500 files changed, 266545 insertions, 214031 deletions

diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index c41c38cba..1b02849fc 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -1,260 +1,260 @@
-# src/mesa/Makefile
-
-TOP = ../..
-include $(TOP)/configs/current
-
-MESA_LIBS := libmesa.a libmesagallium.a
-DEPENDS := depend
-
-ifeq ($(GLES_OVERLAY),1)
-ES1_LIBS := libes1gallium.a
-ES2_LIBS := libes2gallium.a
-DEPENDS += depend.es1 depend.es2
-endif
-
-MESA_OBJ_DIR := .
-ES1_OBJ_DIR := objs-es1
-ES2_OBJ_DIR := objs-es2
-
-
-include sources.mak
-
-# adjust object dirs
-ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_OBJECTS))
-ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_OBJECTS))
-MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
-
-ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-
-# define preprocessor flags
-MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
-ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES)
-ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES)
-
-# append include dirs
-MESA_CPPFLAGS += $(INCLUDE_DIRS)
-ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS)
-ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS)
-
-# tidy compiler flags
-CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
-CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
-
-# LLVM is needed for the state tracker
-MESA_CFLAGS := $(LLVM_CFLAGS)
-ES1_CFLAGS := $(LLVM_CFLAGS)
-ES2_CFLAGS := $(LLVM_CFLAGS)
-
-define mesa-cc-c
-	@mkdir -p $(dir $@)
-	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(CFLAGS)
-endef
-
-define mesa-cxx-c
-	@mkdir -p $(dir $@)
-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(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)
-
-$(ES1_OBJ_DIR)/%.o: %.c
-	$(call mesa-cc-c,ES1)
-
-$(ES1_OBJ_DIR)/%.o: %.cpp
-	$(call mesa-cxx-c,ES1)
-
-$(ES1_OBJ_DIR)/%.o: %.S
-	$(call mesa-cc-c,ES1)
-
-$(ES2_OBJ_DIR)/%.o: %.c
-	$(call mesa-cc-c,ES2)
-
-$(ES2_OBJ_DIR)/%.o: %.cpp
-	$(call mesa-cxx-c,ES2)
-
-$(ES2_OBJ_DIR)/%.o: %.S
-	$(call mesa-cc-c,ES2)
-
-
-# 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) $(ES1_LIBS) $(ES2_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 > $@
-
-######################################################################
-# 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)
-
-libes1.a: $(ES1_OBJECTS) $(GLSL_LIBS)
-	@$(MKLIB) -o es1 -static $(ES1_OBJECTS) $(GLSL_LIBS)
-
-libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS)
-	@$(MKLIB) -o es2 -static $(ES2_OBJECTS) $(GLSL_LIBS)
-
-# 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)
-
-libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)
-	@$(MKLIB) -o es1gallium -static $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)
-
-libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
-	@$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
-
-######################################################################
-# Device drivers
-driver_subdirs: $(MESA_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
-
-depend.es1: $(ALL_SOURCES)
-	@echo "running $(MKDEP) for ES1"
-	@touch $@
-	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES1_OBJ_DIR)/ $(ES1_CPPFLAGS) \
-		$(ALL_SOURCES) > /dev/null 2>/dev/null
-
-depend.es2: $(ALL_SOURCES)
-	@echo "running $(MKDEP) for ES2"
-	@touch $@
-	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES2_OBJ_DIR)/ $(ES2_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)
-
-
-# XXX replace this with new_install above someday
-install: default
-	@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,@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
-
-
-
-# Emacs tags
-tags:
-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
-
-clean-es1:
-	-rm -f $(ES1_LIBS)
-	-rm -rf $(ES1_OBJ_DIR)
-	-rm -f depend.es1 depend.es1.bak
-
-clean-es2:
-	-rm -f $(ES2_LIBS)
-	-rm -rf $(ES2_OBJ_DIR)
-	-rm -f depend.es2 depend.es2.bak
-
-clean: clean-es1 clean-es2
-	-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

+

+ifeq ($(GLES_OVERLAY),1)

+ES1_LIBS := libes1gallium.a

+ES2_LIBS := libes2gallium.a

+DEPENDS += depend.es1 depend.es2

+endif

+

+MESA_OBJ_DIR := .

+ES1_OBJ_DIR := objs-es1

+ES2_OBJ_DIR := objs-es2

+

+

+include sources.mak

+

+# adjust object dirs

+ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_OBJECTS))

+ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_OBJECTS))

+MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))

+

+ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

+ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

+MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

+

+# define preprocessor flags

+MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)

+ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES)

+ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES)

+

+# append include dirs

+MESA_CPPFLAGS += $(INCLUDE_DIRS) $(TALLOC_CFLAGS)

+ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS) $(TALLOC_CFLAGS)

+ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS) $(TALLOC_CFLAGS)

+

+# tidy compiler flags

+CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))

+CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))

+

+# LLVM is needed for the state tracker

+MESA_CFLAGS := $(LLVM_CFLAGS)

+ES1_CFLAGS := $(LLVM_CFLAGS)

+ES2_CFLAGS := $(LLVM_CFLAGS)

+

+define mesa-cc-c

+	@mkdir -p $(dir $@)

+	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(CFLAGS)

+endef

+

+define mesa-cxx-c

+	@mkdir -p $(dir $@)

+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $(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)

+

+$(ES1_OBJ_DIR)/%.o: %.c

+	$(call mesa-cc-c,ES1)

+

+$(ES1_OBJ_DIR)/%.o: %.cpp

+	$(call mesa-cxx-c,ES1)

+

+$(ES1_OBJ_DIR)/%.o: %.S

+	$(call mesa-cc-c,ES1)

+

+$(ES2_OBJ_DIR)/%.o: %.c

+	$(call mesa-cc-c,ES2)

+

+$(ES2_OBJ_DIR)/%.o: %.cpp

+	$(call mesa-cxx-c,ES2)

+

+$(ES2_OBJ_DIR)/%.o: %.S

+	$(call mesa-cc-c,ES2)

+

+

+# 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) $(ES1_LIBS) $(ES2_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 > $@

+

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

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

+

+libes1.a: $(ES1_OBJECTS) $(GLSL_LIBS)

+	@$(MKLIB) -o es1 -static $(ES1_OBJECTS) $(GLSL_LIBS)

+

+libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS)

+	@$(MKLIB) -o es2 -static $(ES2_OBJECTS) $(GLSL_LIBS)

+

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

+

+libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)

+	@$(MKLIB) -o es1gallium -static $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)

+

+libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)

+	@$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)

+

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

+# Device drivers

+driver_subdirs: $(MESA_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

+

+depend.es1: $(ALL_SOURCES)

+	@echo "running $(MKDEP) for ES1"

+	@touch $@

+	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES1_OBJ_DIR)/ $(ES1_CPPFLAGS) \

+		$(ALL_SOURCES) > /dev/null 2>/dev/null

+

+depend.es2: $(ALL_SOURCES)

+	@echo "running $(MKDEP) for ES2"

+	@touch $@

+	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES2_OBJ_DIR)/ $(ES2_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)

+

+

+# XXX replace this with new_install above someday

+install: default

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

+

+

+

+# Emacs tags

+tags:

+	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

+

+clean-es1:

+	-rm -f $(ES1_LIBS)

+	-rm -rf $(ES1_OBJ_DIR)

+	-rm -f depend.es1 depend.es1.bak

+

+clean-es2:

+	-rm -f $(ES2_LIBS)

+	-rm -rf $(ES2_OBJ_DIR)

+	-rm -f depend.es2 depend.es2.bak

+

+clean: clean-es1 clean-es2

+	-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/SConscript b/mesalib/src/mesa/SConscript
new file mode 100644
index 000000000..8cc57e009
--- /dev/null
+++ b/mesalib/src/mesa/SConscript
@@ -0,0 +1,330 @@
+#######################################################################

+# SConscript for Mesa

+

+

+Import('*')

+

+env = env.Clone()

+

+env.Append(CPPPATH = [

+    '#/src/mapi',

+    '#/src/glsl',

+    '#/src/mesa',

+])

+

+if env['platform'] == 'windows':

+    env.Append(CPPDEFINES = [

+        '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers

+        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers

+    ])

+    env.Prepend(CPPPATH = ['#src/talloc'])

+else:

+    env.Append(CPPDEFINES = [

+        'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)

+    ])

+

+#

+# Source files

+#

+

+main_sources = [

+    'main/api_arrayelt.c',

+    'main/api_exec.c',

+    'main/api_loopback.c',

+    'main/api_noop.c',

+    'main/api_validate.c',

+    'main/accum.c',

+    'main/arbprogram.c',

+    'main/atifragshader.c',

+    'main/attrib.c',

+    'main/arrayobj.c',

+    'main/blend.c',

+    'main/bufferobj.c',

+    'main/buffers.c',

+    'main/clear.c',

+    'main/clip.c',

+    'main/colortab.c',

+    'main/condrender.c',

+    'main/context.c',

+    'main/convolve.c',

+    'main/cpuinfo.c',

+    'main/debug.c',

+    'main/depth.c',

+    'main/depthstencil.c',

+    'main/dlist.c',

+    'main/dlopen.c',

+    'main/drawpix.c',

+    'main/drawtex.c',

+    'main/enable.c',

+    'main/enums.c',

+    'main/eval.c',

+    'main/execmem.c',

+    'main/extensions.c',

+    'main/fbobject.c',

+    'main/feedback.c',

+    'main/ffvertex_prog.c',

+    'main/fog.c',

+    'main/formats.c',

+    'main/framebuffer.c',

+    'main/get.c',

+    'main/getstring.c',

+    'main/hash.c',

+    'main/hint.c',

+    'main/histogram.c',

+    'main/image.c',

+    'main/imports.c',

+    'main/light.c',

+    'main/lines.c',

+    'main/matrix.c',

+    'main/mipmap.c',

+    'main/mm.c',

+    'main/multisample.c',

+    'main/nvprogram.c',

+    'main/pack.c',

+    'main/pixel.c',

+    'main/pixelstore.c',

+    'main/pixeltransfer.c',

+    'main/points.c',

+    'main/polygon.c',

+    'main/querymatrix.c',

+    'main/queryobj.c',

+    'main/rastpos.c',

+    'main/readpix.c',

+    'main/remap.c',

+    'main/renderbuffer.c',

+    'main/scissor.c',

+    'main/shaderapi.c',

+    'main/shaderobj.c',

+    'main/shared.c',

+    'main/state.c',

+    'main/stencil.c',

+    'main/syncobj.c',

+    'main/texcompress.c',

+    'main/texcompress_s3tc.c',

+    'main/texcompress_fxt1.c',

+    'main/texenv.c',

+    'main/texenvprogram.c',

+    'main/texfetch.c',

+    'main/texformat.c',

+    'main/texgen.c',

+    'main/texgetimage.c',

+    'main/teximage.c',

+    'main/texobj.c',

+    'main/texpal.c',

+    'main/texparam.c',

+    'main/texrender.c',

+    'main/texstate.c',

+    'main/texstore.c',

+    'main/transformfeedback.c',

+    'main/uniforms.c',

+    'main/varray.c',

+    'main/version.c',

+    'main/viewport.c',

+    'main/vtxfmt.c',

+]

+

+math_sources = [

+    'math/m_debug_clip.c',

+    'math/m_debug_norm.c',

+    'math/m_debug_xform.c',

+    'math/m_eval.c',

+    'math/m_matrix.c',

+    'math/m_translate.c',

+    'math/m_vector.c',

+    'math/m_xform.c',

+]

+

+vbo_sources = [

+    'vbo/vbo_context.c',

+    'vbo/vbo_exec.c',

+    'vbo/vbo_exec_api.c',

+    'vbo/vbo_exec_array.c',

+    'vbo/vbo_exec_draw.c',

+    'vbo/vbo_exec_eval.c',

+    'vbo/vbo_rebase.c',

+    'vbo/vbo_split.c',

+    'vbo/vbo_split_copy.c',

+    'vbo/vbo_split_inplace.c',

+    'vbo/vbo_save.c',

+    'vbo/vbo_save_api.c',

+    'vbo/vbo_save_draw.c',

+    'vbo/vbo_save_loopback.c',

+]

+

+vf_sources = [

+    'vf/vf.c',

+    'vf/vf_generic.c',

+    'vf/vf_sse.c',

+]

+

+statetracker_sources = [

+    'state_tracker/st_atom.c',

+    'state_tracker/st_atom_blend.c',

+    'state_tracker/st_atom_clip.c',

+    'state_tracker/st_atom_constbuf.c',

+    'state_tracker/st_atom_depth.c',

+    'state_tracker/st_atom_framebuffer.c',

+    'state_tracker/st_atom_msaa.c',

+    'state_tracker/st_atom_pixeltransfer.c',

+    'state_tracker/st_atom_sampler.c',

+    'state_tracker/st_atom_scissor.c',

+    'state_tracker/st_atom_shader.c',

+    'state_tracker/st_atom_rasterizer.c',

+    'state_tracker/st_atom_stipple.c',

+    'state_tracker/st_atom_texture.c',

+    'state_tracker/st_atom_viewport.c',

+    'state_tracker/st_cb_accum.c',

+    'state_tracker/st_cb_bitmap.c',

+    'state_tracker/st_cb_blit.c',

+    'state_tracker/st_cb_bufferobjects.c',

+    'state_tracker/st_cb_clear.c',

+    'state_tracker/st_cb_condrender.c',

+    'state_tracker/st_cb_flush.c',

+    'state_tracker/st_cb_drawpixels.c',

+    'state_tracker/st_cb_drawtex.c',

+    'state_tracker/st_cb_eglimage.c',

+    'state_tracker/st_cb_fbo.c',

+    'state_tracker/st_cb_feedback.c',

+    'state_tracker/st_cb_program.c',

+    'state_tracker/st_cb_queryobj.c',

+    'state_tracker/st_cb_rasterpos.c',

+    'state_tracker/st_cb_readpixels.c',

+    'state_tracker/st_cb_strings.c',

+    'state_tracker/st_cb_texture.c',

+    'state_tracker/st_cb_viewport.c',

+    'state_tracker/st_cb_xformfb.c',

+    'state_tracker/st_context.c',

+    'state_tracker/st_debug.c',

+    'state_tracker/st_draw.c',

+    'state_tracker/st_draw_feedback.c',

+    'state_tracker/st_extensions.c',

+    'state_tracker/st_format.c',

+    'state_tracker/st_gen_mipmap.c',

+    'state_tracker/st_manager.c',

+    'state_tracker/st_mesa_to_tgsi.c',

+    'state_tracker/st_program.c',

+    'state_tracker/st_texture.c',

+]

+

+program_sources = [

+    'program/arbprogparse.c',

+    'program/hash_table.c',

+    'program/ir_to_mesa.cpp',

+    'program/lex.yy.c',

+    'program/nvfragparse.c',

+    'program/nvvertparse.c',

+    'program/program.c',

+    'program/program_parse.tab.c',

+    'program/program_parse_extra.c',

+    'program/prog_cache.c',

+    'program/prog_execute.c',

+    'program/prog_instruction.c',

+    'program/prog_noise.c',

+    'program/prog_optimize.c',

+    'program/prog_parameter.c',

+    'program/prog_parameter_layout.c',

+    'program/prog_print.c',

+    'program/prog_statevars.c',

+    'program/prog_uniform.c',

+    'program/programopt.c',

+    'program/sampler.cpp',

+    'program/symbol_table.c',

+]

+

+mesa_sources = (

+    main_sources +

+    math_sources +

+    program_sources +

+    vbo_sources +

+    vf_sources +

+    statetracker_sources

+)

+

+#

+# Assembly sources

+#

+if env['gcc'] and env['platform'] != 'windows':

+    if env['machine'] == 'x86':

+        env.Append(CPPDEFINES = [

+            'USE_X86_ASM',

+            'USE_MMX_ASM',

+            'USE_3DNOW_ASM',

+            'USE_SSE_ASM',

+        ])

+        mesa_sources += [

+            'x86/common_x86.c',

+            'x86/x86_xform.c',

+            'x86/3dnow.c',

+            'x86/sse.c',

+            'x86/common_x86_asm.S',

+            'x86/x86_xform2.S',

+            'x86/x86_xform3.S',

+            'x86/x86_xform4.S',

+            'x86/x86_cliptest.S',

+            'x86/mmx_blend.S',

+            'x86/3dnow_xform1.S',

+            'x86/3dnow_xform2.S',

+            'x86/3dnow_xform3.S',

+            'x86/3dnow_xform4.S',

+            'x86/3dnow_normal.S',

+            'x86/sse_xform1.S',

+            'x86/sse_xform2.S',

+            'x86/sse_xform3.S',

+            'x86/sse_xform4.S',

+            'x86/sse_normal.S',

+            'x86/read_rgba_span_x86.S',

+        ]

+    elif env['machine'] == 'x86_64':

+        env.Append(CPPDEFINES = [

+            'USE_X86_64_ASM',

+        ])

+        mesa_sources += [

+            'x86-64/x86-64.c',

+            'x86-64/xform4.S',

+        ]

+    elif env['machine'] == 'ppc':

+        env.Append(CPPDEFINES = [

+            'USE_PPC_ASM',

+            'USE_VMX_ASM',

+        ])

+        mesa_sources += [

+            'ppc/common_ppc.c',

+        ]

+    elif env['machine'] == 'sparc':

+        mesa_sources += [

+            'sparc/sparc.c',

+            'sparc/clip.S',

+            'sparc/norm.S',

+            'sparc/xform.S',

+        ]

+    else:

+        pass

+

+    # Generate matypes.h

+    if env['machine'] in ('x86', 'x86_64'):

+        # See http://www.scons.org/wiki/UsingCodeGenerators

+        gen_matypes = env.Program(

+            target = 'gen_matypes',

+            source = 'x86/gen_matypes.c',

+        )

+        matypes = env.Command(

+            'matypes.h',

+            gen_matypes,

+            gen_matypes[0].abspath + ' > $TARGET',

+        )

+        # Add the dir containing the generated header (somewhere inside  the

+        # build dir) to the include path

+        env.Append(CPPPATH = [matypes[0].dir])

+

+#

+# Libraries

+#

+

+mesa = env.ConvenienceLibrary(

+    target = 'mesa',

+    source = mesa_sources,

+)

+

+env.Alias('mesa', mesa)

+

+Export('mesa')

diff --git a/mesalib/src/mesa/depend b/mesalib/src/mesa/depend
deleted file mode 100644
index e69de29bb..000000000
--- a/mesalib/src/mesa/depend
+++ /dev/null
diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index f92cdc5a7..e049cc368 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.c
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.c
@@ -1,326 +1,324 @@
-/*
- * 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/imports.h"
-#include "main/arrayobj.h"
-#include "main/context.h"
-#include "main/framebuffer.h"
-#include "main/mipmap.h"
-#include "main/queryobj.h"
-#include "main/renderbuffer.h"
-#include "main/shaderobj.h"
-#include "main/texcompress.h"
-#include "main/texformat.h"
-#include "main/texgetimage.h"
-#include "main/teximage.h"
-#include "main/texobj.h"
-#include "main/texstore.h"
-#include "main/bufferobj.h"
-#include "main/fbobject.h"
-#include "main/texrender.h"
-#include "main/syncobj.h"
-#include "main/transformfeedback.h"
-
-#include "program/program.h"
-#include "tnl/tnl.h"
-#include "swrast/swrast.h"
-
-#include "driverfuncs.h"
-#include "meta.h"
-
-
-
-/**
- * Plug in default functions for all pointers in the dd_function_table
- * structure.
- * Device drivers should call this function and then plug in any
- * functions which it wants to override.
- * Some functions (pointers) MUST be implemented by all drivers (REQUIRED).
- *
- * \param table the dd_function_table to initialize
- */
-void
-_mesa_init_driver_functions(struct dd_function_table *driver)
-{
-   memset(driver, 0, sizeof(*driver));
-
-   driver->GetString = NULL;  /* REQUIRED! */
-   driver->UpdateState = NULL;  /* REQUIRED! */
-   driver->GetBufferSize = NULL;  /* REQUIRED! */
-   driver->ResizeBuffers = _mesa_resize_framebuffer;
-   driver->Error = NULL;
-
-   driver->Finish = NULL;
-   driver->Flush = NULL;
-
-   /* framebuffer/image functions */
-   driver->Clear = _swrast_Clear;
-   driver->Accum = _swrast_Accum;
-   driver->RasterPos = _tnl_RasterPos;
-   driver->DrawPixels = _swrast_DrawPixels;
-   driver->ReadPixels = _swrast_ReadPixels;
-   driver->CopyPixels = _swrast_CopyPixels;
-   driver->Bitmap = _swrast_Bitmap;
-
-   /* Texture functions */
-   driver->ChooseTextureFormat = _mesa_choose_tex_format;
-   driver->TexImage1D = _mesa_store_teximage1d;
-   driver->TexImage2D = _mesa_store_teximage2d;
-   driver->TexImage3D = _mesa_store_teximage3d;
-   driver->TexSubImage1D = _mesa_store_texsubimage1d;
-   driver->TexSubImage2D = _mesa_store_texsubimage2d;
-   driver->TexSubImage3D = _mesa_store_texsubimage3d;
-   driver->GetTexImage = _mesa_get_teximage;
-   driver->CopyTexImage1D = _mesa_meta_CopyTexImage1D;
-   driver->CopyTexImage2D = _mesa_meta_CopyTexImage2D;
-   driver->CopyTexSubImage1D = _mesa_meta_CopyTexSubImage1D;
-   driver->CopyTexSubImage2D = _mesa_meta_CopyTexSubImage2D;
-   driver->CopyTexSubImage3D = _mesa_meta_CopyTexSubImage3D;
-   driver->GenerateMipmap = _mesa_meta_GenerateMipmap;
-   driver->TestProxyTexImage = _mesa_test_proxy_teximage;
-   driver->CompressedTexImage1D = _mesa_store_compressed_teximage1d;
-   driver->CompressedTexImage2D = _mesa_store_compressed_teximage2d;
-   driver->CompressedTexImage3D = _mesa_store_compressed_teximage3d;
-   driver->CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
-   driver->CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
-   driver->CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
-   driver->GetCompressedTexImage = _mesa_get_compressed_teximage;
-   driver->BindTexture = NULL;
-   driver->NewTextureObject = _mesa_new_texture_object;
-   driver->DeleteTexture = _mesa_delete_texture_object;
-   driver->NewTextureImage = _mesa_new_texture_image;
-   driver->FreeTexImageData = _mesa_free_texture_image_data; 
-   driver->MapTexture = NULL;
-   driver->UnmapTexture = NULL;
-   driver->TextureMemCpy = memcpy;
-   driver->IsTextureResident = NULL;
-   driver->UpdateTexturePalette = NULL;
-
-   /* imaging */
-   driver->CopyColorTable = _mesa_meta_CopyColorTable;
-   driver->CopyColorSubTable = _mesa_meta_CopyColorSubTable;
-   driver->CopyConvolutionFilter1D = _mesa_meta_CopyConvolutionFilter1D;
-   driver->CopyConvolutionFilter2D = _mesa_meta_CopyConvolutionFilter2D;
-
-   /* Vertex/fragment programs */
-   driver->BindProgram = NULL;
-   driver->NewProgram = _mesa_new_program;
-   driver->DeleteProgram = _mesa_delete_program;
-
-   /* simple state commands */
-   driver->AlphaFunc = NULL;
-   driver->BlendColor = NULL;
-   driver->BlendEquationSeparate = NULL;
-   driver->BlendFuncSeparate = NULL;
-   driver->ClearColor = NULL;
-   driver->ClearDepth = NULL;
-   driver->ClearStencil = NULL;
-   driver->ClipPlane = NULL;
-   driver->ColorMask = NULL;
-   driver->ColorMaterial = NULL;
-   driver->CullFace = NULL;
-   driver->DrawBuffer = NULL;
-   driver->DrawBuffers = NULL;
-   driver->FrontFace = NULL;
-   driver->DepthFunc = NULL;
-   driver->DepthMask = NULL;
-   driver->DepthRange = NULL;
-   driver->Enable = NULL;
-   driver->Fogfv = NULL;
-   driver->Hint = NULL;
-   driver->Lightfv = NULL;
-   driver->LightModelfv = NULL;
-   driver->LineStipple = NULL;
-   driver->LineWidth = NULL;
-   driver->LogicOpcode = NULL;
-   driver->PointParameterfv = NULL;
-   driver->PointSize = NULL;
-   driver->PolygonMode = NULL;
-   driver->PolygonOffset = NULL;
-   driver->PolygonStipple = NULL;
-   driver->ReadBuffer = NULL;
-   driver->RenderMode = NULL;
-   driver->Scissor = NULL;
-   driver->ShadeModel = NULL;
-   driver->StencilFuncSeparate = NULL;
-   driver->StencilOpSeparate = NULL;
-   driver->StencilMaskSeparate = NULL;
-   driver->TexGen = NULL;
-   driver->TexEnv = NULL;
-   driver->TexParameter = NULL;
-   driver->Viewport = NULL;
-
-   /* buffer objects */
-   _mesa_init_buffer_object_functions(driver);
-
-   /* query objects */
-   _mesa_init_query_object_functions(driver);
-
-   _mesa_init_sync_object_functions(driver);
-
-   driver->NewFramebuffer = _mesa_new_framebuffer;
-   driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
-   driver->RenderTexture = _mesa_render_texture;
-   driver->FinishRenderTexture = _mesa_finish_render_texture;
-   driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer;
-
-   driver->BlitFramebuffer = _swrast_BlitFramebuffer;
-
-   /* APPLE_vertex_array_object */
-   driver->NewArrayObject = _mesa_new_array_object;
-   driver->DeleteArrayObject = _mesa_delete_array_object;
-   driver->BindArrayObject = NULL;
-
-   _mesa_init_shader_object_functions(driver);
-
-   _mesa_init_transform_feedback_functions(driver);
-
-   /* T&L stuff */
-   driver->NeedValidate = GL_FALSE;
-   driver->ValidateTnlModule = NULL;
-   driver->CurrentExecPrimitive = 0;
-   driver->CurrentSavePrimitive = 0;
-   driver->NeedFlush = 0;
-   driver->SaveNeedFlush = 0;
-
-   driver->ProgramStringNotify = _tnl_program_string;
-   driver->FlushVertices = NULL;
-   driver->SaveFlushVertices = NULL;
-   driver->NotifySaveBegin = NULL;
-   driver->LightingSpaceChange = NULL;
-
-   /* display list */
-   driver->NewList = NULL;
-   driver->EndList = NULL;
-   driver->BeginCallList = NULL;
-   driver->EndCallList = NULL;
-}
-
-
-/**
- * Call the ctx->Driver.* state functions with current values to initialize
- * driver state.
- * Only the Intel drivers use this so far.
- */
-void
-_mesa_init_driver_state(GLcontext *ctx)
-{
-   ctx->Driver.AlphaFunc(ctx, ctx->Color.AlphaFunc, ctx->Color.AlphaRef);
-
-   ctx->Driver.BlendColor(ctx, ctx->Color.BlendColor);
-
-   ctx->Driver.BlendEquationSeparate(ctx,
-                                     ctx->Color.BlendEquationRGB,
-                                     ctx->Color.BlendEquationA);
-
-   ctx->Driver.BlendFuncSeparate(ctx,
-                                 ctx->Color.BlendSrcRGB,
-                                 ctx->Color.BlendDstRGB,
-                                 ctx->Color.BlendSrcA, ctx->Color.BlendDstA);
-
-   if (ctx->Driver.ColorMaskIndexed) {
-      GLuint i;
-      for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-         ctx->Driver.ColorMaskIndexed(ctx, i,
-                                      ctx->Color.ColorMask[0][RCOMP],
-                                      ctx->Color.ColorMask[0][GCOMP],
-                                      ctx->Color.ColorMask[0][BCOMP],
-                                      ctx->Color.ColorMask[0][ACOMP]);
-      }
-   }
-   else {
-      ctx->Driver.ColorMask(ctx,
-                            ctx->Color.ColorMask[0][RCOMP],
-                            ctx->Color.ColorMask[0][GCOMP],
-                            ctx->Color.ColorMask[0][BCOMP],
-                            ctx->Color.ColorMask[0][ACOMP]);
-   }
-
-   ctx->Driver.CullFace(ctx, ctx->Polygon.CullFaceMode);
-   ctx->Driver.DepthFunc(ctx, ctx->Depth.Func);
-   ctx->Driver.DepthMask(ctx, ctx->Depth.Mask);
-
-   ctx->Driver.Enable(ctx, GL_ALPHA_TEST, ctx->Color.AlphaEnabled);
-   ctx->Driver.Enable(ctx, GL_BLEND, ctx->Color.BlendEnabled);
-   ctx->Driver.Enable(ctx, GL_COLOR_LOGIC_OP, ctx->Color.ColorLogicOpEnabled);
-   ctx->Driver.Enable(ctx, GL_COLOR_SUM, ctx->Fog.ColorSumEnabled);
-   ctx->Driver.Enable(ctx, GL_CULL_FACE, ctx->Polygon.CullFlag);
-   ctx->Driver.Enable(ctx, GL_DEPTH_TEST, ctx->Depth.Test);
-   ctx->Driver.Enable(ctx, GL_DITHER, ctx->Color.DitherFlag);
-   ctx->Driver.Enable(ctx, GL_FOG, ctx->Fog.Enabled);
-   ctx->Driver.Enable(ctx, GL_LIGHTING, ctx->Light.Enabled);
-   ctx->Driver.Enable(ctx, GL_LINE_SMOOTH, ctx->Line.SmoothFlag);
-   ctx->Driver.Enable(ctx, GL_POLYGON_STIPPLE, ctx->Polygon.StippleFlag);
-   ctx->Driver.Enable(ctx, GL_SCISSOR_TEST, ctx->Scissor.Enabled);
-   ctx->Driver.Enable(ctx, GL_STENCIL_TEST, ctx->Stencil._Enabled);
-   ctx->Driver.Enable(ctx, GL_TEXTURE_1D, GL_FALSE);
-   ctx->Driver.Enable(ctx, GL_TEXTURE_2D, GL_FALSE);
-   ctx->Driver.Enable(ctx, GL_TEXTURE_RECTANGLE_NV, GL_FALSE);
-   ctx->Driver.Enable(ctx, GL_TEXTURE_3D, GL_FALSE);
-   ctx->Driver.Enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
-
-   ctx->Driver.Fogfv(ctx, GL_FOG_COLOR, ctx->Fog.Color);
-   ctx->Driver.Fogfv(ctx, GL_FOG_MODE, 0);
-   ctx->Driver.Fogfv(ctx, GL_FOG_DENSITY, &ctx->Fog.Density);
-   ctx->Driver.Fogfv(ctx, GL_FOG_START, &ctx->Fog.Start);
-   ctx->Driver.Fogfv(ctx, GL_FOG_END, &ctx->Fog.End);
-
-   ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);
-
-   {
-      GLfloat f = (GLfloat) ctx->Light.Model.ColorControl;
-      ctx->Driver.LightModelfv(ctx, GL_LIGHT_MODEL_COLOR_CONTROL, &f);
-   }
-
-   ctx->Driver.LineWidth(ctx, ctx->Line.Width);
-   ctx->Driver.LogicOpcode(ctx, ctx->Color.LogicOp);
-   ctx->Driver.PointSize(ctx, ctx->Point.Size);
-   ctx->Driver.PolygonStipple(ctx, (const GLubyte *) ctx->PolygonStipple);
-   ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
-                       ctx->Scissor.Width, ctx->Scissor.Height);
-   ctx->Driver.ShadeModel(ctx, ctx->Light.ShadeModel);
-   ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT,
-                                   ctx->Stencil.Function[0],
-                                   ctx->Stencil.Ref[0],
-                                   ctx->Stencil.ValueMask[0]);
-   ctx->Driver.StencilFuncSeparate(ctx, GL_BACK,
-                                   ctx->Stencil.Function[1],
-                                   ctx->Stencil.Ref[1],
-                                   ctx->Stencil.ValueMask[1]);
-   ctx->Driver.StencilMaskSeparate(ctx, GL_FRONT, ctx->Stencil.WriteMask[0]);
-   ctx->Driver.StencilMaskSeparate(ctx, GL_BACK, ctx->Stencil.WriteMask[1]);
-   ctx->Driver.StencilOpSeparate(ctx, GL_FRONT,
-                                 ctx->Stencil.FailFunc[0],
-                                 ctx->Stencil.ZFailFunc[0],
-                                 ctx->Stencil.ZPassFunc[0]);
-   ctx->Driver.StencilOpSeparate(ctx, GL_BACK,
-                                 ctx->Stencil.FailFunc[1],
-                                 ctx->Stencil.ZFailFunc[1],
-                                 ctx->Stencil.ZPassFunc[1]);
-
-
-   ctx->Driver.DrawBuffer(ctx, ctx->Color.DrawBuffer[0]);
-}
+/*

+ * 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/imports.h"

+#include "main/arrayobj.h"

+#include "main/context.h"

+#include "main/framebuffer.h"

+#include "main/mipmap.h"

+#include "main/queryobj.h"

+#include "main/renderbuffer.h"

+#include "main/shaderobj.h"

+#include "main/texcompress.h"

+#include "main/texformat.h"

+#include "main/texgetimage.h"

+#include "main/teximage.h"

+#include "main/texobj.h"

+#include "main/texstore.h"

+#include "main/bufferobj.h"

+#include "main/fbobject.h"

+#include "main/texrender.h"

+#include "main/syncobj.h"

+#include "main/transformfeedback.h"

+

+#include "program/program.h"

+#include "tnl/tnl.h"

+#include "swrast/swrast.h"

+

+#include "driverfuncs.h"

+#include "meta.h"

+

+

+

+/**

+ * Plug in default functions for all pointers in the dd_function_table

+ * structure.

+ * Device drivers should call this function and then plug in any

+ * functions which it wants to override.

+ * Some functions (pointers) MUST be implemented by all drivers (REQUIRED).

+ *

+ * \param table the dd_function_table to initialize

+ */

+void

+_mesa_init_driver_functions(struct dd_function_table *driver)

+{

+   memset(driver, 0, sizeof(*driver));

+

+   driver->GetString = NULL;  /* REQUIRED! */

+   driver->UpdateState = NULL;  /* REQUIRED! */

+   driver->GetBufferSize = NULL;  /* REQUIRED! */

+   driver->ResizeBuffers = _mesa_resize_framebuffer;

+   driver->Error = NULL;

+

+   driver->Finish = NULL;

+   driver->Flush = NULL;

+

+   /* framebuffer/image functions */

+   driver->Clear = _swrast_Clear;

+   driver->Accum = _swrast_Accum;

+   driver->RasterPos = _tnl_RasterPos;

+   driver->DrawPixels = _swrast_DrawPixels;

+   driver->ReadPixels = _swrast_ReadPixels;

+   driver->CopyPixels = _swrast_CopyPixels;

+   driver->Bitmap = _swrast_Bitmap;

+

+   /* Texture functions */

+   driver->ChooseTextureFormat = _mesa_choose_tex_format;

+   driver->TexImage1D = _mesa_store_teximage1d;

+   driver->TexImage2D = _mesa_store_teximage2d;

+   driver->TexImage3D = _mesa_store_teximage3d;

+   driver->TexSubImage1D = _mesa_store_texsubimage1d;

+   driver->TexSubImage2D = _mesa_store_texsubimage2d;

+   driver->TexSubImage3D = _mesa_store_texsubimage3d;

+   driver->GetTexImage = _mesa_get_teximage;

+   driver->CopyTexImage1D = _mesa_meta_CopyTexImage1D;

+   driver->CopyTexImage2D = _mesa_meta_CopyTexImage2D;

+   driver->CopyTexSubImage1D = _mesa_meta_CopyTexSubImage1D;

+   driver->CopyTexSubImage2D = _mesa_meta_CopyTexSubImage2D;

+   driver->CopyTexSubImage3D = _mesa_meta_CopyTexSubImage3D;

+   driver->GenerateMipmap = _mesa_meta_GenerateMipmap;

+   driver->TestProxyTexImage = _mesa_test_proxy_teximage;

+   driver->CompressedTexImage1D = _mesa_store_compressed_teximage1d;

+   driver->CompressedTexImage2D = _mesa_store_compressed_teximage2d;

+   driver->CompressedTexImage3D = _mesa_store_compressed_teximage3d;

+   driver->CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;

+   driver->CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;

+   driver->CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;

+   driver->GetCompressedTexImage = _mesa_get_compressed_teximage;

+   driver->BindTexture = NULL;

+   driver->NewTextureObject = _mesa_new_texture_object;

+   driver->DeleteTexture = _mesa_delete_texture_object;

+   driver->NewTextureImage = _mesa_new_texture_image;

+   driver->FreeTexImageData = _mesa_free_texture_image_data; 

+   driver->MapTexture = NULL;

+   driver->UnmapTexture = NULL;

+   driver->TextureMemCpy = memcpy;

+   driver->IsTextureResident = NULL;

+   driver->UpdateTexturePalette = NULL;

+

+   /* imaging */

+   driver->CopyColorTable = _mesa_meta_CopyColorTable;

+   driver->CopyColorSubTable = _mesa_meta_CopyColorSubTable;

+

+   /* Vertex/fragment programs */

+   driver->BindProgram = NULL;

+   driver->NewProgram = _mesa_new_program;

+   driver->DeleteProgram = _mesa_delete_program;

+

+   /* simple state commands */

+   driver->AlphaFunc = NULL;

+   driver->BlendColor = NULL;

+   driver->BlendEquationSeparate = NULL;

+   driver->BlendFuncSeparate = NULL;

+   driver->ClearColor = NULL;

+   driver->ClearDepth = NULL;

+   driver->ClearStencil = NULL;

+   driver->ClipPlane = NULL;

+   driver->ColorMask = NULL;

+   driver->ColorMaterial = NULL;

+   driver->CullFace = NULL;

+   driver->DrawBuffer = NULL;

+   driver->DrawBuffers = NULL;

+   driver->FrontFace = NULL;

+   driver->DepthFunc = NULL;

+   driver->DepthMask = NULL;

+   driver->DepthRange = NULL;

+   driver->Enable = NULL;

+   driver->Fogfv = NULL;

+   driver->Hint = NULL;

+   driver->Lightfv = NULL;

+   driver->LightModelfv = NULL;

+   driver->LineStipple = NULL;

+   driver->LineWidth = NULL;

+   driver->LogicOpcode = NULL;

+   driver->PointParameterfv = NULL;

+   driver->PointSize = NULL;

+   driver->PolygonMode = NULL;

+   driver->PolygonOffset = NULL;

+   driver->PolygonStipple = NULL;

+   driver->ReadBuffer = NULL;

+   driver->RenderMode = NULL;

+   driver->Scissor = NULL;

+   driver->ShadeModel = NULL;

+   driver->StencilFuncSeparate = NULL;

+   driver->StencilOpSeparate = NULL;

+   driver->StencilMaskSeparate = NULL;

+   driver->TexGen = NULL;

+   driver->TexEnv = NULL;

+   driver->TexParameter = NULL;

+   driver->Viewport = NULL;

+

+   /* buffer objects */

+   _mesa_init_buffer_object_functions(driver);

+

+   /* query objects */

+   _mesa_init_query_object_functions(driver);

+

+   _mesa_init_sync_object_functions(driver);

+

+   driver->NewFramebuffer = _mesa_new_framebuffer;

+   driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;

+   driver->RenderTexture = _mesa_render_texture;

+   driver->FinishRenderTexture = _mesa_finish_render_texture;

+   driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer;

+

+   driver->BlitFramebuffer = _swrast_BlitFramebuffer;

+

+   /* APPLE_vertex_array_object */

+   driver->NewArrayObject = _mesa_new_array_object;

+   driver->DeleteArrayObject = _mesa_delete_array_object;

+   driver->BindArrayObject = NULL;

+

+   _mesa_init_shader_object_functions(driver);

+

+   _mesa_init_transform_feedback_functions(driver);

+

+   /* T&L stuff */

+   driver->NeedValidate = GL_FALSE;

+   driver->ValidateTnlModule = NULL;

+   driver->CurrentExecPrimitive = 0;

+   driver->CurrentSavePrimitive = 0;

+   driver->NeedFlush = 0;

+   driver->SaveNeedFlush = 0;

+

+   driver->ProgramStringNotify = _tnl_program_string;

+   driver->FlushVertices = NULL;

+   driver->SaveFlushVertices = NULL;

+   driver->NotifySaveBegin = NULL;

+   driver->LightingSpaceChange = NULL;

+

+   /* display list */

+   driver->NewList = NULL;

+   driver->EndList = NULL;

+   driver->BeginCallList = NULL;

+   driver->EndCallList = NULL;

+}

+

+

+/**

+ * Call the ctx->Driver.* state functions with current values to initialize

+ * driver state.

+ * Only the Intel drivers use this so far.

+ */

+void

+_mesa_init_driver_state(struct gl_context *ctx)

+{

+   ctx->Driver.AlphaFunc(ctx, ctx->Color.AlphaFunc, ctx->Color.AlphaRef);

+

+   ctx->Driver.BlendColor(ctx, ctx->Color.BlendColor);

+

+   ctx->Driver.BlendEquationSeparate(ctx,

+                                     ctx->Color.BlendEquationRGB,

+                                     ctx->Color.BlendEquationA);

+

+   ctx->Driver.BlendFuncSeparate(ctx,

+                                 ctx->Color.BlendSrcRGB,

+                                 ctx->Color.BlendDstRGB,

+                                 ctx->Color.BlendSrcA, ctx->Color.BlendDstA);

+

+   if (ctx->Driver.ColorMaskIndexed) {

+      GLuint i;

+      for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+         ctx->Driver.ColorMaskIndexed(ctx, i,

+                                      ctx->Color.ColorMask[0][RCOMP],

+                                      ctx->Color.ColorMask[0][GCOMP],

+                                      ctx->Color.ColorMask[0][BCOMP],

+                                      ctx->Color.ColorMask[0][ACOMP]);

+      }

+   }

+   else {

+      ctx->Driver.ColorMask(ctx,

+                            ctx->Color.ColorMask[0][RCOMP],

+                            ctx->Color.ColorMask[0][GCOMP],

+                            ctx->Color.ColorMask[0][BCOMP],

+                            ctx->Color.ColorMask[0][ACOMP]);

+   }

+

+   ctx->Driver.CullFace(ctx, ctx->Polygon.CullFaceMode);

+   ctx->Driver.DepthFunc(ctx, ctx->Depth.Func);

+   ctx->Driver.DepthMask(ctx, ctx->Depth.Mask);

+

+   ctx->Driver.Enable(ctx, GL_ALPHA_TEST, ctx->Color.AlphaEnabled);

+   ctx->Driver.Enable(ctx, GL_BLEND, ctx->Color.BlendEnabled);

+   ctx->Driver.Enable(ctx, GL_COLOR_LOGIC_OP, ctx->Color.ColorLogicOpEnabled);

+   ctx->Driver.Enable(ctx, GL_COLOR_SUM, ctx->Fog.ColorSumEnabled);

+   ctx->Driver.Enable(ctx, GL_CULL_FACE, ctx->Polygon.CullFlag);

+   ctx->Driver.Enable(ctx, GL_DEPTH_TEST, ctx->Depth.Test);

+   ctx->Driver.Enable(ctx, GL_DITHER, ctx->Color.DitherFlag);

+   ctx->Driver.Enable(ctx, GL_FOG, ctx->Fog.Enabled);

+   ctx->Driver.Enable(ctx, GL_LIGHTING, ctx->Light.Enabled);

+   ctx->Driver.Enable(ctx, GL_LINE_SMOOTH, ctx->Line.SmoothFlag);

+   ctx->Driver.Enable(ctx, GL_POLYGON_STIPPLE, ctx->Polygon.StippleFlag);

+   ctx->Driver.Enable(ctx, GL_SCISSOR_TEST, ctx->Scissor.Enabled);

+   ctx->Driver.Enable(ctx, GL_STENCIL_TEST, ctx->Stencil._Enabled);

+   ctx->Driver.Enable(ctx, GL_TEXTURE_1D, GL_FALSE);

+   ctx->Driver.Enable(ctx, GL_TEXTURE_2D, GL_FALSE);

+   ctx->Driver.Enable(ctx, GL_TEXTURE_RECTANGLE_NV, GL_FALSE);

+   ctx->Driver.Enable(ctx, GL_TEXTURE_3D, GL_FALSE);

+   ctx->Driver.Enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);

+

+   ctx->Driver.Fogfv(ctx, GL_FOG_COLOR, ctx->Fog.Color);

+   ctx->Driver.Fogfv(ctx, GL_FOG_MODE, 0);

+   ctx->Driver.Fogfv(ctx, GL_FOG_DENSITY, &ctx->Fog.Density);

+   ctx->Driver.Fogfv(ctx, GL_FOG_START, &ctx->Fog.Start);

+   ctx->Driver.Fogfv(ctx, GL_FOG_END, &ctx->Fog.End);

+

+   ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);

+

+   {

+      GLfloat f = (GLfloat) ctx->Light.Model.ColorControl;

+      ctx->Driver.LightModelfv(ctx, GL_LIGHT_MODEL_COLOR_CONTROL, &f);

+   }

+

+   ctx->Driver.LineWidth(ctx, ctx->Line.Width);

+   ctx->Driver.LogicOpcode(ctx, ctx->Color.LogicOp);

+   ctx->Driver.PointSize(ctx, ctx->Point.Size);

+   ctx->Driver.PolygonStipple(ctx, (const GLubyte *) ctx->PolygonStipple);

+   ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,

+                       ctx->Scissor.Width, ctx->Scissor.Height);

+   ctx->Driver.ShadeModel(ctx, ctx->Light.ShadeModel);

+   ctx->Driver.StencilFuncSeparate(ctx, GL_FRONT,

+                                   ctx->Stencil.Function[0],

+                                   ctx->Stencil.Ref[0],

+                                   ctx->Stencil.ValueMask[0]);

+   ctx->Driver.StencilFuncSeparate(ctx, GL_BACK,

+                                   ctx->Stencil.Function[1],

+                                   ctx->Stencil.Ref[1],

+                                   ctx->Stencil.ValueMask[1]);

+   ctx->Driver.StencilMaskSeparate(ctx, GL_FRONT, ctx->Stencil.WriteMask[0]);

+   ctx->Driver.StencilMaskSeparate(ctx, GL_BACK, ctx->Stencil.WriteMask[1]);

+   ctx->Driver.StencilOpSeparate(ctx, GL_FRONT,

+                                 ctx->Stencil.FailFunc[0],

+                                 ctx->Stencil.ZFailFunc[0],

+                                 ctx->Stencil.ZPassFunc[0]);

+   ctx->Driver.StencilOpSeparate(ctx, GL_BACK,

+                                 ctx->Stencil.FailFunc[1],

+                                 ctx->Stencil.ZFailFunc[1],

+                                 ctx->Stencil.ZPassFunc[1]);

+

+

+   ctx->Driver.DrawBuffer(ctx, ctx->Color.DrawBuffer[0]);

+}

diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.h b/mesalib/src/mesa/drivers/common/driverfuncs.h
index 4c90ed12f..31549f65a 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.h
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.h
@@ -1,37 +1,37 @@
-/*
- * 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 DRIVERFUNCS_H
-#define DRIVERFUNCS_H
-
-extern void
-_mesa_init_driver_functions(struct dd_function_table *driver);
-
-
-extern void
-_mesa_init_driver_state(GLcontext *ctx);
-
-
-#endif
+/*

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

+#define DRIVERFUNCS_H

+

+extern void

+_mesa_init_driver_functions(struct dd_function_table *driver);

+

+

+extern void

+_mesa_init_driver_state(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index a03cb68ec..b2cd8dca7 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -1,2868 +1,2854 @@
-/*
- * 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/convolve.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/polygon.h"
-#include "main/readpix.h"
-#include "main/scissor.h"
-#include "main/shaderapi.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;
-
-   /** 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;
-   GLboolean Convolution1DEnabled;
-   GLboolean Convolution2DEnabled;
-   GLboolean Separable2DEnabled;
-
-   /** 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;
-   GLuint Shader;
-
-   /** 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;
-};
-
-
-/**
- * All per-context meta state.
- */
-struct gl_meta_state
-{
-   struct save_state Save;    /**< state saved during meta-ops */
-
-   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(GLcontext *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(GLcontext *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(GLcontext *ctx, GLbitfield state)
-{
-   struct save_state *save = &ctx->Meta->Save;
-
-   save->SavedState = state;
-
-   if (state & META_ALPHA_TEST) {
-      save->AlphaEnabled = ctx->Color.AlphaEnabled;
-      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;
-      save->Convolution1DEnabled = ctx->Pixel.Convolution1DEnabled;
-      save->Convolution2DEnabled = ctx->Pixel.Convolution2DEnabled;
-      save->Separable2DEnabled = ctx->Pixel.Separable2DEnabled;
-      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;
-      ctx->Pixel.Convolution1DEnabled = GL_FALSE;
-      ctx->Pixel.Convolution2DEnabled = GL_FALSE;
-      ctx->Pixel.Separable2DEnabled = 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) {
-         save->Shader = ctx->Shader.CurrentProgram ?
-            ctx->Shader.CurrentProgram->Name : 0;
-         _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);
-            _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(GLcontext *ctx)
-{
-   struct save_state *save = &ctx->Meta->Save;
-   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);
-   }
-
-   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;
-      ctx->Pixel.Convolution1DEnabled = save->Convolution1DEnabled;
-      ctx->Pixel.Convolution2DEnabled = save->Convolution2DEnabled;
-      ctx->Pixel.Separable2DEnabled = save->Separable2DEnabled;
-      /* 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_shader_objects) {
-         _mesa_UseProgramObjectARB(save->Shader);
-      }
-   }
-
-   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(GLcontext *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);
-   _mesa_BindTexture(tex->Target, 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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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;
-
-   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 & 0x7fffffff,
-                                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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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);
-}
-
-
-/**
- * Do glBitmap with a alpha texture quad.  Use the alpha test to
- * cull the 'off' bits.  If alpha test is already enabled, fall back
- * to swrast (should be a rare case).
- * A bitmap cache as in the gallium/mesa state tracker would
- * improve performance a lot.
- */
-void
-_mesa_meta_Bitmap(GLcontext *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;
-   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->Color.AlphaEnabled ||
-       ctx->Fog.Enabled ||
-       ctx->Texture._EnabledUnits ||
-       width > tex->MaxSize ||
-       height > tex->MaxSize) {
-      _swrast_Bitmap(ctx, x, y, width, height, unpack, bitmap1);
-      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);
-   }
-
-   bitmap1 = _mesa_map_pbo_source(ctx, &unpackSave, bitmap1);
-   if (!bitmap1) {
-      _mesa_meta_end(ctx);
-      return;
-   }
-
-   bitmap8 = (GLubyte *) calloc(1, width * height);
-   if (bitmap8) {
-      _mesa_expand_bitmap(width, height, &unpackSave, bitmap1,
-                          bitmap8, width, 0xff);
-
-      _mesa_set_enable(ctx, tex->Target, GL_TRUE);
-
-      _mesa_set_enable(ctx, GL_ALPHA_TEST, GL_TRUE);
-      _mesa_AlphaFunc(GL_GREATER, 0.0);
-
-      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(GLcontext *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(GLcontext *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 baseLevelSave = texObj->BaseLevel;
-   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);
-   _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 sampling to src level */
-      _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel);
-      _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_BASE_LEVEL, baseLevelSave);
-   _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(GLcontext *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(GLcontext *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;
-   GLsizei postConvWidth = width, postConvHeight = height;
-   GLenum format, type;
-   GLint bpp;
-   void *buf;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-
-   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);
-
-   /*
-    * Prepare for new texture image size/data
-    */
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 2,
-                                         &postConvWidth, &postConvHeight);
-   }
-
-   if (texImage->Data) {
-      ctx->Driver.FreeTexImageData(ctx, texImage);
-   }
-
-   _mesa_init_teximage_fields(ctx, target, texImage,
-                              postConvWidth, postConvHeight, 1,
-                              border, internalFormat);
-
-   _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                               internalFormat, GL_NONE, GL_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(GLcontext *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(GLcontext *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(GLcontext *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);
-
-   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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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);
-}
-
-
-void
-_mesa_meta_CopyConvolutionFilter1D(GLcontext *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, "glCopyConvolutionFilter2D");
-      return;
-   }
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   _mesa_update_state(ctx);
-   ctx->Driver.ReadPixels(ctx, x, y, width, 1,
-                          GL_RGBA, GL_FLOAT, &ctx->Pack, buf);
-
-   _mesa_ConvolutionFilter1D(target, internalFormat, width,
-                             GL_RGBA, GL_FLOAT, buf);
-
-   _mesa_meta_end(ctx);
-
-   free(buf);
-}
-
-
-void
-_mesa_meta_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
-                                   GLenum internalFormat, GLint x, GLint y,
-                                   GLsizei width, GLsizei height)
-{
-   GLfloat *buf;
-
-   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-   if (!buf) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyConvolutionFilter2D");
-      return;
-   }
-
-   /*
-    * Read image from framebuffer (disable pixel transfer ops)
-    */
-   _mesa_meta_begin(ctx, META_PIXEL_STORE | META_PIXEL_TRANSFER);
-   _mesa_update_state(ctx);
-
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-                          GL_RGBA, GL_FLOAT, &ctx->Pack, buf);
-
-   _mesa_ConvolutionFilter2D(target, internalFormat, width, height,
-                             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/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 baseLevelSave = texObj->BaseLevel;

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

+   _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 sampling to src level */

+      _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel);

+      _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_BASE_LEVEL, baseLevelSave);

+   _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/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h
index 6225b9418..a350a92aa 100644
--- a/mesalib/src/mesa/drivers/common/meta.h
+++ b/mesalib/src/mesa/drivers/common/meta.h
@@ -1,118 +1,118 @@
-/*
- * 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.
- */
-
-
-#ifndef META_H
-#define META_H
-
-
-extern void
-_mesa_meta_init(GLcontext *ctx);
-
-extern void
-_mesa_meta_free(GLcontext *ctx);
-
-extern void
-_mesa_meta_BlitFramebuffer(GLcontext *ctx,
-                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                           GLbitfield mask, GLenum filter);
-
-extern void
-_mesa_meta_Clear(GLcontext *ctx, GLbitfield buffers);
-
-extern void
-_mesa_meta_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
-                      GLsizei width, GLsizei height,
-                      GLint dstx, GLint dsty, GLenum type);
-
-extern void
-_mesa_meta_DrawPixels(GLcontext *ctx,
-                      GLint x, GLint y, GLsizei width, GLsizei height,
-                      GLenum format, GLenum type,
-                      const struct gl_pixelstore_attrib *unpack,
-                      const GLvoid *pixels);
-
-extern void
-_mesa_meta_Bitmap(GLcontext *ctx,
-                  GLint x, GLint y, GLsizei width, GLsizei height,
-                  const struct gl_pixelstore_attrib *unpack,
-                  const GLubyte *bitmap);
-
-extern GLboolean
-_mesa_meta_check_generate_mipmap_fallback(GLcontext *ctx, GLenum target,
-                                          struct gl_texture_object *texObj);
-
-extern void
-_mesa_meta_GenerateMipmap(GLcontext *ctx, GLenum target,
-                          struct gl_texture_object *texObj);
-
-extern void
-_mesa_meta_CopyTexImage1D(GLcontext *ctx, GLenum target, GLint level,
-                          GLenum internalFormat, GLint x, GLint y,
-                          GLsizei width, GLint border);
-
-extern void
-_mesa_meta_CopyTexImage2D(GLcontext *ctx, GLenum target, GLint level,
-                          GLenum internalFormat, GLint x, GLint y,
-                          GLsizei width, GLsizei height, GLint border);
-
-extern void
-_mesa_meta_CopyTexSubImage1D(GLcontext *ctx, GLenum target, GLint level,
-                             GLint xoffset,
-                             GLint x, GLint y, GLsizei width);
-
-extern void
-_mesa_meta_CopyTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
-                             GLint xoffset, GLint yoffset,
-                             GLint x, GLint y,
-                             GLsizei width, GLsizei height);
-
-extern void
-_mesa_meta_CopyTexSubImage3D(GLcontext *ctx, GLenum target, GLint level,
-                             GLint xoffset, GLint yoffset, GLint zoffset,
-                             GLint x, GLint y,
-                             GLsizei width, GLsizei height);
-
-extern void
-_mesa_meta_CopyColorTable(GLcontext *ctx,
-                          GLenum target, GLenum internalformat,
-                          GLint x, GLint y, GLsizei width);
-
-extern void
-_mesa_meta_CopyColorSubTable(GLcontext *ctx,GLenum target, GLsizei start,
-                             GLint x, GLint y, GLsizei width);
-
-extern void
-_mesa_meta_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
-                                   GLenum internalFormat,
-                                   GLint x, GLint y, GLsizei width);
-
-extern void
-_mesa_meta_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
-                                   GLenum internalFormat, GLint x, GLint y,
-                                   GLsizei width, GLsizei height);
-
-
-#endif /* META_H */
+/*

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

+ */

+

+

+#ifndef META_H

+#define META_H

+

+

+extern void

+_mesa_meta_init(struct gl_context *ctx);

+

+extern void

+_mesa_meta_free(struct gl_context *ctx);

+

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

+

+extern void

+_mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers);

+

+extern void

+_mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy,

+                      GLsizei width, GLsizei height,

+                      GLint dstx, GLint dsty, GLenum type);

+

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

+

+extern void

+_mesa_meta_Bitmap(struct gl_context *ctx,

+                  GLint x, GLint y, GLsizei width, GLsizei height,

+                  const struct gl_pixelstore_attrib *unpack,

+                  const GLubyte *bitmap);

+

+extern GLboolean

+_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,

+                                          struct gl_texture_object *texObj);

+

+extern void

+_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,

+                          struct gl_texture_object *texObj);

+

+extern void

+_mesa_meta_CopyTexImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                          GLenum internalFormat, GLint x, GLint y,

+                          GLsizei width, GLint border);

+

+extern void

+_mesa_meta_CopyTexImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                          GLenum internalFormat, GLint x, GLint y,

+                          GLsizei width, GLsizei height, GLint border);

+

+extern void

+_mesa_meta_CopyTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                             GLint xoffset,

+                             GLint x, GLint y, GLsizei width);

+

+extern void

+_mesa_meta_CopyTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                             GLint xoffset, GLint yoffset,

+                             GLint x, GLint y,

+                             GLsizei width, GLsizei height);

+

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

+

+extern void

+_mesa_meta_CopyColorTable(struct gl_context *ctx,

+                          GLenum target, GLenum internalformat,

+                          GLint x, GLint y, GLsizei width);

+

+extern void

+_mesa_meta_CopyColorSubTable(struct gl_context *ctx,GLenum target, GLsizei start,

+                             GLint x, GLint y, GLsizei width);

+

+extern void

+_mesa_meta_CopyConvolutionFilter1D(struct gl_context *ctx, GLenum target,

+                                   GLenum internalFormat,

+                                   GLint x, GLint y, GLsizei width);

+

+extern void

+_mesa_meta_CopyConvolutionFilter2D(struct gl_context *ctx, GLenum target,

+                                   GLenum internalFormat, GLint x, GLint y,

+                                   GLsizei width, GLsizei height);

+

+

+#endif /* META_H */

diff --git a/mesalib/src/mesa/drivers/dri/Makefile.template b/mesalib/src/mesa/drivers/dri/Makefile.template
index a00018caf..6be554af7 100644
--- a/mesalib/src/mesa/drivers/dri/Makefile.template
+++ b/mesalib/src/mesa/drivers/dri/Makefile.template
@@ -1,113 +1,114 @@
-# -*-makefile-*-
-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
-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 \
-	../common/dri_metaops.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) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-.cpp.o:
-	$(CC) -c $(INCLUDES) $(CXXFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-.S.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
-
-
-##### TARGETS #####
-
-default: subdirs lib
-
-
-.PHONY: lib
-lib: symlinks subdirs depend
-	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
-
-$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_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) $(MESA_MODULES) $(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) $(ASM_SOURCES) $(SYMLINKS)
-	@ echo "running $(MKDEP)"
-	@ rm -f depend
-	@ touch depend
-	@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_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-*-

+

+MESA_MODULES = $(TOP)/src/mesa/libmesa.a

+

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

+	../common/dri_metaops.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) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@

+

+.cpp.o:

+	$(CC) -c $(INCLUDES) $(CXXFLAGS) $(DRIVER_DEFINES) $< -o $@

+

+.S.o:

+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@

+

+

+##### TARGETS #####

+

+default: subdirs lib

+

+

+.PHONY: lib

+lib: symlinks subdirs depend

+	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)

+

+$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_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) $(MESA_MODULES) $(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/depthtmp.h b/mesalib/src/mesa/drivers/dri/common/depthtmp.h
index fd2dab3b4..8e751d7b2 100644
--- a/mesalib/src/mesa/drivers/dri/common/depthtmp.h
+++ b/mesalib/src/mesa/drivers/dri/common/depthtmp.h
@@ -1,270 +1,270 @@
-
-/*
- * Notes:
- * 1. These functions plug into the gl_renderbuffer structure.
- * 2. The 'values' parameter always points to GLuint values, regardless of
- *    the actual Z buffer depth.
- */
-
-
-#include "spantmp_common.h"
-
-#ifndef DBG
-#define DBG 0
-#endif
-
-#ifndef HAVE_HW_DEPTH_SPANS
-#define HAVE_HW_DEPTH_SPANS 0
-#endif
-
-#ifndef HAVE_HW_DEPTH_PIXELS
-#define HAVE_HW_DEPTH_PIXELS 0
-#endif
-
-static void TAG(WriteDepthSpan)( GLcontext *ctx,
-                                 struct gl_renderbuffer *rb,
-                                 GLuint n, GLint x, GLint y,
-				 const void *values,
-				 const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const VALUE_TYPE *depth = (const VALUE_TYPE *) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_DEPTH_VARS;
-
-	 y = Y_FLIP( y );
-
-#if HAVE_HW_DEPTH_SPANS
-	 (void) x1; (void) n1;
-
-	 if ( DBG ) fprintf( stderr, "WriteDepthSpan 0..%d (x1 %d)\n",
-			     (int)n, (int)x );
-
-	 WRITE_DEPTH_SPAN();
-#else
-	 HW_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN( x, y, n, x1, n1, i );
-
-	       if ( DBG ) fprintf( stderr, "WriteDepthSpan %d..%d (x1 %d) (mask %p)\n",
-				   (int)i, (int)n1, (int)x1, mask );
-
-	       if ( mask ) {
-		  for ( ; n1>0 ; i++, x1++, n1-- ) {
-		     if ( mask[i] ) WRITE_DEPTH( x1, y, depth[i] );
-		  }
-	       } else {
-		  for ( ; n1>0 ; i++, x1++, n1-- ) {
-		     WRITE_DEPTH( x1, y, depth[i] );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-#if HAVE_HW_DEPTH_SPANS
-/* implement MonoWriteDepthSpan() in terms of WriteDepthSpan() */
-static void
-TAG(WriteMonoDepthSpan)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                         GLuint n, GLint x, GLint y,
-                         const void *value, const GLubyte mask[] )
-{
-   const GLuint depthVal = *((GLuint *) value);
-   GLuint depths[MAX_WIDTH];
-   GLuint i;
-   for (i = 0; i < n; i++)
-      depths[i] = depthVal;
-   TAG(WriteDepthSpan)(ctx, rb, n, x, y, depths, mask);
-}
-#else
-static void TAG(WriteMonoDepthSpan)( GLcontext *ctx,
-                                     struct gl_renderbuffer *rb,
-                                     GLuint n, GLint x, GLint y,
-                                     const void *value,
-                                     const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLuint depth = *((GLuint *) value);
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_DEPTH_VARS;
-
-	 y = Y_FLIP( y );
-
-	 HW_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN( x, y, n, x1, n1, i );
-
-	       if ( DBG ) fprintf( stderr, "%s %d..%d (x1 %d) = %u\n",
-				   __FUNCTION__, (int)i, (int)n1, (int)x1, (GLuint)depth );
-
-	       if ( mask ) {
-		  for ( ; n1>0 ; i++, x1++, n1-- ) {
-		     if ( mask[i] ) WRITE_DEPTH( x1, y, depth );
-		  }
-	       } else {
-		  for ( ; n1>0 ; x1++, n1-- ) {
-		     WRITE_DEPTH( x1, y, depth );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-#endif
-
-
-static void TAG(WriteDepthPixels)( GLcontext *ctx,
-                                   struct gl_renderbuffer *rb,
-				   GLuint n,
-				   const GLint x[],
-				   const GLint y[],
-				   const void *values,
-				   const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const VALUE_TYPE *depth = (const VALUE_TYPE *) values;
-	 GLuint i;
-	 LOCAL_DEPTH_VARS;
-
-	 if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" );
-
-#if HAVE_HW_DEPTH_PIXELS
-	 (void) i;
-
-	 WRITE_DEPTH_PIXELS();
-#else
-	 HW_CLIPLOOP()
-	    {
-	       if ( mask ) {
-		  for ( i = 0 ; i < n ; i++ ) {
-		     if ( mask[i] ) {
-			const int fy = Y_FLIP( y[i] );
-			if ( CLIPPIXEL( x[i], fy ) )
-			   WRITE_DEPTH( x[i], fy, depth[i] );
-		     }
-		  }
-	       }
-	       else {
-		  for ( i = 0 ; i < n ; i++ ) {
-		     const int fy = Y_FLIP( y[i] );
-		     if ( CLIPPIXEL( x[i], fy ) )
-			WRITE_DEPTH( x[i], fy, depth[i] );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-/* Read depth spans and pixels
- */
-static void TAG(ReadDepthSpan)( GLcontext *ctx,
-                                struct gl_renderbuffer *rb,
-				GLuint n, GLint x, GLint y,
-				void *values )
-{
-   HW_READ_LOCK()
-      {
-         VALUE_TYPE *depth = (VALUE_TYPE *) values;
-	 GLint x1, n1;
-	 LOCAL_DEPTH_VARS;
-
-	 y = Y_FLIP( y );
-
-	 if ( DBG ) fprintf( stderr, "ReadDepthSpan\n" );
-
-#if HAVE_HW_DEPTH_SPANS
-	 (void) x1; (void) n1;
-
-	 READ_DEPTH_SPAN();
-#else
-	 HW_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN( x, y, n, x1, n1, i );
-	       for ( ; n1>0 ; i++, n1-- ) {
-		  READ_DEPTH( depth[i], x+i, y );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif
-      }
-   HW_READ_UNLOCK();
-}
-
-static void TAG(ReadDepthPixels)( GLcontext *ctx,
-                                  struct gl_renderbuffer *rb,
-                                  GLuint n,
-				  const GLint x[], const GLint y[],
-				  void *values )
-{
-   HW_READ_LOCK()
-      {
-         VALUE_TYPE *depth = (VALUE_TYPE *) values;
-	 GLuint i;
-	 LOCAL_DEPTH_VARS;
-
-	 if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" );
-
-#if HAVE_HW_DEPTH_PIXELS
-	 (void) i;
-
-	 READ_DEPTH_PIXELS();
-#else
-	 HW_CLIPLOOP()
-	    {
-	       for ( i = 0 ; i < n ;i++ ) {
-		  int fy = Y_FLIP( y[i] );
-		  if ( CLIPPIXEL( x[i], fy ) )
-		     READ_DEPTH( depth[i], x[i], fy );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif
-      }
-   HW_READ_UNLOCK();
-}
-
-
-/**
- * Initialize the given renderbuffer's span routines to point to
- * the depth/z functions we generated above.
- */
-static void TAG(InitDepthPointers)(struct gl_renderbuffer *rb)
-{
-   rb->GetRow = TAG(ReadDepthSpan);
-   rb->GetValues = TAG(ReadDepthPixels);
-   rb->PutRow = TAG(WriteDepthSpan);
-   rb->PutRowRGB = NULL;
-   rb->PutMonoRow = TAG(WriteMonoDepthSpan);
-   rb->PutValues = TAG(WriteDepthPixels);
-   rb->PutMonoValues = NULL;
-}
-
-
-#if HAVE_HW_DEPTH_SPANS
-#undef WRITE_DEPTH_SPAN
-#undef WRITE_DEPTH_PIXELS
-#undef READ_DEPTH_SPAN
-#undef READ_DEPTH_PIXELS
-#else
-#undef WRITE_DEPTH
-#undef READ_DEPTH
-#endif
-#undef TAG
-#undef VALUE_TYPE
+

+/*

+ * Notes:

+ * 1. These functions plug into the gl_renderbuffer structure.

+ * 2. The 'values' parameter always points to GLuint values, regardless of

+ *    the actual Z buffer depth.

+ */

+

+

+#include "spantmp_common.h"

+

+#ifndef DBG

+#define DBG 0

+#endif

+

+#ifndef HAVE_HW_DEPTH_SPANS

+#define HAVE_HW_DEPTH_SPANS 0

+#endif

+

+#ifndef HAVE_HW_DEPTH_PIXELS

+#define HAVE_HW_DEPTH_PIXELS 0

+#endif

+

+static void TAG(WriteDepthSpan)( struct gl_context *ctx,

+                                 struct gl_renderbuffer *rb,

+                                 GLuint n, GLint x, GLint y,

+				 const void *values,

+				 const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const VALUE_TYPE *depth = (const VALUE_TYPE *) values;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_DEPTH_VARS;

+

+	 y = Y_FLIP( y );

+

+#if HAVE_HW_DEPTH_SPANS

+	 (void) x1; (void) n1;

+

+	 if ( DBG ) fprintf( stderr, "WriteDepthSpan 0..%d (x1 %d)\n",

+			     (int)n, (int)x );

+

+	 WRITE_DEPTH_SPAN();

+#else

+	 HW_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN( x, y, n, x1, n1, i );

+

+	       if ( DBG ) fprintf( stderr, "WriteDepthSpan %d..%d (x1 %d) (mask %p)\n",

+				   (int)i, (int)n1, (int)x1, mask );

+

+	       if ( mask ) {

+		  for ( ; n1>0 ; i++, x1++, n1-- ) {

+		     if ( mask[i] ) WRITE_DEPTH( x1, y, depth[i] );

+		  }

+	       } else {

+		  for ( ; n1>0 ; i++, x1++, n1-- ) {

+		     WRITE_DEPTH( x1, y, depth[i] );

+		  }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+#if HAVE_HW_DEPTH_SPANS

+/* implement MonoWriteDepthSpan() in terms of WriteDepthSpan() */

+static void

+TAG(WriteMonoDepthSpan)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                         GLuint n, GLint x, GLint y,

+                         const void *value, const GLubyte mask[] )

+{

+   const GLuint depthVal = *((GLuint *) value);

+   GLuint depths[MAX_WIDTH];

+   GLuint i;

+   for (i = 0; i < n; i++)

+      depths[i] = depthVal;

+   TAG(WriteDepthSpan)(ctx, rb, n, x, y, depths, mask);

+}

+#else

+static void TAG(WriteMonoDepthSpan)( struct gl_context *ctx,

+                                     struct gl_renderbuffer *rb,

+                                     GLuint n, GLint x, GLint y,

+                                     const void *value,

+                                     const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLuint depth = *((GLuint *) value);

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_DEPTH_VARS;

+

+	 y = Y_FLIP( y );

+

+	 HW_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN( x, y, n, x1, n1, i );

+

+	       if ( DBG ) fprintf( stderr, "%s %d..%d (x1 %d) = %u\n",

+				   __FUNCTION__, (int)i, (int)n1, (int)x1, (GLuint)depth );

+

+	       if ( mask ) {

+		  for ( ; n1>0 ; i++, x1++, n1-- ) {

+		     if ( mask[i] ) WRITE_DEPTH( x1, y, depth );

+		  }

+	       } else {

+		  for ( ; n1>0 ; x1++, n1-- ) {

+		     WRITE_DEPTH( x1, y, depth );

+		  }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+#endif

+

+

+static void TAG(WriteDepthPixels)( struct gl_context *ctx,

+                                   struct gl_renderbuffer *rb,

+				   GLuint n,

+				   const GLint x[],

+				   const GLint y[],

+				   const void *values,

+				   const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const VALUE_TYPE *depth = (const VALUE_TYPE *) values;

+	 GLuint i;

+	 LOCAL_DEPTH_VARS;

+

+	 if ( DBG ) fprintf( stderr, "WriteDepthPixels\n" );

+

+#if HAVE_HW_DEPTH_PIXELS

+	 (void) i;

+

+	 WRITE_DEPTH_PIXELS();

+#else

+	 HW_CLIPLOOP()

+	    {

+	       if ( mask ) {

+		  for ( i = 0 ; i < n ; i++ ) {

+		     if ( mask[i] ) {

+			const int fy = Y_FLIP( y[i] );

+			if ( CLIPPIXEL( x[i], fy ) )

+			   WRITE_DEPTH( x[i], fy, depth[i] );

+		     }

+		  }

+	       }

+	       else {

+		  for ( i = 0 ; i < n ; i++ ) {

+		     const int fy = Y_FLIP( y[i] );

+		     if ( CLIPPIXEL( x[i], fy ) )

+			WRITE_DEPTH( x[i], fy, depth[i] );

+		  }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+/* Read depth spans and pixels

+ */

+static void TAG(ReadDepthSpan)( struct gl_context *ctx,

+                                struct gl_renderbuffer *rb,

+				GLuint n, GLint x, GLint y,

+				void *values )

+{

+   HW_READ_LOCK()

+      {

+         VALUE_TYPE *depth = (VALUE_TYPE *) values;

+	 GLint x1, n1;

+	 LOCAL_DEPTH_VARS;

+

+	 y = Y_FLIP( y );

+

+	 if ( DBG ) fprintf( stderr, "ReadDepthSpan\n" );

+

+#if HAVE_HW_DEPTH_SPANS

+	 (void) x1; (void) n1;

+

+	 READ_DEPTH_SPAN();

+#else

+	 HW_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN( x, y, n, x1, n1, i );

+	       for ( ; n1>0 ; i++, n1-- ) {

+		  READ_DEPTH( depth[i], x+i, y );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif

+      }

+   HW_READ_UNLOCK();

+}

+

+static void TAG(ReadDepthPixels)( struct gl_context *ctx,

+                                  struct gl_renderbuffer *rb,

+                                  GLuint n,

+				  const GLint x[], const GLint y[],

+				  void *values )

+{

+   HW_READ_LOCK()

+      {

+         VALUE_TYPE *depth = (VALUE_TYPE *) values;

+	 GLuint i;

+	 LOCAL_DEPTH_VARS;

+

+	 if ( DBG ) fprintf( stderr, "ReadDepthPixels\n" );

+

+#if HAVE_HW_DEPTH_PIXELS

+	 (void) i;

+

+	 READ_DEPTH_PIXELS();

+#else

+	 HW_CLIPLOOP()

+	    {

+	       for ( i = 0 ; i < n ;i++ ) {

+		  int fy = Y_FLIP( y[i] );

+		  if ( CLIPPIXEL( x[i], fy ) )

+		     READ_DEPTH( depth[i], x[i], fy );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif

+      }

+   HW_READ_UNLOCK();

+}

+

+

+/**

+ * Initialize the given renderbuffer's span routines to point to

+ * the depth/z functions we generated above.

+ */

+static void TAG(InitDepthPointers)(struct gl_renderbuffer *rb)

+{

+   rb->GetRow = TAG(ReadDepthSpan);

+   rb->GetValues = TAG(ReadDepthPixels);

+   rb->PutRow = TAG(WriteDepthSpan);

+   rb->PutRowRGB = NULL;

+   rb->PutMonoRow = TAG(WriteMonoDepthSpan);

+   rb->PutValues = TAG(WriteDepthPixels);

+   rb->PutMonoValues = NULL;

+}

+

+

+#if HAVE_HW_DEPTH_SPANS

+#undef WRITE_DEPTH_SPAN

+#undef WRITE_DEPTH_PIXELS

+#undef READ_DEPTH_SPAN

+#undef READ_DEPTH_PIXELS

+#else

+#undef WRITE_DEPTH

+#undef READ_DEPTH

+#endif

+#undef TAG

+#undef VALUE_TYPE

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
index a2f404b61..e259f11df 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
@@ -1,291 +1,291 @@
-/**************************************************************************
- *
- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright 2009 Intel Corporation.
- * 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/arbprogram.h"
-#include "main/arrayobj.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/enable.h"
-#include "main/matrix.h"
-#include "main/texstate.h"
-#include "main/varray.h"
-#include "main/viewport.h"
-#include "program/program.h"
-#include "dri_metaops.h"
-
-void
-meta_set_passthrough_transform(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   meta->saved_vp_x = ctx->Viewport.X;
-   meta->saved_vp_y = ctx->Viewport.Y;
-   meta->saved_vp_width = ctx->Viewport.Width;
-   meta->saved_vp_height = ctx->Viewport.Height;
-   meta->saved_matrix_mode = ctx->Transform.MatrixMode;
-
-   meta->internal_viewport_call = GL_TRUE;
-   _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);
-   meta->internal_viewport_call = GL_FALSE;
-
-   _mesa_MatrixMode(GL_PROJECTION);
-   _mesa_PushMatrix();
-   _mesa_LoadIdentity();
-   _mesa_Ortho(0, ctx->DrawBuffer->Width, 0, ctx->DrawBuffer->Height, 1, -1);
-
-   _mesa_MatrixMode(GL_MODELVIEW);
-   _mesa_PushMatrix();
-   _mesa_LoadIdentity();
-}
-
-void
-meta_restore_transform(struct dri_metaops *meta)
-{
-   _mesa_MatrixMode(GL_PROJECTION);
-   _mesa_PopMatrix();
-   _mesa_MatrixMode(GL_MODELVIEW);
-   _mesa_PopMatrix();
-
-   _mesa_MatrixMode(meta->saved_matrix_mode);
-
-   meta->internal_viewport_call = GL_TRUE;
-   _mesa_Viewport(meta->saved_vp_x, meta->saved_vp_y,
-		  meta->saved_vp_width, meta->saved_vp_height);
-   meta->internal_viewport_call = GL_FALSE;
-}
-
-
-/**
- * Set up a vertex program to pass through the position and first texcoord
- * for pixel path.
- */
-void
-meta_set_passthrough_vertex_program(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-   static const char *vp =
-      "!!ARBvp1.0\n"
-      "TEMP vertexClip;\n"
-      "DP4 vertexClip.x, state.matrix.mvp.row[0], vertex.position;\n"
-      "DP4 vertexClip.y, state.matrix.mvp.row[1], vertex.position;\n"
-      "DP4 vertexClip.z, state.matrix.mvp.row[2], vertex.position;\n"
-      "DP4 vertexClip.w, state.matrix.mvp.row[3], vertex.position;\n"
-      "MOV result.position, vertexClip;\n"
-      "MOV result.texcoord[0], vertex.texcoord[0];\n"
-      "MOV result.color, vertex.color;\n"
-      "END\n";
-
-   assert(meta->saved_vp == NULL);
-
-   _mesa_reference_vertprog(ctx, &meta->saved_vp,
-			    ctx->VertexProgram.Current);
-   if (meta->passthrough_vp == NULL) {
-      GLuint prog_name;
-      _mesa_GenPrograms(1, &prog_name);
-      _mesa_BindProgram(GL_VERTEX_PROGRAM_ARB, prog_name);
-      _mesa_ProgramStringARB(GL_VERTEX_PROGRAM_ARB,
-			     GL_PROGRAM_FORMAT_ASCII_ARB,
-			     strlen(vp), (const GLubyte *)vp);
-      _mesa_reference_vertprog(ctx, &meta->passthrough_vp,
-			       ctx->VertexProgram.Current);
-      _mesa_DeletePrograms(1, &prog_name);
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-			    meta->passthrough_vp);
-   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-			   &meta->passthrough_vp->Base);
-
-   meta->saved_vp_enable = ctx->VertexProgram.Enabled;
-   _mesa_Enable(GL_VERTEX_PROGRAM_ARB);
-}
-
-/**
- * Restores the previous vertex program after
- * meta_set_passthrough_vertex_program()
- */
-void
-meta_restore_vertex_program(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-			    meta->saved_vp);
-   _mesa_reference_vertprog(ctx, &meta->saved_vp, NULL);
-   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-			   &ctx->VertexProgram.Current->Base);
-
-   if (!meta->saved_vp_enable)
-      _mesa_Disable(GL_VERTEX_PROGRAM_ARB);
-}
-
-/**
- * Binds the given program string to GL_FRAGMENT_PROGRAM_ARB, caching the
- * program object.
- */
-void
-meta_set_fragment_program(struct dri_metaops *meta,
-			  struct gl_fragment_program **prog,
-			  const char *prog_string)
-{
-   GLcontext *ctx = meta->ctx;
-   assert(meta->saved_fp == NULL);
-
-   _mesa_reference_fragprog(ctx, &meta->saved_fp,
-			    ctx->FragmentProgram.Current);
-   if (*prog == NULL) {
-      GLuint prog_name;
-      _mesa_GenPrograms(1, &prog_name);
-      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, prog_name);
-      _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,
-			     GL_PROGRAM_FORMAT_ASCII_ARB,
-			     strlen(prog_string), (const GLubyte *)prog_string);
-      _mesa_reference_fragprog(ctx, prog, ctx->FragmentProgram.Current);
-      /* Note that DeletePrograms unbinds the program on us */
-      _mesa_DeletePrograms(1, &prog_name);
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, *prog);
-   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, &((*prog)->Base));
-
-   meta->saved_fp_enable = ctx->FragmentProgram.Enabled;
-   _mesa_Enable(GL_FRAGMENT_PROGRAM_ARB);
-}
-
-/**
- * Restores the previous fragment program after
- * meta_set_fragment_program()
- */
-void
-meta_restore_fragment_program(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-			    meta->saved_fp);
-   _mesa_reference_fragprog(ctx, &meta->saved_fp, NULL);
-   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
-			   &ctx->FragmentProgram.Current->Base);
-
-   if (!meta->saved_fp_enable)
-      _mesa_Disable(GL_FRAGMENT_PROGRAM_ARB);
-}
-
-static const float default_texcoords[4][2] = { { 0.0, 0.0 },
-					       { 1.0, 0.0 },
-					       { 1.0, 1.0 },
-					       { 0.0, 1.0 } };
-
-void
-meta_set_default_texrect(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-   struct gl_client_array *old_texcoord_array;
-
-   meta->saved_active_texture = ctx->Texture.CurrentUnit;
-   if (meta->saved_array_vbo == NULL) {
-      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo,
-				    ctx->Array.ArrayBufferObj);
-   }
-
-   old_texcoord_array = &ctx->Array.ArrayObj->TexCoord[0];
-   meta->saved_texcoord_type = old_texcoord_array->Type;
-   meta->saved_texcoord_size = old_texcoord_array->Size;
-   meta->saved_texcoord_stride = old_texcoord_array->Stride;
-   meta->saved_texcoord_enable = old_texcoord_array->Enabled;
-   meta->saved_texcoord_ptr = old_texcoord_array->Ptr;
-   _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo,
-				 old_texcoord_array->BufferObj);
-
-   _mesa_ClientActiveTextureARB(GL_TEXTURE0);
-
-   if (meta->texcoord_vbo == NULL) {
-      GLuint vbo_name;
-
-      _mesa_GenBuffersARB(1, &vbo_name);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo_name);
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(default_texcoords),
-			  default_texcoords, GL_STATIC_DRAW_ARB);
-      _mesa_reference_buffer_object(ctx, &meta->texcoord_vbo,
-				    ctx->Array.ArrayBufferObj);
-   } else {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-			  meta->texcoord_vbo->Name);
-   }
-   _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), NULL);
-
-   _mesa_Enable(GL_TEXTURE_COORD_ARRAY);
-}
-
-void
-meta_restore_texcoords(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   /* Restore the old TexCoordPointer */
-   if (meta->saved_texcoord_vbo) {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-			  meta->saved_texcoord_vbo->Name);
-      _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo, NULL);
-   } else {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-   }
-
-   _mesa_TexCoordPointer(meta->saved_texcoord_size,
-			 meta->saved_texcoord_type,
-			 meta->saved_texcoord_stride,
-			 meta->saved_texcoord_ptr);
-   if (!meta->saved_texcoord_enable)
-      _mesa_Disable(GL_TEXTURE_COORD_ARRAY);
-
-   _mesa_ClientActiveTextureARB(GL_TEXTURE0 +
-				meta->saved_active_texture);
-
-   if (meta->saved_array_vbo) {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-			  meta->saved_array_vbo->Name);
-      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo, NULL);
-   } else {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-   }
-}
-
-
-void meta_init_metaops(GLcontext *ctx, struct dri_metaops *meta)
-{
-   meta->ctx = ctx;
-}
-
-void meta_destroy_metaops(struct dri_metaops *meta)
-{
-
-}
+/**************************************************************************

+ *

+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright 2009 Intel Corporation.

+ * 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/arbprogram.h"

+#include "main/arrayobj.h"

+#include "main/bufferobj.h"

+#include "main/context.h"

+#include "main/enable.h"

+#include "main/matrix.h"

+#include "main/texstate.h"

+#include "main/varray.h"

+#include "main/viewport.h"

+#include "program/program.h"

+#include "dri_metaops.h"

+

+void

+meta_set_passthrough_transform(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   meta->saved_vp_x = ctx->Viewport.X;

+   meta->saved_vp_y = ctx->Viewport.Y;

+   meta->saved_vp_width = ctx->Viewport.Width;

+   meta->saved_vp_height = ctx->Viewport.Height;

+   meta->saved_matrix_mode = ctx->Transform.MatrixMode;

+

+   meta->internal_viewport_call = GL_TRUE;

+   _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);

+   meta->internal_viewport_call = GL_FALSE;

+

+   _mesa_MatrixMode(GL_PROJECTION);

+   _mesa_PushMatrix();

+   _mesa_LoadIdentity();

+   _mesa_Ortho(0, ctx->DrawBuffer->Width, 0, ctx->DrawBuffer->Height, 1, -1);

+

+   _mesa_MatrixMode(GL_MODELVIEW);

+   _mesa_PushMatrix();

+   _mesa_LoadIdentity();

+}

+

+void

+meta_restore_transform(struct dri_metaops *meta)

+{

+   _mesa_MatrixMode(GL_PROJECTION);

+   _mesa_PopMatrix();

+   _mesa_MatrixMode(GL_MODELVIEW);

+   _mesa_PopMatrix();

+

+   _mesa_MatrixMode(meta->saved_matrix_mode);

+

+   meta->internal_viewport_call = GL_TRUE;

+   _mesa_Viewport(meta->saved_vp_x, meta->saved_vp_y,

+		  meta->saved_vp_width, meta->saved_vp_height);

+   meta->internal_viewport_call = GL_FALSE;

+}

+

+

+/**

+ * Set up a vertex program to pass through the position and first texcoord

+ * for pixel path.

+ */

+void

+meta_set_passthrough_vertex_program(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+   static const char *vp =

+      "!!ARBvp1.0\n"

+      "TEMP vertexClip;\n"

+      "DP4 vertexClip.x, state.matrix.mvp.row[0], vertex.position;\n"

+      "DP4 vertexClip.y, state.matrix.mvp.row[1], vertex.position;\n"

+      "DP4 vertexClip.z, state.matrix.mvp.row[2], vertex.position;\n"

+      "DP4 vertexClip.w, state.matrix.mvp.row[3], vertex.position;\n"

+      "MOV result.position, vertexClip;\n"

+      "MOV result.texcoord[0], vertex.texcoord[0];\n"

+      "MOV result.color, vertex.color;\n"

+      "END\n";

+

+   assert(meta->saved_vp == NULL);

+

+   _mesa_reference_vertprog(ctx, &meta->saved_vp,

+			    ctx->VertexProgram.Current);

+   if (meta->passthrough_vp == NULL) {

+      GLuint prog_name;

+      _mesa_GenPrograms(1, &prog_name);

+      _mesa_BindProgram(GL_VERTEX_PROGRAM_ARB, prog_name);

+      _mesa_ProgramStringARB(GL_VERTEX_PROGRAM_ARB,

+			     GL_PROGRAM_FORMAT_ASCII_ARB,

+			     strlen(vp), (const GLubyte *)vp);

+      _mesa_reference_vertprog(ctx, &meta->passthrough_vp,

+			       ctx->VertexProgram.Current);

+      _mesa_DeletePrograms(1, &prog_name);

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

+			    meta->passthrough_vp);

+   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

+			   &meta->passthrough_vp->Base);

+

+   meta->saved_vp_enable = ctx->VertexProgram.Enabled;

+   _mesa_Enable(GL_VERTEX_PROGRAM_ARB);

+}

+

+/**

+ * Restores the previous vertex program after

+ * meta_set_passthrough_vertex_program()

+ */

+void

+meta_restore_vertex_program(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

+			    meta->saved_vp);

+   _mesa_reference_vertprog(ctx, &meta->saved_vp, NULL);

+   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

+			   &ctx->VertexProgram.Current->Base);

+

+   if (!meta->saved_vp_enable)

+      _mesa_Disable(GL_VERTEX_PROGRAM_ARB);

+}

+

+/**

+ * Binds the given program string to GL_FRAGMENT_PROGRAM_ARB, caching the

+ * program object.

+ */

+void

+meta_set_fragment_program(struct dri_metaops *meta,

+			  struct gl_fragment_program **prog,

+			  const char *prog_string)

+{

+   struct gl_context *ctx = meta->ctx;

+   assert(meta->saved_fp == NULL);

+

+   _mesa_reference_fragprog(ctx, &meta->saved_fp,

+			    ctx->FragmentProgram.Current);

+   if (*prog == NULL) {

+      GLuint prog_name;

+      _mesa_GenPrograms(1, &prog_name);

+      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, prog_name);

+      _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,

+			     GL_PROGRAM_FORMAT_ASCII_ARB,

+			     strlen(prog_string), (const GLubyte *)prog_string);

+      _mesa_reference_fragprog(ctx, prog, ctx->FragmentProgram.Current);

+      /* Note that DeletePrograms unbinds the program on us */

+      _mesa_DeletePrograms(1, &prog_name);

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, *prog);

+   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, &((*prog)->Base));

+

+   meta->saved_fp_enable = ctx->FragmentProgram.Enabled;

+   _mesa_Enable(GL_FRAGMENT_PROGRAM_ARB);

+}

+

+/**

+ * Restores the previous fragment program after

+ * meta_set_fragment_program()

+ */

+void

+meta_restore_fragment_program(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

+			    meta->saved_fp);

+   _mesa_reference_fragprog(ctx, &meta->saved_fp, NULL);

+   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,

+			   &ctx->FragmentProgram.Current->Base);

+

+   if (!meta->saved_fp_enable)

+      _mesa_Disable(GL_FRAGMENT_PROGRAM_ARB);

+}

+

+static const float default_texcoords[4][2] = { { 0.0, 0.0 },

+					       { 1.0, 0.0 },

+					       { 1.0, 1.0 },

+					       { 0.0, 1.0 } };

+

+void

+meta_set_default_texrect(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+   struct gl_client_array *old_texcoord_array;

+

+   meta->saved_active_texture = ctx->Texture.CurrentUnit;

+   if (meta->saved_array_vbo == NULL) {

+      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo,

+				    ctx->Array.ArrayBufferObj);

+   }

+

+   old_texcoord_array = &ctx->Array.ArrayObj->TexCoord[0];

+   meta->saved_texcoord_type = old_texcoord_array->Type;

+   meta->saved_texcoord_size = old_texcoord_array->Size;

+   meta->saved_texcoord_stride = old_texcoord_array->Stride;

+   meta->saved_texcoord_enable = old_texcoord_array->Enabled;

+   meta->saved_texcoord_ptr = old_texcoord_array->Ptr;

+   _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo,

+				 old_texcoord_array->BufferObj);

+

+   _mesa_ClientActiveTextureARB(GL_TEXTURE0);

+

+   if (meta->texcoord_vbo == NULL) {

+      GLuint vbo_name;

+

+      _mesa_GenBuffersARB(1, &vbo_name);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo_name);

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(default_texcoords),

+			  default_texcoords, GL_STATIC_DRAW_ARB);

+      _mesa_reference_buffer_object(ctx, &meta->texcoord_vbo,

+				    ctx->Array.ArrayBufferObj);

+   } else {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+			  meta->texcoord_vbo->Name);

+   }

+   _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), NULL);

+

+   _mesa_Enable(GL_TEXTURE_COORD_ARRAY);

+}

+

+void

+meta_restore_texcoords(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   /* Restore the old TexCoordPointer */

+   if (meta->saved_texcoord_vbo) {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+			  meta->saved_texcoord_vbo->Name);

+      _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo, NULL);

+   } else {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

+   }

+

+   _mesa_TexCoordPointer(meta->saved_texcoord_size,

+			 meta->saved_texcoord_type,

+			 meta->saved_texcoord_stride,

+			 meta->saved_texcoord_ptr);

+   if (!meta->saved_texcoord_enable)

+      _mesa_Disable(GL_TEXTURE_COORD_ARRAY);

+

+   _mesa_ClientActiveTextureARB(GL_TEXTURE0 +

+				meta->saved_active_texture);

+

+   if (meta->saved_array_vbo) {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+			  meta->saved_array_vbo->Name);

+      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo, NULL);

+   } else {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

+   }

+}

+

+

+void meta_init_metaops(struct gl_context *ctx, struct dri_metaops *meta)

+{

+   meta->ctx = ctx;

+}

+

+void meta_destroy_metaops(struct dri_metaops *meta)

+{

+

+}

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_metaops.h b/mesalib/src/mesa/drivers/dri/common/dri_metaops.h
index 248714532..e72094e62 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_metaops.h
+++ b/mesalib/src/mesa/drivers/dri/common/dri_metaops.h
@@ -1,81 +1,81 @@
-/**************************************************************************
- *
- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright 2009 Intel Corporation.
- * 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 DRI_METAOPS_H
-#define DRI_METAOPS_H
-
-
-struct dri_metaops {
-    GLcontext *ctx;
-    GLboolean internal_viewport_call;
-    struct gl_fragment_program *bitmap_fp;
-    struct gl_vertex_program *passthrough_vp;
-    struct gl_buffer_object *texcoord_vbo;
-    
-    struct gl_fragment_program *saved_fp;
-    GLboolean saved_fp_enable;
-    struct gl_vertex_program *saved_vp;
-    GLboolean saved_vp_enable;
-
-    struct gl_fragment_program *tex2d_fp;
-    
-    GLboolean saved_texcoord_enable;
-    struct gl_buffer_object *saved_array_vbo, *saved_texcoord_vbo;
-    GLenum saved_texcoord_type;
-    GLsizei saved_texcoord_size, saved_texcoord_stride;
-    const void *saved_texcoord_ptr;
-    int saved_active_texture;
-
-    GLint saved_vp_x, saved_vp_y;
-    GLsizei saved_vp_width, saved_vp_height;
-    GLenum saved_matrix_mode;
-};
-
-
-void meta_set_passthrough_transform(struct dri_metaops *meta);
-
-void meta_restore_transform(struct dri_metaops *meta);
-
-void meta_set_passthrough_vertex_program(struct dri_metaops *meta);
-
-void meta_restore_vertex_program(struct dri_metaops *meta);
-
-void meta_set_fragment_program(struct dri_metaops *meta,
-			  struct gl_fragment_program **prog,
-			  const char *prog_string);
-
-void meta_restore_fragment_program(struct dri_metaops *meta);
-
-void meta_set_default_texrect(struct dri_metaops *meta);
-
-void meta_restore_texcoords(struct dri_metaops *meta);
-
-void meta_init_metaops(GLcontext *ctx, struct dri_metaops *meta);
-void meta_destroy_metaops(struct dri_metaops *meta);
-
-#endif
+/**************************************************************************

+ *

+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright 2009 Intel Corporation.

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

+#define DRI_METAOPS_H

+

+

+struct dri_metaops {

+    struct gl_context *ctx;

+    GLboolean internal_viewport_call;

+    struct gl_fragment_program *bitmap_fp;

+    struct gl_vertex_program *passthrough_vp;

+    struct gl_buffer_object *texcoord_vbo;

+    

+    struct gl_fragment_program *saved_fp;

+    GLboolean saved_fp_enable;

+    struct gl_vertex_program *saved_vp;

+    GLboolean saved_vp_enable;

+

+    struct gl_fragment_program *tex2d_fp;

+    

+    GLboolean saved_texcoord_enable;

+    struct gl_buffer_object *saved_array_vbo, *saved_texcoord_vbo;

+    GLenum saved_texcoord_type;

+    GLsizei saved_texcoord_size, saved_texcoord_stride;

+    const void *saved_texcoord_ptr;

+    int saved_active_texture;

+

+    GLint saved_vp_x, saved_vp_y;

+    GLsizei saved_vp_width, saved_vp_height;

+    GLenum saved_matrix_mode;

+};

+

+

+void meta_set_passthrough_transform(struct dri_metaops *meta);

+

+void meta_restore_transform(struct dri_metaops *meta);

+

+void meta_set_passthrough_vertex_program(struct dri_metaops *meta);

+

+void meta_restore_vertex_program(struct dri_metaops *meta);

+

+void meta_set_fragment_program(struct dri_metaops *meta,

+			  struct gl_fragment_program **prog,

+			  const char *prog_string);

+

+void meta_restore_fragment_program(struct dri_metaops *meta);

+

+void meta_set_default_texrect(struct dri_metaops *meta);

+

+void meta_restore_texcoords(struct dri_metaops *meta);

+

+void meta_init_metaops(struct gl_context *ctx, struct dri_metaops *meta);

+void meta_destroy_metaops(struct dri_metaops *meta);

+

+#endif

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index d46f622d5..3bf782a1b 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -1,1010 +1,1009 @@
-/**
- * \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,
-					renderType == GLX_PIXMAP_BIT)) {
-       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 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 __GLcontextModes *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 __GLcontextModes 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;
-
-    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
-};
-
-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 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;

+

+    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

+};

+

+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 785beacd8..b6f04993e 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.h
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.h
@@ -1,558 +1,557 @@
-/*
- * 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/glcore.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 __GLcontextModes *glVis,
-			       __DRIcontext *driContextPriv,
-                               void *sharedContextPrivate);
-
-    /**
-     * Context destruction callback
-     */
-    void (*DestroyContext)(__DRIcontext *driContextPriv);
-
-    /**
-     * Buffer (drawable) creation callback
-     */
-    GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,
-                              __DRIdrawable *driDrawPriv,
-                              const __GLcontextModes *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);
-};
-
-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);

+};

+

+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/drirenderbuffer.c b/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.c
index c9ce6e3cb..5e032bd15 100644
--- a/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.c
+++ b/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.c
@@ -1,200 +1,200 @@
-
-#include "main/mtypes.h"
-#include "main/formats.h"
-#include "main/renderbuffer.h"
-#include "main/imports.h"
-#include "drirenderbuffer.h"
-
-
-/**
- * This will get called when a window (gl_framebuffer) is resized (probably
- * via driUpdateFramebufferSize(), below).
- * Just update width, height and internal format fields for now.
- * There's usually no memory allocation above because the present
- * DRI drivers use statically-allocated full-screen buffers. If that's not
- * the case for a DRI driver, a different AllocStorage method should
- * be used.
- */
-static GLboolean
-driRenderbufferStorage(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       GLenum internalFormat, GLuint width, GLuint height)
-{
-   rb->Width = width;
-   rb->Height = height;
-   rb->InternalFormat = internalFormat;
-   return GL_TRUE;
-}
-
-
-static void
-driDeleteRenderbuffer(struct gl_renderbuffer *rb)
-{
-   /* don't free rb->Data  Chances are it's a memory mapped region for
-    * the dri drivers.
-    */
-   free(rb);
-}
-
-
-/**
- * Allocate a new driRenderbuffer object.
- * Individual drivers are free to implement different versions of
- * this function.
- *
- * At this time, this function can only be used for window-system
- * renderbuffers, not user-created RBOs.
- *
- * \param format  Either GL_RGBA, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24,
- *                GL_DEPTH_COMPONENT32, or GL_STENCIL_INDEX8_EXT (for now).
- * \param addr  address in main memory of the buffer.  Probably a memory
- *              mapped region.
- * \param cpp  chars or bytes per pixel
- * \param offset  start of renderbuffer with respect to start of framebuffer
- * \param pitch   pixels per row
- */
-driRenderbuffer *
-driNewRenderbuffer(gl_format format, GLvoid *addr,
-                   GLint cpp, GLint offset, GLint pitch,
-                   __DRIdrawable *dPriv)
-{
-   driRenderbuffer *drb;
-
-   assert(cpp > 0);
-   assert(pitch > 0);
-
-   drb = calloc(1, sizeof(driRenderbuffer));
-   if (drb) {
-      const GLuint name = 0;
-
-      _mesa_init_renderbuffer(&drb->Base, name);
-
-      /* Make sure we're using a null-valued GetPointer routine */
-      assert(drb->Base.GetPointer(NULL, &drb->Base, 0, 0) == NULL);
-
-      switch (format) {
-      case MESA_FORMAT_ARGB8888:
-         if (cpp == 2) {
-            /* override format */
-            format = MESA_FORMAT_RGB565;
-         }
-         drb->Base.DataType = GL_UNSIGNED_BYTE;
-         break;
-      case MESA_FORMAT_Z16:
-         /* Depth */
-         /* we always Get/Put 32-bit Z values */
-         drb->Base.DataType = GL_UNSIGNED_INT;
-         assert(cpp == 2);
-         break;
-      case MESA_FORMAT_Z32:
-         /* Depth */
-         /* we always Get/Put 32-bit Z values */
-         drb->Base.DataType = GL_UNSIGNED_INT;
-         assert(cpp == 4);
-         break;
-      case MESA_FORMAT_Z24_S8:
-         drb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
-         assert(cpp == 4);
-         break;
-      case MESA_FORMAT_S8_Z24:
-         drb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
-         assert(cpp == 4);
-         break;
-      case MESA_FORMAT_S8:
-         /* Stencil */
-         drb->Base.DataType = GL_UNSIGNED_BYTE;
-         break;
-      default:
-         _mesa_problem(NULL, "Bad format 0x%x in driNewRenderbuffer", format);
-         return NULL;
-      }
-
-      drb->Base.Format = format;
-
-      drb->Base.InternalFormat =
-      drb->Base._BaseFormat = _mesa_get_format_base_format(format);
-
-      drb->Base.AllocStorage = driRenderbufferStorage;
-      drb->Base.Delete = driDeleteRenderbuffer;
-
-      drb->Base.Data = addr;
-
-      /* DRI renderbuffer-specific fields: */
-      drb->dPriv = dPriv;
-      drb->offset = offset;
-      drb->pitch = pitch;
-      drb->cpp = cpp;
-
-      /* may be changed if page flipping is active: */
-      drb->flippedOffset = offset;
-      drb->flippedPitch = pitch;
-      drb->flippedData = addr;
-   }
-   return drb;
-}
-
-
-/**
- * Update the front and back renderbuffers' flippedPitch/Offset/Data fields.
- * If stereo, flip both the left and right pairs.
- * This is used when we do double buffering via page flipping.
- * \param fb  the framebuffer we're page flipping
- * \param flipped  if true, set flipped values, else set non-flipped values
- */
-void
-driFlipRenderbuffers(struct gl_framebuffer *fb, GLboolean flipped)
-{
-   const GLuint count = fb->Visual.stereoMode ? 2 : 1;
-   GLuint lr; /* left or right */
-
-   /* we shouldn't really call this function if single-buffered, but
-    * play it safe.
-    */
-   if (!fb->Visual.doubleBufferMode)
-      return;
-
-   for (lr = 0; lr < count; lr++) {
-      GLuint frontBuf = (lr == 0) ? BUFFER_FRONT_LEFT : BUFFER_FRONT_RIGHT;
-      GLuint backBuf  = (lr == 0) ? BUFFER_BACK_LEFT  : BUFFER_BACK_RIGHT;
-      driRenderbuffer *front_drb
-         = (driRenderbuffer *) fb->Attachment[frontBuf].Renderbuffer;
-      driRenderbuffer *back_drb
-         = (driRenderbuffer *) fb->Attachment[backBuf].Renderbuffer;
-
-      if (flipped) {
-         front_drb->flippedOffset = back_drb->offset;
-         front_drb->flippedPitch  = back_drb->pitch;
-         front_drb->flippedData   = back_drb->Base.Data;
-         back_drb->flippedOffset  = front_drb->offset;
-         back_drb->flippedPitch   = front_drb->pitch;
-         back_drb->flippedData    = front_drb->Base.Data;
-      }
-      else {
-         front_drb->flippedOffset = front_drb->offset;
-         front_drb->flippedPitch  = front_drb->pitch;
-         front_drb->flippedData   = front_drb->Base.Data;
-         back_drb->flippedOffset  = back_drb->offset;
-         back_drb->flippedPitch   = back_drb->pitch;
-         back_drb->flippedData    = back_drb->Base.Data;
-      }
-   }
-}
-
-
-/**
- * Check that the gl_framebuffer associated with dPriv is the right size.
- * Resize the gl_framebuffer if needed.
- * It's expected that the dPriv->driverPrivate member points to a
- * gl_framebuffer object.
- */
-void
-driUpdateFramebufferSize(GLcontext *ctx, const __DRIdrawable *dPriv)
-{
-   struct gl_framebuffer *fb = (struct gl_framebuffer *) dPriv->driverPrivate;
-   if (fb && (dPriv->w != fb->Width || dPriv->h != fb->Height)) {
-      ctx->Driver.ResizeBuffers(ctx, fb, dPriv->w, dPriv->h);
-      /* if the driver needs the hw lock for ResizeBuffers, the drawable
-         might have changed again by now */
-      assert(fb->Width == dPriv->w);
-      assert(fb->Height == dPriv->h);
-   }
-}
+

+#include "main/mtypes.h"

+#include "main/formats.h"

+#include "main/renderbuffer.h"

+#include "main/imports.h"

+#include "drirenderbuffer.h"

+

+

+/**

+ * This will get called when a window (gl_framebuffer) is resized (probably

+ * via driUpdateFramebufferSize(), below).

+ * Just update width, height and internal format fields for now.

+ * There's usually no memory allocation above because the present

+ * DRI drivers use statically-allocated full-screen buffers. If that's not

+ * the case for a DRI driver, a different AllocStorage method should

+ * be used.

+ */

+static GLboolean

+driRenderbufferStorage(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLenum internalFormat, GLuint width, GLuint height)

+{

+   rb->Width = width;

+   rb->Height = height;

+   rb->InternalFormat = internalFormat;

+   return GL_TRUE;

+}

+

+

+static void

+driDeleteRenderbuffer(struct gl_renderbuffer *rb)

+{

+   /* don't free rb->Data  Chances are it's a memory mapped region for

+    * the dri drivers.

+    */

+   free(rb);

+}

+

+

+/**

+ * Allocate a new driRenderbuffer object.

+ * Individual drivers are free to implement different versions of

+ * this function.

+ *

+ * At this time, this function can only be used for window-system

+ * renderbuffers, not user-created RBOs.

+ *

+ * \param format  Either GL_RGBA, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24,

+ *                GL_DEPTH_COMPONENT32, or GL_STENCIL_INDEX8_EXT (for now).

+ * \param addr  address in main memory of the buffer.  Probably a memory

+ *              mapped region.

+ * \param cpp  chars or bytes per pixel

+ * \param offset  start of renderbuffer with respect to start of framebuffer

+ * \param pitch   pixels per row

+ */

+driRenderbuffer *

+driNewRenderbuffer(gl_format format, GLvoid *addr,

+                   GLint cpp, GLint offset, GLint pitch,

+                   __DRIdrawable *dPriv)

+{

+   driRenderbuffer *drb;

+

+   assert(cpp > 0);

+   assert(pitch > 0);

+

+   drb = calloc(1, sizeof(driRenderbuffer));

+   if (drb) {

+      const GLuint name = 0;

+

+      _mesa_init_renderbuffer(&drb->Base, name);

+

+      /* Make sure we're using a null-valued GetPointer routine */

+      assert(drb->Base.GetPointer(NULL, &drb->Base, 0, 0) == NULL);

+

+      switch (format) {

+      case MESA_FORMAT_ARGB8888:

+         if (cpp == 2) {

+            /* override format */

+            format = MESA_FORMAT_RGB565;

+         }

+         drb->Base.DataType = GL_UNSIGNED_BYTE;

+         break;

+      case MESA_FORMAT_Z16:

+         /* Depth */

+         /* we always Get/Put 32-bit Z values */

+         drb->Base.DataType = GL_UNSIGNED_INT;

+         assert(cpp == 2);

+         break;

+      case MESA_FORMAT_Z32:

+         /* Depth */

+         /* we always Get/Put 32-bit Z values */

+         drb->Base.DataType = GL_UNSIGNED_INT;

+         assert(cpp == 4);

+         break;

+      case MESA_FORMAT_Z24_S8:

+         drb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;

+         assert(cpp == 4);

+         break;

+      case MESA_FORMAT_S8_Z24:

+         drb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;

+         assert(cpp == 4);

+         break;

+      case MESA_FORMAT_S8:

+         /* Stencil */

+         drb->Base.DataType = GL_UNSIGNED_BYTE;

+         break;

+      default:

+         _mesa_problem(NULL, "Bad format 0x%x in driNewRenderbuffer", format);

+         return NULL;

+      }

+

+      drb->Base.Format = format;

+

+      drb->Base.InternalFormat =

+      drb->Base._BaseFormat = _mesa_get_format_base_format(format);

+

+      drb->Base.AllocStorage = driRenderbufferStorage;

+      drb->Base.Delete = driDeleteRenderbuffer;

+

+      drb->Base.Data = addr;

+

+      /* DRI renderbuffer-specific fields: */

+      drb->dPriv = dPriv;

+      drb->offset = offset;

+      drb->pitch = pitch;

+      drb->cpp = cpp;

+

+      /* may be changed if page flipping is active: */

+      drb->flippedOffset = offset;

+      drb->flippedPitch = pitch;

+      drb->flippedData = addr;

+   }

+   return drb;

+}

+

+

+/**

+ * Update the front and back renderbuffers' flippedPitch/Offset/Data fields.

+ * If stereo, flip both the left and right pairs.

+ * This is used when we do double buffering via page flipping.

+ * \param fb  the framebuffer we're page flipping

+ * \param flipped  if true, set flipped values, else set non-flipped values

+ */

+void

+driFlipRenderbuffers(struct gl_framebuffer *fb, GLboolean flipped)

+{

+   const GLuint count = fb->Visual.stereoMode ? 2 : 1;

+   GLuint lr; /* left or right */

+

+   /* we shouldn't really call this function if single-buffered, but

+    * play it safe.

+    */

+   if (!fb->Visual.doubleBufferMode)

+      return;

+

+   for (lr = 0; lr < count; lr++) {

+      GLuint frontBuf = (lr == 0) ? BUFFER_FRONT_LEFT : BUFFER_FRONT_RIGHT;

+      GLuint backBuf  = (lr == 0) ? BUFFER_BACK_LEFT  : BUFFER_BACK_RIGHT;

+      driRenderbuffer *front_drb

+         = (driRenderbuffer *) fb->Attachment[frontBuf].Renderbuffer;

+      driRenderbuffer *back_drb

+         = (driRenderbuffer *) fb->Attachment[backBuf].Renderbuffer;

+

+      if (flipped) {

+         front_drb->flippedOffset = back_drb->offset;

+         front_drb->flippedPitch  = back_drb->pitch;

+         front_drb->flippedData   = back_drb->Base.Data;

+         back_drb->flippedOffset  = front_drb->offset;

+         back_drb->flippedPitch   = front_drb->pitch;

+         back_drb->flippedData    = front_drb->Base.Data;

+      }

+      else {

+         front_drb->flippedOffset = front_drb->offset;

+         front_drb->flippedPitch  = front_drb->pitch;

+         front_drb->flippedData   = front_drb->Base.Data;

+         back_drb->flippedOffset  = back_drb->offset;

+         back_drb->flippedPitch   = back_drb->pitch;

+         back_drb->flippedData    = back_drb->Base.Data;

+      }

+   }

+}

+

+

+/**

+ * Check that the gl_framebuffer associated with dPriv is the right size.

+ * Resize the gl_framebuffer if needed.

+ * It's expected that the dPriv->driverPrivate member points to a

+ * gl_framebuffer object.

+ */

+void

+driUpdateFramebufferSize(struct gl_context *ctx, const __DRIdrawable *dPriv)

+{

+   struct gl_framebuffer *fb = (struct gl_framebuffer *) dPriv->driverPrivate;

+   if (fb && (dPriv->w != fb->Width || dPriv->h != fb->Height)) {

+      ctx->Driver.ResizeBuffers(ctx, fb, dPriv->w, dPriv->h);

+      /* if the driver needs the hw lock for ResizeBuffers, the drawable

+         might have changed again by now */

+      assert(fb->Width == dPriv->w);

+      assert(fb->Height == dPriv->h);

+   }

+}

diff --git a/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.h b/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.h
index 677511334..6c11d350d 100644
--- a/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.h
+++ b/mesalib/src/mesa/drivers/dri/common/drirenderbuffer.h
@@ -1,79 +1,79 @@
-
-/**
- * A driRenderbuffer is dervied from gl_renderbuffer.
- * It describes a color buffer (front or back), a depth buffer, or stencil
- * buffer etc.
- * Specific to DRI drivers are the offset and pitch fields.
- */
-
-
-#ifndef DRIRENDERBUFFER_H
-#define DRIRENDERBUFFER_H
-
-#include "main/mtypes.h"
-#include "main/formats.h"
-#include "dri_util.h"
-
-
-typedef struct {
-   struct gl_renderbuffer Base;
-
-   /* Chars or bytes per pixel.  If Z and Stencil are stored together this
-    * will typically be 32 whether this a depth or stencil renderbuffer.
-    */
-   GLint cpp;
-
-   /* Buffer position and pitch (row stride).  Recall that for today's DRI
-    * drivers, we have statically allocated color/depth/stencil buffers.
-    * So this information describes the whole screen, not just a window.
-    * To address pixels in a window, we need to know the window's position
-    * and size with respect to the screen.
-    */
-   GLint offset;  /* in bytes */
-   GLint pitch;   /* in pixels */
-
-   /* If the driver can do page flipping (full-screen double buffering)
-    * the current front/back buffers may get swapped.
-    * If page flipping is disabled, these  fields will be identical to
-    * the offset/pitch/Data above.
-    * If page flipping is enabled, and this is the front(back) renderbuffer,
-    * flippedOffset/Pitch/Data will have the back(front) renderbuffer's values.
-    */
-   GLint flippedOffset;
-   GLint flippedPitch;
-   GLvoid *flippedData;  /* mmap'd address of buffer memory, if used */
-
-   /* Pointer to corresponding __DRIdrawable.  This is used to compute
-    * the window's position within the framebuffer.
-    */
-   __DRIdrawable *dPriv;
-
-   /* XXX this is for radeon/r200 only.  We should really create a new
-    * r200Renderbuffer class, derived from this class...  not a huge deal.
-    */
-   GLboolean depthHasSurface;
-
-   /**
-    * A handy flag to know if this is the back color buffer.
-    * 
-    * \note
-    * This is currently only used by tdfx.
-    */
-   GLboolean backBuffer;
-} driRenderbuffer;
-
-
-extern driRenderbuffer *
-driNewRenderbuffer(gl_format format, GLvoid *addr,
-                   GLint cpp, GLint offset, GLint pitch,
-                   __DRIdrawable *dPriv);
-
-extern void
-driFlipRenderbuffers(struct gl_framebuffer *fb, GLboolean flipped);
-
-
-extern void
-driUpdateFramebufferSize(GLcontext *ctx, const __DRIdrawable *dPriv);
-
-
-#endif /* DRIRENDERBUFFER_H */
+

+/**

+ * A driRenderbuffer is dervied from gl_renderbuffer.

+ * It describes a color buffer (front or back), a depth buffer, or stencil

+ * buffer etc.

+ * Specific to DRI drivers are the offset and pitch fields.

+ */

+

+

+#ifndef DRIRENDERBUFFER_H

+#define DRIRENDERBUFFER_H

+

+#include "main/mtypes.h"

+#include "main/formats.h"

+#include "dri_util.h"

+

+

+typedef struct {

+   struct gl_renderbuffer Base;

+

+   /* Chars or bytes per pixel.  If Z and Stencil are stored together this

+    * will typically be 32 whether this a depth or stencil renderbuffer.

+    */

+   GLint cpp;

+

+   /* Buffer position and pitch (row stride).  Recall that for today's DRI

+    * drivers, we have statically allocated color/depth/stencil buffers.

+    * So this information describes the whole screen, not just a window.

+    * To address pixels in a window, we need to know the window's position

+    * and size with respect to the screen.

+    */

+   GLint offset;  /* in bytes */

+   GLint pitch;   /* in pixels */

+

+   /* If the driver can do page flipping (full-screen double buffering)

+    * the current front/back buffers may get swapped.

+    * If page flipping is disabled, these  fields will be identical to

+    * the offset/pitch/Data above.

+    * If page flipping is enabled, and this is the front(back) renderbuffer,

+    * flippedOffset/Pitch/Data will have the back(front) renderbuffer's values.

+    */

+   GLint flippedOffset;

+   GLint flippedPitch;

+   GLvoid *flippedData;  /* mmap'd address of buffer memory, if used */

+

+   /* Pointer to corresponding __DRIdrawable.  This is used to compute

+    * the window's position within the framebuffer.

+    */

+   __DRIdrawable *dPriv;

+

+   /* XXX this is for radeon/r200 only.  We should really create a new

+    * r200Renderbuffer class, derived from this class...  not a huge deal.

+    */

+   GLboolean depthHasSurface;

+

+   /**

+    * A handy flag to know if this is the back color buffer.

+    * 

+    * \note

+    * This is currently only used by tdfx.

+    */

+   GLboolean backBuffer;

+} driRenderbuffer;

+

+

+extern driRenderbuffer *

+driNewRenderbuffer(gl_format format, GLvoid *addr,

+                   GLint cpp, GLint offset, GLint pitch,

+                   __DRIdrawable *dPriv);

+

+extern void

+driFlipRenderbuffers(struct gl_framebuffer *fb, GLboolean flipped);

+

+

+extern void

+driUpdateFramebufferSize(struct gl_context *ctx, const __DRIdrawable *dPriv);

+

+

+#endif /* DRIRENDERBUFFER_H */

diff --git a/mesalib/src/mesa/drivers/dri/common/drisw_util.h b/mesalib/src/mesa/drivers/dri/common/drisw_util.h
index 9c3d01c99..cae47e1f6 100644
--- a/mesalib/src/mesa/drivers/dri/common/drisw_util.h
+++ b/mesalib/src/mesa/drivers/dri/common/drisw_util.h
@@ -1,135 +1,134 @@
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * Copyright 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.
- */
-
-/**
- * @file
- * Binding of the DRI interface (dri_interface.h) for DRISW.
- *
- * The DRISW structs are 'base classes' of the corresponding DRI1 / DRI2 (DRM)
- * structs. The bindings for SW and DRM can be unified by making the DRM structs
- * 'sub-classes' of the SW structs, either proper or with field re-ordering.
- *
- * The code can also be unified but that requires cluttering the common code
- * with ifdef's and guarding with (__DRIscreen::fd >= 0) for DRM.
- */
-
-#ifndef _DRISW_UTIL_H
-#define _DRISW_UTIL_H
-
-#include "main/mtypes.h"
-
-#include <GL/gl.h>
-#include <GL/internal/glcore.h>
-#include <GL/internal/dri_interface.h>
-typedef struct _drmLock drmLock;
-
-
-/**
- * Extensions
- */
-extern const __DRIcoreExtension driCoreExtension;
-extern const __DRIswrastExtension driSWRastExtension;
-
-
-/**
- * Driver callback functions
- */
-struct __DriverAPIRec {
-    const __DRIconfig **(*InitScreen) (__DRIscreen * priv);
-
-    void (*DestroyScreen)(__DRIscreen *driScrnPriv);
-
-    GLboolean (*CreateContext)(gl_api glapi,
-                               const __GLcontextModes *glVis,
-                               __DRIcontext *driContextPriv,
-                               void *sharedContextPrivate);
-
-    void (*DestroyContext)(__DRIcontext *driContextPriv);
-
-    GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,
-                              __DRIdrawable *driDrawPriv,
-                              const __GLcontextModes *glVis,
-                              GLboolean pixmapBuffer);
-
-    void (*DestroyBuffer)(__DRIdrawable *driDrawPriv);
-
-    void (*SwapBuffers)(__DRIdrawable *driDrawPriv);
-
-    GLboolean (*MakeCurrent)(__DRIcontext *driContextPriv,
-                             __DRIdrawable *driDrawPriv,
-                             __DRIdrawable *driReadPriv);
-
-    GLboolean (*UnbindContext)(__DRIcontext *driContextPriv);
-};
-
-extern const struct __DriverAPIRec driDriverAPI;
-
-
-/**
- * Data types
- */
-struct __DRIscreenRec {
-    int myNum;
-
-    int fd;
-
-    void *private;
-
-    const __DRIextension **extensions;
-
-    const __DRIswrastLoaderExtension *swrast_loader;
-};
-
-struct __DRIcontextRec {
-
-    void *driverPrivate;
-
-    void *loaderPrivate;
-
-    __DRIdrawable *driDrawablePriv;
-
-    __DRIdrawable *driReadablePriv;
-
-    __DRIscreen *driScreenPriv;
-};
-
-struct __DRIdrawableRec {
-
-    void *driverPrivate;
-
-    void *loaderPrivate;
-
-    __DRIcontext *driContextPriv;
-
-    __DRIscreen *driScreenPriv;
-
-    int refcount;
-
-    /* gallium */
-    unsigned int lastStamp;
-
-    int w;
-    int h;
-};
-
-#endif /* _DRISW_UTIL_H */
+/*

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

+ * All Rights Reserved.

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

+ */

+

+/**

+ * @file

+ * Binding of the DRI interface (dri_interface.h) for DRISW.

+ *

+ * The DRISW structs are 'base classes' of the corresponding DRI1 / DRI2 (DRM)

+ * structs. The bindings for SW and DRM can be unified by making the DRM structs

+ * 'sub-classes' of the SW structs, either proper or with field re-ordering.

+ *

+ * The code can also be unified but that requires cluttering the common code

+ * with ifdef's and guarding with (__DRIscreen::fd >= 0) for DRM.

+ */

+

+#ifndef _DRISW_UTIL_H

+#define _DRISW_UTIL_H

+

+#include "main/mtypes.h"

+

+#include <GL/gl.h>

+#include <GL/internal/dri_interface.h>

+typedef struct _drmLock drmLock;

+

+

+/**

+ * Extensions

+ */

+extern const __DRIcoreExtension driCoreExtension;

+extern const __DRIswrastExtension driSWRastExtension;

+

+

+/**

+ * Driver callback functions

+ */

+struct __DriverAPIRec {

+    const __DRIconfig **(*InitScreen) (__DRIscreen * priv);

+

+    void (*DestroyScreen)(__DRIscreen *driScrnPriv);

+

+    GLboolean (*CreateContext)(gl_api glapi,

+                               const struct gl_config *glVis,

+                               __DRIcontext *driContextPriv,

+                               void *sharedContextPrivate);

+

+    void (*DestroyContext)(__DRIcontext *driContextPriv);

+

+    GLboolean (*CreateBuffer)(__DRIscreen *driScrnPriv,

+                              __DRIdrawable *driDrawPriv,

+                              const struct gl_config *glVis,

+                              GLboolean pixmapBuffer);

+

+    void (*DestroyBuffer)(__DRIdrawable *driDrawPriv);

+

+    void (*SwapBuffers)(__DRIdrawable *driDrawPriv);

+

+    GLboolean (*MakeCurrent)(__DRIcontext *driContextPriv,

+                             __DRIdrawable *driDrawPriv,

+                             __DRIdrawable *driReadPriv);

+

+    GLboolean (*UnbindContext)(__DRIcontext *driContextPriv);

+};

+

+extern const struct __DriverAPIRec driDriverAPI;

+

+

+/**

+ * Data types

+ */

+struct __DRIscreenRec {

+    int myNum;

+

+    int fd;

+

+    void *private;

+

+    const __DRIextension **extensions;

+

+    const __DRIswrastLoaderExtension *swrast_loader;

+};

+

+struct __DRIcontextRec {

+

+    void *driverPrivate;

+

+    void *loaderPrivate;

+

+    __DRIdrawable *driDrawablePriv;

+

+    __DRIdrawable *driReadablePriv;

+

+    __DRIscreen *driScreenPriv;

+};

+

+struct __DRIdrawableRec {

+

+    void *driverPrivate;

+

+    void *loaderPrivate;

+

+    __DRIcontext *driContextPriv;

+

+    __DRIscreen *driScreenPriv;

+

+    int refcount;

+

+    /* gallium */

+    unsigned int lastStamp;

+

+    int w;

+    int h;

+};

+

+#endif /* _DRISW_UTIL_H */

diff --git a/mesalib/src/mesa/drivers/dri/common/spantmp.h b/mesalib/src/mesa/drivers/dri/common/spantmp.h
index cdc4f422c..9aea3660c 100644
--- a/mesalib/src/mesa/drivers/dri/common/spantmp.h
+++ b/mesalib/src/mesa/drivers/dri/common/spantmp.h
@@ -1,325 +1,325 @@
-/*
- * Copyright 2000-2001 VA Linux Systems, Inc.
- * (C) Copyright IBM Corporation 2002, 2003
- * 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
- * VA LINUX SYSTEM, IBM 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 <keithw@tungstengraphics.com>
- *    Gareth Hughes <gareth@nvidia.com>
- */
-
-#include "spantmp_common.h"
-
-#ifndef DBG
-#define DBG 0
-#endif
-
-#ifndef HW_READ_CLIPLOOP
-#define HW_READ_CLIPLOOP()	HW_CLIPLOOP()
-#endif
-
-#ifndef HW_WRITE_CLIPLOOP
-#define HW_WRITE_CLIPLOOP()	HW_CLIPLOOP()
-#endif
-
-
-static void TAG(WriteRGBASpan)( GLcontext *ctx,
-                                struct gl_renderbuffer *rb,
-				GLuint n, GLint x, GLint y,
-				const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_RGBA( x1, y,
-				    rgba[i][0], rgba[i][1],
-				    rgba[i][2], rgba[i][3] );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_RGBA( x1, y,
-				 rgba[i][0], rgba[i][1],
-				 rgba[i][2], rgba[i][3] );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-static void TAG(WriteRGBSpan)( GLcontext *ctx,
-                               struct gl_renderbuffer *rb,
-			       GLuint n, GLint x, GLint y,
-			       const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-static void TAG(WriteRGBAPixels)( GLcontext *ctx,
-                                  struct gl_renderbuffer *rb,
-                                  GLuint n, const GLint x[], const GLint y[],
-                                  const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;
-	 GLuint i;
-	 LOCAL_VARS;
-
-	 if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       if (mask)
-	       {
-	          for (i=0;i<n;i++)
-	          {
-		     if (mask[i]) {
-		        const int fy = Y_FLIP(y[i]);
-		        if (CLIPPIXEL(x[i],fy))
-			   WRITE_RGBA( x[i], fy,
-				       rgba[i][0], rgba[i][1],
-				       rgba[i][2], rgba[i][3] );
-		     }
-	          }
-	       }
-	       else
-	       {
-	          for (i=0;i<n;i++)
-	          {
-		     const int fy = Y_FLIP(y[i]);
-		     if (CLIPPIXEL(x[i],fy))
-			WRITE_RGBA( x[i], fy,
-				    rgba[i][0], rgba[i][1],
-				    rgba[i][2], rgba[i][3] );
-	          }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(WriteMonoRGBASpan)( GLcontext *ctx,	
-                                    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y, 
-				    const void *value,
-				    const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *color = (const GLubyte *) value;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-	 INIT_MONO_PIXEL(p, color);
-
-	 y = Y_FLIP( y );
-
-	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-	       if (mask)
-	       {
-	          for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-		        WRITE_PIXEL( x1, y, p );
-	       }
-	       else
-	       {
-	          for (;n1>0;i++,x1++,n1--)
-		     WRITE_PIXEL( x1, y, p );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(WriteMonoRGBAPixels)( GLcontext *ctx,
-                                      struct gl_renderbuffer *rb,
-				      GLuint n,
-                                      const GLint x[], const GLint y[],
-				      const void *value,
-                                      const GLubyte mask[] ) 
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *color = (const GLubyte *) value;
-	 GLuint i;
-	 LOCAL_VARS;
-	 INIT_MONO_PIXEL(p, color);
-
-	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       if (mask)
-	       {
-		  for (i=0;i<n;i++)
-		     if (mask[i]) {
-			int fy = Y_FLIP(y[i]);
-			if (CLIPPIXEL( x[i], fy ))
-			   WRITE_PIXEL( x[i], fy, p );
-		     }
-	       }
-	       else
-	       {
-		  for (i=0;i<n;i++) {
-		     int fy = Y_FLIP(y[i]);
-		     if (CLIPPIXEL( x[i], fy ))
-			WRITE_PIXEL( x[i], fy, p );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(ReadRGBASpan)( GLcontext *ctx,
-                               struct gl_renderbuffer *rb,
-			       GLuint n, GLint x, GLint y,
-			       void *values)
-{
-   HW_READ_LOCK()
-      {
-         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	 GLint x1,n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 if (DBG) fprintf(stderr, "ReadRGBASpan\n");
-
-	 HW_READ_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-	       for (;n1>0;i++,x1++,n1--)
-		  READ_RGBA( rgba[i], x1, y );
-	    }
-         HW_ENDCLIPLOOP();
-      }
-   HW_READ_UNLOCK();
-}
-
-
-static void TAG(ReadRGBAPixels)( GLcontext *ctx,
-                                 struct gl_renderbuffer *rb,
-				 GLuint n, const GLint x[], const GLint y[],
-				 void *values )
-{
-   HW_READ_LOCK()
-      {
-         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	 GLuint i;
-	 LOCAL_VARS;
-
-	 if (DBG) fprintf(stderr, "ReadRGBAPixels\n");
-
-	 HW_READ_CLIPLOOP()
-	    {
-               for (i=0;i<n;i++) {
-                  int fy = Y_FLIP( y[i] );
-                  if (CLIPPIXEL( x[i], fy ))
-                     READ_RGBA( rgba[i], x[i], fy );
-               }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_READ_UNLOCK();
-}
-
-
-static void TAG(InitPointers)(struct gl_renderbuffer *rb)
-{
-   rb->PutRow = TAG(WriteRGBASpan);
-   rb->PutRowRGB = TAG(WriteRGBSpan);
-   rb->PutMonoRow = TAG(WriteMonoRGBASpan);
-   rb->PutValues = TAG(WriteRGBAPixels);
-   rb->PutMonoValues = TAG(WriteMonoRGBAPixels);
-   rb->GetValues = TAG(ReadRGBAPixels);
-   rb->GetRow = TAG(ReadRGBASpan);
-}
-
-
-#undef WRITE_PIXEL
-#undef WRITE_RGBA
-#undef READ_RGBA
-#undef TAG
+/*

+ * Copyright 2000-2001 VA Linux Systems, Inc.

+ * (C) Copyright IBM Corporation 2002, 2003

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

+ * VA LINUX SYSTEM, IBM 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 <keithw@tungstengraphics.com>

+ *    Gareth Hughes <gareth@nvidia.com>

+ */

+

+#include "spantmp_common.h"

+

+#ifndef DBG

+#define DBG 0

+#endif

+

+#ifndef HW_READ_CLIPLOOP

+#define HW_READ_CLIPLOOP()	HW_CLIPLOOP()

+#endif

+

+#ifndef HW_WRITE_CLIPLOOP

+#define HW_WRITE_CLIPLOOP()	HW_CLIPLOOP()

+#endif

+

+

+static void TAG(WriteRGBASpan)( struct gl_context *ctx,

+                                struct gl_renderbuffer *rb,

+				GLuint n, GLint x, GLint y,

+				const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+

+	       if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n",

+				(int)i, (int)n1, (int)x1);

+

+	       if (mask)

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+			WRITE_RGBA( x1, y,

+				    rgba[i][0], rgba[i][1],

+				    rgba[i][2], rgba[i][3] );

+	       }

+	       else

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     WRITE_RGBA( x1, y,

+				 rgba[i][0], rgba[i][1],

+				 rgba[i][2], rgba[i][3] );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+static void TAG(WriteRGBSpan)( struct gl_context *ctx,

+                               struct gl_renderbuffer *rb,

+			       GLuint n, GLint x, GLint y,

+			       const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) values;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+

+	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",

+				(int)i, (int)n1, (int)x1);

+

+	       if (mask)

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );

+	       }

+	       else

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+static void TAG(WriteRGBAPixels)( struct gl_context *ctx,

+                                  struct gl_renderbuffer *rb,

+                                  GLuint n, const GLint x[], const GLint y[],

+                                  const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;

+	 GLuint i;

+	 LOCAL_VARS;

+

+	 if (DBG) fprintf(stderr, "WriteRGBAPixels\n");

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       if (mask)

+	       {

+	          for (i=0;i<n;i++)

+	          {

+		     if (mask[i]) {

+		        const int fy = Y_FLIP(y[i]);

+		        if (CLIPPIXEL(x[i],fy))

+			   WRITE_RGBA( x[i], fy,

+				       rgba[i][0], rgba[i][1],

+				       rgba[i][2], rgba[i][3] );

+		     }

+	          }

+	       }

+	       else

+	       {

+	          for (i=0;i<n;i++)

+	          {

+		     const int fy = Y_FLIP(y[i]);

+		     if (CLIPPIXEL(x[i],fy))

+			WRITE_RGBA( x[i], fy,

+				    rgba[i][0], rgba[i][1],

+				    rgba[i][2], rgba[i][3] );

+	          }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+static void TAG(WriteMonoRGBASpan)( struct gl_context *ctx,	

+                                    struct gl_renderbuffer *rb,

+				    GLuint n, GLint x, GLint y, 

+				    const void *value,

+				    const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte *color = (const GLubyte *) value;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_VARS;

+	 INIT_MONO_PIXEL(p, color);

+

+	 y = Y_FLIP( y );

+

+	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+	       if (mask)

+	       {

+	          for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+		        WRITE_PIXEL( x1, y, p );

+	       }

+	       else

+	       {

+	          for (;n1>0;i++,x1++,n1--)

+		     WRITE_PIXEL( x1, y, p );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+static void TAG(WriteMonoRGBAPixels)( struct gl_context *ctx,

+                                      struct gl_renderbuffer *rb,

+				      GLuint n,

+                                      const GLint x[], const GLint y[],

+				      const void *value,

+                                      const GLubyte mask[] ) 

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte *color = (const GLubyte *) value;

+	 GLuint i;

+	 LOCAL_VARS;

+	 INIT_MONO_PIXEL(p, color);

+

+	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       if (mask)

+	       {

+		  for (i=0;i<n;i++)

+		     if (mask[i]) {

+			int fy = Y_FLIP(y[i]);

+			if (CLIPPIXEL( x[i], fy ))

+			   WRITE_PIXEL( x[i], fy, p );

+		     }

+	       }

+	       else

+	       {

+		  for (i=0;i<n;i++) {

+		     int fy = Y_FLIP(y[i]);

+		     if (CLIPPIXEL( x[i], fy ))

+			WRITE_PIXEL( x[i], fy, p );

+		  }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+static void TAG(ReadRGBASpan)( struct gl_context *ctx,

+                               struct gl_renderbuffer *rb,

+			       GLuint n, GLint x, GLint y,

+			       void *values)

+{

+   HW_READ_LOCK()

+      {

+         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	 GLint x1,n1;

+	 LOCAL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 if (DBG) fprintf(stderr, "ReadRGBASpan\n");

+

+	 HW_READ_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+	       for (;n1>0;i++,x1++,n1--)

+		  READ_RGBA( rgba[i], x1, y );

+	    }

+         HW_ENDCLIPLOOP();

+      }

+   HW_READ_UNLOCK();

+}

+

+

+static void TAG(ReadRGBAPixels)( struct gl_context *ctx,

+                                 struct gl_renderbuffer *rb,

+				 GLuint n, const GLint x[], const GLint y[],

+				 void *values )

+{

+   HW_READ_LOCK()

+      {

+         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	 GLuint i;

+	 LOCAL_VARS;

+

+	 if (DBG) fprintf(stderr, "ReadRGBAPixels\n");

+

+	 HW_READ_CLIPLOOP()

+	    {

+               for (i=0;i<n;i++) {

+                  int fy = Y_FLIP( y[i] );

+                  if (CLIPPIXEL( x[i], fy ))

+                     READ_RGBA( rgba[i], x[i], fy );

+               }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_READ_UNLOCK();

+}

+

+

+static void TAG(InitPointers)(struct gl_renderbuffer *rb)

+{

+   rb->PutRow = TAG(WriteRGBASpan);

+   rb->PutRowRGB = TAG(WriteRGBSpan);

+   rb->PutMonoRow = TAG(WriteMonoRGBASpan);

+   rb->PutValues = TAG(WriteRGBAPixels);

+   rb->PutMonoValues = TAG(WriteMonoRGBAPixels);

+   rb->GetValues = TAG(ReadRGBAPixels);

+   rb->GetRow = TAG(ReadRGBASpan);

+}

+

+

+#undef WRITE_PIXEL

+#undef WRITE_RGBA

+#undef READ_RGBA

+#undef TAG

diff --git a/mesalib/src/mesa/drivers/dri/common/spantmp2.h b/mesalib/src/mesa/drivers/dri/common/spantmp2.h
index 1dab7336b..160836a77 100644
--- a/mesalib/src/mesa/drivers/dri/common/spantmp2.h
+++ b/mesalib/src/mesa/drivers/dri/common/spantmp2.h
@@ -1,916 +1,1038 @@
-/*
- * Copyright 2000-2001 VA Linux Systems, 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
- * VA LINUX SYSTEM, IBM 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 spantmp2.h
- *
- * Template file of span read / write functions.
- *
- * \author Keith Whitwell <keithw@tungstengraphics.com>
- * \author Gareth Hughes <gareth@nvidia.com>
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#include "main/colormac.h"
-#include "spantmp_common.h"
-
-#ifndef DBG
-#define DBG 0
-#endif
-
-#ifndef HW_READ_CLIPLOOP
-#define HW_READ_CLIPLOOP()	HW_CLIPLOOP()
-#endif
-
-#ifndef HW_WRITE_CLIPLOOP
-#define HW_WRITE_CLIPLOOP()	HW_CLIPLOOP()
-#endif
-
-#if (SPANTMP_PIXEL_FMT == GL_RGB)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)
-
-/**
- ** GL_RGB, GL_UNSIGNED_SHORT_5_6_5
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-#define INIT_MONO_PIXEL(p, color) \
-  p = PACK_COLOR_565( color[0], color[1], color[2] )
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   PUT_VALUE(_x, _y, ((((int)r & 0xf8) << 8) |				\
-		      (((int)g & 0xfc) << 3) |				\
-		      (((int)b & 0xf8) >> 3)))				\
-
-#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )					\
-   do {									\
-      GLushort p = GET_VALUE(_x, _y);					\
-      rgba[0] = ((p >> 8) & 0xf8) * 255 / 0xf8;				\
-      rgba[1] = ((p >> 3) & 0xfc) * 255 / 0xfc;				\
-      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\
-      rgba[3] = 0xff;							\
-   } while (0)
-
-#elif (SPANTMP_PIXEL_FMT == GL_RGB)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5_REV)
-
-/**
- ** GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-#define INIT_MONO_PIXEL(p, color) \
-  p = PACK_COLOR_565_REV( color[0], color[1], color[2] )
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   PUT_VALUE(_x, _y, PACK_COLOR_565_REV( r, g, b ))
-
-#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )					\
-   do {									\
-      GLushort p = GET_VALUE(_x, _y);					\
-      p = p << 8 | p >> 8;						\
-      rgba[0] = ((p >> 8) & 0xf8) * 255 / 0xf8;				\
-      rgba[1] = ((p >> 3) & 0xfc) * 255 / 0xfc;				\
-      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\
-      rgba[3] = 0xff;							\
-   } while (0)
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_4_4_4_4)
-
-/**
- ** GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_4444_REV(color[3], color[0], color[1], color[2])
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   PUT_VALUE(_x, _y, PACK_COLOR_4444_REV(a, r, g, b))			\
-
-#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )					\
-   do {									\
-      GLushort p = GET_VALUE(_x, _y);					\
-      rgba[0] = ((p >> 0) & 0xf) * 0x11;				\
-      rgba[1] = ((p >> 12) & 0xf) * 0x11;				\
-      rgba[2] = ((p >> 4) & 0xf) * 0x11;				\
-      rgba[3] = ((p >> 8) & 0xf) * 0x11;				\
-   } while (0)
-
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_4_4_4_4_REV)
-
-/**
- ** GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_4444(color[3], color[0], color[1], color[2])
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   PUT_VALUE(_x, _y, PACK_COLOR_4444(a, r, g, b))			\
-
-#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )					\
-   do {									\
-      GLushort p = GET_VALUE(_x, _y);					\
-      rgba[0] = ((p >> 8) & 0xf) * 0x11;				\
-      rgba[1] = ((p >> 4) & 0xf) * 0x11;				\
-      rgba[2] = ((p >> 0) & 0xf) * 0x11;				\
-      rgba[3] = ((p >> 12) & 0xf) * 0x11;				\
-   } while (0)
-
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_1_5_5_5_REV)
-
-/**
- ** GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_1555(color[3], color[0], color[1], color[2])
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   PUT_VALUE(_x, _y, PACK_COLOR_1555(a, r, g, b))			\
-
-#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )					\
-   do {									\
-      GLushort p = GET_VALUE(_x, _y);					\
-      rgba[0] = ((p >> 7) & 0xf8) * 255 / 0xf8;				\
-      rgba[1] = ((p >> 2) & 0xf8) * 255 / 0xf8;				\
-      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\
-      rgba[3] = ((p >> 15) & 0x1) * 0xff;				\
-   } while (0)
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_1_5_5_5)
-
-/**
- ** GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-#define INIT_MONO_PIXEL(p, color) \
-   p = PACK_COLOR_1555_REV(color[3], color[0], color[1], color[2])
-
-#define WRITE_RGBA( _x, _y, r, g, b, a )				\
-   PUT_VALUE(_x, _y, PACK_COLOR_1555_REV(a, r, g, b))			\
-
-#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )					\
-   do {									\
-      GLushort p = GET_VALUE(_x, _y);					\
-      p = p << 8 | p >> 8;						\
-      rgba[0] = ((p >> 7) & 0xf8) * 255 / 0xf8;				\
-      rgba[1] = ((p >> 2) & 0xf8) * 255 / 0xf8;				\
-      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\
-      rgba[3] = ((p >> 15) & 0x1) * 0xff;				\
-   } while (0)
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGRA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)
-
-/**
- ** GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = PACK_COLOR_8888(color[3], color[0], color[1], color[2]) 
-
-# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
-   PUT_VALUE(_x, _y, ((r << 16) |					\
-		      (g << 8) |					\
-		      (b << 0) |					\
-		      (a << 24)))
-
-#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)
-
-# if defined( USE_X86_ASM )
-#  define READ_RGBA(rgba, _x, _y)                                       \
-    do {                                                                \
-       GLuint p = GET_VALUE(_x, _y);					\
-       __asm__ __volatile__( "bswap	%0; rorl $8, %0"                \
-				: "=r" (p) : "0" (p) );                 \
-       ((GLuint *)rgba)[0] = p;                                         \
-    } while (0)
-# elif defined( MESA_BIG_ENDIAN )
-    /* On PowerPC with GCC 3.4.2 the shift madness below becomes a single
-     * rotlwi instruction.  It also produces good code on SPARC.
-     */
-#  define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLuint p = GET_VALUE(_x, _y);					\
-        GLuint t = p;                                                   \
-        *((uint32_t *) rgba) = (t >> 24) | (p << 8);                    \
-     } while (0)
-# else
-#  define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLuint p = GET_VALUE(_x, _y);					\
-	rgba[0] = (p >> 16) & 0xff;					\
-	rgba[1] = (p >>  8) & 0xff;					\
-	rgba[2] = (p >>  0) & 0xff;					\
-	rgba[3] = (p >> 24) & 0xff;					\
-     } while (0)
-# endif
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGRA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8)
-
-/**
- ** GL_BGRA, GL_UNSIGNED_INT_8_8_8_8
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = PACK_COLOR_8888(color[2], color[1], color[0], color[3]) 
-
-# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
-   PUT_VALUE(_x, _y, ((r << 8) |					\
-		      (g << 16) |					\
-		      (b << 24) |					\
-		      (a << 0)))
-
-#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)
-
-# if defined( USE_X86_ASM )
-#  define READ_RGBA(rgba, _x, _y)                                       \
-    do {                                                                \
-       GLuint p = GET_VALUE(_x, _y);					\
-       __asm__ __volatile__( "rorl $8, %0"				\
-				: "=r" (p) : "0" (p) );                 \
-       ((GLuint *)rgba)[0] = p;                                         \
-    } while (0)
-# elif defined( MESA_BIG_ENDIAN )
-    /* On PowerPC with GCC 3.4.2 the shift madness below becomes a single
-     * rotlwi instruction.  It also produces good code on SPARC.
-     */
-#  define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLuint p = CPU_TO_LE32(GET_VALUE(_x, _y));                      \
-        GLuint t = p;                                                   \
-        *((uint32_t *) rgba) = (t >> 24) | (p << 8);                    \
-     } while (0)
-# else
-#  define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLuint p = GET_VALUE(_x, _y);					\
-	rgba[0] = (p >>  8) & 0xff;					\
-	rgba[1] = (p >> 16) & 0xff;					\
-	rgba[2] = (p >> 24) & 0xff;					\
-	rgba[3] = (p >>  0) & 0xff;					\
-     } while (0)
-# endif
-
-#elif (SPANTMP_PIXEL_FMT == GL_BGR) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)
-
-/**
- ** GL_BGR, GL_UNSIGNED_INT_8_8_8_8_REV
- **
- ** This is really for MESA_FORMAT_XRGB8888.  The spantmp code needs to be
- ** kicked to the curb, and we need to just code-gen this.
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = PACK_COLOR_8888(0xff, color[0], color[1], color[2])
-
-# define WRITE_RGBA(_x, _y, r, g, b, a)					\
-   PUT_VALUE(_x, _y, ((r << 16) |					\
-		      (g << 8) |					\
-		      (b << 0) |					\
-		      (0xff << 24)))
-
-#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)
-
-# if defined( USE_X86_ASM )
-#  define READ_RGBA(rgba, _x, _y)                                       \
-    do {                                                                \
-       GLuint p = GET_VALUE(_x, _y);					\
-       __asm__ __volatile__( "bswap	%0; rorl $8, %0"                \
-				: "=r" (p) : "0" (p) );                 \
-       ((GLuint *)rgba)[0] = p | 0xff000000;				\
-    } while (0)
-# elif defined( MESA_BIG_ENDIAN )
-    /* On PowerPC with GCC 3.4.2 the shift madness below becomes a single
-     * rotlwi instruction.  It also produces good code on SPARC.
-     */
-#  define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLuint p = GET_VALUE(_x, _y);					\
-        *((uint32_t *) rgba) = (p << 8) | 0xff;				\
-     } while (0)
-# else
-#  define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLuint p = GET_VALUE(_x, _y);					\
-	rgba[0] = (p >> 16) & 0xff;					\
-	rgba[1] = (p >>  8) & 0xff;					\
-	rgba[2] = (p >>  0) & 0xff;					\
-	rgba[3] = 0xff;							\
-     } while (0)
-# endif
-
-#elif (SPANTMP_PIXEL_FMT == GL_ALPHA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_BYTE)
-
-/**
- ** GL_ALPHA, GL_UNSIGNED_BYTE
- **/
-
-#ifndef GET_VALUE
-#ifndef GET_PTR
-#define GET_PTR(_x, _y) (     buf + (_x) + (_y) * pitch)
-#endif
-
-#define GET_VALUE(_x, _y) *(volatile GLubyte *)(GET_PTR(_x, _y))
-#define PUT_VALUE(_x, _y, _v) *(volatile GLubyte *)(GET_PTR(_x, _y)) = (_v)
-#endif /* GET_VALUE */
-
-# define INIT_MONO_PIXEL(p, color)                       \
-     p = color[3]
-
-# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \
-   PUT_VALUE(_x, _y, a | (r & 0 /* quiet warnings */))
-
-#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)
-
-#define READ_RGBA( rgba, _x, _y )				        \
-     do {								\
-        GLubyte p = GET_VALUE(_x, _y);					\
-	rgba[0] = 0;							\
-	rgba[1] = 0;							\
-	rgba[2] = 0;							\
-	rgba[3] = p;							\
-     } while (0)
-
-#else
-#error SPANTMP_PIXEL_FMT must be set to a valid value!
-#endif
-
-
-
-/**
- ** Assembly routines.
- **/
-
-#if defined( USE_MMX_ASM ) || defined( USE_SSE_ASM )
-#include "x86/read_rgba_span_x86.h"
-#include "x86/common_x86_asm.h"
-#endif
-
-static void TAG(WriteRGBASpan)( GLcontext *ctx,
-                                struct gl_renderbuffer *rb,
-				GLuint n, GLint x, GLint y,
-				const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_RGBA( x1, y,
-				    rgba[i][0], rgba[i][1],
-				    rgba[i][2], rgba[i][3] );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_RGBA( x1, y,
-				 rgba[i][0], rgba[i][1],
-				 rgba[i][2], rgba[i][3] );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-static void TAG(WriteRGBSpan)( GLcontext *ctx,
-                               struct gl_renderbuffer *rb,
-			       GLuint n, GLint x, GLint y,
-			       const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-static void TAG(WriteRGBAPixels)( GLcontext *ctx,
-                                  struct gl_renderbuffer *rb,
-                                  GLuint n, const GLint x[], const GLint y[],
-                                  const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;
-	 GLint i;
-	 LOCAL_VARS;
-
-	 if (DBG) fprintf(stderr, "WriteRGBAPixels\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       if (mask)
-	       {
-	          for (i=0;i<n;i++)
-	          {
-		     if (mask[i]) {
-		        const int fy = Y_FLIP(y[i]);
-		        if (CLIPPIXEL(x[i],fy))
-			   WRITE_RGBA( x[i], fy,
-				       rgba[i][0], rgba[i][1],
-				       rgba[i][2], rgba[i][3] );
-		     }
-	          }
-	       }
-	       else
-	       {
-	          for (i=0;i<n;i++)
-	          {
-		     const int fy = Y_FLIP(y[i]);
-		     if (CLIPPIXEL(x[i],fy))
-			WRITE_RGBA( x[i], fy,
-				    rgba[i][0], rgba[i][1],
-				    rgba[i][2], rgba[i][3] );
-	          }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(WriteMonoRGBASpan)( GLcontext *ctx,	
-                                    struct gl_renderbuffer *rb,
-				    GLuint n, GLint x, GLint y, 
-				    const void *value, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *color = (const GLubyte *) value;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_VARS;
-	 INIT_MONO_PIXEL(p, color);
-
-	 y = Y_FLIP( y );
-
-	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-	       if (mask)
-	       {
-	          for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-		        WRITE_PIXEL( x1, y, p );
-	       }
-	       else
-	       {
-	          for (;n1>0;i++,x1++,n1--)
-		     WRITE_PIXEL( x1, y, p );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(WriteMonoRGBAPixels)( GLcontext *ctx,
-                                      struct gl_renderbuffer *rb,
-				      GLuint n,
-				      const GLint x[], const GLint y[],
-				      const void *value,
-				      const GLubyte mask[] ) 
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *color = (const GLubyte *) value;
-	 GLint i;
-	 LOCAL_VARS;
-	 INIT_MONO_PIXEL(p, color);
-
-	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");
-
-	 HW_WRITE_CLIPLOOP()
-	    {
-	       if (mask)
-	       {
-		  for (i=0;i<n;i++)
-		     if (mask[i]) {
-			int fy = Y_FLIP(y[i]);
-			if (CLIPPIXEL( x[i], fy ))
-			   WRITE_PIXEL( x[i], fy, p );
-		     }
-	       }
-	       else
-	       {
-		  for (i=0;i<n;i++) {
-		     int fy = Y_FLIP(y[i]);
-		     if (CLIPPIXEL( x[i], fy ))
-			WRITE_PIXEL( x[i], fy, p );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-static void TAG(ReadRGBASpan)( GLcontext *ctx,
-                               struct gl_renderbuffer *rb,
-			       GLuint n, GLint x, GLint y, void *values)
-{
-   HW_READ_LOCK()
-      {
-         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	 GLint x1,n1;
-	 LOCAL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 if (DBG) fprintf(stderr, "ReadRGBASpan\n");
-
-	 HW_READ_CLIPLOOP()
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-	       for (;n1>0;i++,x1++,n1--)
-		  READ_RGBA( rgba[i], x1, y );
-	    }
-         HW_ENDCLIPLOOP();
-      }
-   HW_READ_UNLOCK();
-}
-
-
-#if defined(GET_PTR) && \
-   defined(USE_MMX_ASM) && \
-   (((SPANTMP_PIXEL_FMT == GL_BGRA) && \
-	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)) || \
-    ((SPANTMP_PIXEL_FMT == GL_RGB) && \
-	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)))
-static void TAG2(ReadRGBASpan,_MMX)( GLcontext *ctx,
-                                     struct gl_renderbuffer *rb,
-                                     GLuint n, GLint x, GLint y, void *values)
-{
-#ifndef USE_INNER_EMMS
-   /* The EMMS instruction is directly in-lined here because using GCC's
-    * built-in _mm_empty function was found to utterly destroy performance.
-    */
-   __asm__ __volatile__( "emms" );
-#endif
-
-   HW_READ_LOCK()
-     {
-        GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	GLint x1,n1;
-	LOCAL_VARS;
-
-	y = Y_FLIP(y);
-
-	if (DBG) fprintf(stderr, "ReadRGBASpan\n");
-
-	HW_READ_CLIPLOOP()
-	  {
-	     GLint i = 0;
-	     CLIPSPAN(x,y,n,x1,n1,i);
-
-	       {
-		  const void * src = GET_PTR( x1, y );
-#if (SPANTMP_PIXEL_FMT == GL_RGB) && \
-		  (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)
-		  _generic_read_RGBA_span_RGB565_MMX( src, rgba[i], n1 );
-#else
-		  _generic_read_RGBA_span_BGRA8888_REV_MMX( src, rgba[i], n1 );
-#endif
-	       }
-	  }
-	HW_ENDCLIPLOOP();
-     }
-   HW_READ_UNLOCK();
-#ifndef USE_INNER_EMMS
-   __asm__ __volatile__( "emms" );
-#endif
-}
-#endif
-
-
-#if defined(GET_PTR) &&	\
-   defined(USE_SSE_ASM) && \
-   (SPANTMP_PIXEL_FMT == GL_BGRA) && \
-     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)
-static void TAG2(ReadRGBASpan,_SSE2)( GLcontext *ctx,
-                                      struct gl_renderbuffer *rb,
-                                      GLuint n, GLint x, GLint y,
-                                      void *values)
-{
-   HW_READ_LOCK()
-     {
-        GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	GLint x1,n1;
-	LOCAL_VARS;
-
-	y = Y_FLIP(y);
-
-	if (DBG) fprintf(stderr, "ReadRGBASpan\n");
-
-	HW_READ_CLIPLOOP()
-	  {
-	     GLint i = 0;
-	     CLIPSPAN(x,y,n,x1,n1,i);
-
-	       {
-		  const void * src = GET_PTR( x1, y );
-		  _generic_read_RGBA_span_BGRA8888_REV_SSE2( src, rgba[i], n1 );
-	       }
-	  }
-	HW_ENDCLIPLOOP();
-     }
-   HW_READ_UNLOCK();
-}
-#endif
-
-#if defined(GET_PTR) &&	\
-   defined(USE_SSE_ASM) && \
-   (SPANTMP_PIXEL_FMT == GL_BGRA) && \
-     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)
-static void TAG2(ReadRGBASpan,_SSE)( GLcontext *ctx,
-                                     struct gl_renderbuffer *rb,
-                                     GLuint n, GLint x, GLint y,
-                                     void *values)
-{
-#ifndef USE_INNER_EMMS
-   /* The EMMS instruction is directly in-lined here because using GCC's
-    * built-in _mm_empty function was found to utterly destroy performance.
-    */
-   __asm__ __volatile__( "emms" );
-#endif
-
-   HW_READ_LOCK()
-     {
-        GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	GLint x1,n1;
-	LOCAL_VARS;
-
-	y = Y_FLIP(y);
-
-	if (DBG) fprintf(stderr, "ReadRGBASpan\n");
-
-	HW_READ_CLIPLOOP()
-	  {
-	     GLint i = 0;
-	     CLIPSPAN(x,y,n,x1,n1,i);
-
-	       {
-		  const void * src = GET_PTR( x1, y );
-		  _generic_read_RGBA_span_BGRA8888_REV_SSE( src, rgba[i], n1 );
-	       }
-	  }
-	HW_ENDCLIPLOOP();
-     }
-   HW_READ_UNLOCK();
-#ifndef USE_INNER_EMMS
-   __asm__ __volatile__( "emms" );
-#endif
-}
-#endif
-
-
-static void TAG(ReadRGBAPixels)( GLcontext *ctx,
-                                 struct gl_renderbuffer *rb,
-				 GLuint n, const GLint x[], const GLint y[],
-				 void *values )
-{
-   HW_READ_LOCK()
-      {
-         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;
-	 GLint i;
-	 LOCAL_VARS;
-
-	 if (DBG) fprintf(stderr, "ReadRGBAPixels\n");
-
-	 HW_READ_CLIPLOOP()
-	    {
-               for (i=0;i<n;i++) {
-                  int fy = Y_FLIP( y[i] );
-                     if (CLIPPIXEL( x[i], fy ))
-                        READ_RGBA( rgba[i], x[i], fy );
-               }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_READ_UNLOCK();
-}
-
-static void TAG(InitPointers)(struct gl_renderbuffer *rb)
-{
-   rb->PutRow = TAG(WriteRGBASpan);
-   rb->PutRowRGB = TAG(WriteRGBSpan);
-   rb->PutMonoRow = TAG(WriteMonoRGBASpan);
-   rb->PutValues = TAG(WriteRGBAPixels);
-   rb->PutMonoValues = TAG(WriteMonoRGBAPixels);
-   rb->GetValues = TAG(ReadRGBAPixels);
-
-#if defined(GET_PTR)
-#if defined(USE_SSE_ASM) && \
-   (SPANTMP_PIXEL_FMT == GL_BGRA) && \
-     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)
-   if ( cpu_has_xmm2 ) {
-      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "SSE2" );
-      rb->GetRow = TAG2(ReadRGBASpan, _SSE2);
-   }
-   else
-#endif
-#if defined(USE_SSE_ASM) && \
-   (SPANTMP_PIXEL_FMT == GL_BGRA) && \
-     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)
-   if ( cpu_has_xmm ) {
-      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "SSE" );
-      rb->GetRow = TAG2(ReadRGBASpan, _SSE);
-   }
-   else
-#endif
-#if defined(USE_MMX_ASM) && \
-   (((SPANTMP_PIXEL_FMT == GL_BGRA) && \
-	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)) || \
-    ((SPANTMP_PIXEL_FMT == GL_RGB) && \
-	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)))
-   if ( cpu_has_mmx ) {
-      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "MMX" );
-      rb->GetRow = TAG2(ReadRGBASpan, _MMX);
-   }
-   else
-#endif
-#endif /* GET_PTR */
-   {
-      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "C" );
-      rb->GetRow = TAG(ReadRGBASpan);
-   }
-
-}
-
-
-#undef INIT_MONO_PIXEL
-#undef WRITE_PIXEL
-#undef WRITE_RGBA
-#undef READ_RGBA
-#undef TAG
-#undef TAG2
-#undef GET_VALUE
-#undef PUT_VALUE
-#undef GET_PTR
-#undef SPANTMP_PIXEL_FMT
-#undef SPANTMP_PIXEL_TYPE
+/*

+ * Copyright 2000-2001 VA Linux Systems, 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

+ * VA LINUX SYSTEM, IBM 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 spantmp2.h

+ *

+ * Template file of span read / write functions.

+ *

+ * \author Keith Whitwell <keithw@tungstengraphics.com>

+ * \author Gareth Hughes <gareth@nvidia.com>

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

+ */

+

+#include "main/colormac.h"

+#include "spantmp_common.h"

+

+#ifndef DBG

+#define DBG 0

+#endif

+

+#ifndef HW_READ_CLIPLOOP

+#define HW_READ_CLIPLOOP()	HW_CLIPLOOP()

+#endif

+

+#ifndef HW_WRITE_CLIPLOOP

+#define HW_WRITE_CLIPLOOP()	HW_CLIPLOOP()

+#endif

+

+#ifdef SPANTMP_MESA_FMT

+#define SPANTMP_PIXEL_FMT GL_NONE

+#define SPANTMP_PIXEL_TYPE GL_NONE

+#endif

+

+#ifndef SPANTMP_MESA_FMT

+#define SPANTMP_MESA_FMT MESA_FORMAT_COUNT

+#endif

+

+#if (SPANTMP_PIXEL_FMT == GL_RGB)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)

+

+/**

+ ** GL_RGB, GL_UNSIGNED_SHORT_5_6_5

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+#define INIT_MONO_PIXEL(p, color) \

+  p = PACK_COLOR_565( color[0], color[1], color[2] )

+

+#define WRITE_RGBA( _x, _y, r, g, b, a )				\

+   PUT_VALUE(_x, _y, ((((int)r & 0xf8) << 8) |				\

+		      (((int)g & 0xfc) << 3) |				\

+		      (((int)b & 0xf8) >> 3)))				\

+

+#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )					\

+   do {									\

+      GLushort p = GET_VALUE(_x, _y);					\

+      rgba[0] = ((p >> 8) & 0xf8) * 255 / 0xf8;				\

+      rgba[1] = ((p >> 3) & 0xfc) * 255 / 0xfc;				\

+      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\

+      rgba[3] = 0xff;							\

+   } while (0)

+

+#elif (SPANTMP_PIXEL_FMT == GL_RGB)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5_REV)

+

+/**

+ ** GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+#define INIT_MONO_PIXEL(p, color) \

+  p = PACK_COLOR_565_REV( color[0], color[1], color[2] )

+

+#define WRITE_RGBA( _x, _y, r, g, b, a )				\

+   PUT_VALUE(_x, _y, PACK_COLOR_565_REV( r, g, b ))

+

+#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )					\

+   do {									\

+      GLushort p = GET_VALUE(_x, _y);					\

+      p = p << 8 | p >> 8;						\

+      rgba[0] = ((p >> 8) & 0xf8) * 255 / 0xf8;				\

+      rgba[1] = ((p >> 3) & 0xfc) * 255 / 0xfc;				\

+      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\

+      rgba[3] = 0xff;							\

+   } while (0)

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_4_4_4_4)

+

+/**

+ ** GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+#define INIT_MONO_PIXEL(p, color) \

+   p = PACK_COLOR_4444_REV(color[3], color[0], color[1], color[2])

+

+#define WRITE_RGBA( _x, _y, r, g, b, a )				\

+   PUT_VALUE(_x, _y, PACK_COLOR_4444_REV(a, r, g, b))			\

+

+#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )					\

+   do {									\

+      GLushort p = GET_VALUE(_x, _y);					\

+      rgba[0] = ((p >> 0) & 0xf) * 0x11;				\

+      rgba[1] = ((p >> 12) & 0xf) * 0x11;				\

+      rgba[2] = ((p >> 4) & 0xf) * 0x11;				\

+      rgba[3] = ((p >> 8) & 0xf) * 0x11;				\

+   } while (0)

+

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_4_4_4_4_REV)

+

+/**

+ ** GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+#define INIT_MONO_PIXEL(p, color) \

+   p = PACK_COLOR_4444(color[3], color[0], color[1], color[2])

+

+#define WRITE_RGBA( _x, _y, r, g, b, a )				\

+   PUT_VALUE(_x, _y, PACK_COLOR_4444(a, r, g, b))			\

+

+#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )					\

+   do {									\

+      GLushort p = GET_VALUE(_x, _y);					\

+      rgba[0] = ((p >> 8) & 0xf) * 0x11;				\

+      rgba[1] = ((p >> 4) & 0xf) * 0x11;				\

+      rgba[2] = ((p >> 0) & 0xf) * 0x11;				\

+      rgba[3] = ((p >> 12) & 0xf) * 0x11;				\

+   } while (0)

+

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_1_5_5_5_REV)

+

+/**

+ ** GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+#define INIT_MONO_PIXEL(p, color) \

+   p = PACK_COLOR_1555(color[3], color[0], color[1], color[2])

+

+#define WRITE_RGBA( _x, _y, r, g, b, a )				\

+   PUT_VALUE(_x, _y, PACK_COLOR_1555(a, r, g, b))			\

+

+#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )					\

+   do {									\

+      GLushort p = GET_VALUE(_x, _y);					\

+      rgba[0] = ((p >> 7) & 0xf8) * 255 / 0xf8;				\

+      rgba[1] = ((p >> 2) & 0xf8) * 255 / 0xf8;				\

+      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\

+      rgba[3] = ((p >> 15) & 0x1) * 0xff;				\

+   } while (0)

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGRA)  && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_1_5_5_5)

+

+/**

+ ** GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+#define INIT_MONO_PIXEL(p, color) \

+   p = PACK_COLOR_1555_REV(color[3], color[0], color[1], color[2])

+

+#define WRITE_RGBA( _x, _y, r, g, b, a )				\

+   PUT_VALUE(_x, _y, PACK_COLOR_1555_REV(a, r, g, b))			\

+

+#define WRITE_PIXEL( _x, _y, p ) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )					\

+   do {									\

+      GLushort p = GET_VALUE(_x, _y);					\

+      p = p << 8 | p >> 8;						\

+      rgba[0] = ((p >> 7) & 0xf8) * 255 / 0xf8;				\

+      rgba[1] = ((p >> 2) & 0xf8) * 255 / 0xf8;				\

+      rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8;				\

+      rgba[3] = ((p >> 15) & 0x1) * 0xff;				\

+   } while (0)

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGRA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)

+

+/**

+ ** GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+     p = PACK_COLOR_8888(color[3], color[0], color[1], color[2]) 

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, ((r << 16) |					\

+		      (g << 8) |					\

+		      (b << 0) |					\

+		      (a << 24)))

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+# if defined( USE_X86_ASM )

+#  define READ_RGBA(rgba, _x, _y)                                       \

+    do {                                                                \

+       GLuint p = GET_VALUE(_x, _y);					\

+       __asm__ __volatile__( "bswap	%0; rorl $8, %0"                \

+				: "=r" (p) : "0" (p) );                 \

+       ((GLuint *)rgba)[0] = p;                                         \

+    } while (0)

+# elif defined( MESA_BIG_ENDIAN )

+    /* On PowerPC with GCC 3.4.2 the shift madness below becomes a single

+     * rotlwi instruction.  It also produces good code on SPARC.

+     */

+#  define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = GET_VALUE(_x, _y);					\

+        GLuint t = p;                                                   \

+        *((uint32_t *) rgba) = (t >> 24) | (p << 8);                    \

+     } while (0)

+# else

+#  define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = GET_VALUE(_x, _y);					\

+	rgba[0] = (p >> 16) & 0xff;					\

+	rgba[1] = (p >>  8) & 0xff;					\

+	rgba[2] = (p >>  0) & 0xff;					\

+	rgba[3] = (p >> 24) & 0xff;					\

+     } while (0)

+# endif

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGRA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8)

+

+/**

+ ** GL_BGRA, GL_UNSIGNED_INT_8_8_8_8

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+     p = PACK_COLOR_8888(color[2], color[1], color[0], color[3]) 

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, ((r << 8) |					\

+		      (g << 16) |					\

+		      (b << 24) |					\

+		      (a << 0)))

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+# if defined( USE_X86_ASM )

+#  define READ_RGBA(rgba, _x, _y)                                       \

+    do {                                                                \

+       GLuint p = GET_VALUE(_x, _y);					\

+       __asm__ __volatile__( "rorl $8, %0"				\

+				: "=r" (p) : "0" (p) );                 \

+       ((GLuint *)rgba)[0] = p;                                         \

+    } while (0)

+# elif defined( MESA_BIG_ENDIAN )

+    /* On PowerPC with GCC 3.4.2 the shift madness below becomes a single

+     * rotlwi instruction.  It also produces good code on SPARC.

+     */

+#  define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = CPU_TO_LE32(GET_VALUE(_x, _y));                      \

+        GLuint t = p;                                                   \

+        *((uint32_t *) rgba) = (t >> 24) | (p << 8);                    \

+     } while (0)

+# else

+#  define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = GET_VALUE(_x, _y);					\

+	rgba[0] = (p >>  8) & 0xff;					\

+	rgba[1] = (p >> 16) & 0xff;					\

+	rgba[2] = (p >> 24) & 0xff;					\

+	rgba[3] = (p >>  0) & 0xff;					\

+     } while (0)

+# endif

+

+#elif (SPANTMP_PIXEL_FMT == GL_BGR) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)

+

+/**

+ ** GL_BGR, GL_UNSIGNED_INT_8_8_8_8_REV

+ **

+ ** This is really for MESA_FORMAT_XRGB8888.  The spantmp code needs to be

+ ** kicked to the curb, and we need to just code-gen this.

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+     p = PACK_COLOR_8888(0xff, color[0], color[1], color[2])

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)					\

+   PUT_VALUE(_x, _y, ((r << 16) |					\

+		      (g << 8) |					\

+		      (b << 0) |					\

+		      (0xff << 24)))

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+# if defined( USE_X86_ASM )

+#  define READ_RGBA(rgba, _x, _y)                                       \

+    do {                                                                \

+       GLuint p = GET_VALUE(_x, _y);					\

+       __asm__ __volatile__( "bswap	%0; rorl $8, %0"                \

+				: "=r" (p) : "0" (p) );                 \

+       ((GLuint *)rgba)[0] = p | 0xff000000;				\

+    } while (0)

+# elif defined( MESA_BIG_ENDIAN )

+    /* On PowerPC with GCC 3.4.2 the shift madness below becomes a single

+     * rotlwi instruction.  It also produces good code on SPARC.

+     */

+#  define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = GET_VALUE(_x, _y);					\

+        *((uint32_t *) rgba) = (p << 8) | 0xff;				\

+     } while (0)

+# else

+#  define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = GET_VALUE(_x, _y);					\

+	rgba[0] = (p >> 16) & 0xff;					\

+	rgba[1] = (p >>  8) & 0xff;					\

+	rgba[2] = (p >>  0) & 0xff;					\

+	rgba[3] = 0xff;							\

+     } while (0)

+# endif

+

+#elif (SPANTMP_PIXEL_FMT == GL_ALPHA) && (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_BYTE)

+

+/**

+ ** GL_ALPHA, GL_UNSIGNED_BYTE

+ **/

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLubyte *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLubyte *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+     p = color[3]

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, a | (r & 0 /* quiet warnings */))

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLubyte p = GET_VALUE(_x, _y);					\

+	rgba[0] = 0;							\

+	rgba[1] = 0;							\

+	rgba[2] = 0;							\

+	rgba[3] = p;							\

+     } while (0)

+

+#elif (SPANTMP_MESA_FMT == MESA_FORMAT_R8)

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLubyte *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLubyte *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+     p = color[0]

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, r)

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLubyte p = GET_VALUE(_x, _y);					\

+	rgba[0] = p;							\

+	rgba[1] = 0;							\

+	rgba[2] = 0;							\

+	rgba[3] = 0;							\

+     } while (0)

+

+#elif (SPANTMP_MESA_FMT == MESA_FORMAT_RG88)

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+   PACK_COLOR_8888(color[0], color[1], 0, 0)

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, r)

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLushort p = GET_VALUE(_x, _y);					\

+	rgba[0] = p & 0xff;						\

+	rgba[1] = (p >> 8) & 0xff;					\

+	rgba[2] = 0;							\

+	rgba[3] = 0;							\

+     } while (0)

+

+#elif (SPANTMP_MESA_FMT == MESA_FORMAT_R16)

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) * 2 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLushort *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLushort *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+     p = color[0]

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, r)

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLushort p = GET_VALUE(_x, _y);					\

+	rgba[0] = p;							\

+	rgba[1] = 0;							\

+	rgba[2] = 0;							\

+	rgba[3] = 0;							\

+     } while (0)

+

+#elif (SPANTMP_MESA_FMT == MESA_FORMAT_RG1616)

+

+#ifndef GET_VALUE

+#ifndef GET_PTR

+#define GET_PTR(_x, _y) (     buf + (_x) * 4 + (_y) * pitch)

+#endif

+

+#define GET_VALUE(_x, _y) *(volatile GLuint *)(GET_PTR(_x, _y))

+#define PUT_VALUE(_x, _y, _v) *(volatile GLuint *)(GET_PTR(_x, _y)) = (_v)

+#endif /* GET_VALUE */

+

+# define INIT_MONO_PIXEL(p, color)                       \

+   ((color[1] << 16) | (color[0]))

+

+# define WRITE_RGBA(_x, _y, r, g, b, a)                                 \

+   PUT_VALUE(_x, _y, r)

+

+#define WRITE_PIXEL(_x, _y, p) PUT_VALUE(_x, _y, p)

+

+#define READ_RGBA( rgba, _x, _y )				        \

+     do {								\

+        GLuint p = GET_VALUE(_x, _y);					\

+	rgba[0] = p & 0xffff;						\

+	rgba[1] = (p >> 16) & 0xffff;					\

+	rgba[2] = 0;							\

+	rgba[3] = 0;							\

+     } while (0)

+

+#else

+#error SPANTMP_PIXEL_FMT must be set to a valid value!

+#endif

+

+

+

+/**

+ ** Assembly routines.

+ **/

+

+#if defined( USE_MMX_ASM ) || defined( USE_SSE_ASM )

+#include "x86/read_rgba_span_x86.h"

+#include "x86/common_x86_asm.h"

+#endif

+

+static void TAG(WriteRGBASpan)( struct gl_context *ctx,

+                                struct gl_renderbuffer *rb,

+				GLuint n, GLint x, GLint y,

+				const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+

+	       if (DBG) fprintf(stderr, "WriteRGBASpan %d..%d (x1 %d)\n",

+				(int)i, (int)n1, (int)x1);

+

+	       if (mask)

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+			WRITE_RGBA( x1, y,

+				    rgba[i][0], rgba[i][1],

+				    rgba[i][2], rgba[i][3] );

+	       }

+	       else

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     WRITE_RGBA( x1, y,

+				 rgba[i][0], rgba[i][1],

+				 rgba[i][2], rgba[i][3] );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+static void TAG(WriteRGBSpan)( struct gl_context *ctx,

+                               struct gl_renderbuffer *rb,

+			       GLuint n, GLint x, GLint y,

+			       const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) values;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+

+	       if (DBG) fprintf(stderr, "WriteRGBSpan %d..%d (x1 %d)\n",

+				(int)i, (int)n1, (int)x1);

+

+	       if (mask)

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+			WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );

+	       }

+	       else

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     WRITE_RGBA( x1, y, rgb[i][0], rgb[i][1], rgb[i][2], 255 );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+static void TAG(WriteRGBAPixels)( struct gl_context *ctx,

+                                  struct gl_renderbuffer *rb,

+                                  GLuint n, const GLint x[], const GLint y[],

+                                  const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) values;

+	 GLint i;

+	 LOCAL_VARS;

+

+	 if (DBG) fprintf(stderr, "WriteRGBAPixels\n");

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       if (mask)

+	       {

+	          for (i=0;i<n;i++)

+	          {

+		     if (mask[i]) {

+		        const int fy = Y_FLIP(y[i]);

+		        if (CLIPPIXEL(x[i],fy))

+			   WRITE_RGBA( x[i], fy,

+				       rgba[i][0], rgba[i][1],

+				       rgba[i][2], rgba[i][3] );

+		     }

+	          }

+	       }

+	       else

+	       {

+	          for (i=0;i<n;i++)

+	          {

+		     const int fy = Y_FLIP(y[i]);

+		     if (CLIPPIXEL(x[i],fy))

+			WRITE_RGBA( x[i], fy,

+				    rgba[i][0], rgba[i][1],

+				    rgba[i][2], rgba[i][3] );

+	          }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+static void TAG(WriteMonoRGBASpan)( struct gl_context *ctx,	

+                                    struct gl_renderbuffer *rb,

+				    GLuint n, GLint x, GLint y, 

+				    const void *value, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte *color = (const GLubyte *) value;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_VARS;

+	 INIT_MONO_PIXEL(p, color);

+

+	 y = Y_FLIP( y );

+

+	 if (DBG) fprintf(stderr, "WriteMonoRGBASpan\n");

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+	       if (mask)

+	       {

+	          for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+		        WRITE_PIXEL( x1, y, p );

+	       }

+	       else

+	       {

+	          for (;n1>0;i++,x1++,n1--)

+		     WRITE_PIXEL( x1, y, p );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+static void TAG(WriteMonoRGBAPixels)( struct gl_context *ctx,

+                                      struct gl_renderbuffer *rb,

+				      GLuint n,

+				      const GLint x[], const GLint y[],

+				      const void *value,

+				      const GLubyte mask[] ) 

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte *color = (const GLubyte *) value;

+	 GLint i;

+	 LOCAL_VARS;

+	 INIT_MONO_PIXEL(p, color);

+

+	 if (DBG) fprintf(stderr, "WriteMonoRGBAPixels\n");

+

+	 HW_WRITE_CLIPLOOP()

+	    {

+	       if (mask)

+	       {

+		  for (i=0;i<n;i++)

+		     if (mask[i]) {

+			int fy = Y_FLIP(y[i]);

+			if (CLIPPIXEL( x[i], fy ))

+			   WRITE_PIXEL( x[i], fy, p );

+		     }

+	       }

+	       else

+	       {

+		  for (i=0;i<n;i++) {

+		     int fy = Y_FLIP(y[i]);

+		     if (CLIPPIXEL( x[i], fy ))

+			WRITE_PIXEL( x[i], fy, p );

+		  }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+static void TAG(ReadRGBASpan)( struct gl_context *ctx,

+                               struct gl_renderbuffer *rb,

+			       GLuint n, GLint x, GLint y, void *values)

+{

+   HW_READ_LOCK()

+      {

+         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	 GLint x1,n1;

+	 LOCAL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 if (DBG) fprintf(stderr, "ReadRGBASpan\n");

+

+	 HW_READ_CLIPLOOP()

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+	       for (;n1>0;i++,x1++,n1--)

+		  READ_RGBA( rgba[i], x1, y );

+	    }

+         HW_ENDCLIPLOOP();

+      }

+   HW_READ_UNLOCK();

+}

+

+

+#if defined(GET_PTR) && \

+   defined(USE_MMX_ASM) && \

+   (((SPANTMP_PIXEL_FMT == GL_BGRA) && \

+	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)) || \

+    ((SPANTMP_PIXEL_FMT == GL_RGB) && \

+	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)))

+static void TAG2(ReadRGBASpan,_MMX)( struct gl_context *ctx,

+                                     struct gl_renderbuffer *rb,

+                                     GLuint n, GLint x, GLint y, void *values)

+{

+#ifndef USE_INNER_EMMS

+   /* The EMMS instruction is directly in-lined here because using GCC's

+    * built-in _mm_empty function was found to utterly destroy performance.

+    */

+   __asm__ __volatile__( "emms" );

+#endif

+

+   HW_READ_LOCK()

+     {

+        GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	GLint x1,n1;

+	LOCAL_VARS;

+

+	y = Y_FLIP(y);

+

+	if (DBG) fprintf(stderr, "ReadRGBASpan\n");

+

+	HW_READ_CLIPLOOP()

+	  {

+	     GLint i = 0;

+	     CLIPSPAN(x,y,n,x1,n1,i);

+

+	       {

+		  const void * src = GET_PTR( x1, y );

+#if (SPANTMP_PIXEL_FMT == GL_RGB) && \

+		  (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)

+		  _generic_read_RGBA_span_RGB565_MMX( src, rgba[i], n1 );

+#else

+		  _generic_read_RGBA_span_BGRA8888_REV_MMX( src, rgba[i], n1 );

+#endif

+	       }

+	  }

+	HW_ENDCLIPLOOP();

+     }

+   HW_READ_UNLOCK();

+#ifndef USE_INNER_EMMS

+   __asm__ __volatile__( "emms" );

+#endif

+}

+#endif

+

+

+#if defined(GET_PTR) &&	\

+   defined(USE_SSE_ASM) && \

+   (SPANTMP_PIXEL_FMT == GL_BGRA) && \

+     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)

+static void TAG2(ReadRGBASpan,_SSE2)( struct gl_context *ctx,

+                                      struct gl_renderbuffer *rb,

+                                      GLuint n, GLint x, GLint y,

+                                      void *values)

+{

+   HW_READ_LOCK()

+     {

+        GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	GLint x1,n1;

+	LOCAL_VARS;

+

+	y = Y_FLIP(y);

+

+	if (DBG) fprintf(stderr, "ReadRGBASpan\n");

+

+	HW_READ_CLIPLOOP()

+	  {

+	     GLint i = 0;

+	     CLIPSPAN(x,y,n,x1,n1,i);

+

+	       {

+		  const void * src = GET_PTR( x1, y );

+		  _generic_read_RGBA_span_BGRA8888_REV_SSE2( src, rgba[i], n1 );

+	       }

+	  }

+	HW_ENDCLIPLOOP();

+     }

+   HW_READ_UNLOCK();

+}

+#endif

+

+#if defined(GET_PTR) &&	\

+   defined(USE_SSE_ASM) && \

+   (SPANTMP_PIXEL_FMT == GL_BGRA) && \

+     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)

+static void TAG2(ReadRGBASpan,_SSE)( struct gl_context *ctx,

+                                     struct gl_renderbuffer *rb,

+                                     GLuint n, GLint x, GLint y,

+                                     void *values)

+{

+#ifndef USE_INNER_EMMS

+   /* The EMMS instruction is directly in-lined here because using GCC's

+    * built-in _mm_empty function was found to utterly destroy performance.

+    */

+   __asm__ __volatile__( "emms" );

+#endif

+

+   HW_READ_LOCK()

+     {

+        GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	GLint x1,n1;

+	LOCAL_VARS;

+

+	y = Y_FLIP(y);

+

+	if (DBG) fprintf(stderr, "ReadRGBASpan\n");

+

+	HW_READ_CLIPLOOP()

+	  {

+	     GLint i = 0;

+	     CLIPSPAN(x,y,n,x1,n1,i);

+

+	       {

+		  const void * src = GET_PTR( x1, y );

+		  _generic_read_RGBA_span_BGRA8888_REV_SSE( src, rgba[i], n1 );

+	       }

+	  }

+	HW_ENDCLIPLOOP();

+     }

+   HW_READ_UNLOCK();

+#ifndef USE_INNER_EMMS

+   __asm__ __volatile__( "emms" );

+#endif

+}

+#endif

+

+

+static void TAG(ReadRGBAPixels)( struct gl_context *ctx,

+                                 struct gl_renderbuffer *rb,

+				 GLuint n, const GLint x[], const GLint y[],

+				 void *values )

+{

+   HW_READ_LOCK()

+      {

+         GLubyte (*rgba)[4] = (GLubyte (*)[4]) values;

+	 GLint i;

+	 LOCAL_VARS;

+

+	 if (DBG) fprintf(stderr, "ReadRGBAPixels\n");

+

+	 HW_READ_CLIPLOOP()

+	    {

+               for (i=0;i<n;i++) {

+                  int fy = Y_FLIP( y[i] );

+                     if (CLIPPIXEL( x[i], fy ))

+                        READ_RGBA( rgba[i], x[i], fy );

+               }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_READ_UNLOCK();

+}

+

+static void TAG(InitPointers)(struct gl_renderbuffer *rb)

+{

+   rb->PutRow = TAG(WriteRGBASpan);

+   rb->PutRowRGB = TAG(WriteRGBSpan);

+   rb->PutMonoRow = TAG(WriteMonoRGBASpan);

+   rb->PutValues = TAG(WriteRGBAPixels);

+   rb->PutMonoValues = TAG(WriteMonoRGBAPixels);

+   rb->GetValues = TAG(ReadRGBAPixels);

+

+#if defined(GET_PTR)

+#if defined(USE_SSE_ASM) && \

+   (SPANTMP_PIXEL_FMT == GL_BGRA) && \

+     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)

+   if ( cpu_has_xmm2 ) {

+      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "SSE2" );

+      rb->GetRow = TAG2(ReadRGBASpan, _SSE2);

+   }

+   else

+#endif

+#if defined(USE_SSE_ASM) && \

+   (SPANTMP_PIXEL_FMT == GL_BGRA) && \

+     (SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)

+   if ( cpu_has_xmm ) {

+      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "SSE" );

+      rb->GetRow = TAG2(ReadRGBASpan, _SSE);

+   }

+   else

+#endif

+#if defined(USE_MMX_ASM) && \

+   (((SPANTMP_PIXEL_FMT == GL_BGRA) && \

+	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_INT_8_8_8_8_REV)) || \

+    ((SPANTMP_PIXEL_FMT == GL_RGB) && \

+	(SPANTMP_PIXEL_TYPE == GL_UNSIGNED_SHORT_5_6_5)))

+   if ( cpu_has_mmx ) {

+      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "MMX" );

+      rb->GetRow = TAG2(ReadRGBASpan, _MMX);

+   }

+   else

+#endif

+#endif /* GET_PTR */

+   {

+      if (DBG) fprintf( stderr, "Using %s version of GetRow\n", "C" );

+      rb->GetRow = TAG(ReadRGBASpan);

+   }

+

+}

+

+

+#undef INIT_MONO_PIXEL

+#undef WRITE_PIXEL

+#undef WRITE_RGBA

+#undef READ_RGBA

+#undef TAG

+#undef TAG2

+#undef GET_VALUE

+#undef PUT_VALUE

+#undef GET_PTR

+#undef SPANTMP_PIXEL_FMT

+#undef SPANTMP_PIXEL_TYPE

+#undef SPANTMP_MESA_FMT

diff --git a/mesalib/src/mesa/drivers/dri/common/stenciltmp.h b/mesalib/src/mesa/drivers/dri/common/stenciltmp.h
index 2b10b9ecf..2ea2e207a 100644
--- a/mesalib/src/mesa/drivers/dri/common/stenciltmp.h
+++ b/mesalib/src/mesa/drivers/dri/common/stenciltmp.h
@@ -1,245 +1,245 @@
-
-#include "spantmp_common.h"
-
-#ifndef DBG
-#define DBG 0
-#endif
-
-#ifndef HAVE_HW_STENCIL_SPANS
-#define HAVE_HW_STENCIL_SPANS 0
-#endif
-
-#ifndef HAVE_HW_STENCIL_PIXELS
-#define HAVE_HW_STENCIL_PIXELS 0
-#endif
-
-static void TAG(WriteStencilSpan)( GLcontext *ctx,
-                                   struct gl_renderbuffer *rb,
-				   GLuint n, GLint x, GLint y,
-				   const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *stencil = (const GLubyte *) values;
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_STENCIL_VARS;
-
-	 y = Y_FLIP(y);
-
-#if HAVE_HW_STENCIL_SPANS
-	 (void) x1; (void) n1;
-
-	 if (DBG) fprintf(stderr, "WriteStencilSpan 0..%d (x1 %d)\n",
-			  (int)n1, (int)x1);
-
-	 WRITE_STENCIL_SPAN();
-#else /* HAVE_HW_STENCIL_SPANS */
-	 HW_CLIPLOOP() 
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_STENCIL( x1, y, stencil[i] );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_STENCIL( x1, y, stencil[i] );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif /* !HAVE_HW_STENCIL_SPANS */
-      }
-   HW_WRITE_UNLOCK();
-}
-
-#if HAVE_HW_STENCIL_SPANS
-/* implement MonoWriteDepthSpan() in terms of WriteDepthSpan() */
-static void
-TAG(WriteMonoStencilSpan)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                           GLuint n, GLint x, GLint y,
-                           const void *value, const GLubyte mask[] )
-{
-   const GLuint stenVal = *((GLuint *) value);
-   GLuint stens[MAX_WIDTH];
-   GLuint i;
-   for (i = 0; i < n; i++)
-      stens[i] = stenVal;
-   TAG(WriteStencilSpan)(ctx, rb, n, x, y, stens, mask);
-}
-#else /* HAVE_HW_STENCIL_SPANS */
-static void TAG(WriteMonoStencilSpan)( GLcontext *ctx,
-                                       struct gl_renderbuffer *rb,
-                                       GLuint n, GLint x, GLint y,
-                                       const void *value,
-                                       const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte stencil = *((const GLubyte *) value);
-	 GLint x1;
-	 GLint n1;
-	 LOCAL_STENCIL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 HW_CLIPLOOP() 
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-
-	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",
-				(int)i, (int)n1, (int)x1);
-
-	       if (mask)
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     if (mask[i])
-			WRITE_STENCIL( x1, y, stencil );
-	       }
-	       else
-	       {
-		  for (;n1>0;i++,x1++,n1--)
-		     WRITE_STENCIL( x1, y, stencil );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-      }
-   HW_WRITE_UNLOCK();
-}
-#endif /* !HAVE_HW_STENCIL_SPANS */
-
-
-static void TAG(WriteStencilPixels)( GLcontext *ctx,
-                                     struct gl_renderbuffer *rb,
-				     GLuint n,
-				     const GLint x[], const GLint y[],
-				     const void *values, const GLubyte mask[] )
-{
-   HW_WRITE_LOCK()
-      {
-         const GLubyte *stencil = (const GLubyte *) values;
-	 GLuint i;
-	 LOCAL_STENCIL_VARS;
-
-	 if (DBG) fprintf(stderr, "WriteStencilPixels\n");
-
-#if HAVE_HW_STENCIL_PIXELS
-	 (void) i;
-
-	 WRITE_STENCIL_PIXELS();
-#else /* HAVE_HW_STENCIL_PIXELS */
-	 HW_CLIPLOOP()
-	    {
-	       for (i=0;i<n;i++)
-	       {
-		  if (mask[i]) {
-		     const int fy = Y_FLIP(y[i]);
-		     if (CLIPPIXEL(x[i],fy))
-			WRITE_STENCIL( x[i], fy, stencil[i] );
-		  }
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif /* !HAVE_HW_STENCIL_PIXELS */
-      }
-   HW_WRITE_UNLOCK();
-}
-
-
-/* Read stencil spans and pixels
- */
-static void TAG(ReadStencilSpan)( GLcontext *ctx,
-                                  struct gl_renderbuffer *rb,
-				  GLuint n, GLint x, GLint y,
-				  void *values)
-{
-   HW_READ_LOCK()
-      {
-         GLubyte *stencil = (GLubyte *) values;
-	 GLint x1,n1;
-	 LOCAL_STENCIL_VARS;
-
-	 y = Y_FLIP(y);
-
-	 if (DBG) fprintf(stderr, "ReadStencilSpan\n");
-
-#if HAVE_HW_STENCIL_SPANS
-	 (void) x1; (void) n1;
-
-	 READ_STENCIL_SPAN();
-#else /* HAVE_HW_STENCIL_SPANS */
-	 HW_CLIPLOOP() 
-	    {
-	       GLint i = 0;
-	       CLIPSPAN(x,y,n,x1,n1,i);
-	       for (;n1>0;i++,n1--)
-		  READ_STENCIL( stencil[i], (x+i), y );
-	    }
-	 HW_ENDCLIPLOOP();
-#endif /* !HAVE_HW_STENCIL_SPANS */
-      }
-   HW_READ_UNLOCK();
-}
-
-static void TAG(ReadStencilPixels)( GLcontext *ctx,
-                                    struct gl_renderbuffer *rb,
-                                    GLuint n, const GLint x[], const GLint y[],
-				    void *values )
-{
-   HW_READ_LOCK()
-      {
-         GLubyte *stencil = (GLubyte *) values;
-	 GLuint i;
-	 LOCAL_STENCIL_VARS;
-
-	 if (DBG) fprintf(stderr, "ReadStencilPixels\n");
- 
-#if HAVE_HW_STENCIL_PIXELS
-	 (void) i;
-
-	 READ_STENCIL_PIXELS();
-#else /* HAVE_HW_STENCIL_PIXELS */
-	 HW_CLIPLOOP()
-	    {
-	       for (i=0;i<n;i++) {
-		  int fy = Y_FLIP( y[i] );
-		  if (CLIPPIXEL( x[i], fy ))
-		     READ_STENCIL( stencil[i], x[i], fy );
-	       }
-	    }
-	 HW_ENDCLIPLOOP();
-#endif /* !HAVE_HW_STENCIL_PIXELS */
-      }
-   HW_READ_UNLOCK();
-}
-
-
-
-/**
- * Initialize the given renderbuffer's span routines to point to
- * the stencil functions we generated above.
- */
-static void TAG(InitStencilPointers)(struct gl_renderbuffer *rb)
-{
-   rb->GetRow = TAG(ReadStencilSpan);
-   rb->GetValues = TAG(ReadStencilPixels);
-   rb->PutRow = TAG(WriteStencilSpan);
-   rb->PutRowRGB = NULL;
-   rb->PutMonoRow = TAG(WriteMonoStencilSpan);
-   rb->PutValues = TAG(WriteStencilPixels);
-   rb->PutMonoValues = NULL;
-}
-
-
-#undef WRITE_STENCIL
-#undef READ_STENCIL
-#undef TAG
+

+#include "spantmp_common.h"

+

+#ifndef DBG

+#define DBG 0

+#endif

+

+#ifndef HAVE_HW_STENCIL_SPANS

+#define HAVE_HW_STENCIL_SPANS 0

+#endif

+

+#ifndef HAVE_HW_STENCIL_PIXELS

+#define HAVE_HW_STENCIL_PIXELS 0

+#endif

+

+static void TAG(WriteStencilSpan)( struct gl_context *ctx,

+                                   struct gl_renderbuffer *rb,

+				   GLuint n, GLint x, GLint y,

+				   const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte *stencil = (const GLubyte *) values;

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_STENCIL_VARS;

+

+	 y = Y_FLIP(y);

+

+#if HAVE_HW_STENCIL_SPANS

+	 (void) x1; (void) n1;

+

+	 if (DBG) fprintf(stderr, "WriteStencilSpan 0..%d (x1 %d)\n",

+			  (int)n1, (int)x1);

+

+	 WRITE_STENCIL_SPAN();

+#else /* HAVE_HW_STENCIL_SPANS */

+	 HW_CLIPLOOP() 

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+

+	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",

+				(int)i, (int)n1, (int)x1);

+

+	       if (mask)

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+			WRITE_STENCIL( x1, y, stencil[i] );

+	       }

+	       else

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     WRITE_STENCIL( x1, y, stencil[i] );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif /* !HAVE_HW_STENCIL_SPANS */

+      }

+   HW_WRITE_UNLOCK();

+}

+

+#if HAVE_HW_STENCIL_SPANS

+/* implement MonoWriteDepthSpan() in terms of WriteDepthSpan() */

+static void

+TAG(WriteMonoStencilSpan)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                           GLuint n, GLint x, GLint y,

+                           const void *value, const GLubyte mask[] )

+{

+   const GLuint stenVal = *((GLuint *) value);

+   GLuint stens[MAX_WIDTH];

+   GLuint i;

+   for (i = 0; i < n; i++)

+      stens[i] = stenVal;

+   TAG(WriteStencilSpan)(ctx, rb, n, x, y, stens, mask);

+}

+#else /* HAVE_HW_STENCIL_SPANS */

+static void TAG(WriteMonoStencilSpan)( struct gl_context *ctx,

+                                       struct gl_renderbuffer *rb,

+                                       GLuint n, GLint x, GLint y,

+                                       const void *value,

+                                       const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte stencil = *((const GLubyte *) value);

+	 GLint x1;

+	 GLint n1;

+	 LOCAL_STENCIL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 HW_CLIPLOOP() 

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+

+	       if (DBG) fprintf(stderr, "WriteStencilSpan %d..%d (x1 %d)\n",

+				(int)i, (int)n1, (int)x1);

+

+	       if (mask)

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     if (mask[i])

+			WRITE_STENCIL( x1, y, stencil );

+	       }

+	       else

+	       {

+		  for (;n1>0;i++,x1++,n1--)

+		     WRITE_STENCIL( x1, y, stencil );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+      }

+   HW_WRITE_UNLOCK();

+}

+#endif /* !HAVE_HW_STENCIL_SPANS */

+

+

+static void TAG(WriteStencilPixels)( struct gl_context *ctx,

+                                     struct gl_renderbuffer *rb,

+				     GLuint n,

+				     const GLint x[], const GLint y[],

+				     const void *values, const GLubyte mask[] )

+{

+   HW_WRITE_LOCK()

+      {

+         const GLubyte *stencil = (const GLubyte *) values;

+	 GLuint i;

+	 LOCAL_STENCIL_VARS;

+

+	 if (DBG) fprintf(stderr, "WriteStencilPixels\n");

+

+#if HAVE_HW_STENCIL_PIXELS

+	 (void) i;

+

+	 WRITE_STENCIL_PIXELS();

+#else /* HAVE_HW_STENCIL_PIXELS */

+	 HW_CLIPLOOP()

+	    {

+	       for (i=0;i<n;i++)

+	       {

+		  if (mask[i]) {

+		     const int fy = Y_FLIP(y[i]);

+		     if (CLIPPIXEL(x[i],fy))

+			WRITE_STENCIL( x[i], fy, stencil[i] );

+		  }

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif /* !HAVE_HW_STENCIL_PIXELS */

+      }

+   HW_WRITE_UNLOCK();

+}

+

+

+/* Read stencil spans and pixels

+ */

+static void TAG(ReadStencilSpan)( struct gl_context *ctx,

+                                  struct gl_renderbuffer *rb,

+				  GLuint n, GLint x, GLint y,

+				  void *values)

+{

+   HW_READ_LOCK()

+      {

+         GLubyte *stencil = (GLubyte *) values;

+	 GLint x1,n1;

+	 LOCAL_STENCIL_VARS;

+

+	 y = Y_FLIP(y);

+

+	 if (DBG) fprintf(stderr, "ReadStencilSpan\n");

+

+#if HAVE_HW_STENCIL_SPANS

+	 (void) x1; (void) n1;

+

+	 READ_STENCIL_SPAN();

+#else /* HAVE_HW_STENCIL_SPANS */

+	 HW_CLIPLOOP() 

+	    {

+	       GLint i = 0;

+	       CLIPSPAN(x,y,n,x1,n1,i);

+	       for (;n1>0;i++,n1--)

+		  READ_STENCIL( stencil[i], (x+i), y );

+	    }

+	 HW_ENDCLIPLOOP();

+#endif /* !HAVE_HW_STENCIL_SPANS */

+      }

+   HW_READ_UNLOCK();

+}

+

+static void TAG(ReadStencilPixels)( struct gl_context *ctx,

+                                    struct gl_renderbuffer *rb,

+                                    GLuint n, const GLint x[], const GLint y[],

+				    void *values )

+{

+   HW_READ_LOCK()

+      {

+         GLubyte *stencil = (GLubyte *) values;

+	 GLuint i;

+	 LOCAL_STENCIL_VARS;

+

+	 if (DBG) fprintf(stderr, "ReadStencilPixels\n");

+ 

+#if HAVE_HW_STENCIL_PIXELS

+	 (void) i;

+

+	 READ_STENCIL_PIXELS();

+#else /* HAVE_HW_STENCIL_PIXELS */

+	 HW_CLIPLOOP()

+	    {

+	       for (i=0;i<n;i++) {

+		  int fy = Y_FLIP( y[i] );

+		  if (CLIPPIXEL( x[i], fy ))

+		     READ_STENCIL( stencil[i], x[i], fy );

+	       }

+	    }

+	 HW_ENDCLIPLOOP();

+#endif /* !HAVE_HW_STENCIL_PIXELS */

+      }

+   HW_READ_UNLOCK();

+}

+

+

+

+/**

+ * Initialize the given renderbuffer's span routines to point to

+ * the stencil functions we generated above.

+ */

+static void TAG(InitStencilPointers)(struct gl_renderbuffer *rb)

+{

+   rb->GetRow = TAG(ReadStencilSpan);

+   rb->GetValues = TAG(ReadStencilPixels);

+   rb->PutRow = TAG(WriteStencilSpan);

+   rb->PutRowRGB = NULL;

+   rb->PutMonoRow = TAG(WriteMonoStencilSpan);

+   rb->PutValues = TAG(WriteStencilPixels);

+   rb->PutMonoValues = NULL;

+}

+

+

+#undef WRITE_STENCIL

+#undef READ_STENCIL

+#undef TAG

diff --git a/mesalib/src/mesa/drivers/dri/common/texmem.c b/mesalib/src/mesa/drivers/dri/common/texmem.c
index 895139b55..3c4f3373f 100644
--- a/mesalib/src/mesa/drivers/dri/common/texmem.c
+++ b/mesalib/src/mesa/drivers/dri/common/texmem.c
@@ -1,1341 +1,1341 @@
-/*
- * Copyright 2000-2001 VA Linux Systems, Inc.
- * (C) Copyright IBM Corporation 2002, 2003
- * 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
- * VA LINUX SYSTEM, IBM 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:
- *    Ian Romanick <idr@us.ibm.com>
- *    Keith Whitwell <keithw@tungstengraphics.com>
- *    Kevin E. Martin <kem@users.sourceforge.net>
- *    Gareth Hughes <gareth@nvidia.com>
- */
-
-/** \file texmem.c
- * Implements all of the device-independent texture memory management.
- * 
- * Currently, only a simple LRU texture memory management policy is
- * implemented.  In the (hopefully very near) future, better policies will be
- * implemented.  The idea is that the DRI should be able to run in one of two
- * modes.  In the default mode the DRI will dynamically attempt to discover
- * the best texture management policy for the running application.  In the
- * other mode, the user (via some sort of as yet TBD mechanism) will select
- * a texture management policy that is known to work well with the
- * application.
- */
-
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/simple_list.h"
-#include "texmem.h"
-
-
-static unsigned dummy_swap_counter;
-
-
-/**
- * Calculate \f$\log_2\f$ of a value.  This is a particularly poor
- * implementation of this function.  However, since system performance is in
- * no way dependent on this function, the slowness of the implementation is
- * irrelevent.
- * 
- * \param n Value whose \f$\log_2\f$ is to be calculated
- */
-
-static GLuint
-driLog2( GLuint n )
-{
-   GLuint log2;
-
-   for ( log2 = 1 ; n > 1 ; log2++ ) {
-      n >>= 1;
-   }
-
-   return log2;
-}
-
-
-
-
-/**
- * Determine if a texture is resident in textureable memory.  Depending on
- * the driver, this may or may not be on-card memory.  It could be AGP memory
- * or anyother type of memory from which the hardware can directly read
- * texels.
- * 
- * This function is intended to be used as the \c IsTextureResident function
- * in the device's \c dd_function_table.
- * 
- * \param ctx GL context pointer (currently unused)
- * \param texObj Texture object to be tested
- */
-
-GLboolean
-driIsTextureResident( GLcontext * ctx, 
-		      struct gl_texture_object * texObj )
-{
-   driTextureObject * t;
-
-
-   t = (driTextureObject *) texObj->DriverData;
-   return( (t != NULL) && (t->memBlock != NULL) );
-}
-
-
-
-
-/**
- * (Re)initialize the global circular LRU list.  The last element
- * in the array (\a heap->nrRegions) is the sentinal.  Keeping it
- * at the end of the array allows the other elements of the array
- * to be addressed rationally when looking up objects at a particular
- * location in texture memory.
- * 
- * \param heap Texture heap to be reset
- */
-
-static void resetGlobalLRU( driTexHeap * heap )
-{
-   drmTextureRegionPtr list = heap->global_regions;
-   unsigned       sz = 1U << heap->logGranularity;
-   unsigned       i;
-
-   for (i = 0 ; (i+1) * sz <= heap->size ; i++) {
-      list[i].prev = i-1;
-      list[i].next = i+1;
-      list[i].age = 0;
-   }
-
-   i--;
-   list[0].prev = heap->nrRegions;
-   list[i].prev = i-1;
-   list[i].next = heap->nrRegions;
-   list[heap->nrRegions].prev = i;
-   list[heap->nrRegions].next = 0;
-   heap->global_age[0] = 0;
-}
-
-/**
- * Print out debugging information about the local texture LRU.
- *
- * \param heap Texture heap to be printed
- * \param callername Name of calling function
- */
-static void printLocalLRU( driTexHeap * heap, const char *callername  )
-{
-   driTextureObject *t;
-   unsigned sz = 1U << heap->logGranularity;
-
-   fprintf( stderr, "%s in %s:\nLocal LRU, heap %d:\n", 
-	    __FUNCTION__, callername, heap->heapId );
-
-   foreach ( t, &heap->texture_objects ) {
-      if (!t->memBlock)
-	 continue;
-      if (!t->tObj) {
-	 fprintf( stderr, "Placeholder (%p) %d at 0x%x sz 0x%x\n",
-		  (void *)t,
-		  t->memBlock->ofs / sz,
-		  t->memBlock->ofs,
-		  t->memBlock->size );
-      } else {
-	 fprintf( stderr, "Texture (%p) at 0x%x sz 0x%x\n",
-		  (void *)t,
-		  t->memBlock->ofs,
-		  t->memBlock->size );
-      }
-   }
-   foreach ( t, heap->swapped_objects ) {
-      if (!t->tObj) {
-	 fprintf( stderr, "Swapped Placeholder (%p)\n", (void *)t );
-      } else {
-	 fprintf( stderr, "Swapped Texture (%p)\n", (void *)t );
-      }
-   }
-
-   fprintf( stderr, "\n" );
-}
-
-/**
- * Print out debugging information about the global texture LRU.
- *
- * \param heap Texture heap to be printed
- * \param callername Name of calling function
- */
-static void printGlobalLRU( driTexHeap * heap, const char *callername )
-{
-   drmTextureRegionPtr list = heap->global_regions;
-   unsigned int i, j;
-
-   fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n", 
-	    __FUNCTION__, callername, heap->heapId, (void *)list );
-
-   for ( i = 0, j = heap->nrRegions ; i < heap->nrRegions ; i++ ) {
-      fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n",
-	       j, list[j].age, list[j].next, list[j].prev, list[j].in_use );
-      j = list[j].next;
-      if ( j == heap->nrRegions ) break;
-   }
-
-   if ( j != heap->nrRegions ) {
-      fprintf( stderr, "Loop detected in global LRU\n" );
-      for ( i = 0 ; i < heap->nrRegions ; i++ ) {
-	 fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n",
-		  i, list[i].age, list[i].next, list[i].prev, list[i].in_use );
-      }
-   }
-
-   fprintf( stderr, "\n" );
-}
-
-
-/**
- * Called by the client whenever it touches a local texture.
- * 
- * \param t Texture object that the client has accessed
- */
-
-void driUpdateTextureLRU( driTextureObject * t )
-{
-   driTexHeap   * heap;
-   drmTextureRegionPtr list;
-   unsigned   shift;
-   unsigned   start;
-   unsigned   end;
-   unsigned   i;
-
-
-   heap = t->heap;
-   if ( heap != NULL ) {
-      shift = heap->logGranularity;
-      start = t->memBlock->ofs >> shift;
-      end = (t->memBlock->ofs + t->memBlock->size - 1) >> shift;
-
-
-      heap->local_age = ++heap->global_age[0];
-      list = heap->global_regions;
-
-
-      /* Update the context's local LRU 
-       */
-
-      move_to_head( & heap->texture_objects, t );
-
-
-      for (i = start ; i <= end ; i++) {
-	 list[i].age = heap->local_age;
-
-	 /* remove_from_list(i)
-	  */
-	 list[(unsigned)list[i].next].prev = list[i].prev;
-	 list[(unsigned)list[i].prev].next = list[i].next;
-
-	 /* insert_at_head(list, i)
-	  */
-	 list[i].prev = heap->nrRegions;
-	 list[i].next = list[heap->nrRegions].next;
-	 list[(unsigned)list[heap->nrRegions].next].prev = i;
-	 list[heap->nrRegions].next = i;
-      }
-
-      if ( 0 ) {
-	 printGlobalLRU( heap, __FUNCTION__ );
-	 printLocalLRU( heap, __FUNCTION__ );
-      }
-   }
-}
-
-
-
-
-/**
- * Keep track of swapped out texture objects.
- * 
- * \param t Texture object to be "swapped" out of its texture heap
- */
-
-void driSwapOutTextureObject( driTextureObject * t )
-{
-   unsigned   face;
-
-
-   if ( t->memBlock != NULL ) {
-      assert( t->heap != NULL );
-      mmFreeMem( t->memBlock );
-      t->memBlock = NULL;
-
-      if (t->timestamp > t->heap->timestamp)
-	 t->heap->timestamp = t->timestamp;
-
-      t->heap->texture_swaps[0]++;
-      move_to_tail( t->heap->swapped_objects, t );
-      t->heap = NULL;
-   }
-   else {
-      assert( t->heap == NULL );
-   }
-
-
-   for ( face = 0 ; face < 6 ; face++ ) {
-      t->dirty_images[face] = ~0;
-   }
-}
-
-
-
-
-/**
- * Destroy hardware state associated with texture \a t.  Calls the
- * \a destroy_texture_object method associated with the heap from which
- * \a t was allocated.
- * 
- * \param t Texture object to be destroyed
- */
-
-void driDestroyTextureObject( driTextureObject * t )
-{
-   driTexHeap * heap;
-
-
-   if ( 0 ) {
-      fprintf( stderr, "[%s:%d] freeing %p (tObj = %p, DriverData = %p)\n",
-	       __FILE__, __LINE__,
-	       (void *)t,
-	       (void *)((t != NULL) ? t->tObj : NULL),
-	       (void *)((t != NULL && t->tObj != NULL) ? t->tObj->DriverData : NULL ));
-   }
-
-   if ( t != NULL ) {
-      if ( t->memBlock ) {
-	 heap = t->heap;
-	 assert( heap != NULL );
-
-	 heap->texture_swaps[0]++;
-
-	 mmFreeMem( t->memBlock );
-	 t->memBlock = NULL;
-
-	 if (t->timestamp > t->heap->timestamp)
-	    t->heap->timestamp = t->timestamp;
-
-	 heap->destroy_texture_object( heap->driverContext, t );
-	 t->heap = NULL;
-      }
-
-      if ( t->tObj != NULL ) {
-	 assert( t->tObj->DriverData == t );
-	 t->tObj->DriverData = NULL;
-      }
-
-      remove_from_list( t );
-      FREE( t );
-   }
-
-   if ( 0 ) {
-      fprintf( stderr, "[%s:%d] done freeing %p\n", __FILE__, __LINE__, (void *)t );
-   }
-}
-
-
-
-
-/**
- * Update the local heap's representation of texture memory based on
- * data in the SAREA.  This is done each time it is detected that some other
- * direct rendering client has held the lock.  This pertains to both our local
- * textures and the textures belonging to other clients.  Keep track of other
- * client's textures by pushing a placeholder texture onto the LRU list --
- * these are denoted by \a tObj being \a NULL.
- * 
- * \param heap Heap whose state is to be updated
- * \param offset Byte offset in the heap that has been stolen
- * \param size Size, in bytes, of the stolen block
- * \param in_use Non-zero if the block is pinned/reserved by the kernel
- */
-
-static void driTexturesGone( driTexHeap * heap, int offset, int size, 
-			     int in_use )
-{
-   driTextureObject * t;
-   driTextureObject * tmp;
-
-
-   foreach_s ( t, tmp, & heap->texture_objects ) {
-      if ( (t->memBlock->ofs < (offset + size))
-	   && ((t->memBlock->ofs + t->memBlock->size) > offset) ) {
-	 /* It overlaps - kick it out.  If the texture object is just a
-	  * place holder, then destroy it all together.  Otherwise, mark
-	  * it as being swapped out.
-	  */
-
-	 if ( t->tObj != NULL ) {
-	    driSwapOutTextureObject( t );
-	 }
-	 else {
-	    driDestroyTextureObject( t );
-	 }
-      }
-   }
-
-
-   {
-      t = (driTextureObject *) CALLOC( heap->texture_object_size );
-      if ( t == NULL ) return;
-
-      t->memBlock = mmAllocMem( heap->memory_heap, size, 0, offset );
-      if ( t->memBlock == NULL ) {
-	 fprintf( stderr, "Couldn't alloc placeholder: heap %u sz %x ofs %x\n", heap->heapId,
-		  (int)size, (int)offset );
-	 mmDumpMemInfo( heap->memory_heap );
-	 FREE(t);
-	 return;
-      }
-      t->heap = heap;
-      if (in_use) 
-	 t->reserved = 1; 
-      insert_at_head( & heap->texture_objects, t );
-   }
-}
-
-
-
-
-/**
- * Called by the client on lock contention to determine whether textures have
- * been stolen.  If another client has modified a region in which we have
- * textures, then we need to figure out which of our textures have been
- * removed and update our global LRU.
- * 
- * \param heap Texture heap to be updated
- */
-
-void driAgeTextures( driTexHeap * heap )
-{
-   drmTextureRegionPtr list = heap->global_regions;
-   unsigned       sz = 1U << (heap->logGranularity);
-   unsigned       i, nr = 0;
-
-
-   /* Have to go right round from the back to ensure stuff ends up
-    * LRU in the local list...  Fix with a cursor pointer.
-    */
-
-   for (i = list[heap->nrRegions].prev ; 
-	i != heap->nrRegions && nr < heap->nrRegions ; 
-	i = list[i].prev, nr++) {
-      /* If switching texturing schemes, then the SAREA might not have been
-       * properly cleared, so we need to reset the global texture LRU.
-       */
-
-      if ( (i * sz) > heap->size ) {
-	 nr = heap->nrRegions;
-	 break;
-      }
-
-      if (list[i].age > heap->local_age) 
-	  driTexturesGone( heap, i * sz, sz, list[i].in_use); 
-   }
-
-   /* Loop or uninitialized heap detected.  Reset.
-    */
-
-   if (nr == heap->nrRegions) {
-      driTexturesGone( heap, 0, heap->size, 0);
-      resetGlobalLRU( heap );
-   }
-
-   if ( 0 ) {
-      printGlobalLRU( heap, __FUNCTION__ );
-      printLocalLRU( heap, __FUNCTION__ );
-   }
-
-   heap->local_age = heap->global_age[0];
-}
-
-
-
-
-#define INDEX_ARRAY_SIZE 6 /* I'm not aware of driver with more than 2 heaps */
-
-/**
- * Allocate memory from a texture heap to hold a texture object.  This
- * routine will attempt to allocate memory for the texture from the heaps
- * specified by \c heap_array in order.  That is, first it will try to
- * allocate from \c heap_array[0], then \c heap_array[1], and so on.
- *
- * \param heap_array Array of pointers to texture heaps to use
- * \param nr_heaps Number of heap pointer in \a heap_array
- * \param t Texture object for which space is needed
- * \return The ID of the heap from which memory was allocated, or -1 if
- *         memory could not be allocated.
- *
- * \bug The replacement policy implemented by this function is horrible.
- */
-
-
-int
-driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,
-		    driTextureObject * t )
-{
-   driTexHeap       * heap;
-   driTextureObject * temp;
-   driTextureObject * cursor;
-   unsigned           id;
-
-
-   /* In case it already has texture space, initialize heap.  This also
-    * prevents GCC from issuing a warning that heap might be used
-    * uninitialized.
-    */
-
-   heap = t->heap;
-
-
-   /* Run through each of the existing heaps and try to allocate a buffer
-    * to hold the texture.
-    */
-
-   for ( id = 0 ; (t->memBlock == NULL) && (id < nr_heaps) ; id++ ) {
-      heap = heap_array[ id ];
-      if ( heap != NULL ) {
-	 t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, 
-				   heap->alignmentShift, 0 );
-      }
-   }
-
-
-   /* Kick textures out until the requested texture fits.
-    */
-
-   if ( t->memBlock == NULL ) {
-      unsigned index[INDEX_ARRAY_SIZE];
-      unsigned nrGoodHeaps = 0;
-
-      /* Trying to avoid dynamic memory allocation. If you have more
-       * heaps, increase INDEX_ARRAY_SIZE. I'm not aware of any
-       * drivers with more than 2 tex heaps. */
-      assert( nr_heaps < INDEX_ARRAY_SIZE );
-
-      /* Sort large enough heaps by duty. Insertion sort should be
-       * fast enough for such a short array. */
-      for ( id = 0 ; id < nr_heaps ; id++ ) {
-	 heap = heap_array[ id ];
-
-	 if ( heap != NULL && t->totalSize <= heap->size ) {
-	    unsigned j;
-
-	    for ( j = 0 ; j < nrGoodHeaps; j++ ) {
-	       if ( heap->duty > heap_array[ index[ j ] ]->duty )
-		  break;
-	    }
-
-	    if ( j < nrGoodHeaps ) {
-	       memmove( &index[ j+1 ], &index[ j ],
-			sizeof(index[ 0 ]) * (nrGoodHeaps - j) );
-	    }
-
-	    index[ j ] = id;
-
-	    nrGoodHeaps++;
-	 }
-      }
-
-      for ( id = 0 ; (t->memBlock == NULL) && (id < nrGoodHeaps) ; id++ ) {
-	 heap = heap_array[ index[ id ] ];
-
-	 for ( cursor = heap->texture_objects.prev, temp = cursor->prev;
-	       cursor != &heap->texture_objects ; 
-	       cursor = temp, temp = cursor->prev ) {
-	       
-	    /* The the LRU element.  If the texture is bound to one of
-	     * the texture units, then we cannot kick it out.
-	     */
-	    if ( cursor->bound || cursor->reserved ) {
-	       continue;
-	    }
-
-	    if ( cursor->memBlock )
-	       heap->duty -= cursor->memBlock->size;
-
-	    /* If this is a placeholder, there's no need to keep it */
-	    if (cursor->tObj)
-	       driSwapOutTextureObject( cursor );
-	    else
-	       driDestroyTextureObject( cursor );
-
-	    t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, 
-				      heap->alignmentShift, 0 );
-
-	    if (t->memBlock)
-	       break;
-	 }
-      }
-
-      /* Rebalance duties. If a heap kicked more data than its duty,
-       * then all other heaps get that amount multiplied with their
-       * relative weight added to their duty. The negative duty is
-       * reset to 0. In the end all heaps have a duty >= 0.
-       *
-       * CAUTION: we must not change the heap pointer here, because it
-       * is used below to update the texture object.
-       */
-      for ( id = 0 ; id < nr_heaps ; id++ )
-	 if ( heap_array[ id ] != NULL && heap_array[ id ]->duty < 0) {
-	    int duty = -heap_array[ id ]->duty;
-	    double weight = heap_array[ id ]->weight;
-	    unsigned j;
-
-	    for ( j = 0 ; j < nr_heaps ; j++ )
-	       if ( j != id && heap_array[ j ] != NULL ) {
-		  heap_array[ j ]->duty += (double) duty *
-		     heap_array[ j ]->weight / weight;
-	       }
-
-	    heap_array[ id ]->duty = 0;
-	 }
-   }
-
-
-   if ( t->memBlock != NULL ) {
-      /* id and heap->heapId may or may not be the same value here.
-       */
-
-      assert( heap != NULL );
-      assert( (t->heap == NULL) || (t->heap == heap) );
-
-      t->heap = heap;
-      return heap->heapId;
-   }
-   else {
-      assert( t->heap == NULL );
-
-      fprintf( stderr, "[%s:%d] unable to allocate texture\n",
-	       __FUNCTION__, __LINE__ );
-      return -1;
-   }
-}
-
-
-
-
-
-
-/**
- * Set the location where the texture-swap counter is stored.
- */
-
-void
-driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter )
-{
-   heap->texture_swaps = (counter == NULL) ? & dummy_swap_counter : counter;
-}
-
-
-
-
-/**
- * Create a new heap for texture data.
- * 
- * \param heap_id             Device-dependent heap identifier.  This value
- *                            will returned by driAllocateTexture when memory
- *                            is allocated from this heap.
- * \param context             Device-dependent driver context.  This is
- *                            supplied as the first parameter to the
- *                            \c destroy_tex_obj function.
- * \param size                Size, in bytes, of the texture region
- * \param alignmentShift      Alignment requirement for textures.  If textures 
- *                            must be allocated on a 4096 byte boundry, this
- *                            would be 12.
- * \param nr_regions          Number of regions into which this texture space
- *                            should be partitioned
- * \param global_regions      Array of \c drmTextureRegion structures in the SAREA
- * \param global_age          Pointer to the global texture age in the SAREA
- * \param swapped_objects     Pointer to the list of texture objects that are
- *                            not in texture memory (i.e., have been swapped
- *                            out).
- * \param texture_object_size Size, in bytes, of a device-dependent texture
- *                            object
- * \param destroy_tex_obj     Function used to destroy a device-dependent
- *                            texture object
- *
- * \sa driDestroyTextureHeap
- */
-
-driTexHeap *
-driCreateTextureHeap( unsigned heap_id, void * context, unsigned size,
-		      unsigned alignmentShift, unsigned nr_regions,
-		      drmTextureRegionPtr global_regions, unsigned * global_age,
-		      driTextureObject * swapped_objects, 
-		      unsigned texture_object_size,
-		      destroy_texture_object_t * destroy_tex_obj
-		    )
-{
-   driTexHeap * heap;
-   unsigned     l;
-    
-    
-   if ( 0 )
-       fprintf( stderr, "%s( %u, %p, %u, %u, %u )\n",
-		__FUNCTION__,
-		heap_id, (void *)context, size, alignmentShift, nr_regions );
-
-   heap = (driTexHeap *) CALLOC( sizeof( driTexHeap ) );
-   if ( heap != NULL ) {
-      l = driLog2( (size - 1) / nr_regions );
-      if ( l < alignmentShift )
-      {
-	 l = alignmentShift;
-      }
-
-      heap->logGranularity = l;
-      heap->size = size & ~((1L << l) - 1);
-
-      heap->memory_heap = mmInit( 0, heap->size );
-      if ( heap->memory_heap != NULL ) {
-	 heap->heapId = heap_id;
-	 heap->driverContext = context;
-
-	 heap->alignmentShift = alignmentShift;
-	 heap->nrRegions = nr_regions;
-	 heap->global_regions = global_regions;
-	 heap->global_age = global_age;
-	 heap->swapped_objects = swapped_objects;
-	 heap->texture_object_size = texture_object_size;
-	 heap->destroy_texture_object = destroy_tex_obj;
-
-	 /* Force global heap init */
-	 if (heap->global_age[0] == 0)
-	     heap->local_age = ~0;
-	 else
-	     heap->local_age = 0;
-
-	 make_empty_list( & heap->texture_objects );
-	 driSetTextureSwapCounterLocation( heap, NULL );
-
-	 heap->weight = heap->size;
-	 heap->duty = 0;
-      }
-      else {
-	 FREE( heap );
-	 heap = NULL;
-      }
-   }
-
-
-   if ( 0 )
-       fprintf( stderr, "%s returning %p\n", __FUNCTION__, (void *)heap );
-
-   return heap;
-}
-
-
-
-
-/** Destroys a texture heap
- * 
- * \param heap Texture heap to be destroyed
- */
-
-void
-driDestroyTextureHeap( driTexHeap * heap )
-{
-   driTextureObject * t;
-   driTextureObject * temp;
-
-
-   if ( heap != NULL ) {
-      foreach_s( t, temp, & heap->texture_objects ) {
-	 driDestroyTextureObject( t );
-      }
-      foreach_s( t, temp, heap->swapped_objects ) {
-	 driDestroyTextureObject( t );
-      }
-
-      mmDestroy( heap->memory_heap );
-      FREE( heap );
-   }
-}
-
-
-
-
-/****************************************************************************/
-/**
- * Determine how many texels (including all mipmap levels) would be required
- * for a texture map of size \f$2^^\c base_size_log2\f$ would require.
- *
- * \param base_size_log2 \f$log_2\f$ of the size of a side of the texture
- * \param dimensions Number of dimensions of the texture.  Either 2 or 3.
- * \param faces Number of faces of the texture.  Either 1 or 6 (for cube maps).
- * \return Number of texels
- */
-
-static unsigned
-texels_this_map_size( int base_size_log2, unsigned dimensions, unsigned faces )
-{
-   unsigned  texels;
-
-
-   assert( (faces == 1) || (faces == 6) );
-   assert( (dimensions == 2) || (dimensions == 3) );
-
-   texels = 0;
-   if ( base_size_log2 >= 0 ) {
-      texels = (1U << (dimensions * base_size_log2));
-
-      /* See http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg03636.html
-       * for the complete explaination of why this formulation is used.
-       * Basically, the smaller mipmap levels sum to 0.333 the size of the
-       * level 0 map.  The total size is therefore the size of the map
-       * multipled by 1.333.  The +2 is there to round up.
-       */
-
-      texels = (texels * 4 * faces + 2) / 3;
-   }
-
-   return texels;
-}
-
-
-
-
-struct maps_per_heap {
-   unsigned  c[32];
-};
-
-static void
-fill_in_maximums( driTexHeap * const * heaps, unsigned nr_heaps,
-		  unsigned max_bytes_per_texel, unsigned max_size,
-		  unsigned mipmaps_at_once, unsigned dimensions,
-		  unsigned faces, struct maps_per_heap * max_textures )
-{
-   unsigned   heap;
-   unsigned   log2_size;
-   unsigned   mask;
-
-
-   /* Determine how many textures of each size can be stored in each
-    * texture heap.
-    */
-
-   for ( heap = 0 ; heap < nr_heaps ; heap++ ) {
-      if ( heaps[ heap ] == NULL ) {
-	 (void) memset( max_textures[ heap ].c, 0, 
-			sizeof( max_textures[ heap ].c ) );
-	 continue;
-      }
-
-      mask = (1U << heaps[ heap ]->logGranularity) - 1;
-
-      if ( 0 ) {
-	 fprintf( stderr, "[%s:%d] heap[%u] = %u bytes, mask = 0x%08x\n",
-		  __FILE__, __LINE__,
-		  heap, heaps[ heap ]->size, mask );
-      }
-
-      for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) {
-	 unsigned   total;
-
-
-	 /* Determine the total number of bytes required by a texture of
-	  * size log2_size.
-	  */
-
-	 total = texels_this_map_size( log2_size, dimensions, faces )
-	     - texels_this_map_size( log2_size - mipmaps_at_once,
-				     dimensions, faces );
-	 total *= max_bytes_per_texel;
-	 total = (total + mask) & ~mask;
-
-	 /* The number of textures of a given size that will fit in a heap
-	  * is equal to the size of the heap divided by the size of the
-	  * texture.
-	  */
-
-	 max_textures[ heap ].c[ log2_size ] = heaps[ heap ]->size / total;
-
-	 if ( 0 ) {
-	    fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] "
-		     "= 0x%08x / 0x%08x "
-		     "= %u (%u)\n",
-		     __FILE__, __LINE__,
-		     heap, log2_size,
-		     heaps[ heap ]->size, total,
-		     heaps[ heap ]->size / total,
-		     max_textures[ heap ].c[ log2_size ] );
-	 }
-      }
-   }
-}
-
-
-static unsigned
-get_max_size( unsigned nr_heaps,
-	      unsigned texture_units,
-	      unsigned max_size,
-	      int all_textures_one_heap,
-	      struct maps_per_heap * max_textures )
-{
-   unsigned   heap;
-   unsigned   log2_size;
-
-
-   /* Determine the largest texture size such that a texture of that size
-    * can be bound to each texture unit at the same time.  Some hardware
-    * may require that all textures be in the same texture heap for
-    * multitexturing.
-    */
-
-   for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) {
-      unsigned   total = 0;
-
-      for ( heap = 0 ; heap < nr_heaps ; heap++ )
-      {
-	 total += max_textures[ heap ].c[ log2_size ];
-
-	 if ( 0 ) {
-	    fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] = %u, "
-		     "total = %u\n", __FILE__, __LINE__, heap, log2_size,
-		     max_textures[ heap ].c[ log2_size ], total );
-	 }
-
-	 if ( (max_textures[ heap ].c[ log2_size ] >= texture_units)
-	      || (!all_textures_one_heap && (total >= texture_units)) ) {
-	    /* The number of mipmap levels is the log-base-2 of the
-	     * maximum texture size plus 1.  If the maximum texture size
-	     * is 1x1, the log-base-2 is 0 and 1 mipmap level (the base
-	     * level) is available.
-	     */
-
-	    return log2_size + 1;
-	 }
-      }
-   }
-
-   /* This should NEVER happen.  It should always be possible to have at
-    * *least* a 1x1 texture in memory!
-    */
-   assert( log2_size != 0 );
-   return 0;
-}
-
-#define SET_MAX(f,v) \
-    do { if ( max_sizes[v] != 0 ) { limits-> f = max_sizes[v]; } } while( 0 )
-
-#define SET_MAX_RECT(f,v) \
-    do { if ( max_sizes[v] != 0 ) { limits-> f = 1 << (max_sizes[v] - 1); } } while( 0 )
-
-
-/**
- * Given the amount of texture memory, the number of texture units, and the
- * maximum size of a texel, calculate the maximum texture size the driver can
- * advertise.
- * 
- * \param heaps Texture heaps for this card
- * \param nr_heap Number of texture heaps
- * \param limits OpenGL contants.  MaxTextureUnits must be set.
- * \param max_bytes_per_texel Maximum size of a single texel, in bytes
- * \param max_2D_size \f$\log_2\f$ of the maximum 2D texture size (i.e.,
- *     1024x1024 textures, this would be 10)
- * \param max_3D_size \f$\log_2\f$ of the maximum 3D texture size (i.e.,
- *     1024x1024x1024 textures, this would be 10)
- * \param max_cube_size \f$\log_2\f$ of the maximum cube texture size (i.e.,
- *     1024x1024 textures, this would be 10)
- * \param max_rect_size \f$\log_2\f$ of the maximum texture rectangle size
- *     (i.e., 1024x1024 textures, this would be 10).  This is a power-of-2
- *     even though texture rectangles need not be a power-of-2.
- * \param mipmaps_at_once Total number of mipmaps that can be used
- *     at one time.  For most hardware this will be \f$\c max_size + 1\f$.
- *     For hardware that does not support mipmapping, this will be 1.
- * \param all_textures_one_heap True if the hardware requires that all
- *     textures be in a single texture heap for multitexturing.
- * \param allow_larger_textures 0 conservative, 1 calculate limits
- *     so at least one worst-case texture can fit, 2 just use hw limits.
- */
-
-void
-driCalculateMaxTextureLevels( driTexHeap * const * heaps,
-			      unsigned nr_heaps,
-			      struct gl_constants * limits,
-			      unsigned max_bytes_per_texel,
-			      unsigned max_2D_size,
-			      unsigned max_3D_size,
-			      unsigned max_cube_size,
-			      unsigned max_rect_size,
-			      unsigned mipmaps_at_once,
-			      int all_textures_one_heap,
-			      int allow_larger_textures )
-{
-   struct maps_per_heap  max_textures[8];
-   unsigned         i;
-   const unsigned   dimensions[4] = { 2, 3, 2, 2 };
-   const unsigned   faces[4]      = { 1, 1, 6, 1 };
-   unsigned         max_sizes[4];
-   unsigned         mipmaps[4];
-
-
-   max_sizes[0] = max_2D_size;
-   max_sizes[1] = max_3D_size;
-   max_sizes[2] = max_cube_size;
-   max_sizes[3] = max_rect_size;
-
-   mipmaps[0] = mipmaps_at_once;
-   mipmaps[1] = mipmaps_at_once;
-   mipmaps[2] = mipmaps_at_once;
-   mipmaps[3] = 1;
-
-
-   /* Calculate the maximum number of texture levels in two passes.  The
-    * first pass determines how many textures of each power-of-two size
-    * (including all mipmap levels for that size) can fit in each texture
-    * heap.  The second pass finds the largest texture size that allows
-    * a texture of that size to be bound to every texture unit.
-    */
-
-   for ( i = 0 ; i < 4 ; i++ ) {
-      if ( (allow_larger_textures != 2) && (max_sizes[ i ] != 0) ) {
-	 fill_in_maximums( heaps, nr_heaps, max_bytes_per_texel,
-			   max_sizes[ i ], mipmaps[ i ],
-			   dimensions[ i ], faces[ i ],
-			   max_textures );
-
-	 max_sizes[ i ] = get_max_size( nr_heaps,
-					allow_larger_textures == 1 ?
-					1 : limits->MaxTextureUnits,
-					max_sizes[ i ],
-					all_textures_one_heap,
-					max_textures );
-      }
-      else if (max_sizes[ i ] != 0) {
-	 max_sizes[ i ] += 1;
-      }
-   }
-
-   SET_MAX( MaxTextureLevels,        0 );
-   SET_MAX( Max3DTextureLevels,      1 );
-   SET_MAX( MaxCubeTextureLevels,    2 );
-   SET_MAX_RECT( MaxTextureRectSize, 3 );
-}
-
-
-
-
-/**
- * Perform initial binding of default textures objects on a per unit, per
- * texture target basis.
- *
- * \param ctx Current OpenGL context
- * \param swapped List of swapped-out textures
- * \param targets Bit-mask of value texture targets
- */
-
-void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped,
-			    GLuint targets )
-{
-   struct gl_texture_object *texObj;
-   GLuint tmp = ctx->Texture.CurrentUnit;
-   unsigned   i;
-
-
-   for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) {
-      ctx->Texture.CurrentUnit = i;
-
-      if ( (targets & DRI_TEXMGR_DO_TEXTURE_1D) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_1D_INDEX];
-	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_1D, texObj );
-	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
-      }
-
-      if ( (targets & DRI_TEXMGR_DO_TEXTURE_2D) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_2D_INDEX];
-	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_2D, texObj );
-	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
-      }
-
-      if ( (targets & DRI_TEXMGR_DO_TEXTURE_3D) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_3D_INDEX];
-	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_3D, texObj );
-	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
-      }
-
-      if ( (targets & DRI_TEXMGR_DO_TEXTURE_CUBE) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_CUBE_INDEX];
-	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_CUBE_MAP_ARB, texObj );
-	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
-      }
-
-      if ( (targets & DRI_TEXMGR_DO_TEXTURE_RECT) != 0 ) {
-	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_RECT_INDEX];
-	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_RECTANGLE_NV, texObj );
-	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );
-      }
-   }
-
-   ctx->Texture.CurrentUnit = tmp;
-}
-
-
-
-
-/**
- * Verify that the specified texture is in the specificed heap.
- * 
- * \param tex   Texture to be tested.
- * \param heap  Texture memory heap to be tested.
- * \return True if the texture is in the heap, false otherwise.
- */
-
-static GLboolean
-check_in_heap( const driTextureObject * tex, const driTexHeap * heap )
-{
-#if 1
-   return tex->heap == heap;
-#else
-   driTextureObject * curr;
-
-   foreach( curr, & heap->texture_objects ) {
-      if ( curr == tex ) {
-	 break;
-      }
-   }
-
-   return curr == tex;
-#endif
-}
-
-
-
-/****************************************************************************/
-/**
- * Validate the consistency of a set of texture heaps.
- * Original version by Keith Whitwell in r200/r200_sanity.c.
- */
-
-GLboolean
-driValidateTextureHeaps( driTexHeap * const * texture_heaps,
-			 unsigned nr_heaps, const driTextureObject * swapped )
-{
-   driTextureObject *t;
-   unsigned  i;
-
-   for ( i = 0 ; i < nr_heaps ; i++ ) {
-      int last_end = 0;
-      unsigned textures_in_heap = 0;
-      unsigned blocks_in_mempool = 0;
-      const driTexHeap * heap = texture_heaps[i];
-      const struct mem_block *p = heap->memory_heap;
-
-      /* Check each texture object has a MemBlock, and is linked into
-       * the correct heap.  
-       *
-       * Check the texobj base address corresponds to the MemBlock
-       * range.  Check the texobj size (recalculate?) fits within
-       * the MemBlock.
-       *
-       * Count the number of texobj's using this heap.
-       */
-
-      foreach ( t, &heap->texture_objects ) {
-	 if ( !check_in_heap( t, heap ) ) {
-	    fprintf( stderr, "%s memory block for texture object @ %p not "
-		     "found in heap #%d\n",
-		     __FUNCTION__, (void *)t, i );
-	    return GL_FALSE;
-	 }
-
-
-	 if ( t->totalSize > t->memBlock->size ) {
-	    fprintf( stderr, "%s: Memory block for texture object @ %p is "
-		     "only %u bytes, but %u are required\n",
-		     __FUNCTION__, (void *)t, t->totalSize, t->memBlock->size );
-	    return GL_FALSE;
-	 }
-
-	 textures_in_heap++;
-      }
-
-      /* Validate the contents of the heap:
-       *   - Ordering
-       *   - Overlaps
-       *   - Bounds
-       */
-
-      while ( p != NULL ) {
-	 if (p->reserved) {
-	    fprintf( stderr, "%s: Block (%08x,%x), is reserved?!\n",
-		     __FUNCTION__, p->ofs, p->size );
-	    return GL_FALSE;
-	 }
-
-	 if (p->ofs != last_end) {
-	    fprintf( stderr, "%s: blocks_in_mempool = %d, last_end = %d, p->ofs = %d\n",
-		     __FUNCTION__, blocks_in_mempool, last_end, p->ofs );
-	    return GL_FALSE;
-	 }
-
-	 if (!p->reserved && !p->free) {
-	    blocks_in_mempool++;
-	 }
-
-	 last_end = p->ofs + p->size;
-	 p = p->next;
-      }
-
-      if (textures_in_heap != blocks_in_mempool) {
-	 fprintf( stderr, "%s: Different number of textures objects (%u) and "
-		  "inuse memory blocks (%u)\n", 
-		  __FUNCTION__, textures_in_heap, blocks_in_mempool );
-	 return GL_FALSE;
-      }
-
-#if 0
-      fprintf( stderr, "%s: textures_in_heap = %u\n", 
-	       __FUNCTION__, textures_in_heap );
-#endif
-   }
-
-
-   /* Check swapped texobj's have zero memblocks
-    */
-   i = 0;
-   foreach ( t, swapped ) {
-      if ( t->memBlock != NULL ) {
-	 fprintf( stderr, "%s: Swapped texobj %p has non-NULL memblock %p\n",
-		  __FUNCTION__, (void *)t, (void *)t->memBlock );
-	 return GL_FALSE;
-      }
-      i++;
-   }
-
-#if 0
-   fprintf( stderr, "%s: swapped texture count = %u\n", __FUNCTION__, i );
-#endif
-
-   return GL_TRUE;
-}
-
-
-
-
-/****************************************************************************/
-/**
- * Compute which mipmap levels that really need to be sent to the hardware.
- * This depends on the base image size, GL_TEXTURE_MIN_LOD,
- * GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, and GL_TEXTURE_MAX_LEVEL.
- */
-
-void
-driCalculateTextureFirstLastLevel( driTextureObject * t )
-{
-   struct gl_texture_object * const tObj = t->tObj;
-   const struct gl_texture_image * const baseImage =
-       tObj->Image[0][tObj->BaseLevel];
-
-   /* These must be signed values.  MinLod and MaxLod can be negative numbers,
-    * and having firstLevel and lastLevel as signed prevents the need for
-    * extra sign checks.
-    */
-   int   firstLevel;
-   int   lastLevel;
-
-   /* Yes, this looks overly complicated, but it's all needed.
-    */
-
-   switch (tObj->Target) {
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_3D:
-   case GL_TEXTURE_CUBE_MAP:
-      if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {
-         /* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.
-          */
-
-         firstLevel = lastLevel = tObj->BaseLevel;
-      }
-      else {
-	 firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5);
-	 firstLevel = MAX2(firstLevel, tObj->BaseLevel);
-	 firstLevel = MIN2(firstLevel, tObj->BaseLevel + baseImage->MaxLog2);
-	 lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);
-	 lastLevel = MAX2(lastLevel, t->tObj->BaseLevel);
-	 lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2);
-	 lastLevel = MIN2(lastLevel, t->tObj->MaxLevel);
-	 lastLevel = MAX2(firstLevel, lastLevel); /* need at least one level */
-      }
-      break;
-   case GL_TEXTURE_RECTANGLE_NV:
-   case GL_TEXTURE_4D_SGIS:
-      firstLevel = lastLevel = 0;
-      break;
-   default:
-      return;
-   }
-
-   /* save these values */
-   t->firstLevel = firstLevel;
-   t->lastLevel = lastLevel;
-}
-
-
-
-
-/**
- * \name DRI texture formats.  These vars are initialized to either the
- * big- or little-endian Mesa formats.
- */
-/*@{*/
-gl_format _dri_texformat_rgba8888 = MESA_FORMAT_NONE;
-gl_format _dri_texformat_argb8888 = MESA_FORMAT_NONE;
-gl_format _dri_texformat_rgb565 = MESA_FORMAT_NONE;
-gl_format _dri_texformat_argb4444 = MESA_FORMAT_NONE;
-gl_format _dri_texformat_argb1555 = MESA_FORMAT_NONE;
-gl_format _dri_texformat_al88 = MESA_FORMAT_NONE;
-gl_format _dri_texformat_a8 = MESA_FORMAT_A8;
-gl_format _dri_texformat_ci8 = MESA_FORMAT_CI8;
-gl_format _dri_texformat_i8 = MESA_FORMAT_I8;
-gl_format _dri_texformat_l8 = MESA_FORMAT_L8;
-/*@}*/
-
-
-/**
- * Initialize _dri_texformat_* vars according to whether we're on
- * a big or little endian system.
- */
-void
-driInitTextureFormats(void)
-{
-   if (_mesa_little_endian()) {
-      _dri_texformat_rgba8888	= MESA_FORMAT_RGBA8888;
-      _dri_texformat_argb8888	= MESA_FORMAT_ARGB8888;
-      _dri_texformat_rgb565	= MESA_FORMAT_RGB565;
-      _dri_texformat_argb4444	= MESA_FORMAT_ARGB4444;
-      _dri_texformat_argb1555	= MESA_FORMAT_ARGB1555;
-      _dri_texformat_al88	= MESA_FORMAT_AL88;
-   }
-   else {
-      _dri_texformat_rgba8888	= MESA_FORMAT_RGBA8888_REV;
-      _dri_texformat_argb8888	= MESA_FORMAT_ARGB8888_REV;
-      _dri_texformat_rgb565	= MESA_FORMAT_RGB565_REV;
-      _dri_texformat_argb4444	= MESA_FORMAT_ARGB4444_REV;
-      _dri_texformat_argb1555	= MESA_FORMAT_ARGB1555_REV;
-      _dri_texformat_al88	= MESA_FORMAT_AL88_REV;
-   }
-}
+/*

+ * Copyright 2000-2001 VA Linux Systems, Inc.

+ * (C) Copyright IBM Corporation 2002, 2003

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

+ * VA LINUX SYSTEM, IBM 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:

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

+ *    Keith Whitwell <keithw@tungstengraphics.com>

+ *    Kevin E. Martin <kem@users.sourceforge.net>

+ *    Gareth Hughes <gareth@nvidia.com>

+ */

+

+/** \file texmem.c

+ * Implements all of the device-independent texture memory management.

+ * 

+ * Currently, only a simple LRU texture memory management policy is

+ * implemented.  In the (hopefully very near) future, better policies will be

+ * implemented.  The idea is that the DRI should be able to run in one of two

+ * modes.  In the default mode the DRI will dynamically attempt to discover

+ * the best texture management policy for the running application.  In the

+ * other mode, the user (via some sort of as yet TBD mechanism) will select

+ * a texture management policy that is known to work well with the

+ * application.

+ */

+

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/simple_list.h"

+#include "texmem.h"

+

+

+static unsigned dummy_swap_counter;

+

+

+/**

+ * Calculate \f$\log_2\f$ of a value.  This is a particularly poor

+ * implementation of this function.  However, since system performance is in

+ * no way dependent on this function, the slowness of the implementation is

+ * irrelevent.

+ * 

+ * \param n Value whose \f$\log_2\f$ is to be calculated

+ */

+

+static GLuint

+driLog2( GLuint n )

+{

+   GLuint log2;

+

+   for ( log2 = 1 ; n > 1 ; log2++ ) {

+      n >>= 1;

+   }

+

+   return log2;

+}

+

+

+

+

+/**

+ * Determine if a texture is resident in textureable memory.  Depending on

+ * the driver, this may or may not be on-card memory.  It could be AGP memory

+ * or anyother type of memory from which the hardware can directly read

+ * texels.

+ * 

+ * This function is intended to be used as the \c IsTextureResident function

+ * in the device's \c dd_function_table.

+ * 

+ * \param ctx GL context pointer (currently unused)

+ * \param texObj Texture object to be tested

+ */

+

+GLboolean

+driIsTextureResident( struct gl_context * ctx, 

+		      struct gl_texture_object * texObj )

+{

+   driTextureObject * t;

+

+

+   t = (driTextureObject *) texObj->DriverData;

+   return( (t != NULL) && (t->memBlock != NULL) );

+}

+

+

+

+

+/**

+ * (Re)initialize the global circular LRU list.  The last element

+ * in the array (\a heap->nrRegions) is the sentinal.  Keeping it

+ * at the end of the array allows the other elements of the array

+ * to be addressed rationally when looking up objects at a particular

+ * location in texture memory.

+ * 

+ * \param heap Texture heap to be reset

+ */

+

+static void resetGlobalLRU( driTexHeap * heap )

+{

+   drmTextureRegionPtr list = heap->global_regions;

+   unsigned       sz = 1U << heap->logGranularity;

+   unsigned       i;

+

+   for (i = 0 ; (i+1) * sz <= heap->size ; i++) {

+      list[i].prev = i-1;

+      list[i].next = i+1;

+      list[i].age = 0;

+   }

+

+   i--;

+   list[0].prev = heap->nrRegions;

+   list[i].prev = i-1;

+   list[i].next = heap->nrRegions;

+   list[heap->nrRegions].prev = i;

+   list[heap->nrRegions].next = 0;

+   heap->global_age[0] = 0;

+}

+

+/**

+ * Print out debugging information about the local texture LRU.

+ *

+ * \param heap Texture heap to be printed

+ * \param callername Name of calling function

+ */

+static void printLocalLRU( driTexHeap * heap, const char *callername  )

+{

+   driTextureObject *t;

+   unsigned sz = 1U << heap->logGranularity;

+

+   fprintf( stderr, "%s in %s:\nLocal LRU, heap %d:\n", 

+	    __FUNCTION__, callername, heap->heapId );

+

+   foreach ( t, &heap->texture_objects ) {

+      if (!t->memBlock)

+	 continue;

+      if (!t->tObj) {

+	 fprintf( stderr, "Placeholder (%p) %d at 0x%x sz 0x%x\n",

+		  (void *)t,

+		  t->memBlock->ofs / sz,

+		  t->memBlock->ofs,

+		  t->memBlock->size );

+      } else {

+	 fprintf( stderr, "Texture (%p) at 0x%x sz 0x%x\n",

+		  (void *)t,

+		  t->memBlock->ofs,

+		  t->memBlock->size );

+      }

+   }

+   foreach ( t, heap->swapped_objects ) {

+      if (!t->tObj) {

+	 fprintf( stderr, "Swapped Placeholder (%p)\n", (void *)t );

+      } else {

+	 fprintf( stderr, "Swapped Texture (%p)\n", (void *)t );

+      }

+   }

+

+   fprintf( stderr, "\n" );

+}

+

+/**

+ * Print out debugging information about the global texture LRU.

+ *

+ * \param heap Texture heap to be printed

+ * \param callername Name of calling function

+ */

+static void printGlobalLRU( driTexHeap * heap, const char *callername )

+{

+   drmTextureRegionPtr list = heap->global_regions;

+   unsigned int i, j;

+

+   fprintf( stderr, "%s in %s:\nGlobal LRU, heap %d list %p:\n", 

+	    __FUNCTION__, callername, heap->heapId, (void *)list );

+

+   for ( i = 0, j = heap->nrRegions ; i < heap->nrRegions ; i++ ) {

+      fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n",

+	       j, list[j].age, list[j].next, list[j].prev, list[j].in_use );

+      j = list[j].next;

+      if ( j == heap->nrRegions ) break;

+   }

+

+   if ( j != heap->nrRegions ) {

+      fprintf( stderr, "Loop detected in global LRU\n" );

+      for ( i = 0 ; i < heap->nrRegions ; i++ ) {

+	 fprintf( stderr, "list[%d] age %d next %d prev %d in_use %d\n",

+		  i, list[i].age, list[i].next, list[i].prev, list[i].in_use );

+      }

+   }

+

+   fprintf( stderr, "\n" );

+}

+

+

+/**

+ * Called by the client whenever it touches a local texture.

+ * 

+ * \param t Texture object that the client has accessed

+ */

+

+void driUpdateTextureLRU( driTextureObject * t )

+{

+   driTexHeap   * heap;

+   drmTextureRegionPtr list;

+   unsigned   shift;

+   unsigned   start;

+   unsigned   end;

+   unsigned   i;

+

+

+   heap = t->heap;

+   if ( heap != NULL ) {

+      shift = heap->logGranularity;

+      start = t->memBlock->ofs >> shift;

+      end = (t->memBlock->ofs + t->memBlock->size - 1) >> shift;

+

+

+      heap->local_age = ++heap->global_age[0];

+      list = heap->global_regions;

+

+

+      /* Update the context's local LRU 

+       */

+

+      move_to_head( & heap->texture_objects, t );

+

+

+      for (i = start ; i <= end ; i++) {

+	 list[i].age = heap->local_age;

+

+	 /* remove_from_list(i)

+	  */

+	 list[(unsigned)list[i].next].prev = list[i].prev;

+	 list[(unsigned)list[i].prev].next = list[i].next;

+

+	 /* insert_at_head(list, i)

+	  */

+	 list[i].prev = heap->nrRegions;

+	 list[i].next = list[heap->nrRegions].next;

+	 list[(unsigned)list[heap->nrRegions].next].prev = i;

+	 list[heap->nrRegions].next = i;

+      }

+

+      if ( 0 ) {

+	 printGlobalLRU( heap, __FUNCTION__ );

+	 printLocalLRU( heap, __FUNCTION__ );

+      }

+   }

+}

+

+

+

+

+/**

+ * Keep track of swapped out texture objects.

+ * 

+ * \param t Texture object to be "swapped" out of its texture heap

+ */

+

+void driSwapOutTextureObject( driTextureObject * t )

+{

+   unsigned   face;

+

+

+   if ( t->memBlock != NULL ) {

+      assert( t->heap != NULL );

+      mmFreeMem( t->memBlock );

+      t->memBlock = NULL;

+

+      if (t->timestamp > t->heap->timestamp)

+	 t->heap->timestamp = t->timestamp;

+

+      t->heap->texture_swaps[0]++;

+      move_to_tail( t->heap->swapped_objects, t );

+      t->heap = NULL;

+   }

+   else {

+      assert( t->heap == NULL );

+   }

+

+

+   for ( face = 0 ; face < 6 ; face++ ) {

+      t->dirty_images[face] = ~0;

+   }

+}

+

+

+

+

+/**

+ * Destroy hardware state associated with texture \a t.  Calls the

+ * \a destroy_texture_object method associated with the heap from which

+ * \a t was allocated.

+ * 

+ * \param t Texture object to be destroyed

+ */

+

+void driDestroyTextureObject( driTextureObject * t )

+{

+   driTexHeap * heap;

+

+

+   if ( 0 ) {

+      fprintf( stderr, "[%s:%d] freeing %p (tObj = %p, DriverData = %p)\n",

+	       __FILE__, __LINE__,

+	       (void *)t,

+	       (void *)((t != NULL) ? t->tObj : NULL),

+	       (void *)((t != NULL && t->tObj != NULL) ? t->tObj->DriverData : NULL ));

+   }

+

+   if ( t != NULL ) {

+      if ( t->memBlock ) {

+	 heap = t->heap;

+	 assert( heap != NULL );

+

+	 heap->texture_swaps[0]++;

+

+	 mmFreeMem( t->memBlock );

+	 t->memBlock = NULL;

+

+	 if (t->timestamp > t->heap->timestamp)

+	    t->heap->timestamp = t->timestamp;

+

+	 heap->destroy_texture_object( heap->driverContext, t );

+	 t->heap = NULL;

+      }

+

+      if ( t->tObj != NULL ) {

+	 assert( t->tObj->DriverData == t );

+	 t->tObj->DriverData = NULL;

+      }

+

+      remove_from_list( t );

+      FREE( t );

+   }

+

+   if ( 0 ) {

+      fprintf( stderr, "[%s:%d] done freeing %p\n", __FILE__, __LINE__, (void *)t );

+   }

+}

+

+

+

+

+/**

+ * Update the local heap's representation of texture memory based on

+ * data in the SAREA.  This is done each time it is detected that some other

+ * direct rendering client has held the lock.  This pertains to both our local

+ * textures and the textures belonging to other clients.  Keep track of other

+ * client's textures by pushing a placeholder texture onto the LRU list --

+ * these are denoted by \a tObj being \a NULL.

+ * 

+ * \param heap Heap whose state is to be updated

+ * \param offset Byte offset in the heap that has been stolen

+ * \param size Size, in bytes, of the stolen block

+ * \param in_use Non-zero if the block is pinned/reserved by the kernel

+ */

+

+static void driTexturesGone( driTexHeap * heap, int offset, int size, 

+			     int in_use )

+{

+   driTextureObject * t;

+   driTextureObject * tmp;

+

+

+   foreach_s ( t, tmp, & heap->texture_objects ) {

+      if ( (t->memBlock->ofs < (offset + size))

+	   && ((t->memBlock->ofs + t->memBlock->size) > offset) ) {

+	 /* It overlaps - kick it out.  If the texture object is just a

+	  * place holder, then destroy it all together.  Otherwise, mark

+	  * it as being swapped out.

+	  */

+

+	 if ( t->tObj != NULL ) {

+	    driSwapOutTextureObject( t );

+	 }

+	 else {

+	    driDestroyTextureObject( t );

+	 }

+      }

+   }

+

+

+   {

+      t = (driTextureObject *) CALLOC( heap->texture_object_size );

+      if ( t == NULL ) return;

+

+      t->memBlock = mmAllocMem( heap->memory_heap, size, 0, offset );

+      if ( t->memBlock == NULL ) {

+	 fprintf( stderr, "Couldn't alloc placeholder: heap %u sz %x ofs %x\n", heap->heapId,

+		  (int)size, (int)offset );

+	 mmDumpMemInfo( heap->memory_heap );

+	 FREE(t);

+	 return;

+      }

+      t->heap = heap;

+      if (in_use) 

+	 t->reserved = 1; 

+      insert_at_head( & heap->texture_objects, t );

+   }

+}

+

+

+

+

+/**

+ * Called by the client on lock contention to determine whether textures have

+ * been stolen.  If another client has modified a region in which we have

+ * textures, then we need to figure out which of our textures have been

+ * removed and update our global LRU.

+ * 

+ * \param heap Texture heap to be updated

+ */

+

+void driAgeTextures( driTexHeap * heap )

+{

+   drmTextureRegionPtr list = heap->global_regions;

+   unsigned       sz = 1U << (heap->logGranularity);

+   unsigned       i, nr = 0;

+

+

+   /* Have to go right round from the back to ensure stuff ends up

+    * LRU in the local list...  Fix with a cursor pointer.

+    */

+

+   for (i = list[heap->nrRegions].prev ; 

+	i != heap->nrRegions && nr < heap->nrRegions ; 

+	i = list[i].prev, nr++) {

+      /* If switching texturing schemes, then the SAREA might not have been

+       * properly cleared, so we need to reset the global texture LRU.

+       */

+

+      if ( (i * sz) > heap->size ) {

+	 nr = heap->nrRegions;

+	 break;

+      }

+

+      if (list[i].age > heap->local_age) 

+	  driTexturesGone( heap, i * sz, sz, list[i].in_use); 

+   }

+

+   /* Loop or uninitialized heap detected.  Reset.

+    */

+

+   if (nr == heap->nrRegions) {

+      driTexturesGone( heap, 0, heap->size, 0);

+      resetGlobalLRU( heap );

+   }

+

+   if ( 0 ) {

+      printGlobalLRU( heap, __FUNCTION__ );

+      printLocalLRU( heap, __FUNCTION__ );

+   }

+

+   heap->local_age = heap->global_age[0];

+}

+

+

+

+

+#define INDEX_ARRAY_SIZE 6 /* I'm not aware of driver with more than 2 heaps */

+

+/**

+ * Allocate memory from a texture heap to hold a texture object.  This

+ * routine will attempt to allocate memory for the texture from the heaps

+ * specified by \c heap_array in order.  That is, first it will try to

+ * allocate from \c heap_array[0], then \c heap_array[1], and so on.

+ *

+ * \param heap_array Array of pointers to texture heaps to use

+ * \param nr_heaps Number of heap pointer in \a heap_array

+ * \param t Texture object for which space is needed

+ * \return The ID of the heap from which memory was allocated, or -1 if

+ *         memory could not be allocated.

+ *

+ * \bug The replacement policy implemented by this function is horrible.

+ */

+

+

+int

+driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,

+		    driTextureObject * t )

+{

+   driTexHeap       * heap;

+   driTextureObject * temp;

+   driTextureObject * cursor;

+   unsigned           id;

+

+

+   /* In case it already has texture space, initialize heap.  This also

+    * prevents GCC from issuing a warning that heap might be used

+    * uninitialized.

+    */

+

+   heap = t->heap;

+

+

+   /* Run through each of the existing heaps and try to allocate a buffer

+    * to hold the texture.

+    */

+

+   for ( id = 0 ; (t->memBlock == NULL) && (id < nr_heaps) ; id++ ) {

+      heap = heap_array[ id ];

+      if ( heap != NULL ) {

+	 t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, 

+				   heap->alignmentShift, 0 );

+      }

+   }

+

+

+   /* Kick textures out until the requested texture fits.

+    */

+

+   if ( t->memBlock == NULL ) {

+      unsigned index[INDEX_ARRAY_SIZE];

+      unsigned nrGoodHeaps = 0;

+

+      /* Trying to avoid dynamic memory allocation. If you have more

+       * heaps, increase INDEX_ARRAY_SIZE. I'm not aware of any

+       * drivers with more than 2 tex heaps. */

+      assert( nr_heaps < INDEX_ARRAY_SIZE );

+

+      /* Sort large enough heaps by duty. Insertion sort should be

+       * fast enough for such a short array. */

+      for ( id = 0 ; id < nr_heaps ; id++ ) {

+	 heap = heap_array[ id ];

+

+	 if ( heap != NULL && t->totalSize <= heap->size ) {

+	    unsigned j;

+

+	    for ( j = 0 ; j < nrGoodHeaps; j++ ) {

+	       if ( heap->duty > heap_array[ index[ j ] ]->duty )

+		  break;

+	    }

+

+	    if ( j < nrGoodHeaps ) {

+	       memmove( &index[ j+1 ], &index[ j ],

+			sizeof(index[ 0 ]) * (nrGoodHeaps - j) );

+	    }

+

+	    index[ j ] = id;

+

+	    nrGoodHeaps++;

+	 }

+      }

+

+      for ( id = 0 ; (t->memBlock == NULL) && (id < nrGoodHeaps) ; id++ ) {

+	 heap = heap_array[ index[ id ] ];

+

+	 for ( cursor = heap->texture_objects.prev, temp = cursor->prev;

+	       cursor != &heap->texture_objects ; 

+	       cursor = temp, temp = cursor->prev ) {

+	       

+	    /* The the LRU element.  If the texture is bound to one of

+	     * the texture units, then we cannot kick it out.

+	     */

+	    if ( cursor->bound || cursor->reserved ) {

+	       continue;

+	    }

+

+	    if ( cursor->memBlock )

+	       heap->duty -= cursor->memBlock->size;

+

+	    /* If this is a placeholder, there's no need to keep it */

+	    if (cursor->tObj)

+	       driSwapOutTextureObject( cursor );

+	    else

+	       driDestroyTextureObject( cursor );

+

+	    t->memBlock = mmAllocMem( heap->memory_heap, t->totalSize, 

+				      heap->alignmentShift, 0 );

+

+	    if (t->memBlock)

+	       break;

+	 }

+      }

+

+      /* Rebalance duties. If a heap kicked more data than its duty,

+       * then all other heaps get that amount multiplied with their

+       * relative weight added to their duty. The negative duty is

+       * reset to 0. In the end all heaps have a duty >= 0.

+       *

+       * CAUTION: we must not change the heap pointer here, because it

+       * is used below to update the texture object.

+       */

+      for ( id = 0 ; id < nr_heaps ; id++ )

+	 if ( heap_array[ id ] != NULL && heap_array[ id ]->duty < 0) {

+	    int duty = -heap_array[ id ]->duty;

+	    double weight = heap_array[ id ]->weight;

+	    unsigned j;

+

+	    for ( j = 0 ; j < nr_heaps ; j++ )

+	       if ( j != id && heap_array[ j ] != NULL ) {

+		  heap_array[ j ]->duty += (double) duty *

+		     heap_array[ j ]->weight / weight;

+	       }

+

+	    heap_array[ id ]->duty = 0;

+	 }

+   }

+

+

+   if ( t->memBlock != NULL ) {

+      /* id and heap->heapId may or may not be the same value here.

+       */

+

+      assert( heap != NULL );

+      assert( (t->heap == NULL) || (t->heap == heap) );

+

+      t->heap = heap;

+      return heap->heapId;

+   }

+   else {

+      assert( t->heap == NULL );

+

+      fprintf( stderr, "[%s:%d] unable to allocate texture\n",

+	       __FUNCTION__, __LINE__ );

+      return -1;

+   }

+}

+

+

+

+

+

+

+/**

+ * Set the location where the texture-swap counter is stored.

+ */

+

+void

+driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter )

+{

+   heap->texture_swaps = (counter == NULL) ? & dummy_swap_counter : counter;

+}

+

+

+

+

+/**

+ * Create a new heap for texture data.

+ * 

+ * \param heap_id             Device-dependent heap identifier.  This value

+ *                            will returned by driAllocateTexture when memory

+ *                            is allocated from this heap.

+ * \param context             Device-dependent driver context.  This is

+ *                            supplied as the first parameter to the

+ *                            \c destroy_tex_obj function.

+ * \param size                Size, in bytes, of the texture region

+ * \param alignmentShift      Alignment requirement for textures.  If textures 

+ *                            must be allocated on a 4096 byte boundry, this

+ *                            would be 12.

+ * \param nr_regions          Number of regions into which this texture space

+ *                            should be partitioned

+ * \param global_regions      Array of \c drmTextureRegion structures in the SAREA

+ * \param global_age          Pointer to the global texture age in the SAREA

+ * \param swapped_objects     Pointer to the list of texture objects that are

+ *                            not in texture memory (i.e., have been swapped

+ *                            out).

+ * \param texture_object_size Size, in bytes, of a device-dependent texture

+ *                            object

+ * \param destroy_tex_obj     Function used to destroy a device-dependent

+ *                            texture object

+ *

+ * \sa driDestroyTextureHeap

+ */

+

+driTexHeap *

+driCreateTextureHeap( unsigned heap_id, void * context, unsigned size,

+		      unsigned alignmentShift, unsigned nr_regions,

+		      drmTextureRegionPtr global_regions, unsigned * global_age,

+		      driTextureObject * swapped_objects, 

+		      unsigned texture_object_size,

+		      destroy_texture_object_t * destroy_tex_obj

+		    )

+{

+   driTexHeap * heap;

+   unsigned     l;

+    

+    

+   if ( 0 )

+       fprintf( stderr, "%s( %u, %p, %u, %u, %u )\n",

+		__FUNCTION__,

+		heap_id, (void *)context, size, alignmentShift, nr_regions );

+

+   heap = (driTexHeap *) CALLOC( sizeof( driTexHeap ) );

+   if ( heap != NULL ) {

+      l = driLog2( (size - 1) / nr_regions );

+      if ( l < alignmentShift )

+      {

+	 l = alignmentShift;

+      }

+

+      heap->logGranularity = l;

+      heap->size = size & ~((1L << l) - 1);

+

+      heap->memory_heap = mmInit( 0, heap->size );

+      if ( heap->memory_heap != NULL ) {

+	 heap->heapId = heap_id;

+	 heap->driverContext = context;

+

+	 heap->alignmentShift = alignmentShift;

+	 heap->nrRegions = nr_regions;

+	 heap->global_regions = global_regions;

+	 heap->global_age = global_age;

+	 heap->swapped_objects = swapped_objects;

+	 heap->texture_object_size = texture_object_size;

+	 heap->destroy_texture_object = destroy_tex_obj;

+

+	 /* Force global heap init */

+	 if (heap->global_age[0] == 0)

+	     heap->local_age = ~0;

+	 else

+	     heap->local_age = 0;

+

+	 make_empty_list( & heap->texture_objects );

+	 driSetTextureSwapCounterLocation( heap, NULL );

+

+	 heap->weight = heap->size;

+	 heap->duty = 0;

+      }

+      else {

+	 FREE( heap );

+	 heap = NULL;

+      }

+   }

+

+

+   if ( 0 )

+       fprintf( stderr, "%s returning %p\n", __FUNCTION__, (void *)heap );

+

+   return heap;

+}

+

+

+

+

+/** Destroys a texture heap

+ * 

+ * \param heap Texture heap to be destroyed

+ */

+

+void

+driDestroyTextureHeap( driTexHeap * heap )

+{

+   driTextureObject * t;

+   driTextureObject * temp;

+

+

+   if ( heap != NULL ) {

+      foreach_s( t, temp, & heap->texture_objects ) {

+	 driDestroyTextureObject( t );

+      }

+      foreach_s( t, temp, heap->swapped_objects ) {

+	 driDestroyTextureObject( t );

+      }

+

+      mmDestroy( heap->memory_heap );

+      FREE( heap );

+   }

+}

+

+

+

+

+/****************************************************************************/

+/**

+ * Determine how many texels (including all mipmap levels) would be required

+ * for a texture map of size \f$2^^\c base_size_log2\f$ would require.

+ *

+ * \param base_size_log2 \f$log_2\f$ of the size of a side of the texture

+ * \param dimensions Number of dimensions of the texture.  Either 2 or 3.

+ * \param faces Number of faces of the texture.  Either 1 or 6 (for cube maps).

+ * \return Number of texels

+ */

+

+static unsigned

+texels_this_map_size( int base_size_log2, unsigned dimensions, unsigned faces )

+{

+   unsigned  texels;

+

+

+   assert( (faces == 1) || (faces == 6) );

+   assert( (dimensions == 2) || (dimensions == 3) );

+

+   texels = 0;

+   if ( base_size_log2 >= 0 ) {

+      texels = (1U << (dimensions * base_size_log2));

+

+      /* See http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg03636.html

+       * for the complete explaination of why this formulation is used.

+       * Basically, the smaller mipmap levels sum to 0.333 the size of the

+       * level 0 map.  The total size is therefore the size of the map

+       * multipled by 1.333.  The +2 is there to round up.

+       */

+

+      texels = (texels * 4 * faces + 2) / 3;

+   }

+

+   return texels;

+}

+

+

+

+

+struct maps_per_heap {

+   unsigned  c[32];

+};

+

+static void

+fill_in_maximums( driTexHeap * const * heaps, unsigned nr_heaps,

+		  unsigned max_bytes_per_texel, unsigned max_size,

+		  unsigned mipmaps_at_once, unsigned dimensions,

+		  unsigned faces, struct maps_per_heap * max_textures )

+{

+   unsigned   heap;

+   unsigned   log2_size;

+   unsigned   mask;

+

+

+   /* Determine how many textures of each size can be stored in each

+    * texture heap.

+    */

+

+   for ( heap = 0 ; heap < nr_heaps ; heap++ ) {

+      if ( heaps[ heap ] == NULL ) {

+	 (void) memset( max_textures[ heap ].c, 0, 

+			sizeof( max_textures[ heap ].c ) );

+	 continue;

+      }

+

+      mask = (1U << heaps[ heap ]->logGranularity) - 1;

+

+      if ( 0 ) {

+	 fprintf( stderr, "[%s:%d] heap[%u] = %u bytes, mask = 0x%08x\n",

+		  __FILE__, __LINE__,

+		  heap, heaps[ heap ]->size, mask );

+      }

+

+      for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) {

+	 unsigned   total;

+

+

+	 /* Determine the total number of bytes required by a texture of

+	  * size log2_size.

+	  */

+

+	 total = texels_this_map_size( log2_size, dimensions, faces )

+	     - texels_this_map_size( log2_size - mipmaps_at_once,

+				     dimensions, faces );

+	 total *= max_bytes_per_texel;

+	 total = (total + mask) & ~mask;

+

+	 /* The number of textures of a given size that will fit in a heap

+	  * is equal to the size of the heap divided by the size of the

+	  * texture.

+	  */

+

+	 max_textures[ heap ].c[ log2_size ] = heaps[ heap ]->size / total;

+

+	 if ( 0 ) {

+	    fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] "

+		     "= 0x%08x / 0x%08x "

+		     "= %u (%u)\n",

+		     __FILE__, __LINE__,

+		     heap, log2_size,

+		     heaps[ heap ]->size, total,

+		     heaps[ heap ]->size / total,

+		     max_textures[ heap ].c[ log2_size ] );

+	 }

+      }

+   }

+}

+

+

+static unsigned

+get_max_size( unsigned nr_heaps,

+	      unsigned texture_units,

+	      unsigned max_size,

+	      int all_textures_one_heap,

+	      struct maps_per_heap * max_textures )

+{

+   unsigned   heap;

+   unsigned   log2_size;

+

+

+   /* Determine the largest texture size such that a texture of that size

+    * can be bound to each texture unit at the same time.  Some hardware

+    * may require that all textures be in the same texture heap for

+    * multitexturing.

+    */

+

+   for ( log2_size = max_size ; log2_size > 0 ; log2_size-- ) {

+      unsigned   total = 0;

+

+      for ( heap = 0 ; heap < nr_heaps ; heap++ )

+      {

+	 total += max_textures[ heap ].c[ log2_size ];

+

+	 if ( 0 ) {

+	    fprintf( stderr, "[%s:%d] max_textures[%u].c[%02u] = %u, "

+		     "total = %u\n", __FILE__, __LINE__, heap, log2_size,

+		     max_textures[ heap ].c[ log2_size ], total );

+	 }

+

+	 if ( (max_textures[ heap ].c[ log2_size ] >= texture_units)

+	      || (!all_textures_one_heap && (total >= texture_units)) ) {

+	    /* The number of mipmap levels is the log-base-2 of the

+	     * maximum texture size plus 1.  If the maximum texture size

+	     * is 1x1, the log-base-2 is 0 and 1 mipmap level (the base

+	     * level) is available.

+	     */

+

+	    return log2_size + 1;

+	 }

+      }

+   }

+

+   /* This should NEVER happen.  It should always be possible to have at

+    * *least* a 1x1 texture in memory!

+    */

+   assert( log2_size != 0 );

+   return 0;

+}

+

+#define SET_MAX(f,v) \

+    do { if ( max_sizes[v] != 0 ) { limits-> f = max_sizes[v]; } } while( 0 )

+

+#define SET_MAX_RECT(f,v) \

+    do { if ( max_sizes[v] != 0 ) { limits-> f = 1 << (max_sizes[v] - 1); } } while( 0 )

+

+

+/**

+ * Given the amount of texture memory, the number of texture units, and the

+ * maximum size of a texel, calculate the maximum texture size the driver can

+ * advertise.

+ * 

+ * \param heaps Texture heaps for this card

+ * \param nr_heap Number of texture heaps

+ * \param limits OpenGL contants.  MaxTextureUnits must be set.

+ * \param max_bytes_per_texel Maximum size of a single texel, in bytes

+ * \param max_2D_size \f$\log_2\f$ of the maximum 2D texture size (i.e.,

+ *     1024x1024 textures, this would be 10)

+ * \param max_3D_size \f$\log_2\f$ of the maximum 3D texture size (i.e.,

+ *     1024x1024x1024 textures, this would be 10)

+ * \param max_cube_size \f$\log_2\f$ of the maximum cube texture size (i.e.,

+ *     1024x1024 textures, this would be 10)

+ * \param max_rect_size \f$\log_2\f$ of the maximum texture rectangle size

+ *     (i.e., 1024x1024 textures, this would be 10).  This is a power-of-2

+ *     even though texture rectangles need not be a power-of-2.

+ * \param mipmaps_at_once Total number of mipmaps that can be used

+ *     at one time.  For most hardware this will be \f$\c max_size + 1\f$.

+ *     For hardware that does not support mipmapping, this will be 1.

+ * \param all_textures_one_heap True if the hardware requires that all

+ *     textures be in a single texture heap for multitexturing.

+ * \param allow_larger_textures 0 conservative, 1 calculate limits

+ *     so at least one worst-case texture can fit, 2 just use hw limits.

+ */

+

+void

+driCalculateMaxTextureLevels( driTexHeap * const * heaps,

+			      unsigned nr_heaps,

+			      struct gl_constants * limits,

+			      unsigned max_bytes_per_texel,

+			      unsigned max_2D_size,

+			      unsigned max_3D_size,

+			      unsigned max_cube_size,

+			      unsigned max_rect_size,

+			      unsigned mipmaps_at_once,

+			      int all_textures_one_heap,

+			      int allow_larger_textures )

+{

+   struct maps_per_heap  max_textures[8];

+   unsigned         i;

+   const unsigned   dimensions[4] = { 2, 3, 2, 2 };

+   const unsigned   faces[4]      = { 1, 1, 6, 1 };

+   unsigned         max_sizes[4];

+   unsigned         mipmaps[4];

+

+

+   max_sizes[0] = max_2D_size;

+   max_sizes[1] = max_3D_size;

+   max_sizes[2] = max_cube_size;

+   max_sizes[3] = max_rect_size;

+

+   mipmaps[0] = mipmaps_at_once;

+   mipmaps[1] = mipmaps_at_once;

+   mipmaps[2] = mipmaps_at_once;

+   mipmaps[3] = 1;

+

+

+   /* Calculate the maximum number of texture levels in two passes.  The

+    * first pass determines how many textures of each power-of-two size

+    * (including all mipmap levels for that size) can fit in each texture

+    * heap.  The second pass finds the largest texture size that allows

+    * a texture of that size to be bound to every texture unit.

+    */

+

+   for ( i = 0 ; i < 4 ; i++ ) {

+      if ( (allow_larger_textures != 2) && (max_sizes[ i ] != 0) ) {

+	 fill_in_maximums( heaps, nr_heaps, max_bytes_per_texel,

+			   max_sizes[ i ], mipmaps[ i ],

+			   dimensions[ i ], faces[ i ],

+			   max_textures );

+

+	 max_sizes[ i ] = get_max_size( nr_heaps,

+					allow_larger_textures == 1 ?

+					1 : limits->MaxTextureUnits,

+					max_sizes[ i ],

+					all_textures_one_heap,

+					max_textures );

+      }

+      else if (max_sizes[ i ] != 0) {

+	 max_sizes[ i ] += 1;

+      }

+   }

+

+   SET_MAX( MaxTextureLevels,        0 );

+   SET_MAX( Max3DTextureLevels,      1 );

+   SET_MAX( MaxCubeTextureLevels,    2 );

+   SET_MAX_RECT( MaxTextureRectSize, 3 );

+}

+

+

+

+

+/**

+ * Perform initial binding of default textures objects on a per unit, per

+ * texture target basis.

+ *

+ * \param ctx Current OpenGL context

+ * \param swapped List of swapped-out textures

+ * \param targets Bit-mask of value texture targets

+ */

+

+void driInitTextureObjects( struct gl_context *ctx, driTextureObject * swapped,

+			    GLuint targets )

+{

+   struct gl_texture_object *texObj;

+   GLuint tmp = ctx->Texture.CurrentUnit;

+   unsigned   i;

+

+

+   for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) {

+      ctx->Texture.CurrentUnit = i;

+

+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_1D) != 0 ) {

+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_1D_INDEX];

+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_1D, texObj );

+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );

+      }

+

+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_2D) != 0 ) {

+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_2D_INDEX];

+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_2D, texObj );

+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );

+      }

+

+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_3D) != 0 ) {

+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_3D_INDEX];

+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_3D, texObj );

+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );

+      }

+

+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_CUBE) != 0 ) {

+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_CUBE_INDEX];

+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_CUBE_MAP_ARB, texObj );

+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );

+      }

+

+      if ( (targets & DRI_TEXMGR_DO_TEXTURE_RECT) != 0 ) {

+	 texObj = ctx->Texture.Unit[i].CurrentTex[TEXTURE_RECT_INDEX];

+	 ctx->Driver.BindTexture( ctx, GL_TEXTURE_RECTANGLE_NV, texObj );

+	 move_to_tail( swapped, (driTextureObject *) texObj->DriverData );

+      }

+   }

+

+   ctx->Texture.CurrentUnit = tmp;

+}

+

+

+

+

+/**

+ * Verify that the specified texture is in the specificed heap.

+ * 

+ * \param tex   Texture to be tested.

+ * \param heap  Texture memory heap to be tested.

+ * \return True if the texture is in the heap, false otherwise.

+ */

+

+static GLboolean

+check_in_heap( const driTextureObject * tex, const driTexHeap * heap )

+{

+#if 1

+   return tex->heap == heap;

+#else

+   driTextureObject * curr;

+

+   foreach( curr, & heap->texture_objects ) {

+      if ( curr == tex ) {

+	 break;

+      }

+   }

+

+   return curr == tex;

+#endif

+}

+

+

+

+/****************************************************************************/

+/**

+ * Validate the consistency of a set of texture heaps.

+ * Original version by Keith Whitwell in r200/r200_sanity.c.

+ */

+

+GLboolean

+driValidateTextureHeaps( driTexHeap * const * texture_heaps,

+			 unsigned nr_heaps, const driTextureObject * swapped )

+{

+   driTextureObject *t;

+   unsigned  i;

+

+   for ( i = 0 ; i < nr_heaps ; i++ ) {

+      int last_end = 0;

+      unsigned textures_in_heap = 0;

+      unsigned blocks_in_mempool = 0;

+      const driTexHeap * heap = texture_heaps[i];

+      const struct mem_block *p = heap->memory_heap;

+

+      /* Check each texture object has a MemBlock, and is linked into

+       * the correct heap.  

+       *

+       * Check the texobj base address corresponds to the MemBlock

+       * range.  Check the texobj size (recalculate?) fits within

+       * the MemBlock.

+       *

+       * Count the number of texobj's using this heap.

+       */

+

+      foreach ( t, &heap->texture_objects ) {

+	 if ( !check_in_heap( t, heap ) ) {

+	    fprintf( stderr, "%s memory block for texture object @ %p not "

+		     "found in heap #%d\n",

+		     __FUNCTION__, (void *)t, i );

+	    return GL_FALSE;

+	 }

+

+

+	 if ( t->totalSize > t->memBlock->size ) {

+	    fprintf( stderr, "%s: Memory block for texture object @ %p is "

+		     "only %u bytes, but %u are required\n",

+		     __FUNCTION__, (void *)t, t->totalSize, t->memBlock->size );

+	    return GL_FALSE;

+	 }

+

+	 textures_in_heap++;

+      }

+

+      /* Validate the contents of the heap:

+       *   - Ordering

+       *   - Overlaps

+       *   - Bounds

+       */

+

+      while ( p != NULL ) {

+	 if (p->reserved) {

+	    fprintf( stderr, "%s: Block (%08x,%x), is reserved?!\n",

+		     __FUNCTION__, p->ofs, p->size );

+	    return GL_FALSE;

+	 }

+

+	 if (p->ofs != last_end) {

+	    fprintf( stderr, "%s: blocks_in_mempool = %d, last_end = %d, p->ofs = %d\n",

+		     __FUNCTION__, blocks_in_mempool, last_end, p->ofs );

+	    return GL_FALSE;

+	 }

+

+	 if (!p->reserved && !p->free) {

+	    blocks_in_mempool++;

+	 }

+

+	 last_end = p->ofs + p->size;

+	 p = p->next;

+      }

+

+      if (textures_in_heap != blocks_in_mempool) {

+	 fprintf( stderr, "%s: Different number of textures objects (%u) and "

+		  "inuse memory blocks (%u)\n", 

+		  __FUNCTION__, textures_in_heap, blocks_in_mempool );

+	 return GL_FALSE;

+      }

+

+#if 0

+      fprintf( stderr, "%s: textures_in_heap = %u\n", 

+	       __FUNCTION__, textures_in_heap );

+#endif

+   }

+

+

+   /* Check swapped texobj's have zero memblocks

+    */

+   i = 0;

+   foreach ( t, swapped ) {

+      if ( t->memBlock != NULL ) {

+	 fprintf( stderr, "%s: Swapped texobj %p has non-NULL memblock %p\n",

+		  __FUNCTION__, (void *)t, (void *)t->memBlock );

+	 return GL_FALSE;

+      }

+      i++;

+   }

+

+#if 0

+   fprintf( stderr, "%s: swapped texture count = %u\n", __FUNCTION__, i );

+#endif

+

+   return GL_TRUE;

+}

+

+

+

+

+/****************************************************************************/

+/**

+ * Compute which mipmap levels that really need to be sent to the hardware.

+ * This depends on the base image size, GL_TEXTURE_MIN_LOD,

+ * GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, and GL_TEXTURE_MAX_LEVEL.

+ */

+

+void

+driCalculateTextureFirstLastLevel( driTextureObject * t )

+{

+   struct gl_texture_object * const tObj = t->tObj;

+   const struct gl_texture_image * const baseImage =

+       tObj->Image[0][tObj->BaseLevel];

+

+   /* These must be signed values.  MinLod and MaxLod can be negative numbers,

+    * and having firstLevel and lastLevel as signed prevents the need for

+    * extra sign checks.

+    */

+   int   firstLevel;

+   int   lastLevel;

+

+   /* Yes, this looks overly complicated, but it's all needed.

+    */

+

+   switch (tObj->Target) {

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_3D:

+   case GL_TEXTURE_CUBE_MAP:

+      if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {

+         /* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.

+          */

+

+         firstLevel = lastLevel = tObj->BaseLevel;

+      }

+      else {

+	 firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5);

+	 firstLevel = MAX2(firstLevel, tObj->BaseLevel);

+	 firstLevel = MIN2(firstLevel, tObj->BaseLevel + baseImage->MaxLog2);

+	 lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);

+	 lastLevel = MAX2(lastLevel, t->tObj->BaseLevel);

+	 lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2);

+	 lastLevel = MIN2(lastLevel, t->tObj->MaxLevel);

+	 lastLevel = MAX2(firstLevel, lastLevel); /* need at least one level */

+      }

+      break;

+   case GL_TEXTURE_RECTANGLE_NV:

+   case GL_TEXTURE_4D_SGIS:

+      firstLevel = lastLevel = 0;

+      break;

+   default:

+      return;

+   }

+

+   /* save these values */

+   t->firstLevel = firstLevel;

+   t->lastLevel = lastLevel;

+}

+

+

+

+

+/**

+ * \name DRI texture formats.  These vars are initialized to either the

+ * big- or little-endian Mesa formats.

+ */

+/*@{*/

+gl_format _dri_texformat_rgba8888 = MESA_FORMAT_NONE;

+gl_format _dri_texformat_argb8888 = MESA_FORMAT_NONE;

+gl_format _dri_texformat_rgb565 = MESA_FORMAT_NONE;

+gl_format _dri_texformat_argb4444 = MESA_FORMAT_NONE;

+gl_format _dri_texformat_argb1555 = MESA_FORMAT_NONE;

+gl_format _dri_texformat_al88 = MESA_FORMAT_NONE;

+gl_format _dri_texformat_a8 = MESA_FORMAT_A8;

+gl_format _dri_texformat_ci8 = MESA_FORMAT_CI8;

+gl_format _dri_texformat_i8 = MESA_FORMAT_I8;

+gl_format _dri_texformat_l8 = MESA_FORMAT_L8;

+/*@}*/

+

+

+/**

+ * Initialize _dri_texformat_* vars according to whether we're on

+ * a big or little endian system.

+ */

+void

+driInitTextureFormats(void)

+{

+   if (_mesa_little_endian()) {

+      _dri_texformat_rgba8888	= MESA_FORMAT_RGBA8888;

+      _dri_texformat_argb8888	= MESA_FORMAT_ARGB8888;

+      _dri_texformat_rgb565	= MESA_FORMAT_RGB565;

+      _dri_texformat_argb4444	= MESA_FORMAT_ARGB4444;

+      _dri_texformat_argb1555	= MESA_FORMAT_ARGB1555;

+      _dri_texformat_al88	= MESA_FORMAT_AL88;

+   }

+   else {

+      _dri_texformat_rgba8888	= MESA_FORMAT_RGBA8888_REV;

+      _dri_texformat_argb8888	= MESA_FORMAT_ARGB8888_REV;

+      _dri_texformat_rgb565	= MESA_FORMAT_RGB565_REV;

+      _dri_texformat_argb4444	= MESA_FORMAT_ARGB4444_REV;

+      _dri_texformat_argb1555	= MESA_FORMAT_ARGB1555_REV;

+      _dri_texformat_al88	= MESA_FORMAT_AL88_REV;

+   }

+}

diff --git a/mesalib/src/mesa/drivers/dri/common/texmem.h b/mesalib/src/mesa/drivers/dri/common/texmem.h
index 725ba2e11..3815c4107 100644
--- a/mesalib/src/mesa/drivers/dri/common/texmem.h
+++ b/mesalib/src/mesa/drivers/dri/common/texmem.h
@@ -1,334 +1,334 @@
-/*
- * Copyright 2000-2001 VA Linux Systems, Inc.
- * (c) Copyright IBM Corporation 2002
- * 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
- * VA LINUX SYSTEM, IBM 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:
- *    Ian Romanick <idr@us.ibm.com>
- *    Keith Whitwell <keithw@tungstengraphics.com>
- *    Kevin E. Martin <kem@users.sourceforge.net>
- *    Gareth Hughes <gareth@nvidia.com>
- */
-
-/** \file texmem.h
- * Public interface to the DRI texture memory management routines.
- * 
- * \sa texmem.c
- */
-
-#ifndef DRI_TEXMEM_H
-#define DRI_TEXMEM_H
-
-#include "main/mtypes.h"
-#include "main/formats.h"
-#include "main/mm.h"
-#include "xf86drm.h"
-
-struct dri_tex_heap;
-typedef struct dri_tex_heap driTexHeap;
-
-struct dri_texture_object;
-typedef struct dri_texture_object driTextureObject;
-
-
-/**
- * Base texture object type.  Each driver will extend this type with its own
- * private data members.
- */
-
-struct dri_texture_object {
-	struct dri_texture_object * next;
-	struct dri_texture_object * prev;
-
-	driTexHeap * heap;		/**< Texture heap currently stored in */
-	struct gl_texture_object * tObj;/**< Pointer to Mesa texture object
-					 * If NULL, this texture object is a
-					 * "placeholder" object representing
-					 * texture memory in use by another context.
-					 * A placeholder should have a heap and a memBlock.
-					 */
-	struct mem_block *memBlock;	/**< Memory block containing texture */
-
-        unsigned    reserved;	        /**< Cannot be swapped out by user contexts.  */
-
-	unsigned    bound;		/**< Bitmask indicating which tex units
-					 * this texture object is bound to.
-					 * Bit 0 = unit 0, Bit 1 = unit 1, etc
-					 */
-
-	unsigned    totalSize;		/**< Total size of the texture,
-					 * including all mipmap levels 
-					 */
-
-	unsigned    dirty_images[6];	/**< Flags for whether or not images
-					 * need to be uploaded to local or
-					 * AGP texture space.  One flag set
-					 * for each cube face for cubic
-					 * textures.  Bit zero corresponds to
-					 * the base-level, which may or may
-					 * not be the level zero mipmap.
-					 */
-
-        unsigned    timestamp;	        /**< Timestamp used to
-					 * synchronize with 3d engine
-					 * in hardware where textures
-					 * are uploaded directly to
-					 * the framebuffer.  
-					 */
-
-        unsigned    firstLevel;         /**< Image in \c tObj->Image[0] that
-					 * corresponds to the base-level of
-					 * this texture object.
-					 */
-
-        unsigned    lastLevel;          /**< Last image in \c tObj->Image[0] 
-					 * used by the
-					 * current LOD settings of
-					 * this texture object.  This
-					 * value must be greater than
-					 * or equal to \c firstLevel.
-					 */
-};
-
-
-typedef void (destroy_texture_object_t)( void * driverContext,
-				        driTextureObject * t );
-
-/**
- * Client-private representation of texture memory state.
- *
- * Clients will place one or more of these structs in their driver
- * context struct to manage one or more global texture heaps.
- */
-
-struct dri_tex_heap {
-
-	/** Client-supplied heap identifier 
-	 */
-	unsigned heapId;	
-
-	/** Pointer to the client's private context 
-	 */
-	void *driverContext;
-
-	/** Total size of the heap, in bytes
-	 */
-	unsigned size;
-
-	/** \brief \f$log_2\f$ of size of single heap region
-	 *
-	 * Each context takes memory from the global texture heap in
-	 * \f$2^{logGranularity}\f$ byte blocks.  The value of
-	 * \a logGranularity is based on the amount of memory represented
-	 * by the heap and the maximum number of regions in the SAREA.  Given
-	 * \a b bytes of texture memory an \a n regions in the SAREA,
-	 * \a logGranularity will be \f$\lfloor\log_2( b / n )\rfloor\f$.
-	 */
-	unsigned logGranularity;
-
-	/** \brief Required alignment of allocations in this heap
-	 * 
-	 * The alignment shift is supplied to \a mmAllocMem when memory is
-	 * allocated from this heap.  The value of \a alignmentShift will
-	 * typically reflect some require of the hardware.  This value has
-	 * \b no \b relation to \a logGranularity.  \a alignmentShift is a
-	 * per-context value.
-	 *
-	 * \sa mmAllocMem
-	 */
-	unsigned alignmentShift;
-
-	/** Number of elements in global list (the SAREA).
-	 */
-	unsigned nrRegions;	 
-
-	/** Pointer to SAREA \a driTexRegion array
-	 */
-	drmTextureRegionPtr global_regions;
-
-	/** Pointer to the texture state age (generation number) in the SAREA
-	 */
-	unsigned     * global_age;
-
-	/** Local age (generation number) of texture state
-	 */
-	unsigned local_age;
-
-	/** Memory heap used to manage texture memory represented by
-	 * this texture heap.
-	 */
-	struct mem_block * memory_heap;
-
-	/** List of objects that we currently believe to be in texture
-	 * memory.
-	 */
-	driTextureObject     texture_objects;
-    
-	/** Pointer to the list of texture objects that are not in
-	 * texture memory.
-	 */
-	driTextureObject   * swapped_objects;
-
-	/** Size of the driver-speicific texture object.
-	 */
-	unsigned       texture_object_size;
-
-
-	/**
-	 * \brief Function to destroy driver-specific texture object data.
-	 * 
-	 * This function is supplied by the driver so that the texture manager
-	 * can release all resources associated with a texture object.  This
-	 * function should only release driver-specific data.  That is,
-	 * \a driDestroyTextureObject will release the texture memory
-	 * associated with the texture object, it will release the memory
-	 * for the texture object itself, and it will unlink the texture
-	 * object from the texture object lists.
-	 *
-	 * \param driverContext Pointer to the driver supplied context
-	 * \param t Texture object that is to be destroyed
-	 * \sa driDestroyTextureObject
-	 */
-
-	destroy_texture_object_t * destroy_texture_object;
-
-
-	/**
-	 */
-	unsigned * texture_swaps;
-
-        /**
-	 * Timestamp used to synchronize with 3d engine in hardware
-	 * where textures are uploaded directly to the
-	 * framebuffer.  
-	 */
-        unsigned timestamp;
-
-	/** \brief Kick/upload weight
-	 *
-	 * When not enough free space is available this weight
-	 * influences the choice of the heap from which textures are
-	 * kicked. By default the weight is equal to the heap size.
-	 */
-	double weight;
-
-	/** \brief Kick/upload duty
-	 *
-	 * The heap with the highest duty will be chosen for kicking
-	 * textures if not enough free space is available. The duty is
-	 * reduced by the amount of data kicked. Rebalancing of
-	 * negative duties takes the weights into account.
-	 */
-	int duty;
-};
-
-
-
-
-/**
- * Called by the client on lock contention to determine whether textures have
- * been stolen.  If another client has modified a region in which we have
- * textures, then we need to figure out which of our textures have been
- * removed and update our global LRU.
- * 
- * \param heap Texture heap to be updated
- * \hideinitializer
- */
-
-#define DRI_AGE_TEXTURES( heap )				\
-   do {								\
-       if ( ((heap) != NULL)					\
-	    && ((heap)->local_age != (heap)->global_age[0]) )	\
-	   driAgeTextures( heap );				\
-   } while( 0 )
-
-
-
-
-/* This should be called whenever there has been contention on the hardware
- * lock.  driAgeTextures should not be called directly.  Instead, clients
- * should use DRI_AGE_TEXTURES, above.
- */
-
-void driAgeTextures( driTexHeap * heap );
-
-void driUpdateTextureLRU( driTextureObject * t );
-void driSwapOutTextureObject( driTextureObject * t );
-void driDestroyTextureObject( driTextureObject * t );
-int driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,
-    driTextureObject * t );
-
-GLboolean driIsTextureResident( GLcontext * ctx, 
-    struct gl_texture_object * texObj );
-
-driTexHeap * driCreateTextureHeap( unsigned heap_id, void * context,
-    unsigned size, unsigned alignmentShift, unsigned nr_regions,
-    drmTextureRegionPtr global_regions, unsigned * global_age,
-    driTextureObject * swapped_objects, unsigned texture_object_size,
-    destroy_texture_object_t * destroy_tex_obj );
-void driDestroyTextureHeap( driTexHeap * heap );
-
-void
-driCalculateMaxTextureLevels( driTexHeap * const * heaps,
-			      unsigned nr_heaps,
-			      struct gl_constants * limits,
-			      unsigned max_bytes_per_texel,
-			      unsigned max_2D_size,
-			      unsigned max_3D_size,
-			      unsigned max_cube_size,
-			      unsigned max_rect_size,
-			      unsigned mipmaps_at_once,
-			      int all_textures_one_heap,
-			      int allow_larger_textures );
-
-void
-driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter );
-
-#define DRI_TEXMGR_DO_TEXTURE_1D    0x0001
-#define DRI_TEXMGR_DO_TEXTURE_2D    0x0002
-#define DRI_TEXMGR_DO_TEXTURE_3D    0x0004
-#define DRI_TEXMGR_DO_TEXTURE_CUBE  0x0008
-#define DRI_TEXMGR_DO_TEXTURE_RECT  0x0010
-
-void driInitTextureObjects( GLcontext *ctx, driTextureObject * swapped,
-			    GLuint targets );
-
-GLboolean driValidateTextureHeaps( driTexHeap * const * texture_heaps,
-    unsigned nr_heaps, const driTextureObject * swapped );
-
-extern void driCalculateTextureFirstLastLevel( driTextureObject * t );
-
-
-extern gl_format _dri_texformat_rgba8888;
-extern gl_format _dri_texformat_argb8888;
-extern gl_format _dri_texformat_rgb565;
-extern gl_format _dri_texformat_argb4444;
-extern gl_format _dri_texformat_argb1555;
-extern gl_format _dri_texformat_al88;
-extern gl_format _dri_texformat_a8;
-extern gl_format _dri_texformat_ci8;
-extern gl_format _dri_texformat_i8;
-extern gl_format _dri_texformat_l8;
-
-extern void driInitTextureFormats( void );
-
-#endif /* DRI_TEXMEM_H */
+/*

+ * Copyright 2000-2001 VA Linux Systems, Inc.

+ * (c) Copyright IBM Corporation 2002

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

+ * VA LINUX SYSTEM, IBM 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:

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

+ *    Keith Whitwell <keithw@tungstengraphics.com>

+ *    Kevin E. Martin <kem@users.sourceforge.net>

+ *    Gareth Hughes <gareth@nvidia.com>

+ */

+

+/** \file texmem.h

+ * Public interface to the DRI texture memory management routines.

+ * 

+ * \sa texmem.c

+ */

+

+#ifndef DRI_TEXMEM_H

+#define DRI_TEXMEM_H

+

+#include "main/mtypes.h"

+#include "main/formats.h"

+#include "main/mm.h"

+#include "xf86drm.h"

+

+struct dri_tex_heap;

+typedef struct dri_tex_heap driTexHeap;

+

+struct dri_texture_object;

+typedef struct dri_texture_object driTextureObject;

+

+

+/**

+ * Base texture object type.  Each driver will extend this type with its own

+ * private data members.

+ */

+

+struct dri_texture_object {

+	struct dri_texture_object * next;

+	struct dri_texture_object * prev;

+

+	driTexHeap * heap;		/**< Texture heap currently stored in */

+	struct gl_texture_object * tObj;/**< Pointer to Mesa texture object

+					 * If NULL, this texture object is a

+					 * "placeholder" object representing

+					 * texture memory in use by another context.

+					 * A placeholder should have a heap and a memBlock.

+					 */

+	struct mem_block *memBlock;	/**< Memory block containing texture */

+

+        unsigned    reserved;	        /**< Cannot be swapped out by user contexts.  */

+

+	unsigned    bound;		/**< Bitmask indicating which tex units

+					 * this texture object is bound to.

+					 * Bit 0 = unit 0, Bit 1 = unit 1, etc

+					 */

+

+	unsigned    totalSize;		/**< Total size of the texture,

+					 * including all mipmap levels 

+					 */

+

+	unsigned    dirty_images[6];	/**< Flags for whether or not images

+					 * need to be uploaded to local or

+					 * AGP texture space.  One flag set

+					 * for each cube face for cubic

+					 * textures.  Bit zero corresponds to

+					 * the base-level, which may or may

+					 * not be the level zero mipmap.

+					 */

+

+        unsigned    timestamp;	        /**< Timestamp used to

+					 * synchronize with 3d engine

+					 * in hardware where textures

+					 * are uploaded directly to

+					 * the framebuffer.  

+					 */

+

+        unsigned    firstLevel;         /**< Image in \c tObj->Image[0] that

+					 * corresponds to the base-level of

+					 * this texture object.

+					 */

+

+        unsigned    lastLevel;          /**< Last image in \c tObj->Image[0] 

+					 * used by the

+					 * current LOD settings of

+					 * this texture object.  This

+					 * value must be greater than

+					 * or equal to \c firstLevel.

+					 */

+};

+

+

+typedef void (destroy_texture_object_t)( void * driverContext,

+				        driTextureObject * t );

+

+/**

+ * Client-private representation of texture memory state.

+ *

+ * Clients will place one or more of these structs in their driver

+ * context struct to manage one or more global texture heaps.

+ */

+

+struct dri_tex_heap {

+

+	/** Client-supplied heap identifier 

+	 */

+	unsigned heapId;	

+

+	/** Pointer to the client's private context 

+	 */

+	void *driverContext;

+

+	/** Total size of the heap, in bytes

+	 */

+	unsigned size;

+

+	/** \brief \f$log_2\f$ of size of single heap region

+	 *

+	 * Each context takes memory from the global texture heap in

+	 * \f$2^{logGranularity}\f$ byte blocks.  The value of

+	 * \a logGranularity is based on the amount of memory represented

+	 * by the heap and the maximum number of regions in the SAREA.  Given

+	 * \a b bytes of texture memory an \a n regions in the SAREA,

+	 * \a logGranularity will be \f$\lfloor\log_2( b / n )\rfloor\f$.

+	 */

+	unsigned logGranularity;

+

+	/** \brief Required alignment of allocations in this heap

+	 * 

+	 * The alignment shift is supplied to \a mmAllocMem when memory is

+	 * allocated from this heap.  The value of \a alignmentShift will

+	 * typically reflect some require of the hardware.  This value has

+	 * \b no \b relation to \a logGranularity.  \a alignmentShift is a

+	 * per-context value.

+	 *

+	 * \sa mmAllocMem

+	 */

+	unsigned alignmentShift;

+

+	/** Number of elements in global list (the SAREA).

+	 */

+	unsigned nrRegions;	 

+

+	/** Pointer to SAREA \a driTexRegion array

+	 */

+	drmTextureRegionPtr global_regions;

+

+	/** Pointer to the texture state age (generation number) in the SAREA

+	 */

+	unsigned     * global_age;

+

+	/** Local age (generation number) of texture state

+	 */

+	unsigned local_age;

+

+	/** Memory heap used to manage texture memory represented by

+	 * this texture heap.

+	 */

+	struct mem_block * memory_heap;

+

+	/** List of objects that we currently believe to be in texture

+	 * memory.

+	 */

+	driTextureObject     texture_objects;

+    

+	/** Pointer to the list of texture objects that are not in

+	 * texture memory.

+	 */

+	driTextureObject   * swapped_objects;

+

+	/** Size of the driver-speicific texture object.

+	 */

+	unsigned       texture_object_size;

+

+

+	/**

+	 * \brief Function to destroy driver-specific texture object data.

+	 * 

+	 * This function is supplied by the driver so that the texture manager

+	 * can release all resources associated with a texture object.  This

+	 * function should only release driver-specific data.  That is,

+	 * \a driDestroyTextureObject will release the texture memory

+	 * associated with the texture object, it will release the memory

+	 * for the texture object itself, and it will unlink the texture

+	 * object from the texture object lists.

+	 *

+	 * \param driverContext Pointer to the driver supplied context

+	 * \param t Texture object that is to be destroyed

+	 * \sa driDestroyTextureObject

+	 */

+

+	destroy_texture_object_t * destroy_texture_object;

+

+

+	/**

+	 */

+	unsigned * texture_swaps;

+

+        /**

+	 * Timestamp used to synchronize with 3d engine in hardware

+	 * where textures are uploaded directly to the

+	 * framebuffer.  

+	 */

+        unsigned timestamp;

+

+	/** \brief Kick/upload weight

+	 *

+	 * When not enough free space is available this weight

+	 * influences the choice of the heap from which textures are

+	 * kicked. By default the weight is equal to the heap size.

+	 */

+	double weight;

+

+	/** \brief Kick/upload duty

+	 *

+	 * The heap with the highest duty will be chosen for kicking

+	 * textures if not enough free space is available. The duty is

+	 * reduced by the amount of data kicked. Rebalancing of

+	 * negative duties takes the weights into account.

+	 */

+	int duty;

+};

+

+

+

+

+/**

+ * Called by the client on lock contention to determine whether textures have

+ * been stolen.  If another client has modified a region in which we have

+ * textures, then we need to figure out which of our textures have been

+ * removed and update our global LRU.

+ * 

+ * \param heap Texture heap to be updated

+ * \hideinitializer

+ */

+

+#define DRI_AGE_TEXTURES( heap )				\

+   do {								\

+       if ( ((heap) != NULL)					\

+	    && ((heap)->local_age != (heap)->global_age[0]) )	\

+	   driAgeTextures( heap );				\

+   } while( 0 )

+

+

+

+

+/* This should be called whenever there has been contention on the hardware

+ * lock.  driAgeTextures should not be called directly.  Instead, clients

+ * should use DRI_AGE_TEXTURES, above.

+ */

+

+void driAgeTextures( driTexHeap * heap );

+

+void driUpdateTextureLRU( driTextureObject * t );

+void driSwapOutTextureObject( driTextureObject * t );

+void driDestroyTextureObject( driTextureObject * t );

+int driAllocateTexture( driTexHeap * const * heap_array, unsigned nr_heaps,

+    driTextureObject * t );

+

+GLboolean driIsTextureResident( struct gl_context * ctx, 

+    struct gl_texture_object * texObj );

+

+driTexHeap * driCreateTextureHeap( unsigned heap_id, void * context,

+    unsigned size, unsigned alignmentShift, unsigned nr_regions,

+    drmTextureRegionPtr global_regions, unsigned * global_age,

+    driTextureObject * swapped_objects, unsigned texture_object_size,

+    destroy_texture_object_t * destroy_tex_obj );

+void driDestroyTextureHeap( driTexHeap * heap );

+

+void

+driCalculateMaxTextureLevels( driTexHeap * const * heaps,

+			      unsigned nr_heaps,

+			      struct gl_constants * limits,

+			      unsigned max_bytes_per_texel,

+			      unsigned max_2D_size,

+			      unsigned max_3D_size,

+			      unsigned max_cube_size,

+			      unsigned max_rect_size,

+			      unsigned mipmaps_at_once,

+			      int all_textures_one_heap,

+			      int allow_larger_textures );

+

+void

+driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter );

+

+#define DRI_TEXMGR_DO_TEXTURE_1D    0x0001

+#define DRI_TEXMGR_DO_TEXTURE_2D    0x0002

+#define DRI_TEXMGR_DO_TEXTURE_3D    0x0004

+#define DRI_TEXMGR_DO_TEXTURE_CUBE  0x0008

+#define DRI_TEXMGR_DO_TEXTURE_RECT  0x0010

+

+void driInitTextureObjects( struct gl_context *ctx, driTextureObject * swapped,

+			    GLuint targets );

+

+GLboolean driValidateTextureHeaps( driTexHeap * const * texture_heaps,

+    unsigned nr_heaps, const driTextureObject * swapped );

+

+extern void driCalculateTextureFirstLastLevel( driTextureObject * t );

+

+

+extern gl_format _dri_texformat_rgba8888;

+extern gl_format _dri_texformat_argb8888;

+extern gl_format _dri_texformat_rgb565;

+extern gl_format _dri_texformat_argb4444;

+extern gl_format _dri_texformat_argb1555;

+extern gl_format _dri_texformat_al88;

+extern gl_format _dri_texformat_a8;

+extern gl_format _dri_texformat_ci8;

+extern gl_format _dri_texformat_i8;

+extern gl_format _dri_texformat_l8;

+

+extern void driInitTextureFormats( void );

+

+#endif /* DRI_TEXMEM_H */

diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index 0dd879abc..a2b0b4e94 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -1,798 +1,821 @@
-/*
- * (C) Copyright IBM Corporation 2002, 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
- * VA LINUX SYSTEM, IBM 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 utils.c
- * Utility functions for DRI drivers.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include "main/mtypes.h"
-#include "main/cpuinfo.h"
-#include "main/extensions.h"
-#include "utils.h"
-
-
-/**
- * Print message to \c stderr if the \c LIBGL_DEBUG environment variable
- * is set. 
- * 
- * Is called from the drivers.
- * 
- * \param f \c printf like format string.
- */
-void
-__driUtilMessage(const char *f, ...)
-{
-    va_list args;
-
-    if (getenv("LIBGL_DEBUG")) {
-        fprintf(stderr, "libGL: ");
-        va_start(args, f);
-        vfprintf(stderr, f, args);
-        va_end(args);
-        fprintf(stderr, "\n");
-    }
-}
-
-
-unsigned
-driParseDebugString( const char * debug, 
-		     const struct dri_debug_control * control  )
-{
-   unsigned   flag;
-
-
-   flag = 0;
-   if ( debug != NULL ) {
-      while( control->string != NULL ) {
-	 if ( !strcmp( debug, "all" ) ||
-	      strstr( debug, control->string ) != NULL ) {
-	    flag |= control->flag;
-	 }
-
-	 control++;
-      }
-   }
-
-   return flag;
-}
-
-
-
-/**
- * Create the \c GL_RENDERER string for DRI drivers.
- * 
- * Almost all DRI drivers use a \c GL_RENDERER string of the form:
- *
- *    "Mesa DRI <chip> <driver date> <AGP speed) <CPU information>"
- *
- * Using the supplied chip name, driver data, and AGP speed, this function
- * creates the string.
- * 
- * \param buffer         Buffer to hold the \c GL_RENDERER string.
- * \param hardware_name  Name of the hardware.
- * \param driver_date    Driver date.
- * \param agp_mode       AGP mode (speed).
- * 
- * \returns
- * The length of the string stored in \c buffer.  This does \b not include
- * the terminating \c NUL character.
- */
-unsigned
-driGetRendererString( char * buffer, const char * hardware_name,
-		      const char * driver_date, GLuint agp_mode )
-{
-   unsigned offset;
-   char *cpu;
-
-   offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date );
-
-   /* Append any AGP-specific information.
-    */
-   switch ( agp_mode ) {
-   case 1:
-   case 2:
-   case 4:
-   case 8:
-      offset += sprintf( & buffer[ offset ], " AGP %ux", agp_mode );
-      break;
-	
-   default:
-      break;
-   }
-
-   /* Append any CPU-specific information.
-    */
-   cpu = _mesa_get_cpu_string();
-   if (cpu) {
-      offset += sprintf(buffer + offset, " %s", cpu);
-      free(cpu);
-   }
-
-   return offset;
-}
-
-
-
-
-#define need_GL_ARB_draw_buffers
-#define need_GL_ARB_multisample
-#define need_GL_ARB_texture_compression
-#define need_GL_ARB_transpose_matrix
-#define need_GL_ARB_vertex_buffer_object
-#define need_GL_ARB_window_pos
-#define need_GL_EXT_compiled_vertex_array
-#define need_GL_EXT_multi_draw_arrays
-#define need_GL_EXT_polygon_offset
-#define need_GL_EXT_texture_object
-#define need_GL_EXT_vertex_array
-#define need_GL_IBM_multimode_draw_arrays
-#define need_GL_MESA_window_pos
-
-/* These are needed in *all* drivers because Mesa internally implements
- * certain functionality in terms of functions provided by these extensions.
- * For example, glBlendFunc is implemented by calling glBlendFuncSeparateEXT.
- */
-#define need_GL_EXT_blend_func_separate
-#define need_GL_NV_vertex_program
-
-#include "main/remap_helper.h"
-
-static const struct dri_extension all_mesa_extensions[] = {
-   { "GL_ARB_draw_buffers",          GL_ARB_draw_buffers_functions },
-   { "GL_ARB_multisample",           GL_ARB_multisample_functions },
-   { "GL_ARB_texture_compression",   GL_ARB_texture_compression_functions },
-   { "GL_ARB_transpose_matrix",      GL_ARB_transpose_matrix_functions },
-   { "GL_ARB_vertex_buffer_object",  GL_ARB_vertex_buffer_object_functions},
-   { "GL_ARB_window_pos",            GL_ARB_window_pos_functions },
-   { "GL_EXT_blend_func_separate",   GL_EXT_blend_func_separate_functions },
-   { "GL_EXT_compiled_vertex_array", GL_EXT_compiled_vertex_array_functions },
-   { "GL_EXT_multi_draw_arrays",     GL_EXT_multi_draw_arrays_functions },
-   { "GL_EXT_polygon_offset",        GL_EXT_polygon_offset_functions },
-   { "GL_EXT_texture_object",        GL_EXT_texture_object_functions },
-   { "GL_EXT_vertex_array",          GL_EXT_vertex_array_functions },
-   { "GL_IBM_multimode_draw_arrays", GL_IBM_multimode_draw_arrays_functions },
-   { "GL_MESA_window_pos",           GL_MESA_window_pos_functions },
-   { "GL_NV_vertex_program",         GL_NV_vertex_program_functions },
-   { NULL,                           NULL }
-};
-
-
-/**
- * Enable and map extensions supported by the driver.
- * 
- * When ctx is NULL, extensions are not enabled, but their functions
- * are still mapped.  When extensions_to_enable is NULL, all static
- * functions known to mesa core are mapped.
- *
- * \bug
- * ARB_imaging isn't handled properly.  In Mesa, enabling ARB_imaging also
- * enables all the sub-extensions that are folded into it.  This means that
- * we need to add entry-points (via \c driInitSingleExtension) for those
- * new functions here.
- */
-void driInitExtensions( GLcontext * ctx,
-			const struct dri_extension * extensions_to_enable,
-			GLboolean enable_imaging )
-{
-   static int first_time = 1;
-   unsigned   i;
-
-   if ( first_time ) {
-      first_time = 0;
-      driInitExtensions( NULL, all_mesa_extensions, GL_FALSE );
-   }
-
-   if ( (ctx != NULL) && enable_imaging ) {
-      _mesa_enable_imaging_extensions( ctx );
-   }
-
-   /* The caller is too lazy to list any extension */
-   if ( extensions_to_enable == NULL ) {
-      /* Map the static functions.  Together with those mapped by remap
-       * table, this should cover everything mesa core knows.
-       */
-      _mesa_map_static_functions();
-      return;
-   }
-
-   for ( i = 0 ; extensions_to_enable[i].name != NULL ; i++ ) {
-       driInitSingleExtension( ctx, & extensions_to_enable[i] );
-   }
-}
-
-
-
-
-/**
- * Enable and map functions for a single extension
- * 
- * \param ctx  Context where extension is to be enabled.
- * \param ext  Extension that is to be enabled.
- * 
- * \sa driInitExtensions, _mesa_enable_extension, _mesa_map_function_array
- */
-void driInitSingleExtension( GLcontext * ctx,
-			     const struct dri_extension * ext )
-{
-    if ( ext->functions != NULL ) {
-       _mesa_map_function_array(ext->functions);
-    }
-
-    if ( ctx != NULL ) {
-	_mesa_enable_extension( ctx, ext->name );
-    }
-}
-
-
-/**
- * Utility function used by drivers to test the verions of other components.
- *
- * \param driver_name  Name of the driver.  Used in error messages.
- * \param driActual    Actual DRI version supplied __driCreateNewScreen.
- * \param driExpected  Minimum DRI version required by the driver.
- * \param ddxActual    Actual DDX version supplied __driCreateNewScreen.
- * \param ddxExpected  Minimum DDX minor and range of DDX major version required by the driver.
- * \param drmActual    Actual DRM version supplied __driCreateNewScreen.
- * \param drmExpected  Minimum DRM version required by the driver.
- * 
- * \returns \c GL_TRUE if all version requirements are met.  Otherwise,
- *          \c GL_FALSE is returned.
- * 
- * \sa __driCreateNewScreen, driCheckDriDdxDrmVersions2
- *
- * \todo
- * Now that the old \c driCheckDriDdxDrmVersions function is gone, this
- * function and \c driCheckDriDdxDrmVersions2 should be renamed.
- */
-GLboolean
-driCheckDriDdxDrmVersions3(const char * driver_name,
-			   const __DRIversion * driActual,
-			   const __DRIversion * driExpected,
-			   const __DRIversion * ddxActual,
-			   const __DRIutilversion2 * ddxExpected,
-			   const __DRIversion * drmActual,
-			   const __DRIversion * drmExpected)
-{
-   static const char format[] = "%s DRI driver expected %s version %d.%d.x "
-       "but got version %d.%d.%d\n";
-   static const char format2[] = "%s DRI driver expected %s version %d-%d.%d.x "
-       "but got version %d.%d.%d\n";
-
-
-   /* Check the DRI version */
-   if ( (driActual->major != driExpected->major)
-	|| (driActual->minor < driExpected->minor) ) {
-      fprintf(stderr, format, driver_name, "DRI",
-		       driExpected->major, driExpected->minor,
-		       driActual->major, driActual->minor, driActual->patch);
-      return GL_FALSE;
-   }
-
-   /* Check that the DDX driver version is compatible */
-   if ( (ddxActual->major < ddxExpected->major_min)
-	|| (ddxActual->major > ddxExpected->major_max)
-	|| (ddxActual->minor < ddxExpected->minor) ) {
-      fprintf(stderr, format2, driver_name, "DDX",
-		       ddxExpected->major_min, ddxExpected->major_max, ddxExpected->minor,
-		       ddxActual->major, ddxActual->minor, ddxActual->patch);
-      return GL_FALSE;
-   }
-   
-   /* Check that the DRM driver version is compatible */
-   if ( (drmActual->major != drmExpected->major)
-	|| (drmActual->minor < drmExpected->minor) ) {
-      fprintf(stderr, format, driver_name, "DRM",
-		       drmExpected->major, drmExpected->minor,
-		       drmActual->major, drmActual->minor, drmActual->patch);
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-GLboolean
-driCheckDriDdxDrmVersions2(const char * driver_name,
-			   const __DRIversion * driActual,
-			   const __DRIversion * driExpected,
-			   const __DRIversion * ddxActual,
-			   const __DRIversion * ddxExpected,
-			   const __DRIversion * drmActual,
-			   const __DRIversion * drmExpected)
-{
-   __DRIutilversion2 ddx_expected;
-   ddx_expected.major_min = ddxExpected->major;
-   ddx_expected.major_max = ddxExpected->major;
-   ddx_expected.minor = ddxExpected->minor;
-   ddx_expected.patch = ddxExpected->patch;
-   return driCheckDriDdxDrmVersions3(driver_name, driActual,
-				driExpected, ddxActual, & ddx_expected,
-				drmActual, drmExpected);
-}
-
-GLboolean driClipRectToFramebuffer( const GLframebuffer *buffer,
-				    GLint *x, GLint *y,
-				    GLsizei *width, GLsizei *height )
-{
-   /* left clipping */
-   if (*x < buffer->_Xmin) {
-      *width -= (buffer->_Xmin - *x);
-      *x = buffer->_Xmin;
-   }
-
-   /* right clipping */
-   if (*x + *width > buffer->_Xmax)
-      *width -= (*x + *width - buffer->_Xmax - 1);
-
-   if (*width <= 0)
-      return GL_FALSE;
-
-   /* bottom clipping */
-   if (*y < buffer->_Ymin) {
-      *height -= (buffer->_Ymin - *y);
-      *y = buffer->_Ymin;
-   }
-
-   /* top clipping */
-   if (*y + *height > buffer->_Ymax)
-      *height -= (*y + *height - buffer->_Ymax - 1);
-
-   if (*height <= 0)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-/**
- * Creates a set of \c __GLcontextModes that a driver will expose.
- * 
- * A set of \c __GLcontextModes will be created based on the supplied
- * parameters.  The number of modes processed will be 2 *
- * \c num_depth_stencil_bits * \c num_db_modes.
- * 
- * For the most part, data is just copied from \c depth_bits, \c stencil_bits,
- * \c db_modes, and \c visType into each \c __GLcontextModes element.
- * However, the meanings of \c fb_format and \c fb_type require further
- * explanation.  The \c fb_format specifies which color components are in
- * each pixel and what the default order is.  For example, \c GL_RGB specifies
- * that red, green, blue are available and red is in the "most significant"
- * position and blue is in the "least significant".  The \c fb_type specifies
- * the bit sizes of each component and the actual ordering.  For example, if
- * \c GL_UNSIGNED_SHORT_5_6_5_REV is specified with \c GL_RGB, bits [15:11]
- * are the blue value, bits [10:5] are the green value, and bits [4:0] are
- * the red value.
- * 
- * One sublte issue is the combination of \c GL_RGB  or \c GL_BGR and either
- * of the \c GL_UNSIGNED_INT_8_8_8_8 modes.  The resulting mask values in the
- * \c __GLcontextModes structure is \b identical to the \c GL_RGBA or
- * \c GL_BGRA case, except the \c alphaMask is zero.  This means that, as
- * far as this routine is concerned, \c GL_RGB with \c GL_UNSIGNED_INT_8_8_8_8
- * still uses 32-bits.
- *
- * If in doubt, look at the tables used in the function.
- * 
- * \param ptr_to_modes  Pointer to a pointer to a linked list of
- *                      \c __GLcontextModes.  Upon completion, a pointer to
- *                      the next element to be process will be stored here.
- *                      If the function fails and returns \c GL_FALSE, this
- *                      value will be unmodified, but some elements in the
- *                      linked list may be modified.
- * \param fb_format     Format of the framebuffer.  Currently only \c GL_RGB,
- *                      \c GL_RGBA, \c GL_BGR, and \c GL_BGRA are supported.
- * \param fb_type       Type of the pixels in the framebuffer.  Currently only
- *                      \c GL_UNSIGNED_SHORT_5_6_5, 
- *                      \c GL_UNSIGNED_SHORT_5_6_5_REV,
- *                      \c GL_UNSIGNED_INT_8_8_8_8, and
- *                      \c GL_UNSIGNED_INT_8_8_8_8_REV are supported.
- * \param depth_bits    Array of depth buffer sizes to be exposed.
- * \param stencil_bits  Array of stencil buffer sizes to be exposed.
- * \param num_depth_stencil_bits  Number of entries in both \c depth_bits and
- *                      \c stencil_bits.
- * \param db_modes      Array of buffer swap modes.  If an element has a
- *                      value of \c GLX_NONE, then it represents a
- *                      single-buffered mode.  Other valid values are
- *                      \c GLX_SWAP_EXCHANGE_OML, \c GLX_SWAP_COPY_OML, and
- *                      \c GLX_SWAP_UNDEFINED_OML.  See the
- *                      GLX_OML_swap_method extension spec for more details.
- * \param num_db_modes  Number of entries in \c db_modes.
- * \param msaa_samples  Array of msaa sample count. 0 represents a visual
- *                      without a multisample buffer.
- * \param num_msaa_modes Number of entries in \c msaa_samples.
- * \param visType       GLX visual type.  Usually either \c GLX_TRUE_COLOR or
- *                      \c GLX_DIRECT_COLOR.
- * 
- * \returns
- * \c GL_TRUE on success or \c GL_FALSE on failure.  Currently the only
- * cause of failure is a bad parameter (i.e., unsupported \c fb_format or
- * \c fb_type).
- * 
- * \todo
- * There is currently no way to support packed RGB modes (i.e., modes with
- * exactly 3 bytes per pixel) or floating-point modes.  This could probably
- * be done by creating some new, private enums with clever names likes
- * \c GL_UNSIGNED_3BYTE_8_8_8, \c GL_4FLOAT_32_32_32_32, 
- * \c GL_4HALF_16_16_16_16, etc.  We can cross that bridge when we come to it.
- */
-__DRIconfig **
-driCreateConfigs(GLenum fb_format, GLenum fb_type,
-		 const uint8_t * depth_bits, const uint8_t * stencil_bits,
-		 unsigned num_depth_stencil_bits,
-		 const GLenum * db_modes, unsigned num_db_modes,
-		 const uint8_t * msaa_samples, unsigned num_msaa_modes,
-		 GLboolean enable_accum)
-{
-   static const uint8_t bits_table[4][4] = {
-     /* R  G  B  A */
-      { 3, 3, 2, 0 }, /* Any GL_UNSIGNED_BYTE_3_3_2 */
-      { 5, 6, 5, 0 }, /* Any GL_UNSIGNED_SHORT_5_6_5 */
-      { 8, 8, 8, 0 }, /* Any RGB with any GL_UNSIGNED_INT_8_8_8_8 */
-      { 8, 8, 8, 8 }  /* Any RGBA with any GL_UNSIGNED_INT_8_8_8_8 */
-   };
-
-   static const uint32_t masks_table_rgb[6][4] = {
-      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 3_3_2       */
-      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 2_3_3_REV   */
-      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5       */
-      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5_REV   */
-      { 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 }, /* 8_8_8_8     */
-      { 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }  /* 8_8_8_8_REV */
-   };
-
-   static const uint32_t masks_table_rgba[6][4] = {
-      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 3_3_2       */
-      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 2_3_3_REV   */
-      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5       */
-      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5_REV   */
-      { 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF }, /* 8_8_8_8     */
-      { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }, /* 8_8_8_8_REV */
-   };
-
-   static const uint32_t masks_table_bgr[6][4] = {
-      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 3_3_2       */
-      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 2_3_3_REV   */
-      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5       */
-      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5_REV   */
-      { 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 }, /* 8_8_8_8     */
-      { 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, /* 8_8_8_8_REV */
-   };
-
-   static const uint32_t masks_table_bgra[6][4] = {
-      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 3_3_2       */
-      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 2_3_3_REV   */
-      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5       */
-      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5_REV   */
-      { 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF }, /* 8_8_8_8     */
-      { 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 }, /* 8_8_8_8_REV */
-   };
-
-   static const uint8_t bytes_per_pixel[6] = {
-      1, /* 3_3_2       */
-      1, /* 2_3_3_REV   */
-      2, /* 5_6_5       */
-      2, /* 5_6_5_REV   */
-      4, /* 8_8_8_8     */
-      4  /* 8_8_8_8_REV */
-   };
-
-   const uint8_t  * bits;
-   const uint32_t * masks;
-   int index;
-   __DRIconfig **configs, **c;
-   __GLcontextModes *modes;
-   unsigned i, j, k, h;
-   unsigned num_modes;
-   unsigned num_accum_bits = (enable_accum) ? 2 : 1;
-
-   switch ( fb_type ) {
-      case GL_UNSIGNED_BYTE_3_3_2:
-	 index = 0;
-	 break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-	 index = 1;
-	 break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-	 index = 2;
-	 break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-	 index = 3;
-	 break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-	 index = 4;
-	 break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-	 index = 5;
-	 break;
-      default:
-	 fprintf( stderr, "[%s:%u] Unknown framebuffer type 0x%04x.\n",
-               __FUNCTION__, __LINE__, fb_type );
-	 return NULL;
-   }
-
-
-   /* Valid types are GL_UNSIGNED_SHORT_5_6_5 and GL_UNSIGNED_INT_8_8_8_8 and
-    * the _REV versions.
-    *
-    * Valid formats are GL_RGBA, GL_RGB, and GL_BGRA.
-    */
-
-   switch ( fb_format ) {
-      case GL_RGB:
-         masks = masks_table_rgb[ index ];
-         break;
-
-      case GL_RGBA:
-         masks = masks_table_rgba[ index ];
-         break;
-
-      case GL_BGR:
-         masks = masks_table_bgr[ index ];
-         break;
-
-      case GL_BGRA:
-         masks = masks_table_bgra[ index ];
-         break;
-
-      default:
-         fprintf( stderr, "[%s:%u] Unknown framebuffer format 0x%04x.\n",
-               __FUNCTION__, __LINE__, fb_format );
-         return NULL;
-   }
-
-   switch ( bytes_per_pixel[ index ] ) {
-      case 1:
-	 bits = bits_table[0];
-	 break;
-      case 2:
-	 bits = bits_table[1];
-	 break;
-      default:
-	 bits = ((fb_format == GL_RGB) || (fb_format == GL_BGR))
-	    ? bits_table[2]
-	    : bits_table[3];
-	 break;
-   }
-
-   num_modes = num_depth_stencil_bits * num_db_modes * num_accum_bits * num_msaa_modes;
-   configs = calloc(1, (num_modes + 1) * sizeof *configs);
-   if (configs == NULL)
-       return NULL;
-
-    c = configs;
-    for ( k = 0 ; k < num_depth_stencil_bits ; k++ ) {
-	for ( i = 0 ; i < num_db_modes ; i++ ) {
-	    for ( h = 0 ; h < num_msaa_modes; h++ ) {
-	    	for ( j = 0 ; j < num_accum_bits ; j++ ) {
-		    *c = malloc (sizeof **c);
-		    modes = &(*c)->modes;
-		    c++;
-
-		    memset(modes, 0, sizeof *modes);
-		    modes->redBits   = bits[0];
-		    modes->greenBits = bits[1];
-		    modes->blueBits  = bits[2];
-		    modes->alphaBits = bits[3];
-		    modes->redMask   = masks[0];
-		    modes->greenMask = masks[1];
-		    modes->blueMask  = masks[2];
-		    modes->alphaMask = masks[3];
-		    modes->rgbBits   = modes->redBits + modes->greenBits
-		    	+ modes->blueBits + modes->alphaBits;
-
-		    modes->accumRedBits   = 16 * j;
-		    modes->accumGreenBits = 16 * j;
-		    modes->accumBlueBits  = 16 * j;
-		    modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0;
-		    modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG;
-
-		    modes->stencilBits = stencil_bits[k];
-		    modes->depthBits = depth_bits[k];
-
-		    modes->transparentPixel = GLX_NONE;
-		    modes->transparentRed = GLX_DONT_CARE;
-		    modes->transparentGreen = GLX_DONT_CARE;
-		    modes->transparentBlue = GLX_DONT_CARE;
-		    modes->transparentAlpha = GLX_DONT_CARE;
-		    modes->transparentIndex = GLX_DONT_CARE;
-		    modes->visualType = GLX_DONT_CARE;
-		    modes->renderType = GLX_RGBA_BIT;
-		    modes->drawableType = GLX_WINDOW_BIT;
-		    modes->rgbMode = GL_TRUE;
-
-		    if ( db_modes[i] == GLX_NONE ) {
-		    	modes->doubleBufferMode = GL_FALSE;
-		    }
-		    else {
-		    	modes->doubleBufferMode = GL_TRUE;
-		    	modes->swapMethod = db_modes[i];
-		    }
-
-		    modes->samples = msaa_samples[h];
-		    modes->sampleBuffers = modes->samples ? 1 : 0;
-
-
-		    modes->haveAccumBuffer = ((modes->accumRedBits +
-					   modes->accumGreenBits +
-					   modes->accumBlueBits +
-					   modes->accumAlphaBits) > 0);
-		    modes->haveDepthBuffer = (modes->depthBits > 0);
-		    modes->haveStencilBuffer = (modes->stencilBits > 0);
-
-		    modes->bindToTextureRgb = GL_TRUE;
-		    modes->bindToTextureRgba = GL_TRUE;
-		    modes->bindToMipmapTexture = GL_FALSE;
-		    modes->bindToTextureTargets =
-			__DRI_ATTRIB_TEXTURE_1D_BIT |
-			__DRI_ATTRIB_TEXTURE_2D_BIT |
-			__DRI_ATTRIB_TEXTURE_RECTANGLE_BIT;
-		}
-	    }
-	}
-    }
-    *c = NULL;
-
-    return configs;
-}
-
-__DRIconfig **driConcatConfigs(__DRIconfig **a,
-			       __DRIconfig **b)
-{
-    __DRIconfig **all;
-    int i, j, index;
-
-    i = 0;
-    while (a[i] != NULL)
-	i++;
-    j = 0;
-    while (b[j] != NULL)
-	j++;
-   
-    all = malloc((i + j + 1) * sizeof *all);
-    index = 0;
-    for (i = 0; a[i] != NULL; i++)
-	all[index++] = a[i];
-    for (j = 0; b[j] != NULL; j++)
-	all[index++] = b[j];
-    all[index++] = NULL;
-
-    free(a);
-    free(b);
-
-    return all;
-}
-
-#define __ATTRIB(attrib, field) \
-    { attrib, offsetof(__GLcontextModes, field) }
-
-static const struct { unsigned int attrib, offset; } attribMap[] = {
-    __ATTRIB(__DRI_ATTRIB_BUFFER_SIZE,			rgbBits),
-    __ATTRIB(__DRI_ATTRIB_LEVEL,			level),
-    __ATTRIB(__DRI_ATTRIB_RED_SIZE,			redBits),
-    __ATTRIB(__DRI_ATTRIB_GREEN_SIZE,			greenBits),
-    __ATTRIB(__DRI_ATTRIB_BLUE_SIZE,			blueBits),
-    __ATTRIB(__DRI_ATTRIB_ALPHA_SIZE,			alphaBits),
-    __ATTRIB(__DRI_ATTRIB_DEPTH_SIZE,			depthBits),
-    __ATTRIB(__DRI_ATTRIB_STENCIL_SIZE,			stencilBits),
-    __ATTRIB(__DRI_ATTRIB_ACCUM_RED_SIZE,		accumRedBits),
-    __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE,		accumGreenBits),
-    __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE,		accumBlueBits),
-    __ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE,		accumAlphaBits),
-    __ATTRIB(__DRI_ATTRIB_SAMPLE_BUFFERS,		sampleBuffers),
-    __ATTRIB(__DRI_ATTRIB_SAMPLES,			samples),
-    __ATTRIB(__DRI_ATTRIB_DOUBLE_BUFFER,		doubleBufferMode),
-    __ATTRIB(__DRI_ATTRIB_STEREO,			stereoMode),
-    __ATTRIB(__DRI_ATTRIB_AUX_BUFFERS,			numAuxBuffers),
-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_TYPE,		transparentPixel),
-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_INDEX_VALUE,	transparentPixel),
-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_RED_VALUE,	transparentRed),
-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE,	transparentGreen),
-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE,	transparentBlue),
-    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE,	transparentAlpha),
-    __ATTRIB(__DRI_ATTRIB_FLOAT_MODE,			floatMode),
-    __ATTRIB(__DRI_ATTRIB_RED_MASK,			redMask),
-    __ATTRIB(__DRI_ATTRIB_GREEN_MASK,			greenMask),
-    __ATTRIB(__DRI_ATTRIB_BLUE_MASK,			blueMask),
-    __ATTRIB(__DRI_ATTRIB_ALPHA_MASK,			alphaMask),
-    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH,		maxPbufferWidth),
-    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT,		maxPbufferHeight),
-    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS,		maxPbufferPixels),
-    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH,	optimalPbufferWidth),
-    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT,	optimalPbufferHeight),
-    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,			swapMethod),
-    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB,		bindToTextureRgb),
-    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA,		bindToTextureRgba),
-    __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE,	bindToMipmapTexture),
-    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS,	bindToTextureTargets),
-    __ATTRIB(__DRI_ATTRIB_YINVERTED,			yInverted),
-
-    /* The struct field doesn't matter here, these are handled by the
-     * switch in driGetConfigAttribIndex.  We need them in the array
-     * so the iterator includes them though.*/
-    __ATTRIB(__DRI_ATTRIB_RENDER_TYPE,			level),
-    __ATTRIB(__DRI_ATTRIB_CONFIG_CAVEAT,		level),
-    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,			level)
-};
-
-#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
-
-static int
-driGetConfigAttribIndex(const __DRIconfig *config,
-			unsigned int index, unsigned int *value)
-{
-    switch (attribMap[index].attrib) {
-    case __DRI_ATTRIB_RENDER_TYPE:
-	*value = __DRI_ATTRIB_RGBA_BIT;
-	break;
-    case __DRI_ATTRIB_CONFIG_CAVEAT:
-	if (config->modes.visualRating == GLX_NON_CONFORMANT_CONFIG)
-	    *value = __DRI_ATTRIB_NON_CONFORMANT_CONFIG;
-	else if (config->modes.visualRating == GLX_SLOW_CONFIG)
-	    *value = __DRI_ATTRIB_SLOW_BIT;
-	else
-	    *value = 0;
-	break;
-    case __DRI_ATTRIB_SWAP_METHOD:
-	break;
-
-    case __DRI_ATTRIB_FLOAT_MODE:
-        *value = config->modes.floatMode;
-        break;
-
-    default:
-	*value = *(unsigned int *)
-	    ((char *) &config->modes + attribMap[index].offset);
-	
-	break;
-    }
-
-    return GL_TRUE;
-}
-
-int
-driGetConfigAttrib(const __DRIconfig *config,
-		   unsigned int attrib, unsigned int *value)
-{
-    int i;
-
-    for (i = 0; i < ARRAY_SIZE(attribMap); i++)
-	if (attribMap[i].attrib == attrib)
-	    return driGetConfigAttribIndex(config, i, value);
-
-    return GL_FALSE;
-}
-
-int
-driIndexConfigAttrib(const __DRIconfig *config, int index,
-		     unsigned int *attrib, unsigned int *value)
-{
-    if (index >= 0 && index < ARRAY_SIZE(attribMap)) {
-	*attrib = attribMap[index].attrib;
-	return driGetConfigAttribIndex(config, index, value);
-    }
-
-    return GL_FALSE;
-}
+/*

+ * (C) Copyright IBM Corporation 2002, 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

+ * VA LINUX SYSTEM, IBM 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 utils.c

+ * Utility functions for DRI drivers.

+ *

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

+ */

+

+#include <string.h>

+#include <stdlib.h>

+#include "main/mtypes.h"

+#include "main/cpuinfo.h"

+#include "main/extensions.h"

+#include "utils.h"

+

+

+/**

+ * Print message to \c stderr if the \c LIBGL_DEBUG environment variable

+ * is set. 

+ * 

+ * Is called from the drivers.

+ * 

+ * \param f \c printf like format string.

+ */

+void

+__driUtilMessage(const char *f, ...)

+{

+    va_list args;

+

+    if (getenv("LIBGL_DEBUG")) {

+        fprintf(stderr, "libGL: ");

+        va_start(args, f);

+        vfprintf(stderr, f, args);

+        va_end(args);

+        fprintf(stderr, "\n");

+    }

+}

+

+

+unsigned

+driParseDebugString( const char * debug, 

+		     const struct dri_debug_control * control  )

+{

+   unsigned   flag;

+

+

+   flag = 0;

+   if ( debug != NULL ) {

+      while( control->string != NULL ) {

+	 if ( !strcmp( debug, "all" ) ||

+	      strstr( debug, control->string ) != NULL ) {

+	    flag |= control->flag;

+	 }

+

+	 control++;

+      }

+   }

+

+   return flag;

+}

+

+

+

+/**

+ * Create the \c GL_RENDERER string for DRI drivers.

+ * 

+ * Almost all DRI drivers use a \c GL_RENDERER string of the form:

+ *

+ *    "Mesa DRI <chip> <driver date> <AGP speed) <CPU information>"

+ *

+ * Using the supplied chip name, driver data, and AGP speed, this function

+ * creates the string.

+ * 

+ * \param buffer         Buffer to hold the \c GL_RENDERER string.

+ * \param hardware_name  Name of the hardware.

+ * \param driver_date    Driver date.

+ * \param agp_mode       AGP mode (speed).

+ * 

+ * \returns

+ * The length of the string stored in \c buffer.  This does \b not include

+ * the terminating \c NUL character.

+ */

+unsigned

+driGetRendererString( char * buffer, const char * hardware_name,

+		      const char * driver_date, GLuint agp_mode )

+{

+   unsigned offset;

+   char *cpu;

+

+   offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date );

+

+   /* Append any AGP-specific information.

+    */

+   switch ( agp_mode ) {

+   case 1:

+   case 2:

+   case 4:

+   case 8:

+      offset += sprintf( & buffer[ offset ], " AGP %ux", agp_mode );

+      break;

+	

+   default:

+      break;

+   }

+

+   /* Append any CPU-specific information.

+    */

+   cpu = _mesa_get_cpu_string();

+   if (cpu) {

+      offset += sprintf(buffer + offset, " %s", cpu);

+      free(cpu);

+   }

+

+   return offset;

+}

+

+

+

+

+#define need_GL_ARB_copy_buffer

+#define need_GL_ARB_draw_buffers

+#define need_GL_ARB_multisample

+#define need_GL_ARB_texture_compression

+#define need_GL_ARB_transpose_matrix

+#define need_GL_ARB_vertex_buffer_object

+#define need_GL_ARB_window_pos

+#define need_GL_EXT_compiled_vertex_array

+#define need_GL_EXT_multi_draw_arrays

+#define need_GL_EXT_polygon_offset

+#define need_GL_EXT_texture_object

+#define need_GL_EXT_vertex_array

+#define need_GL_IBM_multimode_draw_arrays

+#define need_GL_MESA_window_pos

+

+/* These are needed in *all* drivers because Mesa internally implements

+ * certain functionality in terms of functions provided by these extensions.

+ * For example, glBlendFunc is implemented by calling glBlendFuncSeparateEXT.

+ */

+#define need_GL_EXT_blend_func_separate

+#define need_GL_NV_vertex_program

+

+#include "main/remap_helper.h"

+

+static const struct dri_extension all_mesa_extensions[] = {

+   { "GL_ARB_copy_buffer",           GL_ARB_copy_buffer_functions },

+   { "GL_ARB_draw_buffers",          GL_ARB_draw_buffers_functions },

+   { "GL_ARB_multisample",           GL_ARB_multisample_functions },

+   { "GL_ARB_texture_compression",   GL_ARB_texture_compression_functions },

+   { "GL_ARB_transpose_matrix",      GL_ARB_transpose_matrix_functions },

+   { "GL_ARB_vertex_buffer_object",  GL_ARB_vertex_buffer_object_functions},

+   { "GL_ARB_window_pos",            GL_ARB_window_pos_functions },

+   { "GL_EXT_blend_func_separate",   GL_EXT_blend_func_separate_functions },

+   { "GL_EXT_compiled_vertex_array", GL_EXT_compiled_vertex_array_functions },

+   { "GL_EXT_multi_draw_arrays",     GL_EXT_multi_draw_arrays_functions },

+   { "GL_EXT_polygon_offset",        GL_EXT_polygon_offset_functions },

+   { "GL_EXT_texture_object",        GL_EXT_texture_object_functions },

+   { "GL_EXT_vertex_array",          GL_EXT_vertex_array_functions },

+   { "GL_IBM_multimode_draw_arrays", GL_IBM_multimode_draw_arrays_functions },

+   { "GL_MESA_window_pos",           GL_MESA_window_pos_functions },

+   { "GL_NV_vertex_program",         GL_NV_vertex_program_functions },

+   { NULL,                           NULL }

+};

+

+

+/**

+ * Enable and map extensions supported by the driver.

+ * 

+ * When ctx is NULL, extensions are not enabled, but their functions

+ * are still mapped.  When extensions_to_enable is NULL, all static

+ * functions known to mesa core are mapped.

+ *

+ * \bug

+ * ARB_imaging isn't handled properly.  In Mesa, enabling ARB_imaging also

+ * enables all the sub-extensions that are folded into it.  This means that

+ * we need to add entry-points (via \c driInitSingleExtension) for those

+ * new functions here.

+ */

+void driInitExtensions( struct gl_context * ctx,

+			const struct dri_extension * extensions_to_enable,

+			GLboolean enable_imaging )

+{

+   static int first_time = 1;

+   unsigned   i;

+

+   if ( first_time ) {

+      first_time = 0;

+      driInitExtensions( NULL, all_mesa_extensions, GL_FALSE );

+   }

+

+   if ( (ctx != NULL) && enable_imaging ) {

+      _mesa_enable_imaging_extensions( ctx );

+   }

+

+   /* The caller is too lazy to list any extension */

+   if ( extensions_to_enable == NULL ) {

+      /* Map the static functions.  Together with those mapped by remap

+       * table, this should cover everything mesa core knows.

+       */

+      _mesa_map_static_functions();

+      return;

+   }

+

+   for ( i = 0 ; extensions_to_enable[i].name != NULL ; i++ ) {

+       driInitSingleExtension( ctx, & extensions_to_enable[i] );

+   }

+}

+

+

+

+

+/**

+ * Enable and map functions for a single extension

+ * 

+ * \param ctx  Context where extension is to be enabled.

+ * \param ext  Extension that is to be enabled.

+ * 

+ * \sa driInitExtensions, _mesa_enable_extension, _mesa_map_function_array

+ */

+void driInitSingleExtension( struct gl_context * ctx,

+			     const struct dri_extension * ext )

+{

+    if ( ext->functions != NULL ) {

+       _mesa_map_function_array(ext->functions);

+    }

+

+    if ( ctx != NULL ) {

+	_mesa_enable_extension( ctx, ext->name );

+    }

+}

+

+

+/**

+ * Utility function used by drivers to test the verions of other components.

+ *

+ * \param driver_name  Name of the driver.  Used in error messages.

+ * \param driActual    Actual DRI version supplied __driCreateNewScreen.

+ * \param driExpected  Minimum DRI version required by the driver.

+ * \param ddxActual    Actual DDX version supplied __driCreateNewScreen.

+ * \param ddxExpected  Minimum DDX minor and range of DDX major version required by the driver.

+ * \param drmActual    Actual DRM version supplied __driCreateNewScreen.

+ * \param drmExpected  Minimum DRM version required by the driver.

+ * 

+ * \returns \c GL_TRUE if all version requirements are met.  Otherwise,

+ *          \c GL_FALSE is returned.

+ * 

+ * \sa __driCreateNewScreen, driCheckDriDdxDrmVersions2

+ *

+ * \todo

+ * Now that the old \c driCheckDriDdxDrmVersions function is gone, this

+ * function and \c driCheckDriDdxDrmVersions2 should be renamed.

+ */

+GLboolean

+driCheckDriDdxDrmVersions3(const char * driver_name,

+			   const __DRIversion * driActual,

+			   const __DRIversion * driExpected,

+			   const __DRIversion * ddxActual,

+			   const __DRIutilversion2 * ddxExpected,

+			   const __DRIversion * drmActual,

+			   const __DRIversion * drmExpected)

+{

+   static const char format[] = "%s DRI driver expected %s version %d.%d.x "

+       "but got version %d.%d.%d\n";

+   static const char format2[] = "%s DRI driver expected %s version %d-%d.%d.x "

+       "but got version %d.%d.%d\n";

+

+

+   /* Check the DRI version */

+   if ( (driActual->major != driExpected->major)

+	|| (driActual->minor < driExpected->minor) ) {

+      fprintf(stderr, format, driver_name, "DRI",

+		       driExpected->major, driExpected->minor,

+		       driActual->major, driActual->minor, driActual->patch);

+      return GL_FALSE;

+   }

+

+   /* Check that the DDX driver version is compatible */

+   if ( (ddxActual->major < ddxExpected->major_min)

+	|| (ddxActual->major > ddxExpected->major_max)

+	|| (ddxActual->minor < ddxExpected->minor) ) {

+      fprintf(stderr, format2, driver_name, "DDX",

+		       ddxExpected->major_min, ddxExpected->major_max, ddxExpected->minor,

+		       ddxActual->major, ddxActual->minor, ddxActual->patch);

+      return GL_FALSE;

+   }

+   

+   /* Check that the DRM driver version is compatible */

+   if ( (drmActual->major != drmExpected->major)

+	|| (drmActual->minor < drmExpected->minor) ) {

+      fprintf(stderr, format, driver_name, "DRM",

+		       drmExpected->major, drmExpected->minor,

+		       drmActual->major, drmActual->minor, drmActual->patch);

+      return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+GLboolean

+driCheckDriDdxDrmVersions2(const char * driver_name,

+			   const __DRIversion * driActual,

+			   const __DRIversion * driExpected,

+			   const __DRIversion * ddxActual,

+			   const __DRIversion * ddxExpected,

+			   const __DRIversion * drmActual,

+			   const __DRIversion * drmExpected)

+{

+   __DRIutilversion2 ddx_expected;

+   ddx_expected.major_min = ddxExpected->major;

+   ddx_expected.major_max = ddxExpected->major;

+   ddx_expected.minor = ddxExpected->minor;

+   ddx_expected.patch = ddxExpected->patch;

+   return driCheckDriDdxDrmVersions3(driver_name, driActual,

+				driExpected, ddxActual, & ddx_expected,

+				drmActual, drmExpected);

+}

+

+GLboolean driClipRectToFramebuffer( const struct gl_framebuffer *buffer,

+				    GLint *x, GLint *y,

+				    GLsizei *width, GLsizei *height )

+{

+   /* left clipping */

+   if (*x < buffer->_Xmin) {

+      *width -= (buffer->_Xmin - *x);

+      *x = buffer->_Xmin;

+   }

+

+   /* right clipping */

+   if (*x + *width > buffer->_Xmax)

+      *width -= (*x + *width - buffer->_Xmax - 1);

+

+   if (*width <= 0)

+      return GL_FALSE;

+

+   /* bottom clipping */

+   if (*y < buffer->_Ymin) {

+      *height -= (buffer->_Ymin - *y);

+      *y = buffer->_Ymin;

+   }

+

+   /* top clipping */

+   if (*y + *height > buffer->_Ymax)

+      *height -= (*y + *height - buffer->_Ymax - 1);

+

+   if (*height <= 0)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+/**

+ * Creates a set of \c struct gl_config that a driver will expose.

+ * 

+ * A set of \c struct gl_config will be created based on the supplied

+ * parameters.  The number of modes processed will be 2 *

+ * \c num_depth_stencil_bits * \c num_db_modes.

+ * 

+ * For the most part, data is just copied from \c depth_bits, \c stencil_bits,

+ * \c db_modes, and \c visType into each \c struct gl_config element.

+ * However, the meanings of \c fb_format and \c fb_type require further

+ * explanation.  The \c fb_format specifies which color components are in

+ * each pixel and what the default order is.  For example, \c GL_RGB specifies

+ * that red, green, blue are available and red is in the "most significant"

+ * position and blue is in the "least significant".  The \c fb_type specifies

+ * the bit sizes of each component and the actual ordering.  For example, if

+ * \c GL_UNSIGNED_SHORT_5_6_5_REV is specified with \c GL_RGB, bits [15:11]

+ * are the blue value, bits [10:5] are the green value, and bits [4:0] are

+ * the red value.

+ * 

+ * One sublte issue is the combination of \c GL_RGB  or \c GL_BGR and either

+ * of the \c GL_UNSIGNED_INT_8_8_8_8 modes.  The resulting mask values in the

+ * \c struct gl_config structure is \b identical to the \c GL_RGBA or

+ * \c GL_BGRA case, except the \c alphaMask is zero.  This means that, as

+ * far as this routine is concerned, \c GL_RGB with \c GL_UNSIGNED_INT_8_8_8_8

+ * still uses 32-bits.

+ *

+ * If in doubt, look at the tables used in the function.

+ * 

+ * \param ptr_to_modes  Pointer to a pointer to a linked list of

+ *                      \c struct gl_config.  Upon completion, a pointer to

+ *                      the next element to be process will be stored here.

+ *                      If the function fails and returns \c GL_FALSE, this

+ *                      value will be unmodified, but some elements in the

+ *                      linked list may be modified.

+ * \param fb_format     Format of the framebuffer.  Currently only \c GL_RGB,

+ *                      \c GL_RGBA, \c GL_BGR, and \c GL_BGRA are supported.

+ * \param fb_type       Type of the pixels in the framebuffer.  Currently only

+ *                      \c GL_UNSIGNED_SHORT_5_6_5, 

+ *                      \c GL_UNSIGNED_SHORT_5_6_5_REV,

+ *                      \c GL_UNSIGNED_INT_8_8_8_8, and

+ *                      \c GL_UNSIGNED_INT_8_8_8_8_REV are supported.

+ * \param depth_bits    Array of depth buffer sizes to be exposed.

+ * \param stencil_bits  Array of stencil buffer sizes to be exposed.

+ * \param num_depth_stencil_bits  Number of entries in both \c depth_bits and

+ *                      \c stencil_bits.

+ * \param db_modes      Array of buffer swap modes.  If an element has a

+ *                      value of \c GLX_NONE, then it represents a

+ *                      single-buffered mode.  Other valid values are

+ *                      \c GLX_SWAP_EXCHANGE_OML, \c GLX_SWAP_COPY_OML, and

+ *                      \c GLX_SWAP_UNDEFINED_OML.  See the

+ *                      GLX_OML_swap_method extension spec for more details.

+ * \param num_db_modes  Number of entries in \c db_modes.

+ * \param msaa_samples  Array of msaa sample count. 0 represents a visual

+ *                      without a multisample buffer.

+ * \param num_msaa_modes Number of entries in \c msaa_samples.

+ * \param visType       GLX visual type.  Usually either \c GLX_TRUE_COLOR or

+ *                      \c GLX_DIRECT_COLOR.

+ * 

+ * \returns

+ * \c GL_TRUE on success or \c GL_FALSE on failure.  Currently the only

+ * cause of failure is a bad parameter (i.e., unsupported \c fb_format or

+ * \c fb_type).

+ * 

+ * \todo

+ * There is currently no way to support packed RGB modes (i.e., modes with

+ * exactly 3 bytes per pixel) or floating-point modes.  This could probably

+ * be done by creating some new, private enums with clever names likes

+ * \c GL_UNSIGNED_3BYTE_8_8_8, \c GL_4FLOAT_32_32_32_32, 

+ * \c GL_4HALF_16_16_16_16, etc.  We can cross that bridge when we come to it.

+ */

+__DRIconfig **

+driCreateConfigs(GLenum fb_format, GLenum fb_type,

+		 const uint8_t * depth_bits, const uint8_t * stencil_bits,

+		 unsigned num_depth_stencil_bits,

+		 const GLenum * db_modes, unsigned num_db_modes,

+		 const uint8_t * msaa_samples, unsigned num_msaa_modes,

+		 GLboolean enable_accum)

+{

+   static const uint8_t bits_table[4][4] = {

+     /* R  G  B  A */

+      { 3, 3, 2, 0 }, /* Any GL_UNSIGNED_BYTE_3_3_2 */

+      { 5, 6, 5, 0 }, /* Any GL_UNSIGNED_SHORT_5_6_5 */

+      { 8, 8, 8, 0 }, /* Any RGB with any GL_UNSIGNED_INT_8_8_8_8 */

+      { 8, 8, 8, 8 }  /* Any RGBA with any GL_UNSIGNED_INT_8_8_8_8 */

+   };

+

+   static const uint32_t masks_table_rgb[6][4] = {

+      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 3_3_2       */

+      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 2_3_3_REV   */

+      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5       */

+      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5_REV   */

+      { 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 }, /* 8_8_8_8     */

+      { 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }  /* 8_8_8_8_REV */

+   };

+

+   static const uint32_t masks_table_rgba[6][4] = {

+      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 3_3_2       */

+      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 2_3_3_REV   */

+      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5       */

+      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5_REV   */

+      { 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF }, /* 8_8_8_8     */

+      { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }, /* 8_8_8_8_REV */

+   };

+

+   static const uint32_t masks_table_bgr[6][4] = {

+      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 3_3_2       */

+      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 2_3_3_REV   */

+      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5       */

+      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5_REV   */

+      { 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 }, /* 8_8_8_8     */

+      { 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, /* 8_8_8_8_REV */

+   };

+

+   static const uint32_t masks_table_bgra[6][4] = {

+      { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 3_3_2       */

+      { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 2_3_3_REV   */

+      { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5       */

+      { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5_REV   */

+      { 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF }, /* 8_8_8_8     */

+      { 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 }, /* 8_8_8_8_REV */

+   };

+

+   static const uint8_t bytes_per_pixel[6] = {

+      1, /* 3_3_2       */

+      1, /* 2_3_3_REV   */

+      2, /* 5_6_5       */

+      2, /* 5_6_5_REV   */

+      4, /* 8_8_8_8     */

+      4  /* 8_8_8_8_REV */

+   };

+

+   const uint8_t  * bits;

+   const uint32_t * masks;

+   int index;

+   __DRIconfig **configs, **c;

+   struct gl_config *modes;

+   unsigned i, j, k, h;

+   unsigned num_modes;

+   unsigned num_accum_bits = (enable_accum) ? 2 : 1;

+

+   switch ( fb_type ) {

+      case GL_UNSIGNED_BYTE_3_3_2:

+	 index = 0;

+	 break;

+      case GL_UNSIGNED_BYTE_2_3_3_REV:

+	 index = 1;

+	 break;

+      case GL_UNSIGNED_SHORT_5_6_5:

+	 index = 2;

+	 break;

+      case GL_UNSIGNED_SHORT_5_6_5_REV:

+	 index = 3;

+	 break;

+      case GL_UNSIGNED_INT_8_8_8_8:

+	 index = 4;

+	 break;

+      case GL_UNSIGNED_INT_8_8_8_8_REV:

+	 index = 5;

+	 break;

+      default:

+	 fprintf( stderr, "[%s:%u] Unknown framebuffer type 0x%04x.\n",

+               __FUNCTION__, __LINE__, fb_type );

+	 return NULL;

+   }

+

+

+   /* Valid types are GL_UNSIGNED_SHORT_5_6_5 and GL_UNSIGNED_INT_8_8_8_8 and

+    * the _REV versions.

+    *

+    * Valid formats are GL_RGBA, GL_RGB, and GL_BGRA.

+    */

+

+   switch ( fb_format ) {

+      case GL_RGB:

+         masks = masks_table_rgb[ index ];

+         break;

+

+      case GL_RGBA:

+         masks = masks_table_rgba[ index ];

+         break;

+

+      case GL_BGR:

+         masks = masks_table_bgr[ index ];

+         break;

+

+      case GL_BGRA:

+         masks = masks_table_bgra[ index ];

+         break;

+

+      default:

+         fprintf( stderr, "[%s:%u] Unknown framebuffer format 0x%04x.\n",

+               __FUNCTION__, __LINE__, fb_format );

+         return NULL;

+   }

+

+   switch ( bytes_per_pixel[ index ] ) {

+      case 1:

+	 bits = bits_table[0];

+	 break;

+      case 2:

+	 bits = bits_table[1];

+	 break;

+      default:

+	 bits = ((fb_format == GL_RGB) || (fb_format == GL_BGR))

+	    ? bits_table[2]

+	    : bits_table[3];

+	 break;

+   }

+

+   num_modes = num_depth_stencil_bits * num_db_modes * num_accum_bits * num_msaa_modes;

+   configs = calloc(1, (num_modes + 1) * sizeof *configs);

+   if (configs == NULL)

+       return NULL;

+

+    c = configs;

+    for ( k = 0 ; k < num_depth_stencil_bits ; k++ ) {

+	for ( i = 0 ; i < num_db_modes ; i++ ) {

+	    for ( h = 0 ; h < num_msaa_modes; h++ ) {

+	    	for ( j = 0 ; j < num_accum_bits ; j++ ) {

+		    *c = malloc (sizeof **c);

+		    modes = &(*c)->modes;

+		    c++;

+

+		    memset(modes, 0, sizeof *modes);

+		    modes->redBits   = bits[0];

+		    modes->greenBits = bits[1];

+		    modes->blueBits  = bits[2];

+		    modes->alphaBits = bits[3];

+		    modes->redMask   = masks[0];

+		    modes->greenMask = masks[1];

+		    modes->blueMask  = masks[2];

+		    modes->alphaMask = masks[3];

+		    modes->rgbBits   = modes->redBits + modes->greenBits

+		    	+ modes->blueBits + modes->alphaBits;

+

+		    modes->accumRedBits   = 16 * j;

+		    modes->accumGreenBits = 16 * j;

+		    modes->accumBlueBits  = 16 * j;

+		    modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0;

+		    modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG;

+

+		    modes->stencilBits = stencil_bits[k];

+		    modes->depthBits = depth_bits[k];

+

+		    modes->transparentPixel = GLX_NONE;

+		    modes->transparentRed = GLX_DONT_CARE;

+		    modes->transparentGreen = GLX_DONT_CARE;

+		    modes->transparentBlue = GLX_DONT_CARE;

+		    modes->transparentAlpha = GLX_DONT_CARE;

+		    modes->transparentIndex = GLX_DONT_CARE;

+		    modes->rgbMode = GL_TRUE;

+

+		    if ( db_modes[i] == GLX_NONE ) {

+		    	modes->doubleBufferMode = GL_FALSE;

+		    }

+		    else {

+		    	modes->doubleBufferMode = GL_TRUE;

+		    	modes->swapMethod = db_modes[i];

+		    }

+

+		    modes->samples = msaa_samples[h];

+		    modes->sampleBuffers = modes->samples ? 1 : 0;

+

+

+		    modes->haveAccumBuffer = ((modes->accumRedBits +

+					   modes->accumGreenBits +

+					   modes->accumBlueBits +

+					   modes->accumAlphaBits) > 0);

+		    modes->haveDepthBuffer = (modes->depthBits > 0);

+		    modes->haveStencilBuffer = (modes->stencilBits > 0);

+

+		    modes->bindToTextureRgb = GL_TRUE;

+		    modes->bindToTextureRgba = GL_TRUE;

+		    modes->bindToMipmapTexture = GL_FALSE;

+		    modes->bindToTextureTargets =

+			__DRI_ATTRIB_TEXTURE_1D_BIT |

+			__DRI_ATTRIB_TEXTURE_2D_BIT |

+			__DRI_ATTRIB_TEXTURE_RECTANGLE_BIT;

+		}

+	    }

+	}

+    }

+    *c = NULL;

+

+    return configs;

+}

+

+__DRIconfig **driConcatConfigs(__DRIconfig **a,

+			       __DRIconfig **b)

+{

+    __DRIconfig **all;

+    int i, j, index;

+

+    i = 0;

+    while (a[i] != NULL)

+	i++;

+    j = 0;

+    while (b[j] != NULL)

+	j++;

+   

+    all = malloc((i + j + 1) * sizeof *all);

+    index = 0;

+    for (i = 0; a[i] != NULL; i++)

+	all[index++] = a[i];

+    for (j = 0; b[j] != NULL; j++)

+	all[index++] = b[j];

+    all[index++] = NULL;

+

+    free(a);

+    free(b);

+

+    return all;

+}

+

+#define __ATTRIB(attrib, field) \

+    { attrib, offsetof(struct gl_config, field) }

+

+static const struct { unsigned int attrib, offset; } attribMap[] = {

+    __ATTRIB(__DRI_ATTRIB_BUFFER_SIZE,			rgbBits),

+    __ATTRIB(__DRI_ATTRIB_LEVEL,			level),

+    __ATTRIB(__DRI_ATTRIB_RED_SIZE,			redBits),

+    __ATTRIB(__DRI_ATTRIB_GREEN_SIZE,			greenBits),

+    __ATTRIB(__DRI_ATTRIB_BLUE_SIZE,			blueBits),

+    __ATTRIB(__DRI_ATTRIB_ALPHA_SIZE,			alphaBits),

+    __ATTRIB(__DRI_ATTRIB_DEPTH_SIZE,			depthBits),

+    __ATTRIB(__DRI_ATTRIB_STENCIL_SIZE,			stencilBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_RED_SIZE,		accumRedBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE,		accumGreenBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE,		accumBlueBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE,		accumAlphaBits),

+    __ATTRIB(__DRI_ATTRIB_SAMPLE_BUFFERS,		sampleBuffers),

+    __ATTRIB(__DRI_ATTRIB_SAMPLES,			samples),

+    __ATTRIB(__DRI_ATTRIB_DOUBLE_BUFFER,		doubleBufferMode),

+    __ATTRIB(__DRI_ATTRIB_STEREO,			stereoMode),

+    __ATTRIB(__DRI_ATTRIB_AUX_BUFFERS,			numAuxBuffers),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_TYPE,		transparentPixel),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_INDEX_VALUE,	transparentPixel),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_RED_VALUE,	transparentRed),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE,	transparentGreen),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE,	transparentBlue),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE,	transparentAlpha),

+    __ATTRIB(__DRI_ATTRIB_FLOAT_MODE,			floatMode),

+    __ATTRIB(__DRI_ATTRIB_RED_MASK,			redMask),

+    __ATTRIB(__DRI_ATTRIB_GREEN_MASK,			greenMask),

+    __ATTRIB(__DRI_ATTRIB_BLUE_MASK,			blueMask),

+    __ATTRIB(__DRI_ATTRIB_ALPHA_MASK,			alphaMask),

+    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH,		maxPbufferWidth),

+    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT,		maxPbufferHeight),

+    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS,		maxPbufferPixels),

+    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH,	optimalPbufferWidth),

+    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT,	optimalPbufferHeight),

+    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,			swapMethod),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB,		bindToTextureRgb),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA,		bindToTextureRgba),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE,	bindToMipmapTexture),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS,	bindToTextureTargets),

+    __ATTRIB(__DRI_ATTRIB_YINVERTED,			yInverted),

+

+    /* The struct field doesn't matter here, these are handled by the

+     * switch in driGetConfigAttribIndex.  We need them in the array

+     * so the iterator includes them though.*/

+    __ATTRIB(__DRI_ATTRIB_RENDER_TYPE,			level),

+    __ATTRIB(__DRI_ATTRIB_CONFIG_CAVEAT,		level),

+    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,			level)

+};

+

+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))

+

+

+/**

+ * Return the value of a configuration attribute.  The attribute is

+ * indicated by the index.

+ */

+static int

+driGetConfigAttribIndex(const __DRIconfig *config,

+			unsigned int index, unsigned int *value)

+{

+    switch (attribMap[index].attrib) {

+    case __DRI_ATTRIB_RENDER_TYPE:

+        /* no support for color index mode */

+	*value = __DRI_ATTRIB_RGBA_BIT;

+	break;

+    case __DRI_ATTRIB_CONFIG_CAVEAT:

+	if (config->modes.visualRating == GLX_NON_CONFORMANT_CONFIG)

+	    *value = __DRI_ATTRIB_NON_CONFORMANT_CONFIG;

+	else if (config->modes.visualRating == GLX_SLOW_CONFIG)

+	    *value = __DRI_ATTRIB_SLOW_BIT;

+	else

+	    *value = 0;

+	break;

+    case __DRI_ATTRIB_SWAP_METHOD:

+        /* XXX no return value??? */

+	break;

+

+    case __DRI_ATTRIB_FLOAT_MODE:

+        /* this field is not int-sized */

+        *value = config->modes.floatMode;

+        break;

+

+    default:

+        /* any other int-sized field */

+	*value = *(unsigned int *)

+	    ((char *) &config->modes + attribMap[index].offset);

+	

+	break;

+    }

+

+    return GL_TRUE;

+}

+

+

+/**

+ * Get the value of a configuration attribute.

+ * \param attrib  the attribute (one of the _DRI_ATTRIB_x tokens)

+ * \param value  returns the attribute's value

+ * \return 1 for success, 0 for failure

+ */

+int

+driGetConfigAttrib(const __DRIconfig *config,

+		   unsigned int attrib, unsigned int *value)

+{

+    int i;

+

+    for (i = 0; i < ARRAY_SIZE(attribMap); i++)

+	if (attribMap[i].attrib == attrib)

+	    return driGetConfigAttribIndex(config, i, value);

+

+    return GL_FALSE;

+}

+

+

+/**

+ * Get a configuration attribute name and value, given an index.

+ * \param index  which field of the __DRIconfig to query

+ * \param attrib  returns the attribute name (one of the _DRI_ATTRIB_x tokens)

+ * \param value  returns the attribute's value

+ * \return 1 for success, 0 for failure

+ */

+int

+driIndexConfigAttrib(const __DRIconfig *config, int index,

+		     unsigned int *attrib, unsigned int *value)

+{

+    if (index >= 0 && index < ARRAY_SIZE(attribMap)) {

+	*attrib = attribMap[index].attrib;

+	return driGetConfigAttribIndex(config, index, value);

+    }

+

+    return GL_FALSE;

+}

diff --git a/mesalib/src/mesa/drivers/dri/common/utils.h b/mesalib/src/mesa/drivers/dri/common/utils.h
index de6070c39..2c952dc19 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.h
+++ b/mesalib/src/mesa/drivers/dri/common/utils.h
@@ -1,123 +1,123 @@
-/*
- * (C) Copyright IBM Corporation 2002, 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
- * VA LINUX SYSTEM, IBM 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:
- *    Ian Romanick <idr@us.ibm.com>
- */
-
-#ifndef DRI_DEBUG_H
-#define DRI_DEBUG_H
-
-#include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
-#include "main/context.h"
-#include "main/remap.h"
-
-typedef struct __DRIutilversionRec2    __DRIutilversion2;
-
-struct dri_debug_control {
-    const char * string;
-    unsigned     flag;
-};
-
-/**
- * Description of the API for an extension to OpenGL.
- */
-struct dri_extension {
-    /**
-     * Name of the extension.
-     */
-    const char * name;
-    
-
-    /**
-     * Pointer to a list of \c dri_extension_function structures.  The list
-     * is terminated by a structure with a \c NULL
-     * \c dri_extension_function::strings pointer.
-     */
-    const struct gl_function_remap * functions;
-};
-
-/**
- * Used to store a version which includes a major range instead of a single
- * major version number.
- */
-struct __DRIutilversionRec2 {
-    int    major_min;    /** min allowed Major version number. */
-    int    major_max;    /** max allowed Major version number. */
-    int    minor;        /**< Minor version number. */
-    int    patch;        /**< Patch-level. */
-};
-
-extern void
-__driUtilMessage(const char *f, ...);
-
-extern unsigned driParseDebugString( const char * debug,
-    const struct dri_debug_control * control );
-
-extern unsigned driGetRendererString( char * buffer,
-    const char * hardware_name, const char * driver_date, GLuint agp_mode );
-
-extern void driInitExtensions( GLcontext * ctx, 
-    const struct dri_extension * card_extensions, GLboolean enable_imaging );
-
-extern void driInitSingleExtension( GLcontext * ctx,
-    const struct dri_extension * ext );
-
-extern GLboolean driCheckDriDdxDrmVersions2(const char * driver_name,
-    const __DRIversion * driActual, const __DRIversion * driExpected,
-    const __DRIversion * ddxActual, const __DRIversion * ddxExpected,
-    const __DRIversion * drmActual, const __DRIversion * drmExpected);
-
-extern GLboolean driCheckDriDdxDrmVersions3(const char * driver_name,
-    const __DRIversion * driActual, const __DRIversion * driExpected,
-    const __DRIversion * ddxActual, const __DRIutilversion2 * ddxExpected,
-    const __DRIversion * drmActual, const __DRIversion * drmExpected);
-
-extern GLboolean driClipRectToFramebuffer( const GLframebuffer *buffer,
-					   GLint *x, GLint *y,
-					   GLsizei *width, GLsizei *height );
-
-struct __DRIconfigRec {
-    __GLcontextModes modes;
-};
-
-extern __DRIconfig **
-driCreateConfigs(GLenum fb_format, GLenum fb_type,
-		 const uint8_t * depth_bits, const uint8_t * stencil_bits,
-		 unsigned num_depth_stencil_bits,
-		 const GLenum * db_modes, unsigned num_db_modes,
-		 const uint8_t * msaa_samples, unsigned num_msaa_modes,
-		 GLboolean enable_accum);
-
-__DRIconfig **driConcatConfigs(__DRIconfig **a,
-			       __DRIconfig **b);
-
-int
-driGetConfigAttrib(const __DRIconfig *config,
-		   unsigned int attrib, unsigned int *value);
-int
-driIndexConfigAttrib(const __DRIconfig *config, int index,
-		     unsigned int *attrib, unsigned int *value);
-
-#endif /* DRI_DEBUG_H */
+/*

+ * (C) Copyright IBM Corporation 2002, 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

+ * VA LINUX SYSTEM, IBM 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:

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

+ */

+

+#ifndef DRI_DEBUG_H

+#define DRI_DEBUG_H

+

+#include <GL/gl.h>

+#include <GL/internal/dri_interface.h>

+#include "main/context.h"

+#include "main/remap.h"

+

+typedef struct __DRIutilversionRec2    __DRIutilversion2;

+

+struct dri_debug_control {

+    const char * string;

+    unsigned     flag;

+};

+

+/**

+ * Description of the API for an extension to OpenGL.

+ */

+struct dri_extension {

+    /**

+     * Name of the extension.

+     */

+    const char * name;

+    

+

+    /**

+     * Pointer to a list of \c dri_extension_function structures.  The list

+     * is terminated by a structure with a \c NULL

+     * \c dri_extension_function::strings pointer.

+     */

+    const struct gl_function_remap * functions;

+};

+

+/**

+ * Used to store a version which includes a major range instead of a single

+ * major version number.

+ */

+struct __DRIutilversionRec2 {

+    int    major_min;    /** min allowed Major version number. */

+    int    major_max;    /** max allowed Major version number. */

+    int    minor;        /**< Minor version number. */

+    int    patch;        /**< Patch-level. */

+};

+

+extern void

+__driUtilMessage(const char *f, ...);

+

+extern unsigned driParseDebugString( const char * debug,

+    const struct dri_debug_control * control );

+

+extern unsigned driGetRendererString( char * buffer,

+    const char * hardware_name, const char * driver_date, GLuint agp_mode );

+

+extern void driInitExtensions( struct gl_context * ctx, 

+    const struct dri_extension * card_extensions, GLboolean enable_imaging );

+

+extern void driInitSingleExtension( struct gl_context * ctx,

+    const struct dri_extension * ext );

+

+extern GLboolean driCheckDriDdxDrmVersions2(const char * driver_name,

+    const __DRIversion * driActual, const __DRIversion * driExpected,

+    const __DRIversion * ddxActual, const __DRIversion * ddxExpected,

+    const __DRIversion * drmActual, const __DRIversion * drmExpected);

+

+extern GLboolean driCheckDriDdxDrmVersions3(const char * driver_name,

+    const __DRIversion * driActual, const __DRIversion * driExpected,

+    const __DRIversion * ddxActual, const __DRIutilversion2 * ddxExpected,

+    const __DRIversion * drmActual, const __DRIversion * drmExpected);

+

+extern GLboolean driClipRectToFramebuffer( const struct gl_framebuffer *buffer,

+					   GLint *x, GLint *y,

+					   GLsizei *width, GLsizei *height );

+

+struct __DRIconfigRec {

+    struct gl_config modes;

+};

+

+extern __DRIconfig **

+driCreateConfigs(GLenum fb_format, GLenum fb_type,

+		 const uint8_t * depth_bits, const uint8_t * stencil_bits,

+		 unsigned num_depth_stencil_bits,

+		 const GLenum * db_modes, unsigned num_db_modes,

+		 const uint8_t * msaa_samples, unsigned num_msaa_modes,

+		 GLboolean enable_accum);

+

+__DRIconfig **driConcatConfigs(__DRIconfig **a,

+			       __DRIconfig **b);

+

+int

+driGetConfigAttrib(const __DRIconfig *config,

+		   unsigned int attrib, unsigned int *value);

+int

+driIndexConfigAttrib(const __DRIconfig *config, int index,

+		     unsigned int *attrib, unsigned int *value);

+

+#endif /* DRI_DEBUG_H */

diff --git a/mesalib/src/mesa/drivers/dri/common/vblank.c b/mesalib/src/mesa/drivers/dri/common/vblank.c
index 49b22a2dc..3b8136844 100644
--- a/mesalib/src/mesa/drivers/dri/common/vblank.c
+++ b/mesalib/src/mesa/drivers/dri/common/vblank.c
@@ -1,434 +1,434 @@
-/* -*- mode: c; c-basic-offset: 3 -*- */
-/*
- * (c) Copyright IBM Corporation 2002
- * 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
- * VA LINUX SYSTEM, IBM 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:
- *    Ian Romanick <idr@us.ibm.com>
- */
-
-#include "main/glheader.h"
-#include "xf86drm.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/dd.h"
-#include "vblank.h"
-#include "xmlpool.h"
-
-static unsigned int msc_to_vblank(__DRIdrawable * dPriv, int64_t msc)
-{
-   return (unsigned int)(msc - dPriv->msc_base + dPriv->vblank_base);
-}
-
-static int64_t vblank_to_msc(__DRIdrawable * dPriv, unsigned int vblank)
-{
-   return (int64_t)(vblank - dPriv->vblank_base + dPriv->msc_base);
-}
-
-
-/****************************************************************************/
-/**
- * Get the current MSC refresh counter.
- *
- * Stores the 64-bit count of vertical refreshes since some (arbitrary)
- * point in time in \c count.  Unless the value wraps around, which it
- * may, it will never decrease for a given drawable.
- *
- * \warning This function is called from \c glXGetVideoSyncSGI, which expects
- * a \c count of type \c unsigned (32-bit), and \c glXGetSyncValuesOML, which 
- * expects a \c count of type \c int64_t (signed 64-bit).  The kernel ioctl 
- * currently always returns a \c sequence of type \c unsigned.
- *
- * \param priv   Pointer to the DRI screen private struct.
- * \param dPriv  Pointer to the DRI drawable private struct
- * \param count  Storage to hold MSC counter.
- * \return       Zero is returned on success.  A negative errno value
- *               is returned on failure.
- */
-int driDrawableGetMSC32( __DRIscreen * priv,
-			 __DRIdrawable * dPriv,
-			 int64_t * count)
-{
-   drmVBlank vbl;
-   int ret;
-
-   /* Don't wait for anything.  Just get the current refresh count. */
-
-   vbl.request.type = DRM_VBLANK_RELATIVE;
-   vbl.request.sequence = 0;
-   if ( dPriv && dPriv->vblFlags & VBLANK_FLAG_SECONDARY )
-      vbl.request.type |= DRM_VBLANK_SECONDARY;
-
-   ret = drmWaitVBlank( priv->fd, &vbl );
-
-   if (dPriv) {
-      *count = vblank_to_msc(dPriv, vbl.reply.sequence);
-   } else {
-      /* Old driver (no knowledge of drawable MSC callback) */
-      *count = vbl.reply.sequence;
-   }
-
-   return ret;
-}
-
-/****************************************************************************/
-/**
- * Wait for a specified refresh count.  This implements most of the
- * functionality of \c glXWaitForMscOML from the GLX_OML_sync_control spec.
- * Waits for the \c target_msc refresh.  If that has already passed, it
- * waits until \f$(MSC \bmod divisor)\f$ is equal to \c remainder.  If 
- * \c target_msc is 0, use the behavior of glXWaitVideoSyncSGI(), which
- * omits the initial check against a target MSC value.
- * 
- * This function is actually something of a hack.  The problem is that, at
- * the time of this writing, none of the existing DRM modules support an
- * ioctl that returns a 64-bit count (at least not on 32-bit platforms).
- * However, this function exists to support a GLX function that requires
- * the use of 64-bit counts.  As such, there is a little bit of ugly
- * hackery at the end of this function to make the 32-bit count act like
- * a 64-bit count.  There are still some cases where this will break, but
- * I believe it catches the most common cases.
- *
- * The real solution is to provide an ioctl that uses a 64-bit count.
- *
- * \param dpy         Pointer to the \c Display.
- * \param priv        Pointer to the DRI drawable private.
- * \param target_msc  Desired refresh count to wait for.  A value of 0
- *                    means to use the glXWaitVideoSyncSGI() behavior.
- * \param divisor     MSC divisor if \c target_msc is already reached.
- * \param remainder   Desired MSC remainder if \c target_msc is already
- *                    reached.
- * \param msc         Buffer to hold MSC when done waiting.
- *
- * \return            Zero on success or \c GLX_BAD_CONTEXT on failure.
- */
-
-int driWaitForMSC32( __DRIdrawable *priv,
-		     int64_t target_msc, int64_t divisor, int64_t remainder,
-		     int64_t * msc )
-{
-   drmVBlank vbl;
-
-
-   if ( divisor != 0 ) {
-      int64_t next = target_msc;
-      int64_t r;
-      int dont_wait = (target_msc == 0);
-
-      do {
-         /* dont_wait means we're using the glXWaitVideoSyncSGI() behavior.
-          * The first time around, just get the current count and proceed 
-          * to the test for (MSC % divisor) == remainder.
-          */
-         vbl.request.type = dont_wait ? DRM_VBLANK_RELATIVE :
-                                        DRM_VBLANK_ABSOLUTE;
-         vbl.request.sequence = next ? msc_to_vblank(priv, next) : 0;
-	 if ( priv->vblFlags & VBLANK_FLAG_SECONDARY )
-	    vbl.request.type |= DRM_VBLANK_SECONDARY;
-
-	 if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
-	    /* FIXME: This doesn't seem like the right thing to return here.
-	     */
-	    return GLX_BAD_CONTEXT;
-	 }
-
-	 *msc = vblank_to_msc(priv, vbl.reply.sequence);
-
-         if (!dont_wait && *msc == next)
-            break;
-         dont_wait = 0;
-
-         /* Assuming the wait-done test fails, the next refresh to wait for
-          * will be one that satisfies (MSC % divisor) == remainder.  The
-          * value (MSC - (MSC % divisor) + remainder) is the refresh value 
-          * closest to the current value that would satisfy the equation.  
-          * If this refresh has already happened, we add divisor to obtain 
-          * the next refresh after the current one that will satisfy it.
-          */
-         r = ((uint64_t)*msc % divisor);
-         next = (*msc - r + remainder);
-         if (next <= *msc)
-	    next += divisor;
-
-      } while (r != remainder);
-   }
-   else {
-      /* If the \c divisor is zero, just wait until the MSC is greater
-       * than or equal to \c target_msc.
-       */
-
-      vbl.request.type = DRM_VBLANK_ABSOLUTE;
-      vbl.request.sequence = target_msc ? msc_to_vblank(priv, target_msc) : 0;
-
-      if ( priv->vblFlags & VBLANK_FLAG_SECONDARY )
-	 vbl.request.type |= DRM_VBLANK_SECONDARY;
-
-      if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
-	 /* FIXME: This doesn't seem like the right thing to return here.
-	  */
-	 return GLX_BAD_CONTEXT;
-      }
-   }
-
-   *msc = vblank_to_msc(priv, vbl.reply.sequence);
-
-   if ( *msc < target_msc ) {
-      *msc += 0x0000000100000000LL;
-   }
-
-   return 0;
-}
-
-
-/****************************************************************************/
-/**
- * Gets a set of default vertical-blank-wait flags based on the internal GLX
- * API version and several configuration options.
- */
-
-GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache )
-{
-   GLuint  flags = VBLANK_FLAG_INTERVAL;
-   int vblank_mode;
-
-
-   if ( driCheckOption( optionCache, "vblank_mode", DRI_ENUM ) )
-      vblank_mode = driQueryOptioni( optionCache, "vblank_mode" );
-   else
-      vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1;
-
-   switch (vblank_mode) {
-   case DRI_CONF_VBLANK_NEVER:
-      flags = 0;
-      break;
-   case DRI_CONF_VBLANK_DEF_INTERVAL_0:
-      break;
-   case DRI_CONF_VBLANK_DEF_INTERVAL_1:
-      flags |= VBLANK_FLAG_THROTTLE;
-      break;
-   case DRI_CONF_VBLANK_ALWAYS_SYNC:
-      flags |= VBLANK_FLAG_SYNC;
-      break;
-   }
-
-   return flags;
-}
-
-
-/****************************************************************************/
-/**
- * Wrapper to call \c drmWaitVBlank.  The main purpose of this function is to
- * wrap the error message logging.  The error message should only be logged
- * the first time the \c drmWaitVBlank fails.  If \c drmWaitVBlank is
- * successful, \c vbl_seq will be set the sequence value in the reply.
- *
- * \param vbl      Pointer to drmVBlank packet desribing how to wait.
- * \param vbl_seq  Location to store the current refresh counter.
- * \param fd       File descriptor use to call into the DRM.
- * \return         Zero on success or -1 on failure.
- */
-
-static int do_wait( drmVBlank * vbl, GLuint * vbl_seq, int fd )
-{
-   int   ret;
-
-
-   ret = drmWaitVBlank( fd, vbl );
-   if ( ret != 0 ) {
-      static GLboolean first_time = GL_TRUE;
-
-      if ( first_time ) {
-	 fprintf(stderr, 
-		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"
-		 " working correctly.\nTry adjusting the vblank_mode"
-		 " configuration parameter.\n", __FUNCTION__, ret);
-	 first_time = GL_FALSE;
-      }
-
-      return -1;
-   }
-
-   *vbl_seq = vbl->reply.sequence;
-   return 0;
-}
-
-
-/****************************************************************************/
-/**
- * Returns the default swap interval of the given drawable.
- */
-
-static unsigned
-driGetDefaultVBlankInterval( const  __DRIdrawable *priv )
-{
-   if ( (priv->vblFlags & (VBLANK_FLAG_THROTTLE | VBLANK_FLAG_SYNC)) != 0 ) {
-      return 1;
-   }
-   else {
-      return 0;
-   }
-}
-
-
-/****************************************************************************/
-/**
- * Sets the default swap interval when the drawable is first bound to a
- * direct rendering context.
- */
-
-void driDrawableInitVBlank( __DRIdrawable *priv )
-{
-   if ( priv->swap_interval == (unsigned)-1 &&
-	!( priv->vblFlags & VBLANK_FLAG_NO_IRQ ) ) {
-      /* Get current vertical blank sequence */
-      drmVBlank vbl;
- 
-      vbl.request.type = DRM_VBLANK_RELATIVE;
-      if ( priv->vblFlags & VBLANK_FLAG_SECONDARY )
- 	 vbl.request.type |= DRM_VBLANK_SECONDARY;
-      vbl.request.sequence = 0;
-      do_wait( &vbl, &priv->vblSeq, priv->driScreenPriv->fd );
-      priv->vblank_base = priv->vblSeq;
-
-      priv->swap_interval = driGetDefaultVBlankInterval( priv );
-   }
-}
-
-
-/****************************************************************************/
-/**
- * Returns the current swap interval of the given drawable.
- */
-
-unsigned
-driGetVBlankInterval( const  __DRIdrawable *priv )
-{
-   if ( (priv->vblFlags & VBLANK_FLAG_INTERVAL) != 0 ) {
-      /* this must have been initialized when the drawable was first bound
-       * to a direct rendering context. */
-      assert ( priv->swap_interval != (unsigned)-1 );
-
-      return priv->swap_interval;
-   }
-   else 
-      return driGetDefaultVBlankInterval( priv );
-}
-
-
-/****************************************************************************/
-/**
- * Returns the current vertical blank sequence number of the given drawable.
- */
-
-void
-driGetCurrentVBlank( __DRIdrawable *priv )
-{
-   drmVBlank vbl;
-
-   vbl.request.type = DRM_VBLANK_RELATIVE;
-   if ( priv->vblFlags & VBLANK_FLAG_SECONDARY ) {
-      vbl.request.type |= DRM_VBLANK_SECONDARY;
-   }
-   vbl.request.sequence = 0;
-
-   (void) do_wait( &vbl, &priv->vblSeq, priv->driScreenPriv->fd );
-}
-
-
-/****************************************************************************/
-/**
- * Waits for the vertical blank for use with glXSwapBuffers.
- * 
- * \param missed_deadline  Set to \c GL_TRUE if the MSC after waiting is later
- *                 than the "target" based on \c priv->vblFlags.  The idea is
- *                 that if \c missed_deadline is set, then the application is
- *                 not achieving its desired framerate.
- * \return         Zero on success, -1 on error.
- */
-
-int
-driWaitForVBlank( __DRIdrawable *priv, GLboolean * missed_deadline )
-{
-   drmVBlank vbl;
-   unsigned   original_seq;
-   unsigned   deadline;
-   unsigned   interval;
-   unsigned   diff;
-
-   *missed_deadline = GL_FALSE;
-   if ( (priv->vblFlags & (VBLANK_FLAG_INTERVAL |
-			   VBLANK_FLAG_THROTTLE |
-			   VBLANK_FLAG_SYNC)) == 0 ||
-	(priv->vblFlags & VBLANK_FLAG_NO_IRQ) != 0 ) {
-      return 0;
-   }
-
-
-   /* VBLANK_FLAG_SYNC means to wait for at least one vertical blank.  If
-    * that flag is not set, do a fake wait for zero vertical blanking
-    * periods so that we can get the current MSC.
-    *
-    * VBLANK_FLAG_INTERVAL and VBLANK_FLAG_THROTTLE mean to wait for at
-    * least one vertical blank since the last wait.  Since do_wait modifies
-    * priv->vblSeq, we have to save the original value of priv->vblSeq for the
-    * VBLANK_FLAG_INTERVAL / VBLANK_FLAG_THROTTLE calculation later.
-    */
-
-   original_seq = priv->vblSeq;
-   interval = driGetVBlankInterval(priv);
-   deadline = original_seq + interval;
-
-   vbl.request.type = DRM_VBLANK_RELATIVE;
-   if ( priv->vblFlags & VBLANK_FLAG_SECONDARY ) {
-      vbl.request.type |= DRM_VBLANK_SECONDARY;
-   }
-   vbl.request.sequence = ((priv->vblFlags & VBLANK_FLAG_SYNC) != 0) ? 1 : 0;
-
-   if ( do_wait( & vbl, &priv->vblSeq, priv->driScreenPriv->fd ) != 0 ) {
-      return -1;
-   }
-
-   diff = priv->vblSeq - deadline;
-
-   /* No need to wait again if we've already reached the target */
-   if (diff <= (1 << 23)) {
-      *missed_deadline = (priv->vblFlags & VBLANK_FLAG_SYNC) ? (diff > 0) :
-			 GL_TRUE;
-      return 0;
-   }
-
-   /* Wait until the target vertical blank. */
-   vbl.request.type = DRM_VBLANK_ABSOLUTE;
-   if ( priv->vblFlags & VBLANK_FLAG_SECONDARY ) {
-      vbl.request.type |= DRM_VBLANK_SECONDARY;
-   }
-   vbl.request.sequence = deadline;
-
-   if ( do_wait( & vbl, &priv->vblSeq, priv->driScreenPriv->fd ) != 0 ) {
-      return -1;
-   }
-
-   diff = priv->vblSeq - deadline;
-   *missed_deadline = diff > 0 && diff <= (1 << 23);
-
-   return 0;
-}
+/* -*- mode: c; c-basic-offset: 3 -*- */

+/*

+ * (c) Copyright IBM Corporation 2002

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

+ * VA LINUX SYSTEM, IBM 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:

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

+ */

+

+#include "main/glheader.h"

+#include "xf86drm.h"

+#include "main/mtypes.h"

+#include "main/macros.h"

+#include "main/dd.h"

+#include "vblank.h"

+#include "xmlpool.h"

+

+static unsigned int msc_to_vblank(__DRIdrawable * dPriv, int64_t msc)

+{

+   return (unsigned int)(msc - dPriv->msc_base + dPriv->vblank_base);

+}

+

+static int64_t vblank_to_msc(__DRIdrawable * dPriv, unsigned int vblank)

+{

+   return (int64_t)(vblank - dPriv->vblank_base + dPriv->msc_base);

+}

+

+

+/****************************************************************************/

+/**

+ * Get the current MSC refresh counter.

+ *

+ * Stores the 64-bit count of vertical refreshes since some (arbitrary)

+ * point in time in \c count.  Unless the value wraps around, which it

+ * may, it will never decrease for a given drawable.

+ *

+ * \warning This function is called from \c glXGetVideoSyncSGI, which expects

+ * a \c count of type \c unsigned (32-bit), and \c glXGetSyncValuesOML, which 

+ * expects a \c count of type \c int64_t (signed 64-bit).  The kernel ioctl 

+ * currently always returns a \c sequence of type \c unsigned.

+ *

+ * \param priv   Pointer to the DRI screen private struct.

+ * \param dPriv  Pointer to the DRI drawable private struct

+ * \param count  Storage to hold MSC counter.

+ * \return       Zero is returned on success.  A negative errno value

+ *               is returned on failure.

+ */

+int driDrawableGetMSC32( __DRIscreen * priv,

+			 __DRIdrawable * dPriv,

+			 int64_t * count)

+{

+   drmVBlank vbl;

+   int ret;

+

+   /* Don't wait for anything.  Just get the current refresh count. */

+

+   vbl.request.type = DRM_VBLANK_RELATIVE;

+   vbl.request.sequence = 0;

+   if ( dPriv && dPriv->vblFlags & VBLANK_FLAG_SECONDARY )

+      vbl.request.type |= DRM_VBLANK_SECONDARY;

+

+   ret = drmWaitVBlank( priv->fd, &vbl );

+

+   if (dPriv) {

+      *count = vblank_to_msc(dPriv, vbl.reply.sequence);

+   } else {

+      /* Old driver (no knowledge of drawable MSC callback) */

+      *count = vbl.reply.sequence;

+   }

+

+   return ret;

+}

+

+/****************************************************************************/

+/**

+ * Wait for a specified refresh count.  This implements most of the

+ * functionality of \c glXWaitForMscOML from the GLX_OML_sync_control spec.

+ * Waits for the \c target_msc refresh.  If that has already passed, it

+ * waits until \f$(MSC \bmod divisor)\f$ is equal to \c remainder.  If 

+ * \c target_msc is 0, use the behavior of glXWaitVideoSyncSGI(), which

+ * omits the initial check against a target MSC value.

+ * 

+ * This function is actually something of a hack.  The problem is that, at

+ * the time of this writing, none of the existing DRM modules support an

+ * ioctl that returns a 64-bit count (at least not on 32-bit platforms).

+ * However, this function exists to support a GLX function that requires

+ * the use of 64-bit counts.  As such, there is a little bit of ugly

+ * hackery at the end of this function to make the 32-bit count act like

+ * a 64-bit count.  There are still some cases where this will break, but

+ * I believe it catches the most common cases.

+ *

+ * The real solution is to provide an ioctl that uses a 64-bit count.

+ *

+ * \param dpy         Pointer to the \c Display.

+ * \param priv        Pointer to the DRI drawable private.

+ * \param target_msc  Desired refresh count to wait for.  A value of 0

+ *                    means to use the glXWaitVideoSyncSGI() behavior.

+ * \param divisor     MSC divisor if \c target_msc is already reached.

+ * \param remainder   Desired MSC remainder if \c target_msc is already

+ *                    reached.

+ * \param msc         Buffer to hold MSC when done waiting.

+ *

+ * \return            Zero on success or \c GLX_BAD_CONTEXT on failure.

+ */

+

+int driWaitForMSC32( __DRIdrawable *priv,

+		     int64_t target_msc, int64_t divisor, int64_t remainder,

+		     int64_t * msc )

+{

+   drmVBlank vbl;

+

+

+   if ( divisor != 0 ) {

+      int64_t next = target_msc;

+      int64_t r;

+      int dont_wait = (target_msc == 0);

+

+      do {

+         /* dont_wait means we're using the glXWaitVideoSyncSGI() behavior.

+          * The first time around, just get the current count and proceed 

+          * to the test for (MSC % divisor) == remainder.

+          */

+         vbl.request.type = dont_wait ? DRM_VBLANK_RELATIVE :

+                                        DRM_VBLANK_ABSOLUTE;

+         vbl.request.sequence = next ? msc_to_vblank(priv, next) : 0;

+	 if ( priv->vblFlags & VBLANK_FLAG_SECONDARY )

+	    vbl.request.type |= DRM_VBLANK_SECONDARY;

+

+	 if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {

+	    /* FIXME: This doesn't seem like the right thing to return here.

+	     */

+	    return GLX_BAD_CONTEXT;

+	 }

+

+	 *msc = vblank_to_msc(priv, vbl.reply.sequence);

+

+         if (!dont_wait && *msc == next)

+            break;

+         dont_wait = 0;

+

+         /* Assuming the wait-done test fails, the next refresh to wait for

+          * will be one that satisfies (MSC % divisor) == remainder.  The

+          * value (MSC - (MSC % divisor) + remainder) is the refresh value 

+          * closest to the current value that would satisfy the equation.  

+          * If this refresh has already happened, we add divisor to obtain 

+          * the next refresh after the current one that will satisfy it.

+          */

+         r = ((uint64_t)*msc % divisor);

+         next = (*msc - r + remainder);

+         if (next <= *msc)

+	    next += divisor;

+

+      } while (r != remainder);

+   }

+   else {

+      /* If the \c divisor is zero, just wait until the MSC is greater

+       * than or equal to \c target_msc.

+       */

+

+      vbl.request.type = DRM_VBLANK_ABSOLUTE;

+      vbl.request.sequence = target_msc ? msc_to_vblank(priv, target_msc) : 0;

+

+      if ( priv->vblFlags & VBLANK_FLAG_SECONDARY )

+	 vbl.request.type |= DRM_VBLANK_SECONDARY;

+

+      if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {

+	 /* FIXME: This doesn't seem like the right thing to return here.

+	  */

+	 return GLX_BAD_CONTEXT;

+      }

+   }

+

+   *msc = vblank_to_msc(priv, vbl.reply.sequence);

+

+   if ( *msc < target_msc ) {

+      *msc += 0x0000000100000000LL;

+   }

+

+   return 0;

+}

+

+

+/****************************************************************************/

+/**

+ * Gets a set of default vertical-blank-wait flags based on the internal GLX

+ * API version and several configuration options.

+ */

+

+GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache )

+{

+   GLuint  flags = VBLANK_FLAG_INTERVAL;

+   int vblank_mode;

+

+

+   if ( driCheckOption( optionCache, "vblank_mode", DRI_ENUM ) )

+      vblank_mode = driQueryOptioni( optionCache, "vblank_mode" );

+   else

+      vblank_mode = DRI_CONF_VBLANK_DEF_INTERVAL_1;

+

+   switch (vblank_mode) {

+   case DRI_CONF_VBLANK_NEVER:

+      flags = 0;

+      break;

+   case DRI_CONF_VBLANK_DEF_INTERVAL_0:

+      break;

+   case DRI_CONF_VBLANK_DEF_INTERVAL_1:

+      flags |= VBLANK_FLAG_THROTTLE;

+      break;

+   case DRI_CONF_VBLANK_ALWAYS_SYNC:

+      flags |= VBLANK_FLAG_SYNC;

+      break;

+   }

+

+   return flags;

+}

+

+

+/****************************************************************************/

+/**

+ * Wrapper to call \c drmWaitVBlank.  The main purpose of this function is to

+ * wrap the error message logging.  The error message should only be logged

+ * the first time the \c drmWaitVBlank fails.  If \c drmWaitVBlank is

+ * successful, \c vbl_seq will be set the sequence value in the reply.

+ *

+ * \param vbl      Pointer to drmVBlank packet describing how to wait.

+ * \param vbl_seq  Location to store the current refresh counter.

+ * \param fd       File descriptor use to call into the DRM.

+ * \return         Zero on success or -1 on failure.

+ */

+

+static int do_wait( drmVBlank * vbl, GLuint * vbl_seq, int fd )

+{

+   int   ret;

+

+

+   ret = drmWaitVBlank( fd, vbl );

+   if ( ret != 0 ) {

+      static GLboolean first_time = GL_TRUE;

+

+      if ( first_time ) {

+	 fprintf(stderr, 

+		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"

+		 " working correctly.\nTry adjusting the vblank_mode"

+		 " configuration parameter.\n", __FUNCTION__, ret);

+	 first_time = GL_FALSE;

+      }

+

+      return -1;

+   }

+

+   *vbl_seq = vbl->reply.sequence;

+   return 0;

+}

+

+

+/****************************************************************************/

+/**

+ * Returns the default swap interval of the given drawable.

+ */

+

+static unsigned

+driGetDefaultVBlankInterval( const  __DRIdrawable *priv )

+{

+   if ( (priv->vblFlags & (VBLANK_FLAG_THROTTLE | VBLANK_FLAG_SYNC)) != 0 ) {

+      return 1;

+   }

+   else {

+      return 0;

+   }

+}

+

+

+/****************************************************************************/

+/**

+ * Sets the default swap interval when the drawable is first bound to a

+ * direct rendering context.

+ */

+

+void driDrawableInitVBlank( __DRIdrawable *priv )

+{

+   if ( priv->swap_interval == (unsigned)-1 &&

+	!( priv->vblFlags & VBLANK_FLAG_NO_IRQ ) ) {

+      /* Get current vertical blank sequence */

+      drmVBlank vbl;

+ 

+      vbl.request.type = DRM_VBLANK_RELATIVE;

+      if ( priv->vblFlags & VBLANK_FLAG_SECONDARY )

+ 	 vbl.request.type |= DRM_VBLANK_SECONDARY;

+      vbl.request.sequence = 0;

+      do_wait( &vbl, &priv->vblSeq, priv->driScreenPriv->fd );

+      priv->vblank_base = priv->vblSeq;

+

+      priv->swap_interval = driGetDefaultVBlankInterval( priv );

+   }

+}

+

+

+/****************************************************************************/

+/**

+ * Returns the current swap interval of the given drawable.

+ */

+

+unsigned

+driGetVBlankInterval( const  __DRIdrawable *priv )

+{

+   if ( (priv->vblFlags & VBLANK_FLAG_INTERVAL) != 0 ) {

+      /* this must have been initialized when the drawable was first bound

+       * to a direct rendering context. */

+      assert ( priv->swap_interval != (unsigned)-1 );

+

+      return priv->swap_interval;

+   }

+   else 

+      return driGetDefaultVBlankInterval( priv );

+}

+

+

+/****************************************************************************/

+/**

+ * Returns the current vertical blank sequence number of the given drawable.

+ */

+

+void

+driGetCurrentVBlank( __DRIdrawable *priv )

+{

+   drmVBlank vbl;

+

+   vbl.request.type = DRM_VBLANK_RELATIVE;

+   if ( priv->vblFlags & VBLANK_FLAG_SECONDARY ) {

+      vbl.request.type |= DRM_VBLANK_SECONDARY;

+   }

+   vbl.request.sequence = 0;

+

+   (void) do_wait( &vbl, &priv->vblSeq, priv->driScreenPriv->fd );

+}

+

+

+/****************************************************************************/

+/**

+ * Waits for the vertical blank for use with glXSwapBuffers.

+ * 

+ * \param missed_deadline  Set to \c GL_TRUE if the MSC after waiting is later

+ *                 than the "target" based on \c priv->vblFlags.  The idea is

+ *                 that if \c missed_deadline is set, then the application is

+ *                 not achieving its desired framerate.

+ * \return         Zero on success, -1 on error.

+ */

+

+int

+driWaitForVBlank( __DRIdrawable *priv, GLboolean * missed_deadline )

+{

+   drmVBlank vbl;

+   unsigned   original_seq;

+   unsigned   deadline;

+   unsigned   interval;

+   unsigned   diff;

+

+   *missed_deadline = GL_FALSE;

+   if ( (priv->vblFlags & (VBLANK_FLAG_INTERVAL |

+			   VBLANK_FLAG_THROTTLE |

+			   VBLANK_FLAG_SYNC)) == 0 ||

+	(priv->vblFlags & VBLANK_FLAG_NO_IRQ) != 0 ) {

+      return 0;

+   }

+

+

+   /* VBLANK_FLAG_SYNC means to wait for at least one vertical blank.  If

+    * that flag is not set, do a fake wait for zero vertical blanking

+    * periods so that we can get the current MSC.

+    *

+    * VBLANK_FLAG_INTERVAL and VBLANK_FLAG_THROTTLE mean to wait for at

+    * least one vertical blank since the last wait.  Since do_wait modifies

+    * priv->vblSeq, we have to save the original value of priv->vblSeq for the

+    * VBLANK_FLAG_INTERVAL / VBLANK_FLAG_THROTTLE calculation later.

+    */

+

+   original_seq = priv->vblSeq;

+   interval = driGetVBlankInterval(priv);

+   deadline = original_seq + interval;

+

+   vbl.request.type = DRM_VBLANK_RELATIVE;

+   if ( priv->vblFlags & VBLANK_FLAG_SECONDARY ) {

+      vbl.request.type |= DRM_VBLANK_SECONDARY;

+   }

+   vbl.request.sequence = ((priv->vblFlags & VBLANK_FLAG_SYNC) != 0) ? 1 : 0;

+

+   if ( do_wait( & vbl, &priv->vblSeq, priv->driScreenPriv->fd ) != 0 ) {

+      return -1;

+   }

+

+   diff = priv->vblSeq - deadline;

+

+   /* No need to wait again if we've already reached the target */

+   if (diff <= (1 << 23)) {

+      *missed_deadline = (priv->vblFlags & VBLANK_FLAG_SYNC) ? (diff > 0) :

+			 GL_TRUE;

+      return 0;

+   }

+

+   /* Wait until the target vertical blank. */

+   vbl.request.type = DRM_VBLANK_ABSOLUTE;

+   if ( priv->vblFlags & VBLANK_FLAG_SECONDARY ) {

+      vbl.request.type |= DRM_VBLANK_SECONDARY;

+   }

+   vbl.request.sequence = deadline;

+

+   if ( do_wait( & vbl, &priv->vblSeq, priv->driScreenPriv->fd ) != 0 ) {

+      return -1;

+   }

+

+   diff = priv->vblSeq - deadline;

+   *missed_deadline = diff > 0 && diff <= (1 << 23);

+

+   return 0;

+}

diff --git a/mesalib/src/mesa/drivers/dri/common/vblank.h b/mesalib/src/mesa/drivers/dri/common/vblank.h
index 29d1ad800..c46f4ccc3 100644
--- a/mesalib/src/mesa/drivers/dri/common/vblank.h
+++ b/mesalib/src/mesa/drivers/dri/common/vblank.h
@@ -1,75 +1,71 @@
-/* -*- mode: c; c-basic-offset: 3 -*- */
-/*
- * (c) Copyright IBM Corporation 2002
- * 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
- * VA LINUX SYSTEM, IBM 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:
- *    Ian Romanick <idr@us.ibm.com>
- */
-
-#ifndef DRI_VBLANK_H
-#define DRI_VBLANK_H
-
-#include "main/context.h"
-#include "dri_util.h"
-#include "xmlconfig.h"
-
-#define VBLANK_FLAG_INTERVAL  (1U << 0)  /* Respect the swap_interval setting
-					  */
-#define VBLANK_FLAG_THROTTLE  (1U << 1)  /* Wait 1 refresh since last call.
-					  */
-#define VBLANK_FLAG_SYNC      (1U << 2)  /* Sync to the next refresh.
-					  */
-#define VBLANK_FLAG_NO_IRQ    (1U << 7)  /* DRM has no IRQ to wait on.
-					  */
-#define VBLANK_FLAG_SECONDARY (1U << 8)  /* Wait for secondary vblank.
-					  */
-
-extern int driGetMSC32( __DRIscreen * priv, int64_t * count );
-extern int driDrawableGetMSC32( __DRIscreen * priv,
-				__DRIdrawable * drawablePrivate,
-				int64_t * count);
-extern int driWaitForMSC32( __DRIdrawable *priv,
-    int64_t target_msc, int64_t divisor, int64_t remainder, int64_t * msc );
-extern GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache );
-extern void driDrawableInitVBlank ( __DRIdrawable *priv );
-extern unsigned driGetVBlankInterval( const  __DRIdrawable *priv );
-extern void driGetCurrentVBlank( __DRIdrawable *priv );
-extern int driWaitForVBlank( __DRIdrawable *priv,
-			     GLboolean * missed_deadline );
-
-#undef usleep
-#include <unistd.h>  /* for usleep() */
-#include <sched.h>   /* for sched_yield() */
-
-#ifdef linux
-#include <sched.h>   /* for sched_yield() */
-#endif
-
-#define DO_USLEEP(nr)							\
-   do {								 	\
-      if (0) fprintf(stderr, "%s: usleep for %u\n", __FUNCTION__, nr );	\
-      if (1) usleep( nr );						\
-      sched_yield();							\
-   } while( 0 )
-
-#endif /* DRI_VBLANK_H */
+/* -*- mode: c; c-basic-offset: 3 -*- */

+/*

+ * (c) Copyright IBM Corporation 2002

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

+ * VA LINUX SYSTEM, IBM 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:

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

+ */

+

+#ifndef DRI_VBLANK_H

+#define DRI_VBLANK_H

+

+#include "main/context.h"

+#include "dri_util.h"

+#include "xmlconfig.h"

+

+#define VBLANK_FLAG_INTERVAL  (1U << 0)  /* Respect the swap_interval setting

+					  */

+#define VBLANK_FLAG_THROTTLE  (1U << 1)  /* Wait 1 refresh since last call.

+					  */

+#define VBLANK_FLAG_SYNC      (1U << 2)  /* Sync to the next refresh.

+					  */

+#define VBLANK_FLAG_NO_IRQ    (1U << 7)  /* DRM has no IRQ to wait on.

+					  */

+#define VBLANK_FLAG_SECONDARY (1U << 8)  /* Wait for secondary vblank.

+					  */

+

+extern int driGetMSC32( __DRIscreen * priv, int64_t * count );

+extern int driDrawableGetMSC32( __DRIscreen * priv,

+				__DRIdrawable * drawablePrivate,

+				int64_t * count);

+extern int driWaitForMSC32( __DRIdrawable *priv,

+    int64_t target_msc, int64_t divisor, int64_t remainder, int64_t * msc );

+extern GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache );

+extern void driDrawableInitVBlank ( __DRIdrawable *priv );

+extern unsigned driGetVBlankInterval( const  __DRIdrawable *priv );

+extern void driGetCurrentVBlank( __DRIdrawable *priv );

+extern int driWaitForVBlank( __DRIdrawable *priv,

+			     GLboolean * missed_deadline );

+

+#undef usleep

+#include <unistd.h>  /* for usleep() */

+#include <sched.h>   /* for sched_yield() */

+

+#define DO_USLEEP(nr)							\

+   do {								 	\

+      if (0) fprintf(stderr, "%s: usleep for %u\n", __FUNCTION__, nr );	\

+      if (1) usleep( nr );						\

+      sched_yield();							\

+   } while( 0 )

+

+#endif /* DRI_VBLANK_H */

diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
index 738b1ae97..eaba335a4 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c
@@ -1,1001 +1,1004 @@
-/*
- * XML DRI client-side driver configuration
- * Copyright (C) 2003 Felix Kuehling
- *
- * 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
- * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS 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 xmlconfig.c
- * \brief Driver-independent client-side part of the XML configuration
- * \author Felix Kuehling
- */
-
-#include "main/glheader.h"
-
-#include <string.h>
-#include <assert.h>
-#include <expat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include "main/imports.h"
-#include "utils.h"
-#include "xmlconfig.h"
-
-#undef GET_PROGRAM_NAME
-
-#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__)
-#    if !defined(__GLIBC__) || (__GLIBC__ < 2)
-/* These aren't declared in any libc5 header */
-extern char *program_invocation_name, *program_invocation_short_name;
-#    endif
-#    define GET_PROGRAM_NAME() program_invocation_short_name
-#elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)
-#    include <osreldate.h>
-#    if (__FreeBSD_version >= 440000)
-#        include <stdlib.h>
-#        define GET_PROGRAM_NAME() getprogname()
-#    endif
-#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
-#    include <stdlib.h>
-#    define GET_PROGRAM_NAME() getprogname()
-#elif defined(__sun)
-/* Solaris has getexecname() which returns the full path - return just
-   the basename to match BSD getprogname() */
-#    include <stdlib.h>
-#    include <libgen.h>
-#    define GET_PROGRAM_NAME() basename(getexecname())
-#endif
-
-#if !defined(GET_PROGRAM_NAME)
-#    if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__)
-/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.
- * Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's
- * used as a last resort, if there is no documented facility available. */
-static const char *__getProgramName () {
-    extern const char *__progname;
-    char * arg = strrchr(__progname, '/');
-    if (arg)
-        return arg+1;
-    else
-        return __progname;
-}
-#        define GET_PROGRAM_NAME() __getProgramName()
-#    else
-#        define GET_PROGRAM_NAME() ""
-#        warning "Per application configuration won't work with your OS version."
-#    endif
-#endif
-
-/** \brief Find an option in an option cache with the name as key */
-static GLuint findOption (const driOptionCache *cache, const char *name) {
-    GLuint len = strlen (name);
-    GLuint size = 1 << cache->tableSize, mask = size - 1;
-    GLuint hash = 0;
-    GLuint i, shift;
-
-  /* compute a hash from the variable length name */
-    for (i = 0, shift = 0; i < len; ++i, shift = (shift+8) & 31)
-	hash += (GLuint)name[i] << shift;
-    hash *= hash;
-    hash = (hash >> (16-cache->tableSize/2)) & mask;
-
-  /* this is just the starting point of the linear search for the option */
-    for (i = 0; i < size; ++i, hash = (hash+1) & mask) {
-      /* if we hit an empty entry then the option is not defined (yet) */
-	if (cache->info[hash].name == 0)
-	    break;
-	else if (!strcmp (name, cache->info[hash].name))
-	    break;
-    }
-  /* this assertion fails if the hash table is full */
-    assert (i < size);
-
-    return hash;
-}
-
-/** \brief Count the real number of options in an option cache */
-static GLuint countOptions (const driOptionCache *cache) {
-    GLuint size = 1 << cache->tableSize;
-    GLuint i, count = 0;
-    for (i = 0; i < size; ++i)
-	if (cache->info[i].name)
-	    count++;
-    return count;
-}
-
-/** \brief Like strdup but using MALLOC and with error checking. */
-#define XSTRDUP(dest,source) do { \
-    GLuint len = strlen (source); \
-    if (!(dest = MALLOC (len+1))) { \
-	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__); \
-	abort(); \
-    } \
-    memcpy (dest, source, len+1); \
-} while (0)
-
-static int compare (const void *a, const void *b) {
-    return strcmp (*(char *const*)a, *(char *const*)b);
-}
-/** \brief Binary search in a string array. */
-static GLuint bsearchStr (const XML_Char *name,
-			  const XML_Char *elems[], GLuint count) {
-    const XML_Char **found;
-    found = bsearch (&name, elems, count, sizeof (XML_Char *), compare);
-    if (found)
-	return found - elems;
-    else
-	return count;
-}
-
-/** \brief Locale-independent integer parser.
- *
- * Works similar to strtol. Leading space is NOT skipped. The input
- * number may have an optional sign. Radix is specified by base. If
- * base is 0 then decimal is assumed unless the input number is
- * prefixed by 0x or 0X for hexadecimal or 0 for octal. After
- * returning tail points to the first character that is not part of
- * the integer number. If no number was found then tail points to the
- * start of the input string. */
-static GLint strToI (const XML_Char *string, const XML_Char **tail, int base) {
-    GLint radix = base == 0 ? 10 : base;
-    GLint result = 0;
-    GLint sign = 1;
-    GLboolean numberFound = GL_FALSE;
-    const XML_Char *start = string;
-
-    assert (radix >= 2 && radix <= 36);
-
-    if (*string == '-') {
-	sign = -1;
-	string++;
-    } else if (*string == '+')
-	string++;
-    if (base == 0 && *string == '0') {
-	numberFound = GL_TRUE; 
-	if (*(string+1) == 'x' || *(string+1) == 'X') {
-	    radix = 16;
-	    string += 2;
-	} else {
-	    radix = 8;
-	    string++;
-	}
-    }
-    do {
-	GLint digit = -1;
-	if (radix <= 10) {
-	    if (*string >= '0' && *string < '0' + radix)
-		digit = *string - '0';
-	} else {
-	    if (*string >= '0' && *string <= '9')
-		digit = *string - '0';
-	    else if (*string >= 'a' && *string < 'a' + radix - 10)
-		digit = *string - 'a' + 10;
-	    else if (*string >= 'A' && *string < 'A' + radix - 10)
-		digit = *string - 'A' + 10;
-	}
-	if (digit != -1) {
-	    numberFound = GL_TRUE;
-	    result = radix*result + digit;
-	    string++;
-	} else
-	    break;
-    } while (GL_TRUE);
-    *tail = numberFound ? string : start;
-    return sign * result;
-}
-
-/** \brief Locale-independent floating-point parser.
- *
- * Works similar to strtod. Leading space is NOT skipped. The input
- * number may have an optional sign. '.' is interpreted as decimal
- * point and may occor at most once. Optionally the number may end in
- * [eE]<exponent>, where <exponent> is an integer as recognized by
- * strToI. In that case the result is number * 10^exponent. After
- * returning tail points to the first character that is not part of
- * the floating point number. If no number was found then tail points
- * to the start of the input string.
- *
- * Uses two passes for maximum accuracy. */
-static GLfloat strToF (const XML_Char *string, const XML_Char **tail) {
-    GLint nDigits = 0, pointPos, exponent;
-    GLfloat sign = 1.0f, result = 0.0f, scale;
-    const XML_Char *start = string, *numStart;
-
-    /* sign */
-    if (*string == '-') {
-	sign = -1.0f;
-	string++;
-    } else if (*string == '+')
-	string++;
-
-    /* first pass: determine position of decimal point, number of
-     * digits, exponent and the end of the number. */
-    numStart = string;
-    while (*string >= '0' && *string <= '9') {
-	string++;
-	nDigits++;
-    }
-    pointPos = nDigits;
-    if (*string == '.') {
-	string++;
-	while (*string >= '0' && *string <= '9') {
-	    string++;
-	    nDigits++;
-	}
-    }
-    if (nDigits == 0) {
-	/* no digits, no number */
-	*tail = start;
-	return 0.0f;
-    }
-    *tail = string;
-    if (*string == 'e' || *string == 'E') {
-	const XML_Char *expTail;
-	exponent = strToI (string+1, &expTail, 10);
-	if (expTail == string+1)
-	    exponent = 0;
-	else
-	    *tail = expTail;
-    } else
-	exponent = 0;
-    string = numStart;
-
-    /* scale of the first digit */
-    scale = sign * (GLfloat)pow (10.0, (GLdouble)(pointPos-1 + exponent));
-
-    /* second pass: parse digits */
-    do {
-	if (*string != '.') {
-	    assert (*string >= '0' && *string <= '9');
-	    result += scale * (GLfloat)(*string - '0');
-	    scale *= 0.1f;
-	    nDigits--;
-	}
-	string++;
-    } while (nDigits > 0);
-
-    return result;
-}
-
-/** \brief Parse a value of a given type. */
-static GLboolean parseValue (driOptionValue *v, driOptionType type,
-			     const XML_Char *string) {
-    const XML_Char *tail = NULL;
-  /* skip leading white-space */
-    string += strspn (string, " \f\n\r\t\v");
-    switch (type) {
-      case DRI_BOOL:
-	if (!strcmp (string, "false")) {
-	    v->_bool = GL_FALSE;
-	    tail = string + 5;
-	} else if (!strcmp (string, "true")) {
-	    v->_bool = GL_TRUE;
-	    tail = string + 4;
-	}
-	else
-	    return GL_FALSE;
-	break;
-      case DRI_ENUM: /* enum is just a special integer */
-      case DRI_INT:
-	v->_int = strToI (string, &tail, 0);
-	break;
-      case DRI_FLOAT:
-	v->_float = strToF (string, &tail);
-	break;
-    }
-
-    if (tail == string)
-	return GL_FALSE; /* empty string (or containing only white-space) */
-  /* skip trailing white space */
-    if (*tail)
-	tail += strspn (tail, " \f\n\r\t\v");
-    if (*tail)
-	return GL_FALSE; /* something left over that is not part of value */
-
-    return GL_TRUE;
-}
-
-/** \brief Parse a list of ranges of type info->type. */
-static GLboolean parseRanges (driOptionInfo *info, const XML_Char *string) {
-    XML_Char *cp, *range;
-    GLuint nRanges, i;
-    driOptionRange *ranges;
-
-    XSTRDUP (cp, string);
-  /* pass 1: determine the number of ranges (number of commas + 1) */
-    range = cp;
-    for (nRanges = 1; *range; ++range)
-	if (*range == ',')
-	    ++nRanges;
-
-    if ((ranges = MALLOC (nRanges*sizeof(driOptionRange))) == NULL) {
-	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
-	abort();
-    }
-
-  /* pass 2: parse all ranges into preallocated array */
-    range = cp;
-    for (i = 0; i < nRanges; ++i) {
-	XML_Char *end, *sep;
-	assert (range);
-	end = strchr (range, ',');
-	if (end)
-	    *end = '\0';
-	sep = strchr (range, ':');
-	if (sep) { /* non-empty interval */
-	    *sep = '\0';
-	    if (!parseValue (&ranges[i].start, info->type, range) ||
-		!parseValue (&ranges[i].end, info->type, sep+1))
-	        break;
-	    if (info->type == DRI_INT &&
-		ranges[i].start._int > ranges[i].end._int)
-		break;
-	    if (info->type == DRI_FLOAT &&
-		ranges[i].start._float > ranges[i].end._float)
-		break;
-	} else { /* empty interval */
-	    if (!parseValue (&ranges[i].start, info->type, range))
-		break;
-	    ranges[i].end = ranges[i].start;
-	}
-	if (end)
-	    range = end+1;
-	else
-	    range = NULL;
-    }
-    FREE (cp);
-    if (i < nRanges) {
-	FREE (ranges);
-	return GL_FALSE;
-    } else
-	assert (range == NULL);
-
-    info->nRanges = nRanges;
-    info->ranges = ranges;
-    return GL_TRUE;
-}
-
-/** \brief Check if a value is in one of info->ranges. */
-static GLboolean checkValue (const driOptionValue *v, const driOptionInfo *info) {
-    GLuint i;
-    assert (info->type != DRI_BOOL); /* should be caught by the parser */
-    if (info->nRanges == 0)
-	return GL_TRUE;
-    switch (info->type) {
-      case DRI_ENUM: /* enum is just a special integer */
-      case DRI_INT:
-	for (i = 0; i < info->nRanges; ++i)
-	    if (v->_int >= info->ranges[i].start._int &&
-		v->_int <= info->ranges[i].end._int)
-		return GL_TRUE;
-	break;
-      case DRI_FLOAT:
-	for (i = 0; i < info->nRanges; ++i)
-	    if (v->_float >= info->ranges[i].start._float &&
-		v->_float <= info->ranges[i].end._float)
-		return GL_TRUE;
-	break;
-      default:
-	assert (0); /* should never happen */
-    }
-    return GL_FALSE;
-}
-
-/** \brief Output a warning message. */
-#define XML_WARNING1(msg) do {\
-    __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
-                      (int) XML_GetCurrentLineNumber(data->parser), \
-                      (int) XML_GetCurrentColumnNumber(data->parser)); \
-} while (0)
-#define XML_WARNING(msg,args...) do { \
-    __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
-                      (int) XML_GetCurrentLineNumber(data->parser), \
-                      (int) XML_GetCurrentColumnNumber(data->parser), \
-                      args); \
-} while (0)
-/** \brief Output an error message. */
-#define XML_ERROR1(msg) do { \
-    __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \
-                      (int) XML_GetCurrentLineNumber(data->parser), \
-                      (int) XML_GetCurrentColumnNumber(data->parser)); \
-} while (0)
-#define XML_ERROR(msg,args...) do { \
-    __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \
-                      (int) XML_GetCurrentLineNumber(data->parser), \
-                      (int) XML_GetCurrentColumnNumber(data->parser), \
-                      args); \
-} while (0)
-/** \brief Output a fatal error message and abort. */
-#define XML_FATAL1(msg) do { \
-    fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \
-             data->name, \
-             (int) XML_GetCurrentLineNumber(data->parser),	\
-             (int) XML_GetCurrentColumnNumber(data->parser)); \
-    abort();\
-} while (0)
-#define XML_FATAL(msg,args...) do { \
-    fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \
-             data->name, \
-             (int) XML_GetCurrentLineNumber(data->parser),	\
-             (int) XML_GetCurrentColumnNumber(data->parser),		\
-             args); \
-    abort();\
-} while (0)
-
-/** \brief Parser context for __driConfigOptions. */
-struct OptInfoData {
-    const char *name;
-    XML_Parser parser;
-    driOptionCache *cache;
-    GLboolean inDriInfo;
-    GLboolean inSection;
-    GLboolean inDesc;
-    GLboolean inOption;
-    GLboolean inEnum;
-    int curOption;
-};
-
-/** \brief Elements in __driConfigOptions. */
-enum OptInfoElem {
-    OI_DESCRIPTION = 0, OI_DRIINFO, OI_ENUM, OI_OPTION, OI_SECTION, OI_COUNT
-};
-static const XML_Char *OptInfoElems[] = {
-    "description", "driinfo", "enum", "option", "section"
-};
-
-/** \brief Parse attributes of an enum element.
- *
- * We're not actually interested in the data. Just make sure this is ok
- * for external configuration tools.
- */
-static void parseEnumAttr (struct OptInfoData *data, const XML_Char **attr) {
-    GLuint i;
-    const XML_Char *value = NULL, *text = NULL;
-    driOptionValue v;
-    GLuint opt = data->curOption;
-    for (i = 0; attr[i]; i += 2) {
-	if (!strcmp (attr[i], "value")) value = attr[i+1];
-	else if (!strcmp (attr[i], "text")) text = attr[i+1];
-	else XML_FATAL("illegal enum attribute: %s.", attr[i]);
-    }
-    if (!value) XML_FATAL1 ("value attribute missing in enum.");
-    if (!text) XML_FATAL1 ("text attribute missing in enum.");
-     if (!parseValue (&v, data->cache->info[opt].type, value))
-	XML_FATAL ("illegal enum value: %s.", value);
-    if (!checkValue (&v, &data->cache->info[opt]))
-	XML_FATAL ("enum value out of valid range: %s.", value);
-}
-
-/** \brief Parse attributes of a description element.
- *
- * We're not actually interested in the data. Just make sure this is ok
- * for external configuration tools.
- */
-static void parseDescAttr (struct OptInfoData *data, const XML_Char **attr) {
-    GLuint i;
-    const XML_Char *lang = NULL, *text = NULL;
-    for (i = 0; attr[i]; i += 2) {
-	if (!strcmp (attr[i], "lang")) lang = attr[i+1];
-	else if (!strcmp (attr[i], "text")) text = attr[i+1];
-	else XML_FATAL("illegal description attribute: %s.", attr[i]);
-    }
-    if (!lang) XML_FATAL1 ("lang attribute missing in description.");
-    if (!text) XML_FATAL1 ("text attribute missing in description.");
-}
-
-/** \brief Parse attributes of an option element. */
-static void parseOptInfoAttr (struct OptInfoData *data, const XML_Char **attr) {
-    enum OptAttr {OA_DEFAULT = 0, OA_NAME, OA_TYPE, OA_VALID, OA_COUNT};
-    static const XML_Char *optAttr[] = {"default", "name", "type", "valid"};
-    const XML_Char *attrVal[OA_COUNT] = {NULL, NULL, NULL, NULL};
-    const char *defaultVal;
-    driOptionCache *cache = data->cache;
-    GLuint opt, i;
-    for (i = 0; attr[i]; i += 2) {
-	GLuint attrName = bsearchStr (attr[i], optAttr, OA_COUNT);
-	if (attrName >= OA_COUNT)
-	    XML_FATAL ("illegal option attribute: %s", attr[i]);
-	attrVal[attrName] = attr[i+1];
-    }
-    if (!attrVal[OA_NAME]) XML_FATAL1 ("name attribute missing in option.");
-    if (!attrVal[OA_TYPE]) XML_FATAL1 ("type attribute missing in option.");
-    if (!attrVal[OA_DEFAULT]) XML_FATAL1 ("default attribute missing in option.");
-
-    opt = findOption (cache, attrVal[OA_NAME]);
-    if (cache->info[opt].name)
-	XML_FATAL ("option %s redefined.", attrVal[OA_NAME]);
-    data->curOption = opt;
-
-    XSTRDUP (cache->info[opt].name, attrVal[OA_NAME]);
-
-    if (!strcmp (attrVal[OA_TYPE], "bool"))
-	cache->info[opt].type = DRI_BOOL;
-    else if (!strcmp (attrVal[OA_TYPE], "enum"))
-	cache->info[opt].type = DRI_ENUM;
-    else if (!strcmp (attrVal[OA_TYPE], "int"))
-	cache->info[opt].type = DRI_INT;
-    else if (!strcmp (attrVal[OA_TYPE], "float"))
-	cache->info[opt].type = DRI_FLOAT;
-    else
-	XML_FATAL ("illegal type in option: %s.", attrVal[OA_TYPE]);
-
-    defaultVal = getenv (cache->info[opt].name);
-    if (defaultVal != NULL) {
-      /* don't use XML_WARNING, we want the user to see this! */
-	fprintf (stderr,
-		 "ATTENTION: default value of option %s overridden by environment.\n",
-		 cache->info[opt].name);
-    } else
-	defaultVal = attrVal[OA_DEFAULT];
-    if (!parseValue (&cache->values[opt], cache->info[opt].type, defaultVal))
-	XML_FATAL ("illegal default value: %s.", defaultVal);
-
-    if (attrVal[OA_VALID]) {
-	if (cache->info[opt].type == DRI_BOOL)
-	    XML_FATAL1 ("boolean option with valid attribute.");
-	if (!parseRanges (&cache->info[opt], attrVal[OA_VALID]))
-	    XML_FATAL ("illegal valid attribute: %s.", attrVal[OA_VALID]);
-	if (!checkValue (&cache->values[opt], &cache->info[opt]))
-	    XML_FATAL ("default value out of valid range '%s': %s.",
-		       attrVal[OA_VALID], defaultVal);
-    } else if (cache->info[opt].type == DRI_ENUM) {
-	XML_FATAL1 ("valid attribute missing in option (mandatory for enums).");
-    } else {
-	cache->info[opt].nRanges = 0;
-	cache->info[opt].ranges = NULL;
-    }
-}
-
-/** \brief Handler for start element events. */
-static void optInfoStartElem (void *userData, const XML_Char *name,
-			      const XML_Char **attr) {
-    struct OptInfoData *data = (struct OptInfoData *)userData;
-    enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT);
-    switch (elem) {
-      case OI_DRIINFO:
-	if (data->inDriInfo)
-	    XML_FATAL1 ("nested <driinfo> elements.");
-	if (attr[0])
-	    XML_FATAL1 ("attributes specified on <driinfo> element.");
-	data->inDriInfo = GL_TRUE;
-	break;
-      case OI_SECTION:
-	if (!data->inDriInfo)
-	    XML_FATAL1 ("<section> must be inside <driinfo>.");
-	if (data->inSection)
-	    XML_FATAL1 ("nested <section> elements.");
-	if (attr[0])
-	    XML_FATAL1 ("attributes specified on <section> element.");
-	data->inSection = GL_TRUE;
-	break;
-      case OI_DESCRIPTION:
-	if (!data->inSection && !data->inOption)
-	    XML_FATAL1 ("<description> must be inside <description> or <option.");
-	if (data->inDesc)
-	    XML_FATAL1 ("nested <description> elements.");
-	data->inDesc = GL_TRUE;
-	parseDescAttr (data, attr);
-	break;
-      case OI_OPTION:
-	if (!data->inSection)
-	    XML_FATAL1 ("<option> must be inside <section>.");
-	if (data->inDesc)
-	    XML_FATAL1 ("<option> nested in <description> element.");
-	if (data->inOption)
-	    XML_FATAL1 ("nested <option> elements.");
-	data->inOption = GL_TRUE;
-	parseOptInfoAttr (data, attr);
-	break;
-      case OI_ENUM:
-	if (!(data->inOption && data->inDesc))
-	    XML_FATAL1 ("<enum> must be inside <option> and <description>.");
-	if (data->inEnum)
-	    XML_FATAL1 ("nested <enum> elements.");
-	data->inEnum = GL_TRUE;
-	parseEnumAttr (data, attr);
-	break;
-      default:
-	XML_FATAL ("unknown element: %s.", name);
-    }
-}
-
-/** \brief Handler for end element events. */
-static void optInfoEndElem (void *userData, const XML_Char *name) {
-    struct OptInfoData *data = (struct OptInfoData *)userData;
-    enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT);
-    switch (elem) {
-      case OI_DRIINFO:
-	data->inDriInfo = GL_FALSE;
-	break;
-      case OI_SECTION:
-	data->inSection = GL_FALSE;
-	break;
-      case OI_DESCRIPTION:
-	data->inDesc = GL_FALSE;
-	break;
-      case OI_OPTION:
-	data->inOption = GL_FALSE;
-	break;
-      case OI_ENUM:
-	data->inEnum = GL_FALSE;
-	break;
-      default:
-	assert (0); /* should have been caught by StartElem */
-    }
-}
-
-void driParseOptionInfo (driOptionCache *info,
-			 const char *configOptions, GLuint nConfigOptions) {
-    XML_Parser p;
-    int status;
-    struct OptInfoData userData;
-    struct OptInfoData *data = &userData;
-    GLuint realNoptions;
-
-  /* determine hash table size and allocate memory:
-   * 3/2 of the number of options, rounded up, so there remains always
-   * at least one free entry. This is needed for detecting undefined
-   * options in configuration files without getting a hash table overflow.
-   * Round this up to a power of two. */
-    GLuint minSize = (nConfigOptions*3 + 1) / 2;
-    GLuint size, log2size;
-    for (size = 1, log2size = 0; size < minSize; size <<= 1, ++log2size);
-    info->tableSize = log2size;
-    info->info = CALLOC (size * sizeof (driOptionInfo));
-    info->values = CALLOC (size * sizeof (driOptionValue));
-    if (info->info == NULL || info->values == NULL) {
-	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
-	abort();
-    }
-
-    p = XML_ParserCreate ("UTF-8"); /* always UTF-8 */
-    XML_SetElementHandler (p, optInfoStartElem, optInfoEndElem);
-    XML_SetUserData (p, data);
-
-    userData.name = "__driConfigOptions";
-    userData.parser = p;
-    userData.cache = info;
-    userData.inDriInfo = GL_FALSE;
-    userData.inSection = GL_FALSE;
-    userData.inDesc = GL_FALSE;
-    userData.inOption = GL_FALSE;
-    userData.inEnum = GL_FALSE;
-    userData.curOption = -1;
-
-    status = XML_Parse (p, configOptions, strlen (configOptions), 1);
-    if (!status)
-	XML_FATAL ("%s.", XML_ErrorString(XML_GetErrorCode(p)));
-
-    XML_ParserFree (p);
-
-  /* Check if the actual number of options matches nConfigOptions.
-   * A mismatch is not fatal (a hash table overflow would be) but we
-   * want the driver developer's attention anyway. */
-    realNoptions = countOptions (info);
-    if (realNoptions != nConfigOptions) {
-	fprintf (stderr,
-		 "Error: nConfigOptions (%u) does not match the actual number of options in\n"
-		 "       __driConfigOptions (%u).\n",
-		 nConfigOptions, realNoptions);
-    }
-}
-
-/** \brief Parser context for configuration files. */
-struct OptConfData {
-    const char *name;
-    XML_Parser parser;
-    driOptionCache *cache;
-    GLint screenNum;
-    const char *driverName, *execName;
-    GLuint ignoringDevice;
-    GLuint ignoringApp;
-    GLuint inDriConf;
-    GLuint inDevice;
-    GLuint inApp;
-    GLuint inOption;
-};
-
-/** \brief Elements in configuration files. */
-enum OptConfElem {
-    OC_APPLICATION = 0, OC_DEVICE, OC_DRICONF, OC_OPTION, OC_COUNT
-};
-static const XML_Char *OptConfElems[] = {
-    "application", "device", "driconf", "option"
-};
-
-/** \brief Parse attributes of a device element. */
-static void parseDeviceAttr (struct OptConfData *data, const XML_Char **attr) {
-    GLuint i;
-    const XML_Char *driver = NULL, *screen = NULL;
-    for (i = 0; attr[i]; i += 2) {
-	if (!strcmp (attr[i], "driver")) driver = attr[i+1];
-	else if (!strcmp (attr[i], "screen")) screen = attr[i+1];
-	else XML_WARNING("unkown device attribute: %s.", attr[i]);
-    }
-    if (driver && strcmp (driver, data->driverName))
-	data->ignoringDevice = data->inDevice;
-    else if (screen) {
-	driOptionValue screenNum;
-	if (!parseValue (&screenNum, DRI_INT, screen))
-	    XML_WARNING("illegal screen number: %s.", screen);
-	else if (screenNum._int != data->screenNum)
-	    data->ignoringDevice = data->inDevice;
-    }
-}
-
-/** \brief Parse attributes of an application element. */
-static void parseAppAttr (struct OptConfData *data, const XML_Char **attr) {
-    GLuint i;
-    const XML_Char *name = NULL, *exec = NULL;
-    for (i = 0; attr[i]; i += 2) {
-	if (!strcmp (attr[i], "name")) name = attr[i+1];
-	else if (!strcmp (attr[i], "executable")) exec = attr[i+1];
-	else XML_WARNING("unkown application attribute: %s.", attr[i]);
-    }
-    if (exec && strcmp (exec, data->execName))
-	data->ignoringApp = data->inApp;
-}
-
-/** \brief Parse attributes of an option element. */
-static void parseOptConfAttr (struct OptConfData *data, const XML_Char **attr) {
-    GLuint i;
-    const XML_Char *name = NULL, *value = NULL;
-    for (i = 0; attr[i]; i += 2) {
-	if (!strcmp (attr[i], "name")) name = attr[i+1];
-	else if (!strcmp (attr[i], "value")) value = attr[i+1];
-	else XML_WARNING("unkown option attribute: %s.", attr[i]);
-    }
-    if (!name) XML_WARNING1 ("name attribute missing in option.");
-    if (!value) XML_WARNING1 ("value attribute missing in option.");
-    if (name && value) {
-	driOptionCache *cache = data->cache;
-	GLuint opt = findOption (cache, name);
-	if (cache->info[opt].name == NULL)
-	    XML_WARNING ("undefined option: %s.", name);
-	else if (getenv (cache->info[opt].name))
-	  /* don't use XML_WARNING, we want the user to see this! */
-	    fprintf (stderr, "ATTENTION: option value of option %s ignored.\n",
-		     cache->info[opt].name);
-	else if (!parseValue (&cache->values[opt], cache->info[opt].type, value))
-	    XML_WARNING ("illegal option value: %s.", value);
-    }
-}
-
-/** \brief Handler for start element events. */
-static void optConfStartElem (void *userData, const XML_Char *name,
-			      const XML_Char **attr) {
-    struct OptConfData *data = (struct OptConfData *)userData;
-    enum OptConfElem elem = bsearchStr (name, OptConfElems, OC_COUNT);
-    switch (elem) {
-      case OC_DRICONF:
-	if (data->inDriConf)
-	    XML_WARNING1 ("nested <driconf> elements.");
-	if (attr[0])
-	    XML_WARNING1 ("attributes specified on <driconf> element.");
-	data->inDriConf++;
-	break;
-      case OC_DEVICE:
-	if (!data->inDriConf)
-	    XML_WARNING1 ("<device> should be inside <driconf>.");
-	if (data->inDevice)
-	    XML_WARNING1 ("nested <device> elements.");
-	data->inDevice++;
-	if (!data->ignoringDevice && !data->ignoringApp)
-	    parseDeviceAttr (data, attr);
-	break;
-      case OC_APPLICATION:
-	if (!data->inDevice)
-	    XML_WARNING1 ("<application> should be inside <device>.");
-	if (data->inApp)
-	    XML_WARNING1 ("nested <application> elements.");
-	data->inApp++;
-	if (!data->ignoringDevice && !data->ignoringApp)
-	    parseAppAttr (data, attr);
-	break;
-      case OC_OPTION:
-	if (!data->inApp)
-	    XML_WARNING1 ("<option> should be inside <application>.");
-	if (data->inOption)
-	    XML_WARNING1 ("nested <option> elements.");
-	data->inOption++;
-	if (!data->ignoringDevice && !data->ignoringApp)
-	    parseOptConfAttr (data, attr);
-	break;
-      default:
-	XML_WARNING ("unknown element: %s.", name);
-    }
-}
-
-/** \brief Handler for end element events. */
-static void optConfEndElem (void *userData, const XML_Char *name) {
-    struct OptConfData *data = (struct OptConfData *)userData;
-    enum OptConfElem elem = bsearchStr (name, OptConfElems, OC_COUNT);
-    switch (elem) {
-      case OC_DRICONF:
-	data->inDriConf--;
-	break;
-      case OC_DEVICE:
-	if (data->inDevice-- == data->ignoringDevice)
-	    data->ignoringDevice = 0;
-	break;
-      case OC_APPLICATION:
-	if (data->inApp-- == data->ignoringApp)
-	    data->ignoringApp = 0;
-	break;
-      case OC_OPTION:
-	data->inOption--;
-	break;
-      default:
-	/* unknown element, warning was produced on start tag */;
-    }
-}
-
-/** \brief Initialize an option cache based on info */
-static void initOptionCache (driOptionCache *cache, const driOptionCache *info) {
-    cache->info = info->info;
-    cache->tableSize = info->tableSize;
-    cache->values = MALLOC ((1<<info->tableSize) * sizeof (driOptionValue));
-    if (cache->values == NULL) {
-	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
-	abort();
-    }
-    memcpy (cache->values, info->values,
-	    (1<<info->tableSize) * sizeof (driOptionValue));
-}
-
-/** \brief Parse the named configuration file */
-static void parseOneConfigFile (XML_Parser p) {
-#define BUF_SIZE 0x1000
-    struct OptConfData *data = (struct OptConfData *)XML_GetUserData (p);
-    int status;
-    int fd;
-
-    if ((fd = open (data->name, O_RDONLY)) == -1) {
-	__driUtilMessage ("Can't open configuration file %s: %s.",
-			  data->name, strerror (errno));
-	return;
-    }
-
-    while (1) {
-	int bytesRead;
-	void *buffer = XML_GetBuffer (p, BUF_SIZE);
-	if (!buffer) {
-	    __driUtilMessage ("Can't allocate parser buffer.");
-	    break;
-	}
-	bytesRead = read (fd, buffer, BUF_SIZE);
-	if (bytesRead == -1) {
-	    __driUtilMessage ("Error reading from configuration file %s: %s.",
-			      data->name, strerror (errno));
-	    break;
-	}
-	status = XML_ParseBuffer (p, bytesRead, bytesRead == 0);
-	if (!status) {
-	    XML_ERROR ("%s.", XML_ErrorString(XML_GetErrorCode(p)));
-	    break;
-	}
-	if (bytesRead == 0)
-	    break;
-    }
-
-    close (fd);
-#undef BUF_SIZE
-}
-
-void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info,
-			  GLint screenNum, const char *driverName) {
-    char *filenames[2] = {"/etc/drirc", NULL};
-    char *home;
-    GLuint i;
-    struct OptConfData userData;
-
-    initOptionCache (cache, info);
-
-    userData.cache = cache;
-    userData.screenNum = screenNum;
-    userData.driverName = driverName;
-    userData.execName = GET_PROGRAM_NAME();
-
-    if ((home = getenv ("HOME"))) {
-	GLuint len = strlen (home);
-	filenames[1] = MALLOC (len + 7+1);
-	if (filenames[1] == NULL)
-	    __driUtilMessage ("Can't allocate memory for %s/.drirc.", home);
-	else {
-	    memcpy (filenames[1], home, len);
-	    memcpy (filenames[1] + len, "/.drirc", 7+1);
-	}
-    }
-
-    for (i = 0; i < 2; ++i) {
-	XML_Parser p;
-	if (filenames[i] == NULL)
-	    continue;
-
-	p = XML_ParserCreate (NULL); /* use encoding specified by file */
-	XML_SetElementHandler (p, optConfStartElem, optConfEndElem);
-	XML_SetUserData (p, &userData);
-	userData.parser = p;
-	userData.name = filenames[i];
-	userData.ignoringDevice = 0;
-	userData.ignoringApp = 0;
-	userData.inDriConf = 0;
-	userData.inDevice = 0;
-	userData.inApp = 0;
-	userData.inOption = 0;
-
-	parseOneConfigFile (p);
-	XML_ParserFree (p);
-    }
-
-    if (filenames[1])
-	FREE (filenames[1]);
-}
-
-void driDestroyOptionInfo (driOptionCache *info) {
-    driDestroyOptionCache (info);
-    if (info->info) {
-	GLuint i, size = 1 << info->tableSize;
-	for (i = 0; i < size; ++i) {
-	    if (info->info[i].name) {
-		FREE (info->info[i].name);
-		if (info->info[i].ranges)
-		    FREE (info->info[i].ranges);
-	    }
-	}
-	FREE (info->info);
-    }
-}
-
-void driDestroyOptionCache (driOptionCache *cache) {
-    if (cache->values)
-	FREE (cache->values);
-}
-
-GLboolean driCheckOption (const driOptionCache *cache, const char *name,
-			  driOptionType type) {
-    GLuint i = findOption (cache, name);
-    return cache->info[i].name != NULL && cache->info[i].type == type;
-}
-
-GLboolean driQueryOptionb (const driOptionCache *cache, const char *name) {
-    GLuint i = findOption (cache, name);
-  /* make sure the option is defined and has the correct type */
-    assert (cache->info[i].name != NULL);
-    assert (cache->info[i].type == DRI_BOOL);
-    return cache->values[i]._bool;
-}
-
-GLint driQueryOptioni (const driOptionCache *cache, const char *name) {
-    GLuint i = findOption (cache, name);
-  /* make sure the option is defined and has the correct type */
-    assert (cache->info[i].name != NULL);
-    assert (cache->info[i].type == DRI_INT || cache->info[i].type == DRI_ENUM);
-    return cache->values[i]._int;
-}
-
-GLfloat driQueryOptionf (const driOptionCache *cache, const char *name) {
-    GLuint i = findOption (cache, name);
-  /* make sure the option is defined and has the correct type */
-    assert (cache->info[i].name != NULL);
-    assert (cache->info[i].type == DRI_FLOAT);
-    return cache->values[i]._float;
-}
+/*

+ * XML DRI client-side driver configuration

+ * Copyright (C) 2003 Felix Kuehling

+ *

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

+ * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS 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 xmlconfig.c

+ * \brief Driver-independent client-side part of the XML configuration

+ * \author Felix Kuehling

+ */

+

+#include "main/glheader.h"

+

+#include <string.h>

+#include <assert.h>

+#include <expat.h>

+#include <fcntl.h>

+#include <unistd.h>

+#include <errno.h>

+#include "main/imports.h"

+#include "utils.h"

+#include "xmlconfig.h"

+

+#undef GET_PROGRAM_NAME

+

+#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__)

+#    if !defined(__GLIBC__) || (__GLIBC__ < 2)

+/* These aren't declared in any libc5 header */

+extern char *program_invocation_name, *program_invocation_short_name;

+#    endif

+#    define GET_PROGRAM_NAME() program_invocation_short_name

+#elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)

+#    include <osreldate.h>

+#    if (__FreeBSD_version >= 440000)

+#        include <stdlib.h>

+#        define GET_PROGRAM_NAME() getprogname()

+#    endif

+#elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)

+#    include <stdlib.h>

+#    define GET_PROGRAM_NAME() getprogname()

+#elif defined(__APPLE__)

+#    include <stdlib.h>

+#    define GET_PROGRAM_NAME() getprogname()

+#elif defined(__sun)

+/* Solaris has getexecname() which returns the full path - return just

+   the basename to match BSD getprogname() */

+#    include <stdlib.h>

+#    include <libgen.h>

+#    define GET_PROGRAM_NAME() basename(getexecname())

+#endif

+

+#if !defined(GET_PROGRAM_NAME)

+#    if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__)

+/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.

+ * Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's

+ * used as a last resort, if there is no documented facility available. */

+static const char *__getProgramName () {

+    extern const char *__progname;

+    char * arg = strrchr(__progname, '/');

+    if (arg)

+        return arg+1;

+    else

+        return __progname;

+}

+#        define GET_PROGRAM_NAME() __getProgramName()

+#    else

+#        define GET_PROGRAM_NAME() ""

+#        warning "Per application configuration won't work with your OS version."

+#    endif

+#endif

+

+/** \brief Find an option in an option cache with the name as key */

+static GLuint findOption (const driOptionCache *cache, const char *name) {

+    GLuint len = strlen (name);

+    GLuint size = 1 << cache->tableSize, mask = size - 1;

+    GLuint hash = 0;

+    GLuint i, shift;

+

+  /* compute a hash from the variable length name */

+    for (i = 0, shift = 0; i < len; ++i, shift = (shift+8) & 31)

+	hash += (GLuint)name[i] << shift;

+    hash *= hash;

+    hash = (hash >> (16-cache->tableSize/2)) & mask;

+

+  /* this is just the starting point of the linear search for the option */

+    for (i = 0; i < size; ++i, hash = (hash+1) & mask) {

+      /* if we hit an empty entry then the option is not defined (yet) */

+	if (cache->info[hash].name == 0)

+	    break;

+	else if (!strcmp (name, cache->info[hash].name))

+	    break;

+    }

+  /* this assertion fails if the hash table is full */

+    assert (i < size);

+

+    return hash;

+}

+

+/** \brief Count the real number of options in an option cache */

+static GLuint countOptions (const driOptionCache *cache) {

+    GLuint size = 1 << cache->tableSize;

+    GLuint i, count = 0;

+    for (i = 0; i < size; ++i)

+	if (cache->info[i].name)

+	    count++;

+    return count;

+}

+

+/** \brief Like strdup but using MALLOC and with error checking. */

+#define XSTRDUP(dest,source) do { \

+    GLuint len = strlen (source); \

+    if (!(dest = MALLOC (len+1))) { \

+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__); \

+	abort(); \

+    } \

+    memcpy (dest, source, len+1); \

+} while (0)

+

+static int compare (const void *a, const void *b) {

+    return strcmp (*(char *const*)a, *(char *const*)b);

+}

+/** \brief Binary search in a string array. */

+static GLuint bsearchStr (const XML_Char *name,

+			  const XML_Char *elems[], GLuint count) {

+    const XML_Char **found;

+    found = bsearch (&name, elems, count, sizeof (XML_Char *), compare);

+    if (found)

+	return found - elems;

+    else

+	return count;

+}

+

+/** \brief Locale-independent integer parser.

+ *

+ * Works similar to strtol. Leading space is NOT skipped. The input

+ * number may have an optional sign. Radix is specified by base. If

+ * base is 0 then decimal is assumed unless the input number is

+ * prefixed by 0x or 0X for hexadecimal or 0 for octal. After

+ * returning tail points to the first character that is not part of

+ * the integer number. If no number was found then tail points to the

+ * start of the input string. */

+static GLint strToI (const XML_Char *string, const XML_Char **tail, int base) {

+    GLint radix = base == 0 ? 10 : base;

+    GLint result = 0;

+    GLint sign = 1;

+    GLboolean numberFound = GL_FALSE;

+    const XML_Char *start = string;

+

+    assert (radix >= 2 && radix <= 36);

+

+    if (*string == '-') {

+	sign = -1;

+	string++;

+    } else if (*string == '+')

+	string++;

+    if (base == 0 && *string == '0') {

+	numberFound = GL_TRUE; 

+	if (*(string+1) == 'x' || *(string+1) == 'X') {

+	    radix = 16;

+	    string += 2;

+	} else {

+	    radix = 8;

+	    string++;

+	}

+    }

+    do {

+	GLint digit = -1;

+	if (radix <= 10) {

+	    if (*string >= '0' && *string < '0' + radix)

+		digit = *string - '0';

+	} else {

+	    if (*string >= '0' && *string <= '9')

+		digit = *string - '0';

+	    else if (*string >= 'a' && *string < 'a' + radix - 10)

+		digit = *string - 'a' + 10;

+	    else if (*string >= 'A' && *string < 'A' + radix - 10)

+		digit = *string - 'A' + 10;

+	}

+	if (digit != -1) {

+	    numberFound = GL_TRUE;

+	    result = radix*result + digit;

+	    string++;

+	} else

+	    break;

+    } while (GL_TRUE);

+    *tail = numberFound ? string : start;

+    return sign * result;

+}

+

+/** \brief Locale-independent floating-point parser.

+ *

+ * Works similar to strtod. Leading space is NOT skipped. The input

+ * number may have an optional sign. '.' is interpreted as decimal

+ * point and may occur at most once. Optionally the number may end in

+ * [eE]<exponent>, where <exponent> is an integer as recognized by

+ * strToI. In that case the result is number * 10^exponent. After

+ * returning tail points to the first character that is not part of

+ * the floating point number. If no number was found then tail points

+ * to the start of the input string.

+ *

+ * Uses two passes for maximum accuracy. */

+static GLfloat strToF (const XML_Char *string, const XML_Char **tail) {

+    GLint nDigits = 0, pointPos, exponent;

+    GLfloat sign = 1.0f, result = 0.0f, scale;

+    const XML_Char *start = string, *numStart;

+

+    /* sign */

+    if (*string == '-') {

+	sign = -1.0f;

+	string++;

+    } else if (*string == '+')

+	string++;

+

+    /* first pass: determine position of decimal point, number of

+     * digits, exponent and the end of the number. */

+    numStart = string;

+    while (*string >= '0' && *string <= '9') {

+	string++;

+	nDigits++;

+    }

+    pointPos = nDigits;

+    if (*string == '.') {

+	string++;

+	while (*string >= '0' && *string <= '9') {

+	    string++;

+	    nDigits++;

+	}

+    }

+    if (nDigits == 0) {

+	/* no digits, no number */

+	*tail = start;

+	return 0.0f;

+    }

+    *tail = string;

+    if (*string == 'e' || *string == 'E') {

+	const XML_Char *expTail;

+	exponent = strToI (string+1, &expTail, 10);

+	if (expTail == string+1)

+	    exponent = 0;

+	else

+	    *tail = expTail;

+    } else

+	exponent = 0;

+    string = numStart;

+

+    /* scale of the first digit */

+    scale = sign * (GLfloat)pow (10.0, (GLdouble)(pointPos-1 + exponent));

+

+    /* second pass: parse digits */

+    do {

+	if (*string != '.') {

+	    assert (*string >= '0' && *string <= '9');

+	    result += scale * (GLfloat)(*string - '0');

+	    scale *= 0.1f;

+	    nDigits--;

+	}

+	string++;

+    } while (nDigits > 0);

+

+    return result;

+}

+

+/** \brief Parse a value of a given type. */

+static GLboolean parseValue (driOptionValue *v, driOptionType type,

+			     const XML_Char *string) {

+    const XML_Char *tail = NULL;

+  /* skip leading white-space */

+    string += strspn (string, " \f\n\r\t\v");

+    switch (type) {

+      case DRI_BOOL:

+	if (!strcmp (string, "false")) {

+	    v->_bool = GL_FALSE;

+	    tail = string + 5;

+	} else if (!strcmp (string, "true")) {

+	    v->_bool = GL_TRUE;

+	    tail = string + 4;

+	}

+	else

+	    return GL_FALSE;

+	break;

+      case DRI_ENUM: /* enum is just a special integer */

+      case DRI_INT:

+	v->_int = strToI (string, &tail, 0);

+	break;

+      case DRI_FLOAT:

+	v->_float = strToF (string, &tail);

+	break;

+    }

+

+    if (tail == string)

+	return GL_FALSE; /* empty string (or containing only white-space) */

+  /* skip trailing white space */

+    if (*tail)

+	tail += strspn (tail, " \f\n\r\t\v");

+    if (*tail)

+	return GL_FALSE; /* something left over that is not part of value */

+

+    return GL_TRUE;

+}

+

+/** \brief Parse a list of ranges of type info->type. */

+static GLboolean parseRanges (driOptionInfo *info, const XML_Char *string) {

+    XML_Char *cp, *range;

+    GLuint nRanges, i;

+    driOptionRange *ranges;

+

+    XSTRDUP (cp, string);

+  /* pass 1: determine the number of ranges (number of commas + 1) */

+    range = cp;

+    for (nRanges = 1; *range; ++range)

+	if (*range == ',')

+	    ++nRanges;

+

+    if ((ranges = MALLOC (nRanges*sizeof(driOptionRange))) == NULL) {

+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);

+	abort();

+    }

+

+  /* pass 2: parse all ranges into preallocated array */

+    range = cp;

+    for (i = 0; i < nRanges; ++i) {

+	XML_Char *end, *sep;

+	assert (range);

+	end = strchr (range, ',');

+	if (end)

+	    *end = '\0';

+	sep = strchr (range, ':');

+	if (sep) { /* non-empty interval */

+	    *sep = '\0';

+	    if (!parseValue (&ranges[i].start, info->type, range) ||

+		!parseValue (&ranges[i].end, info->type, sep+1))

+	        break;

+	    if (info->type == DRI_INT &&

+		ranges[i].start._int > ranges[i].end._int)

+		break;

+	    if (info->type == DRI_FLOAT &&

+		ranges[i].start._float > ranges[i].end._float)

+		break;

+	} else { /* empty interval */

+	    if (!parseValue (&ranges[i].start, info->type, range))

+		break;

+	    ranges[i].end = ranges[i].start;

+	}

+	if (end)

+	    range = end+1;

+	else

+	    range = NULL;

+    }

+    FREE (cp);

+    if (i < nRanges) {

+	FREE (ranges);

+	return GL_FALSE;

+    } else

+	assert (range == NULL);

+

+    info->nRanges = nRanges;

+    info->ranges = ranges;

+    return GL_TRUE;

+}

+

+/** \brief Check if a value is in one of info->ranges. */

+static GLboolean checkValue (const driOptionValue *v, const driOptionInfo *info) {

+    GLuint i;

+    assert (info->type != DRI_BOOL); /* should be caught by the parser */

+    if (info->nRanges == 0)

+	return GL_TRUE;

+    switch (info->type) {

+      case DRI_ENUM: /* enum is just a special integer */

+      case DRI_INT:

+	for (i = 0; i < info->nRanges; ++i)

+	    if (v->_int >= info->ranges[i].start._int &&

+		v->_int <= info->ranges[i].end._int)

+		return GL_TRUE;

+	break;

+      case DRI_FLOAT:

+	for (i = 0; i < info->nRanges; ++i)

+	    if (v->_float >= info->ranges[i].start._float &&

+		v->_float <= info->ranges[i].end._float)

+		return GL_TRUE;

+	break;

+      default:

+	assert (0); /* should never happen */

+    }

+    return GL_FALSE;

+}

+

+/** \brief Output a warning message. */

+#define XML_WARNING1(msg) do {\

+    __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \

+                      (int) XML_GetCurrentLineNumber(data->parser), \

+                      (int) XML_GetCurrentColumnNumber(data->parser)); \

+} while (0)

+#define XML_WARNING(msg,args...) do { \

+    __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \

+                      (int) XML_GetCurrentLineNumber(data->parser), \

+                      (int) XML_GetCurrentColumnNumber(data->parser), \

+                      args); \

+} while (0)

+/** \brief Output an error message. */

+#define XML_ERROR1(msg) do { \

+    __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \

+                      (int) XML_GetCurrentLineNumber(data->parser), \

+                      (int) XML_GetCurrentColumnNumber(data->parser)); \

+} while (0)

+#define XML_ERROR(msg,args...) do { \

+    __driUtilMessage ("Error in %s line %d, column %d: "msg, data->name, \

+                      (int) XML_GetCurrentLineNumber(data->parser), \

+                      (int) XML_GetCurrentColumnNumber(data->parser), \

+                      args); \

+} while (0)

+/** \brief Output a fatal error message and abort. */

+#define XML_FATAL1(msg) do { \

+    fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \

+             data->name, \

+             (int) XML_GetCurrentLineNumber(data->parser),	\

+             (int) XML_GetCurrentColumnNumber(data->parser)); \

+    abort();\

+} while (0)

+#define XML_FATAL(msg,args...) do { \

+    fprintf (stderr, "Fatal error in %s line %d, column %d: "msg"\n", \

+             data->name, \

+             (int) XML_GetCurrentLineNumber(data->parser),	\

+             (int) XML_GetCurrentColumnNumber(data->parser),		\

+             args); \

+    abort();\

+} while (0)

+

+/** \brief Parser context for __driConfigOptions. */

+struct OptInfoData {

+    const char *name;

+    XML_Parser parser;

+    driOptionCache *cache;

+    GLboolean inDriInfo;

+    GLboolean inSection;

+    GLboolean inDesc;

+    GLboolean inOption;

+    GLboolean inEnum;

+    int curOption;

+};

+

+/** \brief Elements in __driConfigOptions. */

+enum OptInfoElem {

+    OI_DESCRIPTION = 0, OI_DRIINFO, OI_ENUM, OI_OPTION, OI_SECTION, OI_COUNT

+};

+static const XML_Char *OptInfoElems[] = {

+    "description", "driinfo", "enum", "option", "section"

+};

+

+/** \brief Parse attributes of an enum element.

+ *

+ * We're not actually interested in the data. Just make sure this is ok

+ * for external configuration tools.

+ */

+static void parseEnumAttr (struct OptInfoData *data, const XML_Char **attr) {

+    GLuint i;

+    const XML_Char *value = NULL, *text = NULL;

+    driOptionValue v;

+    GLuint opt = data->curOption;

+    for (i = 0; attr[i]; i += 2) {

+	if (!strcmp (attr[i], "value")) value = attr[i+1];

+	else if (!strcmp (attr[i], "text")) text = attr[i+1];

+	else XML_FATAL("illegal enum attribute: %s.", attr[i]);

+    }

+    if (!value) XML_FATAL1 ("value attribute missing in enum.");

+    if (!text) XML_FATAL1 ("text attribute missing in enum.");

+     if (!parseValue (&v, data->cache->info[opt].type, value))

+	XML_FATAL ("illegal enum value: %s.", value);

+    if (!checkValue (&v, &data->cache->info[opt]))

+	XML_FATAL ("enum value out of valid range: %s.", value);

+}

+

+/** \brief Parse attributes of a description element.

+ *

+ * We're not actually interested in the data. Just make sure this is ok

+ * for external configuration tools.

+ */

+static void parseDescAttr (struct OptInfoData *data, const XML_Char **attr) {

+    GLuint i;

+    const XML_Char *lang = NULL, *text = NULL;

+    for (i = 0; attr[i]; i += 2) {

+	if (!strcmp (attr[i], "lang")) lang = attr[i+1];

+	else if (!strcmp (attr[i], "text")) text = attr[i+1];

+	else XML_FATAL("illegal description attribute: %s.", attr[i]);

+    }

+    if (!lang) XML_FATAL1 ("lang attribute missing in description.");

+    if (!text) XML_FATAL1 ("text attribute missing in description.");

+}

+

+/** \brief Parse attributes of an option element. */

+static void parseOptInfoAttr (struct OptInfoData *data, const XML_Char **attr) {

+    enum OptAttr {OA_DEFAULT = 0, OA_NAME, OA_TYPE, OA_VALID, OA_COUNT};

+    static const XML_Char *optAttr[] = {"default", "name", "type", "valid"};

+    const XML_Char *attrVal[OA_COUNT] = {NULL, NULL, NULL, NULL};

+    const char *defaultVal;

+    driOptionCache *cache = data->cache;

+    GLuint opt, i;

+    for (i = 0; attr[i]; i += 2) {

+	GLuint attrName = bsearchStr (attr[i], optAttr, OA_COUNT);

+	if (attrName >= OA_COUNT)

+	    XML_FATAL ("illegal option attribute: %s", attr[i]);

+	attrVal[attrName] = attr[i+1];

+    }

+    if (!attrVal[OA_NAME]) XML_FATAL1 ("name attribute missing in option.");

+    if (!attrVal[OA_TYPE]) XML_FATAL1 ("type attribute missing in option.");

+    if (!attrVal[OA_DEFAULT]) XML_FATAL1 ("default attribute missing in option.");

+

+    opt = findOption (cache, attrVal[OA_NAME]);

+    if (cache->info[opt].name)

+	XML_FATAL ("option %s redefined.", attrVal[OA_NAME]);

+    data->curOption = opt;

+

+    XSTRDUP (cache->info[opt].name, attrVal[OA_NAME]);

+

+    if (!strcmp (attrVal[OA_TYPE], "bool"))

+	cache->info[opt].type = DRI_BOOL;

+    else if (!strcmp (attrVal[OA_TYPE], "enum"))

+	cache->info[opt].type = DRI_ENUM;

+    else if (!strcmp (attrVal[OA_TYPE], "int"))

+	cache->info[opt].type = DRI_INT;

+    else if (!strcmp (attrVal[OA_TYPE], "float"))

+	cache->info[opt].type = DRI_FLOAT;

+    else

+	XML_FATAL ("illegal type in option: %s.", attrVal[OA_TYPE]);

+

+    defaultVal = getenv (cache->info[opt].name);

+    if (defaultVal != NULL) {

+      /* don't use XML_WARNING, we want the user to see this! */

+	fprintf (stderr,

+		 "ATTENTION: default value of option %s overridden by environment.\n",

+		 cache->info[opt].name);

+    } else

+	defaultVal = attrVal[OA_DEFAULT];

+    if (!parseValue (&cache->values[opt], cache->info[opt].type, defaultVal))

+	XML_FATAL ("illegal default value: %s.", defaultVal);

+

+    if (attrVal[OA_VALID]) {

+	if (cache->info[opt].type == DRI_BOOL)

+	    XML_FATAL1 ("boolean option with valid attribute.");

+	if (!parseRanges (&cache->info[opt], attrVal[OA_VALID]))

+	    XML_FATAL ("illegal valid attribute: %s.", attrVal[OA_VALID]);

+	if (!checkValue (&cache->values[opt], &cache->info[opt]))

+	    XML_FATAL ("default value out of valid range '%s': %s.",

+		       attrVal[OA_VALID], defaultVal);

+    } else if (cache->info[opt].type == DRI_ENUM) {

+	XML_FATAL1 ("valid attribute missing in option (mandatory for enums).");

+    } else {

+	cache->info[opt].nRanges = 0;

+	cache->info[opt].ranges = NULL;

+    }

+}

+

+/** \brief Handler for start element events. */

+static void optInfoStartElem (void *userData, const XML_Char *name,

+			      const XML_Char **attr) {

+    struct OptInfoData *data = (struct OptInfoData *)userData;

+    enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT);

+    switch (elem) {

+      case OI_DRIINFO:

+	if (data->inDriInfo)

+	    XML_FATAL1 ("nested <driinfo> elements.");

+	if (attr[0])

+	    XML_FATAL1 ("attributes specified on <driinfo> element.");

+	data->inDriInfo = GL_TRUE;

+	break;

+      case OI_SECTION:

+	if (!data->inDriInfo)

+	    XML_FATAL1 ("<section> must be inside <driinfo>.");

+	if (data->inSection)

+	    XML_FATAL1 ("nested <section> elements.");

+	if (attr[0])

+	    XML_FATAL1 ("attributes specified on <section> element.");

+	data->inSection = GL_TRUE;

+	break;

+      case OI_DESCRIPTION:

+	if (!data->inSection && !data->inOption)

+	    XML_FATAL1 ("<description> must be inside <description> or <option.");

+	if (data->inDesc)

+	    XML_FATAL1 ("nested <description> elements.");

+	data->inDesc = GL_TRUE;

+	parseDescAttr (data, attr);

+	break;

+      case OI_OPTION:

+	if (!data->inSection)

+	    XML_FATAL1 ("<option> must be inside <section>.");

+	if (data->inDesc)

+	    XML_FATAL1 ("<option> nested in <description> element.");

+	if (data->inOption)

+	    XML_FATAL1 ("nested <option> elements.");

+	data->inOption = GL_TRUE;

+	parseOptInfoAttr (data, attr);

+	break;

+      case OI_ENUM:

+	if (!(data->inOption && data->inDesc))

+	    XML_FATAL1 ("<enum> must be inside <option> and <description>.");

+	if (data->inEnum)

+	    XML_FATAL1 ("nested <enum> elements.");

+	data->inEnum = GL_TRUE;

+	parseEnumAttr (data, attr);

+	break;

+      default:

+	XML_FATAL ("unknown element: %s.", name);

+    }

+}

+

+/** \brief Handler for end element events. */

+static void optInfoEndElem (void *userData, const XML_Char *name) {

+    struct OptInfoData *data = (struct OptInfoData *)userData;

+    enum OptInfoElem elem = bsearchStr (name, OptInfoElems, OI_COUNT);

+    switch (elem) {

+      case OI_DRIINFO:

+	data->inDriInfo = GL_FALSE;

+	break;

+      case OI_SECTION:

+	data->inSection = GL_FALSE;

+	break;

+      case OI_DESCRIPTION:

+	data->inDesc = GL_FALSE;

+	break;

+      case OI_OPTION:

+	data->inOption = GL_FALSE;

+	break;

+      case OI_ENUM:

+	data->inEnum = GL_FALSE;

+	break;

+      default:

+	assert (0); /* should have been caught by StartElem */

+    }

+}

+

+void driParseOptionInfo (driOptionCache *info,

+			 const char *configOptions, GLuint nConfigOptions) {

+    XML_Parser p;

+    int status;

+    struct OptInfoData userData;

+    struct OptInfoData *data = &userData;

+    GLuint realNoptions;

+

+  /* determine hash table size and allocate memory:

+   * 3/2 of the number of options, rounded up, so there remains always

+   * at least one free entry. This is needed for detecting undefined

+   * options in configuration files without getting a hash table overflow.

+   * Round this up to a power of two. */

+    GLuint minSize = (nConfigOptions*3 + 1) / 2;

+    GLuint size, log2size;

+    for (size = 1, log2size = 0; size < minSize; size <<= 1, ++log2size);

+    info->tableSize = log2size;

+    info->info = CALLOC (size * sizeof (driOptionInfo));

+    info->values = CALLOC (size * sizeof (driOptionValue));

+    if (info->info == NULL || info->values == NULL) {

+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);

+	abort();

+    }

+

+    p = XML_ParserCreate ("UTF-8"); /* always UTF-8 */

+    XML_SetElementHandler (p, optInfoStartElem, optInfoEndElem);

+    XML_SetUserData (p, data);

+

+    userData.name = "__driConfigOptions";

+    userData.parser = p;

+    userData.cache = info;

+    userData.inDriInfo = GL_FALSE;

+    userData.inSection = GL_FALSE;

+    userData.inDesc = GL_FALSE;

+    userData.inOption = GL_FALSE;

+    userData.inEnum = GL_FALSE;

+    userData.curOption = -1;

+

+    status = XML_Parse (p, configOptions, strlen (configOptions), 1);

+    if (!status)

+	XML_FATAL ("%s.", XML_ErrorString(XML_GetErrorCode(p)));

+

+    XML_ParserFree (p);

+

+  /* Check if the actual number of options matches nConfigOptions.

+   * A mismatch is not fatal (a hash table overflow would be) but we

+   * want the driver developer's attention anyway. */

+    realNoptions = countOptions (info);

+    if (realNoptions != nConfigOptions) {

+	fprintf (stderr,

+		 "Error: nConfigOptions (%u) does not match the actual number of options in\n"

+		 "       __driConfigOptions (%u).\n",

+		 nConfigOptions, realNoptions);

+    }

+}

+

+/** \brief Parser context for configuration files. */

+struct OptConfData {

+    const char *name;

+    XML_Parser parser;

+    driOptionCache *cache;

+    GLint screenNum;

+    const char *driverName, *execName;

+    GLuint ignoringDevice;

+    GLuint ignoringApp;

+    GLuint inDriConf;

+    GLuint inDevice;

+    GLuint inApp;

+    GLuint inOption;

+};

+

+/** \brief Elements in configuration files. */

+enum OptConfElem {

+    OC_APPLICATION = 0, OC_DEVICE, OC_DRICONF, OC_OPTION, OC_COUNT

+};

+static const XML_Char *OptConfElems[] = {

+    "application", "device", "driconf", "option"

+};

+

+/** \brief Parse attributes of a device element. */

+static void parseDeviceAttr (struct OptConfData *data, const XML_Char **attr) {

+    GLuint i;

+    const XML_Char *driver = NULL, *screen = NULL;

+    for (i = 0; attr[i]; i += 2) {

+	if (!strcmp (attr[i], "driver")) driver = attr[i+1];

+	else if (!strcmp (attr[i], "screen")) screen = attr[i+1];

+	else XML_WARNING("unknown device attribute: %s.", attr[i]);

+    }

+    if (driver && strcmp (driver, data->driverName))

+	data->ignoringDevice = data->inDevice;

+    else if (screen) {

+	driOptionValue screenNum;

+	if (!parseValue (&screenNum, DRI_INT, screen))

+	    XML_WARNING("illegal screen number: %s.", screen);

+	else if (screenNum._int != data->screenNum)

+	    data->ignoringDevice = data->inDevice;

+    }

+}

+

+/** \brief Parse attributes of an application element. */

+static void parseAppAttr (struct OptConfData *data, const XML_Char **attr) {

+    GLuint i;

+    const XML_Char *name = NULL, *exec = NULL;

+    for (i = 0; attr[i]; i += 2) {

+	if (!strcmp (attr[i], "name")) name = attr[i+1];

+	else if (!strcmp (attr[i], "executable")) exec = attr[i+1];

+	else XML_WARNING("unknown application attribute: %s.", attr[i]);

+    }

+    if (exec && strcmp (exec, data->execName))

+	data->ignoringApp = data->inApp;

+}

+

+/** \brief Parse attributes of an option element. */

+static void parseOptConfAttr (struct OptConfData *data, const XML_Char **attr) {

+    GLuint i;

+    const XML_Char *name = NULL, *value = NULL;

+    for (i = 0; attr[i]; i += 2) {

+	if (!strcmp (attr[i], "name")) name = attr[i+1];

+	else if (!strcmp (attr[i], "value")) value = attr[i+1];

+	else XML_WARNING("unknown option attribute: %s.", attr[i]);

+    }

+    if (!name) XML_WARNING1 ("name attribute missing in option.");

+    if (!value) XML_WARNING1 ("value attribute missing in option.");

+    if (name && value) {

+	driOptionCache *cache = data->cache;

+	GLuint opt = findOption (cache, name);

+	if (cache->info[opt].name == NULL)

+	    XML_WARNING ("undefined option: %s.", name);

+	else if (getenv (cache->info[opt].name))

+	  /* don't use XML_WARNING, we want the user to see this! */

+	    fprintf (stderr, "ATTENTION: option value of option %s ignored.\n",

+		     cache->info[opt].name);

+	else if (!parseValue (&cache->values[opt], cache->info[opt].type, value))

+	    XML_WARNING ("illegal option value: %s.", value);

+    }

+}

+

+/** \brief Handler for start element events. */

+static void optConfStartElem (void *userData, const XML_Char *name,

+			      const XML_Char **attr) {

+    struct OptConfData *data = (struct OptConfData *)userData;

+    enum OptConfElem elem = bsearchStr (name, OptConfElems, OC_COUNT);

+    switch (elem) {

+      case OC_DRICONF:

+	if (data->inDriConf)

+	    XML_WARNING1 ("nested <driconf> elements.");

+	if (attr[0])

+	    XML_WARNING1 ("attributes specified on <driconf> element.");

+	data->inDriConf++;

+	break;

+      case OC_DEVICE:

+	if (!data->inDriConf)

+	    XML_WARNING1 ("<device> should be inside <driconf>.");

+	if (data->inDevice)

+	    XML_WARNING1 ("nested <device> elements.");

+	data->inDevice++;

+	if (!data->ignoringDevice && !data->ignoringApp)

+	    parseDeviceAttr (data, attr);

+	break;

+      case OC_APPLICATION:

+	if (!data->inDevice)

+	    XML_WARNING1 ("<application> should be inside <device>.");

+	if (data->inApp)

+	    XML_WARNING1 ("nested <application> elements.");

+	data->inApp++;

+	if (!data->ignoringDevice && !data->ignoringApp)

+	    parseAppAttr (data, attr);

+	break;

+      case OC_OPTION:

+	if (!data->inApp)

+	    XML_WARNING1 ("<option> should be inside <application>.");

+	if (data->inOption)

+	    XML_WARNING1 ("nested <option> elements.");

+	data->inOption++;

+	if (!data->ignoringDevice && !data->ignoringApp)

+	    parseOptConfAttr (data, attr);

+	break;

+      default:

+	XML_WARNING ("unknown element: %s.", name);

+    }

+}

+

+/** \brief Handler for end element events. */

+static void optConfEndElem (void *userData, const XML_Char *name) {

+    struct OptConfData *data = (struct OptConfData *)userData;

+    enum OptConfElem elem = bsearchStr (name, OptConfElems, OC_COUNT);

+    switch (elem) {

+      case OC_DRICONF:

+	data->inDriConf--;

+	break;

+      case OC_DEVICE:

+	if (data->inDevice-- == data->ignoringDevice)

+	    data->ignoringDevice = 0;

+	break;

+      case OC_APPLICATION:

+	if (data->inApp-- == data->ignoringApp)

+	    data->ignoringApp = 0;

+	break;

+      case OC_OPTION:

+	data->inOption--;

+	break;

+      default:

+	/* unknown element, warning was produced on start tag */;

+    }

+}

+

+/** \brief Initialize an option cache based on info */

+static void initOptionCache (driOptionCache *cache, const driOptionCache *info) {

+    cache->info = info->info;

+    cache->tableSize = info->tableSize;

+    cache->values = MALLOC ((1<<info->tableSize) * sizeof (driOptionValue));

+    if (cache->values == NULL) {

+	fprintf (stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);

+	abort();

+    }

+    memcpy (cache->values, info->values,

+	    (1<<info->tableSize) * sizeof (driOptionValue));

+}

+

+/** \brief Parse the named configuration file */

+static void parseOneConfigFile (XML_Parser p) {

+#define BUF_SIZE 0x1000

+    struct OptConfData *data = (struct OptConfData *)XML_GetUserData (p);

+    int status;

+    int fd;

+

+    if ((fd = open (data->name, O_RDONLY)) == -1) {

+	__driUtilMessage ("Can't open configuration file %s: %s.",

+			  data->name, strerror (errno));

+	return;

+    }

+

+    while (1) {

+	int bytesRead;

+	void *buffer = XML_GetBuffer (p, BUF_SIZE);

+	if (!buffer) {

+	    __driUtilMessage ("Can't allocate parser buffer.");

+	    break;

+	}

+	bytesRead = read (fd, buffer, BUF_SIZE);

+	if (bytesRead == -1) {

+	    __driUtilMessage ("Error reading from configuration file %s: %s.",

+			      data->name, strerror (errno));

+	    break;

+	}

+	status = XML_ParseBuffer (p, bytesRead, bytesRead == 0);

+	if (!status) {

+	    XML_ERROR ("%s.", XML_ErrorString(XML_GetErrorCode(p)));

+	    break;

+	}

+	if (bytesRead == 0)

+	    break;

+    }

+

+    close (fd);

+#undef BUF_SIZE

+}

+

+void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info,

+			  GLint screenNum, const char *driverName) {

+    char *filenames[2] = {"/etc/drirc", NULL};

+    char *home;

+    GLuint i;

+    struct OptConfData userData;

+

+    initOptionCache (cache, info);

+

+    userData.cache = cache;

+    userData.screenNum = screenNum;

+    userData.driverName = driverName;

+    userData.execName = GET_PROGRAM_NAME();

+

+    if ((home = getenv ("HOME"))) {

+	GLuint len = strlen (home);

+	filenames[1] = MALLOC (len + 7+1);

+	if (filenames[1] == NULL)

+	    __driUtilMessage ("Can't allocate memory for %s/.drirc.", home);

+	else {

+	    memcpy (filenames[1], home, len);

+	    memcpy (filenames[1] + len, "/.drirc", 7+1);

+	}

+    }

+

+    for (i = 0; i < 2; ++i) {

+	XML_Parser p;

+	if (filenames[i] == NULL)

+	    continue;

+

+	p = XML_ParserCreate (NULL); /* use encoding specified by file */

+	XML_SetElementHandler (p, optConfStartElem, optConfEndElem);

+	XML_SetUserData (p, &userData);

+	userData.parser = p;

+	userData.name = filenames[i];

+	userData.ignoringDevice = 0;

+	userData.ignoringApp = 0;

+	userData.inDriConf = 0;

+	userData.inDevice = 0;

+	userData.inApp = 0;

+	userData.inOption = 0;

+

+	parseOneConfigFile (p);

+	XML_ParserFree (p);

+    }

+

+    if (filenames[1])

+	FREE (filenames[1]);

+}

+

+void driDestroyOptionInfo (driOptionCache *info) {

+    driDestroyOptionCache (info);

+    if (info->info) {

+	GLuint i, size = 1 << info->tableSize;

+	for (i = 0; i < size; ++i) {

+	    if (info->info[i].name) {

+		FREE (info->info[i].name);

+		if (info->info[i].ranges)

+		    FREE (info->info[i].ranges);

+	    }

+	}

+	FREE (info->info);

+    }

+}

+

+void driDestroyOptionCache (driOptionCache *cache) {

+    if (cache->values)

+	FREE (cache->values);

+}

+

+GLboolean driCheckOption (const driOptionCache *cache, const char *name,

+			  driOptionType type) {

+    GLuint i = findOption (cache, name);

+    return cache->info[i].name != NULL && cache->info[i].type == type;

+}

+

+GLboolean driQueryOptionb (const driOptionCache *cache, const char *name) {

+    GLuint i = findOption (cache, name);

+  /* make sure the option is defined and has the correct type */

+    assert (cache->info[i].name != NULL);

+    assert (cache->info[i].type == DRI_BOOL);

+    return cache->values[i]._bool;

+}

+

+GLint driQueryOptioni (const driOptionCache *cache, const char *name) {

+    GLuint i = findOption (cache, name);

+  /* make sure the option is defined and has the correct type */

+    assert (cache->info[i].name != NULL);

+    assert (cache->info[i].type == DRI_INT || cache->info[i].type == DRI_ENUM);

+    return cache->values[i]._int;

+}

+

+GLfloat driQueryOptionf (const driOptionCache *cache, const char *name) {

+    GLuint i = findOption (cache, name);

+  /* make sure the option is defined and has the correct type */

+    assert (cache->info[i].name != NULL);

+    assert (cache->info[i].type == DRI_FLOAT);

+    return cache->values[i]._float;

+}

diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile b/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile
index 62ec919ea..ae3d89938 100644
--- a/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile
+++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/Makefile
@@ -1,96 +1,96 @@
-# Convenient makefile for managing translations.
-
-# Prerequisites:
-# - GNU gettext
-# - Python
-
-# Adding new translations
-# -----------------------
-
-# To start working on a new translation edit the POS=... line
-# below. If you want to add for example a french translation, add
-# fr.po.
-
-# Then run "make po" to generate a fresh .po file from translatable
-# strings in t_options.h. Now you can edit the new .po file (fr.po in
-# the example above) to translate the strings. Please make sure that
-# your editor encodes the file in UTF-8.
-
-# Updating existing translations
-# ------------------------------
-
-# Run "make po" to update .po files with new translatable strings from
-# t_options.h. Now you can edit the .po files you're interested
-# in. Please make sure that your editor encodes the file in UTF-8.
-
-# Updating options.h
-# ------------------
-
-# Finally run "make" to generate options.h from t_options.h with all
-# translations. Now you can rebuild the drivers. Any common options
-# used by the drivers will have option descriptions with the latest
-# translations.
-
-# Publishing translations
-# -----------------------
-
-# To get your translation(s) into Mesa CVS, please send me your
-# <lang>.po file.
-
-# More information:
-# - info gettext
-
-# The set of supported languages. Add languages as needed.
-POS=de.po es.po nl.po fr.po sv.po
-
-#
-# Don't change anything below, unless you know what you're doing.
-#
-LANGS=$(POS:%.po=%)
-MOS=$(POS:%.po=%/LC_MESSAGES/options.mo)
-POT=xmlpool.pot
-
-.PHONY: all clean pot po mo
-
-all: options.h
-
-# Only intermediate files are cleaned up. options.h is not deleted because
-# it's in CVS. 
-clean:
-	-rm -f $(POT) *~
-	-rm -rf $(LANGS)
-
-# Default target options.h
-options.h: t_options.h mo
-	python gen_xmlpool.py $(LANGS) > options.h
-
-# Update .mo files from the corresponding .po files.
-mo:
-	@for mo in $(MOS); do \
-		lang=$${mo%%/*}; \
-		echo "Updating $$mo from $$lang.po."; \
-		mkdir -p $${mo%/*}; \
-		msgfmt -o $$mo $$lang.po; \
-	done
-
-# Use this target to create or update .po files with new messages in
-# driconf.py.
-po: $(POS)
-
-pot: $(POT)
-
-# Extract message catalog from driconf.py.
-$(POT): t_options.h
-	xgettext -L C --from-code utf-8 -o $(POT) t_options.h
-
-# Create or update a .po file for a specific language.
-%.po: $(POT)
-	@if [ -f $@ ]; then \
-		echo "Merging new strings from $(POT) into $@."; \
-		mv $@ $@~; \
-		msgmerge -o $@ $@~ $(POT); \
-	else \
-		echo "Initializing $@ from $(POT)."; \
-		msginit -i $(POT) -o $@~ --locale=$*; \
-		sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $@~ > $@; \
-	fi
+# Convenient makefile for managing translations.

+

+# Prerequisites:

+# - GNU gettext

+# - Python

+

+# Adding new translations

+# -----------------------

+

+# To start working on a new translation edit the POS=... line

+# below. If you want to add for example a french translation, add

+# fr.po.

+

+# Then run "make po" to generate a fresh .po file from translatable

+# strings in t_options.h. Now you can edit the new .po file (fr.po in

+# the example above) to translate the strings. Please make sure that

+# your editor encodes the file in UTF-8.

+

+# Updating existing translations

+# ------------------------------

+

+# Run "make po" to update .po files with new translatable strings from

+# t_options.h. Now you can edit the .po files you're interested

+# in. Please make sure that your editor encodes the file in UTF-8.

+

+# Updating options.h

+# ------------------

+

+# Finally run "make" to generate options.h from t_options.h with all

+# translations. Now you can rebuild the drivers. Any common options

+# used by the drivers will have option descriptions with the latest

+# translations.

+

+# Publishing translations

+# -----------------------

+

+# To get your translation(s) into Mesa CVS, please send me your

+# <lang>.po file.

+

+# More information:

+# - info gettext

+

+# The set of supported languages. Add languages as needed.

+POS=de.po es.po nl.po fr.po sv.po

+

+#

+# Don't change anything below, unless you know what you're doing.

+#

+LANGS=$(POS:%.po=%)

+MOS=$(POS:%.po=%/LC_MESSAGES/options.mo)

+POT=xmlpool.pot

+

+.PHONY: all clean pot po mo

+

+all: options.h

+

+# Only intermediate files are cleaned up. options.h is not deleted because

+# it's in CVS. 

+clean:

+	-rm -f $(POT) *~

+	-rm -rf $(LANGS)

+

+# Default target options.h

+options.h: t_options.h mo

+	$(PYTHON2) $(PYTHON_FLAGS) gen_xmlpool.py $(LANGS) > options.h

+

+# Update .mo files from the corresponding .po files.

+mo:

+	@for mo in $(MOS); do \

+		lang=$${mo%%/*}; \

+		echo "Updating $$mo from $$lang.po."; \

+		mkdir -p $${mo%/*}; \

+		msgfmt -o $$mo $$lang.po; \

+	done

+

+# Use this target to create or update .po files with new messages in

+# driconf.py.

+po: $(POS)

+

+pot: $(POT)

+

+# Extract message catalog from driconf.py.

+$(POT): t_options.h

+	xgettext -L C --from-code utf-8 -o $(POT) t_options.h

+

+# Create or update a .po file for a specific language.

+%.po: $(POT)

+	@if [ -f $@ ]; then \

+		echo "Merging new strings from $(POT) into $@."; \

+		mv $@ $@~; \

+		msgmerge -o $@ $@~ $(POT); \

+	else \

+		echo "Initializing $@ from $(POT)."; \

+		msginit -i $(POT) -o $@~ --locale=$*; \

+		sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $@~ > $@; \

+	fi

diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py b/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
new file mode 100644
index 000000000..f5ac5e25b
--- /dev/null
+++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
@@ -0,0 +1,191 @@
+#!/usr/bin/python

+

+import sys

+import gettext

+import re

+

+# List of supported languages

+languages = sys.argv[1:]

+

+# Escape special characters in C strings

+def escapeCString (s):

+    escapeSeqs = {'\a' : '\\a', '\b' : '\\b', '\f' : '\\f', '\n' : '\\n',

+                  '\r' : '\\r', '\t' : '\\t', '\v' : '\\v', '\\' : '\\\\'}

+    # " -> '' is a hack. Quotes (") aren't possible in XML attributes.

+    # Better use Unicode characters for typographic quotes in option

+    # descriptions and translations.

+    i = 0

+    r = ''

+    while i < len(s):

+        # Special case: escape double quote with \u201c or \u201d, depending

+        # on whether it's an open or close quote. This is needed because plain

+        # double quotes are not possible in XML attributes.

+        if s[i] == '"':

+            if i == len(s)-1 or s[i+1].isspace():

+                # close quote

+                q = u'\u201c'

+            else:

+                # open quote

+                q = u'\u201d'

+            r = r + q

+        elif escapeSeqs.has_key(s[i]):

+            r = r + escapeSeqs[s[i]]

+        else:

+            r = r + s[i]

+        i = i + 1

+    return r

+

+# Expand escape sequences in C strings (needed for gettext lookup)

+def expandCString (s):

+    escapeSeqs = {'a' : '\a', 'b' : '\b', 'f' : '\f', 'n' : '\n',

+                  'r' : '\r', 't' : '\t', 'v' : '\v',

+                  '"' : '"', '\\' : '\\'}

+    i = 0

+    escape = False

+    hexa = False

+    octa = False

+    num = 0

+    digits = 0

+    r = ''

+    while i < len(s):

+        if not escape:

+            if s[i] == '\\':

+                escape = True

+            else:

+                r = r + s[i]

+        elif hexa:

+            if (s[i] >= '0' and s[i] <= '9') or \

+               (s[i] >= 'a' and s[i] <= 'f') or \

+               (s[i] >= 'A' and s[i] <= 'F'):

+                num = num * 16 + int(s[i],16)

+                digits = digits + 1

+            else:

+                digits = 2

+            if digits >= 2:

+                hexa = False

+                escape = False

+                r = r + chr(num)

+        elif octa:

+            if s[i] >= '0' and s[i] <= '7':

+                num = num * 8 + int(s[i],8)

+                digits = digits + 1

+            else:

+                digits = 3

+            if digits >= 3:

+                octa = False

+                escape = False

+                r = r + chr(num)

+        else:

+            if escapeSeqs.has_key(s[i]):

+                r = r + escapeSeqs[s[i]]

+                escape = False

+            elif s[i] >= '0' and s[i] <= '7':

+                octa = True

+                num = int(s[i],8)

+                if num <= 3:

+                    digits = 1

+                else:

+                    digits = 2

+            elif s[i] == 'x' or s[i] == 'X':

+                hexa = True

+                num = 0

+                digits = 0

+            else:

+                r = r + s[i]

+                escape = False

+        i = i + 1

+    return r

+

+# Expand matches. The first match is always a DESC or DESC_BEGIN match.

+# Subsequent matches are ENUM matches.

+#

+# DESC, DESC_BEGIN format: \1 \2=<lang> \3 \4=gettext(" \5=<text> \6=") \7

+# ENUM format:             \1 \2=gettext(" \3=<text> \4=") \5

+def expandMatches (matches, translations, end=None):

+    assert len(matches) > 0

+    nTranslations = len(translations)

+    i = 0

+    # Expand the description+enums for all translations

+    for lang,trans in translations:

+        i = i + 1

+        # Make sure that all but the last line of a simple description

+        # are extended with a backslash.

+        suffix = ''

+        if len(matches) == 1 and i < len(translations) and \

+               not matches[0].expand (r'\7').endswith('\\'):

+            suffix = ' \\'

+        # Expand the description line. Need to use ugettext in order to allow

+        # non-ascii unicode chars in the original English descriptions.

+        text = escapeCString (trans.ugettext (unicode (expandCString (

+            matches[0].expand (r'\5')), "utf-8"))).encode("utf-8")

+        print matches[0].expand (r'\1' + lang + r'\3"' + text + r'"\7') + suffix

+        # Expand any subsequent enum lines

+        for match in matches[1:]:

+            text = escapeCString (trans.ugettext (unicode (expandCString (

+                match.expand (r'\3')), "utf-8"))).encode("utf-8")

+            print match.expand (r'\1"' + text + r'"\5')

+

+        # Expand description end

+        if end:

+            print end,

+

+# Compile a list of translation classes to all supported languages.

+# The first translation is always a NullTranslations.

+translations = [("en", gettext.NullTranslations())]

+for lang in languages:

+    try:

+        trans = gettext.translation ("options", ".", [lang])

+    except IOError:

+        sys.stderr.write ("Warning: language '%s' not found.\n" % lang)

+        continue

+    translations.append ((lang, trans))

+

+# Regular expressions:

+reLibintl_h  = re.compile (r'#\s*include\s*<libintl.h>')

+reDESC       = re.compile (r'(\s*DRI_CONF_DESC\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')

+reDESC_BEGIN = re.compile (r'(\s*DRI_CONF_DESC_BEGIN\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')

+reENUM       = re.compile (r'(\s*DRI_CONF_ENUM\s*\([^,]+,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')

+reDESC_END   = re.compile (r'\s*DRI_CONF_DESC_END')

+

+# Print a header

+print \

+"/***********************************************************************\n" \

+" ***        THIS FILE IS GENERATED AUTOMATICALLY. DON'T EDIT!        ***\n" \

+" ***********************************************************************/"

+

+# Process the options template and generate options.h with all

+# translations.

+template = file ("t_options.h", "r")

+descMatches = []

+for line in template:

+    if len(descMatches) > 0:

+        matchENUM     = reENUM    .match (line)

+        matchDESC_END = reDESC_END.match (line)

+        if matchENUM:

+            descMatches.append (matchENUM)

+        elif matchDESC_END:

+            expandMatches (descMatches, translations, line)

+            descMatches = []

+        else:

+            sys.stderr.write (

+                "Warning: unexpected line inside description dropped:\n%s\n" \

+                % line)

+        continue

+    if reLibintl_h.search (line):

+        # Ignore (comment out) #include <libintl.h>

+        print "/* %s * commented out by gen_xmlpool.py */" % line

+        continue

+    matchDESC       = reDESC      .match (line)

+    matchDESC_BEGIN = reDESC_BEGIN.match (line)

+    if matchDESC:

+        assert len(descMatches) == 0

+        expandMatches ([matchDESC], translations)

+    elif matchDESC_BEGIN:

+        assert len(descMatches) == 0

+        descMatches = [matchDESC_BEGIN]

+    else:

+        print line,

+

+if len(descMatches) > 0:

+    sys.stderr.write ("Warning: unterminated description at end of file.\n")

+    expandMatches (descMatches, translations)

diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index ff53ffd0d..3ac32b1b4 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -1,741 +1,739 @@
-/*
- * 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/texfetch.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;
-
-    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);
-
-    _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
-			       w, h, 1, 0, internalFormat);
-
-    if (texture_format == __DRI_TEXTURE_FORMAT_RGB)
-	texImage->TexFormat = MESA_FORMAT_XRGB8888;
-    else
-	texImage->TexFormat = MESA_FORMAT_ARGB8888;
-
-    _mesa_set_fetch_functions(texImage, 2);
-
-    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 GLvisual *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(GLcontext *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(GLcontext *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 GLvisual *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 __GLcontextModes * visual, GLboolean isPixmap)
-{
-    struct dri_drawable *drawable = NULL;
-    GLframebuffer *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);
-	GLframebuffer *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);
-    GLframebuffer *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( GLframebuffer *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( GLcontext *ctx, GLframebuffer *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(GLcontext *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( GLcontext *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(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
-{
-    GLframebuffer *draw = ctx->WinSysDrawBuffer;
-    GLframebuffer *read = ctx->WinSysReadBuffer;
-
-    swrast_check_and_update_window_size(ctx, draw);
-    swrast_check_and_update_window_size(ctx, read);
-}
-
-static gl_format swrastChooseTextureFormat(GLcontext * 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;
-}
-
-
-/**
- * Context-related functions.
- */
-
-static GLboolean
-dri_create_context(gl_api api,
-		   const __GLcontextModes * visual,
-		   __DRIcontext * cPriv, void *sharedContextPrivate)
-{
-    struct dri_context *ctx = NULL;
-    struct dri_context *share = (struct dri_context *)sharedContextPrivate;
-    GLcontext *mesaCtx = NULL;
-    GLcontext *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, 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_enable_sw_extensions(mesaCtx);
-    _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);
-
-    _mesa_meta_init(mesaCtx);
-
-    driInitExtensions( mesaCtx, NULL, GL_FALSE );
-
-    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);
-	GLcontext *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)
-{
-    GLcontext *mesaCtx;
-    GLframebuffer *mesaDraw;
-    GLframebuffer *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.

+ */

+

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

+}

+

+

+/**

+ * 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, 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_enable_sw_extensions(mesaCtx);

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

+

+    _mesa_meta_init(mesaCtx);

+

+    driInitExtensions( mesaCtx, NULL, GL_FALSE );

+

+    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 6679061a9..4c3c9830f 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -1,138 +1,138 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * 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.
- */
-
-
-#ifndef _SWRAST_PRIV_H
-#define _SWRAST_PRIV_H
-
-#include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
-#include "main/mtypes.h"
-#include "drisw_util.h"
-
-
-/**
- * Debugging
- */
-#define DEBUG_CORE	0
-#define DEBUG_SPAN	0
-
-#if DEBUG_CORE
-#define TRACE printf("--> %s\n", __FUNCTION__)
-#else
-#define TRACE
-#endif
-
-#if DEBUG_SPAN
-#define TRACE_SPAN printf("--> %s\n", __FUNCTION__)
-#else
-#define TRACE_SPAN
-#endif
-
-
-/**
- * Data types
- */
-struct dri_context
-{
-    /* mesa, base class, must be first */
-    GLcontext Base;
-
-    /* dri */
-    __DRIcontext *cPriv;
-};
-
-static INLINE struct dri_context *
-dri_context(__DRIcontext * driContextPriv)
-{
-    return (struct dri_context *)driContextPriv->driverPrivate;
-}
-
-static INLINE struct dri_context *
-swrast_context(GLcontext *ctx)
-{
-    return (struct dri_context *) ctx;
-}
-
-struct dri_drawable
-{
-    /* mesa, base class, must be first */
-    GLframebuffer Base;
-
-    /* dri */
-    __DRIdrawable *dPriv;
-
-    /* scratch row for optimized front-buffer rendering */
-    char *row;
-};
-
-static INLINE struct dri_drawable *
-dri_drawable(__DRIdrawable * driDrawPriv)
-{
-    return (struct dri_drawable *)driDrawPriv->driverPrivate;
-}
-
-static INLINE struct dri_drawable *
-swrast_drawable(GLframebuffer *fb)
-{
-    return (struct dri_drawable *) fb;
-}
-
-struct swrast_renderbuffer {
-    struct gl_renderbuffer Base;
-
-    /* renderbuffer pitch (in bytes) */
-    GLuint pitch;
-   /* bits per pixel of storage */
-    GLuint bpp;
-};
-
-static INLINE struct swrast_renderbuffer *
-swrast_renderbuffer(struct gl_renderbuffer *rb)
-{
-    return (struct swrast_renderbuffer *) rb;
-}
-
-
-/**
- * Pixel formats we support
- */
-#define PF_A8R8G8B8   1		/**< 32bpp TrueColor:  8-A, 8-R, 8-G, 8-B bits */
-#define PF_R5G6B5     2		/**< 16bpp TrueColor:  5-R, 6-G, 5-B bits */
-#define PF_R3G3B2     3		/**<  8bpp TrueColor:  3-R, 3-G, 2-B bits */
-#define PF_X8R8G8B8   4		/**< 32bpp TrueColor:  8-R, 8-G, 8-B bits */
-
-
-/* swrast_span.c */
-
-extern void
-swrast_set_span_funcs_back(struct swrast_renderbuffer *xrb,
-			   GLuint pixel_format);
-
-extern void
-swrast_set_span_funcs_front(struct swrast_renderbuffer *xrb,
-			    GLuint pixel_format);
-
-#endif /* _SWRAST_PRIV_H_ */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

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

+ */

+

+

+#ifndef _SWRAST_PRIV_H

+#define _SWRAST_PRIV_H

+

+#include <GL/gl.h>

+#include <GL/internal/dri_interface.h>

+#include "main/mtypes.h"

+#include "drisw_util.h"

+

+

+/**

+ * Debugging

+ */

+#define DEBUG_CORE	0

+#define DEBUG_SPAN	0

+

+#if DEBUG_CORE

+#define TRACE printf("--> %s\n", __FUNCTION__)

+#else

+#define TRACE

+#endif

+

+#if DEBUG_SPAN

+#define TRACE_SPAN printf("--> %s\n", __FUNCTION__)

+#else

+#define TRACE_SPAN

+#endif

+

+

+/**

+ * Data types

+ */

+struct dri_context

+{

+    /* mesa, base class, must be first */

+    struct gl_context Base;

+

+    /* dri */

+    __DRIcontext *cPriv;

+};

+

+static INLINE struct dri_context *

+dri_context(__DRIcontext * driContextPriv)

+{

+    return (struct dri_context *)driContextPriv->driverPrivate;

+}

+

+static INLINE struct dri_context *

+swrast_context(struct gl_context *ctx)

+{

+    return (struct dri_context *) ctx;

+}

+

+struct dri_drawable

+{

+    /* mesa, base class, must be first */

+    struct gl_framebuffer Base;

+

+    /* dri */

+    __DRIdrawable *dPriv;

+

+    /* scratch row for optimized front-buffer rendering */

+    char *row;

+};

+

+static INLINE struct dri_drawable *

+dri_drawable(__DRIdrawable * driDrawPriv)

+{

+    return (struct dri_drawable *)driDrawPriv->driverPrivate;

+}

+

+static INLINE struct dri_drawable *

+swrast_drawable(struct gl_framebuffer *fb)

+{

+    return (struct dri_drawable *) fb;

+}

+

+struct swrast_renderbuffer {

+    struct gl_renderbuffer Base;

+

+    /* renderbuffer pitch (in bytes) */

+    GLuint pitch;

+   /* bits per pixel of storage */

+    GLuint bpp;

+};

+

+static INLINE struct swrast_renderbuffer *

+swrast_renderbuffer(struct gl_renderbuffer *rb)

+{

+    return (struct swrast_renderbuffer *) rb;

+}

+

+

+/**

+ * Pixel formats we support

+ */

+#define PF_A8R8G8B8   1		/**< 32bpp TrueColor:  8-A, 8-R, 8-G, 8-B bits */

+#define PF_R5G6B5     2		/**< 16bpp TrueColor:  5-R, 6-G, 5-B bits */

+#define PF_R3G3B2     3		/**<  8bpp TrueColor:  3-R, 3-G, 2-B bits */

+#define PF_X8R8G8B8   4		/**< 32bpp TrueColor:  8-R, 8-G, 8-B bits */

+

+

+/* swrast_span.c */

+

+extern void

+swrast_set_span_funcs_back(struct swrast_renderbuffer *xrb,

+			   GLuint pixel_format);

+

+extern void

+swrast_set_span_funcs_front(struct swrast_renderbuffer *xrb,

+			    GLuint pixel_format);

+

+#endif /* _SWRAST_PRIV_H_ */

diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
index 1e9405eeb..0d2703ca5 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_spantemp.h
@@ -1,319 +1,319 @@
-/*
- * 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.
- */
-
-
-/*
- * Modified version of swrast/s_spantemp.h for front-buffer rendering. The
- * no-mask paths use a scratch row to avoid repeated calls to the loader.
- *
- * For the mask paths we always use an array of 4 elements of RB_TYPE. This is
- * to satisfy the xorg loader requirement of an image pitch of 32 bits and
- * should be ok for other loaders also.
- */
-
-
-#ifndef _SWRAST_SPANTEMP_ONCE
-#define _SWRAST_SPANTEMP_ONCE
-
-static INLINE void
-PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLvoid *p )
-{
-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
-    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
-
-    __DRIscreen *screen = ctx->driScreenPriv;
-
-    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,
-				    x, y, 1, 1, (char *)p,
-				    draw->loaderPrivate);
-}
-
-
-static INLINE void
-GET_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
-{
-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
-    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;
-
-    __DRIscreen *screen = ctx->driScreenPriv;
-
-    screen->swrast_loader->getImage(read, x, y, 1, 1, (char *)p,
-				    read->loaderPrivate);
-}
-
-static INLINE void
-PUT_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
-{
-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
-    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
-
-    __DRIscreen *screen = ctx->driScreenPriv;
-
-    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,
-				    x, y, n, 1, row,
-				    draw->loaderPrivate);
-}
-
-static INLINE void
-GET_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
-{
-    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
-    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;
-
-    __DRIscreen *screen = ctx->driScreenPriv;
-
-    screen->swrast_loader->getImage(read, x, y, n, 1, row,
-				    read->loaderPrivate);
-}
-
-#endif /* _SWRAST_SPANTEMP_ONCE */
-
-
-/*
- * Templates for the span/pixel-array write/read functions called via
- * the gl_renderbuffer's GetRow, GetValues, PutRow, PutMonoRow, PutValues
- * and PutMonoValues functions.
- *
- * Define the following macros before including this file:
- *   NAME(BASE)  to generate the function name (i.e. add prefix or suffix)
- *   RB_TYPE  the renderbuffer DataType
- *   SPAN_VARS  to declare any local variables
- *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel
- *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel
- *   STORE_PIXEL(DST, X, Y, VALUE)  to store pixel values in buffer
- *   FETCH_PIXEL(DST, SRC)  to fetch pixel values from buffer
- *
- * Note that in the STORE_PIXEL macros, we also pass in the (X,Y) coordinates
- * for the pixels to be stored.  This is useful when dithering and probably
- * ignored otherwise.
- */
-
-#include "main/macros.h"
-
-
-#if !defined(RB_COMPONENTS)
-#define RB_COMPONENTS 4
-#endif
-
-
-static void
-NAME(get_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
-               GLuint count, GLint x, GLint y, void *values )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   char *row = swrast_drawable(ctx->ReadBuffer)->row;
-   INIT_PIXEL_PTR(pixel, x, y);
-   GET_ROW( ctx, x, YFLIP(xrb, y), count, row );
-   for (i = 0; i < count; i++) {
-      FETCH_PIXEL(dest[i], pixel);
-      INC_PIXEL_PTR(pixel);
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(get_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                  GLuint count, const GLint x[], const GLint y[], void *values )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   for (i = 0; i < count; i++) {
-      RB_TYPE pixel[4];
-      GET_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
-      FETCH_PIXEL(dest[i], pixel);
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
-               GLuint count, GLint x, GLint y,
-               const void *values, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   if (mask) {
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            RB_TYPE row[4];
-            INIT_PIXEL_PTR(pixel, x, y);
-            STORE_PIXEL(pixel, x + i, y, src[i]);
-            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
-         }
-      }
-   }
-   else {
-      char *row = swrast_drawable(ctx->DrawBuffer)->row;
-      INIT_PIXEL_PTR(pixel, x, y);
-      for (i = 0; i < count; i++) {
-         STORE_PIXEL(pixel, x + i, y, src[i]);
-         INC_PIXEL_PTR(pixel);
-      }
-      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_row_rgb)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                   GLuint count, GLint x, GLint y,
-                   const void *values, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE (*src)[3] = (const RB_TYPE (*)[3]) values;
-   GLuint i;
-   if (mask) {
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            RB_TYPE row[4];
-            INIT_PIXEL_PTR(pixel, x, y);
-#ifdef STORE_PIXEL_RGB
-            STORE_PIXEL_RGB(pixel, x + i, y, src[i]);
-#else
-            STORE_PIXEL(pixel, x + i, y, src[i]);
-#endif
-            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
-         }
-      }
-   }
-   else {
-      char *row = swrast_drawable(ctx->DrawBuffer)->row;
-      INIT_PIXEL_PTR(pixel, x, y);
-      for (i = 0; i < count; i++) {
-#ifdef STORE_PIXEL_RGB
-         STORE_PIXEL_RGB(pixel, x + i, y, src[i]);
-#else
-         STORE_PIXEL(pixel, x + i, y, src[i]);
-#endif
-         INC_PIXEL_PTR(pixel);
-      }
-      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_mono_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                    GLuint count, GLint x, GLint y,
-                    const void *value, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE *src = (const RB_TYPE *) value;
-   GLuint i;
-   if (mask) {
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            RB_TYPE row[4];
-            INIT_PIXEL_PTR(pixel, x, y);
-            STORE_PIXEL(pixel, x + i, y, src);
-            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
-         }
-      }
-   }
-   else {
-      char *row = swrast_drawable(ctx->DrawBuffer)->row;
-      INIT_PIXEL_PTR(pixel, x, y);
-      for (i = 0; i < count; i++) {
-         STORE_PIXEL(pixel, x + i, y, src);
-         INC_PIXEL_PTR(pixel);
-      }
-      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                  GLuint count, const GLint x[], const GLint y[],
-                  const void *values, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   ASSERT(mask);
-   for (i = 0; i < count; i++) {
-      if (mask[i]) {
-         RB_TYPE row[4];
-         INIT_PIXEL_PTR(pixel, x, y);
-         STORE_PIXEL(pixel, x[i], y[i], src[i]);
-         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
-      }
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_mono_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE *src = (const RB_TYPE *) value;
-   GLuint i;
-   ASSERT(mask);
-   for (i = 0; i < count; i++) {
-      if (mask[i]) {
-         RB_TYPE row[4];
-         INIT_PIXEL_PTR(pixel, x, y);
-         STORE_PIXEL(pixel, x[i], y[i], src);
-         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
-      }
-   }
-   (void) rb;
-}
-
-
-#undef NAME
-#undef RB_TYPE
-#undef RB_COMPONENTS
-#undef SPAN_VARS
-#undef INIT_PIXEL_PTR
-#undef INC_PIXEL_PTR
-#undef STORE_PIXEL
-#undef STORE_PIXEL_RGB
-#undef FETCH_PIXEL
+/*

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

+ */

+

+

+/*

+ * Modified version of swrast/s_spantemp.h for front-buffer rendering. The

+ * no-mask paths use a scratch row to avoid repeated calls to the loader.

+ *

+ * For the mask paths we always use an array of 4 elements of RB_TYPE. This is

+ * to satisfy the xorg loader requirement of an image pitch of 32 bits and

+ * should be ok for other loaders also.

+ */

+

+

+#ifndef _SWRAST_SPANTEMP_ONCE

+#define _SWRAST_SPANTEMP_ONCE

+

+static INLINE void

+PUT_PIXEL( struct gl_context *glCtx, GLint x, GLint y, GLvoid *p )

+{

+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

+    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;

+

+    __DRIscreen *screen = ctx->driScreenPriv;

+

+    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,

+				    x, y, 1, 1, (char *)p,

+				    draw->loaderPrivate);

+}

+

+

+static INLINE void

+GET_PIXEL( struct gl_context *glCtx, GLint x, GLint y, GLubyte *p )

+{

+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

+    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;

+

+    __DRIscreen *screen = ctx->driScreenPriv;

+

+    screen->swrast_loader->getImage(read, x, y, 1, 1, (char *)p,

+				    read->loaderPrivate);

+}

+

+static INLINE void

+PUT_ROW( struct gl_context *glCtx, GLint x, GLint y, GLuint n, char *row )

+{

+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

+    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;

+

+    __DRIscreen *screen = ctx->driScreenPriv;

+

+    screen->swrast_loader->putImage(draw, __DRI_SWRAST_IMAGE_OP_DRAW,

+				    x, y, n, 1, row,

+				    draw->loaderPrivate);

+}

+

+static INLINE void

+GET_ROW( struct gl_context *glCtx, GLint x, GLint y, GLuint n, char *row )

+{

+    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;

+    __DRIdrawable *read = swrast_drawable(glCtx->ReadBuffer)->dPriv;

+

+    __DRIscreen *screen = ctx->driScreenPriv;

+

+    screen->swrast_loader->getImage(read, x, y, n, 1, row,

+				    read->loaderPrivate);

+}

+

+#endif /* _SWRAST_SPANTEMP_ONCE */

+

+

+/*

+ * Templates for the span/pixel-array write/read functions called via

+ * the gl_renderbuffer's GetRow, GetValues, PutRow, PutMonoRow, PutValues

+ * and PutMonoValues functions.

+ *

+ * Define the following macros before including this file:

+ *   NAME(BASE)  to generate the function name (i.e. add prefix or suffix)

+ *   RB_TYPE  the renderbuffer DataType

+ *   SPAN_VARS  to declare any local variables

+ *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel

+ *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel

+ *   STORE_PIXEL(DST, X, Y, VALUE)  to store pixel values in buffer

+ *   FETCH_PIXEL(DST, SRC)  to fetch pixel values from buffer

+ *

+ * Note that in the STORE_PIXEL macros, we also pass in the (X,Y) coordinates

+ * for the pixels to be stored.  This is useful when dithering and probably

+ * ignored otherwise.

+ */

+

+#include "main/macros.h"

+

+

+#if !defined(RB_COMPONENTS)

+#define RB_COMPONENTS 4

+#endif

+

+

+static void

+NAME(get_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+               GLuint count, GLint x, GLint y, void *values )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   char *row = swrast_drawable(ctx->ReadBuffer)->row;

+   INIT_PIXEL_PTR(pixel, x, y);

+   GET_ROW( ctx, x, YFLIP(xrb, y), count, row );

+   for (i = 0; i < count; i++) {

+      FETCH_PIXEL(dest[i], pixel);

+      INC_PIXEL_PTR(pixel);

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(get_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                  GLuint count, const GLint x[], const GLint y[], void *values )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   for (i = 0; i < count; i++) {

+      RB_TYPE pixel[4];

+      GET_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);

+      FETCH_PIXEL(dest[i], pixel);

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+               GLuint count, GLint x, GLint y,

+               const void *values, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   if (mask) {

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            RB_TYPE row[4];

+            INIT_PIXEL_PTR(pixel, x, y);

+            STORE_PIXEL(pixel, x + i, y, src[i]);

+            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);

+         }

+      }

+   }

+   else {

+      char *row = swrast_drawable(ctx->DrawBuffer)->row;

+      INIT_PIXEL_PTR(pixel, x, y);

+      for (i = 0; i < count; i++) {

+         STORE_PIXEL(pixel, x + i, y, src[i]);

+         INC_PIXEL_PTR(pixel);

+      }

+      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_row_rgb)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLuint count, GLint x, GLint y,

+                   const void *values, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE (*src)[3] = (const RB_TYPE (*)[3]) values;

+   GLuint i;

+   if (mask) {

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            RB_TYPE row[4];

+            INIT_PIXEL_PTR(pixel, x, y);

+#ifdef STORE_PIXEL_RGB

+            STORE_PIXEL_RGB(pixel, x + i, y, src[i]);

+#else

+            STORE_PIXEL(pixel, x + i, y, src[i]);

+#endif

+            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);

+         }

+      }

+   }

+   else {

+      char *row = swrast_drawable(ctx->DrawBuffer)->row;

+      INIT_PIXEL_PTR(pixel, x, y);

+      for (i = 0; i < count; i++) {

+#ifdef STORE_PIXEL_RGB

+         STORE_PIXEL_RGB(pixel, x + i, y, src[i]);

+#else

+         STORE_PIXEL(pixel, x + i, y, src[i]);

+#endif

+         INC_PIXEL_PTR(pixel);

+      }

+      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_mono_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                    GLuint count, GLint x, GLint y,

+                    const void *value, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE *src = (const RB_TYPE *) value;

+   GLuint i;

+   if (mask) {

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            RB_TYPE row[4];

+            INIT_PIXEL_PTR(pixel, x, y);

+            STORE_PIXEL(pixel, x + i, y, src);

+            PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);

+         }

+      }

+   }

+   else {

+      char *row = swrast_drawable(ctx->DrawBuffer)->row;

+      INIT_PIXEL_PTR(pixel, x, y);

+      for (i = 0; i < count; i++) {

+         STORE_PIXEL(pixel, x + i, y, src);

+         INC_PIXEL_PTR(pixel);

+      }

+      PUT_ROW( ctx, x, YFLIP(xrb, y), count, row );

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                  GLuint count, const GLint x[], const GLint y[],

+                  const void *values, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   ASSERT(mask);

+   for (i = 0; i < count; i++) {

+      if (mask[i]) {

+         RB_TYPE row[4];

+         INIT_PIXEL_PTR(pixel, x, y);

+         STORE_PIXEL(pixel, x[i], y[i], src[i]);

+         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);

+      }

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_mono_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLuint count, const GLint x[], const GLint y[],

+                       const void *value, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE *src = (const RB_TYPE *) value;

+   GLuint i;

+   ASSERT(mask);

+   for (i = 0; i < count; i++) {

+      if (mask[i]) {

+         RB_TYPE row[4];

+         INIT_PIXEL_PTR(pixel, x, y);

+         STORE_PIXEL(pixel, x[i], y[i], src);

+         PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);

+      }

+   }

+   (void) rb;

+}

+

+

+#undef NAME

+#undef RB_TYPE

+#undef RB_COMPONENTS

+#undef SPAN_VARS

+#undef INIT_PIXEL_PTR

+#undef INC_PIXEL_PTR

+#undef STORE_PIXEL

+#undef STORE_PIXEL_RGB

+#undef FETCH_PIXEL

diff --git a/mesalib/src/mesa/drivers/windows/fx/fx.rc b/mesalib/src/mesa/drivers/windows/fx/fx.rc
new file mode 100644
index 000000000..a9aedfc97
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/fx/fx.rc
@@ -0,0 +1,39 @@
+#include <windows.h>

+

+#define PRODNAME                "Mesa 6.x"

+#define CONTACTSTR              "http://www.mesa3d.org"

+#define HWSTR                   "3dfx Voodoo Graphics, Voodoo Rush, Voodoo^2, Voodoo Banshee, Velocity 100/200, Voodoo3, Voodoo4, Voodoo5"

+#define COPYRIGHTSTR            "Copyright \251 Brian E. Paul"

+

+#define VERSIONSTR              "6.3.0.1"

+#define MANVERSION              6

+#define MANREVISION             3

+#define BUILD_NUMBER            1

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER

+ PRODUCTVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER

+ FILEFLAGSMASK 0x0030003FL

+

+ FILEOS VOS_DOS_WINDOWS32

+ FILETYPE VFT_DRV

+ FILESUBTYPE VFT2_DRV_INSTALLABLE

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904E4"

+        BEGIN

+            VALUE "FileDescription", PRODNAME

+            VALUE "FileVersion", VERSIONSTR

+            VALUE "LegalCopyright", COPYRIGHTSTR

+            VALUE "ProductName", PRODNAME

+            VALUE "Graphics Subsystem", HWSTR

+            VALUE "Contact", CONTACTSTR

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        /* the following line should be extended for localized versions */

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/mesalib/src/mesa/drivers/windows/fx/fxopengl.def b/mesalib/src/mesa/drivers/windows/fx/fxopengl.def
index d65b763d2..8714ae983 100644
--- a/mesalib/src/mesa/drivers/windows/fx/fxopengl.def
+++ b/mesalib/src/mesa/drivers/windows/fx/fxopengl.def
@@ -1,955 +1,953 @@
-LIBRARY OpenGL32
-DESCRIPTION "Mesa 5.1"
-EXPORTS
- glAccum
- glActiveStencilFaceEXT
- glActiveTexture
- glActiveTextureARB
- glAlphaFunc
- glAreProgramsResidentNV
- glAreTexturesResident
- glAreTexturesResidentEXT
- glArrayElement
- glArrayElementEXT
- glBegin
- glBeginQueryARB
- glBindBufferARB
- glBindProgramARB
- glBindProgramNV
- glBindTexture
- glBindTextureEXT
- glBitmap
-;glBlendColor
-;glBlendColorEXT
- glBlendEquation
- glBlendEquationEXT
- glBlendFunc
- glBlendFuncSeparate
- glBlendFuncSeparateEXT
- glBlendFuncSeparateINGR
- glBufferDataARB
- glBufferSubDataARB
- glCallList
- glCallLists
- glClear
- glClearAccum
- glClearColor
- glClearDepth
- glClearIndex
- glClearStencil
- glClientActiveTexture
- glClientActiveTextureARB
- glClipPlane
- glColorMask
- glColorMaterial
- glColorPointer
- glColorPointerEXT
- glColorSubTable
- glColorSubTableEXT
- glColorTable
- glColorTableEXT
- glColorTableParameterfv
- glColorTableParameterfvSGI
- glColorTableParameteriv
- glColorTableParameterivSGI
- glColorTableSGI
- glColor3b
- glColor3bv
- glColor3d
- glColor3dv
- glColor3f
- glColor3fv
- glColor3i
- glColor3iv
- glColor3s
- glColor3sv
- glColor3ub
- glColor3ubv
- glColor3ui
- glColor3uiv
- glColor3us
- glColor3usv
- glColor4b
- glColor4bv
- glColor4d
- glColor4dv
- glColor4f
- glColor4fv
- glColor4i
- glColor4iv
- glColor4s
- glColor4sv
- glColor4ub
- glColor4ubv
- glColor4ui
- glColor4uiv
- glColor4us
- glColor4usv
- glCombinerInputNV
- glCombinerOutputNV
- glCombinerParameterfNV
- glCombinerParameterfvNV
- glCombinerParameteriNV
- glCombinerParameterivNV
- glCompressedTexImage1D
- glCompressedTexImage1DARB
- glCompressedTexImage2D
- glCompressedTexImage2DARB
- glCompressedTexImage3D
- glCompressedTexImage3DARB
- glCompressedTexSubImage1D
- glCompressedTexSubImage1DARB
- glCompressedTexSubImage2D
- glCompressedTexSubImage2DARB
- glCompressedTexSubImage3D
- glCompressedTexSubImage3DARB
- glConvolutionFilter1D
- glConvolutionFilter1DEXT
- glConvolutionFilter2D
- glConvolutionFilter2DEXT
- glConvolutionParameterf
- glConvolutionParameterfEXT
- glConvolutionParameterfv
- glConvolutionParameterfvEXT
- glConvolutionParameteri
- glConvolutionParameteriEXT
- glConvolutionParameteriv
- glConvolutionParameterivEXT
- glCopyColorSubTable
- glCopyColorSubTableEXT
- glCopyColorTable
- glCopyColorTableSGI
- glCopyConvolutionFilter1D
- glCopyConvolutionFilter1DEXT
- glCopyConvolutionFilter2D
- glCopyConvolutionFilter2DEXT
- glCopyPixels
- glCopyTexImage1D
- glCopyTexImage1DEXT
- glCopyTexImage2D
- glCopyTexImage2DEXT
- glCopyTexSubImage1D
- glCopyTexSubImage1DEXT
- glCopyTexSubImage2D
- glCopyTexSubImage2DEXT
- glCopyTexSubImage3D
- glCopyTexSubImage3DEXT
- glCullFace
- glCullParameterdvEXT
- glCullParameterfvEXT
- glDeleteBuffersARB
- glDeleteFencesNV
- glDeleteLists
- glDeleteProgramsARB
- glDeleteProgramsNV
- glDeleteQueriesARB
- glDeleteTextures
- glDeleteTexturesEXT
- glDepthBoundsEXT
- glDepthFunc
- glDepthMask
- glDepthRange
- glDetailTexFuncSGIS
- glDisable
- glDisableClientState
- glDisableVertexAttribArrayARB
- glDrawArrays
- glDrawArraysEXT
- glDrawBuffer
- glDrawElements
- glDrawPixels
- glDrawRangeElements
- glDrawRangeElementsEXT
- glEdgeFlag
- glEdgeFlagPointer
- glEdgeFlagPointerEXT
- glEdgeFlagv
- glEnable
- glEnableClientState
- glEnableVertexAttribArrayARB
- glEnd
- glEndList
- glEndQueryARB
- glEvalCoord1d
- glEvalCoord1dv
- glEvalCoord1f
- glEvalCoord1fv
- glEvalCoord2d
- glEvalCoord2dv
- glEvalCoord2f
- glEvalCoord2fv
- glEvalMesh1
- glEvalMesh2
- glEvalPoint1
- glEvalPoint2
- glExecuteProgramNV
- glFeedbackBuffer
- glFinalCombinerInputNV
- glFinish
- glFinishFenceNV
- glFlush
- glFlushRasterSGIX
- glFlushVertexArrayRangeNV
- glFogCoordd
- glFogCoorddEXT
- glFogCoorddv
- glFogCoorddvEXT
- glFogCoordf
- glFogCoordfEXT
- glFogCoordfv
- glFogCoordfvEXT
- glFogCoordPointer
- glFogCoordPointerEXT
- glFogf
- glFogfv
- glFogi
- glFogiv
- glFragmentColorMaterialSGIX
- glFragmentLightfSGIX
- glFragmentLightfvSGIX
- glFragmentLightiSGIX
- glFragmentLightivSGIX
- glFragmentLightModelfSGIX
- glFragmentLightModelfvSGIX
- glFragmentLightModeliSGIX
- glFragmentLightModelivSGIX
- glFragmentMaterialfSGIX
- glFragmentMaterialfvSGIX
- glFragmentMaterialiSGIX
- glFragmentMaterialivSGIX
- glFrameZoomSGIX
- glFrontFace
- glFrustum
- glGenBuffersARB
- glGenFencesNV
- glGenLists
- glGenProgramsARB
- glGenProgramsNV
- glGenQueriesARB
- glGenTextures
- glGenTexturesEXT
- glGetBooleanv
- glGetBufferParameterivARB
- glGetBufferPointervARB
- glGetBufferSubDataARB
- glGetClipPlane
- glGetColorTable
- glGetColorTableEXT
- glGetColorTableParameterfv
- glGetColorTableParameterfvEXT
- glGetColorTableParameterfvSGI
- glGetColorTableParameteriv
- glGetColorTableParameterivEXT
- glGetColorTableParameterivSGI
- glGetColorTableSGI
- glGetCombinerInputParameterfvNV
- glGetCombinerInputParameterivNV
- glGetCombinerOutputParameterfvNV
- glGetCombinerOutputParameterivNV
- glGetCompressedTexImage
- glGetCompressedTexImageARB
- glGetConvolutionFilter
- glGetConvolutionFilterEXT
- glGetConvolutionParameterfv
- glGetConvolutionParameterfvEXT
- glGetConvolutionParameteriv
- glGetConvolutionParameterivEXT
- glGetDetailTexFuncSGIS
- glGetDoublev
- glGetError
- glGetFenceivNV
- glGetFinalCombinerInputParameterfvNV
- glGetFinalCombinerInputParameterivNV
- glGetFloatv
- glGetFragmentLightfvSGIX
- glGetFragmentLightivSGIX
- glGetFragmentMaterialfvSGIX
- glGetFragmentMaterialivSGIX
- glGetHistogram
- glGetHistogramEXT
- glGetHistogramParameterfv
- glGetHistogramParameterfvEXT
- glGetHistogramParameteriv
- glGetHistogramParameterivEXT
- glGetInstrumentsSGIX
- glGetIntegerv
- glGetLightfv
- glGetLightiv
- glGetListParameterfvSGIX
- glGetListParameterivSGIX
- glGetMapdv
- glGetMapfv
- glGetMapiv
- glGetMaterialfv
- glGetMaterialiv
- glGetMinmax
- glGetMinmaxEXT
- glGetMinmaxParameterfv
- glGetMinmaxParameterfvEXT
- glGetMinmaxParameteriv
- glGetMinmaxParameterivEXT
- glGetPixelMapfv
- glGetPixelMapuiv
- glGetPixelMapusv
- glGetPixelTexGenParameterfvSGIS
- glGetPixelTexGenParameterivSGIS
- glGetPointerv
- glGetPointervEXT
- glGetPolygonStipple
- glGetProgramEnvParameterdvARB
- glGetProgramEnvParameterfvARB
- glGetProgramivARB
- glGetProgramivNV
- glGetProgramLocalParameterdvARB
- glGetProgramLocalParameterfvARB
- glGetProgramNamedParameterdvNV
- glGetProgramNamedParameterfvNV
- glGetProgramParameterdvNV
- glGetProgramParameterfvNV
- glGetProgramStringARB
- glGetProgramStringNV
- glGetQueryivARB
- glGetQueryObjectivARB
- glGetQueryObjectuivARB
- glGetSeparableFilter
- glGetSeparableFilterEXT
- glGetSharpenTexFuncSGIS
- glGetString
- glGetTexEnvfv
- glGetTexEnviv
- glGetTexFilterFuncSGIS
- glGetTexGendv
- glGetTexGenfv
- glGetTexGeniv
- glGetTexImage
- glGetTexLevelParameterfv
- glGetTexLevelParameteriv
- glGetTexParameterfv
- glGetTexParameteriv
- glGetTrackMatrixivNV
- glGetVertexAttribdvARB
- glGetVertexAttribdvNV
- glGetVertexAttribfvARB
- glGetVertexAttribfvNV
- glGetVertexAttribivARB
- glGetVertexAttribivNV
- glGetVertexAttribPointervARB
- glGetVertexAttribPointervNV
- glHint
- glHintPGI
- glHistogram
- glHistogramEXT
- glIndexd
- glIndexdv
- glIndexf
- glIndexFuncEXT
- glIndexfv
- glIndexi
- glIndexiv
- glIndexMask
- glIndexMaterialEXT
- glIndexPointer
- glIndexPointerEXT
- glIndexs
- glIndexsv
- glIndexub
- glIndexubv
- glInitNames
- glInstrumentsBufferSGIX
- glInterleavedArrays
- glIsBufferARB
- glIsEnabled
- glIsFenceNV
- glIsList
- glIsProgramARB
- glIsProgramNV
- glIsQueryARB
- glIsTexture
- glIsTextureEXT
- glLightEnviSGIX
- glLightf
- glLightfv
- glLighti
- glLightiv
- glLightModelf
- glLightModelfv
- glLightModeli
- glLightModeliv
- glLineStipple
- glLineWidth
- glListBase
- glListParameterfSGIX
- glListParameterfvSGIX
- glListParameteriSGIX
- glListParameterivSGIX
- glLoadIdentity
- glLoadMatrixd
- glLoadMatrixf
- glLoadName
- glLoadProgramNV
- glLoadTransposeMatrixd
- glLoadTransposeMatrixdARB
- glLoadTransposeMatrixf
- glLoadTransposeMatrixfARB
- glLockArraysEXT
- glLogicOp
- glMapBufferARB
- glMapGrid1d
- glMapGrid1f
- glMapGrid2d
- glMapGrid2f
- glMap1d
- glMap1f
- glMap2d
- glMap2f
- glMaterialf
- glMaterialfv
- glMateriali
- glMaterialiv
- glMatrixMode
- glMinmax
- glMinmaxEXT
- glMultiDrawArrays
- glMultiDrawArraysEXT
- glMultiDrawElements
- glMultiDrawElementsEXT
- glMultiModeDrawArraysIBM
- glMultiModeDrawElementsIBM
- glMultiTexCoord1d
- glMultiTexCoord1dARB
- glMultiTexCoord1dv
- glMultiTexCoord1dvARB
- glMultiTexCoord1f
- glMultiTexCoord1fARB
- glMultiTexCoord1fv
- glMultiTexCoord1fvARB
- glMultiTexCoord1i
- glMultiTexCoord1iARB
- glMultiTexCoord1iv
- glMultiTexCoord1ivARB
- glMultiTexCoord1s
- glMultiTexCoord1sARB
- glMultiTexCoord1sv
- glMultiTexCoord1svARB
- glMultiTexCoord2d
- glMultiTexCoord2dARB
- glMultiTexCoord2dv
- glMultiTexCoord2dvARB
- glMultiTexCoord2f
- glMultiTexCoord2fARB
- glMultiTexCoord2fv
- glMultiTexCoord2fvARB
- glMultiTexCoord2i
- glMultiTexCoord2iARB
- glMultiTexCoord2iv
- glMultiTexCoord2ivARB
- glMultiTexCoord2s
- glMultiTexCoord2sARB
- glMultiTexCoord2sv
- glMultiTexCoord2svARB
- glMultiTexCoord3d
- glMultiTexCoord3dARB
- glMultiTexCoord3dv
- glMultiTexCoord3dvARB
- glMultiTexCoord3f
- glMultiTexCoord3fARB
- glMultiTexCoord3fv
- glMultiTexCoord3fvARB
- glMultiTexCoord3i
- glMultiTexCoord3iARB
- glMultiTexCoord3iv
- glMultiTexCoord3ivARB
- glMultiTexCoord3s
- glMultiTexCoord3sARB
- glMultiTexCoord3sv
- glMultiTexCoord3svARB
- glMultiTexCoord4d
- glMultiTexCoord4dARB
- glMultiTexCoord4dv
- glMultiTexCoord4dvARB
- glMultiTexCoord4f
- glMultiTexCoord4fARB
- glMultiTexCoord4fv
- glMultiTexCoord4fvARB
- glMultiTexCoord4i
- glMultiTexCoord4iARB
- glMultiTexCoord4iv
- glMultiTexCoord4ivARB
- glMultiTexCoord4s
- glMultiTexCoord4sARB
- glMultiTexCoord4sv
- glMultiTexCoord4svARB
- glMultMatrixd
- glMultMatrixf
- glMultTransposeMatrixd
- glMultTransposeMatrixdARB
- glMultTransposeMatrixf
- glMultTransposeMatrixfARB
- glNewList
- glNormalPointer
- glNormalPointerEXT
- glNormal3b
- glNormal3bv
- glNormal3d
- glNormal3dv
- glNormal3f
- glNormal3fv
- glNormal3i
- glNormal3iv
- glNormal3s
- glNormal3sv
- glOrtho
- glPassThrough
- glPixelMapfv
- glPixelMapuiv
- glPixelMapusv
- glPixelStoref
- glPixelStorei
- glPixelTexGenParameterfSGIS
- glPixelTexGenParameterfvSGIS
- glPixelTexGenParameteriSGIS
- glPixelTexGenParameterivSGIS
- glPixelTexGenSGIX
- glPixelTransferf
- glPixelTransferi
- glPixelZoom
- glPointParameterf
- glPointParameterfARB
- glPointParameterfEXT
- glPointParameterfSGIS
- glPointParameterfv
- glPointParameterfvARB
- glPointParameterfvEXT
- glPointParameterfvSGIS
- glPointParameteri
- glPointParameteriNV
- glPointParameteriv
- glPointParameterivNV
- glPointSize
- glPollInstrumentsSGIX
- glPolygonMode
- glPolygonOffset
- glPolygonOffsetEXT
- glPolygonStipple
- glPopAttrib
- glPopClientAttrib
- glPopMatrix
- glPopName
- glPrioritizeTextures
- glPrioritizeTexturesEXT
- glProgramEnvParameter4dARB
- glProgramEnvParameter4dvARB
- glProgramEnvParameter4fARB
- glProgramEnvParameter4fvARB
- glProgramLocalParameter4dARB
- glProgramLocalParameter4dvARB
- glProgramLocalParameter4fARB
- glProgramLocalParameter4fvARB
- glProgramNamedParameter4dNV
- glProgramNamedParameter4dvNV
- glProgramNamedParameter4fNV
- glProgramNamedParameter4fvNV
- glProgramParameters4dvNV
- glProgramParameters4fvNV
- glProgramParameter4dNV
- glProgramParameter4dvNV
- glProgramParameter4fNV
- glProgramParameter4fvNV
- glProgramStringARB
- glPushAttrib
- glPushClientAttrib
- glPushMatrix
- glPushName
- glRasterPos2d
- glRasterPos2dv
- glRasterPos2f
- glRasterPos2fv
- glRasterPos2i
- glRasterPos2iv
- glRasterPos2s
- glRasterPos2sv
- glRasterPos3d
- glRasterPos3dv
- glRasterPos3f
- glRasterPos3fv
- glRasterPos3i
- glRasterPos3iv
- glRasterPos3s
- glRasterPos3sv
- glRasterPos4d
- glRasterPos4dv
- glRasterPos4f
- glRasterPos4fv
- glRasterPos4i
- glRasterPos4iv
- glRasterPos4s
- glRasterPos4sv
- glReadBuffer
- glReadInstrumentsSGIX
- glReadPixels
- glRectd
- glRectdv
- glRectf
- glRectfv
- glRecti
- glRectiv
- glRects
- glRectsv
- glReferencePlaneSGIX
- glRenderMode
- glRequestResidentProgramsNV
- glResetHistogram
- glResetHistogramEXT
- glResetMinmax
- glResetMinmaxEXT
- glResizeBuffersMESA
- glRotated
- glRotatef
- glSampleCoverage
- glSampleCoverageARB
- glSampleMaskEXT
- glSampleMaskSGIS
- glSamplePatternEXT
- glSamplePatternSGIS
- glScaled
- glScalef
- glScissor
- glSecondaryColorPointer
- glSecondaryColorPointerEXT
- glSecondaryColor3b
- glSecondaryColor3bEXT
- glSecondaryColor3bv
- glSecondaryColor3bvEXT
- glSecondaryColor3d
- glSecondaryColor3dEXT
- glSecondaryColor3dv
- glSecondaryColor3dvEXT
- glSecondaryColor3f
- glSecondaryColor3fEXT
- glSecondaryColor3fv
- glSecondaryColor3fvEXT
- glSecondaryColor3i
- glSecondaryColor3iEXT
- glSecondaryColor3iv
- glSecondaryColor3ivEXT
- glSecondaryColor3s
- glSecondaryColor3sEXT
- glSecondaryColor3sv
- glSecondaryColor3svEXT
- glSecondaryColor3ub
- glSecondaryColor3ubEXT
- glSecondaryColor3ubv
- glSecondaryColor3ubvEXT
- glSecondaryColor3ui
- glSecondaryColor3uiEXT
- glSecondaryColor3uiv
- glSecondaryColor3uivEXT
- glSecondaryColor3us
- glSecondaryColor3usEXT
- glSecondaryColor3usv
- glSecondaryColor3usvEXT
- glSelectBuffer
- glSeparableFilter2D
- glSeparableFilter2DEXT
- glSetFenceNV
- glShadeModel
- glSharpenTexFuncSGIS
- glSpriteParameterfSGIX
- glSpriteParameterfvSGIX
- glSpriteParameteriSGIX
- glSpriteParameterivSGIX
- glStartInstrumentsSGIX
- glStencilFunc
- glStencilMask
- glStencilOp
- glStopInstrumentsSGIX
- glTagSampleBufferSGIX
- glTbufferMask3DFX
- glTestFenceNV
- glTexCoordPointer
- glTexCoordPointerEXT
- glTexCoord1d
- glTexCoord1dv
- glTexCoord1f
- glTexCoord1fv
- glTexCoord1i
- glTexCoord1iv
- glTexCoord1s
- glTexCoord1sv
- glTexCoord2d
- glTexCoord2dv
- glTexCoord2f
- glTexCoord2fv
- glTexCoord2i
- glTexCoord2iv
- glTexCoord2s
- glTexCoord2sv
- glTexCoord3d
- glTexCoord3dv
- glTexCoord3f
- glTexCoord3fv
- glTexCoord3i
- glTexCoord3iv
- glTexCoord3s
- glTexCoord3sv
- glTexCoord4d
- glTexCoord4dv
- glTexCoord4f
- glTexCoord4fv
- glTexCoord4i
- glTexCoord4iv
- glTexCoord4s
- glTexCoord4sv
- glTexEnvf
- glTexEnvfv
- glTexEnvi
- glTexEnviv
- glTexFilterFuncSGIS
- glTexGend
- glTexGendv
- glTexGenf
- glTexGenfv
- glTexGeni
- glTexGeniv
- glTexImage1D
- glTexImage2D
- glTexImage3D
- glTexImage3DEXT
- glTexImage4DSGIS
- glTexParameterf
- glTexParameterfv
- glTexParameteri
- glTexParameteriv
- glTexSubImage1D
- glTexSubImage1DEXT
- glTexSubImage2D
- glTexSubImage2DEXT
- glTexSubImage3D
- glTexSubImage3DEXT
- glTexSubImage4DSGIS
- glTrackMatrixNV
- glTranslated
- glTranslatef
- glUnlockArraysEXT
- glUnmapBufferARB
- glVertexArrayRangeNV
- glVertexAttribPointerARB
- glVertexAttribPointerNV
- glVertexAttribs1dvNV
- glVertexAttribs1fvNV
- glVertexAttribs1svNV
- glVertexAttribs2dvNV
- glVertexAttribs2fvNV
- glVertexAttribs2svNV
- glVertexAttribs3dvNV
- glVertexAttribs3fvNV
- glVertexAttribs3svNV
- glVertexAttribs4dvNV
- glVertexAttribs4fvNV
- glVertexAttribs4svNV
- glVertexAttribs4ubvNV
- glVertexAttrib1dARB
- glVertexAttrib1dNV
- glVertexAttrib1dvARB
- glVertexAttrib1dvNV
- glVertexAttrib1fARB
- glVertexAttrib1fNV
- glVertexAttrib1fvARB
- glVertexAttrib1fvNV
- glVertexAttrib1sARB
- glVertexAttrib1sNV
- glVertexAttrib1svARB
- glVertexAttrib1svNV
- glVertexAttrib2dARB
- glVertexAttrib2dNV
- glVertexAttrib2dvARB
- glVertexAttrib2dvNV
- glVertexAttrib2fARB
- glVertexAttrib2fNV
- glVertexAttrib2fvARB
- glVertexAttrib2fvNV
- glVertexAttrib2sARB
- glVertexAttrib2sNV
- glVertexAttrib2svARB
- glVertexAttrib2svNV
- glVertexAttrib3dARB
- glVertexAttrib3dNV
- glVertexAttrib3dvARB
- glVertexAttrib3dvNV
- glVertexAttrib3fARB
- glVertexAttrib3fNV
- glVertexAttrib3fvARB
- glVertexAttrib3fvNV
- glVertexAttrib3sARB
- glVertexAttrib3sNV
- glVertexAttrib3svARB
- glVertexAttrib3svNV
- glVertexAttrib4bvARB
- glVertexAttrib4dARB
- glVertexAttrib4dNV
- glVertexAttrib4dvARB
- glVertexAttrib4dvNV
- glVertexAttrib4fARB
- glVertexAttrib4fNV
- glVertexAttrib4fvARB
- glVertexAttrib4fvNV
- glVertexAttrib4ivARB
- glVertexAttrib4NbvARB
- glVertexAttrib4NivARB
- glVertexAttrib4NsvARB
- glVertexAttrib4NubARB
- glVertexAttrib4NubvARB
- glVertexAttrib4NuivARB
- glVertexAttrib4NusvARB
- glVertexAttrib4sARB
- glVertexAttrib4sNV
- glVertexAttrib4svARB
- glVertexAttrib4svNV
- glVertexAttrib4ubNV
- glVertexAttrib4ubvARB
- glVertexAttrib4ubvNV
- glVertexAttrib4uivARB
- glVertexAttrib4usvARB
- glVertexPointer
- glVertexPointerEXT
- glVertexWeightfEXT
- glVertexWeightfvEXT
- glVertexWeightPointerEXT
- glVertex2d
- glVertex2dv
- glVertex2f
- glVertex2fv
- glVertex2i
- glVertex2iv
- glVertex2s
- glVertex2sv
- glVertex3d
- glVertex3dv
- glVertex3f
- glVertex3fv
- glVertex3i
- glVertex3iv
- glVertex3s
- glVertex3sv
- glVertex4d
- glVertex4dv
- glVertex4f
- glVertex4fv
- glVertex4i
- glVertex4iv
- glVertex4s
- glVertex4sv
- glViewport
- glWindowPos2d
- glWindowPos2dARB
- glWindowPos2dMESA
- glWindowPos2dv
- glWindowPos2dvARB
- glWindowPos2dvMESA
- glWindowPos2f
- glWindowPos2fARB
- glWindowPos2fMESA
- glWindowPos2fv
- glWindowPos2fvARB
- glWindowPos2fvMESA
- glWindowPos2i
- glWindowPos2iARB
- glWindowPos2iMESA
- glWindowPos2iv
- glWindowPos2ivARB
- glWindowPos2ivMESA
- glWindowPos2s
- glWindowPos2sARB
- glWindowPos2sMESA
- glWindowPos2sv
- glWindowPos2svARB
- glWindowPos2svMESA
- glWindowPos3d
- glWindowPos3dARB
- glWindowPos3dMESA
- glWindowPos3dv
- glWindowPos3dvARB
- glWindowPos3dvMESA
- glWindowPos3f
- glWindowPos3fARB
- glWindowPos3fMESA
- glWindowPos3fv
- glWindowPos3fvARB
- glWindowPos3fvMESA
- glWindowPos3i
- glWindowPos3iARB
- glWindowPos3iMESA
- glWindowPos3iv
- glWindowPos3ivARB
- glWindowPos3ivMESA
- glWindowPos3s
- glWindowPos3sARB
- glWindowPos3sMESA
- glWindowPos3sv
- glWindowPos3svARB
- glWindowPos3svMESA
- glWindowPos4dMESA
- glWindowPos4dvMESA
- glWindowPos4fMESA
- glWindowPos4fvMESA
- glWindowPos4iMESA
- glWindowPos4ivMESA
- glWindowPos4sMESA
- glWindowPos4svMESA
- fxCloseHardware
-;fxGetScreenGeometry
- fxMesaCreateBestContext
- fxMesaCreateContext
- fxMesaDestroyContext
- fxMesaGetCurrentContext
- fxMesaMakeCurrent
- fxMesaSelectCurrentBoard
-;fxMesaSetNearFar
- fxMesaSwapBuffers
- fxMesaUpdateScreenSize
- wglChoosePixelFormat
- wglCopyContext
- wglCreateContext
- wglCreateLayerContext
- wglDeleteContext
- wglDescribeLayerPlane
- wglDescribePixelFormat
- wglGetCurrentContext
- wglGetCurrentDC
- wglGetDefaultProcAddress
- wglGetLayerPaletteEntries
- wglGetPixelFormat
- wglGetProcAddress
- wglMakeCurrent
- wglRealizeLayerPalette
- wglSetLayerPaletteEntries
- wglSetPixelFormat
- wglShareLists
- wglSwapBuffers
- wglSwapLayerBuffers
- wglUseFontBitmapsA
- wglUseFontBitmapsW
- wglUseFontOutlinesA
- wglUseFontOutlinesW
- ChoosePixelFormat
- DescribePixelFormat
- GetPixelFormat
- SetPixelFormat
- SwapBuffers
- DrvCopyContext
- DrvCreateContext
- DrvCreateLayerContext
- DrvDeleteContext
- DrvDescribeLayerPlane
- DrvDescribePixelFormat
- DrvGetLayerPaletteEntries
- DrvGetProcAddress
- DrvReleaseContext
- DrvRealizeLayerPalette
- DrvSetContext
- DrvSetLayerPaletteEntries
- DrvSetPixelFormat
- DrvShareLists
- DrvSwapBuffers
- DrvSwapLayerBuffers
- DrvValidateVersion
+LIBRARY OpenGL32

+DESCRIPTION "Mesa 5.1"

+EXPORTS

+ glAccum

+ glActiveStencilFaceEXT

+ glActiveTexture

+ glActiveTextureARB

+ glAlphaFunc

+ glAreProgramsResidentNV

+ glAreTexturesResident

+ glAreTexturesResidentEXT

+ glArrayElement

+ glArrayElementEXT

+ glBegin

+ glBeginQueryARB

+ glBindBufferARB

+ glBindProgramARB

+ glBindProgramNV

+ glBindTexture

+ glBindTextureEXT

+ glBitmap

+;glBlendColor

+;glBlendColorEXT

+ glBlendEquation

+ glBlendEquationEXT

+ glBlendFunc

+ glBlendFuncSeparate

+ glBlendFuncSeparateEXT

+ glBlendFuncSeparateINGR

+ glBufferDataARB

+ glBufferSubDataARB

+ glCallList

+ glCallLists

+ glClear

+ glClearAccum

+ glClearColor

+ glClearDepth

+ glClearIndex

+ glClearStencil

+ glClientActiveTexture

+ glClientActiveTextureARB

+ glClipPlane

+ glColorMask

+ glColorMaterial

+ glColorPointer

+ glColorPointerEXT

+ glColorSubTable

+ glColorSubTableEXT

+ glColorTable

+ glColorTableEXT

+ glColorTableParameterfv

+ glColorTableParameterfvSGI

+ glColorTableParameteriv

+ glColorTableParameterivSGI

+ glColorTableSGI

+ glColor3b

+ glColor3bv

+ glColor3d

+ glColor3dv

+ glColor3f

+ glColor3fv

+ glColor3i

+ glColor3iv

+ glColor3s

+ glColor3sv

+ glColor3ub

+ glColor3ubv

+ glColor3ui

+ glColor3uiv

+ glColor3us

+ glColor3usv

+ glColor4b

+ glColor4bv

+ glColor4d

+ glColor4dv

+ glColor4f

+ glColor4fv

+ glColor4i

+ glColor4iv

+ glColor4s

+ glColor4sv

+ glColor4ub

+ glColor4ubv

+ glColor4ui

+ glColor4uiv

+ glColor4us

+ glColor4usv

+ glCombinerInputNV

+ glCombinerOutputNV

+ glCombinerParameterfNV

+ glCombinerParameterfvNV

+ glCombinerParameteriNV

+ glCombinerParameterivNV

+ glCompressedTexImage1D

+ glCompressedTexImage1DARB

+ glCompressedTexImage2D

+ glCompressedTexImage2DARB

+ glCompressedTexImage3D

+ glCompressedTexImage3DARB

+ glCompressedTexSubImage1D

+ glCompressedTexSubImage1DARB

+ glCompressedTexSubImage2D

+ glCompressedTexSubImage2DARB

+ glCompressedTexSubImage3D

+ glCompressedTexSubImage3DARB

+ glConvolutionFilter1D

+ glConvolutionFilter1DEXT

+ glConvolutionFilter2D

+ glConvolutionFilter2DEXT

+ glConvolutionParameterf

+ glConvolutionParameterfEXT

+ glConvolutionParameterfv

+ glConvolutionParameterfvEXT

+ glConvolutionParameteri

+ glConvolutionParameteriEXT

+ glConvolutionParameteriv

+ glConvolutionParameterivEXT

+ glCopyColorSubTable

+ glCopyColorSubTableEXT

+ glCopyColorTable

+ glCopyColorTableSGI

+ glCopyConvolutionFilter1D

+ glCopyConvolutionFilter1DEXT

+ glCopyConvolutionFilter2D

+ glCopyConvolutionFilter2DEXT

+ glCopyPixels

+ glCopyTexImage1D

+ glCopyTexImage1DEXT

+ glCopyTexImage2D

+ glCopyTexImage2DEXT

+ glCopyTexSubImage1D

+ glCopyTexSubImage1DEXT

+ glCopyTexSubImage2D

+ glCopyTexSubImage2DEXT

+ glCopyTexSubImage3D

+ glCopyTexSubImage3DEXT

+ glCullFace

+ glDeleteBuffersARB

+ glDeleteFencesNV

+ glDeleteLists

+ glDeleteProgramsARB

+ glDeleteProgramsNV

+ glDeleteQueriesARB

+ glDeleteTextures

+ glDeleteTexturesEXT

+ glDepthBoundsEXT

+ glDepthFunc

+ glDepthMask

+ glDepthRange

+ glDetailTexFuncSGIS

+ glDisable

+ glDisableClientState

+ glDisableVertexAttribArrayARB

+ glDrawArrays

+ glDrawArraysEXT

+ glDrawBuffer

+ glDrawElements

+ glDrawPixels

+ glDrawRangeElements

+ glDrawRangeElementsEXT

+ glEdgeFlag

+ glEdgeFlagPointer

+ glEdgeFlagPointerEXT

+ glEdgeFlagv

+ glEnable

+ glEnableClientState

+ glEnableVertexAttribArrayARB

+ glEnd

+ glEndList

+ glEndQueryARB

+ glEvalCoord1d

+ glEvalCoord1dv

+ glEvalCoord1f

+ glEvalCoord1fv

+ glEvalCoord2d

+ glEvalCoord2dv

+ glEvalCoord2f

+ glEvalCoord2fv

+ glEvalMesh1

+ glEvalMesh2

+ glEvalPoint1

+ glEvalPoint2

+ glExecuteProgramNV

+ glFeedbackBuffer

+ glFinalCombinerInputNV

+ glFinish

+ glFinishFenceNV

+ glFlush

+ glFlushRasterSGIX

+ glFlushVertexArrayRangeNV

+ glFogCoordd

+ glFogCoorddEXT

+ glFogCoorddv

+ glFogCoorddvEXT

+ glFogCoordf

+ glFogCoordfEXT

+ glFogCoordfv

+ glFogCoordfvEXT

+ glFogCoordPointer

+ glFogCoordPointerEXT

+ glFogf

+ glFogfv

+ glFogi

+ glFogiv

+ glFragmentColorMaterialSGIX

+ glFragmentLightfSGIX

+ glFragmentLightfvSGIX

+ glFragmentLightiSGIX

+ glFragmentLightivSGIX

+ glFragmentLightModelfSGIX

+ glFragmentLightModelfvSGIX

+ glFragmentLightModeliSGIX

+ glFragmentLightModelivSGIX

+ glFragmentMaterialfSGIX

+ glFragmentMaterialfvSGIX

+ glFragmentMaterialiSGIX

+ glFragmentMaterialivSGIX

+ glFrameZoomSGIX

+ glFrontFace

+ glFrustum

+ glGenBuffersARB

+ glGenFencesNV

+ glGenLists

+ glGenProgramsARB

+ glGenProgramsNV

+ glGenQueriesARB

+ glGenTextures

+ glGenTexturesEXT

+ glGetBooleanv

+ glGetBufferParameterivARB

+ glGetBufferPointervARB

+ glGetBufferSubDataARB

+ glGetClipPlane

+ glGetColorTable

+ glGetColorTableEXT

+ glGetColorTableParameterfv

+ glGetColorTableParameterfvEXT

+ glGetColorTableParameterfvSGI

+ glGetColorTableParameteriv

+ glGetColorTableParameterivEXT

+ glGetColorTableParameterivSGI

+ glGetColorTableSGI

+ glGetCombinerInputParameterfvNV

+ glGetCombinerInputParameterivNV

+ glGetCombinerOutputParameterfvNV

+ glGetCombinerOutputParameterivNV

+ glGetCompressedTexImage

+ glGetCompressedTexImageARB

+ glGetConvolutionFilter

+ glGetConvolutionFilterEXT

+ glGetConvolutionParameterfv

+ glGetConvolutionParameterfvEXT

+ glGetConvolutionParameteriv

+ glGetConvolutionParameterivEXT

+ glGetDetailTexFuncSGIS

+ glGetDoublev

+ glGetError

+ glGetFenceivNV

+ glGetFinalCombinerInputParameterfvNV

+ glGetFinalCombinerInputParameterivNV

+ glGetFloatv

+ glGetFragmentLightfvSGIX

+ glGetFragmentLightivSGIX

+ glGetFragmentMaterialfvSGIX

+ glGetFragmentMaterialivSGIX

+ glGetHistogram

+ glGetHistogramEXT

+ glGetHistogramParameterfv

+ glGetHistogramParameterfvEXT

+ glGetHistogramParameteriv

+ glGetHistogramParameterivEXT

+ glGetInstrumentsSGIX

+ glGetIntegerv

+ glGetLightfv

+ glGetLightiv

+ glGetListParameterfvSGIX

+ glGetListParameterivSGIX

+ glGetMapdv

+ glGetMapfv

+ glGetMapiv

+ glGetMaterialfv

+ glGetMaterialiv

+ glGetMinmax

+ glGetMinmaxEXT

+ glGetMinmaxParameterfv

+ glGetMinmaxParameterfvEXT

+ glGetMinmaxParameteriv

+ glGetMinmaxParameterivEXT

+ glGetPixelMapfv

+ glGetPixelMapuiv

+ glGetPixelMapusv

+ glGetPixelTexGenParameterfvSGIS

+ glGetPixelTexGenParameterivSGIS

+ glGetPointerv

+ glGetPointervEXT

+ glGetPolygonStipple

+ glGetProgramEnvParameterdvARB

+ glGetProgramEnvParameterfvARB

+ glGetProgramivARB

+ glGetProgramivNV

+ glGetProgramLocalParameterdvARB

+ glGetProgramLocalParameterfvARB

+ glGetProgramNamedParameterdvNV

+ glGetProgramNamedParameterfvNV

+ glGetProgramParameterdvNV

+ glGetProgramParameterfvNV

+ glGetProgramStringARB

+ glGetProgramStringNV

+ glGetQueryivARB

+ glGetQueryObjectivARB

+ glGetQueryObjectuivARB

+ glGetSeparableFilter

+ glGetSeparableFilterEXT

+ glGetSharpenTexFuncSGIS

+ glGetString

+ glGetTexEnvfv

+ glGetTexEnviv

+ glGetTexFilterFuncSGIS

+ glGetTexGendv

+ glGetTexGenfv

+ glGetTexGeniv

+ glGetTexImage

+ glGetTexLevelParameterfv

+ glGetTexLevelParameteriv

+ glGetTexParameterfv

+ glGetTexParameteriv

+ glGetTrackMatrixivNV

+ glGetVertexAttribdvARB

+ glGetVertexAttribdvNV

+ glGetVertexAttribfvARB

+ glGetVertexAttribfvNV

+ glGetVertexAttribivARB

+ glGetVertexAttribivNV

+ glGetVertexAttribPointervARB

+ glGetVertexAttribPointervNV

+ glHint

+ glHintPGI

+ glHistogram

+ glHistogramEXT

+ glIndexd

+ glIndexdv

+ glIndexf

+ glIndexFuncEXT

+ glIndexfv

+ glIndexi

+ glIndexiv

+ glIndexMask

+ glIndexMaterialEXT

+ glIndexPointer

+ glIndexPointerEXT

+ glIndexs

+ glIndexsv

+ glIndexub

+ glIndexubv

+ glInitNames

+ glInstrumentsBufferSGIX

+ glInterleavedArrays

+ glIsBufferARB

+ glIsEnabled

+ glIsFenceNV

+ glIsList

+ glIsProgramARB

+ glIsProgramNV

+ glIsQueryARB

+ glIsTexture

+ glIsTextureEXT

+ glLightEnviSGIX

+ glLightf

+ glLightfv

+ glLighti

+ glLightiv

+ glLightModelf

+ glLightModelfv

+ glLightModeli

+ glLightModeliv

+ glLineStipple

+ glLineWidth

+ glListBase

+ glListParameterfSGIX

+ glListParameterfvSGIX

+ glListParameteriSGIX

+ glListParameterivSGIX

+ glLoadIdentity

+ glLoadMatrixd

+ glLoadMatrixf

+ glLoadName

+ glLoadProgramNV

+ glLoadTransposeMatrixd

+ glLoadTransposeMatrixdARB

+ glLoadTransposeMatrixf

+ glLoadTransposeMatrixfARB

+ glLockArraysEXT

+ glLogicOp

+ glMapBufferARB

+ glMapGrid1d

+ glMapGrid1f

+ glMapGrid2d

+ glMapGrid2f

+ glMap1d

+ glMap1f

+ glMap2d

+ glMap2f

+ glMaterialf

+ glMaterialfv

+ glMateriali

+ glMaterialiv

+ glMatrixMode

+ glMinmax

+ glMinmaxEXT

+ glMultiDrawArrays

+ glMultiDrawArraysEXT

+ glMultiDrawElements

+ glMultiDrawElementsEXT

+ glMultiModeDrawArraysIBM

+ glMultiModeDrawElementsIBM

+ glMultiTexCoord1d

+ glMultiTexCoord1dARB

+ glMultiTexCoord1dv

+ glMultiTexCoord1dvARB

+ glMultiTexCoord1f

+ glMultiTexCoord1fARB

+ glMultiTexCoord1fv

+ glMultiTexCoord1fvARB

+ glMultiTexCoord1i

+ glMultiTexCoord1iARB

+ glMultiTexCoord1iv

+ glMultiTexCoord1ivARB

+ glMultiTexCoord1s

+ glMultiTexCoord1sARB

+ glMultiTexCoord1sv

+ glMultiTexCoord1svARB

+ glMultiTexCoord2d

+ glMultiTexCoord2dARB

+ glMultiTexCoord2dv

+ glMultiTexCoord2dvARB

+ glMultiTexCoord2f

+ glMultiTexCoord2fARB

+ glMultiTexCoord2fv

+ glMultiTexCoord2fvARB

+ glMultiTexCoord2i

+ glMultiTexCoord2iARB

+ glMultiTexCoord2iv

+ glMultiTexCoord2ivARB

+ glMultiTexCoord2s

+ glMultiTexCoord2sARB

+ glMultiTexCoord2sv

+ glMultiTexCoord2svARB

+ glMultiTexCoord3d

+ glMultiTexCoord3dARB

+ glMultiTexCoord3dv

+ glMultiTexCoord3dvARB

+ glMultiTexCoord3f

+ glMultiTexCoord3fARB

+ glMultiTexCoord3fv

+ glMultiTexCoord3fvARB

+ glMultiTexCoord3i

+ glMultiTexCoord3iARB

+ glMultiTexCoord3iv

+ glMultiTexCoord3ivARB

+ glMultiTexCoord3s

+ glMultiTexCoord3sARB

+ glMultiTexCoord3sv

+ glMultiTexCoord3svARB

+ glMultiTexCoord4d

+ glMultiTexCoord4dARB

+ glMultiTexCoord4dv

+ glMultiTexCoord4dvARB

+ glMultiTexCoord4f

+ glMultiTexCoord4fARB

+ glMultiTexCoord4fv

+ glMultiTexCoord4fvARB

+ glMultiTexCoord4i

+ glMultiTexCoord4iARB

+ glMultiTexCoord4iv

+ glMultiTexCoord4ivARB

+ glMultiTexCoord4s

+ glMultiTexCoord4sARB

+ glMultiTexCoord4sv

+ glMultiTexCoord4svARB

+ glMultMatrixd

+ glMultMatrixf

+ glMultTransposeMatrixd

+ glMultTransposeMatrixdARB

+ glMultTransposeMatrixf

+ glMultTransposeMatrixfARB

+ glNewList

+ glNormalPointer

+ glNormalPointerEXT

+ glNormal3b

+ glNormal3bv

+ glNormal3d

+ glNormal3dv

+ glNormal3f

+ glNormal3fv

+ glNormal3i

+ glNormal3iv

+ glNormal3s

+ glNormal3sv

+ glOrtho

+ glPassThrough

+ glPixelMapfv

+ glPixelMapuiv

+ glPixelMapusv

+ glPixelStoref

+ glPixelStorei

+ glPixelTexGenParameterfSGIS

+ glPixelTexGenParameterfvSGIS

+ glPixelTexGenParameteriSGIS

+ glPixelTexGenParameterivSGIS

+ glPixelTexGenSGIX

+ glPixelTransferf

+ glPixelTransferi

+ glPixelZoom

+ glPointParameterf

+ glPointParameterfARB

+ glPointParameterfEXT

+ glPointParameterfSGIS

+ glPointParameterfv

+ glPointParameterfvARB

+ glPointParameterfvEXT

+ glPointParameterfvSGIS

+ glPointParameteri

+ glPointParameteriNV

+ glPointParameteriv

+ glPointParameterivNV

+ glPointSize

+ glPollInstrumentsSGIX

+ glPolygonMode

+ glPolygonOffset

+ glPolygonOffsetEXT

+ glPolygonStipple

+ glPopAttrib

+ glPopClientAttrib

+ glPopMatrix

+ glPopName

+ glPrioritizeTextures

+ glPrioritizeTexturesEXT

+ glProgramEnvParameter4dARB

+ glProgramEnvParameter4dvARB

+ glProgramEnvParameter4fARB

+ glProgramEnvParameter4fvARB

+ glProgramLocalParameter4dARB

+ glProgramLocalParameter4dvARB

+ glProgramLocalParameter4fARB

+ glProgramLocalParameter4fvARB

+ glProgramNamedParameter4dNV

+ glProgramNamedParameter4dvNV

+ glProgramNamedParameter4fNV

+ glProgramNamedParameter4fvNV

+ glProgramParameters4dvNV

+ glProgramParameters4fvNV

+ glProgramParameter4dNV

+ glProgramParameter4dvNV

+ glProgramParameter4fNV

+ glProgramParameter4fvNV

+ glProgramStringARB

+ glPushAttrib

+ glPushClientAttrib

+ glPushMatrix

+ glPushName

+ glRasterPos2d

+ glRasterPos2dv

+ glRasterPos2f

+ glRasterPos2fv

+ glRasterPos2i

+ glRasterPos2iv

+ glRasterPos2s

+ glRasterPos2sv

+ glRasterPos3d

+ glRasterPos3dv

+ glRasterPos3f

+ glRasterPos3fv

+ glRasterPos3i

+ glRasterPos3iv

+ glRasterPos3s

+ glRasterPos3sv

+ glRasterPos4d

+ glRasterPos4dv

+ glRasterPos4f

+ glRasterPos4fv

+ glRasterPos4i

+ glRasterPos4iv

+ glRasterPos4s

+ glRasterPos4sv

+ glReadBuffer

+ glReadInstrumentsSGIX

+ glReadPixels

+ glRectd

+ glRectdv

+ glRectf

+ glRectfv

+ glRecti

+ glRectiv

+ glRects

+ glRectsv

+ glReferencePlaneSGIX

+ glRenderMode

+ glRequestResidentProgramsNV

+ glResetHistogram

+ glResetHistogramEXT

+ glResetMinmax

+ glResetMinmaxEXT

+ glResizeBuffersMESA

+ glRotated

+ glRotatef

+ glSampleCoverage

+ glSampleCoverageARB

+ glSampleMaskEXT

+ glSampleMaskSGIS

+ glSamplePatternEXT

+ glSamplePatternSGIS

+ glScaled

+ glScalef

+ glScissor

+ glSecondaryColorPointer

+ glSecondaryColorPointerEXT

+ glSecondaryColor3b

+ glSecondaryColor3bEXT

+ glSecondaryColor3bv

+ glSecondaryColor3bvEXT

+ glSecondaryColor3d

+ glSecondaryColor3dEXT

+ glSecondaryColor3dv

+ glSecondaryColor3dvEXT

+ glSecondaryColor3f

+ glSecondaryColor3fEXT

+ glSecondaryColor3fv

+ glSecondaryColor3fvEXT

+ glSecondaryColor3i

+ glSecondaryColor3iEXT

+ glSecondaryColor3iv

+ glSecondaryColor3ivEXT

+ glSecondaryColor3s

+ glSecondaryColor3sEXT

+ glSecondaryColor3sv

+ glSecondaryColor3svEXT

+ glSecondaryColor3ub

+ glSecondaryColor3ubEXT

+ glSecondaryColor3ubv

+ glSecondaryColor3ubvEXT

+ glSecondaryColor3ui

+ glSecondaryColor3uiEXT

+ glSecondaryColor3uiv

+ glSecondaryColor3uivEXT

+ glSecondaryColor3us

+ glSecondaryColor3usEXT

+ glSecondaryColor3usv

+ glSecondaryColor3usvEXT

+ glSelectBuffer

+ glSeparableFilter2D

+ glSeparableFilter2DEXT

+ glSetFenceNV

+ glShadeModel

+ glSharpenTexFuncSGIS

+ glSpriteParameterfSGIX

+ glSpriteParameterfvSGIX

+ glSpriteParameteriSGIX

+ glSpriteParameterivSGIX

+ glStartInstrumentsSGIX

+ glStencilFunc

+ glStencilMask

+ glStencilOp

+ glStopInstrumentsSGIX

+ glTagSampleBufferSGIX

+ glTbufferMask3DFX

+ glTestFenceNV

+ glTexCoordPointer

+ glTexCoordPointerEXT

+ glTexCoord1d

+ glTexCoord1dv

+ glTexCoord1f

+ glTexCoord1fv

+ glTexCoord1i

+ glTexCoord1iv

+ glTexCoord1s

+ glTexCoord1sv

+ glTexCoord2d

+ glTexCoord2dv

+ glTexCoord2f

+ glTexCoord2fv

+ glTexCoord2i

+ glTexCoord2iv

+ glTexCoord2s

+ glTexCoord2sv

+ glTexCoord3d

+ glTexCoord3dv

+ glTexCoord3f

+ glTexCoord3fv

+ glTexCoord3i

+ glTexCoord3iv

+ glTexCoord3s

+ glTexCoord3sv

+ glTexCoord4d

+ glTexCoord4dv

+ glTexCoord4f

+ glTexCoord4fv

+ glTexCoord4i

+ glTexCoord4iv

+ glTexCoord4s

+ glTexCoord4sv

+ glTexEnvf

+ glTexEnvfv

+ glTexEnvi

+ glTexEnviv

+ glTexFilterFuncSGIS

+ glTexGend

+ glTexGendv

+ glTexGenf

+ glTexGenfv

+ glTexGeni

+ glTexGeniv

+ glTexImage1D

+ glTexImage2D

+ glTexImage3D

+ glTexImage3DEXT

+ glTexImage4DSGIS

+ glTexParameterf

+ glTexParameterfv

+ glTexParameteri

+ glTexParameteriv

+ glTexSubImage1D

+ glTexSubImage1DEXT

+ glTexSubImage2D

+ glTexSubImage2DEXT

+ glTexSubImage3D

+ glTexSubImage3DEXT

+ glTexSubImage4DSGIS

+ glTrackMatrixNV

+ glTranslated

+ glTranslatef

+ glUnlockArraysEXT

+ glUnmapBufferARB

+ glVertexArrayRangeNV

+ glVertexAttribPointerARB

+ glVertexAttribPointerNV

+ glVertexAttribs1dvNV

+ glVertexAttribs1fvNV

+ glVertexAttribs1svNV

+ glVertexAttribs2dvNV

+ glVertexAttribs2fvNV

+ glVertexAttribs2svNV

+ glVertexAttribs3dvNV

+ glVertexAttribs3fvNV

+ glVertexAttribs3svNV

+ glVertexAttribs4dvNV

+ glVertexAttribs4fvNV

+ glVertexAttribs4svNV

+ glVertexAttribs4ubvNV

+ glVertexAttrib1dARB

+ glVertexAttrib1dNV

+ glVertexAttrib1dvARB

+ glVertexAttrib1dvNV

+ glVertexAttrib1fARB

+ glVertexAttrib1fNV

+ glVertexAttrib1fvARB

+ glVertexAttrib1fvNV

+ glVertexAttrib1sARB

+ glVertexAttrib1sNV

+ glVertexAttrib1svARB

+ glVertexAttrib1svNV

+ glVertexAttrib2dARB

+ glVertexAttrib2dNV

+ glVertexAttrib2dvARB

+ glVertexAttrib2dvNV

+ glVertexAttrib2fARB

+ glVertexAttrib2fNV

+ glVertexAttrib2fvARB

+ glVertexAttrib2fvNV

+ glVertexAttrib2sARB

+ glVertexAttrib2sNV

+ glVertexAttrib2svARB

+ glVertexAttrib2svNV

+ glVertexAttrib3dARB

+ glVertexAttrib3dNV

+ glVertexAttrib3dvARB

+ glVertexAttrib3dvNV

+ glVertexAttrib3fARB

+ glVertexAttrib3fNV

+ glVertexAttrib3fvARB

+ glVertexAttrib3fvNV

+ glVertexAttrib3sARB

+ glVertexAttrib3sNV

+ glVertexAttrib3svARB

+ glVertexAttrib3svNV

+ glVertexAttrib4bvARB

+ glVertexAttrib4dARB

+ glVertexAttrib4dNV

+ glVertexAttrib4dvARB

+ glVertexAttrib4dvNV

+ glVertexAttrib4fARB

+ glVertexAttrib4fNV

+ glVertexAttrib4fvARB

+ glVertexAttrib4fvNV

+ glVertexAttrib4ivARB

+ glVertexAttrib4NbvARB

+ glVertexAttrib4NivARB

+ glVertexAttrib4NsvARB

+ glVertexAttrib4NubARB

+ glVertexAttrib4NubvARB

+ glVertexAttrib4NuivARB

+ glVertexAttrib4NusvARB

+ glVertexAttrib4sARB

+ glVertexAttrib4sNV

+ glVertexAttrib4svARB

+ glVertexAttrib4svNV

+ glVertexAttrib4ubNV

+ glVertexAttrib4ubvARB

+ glVertexAttrib4ubvNV

+ glVertexAttrib4uivARB

+ glVertexAttrib4usvARB

+ glVertexPointer

+ glVertexPointerEXT

+ glVertexWeightfEXT

+ glVertexWeightfvEXT

+ glVertexWeightPointerEXT

+ glVertex2d

+ glVertex2dv

+ glVertex2f

+ glVertex2fv

+ glVertex2i

+ glVertex2iv

+ glVertex2s

+ glVertex2sv

+ glVertex3d

+ glVertex3dv

+ glVertex3f

+ glVertex3fv

+ glVertex3i

+ glVertex3iv

+ glVertex3s

+ glVertex3sv

+ glVertex4d

+ glVertex4dv

+ glVertex4f

+ glVertex4fv

+ glVertex4i

+ glVertex4iv

+ glVertex4s

+ glVertex4sv

+ glViewport

+ glWindowPos2d

+ glWindowPos2dARB

+ glWindowPos2dMESA

+ glWindowPos2dv

+ glWindowPos2dvARB

+ glWindowPos2dvMESA

+ glWindowPos2f

+ glWindowPos2fARB

+ glWindowPos2fMESA

+ glWindowPos2fv

+ glWindowPos2fvARB

+ glWindowPos2fvMESA

+ glWindowPos2i

+ glWindowPos2iARB

+ glWindowPos2iMESA

+ glWindowPos2iv

+ glWindowPos2ivARB

+ glWindowPos2ivMESA

+ glWindowPos2s

+ glWindowPos2sARB

+ glWindowPos2sMESA

+ glWindowPos2sv

+ glWindowPos2svARB

+ glWindowPos2svMESA

+ glWindowPos3d

+ glWindowPos3dARB

+ glWindowPos3dMESA

+ glWindowPos3dv

+ glWindowPos3dvARB

+ glWindowPos3dvMESA

+ glWindowPos3f

+ glWindowPos3fARB

+ glWindowPos3fMESA

+ glWindowPos3fv

+ glWindowPos3fvARB

+ glWindowPos3fvMESA

+ glWindowPos3i

+ glWindowPos3iARB

+ glWindowPos3iMESA

+ glWindowPos3iv

+ glWindowPos3ivARB

+ glWindowPos3ivMESA

+ glWindowPos3s

+ glWindowPos3sARB

+ glWindowPos3sMESA

+ glWindowPos3sv

+ glWindowPos3svARB

+ glWindowPos3svMESA

+ glWindowPos4dMESA

+ glWindowPos4dvMESA

+ glWindowPos4fMESA

+ glWindowPos4fvMESA

+ glWindowPos4iMESA

+ glWindowPos4ivMESA

+ glWindowPos4sMESA

+ glWindowPos4svMESA

+ fxCloseHardware

+;fxGetScreenGeometry

+ fxMesaCreateBestContext

+ fxMesaCreateContext

+ fxMesaDestroyContext

+ fxMesaGetCurrentContext

+ fxMesaMakeCurrent

+ fxMesaSelectCurrentBoard

+;fxMesaSetNearFar

+ fxMesaSwapBuffers

+ fxMesaUpdateScreenSize

+ wglChoosePixelFormat

+ wglCopyContext

+ wglCreateContext

+ wglCreateLayerContext

+ wglDeleteContext

+ wglDescribeLayerPlane

+ wglDescribePixelFormat

+ wglGetCurrentContext

+ wglGetCurrentDC

+ wglGetDefaultProcAddress

+ wglGetLayerPaletteEntries

+ wglGetPixelFormat

+ wglGetProcAddress

+ wglMakeCurrent

+ wglRealizeLayerPalette

+ wglSetLayerPaletteEntries

+ wglSetPixelFormat

+ wglShareLists

+ wglSwapBuffers

+ wglSwapLayerBuffers

+ wglUseFontBitmapsA

+ wglUseFontBitmapsW

+ wglUseFontOutlinesA

+ wglUseFontOutlinesW

+ ChoosePixelFormat

+ DescribePixelFormat

+ GetPixelFormat

+ SetPixelFormat

+ SwapBuffers

+ DrvCopyContext

+ DrvCreateContext

+ DrvCreateLayerContext

+ DrvDeleteContext

+ DrvDescribeLayerPlane

+ DrvDescribePixelFormat

+ DrvGetLayerPaletteEntries

+ DrvGetProcAddress

+ DrvReleaseContext

+ DrvRealizeLayerPalette

+ DrvSetContext

+ DrvSetLayerPaletteEntries

+ DrvSetPixelFormat

+ DrvShareLists

+ DrvSwapBuffers

+ DrvSwapLayerBuffers

+ DrvValidateVersion

diff --git a/mesalib/src/mesa/drivers/windows/gdi/InitCritSections.cpp b/mesalib/src/mesa/drivers/windows/gdi/InitCritSections.cpp
new file mode 100644
index 000000000..78e5f3851
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gdi/InitCritSections.cpp
@@ -0,0 +1,33 @@
+#include "glapi.h"

+#include "glThread.h"

+

+#ifdef WIN32

+

+extern "C" _glthread_Mutex OneTimeLock;

+extern "C" _glthread_Mutex GenTexturesLock;

+

+extern "C" void FreeAllTSD(void);

+

+class _CriticalSectionInit

+{

+public:

+	static _CriticalSectionInit	m_inst;

+

+	_CriticalSectionInit()

+	{

+		_glthread_INIT_MUTEX(OneTimeLock);

+		_glthread_INIT_MUTEX(GenTexturesLock);

+	}

+

+	~_CriticalSectionInit()

+	{

+		_glthread_DESTROY_MUTEX(OneTimeLock);

+		_glthread_DESTROY_MUTEX(GenTexturesLock);

+		FreeAllTSD();

+	}

+};

+

+_CriticalSectionInit _CriticalSectionInit::m_inst;

+

+

+#endif /* WIN32 */

diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
index 22b0c46b4..a30326c0c 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1,1661 +1,1661 @@
-/*
- * 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, GLvisual *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 GLframebuffer, return the corresponding WMesaFramebuffer.
- */
-static WMesaFramebuffer wmesa_framebuffer(GLframebuffer *fb)
-{
-    return (WMesaFramebuffer) fb;
-}
-
-
-/**
- * Given a GLcontext, return the corresponding WMesaContext.
- */
-static WMesaContext wmesa_context(const GLcontext *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(GLcontext *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(GLframebuffer *buffer, GLuint *width, GLuint *height)
-{
-    WMesaFramebuffer pwfb = wmesa_framebuffer(buffer);
-    get_window_size(pwfb->hDC, width, height);
-}
-
-
-static void wmesa_flush(GLcontext *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(GLcontext *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(GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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 GLcontext *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(GLcontext *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(GLcontext *ctx, GLframebuffer *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(GLcontext *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(GLcontext *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;
-    GLcontext *ctx;
-    GLvisual *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, 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 )
-{
-    GLcontext *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;
-        GLvisual *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, 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/gdi/wmesadef.h b/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h
index 1c0e24511..530673373 100644
--- a/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h
+++ b/mesalib/src/mesa/drivers/windows/gdi/wmesadef.h
@@ -1,43 +1,43 @@
-#ifndef WMESADEF_H
-#define WMESADEF_H
-#ifdef __MINGW32__
-#include <windows.h>
-#endif
-#include "context.h"
-
-
-/**
- * The Windows Mesa rendering context, derived from GLcontext.
- */
-struct wmesa_context {
-    GLcontext           gl_ctx;	        /* The core GL/Mesa context */
-    HDC                 hDC;
-    COLORREF		clearColorRef;
-    HPEN                clearPen;
-    HBRUSH              clearBrush;
-};
-
-
-/**
- * Windows framebuffer, derived from gl_framebuffer
- */
-struct wmesa_framebuffer
-{
-    struct gl_framebuffer Base;
-    HDC                 hDC;
-    int			pixelformat;
-    GLuint		ScanWidth;
-    int			cColorBits;
-    /* back buffer DIB fields */
-    HDC                 dib_hDC;
-    BITMAPINFO          bmi;
-    HBITMAP             hbmDIB;
-    HBITMAP             hOldBitmap;
-    PBYTE               pbPixels;
-    struct wmesa_framebuffer *next;
-};
-
-typedef struct wmesa_framebuffer *WMesaFramebuffer;
-
-
-#endif /* WMESADEF_H */
+#ifndef WMESADEF_H

+#define WMESADEF_H

+#ifdef __MINGW32__

+#include <windows.h>

+#endif

+#include "context.h"

+

+

+/**

+ * The Windows Mesa rendering context, derived from struct gl_context.

+ */

+struct wmesa_context {

+    struct gl_context           gl_ctx;	        /* The core GL/Mesa context */

+    HDC                 hDC;

+    COLORREF		clearColorRef;

+    HPEN                clearPen;

+    HBRUSH              clearBrush;

+};

+

+

+/**

+ * Windows framebuffer, derived from gl_framebuffer

+ */

+struct wmesa_framebuffer

+{

+    struct gl_framebuffer Base;

+    HDC                 hDC;

+    int			pixelformat;

+    GLuint		ScanWidth;

+    int			cColorBits;

+    /* back buffer DIB fields */

+    HDC                 dib_hDC;

+    BITMAPINFO          bmi;

+    HBITMAP             hbmDIB;

+    HBITMAP             hOldBitmap;

+    PBYTE               pbPixels;

+    struct wmesa_framebuffer *next;

+};

+

+typedef struct wmesa_framebuffer *WMesaFramebuffer;

+

+

+#endif /* WMESADEF_H */

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
index a420b36ff..fabce4c0b 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(GLcontext *, char *);
-extern void _gld_mesa_fatal(GLcontext *, 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(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(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/drivers/windows/gldirect/dglcontext.h b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.h
index 5c433b857..5eea9de3d 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.h
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dglcontext.h
@@ -1,281 +1,281 @@
-/****************************************************************************
-*
-*                        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:  OpenGL context handling.
-*
-****************************************************************************/
-
-#ifndef __DGLCONTEXT_H
-#define __DGLCONTEXT_H
-
-// Disable compiler complaints about DLL linkage
-#pragma warning (disable:4273)
-
-// Macros to control compilation
-#ifndef STRICT
-#define STRICT
-#endif // STRICT
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <GL\gl.h>
-
-#ifdef _USE_GLD3_WGL
-	#include "dglmacros.h"
-	#include "dglglobals.h"
-	#include "pixpack.h"
-	#include "ddlog.h"
-	#include "dglpf.h"
-	#include "context.h"	// Mesa context
-#else
-	#include <ddraw.h>
-	#include <d3d.h>
-
-	#include "dglmacros.h"
-	#include "dglglobals.h"
-	#include "pixpack.h"
-	#include "ddlog.h"
-	#include "dglpf.h"
-	#include "d3dvertex.h"
-
-	#include "DirectGL.h"
-
-	#include "context.h"	// Mesa context
-	#include "vb.h"			// Mesa vertex buffer
-#endif // _USE_GLD3_WGL
-
-/*---------------------- Macros and type definitions ----------------------*/
-
-// TODO: Use a list instead of this constant!
-#define DGL_MAX_CONTEXTS 32
-
-// Structure for describing an OpenGL context
-#ifdef _USE_GLD3_WGL
-typedef struct {
-	BOOL				bHasBeenCurrent;
-	DGL_pixelFormat		*lpPF;
-
-	// Pointer to private driver data (this also contains the drawable).
-	void				*glPriv;
-
-	// Mesa vars:
-	GLcontext			*glCtx;			// The core Mesa context
-	GLvisual			*glVis;			// Describes the color buffer
-	GLframebuffer		*glBuffer;		// Ancillary buffers
-
-	GLuint				ClearIndex;
-	GLuint				CurrentIndex;
-	GLubyte				ClearColor[4];
-	GLubyte				CurrentColor[4];
-
-	BOOL				EmulateSingle;	// Emulate single-buffering
-	BOOL				bDoubleBuffer;
-	BOOL				bDepthBuffer;
-
-	// Shared driver vars:
-	BOOL				bAllocated;
-    BOOL				bFullscreen;	// Is this a fullscreen context?
-    BOOL				bSceneStarted;	// Has a lpDev->BeginScene been issued?
-    BOOL				bCanRender;		// Flag: states whether rendering is OK
-	BOOL				bFrameStarted;	// Has frame update started at all?
-	BOOL				bStencil;		// TRUE if this context has stencil
-	BOOL				bGDIEraseBkgnd; // GDI Erase Background command
-
-	// Window information
-	HWND				hWnd;			// Window handle
-	HDC					hDC;			// Windows' Device Context of the window
-	DWORD				dwWidth;		// Window width
-	DWORD				dwHeight;		// Window height
-	DWORD				dwBPP;			// Window bits-per-pixel;
-	RECT				rcScreenRect;	// Screen rectangle
-	DWORD				dwModeWidth;	// Display mode width
-	DWORD				dwModeHeight;	// Display mode height
-	float				dvClipX;
-	float				dvClipY;
-	LONG				lpfnWndProc;	// window message handler function
-
-} DGL_ctx;
-
-#define GLD_context			DGL_ctx
-#define GLD_GET_CONTEXT(c)	(GLD_context*)(c)->DriverCtx
-
-#else // _USE_GLD3_WGL
-
-typedef struct {
-	BOOL				bHasBeenCurrent;
-	DGL_pixelFormat		*lpPF;
-	//
-	// Mesa context vars:
-	//
-	GLcontext			*glCtx;			// The core Mesa context
-	GLvisual			*glVis;			// Describes the color buffer
-	GLframebuffer		*glBuffer;		// Ancillary buffers
-
-	GLuint				ClearIndex;
-	GLuint				CurrentIndex;
-	GLubyte				ClearColor[4];
-	GLubyte				CurrentColor[4];
-
-	BOOL				EmulateSingle;	// Emulate single-buffering
-	BOOL				bDoubleBuffer;
-	BOOL				bDepthBuffer;
-	int					iZBufferPF;		// Index of Zbuffer pixel format
-
-	// Vertex buffer: one-to-one correlation with Mesa's vertex buffer.
-	// This will be filled by our setup function (see d3dvsetup.c)
-	DGL_TLvertex		gWin[VB_SIZE];	// Transformed and lit vertices
-//	DGL_Lvertex			gObj[VB_SIZE];	// Lit vertices in object coordinates.
-
-	// Indices for DrawIndexedPrimitive.
-	// Clipped quads are drawn seperately, so use VB_SIZE.
-	// 6 indices are needed to make 2 triangles for each possible quad
-//	WORD				wIndices[(VB_SIZE / 4) * 6];
-	WORD				wIndices[32768];
-
-	//
-	// Device driver vars:
-	//
-	BOOL				bAllocated;
-    BOOL				bFullscreen;	// Is this a fullscreen context?
-    BOOL				bSceneStarted;	// Has a lpDev->BeginScene been issued?
-    BOOL				bCanRender;		// Flag: states whether rendering is OK
-	BOOL				bFrameStarted;	// Has frame update started at all?
-
-    // DirectX COM interfaces, postfixed with the interface number
-	IDirectDraw				*lpDD1;
-	IDirectDraw4			*lpDD4;
-	IDirect3D3				*lpD3D3;
-	IDirect3DDevice3		*lpDev3;
-	IDirect3DViewport3		*lpViewport3;
-	IDirectDrawSurface4		*lpFront4;
-	IDirectDrawSurface4		*lpBack4;
-	IDirectDrawSurface4		*lpDepth4;
-
-	// Vertex buffers
-	BOOL					bD3DPipeline; // True if using D3D geometry pipeline
-	IDirect3DVertexBuffer	*m_vbuf;	// Unprocessed vertices
-	IDirect3DVertexBuffer	*m_pvbuf;	// Processed vertices ready to be rendered
-
-	D3DTEXTUREOP		ColorOp[MAX_TEXTURE_UNITS]; // Used for re-enabling texturing
-	D3DTEXTUREOP		AlphaOp[MAX_TEXTURE_UNITS]; // Used for re-enabling texturing
-	struct gl_texture_object *tObj[MAX_TEXTURE_UNITS];
-
-	DDCAPS				ddCaps;			// DirectDraw caps
-	D3DDEVICEDESC		D3DDevDesc;		// Direct3D Device description
-
-	DDPIXELFORMAT		ddpfRender;		// Pixel format of the render buffer
-	DDPIXELFORMAT		ddpfDepth;		// Pixel format of the depth buffer
-
-	BOOL				bStencil;		// TRUE is this context has stencil
-
-	PX_packFunc			fnPackFunc;		// Pixel packing function for SW
-	PX_unpackFunc		fnUnpackFunc;	// Pixel unpacking function for SW
-	PX_packSpanFunc		fnPackSpanFunc;	// Pixel span packer
-
-	D3DVIEWPORT2		d3dViewport;	// D3D Viewport object
-
-	D3DCULL				cullmode;		// Direct3D cull mode
-	D3DCOLOR			curcolor;		// Current color
-	DWORD				dwColorPF;		// Current color, in format of target surface
-	D3DCOLOR			d3dClearColor;	// Clear color
-	D3DCOLOR			ConstantColor;	// For flat shading
-	DWORD				dwClearColorPF;	// Clear color, in format of target surface
-	BOOL				bGDIEraseBkgnd; // GDI Erase Background command
-
-	// Primitive caches
-//	DGL_vertex			LineCache[DGL_MAX_LINE_VERTS];
-//	DGL_vertex			TriCache[DGL_MAX_TRI_VERTS];
-//	DWORD				dwNextLineVert;
-//	DWORD				dwNextTriVert;
-
-	// Window information
-	HWND				hWnd;			// Window handle
-	HDC					hDC;			// Windows' Device Context of the window
-	DWORD				dwWidth;		// Window width
-	DWORD				dwHeight;		// Window height
-	DWORD				dwBPP;			// Window bits-per-pixel;
-	RECT				rcScreenRect;	// Screen rectangle
-	DWORD				dwModeWidth;	// Display mode width
-	DWORD				dwModeHeight;	// Display mode height
-	float				dvClipX;
-	float				dvClipY;
-	LONG				lpfnWndProc;	// window message handler function
-
-	// Shared texture palette
-	IDirectDrawPalette	*lpGlobalPalette;
-
-	// Usage counters.
-	// One of these counters will be incremented when we choose
-	// between hardware and software rendering functions.
-//	DWORD				dwHWUsageCount;	// Hardware usage count
-//	DWORD				dwSWUsageCount;	// Software usage count
-
-	// Texture state flags.
-//	BOOL				m_texturing;		// TRUE is texturing
-//	BOOL				m_mtex;				// TRUE if multitexture
-//	BOOL				m_texHandleValid;	// TRUE if tex state valid
-
-	// Renderstate caches to ensure no redundant state changes
-	DWORD				dwRS[256];		// Renderstates
-	DWORD				dwTSS[2][24];	// Texture-stage states
-	LPDIRECT3DTEXTURE2	lpTex[2];		// Texture (1 per stage)
-
-	DWORD				dwMaxTextureSize;	// Max texture size:
-											// clamped to 1024.
-
-} DGL_ctx;
-#endif // _USE_GLD3_WGL
-
-/*------------------------- Function Prototypes ---------------------------*/
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-HHOOK	hKeyHook;
-LRESULT CALLBACK dglKeyProc(int code,WPARAM wParam,LPARAM lParam);
-
-void		dglInitContextState();
-void		dglDeleteContextState();
-BOOL 		dglIsValidContext(HGLRC a);
-DGL_ctx*	dglGetContextAddress(const HGLRC a);
-HDC 		dglGetCurrentDC(void);
-HGLRC 		dglGetCurrentContext(void);
-HGLRC		dglCreateContext(HDC a, const DGL_pixelFormat *lpPF);
-BOOL		dglMakeCurrent(HDC a, HGLRC b);
-BOOL		dglDeleteContext(HGLRC a);
-BOOL		dglSwapBuffers(HDC hDC);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
+/****************************************************************************

+*

+*                        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:  OpenGL context handling.

+*

+****************************************************************************/

+

+#ifndef __DGLCONTEXT_H

+#define __DGLCONTEXT_H

+

+// Disable compiler complaints about DLL linkage

+#pragma warning (disable:4273)

+

+// Macros to control compilation

+#ifndef STRICT

+#define STRICT

+#endif // STRICT

+#define WIN32_LEAN_AND_MEAN

+#include <windows.h>

+#include <GL\gl.h>

+

+#ifdef _USE_GLD3_WGL

+	#include "dglmacros.h"

+	#include "dglglobals.h"

+	#include "pixpack.h"

+	#include "ddlog.h"

+	#include "dglpf.h"

+	#include "context.h"	// Mesa context

+#else

+	#include <ddraw.h>

+	#include <d3d.h>

+

+	#include "dglmacros.h"

+	#include "dglglobals.h"

+	#include "pixpack.h"

+	#include "ddlog.h"

+	#include "dglpf.h"

+	#include "d3dvertex.h"

+

+	#include "DirectGL.h"

+

+	#include "context.h"	// Mesa context

+	#include "vb.h"			// Mesa vertex buffer

+#endif // _USE_GLD3_WGL

+

+/*---------------------- Macros and type definitions ----------------------*/

+

+// TODO: Use a list instead of this constant!

+#define DGL_MAX_CONTEXTS 32

+

+// Structure for describing an OpenGL context

+#ifdef _USE_GLD3_WGL

+typedef struct {

+	BOOL				bHasBeenCurrent;

+	DGL_pixelFormat		*lpPF;

+

+	// Pointer to private driver data (this also contains the drawable).

+	void				*glPriv;

+

+	// Mesa vars:

+	struct gl_context			*glCtx;			// The core Mesa context

+	struct gl_config			*glVis;			// Describes the color buffer

+	struct gl_framebuffer		*glBuffer;		// Ancillary buffers

+

+	GLuint				ClearIndex;

+	GLuint				CurrentIndex;

+	GLubyte				ClearColor[4];

+	GLubyte				CurrentColor[4];

+

+	BOOL				EmulateSingle;	// Emulate single-buffering

+	BOOL				bDoubleBuffer;

+	BOOL				bDepthBuffer;

+

+	// Shared driver vars:

+	BOOL				bAllocated;

+    BOOL				bFullscreen;	// Is this a fullscreen context?

+    BOOL				bSceneStarted;	// Has a lpDev->BeginScene been issued?

+    BOOL				bCanRender;		// Flag: states whether rendering is OK

+	BOOL				bFrameStarted;	// Has frame update started at all?

+	BOOL				bStencil;		// TRUE if this context has stencil

+	BOOL				bGDIEraseBkgnd; // GDI Erase Background command

+

+	// Window information

+	HWND				hWnd;			// Window handle

+	HDC					hDC;			// Windows' Device Context of the window

+	DWORD				dwWidth;		// Window width

+	DWORD				dwHeight;		// Window height

+	DWORD				dwBPP;			// Window bits-per-pixel;

+	RECT				rcScreenRect;	// Screen rectangle

+	DWORD				dwModeWidth;	// Display mode width

+	DWORD				dwModeHeight;	// Display mode height

+	float				dvClipX;

+	float				dvClipY;

+	LONG				lpfnWndProc;	// window message handler function

+

+} DGL_ctx;

+

+#define GLD_context			DGL_ctx

+#define GLD_GET_CONTEXT(c)	(GLD_context*)(c)->DriverCtx

+

+#else // _USE_GLD3_WGL

+

+typedef struct {

+	BOOL				bHasBeenCurrent;

+	DGL_pixelFormat		*lpPF;

+	//

+	// Mesa context vars:

+	//

+	struct gl_context			*glCtx;			// The core Mesa context

+	struct gl_config			*glVis;			// Describes the color buffer

+	struct gl_framebuffer		*glBuffer;		// Ancillary buffers

+

+	GLuint				ClearIndex;

+	GLuint				CurrentIndex;

+	GLubyte				ClearColor[4];

+	GLubyte				CurrentColor[4];

+

+	BOOL				EmulateSingle;	// Emulate single-buffering

+	BOOL				bDoubleBuffer;

+	BOOL				bDepthBuffer;

+	int					iZBufferPF;		// Index of Zbuffer pixel format

+

+	// Vertex buffer: one-to-one correlation with Mesa's vertex buffer.

+	// This will be filled by our setup function (see d3dvsetup.c)

+	DGL_TLvertex		gWin[VB_SIZE];	// Transformed and lit vertices

+//	DGL_Lvertex			gObj[VB_SIZE];	// Lit vertices in object coordinates.

+

+	// Indices for DrawIndexedPrimitive.

+	// Clipped quads are drawn seperately, so use VB_SIZE.

+	// 6 indices are needed to make 2 triangles for each possible quad

+//	WORD				wIndices[(VB_SIZE / 4) * 6];

+	WORD				wIndices[32768];

+

+	//

+	// Device driver vars:

+	//

+	BOOL				bAllocated;

+    BOOL				bFullscreen;	// Is this a fullscreen context?

+    BOOL				bSceneStarted;	// Has a lpDev->BeginScene been issued?

+    BOOL				bCanRender;		// Flag: states whether rendering is OK

+	BOOL				bFrameStarted;	// Has frame update started at all?

+

+    // DirectX COM interfaces, postfixed with the interface number

+	IDirectDraw				*lpDD1;

+	IDirectDraw4			*lpDD4;

+	IDirect3D3				*lpD3D3;

+	IDirect3DDevice3		*lpDev3;

+	IDirect3DViewport3		*lpViewport3;

+	IDirectDrawSurface4		*lpFront4;

+	IDirectDrawSurface4		*lpBack4;

+	IDirectDrawSurface4		*lpDepth4;

+

+	// Vertex buffers

+	BOOL					bD3DPipeline; // True if using D3D geometry pipeline

+	IDirect3DVertexBuffer	*m_vbuf;	// Unprocessed vertices

+	IDirect3DVertexBuffer	*m_pvbuf;	// Processed vertices ready to be rendered

+

+	D3DTEXTUREOP		ColorOp[MAX_TEXTURE_UNITS]; // Used for re-enabling texturing

+	D3DTEXTUREOP		AlphaOp[MAX_TEXTURE_UNITS]; // Used for re-enabling texturing

+	struct gl_texture_object *tObj[MAX_TEXTURE_UNITS];

+

+	DDCAPS				ddCaps;			// DirectDraw caps

+	D3DDEVICEDESC		D3DDevDesc;		// Direct3D Device description

+

+	DDPIXELFORMAT		ddpfRender;		// Pixel format of the render buffer

+	DDPIXELFORMAT		ddpfDepth;		// Pixel format of the depth buffer

+

+	BOOL				bStencil;		// TRUE is this context has stencil

+

+	PX_packFunc			fnPackFunc;		// Pixel packing function for SW

+	PX_unpackFunc		fnUnpackFunc;	// Pixel unpacking function for SW

+	PX_packSpanFunc		fnPackSpanFunc;	// Pixel span packer

+

+	D3DVIEWPORT2		d3dViewport;	// D3D Viewport object

+

+	D3DCULL				cullmode;		// Direct3D cull mode

+	D3DCOLOR			curcolor;		// Current color

+	DWORD				dwColorPF;		// Current color, in format of target surface

+	D3DCOLOR			d3dClearColor;	// Clear color

+	D3DCOLOR			ConstantColor;	// For flat shading

+	DWORD				dwClearColorPF;	// Clear color, in format of target surface

+	BOOL				bGDIEraseBkgnd; // GDI Erase Background command

+

+	// Primitive caches

+//	DGL_vertex			LineCache[DGL_MAX_LINE_VERTS];

+//	DGL_vertex			TriCache[DGL_MAX_TRI_VERTS];

+//	DWORD				dwNextLineVert;

+//	DWORD				dwNextTriVert;

+

+	// Window information

+	HWND				hWnd;			// Window handle

+	HDC					hDC;			// Windows' Device Context of the window

+	DWORD				dwWidth;		// Window width

+	DWORD				dwHeight;		// Window height

+	DWORD				dwBPP;			// Window bits-per-pixel;

+	RECT				rcScreenRect;	// Screen rectangle

+	DWORD				dwModeWidth;	// Display mode width

+	DWORD				dwModeHeight;	// Display mode height

+	float				dvClipX;

+	float				dvClipY;

+	LONG				lpfnWndProc;	// window message handler function

+

+	// Shared texture palette

+	IDirectDrawPalette	*lpGlobalPalette;

+

+	// Usage counters.

+	// One of these counters will be incremented when we choose

+	// between hardware and software rendering functions.

+//	DWORD				dwHWUsageCount;	// Hardware usage count

+//	DWORD				dwSWUsageCount;	// Software usage count

+

+	// Texture state flags.

+//	BOOL				m_texturing;		// TRUE is texturing

+//	BOOL				m_mtex;				// TRUE if multitexture

+//	BOOL				m_texHandleValid;	// TRUE if tex state valid

+

+	// Renderstate caches to ensure no redundant state changes

+	DWORD				dwRS[256];		// Renderstates

+	DWORD				dwTSS[2][24];	// Texture-stage states

+	LPDIRECT3DTEXTURE2	lpTex[2];		// Texture (1 per stage)

+

+	DWORD				dwMaxTextureSize;	// Max texture size:

+											// clamped to 1024.

+

+} DGL_ctx;

+#endif // _USE_GLD3_WGL

+

+/*------------------------- Function Prototypes ---------------------------*/

+

+#ifdef  __cplusplus

+extern "C" {

+#endif

+

+HHOOK	hKeyHook;

+LRESULT CALLBACK dglKeyProc(int code,WPARAM wParam,LPARAM lParam);

+

+void		dglInitContextState();

+void		dglDeleteContextState();

+BOOL 		dglIsValidContext(HGLRC a);

+DGL_ctx*	dglGetContextAddress(const HGLRC a);

+HDC 		dglGetCurrentDC(void);

+HGLRC 		dglGetCurrentContext(void);

+HGLRC		dglCreateContext(HDC a, const DGL_pixelFormat *lpPF);

+BOOL		dglMakeCurrent(HDC a, HGLRC b);

+BOOL		dglDeleteContext(HGLRC a);

+BOOL		dglSwapBuffers(HDC hDC);

+

+#ifdef  __cplusplus

+}

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.c b/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.c
index 74ecb01a5..37e681dfc 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.c
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.c
@@ -1,2964 +1,2964 @@
-/****************************************************************************
-*
-*                        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:  OpenGL window  functions (wgl*).
-*
-****************************************************************************/
-
-#include "dglwgl.h"
-#ifdef _USE_GLD3_WGL
-#include "gld_driver.h"
-#endif
-
-#include "gl/glu.h"	// MUST USE MICROSOFT'S GLU32!
-
-#ifndef _USE_GLD3_WGL
-extern DGL_mesaFuncs mesaFuncs;
-#endif
-
-// Need to export wgl* functions if using GLD3,
-// otherwise export GLD2 DGL_* functions.
-#ifdef _USE_GLD3_WGL
-#define _GLD_WGL_EXPORT(a) wgl##a
-#else
-#define _GLD_WGL_EXPORT(a) DGL_##a
-#endif
-
-// Calls into Mesa 4.x are different
-#ifdef _USE_GLD3_WGL
-#include "dlist.h"
-#include "drawpix.h"
-#include "get.h"
-#include "matrix.h"
-// NOTE: All the _GLD* macros now call the gl* functions direct.
-//       This ensures that the correct internal pathway is taken. KeithH
-#define _GLD_glNewList		glNewList
-#define _GLD_glBitmap		glBitmap
-#define _GLD_glEndList		glEndList
-#define _GLD_glDeleteLists	glDeleteLists
-#define _GLD_glGetError		glGetError
-#define _GLD_glTranslatef	glTranslatef
-#define _GLD_glBegin		glBegin
-#define _GLD_glVertex2fv	glVertex2fv
-#define _GLD_glEnd			glEnd
-#define _GLD_glNormal3f		glNormal3f
-#define _GLD_glVertex3f		glVertex3f
-#define _GLD_glVertex3fv	glVertex3fv
-#else // _USE_GLD3_WGL
-#define _GLD_glNewList		(*mesaFuncs.glNewList)
-#define _GLD_glBitmap		(*mesaFuncs.glBitmap)
-#define _GLD_glEndList		(*mesaFuncs.glEndList)
-#define _GLD_glDeleteLists	(*mesaFuncs.glDeleteLists)
-#define _GLD_glGetError		(*mesaFuncs.glGetError)
-#define _GLD_glTranslatef	(*mesaFuncs.glTranslatef)
-#define _GLD_glBegin		(*mesaFuncs.glBegin)
-#define _GLD_glVertex2fv	(*mesaFuncs.glVertex2fv)
-#define _GLD_glEnd			(*mesaFuncs.glEnd)
-#define _GLD_glNormal3f		(*mesaFuncs.glNormal3f)
-#define _GLD_glVertex3f		(*mesaFuncs.glVertex3f)
-#define _GLD_glVertex3fv	(*mesaFuncs.glVertex3fv)
-#endif // _USE_GLD3_WGL
-
-// ***********************************************************************
-
-// Emulate SGI DDK calls.
-#define __wglMalloc(a) GlobalAlloc(GPTR, (a))
-#define __wglFree(a) GlobalFree((a))
-
-// ***********************************************************************
-
-// Mesa glu.h and MS glu.h call these different things...
-//#define GLUtesselator GLUtriangulatorObj
-//#define GLU_TESS_VERTEX_DATA GLU_VERTEX_DATA
-
-// For wglFontOutlines
-
-typedef GLUtesselator *(APIENTRY *gluNewTessProto)(void);
-typedef void (APIENTRY *gluDeleteTessProto)(GLUtesselator *tess);
-typedef void (APIENTRY *gluTessBeginPolygonProto)(GLUtesselator *tess, void *polygon_data);
-typedef void (APIENTRY *gluTessBeginContourProto)(GLUtesselator *tess);
-typedef void (APIENTRY *gluTessVertexProto)(GLUtesselator *tess, GLdouble coords[3], void *data);
-typedef void (APIENTRY *gluTessEndContourProto)(GLUtesselator *tess);
-typedef void (APIENTRY *gluTessEndPolygonProto)(GLUtesselator *tess);
-typedef void (APIENTRY *gluTessPropertyProto)(GLUtesselator *tess, GLenum which, GLdouble value);
-typedef void (APIENTRY *gluTessNormalProto)(GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY *gluTessCallbackProto)(GLUtesselator *tess, GLenum which, void (CALLBACK *)());
-
-static HINSTANCE		gluModuleHandle;
-static gluNewTessProto		gluNewTessProc;
-static gluDeleteTessProto	gluDeleteTessProc;
-static gluTessBeginPolygonProto	gluTessBeginPolygonProc;
-static gluTessBeginContourProto	gluTessBeginContourProc;
-static gluTessVertexProto	gluTessVertexProc;
-static gluTessEndContourProto	gluTessEndContourProc;
-static gluTessEndPolygonProto	gluTessEndPolygonProc;
-static gluTessPropertyProto	gluTessPropertyProc;
-static gluTessNormalProto	gluTessNormalProc;
-static gluTessCallbackProto	gluTessCallbackProc;
-
-static HFONT	hNewFont, hOldFont;
-static FLOAT	ScaleFactor;
-
-#define LINE_BUF_QUANT 4000
-#define VERT_BUF_QUANT 4000
-
-static FLOAT*	LineBuf;
-static DWORD	LineBufSize;
-static DWORD	LineBufIndex;
-static FLOAT*	VertBuf;
-static DWORD	VertBufSize;
-static DWORD	VertBufIndex;
-static GLenum	TessErrorOccurred;
-
-static int AppendToLineBuf(
-	FLOAT value);
-
-static int AppendToVertBuf(
-	FLOAT value);
-
-static int DrawGlyph(
-	UCHAR*		glyphBuf,
-	DWORD		glyphSize,
-	FLOAT		chordalDeviation,
-	FLOAT		extrusion,
-	INT		format);
-
-static void FreeLineBuf(void);
-
-static void FreeVertBuf(void);
-
-static long GetWord(
-	UCHAR**		p);
-
-static long GetDWord(
-	UCHAR**		p);
-
-static double GetFixed(
-	UCHAR**		p);
-
-static int InitLineBuf(void);
-
-static int InitVertBuf(void);
-
-static HFONT CreateHighResolutionFont(
-	HDC		hDC);
-
-static int MakeDisplayListFromGlyph(
-	DWORD			listName,
-	UCHAR*			glyphBuf,
-	DWORD			glyphSize,
-	LPGLYPHMETRICSFLOAT	glyphMetricsFloat,
-	FLOAT			chordalDeviation,
-	FLOAT			extrusion,
-	INT			format);
-
-static BOOL LoadGLUTesselator(void);
-static BOOL UnloadGLUTesselator(void);
-
-static int MakeLinesFromArc(
-	FLOAT		x0,
-	FLOAT		y0,
-	FLOAT		x1,
-	FLOAT		y1,
-	FLOAT		x2,
-	FLOAT		y2,
-	DWORD		vertexCountIndex,
-	FLOAT		chordalDeviationSquared);
-
-static int MakeLinesFromGlyph(		UCHAR*		glyphBuf,
-					DWORD		glyphSize,
-					FLOAT		chordalDeviation);
-
-static int MakeLinesFromTTLine(		UCHAR**		pp,
-					DWORD		vertexCountIndex,
-					WORD		pointCount);
-
-static int MakeLinesFromTTPolycurve(	UCHAR**		pp,
-					DWORD		vertexCountIndex,
-					FLOAT		chordalDeviation);
-
-static int MakeLinesFromTTPolygon(	UCHAR**		pp,
-					FLOAT		chordalDeviation);
-
-static int MakeLinesFromTTQSpline(	UCHAR**		pp,
-					DWORD		vertexCountIndex,
-					WORD		pointCount,
-					FLOAT		chordalDeviation);
-
-static void CALLBACK TessCombine(	double		coords[3],
-					void*		vertex_data[4],
-					FLOAT		weight[4],
-					void**		outData);
-
-static void CALLBACK TessError(		GLenum		error);
-
-static void CALLBACK TessVertexOutData(	FLOAT		p[3],
-					GLfloat 	z);
-
-// ***********************************************************************
-
-#ifdef GLD_THREADS
-#pragma message("compiling DGLWGL.C vars for multi-threaded support")
-extern CRITICAL_SECTION CriticalSection;
-extern DWORD dwTLSPixelFormat;			// TLS index for current pixel format
-#endif
-int curPFD = 0;							// Current PFD (static)
-
-// ***********************************************************************
-
-int dglGetPixelFormat(void)
-{
-#ifdef GLD_THREADS
-	int iPixelFormat;
-	// get thread-specific instance
-	if (glb.bMultiThreaded) {
-		__try {
-			iPixelFormat = (int)TlsGetValue(dwTLSPixelFormat);
-		}
-		__except(EXCEPTION_EXECUTE_HANDLER) {
-			iPixelFormat = curPFD;
-		}
-	}
-	// get global static var
-	else {
-		iPixelFormat = curPFD;
-	}
-	return iPixelFormat;
-#else
-	return curPFD;
-#endif
-}
-
-// ***********************************************************************
-
-void dglSetPixelFormat(int iPixelFormat)
-{
-#ifdef GLD_THREADS
-	// set thread-specific instance
-	if (glb.bMultiThreaded) {
-		__try {
-			TlsSetValue(dwTLSPixelFormat, (LPVOID)iPixelFormat);
-		}
-		__except(EXCEPTION_EXECUTE_HANDLER) {
-			curPFD = iPixelFormat;
-		}
-	}
-	// set global static var
-	else {
-		curPFD = iPixelFormat;
-	}
-#else
-	curPFD = iPixelFormat;
-#endif
-}
-
-// ***********************************************************************
-
-int APIENTRY _GLD_WGL_EXPORT(ChoosePixelFormat)(
-	HDC a,
-	CONST PIXELFORMATDESCRIPTOR *ppfd)
-{
-	DGL_pixelFormat			*lpPF = glb.lpPF;
-
-    PIXELFORMATDESCRIPTOR	ppfdBest;
-    int						i;
-	int						bestIndex = -1;
-    int						numPixelFormats;
-	DWORD					dwFlags;
-
-	char					buf[128];
-	char					cat[8];
-
-	DWORD dwAllFlags = 
-					PFD_DRAW_TO_WINDOW |
-					PFD_DRAW_TO_BITMAP |
-					PFD_SUPPORT_GDI |
-					PFD_SUPPORT_OPENGL |
-					PFD_GENERIC_FORMAT |
-					PFD_NEED_PALETTE |
-					PFD_NEED_SYSTEM_PALETTE |
-					PFD_DOUBLEBUFFER |
-					PFD_STEREO |
-					/*PFD_SWAP_LAYER_BUFFERS |*/
-					PFD_DOUBLEBUFFER_DONTCARE |
-					PFD_STEREO_DONTCARE |
-					PFD_SWAP_COPY |
-					PFD_SWAP_EXCHANGE |
-					PFD_GENERIC_ACCELERATED |
-					0;
-
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-	// List may not be built until dglValidate() is called! KeithH
-	lpPF = glb.lpPF;
-
-	//
-	// Lets print the input pixel format to the log
-	// ** Based on "wglinfo" by Nate Robins **
-	//
-	ddlogMessage(DDLOG_SYSTEM, "ChoosePixelFormat:\n");
-	ddlogMessage(DDLOG_INFO, "Input pixel format for ChoosePixelFormat:\n");
-	ddlogMessage(DDLOG_INFO,
-		"   visual  x  bf lv rg d st  r  g  b a  ax dp st accum buffs  ms\n");
-	ddlogMessage(DDLOG_INFO,
-		" id dep cl sp sz l  ci b ro sz sz sz sz bf th cl  r  g  b  a ns b\n");
-	ddlogMessage(DDLOG_INFO,
-		"-----------------------------------------------------------------\n");
-	sprintf(buf, "  .  ");
-
-	sprintf(cat, "%2d ", ppfd->cColorBits);
-	strcat(buf, cat);
-	if(ppfd->dwFlags & PFD_DRAW_TO_WINDOW)      sprintf(cat, "wn ");
-	else if(ppfd->dwFlags & PFD_DRAW_TO_BITMAP) sprintf(cat, "bm ");
-	else sprintf(cat, ".  ");
-	strcat(buf, cat);
-
-	/* should find transparent pixel from LAYERPLANEDESCRIPTOR */
-	sprintf(cat, " . "); 
-	strcat(buf, cat);
-
-	sprintf(cat, "%2d ", ppfd->cColorBits);
-	strcat(buf, cat);
-
-	/* bReserved field indicates number of over/underlays */
-	if(ppfd->bReserved) sprintf(cat, " %d ", ppfd->bReserved);
-	else sprintf(cat, " . "); 
-	strcat(buf, cat);
-
-	sprintf(cat, " %c ", ppfd->iPixelType == PFD_TYPE_RGBA ? 'r' : 'c');
-	strcat(buf, cat);
-
-	sprintf(cat, "%c ", ppfd->dwFlags & PFD_DOUBLEBUFFER ? 'y' : '.');
-	strcat(buf, cat);
-
-	sprintf(cat, " %c ", ppfd->dwFlags & PFD_STEREO ? 'y' : '.');
-	strcat(buf, cat);
-
-	if(ppfd->cRedBits && ppfd->iPixelType == PFD_TYPE_RGBA) 
-	    sprintf(cat, "%2d ", ppfd->cRedBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-
-	if(ppfd->cGreenBits && ppfd->iPixelType == PFD_TYPE_RGBA) 
-	    sprintf(cat, "%2d ", ppfd->cGreenBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-
-	if(ppfd->cBlueBits && ppfd->iPixelType == PFD_TYPE_RGBA) 
-	    sprintf(cat, "%2d ", ppfd->cBlueBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cAlphaBits && ppfd->iPixelType == PFD_TYPE_RGBA) 
-		sprintf(cat, "%2d ", ppfd->cAlphaBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cAuxBuffers)     sprintf(cat, "%2d ", ppfd->cAuxBuffers);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cDepthBits)      sprintf(cat, "%2d ", ppfd->cDepthBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cStencilBits)    sprintf(cat, "%2d ", ppfd->cStencilBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cAccumRedBits)   sprintf(cat, "%2d ", ppfd->cAccumRedBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-
-	if(ppfd->cAccumGreenBits) sprintf(cat, "%2d ", ppfd->cAccumGreenBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cAccumBlueBits)  sprintf(cat, "%2d ", ppfd->cAccumBlueBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	if(ppfd->cAccumAlphaBits) sprintf(cat, "%2d ", ppfd->cAccumAlphaBits);
-	else sprintf(cat, " . ");
-	strcat(buf, cat);
-	
-	/* no multisample in Win32 */
-	sprintf(cat, " . .\n");
-	strcat(buf, cat);
-
-	ddlogMessage(DDLOG_INFO, buf);
-	ddlogMessage(DDLOG_INFO,
-		"-----------------------------------------------------------------\n");
-	ddlogMessage(DDLOG_INFO, "\n");
-
-	//
-	// Examine the flags for correctness
-	//
-	dwFlags = ppfd->dwFlags;
-    if (dwFlags != (dwFlags & dwAllFlags))
-    {
-		/* error: bad dwFlags */
-		ddlogPrintf(DDLOG_WARN,
-					"ChoosePixelFormat: bad flags (0x%x)",
-					dwFlags & (~dwAllFlags));
-		// Mask illegal flags and continue
-		dwFlags = dwFlags & dwAllFlags;
-    }
-	
-    switch (ppfd->iPixelType) {
-    case PFD_TYPE_RGBA:
-    case PFD_TYPE_COLORINDEX:
-		break;
-    default:
-		/* error: bad iPixelType */
-		ddlogMessage(DDLOG_WARN, "ChoosePixelFormat: bad pixel type\n");
-		return 0;
-    }
-	
-    switch (ppfd->iLayerType) {
-    case PFD_MAIN_PLANE:
-    case PFD_OVERLAY_PLANE:
-    case PFD_UNDERLAY_PLANE:
-		break;
-    default:
-		/* error: bad iLayerType */
-		ddlogMessage(DDLOG_WARN, "ChoosePixelFormat: bad layer type\n");
-		return 0;
-    }
-	
-    numPixelFormats = glb.nPixelFormatCount;
-	
-    /* loop through candidate pixel format descriptors */
-    for (i=0; i<numPixelFormats; ++i) {
-		PIXELFORMATDESCRIPTOR ppfdCandidate;
-		
-		memcpy(&ppfdCandidate, &lpPF[i].pfd, sizeof(PIXELFORMATDESCRIPTOR));
-		
-		/*
-		** Check attributes which must match
-		*/
-		if (ppfd->iPixelType != ppfdCandidate.iPixelType) {
-			continue;
-		}
-
-		if (ppfd->iLayerType != ppfdCandidate.iLayerType) {
-			continue;
-		}
-		
-		if (((dwFlags ^ ppfdCandidate.dwFlags) & dwFlags) &
-			(PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP |
-			PFD_SUPPORT_GDI | PFD_SUPPORT_OPENGL))
-		{
-			continue;
-		}
-		
-		if (!(dwFlags & PFD_DOUBLEBUFFER_DONTCARE)) {
-			if ((dwFlags & PFD_DOUBLEBUFFER) !=
-				(ppfdCandidate.dwFlags & PFD_DOUBLEBUFFER))
-			{
-				continue;
-			}
-		}
-		
-//		if (!(dwFlags & PFD_STEREO_DONTCARE)) {
-			if ((dwFlags & PFD_STEREO) !=
-				(ppfdCandidate.dwFlags & PFD_STEREO))
-			{
-				continue;
-			}
-//		}
-		
-        if (ppfd->iPixelType==PFD_TYPE_RGBA
-            && ppfd->cAlphaBits && !ppfdCandidate.cAlphaBits) {
-            continue;
-		}
-		
-        if (ppfd->iPixelType==PFD_TYPE_RGBA
-			&& ppfd->cAccumBits && !ppfdCandidate.cAccumBits) {
-			continue;
-        }
-		
-        if (ppfd->cDepthBits && !ppfdCandidate.cDepthBits) {
-			continue;
-        }
-		
-        if (ppfd->cStencilBits && !ppfdCandidate.cStencilBits) {
-            continue;
-        }
-
-		if (ppfd->cAuxBuffers && !ppfdCandidate.cAuxBuffers) {
-			continue;
-		}
-		
-		/*
-		** See if candidate is better than the previous best choice
-		*/
-		if (bestIndex == -1) {
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-		
-		if ((ppfd->cColorBits > ppfdBest.cColorBits &&
-			ppfdCandidate.cColorBits > ppfdBest.cColorBits) ||
-			(ppfd->cColorBits <= ppfdCandidate.cColorBits &&
-			ppfdCandidate.cColorBits < ppfdBest.cColorBits))
-		{
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-		
-		if (ppfd->iPixelType==PFD_TYPE_RGBA
-            && ppfd->cAlphaBits
-            && ppfdCandidate.cAlphaBits > ppfdBest.cAlphaBits)
-		{
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-		
-		if (ppfd->iPixelType==PFD_TYPE_RGBA
-			&& ppfd->cAccumBits
-            && ppfdCandidate.cAccumBits > ppfdBest.cAccumBits)
-		{
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-		
-		if ((ppfd->cDepthBits > ppfdBest.cDepthBits &&
-			ppfdCandidate.cDepthBits > ppfdBest.cDepthBits) ||
-			(ppfd->cDepthBits <= ppfdCandidate.cDepthBits &&
-			ppfdCandidate.cDepthBits < ppfdBest.cDepthBits))
-		{
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-		
-		if (ppfd->cStencilBits &&
-			ppfdCandidate.cStencilBits > ppfdBest.cStencilBits)
-		{
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-		
-		if (ppfd->cAuxBuffers &&
-			ppfdCandidate.cAuxBuffers > ppfdBest.cAuxBuffers)
-		{
-			ppfdBest = ppfdCandidate;
-			bestIndex = i;
-			continue;
-		}
-    }
-
-	if (bestIndex != -1) {
-		ddlogPrintf(DDLOG_SYSTEM, "Pixel Format %d chosen as best match", bestIndex+1);
-	    return bestIndex + 1;
-	}
-
-	// Return the pixelformat that has the most capabilities.
-	// ** NOTE: This is only possible due to the way the list
-	// of pixelformats is built. **
-	// Now picks best pixelformat. KeithH
-	bestIndex = numPixelFormats;	// most capable double buffer format
-	ddlogPrintf(DDLOG_SYSTEM, "Pixel Format %d chosen by default", bestIndex);
-	return (bestIndex);
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(CopyContext)(
-	HGLRC a,
-	HGLRC b,
-	UINT c)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-    UNSUPPORTED("wglCopyContext")
-    return FALSE; // Failed
-}
-
-// ***********************************************************************
-
-HGLRC APIENTRY _GLD_WGL_EXPORT(CreateContext)(
-	HDC a)
-{
-	int ipf;
-
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-	// Check that the current PFD is valid
-	ipf = dglGetPixelFormat();
-	if (!IsValidPFD(ipf))
-		return (HGLRC)0;
-
-	return dglCreateContext(a, &glb.lpPF[ipf-1]);
-}
-
-// ***********************************************************************
-
-HGLRC APIENTRY _GLD_WGL_EXPORT(CreateLayerContext)(
-	HDC a,
-	int b)
-{
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-    UNSUPPORTED("wglCreateLayerContext")
-    return NULL; // Failed
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(DeleteContext)(
-	HGLRC a)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-    return dglDeleteContext(a);
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(DescribeLayerPlane)(
-	HDC hDC,
-	int iPixelFormat,
-	int iLayerPlane,
-	UINT nBytes,
-	LPLAYERPLANEDESCRIPTOR plpd)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	UNSUPPORTED("DGL_DescribeLayerPlane")
-
-//	gldLogPrintf(GLDLOG_INFO, "DescribeLayerPlane: %d, %d", iPixelFormat, iLayerPlane);
-
-	return FALSE;
-}
-
-// ***********************************************************************
-
-int APIENTRY _GLD_WGL_EXPORT(DescribePixelFormat)(
-	HDC a,
-	int b,
-	UINT c,
-	LPPIXELFORMATDESCRIPTOR d)
-{
-	UINT nSize;
-
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-	if (d == NULL) // Calling app requires max number of PF's
-		return glb.nPixelFormatCount;
-
-	// The supplied buffer may be larger than the info that we
-	// will be copying.
-	if (c > sizeof(PIXELFORMATDESCRIPTOR))
-		nSize = sizeof(PIXELFORMATDESCRIPTOR);
-	else
-		nSize = c;
-
-    // Setup an empty PFD before doing validation check
-    memset(d, 0, nSize);
-    d->nSize = nSize;
-    d->nVersion = 1;
-
-	if (!IsValidPFD(b))
-		return 0; // Bail if PFD index is invalid
-
-	memcpy(d, &glb.lpPF[b-1].pfd, nSize);
-
-	return glb.nPixelFormatCount;
-}
-
-// ***********************************************************************
-
-HGLRC APIENTRY _GLD_WGL_EXPORT(GetCurrentContext)(void)
-{
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-	return dglGetCurrentContext();
-}
-
-// ***********************************************************************
-
-HDC APIENTRY _GLD_WGL_EXPORT(GetCurrentDC)(void)
-{
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-	return dglGetCurrentDC();
-}
-
-// ***********************************************************************
-
-PROC APIENTRY _GLD_WGL_EXPORT(GetDefaultProcAddress)(
-	LPCSTR a)
-{
-	// Validate license
-	if (!dglValidate())
-		return NULL;
-
-    UNSUPPORTED("DGL_GetDefaultProcAddress")
-    return NULL;
-}
-
-// ***********************************************************************
-
-int APIENTRY _GLD_WGL_EXPORT(GetLayerPaletteEntries)(
-	HDC a,
-	int b,
-	int c,
-	int d,
-	COLORREF *e)
-{
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-    UNSUPPORTED("DGL_GetLayerPaletteEntries")
-    return 0;
-}
-
-// ***********************************************************************
-
-int APIENTRY _GLD_WGL_EXPORT(GetPixelFormat)(
-	HDC a)
-{
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-	return dglGetPixelFormat();
-}
-
-// ***********************************************************************
-
-PROC APIENTRY _GLD_WGL_EXPORT(GetProcAddress)(
-	LPCSTR a)
-{
-	PROC dglGetProcAddressD3D(LPCSTR a);
-
-	// Validate license
-	if (!dglValidate())
-		return NULL;
-
-#ifdef _USE_GLD3_WGL
-	return _gldDriver.wglGetProcAddress(a);
-#else
-	return dglGetProcAddressD3D(a);
-#endif
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(MakeCurrent)(
-	HDC a,
-	HGLRC b)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	return dglMakeCurrent(a, b);
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(RealizeLayerPalette)(
-	HDC a,
-	int b,
-	BOOL c)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-    UNSUPPORTED("DGL_RealizeLayerPalette")
-	return FALSE;
-}
-
-// ***********************************************************************
-
-int APIENTRY _GLD_WGL_EXPORT(SetLayerPaletteEntries)(
-	HDC a,
-	int b,
-	int c,
-	int d,
-	CONST COLORREF *e)
-{
-	// Validate license
-	if (!dglValidate())
-		return 0;
-
-    UNSUPPORTED("DGL_SetLayerPaletteEntries")
-	return 0;
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(SetPixelFormat)(
-	HDC a,
-	int b,
-	CONST PIXELFORMATDESCRIPTOR *c)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	if (IsValidPFD(b)) {
-		ddlogPrintf(DDLOG_SYSTEM, "SetPixelFormat: PixelFormat %d has been set", b);
-		dglSetPixelFormat(b);
-		return TRUE;
-	} else {
-		ddlogPrintf(DDLOG_ERROR,
-					"SetPixelFormat: PixelFormat %d is invalid and cannot be set", b);
-		return FALSE;
-	}
-}
-
-// ***********************************************************************
-/*
- * Share lists between two gl_context structures.
- * This was added for WIN32 WGL function support, since wglShareLists()
- * must be called *after* wglCreateContext() with valid GLRCs. (DaveM)
- */
-//
-// Copied from GLD2.x. KeithH
-//
-static GLboolean _gldShareLists(
-	GLcontext *ctx1,
-	GLcontext *ctx2)
-{
-	/* Sanity check context pointers */
-	if (ctx1 == NULL || ctx2 == NULL)
-		return GL_FALSE;
-	/* Sanity check shared list pointers */
-	if (ctx1->Shared == NULL || ctx2->Shared == NULL)
-		return GL_FALSE;
-	/* Decrement reference count on sharee to release previous list */
-	ctx2->Shared->RefCount--;
-#if 0	/* 3DStudio exits on this memory release */
-	if (ctx2->Shared->RefCount == 0)
-		free_shared_state(ctx2, ctx2->Shared);
-#endif
-	/* Re-assign list from sharer to sharee and increment reference count */
-	ctx2->Shared = ctx1->Shared;
-	ctx1->Shared->RefCount++;
-	return GL_TRUE;
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(ShareLists)(
-	HGLRC a,
-	HGLRC b)
-{
-	DGL_ctx *dgl1, *dgl2;
-
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	// Mesa supports shared lists, but you need to supply the shared
-	// GL context info when calling gl_create_context(). An auxiliary
-	// function gl_share_lists() has been added to update the shared
-	// list info after the GL contexts have been created. (DaveM)
-	dgl1 = dglGetContextAddress(a);
-	dgl2 = dglGetContextAddress(b);
-	if (dgl1->bAllocated && dgl2->bAllocated) {
-#ifdef _USE_GLD3_WGL
-		return _gldShareLists(dgl1->glCtx, dgl2->glCtx);
-#else
-		return (*mesaFuncs.gl_share_lists)(dgl1->glCtx, dgl2->glCtx);
-#endif
-	}
-	return FALSE;
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(SwapBuffers)(
-	HDC a)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	return dglSwapBuffers(a);
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(SwapLayerBuffers)(
-	HDC a,
-	UINT b)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	return dglSwapBuffers(a);
-}
-
-// ***********************************************************************
-
-// ***********************************************************************
-// Note: This ResizeBuffers() function may be called from
-// either MESA glViewport() or GLD wglMakeCurrent().
-
-BOOL dglWglResizeBuffers(
-	GLcontext *ctx,
-	BOOL bDefaultDriver)
-{
-	DGL_ctx						*dgl = NULL;
-	RECT						rcScreenRect;
-	DWORD						dwWidth;
-	DWORD						dwHeight;
-	DDSURFACEDESC2				ddsd2;
-	DDSCAPS2					ddscaps2;
-	IDirectDrawClipper			*lpddClipper = NULL;
-	DWORD						dwFlags;
-	HRESULT						hResult;
-
-	DWORD						dwMemoryType;
-
-	int							i;
-	struct gl_texture_object	*tObj;
-	struct gl_texture_image		*image;
-
-	BOOL						bWasFullscreen;
-	BOOL						bSaveDesktop;
-	BOOL						bFullScrnWin = FALSE;
-	DDSURFACEDESC2 				ddsd2DisplayMode;
-
-	DDBLTFX						ddbltfx;
-	POINT						pt;
-	RECT						rcDst;
-#ifdef _USE_GLD3_WGL
-	GLD_displayMode				glddm;
-#endif
-
-#define DDLOG_CRITICAL_OR_WARN	(bDefaultDriver ? DDLOG_WARN : DDLOG_CRITICAL)
-
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	// Sanity checks
-	if (ctx == NULL)
-		return FALSE;
-	dgl = ctx->DriverCtx;
-	if (dgl == NULL)
-		return FALSE;
-
-	// Get the window size and calculate its dimensions
-	if (dgl->hWnd == NULL) {
-		// Check for non-window DC = memory DC ?
-		if (GetClipBox(dgl->hDC, &rcScreenRect) == ERROR)
-			SetRect(&rcScreenRect, 0, 0, 0, 0);
-	}
-	else if (!GetClientRect(dgl->hWnd, &rcScreenRect))
-		SetRect(&rcScreenRect, 0, 0, 0, 0);
-	dwWidth = rcScreenRect.right - rcScreenRect.left;
-	dwHeight = rcScreenRect.bottom - rcScreenRect.top;
-    CopyRect(&dgl->rcScreenRect, &rcScreenRect);
-
-	// This will occur on Alt-Tab
-	if ((dwWidth == 0) && (dwHeight == 0)) {
-		//dgl->bCanRender = FALSE;
-		return TRUE; // No resize possible!
-	}
-
-	// Some apps zero only 1 dimension for non-visible window... (DaveM)
-	if ((dwWidth == 0) || (dwHeight == 0)) {
-		dwWidth = 8;
-		dwHeight = 8;
-	}
-
-	// Test to see if a resize is required.
-	// Note that the dimensions will be the same if a prior resize attempt failed.
-	if ((dwWidth == dgl->dwWidth) && (dwHeight == dgl->dwHeight) && bDefaultDriver) {
-		return TRUE; // No resize required
-	}
-
-	ddlogPrintf(DDLOG_SYSTEM, "dglResize: %dx%d", dwWidth, dwHeight);
-#ifndef _USE_GLD3_WGL
-	// Work out where we want our surfaces created
-	dwMemoryType = (bDefaultDriver) ? glb.dwMemoryType : DDSCAPS_SYSTEMMEMORY;
-#endif // _USE_GLD3_WGL
-
-	// Note previous fullscreen vs window display status
-	bWasFullscreen = dgl->bFullscreen;
-
-#ifdef _USE_GLD3_WGL
-	if (_gldDriver.GetDisplayMode(dgl, &glddm)) {
-		if ( (dwWidth == glddm.Width) &&
-				 (dwHeight == glddm.Height) ) {
-			bFullScrnWin = TRUE;
-		}
-		if (bFullScrnWin && glb.bPrimary && !glb.bFullscreenBlit && !glb.bDirectDrawPersistant) {
-			dgl->bFullscreen = TRUE;
-			ddlogMessage(DDLOG_INFO, "Fullscreen window after resize.\n");
-		}
-		else {
-			dgl->bFullscreen = FALSE;
-			ddlogMessage(DDLOG_INFO, "Non-Fullscreen window after resize.\n");
-		}
-		// Cache the display mode dimensions
-		dgl->dwModeWidth = glddm.Width;
-		dgl->dwModeHeight = glddm.Height;
-	}
-
-	// 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 (dgl->dwWidth > glddm.Width)
-		dgl->dwWidth = glddm.Width;
-	if (dgl->dwHeight > glddm.Height)
-		dgl->dwHeight = glddm.Height;
-#else // _USE_GLD3_WGL
-	// Window resize may have changed to fullscreen
-	ZeroMemory(&ddsd2DisplayMode, sizeof(ddsd2DisplayMode));
-	ddsd2DisplayMode.dwSize = sizeof(ddsd2DisplayMode);
-	hResult = IDirectDraw4_GetDisplayMode(
-					dgl->lpDD4,
-					&ddsd2DisplayMode);
-	if (SUCCEEDED(hResult)) {
-		if ( (dwWidth == ddsd2DisplayMode.dwWidth) &&
-				 (dwHeight == ddsd2DisplayMode.dwHeight) ) {
-			bFullScrnWin = TRUE;
-		}
-		if (bFullScrnWin && glb.bPrimary && !glb.bFullscreenBlit && !glb.bDirectDrawPersistant) {
-			dgl->bFullscreen = TRUE;
-			ddlogMessage(DDLOG_INFO, "Fullscreen window after resize.\n");
-		}
-		else {
-			dgl->bFullscreen = FALSE;
-			ddlogMessage(DDLOG_INFO, "Non-Fullscreen window after resize.\n");
-		}
-		// Cache the display mode dimensions
-		dgl->dwModeWidth = ddsd2DisplayMode.dwWidth;
-		dgl->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 (dgl->dwWidth > ddsd2DisplayMode.dwWidth)
-		dgl->dwWidth = ddsd2DisplayMode.dwWidth;
-	if (dgl->dwHeight > ddsd2DisplayMode.dwHeight)
-		dgl->dwHeight = ddsd2DisplayMode.dwHeight;
-#endif // _USE_GLD3_WGL
-
-	// Note if fullscreen vs window display has changed?
-	bSaveDesktop = (!bWasFullscreen && !dgl->bFullscreen) ? TRUE : FALSE;
-	// Save the desktop primary surface from being destroyed
-	// whenever remaining in windowed mode, since the stereo mode
-	// switches are expensive...
-
-#ifndef _USE_GLD3_WGL
-	// Don't need to re-allocate persistant buffers. (DaveM)
-	// Though we should clear the back buffers to hide artifacts.
-	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers) {
-		dgl->dwWidth = dwWidth;
-		dgl->dwHeight = dwHeight;
-		ZeroMemory(&ddbltfx, sizeof(ddbltfx));
-		ddbltfx.dwSize = sizeof(ddbltfx);
-		ddbltfx.dwFillColor = dgl->dwClearColorPF;
-		IDirectDrawSurface4_Blt(dgl->lpBack4, &rcScreenRect, NULL, NULL,
-			DDBLT_WAIT | DDBLT_COLORFILL, &ddbltfx);
-		return TRUE;
-	}
-
-	// Ensure all rendering is complete
-	if (ctx->Driver.Finish)
-		(*ctx->Driver.Finish)(ctx);
-	if (dgl->bSceneStarted == TRUE) {
-		IDirect3DDevice3_EndScene(dgl->lpDev3);
-		dgl->bSceneStarted = FALSE;
-	}
-#endif // _USE_GLD3_WGL
-	dgl->bCanRender = FALSE;
-
-#ifdef GLD_THREADS
-	// Serialize access to DirectDraw and DDS operations
-	if (glb.bMultiThreaded)
-		EnterCriticalSection(&CriticalSection);
-#endif
-
-#ifndef _USE_GLD3_WGL
-	// Release existing surfaces
-	RELEASE(dgl->lpDev3);
-	RELEASE(dgl->lpDepth4);
-	RELEASE(dgl->lpBack4);
-	if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary)
-        ;
-	else
-	RELEASE(dgl->lpFront4);
-#endif // _USE_GLD3_WGL
-	dgl->dwWidth = dwWidth;
-	dgl->dwHeight = dwHeight;
-
-	// Set defaults
-	dgl->dwModeWidth = dgl->dwWidth;
-	dgl->dwModeHeight = dgl->dwHeight;
-
-#ifdef _USE_GLD3_WGL
-	if (!_gldDriver.ResizeDrawable(dgl, bDefaultDriver, glb.bDirectDrawPersistant, glb.bPersistantBuffers))
-		goto cleanup_and_return_with_error;
-#else // _USE_GLD3_WGL
-
-	if (dgl->bFullscreen) {
-		//
-		// FULLSCREEN
-		//
-
-        // Disable warning popups when in fullscreen mode
-        ddlogWarnOption(FALSE);
-
-		// Have to release the persistant DirectDraw primary surface
-		// if switching to fullscreen mode. So if application wants
-		// persistant display in fullscreen mode, a fullscreen-size
-		// window should be used instead via fullscreen-blit option.
-		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) {
-			RELEASE(glb.lpPrimary4);
-			glb.bDirectDrawPrimary = FALSE;
-		}
-
-		dwFlags = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT;
-		if (glb.bFastFPU)
-			dwFlags |= DDSCL_FPUSETUP;	// optional
-		hResult = IDirectDraw4_SetCooperativeLevel(dgl->lpDD4, dgl->hWnd, dwFlags);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Unable to set Exclusive Fullscreen mode", hResult);
-			goto cleanup_and_return_with_error;
-		}
-
-		hResult = IDirectDraw4_SetDisplayMode(dgl->lpDD4,
-											  dgl->dwModeWidth,
-											  dgl->dwModeHeight,
-											  dgl->dwBPP,
-											  0,
-											  0);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetDisplayMode failed", hResult);
-			goto cleanup_and_return_with_error;
-		}
-
-		// ** The display mode has changed, so dont use MessageBox! **
-
-		ZeroMemory(&ddsd2, sizeof(ddsd2));
-		ddsd2.dwSize = sizeof(ddsd2);
-
-		if (dgl->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(dgl->lpDD4, &ddsd2, &dgl->lpFront4, NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (primary) failed", hResult);
-				goto cleanup_and_return_with_error;
-			}
-			// Render target surface
-			ZeroMemory(&ddscaps2, sizeof(ddscaps2)); // Clear the entire struct.
-			ddscaps2.dwCaps = DDSCAPS_BACKBUFFER;
-			hResult = IDirectDrawSurface4_GetAttachedSurface(dgl->lpFront4, &ddscaps2, &dgl->lpBack4);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: GetAttachedSurface failed", hResult);
-				goto cleanup_and_return_with_error;
-			}
-		} else {
-			// Single buffered
-			// Primary surface
-			ddsd2.dwFlags = DDSD_CAPS;
-			ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE |
-								   //DDSCAPS_3DDEVICE |
-								   dwMemoryType;
-
-			hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpFront4, NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (primary) failed", hResult);
-				goto cleanup_and_return_with_error;
-			}
-
-			dgl->lpBack4 = NULL;
-		}
-	} else {
-		// WINDOWED
-
-        // OK to enable warning popups in windowed mode
-        ddlogWarnOption(glb.bMessageBoxWarnings);
-
-		// Ditto if persistant DirectDraw primary
-		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary)
-			goto DoClipperOnly;
-
-		// WINDOWED
-		dwFlags = DDSCL_NORMAL;
-		if (glb.bMultiThreaded)
-			dwFlags |= DDSCL_MULTITHREADED;
-		if (glb.bFastFPU)
-			dwFlags |= DDSCL_FPUSETUP;	// optional
-		hResult = IDirectDraw4_SetCooperativeLevel(dgl->lpDD4,
-												  dgl->hWnd,
-												  dwFlags);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Unable to set Normal coop level", hResult);
-			goto cleanup_and_return_with_error;
-		}
-		// Primary surface
-		ZeroMemory(&ddsd2, sizeof(ddsd2));
-		ddsd2.dwSize = sizeof(ddsd2);
-		ddsd2.dwFlags = DDSD_CAPS;
-		ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-		hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpFront4, NULL);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (primary) failed", hResult);
-			goto cleanup_and_return_with_error;
-		}
-
-		// Cache the primary surface for persistant DirectDraw state
-		if (glb.bDirectDrawPersistant && !glb.bDirectDrawPrimary) {
-			glb.lpPrimary4 = dgl->lpFront4;
-			IDirectDrawSurface4_AddRef(glb.lpPrimary4);
-			glb.bDirectDrawPrimary = TRUE;
-		}
-
-		// Clipper object
-		hResult = DirectDrawCreateClipper(0, &lpddClipper, NULL);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateClipper failed", hResult);
-			goto cleanup_and_return_with_error;
-		}
-		hResult = IDirectDrawClipper_SetHWnd(lpddClipper, 0, dgl->hWnd);
-		if (FAILED(hResult)) {
-			RELEASE(lpddClipper);
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetHWnd failed", hResult);
-			goto cleanup_and_return_with_error;
-		}
-		hResult = IDirectDrawSurface4_SetClipper(dgl->lpFront4, lpddClipper);
-		RELEASE(lpddClipper); // We have finished with it.
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetClipper failed", hResult);
-			goto cleanup_and_return_with_error;
-		}
-DoClipperOnly:
-		// Update the window for the original clipper
-		if ((glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) || bSaveDesktop) {
-			IDirectDrawSurface4_GetClipper(dgl->lpFront4, &lpddClipper);
-			IDirectDrawClipper_SetHWnd(lpddClipper, 0, dgl->hWnd);
-			RELEASE(lpddClipper);
-		}
-
-		if (dgl->bDoubleBuffer) {
-			// Render target surface
-			ZeroMemory(&ddsd2, sizeof(ddsd2));
-			ddsd2.dwSize = sizeof(ddsd2);
-			ddsd2.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
-			ddsd2.dwWidth        = dgl->dwWidth;
-			ddsd2.dwHeight       = dgl->dwHeight;
-			ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE |
-								   DDSCAPS_OFFSCREENPLAIN |
-								   dwMemoryType;
-			hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpBack4, NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Create Backbuffer failed", hResult);
-				goto cleanup_and_return_with_error;
-			}
-
-		} else {
-			dgl->lpBack4 = NULL;
-		}
-	}
-
-	//
-	// Now create the Zbuffer
-	//
-	if (dgl->bDepthBuffer) {
-		// 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 = dgl->dwWidth;
-		ddsd2.dwHeight = dgl->dwHeight;
-		memcpy(&ddsd2.ddpfPixelFormat,
-			   &glb.lpZBufferPF[dgl->iZBufferPF],
-			   sizeof(DDPIXELFORMAT) );
-
-		// Create a z-buffer
-		hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpDepth4, NULL);
-		if (FAILED(hResult)) {
-			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (ZBuffer) failed", hResult);
-			goto cleanup_and_return_with_error;
-		}
-
-		// Attach Zbuffer to render target
-		TRY(IDirectDrawSurface4_AddAttachedSurface(
-			dgl->bDoubleBuffer ? dgl->lpBack4 : dgl->lpFront4,
-			dgl->lpDepth4),
-			"dglResize: Attach Zbuffer");
-
-	}
-
-	// Clear the newly resized back buffers for the window client area.
-	ZeroMemory(&ddbltfx, sizeof(ddbltfx));
-	ddbltfx.dwSize = sizeof(ddbltfx);
-	ddbltfx.dwFillColor = dgl->dwClearColorPF;
-	IDirectDrawSurface4_Blt(dgl->lpBack4, &rcScreenRect, NULL, NULL,
-		DDBLT_WAIT | DDBLT_COLORFILL, &ddbltfx);
-
-	//
-	// Now that we have a zbuffer we can create the 3D device
-	//
-	hResult = IDirect3D3_CreateDevice(dgl->lpD3D3,
-									  bDefaultDriver ? &glb.d3dGuid : &IID_IDirect3DRGBDevice,
-									  dgl->bDoubleBuffer ? dgl->lpBack4 : dgl->lpFront4,
-									  &dgl->lpDev3,
-									  NULL);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Could not create Direct3D device", hResult);
-		goto cleanup_and_return_with_error;
-	}
-
-	// We must do this as soon as the device is created
-	dglInitStateCaches(dgl);
-
-	//
-	// Viewport
-	//
-	hResult = IDirect3DDevice3_AddViewport(dgl->lpDev3, dgl->lpViewport3);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: AddViewport failed", hResult);
-		goto cleanup_and_return_with_error;
-	}
-
-	// Initialise the viewport
-	dgl->d3dViewport.dwSize = sizeof(dgl->d3dViewport);
-	dgl->d3dViewport.dwX = 0;
-	dgl->d3dViewport.dwY = 0;
-	dgl->d3dViewport.dwWidth = dgl->dwWidth;
-	dgl->d3dViewport.dwHeight = dgl->dwHeight;
-	dgl->d3dViewport.dvClipX = 0;
-	dgl->d3dViewport.dvClipY = 0;
-	dgl->d3dViewport.dvClipWidth = dgl->dwWidth;
-	dgl->d3dViewport.dvClipHeight = dgl->dwHeight;
-//	dgl->d3dViewport.dvMinZ = 0.0f;
-//	dgl->d3dViewport.dvMaxZ = 1.0f;
-	TRY(IDirect3DViewport3_SetViewport2(dgl->lpViewport3, &dgl->d3dViewport),
-		"dglResize: SetViewport2");
-
-	hResult = IDirect3DDevice3_SetCurrentViewport(dgl->lpDev3, dgl->lpViewport3);
-	if (FAILED(hResult)) {
-		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetCurrentViewport failed", hResult);
-		goto cleanup_and_return_with_error;
-	}
-
-	// (Re)Initialise all the Direct3D renderstates
-	dglInitStateD3D(ctx);
-
-	// Now we have to recreate all of our textures (+ mipmaps).
-	// Walk over all textures in hash table
-	// XXX what about the default texture objects (id=0)?
-	{
-		struct _mesa_HashTable *textures = ctx->Shared->TexObjects;
-		GLuint id;
-		for (id = _mesa_HashFirstEntry(textures);
-				 id;
-				 id = _mesa_HashNextEntry(textures, id)) {
-			tObj = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
-			if (tObj->DriverData) {
-				// We could call our TexImage function directly, but it's
-				// safer to use the driver pointer.
-				for (i=0; i<MAX_TEXTURE_LEVELS; i++) {
-					image = tObj->Image[i];
-					if (image) {
-						switch (tObj->Dimensions){
-						case 1:
-							if (ctx->Driver.TexImage)
-								(*ctx->Driver.TexImage)(ctx, GL_TEXTURE_1D, tObj, i, image->Format, image);
-							break;
-						case 2:
-							if (ctx->Driver.TexImage)
-								(*ctx->Driver.TexImage)(ctx, GL_TEXTURE_2D, tObj, i, image->Format, image);
-							break;
-						default:
-							break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// Re-Bind each texture Unit
-	for (i=0; i<glb.wMaxSimultaneousTextures; i++) {
-		tObj = ctx->Texture.Unit[i].Current;
-		if (tObj) {
-			DGL_texture *lpTex = (DGL_texture *)tObj->DriverData;
-			hResult = dglSetTexture(dgl, i, lpTex ? lpTex->lpTexture : NULL);
-			if (FAILED(hResult)) {
-				ddlogError(DDLOG_ERROR, "dglResize: SetTexture failed", hResult);
-			}
-		}
-	}
-#endif // _USE_GLD3_WGL
-
-	dgl->bCanRender = TRUE;
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-	// SUCCESS.
-	return TRUE;
-
-cleanup_and_return_with_error:
-	// Relase all interfaces before returning.
-#ifdef _USE_GLD3_WGL
-	_gldDriver.DestroyDrawable(dgl);
-#else // _USE_GLD3_WGL
-	RELEASE(dgl->lpDev3);
-	RELEASE(dgl->lpDepth4);
-	RELEASE(dgl->lpBack4);
-	if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary)
-		;
-	else
-	RELEASE(dgl->lpFront4);
-
-#undef DDLOG_CRITICAL_OR_WARN
-#endif // _USE_GLD3_WGL
-
-	// Mark context as not being able to render
-	dgl->bCanRender = FALSE;
-
-#ifdef GLD_THREADS
-	// Release serialized access
-	if (glb.bMultiThreaded)
-		LeaveCriticalSection(&CriticalSection);
-#endif
-
-	return FALSE;
-}
-
-// ***********************************************************************
-// ***********************************************************************
-// Support for bitmap fonts.
-// ***********************************************************************
-// ***********************************************************************
-
-/*****************************************************************************
-**
-** InvertGlyphBitmap.
-**
-** Invert the bitmap so that it suits OpenGL's representation.
-** Each row starts on a double word boundary.
-**
-*****************************************************************************/
-
-static void InvertGlyphBitmap(
-	int w,
-	int h,
-	DWORD *fptr,
-	DWORD *tptr)
-{
-	int dWordsInRow = (w+31)/32;
-	int i, j;
-	DWORD *tmp = tptr;
-
-	if (w <= 0 || h <= 0) {
-	return;
-	}
-
-	tptr += ((h-1)*dWordsInRow);
-	for (i = 0; i < h; i++) {
-	for (j = 0; j < dWordsInRow; j++) {
-		*(tptr + j) = *(fptr + j);
-	}
-	tptr -= dWordsInRow;
-	fptr += dWordsInRow;
-	}
-}
-
-// ***********************************************************************
-
-/*****************************************************************************
- * wglUseFontBitmaps
- *
- * Converts a subrange of the glyphs in a GDI font to OpenGL display
- * lists.
- *
- * Extended to support any GDI font, not just TrueType fonts. (DaveM)
- *
- *****************************************************************************/
-
-BOOL APIENTRY _GLD_WGL_EXPORT(UseFontBitmapsA)(
-	HDC hDC,
-	DWORD first,
-	DWORD count,
-	DWORD listBase)
-{
-	int					i, ox, oy, ix, iy;
-	int					w, h;
-	int					iBufSize, iCurBufSize = 0;
-	DWORD				*bitmapBuffer = NULL;
-	DWORD				*invertedBitmapBuffer = NULL;
-	BOOL				bSuccessOrFail = TRUE;
-	BOOL				bTrueType = FALSE;
-	TEXTMETRIC			tm;
-	GLYPHMETRICS		gm;
-	RASTERIZER_STATUS	rs;
-	MAT2				mat;
-	SIZE				size;
-	RECT				rect;
-	HDC					hDCMem;
-	HBITMAP				hBitmap;
-	BITMAPINFO			bmi;
-	HFONT				hFont;
-
-	// Validate SciTech DirectGL license
-	if (!dglValidate())
-		return FALSE;
-
-	// Set up a unity matrix.
-	ZeroMemory(&mat, sizeof(mat));
-	mat.eM11.value = 1;
-	mat.eM22.value = 1;
-
-	// Test to see if selected font is TrueType or not
-	ZeroMemory(&tm, sizeof(tm));
-	if (!GetTextMetrics(hDC, &tm)) {
-		ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: Font metrics error\n");
-		return (FALSE);
-	}
-	bTrueType = (tm.tmPitchAndFamily & TMPF_TRUETYPE) ? TRUE : FALSE;
-
-	// Test to see if TRUE-TYPE capabilities are installed
-	// (only necessary if TrueType font selected)
-	ZeroMemory(&rs, sizeof(rs));
-	if (bTrueType) {
-		if (!GetRasterizerCaps (&rs, sizeof (RASTERIZER_STATUS))) {
-			ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: Raster caps error\n");
-			return (FALSE);
-		}
-		if (!(rs.wFlags & TT_ENABLED)) {
-			ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: No TrueType caps\n");
-			return (FALSE);
-		}
-	}
-
-	// Trick to get the current font handle
-	hFont = SelectObject(hDC, GetStockObject(SYSTEM_FONT));
-	SelectObject(hDC, hFont);
-
-	// Have memory device context available for holding bitmaps of font glyphs
-	hDCMem = CreateCompatibleDC(hDC);
-	SelectObject(hDCMem, hFont);
-	SetTextColor(hDCMem, RGB(0xFF, 0xFF, 0xFF));
-	SetBkColor(hDCMem, 0);
-
-	for (i = first; (DWORD) i < (first + count); i++) {
-		// Find out how much space is needed for the bitmap so we can
-		// Set the buffer size correctly.
-		if (bTrueType) {
-			// Use TrueType support to get bitmap size of glyph
-			iBufSize = GetGlyphOutline(hDC, i, GGO_BITMAP, &gm,
-				0, NULL, &mat);
-			if (iBufSize == GDI_ERROR) {
-				bSuccessOrFail = FALSE;
-				break;
-			}
-		}
-		else {
-			// Use generic GDI support to compute bitmap size of glyph
-			w = tm.tmMaxCharWidth;
-			h = tm.tmHeight;
-			if (GetTextExtentPoint32(hDC, (LPCTSTR)&i, 1, &size)) {
-				w = size.cx;
-				h = size.cy;
-			}
-			iBufSize = w * h;
-			// Use DWORD multiple for compatibility
-			iBufSize += 3;
-			iBufSize /= 4;
-			iBufSize *= 4;
-		}
-
-		// If we need to allocate Larger Buffers, then do so - but allocate
-		// An extra 50 % so that we don't do too many mallocs !
-		if (iBufSize > iCurBufSize) {
-			if (bitmapBuffer) {
-				__wglFree(bitmapBuffer);
-			}
-			if (invertedBitmapBuffer) {
-				__wglFree(invertedBitmapBuffer);
-			}
-
-			iCurBufSize = iBufSize * 2;
-			bitmapBuffer = (DWORD *) __wglMalloc(iCurBufSize);
-			invertedBitmapBuffer = (DWORD *) __wglMalloc(iCurBufSize);
-
-			if (bitmapBuffer == NULL || invertedBitmapBuffer == NULL) {
-				bSuccessOrFail = FALSE;
-				break;
-			}
-		}
-
-		// If we fail to get the Glyph data, delete the display lists
-		// Created so far and return FALSE.
-		if (bTrueType) {
-			// Use TrueType support to get bitmap of glyph
-			if (GetGlyphOutline(hDC, i, GGO_BITMAP, &gm,
-					iBufSize, bitmapBuffer, &mat) == GDI_ERROR) {
-				bSuccessOrFail = FALSE;
-				break;
-			}
-
-			// Setup glBitmap parameters for current font glyph
-			w  = gm.gmBlackBoxX;
-			h  = gm.gmBlackBoxY;
-			ox = gm.gmptGlyphOrigin.x;
-			oy = gm.gmptGlyphOrigin.y;
-			ix = gm.gmCellIncX;
-			iy = gm.gmCellIncY;
-		}
-		else {
-			// Use generic GDI support to create bitmap of glyph
-			ZeroMemory(bitmapBuffer, iBufSize);
-
-			if (i >= tm.tmFirstChar && i <= tm.tmLastChar) {
-				// Only create bitmaps for actual font glyphs
-				hBitmap = CreateBitmap(w, h, 1, 1, NULL);
-				SelectObject(hDCMem, hBitmap);
-				// Make bitmap of current font glyph
-				SetRect(&rect, 0, 0, w, h);
-				DrawText(hDCMem, (LPCTSTR)&i, 1, &rect,
-					DT_LEFT | DT_BOTTOM | DT_SINGLELINE | DT_NOCLIP);
-				// Make copy of bitmap in our local buffer
-				ZeroMemory(&bmi, sizeof(bmi));
-				bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-				bmi.bmiHeader.biWidth = w;
-				bmi.bmiHeader.biHeight = -h;
-				bmi.bmiHeader.biPlanes = 1;
-				bmi.bmiHeader.biBitCount = 1;
-				bmi.bmiHeader.biCompression = BI_RGB;
-				GetDIBits(hDCMem, hBitmap, 0, h, bitmapBuffer, &bmi, 0);
-				DeleteObject(hBitmap);
-			}
-			else {
-				// Otherwise use empty display list for non-existing glyph
-				iBufSize = 0;
-			}
-
-			// Setup glBitmap parameters for current font glyph
-			ox = 0;
-			oy = tm.tmDescent;
-			ix = w;
-			iy = 0;
-		}
-
-		// Create an OpenGL display list.
-		_GLD_glNewList((listBase + i), GL_COMPILE);
-
-		// Some fonts have no data for the space character, yet advertise
-		// a non-zero size.
-		if (0 == iBufSize) {
-			_GLD_glBitmap(0, 0, 0.0f, 0.0f, (GLfloat) ix, (GLfloat) iy, NULL);
-		} else {
-			// Invert the Glyph data.
-			InvertGlyphBitmap(w, h, bitmapBuffer, invertedBitmapBuffer);
-
-			// Render an OpenGL bitmap and invert the origin.
-			_GLD_glBitmap(w, h,
-				(GLfloat) ox, (GLfloat) (h-oy),
-				(GLfloat) ix, (GLfloat) iy,
-				(GLubyte *) invertedBitmapBuffer);
-		}
-
-		// Close this display list.
-		_GLD_glEndList();
-	}
-
-	if (bSuccessOrFail == FALSE) {
-		ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: Get glyph failed\n");
-		_GLD_glDeleteLists((i+listBase), (i-first));
-	}
-
-	// Release resources used
-	DeleteObject(hFont);
-	DeleteDC(hDCMem);
-
-	if (bitmapBuffer)
-		__wglFree(bitmapBuffer);
-	if (invertedBitmapBuffer)
-		__wglFree(invertedBitmapBuffer);
-
-	return(bSuccessOrFail);
-}
-
-// ***********************************************************************
-
-BOOL APIENTRY _GLD_WGL_EXPORT(UseFontBitmapsW)(
-	HDC a,
-	DWORD b,
-	DWORD c,
-	DWORD d)
-{
-	// Validate license
-	if (!dglValidate())
-		return FALSE;
-
-	return _GLD_WGL_EXPORT(UseFontBitmapsA)(a, b, c, d);
-}
-
-// ***********************************************************************
-// ***********************************************************************
-// Support for outline TrueType fonts.
-// ***********************************************************************
-// ***********************************************************************
-
-void * __wglRealloc(
-	void *oldPtr,
-	size_t newSize)
-{
-    void *newPtr = NULL;
-	
-    if (newSize != 0) {
-		newPtr = (void *) GlobalAlloc(GPTR, newSize);
-		if (oldPtr && newPtr) {
-			DWORD oldSize = GlobalSize(oldPtr);
-			
-			memcpy(newPtr, oldPtr, (oldSize <= newSize ? oldSize : newSize));
-			GlobalFree(oldPtr);
-		}
-    } else if (oldPtr) {
-		GlobalFree(oldPtr);
-    }
-    if (newPtr == NULL) {
-		return NULL;	/* XXX out of memory error */
-    }
-    return newPtr;
-}
-
-// ***********************************************************************
-
-
-/*****************************************************************************
- * wglUseFontOutlinesW
- *
- * Converts a subrange of the glyphs in a TrueType font to OpenGL display
- * lists.
- *****************************************************************************/
-
-BOOL APIENTRY _GLD_WGL_EXPORT(UseFontOutlinesW)(
-	IN	HDC			hDC,
-	IN	DWORD			first,
-	IN	DWORD			count,
-	IN	DWORD			listBase,
-	IN	FLOAT			chordalDeviation,
-	IN	FLOAT			extrusion,
-	IN	INT			format,
-	OUT	LPGLYPHMETRICSFLOAT	lpgmf)
-{
-	return _GLD_WGL_EXPORT(UseFontOutlinesA)(hDC, first, count, listBase,
-		chordalDeviation, extrusion, format, lpgmf);
-}
-
-/*****************************************************************************
- * wglUseFontOutlinesA
- *
- * Converts a subrange of the glyphs in a TrueType font to OpenGL display
- * lists.
- *****************************************************************************/
-
-BOOL APIENTRY _GLD_WGL_EXPORT(UseFontOutlinesA)(
-	IN	HDC			hDC,
-			IN	DWORD			first,
-			IN	DWORD			count,
-			IN	DWORD			listBase,
-			IN	FLOAT			chordalDeviation,
-			IN	FLOAT			extrusion,
-			IN	INT			format,
-			OUT	LPGLYPHMETRICSFLOAT	glyphMetricsFloatArray)
-	{
-	DWORD	glyphIndex;
-	UCHAR*	glyphBuf;
-	DWORD	glyphBufSize;
-
-
-	/*
-	 * Flush any previous OpenGL errors.  This allows us to check for
-	 * new errors so they can be reported via the function return value.
-	 */
-	while (_GLD_glGetError() != GL_NO_ERROR)
-		;
-
-	/*
-	 * Make sure that the current font can be sampled accurately.
-	 */
-	hNewFont = CreateHighResolutionFont(hDC);
-	if (!hNewFont)
-		return FALSE;
-
-	hOldFont = SelectObject(hDC, hNewFont);
-	if (!hOldFont)
-		return FALSE;
-
-	/*
-	 * Preallocate a buffer for the outline data, and track its size:
-	 */
-	glyphBuf = (UCHAR*) __wglMalloc(glyphBufSize = 10240);
-	if (!glyphBuf)
-		return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/
-
-	/*
-	 * Process each glyph in the given range:
-	 */
-	for (glyphIndex = first; glyphIndex - first < count; ++glyphIndex)
-		{
-		GLYPHMETRICS	glyphMetrics;
-		DWORD		glyphSize;
-		static MAT2	matrix =
-			{
-			{0, 1},		{0, 0},
-			{0, 0},		{0, 1}
-			};
-		LPGLYPHMETRICSFLOAT glyphMetricsFloat =
-			&glyphMetricsFloatArray[glyphIndex - first];
-
-
-		/*
-		 * Determine how much space is needed to store the glyph's
-		 * outlines.  If our glyph buffer isn't large enough,
-		 * resize it.
-		 */
-		glyphSize = GetGlyphOutline(	hDC,
-						glyphIndex,
-						GGO_NATIVE,
-						&glyphMetrics,
-						0,
-						NULL,
-						&matrix
-						);
-		if (glyphSize < 0)
-			return FALSE; /*WGL_STATUS_FAILURE*/
-		if (glyphSize > glyphBufSize)
-			{
-			__wglFree(glyphBuf);
-			glyphBuf = (UCHAR*) __wglMalloc(glyphBufSize = glyphSize);
-			if (!glyphBuf)
-				return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/
-			}
-
-
-		/*
-		 * Get the glyph's outlines.
-		 */
-		if (GetGlyphOutline(	hDC,
-					glyphIndex,
-					GGO_NATIVE,
-					&glyphMetrics,
-					glyphBufSize,
-					glyphBuf,
-					&matrix
-					) < 0)
-			{
-			__wglFree(glyphBuf);
-			return FALSE; /*WGL_STATUS_FAILURE*/
-			}
-		
-		glyphMetricsFloat->gmfBlackBoxX =
-			(FLOAT) glyphMetrics.gmBlackBoxX * ScaleFactor;
-		glyphMetricsFloat->gmfBlackBoxY =
-			(FLOAT) glyphMetrics.gmBlackBoxY * ScaleFactor;
-		glyphMetricsFloat->gmfptGlyphOrigin.x =
-			(FLOAT) glyphMetrics.gmptGlyphOrigin.x * ScaleFactor;
-		glyphMetricsFloat->gmfptGlyphOrigin.y =
-			(FLOAT) glyphMetrics.gmptGlyphOrigin.y * ScaleFactor;
-		glyphMetricsFloat->gmfCellIncX =
-			(FLOAT) glyphMetrics.gmCellIncX * ScaleFactor;
-		glyphMetricsFloat->gmfCellIncY =
-			(FLOAT) glyphMetrics.gmCellIncY * ScaleFactor;
-		
-		/*
-		 * Turn the glyph into a display list:
-		 */
-		if (!MakeDisplayListFromGlyph(	(glyphIndex - first) + listBase,
-						glyphBuf,
-						glyphSize,
-						glyphMetricsFloat,
-						chordalDeviation + ScaleFactor,
-						extrusion,
-						format))
-			{
-			__wglFree(glyphBuf);
-			return FALSE; /*WGL_STATUS_FAILURE*/
-			}
-		}
-
-
-	/*
-	 * Clean up temporary storage and return.  If an error occurred,
-	 * clear all OpenGL error flags and return FAILURE status;
-	 * otherwise just return SUCCESS.
-	 */
-	__wglFree(glyphBuf);
-
-	SelectObject(hDC, hOldFont);
-
-	if (_GLD_glGetError() == GL_NO_ERROR)
-		return TRUE; /*WGL_STATUS_SUCCESS*/
-	else
-		{
-		while (_GLD_glGetError() != GL_NO_ERROR)
-			;
-		return FALSE; /*WGL_STATUS_FAILURE*/
-		}
-	}
-
-
-
-/*****************************************************************************
- * CreateHighResolutionFont
- *
- * Gets metrics for the current font and creates an equivalent font
- * scaled to the design units of the font.
- * 
- *****************************************************************************/
-
-static HFONT
-CreateHighResolutionFont(HDC hDC)
-	{
-	UINT otmSize;
-	OUTLINETEXTMETRIC *otm;
-	LONG fontHeight, fontWidth, fontUnits;
-	LOGFONT logFont;
-
-	otmSize = GetOutlineTextMetrics(hDC, 0, NULL);
-	if (otmSize == 0) 
-		return NULL;
-
-	otm = (OUTLINETEXTMETRIC *) __wglMalloc(otmSize);
-	if (otm == NULL)
-		return NULL;
-
-	otm->otmSize = otmSize;
-	if (GetOutlineTextMetrics(hDC, otmSize, otm) == 0) 
-		return NULL;
-	
-	fontHeight = otm->otmTextMetrics.tmHeight -
-			otm->otmTextMetrics.tmInternalLeading;
-	fontWidth = otm->otmTextMetrics.tmAveCharWidth;
-	fontUnits = (LONG) otm->otmEMSquare;
-	
-	ScaleFactor = 1.0F / (FLOAT) fontUnits;
-
-	logFont.lfHeight = - ((LONG) fontUnits);
-	logFont.lfWidth = (LONG)
-		((FLOAT) (fontWidth * fontUnits) / (FLOAT) fontHeight);
-	logFont.lfEscapement = 0;
-	logFont.lfOrientation = 0;
-	logFont.lfWeight = otm->otmTextMetrics.tmWeight;
-	logFont.lfItalic = otm->otmTextMetrics.tmItalic;
-	logFont.lfUnderline = otm->otmTextMetrics.tmUnderlined;
-	logFont.lfStrikeOut = otm->otmTextMetrics.tmStruckOut;
-	logFont.lfCharSet = otm->otmTextMetrics.tmCharSet;
-	logFont.lfOutPrecision = OUT_OUTLINE_PRECIS;
-	logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
-	logFont.lfQuality = DEFAULT_QUALITY;
-	logFont.lfPitchAndFamily =
-		otm->otmTextMetrics.tmPitchAndFamily & 0xf0;
-	strcpy(logFont.lfFaceName,
-	       (char *)otm + (int)otm->otmpFaceName);
-
-	hNewFont = CreateFontIndirect(&logFont);
-	if (hNewFont == NULL)
-		return NULL;
-
-	__wglFree(otm);
-
-	return hNewFont;
-	}
-
-
-
-/*****************************************************************************
- * MakeDisplayListFromGlyph
- * 
- * Converts the outline of a glyph to an OpenGL display list.
- *
- * Return value is nonzero for success, zero for failure.
- *
- * Does not check for OpenGL errors, so if the caller needs to know about them,
- * it should call glGetError().
- *****************************************************************************/
-
-static int
-MakeDisplayListFromGlyph(	IN  DWORD		listName,
-				IN  UCHAR*		glyphBuf,
-				IN  DWORD		glyphSize,
-				IN  LPGLYPHMETRICSFLOAT	glyphMetricsFloat,
-				IN  FLOAT		chordalDeviation,
-				IN  FLOAT		extrusion,
-				IN  INT			format)
-	{
-	int status;
-
-	_GLD_glNewList(listName, GL_COMPILE);
-		status = DrawGlyph(	glyphBuf,
-					glyphSize,
-					chordalDeviation,
-					extrusion,
-					format);
-		
-	_GLD_glTranslatef(glyphMetricsFloat->gmfCellIncX,
-		     glyphMetricsFloat->gmfCellIncY,
-		     0.0F);
-	_GLD_glEndList();
-
-	return status;
-	}
-
-
-
-/*****************************************************************************
- * DrawGlyph
- * 
- * Converts the outline of a glyph to OpenGL drawing primitives, tessellating
- * as needed, and then draws the glyph.  Tessellation of the quadratic splines
- * in the outline is controlled by "chordalDeviation", and the drawing
- * primitives (lines or polygons) are selected by "format".
- *
- * Return value is nonzero for success, zero for failure.
- *
- * Does not check for OpenGL errors, so if the caller needs to know about them,
- * it should call glGetError().
- *****************************************************************************/
-
-static int
-DrawGlyph(	IN  UCHAR*	glyphBuf,
-		IN  DWORD	glyphSize,
-		IN  FLOAT	chordalDeviation,
-		IN  FLOAT	extrusion,
-		IN  INT		format)
-	{
-	INT			status = 0;
-	FLOAT*			p;
-	DWORD			loop;
-	DWORD			point;
-	GLUtesselator*		tess = NULL;
-
-
-	/*
-	 * Initialize the global buffer into which we place the outlines:
-	 */
-	if (!InitLineBuf())
-		goto exit;
-
-
-	/*
-	 * Convert the glyph outlines to a set of polyline loops.
-	 * (See MakeLinesFromGlyph() for the format of the loop data
-	 * structure.)
-	 */
-	if (!MakeLinesFromGlyph(glyphBuf, glyphSize, chordalDeviation))
-		goto exit;
-	p = LineBuf;
-
-
-	/*
-	 * Now draw the loops in the appropriate format:
-	 */
-	if (format == WGL_FONT_LINES)
-		{
-		/*
-		 * This is the easy case.  Just draw the outlines.
-		 */
-		for (loop = (DWORD) *p++; loop; --loop)
-			{
-			_GLD_glBegin(GL_LINE_LOOP);
-				for (point = (DWORD) *p++; point; --point)
-					{
-					_GLD_glVertex2fv(p);
-					p += 2;
-					}
-			_GLD_glEnd();
-			}
-		status = 1;
-		}
-
-	else if (format == WGL_FONT_POLYGONS)
-		{
-		double v[3];
-		FLOAT *save_p = p;
-		GLfloat z_value;
-		
-		/*
-		 * This is the hard case.  We have to set up a tessellator
-		 * to convert the outlines into a set of polygonal
-		 * primitives, which the tessellator passes to some
-		 * auxiliary routines for drawing.
-		 */
-		if (!LoadGLUTesselator())
-			goto exit;
-		if (!InitVertBuf())
-			goto exit;
-		if (!(tess = gluNewTessProc()))
-			goto exit;
-		gluTessCallbackProc(tess,	GLU_BEGIN,	(void(CALLBACK *)()) _GLD_glBegin);
-		gluTessCallbackProc(tess,	GLU_TESS_VERTEX_DATA,
-				    (void(CALLBACK *)()) TessVertexOutData);
-		gluTessCallbackProc(tess,	GLU_END,	(void(CALLBACK *)()) _GLD_glEnd);
-		gluTessCallbackProc(tess,	GLU_ERROR,	(void(CALLBACK *)()) TessError);
-		gluTessCallbackProc(tess,	GLU_TESS_COMBINE, (void(CALLBACK *)()) TessCombine);
-		gluTessNormalProc(tess,	0.0F, 0.0F, 1.0F);
-
-		TessErrorOccurred = 0;
-		_GLD_glNormal3f(0.0f, 0.0f, 1.0f);
-		v[2] = 0.0;
-		z_value = 0.0f;
-
-		gluTessBeginPolygonProc(tess, (void *)*(int *)&z_value);
-			for (loop = (DWORD) *p++; loop; --loop)
-				{
-				gluTessBeginContourProc(tess);
-				
-				for (point = (DWORD) *p++; point; --point)
-					{
-					v[0] = p[0];
-					v[1] = p[1];
-					gluTessVertexProc(tess, v, p);
-					p += 2;
-					}
-
-				gluTessEndContourProc(tess);
-				}
-		gluTessEndPolygonProc(tess);
-
-		status = !TessErrorOccurred;
-
-		/* Extrusion code */
-		if (extrusion) {
-			DWORD loops;
-			GLfloat thickness = (GLfloat) -extrusion;
-			FLOAT *vert, *vert2;
-			DWORD count;
-
-			p = save_p;
-			loops = (DWORD) *p++;
-
-			for (loop = 0; loop < loops; loop++) {
-				GLfloat dx, dy, len;
-				DWORD last;
-
-				count = (DWORD) *p++;
-				_GLD_glBegin(GL_QUAD_STRIP);
-
-				/* Check if the first and last vertex are identical
-				 * so we don't draw the same quad twice.
-				 */
-				vert = p + (count-1)*2;
-				last = (p[0] == vert[0] && p[1] == vert[1]) ? count-1 : count;
-
-				for (point = 0; point <= last; point++) {
-					vert  = p + 2 * (point % last);
-					vert2 = p + 2 * ((point+1) % last);
-
-					dx = vert[0] - vert2[0];
-					dy = vert[1] - vert2[1];
-					len = (GLfloat)sqrt(dx * dx + dy * dy);
-
-					_GLD_glNormal3f(dy / len, -dx / len, 0.0f);
-					_GLD_glVertex3f((GLfloat) vert[0],
-							   (GLfloat) vert[1], thickness);
-					_GLD_glVertex3f((GLfloat) vert[0],
-							   (GLfloat) vert[1], 0.0f);
-				}
-
-				_GLD_glEnd();
-				p += count*2;
-			}
-
-			/* Draw the back face */
-			p = save_p;
-			v[2] = thickness;
-			_GLD_glNormal3f(0.0f, 0.0f, -1.0f);
-			gluTessNormalProc(tess,	0.0F, 0.0F, -1.0F);
-
-			gluTessBeginPolygonProc(tess, (void *)*(int *)&thickness);
-
-			for (loop = (DWORD) *p++; loop; --loop)
-			{
-				count = (DWORD) *p++;
-
-				gluTessBeginContourProc(tess);
-				
-				for (point = 0; point < count; point++)
-				{
-					vert = p + ((count-point-1)<<1);
-					v[0] = vert[0];
-					v[1] = vert[1];
-					gluTessVertexProc(tess, v, vert);
-				}
-				p += count*2;
-
-				gluTessEndContourProc(tess);
-			}
-			gluTessEndPolygonProc(tess);
-		}
-
-#if DEBUG
-	if (TessErrorOccurred)
-		printf("Tessellation error %s\n",
-			gluErrorString(TessErrorOccurred));
-#endif
-		}
-
-
-exit:
-	FreeLineBuf();
-	if (tess)
-		gluDeleteTessProc(tess);
-	// UnloadGLUTesselator();
-	FreeVertBuf();
-	return status;
-	}
-
-
-
-/*****************************************************************************
- * LoadGLUTesselator
- *
- * Maps the glu32.dll module and gets function pointers for the 
- * tesselator functions.
- *****************************************************************************/
-
-static BOOL
-LoadGLUTesselator(void)
-	{
-	if (gluModuleHandle != NULL)
-		return TRUE;
-
-	{
-		extern HINSTANCE hInstanceOpenGL;
-		char *gluName = "GLU32.DLL";
-//		char name[256];
-//		char *ptr;
-//		int len;
-
-/*
-		len = GetModuleFileName(hInstanceOpenGL, name, 255);
-		if (len != 0)
-			{
-			ptr = name+len-1;
-			while (ptr > name && *ptr != '\\')
-				ptr--;
-			if (*ptr == '\\')
-				ptr++;
-			if (!stricmp(ptr, "cosmogl.dll"))
-				{
-				gluName = "COSMOGLU.DLL";
-				}
-			else if (!stricmp(ptr, "opengl32.dll"))
-				{
-				gluName = "GLU32.DLL";
-				}
-			}
-*/
-		if ((gluModuleHandle = LoadLibrary(gluName)) == NULL)
-			return FALSE;
-	}
-
-	if ((gluNewTessProc = (gluNewTessProto)
-		GetProcAddress(gluModuleHandle, "gluNewTess")) == NULL)
-		return FALSE;
-	
-	if ((gluDeleteTessProc = (gluDeleteTessProto)
-		GetProcAddress(gluModuleHandle, "gluDeleteTess")) == NULL)
-		return FALSE;
-	
-	if ((gluTessBeginPolygonProc = (gluTessBeginPolygonProto)
-		GetProcAddress(gluModuleHandle, "gluTessBeginPolygon")) == NULL)
-		return FALSE;
-	
-	if ((gluTessBeginContourProc = (gluTessBeginContourProto)
-		GetProcAddress(gluModuleHandle, "gluTessBeginContour")) == NULL)
-		return FALSE;
-	
-	if ((gluTessVertexProc = (gluTessVertexProto)
-		GetProcAddress(gluModuleHandle, "gluTessVertex")) == NULL)
-		return FALSE;
-	
-	if ((gluTessEndContourProc = (gluTessEndContourProto)
-		GetProcAddress(gluModuleHandle, "gluTessEndContour")) == NULL)
-		return FALSE;
-	
-	if ((gluTessEndPolygonProc = (gluTessEndPolygonProto)
-		GetProcAddress(gluModuleHandle, "gluTessEndPolygon")) == NULL)
-		return FALSE;
-	
-	if ((gluTessPropertyProc = (gluTessPropertyProto)
-		GetProcAddress(gluModuleHandle, "gluTessProperty")) == NULL)
-		return FALSE;
-
-	if ((gluTessNormalProc = (gluTessNormalProto)
-		GetProcAddress(gluModuleHandle, "gluTessNormal")) == NULL)
-		return FALSE;
-	
-	if ((gluTessCallbackProc = (gluTessCallbackProto)
-		GetProcAddress(gluModuleHandle, "gluTessCallback")) == NULL)
-		return FALSE;
-
-	return TRUE;
-	}
-
-
-
-/*****************************************************************************
- * UnloadGLUTesselator
- *
- * Unmaps the glu32.dll module.
- *****************************************************************************/
-
-static BOOL
-UnloadGLUTesselator(void)
-	{
-	if (gluModuleHandle != NULL)
-	    if (FreeLibrary(gluModuleHandle) == FALSE)
-		return FALSE;
-	gluModuleHandle = NULL;
-	}
-
-
-
-/*****************************************************************************
- * TessVertexOut
- *
- * Used by tessellator to handle output vertexes.
- *****************************************************************************/
- 
-static void CALLBACK
-TessVertexOut(FLOAT	p[3])
-	{
-	    GLfloat v[2];
-
-	    v[0] = p[0] * ScaleFactor;
-	    v[1] = p[1] * ScaleFactor;
-	    _GLD_glVertex2fv(v);
-	}
-
-static void CALLBACK
-TessVertexOutData(FLOAT	p[3], GLfloat z)
-{
-    GLfloat v[3];
-
-    v[0] = (GLfloat) p[0];
-    v[1] = (GLfloat) p[1];
-    v[2] = z;
-    _GLD_glVertex3fv(v);
-}
-
-
-/*****************************************************************************
- * TessCombine
- *
- * Used by tessellator to handle self-intersecting contours and degenerate
- * geometry.
- *****************************************************************************/
- 
-static void CALLBACK
-TessCombine(double	coords[3],
-	    void*	vertex_data[4],
-	    FLOAT	weight[4],
-	    void**	outData)
-	{
-	if (!AppendToVertBuf((FLOAT) coords[0])
-	 || !AppendToVertBuf((FLOAT) coords[1])
-	 || !AppendToVertBuf((FLOAT) coords[2]))
-		TessErrorOccurred = GL_OUT_OF_MEMORY;
-	*outData = VertBuf + (VertBufIndex - 3);
-	}
-
-
-
-/*****************************************************************************
- * TessError
- *
- * Saves the last tessellator error code in the global TessErrorOccurred.
- *****************************************************************************/
- 
-static void CALLBACK
-TessError(GLenum error)
-	{
-	TessErrorOccurred = error;
-	}
-
-
-
-/*****************************************************************************
- * MakeLinesFromGlyph
- * 
- * Converts the outline of a glyph from the TTPOLYGON format to a simple
- * array of floating-point values containing one or more loops.
- *
- * The first element of the output array is a count of the number of loops.
- * The loop data follows this count.  Each loop consists of a count of the
- * number of vertices it contains, followed by the vertices.  Each vertex
- * is an X and Y coordinate.  For example, a single triangle might be
- * described by this array:
- *
- *	1.,	3.,	0., 0.,		1., 0.,		0., 1.
- *       ^	 ^	 ^    ^		 ^    ^		 ^    ^
- *     #loops	#verts	 x1   y1	 x2   y2	 x3   y3
- *
- * A two-loop glyph would look like this:
- *
- *	2.,	3.,  0.,0.,  1.,0.,  0.,1.,	3.,  .2,.2,  .4,.2,  .2,.4
- *
- * Line segments from the TTPOLYGON are transferred to the output array in
- * the obvious way.  Quadratic splines in the TTPOLYGON are converted to
- * collections of line segments
- *****************************************************************************/
-
-static int
-MakeLinesFromGlyph(IN  UCHAR*	glyphBuf,
-		   IN  DWORD	glyphSize,
-		   IN  FLOAT	chordalDeviation)
-	{
-	UCHAR*	p;
-	int	status = 0;
-
-
-	/*
-	 * Pick up all the polygons (aka loops) that make up the glyph:
-	 */
-	if (!AppendToLineBuf(0.0F))	/* loop count at LineBuf[0] */
-		goto exit;
-
-	p = glyphBuf;
-	while (p < glyphBuf + glyphSize)
-		{
-		if (!MakeLinesFromTTPolygon(&p, chordalDeviation))
-			goto exit;
-		LineBuf[0] += 1.0F;	/* increment loop count */
-		}
-
-	status = 1;
-
-exit:
-	return status;
-	}
-
-
-
-/*****************************************************************************
- * MakeLinesFromTTPolygon
- *
- * Converts a TTPOLYGONHEADER and its associated curve structures into a
- * single polyline loop in the global LineBuf.
- *****************************************************************************/
-
-static int
-MakeLinesFromTTPolygon(	IN OUT	UCHAR**	pp,
-			IN	FLOAT	chordalDeviation)
-	{
-	DWORD	polySize;
-	UCHAR*	polyStart;
-	DWORD	vertexCountIndex;
-
-	/*
-	 * Record where the polygon data begins, and where the loop's
-	 * vertex count resides:
-	 */
-	polyStart = *pp;
-	vertexCountIndex = LineBufIndex;
-	if (!AppendToLineBuf(0.0F))
-		return 0;
-
-	/*
-	 * Extract relevant data from the TTPOLYGONHEADER:
-	 */
-	polySize = GetDWord(pp);
-	if (GetDWord(pp) != TT_POLYGON_TYPE)	/* polygon type */
-		return 0;
-	if (!AppendToLineBuf((FLOAT) GetFixed(pp)))	/* first X coord */
-		return 0;
-	if (!AppendToLineBuf((FLOAT) GetFixed(pp)))	/* first Y coord */
-		return 0;
-	LineBuf[vertexCountIndex] += 1.0F;
-
-	/*
-	 * Process each of the TTPOLYCURVE structures in the polygon:
-	 */
-	while (*pp < polyStart + polySize)
-		if (!MakeLinesFromTTPolycurve(	pp,
-						vertexCountIndex,
-						chordalDeviation))
-		return 0;
-
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * MakeLinesFromTTPolyCurve
- *
- * Converts the lines and splines in a single TTPOLYCURVE structure to points
- * in the global LineBuf.
- *****************************************************************************/
-
-static int
-MakeLinesFromTTPolycurve(	IN OUT	UCHAR**	pp,
-				IN	DWORD	vertexCountIndex,
-				IN	FLOAT	chordalDeviation)
-	{
-	WORD type;
-	WORD pointCount;
-
-
-	/*
-	 * Pick up the relevant fields of the TTPOLYCURVE structure:
-	 */
-	type = (WORD) GetWord(pp);
-	pointCount = (WORD) GetWord(pp);
-
-	/*
-	 * Convert the "curve" to line segments:
-	 */
-	if (type == TT_PRIM_LINE)
-		return MakeLinesFromTTLine(	pp,
-						vertexCountIndex,
-						pointCount);
-	else if (type == TT_PRIM_QSPLINE)
-		return MakeLinesFromTTQSpline(	pp,
-						vertexCountIndex,
-						pointCount,
-						chordalDeviation);
-	else
-		return 0;
-	}
-
-
-
-/*****************************************************************************
- * MakeLinesFromTTLine
- *
- * Converts points from the polyline in a TT_PRIM_LINE structure to
- * equivalent points in the global LineBuf.
- *****************************************************************************/
-static int
-MakeLinesFromTTLine(	IN OUT	UCHAR**	pp,
-			IN	DWORD	vertexCountIndex,
-			IN	WORD	pointCount)
-	{
-	/*
-	 * Just copy the line segments into the line buffer (converting
-	 * type as we go):
-	 */
-	LineBuf[vertexCountIndex] += pointCount;
-	while (pointCount--)
-		{
-		if (!AppendToLineBuf((FLOAT) GetFixed(pp))	/* X coord */
-		 || !AppendToLineBuf((FLOAT) GetFixed(pp)))	/* Y coord */
-			return 0;
-		}
-
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * MakeLinesFromTTQSpline
- *
- * Converts points from the poly quadratic spline in a TT_PRIM_QSPLINE
- * structure to polyline points in the global LineBuf.
- *****************************************************************************/
-
-static int
-MakeLinesFromTTQSpline(	IN OUT	UCHAR**	pp,
-			IN	DWORD	vertexCountIndex,
-			IN	WORD	pointCount,
-			IN	FLOAT	chordalDeviation)
-	{
-	FLOAT x0, y0, x1, y1, x2, y2;
-	WORD point;
-
-	/*
-	 * Process each of the non-interpolated points in the outline.
-	 * To do this, we need to generate two interpolated points (the
-	 * start and end of the arc) for each non-interpolated point.
-	 * The first interpolated point is always the one most recently
-	 * stored in LineBuf, so we just extract it from there.  The
-	 * second interpolated point is either the average of the next
-	 * two points in the QSpline, or the last point in the QSpline
-	 * if only one remains.
-	 */
-	for (point = 0; point < pointCount - 1; ++point)
-		{
-		x0 = LineBuf[LineBufIndex - 2];
-		y0 = LineBuf[LineBufIndex - 1];
-
-		x1 = (FLOAT) GetFixed(pp);
-		y1 = (FLOAT) GetFixed(pp);
-
-		if (point == pointCount - 2)
-			{
-			/*
-			 * This is the last arc in the QSpline.  The final
-			 * point is the end of the arc.
-			 */
-			x2 = (FLOAT) GetFixed(pp);
-			y2 = (FLOAT) GetFixed(pp);
-			}
-		else
-			{
-			/*
-			 * Peek at the next point in the input to compute
-			 * the end of the arc:
-			 */
-			x2 = 0.5F * (x1 + (FLOAT) GetFixed(pp));
-			y2 = 0.5F * (y1 + (FLOAT) GetFixed(pp));
-			/*
-			 * Push the point back onto the input so it will
-			 * be reused as the next off-curve point:
-			 */
-			*pp -= 8;
-			}
-
-		if (!MakeLinesFromArc(	x0, y0,
-					x1, y1,
-					x2, y2,
-					vertexCountIndex,
-					chordalDeviation * chordalDeviation))
-			return 0;
-		}
-
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * MakeLinesFromArc
- *
- * Subdivides one arc of a quadratic spline until the chordal deviation
- * tolerance requirement is met, then places the resulting set of line
- * segments in the global LineBuf.
- *****************************************************************************/
-
-static int
-MakeLinesFromArc(	IN	FLOAT	x0,
-			IN	FLOAT	y0,
-			IN	FLOAT	x1,
-			IN	FLOAT	y1,
-			IN	FLOAT	x2,
-			IN	FLOAT	y2,
-			IN	DWORD	vertexCountIndex,
-			IN	FLOAT	chordalDeviationSquared)
-	{
-	FLOAT	x01;
-	FLOAT	y01;
-	FLOAT	x12;
-	FLOAT	y12;
-	FLOAT	midPointX;
-	FLOAT	midPointY;
-	FLOAT	deltaX;
-	FLOAT	deltaY;
-
-	/*
-	 * Calculate midpoint of the curve by de Casteljau:
-	 */
-	x01 = 0.5F * (x0 + x1);
-	y01 = 0.5F * (y0 + y1);
-	x12 = 0.5F * (x1 + x2);
-	y12 = 0.5F * (y1 + y2);
-	midPointX = 0.5F * (x01 + x12);
-	midPointY = 0.5F * (y01 + y12);
-
-
-	/*
-	 * Estimate chordal deviation by the distance from the midpoint
-	 * of the curve to its non-interpolated control point.  If this
-	 * distance is greater than the specified chordal deviation
-	 * constraint, then subdivide.  Otherwise, generate polylines
-	 * from the three control points.
-	 */
-	deltaX = midPointX - x1;
-	deltaY = midPointY - y1;
-	if (deltaX * deltaX + deltaY * deltaY > chordalDeviationSquared)
-		{
-		MakeLinesFromArc(	x0, y0,
-					x01, y01,
-					midPointX, midPointY,
-					vertexCountIndex,
-					chordalDeviationSquared);
-		
-		MakeLinesFromArc(	midPointX, midPointY,
-					x12, y12,
-					x2, y2,
-					vertexCountIndex,
-					chordalDeviationSquared);
-		}
-	else
-		{
-		/*
-		 * The "pen" is already at (x0, y0), so we don't need to
-		 * add that point to the LineBuf.
-		 */
-		if (!AppendToLineBuf(x1)
-		 || !AppendToLineBuf(y1)
-		 || !AppendToLineBuf(x2)
-		 || !AppendToLineBuf(y2))
-			return 0;
-		LineBuf[vertexCountIndex] += 2.0F;
-		}
-
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * InitLineBuf
- *
- * Initializes the global LineBuf and its associated size and current-element
- * counters.
- *****************************************************************************/
-
-static int
-InitLineBuf(void)
-	{
-	if (!(LineBuf = (FLOAT*)
-		__wglMalloc((LineBufSize = LINE_BUF_QUANT) * sizeof(FLOAT))))
-			return 0;
-	LineBufIndex = 0;
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * InitVertBuf
- *
- * Initializes the global VertBuf and its associated size and current-element
- * counters.
- *****************************************************************************/
-
-static int
-InitVertBuf(void)
-	{
-	if (!(VertBuf = (FLOAT*)
-		__wglMalloc((VertBufSize = VERT_BUF_QUANT) * sizeof(FLOAT))))
-			return 0;
-	VertBufIndex = 0;
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * AppendToLineBuf
- *
- * Appends one floating-point value to the global LineBuf array.  Return value
- * is non-zero for success, zero for failure.
- *****************************************************************************/
-
-static int
-AppendToLineBuf(FLOAT value)
-	{
-	if (LineBufIndex >= LineBufSize)
-		{
-		FLOAT* f;
-		
-		f = (FLOAT*) __wglRealloc(LineBuf,
-			(LineBufSize += LINE_BUF_QUANT) * sizeof(FLOAT));
-		if (!f)
-			return 0;
-		LineBuf = f;
-		}
-	LineBuf[LineBufIndex++] = value;
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * AppendToVertBuf
- *
- * Appends one floating-point value to the global VertBuf array.  Return value
- * is non-zero for success, zero for failure.
- *
- * Note that we can't realloc this one, because the tessellator is using
- * pointers into it.
- *****************************************************************************/
-
-static int
-AppendToVertBuf(FLOAT value)
-	{
-	if (VertBufIndex >= VertBufSize)
-		return 0;
-	VertBuf[VertBufIndex++] = value;
-	return 1;
-	}
-
-
-
-/*****************************************************************************
- * FreeLineBuf
- *
- * Cleans up vertex buffer structure.
- *****************************************************************************/
-
-static void
-FreeLineBuf(void)
-	{
-	if (LineBuf)
-		{
-		__wglFree(LineBuf);
-		LineBuf = NULL;
-		}
-	}
-
-
-
-/*****************************************************************************
- * FreeVertBuf
- *
- * Cleans up vertex buffer structure.
- *****************************************************************************/
-
-static void
-FreeVertBuf(void)
-	{
-	if (VertBuf)
-		{
-		__wglFree(VertBuf);
-		VertBuf = NULL;
-		}
-	}
-
-
-
-/*****************************************************************************
- * GetWord
- *
- * Fetch the next 16-bit word from a little-endian byte stream, and increment
- * the stream pointer to the next unscanned byte.
- *****************************************************************************/
-
-static long GetWord(UCHAR** p)
-	{
-	long value;
-
-	value = ((*p)[1] << 8) + (*p)[0];
-	*p += 2;
-	return value;
-	}
-
-
-
-/*****************************************************************************
- * GetDWord
- *
- * Fetch the next 32-bit word from a little-endian byte stream, and increment
- * the stream pointer to the next unscanned byte.
- *****************************************************************************/
-
-static long GetDWord(UCHAR** p)
-	{
-	long value;
-
-	value = ((*p)[3] << 24) + ((*p)[2] << 16) + ((*p)[1] << 8) + (*p)[0];
-	*p += 4;
-	return value;
-	}
-
-
-
-
-/*****************************************************************************
- * GetFixed
- *
- * Fetch the next 32-bit fixed-point value from a little-endian byte stream,
- * convert it to floating-point, and increment the stream pointer to the next
- * unscanned byte.
- *****************************************************************************/
-
-static double GetFixed(
-	UCHAR** p)
-{
-	long hiBits, loBits;
-	double value;
-
-	loBits = GetWord(p);
-	hiBits = GetWord(p);
-	value = (double) ((hiBits << 16) | loBits) / 65536.0;
-
-	return value * ScaleFactor;
-}
-
-// ***********************************************************************
-
+/****************************************************************************

+*

+*                        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:  OpenGL window  functions (wgl*).

+*

+****************************************************************************/

+

+#include "dglwgl.h"

+#ifdef _USE_GLD3_WGL

+#include "gld_driver.h"

+#endif

+

+#include "gl/glu.h"	// MUST USE MICROSOFT'S GLU32!

+

+#ifndef _USE_GLD3_WGL

+extern DGL_mesaFuncs mesaFuncs;

+#endif

+

+// Need to export wgl* functions if using GLD3,

+// otherwise export GLD2 DGL_* functions.

+#ifdef _USE_GLD3_WGL

+#define _GLD_WGL_EXPORT(a) wgl##a

+#else

+#define _GLD_WGL_EXPORT(a) DGL_##a

+#endif

+

+// Calls into Mesa 4.x are different

+#ifdef _USE_GLD3_WGL

+#include "dlist.h"

+#include "drawpix.h"

+#include "get.h"

+#include "matrix.h"

+// NOTE: All the _GLD* macros now call the gl* functions direct.

+//       This ensures that the correct internal pathway is taken. KeithH

+#define _GLD_glNewList		glNewList

+#define _GLD_glBitmap		glBitmap

+#define _GLD_glEndList		glEndList

+#define _GLD_glDeleteLists	glDeleteLists

+#define _GLD_glGetError		glGetError

+#define _GLD_glTranslatef	glTranslatef

+#define _GLD_glBegin		glBegin

+#define _GLD_glVertex2fv	glVertex2fv

+#define _GLD_glEnd			glEnd

+#define _GLD_glNormal3f		glNormal3f

+#define _GLD_glVertex3f		glVertex3f

+#define _GLD_glVertex3fv	glVertex3fv

+#else // _USE_GLD3_WGL

+#define _GLD_glNewList		(*mesaFuncs.glNewList)

+#define _GLD_glBitmap		(*mesaFuncs.glBitmap)

+#define _GLD_glEndList		(*mesaFuncs.glEndList)

+#define _GLD_glDeleteLists	(*mesaFuncs.glDeleteLists)

+#define _GLD_glGetError		(*mesaFuncs.glGetError)

+#define _GLD_glTranslatef	(*mesaFuncs.glTranslatef)

+#define _GLD_glBegin		(*mesaFuncs.glBegin)

+#define _GLD_glVertex2fv	(*mesaFuncs.glVertex2fv)

+#define _GLD_glEnd			(*mesaFuncs.glEnd)

+#define _GLD_glNormal3f		(*mesaFuncs.glNormal3f)

+#define _GLD_glVertex3f		(*mesaFuncs.glVertex3f)

+#define _GLD_glVertex3fv	(*mesaFuncs.glVertex3fv)

+#endif // _USE_GLD3_WGL

+

+// ***********************************************************************

+

+// Emulate SGI DDK calls.

+#define __wglMalloc(a) GlobalAlloc(GPTR, (a))

+#define __wglFree(a) GlobalFree((a))

+

+// ***********************************************************************

+

+// Mesa glu.h and MS glu.h call these different things...

+//#define GLUtesselator GLUtriangulatorObj

+//#define GLU_TESS_VERTEX_DATA GLU_VERTEX_DATA

+

+// For wglFontOutlines

+

+typedef GLUtesselator *(APIENTRY *gluNewTessProto)(void);

+typedef void (APIENTRY *gluDeleteTessProto)(GLUtesselator *tess);

+typedef void (APIENTRY *gluTessBeginPolygonProto)(GLUtesselator *tess, void *polygon_data);

+typedef void (APIENTRY *gluTessBeginContourProto)(GLUtesselator *tess);

+typedef void (APIENTRY *gluTessVertexProto)(GLUtesselator *tess, GLdouble coords[3], void *data);

+typedef void (APIENTRY *gluTessEndContourProto)(GLUtesselator *tess);

+typedef void (APIENTRY *gluTessEndPolygonProto)(GLUtesselator *tess);

+typedef void (APIENTRY *gluTessPropertyProto)(GLUtesselator *tess, GLenum which, GLdouble value);

+typedef void (APIENTRY *gluTessNormalProto)(GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z);

+typedef void (APIENTRY *gluTessCallbackProto)(GLUtesselator *tess, GLenum which, void (CALLBACK *)());

+

+static HINSTANCE		gluModuleHandle;

+static gluNewTessProto		gluNewTessProc;

+static gluDeleteTessProto	gluDeleteTessProc;

+static gluTessBeginPolygonProto	gluTessBeginPolygonProc;

+static gluTessBeginContourProto	gluTessBeginContourProc;

+static gluTessVertexProto	gluTessVertexProc;

+static gluTessEndContourProto	gluTessEndContourProc;

+static gluTessEndPolygonProto	gluTessEndPolygonProc;

+static gluTessPropertyProto	gluTessPropertyProc;

+static gluTessNormalProto	gluTessNormalProc;

+static gluTessCallbackProto	gluTessCallbackProc;

+

+static HFONT	hNewFont, hOldFont;

+static FLOAT	ScaleFactor;

+

+#define LINE_BUF_QUANT 4000

+#define VERT_BUF_QUANT 4000

+

+static FLOAT*	LineBuf;

+static DWORD	LineBufSize;

+static DWORD	LineBufIndex;

+static FLOAT*	VertBuf;

+static DWORD	VertBufSize;

+static DWORD	VertBufIndex;

+static GLenum	TessErrorOccurred;

+

+static int AppendToLineBuf(

+	FLOAT value);

+

+static int AppendToVertBuf(

+	FLOAT value);

+

+static int DrawGlyph(

+	UCHAR*		glyphBuf,

+	DWORD		glyphSize,

+	FLOAT		chordalDeviation,

+	FLOAT		extrusion,

+	INT		format);

+

+static void FreeLineBuf(void);

+

+static void FreeVertBuf(void);

+

+static long GetWord(

+	UCHAR**		p);

+

+static long GetDWord(

+	UCHAR**		p);

+

+static double GetFixed(

+	UCHAR**		p);

+

+static int InitLineBuf(void);

+

+static int InitVertBuf(void);

+

+static HFONT CreateHighResolutionFont(

+	HDC		hDC);

+

+static int MakeDisplayListFromGlyph(

+	DWORD			listName,

+	UCHAR*			glyphBuf,

+	DWORD			glyphSize,

+	LPGLYPHMETRICSFLOAT	glyphMetricsFloat,

+	FLOAT			chordalDeviation,

+	FLOAT			extrusion,

+	INT			format);

+

+static BOOL LoadGLUTesselator(void);

+static BOOL UnloadGLUTesselator(void);

+

+static int MakeLinesFromArc(

+	FLOAT		x0,

+	FLOAT		y0,

+	FLOAT		x1,

+	FLOAT		y1,

+	FLOAT		x2,

+	FLOAT		y2,

+	DWORD		vertexCountIndex,

+	FLOAT		chordalDeviationSquared);

+

+static int MakeLinesFromGlyph(		UCHAR*		glyphBuf,

+					DWORD		glyphSize,

+					FLOAT		chordalDeviation);

+

+static int MakeLinesFromTTLine(		UCHAR**		pp,

+					DWORD		vertexCountIndex,

+					WORD		pointCount);

+

+static int MakeLinesFromTTPolycurve(	UCHAR**		pp,

+					DWORD		vertexCountIndex,

+					FLOAT		chordalDeviation);

+

+static int MakeLinesFromTTPolygon(	UCHAR**		pp,

+					FLOAT		chordalDeviation);

+

+static int MakeLinesFromTTQSpline(	UCHAR**		pp,

+					DWORD		vertexCountIndex,

+					WORD		pointCount,

+					FLOAT		chordalDeviation);

+

+static void CALLBACK TessCombine(	double		coords[3],

+					void*		vertex_data[4],

+					FLOAT		weight[4],

+					void**		outData);

+

+static void CALLBACK TessError(		GLenum		error);

+

+static void CALLBACK TessVertexOutData(	FLOAT		p[3],

+					GLfloat 	z);

+

+// ***********************************************************************

+

+#ifdef GLD_THREADS

+#pragma message("compiling DGLWGL.C vars for multi-threaded support")

+extern CRITICAL_SECTION CriticalSection;

+extern DWORD dwTLSPixelFormat;			// TLS index for current pixel format

+#endif

+int curPFD = 0;							// Current PFD (static)

+

+// ***********************************************************************

+

+int dglGetPixelFormat(void)

+{

+#ifdef GLD_THREADS

+	int iPixelFormat;

+	// get thread-specific instance

+	if (glb.bMultiThreaded) {

+		__try {

+			iPixelFormat = (int)TlsGetValue(dwTLSPixelFormat);

+		}

+		__except(EXCEPTION_EXECUTE_HANDLER) {

+			iPixelFormat = curPFD;

+		}

+	}

+	// get global static var

+	else {

+		iPixelFormat = curPFD;

+	}

+	return iPixelFormat;

+#else

+	return curPFD;

+#endif

+}

+

+// ***********************************************************************

+

+void dglSetPixelFormat(int iPixelFormat)

+{

+#ifdef GLD_THREADS

+	// set thread-specific instance

+	if (glb.bMultiThreaded) {

+		__try {

+			TlsSetValue(dwTLSPixelFormat, (LPVOID)iPixelFormat);

+		}

+		__except(EXCEPTION_EXECUTE_HANDLER) {

+			curPFD = iPixelFormat;

+		}

+	}

+	// set global static var

+	else {

+		curPFD = iPixelFormat;

+	}

+#else

+	curPFD = iPixelFormat;

+#endif

+}

+

+// ***********************************************************************

+

+int APIENTRY _GLD_WGL_EXPORT(ChoosePixelFormat)(

+	HDC a,

+	CONST PIXELFORMATDESCRIPTOR *ppfd)

+{

+	DGL_pixelFormat			*lpPF = glb.lpPF;

+

+    PIXELFORMATDESCRIPTOR	ppfdBest;

+    int						i;

+	int						bestIndex = -1;

+    int						numPixelFormats;

+	DWORD					dwFlags;

+

+	char					buf[128];

+	char					cat[8];

+

+	DWORD dwAllFlags = 

+					PFD_DRAW_TO_WINDOW |

+					PFD_DRAW_TO_BITMAP |

+					PFD_SUPPORT_GDI |

+					PFD_SUPPORT_OPENGL |

+					PFD_GENERIC_FORMAT |

+					PFD_NEED_PALETTE |

+					PFD_NEED_SYSTEM_PALETTE |

+					PFD_DOUBLEBUFFER |

+					PFD_STEREO |

+					/*PFD_SWAP_LAYER_BUFFERS |*/

+					PFD_DOUBLEBUFFER_DONTCARE |

+					PFD_STEREO_DONTCARE |

+					PFD_SWAP_COPY |

+					PFD_SWAP_EXCHANGE |

+					PFD_GENERIC_ACCELERATED |

+					0;

+

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+	// List may not be built until dglValidate() is called! KeithH

+	lpPF = glb.lpPF;

+

+	//

+	// Lets print the input pixel format to the log

+	// ** Based on "wglinfo" by Nate Robins **

+	//

+	ddlogMessage(DDLOG_SYSTEM, "ChoosePixelFormat:\n");

+	ddlogMessage(DDLOG_INFO, "Input pixel format for ChoosePixelFormat:\n");

+	ddlogMessage(DDLOG_INFO,

+		"   visual  x  bf lv rg d st  r  g  b a  ax dp st accum buffs  ms\n");

+	ddlogMessage(DDLOG_INFO,

+		" id dep cl sp sz l  ci b ro sz sz sz sz bf th cl  r  g  b  a ns b\n");

+	ddlogMessage(DDLOG_INFO,

+		"-----------------------------------------------------------------\n");

+	sprintf(buf, "  .  ");

+

+	sprintf(cat, "%2d ", ppfd->cColorBits);

+	strcat(buf, cat);

+	if(ppfd->dwFlags & PFD_DRAW_TO_WINDOW)      sprintf(cat, "wn ");

+	else if(ppfd->dwFlags & PFD_DRAW_TO_BITMAP) sprintf(cat, "bm ");

+	else sprintf(cat, ".  ");

+	strcat(buf, cat);

+

+	/* should find transparent pixel from LAYERPLANEDESCRIPTOR */

+	sprintf(cat, " . "); 

+	strcat(buf, cat);

+

+	sprintf(cat, "%2d ", ppfd->cColorBits);

+	strcat(buf, cat);

+

+	/* bReserved field indicates number of over/underlays */

+	if(ppfd->bReserved) sprintf(cat, " %d ", ppfd->bReserved);

+	else sprintf(cat, " . "); 

+	strcat(buf, cat);

+

+	sprintf(cat, " %c ", ppfd->iPixelType == PFD_TYPE_RGBA ? 'r' : 'c');

+	strcat(buf, cat);

+

+	sprintf(cat, "%c ", ppfd->dwFlags & PFD_DOUBLEBUFFER ? 'y' : '.');

+	strcat(buf, cat);

+

+	sprintf(cat, " %c ", ppfd->dwFlags & PFD_STEREO ? 'y' : '.');

+	strcat(buf, cat);

+

+	if(ppfd->cRedBits && ppfd->iPixelType == PFD_TYPE_RGBA) 

+	    sprintf(cat, "%2d ", ppfd->cRedBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+

+	if(ppfd->cGreenBits && ppfd->iPixelType == PFD_TYPE_RGBA) 

+	    sprintf(cat, "%2d ", ppfd->cGreenBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+

+	if(ppfd->cBlueBits && ppfd->iPixelType == PFD_TYPE_RGBA) 

+	    sprintf(cat, "%2d ", ppfd->cBlueBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cAlphaBits && ppfd->iPixelType == PFD_TYPE_RGBA) 

+		sprintf(cat, "%2d ", ppfd->cAlphaBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cAuxBuffers)     sprintf(cat, "%2d ", ppfd->cAuxBuffers);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cDepthBits)      sprintf(cat, "%2d ", ppfd->cDepthBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cStencilBits)    sprintf(cat, "%2d ", ppfd->cStencilBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cAccumRedBits)   sprintf(cat, "%2d ", ppfd->cAccumRedBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+

+	if(ppfd->cAccumGreenBits) sprintf(cat, "%2d ", ppfd->cAccumGreenBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cAccumBlueBits)  sprintf(cat, "%2d ", ppfd->cAccumBlueBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	if(ppfd->cAccumAlphaBits) sprintf(cat, "%2d ", ppfd->cAccumAlphaBits);

+	else sprintf(cat, " . ");

+	strcat(buf, cat);

+	

+	/* no multisample in Win32 */

+	sprintf(cat, " . .\n");

+	strcat(buf, cat);

+

+	ddlogMessage(DDLOG_INFO, buf);

+	ddlogMessage(DDLOG_INFO,

+		"-----------------------------------------------------------------\n");

+	ddlogMessage(DDLOG_INFO, "\n");

+

+	//

+	// Examine the flags for correctness

+	//

+	dwFlags = ppfd->dwFlags;

+    if (dwFlags != (dwFlags & dwAllFlags))

+    {

+		/* error: bad dwFlags */

+		ddlogPrintf(DDLOG_WARN,

+					"ChoosePixelFormat: bad flags (0x%x)",

+					dwFlags & (~dwAllFlags));

+		// Mask illegal flags and continue

+		dwFlags = dwFlags & dwAllFlags;

+    }

+	

+    switch (ppfd->iPixelType) {

+    case PFD_TYPE_RGBA:

+    case PFD_TYPE_COLORINDEX:

+		break;

+    default:

+		/* error: bad iPixelType */

+		ddlogMessage(DDLOG_WARN, "ChoosePixelFormat: bad pixel type\n");

+		return 0;

+    }

+	

+    switch (ppfd->iLayerType) {

+    case PFD_MAIN_PLANE:

+    case PFD_OVERLAY_PLANE:

+    case PFD_UNDERLAY_PLANE:

+		break;

+    default:

+		/* error: bad iLayerType */

+		ddlogMessage(DDLOG_WARN, "ChoosePixelFormat: bad layer type\n");

+		return 0;

+    }

+	

+    numPixelFormats = glb.nPixelFormatCount;

+	

+    /* loop through candidate pixel format descriptors */

+    for (i=0; i<numPixelFormats; ++i) {

+		PIXELFORMATDESCRIPTOR ppfdCandidate;

+		

+		memcpy(&ppfdCandidate, &lpPF[i].pfd, sizeof(PIXELFORMATDESCRIPTOR));

+		

+		/*

+		** Check attributes which must match

+		*/

+		if (ppfd->iPixelType != ppfdCandidate.iPixelType) {

+			continue;

+		}

+

+		if (ppfd->iLayerType != ppfdCandidate.iLayerType) {

+			continue;

+		}

+		

+		if (((dwFlags ^ ppfdCandidate.dwFlags) & dwFlags) &

+			(PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP |

+			PFD_SUPPORT_GDI | PFD_SUPPORT_OPENGL))

+		{

+			continue;

+		}

+		

+		if (!(dwFlags & PFD_DOUBLEBUFFER_DONTCARE)) {

+			if ((dwFlags & PFD_DOUBLEBUFFER) !=

+				(ppfdCandidate.dwFlags & PFD_DOUBLEBUFFER))

+			{

+				continue;

+			}

+		}

+		

+//		if (!(dwFlags & PFD_STEREO_DONTCARE)) {

+			if ((dwFlags & PFD_STEREO) !=

+				(ppfdCandidate.dwFlags & PFD_STEREO))

+			{

+				continue;

+			}

+//		}

+		

+        if (ppfd->iPixelType==PFD_TYPE_RGBA

+            && ppfd->cAlphaBits && !ppfdCandidate.cAlphaBits) {

+            continue;

+		}

+		

+        if (ppfd->iPixelType==PFD_TYPE_RGBA

+			&& ppfd->cAccumBits && !ppfdCandidate.cAccumBits) {

+			continue;

+        }

+		

+        if (ppfd->cDepthBits && !ppfdCandidate.cDepthBits) {

+			continue;

+        }

+		

+        if (ppfd->cStencilBits && !ppfdCandidate.cStencilBits) {

+            continue;

+        }

+

+		if (ppfd->cAuxBuffers && !ppfdCandidate.cAuxBuffers) {

+			continue;

+		}

+		

+		/*

+		** See if candidate is better than the previous best choice

+		*/

+		if (bestIndex == -1) {

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+		

+		if ((ppfd->cColorBits > ppfdBest.cColorBits &&

+			ppfdCandidate.cColorBits > ppfdBest.cColorBits) ||

+			(ppfd->cColorBits <= ppfdCandidate.cColorBits &&

+			ppfdCandidate.cColorBits < ppfdBest.cColorBits))

+		{

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+		

+		if (ppfd->iPixelType==PFD_TYPE_RGBA

+            && ppfd->cAlphaBits

+            && ppfdCandidate.cAlphaBits > ppfdBest.cAlphaBits)

+		{

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+		

+		if (ppfd->iPixelType==PFD_TYPE_RGBA

+			&& ppfd->cAccumBits

+            && ppfdCandidate.cAccumBits > ppfdBest.cAccumBits)

+		{

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+		

+		if ((ppfd->cDepthBits > ppfdBest.cDepthBits &&

+			ppfdCandidate.cDepthBits > ppfdBest.cDepthBits) ||

+			(ppfd->cDepthBits <= ppfdCandidate.cDepthBits &&

+			ppfdCandidate.cDepthBits < ppfdBest.cDepthBits))

+		{

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+		

+		if (ppfd->cStencilBits &&

+			ppfdCandidate.cStencilBits > ppfdBest.cStencilBits)

+		{

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+		

+		if (ppfd->cAuxBuffers &&

+			ppfdCandidate.cAuxBuffers > ppfdBest.cAuxBuffers)

+		{

+			ppfdBest = ppfdCandidate;

+			bestIndex = i;

+			continue;

+		}

+    }

+

+	if (bestIndex != -1) {

+		ddlogPrintf(DDLOG_SYSTEM, "Pixel Format %d chosen as best match", bestIndex+1);

+	    return bestIndex + 1;

+	}

+

+	// Return the pixelformat that has the most capabilities.

+	// ** NOTE: This is only possible due to the way the list

+	// of pixelformats is built. **

+	// Now picks best pixelformat. KeithH

+	bestIndex = numPixelFormats;	// most capable double buffer format

+	ddlogPrintf(DDLOG_SYSTEM, "Pixel Format %d chosen by default", bestIndex);

+	return (bestIndex);

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(CopyContext)(

+	HGLRC a,

+	HGLRC b,

+	UINT c)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+    UNSUPPORTED("wglCopyContext")

+    return FALSE; // Failed

+}

+

+// ***********************************************************************

+

+HGLRC APIENTRY _GLD_WGL_EXPORT(CreateContext)(

+	HDC a)

+{

+	int ipf;

+

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+	// Check that the current PFD is valid

+	ipf = dglGetPixelFormat();

+	if (!IsValidPFD(ipf))

+		return (HGLRC)0;

+

+	return dglCreateContext(a, &glb.lpPF[ipf-1]);

+}

+

+// ***********************************************************************

+

+HGLRC APIENTRY _GLD_WGL_EXPORT(CreateLayerContext)(

+	HDC a,

+	int b)

+{

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+    UNSUPPORTED("wglCreateLayerContext")

+    return NULL; // Failed

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(DeleteContext)(

+	HGLRC a)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+    return dglDeleteContext(a);

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(DescribeLayerPlane)(

+	HDC hDC,

+	int iPixelFormat,

+	int iLayerPlane,

+	UINT nBytes,

+	LPLAYERPLANEDESCRIPTOR plpd)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	UNSUPPORTED("DGL_DescribeLayerPlane")

+

+//	gldLogPrintf(GLDLOG_INFO, "DescribeLayerPlane: %d, %d", iPixelFormat, iLayerPlane);

+

+	return FALSE;

+}

+

+// ***********************************************************************

+

+int APIENTRY _GLD_WGL_EXPORT(DescribePixelFormat)(

+	HDC a,

+	int b,

+	UINT c,

+	LPPIXELFORMATDESCRIPTOR d)

+{

+	UINT nSize;

+

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+	if (d == NULL) // Calling app requires max number of PF's

+		return glb.nPixelFormatCount;

+

+	// The supplied buffer may be larger than the info that we

+	// will be copying.

+	if (c > sizeof(PIXELFORMATDESCRIPTOR))

+		nSize = sizeof(PIXELFORMATDESCRIPTOR);

+	else

+		nSize = c;

+

+    // Setup an empty PFD before doing validation check

+    memset(d, 0, nSize);

+    d->nSize = nSize;

+    d->nVersion = 1;

+

+	if (!IsValidPFD(b))

+		return 0; // Bail if PFD index is invalid

+

+	memcpy(d, &glb.lpPF[b-1].pfd, nSize);

+

+	return glb.nPixelFormatCount;

+}

+

+// ***********************************************************************

+

+HGLRC APIENTRY _GLD_WGL_EXPORT(GetCurrentContext)(void)

+{

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+	return dglGetCurrentContext();

+}

+

+// ***********************************************************************

+

+HDC APIENTRY _GLD_WGL_EXPORT(GetCurrentDC)(void)

+{

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+	return dglGetCurrentDC();

+}

+

+// ***********************************************************************

+

+PROC APIENTRY _GLD_WGL_EXPORT(GetDefaultProcAddress)(

+	LPCSTR a)

+{

+	// Validate license

+	if (!dglValidate())

+		return NULL;

+

+    UNSUPPORTED("DGL_GetDefaultProcAddress")

+    return NULL;

+}

+

+// ***********************************************************************

+

+int APIENTRY _GLD_WGL_EXPORT(GetLayerPaletteEntries)(

+	HDC a,

+	int b,

+	int c,

+	int d,

+	COLORREF *e)

+{

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+    UNSUPPORTED("DGL_GetLayerPaletteEntries")

+    return 0;

+}

+

+// ***********************************************************************

+

+int APIENTRY _GLD_WGL_EXPORT(GetPixelFormat)(

+	HDC a)

+{

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+	return dglGetPixelFormat();

+}

+

+// ***********************************************************************

+

+PROC APIENTRY _GLD_WGL_EXPORT(GetProcAddress)(

+	LPCSTR a)

+{

+	PROC dglGetProcAddressD3D(LPCSTR a);

+

+	// Validate license

+	if (!dglValidate())

+		return NULL;

+

+#ifdef _USE_GLD3_WGL

+	return _gldDriver.wglGetProcAddress(a);

+#else

+	return dglGetProcAddressD3D(a);

+#endif

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(MakeCurrent)(

+	HDC a,

+	HGLRC b)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	return dglMakeCurrent(a, b);

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(RealizeLayerPalette)(

+	HDC a,

+	int b,

+	BOOL c)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+    UNSUPPORTED("DGL_RealizeLayerPalette")

+	return FALSE;

+}

+

+// ***********************************************************************

+

+int APIENTRY _GLD_WGL_EXPORT(SetLayerPaletteEntries)(

+	HDC a,

+	int b,

+	int c,

+	int d,

+	CONST COLORREF *e)

+{

+	// Validate license

+	if (!dglValidate())

+		return 0;

+

+    UNSUPPORTED("DGL_SetLayerPaletteEntries")

+	return 0;

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(SetPixelFormat)(

+	HDC a,

+	int b,

+	CONST PIXELFORMATDESCRIPTOR *c)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	if (IsValidPFD(b)) {

+		ddlogPrintf(DDLOG_SYSTEM, "SetPixelFormat: PixelFormat %d has been set", b);

+		dglSetPixelFormat(b);

+		return TRUE;

+	} else {

+		ddlogPrintf(DDLOG_ERROR,

+					"SetPixelFormat: PixelFormat %d is invalid and cannot be set", b);

+		return FALSE;

+	}

+}

+

+// ***********************************************************************

+/*

+ * Share lists between two gl_context structures.

+ * This was added for WIN32 WGL function support, since wglShareLists()

+ * must be called *after* wglCreateContext() with valid GLRCs. (DaveM)

+ */

+//

+// Copied from GLD2.x. KeithH

+//

+static GLboolean _gldShareLists(

+	struct gl_context *ctx1,

+	struct gl_context *ctx2)

+{

+	/* Sanity check context pointers */

+	if (ctx1 == NULL || ctx2 == NULL)

+		return GL_FALSE;

+	/* Sanity check shared list pointers */

+	if (ctx1->Shared == NULL || ctx2->Shared == NULL)

+		return GL_FALSE;

+	/* Decrement reference count on sharee to release previous list */

+	ctx2->Shared->RefCount--;

+#if 0	/* 3DStudio exits on this memory release */

+	if (ctx2->Shared->RefCount == 0)

+		free_shared_state(ctx2, ctx2->Shared);

+#endif

+	/* Re-assign list from sharer to sharee and increment reference count */

+	ctx2->Shared = ctx1->Shared;

+	ctx1->Shared->RefCount++;

+	return GL_TRUE;

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(ShareLists)(

+	HGLRC a,

+	HGLRC b)

+{

+	DGL_ctx *dgl1, *dgl2;

+

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	// Mesa supports shared lists, but you need to supply the shared

+	// GL context info when calling gl_create_context(). An auxiliary

+	// function gl_share_lists() has been added to update the shared

+	// list info after the GL contexts have been created. (DaveM)

+	dgl1 = dglGetContextAddress(a);

+	dgl2 = dglGetContextAddress(b);

+	if (dgl1->bAllocated && dgl2->bAllocated) {

+#ifdef _USE_GLD3_WGL

+		return _gldShareLists(dgl1->glCtx, dgl2->glCtx);

+#else

+		return (*mesaFuncs.gl_share_lists)(dgl1->glCtx, dgl2->glCtx);

+#endif

+	}

+	return FALSE;

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(SwapBuffers)(

+	HDC a)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	return dglSwapBuffers(a);

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(SwapLayerBuffers)(

+	HDC a,

+	UINT b)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	return dglSwapBuffers(a);

+}

+

+// ***********************************************************************

+

+// ***********************************************************************

+// Note: This ResizeBuffers() function may be called from

+// either MESA glViewport() or GLD wglMakeCurrent().

+

+BOOL dglWglResizeBuffers(

+	struct gl_context *ctx,

+	BOOL bDefaultDriver)

+{

+	DGL_ctx						*dgl = NULL;

+	RECT						rcScreenRect;

+	DWORD						dwWidth;

+	DWORD						dwHeight;

+	DDSURFACEDESC2				ddsd2;

+	DDSCAPS2					ddscaps2;

+	IDirectDrawClipper			*lpddClipper = NULL;

+	DWORD						dwFlags;

+	HRESULT						hResult;

+

+	DWORD						dwMemoryType;

+

+	int							i;

+	struct gl_texture_object	*tObj;

+	struct gl_texture_image		*image;

+

+	BOOL						bWasFullscreen;

+	BOOL						bSaveDesktop;

+	BOOL						bFullScrnWin = FALSE;

+	DDSURFACEDESC2 				ddsd2DisplayMode;

+

+	DDBLTFX						ddbltfx;

+	POINT						pt;

+	RECT						rcDst;

+#ifdef _USE_GLD3_WGL

+	GLD_displayMode				glddm;

+#endif

+

+#define DDLOG_CRITICAL_OR_WARN	(bDefaultDriver ? DDLOG_WARN : DDLOG_CRITICAL)

+

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	// Sanity checks

+	if (ctx == NULL)

+		return FALSE;

+	dgl = ctx->DriverCtx;

+	if (dgl == NULL)

+		return FALSE;

+

+	// Get the window size and calculate its dimensions

+	if (dgl->hWnd == NULL) {

+		// Check for non-window DC = memory DC ?

+		if (GetClipBox(dgl->hDC, &rcScreenRect) == ERROR)

+			SetRect(&rcScreenRect, 0, 0, 0, 0);

+	}

+	else if (!GetClientRect(dgl->hWnd, &rcScreenRect))

+		SetRect(&rcScreenRect, 0, 0, 0, 0);

+	dwWidth = rcScreenRect.right - rcScreenRect.left;

+	dwHeight = rcScreenRect.bottom - rcScreenRect.top;

+    CopyRect(&dgl->rcScreenRect, &rcScreenRect);

+

+	// This will occur on Alt-Tab

+	if ((dwWidth == 0) && (dwHeight == 0)) {

+		//dgl->bCanRender = FALSE;

+		return TRUE; // No resize possible!

+	}

+

+	// Some apps zero only 1 dimension for non-visible window... (DaveM)

+	if ((dwWidth == 0) || (dwHeight == 0)) {

+		dwWidth = 8;

+		dwHeight = 8;

+	}

+

+	// Test to see if a resize is required.

+	// Note that the dimensions will be the same if a prior resize attempt failed.

+	if ((dwWidth == dgl->dwWidth) && (dwHeight == dgl->dwHeight) && bDefaultDriver) {

+		return TRUE; // No resize required

+	}

+

+	ddlogPrintf(DDLOG_SYSTEM, "dglResize: %dx%d", dwWidth, dwHeight);

+#ifndef _USE_GLD3_WGL

+	// Work out where we want our surfaces created

+	dwMemoryType = (bDefaultDriver) ? glb.dwMemoryType : DDSCAPS_SYSTEMMEMORY;

+#endif // _USE_GLD3_WGL

+

+	// Note previous fullscreen vs window display status

+	bWasFullscreen = dgl->bFullscreen;

+

+#ifdef _USE_GLD3_WGL

+	if (_gldDriver.GetDisplayMode(dgl, &glddm)) {

+		if ( (dwWidth == glddm.Width) &&

+				 (dwHeight == glddm.Height) ) {

+			bFullScrnWin = TRUE;

+		}

+		if (bFullScrnWin && glb.bPrimary && !glb.bFullscreenBlit && !glb.bDirectDrawPersistant) {

+			dgl->bFullscreen = TRUE;

+			ddlogMessage(DDLOG_INFO, "Fullscreen window after resize.\n");

+		}

+		else {

+			dgl->bFullscreen = FALSE;

+			ddlogMessage(DDLOG_INFO, "Non-Fullscreen window after resize.\n");

+		}

+		// Cache the display mode dimensions

+		dgl->dwModeWidth = glddm.Width;

+		dgl->dwModeHeight = glddm.Height;

+	}

+

+	// 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 (dgl->dwWidth > glddm.Width)

+		dgl->dwWidth = glddm.Width;

+	if (dgl->dwHeight > glddm.Height)

+		dgl->dwHeight = glddm.Height;

+#else // _USE_GLD3_WGL

+	// Window resize may have changed to fullscreen

+	ZeroMemory(&ddsd2DisplayMode, sizeof(ddsd2DisplayMode));

+	ddsd2DisplayMode.dwSize = sizeof(ddsd2DisplayMode);

+	hResult = IDirectDraw4_GetDisplayMode(

+					dgl->lpDD4,

+					&ddsd2DisplayMode);

+	if (SUCCEEDED(hResult)) {

+		if ( (dwWidth == ddsd2DisplayMode.dwWidth) &&

+				 (dwHeight == ddsd2DisplayMode.dwHeight) ) {

+			bFullScrnWin = TRUE;

+		}

+		if (bFullScrnWin && glb.bPrimary && !glb.bFullscreenBlit && !glb.bDirectDrawPersistant) {

+			dgl->bFullscreen = TRUE;

+			ddlogMessage(DDLOG_INFO, "Fullscreen window after resize.\n");

+		}

+		else {

+			dgl->bFullscreen = FALSE;

+			ddlogMessage(DDLOG_INFO, "Non-Fullscreen window after resize.\n");

+		}

+		// Cache the display mode dimensions

+		dgl->dwModeWidth = ddsd2DisplayMode.dwWidth;

+		dgl->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 (dgl->dwWidth > ddsd2DisplayMode.dwWidth)

+		dgl->dwWidth = ddsd2DisplayMode.dwWidth;

+	if (dgl->dwHeight > ddsd2DisplayMode.dwHeight)

+		dgl->dwHeight = ddsd2DisplayMode.dwHeight;

+#endif // _USE_GLD3_WGL

+

+	// Note if fullscreen vs window display has changed?

+	bSaveDesktop = (!bWasFullscreen && !dgl->bFullscreen) ? TRUE : FALSE;

+	// Save the desktop primary surface from being destroyed

+	// whenever remaining in windowed mode, since the stereo mode

+	// switches are expensive...

+

+#ifndef _USE_GLD3_WGL

+	// Don't need to re-allocate persistant buffers. (DaveM)

+	// Though we should clear the back buffers to hide artifacts.

+	if (glb.bDirectDrawPersistant && glb.bPersistantBuffers) {

+		dgl->dwWidth = dwWidth;

+		dgl->dwHeight = dwHeight;

+		ZeroMemory(&ddbltfx, sizeof(ddbltfx));

+		ddbltfx.dwSize = sizeof(ddbltfx);

+		ddbltfx.dwFillColor = dgl->dwClearColorPF;

+		IDirectDrawSurface4_Blt(dgl->lpBack4, &rcScreenRect, NULL, NULL,

+			DDBLT_WAIT | DDBLT_COLORFILL, &ddbltfx);

+		return TRUE;

+	}

+

+	// Ensure all rendering is complete

+	if (ctx->Driver.Finish)

+		(*ctx->Driver.Finish)(ctx);

+	if (dgl->bSceneStarted == TRUE) {

+		IDirect3DDevice3_EndScene(dgl->lpDev3);

+		dgl->bSceneStarted = FALSE;

+	}

+#endif // _USE_GLD3_WGL

+	dgl->bCanRender = FALSE;

+

+#ifdef GLD_THREADS

+	// Serialize access to DirectDraw and DDS operations

+	if (glb.bMultiThreaded)

+		EnterCriticalSection(&CriticalSection);

+#endif

+

+#ifndef _USE_GLD3_WGL

+	// Release existing surfaces

+	RELEASE(dgl->lpDev3);

+	RELEASE(dgl->lpDepth4);

+	RELEASE(dgl->lpBack4);

+	if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary)

+        ;

+	else

+	RELEASE(dgl->lpFront4);

+#endif // _USE_GLD3_WGL

+	dgl->dwWidth = dwWidth;

+	dgl->dwHeight = dwHeight;

+

+	// Set defaults

+	dgl->dwModeWidth = dgl->dwWidth;

+	dgl->dwModeHeight = dgl->dwHeight;

+

+#ifdef _USE_GLD3_WGL

+	if (!_gldDriver.ResizeDrawable(dgl, bDefaultDriver, glb.bDirectDrawPersistant, glb.bPersistantBuffers))

+		goto cleanup_and_return_with_error;

+#else // _USE_GLD3_WGL

+

+	if (dgl->bFullscreen) {

+		//

+		// FULLSCREEN

+		//

+

+        // Disable warning popups when in fullscreen mode

+        ddlogWarnOption(FALSE);

+

+		// Have to release the persistant DirectDraw primary surface

+		// if switching to fullscreen mode. So if application wants

+		// persistant display in fullscreen mode, a fullscreen-size

+		// window should be used instead via fullscreen-blit option.

+		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) {

+			RELEASE(glb.lpPrimary4);

+			glb.bDirectDrawPrimary = FALSE;

+		}

+

+		dwFlags = DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT;

+		if (glb.bFastFPU)

+			dwFlags |= DDSCL_FPUSETUP;	// optional

+		hResult = IDirectDraw4_SetCooperativeLevel(dgl->lpDD4, dgl->hWnd, dwFlags);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Unable to set Exclusive Fullscreen mode", hResult);

+			goto cleanup_and_return_with_error;

+		}

+

+		hResult = IDirectDraw4_SetDisplayMode(dgl->lpDD4,

+											  dgl->dwModeWidth,

+											  dgl->dwModeHeight,

+											  dgl->dwBPP,

+											  0,

+											  0);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetDisplayMode failed", hResult);

+			goto cleanup_and_return_with_error;

+		}

+

+		// ** The display mode has changed, so dont use MessageBox! **

+

+		ZeroMemory(&ddsd2, sizeof(ddsd2));

+		ddsd2.dwSize = sizeof(ddsd2);

+

+		if (dgl->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(dgl->lpDD4, &ddsd2, &dgl->lpFront4, NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (primary) failed", hResult);

+				goto cleanup_and_return_with_error;

+			}

+			// Render target surface

+			ZeroMemory(&ddscaps2, sizeof(ddscaps2)); // Clear the entire struct.

+			ddscaps2.dwCaps = DDSCAPS_BACKBUFFER;

+			hResult = IDirectDrawSurface4_GetAttachedSurface(dgl->lpFront4, &ddscaps2, &dgl->lpBack4);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: GetAttachedSurface failed", hResult);

+				goto cleanup_and_return_with_error;

+			}

+		} else {

+			// Single buffered

+			// Primary surface

+			ddsd2.dwFlags = DDSD_CAPS;

+			ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE |

+								   //DDSCAPS_3DDEVICE |

+								   dwMemoryType;

+

+			hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpFront4, NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (primary) failed", hResult);

+				goto cleanup_and_return_with_error;

+			}

+

+			dgl->lpBack4 = NULL;

+		}

+	} else {

+		// WINDOWED

+

+        // OK to enable warning popups in windowed mode

+        ddlogWarnOption(glb.bMessageBoxWarnings);

+

+		// Ditto if persistant DirectDraw primary

+		if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary)

+			goto DoClipperOnly;

+

+		// WINDOWED

+		dwFlags = DDSCL_NORMAL;

+		if (glb.bMultiThreaded)

+			dwFlags |= DDSCL_MULTITHREADED;

+		if (glb.bFastFPU)

+			dwFlags |= DDSCL_FPUSETUP;	// optional

+		hResult = IDirectDraw4_SetCooperativeLevel(dgl->lpDD4,

+												  dgl->hWnd,

+												  dwFlags);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Unable to set Normal coop level", hResult);

+			goto cleanup_and_return_with_error;

+		}

+		// Primary surface

+		ZeroMemory(&ddsd2, sizeof(ddsd2));

+		ddsd2.dwSize = sizeof(ddsd2);

+		ddsd2.dwFlags = DDSD_CAPS;

+		ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;

+		hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpFront4, NULL);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (primary) failed", hResult);

+			goto cleanup_and_return_with_error;

+		}

+

+		// Cache the primary surface for persistant DirectDraw state

+		if (glb.bDirectDrawPersistant && !glb.bDirectDrawPrimary) {

+			glb.lpPrimary4 = dgl->lpFront4;

+			IDirectDrawSurface4_AddRef(glb.lpPrimary4);

+			glb.bDirectDrawPrimary = TRUE;

+		}

+

+		// Clipper object

+		hResult = DirectDrawCreateClipper(0, &lpddClipper, NULL);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateClipper failed", hResult);

+			goto cleanup_and_return_with_error;

+		}

+		hResult = IDirectDrawClipper_SetHWnd(lpddClipper, 0, dgl->hWnd);

+		if (FAILED(hResult)) {

+			RELEASE(lpddClipper);

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetHWnd failed", hResult);

+			goto cleanup_and_return_with_error;

+		}

+		hResult = IDirectDrawSurface4_SetClipper(dgl->lpFront4, lpddClipper);

+		RELEASE(lpddClipper); // We have finished with it.

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetClipper failed", hResult);

+			goto cleanup_and_return_with_error;

+		}

+DoClipperOnly:

+		// Update the window for the original clipper

+		if ((glb.bDirectDrawPersistant && glb.bDirectDrawPrimary) || bSaveDesktop) {

+			IDirectDrawSurface4_GetClipper(dgl->lpFront4, &lpddClipper);

+			IDirectDrawClipper_SetHWnd(lpddClipper, 0, dgl->hWnd);

+			RELEASE(lpddClipper);

+		}

+

+		if (dgl->bDoubleBuffer) {

+			// Render target surface

+			ZeroMemory(&ddsd2, sizeof(ddsd2));

+			ddsd2.dwSize = sizeof(ddsd2);

+			ddsd2.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;

+			ddsd2.dwWidth        = dgl->dwWidth;

+			ddsd2.dwHeight       = dgl->dwHeight;

+			ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE |

+								   DDSCAPS_OFFSCREENPLAIN |

+								   dwMemoryType;

+			hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpBack4, NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Create Backbuffer failed", hResult);

+				goto cleanup_and_return_with_error;

+			}

+

+		} else {

+			dgl->lpBack4 = NULL;

+		}

+	}

+

+	//

+	// Now create the Zbuffer

+	//

+	if (dgl->bDepthBuffer) {

+		// 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 = dgl->dwWidth;

+		ddsd2.dwHeight = dgl->dwHeight;

+		memcpy(&ddsd2.ddpfPixelFormat,

+			   &glb.lpZBufferPF[dgl->iZBufferPF],

+			   sizeof(DDPIXELFORMAT) );

+

+		// Create a z-buffer

+		hResult = IDirectDraw4_CreateSurface(dgl->lpDD4, &ddsd2, &dgl->lpDepth4, NULL);

+		if (FAILED(hResult)) {

+			ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: CreateSurface (ZBuffer) failed", hResult);

+			goto cleanup_and_return_with_error;

+		}

+

+		// Attach Zbuffer to render target

+		TRY(IDirectDrawSurface4_AddAttachedSurface(

+			dgl->bDoubleBuffer ? dgl->lpBack4 : dgl->lpFront4,

+			dgl->lpDepth4),

+			"dglResize: Attach Zbuffer");

+

+	}

+

+	// Clear the newly resized back buffers for the window client area.

+	ZeroMemory(&ddbltfx, sizeof(ddbltfx));

+	ddbltfx.dwSize = sizeof(ddbltfx);

+	ddbltfx.dwFillColor = dgl->dwClearColorPF;

+	IDirectDrawSurface4_Blt(dgl->lpBack4, &rcScreenRect, NULL, NULL,

+		DDBLT_WAIT | DDBLT_COLORFILL, &ddbltfx);

+

+	//

+	// Now that we have a zbuffer we can create the 3D device

+	//

+	hResult = IDirect3D3_CreateDevice(dgl->lpD3D3,

+									  bDefaultDriver ? &glb.d3dGuid : &IID_IDirect3DRGBDevice,

+									  dgl->bDoubleBuffer ? dgl->lpBack4 : dgl->lpFront4,

+									  &dgl->lpDev3,

+									  NULL);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Could not create Direct3D device", hResult);

+		goto cleanup_and_return_with_error;

+	}

+

+	// We must do this as soon as the device is created

+	dglInitStateCaches(dgl);

+

+	//

+	// Viewport

+	//

+	hResult = IDirect3DDevice3_AddViewport(dgl->lpDev3, dgl->lpViewport3);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: AddViewport failed", hResult);

+		goto cleanup_and_return_with_error;

+	}

+

+	// Initialise the viewport

+	dgl->d3dViewport.dwSize = sizeof(dgl->d3dViewport);

+	dgl->d3dViewport.dwX = 0;

+	dgl->d3dViewport.dwY = 0;

+	dgl->d3dViewport.dwWidth = dgl->dwWidth;

+	dgl->d3dViewport.dwHeight = dgl->dwHeight;

+	dgl->d3dViewport.dvClipX = 0;

+	dgl->d3dViewport.dvClipY = 0;

+	dgl->d3dViewport.dvClipWidth = dgl->dwWidth;

+	dgl->d3dViewport.dvClipHeight = dgl->dwHeight;

+//	dgl->d3dViewport.dvMinZ = 0.0f;

+//	dgl->d3dViewport.dvMaxZ = 1.0f;

+	TRY(IDirect3DViewport3_SetViewport2(dgl->lpViewport3, &dgl->d3dViewport),

+		"dglResize: SetViewport2");

+

+	hResult = IDirect3DDevice3_SetCurrentViewport(dgl->lpDev3, dgl->lpViewport3);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: SetCurrentViewport failed", hResult);

+		goto cleanup_and_return_with_error;

+	}

+

+	// (Re)Initialise all the Direct3D renderstates

+	dglInitStateD3D(ctx);

+

+	// Now we have to recreate all of our textures (+ mipmaps).

+	// Walk over all textures in hash table

+	// XXX what about the default texture objects (id=0)?

+	{

+		struct _mesa_HashTable *textures = ctx->Shared->TexObjects;

+		GLuint id;

+		for (id = _mesa_HashFirstEntry(textures);

+				 id;

+				 id = _mesa_HashNextEntry(textures, id)) {

+			tObj = (struct gl_texture_object *) _mesa_HashLookup(textures, id);

+			if (tObj->DriverData) {

+				// We could call our TexImage function directly, but it's

+				// safer to use the driver pointer.

+				for (i=0; i<MAX_TEXTURE_LEVELS; i++) {

+					image = tObj->Image[i];

+					if (image) {

+						switch (tObj->Dimensions){

+						case 1:

+							if (ctx->Driver.TexImage)

+								(*ctx->Driver.TexImage)(ctx, GL_TEXTURE_1D, tObj, i, image->Format, image);

+							break;

+						case 2:

+							if (ctx->Driver.TexImage)

+								(*ctx->Driver.TexImage)(ctx, GL_TEXTURE_2D, tObj, i, image->Format, image);

+							break;

+						default:

+							break;

+						}

+					}

+				}

+			}

+		}

+	}

+

+	// Re-Bind each texture Unit

+	for (i=0; i<glb.wMaxSimultaneousTextures; i++) {

+		tObj = ctx->Texture.Unit[i].Current;

+		if (tObj) {

+			DGL_texture *lpTex = (DGL_texture *)tObj->DriverData;

+			hResult = dglSetTexture(dgl, i, lpTex ? lpTex->lpTexture : NULL);

+			if (FAILED(hResult)) {

+				ddlogError(DDLOG_ERROR, "dglResize: SetTexture failed", hResult);

+			}

+		}

+	}

+#endif // _USE_GLD3_WGL

+

+	dgl->bCanRender = TRUE;

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+	// SUCCESS.

+	return TRUE;

+

+cleanup_and_return_with_error:

+	// Relase all interfaces before returning.

+#ifdef _USE_GLD3_WGL

+	_gldDriver.DestroyDrawable(dgl);

+#else // _USE_GLD3_WGL

+	RELEASE(dgl->lpDev3);

+	RELEASE(dgl->lpDepth4);

+	RELEASE(dgl->lpBack4);

+	if (glb.bDirectDrawPersistant && glb.bDirectDrawPrimary)

+		;

+	else

+	RELEASE(dgl->lpFront4);

+

+#undef DDLOG_CRITICAL_OR_WARN

+#endif // _USE_GLD3_WGL

+

+	// Mark context as not being able to render

+	dgl->bCanRender = FALSE;

+

+#ifdef GLD_THREADS

+	// Release serialized access

+	if (glb.bMultiThreaded)

+		LeaveCriticalSection(&CriticalSection);

+#endif

+

+	return FALSE;

+}

+

+// ***********************************************************************

+// ***********************************************************************

+// Support for bitmap fonts.

+// ***********************************************************************

+// ***********************************************************************

+

+/*****************************************************************************

+**

+** InvertGlyphBitmap.

+**

+** Invert the bitmap so that it suits OpenGL's representation.

+** Each row starts on a double word boundary.

+**

+*****************************************************************************/

+

+static void InvertGlyphBitmap(

+	int w,

+	int h,

+	DWORD *fptr,

+	DWORD *tptr)

+{

+	int dWordsInRow = (w+31)/32;

+	int i, j;

+	DWORD *tmp = tptr;

+

+	if (w <= 0 || h <= 0) {

+	return;

+	}

+

+	tptr += ((h-1)*dWordsInRow);

+	for (i = 0; i < h; i++) {

+	for (j = 0; j < dWordsInRow; j++) {

+		*(tptr + j) = *(fptr + j);

+	}

+	tptr -= dWordsInRow;

+	fptr += dWordsInRow;

+	}

+}

+

+// ***********************************************************************

+

+/*****************************************************************************

+ * wglUseFontBitmaps

+ *

+ * Converts a subrange of the glyphs in a GDI font to OpenGL display

+ * lists.

+ *

+ * Extended to support any GDI font, not just TrueType fonts. (DaveM)

+ *

+ *****************************************************************************/

+

+BOOL APIENTRY _GLD_WGL_EXPORT(UseFontBitmapsA)(

+	HDC hDC,

+	DWORD first,

+	DWORD count,

+	DWORD listBase)

+{

+	int					i, ox, oy, ix, iy;

+	int					w, h;

+	int					iBufSize, iCurBufSize = 0;

+	DWORD				*bitmapBuffer = NULL;

+	DWORD				*invertedBitmapBuffer = NULL;

+	BOOL				bSuccessOrFail = TRUE;

+	BOOL				bTrueType = FALSE;

+	TEXTMETRIC			tm;

+	GLYPHMETRICS		gm;

+	RASTERIZER_STATUS	rs;

+	MAT2				mat;

+	SIZE				size;

+	RECT				rect;

+	HDC					hDCMem;

+	HBITMAP				hBitmap;

+	BITMAPINFO			bmi;

+	HFONT				hFont;

+

+	// Validate SciTech DirectGL license

+	if (!dglValidate())

+		return FALSE;

+

+	// Set up a unity matrix.

+	ZeroMemory(&mat, sizeof(mat));

+	mat.eM11.value = 1;

+	mat.eM22.value = 1;

+

+	// Test to see if selected font is TrueType or not

+	ZeroMemory(&tm, sizeof(tm));

+	if (!GetTextMetrics(hDC, &tm)) {

+		ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: Font metrics error\n");

+		return (FALSE);

+	}

+	bTrueType = (tm.tmPitchAndFamily & TMPF_TRUETYPE) ? TRUE : FALSE;

+

+	// Test to see if TRUE-TYPE capabilities are installed

+	// (only necessary if TrueType font selected)

+	ZeroMemory(&rs, sizeof(rs));

+	if (bTrueType) {

+		if (!GetRasterizerCaps (&rs, sizeof (RASTERIZER_STATUS))) {

+			ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: Raster caps error\n");

+			return (FALSE);

+		}

+		if (!(rs.wFlags & TT_ENABLED)) {

+			ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: No TrueType caps\n");

+			return (FALSE);

+		}

+	}

+

+	// Trick to get the current font handle

+	hFont = SelectObject(hDC, GetStockObject(SYSTEM_FONT));

+	SelectObject(hDC, hFont);

+

+	// Have memory device context available for holding bitmaps of font glyphs

+	hDCMem = CreateCompatibleDC(hDC);

+	SelectObject(hDCMem, hFont);

+	SetTextColor(hDCMem, RGB(0xFF, 0xFF, 0xFF));

+	SetBkColor(hDCMem, 0);

+

+	for (i = first; (DWORD) i < (first + count); i++) {

+		// Find out how much space is needed for the bitmap so we can

+		// Set the buffer size correctly.

+		if (bTrueType) {

+			// Use TrueType support to get bitmap size of glyph

+			iBufSize = GetGlyphOutline(hDC, i, GGO_BITMAP, &gm,

+				0, NULL, &mat);

+			if (iBufSize == GDI_ERROR) {

+				bSuccessOrFail = FALSE;

+				break;

+			}

+		}

+		else {

+			// Use generic GDI support to compute bitmap size of glyph

+			w = tm.tmMaxCharWidth;

+			h = tm.tmHeight;

+			if (GetTextExtentPoint32(hDC, (LPCTSTR)&i, 1, &size)) {

+				w = size.cx;

+				h = size.cy;

+			}

+			iBufSize = w * h;

+			// Use DWORD multiple for compatibility

+			iBufSize += 3;

+			iBufSize /= 4;

+			iBufSize *= 4;

+		}

+

+		// If we need to allocate Larger Buffers, then do so - but allocate

+		// An extra 50 % so that we don't do too many mallocs !

+		if (iBufSize > iCurBufSize) {

+			if (bitmapBuffer) {

+				__wglFree(bitmapBuffer);

+			}

+			if (invertedBitmapBuffer) {

+				__wglFree(invertedBitmapBuffer);

+			}

+

+			iCurBufSize = iBufSize * 2;

+			bitmapBuffer = (DWORD *) __wglMalloc(iCurBufSize);

+			invertedBitmapBuffer = (DWORD *) __wglMalloc(iCurBufSize);

+

+			if (bitmapBuffer == NULL || invertedBitmapBuffer == NULL) {

+				bSuccessOrFail = FALSE;

+				break;

+			}

+		}

+

+		// If we fail to get the Glyph data, delete the display lists

+		// Created so far and return FALSE.

+		if (bTrueType) {

+			// Use TrueType support to get bitmap of glyph

+			if (GetGlyphOutline(hDC, i, GGO_BITMAP, &gm,

+					iBufSize, bitmapBuffer, &mat) == GDI_ERROR) {

+				bSuccessOrFail = FALSE;

+				break;

+			}

+

+			// Setup glBitmap parameters for current font glyph

+			w  = gm.gmBlackBoxX;

+			h  = gm.gmBlackBoxY;

+			ox = gm.gmptGlyphOrigin.x;

+			oy = gm.gmptGlyphOrigin.y;

+			ix = gm.gmCellIncX;

+			iy = gm.gmCellIncY;

+		}

+		else {

+			// Use generic GDI support to create bitmap of glyph

+			ZeroMemory(bitmapBuffer, iBufSize);

+

+			if (i >= tm.tmFirstChar && i <= tm.tmLastChar) {

+				// Only create bitmaps for actual font glyphs

+				hBitmap = CreateBitmap(w, h, 1, 1, NULL);

+				SelectObject(hDCMem, hBitmap);

+				// Make bitmap of current font glyph

+				SetRect(&rect, 0, 0, w, h);

+				DrawText(hDCMem, (LPCTSTR)&i, 1, &rect,

+					DT_LEFT | DT_BOTTOM | DT_SINGLELINE | DT_NOCLIP);

+				// Make copy of bitmap in our local buffer

+				ZeroMemory(&bmi, sizeof(bmi));

+				bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

+				bmi.bmiHeader.biWidth = w;

+				bmi.bmiHeader.biHeight = -h;

+				bmi.bmiHeader.biPlanes = 1;

+				bmi.bmiHeader.biBitCount = 1;

+				bmi.bmiHeader.biCompression = BI_RGB;

+				GetDIBits(hDCMem, hBitmap, 0, h, bitmapBuffer, &bmi, 0);

+				DeleteObject(hBitmap);

+			}

+			else {

+				// Otherwise use empty display list for non-existing glyph

+				iBufSize = 0;

+			}

+

+			// Setup glBitmap parameters for current font glyph

+			ox = 0;

+			oy = tm.tmDescent;

+			ix = w;

+			iy = 0;

+		}

+

+		// Create an OpenGL display list.

+		_GLD_glNewList((listBase + i), GL_COMPILE);

+

+		// Some fonts have no data for the space character, yet advertise

+		// a non-zero size.

+		if (0 == iBufSize) {

+			_GLD_glBitmap(0, 0, 0.0f, 0.0f, (GLfloat) ix, (GLfloat) iy, NULL);

+		} else {

+			// Invert the Glyph data.

+			InvertGlyphBitmap(w, h, bitmapBuffer, invertedBitmapBuffer);

+

+			// Render an OpenGL bitmap and invert the origin.

+			_GLD_glBitmap(w, h,

+				(GLfloat) ox, (GLfloat) (h-oy),

+				(GLfloat) ix, (GLfloat) iy,

+				(GLubyte *) invertedBitmapBuffer);

+		}

+

+		// Close this display list.

+		_GLD_glEndList();

+	}

+

+	if (bSuccessOrFail == FALSE) {

+		ddlogMessage(DDLOG_ERROR, "DGL_UseFontBitmaps: Get glyph failed\n");

+		_GLD_glDeleteLists((i+listBase), (i-first));

+	}

+

+	// Release resources used

+	DeleteObject(hFont);

+	DeleteDC(hDCMem);

+

+	if (bitmapBuffer)

+		__wglFree(bitmapBuffer);

+	if (invertedBitmapBuffer)

+		__wglFree(invertedBitmapBuffer);

+

+	return(bSuccessOrFail);

+}

+

+// ***********************************************************************

+

+BOOL APIENTRY _GLD_WGL_EXPORT(UseFontBitmapsW)(

+	HDC a,

+	DWORD b,

+	DWORD c,

+	DWORD d)

+{

+	// Validate license

+	if (!dglValidate())

+		return FALSE;

+

+	return _GLD_WGL_EXPORT(UseFontBitmapsA)(a, b, c, d);

+}

+

+// ***********************************************************************

+// ***********************************************************************

+// Support for outline TrueType fonts.

+// ***********************************************************************

+// ***********************************************************************

+

+void * __wglRealloc(

+	void *oldPtr,

+	size_t newSize)

+{

+    void *newPtr = NULL;

+	

+    if (newSize != 0) {

+		newPtr = (void *) GlobalAlloc(GPTR, newSize);

+		if (oldPtr && newPtr) {

+			DWORD oldSize = GlobalSize(oldPtr);

+			

+			memcpy(newPtr, oldPtr, (oldSize <= newSize ? oldSize : newSize));

+			GlobalFree(oldPtr);

+		}

+    } else if (oldPtr) {

+		GlobalFree(oldPtr);

+    }

+    if (newPtr == NULL) {

+		return NULL;	/* XXX out of memory error */

+    }

+    return newPtr;

+}

+

+// ***********************************************************************

+

+

+/*****************************************************************************

+ * wglUseFontOutlinesW

+ *

+ * Converts a subrange of the glyphs in a TrueType font to OpenGL display

+ * lists.

+ *****************************************************************************/

+

+BOOL APIENTRY _GLD_WGL_EXPORT(UseFontOutlinesW)(

+	IN	HDC			hDC,

+	IN	DWORD			first,

+	IN	DWORD			count,

+	IN	DWORD			listBase,

+	IN	FLOAT			chordalDeviation,

+	IN	FLOAT			extrusion,

+	IN	INT			format,

+	OUT	LPGLYPHMETRICSFLOAT	lpgmf)

+{

+	return _GLD_WGL_EXPORT(UseFontOutlinesA)(hDC, first, count, listBase,

+		chordalDeviation, extrusion, format, lpgmf);

+}

+

+/*****************************************************************************

+ * wglUseFontOutlinesA

+ *

+ * Converts a subrange of the glyphs in a TrueType font to OpenGL display

+ * lists.

+ *****************************************************************************/

+

+BOOL APIENTRY _GLD_WGL_EXPORT(UseFontOutlinesA)(

+	IN	HDC			hDC,

+			IN	DWORD			first,

+			IN	DWORD			count,

+			IN	DWORD			listBase,

+			IN	FLOAT			chordalDeviation,

+			IN	FLOAT			extrusion,

+			IN	INT			format,

+			OUT	LPGLYPHMETRICSFLOAT	glyphMetricsFloatArray)

+	{

+	DWORD	glyphIndex;

+	UCHAR*	glyphBuf;

+	DWORD	glyphBufSize;

+

+

+	/*

+	 * Flush any previous OpenGL errors.  This allows us to check for

+	 * new errors so they can be reported via the function return value.

+	 */

+	while (_GLD_glGetError() != GL_NO_ERROR)

+		;

+

+	/*

+	 * Make sure that the current font can be sampled accurately.

+	 */

+	hNewFont = CreateHighResolutionFont(hDC);

+	if (!hNewFont)

+		return FALSE;

+

+	hOldFont = SelectObject(hDC, hNewFont);

+	if (!hOldFont)

+		return FALSE;

+

+	/*

+	 * Preallocate a buffer for the outline data, and track its size:

+	 */

+	glyphBuf = (UCHAR*) __wglMalloc(glyphBufSize = 10240);

+	if (!glyphBuf)

+		return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/

+

+	/*

+	 * Process each glyph in the given range:

+	 */

+	for (glyphIndex = first; glyphIndex - first < count; ++glyphIndex)

+		{

+		GLYPHMETRICS	glyphMetrics;

+		DWORD		glyphSize;

+		static MAT2	matrix =

+			{

+			{0, 1},		{0, 0},

+			{0, 0},		{0, 1}

+			};

+		LPGLYPHMETRICSFLOAT glyphMetricsFloat =

+			&glyphMetricsFloatArray[glyphIndex - first];

+

+

+		/*

+		 * Determine how much space is needed to store the glyph's

+		 * outlines.  If our glyph buffer isn't large enough,

+		 * resize it.

+		 */

+		glyphSize = GetGlyphOutline(	hDC,

+						glyphIndex,

+						GGO_NATIVE,

+						&glyphMetrics,

+						0,

+						NULL,

+						&matrix

+						);

+		if (glyphSize < 0)

+			return FALSE; /*WGL_STATUS_FAILURE*/

+		if (glyphSize > glyphBufSize)

+			{

+			__wglFree(glyphBuf);

+			glyphBuf = (UCHAR*) __wglMalloc(glyphBufSize = glyphSize);

+			if (!glyphBuf)

+				return FALSE; /*WGL_STATUS_NOT_ENOUGH_MEMORY*/

+			}

+

+

+		/*

+		 * Get the glyph's outlines.

+		 */

+		if (GetGlyphOutline(	hDC,

+					glyphIndex,

+					GGO_NATIVE,

+					&glyphMetrics,

+					glyphBufSize,

+					glyphBuf,

+					&matrix

+					) < 0)

+			{

+			__wglFree(glyphBuf);

+			return FALSE; /*WGL_STATUS_FAILURE*/

+			}

+		

+		glyphMetricsFloat->gmfBlackBoxX =

+			(FLOAT) glyphMetrics.gmBlackBoxX * ScaleFactor;

+		glyphMetricsFloat->gmfBlackBoxY =

+			(FLOAT) glyphMetrics.gmBlackBoxY * ScaleFactor;

+		glyphMetricsFloat->gmfptGlyphOrigin.x =

+			(FLOAT) glyphMetrics.gmptGlyphOrigin.x * ScaleFactor;

+		glyphMetricsFloat->gmfptGlyphOrigin.y =

+			(FLOAT) glyphMetrics.gmptGlyphOrigin.y * ScaleFactor;

+		glyphMetricsFloat->gmfCellIncX =

+			(FLOAT) glyphMetrics.gmCellIncX * ScaleFactor;

+		glyphMetricsFloat->gmfCellIncY =

+			(FLOAT) glyphMetrics.gmCellIncY * ScaleFactor;

+		

+		/*

+		 * Turn the glyph into a display list:

+		 */

+		if (!MakeDisplayListFromGlyph(	(glyphIndex - first) + listBase,

+						glyphBuf,

+						glyphSize,

+						glyphMetricsFloat,

+						chordalDeviation + ScaleFactor,

+						extrusion,

+						format))

+			{

+			__wglFree(glyphBuf);

+			return FALSE; /*WGL_STATUS_FAILURE*/

+			}

+		}

+

+

+	/*

+	 * Clean up temporary storage and return.  If an error occurred,

+	 * clear all OpenGL error flags and return FAILURE status;

+	 * otherwise just return SUCCESS.

+	 */

+	__wglFree(glyphBuf);

+

+	SelectObject(hDC, hOldFont);

+

+	if (_GLD_glGetError() == GL_NO_ERROR)

+		return TRUE; /*WGL_STATUS_SUCCESS*/

+	else

+		{

+		while (_GLD_glGetError() != GL_NO_ERROR)

+			;

+		return FALSE; /*WGL_STATUS_FAILURE*/

+		}

+	}

+

+

+

+/*****************************************************************************

+ * CreateHighResolutionFont

+ *

+ * Gets metrics for the current font and creates an equivalent font

+ * scaled to the design units of the font.

+ * 

+ *****************************************************************************/

+

+static HFONT

+CreateHighResolutionFont(HDC hDC)

+	{

+	UINT otmSize;

+	OUTLINETEXTMETRIC *otm;

+	LONG fontHeight, fontWidth, fontUnits;

+	LOGFONT logFont;

+

+	otmSize = GetOutlineTextMetrics(hDC, 0, NULL);

+	if (otmSize == 0) 

+		return NULL;

+

+	otm = (OUTLINETEXTMETRIC *) __wglMalloc(otmSize);

+	if (otm == NULL)

+		return NULL;

+

+	otm->otmSize = otmSize;

+	if (GetOutlineTextMetrics(hDC, otmSize, otm) == 0) 

+		return NULL;

+	

+	fontHeight = otm->otmTextMetrics.tmHeight -

+			otm->otmTextMetrics.tmInternalLeading;

+	fontWidth = otm->otmTextMetrics.tmAveCharWidth;

+	fontUnits = (LONG) otm->otmEMSquare;

+	

+	ScaleFactor = 1.0F / (FLOAT) fontUnits;

+

+	logFont.lfHeight = - ((LONG) fontUnits);

+	logFont.lfWidth = (LONG)

+		((FLOAT) (fontWidth * fontUnits) / (FLOAT) fontHeight);

+	logFont.lfEscapement = 0;

+	logFont.lfOrientation = 0;

+	logFont.lfWeight = otm->otmTextMetrics.tmWeight;

+	logFont.lfItalic = otm->otmTextMetrics.tmItalic;

+	logFont.lfUnderline = otm->otmTextMetrics.tmUnderlined;

+	logFont.lfStrikeOut = otm->otmTextMetrics.tmStruckOut;

+	logFont.lfCharSet = otm->otmTextMetrics.tmCharSet;

+	logFont.lfOutPrecision = OUT_OUTLINE_PRECIS;

+	logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;

+	logFont.lfQuality = DEFAULT_QUALITY;

+	logFont.lfPitchAndFamily =

+		otm->otmTextMetrics.tmPitchAndFamily & 0xf0;

+	strcpy(logFont.lfFaceName,

+	       (char *)otm + (int)otm->otmpFaceName);

+

+	hNewFont = CreateFontIndirect(&logFont);

+	if (hNewFont == NULL)

+		return NULL;

+

+	__wglFree(otm);

+

+	return hNewFont;

+	}

+

+

+

+/*****************************************************************************

+ * MakeDisplayListFromGlyph

+ * 

+ * Converts the outline of a glyph to an OpenGL display list.

+ *

+ * Return value is nonzero for success, zero for failure.

+ *

+ * Does not check for OpenGL errors, so if the caller needs to know about them,

+ * it should call glGetError().

+ *****************************************************************************/

+

+static int

+MakeDisplayListFromGlyph(	IN  DWORD		listName,

+				IN  UCHAR*		glyphBuf,

+				IN  DWORD		glyphSize,

+				IN  LPGLYPHMETRICSFLOAT	glyphMetricsFloat,

+				IN  FLOAT		chordalDeviation,

+				IN  FLOAT		extrusion,

+				IN  INT			format)

+	{

+	int status;

+

+	_GLD_glNewList(listName, GL_COMPILE);

+		status = DrawGlyph(	glyphBuf,

+					glyphSize,

+					chordalDeviation,

+					extrusion,

+					format);

+		

+	_GLD_glTranslatef(glyphMetricsFloat->gmfCellIncX,

+		     glyphMetricsFloat->gmfCellIncY,

+		     0.0F);

+	_GLD_glEndList();

+

+	return status;

+	}

+

+

+

+/*****************************************************************************

+ * DrawGlyph

+ * 

+ * Converts the outline of a glyph to OpenGL drawing primitives, tessellating

+ * as needed, and then draws the glyph.  Tessellation of the quadratic splines

+ * in the outline is controlled by "chordalDeviation", and the drawing

+ * primitives (lines or polygons) are selected by "format".

+ *

+ * Return value is nonzero for success, zero for failure.

+ *

+ * Does not check for OpenGL errors, so if the caller needs to know about them,

+ * it should call glGetError().

+ *****************************************************************************/

+

+static int

+DrawGlyph(	IN  UCHAR*	glyphBuf,

+		IN  DWORD	glyphSize,

+		IN  FLOAT	chordalDeviation,

+		IN  FLOAT	extrusion,

+		IN  INT		format)

+	{

+	INT			status = 0;

+	FLOAT*			p;

+	DWORD			loop;

+	DWORD			point;

+	GLUtesselator*		tess = NULL;

+

+

+	/*

+	 * Initialize the global buffer into which we place the outlines:

+	 */

+	if (!InitLineBuf())

+		goto exit;

+

+

+	/*

+	 * Convert the glyph outlines to a set of polyline loops.

+	 * (See MakeLinesFromGlyph() for the format of the loop data

+	 * structure.)

+	 */

+	if (!MakeLinesFromGlyph(glyphBuf, glyphSize, chordalDeviation))

+		goto exit;

+	p = LineBuf;

+

+

+	/*

+	 * Now draw the loops in the appropriate format:

+	 */

+	if (format == WGL_FONT_LINES)

+		{

+		/*

+		 * This is the easy case.  Just draw the outlines.

+		 */

+		for (loop = (DWORD) *p++; loop; --loop)

+			{

+			_GLD_glBegin(GL_LINE_LOOP);

+				for (point = (DWORD) *p++; point; --point)

+					{

+					_GLD_glVertex2fv(p);

+					p += 2;

+					}

+			_GLD_glEnd();

+			}

+		status = 1;

+		}

+

+	else if (format == WGL_FONT_POLYGONS)

+		{

+		double v[3];

+		FLOAT *save_p = p;

+		GLfloat z_value;

+		

+		/*

+		 * This is the hard case.  We have to set up a tessellator

+		 * to convert the outlines into a set of polygonal

+		 * primitives, which the tessellator passes to some

+		 * auxiliary routines for drawing.

+		 */

+		if (!LoadGLUTesselator())

+			goto exit;

+		if (!InitVertBuf())

+			goto exit;

+		if (!(tess = gluNewTessProc()))

+			goto exit;

+		gluTessCallbackProc(tess,	GLU_BEGIN,	(void(CALLBACK *)()) _GLD_glBegin);

+		gluTessCallbackProc(tess,	GLU_TESS_VERTEX_DATA,

+				    (void(CALLBACK *)()) TessVertexOutData);

+		gluTessCallbackProc(tess,	GLU_END,	(void(CALLBACK *)()) _GLD_glEnd);

+		gluTessCallbackProc(tess,	GLU_ERROR,	(void(CALLBACK *)()) TessError);

+		gluTessCallbackProc(tess,	GLU_TESS_COMBINE, (void(CALLBACK *)()) TessCombine);

+		gluTessNormalProc(tess,	0.0F, 0.0F, 1.0F);

+

+		TessErrorOccurred = 0;

+		_GLD_glNormal3f(0.0f, 0.0f, 1.0f);

+		v[2] = 0.0;

+		z_value = 0.0f;

+

+		gluTessBeginPolygonProc(tess, (void *)*(int *)&z_value);

+			for (loop = (DWORD) *p++; loop; --loop)

+				{

+				gluTessBeginContourProc(tess);

+				

+				for (point = (DWORD) *p++; point; --point)

+					{

+					v[0] = p[0];

+					v[1] = p[1];

+					gluTessVertexProc(tess, v, p);

+					p += 2;

+					}

+

+				gluTessEndContourProc(tess);

+				}

+		gluTessEndPolygonProc(tess);

+

+		status = !TessErrorOccurred;

+

+		/* Extrusion code */

+		if (extrusion) {

+			DWORD loops;

+			GLfloat thickness = (GLfloat) -extrusion;

+			FLOAT *vert, *vert2;

+			DWORD count;

+

+			p = save_p;

+			loops = (DWORD) *p++;

+

+			for (loop = 0; loop < loops; loop++) {

+				GLfloat dx, dy, len;

+				DWORD last;

+

+				count = (DWORD) *p++;

+				_GLD_glBegin(GL_QUAD_STRIP);

+

+				/* Check if the first and last vertex are identical

+				 * so we don't draw the same quad twice.

+				 */

+				vert = p + (count-1)*2;

+				last = (p[0] == vert[0] && p[1] == vert[1]) ? count-1 : count;

+

+				for (point = 0; point <= last; point++) {

+					vert  = p + 2 * (point % last);

+					vert2 = p + 2 * ((point+1) % last);

+

+					dx = vert[0] - vert2[0];

+					dy = vert[1] - vert2[1];

+					len = (GLfloat)sqrt(dx * dx + dy * dy);

+

+					_GLD_glNormal3f(dy / len, -dx / len, 0.0f);

+					_GLD_glVertex3f((GLfloat) vert[0],

+							   (GLfloat) vert[1], thickness);

+					_GLD_glVertex3f((GLfloat) vert[0],

+							   (GLfloat) vert[1], 0.0f);

+				}

+

+				_GLD_glEnd();

+				p += count*2;

+			}

+

+			/* Draw the back face */

+			p = save_p;

+			v[2] = thickness;

+			_GLD_glNormal3f(0.0f, 0.0f, -1.0f);

+			gluTessNormalProc(tess,	0.0F, 0.0F, -1.0F);

+

+			gluTessBeginPolygonProc(tess, (void *)*(int *)&thickness);

+

+			for (loop = (DWORD) *p++; loop; --loop)

+			{

+				count = (DWORD) *p++;

+

+				gluTessBeginContourProc(tess);

+				

+				for (point = 0; point < count; point++)

+				{

+					vert = p + ((count-point-1)<<1);

+					v[0] = vert[0];

+					v[1] = vert[1];

+					gluTessVertexProc(tess, v, vert);

+				}

+				p += count*2;

+

+				gluTessEndContourProc(tess);

+			}

+			gluTessEndPolygonProc(tess);

+		}

+

+#if DEBUG

+	if (TessErrorOccurred)

+		printf("Tessellation error %s\n",

+			gluErrorString(TessErrorOccurred));

+#endif

+		}

+

+

+exit:

+	FreeLineBuf();

+	if (tess)

+		gluDeleteTessProc(tess);

+	// UnloadGLUTesselator();

+	FreeVertBuf();

+	return status;

+	}

+

+

+

+/*****************************************************************************

+ * LoadGLUTesselator

+ *

+ * Maps the glu32.dll module and gets function pointers for the 

+ * tesselator functions.

+ *****************************************************************************/

+

+static BOOL

+LoadGLUTesselator(void)

+	{

+	if (gluModuleHandle != NULL)

+		return TRUE;

+

+	{

+		extern HINSTANCE hInstanceOpenGL;

+		char *gluName = "GLU32.DLL";

+//		char name[256];

+//		char *ptr;

+//		int len;

+

+/*

+		len = GetModuleFileName(hInstanceOpenGL, name, 255);

+		if (len != 0)

+			{

+			ptr = name+len-1;

+			while (ptr > name && *ptr != '\\')

+				ptr--;

+			if (*ptr == '\\')

+				ptr++;

+			if (!stricmp(ptr, "cosmogl.dll"))

+				{

+				gluName = "COSMOGLU.DLL";

+				}

+			else if (!stricmp(ptr, "opengl32.dll"))

+				{

+				gluName = "GLU32.DLL";

+				}

+			}

+*/

+		if ((gluModuleHandle = LoadLibrary(gluName)) == NULL)

+			return FALSE;

+	}

+

+	if ((gluNewTessProc = (gluNewTessProto)

+		GetProcAddress(gluModuleHandle, "gluNewTess")) == NULL)

+		return FALSE;

+	

+	if ((gluDeleteTessProc = (gluDeleteTessProto)

+		GetProcAddress(gluModuleHandle, "gluDeleteTess")) == NULL)

+		return FALSE;

+	

+	if ((gluTessBeginPolygonProc = (gluTessBeginPolygonProto)

+		GetProcAddress(gluModuleHandle, "gluTessBeginPolygon")) == NULL)

+		return FALSE;

+	

+	if ((gluTessBeginContourProc = (gluTessBeginContourProto)

+		GetProcAddress(gluModuleHandle, "gluTessBeginContour")) == NULL)

+		return FALSE;

+	

+	if ((gluTessVertexProc = (gluTessVertexProto)

+		GetProcAddress(gluModuleHandle, "gluTessVertex")) == NULL)

+		return FALSE;

+	

+	if ((gluTessEndContourProc = (gluTessEndContourProto)

+		GetProcAddress(gluModuleHandle, "gluTessEndContour")) == NULL)

+		return FALSE;

+	

+	if ((gluTessEndPolygonProc = (gluTessEndPolygonProto)

+		GetProcAddress(gluModuleHandle, "gluTessEndPolygon")) == NULL)

+		return FALSE;

+	

+	if ((gluTessPropertyProc = (gluTessPropertyProto)

+		GetProcAddress(gluModuleHandle, "gluTessProperty")) == NULL)

+		return FALSE;

+

+	if ((gluTessNormalProc = (gluTessNormalProto)

+		GetProcAddress(gluModuleHandle, "gluTessNormal")) == NULL)

+		return FALSE;

+	

+	if ((gluTessCallbackProc = (gluTessCallbackProto)

+		GetProcAddress(gluModuleHandle, "gluTessCallback")) == NULL)

+		return FALSE;

+

+	return TRUE;

+	}

+

+

+

+/*****************************************************************************

+ * UnloadGLUTesselator

+ *

+ * Unmaps the glu32.dll module.

+ *****************************************************************************/

+

+static BOOL

+UnloadGLUTesselator(void)

+	{

+	if (gluModuleHandle != NULL)

+	    if (FreeLibrary(gluModuleHandle) == FALSE)

+		return FALSE;

+	gluModuleHandle = NULL;

+	}

+

+

+

+/*****************************************************************************

+ * TessVertexOut

+ *

+ * Used by tessellator to handle output vertexes.

+ *****************************************************************************/

+ 

+static void CALLBACK

+TessVertexOut(FLOAT	p[3])

+	{

+	    GLfloat v[2];

+

+	    v[0] = p[0] * ScaleFactor;

+	    v[1] = p[1] * ScaleFactor;

+	    _GLD_glVertex2fv(v);

+	}

+

+static void CALLBACK

+TessVertexOutData(FLOAT	p[3], GLfloat z)

+{

+    GLfloat v[3];

+

+    v[0] = (GLfloat) p[0];

+    v[1] = (GLfloat) p[1];

+    v[2] = z;

+    _GLD_glVertex3fv(v);

+}

+

+

+/*****************************************************************************

+ * TessCombine

+ *

+ * Used by tessellator to handle self-intersecting contours and degenerate

+ * geometry.

+ *****************************************************************************/

+ 

+static void CALLBACK

+TessCombine(double	coords[3],

+	    void*	vertex_data[4],

+	    FLOAT	weight[4],

+	    void**	outData)

+	{

+	if (!AppendToVertBuf((FLOAT) coords[0])

+	 || !AppendToVertBuf((FLOAT) coords[1])

+	 || !AppendToVertBuf((FLOAT) coords[2]))

+		TessErrorOccurred = GL_OUT_OF_MEMORY;

+	*outData = VertBuf + (VertBufIndex - 3);

+	}

+

+

+

+/*****************************************************************************

+ * TessError

+ *

+ * Saves the last tessellator error code in the global TessErrorOccurred.

+ *****************************************************************************/

+ 

+static void CALLBACK

+TessError(GLenum error)

+	{

+	TessErrorOccurred = error;

+	}

+

+

+

+/*****************************************************************************

+ * MakeLinesFromGlyph

+ * 

+ * Converts the outline of a glyph from the TTPOLYGON format to a simple

+ * array of floating-point values containing one or more loops.

+ *

+ * The first element of the output array is a count of the number of loops.

+ * The loop data follows this count.  Each loop consists of a count of the

+ * number of vertices it contains, followed by the vertices.  Each vertex

+ * is an X and Y coordinate.  For example, a single triangle might be

+ * described by this array:

+ *

+ *	1.,	3.,	0., 0.,		1., 0.,		0., 1.

+ *       ^	 ^	 ^    ^		 ^    ^		 ^    ^

+ *     #loops	#verts	 x1   y1	 x2   y2	 x3   y3

+ *

+ * A two-loop glyph would look like this:

+ *

+ *	2.,	3.,  0.,0.,  1.,0.,  0.,1.,	3.,  .2,.2,  .4,.2,  .2,.4

+ *

+ * Line segments from the TTPOLYGON are transferred to the output array in

+ * the obvious way.  Quadratic splines in the TTPOLYGON are converted to

+ * collections of line segments

+ *****************************************************************************/

+

+static int

+MakeLinesFromGlyph(IN  UCHAR*	glyphBuf,

+		   IN  DWORD	glyphSize,

+		   IN  FLOAT	chordalDeviation)

+	{

+	UCHAR*	p;

+	int	status = 0;

+

+

+	/*

+	 * Pick up all the polygons (aka loops) that make up the glyph:

+	 */

+	if (!AppendToLineBuf(0.0F))	/* loop count at LineBuf[0] */

+		goto exit;

+

+	p = glyphBuf;

+	while (p < glyphBuf + glyphSize)

+		{

+		if (!MakeLinesFromTTPolygon(&p, chordalDeviation))

+			goto exit;

+		LineBuf[0] += 1.0F;	/* increment loop count */

+		}

+

+	status = 1;

+

+exit:

+	return status;

+	}

+

+

+

+/*****************************************************************************

+ * MakeLinesFromTTPolygon

+ *

+ * Converts a TTPOLYGONHEADER and its associated curve structures into a

+ * single polyline loop in the global LineBuf.

+ *****************************************************************************/

+

+static int

+MakeLinesFromTTPolygon(	IN OUT	UCHAR**	pp,

+			IN	FLOAT	chordalDeviation)

+	{

+	DWORD	polySize;

+	UCHAR*	polyStart;

+	DWORD	vertexCountIndex;

+

+	/*

+	 * Record where the polygon data begins, and where the loop's

+	 * vertex count resides:

+	 */

+	polyStart = *pp;

+	vertexCountIndex = LineBufIndex;

+	if (!AppendToLineBuf(0.0F))

+		return 0;

+

+	/*

+	 * Extract relevant data from the TTPOLYGONHEADER:

+	 */

+	polySize = GetDWord(pp);

+	if (GetDWord(pp) != TT_POLYGON_TYPE)	/* polygon type */

+		return 0;

+	if (!AppendToLineBuf((FLOAT) GetFixed(pp)))	/* first X coord */

+		return 0;

+	if (!AppendToLineBuf((FLOAT) GetFixed(pp)))	/* first Y coord */

+		return 0;

+	LineBuf[vertexCountIndex] += 1.0F;

+

+	/*

+	 * Process each of the TTPOLYCURVE structures in the polygon:

+	 */

+	while (*pp < polyStart + polySize)

+		if (!MakeLinesFromTTPolycurve(	pp,

+						vertexCountIndex,

+						chordalDeviation))

+		return 0;

+

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * MakeLinesFromTTPolyCurve

+ *

+ * Converts the lines and splines in a single TTPOLYCURVE structure to points

+ * in the global LineBuf.

+ *****************************************************************************/

+

+static int

+MakeLinesFromTTPolycurve(	IN OUT	UCHAR**	pp,

+				IN	DWORD	vertexCountIndex,

+				IN	FLOAT	chordalDeviation)

+	{

+	WORD type;

+	WORD pointCount;

+

+

+	/*

+	 * Pick up the relevant fields of the TTPOLYCURVE structure:

+	 */

+	type = (WORD) GetWord(pp);

+	pointCount = (WORD) GetWord(pp);

+

+	/*

+	 * Convert the "curve" to line segments:

+	 */

+	if (type == TT_PRIM_LINE)

+		return MakeLinesFromTTLine(	pp,

+						vertexCountIndex,

+						pointCount);

+	else if (type == TT_PRIM_QSPLINE)

+		return MakeLinesFromTTQSpline(	pp,

+						vertexCountIndex,

+						pointCount,

+						chordalDeviation);

+	else

+		return 0;

+	}

+

+

+

+/*****************************************************************************

+ * MakeLinesFromTTLine

+ *

+ * Converts points from the polyline in a TT_PRIM_LINE structure to

+ * equivalent points in the global LineBuf.

+ *****************************************************************************/

+static int

+MakeLinesFromTTLine(	IN OUT	UCHAR**	pp,

+			IN	DWORD	vertexCountIndex,

+			IN	WORD	pointCount)

+	{

+	/*

+	 * Just copy the line segments into the line buffer (converting

+	 * type as we go):

+	 */

+	LineBuf[vertexCountIndex] += pointCount;

+	while (pointCount--)

+		{

+		if (!AppendToLineBuf((FLOAT) GetFixed(pp))	/* X coord */

+		 || !AppendToLineBuf((FLOAT) GetFixed(pp)))	/* Y coord */

+			return 0;

+		}

+

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * MakeLinesFromTTQSpline

+ *

+ * Converts points from the poly quadratic spline in a TT_PRIM_QSPLINE

+ * structure to polyline points in the global LineBuf.

+ *****************************************************************************/

+

+static int

+MakeLinesFromTTQSpline(	IN OUT	UCHAR**	pp,

+			IN	DWORD	vertexCountIndex,

+			IN	WORD	pointCount,

+			IN	FLOAT	chordalDeviation)

+	{

+	FLOAT x0, y0, x1, y1, x2, y2;

+	WORD point;

+

+	/*

+	 * Process each of the non-interpolated points in the outline.

+	 * To do this, we need to generate two interpolated points (the

+	 * start and end of the arc) for each non-interpolated point.

+	 * The first interpolated point is always the one most recently

+	 * stored in LineBuf, so we just extract it from there.  The

+	 * second interpolated point is either the average of the next

+	 * two points in the QSpline, or the last point in the QSpline

+	 * if only one remains.

+	 */

+	for (point = 0; point < pointCount - 1; ++point)

+		{

+		x0 = LineBuf[LineBufIndex - 2];

+		y0 = LineBuf[LineBufIndex - 1];

+

+		x1 = (FLOAT) GetFixed(pp);

+		y1 = (FLOAT) GetFixed(pp);

+

+		if (point == pointCount - 2)

+			{

+			/*

+			 * This is the last arc in the QSpline.  The final

+			 * point is the end of the arc.

+			 */

+			x2 = (FLOAT) GetFixed(pp);

+			y2 = (FLOAT) GetFixed(pp);

+			}

+		else

+			{

+			/*

+			 * Peek at the next point in the input to compute

+			 * the end of the arc:

+			 */

+			x2 = 0.5F * (x1 + (FLOAT) GetFixed(pp));

+			y2 = 0.5F * (y1 + (FLOAT) GetFixed(pp));

+			/*

+			 * Push the point back onto the input so it will

+			 * be reused as the next off-curve point:

+			 */

+			*pp -= 8;

+			}

+

+		if (!MakeLinesFromArc(	x0, y0,

+					x1, y1,

+					x2, y2,

+					vertexCountIndex,

+					chordalDeviation * chordalDeviation))

+			return 0;

+		}

+

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * MakeLinesFromArc

+ *

+ * Subdivides one arc of a quadratic spline until the chordal deviation

+ * tolerance requirement is met, then places the resulting set of line

+ * segments in the global LineBuf.

+ *****************************************************************************/

+

+static int

+MakeLinesFromArc(	IN	FLOAT	x0,

+			IN	FLOAT	y0,

+			IN	FLOAT	x1,

+			IN	FLOAT	y1,

+			IN	FLOAT	x2,

+			IN	FLOAT	y2,

+			IN	DWORD	vertexCountIndex,

+			IN	FLOAT	chordalDeviationSquared)

+	{

+	FLOAT	x01;

+	FLOAT	y01;

+	FLOAT	x12;

+	FLOAT	y12;

+	FLOAT	midPointX;

+	FLOAT	midPointY;

+	FLOAT	deltaX;

+	FLOAT	deltaY;

+

+	/*

+	 * Calculate midpoint of the curve by de Casteljau:

+	 */

+	x01 = 0.5F * (x0 + x1);

+	y01 = 0.5F * (y0 + y1);

+	x12 = 0.5F * (x1 + x2);

+	y12 = 0.5F * (y1 + y2);

+	midPointX = 0.5F * (x01 + x12);

+	midPointY = 0.5F * (y01 + y12);

+

+

+	/*

+	 * Estimate chordal deviation by the distance from the midpoint

+	 * of the curve to its non-interpolated control point.  If this

+	 * distance is greater than the specified chordal deviation

+	 * constraint, then subdivide.  Otherwise, generate polylines

+	 * from the three control points.

+	 */

+	deltaX = midPointX - x1;

+	deltaY = midPointY - y1;

+	if (deltaX * deltaX + deltaY * deltaY > chordalDeviationSquared)

+		{

+		MakeLinesFromArc(	x0, y0,

+					x01, y01,

+					midPointX, midPointY,

+					vertexCountIndex,

+					chordalDeviationSquared);

+		

+		MakeLinesFromArc(	midPointX, midPointY,

+					x12, y12,

+					x2, y2,

+					vertexCountIndex,

+					chordalDeviationSquared);

+		}

+	else

+		{

+		/*

+		 * The "pen" is already at (x0, y0), so we don't need to

+		 * add that point to the LineBuf.

+		 */

+		if (!AppendToLineBuf(x1)

+		 || !AppendToLineBuf(y1)

+		 || !AppendToLineBuf(x2)

+		 || !AppendToLineBuf(y2))

+			return 0;

+		LineBuf[vertexCountIndex] += 2.0F;

+		}

+

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * InitLineBuf

+ *

+ * Initializes the global LineBuf and its associated size and current-element

+ * counters.

+ *****************************************************************************/

+

+static int

+InitLineBuf(void)

+	{

+	if (!(LineBuf = (FLOAT*)

+		__wglMalloc((LineBufSize = LINE_BUF_QUANT) * sizeof(FLOAT))))

+			return 0;

+	LineBufIndex = 0;

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * InitVertBuf

+ *

+ * Initializes the global VertBuf and its associated size and current-element

+ * counters.

+ *****************************************************************************/

+

+static int

+InitVertBuf(void)

+	{

+	if (!(VertBuf = (FLOAT*)

+		__wglMalloc((VertBufSize = VERT_BUF_QUANT) * sizeof(FLOAT))))

+			return 0;

+	VertBufIndex = 0;

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * AppendToLineBuf

+ *

+ * Appends one floating-point value to the global LineBuf array.  Return value

+ * is non-zero for success, zero for failure.

+ *****************************************************************************/

+

+static int

+AppendToLineBuf(FLOAT value)

+	{

+	if (LineBufIndex >= LineBufSize)

+		{

+		FLOAT* f;

+		

+		f = (FLOAT*) __wglRealloc(LineBuf,

+			(LineBufSize += LINE_BUF_QUANT) * sizeof(FLOAT));

+		if (!f)

+			return 0;

+		LineBuf = f;

+		}

+	LineBuf[LineBufIndex++] = value;

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * AppendToVertBuf

+ *

+ * Appends one floating-point value to the global VertBuf array.  Return value

+ * is non-zero for success, zero for failure.

+ *

+ * Note that we can't realloc this one, because the tessellator is using

+ * pointers into it.

+ *****************************************************************************/

+

+static int

+AppendToVertBuf(FLOAT value)

+	{

+	if (VertBufIndex >= VertBufSize)

+		return 0;

+	VertBuf[VertBufIndex++] = value;

+	return 1;

+	}

+

+

+

+/*****************************************************************************

+ * FreeLineBuf

+ *

+ * Cleans up vertex buffer structure.

+ *****************************************************************************/

+

+static void

+FreeLineBuf(void)

+	{

+	if (LineBuf)

+		{

+		__wglFree(LineBuf);

+		LineBuf = NULL;

+		}

+	}

+

+

+

+/*****************************************************************************

+ * FreeVertBuf

+ *

+ * Cleans up vertex buffer structure.

+ *****************************************************************************/

+

+static void

+FreeVertBuf(void)

+	{

+	if (VertBuf)

+		{

+		__wglFree(VertBuf);

+		VertBuf = NULL;

+		}

+	}

+

+

+

+/*****************************************************************************

+ * GetWord

+ *

+ * Fetch the next 16-bit word from a little-endian byte stream, and increment

+ * the stream pointer to the next unscanned byte.

+ *****************************************************************************/

+

+static long GetWord(UCHAR** p)

+	{

+	long value;

+

+	value = ((*p)[1] << 8) + (*p)[0];

+	*p += 2;

+	return value;

+	}

+

+

+

+/*****************************************************************************

+ * GetDWord

+ *

+ * Fetch the next 32-bit word from a little-endian byte stream, and increment

+ * the stream pointer to the next unscanned byte.

+ *****************************************************************************/

+

+static long GetDWord(UCHAR** p)

+	{

+	long value;

+

+	value = ((*p)[3] << 24) + ((*p)[2] << 16) + ((*p)[1] << 8) + (*p)[0];

+	*p += 4;

+	return value;

+	}

+

+

+

+

+/*****************************************************************************

+ * GetFixed

+ *

+ * Fetch the next 32-bit fixed-point value from a little-endian byte stream,

+ * convert it to floating-point, and increment the stream pointer to the next

+ * unscanned byte.

+ *****************************************************************************/

+

+static double GetFixed(

+	UCHAR** p)

+{

+	long hiBits, loBits;

+	double value;

+

+	loBits = GetWord(p);

+	hiBits = GetWord(p);

+	value = (double) ((hiBits << 16) | loBits) / 65536.0;

+

+	return value * ScaleFactor;

+}

+

+// ***********************************************************************

+

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.h b/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.h
index aac041033..1dc5c034e 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.h
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dglwgl.h
@@ -1,127 +1,127 @@
-/****************************************************************************
-*
-*                        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:  OpenGL window  functions (wgl*).
-*
-****************************************************************************/
-
-#ifndef __DGLWGL_H
-#define __DGLWGL_H
-
-// Disable compiler complaints about DLL linkage
-#pragma warning (disable:4273)
-
-// Macros to control compilation
-#define STRICT
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include <GL\gl.h>
-
-#include "dglcontext.h"
-#include "dglglobals.h"
-#include "dglmacros.h"
-#include "ddlog.h"
-#include "dglpf.h"
-
-/*---------------------- Macros and type definitions ----------------------*/
-
-typedef struct {
-	PROC proc;
-	char *name;
-}  DGL_extension;
-
-#ifndef __MINGW32__
-/* XXX why is this here?
- * It should probaby be somewhere in src/mesa/drivers/windows/
- */
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(BUILD_FOR_SNAP) 
-#	define WGL_FONT_LINES      0
-#	define WGL_FONT_POLYGONS   1
-#ifndef _GNU_H_WINDOWS32_FUNCTIONS
-#	ifdef UNICODE
-#		define wglUseFontBitmaps  wglUseFontBitmapsW
-#		define wglUseFontOutlines  wglUseFontOutlinesW
-#	else
-#		define wglUseFontBitmaps  wglUseFontBitmapsA
-#		define wglUseFontOutlines  wglUseFontOutlinesA
-#	endif /* !UNICODE */
-#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
-typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
-#if !defined(GLX_USE_MESA)
-#include <GL/mesa_wgl.h>
-#endif
-#endif
-#endif /* !__MINGW32__ */
-
-/*------------------------- Function Prototypes ---------------------------*/
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef _USE_GLD3_WGL
-int		APIENTRY DGL_ChoosePixelFormat(HDC a, CONST PIXELFORMATDESCRIPTOR *ppfd);
-BOOL	APIENTRY DGL_CopyContext(HGLRC a, HGLRC b, UINT c);
-HGLRC	APIENTRY DGL_CreateContext(HDC a);
-HGLRC	APIENTRY DGL_CreateLayerContext(HDC a, int b);
-BOOL	APIENTRY DGL_DeleteContext(HGLRC a);
-BOOL	APIENTRY DGL_DescribeLayerPlane(HDC a, int b, int c, UINT d, LPLAYERPLANEDESCRIPTOR e);
-int		APIENTRY DGL_DescribePixelFormat(HDC a, int b, UINT c, LPPIXELFORMATDESCRIPTOR d);
-HGLRC	APIENTRY DGL_GetCurrentContext(void);
-HDC		APIENTRY DGL_GetCurrentDC(void);
-PROC	APIENTRY DGL_GetDefaultProcAddress(LPCSTR a);
-int		APIENTRY DGL_GetLayerPaletteEntries(HDC a, int b, int c, int d, COLORREF *e);
-int		APIENTRY DGL_GetPixelFormat(HDC a);
-PROC	APIENTRY DGL_GetProcAddress(LPCSTR a);
-BOOL	APIENTRY DGL_MakeCurrent(HDC a, HGLRC b);
-BOOL	APIENTRY DGL_RealizeLayerPalette(HDC a, int b, BOOL c);
-int		APIENTRY DGL_SetLayerPaletteEntries(HDC a, int b, int c, int d, CONST COLORREF *e);
-BOOL	APIENTRY DGL_SetPixelFormat(HDC a, int b, CONST PIXELFORMATDESCRIPTOR *c);
-BOOL	APIENTRY DGL_ShareLists(HGLRC a, HGLRC b);
-BOOL	APIENTRY DGL_SwapBuffers(HDC a);
-BOOL	APIENTRY DGL_SwapLayerBuffers(HDC a, UINT b);
-BOOL	APIENTRY DGL_UseFontBitmapsA(HDC a, DWORD b, DWORD c, DWORD d);
-BOOL	APIENTRY DGL_UseFontBitmapsW(HDC a, DWORD b, DWORD c, DWORD d);
-BOOL	APIENTRY DGL_UseFontOutlinesA(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FLOAT f, int g, LPGLYPHMETRICSFLOAT h);
-BOOL	APIENTRY DGL_UseFontOutlinesW(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FLOAT f, int g, LPGLYPHMETRICSFLOAT h);
-#endif //_USE_GLD3_WGL
-
-BOOL	dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
+/****************************************************************************

+*

+*                        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:  OpenGL window  functions (wgl*).

+*

+****************************************************************************/

+

+#ifndef __DGLWGL_H

+#define __DGLWGL_H

+

+// Disable compiler complaints about DLL linkage

+#pragma warning (disable:4273)

+

+// Macros to control compilation

+#define STRICT

+#define WIN32_LEAN_AND_MEAN

+

+#include <windows.h>

+#include <GL\gl.h>

+

+#include "dglcontext.h"

+#include "dglglobals.h"

+#include "dglmacros.h"

+#include "ddlog.h"

+#include "dglpf.h"

+

+/*---------------------- Macros and type definitions ----------------------*/

+

+typedef struct {

+	PROC proc;

+	char *name;

+}  DGL_extension;

+

+#ifndef __MINGW32__

+/* XXX why is this here?

+ * It should probaby be somewhere in src/mesa/drivers/windows/

+ */

+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(BUILD_FOR_SNAP) 

+#	define WGL_FONT_LINES      0

+#	define WGL_FONT_POLYGONS   1

+#ifndef _GNU_H_WINDOWS32_FUNCTIONS

+#	ifdef UNICODE

+#		define wglUseFontBitmaps  wglUseFontBitmapsW

+#		define wglUseFontOutlines  wglUseFontOutlinesW

+#	else

+#		define wglUseFontBitmaps  wglUseFontBitmapsA

+#		define wglUseFontOutlines  wglUseFontOutlinesA

+#	endif /* !UNICODE */

+#endif /* _GNU_H_WINDOWS32_FUNCTIONS */

+typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;

+typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;

+typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;

+#if !defined(GLX_USE_MESA)

+#include <GL/mesa_wgl.h>

+#endif

+#endif

+#endif /* !__MINGW32__ */

+

+/*------------------------- Function Prototypes ---------------------------*/

+

+#ifdef  __cplusplus

+extern "C" {

+#endif

+

+#ifndef _USE_GLD3_WGL

+int		APIENTRY DGL_ChoosePixelFormat(HDC a, CONST PIXELFORMATDESCRIPTOR *ppfd);

+BOOL	APIENTRY DGL_CopyContext(HGLRC a, HGLRC b, UINT c);

+HGLRC	APIENTRY DGL_CreateContext(HDC a);

+HGLRC	APIENTRY DGL_CreateLayerContext(HDC a, int b);

+BOOL	APIENTRY DGL_DeleteContext(HGLRC a);

+BOOL	APIENTRY DGL_DescribeLayerPlane(HDC a, int b, int c, UINT d, LPLAYERPLANEDESCRIPTOR e);

+int		APIENTRY DGL_DescribePixelFormat(HDC a, int b, UINT c, LPPIXELFORMATDESCRIPTOR d);

+HGLRC	APIENTRY DGL_GetCurrentContext(void);

+HDC		APIENTRY DGL_GetCurrentDC(void);

+PROC	APIENTRY DGL_GetDefaultProcAddress(LPCSTR a);

+int		APIENTRY DGL_GetLayerPaletteEntries(HDC a, int b, int c, int d, COLORREF *e);

+int		APIENTRY DGL_GetPixelFormat(HDC a);

+PROC	APIENTRY DGL_GetProcAddress(LPCSTR a);

+BOOL	APIENTRY DGL_MakeCurrent(HDC a, HGLRC b);

+BOOL	APIENTRY DGL_RealizeLayerPalette(HDC a, int b, BOOL c);

+int		APIENTRY DGL_SetLayerPaletteEntries(HDC a, int b, int c, int d, CONST COLORREF *e);

+BOOL	APIENTRY DGL_SetPixelFormat(HDC a, int b, CONST PIXELFORMATDESCRIPTOR *c);

+BOOL	APIENTRY DGL_ShareLists(HGLRC a, HGLRC b);

+BOOL	APIENTRY DGL_SwapBuffers(HDC a);

+BOOL	APIENTRY DGL_SwapLayerBuffers(HDC a, UINT b);

+BOOL	APIENTRY DGL_UseFontBitmapsA(HDC a, DWORD b, DWORD c, DWORD d);

+BOOL	APIENTRY DGL_UseFontBitmapsW(HDC a, DWORD b, DWORD c, DWORD d);

+BOOL	APIENTRY DGL_UseFontOutlinesA(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FLOAT f, int g, LPGLYPHMETRICSFLOAT h);

+BOOL	APIENTRY DGL_UseFontOutlinesW(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FLOAT f, int g, LPGLYPHMETRICSFLOAT h);

+#endif //_USE_GLD3_WGL

+

+BOOL	dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);

+

+#ifdef  __cplusplus

+}

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
new file mode 100644
index 000000000..0a508355c
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
@@ -0,0 +1,1206 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Driver interface code to Mesa

+*

+****************************************************************************/

+

+//#include <windows.h>

+#include "dglcontext.h"

+#include "ddlog.h"

+#include "gld_dx9.h"

+

+#include "glheader.h"

+#include "context.h"

+#include "colormac.h"

+#include "depth.h"

+#include "extensions.h"

+#include "macros.h"

+#include "matrix.h"

+// #include "mem.h"

+//#include "mmath.h"

+#include "mtypes.h"

+#include "texformat.h"

+#include "teximage.h"

+#include "texstore.h"

+#include "vbo/vbo.h"

+#include "swrast_setup/swrast_setup.h"

+#include "swrast_setup/ss_context.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+extern BOOL dglSwapBuffers(HDC hDC);

+

+// HACK: Hack the _33 member of the OpenGL perspective projection matrix

+const float _fPersp_33 = 1.6f;

+

+//---------------------------------------------------------------------------

+// Internal functions

+//---------------------------------------------------------------------------

+

+void _gld_mesa_warning(

+	__struct gl_context *gc,

+	char *str)

+{

+	// Intercept Mesa's internal warning mechanism

+	gldLogPrintf(GLDLOG_WARN, "Mesa warning: %s", str);

+}

+

+//---------------------------------------------------------------------------

+

+void _gld_mesa_fatal(

+	__struct gl_context *gc,

+	char *str)

+{

+	// Intercept Mesa's internal fatal-message mechanism

+	gldLogPrintf(GLDLOG_CRITICAL, "Mesa FATAL: %s", str);

+

+	// Mesa calls abort(0) here.

+	ddlogClose();

+	exit(0);

+}

+

+//---------------------------------------------------------------------------

+

+D3DSTENCILOP _gldConvertStencilOp(

+	GLenum StencilOp)

+{

+	// Used by Stencil: pass, fail and zfail

+

+	switch (StencilOp) {

+	case GL_KEEP:

+		return D3DSTENCILOP_KEEP;

+	case GL_ZERO:

+		return D3DSTENCILOP_ZERO;

+	case GL_REPLACE:

+	    return D3DSTENCILOP_REPLACE;

+	case GL_INCR:

+		return D3DSTENCILOP_INCRSAT;

+	case GL_DECR:

+	    return D3DSTENCILOP_DECRSAT;

+	case GL_INVERT:

+		return D3DSTENCILOP_INVERT;

+	case GL_INCR_WRAP_EXT:	// GL_EXT_stencil_wrap

+		return D3DSTENCILOP_INCR;

+	case GL_DECR_WRAP_EXT:	// GL_EXT_stencil_wrap

+	    return D3DSTENCILOP_DECR;

+	}

+

+#ifdef _DEBUG

+	gldLogMessage(GLDLOG_ERROR, "_gldConvertStencilOp: Unknown StencilOp\n");

+#endif

+

+	return D3DSTENCILOP_KEEP;

+}

+

+//---------------------------------------------------------------------------

+

+D3DCMPFUNC _gldConvertCompareFunc(

+	GLenum CmpFunc)

+{

+	// Used for Alpha func, depth func and stencil func.

+

+	switch (CmpFunc) {

+	case GL_NEVER:

+		return D3DCMP_NEVER;

+	case GL_LESS:

+		return D3DCMP_LESS;

+	case GL_EQUAL:

+		return D3DCMP_EQUAL;

+	case GL_LEQUAL:

+		return D3DCMP_LESSEQUAL;

+	case GL_GREATER:

+		return D3DCMP_GREATER;

+	case GL_NOTEQUAL:

+		return D3DCMP_NOTEQUAL;

+	case GL_GEQUAL:

+		return D3DCMP_GREATEREQUAL;

+	case GL_ALWAYS:

+		return D3DCMP_ALWAYS;

+	};

+

+#ifdef _DEBUG

+	gldLogMessage(GLDLOG_ERROR, "_gldConvertCompareFunc: Unknown CompareFunc\n");

+#endif

+

+	return D3DCMP_ALWAYS;

+}

+

+//---------------------------------------------------------------------------

+

+D3DBLEND _gldConvertBlendFunc(

+	GLenum blend,

+	GLenum DefaultBlend)

+{

+	switch (blend) {

+	case GL_ZERO:

+		return D3DBLEND_ZERO;

+	case GL_ONE:

+		return D3DBLEND_ONE;

+	case GL_DST_COLOR:

+		return D3DBLEND_DESTCOLOR;

+	case GL_SRC_COLOR:

+		return D3DBLEND_SRCCOLOR;

+	case GL_ONE_MINUS_DST_COLOR:

+		return D3DBLEND_INVDESTCOLOR;

+	case GL_ONE_MINUS_SRC_COLOR:

+		return D3DBLEND_INVSRCCOLOR;

+	case GL_SRC_ALPHA:

+		return D3DBLEND_SRCALPHA;

+	case GL_ONE_MINUS_SRC_ALPHA:

+		return D3DBLEND_INVSRCALPHA;

+	case GL_DST_ALPHA:

+		return D3DBLEND_DESTALPHA;

+	case GL_ONE_MINUS_DST_ALPHA:

+		return D3DBLEND_INVDESTALPHA;

+	case GL_SRC_ALPHA_SATURATE:

+		return D3DBLEND_SRCALPHASAT;

+	}

+

+#ifdef _DEBUG

+	gldLogMessage(GLDLOG_ERROR, "_gldConvertBlendFunc: Unknown BlendFunc\n");

+#endif

+

+	return DefaultBlend;

+}

+

+//---------------------------------------------------------------------------

+// Misc. functions

+//---------------------------------------------------------------------------

+

+void gld_Noop_DX9(

+	struct gl_context *ctx)

+{

+#ifdef _DEBUG

+	gldLogMessage(GLDLOG_ERROR, "gld_Noop called!\n");

+#endif

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Error_DX9(

+	struct gl_context *ctx)

+{

+#ifdef _DEBUG

+	// Quite useless.

+//	gldLogMessage(GLDLOG_ERROR, "ctx->Driver.Error called!\n");

+#endif

+}

+

+//---------------------------------------------------------------------------

+// Required Mesa functions

+//---------------------------------------------------------------------------

+

+static GLboolean gld_set_draw_buffer_DX9(

+	struct gl_context *ctx,

+	GLenum mode)

+{

+   (void) ctx;

+   if ((mode==GL_FRONT_LEFT) || (mode == GL_BACK_LEFT)) {

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_set_read_buffer_DX9(

+	struct gl_context *ctx,

+	struct gl_framebuffer *buffer,

+	GLenum mode)

+{

+   /* separate read buffer not supported */

+/*

+   ASSERT(buffer == ctx->DrawBuffer);

+   ASSERT(mode == GL_FRONT_LEFT);

+*/

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Clear_DX9(

+	struct gl_context *ctx,

+	GLbitfield mask,

+	GLboolean all,

+	GLint x,

+	GLint y,

+	GLint width,

+	GLint height)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	DWORD		dwFlags = 0;

+	D3DCOLOR	Color = 0;

+	float		Z = 0.0f;

+	DWORD		Stencil = 0;

+	D3DRECT		d3dClearRect;

+

+	// TODO: Colourmask

+	const GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask[0];

+

+	if (!gld->pDev)

+		return;

+

+	if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) {

+		GLubyte col[4];

+		CLAMPED_FLOAT_TO_UBYTE(col[0], ctx->Color.ClearColor[0]);

+		CLAMPED_FLOAT_TO_UBYTE(col[1], ctx->Color.ClearColor[1]);

+		CLAMPED_FLOAT_TO_UBYTE(col[2], ctx->Color.ClearColor[2]);

+		CLAMPED_FLOAT_TO_UBYTE(col[3], ctx->Color.ClearColor[3]);

+		dwFlags |= D3DCLEAR_TARGET;

+		Color = D3DCOLOR_RGBA(col[0], col[1], col[2], col[3]);

+	}

+

+	if (mask & DD_DEPTH_BIT) {

+		// D3D8 will fail the Clear call if we try and clear a

+		// depth buffer and we haven't created one.

+		// Also, some apps try and clear a depth buffer,

+		// when a depth buffer hasn't been requested by the app.

+		if (ctx->Visual.depthBits == 0) {

+			mask &= ~DD_DEPTH_BIT; // Remove depth bit from mask

+		} else {

+			dwFlags |= D3DCLEAR_ZBUFFER;

+			Z = ctx->Depth.Clear;

+		}

+	}

+

+	if (mask & DD_STENCIL_BIT) {

+		if (ctx->Visual.stencilBits == 0) {

+			// No stencil bits in depth buffer

+			mask &= ~DD_STENCIL_BIT; // Remove stencil bit from mask

+		} else {

+			dwFlags |= D3DCLEAR_STENCIL;

+			Stencil = ctx->Stencil.Clear;

+		}

+	}

+

+	// Some apps do really weird things with the rect, such as Quake3.

+	if ((x < 0) || (y < 0) || (width <= 0) || (height <= 0)) {

+		all = GL_TRUE;

+	}

+

+	if (!all) {

+		// Calculate clear subrect

+		d3dClearRect.x1	= x;

+		d3dClearRect.y1	= gldCtx->dwHeight - (y + height);

+		d3dClearRect.x2	= x + width;

+		d3dClearRect.y2	= d3dClearRect.y1 + height;

+//		gldLogPrintf(GLDLOG_INFO, "Rect %d,%d %d,%d", x,y,width,height);

+	}

+

+	// dwFlags will be zero if there's nothing to clear

+	if (dwFlags) {

+		_GLD_DX9_DEV(Clear(

+			gld->pDev,

+			all ? 0 : 1,

+			all ? NULL : &d3dClearRect,

+			dwFlags,

+			Color, Z, Stencil));

+	}

+

+	if (mask & DD_ACCUM_BIT) {

+		// Clear accumulation buffer

+	}

+}

+

+//---------------------------------------------------------------------------

+

+// Mesa 5: Parameter change

+static void gld_buffer_size_DX9(

+//	struct gl_context *ctx,

+	struct gl_framebuffer *fb,

+	GLuint *width,

+	GLuint *height)

+{

+//	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+

+	*width = fb->Width; // gldCtx->dwWidth;

+	*height = fb->Height; // gldCtx->dwHeight;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_Finish_DX9(

+	struct gl_context *ctx)

+{

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_Flush_DX9(

+	struct gl_context *ctx)

+{

+	GLD_context		*gld	= GLD_GET_CONTEXT(ctx);

+

+	// TODO: Detect apps that glFlush() then SwapBuffers() ?

+

+	if (gld->EmulateSingle) {

+		// Emulating a single-buffered context.

+		// [Direct3D doesn't allow rendering to front buffer]

+		dglSwapBuffers(gld->hDC);

+	}

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_STENCIL(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// Two-sided stencil. New for Mesa 5

+	const GLuint		uiFace	= 0UL;

+

+	struct gl_stencil_attrib *pStencil = &ctx->Stencil;

+

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILENABLE, pStencil->Enabled ? TRUE : FALSE));

+	if (pStencil->Enabled) {

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILFUNC, _gldConvertCompareFunc(pStencil->Function[uiFace])));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILREF, pStencil->Ref[uiFace]));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILMASK, pStencil->ValueMask[uiFace]));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILWRITEMASK, pStencil->WriteMask[uiFace]));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILFAIL, _gldConvertStencilOp(pStencil->FailFunc[uiFace])));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILZFAIL, _gldConvertStencilOp(pStencil->ZFailFunc[uiFace])));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_STENCILPASS, _gldConvertStencilOp(pStencil->ZPassFunc[uiFace])));

+	}

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_COLOR(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	DWORD		dwFlags = 0;

+	D3DBLEND	src;

+	D3DBLEND	dest;

+

+	// Alpha func

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ALPHAFUNC, _gldConvertCompareFunc(ctx->Color.AlphaFunc)));

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ALPHAREF, (DWORD)ctx->Color.AlphaRef));

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ALPHATESTENABLE, ctx->Color.AlphaEnabled));

+

+	// Blend func

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ALPHABLENDENABLE, ctx->Color.BlendEnabled));

+	src		= _gldConvertBlendFunc(ctx->Color.BlendSrcRGB, GL_ONE);

+	dest	= _gldConvertBlendFunc(ctx->Color.BlendDstRGB, GL_ZERO);

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_SRCBLEND, src));

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_DESTBLEND, dest));

+

+	// Color mask

+	if (ctx->Color.ColorMask[0][0]) dwFlags |= D3DCOLORWRITEENABLE_RED;

+	if (ctx->Color.ColorMask[0][1]) dwFlags |= D3DCOLORWRITEENABLE_GREEN;

+	if (ctx->Color.ColorMask[0][2]) dwFlags |= D3DCOLORWRITEENABLE_BLUE;

+	if (ctx->Color.ColorMask[0][3]) dwFlags |= D3DCOLORWRITEENABLE_ALPHA;

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_COLORWRITEENABLE, dwFlags));

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_DEPTH(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ZENABLE, ctx->Depth.Test ? D3DZB_TRUE : D3DZB_FALSE));

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ZFUNC, _gldConvertCompareFunc(ctx->Depth.Func)));

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_ZWRITEENABLE, ctx->Depth.Mask ? TRUE : FALSE));

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_POLYGON(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DFILLMODE	d3dFillMode = D3DFILL_SOLID;

+	D3DCULL		d3dCullMode = D3DCULL_NONE;

+	float		fOffset = 0; // Changed from int to float for DX9

+

+	// Fillmode

+	switch (ctx->Polygon.FrontMode) {

+	case GL_POINT:

+		d3dFillMode = D3DFILL_POINT;

+		break;

+	case GL_LINE:

+		d3dFillMode = D3DFILL_WIREFRAME;

+		break;

+	case GL_FILL:

+		d3dFillMode = D3DFILL_SOLID;

+		break;

+	}

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FILLMODE, d3dFillMode));

+

+	if (ctx->Polygon.CullFlag) {

+		switch (ctx->Polygon.CullFaceMode) {

+		case GL_BACK:

+			if (ctx->Polygon.FrontFace == GL_CCW)

+				d3dCullMode = D3DCULL_CW;

+			else

+				d3dCullMode = D3DCULL_CCW;

+			break;

+		case GL_FRONT:

+			if (ctx->Polygon.FrontFace == GL_CCW)

+				d3dCullMode = D3DCULL_CCW;

+			else

+				d3dCullMode = D3DCULL_CW;

+			break;

+		case GL_FRONT_AND_BACK:

+			d3dCullMode = D3DCULL_NONE;

+			break;

+		default:

+			break;

+		}

+	} else {

+		d3dCullMode = D3DCULL_NONE;

+	}

+//	d3dCullMode = D3DCULL_NONE; // FOR DEBUGGING

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_CULLMODE, d3dCullMode));

+

+	// Polygon offset

+	// ZBIAS ranges from 0 to 16 and can only move towards the viewer

+	// Mesa5: ctx->Polygon._OffsetAny removed

+	if (ctx->Polygon.OffsetFill) {

+		fOffset = ctx->Polygon.OffsetUnits;

+//		if (iOffset < 0.0f)

+//			iOffset = -iOffset;

+//		else

+//			iOffset = 0.0f; // D3D can't push away

+	}

+	// NOTE: SetRenderState() required a DWORD, so need to cast

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_DEPTHBIAS, *((DWORD*)&fOffset)));

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_FOG(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DCOLOR	d3dFogColour;

+	D3DFOGMODE	d3dFogMode = D3DFOG_LINEAR;

+

+	// TODO: Fog is calculated seperately in the Mesa pipeline

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGENABLE, FALSE));

+	return;

+

+	// Fog enable

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGENABLE, ctx->Fog.Enabled));

+	if (!ctx->Fog.Enabled) {

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGTABLEMODE, D3DFOG_NONE));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGVERTEXMODE, D3DFOG_NONE));

+		return; // If disabled, don't bother setting any fog state

+	}

+

+	// Fog colour

+	d3dFogColour = D3DCOLOR_COLORVALUE(	ctx->Fog.Color[0],

+								ctx->Fog.Color[1],

+								ctx->Fog.Color[2],

+								ctx->Fog.Color[3]);

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGCOLOR, d3dFogColour));

+

+	// Fog density

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGDENSITY, *((DWORD*) (&ctx->Fog.Density))));

+

+	// Fog start

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGSTART, *((DWORD*) (&ctx->Fog.Start))));

+

+	// Fog end

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGEND, *((DWORD*) (&ctx->Fog.End))));

+

+	// Fog mode

+	switch (ctx->Fog.Mode) {

+	case GL_LINEAR:

+		d3dFogMode = D3DFOG_LINEAR;

+		break;

+	case GL_EXP:

+		d3dFogMode = D3DFOG_EXP;

+		break;

+	case GL_EXP2:

+		d3dFogMode = D3DFOG_EXP2;

+		break;

+	}

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGTABLEMODE, d3dFogMode));

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_FOGVERTEXMODE, D3DFOG_NONE));

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_LIGHT(

+	struct gl_context *ctx)

+{

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+	DWORD			dwSpecularEnable;

+

+	// Shademode

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_SHADEMODE, (ctx->Light.ShadeModel == GL_SMOOTH) ? D3DSHADE_GOURAUD : D3DSHADE_FLAT));

+

+	// Separate specular colour

+	if (ctx->Light.Enabled)

+		dwSpecularEnable = (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) ? TRUE: FALSE;

+	else

+		dwSpecularEnable = FALSE;

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_SPECULARENABLE, dwSpecularEnable));

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_MODELVIEW(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DMATRIX	m;

+	//GLfloat		*pM = ctx->ModelView.m;

+	// Mesa5: Model-view is now a stack

+	GLfloat		*pM = ctx->ModelviewMatrixStack.Top->m;

+	m._11 = pM[0];

+	m._12 = pM[1];

+	m._13 = pM[2];

+	m._14 = pM[3];

+	m._21 = pM[4];

+	m._22 = pM[5];

+	m._23 = pM[6];

+	m._24 = pM[7];

+	m._31 = pM[8];

+	m._32 = pM[9];

+	m._33 = pM[10];

+	m._34 = pM[11];

+	m._41 = pM[12];

+	m._42 = pM[13];

+	m._43 = pM[14];

+	m._44 = pM[15];

+

+	gld->matModelView = m;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_PROJECTION(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DMATRIX	m;

+	//GLfloat		*pM = ctx->ProjectionMatrix.m;

+	// Mesa 5: Now a stack

+	GLfloat		*pM = ctx->ProjectionMatrixStack.Top->m;

+	m._11 = pM[0];

+	m._12 = pM[1];

+	m._13 = pM[2];

+	m._14 = pM[3];

+

+	m._21 = pM[4];

+	m._22 = pM[5];

+	m._23 = pM[6];

+	m._24 = pM[7];

+

+	m._31 = pM[8];

+	m._32 = pM[9];

+	m._33 = pM[10] / _fPersp_33; // / 1.6f;

+	m._34 = pM[11];

+

+	m._41 = pM[12];

+	m._42 = pM[13];

+	m._43 = pM[14] / 2.0f;

+	m._44 = pM[15];

+

+	gld->matProjection = m;

+}

+

+//---------------------------------------------------------------------------

+/*

+void gldFrustumHook_DX9(

+	GLdouble left,

+	GLdouble right,

+	GLdouble bottom,

+	GLdouble top,

+	GLdouble nearval,

+	GLdouble farval)

+{

+	GET_CURRENT_CONTEXT(ctx);

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// Pass values on to Mesa first (in case we mess with them)

+	_mesa_Frustum(left, right, bottom, top, nearval, farval);

+

+	_fPersp_33 = farval / (nearval - farval);

+

+//	ddlogPrintf(GLDLOG_SYSTEM, "Frustum: %f", farval/nearval);

+}

+

+//---------------------------------------------------------------------------

+

+void gldOrthoHook_DX9(

+	GLdouble left,

+	GLdouble right,

+	GLdouble bottom,

+	GLdouble top,

+	GLdouble nearval,

+	GLdouble farval)

+{

+	GET_CURRENT_CONTEXT(ctx);

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// Pass values on to Mesa first (in case we mess with them)

+	_mesa_Ortho(left, right, bottom, top, nearval, farval);

+

+	_fPersp_33 = 1.6f;

+

+//	ddlogPrintf(GLDLOG_SYSTEM, "Ortho: %f", farval/nearval);

+}

+*/

+//---------------------------------------------------------------------------

+

+void gld_NEW_VIEWPORT(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DVIEWPORT9	d3dvp;

+//	GLint			x, y;

+//	GLsizei			w, h;

+

+	// Set depth range

+	_GLD_DX9_DEV(GetViewport(gld->pDev, &d3dvp));

+	// D3D can't do Quake1/Quake2 z-trick

+	if (ctx->Viewport.Near <= ctx->Viewport.Far) {

+		d3dvp.MinZ		= ctx->Viewport.Near;

+		d3dvp.MaxZ		= ctx->Viewport.Far;

+	} else {

+		d3dvp.MinZ		= ctx->Viewport.Far;

+		d3dvp.MaxZ		= ctx->Viewport.Near;

+	}

+/*	x = ctx->Viewport.X;

+	y = ctx->Viewport.Y;

+	w = ctx->Viewport.Width;

+	h = ctx->Viewport.Height;

+	if (x < 0) x = 0;

+	if (y < 0) y = 0;

+	if (w > gldCtx->dwWidth) 		w = gldCtx->dwWidth;

+	if (h > gldCtx->dwHeight) 		h = gldCtx->dwHeight;

+	// Ditto for D3D viewport dimensions

+	if (w+x > gldCtx->dwWidth) 		w = gldCtx->dwWidth-x;

+	if (h+y > gldCtx->dwHeight) 	h = gldCtx->dwHeight-y;

+	d3dvp.X			= x;

+	d3dvp.Y			= gldCtx->dwHeight - (y + h);

+	d3dvp.Width		= w;

+	d3dvp.Height	= h;*/

+	_GLD_DX9_DEV(SetViewport(gld->pDev, &d3dvp));

+

+//	gld->fFlipWindowY = (float)gldCtx->dwHeight;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_SCISSOR(

+	struct gl_context *ctx)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// Bail if IHV driver cannot scissor

+	if (!gld->bCanScissor)

+		return;

+

+	// Set scissor rect

+	if (ctx->Scissor.Enabled) {

+		RECT rcRect;

+		// Keep in mind that RECT's need an extra row and column

+		rcRect.left		= ctx->Scissor.X;

+		rcRect.right	= ctx->Scissor.X + ctx->Scissor.Width; // + 1;

+		rcRect.top 		= gldCtx->dwHeight - (ctx->Scissor.Y + ctx->Scissor.Height);

+		rcRect.bottom 	= rcRect.top + ctx->Scissor.Height;

+		IDirect3DDevice9_SetScissorRect(gld->pDev, &rcRect);

+	}

+

+	// Enable/disable scissor as required

+	_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_SCISSORTESTENABLE, ctx->Scissor.Enabled));

+}

+

+//---------------------------------------------------------------------------

+

+__inline BOOL _gldAnyEvalEnabled(

+	struct gl_context *ctx)

+{

+	struct gl_eval_attrib *eval = &ctx->Eval;

+

+	if ((eval->AutoNormal) ||

+		(eval->Map1Color4) ||

+		(eval->Map1Index) ||

+		(eval->Map1Normal) ||

+		(eval->Map1TextureCoord1) ||

+		(eval->Map1TextureCoord2) ||

+		(eval->Map1TextureCoord3) ||

+		(eval->Map1TextureCoord4) ||

+		(eval->Map1Vertex3) ||

+		(eval->Map1Vertex4) ||

+		(eval->Map2Color4) ||

+		(eval->Map2Index) ||

+		(eval->Map2Normal) ||

+		(eval->Map2TextureCoord1) ||

+		(eval->Map2TextureCoord2) ||

+		(eval->Map2TextureCoord3) ||

+		(eval->Map2TextureCoord4) ||

+		(eval->Map2Vertex3) ||

+		(eval->Map2Vertex4)

+		)

+	return TRUE;

+

+	return FALSE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL _gldChooseInternalPipeline(

+	struct gl_context *ctx,

+	GLD_driver_dx9 *gld)

+{

+//	return TRUE;	// DEBUGGING: ALWAYS USE MESA

+//	return FALSE;	// DEBUGGING: ALWAYS USE D3D

+

+	if ((glb.dwTnL == GLDS_TNL_MESA) || (gld->bHasHWTnL == FALSE))

+	{

+		gld->PipelineUsage.qwMesa.QuadPart++;

+		return TRUE; // Force Mesa TnL

+	}

+

+	if ((ctx->Light.Enabled) ||

+		(1) ||

+		(ctx->Texture._TexGenEnabled) ||

+		(ctx->Texture._TexMatEnabled) ||

+//		(ctx->Transform._AnyClip) ||

+		(ctx->Scissor.Enabled) ||

+		_gldAnyEvalEnabled(ctx) // Put this last so we can early-out

+		)

+	{

+		gld->PipelineUsage.qwMesa.QuadPart++;

+		return TRUE;

+	}

+

+	gld->PipelineUsage.qwD3DFVF.QuadPart++;

+	return FALSE;

+

+/*	// Force Mesa pipeline?

+	if (glb.dwTnL == GLDS_TNL_MESA) {

+		gld->PipelineUsage.dwMesa.QuadPart++;

+		return GLD_PIPELINE_MESA;

+	}

+

+	// Test for functionality not exposed in the D3D pathways

+	if ((ctx->Texture._GenFlags)) {

+		gld->PipelineUsage.dwMesa.QuadPart++;

+		return GLD_PIPELINE_MESA;

+	}

+

+	// Now decide if vertex shader can be used.

+	// If two sided lighting is enabled then we must either

+	// use Mesa TnL or the vertex shader

+	if (ctx->_TriangleCaps & DD_TRI_LIGHT_TWOSIDE) {

+		if (gld->VStwosidelight.hShader && !ctx->Fog.Enabled) {

+			// Use Vertex Shader

+			gld->PipelineUsage.dwD3D2SVS.QuadPart++;

+			return GLD_PIPELINE_D3D_VS_TWOSIDE;

+		} else {

+			// Use Mesa TnL

+			gld->PipelineUsage.dwMesa.QuadPart++;

+			return GLD_PIPELINE_MESA;

+		}

+	}

+

+	// Must be D3D fixed-function pipeline

+	gld->PipelineUsage.dwD3DFVF.QuadPart++;

+	return GLD_PIPELINE_D3D_FVF;

+*/

+}

+

+//---------------------------------------------------------------------------

+

+void gld_update_state_DX9(

+	struct gl_context *ctx,

+	GLuint new_state)

+{

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+	TNLcontext		*tnl = TNL_CONTEXT(ctx);

+	GLD_pb_dx9		*gldPB;

+

+	if (!gld || !gld->pDev)

+		return;

+

+	_swsetup_InvalidateState( ctx, new_state );

+	_vbo_InvalidateState( ctx, new_state );

+	_tnl_InvalidateState( ctx, new_state );

+

+	// SetupIndex will be used in the pipelines for choosing setup function

+	if ((ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE | DD_SEPARATE_SPECULAR)) ||

+		(ctx->Fog.Enabled))

+	{

+		if (ctx->_TriangleCaps & DD_FLATSHADE)

+			gld->iSetupFunc = GLD_SI_FLAT_EXTRAS;

+		else

+			gld->iSetupFunc = GLD_SI_SMOOTH_EXTRAS;

+	} else {

+		if (ctx->_TriangleCaps & DD_FLATSHADE)

+			gld->iSetupFunc = GLD_SI_FLAT;	// Setup flat shade + texture

+		else

+			gld->iSetupFunc = GLD_SI_SMOOTH; // Setup smooth shade + texture

+	}

+

+	gld->bUseMesaTnL = _gldChooseInternalPipeline(ctx, gld);

+	if (gld->bUseMesaTnL) {

+		gldPB = &gld->PB2d;

+		_GLD_DX9_DEV(SetSoftwareVertexProcessing(gld->pDev, TRUE));

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_CLIPPING, FALSE));

+		_GLD_DX9_DEV(SetVertexShader(gld->pDev, NULL));

+		_GLD_DX9_DEV(SetFVF(gld->pDev, gldPB->dwFVF));

+	} else {

+		gldPB = &gld->PB3d;

+		_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_CLIPPING, TRUE));

+//		if (gld->TnLPipeline == GLD_PIPELINE_D3D_VS_TWOSIDE) {

+//			_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_SOFTWAREVERTEXPROCESSING, !gld->VStwosidelight.bHardware));

+//			_GLD_DX9_DEV(SetVertexShader(gld->pDev, gld->VStwosidelight.hShader));

+//		} else {

+//			_GLD_DX9_DEV(SetRenderState(gld->pDev, D3DRS_SOFTWAREVERTEXPROCESSING, !gld->bHasHWTnL));

+			_GLD_DX9_DEV(SetSoftwareVertexProcessing(gld->pDev, !gld->bHasHWTnL));

+			_GLD_DX9_DEV(SetVertexShader(gld->pDev, NULL));

+			_GLD_DX9_DEV(SetFVF(gld->pDev, gldPB->dwFVF));

+//		}

+	}

+

+#define _GLD_TEST_STATE(a)		\

+	if (new_state & (a)) {		\

+		gld##a(ctx);			\

+		new_state &= ~(a);		\

+	}

+

+#define _GLD_TEST_STATE_DX9(a)	\

+	if (new_state & (a)) {		\

+		gld##a##_DX9(ctx);		\

+		new_state &= ~(a);		\

+	}

+

+#define _GLD_IGNORE_STATE(a) new_state &= ~(a);

+

+//	if (!gld->bUseMesaTnL) {

+		// Not required if Mesa is doing the TnL.

+	// Problem: If gld->bUseMesaTnL is TRUE when these are signaled,

+	// then we'll miss updating the D3D TnL pipeline.

+	// Therefore, don't test for gld->bUseMesaTnL

+	_GLD_TEST_STATE(_NEW_MODELVIEW);

+	_GLD_TEST_STATE(_NEW_PROJECTION);

+//	}

+

+	_GLD_TEST_STATE_DX9(_NEW_TEXTURE); // extern, so guard with _DX9

+	_GLD_TEST_STATE(_NEW_COLOR);

+	_GLD_TEST_STATE(_NEW_DEPTH);

+	_GLD_TEST_STATE(_NEW_POLYGON);

+	_GLD_TEST_STATE(_NEW_STENCIL);

+	_GLD_TEST_STATE(_NEW_FOG);

+	_GLD_TEST_STATE(_NEW_LIGHT);

+	_GLD_TEST_STATE(_NEW_VIEWPORT);

+

+	_GLD_IGNORE_STATE(_NEW_TRANSFORM);

+

+	// Scissor Test: New for DX9

+	_GLD_TEST_STATE(_NEW_SCISSOR);

+

+// Stubs for future use.

+/*	_GLD_TEST_STATE(_NEW_TEXTURE_MATRIX);

+	_GLD_TEST_STATE(_NEW_COLOR_MATRIX);

+	_GLD_TEST_STATE(_NEW_ACCUM);

+	_GLD_TEST_STATE(_NEW_EVAL);

+	_GLD_TEST_STATE(_NEW_HINT);

+	_GLD_TEST_STATE(_NEW_LINE);

+	_GLD_TEST_STATE(_NEW_PIXEL);

+	_GLD_TEST_STATE(_NEW_POINT);

+	_GLD_TEST_STATE(_NEW_POLYGONSTIPPLE);

+	_GLD_TEST_STATE(_NEW_PACKUNPACK);

+	_GLD_TEST_STATE(_NEW_ARRAY);

+	_GLD_TEST_STATE(_NEW_RENDERMODE);

+	_GLD_TEST_STATE(_NEW_BUFFERS);

+	_GLD_TEST_STATE(_NEW_MULTISAMPLE);

+*/

+

+// For debugging.

+#if 0

+#define _GLD_TEST_UNHANDLED_STATE(a)									\

+	if (new_state & (a)) {									\

+		gldLogMessage(GLDLOG_ERROR, "Unhandled " #a "\n");	\

+	}

+	_GLD_TEST_UNHANDLED_STATE(_NEW_TEXTURE_MATRIX);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_COLOR_MATRIX);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_ACCUM);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_EVAL);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_HINT);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_LINE);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_PIXEL);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_POINT);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_POLYGONSTIPPLE);

+//	_GLD_TEST_UNHANDLED_STATE(_NEW_SCISSOR);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_PACKUNPACK);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_ARRAY);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_RENDERMODE);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_BUFFERS);

+	_GLD_TEST_UNHANDLED_STATE(_NEW_MULTISAMPLE);

+#undef _GLD_UNHANDLED_STATE

+#endif

+

+#undef _GLD_TEST_STATE

+}

+

+//---------------------------------------------------------------------------

+// Viewport

+//---------------------------------------------------------------------------

+

+void gld_Viewport_DX9(

+	struct gl_context *ctx,

+	GLint x,

+	GLint y,

+	GLsizei w,

+	GLsizei h)

+{

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DVIEWPORT9	d3dvp;

+

+	if (!gld || !gld->pDev)

+		return;

+

+	// This is a hack. When the app is minimized, Mesa passes

+	// w=1 and h=1 for viewport dimensions. Without this test

+	// we get a GPF in gld_wgl_resize_buffers().

+	if ((w==1) && (h==1))

+		return;

+

+	// Call ResizeBuffersMESA. This function will early-out

+	// if no resize is needed.

+	//ctx->Driver.ResizeBuffersMESA(ctx);

+	// Mesa 5: Changed parameters

+	ctx->Driver.ResizeBuffers(gldCtx->glBuffer);

+

+#if 0

+	ddlogPrintf(GLDLOG_SYSTEM, ">> Viewport x=%d y=%d w=%d h=%d", x,y,w,h);

+#endif

+

+	// ** D3D viewport must not be outside the render target surface **

+	// Sanity check the GL viewport dimensions

+	if (x < 0) x = 0;

+	if (y < 0) y = 0;

+	if (w > gldCtx->dwWidth) 		w = gldCtx->dwWidth;

+	if (h > gldCtx->dwHeight) 		h = gldCtx->dwHeight;

+	// Ditto for D3D viewport dimensions

+	if (w+x > gldCtx->dwWidth) 		w = gldCtx->dwWidth-x;

+	if (h+y > gldCtx->dwHeight) 	h = gldCtx->dwHeight-y;

+

+	d3dvp.X			= x;

+	d3dvp.Y			= gldCtx->dwHeight - (y + h);

+	d3dvp.Width		= w;

+	d3dvp.Height	= h;

+	if (ctx->Viewport.Near <= ctx->Viewport.Far) {

+		d3dvp.MinZ		= ctx->Viewport.Near;

+		d3dvp.MaxZ		= ctx->Viewport.Far;

+	} else {

+		d3dvp.MinZ		= ctx->Viewport.Far;

+		d3dvp.MaxZ		= ctx->Viewport.Near;

+	}

+

+	// TODO: DEBUGGING

+//	d3dvp.MinZ		= 0.0f;

+//	d3dvp.MaxZ		= 1.0f;

+

+	_GLD_DX9_DEV(SetViewport(gld->pDev, &d3dvp));

+

+}

+

+//---------------------------------------------------------------------------

+

+extern BOOL dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);

+

+// Mesa 5: Parameter change

+void gldResizeBuffers_DX9(

+//	struct gl_context *ctx)

+	struct gl_framebuffer *fb)

+{

+	GET_CURRENT_CONTEXT(ctx);

+	dglWglResizeBuffers(ctx, TRUE);

+}

+

+//---------------------------------------------------------------------------

+#ifdef _DEBUG

+// This is only for debugging.

+// To use, plug into ctx->Driver.Enable pointer below.

+void gld_Enable(

+	struct gl_context *ctx,

+	GLenum e,

+	GLboolean b)

+{

+	char buf[1024];

+	sprintf(buf, "Enable: %s (%s)\n", _mesa_lookup_enum_by_nr(e), b?"TRUE":"FALSE");

+	ddlogMessage(DDLOG_SYSTEM, buf);

+}

+#endif

+//---------------------------------------------------------------------------

+// Driver pointer setup

+//---------------------------------------------------------------------------

+

+extern const GLubyte* _gldGetStringGeneric(struct gl_context*, GLenum);

+

+void gldSetupDriverPointers_DX9(

+	struct gl_context *ctx)

+{

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	TNLcontext *tnl = TNL_CONTEXT(ctx);

+

+	// Mandatory functions

+	ctx->Driver.GetString				= _gldGetStringGeneric;

+	ctx->Driver.UpdateState				= gld_update_state_DX9;

+	ctx->Driver.Clear					= gld_Clear_DX9;

+	ctx->Driver.DrawBuffer				= gld_set_draw_buffer_DX9;

+	ctx->Driver.GetBufferSize			= gld_buffer_size_DX9;

+	ctx->Driver.Finish					= gld_Finish_DX9;

+	ctx->Driver.Flush					= gld_Flush_DX9;

+	ctx->Driver.Error					= gld_Error_DX9;

+

+	// Hardware accumulation buffer

+	ctx->Driver.Accum					= NULL; // TODO: gld_Accum;

+

+	// Bitmap functions

+	ctx->Driver.CopyPixels				= gld_CopyPixels_DX9;

+	ctx->Driver.DrawPixels				= gld_DrawPixels_DX9;

+	ctx->Driver.ReadPixels				= gld_ReadPixels_DX9;

+	ctx->Driver.Bitmap					= gld_Bitmap_DX9;

+

+	// Buffer resize

+	ctx->Driver.ResizeBuffers			= gldResizeBuffers_DX9;

+	

+	// Texture image functions

+	ctx->Driver.ChooseTextureFormat		= gld_ChooseTextureFormat_DX9;

+	ctx->Driver.TexImage1D				= gld_TexImage1D_DX9;

+	ctx->Driver.TexImage2D				= gld_TexImage2D_DX9;

+	ctx->Driver.TexImage3D				= _mesa_store_teximage3d;

+	ctx->Driver.TexSubImage1D			= gld_TexSubImage1D_DX9;

+	ctx->Driver.TexSubImage2D			= gld_TexSubImage2D_DX9;

+	ctx->Driver.TexSubImage3D			= _mesa_store_texsubimage3d;

+	

+	ctx->Driver.CopyTexImage1D			= gldCopyTexImage1D_DX9; //NULL;

+	ctx->Driver.CopyTexImage2D			= gldCopyTexImage2D_DX9; //NULL;

+	ctx->Driver.CopyTexSubImage1D		= gldCopyTexSubImage1D_DX9; //NULL;

+	ctx->Driver.CopyTexSubImage2D		= gldCopyTexSubImage2D_DX9; //NULL;

+	ctx->Driver.CopyTexSubImage3D		= gldCopyTexSubImage3D_DX9;

+	ctx->Driver.TestProxyTexImage		= _mesa_test_proxy_teximage;

+

+	// Texture object functions

+	ctx->Driver.BindTexture				= NULL;

+	ctx->Driver.NewTextureObject		= NULL; // Not yet implemented by Mesa!;

+	ctx->Driver.DeleteTexture			= gld_DeleteTexture_DX9;

+	ctx->Driver.PrioritizeTexture		= NULL;

+

+	// Imaging functionality

+	ctx->Driver.CopyColorTable			= NULL;

+	ctx->Driver.CopyColorSubTable		= NULL;

+	ctx->Driver.CopyConvolutionFilter1D = NULL;

+	ctx->Driver.CopyConvolutionFilter2D = NULL;

+

+	// State changing functions

+	ctx->Driver.AlphaFunc				= NULL; //gld_AlphaFunc;

+	ctx->Driver.BlendFuncSeparate		= NULL; //gld_BlendFunc;

+	ctx->Driver.ClearColor				= NULL; //gld_ClearColor;

+	ctx->Driver.ClearDepth				= NULL; //gld_ClearDepth;

+	ctx->Driver.ClearStencil			= NULL; //gld_ClearStencil;

+	ctx->Driver.ColorMask				= NULL; //gld_ColorMask;

+	ctx->Driver.CullFace				= NULL; //gld_CullFace;

+	ctx->Driver.ClipPlane				= NULL; //gld_ClipPlane;

+	ctx->Driver.FrontFace				= NULL; //gld_FrontFace;

+	ctx->Driver.DepthFunc				= NULL; //gld_DepthFunc;

+	ctx->Driver.DepthMask				= NULL; //gld_DepthMask;

+	ctx->Driver.DepthRange				= NULL;

+	ctx->Driver.Enable					= NULL; //gld_Enable;

+	ctx->Driver.Fogfv					= NULL; //gld_Fogfv;

+	ctx->Driver.Hint					= NULL; //gld_Hint;

+	ctx->Driver.Lightfv					= NULL; //gld_Lightfv;

+	ctx->Driver.LightModelfv			= NULL; //gld_LightModelfv;

+	ctx->Driver.LineStipple				= NULL; //gld_LineStipple;

+	ctx->Driver.LineWidth				= NULL; //gld_LineWidth;

+	ctx->Driver.LogicOpcode				= NULL; //gld_LogicOpcode;

+	ctx->Driver.PointParameterfv		= NULL; //gld_PointParameterfv;

+	ctx->Driver.PointSize				= NULL; //gld_PointSize;

+	ctx->Driver.PolygonMode				= NULL; //gld_PolygonMode;

+	ctx->Driver.PolygonOffset			= NULL; //gld_PolygonOffset;

+	ctx->Driver.PolygonStipple			= NULL; //gld_PolygonStipple;

+	ctx->Driver.RenderMode				= NULL; //gld_RenderMode;

+	ctx->Driver.Scissor					= NULL; //gld_Scissor;

+	ctx->Driver.ShadeModel				= NULL; //gld_ShadeModel;

+	ctx->Driver.StencilFunc				= NULL; //gld_StencilFunc;

+	ctx->Driver.StencilMask				= NULL; //gld_StencilMask;

+	ctx->Driver.StencilOp				= NULL; //gld_StencilOp;

+	ctx->Driver.TexGen					= NULL; //gld_TexGen;

+	ctx->Driver.TexEnv					= NULL;

+	ctx->Driver.TexParameter			= NULL;

+	ctx->Driver.TextureMatrix			= NULL; //gld_TextureMatrix;

+	ctx->Driver.Viewport				= gld_Viewport_DX9;

+

+	_swsetup_Wakeup(ctx);

+

+	tnl->Driver.RunPipeline				= _tnl_run_pipeline;

+	tnl->Driver.Render.ResetLineStipple	= gld_ResetLineStipple_DX9;

+	tnl->Driver.Render.ClippedPolygon	= _tnl_RenderClippedPolygon;

+	tnl->Driver.Render.ClippedLine		= _tnl_RenderClippedLine;

+

+	// Hook into glFrustum() and glOrtho()

+//	ctx->Exec->Frustum					= gldFrustumHook_DX9;

+//	ctx->Exec->Ortho					= gldOrthoHook_DX9;

+

+}

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h
new file mode 100644
index 000000000..5cb36ac05
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_dx9.h
@@ -0,0 +1,327 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  GLDirect Direct3D 9.0 header file

+*

+****************************************************************************/

+

+#ifndef _GLD_DX9_H

+#define _GLD_DX9_H

+

+//---------------------------------------------------------------------------

+// Windows includes

+//---------------------------------------------------------------------------

+

+//#ifndef STRICT

+//#define STRICT

+//#endif

+

+//#define WIN32_LEAN_AND_MEAN

+//#include <windows.h>

+#include <d3d9.h>

+#include <d3dx9.h>

+

+// MS screwed up with the DX8.1 SDK - there's no compile-time

+// method of compiling for 8.0 via the 8.1 SDK unless you

+// "make sure you don't use any 8.1 interfaces".

+// We CAN use 8.1 D3DX static functions, though - just not new 8.1 interfaces.

+//

+// D3D_SDK_VERSION is 120 for 8.0 (supported by Windows 95).

+// D3D_SDK_VERSION is 220 for 8.1 (NOT supported by Windows 95).

+//

+//#define D3D_SDK_VERSION_DX9_SUPPORT_WIN95 120

+//#define D3D_SDK_VERSION_DX91 220

+

+// Typedef for obtaining function from d3d8.dll

+typedef IDirect3D9* (WINAPI *FNDIRECT3DCREATE9) (UINT);

+

+

+//---------------------------------------------------------------------------

+// Defines

+//---------------------------------------------------------------------------

+

+#ifdef _DEBUG

+#define _GLD_TEST_HRESULT(h)					\

+{												\

+	HRESULT _hr = (h);							\

+	if (FAILED(_hr)) {							\

+		gldLogError(GLDLOG_ERROR, #h, _hr);		\

+	}											\

+}

+#define _GLD_DX9(func)		_GLD_TEST_HRESULT(IDirect3D9_##func##)

+#define _GLD_DX9_DEV(func)	_GLD_TEST_HRESULT(IDirect3DDevice9_##func##)

+#define _GLD_DX9_VB(func)	_GLD_TEST_HRESULT(IDirect3DVertexBuffer9_##func##)

+#define _GLD_DX9_TEX(func)	_GLD_TEST_HRESULT(IDirect3DTexture9_##func##)

+#else

+#define _GLD_DX9(func)		IDirect3D9_##func

+#define _GLD_DX9_DEV(func)	IDirect3DDevice9_##func

+#define _GLD_DX9_VB(func)	IDirect3DVertexBuffer9_##func

+#define _GLD_DX9_TEX(func)	IDirect3DTexture9_##func

+#endif

+

+#define SAFE_RELEASE(p)			\

+{								\

+	if (p) {					\

+		(p)->lpVtbl->Release(p);	\

+		(p) = NULL;				\

+	}							\

+}

+

+#define SAFE_RELEASE_VB9(p)						\

+{												\

+	if (p) {									\

+		IDirect3DVertexBuffer9_Release((p));	\

+		(p) = NULL;								\

+	}											\

+}

+

+#define SAFE_RELEASE_SURFACE9(p)		\

+{										\

+	if (p) {							\

+		IDirect3DSurface9_Release((p));	\

+		(p) = NULL;						\

+	}									\

+}

+

+// Setup index.

+enum {

+	GLD_SI_FLAT				= 0,

+	GLD_SI_SMOOTH			= 1,

+	GLD_SI_FLAT_EXTRAS		= 2,

+	GLD_SI_SMOOTH_EXTRAS	= 3,

+};

+/*

+// Internal pipeline

+typedef enum {

+	GLD_PIPELINE_MESA			= 0,	// Mesa pipeline

+	GLD_PIPELINE_D3D_FVF		= 1,	// Direct3D Fixed-function pipeline

+	GLD_PIPELINE_D3D_VS_TWOSIDE	= 2		// Direct3D two-sided-lighting vertex shader

+} GLD_tnl_pipeline;

+*/

+//---------------------------------------------------------------------------

+// Vertex definitions for Fixed-Function pipeline

+//---------------------------------------------------------------------------

+

+//

+// NOTE: If the number of texture units is altered then most of

+//       the texture code will need to be revised.

+//

+

+#define GLD_MAX_TEXTURE_UNITS_DX9	2

+

+//

+// 2D vertex transformed by Mesa

+//

+#define GLD_FVF_2D_VERTEX (	D3DFVF_XYZRHW |		\

+							D3DFVF_DIFFUSE |	\

+							D3DFVF_SPECULAR |	\

+							D3DFVF_TEX2)

+typedef struct {

+	FLOAT	x, y;		// 2D raster coords

+	FLOAT	sz;			// Screen Z (depth)

+	FLOAT	rhw;		// Reciprocal homogenous W

+	DWORD	diffuse;	// Diffuse colour

+	DWORD	specular;	// For separate-specular support

+	FLOAT	t0_u, t0_v;	// 1st set of texture coords

+	FLOAT	t1_u, t1_v;	// 2nd set of texture coords

+} GLD_2D_VERTEX;

+

+

+//

+// 3D vertex transformed by Direct3D

+//

+#define GLD_FVF_3D_VERTEX (	D3DFVF_XYZ |				\

+							D3DFVF_DIFFUSE |			\

+							D3DFVF_TEX2)

+

+typedef struct {

+	D3DXVECTOR3		Position;		// XYZ Vector in object space

+	D3DCOLOR		Diffuse;		// Diffuse colour

+	D3DXVECTOR2		TexUnit0;		// Texture unit 0

+	D3DXVECTOR2		TexUnit1;		// Texture unit 1

+} GLD_3D_VERTEX;

+

+//---------------------------------------------------------------------------

+// Vertex Shaders

+//---------------------------------------------------------------------------

+/*

+// DX8 Vertex Shader

+typedef struct {

+	DWORD	hShader;	// If NULL, shader is invalid and cannot be used

+	BOOL	bHardware;	// If TRUE then shader was created for hardware,

+						// otherwise shader was created for software.

+} GLD_vertexShader;

+*/

+//---------------------------------------------------------------------------

+// Structs

+//---------------------------------------------------------------------------

+

+// This keeps a count of how many times we choose each individual internal

+// pathway. Useful for seeing if a certain pathway was ever used by an app, and

+// how much each pathway is biased.

+// Zero the members at context creation and dump stats at context deletion.

+typedef struct {

+	// Note: DWORD is probably too small

+	ULARGE_INTEGER	qwMesa;		// Mesa TnL pipeline

+	ULARGE_INTEGER	qwD3DFVF;	// Direct3D Fixed-Function pipeline

+//	ULARGE_INTEGER	dwD3D2SVS;	// Direct3D Two-Sided Vertex Shader pipeline

+} GLD_pipeline_usage;

+

+// GLDirect Primitive Buffer (points, lines, triangles and quads)

+typedef struct {

+	// Data for IDirect3DDevice9::CreateVertexBuffer()

+	DWORD					dwStride;		// Stride of vertex

+	DWORD					dwUsage;		// Usage flags

+	DWORD					dwFVF;			// Direct3D Flexible Vertex Format

+	DWORD					dwPool;			// Pool flags

+

+	IDirect3DVertexBuffer9	*pVB;			// Holds points, lines, tris and quads.

+

+	// Point list is assumed to be at start of buffer

+	DWORD					iFirstLine;		// Index of start of line list

+	DWORD					iFirstTriangle;	// Index of start of triangle list

+

+	BYTE					*pPoints;		// Pointer to next free point

+	BYTE					*pLines;		// Pointer to next free line

+	BYTE					*pTriangles;	// Pointer to next free triangle

+

+	DWORD					nPoints;		// Number of points ready to render

+	DWORD					nLines;			// Number of lines ready to render

+	DWORD					nTriangles;		// Number of triangles ready to render

+} GLD_pb_dx9;

+

+// GLDirect DX9 driver data

+typedef struct {

+	// GLDirect vars

+	BOOL					bDoublebuffer;	// Doublebuffer (otherwise single-buffered)

+	BOOL					bDepthStencil;	// Depth buffer needed (stencil optional)

+	D3DFORMAT				RenderFormat;	// Format of back/front buffer

+	D3DFORMAT				DepthFormat;	// Format of depth/stencil

+//	float					fFlipWindowY;	// Value for flipping viewport Y coord

+

+	// Direct3D vars

+	D3DCAPS9				d3dCaps9;

+	BOOL					bHasHWTnL;		// Device has Hardware Transform/Light?

+	IDirect3D9				*pD3D;			// Base Direct3D9 interface

+	IDirect3DDevice9		*pDev;			// Direct3D9 Device interface

+	GLD_pb_dx9				PB2d;			// Vertices transformed by Mesa

+	GLD_pb_dx9				PB3d;			// Vertices transformed by Direct3D

+	D3DPRIMITIVETYPE		d3dpt;			// Current Direct3D primitive type

+	D3DXMATRIX				matProjection;	// Projection matrix for D3D TnL

+	D3DXMATRIX				matModelView;	// Model/View matrix for D3D TnL

+	int						iSetupFunc;		// Which setup functions to use

+	BOOL					bUseMesaTnL;	// Whether to use Mesa or D3D for TnL

+

+	// Direct3D vars for two-sided lighting

+//	GLD_vertexShader		VStwosidelight;	// Vertex Shader for two-sided lighting

+//	D3DXMATRIX				matWorldViewProj;// World/View/Projection matrix for shaders

+

+

+//	GLD_tnl_pipeline		TnLPipeline;	// Index of current internal pipeline

+	GLD_pipeline_usage		PipelineUsage;

+

+	BOOL					bCanScissor;	// Scissor test - new for DX9

+} GLD_driver_dx9;

+

+#define GLD_GET_DX9_DRIVER(c) (GLD_driver_dx9*)(c)->glPriv

+

+//---------------------------------------------------------------------------

+// Function prototypes

+//---------------------------------------------------------------------------

+

+PROC	gldGetProcAddress_DX9(LPCSTR a);

+void	gldEnableExtensions_DX9(struct gl_context *ctx);

+void	gldInstallPipeline_DX9(struct gl_context *ctx);

+void	gldSetupDriverPointers_DX9(struct gl_context *ctx);

+//void	gldResizeBuffers_DX9(struct gl_context *ctx);

+void	gldResizeBuffers_DX9(struct gl_framebuffer *fb);

+

+

+// Texture functions

+

+void	gldCopyTexImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);

+void	gldCopyTexImage2D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);

+void	gldCopyTexSubImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );

+void	gldCopyTexSubImage2D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );

+void	gldCopyTexSubImage3D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );

+

+void	gld_NEW_TEXTURE_DX9(struct gl_context *ctx);

+void	gld_DrawPixels_DX9(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	gld_ReadPixels_DX9(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, GLvoid *dest);

+void	gld_CopyPixels_DX9(struct gl_context *ctx, GLint srcx, GLint srcy, GLsizei width, GLsizei height, GLint dstx, GLint dsty, GLenum type);

+void	gld_Bitmap_DX9(struct gl_context *ctx, GLint x, GLint y, GLsizei width, GLsizei height, const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap);

+const struct gl_texture_format* gld_ChooseTextureFormat_DX9(struct gl_context *ctx, GLint internalFormat, GLenum srcFormat, GLenum srcType);

+void	gld_TexImage2D_DX9(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 *tObj, struct gl_texture_image *texImage);

+void	gld_TexImage1D_DX9(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 );

+void	gld_TexSubImage2D_DX9( struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage );

+void	gld_TexSubImage1D_DX9(struct gl_context *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels, const struct gl_pixelstore_attrib *packing, struct gl_texture_object *texObj, struct gl_texture_image *texImage);

+void	gld_DeleteTexture_DX9(struct gl_context *ctx, struct gl_texture_object *tObj);

+void	gld_ResetLineStipple_DX9(struct gl_context *ctx);

+

+// 2D primitive functions

+

+void	gld_Points2D_DX9(struct gl_context *ctx, GLuint first, GLuint last);

+

+void	gld_Line2DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);

+void	gld_Line2DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);

+

+void	gld_Triangle2DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Triangle2DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Triangle2DFlatExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Triangle2DSmoothExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+

+void	gld_Quad2DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+void	gld_Quad2DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+void	gld_Quad2DFlatExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+void	gld_Quad2DSmoothExtras_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+

+// 3D primitive functions

+

+void	gld_Points3D_DX9(struct gl_context *ctx, GLuint first, GLuint last);

+void	gld_Line3DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);

+void	gld_Triangle3DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Quad3DFlat_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+void	gld_Line3DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);

+void	gld_Triangle3DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Quad3DSmooth_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+

+// Primitive functions for Two-sided-lighting Vertex Shader

+

+void	gld_Points2DTwoside_DX9(struct gl_context *ctx, GLuint first, GLuint last);

+void	gld_Line2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);

+void	gld_Line2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1);

+void	gld_Triangle2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Triangle2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2);

+void	gld_Quad2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+void	gld_Quad2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+

+#endif

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_dxerr9.h b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_dxerr9.h
new file mode 100644
index 000000000..7ec8c8a46
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_dxerr9.h
@@ -0,0 +1,77 @@
+/*==========================================================================;

+ *

+ *

+ *  File:   dxerr9.h

+ *  Content:    DirectX Error Library Include File

+ *

+ ****************************************************************************/

+

+#ifndef _GLD_DXERR9_H_

+#define _GLD_DXERR9_H_

+

+

+#include <d3d9.h>

+

+//

+//  DXGetErrorString9

+//  

+//  Desc:  Converts an DirectX HRESULT to a string 

+//

+//  Args:  HRESULT hr   Can be any error code from

+//                      DPLAY D3D8 D3DX8 DMUSIC DSOUND

+//

+//  Return: Converted string 

+//

+const char*  __stdcall DXGetErrorString9A(HRESULT hr);

+const WCHAR* __stdcall DXGetErrorString9W(HRESULT hr);

+

+#ifdef UNICODE

+    #define DXGetErrorString9 DXGetErrorString9W

+#else

+    #define DXGetErrorString9 DXGetErrorString9A

+#endif 

+

+

+//

+//  DXTrace

+//

+//  Desc:  Outputs a formatted error message to the debug stream

+//

+//  Args:  CHAR* strFile   The current file, typically passed in using the 

+//                         __FILE__ macro.

+//         DWORD dwLine    The current line number, typically passed in using the 

+//                         __LINE__ macro.

+//         HRESULT hr      An HRESULT that will be traced to the debug stream.

+//         CHAR* strMsg    A string that will be traced to the debug stream (may be NULL)

+//         BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.

+//

+//  Return: The hr that was passed in.  

+//

+//HRESULT __stdcall DXTraceA( char* strFile, DWORD dwLine, HRESULT hr, char* strMsg, BOOL bPopMsgBox = FALSE );

+//HRESULT __stdcall DXTraceW( char* strFile, DWORD dwLine, HRESULT hr, WCHAR* strMsg, BOOL bPopMsgBox = FALSE );

+HRESULT __stdcall DXTraceA( char* strFile, DWORD dwLine, HRESULT hr, char* strMsg, BOOL bPopMsgBox);

+HRESULT __stdcall DXTraceW( char* strFile, DWORD dwLine, HRESULT hr, WCHAR* strMsg, BOOL bPopMsgBox);

+

+#ifdef UNICODE

+    #define DXTrace DXTraceW

+#else

+    #define DXTrace DXTraceA

+#endif 

+

+

+//

+// Helper macros

+//

+#if defined(DEBUG) | defined(_DEBUG)

+    #define DXTRACE_MSG(str)              DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE )

+    #define DXTRACE_ERR(str,hr)           DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE )

+    #define DXTRACE_ERR_NOMSGBOX(str,hr)  DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE )

+#else

+    #define DXTRACE_MSG(str)              (0L)

+    #define DXTRACE_ERR(str,hr)           (hr)

+    #define DXTRACE_ERR_NOMSGBOX(str,hr)  (hr)

+#endif

+

+

+#endif

+

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
new file mode 100644
index 000000000..d370ce413
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
@@ -0,0 +1,344 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  GL extensions

+*

+****************************************************************************/

+

+//#include "../GLDirect.h"

+//#include "../gld_log.h"

+//#include "../gld_settings.h"

+

+#include <windows.h>

+#define GL_GLEXT_PROTOTYPES

+#include <GL/gl.h>

+#include <GL/glext.h>

+

+//#include "ddlog.h"

+//#include "gld_dx8.h"

+

+#include "glheader.h"

+#include "context.h"

+#include "colormac.h"

+#include "depth.h"

+#include "extensions.h"

+#include "macros.h"

+#include "matrix.h"

+// #include "mem.h"

+//#include "mmath.h"

+#include "mtypes.h"

+#include "texformat.h"

+#include "texstore.h"

+#include "vbo/vbo.h"

+#include "swrast_setup/swrast_setup.h"

+#include "swrast_setup/ss_context.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+#include "dglcontext.h"

+#include "extensions.h"

+

+// For some reason this is not defined in an above header...

+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);

+

+//---------------------------------------------------------------------------

+// Hack for the SGIS_multitexture extension that was removed from Mesa

+// NOTE: SGIS_multitexture enums also clash with GL_SGIX_async_pixel

+

+	// NOTE: Quake2 ran *slower* with this enabled, so I've

+	// disabled it for now.

+	// To enable, uncomment:

+	//  _mesa_add_extension(ctx, GL_TRUE, szGL_SGIS_multitexture, 0);

+

+//---------------------------------------------------------------------------

+

+enum {

+	/* Quake2 GL_SGIS_multitexture */

+	GL_SELECTED_TEXTURE_SGIS			= 0x835B,

+	GL_SELECTED_TEXTURE_COORD_SET_SGIS	= 0x835C,

+	GL_MAX_TEXTURES_SGIS				= 0x835D,

+	GL_TEXTURE0_SGIS					= 0x835E,

+	GL_TEXTURE1_SGIS					= 0x835F,

+	GL_TEXTURE2_SGIS					= 0x8360,

+	GL_TEXTURE3_SGIS					= 0x8361,

+	GL_TEXTURE_COORD_SET_SOURCE_SGIS	= 0x8363,

+};

+

+//---------------------------------------------------------------------------

+

+void APIENTRY gldSelectTextureSGIS(

+	GLenum target)

+{

+	GLenum ARB_target = GL_TEXTURE0_ARB + (target - GL_TEXTURE0_SGIS);

+	glActiveTextureARB(ARB_target);

+}

+

+//---------------------------------------------------------------------------

+

+void APIENTRY gldMTexCoord2fSGIS(

+	GLenum target,

+	GLfloat s,

+	GLfloat t)

+{

+	GLenum ARB_target = GL_TEXTURE0_ARB + (target - GL_TEXTURE0_SGIS);

+	glMultiTexCoord2fARB(ARB_target, s, t);

+}

+

+//---------------------------------------------------------------------------

+

+void APIENTRY gldMTexCoord2fvSGIS(

+	GLenum target,

+	const GLfloat *v)

+{

+	GLenum ARB_target = GL_TEXTURE0_ARB + (target - GL_TEXTURE0_SGIS);

+	glMultiTexCoord2fvARB(ARB_target, v);

+}

+

+//---------------------------------------------------------------------------

+// Extensions

+//---------------------------------------------------------------------------

+

+typedef struct {

+	PROC proc;

+	char *name;

+}  GLD_extension;

+

+GLD_extension GLD_extList[] = {

+#ifdef GL_EXT_polygon_offset

+    {	(PROC)glPolygonOffsetEXT,		"glPolygonOffsetEXT"		},

+#endif

+    {	(PROC)glBlendEquationEXT,		"glBlendEquationEXT"		},

+    {	(PROC)glBlendColorEXT,			"glBlendColorExt"			},

+    {	(PROC)glVertexPointerEXT,		"glVertexPointerEXT"		},

+    {	(PROC)glNormalPointerEXT,		"glNormalPointerEXT"		},

+    {	(PROC)glColorPointerEXT,		"glColorPointerEXT"			},

+    {	(PROC)glIndexPointerEXT,		"glIndexPointerEXT"			},

+    {	(PROC)glTexCoordPointerEXT,		"glTexCoordPointer"			},

+    {	(PROC)glEdgeFlagPointerEXT,		"glEdgeFlagPointerEXT"		},

+    {	(PROC)glGetPointervEXT,			"glGetPointervEXT"			},

+    {	(PROC)glArrayElementEXT,		"glArrayElementEXT"			},

+    {	(PROC)glDrawArraysEXT,			"glDrawArrayEXT"			},

+    {	(PROC)glAreTexturesResidentEXT,	"glAreTexturesResidentEXT"	},

+    {	(PROC)glBindTextureEXT,			"glBindTextureEXT"			},

+    {	(PROC)glDeleteTexturesEXT,		"glDeleteTexturesEXT"		},

+    {	(PROC)glGenTexturesEXT,			"glGenTexturesEXT"			},

+    {	(PROC)glIsTextureEXT,			"glIsTextureEXT"			},

+    {	(PROC)glPrioritizeTexturesEXT,	"glPrioritizeTexturesEXT"	},

+    {	(PROC)glCopyTexSubImage3DEXT,	"glCopyTexSubImage3DEXT"	},

+    {	(PROC)glTexImage3DEXT,			"glTexImage3DEXT"			},

+    {	(PROC)glTexSubImage3DEXT,		"glTexSubImage3DEXT"		},

+    {	(PROC)glPointParameterfEXT,		"glPointParameterfEXT"		},

+    {	(PROC)glPointParameterfvEXT,	"glPointParameterfvEXT"		},

+

+    {	(PROC)glLockArraysEXT,			"glLockArraysEXT"			},

+    {	(PROC)glUnlockArraysEXT,		"glUnlockArraysEXT"			},

+	{	NULL,							"\0"						}

+};

+

+GLD_extension GLD_multitexList[] = {

+/*

+    {	(PROC)glMultiTexCoord1dSGIS,		"glMTexCoord1dSGIS"			},

+    {	(PROC)glMultiTexCoord1dvSGIS,		"glMTexCoord1dvSGIS"		},

+    {	(PROC)glMultiTexCoord1fSGIS,		"glMTexCoord1fSGIS"			},

+    {	(PROC)glMultiTexCoord1fvSGIS,		"glMTexCoord1fvSGIS"		},

+    {	(PROC)glMultiTexCoord1iSGIS,		"glMTexCoord1iSGIS"			},

+    {	(PROC)glMultiTexCoord1ivSGIS,		"glMTexCoord1ivSGIS"		},

+    {	(PROC)glMultiTexCoord1sSGIS,		"glMTexCoord1sSGIS"			},

+    {	(PROC)glMultiTexCoord1svSGIS,		"glMTexCoord1svSGIS"		},

+    {	(PROC)glMultiTexCoord2dSGIS,		"glMTexCoord2dSGIS"			},

+    {	(PROC)glMultiTexCoord2dvSGIS,		"glMTexCoord2dvSGIS"		},

+    {	(PROC)glMultiTexCoord2fSGIS,		"glMTexCoord2fSGIS"			},

+    {	(PROC)glMultiTexCoord2fvSGIS,		"glMTexCoord2fvSGIS"		},

+    {	(PROC)glMultiTexCoord2iSGIS,		"glMTexCoord2iSGIS"			},

+    {	(PROC)glMultiTexCoord2ivSGIS,		"glMTexCoord2ivSGIS"		},

+    {	(PROC)glMultiTexCoord2sSGIS,		"glMTexCoord2sSGIS"			},

+    {	(PROC)glMultiTexCoord2svSGIS,		"glMTexCoord2svSGIS"		},

+    {	(PROC)glMultiTexCoord3dSGIS,		"glMTexCoord3dSGIS"			},

+    {	(PROC)glMultiTexCoord3dvSGIS,		"glMTexCoord3dvSGIS"		},

+    {	(PROC)glMultiTexCoord3fSGIS,		"glMTexCoord3fSGIS"			},

+    {	(PROC)glMultiTexCoord3fvSGIS,		"glMTexCoord3fvSGIS"		},

+    {	(PROC)glMultiTexCoord3iSGIS,		"glMTexCoord3iSGIS"			},

+    {	(PROC)glMultiTexCoord3ivSGIS,		"glMTexCoord3ivSGIS"		},

+    {	(PROC)glMultiTexCoord3sSGIS,		"glMTexCoord3sSGIS"			},

+    {	(PROC)glMultiTexCoord3svSGIS,		"glMTexCoord3svSGIS"		},

+    {	(PROC)glMultiTexCoord4dSGIS,		"glMTexCoord4dSGIS"			},

+    {	(PROC)glMultiTexCoord4dvSGIS,		"glMTexCoord4dvSGIS"		},

+    {	(PROC)glMultiTexCoord4fSGIS,		"glMTexCoord4fSGIS"			},

+    {	(PROC)glMultiTexCoord4fvSGIS,		"glMTexCoord4fvSGIS"		},

+    {	(PROC)glMultiTexCoord4iSGIS,		"glMTexCoord4iSGIS"			},

+    {	(PROC)glMultiTexCoord4ivSGIS,		"glMTexCoord4ivSGIS"		},

+    {	(PROC)glMultiTexCoord4sSGIS,		"glMTexCoord4sSGIS"			},

+    {	(PROC)glMultiTexCoord4svSGIS,		"glMTexCoord4svSGIS"		},

+    {	(PROC)glMultiTexCoordPointerSGIS,	"glMTexCoordPointerSGIS"	},

+    {	(PROC)glSelectTextureSGIS,			"glSelectTextureSGIS"			},

+    {	(PROC)glSelectTextureCoordSetSGIS,	"glSelectTextureCoordSetSGIS"	},

+*/

+    {	(PROC)glActiveTextureARB,		"glActiveTextureARB"		},

+    {	(PROC)glClientActiveTextureARB,	"glClientActiveTextureARB"	},

+    {	(PROC)glMultiTexCoord1dARB,		"glMultiTexCoord1dARB"		},

+    {	(PROC)glMultiTexCoord1dvARB,	"glMultiTexCoord1dvARB"		},

+    {	(PROC)glMultiTexCoord1fARB,		"glMultiTexCoord1fARB"		},

+    {	(PROC)glMultiTexCoord1fvARB,	"glMultiTexCoord1fvARB"		},

+    {	(PROC)glMultiTexCoord1iARB,		"glMultiTexCoord1iARB"		},

+    {	(PROC)glMultiTexCoord1ivARB,	"glMultiTexCoord1ivARB"		},

+    {	(PROC)glMultiTexCoord1sARB,		"glMultiTexCoord1sARB"		},

+    {	(PROC)glMultiTexCoord1svARB,	"glMultiTexCoord1svARB"		},

+    {	(PROC)glMultiTexCoord2dARB,		"glMultiTexCoord2dARB"		},

+    {	(PROC)glMultiTexCoord2dvARB,	"glMultiTexCoord2dvARB"		},

+    {	(PROC)glMultiTexCoord2fARB,		"glMultiTexCoord2fARB"		},

+    {	(PROC)glMultiTexCoord2fvARB,	"glMultiTexCoord2fvARB"		},

+    {	(PROC)glMultiTexCoord2iARB,		"glMultiTexCoord2iARB"		},

+    {	(PROC)glMultiTexCoord2ivARB,	"glMultiTexCoord2ivARB"		},

+    {	(PROC)glMultiTexCoord2sARB,		"glMultiTexCoord2sARB"		},

+    {	(PROC)glMultiTexCoord2svARB,	"glMultiTexCoord2svARB"		},

+    {	(PROC)glMultiTexCoord3dARB,		"glMultiTexCoord3dARB"		},

+    {	(PROC)glMultiTexCoord3dvARB,	"glMultiTexCoord3dvARB"		},

+    {	(PROC)glMultiTexCoord3fARB,		"glMultiTexCoord3fARB"		},

+    {	(PROC)glMultiTexCoord3fvARB,	"glMultiTexCoord3fvARB"		},

+    {	(PROC)glMultiTexCoord3iARB,		"glMultiTexCoord3iARB"		},

+    {	(PROC)glMultiTexCoord3ivARB,	"glMultiTexCoord3ivARB"		},

+    {	(PROC)glMultiTexCoord3sARB,		"glMultiTexCoord3sARB"		},

+    {	(PROC)glMultiTexCoord3svARB,	"glMultiTexCoord3svARB"		},

+    {	(PROC)glMultiTexCoord4dARB,		"glMultiTexCoord4dARB"		},

+    {	(PROC)glMultiTexCoord4dvARB,	"glMultiTexCoord4dvARB"		},

+    {	(PROC)glMultiTexCoord4fARB,		"glMultiTexCoord4fARB"		},

+    {	(PROC)glMultiTexCoord4fvARB,	"glMultiTexCoord4fvARB"		},

+    {	(PROC)glMultiTexCoord4iARB,		"glMultiTexCoord4iARB"		},

+    {	(PROC)glMultiTexCoord4ivARB,	"glMultiTexCoord4ivARB"		},

+    {	(PROC)glMultiTexCoord4sARB,		"glMultiTexCoord4sARB"		},

+    {	(PROC)glMultiTexCoord4svARB,	"glMultiTexCoord4svARB"		},

+

+	// Descent3 doesn't use correct string, hence this hack

+    {	(PROC)glMultiTexCoord4fARB,		"glMultiTexCoord4f"			},

+

+	// Quake2 SGIS multitexture

+    {	(PROC)gldSelectTextureSGIS,		"glSelectTextureSGIS"		},

+    {	(PROC)gldMTexCoord2fSGIS,		"glMTexCoord2fSGIS"			},

+    {	(PROC)gldMTexCoord2fvSGIS,		"glMTexCoord2fvSGIS"		},

+

+	{	NULL,							"\0"						}

+};

+

+//---------------------------------------------------------------------------

+

+PROC gldGetProcAddress_DX(

+	LPCSTR a)

+{

+	int		i;

+	PROC	proc = NULL;

+

+	for (i=0; GLD_extList[i].proc; i++) {

+		if (!strcmp(a, GLD_extList[i].name)) {

+			proc = GLD_extList[i].proc;

+			break;

+		}

+	}

+

+	if (glb.bMultitexture) {

+		for (i=0; GLD_multitexList[i].proc; i++) {

+			if (!strcmp(a, GLD_multitexList[i].name)) {

+				proc = GLD_multitexList[i].proc;

+				break;

+			}

+		}

+	}

+

+	gldLogPrintf(GLDLOG_INFO, "GetProcAddress: %s (%s)", a, proc ? "OK" : "Failed");

+

+	return proc;

+}

+

+//---------------------------------------------------------------------------

+

+void gldEnableExtensions_DX9(

+	struct gl_context *ctx)

+{

+	GLuint i;

+

+	// Mesa enables some extensions by default.

+	// This table decides which ones we want to switch off again.

+

+	// NOTE: GL_EXT_compiled_vertex_array appears broken.

+

+	const char *gld_disable_extensions[] = {

+//		"GL_ARB_transpose_matrix",

+//		"GL_EXT_compiled_vertex_array",

+//		"GL_EXT_polygon_offset",

+//		"GL_EXT_rescale_normal",

+		"GL_EXT_texture3D",

+//		"GL_NV_texgen_reflection",

+		NULL

+	};

+

+	const char *gld_multitex_extensions[] = {

+		"GL_ARB_multitexture",		// Quake 3

+		NULL

+	};

+

+	// Quake 2 engines

+	const char *szGL_SGIS_multitexture = "GL_SGIS_multitexture";

+

+	const char *gld_enable_extensions[] = {

+		"GL_EXT_texture_env_add",	// Quake 3

+		"GL_ARB_texture_env_add",	// Quake 3

+		NULL

+	};

+	

+	for (i=0; gld_disable_extensions[i]; i++) {

+		_mesa_disable_extension(ctx, gld_disable_extensions[i]);

+	}

+	

+	for (i=0; gld_enable_extensions[i]; i++) {

+		_mesa_enable_extension(ctx, gld_enable_extensions[i]);

+	}

+

+	if (glb.bMultitexture) {	

+		for (i=0; gld_multitex_extensions[i]; i++) {

+			_mesa_enable_extension(ctx, gld_multitex_extensions[i]);

+		}

+

+		// GL_SGIS_multitexture

+		// NOTE: Quake2 ran *slower* with this enabled, so I've

+		// disabled it for now.

+		// Fair bit slower on GeForce256,

+		// Much slower on 3dfx Voodoo5 5500.

+//		_mesa_add_extension(ctx, GL_TRUE, szGL_SGIS_multitexture, 0);

+

+	}

+

+	_mesa_enable_imaging_extensions(ctx);

+	_mesa_enable_1_3_extensions(ctx);

+	_mesa_enable_1_4_extensions(ctx);

+}

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c
new file mode 100644
index 000000000..6c41e567d
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_pipeline_dx9.c
@@ -0,0 +1,77 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Mesa transformation pipeline with GLDirect fastpath

+*

+****************************************************************************/

+

+//#include "../GLDirect.h"

+

+#include "dglcontext.h"

+#include "ddlog.h"

+#include "gld_dx9.h"

+

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+//---------------------------------------------------------------------------

+

+extern struct tnl_pipeline_stage _gld_d3d_render_stage;

+extern struct tnl_pipeline_stage _gld_mesa_render_stage;

+

+static const struct tnl_pipeline_stage *gld_pipeline[] = {

+	&_gld_d3d_render_stage,			// Direct3D TnL

+	&_tnl_vertex_transform_stage,

+	&_tnl_normal_transform_stage,

+	&_tnl_lighting_stage,

+	&_tnl_fog_coordinate_stage,	/* TODO: Omit fog stage. ??? */

+	&_tnl_texgen_stage,

+	&_tnl_texture_transform_stage,

+	&_tnl_point_attenuation_stage,

+	&_gld_mesa_render_stage,		// Mesa TnL, D3D rendering

+	0,

+};

+

+//---------------------------------------------------------------------------

+

+void gldInstallPipeline_DX9(

+	struct gl_context *ctx)

+{

+	// Remove any existing pipeline	stages,

+	// then install GLDirect pipeline stages.

+

+	_tnl_destroy_pipeline(ctx);

+	_tnl_install_pipeline(ctx, gld_pipeline);

+}

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
new file mode 100644
index 000000000..aaed87028
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
@@ -0,0 +1,1446 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Primitive (points/lines/tris/quads) rendering

+*

+****************************************************************************/

+

+//#include "../GLDirect.h"

+

+//#include "gld_dx8.h"

+

+#include "dglcontext.h"

+#include "ddlog.h"

+#include "gld_dx9.h"

+

+#include "glheader.h"

+#include "context.h"

+#include "colormac.h"

+#include "depth.h"

+#include "extensions.h"

+#include "macros.h"

+#include "matrix.h"

+// #include "mem.h"

+//#include "mmath.h"

+#include "mtypes.h"

+#include "texformat.h"

+#include "texstore.h"

+#include "vbo/vbo.h"

+#include "swrast/swrast.h"

+#include "swrast_setup/swrast_setup.h"

+#include "swrast_setup/ss_context.h"

+#include "swrast/s_context.h"

+#include "swrast/s_depth.h"

+#include "swrast/s_lines.h"

+#include "swrast/s_triangle.h"

+#include "swrast/s_trispan.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+// Disable compiler complaints about unreferenced local variables

+#pragma warning (disable:4101)

+

+//---------------------------------------------------------------------------

+// Helper defines for primitives

+//---------------------------------------------------------------------------

+

+//static const float ooZ		= 1.0f / 65536.0f; // One over Z

+

+#define GLD_COLOUR (D3DCOLOR_RGBA(swv->color[0], swv->color[1], swv->color[2], swv->color[3]))

+#define GLD_SPECULAR (D3DCOLOR_RGBA(swv->specular[0], swv->specular[1], swv->specular[2], swv->specular[3]))

+#define GLD_FLIP_Y(y) (gldCtx->dwHeight - (y))

+

+//---------------------------------------------------------------------------

+// 2D vertex setup

+//---------------------------------------------------------------------------

+

+#define GLD_SETUP_2D_VARS_POINTS							\

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);			\

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);	\

+	GLD_2D_VERTEX	*pV		= (GLD_2D_VERTEX*)gld->PB2d.pPoints;	\

+	SScontext		*ss		= SWSETUP_CONTEXT(ctx);			\

+	SWvertex		*swv;									\

+	DWORD			dwSpecularColour;						\

+	DWORD			dwFlatColour

+

+#define GLD_SETUP_2D_VARS_LINES								\

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);			\

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);	\

+	GLD_2D_VERTEX	*pV		= (GLD_2D_VERTEX*)gld->PB2d.pLines;	\

+	SScontext		*ss		= SWSETUP_CONTEXT(ctx);			\

+	SWvertex		*swv;									\

+	DWORD			dwSpecularColour;						\

+	DWORD			dwFlatColour

+

+#define GLD_SETUP_2D_VARS_TRIANGLES							\

+	BOOL			bFog = ctx->Fog.Enabled;				\

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);			\

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);	\

+	GLD_2D_VERTEX	*pV		= (GLD_2D_VERTEX*)gld->PB2d.pTriangles;	\

+	SScontext		*ss		= SWSETUP_CONTEXT(ctx);			\

+	SWvertex		*swv;									\

+	DWORD			dwSpecularColour;						\

+	DWORD			dwFlatColour;							\

+	GLuint					facing = 0;						\

+	struct vertex_buffer	*VB;							\

+	GLchan					(*vbcolor)[4];					\

+	GLchan					(*vbspec)[4]

+

+#define GLD_SETUP_GET_SWVERT(s)					\

+	swv = &ss->verts[##s]

+

+#define GLD_SETUP_2D_VERTEX						\

+	pV->x			= swv->win[0];				\

+	pV->y			= GLD_FLIP_Y(swv->win[1]);	\

+	pV->rhw			= swv->win[3]

+

+#define GLD_SETUP_SMOOTH_COLOUR					\

+	pV->diffuse		= GLD_COLOUR

+

+#define GLD_SETUP_GET_FLAT_COLOUR				\

+	dwFlatColour	= GLD_COLOUR

+#define GLD_SETUP_GET_FLAT_FOG_COLOUR			\

+	dwFlatColour	= _gldComputeFog(ctx, swv)

+

+#define GLD_SETUP_USE_FLAT_COLOUR				\

+	pV->diffuse		= dwFlatColour

+

+#define GLD_SETUP_GET_FLAT_SPECULAR				\

+	dwSpecularColour= GLD_SPECULAR

+

+#define GLD_SETUP_USE_FLAT_SPECULAR				\

+	pV->specular	= dwSpecularColour

+

+#define GLD_SETUP_DEPTH							\

+	pV->sz			= swv->win[2] / ctx->DepthMaxF

+//	pV->z			= swv->win[2] * ooZ;

+

+#define GLD_SETUP_SPECULAR						\

+	pV->specular	= GLD_SPECULAR

+

+#define GLD_SETUP_FOG							\

+	pV->diffuse		= _gldComputeFog(ctx, swv)

+

+#define GLD_SETUP_TEX0							\

+	pV->t0_u		= swv->texcoord[0][0];		\

+	pV->t0_v		= swv->texcoord[0][1]

+

+#define GLD_SETUP_TEX1							\

+	pV->t1_u		= swv->texcoord[1][0];		\

+	pV->t1_v		= swv->texcoord[1][1]

+

+#define GLD_SETUP_LIGHTING(v)			\

+	if (facing == 1) {					\

+		pV->diffuse	= D3DCOLOR_RGBA(vbcolor[##v][0], vbcolor[##v][1], vbcolor[##v][2], vbcolor[##v][3]);	\

+		if (vbspec) {																					\

+			pV->specular = D3DCOLOR_RGBA(vbspec[##v][0], vbspec[##v][1], vbspec[##v][2], vbspec[##v][3]);	\

+		}	\

+	} else {	\

+		if (bFog)						\

+			GLD_SETUP_FOG;				\

+		else							\

+			GLD_SETUP_SMOOTH_COLOUR;	\

+		GLD_SETUP_SPECULAR;				\

+	}

+

+#define GLD_SETUP_GET_FLAT_LIGHTING(v)	\

+	if (facing == 1) {					\

+		dwFlatColour = D3DCOLOR_RGBA(vbcolor[##v][0], vbcolor[##v][1], vbcolor[##v][2], vbcolor[##v][3]);	\

+		if (vbspec) {																					\

+			dwSpecularColour = D3DCOLOR_RGBA(vbspec[##v][0], vbspec[##v][1], vbspec[##v][2], vbspec[##v][3]);	\

+		}	\

+	}

+

+#define GLD_SETUP_TWOSIDED_LIGHTING		\

+	/* Two-sided lighting */				\

+	if (ctx->_TriangleCaps & DD_TRI_LIGHT_TWOSIDE) {	\

+		SWvertex	*verts = SWSETUP_CONTEXT(ctx)->verts;	\

+		SWvertex	*v[3];									\

+		GLfloat		ex,ey,fx,fy,cc;							\

+		/* Get vars for later */							\

+		VB		= &TNL_CONTEXT(ctx)->vb;					\

+		vbcolor	= (GLchan (*)[4])VB->BackfaceColorPtr->data;	\

+		if (VB->BackfaceSecondaryColorPtr) {			\

+			vbspec = (GLchan (*)[4])VB->BackfaceSecondaryColorPtr->data;	\

+		} else {													\

+			vbspec = NULL;											\

+		}															\

+		v[0] = &verts[v0];											\

+		v[1] = &verts[v1];											\

+		v[2] = &verts[v2];											\

+		ex = v[0]->win[0] - v[2]->win[0];	\

+		ey = v[0]->win[1] - v[2]->win[1];	\

+		fx = v[1]->win[0] - v[2]->win[0];	\

+		fy = v[1]->win[1] - v[2]->win[1];	\

+		cc  = ex*fy - ey*fx;				\

+		facing = (cc < 0.0) ^ ctx->Polygon._FrontBit;	\

+	}

+

+//---------------------------------------------------------------------------

+// 3D vertex setup

+//---------------------------------------------------------------------------

+

+#define GLD_SETUP_3D_VARS_POINTS											\

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);			\

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);	\

+	GLD_3D_VERTEX			*pV		= (GLD_3D_VERTEX*)gld->PB3d.pPoints;	\

+	TNLcontext				*tnl	= TNL_CONTEXT(ctx);				\

+	struct vertex_buffer	*VB		= &tnl->vb;						\

+	GLfloat					(*p4f)[4];								\

+	GLfloat					(*tc)[4];								\

+	DWORD					dwColor;

+

+#define GLD_SETUP_3D_VARS_LINES											\

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);			\

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);	\

+	GLD_3D_VERTEX			*pV		= (GLD_3D_VERTEX*)gld->PB3d.pLines;	\

+	TNLcontext				*tnl	= TNL_CONTEXT(ctx);				\

+	struct vertex_buffer	*VB		= &tnl->vb;						\

+	GLfloat					(*p4f)[4];								\

+	GLfloat					(*tc)[4];								\

+	DWORD					dwColor;

+

+#define GLD_SETUP_3D_VARS_TRIANGLES											\

+	GLD_context		*gldCtx	= GLD_GET_CONTEXT(ctx);			\

+	GLD_driver_dx9	*gld	= GLD_GET_DX9_DRIVER(gldCtx);	\

+	GLD_3D_VERTEX			*pV		= (GLD_3D_VERTEX*)gld->PB3d.pTriangles;	\

+	TNLcontext				*tnl	= TNL_CONTEXT(ctx);				\

+	struct vertex_buffer	*VB		= &tnl->vb;						\

+	GLfloat					(*p4f)[4];								\

+	GLfloat					(*tc)[4];								\

+	DWORD					dwColor;

+

+#define GLD_SETUP_3D_VERTEX(v)					\

+	p4f = VB->AttribPtr[_TNL_ATTRIB_POS]->data;		\

+	pV->Position.x	= p4f[##v][0];				\

+	pV->Position.y	= p4f[##v][1];				\

+	pV->Position.z	= p4f[##v][2];

+

+#define GLD_SETUP_SMOOTH_COLOUR_3D(v)															\

+	p4f = (GLfloat (*)[4])VB->AttribPtr[_TNL_ATTRIB_COLOR0]->data;										\

+	pV->Diffuse	= D3DCOLOR_COLORVALUE(p4f[##v][0], p4f[##v][1], p4f[##v][2], p4f[##v][3]);

+

+

+#define GLD_SETUP_GET_FLAT_COLOUR_3D(v)													\

+	p4f = (GLfloat (*)[4])VB->AttribPtr[_TNL_ATTRIB_COLOR00]->data;	\

+	dwColor	= D3DCOLOR_COLORVALUE(p4f[##v][0], p4f[##v][1], p4f[##v][2], p4f[##v][3]);

+

+#define GLD_SETUP_USE_FLAT_COLOUR_3D			\

+	pV->Diffuse = dwColor;

+

+#define GLD_SETUP_TEX0_3D(v)						\

+	if (VB->AttribPtr[_TNL_ATTRIB_TEX0]) {				\

+		tc = VB->AttribPtr[_TNL_ATTRIB_TEX0]->data;		\

+		pV->TexUnit0.x	= tc[##v][0];				\

+		pV->TexUnit0.y	= tc[##v][1];				\

+	}

+

+#define GLD_SETUP_TEX1_3D(v)						\

+	if (VB->AttribPtr[_TNL_ATTRIB_TEX1]) {				\

+		tc = VB->AttribPtr[_TNL_ATTRIB_TEX1]->data;		\

+		pV->TexUnit1.x	= tc[##v][0];				\

+		pV->TexUnit1.y	= tc[##v][1];				\

+	}

+

+//---------------------------------------------------------------------------

+// Helper functions

+//---------------------------------------------------------------------------

+

+__inline DWORD _gldComputeFog(

+	struct gl_context *ctx,

+	SWvertex *swv)

+{

+	// Full fog calculation.

+	// Based on Mesa code.

+

+	GLchan			rFog, gFog, bFog;

+	GLchan			fR, fG, fB;

+	const GLfloat	f = swv->fog;

+	const GLfloat	g = 1.0 - f;

+	

+	UNCLAMPED_FLOAT_TO_CHAN(rFog, ctx->Fog.Color[RCOMP]);

+	UNCLAMPED_FLOAT_TO_CHAN(gFog, ctx->Fog.Color[GCOMP]);

+	UNCLAMPED_FLOAT_TO_CHAN(bFog, ctx->Fog.Color[BCOMP]);

+	fR = f * swv->color[0] + g * rFog;

+	fG = f * swv->color[1] + g * gFog;

+	fB = f * swv->color[2] + g * bFog;

+	return D3DCOLOR_RGBA(fR, fG, fB, swv->color[3]);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_ResetLineStipple_DX9(

+	struct gl_context *ctx)

+{

+	// TODO: Fake stipple with a 32x32 texture.

+}

+

+//---------------------------------------------------------------------------

+// 2D (post-transformed) primitives

+//---------------------------------------------------------------------------

+

+void gld_Points2D_DX9(

+	struct gl_context *ctx,

+	GLuint first,

+	GLuint last)

+{

+	GLD_SETUP_2D_VARS_POINTS;

+

+	unsigned				i;

+	struct vertex_buffer	*VB = &TNL_CONTEXT(ctx)->vb;

+

+	// _Size is already clamped to MaxPointSize and MinPointSize

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_POINTSIZE, *((DWORD*)&ctx->Point._Size));

+

+	if (VB->Elts) {

+		for (i=first; i<last; i++, pV++) {

+			if (VB->ClipMask[VB->Elts[i]] == 0) {

+//				_swrast_Point( ctx, &verts[VB->Elts[i]] );

+				GLD_SETUP_GET_SWVERT(VB->Elts[i]);

+				GLD_SETUP_2D_VERTEX;

+				GLD_SETUP_SMOOTH_COLOUR;

+				GLD_SETUP_DEPTH;

+				GLD_SETUP_SPECULAR;

+				GLD_SETUP_TEX0;

+				GLD_SETUP_TEX1;

+			}

+		}

+	} else {

+		GLD_SETUP_GET_SWVERT(first);

+		for (i=first; i<last; i++, swv++, pV++) {

+			if (VB->ClipMask[i] == 0) {

+//				_swrast_Point( ctx, &verts[i] );

+				GLD_SETUP_2D_VERTEX;

+				GLD_SETUP_SMOOTH_COLOUR;

+				GLD_SETUP_DEPTH;

+				GLD_SETUP_SPECULAR;

+				GLD_SETUP_TEX0;

+				GLD_SETUP_TEX1;

+			}

+		}

+	}

+

+	gld->PB2d.pPoints = (BYTE*)pV;

+	gld->PB2d.nPoints += (last-first);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Line2DFlat_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1)

+{

+	GLD_SETUP_2D_VARS_LINES;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_GET_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_GET_FLAT_SPECULAR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	gld->PB2d.pLines = (BYTE*)pV;

+	gld->PB2d.nLines++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Line2DSmooth_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1)

+{

+	GLD_SETUP_2D_VARS_LINES;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_SPECULAR;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_SPECULAR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	gld->PB2d.pLines = (BYTE*)pV;

+	gld->PB2d.nLines++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle2DFlat_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_GET_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle2DSmooth_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2)

+{

+

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle2DFlatExtras_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_TWOSIDED_LIGHTING(v2);

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	if (bFog)

+		GLD_SETUP_GET_FLAT_FOG_COLOUR;

+	else

+		GLD_SETUP_GET_FLAT_COLOUR;

+	GLD_SETUP_GET_FLAT_SPECULAR;

+	GLD_SETUP_GET_FLAT_LIGHTING(v2);

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle2DSmoothExtras_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_TWOSIDED_LIGHTING(v0);

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v0);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v1);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v2);

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad2DFlat_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2,

+	GLuint v3)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_GET_SWVERT(v3);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_GET_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v3);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad2DSmooth_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2,

+	GLuint v3)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v3);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_SMOOTH_COLOUR;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad2DFlatExtras_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2,

+	GLuint v3)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_TWOSIDED_LIGHTING(v3);

+

+	GLD_SETUP_GET_SWVERT(v3);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	if (bFog)

+		GLD_SETUP_GET_FLAT_FOG_COLOUR;

+	else

+		GLD_SETUP_GET_FLAT_COLOUR;

+	GLD_SETUP_GET_FLAT_SPECULAR;

+	GLD_SETUP_GET_FLAT_LIGHTING(v3);

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v3);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_USE_FLAT_COLOUR;

+	GLD_SETUP_USE_FLAT_SPECULAR;

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad2DSmoothExtras_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2,

+	GLuint v3)

+{

+	GLD_SETUP_2D_VARS_TRIANGLES;

+

+	GLD_SETUP_TWOSIDED_LIGHTING(v0);

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v0);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v1);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v1);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v2);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v2);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v2);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v3);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v3);

+	pV++;

+

+	GLD_SETUP_GET_SWVERT(v0);

+	GLD_SETUP_2D_VERTEX;

+	GLD_SETUP_DEPTH;

+	GLD_SETUP_TEX0;

+	GLD_SETUP_TEX1;

+	GLD_SETUP_LIGHTING(v0);

+	pV++;

+

+	gld->PB2d.pTriangles = (BYTE*)pV;

+	gld->PB2d.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+// 3D (pre-transformed) primitives

+//---------------------------------------------------------------------------

+

+void gld_Points3D_DX9(

+	struct gl_context *ctx,

+	GLuint first,

+	GLuint last)

+{

+	GLD_SETUP_3D_VARS_POINTS

+

+	unsigned				i;

+//	struct vertex_buffer	*VB = &TNL_CONTEXT(ctx)->vb;

+

+	// _Size is already clamped to MaxPointSize and MinPointSize

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_POINTSIZE, *((DWORD*)&ctx->Point._Size));

+

+	if (VB->Elts) {

+		for (i=first; i<last; i++, pV++) {

+			if (VB->ClipMask[VB->Elts[i]] == 0) {

+//				_swrast_Point( ctx, &verts[VB->Elts[i]] );

+//				GLD_SETUP_GET_SWVERT(VB->Elts[i]);

+				GLD_SETUP_3D_VERTEX(VB->Elts[i])

+				GLD_SETUP_SMOOTH_COLOUR_3D(i)

+				GLD_SETUP_TEX0_3D(i)

+				GLD_SETUP_TEX1_3D(i)

+			}

+		}

+	} else {

+//		GLD_SETUP_GET_SWVERT(first);

+		for (i=first; i<last; i++, pV++) {

+			if (VB->ClipMask[i] == 0) {

+//				_swrast_Point( ctx, &verts[i] );

+				GLD_SETUP_3D_VERTEX(i)

+				GLD_SETUP_SMOOTH_COLOUR_3D(i)

+				GLD_SETUP_TEX0_3D(i)

+				GLD_SETUP_TEX1_3D(i)

+			}

+		}

+	}

+/*

+	for (i=first; i<last; i++, pV++) {

+		GLD_SETUP_3D_VERTEX(i)

+		GLD_SETUP_SMOOTH_COLOUR_3D(i)

+		GLD_SETUP_TEX0_3D(i)

+		GLD_SETUP_TEX1_3D(i)

+	}

+*/

+	gld->PB3d.pPoints = (BYTE*)pV;

+	gld->PB3d.nPoints += (last-first);

+}

+

+//---------------------------------------------------------------------------

+// Line functions

+//---------------------------------------------------------------------------

+

+void gld_Line3DFlat_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1)

+{

+	GLD_SETUP_3D_VARS_LINES

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_GET_FLAT_COLOUR_3D(v1)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	pV++;

+

+	gld->PB3d.pLines = (BYTE*)pV;

+	gld->PB3d.nLines++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Line3DSmooth_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1)

+{

+	GLD_SETUP_3D_VARS_LINES

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v1)

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v0)

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	pV++;

+

+	gld->PB3d.pLines = (BYTE*)pV;

+	gld->PB3d.nLines++;

+}

+

+//---------------------------------------------------------------------------

+// Triangle functions

+//---------------------------------------------------------------------------

+

+void gld_Triangle3DFlat_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2)

+{

+	GLD_SETUP_3D_VARS_TRIANGLES

+

+	GLD_SETUP_3D_VERTEX(v2)

+	GLD_SETUP_TEX0_3D(v2)

+	GLD_SETUP_TEX1_3D(v2)

+	GLD_SETUP_GET_FLAT_COLOUR_3D(v2)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	pV++;

+

+	gld->PB3d.pTriangles = (BYTE*)pV;

+	gld->PB3d.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle3DSmooth_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2)

+{

+	GLD_SETUP_3D_VARS_TRIANGLES

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v0)

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v1)

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v2)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v2)

+	GLD_SETUP_TEX0_3D(v2)

+	GLD_SETUP_TEX1_3D(v2)

+	pV++;

+

+	gld->PB3d.pTriangles = (BYTE*)pV;

+	gld->PB3d.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+// Quad functions

+//---------------------------------------------------------------------------

+

+void gld_Quad3DFlat_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2,

+	GLuint v3)

+{

+	GLD_SETUP_3D_VARS_TRIANGLES

+

+	GLD_SETUP_3D_VERTEX(v3)

+	GLD_SETUP_GET_FLAT_COLOUR_3D(v3)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v3)

+	GLD_SETUP_TEX1_3D(v3)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v2)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v2)

+	GLD_SETUP_TEX1_3D(v2)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v3)

+	GLD_SETUP_USE_FLAT_COLOUR_3D

+	GLD_SETUP_TEX0_3D(v3)

+	GLD_SETUP_TEX1_3D(v3)

+	pV++;

+

+	gld->PB3d.pTriangles = (BYTE*)pV;

+	gld->PB3d.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad3DSmooth_DX9(

+	struct gl_context *ctx,

+	GLuint v0,

+	GLuint v1,

+	GLuint v2,

+	GLuint v3)

+{

+	GLD_SETUP_3D_VARS_TRIANGLES

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v0)

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v1)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v1)

+	GLD_SETUP_TEX0_3D(v1)

+	GLD_SETUP_TEX1_3D(v1)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v2)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v2)

+	GLD_SETUP_TEX0_3D(v2)

+	GLD_SETUP_TEX1_3D(v2)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v2)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v2)

+	GLD_SETUP_TEX0_3D(v2)

+	GLD_SETUP_TEX1_3D(v2)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v3)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v3)

+	GLD_SETUP_TEX0_3D(v3)

+	GLD_SETUP_TEX1_3D(v3)

+	pV++;

+

+	GLD_SETUP_3D_VERTEX(v0)

+	GLD_SETUP_SMOOTH_COLOUR_3D(v0)

+	GLD_SETUP_TEX0_3D(v0)

+	GLD_SETUP_TEX1_3D(v0)

+	pV++;

+

+	gld->PB3d.pTriangles = (BYTE*)pV;

+	gld->PB3d.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+// Vertex setup for two-sided-lighting vertex shader

+//---------------------------------------------------------------------------

+

+/*

+

+void gld_Points2DTwoside_DX9(struct gl_context *ctx, GLuint first, GLuint last)

+{

+	// NOTE: Two-sided lighting does not apply to Points

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Line2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1)

+{

+	// NOTE: Two-sided lighting does not apply to Lines

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Line2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1)

+{

+	// NOTE: Two-sided lighting does not apply to Lines

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)

+{

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Triangle2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+	GLD_TWOSIDED_VERTEX	*pV		= (GLD_TWOSIDED_VERTEX*)gld->PBtwosidelight.pTriangles;

+	SScontext			*ss		= SWSETUP_CONTEXT(ctx);

+	SWvertex			*swv;

+	DWORD				dwSpecularColour;

+	DWORD				dwFlatColour;

+	GLuint					facing = 0;

+	struct vertex_buffer	*VB;

+	GLchan					(*vbcolor)[4];

+	GLchan					(*vbspec)[4];

+

+	// Reciprocal of DepthMax

+	const float ooDepthMax = 1.0f / ctx->DepthMaxF; 

+

+	// 1st vert

+	swv = &ss->verts[v0];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 2nd vert

+	swv = &ss->verts[v1];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 3rd vert

+	swv = &ss->verts[v2];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	gld->PBtwosidelight.pTriangles = (BYTE*)pV;

+	gld->PBtwosidelight.nTriangles++;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad2DFlatTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+	GLD_TWOSIDED_VERTEX	*pV		= (GLD_TWOSIDED_VERTEX*)gld->PBtwosidelight.pTriangles;

+	SScontext			*ss		= SWSETUP_CONTEXT(ctx);

+	SWvertex			*swv;

+	DWORD				dwSpecularColour;

+	DWORD				dwFlatColour;

+	GLuint					facing = 0;

+	struct vertex_buffer	*VB;

+	GLchan					(*vbcolor)[4];

+	GLchan					(*vbspec)[4];

+

+	// Reciprocal of DepthMax

+	const float ooDepthMax = 1.0f / ctx->DepthMaxF; 

+

+	// 1st vert

+	swv = &ss->verts[v0];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 2nd vert

+	swv = &ss->verts[v1];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 3rd vert

+	swv = &ss->verts[v2];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 4th vert

+	swv = &ss->verts[v2];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 5th vert

+	swv = &ss->verts[v3];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 6th vert

+	swv = &ss->verts[v0];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	gld->PBtwosidelight.pTriangles = (BYTE*)pV;

+	gld->PBtwosidelight.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Quad2DSmoothTwoside_DX9(struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+	GLD_TWOSIDED_VERTEX	*pV		= (GLD_TWOSIDED_VERTEX*)gld->PBtwosidelight.pTriangles;

+	SScontext			*ss		= SWSETUP_CONTEXT(ctx);

+	SWvertex			*swv;

+	DWORD				dwSpecularColour;

+	DWORD				dwFlatColour;

+	GLuint					facing = 0;

+	struct vertex_buffer	*VB;

+	GLchan					(*vbcolor)[4];

+	GLchan					(*vbspec)[4];

+

+	// Reciprocal of DepthMax

+	const float ooDepthMax = 1.0f / ctx->DepthMaxF; 

+

+	// 1st vert

+	swv = &ss->verts[v0];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 2nd vert

+	swv = &ss->verts[v1];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 3rd vert

+	swv = &ss->verts[v2];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 4th vert

+	swv = &ss->verts[v2];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 5th vert

+	swv = &ss->verts[v3];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	// 6th vert

+	swv = &ss->verts[v0];

+	pV->Position.x = swv->win[0];

+	pV->Position.y = GLD_FLIP_Y(swv->win[1]);

+	pV->Position.z = swv->win[2] * ooDepthMax;

+	pV->Position.w = swv->win[3];

+	pV->TexUnit0.x = swv->texcoord[0][0];

+	pV->TexUnit0.y = swv->texcoord[0][1];

+	pV->TexUnit1.x = swv->texcoord[1][0];

+	pV->TexUnit1.y = swv->texcoord[1][1];

+	pV->FrontDiffuse = GLD_COLOUR;

+	pV->FrontSpecular = GLD_SPECULAR;

+	pV++;

+

+	gld->PBtwosidelight.pTriangles = (BYTE*)pV;

+	gld->PBtwosidelight.nTriangles += 2;

+}

+

+//---------------------------------------------------------------------------

+

+*/

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c
new file mode 100644
index 000000000..c3ebdc3af
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_texture_dx9.c
@@ -0,0 +1,2104 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Texture / Bitmap functions

+*

+****************************************************************************/

+

+#include "dglcontext.h"

+#include "ddlog.h"

+#include "gld_dx9.h"

+

+#include <d3dx9tex.h>

+

+#include "texformat.h"

+#include "colormac.h"

+#include "texstore.h"

+#include "image.h"

+// #include "mem.h"

+

+//---------------------------------------------------------------------------

+

+#define GLD_FLIP_HEIGHT(y,h) (gldCtx->dwHeight - (y) - (h))

+

+//---------------------------------------------------------------------------

+// 1D texture fetch

+//---------------------------------------------------------------------------

+

+#define CHAN_SRC( t, i, j, k, sz )					\

+	((GLchan *)(t)->Data + (i) * (sz))

+#define UBYTE_SRC( t, i, j, k, sz )					\

+	((GLubyte *)(t)->Data + (i) * (sz))

+#define USHORT_SRC( t, i, j, k )					\

+	((GLushort *)(t)->Data + (i))

+#define FLOAT_SRC( t, i, j, k )						\

+	((GLfloat *)(t)->Data + (i))

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_1d_texel_X8R8G8B8(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );

+   GLchan *rgba = (GLchan *)texel;

+   rgba[RCOMP] = src[2];

+   rgba[GCOMP] = src[1];

+   rgba[BCOMP] = src[0];

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_1d_texel_f_X8R8G8B8(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );

+   texel[RCOMP] = CHAN_TO_FLOAT(src[0]);

+   texel[GCOMP] = CHAN_TO_FLOAT(src[1]);

+   texel[BCOMP] = CHAN_TO_FLOAT(src[2]);

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_1d_texel_X1R5G5B5(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLchan *rgba = (GLchan *) texel; GLushort s = *src;

+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 10) & 0xf8) * 255 / 0xf8 );

+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  5) & 0xf8) * 255 / 0xf8 );

+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf8) * 255 / 0xf8 );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_1d_texel_f_X1R5G5B5(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLushort s = *src;

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >> 10) & 0xf8) * 255 / 0xf8 );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  5) & 0xf8) * 255 / 0xf8 );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s      ) & 0xf8) * 255 / 0xf8 );

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_1d_texel_X4R4G4B4(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLchan *rgba = (GLchan *) texel; GLushort s = *src;

+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) * 255 / 0xf );

+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) * 255 / 0xf );

+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) * 255 / 0xf );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_1d_texel_f_X4R4G4B4(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLushort s = *src;

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >>  8) & 0xf) * 255 / 0xf );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  4) & 0xf) * 255 / 0xf );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s      ) & 0xf) * 255 / 0xf );

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+#undef CHAN_SRC

+#undef UBYTE_SRC

+#undef USHORT_SRC

+#undef FLOAT_SRC

+

+//---------------------------------------------------------------------------

+// 2D texture fetch

+//---------------------------------------------------------------------------

+

+#define CHAN_SRC( t, i, j, k, sz )					\

+	((GLchan *)(t)->Data + ((t)->Width * (j) + (i)) * (sz))

+#define UBYTE_SRC( t, i, j, k, sz )					\

+	((GLubyte *)(t)->Data + ((t)->Width * (j) + (i)) * (sz))

+#define USHORT_SRC( t, i, j, k )					\

+	((GLushort *)(t)->Data + ((t)->Width * (j) + (i)))

+#define FLOAT_SRC( t, i, j, k )						\

+	((GLfloat *)(t)->Data + ((t)->Width * (j) + (i)))

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_2d_texel_X8R8G8B8(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );

+   GLchan *rgba = (GLchan *)texel;

+   rgba[RCOMP] = src[2];

+   rgba[GCOMP] = src[1];

+   rgba[BCOMP] = src[0];

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_2d_texel_f_X8R8G8B8(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );

+   texel[RCOMP] = CHAN_TO_FLOAT(src[0]);

+   texel[GCOMP] = CHAN_TO_FLOAT(src[1]);

+   texel[BCOMP] = CHAN_TO_FLOAT(src[2]);

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_2d_texel_X1R5G5B5(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLchan *rgba = (GLchan *) texel; GLushort s = *src;

+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 10) & 0xf8) * 255 / 0xf8 );

+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  5) & 0xf8) * 255 / 0xf8 );

+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf8) * 255 / 0xf8 );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_2d_texel_f_X1R5G5B5(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLushort s = *src;

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >> 10) & 0xf8) * 255 / 0xf8 );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  5) & 0xf8) * 255 / 0xf8 );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s      ) & 0xf8) * 255 / 0xf8 );

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_2d_texel_X4R4G4B4(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLchan *rgba = (GLchan *) texel; GLushort s = *src;

+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) * 255 / 0xf );

+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) * 255 / 0xf );

+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) * 255 / 0xf );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_2d_texel_f_X4R4G4B4(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLushort s = *src;

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >>  8) & 0xf) * 255 / 0xf );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  4) & 0xf) * 255 / 0xf );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s      ) & 0xf) * 255 / 0xf );

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+#undef CHAN_SRC

+#undef UBYTE_SRC

+#undef USHORT_SRC

+#undef FLOAT_SRC

+

+//---------------------------------------------------------------------------

+// 3D texture fetch

+//---------------------------------------------------------------------------

+

+#define CHAN_SRC( t, i, j, k, sz )					\

+	(GLchan *)(t)->Data + (((t)->Height * (k) + (j)) *		\

+				(t)->Width + (i)) * (sz)

+#define UBYTE_SRC( t, i, j, k, sz )					\

+	((GLubyte *)(t)->Data + (((t)->Height * (k) + (j)) *		\

+				 (t)->Width + (i)) * (sz))

+#define USHORT_SRC( t, i, j, k )					\

+	((GLushort *)(t)->Data + (((t)->Height * (k) + (j)) *		\

+				  (t)->Width + (i)))

+#define FLOAT_SRC( t, i, j, k )						\

+	((GLfloat *)(t)->Data + (((t)->Height * (k) + (j)) *		\

+				  (t)->Width + (i)))

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_3d_texel_X8R8G8B8(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );

+   GLchan *rgba = (GLchan *)texel;

+   rgba[RCOMP] = src[2];

+   rgba[GCOMP] = src[1];

+   rgba[BCOMP] = src[0];

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_3d_texel_f_X8R8G8B8(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLchan *src = CHAN_SRC( texImage, i, j, k, 4 );

+   texel[RCOMP] = CHAN_TO_FLOAT(src[0]);

+   texel[GCOMP] = CHAN_TO_FLOAT(src[1]);

+   texel[BCOMP] = CHAN_TO_FLOAT(src[2]);

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_3d_texel_X1R5G5B5(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLchan *rgba = (GLchan *) texel; GLushort s = *src;

+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >> 10) & 0xf8) * 255 / 0xf8 );

+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  5) & 0xf8) * 255 / 0xf8 );

+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf8) * 255 / 0xf8 );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_3d_texel_f_X1R5G5B5(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLushort s = *src;

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >> 10) & 0xf8) * 255 / 0xf8 );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  5) & 0xf8) * 255 / 0xf8 );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s      ) & 0xf8) * 255 / 0xf8 );

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_3d_texel_X4R4G4B4(

+	const struct gl_texture_image *texImage,

+	GLint i, GLint j, GLint k, GLchan *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLchan *rgba = (GLchan *) texel; GLushort s = *src;

+   rgba[RCOMP] = UBYTE_TO_CHAN( ((s >>  8) & 0xf) * 255 / 0xf );

+   rgba[GCOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) * 255 / 0xf );

+   rgba[BCOMP] = UBYTE_TO_CHAN( ((s      ) & 0xf) * 255 / 0xf );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_fetch_3d_texel_f_X4R4G4B4(

+	const struct gl_texture_image *texImage,

+    GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   const GLushort *src = USHORT_SRC( texImage, i, j, k );

+   GLushort s = *src;

+   texel[RCOMP] = UBYTE_TO_FLOAT( ((s >>  8) & 0xf) * 255 / 0xf );

+   texel[GCOMP] = UBYTE_TO_FLOAT( ((s >>  4) & 0xf) * 255 / 0xf );

+   texel[BCOMP] = UBYTE_TO_FLOAT( ((s      ) & 0xf) * 255 / 0xf );

+   texel[ACOMP] = 1.f;

+}

+

+//---------------------------------------------------------------------------

+

+#undef CHAN_SRC

+#undef UBYTE_SRC

+#undef USHORT_SRC

+#undef FLOAT_SRC

+

+//---------------------------------------------------------------------------

+// Direct3D texture formats that have no Mesa equivalent

+//---------------------------------------------------------------------------

+

+const struct gl_texture_format _gld_texformat_X8R8G8B8 = {

+   MESA_FORMAT_ARGB8888,		/* MesaFormat */

+   GL_RGBA,				/* BaseFormat */

+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */

+   8,					/* RedBits */

+   8,					/* GreenBits */

+   8,					/* BlueBits */

+   0,					/* AlphaBits */

+   0,					/* LuminanceBits */

+   0,					/* IntensityBits */

+   0,					/* IndexBits */

+   0,					/* DepthBits */

+   4,					/* TexelBytes */

+   _mesa_texstore_argb8888,			/* StoreTexImageFunc */

+   gld_fetch_1d_texel_X8R8G8B8,		/* FetchTexel1D */

+   gld_fetch_2d_texel_X8R8G8B8,		/* FetchTexel2D */

+   gld_fetch_3d_texel_X8R8G8B8,		/* FetchTexel3D */

+   gld_fetch_1d_texel_f_X8R8G8B8,		/* FetchTexel1Df */

+   gld_fetch_2d_texel_f_X8R8G8B8,		/* FetchTexel2Df */

+   gld_fetch_3d_texel_f_X8R8G8B8,		/* FetchTexel3Df */

+};

+

+const struct gl_texture_format _gld_texformat_X1R5G5B5 = {

+   MESA_FORMAT_ARGB1555,		/* MesaFormat */

+   GL_RGBA,				/* BaseFormat */

+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */

+   5,					/* RedBits */

+   5,					/* GreenBits */

+   5,					/* BlueBits */

+   0,					/* AlphaBits */

+   0,					/* LuminanceBits */

+   0,					/* IntensityBits */

+   0,					/* IndexBits */

+   0,					/* DepthBits */

+   2,					/* TexelBytes */

+   _mesa_texstore_argb1555,			/* StoreTexImageFunc */

+   gld_fetch_1d_texel_X1R5G5B5,		/* FetchTexel1D */

+   gld_fetch_2d_texel_X1R5G5B5,		/* FetchTexel2D */

+   gld_fetch_3d_texel_X1R5G5B5,		/* FetchTexel3D */

+   gld_fetch_1d_texel_f_X1R5G5B5,		/* FetchTexel1Df */

+   gld_fetch_2d_texel_f_X1R5G5B5,		/* FetchTexel2Df */

+   gld_fetch_3d_texel_f_X1R5G5B5,		/* FetchTexel3Df */

+};

+

+const struct gl_texture_format _gld_texformat_X4R4G4B4 = {

+   MESA_FORMAT_ARGB4444,		/* MesaFormat */

+   GL_RGBA,				/* BaseFormat */

+   GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */

+   4,					/* RedBits */

+   4,					/* GreenBits */

+   4,					/* BlueBits */

+   0,					/* AlphaBits */

+   0,					/* LuminanceBits */

+   0,					/* IntensityBits */

+   0,					/* IndexBits */

+   0,					/* DepthBits */

+   2,					/* TexelBytes */

+   _mesa_texstore_argb4444,			/* StoreTexImageFunc */

+   gld_fetch_1d_texel_X4R4G4B4,		/* FetchTexel1D */

+   gld_fetch_2d_texel_X4R4G4B4,		/* FetchTexel2D */

+   gld_fetch_3d_texel_X4R4G4B4,		/* FetchTexel3D */

+   gld_fetch_1d_texel_f_X4R4G4B4,		/* FetchTexel1Df */

+   gld_fetch_2d_texel_f_X4R4G4B4,		/* FetchTexel2Df */

+   gld_fetch_3d_texel_f_X4R4G4B4,		/* FetchTexel3Df */

+};

+

+//---------------------------------------------------------------------------

+// Texture unit constants

+//---------------------------------------------------------------------------

+

+// List of possible combinations of texture environments.

+// Example: GLD_TEXENV_MODULATE_RGBA means 

+//          GL_MODULATE, GL_RGBA base internal format.

+#define GLD_TEXENV_DECAL_RGB		0

+#define GLD_TEXENV_DECAL_RGBA		1

+#define GLD_TEXENV_DECAL_ALPHA		2

+#define GLD_TEXENV_REPLACE_RGB		3

+#define GLD_TEXENV_REPLACE_RGBA		4

+#define GLD_TEXENV_REPLACE_ALPHA	5

+#define GLD_TEXENV_MODULATE_RGB		6

+#define GLD_TEXENV_MODULATE_RGBA	7

+#define GLD_TEXENV_MODULATE_ALPHA	8

+#define GLD_TEXENV_BLEND_RGB		9

+#define GLD_TEXENV_BLEND_RGBA		10

+#define GLD_TEXENV_BLEND_ALPHA		11

+#define GLD_TEXENV_ADD_RGB			12

+#define GLD_TEXENV_ADD_RGBA			13

+#define GLD_TEXENV_ADD_ALPHA		14

+

+// Per-stage (i.e. per-unit) texture environment

+typedef struct {

+	DWORD			ColorArg1;	// Colour argument 1

+	D3DTEXTUREOP	ColorOp;	// Colour operation

+	DWORD			ColorArg2;	// Colour argument 2

+	DWORD			AlphaArg1;	// Alpha argument 1

+	D3DTEXTUREOP	AlphaOp;	// Alpha operation

+	DWORD			AlphaArg2;	// Alpha argument 2

+} GLD_texenv;

+

+// TODO: Do we really need to set ARG1 and ARG2 every time?

+//       They seem to always be TEXTURE and CURRENT respectively.

+

+// C = Colour out

+// A = Alpha out

+// Ct = Colour from Texture

+// Cf = Colour from fragment (diffuse)

+// At = Alpha from Texture

+// Af = Alpha from fragment (diffuse)

+// Cc = GL_TEXTURE_ENV_COLOUR (GL_BLEND)

+const GLD_texenv gldTexEnv[] = {

+	// DECAL_RGB: C=Ct, A=Af

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG1, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+	// DECAL_RGBA: C=Cf(1-At)+CtAt, A=Af

+	{D3DTA_TEXTURE, D3DTOP_BLENDTEXTUREALPHA, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+	// DECAL_ALPHA: <undefined> use DECAL_RGB

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG1, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+

+	// REPLACE_RGB: C=Ct, A=Af

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG1, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+	// REPLACE_RGBA: C=Ct, A=At

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG1, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG1, D3DTA_CURRENT},

+	// REPLACE_ALPHA: C=Cf, A=At

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG1, D3DTA_CURRENT},

+

+	// MODULATE_RGB: C=CfCt, A=Af

+	{D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+	// MODULATE_RGBA: C=CfCt, A=AfAt

+	{D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT},

+	// MODULATE_ALPHA: C=Cf, A=AfAt

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT},

+

+	// BLEND_RGB: C=Cf(1-Ct)+CcCt, A=Af

+	{D3DTA_TEXTURE, D3DTOP_LERP, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+	// BLEND_RGBA: C=Cf(1-Ct)+CcCt, A=AfAt

+	{D3DTA_TEXTURE, D3DTOP_LERP, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT},

+	// BLEND_ALPHA: C=Cf, A=AfAt

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT},

+

+	// ADD_RGB: C=Cf+Ct, A=Af

+	{D3DTA_TEXTURE, D3DTOP_ADD, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT},

+	// ADD_RGBA: C=Cf+Ct, A=AfAt

+	{D3DTA_TEXTURE, D3DTOP_ADD, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT},

+	// ADD_ALPHA: C=Cf, A=AfAt

+	{D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_CURRENT,

+	D3DTA_TEXTURE, D3DTOP_MODULATE, D3DTA_CURRENT},

+};

+

+//---------------------------------------------------------------------------

+

+D3DTEXTUREADDRESS _gldConvertWrap(

+	GLenum wrap)

+{

+	return (wrap == GL_CLAMP) ? D3DTADDRESS_CLAMP : D3DTADDRESS_WRAP;

+}

+

+//---------------------------------------------------------------------------

+

+D3DTEXTUREFILTERTYPE _gldConvertMagFilter(

+	GLenum magfilter)

+{

+	return (magfilter == GL_LINEAR) ? D3DTEXF_LINEAR : D3DTEXF_POINT;

+}

+

+//---------------------------------------------------------------------------

+

+void _gldConvertMinFilter(

+	GLenum minfilter,

+	D3DTEXTUREFILTERTYPE *min_filter,

+	D3DTEXTUREFILTERTYPE *mip_filter)

+{

+	switch (minfilter) {

+	case GL_NEAREST:

+		*min_filter = D3DTEXF_POINT;

+		*mip_filter = D3DTEXF_NONE;

+		break;

+	case GL_LINEAR:

+		*min_filter = D3DTEXF_LINEAR;

+		*mip_filter = D3DTEXF_NONE;

+		break;

+	case GL_NEAREST_MIPMAP_NEAREST:

+		*min_filter = D3DTEXF_POINT;

+		*mip_filter = D3DTEXF_POINT;

+		break;

+	case GL_LINEAR_MIPMAP_NEAREST:

+		*min_filter = D3DTEXF_LINEAR;

+		*mip_filter = D3DTEXF_POINT;

+		break;

+	case GL_NEAREST_MIPMAP_LINEAR:

+		*min_filter = D3DTEXF_POINT;

+		*mip_filter = D3DTEXF_LINEAR;

+		break;

+	case GL_LINEAR_MIPMAP_LINEAR:

+		*min_filter = D3DTEXF_LINEAR;

+		*mip_filter = D3DTEXF_LINEAR;

+		break;

+	}

+}

+

+//---------------------------------------------------------------------------

+

+D3DFORMAT _gldGLFormatToD3DFormat(

+	GLenum internalFormat)

+{

+	switch (internalFormat) {

+	case GL_INTENSITY:

+	case GL_INTENSITY4:

+	case GL_INTENSITY8:

+	case GL_INTENSITY12:

+	case GL_INTENSITY16:

+		// LUNIMANCE != INTENSITY, but D3D doesn't have I8 textures

+		return D3DFMT_L8;

+	case 1:

+	case GL_LUMINANCE:

+	case GL_LUMINANCE4:

+	case GL_LUMINANCE8:

+	case GL_LUMINANCE12:

+	case GL_LUMINANCE16:

+		return D3DFMT_L8;

+	case GL_ALPHA:

+	case GL_ALPHA4:

+	case GL_ALPHA8:

+	case GL_ALPHA12:

+	case GL_ALPHA16:

+		return D3DFMT_A8;

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

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

+		return D3DFMT_A8L8;

+	case GL_R3_G3_B2:

+		// TODO: Mesa does not support RGB332 internally

+		return D3DFMT_X4R4G4B4; //D3DFMT_R3G3B2;

+	case GL_RGB4:

+		return D3DFMT_X4R4G4B4;

+	case GL_RGB5:

+		return D3DFMT_X1R5G5B5;

+	case 3:

+	case GL_RGB:

+	case GL_RGB8:

+	case GL_RGB10:

+	case GL_RGB12:

+	case GL_RGB16:

+		return D3DFMT_R8G8B8;

+	case GL_RGBA4:

+		return D3DFMT_A4R4G4B4;

+	case 4:

+	case GL_RGBA:

+	case GL_RGBA2:

+	case GL_RGBA8:

+	case GL_RGB10_A2:

+	case GL_RGBA12:

+	case GL_RGBA16:

+		return D3DFMT_A8R8G8B8;

+	case GL_RGB5_A1:

+		return D3DFMT_A1R5G5B5;

+	}

+

+	// Return an acceptable default

+	return D3DFMT_A8R8G8B8;

+}

+

+//---------------------------------------------------------------------------

+

+GLenum _gldDecodeBaseFormat(

+	IDirect3DTexture9 *pTex)

+{

+	// Examine Direct3D texture and return base OpenGL internal texture format

+	// NOTE: We can't use any base format info from Mesa because D3D might have

+	// used a different texture format when we used D3DXCreateTexture().

+

+	// Base internal format is one of (Red Book p355):

+	//	GL_ALPHA, 

+	//	GL_LUMINANCE, 

+	//	GL_LUMINANCE_ALPHA, 

+	//	GL_INTENSITY, 

+	//	GL_RGB, 

+	//	GL_RGBA

+

+	// NOTE: INTENSITY not used (not supported by Direct3D)

+	//       LUMINANCE has same texture functions as RGB

+	//       LUMINANCE_ALPHA has same texture functions as RGBA

+

+	// TODO: cache format instead of using GetLevelDesc()

+	D3DSURFACE_DESC desc;

+	_GLD_DX9_TEX(GetLevelDesc(pTex, 0, &desc));

+

+	switch (desc.Format) {

+    case D3DFMT_R8G8B8:

+    case D3DFMT_X8R8G8B8:

+    case D3DFMT_R5G6B5:

+    case D3DFMT_X1R5G5B5:

+    case D3DFMT_R3G3B2:

+    case D3DFMT_X4R4G4B4:

+    case D3DFMT_P8:

+    case D3DFMT_L8:

+		return GL_RGB;

+    case D3DFMT_A8R8G8B8:

+    case D3DFMT_A1R5G5B5:

+    case D3DFMT_A4R4G4B4:

+    case D3DFMT_A8R3G3B2:

+    case D3DFMT_A8P8:

+    case D3DFMT_A8L8:

+    case D3DFMT_A4L4:

+		return GL_RGBA;

+    case D3DFMT_A8:

+		return GL_ALPHA;

+	// Compressed texture formats. Need to check these...

+    case D3DFMT_DXT1:

+		return GL_RGBA;

+    case D3DFMT_DXT2:

+		return GL_RGB;

+    case D3DFMT_DXT3:

+		return GL_RGBA;

+    case D3DFMT_DXT4:

+		return GL_RGB;

+    case D3DFMT_DXT5:

+		return GL_RGBA;

+	}

+

+	// Fell through. Return arbitary default.

+	return GL_RGBA;

+}

+

+//---------------------------------------------------------------------------

+

+const struct gl_texture_format* _gldMesaFormatForD3DFormat(

+	D3DFORMAT d3dfmt)

+{

+	switch (d3dfmt) {

+	case D3DFMT_A8R8G8B8:

+		return &_mesa_texformat_argb8888;

+	case D3DFMT_R8G8B8:

+		return &_mesa_texformat_rgb888;

+	case D3DFMT_R5G6B5:

+		return &_mesa_texformat_rgb565;

+	case D3DFMT_A4R4G4B4:

+		return &_mesa_texformat_argb4444;

+	case D3DFMT_A1R5G5B5:

+		return &_mesa_texformat_argb1555;

+	case D3DFMT_A8L8:

+		return &_mesa_texformat_al88;

+	case D3DFMT_R3G3B2:

+		return &_mesa_texformat_rgb332;

+	case D3DFMT_A8:

+		return &_mesa_texformat_a8;

+	case D3DFMT_L8:

+		return &_mesa_texformat_l8;

+	case D3DFMT_X8R8G8B8:

+		return &_gld_texformat_X8R8G8B8;

+	case D3DFMT_X1R5G5B5:

+		return &_gld_texformat_X1R5G5B5;

+	case D3DFMT_X4R4G4B4:

+		return &_gld_texformat_X4R4G4B4;

+	}

+

+	// If we reach here then we've made an error somewhere else

+	// by allowing a format that is not supported.

+	assert(0);

+

+	return NULL; // Shut up compiler warning

+}

+

+//---------------------------------------------------------------------------

+// Copy* functions

+//---------------------------------------------------------------------------

+

+void gldCopyTexImage1D_DX9(

+	struct gl_context *ctx,

+	GLenum target, GLint level,

+	GLenum internalFormat,

+	GLint x, GLint y,

+	GLsizei width, GLint border )

+{

+	// TODO

+}

+

+//---------------------------------------------------------------------------

+

+void gldCopyTexImage2D_DX9(

+	struct gl_context *ctx,

+	GLenum target,

+	GLint level,

+	GLenum internalFormat,

+	GLint x,

+	GLint y,

+	GLsizei width,

+	GLsizei height,

+	GLint border)

+{

+	// TODO

+}

+

+//---------------------------------------------------------------------------

+

+void gldCopyTexSubImage1D_DX9(

+	struct gl_context *ctx,

+	GLenum target, GLint level,

+	GLint xoffset, GLint x, GLint y, GLsizei width )

+{

+	// TODO

+}

+

+//---------------------------------------------------------------------------

+

+void gldCopyTexSubImage2D_DX9(

+	struct gl_context *ctx,

+	GLenum target,

+	GLint level,

+	GLint xoffset,

+	GLint yoffset,

+	GLint x,

+	GLint y,

+	GLsizei width,

+	GLsizei height)

+{

+	// TODO

+}

+

+//---------------------------------------------------------------------------

+

+void gldCopyTexSubImage3D_DX9(

+	struct gl_context *ctx,

+	GLenum target,

+	GLint level,

+	GLint xoffset,

+	GLint yoffset,

+	GLint zoffset,

+	GLint x,

+	GLint y,

+	GLsizei width,

+	GLsizei height )

+{

+	// TODO ?

+}

+

+//---------------------------------------------------------------------------

+// Bitmap/Pixel functions

+//---------------------------------------------------------------------------

+

+#define GLD_FLIP_Y(y) (gldCtx->dwHeight - (y))

+

+#define _GLD_FVF_IMAGE	(D3DFVF_XYZRHW | D3DFVF_TEX1)

+

+typedef struct {

+	FLOAT	x, y;		// 2D raster coords

+	FLOAT	z;			// depth value

+	FLOAT	rhw;		// reciprocal homogenous W (always 1.0f)

+	FLOAT	tu, tv;		// texture coords

+} _GLD_IMAGE_VERTEX;

+

+//---------------------------------------------------------------------------

+

+HRESULT _gldDrawPixels(

+	struct gl_context *ctx,

+	BOOL bChromakey,	// Alpha test for glBitmap() images

+	GLint x,			// GL x position

+	GLint y,			// GL y position (needs flipping)

+	GLsizei width,		// Width of input image

+	GLsizei height,		// Height of input image

+	IDirect3DSurface9 *pImage)

+{

+	//

+	// Draw input image as texture implementing PixelZoom and clipping.

+	// Any fragment operations currently enabled will be used.

+	//

+

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	IDirect3DTexture9	*pTexture;

+	D3DSURFACE_DESC		d3dsd;

+	IDirect3DSurface9	*pSurface;

+	_GLD_IMAGE_VERTEX	v[4];

+	HRESULT				hr;

+

+	float				ZoomWidth, ZoomHeight;

+	float				ScaleWidth, ScaleHeight;

+

+	// Create a texture to hold image

+	hr = D3DXCreateTexture(

+		gld->pDev,

+		width, height,

+		1, // miplevels

+		0, // usage

+		D3DFMT_A8R8G8B8, // format

+		D3DPOOL_MANAGED, // pool

+		&pTexture);

+	if (FAILED(hr))

+		return hr;

+

+	hr = IDirect3DTexture9_GetSurfaceLevel(pTexture, 0, &pSurface);

+	if (FAILED(hr)) {

+		IDirect3DTexture9_Release(pTexture);

+		return hr;

+	}

+

+	// Copy image into texture

+	hr = D3DXLoadSurfaceFromSurface(

+		pSurface, NULL, NULL,	// Dest surface

+		pImage, NULL, NULL,		// Src surface

+		D3DX_FILTER_NONE,

+		0);

+	IDirect3DSurface9_Release(pSurface);

+	if (FAILED(hr)) {

+		IDirect3DTexture9_Release(pTexture);

+		return hr;

+	}

+

+	//

+	// Set up the quad like this (ascii-art ahead!)

+	//

+	// 3--2

+	// |  |

+	// 0--1

+	//

+	//

+

+	// Set depth

+	v[0].z = v[1].z = v[2].z = v[3].z = ctx->Current.RasterPos[2];

+	// Set Reciprocal Homogenous W

+	v[0].rhw = v[1].rhw = v[2].rhw = v[3].rhw = 1.0f;

+

+	// Set texcoords

+	// Examine texture size - if different to input width and height

+	// then we'll need to munge the texcoords to fit.

+	IDirect3DTexture9_GetLevelDesc(pTexture, 0, &d3dsd);

+	ScaleWidth = (float)width / (float)d3dsd.Width;

+	ScaleHeight = (float)height / (float)d3dsd.Height;

+	v[0].tu = 0.0f;			v[0].tv = 0.0f;

+	v[1].tu = ScaleWidth;	v[1].tv = 0.0f;

+	v[2].tu = ScaleWidth;	v[2].tv = ScaleHeight;

+	v[3].tu = 0.0f;			v[3].tv = ScaleHeight;

+

+	// Set raster positions

+	ZoomWidth = (float)width * ctx->Pixel.ZoomX;

+	ZoomHeight = (float)height * ctx->Pixel.ZoomY;

+

+	v[0].x = x;				v[0].y = GLD_FLIP_Y(y);

+	v[1].x = x+ZoomWidth;	v[1].y = GLD_FLIP_Y(y);

+	v[2].x = x+ZoomWidth;	v[2].y = GLD_FLIP_Y(y+ZoomHeight);

+	v[3].x = x;				v[3].y = GLD_FLIP_Y(y+ZoomHeight);

+

+	// Draw image with full HW acceleration

+	// NOTE: Be nice to use a State Block for all this state...

+	IDirect3DDevice9_SetTexture(gld->pDev, 0, pTexture);

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_CULLMODE, D3DCULL_NONE);

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_CLIPPING, TRUE);

+

+//	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_MINFILTER, D3DTEXF_POINT);

+//	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT);

+//	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT);

+//	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_ADDRESSU, D3DTADDRESS_CLAMP);

+//	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_ADDRESSV, D3DTADDRESS_CLAMP);

+	IDirect3DDevice9_SetSamplerState(gld->pDev, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT);

+	IDirect3DDevice9_SetSamplerState(gld->pDev, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT);

+	IDirect3DDevice9_SetSamplerState(gld->pDev, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT);

+	IDirect3DDevice9_SetSamplerState(gld->pDev, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);

+	IDirect3DDevice9_SetSamplerState(gld->pDev, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);

+

+	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);

+	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1);

+	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE);

+	IDirect3DDevice9_SetTextureStageState(gld->pDev, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);

+	IDirect3DDevice9_SetTextureStageState(gld->pDev, 1, D3DTSS_COLOROP, D3DTOP_DISABLE);

+	IDirect3DDevice9_SetTextureStageState(gld->pDev, 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);

+

+	IDirect3DDevice9_SetVertexShader(gld->pDev, NULL);

+	IDirect3DDevice9_SetFVF(gld->pDev, _GLD_FVF_IMAGE);

+

+	//

+	// Emulate Chromakey with an Alpha Test.

+	// [Alpha Test is more widely supported anyway]

+	//

+	if (bChromakey) {

+		// Switch on alpha testing

+		IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_ALPHATESTENABLE, TRUE);

+		// Fragment passes is alpha is greater than reference value

+		IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_ALPHAFUNC, D3DCMP_GREATER);

+		// Set alpha reference value between Bitmap alpha values of

+		// zero (transparent) and one (opaque).

+		IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_ALPHAREF, 0x7f);

+	}

+

+	IDirect3DDevice9_DrawPrimitiveUP(gld->pDev, D3DPT_TRIANGLEFAN, 2, &v, sizeof(_GLD_IMAGE_VERTEX));

+

+	// Release texture

+	IDirect3DDevice9_SetTexture(gld->pDev, 0, NULL);

+	IDirect3DTexture9_Release(pTexture);

+

+	// Reset state to before we messed it up

+	FLUSH_VERTICES(ctx, _NEW_ALL);

+

+	return S_OK;

+}

+

+//---------------------------------------------------------------------------

+

+void gld_DrawPixels_DX9(

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

+{

+	GLD_context			*gldCtx;

+	GLD_driver_dx9		*gld;

+

+	IDirect3DSurface9	*pImage;

+	HRESULT				hr;

+	D3DLOCKED_RECT		d3dLockedRect;

+

+	const struct gl_texture_format	*MesaFormat;

+

+	MesaFormat = _mesa_choose_tex_format(ctx, format, format, type);

+

+	// Mesa does not currently handle this format.

+	if (format == GL_BGR)

+		return;

+

+	gldCtx	= GLD_GET_CONTEXT(ctx);

+	gld		= GLD_GET_DX9_DRIVER(gldCtx);

+

+	hr = IDirect3DDevice9_CreateOffscreenPlainSurface(

+		gld->pDev, 

+		width,

+		height,

+		D3DFMT_A8R8G8B8,

+		D3DPOOL_SCRATCH,

+		&pImage,

+		NULL);

+	if (FAILED(hr)) {

+		return;

+	}

+

+	//

+	// Use Mesa to fill in image

+	//

+

+	// Lock all of surface 

+	hr = IDirect3DSurface9_LockRect(pImage, &d3dLockedRect, NULL, 0);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pImage);

+		return;

+	}

+

+	// unpack image, apply transfer ops and store directly in texture

+	MesaFormat->StoreImage(

+		ctx,

+		2,

+		GL_RGBA,

+		&_mesa_texformat_argb8888,

+		d3dLockedRect.pBits,

+		width, height, 1, 0, 0, 0,

+		d3dLockedRect.Pitch,

+		0, /* dstImageStride */

+		format, type, pixels, unpack);

+

+	IDirect3DSurface9_UnlockRect(pImage);

+

+	_gldDrawPixels(ctx, FALSE, x, y, width, height, pImage);

+

+	IDirect3DSurface9_Release(pImage);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_ReadPixels_DX9(

+	struct gl_context *ctx,

+	GLint x, GLint y, GLsizei width, GLsizei height,

+	GLenum format, GLenum type,

+	const struct gl_pixelstore_attrib *pack,

+	GLvoid *dest)

+{

+

+	GLD_context						*gldCtx;

+	GLD_driver_dx9					*gld;

+

+	IDirect3DSurface9				*pBackbuffer = NULL;

+	IDirect3DSurface9				*pNativeImage = NULL;

+	IDirect3DSurface9				*pCanonicalImage = NULL;

+

+	D3DSURFACE_DESC					d3dsd;

+	RECT							rcSrc; // Source rect

+	POINT							ptDst; // Dest point

+	HRESULT							hr;

+	D3DLOCKED_RECT					d3dLockedRect;

+	struct gl_pixelstore_attrib		srcPacking;

+	int								i;

+	GLint							DstRowStride;

+	const struct gl_texture_format	*MesaFormat;

+

+	switch (format) {

+	case GL_STENCIL_INDEX:

+	case GL_DEPTH_COMPONENT:

+		return;

+	}

+	

+	MesaFormat = _mesa_choose_tex_format(ctx, format, format, type);

+	DstRowStride = _mesa_image_row_stride(pack, width, format, type);

+

+	gldCtx	= GLD_GET_CONTEXT(ctx);

+	gld		= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// Get backbuffer

+	hr = IDirect3DDevice9_GetBackBuffer(

+		gld->pDev,

+		0, // First swapchain

+		0, // First backbuffer

+		D3DBACKBUFFER_TYPE_MONO,

+		&pBackbuffer);

+	if (FAILED(hr))

+		return;

+

+	// Get backbuffer description

+	hr = IDirect3DSurface9_GetDesc(pBackbuffer, &d3dsd);

+	if (FAILED(hr)) {

+		goto gld_ReadPixels_DX9_return;

+	}

+

+	// Create a surface compatible with backbuffer

+	hr = IDirect3DDevice9_CreateOffscreenPlainSurface(

+		gld->pDev, 

+		width,

+		height,

+		d3dsd.Format,

+		D3DPOOL_SCRATCH,

+		&pNativeImage,

+		NULL);

+	if (FAILED(hr)) {

+		goto gld_ReadPixels_DX9_return;

+	}

+

+	// Compute source rect and dest point

+	SetRect(&rcSrc, 0, 0, width, height);

+	OffsetRect(&rcSrc, x, GLD_FLIP_HEIGHT(y, height));

+	ptDst.x = ptDst.y = 0;

+

+	// Get source pixels.

+	//

+	// This intermediate surface ensure that we can use CopyRects()

+	// instead of relying on D3DXLoadSurfaceFromSurface(), which may

+	// try and lock the backbuffer. This way seems safer.

+	//

+	// CopyRects has been removed for DX9.

+	//

+/*	hr = IDirect3DDevice9_CopyRects(

+		gld->pDev,

+		pBackbuffer,

+		&rcSrc,

+		1,

+		pNativeImage,

+		&ptDst);*/

+	hr = D3DXLoadSurfaceFromSurface(

+			pNativeImage,		// Dest surface

+			NULL,				// Dest palette

+			&rcSrc,				// Dest rect

+			pBackbuffer,		// Src surface

+			NULL,				// Src palette

+			&rcSrc,				// Src rect

+			D3DX_FILTER_NONE,	// Filter

+			0					// Colorkey (0=no colorkey)

+		);

+	if (FAILED(hr)) {

+		goto gld_ReadPixels_DX9_return;

+	}

+

+	// Create an RGBA8888 surface

+	hr = IDirect3DDevice9_CreateOffscreenPlainSurface(

+		gld->pDev, 

+		width,

+		height,

+		D3DFMT_A8R8G8B8,

+		D3DPOOL_SCRATCH,

+		&pCanonicalImage,

+		NULL);

+	if (FAILED(hr)) {

+		goto gld_ReadPixels_DX9_return;

+	}

+

+	// Convert to RGBA8888

+	hr = D3DXLoadSurfaceFromSurface(

+		pCanonicalImage,	// Dest surface

+		NULL, NULL,			// Dest palette, RECT

+		pNativeImage,		// Src surface

+		NULL, NULL,			// Src palette, RECT

+		D3DX_FILTER_NONE,	// Filter

+		0);					// Colourkey

+	if (FAILED(hr)) {

+		goto gld_ReadPixels_DX9_return;

+	}

+

+	srcPacking.Alignment	= 1;

+	srcPacking.ImageHeight	= height;

+	srcPacking.LsbFirst		= GL_FALSE;

+	srcPacking.RowLength	= 0;

+	srcPacking.SkipImages	= 0;

+	srcPacking.SkipPixels	= 0;

+	srcPacking.SkipRows		= 0;

+	srcPacking.SwapBytes	= GL_FALSE;

+

+	// Lock all of image

+	hr = IDirect3DSurface9_LockRect(pCanonicalImage, &d3dLockedRect, NULL, 0);

+	if (FAILED(hr)) {

+		goto gld_ReadPixels_DX9_return;

+	}

+

+	// We need to flip the data. Yuck.

+	// Perhaps Mesa has a span packer we can use in future...

+	for (i=0; i<height; i++) {

+		BYTE *pDestRow = (BYTE*)_mesa_image_address(2,pack, dest, width, height, format, type, 0, i, 0);

+		BYTE *pSrcRow = (BYTE*)d3dLockedRect.pBits + (d3dLockedRect.Pitch * (height-i-1));

+		MesaFormat->StoreImage(

+			ctx,

+			2,

+			GL_RGBA,				// base format

+			MesaFormat,				// dst format

+			pDestRow,				// dest addr

+			width, 1, 1, 0, 0, 0,	// src x,y,z & dst offsets x,y,z

+			DstRowStride,			// dst row stride

+			0,						// dstImageStride

+			GL_BGRA,				// src format

+			GL_UNSIGNED_BYTE,		// src type

+			pSrcRow,				// src addr

+			&srcPacking);			// packing params of source image

+	}

+

+	IDirect3DSurface9_UnlockRect(pCanonicalImage);

+

+gld_ReadPixels_DX9_return:

+	SAFE_RELEASE_SURFACE9(pCanonicalImage);

+	SAFE_RELEASE_SURFACE9(pNativeImage);

+	SAFE_RELEASE_SURFACE9(pBackbuffer);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_CopyPixels_DX9(

+	struct gl_context *ctx,

+	GLint srcx,

+	GLint srcy,

+	GLsizei width,

+	GLsizei height,

+	GLint dstx,

+	GLint dsty,

+	GLenum type)

+{

+	//

+	// NOTE: Not allowed to copy vidmem to vidmem!

+	//       Therefore we use an intermediate image surface.

+	//

+

+	GLD_context			*gldCtx;

+	GLD_driver_dx9		*gld;

+

+	IDirect3DSurface9	*pBackbuffer;

+	D3DSURFACE_DESC		d3dsd;

+	IDirect3DSurface9	*pImage;

+	RECT				rcSrc; // Source rect

+	POINT				ptDst; // Dest point

+	HRESULT				hr;

+

+	// Only backbuffer

+	if (type != GL_COLOR)

+		return;

+

+	gldCtx	= GLD_GET_CONTEXT(ctx);

+	gld		= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// Get backbuffer

+	hr = IDirect3DDevice9_GetBackBuffer(

+		gld->pDev,

+		0, // First swapchain

+		0, // First backbuffer

+		D3DBACKBUFFER_TYPE_MONO,

+		&pBackbuffer);

+	if (FAILED(hr))

+		return;

+

+	// Get backbuffer description

+	hr = IDirect3DSurface9_GetDesc(pBackbuffer, &d3dsd);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pBackbuffer);

+		return;

+	}

+

+	// Create a surface compatible with backbuffer

+	hr = IDirect3DDevice9_CreateOffscreenPlainSurface(

+		gld->pDev, 

+		width,

+		height,

+		d3dsd.Format,

+		D3DPOOL_SCRATCH,

+		&pImage,

+		NULL);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pBackbuffer);

+		return;

+	}

+

+	// Compute source rect and dest point

+	SetRect(&rcSrc, 0, 0, width, height);

+	OffsetRect(&rcSrc, srcx, GLD_FLIP_HEIGHT(srcy, height));

+	ptDst.x = ptDst.y = 0;

+

+	// Get source pixels

+/*	hr = IDirect3DDevice8_CopyRects(

+		gld->pDev,

+		pBackbuffer,

+		&rcSrc,

+		1,

+		pImage,

+		&ptDst);*/

+	hr = D3DXLoadSurfaceFromSurface(

+			pImage,				// Dest surface

+			NULL,				// Dest palette

+			&rcSrc,				// Dest rect

+			pBackbuffer,		// Src surface

+			NULL,				// Src palette

+			&rcSrc,				// Src rect

+			D3DX_FILTER_NONE,	// Filter

+			0					// Colorkey (0=no colorkey)

+		);

+	IDirect3DSurface9_Release(pBackbuffer);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pImage);

+		return;

+	}

+

+	_gldDrawPixels(ctx, FALSE, dstx, dsty, width, height, pImage);

+

+	IDirect3DSurface9_Release(pImage);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_Bitmap_DX9(

+	struct gl_context *ctx,

+	GLint x,

+	GLint y,

+	GLsizei width,

+	GLsizei height,

+	const struct gl_pixelstore_attrib *unpack,

+	const GLubyte *bitmap)

+{

+	GLD_context			*gldCtx;

+	GLD_driver_dx9		*gld;

+

+	IDirect3DSurface9	*pImage;

+	HRESULT				hr;

+	D3DLOCKED_RECT		d3dLockedRect;

+	BYTE				*pTempBitmap;

+	D3DCOLOR			clBitmapOne, clBitmapZero;

+	D3DCOLOR			*pBits;

+	const GLubyte		*src;

+	int					i, j, k;

+

+	gldCtx	= GLD_GET_CONTEXT(ctx);

+	gld		= GLD_GET_DX9_DRIVER(gldCtx);

+

+	// A NULL bitmap is valid, but merely advances the raster position

+	if ((bitmap == NULL) || (width == 0) || (height == 0))

+		return;

+

+	clBitmapZero	= D3DCOLOR_RGBA(0,0,0,0); // NOTE: Alpha is Zero

+	clBitmapOne		= D3DCOLOR_COLORVALUE(

+		ctx->Current.RasterColor[0],

+		ctx->Current.RasterColor[1],

+		ctx->Current.RasterColor[2],

+		1.0f); // NOTE: Alpha is One

+

+	hr = IDirect3DDevice9_CreateOffscreenPlainSurface(

+		gld->pDev, 

+		width,

+		height,

+		D3DFMT_A8R8G8B8,

+		D3DPOOL_SCRATCH,

+		&pImage,

+		NULL);

+	if (FAILED(hr)) {

+		return;

+	}

+

+	// Lock all of surface 

+	hr = IDirect3DSurface9_LockRect(pImage, &d3dLockedRect, NULL, 0);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pImage);

+		return;

+	}

+

+	pTempBitmap = _mesa_unpack_bitmap(width, height, bitmap, unpack);

+	if (pTempBitmap == NULL) {

+		IDirect3DSurface9_Release(pImage);

+		return;

+	}

+

+	pBits = (D3DCOLOR*)d3dLockedRect.pBits;

+

+	for (i=0; i<height; i++) {

+		GLubyte byte;

+		pBits = (D3DCOLOR*)((BYTE*)d3dLockedRect.pBits + (i*d3dLockedRect.Pitch));

+		src = (const GLubyte *) _mesa_image_address(2,

+			&ctx->DefaultPacking, pTempBitmap, width, height, GL_COLOR_INDEX, GL_BITMAP,

+			0, i, 0);

+		for (j=0; j<(width>>3); j++) {

+			byte = *src++;

+			for (k=0; k<8; k++) {

+				*pBits++ = (byte & 128) ? clBitmapOne : clBitmapZero;

+				byte <<= 1;

+			}

+		}

+		// Fill remaining bits from bitmap

+		if (width & 7) {

+			byte = *src;

+			for (k=0; k<(width & 7); k++) {

+				*pBits++ = (byte & 128) ? clBitmapOne : clBitmapZero;

+				byte <<= 1;

+			}

+		}

+	}

+

+	FREE(pTempBitmap);

+

+/*

+	// unpack image, apply transfer ops and store directly in texture

+	texImage->TexFormat->StoreImage(

+		ctx,

+		2,

+		GL_BITMAP,

+		&_mesa_texformat_argb8888,

+		d3dLockedRect.pBits,

+		width, height, 1, 0, 0, 0,

+		d3dLockedRect.Pitch,

+		0, // dstImageStride

+		GL_BITMAP, GL_COLOR_INDEX, bitmap, unpack);

+*/

+	IDirect3DSurface9_UnlockRect(pImage);

+

+	_gldDrawPixels(ctx, TRUE, x, y, width, height, pImage);

+

+	IDirect3DSurface9_Release(pImage);

+}

+

+//---------------------------------------------------------------------------

+// Texture functions

+//---------------------------------------------------------------------------

+

+void _gldAllocateTexture(

+	struct gl_context *ctx,

+	struct gl_texture_object *tObj,

+	struct gl_texture_image *texImage)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	IDirect3DTexture9	*pTex;

+	D3DFORMAT			d3dFormat;

+

+	if (!tObj || !texImage)

+		return;

+

+	pTex = (IDirect3DTexture9*)tObj->DriverData;

+	if (pTex) {

+		// Decide whether we can keep existing D3D texture

+		// by examining top-level surface.

+		D3DSURFACE_DESC d3dsd;

+		_GLD_DX9_TEX(GetLevelDesc(pTex, 0, &d3dsd));

+		// Release existing texture if not compatible

+		if ((d3dsd.Width == texImage->Width) || 

+			(d3dsd.Height == texImage->Height))

+		{

+			return; // Keep the existing texture

+		}

+		tObj->DriverData = NULL;

+		_GLD_DX9_TEX(Release(pTex));

+	}

+

+	d3dFormat = _gldGLFormatToD3DFormat(texImage->IntFormat);

+	D3DXCreateTexture(

+		gld->pDev,

+		texImage->Width,

+		texImage->Height,

+		// TODO: Re-evaluate mipmapping

+		(glb.bUseMipmaps) ? D3DX_DEFAULT : 1,

+		0,				// Usage

+		d3dFormat,

+		D3DPOOL_MANAGED,

+		&pTex);

+	tObj->DriverData = pTex;

+}

+

+//---------------------------------------------------------------------------

+

+const struct gl_texture_format* gld_ChooseTextureFormat_DX9(

+	struct gl_context *ctx,

+	GLint internalFormat,

+	GLenum srcFormat,

+	GLenum srcType)

+{

+	// [Based on mesa_choose_tex_format()]

+	//

+	// We will choose only texture formats that are supported

+	// by Direct3D. If the hardware doesn't support a particular

+	// texture format, then the D3DX texture calls that we use

+	// will automatically use a HW supported format.

+	//

+	// The most critical aim is to reduce copying; if we can use

+	// texture-image data directly then it will be a big performance assist.

+	//

+

+	switch (internalFormat) {

+	case GL_INTENSITY:

+	case GL_INTENSITY4:

+	case GL_INTENSITY8:

+	case GL_INTENSITY12:

+	case GL_INTENSITY16:

+		return &_mesa_texformat_l8; // D3DFMT_L8

+	case 1:

+	case GL_LUMINANCE:

+	case GL_LUMINANCE4:

+	case GL_LUMINANCE8:

+	case GL_LUMINANCE12:

+	case GL_LUMINANCE16:

+		return &_mesa_texformat_l8; // D3DFMT_L8

+	case GL_ALPHA:

+	case GL_ALPHA4:

+	case GL_ALPHA8:

+	case GL_ALPHA12:

+	case GL_ALPHA16:

+		return &_mesa_texformat_a8; // D3DFMT_A8

+	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 &_mesa_texformat_rgb565; // D3DFMT_R5G6B5

+		// Mesa will convert this for us later...

+		//      return &_mesa_texformat_ci8; // D3DFMT_R5G6B5

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

+		return &_mesa_texformat_al88; // D3DFMT_A8L8

+	case GL_R3_G3_B2:

+		return &_mesa_texformat_rgb332; // D3DFMT_R3G3B2

+	case GL_RGB4:

+	case GL_RGBA4:

+	case GL_RGBA2:

+		return &_mesa_texformat_argb4444; // D3DFMT_A4R4G4B4

+	case 3:

+	case GL_RGB:

+	case GL_RGB5:

+	case GL_RGB8:

+	case GL_RGB10:

+	case GL_RGB12:

+	case GL_RGB16:

+		return &_mesa_texformat_rgb565;

+	case 4:

+	case GL_RGBA:

+	case GL_RGBA8:

+	case GL_RGB10_A2:

+	case GL_RGBA12:

+	case GL_RGBA16:

+		return &_mesa_texformat_argb8888;

+	case GL_RGB5_A1:

+		return &_mesa_texformat_argb1555;

+	default:

+		_mesa_problem(NULL, "unexpected format in fxDDChooseTextureFormat");

+		return NULL;

+   }

+}

+

+//---------------------------------------------------------------------------

+

+/*

+// Safer(?), slower version.

+void gld_TexImage2D_DX9(

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

+	struct gl_texture_image *texImage)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	IDirect3DTexture9	*pTex;

+	IDirect3DSurface9	*pSurface;

+	RECT				rcSrcRect;

+	HRESULT				hr;

+	GLint				texelBytes = 4;

+	GLvoid				*tempImage;

+

+	if (!tObj || !texImage)

+		return;

+

+	if (level == 0) {

+		_gldAllocateTexture(ctx, tObj, texImage);

+	}

+

+	pTex = (IDirect3DTexture9*)tObj->DriverData;

+	if (!pTex)

+		return; // Texture has not been created

+	if (level >= IDirect3DTexture9_GetLevelCount(pTex))

+		return; // Level does not exist

+	hr = IDirect3DTexture9_GetSurfaceLevel(pTex, level, &pSurface);

+	if (FAILED(hr))

+		return; // Surface level doesn't exist (or just a plain error)

+

+	tempImage = MALLOC(width * height * texelBytes);

+	if (!tempImage) {

+		_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");

+		IDirect3DSurface9_Release(pSurface);

+		return;

+	}

+	// unpack image, apply transfer ops and store in tempImage

+	texImage->TexFormat->StoreImage(ctx, 2, texImage->Format,

+		&_mesa_texformat_argb8888, // dest format

+		tempImage,

+		width, height, 1, 0, 0, 0,

+		width * texelBytes,

+		0, // dstImageStride

+		format, type, pixels, packing);

+

+	SetRect(&rcSrcRect, 0, 0, width, height);

+	D3DXLoadSurfaceFromMemory(

+		pSurface,

+		NULL,

+		NULL,

+		tempImage,

+		D3DFMT_A8R8G8B8,

+		width * texelBytes,

+		NULL,

+		&rcSrcRect,

+		D3DX_FILTER_NONE,

+		0);

+

+	FREE(tempImage);

+	IDirect3DSurface9_Release(pSurface);

+}

+*/

+

+//---------------------------------------------------------------------------

+

+// Faster, more efficient version.

+// Copies subimage straight to dest texture

+void gld_TexImage2D_DX9(

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

+	struct gl_texture_image *texImage)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	IDirect3DTexture9	*pTex;

+	IDirect3DSurface9	*pSurface;

+	HRESULT				hr;

+	D3DLOCKED_RECT		d3dLockedRect;

+	D3DSURFACE_DESC		d3dsd;

+

+	if (!tObj || !texImage)

+		return;

+

+	// GLQUAKE FIX

+	// Test for input alpha data with non-alpha internalformat

+	if (((internalFormat==3) || (internalFormat==GL_RGB)) && (format==GL_RGBA)) {

+		// Input format has alpha, but a non-alpha format has been requested.

+		texImage->IntFormat = GL_RGBA;

+		internalFormat = GL_RGBA;

+	}

+

+	if (level == 0) {

+		_gldAllocateTexture(ctx, tObj, texImage);

+	}

+

+	pTex = (IDirect3DTexture9*)tObj->DriverData;

+	if (!pTex)

+		return; // Texture has not been created

+	if (level >= IDirect3DTexture9_GetLevelCount(pTex))

+		return; // Level does not exist

+	hr = IDirect3DTexture9_GetSurfaceLevel(pTex, level, &pSurface);

+	if (FAILED(hr))

+		return; // Surface level doesn't exist (or just a plain error)

+

+	IDirect3DSurface9_GetDesc(pSurface, &d3dsd);

+

+	// Lock all of surface 

+	hr = IDirect3DSurface9_LockRect(pSurface, &d3dLockedRect, NULL, 0);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pSurface);

+		return;

+	}

+

+	// unpack image, apply transfer ops and store directly in texture

+	texImage->TexFormat->StoreImage(

+		ctx,

+		2,

+		texImage->Format,

+		_gldMesaFormatForD3DFormat(d3dsd.Format),

+		d3dLockedRect.pBits,

+		width, height, 1, 0, 0, 0,

+		d3dLockedRect.Pitch,

+		0, // dstImageStride

+		format, type, pixels, packing);

+

+	IDirect3DSurface9_UnlockRect(pSurface);

+	IDirect3DSurface9_Release(pSurface);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_TexImage1D_DX9(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 )

+{

+	// A 1D texture is a 2D texture with a height of zero

+	gld_TexImage2D_DX9(ctx, target, level, internalFormat, width, 1, border, format, type, pixels, packing, texObj, texImage);

+}

+

+//---------------------------------------------------------------------------

+

+/*

+void gld_TexSubImage2D( struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint yoffset,

+                          GLsizei width, GLsizei height,

+                          GLenum format, GLenum type,

+                          const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *tObj,

+                          struct gl_texture_image *texImage )

+{

+	GLD_GET_CONTEXT

+	IDirect3DTexture9	*pTex;

+	IDirect3DSurface9	*pSurface;

+	D3DFORMAT			d3dFormat;

+	HRESULT				hr;

+	GLint				texelBytes = 4;

+	GLvoid				*tempImage;

+	RECT				rcSrcRect;

+	RECT				rcDstRect;

+

+	if (!tObj || !texImage)

+		return;

+

+	pTex = (IDirect3DTexture9*)tObj->DriverData;

+	if (!pTex)

+		return; // Texture has not been created

+	if (level >= _GLD_DX9_TEX(GetLevelCount(pTex))

+		return; // Level does not exist

+	hr = _GLD_DX9_TEX(GetSurfaceLevel(pTex, level, &pSurface);

+	if (FAILED(hr))

+		return; // Surface level doesn't exist (or just a plain error)

+

+	d3dFormat = _gldGLFormatToD3DFormat(texImage->Format);

+	tempImage = MALLOC(width * height * texelBytes);

+	if (!tempImage) {

+		_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");

+		IDirect3DSurface9_Release(pSurface);

+		return;

+	}

+

+	// unpack image, apply transfer ops and store in tempImage

+	texImage->TexFormat->StoreImage(ctx, 2, texImage->Format,

+		&_mesa_texformat_argb8888, // dest format

+		tempImage,

+		width, height, 1, 0, 0, 0,

+		width * texelBytes,

+		0, // dstImageStride

+		format, type, pixels, packing);

+

+	// Source rectangle is whole of input image

+	SetRect(&rcSrcRect, 0, 0, width, height);

+

+	// Dest rectangle must be offset to dest image

+	SetRect(&rcDstRect, 0, 0, width, height);

+	OffsetRect(&rcDstRect, xoffset, yoffset);

+

+	D3DXLoadSurfaceFromMemory(

+		pSurface,

+		NULL,

+		&rcDstRect,

+		tempImage,

+		D3DFMT_A8R8G8B8,

+		width * texelBytes,

+		NULL,

+		&rcSrcRect,

+		D3DX_FILTER_NONE,

+		0);

+

+	FREE(tempImage);

+	IDirect3DSurface9_Release(pSurface);

+}

+*/

+

+//---------------------------------------------------------------------------

+

+// Faster, more efficient version.

+// Copies subimage straight to dest texture

+void gld_TexSubImage2D_DX9( struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint yoffset,

+                          GLsizei width, GLsizei height,

+                          GLenum format, GLenum type,

+                          const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *tObj,

+                          struct gl_texture_image *texImage )

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	IDirect3DTexture9	*pTex;

+	IDirect3DSurface9	*pSurface;

+	HRESULT				hr;

+	RECT				rcDstRect;

+	D3DLOCKED_RECT		d3dLockedRect;

+	D3DSURFACE_DESC		d3dsd;

+

+	if (!tObj || !texImage)

+		return;

+

+	pTex = (IDirect3DTexture9*)tObj->DriverData;

+	if (!pTex)

+		return; // Texture has not been created

+	if (level >= IDirect3DTexture9_GetLevelCount(pTex))

+		return; // Level does not exist

+	hr = IDirect3DTexture9_GetSurfaceLevel(pTex, level, &pSurface);

+	if (FAILED(hr))

+		return; // Surface level doesn't exist (or just a plain error)

+

+	IDirect3DSurface9_GetDesc(pSurface, &d3dsd);

+

+	// Dest rectangle must be offset to dest image

+	SetRect(&rcDstRect, 0, 0, width, height);

+	OffsetRect(&rcDstRect, xoffset, yoffset);

+

+	// Lock sub-rect of surface 

+	hr = IDirect3DSurface9_LockRect(pSurface, &d3dLockedRect, &rcDstRect, 0);

+	if (FAILED(hr)) {

+		IDirect3DSurface9_Release(pSurface);

+		return;

+	}

+

+	// unpack image, apply transfer ops and store directly in texture

+	texImage->TexFormat->StoreImage(ctx, 2, texImage->Format,

+		_gldMesaFormatForD3DFormat(d3dsd.Format),

+		d3dLockedRect.pBits,

+		width, height, 1,

+		0, 0, 0, // NOTE: d3dLockedRect.pBits is already offset!!!

+		d3dLockedRect.Pitch,

+		0, // dstImageStride

+		format, type, pixels, packing);

+

+

+	IDirect3DSurface9_UnlockRect(pSurface);

+	IDirect3DSurface9_Release(pSurface);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_TexSubImage1D_DX9( struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLsizei width,

+                          GLenum format, GLenum type,

+                          const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage )

+{

+	gld_TexSubImage2D_DX9(ctx, target, level, xoffset, 0, width, 1, format, type, pixels, packing, texObj, texImage);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_DeleteTexture_DX9(

+	struct gl_context *ctx,

+	struct gl_texture_object *tObj)

+{

+	GLD_context *gld = (GLD_context*)(ctx->DriverCtx);

+

+	if (tObj) {

+		IDirect3DTexture9 *pTex = (IDirect3DTexture9*)tObj->DriverData;

+		if (pTex) {

+/*			// Make sure texture is not bound to a stage before releasing it

+			for (int i=0; i<MAX_TEXTURE_UNITS; i++) {

+				if (gld->CurrentTexture[i] == pTex) {

+					gld->pDev->SetTexture(i, NULL);

+					gld->CurrentTexture[i] = NULL;

+				}

+			}*/

+			_GLD_DX9_TEX(Release(pTex));

+			tObj->DriverData = NULL;

+		}

+	}

+}

+

+//---------------------------------------------------------------------------

+

+__inline void _gldSetColorOps(

+	const GLD_driver_dx9 *gld,

+	GLuint unit,

+	DWORD ColorArg1,

+	D3DTEXTUREOP ColorOp,

+	DWORD ColorArg2)

+{

+	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_COLORARG1, ColorArg1));

+	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_COLOROP, ColorOp));

+	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_COLORARG2, ColorArg2));

+}

+

+//---------------------------------------------------------------------------

+

+__inline void _gldSetAlphaOps(

+	const GLD_driver_dx9 *gld,

+	GLuint unit,

+	DWORD AlphaArg1,

+	D3DTEXTUREOP AlphaOp,

+	DWORD AlphaArg2)

+{

+	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_ALPHAARG1, AlphaArg1));

+	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_ALPHAOP, AlphaOp));

+	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_ALPHAARG2, AlphaArg2));

+}

+

+//---------------------------------------------------------------------------

+

+void gldUpdateTextureUnit(

+	struct gl_context *ctx,

+	GLuint unit,

+	BOOL bPassThrough)

+{

+	GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	D3DTEXTUREFILTERTYPE	minfilter;

+	D3DTEXTUREFILTERTYPE	mipfilter;

+	GLenum					BaseFormat;

+	DWORD					dwColorArg0;

+	int						iTexEnv = 0;

+	GLD_texenv				*pTexenv;

+

+	// NOTE: If bPassThrough is FALSE then texture stage can be

+	// disabled otherwise it must pass-through it's current fragment.

+

+	const struct gl_texture_unit *pUnit = &ctx->Texture.Unit[unit];

+	const struct gl_texture_object *tObj = pUnit->_Current;

+

+	IDirect3DTexture9 *pTex = NULL;

+	if (tObj) {

+		pTex = (IDirect3DTexture9*)tObj->DriverData;

+	}

+

+	// Enable texturing if unit is enabled and a valid D3D texture exists

+	// Mesa 5: TEXTUREn_x altered to TEXTURE_nD_BIT

+	//if (pTex && (pUnit->Enabled & (TEXTURE0_1D | TEXTURE0_2D))) {

+	if (pTex && (pUnit->_ReallyEnabled & (TEXTURE_1D_BIT | TEXTURE_2D_BIT))) {

+		// Enable texturing

+		_GLD_DX9_DEV(SetTexture(gld->pDev, unit, pTex));

+	} else {

+		// Disable texturing, then return

+		_GLD_DX9_DEV(SetTexture(gld->pDev, unit, NULL));

+		if (bPassThrough) {

+			_gldSetColorOps(gld, unit, D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_DIFFUSE);

+			_gldSetAlphaOps(gld, unit, D3DTA_TEXTURE, D3DTOP_SELECTARG2, D3DTA_DIFFUSE);

+		} else {

+			_gldSetColorOps(gld, unit, D3DTA_TEXTURE, D3DTOP_DISABLE, D3DTA_DIFFUSE);

+			_gldSetAlphaOps(gld, unit, D3DTA_TEXTURE, D3DTOP_DISABLE, D3DTA_DIFFUSE);

+		}

+		return;

+	}

+

+	// Texture parameters

+	_gldConvertMinFilter(tObj->MinFilter, &minfilter, &mipfilter);

+//	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_MINFILTER, minfilter));

+//	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_MIPFILTER, mipfilter));

+//	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_MAGFILTER, _gldConvertMagFilter(tObj->MagFilter)));

+//	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_ADDRESSU, _gldConvertWrap(tObj->WrapS)));

+//	_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_ADDRESSV, _gldConvertWrap(tObj->WrapT)));

+	_GLD_DX9_DEV(SetSamplerState(gld->pDev, unit, D3DSAMP_MINFILTER, minfilter));

+	_GLD_DX9_DEV(SetSamplerState(gld->pDev, unit, D3DSAMP_MIPFILTER, mipfilter));

+	_GLD_DX9_DEV(SetSamplerState(gld->pDev, unit, D3DSAMP_MAGFILTER, _gldConvertMagFilter(tObj->MagFilter)));

+	_GLD_DX9_DEV(SetSamplerState(gld->pDev, unit, D3DSAMP_ADDRESSU, _gldConvertWrap(tObj->WrapS)));

+	_GLD_DX9_DEV(SetSamplerState(gld->pDev, unit, D3DSAMP_ADDRESSV, _gldConvertWrap(tObj->WrapT)));

+

+	// Texture priority

+	_GLD_DX9_TEX(SetPriority(pTex, (DWORD)(tObj->Priority*65535.0f)));

+

+	// Texture environment

+	// TODO: Examine input texture for alpha and use specific alpha/non-alpha ops.

+	//       See Page 355 of the Red Book.

+	BaseFormat = _gldDecodeBaseFormat(pTex);

+

+	switch (BaseFormat) {

+	case GL_RGB:

+		iTexEnv = 0;

+		break;

+	case GL_RGBA:

+		iTexEnv = 1;

+		break;

+	case GL_ALPHA:

+		iTexEnv = 2;

+		break;

+	}

+

+	switch (pUnit->EnvMode) {

+	case GL_DECAL:

+		iTexEnv += 0;

+		break;

+	case GL_REPLACE:

+		iTexEnv += 3;

+		break;

+	case GL_MODULATE:

+		iTexEnv += 6;

+		break;

+	case GL_BLEND:

+		// Set blend colour

+		dwColorArg0 = D3DCOLOR_COLORVALUE(pUnit->EnvColor[0], pUnit->EnvColor[1], pUnit->EnvColor[2], pUnit->EnvColor[3]);

+		_GLD_DX9_DEV(SetTextureStageState(gld->pDev, unit, D3DTSS_COLORARG0, dwColorArg0));

+		iTexEnv += 9;

+		break;

+	case GL_ADD:

+		iTexEnv += 12;

+		break;

+	}

+	pTexenv = (GLD_texenv*)&gldTexEnv[iTexEnv];

+	_gldSetColorOps(gld, unit, pTexenv->ColorArg1, pTexenv->ColorOp, pTexenv->ColorArg2);

+	_gldSetAlphaOps(gld, unit, pTexenv->AlphaArg1, pTexenv->AlphaOp, pTexenv->AlphaArg2);

+}

+

+//---------------------------------------------------------------------------

+

+void gld_NEW_TEXTURE_DX9(

+	struct gl_context *ctx)

+{

+	// TODO: Support for three (ATI Radeon) or more (nVidia GeForce3) texture units

+

+	BOOL bUnit0Enabled;

+	BOOL bUnit1Enabled;

+

+	if (!ctx)

+		return; // Sanity check

+

+	if (ctx->Const.MaxTextureUnits == 1) {

+		gldUpdateTextureUnit(ctx, 0, TRUE);

+		return;

+	}

+

+	//

+	// NOTE: THE FOLLOWING RELATES TO TWO TEXTURE UNITS, AND TWO ONLY!!

+	//

+

+	// Mesa 5: Texture Units altered

+	//bUnit0Enabled = (ctx->Texture._ReallyEnabled & (TEXTURE0_1D | TEXTURE0_2D)) ? TRUE : FALSE;

+	//bUnit1Enabled = (ctx->Texture._ReallyEnabled & (TEXTURE1_1D | TEXTURE1_2D)) ? TRUE : FALSE;

+	bUnit0Enabled = (ctx->Texture.Unit[0]._ReallyEnabled & (TEXTURE_1D_BIT | TEXTURE_2D_BIT)) ? TRUE : FALSE;

+	bUnit1Enabled = (ctx->Texture.Unit[1]._ReallyEnabled & (TEXTURE_1D_BIT | TEXTURE_2D_BIT)) ? TRUE : FALSE;

+

+	// If Unit0 is disabled and Unit1 is enabled then we must pass-though

+	gldUpdateTextureUnit(ctx, 0, (!bUnit0Enabled && bUnit1Enabled) ? TRUE : FALSE);

+	// We can always disable the last texture unit

+	gldUpdateTextureUnit(ctx, 1, FALSE);

+

+#ifdef _DEBUG

+#if 0

+	{

+		// Find out whether device supports current renderstates

+		GLD_context			*gldCtx	= GLD_GET_CONTEXT(ctx);

+		GLD_driver_dx9		*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+//		GLD_context			*gld	= GLD_GET_CONTEXT(ctx);

+

+		DWORD dwPasses;

+		_GLD_DX9_DEV(ValidateDevice(gld->pDev, &dwPasses));

+//		if (FAILED(hr)) {

+//			gldLogError(GLDLOG_ERROR, "ValidateDevice failed", hr);

+//		}

+		if (dwPasses != 1) {

+			gldLogMessage(GLDLOG_ERROR, "ValidateDevice: Can't do in one pass\n");

+		}

+	}

+#endif

+#endif

+};

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
new file mode 100644
index 000000000..28164a8de
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
@@ -0,0 +1,263 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  GLDirect fastpath pipeline stage

+*

+****************************************************************************/

+

+//---------------------------------------------------------------------------

+

+//#include "../GLDirect.h"

+//#include "../gld_log.h"

+//#include "gld_dx8.h"

+

+#include "dglcontext.h"

+#include "ddlog.h"

+#include "gld_dx9.h"

+

+//---------------------------------------------------------------------------

+

+#include "glheader.h"

+#include "context.h"

+#include "macros.h"

+// #include "mem.h"

+#include "mtypes.h"

+//#include "mmath.h"

+

+#include "math/m_matrix.h"

+#include "math/m_xform.h"

+

+#include "tnl/t_pipeline.h"

+

+//---------------------------------------------------------------------------

+

+__inline void _gldSetVertexShaderConstants(

+	struct gl_context *ctx,

+	GLD_driver_dx9 *gld)

+{

+	D3DXMATRIX mat, matView, matProj;

+	GLfloat		*pM;

+

+	// Mesa 5: Altered to a Stack

+	//pM = ctx->ModelView.m;

+	pM = ctx->ModelviewMatrixStack.Top->m;

+	matView._11 = pM[0];

+	matView._12 = pM[1];

+	matView._13 = pM[2];

+	matView._14 = pM[3];

+	matView._21 = pM[4];

+	matView._22 = pM[5];

+	matView._23 = pM[6];

+	matView._24 = pM[7];

+	matView._31 = pM[8];

+	matView._32 = pM[9];

+	matView._33 = pM[10];

+	matView._34 = pM[11];

+	matView._41 = pM[12];

+	matView._42 = pM[13];

+	matView._43 = pM[14];

+	matView._44 = pM[15];

+

+	// Mesa 5: Altered to a Stack

+	//pM = ctx->ProjectionMatrix.m;

+	pM = ctx->ProjectionMatrixStack.Top->m;

+	matProj._11 = pM[0];

+	matProj._12 = pM[1];

+	matProj._13 = pM[2];

+	matProj._14 = pM[3];

+	matProj._21 = pM[4];

+	matProj._22 = pM[5];

+	matProj._23 = pM[6];

+	matProj._24 = pM[7];

+	matProj._31 = pM[8];

+	matProj._32 = pM[9];

+	matProj._33 = pM[10];

+	matProj._34 = pM[11];

+	matProj._41 = pM[12];

+	matProj._42 = pM[13];

+	matProj._43 = pM[14];

+	matProj._44 = pM[15];

+

+	D3DXMatrixMultiply( &mat, &matView, &matProj );

+	D3DXMatrixTranspose( &mat, &mat );

+

+	_GLD_DX9_DEV(SetVertexShaderConstantF(gld->pDev, 0, (float*)&mat, 4));

+}

+

+//---------------------------------------------------------------------------

+

+static GLboolean gld_d3d_render_stage_run(

+	struct gl_context *ctx,

+	struct tnl_pipeline_stage *stage)

+{

+	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9			*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+

+	TNLcontext				*tnl;

+	struct vertex_buffer	*VB;

+	tnl_render_func				*tab;

+	GLint					pass;

+	GLD_pb_dx9				*gldPB = &gld->PB3d;

+/*

+	static int count = 0;

+	count++;

+	if (count != 2)

+		return GL_FALSE;

+*/

+	// The "check" function should disable this stage,

+	// but we'll test gld->bUseMesaTnL anyway.

+	if (gld->bUseMesaTnL) {

+		// Do nothing in this stage, but continue pipeline

+		return GL_TRUE;

+	}

+	

+	tnl = TNL_CONTEXT(ctx);

+	VB = &tnl->vb;

+	pass = 0;

+

+   tnl->Driver.Render.Start( ctx );

+

+#if 0

+   // For debugging: Useful to see if an app passes colour data in

+   // an unusual format.

+   switch (VB->AttribPtr[_TNL_ATTRIB_COLOR0]->Type) {

+   case GL_FLOAT:

+	   ddlogMessage(GLDLOG_SYSTEM, "ColorPtr: GL_FLOAT\n");

+	   break;

+   case GL_UNSIGNED_BYTE:

+	   ddlogMessage(GLDLOG_SYSTEM, "ColorPtr: GL_UNSIGNED_BYTE\n");

+	   break;

+   default:

+	   ddlogMessage(GLDLOG_SYSTEM, "ColorPtr: *?*\n");

+	   break;

+   }

+#endif

+

+   tnl->Driver.Render.Points		= gld_Points3D_DX9;

+   if (ctx->_TriangleCaps & DD_FLATSHADE) {

+	   tnl->Driver.Render.Line		= gld_Line3DFlat_DX9;

+	   tnl->Driver.Render.Triangle	= gld_Triangle3DFlat_DX9;

+	   tnl->Driver.Render.Quad		= gld_Quad3DFlat_DX9;

+   } else {

+	   tnl->Driver.Render.Line		= gld_Line3DSmooth_DX9;

+	   tnl->Driver.Render.Triangle	= gld_Triangle3DSmooth_DX9;

+	   tnl->Driver.Render.Quad		= gld_Quad3DSmooth_DX9;

+   }

+

+	_GLD_DX9_VB(Lock(gldPB->pVB, 0, 0, &gldPB->pPoints, D3DLOCK_DISCARD));

+	gldPB->nPoints = gldPB->nLines = gldPB->nTriangles = 0;

+	// Allocate primitive pointers

+	// gldPB->pPoints is always first

+	gldPB->pLines		= gldPB->pPoints + (gldPB->dwStride * gldPB->iFirstLine);

+	gldPB->pTriangles	= gldPB->pPoints + (gldPB->dwStride * gldPB->iFirstTriangle);

+	

+	ASSERT(tnl->Driver.Render.BuildVertices);

+	ASSERT(tnl->Driver.Render.PrimitiveNotify);

+	ASSERT(tnl->Driver.Render.Points);

+	ASSERT(tnl->Driver.Render.Line);

+	ASSERT(tnl->Driver.Render.Triangle);

+	ASSERT(tnl->Driver.Render.Quad);

+	ASSERT(tnl->Driver.Render.ResetLineStipple);

+	ASSERT(tnl->Driver.Render.Interp);

+	ASSERT(tnl->Driver.Render.CopyPV);

+	ASSERT(tnl->Driver.Render.ClippedLine);

+	ASSERT(tnl->Driver.Render.ClippedPolygon);

+	ASSERT(tnl->Driver.Render.Finish);

+

+	tab = (VB->Elts ? tnl->Driver.Render.PrimTabElts : tnl->Driver.Render.PrimTabVerts);

+	

+	do {

+		GLuint i, length, flags = 0;

+		for (i = 0 ; !(flags & PRIM_END) ; i += length)

+		{

+			flags = VB->Primitive[i].mode;

+			length= VB->Primitive[i].count;

+			ASSERT(length || (flags & PRIM_END));

+			ASSERT((flags & PRIM_MODE_MASK) <= GL_POLYGON+1);

+			if (length)

+				tab[flags & PRIM_MODE_MASK]( ctx, i, i + length, flags );

+		}

+	} while (tnl->Driver.Render.Multipass &&

+		tnl->Driver.Render.Multipass( ctx, ++pass ));

+	

+	_GLD_DX9_VB(Unlock(gldPB->pVB));

+

+	_GLD_DX9_DEV(SetStreamSource(gld->pDev, 0, gldPB->pVB, 0, gldPB->dwStride));

+

+	_GLD_DX9_DEV(SetTransform(gld->pDev, D3DTS_PROJECTION, &gld->matProjection));

+	_GLD_DX9_DEV(SetTransform(gld->pDev, D3DTS_WORLD, &gld->matModelView));

+

+	if (gldPB->nPoints) {

+		_GLD_DX9_DEV(DrawPrimitive(gld->pDev, D3DPT_POINTLIST, 0, gldPB->nPoints));

+		gldPB->nPoints = 0;

+	}

+

+	if (gldPB->nLines) {

+		_GLD_DX9_DEV(DrawPrimitive(gld->pDev, D3DPT_LINELIST, gldPB->iFirstLine, gldPB->nLines));

+		gldPB->nLines = 0;

+	}

+

+	if (gldPB->nTriangles) {

+		_GLD_DX9_DEV(DrawPrimitive(gld->pDev, D3DPT_TRIANGLELIST, gldPB->iFirstTriangle, gldPB->nTriangles));

+		gldPB->nTriangles = 0;

+	}

+

+	return GL_FALSE;		/* finished the pipe */

+}

+

+//---------------------------------------------------------------------------

+

+static void gld_d3d_render_stage_check(

+	struct gl_context *ctx,

+	struct tnl_pipeline_stage *stage)

+{

+	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9			*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+	// Is this thread safe?

+	stage->active = (gld->bUseMesaTnL) ? GL_FALSE : GL_TRUE;

+	return;

+}

+

+

+//---------------------------------------------------------------------------

+

+const struct tnl_pipeline_stage _gld_d3d_render_stage =

+{

+   "gld_d3d_render_stage",

+   NULL,

+   NULL,

+   NULL,

+   NULL,

+   gld_d3d_render_stage_run			/* run */

+};

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
new file mode 100644
index 000000000..4023d547d
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
@@ -0,0 +1,443 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 <keithw@valinux.com>

+ */

+

+

+/*

+ * Render whole vertex buffers, including projection of vertices from

+ * clip space and clipping of primitives.

+ *

+ * This file makes calls to project vertices and to the point, line

+ * and triangle rasterizers via the function pointers:

+ *

+ *    context->Driver.Render.*

+ *

+ */

+

+

+//---------------------------------------------------------------------------

+

+#include "dglcontext.h"

+#include "ddlog.h"

+#include "gld_dx9.h"

+

+//---------------------------------------------------------------------------

+

+#include "glheader.h"

+#include "context.h"

+#include "macros.h"

+#include "mtypes.h"

+//#include "mmath.h"

+

+#include "math/m_matrix.h"

+#include "math/m_xform.h"

+

+#include "tnl/t_pipeline.h"

+

+/**********************************************************************/

+/*                        Clip single primitives                      */

+/**********************************************************************/

+

+

+#if defined(USE_IEEE)

+#define NEGATIVE(x) (GET_FLOAT_BITS(x) & (1<<31))

+//#define DIFFERENT_SIGNS(x,y) ((GET_FLOAT_BITS(x) ^ GET_FLOAT_BITS(y)) & (1<<31))

+#else

+#define NEGATIVE(x) (x < 0)

+//#define DIFFERENT_SIGNS(x,y) (x * y <= 0 && x - y != 0)

+/* Could just use (x*y<0) except for the flatshading requirements.

+ * Maybe there's a better way?

+ */

+#endif

+

+

+#define W(i) coord[i][3]

+#define Z(i) coord[i][2]

+#define Y(i) coord[i][1]

+#define X(i) coord[i][0]

+#define SIZE 4

+#define TAG(x) x##_4

+#include "tnl/t_vb_cliptmp.h"

+

+

+

+/**********************************************************************/

+/*              Clip and render whole begin/end objects               */

+/**********************************************************************/

+

+#define NEED_EDGEFLAG_SETUP (ctx->_TriangleCaps & DD_TRI_UNFILLED)

+#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]

+#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val

+

+

+/* Vertices, with the possibility of clipping.

+ */

+#define RENDER_POINTS( start, count ) \

+   tnl->Driver.Render.Points( ctx, start, count )

+

+#define RENDER_LINE( v1, v2 )			\

+do {						\

+   GLubyte c1 = mask[v1], c2 = mask[v2];	\

+   GLubyte ormask = c1|c2;			\

+   if (!ormask)					\

+      LineFunc( ctx, v1, v2 );			\

+   else if (!(c1 & c2 & 0x3f))			\

+      clip_line_4( ctx, v1, v2, ormask );	\

+} while (0)

+

+#define RENDER_TRI( v1, v2, v3 )			\

+do {							\

+   GLubyte c1 = mask[v1], c2 = mask[v2], c3 = mask[v3];	\

+   GLubyte ormask = c1|c2|c3;				\

+   if (!ormask)						\

+      TriangleFunc( ctx, v1, v2, v3 );			\

+   else if (!(c1 & c2 & c3 & 0x3f)) 			\

+      clip_tri_4( ctx, v1, v2, v3, ormask );    	\

+} while (0)

+

+#define RENDER_QUAD( v1, v2, v3, v4 )			\

+do {							\

+   GLubyte c1 = mask[v1], c2 = mask[v2];		\

+   GLubyte c3 = mask[v3], c4 = mask[v4];		\

+   GLubyte ormask = c1|c2|c3|c4;			\

+   if (!ormask)						\

+      QuadFunc( ctx, v1, v2, v3, v4 );			\

+   else if (!(c1 & c2 & c3 & c4 & 0x3f)) 		\

+      clip_quad_4( ctx, v1, v2, v3, v4, ormask );	\

+} while (0)

+

+

+#define LOCAL_VARS						\

+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\

+   struct vertex_buffer *VB = &tnl->vb;				\

+   const GLuint * const elt = VB->Elts;				\

+   const GLubyte *mask = VB->ClipMask;				\

+   const GLuint sz = VB->ClipPtr->size;				\

+   const tnl_line_func LineFunc = tnl->Driver.Render.Line;		\

+   const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\

+   const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;		\

+   const GLboolean stipple = ctx->Line.StippleFlag;		\

+   (void) (LineFunc && TriangleFunc && QuadFunc);		\

+   (void) elt; (void) mask; (void) sz; (void) stipple;

+

+#define TAG(x) clip_##x##_verts

+#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )

+#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )

+#define PRESERVE_VB_DEFS

+#include "tnl/t_vb_rendertmp.h"

+

+

+

+/* Elts, with the possibility of clipping.

+ */

+#undef ELT

+#undef TAG

+#define ELT(x) elt[x]

+#define TAG(x) clip_##x##_elts

+#include "tnl/t_vb_rendertmp.h"

+

+/* TODO: do this for all primitives, verts and elts:

+ */

+static void clip_elt_triangles( struct gl_context *ctx,

+				GLuint start,

+				GLuint count,

+				GLuint flags )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl_render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];

+   struct vertex_buffer *VB = &tnl->vb;

+   const GLuint * const elt = VB->Elts;

+   GLubyte *mask = VB->ClipMask;

+   GLuint last = count-2;

+   GLuint j;

+   (void) flags;

+

+   tnl->Driver.Render.PrimitiveNotify( ctx, GL_TRIANGLES );

+

+   for (j=start; j < last; j+=3 ) {

+      GLubyte c1 = mask[elt[j]];

+      GLubyte c2 = mask[elt[j+1]];

+      GLubyte c3 = mask[elt[j+2]];

+      GLubyte ormask = c1|c2|c3;

+      if (ormask) {

+	 if (start < j)

+	    render_tris( ctx, start, j, 0 );

+	 if (!(c1&c2&c3&0x3f))

+	    clip_tri_4( ctx, elt[j], elt[j+1], elt[j+2], ormask );

+	 start = j+3;

+      }

+   }

+

+   if (start < j)

+      render_tris( ctx, start, j, 0 );

+}

+

+/**********************************************************************/

+/*                  Render whole begin/end objects                    */

+/**********************************************************************/

+

+#define NEED_EDGEFLAG_SETUP (ctx->_TriangleCaps & DD_TRI_UNFILLED)

+#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]

+#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val

+

+

+/* Vertices, no clipping.

+ */

+#define RENDER_POINTS( start, count ) \

+   tnl->Driver.Render.Points( ctx, start, count )

+

+#define RENDER_LINE( v1, v2 ) \

+   LineFunc( ctx, v1, v2 )

+

+#define RENDER_TRI( v1, v2, v3 ) \

+   TriangleFunc( ctx, v1, v2, v3 )

+

+#define RENDER_QUAD( v1, v2, v3, v4 ) \

+   QuadFunc( ctx, v1, v2, v3, v4 )

+

+#define TAG(x) _gld_tnl_##x##_verts

+

+#define LOCAL_VARS						\

+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\

+   struct vertex_buffer *VB = &tnl->vb;				\

+   const GLuint * const elt = VB->Elts;				\

+   const tnl_line_func LineFunc = tnl->Driver.Render.Line;		\

+   const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\

+   const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;		\

+   (void) (LineFunc && TriangleFunc && QuadFunc);		\

+   (void) elt;

+

+#define RESET_STIPPLE tnl->Driver.Render.ResetLineStipple( ctx )

+#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )

+#define RENDER_TAB_QUALIFIER

+#define PRESERVE_VB_DEFS

+#include "tnl/t_vb_rendertmp.h"

+

+

+/* Elts, no clipping.

+ */

+#undef ELT

+#define TAG(x) _gld_tnl_##x##_elts

+#define ELT(x) elt[x]

+#include "tnl/t_vb_rendertmp.h"

+

+

+/**********************************************************************/

+/*              Helper functions for drivers                  */

+/**********************************************************************/

+/*

+void _tnl_RenderClippedPolygon( struct gl_context *ctx, const GLuint *elts, GLuint n )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLuint *tmp = VB->Elts;

+

+   VB->Elts = (GLuint *)elts;

+   tnl->Driver.Render.PrimTabElts[GL_POLYGON]( ctx, 0, n, PRIM_BEGIN|PRIM_END );

+   VB->Elts = tmp;

+}

+

+void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl->Driver.Render.Line( ctx, ii, jj );

+}

+*/

+

+

+/**********************************************************************/

+/*              Clip and render whole vertex buffers                  */

+/**********************************************************************/

+

+tnl_points_func _gldSetupPoints[4] = {

+	gld_Points2D_DX9,

+	gld_Points2D_DX9,

+	gld_Points2D_DX9,

+	gld_Points2D_DX9

+};

+tnl_line_func _gldSetupLine[4] = {

+	gld_Line2DFlat_DX9,

+	gld_Line2DSmooth_DX9,

+	gld_Line2DFlat_DX9,

+	gld_Line2DSmooth_DX9,

+};

+tnl_triangle_func _gldSetupTriangle[4] = {

+	gld_Triangle2DFlat_DX9,

+	gld_Triangle2DSmooth_DX9,

+	gld_Triangle2DFlatExtras_DX9,

+	gld_Triangle2DSmoothExtras_DX9

+};

+tnl_quad_func _gldSetupQuad[4] = {

+	gld_Quad2DFlat_DX9,

+	gld_Quad2DSmooth_DX9,

+	gld_Quad2DFlatExtras_DX9,

+	gld_Quad2DSmoothExtras_DX9

+};

+

+//---------------------------------------------------------------------------

+

+static GLboolean _gld_mesa_render_stage_run(

+	struct gl_context *ctx,

+	struct tnl_pipeline_stage *stage)

+{

+	GLD_context				*gldCtx	= GLD_GET_CONTEXT(ctx);

+	GLD_driver_dx9			*gld	= GLD_GET_DX9_DRIVER(gldCtx);

+		

+	TNLcontext				*tnl = TNL_CONTEXT(ctx);

+	struct vertex_buffer	*VB = &tnl->vb;

+	tnl_render_func				*tab;

+	GLint					pass = 0;

+	GLD_pb_dx9				*gldPB;

+

+	/* Allow the drivers to lock before projected verts are built so

+    * that window coordinates are guarenteed not to change before

+    * rendering.

+    */

+	ASSERT(tnl->Driver.Render.Start);

+	

+	tnl->Driver.Render.Start( ctx );

+	

+	// NOTE: Setting D3DRS_SOFTWAREVERTEXPROCESSING for a mixed-mode device resets

+	//       stream, indices and shader to default values of NULL or 0.

+/*	if ((ctx->_TriangleCaps & DD_TRI_LIGHT_TWOSIDE) &&

+		gld->VStwosidelight.hShader &&

+		!ctx->Fog.Enabled)

+	{

+		IDirect3DDevice8_SetRenderState(gld->pDev, D3DRS_SOFTWAREVERTEXPROCESSING, !gld->VStwosidelight.bHardware);

+		_GLD_DX9_DEV(SetVertexShader(gld->pDev, gld->VStwosidelight.hShader));

+		gldPB = &gld->PBtwosidelight;

+		tnl->Driver.Render.Points	= gld_Points2DTwoside_DX9;

+		if (ctx->_TriangleCaps & DD_FLATSHADE) {

+			tnl->Driver.Render.Line		= gld_Line2DFlatTwoside_DX9;

+			tnl->Driver.Render.Triangle	= gld_Triangle2DFlatTwoside_DX9;

+			tnl->Driver.Render.Quad		= gld_Quad2DFlatTwoside_DX9;

+		} else {

+			tnl->Driver.Render.Line		= gld_Line2DSmoothTwoside_DX9;

+			tnl->Driver.Render.Triangle	= gld_Triangle2DSmoothTwoside_DX9;

+			tnl->Driver.Render.Quad		= gld_Quad2DSmoothTwoside_DX9;

+		}

+	} else {*/

+//		IDirect3DDevice8_SetRenderState(gld->pDev, D3DRS_SOFTWAREVERTEXPROCESSING, TRUE);

+		IDirect3DDevice9_SetSoftwareVertexProcessing(gld->pDev, TRUE);

+		gldPB = &gld->PB2d;

+		_GLD_DX9_DEV(SetVertexShader(gld->pDev, NULL));

+		_GLD_DX9_DEV(SetFVF(gld->pDev, gldPB->dwFVF));

+		tnl->Driver.Render.Points	= _gldSetupPoints[gld->iSetupFunc];

+		tnl->Driver.Render.Line		= _gldSetupLine[gld->iSetupFunc];

+		tnl->Driver.Render.Triangle	= _gldSetupTriangle[gld->iSetupFunc];

+		tnl->Driver.Render.Quad		= _gldSetupQuad[gld->iSetupFunc];

+//	}

+

+	_GLD_DX9_VB(Lock(gldPB->pVB, 0, 0, &gldPB->pPoints, D3DLOCK_DISCARD));

+	gldPB->nPoints = gldPB->nLines = gldPB->nTriangles = 0;

+	// Allocate primitive pointers

+	// gldPB->pPoints is always first

+	gldPB->pLines		= gldPB->pPoints + (gldPB->dwStride * gldPB->iFirstLine);

+	gldPB->pTriangles	= gldPB->pPoints + (gldPB->dwStride * gldPB->iFirstTriangle);

+

+	ASSERT(tnl->Driver.Render.BuildVertices);

+	ASSERT(tnl->Driver.Render.PrimitiveNotify);

+	ASSERT(tnl->Driver.Render.Points);

+	ASSERT(tnl->Driver.Render.Line);

+	ASSERT(tnl->Driver.Render.Triangle);

+	ASSERT(tnl->Driver.Render.Quad);

+	ASSERT(tnl->Driver.Render.ResetLineStipple);

+	ASSERT(tnl->Driver.Render.Interp);

+	ASSERT(tnl->Driver.Render.CopyPV);

+	ASSERT(tnl->Driver.Render.ClippedLine);

+	ASSERT(tnl->Driver.Render.ClippedPolygon);

+	ASSERT(tnl->Driver.Render.Finish);

+	

+	tnl->Driver.Render.BuildVertices( ctx, 0, VB->Count, ~0 );

+	

+	if (VB->ClipOrMask) {

+		tab = VB->Elts ? clip_render_tab_elts : clip_render_tab_verts;

+		clip_render_tab_elts[GL_TRIANGLES] = clip_elt_triangles;

+	}

+	else {

+		tab = (VB->Elts ? 

+			tnl->Driver.Render.PrimTabElts : 

+		tnl->Driver.Render.PrimTabVerts);

+	}

+	

+	do {

+		GLuint i, length, flags = 0;

+		for (i = 0 ; !(flags & PRIM_END) ; i += length) {

+			flags = VB->Primitive[i].mode;

+			length= VB->Primitive[i].count;

+			ASSERT(length || (flags & PRIM_END));

+			ASSERT((flags & PRIM_MODE_MASK) <= GL_POLYGON+1);

+			if (length)

+				tab[flags & PRIM_MODE_MASK]( ctx, i, i + length, flags );

+		}

+	} while (tnl->Driver.Render.Multipass &&

+		tnl->Driver.Render.Multipass( ctx, ++pass ));

+	

+	

+//	tnl->Driver.Render.Finish( ctx );

+	

+	_GLD_DX9_VB(Unlock(gldPB->pVB));

+

+	_GLD_DX9_DEV(SetStreamSource(gld->pDev, 0, gldPB->pVB, 0, gldPB->dwStride));

+

+	if (gldPB->nPoints) {

+		_GLD_DX9_DEV(DrawPrimitive(gld->pDev, D3DPT_POINTLIST, 0, gldPB->nPoints));

+		gldPB->nPoints = 0;

+	}

+

+	if (gldPB->nLines) {

+		_GLD_DX9_DEV(DrawPrimitive(gld->pDev, D3DPT_LINELIST, gldPB->iFirstLine, gldPB->nLines));

+		gldPB->nLines = 0;

+	}

+

+	if (gldPB->nTriangles) {

+		_GLD_DX9_DEV(DrawPrimitive(gld->pDev, D3DPT_TRIANGLELIST, gldPB->iFirstTriangle, gldPB->nTriangles));

+		gldPB->nTriangles = 0;

+	}

+

+	return GL_FALSE;		/* finished the pipe */

+}

+

+

+/**********************************************************************/

+/*                          Render pipeline stage                     */

+/**********************************************************************/

+

+

+

+

+const struct tnl_pipeline_stage _gld_mesa_render_stage =

+{

+   "gld_mesa_render_stage",

+   NULL,

+   NULL,

+   NULL,

+   NULL,

+   _gld_mesa_render_stage_run	/* run */

+};

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
new file mode 100644
index 000000000..45324128a
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/dx9/gld_wgl_dx9.c
@@ -0,0 +1,1346 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  GLDirect Direct3D 8.x WGL (WindowsGL)

+*

+****************************************************************************/

+

+#include "dglcontext.h"

+#include "gld_driver.h"

+#include "gld_dxerr9.h"

+#include "gld_dx9.h"

+

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+

+// Copied from dglcontect.c

+#define GLDERR_NONE     0

+#define GLDERR_MEM      1

+#define GLDERR_DDRAW    2

+#define GLDERR_D3D      3

+#define GLDERR_BPP      4

+#define GLDERR_DDS      5

+// This external var keeps track of any error

+extern int nContextError;

+

+#define DDLOG_CRITICAL_OR_WARN	DDLOG_CRITICAL

+

+extern void _gld_mesa_warning(struct gl_context *, char *);

+extern void _gld_mesa_fatal(struct gl_context *, char *);

+

+//---------------------------------------------------------------------------

+

+static char	szColorDepthWarning[] =

+"GLDirect does not support the current desktop\n\

+color depth.\n\n\

+You may need to change the display resolution to\n\

+16 bits per pixel or higher color depth using\n\

+the Windows Display Settings control panel\n\

+before running this OpenGL application.\n";

+

+// The only depth-stencil formats currently supported by Direct3D

+// Surface Format	Depth	Stencil		Total Bits

+// D3DFMT_D32		32		-			32

+// D3DFMT_D15S1		15		1			16

+// D3DFMT_D24S8		24		8			32

+// D3DFMT_D16		16		-			16

+// D3DFMT_D24X8		24		-			32

+// D3DFMT_D24X4S4	24		4			32

+

+// This pixel format will be used as a template when compiling the list

+// of pixel formats supported by the hardware. Many fields will be

+// filled in at runtime.

+// PFD flag defaults are upgraded to match ChoosePixelFormat() -- DaveM

+static DGL_pixelFormat pfTemplateHW =

+{

+    {

+	sizeof(PIXELFORMATDESCRIPTOR),	// Size of the data structure

+		1,							// Structure version - should be 1

+									// Flags:

+		PFD_DRAW_TO_WINDOW |		// The buffer can draw to a window or device surface.

+		PFD_DRAW_TO_BITMAP |		// The buffer can draw to a bitmap. (DaveM)

+		PFD_SUPPORT_GDI |			// The buffer supports GDI drawing. (DaveM)

+		PFD_SUPPORT_OPENGL |		// The buffer supports OpenGL drawing.

+		PFD_DOUBLEBUFFER |			// The buffer is double-buffered.

+		0,							// Placeholder for easy commenting of above flags

+		PFD_TYPE_RGBA,				// Pixel type RGBA.

+		16,							// Total colour bitplanes (excluding alpha bitplanes)

+		5, 0,						// Red bits, shift

+		5, 0,						// Green bits, shift

+		5, 0,						// Blue bits, shift

+		0, 0,						// Alpha bits, shift (destination alpha)

+		0,							// Accumulator bits (total)

+		0, 0, 0, 0,					// Accumulator bits: Red, Green, Blue, Alpha

+		0,							// Depth bits

+		0,							// Stencil bits

+		0,							// Number of auxiliary buffers

+		0,							// Layer type

+		0,							// Specifies the number of overlay and underlay planes.

+		0,							// Layer mask

+		0,							// Specifies the transparent color or index of an underlay plane.

+		0							// Damage mask

+	},

+	D3DFMT_UNKNOWN,	// No depth/stencil buffer

+};

+

+//---------------------------------------------------------------------------

+// Vertex Shaders

+//---------------------------------------------------------------------------

+/*

+// Vertex Shader Declaration

+static DWORD dwTwoSidedLightingDecl[] =

+{

+	D3DVSD_STREAM(0),

+	D3DVSD_REG(0,  D3DVSDT_FLOAT3), 	 // XYZ position

+	D3DVSD_REG(1,  D3DVSDT_FLOAT3), 	 // XYZ normal

+	D3DVSD_REG(2,  D3DVSDT_D3DCOLOR),	 // Diffuse color

+	D3DVSD_REG(3,  D3DVSDT_D3DCOLOR),	 // Specular color

+	D3DVSD_REG(4,  D3DVSDT_FLOAT2), 	 // 2D texture unit 0

+	D3DVSD_REG(5,  D3DVSDT_FLOAT2), 	 // 2D texture unit 1

+	D3DVSD_END()

+};

+

+// Vertex Shader for two-sided lighting

+static char *szTwoSidedLightingVS =

+// This is a test shader!

+"vs.1.0\n"

+"m4x4 oPos,v0,c0\n"

+"mov oD0,v2\n"

+"mov oD1,v3\n"

+"mov oT0,v4\n"

+"mov oT1,v5\n"

+;

+*/

+//---------------------------------------------------------------------------

+//---------------------------------------------------------------------------

+

+typedef struct {

+	HINSTANCE			hD3D9DLL;			// Handle to d3d9.dll

+	FNDIRECT3DCREATE9	fnDirect3DCreate9;	// Direct3DCreate9 function prototype

+	BOOL				bDirect3D;			// Persistant Direct3D9 exists

+	BOOL				bDirect3DDevice;	// Persistant Direct3DDevice9 exists

+	IDirect3D9			*pD3D;				// Persistant Direct3D9

+	IDirect3DDevice9	*pDev;				// Persistant Direct3DDevice9

+} GLD_dx9_globals;

+

+// These are "global" to all DX9 contexts. KeithH

+static GLD_dx9_globals dx9Globals;

+

+//---------------------------------------------------------------------------

+//---------------------------------------------------------------------------

+

+BOOL gldGetDXErrorString_DX(

+	HRESULT hr,

+	char *buf,

+	int nBufSize)

+{

+	//

+	// Return a string describing the input HRESULT error code

+	//

+

+	const char *pStr = DXGetErrorString9(hr);

+

+	if (pStr == NULL)

+		return FALSE;

+

+	if (strlen(pStr) > nBufSize)

+		strncpy(buf, pStr, nBufSize);

+	else

+		strcpy(buf, pStr);

+

+//	D3DXGetErrorString(hr, buf, nBufSize);

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+static D3DMULTISAMPLE_TYPE _gldGetDeviceMultiSampleType(

+	IDirect3D9 *pD3D9,

+	D3DFORMAT SurfaceFormat,

+	D3DDEVTYPE d3dDevType,

+	BOOL Windowed)

+{

+	int			i;

+	HRESULT		hr;

+

+	if (glb.dwMultisample == GLDS_MULTISAMPLE_NONE)

+		return D3DMULTISAMPLE_NONE;

+

+	if (glb.dwMultisample == GLDS_MULTISAMPLE_FASTEST) {

+		// Find fastest multisample

+		for (i=2; i<17; i++) {

+			hr = IDirect3D9_CheckDeviceMultiSampleType(

+					pD3D9,

+					glb.dwAdapter,

+					d3dDevType,

+					SurfaceFormat,

+					Windowed,

+					(D3DMULTISAMPLE_TYPE)i,

+					NULL);

+			if (SUCCEEDED(hr)) {

+				return (D3DMULTISAMPLE_TYPE)i;

+			}

+		}

+	} else {

+		// Find nicest multisample

+		for (i=16; i>1; i--) {

+			hr = IDirect3D9_CheckDeviceMultiSampleType(

+					pD3D9,

+					glb.dwAdapter,

+					d3dDevType,

+					SurfaceFormat,

+					Windowed,

+					(D3DMULTISAMPLE_TYPE)i,

+					NULL);

+			if (SUCCEEDED(hr)) {

+				return (D3DMULTISAMPLE_TYPE)i;

+			}

+		}

+	}

+

+	// Nothing found - return default

+	return D3DMULTISAMPLE_NONE;

+}

+

+//---------------------------------------------------------------------------

+

+void _gldDestroyPrimitiveBuffer(

+	GLD_pb_dx9 *gldVB)

+{

+	SAFE_RELEASE(gldVB->pVB);

+

+	// Sanity check...

+	gldVB->nLines = gldVB->nPoints = gldVB->nTriangles = 0;

+}

+

+//---------------------------------------------------------------------------

+

+HRESULT _gldCreatePrimitiveBuffer(

+	struct gl_context *ctx,

+	GLD_driver_dx9 *lpCtx,

+	GLD_pb_dx9 *gldVB)

+{

+	HRESULT		hResult;

+	char		*szCreateVertexBufferFailed = "CreateVertexBuffer failed";

+	DWORD		dwMaxVertices;	// Max number of vertices in vertex buffer

+	DWORD		dwVBSize;		// Total size of vertex buffer

+

+	// If CVA (Compiled Vertex Array) is used by an OpenGL app, then we

+	// will need enough vertices to cater for Mesa::Const.MaxArrayLockSize.

+	// We'll use IMM_SIZE if it's larger (which it should not be).

+	dwMaxVertices = MAX_ARRAY_LOCK_SIZE;

+

+	// Now calculate how many vertices to allow for in total

+	// 1 per point, 2 per line, 6 per quad = 9

+	dwVBSize = dwMaxVertices * 9 * gldVB->dwStride;

+

+	hResult = IDirect3DDevice9_CreateVertexBuffer(

+		lpCtx->pDev,

+		dwVBSize,

+		gldVB->dwUsage,

+		gldVB->dwFVF,

+		gldVB->dwPool,

+		&gldVB->pVB,

+		NULL);

+	if (FAILED(hResult)) {

+		ddlogMessage(DDLOG_CRITICAL_OR_WARN, szCreateVertexBufferFailed);

+		return hResult;

+	}

+

+	gldVB->nLines = gldVB->nPoints = gldVB->nTriangles = 0;

+	gldVB->pPoints	= gldVB->pLines = gldVB->pTriangles = NULL;

+	gldVB->iFirstLine = dwMaxVertices; // Index of first line in VB

+	gldVB->iFirstTriangle = dwMaxVertices*3; // Index of first triangle in VB

+

+	return S_OK;

+}

+

+//---------------------------------------------------------------------------

+// Function: _gldCreateVertexShaders

+// Create DX9 Vertex Shaders.

+//---------------------------------------------------------------------------

+/*

+void _gldCreateVertexShaders(

+	GLD_driver_dx9 *gld)

+{

+	DWORD			dwFlags;

+	LPD3DXBUFFER	pVSOpcodeBuffer; // Vertex Shader opcode buffer

+	HRESULT			hr;

+

+#ifdef _DEBUG

+	dwFlags = D3DXASM_DEBUG;

+#else

+	dwFlags = 0; // D3DXASM_SKIPVALIDATION;

+#endif

+

+	ddlogMessage(DDLOG_INFO, "Creating shaders...\n");

+

+	// Init the shader handle

+	gld->VStwosidelight.hShader = 0;

+

+	if (gld->d3dCaps8.MaxStreams == 0) {

+		// Lame DX8 driver doesn't support streams

+		// Not fatal, as defaults will be used

+		ddlogMessage(DDLOG_WARN, "Driver doesn't support Vertex Shaders (MaxStreams==0)\n");

+		return;

+	}

+

+	// ** THIS DISABLES VERTEX SHADER SUPPORT **

+//	return;

+	// ** THIS DISABLES VERTEX SHADER SUPPORT **

+

+	//

+	// Two-sided lighting

+	//

+

+#if 0

+	//

+	// DEBUGGING: Load shader from a text file

+	//

+	{

+	LPD3DXBUFFER	pVSErrorBuffer; // Vertex Shader error buffer

+	hr = D3DXAssembleShaderFromFile(

+			"twoside.vsh",

+			dwFlags,

+			NULL, // No constants

+			&pVSOpcodeBuffer,

+			&pVSErrorBuffer);

+	if (pVSErrorBuffer && pVSErrorBuffer->lpVtbl->GetBufferPointer(pVSErrorBuffer))

+		ddlogMessage(DDLOG_INFO, pVSErrorBuffer->lpVtbl->GetBufferPointer(pVSErrorBuffer));

+	SAFE_RELEASE(pVSErrorBuffer);

+	}

+#else

+	{

+	LPD3DXBUFFER	pVSErrorBuffer; // Vertex Shader error buffer

+	// Assemble ascii shader text into shader opcodes

+	hr = D3DXAssembleShader(

+			szTwoSidedLightingVS,

+			strlen(szTwoSidedLightingVS),

+			dwFlags,

+			NULL, // No constants

+			&pVSOpcodeBuffer,

+			&pVSErrorBuffer);

+	if (pVSErrorBuffer && pVSErrorBuffer->lpVtbl->GetBufferPointer(pVSErrorBuffer))

+		ddlogMessage(DDLOG_INFO, pVSErrorBuffer->lpVtbl->GetBufferPointer(pVSErrorBuffer));

+	SAFE_RELEASE(pVSErrorBuffer);

+	}

+#endif

+	if (FAILED(hr)) {

+		ddlogError(DDLOG_WARN, "AssembleShader failed", hr);

+		SAFE_RELEASE(pVSOpcodeBuffer);

+		return;

+	}

+

+// This is for debugging. Remove to enable vertex shaders in HW

+#define _GLD_FORCE_SW_VS 0

+

+	if (_GLD_FORCE_SW_VS) {

+		// _GLD_FORCE_SW_VS should be disabled for Final Release

+		ddlogMessage(DDLOG_SYSTEM, "[Forcing shaders in SW]\n");

+	}

+

+	// Try and create shader in hardware.

+	// NOTE: The D3D Ref device appears to succeed when trying to

+	//       create the device in hardware, but later complains

+	//       when trying to set it with SetVertexShader(). Go figure.

+	if (_GLD_FORCE_SW_VS || glb.dwDriver == GLDS_DRIVER_REF) {

+		// Don't try and create a hardware shader with the Ref device

+		hr = E_FAIL; // COM error/fail result

+	} else {

+		gld->VStwosidelight.bHardware = TRUE;

+		hr = IDirect3DDevice8_CreateVertexShader(

+			gld->pDev,

+			dwTwoSidedLightingDecl,

+			pVSOpcodeBuffer->lpVtbl->GetBufferPointer(pVSOpcodeBuffer),

+			&gld->VStwosidelight.hShader,

+			0);

+	}

+	if (FAILED(hr)) {

+		ddlogMessage(DDLOG_INFO, "... HW failed, trying SW...\n");

+		// Failed. Try and create shader for software processing

+		hr = IDirect3DDevice8_CreateVertexShader(

+			gld->pDev,

+			dwTwoSidedLightingDecl,

+			pVSOpcodeBuffer->lpVtbl->GetBufferPointer(pVSOpcodeBuffer),

+			&gld->VStwosidelight.hShader,

+			D3DUSAGE_SOFTWAREPROCESSING);

+		if (FAILED(hr)) {

+			gld->VStwosidelight.hShader = 0; // Sanity check

+			ddlogError(DDLOG_WARN, "CreateVertexShader failed", hr);

+			return;

+		}

+		// Succeeded, but for software processing

+		gld->VStwosidelight.bHardware = FALSE;

+	}

+

+	SAFE_RELEASE(pVSOpcodeBuffer);

+

+	ddlogMessage(DDLOG_INFO, "... OK\n");

+}

+

+//---------------------------------------------------------------------------

+

+void _gldDestroyVertexShaders(

+	GLD_driver_dx9 *gld)

+{

+	if (gld->VStwosidelight.hShader) {

+		IDirect3DDevice8_DeleteVertexShader(gld->pDev, gld->VStwosidelight.hShader);

+		gld->VStwosidelight.hShader = 0;

+	}

+}

+*/

+//---------------------------------------------------------------------------

+

+BOOL gldCreateDrawable_DX(

+	DGL_ctx *ctx,

+//	BOOL bDefaultDriver,

+	BOOL bDirectDrawPersistant,

+	BOOL bPersistantBuffers)

+{

+	//

+	// bDirectDrawPersistant:	applies to IDirect3D9

+	// bPersistantBuffers:		applies to IDirect3DDevice9

+	//

+

+	HRESULT					hResult;

+	GLD_driver_dx9			*lpCtx = NULL;

+	D3DDEVTYPE				d3dDevType;

+	D3DPRESENT_PARAMETERS	d3dpp;

+	D3DDISPLAYMODE			d3ddm;

+	DWORD					dwBehaviourFlags;

+	D3DADAPTER_IDENTIFIER9	d3dIdent;

+

+	// Error if context is NULL.

+	if (ctx == NULL)

+		return FALSE;

+

+	if (ctx->glPriv) {

+		lpCtx = ctx->glPriv;

+		// Release any existing interfaces

+		SAFE_RELEASE(lpCtx->pDev);

+		SAFE_RELEASE(lpCtx->pD3D);

+	} else {

+		lpCtx = (GLD_driver_dx9*)malloc(sizeof(GLD_driver_dx9));

+		ZeroMemory(lpCtx, sizeof(lpCtx));

+	}

+

+	d3dDevType = (glb.dwDriver == GLDS_DRIVER_HAL) ? D3DDEVTYPE_HAL : D3DDEVTYPE_REF;

+	// TODO: Check this

+//	if (bDefaultDriver)

+//		d3dDevType = D3DDEVTYPE_REF;

+

+	// Use persistant interface if needed

+	if (bDirectDrawPersistant && dx9Globals.bDirect3D) {

+		lpCtx->pD3D = dx9Globals.pD3D;

+		IDirect3D9_AddRef(lpCtx->pD3D);

+		goto SkipDirectDrawCreate;

+	}

+

+	// Create Direct3D9 object

+	lpCtx->pD3D = dx9Globals.fnDirect3DCreate9(D3D_SDK_VERSION);

+	if (lpCtx->pD3D == NULL) {

+		MessageBox(NULL, "Unable to initialize Direct3D9", "GLDirect", MB_OK);

+		ddlogMessage(DDLOG_CRITICAL_OR_WARN, "Unable to create Direct3D9 interface");

+        nContextError = GLDERR_D3D;

+		goto return_with_error;

+	}

+

+	// Cache Direct3D interface for subsequent GLRCs

+	if (bDirectDrawPersistant && !dx9Globals.bDirect3D) {

+		dx9Globals.pD3D = lpCtx->pD3D;

+		IDirect3D9_AddRef(dx9Globals.pD3D);

+		dx9Globals.bDirect3D = TRUE;

+	}

+SkipDirectDrawCreate:

+

+	// Get the display mode so we can make a compatible backbuffer

+	hResult = IDirect3D9_GetAdapterDisplayMode(lpCtx->pD3D, glb.dwAdapter, &d3ddm);

+	if (FAILED(hResult)) {

+        nContextError = GLDERR_D3D;

+		goto return_with_error;

+	}

+

+	// Get device caps

+	hResult = IDirect3D9_GetDeviceCaps(lpCtx->pD3D, glb.dwAdapter, d3dDevType, &lpCtx->d3dCaps9);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "IDirect3D9_GetDeviceCaps failed", hResult);

+        nContextError = GLDERR_D3D;

+		goto return_with_error;

+	}

+

+	// Check for hardware transform & lighting

+	lpCtx->bHasHWTnL = lpCtx->d3dCaps9.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT ? TRUE : FALSE;

+

+/*

+	//

+	// GONE FOR DX9?

+	//

+	// If this flag is present then we can't default to Mesa

+	// SW rendering between BeginScene() and EndScene().

+	if (lpCtx->d3dCaps9.Caps2 & D3DCAPS2_NO2DDURING3DSCENE) {

+		ddlogMessage(DDLOG_WARN,

+			"Warning          : No 2D allowed during 3D scene.\n");

+	}

+*/

+

+	//

+	//	Create the Direct3D context

+	//

+

+	// Re-use original IDirect3DDevice if persistant buffers exist.

+	// Note that we test for persistant IDirect3D9 as well

+	// bDirectDrawPersistant == persistant IDirect3D9 (DirectDraw9 does not exist)

+	if (bDirectDrawPersistant && bPersistantBuffers && dx9Globals.pD3D && dx9Globals.pDev) {

+		lpCtx->pDev = dx9Globals.pDev;

+		IDirect3DDevice9_AddRef(dx9Globals.pDev);

+		goto skip_direct3ddevice_create;

+	}

+

+	// Clear the presentation parameters (sets all members to zero)

+	ZeroMemory(&d3dpp, sizeof(d3dpp));

+

+	// Recommended by MS; needed for MultiSample.

+	// Be careful if altering this for FullScreenBlit

+	d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;

+

+	d3dpp.BackBufferFormat	= d3ddm.Format;

+	d3dpp.BackBufferCount	= 2; //1;

+	d3dpp.MultiSampleType	= _gldGetDeviceMultiSampleType(lpCtx->pD3D, d3ddm.Format, d3dDevType, !ctx->bFullscreen);

+	d3dpp.AutoDepthStencilFormat	= ctx->lpPF->dwDriverData;

+	d3dpp.EnableAutoDepthStencil	= (d3dpp.AutoDepthStencilFormat == D3DFMT_UNKNOWN) ? FALSE : TRUE;

+

+	if (ctx->bFullscreen) {

+		ddlogWarnOption(FALSE); // Don't popup any messages in fullscreen

+		d3dpp.Windowed							= FALSE;

+		d3dpp.BackBufferWidth					= d3ddm.Width;

+		d3dpp.BackBufferHeight					= d3ddm.Height;

+		d3dpp.hDeviceWindow						= ctx->hWnd;

+		d3dpp.FullScreen_RefreshRateInHz		= D3DPRESENT_RATE_DEFAULT;

+

+		// Support for vertical retrace synchronisation.

+		// Set default presentation interval in case caps bits are missing

+		d3dpp.PresentationInterval	= D3DPRESENT_INTERVAL_DEFAULT;

+		if (glb.bWaitForRetrace) {

+			if (lpCtx->d3dCaps9.PresentationIntervals & D3DPRESENT_INTERVAL_ONE)

+				d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;

+		} else {

+			if (lpCtx->d3dCaps9.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE)

+				d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;

+		}

+	} else {

+		ddlogWarnOption(glb.bMessageBoxWarnings); // OK to popup messages

+		d3dpp.Windowed							= TRUE;

+		d3dpp.BackBufferWidth					= ctx->dwWidth;

+		d3dpp.BackBufferHeight					= ctx->dwHeight;

+		d3dpp.hDeviceWindow						= ctx->hWnd;

+		d3dpp.FullScreen_RefreshRateInHz		= 0;

+		// PresentationInterval Windowed mode is optional now in DX9 (DaveM)

+		d3dpp.PresentationInterval	= D3DPRESENT_INTERVAL_DEFAULT;

+		if (glb.bWaitForRetrace) {

+				d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;

+		} else {

+				d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;

+		}

+	}

+

+	// Decide if we can use hardware TnL

+	dwBehaviourFlags = (lpCtx->bHasHWTnL) ?

+		D3DCREATE_MIXED_VERTEXPROCESSING : D3DCREATE_SOFTWARE_VERTEXPROCESSING;

+	// Add flag to tell D3D to be thread-safe

+	if (glb.bMultiThreaded)

+		dwBehaviourFlags |= D3DCREATE_MULTITHREADED;

+	// Add flag to tell D3D to be FPU-safe

+	if (!glb.bFastFPU)

+		dwBehaviourFlags |= D3DCREATE_FPU_PRESERVE;

+	hResult = IDirect3D9_CreateDevice(lpCtx->pD3D,

+								glb.dwAdapter,

+								d3dDevType,

+								ctx->hWnd,

+								dwBehaviourFlags,

+								&d3dpp,

+								&lpCtx->pDev);

+    if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "IDirect3D9_CreateDevice failed", hResult);

+        nContextError = GLDERR_D3D;

+		goto return_with_error;

+	}

+

+	if (bDirectDrawPersistant && bPersistantBuffers && dx9Globals.pD3D) {

+		dx9Globals.pDev = lpCtx->pDev;

+		dx9Globals.bDirect3DDevice = TRUE;

+	}

+

+	// Dump some useful stats

+	hResult = IDirect3D9_GetAdapterIdentifier(

+		lpCtx->pD3D,

+		glb.dwAdapter,

+		0, // No WHQL detection (avoid few seconds delay)

+		&d3dIdent);

+	if (SUCCEEDED(hResult)) {

+		ddlogPrintf(DDLOG_INFO, "[Driver Description: %s]", &d3dIdent.Description);

+		ddlogPrintf(DDLOG_INFO, "[Driver file: %s %d.%d.%02d.%d]",

+			d3dIdent.Driver,

+			HIWORD(d3dIdent.DriverVersion.HighPart),

+			LOWORD(d3dIdent.DriverVersion.HighPart),

+			HIWORD(d3dIdent.DriverVersion.LowPart),

+			LOWORD(d3dIdent.DriverVersion.LowPart));

+		ddlogPrintf(DDLOG_INFO, "[VendorId: 0x%X, DeviceId: 0x%X, SubSysId: 0x%X, Revision: 0x%X]",

+			d3dIdent.VendorId, d3dIdent.DeviceId, d3dIdent.SubSysId, d3dIdent.Revision);

+	}

+

+	// Test to see if IHV driver exposes Scissor Test (new for DX9)

+	lpCtx->bCanScissor = lpCtx->d3dCaps9.RasterCaps & D3DPRASTERCAPS_SCISSORTEST;

+	ddlogPrintf(DDLOG_INFO, "Can Scissor: %s", lpCtx->bCanScissor ? "Yes" : "No");

+

+	// Init projection matrix for D3D TnL

+	D3DXMatrixIdentity(&lpCtx->matProjection);

+	lpCtx->matModelView = lpCtx->matProjection;

+//		gld->bUseMesaProjection = TRUE;

+

+skip_direct3ddevice_create:

+

+	// Create buffers to hold primitives

+	lpCtx->PB2d.dwFVF		= GLD_FVF_2D_VERTEX;

+	lpCtx->PB2d.dwPool		= D3DPOOL_SYSTEMMEM;

+	lpCtx->PB2d.dwStride	= sizeof(GLD_2D_VERTEX);

+	lpCtx->PB2d.dwUsage		= D3DUSAGE_DONOTCLIP |

+								D3DUSAGE_DYNAMIC |

+								D3DUSAGE_SOFTWAREPROCESSING |

+								D3DUSAGE_WRITEONLY;

+	hResult = _gldCreatePrimitiveBuffer(ctx->glCtx, lpCtx, &lpCtx->PB2d);

+	if (FAILED(hResult))

+		goto return_with_error;

+

+	lpCtx->PB3d.dwFVF		= GLD_FVF_3D_VERTEX;

+	lpCtx->PB3d.dwPool		= D3DPOOL_DEFAULT;

+	lpCtx->PB3d.dwStride	= sizeof(GLD_3D_VERTEX);

+	lpCtx->PB3d.dwUsage		= D3DUSAGE_DYNAMIC |

+//DaveM								D3DUSAGE_SOFTWAREPROCESSING |

+								D3DUSAGE_WRITEONLY;

+	hResult = _gldCreatePrimitiveBuffer(ctx->glCtx, lpCtx, &lpCtx->PB3d);

+	if (FAILED(hResult))

+		goto return_with_error;

+

+/*	// NOTE: A FVF code of zero indicates a non-FVF vertex buffer (for vertex shaders)

+	lpCtx->PBtwosidelight.dwFVF		= 0; //GLD_FVF_TWOSIDED_VERTEX;

+	lpCtx->PBtwosidelight.dwPool	= D3DPOOL_DEFAULT;

+	lpCtx->PBtwosidelight.dwStride	= sizeof(GLD_TWOSIDED_VERTEX);

+	lpCtx->PBtwosidelight.dwUsage	= D3DUSAGE_DONOTCLIP |

+								D3DUSAGE_DYNAMIC |

+								D3DUSAGE_SOFTWAREPROCESSING |

+								D3DUSAGE_WRITEONLY;

+	hResult = _gldCreatePrimitiveBuffer(ctx->glCtx, lpCtx, &lpCtx->PBtwosidelight);

+	if (FAILED(hResult))

+		goto return_with_error;*/

+

+	// Now try and create the DX9 Vertex Shaders

+//	_gldCreateVertexShaders(lpCtx);

+

+	// Zero the pipeline usage counters

+	lpCtx->PipelineUsage.qwMesa.QuadPart = 

+//	lpCtx->PipelineUsage.dwD3D2SVS.QuadPart =

+	lpCtx->PipelineUsage.qwD3DFVF.QuadPart = 0;

+

+	// Assign drawable to GL private

+	ctx->glPriv = lpCtx;

+	return TRUE;

+

+return_with_error:

+	// Clean up and bail

+

+//	_gldDestroyVertexShaders(lpCtx);

+

+//	_gldDestroyPrimitiveBuffer(&lpCtx->PBtwosidelight);

+	_gldDestroyPrimitiveBuffer(&lpCtx->PB3d);

+	_gldDestroyPrimitiveBuffer(&lpCtx->PB2d);

+

+	SAFE_RELEASE(lpCtx->pDev);

+	SAFE_RELEASE(lpCtx->pD3D);

+	return FALSE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldResizeDrawable_DX(

+	DGL_ctx *ctx,

+	BOOL bDefaultDriver,

+	BOOL bPersistantInterface,

+	BOOL bPersistantBuffers)

+{

+	GLD_driver_dx9			*gld = NULL;

+	D3DDEVTYPE				d3dDevType;

+	D3DPRESENT_PARAMETERS	d3dpp;

+	D3DDISPLAYMODE			d3ddm;

+	HRESULT					hResult;

+

+	// Error if context is NULL.

+	if (ctx == NULL)

+		return FALSE;

+

+	gld = ctx->glPriv;

+	if (gld == NULL)

+		return FALSE;

+

+	if (ctx->bSceneStarted) {

+		IDirect3DDevice9_EndScene(gld->pDev);

+		ctx->bSceneStarted = FALSE;

+	}

+

+	d3dDevType = (glb.dwDriver == GLDS_DRIVER_HAL) ? D3DDEVTYPE_HAL : D3DDEVTYPE_REF;

+	if (!bDefaultDriver)

+		d3dDevType = D3DDEVTYPE_REF; // Force Direct3D Reference Rasterise (software)

+

+	// Get the display mode so we can make a compatible backbuffer

+	hResult = IDirect3D9_GetAdapterDisplayMode(gld->pD3D, glb.dwAdapter, &d3ddm);

+	if (FAILED(hResult)) {

+        nContextError = GLDERR_D3D;

+//		goto return_with_error;

+		return FALSE;

+	}

+

+	// Destroy DX9 Vertex Shaders before Reset()

+//	_gldDestroyVertexShaders(gld);

+

+	// Release POOL_DEFAULT objects before Reset()

+	if (gld->PB2d.dwPool == D3DPOOL_DEFAULT)

+		_gldDestroyPrimitiveBuffer(&gld->PB2d);

+	if (gld->PB3d.dwPool == D3DPOOL_DEFAULT)

+		_gldDestroyPrimitiveBuffer(&gld->PB3d);

+//	if (gld->PBtwosidelight.dwPool == D3DPOOL_DEFAULT)

+//		_gldDestroyPrimitiveBuffer(&gld->PBtwosidelight);

+

+	// Clear the presentation parameters (sets all members to zero)

+	ZeroMemory(&d3dpp, sizeof(d3dpp));

+

+	// Recommended by MS; needed for MultiSample.

+	// Be careful if altering this for FullScreenBlit

+	d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;

+

+	d3dpp.BackBufferFormat	= d3ddm.Format;

+	d3dpp.BackBufferCount	= 1;

+	d3dpp.MultiSampleType	= _gldGetDeviceMultiSampleType(gld->pD3D, d3ddm.Format, d3dDevType, !ctx->bFullscreen);

+	d3dpp.AutoDepthStencilFormat	= ctx->lpPF->dwDriverData;

+	d3dpp.EnableAutoDepthStencil	= (d3dpp.AutoDepthStencilFormat == D3DFMT_UNKNOWN) ? FALSE : TRUE;

+

+	// TODO: Sync to refresh

+

+	if (ctx->bFullscreen) {

+		ddlogWarnOption(FALSE); // Don't popup any messages in fullscreen 

+		d3dpp.Windowed						= FALSE;

+		d3dpp.BackBufferWidth				= d3ddm.Width;

+		d3dpp.BackBufferHeight				= d3ddm.Height;

+		d3dpp.hDeviceWindow					= ctx->hWnd;

+		d3dpp.FullScreen_RefreshRateInHz	= D3DPRESENT_RATE_DEFAULT;

+		d3dpp.PresentationInterval			= D3DPRESENT_INTERVAL_DEFAULT;

+		// Get better benchmark results? KeithH

+//		d3dpp.FullScreen_RefreshRateInHz	= D3DPRESENT_RATE_UNLIMITED;

+	} else {

+		ddlogWarnOption(glb.bMessageBoxWarnings); // OK to popup messages

+		d3dpp.Windowed						= TRUE;

+		d3dpp.BackBufferWidth				= ctx->dwWidth;

+		d3dpp.BackBufferHeight				= ctx->dwHeight;

+		d3dpp.hDeviceWindow					= ctx->hWnd;

+		d3dpp.FullScreen_RefreshRateInHz	= 0;

+		d3dpp.PresentationInterval			= D3DPRESENT_INTERVAL_DEFAULT;

+	}

+	hResult = IDirect3DDevice9_Reset(gld->pDev, &d3dpp);

+	if (FAILED(hResult)) {

+		ddlogError(DDLOG_CRITICAL_OR_WARN, "dglResize: Reset failed", hResult);

+		return FALSE;

+		//goto cleanup_and_return_with_error;

+	}

+

+	//

+	// Recreate POOL_DEFAULT objects

+	//

+	if (gld->PB2d.dwPool == D3DPOOL_DEFAULT) {

+		_gldCreatePrimitiveBuffer(ctx->glCtx, gld, &gld->PB2d);

+	}

+	if (gld->PB3d.dwPool == D3DPOOL_DEFAULT) {

+		_gldCreatePrimitiveBuffer(ctx->glCtx, gld, &gld->PB3d);

+	}

+//	if (gld->PBtwosidelight.dwPool == D3DPOOL_DEFAULT) {

+//		_gldCreatePrimitiveBuffer(ctx->glCtx, gld, &gld->PB2d);

+//	}

+

+	// Recreate DX9 Vertex Shaders

+//	_gldCreateVertexShaders(gld);

+

+	// Signal a complete state update

+	ctx->glCtx->Driver.UpdateState(ctx->glCtx, _NEW_ALL);

+

+	// Begin a new scene

+	IDirect3DDevice9_BeginScene(gld->pDev);

+	ctx->bSceneStarted = TRUE;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldDestroyDrawable_DX(

+	DGL_ctx *ctx)

+{

+	GLD_driver_dx9			*lpCtx = NULL;

+

+	// Error if context is NULL.

+	if (!ctx)

+		return FALSE;

+

+	// Error if the drawable does not exist.

+	if (!ctx->glPriv)

+		return FALSE;

+

+	lpCtx = ctx->glPriv;

+

+#ifdef _DEBUG

+	// Dump out stats

+	ddlogPrintf(DDLOG_SYSTEM, "Usage: M:0x%X%X, D:0x%X%X",

+		lpCtx->PipelineUsage.qwMesa.HighPart,

+		lpCtx->PipelineUsage.qwMesa.LowPart,

+		lpCtx->PipelineUsage.qwD3DFVF.HighPart,

+		lpCtx->PipelineUsage.qwD3DFVF.LowPart);

+#endif

+

+//	_gldDestroyVertexShaders(lpCtx);

+	

+//	_gldDestroyPrimitiveBuffer(&lpCtx->PBtwosidelight);

+	_gldDestroyPrimitiveBuffer(&lpCtx->PB3d);

+	_gldDestroyPrimitiveBuffer(&lpCtx->PB2d);

+

+	SAFE_RELEASE(lpCtx->pDev);

+	SAFE_RELEASE(lpCtx->pD3D);

+

+	// Free the private drawable data

+	free(ctx->glPriv);

+	ctx->glPriv = NULL;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldCreatePrivateGlobals_DX(void)

+{

+	ZeroMemory(&dx9Globals, sizeof(dx9Globals));

+

+	// Load d3d9.dll

+	dx9Globals.hD3D9DLL = LoadLibrary("D3D9.DLL");

+	if (dx9Globals.hD3D9DLL == NULL)

+		return FALSE;

+

+	// Now try and obtain Direct3DCreate9

+	dx9Globals.fnDirect3DCreate9 = (FNDIRECT3DCREATE9)GetProcAddress(dx9Globals.hD3D9DLL, "Direct3DCreate9");

+	if (dx9Globals.fnDirect3DCreate9 == NULL) {

+		FreeLibrary(dx9Globals.hD3D9DLL);

+		return FALSE;

+	}

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldDestroyPrivateGlobals_DX(void)

+{

+	if (dx9Globals.bDirect3DDevice) {

+		SAFE_RELEASE(dx9Globals.pDev);

+		dx9Globals.bDirect3DDevice = FALSE;

+	}

+	if (dx9Globals.bDirect3D) {

+		SAFE_RELEASE(dx9Globals.pD3D);

+		dx9Globals.bDirect3D = FALSE;

+	}

+

+	FreeLibrary(dx9Globals.hD3D9DLL);

+	dx9Globals.hD3D9DLL = NULL;

+	dx9Globals.fnDirect3DCreate9 = NULL;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+static void _BitsFromDisplayFormat(

+	D3DFORMAT fmt,

+	BYTE *cColorBits,

+	BYTE *cRedBits,

+	BYTE *cGreenBits,

+	BYTE *cBlueBits,

+	BYTE *cAlphaBits)

+{

+	switch (fmt) {

+	case D3DFMT_X1R5G5B5:

+		*cColorBits = 16;

+		*cRedBits = 5;

+		*cGreenBits = 5;

+		*cBlueBits = 5;

+		*cAlphaBits = 0;

+		return;

+	case D3DFMT_R5G6B5:

+		*cColorBits = 16;

+		*cRedBits = 5;

+		*cGreenBits = 6;

+		*cBlueBits = 5;

+		*cAlphaBits = 0;

+		return;

+	case D3DFMT_X8R8G8B8:

+		*cColorBits = 32;

+		*cRedBits = 8;

+		*cGreenBits = 8;

+		*cBlueBits = 8;

+		*cAlphaBits = 0;

+		return;

+	case D3DFMT_A8R8G8B8:

+		*cColorBits = 32;

+		*cRedBits = 8;

+		*cGreenBits = 8;

+		*cBlueBits = 8;

+		*cAlphaBits = 8;

+		return;

+	}

+

+	// Should not get here!

+	*cColorBits = 32;

+	*cRedBits = 8;

+	*cGreenBits = 8;

+	*cBlueBits = 8;

+	*cAlphaBits = 0;

+}

+

+//---------------------------------------------------------------------------

+

+static void _BitsFromDepthStencilFormat(

+	D3DFORMAT fmt,

+	BYTE *cDepthBits,

+	BYTE *cStencilBits)

+{

+	// NOTE: GL expects either 32 or 16 as depth bits.

+	switch (fmt) {

+	case D3DFMT_D32:

+		*cDepthBits = 32;

+		*cStencilBits = 0;

+		return;

+	case D3DFMT_D15S1:

+		*cDepthBits = 16;

+		*cStencilBits = 1;

+		return;

+	case D3DFMT_D24S8:

+		*cDepthBits = 32;

+		*cStencilBits = 8;

+		return;

+	case D3DFMT_D16:

+		*cDepthBits = 16;

+		*cStencilBits = 0;

+		return;

+	case D3DFMT_D24X8:

+		*cDepthBits = 32;

+		*cStencilBits = 0;

+		return;

+	case D3DFMT_D24X4S4:

+		*cDepthBits = 32;

+		*cStencilBits = 4;

+		return;

+	}

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldBuildPixelformatList_DX(void)

+{

+	D3DDISPLAYMODE		d3ddm;

+	D3DFORMAT			fmt[6];

+	IDirect3D9			*pD3D = NULL;

+	HRESULT				hr;

+	int					nSupportedFormats = 0;

+	int					i;

+	DGL_pixelFormat		*pPF;

+	BYTE				cColorBits, cRedBits, cGreenBits, cBlueBits, cAlphaBits;

+//	char				buf[128];

+//	char				cat[8];

+

+	// Direct3D (SW or HW)

+	// These are arranged so that 'best' pixelformat

+	// is higher in the list (for ChoosePixelFormat).

+	const D3DFORMAT DepthStencil[6] = {

+// New order: increaing Z, then increasing stencil

+		D3DFMT_D15S1,

+		D3DFMT_D16,

+		D3DFMT_D24X4S4,

+		D3DFMT_D24X8,

+		D3DFMT_D24S8,

+		D3DFMT_D32,

+	};

+

+	// Dump DX version

+	ddlogMessage(GLDLOG_SYSTEM, "DirectX Version  : 9.0\n");

+

+	// Release any existing pixelformat list

+	if (glb.lpPF) {

+		free(glb.lpPF);

+	}

+

+	glb.nPixelFormatCount	= 0;

+	glb.lpPF				= NULL;

+

+	//

+	// Pixelformats for Direct3D (SW or HW) rendering

+	//

+

+	// Get a Direct3D 9.0 interface

+	pD3D = dx9Globals.fnDirect3DCreate9(D3D_SDK_VERSION);

+	if (!pD3D) {

+		return FALSE;

+	}

+

+	// We will use the display mode format when finding compliant

+	// rendertarget/depth-stencil surfaces.

+	hr = IDirect3D9_GetAdapterDisplayMode(pD3D, glb.dwAdapter, &d3ddm);

+	if (FAILED(hr)) {

+		IDirect3D9_Release(pD3D);

+		return FALSE;

+	}

+	

+	// Run through the possible formats and detect supported formats

+	for (i=0; i<6; i++) {

+		hr = IDirect3D9_CheckDeviceFormat(

+			pD3D,

+			glb.dwAdapter,

+			glb.dwDriver==GLDS_DRIVER_HAL ? D3DDEVTYPE_HAL : D3DDEVTYPE_REF,

+            d3ddm.Format,

+			D3DUSAGE_DEPTHSTENCIL,

+			D3DRTYPE_SURFACE,

+			DepthStencil[i]);

+		if (FAILED(hr))

+			// A failure here is not fatal.

+			continue;

+

+	    // Verify that the depth format is compatible.

+	    hr = IDirect3D9_CheckDepthStencilMatch(

+				pD3D,

+				glb.dwAdapter,

+                glb.dwDriver==GLDS_DRIVER_HAL ? D3DDEVTYPE_HAL : D3DDEVTYPE_REF,

+                d3ddm.Format,

+                d3ddm.Format,

+                DepthStencil[i]);

+		if (FAILED(hr))

+			// A failure here is not fatal, just means depth-stencil

+			// format is not compatible with this display mode.

+			continue;

+

+		fmt[nSupportedFormats++] = DepthStencil[i];

+	}

+

+	IDirect3D9_Release(pD3D);

+

+	if (nSupportedFormats == 0)

+		return FALSE; // Bail: no compliant pixelformats

+

+	// Total count of pixelformats is:

+	// (nSupportedFormats+1)*2

+	// UPDATED: nSupportedFormats*2

+	glb.lpPF = (DGL_pixelFormat *)calloc(nSupportedFormats*2, sizeof(DGL_pixelFormat));

+	glb.nPixelFormatCount = nSupportedFormats*2;

+	if (glb.lpPF == NULL) {

+		glb.nPixelFormatCount = 0;

+		return FALSE;

+	}

+

+	// Get a copy of pointer that we can alter

+	pPF = glb.lpPF;

+

+	// Cache colour bits from display format

+	_BitsFromDisplayFormat(d3ddm.Format, &cColorBits, &cRedBits, &cGreenBits, &cBlueBits, &cAlphaBits);

+

+	//

+	// Add single-buffer formats

+	//

+/*

+	// NOTE: No longer returning pixelformats that don't contain depth

+	// Single-buffer, no depth-stencil buffer

+	memcpy(pPF, &pfTemplateHW, sizeof(DGL_pixelFormat));

+	pPF->pfd.dwFlags &= ~PFD_DOUBLEBUFFER; // Remove doublebuffer flag

+	pPF->pfd.cColorBits		= cColorBits;

+	pPF->pfd.cRedBits		= cRedBits;

+	pPF->pfd.cGreenBits		= cGreenBits;

+	pPF->pfd.cBlueBits		= cBlueBits;

+	pPF->pfd.cAlphaBits		= cAlphaBits;

+	pPF->pfd.cDepthBits		= 0;

+	pPF->pfd.cStencilBits	= 0;

+	pPF->dwDriverData		= D3DFMT_UNKNOWN;

+	pPF++;

+*/

+	for (i=0; i<nSupportedFormats; i++, pPF++) {

+		memcpy(pPF, &pfTemplateHW, sizeof(DGL_pixelFormat));

+		pPF->pfd.dwFlags &= ~PFD_DOUBLEBUFFER; // Remove doublebuffer flag

+		pPF->pfd.cColorBits		= cColorBits;

+		pPF->pfd.cRedBits		= cRedBits;

+		pPF->pfd.cGreenBits		= cGreenBits;

+		pPF->pfd.cBlueBits		= cBlueBits;

+		pPF->pfd.cAlphaBits		= cAlphaBits;

+		_BitsFromDepthStencilFormat(fmt[i], &pPF->pfd.cDepthBits, &pPF->pfd.cStencilBits);

+		pPF->dwDriverData		= fmt[i];

+	}

+

+	//

+	// Add double-buffer formats

+	//

+

+	// NOTE: No longer returning pixelformats that don't contain depth

+/*

+	memcpy(pPF, &pfTemplateHW, sizeof(DGL_pixelFormat));

+	pPF->pfd.cColorBits		= cColorBits;

+	pPF->pfd.cRedBits		= cRedBits;

+	pPF->pfd.cGreenBits		= cGreenBits;

+	pPF->pfd.cBlueBits		= cBlueBits;

+	pPF->pfd.cAlphaBits		= cAlphaBits;

+	pPF->pfd.cDepthBits		= 0;

+	pPF->pfd.cStencilBits	= 0;

+	pPF->dwDriverData		= D3DFMT_UNKNOWN;

+	pPF++;

+*/

+	for (i=0; i<nSupportedFormats; i++, pPF++) {

+		memcpy(pPF, &pfTemplateHW, sizeof(DGL_pixelFormat));

+		pPF->pfd.cColorBits		= cColorBits;

+		pPF->pfd.cRedBits		= cRedBits;

+		pPF->pfd.cGreenBits		= cGreenBits;

+		pPF->pfd.cBlueBits		= cBlueBits;

+		pPF->pfd.cAlphaBits		= cAlphaBits;

+		_BitsFromDepthStencilFormat(fmt[i], &pPF->pfd.cDepthBits, &pPF->pfd.cStencilBits);

+		pPF->dwDriverData		= fmt[i];

+	}

+

+	// Popup warning message if non RGB color mode

+	{

+		// This is a hack. KeithH

+		HDC hdcDesktop = GetDC(NULL);

+		DWORD dwDisplayBitDepth = GetDeviceCaps(hdcDesktop, BITSPIXEL);

+		ReleaseDC(0, hdcDesktop);

+		if (dwDisplayBitDepth <= 8) {

+			ddlogPrintf(DDLOG_WARN, "Current Color Depth %d bpp is not supported", dwDisplayBitDepth);

+			MessageBox(NULL, szColorDepthWarning, "GLDirect", MB_OK | MB_ICONWARNING);

+		}

+	}

+

+	// Mark list as 'current'

+	glb.bPixelformatsDirty = FALSE;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldInitialiseMesa_DX(

+	DGL_ctx *lpCtx)

+{

+	GLD_driver_dx9	*gld = NULL;

+	int				MaxTextureSize, TextureLevels;

+	BOOL			bSoftwareTnL;

+

+	if (lpCtx == NULL)

+		return FALSE;

+

+	gld = lpCtx->glPriv;

+	if (gld == NULL)

+		return FALSE;

+

+	if (glb.bMultitexture) {

+		lpCtx->glCtx->Const.MaxTextureUnits = gld->d3dCaps9.MaxSimultaneousTextures;

+		// Only support MAX_TEXTURE_UNITS texture units.

+		// ** If this is altered then the FVF formats must be reviewed **.

+		if (lpCtx->glCtx->Const.MaxTextureUnits > GLD_MAX_TEXTURE_UNITS_DX9)

+			lpCtx->glCtx->Const.MaxTextureUnits = GLD_MAX_TEXTURE_UNITS_DX9;

+	} else {

+		// Multitexture override

+		lpCtx->glCtx->Const.MaxTextureUnits = 1;

+	}

+

+	// max texture size

+	MaxTextureSize = min(gld->d3dCaps9.MaxTextureHeight, gld->d3dCaps9.MaxTextureWidth);

+	if (MaxTextureSize == 0)

+		MaxTextureSize = 256; // Sanity check

+

+	//

+	// HACK!!

+	if (MaxTextureSize > 1024)

+		MaxTextureSize = 1024; // HACK - CLAMP TO 1024

+	// HACK!!

+	//

+

+	// Got to set MAX_TEXTURE_SIZE as max levels.

+	// Who thought this stupid idea up? ;)

+	TextureLevels = 0;

+	// Calculate power-of-two.

+	while (MaxTextureSize) {

+		TextureLevels++;

+		MaxTextureSize >>= 1;

+	}

+	lpCtx->glCtx->Const.MaxTextureLevels = (TextureLevels) ? TextureLevels : 8;

+	lpCtx->glCtx->Const.MaxDrawBuffers = 1;

+

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_LIGHTING, FALSE);

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_CULLMODE, D3DCULL_NONE);

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_DITHERENABLE, TRUE);

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_SHADEMODE, D3DSHADE_GOURAUD);

+

+	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_ZENABLE,

+		(lpCtx->lpPF->dwDriverData!=D3DFMT_UNKNOWN) ? D3DZB_TRUE : D3DZB_FALSE);

+

+	// Set the view matrix

+	{

+		D3DXMATRIX	vm;

+#if 1

+		D3DXMatrixIdentity(&vm);

+#else

+		D3DXVECTOR3 Eye(0.0f, 0.0f, 0.0f);

+		D3DXVECTOR3 At(0.0f, 0.0f, -1.0f);

+		D3DXVECTOR3 Up(0.0f, 1.0f, 0.0f);

+		D3DXMatrixLookAtRH(&vm, &Eye, &At, &Up);

+		vm._31 = -vm._31;

+		vm._32 = -vm._32;

+		vm._33 = -vm._33;

+		vm._34 = -vm._34;

+#endif

+		IDirect3DDevice9_SetTransform(gld->pDev, D3DTS_VIEW, &vm);

+	}

+

+	if (gld->bHasHWTnL) {

+		if (glb.dwTnL == GLDS_TNL_DEFAULT)

+			bSoftwareTnL = FALSE; // HW TnL

+		else {

+			bSoftwareTnL = ((glb.dwTnL == GLDS_TNL_MESA) || (glb.dwTnL == GLDS_TNL_D3DSW)) ? TRUE : FALSE;

+		}

+	} else {

+		// No HW TnL, so no choice possible

+		bSoftwareTnL = TRUE;

+	}

+//	IDirect3DDevice9_SetRenderState(gld->pDev, D3DRS_SOFTWAREVERTEXPROCESSING, bSoftwareTnL);

+	IDirect3DDevice9_SetSoftwareVertexProcessing(gld->pDev, bSoftwareTnL);

+

+// Dump this in a Release build as well, now.

+//#ifdef _DEBUG

+	ddlogPrintf(DDLOG_INFO, "HW TnL: %s",

+		gld->bHasHWTnL ? (bSoftwareTnL ? "Disabled" : "Enabled") : "Unavailable");

+//#endif

+

+	gldEnableExtensions_DX9(lpCtx->glCtx);

+	gldInstallPipeline_DX9(lpCtx->glCtx);

+	gldSetupDriverPointers_DX9(lpCtx->glCtx);

+

+	// Signal a complete state update

+	lpCtx->glCtx->Driver.UpdateState(lpCtx->glCtx, _NEW_ALL);

+

+	// Start a scene

+	IDirect3DDevice9_BeginScene(gld->pDev);

+	lpCtx->bSceneStarted = TRUE;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldSwapBuffers_DX(

+	DGL_ctx *ctx,

+	HDC hDC,

+	HWND hWnd)

+{

+	HRESULT			hr;

+	GLD_driver_dx9	*gld = NULL;

+

+	if (ctx == NULL)

+		return FALSE;

+

+	gld = ctx->glPriv;

+	if (gld == NULL)

+		return FALSE;

+

+	if (ctx->bSceneStarted) {

+		IDirect3DDevice9_EndScene(gld->pDev);

+		ctx->bSceneStarted = FALSE;

+	}

+

+	// Swap the buffers. hWnd may override the hWnd used for CreateDevice()

+	hr = IDirect3DDevice9_Present(gld->pDev, NULL, NULL, hWnd, NULL);

+

+exit_swap:

+

+	IDirect3DDevice9_BeginScene(gld->pDev);

+	ctx->bSceneStarted = TRUE;

+

+// Debugging code

+#ifdef _DEBUG

+//	ddlogMessage(GLDLOG_WARN, "SwapBuffers\n");

+#endif

+

+	return (FAILED(hr)) ? FALSE : TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldGetDisplayMode_DX(

+	DGL_ctx *ctx,

+	GLD_displayMode *glddm)

+{

+	D3DDISPLAYMODE	d3ddm;

+	HRESULT			hr;

+	GLD_driver_dx9	*lpCtx = NULL;

+	BYTE cColorBits, cRedBits, cGreenBits, cBlueBits, cAlphaBits;

+

+	if ((glddm == NULL) || (ctx == NULL))

+		return FALSE;

+

+	lpCtx = ctx->glPriv;

+	if (lpCtx == NULL)

+		return FALSE;

+

+	if (lpCtx->pD3D == NULL)

+		return FALSE;

+

+	hr = IDirect3D9_GetAdapterDisplayMode(lpCtx->pD3D, glb.dwAdapter, &d3ddm);

+	if (FAILED(hr))

+		return FALSE;

+

+	// Get info from the display format

+	_BitsFromDisplayFormat(d3ddm.Format,

+		&cColorBits, &cRedBits, &cGreenBits, &cBlueBits, &cAlphaBits);

+

+	glddm->Width	= d3ddm.Width;

+	glddm->Height	= d3ddm.Height;

+	glddm->BPP		= cColorBits;

+	glddm->Refresh	= d3ddm.RefreshRate;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.c b/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.c
index f7c575614..226dc5a5a 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.c
+++ b/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.c
@@ -1,279 +1,279 @@
-/****************************************************************************
-*
-*                        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/2000/XP/XBox (Win32)
-*
-* Description:  Driver functions and interfaces
-*
-****************************************************************************/
-
-#define STRICT
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include "gld_driver.h"
-#include "ddlog.h"
-#include "glheader.h"
-
-// For glGetString().
-#include "common_x86_asm.h"
-
-//---------------------------------------------------------------------------
-
-static char *szDriverError = "Driver used before initialisation!";
-
-// This holds our dynamically created OpenGL renderer string.
-// 256 chars should be plenty - remember that some apps display this.
-static char _gldRendererString[256];
-
-static char *szVendor = "SciTech Software, Inc.";
-
-//---------------------------------------------------------------------------
-
-extern BOOL gldGetDXErrorString_DX(HRESULT hr, char *buf, int nBufSize);
-
-extern BOOL gldCreateDrawable_MesaSW(DGL_ctx *ctx, BOOL bPersistantInterface, BOOL bPersistantBuffers);
-extern BOOL gldResizeDrawable_MesaSW(DGL_ctx *ctx, BOOL bDefaultDriver, BOOL bPersistantInterface, BOOL bPersistantBuffers);
-extern BOOL gldDestroyDrawable_MesaSW(DGL_ctx *ctx);
-extern BOOL gldCreatePrivateGlobals_MesaSW(void);
-extern BOOL gldDestroyPrivateGlobals_MesaSW(void);
-extern BOOL	gldBuildPixelformatList_MesaSW(void);
-extern BOOL gldInitialiseMesa_MesaSW(DGL_ctx *ctx);
-extern BOOL	gldSwapBuffers_MesaSW(DGL_ctx *ctx, HDC hDC, HWND hWnd);
-extern PROC	gldGetProcAddress_MesaSW(LPCSTR a);
-extern BOOL	gldGetDisplayMode_MesaSW(DGL_ctx *ctx, GLD_displayMode *glddm);
-
-extern BOOL gldCreateDrawable_DX(DGL_ctx *ctx, BOOL bPersistantInterface, BOOL bPersistantBuffers);
-extern BOOL gldResizeDrawable_DX(DGL_ctx *ctx, BOOL bDefaultDriver, BOOL bPersistantInterface, BOOL bPersistantBuffers);
-extern BOOL gldDestroyDrawable_DX(DGL_ctx *ctx);
-extern BOOL gldCreatePrivateGlobals_DX(void);
-extern BOOL gldDestroyPrivateGlobals_DX(void);
-extern BOOL	gldBuildPixelformatList_DX(void);
-extern BOOL gldInitialiseMesa_DX(DGL_ctx *ctx);
-extern BOOL	gldSwapBuffers_DX(DGL_ctx *ctx, HDC hDC, HWND hWnd);
-extern PROC	gldGetProcAddress_DX(LPCSTR a);
-extern BOOL	gldGetDisplayMode_DX(DGL_ctx *ctx, GLD_displayMode *glddm);
-
-//---------------------------------------------------------------------------
-// NOP functions. Called if proper driver functions are not set.
-//---------------------------------------------------------------------------
-
-static BOOL _gldDriverError(void)
-{
-	ddlogMessage(DDLOG_CRITICAL, szDriverError);
-	return FALSE;
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _GetDXErrorString_ERROR(
-	HRESULT hr,
-	char *buf,
-	int nBufSize)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _CreateDrawable_ERROR(
-	DGL_ctx *ctx,
-	BOOL bPersistantInterface,
-	BOOL bPersistantBuffers)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _ResizeDrawable_ERROR(
-	DGL_ctx *ctx,
-	BOOL bDefaultDriver,
-	BOOL bPersistantInterface,
-	BOOL bPersistantBuffers)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _DestroyDrawable_ERROR(
-	DGL_ctx *ctx)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _CreatePrivateGlobals_ERROR(void)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _DestroyPrivateGlobals_ERROR(void)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL _BuildPixelformatList_ERROR(void)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-
-static BOOL _InitialiseMesa_ERROR(
-	DGL_ctx *ctx)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL	_SwapBuffers_ERROR(
-	DGL_ctx *ctx,
-	HDC hDC,
-	HWND hWnd)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-
-static PROC _GetProcAddress_ERROR(
-	LPCSTR a)
-{
-	_gldDriverError();
-	return NULL;
-}
-
-//---------------------------------------------------------------------------
-
-static BOOL	_GetDisplayMode_ERROR(
-	DGL_ctx *ctx,
-	GLD_displayMode *glddm)
-{
-	return _gldDriverError();
-}
-
-//---------------------------------------------------------------------------
-// Functions useful to all drivers
-//---------------------------------------------------------------------------
-
-const GLubyte* _gldGetStringGeneric(
-	GLcontext *ctx,
-	GLenum name)
-{
-	if (!ctx)
-		return NULL;
-
-	switch (name) {
-	case GL_RENDERER:
-		sprintf(_gldRendererString, "GLDirect 4.0 %s%s%s%s (%s %s)",
-			_mesa_x86_cpu_features	? "/x86"		: "",
-			cpu_has_mmx				? "/MMX"		: "",
-			cpu_has_3dnow			? "/3DNow!"		: "",
-			cpu_has_xmm				? "/SSE"		: "",
-			__DATE__, __TIME__);
-		return (const GLubyte *) _gldRendererString;
-	case GL_VENDOR:
-		return (const GLubyte *) szVendor;
-	default:
-		return NULL;
-	}
-}
-
-//---------------------------------------------------------------------------
-// Global driver function pointers, initially set to functions that
-// will report an error when called.
-//---------------------------------------------------------------------------
-
-GLD_driver _gldDriver = {
-	_GetDXErrorString_ERROR,
-	_CreateDrawable_ERROR,
-	_ResizeDrawable_ERROR,
-	_DestroyDrawable_ERROR,
-	_CreatePrivateGlobals_ERROR,
-	_DestroyPrivateGlobals_ERROR,
-	_BuildPixelformatList_ERROR,
-	_InitialiseMesa_ERROR,
-	_SwapBuffers_ERROR,
-	_GetProcAddress_ERROR,
-	_GetDisplayMode_ERROR
-};
-
-//---------------------------------------------------------------------------
-// Init function. Should be called as soon as regkeys/ini-settings are read.
-//---------------------------------------------------------------------------
-
-BOOL gldInitDriverPointers(
-	DWORD dwDriver)
-{
-	_gldDriver.GetDXErrorString	= gldGetDXErrorString_DX;
-
-	if (dwDriver == GLDS_DRIVER_MESA_SW) {
-		// Mesa Software driver
-		_gldDriver.CreateDrawable			= gldCreateDrawable_MesaSW;
-		_gldDriver.ResizeDrawable			= gldResizeDrawable_MesaSW;
-		_gldDriver.DestroyDrawable			= gldDestroyDrawable_MesaSW;
-		_gldDriver.CreatePrivateGlobals		= gldCreatePrivateGlobals_MesaSW;
-		_gldDriver.DestroyPrivateGlobals	= gldDestroyPrivateGlobals_MesaSW;
-		_gldDriver.BuildPixelformatList		= gldBuildPixelformatList_MesaSW;
-		_gldDriver.InitialiseMesa			= gldInitialiseMesa_MesaSW;
-		_gldDriver.SwapBuffers				= gldSwapBuffers_MesaSW;
-		_gldDriver.wglGetProcAddress		= gldGetProcAddress_MesaSW;
-		_gldDriver.GetDisplayMode			= gldGetDisplayMode_MesaSW;
-		return TRUE;
-	}
-	
-	if ((dwDriver == GLDS_DRIVER_REF) || (dwDriver == GLDS_DRIVER_HAL)) {
-		// Direct3D driver, either HW or SW
-		_gldDriver.CreateDrawable			= gldCreateDrawable_DX;
-		_gldDriver.ResizeDrawable			= gldResizeDrawable_DX;
-		_gldDriver.DestroyDrawable			= gldDestroyDrawable_DX;
-		_gldDriver.CreatePrivateGlobals		= gldCreatePrivateGlobals_DX;
-		_gldDriver.DestroyPrivateGlobals	= gldDestroyPrivateGlobals_DX;
-		_gldDriver.BuildPixelformatList		= gldBuildPixelformatList_DX;
-		_gldDriver.InitialiseMesa			= gldInitialiseMesa_DX;
-		_gldDriver.SwapBuffers				= gldSwapBuffers_DX;
-		_gldDriver.wglGetProcAddress		= gldGetProcAddress_DX;
-		_gldDriver.GetDisplayMode			= gldGetDisplayMode_DX;
-		return TRUE;
-	};
-
-	return FALSE;
-}
-
-//---------------------------------------------------------------------------
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Driver functions and interfaces

+*

+****************************************************************************/

+

+#define STRICT

+#define WIN32_LEAN_AND_MEAN

+#include <windows.h>

+

+#include "gld_driver.h"

+#include "ddlog.h"

+#include "glheader.h"

+

+// For glGetString().

+#include "common_x86_asm.h"

+

+//---------------------------------------------------------------------------

+

+static char *szDriverError = "Driver used before initialisation!";

+

+// This holds our dynamically created OpenGL renderer string.

+// 256 chars should be plenty - remember that some apps display this.

+static char _gldRendererString[256];

+

+static char *szVendor = "SciTech Software, Inc.";

+

+//---------------------------------------------------------------------------

+

+extern BOOL gldGetDXErrorString_DX(HRESULT hr, char *buf, int nBufSize);

+

+extern BOOL gldCreateDrawable_MesaSW(DGL_ctx *ctx, BOOL bPersistantInterface, BOOL bPersistantBuffers);

+extern BOOL gldResizeDrawable_MesaSW(DGL_ctx *ctx, BOOL bDefaultDriver, BOOL bPersistantInterface, BOOL bPersistantBuffers);

+extern BOOL gldDestroyDrawable_MesaSW(DGL_ctx *ctx);

+extern BOOL gldCreatePrivateGlobals_MesaSW(void);

+extern BOOL gldDestroyPrivateGlobals_MesaSW(void);

+extern BOOL	gldBuildPixelformatList_MesaSW(void);

+extern BOOL gldInitialiseMesa_MesaSW(DGL_ctx *ctx);

+extern BOOL	gldSwapBuffers_MesaSW(DGL_ctx *ctx, HDC hDC, HWND hWnd);

+extern PROC	gldGetProcAddress_MesaSW(LPCSTR a);

+extern BOOL	gldGetDisplayMode_MesaSW(DGL_ctx *ctx, GLD_displayMode *glddm);

+

+extern BOOL gldCreateDrawable_DX(DGL_ctx *ctx, BOOL bPersistantInterface, BOOL bPersistantBuffers);

+extern BOOL gldResizeDrawable_DX(DGL_ctx *ctx, BOOL bDefaultDriver, BOOL bPersistantInterface, BOOL bPersistantBuffers);

+extern BOOL gldDestroyDrawable_DX(DGL_ctx *ctx);

+extern BOOL gldCreatePrivateGlobals_DX(void);

+extern BOOL gldDestroyPrivateGlobals_DX(void);

+extern BOOL	gldBuildPixelformatList_DX(void);

+extern BOOL gldInitialiseMesa_DX(DGL_ctx *ctx);

+extern BOOL	gldSwapBuffers_DX(DGL_ctx *ctx, HDC hDC, HWND hWnd);

+extern PROC	gldGetProcAddress_DX(LPCSTR a);

+extern BOOL	gldGetDisplayMode_DX(DGL_ctx *ctx, GLD_displayMode *glddm);

+

+//---------------------------------------------------------------------------

+// NOP functions. Called if proper driver functions are not set.

+//---------------------------------------------------------------------------

+

+static BOOL _gldDriverError(void)

+{

+	ddlogMessage(DDLOG_CRITICAL, szDriverError);

+	return FALSE;

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _GetDXErrorString_ERROR(

+	HRESULT hr,

+	char *buf,

+	int nBufSize)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _CreateDrawable_ERROR(

+	DGL_ctx *ctx,

+	BOOL bPersistantInterface,

+	BOOL bPersistantBuffers)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _ResizeDrawable_ERROR(

+	DGL_ctx *ctx,

+	BOOL bDefaultDriver,

+	BOOL bPersistantInterface,

+	BOOL bPersistantBuffers)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _DestroyDrawable_ERROR(

+	DGL_ctx *ctx)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _CreatePrivateGlobals_ERROR(void)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _DestroyPrivateGlobals_ERROR(void)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL _BuildPixelformatList_ERROR(void)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+

+static BOOL _InitialiseMesa_ERROR(

+	DGL_ctx *ctx)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL	_SwapBuffers_ERROR(

+	DGL_ctx *ctx,

+	HDC hDC,

+	HWND hWnd)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+

+static PROC _GetProcAddress_ERROR(

+	LPCSTR a)

+{

+	_gldDriverError();

+	return NULL;

+}

+

+//---------------------------------------------------------------------------

+

+static BOOL	_GetDisplayMode_ERROR(

+	DGL_ctx *ctx,

+	GLD_displayMode *glddm)

+{

+	return _gldDriverError();

+}

+

+//---------------------------------------------------------------------------

+// Functions useful to all drivers

+//---------------------------------------------------------------------------

+

+const GLubyte* _gldGetStringGeneric(

+	struct gl_context *ctx,

+	GLenum name)

+{

+	if (!ctx)

+		return NULL;

+

+	switch (name) {

+	case GL_RENDERER:

+		sprintf(_gldRendererString, "GLDirect 4.0 %s%s%s%s (%s %s)",

+			_mesa_x86_cpu_features	? "/x86"		: "",

+			cpu_has_mmx				? "/MMX"		: "",

+			cpu_has_3dnow			? "/3DNow!"		: "",

+			cpu_has_xmm				? "/SSE"		: "",

+			__DATE__, __TIME__);

+		return (const GLubyte *) _gldRendererString;

+	case GL_VENDOR:

+		return (const GLubyte *) szVendor;

+	default:

+		return NULL;

+	}

+}

+

+//---------------------------------------------------------------------------

+// Global driver function pointers, initially set to functions that

+// will report an error when called.

+//---------------------------------------------------------------------------

+

+GLD_driver _gldDriver = {

+	_GetDXErrorString_ERROR,

+	_CreateDrawable_ERROR,

+	_ResizeDrawable_ERROR,

+	_DestroyDrawable_ERROR,

+	_CreatePrivateGlobals_ERROR,

+	_DestroyPrivateGlobals_ERROR,

+	_BuildPixelformatList_ERROR,

+	_InitialiseMesa_ERROR,

+	_SwapBuffers_ERROR,

+	_GetProcAddress_ERROR,

+	_GetDisplayMode_ERROR

+};

+

+//---------------------------------------------------------------------------

+// Init function. Should be called as soon as regkeys/ini-settings are read.

+//---------------------------------------------------------------------------

+

+BOOL gldInitDriverPointers(

+	DWORD dwDriver)

+{

+	_gldDriver.GetDXErrorString	= gldGetDXErrorString_DX;

+

+	if (dwDriver == GLDS_DRIVER_MESA_SW) {

+		// Mesa Software driver

+		_gldDriver.CreateDrawable			= gldCreateDrawable_MesaSW;

+		_gldDriver.ResizeDrawable			= gldResizeDrawable_MesaSW;

+		_gldDriver.DestroyDrawable			= gldDestroyDrawable_MesaSW;

+		_gldDriver.CreatePrivateGlobals		= gldCreatePrivateGlobals_MesaSW;

+		_gldDriver.DestroyPrivateGlobals	= gldDestroyPrivateGlobals_MesaSW;

+		_gldDriver.BuildPixelformatList		= gldBuildPixelformatList_MesaSW;

+		_gldDriver.InitialiseMesa			= gldInitialiseMesa_MesaSW;

+		_gldDriver.SwapBuffers				= gldSwapBuffers_MesaSW;

+		_gldDriver.wglGetProcAddress		= gldGetProcAddress_MesaSW;

+		_gldDriver.GetDisplayMode			= gldGetDisplayMode_MesaSW;

+		return TRUE;

+	}

+	

+	if ((dwDriver == GLDS_DRIVER_REF) || (dwDriver == GLDS_DRIVER_HAL)) {

+		// Direct3D driver, either HW or SW

+		_gldDriver.CreateDrawable			= gldCreateDrawable_DX;

+		_gldDriver.ResizeDrawable			= gldResizeDrawable_DX;

+		_gldDriver.DestroyDrawable			= gldDestroyDrawable_DX;

+		_gldDriver.CreatePrivateGlobals		= gldCreatePrivateGlobals_DX;

+		_gldDriver.DestroyPrivateGlobals	= gldDestroyPrivateGlobals_DX;

+		_gldDriver.BuildPixelformatList		= gldBuildPixelformatList_DX;

+		_gldDriver.InitialiseMesa			= gldInitialiseMesa_DX;

+		_gldDriver.SwapBuffers				= gldSwapBuffers_DX;

+		_gldDriver.wglGetProcAddress		= gldGetProcAddress_DX;

+		_gldDriver.GetDisplayMode			= gldGetDisplayMode_DX;

+		return TRUE;

+	};

+

+	return FALSE;

+}

+

+//---------------------------------------------------------------------------

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.h b/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.h
index 01a46a832..6067245b8 100644
--- a/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.h
+++ b/mesalib/src/mesa/drivers/windows/gldirect/gld_driver.h
@@ -1,90 +1,90 @@
-/****************************************************************************
-*
-*                        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/2000/XP/XBox (Win32)
-*
-* Description:  Driver functions and interfaces
-*
-****************************************************************************/
-
-#ifndef _GLD_DRIVER_H
-#define _GLD_DRIVER_H
-
-// This file is only useful is we're using the new GLD3 WGL code.
-#ifdef _USE_GLD3_WGL
-
-#include "dglcontext.h"
-
-// Same as DX8 D3DDISPLAYMODE
-typedef struct {
-	DWORD	Width;
-	DWORD	Height;
-	DWORD	Refresh;
-	DWORD	BPP;
-} GLD_displayMode;
-
-typedef struct {
-	// Returns a string for a given HRESULT error code.
-	BOOL	(*GetDXErrorString)(HRESULT hr, char *buf, int nBufSize);
-
-	// Driver functions for managing drawables.
-	// Functions must respect persistant buffers / persistant interface.
-	// NOTE: Persistant interface is: DirectDraw, pre-DX8; Direct3D, DX8 and above.
-	BOOL	(*CreateDrawable)(DGL_ctx *ctx, BOOL bPersistantInterface, BOOL bPersistantBuffers);
-	BOOL	(*ResizeDrawable)(DGL_ctx *ctx, BOOL bDefaultDriver, BOOL bPersistantInterface, BOOL bPersistantBuffers);
-	BOOL	(*DestroyDrawable)(DGL_ctx *ctx);
-
-	// Create/Destroy private globals belonging to driver
-	BOOL	(*CreatePrivateGlobals)(void);
-	BOOL	(*DestroyPrivateGlobals)(void);
-
-	// Build pixelformat list
-	BOOL	(*BuildPixelformatList)(void);
-
-	// Initialise Mesa's driver pointers
-	BOOL	(*InitialiseMesa)(DGL_ctx *ctx);
-
-	// Swap buffers
-	BOOL	(*SwapBuffers)(DGL_ctx *ctx, HDC hDC, HWND hWnd);
-
-	// wglGetProcAddress()
-	PROC	(*wglGetProcAddress)(LPCSTR a);
-
-	BOOL	(*GetDisplayMode)(DGL_ctx *ctx, GLD_displayMode *glddm);
-} GLD_driver;
-
-extern GLD_driver _gldDriver;
-
-BOOL gldInitDriverPointers(DWORD dwDriver);
-const GLubyte* _gldGetStringGeneric(GLcontext *ctx, GLenum name);
-
-#endif // _USE_GLD3_WGL
-
-#endif // _GLD_DRIVER_H
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Driver functions and interfaces

+*

+****************************************************************************/

+

+#ifndef _GLD_DRIVER_H

+#define _GLD_DRIVER_H

+

+// This file is only useful is we're using the new GLD3 WGL code.

+#ifdef _USE_GLD3_WGL

+

+#include "dglcontext.h"

+

+// Same as DX8 D3DDISPLAYMODE

+typedef struct {

+	DWORD	Width;

+	DWORD	Height;

+	DWORD	Refresh;

+	DWORD	BPP;

+} GLD_displayMode;

+

+typedef struct {

+	// Returns a string for a given HRESULT error code.

+	BOOL	(*GetDXErrorString)(HRESULT hr, char *buf, int nBufSize);

+

+	// Driver functions for managing drawables.

+	// Functions must respect persistant buffers / persistant interface.

+	// NOTE: Persistant interface is: DirectDraw, pre-DX8; Direct3D, DX8 and above.

+	BOOL	(*CreateDrawable)(DGL_ctx *ctx, BOOL bPersistantInterface, BOOL bPersistantBuffers);

+	BOOL	(*ResizeDrawable)(DGL_ctx *ctx, BOOL bDefaultDriver, BOOL bPersistantInterface, BOOL bPersistantBuffers);

+	BOOL	(*DestroyDrawable)(DGL_ctx *ctx);

+

+	// Create/Destroy private globals belonging to driver

+	BOOL	(*CreatePrivateGlobals)(void);

+	BOOL	(*DestroyPrivateGlobals)(void);

+

+	// Build pixelformat list

+	BOOL	(*BuildPixelformatList)(void);

+

+	// Initialise Mesa's driver pointers

+	BOOL	(*InitialiseMesa)(DGL_ctx *ctx);

+

+	// Swap buffers

+	BOOL	(*SwapBuffers)(DGL_ctx *ctx, HDC hDC, HWND hWnd);

+

+	// wglGetProcAddress()

+	PROC	(*wglGetProcAddress)(LPCSTR a);

+

+	BOOL	(*GetDisplayMode)(DGL_ctx *ctx, GLD_displayMode *glddm);

+} GLD_driver;

+

+extern GLD_driver _gldDriver;

+

+BOOL gldInitDriverPointers(DWORD dwDriver);

+const GLubyte* _gldGetStringGeneric(struct gl_context *ctx, GLenum name);

+

+#endif // _USE_GLD3_WGL

+

+#endif // _GLD_DRIVER_H

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/gldirect.rc b/mesalib/src/mesa/drivers/windows/gldirect/gldirect.rc
new file mode 100644
index 000000000..b0a22b281
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/gldirect.rc
@@ -0,0 +1,43 @@
+/****************************************************************************

+*

+*                        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:		Windows Resource Compiler

+* Environment:	Windows 95

+*

+****************************************************************************/

+

+#ifndef WORKSHOP_INVOKED

+  #include <windows.h>

+#endif

+

+#define FILE_DESCRIPTION    "SciTech GLDirect"

+#define ORIG_FILENAME       "opengl32.dll"

+#define FILE_TYPE			VFT_DLL

+

+#include "gldirect/gldver.ver"

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/mesasw/colors.h b/mesalib/src/mesa/drivers/windows/gldirect/mesasw/colors.h
new file mode 100644
index 000000000..12b5003bf
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/mesasw/colors.h
@@ -0,0 +1,520 @@
+/*	File name	:	colors.h

+ *  Version		:	2.3

+ *

+ *  Header file for display driver for Mesa 2.3  under 

+ *	Windows95 and WindowsNT 

+ *	This file defines macros and global variables  needed

+ *	for converting color format

+ *

+ *	Copyright (C) 1996-  Li Wei

+ *  Address		:		Institute of Artificial Intelligence

+ *				:			& Robotics

+ *				:		Xi'an Jiaotong University

+ *  Email		:		liwei@aiar.xjtu.edu.cn

+ *  Web page	:		http://sun.aiar.xjtu.edu.cn

+ *

+ *  This file and its associations are partially based on the 

+ *  Windows NT driver for Mesa, written by Mark Leaming

+ *  (mark@rsinc.com).

+ */

+

+/*

+ * Macros for pixel format defined

+ */

+

+/*

+ * Revision 1.1  2004/04/20 11:13:11  alanh

+ * add SciTech's GLDirect driver for Windows.

+ *

+ * This code is donated to Mesa which allows the usage of

+ * a Direct3D layer (DX7, DX8, DX9 or complete software fallback).

+ *

+ * No build system exists for this code yet, that will come.....

+ *

+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg

+ * Imported sources

+ *

+ * Revision 1.2  1999/01/03 03:08:57  brianp

+ * Ted Jump's changes

+ *

+ * Revision 1.1  1999/01/03 03:08:12  brianp

+ * Initial revision

+ *

+ * Revision 2.0.2  1997/4/30 15:58:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)

+ * Add LUTs need for dithering

+ */

+

+/*

+ * Revision 1.1  2004/04/20 11:13:11  alanh

+ * add SciTech's GLDirect driver for Windows.

+ *

+ * This code is donated to Mesa which allows the usage of

+ * a Direct3D layer (DX7, DX8, DX9 or complete software fallback).

+ *

+ * No build system exists for this code yet, that will come.....

+ *

+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg

+ * Imported sources

+ *

+ * Revision 1.2  1999/01/03 03:08:57  brianp

+ * Ted Jump's changes

+ *

+ * Revision 1.1  1999/01/03 03:08:12  brianp

+ * Initial revision

+ *

+ * Revision 2.0.1  1997/4/29 15:52:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)

+ * Add BGR8 Macro

+ */

+ 

+/*

+ * Revision 1.1  2004/04/20 11:13:11  alanh

+ * add SciTech's GLDirect driver for Windows.

+ *

+ * This code is donated to Mesa which allows the usage of

+ * a Direct3D layer (DX7, DX8, DX9 or complete software fallback).

+ *

+ * No build system exists for this code yet, that will come.....

+ *

+ * Revision 1.1.1.1  1999/08/19 00:55:42  jtg

+ * Imported sources

+ *

+ * Revision 1.2  1999/01/03 03:08:57  brianp

+ * Ted Jump's changes

+ *

+ * Revision 1.1  1999/01/03 03:08:12  brianp

+ * Initial revision

+ *

+ * Revision 2.0  1996/11/15 10:55:00  CST by Li Wei(liwei@aiar.xjtu.edu.cn)

+ * Initial revision

+ */

+/* Values for wmesa->pixelformat: */

+

+#define PF_8A8B8G8R	3	/* 32-bit TrueColor:  8-A, 8-B, 8-G, 8-R */

+#define PF_8R8G8B	4	/* 32-bit TrueColor:  8-R, 8-G, 8-B */

+#define PF_5R6G5B	5	/* 16-bit TrueColor:  5-R, 6-G, 5-B bits */

+#define PF_DITHER8	6	/* Dithered RGB using a lookup table */

+#define PF_LOOKUP	7	/* Undithered RGB using a lookup table */

+#define PF_GRAYSCALE	10	/* Grayscale or StaticGray */

+#define PF_BADFORMAT	11

+#define PF_INDEX8		12

+

+char ColorMap16[] = {

+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,

+0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,

+0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,

+0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,

+0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,

+0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,

+0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,

+0x07,0x07,0x07,0x07,0x07,0x07,0x07,0x07,

+0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,

+0x09,0x09,0x09,0x09,0x09,0x09,0x09,0x09,

+0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,

+0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,

+0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,

+0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,

+0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,0x0E,

+0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,

+0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,

+0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11,

+0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,

+0x13,0x13,0x13,0x13,0x13,0x13,0x13,0x13,

+0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14,

+0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,

+0x16,0x16,0x16,0x16,0x16,0x16,0x16,0x16,

+0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,

+0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,

+0x19,0x19,0x19,0x19,0x19,0x19,0x19,0x19,

+0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,0x1A,

+0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,0x1B,

+0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,0x1C,

+0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,0x1D,

+0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,0x1E,

+0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F};

+

+#define BGR8(r,g,b)		(unsigned)(((BYTE)(b & 0xc0 | (g & 0xe0)>>2 | (r & 0xe0)>>5)))

+#ifdef DDRAW

+#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(g&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))

+#else

+#define BGR16(r,g,b)	((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 10)))

+#endif

+#define BGR24(r,g,b)	(unsigned long)(((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16))) << 8)

+#define BGR32(r,g,b)	(unsigned long)((DWORD)(((BYTE)(b)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(r))<<16)))

+

+

+

+/*

+ * If pixelformat==PF_8A8B8G8R:

+ */

+#define PACK_8A8B8G8R( R, G, B, A )	\

+	( ((A) << 24) | ((B) << 16) | ((G) << 8) | (R) )

+

+

+/*

+ * If pixelformat==PF_8R8G8B:

+ */

+#define PACK_8R8G8B( R, G, B)	 ( ((R) << 16) | ((G) << 8) | (B) )

+

+

+/*

+ * If pixelformat==PF_5R6G5B:

+ */

+

+

+#ifdef DDRAW

+#define PACK_5R6G5B( R, G, B) ((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(G&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[R])) << 11)))

+#else

+#define PACK_5R6G5B( R, G, B)	((WORD)(((BYTE)(ColorMap16[B]) | ((BYTE)(ColorMap16[G]) << 5)) | (((WORD)(BYTE)(ColorMap16[R])) << 10)))

+#endif

+/*----------------------------------------------------------------------------

+

+Division lookup tables.  These tables compute 0-255 divided by 51 and

+modulo 51.  These tables could approximate gamma correction.

+

+*/

+

+char unsigned const aDividedBy51Rounded[256] =

+{

+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

+  0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

+  1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,

+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,

+  2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,

+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,

+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,

+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,

+};

+

+char unsigned const aDividedBy51[256] =

+{

+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

+  0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

+  1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,

+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,

+  2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,

+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,

+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 

+};

+

+char unsigned const aModulo51[256] =

+{

+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,

+  20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,

+  38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6,

+  7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,

+  26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,

+  44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,

+  13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,

+  31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,

+  49, 50, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,

+  18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,

+  36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 1, 2, 3,

+  4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,

+  23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,

+  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0, 

+};

+

+/*----------------------------------------------------------------------------

+

+Multiplication LUTs.  These compute 0-5 times 6 and 36.

+

+*/

+

+char unsigned const aTimes6[6] =

+{

+  0, 6, 12, 18, 24, 30

+};

+

+char unsigned const aTimes36[6] =

+{

+  0, 36, 72, 108, 144, 180

+};

+

+

+/*----------------------------------------------------------------------------

+

+Dither matrices for 8 bit to 2.6 bit halftones.

+

+*/

+

+char unsigned const aHalftone16x16[256] =

+{

+  0, 44, 9, 41, 3, 46, 12, 43, 1, 44, 10, 41, 3, 46, 12, 43,

+  34, 16, 25, 19, 37, 18, 28, 21, 35, 16, 26, 19, 37, 18, 28, 21,

+  38, 6, 47, 3, 40, 9, 50, 6, 38, 7, 47, 4, 40, 9, 49, 6,

+  22, 28, 13, 31, 25, 31, 15, 34, 22, 29, 13, 32, 24, 31, 15, 34,

+  2, 46, 12, 43, 1, 45, 10, 42, 2, 45, 11, 42, 1, 45, 11, 42,

+  37, 18, 27, 21, 35, 17, 26, 20, 36, 17, 27, 20, 36, 17, 26, 20,

+  40, 8, 49, 5, 38, 7, 48, 4, 39, 8, 48, 5, 39, 7, 48, 4,

+  24, 30, 15, 33, 23, 29, 13, 32, 23, 30, 14, 33, 23, 29, 14, 32,

+  2, 46, 12, 43, 0, 44, 10, 41, 3, 47, 12, 44, 0, 44, 10, 41,

+  37, 18, 27, 21, 35, 16, 25, 19, 37, 19, 28, 22, 35, 16, 25, 19,

+  40, 9, 49, 5, 38, 7, 47, 4, 40, 9, 50, 6, 38, 6, 47, 3,

+  24, 30, 15, 34, 22, 29, 13, 32, 25, 31, 15, 34, 22, 28, 13, 31,

+  1, 45, 11, 42, 2, 46, 11, 42, 1, 45, 10, 41, 2, 46, 11, 43,

+  36, 17, 26, 20, 36, 17, 27, 21, 35, 16, 26, 20, 36, 18, 27, 21,

+  39, 8, 48, 4, 39, 8, 49, 5, 38, 7, 48, 4, 39, 8, 49, 5,

+  23, 29, 14, 33, 24, 30, 14, 33, 23, 29, 13, 32, 24, 30, 14, 33,

+};

+

+char unsigned const aHalftone8x8[64] =

+{

+   0, 38,  9, 47,  2, 40, 11, 50,

+  25, 12, 35, 22, 27, 15, 37, 24,

+   6, 44,  3, 41,  8, 47,  5, 43,

+  31, 19, 28, 15, 34, 21, 31, 18,

+   1, 39, 11, 49,  0, 39, 10, 48,

+  27, 14, 36, 23, 26, 13, 35, 23,

+   7, 46,  4, 43,  7, 45,  3, 42,

+  33, 20, 30, 17, 32, 19, 29, 16,

+};

+

+char unsigned const aHalftone4x4_1[16] =

+{

+  0, 25, 6, 31,

+  38, 12, 44, 19,

+  9, 35, 3, 28,

+  47, 22, 41, 15

+};

+

+char unsigned const aHalftone4x4_2[16] =

+{

+  41, 3, 9, 28,

+  35, 15, 22, 47,

+  6, 25, 38, 0,

+  19, 44, 31, 12

+};

+

+/***************************************************************************

+  aWinGHalftoneTranslation

+

+  Translates a 2.6 bit-per-pixel halftoned representation into the

+  slightly rearranged WinG Halftone Palette.

+*/

+

+char unsigned const aWinGHalftoneTranslation[216] =

+{

+  0,

+  29,

+  30,

+  31,

+  32,

+  249,

+  33,

+  34,

+  35,

+  36,

+  37,

+  38,

+  39,

+  40,

+  41,

+  42,

+  43,

+  44,

+  45,

+  46,

+  47,

+  48,

+  49,

+  50,

+  51,

+  52,

+  53,

+  54,

+  55,

+  56,

+  250,

+  250,

+  57,

+  58,

+  59,

+  251,

+  60,

+  61,

+  62,

+  63,

+  64,

+  65,

+  66,

+  67,

+  68,

+  69,

+  70,

+  71,

+  72,

+  73,

+  74,

+  75,

+  76,

+  77,

+  78,

+  79,

+  80,

+  81,

+  82,

+  83,

+  84,

+  85,

+  86,

+  87,

+  88,

+  89,

+  250,

+  90,

+  91,

+  92,

+  93,

+  94,

+  95,

+  96,

+  97,

+  98,

+  99,

+  100,

+  101,

+  102,

+  103,

+  104,

+  105,

+  106,

+  107,

+  108,

+  109,

+  110,

+  111,

+  227,

+  112,

+  113,

+  114,

+  115,

+  116,

+  117,

+  118,

+  119,

+  151,

+  120,

+  121,

+  122,

+  123,

+  124,

+  228,

+  125,

+  126,

+  229,

+  133,

+  162,

+  135,

+  131,

+  132,

+  137,

+  166,

+  134,

+  140,

+  130,

+  136,

+  143,

+  138,

+  139,

+  174,

+  141,

+  142,

+  177,

+  129,

+  144,

+  145,

+  146,

+  147,

+  148,

+  149,

+  150,

+  157,

+  152,

+  153,

+  154,

+  155,

+  156,

+  192,

+  158,

+  159,

+  160,

+  161,

+  196,

+  163,

+  164,

+  165,

+  127,

+  199,

+  167,

+  168,

+  169,

+  170,

+  171,

+  172,

+  173,

+  207,

+  175,

+  176,

+  210,

+  178,

+  179,

+  180,

+  181,

+  182,

+  183,

+  184,

+  185,

+  186,

+  187,

+  188,

+  189,

+  190,

+  191,

+  224,

+  193,

+  194,

+  195,

+  252,

+  252,

+  197,

+  198,

+  128,

+  253,

+  252,

+  200,

+  201,

+  202,

+  203,

+  204,

+  205,

+  206,

+  230,

+  208,

+  209,

+  231,

+  211,

+  212,

+  213,

+  214,

+  215,

+  216,

+  217,

+  218,

+  219,

+  220,

+  221,

+  222,

+  254,

+  223,

+  232,

+  225,

+  226,

+  255,

+};

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c b/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
new file mode 100644
index 000000000..36ebe9f31
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
@@ -0,0 +1,1682 @@
+/****************************************************************************

+*

+*                        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/2000/XP/XBox (Win32)

+*

+* Description:  Mesa Software WGL (WindowsGL)

+*

+****************************************************************************/

+

+#include <windows.h>

+#define GL_GLEXT_PROTOTYPES

+#include <GL/gl.h>

+#include <GL/glext.h>

+

+#include "glheader.h"

+#include "colors.h"

+#include "context.h"

+#include "colormac.h"

+#include "dd.h"

+#include "depth.h"

+#include "extensions.h"

+#include "macros.h"

+#include "matrix.h"

+// #include "mem.h"

+//#include "mmath.h"

+#include "mtypes.h"

+#include "texformat.h"

+#include "texstore.h"

+#include "teximage.h"

+#include "vbo/vbo.h"

+#include "swrast/swrast.h"

+#include "swrast_setup/swrast_setup.h"

+#include "swrast/s_context.h"

+#include "swrast/s_depth.h"

+#include "swrast/s_lines.h"

+#include "swrast/s_triangle.h"

+#include "swrast/s_trispan.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+#include "dglcontext.h"

+#include "gld_driver.h"

+

+//---------------------------------------------------------------------------

+//---------------------------------------------------------------------------

+

+DGL_pixelFormat pfTemplateMesaSW =

+{

+    {

+	sizeof(PIXELFORMATDESCRIPTOR),	// Size of the data structure

+		1,							// Structure version - should be 1

+									// Flags:

+		PFD_DRAW_TO_WINDOW |		// The buffer can draw to a window or device surface.

+		PFD_DRAW_TO_BITMAP |		// The buffer can draw to a bitmap. (DaveM)

+		PFD_SUPPORT_GDI |			// The buffer supports GDI drawing. (DaveM)

+		PFD_SUPPORT_OPENGL |		// The buffer supports OpenGL drawing.

+		PFD_DOUBLEBUFFER |			// The buffer is double-buffered.

+		0,							// Placeholder for easy commenting of above flags

+		PFD_TYPE_RGBA,				// Pixel type RGBA.

+		32,							// Total colour bitplanes (excluding alpha bitplanes)

+		8, 0,						// Red bits, shift

+		8, 8,						// Green bits, shift

+		8, 16,						// Blue bits, shift

+		8, 24,						// Alpha bits, shift (destination alpha)

+		64,							// Accumulator bits (total)

+		16, 16, 16, 16,				// Accumulator bits: Red, Green, Blue, Alpha

+		16,							// Depth bits

+		8,							// Stencil bits

+		0,							// Number of auxiliary buffers

+		0,							// Layer type

+		0,							// Specifies the number of overlay and underlay planes.

+		0,							// Layer mask

+		0,							// Specifies the transparent color or index of an underlay plane.

+		0							// Damage mask

+	},

+	0,	// Unused

+};

+

+//---------------------------------------------------------------------------

+// Extensions

+//---------------------------------------------------------------------------

+

+typedef struct {

+	PROC proc;

+	char *name;

+}  GLD_extension;

+

+static GLD_extension GLD_extList[] = {

+#ifdef GL_EXT_polygon_offset

+    {	(PROC)glPolygonOffsetEXT,		"glPolygonOffsetEXT"		},

+#endif

+    {	(PROC)glBlendEquationEXT,		"glBlendEquationEXT"		},

+    {	(PROC)glBlendColorEXT,			"glBlendColorExt"			},

+    {	(PROC)glVertexPointerEXT,		"glVertexPointerEXT"		},

+    {	(PROC)glNormalPointerEXT,		"glNormalPointerEXT"		},

+    {	(PROC)glColorPointerEXT,		"glColorPointerEXT"			},

+    {	(PROC)glIndexPointerEXT,		"glIndexPointerEXT"			},

+    {	(PROC)glTexCoordPointerEXT,		"glTexCoordPointer"			},

+    {	(PROC)glEdgeFlagPointerEXT,		"glEdgeFlagPointerEXT"		},

+    {	(PROC)glGetPointervEXT,			"glGetPointervEXT"			},

+    {	(PROC)glArrayElementEXT,		"glArrayElementEXT"			},

+    {	(PROC)glDrawArraysEXT,			"glDrawArrayEXT"			},

+    {	(PROC)glAreTexturesResidentEXT,	"glAreTexturesResidentEXT"	},

+    {	(PROC)glBindTextureEXT,			"glBindTextureEXT"			},

+    {	(PROC)glDeleteTexturesEXT,		"glDeleteTexturesEXT"		},

+    {	(PROC)glGenTexturesEXT,			"glGenTexturesEXT"			},

+    {	(PROC)glIsTextureEXT,			"glIsTextureEXT"			},

+    {	(PROC)glPrioritizeTexturesEXT,	"glPrioritizeTexturesEXT"	},

+    {	(PROC)glCopyTexSubImage3DEXT,	"glCopyTexSubImage3DEXT"	},

+    {	(PROC)glTexImage3DEXT,			"glTexImage3DEXT"			},

+    {	(PROC)glTexSubImage3DEXT,		"glTexSubImage3DEXT"		},

+    {	(PROC)glPointParameterfEXT,		"glPointParameterfEXT"		},

+    {	(PROC)glPointParameterfvEXT,	"glPointParameterfvEXT"		},

+    {	(PROC)glLockArraysEXT,			"glLockArraysEXT"			},

+    {	(PROC)glUnlockArraysEXT,		"glUnlockArraysEXT"			},

+	{	NULL,							"\0"						}

+};

+

+//---------------------------------------------------------------------------

+// WMesa Internal Functions

+//---------------------------------------------------------------------------

+

+#define PAGE_FILE	0xffffffff

+

+#define REDBITS		0x03

+#define REDSHIFT	0x00

+#define GREENBITS	0x03

+#define GREENSHIFT	0x03

+#define BLUEBITS	0x02

+#define BLUESHIFT	0x06

+

+typedef struct _dibSection {

+	HDC 	hDC;

+	HANDLE	hFileMap;

+	BOOL	fFlushed;

+	LPVOID	base;

+} WMDIBSECTION, *PWMDIBSECTION;

+

+typedef struct wmesa_context {

+	HWND				Window;

+	HDC 				hDC;

+	HPALETTE			hPalette;

+	HPALETTE			hOldPalette;

+	HPEN				hPen;

+	HPEN				hOldPen;

+	HCURSOR 			hOldCursor;

+	COLORREF			crColor;

+	// 3D projection stuff

+	RECT				drawRect;

+	UINT				uiDIBoffset;

+	// OpenGL stuff

+	HPALETTE			hGLPalette;

+	GLuint				width;

+	GLuint				height;

+	GLuint				ScanWidth;

+	GLboolean			db_flag;	//* double buffered?

+	GLboolean			rgb_flag;	//* RGB mode?

+	GLboolean			dither_flag;	//* use dither when 256 color mode for RGB?

+	GLuint				depth;		//* bits per pixel (1, 8, 24, etc)

+	ULONG				pixel;	// current color index or RGBA pixel value

+	ULONG				clearpixel; //* pixel for clearing the color buffers

+	PBYTE				ScreenMem; // WinG memory

+	BITMAPINFO			*IndexFormat;

+	HPALETTE			hPal; // Current Palette

+	HPALETTE			hPalHalfTone;

+	

+	

+	WMDIBSECTION		dib;

+	BITMAPINFO			bmi;

+	HBITMAP 			hbmDIB;

+	HBITMAP 			hOldBitmap;

+	HBITMAP 			Old_Compat_BM;

+	HBITMAP 			Compat_BM;			  // Bitmap for double buffering

+	PBYTE				pbPixels;

+	int 				nColors;

+	BYTE				cColorBits;

+	int 				pixelformat;

+	

+	RECT					rectOffScreen;

+	RECT					rectSurface;

+//	HWND					hwnd;

+	DWORD					pitch;

+	PBYTE					addrOffScreen;

+

+	// We always double-buffer, for performance reasons, but

+	// we need to know which of SwapBuffers() or glFlush() to

+	// handle. If we're emulating, then we update on Flush(),

+	// otherwise we update on SwapBufers(). KeithH

+	BOOL				bEmulateSingleBuffer;

+} WMesaContext, *PWMC;

+

+#define GLD_GET_WMESA_DRIVER(c)	(WMesaContext*)(c)->glPriv

+

+// TODO:

+GLint stereo_flag = 0 ;

+

+/* If we are double-buffering, we want to get the DC for the

+ * off-screen DIB, otherwise the DC for the window.

+ */

+#define DD_GETDC ((Current->db_flag) ? Current->dib.hDC : Current->hDC )

+#define DD_RELEASEDC

+

+#define FLIP(Y)  (Current->height-(Y)-1)

+

+struct DISPLAY_OPTIONS {

+	int  stereo;

+	int  fullScreen;

+	int	 mode;

+	int	 bpp;

+};

+

+struct DISPLAY_OPTIONS displayOptions;

+

+//---------------------------------------------------------------------------

+

+static unsigned char threeto8[8] = {

+  0, 0111>>1, 0222>>1, 0333>>1, 0444>>1, 0555>>1, 0666>>1, 0377

+};

+

+static unsigned char twoto8[4] = {

+  0, 0x55, 0xaa, 0xff

+};

+

+static unsigned char oneto8[2] = {

+  0, 255

+};

+

+//---------------------------------------------------------------------------

+

+BYTE DITHER_RGB_2_8BIT( int red, int green, int blue, int pixel, int scanline)

+{

+  char unsigned redtemp, greentemp, bluetemp, paletteindex;

+  

+  //*** now, look up each value in the halftone matrix

+  //*** using an 8x8 ordered dither.

+  redtemp = aDividedBy51[red]

+    + (aModulo51[red] > aHalftone8x8[(pixel%8)*8

+				    + scanline%8]);

+  greentemp = aDividedBy51[(char unsigned)green]

+    + (aModulo51[green] > aHalftone8x8[

+      (pixel%8)*8 + scanline%8]);

+  bluetemp = aDividedBy51[(char unsigned)blue]

+    + (aModulo51[blue] > aHalftone8x8[

+      (pixel%8)*8 +scanline%8]);

+  

+  //*** recombine the halftoned rgb values into a palette index

+  paletteindex =

+    redtemp + aTimes6[greentemp] + aTimes36[bluetemp];

+  

+  //*** and translate through the wing halftone palette

+  //*** translation vector to give the correct value.

+  return aWinGHalftoneTranslation[paletteindex];

+}

+

+//---------------------------------------------------------------------------

+

+static unsigned char componentFromIndex(UCHAR i, UINT nbits, UINT shift)

+{

+  unsigned char val;

+  

+  val = i >> shift;

+  switch (nbits) {

+    

+  case 1:

+    val &= 0x1;

+    return oneto8[val];

+    

+  case 2:

+    val &= 0x3;

+    return twoto8[val];

+    

+  case 3:

+    val &= 0x7;

+    return threeto8[val];

+    

+  default:

+    return 0;

+  }

+}

+

+//---------------------------------------------------------------------------

+

+

+void wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)

+{

+	WMesaContext *Current = pwc;

+

+	// Test for invalid scanline parameter. KeithH

+	if ((iScanLine < 0) || (iScanLine >= pwc->height))

+		return;

+

+  if (Current->db_flag) {

+    LPBYTE  lpb = pwc->pbPixels;

+    UINT    nBypp = pwc->cColorBits >> 3;

+    UINT    nOffset = iPixel % nBypp;

+    

+    lpb += pwc->ScanWidth * iScanLine;

+    lpb += iPixel * nBypp;

+    

+    if(nBypp == 1){

+      if(pwc->dither_flag)

+	*lpb = DITHER_RGB_2_8BIT(r,g,b,iScanLine,iPixel);

+      else

+	*lpb = BGR8(r,g,b);

+    }

+    else if(nBypp == 2)

+      *((LPWORD)lpb) = BGR16(r,g,b);

+    else if (nBypp == 3)

+      *((LPDWORD)lpb) = BGR24(r,g,b);

+    else if (nBypp == 4)

+      *((LPDWORD)lpb) = BGR32(r,g,b);

+  }

+  else{

+    SetPixel(Current->hDC, iPixel, iScanLine, RGB(r,g,b));

+  }

+}

+

+//---------------------------------------------------------------------------

+

+void  wmCreateDIBSection(

+  HDC   hDC,

+  PWMC pwc,    // handle of device context

+  CONST BITMAPINFO *pbmi,  // bitmap size, format, and color data

+  UINT iUsage  // color data type indicator: RGB values or palette indices

+  )

+{

+  DWORD   dwSize = 0;

+  DWORD   dwScanWidth;

+  UINT    nBypp = pwc->cColorBits / 8;

+  HDC     hic;

+  

+  dwScanWidth = (((pwc->ScanWidth * nBypp)+ 3) & ~3);

+  

+  pwc->ScanWidth =pwc->pitch = dwScanWidth;

+  

+  if (stereo_flag)

+    pwc->ScanWidth = 2* pwc->pitch;

+  

+  dwSize = sizeof(BITMAPINFO) + (dwScanWidth * pwc->height);

+  

+  pwc->dib.hFileMap = CreateFileMapping((HANDLE)PAGE_FILE,

+					NULL,

+					PAGE_READWRITE | SEC_COMMIT,

+					0,

+					dwSize,

+					NULL);

+  

+  if (!pwc->dib.hFileMap)

+    return;

+  

+  pwc->dib.base = MapViewOfFile(pwc->dib.hFileMap,

+				FILE_MAP_ALL_ACCESS,

+				0,

+				0,

+				0);

+  

+  if(!pwc->dib.base){

+    CloseHandle(pwc->dib.hFileMap);

+    return;

+  }

+  

+

+  CopyMemory(pwc->dib.base, pbmi, sizeof(BITMAPINFO));

+  

+  hic = CreateIC("display", NULL, NULL, NULL);

+  pwc->dib.hDC = CreateCompatibleDC(hic);

+  

+

+  pwc->hbmDIB = CreateDIBSection(hic,

+				 &(pwc->bmi),

+				 (iUsage ? DIB_PAL_COLORS : DIB_RGB_COLORS),

+				 &(pwc->pbPixels),

+				 pwc->dib.hFileMap,

+				 0);

+  pwc->ScreenMem = pwc->addrOffScreen = pwc->pbPixels;

+  pwc->hOldBitmap = SelectObject(pwc->dib.hDC, pwc->hbmDIB);

+  

+  DeleteDC(hic);

+  

+  return;

+  

+}

+

+//---------------------------------------------------------------------------

+

+void wmCreatePalette( PWMC pwdc )

+{

+  /* Create a compressed and re-expanded 3:3:2 palette */

+  int            i;

+  LOGPALETTE     *pPal;

+  BYTE           rb, rs, gb, gs, bb, bs;

+  

+  pwdc->nColors = 0x100;

+  

+  pPal = (PLOGPALETTE)malloc(sizeof(LOGPALETTE) + 

+			     pwdc->nColors * sizeof(PALETTEENTRY));

+  memset( pPal, 0, sizeof(LOGPALETTE) + pwdc->nColors * sizeof(PALETTEENTRY) );

+  

+  pPal->palVersion = 0x300;

+  

+  rb = REDBITS;

+  rs = REDSHIFT;

+  gb = GREENBITS;

+  gs = GREENSHIFT;

+  bb = BLUEBITS;

+  bs = BLUESHIFT;

+  

+  if (pwdc->db_flag) {

+    

+    /* Need to make two palettes: one for the screen DC and one for the DIB. */

+    pPal->palNumEntries = pwdc->nColors;

+    for (i = 0; i < pwdc->nColors; i++) {

+      pPal->palPalEntry[i].peRed = componentFromIndex( i, rb, rs );

+      pPal->palPalEntry[i].peGreen = componentFromIndex( i, gb, gs );

+      pPal->palPalEntry[i].peBlue = componentFromIndex( i, bb, bs );

+      pPal->palPalEntry[i].peFlags = 0;

+    }

+    pwdc->hGLPalette = CreatePalette( pPal );

+    pwdc->hPalette = CreatePalette( pPal );

+  }

+  

+  else {

+    pPal->palNumEntries = pwdc->nColors;

+    for (i = 0; i < pwdc->nColors; i++) {

+      pPal->palPalEntry[i].peRed = componentFromIndex( i, rb, rs );

+      pPal->palPalEntry[i].peGreen = componentFromIndex( i, gb, gs );

+      pPal->palPalEntry[i].peBlue = componentFromIndex( i, bb, bs );

+      pPal->palPalEntry[i].peFlags = 0;

+    }

+    pwdc->hGLPalette = CreatePalette( pPal );

+  }

+  

+  free(pPal);

+  

+}

+

+//---------------------------------------------------------------------------

+

+/* This function sets the color table of a DIB section

+ * to match that of the destination DC

+ */

+BOOL wmSetDibColors(PWMC pwc)

+{

+  RGBQUAD         *pColTab, *pRGB;

+  PALETTEENTRY    *pPal, *pPE;

+  int             i, nColors;

+  BOOL            bRet=TRUE;

+  DWORD           dwErr=0;

+  

+  /* Build a color table in the DIB that maps to the

+   *  selected palette in the DC.

+   */

+  nColors = 1 << pwc->cColorBits;

+  pPal = (PALETTEENTRY *)malloc( nColors * sizeof(PALETTEENTRY));

+  memset( pPal, 0, nColors * sizeof(PALETTEENTRY) );

+  GetPaletteEntries( pwc->hGLPalette, 0, nColors, pPal );

+  pColTab = (RGBQUAD *)malloc( nColors * sizeof(RGBQUAD));

+  for (i = 0, pRGB = pColTab, pPE = pPal; i < nColors; i++, pRGB++, pPE++) {

+    pRGB->rgbRed = pPE->peRed;

+    pRGB->rgbGreen = pPE->peGreen;

+    pRGB->rgbBlue = pPE->peBlue;

+  }

+  if(pwc->db_flag)

+    bRet = SetDIBColorTable(pwc->dib.hDC, 0, nColors, pColTab );

+  

+  if(!bRet)

+    dwErr = GetLastError();

+  

+  free( pColTab );

+  free( pPal );

+  

+  return bRet;

+}

+

+//---------------------------------------------------------------------------

+

+static void wmSetPixelFormat( PWMC wc, HDC hDC)

+{

+  if(wc->rgb_flag)

+    wc->cColorBits = GetDeviceCaps(hDC, BITSPIXEL);

+  else

+    wc->cColorBits = 8;

+  switch(wc->cColorBits){

+  case 8:

+    if(wc->dither_flag != GL_TRUE)

+      wc->pixelformat = PF_INDEX8;

+    else

+      wc->pixelformat = PF_DITHER8;

+    break;

+  case 16:

+    wc->pixelformat = PF_5R6G5B;

+    break;

+  case 32:

+    wc->pixelformat = PF_8R8G8B;

+    break;

+  default:

+    wc->pixelformat = PF_BADFORMAT;

+  }

+}

+

+//---------------------------------------------------------------------------

+

+/*

+ * This function creates the DIB section that is used for combined

+ * GL and GDI calls

+ */

+BOOL wmCreateBackingStore(PWMC pwc, long lxSize, long lySize)

+{

+  HDC hdc = pwc->hDC;

+  LPBITMAPINFO pbmi = &(pwc->bmi);

+  int     iUsage;

+  

+  pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

+  pbmi->bmiHeader.biWidth = lxSize;

+  pbmi->bmiHeader.biHeight= -lySize;

+  pbmi->bmiHeader.biPlanes = 1;

+  if(pwc->rgb_flag)

+    pbmi->bmiHeader.biBitCount = GetDeviceCaps(pwc->hDC, BITSPIXEL);

+  else

+    pbmi->bmiHeader.biBitCount = 8;

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

+  

+  iUsage = (pbmi->bmiHeader.biBitCount <= 8) ? DIB_PAL_COLORS : DIB_RGB_COLORS;

+

+  pwc->cColorBits = pbmi->bmiHeader.biBitCount;

+  pwc->ScanWidth = pwc->pitch = lxSize;

+  pwc->width = lxSize;

+  pwc->height = lySize;

+  

+  wmCreateDIBSection(hdc, pwc, pbmi, iUsage);

+  

+  if ((iUsage == DIB_PAL_COLORS) && !(pwc->hGLPalette)) {

+    wmCreatePalette( pwc );

+    wmSetDibColors( pwc );

+  }

+  wmSetPixelFormat(pwc, pwc->hDC);

+  return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+/*

+ * Free up the dib section that was created

+ */

+BOOL wmDeleteBackingStore(PWMC pwc)

+{

+  SelectObject(pwc->dib.hDC, pwc->hOldBitmap);

+  DeleteDC(pwc->dib.hDC);

+  DeleteObject(pwc->hbmDIB);

+  UnmapViewOfFile(pwc->dib.base);

+  CloseHandle(pwc->dib.hFileMap);

+  return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+/*

+ * Blit memory DC to screen DC

+ */

+BOOL wmFlush(PWMC pwc, HDC hDC)

+{

+  BOOL    bRet = 0;

+  DWORD   dwErr = 0;

+  

+// Now using bEmulateSingleBuffer in the calling function. KeithH

+

+//  if(pwc->db_flag){

+    bRet = BitBlt(hDC, 0, 0, pwc->width, pwc->height,

+		  pwc->dib.hDC, 0, 0, SRCCOPY);

+//  }

+  

+  return bRet;

+  

+}

+

+//---------------------------------------------------------------------------

+// Support Functions

+//---------------------------------------------------------------------------

+

+static void flush(struct gl_context* ctx)

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+/*

+  if((Current->rgb_flag &&!(Current->db_flag))

+     ||(!Current->rgb_flag))

+    {

+      wmFlush(Current, Current->hDC);

+    }

+*/

+	// Only flush if we're not in double-buffer mode. KeithH

+	// The demo fractal.c calls glutSwapBuffers() then glFlush()!

+	if (Current->bEmulateSingleBuffer) {

+		wmFlush(Current, Current->hDC);

+	}

+}

+

+

+//---------------------------------------------------------------------------

+

+/*

+ * Set the color used to clear the color buffer.

+ */

+//static void clear_color( struct gl_context* ctx, const GLchan color[4] )

+// Changed for Mesa 5.x. KeithH

+static void clear_color(

+	struct gl_context* ctx,

+	const GLfloat color[4])

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+	GLubyte col[4];

+	CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);

+	CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);

+	CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);

+	Current->clearpixel = RGB(col[0], col[1], col[2]);

+}

+

+

+//---------------------------------------------------------------------------

+

+

+/*

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

+ * We also only clear the color buffers if the color masks are all 1's.

+ * Otherwise, we let swrast do it.

+ */

+

+static clear(struct gl_context* ctx, GLbitfield mask,

+	     GLboolean all, GLint x, GLint y, GLint width, GLint height)

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  DWORD   dwColor;

+  WORD    wColor;

+  BYTE    bColor;

+  LPDWORD lpdw = (LPDWORD)Current->pbPixels;

+  LPWORD  lpw = (LPWORD)Current->pbPixels;

+  LPBYTE  lpb = Current->pbPixels;

+  int     lines;

+  const   GLuint *colorMask = (GLuint *) &ctx->Color.ColorMask;

+  

+  if (all){

+    x=y=0;

+    width=Current->width;

+    height=Current->height;

+  }

+  

+  

+  /* sanity check - can't have right(stereo) buffers */

+  assert((mask & (DD_FRONT_RIGHT_BIT | DD_BACK_RIGHT_BIT)) == 0);

+  

+  /* clear alpha */

+  if ((mask & (DD_FRONT_LEFT_BIT | DD_BACK_RIGHT_BIT)) &&

+      ctx->DrawBuffer->UseSoftwareAlphaBuffers &&

+      ctx->Color.ColorMask[ACOMP]) {

+      _swrast_clear_alpha_buffers( ctx );

+  }

+  

+  if (*colorMask == 0xffffffff && ctx->Color.IndexMask == 0xffffffff) {

+      if (mask & DD_BACK_LEFT_BIT) {

+	  /* Double-buffering - clear back buffer */

+	  UINT    nBypp = Current->cColorBits / 8;

+	  int     i = 0;

+	  int     iSize = 0;

+	  

+	  assert(Current->db_flag==GL_TRUE); /* we'd better be double buffer */

+	  if(nBypp ==1 ){

+	      iSize = Current->width/4;

+	      bColor  = BGR8(GetRValue(Current->clearpixel),

+			     GetGValue(Current->clearpixel),

+			     GetBValue(Current->clearpixel));

+	      wColor  = MAKEWORD(bColor,bColor);

+	      dwColor = MAKELONG(wColor, wColor);

+	  }

+	  if(nBypp == 2){

+	      iSize = Current->width / 2;

+	      wColor = BGR16(GetRValue(Current->clearpixel),

+			     GetGValue(Current->clearpixel),

+			     GetBValue(Current->clearpixel));

+	      dwColor = MAKELONG(wColor, wColor);

+	  }

+	  else if(nBypp == 4){

+	      iSize = Current->width;

+	      dwColor = BGR32(GetRValue(Current->clearpixel),

+			      GetGValue(Current->clearpixel),

+			      GetBValue(Current->clearpixel));

+	  }

+	  

+	  /* clear a line */

+	  while(i < iSize){

+	      *lpdw = dwColor;

+	      lpdw++;

+	      i++;

+	  }

+	  

+	  /* This is the 24bit case */

+	  if (nBypp == 3) {

+	      iSize = Current->width *3/4;

+	      dwColor = BGR24(GetRValue(Current->clearpixel),

+			      GetGValue(Current->clearpixel),

+			      GetBValue(Current->clearpixel));

+	      while(i < iSize){

+		  *lpdw = dwColor;

+		  lpb += nBypp;

+		  lpdw = (LPDWORD)lpb;

+		  i++;

+	      }

+	  }

+	  

+	  i = 0;

+	  if (stereo_flag)

+	      lines = height /2;

+	  else

+	      lines = height;

+	  /* copy cleared line to other lines in buffer */

+	  do {

+	      memcpy(lpb, Current->pbPixels, iSize*4);

+	      lpb += Current->ScanWidth;

+	      i++;

+	  }

+	  while (i<lines-1);

+	  mask &= ~DD_BACK_LEFT_BIT;

+      } /* double-buffer */

+      

+      if (mask & DD_FRONT_LEFT_BIT) {

+	  /* single-buffer */

+	  HDC DC=DD_GETDC;

+	  HPEN Pen=CreatePen(PS_SOLID,1,Current->clearpixel);

+	  HBRUSH Brush=CreateSolidBrush(Current->clearpixel);

+	  HPEN Old_Pen=SelectObject(DC,Pen);

+	  HBRUSH Old_Brush=SelectObject(DC,Brush);

+	  Rectangle(DC,x,y,x+width,y+height);

+	  SelectObject(DC,Old_Pen);

+	  SelectObject(DC,Old_Brush);

+	  DeleteObject(Pen);

+	  DeleteObject(Brush);

+	  DD_RELEASEDC;

+	  mask &= ~DD_FRONT_LEFT_BIT;

+      } /* single-buffer */

+  } /* if masks are all 1's */

+    

+  /* Call swrast if there is anything left to clear (like DEPTH) */

+  if (mask)

+      _swrast_Clear( ctx, mask, all, x, y, width, height );

+}

+  

+

+//---------------------------------------------------------------------------

+

+

+static void enable( struct gl_context* ctx, GLenum pname, GLboolean enable )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+

+	if (!Current)

+		return;

+	

+	if (pname == GL_DITHER) {

+		if(enable == GL_FALSE){

+			Current->dither_flag = GL_FALSE;

+			if(Current->cColorBits == 8)

+				Current->pixelformat = PF_INDEX8;

+		}

+		else{

+			if (Current->rgb_flag && Current->cColorBits == 8){

+				Current->pixelformat = PF_DITHER8;

+				Current->dither_flag = GL_TRUE;

+			}

+			else

+				Current->dither_flag = GL_FALSE;

+		}

+	}

+}

+

+//---------------------------------------------------------------------------

+

+static GLboolean set_draw_buffer( struct gl_context* ctx, GLenum mode )

+{

+  /* TODO: this could be better */

+  if (mode==GL_FRONT_LEFT || mode==GL_BACK_LEFT) {

+    return GL_TRUE;

+  }

+  else {

+    return GL_FALSE;

+  }

+}

+

+//---------------------------------------------------------------------------

+

+

+static void set_read_buffer(struct gl_context *ctx, struct gl_framebuffer *colorBuffer,

+                            GLenum buffer )

+{

+  /* XXX todo */

+  return;

+}

+

+

+//---------------------------------------------------------------------------

+

+

+/* Return characteristics of the output buffer. */

+//static void buffer_size( struct gl_context* ctx, GLuint *width, GLuint *height )

+// Altered for Mesa 5.x. KeithH

+static void buffer_size(

+	struct gl_framebuffer *buffer,

+	GLuint *width,

+	GLuint *height)

+{

+	// For some reason the context is not passed into this function.

+	// Therefore we have to explicitly retrieve it.

+	GET_CURRENT_CONTEXT(ctx);

+

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+	int New_Size;

+	RECT CR;

+	

+	GetClientRect(Current->Window,&CR);

+	

+	*width=CR.right;

+	*height=CR.bottom;

+	

+	New_Size=((*width)!=Current->width) || ((*height)!=Current->height);

+	

+	if (New_Size){

+		Current->width=*width;

+		Current->height=*height;

+		Current->ScanWidth=Current->width;

+		if ((Current->ScanWidth%sizeof(long))!=0)

+			Current->ScanWidth+=(sizeof(long)-(Current->ScanWidth%sizeof(long)));

+		

+		if (Current->db_flag){

+			if (Current->rgb_flag==GL_TRUE && Current->dither_flag!=GL_TRUE){

+				wmDeleteBackingStore(Current);

+				wmCreateBackingStore(Current, Current->width, Current->height);

+			}

+		}

+		

+	}

+}

+

+

+

+/**********************************************************************/

+/*****           Accelerated point, line, polygon rendering       *****/

+/**********************************************************************/

+

+/* Accelerated routines are not implemented in 4.0. See OSMesa for ideas. */

+

+static void fast_rgb_points( struct gl_context* ctx, GLuint first, GLuint last )

+{

+}

+

+//---------------------------------------------------------------------------

+

+/* Return pointer to accelerated points function */

+extern tnl_points_func choose_points_function( struct gl_context* ctx )

+{

+  return NULL;

+}

+

+//---------------------------------------------------------------------------

+

+static void fast_flat_rgb_line( struct gl_context* ctx, GLuint v0, 

+				GLuint v1, GLuint pv )

+{

+}

+

+//---------------------------------------------------------------------------

+

+static tnl_line_func choose_line_function( struct gl_context* ctx )

+{

+}

+

+

+/**********************************************************************/

+/*****                 Span-based pixel drawing                   *****/

+/**********************************************************************/

+

+

+/* Write a horizontal span of 32-bit color-index pixels with a boolean mask. */

+static void write_ci32_span( const struct gl_context* ctx,

+                             GLuint n, GLint x, GLint y,

+                             const GLuint index[],

+                             const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  PBYTE Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++)

+    if (mask[i])

+      Mem[i]=index[i];

+}

+

+

+//---------------------------------------------------------------------------

+

+/* Write a horizontal span of 8-bit color-index pixels with a boolean mask. */

+static void write_ci8_span( const struct gl_context* ctx,

+                            GLuint n, GLint x, GLint y,

+                            const GLubyte index[],

+                            const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  PBYTE Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++)

+    if (mask[i])

+      Mem[i]=index[i];

+}

+

+

+//---------------------------------------------------------------------------

+

+

+/*

+ * Write a horizontal span of pixels with a boolean mask.  The current

+ * color index is used for all pixels.

+ */

+static void write_mono_ci_span(const struct gl_context* ctx,

+                               GLuint n,GLint x,GLint y,

+                               GLuint colorIndex, const GLubyte mask[])

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  BYTE *Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++)

+    if (mask[i])

+      Mem[i]=colorIndex;

+}

+

+//---------------------------------------------------------------------------

+

+/*

+ * To improve the performance of this routine, frob the data into an actual

+ * scanline and call bitblt on the complete scan line instead of SetPixel.

+ */

+

+/* Write a horizontal span of RGBA color pixels with a boolean mask. */

+static void write_rgba_span( const struct gl_context* ctx, GLuint n, GLint x, GLint y,

+                             const GLubyte rgba[][4], const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  PWMC    pwc = Current;

+  

+  if (pwc->rgb_flag==GL_TRUE)

+    {

+      GLuint i;

+      HDC DC=DD_GETDC;

+      y=FLIP(y);

+      if (mask) {

+	for (i=0; i<n; i++)

+	  if (mask[i])

+	    wmSetPixel(pwc, y, x + i, 

+		       rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);

+      }

+      else {

+	for (i=0; i<n; i++)

+	  wmSetPixel(pwc, y, x + i, 

+		     rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP] );

+      }

+      DD_RELEASEDC;

+    }

+  else

+    {

+      GLuint i;

+      BYTE *Mem=Current->ScreenMem+y*Current->ScanWidth+x;

+      y = FLIP(y);

+      if (mask) {

+	for (i=0; i<n; i++)

+	  if (mask[i])

+	    Mem[i] = GetNearestPaletteIndex(Current->hPal, 

+					    RGB(rgba[i][RCOMP], 

+						rgba[i][GCOMP], 

+						rgba[i][BCOMP]));

+      }

+      else {

+	for (i=0; i<n; i++)

+	  Mem[i] = GetNearestPaletteIndex(Current->hPal,

+					  RGB(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( const struct gl_context* ctx,

+                            GLuint n, GLint x, GLint y,

+                            const GLubyte rgb[][3], const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  PWMC    pwc = Current;

+  

+  if (pwc->rgb_flag==GL_TRUE)

+    {

+      GLuint i;

+      HDC DC=DD_GETDC;

+      y=FLIP(y);

+      if (mask) {

+	for (i=0; i<n; i++)

+	  if (mask[i])

+	    wmSetPixel(pwc, y, x + i, 

+		       rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP]);

+      }

+      else {

+	for (i=0; i<n; i++)

+	  wmSetPixel(pwc, y, x + i, 

+		     rgb[i][RCOMP], rgb[i][GCOMP], rgb[i][BCOMP] );

+      }

+      DD_RELEASEDC;

+    }

+  else

+    {

+      GLuint i;

+      BYTE *Mem=Current->ScreenMem+y*Current->ScanWidth+x;

+      y = FLIP(y);

+      if (mask) {

+	for (i=0; i<n; i++)

+	  if (mask[i])

+	    Mem[i] = GetNearestPaletteIndex(Current->hPal,

+					    RGB(rgb[i][RCOMP], 

+						rgb[i][GCOMP], 

+						rgb[i][BCOMP]));

+      }

+      else {

+	for (i=0; i<n; i++)

+	  Mem[i] = GetNearestPaletteIndex(Current->hPal,

+					  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( const struct gl_context* ctx,

+                                  GLuint n, GLint x, GLint y,

+                                  const GLchan color[4], const GLubyte mask[])

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  ULONG pixel =  RGB( color[RCOMP], color[GCOMP], color[BCOMP] );

+  GLuint i;

+  HDC DC=DD_GETDC;

+  PWMC pwc = Current;

+  assert(Current->rgb_flag==GL_TRUE);

+  y=FLIP(y);

+  if(Current->rgb_flag==GL_TRUE){

+    for (i=0; i<n; i++)

+      if (mask[i])

+	wmSetPixel(pwc,y,x+i,color[RCOMP], color[GCOMP], color[BCOMP]);

+  }

+  else {

+    for (i=0; i<n; i++)

+      if (mask[i])

+	SetPixel(DC, y, x+i, pixel);

+  }

+  DD_RELEASEDC;

+}

+

+

+

+/**********************************************************************/

+/*****                   Array-based pixel drawing                *****/

+/**********************************************************************/

+

+

+/* Write an array of 32-bit index pixels with a boolean mask. */

+static void write_ci32_pixels( const struct gl_context* ctx,

+                               GLuint n, const GLint x[], const GLint y[],

+                               const GLuint index[], const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++) {

+    if (mask[i]) {

+      BYTE *Mem=Current->ScreenMem+FLIP(y[i])*Current->ScanWidth+x[i];

+      *Mem = index[i];

+    }

+  }

+}

+

+

+//---------------------------------------------------------------------------

+

+

+/*

+ * Write an array of pixels with a boolean mask.  The current color

+ * index is used for all pixels.

+ */

+static void write_mono_ci_pixels( const struct gl_context* ctx,

+                                  GLuint n,

+                                  const GLint x[], const GLint y[],

+                                  GLuint colorIndex, const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++) {

+    if (mask[i]) {

+      BYTE *Mem=Current->ScreenMem+FLIP(y[i])*Current->ScanWidth+x[i];

+      *Mem = colorIndex;

+    }

+  }

+}

+

+

+//---------------------------------------------------------------------------

+

+

+/* Write an array of RGBA pixels with a boolean mask. */

+static void write_rgba_pixels( const struct gl_context* ctx,

+                               GLuint n, const GLint x[], const GLint y[],

+                               const GLubyte rgba[][4], const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  PWMC    pwc = Current;

+  HDC DC=DD_GETDC;

+  assert(Current->rgb_flag==GL_TRUE);

+  for (i=0; i<n; i++)

+    if (mask[i])

+      wmSetPixel(pwc, FLIP(y[i]), x[i],

+		 rgba[i][RCOMP], rgba[i][GCOMP], rgba[i][BCOMP]);

+  DD_RELEASEDC;

+}

+

+

+//---------------------------------------------------------------------------

+

+

+/*

+ * Write an array of pixels with a boolean mask.  The current color

+ * is used for all pixels.

+ */

+static void write_mono_rgba_pixels( const struct gl_context* ctx,

+                                    GLuint n,

+                                    const GLint x[], const GLint y[],

+                                    const GLchan color[4],

+                                    const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  PWMC    pwc = Current;

+  HDC DC=DD_GETDC;

+  assert(Current->rgb_flag==GL_TRUE);

+  for (i=0; i<n; i++)

+    if (mask[i])

+      wmSetPixel(pwc, FLIP(y[i]),x[i],color[RCOMP],

+		 color[GCOMP], color[BCOMP]);

+  DD_RELEASEDC;

+}

+

+/**********************************************************************/

+/*****            Read spans/arrays of pixels                     *****/

+/**********************************************************************/

+

+/* Read a horizontal span of color-index pixels. */

+static void read_ci32_span( const struct gl_context* ctx, GLuint n, GLint x, GLint y,

+                            GLuint index[])

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  BYTE *Mem=Current->ScreenMem+FLIP(y)*Current->ScanWidth+x;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++)

+    index[i]=Mem[i];

+}

+

+//---------------------------------------------------------------------------

+

+/* Read an array of color index pixels. */

+static void read_ci32_pixels( const struct gl_context* ctx,

+                              GLuint n, const GLint x[], const GLint y[],

+                              GLuint indx[], const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  assert(Current->rgb_flag==GL_FALSE);

+  for (i=0; i<n; i++) {

+    if (mask[i]) {

+      indx[i]=*(Current->ScreenMem+FLIP(y[i])*Current->ScanWidth+x[i]);

+    }

+  }

+}

+

+//---------------------------------------------------------------------------

+

+/* Read a horizontal span of color pixels. */

+static void read_rgba_span( const struct gl_context* ctx,

+                            GLuint n, GLint x, GLint y,

+                            GLubyte rgba[][4] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  UINT i;

+  COLORREF Color;

+  HDC DC=DD_GETDC;

+  assert(Current->rgb_flag==GL_TRUE);

+  y = Current->height - y - 1;

+  for (i=0; i<n; i++) {

+    Color=GetPixel(DC,x+i,y);

+    rgba[i][RCOMP] = GetRValue(Color);

+    rgba[i][GCOMP] = GetGValue(Color);

+    rgba[i][BCOMP] = GetBValue(Color);

+    rgba[i][ACOMP] = 255;

+  }

+  DD_RELEASEDC;

+}

+

+//---------------------------------------------------------------------------

+

+/* Read an array of color pixels. */

+static void read_rgba_pixels( const struct gl_context* ctx,

+                              GLuint n, const GLint x[], const GLint y[],

+                              GLubyte rgba[][4], const GLubyte mask[] )

+{

+	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);

+	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);

+  GLuint i;

+  COLORREF Color;

+  HDC DC=DD_GETDC;

+  assert(Current->rgb_flag==GL_TRUE);

+  for (i=0; i<n; i++) {

+    if (mask[i]) {

+      GLint y2 = Current->height - y[i] - 1;

+      Color=GetPixel(DC,x[i],y2);

+      rgba[i][RCOMP] = GetRValue(Color);

+      rgba[i][GCOMP] = GetGValue(Color);

+      rgba[i][BCOMP] = GetBValue(Color);

+      rgba[i][ACOMP] = 255;

+    }

+  }

+  DD_RELEASEDC;

+}

+

+//---------------------------------------------------------------------------

+

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

+}

+

+//---------------------------------------------------------------------------

+

+static void wmesa_viewport(

+	struct gl_context *ctx,

+	GLint x,

+	GLint y,

+	GLsizei w,

+	GLsizei h)

+{

+//	ctx->Driver.ResizeBuffersMESA(ctx);

+}

+

+//---------------------------------------------------------------------------

+

+static void wmesa_update_state_first_time(

+	struct gl_context *ctx,

+	GLuint new_state)

+{

+	struct swrast_device_driver	*swdd = _swrast_GetDeviceDriverReference( ctx );

+	TNLcontext					*tnl = TNL_CONTEXT(ctx);

+	

+        _mesa_init_driver_functions(&ctx->Driver);

+

+	/*

+	* XXX these function pointers could be initialized just once during

+	* context creation since they don't depend on any state changes.

+	* kws - This is true - this function gets called a lot and it

+	* would be good to minimize setting all this when not needed.

+	*/

+	// Good idea, so I'll do it. KeithH. :-)

+

+	ctx->Driver.GetString				= _gldGetStringGeneric;

+	ctx->Driver.UpdateState				= wmesa_update_state;

+	ctx->Driver.DrawBuffer				= set_draw_buffer;

+	ctx->Driver.ResizeBuffers			= _swrast_alloc_buffers;

+	ctx->Driver.GetBufferSize			= buffer_size;

+

+	ctx->Driver.Viewport				= wmesa_viewport;

+	

+	ctx->Driver.Clear					= clear;

+	

+	ctx->Driver.Flush					= flush;

+	ctx->Driver.ClearColor				= clear_color;

+	ctx->Driver.Enable					= enable;

+	

+	

+	// Does not apply for Mesa 5.x

+	//ctx->Driver.BaseCompressedTexFormat	= _mesa_base_compressed_texformat;

+	//ctx->Driver.CompressedTextureSize	= _mesa_compressed_texture_size;

+	//ctx->Driver.GetCompressedTexImage	= _mesa_get_compressed_teximage;

+	

+	swdd->SetBuffer					= set_read_buffer;

+	

+	

+	/* Pixel/span writing functions: */

+	swdd->WriteRGBASpan        = write_rgba_span;

+	swdd->WriteRGBSpan         = write_rgb_span;

+	swdd->WriteMonoRGBASpan    = write_mono_rgba_span;

+	swdd->WriteRGBAPixels      = write_rgba_pixels;

+	swdd->WriteMonoRGBAPixels  = write_mono_rgba_pixels;

+	swdd->WriteCI32Span        = write_ci32_span;

+	swdd->WriteCI8Span         = write_ci8_span;

+	swdd->WriteMonoCISpan      = write_mono_ci_span;

+	swdd->WriteCI32Pixels      = write_ci32_pixels;

+	swdd->WriteMonoCIPixels    = write_mono_ci_pixels;

+	

+	swdd->ReadCI32Span        = read_ci32_span;

+	swdd->ReadRGBASpan        = read_rgba_span;

+	swdd->ReadCI32Pixels      = read_ci32_pixels;

+	swdd->ReadRGBAPixels      = read_rgba_pixels;

+	

+	

+	tnl->Driver.RunPipeline = _tnl_run_pipeline;

+	

+	wmesa_update_state(ctx, new_state);

+}

+

+//---------------------------------------------------------------------------

+// Driver interface functions

+//---------------------------------------------------------------------------

+

+BOOL gldCreateDrawable_MesaSW(

+	DGL_ctx *pCtx,

+	BOOL bPersistantInterface,

+	BOOL bPersistantBuffers)

+{

+	WMesaContext *c;

+	GLboolean true_color_flag;

+	GLboolean rgb_flag = GL_TRUE;

+	GLboolean db_flag = GL_TRUE;

+

+	if (pCtx == NULL)

+		return FALSE;

+

+	c = (struct wmesa_context * ) calloc(1,sizeof(struct wmesa_context));

+	if (!c)

+		return FALSE;

+

+	pCtx->glPriv = c;

+

+	c->hDC		= pCtx->hDC;

+	c->Window	= pCtx->hWnd;

+

+	true_color_flag = GetDeviceCaps(pCtx->hDC, BITSPIXEL) > 8;

+	

+	

+#ifdef DITHER

+	if ((true_color_flag==GL_FALSE) && (rgb_flag == GL_TRUE)){

+		c->dither_flag = GL_TRUE;

+		c->hPalHalfTone = WinGCreateHalftonePalette();

+	}

+	else

+		c->dither_flag = GL_FALSE;

+#else

+	c->dither_flag = GL_FALSE;

+#endif

+	

+	

+	if (rgb_flag==GL_FALSE)

+    {

+		c->rgb_flag = GL_FALSE;

+#if 0

+		/* Old WinG stuff???? */

+		c->db_flag = db_flag =GL_TRUE; /* WinG requires double buffering */

+		printf("Single buffer is not supported in color index mode, ",

+			"setting to double buffer.\n");

+#endif

+    }

+	else

+    {

+		c->rgb_flag = GL_TRUE;

+    }

+

+//	db_flag = pCtx->lpPF->pfd.dwFlags & PFD_DOUBLEBUFFER ? GL_TRUE : GL_FALSE;

+	db_flag = GL_TRUE; // Force double-buffer

+	if (db_flag) {

+		c->db_flag = 1;

+		/* Double buffered */

+		{

+			wmCreateBackingStore(c, pCtx->dwWidth, pCtx->dwHeight);

+			

+		}

+    } else {

+		/* Single Buffered */

+		if (c->rgb_flag)

+			c->db_flag = 0;

+    }	

+

+	c->bEmulateSingleBuffer = (pCtx->lpPF->pfd.dwFlags & PFD_DOUBLEBUFFER)

+		? FALSE : TRUE;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldResizeDrawable_MesaSW(

+	DGL_ctx *ctx,

+	BOOL bDefaultDriver,

+	BOOL bPersistantInterface,

+	BOOL bPersistantBuffers)

+{

+	WMesaContext *c;

+

+	if (ctx == NULL)

+		return FALSE;

+

+	c = ctx->glPriv;

+	if (c == NULL)

+		return FALSE;

+

+	c->hDC = ctx->hDC;

+	c->Window = ctx->hWnd;

+//	c->width = ctx->dwWidth;

+//	c->height = ctx->dwHeight;

+

+	if (c->db_flag) {

+		wmDeleteBackingStore(c);

+		wmCreateBackingStore(c, ctx->dwWidth, ctx->dwHeight);

+	}

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldDestroyDrawable_MesaSW(

+	DGL_ctx *ctx)

+{

+	WMesaContext *c;

+

+	if (ctx == NULL)

+		return FALSE;

+

+	c = ctx->glPriv;

+	if (c == NULL)

+		return FALSE;

+

+	if (c->hPalHalfTone != NULL)

+		DeleteObject(c->hPalHalfTone);

+    

+	if (c->db_flag)

+		wmDeleteBackingStore(c);

+

+	free(c);

+

+	ctx->glPriv = NULL;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldCreatePrivateGlobals_MesaSW(void)

+{

+	// Mesa Software driver needs no private globals

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldDestroyPrivateGlobals_MesaSW(void)

+{

+	// Mesa Software driver needs no private globals

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldBuildPixelformatList_MesaSW(void)

+{

+	// Release any existing pixelformat list

+	if (glb.lpPF) {

+		free(glb.lpPF);

+	}

+

+	glb.nPixelFormatCount	= 0;

+	glb.lpPF				= NULL;

+

+	glb.lpPF = (DGL_pixelFormat *)calloc(2, sizeof(DGL_pixelFormat));

+	if (glb.lpPF == NULL)

+		return FALSE;

+	// Single-buffered

+	memcpy(&glb.lpPF[0], &pfTemplateMesaSW, sizeof(DGL_pixelFormat));

+	glb.lpPF[0].pfd.dwFlags &= ~PFD_DOUBLEBUFFER; // Remove doublebuffer flag

+	// Double-buffered

+	memcpy(&glb.lpPF[1], &pfTemplateMesaSW, sizeof(DGL_pixelFormat));

+	glb.nPixelFormatCount = 2;

+

+	// Mark list as 'current'

+	glb.bPixelformatsDirty = FALSE;

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldInitialiseMesa_MesaSW(

+	DGL_ctx *gld)

+{

+	struct gl_context *ctx;

+

+	if (gld == NULL)

+		return FALSE;

+

+	ctx = gld->glCtx;

+

+	// Set max texture size to 256

+	ctx->Const.MaxTextureLevels = 8;

+

+	// Multitexture enable/disable

+	ctx->Const.MaxTextureUnits = (glb.bMultitexture) ? MAX_TEXTURE_UNITS : 1;

+

+	/* Initialize the software rasterizer and helper modules.*/

+

+	// Added this to force max texture diminsion to 256. KeithH

+	ctx->Const.MaxTextureLevels = 8;

+	ctx->Const.MaxDrawBuffers = 1;

+

+	_mesa_enable_sw_extensions(ctx);

+	_mesa_enable_imaging_extensions(ctx);

+	_mesa_enable_1_3_extensions(ctx);

+	

+//	_swrast_CreateContext( ctx );

+//	_vbo_CreateContext( ctx );

+//	_tnl_CreateContext( ctx );

+//	_swsetup_CreateContext( ctx );

+	

+	_swsetup_Wakeup( ctx );

+	

+	wmesa_update_state_first_time(ctx, ~0);

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldSwapBuffers_MesaSW(

+	DGL_ctx *ctx,

+	HDC hDC,

+	HWND hWnd)

+{

+	WMesaContext *c;

+

+	if (ctx == NULL)

+		return FALSE;

+

+	c = ctx->glPriv;

+	if (c == NULL)

+		return FALSE;

+	

+	/* If we're swapping the buffer associated with the current context

+	* we have to flush any pending rendering commands first.

+	*/

+

+	// Altered to respect bEmulateSingleBuffer. KeithH

+//	if (c->db_flag)

+	if (!c->bEmulateSingleBuffer)

+		wmFlush(c, hDC);

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

+PROC gldGetProcAddress_MesaSW(

+	LPCSTR a)

+{

+	int		i;

+	PROC	proc = NULL;

+

+	for (i=0; GLD_extList[i].proc; i++) {

+		if (!strcmp(a, GLD_extList[i].name)) {

+			proc = GLD_extList[i].proc;

+			break;

+		}

+	}

+

+	gldLogPrintf(GLDLOG_INFO, "GetProcAddress: %s (%s)", a, proc ? "OK" : "Failed");

+

+	return proc;

+}

+

+//---------------------------------------------------------------------------

+

+BOOL gldGetDisplayMode_MesaSW(

+	DGL_ctx *ctx,

+	GLD_displayMode *glddm)

+{

+	HDC hdcDesktop;

+

+	if (glddm == NULL)

+		return FALSE;

+

+	//

+	// A bit hacky... KeithH

+	//

+

+	hdcDesktop = GetDC(NULL);

+	glddm->Width	= GetDeviceCaps(hdcDesktop, HORZRES);

+	glddm->Height	= GetDeviceCaps(hdcDesktop, VERTRES);

+	glddm->BPP		= GetDeviceCaps(hdcDesktop, BITSPIXEL);

+	glddm->Refresh	= 0;

+	ReleaseDC(0, hdcDesktop);

+

+	return TRUE;

+}

+

+//---------------------------------------------------------------------------

+

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/opengl32.ref b/mesalib/src/mesa/drivers/windows/gldirect/opengl32.ref
new file mode 100644
index 000000000..3a4933e54
--- /dev/null
+++ b/mesalib/src/mesa/drivers/windows/gldirect/opengl32.ref
@@ -0,0 +1,495 @@
+;****************************************************************************

+;*

+;*                        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/2000/XP/XBox (Win32)

+;*

+;* Description:  DLL Module definition file

+;*

+;****************************************************************************/

+

+DESCRIPTION 'GLDirect'

+

+VERSION 3.0

+

+EXPORTS

+ glAccum

+ glAlphaFunc

+ glAreTexturesResident

+ glArrayElement

+ glBegin

+ glBindTexture

+ glBitmap

+ glBlendFunc

+ glCallList

+ glCallLists

+ glClear

+ glClearAccum

+ glClearIndex

+ glClearColor

+ glClearDepth

+ glClearStencil

+ glClipPlane

+ glColor3b

+ glColor3d

+ glColor3f

+ glColor3i

+ glColor3s

+ glColor3ub

+ glColor3ui

+ glColor3us

+ glColor4b

+ glColor4d

+ glColor4f

+ glColor4i

+ glColor4s

+ glColor4ub

+ glColor4ui

+ glColor4us

+ glColor3bv

+ glColor3dv

+ glColor3fv

+ glColor3iv

+ glColor3sv

+ glColor3ubv

+ glColor3uiv

+ glColor3usv

+ glColor4bv

+ glColor4dv

+ glColor4fv

+ glColor4iv

+ glColor4sv

+ glColor4ubv

+ glColor4uiv

+ glColor4usv

+ glColorMask

+ glColorMaterial

+ glColorPointer

+ glColorTableEXT

+ glColorSubTableEXT

+ glCopyPixels

+ glCopyTexImage1D

+ glCopyTexImage2D

+ glCopyTexSubImage1D

+ glCopyTexSubImage2D

+ glCullFace

+ glDepthFunc

+ glDepthMask

+ glDepthRange

+ glDeleteLists

+ glDeleteTextures

+ glDisable

+ glDisableClientState

+ glDrawArrays

+ glDrawBuffer

+ glDrawElements

+ glDrawPixels

+ glEnable

+ glEnableClientState

+ glEnd

+ glEndList

+ glEvalCoord1d

+ glEvalCoord1f

+ glEvalCoord1dv

+ glEvalCoord1fv

+ glEvalCoord2d

+ glEvalCoord2f

+ glEvalCoord2dv

+ glEvalCoord2fv

+ glEvalPoint1

+ glEvalPoint2

+ glEvalMesh1

+ glEdgeFlag

+ glEdgeFlagv

+ glEdgeFlagPointer

+ glEvalMesh2

+ glFeedbackBuffer

+ glFinish

+ glFlush

+ glFogf

+ glFogi

+ glFogfv

+ glFogiv

+ glFrontFace

+ glFrustum

+ glGenLists

+ glGenTextures

+ glGetBooleanv

+ glGetClipPlane

+ glGetColorTableEXT

+ glGetColorTableParameterivEXT

+ glGetColorTableParameterfvEXT

+ glGetDoublev

+ glGetError

+ glGetFloatv

+ glGetIntegerv

+ glGetLightfv

+ glGetLightiv

+ glGetMapdv

+ glGetMapfv

+ glGetMapiv

+ glGetMaterialfv

+ glGetMaterialiv

+ glGetPixelMapfv

+ glGetPixelMapuiv

+ glGetPixelMapusv

+ glGetPointerv

+ glGetPolygonStipple

+ glGetString

+ glGetTexEnvfv

+ glGetTexEnviv

+ glGetTexGeniv

+ glGetTexGendv

+ glGetTexGenfv

+ glGetTexImage

+ glGetTexLevelParameterfv

+ glGetTexLevelParameteriv

+ glGetTexParameterfv

+ glGetTexParameteriv

+ glHint

+ glIndexd

+ glIndexf

+ glIndexi

+ glIndexs

+ glIndexub

+ glIndexdv

+ glIndexfv

+ glIndexiv

+ glIndexsv

+ glIndexubv

+ glIndexMask

+ glIndexPointer

+ glInterleavedArrays

+ glInitNames

+ glIsList

+ glIsTexture

+ glLightf

+ glLighti

+ glLightfv

+ glLightiv

+ glLightModelf

+ glLightModeli

+ glLightModelfv

+ glLightModeliv

+ glLineWidth

+ glLineStipple

+ glListBase

+ glLoadIdentity

+ glLoadMatrixd

+ glLoadMatrixf

+ glLoadName

+ glLogicOp

+ glMap1d

+ glMap1f

+ glMap2d

+ glMap2f

+ glMapGrid1d

+ glMapGrid1f

+ glMapGrid2d

+ glMapGrid2f

+ glMaterialf

+ glMateriali

+ glMaterialfv

+ glMaterialiv

+ glMatrixMode

+ glMultMatrixd

+ glMultMatrixf

+ glNewList

+ glNormal3b

+ glNormal3d

+ glNormal3f

+ glNormal3i

+ glNormal3s

+ glNormal3bv

+ glNormal3dv

+ glNormal3fv

+ glNormal3iv

+ glNormal3sv

+ glNormalPointer

+ glOrtho

+ glPassThrough

+ glPixelMapfv

+ glPixelMapuiv

+ glPixelMapusv

+ glPixelStoref

+ glPixelStorei

+ glPixelTransferf

+ glPixelTransferi

+ glPixelZoom

+ glPointSize

+ glPolygonMode

+ glPolygonOffset

+ glPolygonOffsetEXT

+ glPolygonStipple

+ glPopAttrib

+ glPopClientAttrib

+ glPopMatrix

+ glPopName

+ glPrioritizeTextures

+ glPushMatrix

+ glRasterPos2d

+ glRasterPos2f

+ glRasterPos2i

+ glRasterPos2s

+ glRasterPos3d

+ glRasterPos3f

+ glRasterPos3i

+ glRasterPos3s

+ glRasterPos4d

+ glRasterPos4f

+ glRasterPos4i

+ glRasterPos4s

+ glRasterPos2dv

+ glRasterPos2fv

+ glRasterPos2iv

+ glRasterPos2sv

+ glRasterPos3dv

+ glRasterPos3fv

+ glRasterPos3iv

+ glRasterPos3sv

+ glRasterPos4dv

+ glRasterPos4fv

+ glRasterPos4iv

+ glRasterPos4sv

+ glReadBuffer

+ glReadPixels

+ glRectd

+ glRectf

+ glRecti

+ glRects

+ glRectdv

+ glRectfv

+ glRectiv

+ glRectsv

+ glScissor

+ glIsEnabled

+ glPushAttrib

+ glPushClientAttrib

+ glPushName

+ glRenderMode

+ glRotated

+ glRotatef

+ glSelectBuffer

+ glScaled

+ glScalef

+ glShadeModel

+ glStencilFunc

+ glStencilMask

+ glStencilOp

+ glTexCoord1d

+ glTexCoord1f

+ glTexCoord1i

+ glTexCoord1s

+ glTexCoord2d

+ glTexCoord2f

+ glTexCoord2i

+ glTexCoord2s

+ glTexCoord3d

+ glTexCoord3f

+ glTexCoord3i

+ glTexCoord3s

+ glTexCoord4d

+ glTexCoord4f

+ glTexCoord4i

+ glTexCoord4s

+ glTexCoord1dv

+ glTexCoord1fv

+ glTexCoord1iv

+ glTexCoord1sv

+ glTexCoord2dv

+ glTexCoord2fv

+ glTexCoord2iv

+ glTexCoord2sv

+ glTexCoord3dv

+ glTexCoord3fv

+ glTexCoord3iv

+ glTexCoord3sv

+ glTexCoord4dv

+ glTexCoord4fv

+ glTexCoord4iv

+ glTexCoord4sv

+ glTexCoordPointer

+ glTexGend

+ glTexGenf

+ glTexGeni

+ glTexGendv

+ glTexGeniv

+ glTexGenfv

+ glTexEnvf

+ glTexEnvi

+ glTexEnvfv

+ glTexEnviv

+ glTexImage1D

+ glTexImage2D

+ glTexParameterf

+ glTexParameteri

+ glTexParameterfv

+ glTexParameteriv

+ glTexSubImage1D

+ glTexSubImage2D

+ glTranslated

+ glTranslatef

+ glVertex2d

+ glVertex2f

+ glVertex2i

+ glVertex2s

+ glVertex3d

+ glVertex3f

+ glVertex3i

+ glVertex3s

+ glVertex4d

+ glVertex4f

+ glVertex4i

+ glVertex4s

+ glVertex2dv

+ glVertex2fv

+ glVertex2iv

+ glVertex2sv

+ glVertex3dv

+ glVertex3fv

+ glVertex3iv

+ glVertex3sv

+ glVertex4dv

+ glVertex4fv

+ glVertex4iv

+ glVertex4sv

+ glVertexPointer

+ glViewport

+

+ glBlendEquationEXT

+ glBlendColorEXT

+ glVertexPointerEXT

+ glNormalPointerEXT

+ glColorPointerEXT

+ glIndexPointerEXT

+ glTexCoordPointerEXT

+ glEdgeFlagPointerEXT

+ glGetPointervEXT

+ glArrayElementEXT

+ glDrawArraysEXT

+ glBindTextureEXT

+ glDeleteTexturesEXT

+ glGenTexturesEXT

+ glPrioritizeTexturesEXT

+ glCopyTexSubImage3DEXT

+ glTexImage3DEXT

+ glTexSubImage3DEXT

+

+ glWindowPos4fMESA

+ glWindowPos2iMESA

+ glWindowPos2sMESA

+ glWindowPos2fMESA

+ glWindowPos2dMESA

+ glWindowPos2ivMESA

+ glWindowPos2svMESA

+ glWindowPos2fvMESA

+ glWindowPos2dvMESA

+ glWindowPos3iMESA

+ glWindowPos3sMESA

+ glWindowPos3fMESA

+ glWindowPos3dMESA

+ glWindowPos3ivMESA

+ glWindowPos3svMESA

+ glWindowPos3fvMESA

+ glWindowPos3dvMESA

+ glWindowPos4iMESA

+ glWindowPos4sMESA

+ glWindowPos4dMESA

+ glWindowPos4ivMESA

+ glWindowPos4svMESA

+ glWindowPos4fvMESA

+ glWindowPos4dvMESA

+ glResizeBuffersMESA

+

+ wglCopyContext

+ wglCreateContext

+ wglCreateLayerContext

+ wglDeleteContext

+ wglDescribeLayerPlane

+ wglGetCurrentContext

+ wglGetCurrentDC

+ wglGetLayerPaletteEntries

+ wglGetProcAddress

+ wglMakeCurrent

+ wglRealizeLayerPalette

+ wglSetLayerPaletteEntries

+ wglShareLists

+ wglSwapLayerBuffers

+ wglUseFontBitmapsA

+ wglUseFontBitmapsW

+ wglUseFontOutlinesA

+ wglUseFontOutlinesW

+

+;These functions are identical and therefore share the same addresses

+ ChoosePixelFormat = wglChoosePixelFormat

+ DescribePixelFormat = wglDescribePixelFormat

+ GetPixelFormat = wglGetPixelFormat

+ SetPixelFormat = wglSetPixelFormat 

+ SwapBuffers = wglSwapBuffers

+

+ wglChoosePixelFormat

+ wglDescribePixelFormat

+ wglGetPixelFormat

+ wglSetPixelFormat

+ wglSwapBuffers

+

+ glActiveTextureARB

+ glClientActiveTextureARB

+ glMultiTexCoord1dARB

+ glMultiTexCoord1dvARB

+ glMultiTexCoord1fARB

+ glMultiTexCoord1fvARB

+ glMultiTexCoord1iARB

+ glMultiTexCoord1ivARB

+ glMultiTexCoord1sARB

+ glMultiTexCoord1svARB

+ glMultiTexCoord2dARB

+ glMultiTexCoord2dvARB

+ glMultiTexCoord2fARB

+ glMultiTexCoord2fvARB

+ glMultiTexCoord2iARB

+ glMultiTexCoord2ivARB

+ glMultiTexCoord2sARB

+ glMultiTexCoord2svARB

+ glMultiTexCoord3dARB

+ glMultiTexCoord3dvARB

+ glMultiTexCoord3fARB

+ glMultiTexCoord3fvARB

+ glMultiTexCoord3iARB

+ glMultiTexCoord3ivARB

+ glMultiTexCoord3sARB

+ glMultiTexCoord3svARB

+ glMultiTexCoord4dARB

+ glMultiTexCoord4dvARB

+ glMultiTexCoord4fARB

+ glMultiTexCoord4fvARB

+ glMultiTexCoord4iARB

+ glMultiTexCoord4ivARB

+ glMultiTexCoord4sARB

+ glMultiTexCoord4svARB

diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
index 4c5fd59d4..280e93a90 100644
--- a/mesalib/src/mesa/main/APIspec.xml
+++ b/mesalib/src/mesa/main/APIspec.xml
@@ -1,4332 +1,4341 @@
-<?xml version="1.0"?>
-<!DOCTYPE apispec SYSTEM "APIspec.dtd">
-
-<!-- A function is generated from a template.  Multiple functions can be
-     generated from a single template with different arguments.  For example,
-     glColor3f can be generated from
-
-     <function name="Color3f" template="Color" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-
-     and glColor4iv can be generated from
-
-     <function name="Color4iv" template="Color" gltype="GLint" vector_size="4"/>
-
-     In a template, there are <desc>s that describe the properties of
-     parameters.  A <desc> can enumerate the valid values of a parameter.  It
-     can also specify the error code when an invalid value is given, and etc.
-     By nesting <desc>s, they can create dependency between parameters.
-
-     A function can be marked as external.  It means that the function cannot
-     be dispatched to the corresponding mesa function, if one exists, directly,
-     and requires an external implementation.
--->
-
-<apispec>
-
-<template name="Color">
-	<proto>
-		<return type="void"/>
-		<vector name="v" type="const GLtype *" size="dynamic">
-			<param name="red" type="GLtype"/>
-			<param name="green" type="GLtype"/>
-			<param name="blue" type="GLtype"/>
-			<param name="alpha" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="ClipPlane">
-	<proto>
-		<return type="void"/>
-		<param name="plane" type="GLenum"/>
-		<vector name="equation" type="const GLtype *" size="4"/>
-	</proto>
-
-	<desc name="plane">
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-	</desc>
-</template>
-
-<template name="CullFace">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_FRONT"/>
-		<value name="GL_BACK"/>
-		<value name="GL_FRONT_AND_BACK"/>
-	</desc>
-</template>
-
-<template name="Fog">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-        <desc name="pname">
-		<value name="GL_FOG_MODE"/>
-		<desc name="param">
-			<value name="GL_EXP"/>
-			<value name="GL_EXP2"/>
-			<value name="GL_LINEAR"/>
-		</desc>
-        </desc>
-
-	<desc name="pname">
-		<value name="GL_FOG_COLOR"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_FOG_DENSITY"/>
-		<value name="GL_FOG_START"/>
-		<value name="GL_FOG_END"/>
-
-		<desc name="params" vector_size="1"/>
-	</desc>
-</template>
-
-<template name="FrontFace">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_CW"/>
-		<value name="GL_CCW"/>
-	</desc>
-</template>
-
-<template name="Hint">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-
-	<desc name="target" category="GLES1.1">
-		<value name="GL_FOG_HINT"/>
-		<value name="GL_LINE_SMOOTH_HINT"/>
-		<value name="GL_PERSPECTIVE_CORRECTION_HINT"/>
-		<value name="GL_POINT_SMOOTH_HINT"/>
-	</desc>
-	<desc name="target" category="OES_standard_derivatives">
-		<value name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES"/>
-	</desc>
-	<desc name="target">
-		<value name="GL_GENERATE_MIPMAP_HINT"/>
-	</desc>
-
-	<desc name="mode">
-		<value name="GL_FASTEST"/>
-		<value name="GL_NICEST"/>
-		<value name="GL_DONT_CARE"/>
-	</desc>
-</template>
-
-<template name="Light">
-	<proto>
-		<return type="void"/>
-		<param name="light" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="light">
-		<range base="GL_LIGHT" from="0" to="7"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_AMBIENT"/>
-		<value name="GL_DIFFUSE"/>
-		<value name="GL_SPECULAR"/>
-		<value name="GL_POSITION"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SPOT_DIRECTION"/>
-
-		<desc name="params" vector_size="3"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SPOT_EXPONENT"/>
-		<value name="GL_SPOT_CUTOFF"/>
-		<value name="GL_CONSTANT_ATTENUATION"/>
-		<value name="GL_LINEAR_ATTENUATION"/>
-		<value name="GL_QUADRATIC_ATTENUATION"/>
-
-		<desc name="params" vector_size="1"/>
-	</desc>
-</template>
-
-<template name="LightModel">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_LIGHT_MODEL_AMBIENT"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_LIGHT_MODEL_TWO_SIDE"/>
-		<desc name="param">
-			<value name="GL_TRUE"/>
-			<value name="GL_FALSE"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="LineWidth">
-	<proto>
-		<return type="void"/>
-		<param name="width" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Material">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="face">
-		<value name="GL_FRONT_AND_BACK"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_AMBIENT"/>
-		<value name="GL_DIFFUSE"/>
-		<value name="GL_AMBIENT_AND_DIFFUSE"/>
-		<value name="GL_SPECULAR"/>
-		<value name="GL_EMISSION"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SHININESS"/>
-
-		<desc name="params" vector_size="1"/>
-	</desc>
-</template>
-
-<template name="PointSize">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="PointSizePointer">
-	<proto>
-		<return type="void"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="type">
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-	</desc>
-</template>
-
-<template name="Scissor">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="ShadeModel">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_FLAT"/>
-		<value name="GL_SMOOTH"/>
-	</desc>
-</template>
-
-<template name="TexParameter">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_WRAP_S"/>
-		<value name="GL_TEXTURE_WRAP_T"/>
-		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>
-
-		<desc name="param">
-			<value name="GL_CLAMP_TO_EDGE"/>
-			<value name="GL_REPEAT"/>
-			<value name="GL_MIRRORED_REPEAT" category="GLES2.0"/>
-			<value name="GL_MIRRORED_REPEAT_OES" category="OES_texture_mirrored_repeat"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_MIN_FILTER"/>
-
-		<desc name="param">
-			<value name="GL_NEAREST"/>
-			<value name="GL_LINEAR"/>
-			<value name="GL_NEAREST_MIPMAP_NEAREST"/>
-			<value name="GL_NEAREST_MIPMAP_LINEAR"/>
-			<value name="GL_LINEAR_MIPMAP_NEAREST"/>
-			<value name="GL_LINEAR_MIPMAP_LINEAR"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_MAG_FILTER"/>
-
-		<desc name="param">
-			<value name="GL_NEAREST"/>
-			<value name="GL_LINEAR"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="GLES1.1">
-		<value name="GL_GENERATE_MIPMAP"/>
-
-		<desc name="param">
-			<value name="GL_TRUE"/>
-			<value name="GL_FALSE"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="EXT_texture_filter_anisotropic">
-		<value name="GL_TEXTURE_MAX_ANISOTROPY_EXT"/>
-		<desc name="params" vector_size="1"/>
-	</desc>
-
-	<desc name="pname" category="OES_draw_texture">
-		<value name="GL_TEXTURE_CROP_RECT_OES"/>
-		<desc name="params" vector_size="4"/>
-	</desc>
-</template>
-
-<template name="TexImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLint"/> <!-- should be GLenum -->
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="internalFormat" error="GL_INVALID_VALUE">
-		<value name="GL_ALPHA"/>
-		<value name="GL_RGB"/>
-		<value name="GL_RGBA"/>
-		<value name="GL_LUMINANCE"/>
-		<value name="GL_LUMINANCE_ALPHA"/>
-		<value name="GL_DEPTH_COMPONENT" category="OES_depth_texture"/>
-		<value name="GL_DEPTH_STENCIL_OES" category="OES_packed_depth_stencil"/>
-	</desc>
-
-	<desc name="border" error="GL_INVALID_VALUE">
-		<value name="0"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_depth_texture">
-		<value name="GL_DEPTH_COMPONENT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_SHORT"/>
-			<value name="GL_UNSIGNED_INT"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_packed_depth_stencil">
-		<value name="GL_DEPTH_STENCIL_OES"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_INT_24_8_OES"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="TexEnv">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="target" category="OES_point_sprite">
-		<value name="GL_POINT_SPRITE_OES"/>
-
-		<desc name="pname">
-			<value name="GL_COORD_REPLACE_OES"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="OES_point_sprite">
-		<value name="GL_COORD_REPLACE_OES"/>
-
-		<desc name="param">
-			<value name="GL_TRUE"/>
-			<value name="GL_FALSE"/>
-		</desc>
-	</desc>
-
-	<desc name="target" category="EXT_texture_lod_bias">
-		<value name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
-
-		<desc name="pname">
-			<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="EXT_texture_lod_bias">
-		<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
-		<desc name="params" vector_size="1"/>
-	</desc>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_ENV"/>
-
-		<desc name="pname">
-			<value name="GL_TEXTURE_ENV_MODE"/>
-			<value name="GL_COMBINE_RGB"/>
-			<value name="GL_COMBINE_ALPHA"/>
-			<value name="GL_RGB_SCALE"/>
-			<value name="GL_ALPHA_SCALE"/>
-			<value name="GL_SRC0_RGB"/>
-			<value name="GL_SRC1_RGB"/>
-			<value name="GL_SRC2_RGB"/>
-			<value name="GL_SRC0_ALPHA"/>
-			<value name="GL_SRC1_ALPHA"/>
-			<value name="GL_SRC2_ALPHA"/>
-			<value name="GL_OPERAND0_RGB"/>
-			<value name="GL_OPERAND1_RGB"/>
-			<value name="GL_OPERAND2_RGB"/>
-			<value name="GL_OPERAND0_ALPHA"/>
-			<value name="GL_OPERAND1_ALPHA"/>
-			<value name="GL_OPERAND2_ALPHA"/>
-			<value name="GL_TEXTURE_ENV_COLOR"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_ENV_MODE"/>
-
-		<desc name="param">
-			<value name="GL_REPLACE"/>
-			<value name="GL_MODULATE"/>
-			<value name="GL_DECAL"/>
-			<value name="GL_BLEND"/>
-			<value name="GL_ADD"/>
-			<value name="GL_COMBINE"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_COMBINE_RGB"/>
-
-		<desc name="param">
-			<value name="GL_REPLACE"/>
-			<value name="GL_MODULATE"/>
-			<value name="GL_ADD"/>
-			<value name="GL_ADD_SIGNED"/>
-			<value name="GL_INTERPOLATE"/>
-			<value name="GL_SUBTRACT"/>
-			<value name="GL_DOT3_RGB"/>
-			<value name="GL_DOT3_RGBA"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_COMBINE_ALPHA"/>
-
-		<desc name="param">
-			<value name="GL_REPLACE"/>
-			<value name="GL_MODULATE"/>
-			<value name="GL_ADD"/>
-			<value name="GL_ADD_SIGNED"/>
-			<value name="GL_INTERPOLATE"/>
-			<value name="GL_SUBTRACT"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_RGB_SCALE"/>
-		<value name="GL_ALPHA_SCALE"/>
-
-		<desc name="param" convert="true" error="GL_INVALID_VALUE">
-			<value name="1.0"/>
-			<value name="2.0"/>
-			<value name="4.0"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SRC0_RGB"/>
-		<value name="GL_SRC1_RGB"/>
-		<value name="GL_SRC2_RGB"/>
-		<value name="GL_SRC0_ALPHA"/>
-		<value name="GL_SRC1_ALPHA"/>
-		<value name="GL_SRC2_ALPHA"/>
-
-		<desc name="param">
-			<value name="GL_TEXTURE"/>
-			<value name="GL_CONSTANT"/>
-			<value name="GL_PRIMARY_COLOR"/>
-			<value name="GL_PREVIOUS"/>
-
-			<range base="GL_TEXTURE" from="0" to="31" category="OES_texture_env_crossbar"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_OPERAND0_RGB"/>
-		<value name="GL_OPERAND1_RGB"/>
-		<value name="GL_OPERAND2_RGB"/>
-
-		<desc name="param">
-			<value name="GL_SRC_COLOR"/>
-			<value name="GL_ONE_MINUS_SRC_COLOR"/>
-			<value name="GL_SRC_ALPHA"/>
-			<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_OPERAND0_ALPHA"/>
-		<value name="GL_OPERAND1_ALPHA"/>
-		<value name="GL_OPERAND2_ALPHA"/>
-
-		<desc name="param">
-			<value name="GL_SRC_ALPHA"/>
-			<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_ENV_COLOR"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-</template>
-
-<template name="TexGen">
-	<proto>
-		<return type="void"/>
-		<param name="coord" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="coord" category="OES_texture_cube_map">
-		<value name="GL_TEXTURE_GEN_STR_OES"/>
-	</desc>
-
-	<desc name="pname" category="OES_texture_cube_map">
-		<value name="GL_TEXTURE_GEN_MODE_OES"/>
-
-		<desc name="param">
-			<value name="GL_NORMAL_MAP_OES"/>
-			<value name="GL_REFLECTION_MAP_OES"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="Clear">
-	<proto>
-		<return type="void"/>
-		<param name="mask" type="GLbitfield"/>
-	</proto>
-
-	<desc name="mask" error="GL_INVALID_VALUE">
-		<value name="0"/>
-		<value name="(GL_COLOR_BUFFER_BIT)"/>
-		<value name="(GL_DEPTH_BUFFER_BIT)"/>
-		<value name="(GL_STENCIL_BUFFER_BIT)"/>
-		<value name="(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)"/>
-		<value name="(GL_COLOR_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>
-		<value name="(GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>
-		<value name="(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>
-	</desc>
-</template>
-
-<template name="ClearColor">
-	<proto>
-		<return type="void"/>
-		<param name="red" type="GLtype"/>
-		<param name="green" type="GLtype"/>
-		<param name="blue" type="GLtype"/>
-		<param name="alpha" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="ClearStencil">
-	<proto>
-		<return type="void"/>
-		<param name="s" type="GLint"/>
-	</proto>
-</template>
-
-<template name="ClearDepth">
-	<proto>
-		<return type="void"/>
-		<param name="depth" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="StencilMask">
-	<proto>
-		<return type="void"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="StencilMaskSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-
-	<desc name="face">
-		<value name="GL_FRONT"/>
-		<value name="GL_BACK"/>
-		<value name="GL_FRONT_AND_BACK"/>
-	</desc>
-</template>
-
-<template name="ColorMask">
-	<proto>
-		<return type="void"/>
-		<param name="red" type="GLboolean"/>
-		<param name="green" type="GLboolean"/>
-		<param name="blue" type="GLboolean"/>
-		<param name="alpha" type="GLboolean"/>
-	</proto>
-</template>
-
-<template name="DepthMask">
-	<proto>
-		<return type="void"/>
-		<param name="flag" type="GLboolean"/>
-	</proto>
-</template>
-
-<template name="Disable">
-	<proto>
-		<return type="void"/>
-		<param name="cap" type="GLenum"/>
-	</proto>
-
-	<desc name="cap" category="GLES1.1">
-		<value name="GL_NORMALIZE"/>
-		<value name="GL_RESCALE_NORMAL"/>
-
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-
-		<value name="GL_FOG"/>
-		<value name="GL_LIGHTING"/>
-		<value name="GL_COLOR_MATERIAL"/>
-
-		<range base="GL_LIGHT" from="0" to="7"/>
-
-		<value name="GL_POINT_SMOOTH"/>
-		<value name="GL_LINE_SMOOTH"/>
-		<value name="GL_CULL_FACE"/>
-		<value name="GL_POLYGON_OFFSET_FILL"/>
-		<value name="GL_MULTISAMPLE"/>
-		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
-		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>
-		<value name="GL_SAMPLE_COVERAGE"/>
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_SCISSOR_TEST"/>
-		<value name="GL_ALPHA_TEST"/>
-		<value name="GL_STENCIL_TEST"/>
-		<value name="GL_DEPTH_TEST"/>
-		<value name="GL_BLEND"/>
-		<value name="GL_DITHER"/>
-		<value name="GL_COLOR_LOGIC_OP"/>
-
-		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>
-		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="cap" category="GLES2.0">
-		<value name="GL_CULL_FACE"/>
-		<value name="GL_SCISSOR_TEST"/>
-		<value name="GL_POLYGON_OFFSET_FILL"/>
-		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
-		<value name="GL_SAMPLE_COVERAGE"/>
-		<value name="GL_STENCIL_TEST"/>
-		<value name="GL_DEPTH_TEST"/>
-		<value name="GL_DITHER"/>
-		<value name="GL_BLEND"/>
-	</desc>
-</template>
-
-<!-- it is exactly the same as Disable -->
-<template name="Enable">
-	<proto>
-		<return type="void"/>
-		<param name="cap" type="GLenum"/>
-	</proto>
-
-	<desc name="cap" category="GLES1.1">
-		<value name="GL_NORMALIZE"/>
-		<value name="GL_RESCALE_NORMAL"/>
-
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-
-		<value name="GL_FOG"/>
-		<value name="GL_LIGHTING"/>
-		<value name="GL_COLOR_MATERIAL"/>
-
-		<range base="GL_LIGHT" from="0" to="7"/>
-
-		<value name="GL_POINT_SMOOTH"/>
-		<value name="GL_LINE_SMOOTH"/>
-		<value name="GL_CULL_FACE"/>
-		<value name="GL_POLYGON_OFFSET_FILL"/>
-		<value name="GL_MULTISAMPLE"/>
-		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
-		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>
-		<value name="GL_SAMPLE_COVERAGE"/>
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_SCISSOR_TEST"/>
-		<value name="GL_ALPHA_TEST"/>
-		<value name="GL_STENCIL_TEST"/>
-		<value name="GL_DEPTH_TEST"/>
-		<value name="GL_BLEND"/>
-		<value name="GL_DITHER"/>
-		<value name="GL_COLOR_LOGIC_OP"/>
-
-		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>
-		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="cap" category="GLES2.0">
-		<value name="GL_CULL_FACE"/>
-		<value name="GL_SCISSOR_TEST"/>
-		<value name="GL_POLYGON_OFFSET_FILL"/>
-		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
-		<value name="GL_SAMPLE_COVERAGE"/>
-		<value name="GL_STENCIL_TEST"/>
-		<value name="GL_DEPTH_TEST"/>
-		<value name="GL_DITHER"/>
-		<value name="GL_BLEND"/>
-	</desc>
-</template>
-
-<template name="Finish">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="Flush">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="AlphaFunc">
-	<proto>
-		<return type="void"/>
-		<param name="func" type="GLenum"/>
-		<param name="ref" type="GLtype"/>
-	</proto>
-	<desc name="func">
-		<value name="GL_NEVER"/>
-		<value name="GL_LESS"/>
-		<value name="GL_EQUAL"/>
-		<value name="GL_LEQUAL"/>
-		<value name="GL_GREATER"/>
-		<value name="GL_NOTEQUAL"/>
-		<value name="GL_GEQUAL"/>
-		<value name="GL_ALWAYS"/>
-	</desc>
-</template>
-
-<template name="BlendFunc">
-	<proto>
-		<return type="void"/>
-		<param name="sfactor" type="GLenum"/>
-		<param name="dfactor" type="GLenum"/>
-	</proto>
-
-	<desc name="sfactor">
-		<value name="GL_ZERO"/>
-		<value name="GL_ONE"/>
-		<value name="GL_SRC_COLOR"/>
-		<value name="GL_ONE_MINUS_SRC_COLOR"/>
-		<value name="GL_SRC_ALPHA"/>
-		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		<value name="GL_DST_ALPHA"/>
-		<value name="GL_ONE_MINUS_DST_ALPHA"/>
-		<value name="GL_DST_COLOR"/>
-		<value name="GL_ONE_MINUS_DST_COLOR"/>
-		<value name="GL_SRC_ALPHA_SATURATE"/>
-
-		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
-	</desc>
-
-	<desc name="dfactor">
-		<value name="GL_ZERO"/>
-		<value name="GL_ONE"/>
-		<value name="GL_SRC_COLOR"/>
-		<value name="GL_ONE_MINUS_SRC_COLOR"/>
-		<value name="GL_SRC_ALPHA"/>
-		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		<value name="GL_DST_ALPHA"/>
-		<value name="GL_ONE_MINUS_DST_ALPHA"/>
-		<value name="GL_DST_COLOR"/>
-		<value name="GL_ONE_MINUS_DST_COLOR"/>
-
-		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="LogicOp">
-	<proto>
-		<return type="void"/>
-		<param name="opcode" type="GLenum"/>
-	</proto>
-
-	<desc name="opcode">
-		<value name="GL_CLEAR"/>
-		<value name="GL_SET"/>
-		<value name="GL_COPY"/>
-		<value name="GL_COPY_INVERTED"/>
-		<value name="GL_NOOP"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_AND"/>
-		<value name="GL_NAND"/>
-		<value name="GL_OR"/>
-		<value name="GL_NOR"/>
-		<value name="GL_XOR"/>
-		<value name="GL_EQUIV"/>
-		<value name="GL_AND_REVERSE"/>
-		<value name="GL_AND_INVERTED"/>
-		<value name="GL_OR_REVERSE"/>
-		<value name="GL_OR_INVERTED"/>
-	</desc>
-</template>
-
-<template name="StencilFunc">
-	<proto>
-		<return type="void"/>
-		<param name="func" type="GLenum"/>
-		<param name="ref" type="GLint"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-
-	<desc name="func">
-		<value name="GL_NEVER"/>
-		<value name="GL_LESS"/>
-		<value name="GL_LEQUAL"/>
-		<value name="GL_GREATER"/>
-		<value name="GL_GEQUAL"/>
-		<value name="GL_EQUAL"/>
-		<value name="GL_NOTEQUAL"/>
-		<value name="GL_ALWAYS"/>
-	</desc>
-</template>
-
-<template name="StencilFuncSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="func" type="GLenum"/>
-		<param name="ref" type="GLint"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-
-	<desc name="face">
-		<value name="GL_FRONT"/>
-		<value name="GL_BACK"/>
-		<value name="GL_FRONT_AND_BACK"/>
-	</desc>
-
-	<desc name="func">
-		<value name="GL_NEVER"/>
-		<value name="GL_LESS"/>
-		<value name="GL_LEQUAL"/>
-		<value name="GL_GREATER"/>
-		<value name="GL_GEQUAL"/>
-		<value name="GL_EQUAL"/>
-		<value name="GL_NOTEQUAL"/>
-		<value name="GL_ALWAYS"/>
-	</desc>
-</template>
-
-<template name="StencilOp">
-	<proto>
-		<return type="void"/>
-		<param name="fail" type="GLenum"/>
-		<param name="zfail" type="GLenum"/>
-		<param name="zpass" type="GLenum"/>
-	</proto>
-
-	<desc name="fail">
-		<value name="GL_KEEP"/>
-		<value name="GL_ZERO"/>
-		<value name="GL_REPLACE"/>
-		<value name="GL_INCR"/>
-		<value name="GL_DECR"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_INCR_WRAP" category="GLES2.0"/>
-		<value name="GL_DECR_WRAP" category="GLES2.0"/>
-		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
-		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
-	</desc>
-
-	<desc name="zfail">
-		<value name="GL_KEEP"/>
-		<value name="GL_ZERO"/>
-		<value name="GL_REPLACE"/>
-		<value name="GL_INCR"/>
-		<value name="GL_DECR"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_INCR_WRAP" category="GLES2.0"/>
-		<value name="GL_DECR_WRAP" category="GLES2.0"/>
-		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
-		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
-	</desc>
-
-	<desc name="zpass">
-		<value name="GL_KEEP"/>
-		<value name="GL_ZERO"/>
-		<value name="GL_REPLACE"/>
-		<value name="GL_INCR"/>
-		<value name="GL_DECR"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_INCR_WRAP" category="GLES2.0"/>
-		<value name="GL_DECR_WRAP" category="GLES2.0"/>
-		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
-		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
-	</desc>
-</template>
-
-<template name="StencilOpSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="fail" type="GLenum"/>
-		<param name="zfail" type="GLenum"/>
-		<param name="zpass" type="GLenum"/>
-	</proto>
-
-	<desc name="face">
-		<value name="GL_FRONT"/>
-		<value name="GL_BACK"/>
-		<value name="GL_FRONT_AND_BACK"/>
-	</desc>
-
-	<desc name="fail">
-		<value name="GL_KEEP"/>
-		<value name="GL_ZERO"/>
-		<value name="GL_REPLACE"/>
-		<value name="GL_INCR"/>
-		<value name="GL_DECR"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_INCR_WRAP"/>
-		<value name="GL_DECR_WRAP"/>
-	</desc>
-
-	<desc name="zfail">
-		<value name="GL_KEEP"/>
-		<value name="GL_ZERO"/>
-		<value name="GL_REPLACE"/>
-		<value name="GL_INCR"/>
-		<value name="GL_DECR"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_INCR_WRAP"/>
-		<value name="GL_DECR_WRAP"/>
-	</desc>
-
-	<desc name="zpass">
-		<value name="GL_KEEP"/>
-		<value name="GL_ZERO"/>
-		<value name="GL_REPLACE"/>
-		<value name="GL_INCR"/>
-		<value name="GL_DECR"/>
-		<value name="GL_INVERT"/>
-		<value name="GL_INCR_WRAP"/>
-		<value name="GL_DECR_WRAP"/>
-	</desc>
-</template>
-
-<template name="DepthFunc">
-	<proto>
-		<return type="void"/>
-		<param name="func" type="GLenum"/>
-	</proto>
-
-	<desc name="func">
-		<value name="GL_NEVER"/>
-		<value name="GL_LESS"/>
-		<value name="GL_EQUAL"/>
-		<value name="GL_LEQUAL"/>
-		<value name="GL_GREATER"/>
-		<value name="GL_NOTEQUAL"/>
-		<value name="GL_GEQUAL"/>
-		<value name="GL_ALWAYS"/>
-	</desc>
-</template>
-
-<template name="PixelStore">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<param name="param" type="GLtype"/>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_PACK_ALIGNMENT"/>
-		<value name="GL_UNPACK_ALIGNMENT"/>
-	</desc>
-
-	<desc name="param" error="GL_INVALID_VALUE">
-		<value name="1"/>
-		<value name="2"/>
-		<value name="4"/>
-		<value name="8"/>
-	</desc>
-</template>
-
-<template name="ReadPixels" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="GLvoid *"/>
-	</proto>
-
-	<!-- Technically, only two combinations are actually allowed:
-	     GL_RGBA/GL_UNSIGNED_BYTE, and some implementation-specific
-	     internal preferred combination.  I don't know what that is, so I'm
-	     allowing any valid combination for now; the underlying support
-	     should fail when necessary.-->
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="EXT_read_format_bgra">
-		<value name="GL_BGRA_EXT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/>
-			<value name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="GetClipPlane" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="plane" type="GLenum"/>
-		<vector name="equation" type="GLtype *" size="4"/>
-	</proto>
-
-	<desc name="plane">
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-	</desc>
-</template>
-
-<template name="GetError" direction="get">
-	<proto>
-		<return type="GLenum"/>
-	</proto>
-</template>
-
-<!-- template for GetFloatv, GetIntegerv, GetBoolean, and GetFixedv -->
-<template name="GetState" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-	<!-- param checking is done in mesa -->
-</template>
-
-<template name="GetLight" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="light" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="light">
-		<range base="GL_LIGHT" from="0" to="7"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_AMBIENT"/>
-		<value name="GL_DIFFUSE"/>
-		<value name="GL_SPECULAR"/>
-		<value name="GL_POSITION"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SPOT_DIRECTION"/>
-
-		<desc name="params" vector_size="3"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SPOT_EXPONENT"/>
-		<value name="GL_SPOT_CUTOFF"/>
-		<value name="GL_CONSTANT_ATTENUATION"/>
-		<value name="GL_LINEAR_ATTENUATION"/>
-		<value name="GL_QUADRATIC_ATTENUATION"/>
-
-		<desc name="params" vector_size="1"/>
-	</desc>
-</template>
-
-<template name="GetMaterial" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="face">
-		<value name="GL_FRONT"/>
-		<value name="GL_BACK"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_SHININESS"/>
-		<desc name="params" vector_size="1"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_AMBIENT"/>
-		<value name="GL_DIFFUSE"/>
-		<value name="GL_AMBIENT_AND_DIFFUSE"/>
-		<value name="GL_SPECULAR"/>
-		<value name="GL_EMISSION"/>
-
-		<desc name="params" vector_size="4"/>
-	</desc>
-</template>
-
-<template name="GetString" direction="get">
-	<proto>
-		<return type="const GLubyte *"/>
-		<param name="name" type="GLenum"/>
-	</proto>
-
-	<desc name="name">
-		<value name="GL_VENDOR"/>
-		<value name="GL_RENDERER"/>
-		<value name="GL_VERSION"/>
-		<value name="GL_EXTENSIONS"/>
-		<value name="GL_SHADING_LANGUAGE_VERSION" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="GetTexEnv" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="target" category="OES_point_sprite">
-		<value name="GL_POINT_SPRITE_OES"/>
-		<desc name="pname">
-			<value name="GL_COORD_REPLACE_OES"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="OES_point_sprite">
-		<value name="GL_COORD_REPLACE_OES"/>
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-
-	<desc name="target" category="EXT_texture_lod_bias">
-		<value name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
-
-		<desc name="pname">
-			<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="EXT_texture_lod_bias">
-		<value name="GL_TEXTURE_LOD_BIAS_EXT"/>
-		<desc name="params" vector_size="1"/>
-	</desc>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_ENV"/>
-
-		<desc name="pname">
-			<value name="GL_TEXTURE_ENV_COLOR"/>
-			<value name="GL_RGB_SCALE"/>
-			<value name="GL_ALPHA_SCALE"/>
-			<value name="GL_TEXTURE_ENV_MODE"/>
-			<value name="GL_COMBINE_RGB"/>
-			<value name="GL_COMBINE_ALPHA"/>
-			<value name="GL_SRC0_RGB"/>
-			<value name="GL_SRC1_RGB"/>
-			<value name="GL_SRC2_RGB"/>
-			<value name="GL_SRC0_ALPHA"/>
-			<value name="GL_SRC1_ALPHA"/>
-			<value name="GL_SRC2_ALPHA"/>
-			<value name="GL_OPERAND0_RGB"/>
-			<value name="GL_OPERAND1_RGB"/>
-			<value name="GL_OPERAND2_RGB"/>
-			<value name="GL_OPERAND0_ALPHA"/>
-			<value name="GL_OPERAND1_ALPHA"/>
-			<value name="GL_OPERAND2_ALPHA"/>
-		</desc>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_ENV_COLOR"/>
-		<desc name="params" vector_size="4"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_RGB_SCALE"/>
-		<value name="GL_ALPHA_SCALE"/>
-
-		<desc name="params" vector_size="1"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_ENV_MODE"/>
-		<value name="GL_COMBINE_RGB"/>
-		<value name="GL_COMBINE_ALPHA"/>
-		<value name="GL_SRC0_RGB"/>
-		<value name="GL_SRC1_RGB"/>
-		<value name="GL_SRC2_RGB"/>
-		<value name="GL_SRC0_ALPHA"/>
-		<value name="GL_SRC1_ALPHA"/>
-		<value name="GL_SRC2_ALPHA"/>
-		<value name="GL_OPERAND0_RGB"/>
-		<value name="GL_OPERAND1_RGB"/>
-		<value name="GL_OPERAND2_RGB"/>
-		<value name="GL_OPERAND0_ALPHA"/>
-		<value name="GL_OPERAND1_ALPHA"/>
-		<value name="GL_OPERAND2_ALPHA"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-</template>
-
-<template name="GetTexGen" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="coord" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="coord">
-		<value name="GL_TEXTURE_GEN_STR_OES"/>
-	</desc>
-	<desc name="pname">
-		<value name="GL_TEXTURE_GEN_MODE_OES"/>
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-</template>
-
-<template name="GetTexParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_WRAP_S"/>
-		<value name="GL_TEXTURE_WRAP_T"/>
-		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>
-		<value name="GL_TEXTURE_MIN_FILTER"/>
-		<value name="GL_TEXTURE_MAG_FILTER"/>
-		<value name="GL_GENERATE_MIPMAP" category="GLES1.1"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-
-	<desc name="pname" category="OES_draw_texture">
-		<value name="GL_TEXTURE_CROP_RECT_OES"/>
-		<desc name="params" vector_size="4"/>
-	</desc>
-</template>
-
-<template name="IsEnabled" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="cap" type="GLenum"/>
-	</proto>
-
-	<desc name="cap" category="GLES1.1">
-		<value name="GL_NORMALIZE"/>
-		<value name="GL_RESCALE_NORMAL"/>
-
-		<range base="GL_CLIP_PLANE" from="0" to="5"/>
-
-		<value name="GL_FOG"/>
-		<value name="GL_LIGHTING"/>
-		<value name="GL_COLOR_MATERIAL"/>
-
-		<range base="GL_LIGHT" from="0" to="7"/>
-
-		<value name="GL_POINT_SMOOTH"/>
-		<value name="GL_LINE_SMOOTH"/>
-		<value name="GL_CULL_FACE"/>
-		<value name="GL_POLYGON_OFFSET_FILL"/>
-		<value name="GL_MULTISAMPLE"/>
-		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
-		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>
-		<value name="GL_SAMPLE_COVERAGE"/>
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_SCISSOR_TEST"/>
-		<value name="GL_ALPHA_TEST"/>
-		<value name="GL_STENCIL_TEST"/>
-		<value name="GL_DEPTH_TEST"/>
-		<value name="GL_BLEND"/>
-		<value name="GL_DITHER"/>
-		<value name="GL_COLOR_LOGIC_OP"/>
-
-		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>
-
-		<value name="GL_VERTEX_ARRAY"/>
-		<value name="GL_NORMAL_ARRAY"/>
-		<value name="GL_COLOR_ARRAY"/>
-		<value name="GL_TEXTURE_COORD_ARRAY"/>
-		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>
-		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>
-		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>
-	</desc>
-
-	<desc name="cap" category="GLES2.0">
-		<value name="GL_CULL_FACE"/>
-		<value name="GL_SCISSOR_TEST"/>
-		<value name="GL_POLYGON_OFFSET_FILL"/>
-		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>
-		<value name="GL_SAMPLE_COVERAGE"/>
-		<value name="GL_STENCIL_TEST"/>
-		<value name="GL_DEPTH_TEST"/>
-		<value name="GL_DITHER"/>
-		<value name="GL_BLEND"/>
-	</desc>
-</template>
-
-<template name="DepthRange">
-	<proto>
-		<return type="void"/>
-		<param name="zNear" type="GLtype"/>
-		<param name="zFar" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Frustum">
-	<proto>
-		<return type="void"/>
-		<param name="left" type="GLtype"/>
-		<param name="right" type="GLtype"/>
-		<param name="bottom" type="GLtype"/>
-		<param name="top" type="GLtype"/>
-		<param name="zNear" type="GLtype"/>
-		<param name="zFar" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="LoadIdentity">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="LoadMatrix">
-	<proto>
-		<return type="void"/>
-		<vector name="m" type="const GLtype *" size="16"/>
-	</proto>
-</template>
-
-<template name="MatrixMode">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_MODELVIEW"/>
-		<value name="GL_PROJECTION"/>
-		<value name="GL_TEXTURE"/>
-		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>
-	</desc>
-</template>
-
-<template name="MultMatrix">
-	<proto>
-		<return type="void"/>
-		<vector name="m" type="const GLtype *" size="16"/>
-	</proto>
-</template>
-
-<template name="Ortho">
-	<proto>
-		<return type="void"/>
-		<param name="left" type="GLtype"/>
-		<param name="right" type="GLtype"/>
-		<param name="bottom" type="GLtype"/>
-		<param name="top" type="GLtype"/>
-		<param name="zNear" type="GLtype"/>
-		<param name="zFar" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="PopMatrix">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="PushMatrix">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="Rotate">
-	<proto>
-		<return type="void"/>
-		<param name="angle" type="GLtype"/>
-		<param name="x" type="GLtype"/>
-		<param name="y" type="GLtype"/>
-		<param name="z" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Scale">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLtype"/>
-		<param name="y" type="GLtype"/>
-		<param name="z" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Translate">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLtype"/>
-		<param name="y" type="GLtype"/>
-		<param name="z" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Viewport">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="ColorPointer">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="4"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_UNSIGNED_BYTE"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
-</template>
-
-<template name="DisableClientState">
-	<proto>
-		<return type="void"/>
-		<param name="array" type="GLenum"/>
-	</proto>
-
-	<desc name="array">
-		<value name="GL_VERTEX_ARRAY"/>
-		<value name="GL_NORMAL_ARRAY"/>
-		<value name="GL_COLOR_ARRAY"/>
-		<value name="GL_TEXTURE_COORD_ARRAY"/>
-		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>
-		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>
-		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>
-	</desc>
-</template>
-
-<template name="DrawArrays">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="first" type="GLint"/>
-		<param name="count" type="GLsizei"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_POINTS"/>
-		<value name="GL_LINES"/>
-		<value name="GL_LINE_LOOP"/>
-		<value name="GL_LINE_STRIP"/>
-		<value name="GL_TRIANGLES"/>
-		<value name="GL_TRIANGLE_STRIP"/>
-		<value name="GL_TRIANGLE_FAN"/>
-	</desc>
-</template>
-
-<template name="DrawElements">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="count" type="GLsizei"/>
-		<param name="type" type="GLenum"/>
-		<param name="indices" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_POINTS"/>
-		<value name="GL_LINES"/>
-		<value name="GL_LINE_LOOP"/>
-		<value name="GL_LINE_STRIP"/>
-		<value name="GL_TRIANGLES"/>
-		<value name="GL_TRIANGLE_STRIP"/>
-		<value name="GL_TRIANGLE_FAN"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_UNSIGNED_BYTE"/>
-		<value name="GL_UNSIGNED_SHORT"/>
-		<value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
-	</desc>
-</template>
-
-<template name="EnableClientState">
-	<proto>
-		<return type="void"/>
-		<param name="array" type="GLenum"/>
-	</proto>
-
-	<desc name="array">
-		<value name="GL_VERTEX_ARRAY"/>
-		<value name="GL_NORMAL_ARRAY"/>
-		<value name="GL_COLOR_ARRAY"/>
-		<value name="GL_TEXTURE_COORD_ARRAY"/>
-		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>
-		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>
-		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>
-	</desc>
-</template>
-
-<template name="GetPointer" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLvoid **" size="dynamic"/>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_VERTEX_ARRAY_POINTER"/>
-		<value name="GL_NORMAL_ARRAY_POINTER"/>
-		<value name="GL_COLOR_ARRAY_POINTER"/>
-		<value name="GL_TEXTURE_COORD_ARRAY_POINTER"/>
-		<value name="GL_MATRIX_INDEX_ARRAY_POINTER_OES" category="OES_matrix_palette"/>
-		<value name="GL_WEIGHT_ARRAY_POINTER_OES" category="OES_matrix_palette"/>
-		<value name="GL_POINT_SIZE_ARRAY_POINTER_OES" category="OES_point_size_array"/>
-	</desc>
-</template>
-
-<template name="Normal">
-	<proto>
-		<return type="void"/>
-		<vector name="v" type="const GLtype *" size="3">
-			<param name="nx" type="GLtype"/>
-			<param name="ny" type="GLtype"/>
-			<param name="nz" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="NormalPointer">
-	<proto>
-		<return type="void"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="type">
-		<value name="GL_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
-</template>
-
-<template name="TexCoordPointer">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
-</template>
-
-<template name="VertexPointer">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
-</template>
-
-<template name="PolygonOffset">
-	<proto>
-		<return type="void"/>
-		<param name="factor" type="GLtype"/>
-		<param name="units" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="CopyTexImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="internalFormat" error="GL_INVALID_VALUE">
-		<value name="GL_ALPHA"/>
-		<value name="GL_RGB"/>
-		<value name="GL_RGBA"/>
-		<value name="GL_LUMINANCE"/>
-		<value name="GL_LUMINANCE_ALPHA"/>
-	</desc>
-
-	<desc name="border" error="GL_INVALID_VALUE">
-		<value name="0"/>
-	</desc>
-</template>
-
-<template name="CopyTexSubImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-</template>
-
-<template name="TexSubImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_depth_texture">
-		<value name="GL_DEPTH_COMPONENT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_SHORT"/>
-			<value name="GL_UNSIGNED_INT"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_packed_depth_stencil">
-		<value name="GL_DEPTH_STENCIL_OES"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_INT_24_8_OES"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="BindTexture">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="texture" type="GLuint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-	</desc>
-</template>
-
-<template name="DeleteTextures">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="textures" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenTextures" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="textures" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="IsTexture" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="texture" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="BlendColor">
-	<proto>
-		<return type="void"/>
-		<param name="red" type="GLtype"/>
-		<param name="green" type="GLtype"/>
-		<param name="blue" type="GLtype"/>
-		<param name="alpha" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="BlendEquation">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_FUNC_ADD" category="GLES2.0"/>
-		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
-		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
-		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
-		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
-		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
-
-		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
-		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
-	</desc>
-</template>
-
-<template name="BlendEquationSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="modeRGB" type="GLenum"/>
-		<param name="modeAlpha" type="GLenum"/>
-	</proto>
-
-	<desc name="modeRGB">
-		<value name="GL_FUNC_ADD" category="GLES2.0"/>
-		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
-		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
-		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
-		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
-		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
-
-		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
-		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
-	</desc>
-
-	<desc name="modeAlpha">
-		<value name="GL_FUNC_ADD" category="GLES2.0"/>
-		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>
-		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>
-		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>
-		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>
-		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>
-
-		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>
-		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>
-	</desc>
-</template>
-
-<template name="TexImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_ALPHA"/>
-		<value name="GL_RGB"/>
-		<value name="GL_RGBA"/>
-		<value name="GL_LUMINANCE"/>
-		<value name="GL_LUMINANCE_ALPHA"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="TexSubImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="CopyTexSubImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-</template>
-
-<template name="MultiTexCoord">
-	<proto>
-		<return type="void"/>
-		<param name="texture" type="GLenum"/>
-		<vector name="v" type="const GLtype *" size="dynamic">
-			<param name="s" type="GLtype"/>
-			<param name="t" type="GLtype"/>
-			<param name="r" type="GLtype"/>
-			<param name="q" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="texture">
-		<range base="GL_TEXTURE" from="0" to="31"/>
-	</desc>
-</template>
-
-<template name="CompressedTexImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="imagesize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>
-		<value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>
-		<value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>
-		<value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
-		<value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
-	</desc>
-</template>
-
-<template name="CompressedTexSubImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="imagesize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-</template>
-
-<template name="ActiveTexture">
-	<proto>
-		<return type="void"/>
-		<param name="texture" type="GLenum"/>
-	</proto>
-
-	<desc name="texture">
-		<range base="GL_TEXTURE" from="0" to="31"/>
-	</desc>
-</template>
-
-<template name="ClientActiveTexture">
-	<proto>
-		<return type="void"/>
-		<param name="texture" type="GLenum"/>
-	</proto>
-
-	<desc name="texture">
-		<range base="GL_TEXTURE" from="0" to="31"/>
-	</desc>
-</template>
-
-<template name="SampleCoverage">
-	<proto>
-		<return type="void"/>
-		<param name="value" type="GLtype"/>
-		<param name="invert" type="GLboolean"/>
-	</proto>
-</template>
-
-<template name="CompressedTexImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="imageSize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_ETC1_RGB8_OES" category="OES_compressed_ETC1_RGB8_texture"/>
-
-		<value name="GL_PALETTE4_RGB8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_RGBA8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_RGBA4_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGB8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGBA8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGBA4_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
-
-		<value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>
-		<value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>
-
-		<value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>
-		<value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
-		<value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
-
-		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-	</desc>
-
-	<desc name="border" error="GL_INVALID_VALUE">
-		<value name="0"/>
-	</desc>
-</template>
-
-<template name="CompressedTexSubImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="imageSize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-	</desc>
-</template>
-
-<template name="BlendFuncSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="srcRGB" type="GLenum"/>
-		<param name="dstRGB" type="GLenum"/>
-		<param name="srcAlpha" type="GLenum"/>
-		<param name="dstAlpha" type="GLenum"/>
-	</proto>
-
-	<desc name="srcRGB">
-		<value name="GL_ZERO"/>
-		<value name="GL_ONE"/>
-		<value name="GL_SRC_COLOR"/>
-		<value name="GL_ONE_MINUS_SRC_COLOR"/>
-		<value name="GL_SRC_ALPHA"/>
-		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		<value name="GL_DST_ALPHA"/>
-		<value name="GL_ONE_MINUS_DST_ALPHA"/>
-		<value name="GL_DST_COLOR"/>
-		<value name="GL_ONE_MINUS_DST_COLOR"/>
-		<value name="GL_SRC_ALPHA_SATURATE"/>
-
-		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
-	</desc>
-
-	<desc name="dstRGB">
-		<value name="GL_ZERO"/>
-		<value name="GL_ONE"/>
-		<value name="GL_SRC_COLOR"/>
-		<value name="GL_ONE_MINUS_SRC_COLOR"/>
-		<value name="GL_SRC_ALPHA"/>
-		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		<value name="GL_DST_ALPHA"/>
-		<value name="GL_ONE_MINUS_DST_ALPHA"/>
-		<value name="GL_DST_COLOR"/>
-		<value name="GL_ONE_MINUS_DST_COLOR"/>
-
-		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
-	</desc>
-
-	<desc name="srcAlpha">
-		<value name="GL_ZERO"/>
-		<value name="GL_ONE"/>
-		<value name="GL_SRC_COLOR"/>
-		<value name="GL_ONE_MINUS_SRC_COLOR"/>
-		<value name="GL_SRC_ALPHA"/>
-		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		<value name="GL_DST_ALPHA"/>
-		<value name="GL_ONE_MINUS_DST_ALPHA"/>
-		<value name="GL_DST_COLOR"/>
-		<value name="GL_ONE_MINUS_DST_COLOR"/>
-		<value name="GL_SRC_ALPHA_SATURATE"/>
-
-		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
-	</desc>
-
-	<desc name="dstAlpha">
-		<value name="GL_ZERO"/>
-		<value name="GL_ONE"/>
-		<value name="GL_SRC_COLOR"/>
-		<value name="GL_ONE_MINUS_SRC_COLOR"/>
-		<value name="GL_SRC_ALPHA"/>
-		<value name="GL_ONE_MINUS_SRC_ALPHA"/>
-		<value name="GL_DST_ALPHA"/>
-		<value name="GL_ONE_MINUS_DST_ALPHA"/>
-		<value name="GL_DST_COLOR"/>
-		<value name="GL_ONE_MINUS_DST_COLOR"/>
-
-		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>
-		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>
-		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="PointParameter">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_POINT_SIZE_MIN"/>
-		<value name="GL_POINT_SIZE_MAX"/>
-		<value name="GL_POINT_FADE_THRESHOLD_SIZE"/>
-
-		<desc name="params" vector_size="1"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_POINT_DISTANCE_ATTENUATION"/>
-		<desc name="params" vector_size="3"/>
-	</desc>
-</template>
-
-<template name="VertexAttrib">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<vector name="v" type="const GLtype *" size="dynamic">
-			<param name="x" type="GLtype"/>
-			<param name="y" type="GLtype"/>
-			<param name="z" type="GLtype"/>
-			<param name="w" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="VertexAttribPointer">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="normalized" type="GLboolean"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="1"/>
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
-
-	<desc name="type" error="GL_INVALID_VALUE">
-		<value name="GL_BYTE"/>
-		<value name="GL_UNSIGNED_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_UNSIGNED_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-		<value name="GL_UNSIGNED_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>
-		<value name="GL_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>
-	</desc>
-
-	<desc name="type" category="OES_vertex_type_10_10_10_2">
-		<value name="GL_UNSIGNED_INT_10_10_10_2_OES"/>
-		<value name="GL_INT_10_10_10_2_OES"/>
-
-		<desc name="size">
-			<value name="3"/>
-			<value name="4"/>
-		</desc>
-	</desc>
-</template>
-
-<template name="EnableVertexAttribArray">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DisableVertexAttribArray">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="IsProgram" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GetProgram" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_DELETE_STATUS"/>
-		<value name="GL_LINK_STATUS"/>
-		<value name="GL_VALIDATE_STATUS"/>
-		<value name="GL_INFO_LOG_LENGTH"/>
-		<value name="GL_ATTACHED_SHADERS"/>
-		<value name="GL_ACTIVE_ATTRIBUTES"/>
-		<value name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>
-		<value name="GL_ACTIVE_UNIFORMS"/>
-		<value name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>
-		<value name="GL_PROGRAM_BINARY_LENGTH_OES" category="OES_get_program_binary"/>
-
-		<desc name="params" convert="false"/>
-	</desc>
-</template>
-
-<template name="GetVertexAttrib" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>
-		<value name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>
-		<value name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>
-		<value name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>
-		<value name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>
-		<value name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_CURRENT_VERTEX_ATTRIB"/>
-		<desc name="params" vector_size="16?" convert="false"/>
-	</desc>
-</template>
-
-<template name="GetVertexAttribPointer" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="pointer" type="GLvoid **" size="dynamic"/>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
-	</desc>
-</template>
-
-<template name="GetBufferPointer" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLvoid **" size="dynamic"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_BUFFER_MAP_POINTER_OES"/>
-	</desc>
-</template>
-
-<template name="MapBuffer" direction="get">
-	<proto>
-		<return type="void *"/>
-		<param name="target" type="GLenum"/>
-		<param name="access" type="GLenum"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="access">
-		<value name="GL_WRITE_ONLY_OES"/>
-	</desc>
-</template>
-
-<template name="UnmapBuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="target" type="GLenum"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-</template>
-
-<template name="BindBuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="buffer" type="GLuint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-</template>
-
-<template name="BufferData">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="size" type="GLsizeiptr"/>
-		<param name="data" type="const GLvoid *"/>
-		<param name="usage" type="GLenum"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="usage">
-		<value name="GL_STATIC_DRAW"/>
-		<value name="GL_DYNAMIC_DRAW"/>
-		<value name="GL_STREAM_DRAW" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="BufferSubData">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="offset" type="GLintptr"/>
-		<param name="size" type="GLsizeiptr"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-</template>
-
-<template name="DeleteBuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="buffer" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenBuffers" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="buffer" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="GetBufferParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_BUFFER_SIZE"/>
-		<value name="GL_BUFFER_USAGE"/>
-		<value name="GL_BUFFER_ACCESS_OES" category="OES_mapbuffer"/>
-		<value name="GL_BUFFER_MAPPED_OES" category="OES_mapbuffer"/>
-	</desc>
-</template>
-
-<template name="IsBuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="buffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="CreateShader">
-	<proto>
-		<return type="GLuint"/>
-		<param name="type" type="GLenum"/>
-	</proto>
-
-	<desc name="type">
-		<value name="GL_VERTEX_SHADER"/>
-		<value name="GL_FRAGMENT_SHADER"/>
-	</desc>
-</template>
-
-<template name="ShaderSource">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="count" type="GLsizei"/>
-		<param name="string" type="const GLchar **"/>
-		<param name="length" type="const int *"/>
-	</proto>
-</template>
-
-<template name="CompileShader">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="ReleaseShaderCompiler">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="DeleteShader">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="ShaderBinary">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="shaders" type="const GLuint *"/>
-		<param name="binaryformat" type="GLenum"/>
-		<param name="binary" type="const GLvoid *"/>
-		<param name="length" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="CreateProgram">
-	<proto>
-		<return type="GLuint"/>
-	</proto>
-</template>
-
-<template name="AttachShader">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DetachShader">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="LinkProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="UseProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DeleteProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GetActiveAttrib" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="index" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="size" type="GLint *"/>
-		<param name="type" type="GLenum *"/>
-		<param name="name" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetAttribLocation" direction="get">
-	<proto>
-		<return type="GLint"/>
-		<param name="program" type="GLuint"/>
-		<param name="name" type="const char *"/>
-	</proto>
-</template>
-
-<template name="BindAttribLocation">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="index" type="GLuint"/>
-		<param name="name" type="const char *"/>
-	</proto>
-</template>
-
-<template name="GetUniformLocation" direction="get">
-	<proto>
-		<return type="GLint"/>
-		<param name="program" type="GLuint"/>
-		<param name="name" type="const char *"/>
-	</proto>
-</template>
-
-<template name="GetActiveUniform" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="index" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="size" type="GLint *"/>
-		<param name="type" type="GLenum *"/>
-		<param name="name" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="Uniform">
-	<proto>
-		<return type="void"/>
-		<param name="location" type="GLint"/>
-		<param name="count" type="GLsizei" hide_if_expanded="true"/>
-		<vector name="values" type="const GLtype *" size="dynamic">
-			<param name="v0" type="GLtype"/>
-			<param name="v1" type="GLtype"/>
-			<param name="v2" type="GLtype"/>
-			<param name="v3" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="UniformMatrix">
-	<proto>
-		<return type="void"/>
-		<param name="location" type="GLint"/>
-		<param name="count" type="GLsizei"/>
-		<param name="transpose" type="GLboolean"/>
-		<vector name="value" type="const GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="ValidateProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GenerateMipmap">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-	</desc>
-</template>
-
-<template name="BindFramebuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="framebuffer" type="GLuint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="DeleteFramebuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="framebuffers" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenFramebuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="ids" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="BindRenderbuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="renderbuffer" type="GLuint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="DeleteRenderbuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="renderbuffers" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenRenderbuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="renderbuffers" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="RenderbufferStorage">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_DEPTH_COMPONENT16_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RGBA4_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RGB5_A1_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RGB565_OES" category="OES_framebuffer_object"/>
-		<value name="GL_STENCIL_INDEX8_OES" category="OES_stencil8"/>
-
-		<value name="GL_DEPTH_COMPONENT16" category="GLES2.0"/>
-		<value name="GL_RGBA4" category="GLES2.0"/>
-		<value name="GL_RGB5_A1" category="GLES2.0"/>
-		<value name="GL_RGB565" category="GLES2.0"/>
-		<value name="GL_STENCIL_INDEX8" category="GLES2.0"/>
-
-		<value name="GL_DEPTH_COMPONENT24_OES" category="OES_depth24"/>
-		<value name="GL_DEPTH_COMPONENT32_OES" category="OES_depth32"/>
-		<value name="GL_RGB8_OES" category="OES_rgb8_rgba8"/>
-		<value name="GL_RGBA8_OES" category="OES_rgb8_rgba8"/>
-		<value name="GL_STENCIL_INDEX1_OES" category="OES_stencil1"/>
-		<value name="GL_STENCIL_INDEX4_OES" category="OES_stencil4"/>
-		<value name="GL_DEPTH24_STENCIL8_OES" category="OES_packed_depth_stencil"/>
-	</desc>
-</template>
-
-<template name="FramebufferRenderbuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="renderbuffertarget" type="GLenum"/>
-		<param name="renderbuffer" type="GLuint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
-	</desc>
-
-	<desc name="attachment">
-		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>
-		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>
-		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>
-		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>
-		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>
-		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>
-	</desc>
-
-	<desc name="renderbuffertarget">
-		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="FramebufferTexture2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="textarget" type="GLenum"/>
-		<param name="texture" type="GLuint"/>
-		<param name="level" type="GLint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
-	</desc>
-
-	<desc name="attachment">
-		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>
-		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>
-		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>
-		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>
-		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>
-		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>
-	</desc>
-
-	<desc name="textarget" error="GL_INVALID_OPERATION">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-	<!-- According to the base specification, "level" must be 0.  But
-	     extension GL_OES_fbo_render_mipmap lifts that restriction,
-	     so no restriction is placed here. -->
-</template>
-
-<template name="FramebufferTexture3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="textarget" type="GLenum"/>
-		<param name="texture" type="GLuint"/>
-		<param name="level" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
-	</desc>
-
-	<desc name="attachment">
-		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>
-		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>
-		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>
-		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>
-		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>
-		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>
-	</desc>
-
-	<desc name="textarget" error="GL_INVALID_OPERATION">
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-	</desc>
-</template>
-
-<template name="CheckFramebufferStatus" direction="get">
-	<proto>
-		<return type="GLenum"/>
-		<param name="target" type="GLenum"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
-	</desc>
-</template>
-
-<template name="GetFramebufferAttachmentParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES" category="OES_framebuffer_object"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES" category="OES_framebuffer_object"/>
-
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE" category="GLES2.0"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME" category="GLES2.0"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL" category="GLES2.0"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE" category="GLES2.0"/>
-		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" category="OES_texture_3D"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-</template>
-
-<template name="GetRenderbufferParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
-	</desc>
-
-	<desc name="pname" category="OES_framebuffer_object">
-		<value name="GL_RENDERBUFFER_WIDTH_OES"/>
-		<value name="GL_RENDERBUFFER_HEIGHT_OES"/>
-		<value name="GL_RENDERBUFFER_INTERNAL_FORMAT_OES"/>
-		<value name="GL_RENDERBUFFER_RED_SIZE_OES"/>
-		<value name="GL_RENDERBUFFER_GREEN_SIZE_OES"/>
-		<value name="GL_RENDERBUFFER_BLUE_SIZE_OES"/>
-		<value name="GL_RENDERBUFFER_ALPHA_SIZE_OES"/>
-		<value name="GL_RENDERBUFFER_DEPTH_SIZE_OES"/>
-		<value name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-
-	<desc name="pname" category="GLES2.0">
-		<value name="GL_RENDERBUFFER_WIDTH"/>
-		<value name="GL_RENDERBUFFER_HEIGHT"/>
-		<value name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
-		<value name="GL_RENDERBUFFER_RED_SIZE"/>
-		<value name="GL_RENDERBUFFER_GREEN_SIZE"/>
-		<value name="GL_RENDERBUFFER_BLUE_SIZE"/>
-		<value name="GL_RENDERBUFFER_ALPHA_SIZE"/>
-		<value name="GL_RENDERBUFFER_DEPTH_SIZE"/>
-		<value name="GL_RENDERBUFFER_STENCIL_SIZE"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-</template>
-
-<template name="IsRenderbuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="renderbuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="IsFramebuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="framebuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="IsShader" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GetShader" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-
-	<desc name="pname">
-		<value name="GL_SHADER_TYPE"/>
-		<value name="GL_COMPILE_STATUS"/>
-		<value name="GL_DELETE_STATUS"/>
-		<value name="GL_INFO_LOG_LENGTH"/>
-		<value name="GL_SHADER_SOURCE_LENGTH"/>
-	</desc>
-</template>
-
-<template name="GetAttachedShaders" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="maxCount" type="GLsizei"/>
-		<param name="count" type="GLsizei *"/>
-		<param name="shaders" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="GetShaderInfoLog" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="infoLog" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetProgramInfoLog" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="infoLog" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetShaderSource" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="source" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetShaderPrecisionFormat" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shadertype" type="GLenum"/>
-		<param name="precisiontype" type="GLenum"/>
-		<param name="range" type="GLint *"/>
-		<param name="precision" type="GLint *"/>
-	</proto>
-
-	<desc name="shadertype">
-		<value name="GL_VERTEX_SHADER"/>
-		<value name="GL_FRAGMENT_SHADER"/>
-	</desc>
-
-	<desc name="precisiontype">
-		<value name="GL_LOW_FLOAT"/>
-		<value name="GL_MEDIUM_FLOAT"/>
-		<value name="GL_HIGH_FLOAT"/>
-		<value name="GL_LOW_INT"/>
-		<value name="GL_MEDIUM_INT"/>
-		<value name="GL_HIGH_INT"/>
-	</desc>
-</template>
-
-<template name="GetUniform" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="location" type="GLint"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="QueryMatrix" direction="get">
-	<proto>
-		<return type="GLbitfield"/>
-		<vector name="mantissa" type="GLtype *" size="16"/>
-		<vector name="exponent" type="GLint *" size="16"/>
-	</proto>
-</template>
-
-<template name="DrawTex">
-	<proto>
-		<return type="void"/>
-		<vector name="coords" type="const GLtype *" size="5">
-			<param name="x" type="GLtype"/>
-			<param name="y" type="GLtype"/>
-			<param name="z" type="GLtype"/>
-			<param name="w" type="GLtype"/>
-			<param name="h" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="MultiDrawArrays">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="first" type="const GLint *"/>
-		<param name="count" type="const GLsizei *"/>
-		<param name="primcount" type="GLsizei"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_POINTS"/>
-		<value name="GL_LINES"/>
-		<value name="GL_LINE_LOOP"/>
-		<value name="GL_LINE_STRIP"/>
-		<value name="GL_TRIANGLES"/>
-		<value name="GL_TRIANGLE_STRIP"/>
-		<value name="GL_TRIANGLE_FAN"/>
-	</desc>
-</template>
-
-<template name="MultiDrawElements">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="count" type="const GLsizei *"/>
-		<param name="type" type="GLenum"/>
-		<param name="indices" type="const GLvoid **"/>
-		<param name="primcount" type="GLsizei"/>
-	</proto>
-
-	<desc name="mode">
-		<value name="GL_POINTS"/>
-		<value name="GL_LINES"/>
-		<value name="GL_LINE_LOOP"/>
-		<value name="GL_LINE_STRIP"/>
-		<value name="GL_TRIANGLES"/>
-		<value name="GL_TRIANGLE_STRIP"/>
-		<value name="GL_TRIANGLE_FAN"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_UNSIGNED_BYTE"/>
-		<value name="GL_UNSIGNED_SHORT"/>
-		<value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
-	</desc>
-</template>
-
-<template name="EGLImageTargetTexture2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="image" type="GLeglImageOES"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-	</desc>
-</template>
-
-<template name="EGLImageTargetRenderbufferStorage">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="image" type="GLeglImageOES"/>
-	</proto>
-
-	<desc name="target">
-		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
-		<value name="GL_RENDERBUFFER" category="GLES2.0"/>
-	</desc>
-</template>
-
-<api name="mesa" implementation="true">
-	<category name="MESA"/>
-
-	<function name="Color4f"  default_prefix="_vbo_" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="ClipPlane" template="ClipPlane" gltype="GLdouble"/>
-	<function name="CullFace" template="CullFace"/>
-
-	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>
-	<function name="Fogfv" template="Fog" gltype="GLfloat"/>
-
-	<function name="FrontFace" template="FrontFace"/>
-	<function name="Hint" template="Hint"/>
-
-	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>
-	<function name="Lightfv" template="Light" gltype="GLfloat"/>
-
-	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>
-	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>
-
-	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
-
-	<function name="Materialf" default_prefix="_vbo_" template="Material" gltype="GLfloat" expand_vector="true"/>
-	<function name="Materialfv" default_prefix="_vbo_" template="Material" gltype="GLfloat"/>
-
-	<function name="PointSize" template="PointSize" gltype="GLfloat"/>
-	<function name="PointSizePointer" template="PointSizePointer"/>
-
-	<function name="Scissor" template="Scissor"/>
-	<function name="ShadeModel" template="ShadeModel"/>
-
-	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
-	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
-	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
-
-	<function name="TexImage2D" template="TexImage2D"/>
-
-	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>
-	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>
-	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>
-
-	<function name="TexGenf" template="TexGen" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexGenfv" template="TexGen" gltype="GLfloat"/>
-
-	<function name="Clear" template="Clear"/>
-	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
-	<function name="ClearStencil" template="ClearStencil"/>
-	<function name="ClearDepth" template="ClearDepth" gltype="GLclampd"/>
-
-	<function name="StencilMask" template="StencilMask"/>
-	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>
-	<function name="ColorMask" template="ColorMask"/>
-	<function name="DepthMask" template="DepthMask"/>
-	<function name="Disable" template="Disable"/>
-	<function name="Enable" template="Enable"/>
-	<function name="Finish" template="Finish"/>
-	<function name="Flush" template="Flush"/>
-
-	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>
-
-	<function name="BlendFunc" template="BlendFunc"/>
-	<function name="LogicOp" template="LogicOp"/>
-	<function name="StencilFunc" template="StencilFunc"/>
-	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>
-	<function name="StencilOp" template="StencilOp"/>
-	<function name="StencilOpSeparate" template="StencilOpSeparate"/>
-	<function name="DepthFunc" template="DepthFunc"/>
-	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
-
-	<function name="ReadPixels" template="ReadPixels"/>
-	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
-	<function name="GetClipPlane" template="GetClipPlane" gltype="GLdouble"/>
-	<function name="GetError" template="GetError"/>
-	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
-	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>
-	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
-
-	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>
-	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>
-	<function name="GetMaterialiv" template="GetMaterial" gltype="GLint"/>
-
-	<function name="GetString" template="GetString"/>
-
-	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>
-	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>
-	<function name="GetTexGenfv" template="GetTexGen" gltype="GLfloat"/>
-	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
-	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
-
-	<function name="IsEnabled" template="IsEnabled"/>
-
-	<function name="DepthRange" template="DepthRange" gltype="GLclampd"/>
-	<function name="Frustum" template="Frustum" gltype="GLdouble"/>
-
-	<function name="LoadIdentity" template="LoadIdentity"/>
-	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>
-	<function name="MatrixMode" template="MatrixMode"/>
-
-	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>
-	<function name="Ortho" template="Ortho" gltype="GLdouble"/>
-	<function name="PopMatrix" template="PopMatrix"/>
-	<function name="PushMatrix" template="PushMatrix"/>
-
-	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>
-	<function name="Scalef" template="Scale" gltype="GLfloat"/>
-	<function name="Translatef" template="Translate" gltype="GLfloat"/>
-
-	<function name="Viewport" template="Viewport"/>
-
-	<function name="ColorPointer" template="ColorPointer"/>
-	<function name="DisableClientState" template="DisableClientState"/>
-	<function name="DrawArrays" template="DrawArrays"/>
-	<function name="DrawElements" template="DrawElements"/>
-	<function name="EnableClientState" template="EnableClientState"/>
-
-	<function name="GetPointerv" template="GetPointer"/>
-	<function name="Normal3f" default_prefix="_vbo_" template="Normal" gltype="GLfloat" expand_vector="true"/>
-	<function name="NormalPointer" template="NormalPointer"/>
-	<function name="TexCoordPointer" template="TexCoordPointer"/>
-	<function name="VertexPointer" template="VertexPointer"/>
-
-	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
-	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
-	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
-	<function name="TexSubImage2D" template="TexSubImage2D"/>
-
-	<function name="BindTexture" template="BindTexture"/>
-	<function name="DeleteTextures" template="DeleteTextures"/>
-	<function name="GenTextures" template="GenTextures"/>
-	<function name="IsTexture" template="IsTexture"/>
-
-	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>
-	<function name="BlendEquation" template="BlendEquation"/>
-	<function name="BlendEquationSeparateEXT" template="BlendEquationSeparate"/>
-
-	<function name="TexImage3D" template="TexImage3D"/>
-	<function name="TexSubImage3D" template="TexSubImage3D"/>
-	<function name="CopyTexSubImage3D" template="CopyTexSubImage3D"/>
-
-	<function name="CompressedTexImage3DARB" template="CompressedTexImage3D"/>
-	<function name="CompressedTexSubImage3DARB" template="CompressedTexSubImage3D"/>
-
-	<function name="ActiveTextureARB" template="ActiveTexture"/>
-	<function name="ClientActiveTextureARB" template="ClientActiveTexture"/>
-
-	<function name="MultiTexCoord4f" default_prefix="_vbo_" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-
-	<function name="SampleCoverageARB" template="SampleCoverage" gltype="GLclampf"/>
-
-	<function name="CompressedTexImage2DARB" template="CompressedTexImage2D"/>
-	<function name="CompressedTexSubImage2DARB" template="CompressedTexSubImage2D"/>
-
-	<function name="BlendFuncSeparateEXT" template="BlendFuncSeparate"/>
-
-	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>
-
-	<function name="VertexAttrib1f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="VertexAttrib2f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="VertexAttrib3f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="VertexAttrib4f" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="VertexAttrib1fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>
-	<function name="VertexAttrib2fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>
-	<function name="VertexAttrib3fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>
-	<function name="VertexAttrib4fv" default_prefix="_vbo_" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>
-
-	<function name="VertexAttribPointerARB" template="VertexAttribPointer"/>
-	<function name="EnableVertexAttribArrayARB" template="EnableVertexAttribArray"/>
-	<function name="DisableVertexAttribArrayARB" template="DisableVertexAttribArray"/>
-
-	<function name="IsProgram" template="IsProgram"/>
-	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>
-
-	<function name="GetVertexAttribfvARB" template="GetVertexAttrib" gltype="GLfloat"/>
-	<function name="GetVertexAttribivARB" template="GetVertexAttrib" gltype="GLint"/>
-	<function name="GetVertexAttribPointervARB" template="GetVertexAttribPointer"/>
-
-	<function name="GetBufferPointervARB" template="GetBufferPointer"/>
-	<function name="MapBufferARB" template="MapBuffer"/>
-	<function name="UnmapBufferARB" template="UnmapBuffer"/>
-	<function name="BindBufferARB" template="BindBuffer"/>
-	<function name="BufferDataARB" template="BufferData"/>
-	<function name="BufferSubDataARB" template="BufferSubData"/>
-	<function name="DeleteBuffersARB" template="DeleteBuffers"/>
-	<function name="GenBuffersARB" template="GenBuffers"/>
-	<function name="GetBufferParameterivARB" template="GetBufferParameter" gltype="GLint"/>
-	<function name="IsBufferARB" template="IsBuffer"/>
-
-	<function name="CreateShader" template="CreateShader"/>
-	<function name="ShaderSourceARB" template="ShaderSource"/>
-	<function name="CompileShaderARB" template="CompileShader"/>
-	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>
-	<function name="DeleteShader" template="DeleteShader"/>
-	<function name="ShaderBinary" template="ShaderBinary"/>
-	<function name="CreateProgram" template="CreateProgram"/>
-	<function name="AttachShader" template="AttachShader"/>
-	<function name="DetachShader" template="DetachShader"/>
-	<function name="LinkProgramARB" template="LinkProgram"/>
-	<function name="UseProgramObjectARB" template="UseProgram"/>
-	<function name="DeleteProgram" template="DeleteProgram"/>
-
-	<function name="GetActiveAttribARB" template="GetActiveAttrib"/>
-	<function name="GetAttribLocationARB" template="GetAttribLocation"/>
-	<function name="BindAttribLocationARB" template="BindAttribLocation"/>
-	<function name="GetUniformLocationARB" template="GetUniformLocation"/>
-	<function name="GetActiveUniformARB" template="GetActiveUniform"/>
-
-	<function name="Uniform1fARB" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2fARB" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3fARB" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4fARB" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="Uniform1iARB" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2iARB" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3iARB" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4iARB" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>
-	<function name="Uniform1fvARB" template="Uniform" gltype="GLfloat" vector_size="1"/>
-	<function name="Uniform2fvARB" template="Uniform" gltype="GLfloat" vector_size="2"/>
-	<function name="Uniform3fvARB" template="Uniform" gltype="GLfloat" vector_size="3"/>
-	<function name="Uniform4fvARB" template="Uniform" gltype="GLfloat" vector_size="4"/>
-	<function name="Uniform1ivARB" template="Uniform" gltype="GLint" vector_size="1"/>
-	<function name="Uniform2ivARB" template="Uniform" gltype="GLint" vector_size="2"/>
-	<function name="Uniform3ivARB" template="Uniform" gltype="GLint" vector_size="3"/>
-	<function name="Uniform4ivARB" template="Uniform" gltype="GLint" vector_size="4"/>
-
-	<function name="UniformMatrix2fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>
-	<function name="UniformMatrix3fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>
-	<function name="UniformMatrix4fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>
-
-	<function name="ValidateProgramARB" template="ValidateProgram"/>
-
-	<function name="GenerateMipmapEXT" template="GenerateMipmap"/>
-	<function name="BindFramebufferEXT" template="BindFramebuffer"/>
-	<function name="DeleteFramebuffersEXT" template="DeleteFramebuffers"/>
-	<function name="GenFramebuffersEXT" template="GenFramebuffers"/>
-	<function name="BindRenderbufferEXT" template="BindRenderbuffer"/>
-	<function name="DeleteRenderbuffersEXT" template="DeleteRenderbuffers"/>
-	<function name="GenRenderbuffersEXT" template="GenRenderbuffers"/>
-	<function name="RenderbufferStorageEXT" template="RenderbufferStorage"/>
-	<function name="FramebufferRenderbufferEXT" template="FramebufferRenderbuffer"/>
-	<function name="FramebufferTexture2DEXT" template="FramebufferTexture2D"/>
-	<function name="FramebufferTexture3DEXT" template="FramebufferTexture3D"/>
-	<function name="CheckFramebufferStatusEXT" template="CheckFramebufferStatus"/>
-	<function name="GetFramebufferAttachmentParameterivEXT" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
-	<function name="GetRenderbufferParameterivEXT" template="GetRenderbufferParameter" gltype="GLint"/>
-	<function name="IsRenderbufferEXT" template="IsRenderbuffer"/>
-	<function name="IsFramebufferEXT" template="IsFramebuffer"/>
-
-	<function name="IsShader" template="IsShader"/>
-	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>
-	<function name="GetAttachedShaders" template="GetAttachedShaders"/>
-	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>
-	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>
-	<function name="GetShaderSourceARB" template="GetShaderSource"/>
-	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>
-	<function name="GetUniformfvARB" template="GetUniform" gltype="GLfloat"/>
-	<function name="GetUniformivARB" template="GetUniform" gltype="GLint"/>
-
-	<function name="DrawTexf" template="DrawTex" gltype="GLfloat" expand_vector="true"/>
-	<function name="DrawTexfv" template="DrawTex" gltype="GLfloat"/>
-	<function name="DrawTexi" template="DrawTex" gltype="GLint" expand_vector="true"/>
-	<function name="DrawTexiv" template="DrawTex" gltype="GLint"/>
-	<function name="DrawTexs" template="DrawTex" gltype="GLshort" expand_vector="true"/>
-	<function name="DrawTexsv" template="DrawTex" gltype="GLshort"/>
-
-        <!-- EXT_multi_draw_arrays -->
-        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
-        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
-
-        <!-- OES_EGL_image -->
-        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
-        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
-</api>
-
-<api name="GLES1.1">
-	<category name="GLES1.1"/>
-
-	<category name="OES_byte_coordinates"/>
-	<category name="OES_fixed_point"/>
-	<category name="OES_single_precision"/>
-	<category name="OES_matrix_get"/>
-	<category name="OES_read_format"/>
-	<category name="OES_compressed_paletted_texture"/>
-	<category name="OES_point_size_array"/>
-	<category name="OES_point_sprite"/>
-	<category name="OES_query_matrix"/>
-	<category name="OES_draw_texture"/>
-	<category name="OES_blend_equation_separate"/>
-	<category name="OES_blend_func_separate"/>
-	<category name="OES_blend_subtract"/>
-	<category name="OES_stencil_wrap"/>
-	<category name="OES_texture_cube_map"/>
-	<category name="OES_texture_env_crossbar"/>
-	<category name="OES_texture_mirrored_repeat"/>
-	<category name="OES_framebuffer_object"/>
-	<category name="OES_depth24"/>
-	<category name="OES_depth32"/>
-	<category name="OES_fbo_render_mipmap"/>
-	<category name="OES_rgb8_rgba8"/>
-	<category name="OES_stencil1"/>
-	<category name="OES_stencil4"/>
-	<category name="OES_stencil8"/>
-	<category name="OES_element_index_uint"/>
-	<category name="OES_mapbuffer"/>
-	<category name="EXT_texture_filter_anisotropic"/>
-
-	<category name="ARB_texture_non_power_of_two"/>
-	<!-- disabled due to missing enums
-	<category name="EXT_texture_compression_dxt1"/>
-	-->
-	<category name="EXT_texture_lod_bias"/>
-	<category name="EXT_blend_minmax"/>
-	<category name="EXT_multi_draw_arrays"/>
-	<category name="OES_EGL_image"/>
-
-	<category name="OES_matrix_palette"/>
-
-	<function name="Color4f" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="Color4ub" template="Color" gltype="GLubyte" vector_size="4" expand_vector="true"/>
-	<function name="Color4x" template="Color" gltype="GLfixed" vector_size="4" expand_vector="true"/>
-
-	<function name="ClipPlanef" template="ClipPlane" gltype="GLfloat"/>
-	<function name="ClipPlanex" template="ClipPlane" gltype="GLfixed"/>
-
-	<function name="CullFace" template="CullFace"/>
-
-	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>
-	<function name="Fogx" template="Fog" gltype="GLfixed" expand_vector="true"/>
-	<function name="Fogfv" template="Fog" gltype="GLfloat"/>
-	<function name="Fogxv" template="Fog" gltype="GLfixed"/>
-
-	<function name="FrontFace" template="FrontFace"/>
-	<function name="Hint" template="Hint"/>
-
-	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>
-	<function name="Lightx" template="Light" gltype="GLfixed" expand_vector="true"/>
-	<function name="Lightfv" template="Light" gltype="GLfloat"/>
-	<function name="Lightxv" template="Light" gltype="GLfixed"/>
-
-	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>
-	<function name="LightModelx" template="LightModel" gltype="GLfixed" expand_vector="true"/>
-	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>
-	<function name="LightModelxv" template="LightModel" gltype="GLfixed"/>
-
-	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
-	<function name="LineWidthx" template="LineWidth" gltype="GLfixed"/>
-
-	<function name="Materialf" template="Material" gltype="GLfloat" expand_vector="true"/>
-	<function name="Materialfv" template="Material" gltype="GLfloat"/>
-	<function name="Materialx" template="Material" gltype="GLfixed" expand_vector="true"/>
-	<function name="Materialxv" template="Material" gltype="GLfixed"/>
-
-	<function name="PointSize" template="PointSize" gltype="GLfloat"/>
-	<function name="PointSizex" template="PointSize" gltype="GLfixed"/>
-	<function name="PointSizePointerOES" template="PointSizePointer"/>
-
-	<function name="Scissor" template="Scissor"/>
-	<function name="ShadeModel" template="ShadeModel"/>
-
-	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
-	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
-	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
-	<function name="TexParameterx" template="TexParameter" gltype="GLfixed" expand_vector="true"/>
-	<function name="TexParameterxv" template="TexParameter" gltype="GLfixed"/>
-
-	<function name="TexImage2D" template="TexImage2D"/>
-
-	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>
-	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>
-	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>
-	<function name="TexEnvx" template="TexEnv" gltype="GLfixed" expand_vector="true"/>
-	<function name="TexEnvxv" template="TexEnv" gltype="GLfixed"/>
-
-	<function name="TexGenfOES" external="true" template="TexGen" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexGenfvOES" external="true" template="TexGen" gltype="GLfloat"/>
-	<function name="TexGeniOES" external="true" template="TexGen" gltype="GLint" expand_vector="true"/>
-	<function name="TexGenivOES" external="true" template="TexGen" gltype="GLint"/>
-	<function name="TexGenxOES" external="true" template="TexGen" gltype="GLfixed" expand_vector="true"/>
-	<function name="TexGenxvOES" external="true" template="TexGen" gltype="GLfixed"/>
-
-	<function name="Clear" template="Clear"/>
-	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
-	<function name="ClearColorx" template="ClearColor" gltype="GLclampx"/>
-
-	<function name="ClearStencil" template="ClearStencil"/>
-	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
-	<function name="ClearDepthx" template="ClearDepth" gltype="GLclampx"/>
-
-	<function name="StencilMask" template="StencilMask"/>
-	<function name="ColorMask" template="ColorMask"/>
-	<function name="DepthMask" template="DepthMask"/>
-
-	<function name="Disable" template="Disable"/>
-	<function name="Enable" template="Enable"/>
-	<function name="Finish" template="Finish"/>
-	<function name="Flush" template="Flush"/>
-
-	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>
-	<function name="AlphaFuncx" template="AlphaFunc" gltype="GLclampx"/>
-
-	<function name="BlendFunc" template="BlendFunc"/>
-	<function name="LogicOp" template="LogicOp"/>
-	<function name="StencilFunc" template="StencilFunc"/>
-
-	<function name="StencilOp" template="StencilOp"/>
-	<function name="DepthFunc" template="DepthFunc"/>
-
-	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
-	<function name="ReadPixels" template="ReadPixels"/>
-
-	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
-
-	<function name="GetClipPlanef" template="GetClipPlane" gltype="GLfloat"/>
-	<function name="GetClipPlanex" template="GetClipPlane" gltype="GLfixed"/>
-
-	<function name="GetError" template="GetError"/>
-	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
-	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>
-	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
-
-	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>
-	<function name="GetLightxv" template="GetLight" gltype="GLfixed"/>
-
-	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>
-	<function name="GetMaterialxv" template="GetMaterial" gltype="GLfixed"/>
-
-	<function name="GetString" template="GetString"/>
-
-	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>
-	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>
-	<function name="GetTexEnvxv" template="GetTexEnv" gltype="GLfixed"/>
-
-	<function name="GetTexGenfvOES" external="true" template="GetTexGen" gltype="GLfloat"/>
-	<function name="GetTexGenivOES" external="true" template="GetTexGen" gltype="GLint"/>
-	<function name="GetTexGenxvOES" external="true" template="GetTexGen" gltype="GLfixed"/>
-
-	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
-	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
-	<function name="GetTexParameterxv" template="GetTexParameter" gltype="GLfixed"/>
-
-	<function name="IsEnabled" template="IsEnabled"/>
-
-	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
-	<function name="DepthRangex" template="DepthRange" gltype="GLclampx"/>
-
-	<function name="Frustumf" template="Frustum" gltype="GLfloat"/>
-	<function name="Frustumx" template="Frustum" gltype="GLfixed"/>
-
-	<function name="LoadIdentity" template="LoadIdentity"/>
-	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>
-	<function name="LoadMatrixx" template="LoadMatrix" gltype="GLfixed"/>
-	<function name="MatrixMode" template="MatrixMode"/>
-
-	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>
-	<function name="MultMatrixx" template="MultMatrix" gltype="GLfixed"/>
-	<function name="Orthof" template="Ortho" gltype="GLfloat"/>
-	<function name="Orthox" template="Ortho" gltype="GLfixed"/>
-
-	<function name="PopMatrix" template="PopMatrix"/>
-	<function name="PushMatrix" template="PushMatrix"/>
-
-	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>
-	<function name="Rotatex" template="Rotate" gltype="GLfixed"/>
-	<function name="Scalef" template="Scale" gltype="GLfloat"/>
-	<function name="Scalex" template="Scale" gltype="GLfixed"/>
-	<function name="Translatef" template="Translate" gltype="GLfloat"/>
-	<function name="Translatex" template="Translate" gltype="GLfixed"/>
-
-	<function name="Viewport" template="Viewport"/>
-	<function name="ColorPointer" template="ColorPointer"/>
-	<function name="DisableClientState" template="DisableClientState"/>
-	<function name="DrawArrays" template="DrawArrays"/>
-	<function name="DrawElements" template="DrawElements"/>
-	<function name="EnableClientState" template="EnableClientState"/>
-
-	<function name="GetPointerv" template="GetPointer"/>
-
-	<function name="Normal3f" template="Normal" gltype="GLfloat" expand_vector="true"/>
-	<function name="Normal3x" template="Normal" gltype="GLfixed" expand_vector="true"/>
-	<function name="NormalPointer" template="NormalPointer"/>
-	<function name="TexCoordPointer" template="TexCoordPointer"/>
-	<function name="VertexPointer" template="VertexPointer"/>
-
-	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
-	<function name="PolygonOffsetx" template="PolygonOffset" gltype="GLfixed"/>
-
-	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
-	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
-
-	<function name="TexSubImage2D" template="TexSubImage2D"/>
-
-	<function name="BindTexture" template="BindTexture"/>
-	<function name="DeleteTextures" template="DeleteTextures"/>
-	<function name="GenTextures" template="GenTextures"/>
-	<function name="IsTexture" template="IsTexture"/>
-
-	<function name="BlendEquationOES" template="BlendEquation"/>
-	<function name="BlendEquationSeparateOES" template="BlendEquationSeparate"/>
-
-	<function name="MultiTexCoord4x" template="MultiTexCoord" gltype="GLfixed" vector_size="4" expand_vector="true"/>
-
-	<function name="ActiveTexture" template="ActiveTexture"/>
-	<function name="ClientActiveTexture" template="ClientActiveTexture"/>
-
-	<function name="MultiTexCoord4f" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-
-	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>
-	<function name="SampleCoveragex" template="SampleCoverage" gltype="GLclampx"/>
-
-	<!-- CompressedTexImage2D calls out to two different functions based on
-	     whether the image is a paletted image or not -->
-	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>
-	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>
-
-	<function name="BlendFuncSeparateOES" template="BlendFuncSeparate"/>
-
-	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>
-	<function name="PointParameterx" template="PointParameter" gltype="GLfixed" expand_vector="true"/>
-	<function name="PointParameterxv" template="PointParameter" gltype="GLfixed"/>
-
-	<!-- OES_mapbuffer -->
-	<function name="GetBufferPointervOES" template="GetBufferPointer"/>
-	<function name="MapBufferOES" template="MapBuffer"/>
-	<function name="UnmapBufferOES" template="UnmapBuffer"/>
-
-	<function name="BindBuffer" template="BindBuffer"/>
-	<function name="BufferData" template="BufferData"/>
-	<function name="BufferSubData" template="BufferSubData"/>
-	<function name="DeleteBuffers" template="DeleteBuffers"/>
-	<function name="GenBuffers" template="GenBuffers"/>
-	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>
-	<function name="IsBuffer" template="IsBuffer"/>
-
-	<!-- OES_framebuffer_object -->
-	<function name="GenerateMipmapOES" template="GenerateMipmap"/>
-	<function name="BindFramebufferOES" template="BindFramebuffer"/>
-	<function name="DeleteFramebuffersOES" template="DeleteFramebuffers"/>
-	<function name="GenFramebuffersOES" template="GenFramebuffers"/>
-	<function name="BindRenderbufferOES" template="BindRenderbuffer"/>
-	<function name="DeleteRenderbuffersOES" template="DeleteRenderbuffers"/>
-	<function name="GenRenderbuffersOES" template="GenRenderbuffers"/>
-	<function name="RenderbufferStorageOES" external="true" template="RenderbufferStorage"/>
-	<function name="FramebufferRenderbufferOES" template="FramebufferRenderbuffer"/>
-	<function name="FramebufferTexture2DOES" template="FramebufferTexture2D"/>
-	<function name="CheckFramebufferStatusOES" template="CheckFramebufferStatus"/>
-	<function name="GetFramebufferAttachmentParameterivOES" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
-	<function name="GetRenderbufferParameterivOES" template="GetRenderbufferParameter" gltype="GLint"/>
-	<function name="IsRenderbufferOES" template="IsRenderbuffer"/>
-	<function name="IsFramebufferOES" template="IsFramebuffer"/>
-
-	<!-- OES_query_matrix -->
-	<!-- QueryMatrixx returns values in an unusual, decomposed, fixed-value
-	     form; it has its own code for this -->
-	<function name="QueryMatrixxOES" external="true" template="QueryMatrix" gltype="GLfixed"/>
-
-	<!-- OES_draw_texture -->
-	<function name="DrawTexfOES" template="DrawTex" gltype="GLfloat" expand_vector="true"/>
-	<function name="DrawTexiOES" template="DrawTex" gltype="GLint" expand_vector="true"/>
-	<function name="DrawTexsOES" template="DrawTex" gltype="GLshort" expand_vector="true"/>
-	<function name="DrawTexxOES" template="DrawTex" gltype="GLfixed" expand_vector="true"/>
-	<function name="DrawTexfvOES" template="DrawTex" gltype="GLfloat"/>
-	<function name="DrawTexivOES" template="DrawTex" gltype="GLint"/>
-	<function name="DrawTexsvOES" template="DrawTex" gltype="GLshort"/>
-	<function name="DrawTexxvOES" template="DrawTex" gltype="GLfixed"/>
-
-        <!-- EXT_multi_draw_arrays -->
-        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
-        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
-
-        <!-- OES_EGL_image -->
-        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
-        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
-</api>
-
-<api name="GLES2.0">
-	<category name="GLES2.0"/>
-
-	<category name="OES_compressed_paletted_texture"/>
-	<category name="OES_depth24"/>
-	<category name="OES_depth32"/>
-	<category name="OES_fbo_render_mipmap"/>
-	<category name="OES_rgb8_rgba8"/>
-	<category name="OES_stencil1"/>
-	<category name="OES_stencil4"/>
-	<category name="OES_element_index_uint"/>
-	<category name="OES_mapbuffer"/>
-	<category name="OES_texture_3D"/>
-	<category name="OES_texture_npot"/>
-	<category name="EXT_texture_filter_anisotropic"/>
-	<category name="EXT_texture_type_2_10_10_10_REV"/>
-	<category name="OES_depth_texture"/>
-	<category name="OES_packed_depth_stencil"/>
-	<category name="OES_standard_derivatives"/>
-
-	<category name="EXT_texture_compression_dxt1"/>
-	<category name="EXT_blend_minmax"/>
-	<category name="EXT_multi_draw_arrays"/>
-	<category name="OES_EGL_image"/>
-
-	<function name="CullFace" template="CullFace"/>
-
-	<function name="FrontFace" template="FrontFace"/>
-	<function name="Hint" template="Hint"/>
-
-	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
-
-	<function name="Scissor" template="Scissor"/>
-
-	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
-	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
-	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
-
-	<function name="TexImage2D" template="TexImage2D"/>
-
-	<function name="Clear" template="Clear"/>
-	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
-	<function name="ClearStencil" template="ClearStencil"/>
-	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
-
-	<function name="StencilMask" template="StencilMask"/>
-	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>
-	<function name="ColorMask" template="ColorMask"/>
-	<function name="DepthMask" template="DepthMask"/>
-	<function name="Disable" template="Disable"/>
-	<function name="Enable" template="Enable"/>
-	<function name="Finish" template="Finish"/>
-	<function name="Flush" template="Flush"/>
-
-	<function name="BlendFunc" template="BlendFunc"/>
-
-	<function name="StencilFunc" template="StencilFunc"/>
-	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>
-	<function name="StencilOp" template="StencilOp"/>
-	<function name="StencilOpSeparate" template="StencilOpSeparate"/>
-
-	<function name="DepthFunc" template="DepthFunc"/>
-
-	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
-	<function name="ReadPixels" template="ReadPixels"/>
-
-	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
-	<function name="GetError" template="GetError"/>
-	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
-	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
-
-	<function name="GetString" template="GetString"/>
-
-	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
-	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
-
-	<function name="IsEnabled" template="IsEnabled"/>
-
-	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
-
-	<function name="Viewport" template="Viewport"/>
-
-	<function name="DrawArrays" template="DrawArrays"/>
-	<function name="DrawElements" template="DrawElements"/>
-
-	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
-	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
-	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
-	<function name="TexSubImage2D" template="TexSubImage2D"/>
-
-	<function name="BindTexture" template="BindTexture"/>
-	<function name="DeleteTextures" template="DeleteTextures"/>
-	<function name="GenTextures" template="GenTextures"/>
-	<function name="IsTexture" template="IsTexture"/>
-
-	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>
-	<function name="BlendEquation" template="BlendEquation"/>
-	<function name="BlendEquationSeparate" template="BlendEquationSeparate"/>
-
-	<function name="TexImage3DOES" template="TexImage3D"/>
-	<function name="TexSubImage3DOES" template="TexSubImage3D"/>
-	<function name="CopyTexSubImage3DOES" template="CopyTexSubImage3D"/>
-
-	<function name="CompressedTexImage3DOES" template="CompressedTexImage3D"/>
-	<function name="CompressedTexSubImage3DOES" template="CompressedTexSubImage3D"/>
-
-	<function name="ActiveTexture" template="ActiveTexture"/>
-
-	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>
-
-	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>
-	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>
-
-	<function name="BlendFuncSeparate" template="BlendFuncSeparate"/>
-
-	<function name="VertexAttrib1f" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="VertexAttrib2f" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="VertexAttrib3f" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="VertexAttrib4f" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="VertexAttrib1fv" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>
-	<function name="VertexAttrib2fv" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>
-	<function name="VertexAttrib3fv" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>
-	<function name="VertexAttrib4fv" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>
-
-	<function name="VertexAttribPointer" template="VertexAttribPointer"/>
-
-	<function name="EnableVertexAttribArray" template="EnableVertexAttribArray"/>
-	<function name="DisableVertexAttribArray" template="DisableVertexAttribArray"/>
-
-	<function name="IsProgram" template="IsProgram"/>
-	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>
-
-	<function name="GetVertexAttribfv" template="GetVertexAttrib" gltype="GLfloat"/>
-	<function name="GetVertexAttribiv" template="GetVertexAttrib" gltype="GLint"/>
-	<function name="GetVertexAttribPointerv" template="GetVertexAttribPointer"/>
-
-	<function name="GetBufferPointervOES" template="GetBufferPointer"/>
-	<function name="MapBufferOES" template="MapBuffer"/>
-	<function name="UnmapBufferOES" template="UnmapBuffer"/>
-	<function name="BindBuffer" template="BindBuffer"/>
-	<function name="BufferData" template="BufferData"/>
-	<function name="BufferSubData" template="BufferSubData"/>
-	<function name="DeleteBuffers" template="DeleteBuffers"/>
-	<function name="GenBuffers" template="GenBuffers"/>
-	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>
-	<function name="IsBuffer" template="IsBuffer"/>
-
-	<function name="CreateShader" template="CreateShader"/>
-	<function name="ShaderSource" template="ShaderSource"/>
-	<function name="CompileShader" template="CompileShader"/>
-	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>
-	<function name="DeleteShader" template="DeleteShader"/>
-	<function name="ShaderBinary" template="ShaderBinary"/>
-	<function name="CreateProgram" template="CreateProgram"/>
-	<function name="AttachShader" template="AttachShader"/>
-	<function name="DetachShader" template="DetachShader"/>
-	<function name="LinkProgram" template="LinkProgram"/>
-	<function name="UseProgram" template="UseProgram"/>
-	<function name="DeleteProgram" template="DeleteProgram"/>
-
-	<function name="GetActiveAttrib" template="GetActiveAttrib"/>
-	<function name="GetAttribLocation" template="GetAttribLocation"/>
-	<function name="BindAttribLocation" template="BindAttribLocation"/>
-	<function name="GetUniformLocation" template="GetUniformLocation"/>
-	<function name="GetActiveUniform" template="GetActiveUniform"/>
-
-	<function name="Uniform1f" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2f" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3f" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4f" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="Uniform1i" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2i" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3i" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4i" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>
-
-	<function name="Uniform1fv" template="Uniform" gltype="GLfloat" vector_size="1"/>
-	<function name="Uniform2fv" template="Uniform" gltype="GLfloat" vector_size="2"/>
-	<function name="Uniform3fv" template="Uniform" gltype="GLfloat" vector_size="3"/>
-	<function name="Uniform4fv" template="Uniform" gltype="GLfloat" vector_size="4"/>
-	<function name="Uniform1iv" template="Uniform" gltype="GLint" vector_size="1"/>
-	<function name="Uniform2iv" template="Uniform" gltype="GLint" vector_size="2"/>
-	<function name="Uniform3iv" template="Uniform" gltype="GLint" vector_size="3"/>
-	<function name="Uniform4iv" template="Uniform" gltype="GLint" vector_size="4"/>
-
-	<function name="UniformMatrix2fv" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>
-	<function name="UniformMatrix3fv" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>
-	<function name="UniformMatrix4fv" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>
-
-	<function name="ValidateProgram" template="ValidateProgram"/>
-
-	<function name="GenerateMipmap" template="GenerateMipmap"/>
-	<function name="BindFramebuffer" template="BindFramebuffer"/>
-	<function name="DeleteFramebuffers" template="DeleteFramebuffers"/>
-	<function name="GenFramebuffers" template="GenFramebuffers"/>
-	<function name="BindRenderbuffer" template="BindRenderbuffer"/>
-	<function name="DeleteRenderbuffers" template="DeleteRenderbuffers"/>
-	<function name="GenRenderbuffers" template="GenRenderbuffers"/>
-	<function name="RenderbufferStorage" external="true" template="RenderbufferStorage"/>
-	<function name="FramebufferRenderbuffer" template="FramebufferRenderbuffer"/>
-	<function name="FramebufferTexture2D" template="FramebufferTexture2D"/>
-	<function name="FramebufferTexture3DOES" template="FramebufferTexture3D"/>
-	<function name="CheckFramebufferStatus" template="CheckFramebufferStatus"/>
-	<function name="GetFramebufferAttachmentParameteriv" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
-	<function name="GetRenderbufferParameteriv" template="GetRenderbufferParameter" gltype="GLint"/>
-	<function name="IsRenderbuffer" template="IsRenderbuffer"/>
-	<function name="IsFramebuffer" template="IsFramebuffer"/>
-
-	<function name="IsShader" template="IsShader"/>
-	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>
-	<function name="GetAttachedShaders" template="GetAttachedShaders"/>
-	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>
-	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>
-	<function name="GetShaderSource" template="GetShaderSource"/>
-	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>
-	<function name="GetUniformfv" template="GetUniform" gltype="GLfloat"/>
-	<function name="GetUniformiv" template="GetUniform" gltype="GLint"/>
-
-        <!-- EXT_multi_draw_arrays -->
-        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
-        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
-
-        <!-- OES_EGL_image -->
-        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
-        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
-</api>
-
-</apispec>
+<?xml version="1.0"?>

+<!DOCTYPE apispec SYSTEM "APIspec.dtd">

+

+<!-- A function is generated from a template.  Multiple functions can be

+     generated from a single template with different arguments.  For example,

+     glColor3f can be generated from

+

+     <function name="Color3f" template="Color" gltype="GLfloat" vector_size="3" expand_vector="true"/>

+

+     and glColor4iv can be generated from

+

+     <function name="Color4iv" template="Color" gltype="GLint" vector_size="4"/>

+

+     In a template, there are <desc>s that describe the properties of

+     parameters.  A <desc> can enumerate the valid values of a parameter.  It

+     can also specify the error code when an invalid value is given, and etc.

+     By nesting <desc>s, they can create dependency between parameters.

+

+     A function can be marked as external.  It means that the function cannot

+     be dispatched to the corresponding mesa function, if one exists, directly,

+     and requires an external implementation.

+-->

+

+<apispec>

+

+<template name="Color">

+	<proto>

+		<return type="void"/>

+		<vector name="v" type="const GLtype *" size="dynamic">

+			<param name="red" type="GLtype"/>

+			<param name="green" type="GLtype"/>

+			<param name="blue" type="GLtype"/>

+			<param name="alpha" type="GLtype"/>

+		</vector>

+	</proto>

+</template>

+

+<template name="ClipPlane">

+	<proto>

+		<return type="void"/>

+		<param name="plane" type="GLenum"/>

+		<vector name="equation" type="const GLtype *" size="4"/>

+	</proto>

+

+	<desc name="plane">

+		<range base="GL_CLIP_PLANE" from="0" to="5"/>

+	</desc>

+</template>

+

+<template name="CullFace">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_FRONT"/>

+		<value name="GL_BACK"/>

+		<value name="GL_FRONT_AND_BACK"/>

+	</desc>

+</template>

+

+<template name="Fog">

+	<proto>

+		<return type="void"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+        <desc name="pname">

+		<value name="GL_FOG_MODE"/>

+		<desc name="param">

+			<value name="GL_EXP"/>

+			<value name="GL_EXP2"/>

+			<value name="GL_LINEAR"/>

+		</desc>

+        </desc>

+

+	<desc name="pname">

+		<value name="GL_FOG_COLOR"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_FOG_DENSITY"/>

+		<value name="GL_FOG_START"/>

+		<value name="GL_FOG_END"/>

+

+		<desc name="params" vector_size="1"/>

+	</desc>

+</template>

+

+<template name="FrontFace">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_CW"/>

+		<value name="GL_CCW"/>

+	</desc>

+</template>

+

+<template name="Hint">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="mode" type="GLenum"/>

+	</proto>

+

+	<desc name="target" category="GLES1.1">

+		<value name="GL_FOG_HINT"/>

+		<value name="GL_LINE_SMOOTH_HINT"/>

+		<value name="GL_PERSPECTIVE_CORRECTION_HINT"/>

+		<value name="GL_POINT_SMOOTH_HINT"/>

+	</desc>

+	<desc name="target" category="OES_standard_derivatives">

+		<value name="GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES"/>

+	</desc>

+	<desc name="target">

+		<value name="GL_GENERATE_MIPMAP_HINT"/>

+	</desc>

+

+	<desc name="mode">

+		<value name="GL_FASTEST"/>

+		<value name="GL_NICEST"/>

+		<value name="GL_DONT_CARE"/>

+	</desc>

+</template>

+

+<template name="Light">

+	<proto>

+		<return type="void"/>

+		<param name="light" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="light">

+		<range base="GL_LIGHT" from="0" to="7"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_AMBIENT"/>

+		<value name="GL_DIFFUSE"/>

+		<value name="GL_SPECULAR"/>

+		<value name="GL_POSITION"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SPOT_DIRECTION"/>

+

+		<desc name="params" vector_size="3"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SPOT_EXPONENT"/>

+		<value name="GL_SPOT_CUTOFF"/>

+		<value name="GL_CONSTANT_ATTENUATION"/>

+		<value name="GL_LINEAR_ATTENUATION"/>

+		<value name="GL_QUADRATIC_ATTENUATION"/>

+

+		<desc name="params" vector_size="1"/>

+	</desc>

+</template>

+

+<template name="LightModel">

+	<proto>

+		<return type="void"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_LIGHT_MODEL_AMBIENT"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_LIGHT_MODEL_TWO_SIDE"/>

+		<desc name="param">

+			<value name="GL_TRUE"/>

+			<value name="GL_FALSE"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="LineWidth">

+	<proto>

+		<return type="void"/>

+		<param name="width" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="Material">

+	<proto>

+		<return type="void"/>

+		<param name="face" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="face">

+		<value name="GL_FRONT_AND_BACK"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_AMBIENT"/>

+		<value name="GL_DIFFUSE"/>

+		<value name="GL_AMBIENT_AND_DIFFUSE"/>

+		<value name="GL_SPECULAR"/>

+		<value name="GL_EMISSION"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SHININESS"/>

+

+		<desc name="params" vector_size="1"/>

+	</desc>

+</template>

+

+<template name="PointSize">

+	<proto>

+		<return type="void"/>

+		<param name="size" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="PointSizePointer">

+	<proto>

+		<return type="void"/>

+		<param name="type" type="GLenum"/>

+		<param name="stride" type="GLsizei"/>

+		<param name="pointer" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="type">

+		<value name="GL_FLOAT"/>

+		<value name="GL_FIXED"/>

+	</desc>

+</template>

+

+<template name="Scissor">

+	<proto>

+		<return type="void"/>

+		<param name="x" type="GLint"/>

+		<param name="y" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+	</proto>

+</template>

+

+<template name="ShadeModel">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_FLAT"/>

+		<value name="GL_SMOOTH"/>

+	</desc>

+</template>

+

+<template name="TexParameter">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_WRAP_S"/>

+		<value name="GL_TEXTURE_WRAP_T"/>

+		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>

+

+		<desc name="param">

+			<value name="GL_CLAMP_TO_EDGE"/>

+			<value name="GL_REPEAT"/>

+			<value name="GL_MIRRORED_REPEAT" category="GLES2.0"/>

+			<value name="GL_MIRRORED_REPEAT_OES" category="OES_texture_mirrored_repeat"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_MIN_FILTER"/>

+

+		<desc name="param">

+			<value name="GL_NEAREST"/>

+			<value name="GL_LINEAR"/>

+			<value name="GL_NEAREST_MIPMAP_NEAREST"/>

+			<value name="GL_NEAREST_MIPMAP_LINEAR"/>

+			<value name="GL_LINEAR_MIPMAP_NEAREST"/>

+			<value name="GL_LINEAR_MIPMAP_LINEAR"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_MAG_FILTER"/>

+

+		<desc name="param">

+			<value name="GL_NEAREST"/>

+			<value name="GL_LINEAR"/>

+		</desc>

+	</desc>

+

+	<desc name="pname" category="GLES1.1">

+		<value name="GL_GENERATE_MIPMAP"/>

+

+		<desc name="param">

+			<value name="GL_TRUE"/>

+			<value name="GL_FALSE"/>

+		</desc>

+	</desc>

+

+	<desc name="pname" category="EXT_texture_filter_anisotropic">

+		<value name="GL_TEXTURE_MAX_ANISOTROPY_EXT"/>

+		<desc name="params" vector_size="1"/>

+	</desc>

+

+	<desc name="pname" category="OES_draw_texture">

+		<value name="GL_TEXTURE_CROP_RECT_OES"/>

+		<desc name="params" vector_size="4"/>

+	</desc>

+</template>

+

+<template name="TexImage2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="internalFormat" type="GLint"/> <!-- should be GLenum -->

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="border" type="GLint"/>

+		<param name="format" type="GLenum"/>

+		<param name="type" type="GLenum"/>

+		<param name="pixels" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="internalFormat" error="GL_INVALID_VALUE">

+		<value name="GL_ALPHA"/>

+		<value name="GL_RGB"/>

+		<value name="GL_RGBA"/>

+		<value name="GL_BGRA_EXT"/>

+		<value name="GL_LUMINANCE"/>

+		<value name="GL_LUMINANCE_ALPHA"/>

+		<value name="GL_DEPTH_COMPONENT" category="OES_depth_texture"/>

+		<value name="GL_DEPTH_STENCIL_OES" category="OES_packed_depth_stencil"/>

+	</desc>

+

+	<desc name="border" error="GL_INVALID_VALUE">

+		<value name="0"/>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGB"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGBA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>

+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format" category="OES_depth_texture">

+		<value name="GL_DEPTH_COMPONENT"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_SHORT"/>

+			<value name="GL_UNSIGNED_INT"/>

+		</desc>

+	</desc>

+

+	<desc name="format" category="OES_packed_depth_stencil">

+		<value name="GL_DEPTH_STENCIL_OES"/>

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_INT_24_8_OES"/>

+		</desc>

+	</desc>

+

+	<desc name="format" category="EXT_texture_format_BGRA8888">

+		<value name="GL_BGRA_EXT"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="TexEnv">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="target" category="OES_point_sprite">

+		<value name="GL_POINT_SPRITE_OES"/>

+

+		<desc name="pname">

+			<value name="GL_COORD_REPLACE_OES"/>

+		</desc>

+	</desc>

+

+	<desc name="pname" category="OES_point_sprite">

+		<value name="GL_COORD_REPLACE_OES"/>

+

+		<desc name="param">

+			<value name="GL_TRUE"/>

+			<value name="GL_FALSE"/>

+		</desc>

+	</desc>

+

+	<desc name="target" category="EXT_texture_lod_bias">

+		<value name="GL_TEXTURE_FILTER_CONTROL_EXT"/>

+

+		<desc name="pname">

+			<value name="GL_TEXTURE_LOD_BIAS_EXT"/>

+		</desc>

+	</desc>

+

+	<desc name="pname" category="EXT_texture_lod_bias">

+		<value name="GL_TEXTURE_LOD_BIAS_EXT"/>

+		<desc name="params" vector_size="1"/>

+	</desc>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_ENV"/>

+

+		<desc name="pname">

+			<value name="GL_TEXTURE_ENV_MODE"/>

+			<value name="GL_COMBINE_RGB"/>

+			<value name="GL_COMBINE_ALPHA"/>

+			<value name="GL_RGB_SCALE"/>

+			<value name="GL_ALPHA_SCALE"/>

+			<value name="GL_SRC0_RGB"/>

+			<value name="GL_SRC1_RGB"/>

+			<value name="GL_SRC2_RGB"/>

+			<value name="GL_SRC0_ALPHA"/>

+			<value name="GL_SRC1_ALPHA"/>

+			<value name="GL_SRC2_ALPHA"/>

+			<value name="GL_OPERAND0_RGB"/>

+			<value name="GL_OPERAND1_RGB"/>

+			<value name="GL_OPERAND2_RGB"/>

+			<value name="GL_OPERAND0_ALPHA"/>

+			<value name="GL_OPERAND1_ALPHA"/>

+			<value name="GL_OPERAND2_ALPHA"/>

+			<value name="GL_TEXTURE_ENV_COLOR"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_ENV_MODE"/>

+

+		<desc name="param">

+			<value name="GL_REPLACE"/>

+			<value name="GL_MODULATE"/>

+			<value name="GL_DECAL"/>

+			<value name="GL_BLEND"/>

+			<value name="GL_ADD"/>

+			<value name="GL_COMBINE"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_COMBINE_RGB"/>

+

+		<desc name="param">

+			<value name="GL_REPLACE"/>

+			<value name="GL_MODULATE"/>

+			<value name="GL_ADD"/>

+			<value name="GL_ADD_SIGNED"/>

+			<value name="GL_INTERPOLATE"/>

+			<value name="GL_SUBTRACT"/>

+			<value name="GL_DOT3_RGB"/>

+			<value name="GL_DOT3_RGBA"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_COMBINE_ALPHA"/>

+

+		<desc name="param">

+			<value name="GL_REPLACE"/>

+			<value name="GL_MODULATE"/>

+			<value name="GL_ADD"/>

+			<value name="GL_ADD_SIGNED"/>

+			<value name="GL_INTERPOLATE"/>

+			<value name="GL_SUBTRACT"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_RGB_SCALE"/>

+		<value name="GL_ALPHA_SCALE"/>

+

+		<desc name="param" convert="true" error="GL_INVALID_VALUE">

+			<value name="1.0"/>

+			<value name="2.0"/>

+			<value name="4.0"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SRC0_RGB"/>

+		<value name="GL_SRC1_RGB"/>

+		<value name="GL_SRC2_RGB"/>

+		<value name="GL_SRC0_ALPHA"/>

+		<value name="GL_SRC1_ALPHA"/>

+		<value name="GL_SRC2_ALPHA"/>

+

+		<desc name="param">

+			<value name="GL_TEXTURE"/>

+			<value name="GL_CONSTANT"/>

+			<value name="GL_PRIMARY_COLOR"/>

+			<value name="GL_PREVIOUS"/>

+

+			<range base="GL_TEXTURE" from="0" to="31" category="OES_texture_env_crossbar"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_OPERAND0_RGB"/>

+		<value name="GL_OPERAND1_RGB"/>

+		<value name="GL_OPERAND2_RGB"/>

+

+		<desc name="param">

+			<value name="GL_SRC_COLOR"/>

+			<value name="GL_ONE_MINUS_SRC_COLOR"/>

+			<value name="GL_SRC_ALPHA"/>

+			<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_OPERAND0_ALPHA"/>

+		<value name="GL_OPERAND1_ALPHA"/>

+		<value name="GL_OPERAND2_ALPHA"/>

+

+		<desc name="param">

+			<value name="GL_SRC_ALPHA"/>

+			<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_ENV_COLOR"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+</template>

+

+<template name="TexGen">

+	<proto>

+		<return type="void"/>

+		<param name="coord" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="coord" category="OES_texture_cube_map">

+		<value name="GL_TEXTURE_GEN_STR_OES"/>

+	</desc>

+

+	<desc name="pname" category="OES_texture_cube_map">

+		<value name="GL_TEXTURE_GEN_MODE_OES"/>

+

+		<desc name="param">

+			<value name="GL_NORMAL_MAP_OES"/>

+			<value name="GL_REFLECTION_MAP_OES"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="Clear">

+	<proto>

+		<return type="void"/>

+		<param name="mask" type="GLbitfield"/>

+	</proto>

+

+	<desc name="mask" error="GL_INVALID_VALUE">

+		<value name="0"/>

+		<value name="(GL_COLOR_BUFFER_BIT)"/>

+		<value name="(GL_DEPTH_BUFFER_BIT)"/>

+		<value name="(GL_STENCIL_BUFFER_BIT)"/>

+		<value name="(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)"/>

+		<value name="(GL_COLOR_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>

+		<value name="(GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>

+		<value name="(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT)"/>

+	</desc>

+</template>

+

+<template name="ClearColor">

+	<proto>

+		<return type="void"/>

+		<param name="red" type="GLtype"/>

+		<param name="green" type="GLtype"/>

+		<param name="blue" type="GLtype"/>

+		<param name="alpha" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="ClearStencil">

+	<proto>

+		<return type="void"/>

+		<param name="s" type="GLint"/>

+	</proto>

+</template>

+

+<template name="ClearDepth">

+	<proto>

+		<return type="void"/>

+		<param name="depth" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="StencilMask">

+	<proto>

+		<return type="void"/>

+		<param name="mask" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="StencilMaskSeparate">

+	<proto>

+		<return type="void"/>

+		<param name="face" type="GLenum"/>

+		<param name="mask" type="GLuint"/>

+	</proto>

+

+	<desc name="face">

+		<value name="GL_FRONT"/>

+		<value name="GL_BACK"/>

+		<value name="GL_FRONT_AND_BACK"/>

+	</desc>

+</template>

+

+<template name="ColorMask">

+	<proto>

+		<return type="void"/>

+		<param name="red" type="GLboolean"/>

+		<param name="green" type="GLboolean"/>

+		<param name="blue" type="GLboolean"/>

+		<param name="alpha" type="GLboolean"/>

+	</proto>

+</template>

+

+<template name="DepthMask">

+	<proto>

+		<return type="void"/>

+		<param name="flag" type="GLboolean"/>

+	</proto>

+</template>

+

+<template name="Disable">

+	<proto>

+		<return type="void"/>

+		<param name="cap" type="GLenum"/>

+	</proto>

+

+	<desc name="cap" category="GLES1.1">

+		<value name="GL_NORMALIZE"/>

+		<value name="GL_RESCALE_NORMAL"/>

+

+		<range base="GL_CLIP_PLANE" from="0" to="5"/>

+

+		<value name="GL_FOG"/>

+		<value name="GL_LIGHTING"/>

+		<value name="GL_COLOR_MATERIAL"/>

+

+		<range base="GL_LIGHT" from="0" to="7"/>

+

+		<value name="GL_POINT_SMOOTH"/>

+		<value name="GL_LINE_SMOOTH"/>

+		<value name="GL_CULL_FACE"/>

+		<value name="GL_POLYGON_OFFSET_FILL"/>

+		<value name="GL_MULTISAMPLE"/>

+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>

+		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>

+		<value name="GL_SAMPLE_COVERAGE"/>

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_SCISSOR_TEST"/>

+		<value name="GL_ALPHA_TEST"/>

+		<value name="GL_STENCIL_TEST"/>

+		<value name="GL_DEPTH_TEST"/>

+		<value name="GL_BLEND"/>

+		<value name="GL_DITHER"/>

+		<value name="GL_COLOR_LOGIC_OP"/>

+

+		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>

+		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="cap" category="GLES2.0">

+		<value name="GL_CULL_FACE"/>

+		<value name="GL_SCISSOR_TEST"/>

+		<value name="GL_POLYGON_OFFSET_FILL"/>

+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>

+		<value name="GL_SAMPLE_COVERAGE"/>

+		<value name="GL_STENCIL_TEST"/>

+		<value name="GL_DEPTH_TEST"/>

+		<value name="GL_DITHER"/>

+		<value name="GL_BLEND"/>

+	</desc>

+</template>

+

+<!-- it is exactly the same as Disable -->

+<template name="Enable">

+	<proto>

+		<return type="void"/>

+		<param name="cap" type="GLenum"/>

+	</proto>

+

+	<desc name="cap" category="GLES1.1">

+		<value name="GL_NORMALIZE"/>

+		<value name="GL_RESCALE_NORMAL"/>

+

+		<range base="GL_CLIP_PLANE" from="0" to="5"/>

+

+		<value name="GL_FOG"/>

+		<value name="GL_LIGHTING"/>

+		<value name="GL_COLOR_MATERIAL"/>

+

+		<range base="GL_LIGHT" from="0" to="7"/>

+

+		<value name="GL_POINT_SMOOTH"/>

+		<value name="GL_LINE_SMOOTH"/>

+		<value name="GL_CULL_FACE"/>

+		<value name="GL_POLYGON_OFFSET_FILL"/>

+		<value name="GL_MULTISAMPLE"/>

+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>

+		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>

+		<value name="GL_SAMPLE_COVERAGE"/>

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_SCISSOR_TEST"/>

+		<value name="GL_ALPHA_TEST"/>

+		<value name="GL_STENCIL_TEST"/>

+		<value name="GL_DEPTH_TEST"/>

+		<value name="GL_BLEND"/>

+		<value name="GL_DITHER"/>

+		<value name="GL_COLOR_LOGIC_OP"/>

+

+		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>

+		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="cap" category="GLES2.0">

+		<value name="GL_CULL_FACE"/>

+		<value name="GL_SCISSOR_TEST"/>

+		<value name="GL_POLYGON_OFFSET_FILL"/>

+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>

+		<value name="GL_SAMPLE_COVERAGE"/>

+		<value name="GL_STENCIL_TEST"/>

+		<value name="GL_DEPTH_TEST"/>

+		<value name="GL_DITHER"/>

+		<value name="GL_BLEND"/>

+	</desc>

+</template>

+

+<template name="Finish">

+	<proto>

+		<return type="void"/>

+	</proto>

+</template>

+

+<template name="Flush">

+	<proto>

+		<return type="void"/>

+	</proto>

+</template>

+

+<template name="AlphaFunc">

+	<proto>

+		<return type="void"/>

+		<param name="func" type="GLenum"/>

+		<param name="ref" type="GLtype"/>

+	</proto>

+	<desc name="func">

+		<value name="GL_NEVER"/>

+		<value name="GL_LESS"/>

+		<value name="GL_EQUAL"/>

+		<value name="GL_LEQUAL"/>

+		<value name="GL_GREATER"/>

+		<value name="GL_NOTEQUAL"/>

+		<value name="GL_GEQUAL"/>

+		<value name="GL_ALWAYS"/>

+	</desc>

+</template>

+

+<template name="BlendFunc">

+	<proto>

+		<return type="void"/>

+		<param name="sfactor" type="GLenum"/>

+		<param name="dfactor" type="GLenum"/>

+	</proto>

+

+	<desc name="sfactor">

+		<value name="GL_ZERO"/>

+		<value name="GL_ONE"/>

+		<value name="GL_SRC_COLOR"/>

+		<value name="GL_ONE_MINUS_SRC_COLOR"/>

+		<value name="GL_SRC_ALPHA"/>

+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		<value name="GL_DST_ALPHA"/>

+		<value name="GL_ONE_MINUS_DST_ALPHA"/>

+		<value name="GL_DST_COLOR"/>

+		<value name="GL_ONE_MINUS_DST_COLOR"/>

+		<value name="GL_SRC_ALPHA_SATURATE"/>

+

+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>

+	</desc>

+

+	<desc name="dfactor">

+		<value name="GL_ZERO"/>

+		<value name="GL_ONE"/>

+		<value name="GL_SRC_COLOR"/>

+		<value name="GL_ONE_MINUS_SRC_COLOR"/>

+		<value name="GL_SRC_ALPHA"/>

+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		<value name="GL_DST_ALPHA"/>

+		<value name="GL_ONE_MINUS_DST_ALPHA"/>

+		<value name="GL_DST_COLOR"/>

+		<value name="GL_ONE_MINUS_DST_COLOR"/>

+

+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="LogicOp">

+	<proto>

+		<return type="void"/>

+		<param name="opcode" type="GLenum"/>

+	</proto>

+

+	<desc name="opcode">

+		<value name="GL_CLEAR"/>

+		<value name="GL_SET"/>

+		<value name="GL_COPY"/>

+		<value name="GL_COPY_INVERTED"/>

+		<value name="GL_NOOP"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_AND"/>

+		<value name="GL_NAND"/>

+		<value name="GL_OR"/>

+		<value name="GL_NOR"/>

+		<value name="GL_XOR"/>

+		<value name="GL_EQUIV"/>

+		<value name="GL_AND_REVERSE"/>

+		<value name="GL_AND_INVERTED"/>

+		<value name="GL_OR_REVERSE"/>

+		<value name="GL_OR_INVERTED"/>

+	</desc>

+</template>

+

+<template name="StencilFunc">

+	<proto>

+		<return type="void"/>

+		<param name="func" type="GLenum"/>

+		<param name="ref" type="GLint"/>

+		<param name="mask" type="GLuint"/>

+	</proto>

+

+	<desc name="func">

+		<value name="GL_NEVER"/>

+		<value name="GL_LESS"/>

+		<value name="GL_LEQUAL"/>

+		<value name="GL_GREATER"/>

+		<value name="GL_GEQUAL"/>

+		<value name="GL_EQUAL"/>

+		<value name="GL_NOTEQUAL"/>

+		<value name="GL_ALWAYS"/>

+	</desc>

+</template>

+

+<template name="StencilFuncSeparate">

+	<proto>

+		<return type="void"/>

+		<param name="face" type="GLenum"/>

+		<param name="func" type="GLenum"/>

+		<param name="ref" type="GLint"/>

+		<param name="mask" type="GLuint"/>

+	</proto>

+

+	<desc name="face">

+		<value name="GL_FRONT"/>

+		<value name="GL_BACK"/>

+		<value name="GL_FRONT_AND_BACK"/>

+	</desc>

+

+	<desc name="func">

+		<value name="GL_NEVER"/>

+		<value name="GL_LESS"/>

+		<value name="GL_LEQUAL"/>

+		<value name="GL_GREATER"/>

+		<value name="GL_GEQUAL"/>

+		<value name="GL_EQUAL"/>

+		<value name="GL_NOTEQUAL"/>

+		<value name="GL_ALWAYS"/>

+	</desc>

+</template>

+

+<template name="StencilOp">

+	<proto>

+		<return type="void"/>

+		<param name="fail" type="GLenum"/>

+		<param name="zfail" type="GLenum"/>

+		<param name="zpass" type="GLenum"/>

+	</proto>

+

+	<desc name="fail">

+		<value name="GL_KEEP"/>

+		<value name="GL_ZERO"/>

+		<value name="GL_REPLACE"/>

+		<value name="GL_INCR"/>

+		<value name="GL_DECR"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_INCR_WRAP" category="GLES2.0"/>

+		<value name="GL_DECR_WRAP" category="GLES2.0"/>

+		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>

+		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>

+	</desc>

+

+	<desc name="zfail">

+		<value name="GL_KEEP"/>

+		<value name="GL_ZERO"/>

+		<value name="GL_REPLACE"/>

+		<value name="GL_INCR"/>

+		<value name="GL_DECR"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_INCR_WRAP" category="GLES2.0"/>

+		<value name="GL_DECR_WRAP" category="GLES2.0"/>

+		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>

+		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>

+	</desc>

+

+	<desc name="zpass">

+		<value name="GL_KEEP"/>

+		<value name="GL_ZERO"/>

+		<value name="GL_REPLACE"/>

+		<value name="GL_INCR"/>

+		<value name="GL_DECR"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_INCR_WRAP" category="GLES2.0"/>

+		<value name="GL_DECR_WRAP" category="GLES2.0"/>

+		<value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>

+		<value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>

+	</desc>

+</template>

+

+<template name="StencilOpSeparate">

+	<proto>

+		<return type="void"/>

+		<param name="face" type="GLenum"/>

+		<param name="fail" type="GLenum"/>

+		<param name="zfail" type="GLenum"/>

+		<param name="zpass" type="GLenum"/>

+	</proto>

+

+	<desc name="face">

+		<value name="GL_FRONT"/>

+		<value name="GL_BACK"/>

+		<value name="GL_FRONT_AND_BACK"/>

+	</desc>

+

+	<desc name="fail">

+		<value name="GL_KEEP"/>

+		<value name="GL_ZERO"/>

+		<value name="GL_REPLACE"/>

+		<value name="GL_INCR"/>

+		<value name="GL_DECR"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_INCR_WRAP"/>

+		<value name="GL_DECR_WRAP"/>

+	</desc>

+

+	<desc name="zfail">

+		<value name="GL_KEEP"/>

+		<value name="GL_ZERO"/>

+		<value name="GL_REPLACE"/>

+		<value name="GL_INCR"/>

+		<value name="GL_DECR"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_INCR_WRAP"/>

+		<value name="GL_DECR_WRAP"/>

+	</desc>

+

+	<desc name="zpass">

+		<value name="GL_KEEP"/>

+		<value name="GL_ZERO"/>

+		<value name="GL_REPLACE"/>

+		<value name="GL_INCR"/>

+		<value name="GL_DECR"/>

+		<value name="GL_INVERT"/>

+		<value name="GL_INCR_WRAP"/>

+		<value name="GL_DECR_WRAP"/>

+	</desc>

+</template>

+

+<template name="DepthFunc">

+	<proto>

+		<return type="void"/>

+		<param name="func" type="GLenum"/>

+	</proto>

+

+	<desc name="func">

+		<value name="GL_NEVER"/>

+		<value name="GL_LESS"/>

+		<value name="GL_EQUAL"/>

+		<value name="GL_LEQUAL"/>

+		<value name="GL_GREATER"/>

+		<value name="GL_NOTEQUAL"/>

+		<value name="GL_GEQUAL"/>

+		<value name="GL_ALWAYS"/>

+	</desc>

+</template>

+

+<template name="PixelStore">

+	<proto>

+		<return type="void"/>

+		<param name="pname" type="GLenum"/>

+		<param name="param" type="GLtype"/>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_PACK_ALIGNMENT"/>

+		<value name="GL_UNPACK_ALIGNMENT"/>

+	</desc>

+

+	<desc name="param" error="GL_INVALID_VALUE">

+		<value name="1"/>

+		<value name="2"/>

+		<value name="4"/>

+		<value name="8"/>

+	</desc>

+</template>

+

+<template name="ReadPixels" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="x" type="GLint"/>

+		<param name="y" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="format" type="GLenum"/>

+		<param name="type" type="GLenum"/>

+		<param name="pixels" type="GLvoid *"/>

+	</proto>

+

+	<!-- Technically, only two combinations are actually allowed:

+	     GL_RGBA/GL_UNSIGNED_BYTE, and some implementation-specific

+	     internal preferred combination.  I don't know what that is, so I'm

+	     allowing any valid combination for now; the underlying support

+	     should fail when necessary.-->

+	<desc name="format">

+		<value name="GL_ALPHA"/>

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGB"/>

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGBA"/>

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>

+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE"/>

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE_ALPHA"/>

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+		</desc>

+	</desc>

+

+	<desc name="format" category="EXT_read_format_bgra">

+		<value name="GL_BGRA_EXT"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT"/>

+			<value name="GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="GetClipPlane" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="plane" type="GLenum"/>

+		<vector name="equation" type="GLtype *" size="4"/>

+	</proto>

+

+	<desc name="plane">

+		<range base="GL_CLIP_PLANE" from="0" to="5"/>

+	</desc>

+</template>

+

+<template name="GetError" direction="get">

+	<proto>

+		<return type="GLenum"/>

+	</proto>

+</template>

+

+<!-- template for GetFloatv, GetIntegerv, GetBoolean, and GetFixedv -->

+<template name="GetState" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+	<!-- param checking is done in mesa -->

+</template>

+

+<template name="GetLight" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="light" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="light">

+		<range base="GL_LIGHT" from="0" to="7"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_AMBIENT"/>

+		<value name="GL_DIFFUSE"/>

+		<value name="GL_SPECULAR"/>

+		<value name="GL_POSITION"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SPOT_DIRECTION"/>

+

+		<desc name="params" vector_size="3"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SPOT_EXPONENT"/>

+		<value name="GL_SPOT_CUTOFF"/>

+		<value name="GL_CONSTANT_ATTENUATION"/>

+		<value name="GL_LINEAR_ATTENUATION"/>

+		<value name="GL_QUADRATIC_ATTENUATION"/>

+

+		<desc name="params" vector_size="1"/>

+	</desc>

+</template>

+

+<template name="GetMaterial" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="face" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="face">

+		<value name="GL_FRONT"/>

+		<value name="GL_BACK"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_SHININESS"/>

+		<desc name="params" vector_size="1"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_AMBIENT"/>

+		<value name="GL_DIFFUSE"/>

+		<value name="GL_AMBIENT_AND_DIFFUSE"/>

+		<value name="GL_SPECULAR"/>

+		<value name="GL_EMISSION"/>

+

+		<desc name="params" vector_size="4"/>

+	</desc>

+</template>

+

+<template name="GetString" direction="get">

+	<proto>

+		<return type="const GLubyte *"/>

+		<param name="name" type="GLenum"/>

+	</proto>

+

+	<desc name="name">

+		<value name="GL_VENDOR"/>

+		<value name="GL_RENDERER"/>

+		<value name="GL_VERSION"/>

+		<value name="GL_EXTENSIONS"/>

+		<value name="GL_SHADING_LANGUAGE_VERSION" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="GetTexEnv" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="target" category="OES_point_sprite">

+		<value name="GL_POINT_SPRITE_OES"/>

+		<desc name="pname">

+			<value name="GL_COORD_REPLACE_OES"/>

+		</desc>

+	</desc>

+

+	<desc name="pname" category="OES_point_sprite">

+		<value name="GL_COORD_REPLACE_OES"/>

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+

+	<desc name="target" category="EXT_texture_lod_bias">

+		<value name="GL_TEXTURE_FILTER_CONTROL_EXT"/>

+

+		<desc name="pname">

+			<value name="GL_TEXTURE_LOD_BIAS_EXT"/>

+		</desc>

+	</desc>

+

+	<desc name="pname" category="EXT_texture_lod_bias">

+		<value name="GL_TEXTURE_LOD_BIAS_EXT"/>

+		<desc name="params" vector_size="1"/>

+	</desc>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_ENV"/>

+

+		<desc name="pname">

+			<value name="GL_TEXTURE_ENV_COLOR"/>

+			<value name="GL_RGB_SCALE"/>

+			<value name="GL_ALPHA_SCALE"/>

+			<value name="GL_TEXTURE_ENV_MODE"/>

+			<value name="GL_COMBINE_RGB"/>

+			<value name="GL_COMBINE_ALPHA"/>

+			<value name="GL_SRC0_RGB"/>

+			<value name="GL_SRC1_RGB"/>

+			<value name="GL_SRC2_RGB"/>

+			<value name="GL_SRC0_ALPHA"/>

+			<value name="GL_SRC1_ALPHA"/>

+			<value name="GL_SRC2_ALPHA"/>

+			<value name="GL_OPERAND0_RGB"/>

+			<value name="GL_OPERAND1_RGB"/>

+			<value name="GL_OPERAND2_RGB"/>

+			<value name="GL_OPERAND0_ALPHA"/>

+			<value name="GL_OPERAND1_ALPHA"/>

+			<value name="GL_OPERAND2_ALPHA"/>

+		</desc>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_ENV_COLOR"/>

+		<desc name="params" vector_size="4"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_RGB_SCALE"/>

+		<value name="GL_ALPHA_SCALE"/>

+

+		<desc name="params" vector_size="1"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_ENV_MODE"/>

+		<value name="GL_COMBINE_RGB"/>

+		<value name="GL_COMBINE_ALPHA"/>

+		<value name="GL_SRC0_RGB"/>

+		<value name="GL_SRC1_RGB"/>

+		<value name="GL_SRC2_RGB"/>

+		<value name="GL_SRC0_ALPHA"/>

+		<value name="GL_SRC1_ALPHA"/>

+		<value name="GL_SRC2_ALPHA"/>

+		<value name="GL_OPERAND0_RGB"/>

+		<value name="GL_OPERAND1_RGB"/>

+		<value name="GL_OPERAND2_RGB"/>

+		<value name="GL_OPERAND0_ALPHA"/>

+		<value name="GL_OPERAND1_ALPHA"/>

+		<value name="GL_OPERAND2_ALPHA"/>

+

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+</template>

+

+<template name="GetTexGen" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="coord" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="coord">

+		<value name="GL_TEXTURE_GEN_STR_OES"/>

+	</desc>

+	<desc name="pname">

+		<value name="GL_TEXTURE_GEN_MODE_OES"/>

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+</template>

+

+<template name="GetTexParameter" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_TEXTURE_WRAP_S"/>

+		<value name="GL_TEXTURE_WRAP_T"/>

+		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>

+		<value name="GL_TEXTURE_MIN_FILTER"/>

+		<value name="GL_TEXTURE_MAG_FILTER"/>

+		<value name="GL_GENERATE_MIPMAP" category="GLES1.1"/>

+

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+

+	<desc name="pname" category="OES_draw_texture">

+		<value name="GL_TEXTURE_CROP_RECT_OES"/>

+		<desc name="params" vector_size="4"/>

+	</desc>

+</template>

+

+<template name="IsEnabled" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="cap" type="GLenum"/>

+	</proto>

+

+	<desc name="cap" category="GLES1.1">

+		<value name="GL_NORMALIZE"/>

+		<value name="GL_RESCALE_NORMAL"/>

+

+		<range base="GL_CLIP_PLANE" from="0" to="5"/>

+

+		<value name="GL_FOG"/>

+		<value name="GL_LIGHTING"/>

+		<value name="GL_COLOR_MATERIAL"/>

+

+		<range base="GL_LIGHT" from="0" to="7"/>

+

+		<value name="GL_POINT_SMOOTH"/>

+		<value name="GL_LINE_SMOOTH"/>

+		<value name="GL_CULL_FACE"/>

+		<value name="GL_POLYGON_OFFSET_FILL"/>

+		<value name="GL_MULTISAMPLE"/>

+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>

+		<value name="GL_SAMPLE_ALPHA_TO_ONE"/>

+		<value name="GL_SAMPLE_COVERAGE"/>

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_SCISSOR_TEST"/>

+		<value name="GL_ALPHA_TEST"/>

+		<value name="GL_STENCIL_TEST"/>

+		<value name="GL_DEPTH_TEST"/>

+		<value name="GL_BLEND"/>

+		<value name="GL_DITHER"/>

+		<value name="GL_COLOR_LOGIC_OP"/>

+

+		<value name="GL_POINT_SPRITE_OES" category="OES_point_sprite"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/>

+

+		<value name="GL_VERTEX_ARRAY"/>

+		<value name="GL_NORMAL_ARRAY"/>

+		<value name="GL_COLOR_ARRAY"/>

+		<value name="GL_TEXTURE_COORD_ARRAY"/>

+		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>

+		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>

+		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>

+	</desc>

+

+	<desc name="cap" category="GLES2.0">

+		<value name="GL_CULL_FACE"/>

+		<value name="GL_SCISSOR_TEST"/>

+		<value name="GL_POLYGON_OFFSET_FILL"/>

+		<value name="GL_SAMPLE_ALPHA_TO_COVERAGE"/>

+		<value name="GL_SAMPLE_COVERAGE"/>

+		<value name="GL_STENCIL_TEST"/>

+		<value name="GL_DEPTH_TEST"/>

+		<value name="GL_DITHER"/>

+		<value name="GL_BLEND"/>

+	</desc>

+</template>

+

+<template name="DepthRange">

+	<proto>

+		<return type="void"/>

+		<param name="zNear" type="GLtype"/>

+		<param name="zFar" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="Frustum">

+	<proto>

+		<return type="void"/>

+		<param name="left" type="GLtype"/>

+		<param name="right" type="GLtype"/>

+		<param name="bottom" type="GLtype"/>

+		<param name="top" type="GLtype"/>

+		<param name="zNear" type="GLtype"/>

+		<param name="zFar" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="LoadIdentity">

+	<proto>

+		<return type="void"/>

+	</proto>

+</template>

+

+<template name="LoadMatrix">

+	<proto>

+		<return type="void"/>

+		<vector name="m" type="const GLtype *" size="16"/>

+	</proto>

+</template>

+

+<template name="MatrixMode">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_MODELVIEW"/>

+		<value name="GL_PROJECTION"/>

+		<value name="GL_TEXTURE"/>

+		<value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/>

+	</desc>

+</template>

+

+<template name="MultMatrix">

+	<proto>

+		<return type="void"/>

+		<vector name="m" type="const GLtype *" size="16"/>

+	</proto>

+</template>

+

+<template name="Ortho">

+	<proto>

+		<return type="void"/>

+		<param name="left" type="GLtype"/>

+		<param name="right" type="GLtype"/>

+		<param name="bottom" type="GLtype"/>

+		<param name="top" type="GLtype"/>

+		<param name="zNear" type="GLtype"/>

+		<param name="zFar" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="PopMatrix">

+	<proto>

+		<return type="void"/>

+	</proto>

+</template>

+

+<template name="PushMatrix">

+	<proto>

+		<return type="void"/>

+	</proto>

+</template>

+

+<template name="Rotate">

+	<proto>

+		<return type="void"/>

+		<param name="angle" type="GLtype"/>

+		<param name="x" type="GLtype"/>

+		<param name="y" type="GLtype"/>

+		<param name="z" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="Scale">

+	<proto>

+		<return type="void"/>

+		<param name="x" type="GLtype"/>

+		<param name="y" type="GLtype"/>

+		<param name="z" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="Translate">

+	<proto>

+		<return type="void"/>

+		<param name="x" type="GLtype"/>

+		<param name="y" type="GLtype"/>

+		<param name="z" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="Viewport">

+	<proto>

+		<return type="void"/>

+		<param name="x" type="GLint"/>

+		<param name="y" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+	</proto>

+</template>

+

+<template name="ColorPointer">

+	<proto>

+		<return type="void"/>

+		<param name="size" type="GLint"/>

+		<param name="type" type="GLenum"/>

+		<param name="stride" type="GLsizei"/>

+		<param name="pointer" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="size" error="GL_INVALID_VALUE">

+		<value name="4"/>

+	</desc>

+

+	<desc name="type">

+		<value name="GL_UNSIGNED_BYTE"/>

+		<value name="GL_FLOAT"/>

+		<value name="GL_FIXED"/>

+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>

+	</desc>

+</template>

+

+<template name="DisableClientState">

+	<proto>

+		<return type="void"/>

+		<param name="array" type="GLenum"/>

+	</proto>

+

+	<desc name="array">

+		<value name="GL_VERTEX_ARRAY"/>

+		<value name="GL_NORMAL_ARRAY"/>

+		<value name="GL_COLOR_ARRAY"/>

+		<value name="GL_TEXTURE_COORD_ARRAY"/>

+		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>

+		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>

+		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>

+	</desc>

+</template>

+

+<template name="DrawArrays">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+		<param name="first" type="GLint"/>

+		<param name="count" type="GLsizei"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_POINTS"/>

+		<value name="GL_LINES"/>

+		<value name="GL_LINE_LOOP"/>

+		<value name="GL_LINE_STRIP"/>

+		<value name="GL_TRIANGLES"/>

+		<value name="GL_TRIANGLE_STRIP"/>

+		<value name="GL_TRIANGLE_FAN"/>

+	</desc>

+</template>

+

+<template name="DrawElements">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+		<param name="count" type="GLsizei"/>

+		<param name="type" type="GLenum"/>

+		<param name="indices" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_POINTS"/>

+		<value name="GL_LINES"/>

+		<value name="GL_LINE_LOOP"/>

+		<value name="GL_LINE_STRIP"/>

+		<value name="GL_TRIANGLES"/>

+		<value name="GL_TRIANGLE_STRIP"/>

+		<value name="GL_TRIANGLE_FAN"/>

+	</desc>

+

+	<desc name="type">

+		<value name="GL_UNSIGNED_BYTE"/>

+		<value name="GL_UNSIGNED_SHORT"/>

+		<value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>

+	</desc>

+</template>

+

+<template name="EnableClientState">

+	<proto>

+		<return type="void"/>

+		<param name="array" type="GLenum"/>

+	</proto>

+

+	<desc name="array">

+		<value name="GL_VERTEX_ARRAY"/>

+		<value name="GL_NORMAL_ARRAY"/>

+		<value name="GL_COLOR_ARRAY"/>

+		<value name="GL_TEXTURE_COORD_ARRAY"/>

+		<value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/>

+		<value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/>

+		<value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/>

+	</desc>

+</template>

+

+<template name="GetPointer" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLvoid **" size="dynamic"/>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_VERTEX_ARRAY_POINTER"/>

+		<value name="GL_NORMAL_ARRAY_POINTER"/>

+		<value name="GL_COLOR_ARRAY_POINTER"/>

+		<value name="GL_TEXTURE_COORD_ARRAY_POINTER"/>

+		<value name="GL_MATRIX_INDEX_ARRAY_POINTER_OES" category="OES_matrix_palette"/>

+		<value name="GL_WEIGHT_ARRAY_POINTER_OES" category="OES_matrix_palette"/>

+		<value name="GL_POINT_SIZE_ARRAY_POINTER_OES" category="OES_point_size_array"/>

+	</desc>

+</template>

+

+<template name="Normal">

+	<proto>

+		<return type="void"/>

+		<vector name="v" type="const GLtype *" size="3">

+			<param name="nx" type="GLtype"/>

+			<param name="ny" type="GLtype"/>

+			<param name="nz" type="GLtype"/>

+		</vector>

+	</proto>

+</template>

+

+<template name="NormalPointer">

+	<proto>

+		<return type="void"/>

+		<param name="type" type="GLenum"/>

+		<param name="stride" type="GLsizei"/>

+		<param name="pointer" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="type">

+		<value name="GL_BYTE"/>

+		<value name="GL_SHORT"/>

+		<value name="GL_FLOAT"/>

+		<value name="GL_FIXED"/>

+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>

+	</desc>

+</template>

+

+<template name="TexCoordPointer">

+	<proto>

+		<return type="void"/>

+		<param name="size" type="GLint"/>

+		<param name="type" type="GLenum"/>

+		<param name="stride" type="GLsizei"/>

+		<param name="pointer" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="size" error="GL_INVALID_VALUE">

+		<value name="2"/>

+		<value name="3"/>

+		<value name="4"/>

+	</desc>

+

+	<desc name="type">

+		<value name="GL_BYTE"/>

+		<value name="GL_SHORT"/>

+		<value name="GL_FLOAT"/>

+		<value name="GL_FIXED"/>

+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>

+	</desc>

+</template>

+

+<template name="VertexPointer">

+	<proto>

+		<return type="void"/>

+		<param name="size" type="GLint"/>

+		<param name="type" type="GLenum"/>

+		<param name="stride" type="GLsizei"/>

+		<param name="pointer" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="size" error="GL_INVALID_VALUE">

+		<value name="2"/>

+		<value name="3"/>

+		<value name="4"/>

+	</desc>

+

+	<desc name="type">

+		<value name="GL_BYTE"/>

+		<value name="GL_SHORT"/>

+		<value name="GL_FLOAT"/>

+		<value name="GL_FIXED"/>

+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>

+	</desc>

+</template>

+

+<template name="PolygonOffset">

+	<proto>

+		<return type="void"/>

+		<param name="factor" type="GLtype"/>

+		<param name="units" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="CopyTexImage2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="internalFormat" type="GLenum"/>

+		<param name="x" type="GLint"/>

+		<param name="y" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="border" type="GLint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="internalFormat" error="GL_INVALID_VALUE">

+		<value name="GL_ALPHA"/>

+		<value name="GL_RGB"/>

+		<value name="GL_RGBA"/>

+		<value name="GL_LUMINANCE"/>

+		<value name="GL_LUMINANCE_ALPHA"/>

+	</desc>

+

+	<desc name="border" error="GL_INVALID_VALUE">

+		<value name="0"/>

+	</desc>

+</template>

+

+<template name="CopyTexSubImage2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="xoffset" type="GLint"/>

+		<param name="yoffset" type="GLint"/>

+		<param name="x" type="GLint"/>

+		<param name="y" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+</template>

+

+<template name="TexSubImage2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="xoffset" type="GLint"/>

+		<param name="yoffset" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="format" type="GLenum"/>

+		<param name="type" type="GLenum"/>

+		<param name="pixels" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGB"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGBA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>

+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format" category="OES_depth_texture">

+		<value name="GL_DEPTH_COMPONENT"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_SHORT"/>

+			<value name="GL_UNSIGNED_INT"/>

+		</desc>

+	</desc>

+

+	<desc name="format" category="OES_packed_depth_stencil">

+		<value name="GL_DEPTH_STENCIL_OES"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_INT_24_8_OES"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="BindTexture">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="texture" type="GLuint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>

+	</desc>

+</template>

+

+<template name="DeleteTextures">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="textures" type="const GLuint *"/>

+	</proto>

+</template>

+

+<template name="GenTextures" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="textures" type="GLuint *"/>

+	</proto>

+</template>

+

+<template name="IsTexture" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="texture" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="BlendColor">

+	<proto>

+		<return type="void"/>

+		<param name="red" type="GLtype"/>

+		<param name="green" type="GLtype"/>

+		<param name="blue" type="GLtype"/>

+		<param name="alpha" type="GLtype"/>

+	</proto>

+</template>

+

+<template name="BlendEquation">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_FUNC_ADD" category="GLES2.0"/>

+		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>

+		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>

+		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>

+		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>

+		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>

+

+		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>

+		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>

+	</desc>

+</template>

+

+<template name="BlendEquationSeparate">

+	<proto>

+		<return type="void"/>

+		<param name="modeRGB" type="GLenum"/>

+		<param name="modeAlpha" type="GLenum"/>

+	</proto>

+

+	<desc name="modeRGB">

+		<value name="GL_FUNC_ADD" category="GLES2.0"/>

+		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>

+		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>

+		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>

+		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>

+		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>

+

+		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>

+		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>

+	</desc>

+

+	<desc name="modeAlpha">

+		<value name="GL_FUNC_ADD" category="GLES2.0"/>

+		<value name="GL_FUNC_SUBTRACT" category="GLES2.0"/>

+		<value name="GL_FUNC_REVERSE_SUBTRACT" category="GLES2.0"/>

+		<value name="GL_FUNC_ADD_OES" category="OES_blend_subtract"/>

+		<value name="GL_FUNC_SUBTRACT_OES" category="OES_blend_subtract"/>

+		<value name="GL_FUNC_REVERSE_SUBTRACT_OES" category="OES_blend_subtract"/>

+

+		<value name="GL_MIN_EXT" category="EXT_blend_minmax"/>

+		<value name="GL_MAX_EXT" category="EXT_blend_minmax"/>

+	</desc>

+</template>

+

+<template name="TexImage3D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="internalFormat" type="GLenum"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="depth" type="GLsizei"/>

+		<param name="border" type="GLint"/>

+		<param name="format" type="GLenum"/>

+		<param name="type" type="GLenum"/>

+		<param name="pixels" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_3D_OES"/>

+	</desc>

+

+	<desc name="internalFormat">

+		<value name="GL_ALPHA"/>

+		<value name="GL_RGB"/>

+		<value name="GL_RGBA"/>

+		<value name="GL_LUMINANCE"/>

+		<value name="GL_LUMINANCE_ALPHA"/>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGB"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGBA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>

+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="TexSubImage3D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="xoffset" type="GLint"/>

+		<param name="yoffset" type="GLint"/>

+		<param name="zoffset" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="depth" type="GLsizei"/>

+		<param name="format" type="GLenum"/>

+		<param name="type" type="GLenum"/>

+		<param name="pixels" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_3D_OES"/>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGB"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_5_6_5"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_RGBA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>

+			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_LUMINANCE_ALPHA"/>

+

+		<desc name="type" error="GL_INVALID_OPERATION">

+			<value name="GL_UNSIGNED_BYTE"/>

+			<value name="GL_FLOAT" category="OES_texture_float"/>

+			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="CopyTexSubImage3D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="xoffset" type="GLint"/>

+		<param name="yoffset" type="GLint"/>

+		<param name="zoffset" type="GLint"/>

+		<param name="x" type="GLint"/>

+		<param name="y" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_3D_OES"/>

+	</desc>

+</template>

+

+<template name="MultiTexCoord">

+	<proto>

+		<return type="void"/>

+		<param name="texture" type="GLenum"/>

+		<vector name="v" type="const GLtype *" size="dynamic">

+			<param name="s" type="GLtype"/>

+			<param name="t" type="GLtype"/>

+			<param name="r" type="GLtype"/>

+			<param name="q" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="texture">

+		<range base="GL_TEXTURE" from="0" to="31"/>

+	</desc>

+</template>

+

+<template name="CompressedTexImage3D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="internalFormat" type="GLenum"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="depth" type="GLsizei"/>

+		<param name="border" type="GLint"/>

+		<param name="imagesize" type="GLsizei"/>

+		<param name="data" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_3D_OES"/>

+	</desc>

+

+	<desc name="internalFormat">

+		<value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>

+		<value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>

+		<value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>

+		<value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>

+		<value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>

+	</desc>

+</template>

+

+<template name="CompressedTexSubImage3D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="xoffset" type="GLint"/>

+		<param name="yoffset" type="GLint"/>

+		<param name="zoffset" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="depth" type="GLsizei"/>

+		<param name="format" type="GLenum"/>

+		<param name="imagesize" type="GLsizei"/>

+		<param name="data" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_3D_OES"/>

+	</desc>

+</template>

+

+<template name="ActiveTexture">

+	<proto>

+		<return type="void"/>

+		<param name="texture" type="GLenum"/>

+	</proto>

+

+	<desc name="texture">

+		<range base="GL_TEXTURE" from="0" to="31"/>

+	</desc>

+</template>

+

+<template name="ClientActiveTexture">

+	<proto>

+		<return type="void"/>

+		<param name="texture" type="GLenum"/>

+	</proto>

+

+	<desc name="texture">

+		<range base="GL_TEXTURE" from="0" to="31"/>

+	</desc>

+</template>

+

+<template name="SampleCoverage">

+	<proto>

+		<return type="void"/>

+		<param name="value" type="GLtype"/>

+		<param name="invert" type="GLboolean"/>

+	</proto>

+</template>

+

+<template name="CompressedTexImage2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="internalFormat" type="GLenum"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="border" type="GLint"/>

+		<param name="imageSize" type="GLsizei"/>

+		<param name="data" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="internalFormat">

+		<value name="GL_ETC1_RGB8_OES" category="OES_compressed_ETC1_RGB8_texture"/>

+

+		<value name="GL_PALETTE4_RGB8_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE4_RGBA8_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE4_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE4_RGBA4_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE4_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE8_RGB8_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE8_RGBA8_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE8_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE8_RGBA4_OES" category="OES_compressed_paletted_texture"/>

+		<value name="GL_PALETTE8_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>

+

+		<value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>

+		<value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>

+

+		<value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>

+		<value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>

+		<value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>

+

+		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>

+		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>

+	</desc>

+

+	<desc name="border" error="GL_INVALID_VALUE">

+		<value name="0"/>

+	</desc>

+</template>

+

+<template name="CompressedTexSubImage2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="level" type="GLint"/>

+		<param name="xoffset" type="GLint"/>

+		<param name="yoffset" type="GLint"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+		<param name="format" type="GLenum"/>

+		<param name="imageSize" type="GLsizei"/>

+		<param name="data" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+

+	<desc name="format">

+		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>

+		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>

+	</desc>

+</template>

+

+<template name="BlendFuncSeparate">

+	<proto>

+		<return type="void"/>

+		<param name="srcRGB" type="GLenum"/>

+		<param name="dstRGB" type="GLenum"/>

+		<param name="srcAlpha" type="GLenum"/>

+		<param name="dstAlpha" type="GLenum"/>

+	</proto>

+

+	<desc name="srcRGB">

+		<value name="GL_ZERO"/>

+		<value name="GL_ONE"/>

+		<value name="GL_SRC_COLOR"/>

+		<value name="GL_ONE_MINUS_SRC_COLOR"/>

+		<value name="GL_SRC_ALPHA"/>

+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		<value name="GL_DST_ALPHA"/>

+		<value name="GL_ONE_MINUS_DST_ALPHA"/>

+		<value name="GL_DST_COLOR"/>

+		<value name="GL_ONE_MINUS_DST_COLOR"/>

+		<value name="GL_SRC_ALPHA_SATURATE"/>

+

+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>

+	</desc>

+

+	<desc name="dstRGB">

+		<value name="GL_ZERO"/>

+		<value name="GL_ONE"/>

+		<value name="GL_SRC_COLOR"/>

+		<value name="GL_ONE_MINUS_SRC_COLOR"/>

+		<value name="GL_SRC_ALPHA"/>

+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		<value name="GL_DST_ALPHA"/>

+		<value name="GL_ONE_MINUS_DST_ALPHA"/>

+		<value name="GL_DST_COLOR"/>

+		<value name="GL_ONE_MINUS_DST_COLOR"/>

+

+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>

+	</desc>

+

+	<desc name="srcAlpha">

+		<value name="GL_ZERO"/>

+		<value name="GL_ONE"/>

+		<value name="GL_SRC_COLOR"/>

+		<value name="GL_ONE_MINUS_SRC_COLOR"/>

+		<value name="GL_SRC_ALPHA"/>

+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		<value name="GL_DST_ALPHA"/>

+		<value name="GL_ONE_MINUS_DST_ALPHA"/>

+		<value name="GL_DST_COLOR"/>

+		<value name="GL_ONE_MINUS_DST_COLOR"/>

+		<value name="GL_SRC_ALPHA_SATURATE"/>

+

+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>

+	</desc>

+

+	<desc name="dstAlpha">

+		<value name="GL_ZERO"/>

+		<value name="GL_ONE"/>

+		<value name="GL_SRC_COLOR"/>

+		<value name="GL_ONE_MINUS_SRC_COLOR"/>

+		<value name="GL_SRC_ALPHA"/>

+		<value name="GL_ONE_MINUS_SRC_ALPHA"/>

+		<value name="GL_DST_ALPHA"/>

+		<value name="GL_ONE_MINUS_DST_ALPHA"/>

+		<value name="GL_DST_COLOR"/>

+		<value name="GL_ONE_MINUS_DST_COLOR"/>

+

+		<value name="GL_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_COLOR" category="GLES2.0"/>

+		<value name="GL_CONSTANT_ALPHA" category="GLES2.0"/>

+		<value name="GL_ONE_MINUS_CONSTANT_ALPHA" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="PointParameter">

+	<proto>

+		<return type="void"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="const GLtype *" size="dynamic">

+			<param name="param" type="GLtype"/>

+		</vector>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_POINT_SIZE_MIN"/>

+		<value name="GL_POINT_SIZE_MAX"/>

+		<value name="GL_POINT_FADE_THRESHOLD_SIZE"/>

+

+		<desc name="params" vector_size="1"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_POINT_DISTANCE_ATTENUATION"/>

+		<desc name="params" vector_size="3"/>

+	</desc>

+</template>

+

+<template name="VertexAttrib">

+	<proto>

+		<return type="void"/>

+		<param name="index" type="GLuint"/>

+		<vector name="v" type="const GLtype *" size="dynamic">

+			<param name="x" type="GLtype"/>

+			<param name="y" type="GLtype"/>

+			<param name="z" type="GLtype"/>

+			<param name="w" type="GLtype"/>

+		</vector>

+	</proto>

+</template>

+

+<template name="VertexAttribPointer">

+	<proto>

+		<return type="void"/>

+		<param name="index" type="GLuint"/>

+		<param name="size" type="GLint"/>

+		<param name="type" type="GLenum"/>

+		<param name="normalized" type="GLboolean"/>

+		<param name="stride" type="GLsizei"/>

+		<param name="pointer" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="size" error="GL_INVALID_VALUE">

+		<value name="1"/>

+		<value name="2"/>

+		<value name="3"/>

+		<value name="4"/>

+	</desc>

+

+	<desc name="type" error="GL_INVALID_VALUE">

+		<value name="GL_BYTE"/>

+		<value name="GL_UNSIGNED_BYTE"/>

+		<value name="GL_SHORT"/>

+		<value name="GL_UNSIGNED_SHORT"/>

+		<value name="GL_FLOAT"/>

+		<value name="GL_FIXED"/>

+		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>

+		<value name="GL_UNSIGNED_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>

+		<value name="GL_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>

+	</desc>

+

+	<desc name="type" category="OES_vertex_type_10_10_10_2">

+		<value name="GL_UNSIGNED_INT_10_10_10_2_OES"/>

+		<value name="GL_INT_10_10_10_2_OES"/>

+

+		<desc name="size">

+			<value name="3"/>

+			<value name="4"/>

+		</desc>

+	</desc>

+</template>

+

+<template name="EnableVertexAttribArray">

+	<proto>

+		<return type="void"/>

+		<param name="index" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="DisableVertexAttribArray">

+	<proto>

+		<return type="void"/>

+		<param name="index" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="IsProgram" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="program" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="GetProgram" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_DELETE_STATUS"/>

+		<value name="GL_LINK_STATUS"/>

+		<value name="GL_VALIDATE_STATUS"/>

+		<value name="GL_INFO_LOG_LENGTH"/>

+		<value name="GL_ATTACHED_SHADERS"/>

+		<value name="GL_ACTIVE_ATTRIBUTES"/>

+		<value name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>

+		<value name="GL_ACTIVE_UNIFORMS"/>

+		<value name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>

+		<value name="GL_PROGRAM_BINARY_LENGTH_OES" category="OES_get_program_binary"/>

+

+		<desc name="params" convert="false"/>

+	</desc>

+</template>

+

+<template name="GetVertexAttrib" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="index" type="GLuint"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_VERTEX_ATTRIB_ARRAY_ENABLED"/>

+		<value name="GL_VERTEX_ATTRIB_ARRAY_SIZE"/>

+		<value name="GL_VERTEX_ATTRIB_ARRAY_STRIDE"/>

+		<value name="GL_VERTEX_ATTRIB_ARRAY_TYPE"/>

+		<value name="GL_VERTEX_ATTRIB_ARRAY_NORMALIZED"/>

+		<value name="GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING"/>

+

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_CURRENT_VERTEX_ATTRIB"/>

+		<desc name="params" vector_size="16?" convert="false"/>

+	</desc>

+</template>

+

+<template name="GetVertexAttribPointer" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="index" type="GLuint"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="pointer" type="GLvoid **" size="dynamic"/>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>

+	</desc>

+</template>

+

+<template name="GetBufferPointer" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLvoid **" size="dynamic"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_BUFFER_MAP_POINTER_OES"/>

+	</desc>

+</template>

+

+<template name="MapBuffer" direction="get">

+	<proto>

+		<return type="void *"/>

+		<param name="target" type="GLenum"/>

+		<param name="access" type="GLenum"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+

+	<desc name="access">

+		<value name="GL_WRITE_ONLY_OES"/>

+	</desc>

+</template>

+

+<template name="UnmapBuffer" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="target" type="GLenum"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+</template>

+

+<template name="BindBuffer">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="buffer" type="GLuint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+</template>

+

+<template name="BufferData">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="size" type="GLsizeiptr"/>

+		<param name="data" type="const GLvoid *"/>

+		<param name="usage" type="GLenum"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+

+	<desc name="usage">

+		<value name="GL_STATIC_DRAW"/>

+		<value name="GL_DYNAMIC_DRAW"/>

+		<value name="GL_STREAM_DRAW" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="BufferSubData">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="offset" type="GLintptr"/>

+		<param name="size" type="GLsizeiptr"/>

+		<param name="data" type="const GLvoid *"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+</template>

+

+<template name="DeleteBuffers">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="buffer" type="const GLuint *"/>

+	</proto>

+</template>

+

+<template name="GenBuffers" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="buffer" type="GLuint *"/>

+	</proto>

+</template>

+

+<template name="GetBufferParameter" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_ARRAY_BUFFER"/>

+		<value name="GL_ELEMENT_ARRAY_BUFFER"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_BUFFER_SIZE"/>

+		<value name="GL_BUFFER_USAGE"/>

+		<value name="GL_BUFFER_ACCESS_OES" category="OES_mapbuffer"/>

+		<value name="GL_BUFFER_MAPPED_OES" category="OES_mapbuffer"/>

+	</desc>

+</template>

+

+<template name="IsBuffer" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="buffer" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="CreateShader">

+	<proto>

+		<return type="GLuint"/>

+		<param name="type" type="GLenum"/>

+	</proto>

+

+	<desc name="type">

+		<value name="GL_VERTEX_SHADER"/>

+		<value name="GL_FRAGMENT_SHADER"/>

+	</desc>

+</template>

+

+<template name="ShaderSource">

+	<proto>

+		<return type="void"/>

+		<param name="shader" type="GLuint"/>

+		<param name="count" type="GLsizei"/>

+		<param name="string" type="const GLchar **"/>

+		<param name="length" type="const int *"/>

+	</proto>

+</template>

+

+<template name="CompileShader">

+	<proto>

+		<return type="void"/>

+		<param name="shader" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="ReleaseShaderCompiler">

+	<proto>

+		<return type="void"/>

+	</proto>

+</template>

+

+<template name="DeleteShader">

+	<proto>

+		<return type="void"/>

+		<param name="shader" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="ShaderBinary">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="shaders" type="const GLuint *"/>

+		<param name="binaryformat" type="GLenum"/>

+		<param name="binary" type="const GLvoid *"/>

+		<param name="length" type="GLsizei"/>

+	</proto>

+</template>

+

+<template name="CreateProgram">

+	<proto>

+		<return type="GLuint"/>

+	</proto>

+</template>

+

+<template name="AttachShader">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="shader" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="DetachShader">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="shader" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="LinkProgram">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="UseProgram">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="DeleteProgram">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="GetActiveAttrib" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="index" type="GLuint"/>

+		<param name="bufSize" type="GLsizei"/>

+		<param name="length" type="GLsizei *"/>

+		<param name="size" type="GLint *"/>

+		<param name="type" type="GLenum *"/>

+		<param name="name" type="GLchar *"/>

+	</proto>

+</template>

+

+<template name="GetAttribLocation" direction="get">

+	<proto>

+		<return type="GLint"/>

+		<param name="program" type="GLuint"/>

+		<param name="name" type="const char *"/>

+	</proto>

+</template>

+

+<template name="BindAttribLocation">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="index" type="GLuint"/>

+		<param name="name" type="const char *"/>

+	</proto>

+</template>

+

+<template name="GetUniformLocation" direction="get">

+	<proto>

+		<return type="GLint"/>

+		<param name="program" type="GLuint"/>

+		<param name="name" type="const char *"/>

+	</proto>

+</template>

+

+<template name="GetActiveUniform" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="index" type="GLuint"/>

+		<param name="bufSize" type="GLsizei"/>

+		<param name="length" type="GLsizei *"/>

+		<param name="size" type="GLint *"/>

+		<param name="type" type="GLenum *"/>

+		<param name="name" type="GLchar *"/>

+	</proto>

+</template>

+

+<template name="Uniform">

+	<proto>

+		<return type="void"/>

+		<param name="location" type="GLint"/>

+		<param name="count" type="GLsizei" hide_if_expanded="true"/>

+		<vector name="values" type="const GLtype *" size="dynamic">

+			<param name="v0" type="GLtype"/>

+			<param name="v1" type="GLtype"/>

+			<param name="v2" type="GLtype"/>

+			<param name="v3" type="GLtype"/>

+		</vector>

+	</proto>

+</template>

+

+<template name="UniformMatrix">

+	<proto>

+		<return type="void"/>

+		<param name="location" type="GLint"/>

+		<param name="count" type="GLsizei"/>

+		<param name="transpose" type="GLboolean"/>

+		<vector name="value" type="const GLtype *" size="dynamic"/>

+	</proto>

+</template>

+

+<template name="ValidateProgram">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="GenerateMipmap">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>

+	</desc>

+</template>

+

+<template name="BindFramebuffer">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="framebuffer" type="GLuint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="DeleteFramebuffers">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="framebuffers" type="const GLuint *"/>

+	</proto>

+</template>

+

+<template name="GenFramebuffers">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="ids" type="GLuint *"/>

+	</proto>

+</template>

+

+<template name="BindRenderbuffer">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="renderbuffer" type="GLuint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="DeleteRenderbuffers">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="renderbuffers" type="const GLuint *"/>

+	</proto>

+</template>

+

+<template name="GenRenderbuffers">

+	<proto>

+		<return type="void"/>

+		<param name="n" type="GLsizei"/>

+		<param name="renderbuffers" type="GLuint *"/>

+	</proto>

+</template>

+

+<template name="RenderbufferStorage">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="internalFormat" type="GLenum"/>

+		<param name="width" type="GLsizei"/>

+		<param name="height" type="GLsizei"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>

+	</desc>

+

+	<desc name="internalFormat">

+		<value name="GL_DEPTH_COMPONENT16_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RGBA4_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RGB5_A1_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RGB565_OES" category="OES_framebuffer_object"/>

+		<value name="GL_STENCIL_INDEX8_OES" category="OES_stencil8"/>

+

+		<value name="GL_DEPTH_COMPONENT16" category="GLES2.0"/>

+		<value name="GL_RGBA4" category="GLES2.0"/>

+		<value name="GL_RGB5_A1" category="GLES2.0"/>

+		<value name="GL_RGB565" category="GLES2.0"/>

+		<value name="GL_STENCIL_INDEX8" category="GLES2.0"/>

+

+		<value name="GL_DEPTH_COMPONENT24_OES" category="OES_depth24"/>

+		<value name="GL_DEPTH_COMPONENT32_OES" category="OES_depth32"/>

+		<value name="GL_RGB8_OES" category="OES_rgb8_rgba8"/>

+		<value name="GL_RGBA8_OES" category="OES_rgb8_rgba8"/>

+		<value name="GL_STENCIL_INDEX1_OES" category="OES_stencil1"/>

+		<value name="GL_STENCIL_INDEX4_OES" category="OES_stencil4"/>

+		<value name="GL_DEPTH24_STENCIL8_OES" category="OES_packed_depth_stencil"/>

+	</desc>

+</template>

+

+<template name="FramebufferRenderbuffer">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="attachment" type="GLenum"/>

+		<param name="renderbuffertarget" type="GLenum"/>

+		<param name="renderbuffer" type="GLuint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>

+	</desc>

+

+	<desc name="attachment">

+		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>

+		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>

+		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>

+		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>

+		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>

+		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>

+	</desc>

+

+	<desc name="renderbuffertarget">

+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="FramebufferTexture2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="attachment" type="GLenum"/>

+		<param name="textarget" type="GLenum"/>

+		<param name="texture" type="GLuint"/>

+		<param name="level" type="GLint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>

+	</desc>

+

+	<desc name="attachment">

+		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>

+		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>

+		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>

+		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>

+		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>

+		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>

+	</desc>

+

+	<desc name="textarget" error="GL_INVALID_OPERATION">

+		<value name="GL_TEXTURE_2D"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>

+		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>

+	</desc>

+	<!-- According to the base specification, "level" must be 0.  But

+	     extension GL_OES_fbo_render_mipmap lifts that restriction,

+	     so no restriction is placed here. -->

+</template>

+

+<template name="FramebufferTexture3D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="attachment" type="GLenum"/>

+		<param name="textarget" type="GLenum"/>

+		<param name="texture" type="GLuint"/>

+		<param name="level" type="GLint"/>

+		<param name="zoffset" type="GLint"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>

+	</desc>

+

+	<desc name="attachment">

+		<value name="GL_COLOR_ATTACHMENT0_OES" category="OES_framebuffer_object"/>

+		<value name="GL_DEPTH_ATTACHMENT_OES" category="OES_framebuffer_object"/>

+		<value name="GL_STENCIL_ATTACHMENT_OES" category="OES_framebuffer_object"/>

+		<value name="GL_COLOR_ATTACHMENT0" category="GLES2.0"/>

+		<value name="GL_DEPTH_ATTACHMENT" category="GLES2.0"/>

+		<value name="GL_STENCIL_ATTACHMENT" category="GLES2.0"/>

+	</desc>

+

+	<desc name="textarget" error="GL_INVALID_OPERATION">

+		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>

+	</desc>

+</template>

+

+<template name="CheckFramebufferStatus" direction="get">

+	<proto>

+		<return type="GLenum"/>

+		<param name="target" type="GLenum"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>

+	</desc>

+</template>

+

+<template name="GetFramebufferAttachmentParameter" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="attachment" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER" category="GLES2.0"/>

+	</desc>

+

+	<desc name="pname">

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES" category="OES_framebuffer_object"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES" category="OES_framebuffer_object"/>

+

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE" category="GLES2.0"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME" category="GLES2.0"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL" category="GLES2.0"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE" category="GLES2.0"/>

+		<value name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" category="OES_texture_3D"/>

+

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+</template>

+

+<template name="GetRenderbufferParameter" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>

+	</desc>

+

+	<desc name="pname" category="OES_framebuffer_object">

+		<value name="GL_RENDERBUFFER_WIDTH_OES"/>

+		<value name="GL_RENDERBUFFER_HEIGHT_OES"/>

+		<value name="GL_RENDERBUFFER_INTERNAL_FORMAT_OES"/>

+		<value name="GL_RENDERBUFFER_RED_SIZE_OES"/>

+		<value name="GL_RENDERBUFFER_GREEN_SIZE_OES"/>

+		<value name="GL_RENDERBUFFER_BLUE_SIZE_OES"/>

+		<value name="GL_RENDERBUFFER_ALPHA_SIZE_OES"/>

+		<value name="GL_RENDERBUFFER_DEPTH_SIZE_OES"/>

+		<value name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>

+

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+

+	<desc name="pname" category="GLES2.0">

+		<value name="GL_RENDERBUFFER_WIDTH"/>

+		<value name="GL_RENDERBUFFER_HEIGHT"/>

+		<value name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>

+		<value name="GL_RENDERBUFFER_RED_SIZE"/>

+		<value name="GL_RENDERBUFFER_GREEN_SIZE"/>

+		<value name="GL_RENDERBUFFER_BLUE_SIZE"/>

+		<value name="GL_RENDERBUFFER_ALPHA_SIZE"/>

+		<value name="GL_RENDERBUFFER_DEPTH_SIZE"/>

+		<value name="GL_RENDERBUFFER_STENCIL_SIZE"/>

+

+		<desc name="params" vector_size="1" convert="false"/>

+	</desc>

+</template>

+

+<template name="IsRenderbuffer" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="renderbuffer" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="IsFramebuffer" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="framebuffer" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="IsShader" direction="get">

+	<proto>

+		<return type="GLboolean"/>

+		<param name="shader" type="GLuint"/>

+	</proto>

+</template>

+

+<template name="GetShader" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="shader" type="GLuint"/>

+		<param name="pname" type="GLenum"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+

+	<desc name="pname">

+		<value name="GL_SHADER_TYPE"/>

+		<value name="GL_COMPILE_STATUS"/>

+		<value name="GL_DELETE_STATUS"/>

+		<value name="GL_INFO_LOG_LENGTH"/>

+		<value name="GL_SHADER_SOURCE_LENGTH"/>

+	</desc>

+</template>

+

+<template name="GetAttachedShaders" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="maxCount" type="GLsizei"/>

+		<param name="count" type="GLsizei *"/>

+		<param name="shaders" type="GLuint *"/>

+	</proto>

+</template>

+

+<template name="GetShaderInfoLog" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="shader" type="GLuint"/>

+		<param name="bufSize" type="GLsizei"/>

+		<param name="length" type="GLsizei *"/>

+		<param name="infoLog" type="GLchar *"/>

+	</proto>

+</template>

+

+<template name="GetProgramInfoLog" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="bufSize" type="GLsizei"/>

+		<param name="length" type="GLsizei *"/>

+		<param name="infoLog" type="GLchar *"/>

+	</proto>

+</template>

+

+<template name="GetShaderSource" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="shader" type="GLuint"/>

+		<param name="bufSize" type="GLsizei"/>

+		<param name="length" type="GLsizei *"/>

+		<param name="source" type="GLchar *"/>

+	</proto>

+</template>

+

+<template name="GetShaderPrecisionFormat" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="shadertype" type="GLenum"/>

+		<param name="precisiontype" type="GLenum"/>

+		<param name="range" type="GLint *"/>

+		<param name="precision" type="GLint *"/>

+	</proto>

+

+	<desc name="shadertype">

+		<value name="GL_VERTEX_SHADER"/>

+		<value name="GL_FRAGMENT_SHADER"/>

+	</desc>

+

+	<desc name="precisiontype">

+		<value name="GL_LOW_FLOAT"/>

+		<value name="GL_MEDIUM_FLOAT"/>

+		<value name="GL_HIGH_FLOAT"/>

+		<value name="GL_LOW_INT"/>

+		<value name="GL_MEDIUM_INT"/>

+		<value name="GL_HIGH_INT"/>

+	</desc>

+</template>

+

+<template name="GetUniform" direction="get">

+	<proto>

+		<return type="void"/>

+		<param name="program" type="GLuint"/>

+		<param name="location" type="GLint"/>

+		<vector name="params" type="GLtype *" size="dynamic"/>

+	</proto>

+</template>

+

+<template name="QueryMatrix" direction="get">

+	<proto>

+		<return type="GLbitfield"/>

+		<vector name="mantissa" type="GLtype *" size="16"/>

+		<vector name="exponent" type="GLint *" size="16"/>

+	</proto>

+</template>

+

+<template name="DrawTex">

+	<proto>

+		<return type="void"/>

+		<vector name="coords" type="const GLtype *" size="5">

+			<param name="x" type="GLtype"/>

+			<param name="y" type="GLtype"/>

+			<param name="z" type="GLtype"/>

+			<param name="w" type="GLtype"/>

+			<param name="h" type="GLtype"/>

+		</vector>

+	</proto>

+</template>

+

+<template name="MultiDrawArrays">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+		<param name="first" type="const GLint *"/>

+		<param name="count" type="const GLsizei *"/>

+		<param name="primcount" type="GLsizei"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_POINTS"/>

+		<value name="GL_LINES"/>

+		<value name="GL_LINE_LOOP"/>

+		<value name="GL_LINE_STRIP"/>

+		<value name="GL_TRIANGLES"/>

+		<value name="GL_TRIANGLE_STRIP"/>

+		<value name="GL_TRIANGLE_FAN"/>

+	</desc>

+</template>

+

+<template name="MultiDrawElements">

+	<proto>

+		<return type="void"/>

+		<param name="mode" type="GLenum"/>

+		<param name="count" type="const GLsizei *"/>

+		<param name="type" type="GLenum"/>

+		<param name="indices" type="const GLvoid **"/>

+		<param name="primcount" type="GLsizei"/>

+	</proto>

+

+	<desc name="mode">

+		<value name="GL_POINTS"/>

+		<value name="GL_LINES"/>

+		<value name="GL_LINE_LOOP"/>

+		<value name="GL_LINE_STRIP"/>

+		<value name="GL_TRIANGLES"/>

+		<value name="GL_TRIANGLE_STRIP"/>

+		<value name="GL_TRIANGLE_FAN"/>

+	</desc>

+

+	<desc name="type">

+		<value name="GL_UNSIGNED_BYTE"/>

+		<value name="GL_UNSIGNED_SHORT"/>

+		<value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>

+	</desc>

+</template>

+

+<template name="EGLImageTargetTexture2D">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="image" type="GLeglImageOES"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_TEXTURE_2D"/>

+	</desc>

+</template>

+

+<template name="EGLImageTargetRenderbufferStorage">

+	<proto>

+		<return type="void"/>

+		<param name="target" type="GLenum"/>

+		<param name="image" type="GLeglImageOES"/>

+	</proto>

+

+	<desc name="target">

+		<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>

+		<value name="GL_RENDERBUFFER" category="GLES2.0"/>

+	</desc>

+</template>

+

+<api name="mesa" implementation="true">

+	<category name="MESA"/>

+

+	<function name="Color4f"  default_prefix="_es_" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+	<function name="ClipPlane" template="ClipPlane" gltype="GLdouble"/>

+	<function name="CullFace" template="CullFace"/>

+

+	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>

+	<function name="Fogfv" template="Fog" gltype="GLfloat"/>

+

+	<function name="FrontFace" template="FrontFace"/>

+	<function name="Hint" template="Hint"/>

+

+	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>

+	<function name="Lightfv" template="Light" gltype="GLfloat"/>

+

+	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>

+	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>

+

+	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>

+

+	<function name="Materialf" default_prefix="_es_" template="Material" gltype="GLfloat" expand_vector="true"/>

+	<function name="Materialfv" default_prefix="_es_" template="Material" gltype="GLfloat"/>

+

+	<function name="PointSize" template="PointSize" gltype="GLfloat"/>

+	<function name="PointSizePointer" template="PointSizePointer"/>

+

+	<function name="Scissor" template="Scissor"/>

+	<function name="ShadeModel" template="ShadeModel"/>

+

+	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>

+	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>

+	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>

+

+	<function name="TexImage2D" template="TexImage2D"/>

+

+	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>

+	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>

+	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>

+

+	<function name="TexGenf" template="TexGen" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexGenfv" template="TexGen" gltype="GLfloat"/>

+

+	<function name="Clear" template="Clear"/>

+	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>

+	<function name="ClearStencil" template="ClearStencil"/>

+	<function name="ClearDepth" template="ClearDepth" gltype="GLclampd"/>

+

+	<function name="StencilMask" template="StencilMask"/>

+	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>

+	<function name="ColorMask" template="ColorMask"/>

+	<function name="DepthMask" template="DepthMask"/>

+	<function name="Disable" template="Disable"/>

+	<function name="Enable" template="Enable"/>

+	<function name="Finish" template="Finish"/>

+	<function name="Flush" template="Flush"/>

+

+	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>

+

+	<function name="BlendFunc" template="BlendFunc"/>

+	<function name="LogicOp" template="LogicOp"/>

+	<function name="StencilFunc" template="StencilFunc"/>

+	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>

+	<function name="StencilOp" template="StencilOp"/>

+	<function name="StencilOpSeparate" template="StencilOpSeparate"/>

+	<function name="DepthFunc" template="DepthFunc"/>

+	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>

+

+	<function name="ReadPixels" template="ReadPixels"/>

+	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>

+	<function name="GetClipPlane" template="GetClipPlane" gltype="GLdouble"/>

+	<function name="GetError" template="GetError"/>

+	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>

+	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>

+	<function name="GetIntegerv" template="GetState" gltype="GLint"/>

+

+	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>

+	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>

+	<function name="GetMaterialiv" template="GetMaterial" gltype="GLint"/>

+

+	<function name="GetString" template="GetString"/>

+

+	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>

+	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>

+	<function name="GetTexGenfv" template="GetTexGen" gltype="GLfloat"/>

+	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>

+	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>

+

+	<function name="IsEnabled" template="IsEnabled"/>

+

+	<function name="DepthRange" template="DepthRange" gltype="GLclampd"/>

+	<function name="Frustum" template="Frustum" gltype="GLdouble"/>

+

+	<function name="LoadIdentity" template="LoadIdentity"/>

+	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>

+	<function name="MatrixMode" template="MatrixMode"/>

+

+	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>

+	<function name="Ortho" template="Ortho" gltype="GLdouble"/>

+	<function name="PopMatrix" template="PopMatrix"/>

+	<function name="PushMatrix" template="PushMatrix"/>

+

+	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>

+	<function name="Scalef" template="Scale" gltype="GLfloat"/>

+	<function name="Translatef" template="Translate" gltype="GLfloat"/>

+

+	<function name="Viewport" template="Viewport"/>

+

+	<function name="ColorPointer" template="ColorPointer"/>

+	<function name="DisableClientState" template="DisableClientState"/>

+	<function name="DrawArrays" template="DrawArrays"/>

+	<function name="DrawElements" template="DrawElements"/>

+	<function name="EnableClientState" template="EnableClientState"/>

+

+	<function name="GetPointerv" template="GetPointer"/>

+	<function name="Normal3f" default_prefix="_es_" template="Normal" gltype="GLfloat" expand_vector="true"/>

+	<function name="NormalPointer" template="NormalPointer"/>

+	<function name="TexCoordPointer" template="TexCoordPointer"/>

+	<function name="VertexPointer" template="VertexPointer"/>

+

+	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>

+	<function name="CopyTexImage2D" template="CopyTexImage2D"/>

+	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>

+	<function name="TexSubImage2D" template="TexSubImage2D"/>

+

+	<function name="BindTexture" template="BindTexture"/>

+	<function name="DeleteTextures" template="DeleteTextures"/>

+	<function name="GenTextures" template="GenTextures"/>

+	<function name="IsTexture" template="IsTexture"/>

+

+	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>

+	<function name="BlendEquation" template="BlendEquation"/>

+	<function name="BlendEquationSeparateEXT" template="BlendEquationSeparate"/>

+

+	<function name="TexImage3D" template="TexImage3D"/>

+	<function name="TexSubImage3D" template="TexSubImage3D"/>

+	<function name="CopyTexSubImage3D" template="CopyTexSubImage3D"/>

+

+	<function name="CompressedTexImage3DARB" template="CompressedTexImage3D"/>

+	<function name="CompressedTexSubImage3DARB" template="CompressedTexSubImage3D"/>

+

+	<function name="ActiveTextureARB" template="ActiveTexture"/>

+	<function name="ClientActiveTextureARB" template="ClientActiveTexture"/>

+

+	<function name="MultiTexCoord4f" default_prefix="_es_" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+

+	<function name="SampleCoverageARB" template="SampleCoverage" gltype="GLclampf"/>

+

+	<function name="CompressedTexImage2DARB" template="CompressedTexImage2D"/>

+	<function name="CompressedTexSubImage2DARB" template="CompressedTexSubImage2D"/>

+

+	<function name="BlendFuncSeparateEXT" template="BlendFuncSeparate"/>

+

+	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>

+	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>

+

+	<function name="VertexAttrib1f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>

+	<function name="VertexAttrib2f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>

+	<function name="VertexAttrib3f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>

+	<function name="VertexAttrib4f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+	<function name="VertexAttrib1fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>

+	<function name="VertexAttrib2fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>

+	<function name="VertexAttrib3fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>

+	<function name="VertexAttrib4fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>

+

+	<function name="VertexAttribPointerARB" template="VertexAttribPointer"/>

+	<function name="EnableVertexAttribArrayARB" template="EnableVertexAttribArray"/>

+	<function name="DisableVertexAttribArrayARB" template="DisableVertexAttribArray"/>

+

+	<function name="IsProgram" template="IsProgram"/>

+	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>

+

+	<function name="GetVertexAttribfvARB" template="GetVertexAttrib" gltype="GLfloat"/>

+	<function name="GetVertexAttribivARB" template="GetVertexAttrib" gltype="GLint"/>

+	<function name="GetVertexAttribPointervARB" template="GetVertexAttribPointer"/>

+

+	<function name="GetBufferPointervARB" template="GetBufferPointer"/>

+	<function name="MapBufferARB" template="MapBuffer"/>

+	<function name="UnmapBufferARB" template="UnmapBuffer"/>

+	<function name="BindBufferARB" template="BindBuffer"/>

+	<function name="BufferDataARB" template="BufferData"/>

+	<function name="BufferSubDataARB" template="BufferSubData"/>

+	<function name="DeleteBuffersARB" template="DeleteBuffers"/>

+	<function name="GenBuffersARB" template="GenBuffers"/>

+	<function name="GetBufferParameterivARB" template="GetBufferParameter" gltype="GLint"/>

+	<function name="IsBufferARB" template="IsBuffer"/>

+

+	<function name="CreateShader" template="CreateShader"/>

+	<function name="ShaderSourceARB" template="ShaderSource"/>

+	<function name="CompileShaderARB" template="CompileShader"/>

+	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>

+	<function name="DeleteShader" template="DeleteShader"/>

+	<function name="ShaderBinary" template="ShaderBinary"/>

+	<function name="CreateProgram" template="CreateProgram"/>

+	<function name="AttachShader" template="AttachShader"/>

+	<function name="DetachShader" template="DetachShader"/>

+	<function name="LinkProgramARB" template="LinkProgram"/>

+	<function name="UseProgramObjectARB" template="UseProgram"/>

+	<function name="DeleteProgram" template="DeleteProgram"/>

+

+	<function name="GetActiveAttribARB" template="GetActiveAttrib"/>

+	<function name="GetAttribLocationARB" template="GetAttribLocation"/>

+	<function name="BindAttribLocationARB" template="BindAttribLocation"/>

+	<function name="GetUniformLocationARB" template="GetUniformLocation"/>

+	<function name="GetActiveUniformARB" template="GetActiveUniform"/>

+

+	<function name="Uniform1fARB" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>

+	<function name="Uniform2fARB" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>

+	<function name="Uniform3fARB" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>

+	<function name="Uniform4fARB" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+	<function name="Uniform1iARB" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>

+	<function name="Uniform2iARB" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>

+	<function name="Uniform3iARB" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>

+	<function name="Uniform4iARB" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>

+	<function name="Uniform1fvARB" template="Uniform" gltype="GLfloat" vector_size="1"/>

+	<function name="Uniform2fvARB" template="Uniform" gltype="GLfloat" vector_size="2"/>

+	<function name="Uniform3fvARB" template="Uniform" gltype="GLfloat" vector_size="3"/>

+	<function name="Uniform4fvARB" template="Uniform" gltype="GLfloat" vector_size="4"/>

+	<function name="Uniform1ivARB" template="Uniform" gltype="GLint" vector_size="1"/>

+	<function name="Uniform2ivARB" template="Uniform" gltype="GLint" vector_size="2"/>

+	<function name="Uniform3ivARB" template="Uniform" gltype="GLint" vector_size="3"/>

+	<function name="Uniform4ivARB" template="Uniform" gltype="GLint" vector_size="4"/>

+

+	<function name="UniformMatrix2fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>

+	<function name="UniformMatrix3fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>

+	<function name="UniformMatrix4fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>

+

+	<function name="ValidateProgramARB" template="ValidateProgram"/>

+

+	<function name="GenerateMipmapEXT" template="GenerateMipmap"/>

+	<function name="BindFramebufferEXT" template="BindFramebuffer"/>

+	<function name="DeleteFramebuffersEXT" template="DeleteFramebuffers"/>

+	<function name="GenFramebuffersEXT" template="GenFramebuffers"/>

+	<function name="BindRenderbufferEXT" template="BindRenderbuffer"/>

+	<function name="DeleteRenderbuffersEXT" template="DeleteRenderbuffers"/>

+	<function name="GenRenderbuffersEXT" template="GenRenderbuffers"/>

+	<function name="RenderbufferStorageEXT" template="RenderbufferStorage"/>

+	<function name="FramebufferRenderbufferEXT" template="FramebufferRenderbuffer"/>

+	<function name="FramebufferTexture2DEXT" template="FramebufferTexture2D"/>

+	<function name="FramebufferTexture3DEXT" template="FramebufferTexture3D"/>

+	<function name="CheckFramebufferStatusEXT" template="CheckFramebufferStatus"/>

+	<function name="GetFramebufferAttachmentParameterivEXT" template="GetFramebufferAttachmentParameter" gltype="GLint"/>

+	<function name="GetRenderbufferParameterivEXT" template="GetRenderbufferParameter" gltype="GLint"/>

+	<function name="IsRenderbufferEXT" template="IsRenderbuffer"/>

+	<function name="IsFramebufferEXT" template="IsFramebuffer"/>

+

+	<function name="IsShader" template="IsShader"/>

+	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>

+	<function name="GetAttachedShaders" template="GetAttachedShaders"/>

+	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>

+	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>

+	<function name="GetShaderSourceARB" template="GetShaderSource"/>

+	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>

+	<function name="GetUniformfvARB" template="GetUniform" gltype="GLfloat"/>

+	<function name="GetUniformivARB" template="GetUniform" gltype="GLint"/>

+

+	<function name="DrawTexf" template="DrawTex" gltype="GLfloat" expand_vector="true"/>

+	<function name="DrawTexfv" template="DrawTex" gltype="GLfloat"/>

+	<function name="DrawTexi" template="DrawTex" gltype="GLint" expand_vector="true"/>

+	<function name="DrawTexiv" template="DrawTex" gltype="GLint"/>

+	<function name="DrawTexs" template="DrawTex" gltype="GLshort" expand_vector="true"/>

+	<function name="DrawTexsv" template="DrawTex" gltype="GLshort"/>

+

+        <!-- EXT_multi_draw_arrays -->

+        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>

+        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>

+

+        <!-- OES_EGL_image -->

+        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>

+        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>

+</api>

+

+<api name="GLES1.1">

+	<category name="GLES1.1"/>

+

+	<category name="OES_byte_coordinates"/>

+	<category name="OES_fixed_point"/>

+	<category name="OES_single_precision"/>

+	<category name="OES_matrix_get"/>

+	<category name="OES_read_format"/>

+	<category name="OES_compressed_paletted_texture"/>

+	<category name="OES_point_size_array"/>

+	<category name="OES_point_sprite"/>

+	<category name="OES_query_matrix"/>

+	<category name="OES_draw_texture"/>

+	<category name="OES_blend_equation_separate"/>

+	<category name="OES_blend_func_separate"/>

+	<category name="OES_blend_subtract"/>

+	<category name="OES_stencil_wrap"/>

+	<category name="OES_texture_cube_map"/>

+	<category name="OES_texture_env_crossbar"/>

+	<category name="OES_texture_mirrored_repeat"/>

+	<category name="OES_framebuffer_object"/>

+	<category name="OES_depth24"/>

+	<category name="OES_depth32"/>

+	<category name="OES_fbo_render_mipmap"/>

+	<category name="OES_rgb8_rgba8"/>

+	<category name="OES_stencil1"/>

+	<category name="OES_stencil4"/>

+	<category name="OES_stencil8"/>

+	<category name="OES_element_index_uint"/>

+	<category name="OES_mapbuffer"/>

+	<category name="EXT_texture_filter_anisotropic"/>

+

+	<category name="ARB_texture_non_power_of_two"/>

+	<!-- disabled due to missing enums

+	<category name="EXT_texture_compression_dxt1"/>

+	-->

+	<category name="EXT_texture_lod_bias"/>

+	<category name="EXT_blend_minmax"/>

+	<category name="EXT_multi_draw_arrays"/>

+	<category name="OES_EGL_image"/>

+

+	<category name="OES_matrix_palette"/>

+

+	<function name="Color4f" external="true" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+	<function name="Color4ub" template="Color" gltype="GLubyte" vector_size="4" expand_vector="true"/>

+	<function name="Color4x" template="Color" gltype="GLfixed" vector_size="4" expand_vector="true"/>

+

+	<function name="ClipPlanef" template="ClipPlane" gltype="GLfloat"/>

+	<function name="ClipPlanex" template="ClipPlane" gltype="GLfixed"/>

+

+	<function name="CullFace" template="CullFace"/>

+

+	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>

+	<function name="Fogx" template="Fog" gltype="GLfixed" expand_vector="true"/>

+	<function name="Fogfv" template="Fog" gltype="GLfloat"/>

+	<function name="Fogxv" template="Fog" gltype="GLfixed"/>

+

+	<function name="FrontFace" template="FrontFace"/>

+	<function name="Hint" template="Hint"/>

+

+	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>

+	<function name="Lightx" template="Light" gltype="GLfixed" expand_vector="true"/>

+	<function name="Lightfv" template="Light" gltype="GLfloat"/>

+	<function name="Lightxv" template="Light" gltype="GLfixed"/>

+

+	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>

+	<function name="LightModelx" template="LightModel" gltype="GLfixed" expand_vector="true"/>

+	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>

+	<function name="LightModelxv" template="LightModel" gltype="GLfixed"/>

+

+	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>

+	<function name="LineWidthx" template="LineWidth" gltype="GLfixed"/>

+

+	<function name="Materialf" external="true" template="Material" gltype="GLfloat" expand_vector="true"/>

+	<function name="Materialfv" external="true" template="Material" gltype="GLfloat"/>

+	<function name="Materialx" template="Material" gltype="GLfixed" expand_vector="true"/>

+	<function name="Materialxv" template="Material" gltype="GLfixed"/>

+

+	<function name="PointSize" template="PointSize" gltype="GLfloat"/>

+	<function name="PointSizex" template="PointSize" gltype="GLfixed"/>

+	<function name="PointSizePointerOES" template="PointSizePointer"/>

+

+	<function name="Scissor" template="Scissor"/>

+	<function name="ShadeModel" template="ShadeModel"/>

+

+	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>

+	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>

+	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>

+	<function name="TexParameterx" template="TexParameter" gltype="GLfixed" expand_vector="true"/>

+	<function name="TexParameterxv" template="TexParameter" gltype="GLfixed"/>

+

+	<function name="TexImage2D" template="TexImage2D"/>

+

+	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>

+	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>

+	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>

+	<function name="TexEnvx" template="TexEnv" gltype="GLfixed" expand_vector="true"/>

+	<function name="TexEnvxv" template="TexEnv" gltype="GLfixed"/>

+

+	<function name="TexGenfOES" external="true" template="TexGen" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexGenfvOES" external="true" template="TexGen" gltype="GLfloat"/>

+	<function name="TexGeniOES" external="true" template="TexGen" gltype="GLint" expand_vector="true"/>

+	<function name="TexGenivOES" external="true" template="TexGen" gltype="GLint"/>

+	<function name="TexGenxOES" external="true" template="TexGen" gltype="GLfixed" expand_vector="true"/>

+	<function name="TexGenxvOES" external="true" template="TexGen" gltype="GLfixed"/>

+

+	<function name="Clear" template="Clear"/>

+	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>

+	<function name="ClearColorx" template="ClearColor" gltype="GLclampx"/>

+

+	<function name="ClearStencil" template="ClearStencil"/>

+	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>

+	<function name="ClearDepthx" template="ClearDepth" gltype="GLclampx"/>

+

+	<function name="StencilMask" template="StencilMask"/>

+	<function name="ColorMask" template="ColorMask"/>

+	<function name="DepthMask" template="DepthMask"/>

+

+	<function name="Disable" template="Disable"/>

+	<function name="Enable" template="Enable"/>

+	<function name="Finish" template="Finish"/>

+	<function name="Flush" template="Flush"/>

+

+	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>

+	<function name="AlphaFuncx" template="AlphaFunc" gltype="GLclampx"/>

+

+	<function name="BlendFunc" template="BlendFunc"/>

+	<function name="LogicOp" template="LogicOp"/>

+	<function name="StencilFunc" template="StencilFunc"/>

+

+	<function name="StencilOp" template="StencilOp"/>

+	<function name="DepthFunc" template="DepthFunc"/>

+

+	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>

+	<function name="ReadPixels" template="ReadPixels"/>

+

+	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>

+

+	<function name="GetClipPlanef" template="GetClipPlane" gltype="GLfloat"/>

+	<function name="GetClipPlanex" template="GetClipPlane" gltype="GLfixed"/>

+

+	<function name="GetError" template="GetError"/>

+	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>

+	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>

+	<function name="GetIntegerv" template="GetState" gltype="GLint"/>

+

+	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>

+	<function name="GetLightxv" template="GetLight" gltype="GLfixed"/>

+

+	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>

+	<function name="GetMaterialxv" template="GetMaterial" gltype="GLfixed"/>

+

+	<function name="GetString" template="GetString"/>

+

+	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>

+	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>

+	<function name="GetTexEnvxv" template="GetTexEnv" gltype="GLfixed"/>

+

+	<function name="GetTexGenfvOES" external="true" template="GetTexGen" gltype="GLfloat"/>

+	<function name="GetTexGenivOES" external="true" template="GetTexGen" gltype="GLint"/>

+	<function name="GetTexGenxvOES" external="true" template="GetTexGen" gltype="GLfixed"/>

+

+	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>

+	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>

+	<function name="GetTexParameterxv" template="GetTexParameter" gltype="GLfixed"/>

+

+	<function name="IsEnabled" template="IsEnabled"/>

+

+	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>

+	<function name="DepthRangex" template="DepthRange" gltype="GLclampx"/>

+

+	<function name="Frustumf" template="Frustum" gltype="GLfloat"/>

+	<function name="Frustumx" template="Frustum" gltype="GLfixed"/>

+

+	<function name="LoadIdentity" template="LoadIdentity"/>

+	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>

+	<function name="LoadMatrixx" template="LoadMatrix" gltype="GLfixed"/>

+	<function name="MatrixMode" template="MatrixMode"/>

+

+	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>

+	<function name="MultMatrixx" template="MultMatrix" gltype="GLfixed"/>

+	<function name="Orthof" template="Ortho" gltype="GLfloat"/>

+	<function name="Orthox" template="Ortho" gltype="GLfixed"/>

+

+	<function name="PopMatrix" template="PopMatrix"/>

+	<function name="PushMatrix" template="PushMatrix"/>

+

+	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>

+	<function name="Rotatex" template="Rotate" gltype="GLfixed"/>

+	<function name="Scalef" template="Scale" gltype="GLfloat"/>

+	<function name="Scalex" template="Scale" gltype="GLfixed"/>

+	<function name="Translatef" template="Translate" gltype="GLfloat"/>

+	<function name="Translatex" template="Translate" gltype="GLfixed"/>

+

+	<function name="Viewport" template="Viewport"/>

+	<function name="ColorPointer" template="ColorPointer"/>

+	<function name="DisableClientState" template="DisableClientState"/>

+	<function name="DrawArrays" template="DrawArrays"/>

+	<function name="DrawElements" template="DrawElements"/>

+	<function name="EnableClientState" template="EnableClientState"/>

+

+	<function name="GetPointerv" template="GetPointer"/>

+

+	<function name="Normal3f" external="true" template="Normal" gltype="GLfloat" expand_vector="true"/>

+	<function name="Normal3x" template="Normal" gltype="GLfixed" expand_vector="true"/>

+	<function name="NormalPointer" template="NormalPointer"/>

+	<function name="TexCoordPointer" template="TexCoordPointer"/>

+	<function name="VertexPointer" template="VertexPointer"/>

+

+	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>

+	<function name="PolygonOffsetx" template="PolygonOffset" gltype="GLfixed"/>

+

+	<function name="CopyTexImage2D" template="CopyTexImage2D"/>

+	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>

+

+	<function name="TexSubImage2D" template="TexSubImage2D"/>

+

+	<function name="BindTexture" template="BindTexture"/>

+	<function name="DeleteTextures" template="DeleteTextures"/>

+	<function name="GenTextures" template="GenTextures"/>

+	<function name="IsTexture" template="IsTexture"/>

+

+	<function name="BlendEquationOES" template="BlendEquation"/>

+	<function name="BlendEquationSeparateOES" template="BlendEquationSeparate"/>

+

+	<function name="MultiTexCoord4x" template="MultiTexCoord" gltype="GLfixed" vector_size="4" expand_vector="true"/>

+

+	<function name="ActiveTexture" template="ActiveTexture"/>

+	<function name="ClientActiveTexture" template="ClientActiveTexture"/>

+

+	<function name="MultiTexCoord4f" external="true" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+

+	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>

+	<function name="SampleCoveragex" template="SampleCoverage" gltype="GLclampx"/>

+

+	<!-- CompressedTexImage2D calls out to two different functions based on

+	     whether the image is a paletted image or not -->

+	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>

+	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>

+

+	<function name="BlendFuncSeparateOES" template="BlendFuncSeparate"/>

+

+	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>

+	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>

+	<function name="PointParameterx" template="PointParameter" gltype="GLfixed" expand_vector="true"/>

+	<function name="PointParameterxv" template="PointParameter" gltype="GLfixed"/>

+

+	<!-- OES_mapbuffer -->

+	<function name="GetBufferPointervOES" template="GetBufferPointer"/>

+	<function name="MapBufferOES" template="MapBuffer"/>

+	<function name="UnmapBufferOES" template="UnmapBuffer"/>

+

+	<function name="BindBuffer" template="BindBuffer"/>

+	<function name="BufferData" template="BufferData"/>

+	<function name="BufferSubData" template="BufferSubData"/>

+	<function name="DeleteBuffers" template="DeleteBuffers"/>

+	<function name="GenBuffers" template="GenBuffers"/>

+	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>

+	<function name="IsBuffer" template="IsBuffer"/>

+

+	<!-- OES_framebuffer_object -->

+	<function name="GenerateMipmapOES" template="GenerateMipmap"/>

+	<function name="BindFramebufferOES" template="BindFramebuffer"/>

+	<function name="DeleteFramebuffersOES" template="DeleteFramebuffers"/>

+	<function name="GenFramebuffersOES" template="GenFramebuffers"/>

+	<function name="BindRenderbufferOES" template="BindRenderbuffer"/>

+	<function name="DeleteRenderbuffersOES" template="DeleteRenderbuffers"/>

+	<function name="GenRenderbuffersOES" template="GenRenderbuffers"/>

+	<function name="RenderbufferStorageOES" external="true" template="RenderbufferStorage"/>

+	<function name="FramebufferRenderbufferOES" template="FramebufferRenderbuffer"/>

+	<function name="FramebufferTexture2DOES" template="FramebufferTexture2D"/>

+	<function name="CheckFramebufferStatusOES" template="CheckFramebufferStatus"/>

+	<function name="GetFramebufferAttachmentParameterivOES" template="GetFramebufferAttachmentParameter" gltype="GLint"/>

+	<function name="GetRenderbufferParameterivOES" template="GetRenderbufferParameter" gltype="GLint"/>

+	<function name="IsRenderbufferOES" template="IsRenderbuffer"/>

+	<function name="IsFramebufferOES" template="IsFramebuffer"/>

+

+	<!-- OES_query_matrix -->

+	<!-- QueryMatrixx returns values in an unusual, decomposed, fixed-value

+	     form; it has its own code for this -->

+	<function name="QueryMatrixxOES" external="true" template="QueryMatrix" gltype="GLfixed"/>

+

+	<!-- OES_draw_texture -->

+	<function name="DrawTexfOES" template="DrawTex" gltype="GLfloat" expand_vector="true"/>

+	<function name="DrawTexiOES" template="DrawTex" gltype="GLint" expand_vector="true"/>

+	<function name="DrawTexsOES" template="DrawTex" gltype="GLshort" expand_vector="true"/>

+	<function name="DrawTexxOES" template="DrawTex" gltype="GLfixed" expand_vector="true"/>

+	<function name="DrawTexfvOES" template="DrawTex" gltype="GLfloat"/>

+	<function name="DrawTexivOES" template="DrawTex" gltype="GLint"/>

+	<function name="DrawTexsvOES" template="DrawTex" gltype="GLshort"/>

+	<function name="DrawTexxvOES" template="DrawTex" gltype="GLfixed"/>

+

+        <!-- EXT_multi_draw_arrays -->

+        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>

+        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>

+

+        <!-- OES_EGL_image -->

+        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>

+        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>

+</api>

+

+<api name="GLES2.0">

+	<category name="GLES2.0"/>

+

+	<category name="OES_compressed_paletted_texture"/>

+	<category name="OES_depth24"/>

+	<category name="OES_depth32"/>

+	<category name="OES_fbo_render_mipmap"/>

+	<category name="OES_rgb8_rgba8"/>

+	<category name="OES_stencil1"/>

+	<category name="OES_stencil4"/>

+	<category name="OES_element_index_uint"/>

+	<category name="OES_mapbuffer"/>

+	<category name="OES_texture_3D"/>

+	<category name="OES_texture_npot"/>

+	<category name="EXT_texture_filter_anisotropic"/>

+	<category name="EXT_texture_type_2_10_10_10_REV"/>

+	<category name="OES_depth_texture"/>

+	<category name="OES_packed_depth_stencil"/>

+	<category name="OES_standard_derivatives"/>

+	<category name="EXT_texture_format_BGRA8888"/>

+

+	<category name="EXT_texture_compression_dxt1"/>

+	<category name="EXT_blend_minmax"/>

+	<category name="EXT_multi_draw_arrays"/>

+	<category name="OES_EGL_image"/>

+

+	<function name="CullFace" template="CullFace"/>

+

+	<function name="FrontFace" template="FrontFace"/>

+	<function name="Hint" template="Hint"/>

+

+	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>

+

+	<function name="Scissor" template="Scissor"/>

+

+	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>

+	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>

+	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>

+	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>

+

+	<function name="TexImage2D" template="TexImage2D"/>

+

+	<function name="Clear" template="Clear"/>

+	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>

+	<function name="ClearStencil" template="ClearStencil"/>

+	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>

+

+	<function name="StencilMask" template="StencilMask"/>

+	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>

+	<function name="ColorMask" template="ColorMask"/>

+	<function name="DepthMask" template="DepthMask"/>

+	<function name="Disable" template="Disable"/>

+	<function name="Enable" template="Enable"/>

+	<function name="Finish" template="Finish"/>

+	<function name="Flush" template="Flush"/>

+

+	<function name="BlendFunc" template="BlendFunc"/>

+

+	<function name="StencilFunc" template="StencilFunc"/>

+	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>

+	<function name="StencilOp" template="StencilOp"/>

+	<function name="StencilOpSeparate" template="StencilOpSeparate"/>

+

+	<function name="DepthFunc" template="DepthFunc"/>

+

+	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>

+	<function name="ReadPixels" template="ReadPixels"/>

+

+	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>

+	<function name="GetError" template="GetError"/>

+	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>

+	<function name="GetIntegerv" template="GetState" gltype="GLint"/>

+

+	<function name="GetString" template="GetString"/>

+

+	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>

+	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>

+

+	<function name="IsEnabled" template="IsEnabled"/>

+

+	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>

+

+	<function name="Viewport" template="Viewport"/>

+

+	<function name="DrawArrays" template="DrawArrays"/>

+	<function name="DrawElements" template="DrawElements"/>

+

+	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>

+	<function name="CopyTexImage2D" template="CopyTexImage2D"/>

+	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>

+	<function name="TexSubImage2D" template="TexSubImage2D"/>

+

+	<function name="BindTexture" template="BindTexture"/>

+	<function name="DeleteTextures" template="DeleteTextures"/>

+	<function name="GenTextures" template="GenTextures"/>

+	<function name="IsTexture" template="IsTexture"/>

+

+	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>

+	<function name="BlendEquation" template="BlendEquation"/>

+	<function name="BlendEquationSeparate" template="BlendEquationSeparate"/>

+

+	<function name="TexImage3DOES" template="TexImage3D"/>

+	<function name="TexSubImage3DOES" template="TexSubImage3D"/>

+	<function name="CopyTexSubImage3DOES" template="CopyTexSubImage3D"/>

+

+	<function name="CompressedTexImage3DOES" template="CompressedTexImage3D"/>

+	<function name="CompressedTexSubImage3DOES" template="CompressedTexSubImage3D"/>

+

+	<function name="ActiveTexture" template="ActiveTexture"/>

+

+	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>

+

+	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>

+	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>

+

+	<function name="BlendFuncSeparate" template="BlendFuncSeparate"/>

+

+	<function name="VertexAttrib1f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>

+	<function name="VertexAttrib2f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>

+	<function name="VertexAttrib3f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>

+	<function name="VertexAttrib4f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+	<function name="VertexAttrib1fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>

+	<function name="VertexAttrib2fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>

+	<function name="VertexAttrib3fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>

+	<function name="VertexAttrib4fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>

+

+	<function name="VertexAttribPointer" template="VertexAttribPointer"/>

+

+	<function name="EnableVertexAttribArray" template="EnableVertexAttribArray"/>

+	<function name="DisableVertexAttribArray" template="DisableVertexAttribArray"/>

+

+	<function name="IsProgram" template="IsProgram"/>

+	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>

+

+	<function name="GetVertexAttribfv" template="GetVertexAttrib" gltype="GLfloat"/>

+	<function name="GetVertexAttribiv" template="GetVertexAttrib" gltype="GLint"/>

+	<function name="GetVertexAttribPointerv" template="GetVertexAttribPointer"/>

+

+	<function name="GetBufferPointervOES" template="GetBufferPointer"/>

+	<function name="MapBufferOES" template="MapBuffer"/>

+	<function name="UnmapBufferOES" template="UnmapBuffer"/>

+	<function name="BindBuffer" template="BindBuffer"/>

+	<function name="BufferData" template="BufferData"/>

+	<function name="BufferSubData" template="BufferSubData"/>

+	<function name="DeleteBuffers" template="DeleteBuffers"/>

+	<function name="GenBuffers" template="GenBuffers"/>

+	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>

+	<function name="IsBuffer" template="IsBuffer"/>

+

+	<function name="CreateShader" template="CreateShader"/>

+	<function name="ShaderSource" template="ShaderSource"/>

+	<function name="CompileShader" template="CompileShader"/>

+	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>

+	<function name="DeleteShader" template="DeleteShader"/>

+	<function name="ShaderBinary" template="ShaderBinary"/>

+	<function name="CreateProgram" template="CreateProgram"/>

+	<function name="AttachShader" template="AttachShader"/>

+	<function name="DetachShader" template="DetachShader"/>

+	<function name="LinkProgram" template="LinkProgram"/>

+	<function name="UseProgram" template="UseProgram"/>

+	<function name="DeleteProgram" template="DeleteProgram"/>

+

+	<function name="GetActiveAttrib" template="GetActiveAttrib"/>

+	<function name="GetAttribLocation" template="GetAttribLocation"/>

+	<function name="BindAttribLocation" template="BindAttribLocation"/>

+	<function name="GetUniformLocation" template="GetUniformLocation"/>

+	<function name="GetActiveUniform" template="GetActiveUniform"/>

+

+	<function name="Uniform1f" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>

+	<function name="Uniform2f" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>

+	<function name="Uniform3f" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>

+	<function name="Uniform4f" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>

+	<function name="Uniform1i" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>

+	<function name="Uniform2i" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>

+	<function name="Uniform3i" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>

+	<function name="Uniform4i" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>

+

+	<function name="Uniform1fv" template="Uniform" gltype="GLfloat" vector_size="1"/>

+	<function name="Uniform2fv" template="Uniform" gltype="GLfloat" vector_size="2"/>

+	<function name="Uniform3fv" template="Uniform" gltype="GLfloat" vector_size="3"/>

+	<function name="Uniform4fv" template="Uniform" gltype="GLfloat" vector_size="4"/>

+	<function name="Uniform1iv" template="Uniform" gltype="GLint" vector_size="1"/>

+	<function name="Uniform2iv" template="Uniform" gltype="GLint" vector_size="2"/>

+	<function name="Uniform3iv" template="Uniform" gltype="GLint" vector_size="3"/>

+	<function name="Uniform4iv" template="Uniform" gltype="GLint" vector_size="4"/>

+

+	<function name="UniformMatrix2fv" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>

+	<function name="UniformMatrix3fv" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>

+	<function name="UniformMatrix4fv" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>

+

+	<function name="ValidateProgram" template="ValidateProgram"/>

+

+	<function name="GenerateMipmap" template="GenerateMipmap"/>

+	<function name="BindFramebuffer" template="BindFramebuffer"/>

+	<function name="DeleteFramebuffers" template="DeleteFramebuffers"/>

+	<function name="GenFramebuffers" template="GenFramebuffers"/>

+	<function name="BindRenderbuffer" template="BindRenderbuffer"/>

+	<function name="DeleteRenderbuffers" template="DeleteRenderbuffers"/>

+	<function name="GenRenderbuffers" template="GenRenderbuffers"/>

+	<function name="RenderbufferStorage" external="true" template="RenderbufferStorage"/>

+	<function name="FramebufferRenderbuffer" template="FramebufferRenderbuffer"/>

+	<function name="FramebufferTexture2D" template="FramebufferTexture2D"/>

+	<function name="FramebufferTexture3DOES" template="FramebufferTexture3D"/>

+	<function name="CheckFramebufferStatus" template="CheckFramebufferStatus"/>

+	<function name="GetFramebufferAttachmentParameteriv" template="GetFramebufferAttachmentParameter" gltype="GLint"/>

+	<function name="GetRenderbufferParameteriv" template="GetRenderbufferParameter" gltype="GLint"/>

+	<function name="IsRenderbuffer" template="IsRenderbuffer"/>

+	<function name="IsFramebuffer" template="IsFramebuffer"/>

+

+	<function name="IsShader" template="IsShader"/>

+	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>

+	<function name="GetAttachedShaders" template="GetAttachedShaders"/>

+	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>

+	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>

+	<function name="GetShaderSource" template="GetShaderSource"/>

+	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>

+	<function name="GetUniformfv" template="GetUniform" gltype="GLfloat"/>

+	<function name="GetUniformiv" template="GetUniform" gltype="GLint"/>

+

+        <!-- EXT_multi_draw_arrays -->

+        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>

+        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>

+

+        <!-- OES_EGL_image -->

+        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>

+        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>

+</api>

+

+</apispec>

diff --git a/mesalib/src/mesa/main/accum.c b/mesalib/src/mesa/main/accum.c
index 2012d00fd..1e001ab42 100644
--- a/mesalib/src/mesa/main/accum.c
+++ b/mesalib/src/mesa/main/accum.c
@@ -1,122 +1,122 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 "accum.h"
-#include "context.h"
-#include "imports.h"
-#include "macros.h"
-#include "state.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_accum
-
-
-void GLAPIENTRY
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
-{
-   GLfloat tmp[4];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   tmp[0] = CLAMP( red,   -1.0F, 1.0F );
-   tmp[1] = CLAMP( green, -1.0F, 1.0F );
-   tmp[2] = CLAMP( blue,  -1.0F, 1.0F );
-   tmp[3] = CLAMP( alpha, -1.0F, 1.0F );
-
-   if (TEST_EQ_4V(tmp, ctx->Accum.ClearColor))
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_ACCUM);
-   COPY_4FV( ctx->Accum.ClearColor, tmp );
-}
-
-
-static void GLAPIENTRY
-_mesa_Accum( GLenum op, GLfloat value )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (op) {
-   case GL_ADD:
-   case GL_MULT:
-   case GL_ACCUM:
-   case GL_LOAD:
-   case GL_RETURN:
-      /* OK */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glAccum(op)");
-      return;
-   }
-
-   if (ctx->DrawBuffer->Visual.haveAccumBuffer == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(no accum buffer)");
-      return;
-   }
-
-   if (ctx->DrawBuffer != ctx->ReadBuffer) {
-      /* See GLX_SGI_make_current_read or WGL_ARB_make_current_read,
-       * or GL_EXT_framebuffer_blit.
-       */
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glAccum(different read/draw buffers)");
-      return;
-   }
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glAccum(incomplete framebuffer)");
-      return;
-   }
-
-   if (ctx->RenderMode == GL_RENDER) {
-      ctx->Driver.Accum(ctx, op, value);
-   }
-}
-
-
-void
-_mesa_init_accum_dispatch(struct _glapi_table *disp)
-{
-   SET_Accum(disp, _mesa_Accum);
-   SET_ClearAccum(disp, _mesa_ClearAccum);
-}
-
-
-#endif /* FEATURE_accum */
-
-
-void 
-_mesa_init_accum( GLcontext *ctx )
-{
-   /* Accumulate buffer group */
-   ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 "accum.h"

+#include "context.h"

+#include "imports.h"

+#include "macros.h"

+#include "state.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_accum

+

+

+void GLAPIENTRY

+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )

+{

+   GLfloat tmp[4];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   tmp[0] = CLAMP( red,   -1.0F, 1.0F );

+   tmp[1] = CLAMP( green, -1.0F, 1.0F );

+   tmp[2] = CLAMP( blue,  -1.0F, 1.0F );

+   tmp[3] = CLAMP( alpha, -1.0F, 1.0F );

+

+   if (TEST_EQ_4V(tmp, ctx->Accum.ClearColor))

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_ACCUM);

+   COPY_4FV( ctx->Accum.ClearColor, tmp );

+}

+

+

+static void GLAPIENTRY

+_mesa_Accum( GLenum op, GLfloat value )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   switch (op) {

+   case GL_ADD:

+   case GL_MULT:

+   case GL_ACCUM:

+   case GL_LOAD:

+   case GL_RETURN:

+      /* OK */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glAccum(op)");

+      return;

+   }

+

+   if (ctx->DrawBuffer->Visual.haveAccumBuffer == 0) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(no accum buffer)");

+      return;

+   }

+

+   if (ctx->DrawBuffer != ctx->ReadBuffer) {

+      /* See GLX_SGI_make_current_read or WGL_ARB_make_current_read,

+       * or GL_EXT_framebuffer_blit.

+       */

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glAccum(different read/draw buffers)");

+      return;

+   }

+

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                  "glAccum(incomplete framebuffer)");

+      return;

+   }

+

+   if (ctx->RenderMode == GL_RENDER) {

+      ctx->Driver.Accum(ctx, op, value);

+   }

+}

+

+

+void

+_mesa_init_accum_dispatch(struct _glapi_table *disp)

+{

+   SET_Accum(disp, _mesa_Accum);

+   SET_ClearAccum(disp, _mesa_ClearAccum);

+}

+

+

+#endif /* FEATURE_accum */

+

+

+void 

+_mesa_init_accum( struct gl_context *ctx )

+{

+   /* Accumulate buffer group */

+   ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );

+}

diff --git a/mesalib/src/mesa/main/accum.h b/mesalib/src/mesa/main/accum.h
index 4b628bafa..bcd91bd53 100644
--- a/mesalib/src/mesa/main/accum.h
+++ b/mesalib/src/mesa/main/accum.h
@@ -1,72 +1,75 @@
-/**
- * \file accum.h
- * Accumulation buffer operations.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 ACCUM_H
-#define ACCUM_H
-
-
-#include "main/mtypes.h"
-
-#if FEATURE_accum
-
-extern void GLAPIENTRY
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-
-extern void
-_mesa_init_accum_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_accum */
-
-#include "main/compiler.h"
-
-static INLINE void
-_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
-{
-   /* this is used in _mesa_PopAttrib */
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_init_accum_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_accum */
-
-extern void
-_mesa_init_accum( GLcontext *ctx );
-
-#endif /* ACCUM_H */
+/**

+ * \file accum.h

+ * Accumulation buffer operations.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 ACCUM_H

+#define ACCUM_H

+

+#include "main/glheader.h"

+#include "main/mfeatures.h"

+

+struct _glapi_table;

+struct gl_context;

+

+#if FEATURE_accum

+

+extern void GLAPIENTRY

+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );

+

+extern void

+_mesa_init_accum_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_accum */

+

+#include "main/compiler.h"

+

+static INLINE void

+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )

+{

+   /* this is used in _mesa_PopAttrib */

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_init_accum_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_accum */

+

+extern void

+_mesa_init_accum( struct gl_context *ctx );

+

+#endif /* ACCUM_H */

diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c
index ffcd19424..98ae3cff7 100644
--- a/mesalib/src/mesa/main/api_arrayelt.c
+++ b/mesalib/src/mesa/main/api_arrayelt.c
@@ -1,1332 +1,1708 @@
-/*
- * 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.
- */
-
-/* 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 "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 )
-
-
-#if FEATURE_arrayelt
-
-
-static const int ColorFuncs[2][8] = {
-   {
-      _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][8] = {
-   {
-      -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[8] = {
-   -1,
-   _gloffset_Indexubv,
-   _gloffset_Indexsv,
-   -1,
-   _gloffset_Indexiv,
-   -1,
-   _gloffset_Indexfv,
-   _gloffset_Indexdv,
-};
-
-static const int NormalFuncs[8] = {
-   _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[8];
-static int FogCoordFuncs[8];
-
-
-/**
- ** 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][8] = {
-   {
-      /* 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));
-}
-
-
-/*
- * Array [size][type] of VertexAttrib functions
- */
-static attrib_func AttribFuncsARB[2][4][8] = {
-   {
-      /* 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
-      }
-   }
-};
-
-/**********************************************************************/
-
-
-GLboolean _ae_create_context( GLcontext *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( GLcontext *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( GLcontext *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 {
-            at->func = AttribFuncsARB[at->array->Normalized]
-                                     [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( GLcontext *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( GLcontext *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 );
-   }
-
-   do_map = actx->nr_vbos && !actx->mapped_vbos;
-
-   /* 
-    */
-   if (do_map)
-      _ae_map_vbos(ctx);
-   
-   /* generic attributes */
-   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 );
-   }
-
-   /* conventional arrays */
-   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( GLcontext *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 "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

+VertexAttrib1NbvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NbvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3bvNV(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0]),

+                                          UBYTE_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3ubvNV(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NsvNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NsvNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0]),

+                                          SHORT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3svNV(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NusvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NusvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+			     USHORT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3usvNV(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3ivNV(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NuivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fNV(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NuivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+                                          UINT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fNV(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                          (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3uivNV(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib3fNV(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1],

+                                          (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib1fvNV(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib2fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib2fvNV(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib3fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib3fvNV(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib4fvNV(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib4fvNV(GET_DISPATCH(), (index, v));

+}

+

+/* GL_DOUBLE attributes */

+

+static void

+VertexAttrib1dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib1dvNV(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib2dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib2dvNV(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib3dvNV(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib3dvNV(GET_DISPATCH(), (index, v));

+}

+

+static void

+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

+VertexAttrib1NbvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NbvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3bvARB(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UBYTE_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,

+                                           UBYTE_TO_FLOAT(v[0]),

+                                           UBYTE_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,

+                                           (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3ubvARB(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,

+                                           (GLfloat)v[0],

+                                           (GLfloat)v[1],

+                                           (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NsvARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, SHORT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NsvARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(),

+                          (index, SHORT_TO_FLOAT(v[0]),

+                           SHORT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(),

+                          (index, (GLfloat)v[0], (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3svARB(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(),

+                          (index,

+                           (GLfloat)v[0], (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NusvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NusvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, USHORT_TO_FLOAT(v[0]),

+			     USHORT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3usvARB(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, INT_TO_FLOAT(v[0]),

+					       INT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3ivARB(GLuint index, const GLint *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1NuivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0])));

+}

+

+static void

+VertexAttrib1uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib1fARB(GET_DISPATCH(), (index, (GLfloat)v[0]));

+}

+

+static void

+VertexAttrib2NuivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, UINT_TO_FLOAT(v[0]),

+                                           UINT_TO_FLOAT(v[1])));

+}

+

+static void

+VertexAttrib2uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib2fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1]));

+}

+

+static void

+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

+VertexAttrib3uivARB(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttrib3fARB(GET_DISPATCH(), (index, (GLfloat)v[0],

+                                           (GLfloat)v[1], (GLfloat)v[2]));

+}

+

+static void

+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

+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

+VertexAttrib1fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib1fvARB(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib2fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib2fvARB(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib3fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib3fvARB(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib4fvARB(GLuint index, const GLfloat *v)

+{

+   CALL_VertexAttrib4fvARB(GET_DISPATCH(), (index, v));

+}

+

+/* GL_DOUBLE attributes */

+

+static void

+VertexAttrib1dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib2dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib3dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));

+}

+

+static void

+VertexAttrib4dvARB(GLuint index, const GLdouble *v)

+{

+   CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));

+}

+

+

+/**

+ * Integer-valued attributes

+ */

+static void

+VertexAttribI1bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void

+VertexAttribI2bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void

+VertexAttribI3bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void

+VertexAttribI4bv(GLuint index, const GLbyte *v)

+{

+   CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));

+}

+

+

+static void

+VertexAttribI1ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void

+VertexAttribI2ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void

+VertexAttribI3ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void

+VertexAttribI4ubv(GLuint index, const GLubyte *v)

+{

+   CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));

+}

+

+

+

+static void

+VertexAttribI1sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void

+VertexAttribI2sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void

+VertexAttribI3sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void

+VertexAttribI4sv(GLuint index, const GLshort *v)

+{

+   CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));

+}

+

+

+static void

+VertexAttribI1usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void

+VertexAttribI2usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void

+VertexAttribI3usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void

+VertexAttribI4usv(GLuint index, const GLushort *v)

+{

+   CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));

+}

+

+

+

+static void

+VertexAttribI1iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void

+VertexAttribI2iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI2iEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void

+VertexAttribI3iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI3iEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void

+VertexAttribI4iv(GLuint index, const GLint *v)

+{

+   CALL_VertexAttribI4ivEXT(GET_DISPATCH(), (index, v));

+}

+

+

+static void

+VertexAttribI1uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index, v[0]));

+}

+

+static void

+VertexAttribI2uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (index, v[0], v[1]));

+}

+

+static void

+VertexAttribI3uiv(GLuint index, const GLuint *v)

+{

+   CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (index, v[0], v[1], v[2]));

+}

+

+static void

+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_arrayelt.h b/mesalib/src/mesa/main/api_arrayelt.h
index d18c0792c..1e5c6dee0 100644
--- a/mesalib/src/mesa/main/api_arrayelt.h
+++ b/mesalib/src/mesa/main/api_arrayelt.h
@@ -1,83 +1,83 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 API_ARRAYELT_H
-#define API_ARRAYELT_H
-
-
-#include "main/mtypes.h"
-
-#if FEATURE_arrayelt
-
-#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl)     \
-   do {                                            \
-      (vfmt)->ArrayElement = impl ## ArrayElement; \
-   } while (0)
-
-extern GLboolean _ae_create_context( GLcontext *ctx );
-extern void _ae_destroy_context( GLcontext *ctx );
-extern void _ae_invalidate_state( GLcontext *ctx, GLuint new_state );
-extern void GLAPIENTRY _ae_ArrayElement( GLint elt );
-
-/* May optionally be called before a batch of element calls:
- */
-extern void _ae_map_vbos( GLcontext *ctx );
-extern void _ae_unmap_vbos( GLcontext *ctx );
-
-extern void
-_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
-                              const GLvertexformat *vfmt);
-
-#else /* FEATURE_arrayelt */
-
-#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0)
-
-static INLINE GLboolean
-_ae_create_context( GLcontext *ctx )
-{
-   return GL_TRUE;
-}
-
-static INLINE void
-_ae_destroy_context( GLcontext *ctx )
-{
-}
-
-static INLINE void
-_ae_invalidate_state( GLcontext *ctx, GLuint new_state )
-{
-}
-
-static INLINE void
-_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
-                              const GLvertexformat *vfmt)
-{
-}
-
-#endif /* FEATURE_arrayelt */
-
-
-#endif /* API_ARRAYELT_H */
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 API_ARRAYELT_H

+#define API_ARRAYELT_H

+

+

+#include "main/mtypes.h"

+

+#if FEATURE_arrayelt

+

+#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl)     \

+   do {                                            \

+      (vfmt)->ArrayElement = impl ## ArrayElement; \

+   } while (0)

+

+extern GLboolean _ae_create_context( struct gl_context *ctx );

+extern void _ae_destroy_context( struct gl_context *ctx );

+extern void _ae_invalidate_state( struct gl_context *ctx, GLuint new_state );

+extern void GLAPIENTRY _ae_ArrayElement( GLint elt );

+

+/* May optionally be called before a batch of element calls:

+ */

+extern void _ae_map_vbos( struct gl_context *ctx );

+extern void _ae_unmap_vbos( struct gl_context *ctx );

+

+extern void

+_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,

+                              const GLvertexformat *vfmt);

+

+#else /* FEATURE_arrayelt */

+

+#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0)

+

+static INLINE GLboolean

+_ae_create_context( struct gl_context *ctx )

+{

+   return GL_TRUE;

+}

+

+static INLINE void

+_ae_destroy_context( struct gl_context *ctx )

+{

+}

+

+static INLINE void

+_ae_invalidate_state( struct gl_context *ctx, GLuint new_state )

+{

+}

+

+static INLINE void

+_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,

+                              const GLvertexformat *vfmt)

+{

+}

+

+#endif /* FEATURE_arrayelt */

+

+

+#endif /* API_ARRAYELT_H */

diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index c3c710f5e..af8383b6a 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -1,735 +1,714 @@
-/*
- * 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 api_exec.c
- * Initialize dispatch table with the immidiate mode functions.
- */
-
-
-#include "mfeatures.h"
-#include "accum.h"
-#include "api_loopback.h"
-#include "api_exec.h"
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "arbprogram.h"
-#endif
-#include "atifragshader.h"
-#include "attrib.h"
-#include "blend.h"
-#if FEATURE_ARB_vertex_buffer_object
-#include "bufferobj.h"
-#endif
-#include "arrayobj.h"
-#if FEATURE_draw_read_buffer
-#include "buffers.h"
-#endif
-#include "clear.h"
-#include "clip.h"
-#include "colortab.h"
-#include "condrender.h"
-#include "context.h"
-#include "convolve.h"
-#include "depth.h"
-#include "dlist.h"
-#include "drawpix.h"
-#include "rastpos.h"
-#include "enable.h"
-#include "eval.h"
-#include "get.h"
-#include "feedback.h"
-#include "fog.h"
-#if FEATURE_EXT_framebuffer_object
-#include "fbobject.h"
-#endif
-#include "framebuffer.h"
-#include "hint.h"
-#include "histogram.h"
-#include "imports.h"
-#include "light.h"
-#include "lines.h"
-#include "matrix.h"
-#include "multisample.h"
-#include "pixel.h"
-#include "pixelstore.h"
-#include "points.h"
-#include "polygon.h"
-#include "queryobj.h"
-#include "readpix.h"
-#include "scissor.h"
-#include "stencil.h"
-#include "texenv.h"
-#include "texgetimage.h"
-#include "teximage.h"
-#include "texgen.h"
-#include "texobj.h"
-#include "texparam.h"
-#include "texstate.h"
-#include "transformfeedback.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "viewport.h"
-#if FEATURE_NV_vertex_program
-#include "nvprogram.h"
-#endif
-#if FEATURE_NV_fragment_program
-#include "nvprogram.h"
-#endif
-#if FEATURE_ARB_shader_objects
-#include "shaderapi.h"
-#include "uniforms.h"
-#endif
-#include "syncobj.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_GL
-
-
-#ifdef _GLAPI_USE_REMAP_TABLE
-
-#define need_MESA_remap_table
-#include "main/remap.h"
-#include "main/remap_helper.h"
-
-/* This is shared across all APIs but We define this here since
- * desktop GL has the biggest remap table. */
-int driDispatchRemapTable[driDispatchRemapTable_size];
-
-/**
- * Map the functions which are already static.
- *
- * When a extension function are incorporated into the ABI, the
- * extension suffix is usually stripped.  Mapping such functions
- * makes sure the alternative names are available.
- *
- * Note that functions mapped by _mesa_init_remap_table() are
- * excluded.
- */
-void
-_mesa_map_static_functions(void)
-{
-   /* Remap static functions which have alternative names and are in the ABI.
-    * This is to be on the safe side.  glapi should have defined those names.
-    */
-   _mesa_map_function_array(MESA_alt_functions);
-}
-
-void
-_mesa_init_remap_table(void)
-{
-   _mesa_do_init_remap_table(_mesa_function_pool,
-			     driDispatchRemapTable_size,
-			     MESA_remap_table_functions);
-}
-
-#endif /* _GLAPI_USE_REMAP_TABLE */
-
-
-/**
- * Initialize a dispatch table with pointers to Mesa's immediate-mode
- * commands.
- *
- * Pointers to glBegin()/glEnd() object commands and a few others
- * are provided via the GLvertexformat interface.
- *
- * \param ctx  GL context to which \c exec belongs.
- * \param exec dispatch table.
- */
-struct _glapi_table *
-_mesa_create_exec_table(void)
-{
-   struct _glapi_table *exec;
-
-   exec = _mesa_alloc_dispatch_table(sizeof *exec);
-   if (exec == NULL)
-      return NULL;
-
-#if _HAVE_FULL_GL
-   _mesa_loopback_init_api_table( exec );
-#endif
-
-   /* load the dispatch slots we understand */
-   SET_AlphaFunc(exec, _mesa_AlphaFunc);
-   SET_BlendFunc(exec, _mesa_BlendFunc);
-   SET_Clear(exec, _mesa_Clear);
-   SET_ClearColor(exec, _mesa_ClearColor);
-   SET_ClearStencil(exec, _mesa_ClearStencil);
-   SET_ColorMask(exec, _mesa_ColorMask);
-   SET_CullFace(exec, _mesa_CullFace);
-   SET_Disable(exec, _mesa_Disable);
-#if FEATURE_draw_read_buffer
-   SET_DrawBuffer(exec, _mesa_DrawBuffer);
-   SET_ReadBuffer(exec, _mesa_ReadBuffer);
-#endif
-   SET_Enable(exec, _mesa_Enable);
-   SET_Finish(exec, _mesa_Finish);
-   SET_Flush(exec, _mesa_Flush);
-   SET_FrontFace(exec, _mesa_FrontFace);
-   SET_Frustum(exec, _mesa_Frustum);
-   SET_GetError(exec, _mesa_GetError);
-   SET_GetFloatv(exec, _mesa_GetFloatv);
-   SET_GetString(exec, _mesa_GetString);
-   SET_LineStipple(exec, _mesa_LineStipple);
-   SET_LineWidth(exec, _mesa_LineWidth);
-   SET_LoadIdentity(exec, _mesa_LoadIdentity);
-   SET_LoadMatrixf(exec, _mesa_LoadMatrixf);
-   SET_LogicOp(exec, _mesa_LogicOp);
-   SET_MatrixMode(exec, _mesa_MatrixMode);
-   SET_MultMatrixf(exec, _mesa_MultMatrixf);
-   SET_Ortho(exec, _mesa_Ortho);
-   SET_PixelStorei(exec, _mesa_PixelStorei);
-   SET_PopMatrix(exec, _mesa_PopMatrix);
-   SET_PushMatrix(exec, _mesa_PushMatrix);
-   SET_Rotatef(exec, _mesa_Rotatef);
-   SET_Scalef(exec, _mesa_Scalef);
-   SET_Scissor(exec, _mesa_Scissor);
-   SET_ShadeModel(exec, _mesa_ShadeModel);
-   SET_StencilFunc(exec, _mesa_StencilFunc);
-   SET_StencilMask(exec, _mesa_StencilMask);
-   SET_StencilOp(exec, _mesa_StencilOp);
-   SET_TexEnvfv(exec, _mesa_TexEnvfv);
-   SET_TexEnvi(exec, _mesa_TexEnvi);
-   SET_TexImage2D(exec, _mesa_TexImage2D);
-   SET_TexParameteri(exec, _mesa_TexParameteri);
-   SET_Translatef(exec, _mesa_Translatef);
-   SET_Viewport(exec, _mesa_Viewport);
-
-   _mesa_init_accum_dispatch(exec);
-   _mesa_init_dlist_dispatch(exec);
-
-   SET_ClearDepth(exec, _mesa_ClearDepth);
-   SET_ClearIndex(exec, _mesa_ClearIndex);
-   SET_ClipPlane(exec, _mesa_ClipPlane);
-   SET_ColorMaterial(exec, _mesa_ColorMaterial);
-   SET_CullParameterfvEXT(exec, _mesa_CullParameterfvEXT);
-   SET_CullParameterdvEXT(exec, _mesa_CullParameterdvEXT);
-   SET_DepthFunc(exec, _mesa_DepthFunc);
-   SET_DepthMask(exec, _mesa_DepthMask);
-   SET_DepthRange(exec, _mesa_DepthRange);
-
-   _mesa_init_drawpix_dispatch(exec);
-   _mesa_init_feedback_dispatch(exec);
-
-   SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
-   SET_Fogf(exec, _mesa_Fogf);
-   SET_Fogfv(exec, _mesa_Fogfv);
-   SET_Fogi(exec, _mesa_Fogi);
-   SET_Fogiv(exec, _mesa_Fogiv);
-   SET_GetClipPlane(exec, _mesa_GetClipPlane);
-   SET_GetBooleanv(exec, _mesa_GetBooleanv);
-   SET_GetDoublev(exec, _mesa_GetDoublev);
-   SET_GetIntegerv(exec, _mesa_GetIntegerv);
-   SET_GetLightfv(exec, _mesa_GetLightfv);
-   SET_GetLightiv(exec, _mesa_GetLightiv);
-   SET_GetMaterialfv(exec, _mesa_GetMaterialfv);
-   SET_GetMaterialiv(exec, _mesa_GetMaterialiv);
-   SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);
-   SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv);
-   SET_GetTexEnviv(exec, _mesa_GetTexEnviv);
-   SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv);
-   SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv);
-   SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv);
-   SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);
-   SET_GetTexImage(exec, _mesa_GetTexImage);
-   SET_Hint(exec, _mesa_Hint);
-   SET_IndexMask(exec, _mesa_IndexMask);
-   SET_IsEnabled(exec, _mesa_IsEnabled);
-   SET_LightModelf(exec, _mesa_LightModelf);
-   SET_LightModelfv(exec, _mesa_LightModelfv);
-   SET_LightModeli(exec, _mesa_LightModeli);
-   SET_LightModeliv(exec, _mesa_LightModeliv);
-   SET_Lightf(exec, _mesa_Lightf);
-   SET_Lightfv(exec, _mesa_Lightfv);
-   SET_Lighti(exec, _mesa_Lighti);
-   SET_Lightiv(exec, _mesa_Lightiv);
-   SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
-
-   _mesa_init_eval_dispatch(exec);
-
-   SET_MultMatrixd(exec, _mesa_MultMatrixd);
-
-   _mesa_init_pixel_dispatch(exec);
-
-   SET_PixelStoref(exec, _mesa_PixelStoref);
-   SET_PointSize(exec, _mesa_PointSize);
-   SET_PolygonMode(exec, _mesa_PolygonMode);
-   SET_PolygonOffset(exec, _mesa_PolygonOffset);
-   SET_PolygonStipple(exec, _mesa_PolygonStipple);
-
-   _mesa_init_attrib_dispatch(exec);
-   _mesa_init_rastpos_dispatch(exec);
-
-   SET_ReadPixels(exec, _mesa_ReadPixels);
-   SET_Rotated(exec, _mesa_Rotated);
-   SET_Scaled(exec, _mesa_Scaled);
-   SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT);
-   SET_TexEnvf(exec, _mesa_TexEnvf);
-   SET_TexEnviv(exec, _mesa_TexEnviv);
-
-   _mesa_init_texgen_dispatch(exec);
-
-   SET_TexImage1D(exec, _mesa_TexImage1D);
-   SET_TexParameterf(exec, _mesa_TexParameterf);
-   SET_TexParameterfv(exec, _mesa_TexParameterfv);
-   SET_TexParameteriv(exec, _mesa_TexParameteriv);
-   SET_Translated(exec, _mesa_Translated);
-
-   /* 1.1 */
-   SET_BindTexture(exec, _mesa_BindTexture);
-   SET_DeleteTextures(exec, _mesa_DeleteTextures);
-   SET_GenTextures(exec, _mesa_GenTextures);
-#if _HAVE_FULL_GL
-   SET_AreTexturesResident(exec, _mesa_AreTexturesResident);
-   SET_ColorPointer(exec, _mesa_ColorPointer);
-   SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D);
-   SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D);
-   SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D);
-   SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D);
-   SET_DisableClientState(exec, _mesa_DisableClientState);
-   SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer);
-   SET_EnableClientState(exec, _mesa_EnableClientState);
-   SET_GetPointerv(exec, _mesa_GetPointerv);
-   SET_IndexPointer(exec, _mesa_IndexPointer);
-   SET_InterleavedArrays(exec, _mesa_InterleavedArrays);
-   SET_IsTexture(exec, _mesa_IsTexture);
-   SET_NormalPointer(exec, _mesa_NormalPointer);
-   SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
-   SET_TexCoordPointer(exec, _mesa_TexCoordPointer);
-   SET_TexSubImage1D(exec, _mesa_TexSubImage1D);
-   SET_TexSubImage2D(exec, _mesa_TexSubImage2D);
-   SET_VertexPointer(exec, _mesa_VertexPointer);
-#endif
-
-   /* 1.2 */
-#if _HAVE_FULL_GL
-   SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D);
-   SET_TexImage3D(exec, _mesa_TexImage3D);
-   SET_TexSubImage3D(exec, _mesa_TexSubImage3D);
-#endif
-
-   /* OpenGL 1.2  GL_ARB_imaging */
-   SET_BlendColor(exec, _mesa_BlendColor);
-   SET_BlendEquation(exec, _mesa_BlendEquation);
-   SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
-
-   _mesa_init_colortable_dispatch(exec);
-   _mesa_init_convolve_dispatch(exec);
-   _mesa_init_histogram_dispatch(exec);
-
-   /* OpenGL 2.0 */
-   SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
-   SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);
-   SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);
-
-#if FEATURE_ARB_shader_objects
-   _mesa_init_shader_dispatch(exec);
-   _mesa_init_shader_uniform_dispatch(exec);
-#endif
-
-   /* 2. GL_EXT_blend_color */
-#if 0
-/*    SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */
-#endif
-
-   /* 3. GL_EXT_polygon_offset */
-#if _HAVE_FULL_GL
-   SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);
-#endif
-
-   /* 6. GL_EXT_texture3d */
-#if 0
-/*    SET_CopyTexSubImage3DEXT(exec, _mesa_CopyTexSubImage3D); */
-/*    SET_TexImage3DEXT(exec, _mesa_TexImage3DEXT); */
-/*    SET_TexSubImage3DEXT(exec, _mesa_TexSubImage3D); */
-#endif
-
-   /* 11. GL_EXT_histogram */
-#if 0
-   SET_GetHistogramEXT(exec, _mesa_GetHistogram);
-   SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv);
-   SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv);
-   SET_GetMinmaxEXT(exec, _mesa_GetMinmax);
-   SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv);
-   SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv);
-#endif
-
-   /* 14. SGI_color_table */
-#if 0
-   SET_ColorTableSGI(exec, _mesa_ColorTable);
-   SET_ColorSubTableSGI(exec, _mesa_ColorSubTable);
-   SET_GetColorTableSGI(exec, _mesa_GetColorTable);
-   SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv);
-   SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv);
-#endif
-
-   /* 30. GL_EXT_vertex_array */
-#if _HAVE_FULL_GL
-   SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT);
-   SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT);
-   SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT);
-   SET_NormalPointerEXT(exec, _mesa_NormalPointerEXT);
-   SET_TexCoordPointerEXT(exec, _mesa_TexCoordPointerEXT);
-   SET_VertexPointerEXT(exec, _mesa_VertexPointerEXT);
-#endif
-
-   /* 37. GL_EXT_blend_minmax */
-#if 0
-   SET_BlendEquationEXT(exec, _mesa_BlendEquationEXT);
-#endif
-
-   /* 54. GL_EXT_point_parameters */
-#if _HAVE_FULL_GL
-   SET_PointParameterfEXT(exec, _mesa_PointParameterf);
-   SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);
-#endif
-
-   /* 97. GL_EXT_compiled_vertex_array */
-#if _HAVE_FULL_GL
-   SET_LockArraysEXT(exec, _mesa_LockArraysEXT);
-   SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT);
-#endif
-
-   /* 148. GL_EXT_multi_draw_arrays */
-#if _HAVE_FULL_GL
-   SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT);
-#endif
-
-   /* 173. GL_INGR_blend_func_separate */
-#if _HAVE_FULL_GL
-   SET_BlendFuncSeparateEXT(exec, _mesa_BlendFuncSeparateEXT);
-#endif
-
-   /* 196. GL_MESA_resize_buffers */
-#if _HAVE_FULL_GL
-   SET_ResizeBuffersMESA(exec, _mesa_ResizeBuffersMESA);
-#endif
-
-   /* 197. GL_MESA_window_pos */
-   /* part of _mesa_init_rastpos_dispatch(exec); */
-
-   /* 200. GL_IBM_multimode_draw_arrays */
-#if _HAVE_FULL_GL
-   SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM);
-   SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM);
-#endif
-
-   /* 233. GL_NV_vertex_program */
-#if FEATURE_NV_vertex_program
-   SET_BindProgramNV(exec, _mesa_BindProgram);
-   SET_DeleteProgramsNV(exec, _mesa_DeletePrograms);
-   SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);
-   SET_GenProgramsNV(exec, _mesa_GenPrograms);
-   SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
-   SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
-   SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
-   SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
-   SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
-   SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);
-   SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);
-   SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);
-   SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV);
-   SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV);
-   SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
-   SET_IsProgramNV(exec, _mesa_IsProgramARB);
-   SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
-   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
-   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */
-   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */
-   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */
-   SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
-   SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
-   SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
-   SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);
-   /* glVertexAttrib*NV functions handled in api_loopback.c */
-#endif
-
-   /* 273. GL_APPLE_vertex_array_object */
-   SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE);
-   SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
-   SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
-   SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
-
-   /* 282. GL_NV_fragment_program */
-#if FEATURE_NV_fragment_program
-   SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);
-   SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);
-   SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);
-   SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);
-   SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);
-   SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);
-   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
-   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
-#endif
-
-   /* 262. GL_NV_point_sprite */
-#if _HAVE_FULL_GL
-   SET_PointParameteriNV(exec, _mesa_PointParameteri);
-   SET_PointParameterivNV(exec, _mesa_PointParameteriv);
-#endif
-
-   /* 268. GL_EXT_stencil_two_side */
-#if _HAVE_FULL_GL
-   SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);
-#endif
-
-   /* ???. GL_EXT_depth_bounds_test */
-   SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
-
-   /* 352. GL_EXT_transform_feedback */
-   _mesa_init_transform_feedback_dispatch(exec);
-
-   /* 364. GL_EXT_provoking_vertex */
-   SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT);
-
-   /* ARB 1. GL_ARB_multitexture */
-#if _HAVE_FULL_GL
-   SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB);
-   SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB);
-#endif
-
-   /* ARB 3. GL_ARB_transpose_matrix */
-#if _HAVE_FULL_GL
-   SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB);
-   SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB);
-   SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB);
-   SET_MultTransposeMatrixfARB(exec, _mesa_MultTransposeMatrixfARB);
-#endif
-
-   /* ARB 5. GL_ARB_multisample */
-#if _HAVE_FULL_GL
-   SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB);
-#endif
-
-   /* ARB 12. GL_ARB_texture_compression */
-#if _HAVE_FULL_GL
-   SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB);
-   SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB);
-   SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB);
-   SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB);
-   SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB);
-   SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB);
-   SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB);
-#endif
-
-   /* ARB 14. GL_ARB_point_parameters */
-   /* reuse EXT_point_parameters functions */
-
-   /* ARB 26. GL_ARB_vertex_program */
-   /* ARB 27. GL_ARB_fragment_program */
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */
-   /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */
-   /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */
-   /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */
-   /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */
-   /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */
-   /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */
-   /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */
-   /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */
-   /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */
-   /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */
-   /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */
-   /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */
-   /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */
-   /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */
-   /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */
-   /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */
-   /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */
-   /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */
-   /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */
-   /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */
-   /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */
-   /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */
-   /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */
-   /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */
-   /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */
-   /* glVertexAttrib4bvARB handled in api_loopback.c */
-   /* glVertexAttrib4ivARB handled in api_loopback.c */
-   /* glVertexAttrib4ubvARB handled in api_loopback.c */
-   /* glVertexAttrib4usvARB handled in api_loopback.c */
-   /* glVertexAttrib4uivARB handled in api_loopback.c */
-   /* glVertexAttrib4NbvARB handled in api_loopback.c */
-   /* glVertexAttrib4NsvARB handled in api_loopback.c */
-   /* glVertexAttrib4NivARB handled in api_loopback.c */
-   /* glVertexAttrib4NusvARB handled in api_loopback.c */
-   /* glVertexAttrib4NuivARB handled in api_loopback.c */
-   SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB);
-   SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB);
-   SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB);
-   SET_ProgramStringARB(exec, _mesa_ProgramStringARB);
-   /* glBindProgramARB aliases glBindProgramNV */
-   /* glDeleteProgramsARB aliases glDeleteProgramsNV */
-   /* glGenProgramsARB aliases glGenProgramsNV */
-   /* glIsProgramARB aliases glIsProgramNV */
-   SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB);
-   SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
-   SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
-   /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
-   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
-   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
-   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);
-   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);
-   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
-   SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB);
-   SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB);
-   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
-   SET_GetProgramivARB(exec, _mesa_GetProgramivARB);
-   SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB);
-#endif
-
-   /* ARB 28. GL_ARB_vertex_buffer_object */
-#if FEATURE_ARB_vertex_buffer_object
-   SET_BindBufferARB(exec, _mesa_BindBufferARB);
-   SET_BufferDataARB(exec, _mesa_BufferDataARB);
-   SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB);
-   SET_DeleteBuffersARB(exec, _mesa_DeleteBuffersARB);
-   SET_GenBuffersARB(exec, _mesa_GenBuffersARB);
-   SET_GetBufferParameterivARB(exec, _mesa_GetBufferParameterivARB);
-   SET_GetBufferPointervARB(exec, _mesa_GetBufferPointervARB);
-   SET_GetBufferSubDataARB(exec, _mesa_GetBufferSubDataARB);
-   SET_IsBufferARB(exec, _mesa_IsBufferARB);
-   SET_MapBufferARB(exec, _mesa_MapBufferARB);
-   SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);
-#endif
-
-   /* ARB 29. GL_ARB_occlusion_query */
-   _mesa_init_queryobj_dispatch(exec);
-
-   /* ARB 37. GL_ARB_draw_buffers */
-#if FEATURE_draw_read_buffer
-   SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
-#endif
-
-   /* GL_ARB_sync */
-   _mesa_init_sync_dispatch(exec);
-
-  /* GL_ATI_fragment_shader */
-   _mesa_init_ati_fragment_shader_dispatch(exec);
-
-  /* GL_ATI_envmap_bumpmap */
-   SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);
-   SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI);
-   SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI);
-   SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI);
-
-#if FEATURE_EXT_framebuffer_object
-   SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT);
-   SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT);
-   SET_DeleteRenderbuffersEXT(exec, _mesa_DeleteRenderbuffersEXT);
-   SET_GenRenderbuffersEXT(exec, _mesa_GenRenderbuffersEXT);
-   SET_RenderbufferStorageEXT(exec, _mesa_RenderbufferStorageEXT);
-   SET_GetRenderbufferParameterivEXT(exec, _mesa_GetRenderbufferParameterivEXT);
-   SET_IsFramebufferEXT(exec, _mesa_IsFramebufferEXT);
-   SET_BindFramebufferEXT(exec, _mesa_BindFramebufferEXT);
-   SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT);
-   SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT);
-   SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT);
-   SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT);
-   SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT);
-   SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT);
-   SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT);
-   SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT);
-   SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);
-#endif
-
-#if FEATURE_EXT_framebuffer_blit
-   SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);
-#endif
-
-   /* GL_EXT_gpu_program_parameters */
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT);
-   SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT);
-#endif
-
-   /* GL_MESA_texture_array / GL_EXT_texture_array */
-#if FEATURE_EXT_framebuffer_object
-   SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT);
-#endif
-
-   /* GL_ATI_separate_stencil */
-   SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
-
-#if FEATURE_ARB_framebuffer_object
-   /* The ARB_fbo functions are the union of
-    * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array
-    */
-   SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);
-#endif
-
-#if FEATURE_ARB_map_buffer_range
-   SET_MapBufferRange(exec, _mesa_MapBufferRange);
-   SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange);
-#endif
-
-   /* GL_ARB_copy_buffer */
-   SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);
-
-   /* GL_ARB_vertex_array_object */
-   SET_BindVertexArray(exec, _mesa_BindVertexArray);
-   SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
-
-   /* GL_EXT_draw_buffers2 */
-   SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed);
-   SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv);
-   SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv);
-   SET_EnableIndexedEXT(exec, _mesa_EnableIndexed);
-   SET_DisableIndexedEXT(exec, _mesa_DisableIndexed);
-   SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed);
-
-   /* GL_NV_conditional_render */
-   SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender);
-   SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender);
-
-#if FEATURE_OES_EGL_image
-   SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES);
-   SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES);
-#endif
-
-#if FEATURE_APPLE_object_purgeable
-   SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE);
-   SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE);
-   SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE);
-#endif
-
-#if FEATURE_ARB_geometry_shader4
-   SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB);
-   SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB);
-#endif
-
-
-   return exec;
-}
-
-#endif /* FEATURE_GL */
+/*

+ * 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 api_exec.c

+ * Initialize dispatch table with the immidiate mode functions.

+ */

+

+

+#include "mfeatures.h"

+#include "accum.h"

+#include "api_loopback.h"

+#include "api_exec.h"

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+#include "arbprogram.h"

+#endif

+#include "atifragshader.h"

+#include "attrib.h"

+#include "blend.h"

+#if FEATURE_ARB_vertex_buffer_object

+#include "bufferobj.h"

+#endif

+#include "arrayobj.h"

+#if FEATURE_draw_read_buffer

+#include "buffers.h"

+#endif

+#include "clear.h"

+#include "clip.h"

+#include "colortab.h"

+#include "condrender.h"

+#include "context.h"

+#include "convolve.h"

+#include "depth.h"

+#include "dlist.h"

+#include "drawpix.h"

+#include "rastpos.h"

+#include "enable.h"

+#include "eval.h"

+#include "get.h"

+#include "feedback.h"

+#include "fog.h"

+#if FEATURE_EXT_framebuffer_object

+#include "fbobject.h"

+#endif

+#include "framebuffer.h"

+#include "hint.h"

+#include "histogram.h"

+#include "imports.h"

+#include "light.h"

+#include "lines.h"

+#include "matrix.h"

+#include "multisample.h"

+#include "pixel.h"

+#include "pixelstore.h"

+#include "points.h"

+#include "polygon.h"

+#include "queryobj.h"

+#include "readpix.h"

+#include "scissor.h"

+#include "stencil.h"

+#include "texenv.h"

+#include "texgetimage.h"

+#include "teximage.h"

+#include "texgen.h"

+#include "texobj.h"

+#include "texparam.h"

+#include "texstate.h"

+#include "transformfeedback.h"

+#include "mtypes.h"

+#include "varray.h"

+#include "viewport.h"

+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program

+#include "nvprogram.h"

+#endif

+#if FEATURE_ARB_shader_objects

+#include "shaderapi.h"

+#include "uniforms.h"

+#endif

+#include "syncobj.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_GL

+

+

+/**

+ * Initialize a dispatch table with pointers to Mesa's immediate-mode

+ * commands.

+ *

+ * Pointers to glBegin()/glEnd() object commands and a few others

+ * are provided via the GLvertexformat interface.

+ *

+ * \param ctx  GL context to which \c exec belongs.

+ * \param exec dispatch table.

+ */

+struct _glapi_table *

+_mesa_create_exec_table(void)

+{

+   struct _glapi_table *exec;

+

+   exec = _mesa_alloc_dispatch_table(_gloffset_COUNT);

+   if (exec == NULL)

+      return NULL;

+

+#if _HAVE_FULL_GL

+   _mesa_loopback_init_api_table( exec );

+#endif

+

+   /* load the dispatch slots we understand */

+   SET_AlphaFunc(exec, _mesa_AlphaFunc);

+   SET_BlendFunc(exec, _mesa_BlendFunc);

+   SET_Clear(exec, _mesa_Clear);

+   SET_ClearColor(exec, _mesa_ClearColor);

+   SET_ClearStencil(exec, _mesa_ClearStencil);

+   SET_ColorMask(exec, _mesa_ColorMask);

+   SET_CullFace(exec, _mesa_CullFace);

+   SET_Disable(exec, _mesa_Disable);

+#if FEATURE_draw_read_buffer

+   SET_DrawBuffer(exec, _mesa_DrawBuffer);

+   SET_ReadBuffer(exec, _mesa_ReadBuffer);

+#endif

+   SET_Enable(exec, _mesa_Enable);

+   SET_Finish(exec, _mesa_Finish);

+   SET_Flush(exec, _mesa_Flush);

+   SET_FrontFace(exec, _mesa_FrontFace);

+   SET_Frustum(exec, _mesa_Frustum);

+   SET_GetError(exec, _mesa_GetError);

+   SET_GetFloatv(exec, _mesa_GetFloatv);

+   SET_GetString(exec, _mesa_GetString);

+   SET_LineStipple(exec, _mesa_LineStipple);

+   SET_LineWidth(exec, _mesa_LineWidth);

+   SET_LoadIdentity(exec, _mesa_LoadIdentity);

+   SET_LoadMatrixf(exec, _mesa_LoadMatrixf);

+   SET_LogicOp(exec, _mesa_LogicOp);

+   SET_MatrixMode(exec, _mesa_MatrixMode);

+   SET_MultMatrixf(exec, _mesa_MultMatrixf);

+   SET_Ortho(exec, _mesa_Ortho);

+   SET_PixelStorei(exec, _mesa_PixelStorei);

+   SET_PopMatrix(exec, _mesa_PopMatrix);

+   SET_PushMatrix(exec, _mesa_PushMatrix);

+   SET_Rotatef(exec, _mesa_Rotatef);

+   SET_Scalef(exec, _mesa_Scalef);

+   SET_Scissor(exec, _mesa_Scissor);

+   SET_ShadeModel(exec, _mesa_ShadeModel);

+   SET_StencilFunc(exec, _mesa_StencilFunc);

+   SET_StencilMask(exec, _mesa_StencilMask);

+   SET_StencilOp(exec, _mesa_StencilOp);

+   SET_TexEnvfv(exec, _mesa_TexEnvfv);

+   SET_TexEnvi(exec, _mesa_TexEnvi);

+   SET_TexImage2D(exec, _mesa_TexImage2D);

+   SET_TexParameteri(exec, _mesa_TexParameteri);

+   SET_Translatef(exec, _mesa_Translatef);

+   SET_Viewport(exec, _mesa_Viewport);

+

+   _mesa_init_accum_dispatch(exec);

+   _mesa_init_dlist_dispatch(exec);

+

+   SET_ClearDepth(exec, _mesa_ClearDepth);

+   SET_ClearIndex(exec, _mesa_ClearIndex);

+   SET_ClipPlane(exec, _mesa_ClipPlane);

+   SET_ColorMaterial(exec, _mesa_ColorMaterial);

+   SET_DepthFunc(exec, _mesa_DepthFunc);

+   SET_DepthMask(exec, _mesa_DepthMask);

+   SET_DepthRange(exec, _mesa_DepthRange);

+

+   _mesa_init_drawpix_dispatch(exec);

+   _mesa_init_feedback_dispatch(exec);

+

+   SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);

+   SET_Fogf(exec, _mesa_Fogf);

+   SET_Fogfv(exec, _mesa_Fogfv);

+   SET_Fogi(exec, _mesa_Fogi);

+   SET_Fogiv(exec, _mesa_Fogiv);

+   SET_GetClipPlane(exec, _mesa_GetClipPlane);

+   SET_GetBooleanv(exec, _mesa_GetBooleanv);

+   SET_GetDoublev(exec, _mesa_GetDoublev);

+   SET_GetIntegerv(exec, _mesa_GetIntegerv);

+   SET_GetLightfv(exec, _mesa_GetLightfv);

+   SET_GetLightiv(exec, _mesa_GetLightiv);

+   SET_GetMaterialfv(exec, _mesa_GetMaterialfv);

+   SET_GetMaterialiv(exec, _mesa_GetMaterialiv);

+   SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);

+   SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv);

+   SET_GetTexEnviv(exec, _mesa_GetTexEnviv);

+   SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv);

+   SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv);

+   SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv);

+   SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);

+   SET_GetTexImage(exec, _mesa_GetTexImage);

+   SET_Hint(exec, _mesa_Hint);

+   SET_IndexMask(exec, _mesa_IndexMask);

+   SET_IsEnabled(exec, _mesa_IsEnabled);

+   SET_LightModelf(exec, _mesa_LightModelf);

+   SET_LightModelfv(exec, _mesa_LightModelfv);

+   SET_LightModeli(exec, _mesa_LightModeli);

+   SET_LightModeliv(exec, _mesa_LightModeliv);

+   SET_Lightf(exec, _mesa_Lightf);

+   SET_Lightfv(exec, _mesa_Lightfv);

+   SET_Lighti(exec, _mesa_Lighti);

+   SET_Lightiv(exec, _mesa_Lightiv);

+   SET_LoadMatrixd(exec, _mesa_LoadMatrixd);

+

+   _mesa_init_eval_dispatch(exec);

+

+   SET_MultMatrixd(exec, _mesa_MultMatrixd);

+

+   _mesa_init_pixel_dispatch(exec);

+

+   SET_PixelStoref(exec, _mesa_PixelStoref);

+   SET_PointSize(exec, _mesa_PointSize);

+   SET_PolygonMode(exec, _mesa_PolygonMode);

+   SET_PolygonOffset(exec, _mesa_PolygonOffset);

+   SET_PolygonStipple(exec, _mesa_PolygonStipple);

+

+   _mesa_init_attrib_dispatch(exec);

+   _mesa_init_rastpos_dispatch(exec);

+

+   SET_ReadPixels(exec, _mesa_ReadPixels);

+   SET_Rotated(exec, _mesa_Rotated);

+   SET_Scaled(exec, _mesa_Scaled);

+   SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT);

+   SET_TexEnvf(exec, _mesa_TexEnvf);

+   SET_TexEnviv(exec, _mesa_TexEnviv);

+

+   _mesa_init_texgen_dispatch(exec);

+

+   SET_TexImage1D(exec, _mesa_TexImage1D);

+   SET_TexParameterf(exec, _mesa_TexParameterf);

+   SET_TexParameterfv(exec, _mesa_TexParameterfv);

+   SET_TexParameteriv(exec, _mesa_TexParameteriv);

+   SET_Translated(exec, _mesa_Translated);

+

+   /* 1.1 */

+   SET_BindTexture(exec, _mesa_BindTexture);

+   SET_DeleteTextures(exec, _mesa_DeleteTextures);

+   SET_GenTextures(exec, _mesa_GenTextures);

+#if _HAVE_FULL_GL

+   SET_AreTexturesResident(exec, _mesa_AreTexturesResident);

+   SET_ColorPointer(exec, _mesa_ColorPointer);

+   SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D);

+   SET_CopyTexImage2D(exec, _mesa_CopyTexImage2D);

+   SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D);

+   SET_CopyTexSubImage2D(exec, _mesa_CopyTexSubImage2D);

+   SET_DisableClientState(exec, _mesa_DisableClientState);

+   SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer);

+   SET_EnableClientState(exec, _mesa_EnableClientState);

+   SET_GetPointerv(exec, _mesa_GetPointerv);

+   SET_IndexPointer(exec, _mesa_IndexPointer);

+   SET_InterleavedArrays(exec, _mesa_InterleavedArrays);

+   SET_IsTexture(exec, _mesa_IsTexture);

+   SET_NormalPointer(exec, _mesa_NormalPointer);

+   SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);

+   SET_TexCoordPointer(exec, _mesa_TexCoordPointer);

+   SET_TexSubImage1D(exec, _mesa_TexSubImage1D);

+   SET_TexSubImage2D(exec, _mesa_TexSubImage2D);

+   SET_VertexPointer(exec, _mesa_VertexPointer);

+#endif

+

+   /* 1.2 */

+#if _HAVE_FULL_GL

+   SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D);

+   SET_TexImage3D(exec, _mesa_TexImage3D);

+   SET_TexSubImage3D(exec, _mesa_TexSubImage3D);

+#endif

+

+   /* OpenGL 1.2  GL_ARB_imaging */

+   SET_BlendColor(exec, _mesa_BlendColor);

+   SET_BlendEquation(exec, _mesa_BlendEquation);

+   SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);

+

+   _mesa_init_colortable_dispatch(exec);

+   _mesa_init_convolve_dispatch(exec);

+   _mesa_init_histogram_dispatch(exec);

+

+   /* OpenGL 2.0 */

+   SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);

+   SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);

+   SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);

+

+#if FEATURE_ARB_shader_objects

+   _mesa_init_shader_dispatch(exec);

+   _mesa_init_shader_uniform_dispatch(exec);

+#endif

+

+   /* 2. GL_EXT_blend_color */

+#if 0

+/*    SET_BlendColorEXT(exec, _mesa_BlendColorEXT); */

+#endif

+

+   /* 3. GL_EXT_polygon_offset */

+#if _HAVE_FULL_GL

+   SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);

+#endif

+

+   /* 6. GL_EXT_texture3d */

+#if 0

+/*    SET_CopyTexSubImage3DEXT(exec, _mesa_CopyTexSubImage3D); */

+/*    SET_TexImage3DEXT(exec, _mesa_TexImage3DEXT); */

+/*    SET_TexSubImage3DEXT(exec, _mesa_TexSubImage3D); */

+#endif

+

+   /* 11. GL_EXT_histogram */

+#if 0

+   SET_GetHistogramEXT(exec, _mesa_GetHistogram);

+   SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv);

+   SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv);

+   SET_GetMinmaxEXT(exec, _mesa_GetMinmax);

+   SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv);

+   SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv);

+#endif

+

+   /* 14. SGI_color_table */

+#if 0

+   SET_ColorTableSGI(exec, _mesa_ColorTable);

+   SET_ColorSubTableSGI(exec, _mesa_ColorSubTable);

+   SET_GetColorTableSGI(exec, _mesa_GetColorTable);

+   SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv);

+   SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv);

+#endif

+

+   /* 30. GL_EXT_vertex_array */

+#if _HAVE_FULL_GL

+   SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT);

+   SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT);

+   SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT);

+   SET_NormalPointerEXT(exec, _mesa_NormalPointerEXT);

+   SET_TexCoordPointerEXT(exec, _mesa_TexCoordPointerEXT);

+   SET_VertexPointerEXT(exec, _mesa_VertexPointerEXT);

+#endif

+

+   /* 37. GL_EXT_blend_minmax */

+#if 0

+   SET_BlendEquationEXT(exec, _mesa_BlendEquationEXT);

+#endif

+

+   /* 54. GL_EXT_point_parameters */

+#if _HAVE_FULL_GL

+   SET_PointParameterfEXT(exec, _mesa_PointParameterf);

+   SET_PointParameterfvEXT(exec, _mesa_PointParameterfv);

+#endif

+

+   /* 97. GL_EXT_compiled_vertex_array */

+#if _HAVE_FULL_GL

+   SET_LockArraysEXT(exec, _mesa_LockArraysEXT);

+   SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT);

+#endif

+

+   /* 148. GL_EXT_multi_draw_arrays */

+#if _HAVE_FULL_GL

+   SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT);

+#endif

+

+   /* 173. GL_INGR_blend_func_separate */

+#if _HAVE_FULL_GL

+   SET_BlendFuncSeparateEXT(exec, _mesa_BlendFuncSeparateEXT);

+#endif

+

+   /* 196. GL_MESA_resize_buffers */

+#if _HAVE_FULL_GL

+   SET_ResizeBuffersMESA(exec, _mesa_ResizeBuffersMESA);

+#endif

+

+   /* 197. GL_MESA_window_pos */

+   /* part of _mesa_init_rastpos_dispatch(exec); */

+

+   /* 200. GL_IBM_multimode_draw_arrays */

+#if _HAVE_FULL_GL

+   SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM);

+   SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM);

+#endif

+

+   /* 233. GL_NV_vertex_program */

+#if FEATURE_NV_vertex_program

+   SET_BindProgramNV(exec, _mesa_BindProgram);

+   SET_DeleteProgramsNV(exec, _mesa_DeletePrograms);

+   SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);

+   SET_GenProgramsNV(exec, _mesa_GenPrograms);

+   SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);

+   SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);

+   SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);

+   SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);

+   SET_GetProgramivNV(exec, _mesa_GetProgramivNV);

+   SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);

+   SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);

+   SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);

+   SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV);

+   SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV);

+   SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);

+   SET_IsProgramNV(exec, _mesa_IsProgramARB);

+   SET_LoadProgramNV(exec, _mesa_LoadProgramNV);

+   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */

+   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */

+   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */

+   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */

+   SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);

+   SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);

+   SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);

+   SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);

+   /* glVertexAttrib*NV functions handled in api_loopback.c */

+#endif

+

+   /* 273. GL_APPLE_vertex_array_object */

+   SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE);

+   SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);

+   SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);

+   SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);

+

+   /* 282. GL_NV_fragment_program */

+#if FEATURE_NV_fragment_program

+   SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);

+   SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);

+   SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);

+   SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);

+   SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);

+   SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);

+   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);

+   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);

+   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);

+   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);

+   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);

+   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);

+#endif

+

+   /* 262. GL_NV_point_sprite */

+#if _HAVE_FULL_GL

+   SET_PointParameteriNV(exec, _mesa_PointParameteri);

+   SET_PointParameterivNV(exec, _mesa_PointParameteriv);

+#endif

+

+   /* 268. GL_EXT_stencil_two_side */

+#if _HAVE_FULL_GL

+   SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);

+#endif

+

+   /* 285. GL_NV_primitive_restart */

+   SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex);

+

+   /* ???. GL_EXT_depth_bounds_test */

+   SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);

+

+   /* 352. GL_EXT_transform_feedback */

+   _mesa_init_transform_feedback_dispatch(exec);

+

+   /* 364. GL_EXT_provoking_vertex */

+   SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT);

+

+   /* ARB 1. GL_ARB_multitexture */

+#if _HAVE_FULL_GL

+   SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB);

+   SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB);

+#endif

+

+   /* ARB 3. GL_ARB_transpose_matrix */

+#if _HAVE_FULL_GL

+   SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB);

+   SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB);

+   SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB);

+   SET_MultTransposeMatrixfARB(exec, _mesa_MultTransposeMatrixfARB);

+#endif

+

+   /* ARB 5. GL_ARB_multisample */

+#if _HAVE_FULL_GL

+   SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB);

+#endif

+

+   /* ARB 12. GL_ARB_texture_compression */

+#if _HAVE_FULL_GL

+   SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB);

+   SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB);

+   SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB);

+   SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB);

+   SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB);

+   SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB);

+   SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB);

+#endif

+

+   /* ARB 14. GL_ARB_point_parameters */

+   /* reuse EXT_point_parameters functions */

+

+   /* ARB 26. GL_ARB_vertex_program */

+   /* ARB 27. GL_ARB_fragment_program */

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+   /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */

+   /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */

+   /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */

+   /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */

+   /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */

+   /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */

+   /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */

+   /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */

+   /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */

+   /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */

+   /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */

+   /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */

+   /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */

+   /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */

+   /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */

+   /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */

+   /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */

+   /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */

+   /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */

+   /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */

+   /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */

+   /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */

+   /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */

+   /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */

+   /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */

+   /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */

+   /* glVertexAttrib4bvARB handled in api_loopback.c */

+   /* glVertexAttrib4ivARB handled in api_loopback.c */

+   /* glVertexAttrib4ubvARB handled in api_loopback.c */

+   /* glVertexAttrib4usvARB handled in api_loopback.c */

+   /* glVertexAttrib4uivARB handled in api_loopback.c */

+   /* glVertexAttrib4NbvARB handled in api_loopback.c */

+   /* glVertexAttrib4NsvARB handled in api_loopback.c */

+   /* glVertexAttrib4NivARB handled in api_loopback.c */

+   /* glVertexAttrib4NusvARB handled in api_loopback.c */

+   /* glVertexAttrib4NuivARB handled in api_loopback.c */

+   SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB);

+   SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB);

+   SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB);

+   SET_ProgramStringARB(exec, _mesa_ProgramStringARB);

+   /* glBindProgramARB aliases glBindProgramNV */

+   /* glDeleteProgramsARB aliases glDeleteProgramsNV */

+   /* glGenProgramsARB aliases glGenProgramsNV */

+   /* glIsProgramARB aliases glIsProgramNV */

+   SET_GetVertexAttribdvARB(exec, _mesa_GetVertexAttribdvARB);

+   SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);

+   SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);

+   /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */

+   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);

+   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);

+   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);

+   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);

+   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);

+   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);

+   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);

+   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);

+   SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB);

+   SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB);

+   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);

+   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);

+   SET_GetProgramivARB(exec, _mesa_GetProgramivARB);

+   SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB);

+#endif

+

+   /* ARB 28. GL_ARB_vertex_buffer_object */

+#if FEATURE_ARB_vertex_buffer_object

+   SET_BindBufferARB(exec, _mesa_BindBufferARB);

+   SET_BufferDataARB(exec, _mesa_BufferDataARB);

+   SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB);

+   SET_DeleteBuffersARB(exec, _mesa_DeleteBuffersARB);

+   SET_GenBuffersARB(exec, _mesa_GenBuffersARB);

+   SET_GetBufferParameterivARB(exec, _mesa_GetBufferParameterivARB);

+   SET_GetBufferPointervARB(exec, _mesa_GetBufferPointervARB);

+   SET_GetBufferSubDataARB(exec, _mesa_GetBufferSubDataARB);

+   SET_IsBufferARB(exec, _mesa_IsBufferARB);

+   SET_MapBufferARB(exec, _mesa_MapBufferARB);

+   SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);

+#endif

+

+   /* ARB 29. GL_ARB_occlusion_query */

+   _mesa_init_queryobj_dispatch(exec);

+

+   /* ARB 37. GL_ARB_draw_buffers */

+#if FEATURE_draw_read_buffer

+   SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);

+#endif

+

+   /* GL_ARB_sync */

+   _mesa_init_sync_dispatch(exec);

+

+  /* GL_ATI_fragment_shader */

+   _mesa_init_ati_fragment_shader_dispatch(exec);

+

+  /* GL_ATI_envmap_bumpmap */

+   SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);

+   SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI);

+   SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI);

+   SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI);

+

+#if FEATURE_EXT_framebuffer_object

+   SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT);

+   SET_BindRenderbufferEXT(exec, _mesa_BindRenderbufferEXT);

+   SET_DeleteRenderbuffersEXT(exec, _mesa_DeleteRenderbuffersEXT);

+   SET_GenRenderbuffersEXT(exec, _mesa_GenRenderbuffersEXT);

+   SET_RenderbufferStorageEXT(exec, _mesa_RenderbufferStorageEXT);

+   SET_GetRenderbufferParameterivEXT(exec, _mesa_GetRenderbufferParameterivEXT);

+   SET_IsFramebufferEXT(exec, _mesa_IsFramebufferEXT);

+   SET_BindFramebufferEXT(exec, _mesa_BindFramebufferEXT);

+   SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT);

+   SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT);

+   SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT);

+   SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT);

+   SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT);

+   SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT);

+   SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT);

+   SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT);

+   SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);

+#endif

+

+#if FEATURE_EXT_framebuffer_blit

+   SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);

+#endif

+

+   /* GL_EXT_gpu_program_parameters */

+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

+   SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT);

+   SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT);

+#endif

+

+   /* GL_MESA_texture_array / GL_EXT_texture_array */

+#if FEATURE_EXT_framebuffer_object

+   SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT);

+#endif

+

+   /* GL_ATI_separate_stencil */

+   SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);

+

+#if FEATURE_ARB_framebuffer_object

+   /* The ARB_fbo functions are the union of

+    * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array

+    */

+   SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);

+#endif

+

+#if FEATURE_ARB_map_buffer_range

+   SET_MapBufferRange(exec, _mesa_MapBufferRange);

+   SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange);

+#endif

+

+   /* GL_ARB_copy_buffer */

+   SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);

+

+   /* GL_ARB_vertex_array_object */

+   SET_BindVertexArray(exec, _mesa_BindVertexArray);

+   SET_GenVertexArrays(exec, _mesa_GenVertexArrays);

+

+   /* GL_EXT_draw_buffers2 */

+   SET_ColorMaskIndexedEXT(exec, _mesa_ColorMaskIndexed);

+   SET_GetBooleanIndexedvEXT(exec, _mesa_GetBooleanIndexedv);

+   SET_GetIntegerIndexedvEXT(exec, _mesa_GetIntegerIndexedv);

+   SET_EnableIndexedEXT(exec, _mesa_EnableIndexed);

+   SET_DisableIndexedEXT(exec, _mesa_DisableIndexed);

+   SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed);

+

+   /* GL_NV_conditional_render */

+   SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender);

+   SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender);

+

+#if FEATURE_OES_EGL_image

+   SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES);

+   SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES);

+#endif

+

+#if FEATURE_APPLE_object_purgeable

+   SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE);

+   SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE);

+   SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE);

+#endif

+

+#if FEATURE_ARB_geometry_shader4

+   SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB);

+   SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB);

+#endif

+

+   /* GL_EXT_texture_integer */

+   SET_ClearColorIiEXT(exec, _mesa_ClearColorIiEXT);

+   SET_ClearColorIuiEXT(exec, _mesa_ClearColorIuiEXT);

+   SET_GetTexParameterIivEXT(exec, _mesa_GetTexParameterIiv);

+   SET_GetTexParameterIuivEXT(exec, _mesa_GetTexParameterIuiv);

+   SET_TexParameterIivEXT(exec, _mesa_TexParameterIiv);

+   SET_TexParameterIuivEXT(exec, _mesa_TexParameterIuiv);

+

+   /* GL_EXT_gpu_shader4 / OpenGL 3.0 */

+   SET_GetVertexAttribIivEXT(exec, _mesa_GetVertexAttribIiv);

+   SET_GetVertexAttribIuivEXT(exec, _mesa_GetVertexAttribIuiv);

+   SET_VertexAttribIPointerEXT(exec, _mesa_VertexAttribIPointer);

+

+   /* GL 3.0 (functions not covered by other extensions) */

+   SET_ClearBufferiv(exec, _mesa_ClearBufferiv);

+   SET_ClearBufferuiv(exec, _mesa_ClearBufferuiv);

+   SET_ClearBufferfv(exec, _mesa_ClearBufferfv);

+   SET_ClearBufferfi(exec, _mesa_ClearBufferfi);

+   SET_GetStringi(exec, _mesa_GetStringi);

+   SET_ClampColor(exec, _mesa_ClampColorARB);

+

+

+   return exec;

+}

+

+#endif /* FEATURE_GL */

diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c
index d1789069c..fb9d781f7 100644
--- a/mesalib/src/mesa/main/api_loopback.c
+++ b/mesalib/src/mesa/main/api_loopback.c
@@ -1,1838 +1,1725 @@
-/**
- * \file api_loopback.c
- *
- * \author Keith Whitwell <keith@tungstengraphics.com>
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * 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.
- */
-
-
-#include "glheader.h"
-#include "macros.h"
-#include "api_loopback.h"
-#include "mtypes.h"
-#include "glapi/glapi.h"
-#include "glapi/glapitable.h"
-#include "glapi/glthread.h"
-#include "main/dispatch.h"
-
-/* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
- * calls to a smaller set of driver-provided formats.  Currently just
- * go back to dispatch to find these (eg. call glNormal3f directly),
- * hence 'loopback'.
- *
- * The driver must supply all of the remaining entry points, which are
- * listed in dd.h.  The easiest way for a driver to do this is to
- * install the supplied software t&l module.
- */
-#define COLORF(r,g,b,a)             CALL_Color4f(GET_DISPATCH(), (r,g,b,a))
-#define VERTEX2(x,y)	            CALL_Vertex2f(GET_DISPATCH(), (x,y))
-#define VERTEX3(x,y,z)	            CALL_Vertex3f(GET_DISPATCH(), (x,y,z))
-#define VERTEX4(x,y,z,w)            CALL_Vertex4f(GET_DISPATCH(), (x,y,z,w))
-#define NORMAL(x,y,z)               CALL_Normal3f(GET_DISPATCH(), (x,y,z))
-#define TEXCOORD1(s)                CALL_TexCoord1f(GET_DISPATCH(), (s))
-#define TEXCOORD2(s,t)              CALL_TexCoord2f(GET_DISPATCH(), (s,t))
-#define TEXCOORD3(s,t,u)            CALL_TexCoord3f(GET_DISPATCH(), (s,t,u))
-#define TEXCOORD4(s,t,u,v)          CALL_TexCoord4f(GET_DISPATCH(), (s,t,u,v))
-#define INDEX(c)		    CALL_Indexf(GET_DISPATCH(), (c))
-#define MULTI_TEXCOORD1(z,s)	    CALL_MultiTexCoord1fARB(GET_DISPATCH(), (z,s))
-#define MULTI_TEXCOORD2(z,s,t)	    CALL_MultiTexCoord2fARB(GET_DISPATCH(), (z,s,t))
-#define MULTI_TEXCOORD3(z,s,t,u)    CALL_MultiTexCoord3fARB(GET_DISPATCH(), (z,s,t,u))
-#define MULTI_TEXCOORD4(z,s,t,u,v)  CALL_MultiTexCoord4fARB(GET_DISPATCH(), (z,s,t,u,v))
-#define EVALCOORD1(x)               CALL_EvalCoord1f(GET_DISPATCH(), (x))
-#define EVALCOORD2(x,y)             CALL_EvalCoord2f(GET_DISPATCH(), (x,y))
-#define MATERIALFV(a,b,c)           CALL_Materialfv(GET_DISPATCH(), (a,b,c))
-#define RECTF(a,b,c,d)              CALL_Rectf(GET_DISPATCH(), (a,b,c,d))
-
-#define ATTRIB1NV(index,x)          CALL_VertexAttrib1fNV(GET_DISPATCH(), (index,x))
-#define ATTRIB2NV(index,x,y)        CALL_VertexAttrib2fNV(GET_DISPATCH(), (index,x,y))
-#define ATTRIB3NV(index,x,y,z)      CALL_VertexAttrib3fNV(GET_DISPATCH(), (index,x,y,z))
-#define ATTRIB4NV(index,x,y,z,w)    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index,x,y,z,w))
-#define ATTRIB1ARB(index,x)         CALL_VertexAttrib1fARB(GET_DISPATCH(), (index,x))
-#define ATTRIB2ARB(index,x,y)       CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,x,y))
-#define ATTRIB3ARB(index,x,y,z)     CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,x,y,z))
-#define ATTRIB4ARB(index,x,y,z,w)   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index,x,y,z,w))
-#define FOGCOORDF(x)                CALL_FogCoordfEXT(GET_DISPATCH(), (x))
-#define SECONDARYCOLORF(a,b,c)      CALL_SecondaryColor3fEXT(GET_DISPATCH(), (a,b,c))
-
-
-#if FEATURE_beginend
-
-
-static void GLAPIENTRY
-loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
-{
-   COLORF( BYTE_TO_FLOAT(red),
-	   BYTE_TO_FLOAT(green),
-	   BYTE_TO_FLOAT(blue),
-	   1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue )
-{
-   COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3i_f( GLint red, GLint green, GLint blue )
-{
-   COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
-	   INT_TO_FLOAT(blue), 1.0);
-}
-
-static void GLAPIENTRY
-loopback_Color3s_f( GLshort red, GLshort green, GLshort blue )
-{
-   COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
-	   SHORT_TO_FLOAT(blue), 1.0);
-}
-
-static void GLAPIENTRY
-loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue )
-{
-   COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
-	   UINT_TO_FLOAT(blue), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3us_f( GLushort red, GLushort green, GLushort blue )
-{
-   COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
-	   USHORT_TO_FLOAT(blue), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )
-{
-   COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
-	   UBYTE_TO_FLOAT(blue), 1.0 );
-}
-
-
-static void GLAPIENTRY
-loopback_Color3bv_f( const GLbyte *v )
-{
-   COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
-	   BYTE_TO_FLOAT(v[2]), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3dv_f( const GLdouble *v )
-{
-   COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3iv_f( const GLint *v )
-{
-   COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
-	   INT_TO_FLOAT(v[2]), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3sv_f( const GLshort *v )
-{
-   COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
-	   SHORT_TO_FLOAT(v[2]), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3uiv_f( const GLuint *v )
-{
-   COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
-	   UINT_TO_FLOAT(v[2]), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3usv_f( const GLushort *v )
-{
-   COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
-	   USHORT_TO_FLOAT(v[2]), 1.0 );
-}
-
-static void GLAPIENTRY
-loopback_Color3ubv_f( const GLubyte *v )
-{
-   COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
-	   UBYTE_TO_FLOAT(v[2]), 1.0 );
-}
-
-
-static void GLAPIENTRY
-loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
-			      GLbyte alpha )
-{
-   COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green),
-	   BYTE_TO_FLOAT(blue), BYTE_TO_FLOAT(alpha) );
-}
-
-static void GLAPIENTRY
-loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
-			      GLdouble alpha )
-{
-   COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha );
-}
-
-static void GLAPIENTRY
-loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha )
-{
-   COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
-	   INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) );
-}
-
-static void GLAPIENTRY
-loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
-			      GLshort alpha )
-{
-   COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
-	   SHORT_TO_FLOAT(blue), SHORT_TO_FLOAT(alpha) );
-}
-
-static void GLAPIENTRY
-loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha )
-{
-   COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
-	   UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) );
-}
-
-static void GLAPIENTRY
-loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha )
-{
-   COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
-	   USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) );
-}
-
-static void GLAPIENTRY
-loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
-{
-   COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
-	   UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) );
-}
-
-
-static void GLAPIENTRY
-loopback_Color4iv_f( const GLint *v )
-{
-   COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
-	   INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );
-}
-
-
-static void GLAPIENTRY
-loopback_Color4bv_f( const GLbyte *v )
-{
-   COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
-	   BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) );
-}
-
-static void GLAPIENTRY
-loopback_Color4dv_f( const GLdouble *v )
-{
-   COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-
-static void GLAPIENTRY
-loopback_Color4sv_f( const GLshort *v)
-{
-   COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
-	   SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) );
-}
-
-
-static void GLAPIENTRY
-loopback_Color4uiv_f( const GLuint *v)
-{
-   COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
-	   UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) );
-}
-
-static void GLAPIENTRY
-loopback_Color4usv_f( const GLushort *v)
-{
-   COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
-	   USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) );
-}
-
-static void GLAPIENTRY
-loopback_Color4ubv_f( const GLubyte *v)
-{
-   COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
-	   UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) );
-}
-
-
-static void GLAPIENTRY
-loopback_FogCoorddEXT( GLdouble d )
-{
-   FOGCOORDF( (GLfloat) d );
-}
-
-static void GLAPIENTRY
-loopback_FogCoorddvEXT( const GLdouble *v )
-{
-   FOGCOORDF( (GLfloat) *v );
-}
-
-
-static void GLAPIENTRY
-loopback_Indexd( GLdouble c )
-{
-   INDEX( (GLfloat) c );
-}
-
-static void GLAPIENTRY
-loopback_Indexi( GLint c )
-{
-   INDEX( (GLfloat) c );
-}
-
-static void GLAPIENTRY
-loopback_Indexs( GLshort c )
-{
-   INDEX( (GLfloat) c );
-}
-
-static void GLAPIENTRY
-loopback_Indexub( GLubyte c )
-{
-   INDEX( (GLfloat) c );
-}
-
-static void GLAPIENTRY
-loopback_Indexdv( const GLdouble *c )
-{
-   INDEX( (GLfloat) *c );
-}
-
-static void GLAPIENTRY
-loopback_Indexiv( const GLint *c )
-{
-   INDEX( (GLfloat) *c );
-}
-
-static void GLAPIENTRY
-loopback_Indexsv( const GLshort *c )
-{
-   INDEX( (GLfloat) *c );
-}
-
-static void GLAPIENTRY
-loopback_Indexubv( const GLubyte *c )
-{
-   INDEX( (GLfloat) *c );
-}
-
-
-static void GLAPIENTRY
-loopback_EdgeFlagv(const GLboolean *flag)
-{
-   CALL_EdgeFlag(GET_DISPATCH(), (*flag));
-}
-
-
-static void GLAPIENTRY
-loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )
-{
-   NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) );
-}
-
-static void GLAPIENTRY
-loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )
-{
-   NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz);
-}
-
-static void GLAPIENTRY
-loopback_Normal3i( GLint nx, GLint ny, GLint nz )
-{
-   NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) );
-}
-
-static void GLAPIENTRY
-loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz )
-{
-   NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) );
-}
-
-static void GLAPIENTRY
-loopback_Normal3bv( const GLbyte *v )
-{
-   NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) );
-}
-
-static void GLAPIENTRY
-loopback_Normal3dv( const GLdouble *v )
-{
-   NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_Normal3iv( const GLint *v )
-{
-   NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) );
-}
-
-static void GLAPIENTRY
-loopback_Normal3sv( const GLshort *v )
-{
-   NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) );
-}
-
-static void GLAPIENTRY
-loopback_TexCoord1d( GLdouble s )
-{
-   TEXCOORD1((GLfloat) s);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord1i( GLint s )
-{
-   TEXCOORD1((GLfloat) s);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord1s( GLshort s )
-{
-   TEXCOORD1((GLfloat) s);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord2d( GLdouble s, GLdouble t )
-{
-   TEXCOORD2((GLfloat) s,(GLfloat) t);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord2s( GLshort s, GLshort t )
-{
-   TEXCOORD2((GLfloat) s,(GLfloat) t);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord2i( GLint s, GLint t )
-{
-   TEXCOORD2((GLfloat) s,(GLfloat) t);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )
-{
-   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord3i( GLint s, GLint t, GLint r )
-{
-   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord3s( GLshort s, GLshort t, GLshort r )
-{
-   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )
-{
-   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q )
-{
-   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )
-{
-   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord1dv( const GLdouble *v )
-{
-   TEXCOORD1((GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord1iv( const GLint *v )
-{
-   TEXCOORD1((GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord1sv( const GLshort *v )
-{
-   TEXCOORD1((GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord2dv( const GLdouble *v )
-{
-   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord2iv( const GLint *v )
-{
-   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord2sv( const GLshort *v )
-{
-   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord3dv( const GLdouble *v )
-{
-   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord3iv( const GLint *v )
-{
-   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord3sv( const GLshort *v )
-{
-   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord4dv( const GLdouble *v )
-{
-   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord4iv( const GLint *v )
-{
-   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_TexCoord4sv( const GLshort *v )
-{
-   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_Vertex2d( GLdouble x, GLdouble y )
-{
-   VERTEX2( (GLfloat) x, (GLfloat) y );
-}
-
-static void GLAPIENTRY
-loopback_Vertex2i( GLint x, GLint y )
-{
-   VERTEX2( (GLfloat) x, (GLfloat) y );
-}
-
-static void GLAPIENTRY
-loopback_Vertex2s( GLshort x, GLshort y )
-{
-   VERTEX2( (GLfloat) x, (GLfloat) y );
-}
-
-static void GLAPIENTRY
-loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z )
-{
-   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
-}
-
-static void GLAPIENTRY
-loopback_Vertex3i( GLint x, GLint y, GLint z )
-{
-   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
-}
-
-static void GLAPIENTRY
-loopback_Vertex3s( GLshort x, GLshort y, GLshort z )
-{
-   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
-}
-
-static void GLAPIENTRY
-loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )
-{
-   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
-}
-
-static void GLAPIENTRY
-loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w )
-{
-   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
-}
-
-static void GLAPIENTRY
-loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )
-{
-   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
-}
-
-static void GLAPIENTRY
-loopback_Vertex2dv( const GLdouble *v )
-{
-   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex2iv( const GLint *v )
-{
-   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex2sv( const GLshort *v )
-{
-   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex3dv( const GLdouble *v )
-{
-   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex3iv( const GLint *v )
-{
-   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex3sv( const GLshort *v )
-{
-   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex4dv( const GLdouble *v )
-{
-   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
-	    (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex4iv( const GLint *v )
-{
-   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
-	    (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-static void GLAPIENTRY
-loopback_Vertex4sv( const GLshort *v )
-{
-   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
-	    (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord1dARB(GLenum target, GLdouble s)
-{
-   MULTI_TEXCOORD1( target, (GLfloat) s );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v)
-{
-   MULTI_TEXCOORD1( target, (GLfloat) v[0] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord1iARB(GLenum target, GLint s)
-{
-   MULTI_TEXCOORD1( target, (GLfloat) s );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v)
-{
-   MULTI_TEXCOORD1( target, (GLfloat) v[0] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord1sARB(GLenum target, GLshort s)
-{
-   MULTI_TEXCOORD1( target, (GLfloat) s );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v)
-{
-   MULTI_TEXCOORD1( target, (GLfloat) v[0] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t)
-{
-   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v)
-{
-   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t)
-{
-   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v)
-{
-   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t)
-{
-   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v)
-{
-   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r)
-{
-   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v)
-{
-   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r)
-{
-   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v)
-{
-   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r)
-{
-   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v)
-{
-   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
-{
-   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, 
-		    (GLfloat) r, (GLfloat) q );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v)
-{
-   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], 
-		    (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q)
-{
-   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
-		    (GLfloat) r, (GLfloat) q );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v)
-{
-   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
-		    (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
-{
-   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
-		    (GLfloat) r, (GLfloat) q );
-}
-
-static void GLAPIENTRY
-loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v)
-{
-   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
-		    (GLfloat) v[2], (GLfloat) v[3] );
-}
-
-static void GLAPIENTRY
-loopback_EvalCoord2dv( const GLdouble *u )
-{
-   EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );
-}
-
-static void GLAPIENTRY
-loopback_EvalCoord2fv( const GLfloat *u )
-{
-   EVALCOORD2( u[0], u[1] );
-}
-
-static void GLAPIENTRY
-loopback_EvalCoord2d( GLdouble u, GLdouble v )
-{
-   EVALCOORD2( (GLfloat) u, (GLfloat) v );
-}
-
-static void GLAPIENTRY
-loopback_EvalCoord1dv( const GLdouble *u )
-{
-   EVALCOORD1( (GLfloat) *u );
-}
-
-static void GLAPIENTRY
-loopback_EvalCoord1fv( const GLfloat *u )
-{
-   EVALCOORD1( (GLfloat) *u );
-}
-
-static void GLAPIENTRY
-loopback_EvalCoord1d( GLdouble u )
-{
-   EVALCOORD1( (GLfloat) u );
-}
-
-static void GLAPIENTRY
-loopback_Materialf( GLenum face, GLenum pname, GLfloat param )
-{
-   GLfloat fparam[4];
-   fparam[0] = param;
-   MATERIALFV( face, pname, fparam );
-}
-
-static void GLAPIENTRY
-loopback_Materiali(GLenum face, GLenum pname, GLint param )
-{
-   GLfloat p = (GLfloat) param;
-   MATERIALFV(face, pname, &p);
-}
-
-static void GLAPIENTRY
-loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )
-{
-   GLfloat fparam[4];
-   switch (pname) {
-   case GL_AMBIENT:
-   case GL_DIFFUSE:
-   case GL_SPECULAR:
-   case GL_EMISSION:
-   case GL_AMBIENT_AND_DIFFUSE:
-      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_SHININESS:
-      fparam[0] = (GLfloat) params[0];
-      break;
-   case GL_COLOR_INDEXES:
-      fparam[0] = (GLfloat) params[0];
-      fparam[1] = (GLfloat) params[1];
-      fparam[2] = (GLfloat) params[2];
-      break;
-   default:
-      ;
-   }
-   MATERIALFV(face, pname, fparam);
-}
-
-
-static void GLAPIENTRY
-loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
-{
-   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
-}
-
-static void GLAPIENTRY
-loopback_Rectdv(const GLdouble *v1, const GLdouble *v2)
-{
-   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
-}
-
-static void GLAPIENTRY
-loopback_Rectfv(const GLfloat *v1, const GLfloat *v2)
-{
-   RECTF(v1[0], v1[1], v2[0], v2[1]);
-}
-
-static void GLAPIENTRY
-loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
-{
-   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
-}
-
-static void GLAPIENTRY
-loopback_Rectiv(const GLint *v1, const GLint *v2)
-{
-   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
-}
-
-static void GLAPIENTRY
-loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
-{
-   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
-}
-
-static void GLAPIENTRY
-loopback_Rectsv(const GLshort *v1, const GLshort *v2)
-{
-   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )
-{
-   SECONDARYCOLORF( BYTE_TO_FLOAT(red),
-		    BYTE_TO_FLOAT(green),
-		    BYTE_TO_FLOAT(blue) );
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue )
-{
-   SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue );
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )
-{
-   SECONDARYCOLORF( INT_TO_FLOAT(red),
-		    INT_TO_FLOAT(green),
-		    INT_TO_FLOAT(blue));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )
-{
-   SECONDARYCOLORF(SHORT_TO_FLOAT(red),
-                   SHORT_TO_FLOAT(green),
-                   SHORT_TO_FLOAT(blue));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )
-{
-   SECONDARYCOLORF(UINT_TO_FLOAT(red),
-                   UINT_TO_FLOAT(green),
-                   UINT_TO_FLOAT(blue));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )
-{
-   SECONDARYCOLORF(USHORT_TO_FLOAT(red),
-                   USHORT_TO_FLOAT(green),
-                   USHORT_TO_FLOAT(blue));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )
-{
-   SECONDARYCOLORF(UBYTE_TO_FLOAT(red),
-                   UBYTE_TO_FLOAT(green),
-                   UBYTE_TO_FLOAT(blue));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3bvEXT_f( const GLbyte *v )
-{
-   SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]),
-                   BYTE_TO_FLOAT(v[1]),
-                   BYTE_TO_FLOAT(v[2]));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3dvEXT_f( const GLdouble *v )
-{
-   SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
-}
-static void GLAPIENTRY
-loopback_SecondaryColor3ivEXT_f( const GLint *v )
-{
-   SECONDARYCOLORF(INT_TO_FLOAT(v[0]),
-                   INT_TO_FLOAT(v[1]),
-                   INT_TO_FLOAT(v[2]));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3svEXT_f( const GLshort *v )
-{
-   SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]),
-                   SHORT_TO_FLOAT(v[1]),
-                   SHORT_TO_FLOAT(v[2]));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3uivEXT_f( const GLuint *v )
-{
-   SECONDARYCOLORF(UINT_TO_FLOAT(v[0]),
-                   UINT_TO_FLOAT(v[1]),
-                   UINT_TO_FLOAT(v[2]));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3usvEXT_f( const GLushort *v )
-{
-   SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]),
-                   USHORT_TO_FLOAT(v[1]),
-                   USHORT_TO_FLOAT(v[2]));
-}
-
-static void GLAPIENTRY
-loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )
-{
-   SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]),
-                   UBYTE_TO_FLOAT(v[1]),
-                   UBYTE_TO_FLOAT(v[2]));
-}
-
-
-/*
- * GL_NV_vertex_program:
- * Always loop-back to one of the VertexAttrib[1234]f[v]NV functions.
- */
-
-static void GLAPIENTRY
-loopback_VertexAttrib1sNV(GLuint index, GLshort x)
-{
-   ATTRIB1NV(index, (GLfloat) x);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib1dNV(GLuint index, GLdouble x)
-{
-   ATTRIB1NV(index, (GLfloat) x);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)
-{
-   ATTRIB2NV(index, (GLfloat) x, y);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
-{
-   ATTRIB2NV(index, (GLfloat) x, (GLfloat) y);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
-{
-   ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)
-{
-   ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
-{
-   ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
-{
-   ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
-	UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib1svNV(GLuint index, const GLshort *v)
-{
-   ATTRIB1NV(index, (GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v)
-{
-   ATTRIB1NV(index, (GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2svNV(GLuint index, const GLshort *v)
-{
-   ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
-{
-   ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3svNV(GLuint index, const GLshort *v)
-{
-   ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v)
-{
-   ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4svNV(GLuint index, const GLshort *v)
-{
-   ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 
-	  (GLfloat)v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v)
-{
-   ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
-{
-   ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
-          UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
-}
-
-
-static void GLAPIENTRY
-loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib1svNV(index + i, v + i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      ATTRIB1NV(index + i, v[i]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib1dvNV(index + i, v + i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib2svNV(index + i, v + 2 * i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      ATTRIB2NV(index + i, v[2 * i], v[2 * i + 1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib2dvNV(index + i, v + 2 * i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib3svNV(index + i, v + 3 * i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      ATTRIB3NV(index + i, v[3 * i], v[3 * i + 1], v[3 * i + 2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib3dvNV(index + i, v + 3 * i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib4svNV(index + i, v + 4 * i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      ATTRIB4NV(index + i, v[4 * i], v[4 * i + 1], v[4 * i + 2], v[4 * i + 3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib4dvNV(index + i, v + 4 * i);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
-{
-   GLint i;
-   for (i = n - 1; i >= 0; i--)
-      loopback_VertexAttrib4ubvNV(index + i, v + 4 * i);
-}
-
-
-/*
- * GL_ARB_vertex_program
- * Always loop-back to one of the VertexAttrib[1234]f[v]ARB functions.
- */
-
-static void GLAPIENTRY
-loopback_VertexAttrib1sARB(GLuint index, GLshort x)
-{
-   ATTRIB1ARB(index, (GLfloat) x);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib1dARB(GLuint index, GLdouble x)
-{
-   ATTRIB1ARB(index, (GLfloat) x);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y)
-{
-   ATTRIB2ARB(index, (GLfloat) x, y);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y)
-{
-   ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z)
-{
-   ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z)
-{
-   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
-{
-   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib1svARB(GLuint index, const GLshort *v)
-{
-   ATTRIB1ARB(index, (GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v)
-{
-   ATTRIB1ARB(index, (GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2svARB(GLuint index, const GLshort *v)
-{
-   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v)
-{
-   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3svARB(GLuint index, const GLshort *v)
-{
-   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v)
-{
-   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4svARB(GLuint index, const GLshort *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 
-	  (GLfloat)v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4ivARB(GLuint index, const GLint * v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v)
-{
-   ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
-          BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v)
-{
-   ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
-          SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NivARB(GLuint index, const GLint * v)
-{
-   ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
-          INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
-{
-   ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
-              UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v)
-{
-   ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
-          UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v)
-{
-   ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
-          USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]));
-}
-
-static void GLAPIENTRY
-loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
-{
-   ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
-          UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]));
-}
-
-
-
-/** GL 3.0 Integer-valued attributes **/
-
-static void GLAPIENTRY
-loopback_VertexAttribI1i(GLuint index, GLint x)
-{
-   ATTRIB1ARB(index, (GLfloat) x);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI2i(GLuint index, GLint x, GLint y)
-{
-   ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
-{
-   ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
-{
-   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI1ui(GLuint index, GLuint x)
-{
-   ATTRIB1ARB(index, (GLfloat) x);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI2ui(GLuint index, GLuint x, GLuint y)
-{
-   ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
-{
-   ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
-{
-   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI1iv(GLuint index, const GLint *v)
-{
-   ATTRIB1ARB(index, (GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI2iv (GLuint index, const GLint *v)
-{
-   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI3iv(GLuint index, const GLint *v)
-{
-   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4iv(GLuint index, const GLint *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
-              (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI1uiv(GLuint index, const GLuint *v)
-{
-   ATTRIB1ARB(index, (GLfloat) v[0]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI2uiv(GLuint index, const GLuint *v)
-{
-   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI3uiv(GLuint index, const GLuint *v)
-{
-   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4uiv(GLuint index, const GLuint *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
-              (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4bv(GLuint index, const GLbyte *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
-              (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4sv(GLuint index, const GLshort *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
-              (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
-              (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-loopback_VertexAttribI4usv(GLuint index, const GLushort *v)
-{
-   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1],
-              (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-
-
-/*
- * This code never registers handlers for any of the entry points
- * listed in vtxfmt.h.
- */
-void
-_mesa_loopback_init_api_table( struct _glapi_table *dest )
-{
-   SET_Color3b(dest, loopback_Color3b_f);
-   SET_Color3d(dest, loopback_Color3d_f);
-   SET_Color3i(dest, loopback_Color3i_f);
-   SET_Color3s(dest, loopback_Color3s_f);
-   SET_Color3ui(dest, loopback_Color3ui_f);
-   SET_Color3us(dest, loopback_Color3us_f);
-   SET_Color3ub(dest, loopback_Color3ub_f);
-   SET_Color4b(dest, loopback_Color4b_f);
-   SET_Color4d(dest, loopback_Color4d_f);
-   SET_Color4i(dest, loopback_Color4i_f);
-   SET_Color4s(dest, loopback_Color4s_f);
-   SET_Color4ui(dest, loopback_Color4ui_f);
-   SET_Color4us(dest, loopback_Color4us_f);
-   SET_Color4ub(dest, loopback_Color4ub_f);
-   SET_Color3bv(dest, loopback_Color3bv_f);
-   SET_Color3dv(dest, loopback_Color3dv_f);
-   SET_Color3iv(dest, loopback_Color3iv_f);
-   SET_Color3sv(dest, loopback_Color3sv_f);
-   SET_Color3uiv(dest, loopback_Color3uiv_f);
-   SET_Color3usv(dest, loopback_Color3usv_f);
-   SET_Color3ubv(dest, loopback_Color3ubv_f);
-   SET_Color4bv(dest, loopback_Color4bv_f);
-   SET_Color4dv(dest, loopback_Color4dv_f);
-   SET_Color4iv(dest, loopback_Color4iv_f);
-   SET_Color4sv(dest, loopback_Color4sv_f);
-   SET_Color4uiv(dest, loopback_Color4uiv_f);
-   SET_Color4usv(dest, loopback_Color4usv_f);
-   SET_Color4ubv(dest, loopback_Color4ubv_f);
-
-   SET_SecondaryColor3bEXT(dest, loopback_SecondaryColor3bEXT_f);
-   SET_SecondaryColor3dEXT(dest, loopback_SecondaryColor3dEXT_f);
-   SET_SecondaryColor3iEXT(dest, loopback_SecondaryColor3iEXT_f);
-   SET_SecondaryColor3sEXT(dest, loopback_SecondaryColor3sEXT_f);
-   SET_SecondaryColor3uiEXT(dest, loopback_SecondaryColor3uiEXT_f);
-   SET_SecondaryColor3usEXT(dest, loopback_SecondaryColor3usEXT_f);
-   SET_SecondaryColor3ubEXT(dest, loopback_SecondaryColor3ubEXT_f);
-   SET_SecondaryColor3bvEXT(dest, loopback_SecondaryColor3bvEXT_f);
-   SET_SecondaryColor3dvEXT(dest, loopback_SecondaryColor3dvEXT_f);
-   SET_SecondaryColor3ivEXT(dest, loopback_SecondaryColor3ivEXT_f);
-   SET_SecondaryColor3svEXT(dest, loopback_SecondaryColor3svEXT_f);
-   SET_SecondaryColor3uivEXT(dest, loopback_SecondaryColor3uivEXT_f);
-   SET_SecondaryColor3usvEXT(dest, loopback_SecondaryColor3usvEXT_f);
-   SET_SecondaryColor3ubvEXT(dest, loopback_SecondaryColor3ubvEXT_f);
-      
-   SET_EdgeFlagv(dest, loopback_EdgeFlagv);
-
-   SET_Indexd(dest, loopback_Indexd);
-   SET_Indexi(dest, loopback_Indexi);
-   SET_Indexs(dest, loopback_Indexs);
-   SET_Indexub(dest, loopback_Indexub);
-   SET_Indexdv(dest, loopback_Indexdv);
-   SET_Indexiv(dest, loopback_Indexiv);
-   SET_Indexsv(dest, loopback_Indexsv);
-   SET_Indexubv(dest, loopback_Indexubv);
-   SET_Normal3b(dest, loopback_Normal3b);
-   SET_Normal3d(dest, loopback_Normal3d);
-   SET_Normal3i(dest, loopback_Normal3i);
-   SET_Normal3s(dest, loopback_Normal3s);
-   SET_Normal3bv(dest, loopback_Normal3bv);
-   SET_Normal3dv(dest, loopback_Normal3dv);
-   SET_Normal3iv(dest, loopback_Normal3iv);
-   SET_Normal3sv(dest, loopback_Normal3sv);
-   SET_TexCoord1d(dest, loopback_TexCoord1d);
-   SET_TexCoord1i(dest, loopback_TexCoord1i);
-   SET_TexCoord1s(dest, loopback_TexCoord1s);
-   SET_TexCoord2d(dest, loopback_TexCoord2d);
-   SET_TexCoord2s(dest, loopback_TexCoord2s);
-   SET_TexCoord2i(dest, loopback_TexCoord2i);
-   SET_TexCoord3d(dest, loopback_TexCoord3d);
-   SET_TexCoord3i(dest, loopback_TexCoord3i);
-   SET_TexCoord3s(dest, loopback_TexCoord3s);
-   SET_TexCoord4d(dest, loopback_TexCoord4d);
-   SET_TexCoord4i(dest, loopback_TexCoord4i);
-   SET_TexCoord4s(dest, loopback_TexCoord4s);
-   SET_TexCoord1dv(dest, loopback_TexCoord1dv);
-   SET_TexCoord1iv(dest, loopback_TexCoord1iv);
-   SET_TexCoord1sv(dest, loopback_TexCoord1sv);
-   SET_TexCoord2dv(dest, loopback_TexCoord2dv);
-   SET_TexCoord2iv(dest, loopback_TexCoord2iv);
-   SET_TexCoord2sv(dest, loopback_TexCoord2sv);
-   SET_TexCoord3dv(dest, loopback_TexCoord3dv);
-   SET_TexCoord3iv(dest, loopback_TexCoord3iv);
-   SET_TexCoord3sv(dest, loopback_TexCoord3sv);
-   SET_TexCoord4dv(dest, loopback_TexCoord4dv);
-   SET_TexCoord4iv(dest, loopback_TexCoord4iv);
-   SET_TexCoord4sv(dest, loopback_TexCoord4sv);
-   SET_Vertex2d(dest, loopback_Vertex2d);
-   SET_Vertex2i(dest, loopback_Vertex2i);
-   SET_Vertex2s(dest, loopback_Vertex2s);
-   SET_Vertex3d(dest, loopback_Vertex3d);
-   SET_Vertex3i(dest, loopback_Vertex3i);
-   SET_Vertex3s(dest, loopback_Vertex3s);
-   SET_Vertex4d(dest, loopback_Vertex4d);
-   SET_Vertex4i(dest, loopback_Vertex4i);
-   SET_Vertex4s(dest, loopback_Vertex4s);
-   SET_Vertex2dv(dest, loopback_Vertex2dv);
-   SET_Vertex2iv(dest, loopback_Vertex2iv);
-   SET_Vertex2sv(dest, loopback_Vertex2sv);
-   SET_Vertex3dv(dest, loopback_Vertex3dv);
-   SET_Vertex3iv(dest, loopback_Vertex3iv);
-   SET_Vertex3sv(dest, loopback_Vertex3sv);
-   SET_Vertex4dv(dest, loopback_Vertex4dv);
-   SET_Vertex4iv(dest, loopback_Vertex4iv);
-   SET_Vertex4sv(dest, loopback_Vertex4sv);
-   SET_MultiTexCoord1dARB(dest, loopback_MultiTexCoord1dARB);
-   SET_MultiTexCoord1dvARB(dest, loopback_MultiTexCoord1dvARB);
-   SET_MultiTexCoord1iARB(dest, loopback_MultiTexCoord1iARB);
-   SET_MultiTexCoord1ivARB(dest, loopback_MultiTexCoord1ivARB);
-   SET_MultiTexCoord1sARB(dest, loopback_MultiTexCoord1sARB);
-   SET_MultiTexCoord1svARB(dest, loopback_MultiTexCoord1svARB);
-   SET_MultiTexCoord2dARB(dest, loopback_MultiTexCoord2dARB);
-   SET_MultiTexCoord2dvARB(dest, loopback_MultiTexCoord2dvARB);
-   SET_MultiTexCoord2iARB(dest, loopback_MultiTexCoord2iARB);
-   SET_MultiTexCoord2ivARB(dest, loopback_MultiTexCoord2ivARB);
-   SET_MultiTexCoord2sARB(dest, loopback_MultiTexCoord2sARB);
-   SET_MultiTexCoord2svARB(dest, loopback_MultiTexCoord2svARB);
-   SET_MultiTexCoord3dARB(dest, loopback_MultiTexCoord3dARB);
-   SET_MultiTexCoord3dvARB(dest, loopback_MultiTexCoord3dvARB);
-   SET_MultiTexCoord3iARB(dest, loopback_MultiTexCoord3iARB);
-   SET_MultiTexCoord3ivARB(dest, loopback_MultiTexCoord3ivARB);
-   SET_MultiTexCoord3sARB(dest, loopback_MultiTexCoord3sARB);
-   SET_MultiTexCoord3svARB(dest, loopback_MultiTexCoord3svARB);
-   SET_MultiTexCoord4dARB(dest, loopback_MultiTexCoord4dARB);
-   SET_MultiTexCoord4dvARB(dest, loopback_MultiTexCoord4dvARB);
-   SET_MultiTexCoord4iARB(dest, loopback_MultiTexCoord4iARB);
-   SET_MultiTexCoord4ivARB(dest, loopback_MultiTexCoord4ivARB);
-   SET_MultiTexCoord4sARB(dest, loopback_MultiTexCoord4sARB);
-   SET_MultiTexCoord4svARB(dest, loopback_MultiTexCoord4svARB);
-   SET_EvalCoord2dv(dest, loopback_EvalCoord2dv);
-   SET_EvalCoord2fv(dest, loopback_EvalCoord2fv);
-   SET_EvalCoord2d(dest, loopback_EvalCoord2d);
-   SET_EvalCoord1dv(dest, loopback_EvalCoord1dv);
-   SET_EvalCoord1fv(dest, loopback_EvalCoord1fv);
-   SET_EvalCoord1d(dest, loopback_EvalCoord1d);
-   SET_Materialf(dest, loopback_Materialf);
-   SET_Materiali(dest, loopback_Materiali);
-   SET_Materialiv(dest, loopback_Materialiv);
-   SET_Rectd(dest, loopback_Rectd);
-   SET_Rectdv(dest, loopback_Rectdv);
-   SET_Rectfv(dest, loopback_Rectfv);
-   SET_Recti(dest, loopback_Recti);
-   SET_Rectiv(dest, loopback_Rectiv);
-   SET_Rects(dest, loopback_Rects);
-   SET_Rectsv(dest, loopback_Rectsv);
-   SET_FogCoorddEXT(dest, loopback_FogCoorddEXT);
-   SET_FogCoorddvEXT(dest, loopback_FogCoorddvEXT);
-
-   SET_VertexAttrib1sNV(dest, loopback_VertexAttrib1sNV);
-   SET_VertexAttrib1dNV(dest, loopback_VertexAttrib1dNV);
-   SET_VertexAttrib2sNV(dest, loopback_VertexAttrib2sNV);
-   SET_VertexAttrib2dNV(dest, loopback_VertexAttrib2dNV);
-   SET_VertexAttrib3sNV(dest, loopback_VertexAttrib3sNV);
-   SET_VertexAttrib3dNV(dest, loopback_VertexAttrib3dNV);
-   SET_VertexAttrib4sNV(dest, loopback_VertexAttrib4sNV);
-   SET_VertexAttrib4dNV(dest, loopback_VertexAttrib4dNV);
-   SET_VertexAttrib4ubNV(dest, loopback_VertexAttrib4ubNV);
-   SET_VertexAttrib1svNV(dest, loopback_VertexAttrib1svNV);
-   SET_VertexAttrib1dvNV(dest, loopback_VertexAttrib1dvNV);
-   SET_VertexAttrib2svNV(dest, loopback_VertexAttrib2svNV);
-   SET_VertexAttrib2dvNV(dest, loopback_VertexAttrib2dvNV);
-   SET_VertexAttrib3svNV(dest, loopback_VertexAttrib3svNV);
-   SET_VertexAttrib3dvNV(dest, loopback_VertexAttrib3dvNV);
-   SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV);
-   SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV);
-   SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV);
-   SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV);
-   SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV);
-   SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV);
-   SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV);
-   SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV);
-   SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV);
-   SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV);
-   SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV);
-   SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV);
-   SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV);
-   SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV);
-   SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV);
-   SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV);
-
-   SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB);
-   SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB);
-   SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB);
-   SET_VertexAttrib2dARB(dest, loopback_VertexAttrib2dARB);
-   SET_VertexAttrib3sARB(dest, loopback_VertexAttrib3sARB);
-   SET_VertexAttrib3dARB(dest, loopback_VertexAttrib3dARB);
-   SET_VertexAttrib4sARB(dest, loopback_VertexAttrib4sARB);
-   SET_VertexAttrib4dARB(dest, loopback_VertexAttrib4dARB);
-   SET_VertexAttrib1svARB(dest, loopback_VertexAttrib1svARB);
-   SET_VertexAttrib1dvARB(dest, loopback_VertexAttrib1dvARB);
-   SET_VertexAttrib2svARB(dest, loopback_VertexAttrib2svARB);
-   SET_VertexAttrib2dvARB(dest, loopback_VertexAttrib2dvARB);
-   SET_VertexAttrib3svARB(dest, loopback_VertexAttrib3svARB);
-   SET_VertexAttrib3dvARB(dest, loopback_VertexAttrib3dvARB);
-   SET_VertexAttrib4svARB(dest, loopback_VertexAttrib4svARB);
-   SET_VertexAttrib4dvARB(dest, loopback_VertexAttrib4dvARB);
-   SET_VertexAttrib4NubARB(dest, loopback_VertexAttrib4NubARB);
-   SET_VertexAttrib4NubvARB(dest, loopback_VertexAttrib4NubvARB);
-   SET_VertexAttrib4bvARB(dest, loopback_VertexAttrib4bvARB);
-   SET_VertexAttrib4ivARB(dest, loopback_VertexAttrib4ivARB);
-   SET_VertexAttrib4ubvARB(dest, loopback_VertexAttrib4ubvARB);
-   SET_VertexAttrib4usvARB(dest, loopback_VertexAttrib4usvARB);
-   SET_VertexAttrib4uivARB(dest, loopback_VertexAttrib4uivARB);
-   SET_VertexAttrib4NbvARB(dest, loopback_VertexAttrib4NbvARB);
-   SET_VertexAttrib4NsvARB(dest, loopback_VertexAttrib4NsvARB);
-   SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB);
-   SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB);
-   SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB);
-
-   /* GL 3.0 */
-#if 0
-   SET_VertexAttribI1i(dest, loopback_VertexAttribI1i);
-   SET_VertexAttribI2i(dest, loopback_VertexAttribI2i);
-   SET_VertexAttribI3i(dest, loopback_VertexAttribI3i);
-   SET_VertexAttribI4i(dest, loopback_VertexAttribI4i);
-   SET_VertexAttribI1ui(dest, loopback_VertexAttribI1ui);
-   SET_VertexAttribI2ui(dest, loopback_VertexAttribI2ui);
-   SET_VertexAttribI3ui(dest, loopback_VertexAttribI3ui);
-   SET_VertexAttribI4ui(dest, loopback_VertexAttribI4ui);
-   SET_VertexAttribI1iv(dest, loopback_VertexAttribI1iv);
-   SET_VertexAttribI2iv(dest, loopback_VertexAttribI2iv);
-   SET_VertexAttribI3iv(dest, loopback_VertexAttribI3iv);
-   SET_VertexAttribI4iv(dest, loopback_VertexAttribI4iv);
-   SET_VertexAttribI1uiv(dest, loopback_VertexAttribI1uiv);
-   SET_VertexAttribI2uiv(dest, loopback_VertexAttribI2uiv);
-   SET_VertexAttribI3uiv(dest, loopback_VertexAttribI3uiv);
-   SET_VertexAttribI4uiv(dest, loopback_VertexAttribI4uiv);
-   SET_VertexAttribI4bv(dest, loopback_VertexAttribI4bv);
-   SET_VertexAttribI4sv(dest, loopback_VertexAttribI4sv);
-   SET_VertexAttribI4ubv(dest, loopback_VertexAttribI4ubv);
-   SET_VertexAttribI4usv(dest, loopback_VertexAttribI4usv);
-#else
-   (void) loopback_VertexAttribI1i;
-   (void) loopback_VertexAttribI2i;
-   (void) loopback_VertexAttribI3i;
-   (void) loopback_VertexAttribI4i;
-   (void) loopback_VertexAttribI1ui;
-   (void) loopback_VertexAttribI2ui;
-   (void) loopback_VertexAttribI3ui;
-   (void) loopback_VertexAttribI4ui;
-   (void) loopback_VertexAttribI1iv;
-   (void) loopback_VertexAttribI2iv;
-   (void) loopback_VertexAttribI3iv;
-   (void) loopback_VertexAttribI4iv;
-   (void) loopback_VertexAttribI1uiv;
-   (void) loopback_VertexAttribI2uiv;
-   (void) loopback_VertexAttribI3uiv;
-   (void) loopback_VertexAttribI4uiv;
-   (void) loopback_VertexAttribI4bv;
-   (void) loopback_VertexAttribI4sv;
-   (void) loopback_VertexAttribI4ubv;
-   (void) loopback_VertexAttribI4usv;
-#endif
-}
-
-
-#endif /* FEATURE_beginend */
+/**

+ * \file api_loopback.c

+ *

+ * \author Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

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

+ */

+

+

+#include "glheader.h"

+#include "macros.h"

+#include "api_loopback.h"

+#include "mtypes.h"

+#include "glapi/glapi.h"

+#include "glapi/glthread.h"

+#include "main/dispatch.h"

+#include "mfeatures.h"

+

+/* KW: A set of functions to convert unusual Color/Normal/Vertex/etc

+ * calls to a smaller set of driver-provided formats.  Currently just

+ * go back to dispatch to find these (eg. call glNormal3f directly),

+ * hence 'loopback'.

+ *

+ * The driver must supply all of the remaining entry points, which are

+ * listed in dd.h.  The easiest way for a driver to do this is to

+ * install the supplied software t&l module.

+ */

+#define COLORF(r,g,b,a)             CALL_Color4f(GET_DISPATCH(), (r,g,b,a))

+#define VERTEX2(x,y)	            CALL_Vertex2f(GET_DISPATCH(), (x,y))

+#define VERTEX3(x,y,z)	            CALL_Vertex3f(GET_DISPATCH(), (x,y,z))

+#define VERTEX4(x,y,z,w)            CALL_Vertex4f(GET_DISPATCH(), (x,y,z,w))

+#define NORMAL(x,y,z)               CALL_Normal3f(GET_DISPATCH(), (x,y,z))

+#define TEXCOORD1(s)                CALL_TexCoord1f(GET_DISPATCH(), (s))

+#define TEXCOORD2(s,t)              CALL_TexCoord2f(GET_DISPATCH(), (s,t))

+#define TEXCOORD3(s,t,u)            CALL_TexCoord3f(GET_DISPATCH(), (s,t,u))

+#define TEXCOORD4(s,t,u,v)          CALL_TexCoord4f(GET_DISPATCH(), (s,t,u,v))

+#define INDEX(c)		    CALL_Indexf(GET_DISPATCH(), (c))

+#define MULTI_TEXCOORD1(z,s)	    CALL_MultiTexCoord1fARB(GET_DISPATCH(), (z,s))

+#define MULTI_TEXCOORD2(z,s,t)	    CALL_MultiTexCoord2fARB(GET_DISPATCH(), (z,s,t))

+#define MULTI_TEXCOORD3(z,s,t,u)    CALL_MultiTexCoord3fARB(GET_DISPATCH(), (z,s,t,u))

+#define MULTI_TEXCOORD4(z,s,t,u,v)  CALL_MultiTexCoord4fARB(GET_DISPATCH(), (z,s,t,u,v))

+#define EVALCOORD1(x)               CALL_EvalCoord1f(GET_DISPATCH(), (x))

+#define EVALCOORD2(x,y)             CALL_EvalCoord2f(GET_DISPATCH(), (x,y))

+#define MATERIALFV(a,b,c)           CALL_Materialfv(GET_DISPATCH(), (a,b,c))

+#define RECTF(a,b,c,d)              CALL_Rectf(GET_DISPATCH(), (a,b,c,d))

+

+#define FOGCOORDF(x)                CALL_FogCoordfEXT(GET_DISPATCH(), (x))

+#define SECONDARYCOLORF(a,b,c)      CALL_SecondaryColor3fEXT(GET_DISPATCH(), (a,b,c))

+

+#define ATTRIB1NV(index,x)          CALL_VertexAttrib1fNV(GET_DISPATCH(), (index,x))

+#define ATTRIB2NV(index,x,y)        CALL_VertexAttrib2fNV(GET_DISPATCH(), (index,x,y))

+#define ATTRIB3NV(index,x,y,z)      CALL_VertexAttrib3fNV(GET_DISPATCH(), (index,x,y,z))

+#define ATTRIB4NV(index,x,y,z,w)    CALL_VertexAttrib4fNV(GET_DISPATCH(), (index,x,y,z,w))

+

+#define ATTRIB1ARB(index,x)         CALL_VertexAttrib1fARB(GET_DISPATCH(), (index,x))

+#define ATTRIB2ARB(index,x,y)       CALL_VertexAttrib2fARB(GET_DISPATCH(), (index,x,y))

+#define ATTRIB3ARB(index,x,y,z)     CALL_VertexAttrib3fARB(GET_DISPATCH(), (index,x,y,z))

+#define ATTRIB4ARB(index,x,y,z,w)   CALL_VertexAttrib4fARB(GET_DISPATCH(), (index,x,y,z,w))

+

+#define ATTRIBI_1I(index,x)   CALL_VertexAttribI1iEXT(GET_DISPATCH(), (index,x))

+#define ATTRIBI_1UI(index,x)   CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (index,x))

+#define ATTRIBI_4I(index,x,y,z,w)   CALL_VertexAttribI4iEXT(GET_DISPATCH(), (index,x,y,z,w))

+

+#define ATTRIBI_4UI(index,x,y,z,w)   CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w))

+

+

+#if FEATURE_beginend

+

+

+static void GLAPIENTRY

+loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )

+{

+   COLORF( BYTE_TO_FLOAT(red),

+	   BYTE_TO_FLOAT(green),

+	   BYTE_TO_FLOAT(blue),

+	   1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue )

+{

+   COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3i_f( GLint red, GLint green, GLint blue )

+{

+   COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),

+	   INT_TO_FLOAT(blue), 1.0);

+}

+

+static void GLAPIENTRY

+loopback_Color3s_f( GLshort red, GLshort green, GLshort blue )

+{

+   COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),

+	   SHORT_TO_FLOAT(blue), 1.0);

+}

+

+static void GLAPIENTRY

+loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue )

+{

+   COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),

+	   UINT_TO_FLOAT(blue), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3us_f( GLushort red, GLushort green, GLushort blue )

+{

+   COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),

+	   USHORT_TO_FLOAT(blue), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )

+{

+   COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),

+	   UBYTE_TO_FLOAT(blue), 1.0 );

+}

+

+

+static void GLAPIENTRY

+loopback_Color3bv_f( const GLbyte *v )

+{

+   COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),

+	   BYTE_TO_FLOAT(v[2]), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3dv_f( const GLdouble *v )

+{

+   COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3iv_f( const GLint *v )

+{

+   COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),

+	   INT_TO_FLOAT(v[2]), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3sv_f( const GLshort *v )

+{

+   COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),

+	   SHORT_TO_FLOAT(v[2]), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3uiv_f( const GLuint *v )

+{

+   COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),

+	   UINT_TO_FLOAT(v[2]), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3usv_f( const GLushort *v )

+{

+   COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),

+	   USHORT_TO_FLOAT(v[2]), 1.0 );

+}

+

+static void GLAPIENTRY

+loopback_Color3ubv_f( const GLubyte *v )

+{

+   COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),

+	   UBYTE_TO_FLOAT(v[2]), 1.0 );

+}

+

+

+static void GLAPIENTRY

+loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,

+			      GLbyte alpha )

+{

+   COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green),

+	   BYTE_TO_FLOAT(blue), BYTE_TO_FLOAT(alpha) );

+}

+

+static void GLAPIENTRY

+loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,

+			      GLdouble alpha )

+{

+   COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha );

+}

+

+static void GLAPIENTRY

+loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha )

+{

+   COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),

+	   INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) );

+}

+

+static void GLAPIENTRY

+loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,

+			      GLshort alpha )

+{

+   COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),

+	   SHORT_TO_FLOAT(blue), SHORT_TO_FLOAT(alpha) );

+}

+

+static void GLAPIENTRY

+loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha )

+{

+   COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),

+	   UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) );

+}

+

+static void GLAPIENTRY

+loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha )

+{

+   COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),

+	   USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) );

+}

+

+static void GLAPIENTRY

+loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )

+{

+   COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),

+	   UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) );

+}

+

+

+static void GLAPIENTRY

+loopback_Color4iv_f( const GLint *v )

+{

+   COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),

+	   INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );

+}

+

+

+static void GLAPIENTRY

+loopback_Color4bv_f( const GLbyte *v )

+{

+   COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),

+	   BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) );

+}

+

+static void GLAPIENTRY

+loopback_Color4dv_f( const GLdouble *v )

+{

+   COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+

+static void GLAPIENTRY

+loopback_Color4sv_f( const GLshort *v)

+{

+   COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),

+	   SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) );

+}

+

+

+static void GLAPIENTRY

+loopback_Color4uiv_f( const GLuint *v)

+{

+   COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),

+	   UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) );

+}

+

+static void GLAPIENTRY

+loopback_Color4usv_f( const GLushort *v)

+{

+   COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),

+	   USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) );

+}

+

+static void GLAPIENTRY

+loopback_Color4ubv_f( const GLubyte *v)

+{

+   COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),

+	   UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) );

+}

+

+

+static void GLAPIENTRY

+loopback_FogCoorddEXT( GLdouble d )

+{

+   FOGCOORDF( (GLfloat) d );

+}

+

+static void GLAPIENTRY

+loopback_FogCoorddvEXT( const GLdouble *v )

+{

+   FOGCOORDF( (GLfloat) *v );

+}

+

+

+static void GLAPIENTRY

+loopback_Indexd( GLdouble c )

+{

+   INDEX( (GLfloat) c );

+}

+

+static void GLAPIENTRY

+loopback_Indexi( GLint c )

+{

+   INDEX( (GLfloat) c );

+}

+

+static void GLAPIENTRY

+loopback_Indexs( GLshort c )

+{

+   INDEX( (GLfloat) c );

+}

+

+static void GLAPIENTRY

+loopback_Indexub( GLubyte c )

+{

+   INDEX( (GLfloat) c );

+}

+

+static void GLAPIENTRY

+loopback_Indexdv( const GLdouble *c )

+{

+   INDEX( (GLfloat) *c );

+}

+

+static void GLAPIENTRY

+loopback_Indexiv( const GLint *c )

+{

+   INDEX( (GLfloat) *c );

+}

+

+static void GLAPIENTRY

+loopback_Indexsv( const GLshort *c )

+{

+   INDEX( (GLfloat) *c );

+}

+

+static void GLAPIENTRY

+loopback_Indexubv( const GLubyte *c )

+{

+   INDEX( (GLfloat) *c );

+}

+

+

+static void GLAPIENTRY

+loopback_EdgeFlagv(const GLboolean *flag)

+{

+   CALL_EdgeFlag(GET_DISPATCH(), (*flag));

+}

+

+

+static void GLAPIENTRY

+loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )

+{

+   NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) );

+}

+

+static void GLAPIENTRY

+loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )

+{

+   NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz);

+}

+

+static void GLAPIENTRY

+loopback_Normal3i( GLint nx, GLint ny, GLint nz )

+{

+   NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) );

+}

+

+static void GLAPIENTRY

+loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz )

+{

+   NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) );

+}

+

+static void GLAPIENTRY

+loopback_Normal3bv( const GLbyte *v )

+{

+   NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) );

+}

+

+static void GLAPIENTRY

+loopback_Normal3dv( const GLdouble *v )

+{

+   NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_Normal3iv( const GLint *v )

+{

+   NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) );

+}

+

+static void GLAPIENTRY

+loopback_Normal3sv( const GLshort *v )

+{

+   NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) );

+}

+

+static void GLAPIENTRY

+loopback_TexCoord1d( GLdouble s )

+{

+   TEXCOORD1((GLfloat) s);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord1i( GLint s )

+{

+   TEXCOORD1((GLfloat) s);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord1s( GLshort s )

+{

+   TEXCOORD1((GLfloat) s);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord2d( GLdouble s, GLdouble t )

+{

+   TEXCOORD2((GLfloat) s,(GLfloat) t);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord2s( GLshort s, GLshort t )

+{

+   TEXCOORD2((GLfloat) s,(GLfloat) t);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord2i( GLint s, GLint t )

+{

+   TEXCOORD2((GLfloat) s,(GLfloat) t);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )

+{

+   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord3i( GLint s, GLint t, GLint r )

+{

+   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord3s( GLshort s, GLshort t, GLshort r )

+{

+   TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )

+{

+   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q )

+{

+   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )

+{

+   TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord1dv( const GLdouble *v )

+{

+   TEXCOORD1((GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord1iv( const GLint *v )

+{

+   TEXCOORD1((GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord1sv( const GLshort *v )

+{

+   TEXCOORD1((GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord2dv( const GLdouble *v )

+{

+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord2iv( const GLint *v )

+{

+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord2sv( const GLshort *v )

+{

+   TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord3dv( const GLdouble *v )

+{

+   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord3iv( const GLint *v )

+{

+   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord3sv( const GLshort *v )

+{

+   TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord4dv( const GLdouble *v )

+{

+   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord4iv( const GLint *v )

+{

+   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_TexCoord4sv( const GLshort *v )

+{

+   TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_Vertex2d( GLdouble x, GLdouble y )

+{

+   VERTEX2( (GLfloat) x, (GLfloat) y );

+}

+

+static void GLAPIENTRY

+loopback_Vertex2i( GLint x, GLint y )

+{

+   VERTEX2( (GLfloat) x, (GLfloat) y );

+}

+

+static void GLAPIENTRY

+loopback_Vertex2s( GLshort x, GLshort y )

+{

+   VERTEX2( (GLfloat) x, (GLfloat) y );

+}

+

+static void GLAPIENTRY

+loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z )

+{

+   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );

+}

+

+static void GLAPIENTRY

+loopback_Vertex3i( GLint x, GLint y, GLint z )

+{

+   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );

+}

+

+static void GLAPIENTRY

+loopback_Vertex3s( GLshort x, GLshort y, GLshort z )

+{

+   VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );

+}

+

+static void GLAPIENTRY

+loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )

+{

+   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );

+}

+

+static void GLAPIENTRY

+loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w )

+{

+   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );

+}

+

+static void GLAPIENTRY

+loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )

+{

+   VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );

+}

+

+static void GLAPIENTRY

+loopback_Vertex2dv( const GLdouble *v )

+{

+   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex2iv( const GLint *v )

+{

+   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex2sv( const GLshort *v )

+{

+   VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex3dv( const GLdouble *v )

+{

+   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex3iv( const GLint *v )

+{

+   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex3sv( const GLshort *v )

+{

+   VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex4dv( const GLdouble *v )

+{

+   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],

+	    (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex4iv( const GLint *v )

+{

+   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],

+	    (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+static void GLAPIENTRY

+loopback_Vertex4sv( const GLshort *v )

+{

+   VERTEX4( (GLfloat) v[0], (GLfloat) v[1],

+	    (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord1dARB(GLenum target, GLdouble s)

+{

+   MULTI_TEXCOORD1( target, (GLfloat) s );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v)

+{

+   MULTI_TEXCOORD1( target, (GLfloat) v[0] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord1iARB(GLenum target, GLint s)

+{

+   MULTI_TEXCOORD1( target, (GLfloat) s );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v)

+{

+   MULTI_TEXCOORD1( target, (GLfloat) v[0] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord1sARB(GLenum target, GLshort s)

+{

+   MULTI_TEXCOORD1( target, (GLfloat) s );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v)

+{

+   MULTI_TEXCOORD1( target, (GLfloat) v[0] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t)

+{

+   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v)

+{

+   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t)

+{

+   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v)

+{

+   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t)

+{

+   MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v)

+{

+   MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r)

+{

+   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v)

+{

+   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r)

+{

+   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v)

+{

+   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r)

+{

+   MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v)

+{

+   MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)

+{

+   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, 

+		    (GLfloat) r, (GLfloat) q );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v)

+{

+   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], 

+		    (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q)

+{

+   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,

+		    (GLfloat) r, (GLfloat) q );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v)

+{

+   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],

+		    (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)

+{

+   MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,

+		    (GLfloat) r, (GLfloat) q );

+}

+

+static void GLAPIENTRY

+loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v)

+{

+   MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],

+		    (GLfloat) v[2], (GLfloat) v[3] );

+}

+

+static void GLAPIENTRY

+loopback_EvalCoord2dv( const GLdouble *u )

+{

+   EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );

+}

+

+static void GLAPIENTRY

+loopback_EvalCoord2fv( const GLfloat *u )

+{

+   EVALCOORD2( u[0], u[1] );

+}

+

+static void GLAPIENTRY

+loopback_EvalCoord2d( GLdouble u, GLdouble v )

+{

+   EVALCOORD2( (GLfloat) u, (GLfloat) v );

+}

+

+static void GLAPIENTRY

+loopback_EvalCoord1dv( const GLdouble *u )

+{

+   EVALCOORD1( (GLfloat) *u );

+}

+

+static void GLAPIENTRY

+loopback_EvalCoord1fv( const GLfloat *u )

+{

+   EVALCOORD1( (GLfloat) *u );

+}

+

+static void GLAPIENTRY

+loopback_EvalCoord1d( GLdouble u )

+{

+   EVALCOORD1( (GLfloat) u );

+}

+

+static void GLAPIENTRY

+loopback_Materialf( GLenum face, GLenum pname, GLfloat param )

+{

+   GLfloat fparam[4];

+   fparam[0] = param;

+   MATERIALFV( face, pname, fparam );

+}

+

+static void GLAPIENTRY

+loopback_Materiali(GLenum face, GLenum pname, GLint param )

+{

+   GLfloat p = (GLfloat) param;

+   MATERIALFV(face, pname, &p);

+}

+

+static void GLAPIENTRY

+loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )

+{

+   GLfloat fparam[4];

+   switch (pname) {

+   case GL_AMBIENT:

+   case GL_DIFFUSE:

+   case GL_SPECULAR:

+   case GL_EMISSION:

+   case GL_AMBIENT_AND_DIFFUSE:

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

+      fparam[0] = (GLfloat) params[0];

+      break;

+   case GL_COLOR_INDEXES:

+      fparam[0] = (GLfloat) params[0];

+      fparam[1] = (GLfloat) params[1];

+      fparam[2] = (GLfloat) params[2];

+      break;

+   default:

+      ;

+   }

+   MATERIALFV(face, pname, fparam);

+}

+

+

+static void GLAPIENTRY

+loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)

+{

+   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);

+}

+

+static void GLAPIENTRY

+loopback_Rectdv(const GLdouble *v1, const GLdouble *v2)

+{

+   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);

+}

+

+static void GLAPIENTRY

+loopback_Rectfv(const GLfloat *v1, const GLfloat *v2)

+{

+   RECTF(v1[0], v1[1], v2[0], v2[1]);

+}

+

+static void GLAPIENTRY

+loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2)

+{

+   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);

+}

+

+static void GLAPIENTRY

+loopback_Rectiv(const GLint *v1, const GLint *v2)

+{

+   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);

+}

+

+static void GLAPIENTRY

+loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)

+{

+   RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);

+}

+

+static void GLAPIENTRY

+loopback_Rectsv(const GLshort *v1, const GLshort *v2)

+{

+   RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )

+{

+   SECONDARYCOLORF( BYTE_TO_FLOAT(red),

+		    BYTE_TO_FLOAT(green),

+		    BYTE_TO_FLOAT(blue) );

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue )

+{

+   SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue );

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )

+{

+   SECONDARYCOLORF( INT_TO_FLOAT(red),

+		    INT_TO_FLOAT(green),

+		    INT_TO_FLOAT(blue));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )

+{

+   SECONDARYCOLORF(SHORT_TO_FLOAT(red),

+                   SHORT_TO_FLOAT(green),

+                   SHORT_TO_FLOAT(blue));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )

+{

+   SECONDARYCOLORF(UINT_TO_FLOAT(red),

+                   UINT_TO_FLOAT(green),

+                   UINT_TO_FLOAT(blue));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )

+{

+   SECONDARYCOLORF(USHORT_TO_FLOAT(red),

+                   USHORT_TO_FLOAT(green),

+                   USHORT_TO_FLOAT(blue));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )

+{

+   SECONDARYCOLORF(UBYTE_TO_FLOAT(red),

+                   UBYTE_TO_FLOAT(green),

+                   UBYTE_TO_FLOAT(blue));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3bvEXT_f( const GLbyte *v )

+{

+   SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]),

+                   BYTE_TO_FLOAT(v[1]),

+                   BYTE_TO_FLOAT(v[2]));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3dvEXT_f( const GLdouble *v )

+{

+   SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );

+}

+static void GLAPIENTRY

+loopback_SecondaryColor3ivEXT_f( const GLint *v )

+{

+   SECONDARYCOLORF(INT_TO_FLOAT(v[0]),

+                   INT_TO_FLOAT(v[1]),

+                   INT_TO_FLOAT(v[2]));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3svEXT_f( const GLshort *v )

+{

+   SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]),

+                   SHORT_TO_FLOAT(v[1]),

+                   SHORT_TO_FLOAT(v[2]));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3uivEXT_f( const GLuint *v )

+{

+   SECONDARYCOLORF(UINT_TO_FLOAT(v[0]),

+                   UINT_TO_FLOAT(v[1]),

+                   UINT_TO_FLOAT(v[2]));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3usvEXT_f( const GLushort *v )

+{

+   SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]),

+                   USHORT_TO_FLOAT(v[1]),

+                   USHORT_TO_FLOAT(v[2]));

+}

+

+static void GLAPIENTRY

+loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )

+{

+   SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]),

+                   UBYTE_TO_FLOAT(v[1]),

+                   UBYTE_TO_FLOAT(v[2]));

+}

+

+

+/*

+ * GL_NV_vertex_program:

+ * Always loop-back to one of the VertexAttrib[1234]f[v]NV functions.

+ * Note that attribute indexes DO alias conventional vertex attributes.

+ */

+

+static void GLAPIENTRY

+loopback_VertexAttrib1sNV(GLuint index, GLshort x)

+{

+   ATTRIB1NV(index, (GLfloat) x);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib1dNV(GLuint index, GLdouble x)

+{

+   ATTRIB1NV(index, (GLfloat) x);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)

+{

+   ATTRIB2NV(index, (GLfloat) x, y);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)

+{

+   ATTRIB2NV(index, (GLfloat) x, (GLfloat) y);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)

+{

+   ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)

+{

+   ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)

+{

+   ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)

+{

+   ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),

+	UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib1svNV(GLuint index, const GLshort *v)

+{

+   ATTRIB1NV(index, (GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v)

+{

+   ATTRIB1NV(index, (GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2svNV(GLuint index, const GLshort *v)

+{

+   ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v)

+{

+   ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3svNV(GLuint index, const GLshort *v)

+{

+   ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v)

+{

+   ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4svNV(GLuint index, const GLshort *v)

+{

+   ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 

+	  (GLfloat)v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v)

+{

+   ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)

+{

+   ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),

+          UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));

+}

+

+

+static void GLAPIENTRY

+loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib1svNV(index + i, v + i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      ATTRIB1NV(index + i, v[i]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib1dvNV(index + i, v + i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib2svNV(index + i, v + 2 * i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      ATTRIB2NV(index + i, v[2 * i], v[2 * i + 1]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib2dvNV(index + i, v + 2 * i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib3svNV(index + i, v + 3 * i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      ATTRIB3NV(index + i, v[3 * i], v[3 * i + 1], v[3 * i + 2]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib3dvNV(index + i, v + 3 * i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib4svNV(index + i, v + 4 * i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      ATTRIB4NV(index + i, v[4 * i], v[4 * i + 1], v[4 * i + 2], v[4 * i + 3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib4dvNV(index + i, v + 4 * i);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)

+{

+   GLint i;

+   for (i = n - 1; i >= 0; i--)

+      loopback_VertexAttrib4ubvNV(index + i, v + 4 * i);

+}

+

+

+/*

+ * GL_ARB_vertex_program

+ * Always loop-back to one of the VertexAttrib[1234]f[v]ARB functions.

+ * Note that attribute indexes do NOT alias conventional attributes.

+ */

+

+static void GLAPIENTRY

+loopback_VertexAttrib1sARB(GLuint index, GLshort x)

+{

+   ATTRIB1ARB(index, (GLfloat) x);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib1dARB(GLuint index, GLdouble x)

+{

+   ATTRIB1ARB(index, (GLfloat) x);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y)

+{

+   ATTRIB2ARB(index, (GLfloat) x, y);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y)

+{

+   ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z)

+{

+   ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z)

+{

+   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)

+{

+   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib1svARB(GLuint index, const GLshort *v)

+{

+   ATTRIB1ARB(index, (GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v)

+{

+   ATTRIB1ARB(index, (GLfloat) v[0]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2svARB(GLuint index, const GLshort *v)

+{

+   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v)

+{

+   ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3svARB(GLuint index, const GLshort *v)

+{

+   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v)

+{

+   ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4svARB(GLuint index, const GLshort *v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 

+	  (GLfloat)v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4ivARB(GLuint index, const GLint * v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v)

+{

+   ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v)

+{

+   ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),

+          BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v)

+{

+   ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),

+          SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NivARB(GLuint index, const GLint * v)

+{

+   ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),

+          INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)

+{

+   ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),

+              UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v)

+{

+   ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),

+          UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v)

+{

+   ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),

+          USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]));

+}

+

+static void GLAPIENTRY

+loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)

+{

+   ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),

+          UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]));

+}

+

+

+

+/**

+ * GL_EXT_gpu_shader / GL 3.0 signed/unsigned integer-valued attributes.

+ * Note that attribute indexes do NOT alias conventional attributes.

+ */

+

+static void GLAPIENTRY

+loopback_VertexAttribI1iv(GLuint index, const GLint *v)

+{

+   ATTRIBI_1I(index, v[0]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribI1uiv(GLuint index, const GLuint *v)

+{

+   ATTRIBI_1UI(index, v[0]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribI4bv(GLuint index, const GLbyte *v)

+{

+   ATTRIBI_4I(index, v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribI4sv(GLuint index, const GLshort *v)

+{

+   ATTRIBI_4I(index, v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v)

+{

+   ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+loopback_VertexAttribI4usv(GLuint index, const GLushort *v)

+{

+   ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);

+}

+

+

+

+

+/*

+ * This code never registers handlers for any of the entry points

+ * listed in vtxfmt.h.

+ */

+void

+_mesa_loopback_init_api_table( struct _glapi_table *dest )

+{

+   SET_Color3b(dest, loopback_Color3b_f);

+   SET_Color3d(dest, loopback_Color3d_f);

+   SET_Color3i(dest, loopback_Color3i_f);

+   SET_Color3s(dest, loopback_Color3s_f);

+   SET_Color3ui(dest, loopback_Color3ui_f);

+   SET_Color3us(dest, loopback_Color3us_f);

+   SET_Color3ub(dest, loopback_Color3ub_f);

+   SET_Color4b(dest, loopback_Color4b_f);

+   SET_Color4d(dest, loopback_Color4d_f);

+   SET_Color4i(dest, loopback_Color4i_f);

+   SET_Color4s(dest, loopback_Color4s_f);

+   SET_Color4ui(dest, loopback_Color4ui_f);

+   SET_Color4us(dest, loopback_Color4us_f);

+   SET_Color4ub(dest, loopback_Color4ub_f);

+   SET_Color3bv(dest, loopback_Color3bv_f);

+   SET_Color3dv(dest, loopback_Color3dv_f);

+   SET_Color3iv(dest, loopback_Color3iv_f);

+   SET_Color3sv(dest, loopback_Color3sv_f);

+   SET_Color3uiv(dest, loopback_Color3uiv_f);

+   SET_Color3usv(dest, loopback_Color3usv_f);

+   SET_Color3ubv(dest, loopback_Color3ubv_f);

+   SET_Color4bv(dest, loopback_Color4bv_f);

+   SET_Color4dv(dest, loopback_Color4dv_f);

+   SET_Color4iv(dest, loopback_Color4iv_f);

+   SET_Color4sv(dest, loopback_Color4sv_f);

+   SET_Color4uiv(dest, loopback_Color4uiv_f);

+   SET_Color4usv(dest, loopback_Color4usv_f);

+   SET_Color4ubv(dest, loopback_Color4ubv_f);

+

+   SET_SecondaryColor3bEXT(dest, loopback_SecondaryColor3bEXT_f);

+   SET_SecondaryColor3dEXT(dest, loopback_SecondaryColor3dEXT_f);

+   SET_SecondaryColor3iEXT(dest, loopback_SecondaryColor3iEXT_f);

+   SET_SecondaryColor3sEXT(dest, loopback_SecondaryColor3sEXT_f);

+   SET_SecondaryColor3uiEXT(dest, loopback_SecondaryColor3uiEXT_f);

+   SET_SecondaryColor3usEXT(dest, loopback_SecondaryColor3usEXT_f);

+   SET_SecondaryColor3ubEXT(dest, loopback_SecondaryColor3ubEXT_f);

+   SET_SecondaryColor3bvEXT(dest, loopback_SecondaryColor3bvEXT_f);

+   SET_SecondaryColor3dvEXT(dest, loopback_SecondaryColor3dvEXT_f);

+   SET_SecondaryColor3ivEXT(dest, loopback_SecondaryColor3ivEXT_f);

+   SET_SecondaryColor3svEXT(dest, loopback_SecondaryColor3svEXT_f);

+   SET_SecondaryColor3uivEXT(dest, loopback_SecondaryColor3uivEXT_f);

+   SET_SecondaryColor3usvEXT(dest, loopback_SecondaryColor3usvEXT_f);

+   SET_SecondaryColor3ubvEXT(dest, loopback_SecondaryColor3ubvEXT_f);

+      

+   SET_EdgeFlagv(dest, loopback_EdgeFlagv);

+

+   SET_Indexd(dest, loopback_Indexd);

+   SET_Indexi(dest, loopback_Indexi);

+   SET_Indexs(dest, loopback_Indexs);

+   SET_Indexub(dest, loopback_Indexub);

+   SET_Indexdv(dest, loopback_Indexdv);

+   SET_Indexiv(dest, loopback_Indexiv);

+   SET_Indexsv(dest, loopback_Indexsv);

+   SET_Indexubv(dest, loopback_Indexubv);

+   SET_Normal3b(dest, loopback_Normal3b);

+   SET_Normal3d(dest, loopback_Normal3d);

+   SET_Normal3i(dest, loopback_Normal3i);

+   SET_Normal3s(dest, loopback_Normal3s);

+   SET_Normal3bv(dest, loopback_Normal3bv);

+   SET_Normal3dv(dest, loopback_Normal3dv);

+   SET_Normal3iv(dest, loopback_Normal3iv);

+   SET_Normal3sv(dest, loopback_Normal3sv);

+   SET_TexCoord1d(dest, loopback_TexCoord1d);

+   SET_TexCoord1i(dest, loopback_TexCoord1i);

+   SET_TexCoord1s(dest, loopback_TexCoord1s);

+   SET_TexCoord2d(dest, loopback_TexCoord2d);

+   SET_TexCoord2s(dest, loopback_TexCoord2s);

+   SET_TexCoord2i(dest, loopback_TexCoord2i);

+   SET_TexCoord3d(dest, loopback_TexCoord3d);

+   SET_TexCoord3i(dest, loopback_TexCoord3i);

+   SET_TexCoord3s(dest, loopback_TexCoord3s);

+   SET_TexCoord4d(dest, loopback_TexCoord4d);

+   SET_TexCoord4i(dest, loopback_TexCoord4i);

+   SET_TexCoord4s(dest, loopback_TexCoord4s);

+   SET_TexCoord1dv(dest, loopback_TexCoord1dv);

+   SET_TexCoord1iv(dest, loopback_TexCoord1iv);

+   SET_TexCoord1sv(dest, loopback_TexCoord1sv);

+   SET_TexCoord2dv(dest, loopback_TexCoord2dv);

+   SET_TexCoord2iv(dest, loopback_TexCoord2iv);

+   SET_TexCoord2sv(dest, loopback_TexCoord2sv);

+   SET_TexCoord3dv(dest, loopback_TexCoord3dv);

+   SET_TexCoord3iv(dest, loopback_TexCoord3iv);

+   SET_TexCoord3sv(dest, loopback_TexCoord3sv);

+   SET_TexCoord4dv(dest, loopback_TexCoord4dv);

+   SET_TexCoord4iv(dest, loopback_TexCoord4iv);

+   SET_TexCoord4sv(dest, loopback_TexCoord4sv);

+   SET_Vertex2d(dest, loopback_Vertex2d);

+   SET_Vertex2i(dest, loopback_Vertex2i);

+   SET_Vertex2s(dest, loopback_Vertex2s);

+   SET_Vertex3d(dest, loopback_Vertex3d);

+   SET_Vertex3i(dest, loopback_Vertex3i);

+   SET_Vertex3s(dest, loopback_Vertex3s);

+   SET_Vertex4d(dest, loopback_Vertex4d);

+   SET_Vertex4i(dest, loopback_Vertex4i);

+   SET_Vertex4s(dest, loopback_Vertex4s);

+   SET_Vertex2dv(dest, loopback_Vertex2dv);

+   SET_Vertex2iv(dest, loopback_Vertex2iv);

+   SET_Vertex2sv(dest, loopback_Vertex2sv);

+   SET_Vertex3dv(dest, loopback_Vertex3dv);

+   SET_Vertex3iv(dest, loopback_Vertex3iv);

+   SET_Vertex3sv(dest, loopback_Vertex3sv);

+   SET_Vertex4dv(dest, loopback_Vertex4dv);

+   SET_Vertex4iv(dest, loopback_Vertex4iv);

+   SET_Vertex4sv(dest, loopback_Vertex4sv);

+   SET_MultiTexCoord1dARB(dest, loopback_MultiTexCoord1dARB);

+   SET_MultiTexCoord1dvARB(dest, loopback_MultiTexCoord1dvARB);

+   SET_MultiTexCoord1iARB(dest, loopback_MultiTexCoord1iARB);

+   SET_MultiTexCoord1ivARB(dest, loopback_MultiTexCoord1ivARB);

+   SET_MultiTexCoord1sARB(dest, loopback_MultiTexCoord1sARB);

+   SET_MultiTexCoord1svARB(dest, loopback_MultiTexCoord1svARB);

+   SET_MultiTexCoord2dARB(dest, loopback_MultiTexCoord2dARB);

+   SET_MultiTexCoord2dvARB(dest, loopback_MultiTexCoord2dvARB);

+   SET_MultiTexCoord2iARB(dest, loopback_MultiTexCoord2iARB);

+   SET_MultiTexCoord2ivARB(dest, loopback_MultiTexCoord2ivARB);

+   SET_MultiTexCoord2sARB(dest, loopback_MultiTexCoord2sARB);

+   SET_MultiTexCoord2svARB(dest, loopback_MultiTexCoord2svARB);

+   SET_MultiTexCoord3dARB(dest, loopback_MultiTexCoord3dARB);

+   SET_MultiTexCoord3dvARB(dest, loopback_MultiTexCoord3dvARB);

+   SET_MultiTexCoord3iARB(dest, loopback_MultiTexCoord3iARB);

+   SET_MultiTexCoord3ivARB(dest, loopback_MultiTexCoord3ivARB);

+   SET_MultiTexCoord3sARB(dest, loopback_MultiTexCoord3sARB);

+   SET_MultiTexCoord3svARB(dest, loopback_MultiTexCoord3svARB);

+   SET_MultiTexCoord4dARB(dest, loopback_MultiTexCoord4dARB);

+   SET_MultiTexCoord4dvARB(dest, loopback_MultiTexCoord4dvARB);

+   SET_MultiTexCoord4iARB(dest, loopback_MultiTexCoord4iARB);

+   SET_MultiTexCoord4ivARB(dest, loopback_MultiTexCoord4ivARB);

+   SET_MultiTexCoord4sARB(dest, loopback_MultiTexCoord4sARB);

+   SET_MultiTexCoord4svARB(dest, loopback_MultiTexCoord4svARB);

+   SET_EvalCoord2dv(dest, loopback_EvalCoord2dv);

+   SET_EvalCoord2fv(dest, loopback_EvalCoord2fv);

+   SET_EvalCoord2d(dest, loopback_EvalCoord2d);

+   SET_EvalCoord1dv(dest, loopback_EvalCoord1dv);

+   SET_EvalCoord1fv(dest, loopback_EvalCoord1fv);

+   SET_EvalCoord1d(dest, loopback_EvalCoord1d);

+   SET_Materialf(dest, loopback_Materialf);

+   SET_Materiali(dest, loopback_Materiali);

+   SET_Materialiv(dest, loopback_Materialiv);

+   SET_Rectd(dest, loopback_Rectd);

+   SET_Rectdv(dest, loopback_Rectdv);

+   SET_Rectfv(dest, loopback_Rectfv);

+   SET_Recti(dest, loopback_Recti);

+   SET_Rectiv(dest, loopback_Rectiv);

+   SET_Rects(dest, loopback_Rects);

+   SET_Rectsv(dest, loopback_Rectsv);

+   SET_FogCoorddEXT(dest, loopback_FogCoorddEXT);

+   SET_FogCoorddvEXT(dest, loopback_FogCoorddvEXT);

+

+   SET_VertexAttrib1sNV(dest, loopback_VertexAttrib1sNV);

+   SET_VertexAttrib1dNV(dest, loopback_VertexAttrib1dNV);

+   SET_VertexAttrib2sNV(dest, loopback_VertexAttrib2sNV);

+   SET_VertexAttrib2dNV(dest, loopback_VertexAttrib2dNV);

+   SET_VertexAttrib3sNV(dest, loopback_VertexAttrib3sNV);

+   SET_VertexAttrib3dNV(dest, loopback_VertexAttrib3dNV);

+   SET_VertexAttrib4sNV(dest, loopback_VertexAttrib4sNV);

+   SET_VertexAttrib4dNV(dest, loopback_VertexAttrib4dNV);

+   SET_VertexAttrib4ubNV(dest, loopback_VertexAttrib4ubNV);

+   SET_VertexAttrib1svNV(dest, loopback_VertexAttrib1svNV);

+   SET_VertexAttrib1dvNV(dest, loopback_VertexAttrib1dvNV);

+   SET_VertexAttrib2svNV(dest, loopback_VertexAttrib2svNV);

+   SET_VertexAttrib2dvNV(dest, loopback_VertexAttrib2dvNV);

+   SET_VertexAttrib3svNV(dest, loopback_VertexAttrib3svNV);

+   SET_VertexAttrib3dvNV(dest, loopback_VertexAttrib3dvNV);

+   SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV);

+   SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV);

+   SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV);

+   SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV);

+   SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV);

+   SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV);

+   SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV);

+   SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV);

+   SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV);

+   SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV);

+   SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV);

+   SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV);

+   SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV);

+   SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV);

+   SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV);

+   SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV);

+

+   SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB);

+   SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB);

+   SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB);

+   SET_VertexAttrib2dARB(dest, loopback_VertexAttrib2dARB);

+   SET_VertexAttrib3sARB(dest, loopback_VertexAttrib3sARB);

+   SET_VertexAttrib3dARB(dest, loopback_VertexAttrib3dARB);

+   SET_VertexAttrib4sARB(dest, loopback_VertexAttrib4sARB);

+   SET_VertexAttrib4dARB(dest, loopback_VertexAttrib4dARB);

+   SET_VertexAttrib1svARB(dest, loopback_VertexAttrib1svARB);

+   SET_VertexAttrib1dvARB(dest, loopback_VertexAttrib1dvARB);

+   SET_VertexAttrib2svARB(dest, loopback_VertexAttrib2svARB);

+   SET_VertexAttrib2dvARB(dest, loopback_VertexAttrib2dvARB);

+   SET_VertexAttrib3svARB(dest, loopback_VertexAttrib3svARB);

+   SET_VertexAttrib3dvARB(dest, loopback_VertexAttrib3dvARB);

+   SET_VertexAttrib4svARB(dest, loopback_VertexAttrib4svARB);

+   SET_VertexAttrib4dvARB(dest, loopback_VertexAttrib4dvARB);

+   SET_VertexAttrib4NubARB(dest, loopback_VertexAttrib4NubARB);

+   SET_VertexAttrib4NubvARB(dest, loopback_VertexAttrib4NubvARB);

+   SET_VertexAttrib4bvARB(dest, loopback_VertexAttrib4bvARB);

+   SET_VertexAttrib4ivARB(dest, loopback_VertexAttrib4ivARB);

+   SET_VertexAttrib4ubvARB(dest, loopback_VertexAttrib4ubvARB);

+   SET_VertexAttrib4usvARB(dest, loopback_VertexAttrib4usvARB);

+   SET_VertexAttrib4uivARB(dest, loopback_VertexAttrib4uivARB);

+   SET_VertexAttrib4NbvARB(dest, loopback_VertexAttrib4NbvARB);

+   SET_VertexAttrib4NsvARB(dest, loopback_VertexAttrib4NsvARB);

+   SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB);

+   SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB);

+   SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB);

+

+   /* GL_EXT_gpu_shader4, GL 3.0 */

+   SET_VertexAttribI1ivEXT(dest, loopback_VertexAttribI1iv);

+   SET_VertexAttribI1uivEXT(dest, loopback_VertexAttribI1uiv);

+   SET_VertexAttribI4bvEXT(dest, loopback_VertexAttribI4bv);

+   SET_VertexAttribI4svEXT(dest, loopback_VertexAttribI4sv);

+   SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv);

+   SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv);

+}

+

+

+#endif /* FEATURE_beginend */

diff --git a/mesalib/src/mesa/main/api_loopback.h b/mesalib/src/mesa/main/api_loopback.h
index 3140eb515..921637641 100644
--- a/mesalib/src/mesa/main/api_loopback.h
+++ b/mesalib/src/mesa/main/api_loopback.h
@@ -1,45 +1,48 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 API_LOOPBACK_H
-#define API_LOOPBACK_H
-
-#include "main/mtypes.h"
-
-#if FEATURE_beginend
-
-extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
-
-#else /* FEATURE_beginend */
-
-static INLINE void
-_mesa_loopback_init_api_table( struct _glapi_table *dest )
-{
-}
-
-#endif /* FEATURE_beginend */
-
-#endif /* API_LOOPBACK_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 API_LOOPBACK_H

+#define API_LOOPBACK_H

+

+#include "main/compiler.h"

+#include "main/mfeatures.h"

+

+struct _glapi_table;

+

+#if FEATURE_beginend

+

+extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );

+

+#else /* FEATURE_beginend */

+

+static INLINE void

+_mesa_loopback_init_api_table( struct _glapi_table *dest )

+{

+}

+

+#endif /* FEATURE_beginend */

+

+#endif /* API_LOOPBACK_H */

diff --git a/mesalib/src/mesa/main/api_noop.c b/mesalib/src/mesa/main/api_noop.c
index 9a36394d6..f13d3641b 100644
--- a/mesalib/src/mesa/main/api_noop.c
+++ b/mesalib/src/mesa/main/api_noop.c
@@ -1,1072 +1,1084 @@
-/*
- * 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 "api_noop.h"
-#include "api_validate.h"
-#include "api_arrayelt.h"
-#include "context.h"
-#include "light.h"
-#include "macros.h"
-#include "dlist.h"
-#include "eval.h"
-#include "main/dispatch.h"
-
-
-/**
- * \file
- * Just update the ctx->Current vertex attributes.
- * These functions are used when outside glBegin/glEnd or outside display
- * lists.
- */
-
-
-#if FEATURE_beginend
-
-
-static void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] = (GLfloat)b;
-}
-
-static void GLAPIENTRY _mesa_noop_Indexf( GLfloat f )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0] = f;
-}
-
-static void GLAPIENTRY _mesa_noop_Indexfv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0] = *v;
-}
-
-static void GLAPIENTRY _mesa_noop_FogCoordfEXT( GLfloat a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_FOG];
-   dest[0] = a;
-   dest[1] = 0.0;
-   dest[2] = 0.0;
-   dest[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_FogCoordfvEXT( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_FOG];
-   dest[0] = v[0];
-   dest[1] = 0.0;
-   dest[2] = 0.0;
-   dest[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
-   dest[0] = a;
-   dest[1] = b;
-   dest[2] = c;
-   dest[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_Normal3fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   dest[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-   color[0] = a;
-   color[1] = b;
-   color[2] = c;
-   color[3] = d;
-}
-
-static void GLAPIENTRY _mesa_noop_Color4fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-   color[0] = v[0];
-   color[1] = v[1];
-   color[2] = v[2];
-   color[3] = v[3];
-}
-
-static void GLAPIENTRY _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-   color[0] = a;
-   color[1] = b;
-   color[2] = c;
-   color[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_Color3fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-   color[0] = v[0];
-   color[1] = v[1];
-   color[2] = v[2];
-   color[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = a;
-      dest[1] = 0;
-      dest[2] = 0;
-      dest[3] = 1;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = v[0];
-      dest[1] = 0;
-      dest[2] = 0;
-      dest[3] = 1;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = a;
-      dest[1] = b;
-      dest[2] = 0;
-      dest[3] = 1;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = v[0];
-      dest[1] = v[1];
-      dest[2] = 0;
-      dest[3] = 1;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = a;
-      dest[1] = b;
-      dest[2] = c;
-      dest[3] = 1;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = v[0];
-      dest[1] = v[1];
-      dest[2] = v[2];
-      dest[3] = 1;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b,
-			      GLfloat c, GLfloat d )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = a;
-      dest[1] = b;
-      dest[2] = c;
-      dest[3] = d;
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint unit = target - GL_TEXTURE0_ARB;
-
-   /* unit is unsigned -- cannot be less than zero.
-    */
-   if (unit < MAX_TEXTURE_COORD_UNITS)
-   {
-      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];
-      dest[0] = v[0];
-      dest[1] = v[1];
-      dest[2] = v[2];
-      dest[3] = v[3];
-   }
-}
-
-static void GLAPIENTRY _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
-   color[0] = a;
-   color[1] = b;
-   color[2] = c;
-   color[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
-   color[0] = v[0];
-   color[1] = v[1];
-   color[2] = v[2];
-   color[3] = 1.0;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord1f( GLfloat a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = a;
-   dest[1] = 0;
-   dest[2] = 0;
-   dest[3] = 1;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord1fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = v[0];
-   dest[1] = 0;
-   dest[2] = 0;
-   dest[3] = 1;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord2f( GLfloat a, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = a;
-   dest[1] = b;
-   dest[2] = 0;
-   dest[3] = 1;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord2fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = 0;
-   dest[3] = 1;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = a;
-   dest[1] = b;
-   dest[2] = c;
-   dest[3] = 1;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord3fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   dest[3] = 1;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = a;
-   dest[1] = b;
-   dest[2] = c;
-   dest[3] = d;
-}
-
-static void GLAPIENTRY _mesa_noop_TexCoord4fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   dest[3] = v[3];
-}
-
-
-/**
- * GL_NV_vertex_program attributes.
- * Note that these attributes alias the conventional vertex attributes.
- */
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], x, 0, 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], v[0], 0, 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fvNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], x, y, 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fvNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x,
-                                  GLfloat y, GLfloat z )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], x, y, z, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], v[2], 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fvNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x,
-                                  GLfloat y, GLfloat z, GLfloat w )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], x, y, z, w);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fNV(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], v[2], v[3]);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fvNV(index)" );
-}
-
-
-
-/**
- * GL_ARB_vertex_program attributes.
- * Note that these attributes DO NOT alias the conventional vertex attributes.
- */
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib1fARB( GLuint index, GLfloat x )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, 0, 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib1fvARB( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], 0, 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fvARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib2fARB( GLuint index, GLfloat x, GLfloat y )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib2fvARB( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], 0, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fvARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib3fARB( GLuint index, GLfloat x,
-                                  GLfloat y, GLfloat z )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib3fvARB( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], 1);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fvARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib4fARB( GLuint index, GLfloat x,
-                                  GLfloat y, GLfloat z, GLfloat w )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, w);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fARB(index)" );
-}
-
-static void GLAPIENTRY _mesa_noop_VertexAttrib4fvARB( GLuint index, const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {
-      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], v[3]);
-   }
-   else
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fvARB(index)" );
-}
-
-
-
-/**
- * Called by glMaterial*()
- */
-void GLAPIENTRY
-_mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i, nr;
-   struct gl_material *mat = &ctx->Light.Material;
-   GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0,
-                                            "_mesa_noop_Materialfv" );
-
-   if (ctx->Light.ColorMaterialEnabled)
-      bitmask &= ~ctx->Light.ColorMaterialBitmask;
-
-   if (bitmask == 0)
-      return;
-
-   switch (pname) {
-   case GL_SHININESS: nr = 1; break;
-   case GL_COLOR_INDEXES: nr = 3; break;
-   default: nr = 4 ; break;
-   }
-
-   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
-      if (bitmask & (1<<i))
-	 COPY_SZ_4V( mat->Attrib[i], nr, params ); 
-
-   _mesa_update_material( ctx, bitmask );
-}
-
-
-/**
- * These really are noops outside begin/end:
- */
-static void GLAPIENTRY _mesa_noop_Vertex2fv( const GLfloat *v )
-{
-   (void) v;
-}
-
-static void GLAPIENTRY _mesa_noop_Vertex3fv( const GLfloat *v )
-{
-   (void) v;
-}
-
-static void GLAPIENTRY _mesa_noop_Vertex4fv( const GLfloat *v )
-{
-   (void) v;
-}
-
-static void GLAPIENTRY _mesa_noop_Vertex2f( GLfloat a, GLfloat b )
-{
-   (void) a; (void) b;
-}
-
-static void GLAPIENTRY _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c )
-{
-   (void) a; (void) b; (void) c;
-}
-
-static void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
-{
-   (void) a; (void) b; (void) c; (void) d;
-}
-
-
-#if FEATURE_evaluators
-/* Similarly, these have no effect outside begin/end:
- */
-static void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a )
-{
-   (void) a;
-}
-
-static void GLAPIENTRY _mesa_noop_EvalCoord1fv( const GLfloat *v )
-{
-   (void) v;
-}
-
-static void GLAPIENTRY _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b )
-{
-   (void) a; (void) b;
-}
-
-static void GLAPIENTRY _mesa_noop_EvalCoord2fv( const GLfloat *v )
-{
-   (void) v;
-}
-
-static void GLAPIENTRY _mesa_noop_EvalPoint1( GLint a )
-{
-   (void) a;
-}
-
-static void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b )
-{
-   (void) a; (void) b;
-}
-#endif /* FEATURE_evaluators */
-
-
-/* Begin -- call into driver, should result in the vtxfmt being
- * swapped out:
- */
-static void GLAPIENTRY _mesa_noop_Begin( GLenum mode )
-{
-   (void) mode;
-}
-
-
-/* End -- just raise an error
- */
-static void GLAPIENTRY _mesa_noop_End( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd(no glBegin)" );
-}
-
-
-/**
- * Execute a glRectf() function.  This is not suitable for GL_COMPILE
- * modes (as the test for outside begin/end is not compiled),
- * but may be useful for drivers in circumstances which exclude
- * display list interactions.
- *
- * (None of the functions in this file are suitable for GL_COMPILE
- * modes).
- */
-void GLAPIENTRY
-_mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
-{
-   {
-      GET_CURRENT_CONTEXT(ctx);
-      ASSERT_OUTSIDE_BEGIN_END(ctx);
-   }
-
-   CALL_Begin(GET_DISPATCH(), (GL_QUADS));
-   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(), ());
-}
-
-
-/**
- * Some very basic support for arrays.  Drivers without explicit array
- * support can hook these in, but still need to supply an array-elt
- * implementation.
- */
-static void GLAPIENTRY
-_mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))
-      return;
-
-   CALL_Begin(GET_DISPATCH(), (mode));
-   for (i = 0; i < count; i++)
-       CALL_ArrayElement(GET_DISPATCH(), (start + i));
-   CALL_End(GET_DISPATCH(), ());
-}
-
-
-static void GLAPIENTRY
-_mesa_noop_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;
-
-   CALL_Begin(GET_DISPATCH(), (mode));
-
-   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(), ());
-}
-
-static void GLAPIENTRY
-_mesa_noop_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-				  const GLvoid *indices, GLint basevertex)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices,
-				     basevertex ))
-      return;
-
-   CALL_Begin(GET_DISPATCH(), (mode));
-
-   switch (type) {
-   case GL_UNSIGNED_BYTE:
-      for (i = 0 ; i < count ; i++)
-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] +
-					      basevertex));
-      break;
-   case GL_UNSIGNED_SHORT:
-      for (i = 0 ; i < count ; i++)
-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] +
-					      basevertex ));
-      break;
-   case GL_UNSIGNED_INT:
-      for (i = 0 ; i < count ; i++)
-	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] +
-					      basevertex ));
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElementsBaseVertex(type)" );
-      break;
-   }
-
-   CALL_End(GET_DISPATCH(), ());
-}
-
-
-static void GLAPIENTRY
-_mesa_noop_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 ))
-       CALL_DrawElements(GET_DISPATCH(), (mode, count, type, indices));
-}
-
-/* GL_EXT_multi_draw_arrays */
-void GLAPIENTRY
-_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
-			     const GLvoid **indices, GLsizei primcount)
-{
-   GLsizei i;
-
-   for (i = 0; i < primcount; i++) {
-      if (count[i] > 0) {
-	 CALL_DrawElements(GET_DISPATCH(), (mode, count[i], type, indices[i]));
-      }
-   }
-}
-
-static void GLAPIENTRY
-_mesa_noop_DrawRangeElementsBaseVertex(GLenum mode,
-				       GLuint start, GLuint end,
-				       GLsizei count, GLenum type,
-				       const GLvoid *indices, GLint basevertex)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (_mesa_validate_DrawRangeElements( ctx, mode,
-					 start, end,
-					 count, type, indices, basevertex ))
-      CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count, type, indices,
-						   basevertex));
-}
-
-/* GL_EXT_multi_draw_arrays */
-void GLAPIENTRY
-_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
-				       GLenum type,
-				       const GLvoid **indices,
-				       GLsizei primcount,
-				       const GLint *basevertex)
-{
-   GLsizei i;
-
-   for (i = 0; i < primcount; i++) {
-      if (count[i] > 0) {
-	 CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count[i], type,
-						      indices[i],
-						      basevertex[i]));
-      }
-   }
-}
-
-/*
- * Eval Mesh
- */
-
-/**
- * KW:
- * If are compiling, we don't know whether eval will produce a
- * vertex when it is run in the future.  If this is pure immediate
- * mode, eval is a noop if neither vertex map is enabled.
- *
- * Thus we need to have a check in the display list code or elsewhere
- * for eval(1,2) vertices in the case where map(1,2)_vertex is
- * disabled, and to purge those vertices from the vb.
- */
-void GLAPIENTRY
-_mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-   GLfloat u, du;
-   GLenum prim;
-
-   switch (mode) {
-   case GL_POINT:
-      prim = GL_POINTS;
-      break;
-   case GL_LINE:
-      prim = GL_LINE_STRIP;
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh1(mode)" );
-      return;
-   }
-
-   /* No effect if vertex maps disabled.
-    */
-   if (!ctx->Eval.Map1Vertex4 && 
-       !ctx->Eval.Map1Vertex3 &&
-       !(ctx->VertexProgram._Enabled && ctx->Eval.Map1Attrib[VERT_ATTRIB_POS]))
-      return;
-
-   du = ctx->Eval.MapGrid1du;
-   u = ctx->Eval.MapGrid1u1 + i1 * du;
-
-   CALL_Begin(GET_DISPATCH(), (prim));
-   for (i=i1;i<=i2;i++,u+=du) {
-      CALL_EvalCoord1f(GET_DISPATCH(), (u));
-   }
-   CALL_End(GET_DISPATCH(), ());
-}
-
-
-
-void GLAPIENTRY
-_mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat u, du, v, dv, v1, u1;
-   GLint i, j;
-
-   switch (mode) {
-   case GL_POINT:
-   case GL_LINE:
-   case GL_FILL:
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
-      return;
-   }
-
-   /* No effect if vertex maps disabled.
-    */
-   if (!ctx->Eval.Map2Vertex4 && 
-       !ctx->Eval.Map2Vertex3 &&
-       !(ctx->VertexProgram._Enabled && ctx->Eval.Map2Attrib[VERT_ATTRIB_POS]))
-      return;
-
-   du = ctx->Eval.MapGrid2du;
-   dv = ctx->Eval.MapGrid2dv;
-   v1 = ctx->Eval.MapGrid2v1 + j1 * dv;
-   u1 = ctx->Eval.MapGrid2u1 + i1 * du;
-
-   switch (mode) {
-   case GL_POINT:
-      CALL_Begin(GET_DISPATCH(), (GL_POINTS));
-      for (v=v1,j=j1;j<=j2;j++,v+=dv) {
-	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
-	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));
-	 }
-      }
-      CALL_End(GET_DISPATCH(), ());
-      break;
-   case GL_LINE:
-      for (v=v1,j=j1;j<=j2;j++,v+=dv) {
-	 CALL_Begin(GET_DISPATCH(), (GL_LINE_STRIP));
-	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
-	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));
-	 }
-	 CALL_End(GET_DISPATCH(), ());
-      }
-      for (u=u1,i=i1;i<=i2;i++,u+=du) {
-	 CALL_Begin(GET_DISPATCH(), (GL_LINE_STRIP));
-	 for (v=v1,j=j1;j<=j2;j++,v+=dv) {
-	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));
-	 }
-	 CALL_End(GET_DISPATCH(), ());
-      }
-      break;
-   case GL_FILL:
-      for (v=v1,j=j1;j<j2;j++,v+=dv) {
-	 CALL_Begin(GET_DISPATCH(), (GL_TRIANGLE_STRIP));
-	 for (u=u1,i=i1;i<=i2;i++,u+=du) {
-	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));
-	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v+dv));
-	 }
-	 CALL_End(GET_DISPATCH(), ());
-      }
-      break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
-      return;
-   }
-}
-
-
-
-/**
- * Build a vertexformat of functions to use outside begin/end pairs.
- * 
- * TODO -- build a whole dispatch table for this purpose, and likewise
- * for inside begin/end.
- */
-void
-_mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
-{
-   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);
-
-   vfmt->Begin = _mesa_noop_Begin;
-
-   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
-
-   vfmt->Color3f = _mesa_noop_Color3f;
-   vfmt->Color3fv = _mesa_noop_Color3fv;
-   vfmt->Color4f = _mesa_noop_Color4f;
-   vfmt->Color4fv = _mesa_noop_Color4fv;
-   vfmt->EdgeFlag = _mesa_noop_EdgeFlag;
-   vfmt->End = _mesa_noop_End;
-
-   _MESA_INIT_EVAL_VTXFMT(vfmt, _mesa_noop_);
-
-   vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;
-   vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT;
-   vfmt->Indexf = _mesa_noop_Indexf;
-   vfmt->Indexfv = _mesa_noop_Indexfv;
-   vfmt->Materialfv = _mesa_noop_Materialfv;
-   vfmt->MultiTexCoord1fARB = _mesa_noop_MultiTexCoord1fARB;
-   vfmt->MultiTexCoord1fvARB = _mesa_noop_MultiTexCoord1fvARB;
-   vfmt->MultiTexCoord2fARB = _mesa_noop_MultiTexCoord2fARB;
-   vfmt->MultiTexCoord2fvARB = _mesa_noop_MultiTexCoord2fvARB;
-   vfmt->MultiTexCoord3fARB = _mesa_noop_MultiTexCoord3fARB;
-   vfmt->MultiTexCoord3fvARB = _mesa_noop_MultiTexCoord3fvARB;
-   vfmt->MultiTexCoord4fARB = _mesa_noop_MultiTexCoord4fARB;
-   vfmt->MultiTexCoord4fvARB = _mesa_noop_MultiTexCoord4fvARB;
-   vfmt->Normal3f = _mesa_noop_Normal3f;
-   vfmt->Normal3fv = _mesa_noop_Normal3fv;
-   vfmt->SecondaryColor3fEXT = _mesa_noop_SecondaryColor3fEXT;
-   vfmt->SecondaryColor3fvEXT = _mesa_noop_SecondaryColor3fvEXT;
-   vfmt->TexCoord1f = _mesa_noop_TexCoord1f;
-   vfmt->TexCoord1fv = _mesa_noop_TexCoord1fv;
-   vfmt->TexCoord2f = _mesa_noop_TexCoord2f;
-   vfmt->TexCoord2fv = _mesa_noop_TexCoord2fv;
-   vfmt->TexCoord3f = _mesa_noop_TexCoord3f;
-   vfmt->TexCoord3fv = _mesa_noop_TexCoord3fv;
-   vfmt->TexCoord4f = _mesa_noop_TexCoord4f;
-   vfmt->TexCoord4fv = _mesa_noop_TexCoord4fv;
-   vfmt->Vertex2f = _mesa_noop_Vertex2f;
-   vfmt->Vertex2fv = _mesa_noop_Vertex2fv;
-   vfmt->Vertex3f = _mesa_noop_Vertex3f;
-   vfmt->Vertex3fv = _mesa_noop_Vertex3fv;
-   vfmt->Vertex4f = _mesa_noop_Vertex4f;
-   vfmt->Vertex4fv = _mesa_noop_Vertex4fv;
-   vfmt->VertexAttrib1fNV = _mesa_noop_VertexAttrib1fNV;
-   vfmt->VertexAttrib1fvNV = _mesa_noop_VertexAttrib1fvNV;
-   vfmt->VertexAttrib2fNV = _mesa_noop_VertexAttrib2fNV;
-   vfmt->VertexAttrib2fvNV = _mesa_noop_VertexAttrib2fvNV;
-   vfmt->VertexAttrib3fNV = _mesa_noop_VertexAttrib3fNV;
-   vfmt->VertexAttrib3fvNV = _mesa_noop_VertexAttrib3fvNV;
-   vfmt->VertexAttrib4fNV = _mesa_noop_VertexAttrib4fNV;
-   vfmt->VertexAttrib4fvNV = _mesa_noop_VertexAttrib4fvNV;
-   vfmt->VertexAttrib1fARB = _mesa_noop_VertexAttrib1fARB;
-   vfmt->VertexAttrib1fvARB = _mesa_noop_VertexAttrib1fvARB;
-   vfmt->VertexAttrib2fARB = _mesa_noop_VertexAttrib2fARB;
-   vfmt->VertexAttrib2fvARB = _mesa_noop_VertexAttrib2fvARB;
-   vfmt->VertexAttrib3fARB = _mesa_noop_VertexAttrib3fARB;
-   vfmt->VertexAttrib3fvARB = _mesa_noop_VertexAttrib3fvARB;
-   vfmt->VertexAttrib4fARB = _mesa_noop_VertexAttrib4fARB;
-   vfmt->VertexAttrib4fvARB = _mesa_noop_VertexAttrib4fvARB;
-
-   vfmt->Rectf = _mesa_noop_Rectf;
-
-   vfmt->DrawArrays = _mesa_noop_DrawArrays;
-   vfmt->DrawElements = _mesa_noop_DrawElements;
-   vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements;
-   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
-   vfmt->DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex;
-   vfmt->DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;
-   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;
-}
-
-
-#endif /* FEATURE_beginend */
+/*

+ * 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 "api_noop.h"

+#include "api_validate.h"

+#include "api_arrayelt.h"

+#include "context.h"

+#include "light.h"

+#include "macros.h"

+#include "dlist.h"

+#include "eval.h"

+#include "main/dispatch.h"

+

+

+/**

+ * \file

+ * Just update the ctx->Current vertex attributes.

+ * These functions are used when outside glBegin/glEnd or outside display

+ * lists.

+ */

+

+

+#if FEATURE_beginend

+

+

+static void GLAPIENTRY _mesa_noop_EdgeFlag( GLboolean b )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] = (GLfloat)b;

+}

+

+static void GLAPIENTRY _mesa_noop_Indexf( GLfloat f )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0] = f;

+}

+

+static void GLAPIENTRY _mesa_noop_Indexfv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0] = *v;

+}

+

+static void GLAPIENTRY _mesa_noop_FogCoordfEXT( GLfloat a )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_FOG];

+   dest[0] = a;

+   dest[1] = 0.0;

+   dest[2] = 0.0;

+   dest[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_FogCoordfvEXT( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_FOG];

+   dest[0] = v[0];

+   dest[1] = 0.0;

+   dest[2] = 0.0;

+   dest[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_Normal3f( GLfloat a, GLfloat b, GLfloat c )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];

+   dest[0] = a;

+   dest[1] = b;

+   dest[2] = c;

+   dest[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_Normal3fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];

+   dest[0] = v[0];

+   dest[1] = v[1];

+   dest[2] = v[2];

+   dest[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_Color4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+   color[0] = a;

+   color[1] = b;

+   color[2] = c;

+   color[3] = d;

+}

+

+static void GLAPIENTRY _mesa_noop_Color4fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+   color[0] = v[0];

+   color[1] = v[1];

+   color[2] = v[2];

+   color[3] = v[3];

+}

+

+static void GLAPIENTRY _mesa_noop_Color3f( GLfloat a, GLfloat b, GLfloat c )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+   color[0] = a;

+   color[1] = b;

+   color[2] = c;

+   color[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_Color3fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+   color[0] = v[0];

+   color[1] = v[1];

+   color[2] = v[2];

+   color[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord1fARB( GLenum target, GLfloat a )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = a;

+      dest[1] = 0;

+      dest[2] = 0;

+      dest[3] = 1;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord1fvARB( GLenum target, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = v[0];

+      dest[1] = 0;

+      dest[2] = 0;

+      dest[3] = 1;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord2fARB( GLenum target, GLfloat a, GLfloat b )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = a;

+      dest[1] = b;

+      dest[2] = 0;

+      dest[3] = 1;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord2fvARB( GLenum target, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = v[0];

+      dest[1] = v[1];

+      dest[2] = 0;

+      dest[3] = 1;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord3fARB( GLenum target, GLfloat a, GLfloat b, GLfloat c)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = a;

+      dest[1] = b;

+      dest[2] = c;

+      dest[3] = 1;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord3fvARB( GLenum target, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = v[0];

+      dest[1] = v[1];

+      dest[2] = v[2];

+      dest[3] = 1;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord4fARB( GLenum target, GLfloat a, GLfloat b,

+			      GLfloat c, GLfloat d )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = a;

+      dest[1] = b;

+      dest[2] = c;

+      dest[3] = d;

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_MultiTexCoord4fvARB( GLenum target, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint unit = target - GL_TEXTURE0_ARB;

+

+   /* unit is unsigned -- cannot be less than zero.

+    */

+   if (unit < MAX_TEXTURE_COORD_UNITS)

+   {

+      GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit];

+      dest[0] = v[0];

+      dest[1] = v[1];

+      dest[2] = v[2];

+      dest[3] = v[3];

+   }

+}

+

+static void GLAPIENTRY _mesa_noop_SecondaryColor3fEXT( GLfloat a, GLfloat b, GLfloat c )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];

+   color[0] = a;

+   color[1] = b;

+   color[2] = c;

+   color[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_SecondaryColor3fvEXT( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *color = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];

+   color[0] = v[0];

+   color[1] = v[1];

+   color[2] = v[2];

+   color[3] = 1.0;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord1f( GLfloat a )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = a;

+   dest[1] = 0;

+   dest[2] = 0;

+   dest[3] = 1;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord1fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = v[0];

+   dest[1] = 0;

+   dest[2] = 0;

+   dest[3] = 1;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord2f( GLfloat a, GLfloat b )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = a;

+   dest[1] = b;

+   dest[2] = 0;

+   dest[3] = 1;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord2fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = v[0];

+   dest[1] = v[1];

+   dest[2] = 0;

+   dest[3] = 1;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord3f( GLfloat a, GLfloat b, GLfloat c )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = a;

+   dest[1] = b;

+   dest[2] = c;

+   dest[3] = 1;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord3fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = v[0];

+   dest[1] = v[1];

+   dest[2] = v[2];

+   dest[3] = 1;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = a;

+   dest[1] = b;

+   dest[2] = c;

+   dest[3] = d;

+}

+

+static void GLAPIENTRY _mesa_noop_TexCoord4fv( const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat *dest = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+   dest[0] = v[0];

+   dest[1] = v[1];

+   dest[2] = v[2];

+   dest[3] = v[3];

+}

+

+

+/**

+ * GL_NV_vertex_program attributes.

+ * Note that these attributes alias the conventional vertex attributes.

+ */

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib1fNV( GLuint index, GLfloat x )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], x, 0, 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib1fvNV( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], 0, 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fvNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], x, y, 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib2fvNV( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fvNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib3fNV( GLuint index, GLfloat x,

+                                  GLfloat y, GLfloat z )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], x, y, z, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib3fvNV( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], v[2], 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fvNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib4fNV( GLuint index, GLfloat x,

+                                  GLfloat y, GLfloat z, GLfloat w )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], x, y, z, w);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fNV(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib4fvNV( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      ASSIGN_4V(ctx->Current.Attrib[index], v[0], v[1], v[2], v[3]);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fvNV(index)" );

+}

+

+

+

+/**

+ * GL_ARB_vertex_program attributes.

+ * Note that these attributes DO NOT alias the conventional vertex attributes.

+ */

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib1fARB( GLuint index, GLfloat x )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, 0, 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib1fvARB( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], 0, 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib1fvARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib2fARB( GLuint index, GLfloat x, GLfloat y )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib2fvARB( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], 0, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib2fvARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib3fARB( GLuint index, GLfloat x,

+                                  GLfloat y, GLfloat z )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib3fvARB( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], 1);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib3fvARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib4fARB( GLuint index, GLfloat x,

+                                  GLfloat y, GLfloat z, GLfloat w )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], x, y, z, w);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fARB(index)" );

+}

+

+static void GLAPIENTRY _mesa_noop_VertexAttrib4fvARB( GLuint index, const GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (index < MAX_VERTEX_GENERIC_ATTRIBS) {

+      ASSIGN_4V(ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index], v[0], v[1], v[2], v[3]);

+   }

+   else

+      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexAttrib4fvARB(index)" );

+}

+

+

+

+/**

+ * Called by glMaterial*()

+ */

+void GLAPIENTRY

+_mesa_noop_Materialfv( GLenum face, GLenum pname, const GLfloat *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i, nr;

+   struct gl_material *mat = &ctx->Light.Material;

+   GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0,

+                                            "_mesa_noop_Materialfv" );

+

+   if (ctx->Light.ColorMaterialEnabled)

+      bitmask &= ~ctx->Light.ColorMaterialBitmask;

+

+   if (bitmask == 0)

+      return;

+

+   switch (pname) {

+   case GL_SHININESS: nr = 1; break;

+   case GL_COLOR_INDEXES: nr = 3; break;

+   default: nr = 4 ; break;

+   }

+

+   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 

+      if (bitmask & (1<<i))

+	 COPY_SZ_4V( mat->Attrib[i], nr, params ); 

+

+   _mesa_update_material( ctx, bitmask );

+}

+

+

+/**

+ * These really are noops outside begin/end:

+ */

+static void GLAPIENTRY _mesa_noop_Vertex2fv( const GLfloat *v )

+{

+   (void) v;

+}

+

+static void GLAPIENTRY _mesa_noop_Vertex3fv( const GLfloat *v )

+{

+   (void) v;

+}

+

+static void GLAPIENTRY _mesa_noop_Vertex4fv( const GLfloat *v )

+{

+   (void) v;

+}

+

+static void GLAPIENTRY _mesa_noop_Vertex2f( GLfloat a, GLfloat b )

+{

+   (void) a; (void) b;

+}

+

+static void GLAPIENTRY _mesa_noop_Vertex3f( GLfloat a, GLfloat b, GLfloat c )

+{

+   (void) a; (void) b; (void) c;

+}

+

+static void GLAPIENTRY _mesa_noop_Vertex4f( GLfloat a, GLfloat b, GLfloat c, GLfloat d )

+{

+   (void) a; (void) b; (void) c; (void) d;

+}

+

+

+#if FEATURE_evaluators

+/* Similarly, these have no effect outside begin/end:

+ */

+static void GLAPIENTRY _mesa_noop_EvalCoord1f( GLfloat a )

+{

+   (void) a;

+}

+

+static void GLAPIENTRY _mesa_noop_EvalCoord1fv( const GLfloat *v )

+{

+   (void) v;

+}

+

+static void GLAPIENTRY _mesa_noop_EvalCoord2f( GLfloat a, GLfloat b )

+{

+   (void) a; (void) b;

+}

+

+static void GLAPIENTRY _mesa_noop_EvalCoord2fv( const GLfloat *v )

+{

+   (void) v;

+}

+

+static void GLAPIENTRY _mesa_noop_EvalPoint1( GLint a )

+{

+   (void) a;

+}

+

+static void GLAPIENTRY _mesa_noop_EvalPoint2( GLint a, GLint b )

+{

+   (void) a; (void) b;

+}

+#endif /* FEATURE_evaluators */

+

+

+/* Begin -- call into driver, should result in the vtxfmt being

+ * swapped out:

+ */

+static void GLAPIENTRY _mesa_noop_Begin( GLenum mode )

+{

+   (void) mode;

+}

+

+

+/* End -- just raise an error

+ */

+static void GLAPIENTRY _mesa_noop_End( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd(no glBegin)" );

+}

+

+

+/***

+ * PrimitiveRestart called outside glBegin()/End(): raise an error

+ */

+static void GLAPIENTRY _mesa_noop_PrimitiveRestartNV( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartNV(no glBegin)");

+}

+

+

+/**

+ * Execute a glRectf() function.  This is not suitable for GL_COMPILE

+ * modes (as the test for outside begin/end is not compiled),

+ * but may be useful for drivers in circumstances which exclude

+ * display list interactions.

+ *

+ * (None of the functions in this file are suitable for GL_COMPILE

+ * modes).

+ */

+void GLAPIENTRY

+_mesa_noop_Rectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )

+{

+   {

+      GET_CURRENT_CONTEXT(ctx);

+      ASSERT_OUTSIDE_BEGIN_END(ctx);

+   }

+

+   CALL_Begin(GET_DISPATCH(), (GL_QUADS));

+   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(), ());

+}

+

+

+/**

+ * Some very basic support for arrays.  Drivers without explicit array

+ * support can hook these in, but still need to supply an array-elt

+ * implementation.

+ */

+static void GLAPIENTRY

+_mesa_noop_DrawArrays(GLenum mode, GLint start, GLsizei count)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   if (!_mesa_validate_DrawArrays( ctx, mode, start, count ))

+      return;

+

+   CALL_Begin(GET_DISPATCH(), (mode));

+   for (i = 0; i < count; i++)

+       CALL_ArrayElement(GET_DISPATCH(), (start + i));

+   CALL_End(GET_DISPATCH(), ());

+}

+

+

+static void GLAPIENTRY

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

+

+   CALL_Begin(GET_DISPATCH(), (mode));

+

+   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(), ());

+}

+

+static void GLAPIENTRY

+_mesa_noop_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,

+				  const GLvoid *indices, GLint basevertex)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices,

+				     basevertex ))

+      return;

+

+   CALL_Begin(GET_DISPATCH(), (mode));

+

+   switch (type) {

+   case GL_UNSIGNED_BYTE:

+      for (i = 0 ; i < count ; i++)

+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLubyte *)indices)[i] +

+					      basevertex));

+      break;

+   case GL_UNSIGNED_SHORT:

+      for (i = 0 ; i < count ; i++)

+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLushort *)indices)[i] +

+					      basevertex ));

+      break;

+   case GL_UNSIGNED_INT:

+      for (i = 0 ; i < count ; i++)

+	  CALL_ArrayElement(GET_DISPATCH(), ( ((GLuint *)indices)[i] +

+					      basevertex ));

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glDrawElementsBaseVertex(type)" );

+      break;

+   }

+

+   CALL_End(GET_DISPATCH(), ());

+}

+

+

+static void GLAPIENTRY

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

+       CALL_DrawElements(GET_DISPATCH(), (mode, count, type, indices));

+}

+

+/* GL_EXT_multi_draw_arrays */

+void GLAPIENTRY

+_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,

+			     const GLvoid **indices, GLsizei primcount)

+{

+   GLsizei i;

+

+   for (i = 0; i < primcount; i++) {

+      if (count[i] > 0) {

+	 CALL_DrawElements(GET_DISPATCH(), (mode, count[i], type, indices[i]));

+      }

+   }

+}

+

+static void GLAPIENTRY

+_mesa_noop_DrawRangeElementsBaseVertex(GLenum mode,

+				       GLuint start, GLuint end,

+				       GLsizei count, GLenum type,

+				       const GLvoid *indices, GLint basevertex)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (_mesa_validate_DrawRangeElements( ctx, mode,

+					 start, end,

+					 count, type, indices, basevertex ))

+      CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count, type, indices,

+						   basevertex));

+}

+

+/* GL_EXT_multi_draw_arrays */

+void GLAPIENTRY

+_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,

+				       GLenum type,

+				       const GLvoid **indices,

+				       GLsizei primcount,

+				       const GLint *basevertex)

+{

+   GLsizei i;

+

+   for (i = 0; i < primcount; i++) {

+      if (count[i] > 0) {

+	 CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count[i], type,

+						      indices[i],

+						      basevertex[i]));

+      }

+   }

+}

+

+/*

+ * Eval Mesh

+ */

+

+/**

+ * KW:

+ * If are compiling, we don't know whether eval will produce a

+ * vertex when it is run in the future.  If this is pure immediate

+ * mode, eval is a noop if neither vertex map is enabled.

+ *

+ * Thus we need to have a check in the display list code or elsewhere

+ * for eval(1,2) vertices in the case where map(1,2)_vertex is

+ * disabled, and to purge those vertices from the vb.

+ */

+void GLAPIENTRY

+_mesa_noop_EvalMesh1( GLenum mode, GLint i1, GLint i2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+   GLfloat u, du;

+   GLenum prim;

+

+   switch (mode) {

+   case GL_POINT:

+      prim = GL_POINTS;

+      break;

+   case GL_LINE:

+      prim = GL_LINE_STRIP;

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh1(mode)" );

+      return;

+   }

+

+   /* No effect if vertex maps disabled.

+    */

+   if (!ctx->Eval.Map1Vertex4 && 

+       !ctx->Eval.Map1Vertex3 &&

+       !(ctx->VertexProgram._Enabled && ctx->Eval.Map1Attrib[VERT_ATTRIB_POS]))

+      return;

+

+   du = ctx->Eval.MapGrid1du;

+   u = ctx->Eval.MapGrid1u1 + i1 * du;

+

+   CALL_Begin(GET_DISPATCH(), (prim));

+   for (i=i1;i<=i2;i++,u+=du) {

+      CALL_EvalCoord1f(GET_DISPATCH(), (u));

+   }

+   CALL_End(GET_DISPATCH(), ());

+}

+

+

+

+void GLAPIENTRY

+_mesa_noop_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat u, du, v, dv, v1, u1;

+   GLint i, j;

+

+   switch (mode) {

+   case GL_POINT:

+   case GL_LINE:

+   case GL_FILL:

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );

+      return;

+   }

+

+   /* No effect if vertex maps disabled.

+    */

+   if (!ctx->Eval.Map2Vertex4 && 

+       !ctx->Eval.Map2Vertex3 &&

+       !(ctx->VertexProgram._Enabled && ctx->Eval.Map2Attrib[VERT_ATTRIB_POS]))

+      return;

+

+   du = ctx->Eval.MapGrid2du;

+   dv = ctx->Eval.MapGrid2dv;

+   v1 = ctx->Eval.MapGrid2v1 + j1 * dv;

+   u1 = ctx->Eval.MapGrid2u1 + i1 * du;

+

+   switch (mode) {

+   case GL_POINT:

+      CALL_Begin(GET_DISPATCH(), (GL_POINTS));

+      for (v=v1,j=j1;j<=j2;j++,v+=dv) {

+	 for (u=u1,i=i1;i<=i2;i++,u+=du) {

+	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));

+	 }

+      }

+      CALL_End(GET_DISPATCH(), ());

+      break;

+   case GL_LINE:

+      for (v=v1,j=j1;j<=j2;j++,v+=dv) {

+	 CALL_Begin(GET_DISPATCH(), (GL_LINE_STRIP));

+	 for (u=u1,i=i1;i<=i2;i++,u+=du) {

+	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));

+	 }

+	 CALL_End(GET_DISPATCH(), ());

+      }

+      for (u=u1,i=i1;i<=i2;i++,u+=du) {

+	 CALL_Begin(GET_DISPATCH(), (GL_LINE_STRIP));

+	 for (v=v1,j=j1;j<=j2;j++,v+=dv) {

+	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));

+	 }

+	 CALL_End(GET_DISPATCH(), ());

+      }

+      break;

+   case GL_FILL:

+      for (v=v1,j=j1;j<j2;j++,v+=dv) {

+	 CALL_Begin(GET_DISPATCH(), (GL_TRIANGLE_STRIP));

+	 for (u=u1,i=i1;i<=i2;i++,u+=du) {

+	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v));

+	    CALL_EvalCoord2f(GET_DISPATCH(), (u, v+dv));

+	 }

+	 CALL_End(GET_DISPATCH(), ());

+      }

+      break;

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );

+      return;

+   }

+}

+

+

+

+/**

+ * Build a vertexformat of functions to use outside begin/end pairs.

+ * 

+ * TODO -- build a whole dispatch table for this purpose, and likewise

+ * for inside begin/end.

+ */

+void

+_mesa_noop_vtxfmt_init( GLvertexformat *vfmt )

+{

+   _MESA_INIT_ARRAYELT_VTXFMT(vfmt, _ae_);

+

+   vfmt->Begin = _mesa_noop_Begin;

+

+   _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);

+

+   vfmt->Color3f = _mesa_noop_Color3f;

+   vfmt->Color3fv = _mesa_noop_Color3fv;

+   vfmt->Color4f = _mesa_noop_Color4f;

+   vfmt->Color4fv = _mesa_noop_Color4fv;

+   vfmt->EdgeFlag = _mesa_noop_EdgeFlag;

+   vfmt->End = _mesa_noop_End;

+

+   vfmt->PrimitiveRestartNV = _mesa_noop_PrimitiveRestartNV;

+

+   _MESA_INIT_EVAL_VTXFMT(vfmt, _mesa_noop_);

+

+   vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;

+   vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT;

+   vfmt->Indexf = _mesa_noop_Indexf;

+   vfmt->Indexfv = _mesa_noop_Indexfv;

+   vfmt->Materialfv = _mesa_noop_Materialfv;

+   vfmt->MultiTexCoord1fARB = _mesa_noop_MultiTexCoord1fARB;

+   vfmt->MultiTexCoord1fvARB = _mesa_noop_MultiTexCoord1fvARB;

+   vfmt->MultiTexCoord2fARB = _mesa_noop_MultiTexCoord2fARB;

+   vfmt->MultiTexCoord2fvARB = _mesa_noop_MultiTexCoord2fvARB;

+   vfmt->MultiTexCoord3fARB = _mesa_noop_MultiTexCoord3fARB;

+   vfmt->MultiTexCoord3fvARB = _mesa_noop_MultiTexCoord3fvARB;

+   vfmt->MultiTexCoord4fARB = _mesa_noop_MultiTexCoord4fARB;

+   vfmt->MultiTexCoord4fvARB = _mesa_noop_MultiTexCoord4fvARB;

+   vfmt->Normal3f = _mesa_noop_Normal3f;

+   vfmt->Normal3fv = _mesa_noop_Normal3fv;

+   vfmt->SecondaryColor3fEXT = _mesa_noop_SecondaryColor3fEXT;

+   vfmt->SecondaryColor3fvEXT = _mesa_noop_SecondaryColor3fvEXT;

+   vfmt->TexCoord1f = _mesa_noop_TexCoord1f;

+   vfmt->TexCoord1fv = _mesa_noop_TexCoord1fv;

+   vfmt->TexCoord2f = _mesa_noop_TexCoord2f;

+   vfmt->TexCoord2fv = _mesa_noop_TexCoord2fv;

+   vfmt->TexCoord3f = _mesa_noop_TexCoord3f;

+   vfmt->TexCoord3fv = _mesa_noop_TexCoord3fv;

+   vfmt->TexCoord4f = _mesa_noop_TexCoord4f;

+   vfmt->TexCoord4fv = _mesa_noop_TexCoord4fv;

+   vfmt->Vertex2f = _mesa_noop_Vertex2f;

+   vfmt->Vertex2fv = _mesa_noop_Vertex2fv;

+   vfmt->Vertex3f = _mesa_noop_Vertex3f;

+   vfmt->Vertex3fv = _mesa_noop_Vertex3fv;

+   vfmt->Vertex4f = _mesa_noop_Vertex4f;

+   vfmt->Vertex4fv = _mesa_noop_Vertex4fv;

+   vfmt->VertexAttrib1fNV = _mesa_noop_VertexAttrib1fNV;

+   vfmt->VertexAttrib1fvNV = _mesa_noop_VertexAttrib1fvNV;

+   vfmt->VertexAttrib2fNV = _mesa_noop_VertexAttrib2fNV;

+   vfmt->VertexAttrib2fvNV = _mesa_noop_VertexAttrib2fvNV;

+   vfmt->VertexAttrib3fNV = _mesa_noop_VertexAttrib3fNV;

+   vfmt->VertexAttrib3fvNV = _mesa_noop_VertexAttrib3fvNV;

+   vfmt->VertexAttrib4fNV = _mesa_noop_VertexAttrib4fNV;

+   vfmt->VertexAttrib4fvNV = _mesa_noop_VertexAttrib4fvNV;

+   vfmt->VertexAttrib1fARB = _mesa_noop_VertexAttrib1fARB;

+   vfmt->VertexAttrib1fvARB = _mesa_noop_VertexAttrib1fvARB;

+   vfmt->VertexAttrib2fARB = _mesa_noop_VertexAttrib2fARB;

+   vfmt->VertexAttrib2fvARB = _mesa_noop_VertexAttrib2fvARB;

+   vfmt->VertexAttrib3fARB = _mesa_noop_VertexAttrib3fARB;

+   vfmt->VertexAttrib3fvARB = _mesa_noop_VertexAttrib3fvARB;

+   vfmt->VertexAttrib4fARB = _mesa_noop_VertexAttrib4fARB;

+   vfmt->VertexAttrib4fvARB = _mesa_noop_VertexAttrib4fvARB;

+

+   vfmt->Rectf = _mesa_noop_Rectf;

+

+   vfmt->DrawArrays = _mesa_noop_DrawArrays;

+   vfmt->DrawElements = _mesa_noop_DrawElements;

+   vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements;

+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;

+   vfmt->DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex;

+   vfmt->DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex;

+   vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex;

+}

+

+

+#endif /* FEATURE_beginend */

diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c
index b3b5c6cc0..e48a18a00 100644
--- a/mesalib/src/mesa/main/api_validate.c
+++ b/mesalib/src/mesa/main/api_validate.c
@@ -1,431 +1,432 @@
-/*
- * 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 "api_validate.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "imports.h"
-#include "mtypes.h"
-#include "vbo/vbo.h"
-
-
-/**
- * \return  number of bytes in array [count] of type.
- */
-static GLsizei
-index_bytes(GLenum type, GLsizei count)
-{
-   if (type == GL_UNSIGNED_INT) {
-      return count * sizeof(GLuint);
-   }
-   else if (type == GL_UNSIGNED_BYTE) {
-      return count * sizeof(GLubyte);
-   }
-   else {
-      ASSERT(type == GL_UNSIGNED_SHORT);
-      return count * sizeof(GLushort);
-   }
-}
-
-
-/**
- * Find the max index in the given element/index buffer
- */
-GLuint
-_mesa_max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
-                       const void *indices,
-                       struct gl_buffer_object *elementBuf)
-{
-   const GLubyte *map = NULL;
-   GLuint max = 0;
-   GLuint i;
-
-   if (_mesa_is_bufferobj(elementBuf)) {
-      /* elements are in a user-defined buffer object.  need to map it */
-      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,
-                                  GL_READ_ONLY, elementBuf);
-      /* Actual address is the sum of pointers */
-      indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);
-   }
-
-   if (type == GL_UNSIGNED_INT) {
-      for (i = 0; i < count; i++)
-         if (((GLuint *) indices)[i] > max)
-            max = ((GLuint *) indices)[i];
-   }
-   else if (type == GL_UNSIGNED_SHORT) {
-      for (i = 0; i < count; i++)
-         if (((GLushort *) indices)[i] > max)
-            max = ((GLushort *) indices)[i];
-   }
-   else {
-      ASSERT(type == GL_UNSIGNED_BYTE);
-      for (i = 0; i < count; i++)
-         if (((GLubyte *) indices)[i] > max)
-            max = ((GLubyte *) indices)[i];
-   }
-
-   if (map) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);
-   }
-
-   return max;
-}
-
-
-/**
- * Check if OK to draw arrays/elements.
- */
-static GLboolean
-check_valid_to_render(GLcontext *ctx, const char *function)
-{
-   if (!_mesa_valid_to_render(ctx, function)) {
-      return GL_FALSE;
-   }
-
-   switch (ctx->API) {
-#if FEATURE_es2_glsl
-   case API_OPENGLES2:
-      /* For ES2, we can draw if any vertex array is enabled (and we
-       * should always have a vertex program/shader). */
-      if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
-	 return GL_FALSE;
-      break;
-#endif
-
-#if FEATURE_ES1 || FEATURE_GL
-   case API_OPENGLES:
-   case API_OPENGL:
-      /* For regular OpenGL, only draw if we have vertex positions
-       * (regardless of whether or not we have a vertex program/shader). */
-      if (!ctx->Array.ArrayObj->Vertex.Enabled &&
-	  !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)
-	 return GL_FALSE;
-      break;
-#endif
-
-   default:
-      ASSERT_NO_FEATURE();
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do bounds checking on array element indexes.  Check that the vertices
- * pointed to by the indices don't lie outside buffer object bounds.
- * \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds
- */
-static GLboolean
-check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
-		   const GLvoid *indices, GLint basevertex)
-{
-   struct _mesa_prim prim;
-   struct _mesa_index_buffer ib;
-   GLuint min, max;
-
-   /* Only the X Server needs to do this -- otherwise, accessing outside
-    * array/BO bounds allows application termination.
-    */
-   if (!ctx->Const.CheckArrayBounds)
-      return GL_TRUE;
-
-   memset(&prim, 0, sizeof(prim));
-   prim.count = count;
-
-   memset(&ib, 0, sizeof(ib));
-   ib.type = type;
-   ib.ptr = indices;
-   ib.obj = ctx->Array.ElementArrayBufferObj;
-
-   vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);
-
-   if ((int)(min + basevertex) < 0 ||
-       max + basevertex > ctx->Array.ArrayObj->_MaxElement) {
-      /* the max element is out of bounds of one or more enabled arrays */
-      _mesa_warning(ctx, "glDrawElements() index=%u is out of bounds (max=%u)",
-                    max, ctx->Array.ArrayObj->_MaxElement);
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Error checking for glDrawElements().  Includes parameter checking
- * and VBO bounds checking.
- * \return GL_TRUE if OK to render, GL_FALSE if error found
- */
-GLboolean
-_mesa_validate_DrawElements(GLcontext *ctx,
-			    GLenum mode, GLsizei count, GLenum type,
-			    const GLvoid *indices, GLint basevertex)
-{
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (count <= 0) {
-      if (count < 0)
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawElements(count)" );
-      return GL_FALSE;
-   }
-
-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );
-      return GL_FALSE;
-   }
-
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT)
-   {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
-      return GL_FALSE;
-   }
-
-   if (!check_valid_to_render(ctx, "glDrawElements"))
-      return GL_FALSE;
-
-   /* Vertex buffer object tests */
-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
-      /* use indices in the buffer object */
-      /* make sure count doesn't go outside buffer bounds */
-      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
-         _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
-         return GL_FALSE;
-      }
-   }
-   else {
-      /* not using a VBO */
-      if (!indices)
-         return GL_FALSE;
-   }
-
-   if (!check_index_bounds(ctx, count, type, indices, basevertex))
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Error checking for glDrawRangeElements().  Includes parameter checking
- * and VBO bounds checking.
- * \return GL_TRUE if OK to render, GL_FALSE if error found
- */
-GLboolean
-_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
-				 GLuint start, GLuint end,
-				 GLsizei count, GLenum type,
-				 const GLvoid *indices, GLint basevertex)
-{
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (count <= 0) {
-      if (count < 0)
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(count)" );
-      return GL_FALSE;
-   }
-
-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );
-      return GL_FALSE;
-   }
-
-   if (end < start) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(end<start)");
-      return GL_FALSE;
-   }
-
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(type)" );
-      return GL_FALSE;
-   }
-
-   if (!check_valid_to_render(ctx, "glDrawRangeElements"))
-      return GL_FALSE;
-
-   /* Vertex buffer object tests */
-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
-      /* use indices in the buffer object */
-      /* make sure count doesn't go outside buffer bounds */
-      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
-         _mesa_warning(ctx, "glDrawRangeElements index out of buffer bounds");
-         return GL_FALSE;
-      }
-   }
-   else {
-      /* not using a VBO */
-      if (!indices)
-         return GL_FALSE;
-   }
-
-   if (!check_index_bounds(ctx, count, type, indices, basevertex))
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Called from the tnl module to error check the function parameters and
- * verify that we really can draw something.
- * \return GL_TRUE if OK to render, GL_FALSE if error found
- */
-GLboolean
-_mesa_validate_DrawArrays(GLcontext *ctx,
-			  GLenum mode, GLint start, GLsizei count)
-{
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (count <= 0) {
-      if (count < 0)
-         _mesa_error(ctx, GL_INVALID_VALUE, "glDrawArrays(count)" );
-      return GL_FALSE;
-   }
-
-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
-      return GL_FALSE;
-   }
-
-   if (!check_valid_to_render(ctx, "glDrawArrays"))
-      return GL_FALSE;
-
-   if (ctx->Const.CheckArrayBounds) {
-      if (start + count > (GLint) ctx->Array.ArrayObj->_MaxElement)
-         return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-GLboolean
-_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
-                                   GLsizei count, GLsizei primcount)
-{
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (count <= 0) {
-      if (count < 0)
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glDrawArraysInstanced(count=%d)", count);
-      return GL_FALSE;
-   }
-
-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glDrawArraysInstanced(mode=0x%x)", mode);
-      return GL_FALSE;
-   }
-
-   if (primcount <= 0) {
-      if (primcount < 0)
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glDrawArraysInstanced(primcount=%d)", primcount);
-      return GL_FALSE;
-   }
-
-   if (!check_valid_to_render(ctx, "glDrawArraysInstanced(invalid to render)"))
-      return GL_FALSE;
-
-   if (ctx->CompileFlag) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glDrawArraysInstanced(display list");
-      return GL_FALSE;
-   }
-
-   if (ctx->Const.CheckArrayBounds) {
-      if (first + count > (GLint) ctx->Array.ArrayObj->_MaxElement)
-         return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-GLboolean
-_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
-                                     GLenum mode, GLsizei count, GLenum type,
-                                     const GLvoid *indices, GLsizei primcount)
-{
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (count <= 0) {
-      if (count < 0)
-	 _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glDrawElementsInstanced(count=%d)", count);
-      return GL_FALSE;
-   }
-
-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glDrawElementsInstanced(mode = 0x%x)", mode);
-      return GL_FALSE;
-   }
-
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glDrawElementsInstanced(type=0x%x)", type);
-      return GL_FALSE;
-   }
-
-   if (primcount <= 0) {
-      if (primcount < 0)
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glDrawElementsInstanced(primcount=%d)", primcount);
-      return GL_FALSE;
-   }
-
-   if (!check_valid_to_render(ctx, "glDrawElementsInstanced"))
-      return GL_FALSE;
-
-   /* Vertex buffer object tests */
-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
-      /* use indices in the buffer object */
-      /* make sure count doesn't go outside buffer bounds */
-      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
-         _mesa_warning(ctx,
-                       "glDrawElementsInstanced index out of buffer bounds");
-         return GL_FALSE;
-      }
-   }
-   else {
-      /* not using a VBO */
-      if (!indices)
-         return GL_FALSE;
-   }
-
-   if (!check_index_bounds(ctx, count, type, indices, 0))
-      return GL_FALSE;
-
-   return 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 "api_validate.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "imports.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+#include "vbo/vbo.h"

+

+

+/**

+ * \return  number of bytes in array [count] of type.

+ */

+static GLsizei

+index_bytes(GLenum type, GLsizei count)

+{

+   if (type == GL_UNSIGNED_INT) {

+      return count * sizeof(GLuint);

+   }

+   else if (type == GL_UNSIGNED_BYTE) {

+      return count * sizeof(GLubyte);

+   }

+   else {

+      ASSERT(type == GL_UNSIGNED_SHORT);

+      return count * sizeof(GLushort);

+   }

+}

+

+

+/**

+ * Find the max index in the given element/index buffer

+ */

+GLuint

+_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,

+                       const void *indices,

+                       struct gl_buffer_object *elementBuf)

+{

+   const GLubyte *map = NULL;

+   GLuint max = 0;

+   GLuint i;

+

+   if (_mesa_is_bufferobj(elementBuf)) {

+      /* elements are in a user-defined buffer object.  need to map it */

+      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,

+                                  GL_READ_ONLY, elementBuf);

+      /* Actual address is the sum of pointers */

+      indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);

+   }

+

+   if (type == GL_UNSIGNED_INT) {

+      for (i = 0; i < count; i++)

+         if (((GLuint *) indices)[i] > max)

+            max = ((GLuint *) indices)[i];

+   }

+   else if (type == GL_UNSIGNED_SHORT) {

+      for (i = 0; i < count; i++)

+         if (((GLushort *) indices)[i] > max)

+            max = ((GLushort *) indices)[i];

+   }

+   else {

+      ASSERT(type == GL_UNSIGNED_BYTE);

+      for (i = 0; i < count; i++)

+         if (((GLubyte *) indices)[i] > max)

+            max = ((GLubyte *) indices)[i];

+   }

+

+   if (map) {

+      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);

+   }

+

+   return max;

+}

+

+

+/**

+ * Check if OK to draw arrays/elements.

+ */

+static GLboolean

+check_valid_to_render(struct gl_context *ctx, const char *function)

+{

+   if (!_mesa_valid_to_render(ctx, function)) {

+      return GL_FALSE;

+   }

+

+   switch (ctx->API) {

+#if FEATURE_es2_glsl

+   case API_OPENGLES2:

+      /* For ES2, we can draw if any vertex array is enabled (and we

+       * should always have a vertex program/shader). */

+      if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)

+	 return GL_FALSE;

+      break;

+#endif

+

+#if FEATURE_ES1 || FEATURE_GL

+   case API_OPENGLES:

+   case API_OPENGL:

+      /* For regular OpenGL, only draw if we have vertex positions

+       * (regardless of whether or not we have a vertex program/shader). */

+      if (!ctx->Array.ArrayObj->Vertex.Enabled &&

+	  !ctx->Array.ArrayObj->VertexAttrib[0].Enabled)

+	 return GL_FALSE;

+      break;

+#endif

+

+   default:

+      ASSERT_NO_FEATURE();

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do bounds checking on array element indexes.  Check that the vertices

+ * pointed to by the indices don't lie outside buffer object bounds.

+ * \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds

+ */

+static GLboolean

+check_index_bounds(struct gl_context *ctx, GLsizei count, GLenum type,

+		   const GLvoid *indices, GLint basevertex)

+{

+   struct _mesa_prim prim;

+   struct _mesa_index_buffer ib;

+   GLuint min, max;

+

+   /* Only the X Server needs to do this -- otherwise, accessing outside

+    * array/BO bounds allows application termination.

+    */

+   if (!ctx->Const.CheckArrayBounds)

+      return GL_TRUE;

+

+   memset(&prim, 0, sizeof(prim));

+   prim.count = count;

+

+   memset(&ib, 0, sizeof(ib));

+   ib.type = type;

+   ib.ptr = indices;

+   ib.obj = ctx->Array.ElementArrayBufferObj;

+

+   vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);

+

+   if ((int)(min + basevertex) < 0 ||

+       max + basevertex > ctx->Array.ArrayObj->_MaxElement) {

+      /* the max element is out of bounds of one or more enabled arrays */

+      _mesa_warning(ctx, "glDrawElements() index=%u is out of bounds (max=%u)",

+                    max, ctx->Array.ArrayObj->_MaxElement);

+      return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Error checking for glDrawElements().  Includes parameter checking

+ * and VBO bounds checking.

+ * \return GL_TRUE if OK to render, GL_FALSE if error found

+ */

+GLboolean

+_mesa_validate_DrawElements(struct gl_context *ctx,

+			    GLenum mode, GLsizei count, GLenum type,

+			    const GLvoid *indices, GLint basevertex)

+{

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (count <= 0) {

+      if (count < 0)

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawElements(count)" );

+      return GL_FALSE;

+   }

+

+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );

+      return GL_FALSE;

+   }

+

+   if (type != GL_UNSIGNED_INT &&

+       type != GL_UNSIGNED_BYTE &&

+       type != GL_UNSIGNED_SHORT)

+   {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" );

+      return GL_FALSE;

+   }

+

+   if (!check_valid_to_render(ctx, "glDrawElements"))

+      return GL_FALSE;

+

+   /* Vertex buffer object tests */

+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

+      /* use indices in the buffer object */

+      /* make sure count doesn't go outside buffer bounds */

+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {

+         _mesa_warning(ctx, "glDrawElements index out of buffer bounds");

+         return GL_FALSE;

+      }

+   }

+   else {

+      /* not using a VBO */

+      if (!indices)

+         return GL_FALSE;

+   }

+

+   if (!check_index_bounds(ctx, count, type, indices, basevertex))

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Error checking for glDrawRangeElements().  Includes parameter checking

+ * and VBO bounds checking.

+ * \return GL_TRUE if OK to render, GL_FALSE if error found

+ */

+GLboolean

+_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,

+				 GLuint start, GLuint end,

+				 GLsizei count, GLenum type,

+				 const GLvoid *indices, GLint basevertex)

+{

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (count <= 0) {

+      if (count < 0)

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(count)" );

+      return GL_FALSE;

+   }

+

+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );

+      return GL_FALSE;

+   }

+

+   if (end < start) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(end<start)");

+      return GL_FALSE;

+   }

+

+   if (type != GL_UNSIGNED_INT &&

+       type != GL_UNSIGNED_BYTE &&

+       type != GL_UNSIGNED_SHORT) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(type)" );

+      return GL_FALSE;

+   }

+

+   if (!check_valid_to_render(ctx, "glDrawRangeElements"))

+      return GL_FALSE;

+

+   /* Vertex buffer object tests */

+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

+      /* use indices in the buffer object */

+      /* make sure count doesn't go outside buffer bounds */

+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {

+         _mesa_warning(ctx, "glDrawRangeElements index out of buffer bounds");

+         return GL_FALSE;

+      }

+   }

+   else {

+      /* not using a VBO */

+      if (!indices)

+         return GL_FALSE;

+   }

+

+   if (!check_index_bounds(ctx, count, type, indices, basevertex))

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Called from the tnl module to error check the function parameters and

+ * verify that we really can draw something.

+ * \return GL_TRUE if OK to render, GL_FALSE if error found

+ */

+GLboolean

+_mesa_validate_DrawArrays(struct gl_context *ctx,

+			  GLenum mode, GLint start, GLsizei count)

+{

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (count <= 0) {

+      if (count < 0)

+         _mesa_error(ctx, GL_INVALID_VALUE, "glDrawArrays(count)" );

+      return GL_FALSE;

+   }

+

+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );

+      return GL_FALSE;

+   }

+

+   if (!check_valid_to_render(ctx, "glDrawArrays"))

+      return GL_FALSE;

+

+   if (ctx->Const.CheckArrayBounds) {

+      if (start + count > (GLint) ctx->Array.ArrayObj->_MaxElement)

+         return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+GLboolean

+_mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,

+                                   GLsizei count, GLsizei primcount)

+{

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (count <= 0) {

+      if (count < 0)

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glDrawArraysInstanced(count=%d)", count);

+      return GL_FALSE;

+   }

+

+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glDrawArraysInstanced(mode=0x%x)", mode);

+      return GL_FALSE;

+   }

+

+   if (primcount <= 0) {

+      if (primcount < 0)

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glDrawArraysInstanced(primcount=%d)", primcount);

+      return GL_FALSE;

+   }

+

+   if (!check_valid_to_render(ctx, "glDrawArraysInstanced(invalid to render)"))

+      return GL_FALSE;

+

+   if (ctx->CompileFlag) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glDrawArraysInstanced(display list");

+      return GL_FALSE;

+   }

+

+   if (ctx->Const.CheckArrayBounds) {

+      if (first + count > (GLint) ctx->Array.ArrayObj->_MaxElement)

+         return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+GLboolean

+_mesa_validate_DrawElementsInstanced(struct gl_context *ctx,

+                                     GLenum mode, GLsizei count, GLenum type,

+                                     const GLvoid *indices, GLsizei primcount)

+{

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (count <= 0) {

+      if (count < 0)

+	 _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glDrawElementsInstanced(count=%d)", count);

+      return GL_FALSE;

+   }

+

+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glDrawElementsInstanced(mode = 0x%x)", mode);

+      return GL_FALSE;

+   }

+

+   if (type != GL_UNSIGNED_INT &&

+       type != GL_UNSIGNED_BYTE &&

+       type != GL_UNSIGNED_SHORT) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glDrawElementsInstanced(type=0x%x)", type);

+      return GL_FALSE;

+   }

+

+   if (primcount <= 0) {

+      if (primcount < 0)

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glDrawElementsInstanced(primcount=%d)", primcount);

+      return GL_FALSE;

+   }

+

+   if (!check_valid_to_render(ctx, "glDrawElementsInstanced"))

+      return GL_FALSE;

+

+   /* Vertex buffer object tests */

+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

+      /* use indices in the buffer object */

+      /* make sure count doesn't go outside buffer bounds */

+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {

+         _mesa_warning(ctx,

+                       "glDrawElementsInstanced index out of buffer bounds");

+         return GL_FALSE;

+      }

+   }

+   else {

+      /* not using a VBO */

+      if (!indices)

+         return GL_FALSE;

+   }

+

+   if (!check_index_bounds(ctx, count, type, indices, 0))

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

diff --git a/mesalib/src/mesa/main/api_validate.h b/mesalib/src/mesa/main/api_validate.h
index cd27d58aa..dca3e53e8 100644
--- a/mesalib/src/mesa/main/api_validate.h
+++ b/mesalib/src/mesa/main/api_validate.h
@@ -1,65 +1,68 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 API_VALIDATE_H
-#define API_VALIDATE_H
-
-
-#include "mtypes.h"
-
-
-extern GLuint
-_mesa_max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
-                       const void *indices,
-                       struct gl_buffer_object *elementBuf);
-
-extern GLboolean
-_mesa_validate_DrawArrays(GLcontext *ctx,
-			  GLenum mode, GLint start, GLsizei count);
-
-extern GLboolean
-_mesa_validate_DrawElements(GLcontext *ctx,
-			    GLenum mode, GLsizei count, GLenum type,
-			    const GLvoid *indices, GLint basevertex);
-
-extern GLboolean
-_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
-				 GLuint start, GLuint end,
-				 GLsizei count, GLenum type,
-				 const GLvoid *indices, GLint basevertex);
-
-
-extern GLboolean
-_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
-                                   GLsizei count, GLsizei primcount);
-
-extern GLboolean
-_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
-                                     GLenum mode, GLsizei count, GLenum type,
-                                     const GLvoid *indices, GLsizei primcount);
-
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 API_VALIDATE_H

+#define API_VALIDATE_H

+

+

+#include "glheader.h"

+

+struct gl_buffer_object;

+struct gl_context;

+

+

+extern GLuint

+_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,

+                       const void *indices,

+                       struct gl_buffer_object *elementBuf);

+

+extern GLboolean

+_mesa_validate_DrawArrays(struct gl_context *ctx,

+			  GLenum mode, GLint start, GLsizei count);

+

+extern GLboolean

+_mesa_validate_DrawElements(struct gl_context *ctx,

+			    GLenum mode, GLsizei count, GLenum type,

+			    const GLvoid *indices, GLint basevertex);

+

+extern GLboolean

+_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,

+				 GLuint start, GLuint end,

+				 GLsizei count, GLenum type,

+				 const GLvoid *indices, GLint basevertex);

+

+

+extern GLboolean

+_mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,

+                                   GLsizei count, GLsizei primcount);

+

+extern GLboolean

+_mesa_validate_DrawElementsInstanced(struct gl_context *ctx,

+                                     GLenum mode, GLsizei count, GLenum type,

+                                     const GLvoid *indices, GLsizei primcount);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c
index 0069cd3dc..37ecb6b97 100644
--- a/mesalib/src/mesa/main/arrayobj.c
+++ b/mesalib/src/mesa/main/arrayobj.c
@@ -1,576 +1,576 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2006
- * 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 OR IBM 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 arrayobj.c
- * Functions for the GL_APPLE_vertex_array_object extension.
- *
- * \todo
- * The code in this file borrows a lot from bufferobj.c.  There's a certain
- * amount of cruft left over from that origin that may be unnecessary.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- * \author Brian Paul
- */
-
-
-#include "glheader.h"
-#include "hash.h"
-#include "imports.h"
-#include "context.h"
-#if FEATURE_ARB_vertex_buffer_object
-#include "bufferobj.h"
-#endif
-#include "arrayobj.h"
-#include "macros.h"
-#include "main/dispatch.h"
-
-
-/**
- * Look up the array object for the given ID.
- * 
- * \returns
- * Either a pointer to the array object with the specified ID or \c NULL for
- * a non-existent ID.  The spec defines ID 0 as being technically
- * non-existent.
- */
-
-static INLINE struct gl_array_object *
-lookup_arrayobj(GLcontext *ctx, GLuint id)
-{
-   if (id == 0)
-      return NULL;
-   else
-      return (struct gl_array_object *)
-         _mesa_HashLookup(ctx->Array.Objects, id);
-}
-
-
-/**
- * For all the vertex arrays in the array object, unbind any pointers
- * to any buffer objects (VBOs).
- * This is done just prior to array object destruction.
- */
-static void
-unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
-{
-   GLuint i;
-
-   _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Weight.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->FogCoord.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);
-
-   for (i = 0; i < Elements(obj->TexCoord); i++)
-      _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);
-
-   for (i = 0; i < Elements(obj->VertexAttrib); i++)
-      _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);
-
-#if FEATURE_point_size_array
-   _mesa_reference_buffer_object(ctx, &obj->PointSize.BufferObj, NULL);
-#endif
-}
-
-
-/**
- * Allocate and initialize a new vertex array object.
- * 
- * This function is intended to be called via
- * \c dd_function_table::NewArrayObject.
- */
-struct gl_array_object *
-_mesa_new_array_object( GLcontext *ctx, GLuint name )
-{
-   struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);
-   if (obj)
-      _mesa_initialize_array_object(ctx, obj, name);
-   return obj;
-}
-
-
-/**
- * Delete an array object.
- * 
- * This function is intended to be called via
- * \c dd_function_table::DeleteArrayObject.
- */
-void
-_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
-{
-   (void) ctx;
-   unbind_array_object_vbos(ctx, obj);
-   _glthread_DESTROY_MUTEX(obj->Mutex);
-   free(obj);
-}
-
-
-/**
- * Set ptr to arrayObj w/ reference counting.
- */
-void
-_mesa_reference_array_object(GLcontext *ctx,
-                             struct gl_array_object **ptr,
-                             struct gl_array_object *arrayObj)
-{
-   if (*ptr == arrayObj)
-      return;
-
-   if (*ptr) {
-      /* Unreference the old array object */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_array_object *oldObj = *ptr;
-
-      _glthread_LOCK_MUTEX(oldObj->Mutex);
-      ASSERT(oldObj->RefCount > 0);
-      oldObj->RefCount--;
-#if 0
-      printf("ArrayObj %p %d DECR to %d\n",
-             (void *) oldObj, oldObj->Name, oldObj->RefCount);
-#endif
-      deleteFlag = (oldObj->RefCount == 0);
-      _glthread_UNLOCK_MUTEX(oldObj->Mutex);
-
-      if (deleteFlag) {
-	 ASSERT(ctx->Driver.DeleteArrayObject);
-         ctx->Driver.DeleteArrayObject(ctx, oldObj);
-      }
-
-      *ptr = NULL;
-   }
-   ASSERT(!*ptr);
-
-   if (arrayObj) {
-      /* reference new array object */
-      _glthread_LOCK_MUTEX(arrayObj->Mutex);
-      if (arrayObj->RefCount == 0) {
-         /* this array's being deleted (look just above) */
-         /* Not sure this can every really happen.  Warn if it does. */
-         _mesa_problem(NULL, "referencing deleted array object");
-         *ptr = NULL;
-      }
-      else {
-         arrayObj->RefCount++;
-#if 0
-         printf("ArrayObj %p %d INCR to %d\n",
-                (void *) arrayObj, arrayObj->Name, arrayObj->RefCount);
-#endif
-         *ptr = arrayObj;
-      }
-      _glthread_UNLOCK_MUTEX(arrayObj->Mutex);
-   }
-}
-
-
-
-static void
-init_array(GLcontext *ctx,
-           struct gl_client_array *array, GLint size, GLint type)
-{
-   array->Size = size;
-   array->Type = type;
-   array->Format = GL_RGBA; /* only significant for GL_EXT_vertex_array_bgra */
-   array->Stride = 0;
-   array->StrideB = 0;
-   array->Ptr = NULL;
-   array->Enabled = GL_FALSE;
-   array->Normalized = GL_FALSE;
-#if FEATURE_ARB_vertex_buffer_object
-   /* Vertex array buffers */
-   _mesa_reference_buffer_object(ctx, &array->BufferObj,
-                                 ctx->Shared->NullBufferObj);
-#endif
-}
-
-
-/**
- * Initialize a gl_array_object's arrays.
- */
-void
-_mesa_initialize_array_object( GLcontext *ctx,
-			       struct gl_array_object *obj,
-			       GLuint name )
-{
-   GLuint i;
-
-   obj->Name = name;
-
-   _glthread_INIT_MUTEX(obj->Mutex);
-   obj->RefCount = 1;
-
-   /* Init the individual arrays */
-   init_array(ctx, &obj->Vertex, 4, GL_FLOAT);
-   init_array(ctx, &obj->Weight, 1, GL_FLOAT);
-   init_array(ctx, &obj->Normal, 3, GL_FLOAT);
-   init_array(ctx, &obj->Color, 4, GL_FLOAT);
-   init_array(ctx, &obj->SecondaryColor, 4, GL_FLOAT);
-   init_array(ctx, &obj->FogCoord, 1, GL_FLOAT);
-   init_array(ctx, &obj->Index, 1, GL_FLOAT);
-   for (i = 0; i < Elements(obj->TexCoord); i++) {
-      init_array(ctx, &obj->TexCoord[i], 4, GL_FLOAT);
-   }
-   init_array(ctx, &obj->EdgeFlag, 1, GL_BOOL);
-   for (i = 0; i < Elements(obj->VertexAttrib); i++) {
-      init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);
-   }
-
-#if FEATURE_point_size_array
-   init_array(ctx, &obj->PointSize, 1, GL_FLOAT);
-#endif
-}
-
-
-/**
- * Add the given array object to the array object pool.
- */
-static void
-save_array_object( GLcontext *ctx, struct gl_array_object *obj )
-{
-   if (obj->Name > 0) {
-      /* insert into hash table */
-      _mesa_HashInsert(ctx->Array.Objects, obj->Name, obj);
-   }
-}
-
-
-/**
- * Remove the given array object from the array object pool.
- * Do not deallocate the array object though.
- */
-static void
-remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
-{
-   if (obj->Name > 0) {
-      /* remove from hash table */
-      _mesa_HashRemove(ctx->Array.Objects, obj->Name);
-   }
-}
-
-
-
-/**
- * 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)
-{
-   if (array->BufferObj->Name) {
-      /* Compute the max element we can access in the VBO without going
-       * out of bounds.
-       */
-      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size
-                            - (GLsizeiptrARB) array->Ptr + array->StrideB
-                            - array->_ElementSize) / array->StrideB;
-      if (0)
-         printf("%s Object %u  Size %u  MaxElement %u\n",
-		__FUNCTION__,
-		array->BufferObj->Name,
-		(GLuint) array->BufferObj->Size,
-		array->_MaxElement);
-   }
-   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);
-   if (array->Enabled)
-      return MIN2(min, array->_MaxElement);
-   else
-      return min;
-}
-
-
-/**
- * Examine vertex arrays to update the gl_array_object::_MaxElement field.
- */
-void
-_mesa_update_array_object_max_element(GLcontext *ctx,
-                                      struct gl_array_object *arrayObj)
-{
-   GLuint i, min = ~0;
-
-   min = update_min(min, &arrayObj->Vertex);
-   min = update_min(min, &arrayObj->Weight);
-   min = update_min(min, &arrayObj->Normal);
-   min = update_min(min, &arrayObj->Color);
-   min = update_min(min, &arrayObj->SecondaryColor);
-   min = update_min(min, &arrayObj->FogCoord);
-   min = update_min(min, &arrayObj->Index);
-   min = update_min(min, &arrayObj->EdgeFlag);
-#if FEATURE_point_size_array
-   min = update_min(min, &arrayObj->PointSize);
-#endif
-   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)
-      min = update_min(min, &arrayObj->TexCoord[i]);
-   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
-      min = update_min(min, &arrayObj->VertexAttrib[i]);
-
-   /* _MaxElement is one past the last legal array element */
-   arrayObj->_MaxElement = min;
-}
-
-
-/**********************************************************************/
-/* API Functions                                                      */
-/**********************************************************************/
-
-
-/**
- * Helper for _mesa_BindVertexArray() and _mesa_BindVertexArrayAPPLE().
- * \param genRequired  specifies behavour when id was not generated with
- *                     glGenVertexArrays().
- */
-static void
-bind_vertex_array(GLcontext *ctx, GLuint id, GLboolean genRequired)
-{
-   struct gl_array_object * const oldObj = ctx->Array.ArrayObj;
-   struct gl_array_object *newObj = NULL;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   ASSERT(oldObj != NULL);
-
-   if ( oldObj->Name == id )
-      return;   /* rebinding the same array object- no change */
-
-   /*
-    * Get pointer to new array object (newObj)
-    */
-   if (id == 0) {
-      /* The spec says there is no array object named 0, but we use
-       * one internally because it simplifies things.
-       */
-      newObj = ctx->Array.DefaultArrayObj;
-   }
-   else {
-      /* non-default array object */
-      newObj = lookup_arrayobj(ctx, id);
-      if (!newObj) {
-         if (genRequired) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");
-            return;
-         }
-
-         /* For APPLE version, generate a new array object now */
-	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);
-         if (!newObj) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
-            return;
-         }
-         save_array_object(ctx, newObj);
-      }
-   }
-
-   ctx->NewState |= _NEW_ARRAY;
-   ctx->Array.NewState |= _NEW_ARRAY_ALL;
-   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, newObj);
-
-   /* Pass BindVertexArray call to device driver */
-   if (ctx->Driver.BindArrayObject && newObj)
-      ctx->Driver.BindArrayObject(ctx, newObj);
-}
-
-
-/**
- * ARB version of glBindVertexArray()
- * This function behaves differently from glBindVertexArrayAPPLE() in
- * that this function requires all ids to have been previously generated
- * by glGenVertexArrays[APPLE]().
- */
-void GLAPIENTRY
-_mesa_BindVertexArray( GLuint id )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   bind_vertex_array(ctx, id, GL_TRUE);
-}
-
-
-/**
- * Bind a new array.
- *
- * \todo
- * The binding could be done more efficiently by comparing the non-NULL
- * pointers in the old and new objects.  The only arrays that are "dirty" are
- * the ones that are non-NULL in either object.
- */
-void GLAPIENTRY
-_mesa_BindVertexArrayAPPLE( GLuint id )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   bind_vertex_array(ctx, id, GL_FALSE);
-}
-
-
-/**
- * Delete a set of array objects.
- * 
- * \param n      Number of array objects to delete.
- * \param ids    Array of \c n array object IDs.
- */
-void GLAPIENTRY
-_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLsizei i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteVertexArrayAPPLE(n)");
-      return;
-   }
-
-   for (i = 0; i < n; i++) {
-      struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]);
-
-      if ( obj != NULL ) {
-	 ASSERT( obj->Name == ids[i] );
-
-	 /* If the array object is currently bound, the spec says "the binding
-	  * for that object reverts to zero and the default vertex array
-	  * becomes current."
-	  */
-	 if ( obj == ctx->Array.ArrayObj ) {
-	    CALL_BindVertexArrayAPPLE( ctx->Exec, (0) );
-	 }
-
-	 /* The ID is immediately freed for re-use */
-	 remove_array_object(ctx, obj);
-
-         /* Unreference the array object. 
-          * If refcount hits zero, the object will be deleted.
-          */
-         _mesa_reference_array_object(ctx, &obj, NULL);
-      }
-   }
-}
-
-
-/**
- * Generate a set of unique array object IDs and store them in \c arrays.
- * Helper for _mesa_GenVertexArrays[APPLE]() functions below.
- * \param n       Number of IDs to generate.
- * \param arrays  Array of \c n locations to store the IDs.
- * \param vboOnly Will arrays have to reside in VBOs?
- */
-static void 
-gen_vertex_arrays(GLcontext *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
-{
-   GLuint first;
-   GLint i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenVertexArraysAPPLE");
-      return;
-   }
-
-   if (!arrays) {
-      return;
-   }
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Array.Objects, n);
-
-   /* Allocate new, empty array objects and return identifiers */
-   for (i = 0; i < n; i++) {
-      struct gl_array_object *obj;
-      GLuint name = first + i;
-
-      obj = (*ctx->Driver.NewArrayObject)( ctx, name );
-      if (!obj) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
-         return;
-      }
-      obj->VBOonly = vboOnly;
-      save_array_object(ctx, obj);
-      arrays[i] = first + i;
-   }
-}
-
-
-/**
- * ARB version of glGenVertexArrays()
- * All arrays will be required to live in VBOs.
- */
-void GLAPIENTRY
-_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   gen_vertex_arrays(ctx, n, arrays, GL_TRUE);
-}
-
-
-/**
- * APPLE version of glGenVertexArraysAPPLE()
- * Arrays may live in VBOs or ordinary memory.
- */
-void GLAPIENTRY
-_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   gen_vertex_arrays(ctx, n, arrays, GL_FALSE);
-}
-
-
-/**
- * Determine if ID is the name of an array object.
- * 
- * \param id  ID of the potential array object.
- * \return  \c GL_TRUE if \c id is the name of a array object, 
- *          \c GL_FALSE otherwise.
- */
-GLboolean GLAPIENTRY
-_mesa_IsVertexArrayAPPLE( GLuint id )
-{
-   struct gl_array_object * obj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (id == 0)
-      return GL_FALSE;
-
-   obj = lookup_arrayobj(ctx, id);
-
-   return (obj != NULL) ? GL_TRUE : GL_FALSE;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * (C) Copyright IBM Corporation 2006

+ * 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 OR IBM 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 arrayobj.c

+ * Functions for the GL_APPLE_vertex_array_object extension.

+ *

+ * \todo

+ * The code in this file borrows a lot from bufferobj.c.  There's a certain

+ * amount of cruft left over from that origin that may be unnecessary.

+ *

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

+ * \author Brian Paul

+ */

+

+

+#include "glheader.h"

+#include "hash.h"

+#include "imports.h"

+#include "context.h"

+#if FEATURE_ARB_vertex_buffer_object

+#include "bufferobj.h"

+#endif

+#include "arrayobj.h"

+#include "macros.h"

+#include "main/dispatch.h"

+

+

+/**

+ * Look up the array object for the given ID.

+ * 

+ * \returns

+ * Either a pointer to the array object with the specified ID or \c NULL for

+ * a non-existent ID.  The spec defines ID 0 as being technically

+ * non-existent.

+ */

+

+static INLINE struct gl_array_object *

+lookup_arrayobj(struct gl_context *ctx, GLuint id)

+{

+   if (id == 0)

+      return NULL;

+   else

+      return (struct gl_array_object *)

+         _mesa_HashLookup(ctx->Array.Objects, id);

+}

+

+

+/**

+ * For all the vertex arrays in the array object, unbind any pointers

+ * to any buffer objects (VBOs).

+ * This is done just prior to array object destruction.

+ */

+static void

+unbind_array_object_vbos(struct gl_context *ctx, struct gl_array_object *obj)

+{

+   GLuint i;

+

+   _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Weight.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->FogCoord.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);

+

+   for (i = 0; i < Elements(obj->TexCoord); i++)

+      _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);

+

+   for (i = 0; i < Elements(obj->VertexAttrib); i++)

+      _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);

+

+#if FEATURE_point_size_array

+   _mesa_reference_buffer_object(ctx, &obj->PointSize.BufferObj, NULL);

+#endif

+}

+

+

+/**

+ * Allocate and initialize a new vertex array object.

+ * 

+ * This function is intended to be called via

+ * \c dd_function_table::NewArrayObject.

+ */

+struct gl_array_object *

+_mesa_new_array_object( struct gl_context *ctx, GLuint name )

+{

+   struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);

+   if (obj)

+      _mesa_initialize_array_object(ctx, obj, name);

+   return obj;

+}

+

+

+/**

+ * Delete an array object.

+ * 

+ * This function is intended to be called via

+ * \c dd_function_table::DeleteArrayObject.

+ */

+void

+_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )

+{

+   (void) ctx;

+   unbind_array_object_vbos(ctx, obj);

+   _glthread_DESTROY_MUTEX(obj->Mutex);

+   free(obj);

+}

+

+

+/**

+ * Set ptr to arrayObj w/ reference counting.

+ */

+void

+_mesa_reference_array_object(struct gl_context *ctx,

+                             struct gl_array_object **ptr,

+                             struct gl_array_object *arrayObj)

+{

+   if (*ptr == arrayObj)

+      return;

+

+   if (*ptr) {

+      /* Unreference the old array object */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_array_object *oldObj = *ptr;

+

+      _glthread_LOCK_MUTEX(oldObj->Mutex);

+      ASSERT(oldObj->RefCount > 0);

+      oldObj->RefCount--;

+#if 0

+      printf("ArrayObj %p %d DECR to %d\n",

+             (void *) oldObj, oldObj->Name, oldObj->RefCount);

+#endif

+      deleteFlag = (oldObj->RefCount == 0);

+      _glthread_UNLOCK_MUTEX(oldObj->Mutex);

+

+      if (deleteFlag) {

+	 ASSERT(ctx->Driver.DeleteArrayObject);

+         ctx->Driver.DeleteArrayObject(ctx, oldObj);

+      }

+

+      *ptr = NULL;

+   }

+   ASSERT(!*ptr);

+

+   if (arrayObj) {

+      /* reference new array object */

+      _glthread_LOCK_MUTEX(arrayObj->Mutex);

+      if (arrayObj->RefCount == 0) {

+         /* this array's being deleted (look just above) */

+         /* Not sure this can every really happen.  Warn if it does. */

+         _mesa_problem(NULL, "referencing deleted array object");

+         *ptr = NULL;

+      }

+      else {

+         arrayObj->RefCount++;

+#if 0

+         printf("ArrayObj %p %d INCR to %d\n",

+                (void *) arrayObj, arrayObj->Name, arrayObj->RefCount);

+#endif

+         *ptr = arrayObj;

+      }

+      _glthread_UNLOCK_MUTEX(arrayObj->Mutex);

+   }

+}

+

+

+

+static void

+init_array(struct gl_context *ctx,

+           struct gl_client_array *array, GLint size, GLint type)

+{

+   array->Size = size;

+   array->Type = type;

+   array->Format = GL_RGBA; /* only significant for GL_EXT_vertex_array_bgra */

+   array->Stride = 0;

+   array->StrideB = 0;

+   array->Ptr = NULL;

+   array->Enabled = GL_FALSE;

+   array->Normalized = GL_FALSE;

+#if FEATURE_ARB_vertex_buffer_object

+   /* Vertex array buffers */

+   _mesa_reference_buffer_object(ctx, &array->BufferObj,

+                                 ctx->Shared->NullBufferObj);

+#endif

+}

+

+

+/**

+ * Initialize a gl_array_object's arrays.

+ */

+void

+_mesa_initialize_array_object( struct gl_context *ctx,

+			       struct gl_array_object *obj,

+			       GLuint name )

+{

+   GLuint i;

+

+   obj->Name = name;

+

+   _glthread_INIT_MUTEX(obj->Mutex);

+   obj->RefCount = 1;

+

+   /* Init the individual arrays */

+   init_array(ctx, &obj->Vertex, 4, GL_FLOAT);

+   init_array(ctx, &obj->Weight, 1, GL_FLOAT);

+   init_array(ctx, &obj->Normal, 3, GL_FLOAT);

+   init_array(ctx, &obj->Color, 4, GL_FLOAT);

+   init_array(ctx, &obj->SecondaryColor, 4, GL_FLOAT);

+   init_array(ctx, &obj->FogCoord, 1, GL_FLOAT);

+   init_array(ctx, &obj->Index, 1, GL_FLOAT);

+   for (i = 0; i < Elements(obj->TexCoord); i++) {

+      init_array(ctx, &obj->TexCoord[i], 4, GL_FLOAT);

+   }

+   init_array(ctx, &obj->EdgeFlag, 1, GL_BOOL);

+   for (i = 0; i < Elements(obj->VertexAttrib); i++) {

+      init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);

+   }

+

+#if FEATURE_point_size_array

+   init_array(ctx, &obj->PointSize, 1, GL_FLOAT);

+#endif

+}

+

+

+/**

+ * Add the given array object to the array object pool.

+ */

+static void

+save_array_object( struct gl_context *ctx, struct gl_array_object *obj )

+{

+   if (obj->Name > 0) {

+      /* insert into hash table */

+      _mesa_HashInsert(ctx->Array.Objects, obj->Name, obj);

+   }

+}

+

+

+/**

+ * Remove the given array object from the array object pool.

+ * Do not deallocate the array object though.

+ */

+static void

+remove_array_object( struct gl_context *ctx, struct gl_array_object *obj )

+{

+   if (obj->Name > 0) {

+      /* remove from hash table */

+      _mesa_HashRemove(ctx->Array.Objects, obj->Name);

+   }

+}

+

+

+

+/**

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

+{

+   if (array->BufferObj->Name) {

+      /* Compute the max element we can access in the VBO without going

+       * out of bounds.

+       */

+      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size

+                            - (GLsizeiptrARB) array->Ptr + array->StrideB

+                            - array->_ElementSize) / array->StrideB;

+      if (0)

+         printf("%s Object %u  Size %u  MaxElement %u\n",

+		__FUNCTION__,

+		array->BufferObj->Name,

+		(GLuint) array->BufferObj->Size,

+		array->_MaxElement);

+   }

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

+   if (array->Enabled)

+      return MIN2(min, array->_MaxElement);

+   else

+      return min;

+}

+

+

+/**

+ * Examine vertex arrays to update the gl_array_object::_MaxElement field.

+ */

+void

+_mesa_update_array_object_max_element(struct gl_context *ctx,

+                                      struct gl_array_object *arrayObj)

+{

+   GLuint i, min = ~0;

+

+   min = update_min(min, &arrayObj->Vertex);

+   min = update_min(min, &arrayObj->Weight);

+   min = update_min(min, &arrayObj->Normal);

+   min = update_min(min, &arrayObj->Color);

+   min = update_min(min, &arrayObj->SecondaryColor);

+   min = update_min(min, &arrayObj->FogCoord);

+   min = update_min(min, &arrayObj->Index);

+   min = update_min(min, &arrayObj->EdgeFlag);

+#if FEATURE_point_size_array

+   min = update_min(min, &arrayObj->PointSize);

+#endif

+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)

+      min = update_min(min, &arrayObj->TexCoord[i]);

+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)

+      min = update_min(min, &arrayObj->VertexAttrib[i]);

+

+   /* _MaxElement is one past the last legal array element */

+   arrayObj->_MaxElement = min;

+}

+

+

+/**********************************************************************/

+/* API Functions                                                      */

+/**********************************************************************/

+

+

+/**

+ * Helper for _mesa_BindVertexArray() and _mesa_BindVertexArrayAPPLE().

+ * \param genRequired  specifies behavour when id was not generated with

+ *                     glGenVertexArrays().

+ */

+static void

+bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)

+{

+   struct gl_array_object * const oldObj = ctx->Array.ArrayObj;

+   struct gl_array_object *newObj = NULL;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   ASSERT(oldObj != NULL);

+

+   if ( oldObj->Name == id )

+      return;   /* rebinding the same array object- no change */

+

+   /*

+    * Get pointer to new array object (newObj)

+    */

+   if (id == 0) {

+      /* The spec says there is no array object named 0, but we use

+       * one internally because it simplifies things.

+       */

+      newObj = ctx->Array.DefaultArrayObj;

+   }

+   else {

+      /* non-default array object */

+      newObj = lookup_arrayobj(ctx, id);

+      if (!newObj) {

+         if (genRequired) {

+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");

+            return;

+         }

+

+         /* For APPLE version, generate a new array object now */

+	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);

+         if (!newObj) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");

+            return;

+         }

+         save_array_object(ctx, newObj);

+      }

+   }

+

+   ctx->NewState |= _NEW_ARRAY;

+   ctx->Array.NewState |= _NEW_ARRAY_ALL;

+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, newObj);

+

+   /* Pass BindVertexArray call to device driver */

+   if (ctx->Driver.BindArrayObject && newObj)

+      ctx->Driver.BindArrayObject(ctx, newObj);

+}

+

+

+/**

+ * ARB version of glBindVertexArray()

+ * This function behaves differently from glBindVertexArrayAPPLE() in

+ * that this function requires all ids to have been previously generated

+ * by glGenVertexArrays[APPLE]().

+ */

+void GLAPIENTRY

+_mesa_BindVertexArray( GLuint id )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   bind_vertex_array(ctx, id, GL_TRUE);

+}

+

+

+/**

+ * Bind a new array.

+ *

+ * \todo

+ * The binding could be done more efficiently by comparing the non-NULL

+ * pointers in the old and new objects.  The only arrays that are "dirty" are

+ * the ones that are non-NULL in either object.

+ */

+void GLAPIENTRY

+_mesa_BindVertexArrayAPPLE( GLuint id )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   bind_vertex_array(ctx, id, GL_FALSE);

+}

+

+

+/**

+ * Delete a set of array objects.

+ * 

+ * \param n      Number of array objects to delete.

+ * \param ids    Array of \c n array object IDs.

+ */

+void GLAPIENTRY

+_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLsizei i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteVertexArrayAPPLE(n)");

+      return;

+   }

+

+   for (i = 0; i < n; i++) {

+      struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]);

+

+      if ( obj != NULL ) {

+	 ASSERT( obj->Name == ids[i] );

+

+	 /* If the array object is currently bound, the spec says "the binding

+	  * for that object reverts to zero and the default vertex array

+	  * becomes current."

+	  */

+	 if ( obj == ctx->Array.ArrayObj ) {

+	    CALL_BindVertexArrayAPPLE( ctx->Exec, (0) );

+	 }

+

+	 /* The ID is immediately freed for re-use */

+	 remove_array_object(ctx, obj);

+

+         /* Unreference the array object. 

+          * If refcount hits zero, the object will be deleted.

+          */

+         _mesa_reference_array_object(ctx, &obj, NULL);

+      }

+   }

+}

+

+

+/**

+ * Generate a set of unique array object IDs and store them in \c arrays.

+ * Helper for _mesa_GenVertexArrays[APPLE]() functions below.

+ * \param n       Number of IDs to generate.

+ * \param arrays  Array of \c n locations to store the IDs.

+ * \param vboOnly Will arrays have to reside in VBOs?

+ */

+static void 

+gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)

+{

+   GLuint first;

+   GLint i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenVertexArraysAPPLE");

+      return;

+   }

+

+   if (!arrays) {

+      return;

+   }

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Array.Objects, n);

+

+   /* Allocate new, empty array objects and return identifiers */

+   for (i = 0; i < n; i++) {

+      struct gl_array_object *obj;

+      GLuint name = first + i;

+

+      obj = (*ctx->Driver.NewArrayObject)( ctx, name );

+      if (!obj) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");

+         return;

+      }

+      obj->VBOonly = vboOnly;

+      save_array_object(ctx, obj);

+      arrays[i] = first + i;

+   }

+}

+

+

+/**

+ * ARB version of glGenVertexArrays()

+ * All arrays will be required to live in VBOs.

+ */

+void GLAPIENTRY

+_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   gen_vertex_arrays(ctx, n, arrays, GL_TRUE);

+}

+

+

+/**

+ * APPLE version of glGenVertexArraysAPPLE()

+ * Arrays may live in VBOs or ordinary memory.

+ */

+void GLAPIENTRY

+_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   gen_vertex_arrays(ctx, n, arrays, GL_FALSE);

+}

+

+

+/**

+ * Determine if ID is the name of an array object.

+ * 

+ * \param id  ID of the potential array object.

+ * \return  \c GL_TRUE if \c id is the name of a array object, 

+ *          \c GL_FALSE otherwise.

+ */

+GLboolean GLAPIENTRY

+_mesa_IsVertexArrayAPPLE( GLuint id )

+{

+   struct gl_array_object * obj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (id == 0)

+      return GL_FALSE;

+

+   obj = lookup_arrayobj(ctx, id);

+

+   return (obj != NULL) ? GL_TRUE : GL_FALSE;

+}

diff --git a/mesalib/src/mesa/main/arrayobj.h b/mesalib/src/mesa/main/arrayobj.h
index fdf7e2bca..44f771417 100644
--- a/mesalib/src/mesa/main/arrayobj.h
+++ b/mesalib/src/mesa/main/arrayobj.h
@@ -1,83 +1,85 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2006
- * 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 OR IBM 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 ARRAYOBJ_H
-#define ARRAYOBJ_H
-
-#include "mtypes.h"
-
-/**
- * \file arrayobj.h
- * Functions for the GL_APPLE_vertex_array_object extension.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- * \author Brian Paul
- */
-
-/*
- * Internal functions
- */
-
-extern struct gl_array_object *
-_mesa_new_array_object( GLcontext *ctx, GLuint name );
-
-extern void
-_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
-
-extern void
-_mesa_reference_array_object(GLcontext *ctx,
-                             struct gl_array_object **ptr,
-                             struct gl_array_object *arrayObj);
-
-extern void
-_mesa_initialize_array_object( GLcontext *ctx,
-                               struct gl_array_object *obj, GLuint name );
-
-
-extern void
-_mesa_update_array_object_max_element(GLcontext *ctx,
-                                      struct gl_array_object *arrayObj);
-
-
-/*
- * API functions
- */
-
-
-void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
-
-void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
-
-void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
-
-void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
-
-void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
-
-GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
-
-#endif /* ARRAYOBJ_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.

+ * (C) Copyright IBM Corporation 2006

+ * 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 OR IBM 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 ARRAYOBJ_H

+#define ARRAYOBJ_H

+

+#include "glheader.h"

+

+struct gl_context;

+

+/**

+ * \file arrayobj.h

+ * Functions for the GL_APPLE_vertex_array_object extension.

+ *

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

+ * \author Brian Paul

+ */

+

+/*

+ * Internal functions

+ */

+

+extern struct gl_array_object *

+_mesa_new_array_object( struct gl_context *ctx, GLuint name );

+

+extern void

+_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj );

+

+extern void

+_mesa_reference_array_object(struct gl_context *ctx,

+                             struct gl_array_object **ptr,

+                             struct gl_array_object *arrayObj);

+

+extern void

+_mesa_initialize_array_object( struct gl_context *ctx,

+                               struct gl_array_object *obj, GLuint name );

+

+

+extern void

+_mesa_update_array_object_max_element(struct gl_context *ctx,

+                                      struct gl_array_object *arrayObj);

+

+

+/*

+ * API functions

+ */

+

+

+void GLAPIENTRY _mesa_BindVertexArray( GLuint id );

+

+void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );

+

+void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);

+

+void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);

+

+void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);

+

+GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );

+

+#endif /* ARRAYOBJ_H */

diff --git a/mesalib/src/mesa/main/atifragshader.c b/mesalib/src/mesa/main/atifragshader.c
index 550f50b7a..f2a41e30b 100644
--- a/mesalib/src/mesa/main/atifragshader.c
+++ b/mesalib/src/mesa/main/atifragshader.c
@@ -1,794 +1,795 @@
-/**
- * \file atifragshader.c
- * \author David Airlie
- * Copyright (C) 2004  David Airlie   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
- * DAVID AIRLIE 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/hash.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/enums.h"
-#include "main/mtypes.h"
-#include "main/dispatch.h"
-#include "main/atifragshader.h"
-
-#if FEATURE_ATI_fragment_shader
-
-#define MESA_DEBUG_ATI_FS 0
-
-static struct ati_fragment_shader DummyShader;
-
-
-void
-_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
-{
-   SET_GenFragmentShadersATI(disp, _mesa_GenFragmentShadersATI);
-   SET_BindFragmentShaderATI(disp, _mesa_BindFragmentShaderATI);
-   SET_DeleteFragmentShaderATI(disp, _mesa_DeleteFragmentShaderATI);
-   SET_BeginFragmentShaderATI(disp, _mesa_BeginFragmentShaderATI);
-   SET_EndFragmentShaderATI(disp, _mesa_EndFragmentShaderATI);
-   SET_PassTexCoordATI(disp, _mesa_PassTexCoordATI);
-   SET_SampleMapATI(disp, _mesa_SampleMapATI);
-   SET_ColorFragmentOp1ATI(disp, _mesa_ColorFragmentOp1ATI);
-   SET_ColorFragmentOp2ATI(disp, _mesa_ColorFragmentOp2ATI);
-   SET_ColorFragmentOp3ATI(disp, _mesa_ColorFragmentOp3ATI);
-   SET_AlphaFragmentOp1ATI(disp, _mesa_AlphaFragmentOp1ATI);
-   SET_AlphaFragmentOp2ATI(disp, _mesa_AlphaFragmentOp2ATI);
-   SET_AlphaFragmentOp3ATI(disp, _mesa_AlphaFragmentOp3ATI);
-   SET_SetFragmentShaderConstantATI(disp, _mesa_SetFragmentShaderConstantATI);
-}
-
-
-/**
- * Allocate and initialize a new ATI fragment shader object.
- */
-struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
-{
-   struct ati_fragment_shader *s = CALLOC_STRUCT(ati_fragment_shader);
-   (void) ctx;
-   if (s) {
-      s->Id = id;
-      s->RefCount = 1;
-   }
-   return s;
-}
-
-
-/**
- * Delete the given ati fragment shader
- */
-void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx, struct ati_fragment_shader *s)
-{
-   GLuint i;
-   for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
-      if (s->Instructions[i])
-         free(s->Instructions[i]);
-      if (s->SetupInst[i])
-         free(s->SetupInst[i]);
-   }
-   free(s);
-}
-
-
-
-static void
-new_arith_inst(struct ati_fragment_shader *prog)
-{
-/* set "default" instruction as not all may get defined.
-   there is no specified way to express a nop with ati fragment shaders we use
-   GL_NONE as the op enum and just set some params to 0 - so nothing to do here */
-   prog->numArithInstr[prog->cur_pass >> 1]++;
-}
-
-static void
-new_tex_inst(struct ati_fragment_shader *prog)
-{
-}
-
-static void match_pair_inst(struct ati_fragment_shader *curProg, GLuint optype)
-{
-   if (optype == curProg->last_optype) {
-      curProg->last_optype = 1;
-   }
-}
-
-#if MESA_DEBUG_ATI_FS
-static char *
-create_dst_mod_str(GLuint mod)
-{
-   static char ret_str[1024];
-
-   memset(ret_str, 0, 1024);
-   if (mod & GL_2X_BIT_ATI)
-      strncat(ret_str, "|2X", 1024);
-
-   if (mod & GL_4X_BIT_ATI)
-      strncat(ret_str, "|4X", 1024);
-
-   if (mod & GL_8X_BIT_ATI)
-      strncat(ret_str, "|8X", 1024);
-   if (mod & GL_HALF_BIT_ATI)
-      strncat(ret_str, "|HA", 1024);
-   if (mod & GL_QUARTER_BIT_ATI)
-      strncat(ret_str, "|QU", 1024);
-   if (mod & GL_EIGHTH_BIT_ATI)
-      strncat(ret_str, "|EI", 1024);
-
-   if (mod & GL_SATURATE_BIT_ATI)
-      strncat(ret_str, "|SAT", 1024);
-
-   if (strlen(ret_str) == 0)
-      strncat(ret_str, "NONE", 1024);
-   return ret_str;
-}
-
-static char *atifs_ops[] = {"ColorFragmentOp1ATI", "ColorFragmentOp2ATI", "ColorFragmentOp3ATI", 
-			    "AlphaFragmentOp1ATI", "AlphaFragmentOp2ATI", "AlphaFragmentOp3ATI" };
-
-static void debug_op(GLint optype, GLuint arg_count, GLenum op, GLuint dst,
-		     GLuint dstMask, GLuint dstMod, GLuint arg1,
-		     GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-		     GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,
-		     GLuint arg3Rep, GLuint arg3Mod)
-{
-  char *op_name;
-
-  op_name = atifs_ops[(arg_count-1)+(optype?3:0)];
-  
-  fprintf(stderr, "%s(%s, %s", op_name, _mesa_lookup_enum_by_nr(op),
-	      _mesa_lookup_enum_by_nr(dst));
-  if (!optype)
-    fprintf(stderr, ", %d", dstMask);
-  
-  fprintf(stderr, ", %s", create_dst_mod_str(dstMod));
-  
-  fprintf(stderr, ", %s, %s, %d", _mesa_lookup_enum_by_nr(arg1),
-	      _mesa_lookup_enum_by_nr(arg1Rep), arg1Mod);
-  if (arg_count>1)
-    fprintf(stderr, ", %s, %s, %d", _mesa_lookup_enum_by_nr(arg2),
-	      _mesa_lookup_enum_by_nr(arg2Rep), arg2Mod);
-  if (arg_count>2)
-    fprintf(stderr, ", %s, %s, %d", _mesa_lookup_enum_by_nr(arg3),
-	      _mesa_lookup_enum_by_nr(arg3Rep), arg3Mod);
-
-  fprintf(stderr,")\n");
-
-}
-#endif
-
-static int check_arith_arg(struct ati_fragment_shader *curProg,
-			GLuint optype, GLuint arg, GLuint argRep)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (((arg < GL_CON_0_ATI) || (arg > GL_CON_7_ATI)) &&
-      ((arg < GL_REG_0_ATI) || (arg > GL_REG_5_ATI)) &&
-      (arg != GL_ZERO) && (arg != GL_ONE) &&
-      (arg != GL_PRIMARY_COLOR_ARB) && (arg != GL_SECONDARY_INTERPOLATOR_ATI)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(arg)");
-      return 0;
-   }
-   if ((arg == GL_SECONDARY_INTERPOLATOR_ATI) && (((optype == 0) && (argRep == GL_ALPHA)) ||
-      ((optype == 1) && ((arg == GL_ALPHA) || (argRep == GL_NONE))))) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(sec_interp)");
-      return 0;
-   }
-   if ((arg == GL_SECONDARY_INTERPOLATOR_ATI) && (((optype == 0) && (argRep == GL_ALPHA)) ||
-      ((optype == 1) && ((arg == GL_ALPHA) || (argRep == GL_NONE))))) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(sec_interp)");
-      return 0;
-   }
-   if ((curProg->cur_pass == 1) &&
-      ((arg == GL_PRIMARY_COLOR_ARB) || (arg == GL_SECONDARY_INTERPOLATOR_ATI))) {
-      curProg->interpinp1 = GL_TRUE;
-   }
-   return 1;
-}
-
-GLuint GLAPIENTRY
-_mesa_GenFragmentShadersATI(GLuint range)
-{
-   GLuint first;
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (range == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenFragmentShadersATI(range)");
-      return 0;
-   }
-
-   if (ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenFragmentShadersATI(insideShader)");
-      return 0;
-   }
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->ATIShaders, range);
-   for (i = 0; i < range; i++) {
-      _mesa_HashInsert(ctx->Shared->ATIShaders, first + i, &DummyShader);
-   }
-
-   return first;
-}
-
-void GLAPIENTRY
-_mesa_BindFragmentShaderATI(GLuint id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;
-   struct ati_fragment_shader *newProg;
-
-   if (ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFragmentShaderATI(insideShader)");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   if (curProg->Id == id) {
-      return;
-   }
-
-   /* unbind current */
-   if (curProg->Id != 0) {
-      curProg->RefCount--;
-      if (curProg->RefCount <= 0) {
-	 _mesa_HashRemove(ctx->Shared->ATIShaders, id);
-      }
-   }
-
-   /* find new shader */
-   if (id == 0) {
-      newProg = ctx->Shared->DefaultFragmentShader;
-   }
-   else {
-      newProg = (struct ati_fragment_shader *)
-         _mesa_HashLookup(ctx->Shared->ATIShaders, id);
-      if (!newProg || newProg == &DummyShader) {
-	 /* allocate a new program now */
-	 newProg = _mesa_new_ati_fragment_shader(ctx, id);
-	 if (!newProg) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFragmentShaderATI");
-	    return;
-	 }
-	 _mesa_HashInsert(ctx->Shared->ATIShaders, id, newProg);
-      }
-
-   }
-
-   /* do actual bind */
-   ctx->ATIFragmentShader.Current = newProg;
-
-   ASSERT(ctx->ATIFragmentShader.Current);
-   if (newProg)
-      newProg->RefCount++;
-
-   /*if (ctx->Driver.BindProgram)
-      ctx->Driver.BindProgram(ctx, target, prog); */
-}
-
-void GLAPIENTRY
-_mesa_DeleteFragmentShaderATI(GLuint id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteFragmentShaderATI(insideShader)");
-      return;
-   }
-
-   if (id != 0) {
-      struct ati_fragment_shader *prog = (struct ati_fragment_shader *)
-	 _mesa_HashLookup(ctx->Shared->ATIShaders, id);
-      if (prog == &DummyShader) {
-	 _mesa_HashRemove(ctx->Shared->ATIShaders, id);
-      }
-      else if (prog) {
-	 if (ctx->ATIFragmentShader.Current &&
-	     ctx->ATIFragmentShader.Current->Id == id) {
-	     FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-	    _mesa_BindFragmentShaderATI(0);
-	 }
-      }
-
-      /* The ID is immediately available for re-use now */
-      _mesa_HashRemove(ctx->Shared->ATIShaders, id);
-      if (prog) {
-	 prog->RefCount--;
-	 if (prog->RefCount <= 0) {
-	    free(prog);
-	 }
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_BeginFragmentShaderATI(void)
-{
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginFragmentShaderATI(insideShader)");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   /* if the shader was already defined free instructions and get new ones
-      (or, could use the same mem but would need to reinitialize) */
-   /* no idea if it's allowed to redefine a shader */
-   for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
-         if (ctx->ATIFragmentShader.Current->Instructions[i])
-            free(ctx->ATIFragmentShader.Current->Instructions[i]);
-         if (ctx->ATIFragmentShader.Current->SetupInst[i])
-            free(ctx->ATIFragmentShader.Current->SetupInst[i]);
-   }
-
-   /* malloc the instructions here - not sure if the best place but its
-      a start */
-   for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
-      ctx->ATIFragmentShader.Current->Instructions[i] =
-	 (struct atifs_instruction *)
-	 calloc(1, sizeof(struct atifs_instruction) *
-		   (MAX_NUM_INSTRUCTIONS_PER_PASS_ATI));
-      ctx->ATIFragmentShader.Current->SetupInst[i] =
-	 (struct atifs_setupinst *)
-	 calloc(1, sizeof(struct atifs_setupinst) *
-		   (MAX_NUM_FRAGMENT_REGISTERS_ATI));
-   }
-
-/* can't rely on calloc for initialization as it's possible to redefine a shader (?) */
-   ctx->ATIFragmentShader.Current->LocalConstDef = 0;
-   ctx->ATIFragmentShader.Current->numArithInstr[0] = 0;
-   ctx->ATIFragmentShader.Current->numArithInstr[1] = 0;
-   ctx->ATIFragmentShader.Current->regsAssigned[0] = 0;
-   ctx->ATIFragmentShader.Current->regsAssigned[1] = 0;
-   ctx->ATIFragmentShader.Current->NumPasses = 0;
-   ctx->ATIFragmentShader.Current->cur_pass = 0;
-   ctx->ATIFragmentShader.Current->last_optype = 0;
-   ctx->ATIFragmentShader.Current->interpinp1 = GL_FALSE;
-   ctx->ATIFragmentShader.Current->isValid = GL_FALSE;
-   ctx->ATIFragmentShader.Current->swizzlerq = 0;
-   ctx->ATIFragmentShader.Compiling = 1;
-}
-
-void GLAPIENTRY
-_mesa_EndFragmentShaderATI(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;
-#if MESA_DEBUG_ATI_FS
-   GLint i, j;
-#endif
-
-   if (!ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndFragmentShaderATI(outsideShader)");
-      return;
-   }
-   if (curProg->interpinp1 && (ctx->ATIFragmentShader.Current->cur_pass > 1)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndFragmentShaderATI(interpinfirstpass)");
-   /* according to spec, DON'T return here */
-   }
-
-   match_pair_inst(curProg, 0);
-   ctx->ATIFragmentShader.Compiling = 0;
-   ctx->ATIFragmentShader.Current->isValid = GL_TRUE;
-   if ((ctx->ATIFragmentShader.Current->cur_pass == 0) ||
-      (ctx->ATIFragmentShader.Current->cur_pass == 2)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndFragmentShaderATI(noarithinst)");
-   }
-   if (ctx->ATIFragmentShader.Current->cur_pass > 1)
-      ctx->ATIFragmentShader.Current->NumPasses = 2;
-   else
-      ctx->ATIFragmentShader.Current->NumPasses = 1;
-
-   ctx->ATIFragmentShader.Current->cur_pass = 0;
-
-#if MESA_DEBUG_ATI_FS
-   for (j = 0; j < MAX_NUM_PASSES_ATI; j++) {
-      for (i = 0; i < MAX_NUM_FRAGMENT_REGISTERS_ATI; i++) {
-	 GLuint op = curProg->SetupInst[j][i].Opcode;
-	 const char *op_enum = op > 5 ? _mesa_lookup_enum_by_nr(op) : "0";
-	 GLuint src = curProg->SetupInst[j][i].src;
-	 GLuint swizzle = curProg->SetupInst[j][i].swizzle;
-	 fprintf(stderr, "%2d %04X %s %d %04X\n", i, op, op_enum, src,
-	      swizzle);
-      }
-      for (i = 0; i < curProg->numArithInstr[j]; i++) {
-	 GLuint op0 = curProg->Instructions[j][i].Opcode[0];
-	 GLuint op1 = curProg->Instructions[j][i].Opcode[1];
-	 const char *op0_enum = op0 > 5 ? _mesa_lookup_enum_by_nr(op0) : "0";
-	 const char *op1_enum = op1 > 5 ? _mesa_lookup_enum_by_nr(op1) : "0";
-	 GLuint count0 = curProg->Instructions[j][i].ArgCount[0];
-	 GLuint count1 = curProg->Instructions[j][i].ArgCount[1];
-	 fprintf(stderr, "%2d %04X %s %d %04X %s %d\n", i, op0, op0_enum, count0,
-	      op1, op1_enum, count1);
-      }
-   }
-#endif
-
-   if (!ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_SHADER_ATI, NULL)) {
-      ctx->ATIFragmentShader.Current->isValid = GL_FALSE;
-      /* XXX is this the right error? */
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glEndFragmentShaderATI(driver rejected shader)");
-   }
-}
-
-void GLAPIENTRY
-_mesa_PassTexCoordATI(GLuint dst, GLuint coord, GLenum swizzle)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;
-   struct atifs_setupinst *curI;
-
-   if (!ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(outsideShader)");
-      return;
-   }
-
-   if (curProg->cur_pass == 1) {
-      match_pair_inst(curProg, 0);
-      curProg->cur_pass = 2;
-   }
-   if ((curProg->cur_pass > 2) ||
-      ((1 << (dst - GL_REG_0_ATI)) & curProg->regsAssigned[curProg->cur_pass >> 1])) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoord(pass)");
-      return;
-   }
-   if ((dst < GL_REG_0_ATI) || (dst > GL_REG_5_ATI) ||
-      ((dst - GL_REG_0_ATI) >= ctx->Const.MaxTextureUnits)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glPassTexCoordATI(dst)");
-      return;
-   }
-   if (((coord < GL_REG_0_ATI) || (coord > GL_REG_5_ATI)) &&
-       ((coord < GL_TEXTURE0_ARB) || (coord > GL_TEXTURE7_ARB) ||
-       ((coord - GL_TEXTURE0_ARB) >= ctx->Const.MaxTextureUnits))) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glPassTexCoordATI(coord)");
-      return;
-   }
-   if ((curProg->cur_pass == 0) && (coord >= GL_REG_0_ATI)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(coord)");
-      return;
-   }
-   if (!(swizzle >= GL_SWIZZLE_STR_ATI) && (swizzle <= GL_SWIZZLE_STQ_DQ_ATI)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glPassTexCoordATI(swizzle)");
-      return;
-   }
-   if ((swizzle & 1) && (coord >= GL_REG_0_ATI)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(swizzle)");
-      return;
-   }
-   if (coord <= GL_TEXTURE7_ARB) {
-      GLuint tmp = coord - GL_TEXTURE0_ARB;
-      if ((((curProg->swizzlerq >> (tmp * 2)) & 3) != 0) &&
-	   (((swizzle & 1) + 1) != ((curProg->swizzlerq >> (tmp * 2)) & 3))) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(swizzle)");
-	 return;
-      } else {
-	 curProg->swizzlerq |= (((swizzle & 1) + 1) << (tmp * 2));
-      }
-   }
-
-   curProg->regsAssigned[curProg->cur_pass >> 1] |=  1 << (dst - GL_REG_0_ATI);
-   new_tex_inst(curProg);
-
-   /* add the instructions */
-   curI = &curProg->SetupInst[curProg->cur_pass >> 1][dst - GL_REG_0_ATI];
-
-   curI->Opcode = ATI_FRAGMENT_SHADER_PASS_OP;
-   curI->src = coord;
-   curI->swizzle = swizzle;
-
-#if MESA_DEBUG_ATI_FS
-   _mesa_debug(ctx, "%s(%s, %s, %s)\n", __FUNCTION__,
-	       _mesa_lookup_enum_by_nr(dst), _mesa_lookup_enum_by_nr(coord),
-	       _mesa_lookup_enum_by_nr(swizzle));
-#endif
-}
-
-void GLAPIENTRY
-_mesa_SampleMapATI(GLuint dst, GLuint interp, GLenum swizzle)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;
-   struct atifs_setupinst *curI;
-
-   if (!ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(outsideShader)");
-      return;
-   }
-
-   if (curProg->cur_pass == 1) {
-      match_pair_inst(curProg, 0);
-      curProg->cur_pass = 2;
-   }
-   if ((curProg->cur_pass > 2) ||
-      ((1 << (dst - GL_REG_0_ATI)) & curProg->regsAssigned[curProg->cur_pass >> 1])) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(pass)");
-      return;
-   }
-   if ((dst < GL_REG_0_ATI) || (dst > GL_REG_5_ATI) ||
-      ((dst - GL_REG_0_ATI) >= ctx->Const.MaxTextureUnits)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSampleMapATI(dst)");
-      return;
-   }
-   if (((interp < GL_REG_0_ATI) || (interp > GL_REG_5_ATI)) &&
-       ((interp < GL_TEXTURE0_ARB) || (interp > GL_TEXTURE7_ARB) ||
-       ((interp - GL_TEXTURE0_ARB) >= ctx->Const.MaxTextureUnits))) {
-   /* is this texture5 or texture7? spec is a bit unclear there */
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSampleMapATI(interp)");
-      return;
-   }
-   if ((curProg->cur_pass == 0) && (interp >= GL_REG_0_ATI)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(interp)");
-      return;
-   }
-   if (!(swizzle >= GL_SWIZZLE_STR_ATI) && (swizzle <= GL_SWIZZLE_STQ_DQ_ATI)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSampleMapATI(swizzle)");
-      return;
-   }
-   if ((swizzle & 1) && (interp >= GL_REG_0_ATI)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(swizzle)");
-      return;
-   }
-   if (interp <= GL_TEXTURE7_ARB) {
-      GLuint tmp = interp - GL_TEXTURE0_ARB;
-      if ((((curProg->swizzlerq >> (tmp * 2)) & 3) != 0) &&
-	   (((swizzle & 1) + 1) != ((curProg->swizzlerq >> (tmp * 2)) & 3))) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(swizzle)");
-	 return;
-      } else {
-	 curProg->swizzlerq |= (((swizzle & 1) + 1) << (tmp * 2));
-      }
-   }
-
-   curProg->regsAssigned[curProg->cur_pass >> 1] |=  1 << (dst - GL_REG_0_ATI);
-   new_tex_inst(curProg);
-
-   /* add the instructions */
-   curI = &curProg->SetupInst[curProg->cur_pass >> 1][dst - GL_REG_0_ATI];
-
-   curI->Opcode = ATI_FRAGMENT_SHADER_SAMPLE_OP;
-   curI->src = interp;
-   curI->swizzle = swizzle;
-
-#if MESA_DEBUG_ATI_FS
-   _mesa_debug(ctx, "%s(%s, %s, %s)\n", __FUNCTION__,
-	       _mesa_lookup_enum_by_nr(dst), _mesa_lookup_enum_by_nr(interp),
-	       _mesa_lookup_enum_by_nr(swizzle));
-#endif
-}
-
-static void
-_mesa_FragmentOpXATI(GLint optype, GLuint arg_count, GLenum op, GLuint dst,
-		     GLuint dstMask, GLuint dstMod, GLuint arg1,
-		     GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-		     GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,
-		     GLuint arg3Rep, GLuint arg3Mod)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;
-   GLint ci;
-   struct atifs_instruction *curI;
-   GLuint modtemp = dstMod & ~GL_SATURATE_BIT_ATI;
-
-   if (!ctx->ATIFragmentShader.Compiling) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(outsideShader)");
-      return;
-   }
-
-   if (curProg->cur_pass==0)
-      curProg->cur_pass=1;
-
-   else if (curProg->cur_pass==2)
-      curProg->cur_pass=3;
-
-   /* decide whether this is a new instruction or not ... all color instructions are new,
-      and alpha instructions might also be new if there was no preceding color inst */
-   if ((optype == 0) || (curProg->last_optype == optype)) {
-      if (curProg->numArithInstr[curProg->cur_pass >> 1] > 7) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(instrCount)");
-	 return;
-      }
-      /* easier to do that here slight side effect invalid instr will still be inserted as nops */
-      match_pair_inst(curProg, optype);
-      new_arith_inst(curProg);
-   }
-   curProg->last_optype = optype;
-   ci = curProg->numArithInstr[curProg->cur_pass >> 1] - 1;
-
-   /* add the instructions */
-   curI = &curProg->Instructions[curProg->cur_pass >> 1][ci];
-
-   /* error checking */
-   if ((dst < GL_REG_0_ATI) || (dst > GL_REG_5_ATI)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(dst)");
-      return;
-   }
-   if ((modtemp != GL_NONE) && (modtemp != GL_2X_BIT_ATI) &&
-      (modtemp != GL_4X_BIT_ATI) && (modtemp != GL_8X_BIT_ATI) &&
-      (modtemp != GL_HALF_BIT_ATI) && !(modtemp != GL_QUARTER_BIT_ATI) &&
-      (modtemp != GL_EIGHTH_BIT_ATI)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(dstMod)%x", modtemp);
-      return;
-   }
-   /* op checking? Actually looks like that's missing in the spec but we'll do it anyway */
-   if (((op < GL_ADD_ATI) || (op > GL_DOT2_ADD_ATI)) && !(op == GL_MOV_ATI)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(op)");
-      return;
-   }
-   if (optype == 1) {
-      if (((op == GL_DOT2_ADD_ATI) && (curI->Opcode[0] != GL_DOT2_ADD_ATI)) ||
-	 ((op == GL_DOT3_ATI) && (curI->Opcode[0] != GL_DOT3_ATI)) ||
-	 ((op == GL_DOT4_ATI) && (curI->Opcode[0] != GL_DOT4_ATI)) ||
-	 ((op != GL_DOT4_ATI) && (curI->Opcode[0] == GL_DOT4_ATI))) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "AFragmentOpATI(op)");
-	 return;
-      }
-   }
-   if ((op == GL_DOT4_ATI) &&
-      (((arg1 == GL_SECONDARY_INTERPOLATOR_ATI) && ((arg1Rep == GL_ALPHA) || (arg1Rep == GL_NONE))) ||
-      (((arg2 == GL_SECONDARY_INTERPOLATOR_ATI) && ((arg2Rep == GL_ALPHA) || (arg2Rep == GL_NONE)))))) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(sec_interp)");
-   }
-
-   if (!check_arith_arg(curProg, optype, arg1, arg1Rep)) {
-      return;
-   }
-   if (arg2) {
-      if (!check_arith_arg(curProg, optype, arg2, arg2Rep)) {
-	 return;
-      }
-   }
-   if (arg3) {
-      if (!check_arith_arg(curProg, optype, arg3, arg3Rep)) {
-	 return;
-      }
-      if ((arg1 >= GL_CON_0_ATI) && (arg1 <= GL_CON_7_ATI) &&
-	  (arg2 >= GL_CON_0_ATI) && (arg2 <= GL_CON_7_ATI) &&
-	  (arg3 >= GL_CON_0_ATI) && (arg3 <= GL_CON_7_ATI) &&
-	  (arg1 != arg2) && (arg1 != arg3) && (arg2 != arg3)) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(3Consts)");
-	 return;
-      }
-   }
-
-   /* all ok - not all fully validated though (e.g. argNMod - spec doesn't say anything) */
-
-   curI->Opcode[optype] = op;
-   curI->SrcReg[optype][0].Index = arg1;
-   curI->SrcReg[optype][0].argRep = arg1Rep;
-   curI->SrcReg[optype][0].argMod = arg1Mod;
-   curI->ArgCount[optype] = arg_count;
-
-   if (arg2) {
-      curI->SrcReg[optype][1].Index = arg2;
-      curI->SrcReg[optype][1].argRep = arg2Rep;
-      curI->SrcReg[optype][1].argMod = arg2Mod;
-   }
-
-   if (arg3) {
-      curI->SrcReg[optype][2].Index = arg3;
-      curI->SrcReg[optype][2].argRep = arg3Rep;
-      curI->SrcReg[optype][2].argMod = arg3Mod;
-   }
-
-   curI->DstReg[optype].Index = dst;
-   curI->DstReg[optype].dstMod = dstMod;
-   curI->DstReg[optype].dstMask = dstMask;
-
-#if MESA_DEBUG_ATI_FS
-   debug_op(optype, arg_count, op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
-#endif
-
-}
-
-void GLAPIENTRY
-_mesa_ColorFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMask,
-			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-			  GLuint arg1Mod)
-{
-   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_COLOR_OP, 1, op, dst, dstMask,
-			dstMod, arg1, arg1Rep, arg1Mod, 0, 0, 0, 0, 0, 0);
-}
-
-void GLAPIENTRY
-_mesa_ColorFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMask,
-			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,
-			  GLuint arg2Mod)
-{
-   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_COLOR_OP, 2, op, dst, dstMask,
-			dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep,
-			arg2Mod, 0, 0, 0);
-}
-
-void GLAPIENTRY
-_mesa_ColorFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMask,
-			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,
-			  GLuint arg2Mod, GLuint arg3, GLuint arg3Rep,
-			  GLuint arg3Mod)
-{
-   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_COLOR_OP, 3, op, dst, dstMask,
-			dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep,
-			arg2Mod, arg3, arg3Rep, arg3Mod);
-}
-
-void GLAPIENTRY
-_mesa_AlphaFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-			  GLuint arg1Rep, GLuint arg1Mod)
-{
-   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_ALPHA_OP, 1, op, dst, 0, dstMod,
-			arg1, arg1Rep, arg1Mod, 0, 0, 0, 0, 0, 0);
-}
-
-void GLAPIENTRY
-_mesa_AlphaFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-			  GLuint arg2Rep, GLuint arg2Mod)
-{
-   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_ALPHA_OP, 2, op, dst, 0, dstMod,
-			arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, 0, 0,
-			0);
-}
-
-void GLAPIENTRY
-_mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-			  GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,
-			  GLuint arg3Rep, GLuint arg3Mod)
-{
-   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_ALPHA_OP, 3, op, dst, 0, dstMod,
-			arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3,
-			arg3Rep, arg3Mod);
-}
-
-void GLAPIENTRY
-_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value)
-{
-   GLuint dstindex;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if ((dst < GL_CON_0_ATI) || (dst > GL_CON_7_ATI)) {
-      /* spec says nothing about what should happen here but we can't just segfault...*/
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSetFragmentShaderConstantATI(dst)");
-      return;
-   }
-
-   dstindex = dst - GL_CON_0_ATI;
-   if (ctx->ATIFragmentShader.Compiling) {
-      struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;
-      COPY_4V(curProg->Constants[dstindex], value);
-      curProg->LocalConstDef |= 1 << dstindex;
-   }
-   else {
-      FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-      COPY_4V(ctx->ATIFragmentShader.GlobalConstants[dstindex], value);
-   }
-}
-
-#endif /* FEATURE_ATI_fragment_shader */
+/**

+ * \file atifragshader.c

+ * \author David Airlie

+ * Copyright (C) 2004  David Airlie   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

+ * DAVID AIRLIE 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/hash.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/enums.h"

+#include "main/mtypes.h"

+#include "main/dispatch.h"

+#include "main/atifragshader.h"

+

+#if FEATURE_ATI_fragment_shader

+

+#define MESA_DEBUG_ATI_FS 0

+

+static struct ati_fragment_shader DummyShader;

+

+

+void

+_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)

+{

+   SET_GenFragmentShadersATI(disp, _mesa_GenFragmentShadersATI);

+   SET_BindFragmentShaderATI(disp, _mesa_BindFragmentShaderATI);

+   SET_DeleteFragmentShaderATI(disp, _mesa_DeleteFragmentShaderATI);

+   SET_BeginFragmentShaderATI(disp, _mesa_BeginFragmentShaderATI);

+   SET_EndFragmentShaderATI(disp, _mesa_EndFragmentShaderATI);

+   SET_PassTexCoordATI(disp, _mesa_PassTexCoordATI);

+   SET_SampleMapATI(disp, _mesa_SampleMapATI);

+   SET_ColorFragmentOp1ATI(disp, _mesa_ColorFragmentOp1ATI);

+   SET_ColorFragmentOp2ATI(disp, _mesa_ColorFragmentOp2ATI);

+   SET_ColorFragmentOp3ATI(disp, _mesa_ColorFragmentOp3ATI);

+   SET_AlphaFragmentOp1ATI(disp, _mesa_AlphaFragmentOp1ATI);

+   SET_AlphaFragmentOp2ATI(disp, _mesa_AlphaFragmentOp2ATI);

+   SET_AlphaFragmentOp3ATI(disp, _mesa_AlphaFragmentOp3ATI);

+   SET_SetFragmentShaderConstantATI(disp, _mesa_SetFragmentShaderConstantATI);

+}

+

+

+/**

+ * Allocate and initialize a new ATI fragment shader object.

+ */

+struct ati_fragment_shader *

+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)

+{

+   struct ati_fragment_shader *s = CALLOC_STRUCT(ati_fragment_shader);

+   (void) ctx;

+   if (s) {

+      s->Id = id;

+      s->RefCount = 1;

+   }

+   return s;

+}

+

+

+/**

+ * Delete the given ati fragment shader

+ */

+void

+_mesa_delete_ati_fragment_shader(struct gl_context *ctx, struct ati_fragment_shader *s)

+{

+   GLuint i;

+   for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {

+      if (s->Instructions[i])

+         free(s->Instructions[i]);

+      if (s->SetupInst[i])

+         free(s->SetupInst[i]);

+   }

+   free(s);

+}

+

+

+

+static void

+new_arith_inst(struct ati_fragment_shader *prog)

+{

+/* set "default" instruction as not all may get defined.

+   there is no specified way to express a nop with ati fragment shaders we use

+   GL_NONE as the op enum and just set some params to 0 - so nothing to do here */

+   prog->numArithInstr[prog->cur_pass >> 1]++;

+}

+

+static void

+new_tex_inst(struct ati_fragment_shader *prog)

+{

+}

+

+static void match_pair_inst(struct ati_fragment_shader *curProg, GLuint optype)

+{

+   if (optype == curProg->last_optype) {

+      curProg->last_optype = 1;

+   }

+}

+

+#if MESA_DEBUG_ATI_FS

+static char *

+create_dst_mod_str(GLuint mod)

+{

+   static char ret_str[1024];

+

+   memset(ret_str, 0, 1024);

+   if (mod & GL_2X_BIT_ATI)

+      strncat(ret_str, "|2X", 1024);

+

+   if (mod & GL_4X_BIT_ATI)

+      strncat(ret_str, "|4X", 1024);

+

+   if (mod & GL_8X_BIT_ATI)

+      strncat(ret_str, "|8X", 1024);

+   if (mod & GL_HALF_BIT_ATI)

+      strncat(ret_str, "|HA", 1024);

+   if (mod & GL_QUARTER_BIT_ATI)

+      strncat(ret_str, "|QU", 1024);

+   if (mod & GL_EIGHTH_BIT_ATI)

+      strncat(ret_str, "|EI", 1024);

+

+   if (mod & GL_SATURATE_BIT_ATI)

+      strncat(ret_str, "|SAT", 1024);

+

+   if (strlen(ret_str) == 0)

+      strncat(ret_str, "NONE", 1024);

+   return ret_str;

+}

+

+static char *atifs_ops[] = {"ColorFragmentOp1ATI", "ColorFragmentOp2ATI", "ColorFragmentOp3ATI", 

+			    "AlphaFragmentOp1ATI", "AlphaFragmentOp2ATI", "AlphaFragmentOp3ATI" };

+

+static void debug_op(GLint optype, GLuint arg_count, GLenum op, GLuint dst,

+		     GLuint dstMask, GLuint dstMod, GLuint arg1,

+		     GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,

+		     GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,

+		     GLuint arg3Rep, GLuint arg3Mod)

+{

+  char *op_name;

+

+  op_name = atifs_ops[(arg_count-1)+(optype?3:0)];

+  

+  fprintf(stderr, "%s(%s, %s", op_name, _mesa_lookup_enum_by_nr(op),

+	      _mesa_lookup_enum_by_nr(dst));

+  if (!optype)

+    fprintf(stderr, ", %d", dstMask);

+  

+  fprintf(stderr, ", %s", create_dst_mod_str(dstMod));

+  

+  fprintf(stderr, ", %s, %s, %d", _mesa_lookup_enum_by_nr(arg1),

+	      _mesa_lookup_enum_by_nr(arg1Rep), arg1Mod);

+  if (arg_count>1)

+    fprintf(stderr, ", %s, %s, %d", _mesa_lookup_enum_by_nr(arg2),

+	      _mesa_lookup_enum_by_nr(arg2Rep), arg2Mod);

+  if (arg_count>2)

+    fprintf(stderr, ", %s, %s, %d", _mesa_lookup_enum_by_nr(arg3),

+	      _mesa_lookup_enum_by_nr(arg3Rep), arg3Mod);

+

+  fprintf(stderr,")\n");

+

+}

+#endif

+

+static int check_arith_arg(struct ati_fragment_shader *curProg,

+			GLuint optype, GLuint arg, GLuint argRep)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (((arg < GL_CON_0_ATI) || (arg > GL_CON_7_ATI)) &&

+      ((arg < GL_REG_0_ATI) || (arg > GL_REG_5_ATI)) &&

+      (arg != GL_ZERO) && (arg != GL_ONE) &&

+      (arg != GL_PRIMARY_COLOR_ARB) && (arg != GL_SECONDARY_INTERPOLATOR_ATI)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(arg)");

+      return 0;

+   }

+   if ((arg == GL_SECONDARY_INTERPOLATOR_ATI) && (((optype == 0) && (argRep == GL_ALPHA)) ||

+      ((optype == 1) && ((arg == GL_ALPHA) || (argRep == GL_NONE))))) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(sec_interp)");

+      return 0;

+   }

+   if ((arg == GL_SECONDARY_INTERPOLATOR_ATI) && (((optype == 0) && (argRep == GL_ALPHA)) ||

+      ((optype == 1) && ((arg == GL_ALPHA) || (argRep == GL_NONE))))) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(sec_interp)");

+      return 0;

+   }

+   if ((curProg->cur_pass == 1) &&

+      ((arg == GL_PRIMARY_COLOR_ARB) || (arg == GL_SECONDARY_INTERPOLATOR_ATI))) {

+      curProg->interpinp1 = GL_TRUE;

+   }

+   return 1;

+}

+

+GLuint GLAPIENTRY

+_mesa_GenFragmentShadersATI(GLuint range)

+{

+   GLuint first;

+   GLuint i;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (range == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenFragmentShadersATI(range)");

+      return 0;

+   }

+

+   if (ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenFragmentShadersATI(insideShader)");

+      return 0;

+   }

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->ATIShaders, range);

+   for (i = 0; i < range; i++) {

+      _mesa_HashInsert(ctx->Shared->ATIShaders, first + i, &DummyShader);

+   }

+

+   return first;

+}

+

+void GLAPIENTRY

+_mesa_BindFragmentShaderATI(GLuint id)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;

+   struct ati_fragment_shader *newProg;

+

+   if (ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFragmentShaderATI(insideShader)");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+

+   if (curProg->Id == id) {

+      return;

+   }

+

+   /* unbind current */

+   if (curProg->Id != 0) {

+      curProg->RefCount--;

+      if (curProg->RefCount <= 0) {

+	 _mesa_HashRemove(ctx->Shared->ATIShaders, id);

+      }

+   }

+

+   /* find new shader */

+   if (id == 0) {

+      newProg = ctx->Shared->DefaultFragmentShader;

+   }

+   else {

+      newProg = (struct ati_fragment_shader *)

+         _mesa_HashLookup(ctx->Shared->ATIShaders, id);

+      if (!newProg || newProg == &DummyShader) {

+	 /* allocate a new program now */

+	 newProg = _mesa_new_ati_fragment_shader(ctx, id);

+	 if (!newProg) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFragmentShaderATI");

+	    return;

+	 }

+	 _mesa_HashInsert(ctx->Shared->ATIShaders, id, newProg);

+      }

+

+   }

+

+   /* do actual bind */

+   ctx->ATIFragmentShader.Current = newProg;

+

+   ASSERT(ctx->ATIFragmentShader.Current);

+   if (newProg)

+      newProg->RefCount++;

+

+   /*if (ctx->Driver.BindProgram)

+      ctx->Driver.BindProgram(ctx, target, prog); */

+}

+

+void GLAPIENTRY

+_mesa_DeleteFragmentShaderATI(GLuint id)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteFragmentShaderATI(insideShader)");

+      return;

+   }

+

+   if (id != 0) {

+      struct ati_fragment_shader *prog = (struct ati_fragment_shader *)

+	 _mesa_HashLookup(ctx->Shared->ATIShaders, id);

+      if (prog == &DummyShader) {

+	 _mesa_HashRemove(ctx->Shared->ATIShaders, id);

+      }

+      else if (prog) {

+	 if (ctx->ATIFragmentShader.Current &&

+	     ctx->ATIFragmentShader.Current->Id == id) {

+	     FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+	    _mesa_BindFragmentShaderATI(0);

+	 }

+      }

+

+      /* The ID is immediately available for re-use now */

+      _mesa_HashRemove(ctx->Shared->ATIShaders, id);

+      if (prog) {

+	 prog->RefCount--;

+	 if (prog->RefCount <= 0) {

+	    assert(prog != &DummyShader);

+	    free(prog);

+	 }

+      }

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_BeginFragmentShaderATI(void)

+{

+   GLint i;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginFragmentShaderATI(insideShader)");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+

+   /* if the shader was already defined free instructions and get new ones

+      (or, could use the same mem but would need to reinitialize) */

+   /* no idea if it's allowed to redefine a shader */

+   for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {

+         if (ctx->ATIFragmentShader.Current->Instructions[i])

+            free(ctx->ATIFragmentShader.Current->Instructions[i]);

+         if (ctx->ATIFragmentShader.Current->SetupInst[i])

+            free(ctx->ATIFragmentShader.Current->SetupInst[i]);

+   }

+

+   /* malloc the instructions here - not sure if the best place but its

+      a start */

+   for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {

+      ctx->ATIFragmentShader.Current->Instructions[i] =

+	 (struct atifs_instruction *)

+	 calloc(1, sizeof(struct atifs_instruction) *

+		   (MAX_NUM_INSTRUCTIONS_PER_PASS_ATI));

+      ctx->ATIFragmentShader.Current->SetupInst[i] =

+	 (struct atifs_setupinst *)

+	 calloc(1, sizeof(struct atifs_setupinst) *

+		   (MAX_NUM_FRAGMENT_REGISTERS_ATI));

+   }

+

+/* can't rely on calloc for initialization as it's possible to redefine a shader (?) */

+   ctx->ATIFragmentShader.Current->LocalConstDef = 0;

+   ctx->ATIFragmentShader.Current->numArithInstr[0] = 0;

+   ctx->ATIFragmentShader.Current->numArithInstr[1] = 0;

+   ctx->ATIFragmentShader.Current->regsAssigned[0] = 0;

+   ctx->ATIFragmentShader.Current->regsAssigned[1] = 0;

+   ctx->ATIFragmentShader.Current->NumPasses = 0;

+   ctx->ATIFragmentShader.Current->cur_pass = 0;

+   ctx->ATIFragmentShader.Current->last_optype = 0;

+   ctx->ATIFragmentShader.Current->interpinp1 = GL_FALSE;

+   ctx->ATIFragmentShader.Current->isValid = GL_FALSE;

+   ctx->ATIFragmentShader.Current->swizzlerq = 0;

+   ctx->ATIFragmentShader.Compiling = 1;

+}

+

+void GLAPIENTRY

+_mesa_EndFragmentShaderATI(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;

+#if MESA_DEBUG_ATI_FS

+   GLint i, j;

+#endif

+

+   if (!ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndFragmentShaderATI(outsideShader)");

+      return;

+   }

+   if (curProg->interpinp1 && (ctx->ATIFragmentShader.Current->cur_pass > 1)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndFragmentShaderATI(interpinfirstpass)");

+   /* according to spec, DON'T return here */

+   }

+

+   match_pair_inst(curProg, 0);

+   ctx->ATIFragmentShader.Compiling = 0;

+   ctx->ATIFragmentShader.Current->isValid = GL_TRUE;

+   if ((ctx->ATIFragmentShader.Current->cur_pass == 0) ||

+      (ctx->ATIFragmentShader.Current->cur_pass == 2)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndFragmentShaderATI(noarithinst)");

+   }

+   if (ctx->ATIFragmentShader.Current->cur_pass > 1)

+      ctx->ATIFragmentShader.Current->NumPasses = 2;

+   else

+      ctx->ATIFragmentShader.Current->NumPasses = 1;

+

+   ctx->ATIFragmentShader.Current->cur_pass = 0;

+

+#if MESA_DEBUG_ATI_FS

+   for (j = 0; j < MAX_NUM_PASSES_ATI; j++) {

+      for (i = 0; i < MAX_NUM_FRAGMENT_REGISTERS_ATI; i++) {

+	 GLuint op = curProg->SetupInst[j][i].Opcode;

+	 const char *op_enum = op > 5 ? _mesa_lookup_enum_by_nr(op) : "0";

+	 GLuint src = curProg->SetupInst[j][i].src;

+	 GLuint swizzle = curProg->SetupInst[j][i].swizzle;

+	 fprintf(stderr, "%2d %04X %s %d %04X\n", i, op, op_enum, src,

+	      swizzle);

+      }

+      for (i = 0; i < curProg->numArithInstr[j]; i++) {

+	 GLuint op0 = curProg->Instructions[j][i].Opcode[0];

+	 GLuint op1 = curProg->Instructions[j][i].Opcode[1];

+	 const char *op0_enum = op0 > 5 ? _mesa_lookup_enum_by_nr(op0) : "0";

+	 const char *op1_enum = op1 > 5 ? _mesa_lookup_enum_by_nr(op1) : "0";

+	 GLuint count0 = curProg->Instructions[j][i].ArgCount[0];

+	 GLuint count1 = curProg->Instructions[j][i].ArgCount[1];

+	 fprintf(stderr, "%2d %04X %s %d %04X %s %d\n", i, op0, op0_enum, count0,

+	      op1, op1_enum, count1);

+      }

+   }

+#endif

+

+   if (!ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_SHADER_ATI, NULL)) {

+      ctx->ATIFragmentShader.Current->isValid = GL_FALSE;

+      /* XXX is this the right error? */

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glEndFragmentShaderATI(driver rejected shader)");

+   }

+}

+

+void GLAPIENTRY

+_mesa_PassTexCoordATI(GLuint dst, GLuint coord, GLenum swizzle)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;

+   struct atifs_setupinst *curI;

+

+   if (!ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(outsideShader)");

+      return;

+   }

+

+   if (curProg->cur_pass == 1) {

+      match_pair_inst(curProg, 0);

+      curProg->cur_pass = 2;

+   }

+   if ((curProg->cur_pass > 2) ||

+      ((1 << (dst - GL_REG_0_ATI)) & curProg->regsAssigned[curProg->cur_pass >> 1])) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoord(pass)");

+      return;

+   }

+   if ((dst < GL_REG_0_ATI) || (dst > GL_REG_5_ATI) ||

+      ((dst - GL_REG_0_ATI) >= ctx->Const.MaxTextureUnits)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glPassTexCoordATI(dst)");

+      return;

+   }

+   if (((coord < GL_REG_0_ATI) || (coord > GL_REG_5_ATI)) &&

+       ((coord < GL_TEXTURE0_ARB) || (coord > GL_TEXTURE7_ARB) ||

+       ((coord - GL_TEXTURE0_ARB) >= ctx->Const.MaxTextureUnits))) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glPassTexCoordATI(coord)");

+      return;

+   }

+   if ((curProg->cur_pass == 0) && (coord >= GL_REG_0_ATI)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(coord)");

+      return;

+   }

+   if (!(swizzle >= GL_SWIZZLE_STR_ATI) && (swizzle <= GL_SWIZZLE_STQ_DQ_ATI)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glPassTexCoordATI(swizzle)");

+      return;

+   }

+   if ((swizzle & 1) && (coord >= GL_REG_0_ATI)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(swizzle)");

+      return;

+   }

+   if (coord <= GL_TEXTURE7_ARB) {

+      GLuint tmp = coord - GL_TEXTURE0_ARB;

+      if ((((curProg->swizzlerq >> (tmp * 2)) & 3) != 0) &&

+	   (((swizzle & 1) + 1) != ((curProg->swizzlerq >> (tmp * 2)) & 3))) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION, "glPassTexCoordATI(swizzle)");

+	 return;

+      } else {

+	 curProg->swizzlerq |= (((swizzle & 1) + 1) << (tmp * 2));

+      }

+   }

+

+   curProg->regsAssigned[curProg->cur_pass >> 1] |=  1 << (dst - GL_REG_0_ATI);

+   new_tex_inst(curProg);

+

+   /* add the instructions */

+   curI = &curProg->SetupInst[curProg->cur_pass >> 1][dst - GL_REG_0_ATI];

+

+   curI->Opcode = ATI_FRAGMENT_SHADER_PASS_OP;

+   curI->src = coord;

+   curI->swizzle = swizzle;

+

+#if MESA_DEBUG_ATI_FS

+   _mesa_debug(ctx, "%s(%s, %s, %s)\n", __FUNCTION__,

+	       _mesa_lookup_enum_by_nr(dst), _mesa_lookup_enum_by_nr(coord),

+	       _mesa_lookup_enum_by_nr(swizzle));

+#endif

+}

+

+void GLAPIENTRY

+_mesa_SampleMapATI(GLuint dst, GLuint interp, GLenum swizzle)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;

+   struct atifs_setupinst *curI;

+

+   if (!ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(outsideShader)");

+      return;

+   }

+

+   if (curProg->cur_pass == 1) {

+      match_pair_inst(curProg, 0);

+      curProg->cur_pass = 2;

+   }

+   if ((curProg->cur_pass > 2) ||

+      ((1 << (dst - GL_REG_0_ATI)) & curProg->regsAssigned[curProg->cur_pass >> 1])) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(pass)");

+      return;

+   }

+   if ((dst < GL_REG_0_ATI) || (dst > GL_REG_5_ATI) ||

+      ((dst - GL_REG_0_ATI) >= ctx->Const.MaxTextureUnits)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glSampleMapATI(dst)");

+      return;

+   }

+   if (((interp < GL_REG_0_ATI) || (interp > GL_REG_5_ATI)) &&

+       ((interp < GL_TEXTURE0_ARB) || (interp > GL_TEXTURE7_ARB) ||

+       ((interp - GL_TEXTURE0_ARB) >= ctx->Const.MaxTextureUnits))) {

+   /* is this texture5 or texture7? spec is a bit unclear there */

+      _mesa_error(ctx, GL_INVALID_ENUM, "glSampleMapATI(interp)");

+      return;

+   }

+   if ((curProg->cur_pass == 0) && (interp >= GL_REG_0_ATI)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(interp)");

+      return;

+   }

+   if (!(swizzle >= GL_SWIZZLE_STR_ATI) && (swizzle <= GL_SWIZZLE_STQ_DQ_ATI)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glSampleMapATI(swizzle)");

+      return;

+   }

+   if ((swizzle & 1) && (interp >= GL_REG_0_ATI)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(swizzle)");

+      return;

+   }

+   if (interp <= GL_TEXTURE7_ARB) {

+      GLuint tmp = interp - GL_TEXTURE0_ARB;

+      if ((((curProg->swizzlerq >> (tmp * 2)) & 3) != 0) &&

+	   (((swizzle & 1) + 1) != ((curProg->swizzlerq >> (tmp * 2)) & 3))) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION, "glSampleMapATI(swizzle)");

+	 return;

+      } else {

+	 curProg->swizzlerq |= (((swizzle & 1) + 1) << (tmp * 2));

+      }

+   }

+

+   curProg->regsAssigned[curProg->cur_pass >> 1] |=  1 << (dst - GL_REG_0_ATI);

+   new_tex_inst(curProg);

+

+   /* add the instructions */

+   curI = &curProg->SetupInst[curProg->cur_pass >> 1][dst - GL_REG_0_ATI];

+

+   curI->Opcode = ATI_FRAGMENT_SHADER_SAMPLE_OP;

+   curI->src = interp;

+   curI->swizzle = swizzle;

+

+#if MESA_DEBUG_ATI_FS

+   _mesa_debug(ctx, "%s(%s, %s, %s)\n", __FUNCTION__,

+	       _mesa_lookup_enum_by_nr(dst), _mesa_lookup_enum_by_nr(interp),

+	       _mesa_lookup_enum_by_nr(swizzle));

+#endif

+}

+

+static void

+_mesa_FragmentOpXATI(GLint optype, GLuint arg_count, GLenum op, GLuint dst,

+		     GLuint dstMask, GLuint dstMod, GLuint arg1,

+		     GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,

+		     GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,

+		     GLuint arg3Rep, GLuint arg3Mod)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;

+   GLint ci;

+   struct atifs_instruction *curI;

+   GLuint modtemp = dstMod & ~GL_SATURATE_BIT_ATI;

+

+   if (!ctx->ATIFragmentShader.Compiling) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(outsideShader)");

+      return;

+   }

+

+   if (curProg->cur_pass==0)

+      curProg->cur_pass=1;

+

+   else if (curProg->cur_pass==2)

+      curProg->cur_pass=3;

+

+   /* decide whether this is a new instruction or not ... all color instructions are new,

+      and alpha instructions might also be new if there was no preceding color inst */

+   if ((optype == 0) || (curProg->last_optype == optype)) {

+      if (curProg->numArithInstr[curProg->cur_pass >> 1] > 7) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(instrCount)");

+	 return;

+      }

+      /* easier to do that here slight side effect invalid instr will still be inserted as nops */

+      match_pair_inst(curProg, optype);

+      new_arith_inst(curProg);

+   }

+   curProg->last_optype = optype;

+   ci = curProg->numArithInstr[curProg->cur_pass >> 1] - 1;

+

+   /* add the instructions */

+   curI = &curProg->Instructions[curProg->cur_pass >> 1][ci];

+

+   /* error checking */

+   if ((dst < GL_REG_0_ATI) || (dst > GL_REG_5_ATI)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(dst)");

+      return;

+   }

+   if ((modtemp != GL_NONE) && (modtemp != GL_2X_BIT_ATI) &&

+      (modtemp != GL_4X_BIT_ATI) && (modtemp != GL_8X_BIT_ATI) &&

+      (modtemp != GL_HALF_BIT_ATI) && !(modtemp != GL_QUARTER_BIT_ATI) &&

+      (modtemp != GL_EIGHTH_BIT_ATI)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(dstMod)%x", modtemp);

+      return;

+   }

+   /* op checking? Actually looks like that's missing in the spec but we'll do it anyway */

+   if (((op < GL_ADD_ATI) || (op > GL_DOT2_ADD_ATI)) && !(op == GL_MOV_ATI)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "C/AFragmentOpATI(op)");

+      return;

+   }

+   if (optype == 1) {

+      if (((op == GL_DOT2_ADD_ATI) && (curI->Opcode[0] != GL_DOT2_ADD_ATI)) ||

+	 ((op == GL_DOT3_ATI) && (curI->Opcode[0] != GL_DOT3_ATI)) ||

+	 ((op == GL_DOT4_ATI) && (curI->Opcode[0] != GL_DOT4_ATI)) ||

+	 ((op != GL_DOT4_ATI) && (curI->Opcode[0] == GL_DOT4_ATI))) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION, "AFragmentOpATI(op)");

+	 return;

+      }

+   }

+   if ((op == GL_DOT4_ATI) &&

+      (((arg1 == GL_SECONDARY_INTERPOLATOR_ATI) && ((arg1Rep == GL_ALPHA) || (arg1Rep == GL_NONE))) ||

+      (((arg2 == GL_SECONDARY_INTERPOLATOR_ATI) && ((arg2Rep == GL_ALPHA) || (arg2Rep == GL_NONE)))))) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(sec_interp)");

+   }

+

+   if (!check_arith_arg(curProg, optype, arg1, arg1Rep)) {

+      return;

+   }

+   if (arg2) {

+      if (!check_arith_arg(curProg, optype, arg2, arg2Rep)) {

+	 return;

+      }

+   }

+   if (arg3) {

+      if (!check_arith_arg(curProg, optype, arg3, arg3Rep)) {

+	 return;

+      }

+      if ((arg1 >= GL_CON_0_ATI) && (arg1 <= GL_CON_7_ATI) &&

+	  (arg2 >= GL_CON_0_ATI) && (arg2 <= GL_CON_7_ATI) &&

+	  (arg3 >= GL_CON_0_ATI) && (arg3 <= GL_CON_7_ATI) &&

+	  (arg1 != arg2) && (arg1 != arg3) && (arg2 != arg3)) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION, "C/AFragmentOpATI(3Consts)");

+	 return;

+      }

+   }

+

+   /* all ok - not all fully validated though (e.g. argNMod - spec doesn't say anything) */

+

+   curI->Opcode[optype] = op;

+   curI->SrcReg[optype][0].Index = arg1;

+   curI->SrcReg[optype][0].argRep = arg1Rep;

+   curI->SrcReg[optype][0].argMod = arg1Mod;

+   curI->ArgCount[optype] = arg_count;

+

+   if (arg2) {

+      curI->SrcReg[optype][1].Index = arg2;

+      curI->SrcReg[optype][1].argRep = arg2Rep;

+      curI->SrcReg[optype][1].argMod = arg2Mod;

+   }

+

+   if (arg3) {

+      curI->SrcReg[optype][2].Index = arg3;

+      curI->SrcReg[optype][2].argRep = arg3Rep;

+      curI->SrcReg[optype][2].argMod = arg3Mod;

+   }

+

+   curI->DstReg[optype].Index = dst;

+   curI->DstReg[optype].dstMod = dstMod;

+   curI->DstReg[optype].dstMask = dstMask;

+

+#if MESA_DEBUG_ATI_FS

+   debug_op(optype, arg_count, op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);

+#endif

+

+}

+

+void GLAPIENTRY

+_mesa_ColorFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMask,

+			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,

+			  GLuint arg1Mod)

+{

+   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_COLOR_OP, 1, op, dst, dstMask,

+			dstMod, arg1, arg1Rep, arg1Mod, 0, 0, 0, 0, 0, 0);

+}

+

+void GLAPIENTRY

+_mesa_ColorFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMask,

+			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,

+			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,

+			  GLuint arg2Mod)

+{

+   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_COLOR_OP, 2, op, dst, dstMask,

+			dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep,

+			arg2Mod, 0, 0, 0);

+}

+

+void GLAPIENTRY

+_mesa_ColorFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMask,

+			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,

+			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,

+			  GLuint arg2Mod, GLuint arg3, GLuint arg3Rep,

+			  GLuint arg3Mod)

+{

+   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_COLOR_OP, 3, op, dst, dstMask,

+			dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep,

+			arg2Mod, arg3, arg3Rep, arg3Mod);

+}

+

+void GLAPIENTRY

+_mesa_AlphaFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,

+			  GLuint arg1Rep, GLuint arg1Mod)

+{

+   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_ALPHA_OP, 1, op, dst, 0, dstMod,

+			arg1, arg1Rep, arg1Mod, 0, 0, 0, 0, 0, 0);

+}

+

+void GLAPIENTRY

+_mesa_AlphaFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,

+			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,

+			  GLuint arg2Rep, GLuint arg2Mod)

+{

+   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_ALPHA_OP, 2, op, dst, 0, dstMod,

+			arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, 0, 0,

+			0);

+}

+

+void GLAPIENTRY

+_mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,

+			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,

+			  GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,

+			  GLuint arg3Rep, GLuint arg3Mod)

+{

+   _mesa_FragmentOpXATI(ATI_FRAGMENT_SHADER_ALPHA_OP, 3, op, dst, 0, dstMod,

+			arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3,

+			arg3Rep, arg3Mod);

+}

+

+void GLAPIENTRY

+_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value)

+{

+   GLuint dstindex;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if ((dst < GL_CON_0_ATI) || (dst > GL_CON_7_ATI)) {

+      /* spec says nothing about what should happen here but we can't just segfault...*/

+      _mesa_error(ctx, GL_INVALID_ENUM, "glSetFragmentShaderConstantATI(dst)");

+      return;

+   }

+

+   dstindex = dst - GL_CON_0_ATI;

+   if (ctx->ATIFragmentShader.Compiling) {

+      struct ati_fragment_shader *curProg = ctx->ATIFragmentShader.Current;

+      COPY_4V(curProg->Constants[dstindex], value);

+      curProg->LocalConstDef |= 1 << dstindex;

+   }

+   else {

+      FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+      COPY_4V(ctx->ATIFragmentShader.GlobalConstants[dstindex], value);

+   }

+}

+

+#endif /* FEATURE_ATI_fragment_shader */

diff --git a/mesalib/src/mesa/main/atifragshader.h b/mesalib/src/mesa/main/atifragshader.h
index 31c335ec8..838d327c0 100644
--- a/mesalib/src/mesa/main/atifragshader.h
+++ b/mesalib/src/mesa/main/atifragshader.h
@@ -1,149 +1,154 @@
-/*
- * Mesa 3-D graphics library ATI Fragment Shader
- *
- * Copyright (C) 2004  David Airlie   All Rights Reserved.
- *
- */
-
-#ifndef ATIFRAGSHADER_H
-#define ATIFRAGSHADER_H
-
-#include "main/mtypes.h"
-
-#define MAX_NUM_INSTRUCTIONS_PER_PASS_ATI 8
-#define MAX_NUM_PASSES_ATI                2
-#define MAX_NUM_FRAGMENT_REGISTERS_ATI    6
-
-struct ati_fs_opcode_st
-{
-   GLenum opcode;
-   GLint num_src_args;
-};
-
-extern struct ati_fs_opcode_st ati_fs_opcodes[];
-
-struct atifragshader_src_register
-{
-   GLuint Index;
-   GLuint argRep;
-   GLuint argMod;
-};
-
-struct atifragshader_dst_register
-{
-   GLuint Index;
-   GLuint dstMod;
-   GLuint dstMask;
-};
-
-#define ATI_FRAGMENT_SHADER_COLOR_OP 0
-#define ATI_FRAGMENT_SHADER_ALPHA_OP 1
-#define ATI_FRAGMENT_SHADER_PASS_OP  2
-#define ATI_FRAGMENT_SHADER_SAMPLE_OP 3
-
-/* two opcodes - one for color/one for alpha */
-/* up to three source registers for most ops */
-struct atifs_instruction
-{
-   GLenum Opcode[2];
-   GLuint ArgCount[2];
-   struct atifragshader_src_register SrcReg[2][3];
-   struct atifragshader_dst_register DstReg[2];
-};
-
-/* different from arithmetic shader instruction */
-struct atifs_setupinst
-{
-   GLenum Opcode;
-   GLuint src;
-   GLenum swizzle;
-};
-
-
-#if FEATURE_ATI_fragment_shader
-
-extern void
-_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
-
-extern struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id);
-
-extern void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx,
-                                 struct ati_fragment_shader *s);
-
-
-extern GLuint GLAPIENTRY _mesa_GenFragmentShadersATI(GLuint range);
-
-extern void GLAPIENTRY _mesa_BindFragmentShaderATI(GLuint id);
-
-extern void GLAPIENTRY _mesa_DeleteFragmentShaderATI(GLuint id);
-
-extern void GLAPIENTRY _mesa_BeginFragmentShaderATI(void);
-
-extern void GLAPIENTRY _mesa_EndFragmentShaderATI(void);
-
-extern void GLAPIENTRY
-_mesa_PassTexCoordATI(GLuint dst, GLuint coord, GLenum swizzle);
-
-extern void GLAPIENTRY
-_mesa_SampleMapATI(GLuint dst, GLuint interp, GLenum swizzle);
-
-extern void GLAPIENTRY
-_mesa_ColorFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMask,
-			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-			  GLuint arg1Mod);
-
-extern void GLAPIENTRY
-_mesa_ColorFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMask,
-			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,
-			  GLuint arg2Mod);
-
-extern void GLAPIENTRY
-_mesa_ColorFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMask,
-			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,
-			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,
-			  GLuint arg2Mod, GLuint arg3, GLuint arg3Rep,
-			  GLuint arg3Mod);
-
-extern void GLAPIENTRY
-_mesa_AlphaFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-			  GLuint arg1Rep, GLuint arg1Mod);
-
-extern void GLAPIENTRY
-_mesa_AlphaFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-			  GLuint arg2Rep, GLuint arg2Mod);
-
-extern void GLAPIENTRY
-_mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
-			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,
-			  GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,
-			  GLuint arg3Rep, GLuint arg3Mod);
-
-extern void GLAPIENTRY
-_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
-
-#else /* FEATURE_ATI_fragment_shader */
-
-static INLINE void
-_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
-{
-}
-
-static INLINE struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
-{
-   return NULL;
-}
-
-static INLINE void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx,
-                                 struct ati_fragment_shader *s)
-{
-}
-
-#endif /* FEATURE_ATI_fragment_shader */
-
-#endif /* ATIFRAGSHADER_H */
+/*

+ * Mesa 3-D graphics library ATI Fragment Shader

+ *

+ * Copyright (C) 2004  David Airlie   All Rights Reserved.

+ *

+ */

+

+#ifndef ATIFRAGSHADER_H

+#define ATIFRAGSHADER_H

+

+#include "compiler.h"

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct gl_context;

+

+#define MAX_NUM_INSTRUCTIONS_PER_PASS_ATI 8

+#define MAX_NUM_PASSES_ATI                2

+#define MAX_NUM_FRAGMENT_REGISTERS_ATI    6

+

+struct ati_fs_opcode_st

+{

+   GLenum opcode;

+   GLint num_src_args;

+};

+

+extern struct ati_fs_opcode_st ati_fs_opcodes[];

+

+struct atifragshader_src_register

+{

+   GLuint Index;

+   GLuint argRep;

+   GLuint argMod;

+};

+

+struct atifragshader_dst_register

+{

+   GLuint Index;

+   GLuint dstMod;

+   GLuint dstMask;

+};

+

+#define ATI_FRAGMENT_SHADER_COLOR_OP 0

+#define ATI_FRAGMENT_SHADER_ALPHA_OP 1

+#define ATI_FRAGMENT_SHADER_PASS_OP  2

+#define ATI_FRAGMENT_SHADER_SAMPLE_OP 3

+

+/* two opcodes - one for color/one for alpha */

+/* up to three source registers for most ops */

+struct atifs_instruction

+{

+   GLenum Opcode[2];

+   GLuint ArgCount[2];

+   struct atifragshader_src_register SrcReg[2][3];

+   struct atifragshader_dst_register DstReg[2];

+};

+

+/* different from arithmetic shader instruction */

+struct atifs_setupinst

+{

+   GLenum Opcode;

+   GLuint src;

+   GLenum swizzle;

+};

+

+

+#if FEATURE_ATI_fragment_shader

+

+extern void

+_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);

+

+extern struct ati_fragment_shader *

+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id);

+

+extern void

+_mesa_delete_ati_fragment_shader(struct gl_context *ctx,

+                                 struct ati_fragment_shader *s);

+

+

+extern GLuint GLAPIENTRY _mesa_GenFragmentShadersATI(GLuint range);

+

+extern void GLAPIENTRY _mesa_BindFragmentShaderATI(GLuint id);

+

+extern void GLAPIENTRY _mesa_DeleteFragmentShaderATI(GLuint id);

+

+extern void GLAPIENTRY _mesa_BeginFragmentShaderATI(void);

+

+extern void GLAPIENTRY _mesa_EndFragmentShaderATI(void);

+

+extern void GLAPIENTRY

+_mesa_PassTexCoordATI(GLuint dst, GLuint coord, GLenum swizzle);

+

+extern void GLAPIENTRY

+_mesa_SampleMapATI(GLuint dst, GLuint interp, GLenum swizzle);

+

+extern void GLAPIENTRY

+_mesa_ColorFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMask,

+			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,

+			  GLuint arg1Mod);

+

+extern void GLAPIENTRY

+_mesa_ColorFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMask,

+			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,

+			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,

+			  GLuint arg2Mod);

+

+extern void GLAPIENTRY

+_mesa_ColorFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMask,

+			  GLuint dstMod, GLuint arg1, GLuint arg1Rep,

+			  GLuint arg1Mod, GLuint arg2, GLuint arg2Rep,

+			  GLuint arg2Mod, GLuint arg3, GLuint arg3Rep,

+			  GLuint arg3Mod);

+

+extern void GLAPIENTRY

+_mesa_AlphaFragmentOp1ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,

+			  GLuint arg1Rep, GLuint arg1Mod);

+

+extern void GLAPIENTRY

+_mesa_AlphaFragmentOp2ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,

+			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,

+			  GLuint arg2Rep, GLuint arg2Mod);

+

+extern void GLAPIENTRY

+_mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,

+			  GLuint arg1Rep, GLuint arg1Mod, GLuint arg2,

+			  GLuint arg2Rep, GLuint arg2Mod, GLuint arg3,

+			  GLuint arg3Rep, GLuint arg3Mod);

+

+extern void GLAPIENTRY

+_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);

+

+#else /* FEATURE_ATI_fragment_shader */

+

+static INLINE void

+_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)

+{

+}

+

+static INLINE struct ati_fragment_shader *

+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)

+{

+   return NULL;

+}

+

+static INLINE void

+_mesa_delete_ati_fragment_shader(struct gl_context *ctx,

+                                 struct ati_fragment_shader *s)

+{

+}

+

+#endif /* FEATURE_ATI_fragment_shader */

+

+#endif /* ATIFRAGSHADER_H */

diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c
index 753949be5..23ba36fba 100644
--- a/mesalib/src/mesa/main/attrib.c
+++ b/mesalib/src/mesa/main/attrib.c
@@ -1,1575 +1,1546 @@
-/*
- * 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.
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "accum.h"
-#include "arrayobj.h"
-#include "attrib.h"
-#include "blend.h"
-#include "buffers.h"
-#include "bufferobj.h"
-#include "clear.h"
-#include "colormac.h"
-#include "context.h"
-#include "depth.h"
-#include "enable.h"
-#include "enums.h"
-#include "fog.h"
-#include "hint.h"
-#include "light.h"
-#include "lines.h"
-#include "macros.h"
-#include "matrix.h"
-#include "multisample.h"
-#include "points.h"
-#include "polygon.h"
-#include "scissor.h"
-#include "stencil.h"
-#include "texenv.h"
-#include "texgen.h"
-#include "texobj.h"
-#include "texparam.h"
-#include "texstate.h"
-#include "varray.h"
-#include "viewport.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-/**
- * glEnable()/glDisable() attribute group (GL_ENABLE_BIT).
- */
-struct gl_enable_attrib
-{
-   GLboolean AlphaTest;
-   GLboolean AutoNormal;
-   GLboolean Blend;
-   GLbitfield ClipPlanes;
-   GLboolean ColorMaterial;
-   GLboolean ColorTable[COLORTABLE_MAX];
-   GLboolean Convolution1D;
-   GLboolean Convolution2D;
-   GLboolean Separable2D;
-   GLboolean CullFace;
-   GLboolean DepthClamp;
-   GLboolean DepthTest;
-   GLboolean Dither;
-   GLboolean Fog;
-   GLboolean Histogram;
-   GLboolean Light[MAX_LIGHTS];
-   GLboolean Lighting;
-   GLboolean LineSmooth;
-   GLboolean LineStipple;
-   GLboolean IndexLogicOp;
-   GLboolean ColorLogicOp;
-
-   GLboolean Map1Color4;
-   GLboolean Map1Index;
-   GLboolean Map1Normal;
-   GLboolean Map1TextureCoord1;
-   GLboolean Map1TextureCoord2;
-   GLboolean Map1TextureCoord3;
-   GLboolean Map1TextureCoord4;
-   GLboolean Map1Vertex3;
-   GLboolean Map1Vertex4;
-   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */
-   GLboolean Map2Color4;
-   GLboolean Map2Index;
-   GLboolean Map2Normal;
-   GLboolean Map2TextureCoord1;
-   GLboolean Map2TextureCoord2;
-   GLboolean Map2TextureCoord3;
-   GLboolean Map2TextureCoord4;
-   GLboolean Map2Vertex3;
-   GLboolean Map2Vertex4;
-   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
-
-   GLboolean MinMax;
-   GLboolean Normalize;
-   GLboolean PixelTexture;
-   GLboolean PointSmooth;
-   GLboolean PolygonOffsetPoint;
-   GLboolean PolygonOffsetLine;
-   GLboolean PolygonOffsetFill;
-   GLboolean PolygonSmooth;
-   GLboolean PolygonStipple;
-   GLboolean RescaleNormals;
-   GLboolean Scissor;
-   GLboolean Stencil;
-   GLboolean StencilTwoSide;          /* GL_EXT_stencil_two_side */
-   GLboolean MultisampleEnabled;      /* GL_ARB_multisample */
-   GLboolean SampleAlphaToCoverage;   /* GL_ARB_multisample */
-   GLboolean SampleAlphaToOne;        /* GL_ARB_multisample */
-   GLboolean SampleCoverage;          /* GL_ARB_multisample */
-   GLboolean SampleCoverageInvert;    /* GL_ARB_multisample */
-   GLboolean RasterPositionUnclipped; /* GL_IBM_rasterpos_clip */
-
-   GLbitfield Texture[MAX_TEXTURE_UNITS];
-   GLbitfield TexGen[MAX_TEXTURE_UNITS];
-
-   /* SGI_texture_color_table */
-   GLboolean TextureColorTable[MAX_TEXTURE_UNITS];
-
-   /* GL_ARB_vertex_program / GL_NV_vertex_program */
-   GLboolean VertexProgram;
-   GLboolean VertexProgramPointSize;
-   GLboolean VertexProgramTwoSide;
-
-   /* GL_ARB_point_sprite / GL_NV_point_sprite */
-   GLboolean PointSprite;
-   GLboolean FragmentShaderATI;
-};
-
-
-/**
- * Node for the attribute stack.
- */
-struct gl_attrib_node
-{
-   GLbitfield kind;
-   void *data;
-   struct gl_attrib_node *next;
-};
-
-
-
-/**
- * Special struct for saving/restoring texture state (GL_TEXTURE_BIT)
- */
-struct texture_state
-{
-   struct gl_texture_attrib Texture;  /**< The usual context state */
-
-   /** to save per texture object state (wrap modes, filters, etc): */
-   struct gl_texture_object SavedObj[MAX_TEXTURE_UNITS][NUM_TEXTURE_TARGETS];
-
-   /**
-    * To save references to texture objects (so they don't get accidentally
-    * deleted while saved in the attribute stack).
-    */
-   struct gl_texture_object *SavedTexRef[MAX_TEXTURE_UNITS][NUM_TEXTURE_TARGETS];
-};
-
-
-#if FEATURE_attrib_stack
-
-
-/**
- * Allocate new attribute node of given type/kind.  Attach payload data.
- * Insert it into the linked list named by 'head'.
- */
-static void
-save_attrib_data(struct gl_attrib_node **head,
-                 GLbitfield kind, void *payload)
-{
-   struct gl_attrib_node *n = MALLOC_STRUCT(gl_attrib_node);
-   if (n) {
-      n->kind = kind;
-      n->data = payload;
-      /* insert at head */
-      n->next = *head;
-      *head = n;
-   }
-   else {
-      /* out of memory! */
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_PushAttrib(GLbitfield mask)
-{
-   struct gl_attrib_node *head;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glPushAttrib %x\n", (int) mask);
-
-   if (ctx->AttribStackDepth >= MAX_ATTRIB_STACK_DEPTH) {
-      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushAttrib" );
-      return;
-   }
-
-   /* Build linked list of attribute nodes which save all attribute */
-   /* groups specified by the mask. */
-   head = NULL;
-
-   if (mask & GL_ACCUM_BUFFER_BIT) {
-      struct gl_accum_attrib *attr;
-      attr = MALLOC_STRUCT( gl_accum_attrib );
-      memcpy( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );
-      save_attrib_data(&head, GL_ACCUM_BUFFER_BIT, attr);
-   }
-
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      GLuint i;
-      struct gl_colorbuffer_attrib *attr;
-      attr = MALLOC_STRUCT( gl_colorbuffer_attrib );
-      memcpy( attr, &ctx->Color, sizeof(struct gl_colorbuffer_attrib) );
-      /* push the Draw FBO's DrawBuffer[] state, not ctx->Color.DrawBuffer[] */
-      for (i = 0; i < ctx->Const.MaxDrawBuffers; i ++)
-         attr->DrawBuffer[i] = ctx->DrawBuffer->ColorDrawBuffer[i];
-      save_attrib_data(&head, GL_COLOR_BUFFER_BIT, attr);
-   }
-
-   if (mask & GL_CURRENT_BIT) {
-      struct gl_current_attrib *attr;
-      FLUSH_CURRENT( ctx, 0 );
-      attr = MALLOC_STRUCT( gl_current_attrib );
-      memcpy( attr, &ctx->Current, sizeof(struct gl_current_attrib) );
-      save_attrib_data(&head, GL_CURRENT_BIT, attr);
-   }
-
-   if (mask & GL_DEPTH_BUFFER_BIT) {
-      struct gl_depthbuffer_attrib *attr;
-      attr = MALLOC_STRUCT( gl_depthbuffer_attrib );
-      memcpy( attr, &ctx->Depth, sizeof(struct gl_depthbuffer_attrib) );
-      save_attrib_data(&head, GL_DEPTH_BUFFER_BIT, attr);
-   }
-
-   if (mask & GL_ENABLE_BIT) {
-      struct gl_enable_attrib *attr;
-      GLuint i;
-      attr = MALLOC_STRUCT( gl_enable_attrib );
-      /* Copy enable flags from all other attributes into the enable struct. */
-      attr->AlphaTest = ctx->Color.AlphaEnabled;
-      attr->AutoNormal = ctx->Eval.AutoNormal;
-      attr->Blend = ctx->Color.BlendEnabled;
-      attr->ClipPlanes = ctx->Transform.ClipPlanesEnabled;
-      attr->ColorMaterial = ctx->Light.ColorMaterialEnabled;
-      for (i = 0; i < COLORTABLE_MAX; i++) {
-         attr->ColorTable[i] = ctx->Pixel.ColorTableEnabled[i];
-      }
-      attr->Convolution1D = ctx->Pixel.Convolution1DEnabled;
-      attr->Convolution2D = ctx->Pixel.Convolution2DEnabled;
-      attr->Separable2D = ctx->Pixel.Separable2DEnabled;
-      attr->CullFace = ctx->Polygon.CullFlag;
-      attr->DepthClamp = ctx->Transform.DepthClamp;
-      attr->DepthTest = ctx->Depth.Test;
-      attr->Dither = ctx->Color.DitherFlag;
-      attr->Fog = ctx->Fog.Enabled;
-      for (i = 0; i < ctx->Const.MaxLights; i++) {
-         attr->Light[i] = ctx->Light.Light[i].Enabled;
-      }
-      attr->Lighting = ctx->Light.Enabled;
-      attr->LineSmooth = ctx->Line.SmoothFlag;
-      attr->LineStipple = ctx->Line.StippleFlag;
-      attr->Histogram = ctx->Pixel.HistogramEnabled;
-      attr->MinMax = ctx->Pixel.MinMaxEnabled;
-      attr->IndexLogicOp = ctx->Color.IndexLogicOpEnabled;
-      attr->ColorLogicOp = ctx->Color.ColorLogicOpEnabled;
-      attr->Map1Color4 = ctx->Eval.Map1Color4;
-      attr->Map1Index = ctx->Eval.Map1Index;
-      attr->Map1Normal = ctx->Eval.Map1Normal;
-      attr->Map1TextureCoord1 = ctx->Eval.Map1TextureCoord1;
-      attr->Map1TextureCoord2 = ctx->Eval.Map1TextureCoord2;
-      attr->Map1TextureCoord3 = ctx->Eval.Map1TextureCoord3;
-      attr->Map1TextureCoord4 = ctx->Eval.Map1TextureCoord4;
-      attr->Map1Vertex3 = ctx->Eval.Map1Vertex3;
-      attr->Map1Vertex4 = ctx->Eval.Map1Vertex4;
-      memcpy(attr->Map1Attrib, ctx->Eval.Map1Attrib, sizeof(ctx->Eval.Map1Attrib));
-      attr->Map2Color4 = ctx->Eval.Map2Color4;
-      attr->Map2Index = ctx->Eval.Map2Index;
-      attr->Map2Normal = ctx->Eval.Map2Normal;
-      attr->Map2TextureCoord1 = ctx->Eval.Map2TextureCoord1;
-      attr->Map2TextureCoord2 = ctx->Eval.Map2TextureCoord2;
-      attr->Map2TextureCoord3 = ctx->Eval.Map2TextureCoord3;
-      attr->Map2TextureCoord4 = ctx->Eval.Map2TextureCoord4;
-      attr->Map2Vertex3 = ctx->Eval.Map2Vertex3;
-      attr->Map2Vertex4 = ctx->Eval.Map2Vertex4;
-      memcpy(attr->Map2Attrib, ctx->Eval.Map2Attrib, sizeof(ctx->Eval.Map2Attrib));
-      attr->Normalize = ctx->Transform.Normalize;
-      attr->RasterPositionUnclipped = ctx->Transform.RasterPositionUnclipped;
-      attr->PointSmooth = ctx->Point.SmoothFlag;
-      attr->PointSprite = ctx->Point.PointSprite;
-      attr->PolygonOffsetPoint = ctx->Polygon.OffsetPoint;
-      attr->PolygonOffsetLine = ctx->Polygon.OffsetLine;
-      attr->PolygonOffsetFill = ctx->Polygon.OffsetFill;
-      attr->PolygonSmooth = ctx->Polygon.SmoothFlag;
-      attr->PolygonStipple = ctx->Polygon.StippleFlag;
-      attr->RescaleNormals = ctx->Transform.RescaleNormals;
-      attr->Scissor = ctx->Scissor.Enabled;
-      attr->Stencil = ctx->Stencil.Enabled;
-      attr->StencilTwoSide = ctx->Stencil.TestTwoSide;
-      attr->MultisampleEnabled = ctx->Multisample.Enabled;
-      attr->SampleAlphaToCoverage = ctx->Multisample.SampleAlphaToCoverage;
-      attr->SampleAlphaToOne = ctx->Multisample.SampleAlphaToOne;
-      attr->SampleCoverage = ctx->Multisample.SampleCoverage;
-      attr->SampleCoverageInvert = ctx->Multisample.SampleCoverageInvert;
-      for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-         attr->Texture[i] = ctx->Texture.Unit[i].Enabled;
-         attr->TexGen[i] = ctx->Texture.Unit[i].TexGenEnabled;
-         attr->TextureColorTable[i] = ctx->Texture.Unit[i].ColorTableEnabled;
-      }
-      /* GL_NV_vertex_program */
-      attr->VertexProgram = ctx->VertexProgram.Enabled;
-      attr->VertexProgramPointSize = ctx->VertexProgram.PointSizeEnabled;
-      attr->VertexProgramTwoSide = ctx->VertexProgram.TwoSideEnabled;
-      save_attrib_data(&head, GL_ENABLE_BIT, attr);
-   }
-
-   if (mask & GL_EVAL_BIT) {
-      struct gl_eval_attrib *attr;
-      attr = MALLOC_STRUCT( gl_eval_attrib );
-      memcpy( attr, &ctx->Eval, sizeof(struct gl_eval_attrib) );
-      save_attrib_data(&head, GL_EVAL_BIT, attr);
-   }
-
-   if (mask & GL_FOG_BIT) {
-      struct gl_fog_attrib *attr;
-      attr = MALLOC_STRUCT( gl_fog_attrib );
-      memcpy( attr, &ctx->Fog, sizeof(struct gl_fog_attrib) );
-      save_attrib_data(&head, GL_FOG_BIT, attr);
-   }
-
-   if (mask & GL_HINT_BIT) {
-      struct gl_hint_attrib *attr;
-      attr = MALLOC_STRUCT( gl_hint_attrib );
-      memcpy( attr, &ctx->Hint, sizeof(struct gl_hint_attrib) );
-      save_attrib_data(&head, GL_HINT_BIT, attr);
-   }
-
-   if (mask & GL_LIGHTING_BIT) {
-      struct gl_light_attrib *attr;
-      FLUSH_CURRENT(ctx, 0);	/* flush material changes */
-      attr = MALLOC_STRUCT( gl_light_attrib );
-      memcpy( attr, &ctx->Light, sizeof(struct gl_light_attrib) );
-      save_attrib_data(&head, GL_LIGHTING_BIT, attr);
-   }
-
-   if (mask & GL_LINE_BIT) {
-      struct gl_line_attrib *attr;
-      attr = MALLOC_STRUCT( gl_line_attrib );
-      memcpy( attr, &ctx->Line, sizeof(struct gl_line_attrib) );
-      save_attrib_data(&head, GL_LINE_BIT, attr);
-   }
-
-   if (mask & GL_LIST_BIT) {
-      struct gl_list_attrib *attr;
-      attr = MALLOC_STRUCT( gl_list_attrib );
-      memcpy( attr, &ctx->List, sizeof(struct gl_list_attrib) );
-      save_attrib_data(&head, GL_LIST_BIT, attr);
-   }
-
-   if (mask & GL_PIXEL_MODE_BIT) {
-      struct gl_pixel_attrib *attr;
-      attr = MALLOC_STRUCT( gl_pixel_attrib );
-      memcpy( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );
-      /* push the Read FBO's ReadBuffer state, not ctx->Pixel.ReadBuffer */
-      attr->ReadBuffer = ctx->ReadBuffer->ColorReadBuffer;
-      save_attrib_data(&head, GL_PIXEL_MODE_BIT, attr);
-   }
-
-   if (mask & GL_POINT_BIT) {
-      struct gl_point_attrib *attr;
-      attr = MALLOC_STRUCT( gl_point_attrib );
-      memcpy( attr, &ctx->Point, sizeof(struct gl_point_attrib) );
-      save_attrib_data(&head, GL_POINT_BIT, attr);
-   }
-
-   if (mask & GL_POLYGON_BIT) {
-      struct gl_polygon_attrib *attr;
-      attr = MALLOC_STRUCT( gl_polygon_attrib );
-      memcpy( attr, &ctx->Polygon, sizeof(struct gl_polygon_attrib) );
-      save_attrib_data(&head, GL_POLYGON_BIT, attr);
-   }
-
-   if (mask & GL_POLYGON_STIPPLE_BIT) {
-      GLuint *stipple;
-      stipple = (GLuint *) MALLOC( 32*sizeof(GLuint) );
-      memcpy( stipple, ctx->PolygonStipple, 32*sizeof(GLuint) );
-      save_attrib_data(&head, GL_POLYGON_STIPPLE_BIT, stipple);
-   }
-
-   if (mask & GL_SCISSOR_BIT) {
-      struct gl_scissor_attrib *attr;
-      attr = MALLOC_STRUCT( gl_scissor_attrib );
-      memcpy( attr, &ctx->Scissor, sizeof(struct gl_scissor_attrib) );
-      save_attrib_data(&head, GL_SCISSOR_BIT, attr);
-   }
-
-   if (mask & GL_STENCIL_BUFFER_BIT) {
-      struct gl_stencil_attrib *attr;
-      attr = MALLOC_STRUCT( gl_stencil_attrib );
-      memcpy( attr, &ctx->Stencil, sizeof(struct gl_stencil_attrib) );
-      save_attrib_data(&head, GL_STENCIL_BUFFER_BIT, attr);
-   }
-
-   if (mask & GL_TEXTURE_BIT) {
-      struct texture_state *texstate = CALLOC_STRUCT(texture_state);
-      GLuint u, tex;
-
-      if (!texstate) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glPushAttrib(GL_TEXTURE_BIT)");
-         goto end;
-      }
-
-      _mesa_lock_context_textures(ctx);
-
-      /* copy/save the bulk of texture state here */
-      memcpy(&texstate->Texture, &ctx->Texture, sizeof(ctx->Texture));
-
-      /* Save references to the currently bound texture objects so they don't
-       * accidentally get deleted while referenced in the attribute stack.
-       */
-      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-            _mesa_reference_texobj(&texstate->SavedTexRef[u][tex],
-                                   ctx->Texture.Unit[u].CurrentTex[tex]);
-         }
-      }
-
-      /* copy state/contents of the currently bound texture objects */
-      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-            _mesa_copy_texture_object(&texstate->SavedObj[u][tex],
-                                      ctx->Texture.Unit[u].CurrentTex[tex]);
-         }
-      }
-
-      _mesa_unlock_context_textures(ctx);
-
-      save_attrib_data(&head, GL_TEXTURE_BIT, texstate);
-   }
-
-   if (mask & GL_TRANSFORM_BIT) {
-      struct gl_transform_attrib *attr;
-      attr = MALLOC_STRUCT( gl_transform_attrib );
-      memcpy( attr, &ctx->Transform, sizeof(struct gl_transform_attrib) );
-      save_attrib_data(&head, GL_TRANSFORM_BIT, attr);
-   }
-
-   if (mask & GL_VIEWPORT_BIT) {
-      struct gl_viewport_attrib *attr;
-      attr = MALLOC_STRUCT( gl_viewport_attrib );
-      memcpy( attr, &ctx->Viewport, sizeof(struct gl_viewport_attrib) );
-      save_attrib_data(&head, GL_VIEWPORT_BIT, attr);
-   }
-
-   /* GL_ARB_multisample */
-   if (mask & GL_MULTISAMPLE_BIT_ARB) {
-      struct gl_multisample_attrib *attr;
-      attr = MALLOC_STRUCT( gl_multisample_attrib );
-      memcpy( attr, &ctx->Multisample, sizeof(struct gl_multisample_attrib) );
-      save_attrib_data(&head, GL_MULTISAMPLE_BIT_ARB, attr);
-   }
-
-end:
-   ctx->AttribStack[ctx->AttribStackDepth] = head;
-   ctx->AttribStackDepth++;
-}
-
-
-
-static void
-pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
-{
-   const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
-   GLuint i;
-
-#define TEST_AND_UPDATE(VALUE, NEWVALUE, ENUM)		\
-	if ((VALUE) != (NEWVALUE)) {			\
-	   _mesa_set_enable( ctx, ENUM, (NEWVALUE) );	\
-	}
-
-   TEST_AND_UPDATE(ctx->Color.AlphaEnabled, enable->AlphaTest, GL_ALPHA_TEST);
-   if (ctx->Color.BlendEnabled != enable->Blend) {
-      if (ctx->Extensions.EXT_draw_buffers2) {
-         GLuint i;
-         for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-            _mesa_set_enablei(ctx, GL_BLEND, i, (enable->Blend >> i) & 1);
-         }
-      }
-      else {
-         _mesa_set_enable(ctx, GL_BLEND, (enable->Blend & 1));
-      }
-   }
-
-   for (i=0;i<MAX_CLIP_PLANES;i++) {
-      const GLuint mask = 1 << i;
-      if ((ctx->Transform.ClipPlanesEnabled & mask) != (enable->ClipPlanes & mask))
-	  _mesa_set_enable(ctx, (GLenum) (GL_CLIP_PLANE0 + i),
-			   (GLboolean) ((enable->ClipPlanes & mask) ? GL_TRUE : GL_FALSE));
-   }
-
-   TEST_AND_UPDATE(ctx->Light.ColorMaterialEnabled, enable->ColorMaterial,
-                   GL_COLOR_MATERIAL);
-   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION],
-                   enable->ColorTable[COLORTABLE_PRECONVOLUTION],
-                   GL_COLOR_TABLE);
-   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION],
-                   enable->ColorTable[COLORTABLE_POSTCONVOLUTION],
-                   GL_POST_CONVOLUTION_COLOR_TABLE);
-   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX],
-                   enable->ColorTable[COLORTABLE_POSTCOLORMATRIX],
-                   GL_POST_COLOR_MATRIX_COLOR_TABLE);
-   TEST_AND_UPDATE(ctx->Polygon.CullFlag, enable->CullFace, GL_CULL_FACE);
-   TEST_AND_UPDATE(ctx->Transform.DepthClamp, enable->DepthClamp,
-		   GL_DEPTH_CLAMP);
-   TEST_AND_UPDATE(ctx->Depth.Test, enable->DepthTest, GL_DEPTH_TEST);
-   TEST_AND_UPDATE(ctx->Color.DitherFlag, enable->Dither, GL_DITHER);
-   TEST_AND_UPDATE(ctx->Pixel.Convolution1DEnabled, enable->Convolution1D,
-                   GL_CONVOLUTION_1D);
-   TEST_AND_UPDATE(ctx->Pixel.Convolution2DEnabled, enable->Convolution2D,
-                   GL_CONVOLUTION_2D);
-   TEST_AND_UPDATE(ctx->Pixel.Separable2DEnabled, enable->Separable2D,
-                   GL_SEPARABLE_2D);
-   TEST_AND_UPDATE(ctx->Fog.Enabled, enable->Fog, GL_FOG);
-   TEST_AND_UPDATE(ctx->Light.Enabled, enable->Lighting, GL_LIGHTING);
-   TEST_AND_UPDATE(ctx->Line.SmoothFlag, enable->LineSmooth, GL_LINE_SMOOTH);
-   TEST_AND_UPDATE(ctx->Line.StippleFlag, enable->LineStipple,
-                   GL_LINE_STIPPLE);
-   TEST_AND_UPDATE(ctx->Color.IndexLogicOpEnabled, enable->IndexLogicOp,
-                   GL_INDEX_LOGIC_OP);
-   TEST_AND_UPDATE(ctx->Color.ColorLogicOpEnabled, enable->ColorLogicOp,
-                   GL_COLOR_LOGIC_OP);
-
-   TEST_AND_UPDATE(ctx->Eval.Map1Color4, enable->Map1Color4, GL_MAP1_COLOR_4);
-   TEST_AND_UPDATE(ctx->Eval.Map1Index, enable->Map1Index, GL_MAP1_INDEX);
-   TEST_AND_UPDATE(ctx->Eval.Map1Normal, enable->Map1Normal, GL_MAP1_NORMAL);
-   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord1, enable->Map1TextureCoord1,
-                   GL_MAP1_TEXTURE_COORD_1);
-   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord2, enable->Map1TextureCoord2,
-                   GL_MAP1_TEXTURE_COORD_2);
-   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord3, enable->Map1TextureCoord3,
-                   GL_MAP1_TEXTURE_COORD_3);
-   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord4, enable->Map1TextureCoord4,
-                   GL_MAP1_TEXTURE_COORD_4);
-   TEST_AND_UPDATE(ctx->Eval.Map1Vertex3, enable->Map1Vertex3,
-                   GL_MAP1_VERTEX_3);
-   TEST_AND_UPDATE(ctx->Eval.Map1Vertex4, enable->Map1Vertex4,
-                   GL_MAP1_VERTEX_4);
-   for (i = 0; i < 16; i++) {
-      TEST_AND_UPDATE(ctx->Eval.Map1Attrib[i], enable->Map1Attrib[i],
-                      GL_MAP1_VERTEX_ATTRIB0_4_NV + i);
-   }
-
-   TEST_AND_UPDATE(ctx->Eval.Map2Color4, enable->Map2Color4, GL_MAP2_COLOR_4);
-   TEST_AND_UPDATE(ctx->Eval.Map2Index, enable->Map2Index, GL_MAP2_INDEX);
-   TEST_AND_UPDATE(ctx->Eval.Map2Normal, enable->Map2Normal, GL_MAP2_NORMAL);
-   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord1, enable->Map2TextureCoord1,
-                   GL_MAP2_TEXTURE_COORD_1);
-   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord2, enable->Map2TextureCoord2,
-                   GL_MAP2_TEXTURE_COORD_2);
-   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord3, enable->Map2TextureCoord3,
-                   GL_MAP2_TEXTURE_COORD_3);
-   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord4, enable->Map2TextureCoord4,
-                   GL_MAP2_TEXTURE_COORD_4);
-   TEST_AND_UPDATE(ctx->Eval.Map2Vertex3, enable->Map2Vertex3,
-                   GL_MAP2_VERTEX_3);
-   TEST_AND_UPDATE(ctx->Eval.Map2Vertex4, enable->Map2Vertex4,
-                   GL_MAP2_VERTEX_4);
-   for (i = 0; i < 16; i++) {
-      TEST_AND_UPDATE(ctx->Eval.Map2Attrib[i], enable->Map2Attrib[i],
-                      GL_MAP2_VERTEX_ATTRIB0_4_NV + i);
-   }
-
-   TEST_AND_UPDATE(ctx->Eval.AutoNormal, enable->AutoNormal, GL_AUTO_NORMAL);
-   TEST_AND_UPDATE(ctx->Transform.Normalize, enable->Normalize, GL_NORMALIZE);
-   TEST_AND_UPDATE(ctx->Transform.RescaleNormals, enable->RescaleNormals,
-                   GL_RESCALE_NORMAL_EXT);
-   TEST_AND_UPDATE(ctx->Transform.RasterPositionUnclipped,
-                   enable->RasterPositionUnclipped,
-                   GL_RASTER_POSITION_UNCLIPPED_IBM);
-   TEST_AND_UPDATE(ctx->Point.SmoothFlag, enable->PointSmooth,
-                   GL_POINT_SMOOTH);
-   if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite) {
-      TEST_AND_UPDATE(ctx->Point.PointSprite, enable->PointSprite,
-                      GL_POINT_SPRITE_NV);
-   }
-   TEST_AND_UPDATE(ctx->Polygon.OffsetPoint, enable->PolygonOffsetPoint,
-                   GL_POLYGON_OFFSET_POINT);
-   TEST_AND_UPDATE(ctx->Polygon.OffsetLine, enable->PolygonOffsetLine,
-                   GL_POLYGON_OFFSET_LINE);
-   TEST_AND_UPDATE(ctx->Polygon.OffsetFill, enable->PolygonOffsetFill,
-                   GL_POLYGON_OFFSET_FILL);
-   TEST_AND_UPDATE(ctx->Polygon.SmoothFlag, enable->PolygonSmooth,
-                   GL_POLYGON_SMOOTH);
-   TEST_AND_UPDATE(ctx->Polygon.StippleFlag, enable->PolygonStipple,
-                   GL_POLYGON_STIPPLE);
-   TEST_AND_UPDATE(ctx->Scissor.Enabled, enable->Scissor, GL_SCISSOR_TEST);
-   TEST_AND_UPDATE(ctx->Stencil.Enabled, enable->Stencil, GL_STENCIL_TEST);
-   if (ctx->Extensions.EXT_stencil_two_side) {
-      TEST_AND_UPDATE(ctx->Stencil.TestTwoSide, enable->StencilTwoSide, GL_STENCIL_TEST_TWO_SIDE_EXT);
-   }
-   TEST_AND_UPDATE(ctx->Multisample.Enabled, enable->MultisampleEnabled,
-                   GL_MULTISAMPLE_ARB);
-   TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToCoverage,
-                   enable->SampleAlphaToCoverage,
-                   GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
-   TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToOne,
-                   enable->SampleAlphaToOne,
-                   GL_SAMPLE_ALPHA_TO_ONE_ARB);
-   TEST_AND_UPDATE(ctx->Multisample.SampleCoverage,
-                   enable->SampleCoverage,
-                   GL_SAMPLE_COVERAGE_ARB);
-   TEST_AND_UPDATE(ctx->Multisample.SampleCoverageInvert,
-                   enable->SampleCoverageInvert,
-                   GL_SAMPLE_COVERAGE_INVERT_ARB);
-   /* GL_ARB_vertex_program, GL_NV_vertex_program */
-   TEST_AND_UPDATE(ctx->VertexProgram.Enabled,
-                   enable->VertexProgram,
-                   GL_VERTEX_PROGRAM_ARB);
-   TEST_AND_UPDATE(ctx->VertexProgram.PointSizeEnabled,
-                   enable->VertexProgramPointSize,
-                   GL_VERTEX_PROGRAM_POINT_SIZE_ARB);
-   TEST_AND_UPDATE(ctx->VertexProgram.TwoSideEnabled,
-                   enable->VertexProgramTwoSide,
-                   GL_VERTEX_PROGRAM_TWO_SIDE_ARB);
-
-#undef TEST_AND_UPDATE
-
-   /* texture unit enables */
-   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-      const GLbitfield enabled = enable->Texture[i];
-      const GLbitfield genEnabled = enable->TexGen[i];
-
-      if (ctx->Texture.Unit[i].Enabled != enabled) {
-         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
-
-         _mesa_set_enable(ctx, GL_TEXTURE_1D,
-                          (enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE);
-         _mesa_set_enable(ctx, GL_TEXTURE_2D,
-                          (enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE);
-         _mesa_set_enable(ctx, GL_TEXTURE_3D,
-                          (enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE);
-         if (ctx->Extensions.NV_texture_rectangle) {
-            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_ARB,
-                             (enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);
-         }
-         if (ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP,
-                             (enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE);
-         }
-         if (ctx->Extensions.MESA_texture_array) {
-            _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,
-                           (enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
-            _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,
-                           (enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
-         }
-      }
-
-      if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {
-         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
-         _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,
-                          (genEnabled & S_BIT) ? GL_TRUE : GL_FALSE);
-         _mesa_set_enable(ctx, GL_TEXTURE_GEN_T,
-                          (genEnabled & T_BIT) ? GL_TRUE : GL_FALSE);
-         _mesa_set_enable(ctx, GL_TEXTURE_GEN_R,
-                          (genEnabled & R_BIT) ? GL_TRUE : GL_FALSE);
-         _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q,
-                          (genEnabled & Q_BIT) ? GL_TRUE : GL_FALSE);
-      }
-
-      /* GL_SGI_texture_color_table */
-      ctx->Texture.Unit[i].ColorTableEnabled = enable->TextureColorTable[i];
-   }
-
-   _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);
-}
-
-
-/**
- * Pop/restore texture attribute/group state.
- */
-static void
-pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
-{
-   GLuint u;
-
-   _mesa_lock_context_textures(ctx);
-
-   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-      const struct gl_texture_unit *unit = &texstate->Texture.Unit[u];
-      GLuint tgt;
-
-      _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);
-      _mesa_set_enable(ctx, GL_TEXTURE_1D,
-                       (unit->Enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE);
-      _mesa_set_enable(ctx, GL_TEXTURE_2D,
-                       (unit->Enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE);
-      _mesa_set_enable(ctx, GL_TEXTURE_3D,
-                       (unit->Enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE);
-      if (ctx->Extensions.ARB_texture_cube_map) {
-         _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP_ARB,
-                     (unit->Enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE);
-      }
-      if (ctx->Extensions.NV_texture_rectangle) {
-         _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_NV,
-                     (unit->Enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);
-      }
-      if (ctx->Extensions.MESA_texture_array) {
-         _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,
-                 (unit->Enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
-         _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,
-                 (unit->Enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);
-      }
-
-      if (ctx->Extensions.SGI_texture_color_table) {
-         _mesa_set_enable(ctx, GL_TEXTURE_COLOR_TABLE_SGI,
-                          unit->ColorTableEnabled);
-      }
-      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->EnvMode);
-      _mesa_TexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, unit->EnvColor);
-      _mesa_TexGeni(GL_S, GL_TEXTURE_GEN_MODE, unit->GenS.Mode);
-      _mesa_TexGeni(GL_T, GL_TEXTURE_GEN_MODE, unit->GenT.Mode);
-      _mesa_TexGeni(GL_R, GL_TEXTURE_GEN_MODE, unit->GenR.Mode);
-      _mesa_TexGeni(GL_Q, GL_TEXTURE_GEN_MODE, unit->GenQ.Mode);
-      _mesa_TexGenfv(GL_S, GL_OBJECT_PLANE, unit->GenS.ObjectPlane);
-      _mesa_TexGenfv(GL_T, GL_OBJECT_PLANE, unit->GenT.ObjectPlane);
-      _mesa_TexGenfv(GL_R, GL_OBJECT_PLANE, unit->GenR.ObjectPlane);
-      _mesa_TexGenfv(GL_Q, GL_OBJECT_PLANE, unit->GenQ.ObjectPlane);
-      /* Eye plane done differently to avoid re-transformation */
-      {
-         struct gl_texture_unit *destUnit = &ctx->Texture.Unit[u];
-         COPY_4FV(destUnit->GenS.EyePlane, unit->GenS.EyePlane);
-         COPY_4FV(destUnit->GenT.EyePlane, unit->GenT.EyePlane);
-         COPY_4FV(destUnit->GenR.EyePlane, unit->GenR.EyePlane);
-         COPY_4FV(destUnit->GenQ.EyePlane, unit->GenQ.EyePlane);
-         if (ctx->Driver.TexGen) {
-            ctx->Driver.TexGen(ctx, GL_S, GL_EYE_PLANE, unit->GenS.EyePlane);
-            ctx->Driver.TexGen(ctx, GL_T, GL_EYE_PLANE, unit->GenT.EyePlane);
-            ctx->Driver.TexGen(ctx, GL_R, GL_EYE_PLANE, unit->GenR.EyePlane);
-            ctx->Driver.TexGen(ctx, GL_Q, GL_EYE_PLANE, unit->GenQ.EyePlane);
-         }
-      }
-      _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,
-                       ((unit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE));
-      _mesa_set_enable(ctx, GL_TEXTURE_GEN_T,
-                       ((unit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE));
-      _mesa_set_enable(ctx, GL_TEXTURE_GEN_R,
-                       ((unit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE));
-      _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q,
-                       ((unit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE));
-      if (ctx->Extensions.EXT_texture_lod_bias) {
-         _mesa_TexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT,
-                       GL_TEXTURE_LOD_BIAS_EXT, unit->LodBias);
-      }
-      if (ctx->Extensions.EXT_texture_env_combine ||
-          ctx->Extensions.ARB_texture_env_combine) {
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB,
-                       unit->Combine.ModeRGB);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA,
-                       unit->Combine.ModeA);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB,
-                       unit->Combine.SourceRGB[0]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB,
-                       unit->Combine.SourceRGB[1]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB,
-                       unit->Combine.SourceRGB[2]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA,
-                       unit->Combine.SourceA[0]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA,
-                       unit->Combine.SourceA[1]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA,
-                       unit->Combine.SourceA[2]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB,
-                       unit->Combine.OperandRGB[0]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB,
-                       unit->Combine.OperandRGB[1]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB,
-                       unit->Combine.OperandRGB[2]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA,
-                       unit->Combine.OperandA[0]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA,
-                       unit->Combine.OperandA[1]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA,
-                       unit->Combine.OperandA[2]);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE,
-                       1 << unit->Combine.ScaleShiftRGB);
-         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE,
-                       1 << unit->Combine.ScaleShiftA);
-      }
-
-      /* Restore texture object state for each target */
-      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-         const struct gl_texture_object *obj = NULL;
-         GLenum target;
-
-         obj = &texstate->SavedObj[u][tgt];
-
-         /* don't restore state for unsupported targets to prevent
-          * raising GL errors.
-          */
-         if (obj->Target == GL_TEXTURE_CUBE_MAP_ARB &&
-             !ctx->Extensions.ARB_texture_cube_map) {
-            continue;
-         }
-         else if (obj->Target == GL_TEXTURE_RECTANGLE_NV &&
-                  !ctx->Extensions.NV_texture_rectangle) {
-            continue;
-         }
-         else if ((obj->Target == GL_TEXTURE_1D_ARRAY_EXT ||
-                   obj->Target == GL_TEXTURE_2D_ARRAY_EXT) &&
-                  !ctx->Extensions.MESA_texture_array) {
-            continue;
-         }
-
-         target = obj->Target;
-
-         _mesa_BindTexture(target, obj->Name);
-
-         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor.f);
-         _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);
-         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, obj->WrapR);
-         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, obj->MinFilter);
-         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, obj->MagFilter);
-         _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, obj->MinLod);
-         _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, obj->MaxLod);
-         _mesa_TexParameterf(target, GL_TEXTURE_LOD_BIAS, obj->LodBias);
-         _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, obj->BaseLevel);
-         if (target != GL_TEXTURE_RECTANGLE_ARB)
-            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel);
-         if (ctx->Extensions.EXT_texture_filter_anisotropic) {
-            _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT,
-                                obj->MaxAnisotropy);
-         }
-         if (ctx->Extensions.ARB_shadow_ambient) {
-            _mesa_TexParameterf(target, GL_TEXTURE_COMPARE_FAIL_VALUE_ARB,
-                                obj->CompareFailValue);
-         }
-      }
-
-      /* remove saved references to the texture objects */
-      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-         _mesa_reference_texobj(&texstate->SavedTexRef[u][tgt], NULL);
-      }
-   }
-
-   _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
-
-   _mesa_unlock_context_textures(ctx);
-}
-
-
-/*
- * This function is kind of long just because we have to call a lot
- * of device driver functions to update device driver state.
- *
- * XXX As it is now, most of the pop-code calls immediate-mode Mesa functions
- * in order to restore GL state.  This isn't terribly efficient but it
- * ensures that dirty flags and any derived state gets updated correctly.
- * We could at least check if the value to restore equals the current value
- * and then skip the Mesa call.
- */
-void GLAPIENTRY
-_mesa_PopAttrib(void)
-{
-   struct gl_attrib_node *attr, *next;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (ctx->AttribStackDepth == 0) {
-      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopAttrib" );
-      return;
-   }
-
-   ctx->AttribStackDepth--;
-   attr = ctx->AttribStack[ctx->AttribStackDepth];
-
-   while (attr) {
-
-      if (MESA_VERBOSE & VERBOSE_API) {
-         _mesa_debug(ctx, "glPopAttrib %s\n",
-                     _mesa_lookup_enum_by_nr(attr->kind));
-      }
-
-      switch (attr->kind) {
-         case GL_ACCUM_BUFFER_BIT:
-            {
-               const struct gl_accum_attrib *accum;
-               accum = (const struct gl_accum_attrib *) attr->data;
-               _mesa_ClearAccum(accum->ClearColor[0],
-                                accum->ClearColor[1],
-                                accum->ClearColor[2],
-                                accum->ClearColor[3]);
-            }
-            break;
-         case GL_COLOR_BUFFER_BIT:
-            {
-               const struct gl_colorbuffer_attrib *color;
-
-               color = (const struct gl_colorbuffer_attrib *) attr->data;
-               _mesa_ClearIndex((GLfloat) color->ClearIndex);
-               _mesa_ClearColor(color->ClearColor[0],
-                                color->ClearColor[1],
-                                color->ClearColor[2],
-                                color->ClearColor[3]);
-               _mesa_IndexMask(color->IndexMask);
-               if (!ctx->Extensions.EXT_draw_buffers2) {
-                  _mesa_ColorMask((GLboolean) (color->ColorMask[0][0] != 0),
-                                  (GLboolean) (color->ColorMask[0][1] != 0),
-                                  (GLboolean) (color->ColorMask[0][2] != 0),
-                                  (GLboolean) (color->ColorMask[0][3] != 0));
-               }
-               else {
-                  GLuint i;
-                  for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-                     _mesa_ColorMaskIndexed(i, 
-                                  (GLboolean) (color->ColorMask[i][0] != 0),
-                                  (GLboolean) (color->ColorMask[i][1] != 0),
-                                  (GLboolean) (color->ColorMask[i][2] != 0),
-                                  (GLboolean) (color->ColorMask[i][3] != 0));
-                  }
-               }
-               {
-                  /* Need to determine if more than one color output is
-                   * specified.  If so, call glDrawBuffersARB, else call
-                   * glDrawBuffer().  This is a subtle, but essential point
-                   * since GL_FRONT (for example) is illegal for the former
-                   * function, but legal for the later.
-                   */
-                  GLboolean multipleBuffers = GL_FALSE;
-		  GLuint i;
-
-		  for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {
-		     if (color->DrawBuffer[i] != GL_NONE) {
-			multipleBuffers = GL_TRUE;
-			break;
-		     }
-                  }
-                  /* Call the API_level functions, not _mesa_drawbuffers()
-                   * since we need to do error checking on the pop'd
-                   * GL_DRAW_BUFFER.
-                   * Ex: if GL_FRONT were pushed, but we're popping with a
-                   * user FBO bound, GL_FRONT will be illegal and we'll need
-                   * to record that error.  Per OpenGL ARB decision.
-                   */
-                  if (multipleBuffers)
-                     _mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers,
-                                          color->DrawBuffer);
-                  else
-                     _mesa_DrawBuffer(color->DrawBuffer[0]);
-               }
-               _mesa_set_enable(ctx, GL_ALPHA_TEST, color->AlphaEnabled);
-               _mesa_AlphaFunc(color->AlphaFunc, color->AlphaRef);
-               if (ctx->Color.BlendEnabled != 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,
-                                          (color->BlendEnabled >> i) & 1);
-                     }
-                  }
-                  else {
-                     _mesa_set_enable(ctx, GL_BLEND, (color->BlendEnabled & 1));
-                  }
-               }
-               _mesa_BlendFuncSeparateEXT(color->BlendSrcRGB,
-                                          color->BlendDstRGB,
-                                          color->BlendSrcA,
-                                          color->BlendDstA);
-	       /* This special case is because glBlendEquationSeparateEXT
-		* cannot take GL_LOGIC_OP as a parameter.
-		*/
-	       if ( color->BlendEquationRGB == color->BlendEquationA ) {
-		  _mesa_BlendEquation(color->BlendEquationRGB);
-	       }
-	       else {
-		  _mesa_BlendEquationSeparateEXT(color->BlendEquationRGB,
-						 color->BlendEquationA);
-	       }
-               _mesa_BlendColor(color->BlendColor[0],
-                                color->BlendColor[1],
-                                color->BlendColor[2],
-                                color->BlendColor[3]);
-               _mesa_LogicOp(color->LogicOp);
-               _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP,
-                                color->ColorLogicOpEnabled);
-               _mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,
-                                color->IndexLogicOpEnabled);
-               _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
-            }
-            break;
-         case GL_CURRENT_BIT:
-	    FLUSH_CURRENT( ctx, 0 );
-            memcpy( &ctx->Current, attr->data,
-		    sizeof(struct gl_current_attrib) );
-            break;
-         case GL_DEPTH_BUFFER_BIT:
-            {
-               const struct gl_depthbuffer_attrib *depth;
-               depth = (const struct gl_depthbuffer_attrib *) attr->data;
-               _mesa_DepthFunc(depth->Func);
-               _mesa_ClearDepth(depth->Clear);
-               _mesa_set_enable(ctx, GL_DEPTH_TEST, depth->Test);
-               _mesa_DepthMask(depth->Mask);
-            }
-            break;
-         case GL_ENABLE_BIT:
-            {
-               const struct gl_enable_attrib *enable;
-               enable = (const struct gl_enable_attrib *) attr->data;
-               pop_enable_group(ctx, enable);
-	       ctx->NewState |= _NEW_ALL;
-            }
-            break;
-         case GL_EVAL_BIT:
-            memcpy( &ctx->Eval, attr->data, sizeof(struct gl_eval_attrib) );
-	    ctx->NewState |= _NEW_EVAL;
-            break;
-         case GL_FOG_BIT:
-            {
-               const struct gl_fog_attrib *fog;
-               fog = (const struct gl_fog_attrib *) attr->data;
-               _mesa_set_enable(ctx, GL_FOG, fog->Enabled);
-               _mesa_Fogfv(GL_FOG_COLOR, fog->Color);
-               _mesa_Fogf(GL_FOG_DENSITY, fog->Density);
-               _mesa_Fogf(GL_FOG_START, fog->Start);
-               _mesa_Fogf(GL_FOG_END, fog->End);
-               _mesa_Fogf(GL_FOG_INDEX, fog->Index);
-               _mesa_Fogi(GL_FOG_MODE, fog->Mode);
-            }
-            break;
-         case GL_HINT_BIT:
-            {
-               const struct gl_hint_attrib *hint;
-               hint = (const struct gl_hint_attrib *) attr->data;
-               _mesa_Hint(GL_PERSPECTIVE_CORRECTION_HINT,
-                          hint->PerspectiveCorrection );
-               _mesa_Hint(GL_POINT_SMOOTH_HINT, hint->PointSmooth);
-               _mesa_Hint(GL_LINE_SMOOTH_HINT, hint->LineSmooth);
-               _mesa_Hint(GL_POLYGON_SMOOTH_HINT, hint->PolygonSmooth);
-               _mesa_Hint(GL_FOG_HINT, hint->Fog);
-               _mesa_Hint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT,
-                          hint->ClipVolumeClipping);
-	       _mesa_Hint(GL_TEXTURE_COMPRESSION_HINT_ARB,
-			  hint->TextureCompression);
-            }
-            break;
-         case GL_LIGHTING_BIT:
-            {
-               GLuint i;
-               const struct gl_light_attrib *light;
-               light = (const struct gl_light_attrib *) attr->data;
-               /* lighting enable */
-               _mesa_set_enable(ctx, GL_LIGHTING, light->Enabled);
-               /* per-light state */
-               if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top))
-                  _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-	       
-               for (i = 0; i < ctx->Const.MaxLights; i++) {
-                  const struct gl_light *l = &light->Light[i];
-                  _mesa_set_enable(ctx, GL_LIGHT0 + i, l->Enabled);
-                  _mesa_light(ctx, i, GL_AMBIENT, l->Ambient);
-                  _mesa_light(ctx, i, GL_DIFFUSE, l->Diffuse);
-                  _mesa_light(ctx, i, GL_SPECULAR, l->Specular );
-                  _mesa_light(ctx, i, GL_POSITION, l->EyePosition);
-                  _mesa_light(ctx, i, GL_SPOT_DIRECTION, l->SpotDirection);
-                  {
-                     GLfloat p[4] = { 0 };
-                     p[0] = l->SpotExponent;
-                     _mesa_light(ctx, i, GL_SPOT_EXPONENT, p);
-                  }
-                  {
-                     GLfloat p[4] = { 0 };
-                     p[0] = l->SpotCutoff;
-                     _mesa_light(ctx, i, GL_SPOT_CUTOFF, p);
-                  }
-                  {
-                     GLfloat p[4] = { 0 };
-                     p[0] = l->ConstantAttenuation;
-                     _mesa_light(ctx, i, GL_CONSTANT_ATTENUATION, p);
-                  }
-                  {
-                     GLfloat p[4] = { 0 };
-                     p[0] = l->LinearAttenuation;
-                     _mesa_light(ctx, i, GL_LINEAR_ATTENUATION, p);
-                  }
-                  {
-                     GLfloat p[4] = { 0 };
-                     p[0] = l->QuadraticAttenuation;
-                     _mesa_light(ctx, i, GL_QUADRATIC_ATTENUATION, p);
-                  }
-                }
-               /* light model */
-               _mesa_LightModelfv(GL_LIGHT_MODEL_AMBIENT,
-                                  light->Model.Ambient);
-               _mesa_LightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER,
-                                 (GLfloat) light->Model.LocalViewer);
-               _mesa_LightModelf(GL_LIGHT_MODEL_TWO_SIDE,
-                                 (GLfloat) light->Model.TwoSide);
-               _mesa_LightModelf(GL_LIGHT_MODEL_COLOR_CONTROL,
-                                 (GLfloat) light->Model.ColorControl);
-               /* shade model */
-               _mesa_ShadeModel(light->ShadeModel);
-               /* color material */
-               _mesa_ColorMaterial(light->ColorMaterialFace,
-                                   light->ColorMaterialMode);
-               _mesa_set_enable(ctx, GL_COLOR_MATERIAL,
-                                light->ColorMaterialEnabled);
-               /* materials */
-               memcpy(&ctx->Light.Material, &light->Material,
-                      sizeof(struct gl_material));
-            }
-            break;
-         case GL_LINE_BIT:
-            {
-               const struct gl_line_attrib *line;
-               line = (const struct gl_line_attrib *) attr->data;
-               _mesa_set_enable(ctx, GL_LINE_SMOOTH, line->SmoothFlag);
-               _mesa_set_enable(ctx, GL_LINE_STIPPLE, line->StippleFlag);
-               _mesa_LineStipple(line->StippleFactor, line->StipplePattern);
-               _mesa_LineWidth(line->Width);
-            }
-            break;
-         case GL_LIST_BIT:
-            memcpy( &ctx->List, attr->data, sizeof(struct gl_list_attrib) );
-            break;
-         case GL_PIXEL_MODE_BIT:
-            memcpy( &ctx->Pixel, attr->data, sizeof(struct gl_pixel_attrib) );
-            /* XXX what other pixel state needs to be set by function calls? */
-            _mesa_ReadBuffer(ctx->Pixel.ReadBuffer);
-	    ctx->NewState |= _NEW_PIXEL;
-            break;
-         case GL_POINT_BIT:
-            {
-               const struct gl_point_attrib *point;
-               point = (const struct gl_point_attrib *) attr->data;
-               _mesa_PointSize(point->Size);
-               _mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag);
-               if (ctx->Extensions.EXT_point_parameters) {
-                  _mesa_PointParameterfv(GL_DISTANCE_ATTENUATION_EXT,
-                                         point->Params);
-                  _mesa_PointParameterf(GL_POINT_SIZE_MIN_EXT,
-                                        point->MinSize);
-                  _mesa_PointParameterf(GL_POINT_SIZE_MAX_EXT,
-                                        point->MaxSize);
-                  _mesa_PointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT,
-                                        point->Threshold);
-               }
-               if (ctx->Extensions.NV_point_sprite
-		   || ctx->Extensions.ARB_point_sprite) {
-                  GLuint u;
-                  for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-                     _mesa_TexEnvi(GL_POINT_SPRITE_NV, GL_COORD_REPLACE_NV,
-                                   (GLint) point->CoordReplace[u]);
-                  }
-                  _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
-                  if (ctx->Extensions.NV_point_sprite)
-                     _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV,
-                                           ctx->Point.SpriteRMode);
-                  _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN,
-                                        (GLfloat)ctx->Point.SpriteOrigin);
-               }
-            }
-            break;
-         case GL_POLYGON_BIT:
-            {
-               const struct gl_polygon_attrib *polygon;
-               polygon = (const struct gl_polygon_attrib *) attr->data;
-               _mesa_CullFace(polygon->CullFaceMode);
-               _mesa_FrontFace(polygon->FrontFace);
-               _mesa_PolygonMode(GL_FRONT, polygon->FrontMode);
-               _mesa_PolygonMode(GL_BACK, polygon->BackMode);
-               _mesa_PolygonOffset(polygon->OffsetFactor,
-                                   polygon->OffsetUnits);
-               _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, polygon->SmoothFlag);
-               _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, polygon->StippleFlag);
-               _mesa_set_enable(ctx, GL_CULL_FACE, polygon->CullFlag);
-               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_POINT,
-                                polygon->OffsetPoint);
-               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_LINE,
-                                polygon->OffsetLine);
-               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL,
-                                polygon->OffsetFill);
-            }
-            break;
-	 case GL_POLYGON_STIPPLE_BIT:
-	    memcpy( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
-	    ctx->NewState |= _NEW_POLYGONSTIPPLE;
-	    if (ctx->Driver.PolygonStipple)
-	       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
-	    break;
-         case GL_SCISSOR_BIT:
-            {
-               const struct gl_scissor_attrib *scissor;
-               scissor = (const struct gl_scissor_attrib *) attr->data;
-               _mesa_Scissor(scissor->X, scissor->Y,
-                             scissor->Width, scissor->Height);
-               _mesa_set_enable(ctx, GL_SCISSOR_TEST, scissor->Enabled);
-            }
-            break;
-         case GL_STENCIL_BUFFER_BIT:
-            {
-               const struct gl_stencil_attrib *stencil;
-               stencil = (const struct gl_stencil_attrib *) attr->data;
-               _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]);
-            }
-            break;
-         case GL_TRANSFORM_BIT:
-            {
-               GLuint i;
-               const struct gl_transform_attrib *xform;
-               xform = (const struct gl_transform_attrib *) attr->data;
-               _mesa_MatrixMode(xform->MatrixMode);
-               if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))
-                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
-
-               /* restore clip planes */
-               for (i = 0; i < MAX_CLIP_PLANES; i++) {
-                  const GLuint mask = 1 << i;
-                  const GLfloat *eyePlane = xform->EyeUserPlane[i];
-                  COPY_4V(ctx->Transform.EyeUserPlane[i], eyePlane);
-                  if (xform->ClipPlanesEnabled & mask) {
-                     _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_TRUE);
-                  }
-                  else {
-                     _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_FALSE);
-                  }
-                  if (ctx->Driver.ClipPlane)
-                     ctx->Driver.ClipPlane( ctx, GL_CLIP_PLANE0 + i, eyePlane );
-               }
-
-               /* normalize/rescale */
-               if (xform->Normalize != ctx->Transform.Normalize)
-                  _mesa_set_enable(ctx, GL_NORMALIZE,ctx->Transform.Normalize);
-               if (xform->RescaleNormals != ctx->Transform.RescaleNormals)
-                  _mesa_set_enable(ctx, GL_RESCALE_NORMAL_EXT,
-                                   ctx->Transform.RescaleNormals);
-               if (xform->DepthClamp != ctx->Transform.DepthClamp)
-                  _mesa_set_enable(ctx, GL_DEPTH_CLAMP,
-                                   ctx->Transform.DepthClamp);
-            }
-            break;
-         case GL_TEXTURE_BIT:
-            /* Take care of texture object reference counters */
-            {
-               struct texture_state *texstate
-                  = (struct texture_state *) attr->data;
-               pop_texture_group(ctx, texstate);
-	       ctx->NewState |= _NEW_TEXTURE;
-            }
-            break;
-         case GL_VIEWPORT_BIT:
-            {
-               const struct gl_viewport_attrib *vp;
-               vp = (const struct gl_viewport_attrib *) attr->data;
-               _mesa_Viewport(vp->X, vp->Y, vp->Width, vp->Height);
-               _mesa_DepthRange(vp->Near, vp->Far);
-            }
-            break;
-         case GL_MULTISAMPLE_BIT_ARB:
-            {
-               const struct gl_multisample_attrib *ms;
-               ms = (const struct gl_multisample_attrib *) attr->data;
-               _mesa_SampleCoverageARB(ms->SampleCoverageValue,
-                                       ms->SampleCoverageInvert);
-            }
-            break;
-
-         default:
-            _mesa_problem( ctx, "Bad attrib flag in PopAttrib");
-            break;
-      }
-
-      next = attr->next;
-      FREE( attr->data );
-      FREE( attr );
-      attr = next;
-   }
-}
-
-
-/**
- * Helper for incrementing/decrementing vertex buffer object reference
- * counts when pushing/popping the GL_CLIENT_VERTEX_ARRAY_BIT attribute group.
- */
-static void
-adjust_buffer_object_ref_counts(struct gl_array_object *arrayObj, GLint step)
-{
-   GLuint i;
-
-   arrayObj->Vertex.BufferObj->RefCount += step;
-   arrayObj->Weight.BufferObj->RefCount += step;
-   arrayObj->Normal.BufferObj->RefCount += step;
-   arrayObj->Color.BufferObj->RefCount += step;
-   arrayObj->SecondaryColor.BufferObj->RefCount += step;
-   arrayObj->FogCoord.BufferObj->RefCount += step;
-   arrayObj->Index.BufferObj->RefCount += step;
-   arrayObj->EdgeFlag.BufferObj->RefCount += step;
-   for (i = 0; i < Elements(arrayObj->TexCoord); i++)
-      arrayObj->TexCoord[i].BufferObj->RefCount += step;
-   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
-      arrayObj->VertexAttrib[i].BufferObj->RefCount += step;
-}
-
-
-/**
- * Copy gl_pixelstore_attrib from src to dst, updating buffer
- * object refcounts.
- */
-static void
-copy_pixelstore(GLcontext *ctx,
-                struct gl_pixelstore_attrib *dst,
-                const struct gl_pixelstore_attrib *src)
-{
-   dst->Alignment = src->Alignment;
-   dst->RowLength = src->RowLength;
-   dst->SkipPixels = src->SkipPixels;
-   dst->SkipRows = src->SkipRows;
-   dst->ImageHeight = src->ImageHeight;
-   dst->SkipImages = src->SkipImages;
-   dst->SwapBytes = src->SwapBytes;
-   dst->LsbFirst = src->LsbFirst;
-   dst->ClientStorage = src->ClientStorage;
-   dst->Invert = src->Invert;
-   _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);
-}
-
-
-#define GL_CLIENT_PACK_BIT (1<<20)
-#define GL_CLIENT_UNPACK_BIT (1<<21)
-
-
-void GLAPIENTRY
-_mesa_PushClientAttrib(GLbitfield mask)
-{
-   struct gl_attrib_node *head;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->ClientAttribStackDepth >= MAX_CLIENT_ATTRIB_STACK_DEPTH) {
-      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushClientAttrib" );
-      return;
-   }
-
-   /* Build linked list of attribute nodes which save all attribute
-    * groups specified by the mask.
-    */
-   head = NULL;
-
-   if (mask & GL_CLIENT_PIXEL_STORE_BIT) {
-      struct gl_pixelstore_attrib *attr;
-      /* packing attribs */
-      attr = CALLOC_STRUCT( gl_pixelstore_attrib );
-      copy_pixelstore(ctx, attr, &ctx->Pack);
-      save_attrib_data(&head, GL_CLIENT_PACK_BIT, attr);
-      /* unpacking attribs */
-      attr = CALLOC_STRUCT( gl_pixelstore_attrib );
-      copy_pixelstore(ctx, attr, &ctx->Unpack);
-      save_attrib_data(&head, GL_CLIENT_UNPACK_BIT, attr);
-   }
-
-   if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {
-      struct gl_array_attrib *attr;
-      struct gl_array_object *obj;
-
-      attr = MALLOC_STRUCT( gl_array_attrib );
-      obj = MALLOC_STRUCT( gl_array_object );
-
-#if FEATURE_ARB_vertex_buffer_object
-      /* increment ref counts since we're copying pointers to these objects */
-      ctx->Array.ArrayBufferObj->RefCount++;
-      ctx->Array.ElementArrayBufferObj->RefCount++;
-#endif
-
-      memcpy( attr, &ctx->Array, sizeof(struct gl_array_attrib) );
-      memcpy( obj, ctx->Array.ArrayObj, sizeof(struct gl_array_object) );
-
-      attr->ArrayObj = obj;
-
-      save_attrib_data(&head, GL_CLIENT_VERTEX_ARRAY_BIT, attr);
-
-      /* bump reference counts on buffer objects */
-      adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, 1);
-   }
-
-   ctx->ClientAttribStack[ctx->ClientAttribStackDepth] = head;
-   ctx->ClientAttribStackDepth++;
-}
-
-
-
-
-void GLAPIENTRY
-_mesa_PopClientAttrib(void)
-{
-   struct gl_attrib_node *node, *next;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (ctx->ClientAttribStackDepth == 0) {
-      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopClientAttrib" );
-      return;
-   }
-
-   ctx->ClientAttribStackDepth--;
-   node = ctx->ClientAttribStack[ctx->ClientAttribStackDepth];
-
-   while (node) {
-      switch (node->kind) {
-         case GL_CLIENT_PACK_BIT:
-            {
-               struct gl_pixelstore_attrib *store =
-                  (struct gl_pixelstore_attrib *) node->data;
-               copy_pixelstore(ctx, &ctx->Pack, store);
-               _mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);
-            }
-	    ctx->NewState |= _NEW_PACKUNPACK;
-            break;
-         case GL_CLIENT_UNPACK_BIT:
-            {
-               struct gl_pixelstore_attrib *store =
-                  (struct gl_pixelstore_attrib *) node->data;
-               copy_pixelstore(ctx, &ctx->Unpack, store);
-               _mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);
-            }
-	    ctx->NewState |= _NEW_PACKUNPACK;
-            break;
-         case GL_CLIENT_VERTEX_ARRAY_BIT: {
-	    struct gl_array_attrib * data =
-	      (struct gl_array_attrib *) node->data;
-
-            adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, -1);
-	 
-            ctx->Array.ActiveTexture = data->ActiveTexture;
-	    if (data->LockCount != 0)
-	       _mesa_LockArraysEXT(data->LockFirst, data->LockCount);
-	    else if (ctx->Array.LockCount)
-	       _mesa_UnlockArraysEXT();
-
-	    _mesa_BindVertexArrayAPPLE( data->ArrayObj->Name );
-	    
-#if FEATURE_ARB_vertex_buffer_object
-            _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-                                data->ArrayBufferObj->Name);
-            _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB,
-                                data->ElementArrayBufferObj->Name);
-#endif
-
-	    memcpy( ctx->Array.ArrayObj, data->ArrayObj,
-		    sizeof( struct gl_array_object ) );
-
-	    FREE( data->ArrayObj );
-	    
-	    /* FIXME: Should some bits in ctx->Array->NewState also be set
-	     * FIXME: here?  It seems like it should be set to inclusive-or
-	     * FIXME: of the old ArrayObj->_Enabled and the new _Enabled.
-	     */
-
-	    ctx->NewState |= _NEW_ARRAY;
-            break;
-	 }
-         default:
-            _mesa_problem( ctx, "Bad attrib flag in PopClientAttrib");
-            break;
-      }
-
-      next = node->next;
-      FREE( node->data );
-      FREE( node );
-      node = next;
-   }
-}
-
-
-void
-_mesa_init_attrib_dispatch(struct _glapi_table *disp)
-{
-   SET_PopAttrib(disp, _mesa_PopAttrib);
-   SET_PushAttrib(disp, _mesa_PushAttrib);
-   SET_PopClientAttrib(disp, _mesa_PopClientAttrib);
-   SET_PushClientAttrib(disp, _mesa_PushClientAttrib);
-}
-
-
-#endif /* FEATURE_attrib_stack */
-
-
-/**
- * Free any attribute state data that might be attached to the context.
- */
-void
-_mesa_free_attrib_data(GLcontext *ctx)
-{
-   while (ctx->AttribStackDepth > 0) {
-      struct gl_attrib_node *attr, *next;
-
-      ctx->AttribStackDepth--;
-      attr = ctx->AttribStack[ctx->AttribStackDepth];
-
-      while (attr) {
-         if (attr->kind == GL_TEXTURE_BIT) {
-            struct texture_state *texstate = (struct texture_state*)attr->data;
-            GLuint u, tgt;
-            /* clear references to the saved texture objects */
-            for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
-               for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-                  _mesa_reference_texobj(&texstate->SavedTexRef[u][tgt], NULL);
-               }
-            }
-         }
-         else {
-            /* any other chunks of state that requires special handling? */
-         }
-
-         next = attr->next;
-         free(attr->data);
-         free(attr);
-         attr = next;
-      }
-   }
-}
-
-
-void _mesa_init_attrib( GLcontext *ctx )
-{
-   /* Renderer and client attribute stacks */
-   ctx->AttribStackDepth = 0;
-   ctx->ClientAttribStackDepth = 0;
-}
+/*

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

+ */

+

+#include "glheader.h"

+#include "imports.h"

+#include "accum.h"

+#include "arrayobj.h"

+#include "attrib.h"

+#include "blend.h"

+#include "buffers.h"

+#include "bufferobj.h"

+#include "clear.h"

+#include "colormac.h"

+#include "context.h"

+#include "depth.h"

+#include "enable.h"

+#include "enums.h"

+#include "fog.h"

+#include "hint.h"

+#include "light.h"

+#include "lines.h"

+#include "macros.h"

+#include "matrix.h"

+#include "multisample.h"

+#include "points.h"

+#include "polygon.h"

+#include "scissor.h"

+#include "stencil.h"

+#include "texenv.h"

+#include "texgen.h"

+#include "texobj.h"

+#include "texparam.h"

+#include "texstate.h"

+#include "varray.h"

+#include "viewport.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+/**

+ * glEnable()/glDisable() attribute group (GL_ENABLE_BIT).

+ */

+struct gl_enable_attrib

+{

+   GLboolean AlphaTest;

+   GLboolean AutoNormal;

+   GLboolean Blend;

+   GLbitfield ClipPlanes;

+   GLboolean ColorMaterial;

+   GLboolean CullFace;

+   GLboolean DepthClamp;

+   GLboolean DepthTest;

+   GLboolean Dither;

+   GLboolean Fog;

+   GLboolean Light[MAX_LIGHTS];

+   GLboolean Lighting;

+   GLboolean LineSmooth;

+   GLboolean LineStipple;

+   GLboolean IndexLogicOp;

+   GLboolean ColorLogicOp;

+

+   GLboolean Map1Color4;

+   GLboolean Map1Index;

+   GLboolean Map1Normal;

+   GLboolean Map1TextureCoord1;

+   GLboolean Map1TextureCoord2;

+   GLboolean Map1TextureCoord3;

+   GLboolean Map1TextureCoord4;

+   GLboolean Map1Vertex3;

+   GLboolean Map1Vertex4;

+   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */

+   GLboolean Map2Color4;

+   GLboolean Map2Index;

+   GLboolean Map2Normal;

+   GLboolean Map2TextureCoord1;

+   GLboolean Map2TextureCoord2;

+   GLboolean Map2TextureCoord3;

+   GLboolean Map2TextureCoord4;

+   GLboolean Map2Vertex3;

+   GLboolean Map2Vertex4;

+   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */

+

+   GLboolean Normalize;

+   GLboolean PixelTexture;

+   GLboolean PointSmooth;

+   GLboolean PolygonOffsetPoint;

+   GLboolean PolygonOffsetLine;

+   GLboolean PolygonOffsetFill;

+   GLboolean PolygonSmooth;

+   GLboolean PolygonStipple;

+   GLboolean RescaleNormals;

+   GLboolean Scissor;

+   GLboolean Stencil;

+   GLboolean StencilTwoSide;          /* GL_EXT_stencil_two_side */

+   GLboolean MultisampleEnabled;      /* GL_ARB_multisample */

+   GLboolean SampleAlphaToCoverage;   /* GL_ARB_multisample */

+   GLboolean SampleAlphaToOne;        /* GL_ARB_multisample */

+   GLboolean SampleCoverage;          /* GL_ARB_multisample */

+   GLboolean SampleCoverageInvert;    /* GL_ARB_multisample */

+   GLboolean RasterPositionUnclipped; /* GL_IBM_rasterpos_clip */

+

+   GLbitfield Texture[MAX_TEXTURE_UNITS];

+   GLbitfield TexGen[MAX_TEXTURE_UNITS];

+

+   /* SGI_texture_color_table */

+   GLboolean TextureColorTable[MAX_TEXTURE_UNITS];

+

+   /* GL_ARB_vertex_program / GL_NV_vertex_program */

+   GLboolean VertexProgram;

+   GLboolean VertexProgramPointSize;

+   GLboolean VertexProgramTwoSide;

+

+   /* GL_ARB_point_sprite / GL_NV_point_sprite */

+   GLboolean PointSprite;

+   GLboolean FragmentShaderATI;

+};

+

+

+/**

+ * Node for the attribute stack.

+ */

+struct gl_attrib_node

+{

+   GLbitfield kind;

+   void *data;

+   struct gl_attrib_node *next;

+};

+

+

+

+/**

+ * Special struct for saving/restoring texture state (GL_TEXTURE_BIT)

+ */

+struct texture_state

+{

+   struct gl_texture_attrib Texture;  /**< The usual context state */

+

+   /** to save per texture object state (wrap modes, filters, etc): */

+   struct gl_texture_object SavedObj[MAX_TEXTURE_UNITS][NUM_TEXTURE_TARGETS];

+

+   /**

+    * To save references to texture objects (so they don't get accidentally

+    * deleted while saved in the attribute stack).

+    */

+   struct gl_texture_object *SavedTexRef[MAX_TEXTURE_UNITS][NUM_TEXTURE_TARGETS];

+};

+

+

+#if FEATURE_attrib_stack

+

+

+/**

+ * Allocate new attribute node of given type/kind.  Attach payload data.

+ * Insert it into the linked list named by 'head'.

+ */

+static void

+save_attrib_data(struct gl_attrib_node **head,

+                 GLbitfield kind, void *payload)

+{

+   struct gl_attrib_node *n = MALLOC_STRUCT(gl_attrib_node);

+   if (n) {

+      n->kind = kind;

+      n->data = payload;

+      /* insert at head */

+      n->next = *head;

+      *head = n;

+   }

+   else {

+      /* out of memory! */

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_PushAttrib(GLbitfield mask)

+{

+   struct gl_attrib_node *head;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glPushAttrib %x\n", (int) mask);

+

+   if (ctx->AttribStackDepth >= MAX_ATTRIB_STACK_DEPTH) {

+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushAttrib" );

+      return;

+   }

+

+   /* Build linked list of attribute nodes which save all attribute */

+   /* groups specified by the mask. */

+   head = NULL;

+

+   if (mask & GL_ACCUM_BUFFER_BIT) {

+      struct gl_accum_attrib *attr;

+      attr = MALLOC_STRUCT( gl_accum_attrib );

+      memcpy( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );

+      save_attrib_data(&head, GL_ACCUM_BUFFER_BIT, attr);

+   }

+

+   if (mask & GL_COLOR_BUFFER_BIT) {

+      GLuint i;

+      struct gl_colorbuffer_attrib *attr;

+      attr = MALLOC_STRUCT( gl_colorbuffer_attrib );

+      memcpy( attr, &ctx->Color, sizeof(struct gl_colorbuffer_attrib) );

+      /* push the Draw FBO's DrawBuffer[] state, not ctx->Color.DrawBuffer[] */

+      for (i = 0; i < ctx->Const.MaxDrawBuffers; i ++)

+         attr->DrawBuffer[i] = ctx->DrawBuffer->ColorDrawBuffer[i];

+      save_attrib_data(&head, GL_COLOR_BUFFER_BIT, attr);

+   }

+

+   if (mask & GL_CURRENT_BIT) {

+      struct gl_current_attrib *attr;

+      FLUSH_CURRENT( ctx, 0 );

+      attr = MALLOC_STRUCT( gl_current_attrib );

+      memcpy( attr, &ctx->Current, sizeof(struct gl_current_attrib) );

+      save_attrib_data(&head, GL_CURRENT_BIT, attr);

+   }

+

+   if (mask & GL_DEPTH_BUFFER_BIT) {

+      struct gl_depthbuffer_attrib *attr;

+      attr = MALLOC_STRUCT( gl_depthbuffer_attrib );

+      memcpy( attr, &ctx->Depth, sizeof(struct gl_depthbuffer_attrib) );

+      save_attrib_data(&head, GL_DEPTH_BUFFER_BIT, attr);

+   }

+

+   if (mask & GL_ENABLE_BIT) {

+      struct gl_enable_attrib *attr;

+      GLuint i;

+      attr = MALLOC_STRUCT( gl_enable_attrib );

+      /* Copy enable flags from all other attributes into the enable struct. */

+      attr->AlphaTest = ctx->Color.AlphaEnabled;

+      attr->AutoNormal = ctx->Eval.AutoNormal;

+      attr->Blend = ctx->Color.BlendEnabled;

+      attr->ClipPlanes = ctx->Transform.ClipPlanesEnabled;

+      attr->ColorMaterial = ctx->Light.ColorMaterialEnabled;

+      attr->CullFace = ctx->Polygon.CullFlag;

+      attr->DepthClamp = ctx->Transform.DepthClamp;

+      attr->DepthTest = ctx->Depth.Test;

+      attr->Dither = ctx->Color.DitherFlag;

+      attr->Fog = ctx->Fog.Enabled;

+      for (i = 0; i < ctx->Const.MaxLights; i++) {

+         attr->Light[i] = ctx->Light.Light[i].Enabled;

+      }

+      attr->Lighting = ctx->Light.Enabled;

+      attr->LineSmooth = ctx->Line.SmoothFlag;

+      attr->LineStipple = ctx->Line.StippleFlag;

+      attr->IndexLogicOp = ctx->Color.IndexLogicOpEnabled;

+      attr->ColorLogicOp = ctx->Color.ColorLogicOpEnabled;

+      attr->Map1Color4 = ctx->Eval.Map1Color4;

+      attr->Map1Index = ctx->Eval.Map1Index;

+      attr->Map1Normal = ctx->Eval.Map1Normal;

+      attr->Map1TextureCoord1 = ctx->Eval.Map1TextureCoord1;

+      attr->Map1TextureCoord2 = ctx->Eval.Map1TextureCoord2;

+      attr->Map1TextureCoord3 = ctx->Eval.Map1TextureCoord3;

+      attr->Map1TextureCoord4 = ctx->Eval.Map1TextureCoord4;

+      attr->Map1Vertex3 = ctx->Eval.Map1Vertex3;

+      attr->Map1Vertex4 = ctx->Eval.Map1Vertex4;

+      memcpy(attr->Map1Attrib, ctx->Eval.Map1Attrib, sizeof(ctx->Eval.Map1Attrib));

+      attr->Map2Color4 = ctx->Eval.Map2Color4;

+      attr->Map2Index = ctx->Eval.Map2Index;

+      attr->Map2Normal = ctx->Eval.Map2Normal;

+      attr->Map2TextureCoord1 = ctx->Eval.Map2TextureCoord1;

+      attr->Map2TextureCoord2 = ctx->Eval.Map2TextureCoord2;

+      attr->Map2TextureCoord3 = ctx->Eval.Map2TextureCoord3;

+      attr->Map2TextureCoord4 = ctx->Eval.Map2TextureCoord4;

+      attr->Map2Vertex3 = ctx->Eval.Map2Vertex3;

+      attr->Map2Vertex4 = ctx->Eval.Map2Vertex4;

+      memcpy(attr->Map2Attrib, ctx->Eval.Map2Attrib, sizeof(ctx->Eval.Map2Attrib));

+      attr->Normalize = ctx->Transform.Normalize;

+      attr->RasterPositionUnclipped = ctx->Transform.RasterPositionUnclipped;

+      attr->PointSmooth = ctx->Point.SmoothFlag;

+      attr->PointSprite = ctx->Point.PointSprite;

+      attr->PolygonOffsetPoint = ctx->Polygon.OffsetPoint;

+      attr->PolygonOffsetLine = ctx->Polygon.OffsetLine;

+      attr->PolygonOffsetFill = ctx->Polygon.OffsetFill;

+      attr->PolygonSmooth = ctx->Polygon.SmoothFlag;

+      attr->PolygonStipple = ctx->Polygon.StippleFlag;

+      attr->RescaleNormals = ctx->Transform.RescaleNormals;

+      attr->Scissor = ctx->Scissor.Enabled;

+      attr->Stencil = ctx->Stencil.Enabled;

+      attr->StencilTwoSide = ctx->Stencil.TestTwoSide;

+      attr->MultisampleEnabled = ctx->Multisample.Enabled;

+      attr->SampleAlphaToCoverage = ctx->Multisample.SampleAlphaToCoverage;

+      attr->SampleAlphaToOne = ctx->Multisample.SampleAlphaToOne;

+      attr->SampleCoverage = ctx->Multisample.SampleCoverage;

+      attr->SampleCoverageInvert = ctx->Multisample.SampleCoverageInvert;

+      for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {

+         attr->Texture[i] = ctx->Texture.Unit[i].Enabled;

+         attr->TexGen[i] = ctx->Texture.Unit[i].TexGenEnabled;

+         attr->TextureColorTable[i] = ctx->Texture.Unit[i].ColorTableEnabled;

+      }

+      /* GL_NV_vertex_program */

+      attr->VertexProgram = ctx->VertexProgram.Enabled;

+      attr->VertexProgramPointSize = ctx->VertexProgram.PointSizeEnabled;

+      attr->VertexProgramTwoSide = ctx->VertexProgram.TwoSideEnabled;

+      save_attrib_data(&head, GL_ENABLE_BIT, attr);

+   }

+

+   if (mask & GL_EVAL_BIT) {

+      struct gl_eval_attrib *attr;

+      attr = MALLOC_STRUCT( gl_eval_attrib );

+      memcpy( attr, &ctx->Eval, sizeof(struct gl_eval_attrib) );

+      save_attrib_data(&head, GL_EVAL_BIT, attr);

+   }

+

+   if (mask & GL_FOG_BIT) {

+      struct gl_fog_attrib *attr;

+      attr = MALLOC_STRUCT( gl_fog_attrib );

+      memcpy( attr, &ctx->Fog, sizeof(struct gl_fog_attrib) );

+      save_attrib_data(&head, GL_FOG_BIT, attr);

+   }

+

+   if (mask & GL_HINT_BIT) {

+      struct gl_hint_attrib *attr;

+      attr = MALLOC_STRUCT( gl_hint_attrib );

+      memcpy( attr, &ctx->Hint, sizeof(struct gl_hint_attrib) );

+      save_attrib_data(&head, GL_HINT_BIT, attr);

+   }

+

+   if (mask & GL_LIGHTING_BIT) {

+      struct gl_light_attrib *attr;

+      FLUSH_CURRENT(ctx, 0);	/* flush material changes */

+      attr = MALLOC_STRUCT( gl_light_attrib );

+      memcpy( attr, &ctx->Light, sizeof(struct gl_light_attrib) );

+      save_attrib_data(&head, GL_LIGHTING_BIT, attr);

+   }

+

+   if (mask & GL_LINE_BIT) {

+      struct gl_line_attrib *attr;

+      attr = MALLOC_STRUCT( gl_line_attrib );

+      memcpy( attr, &ctx->Line, sizeof(struct gl_line_attrib) );

+      save_attrib_data(&head, GL_LINE_BIT, attr);

+   }

+

+   if (mask & GL_LIST_BIT) {

+      struct gl_list_attrib *attr;

+      attr = MALLOC_STRUCT( gl_list_attrib );

+      memcpy( attr, &ctx->List, sizeof(struct gl_list_attrib) );

+      save_attrib_data(&head, GL_LIST_BIT, attr);

+   }

+

+   if (mask & GL_PIXEL_MODE_BIT) {

+      struct gl_pixel_attrib *attr;

+      attr = MALLOC_STRUCT( gl_pixel_attrib );

+      memcpy( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );

+      /* push the Read FBO's ReadBuffer state, not ctx->Pixel.ReadBuffer */

+      attr->ReadBuffer = ctx->ReadBuffer->ColorReadBuffer;

+      save_attrib_data(&head, GL_PIXEL_MODE_BIT, attr);

+   }

+

+   if (mask & GL_POINT_BIT) {

+      struct gl_point_attrib *attr;

+      attr = MALLOC_STRUCT( gl_point_attrib );

+      memcpy( attr, &ctx->Point, sizeof(struct gl_point_attrib) );

+      save_attrib_data(&head, GL_POINT_BIT, attr);

+   }

+

+   if (mask & GL_POLYGON_BIT) {

+      struct gl_polygon_attrib *attr;

+      attr = MALLOC_STRUCT( gl_polygon_attrib );

+      memcpy( attr, &ctx->Polygon, sizeof(struct gl_polygon_attrib) );

+      save_attrib_data(&head, GL_POLYGON_BIT, attr);

+   }

+

+   if (mask & GL_POLYGON_STIPPLE_BIT) {

+      GLuint *stipple;

+      stipple = (GLuint *) MALLOC( 32*sizeof(GLuint) );

+      memcpy( stipple, ctx->PolygonStipple, 32*sizeof(GLuint) );

+      save_attrib_data(&head, GL_POLYGON_STIPPLE_BIT, stipple);

+   }

+

+   if (mask & GL_SCISSOR_BIT) {

+      struct gl_scissor_attrib *attr;

+      attr = MALLOC_STRUCT( gl_scissor_attrib );

+      memcpy( attr, &ctx->Scissor, sizeof(struct gl_scissor_attrib) );

+      save_attrib_data(&head, GL_SCISSOR_BIT, attr);

+   }

+

+   if (mask & GL_STENCIL_BUFFER_BIT) {

+      struct gl_stencil_attrib *attr;

+      attr = MALLOC_STRUCT( gl_stencil_attrib );

+      memcpy( attr, &ctx->Stencil, sizeof(struct gl_stencil_attrib) );

+      save_attrib_data(&head, GL_STENCIL_BUFFER_BIT, attr);

+   }

+

+   if (mask & GL_TEXTURE_BIT) {

+      struct texture_state *texstate = CALLOC_STRUCT(texture_state);

+      GLuint u, tex;

+

+      if (!texstate) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glPushAttrib(GL_TEXTURE_BIT)");

+         goto end;

+      }

+

+      _mesa_lock_context_textures(ctx);

+

+      /* copy/save the bulk of texture state here */

+      memcpy(&texstate->Texture, &ctx->Texture, sizeof(ctx->Texture));

+

+      /* Save references to the currently bound texture objects so they don't

+       * accidentally get deleted while referenced in the attribute stack.

+       */

+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {

+            _mesa_reference_texobj(&texstate->SavedTexRef[u][tex],

+                                   ctx->Texture.Unit[u].CurrentTex[tex]);

+         }

+      }

+

+      /* copy state/contents of the currently bound texture objects */

+      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {

+            _mesa_copy_texture_object(&texstate->SavedObj[u][tex],

+                                      ctx->Texture.Unit[u].CurrentTex[tex]);

+         }

+      }

+

+      _mesa_unlock_context_textures(ctx);

+

+      save_attrib_data(&head, GL_TEXTURE_BIT, texstate);

+   }

+

+   if (mask & GL_TRANSFORM_BIT) {

+      struct gl_transform_attrib *attr;

+      attr = MALLOC_STRUCT( gl_transform_attrib );

+      memcpy( attr, &ctx->Transform, sizeof(struct gl_transform_attrib) );

+      save_attrib_data(&head, GL_TRANSFORM_BIT, attr);

+   }

+

+   if (mask & GL_VIEWPORT_BIT) {

+      struct gl_viewport_attrib *attr;

+      attr = MALLOC_STRUCT( gl_viewport_attrib );

+      memcpy( attr, &ctx->Viewport, sizeof(struct gl_viewport_attrib) );

+      save_attrib_data(&head, GL_VIEWPORT_BIT, attr);

+   }

+

+   /* GL_ARB_multisample */

+   if (mask & GL_MULTISAMPLE_BIT_ARB) {

+      struct gl_multisample_attrib *attr;

+      attr = MALLOC_STRUCT( gl_multisample_attrib );

+      memcpy( attr, &ctx->Multisample, sizeof(struct gl_multisample_attrib) );

+      save_attrib_data(&head, GL_MULTISAMPLE_BIT_ARB, attr);

+   }

+

+end:

+   ctx->AttribStack[ctx->AttribStackDepth] = head;

+   ctx->AttribStackDepth++;

+}

+

+

+

+static void

+pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)

+{

+   const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;

+   GLuint i;

+

+#define TEST_AND_UPDATE(VALUE, NEWVALUE, ENUM)		\

+	if ((VALUE) != (NEWVALUE)) {			\

+	   _mesa_set_enable( ctx, ENUM, (NEWVALUE) );	\

+	}

+

+   TEST_AND_UPDATE(ctx->Color.AlphaEnabled, enable->AlphaTest, GL_ALPHA_TEST);

+   if (ctx->Color.BlendEnabled != enable->Blend) {

+      if (ctx->Extensions.EXT_draw_buffers2) {

+         GLuint i;

+         for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+            _mesa_set_enablei(ctx, GL_BLEND, i, (enable->Blend >> i) & 1);

+         }

+      }

+      else {

+         _mesa_set_enable(ctx, GL_BLEND, (enable->Blend & 1));

+      }

+   }

+

+   for (i=0;i<MAX_CLIP_PLANES;i++) {

+      const GLuint mask = 1 << i;

+      if ((ctx->Transform.ClipPlanesEnabled & mask) != (enable->ClipPlanes & mask))

+	  _mesa_set_enable(ctx, (GLenum) (GL_CLIP_PLANE0 + i),

+			   (GLboolean) ((enable->ClipPlanes & mask) ? GL_TRUE : GL_FALSE));

+   }

+

+   TEST_AND_UPDATE(ctx->Light.ColorMaterialEnabled, enable->ColorMaterial,

+                   GL_COLOR_MATERIAL);

+   TEST_AND_UPDATE(ctx->Polygon.CullFlag, enable->CullFace, GL_CULL_FACE);

+   TEST_AND_UPDATE(ctx->Transform.DepthClamp, enable->DepthClamp,

+		   GL_DEPTH_CLAMP);

+   TEST_AND_UPDATE(ctx->Depth.Test, enable->DepthTest, GL_DEPTH_TEST);

+   TEST_AND_UPDATE(ctx->Color.DitherFlag, enable->Dither, GL_DITHER);

+   TEST_AND_UPDATE(ctx->Fog.Enabled, enable->Fog, GL_FOG);

+   TEST_AND_UPDATE(ctx->Light.Enabled, enable->Lighting, GL_LIGHTING);

+   TEST_AND_UPDATE(ctx->Line.SmoothFlag, enable->LineSmooth, GL_LINE_SMOOTH);

+   TEST_AND_UPDATE(ctx->Line.StippleFlag, enable->LineStipple,

+                   GL_LINE_STIPPLE);

+   TEST_AND_UPDATE(ctx->Color.IndexLogicOpEnabled, enable->IndexLogicOp,

+                   GL_INDEX_LOGIC_OP);

+   TEST_AND_UPDATE(ctx->Color.ColorLogicOpEnabled, enable->ColorLogicOp,

+                   GL_COLOR_LOGIC_OP);

+

+   TEST_AND_UPDATE(ctx->Eval.Map1Color4, enable->Map1Color4, GL_MAP1_COLOR_4);

+   TEST_AND_UPDATE(ctx->Eval.Map1Index, enable->Map1Index, GL_MAP1_INDEX);

+   TEST_AND_UPDATE(ctx->Eval.Map1Normal, enable->Map1Normal, GL_MAP1_NORMAL);

+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord1, enable->Map1TextureCoord1,

+                   GL_MAP1_TEXTURE_COORD_1);

+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord2, enable->Map1TextureCoord2,

+                   GL_MAP1_TEXTURE_COORD_2);

+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord3, enable->Map1TextureCoord3,

+                   GL_MAP1_TEXTURE_COORD_3);

+   TEST_AND_UPDATE(ctx->Eval.Map1TextureCoord4, enable->Map1TextureCoord4,

+                   GL_MAP1_TEXTURE_COORD_4);

+   TEST_AND_UPDATE(ctx->Eval.Map1Vertex3, enable->Map1Vertex3,

+                   GL_MAP1_VERTEX_3);

+   TEST_AND_UPDATE(ctx->Eval.Map1Vertex4, enable->Map1Vertex4,

+                   GL_MAP1_VERTEX_4);

+   for (i = 0; i < 16; i++) {

+      TEST_AND_UPDATE(ctx->Eval.Map1Attrib[i], enable->Map1Attrib[i],

+                      GL_MAP1_VERTEX_ATTRIB0_4_NV + i);

+   }

+

+   TEST_AND_UPDATE(ctx->Eval.Map2Color4, enable->Map2Color4, GL_MAP2_COLOR_4);

+   TEST_AND_UPDATE(ctx->Eval.Map2Index, enable->Map2Index, GL_MAP2_INDEX);

+   TEST_AND_UPDATE(ctx->Eval.Map2Normal, enable->Map2Normal, GL_MAP2_NORMAL);

+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord1, enable->Map2TextureCoord1,

+                   GL_MAP2_TEXTURE_COORD_1);

+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord2, enable->Map2TextureCoord2,

+                   GL_MAP2_TEXTURE_COORD_2);

+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord3, enable->Map2TextureCoord3,

+                   GL_MAP2_TEXTURE_COORD_3);

+   TEST_AND_UPDATE(ctx->Eval.Map2TextureCoord4, enable->Map2TextureCoord4,

+                   GL_MAP2_TEXTURE_COORD_4);

+   TEST_AND_UPDATE(ctx->Eval.Map2Vertex3, enable->Map2Vertex3,

+                   GL_MAP2_VERTEX_3);

+   TEST_AND_UPDATE(ctx->Eval.Map2Vertex4, enable->Map2Vertex4,

+                   GL_MAP2_VERTEX_4);

+   for (i = 0; i < 16; i++) {

+      TEST_AND_UPDATE(ctx->Eval.Map2Attrib[i], enable->Map2Attrib[i],

+                      GL_MAP2_VERTEX_ATTRIB0_4_NV + i);

+   }

+

+   TEST_AND_UPDATE(ctx->Eval.AutoNormal, enable->AutoNormal, GL_AUTO_NORMAL);

+   TEST_AND_UPDATE(ctx->Transform.Normalize, enable->Normalize, GL_NORMALIZE);

+   TEST_AND_UPDATE(ctx->Transform.RescaleNormals, enable->RescaleNormals,

+                   GL_RESCALE_NORMAL_EXT);

+   TEST_AND_UPDATE(ctx->Transform.RasterPositionUnclipped,

+                   enable->RasterPositionUnclipped,

+                   GL_RASTER_POSITION_UNCLIPPED_IBM);

+   TEST_AND_UPDATE(ctx->Point.SmoothFlag, enable->PointSmooth,

+                   GL_POINT_SMOOTH);

+   if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite) {

+      TEST_AND_UPDATE(ctx->Point.PointSprite, enable->PointSprite,

+                      GL_POINT_SPRITE_NV);

+   }

+   TEST_AND_UPDATE(ctx->Polygon.OffsetPoint, enable->PolygonOffsetPoint,

+                   GL_POLYGON_OFFSET_POINT);

+   TEST_AND_UPDATE(ctx->Polygon.OffsetLine, enable->PolygonOffsetLine,

+                   GL_POLYGON_OFFSET_LINE);

+   TEST_AND_UPDATE(ctx->Polygon.OffsetFill, enable->PolygonOffsetFill,

+                   GL_POLYGON_OFFSET_FILL);

+   TEST_AND_UPDATE(ctx->Polygon.SmoothFlag, enable->PolygonSmooth,

+                   GL_POLYGON_SMOOTH);

+   TEST_AND_UPDATE(ctx->Polygon.StippleFlag, enable->PolygonStipple,

+                   GL_POLYGON_STIPPLE);

+   TEST_AND_UPDATE(ctx->Scissor.Enabled, enable->Scissor, GL_SCISSOR_TEST);

+   TEST_AND_UPDATE(ctx->Stencil.Enabled, enable->Stencil, GL_STENCIL_TEST);

+   if (ctx->Extensions.EXT_stencil_two_side) {

+      TEST_AND_UPDATE(ctx->Stencil.TestTwoSide, enable->StencilTwoSide, GL_STENCIL_TEST_TWO_SIDE_EXT);

+   }

+   TEST_AND_UPDATE(ctx->Multisample.Enabled, enable->MultisampleEnabled,

+                   GL_MULTISAMPLE_ARB);

+   TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToCoverage,

+                   enable->SampleAlphaToCoverage,

+                   GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);

+   TEST_AND_UPDATE(ctx->Multisample.SampleAlphaToOne,

+                   enable->SampleAlphaToOne,

+                   GL_SAMPLE_ALPHA_TO_ONE_ARB);

+   TEST_AND_UPDATE(ctx->Multisample.SampleCoverage,

+                   enable->SampleCoverage,

+                   GL_SAMPLE_COVERAGE_ARB);

+   TEST_AND_UPDATE(ctx->Multisample.SampleCoverageInvert,

+                   enable->SampleCoverageInvert,

+                   GL_SAMPLE_COVERAGE_INVERT_ARB);

+   /* GL_ARB_vertex_program, GL_NV_vertex_program */

+   TEST_AND_UPDATE(ctx->VertexProgram.Enabled,

+                   enable->VertexProgram,

+                   GL_VERTEX_PROGRAM_ARB);

+   TEST_AND_UPDATE(ctx->VertexProgram.PointSizeEnabled,

+                   enable->VertexProgramPointSize,

+                   GL_VERTEX_PROGRAM_POINT_SIZE_ARB);

+   TEST_AND_UPDATE(ctx->VertexProgram.TwoSideEnabled,

+                   enable->VertexProgramTwoSide,

+                   GL_VERTEX_PROGRAM_TWO_SIDE_ARB);

+

+#undef TEST_AND_UPDATE

+

+   /* texture unit enables */

+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {

+      const GLbitfield enabled = enable->Texture[i];

+      const GLbitfield genEnabled = enable->TexGen[i];

+

+      if (ctx->Texture.Unit[i].Enabled != enabled) {

+         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);

+

+         _mesa_set_enable(ctx, GL_TEXTURE_1D,

+                          (enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE);

+         _mesa_set_enable(ctx, GL_TEXTURE_2D,

+                          (enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE);

+         _mesa_set_enable(ctx, GL_TEXTURE_3D,

+                          (enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE);

+         if (ctx->Extensions.NV_texture_rectangle) {

+            _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_ARB,

+                             (enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);

+         }

+         if (ctx->Extensions.ARB_texture_cube_map) {

+            _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP,

+                             (enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE);

+         }

+         if (ctx->Extensions.MESA_texture_array) {

+            _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,

+                           (enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);

+            _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,

+                           (enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);

+         }

+      }

+

+      if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {

+         _mesa_ActiveTextureARB(GL_TEXTURE0 + i);

+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,

+                          (genEnabled & S_BIT) ? GL_TRUE : GL_FALSE);

+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_T,

+                          (genEnabled & T_BIT) ? GL_TRUE : GL_FALSE);

+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_R,

+                          (genEnabled & R_BIT) ? GL_TRUE : GL_FALSE);

+         _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q,

+                          (genEnabled & Q_BIT) ? GL_TRUE : GL_FALSE);

+      }

+

+      /* GL_SGI_texture_color_table */

+      ctx->Texture.Unit[i].ColorTableEnabled = enable->TextureColorTable[i];

+   }

+

+   _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);

+}

+

+

+/**

+ * Pop/restore texture attribute/group state.

+ */

+static void

+pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)

+{

+   GLuint u;

+

+   _mesa_lock_context_textures(ctx);

+

+   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+      const struct gl_texture_unit *unit = &texstate->Texture.Unit[u];

+      GLuint tgt;

+

+      _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);

+      _mesa_set_enable(ctx, GL_TEXTURE_1D,

+                       (unit->Enabled & TEXTURE_1D_BIT) ? GL_TRUE : GL_FALSE);

+      _mesa_set_enable(ctx, GL_TEXTURE_2D,

+                       (unit->Enabled & TEXTURE_2D_BIT) ? GL_TRUE : GL_FALSE);

+      _mesa_set_enable(ctx, GL_TEXTURE_3D,

+                       (unit->Enabled & TEXTURE_3D_BIT) ? GL_TRUE : GL_FALSE);

+      if (ctx->Extensions.ARB_texture_cube_map) {

+         _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP_ARB,

+                     (unit->Enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE);

+      }

+      if (ctx->Extensions.NV_texture_rectangle) {

+         _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_NV,

+                     (unit->Enabled & TEXTURE_RECT_BIT) ? GL_TRUE : GL_FALSE);

+      }

+      if (ctx->Extensions.MESA_texture_array) {

+         _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT,

+                 (unit->Enabled & TEXTURE_1D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);

+         _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT,

+                 (unit->Enabled & TEXTURE_2D_ARRAY_BIT) ? GL_TRUE : GL_FALSE);

+      }

+

+      if (ctx->Extensions.SGI_texture_color_table) {

+         _mesa_set_enable(ctx, GL_TEXTURE_COLOR_TABLE_SGI,

+                          unit->ColorTableEnabled);

+      }

+      _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->EnvMode);

+      _mesa_TexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, unit->EnvColor);

+      _mesa_TexGeni(GL_S, GL_TEXTURE_GEN_MODE, unit->GenS.Mode);

+      _mesa_TexGeni(GL_T, GL_TEXTURE_GEN_MODE, unit->GenT.Mode);

+      _mesa_TexGeni(GL_R, GL_TEXTURE_GEN_MODE, unit->GenR.Mode);

+      _mesa_TexGeni(GL_Q, GL_TEXTURE_GEN_MODE, unit->GenQ.Mode);

+      _mesa_TexGenfv(GL_S, GL_OBJECT_PLANE, unit->GenS.ObjectPlane);

+      _mesa_TexGenfv(GL_T, GL_OBJECT_PLANE, unit->GenT.ObjectPlane);

+      _mesa_TexGenfv(GL_R, GL_OBJECT_PLANE, unit->GenR.ObjectPlane);

+      _mesa_TexGenfv(GL_Q, GL_OBJECT_PLANE, unit->GenQ.ObjectPlane);

+      /* Eye plane done differently to avoid re-transformation */

+      {

+         struct gl_texture_unit *destUnit = &ctx->Texture.Unit[u];

+         COPY_4FV(destUnit->GenS.EyePlane, unit->GenS.EyePlane);

+         COPY_4FV(destUnit->GenT.EyePlane, unit->GenT.EyePlane);

+         COPY_4FV(destUnit->GenR.EyePlane, unit->GenR.EyePlane);

+         COPY_4FV(destUnit->GenQ.EyePlane, unit->GenQ.EyePlane);

+         if (ctx->Driver.TexGen) {

+            ctx->Driver.TexGen(ctx, GL_S, GL_EYE_PLANE, unit->GenS.EyePlane);

+            ctx->Driver.TexGen(ctx, GL_T, GL_EYE_PLANE, unit->GenT.EyePlane);

+            ctx->Driver.TexGen(ctx, GL_R, GL_EYE_PLANE, unit->GenR.EyePlane);

+            ctx->Driver.TexGen(ctx, GL_Q, GL_EYE_PLANE, unit->GenQ.EyePlane);

+         }

+      }

+      _mesa_set_enable(ctx, GL_TEXTURE_GEN_S,

+                       ((unit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE));

+      _mesa_set_enable(ctx, GL_TEXTURE_GEN_T,

+                       ((unit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE));

+      _mesa_set_enable(ctx, GL_TEXTURE_GEN_R,

+                       ((unit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE));

+      _mesa_set_enable(ctx, GL_TEXTURE_GEN_Q,

+                       ((unit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE));

+      if (ctx->Extensions.EXT_texture_lod_bias) {

+         _mesa_TexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT,

+                       GL_TEXTURE_LOD_BIAS_EXT, unit->LodBias);

+      }

+      if (ctx->Extensions.EXT_texture_env_combine ||

+          ctx->Extensions.ARB_texture_env_combine) {

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB,

+                       unit->Combine.ModeRGB);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA,

+                       unit->Combine.ModeA);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB,

+                       unit->Combine.SourceRGB[0]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB,

+                       unit->Combine.SourceRGB[1]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB,

+                       unit->Combine.SourceRGB[2]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA,

+                       unit->Combine.SourceA[0]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA,

+                       unit->Combine.SourceA[1]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA,

+                       unit->Combine.SourceA[2]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB,

+                       unit->Combine.OperandRGB[0]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB,

+                       unit->Combine.OperandRGB[1]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB,

+                       unit->Combine.OperandRGB[2]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA,

+                       unit->Combine.OperandA[0]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA,

+                       unit->Combine.OperandA[1]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA,

+                       unit->Combine.OperandA[2]);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE,

+                       1 << unit->Combine.ScaleShiftRGB);

+         _mesa_TexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE,

+                       1 << unit->Combine.ScaleShiftA);

+      }

+

+      /* Restore texture object state for each target */

+      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+         const struct gl_texture_object *obj = NULL;

+         GLenum target;

+

+         obj = &texstate->SavedObj[u][tgt];

+

+         /* don't restore state for unsupported targets to prevent

+          * raising GL errors.

+          */

+         if (obj->Target == GL_TEXTURE_CUBE_MAP_ARB &&

+             !ctx->Extensions.ARB_texture_cube_map) {

+            continue;

+         }

+         else if (obj->Target == GL_TEXTURE_RECTANGLE_NV &&

+                  !ctx->Extensions.NV_texture_rectangle) {

+            continue;

+         }

+         else if ((obj->Target == GL_TEXTURE_1D_ARRAY_EXT ||

+                   obj->Target == GL_TEXTURE_2D_ARRAY_EXT) &&

+                  !ctx->Extensions.MESA_texture_array) {

+            continue;

+         }

+

+         target = obj->Target;

+

+         _mesa_BindTexture(target, obj->Name);

+

+         _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor.f);

+         _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);

+         _mesa_TexParameteri(target, GL_TEXTURE_WRAP_R, obj->WrapR);

+         _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, obj->MinFilter);

+         _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, obj->MagFilter);

+         _mesa_TexParameterf(target, GL_TEXTURE_MIN_LOD, obj->MinLod);

+         _mesa_TexParameterf(target, GL_TEXTURE_MAX_LOD, obj->MaxLod);

+         _mesa_TexParameterf(target, GL_TEXTURE_LOD_BIAS, obj->LodBias);

+         _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, obj->BaseLevel);

+         if (target != GL_TEXTURE_RECTANGLE_ARB)

+            _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, obj->MaxLevel);

+         if (ctx->Extensions.EXT_texture_filter_anisotropic) {

+            _mesa_TexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT,

+                                obj->MaxAnisotropy);

+         }

+         if (ctx->Extensions.ARB_shadow_ambient) {

+            _mesa_TexParameterf(target, GL_TEXTURE_COMPARE_FAIL_VALUE_ARB,

+                                obj->CompareFailValue);

+         }

+      }

+

+      /* remove saved references to the texture objects */

+      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+         _mesa_reference_texobj(&texstate->SavedTexRef[u][tgt], NULL);

+      }

+   }

+

+   _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);

+

+   _mesa_unlock_context_textures(ctx);

+}

+

+

+/*

+ * This function is kind of long just because we have to call a lot

+ * of device driver functions to update device driver state.

+ *

+ * XXX As it is now, most of the pop-code calls immediate-mode Mesa functions

+ * in order to restore GL state.  This isn't terribly efficient but it

+ * ensures that dirty flags and any derived state gets updated correctly.

+ * We could at least check if the value to restore equals the current value

+ * and then skip the Mesa call.

+ */

+void GLAPIENTRY

+_mesa_PopAttrib(void)

+{

+   struct gl_attrib_node *attr, *next;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (ctx->AttribStackDepth == 0) {

+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopAttrib" );

+      return;

+   }

+

+   ctx->AttribStackDepth--;

+   attr = ctx->AttribStack[ctx->AttribStackDepth];

+

+   while (attr) {

+

+      if (MESA_VERBOSE & VERBOSE_API) {

+         _mesa_debug(ctx, "glPopAttrib %s\n",

+                     _mesa_lookup_enum_by_nr(attr->kind));

+      }

+

+      switch (attr->kind) {

+         case GL_ACCUM_BUFFER_BIT:

+            {

+               const struct gl_accum_attrib *accum;

+               accum = (const struct gl_accum_attrib *) attr->data;

+               _mesa_ClearAccum(accum->ClearColor[0],

+                                accum->ClearColor[1],

+                                accum->ClearColor[2],

+                                accum->ClearColor[3]);

+            }

+            break;

+         case GL_COLOR_BUFFER_BIT:

+            {

+               const struct gl_colorbuffer_attrib *color;

+

+               color = (const struct gl_colorbuffer_attrib *) attr->data;

+               _mesa_ClearIndex((GLfloat) color->ClearIndex);

+               _mesa_ClearColor(color->ClearColor[0],

+                                color->ClearColor[1],

+                                color->ClearColor[2],

+                                color->ClearColor[3]);

+               _mesa_IndexMask(color->IndexMask);

+               if (!ctx->Extensions.EXT_draw_buffers2) {

+                  _mesa_ColorMask((GLboolean) (color->ColorMask[0][0] != 0),

+                                  (GLboolean) (color->ColorMask[0][1] != 0),

+                                  (GLboolean) (color->ColorMask[0][2] != 0),

+                                  (GLboolean) (color->ColorMask[0][3] != 0));

+               }

+               else {

+                  GLuint i;

+                  for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+                     _mesa_ColorMaskIndexed(i, 

+                                  (GLboolean) (color->ColorMask[i][0] != 0),

+                                  (GLboolean) (color->ColorMask[i][1] != 0),

+                                  (GLboolean) (color->ColorMask[i][2] != 0),

+                                  (GLboolean) (color->ColorMask[i][3] != 0));

+                  }

+               }

+               {

+                  /* Need to determine if more than one color output is

+                   * specified.  If so, call glDrawBuffersARB, else call

+                   * glDrawBuffer().  This is a subtle, but essential point

+                   * since GL_FRONT (for example) is illegal for the former

+                   * function, but legal for the later.

+                   */

+                  GLboolean multipleBuffers = GL_FALSE;

+		  GLuint i;

+

+		  for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {

+		     if (color->DrawBuffer[i] != GL_NONE) {

+			multipleBuffers = GL_TRUE;

+			break;

+		     }

+                  }

+                  /* Call the API_level functions, not _mesa_drawbuffers()

+                   * since we need to do error checking on the pop'd

+                   * GL_DRAW_BUFFER.

+                   * Ex: if GL_FRONT were pushed, but we're popping with a

+                   * user FBO bound, GL_FRONT will be illegal and we'll need

+                   * to record that error.  Per OpenGL ARB decision.

+                   */

+                  if (multipleBuffers)

+                     _mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers,

+                                          color->DrawBuffer);

+                  else

+                     _mesa_DrawBuffer(color->DrawBuffer[0]);

+               }

+               _mesa_set_enable(ctx, GL_ALPHA_TEST, color->AlphaEnabled);

+               _mesa_AlphaFunc(color->AlphaFunc, color->AlphaRef);

+               if (ctx->Color.BlendEnabled != 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,

+                                          (color->BlendEnabled >> i) & 1);

+                     }

+                  }

+                  else {

+                     _mesa_set_enable(ctx, GL_BLEND, (color->BlendEnabled & 1));

+                  }

+               }

+               _mesa_BlendFuncSeparateEXT(color->BlendSrcRGB,

+                                          color->BlendDstRGB,

+                                          color->BlendSrcA,

+                                          color->BlendDstA);

+	       /* This special case is because glBlendEquationSeparateEXT

+		* cannot take GL_LOGIC_OP as a parameter.

+		*/

+	       if ( color->BlendEquationRGB == color->BlendEquationA ) {

+		  _mesa_BlendEquation(color->BlendEquationRGB);

+	       }

+	       else {

+		  _mesa_BlendEquationSeparateEXT(color->BlendEquationRGB,

+						 color->BlendEquationA);

+	       }

+               _mesa_BlendColor(color->BlendColor[0],

+                                color->BlendColor[1],

+                                color->BlendColor[2],

+                                color->BlendColor[3]);

+               _mesa_LogicOp(color->LogicOp);

+               _mesa_set_enable(ctx, GL_COLOR_LOGIC_OP,

+                                color->ColorLogicOpEnabled);

+               _mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,

+                                color->IndexLogicOpEnabled);

+               _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);

+            }

+            break;

+         case GL_CURRENT_BIT:

+	    FLUSH_CURRENT( ctx, 0 );

+            memcpy( &ctx->Current, attr->data,

+		    sizeof(struct gl_current_attrib) );

+            break;

+         case GL_DEPTH_BUFFER_BIT:

+            {

+               const struct gl_depthbuffer_attrib *depth;

+               depth = (const struct gl_depthbuffer_attrib *) attr->data;

+               _mesa_DepthFunc(depth->Func);

+               _mesa_ClearDepth(depth->Clear);

+               _mesa_set_enable(ctx, GL_DEPTH_TEST, depth->Test);

+               _mesa_DepthMask(depth->Mask);

+            }

+            break;

+         case GL_ENABLE_BIT:

+            {

+               const struct gl_enable_attrib *enable;

+               enable = (const struct gl_enable_attrib *) attr->data;

+               pop_enable_group(ctx, enable);

+	       ctx->NewState |= _NEW_ALL;

+            }

+            break;

+         case GL_EVAL_BIT:

+            memcpy( &ctx->Eval, attr->data, sizeof(struct gl_eval_attrib) );

+	    ctx->NewState |= _NEW_EVAL;

+            break;

+         case GL_FOG_BIT:

+            {

+               const struct gl_fog_attrib *fog;

+               fog = (const struct gl_fog_attrib *) attr->data;

+               _mesa_set_enable(ctx, GL_FOG, fog->Enabled);

+               _mesa_Fogfv(GL_FOG_COLOR, fog->Color);

+               _mesa_Fogf(GL_FOG_DENSITY, fog->Density);

+               _mesa_Fogf(GL_FOG_START, fog->Start);

+               _mesa_Fogf(GL_FOG_END, fog->End);

+               _mesa_Fogf(GL_FOG_INDEX, fog->Index);

+               _mesa_Fogi(GL_FOG_MODE, fog->Mode);

+            }

+            break;

+         case GL_HINT_BIT:

+            {

+               const struct gl_hint_attrib *hint;

+               hint = (const struct gl_hint_attrib *) attr->data;

+               _mesa_Hint(GL_PERSPECTIVE_CORRECTION_HINT,

+                          hint->PerspectiveCorrection );

+               _mesa_Hint(GL_POINT_SMOOTH_HINT, hint->PointSmooth);

+               _mesa_Hint(GL_LINE_SMOOTH_HINT, hint->LineSmooth);

+               _mesa_Hint(GL_POLYGON_SMOOTH_HINT, hint->PolygonSmooth);

+               _mesa_Hint(GL_FOG_HINT, hint->Fog);

+               _mesa_Hint(GL_CLIP_VOLUME_CLIPPING_HINT_EXT,

+                          hint->ClipVolumeClipping);

+	       _mesa_Hint(GL_TEXTURE_COMPRESSION_HINT_ARB,

+			  hint->TextureCompression);

+            }

+            break;

+         case GL_LIGHTING_BIT:

+            {

+               GLuint i;

+               const struct gl_light_attrib *light;

+               light = (const struct gl_light_attrib *) attr->data;

+               /* lighting enable */

+               _mesa_set_enable(ctx, GL_LIGHTING, light->Enabled);

+               /* per-light state */

+               if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top))

+                  _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );

+	       

+               for (i = 0; i < ctx->Const.MaxLights; i++) {

+                  const struct gl_light *l = &light->Light[i];

+                  _mesa_set_enable(ctx, GL_LIGHT0 + i, l->Enabled);

+                  _mesa_light(ctx, i, GL_AMBIENT, l->Ambient);

+                  _mesa_light(ctx, i, GL_DIFFUSE, l->Diffuse);

+                  _mesa_light(ctx, i, GL_SPECULAR, l->Specular );

+                  _mesa_light(ctx, i, GL_POSITION, l->EyePosition);

+                  _mesa_light(ctx, i, GL_SPOT_DIRECTION, l->SpotDirection);

+                  {

+                     GLfloat p[4] = { 0 };

+                     p[0] = l->SpotExponent;

+                     _mesa_light(ctx, i, GL_SPOT_EXPONENT, p);

+                  }

+                  {

+                     GLfloat p[4] = { 0 };

+                     p[0] = l->SpotCutoff;

+                     _mesa_light(ctx, i, GL_SPOT_CUTOFF, p);

+                  }

+                  {

+                     GLfloat p[4] = { 0 };

+                     p[0] = l->ConstantAttenuation;

+                     _mesa_light(ctx, i, GL_CONSTANT_ATTENUATION, p);

+                  }

+                  {

+                     GLfloat p[4] = { 0 };

+                     p[0] = l->LinearAttenuation;

+                     _mesa_light(ctx, i, GL_LINEAR_ATTENUATION, p);

+                  }

+                  {

+                     GLfloat p[4] = { 0 };

+                     p[0] = l->QuadraticAttenuation;

+                     _mesa_light(ctx, i, GL_QUADRATIC_ATTENUATION, p);

+                  }

+                }

+               /* light model */

+               _mesa_LightModelfv(GL_LIGHT_MODEL_AMBIENT,

+                                  light->Model.Ambient);

+               _mesa_LightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER,

+                                 (GLfloat) light->Model.LocalViewer);

+               _mesa_LightModelf(GL_LIGHT_MODEL_TWO_SIDE,

+                                 (GLfloat) light->Model.TwoSide);

+               _mesa_LightModelf(GL_LIGHT_MODEL_COLOR_CONTROL,

+                                 (GLfloat) light->Model.ColorControl);

+               /* shade model */

+               _mesa_ShadeModel(light->ShadeModel);

+               /* color material */

+               _mesa_ColorMaterial(light->ColorMaterialFace,

+                                   light->ColorMaterialMode);

+               _mesa_set_enable(ctx, GL_COLOR_MATERIAL,

+                                light->ColorMaterialEnabled);

+               /* materials */

+               memcpy(&ctx->Light.Material, &light->Material,

+                      sizeof(struct gl_material));

+            }

+            break;

+         case GL_LINE_BIT:

+            {

+               const struct gl_line_attrib *line;

+               line = (const struct gl_line_attrib *) attr->data;

+               _mesa_set_enable(ctx, GL_LINE_SMOOTH, line->SmoothFlag);

+               _mesa_set_enable(ctx, GL_LINE_STIPPLE, line->StippleFlag);

+               _mesa_LineStipple(line->StippleFactor, line->StipplePattern);

+               _mesa_LineWidth(line->Width);

+            }

+            break;

+         case GL_LIST_BIT:

+            memcpy( &ctx->List, attr->data, sizeof(struct gl_list_attrib) );

+            break;

+         case GL_PIXEL_MODE_BIT:

+            memcpy( &ctx->Pixel, attr->data, sizeof(struct gl_pixel_attrib) );

+            /* XXX what other pixel state needs to be set by function calls? */

+            _mesa_ReadBuffer(ctx->Pixel.ReadBuffer);

+	    ctx->NewState |= _NEW_PIXEL;

+            break;

+         case GL_POINT_BIT:

+            {

+               const struct gl_point_attrib *point;

+               point = (const struct gl_point_attrib *) attr->data;

+               _mesa_PointSize(point->Size);

+               _mesa_set_enable(ctx, GL_POINT_SMOOTH, point->SmoothFlag);

+               if (ctx->Extensions.EXT_point_parameters) {

+                  _mesa_PointParameterfv(GL_DISTANCE_ATTENUATION_EXT,

+                                         point->Params);

+                  _mesa_PointParameterf(GL_POINT_SIZE_MIN_EXT,

+                                        point->MinSize);

+                  _mesa_PointParameterf(GL_POINT_SIZE_MAX_EXT,

+                                        point->MaxSize);

+                  _mesa_PointParameterf(GL_POINT_FADE_THRESHOLD_SIZE_EXT,

+                                        point->Threshold);

+               }

+               if (ctx->Extensions.NV_point_sprite

+		   || ctx->Extensions.ARB_point_sprite) {

+                  GLuint u;

+                  for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+                     _mesa_TexEnvi(GL_POINT_SPRITE_NV, GL_COORD_REPLACE_NV,

+                                   (GLint) point->CoordReplace[u]);

+                  }

+                  _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);

+                  if (ctx->Extensions.NV_point_sprite)

+                     _mesa_PointParameteri(GL_POINT_SPRITE_R_MODE_NV,

+                                           ctx->Point.SpriteRMode);

+                  _mesa_PointParameterf(GL_POINT_SPRITE_COORD_ORIGIN,

+                                        (GLfloat)ctx->Point.SpriteOrigin);

+               }

+            }

+            break;

+         case GL_POLYGON_BIT:

+            {

+               const struct gl_polygon_attrib *polygon;

+               polygon = (const struct gl_polygon_attrib *) attr->data;

+               _mesa_CullFace(polygon->CullFaceMode);

+               _mesa_FrontFace(polygon->FrontFace);

+               _mesa_PolygonMode(GL_FRONT, polygon->FrontMode);

+               _mesa_PolygonMode(GL_BACK, polygon->BackMode);

+               _mesa_PolygonOffset(polygon->OffsetFactor,

+                                   polygon->OffsetUnits);

+               _mesa_set_enable(ctx, GL_POLYGON_SMOOTH, polygon->SmoothFlag);

+               _mesa_set_enable(ctx, GL_POLYGON_STIPPLE, polygon->StippleFlag);

+               _mesa_set_enable(ctx, GL_CULL_FACE, polygon->CullFlag);

+               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_POINT,

+                                polygon->OffsetPoint);

+               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_LINE,

+                                polygon->OffsetLine);

+               _mesa_set_enable(ctx, GL_POLYGON_OFFSET_FILL,

+                                polygon->OffsetFill);

+            }

+            break;

+	 case GL_POLYGON_STIPPLE_BIT:

+	    memcpy( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );

+	    ctx->NewState |= _NEW_POLYGONSTIPPLE;

+	    if (ctx->Driver.PolygonStipple)

+	       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );

+	    break;

+         case GL_SCISSOR_BIT:

+            {

+               const struct gl_scissor_attrib *scissor;

+               scissor = (const struct gl_scissor_attrib *) attr->data;

+               _mesa_Scissor(scissor->X, scissor->Y,

+                             scissor->Width, scissor->Height);

+               _mesa_set_enable(ctx, GL_SCISSOR_TEST, scissor->Enabled);

+            }

+            break;

+         case GL_STENCIL_BUFFER_BIT:

+            {

+               const struct gl_stencil_attrib *stencil;

+               stencil = (const struct gl_stencil_attrib *) attr->data;

+               _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]);

+            }

+            break;

+         case GL_TRANSFORM_BIT:

+            {

+               GLuint i;

+               const struct gl_transform_attrib *xform;

+               xform = (const struct gl_transform_attrib *) attr->data;

+               _mesa_MatrixMode(xform->MatrixMode);

+               if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))

+                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

+

+               /* restore clip planes */

+               for (i = 0; i < MAX_CLIP_PLANES; i++) {

+                  const GLuint mask = 1 << i;

+                  const GLfloat *eyePlane = xform->EyeUserPlane[i];

+                  COPY_4V(ctx->Transform.EyeUserPlane[i], eyePlane);

+                  if (xform->ClipPlanesEnabled & mask) {

+                     _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_TRUE);

+                  }

+                  else {

+                     _mesa_set_enable(ctx, GL_CLIP_PLANE0 + i, GL_FALSE);

+                  }

+                  if (ctx->Driver.ClipPlane)

+                     ctx->Driver.ClipPlane( ctx, GL_CLIP_PLANE0 + i, eyePlane );

+               }

+

+               /* normalize/rescale */

+               if (xform->Normalize != ctx->Transform.Normalize)

+                  _mesa_set_enable(ctx, GL_NORMALIZE,ctx->Transform.Normalize);

+               if (xform->RescaleNormals != ctx->Transform.RescaleNormals)

+                  _mesa_set_enable(ctx, GL_RESCALE_NORMAL_EXT,

+                                   ctx->Transform.RescaleNormals);

+               if (xform->DepthClamp != ctx->Transform.DepthClamp)

+                  _mesa_set_enable(ctx, GL_DEPTH_CLAMP,

+                                   ctx->Transform.DepthClamp);

+            }

+            break;

+         case GL_TEXTURE_BIT:

+            /* Take care of texture object reference counters */

+            {

+               struct texture_state *texstate

+                  = (struct texture_state *) attr->data;

+               pop_texture_group(ctx, texstate);

+	       ctx->NewState |= _NEW_TEXTURE;

+            }

+            break;

+         case GL_VIEWPORT_BIT:

+            {

+               const struct gl_viewport_attrib *vp;

+               vp = (const struct gl_viewport_attrib *) attr->data;

+               _mesa_Viewport(vp->X, vp->Y, vp->Width, vp->Height);

+               _mesa_DepthRange(vp->Near, vp->Far);

+            }

+            break;

+         case GL_MULTISAMPLE_BIT_ARB:

+            {

+               const struct gl_multisample_attrib *ms;

+               ms = (const struct gl_multisample_attrib *) attr->data;

+               _mesa_SampleCoverageARB(ms->SampleCoverageValue,

+                                       ms->SampleCoverageInvert);

+            }

+            break;

+

+         default:

+            _mesa_problem( ctx, "Bad attrib flag in PopAttrib");

+            break;

+      }

+

+      next = attr->next;

+      FREE( attr->data );

+      FREE( attr );

+      attr = next;

+   }

+}

+

+

+/**

+ * Helper for incrementing/decrementing vertex buffer object reference

+ * counts when pushing/popping the GL_CLIENT_VERTEX_ARRAY_BIT attribute group.

+ */

+static void

+adjust_buffer_object_ref_counts(struct gl_array_object *arrayObj, GLint step)

+{

+   GLuint i;

+

+   arrayObj->Vertex.BufferObj->RefCount += step;

+   arrayObj->Weight.BufferObj->RefCount += step;

+   arrayObj->Normal.BufferObj->RefCount += step;

+   arrayObj->Color.BufferObj->RefCount += step;

+   arrayObj->SecondaryColor.BufferObj->RefCount += step;

+   arrayObj->FogCoord.BufferObj->RefCount += step;

+   arrayObj->Index.BufferObj->RefCount += step;

+   arrayObj->EdgeFlag.BufferObj->RefCount += step;

+   for (i = 0; i < Elements(arrayObj->TexCoord); i++)

+      arrayObj->TexCoord[i].BufferObj->RefCount += step;

+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)

+      arrayObj->VertexAttrib[i].BufferObj->RefCount += step;

+}

+

+

+/**

+ * Copy gl_pixelstore_attrib from src to dst, updating buffer

+ * object refcounts.

+ */

+static void

+copy_pixelstore(struct gl_context *ctx,

+                struct gl_pixelstore_attrib *dst,

+                const struct gl_pixelstore_attrib *src)

+{

+   dst->Alignment = src->Alignment;

+   dst->RowLength = src->RowLength;

+   dst->SkipPixels = src->SkipPixels;

+   dst->SkipRows = src->SkipRows;

+   dst->ImageHeight = src->ImageHeight;

+   dst->SkipImages = src->SkipImages;

+   dst->SwapBytes = src->SwapBytes;

+   dst->LsbFirst = src->LsbFirst;

+   dst->ClientStorage = src->ClientStorage;

+   dst->Invert = src->Invert;

+   _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);

+}

+

+

+#define GL_CLIENT_PACK_BIT (1<<20)

+#define GL_CLIENT_UNPACK_BIT (1<<21)

+

+

+void GLAPIENTRY

+_mesa_PushClientAttrib(GLbitfield mask)

+{

+   struct gl_attrib_node *head;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->ClientAttribStackDepth >= MAX_CLIENT_ATTRIB_STACK_DEPTH) {

+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushClientAttrib" );

+      return;

+   }

+

+   /* Build linked list of attribute nodes which save all attribute

+    * groups specified by the mask.

+    */

+   head = NULL;

+

+   if (mask & GL_CLIENT_PIXEL_STORE_BIT) {

+      struct gl_pixelstore_attrib *attr;

+      /* packing attribs */

+      attr = CALLOC_STRUCT( gl_pixelstore_attrib );

+      copy_pixelstore(ctx, attr, &ctx->Pack);

+      save_attrib_data(&head, GL_CLIENT_PACK_BIT, attr);

+      /* unpacking attribs */

+      attr = CALLOC_STRUCT( gl_pixelstore_attrib );

+      copy_pixelstore(ctx, attr, &ctx->Unpack);

+      save_attrib_data(&head, GL_CLIENT_UNPACK_BIT, attr);

+   }

+

+   if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {

+      struct gl_array_attrib *attr;

+      struct gl_array_object *obj;

+

+      attr = MALLOC_STRUCT( gl_array_attrib );

+      obj = MALLOC_STRUCT( gl_array_object );

+

+#if FEATURE_ARB_vertex_buffer_object

+      /* increment ref counts since we're copying pointers to these objects */

+      ctx->Array.ArrayBufferObj->RefCount++;

+      ctx->Array.ElementArrayBufferObj->RefCount++;

+#endif

+

+      memcpy( attr, &ctx->Array, sizeof(struct gl_array_attrib) );

+      memcpy( obj, ctx->Array.ArrayObj, sizeof(struct gl_array_object) );

+

+      attr->ArrayObj = obj;

+

+      save_attrib_data(&head, GL_CLIENT_VERTEX_ARRAY_BIT, attr);

+

+      /* bump reference counts on buffer objects */

+      adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, 1);

+   }

+

+   ctx->ClientAttribStack[ctx->ClientAttribStackDepth] = head;

+   ctx->ClientAttribStackDepth++;

+}

+

+

+

+

+void GLAPIENTRY

+_mesa_PopClientAttrib(void)

+{

+   struct gl_attrib_node *node, *next;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (ctx->ClientAttribStackDepth == 0) {

+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopClientAttrib" );

+      return;

+   }

+

+   ctx->ClientAttribStackDepth--;

+   node = ctx->ClientAttribStack[ctx->ClientAttribStackDepth];

+

+   while (node) {

+      switch (node->kind) {

+         case GL_CLIENT_PACK_BIT:

+            {

+               struct gl_pixelstore_attrib *store =

+                  (struct gl_pixelstore_attrib *) node->data;

+               copy_pixelstore(ctx, &ctx->Pack, store);

+               _mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);

+            }

+	    ctx->NewState |= _NEW_PACKUNPACK;

+            break;

+         case GL_CLIENT_UNPACK_BIT:

+            {

+               struct gl_pixelstore_attrib *store =

+                  (struct gl_pixelstore_attrib *) node->data;

+               copy_pixelstore(ctx, &ctx->Unpack, store);

+               _mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);

+            }

+	    ctx->NewState |= _NEW_PACKUNPACK;

+            break;

+         case GL_CLIENT_VERTEX_ARRAY_BIT: {

+	    struct gl_array_attrib * data =

+	      (struct gl_array_attrib *) node->data;

+

+            adjust_buffer_object_ref_counts(ctx->Array.ArrayObj, -1);

+	 

+            ctx->Array.ActiveTexture = data->ActiveTexture;

+	    if (data->LockCount != 0)

+	       _mesa_LockArraysEXT(data->LockFirst, data->LockCount);

+	    else if (ctx->Array.LockCount)

+	       _mesa_UnlockArraysEXT();

+

+	    _mesa_BindVertexArrayAPPLE( data->ArrayObj->Name );

+	    

+#if FEATURE_ARB_vertex_buffer_object

+            _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+                                data->ArrayBufferObj->Name);

+            _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB,

+                                data->ElementArrayBufferObj->Name);

+#endif

+

+	    memcpy( ctx->Array.ArrayObj, data->ArrayObj,

+		    sizeof( struct gl_array_object ) );

+

+	    FREE( data->ArrayObj );

+	    

+	    /* FIXME: Should some bits in ctx->Array->NewState also be set

+	     * FIXME: here?  It seems like it should be set to inclusive-or

+	     * FIXME: of the old ArrayObj->_Enabled and the new _Enabled.

+	     */

+

+	    ctx->NewState |= _NEW_ARRAY;

+            break;

+	 }

+         default:

+            _mesa_problem( ctx, "Bad attrib flag in PopClientAttrib");

+            break;

+      }

+

+      next = node->next;

+      FREE( node->data );

+      FREE( node );

+      node = next;

+   }

+}

+

+

+void

+_mesa_init_attrib_dispatch(struct _glapi_table *disp)

+{

+   SET_PopAttrib(disp, _mesa_PopAttrib);

+   SET_PushAttrib(disp, _mesa_PushAttrib);

+   SET_PopClientAttrib(disp, _mesa_PopClientAttrib);

+   SET_PushClientAttrib(disp, _mesa_PushClientAttrib);

+}

+

+

+#endif /* FEATURE_attrib_stack */

+

+

+/**

+ * Free any attribute state data that might be attached to the context.

+ */

+void

+_mesa_free_attrib_data(struct gl_context *ctx)

+{

+   while (ctx->AttribStackDepth > 0) {

+      struct gl_attrib_node *attr, *next;

+

+      ctx->AttribStackDepth--;

+      attr = ctx->AttribStack[ctx->AttribStackDepth];

+

+      while (attr) {

+         if (attr->kind == GL_TEXTURE_BIT) {

+            struct texture_state *texstate = (struct texture_state*)attr->data;

+            GLuint u, tgt;

+            /* clear references to the saved texture objects */

+            for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {

+               for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+                  _mesa_reference_texobj(&texstate->SavedTexRef[u][tgt], NULL);

+               }

+            }

+         }

+         else {

+            /* any other chunks of state that requires special handling? */

+         }

+

+         next = attr->next;

+         free(attr->data);

+         free(attr);

+         attr = next;

+      }

+   }

+}

+

+

+void _mesa_init_attrib( struct gl_context *ctx )

+{

+   /* Renderer and client attribute stacks */

+   ctx->AttribStackDepth = 0;

+   ctx->ClientAttribStackDepth = 0;

+}

diff --git a/mesalib/src/mesa/main/attrib.h b/mesalib/src/mesa/main/attrib.h
index 83b28a65b..8e7969a65 100644
--- a/mesalib/src/mesa/main/attrib.h
+++ b/mesalib/src/mesa/main/attrib.h
@@ -1,78 +1,80 @@
-/*
- * 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 ATTRIB_H
-#define ATTRIB_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_attrib_stack
-
-extern void GLAPIENTRY
-_mesa_PushAttrib( GLbitfield mask );
-
-extern void GLAPIENTRY
-_mesa_PopAttrib( void );
-
-extern void GLAPIENTRY
-_mesa_PushClientAttrib( GLbitfield mask );
-
-extern void GLAPIENTRY
-_mesa_PopClientAttrib( void );
-
-extern void
-_mesa_init_attrib_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_attrib_stack */
-
-#include "main/compiler.h"
-
-static INLINE void
-_mesa_PushClientAttrib( GLbitfield mask )
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_PopClientAttrib( void )
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_init_attrib_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_attrib_stack */
-
-extern void 
-_mesa_init_attrib( GLcontext *ctx );
-
-extern void 
-_mesa_free_attrib_data( GLcontext *ctx );
-
-#endif /* ATTRIB_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 ATTRIB_H

+#define ATTRIB_H

+

+

+#include "compiler.h"

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct gl_context;

+

+#if FEATURE_attrib_stack

+

+extern void GLAPIENTRY

+_mesa_PushAttrib( GLbitfield mask );

+

+extern void GLAPIENTRY

+_mesa_PopAttrib( void );

+

+extern void GLAPIENTRY

+_mesa_PushClientAttrib( GLbitfield mask );

+

+extern void GLAPIENTRY

+_mesa_PopClientAttrib( void );

+

+extern void

+_mesa_init_attrib_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_attrib_stack */

+

+static INLINE void

+_mesa_PushClientAttrib( GLbitfield mask )

+{

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_PopClientAttrib( void )

+{

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_init_attrib_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_attrib_stack */

+

+extern void 

+_mesa_init_attrib( struct gl_context *ctx );

+

+extern void 

+_mesa_free_attrib_data( struct gl_context *ctx );

+

+#endif /* ATTRIB_H */

diff --git a/mesalib/src/mesa/main/blend.c b/mesalib/src/mesa/main/blend.c
index d022770f2..10e384a40 100644
--- a/mesalib/src/mesa/main/blend.c
+++ b/mesalib/src/mesa/main/blend.c
@@ -1,631 +1,629 @@
-/**
- * \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"
-
-
-/**
- * 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);
-}
-
-
-/**
- * Process GL_EXT_blend_func_separate().
- *
- * \param sfactorRGB RGB source factor operator.
- * \param dfactorRGB RGB destination factor operator.
- * \param sfactorA alpha source factor operator.
- * \param dfactorA alpha destination factor operator.
- *
- * Verifies the parameters and updates gl_colorbuffer_attrib.
- * On a change, flush the vertices and notify the driver via
- * dd_function_table::BlendFuncSeparate.
- */
-void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
-                            GLenum sfactorA, GLenum dfactorA )
-{
-   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));
-
-   switch (sfactorRGB) {
-      case GL_SRC_COLOR:
-      case GL_ONE_MINUS_SRC_COLOR:
-         if (!ctx->Extensions.NV_blend_square) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorRGB)");
-            return;
-         }
-         /* fall-through */
-      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:
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorRGB)");
-         return;
-   }
-
-   switch (dfactorRGB) {
-      case GL_DST_COLOR:
-      case GL_ONE_MINUS_DST_COLOR:
-         if (!ctx->Extensions.NV_blend_square) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorRGB)");
-            return;
-         }
-         /* fall-through */
-      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:
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorRGB)");
-         return;
-   }
-
-   switch (sfactorA) {
-      case GL_SRC_COLOR:
-      case GL_ONE_MINUS_SRC_COLOR:
-         if (!ctx->Extensions.NV_blend_square) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorA)");
-            return;
-         }
-         /* fall-through */
-      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:
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorA)");
-         return;
-   }
-
-   switch (dfactorA) {
-      case GL_DST_COLOR:
-      case GL_ONE_MINUS_DST_COLOR:
-         if (!ctx->Extensions.NV_blend_square) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorA)");
-            return;
-         }
-         /* fall-through */
-      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:
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorA)" );
-         return;
-   }
-
-   if (ctx->Color.BlendSrcRGB == sfactorRGB &&
-       ctx->Color.BlendDstRGB == dfactorRGB &&
-       ctx->Color.BlendSrcA == sfactorA &&
-       ctx->Color.BlendDstA == dfactorA)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-
-   ctx->Color.BlendSrcRGB = sfactorRGB;
-   ctx->Color.BlendDstRGB = dfactorRGB;
-   ctx->Color.BlendSrcA = sfactorA;
-   ctx->Color.BlendDstA = dfactorA;
-
-   if (ctx->Driver.BlendFuncSeparate) {
-      (*ctx->Driver.BlendFuncSeparate)( ctx, sfactorRGB, dfactorRGB,
-					sfactorA, dfactorA );
-   }
-}
-
-
-#if _HAVE_FULL_GL
-
-static GLboolean
-_mesa_validate_blend_equation( GLcontext *ctx,
-			       GLenum mode, GLboolean is_separate )
-{
-   switch (mode) {
-      case GL_FUNC_ADD:
-         break;
-      case GL_MIN:
-      case GL_MAX:
-         if (!ctx->Extensions.EXT_blend_minmax &&
-             !ctx->Extensions.ARB_imaging) {
-            return GL_FALSE;
-         }
-         break;
-      /* glBlendEquationSeparate cannot take GL_LOGIC_OP as a parameter.
-       */
-      case GL_LOGIC_OP:
-         if (!ctx->Extensions.EXT_blend_logic_op || is_separate) {
-            return GL_FALSE;
-         }
-         break;
-      case GL_FUNC_SUBTRACT:
-      case GL_FUNC_REVERSE_SUBTRACT:
-         if (!ctx->Extensions.EXT_blend_subtract &&
-             !ctx->Extensions.ARB_imaging) {
-            return GL_FALSE;
-         }
-         break;
-      default:
-         return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-/* This is really an extension function! */
-void GLAPIENTRY
-_mesa_BlendEquation( GLenum mode )
-{
-   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 ( ! _mesa_validate_blend_equation( ctx, mode, GL_FALSE ) ) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");
-      return;
-   }
-
-   if ( (ctx->Color.BlendEquationRGB == mode) &&
-	(ctx->Color.BlendEquationA == mode) )
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.BlendEquationRGB = mode;
-   ctx->Color.BlendEquationA = mode;
-
-   if (ctx->Driver.BlendEquationSeparate)
-      (*ctx->Driver.BlendEquationSeparate)( ctx, mode, mode );
-}
-
-
-void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
-{
-   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 ( ! _mesa_validate_blend_equation( ctx, modeRGB, GL_TRUE ) ) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeRGB)");
-      return;
-   }
-
-   if ( ! _mesa_validate_blend_equation( ctx, modeA, GL_TRUE ) ) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)");
-      return;
-   }
-
-
-   if ( (ctx->Color.BlendEquationRGB == modeRGB) &&
-	(ctx->Color.BlendEquationA == modeA) )
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   ctx->Color.BlendEquationRGB = modeRGB;
-   ctx->Color.BlendEquationA = modeA;
-
-   if (ctx->Driver.BlendEquationSeparate)
-      (*ctx->Driver.BlendEquationSeparate)( ctx, modeRGB, modeA );
-}
-#endif
-
-
-/**
- * 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] = CLAMP( red,   0.0F, 1.0F );
-   tmp[1] = CLAMP( green, 0.0F, 1.0F );
-   tmp[2] = CLAMP( blue,  0.0F, 1.0F );
-   tmp[3] = CLAMP( alpha, 0.0F, 1.0F );
-
-   if (TEST_EQ_4V(tmp, ctx->Color.BlendColor))
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   COPY_4FV( ctx->Color.BlendColor, tmp );
-
-   if (ctx->Driver.BlendColor)
-      (*ctx->Driver.BlendColor)(ctx, tmp);
-}
-
-
-/**
- * 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);
-
-   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:
-      ref = CLAMP(ref, 0.0F, 1.0F);
-
-      if (ctx->Color.AlphaFunc == func && ctx->Color.AlphaRef == ref)
-         return; /* no change */
-
-      FLUSH_VERTICES(ctx, _NEW_COLOR);
-      ctx->Color.AlphaFunc = func;
-      ctx->Color.AlphaRef = ref;
-
-      if (ctx->Driver.AlphaFunc)
-         ctx->Driver.AlphaFunc(ctx, func, ref);
-      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);
-
-   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);
-}
-
-
-extern 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:
-      ctx->Light.ClampVertexColor = clamp;
-      break;
-   case GL_CLAMP_FRAGMENT_COLOR_ARB:
-      ctx->Color.ClampFragmentColor = clamp;
-      break;
-   case GL_CLAMP_READ_COLOR_ARB:
-      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,
- * __GLcontextRec::Color.
- */
-void _mesa_init_color( GLcontext * ctx )
-{
-   /* 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 );
-   ctx->Color.AlphaEnabled = GL_FALSE;
-   ctx->Color.AlphaFunc = GL_ALWAYS;
-   ctx->Color.AlphaRef = 0;
-   ctx->Color.BlendEnabled = 0x0;
-   ctx->Color.BlendSrcRGB = GL_ONE;
-   ctx->Color.BlendDstRGB = GL_ZERO;
-   ctx->Color.BlendSrcA = GL_ONE;
-   ctx->Color.BlendDstA = GL_ZERO;
-   ctx->Color.BlendEquationRGB = GL_FUNC_ADD;
-   ctx->Color.BlendEquationA = GL_FUNC_ADD;
-   ASSIGN_4V( ctx->Color.BlendColor, 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.ClampReadColor = GL_FIXED_ONLY_ARB;
-}
-
-/*@}*/
+/**

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

+

+

+/**

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

+}

+

+

+/**

+ * Process GL_EXT_blend_func_separate().

+ *

+ * \param sfactorRGB RGB source factor operator.

+ * \param dfactorRGB RGB destination factor operator.

+ * \param sfactorA alpha source factor operator.

+ * \param dfactorA alpha destination factor operator.

+ *

+ * Verifies the parameters and updates gl_colorbuffer_attrib.

+ * On a change, flush the vertices and notify the driver via

+ * dd_function_table::BlendFuncSeparate.

+ */

+void GLAPIENTRY

+_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,

+                            GLenum sfactorA, GLenum dfactorA )

+{

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

+

+   switch (sfactorRGB) {

+      case GL_SRC_COLOR:

+      case GL_ONE_MINUS_SRC_COLOR:

+         if (!ctx->Extensions.NV_blend_square) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorRGB)");

+            return;

+         }

+         /* fall-through */

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

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorRGB)");

+         return;

+   }

+

+   switch (dfactorRGB) {

+      case GL_DST_COLOR:

+      case GL_ONE_MINUS_DST_COLOR:

+         if (!ctx->Extensions.NV_blend_square) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorRGB)");

+            return;

+         }

+         /* fall-through */

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

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorRGB)");

+         return;

+   }

+

+   switch (sfactorA) {

+      case GL_SRC_COLOR:

+      case GL_ONE_MINUS_SRC_COLOR:

+         if (!ctx->Extensions.NV_blend_square) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorA)");

+            return;

+         }

+         /* fall-through */

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

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (sfactorA)");

+         return;

+   }

+

+   switch (dfactorA) {

+      case GL_DST_COLOR:

+      case GL_ONE_MINUS_DST_COLOR:

+         if (!ctx->Extensions.NV_blend_square) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorA)");

+            return;

+         }

+         /* fall-through */

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

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glBlendFunc or glBlendFuncSeparate (dfactorA)" );

+         return;

+   }

+

+   if (ctx->Color.BlendSrcRGB == sfactorRGB &&

+       ctx->Color.BlendDstRGB == dfactorRGB &&

+       ctx->Color.BlendSrcA == sfactorA &&

+       ctx->Color.BlendDstA == dfactorA)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+

+   ctx->Color.BlendSrcRGB = sfactorRGB;

+   ctx->Color.BlendDstRGB = dfactorRGB;

+   ctx->Color.BlendSrcA = sfactorA;

+   ctx->Color.BlendDstA = dfactorA;

+

+   if (ctx->Driver.BlendFuncSeparate) {

+      (*ctx->Driver.BlendFuncSeparate)( ctx, sfactorRGB, dfactorRGB,

+					sfactorA, dfactorA );

+   }

+}

+

+

+#if _HAVE_FULL_GL

+

+static GLboolean

+_mesa_validate_blend_equation( struct gl_context *ctx,

+			       GLenum mode, GLboolean is_separate )

+{

+   switch (mode) {

+      case GL_FUNC_ADD:

+         break;

+      case GL_MIN:

+      case GL_MAX:

+         if (!ctx->Extensions.EXT_blend_minmax) {

+            return GL_FALSE;

+         }

+         break;

+      /* glBlendEquationSeparate cannot take GL_LOGIC_OP as a parameter.

+       */

+      case GL_LOGIC_OP:

+         if (!ctx->Extensions.EXT_blend_logic_op || is_separate) {

+            return GL_FALSE;

+         }

+         break;

+      case GL_FUNC_SUBTRACT:

+      case GL_FUNC_REVERSE_SUBTRACT:

+         if (!ctx->Extensions.EXT_blend_subtract) {

+            return GL_FALSE;

+         }

+         break;

+      default:

+         return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+/* This is really an extension function! */

+void GLAPIENTRY

+_mesa_BlendEquation( GLenum mode )

+{

+   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 ( ! _mesa_validate_blend_equation( ctx, mode, GL_FALSE ) ) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation");

+      return;

+   }

+

+   if ( (ctx->Color.BlendEquationRGB == mode) &&

+	(ctx->Color.BlendEquationA == mode) )

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.BlendEquationRGB = mode;

+   ctx->Color.BlendEquationA = mode;

+

+   if (ctx->Driver.BlendEquationSeparate)

+      (*ctx->Driver.BlendEquationSeparate)( ctx, mode, mode );

+}

+

+

+void GLAPIENTRY

+_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )

+{

+   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 ( ! _mesa_validate_blend_equation( ctx, modeRGB, GL_TRUE ) ) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeRGB)");

+      return;

+   }

+

+   if ( ! _mesa_validate_blend_equation( ctx, modeA, GL_TRUE ) ) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)");

+      return;

+   }

+

+

+   if ( (ctx->Color.BlendEquationRGB == modeRGB) &&

+	(ctx->Color.BlendEquationA == modeA) )

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   ctx->Color.BlendEquationRGB = modeRGB;

+   ctx->Color.BlendEquationA = modeA;

+

+   if (ctx->Driver.BlendEquationSeparate)

+      (*ctx->Driver.BlendEquationSeparate)( ctx, modeRGB, modeA );

+}

+#endif

+

+

+/**

+ * 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] = CLAMP( red,   0.0F, 1.0F );

+   tmp[1] = CLAMP( green, 0.0F, 1.0F );

+   tmp[2] = CLAMP( blue,  0.0F, 1.0F );

+   tmp[3] = CLAMP( alpha, 0.0F, 1.0F );

+

+   if (TEST_EQ_4V(tmp, ctx->Color.BlendColor))

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   COPY_4FV( ctx->Color.BlendColor, tmp );

+

+   if (ctx->Driver.BlendColor)

+      (*ctx->Driver.BlendColor)(ctx, tmp);

+}

+

+

+/**

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

+

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

+      ref = CLAMP(ref, 0.0F, 1.0F);

+

+      if (ctx->Color.AlphaFunc == func && ctx->Color.AlphaRef == ref)

+         return; /* no change */

+

+      FLUSH_VERTICES(ctx, _NEW_COLOR);

+      ctx->Color.AlphaFunc = func;

+      ctx->Color.AlphaRef = ref;

+

+      if (ctx->Driver.AlphaFunc)

+         ctx->Driver.AlphaFunc(ctx, func, ref);

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

+

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

+}

+

+

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

+      ctx->Light.ClampVertexColor = clamp;

+      break;

+   case GL_CLAMP_FRAGMENT_COLOR_ARB:

+      ctx->Color.ClampFragmentColor = clamp;

+      break;

+   case GL_CLAMP_READ_COLOR_ARB:

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

+{

+   /* 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 );

+   ctx->Color.AlphaEnabled = GL_FALSE;

+   ctx->Color.AlphaFunc = GL_ALWAYS;

+   ctx->Color.AlphaRef = 0;

+   ctx->Color.BlendEnabled = 0x0;

+   ctx->Color.BlendSrcRGB = GL_ONE;

+   ctx->Color.BlendDstRGB = GL_ZERO;

+   ctx->Color.BlendSrcA = GL_ONE;

+   ctx->Color.BlendDstA = GL_ZERO;

+   ctx->Color.BlendEquationRGB = GL_FUNC_ADD;

+   ctx->Color.BlendEquationA = GL_FUNC_ADD;

+   ASSIGN_4V( ctx->Color.BlendColor, 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.ClampReadColor = GL_FIXED_ONLY_ARB;

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/blend.h b/mesalib/src/mesa/main/blend.h
index b4fd7470e..4437ba1bd 100644
--- a/mesalib/src/mesa/main/blend.h
+++ b/mesalib/src/mesa/main/blend.h
@@ -1,87 +1,89 @@
-/**
- * \file blend.h
- * Blending functions operations.
- */
-
-/*
- * 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 BLEND_H
-#define BLEND_H
-
-
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
-
-
-extern void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
-                            GLenum sfactorA, GLenum dfactorA );
-
-
-extern void GLAPIENTRY
-_mesa_BlendEquation( GLenum mode );
-
-
-extern void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA );
-
-
-extern void GLAPIENTRY
-_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-
-
-extern void GLAPIENTRY
-_mesa_AlphaFunc( GLenum func, GLclampf ref );
-
-
-extern void GLAPIENTRY
-_mesa_LogicOp( GLenum opcode );
-
-
-extern void GLAPIENTRY
-_mesa_IndexMask( GLuint mask );
-
-extern void GLAPIENTRY
-_mesa_ColorMask( GLboolean red, GLboolean green,
-                 GLboolean blue, GLboolean alpha );
-
-extern void GLAPIENTRY
-_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
-                        GLboolean blue, GLboolean alpha );
-
-
-extern void GLAPIENTRY
-_mesa_ClampColorARB(GLenum target, GLenum clamp);
-
-
-extern void  
-_mesa_init_color( GLcontext * ctx );
-
-#endif
+/**

+ * \file blend.h

+ * Blending functions operations.

+ */

+

+/*

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

+#define BLEND_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+

+extern void GLAPIENTRY

+_mesa_BlendFunc( GLenum sfactor, GLenum dfactor );

+

+

+extern void GLAPIENTRY

+_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,

+                            GLenum sfactorA, GLenum dfactorA );

+

+

+extern void GLAPIENTRY

+_mesa_BlendEquation( GLenum mode );

+

+

+extern void GLAPIENTRY

+_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA );

+

+

+extern void GLAPIENTRY

+_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);

+

+

+extern void GLAPIENTRY

+_mesa_AlphaFunc( GLenum func, GLclampf ref );

+

+

+extern void GLAPIENTRY

+_mesa_LogicOp( GLenum opcode );

+

+

+extern void GLAPIENTRY

+_mesa_IndexMask( GLuint mask );

+

+extern void GLAPIENTRY

+_mesa_ColorMask( GLboolean red, GLboolean green,

+                 GLboolean blue, GLboolean alpha );

+

+extern void GLAPIENTRY

+_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,

+                        GLboolean blue, GLboolean alpha );

+

+

+extern void GLAPIENTRY

+_mesa_ClampColorARB(GLenum target, GLenum clamp);

+

+

+extern void  

+_mesa_init_color( struct gl_context * ctx );

+

+#endif

diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 4797f29b4..a70c75750 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -1,2142 +1,2143 @@
-/*
- * 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 bufferobj.c
- * \brief Functions for the GL_ARB_vertex/pixel_buffer_object extensions.
- * \author Brian Paul, Ian Romanick
- */
-
-
-#include "glheader.h"
-#include "enums.h"
-#include "hash.h"
-#include "imports.h"
-#include "image.h"
-#include "context.h"
-#include "bufferobj.h"
-#include "fbobject.h"
-#include "texobj.h"
-
-
-/* Debug flags */
-/*#define VBO_DEBUG*/
-/*#define BOUNDS_CHECK*/
-
-
-#if FEATURE_OES_mapbuffer
-#define DEFAULT_ACCESS GL_MAP_WRITE_BIT
-#else
-#define DEFAULT_ACCESS (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)
-#endif
-
-
-/**
- * Return pointer to address of a buffer object target.
- * \param ctx  the GL context
- * \param target  the buffer object target to be retrieved.
- * \return   pointer to pointer to the buffer object bound to \c target in the
- *           specified context or \c NULL if \c target is invalid.
- */
-static INLINE struct gl_buffer_object **
-get_buffer_target(GLcontext *ctx, GLenum target)
-{
-   switch (target) {
-   case GL_ARRAY_BUFFER_ARB:
-      return &ctx->Array.ArrayBufferObj;
-   case GL_ELEMENT_ARRAY_BUFFER_ARB:
-      return &ctx->Array.ElementArrayBufferObj;
-   case GL_PIXEL_PACK_BUFFER_EXT:
-      return &ctx->Pack.BufferObj;
-   case GL_PIXEL_UNPACK_BUFFER_EXT:
-      return &ctx->Unpack.BufferObj;
-   case GL_COPY_READ_BUFFER:
-      if (ctx->Extensions.ARB_copy_buffer) {
-         return &ctx->CopyReadBuffer;
-      }
-      break;
-   case GL_COPY_WRITE_BUFFER:
-      if (ctx->Extensions.ARB_copy_buffer) {
-         return &ctx->CopyWriteBuffer;
-      }
-      break;
-#if FEATURE_EXT_transform_feedback
-   case GL_TRANSFORM_FEEDBACK_BUFFER:
-      if (ctx->Extensions.EXT_transform_feedback) {
-         return &ctx->TransformFeedback.CurrentBuffer;
-      }
-      break;
-#endif
-   default:
-      return NULL;
-   }
-   return NULL;
-}
-
-
-/**
- * Get the buffer object bound to the specified target in a GL context.
- * \param ctx  the GL context
- * \param target  the buffer object target to be retrieved.
- * \return   pointer to the buffer object bound to \c target in the
- *           specified context or \c NULL if \c target is invalid.
- */
-static INLINE struct gl_buffer_object *
-get_buffer(GLcontext *ctx, GLenum target)
-{
-   struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);
-   if (bufObj)
-      return *bufObj;
-   return NULL;
-}
-
-
-/**
- * Convert a GLbitfield describing the mapped buffer access flags
- * into one of GL_READ_WRITE, GL_READ_ONLY, or GL_WRITE_ONLY.
- */
-static GLenum
-simplified_access_mode(GLbitfield access)
-{
-   const GLbitfield rwFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
-   if ((access & rwFlags) == rwFlags)
-      return GL_READ_WRITE;
-   if ((access & GL_MAP_READ_BIT) == GL_MAP_READ_BIT)
-      return GL_READ_ONLY;
-   if ((access & GL_MAP_WRITE_BIT) == GL_MAP_WRITE_BIT)
-      return GL_WRITE_ONLY;
-   return GL_READ_WRITE; /* this should never happen, but no big deal */
-}
-
-
-/**
- * Tests the subdata range parameters and sets the GL error code for
- * \c glBufferSubDataARB and \c glGetBufferSubDataARB.
- *
- * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
- * \param offset  Offset of the first byte of the subdata range.
- * \param size    Size, in bytes, of the subdata range.
- * \param caller  Name of calling function for recording errors.
- * \return   A pointer to the buffer object bound to \c target in the
- *           specified context or \c NULL if any of the parameter or state
- *           conditions for \c glBufferSubDataARB or \c glGetBufferSubDataARB
- *           are invalid.
- *
- * \sa glBufferSubDataARB, glGetBufferSubDataARB
- */
-static struct gl_buffer_object *
-buffer_object_subdata_range_good( GLcontext * ctx, GLenum target, 
-                                  GLintptrARB offset, GLsizeiptrARB size,
-                                  const char *caller )
-{
-   struct gl_buffer_object *bufObj;
-
-   if (size < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", caller);
-      return NULL;
-   }
-
-   if (offset < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset < 0)", caller);
-      return NULL;
-   }
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);
-      return NULL;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
-      return NULL;
-   }
-   if (offset + size > bufObj->Size) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-		  "%s(size + offset > buffer size)", caller);
-      return NULL;
-   }
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      /* Buffer is currently mapped */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
-      return NULL;
-   }
-
-   return bufObj;
-}
-
-
-/**
- * Allocate and initialize a new buffer object.
- * 
- * Default callback for the \c dd_function_table::NewBufferObject() hook.
- */
-static struct gl_buffer_object *
-_mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
-{
-   struct gl_buffer_object *obj;
-
-   (void) ctx;
-
-   obj = MALLOC_STRUCT(gl_buffer_object);
-   _mesa_initialize_buffer_object(obj, name, target);
-   return obj;
-}
-
-
-/**
- * Delete a buffer object.
- * 
- * Default callback for the \c dd_function_table::DeleteBuffer() hook.
- */
-static void
-_mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
-{
-   (void) ctx;
-
-   if (bufObj->Data)
-      free(bufObj->Data);
-
-   /* assign strange values here to help w/ debugging */
-   bufObj->RefCount = -1000;
-   bufObj->Name = ~0;
-
-   _glthread_DESTROY_MUTEX(bufObj->Mutex);
-   free(bufObj);
-}
-
-
-
-/**
- * Set ptr to bufObj w/ reference counting.
- */
-void
-_mesa_reference_buffer_object(GLcontext *ctx,
-                              struct gl_buffer_object **ptr,
-                              struct gl_buffer_object *bufObj)
-{
-   if (*ptr == bufObj)
-      return;
-
-   if (*ptr) {
-      /* Unreference the old buffer */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_buffer_object *oldObj = *ptr;
-
-      _glthread_LOCK_MUTEX(oldObj->Mutex);
-      ASSERT(oldObj->RefCount > 0);
-      oldObj->RefCount--;
-#if 0
-      printf("BufferObj %p %d DECR to %d\n",
-             (void *) oldObj, oldObj->Name, oldObj->RefCount);
-#endif
-      deleteFlag = (oldObj->RefCount == 0);
-      _glthread_UNLOCK_MUTEX(oldObj->Mutex);
-
-      if (deleteFlag) {
-
-         /* some sanity checking: don't delete a buffer still in use */
-#if 0
-         /* unfortunately, these tests are invalid during context tear-down */
-	 ASSERT(ctx->Array.ArrayBufferObj != bufObj);
-	 ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);
-	 ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);
-#endif
-
-	 ASSERT(ctx->Driver.DeleteBuffer);
-         ctx->Driver.DeleteBuffer(ctx, oldObj);
-      }
-
-      *ptr = NULL;
-   }
-   ASSERT(!*ptr);
-
-   if (bufObj) {
-      /* reference new buffer */
-      _glthread_LOCK_MUTEX(bufObj->Mutex);
-      if (bufObj->RefCount == 0) {
-         /* this buffer's being deleted (look just above) */
-         /* Not sure this can every really happen.  Warn if it does. */
-         _mesa_problem(NULL, "referencing deleted buffer object");
-         *ptr = NULL;
-      }
-      else {
-         bufObj->RefCount++;
-#if 0
-         printf("BufferObj %p %d INCR to %d\n",
-                (void *) bufObj, bufObj->Name, bufObj->RefCount);
-#endif
-         *ptr = bufObj;
-      }
-      _glthread_UNLOCK_MUTEX(bufObj->Mutex);
-   }
-}
-
-
-/**
- * Initialize a buffer object to default values.
- */
-void
-_mesa_initialize_buffer_object( struct gl_buffer_object *obj,
-				GLuint name, GLenum target )
-{
-   (void) target;
-
-   memset(obj, 0, sizeof(struct gl_buffer_object));
-   _glthread_INIT_MUTEX(obj->Mutex);
-   obj->RefCount = 1;
-   obj->Name = name;
-   obj->Usage = GL_STATIC_DRAW_ARB;
-   obj->AccessFlags = DEFAULT_ACCESS;
-}
-
-
-/**
- * Allocate space for and store data in a buffer object.  Any data that was
- * previously stored in the buffer object is lost.  If \c data is \c NULL,
- * memory will be allocated, but no copy will occur.
- *
- * This is the default callback for \c dd_function_table::BufferData()
- * Note that all GL error checking will have been done already.
- *
- * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
- * \param size    Size, in bytes, of the new data store.
- * \param data    Pointer to the data to store in the buffer object.  This
- *                pointer may be \c NULL.
- * \param usage   Hints about how the data will be used.
- * \param bufObj  Object to be used.
- *
- * \return GL_TRUE for success, GL_FALSE for failure
- * \sa glBufferDataARB, dd_function_table::BufferData.
- */
-static GLboolean
-_mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
-		   const GLvoid * data, GLenum usage,
-		   struct gl_buffer_object * bufObj )
-{
-   void * new_data;
-
-   (void) ctx; (void) target;
-
-   new_data = _mesa_realloc( bufObj->Data, bufObj->Size, size );
-   if (new_data) {
-      bufObj->Data = (GLubyte *) new_data;
-      bufObj->Size = size;
-      bufObj->Usage = usage;
-
-      if (data) {
-	 memcpy( bufObj->Data, data, size );
-      }
-
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Replace data in a subrange of buffer object.  If the data range
- * specified by \c size + \c offset extends beyond the end of the buffer or
- * if \c data is \c NULL, no copy is performed.
- *
- * This is the default callback for \c dd_function_table::BufferSubData()
- * Note that all GL error checking will have been done already.
- *
- * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
- * \param offset  Offset of the first byte to be modified.
- * \param size    Size, in bytes, of the data range.
- * \param data    Pointer to the data to store in the buffer object.
- * \param bufObj  Object to be used.
- *
- * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
- */
-static void
-_mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
-		      GLsizeiptrARB size, const GLvoid * data,
-		      struct gl_buffer_object * bufObj )
-{
-   (void) ctx; (void) target;
-
-   /* this should have been caught in _mesa_BufferSubData() */
-   ASSERT(size + offset <= bufObj->Size);
-
-   if (bufObj->Data) {
-      memcpy( (GLubyte *) bufObj->Data + offset, data, size );
-   }
-}
-
-
-/**
- * Retrieve data from a subrange of buffer object.  If the data range
- * specified by \c size + \c offset extends beyond the end of the buffer or
- * if \c data is \c NULL, no copy is performed.
- *
- * This is the default callback for \c dd_function_table::GetBufferSubData()
- * Note that all GL error checking will have been done already.
- *
- * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
- * \param offset  Offset of the first byte to be fetched.
- * \param size    Size, in bytes, of the data range.
- * \param data    Destination for data
- * \param bufObj  Object to be used.
- *
- * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
- */
-static void
-_mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
-			  GLsizeiptrARB size, GLvoid * data,
-			  struct gl_buffer_object * bufObj )
-{
-   (void) ctx; (void) target;
-
-   if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {
-      memcpy( data, (GLubyte *) bufObj->Data + offset, size );
-   }
-}
-
-
-/**
- * Default callback for \c dd_function_tabel::MapBuffer().
- *
- * The function parameters will have been already tested for errors.
- *
- * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
- * \param access  Information about how the buffer will be accessed.
- * \param bufObj  Object to be mapped.
- * \return  A pointer to the object's internal data store that can be accessed
- *          by the processor
- *
- * \sa glMapBufferARB, dd_function_table::MapBuffer
- */
-static void *
-_mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
-		  struct gl_buffer_object *bufObj )
-{
-   (void) ctx;
-   (void) target;
-   (void) access;
-   /* Just return a direct pointer to the data */
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      /* already mapped! */
-      return NULL;
-   }
-   bufObj->Pointer = bufObj->Data;
-   bufObj->Length = bufObj->Size;
-   bufObj->Offset = 0;
-   return bufObj->Pointer;
-}
-
-
-/**
- * Default fallback for \c dd_function_table::MapBufferRange().
- * Called via glMapBufferRange().
- */
-static void *
-_mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
-                        GLsizeiptr length, GLbitfield access,
-                        struct gl_buffer_object *bufObj )
-{
-   (void) ctx;
-   (void) target;
-   assert(!_mesa_bufferobj_mapped(bufObj));
-   /* Just return a direct pointer to the data */
-   bufObj->Pointer = bufObj->Data + offset;
-   bufObj->Length = length;
-   bufObj->Offset = offset;
-   bufObj->AccessFlags = access;
-   return bufObj->Pointer;
-}
-
-
-/**
- * Default fallback for \c dd_function_table::FlushMappedBufferRange().
- * Called via glFlushMappedBufferRange().
- */
-static void
-_mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target, 
-                                 GLintptr offset, GLsizeiptr length,
-                                 struct gl_buffer_object *obj )
-{
-   (void) ctx;
-   (void) target;
-   (void) offset;
-   (void) length;
-   (void) obj;
-   /* no-op */
-}
-
-
-/**
- * Default callback for \c dd_function_table::MapBuffer().
- *
- * The input parameters will have been already tested for errors.
- *
- * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
- */
-static GLboolean
-_mesa_buffer_unmap( GLcontext *ctx, GLenum target,
-                    struct gl_buffer_object *bufObj )
-{
-   (void) ctx;
-   (void) target;
-   /* XXX we might assert here that bufObj->Pointer is non-null */
-   bufObj->Pointer = NULL;
-   bufObj->Length = 0;
-   bufObj->Offset = 0;
-   bufObj->AccessFlags = 0x0;
-   return GL_TRUE;
-}
-
-
-/**
- * Default fallback for \c dd_function_table::CopyBufferSubData().
- * Called via glCopyBuffserSubData().
- */
-static void
-_mesa_copy_buffer_subdata(GLcontext *ctx,
-                          struct gl_buffer_object *src,
-                          struct gl_buffer_object *dst,
-                          GLintptr readOffset, GLintptr writeOffset,
-                          GLsizeiptr size)
-{
-   GLubyte *srcPtr, *dstPtr;
-
-   /* buffer should not already be mapped */
-   assert(!_mesa_bufferobj_mapped(src));
-   assert(!_mesa_bufferobj_mapped(dst));
-
-   srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,
-                                              GL_READ_ONLY, src);
-   dstPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_WRITE_BUFFER,
-                                              GL_WRITE_ONLY, dst);
-
-   if (srcPtr && dstPtr)
-      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
-
-   ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);
-   ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);
-}
-
-
-
-/**
- * Initialize the state associated with buffer objects
- */
-void
-_mesa_init_buffer_objects( GLcontext *ctx )
-{
-   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj,
-                                 ctx->Shared->NullBufferObj);
-   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj,
-                                 ctx->Shared->NullBufferObj);
-
-   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer,
-                                 ctx->Shared->NullBufferObj);
-   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer,
-                                 ctx->Shared->NullBufferObj);
-}
-
-
-void
-_mesa_free_buffer_objects( GLcontext *ctx )
-{
-   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
-
-   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer, NULL);
-   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer, NULL);
-}
-
-
-/**
- * Bind the specified target to buffer for the specified context.
- * Called by glBindBuffer() and other functions.
- */
-static void
-bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
-{
-   struct gl_buffer_object *oldBufObj;
-   struct gl_buffer_object *newBufObj = NULL;
-   struct gl_buffer_object **bindTarget = NULL;
-
-   bindTarget = get_buffer_target(ctx, target);
-   if (!bindTarget) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)", target);
-      return;
-   }
-
-   /* Get pointer to old buffer object (to be unbound) */
-   oldBufObj = *bindTarget;
-   if (oldBufObj && oldBufObj->Name == buffer)
-      return;   /* rebinding the same buffer object- no change */
-
-   /*
-    * Get pointer to new buffer object (newBufObj)
-    */
-   if (buffer == 0) {
-      /* The spec says there's not a buffer object named 0, but we use
-       * one internally because it simplifies things.
-       */
-      newBufObj = ctx->Shared->NullBufferObj;
-   }
-   else {
-      /* non-default buffer object */
-      newBufObj = _mesa_lookup_bufferobj(ctx, buffer);
-      if (!newBufObj) {
-         /* if this is a new buffer object id, allocate a buffer object now */
-         ASSERT(ctx->Driver.NewBufferObject);
-         newBufObj = ctx->Driver.NewBufferObject(ctx, buffer, target);
-         if (!newBufObj) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");
-            return;
-         }
-         _mesa_HashInsert(ctx->Shared->BufferObjects, buffer, newBufObj);
-      }
-   }
-   
-   /* bind new buffer */
-   _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);
-
-   /* Pass BindBuffer call to device driver */
-   if (ctx->Driver.BindBuffer)
-      ctx->Driver.BindBuffer( ctx, target, newBufObj );
-}
-
-
-/**
- * Update the default buffer objects in the given context to reference those
- * specified in the shared state and release those referencing the old 
- * shared state.
- */
-void
-_mesa_update_default_objects_buffer_objects(GLcontext *ctx)
-{
-   /* Bind the NullBufferObj to remove references to those
-    * in the shared context hash table.
-    */
-   bind_buffer_object( ctx, GL_ARRAY_BUFFER_ARB, 0);
-   bind_buffer_object( ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
-   bind_buffer_object( ctx, GL_PIXEL_PACK_BUFFER_ARB, 0);
-   bind_buffer_object( ctx, GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-}
-
-
-/**
- * When we're about to read pixel data out of a PBO (via glDrawPixels,
- * glTexImage, etc) or write data into a PBO (via glReadPixels,
- * glGetTexImage, etc) we call this function to check that we're not
- * going to read out of bounds.
- *
- * XXX This would also be a convenient time to check that the PBO isn't
- * currently mapped.  Whoever calls this function should check for that.
- * Remember, we can't use a PBO when it's mapped!
- *
- * If we're not using a PBO, this is a no-op.
- *
- * \param width  width of image to read/write
- * \param height  height of image to read/write
- * \param depth  depth of image to read/write
- * \param format  format of image to read/write
- * \param type  datatype of image to read/write
- * \param ptr  the user-provided pointer/offset
- * \return GL_TRUE if the PBO access is OK, GL_FALSE if the access would
- *         go out of bounds.
- */
-GLboolean
-_mesa_validate_pbo_access(GLuint dimensions,
-                          const struct gl_pixelstore_attrib *pack,
-                          GLsizei width, GLsizei height, GLsizei depth,
-                          GLenum format, GLenum type, const GLvoid *ptr)
-{
-   GLvoid *start, *end;
-   const GLubyte *sizeAddr; /* buffer size, cast to a pointer */
-
-   if (!_mesa_is_bufferobj(pack->BufferObj))
-      return GL_TRUE;  /* no PBO, OK */
-
-   if (pack->BufferObj->Size == 0)
-      /* no buffer! */
-      return GL_FALSE;
-
-   /* get address of first pixel we'll read */
-   start = _mesa_image_address(dimensions, pack, ptr, width, height,
-                               format, type, 0, 0, 0);
-
-   /* get address just past the last pixel we'll read */
-   end =  _mesa_image_address(dimensions, pack, ptr, width, height,
-                              format, type, depth-1, height-1, width);
-
-
-   sizeAddr = ((const GLubyte *) 0) + pack->BufferObj->Size;
-
-   if ((const GLubyte *) start > sizeAddr) {
-      /* This will catch negative values / wrap-around */
-      return GL_FALSE;
-   }
-   if ((const GLubyte *) end > sizeAddr) {
-      /* Image read goes beyond end of buffer */
-      return GL_FALSE;
-   }
-
-   /* OK! */
-   return GL_TRUE;
-}
-
-
-/**
- * For commands that read from a PBO (glDrawPixels, glTexImage,
- * glPolygonStipple, etc), if we're reading from a PBO, map it read-only
- * and return the pointer into the PBO.  If we're not reading from a
- * PBO, return \p src as-is.
- * If non-null return, must call _mesa_unmap_pbo_source() when done.
- *
- * \return NULL if error, else pointer to start of data
- */
-const GLvoid *
-_mesa_map_pbo_source(GLcontext *ctx,
-                     const struct gl_pixelstore_attrib *unpack,
-                     const GLvoid *src)
-{
-   const GLubyte *buf;
-
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* unpack from PBO */
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              unpack->BufferObj);
-      if (!buf)
-         return NULL;
-
-      buf = ADD_POINTERS(buf, src);
-   }
-   else {
-      /* unpack from normal memory */
-      buf = src;
-   }
-
-   return buf;
-}
-
-
-/**
- * Combine PBO-read validation and mapping.
- * If any GL errors are detected, they'll be recorded and NULL returned.
- * \sa _mesa_validate_pbo_access
- * \sa _mesa_map_pbo_source
- * A call to this function should have a matching call to
- * _mesa_unmap_pbo_source().
- */
-const GLvoid *
-_mesa_map_validate_pbo_source(GLcontext *ctx,
-                              GLuint dimensions,
-                              const struct gl_pixelstore_attrib *unpack,
-                              GLsizei width, GLsizei height, GLsizei depth,
-                              GLenum format, GLenum type, const GLvoid *ptr,
-                              const char *where)
-{
-   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);
-
-   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* non-PBO access: no validation to be done */
-      return ptr;
-   }
-
-   if (!_mesa_validate_pbo_access(dimensions, unpack,
-                                  width, height, depth, format, type, ptr)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "%s(out of bounds PBO access)", where);
-      return NULL;
-   }
-
-   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
-      /* buffer is already mapped - that's an error */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
-      return NULL;
-   }
-
-   ptr = _mesa_map_pbo_source(ctx, unpack, ptr);
-   return ptr;
-}
-
-
-/**
- * Counterpart to _mesa_map_pbo_source()
- */
-void
-_mesa_unmap_pbo_source(GLcontext *ctx,
-                       const struct gl_pixelstore_attrib *unpack)
-{
-   ASSERT(unpack != &ctx->Pack); /* catch pack/unpack mismatch */
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
-}
-
-
-/**
- * For commands that write to a PBO (glReadPixels, glGetColorTable, etc),
- * if we're writing to a PBO, map it write-only and return the pointer
- * into the PBO.  If we're not writing to a PBO, return \p dst as-is.
- * If non-null return, must call _mesa_unmap_pbo_dest() when done.
- *
- * \return NULL if error, else pointer to start of data
- */
-void *
-_mesa_map_pbo_dest(GLcontext *ctx,
-                   const struct gl_pixelstore_attrib *pack,
-                   GLvoid *dest)
-{
-   void *buf;
-
-   if (_mesa_is_bufferobj(pack->BufferObj)) {
-      /* pack into PBO */
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              pack->BufferObj);
-      if (!buf)
-         return NULL;
-
-      buf = ADD_POINTERS(buf, dest);
-   }
-   else {
-      /* pack to normal memory */
-      buf = dest;
-   }
-
-   return buf;
-}
-
-
-/**
- * Combine PBO-write validation and mapping.
- * If any GL errors are detected, they'll be recorded and NULL returned.
- * \sa _mesa_validate_pbo_access
- * \sa _mesa_map_pbo_dest
- * A call to this function should have a matching call to
- * _mesa_unmap_pbo_dest().
- */
-GLvoid *
-_mesa_map_validate_pbo_dest(GLcontext *ctx,
-                            GLuint dimensions,
-                            const struct gl_pixelstore_attrib *unpack,
-                            GLsizei width, GLsizei height, GLsizei depth,
-                            GLenum format, GLenum type, GLvoid *ptr,
-                            const char *where)
-{
-   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);
-
-   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* non-PBO access: no validation to be done */
-      return ptr;
-   }
-
-   if (!_mesa_validate_pbo_access(dimensions, unpack,
-                                  width, height, depth, format, type, ptr)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "%s(out of bounds PBO access)", where);
-      return NULL;
-   }
-
-   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
-      /* buffer is already mapped - that's an error */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
-      return NULL;
-   }
-
-   ptr = _mesa_map_pbo_dest(ctx, unpack, ptr);
-   return ptr;
-}
-
-
-/**
- * Counterpart to _mesa_map_pbo_dest()
- */
-void
-_mesa_unmap_pbo_dest(GLcontext *ctx,
-                     const struct gl_pixelstore_attrib *pack)
-{
-   ASSERT(pack != &ctx->Unpack); /* catch pack/unpack mismatch */
-   if (_mesa_is_bufferobj(pack->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, pack->BufferObj);
-   }
-}
-
-
-
-/**
- * Return the gl_buffer_object for the given ID.
- * Always return NULL for ID 0.
- */
-struct gl_buffer_object *
-_mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer)
-{
-   if (buffer == 0)
-      return NULL;
-   else
-      return (struct gl_buffer_object *)
-         _mesa_HashLookup(ctx->Shared->BufferObjects, buffer);
-}
-
-
-/**
- * If *ptr points to obj, set ptr = the Null/default buffer object.
- * This is a helper for buffer object deletion.
- * The GL spec says that deleting a buffer object causes it to get
- * unbound from all arrays in the current context.
- */
-static void
-unbind(GLcontext *ctx,
-       struct gl_buffer_object **ptr,
-       struct gl_buffer_object *obj)
-{
-   if (*ptr == obj) {
-      _mesa_reference_buffer_object(ctx, ptr, ctx->Shared->NullBufferObj);
-   }
-}
-
-
-/**
- * Plug default/fallback buffer object functions into the device
- * driver hooks.
- */
-void
-_mesa_init_buffer_object_functions(struct dd_function_table *driver)
-{
-   /* GL_ARB_vertex/pixel_buffer_object */
-   driver->NewBufferObject = _mesa_new_buffer_object;
-   driver->DeleteBuffer = _mesa_delete_buffer_object;
-   driver->BindBuffer = NULL;
-   driver->BufferData = _mesa_buffer_data;
-   driver->BufferSubData = _mesa_buffer_subdata;
-   driver->GetBufferSubData = _mesa_buffer_get_subdata;
-   driver->MapBuffer = _mesa_buffer_map;
-   driver->UnmapBuffer = _mesa_buffer_unmap;
-
-   /* GL_ARB_map_buffer_range */
-   driver->MapBufferRange = _mesa_buffer_map_range;
-   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;
-
-   /* GL_ARB_copy_buffer */
-   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;
-}
-
-
-
-/**********************************************************************/
-/* API Functions                                                      */
-/**********************************************************************/
-
-void GLAPIENTRY
-_mesa_BindBufferARB(GLenum target, GLuint buffer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   bind_buffer_object(ctx, target, buffer);
-}
-
-
-/**
- * Delete a set of buffer objects.
- * 
- * \param n      Number of buffer objects to delete.
- * \param ids    Array of \c n buffer object IDs.
- */
-void GLAPIENTRY
-_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLsizei i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteBuffersARB(n)");
-      return;
-   }
-
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
-   for (i = 0; i < n; i++) {
-      struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, ids[i]);
-      if (bufObj) {
-         struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-         GLuint j;
-
-         ASSERT(bufObj->Name == ids[i]);
-
-         if (_mesa_bufferobj_mapped(bufObj)) {
-            /* if mapped, unmap it now */
-            ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
-            bufObj->AccessFlags = DEFAULT_ACCESS;
-            bufObj->Pointer = NULL;
-         }
-
-         /* unbind any vertex pointers bound to this buffer */
-         unbind(ctx, &arrayObj->Vertex.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->Weight.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->Normal.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->Color.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->SecondaryColor.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->FogCoord.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->Index.BufferObj, bufObj);
-         unbind(ctx, &arrayObj->EdgeFlag.BufferObj, bufObj);
-         for (j = 0; j < Elements(arrayObj->TexCoord); j++) {
-            unbind(ctx, &arrayObj->TexCoord[j].BufferObj, bufObj);
-         }
-         for (j = 0; j < Elements(arrayObj->VertexAttrib); j++) {
-            unbind(ctx, &arrayObj->VertexAttrib[j].BufferObj, bufObj);
-         }
-
-         if (ctx->Array.ArrayBufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
-         }
-         if (ctx->Array.ElementArrayBufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
-         }
-
-         /* unbind any pixel pack/unpack pointers bound to this buffer */
-         if (ctx->Pack.BufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );
-         }
-         if (ctx->Unpack.BufferObj == bufObj) {
-            _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
-         }
-
-         /* The ID is immediately freed for re-use */
-         _mesa_HashRemove(ctx->Shared->BufferObjects, bufObj->Name);
-         _mesa_reference_buffer_object(ctx, &bufObj, NULL);
-      }
-   }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-}
-
-
-/**
- * Generate a set of unique buffer object IDs and store them in \c buffer.
- * 
- * \param n       Number of IDs to generate.
- * \param buffer  Array of \c n locations to store the IDs.
- */
-void GLAPIENTRY
-_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint first;
-   GLint i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenBuffersARB");
-      return;
-   }
-
-   if (!buffer) {
-      return;
-   }
-
-   /*
-    * This must be atomic (generation and allocation of buffer object IDs)
-    */
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->BufferObjects, n);
-
-   /* Allocate new, empty buffer objects and return identifiers */
-   for (i = 0; i < n; i++) {
-      struct gl_buffer_object *bufObj;
-      GLuint name = first + i;
-      GLenum target = 0;
-      bufObj = ctx->Driver.NewBufferObject( ctx, name, target );
-      if (!bufObj) {
-         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenBuffersARB");
-         return;
-      }
-      _mesa_HashInsert(ctx->Shared->BufferObjects, first + i, bufObj);
-      buffer[i] = first + i;
-   }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-}
-
-
-/**
- * Determine if ID is the name of a buffer object.
- * 
- * \param id  ID of the potential buffer object.
- * \return  \c GL_TRUE if \c id is the name of a buffer object, 
- *          \c GL_FALSE otherwise.
- */
-GLboolean GLAPIENTRY
-_mesa_IsBufferARB(GLuint id)
-{
-   struct gl_buffer_object *bufObj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-   bufObj = _mesa_lookup_bufferobj(ctx, id);
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-   return bufObj ? GL_TRUE : GL_FALSE;
-}
-
-
-void GLAPIENTRY
-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
-                    const GLvoid * data, GLenum usage)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (size < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferDataARB(size < 0)");
-      return;
-   }
-
-   switch (usage) {
-   case GL_STREAM_DRAW_ARB:
-   case GL_STREAM_READ_ARB:
-   case GL_STREAM_COPY_ARB:
-   case GL_STATIC_DRAW_ARB:
-   case GL_STATIC_READ_ARB:
-   case GL_STATIC_COPY_ARB:
-   case GL_DYNAMIC_DRAW_ARB:
-   case GL_DYNAMIC_READ_ARB:
-   case GL_DYNAMIC_COPY_ARB:
-      /* OK */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
-      return;
-   }
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(target)" );
-      return;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );
-      return;
-   }
-   
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
-      ctx->Driver.UnmapBuffer(ctx, target, bufObj);
-      bufObj->AccessFlags = DEFAULT_ACCESS;
-      ASSERT(bufObj->Pointer == NULL);
-   }  
-
-   FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
-
-   bufObj->Written = GL_TRUE;
-
-#ifdef VBO_DEBUG
-   printf("glBufferDataARB(%u, sz %ld, from %p, usage 0x%x)\n",
-                bufObj->Name, size, data, usage);
-#endif
-
-#ifdef BOUNDS_CHECK
-   size += 100;
-#endif
-
-   ASSERT(ctx->Driver.BufferData);
-   if (!ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj )) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB()");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
-                       GLsizeiptrARB size, const GLvoid * data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
-                                              "glBufferSubDataARB" );
-   if (!bufObj) {
-      /* error already recorded */
-      return;
-   }
-
-   bufObj->Written = GL_TRUE;
-
-   ASSERT(ctx->Driver.BufferSubData);
-   ctx->Driver.BufferSubData( ctx, target, offset, size, data, bufObj );
-}
-
-
-void GLAPIENTRY
-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
-                          GLsizeiptrARB size, void * data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
-                                              "glGetBufferSubDataARB" );
-   if (!bufObj) {
-      /* error already recorded */
-      return;
-   }
-
-   ASSERT(ctx->Driver.GetBufferSubData);
-   ctx->Driver.GetBufferSubData( ctx, target, offset, size, data, bufObj );
-}
-
-
-void * GLAPIENTRY
-_mesa_MapBufferARB(GLenum target, GLenum access)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object * bufObj;
-   GLbitfield accessFlags;
-   void *map;
-
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
-
-   switch (access) {
-   case GL_READ_ONLY_ARB:
-      accessFlags = GL_MAP_READ_BIT;
-      break;
-   case GL_WRITE_ONLY_ARB:
-      accessFlags = GL_MAP_WRITE_BIT;
-      break;
-   case GL_READ_WRITE_ARB:
-      accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
-      return NULL;
-   }
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)" );
-      return NULL;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );
-      return NULL;
-   }
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
-      return NULL;
-   }
-
-   ASSERT(ctx->Driver.MapBuffer);
-   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
-   if (!map) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
-      return NULL;
-   }
-   else {
-      /* The driver callback should have set these fields.
-       * This is important because other modules (like VBO) might call
-       * the driver function directly.
-       */
-      ASSERT(bufObj->Pointer == map);
-      ASSERT(bufObj->Length == bufObj->Size);
-      ASSERT(bufObj->Offset == 0);
-      bufObj->AccessFlags = accessFlags;
-   }
-
-   if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
-      bufObj->Written = GL_TRUE;
-
-#ifdef VBO_DEBUG
-   printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",
-	  bufObj->Name, bufObj->Size, access);
-   if (access == GL_WRITE_ONLY_ARB) {
-      GLuint i;
-      GLubyte *b = (GLubyte *) bufObj->Pointer;
-      for (i = 0; i < bufObj->Size; i++)
-         b[i] = i & 0xff;
-   }
-#endif
-
-#ifdef BOUNDS_CHECK
-   {
-      GLubyte *buf = (GLubyte *) bufObj->Pointer;
-      GLuint i;
-      /* buffer is 100 bytes larger than requested, fill with magic value */
-      for (i = 0; i < 100; i++) {
-         buf[bufObj->Size - i - 1] = 123;
-      }
-   }
-#endif
-
-   return bufObj->Pointer;
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_UnmapBufferARB(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   GLboolean status = GL_TRUE;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glUnmapBufferARB(target)" );
-      return GL_FALSE;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
-      return GL_FALSE;
-   }
-   if (!_mesa_bufferobj_mapped(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
-      return GL_FALSE;
-   }
-
-#ifdef BOUNDS_CHECK
-   if (bufObj->Access != GL_READ_ONLY_ARB) {
-      GLubyte *buf = (GLubyte *) bufObj->Pointer;
-      GLuint i;
-      /* check that last 100 bytes are still = magic value */
-      for (i = 0; i < 100; i++) {
-         GLuint pos = bufObj->Size - i - 1;
-         if (buf[pos] != 123) {
-            _mesa_warning(ctx, "Out of bounds buffer object write detected"
-                          " at position %d (value = %u)\n",
-                          pos, buf[pos]);
-         }
-      }
-   }
-#endif
-
-#ifdef VBO_DEBUG
-   if (bufObj->AccessFlags & GL_MAP_WRITE_BIT) {
-      GLuint i, unchanged = 0;
-      GLubyte *b = (GLubyte *) bufObj->Pointer;
-      GLint pos = -1;
-      /* check which bytes changed */
-      for (i = 0; i < bufObj->Size - 1; i++) {
-         if (b[i] == (i & 0xff) && b[i+1] == ((i+1) & 0xff)) {
-            unchanged++;
-            if (pos == -1)
-               pos = i;
-         }
-      }
-      if (unchanged) {
-         printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",
-                      bufObj->Name, unchanged, bufObj->Size, pos);
-      }
-   }
-#endif
-
-   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
-   bufObj->AccessFlags = DEFAULT_ACCESS;
-   ASSERT(bufObj->Pointer == NULL);
-   ASSERT(bufObj->Offset == 0);
-   ASSERT(bufObj->Length == 0);
-
-   return status;
-}
-
-
-void GLAPIENTRY
-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(target)" );
-      return;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameterivARB" );
-      return;
-   }
-
-   switch (pname) {
-   case GL_BUFFER_SIZE_ARB:
-      *params = (GLint) bufObj->Size;
-      return;
-   case GL_BUFFER_USAGE_ARB:
-      *params = bufObj->Usage;
-      return;
-   case GL_BUFFER_ACCESS_ARB:
-      *params = simplified_access_mode(bufObj->AccessFlags);
-      return;
-   case GL_BUFFER_MAPPED_ARB:
-      *params = _mesa_bufferobj_mapped(bufObj);
-      return;
-   case GL_BUFFER_ACCESS_FLAGS:
-      if (ctx->VersionMajor < 3)
-         goto invalid_pname;
-      *params = bufObj->AccessFlags;
-      return;
-   case GL_BUFFER_MAP_OFFSET:
-      if (ctx->VersionMajor < 3)
-         goto invalid_pname;
-      *params = (GLint) bufObj->Offset;
-      return;
-   case GL_BUFFER_MAP_LENGTH:
-      if (ctx->VersionMajor < 3)
-         goto invalid_pname;
-      *params = (GLint) bufObj->Length;
-      return;
-   default:
-      ; /* fall-through */
-   }
-
-invalid_pname:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",
-               _mesa_lookup_enum_by_nr(pname));
-}
-
-
-/**
- * New in GL 3.2
- * This is pretty much a duplicate of GetBufferParameteriv() but the
- * GL_BUFFER_SIZE_ARB attribute will be 64-bits on a 64-bit system.
- */
-void GLAPIENTRY
-_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(target)" );
-      return;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameteri64v" );
-      return;
-   }
-
-   switch (pname) {
-   case GL_BUFFER_SIZE_ARB:
-      *params = bufObj->Size;
-      return;
-   case GL_BUFFER_USAGE_ARB:
-      *params = bufObj->Usage;
-      return;
-   case GL_BUFFER_ACCESS_ARB:
-      *params = simplified_access_mode(bufObj->AccessFlags);
-      return;
-   case GL_BUFFER_ACCESS_FLAGS:
-      if (ctx->VersionMajor < 3)
-         goto invalid_pname;
-      *params = bufObj->AccessFlags;
-      return;
-   case GL_BUFFER_MAPPED_ARB:
-      *params = _mesa_bufferobj_mapped(bufObj);
-      return;
-   case GL_BUFFER_MAP_OFFSET:
-      if (ctx->VersionMajor < 3)
-         goto invalid_pname;
-      *params = bufObj->Offset;
-      return;
-   case GL_BUFFER_MAP_LENGTH:
-      if (ctx->VersionMajor < 3)
-         goto invalid_pname;
-      *params = bufObj->Length;
-      return;
-   default:
-      ; /* fall-through */
-   }
-
-invalid_pname:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",
-               _mesa_lookup_enum_by_nr(pname));
-}
-
-
-void GLAPIENTRY
-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object * bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname != GL_BUFFER_MAP_POINTER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(pname)");
-      return;
-   }
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(target)" );
-      return;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );
-      return;
-   }
-
-   *params = bufObj->Pointer;
-}
-
-
-void GLAPIENTRY
-_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
-                        GLintptr readOffset, GLintptr writeOffset,
-                        GLsizeiptr size)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *src, *dst;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   src = get_buffer(ctx, readTarget);
-   if (!src || !_mesa_is_bufferobj(src)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);
-      return;
-   }
-
-   dst = get_buffer(ctx, writeTarget);
-   if (!dst || !_mesa_is_bufferobj(dst)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);
-      return;
-   }
-
-   if (_mesa_bufferobj_mapped(src)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyBuffserSubData(readBuffer is mapped)");
-      return;
-   }
-
-   if (_mesa_bufferobj_mapped(dst)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyBuffserSubData(writeBuffer is mapped)");
-      return;
-   }
-
-   if (readOffset < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBuffserSubData(readOffset = %d)", (int) readOffset);
-      return;
-   }
-
-   if (writeOffset < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBuffserSubData(writeOffset = %d)", (int) writeOffset);
-      return;
-   }
-
-   if (readOffset + size > src->Size) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBuffserSubData(readOffset + size = %d)",
-                  (int) (readOffset + size));
-      return;
-   }
-
-   if (writeOffset + size > dst->Size) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyBuffserSubData(writeOffset + size = %d)",
-                  (int) (writeOffset + size));
-      return;
-   }
-
-   if (src == dst) {
-      if (readOffset + size <= writeOffset) {
-         /* OK */
-      }
-      else if (writeOffset + size <= readOffset) {
-         /* OK */
-      }
-      else {
-         /* overlapping src/dst is illegal */
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyBuffserSubData(overlapping src/dst)");
-         return;
-      }
-   }
-
-   ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);
-}
-
-
-/**
- * See GL_ARB_map_buffer_range spec
- */
-void * GLAPIENTRY
-_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
-                     GLbitfield access)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   void *map;
-
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
-
-   if (!ctx->Extensions.ARB_map_buffer_range) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(extension not supported)");
-      return NULL;
-   }
-
-   if (offset < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset = %ld)", (long)offset);
-      return NULL;
-   }
-
-   if (length < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(length = %ld)", (long)length);
-      return NULL;
-   }
-
-   if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(access indicates neither read or write)");
-      return NULL;
-   }
-
-   if (access & GL_MAP_READ_BIT) {
-      if ((access & GL_MAP_INVALIDATE_RANGE_BIT) ||
-          (access & GL_MAP_INVALIDATE_BUFFER_BIT) ||
-          (access & GL_MAP_UNSYNCHRONIZED_BIT)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glMapBufferRange(invalid access flags)");
-         return NULL;
-      }
-   }
-
-   if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&
-       ((access & GL_MAP_WRITE_BIT) == 0)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(invalid access flags)");
-      return NULL;
-   }
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj || !_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glMapBufferRange(target = 0x%x)", target);
-      return NULL;
-   }
-
-   if (offset + length > bufObj->Size) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset + length > size)");
-      return NULL;
-   }
-
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(buffer already mapped)");
-      return NULL;
-   }
-      
-   ASSERT(ctx->Driver.MapBufferRange);
-   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
-                                    access, bufObj);
-   if (!map) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
-   }
-   else {
-      /* The driver callback should have set all these fields.
-       * This is important because other modules (like VBO) might call
-       * the driver function directly.
-       */
-      ASSERT(bufObj->Pointer == map);
-      ASSERT(bufObj->Length == length);
-      ASSERT(bufObj->Offset == offset);
-      ASSERT(bufObj->AccessFlags == access);
-   }
-
-   return map;
-}
-
-
-/**
- * See GL_ARB_map_buffer_range spec
- */
-void GLAPIENTRY
-_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_buffer_object *bufObj;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.ARB_map_buffer_range) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(extension not supported)");
-      return;
-   }
-
-   if (offset < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(offset = %ld)", (long)offset);
-      return;
-   }
-
-   if (length < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glMapBufferRange(length = %ld)", (long)length);
-      return;
-   }
-
-   bufObj = get_buffer(ctx, target);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glMapBufferRange(target = 0x%x)", target);
-      return;
-   }
-
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(current buffer is 0)");
-      return;
-   }
-
-   if (!_mesa_bufferobj_mapped(bufObj)) {
-      /* buffer is not mapped */
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(buffer is not mapped)");
-      return;
-   }
-
-   if ((bufObj->AccessFlags & GL_MAP_FLUSH_EXPLICIT_BIT) == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glMapBufferRange(GL_MAP_FLUSH_EXPLICIT_BIT not set)");
-      return;
-   }
-
-   if (offset + length > bufObj->Length) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-		  "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",
-		  (long)offset, (long)length, (long)bufObj->Length);
-      return;
-   }
-
-   ASSERT(bufObj->AccessFlags & GL_MAP_WRITE_BIT);
-
-   if (ctx->Driver.FlushMappedBufferRange)
-      ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);
-}
-
-
-#if FEATURE_APPLE_object_purgeable
-static GLenum
-_mesa_BufferObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
-{
-   struct gl_buffer_object *bufObj;
-   GLenum retval;
-
-   bufObj = _mesa_lookup_bufferobj(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectPurgeable(name = 0x%x)", name);
-      return 0;
-   }
-   if (!_mesa_is_bufferobj(bufObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glObjectPurgeable(buffer 0)" );
-      return 0;
-   }
-
-   if (bufObj->Purgeable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
-      return GL_VOLATILE_APPLE;
-   }
-
-   bufObj->Purgeable = GL_TRUE;
-
-   retval = GL_VOLATILE_APPLE;
-   if (ctx->Driver.BufferObjectPurgeable)
-      retval = ctx->Driver.BufferObjectPurgeable(ctx, bufObj, option);
-
-   return retval;
-}
-
-
-static GLenum
-_mesa_RenderObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
-{
-   struct gl_renderbuffer *bufObj;
-   GLenum retval;
-
-   bufObj = _mesa_lookup_renderbuffer(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   if (bufObj->Purgeable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
-      return GL_VOLATILE_APPLE;
-   }
-
-   bufObj->Purgeable = GL_TRUE;
-
-   retval = GL_VOLATILE_APPLE;
-   if (ctx->Driver.RenderObjectPurgeable)
-      retval = ctx->Driver.RenderObjectPurgeable(ctx, bufObj, option);
-
-   return retval;
-}
-
-
-static GLenum
-_mesa_TextureObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
-{
-   struct gl_texture_object *bufObj;
-   GLenum retval;
-
-   bufObj = _mesa_lookup_texture(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectPurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   if (bufObj->Purgeable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
-      return GL_VOLATILE_APPLE;
-   }
-
-   bufObj->Purgeable = GL_TRUE;
-
-   retval = GL_VOLATILE_APPLE;
-   if (ctx->Driver.TextureObjectPurgeable)
-      retval = ctx->Driver.TextureObjectPurgeable(ctx, bufObj, option);
-
-   return retval;
-}
-
-
-GLenum GLAPIENTRY
-_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
-{
-   GLenum retval;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   if (name == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectPurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   switch (option) {
-   case GL_VOLATILE_APPLE:
-   case GL_RELEASED_APPLE:
-      /* legal */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectPurgeable(name = 0x%x) invalid option: %d",
-                  name, option);
-      return 0;
-   }
-
-   switch (objectType) {
-   case GL_TEXTURE:
-      retval = _mesa_TextureObjectPurgeable (ctx, name, option);
-      break;
-   case GL_RENDERBUFFER_EXT:
-      retval = _mesa_RenderObjectPurgeable (ctx, name, option);
-      break;
-   case GL_BUFFER_OBJECT_APPLE:
-      retval = _mesa_BufferObjectPurgeable (ctx, name, option);
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectPurgeable(name = 0x%x) invalid type: %d",
-                  name, objectType);
-      return 0;
-   }
-
-   /* In strict conformance to the spec, we must only return VOLATILE when
-    * when passed the VOLATILE option. Madness.
-    *
-    * XXX First fix the spec, then fix me.
-    */
-   return option == GL_VOLATILE_APPLE ? GL_VOLATILE_APPLE : retval;
-}
-
-
-static GLenum
-_mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
-{
-   struct gl_buffer_object *bufObj;
-   GLenum retval;
-
-   bufObj = _mesa_lookup_bufferobj(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   if (! bufObj->Purgeable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectUnpurgeable(name = 0x%x) object is "
-                  " already \"unpurged\"", name);
-      return 0;
-   }
-
-   bufObj->Purgeable = GL_FALSE;
-
-   retval = option;
-   if (ctx->Driver.BufferObjectUnpurgeable)
-      retval = ctx->Driver.BufferObjectUnpurgeable(ctx, bufObj, option);
-
-   return retval;
-}
-
-
-static GLenum
-_mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
-{
-   struct gl_renderbuffer *bufObj;
-   GLenum retval;
-
-   bufObj = _mesa_lookup_renderbuffer(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   if (! bufObj->Purgeable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectUnpurgeable(name = 0x%x) object is "
-                  " already \"unpurged\"", name);
-      return 0;
-   }
-
-   bufObj->Purgeable = GL_FALSE;
-
-   retval = option;
-   if (ctx->Driver.RenderObjectUnpurgeable)
-      retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);
-
-   return retval;
-}
-
-
-static GLenum
-_mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
-{
-   struct gl_texture_object *bufObj;
-   GLenum retval;
-
-   bufObj = _mesa_lookup_texture(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   if (! bufObj->Purgeable) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectUnpurgeable(name = 0x%x) object is"
-                  " already \"unpurged\"", name);
-      return 0;
-   }
-
-   bufObj->Purgeable = GL_FALSE;
-
-   retval = option;
-   if (ctx->Driver.TextureObjectUnpurgeable)
-      retval = ctx->Driver.TextureObjectUnpurgeable(ctx, bufObj, option);
-
-   return retval;
-}
-
-
-GLenum GLAPIENTRY
-_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   if (name == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return 0;
-   }
-
-   switch (option) {
-   case GL_RETAINED_APPLE:
-   case GL_UNDEFINED_APPLE:
-      /* legal */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d",
-                  name, option);
-      return 0;
-   }
-
-   switch (objectType) {
-   case GL_BUFFER_OBJECT_APPLE:
-      return _mesa_BufferObjectUnpurgeable(ctx, name, option);
-   case GL_TEXTURE:
-      return _mesa_TextureObjectUnpurgeable(ctx, name, option);
-   case GL_RENDERBUFFER_EXT:
-      return _mesa_RenderObjectUnpurgeable(ctx, name, option);
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d",
-                  name, objectType);
-      return 0;
-   }
-}
-
-
-static void
-_mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
-                                      GLenum pname, GLint* params)
-{
-   struct gl_buffer_object *bufObj;
-
-   bufObj = _mesa_lookup_bufferobj(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetObjectParameteriv(name = 0x%x) invalid object", name);
-      return;
-   }
-
-   switch (pname) {
-   case GL_PURGEABLE_APPLE:
-      *params = bufObj->Purgeable;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
-                  name, pname);
-      break;
-   }
-}
-
-
-static void
-_mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
-                                      GLenum pname, GLint* params)
-{
-   struct gl_renderbuffer *bufObj;
-
-   bufObj = _mesa_lookup_renderbuffer(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return;
-   }
-
-   switch (pname) {
-   case GL_PURGEABLE_APPLE:
-      *params = bufObj->Purgeable;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
-                  name, pname);
-      break;
-   }
-}
-
-
-static void
-_mesa_GetTextureObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
-                                       GLenum pname, GLint* params)
-{
-   struct gl_texture_object *bufObj;
-
-   bufObj = _mesa_lookup_texture(ctx, name);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glObjectUnpurgeable(name = 0x%x)", name);
-      return;
-   }
-
-   switch (pname) {
-   case GL_PURGEABLE_APPLE:
-      *params = bufObj->Purgeable;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
-                  name, pname);
-      break;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,
-                                GLint* params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (name == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetObjectParameteriv(name = 0x%x)", name);
-      return;
-   }
-
-   switch (objectType) {
-   case GL_TEXTURE:
-      _mesa_GetTextureObjectParameterivAPPLE (ctx, name, pname, params);
-      break;
-   case GL_BUFFER_OBJECT_APPLE:
-      _mesa_GetBufferObjectParameterivAPPLE (ctx, name, pname, params);
-      break;
-   case GL_RENDERBUFFER_EXT:
-      _mesa_GetRenderObjectParameterivAPPLE (ctx, name, pname, params);
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d",
-                  name, objectType);
-   }
-}
-
-#endif /* FEATURE_APPLE_object_purgeable */
+/*

+ * 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 bufferobj.c

+ * \brief Functions for the GL_ARB_vertex/pixel_buffer_object extensions.

+ * \author Brian Paul, Ian Romanick

+ */

+

+

+#include "glheader.h"

+#include "enums.h"

+#include "hash.h"

+#include "imports.h"

+#include "image.h"

+#include "context.h"

+#include "bufferobj.h"

+#include "fbobject.h"

+#include "texobj.h"

+

+

+/* Debug flags */

+/*#define VBO_DEBUG*/

+/*#define BOUNDS_CHECK*/

+

+

+#if FEATURE_OES_mapbuffer

+#define DEFAULT_ACCESS GL_MAP_WRITE_BIT

+#else

+#define DEFAULT_ACCESS (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)

+#endif

+

+

+/**

+ * Used as a placeholder for buffer objects between glGenBuffers() and

+ * glBindBuffer() so that glIsBuffer() can work correctly.

+ */

+static struct gl_buffer_object DummyBufferObject;

+

+

+/**

+ * Return pointer to address of a buffer object target.

+ * \param ctx  the GL context

+ * \param target  the buffer object target to be retrieved.

+ * \return   pointer to pointer to the buffer object bound to \c target in the

+ *           specified context or \c NULL if \c target is invalid.

+ */

+static INLINE struct gl_buffer_object **

+get_buffer_target(struct gl_context *ctx, GLenum target)

+{

+   switch (target) {

+   case GL_ARRAY_BUFFER_ARB:

+      return &ctx->Array.ArrayBufferObj;

+   case GL_ELEMENT_ARRAY_BUFFER_ARB:

+      return &ctx->Array.ElementArrayBufferObj;

+   case GL_PIXEL_PACK_BUFFER_EXT:

+      return &ctx->Pack.BufferObj;

+   case GL_PIXEL_UNPACK_BUFFER_EXT:

+      return &ctx->Unpack.BufferObj;

+   case GL_COPY_READ_BUFFER:

+      return &ctx->CopyReadBuffer;

+   case GL_COPY_WRITE_BUFFER:

+      return &ctx->CopyWriteBuffer;

+#if FEATURE_EXT_transform_feedback

+   case GL_TRANSFORM_FEEDBACK_BUFFER:

+      if (ctx->Extensions.EXT_transform_feedback) {

+         return &ctx->TransformFeedback.CurrentBuffer;

+      }

+      break;

+#endif

+   default:

+      return NULL;

+   }

+   return NULL;

+}

+

+

+/**

+ * Get the buffer object bound to the specified target in a GL context.

+ * \param ctx  the GL context

+ * \param target  the buffer object target to be retrieved.

+ * \return   pointer to the buffer object bound to \c target in the

+ *           specified context or \c NULL if \c target is invalid.

+ */

+static INLINE struct gl_buffer_object *

+get_buffer(struct gl_context *ctx, GLenum target)

+{

+   struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);

+   if (bufObj)

+      return *bufObj;

+   return NULL;

+}

+

+

+/**

+ * Convert a GLbitfield describing the mapped buffer access flags

+ * into one of GL_READ_WRITE, GL_READ_ONLY, or GL_WRITE_ONLY.

+ */

+static GLenum

+simplified_access_mode(GLbitfield access)

+{

+   const GLbitfield rwFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;

+   if ((access & rwFlags) == rwFlags)

+      return GL_READ_WRITE;

+   if ((access & GL_MAP_READ_BIT) == GL_MAP_READ_BIT)

+      return GL_READ_ONLY;

+   if ((access & GL_MAP_WRITE_BIT) == GL_MAP_WRITE_BIT)

+      return GL_WRITE_ONLY;

+   return GL_READ_WRITE; /* this should never happen, but no big deal */

+}

+

+

+/**

+ * Tests the subdata range parameters and sets the GL error code for

+ * \c glBufferSubDataARB and \c glGetBufferSubDataARB.

+ *

+ * \param ctx     GL context.

+ * \param target  Buffer object target on which to operate.

+ * \param offset  Offset of the first byte of the subdata range.

+ * \param size    Size, in bytes, of the subdata range.

+ * \param caller  Name of calling function for recording errors.

+ * \return   A pointer to the buffer object bound to \c target in the

+ *           specified context or \c NULL if any of the parameter or state

+ *           conditions for \c glBufferSubDataARB or \c glGetBufferSubDataARB

+ *           are invalid.

+ *

+ * \sa glBufferSubDataARB, glGetBufferSubDataARB

+ */

+static struct gl_buffer_object *

+buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target, 

+                                  GLintptrARB offset, GLsizeiptrARB size,

+                                  const char *caller )

+{

+   struct gl_buffer_object *bufObj;

+

+   if (size < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", caller);

+      return NULL;

+   }

+

+   if (offset < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset < 0)", caller);

+      return NULL;

+   }

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);

+      return NULL;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);

+      return NULL;

+   }

+   if (offset + size > bufObj->Size) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+		  "%s(size + offset > buffer size)", caller);

+      return NULL;

+   }

+   if (_mesa_bufferobj_mapped(bufObj)) {

+      /* Buffer is currently mapped */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);

+      return NULL;

+   }

+

+   return bufObj;

+}

+

+

+/**

+ * Allocate and initialize a new buffer object.

+ * 

+ * Default callback for the \c dd_function_table::NewBufferObject() hook.

+ */

+static struct gl_buffer_object *

+_mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )

+{

+   struct gl_buffer_object *obj;

+

+   (void) ctx;

+

+   obj = MALLOC_STRUCT(gl_buffer_object);

+   _mesa_initialize_buffer_object(obj, name, target);

+   return obj;

+}

+

+

+/**

+ * Delete a buffer object.

+ * 

+ * Default callback for the \c dd_function_table::DeleteBuffer() hook.

+ */

+static void

+_mesa_delete_buffer_object( struct gl_context *ctx, struct gl_buffer_object *bufObj )

+{

+   (void) ctx;

+

+   if (bufObj->Data)

+      free(bufObj->Data);

+

+   /* assign strange values here to help w/ debugging */

+   bufObj->RefCount = -1000;

+   bufObj->Name = ~0;

+

+   _glthread_DESTROY_MUTEX(bufObj->Mutex);

+   free(bufObj);

+}

+

+

+

+/**

+ * Set ptr to bufObj w/ reference counting.

+ */

+void

+_mesa_reference_buffer_object(struct gl_context *ctx,

+                              struct gl_buffer_object **ptr,

+                              struct gl_buffer_object *bufObj)

+{

+   if (*ptr == bufObj)

+      return;

+

+   if (*ptr) {

+      /* Unreference the old buffer */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_buffer_object *oldObj = *ptr;

+

+      _glthread_LOCK_MUTEX(oldObj->Mutex);

+      ASSERT(oldObj->RefCount > 0);

+      oldObj->RefCount--;

+#if 0

+      printf("BufferObj %p %d DECR to %d\n",

+             (void *) oldObj, oldObj->Name, oldObj->RefCount);

+#endif

+      deleteFlag = (oldObj->RefCount == 0);

+      _glthread_UNLOCK_MUTEX(oldObj->Mutex);

+

+      if (deleteFlag) {

+

+         /* some sanity checking: don't delete a buffer still in use */

+#if 0

+         /* unfortunately, these tests are invalid during context tear-down */

+	 ASSERT(ctx->Array.ArrayBufferObj != bufObj);

+	 ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);

+	 ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);

+#endif

+

+	 ASSERT(ctx->Driver.DeleteBuffer);

+         ctx->Driver.DeleteBuffer(ctx, oldObj);

+      }

+

+      *ptr = NULL;

+   }

+   ASSERT(!*ptr);

+

+   if (bufObj) {

+      /* reference new buffer */

+      _glthread_LOCK_MUTEX(bufObj->Mutex);

+      if (bufObj->RefCount == 0) {

+         /* this buffer's being deleted (look just above) */

+         /* Not sure this can every really happen.  Warn if it does. */

+         _mesa_problem(NULL, "referencing deleted buffer object");

+         *ptr = NULL;

+      }

+      else {

+         bufObj->RefCount++;

+#if 0

+         printf("BufferObj %p %d INCR to %d\n",

+                (void *) bufObj, bufObj->Name, bufObj->RefCount);

+#endif

+         *ptr = bufObj;

+      }

+      _glthread_UNLOCK_MUTEX(bufObj->Mutex);

+   }

+}

+

+

+/**

+ * Initialize a buffer object to default values.

+ */

+void

+_mesa_initialize_buffer_object( struct gl_buffer_object *obj,

+				GLuint name, GLenum target )

+{

+   (void) target;

+

+   memset(obj, 0, sizeof(struct gl_buffer_object));

+   _glthread_INIT_MUTEX(obj->Mutex);

+   obj->RefCount = 1;

+   obj->Name = name;

+   obj->Usage = GL_STATIC_DRAW_ARB;

+   obj->AccessFlags = DEFAULT_ACCESS;

+}

+

+

+/**

+ * Allocate space for and store data in a buffer object.  Any data that was

+ * previously stored in the buffer object is lost.  If \c data is \c NULL,

+ * memory will be allocated, but no copy will occur.

+ *

+ * This is the default callback for \c dd_function_table::BufferData()

+ * Note that all GL error checking will have been done already.

+ *

+ * \param ctx     GL context.

+ * \param target  Buffer object target on which to operate.

+ * \param size    Size, in bytes, of the new data store.

+ * \param data    Pointer to the data to store in the buffer object.  This

+ *                pointer may be \c NULL.

+ * \param usage   Hints about how the data will be used.

+ * \param bufObj  Object to be used.

+ *

+ * \return GL_TRUE for success, GL_FALSE for failure

+ * \sa glBufferDataARB, dd_function_table::BufferData.

+ */

+static GLboolean

+_mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,

+		   const GLvoid * data, GLenum usage,

+		   struct gl_buffer_object * bufObj )

+{

+   void * new_data;

+

+   (void) ctx; (void) target;

+

+   new_data = _mesa_realloc( bufObj->Data, bufObj->Size, size );

+   if (new_data) {

+      bufObj->Data = (GLubyte *) new_data;

+      bufObj->Size = size;

+      bufObj->Usage = usage;

+

+      if (data) {

+	 memcpy( bufObj->Data, data, size );

+      }

+

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Replace data in a subrange of buffer object.  If the data range

+ * specified by \c size + \c offset extends beyond the end of the buffer or

+ * if \c data is \c NULL, no copy is performed.

+ *

+ * This is the default callback for \c dd_function_table::BufferSubData()

+ * Note that all GL error checking will have been done already.

+ *

+ * \param ctx     GL context.

+ * \param target  Buffer object target on which to operate.

+ * \param offset  Offset of the first byte to be modified.

+ * \param size    Size, in bytes, of the data range.

+ * \param data    Pointer to the data to store in the buffer object.

+ * \param bufObj  Object to be used.

+ *

+ * \sa glBufferSubDataARB, dd_function_table::BufferSubData.

+ */

+static void

+_mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,

+		      GLsizeiptrARB size, const GLvoid * data,

+		      struct gl_buffer_object * bufObj )

+{

+   (void) ctx; (void) target;

+

+   /* this should have been caught in _mesa_BufferSubData() */

+   ASSERT(size + offset <= bufObj->Size);

+

+   if (bufObj->Data) {

+      memcpy( (GLubyte *) bufObj->Data + offset, data, size );

+   }

+}

+

+

+/**

+ * Retrieve data from a subrange of buffer object.  If the data range

+ * specified by \c size + \c offset extends beyond the end of the buffer or

+ * if \c data is \c NULL, no copy is performed.

+ *

+ * This is the default callback for \c dd_function_table::GetBufferSubData()

+ * Note that all GL error checking will have been done already.

+ *

+ * \param ctx     GL context.

+ * \param target  Buffer object target on which to operate.

+ * \param offset  Offset of the first byte to be fetched.

+ * \param size    Size, in bytes, of the data range.

+ * \param data    Destination for data

+ * \param bufObj  Object to be used.

+ *

+ * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.

+ */

+static void

+_mesa_buffer_get_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,

+			  GLsizeiptrARB size, GLvoid * data,

+			  struct gl_buffer_object * bufObj )

+{

+   (void) ctx; (void) target;

+

+   if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {

+      memcpy( data, (GLubyte *) bufObj->Data + offset, size );

+   }

+}

+

+

+/**

+ * Default callback for \c dd_function_tabel::MapBuffer().

+ *

+ * The function parameters will have been already tested for errors.

+ *

+ * \param ctx     GL context.

+ * \param target  Buffer object target on which to operate.

+ * \param access  Information about how the buffer will be accessed.

+ * \param bufObj  Object to be mapped.

+ * \return  A pointer to the object's internal data store that can be accessed

+ *          by the processor

+ *

+ * \sa glMapBufferARB, dd_function_table::MapBuffer

+ */

+static void *

+_mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,

+		  struct gl_buffer_object *bufObj )

+{

+   (void) ctx;

+   (void) target;

+   (void) access;

+   /* Just return a direct pointer to the data */

+   if (_mesa_bufferobj_mapped(bufObj)) {

+      /* already mapped! */

+      return NULL;

+   }

+   bufObj->Pointer = bufObj->Data;

+   bufObj->Length = bufObj->Size;

+   bufObj->Offset = 0;

+   return bufObj->Pointer;

+}

+

+

+/**

+ * Default fallback for \c dd_function_table::MapBufferRange().

+ * Called via glMapBufferRange().

+ */

+static void *

+_mesa_buffer_map_range( struct gl_context *ctx, GLenum target, GLintptr offset,

+                        GLsizeiptr length, GLbitfield access,

+                        struct gl_buffer_object *bufObj )

+{

+   (void) ctx;

+   (void) target;

+   assert(!_mesa_bufferobj_mapped(bufObj));

+   /* Just return a direct pointer to the data */

+   bufObj->Pointer = bufObj->Data + offset;

+   bufObj->Length = length;

+   bufObj->Offset = offset;

+   bufObj->AccessFlags = access;

+   return bufObj->Pointer;

+}

+

+

+/**

+ * Default fallback for \c dd_function_table::FlushMappedBufferRange().

+ * Called via glFlushMappedBufferRange().

+ */

+static void

+_mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target, 

+                                 GLintptr offset, GLsizeiptr length,

+                                 struct gl_buffer_object *obj )

+{

+   (void) ctx;

+   (void) target;

+   (void) offset;

+   (void) length;

+   (void) obj;

+   /* no-op */

+}

+

+

+/**

+ * Default callback for \c dd_function_table::MapBuffer().

+ *

+ * The input parameters will have been already tested for errors.

+ *

+ * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer

+ */

+static GLboolean

+_mesa_buffer_unmap( struct gl_context *ctx, GLenum target,

+                    struct gl_buffer_object *bufObj )

+{

+   (void) ctx;

+   (void) target;

+   /* XXX we might assert here that bufObj->Pointer is non-null */

+   bufObj->Pointer = NULL;

+   bufObj->Length = 0;

+   bufObj->Offset = 0;

+   bufObj->AccessFlags = 0x0;

+   return GL_TRUE;

+}

+

+

+/**

+ * Default fallback for \c dd_function_table::CopyBufferSubData().

+ * Called via glCopyBuffserSubData().

+ */

+static void

+_mesa_copy_buffer_subdata(struct gl_context *ctx,

+                          struct gl_buffer_object *src,

+                          struct gl_buffer_object *dst,

+                          GLintptr readOffset, GLintptr writeOffset,

+                          GLsizeiptr size)

+{

+   GLubyte *srcPtr, *dstPtr;

+

+   /* buffer should not already be mapped */

+   assert(!_mesa_bufferobj_mapped(src));

+   assert(!_mesa_bufferobj_mapped(dst));

+

+   srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,

+                                              GL_READ_ONLY, src);

+   dstPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_WRITE_BUFFER,

+                                              GL_WRITE_ONLY, dst);

+

+   if (srcPtr && dstPtr)

+      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);

+

+   ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);

+   ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);

+}

+

+

+

+/**

+ * Initialize the state associated with buffer objects

+ */

+void

+_mesa_init_buffer_objects( struct gl_context *ctx )

+{

+   memset(&DummyBufferObject, 0, sizeof(DummyBufferObject));

+   DummyBufferObject.RefCount = 1000*1000*1000; /* never delete */

+

+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj,

+                                 ctx->Shared->NullBufferObj);

+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj,

+                                 ctx->Shared->NullBufferObj);

+

+   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer,

+                                 ctx->Shared->NullBufferObj);

+   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer,

+                                 ctx->Shared->NullBufferObj);

+}

+

+

+void

+_mesa_free_buffer_objects( struct gl_context *ctx )

+{

+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);

+

+   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer, NULL);

+   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer, NULL);

+}

+

+

+/**

+ * Bind the specified target to buffer for the specified context.

+ * Called by glBindBuffer() and other functions.

+ */

+static void

+bind_buffer_object(struct gl_context *ctx, GLenum target, GLuint buffer)

+{

+   struct gl_buffer_object *oldBufObj;

+   struct gl_buffer_object *newBufObj = NULL;

+   struct gl_buffer_object **bindTarget = NULL;

+

+   bindTarget = get_buffer_target(ctx, target);

+   if (!bindTarget) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)", target);

+      return;

+   }

+

+   /* Get pointer to old buffer object (to be unbound) */

+   oldBufObj = *bindTarget;

+   if (oldBufObj && oldBufObj->Name == buffer)

+      return;   /* rebinding the same buffer object- no change */

+

+   /*

+    * Get pointer to new buffer object (newBufObj)

+    */

+   if (buffer == 0) {

+      /* The spec says there's not a buffer object named 0, but we use

+       * one internally because it simplifies things.

+       */

+      newBufObj = ctx->Shared->NullBufferObj;

+   }

+   else {

+      /* non-default buffer object */

+      newBufObj = _mesa_lookup_bufferobj(ctx, buffer);

+      if (!newBufObj || newBufObj == &DummyBufferObject) {

+         /* If this is a new buffer object id, or one which was generated but

+          * never used before, allocate a buffer object now.

+          */

+         ASSERT(ctx->Driver.NewBufferObject);

+         newBufObj = ctx->Driver.NewBufferObject(ctx, buffer, target);

+         if (!newBufObj) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");

+            return;

+         }

+         _mesa_HashInsert(ctx->Shared->BufferObjects, buffer, newBufObj);

+      }

+   }

+   

+   /* bind new buffer */

+   _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);

+

+   /* Pass BindBuffer call to device driver */

+   if (ctx->Driver.BindBuffer)

+      ctx->Driver.BindBuffer( ctx, target, newBufObj );

+}

+

+

+/**

+ * Update the default buffer objects in the given context to reference those

+ * specified in the shared state and release those referencing the old 

+ * shared state.

+ */

+void

+_mesa_update_default_objects_buffer_objects(struct gl_context *ctx)

+{

+   /* Bind the NullBufferObj to remove references to those

+    * in the shared context hash table.

+    */

+   bind_buffer_object( ctx, GL_ARRAY_BUFFER_ARB, 0);

+   bind_buffer_object( ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, 0);

+   bind_buffer_object( ctx, GL_PIXEL_PACK_BUFFER_ARB, 0);

+   bind_buffer_object( ctx, GL_PIXEL_UNPACK_BUFFER_ARB, 0);

+}

+

+

+/**

+ * When we're about to read pixel data out of a PBO (via glDrawPixels,

+ * glTexImage, etc) or write data into a PBO (via glReadPixels,

+ * glGetTexImage, etc) we call this function to check that we're not

+ * going to read out of bounds.

+ *

+ * XXX This would also be a convenient time to check that the PBO isn't

+ * currently mapped.  Whoever calls this function should check for that.

+ * Remember, we can't use a PBO when it's mapped!

+ *

+ * If we're not using a PBO, this is a no-op.

+ *

+ * \param width  width of image to read/write

+ * \param height  height of image to read/write

+ * \param depth  depth of image to read/write

+ * \param format  format of image to read/write

+ * \param type  datatype of image to read/write

+ * \param ptr  the user-provided pointer/offset

+ * \return GL_TRUE if the PBO access is OK, GL_FALSE if the access would

+ *         go out of bounds.

+ */

+GLboolean

+_mesa_validate_pbo_access(GLuint dimensions,

+                          const struct gl_pixelstore_attrib *pack,

+                          GLsizei width, GLsizei height, GLsizei depth,

+                          GLenum format, GLenum type, const GLvoid *ptr)

+{

+   GLvoid *start, *end;

+   const GLubyte *sizeAddr; /* buffer size, cast to a pointer */

+

+   if (!_mesa_is_bufferobj(pack->BufferObj))

+      return GL_TRUE;  /* no PBO, OK */

+

+   if (pack->BufferObj->Size == 0)

+      /* no buffer! */

+      return GL_FALSE;

+

+   /* get address of first pixel we'll read */

+   start = _mesa_image_address(dimensions, pack, ptr, width, height,

+                               format, type, 0, 0, 0);

+

+   /* get address just past the last pixel we'll read */

+   end =  _mesa_image_address(dimensions, pack, ptr, width, height,

+                              format, type, depth-1, height-1, width);

+

+

+   sizeAddr = ((const GLubyte *) 0) + pack->BufferObj->Size;

+

+   if ((const GLubyte *) start > sizeAddr) {

+      /* This will catch negative values / wrap-around */

+      return GL_FALSE;

+   }

+   if ((const GLubyte *) end > sizeAddr) {

+      /* Image read goes beyond end of buffer */

+      return GL_FALSE;

+   }

+

+   /* OK! */

+   return GL_TRUE;

+}

+

+

+/**

+ * For commands that read from a PBO (glDrawPixels, glTexImage,

+ * glPolygonStipple, etc), if we're reading from a PBO, map it read-only

+ * and return the pointer into the PBO.  If we're not reading from a

+ * PBO, return \p src as-is.

+ * If non-null return, must call _mesa_unmap_pbo_source() when done.

+ *

+ * \return NULL if error, else pointer to start of data

+ */

+const GLvoid *

+_mesa_map_pbo_source(struct gl_context *ctx,

+                     const struct gl_pixelstore_attrib *unpack,

+                     const GLvoid *src)

+{

+   const GLubyte *buf;

+

+   if (_mesa_is_bufferobj(unpack->BufferObj)) {

+      /* unpack from PBO */

+      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                                              GL_READ_ONLY_ARB,

+                                              unpack->BufferObj);

+      if (!buf)

+         return NULL;

+

+      buf = ADD_POINTERS(buf, src);

+   }

+   else {

+      /* unpack from normal memory */

+      buf = src;

+   }

+

+   return buf;

+}

+

+

+/**

+ * Combine PBO-read validation and mapping.

+ * If any GL errors are detected, they'll be recorded and NULL returned.

+ * \sa _mesa_validate_pbo_access

+ * \sa _mesa_map_pbo_source

+ * A call to this function should have a matching call to

+ * _mesa_unmap_pbo_source().

+ */

+const GLvoid *

+_mesa_map_validate_pbo_source(struct gl_context *ctx,

+                              GLuint dimensions,

+                              const struct gl_pixelstore_attrib *unpack,

+                              GLsizei width, GLsizei height, GLsizei depth,

+                              GLenum format, GLenum type, const GLvoid *ptr,

+                              const char *where)

+{

+   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);

+

+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {

+      /* non-PBO access: no validation to be done */

+      return ptr;

+   }

+

+   if (!_mesa_validate_pbo_access(dimensions, unpack,

+                                  width, height, depth, format, type, ptr)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "%s(out of bounds PBO access)", where);

+      return NULL;

+   }

+

+   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {

+      /* buffer is already mapped - that's an error */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);

+      return NULL;

+   }

+

+   ptr = _mesa_map_pbo_source(ctx, unpack, ptr);

+   return ptr;

+}

+

+

+/**

+ * Counterpart to _mesa_map_pbo_source()

+ */

+void

+_mesa_unmap_pbo_source(struct gl_context *ctx,

+                       const struct gl_pixelstore_attrib *unpack)

+{

+   ASSERT(unpack != &ctx->Pack); /* catch pack/unpack mismatch */

+   if (_mesa_is_bufferobj(unpack->BufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                              unpack->BufferObj);

+   }

+}

+

+

+/**

+ * For commands that write to a PBO (glReadPixels, glGetColorTable, etc),

+ * if we're writing to a PBO, map it write-only and return the pointer

+ * into the PBO.  If we're not writing to a PBO, return \p dst as-is.

+ * If non-null return, must call _mesa_unmap_pbo_dest() when done.

+ *

+ * \return NULL if error, else pointer to start of data

+ */

+void *

+_mesa_map_pbo_dest(struct gl_context *ctx,

+                   const struct gl_pixelstore_attrib *pack,

+                   GLvoid *dest)

+{

+   void *buf;

+

+   if (_mesa_is_bufferobj(pack->BufferObj)) {

+      /* pack into PBO */

+      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,

+                                              GL_WRITE_ONLY_ARB,

+                                              pack->BufferObj);

+      if (!buf)

+         return NULL;

+

+      buf = ADD_POINTERS(buf, dest);

+   }

+   else {

+      /* pack to normal memory */

+      buf = dest;

+   }

+

+   return buf;

+}

+

+

+/**

+ * Combine PBO-write validation and mapping.

+ * If any GL errors are detected, they'll be recorded and NULL returned.

+ * \sa _mesa_validate_pbo_access

+ * \sa _mesa_map_pbo_dest

+ * A call to this function should have a matching call to

+ * _mesa_unmap_pbo_dest().

+ */

+GLvoid *

+_mesa_map_validate_pbo_dest(struct gl_context *ctx,

+                            GLuint dimensions,

+                            const struct gl_pixelstore_attrib *unpack,

+                            GLsizei width, GLsizei height, GLsizei depth,

+                            GLenum format, GLenum type, GLvoid *ptr,

+                            const char *where)

+{

+   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);

+

+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {

+      /* non-PBO access: no validation to be done */

+      return ptr;

+   }

+

+   if (!_mesa_validate_pbo_access(dimensions, unpack,

+                                  width, height, depth, format, type, ptr)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "%s(out of bounds PBO access)", where);

+      return NULL;

+   }

+

+   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {

+      /* buffer is already mapped - that's an error */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);

+      return NULL;

+   }

+

+   ptr = _mesa_map_pbo_dest(ctx, unpack, ptr);

+   return ptr;

+}

+

+

+/**

+ * Counterpart to _mesa_map_pbo_dest()

+ */

+void

+_mesa_unmap_pbo_dest(struct gl_context *ctx,

+                     const struct gl_pixelstore_attrib *pack)

+{

+   ASSERT(pack != &ctx->Unpack); /* catch pack/unpack mismatch */

+   if (_mesa_is_bufferobj(pack->BufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, pack->BufferObj);

+   }

+}

+

+

+

+/**

+ * Return the gl_buffer_object for the given ID.

+ * Always return NULL for ID 0.

+ */

+struct gl_buffer_object *

+_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer)

+{

+   if (buffer == 0)

+      return NULL;

+   else

+      return (struct gl_buffer_object *)

+         _mesa_HashLookup(ctx->Shared->BufferObjects, buffer);

+}

+

+

+/**

+ * If *ptr points to obj, set ptr = the Null/default buffer object.

+ * This is a helper for buffer object deletion.

+ * The GL spec says that deleting a buffer object causes it to get

+ * unbound from all arrays in the current context.

+ */

+static void

+unbind(struct gl_context *ctx,

+       struct gl_buffer_object **ptr,

+       struct gl_buffer_object *obj)

+{

+   if (*ptr == obj) {

+      _mesa_reference_buffer_object(ctx, ptr, ctx->Shared->NullBufferObj);

+   }

+}

+

+

+/**

+ * Plug default/fallback buffer object functions into the device

+ * driver hooks.

+ */

+void

+_mesa_init_buffer_object_functions(struct dd_function_table *driver)

+{

+   /* GL_ARB_vertex/pixel_buffer_object */

+   driver->NewBufferObject = _mesa_new_buffer_object;

+   driver->DeleteBuffer = _mesa_delete_buffer_object;

+   driver->BindBuffer = NULL;

+   driver->BufferData = _mesa_buffer_data;

+   driver->BufferSubData = _mesa_buffer_subdata;

+   driver->GetBufferSubData = _mesa_buffer_get_subdata;

+   driver->MapBuffer = _mesa_buffer_map;

+   driver->UnmapBuffer = _mesa_buffer_unmap;

+

+   /* GL_ARB_map_buffer_range */

+   driver->MapBufferRange = _mesa_buffer_map_range;

+   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;

+

+   /* GL_ARB_copy_buffer */

+   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;

+}

+

+

+

+/**********************************************************************/

+/* API Functions                                                      */

+/**********************************************************************/

+

+void GLAPIENTRY

+_mesa_BindBufferARB(GLenum target, GLuint buffer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   bind_buffer_object(ctx, target, buffer);

+}

+

+

+/**

+ * Delete a set of buffer objects.

+ * 

+ * \param n      Number of buffer objects to delete.

+ * \param ids    Array of \c n buffer object IDs.

+ */

+void GLAPIENTRY

+_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLsizei i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteBuffersARB(n)");

+      return;

+   }

+

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+

+   for (i = 0; i < n; i++) {

+      struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, ids[i]);

+      if (bufObj) {

+         struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+         GLuint j;

+

+         ASSERT(bufObj->Name == ids[i] || bufObj == &DummyBufferObject);

+

+         if (_mesa_bufferobj_mapped(bufObj)) {

+            /* if mapped, unmap it now */

+            ctx->Driver.UnmapBuffer(ctx, 0, bufObj);

+            bufObj->AccessFlags = DEFAULT_ACCESS;

+            bufObj->Pointer = NULL;

+         }

+

+         /* unbind any vertex pointers bound to this buffer */

+         unbind(ctx, &arrayObj->Vertex.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->Weight.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->Normal.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->Color.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->SecondaryColor.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->FogCoord.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->Index.BufferObj, bufObj);

+         unbind(ctx, &arrayObj->EdgeFlag.BufferObj, bufObj);

+         for (j = 0; j < Elements(arrayObj->TexCoord); j++) {

+            unbind(ctx, &arrayObj->TexCoord[j].BufferObj, bufObj);

+         }

+         for (j = 0; j < Elements(arrayObj->VertexAttrib); j++) {

+            unbind(ctx, &arrayObj->VertexAttrib[j].BufferObj, bufObj);

+         }

+

+         if (ctx->Array.ArrayBufferObj == bufObj) {

+            _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );

+         }

+         if (ctx->Array.ElementArrayBufferObj == bufObj) {

+            _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );

+         }

+

+         /* unbind any pixel pack/unpack pointers bound to this buffer */

+         if (ctx->Pack.BufferObj == bufObj) {

+            _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );

+         }

+         if (ctx->Unpack.BufferObj == bufObj) {

+            _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );

+         }

+

+         /* The ID is immediately freed for re-use */

+         _mesa_HashRemove(ctx->Shared->BufferObjects, ids[i]);

+         _mesa_reference_buffer_object(ctx, &bufObj, NULL);

+      }

+   }

+

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+}

+

+

+/**

+ * Generate a set of unique buffer object IDs and store them in \c buffer.

+ * 

+ * \param n       Number of IDs to generate.

+ * \param buffer  Array of \c n locations to store the IDs.

+ */

+void GLAPIENTRY

+_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint first;

+   GLint i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenBuffersARB");

+      return;

+   }

+

+   if (!buffer) {

+      return;

+   }

+

+   /*

+    * This must be atomic (generation and allocation of buffer object IDs)

+    */

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->BufferObjects, n);

+

+   /* Insert the ID and pointer to dummy buffer object into hash table */

+   for (i = 0; i < n; i++) {

+      _mesa_HashInsert(ctx->Shared->BufferObjects, first + i,

+                       &DummyBufferObject);

+      buffer[i] = first + i;

+   }

+

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+}

+

+

+/**

+ * Determine if ID is the name of a buffer object.

+ * 

+ * \param id  ID of the potential buffer object.

+ * \return  \c GL_TRUE if \c id is the name of a buffer object, 

+ *          \c GL_FALSE otherwise.

+ */

+GLboolean GLAPIENTRY

+_mesa_IsBufferARB(GLuint id)

+{

+   struct gl_buffer_object *bufObj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+   bufObj = _mesa_lookup_bufferobj(ctx, id);

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+   return bufObj && bufObj != &DummyBufferObject;

+}

+

+

+void GLAPIENTRY

+_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,

+                    const GLvoid * data, GLenum usage)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (size < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferDataARB(size < 0)");

+      return;

+   }

+

+   switch (usage) {

+   case GL_STREAM_DRAW_ARB:

+   case GL_STREAM_READ_ARB:

+   case GL_STREAM_COPY_ARB:

+   case GL_STATIC_DRAW_ARB:

+   case GL_STATIC_READ_ARB:

+   case GL_STATIC_COPY_ARB:

+   case GL_DYNAMIC_DRAW_ARB:

+   case GL_DYNAMIC_READ_ARB:

+   case GL_DYNAMIC_COPY_ARB:

+      /* OK */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");

+      return;

+   }

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(target)" );

+      return;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );

+      return;

+   }

+   

+   if (_mesa_bufferobj_mapped(bufObj)) {

+      /* Unmap the existing buffer.  We'll replace it now.  Not an error. */

+      ctx->Driver.UnmapBuffer(ctx, target, bufObj);

+      bufObj->AccessFlags = DEFAULT_ACCESS;

+      ASSERT(bufObj->Pointer == NULL);

+   }  

+

+   FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);

+

+   bufObj->Written = GL_TRUE;

+

+#ifdef VBO_DEBUG

+   printf("glBufferDataARB(%u, sz %ld, from %p, usage 0x%x)\n",

+                bufObj->Name, size, data, usage);

+#endif

+

+#ifdef BOUNDS_CHECK

+   size += 100;

+#endif

+

+   ASSERT(ctx->Driver.BufferData);

+   if (!ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj )) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB()");

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,

+                       GLsizeiptrARB size, const GLvoid * data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,

+                                              "glBufferSubDataARB" );

+   if (!bufObj) {

+      /* error already recorded */

+      return;

+   }

+

+   if (size == 0)

+      return;

+

+   bufObj->Written = GL_TRUE;

+

+   ASSERT(ctx->Driver.BufferSubData);

+   ctx->Driver.BufferSubData( ctx, target, offset, size, data, bufObj );

+}

+

+

+void GLAPIENTRY

+_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,

+                          GLsizeiptrARB size, void * data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,

+                                              "glGetBufferSubDataARB" );

+   if (!bufObj) {

+      /* error already recorded */

+      return;

+   }

+

+   ASSERT(ctx->Driver.GetBufferSubData);

+   ctx->Driver.GetBufferSubData( ctx, target, offset, size, data, bufObj );

+}

+

+

+void * GLAPIENTRY

+_mesa_MapBufferARB(GLenum target, GLenum access)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object * bufObj;

+   GLbitfield accessFlags;

+   void *map;

+

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

+

+   switch (access) {

+   case GL_READ_ONLY_ARB:

+      accessFlags = GL_MAP_READ_BIT;

+      break;

+   case GL_WRITE_ONLY_ARB:

+      accessFlags = GL_MAP_WRITE_BIT;

+      break;

+   case GL_READ_WRITE_ARB:

+      accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");

+      return NULL;

+   }

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)" );

+      return NULL;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );

+      return NULL;

+   }

+   if (_mesa_bufferobj_mapped(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");

+      return NULL;

+   }

+

+   ASSERT(ctx->Driver.MapBuffer);

+   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );

+   if (!map) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");

+      return NULL;

+   }

+   else {

+      /* The driver callback should have set these fields.

+       * This is important because other modules (like VBO) might call

+       * the driver function directly.

+       */

+      ASSERT(bufObj->Pointer == map);

+      ASSERT(bufObj->Length == bufObj->Size);

+      ASSERT(bufObj->Offset == 0);

+      bufObj->AccessFlags = accessFlags;

+   }

+

+   if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)

+      bufObj->Written = GL_TRUE;

+

+#ifdef VBO_DEBUG

+   printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",

+	  bufObj->Name, bufObj->Size, access);

+   if (access == GL_WRITE_ONLY_ARB) {

+      GLuint i;

+      GLubyte *b = (GLubyte *) bufObj->Pointer;

+      for (i = 0; i < bufObj->Size; i++)

+         b[i] = i & 0xff;

+   }

+#endif

+

+#ifdef BOUNDS_CHECK

+   {

+      GLubyte *buf = (GLubyte *) bufObj->Pointer;

+      GLuint i;

+      /* buffer is 100 bytes larger than requested, fill with magic value */

+      for (i = 0; i < 100; i++) {

+         buf[bufObj->Size - i - 1] = 123;

+      }

+   }

+#endif

+

+   return bufObj->Pointer;

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_UnmapBufferARB(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   GLboolean status = GL_TRUE;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glUnmapBufferARB(target)" );

+      return GL_FALSE;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );

+      return GL_FALSE;

+   }

+   if (!_mesa_bufferobj_mapped(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");

+      return GL_FALSE;

+   }

+

+#ifdef BOUNDS_CHECK

+   if (bufObj->Access != GL_READ_ONLY_ARB) {

+      GLubyte *buf = (GLubyte *) bufObj->Pointer;

+      GLuint i;

+      /* check that last 100 bytes are still = magic value */

+      for (i = 0; i < 100; i++) {

+         GLuint pos = bufObj->Size - i - 1;

+         if (buf[pos] != 123) {

+            _mesa_warning(ctx, "Out of bounds buffer object write detected"

+                          " at position %d (value = %u)\n",

+                          pos, buf[pos]);

+         }

+      }

+   }

+#endif

+

+#ifdef VBO_DEBUG

+   if (bufObj->AccessFlags & GL_MAP_WRITE_BIT) {

+      GLuint i, unchanged = 0;

+      GLubyte *b = (GLubyte *) bufObj->Pointer;

+      GLint pos = -1;

+      /* check which bytes changed */

+      for (i = 0; i < bufObj->Size - 1; i++) {

+         if (b[i] == (i & 0xff) && b[i+1] == ((i+1) & 0xff)) {

+            unchanged++;

+            if (pos == -1)

+               pos = i;

+         }

+      }

+      if (unchanged) {

+         printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",

+                      bufObj->Name, unchanged, bufObj->Size, pos);

+      }

+   }

+#endif

+

+   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );

+   bufObj->AccessFlags = DEFAULT_ACCESS;

+   ASSERT(bufObj->Pointer == NULL);

+   ASSERT(bufObj->Offset == 0);

+   ASSERT(bufObj->Length == 0);

+

+   return status;

+}

+

+

+void GLAPIENTRY

+_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(target)" );

+      return;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameterivARB" );

+      return;

+   }

+

+   switch (pname) {

+   case GL_BUFFER_SIZE_ARB:

+      *params = (GLint) bufObj->Size;

+      return;

+   case GL_BUFFER_USAGE_ARB:

+      *params = bufObj->Usage;

+      return;

+   case GL_BUFFER_ACCESS_ARB:

+      *params = simplified_access_mode(bufObj->AccessFlags);

+      return;

+   case GL_BUFFER_MAPPED_ARB:

+      *params = _mesa_bufferobj_mapped(bufObj);

+      return;

+   case GL_BUFFER_ACCESS_FLAGS:

+      if (ctx->VersionMajor < 3)

+         goto invalid_pname;

+      *params = bufObj->AccessFlags;

+      return;

+   case GL_BUFFER_MAP_OFFSET:

+      if (ctx->VersionMajor < 3)

+         goto invalid_pname;

+      *params = (GLint) bufObj->Offset;

+      return;

+   case GL_BUFFER_MAP_LENGTH:

+      if (ctx->VersionMajor < 3)

+         goto invalid_pname;

+      *params = (GLint) bufObj->Length;

+      return;

+   default:

+      ; /* fall-through */

+   }

+

+invalid_pname:

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",

+               _mesa_lookup_enum_by_nr(pname));

+}

+

+

+/**

+ * New in GL 3.2

+ * This is pretty much a duplicate of GetBufferParameteriv() but the

+ * GL_BUFFER_SIZE_ARB attribute will be 64-bits on a 64-bit system.

+ */

+void GLAPIENTRY

+_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(target)" );

+      return;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameteri64v" );

+      return;

+   }

+

+   switch (pname) {

+   case GL_BUFFER_SIZE_ARB:

+      *params = bufObj->Size;

+      return;

+   case GL_BUFFER_USAGE_ARB:

+      *params = bufObj->Usage;

+      return;

+   case GL_BUFFER_ACCESS_ARB:

+      *params = simplified_access_mode(bufObj->AccessFlags);

+      return;

+   case GL_BUFFER_ACCESS_FLAGS:

+      if (ctx->VersionMajor < 3)

+         goto invalid_pname;

+      *params = bufObj->AccessFlags;

+      return;

+   case GL_BUFFER_MAPPED_ARB:

+      *params = _mesa_bufferobj_mapped(bufObj);

+      return;

+   case GL_BUFFER_MAP_OFFSET:

+      if (ctx->VersionMajor < 3)

+         goto invalid_pname;

+      *params = bufObj->Offset;

+      return;

+   case GL_BUFFER_MAP_LENGTH:

+      if (ctx->VersionMajor < 3)

+         goto invalid_pname;

+      *params = bufObj->Length;

+      return;

+   default:

+      ; /* fall-through */

+   }

+

+invalid_pname:

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",

+               _mesa_lookup_enum_by_nr(pname));

+}

+

+

+void GLAPIENTRY

+_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object * bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname != GL_BUFFER_MAP_POINTER_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(pname)");

+      return;

+   }

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(target)" );

+      return;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );

+      return;

+   }

+

+   *params = bufObj->Pointer;

+}

+

+

+void GLAPIENTRY

+_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,

+                        GLintptr readOffset, GLintptr writeOffset,

+                        GLsizeiptr size)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *src, *dst;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   src = get_buffer(ctx, readTarget);

+   if (!src || !_mesa_is_bufferobj(src)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);

+      return;

+   }

+

+   dst = get_buffer(ctx, writeTarget);

+   if (!dst || !_mesa_is_bufferobj(dst)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);

+      return;

+   }

+

+   if (_mesa_bufferobj_mapped(src)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyBuffserSubData(readBuffer is mapped)");

+      return;

+   }

+

+   if (_mesa_bufferobj_mapped(dst)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyBuffserSubData(writeBuffer is mapped)");

+      return;

+   }

+

+   if (readOffset < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyBuffserSubData(readOffset = %d)", (int) readOffset);

+      return;

+   }

+

+   if (writeOffset < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyBuffserSubData(writeOffset = %d)", (int) writeOffset);

+      return;

+   }

+

+   if (readOffset + size > src->Size) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyBuffserSubData(readOffset + size = %d)",

+                  (int) (readOffset + size));

+      return;

+   }

+

+   if (writeOffset + size > dst->Size) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyBuffserSubData(writeOffset + size = %d)",

+                  (int) (writeOffset + size));

+      return;

+   }

+

+   if (src == dst) {

+      if (readOffset + size <= writeOffset) {

+         /* OK */

+      }

+      else if (writeOffset + size <= readOffset) {

+         /* OK */

+      }

+      else {

+         /* overlapping src/dst is illegal */

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyBuffserSubData(overlapping src/dst)");

+         return;

+      }

+   }

+

+   ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);

+}

+

+

+/**

+ * See GL_ARB_map_buffer_range spec

+ */

+void * GLAPIENTRY

+_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,

+                     GLbitfield access)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   void *map;

+

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

+

+   if (!ctx->Extensions.ARB_map_buffer_range) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(extension not supported)");

+      return NULL;

+   }

+

+   if (offset < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glMapBufferRange(offset = %ld)", (long)offset);

+      return NULL;

+   }

+

+   if (length < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glMapBufferRange(length = %ld)", (long)length);

+      return NULL;

+   }

+

+   if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(access indicates neither read or write)");

+      return NULL;

+   }

+

+   if (access & GL_MAP_READ_BIT) {

+      if ((access & GL_MAP_INVALIDATE_RANGE_BIT) ||

+          (access & GL_MAP_INVALIDATE_BUFFER_BIT) ||

+          (access & GL_MAP_UNSYNCHRONIZED_BIT)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glMapBufferRange(invalid access flags)");

+         return NULL;

+      }

+   }

+

+   if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&

+       ((access & GL_MAP_WRITE_BIT) == 0)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(invalid access flags)");

+      return NULL;

+   }

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj || !_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glMapBufferRange(target = 0x%x)", target);

+      return NULL;

+   }

+

+   if (offset + length > bufObj->Size) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glMapBufferRange(offset + length > size)");

+      return NULL;

+   }

+

+   if (_mesa_bufferobj_mapped(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(buffer already mapped)");

+      return NULL;

+   }

+      

+   ASSERT(ctx->Driver.MapBufferRange);

+   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,

+                                    access, bufObj);

+   if (!map) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");

+   }

+   else {

+      /* The driver callback should have set all these fields.

+       * This is important because other modules (like VBO) might call

+       * the driver function directly.

+       */

+      ASSERT(bufObj->Pointer == map);

+      ASSERT(bufObj->Length == length);

+      ASSERT(bufObj->Offset == offset);

+      ASSERT(bufObj->AccessFlags == access);

+   }

+

+   return map;

+}

+

+

+/**

+ * See GL_ARB_map_buffer_range spec

+ */

+void GLAPIENTRY

+_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_buffer_object *bufObj;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.ARB_map_buffer_range) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(extension not supported)");

+      return;

+   }

+

+   if (offset < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glMapBufferRange(offset = %ld)", (long)offset);

+      return;

+   }

+

+   if (length < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glMapBufferRange(length = %ld)", (long)length);

+      return;

+   }

+

+   bufObj = get_buffer(ctx, target);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glMapBufferRange(target = 0x%x)", target);

+      return;

+   }

+

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(current buffer is 0)");

+      return;

+   }

+

+   if (!_mesa_bufferobj_mapped(bufObj)) {

+      /* buffer is not mapped */

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(buffer is not mapped)");

+      return;

+   }

+

+   if ((bufObj->AccessFlags & GL_MAP_FLUSH_EXPLICIT_BIT) == 0) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glMapBufferRange(GL_MAP_FLUSH_EXPLICIT_BIT not set)");

+      return;

+   }

+

+   if (offset + length > bufObj->Length) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+		  "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",

+		  (long)offset, (long)length, (long)bufObj->Length);

+      return;

+   }

+

+   ASSERT(bufObj->AccessFlags & GL_MAP_WRITE_BIT);

+

+   if (ctx->Driver.FlushMappedBufferRange)

+      ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);

+}

+

+

+#if FEATURE_APPLE_object_purgeable

+static GLenum

+_mesa_BufferObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)

+{

+   struct gl_buffer_object *bufObj;

+   GLenum retval;

+

+   bufObj = _mesa_lookup_bufferobj(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectPurgeable(name = 0x%x)", name);

+      return 0;

+   }

+   if (!_mesa_is_bufferobj(bufObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glObjectPurgeable(buffer 0)" );

+      return 0;

+   }

+

+   if (bufObj->Purgeable) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);

+      return GL_VOLATILE_APPLE;

+   }

+

+   bufObj->Purgeable = GL_TRUE;

+

+   retval = GL_VOLATILE_APPLE;

+   if (ctx->Driver.BufferObjectPurgeable)

+      retval = ctx->Driver.BufferObjectPurgeable(ctx, bufObj, option);

+

+   return retval;

+}

+

+

+static GLenum

+_mesa_RenderObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)

+{

+   struct gl_renderbuffer *bufObj;

+   GLenum retval;

+

+   bufObj = _mesa_lookup_renderbuffer(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   if (bufObj->Purgeable) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);

+      return GL_VOLATILE_APPLE;

+   }

+

+   bufObj->Purgeable = GL_TRUE;

+

+   retval = GL_VOLATILE_APPLE;

+   if (ctx->Driver.RenderObjectPurgeable)

+      retval = ctx->Driver.RenderObjectPurgeable(ctx, bufObj, option);

+

+   return retval;

+}

+

+

+static GLenum

+_mesa_TextureObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)

+{

+   struct gl_texture_object *bufObj;

+   GLenum retval;

+

+   bufObj = _mesa_lookup_texture(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectPurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   if (bufObj->Purgeable) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);

+      return GL_VOLATILE_APPLE;

+   }

+

+   bufObj->Purgeable = GL_TRUE;

+

+   retval = GL_VOLATILE_APPLE;

+   if (ctx->Driver.TextureObjectPurgeable)

+      retval = ctx->Driver.TextureObjectPurgeable(ctx, bufObj, option);

+

+   return retval;

+}

+

+

+GLenum GLAPIENTRY

+_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)

+{

+   GLenum retval;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   if (name == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectPurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   switch (option) {

+   case GL_VOLATILE_APPLE:

+   case GL_RELEASED_APPLE:

+      /* legal */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glObjectPurgeable(name = 0x%x) invalid option: %d",

+                  name, option);

+      return 0;

+   }

+

+   switch (objectType) {

+   case GL_TEXTURE:

+      retval = _mesa_TextureObjectPurgeable (ctx, name, option);

+      break;

+   case GL_RENDERBUFFER_EXT:

+      retval = _mesa_RenderObjectPurgeable (ctx, name, option);

+      break;

+   case GL_BUFFER_OBJECT_APPLE:

+      retval = _mesa_BufferObjectPurgeable (ctx, name, option);

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glObjectPurgeable(name = 0x%x) invalid type: %d",

+                  name, objectType);

+      return 0;

+   }

+

+   /* In strict conformance to the spec, we must only return VOLATILE when

+    * when passed the VOLATILE option. Madness.

+    *

+    * XXX First fix the spec, then fix me.

+    */

+   return option == GL_VOLATILE_APPLE ? GL_VOLATILE_APPLE : retval;

+}

+

+

+static GLenum

+_mesa_BufferObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option)

+{

+   struct gl_buffer_object *bufObj;

+   GLenum retval;

+

+   bufObj = _mesa_lookup_bufferobj(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   if (! bufObj->Purgeable) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glObjectUnpurgeable(name = 0x%x) object is "

+                  " already \"unpurged\"", name);

+      return 0;

+   }

+

+   bufObj->Purgeable = GL_FALSE;

+

+   retval = option;

+   if (ctx->Driver.BufferObjectUnpurgeable)

+      retval = ctx->Driver.BufferObjectUnpurgeable(ctx, bufObj, option);

+

+   return retval;

+}

+

+

+static GLenum

+_mesa_RenderObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option)

+{

+   struct gl_renderbuffer *bufObj;

+   GLenum retval;

+

+   bufObj = _mesa_lookup_renderbuffer(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   if (! bufObj->Purgeable) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glObjectUnpurgeable(name = 0x%x) object is "

+                  " already \"unpurged\"", name);

+      return 0;

+   }

+

+   bufObj->Purgeable = GL_FALSE;

+

+   retval = option;

+   if (ctx->Driver.RenderObjectUnpurgeable)

+      retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);

+

+   return retval;

+}

+

+

+static GLenum

+_mesa_TextureObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option)

+{

+   struct gl_texture_object *bufObj;

+   GLenum retval;

+

+   bufObj = _mesa_lookup_texture(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   if (! bufObj->Purgeable) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glObjectUnpurgeable(name = 0x%x) object is"

+                  " already \"unpurged\"", name);

+      return 0;

+   }

+

+   bufObj->Purgeable = GL_FALSE;

+

+   retval = option;

+   if (ctx->Driver.TextureObjectUnpurgeable)

+      retval = ctx->Driver.TextureObjectUnpurgeable(ctx, bufObj, option);

+

+   return retval;

+}

+

+

+GLenum GLAPIENTRY

+_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   if (name == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return 0;

+   }

+

+   switch (option) {

+   case GL_RETAINED_APPLE:

+   case GL_UNDEFINED_APPLE:

+      /* legal */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d",

+                  name, option);

+      return 0;

+   }

+

+   switch (objectType) {

+   case GL_BUFFER_OBJECT_APPLE:

+      return _mesa_BufferObjectUnpurgeable(ctx, name, option);

+   case GL_TEXTURE:

+      return _mesa_TextureObjectUnpurgeable(ctx, name, option);

+   case GL_RENDERBUFFER_EXT:

+      return _mesa_RenderObjectUnpurgeable(ctx, name, option);

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d",

+                  name, objectType);

+      return 0;

+   }

+}

+

+

+static void

+_mesa_GetBufferObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,

+                                      GLenum pname, GLint* params)

+{

+   struct gl_buffer_object *bufObj;

+

+   bufObj = _mesa_lookup_bufferobj(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glGetObjectParameteriv(name = 0x%x) invalid object", name);

+      return;

+   }

+

+   switch (pname) {

+   case GL_PURGEABLE_APPLE:

+      *params = bufObj->Purgeable;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",

+                  name, pname);

+      break;

+   }

+}

+

+

+static void

+_mesa_GetRenderObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,

+                                      GLenum pname, GLint* params)

+{

+   struct gl_renderbuffer *bufObj;

+

+   bufObj = _mesa_lookup_renderbuffer(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return;

+   }

+

+   switch (pname) {

+   case GL_PURGEABLE_APPLE:

+      *params = bufObj->Purgeable;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",

+                  name, pname);

+      break;

+   }

+}

+

+

+static void

+_mesa_GetTextureObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,

+                                       GLenum pname, GLint* params)

+{

+   struct gl_texture_object *bufObj;

+

+   bufObj = _mesa_lookup_texture(ctx, name);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glObjectUnpurgeable(name = 0x%x)", name);

+      return;

+   }

+

+   switch (pname) {

+   case GL_PURGEABLE_APPLE:

+      *params = bufObj->Purgeable;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",

+                  name, pname);

+      break;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,

+                                GLint* params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (name == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glGetObjectParameteriv(name = 0x%x)", name);

+      return;

+   }

+

+   switch (objectType) {

+   case GL_TEXTURE:

+      _mesa_GetTextureObjectParameterivAPPLE (ctx, name, pname, params);

+      break;

+   case GL_BUFFER_OBJECT_APPLE:

+      _mesa_GetBufferObjectParameterivAPPLE (ctx, name, pname, params);

+      break;

+   case GL_RENDERBUFFER_EXT:

+      _mesa_GetRenderObjectParameterivAPPLE (ctx, name, pname, params);

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d",

+                  name, objectType);

+   }

+}

+

+#endif /* FEATURE_APPLE_object_purgeable */

diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h
index f234d06c6..57aa82eda 100644
--- a/mesalib/src/mesa/main/bufferobj.h
+++ b/mesalib/src/mesa/main/bufferobj.h
@@ -1,189 +1,189 @@
-/*
- * 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 "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( GLcontext *ctx );
-
-extern void
-_mesa_free_buffer_objects( GLcontext *ctx );
-
-extern void
-_mesa_update_default_objects_buffer_objects(GLcontext *ctx);
-
-
-extern struct gl_buffer_object *
-_mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer);
-
-extern void
-_mesa_initialize_buffer_object( struct gl_buffer_object *obj,
-				GLuint name, GLenum target );
-
-extern void
-_mesa_reference_buffer_object(GLcontext *ctx,
-                              struct gl_buffer_object **ptr,
-                              struct gl_buffer_object *bufObj);
-
-extern GLboolean
-_mesa_validate_pbo_access(GLuint dimensions,
-                          const struct gl_pixelstore_attrib *pack,
-                          GLsizei width, GLsizei height, GLsizei depth,
-                          GLenum format, GLenum type, const GLvoid *ptr);
-
-extern const GLvoid *
-_mesa_map_pbo_source(GLcontext *ctx,
-                     const struct gl_pixelstore_attrib *unpack,
-                     const GLvoid *src);
-
-extern const GLvoid *
-_mesa_map_validate_pbo_source(GLcontext *ctx,
-                              GLuint dimensions,
-                              const struct gl_pixelstore_attrib *unpack,
-                              GLsizei width, GLsizei height, GLsizei depth,
-                              GLenum format, GLenum type, const GLvoid *ptr,
-                              const char *where);
-
-extern void
-_mesa_unmap_pbo_source(GLcontext *ctx,
-                       const struct gl_pixelstore_attrib *unpack);
-
-extern void *
-_mesa_map_pbo_dest(GLcontext *ctx,
-                   const struct gl_pixelstore_attrib *pack,
-                   GLvoid *dest);
-
-extern GLvoid *
-_mesa_map_validate_pbo_dest(GLcontext *ctx,
-                            GLuint dimensions,
-                            const struct gl_pixelstore_attrib *unpack,
-                            GLsizei width, GLsizei height, GLsizei depth,
-                            GLenum format, GLenum type, GLvoid *ptr,
-                            const char *where);
-
-extern void
-_mesa_unmap_pbo_dest(GLcontext *ctx,
-                     const struct gl_pixelstore_attrib *pack);
-
-
-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 "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 GLboolean

+_mesa_validate_pbo_access(GLuint dimensions,

+                          const struct gl_pixelstore_attrib *pack,

+                          GLsizei width, GLsizei height, GLsizei depth,

+                          GLenum format, GLenum type, const GLvoid *ptr);

+

+extern const GLvoid *

+_mesa_map_pbo_source(struct gl_context *ctx,

+                     const struct gl_pixelstore_attrib *unpack,

+                     const GLvoid *src);

+

+extern const GLvoid *

+_mesa_map_validate_pbo_source(struct gl_context *ctx,

+                              GLuint dimensions,

+                              const struct gl_pixelstore_attrib *unpack,

+                              GLsizei width, GLsizei height, GLsizei depth,

+                              GLenum format, GLenum type, const GLvoid *ptr,

+                              const char *where);

+

+extern void

+_mesa_unmap_pbo_source(struct gl_context *ctx,

+                       const struct gl_pixelstore_attrib *unpack);

+

+extern void *

+_mesa_map_pbo_dest(struct gl_context *ctx,

+                   const struct gl_pixelstore_attrib *pack,

+                   GLvoid *dest);

+

+extern GLvoid *

+_mesa_map_validate_pbo_dest(struct gl_context *ctx,

+                            GLuint dimensions,

+                            const struct gl_pixelstore_attrib *unpack,

+                            GLsizei width, GLsizei height, GLsizei depth,

+                            GLenum format, GLenum type, GLvoid *ptr,

+                            const char *where);

+

+extern void

+_mesa_unmap_pbo_dest(struct gl_context *ctx,

+                     const struct gl_pixelstore_attrib *pack);

+

+

+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/buffers.c b/mesalib/src/mesa/main/buffers.c
index fb30b5996..cdc174454 100644
--- a/mesalib/src/mesa/main/buffers.c
+++ b/mesalib/src/mesa/main/buffers.c
@@ -1,525 +1,525 @@
-/*
- * 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 buffers.c
- * glReadBuffer, DrawBuffer functions.
- */
-
-
-
-#include "glheader.h"
-#include "buffers.h"
-#include "colormac.h"
-#include "context.h"
-#include "enums.h"
-
-
-#define BAD_MASK ~0u
-
-
-/**
- * Return bitmask of BUFFER_BIT_* flags indicating which color buffers are
- * available to the rendering context (for drawing or reading).
- * This depends on the type of framebuffer.  For window system framebuffers
- * we look at the framebuffer's visual.  But for user-create framebuffers we
- * look at the number of supported color attachments.
- * \param fb  the framebuffer to draw to, or read from
- * \return  bitmask of BUFFER_BIT_* flags
- */
-static GLbitfield
-supported_buffer_bitmask(const GLcontext *ctx, const struct gl_framebuffer *fb)
-{
-   GLbitfield mask = 0x0;
-
-   if (fb->Name > 0) {
-      /* A user-created renderbuffer */
-      GLuint i;
-      ASSERT(ctx->Extensions.EXT_framebuffer_object);
-      for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {
-         mask |= (BUFFER_BIT_COLOR0 << i);
-      }
-   }
-   else {
-      /* A window system framebuffer */
-      GLint i;
-      mask = BUFFER_BIT_FRONT_LEFT; /* always have this */
-      if (fb->Visual.stereoMode) {
-         mask |= BUFFER_BIT_FRONT_RIGHT;
-         if (fb->Visual.doubleBufferMode) {
-            mask |= BUFFER_BIT_BACK_LEFT | BUFFER_BIT_BACK_RIGHT;
-         }
-      }
-      else if (fb->Visual.doubleBufferMode) {
-         mask |= BUFFER_BIT_BACK_LEFT;
-      }
-
-      for (i = 0; i < fb->Visual.numAuxBuffers; i++) {
-         mask |= (BUFFER_BIT_AUX0 << i);
-      }
-   }
-
-   return mask;
-}
-
-
-/**
- * Helper routine used by glDrawBuffer and glDrawBuffersARB.
- * Given a GLenum naming one or more color buffers (such as
- * GL_FRONT_AND_BACK), return the corresponding bitmask of BUFFER_BIT_* flags.
- */
-static GLbitfield
-draw_buffer_enum_to_bitmask(GLenum buffer)
-{
-   switch (buffer) {
-      case GL_NONE:
-         return 0;
-      case GL_FRONT:
-         return BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_FRONT_RIGHT;
-      case GL_BACK:
-         return BUFFER_BIT_BACK_LEFT | BUFFER_BIT_BACK_RIGHT;
-      case GL_RIGHT:
-         return BUFFER_BIT_FRONT_RIGHT | BUFFER_BIT_BACK_RIGHT;
-      case GL_FRONT_RIGHT:
-         return BUFFER_BIT_FRONT_RIGHT;
-      case GL_BACK_RIGHT:
-         return BUFFER_BIT_BACK_RIGHT;
-      case GL_BACK_LEFT:
-         return BUFFER_BIT_BACK_LEFT;
-      case GL_FRONT_AND_BACK:
-         return BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT
-              | BUFFER_BIT_FRONT_RIGHT | BUFFER_BIT_BACK_RIGHT;
-      case GL_LEFT:
-         return BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT;
-      case GL_FRONT_LEFT:
-         return BUFFER_BIT_FRONT_LEFT;
-      case GL_AUX0:
-         return BUFFER_BIT_AUX0;
-      case GL_AUX1:
-      case GL_AUX2:
-      case GL_AUX3:
-         return 1 << BUFFER_COUNT; /* invalid, but not BAD_MASK */
-      case GL_COLOR_ATTACHMENT0_EXT:
-         return BUFFER_BIT_COLOR0;
-      case GL_COLOR_ATTACHMENT1_EXT:
-         return BUFFER_BIT_COLOR1;
-      case GL_COLOR_ATTACHMENT2_EXT:
-         return BUFFER_BIT_COLOR2;
-      case GL_COLOR_ATTACHMENT3_EXT:
-         return BUFFER_BIT_COLOR3;
-      case GL_COLOR_ATTACHMENT4_EXT:
-         return BUFFER_BIT_COLOR4;
-      case GL_COLOR_ATTACHMENT5_EXT:
-         return BUFFER_BIT_COLOR5;
-      case GL_COLOR_ATTACHMENT6_EXT:
-         return BUFFER_BIT_COLOR6;
-      case GL_COLOR_ATTACHMENT7_EXT:
-         return BUFFER_BIT_COLOR7;
-      default:
-         /* error */
-         return BAD_MASK;
-   }
-}
-
-
-/**
- * Helper routine used by glReadBuffer.
- * Given a GLenum naming a color buffer, return the index of the corresponding
- * renderbuffer (a BUFFER_* value).
- * return -1 for an invalid buffer.
- */
-static GLint
-read_buffer_enum_to_index(GLenum buffer)
-{
-   switch (buffer) {
-      case GL_FRONT:
-         return BUFFER_FRONT_LEFT;
-      case GL_BACK:
-         return BUFFER_BACK_LEFT;
-      case GL_RIGHT:
-         return BUFFER_FRONT_RIGHT;
-      case GL_FRONT_RIGHT:
-         return BUFFER_FRONT_RIGHT;
-      case GL_BACK_RIGHT:
-         return BUFFER_BACK_RIGHT;
-      case GL_BACK_LEFT:
-         return BUFFER_BACK_LEFT;
-      case GL_LEFT:
-         return BUFFER_FRONT_LEFT;
-      case GL_FRONT_LEFT:
-         return BUFFER_FRONT_LEFT;
-      case GL_AUX0:
-         return BUFFER_AUX0;
-      case GL_AUX1:
-      case GL_AUX2:
-      case GL_AUX3:
-         return BUFFER_COUNT; /* invalid, but not -1 */
-      case GL_COLOR_ATTACHMENT0_EXT:
-         return BUFFER_COLOR0;
-      case GL_COLOR_ATTACHMENT1_EXT:
-         return BUFFER_COLOR1;
-      case GL_COLOR_ATTACHMENT2_EXT:
-         return BUFFER_COLOR2;
-      case GL_COLOR_ATTACHMENT3_EXT:
-         return BUFFER_COLOR3;
-      case GL_COLOR_ATTACHMENT4_EXT:
-         return BUFFER_COLOR4;
-      case GL_COLOR_ATTACHMENT5_EXT:
-         return BUFFER_COLOR5;
-      case GL_COLOR_ATTACHMENT6_EXT:
-         return BUFFER_COLOR6;
-      case GL_COLOR_ATTACHMENT7_EXT:
-         return BUFFER_COLOR7;
-      default:
-         /* error */
-         return -1;
-   }
-}
-
-
-/**
- * Called by glDrawBuffer().
- * Specify which renderbuffer(s) to draw into for the first color output.
- * <buffer> can name zero, one, two or four renderbuffers!
- * \sa _mesa_DrawBuffersARB
- *
- * \param buffer  buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc.
- *
- * Note that the behaviour of this function depends on whether the
- * current ctx->DrawBuffer is a window-system framebuffer (Name=0) or
- * a user-created framebuffer object (Name!=0).
- *   In the former case, we update the per-context ctx->Color.DrawBuffer
- *   state var _and_ the FB's ColorDrawBuffer state.
- *   In the later case, we update the FB's ColorDrawBuffer state only.
- *
- * Furthermore, upon a MakeCurrent() or BindFramebuffer() call, if the
- * new FB is a window system FB, we need to re-update the FB's
- * ColorDrawBuffer state to match the context.  This is handled in
- * _mesa_update_framebuffer().
- *
- * See the GL_EXT_framebuffer_object spec for more info.
- */
-void GLAPIENTRY
-_mesa_DrawBuffer(GLenum buffer)
-{
-   GLbitfield destMask;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex... */
-
-   if (MESA_VERBOSE & VERBOSE_API) {
-      _mesa_debug(ctx, "glDrawBuffer %s\n", _mesa_lookup_enum_by_nr(buffer));
-   }
-
-   if (buffer == GL_NONE) {
-      destMask = 0x0;
-   }
-   else {
-      const GLbitfield supportedMask
-         = supported_buffer_bitmask(ctx, ctx->DrawBuffer);
-      destMask = draw_buffer_enum_to_bitmask(buffer);
-      if (destMask == BAD_MASK) {
-         /* totally bogus buffer */
-         _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffer(buffer=0x%x)", buffer);
-         return;
-      }
-      destMask &= supportedMask;
-      if (destMask == 0x0) {
-         /* none of the named color buffers exist! */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glDrawBuffer(buffer=0x%x)", buffer);
-         return;
-      }
-   }
-
-   /* if we get here, there's no error so set new state */
-   _mesa_drawbuffers(ctx, 1, &buffer, &destMask);
-
-   /*
-    * Call device driver function.
-    */
-   if (ctx->Driver.DrawBuffers)
-      ctx->Driver.DrawBuffers(ctx, 1, &buffer);
-   else if (ctx->Driver.DrawBuffer)
-      ctx->Driver.DrawBuffer(ctx, buffer);
-}
-
-
-/**
- * Called by glDrawBuffersARB; specifies the destination color renderbuffers
- * for N fragment program color outputs.
- * \sa _mesa_DrawBuffer
- * \param n  number of outputs
- * \param buffers  array [n] of renderbuffer names.  Unlike glDrawBuffer, the
- *                 names cannot specify more than one buffer.  For example,
- *                 GL_FRONT_AND_BACK is illegal.
- */
-void GLAPIENTRY
-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
-{
-   GLint output;
-   GLbitfield usedBufferMask, supportedMask;
-   GLbitfield destMask[MAX_DRAW_BUFFERS];
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   /* Turns out n==0 is a valid input that should not produce an error.
-    * The remaining code below correctly handles the n==0 case.
-    */
-   if (n < 0 || n > (GLsizei) ctx->Const.MaxDrawBuffers) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawBuffersARB(n)");
-      return;
-   }
-
-   supportedMask = supported_buffer_bitmask(ctx, ctx->DrawBuffer);
-   usedBufferMask = 0x0;
-
-   /* complicated error checking... */
-   for (output = 0; output < n; output++) {
-      if (buffers[output] == GL_NONE) {
-         destMask[output] = 0x0;
-      }
-      else {
-         destMask[output] = draw_buffer_enum_to_bitmask(buffers[output]);
-         if (destMask[output] == BAD_MASK
-             || _mesa_bitcount(destMask[output]) > 1) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffersARB(buffer)");
-            return;
-         }         
-         destMask[output] &= supportedMask;
-         if (destMask[output] == 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glDrawBuffersARB(unsupported buffer)");
-            return;
-         }
-         if (destMask[output] & usedBufferMask) {
-            /* can't specify a dest buffer more than once! */
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glDrawBuffersARB(duplicated buffer)");
-            return;
-         }
-
-         /* update bitmask */
-         usedBufferMask |= destMask[output];
-      }
-   }
-
-   /* OK, if we get here, there were no errors so set the new state */
-   _mesa_drawbuffers(ctx, n, buffers, destMask);
-
-   /*
-    * Call device driver function.  Note that n can be equal to 0,
-    * in which case we don't want to reference buffers[0], which
-    * may not be valid.
-    */
-   if (ctx->Driver.DrawBuffers)
-      ctx->Driver.DrawBuffers(ctx, n, buffers);
-   else if (ctx->Driver.DrawBuffer)
-      ctx->Driver.DrawBuffer(ctx, n > 0 ? buffers[0] : GL_NONE);
-}
-
-
-/**
- * Helper function to set the GL_DRAW_BUFFER state in the context and
- * current FBO.  Called via glDrawBuffer(), glDrawBuffersARB()
- *
- * All error checking will have been done prior to calling this function
- * so nothing should go wrong at this point.
- *
- * \param ctx  current context
- * \param n    number of color outputs to set
- * \param buffers  array[n] of colorbuffer names, like GL_LEFT.
- * \param destMask  array[n] of BUFFER_BIT_* bitmasks which correspond to the
- *                  colorbuffer names.  (i.e. GL_FRONT_AND_BACK =>
- *                  BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT).
- */
-void
-_mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
-                  const GLbitfield *destMask)
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   GLbitfield mask[MAX_DRAW_BUFFERS];
-   GLboolean newState = GL_FALSE;
-
-   if (!destMask) {
-      /* compute destMask values now */
-      const GLbitfield supportedMask = supported_buffer_bitmask(ctx, fb);
-      GLuint output;
-      for (output = 0; output < n; output++) {
-         mask[output] = draw_buffer_enum_to_bitmask(buffers[output]);
-         ASSERT(mask[output] != BAD_MASK);
-         mask[output] &= supportedMask;
-      }
-      destMask = mask;
-   }
-
-   /*
-    * If n==1, destMask[0] may have up to four bits set.
-    * Otherwise, destMask[x] can only have one bit set.
-    */
-   if (n == 1) {
-      GLuint count = 0, destMask0 = destMask[0];
-      while (destMask0) {
-         GLint bufIndex = _mesa_ffs(destMask0) - 1;
-         if (fb->_ColorDrawBufferIndexes[count] != bufIndex) {
-            fb->_ColorDrawBufferIndexes[count] = bufIndex;
-            newState = GL_TRUE;
-         }
-         count++;
-         destMask0 &= ~(1 << bufIndex);
-      }
-      fb->ColorDrawBuffer[0] = buffers[0];
-      if (fb->_NumColorDrawBuffers != count) {
-         fb->_NumColorDrawBuffers = count;
-         newState = GL_TRUE;
-      }
-   }
-   else {
-      GLuint buf, count = 0;
-      for (buf = 0; buf < n; buf++ ) {
-         if (destMask[buf]) {
-            GLint bufIndex = _mesa_ffs(destMask[buf]) - 1;
-            /* only one bit should be set in the destMask[buf] field */
-            ASSERT(_mesa_bitcount(destMask[buf]) == 1);
-            if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) {
-               fb->_ColorDrawBufferIndexes[buf] = bufIndex;
-               newState = GL_TRUE;
-            }
-            fb->ColorDrawBuffer[buf] = buffers[buf];
-            count = buf + 1;
-         }
-         else {
-            if (fb->_ColorDrawBufferIndexes[buf] != -1) {
-               fb->_ColorDrawBufferIndexes[buf] = -1;
-               newState = GL_TRUE;
-            }
-         }
-      }
-      /* set remaining outputs to -1 (GL_NONE) */
-      while (buf < ctx->Const.MaxDrawBuffers) {
-         if (fb->_ColorDrawBufferIndexes[buf] != -1) {
-            fb->_ColorDrawBufferIndexes[buf] = -1;
-            newState = GL_TRUE;
-         }
-         fb->ColorDrawBuffer[buf] = GL_NONE;
-         buf++;
-      }
-      fb->_NumColorDrawBuffers = count;
-   }
-
-   if (fb->Name == 0) {
-      /* also set context drawbuffer state */
-      GLuint buf;
-      for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {
-         if (ctx->Color.DrawBuffer[buf] != fb->ColorDrawBuffer[buf]) {
-            ctx->Color.DrawBuffer[buf] = fb->ColorDrawBuffer[buf];
-            newState = GL_TRUE;
-         }
-      }
-   }
-
-   if (newState)
-      FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-}
-
-
-/**
- * Like \sa _mesa_drawbuffers(), this is a helper function for setting
- * GL_READ_BUFFER state in the context and current FBO.
- * \param ctx  the rendering context
- * \param buffer  GL_FRONT, GL_BACK, GL_COLOR_ATTACHMENT0, etc.
- * \param bufferIndex  the numerical index corresponding to 'buffer'
- */
-void
-_mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex)
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-
-   if (fb->Name == 0) {
-      /* Only update the per-context READ_BUFFER state if we're bound to
-       * a window-system framebuffer.
-       */
-      ctx->Pixel.ReadBuffer = buffer;
-   }
-
-   fb->ColorReadBuffer = buffer;
-   fb->_ColorReadBufferIndex = bufferIndex;
-
-   ctx->NewState |= _NEW_BUFFERS;
-}
-
-
-
-/**
- * Called by glReadBuffer to set the source renderbuffer for reading pixels.
- * \param mode color buffer such as GL_FRONT, GL_BACK, etc.
- */
-void GLAPIENTRY
-_mesa_ReadBuffer(GLenum buffer)
-{
-   struct gl_framebuffer *fb;
-   GLbitfield supportedMask;
-   GLint srcBuffer;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glReadBuffer %s\n", _mesa_lookup_enum_by_nr(buffer));
-
-   fb = ctx->ReadBuffer;
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glReadBuffer %s\n", _mesa_lookup_enum_by_nr(buffer));
-
-   if (fb->Name > 0 && buffer == GL_NONE) {
-      /* This is legal for user-created framebuffer objects */
-      srcBuffer = -1;
-   }
-   else {
-      /* general case / window-system framebuffer */
-      srcBuffer = read_buffer_enum_to_index(buffer);
-      if (srcBuffer == -1) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glReadBuffer(buffer=0x%x)", buffer);
-         return;
-      }
-      supportedMask = supported_buffer_bitmask(ctx, fb);
-      if (((1 << srcBuffer) & supportedMask) == 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadBuffer(buffer=0x%x)", buffer);
-         return;
-      }
-   }
-
-   /* OK, all error checking has been completed now */
-
-   _mesa_readbuffer(ctx, buffer, srcBuffer);
-   ctx->NewState |= _NEW_BUFFERS;
-
-   /*
-    * Call device driver function.
-    */
-   if (ctx->Driver.ReadBuffer)
-      (*ctx->Driver.ReadBuffer)(ctx, buffer);
-}
+/*

+ * 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 buffers.c

+ * glReadBuffer, DrawBuffer functions.

+ */

+

+

+

+#include "glheader.h"

+#include "buffers.h"

+#include "colormac.h"

+#include "context.h"

+#include "enums.h"

+

+

+#define BAD_MASK ~0u

+

+

+/**

+ * Return bitmask of BUFFER_BIT_* flags indicating which color buffers are

+ * available to the rendering context (for drawing or reading).

+ * This depends on the type of framebuffer.  For window system framebuffers

+ * we look at the framebuffer's visual.  But for user-create framebuffers we

+ * look at the number of supported color attachments.

+ * \param fb  the framebuffer to draw to, or read from

+ * \return  bitmask of BUFFER_BIT_* flags

+ */

+static GLbitfield

+supported_buffer_bitmask(const struct gl_context *ctx, const struct gl_framebuffer *fb)

+{

+   GLbitfield mask = 0x0;

+

+   if (fb->Name > 0) {

+      /* A user-created renderbuffer */

+      GLuint i;

+      ASSERT(ctx->Extensions.EXT_framebuffer_object);

+      for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {

+         mask |= (BUFFER_BIT_COLOR0 << i);

+      }

+   }

+   else {

+      /* A window system framebuffer */

+      GLint i;

+      mask = BUFFER_BIT_FRONT_LEFT; /* always have this */

+      if (fb->Visual.stereoMode) {

+         mask |= BUFFER_BIT_FRONT_RIGHT;

+         if (fb->Visual.doubleBufferMode) {

+            mask |= BUFFER_BIT_BACK_LEFT | BUFFER_BIT_BACK_RIGHT;

+         }

+      }

+      else if (fb->Visual.doubleBufferMode) {

+         mask |= BUFFER_BIT_BACK_LEFT;

+      }

+

+      for (i = 0; i < fb->Visual.numAuxBuffers; i++) {

+         mask |= (BUFFER_BIT_AUX0 << i);

+      }

+   }

+

+   return mask;

+}

+

+

+/**

+ * Helper routine used by glDrawBuffer and glDrawBuffersARB.

+ * Given a GLenum naming one or more color buffers (such as

+ * GL_FRONT_AND_BACK), return the corresponding bitmask of BUFFER_BIT_* flags.

+ */

+static GLbitfield

+draw_buffer_enum_to_bitmask(GLenum buffer)

+{

+   switch (buffer) {

+      case GL_NONE:

+         return 0;

+      case GL_FRONT:

+         return BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_FRONT_RIGHT;

+      case GL_BACK:

+         return BUFFER_BIT_BACK_LEFT | BUFFER_BIT_BACK_RIGHT;

+      case GL_RIGHT:

+         return BUFFER_BIT_FRONT_RIGHT | BUFFER_BIT_BACK_RIGHT;

+      case GL_FRONT_RIGHT:

+         return BUFFER_BIT_FRONT_RIGHT;

+      case GL_BACK_RIGHT:

+         return BUFFER_BIT_BACK_RIGHT;

+      case GL_BACK_LEFT:

+         return BUFFER_BIT_BACK_LEFT;

+      case GL_FRONT_AND_BACK:

+         return BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT

+              | BUFFER_BIT_FRONT_RIGHT | BUFFER_BIT_BACK_RIGHT;

+      case GL_LEFT:

+         return BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT;

+      case GL_FRONT_LEFT:

+         return BUFFER_BIT_FRONT_LEFT;

+      case GL_AUX0:

+         return BUFFER_BIT_AUX0;

+      case GL_AUX1:

+      case GL_AUX2:

+      case GL_AUX3:

+         return 1 << BUFFER_COUNT; /* invalid, but not BAD_MASK */

+      case GL_COLOR_ATTACHMENT0_EXT:

+         return BUFFER_BIT_COLOR0;

+      case GL_COLOR_ATTACHMENT1_EXT:

+         return BUFFER_BIT_COLOR1;

+      case GL_COLOR_ATTACHMENT2_EXT:

+         return BUFFER_BIT_COLOR2;

+      case GL_COLOR_ATTACHMENT3_EXT:

+         return BUFFER_BIT_COLOR3;

+      case GL_COLOR_ATTACHMENT4_EXT:

+         return BUFFER_BIT_COLOR4;

+      case GL_COLOR_ATTACHMENT5_EXT:

+         return BUFFER_BIT_COLOR5;

+      case GL_COLOR_ATTACHMENT6_EXT:

+         return BUFFER_BIT_COLOR6;

+      case GL_COLOR_ATTACHMENT7_EXT:

+         return BUFFER_BIT_COLOR7;

+      default:

+         /* error */

+         return BAD_MASK;

+   }

+}

+

+

+/**

+ * Helper routine used by glReadBuffer.

+ * Given a GLenum naming a color buffer, return the index of the corresponding

+ * renderbuffer (a BUFFER_* value).

+ * return -1 for an invalid buffer.

+ */

+static GLint

+read_buffer_enum_to_index(GLenum buffer)

+{

+   switch (buffer) {

+      case GL_FRONT:

+         return BUFFER_FRONT_LEFT;

+      case GL_BACK:

+         return BUFFER_BACK_LEFT;

+      case GL_RIGHT:

+         return BUFFER_FRONT_RIGHT;

+      case GL_FRONT_RIGHT:

+         return BUFFER_FRONT_RIGHT;

+      case GL_BACK_RIGHT:

+         return BUFFER_BACK_RIGHT;

+      case GL_BACK_LEFT:

+         return BUFFER_BACK_LEFT;

+      case GL_LEFT:

+         return BUFFER_FRONT_LEFT;

+      case GL_FRONT_LEFT:

+         return BUFFER_FRONT_LEFT;

+      case GL_AUX0:

+         return BUFFER_AUX0;

+      case GL_AUX1:

+      case GL_AUX2:

+      case GL_AUX3:

+         return BUFFER_COUNT; /* invalid, but not -1 */

+      case GL_COLOR_ATTACHMENT0_EXT:

+         return BUFFER_COLOR0;

+      case GL_COLOR_ATTACHMENT1_EXT:

+         return BUFFER_COLOR1;

+      case GL_COLOR_ATTACHMENT2_EXT:

+         return BUFFER_COLOR2;

+      case GL_COLOR_ATTACHMENT3_EXT:

+         return BUFFER_COLOR3;

+      case GL_COLOR_ATTACHMENT4_EXT:

+         return BUFFER_COLOR4;

+      case GL_COLOR_ATTACHMENT5_EXT:

+         return BUFFER_COLOR5;

+      case GL_COLOR_ATTACHMENT6_EXT:

+         return BUFFER_COLOR6;

+      case GL_COLOR_ATTACHMENT7_EXT:

+         return BUFFER_COLOR7;

+      default:

+         /* error */

+         return -1;

+   }

+}

+

+

+/**

+ * Called by glDrawBuffer().

+ * Specify which renderbuffer(s) to draw into for the first color output.

+ * <buffer> can name zero, one, two or four renderbuffers!

+ * \sa _mesa_DrawBuffersARB

+ *

+ * \param buffer  buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc.

+ *

+ * Note that the behaviour of this function depends on whether the

+ * current ctx->DrawBuffer is a window-system framebuffer (Name=0) or

+ * a user-created framebuffer object (Name!=0).

+ *   In the former case, we update the per-context ctx->Color.DrawBuffer

+ *   state var _and_ the FB's ColorDrawBuffer state.

+ *   In the later case, we update the FB's ColorDrawBuffer state only.

+ *

+ * Furthermore, upon a MakeCurrent() or BindFramebuffer() call, if the

+ * new FB is a window system FB, we need to re-update the FB's

+ * ColorDrawBuffer state to match the context.  This is handled in

+ * _mesa_update_framebuffer().

+ *

+ * See the GL_EXT_framebuffer_object spec for more info.

+ */

+void GLAPIENTRY

+_mesa_DrawBuffer(GLenum buffer)

+{

+   GLbitfield destMask;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex... */

+

+   if (MESA_VERBOSE & VERBOSE_API) {

+      _mesa_debug(ctx, "glDrawBuffer %s\n", _mesa_lookup_enum_by_nr(buffer));

+   }

+

+   if (buffer == GL_NONE) {

+      destMask = 0x0;

+   }

+   else {

+      const GLbitfield supportedMask

+         = supported_buffer_bitmask(ctx, ctx->DrawBuffer);

+      destMask = draw_buffer_enum_to_bitmask(buffer);

+      if (destMask == BAD_MASK) {

+         /* totally bogus buffer */

+         _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffer(buffer=0x%x)", buffer);

+         return;

+      }

+      destMask &= supportedMask;

+      if (destMask == 0x0) {

+         /* none of the named color buffers exist! */

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glDrawBuffer(buffer=0x%x)", buffer);

+         return;

+      }

+   }

+

+   /* if we get here, there's no error so set new state */

+   _mesa_drawbuffers(ctx, 1, &buffer, &destMask);

+

+   /*

+    * Call device driver function.

+    */

+   if (ctx->Driver.DrawBuffers)

+      ctx->Driver.DrawBuffers(ctx, 1, &buffer);

+   else if (ctx->Driver.DrawBuffer)

+      ctx->Driver.DrawBuffer(ctx, buffer);

+}

+

+

+/**

+ * Called by glDrawBuffersARB; specifies the destination color renderbuffers

+ * for N fragment program color outputs.

+ * \sa _mesa_DrawBuffer

+ * \param n  number of outputs

+ * \param buffers  array [n] of renderbuffer names.  Unlike glDrawBuffer, the

+ *                 names cannot specify more than one buffer.  For example,

+ *                 GL_FRONT_AND_BACK is illegal.

+ */

+void GLAPIENTRY

+_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)

+{

+   GLint output;

+   GLbitfield usedBufferMask, supportedMask;

+   GLbitfield destMask[MAX_DRAW_BUFFERS];

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   /* Turns out n==0 is a valid input that should not produce an error.

+    * The remaining code below correctly handles the n==0 case.

+    */

+   if (n < 0 || n > (GLsizei) ctx->Const.MaxDrawBuffers) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawBuffersARB(n)");

+      return;

+   }

+

+   supportedMask = supported_buffer_bitmask(ctx, ctx->DrawBuffer);

+   usedBufferMask = 0x0;

+

+   /* complicated error checking... */

+   for (output = 0; output < n; output++) {

+      if (buffers[output] == GL_NONE) {

+         destMask[output] = 0x0;

+      }

+      else {

+         destMask[output] = draw_buffer_enum_to_bitmask(buffers[output]);

+         if (destMask[output] == BAD_MASK

+             || _mesa_bitcount(destMask[output]) > 1) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffersARB(buffer)");

+            return;

+         }         

+         destMask[output] &= supportedMask;

+         if (destMask[output] == 0) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glDrawBuffersARB(unsupported buffer)");

+            return;

+         }

+         if (destMask[output] & usedBufferMask) {

+            /* can't specify a dest buffer more than once! */

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glDrawBuffersARB(duplicated buffer)");

+            return;

+         }

+

+         /* update bitmask */

+         usedBufferMask |= destMask[output];

+      }

+   }

+

+   /* OK, if we get here, there were no errors so set the new state */

+   _mesa_drawbuffers(ctx, n, buffers, destMask);

+

+   /*

+    * Call device driver function.  Note that n can be equal to 0,

+    * in which case we don't want to reference buffers[0], which

+    * may not be valid.

+    */

+   if (ctx->Driver.DrawBuffers)

+      ctx->Driver.DrawBuffers(ctx, n, buffers);

+   else if (ctx->Driver.DrawBuffer)

+      ctx->Driver.DrawBuffer(ctx, n > 0 ? buffers[0] : GL_NONE);

+}

+

+

+/**

+ * Helper function to set the GL_DRAW_BUFFER state in the context and

+ * current FBO.  Called via glDrawBuffer(), glDrawBuffersARB()

+ *

+ * All error checking will have been done prior to calling this function

+ * so nothing should go wrong at this point.

+ *

+ * \param ctx  current context

+ * \param n    number of color outputs to set

+ * \param buffers  array[n] of colorbuffer names, like GL_LEFT.

+ * \param destMask  array[n] of BUFFER_BIT_* bitmasks which correspond to the

+ *                  colorbuffer names.  (i.e. GL_FRONT_AND_BACK =>

+ *                  BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT).

+ */

+void

+_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,

+                  const GLbitfield *destMask)

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   GLbitfield mask[MAX_DRAW_BUFFERS];

+   GLboolean newState = GL_FALSE;

+

+   if (!destMask) {

+      /* compute destMask values now */

+      const GLbitfield supportedMask = supported_buffer_bitmask(ctx, fb);

+      GLuint output;

+      for (output = 0; output < n; output++) {

+         mask[output] = draw_buffer_enum_to_bitmask(buffers[output]);

+         ASSERT(mask[output] != BAD_MASK);

+         mask[output] &= supportedMask;

+      }

+      destMask = mask;

+   }

+

+   /*

+    * If n==1, destMask[0] may have up to four bits set.

+    * Otherwise, destMask[x] can only have one bit set.

+    */

+   if (n == 1) {

+      GLuint count = 0, destMask0 = destMask[0];

+      while (destMask0) {

+         GLint bufIndex = _mesa_ffs(destMask0) - 1;

+         if (fb->_ColorDrawBufferIndexes[count] != bufIndex) {

+            fb->_ColorDrawBufferIndexes[count] = bufIndex;

+            newState = GL_TRUE;

+         }

+         count++;

+         destMask0 &= ~(1 << bufIndex);

+      }

+      fb->ColorDrawBuffer[0] = buffers[0];

+      if (fb->_NumColorDrawBuffers != count) {

+         fb->_NumColorDrawBuffers = count;

+         newState = GL_TRUE;

+      }

+   }

+   else {

+      GLuint buf, count = 0;

+      for (buf = 0; buf < n; buf++ ) {

+         if (destMask[buf]) {

+            GLint bufIndex = _mesa_ffs(destMask[buf]) - 1;

+            /* only one bit should be set in the destMask[buf] field */

+            ASSERT(_mesa_bitcount(destMask[buf]) == 1);

+            if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) {

+               fb->_ColorDrawBufferIndexes[buf] = bufIndex;

+               newState = GL_TRUE;

+            }

+            fb->ColorDrawBuffer[buf] = buffers[buf];

+            count = buf + 1;

+         }

+         else {

+            if (fb->_ColorDrawBufferIndexes[buf] != -1) {

+               fb->_ColorDrawBufferIndexes[buf] = -1;

+               newState = GL_TRUE;

+            }

+         }

+      }

+      /* set remaining outputs to -1 (GL_NONE) */

+      while (buf < ctx->Const.MaxDrawBuffers) {

+         if (fb->_ColorDrawBufferIndexes[buf] != -1) {

+            fb->_ColorDrawBufferIndexes[buf] = -1;

+            newState = GL_TRUE;

+         }

+         fb->ColorDrawBuffer[buf] = GL_NONE;

+         buf++;

+      }

+      fb->_NumColorDrawBuffers = count;

+   }

+

+   if (fb->Name == 0) {

+      /* also set context drawbuffer state */

+      GLuint buf;

+      for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {

+         if (ctx->Color.DrawBuffer[buf] != fb->ColorDrawBuffer[buf]) {

+            ctx->Color.DrawBuffer[buf] = fb->ColorDrawBuffer[buf];

+            newState = GL_TRUE;

+         }

+      }

+   }

+

+   if (newState)

+      FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+}

+

+

+/**

+ * Like \sa _mesa_drawbuffers(), this is a helper function for setting

+ * GL_READ_BUFFER state in the context and current FBO.

+ * \param ctx  the rendering context

+ * \param buffer  GL_FRONT, GL_BACK, GL_COLOR_ATTACHMENT0, etc.

+ * \param bufferIndex  the numerical index corresponding to 'buffer'

+ */

+void

+_mesa_readbuffer(struct gl_context *ctx, GLenum buffer, GLint bufferIndex)

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+

+   if (fb->Name == 0) {

+      /* Only update the per-context READ_BUFFER state if we're bound to

+       * a window-system framebuffer.

+       */

+      ctx->Pixel.ReadBuffer = buffer;

+   }

+

+   fb->ColorReadBuffer = buffer;

+   fb->_ColorReadBufferIndex = bufferIndex;

+

+   ctx->NewState |= _NEW_BUFFERS;

+}

+

+

+

+/**

+ * Called by glReadBuffer to set the source renderbuffer for reading pixels.

+ * \param mode color buffer such as GL_FRONT, GL_BACK, etc.

+ */

+void GLAPIENTRY

+_mesa_ReadBuffer(GLenum buffer)

+{

+   struct gl_framebuffer *fb;

+   GLbitfield supportedMask;

+   GLint srcBuffer;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glReadBuffer %s\n", _mesa_lookup_enum_by_nr(buffer));

+

+   fb = ctx->ReadBuffer;

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glReadBuffer %s\n", _mesa_lookup_enum_by_nr(buffer));

+

+   if (fb->Name > 0 && buffer == GL_NONE) {

+      /* This is legal for user-created framebuffer objects */

+      srcBuffer = -1;

+   }

+   else {

+      /* general case / window-system framebuffer */

+      srcBuffer = read_buffer_enum_to_index(buffer);

+      if (srcBuffer == -1) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glReadBuffer(buffer=0x%x)", buffer);

+         return;

+      }

+      supportedMask = supported_buffer_bitmask(ctx, fb);

+      if (((1 << srcBuffer) & supportedMask) == 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glReadBuffer(buffer=0x%x)", buffer);

+         return;

+      }

+   }

+

+   /* OK, all error checking has been completed now */

+

+   _mesa_readbuffer(ctx, buffer, srcBuffer);

+   ctx->NewState |= _NEW_BUFFERS;

+

+   /*

+    * Call device driver function.

+    */

+   if (ctx->Driver.ReadBuffer)

+      (*ctx->Driver.ReadBuffer)(ctx, buffer);

+}

diff --git a/mesalib/src/mesa/main/buffers.h b/mesalib/src/mesa/main/buffers.h
index 8a7e7b5c1..cf684c5fe 100644
--- a/mesalib/src/mesa/main/buffers.h
+++ b/mesalib/src/mesa/main/buffers.h
@@ -1,56 +1,57 @@
-/**
- * \file buffers.h
- * Frame buffer management functions declarations.
- */
-
-/*
- * 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 BUFFERS_H
-#define BUFFERS_H
-
-
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_DrawBuffer( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
-
-extern void
-_mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
-                  const GLbitfield *destMask);
-
-extern void
-_mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex);
-
-extern void GLAPIENTRY
-_mesa_ReadBuffer( GLenum mode );
-
-
-#endif
+/**

+ * \file buffers.h

+ * Frame buffer management functions declarations.

+ */

+

+/*

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

+#define BUFFERS_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_DrawBuffer( GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);

+

+extern void

+_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,

+                  const GLbitfield *destMask);

+

+extern void

+_mesa_readbuffer(struct gl_context *ctx, GLenum buffer, GLint bufferIndex);

+

+extern void GLAPIENTRY

+_mesa_ReadBuffer( GLenum mode );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/clear.c b/mesalib/src/mesa/main/clear.c
index 49d86b3b1..3edcbe884 100644
--- a/mesalib/src/mesa/main/clear.c
+++ b/mesalib/src/mesa/main/clear.c
@@ -1,504 +1,566 @@
-/*
- * 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 "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] = CLAMP(red,   0.0F, 1.0F);
-   tmp[1] = CLAMP(green, 0.0F, 1.0F);
-   tmp[2] = CLAMP(blue,  0.0F, 1.0F);
-   tmp[3] = CLAMP(alpha, 0.0F, 1.0F);
-
-   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))
-      return; /* no change */
-
-   FLUSH_VERTICES(ctx, _NEW_COLOR);
-   COPY_4V(ctx->Color.ClearColor, tmp);
-
-   if (ctx->Driver.ClearColor) {
-      /* it's OK to call glClearColor in CI mode but it should be a NOP */
-      (*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 __GLcontextRec::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(GLcontext *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, "glClearBufferiv(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 "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] = CLAMP(red,   0.0F, 1.0F);

+   tmp[1] = CLAMP(green, 0.0F, 1.0F);

+   tmp[2] = CLAMP(blue,  0.0F, 1.0F);

+   tmp[3] = CLAMP(alpha, 0.0F, 1.0F);

+

+   if (TEST_EQ_4V(tmp, ctx->Color.ClearColor))

+      return; /* no change */

+

+   FLUSH_VERTICES(ctx, _NEW_COLOR);

+   COPY_4V(ctx->Color.ClearColor, tmp);

+

+   if (ctx->Driver.ClearColor) {

+      /* it's OK to call glClearColor in CI mode but it should be a NOP */

+      (*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/clear.h b/mesalib/src/mesa/main/clear.h
index 6657370c4..d3d64fd62 100644
--- a/mesalib/src/mesa/main/clear.h
+++ b/mesalib/src/mesa/main/clear.h
@@ -1,57 +1,64 @@
-/*
- * 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 CLEAR_H
-#define CLEAR_H
-
-
-#include "glheader.h"
-
-
-extern void GLAPIENTRY
-_mesa_ClearIndex( GLfloat c );
-
-extern void GLAPIENTRY
-_mesa_ClearColor( GLclampf red, GLclampf green,
-                  GLclampf blue, GLclampf alpha );
-
-extern void GLAPIENTRY
-_mesa_Clear( GLbitfield mask );
-
-
-extern void GLAPIENTRY
-_mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,
-                    GLfloat depth, GLint stencil);
-
-#endif
+/*

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

+#define CLEAR_H

+

+

+#include "glheader.h"

+

+

+extern void GLAPIENTRY

+_mesa_ClearIndex( GLfloat c );

+

+extern void GLAPIENTRY

+_mesa_ClearColor( GLclampf red, GLclampf green,

+                  GLclampf blue, GLclampf alpha );

+

+extern void GLAPIENTRY

+_mesa_ClearColorIiEXT(GLint r, GLint g, GLint b, GLint a);

+

+extern void GLAPIENTRY

+_mesa_ClearColorIuiEXT(GLuint r, GLuint g, GLuint b, GLuint a);

+

+

+extern void GLAPIENTRY

+_mesa_Clear( GLbitfield mask );

+

+

+extern void GLAPIENTRY

+_mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value);

+

+extern void GLAPIENTRY

+_mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value);

+

+extern void GLAPIENTRY

+_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value);

+

+extern void GLAPIENTRY

+_mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,

+                    GLfloat depth, GLint stencil);

+

+#endif

diff --git a/mesalib/src/mesa/main/clip.c b/mesalib/src/mesa/main/clip.c
index 96c80e6ef..bec04de72 100644
--- a/mesalib/src/mesa/main/clip.c
+++ b/mesalib/src/mesa/main/clip.c
@@ -1,159 +1,116 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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 "clip.h"
-#include "context.h"
-#include "macros.h"
-#include "mtypes.h"
-
-#include "math/m_matrix.h"
-
-
-
-/**********************************************************************/
-/*                     Get/Set User clip-planes.                      */
-/**********************************************************************/
-
-
-
-void GLAPIENTRY
-_mesa_ClipPlane( GLenum plane, const GLdouble *eq )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint p;
-   GLfloat equation[4];
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   p = (GLint) plane - (GLint) GL_CLIP_PLANE0;
-   if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glClipPlane" );
-      return;
-   }
-
-   equation[0] = (GLfloat) eq[0];
-   equation[1] = (GLfloat) eq[1];
-   equation[2] = (GLfloat) eq[2];
-   equation[3] = (GLfloat) eq[3];
-
-   /*
-    * The equation is transformed by the transpose of the inverse of the
-    * current modelview matrix and stored in the resulting eye coordinates.
-    *
-    * KW: Eqn is then transformed to the current clip space, where user
-    * clipping now takes place.  The clip-space equations are recalculated
-    * whenever the projection matrix changes.
-    */
-   if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top))
-      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-
-   _mesa_transform_vector( equation, equation,
-                           ctx->ModelviewMatrixStack.Top->inv );
-
-   if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation))
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-   COPY_4FV(ctx->Transform.EyeUserPlane[p], equation);
-
-   /* Update derived state.  This state also depends on the projection
-    * matrix, and is recalculated on changes to the projection matrix by
-    * code in _mesa_update_state().
-    */
-   if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-      if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))
-         _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
-
-      _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
-			   ctx->Transform.EyeUserPlane[p],
-			   ctx->ProjectionMatrixStack.Top->inv );
-   }
-
-   if (ctx->Driver.ClipPlane)
-      ctx->Driver.ClipPlane( ctx, plane, equation );
-}
-
-
-void GLAPIENTRY
-_mesa_GetClipPlane( GLenum plane, GLdouble *equation )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint p;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   p = (GLint) (plane - GL_CLIP_PLANE0);
-   if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetClipPlane" );
-      return;
-   }
-
-   equation[0] = (GLdouble) ctx->Transform.EyeUserPlane[p][0];
-   equation[1] = (GLdouble) ctx->Transform.EyeUserPlane[p][1];
-   equation[2] = (GLdouble) ctx->Transform.EyeUserPlane[p][2];
-   equation[3] = (GLdouble) ctx->Transform.EyeUserPlane[p][3];
-}
-
-void GLAPIENTRY 
-_mesa_CullParameterfvEXT (GLenum cap, GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (cap) {
-   case GL_CULL_VERTEX_EYE_POSITION_EXT:
-      FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-      COPY_4FV(ctx->Transform.CullEyePos, v);
-      
-      _mesa_transform_vector( ctx->Transform.CullObjPos, 
-			      ctx->Transform.CullEyePos,
-			      ctx->ModelviewMatrixStack.Top->inv );
-      break;
-
-   case GL_CULL_VERTEX_OBJECT_POSITION_EXT:
-      FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-      COPY_4FV(ctx->Transform.CullObjPos, v);
-
-      _mesa_transform_vector( ctx->Transform.CullEyePos, 
-			      ctx->Transform.CullObjPos,
-			      ctx->ModelviewMatrixStack.Top->m );
-     break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glCullParameterfvEXT" );
-   }
-}
-
-void GLAPIENTRY 
-_mesa_CullParameterdvEXT (GLenum cap, GLdouble *v)
-{
-   GLfloat f[4];
-   
-   f[0] = (GLfloat)v[0];
-   f[1] = (GLfloat)v[1];
-   f[2] = (GLfloat)v[2];
-   f[3] = (GLfloat)v[3];
-
-   _mesa_CullParameterfvEXT(cap, f);
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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 "clip.h"

+#include "context.h"

+#include "macros.h"

+#include "mtypes.h"

+

+#include "math/m_matrix.h"

+

+

+

+/**********************************************************************/

+/*                     Get/Set User clip-planes.                      */

+/**********************************************************************/

+

+

+

+void GLAPIENTRY

+_mesa_ClipPlane( GLenum plane, const GLdouble *eq )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint p;

+   GLfloat equation[4];

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   p = (GLint) plane - (GLint) GL_CLIP_PLANE0;

+   if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glClipPlane" );

+      return;

+   }

+

+   equation[0] = (GLfloat) eq[0];

+   equation[1] = (GLfloat) eq[1];

+   equation[2] = (GLfloat) eq[2];

+   equation[3] = (GLfloat) eq[3];

+

+   /*

+    * The equation is transformed by the transpose of the inverse of the

+    * current modelview matrix and stored in the resulting eye coordinates.

+    *

+    * KW: Eqn is then transformed to the current clip space, where user

+    * clipping now takes place.  The clip-space equations are recalculated

+    * whenever the projection matrix changes.

+    */

+   if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top))

+      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );

+

+   _mesa_transform_vector( equation, equation,

+                           ctx->ModelviewMatrixStack.Top->inv );

+

+   if (TEST_EQ_4V(ctx->Transform.EyeUserPlane[p], equation))

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+   COPY_4FV(ctx->Transform.EyeUserPlane[p], equation);

+

+   /* Update derived state.  This state also depends on the projection

+    * matrix, and is recalculated on changes to the projection matrix by

+    * code in _mesa_update_state().

+    */

+   if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+      if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))

+         _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

+

+      _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],

+			   ctx->Transform.EyeUserPlane[p],

+			   ctx->ProjectionMatrixStack.Top->inv );

+   }

+

+   if (ctx->Driver.ClipPlane)

+      ctx->Driver.ClipPlane( ctx, plane, equation );

+}

+

+

+void GLAPIENTRY

+_mesa_GetClipPlane( GLenum plane, GLdouble *equation )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint p;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   p = (GLint) (plane - GL_CLIP_PLANE0);

+   if (p < 0 || p >= (GLint) ctx->Const.MaxClipPlanes) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetClipPlane" );

+      return;

+   }

+

+   equation[0] = (GLdouble) ctx->Transform.EyeUserPlane[p][0];

+   equation[1] = (GLdouble) ctx->Transform.EyeUserPlane[p][1];

+   equation[2] = (GLdouble) ctx->Transform.EyeUserPlane[p][2];

+   equation[3] = (GLdouble) ctx->Transform.EyeUserPlane[p][3];

+}

diff --git a/mesalib/src/mesa/main/clip.h b/mesalib/src/mesa/main/clip.h
index ac472d66e..bba16e11c 100644
--- a/mesalib/src/mesa/main/clip.h
+++ b/mesalib/src/mesa/main/clip.h
@@ -1,49 +1,42 @@
-/**
- * \file clip.h
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 CLIP_H
-#define CLIP_H
-
-#include "glheader.h"
-
-extern void GLAPIENTRY 
-_mesa_ClipPlane( GLenum plane, const GLdouble *equation );
-
-extern void GLAPIENTRY 
-_mesa_GetClipPlane( GLenum plane, GLdouble *equation );
-
-extern void GLAPIENTRY 
-_mesa_CullParameterfvEXT (GLenum cap, GLfloat *v);
-
-extern void GLAPIENTRY 
-_mesa_CullParameterdvEXT (GLenum cap, GLdouble *v);
-
-
-#endif
+/**

+ * \file clip.h

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 CLIP_H

+#define CLIP_H

+

+#include "glheader.h"

+

+extern void GLAPIENTRY 

+_mesa_ClipPlane( GLenum plane, const GLdouble *equation );

+

+extern void GLAPIENTRY 

+_mesa_GetClipPlane( GLenum plane, GLdouble *equation );

+

+#endif

diff --git a/mesalib/src/mesa/main/colormac.h b/mesalib/src/mesa/main/colormac.h
index 245fb658b..995183aeb 100644
--- a/mesalib/src/mesa/main/colormac.h
+++ b/mesalib/src/mesa/main/colormac.h
@@ -1,228 +1,235 @@
-/*
- * 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 colormac.h
- * Color-related macros
- */
-
-
-#ifndef COLORMAC_H
-#define COLORMAC_H
-
-
-#include "config.h"
-#include "macros.h"
-#include "mtypes.h"
-
-
-/** \def BYTE_TO_CHAN
- * Convert from GLbyte to GLchan */
-
-/** \def UBYTE_TO_CHAN
- * Convert from GLubyte to GLchan */
-
-/** \def SHORT_TO_CHAN
- * Convert from GLshort to GLchan */
-
-/** \def USHORT_TO_CHAN
- * Convert from GLushort to GLchan */
-
-/** \def INT_TO_CHAN
- * Convert from GLint to GLchan */
-
-/** \def UINT_TO_CHAN
- * Convert from GLuint to GLchan */
-
-/** \def CHAN_TO_UBYTE
- * Convert from GLchan to GLubyte */
-
-/** \def CHAN_TO_FLOAT
- * Convert from GLchan to GLfloat */
-
-/** \def CLAMPED_FLOAT_TO_CHAN
- * Convert from GLclampf to GLchan */
-
-/** \def UNCLAMPED_FLOAT_TO_CHAN
- * Convert from GLfloat to GLchan */
-
-/** \def COPY_CHAN4
- * Copy a GLchan[4] array */
-
-#if CHAN_BITS == 8
-
-#define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (GLchan) (b))
-#define UBYTE_TO_CHAN(b)  (b)
-#define SHORT_TO_CHAN(s)  ((s) < 0 ? 0 : (GLchan) ((s) >> 7))
-#define USHORT_TO_CHAN(s) ((GLchan) ((s) >> 8))
-#define INT_TO_CHAN(i)    ((i) < 0 ? 0 : (GLchan) ((i) >> 23))
-#define UINT_TO_CHAN(i)   ((GLchan) ((i) >> 24))
-
-#define CHAN_TO_UBYTE(c)  (c)
-#define CHAN_TO_FLOAT(c)  UBYTE_TO_FLOAT(c)
-
-#define CLAMPED_FLOAT_TO_CHAN(c, f)    CLAMPED_FLOAT_TO_UBYTE(c, f)
-#define UNCLAMPED_FLOAT_TO_CHAN(c, f)  UNCLAMPED_FLOAT_TO_UBYTE(c, f)
-
-#define COPY_CHAN4(DST, SRC)  COPY_4UBV(DST, SRC)
-
-#elif CHAN_BITS == 16
-
-#define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (((GLchan) (b)) * 516))
-#define UBYTE_TO_CHAN(b)  ((((GLchan) (b)) << 8) | ((GLchan) (b)))
-#define SHORT_TO_CHAN(s)  ((s) < 0 ? 0 : (GLchan) (s))
-#define USHORT_TO_CHAN(s) (s)
-#define INT_TO_CHAN(i)    ((i) < 0 ? 0 : (GLchan) ((i) >> 15))
-#define UINT_TO_CHAN(i)   ((GLchan) ((i) >> 16))
-
-#define CHAN_TO_UBYTE(c)  ((c) >> 8)
-#define CHAN_TO_FLOAT(c)  ((GLfloat) ((c) * (1.0 / CHAN_MAXF)))
-
-#define CLAMPED_FLOAT_TO_CHAN(c, f)    CLAMPED_FLOAT_TO_USHORT(c, f)
-#define UNCLAMPED_FLOAT_TO_CHAN(c, f)  UNCLAMPED_FLOAT_TO_USHORT(c, f)
-
-#define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
-
-#elif CHAN_BITS == 32
-
-/* XXX floating-point color channels not fully thought-out */
-#define BYTE_TO_CHAN(b)   ((GLfloat) ((b) * (1.0F / 127.0F)))
-#define UBYTE_TO_CHAN(b)  ((GLfloat) ((b) * (1.0F / 255.0F)))
-#define SHORT_TO_CHAN(s)  ((GLfloat) ((s) * (1.0F / 32767.0F)))
-#define USHORT_TO_CHAN(s) ((GLfloat) ((s) * (1.0F / 65535.0F)))
-#define INT_TO_CHAN(i)    ((GLfloat) ((i) * (1.0F / 2147483647.0F)))
-#define UINT_TO_CHAN(i)   ((GLfloat) ((i) * (1.0F / 4294967295.0F)))
-
-#define CHAN_TO_UBYTE(c)  FLOAT_TO_UBYTE(c)
-#define CHAN_TO_FLOAT(c)  (c)
-
-#define CLAMPED_FLOAT_TO_CHAN(c, f)  c = (f)
-#define UNCLAMPED_FLOAT_TO_CHAN(c, f)      c = (f)
-
-#define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
-
-#else
-
-#error unexpected CHAN_BITS size
-
-#endif
-
-
-/**
- * Convert 3 channels at once.
- *
- * \param dst pointer to destination GLchan[3] array.
- * \param f pointer to source GLfloat[3] array.
- *
- * \sa #UNCLAMPED_FLOAT_TO_CHAN.
- */
-#define UNCLAMPED_FLOAT_TO_RGB_CHAN(dst, f)	\
-do {						\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[0], (f)[0]);	\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[1], (f)[1]);	\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[2], (f)[2]);	\
-} while (0)
-
-
-/**
- * Convert 4 channels at once.
- *
- * \param dst pointer to destination GLchan[4] array.
- * \param f pointer to source GLfloat[4] array.
- *
- * \sa #UNCLAMPED_FLOAT_TO_CHAN.
- */
-#define UNCLAMPED_FLOAT_TO_RGBA_CHAN(dst, f)	\
-do {						\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[0], (f)[0]);	\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[1], (f)[1]);	\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[2], (f)[2]);	\
-   UNCLAMPED_FLOAT_TO_CHAN((dst)[3], (f)[3]);	\
-} while (0)
-
-
-
-/**
- * \name Generic color packing macros.  All inputs should be GLubytes.
- *
- * \todo We may move these into texstore.h at some point.
- */
-/*@{*/
-
-#define PACK_COLOR_8888( X, Y, Z, W ) \
-   (((X) << 24) | ((Y) << 16) | ((Z) << 8) | (W))
-
-#define PACK_COLOR_8888_REV( X, Y, Z, W ) \
-   (((W) << 24) | ((Z) << 16) | ((Y) << 8) | (X))
-
-#define PACK_COLOR_888( X, Y, Z ) \
-   (((X) << 16) | ((Y) << 8) | (Z))
-
-#define PACK_COLOR_565( X, Y, Z )                                  \
-   ((((X) & 0xf8) << 8) | (((Y) & 0xfc) << 3) | (((Z) & 0xf8) >> 3))
-
-#define PACK_COLOR_565_REV( X, Y, Z ) \
-   (((X) & 0xf8) | ((Y) & 0xe0) >> 5 | (((Y) & 0x1c) << 11) | (((Z) & 0xf8) << 5))
-
-#define PACK_COLOR_5551( R, G, B, A )					\
-   ((((R) & 0xf8) << 8) | (((G) & 0xf8) << 3) | (((B) & 0xf8) >> 2) |	\
-    ((A) ? 1 : 0))
-
-#define PACK_COLOR_1555( A, B, G, R )					\
-   ((((B) & 0xf8) << 7) | (((G) & 0xf8) << 2) | (((R) & 0xf8) >> 3) |	\
-    ((A) ? 0x8000 : 0))
-
-#define PACK_COLOR_1555_REV( A, B, G, R )					\
-   ((((B) & 0xf8) >> 1) | (((G) & 0xc0) >> 6) | (((G) & 0x38) << 10) | (((R) & 0xf8) << 5) |	\
-    ((A) ? 0x80 : 0))
-
-#define PACK_COLOR_4444( R, G, B, A )					\
-   ((((R) & 0xf0) << 8) | (((G) & 0xf0) << 4) | ((B) & 0xf0) | ((A) >> 4))
-
-#define PACK_COLOR_4444_REV( R, G, B, A )				\
-   ((((B) & 0xf0) << 8) | (((A) & 0xf0) << 4) | ((R) & 0xf0) | ((G) >> 4))
-
-#define PACK_COLOR_88( L, A )						\
-   (((L) << 8) | (A))
-
-#define PACK_COLOR_88_REV( L, A )					\
-   (((A) << 8) | (L))
-
-#define PACK_COLOR_1616( L, A )						\
-   (((L) << 16) | (A))
-
-#define PACK_COLOR_1616_REV( L, A )					\
-   (((A) << 16) | (L))
-
-#define PACK_COLOR_332( R, G, B )					\
-   (((R) & 0xe0) | (((G) & 0xe0) >> 3) | (((B) & 0xc0) >> 6))
-
-#define PACK_COLOR_233( B, G, R )					\
-   (((B) & 0xc0) | (((G) & 0xe0) >> 2) | (((R) & 0xe0) >> 5))
-
-/*@}*/
-
-
-#endif /* COLORMAC_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 colormac.h

+ * Color-related macros

+ */

+

+

+#ifndef COLORMAC_H

+#define COLORMAC_H

+

+

+#include "config.h"

+#include "macros.h"

+#include "mtypes.h"

+

+

+/** \def BYTE_TO_CHAN

+ * Convert from GLbyte to GLchan */

+

+/** \def UBYTE_TO_CHAN

+ * Convert from GLubyte to GLchan */

+

+/** \def SHORT_TO_CHAN

+ * Convert from GLshort to GLchan */

+

+/** \def USHORT_TO_CHAN

+ * Convert from GLushort to GLchan */

+

+/** \def INT_TO_CHAN

+ * Convert from GLint to GLchan */

+

+/** \def UINT_TO_CHAN

+ * Convert from GLuint to GLchan */

+

+/** \def CHAN_TO_UBYTE

+ * Convert from GLchan to GLubyte */

+

+/** \def CHAN_TO_FLOAT

+ * Convert from GLchan to GLfloat */

+

+/** \def CLAMPED_FLOAT_TO_CHAN

+ * Convert from GLclampf to GLchan */

+

+/** \def UNCLAMPED_FLOAT_TO_CHAN

+ * Convert from GLfloat to GLchan */

+

+/** \def COPY_CHAN4

+ * Copy a GLchan[4] array */

+

+#if CHAN_BITS == 8

+

+#define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (GLchan) (b))

+#define UBYTE_TO_CHAN(b)  (b)

+#define SHORT_TO_CHAN(s)  ((s) < 0 ? 0 : (GLchan) ((s) >> 7))

+#define USHORT_TO_CHAN(s) ((GLchan) ((s) >> 8))

+#define INT_TO_CHAN(i)    ((i) < 0 ? 0 : (GLchan) ((i) >> 23))

+#define UINT_TO_CHAN(i)   ((GLchan) ((i) >> 24))

+

+#define CHAN_TO_UBYTE(c)  (c)

+#define CHAN_TO_FLOAT(c)  UBYTE_TO_FLOAT(c)

+

+#define CLAMPED_FLOAT_TO_CHAN(c, f)    CLAMPED_FLOAT_TO_UBYTE(c, f)

+#define UNCLAMPED_FLOAT_TO_CHAN(c, f)  UNCLAMPED_FLOAT_TO_UBYTE(c, f)

+

+#define COPY_CHAN4(DST, SRC)  COPY_4UBV(DST, SRC)

+

+#elif CHAN_BITS == 16

+

+#define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (((GLchan) (b)) * 516))

+#define UBYTE_TO_CHAN(b)  ((((GLchan) (b)) << 8) | ((GLchan) (b)))

+#define SHORT_TO_CHAN(s)  ((s) < 0 ? 0 : (GLchan) (s))

+#define USHORT_TO_CHAN(s) (s)

+#define INT_TO_CHAN(i)    ((i) < 0 ? 0 : (GLchan) ((i) >> 15))

+#define UINT_TO_CHAN(i)   ((GLchan) ((i) >> 16))

+

+#define CHAN_TO_UBYTE(c)  ((c) >> 8)

+#define CHAN_TO_FLOAT(c)  ((GLfloat) ((c) * (1.0 / CHAN_MAXF)))

+

+#define CLAMPED_FLOAT_TO_CHAN(c, f)    CLAMPED_FLOAT_TO_USHORT(c, f)

+#define UNCLAMPED_FLOAT_TO_CHAN(c, f)  UNCLAMPED_FLOAT_TO_USHORT(c, f)

+

+#define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)

+

+#elif CHAN_BITS == 32

+

+/* XXX floating-point color channels not fully thought-out */

+#define BYTE_TO_CHAN(b)   ((GLfloat) ((b) * (1.0F / 127.0F)))

+#define UBYTE_TO_CHAN(b)  ((GLfloat) ((b) * (1.0F / 255.0F)))

+#define SHORT_TO_CHAN(s)  ((GLfloat) ((s) * (1.0F / 32767.0F)))

+#define USHORT_TO_CHAN(s) ((GLfloat) ((s) * (1.0F / 65535.0F)))

+#define INT_TO_CHAN(i)    ((GLfloat) ((i) * (1.0F / 2147483647.0F)))

+#define UINT_TO_CHAN(i)   ((GLfloat) ((i) * (1.0F / 4294967295.0F)))

+

+#define CHAN_TO_UBYTE(c)  FLOAT_TO_UBYTE(c)

+#define CHAN_TO_FLOAT(c)  (c)

+

+#define CLAMPED_FLOAT_TO_CHAN(c, f)  c = (f)

+#define UNCLAMPED_FLOAT_TO_CHAN(c, f)      c = (f)

+

+#define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)

+

+#else

+

+#error unexpected CHAN_BITS size

+

+#endif

+

+

+/**

+ * Convert 3 channels at once.

+ *

+ * \param dst pointer to destination GLchan[3] array.

+ * \param f pointer to source GLfloat[3] array.

+ *

+ * \sa #UNCLAMPED_FLOAT_TO_CHAN.

+ */

+#define UNCLAMPED_FLOAT_TO_RGB_CHAN(dst, f)	\

+do {						\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[0], (f)[0]);	\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[1], (f)[1]);	\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[2], (f)[2]);	\

+} while (0)

+

+

+/**

+ * Convert 4 channels at once.

+ *

+ * \param dst pointer to destination GLchan[4] array.

+ * \param f pointer to source GLfloat[4] array.

+ *

+ * \sa #UNCLAMPED_FLOAT_TO_CHAN.

+ */

+#define UNCLAMPED_FLOAT_TO_RGBA_CHAN(dst, f)	\

+do {						\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[0], (f)[0]);	\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[1], (f)[1]);	\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[2], (f)[2]);	\

+   UNCLAMPED_FLOAT_TO_CHAN((dst)[3], (f)[3]);	\

+} while (0)

+

+

+

+/**

+ * \name Generic color packing macros.  All inputs should be GLubytes.

+ *

+ * \todo We may move these into texstore.h at some point.

+ */

+/*@{*/

+

+#define PACK_COLOR_8888( X, Y, Z, W ) \

+   (((X) << 24) | ((Y) << 16) | ((Z) << 8) | (W))

+

+#define PACK_COLOR_8888_REV( X, Y, Z, W ) \

+   (((W) << 24) | ((Z) << 16) | ((Y) << 8) | (X))

+

+#define PACK_COLOR_888( X, Y, Z ) \

+   (((X) << 16) | ((Y) << 8) | (Z))

+

+#define PACK_COLOR_565( X, Y, Z )                                  \

+   ((((X) & 0xf8) << 8) | (((Y) & 0xfc) << 3) | (((Z) & 0xf8) >> 3))

+

+#define PACK_COLOR_565_REV( X, Y, Z ) \

+   (((X) & 0xf8) | ((Y) & 0xe0) >> 5 | (((Y) & 0x1c) << 11) | (((Z) & 0xf8) << 5))

+

+#define PACK_COLOR_5551( R, G, B, A )					\

+   ((((R) & 0xf8) << 8) | (((G) & 0xf8) << 3) | (((B) & 0xf8) >> 2) |	\

+    ((A) ? 1 : 0))

+

+#define PACK_COLOR_1555( A, B, G, R )					\

+   ((((B) & 0xf8) << 7) | (((G) & 0xf8) << 2) | (((R) & 0xf8) >> 3) |	\

+    ((A) ? 0x8000 : 0))

+

+#define PACK_COLOR_1555_REV( A, B, G, R )					\

+   ((((B) & 0xf8) >> 1) | (((G) & 0xc0) >> 6) | (((G) & 0x38) << 10) | (((R) & 0xf8) << 5) |	\

+    ((A) ? 0x80 : 0))

+

+#define PACK_COLOR_2101010( A, B, G, R )					\

+   (((B) << 22) | ((G) << 12) | ((R) << 2) |	\

+    (((A) & 0xc0) << 24))

+

+#define PACK_COLOR_4444( R, G, B, A )					\

+   ((((R) & 0xf0) << 8) | (((G) & 0xf0) << 4) | ((B) & 0xf0) | ((A) >> 4))

+

+#define PACK_COLOR_4444_REV( R, G, B, A )				\

+   ((((B) & 0xf0) << 8) | (((A) & 0xf0) << 4) | ((R) & 0xf0) | ((G) >> 4))

+

+#define PACK_COLOR_44( L, A )						\

+   (((L) & 0xf0) | (((A) & 0xf0) >> 4))

+

+#define PACK_COLOR_88( L, A )						\

+   (((L) << 8) | (A))

+

+#define PACK_COLOR_88_REV( L, A )					\

+   (((A) << 8) | (L))

+

+#define PACK_COLOR_1616( L, A )						\

+   (((L) << 16) | (A))

+

+#define PACK_COLOR_1616_REV( L, A )					\

+   (((A) << 16) | (L))

+

+#define PACK_COLOR_332( R, G, B )					\

+   (((R) & 0xe0) | (((G) & 0xe0) >> 3) | (((B) & 0xc0) >> 6))

+

+#define PACK_COLOR_233( B, G, R )					\

+   (((B) & 0xc0) | (((G) & 0xe0) >> 2) | (((R) & 0xe0) >> 5))

+

+/*@}*/

+

+

+#endif /* COLORMAC_H */

diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c
index 52d5badf3..a18a67ce2 100644
--- a/mesalib/src/mesa/main/colortab.c
+++ b/mesalib/src/mesa/main/colortab.c
@@ -1,1133 +1,932 @@
-/*
- * 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 "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(GLcontext *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;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_PROXY_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_PRECONVOLUTION];
-         proxy = GL_TRUE;
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
-            return;
-         }
-         table = &(texUnit->ColorTable);
-         scale = ctx->Pixel.TextureColorTableScale;
-         bias = ctx->Pixel.TextureColorTableBias;
-         break;
-      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
-            return;
-         }
-         table = &(texUnit->ProxyColorTable);
-         proxy = GL_TRUE;
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCONVOLUTION];
-         proxy = GL_TRUE;
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
-         break;
-      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
-         proxy = GL_TRUE;
-         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;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
-            return;
-         }
-         table = &(texUnit->ColorTable);
-         scale = ctx->Pixel.TextureColorTableScale;
-         bias = ctx->Pixel.TextureColorTableBias;
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
-         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];
-   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;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
-            return;
-         }
-         table = &(texUnit->ColorTable);
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         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;
-
-   _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
-                              format, type, data, &ctx->Pack, 0x0);
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-
-static void GLAPIENTRY
-_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   GLfloat *scale, *bias;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-   case GL_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-      break;
-   case GL_TEXTURE_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.TextureColorTableScale;
-      bias  = ctx->Pixel.TextureColorTableBias;
-      break;
-   case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-      break;
-   case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
-      return;
-   }
-
-   if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-      COPY_4V(scale, params);
-   }
-   else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-      COPY_4V(bias, params);
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");
-      return;
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-
-static void GLAPIENTRY
-_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   GLfloat fparams[4];
-   if (pname == GL_COLOR_TABLE_SGI ||
-       pname == GL_TEXTURE_COLOR_TABLE_SGI ||
-       pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
-       pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI) {
-      /* four values */
-      fparams[0] = (GLfloat) params[0];
-      fparams[1] = (GLfloat) params[1];
-      fparams[2] = (GLfloat) params[2];
-      fparams[3] = (GLfloat) params[3];
-   }
-   else {
-      /* one values */
-      fparams[0] = (GLfloat) params[0];
-   }
-   _mesa_ColorTableParameterfv(target, pname, fparams);
-}
-
-
-
-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;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION]);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION]);
-            return;
-         }
-         break;
-      case GL_PROXY_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
-            return;
-         }
-         table = &(texUnit->ColorTable);
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.TextureColorTableScale);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.TextureColorTableBias);
-            return;
-         }
-         break;
-      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
-            return;
-         }
-         table = &(texUnit->ProxyColorTable);
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION]);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION]);
-            return;
-         }
-         break;
-      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX]);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX]);
-            return;
-         }
-         break;
-      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
-         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;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            GLfloat *scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-            params[0] = (GLint) scale[0];
-            params[1] = (GLint) scale[1];
-            params[2] = (GLint) scale[2];
-            params[3] = (GLint) scale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            GLfloat *bias = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-            params[0] = (GLint) bias[0];
-            params[1] = (GLint) bias[1];
-            params[2] = (GLint) bias[2];
-            params[3] = (GLint) bias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
-            return;
-         }
-         table = &(texUnit->ColorTable);
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            params[0] = (GLint) ctx->Pixel.TextureColorTableScale[0];
-            params[1] = (GLint) ctx->Pixel.TextureColorTableScale[1];
-            params[2] = (GLint) ctx->Pixel.TextureColorTableScale[2];
-            params[3] = (GLint) ctx->Pixel.TextureColorTableScale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            params[0] = (GLint) ctx->Pixel.TextureColorTableBias[0];
-            params[1] = (GLint) ctx->Pixel.TextureColorTableBias[1];
-            params[2] = (GLint) ctx->Pixel.TextureColorTableBias[2];
-            params[3] = (GLint) ctx->Pixel.TextureColorTableBias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
-         if (!ctx->Extensions.SGI_texture_color_table) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
-            return;
-         }
-         table = &(texUnit->ProxyColorTable);
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            GLfloat *scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-            params[0] = (GLint) scale[0];
-            params[1] = (GLint) scale[1];
-            params[2] = (GLint) scale[2];
-            params[3] = (GLint) scale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            GLfloat *bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-            params[0] = (GLint) bias[0];
-            params[1] = (GLint) bias[1];
-            params[2] = (GLint) bias[2];
-            params[3] = (GLint) bias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            GLfloat *scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-            params[0] = (GLint) scale[0];
-            params[0] = (GLint) scale[1];
-            params[0] = (GLint) scale[2];
-            params[0] = (GLint) scale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            GLfloat *bias = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-            params[0] = (GLint) bias[0];
-            params[1] = (GLint) bias[1];
-            params[2] = (GLint) bias[2];
-            params[3] = (GLint) bias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
-         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;
-   }
-}
-
-
-/*
- * Initialize all colortables for a context.
- */
-void
-_mesa_init_colortables( GLcontext * ctx )
-{
-   GLuint i;
-   for (i = 0; i < COLORTABLE_MAX; i++) {
-      _mesa_init_colortable(&ctx->ColorTable[i]);
-      _mesa_init_colortable(&ctx->ProxyColorTable[i]);
-   }
-}
-
-
-/*
- * Free all colortable data for a context
- */
-void
-_mesa_free_colortables_data( GLcontext *ctx )
-{
-   GLuint i;
-   for (i = 0; i < COLORTABLE_MAX; i++) {
-      _mesa_free_colortable_data(&ctx->ColorTable[i]);
-      _mesa_free_colortable_data(&ctx->ProxyColorTable[i]);
-   }
-}
+/*

+ * 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 "pack.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;

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");

+            return;

+         }

+         table = &(texUnit->ColorTable);

+         scale = ctx->Pixel.TextureColorTableScale;

+         bias = ctx->Pixel.TextureColorTableBias;

+         break;

+      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");

+            return;

+         }

+         table = &(texUnit->ProxyColorTable);

+         proxy = GL_TRUE;

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

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");

+            return;

+         }

+         table = &(texUnit->ColorTable);

+         scale = ctx->Pixel.TextureColorTableScale;

+         bias = ctx->Pixel.TextureColorTableBias;

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

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

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");

+            return;

+         }

+         table = &(texUnit->ColorTable);

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

+

+   _mesa_pack_rgba_span_float(ctx, table->Size, rgba,

+                              format, type, data, &ctx->Pack, 0x0);

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+}

+

+

+

+static void GLAPIENTRY

+_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)

+{

+   GLfloat *scale, *bias;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   switch (target) {

+   case GL_TEXTURE_COLOR_TABLE_SGI:

+      scale = ctx->Pixel.TextureColorTableScale;

+      bias  = ctx->Pixel.TextureColorTableBias;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");

+      return;

+   }

+

+   if (pname == GL_COLOR_TABLE_SCALE_SGI) {

+      COPY_4V(scale, params);

+   }

+   else if (pname == GL_COLOR_TABLE_BIAS_SGI) {

+      COPY_4V(bias, params);

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameterfv(pname)");

+      return;

+   }

+

+   ctx->NewState |= _NEW_PIXEL;

+}

+

+

+

+static void GLAPIENTRY

+_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   GLfloat fparams[4];

+   if (pname == GL_TEXTURE_COLOR_TABLE_SGI) {

+      /* four values */

+      fparams[0] = (GLfloat) params[0];

+      fparams[1] = (GLfloat) params[1];

+      fparams[2] = (GLfloat) params[2];

+      fparams[3] = (GLfloat) params[3];

+   }

+   else {

+      /* one values */

+      fparams[0] = (GLfloat) params[0];

+   }

+   _mesa_ColorTableParameterfv(target, pname, fparams);

+}

+

+

+

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

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");

+            return;

+         }

+         table = &(texUnit->ColorTable);

+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {

+            COPY_4V(params, ctx->Pixel.TextureColorTableScale);

+            return;

+         }

+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {

+            COPY_4V(params, ctx->Pixel.TextureColorTableBias);

+            return;

+         }

+         break;

+      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");

+            return;

+         }

+         table = &(texUnit->ProxyColorTable);

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

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");

+            return;

+         }

+         table = &(texUnit->ColorTable);

+         if (pname == GL_COLOR_TABLE_SCALE_SGI) {

+            params[0] = (GLint) ctx->Pixel.TextureColorTableScale[0];

+            params[1] = (GLint) ctx->Pixel.TextureColorTableScale[1];

+            params[2] = (GLint) ctx->Pixel.TextureColorTableScale[2];

+            params[3] = (GLint) ctx->Pixel.TextureColorTableScale[3];

+            return;

+         }

+         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {

+            params[0] = (GLint) ctx->Pixel.TextureColorTableBias[0];

+            params[1] = (GLint) ctx->Pixel.TextureColorTableBias[1];

+            params[2] = (GLint) ctx->Pixel.TextureColorTableBias[2];

+            params[3] = (GLint) ctx->Pixel.TextureColorTableBias[3];

+            return;

+         }

+         break;

+      case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:

+         if (!ctx->Extensions.SGI_texture_color_table) {

+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");

+            return;

+         }

+         table = &(texUnit->ProxyColorTable);

+         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/colortab.h b/mesalib/src/mesa/main/colortab.h
index 303c9fb30..81b4e008b 100644
--- a/mesalib/src/mesa/main/colortab.h
+++ b/mesalib/src/mesa/main/colortab.h
@@ -1,88 +1,84 @@
-/*
- * 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 COLORTAB_H
-#define COLORTAB_H
-
-
-#include "main/mtypes.h"
-
-#if FEATURE_colortable
-
-extern void GLAPIENTRY
-_mesa_ColorTable( GLenum target, GLenum internalformat,
-                  GLsizei width, GLenum format, GLenum type,
-                  const GLvoid *table );
-
-extern void GLAPIENTRY
-_mesa_ColorSubTable( GLenum target, GLsizei start,
-                     GLsizei count, GLenum format, GLenum type,
-                     const GLvoid *table );
-
-extern void
-_mesa_init_colortable_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_colortable */
-
-#include "main/compiler.h"
-
-static INLINE void GLAPIENTRY
-_mesa_ColorTable( GLenum target, GLenum internalformat,
-                  GLsizei width, GLenum format, GLenum type,
-                  const GLvoid *table )
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void GLAPIENTRY
-_mesa_ColorSubTable( GLenum target, GLsizei start,
-                     GLsizei count, GLenum format, GLenum type,
-                     const GLvoid *table )
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_init_colortable_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_colortable */
-
-
-extern void
-_mesa_init_colortable( struct gl_color_table *table );
-
-extern void
-_mesa_free_colortable_data( struct gl_color_table *table );
-
-extern void 
-_mesa_init_colortables( GLcontext *ctx );
-
-extern void 
-_mesa_free_colortables_data( GLcontext *ctx );
-
-
-#endif /* COLORTAB_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.

+ */

+

+

+#ifndef COLORTAB_H

+#define COLORTAB_H

+

+

+#include "compiler.h"

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct gl_color_table;

+

+#if FEATURE_colortable

+

+extern void GLAPIENTRY

+_mesa_ColorTable( GLenum target, GLenum internalformat,

+                  GLsizei width, GLenum format, GLenum type,

+                  const GLvoid *table );

+

+extern void GLAPIENTRY

+_mesa_ColorSubTable( GLenum target, GLsizei start,

+                     GLsizei count, GLenum format, GLenum type,

+                     const GLvoid *table );

+

+extern void

+_mesa_init_colortable_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_colortable */

+

+static INLINE void GLAPIENTRY

+_mesa_ColorTable( GLenum target, GLenum internalformat,

+                  GLsizei width, GLenum format, GLenum type,

+                  const GLvoid *table )

+{

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void GLAPIENTRY

+_mesa_ColorSubTable( GLenum target, GLsizei start,

+                     GLsizei count, GLenum format, GLenum type,

+                     const GLvoid *table )

+{

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_init_colortable_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_colortable */

+

+

+extern void

+_mesa_init_colortable( struct gl_color_table *table );

+

+extern void

+_mesa_free_colortable_data( struct gl_color_table *table );

+

+#endif /* COLORTAB_H */

diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index 800eb8390..41cd48bc6 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -1,512 +1,516 @@
-/*
- * 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
- */
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#  define PUBLIC __attribute__((visibility("default")))
-#  define USED __attribute__((used))
-#else
-#  define PUBLIC
-#  define USED
-#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
-
-#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
-
-/**
- * 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 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

+ */

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

+ */

+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))

+#  define PUBLIC __attribute__((visibility("default")))

+#  define USED __attribute__((used))

+#else

+#  define PUBLIC

+#  define USED

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

+

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

+

+/**

+ * 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/condrender.c b/mesalib/src/mesa/main/condrender.c
index 8d9a91d54..250397854 100644
--- a/mesalib/src/mesa/main/condrender.c
+++ b/mesalib/src/mesa/main/condrender.c
@@ -1,147 +1,147 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.8
- *
- * 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 (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 condrender.c
- * Conditional rendering functions
- *
- * \author Brian Paul
- */
-
-#include "glheader.h"
-#include "condrender.h"
-#include "enums.h"
-#include "queryobj.h"
-
-
-void GLAPIENTRY
-_mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
-{
-   struct gl_query_object *q;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (!ctx->Extensions.NV_conditional_render || ctx->Query.CondRenderQuery) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()");
-      return;
-   }
-
-   ASSERT(ctx->Query.CondRenderMode == GL_NONE);
-
-   switch (mode) {
-   case GL_QUERY_WAIT:
-   case GL_QUERY_NO_WAIT:
-   case GL_QUERY_BY_REGION_WAIT:
-   case GL_QUERY_BY_REGION_NO_WAIT:
-      /* OK */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginConditionalRender(mode=%s)",
-                  _mesa_lookup_enum_by_nr(mode));
-      return;
-   }
-
-   q = _mesa_lookup_query_object(ctx, queryId);
-   if (!q) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glBeginConditionalRender(bad queryId=%u)", queryId);
-      return;
-   }
-   ASSERT(q->Id == queryId);
-
-   if (q->Target != GL_SAMPLES_PASSED) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()");
-      return;
-   }
-
-   ctx->Query.CondRenderQuery = q;
-   ctx->Query.CondRenderMode = mode;
-
-   if (ctx->Driver.BeginConditionalRender)
-      ctx->Driver.BeginConditionalRender(ctx, q, mode);
-}
-
-
-void APIENTRY
-_mesa_EndConditionalRender(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   FLUSH_VERTICES(ctx, 0x0);
-
-   if (!ctx->Extensions.NV_conditional_render || !ctx->Query.CondRenderQuery) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndConditionalRender()");
-      return;
-   }
-
-   if (ctx->Driver.EndConditionalRender)
-      ctx->Driver.EndConditionalRender(ctx, ctx->Query.CondRenderQuery);
-
-   ctx->Query.CondRenderQuery = NULL;
-   ctx->Query.CondRenderMode = GL_NONE;
-}
-
-
-/**
- * This function is called by software rendering commands (all point,
- * line triangle drawing, glClear, glDrawPixels, glCopyPixels, and
- * glBitmap, glBlitFramebuffer) to determine if subsequent drawing
- * commands should be
- * executed or discarded depending on the current conditional
- * rendering state.  Ideally, this check would be implemented by the
- * GPU when doing hardware rendering.  XXX should this function be
- * called via a new driver hook?
- *
- * \return GL_TRUE if we should render, GL_FALSE if we should discard
- */
-GLboolean
-_mesa_check_conditional_render(GLcontext *ctx)
-{
-   struct gl_query_object *q = ctx->Query.CondRenderQuery;
-
-   if (!q) {
-      /* no query in progress - draw normally */
-      return GL_TRUE;
-   }
-
-   switch (ctx->Query.CondRenderMode) {
-   case GL_QUERY_BY_REGION_WAIT:
-      /* fall-through */
-   case GL_QUERY_WAIT:
-      if (!q->Ready) {
-         ctx->Driver.WaitQuery(ctx, q);
-      }
-      return q->Result > 0;
-   case GL_QUERY_BY_REGION_NO_WAIT:
-      /* fall-through */
-   case GL_QUERY_NO_WAIT:
-      return q->Ready ? (q->Result > 0) : GL_TRUE;
-   default:
-      _mesa_problem(ctx, "Bad cond render mode %s in "
-                    " _mesa_check_conditional_render()",
-                    _mesa_lookup_enum_by_nr(ctx->Query.CondRenderMode));
-      return GL_TRUE;
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.8

+ *

+ * 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 (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 condrender.c

+ * Conditional rendering functions

+ *

+ * \author Brian Paul

+ */

+

+#include "glheader.h"

+#include "condrender.h"

+#include "enums.h"

+#include "queryobj.h"

+

+

+void GLAPIENTRY

+_mesa_BeginConditionalRender(GLuint queryId, GLenum mode)

+{

+   struct gl_query_object *q;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (!ctx->Extensions.NV_conditional_render || ctx->Query.CondRenderQuery) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()");

+      return;

+   }

+

+   ASSERT(ctx->Query.CondRenderMode == GL_NONE);

+

+   switch (mode) {

+   case GL_QUERY_WAIT:

+   case GL_QUERY_NO_WAIT:

+   case GL_QUERY_BY_REGION_WAIT:

+   case GL_QUERY_BY_REGION_NO_WAIT:

+      /* OK */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginConditionalRender(mode=%s)",

+                  _mesa_lookup_enum_by_nr(mode));

+      return;

+   }

+

+   q = _mesa_lookup_query_object(ctx, queryId);

+   if (!q) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glBeginConditionalRender(bad queryId=%u)", queryId);

+      return;

+   }

+   ASSERT(q->Id == queryId);

+

+   if (q->Target != GL_SAMPLES_PASSED) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()");

+      return;

+   }

+

+   ctx->Query.CondRenderQuery = q;

+   ctx->Query.CondRenderMode = mode;

+

+   if (ctx->Driver.BeginConditionalRender)

+      ctx->Driver.BeginConditionalRender(ctx, q, mode);

+}

+

+

+void APIENTRY

+_mesa_EndConditionalRender(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   FLUSH_VERTICES(ctx, 0x0);

+

+   if (!ctx->Extensions.NV_conditional_render || !ctx->Query.CondRenderQuery) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEndConditionalRender()");

+      return;

+   }

+

+   if (ctx->Driver.EndConditionalRender)

+      ctx->Driver.EndConditionalRender(ctx, ctx->Query.CondRenderQuery);

+

+   ctx->Query.CondRenderQuery = NULL;

+   ctx->Query.CondRenderMode = GL_NONE;

+}

+

+

+/**

+ * This function is called by software rendering commands (all point,

+ * line triangle drawing, glClear, glDrawPixels, glCopyPixels, and

+ * glBitmap, glBlitFramebuffer) to determine if subsequent drawing

+ * commands should be

+ * executed or discarded depending on the current conditional

+ * rendering state.  Ideally, this check would be implemented by the

+ * GPU when doing hardware rendering.  XXX should this function be

+ * called via a new driver hook?

+ *

+ * \return GL_TRUE if we should render, GL_FALSE if we should discard

+ */

+GLboolean

+_mesa_check_conditional_render(struct gl_context *ctx)

+{

+   struct gl_query_object *q = ctx->Query.CondRenderQuery;

+

+   if (!q) {

+      /* no query in progress - draw normally */

+      return GL_TRUE;

+   }

+

+   switch (ctx->Query.CondRenderMode) {

+   case GL_QUERY_BY_REGION_WAIT:

+      /* fall-through */

+   case GL_QUERY_WAIT:

+      if (!q->Ready) {

+         ctx->Driver.WaitQuery(ctx, q);

+      }

+      return q->Result > 0;

+   case GL_QUERY_BY_REGION_NO_WAIT:

+      /* fall-through */

+   case GL_QUERY_NO_WAIT:

+      return q->Ready ? (q->Result > 0) : GL_TRUE;

+   default:

+      _mesa_problem(ctx, "Bad cond render mode %s in "

+                    " _mesa_check_conditional_render()",

+                    _mesa_lookup_enum_by_nr(ctx->Query.CondRenderMode));

+      return GL_TRUE;

+   }

+}

diff --git a/mesalib/src/mesa/main/condrender.h b/mesalib/src/mesa/main/condrender.h
index d55e9805f..49e9953be 100644
--- a/mesalib/src/mesa/main/condrender.h
+++ b/mesalib/src/mesa/main/condrender.h
@@ -1,45 +1,45 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.8
- *
- * 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 (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 CONDRENDER_H
-#define CONDRENDER_H
-
-
-#include "glheader.h"
-#include "context.h"
-
-
-extern void GLAPIENTRY
-_mesa_BeginConditionalRender(GLuint queryId, GLenum mode);
-
-extern void APIENTRY
-_mesa_EndConditionalRender(void);
-
-extern GLboolean
-_mesa_check_conditional_render(GLcontext *ctx);
-
-
-#endif /* CONDRENDER_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.8

+ *

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

+#define CONDRENDER_H

+

+

+#include "glheader.h"

+#include "context.h"

+

+

+extern void GLAPIENTRY

+_mesa_BeginConditionalRender(GLuint queryId, GLenum mode);

+

+extern void APIENTRY

+_mesa_EndConditionalRender(void);

+

+extern GLboolean

+_mesa_check_conditional_render(struct gl_context *ctx);

+

+

+#endif /* CONDRENDER_H */

diff --git a/mesalib/src/mesa/main/config.h b/mesalib/src/mesa/main/config.h
index 0f2d1a8f8..a12f7f4f3 100644
--- a/mesalib/src/mesa/main/config.h
+++ b/mesalib/src/mesa/main/config.h
@@ -1,338 +1,358 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- * 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, 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 config.h
- * Tunable configuration parameters.
- */
-
-#ifndef MESA_CONFIG_H_INCLUDED
-#define MESA_CONFIG_H_INCLUDED
-
-
-/**
- * \name OpenGL implementation limits
- */
-/*@{*/
-
-/** Maximum modelview matrix stack depth */
-#define MAX_MODELVIEW_STACK_DEPTH 32
-
-/** Maximum projection matrix stack depth */
-#define MAX_PROJECTION_STACK_DEPTH 32
-
-/** Maximum texture matrix stack depth */
-#define MAX_TEXTURE_STACK_DEPTH 10
-
-/** Maximum color matrix stack depth */
-#define MAX_COLOR_STACK_DEPTH 4
-
-/** Maximum attribute stack depth */
-#define MAX_ATTRIB_STACK_DEPTH 16
-
-/** Maximum client attribute stack depth */
-#define MAX_CLIENT_ATTRIB_STACK_DEPTH 16
-
-/** Maximum recursion depth of display list calls */
-#define MAX_LIST_NESTING 64
-
-/** Maximum number of lights */
-#define MAX_LIGHTS 8
-
-/** Maximum user-defined clipping planes */
-#define MAX_CLIP_PLANES 6
-
-/** Maximum pixel map lookup table size */
-#define MAX_PIXEL_MAP_TABLE 256
-
-/** Maximum number of auxillary color buffers */
-#define MAX_AUX_BUFFERS 1
-
-/** Maximum order (degree) of curves */
-#ifdef AMIGA
-#   define MAX_EVAL_ORDER 12
-#else
-#   define MAX_EVAL_ORDER 30
-#endif
-
-/** Maximum Name stack depth */
-#define MAX_NAME_STACK_DEPTH 64
-
-/** Minimum point size */
-#define MIN_POINT_SIZE 1.0
-/** Maximum point size */
-#define MAX_POINT_SIZE 60.0
-/** Point size granularity */
-#define POINT_SIZE_GRANULARITY 0.1
-
-/** Minimum line width */
-#define MIN_LINE_WIDTH 1.0
-/** Maximum line width */
-#define MAX_LINE_WIDTH 10.0
-/** Line width granularity */
-#define LINE_WIDTH_GRANULARITY 0.1
-
-/** Max texture palette / color table size */
-#define MAX_COLOR_TABLE_SIZE 256
-
-/** Number of 1D/2D texture mipmap levels */
-#define MAX_TEXTURE_LEVELS 13
-
-/** Number of 3D texture mipmap levels */
-#define MAX_3D_TEXTURE_LEVELS 9
-
-/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
-#define MAX_CUBE_TEXTURE_LEVELS 13
-
-/** Maximum rectangular texture size - GL_NV_texture_rectangle */
-#define MAX_TEXTURE_RECT_SIZE 4096
-
-/** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */
-#define MAX_ARRAY_TEXTURE_LAYERS 64
-
-/**
- * Max number of texture coordinate units.  This mainly just applies to
- * the fixed-function vertex code.  This will be difficult to raise above
- * eight because of various vertex attribute bitvectors.
- */
-#define MAX_TEXTURE_COORD_UNITS 8
-
-/**
- * Max number of texture image units.  Also determines number of texture
- * samplers in shaders.
- */
-#define MAX_TEXTURE_IMAGE_UNITS 16
-
-/**
- * Larger of MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.
- * This value is only used for dimensioning arrays.
- * Either MAX_TEXTURE_COORD_UNITS or MAX_TEXTURE_IMAGE_UNITS (or the
- * corresponding ctx->Const.MaxTextureCoord/ImageUnits fields) should be
- * used almost everywhere else.
- */
-#define MAX_TEXTURE_UNITS ((MAX_TEXTURE_COORD_UNITS > MAX_TEXTURE_IMAGE_UNITS) ? MAX_TEXTURE_COORD_UNITS : MAX_TEXTURE_IMAGE_UNITS)
-
-
-/** 
- * Maximum viewport/image width. Must accomodate all texture sizes too. 
- */
-
-#ifndef MAX_WIDTH
-#   define MAX_WIDTH 4096
-#endif
-/** Maximum viewport/image height */
-#ifndef MAX_HEIGHT
-#   define MAX_HEIGHT 4096
-#endif
-
-/** Maxmimum size for CVA.  May be overridden by the drivers.  */
-#define MAX_ARRAY_LOCK_SIZE 3000
-
-/** Subpixel precision for antialiasing, window coordinate snapping */
-#define SUB_PIXEL_BITS 4
-
-/** Size of histogram tables */
-#define HISTOGRAM_TABLE_SIZE 256
-
-/** Max convolution filter width */
-#define MAX_CONVOLUTION_WIDTH 9
-/** Max convolution filter height */
-#define MAX_CONVOLUTION_HEIGHT 9
-
-/** For GL_ARB_texture_compression */
-#define MAX_COMPRESSED_TEXTURE_FORMATS 25
-
-/** For GL_EXT_texture_filter_anisotropic */
-#define MAX_TEXTURE_MAX_ANISOTROPY 16.0
-
-/** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */
-#define MAX_TEXTURE_LOD_BIAS 12.0
-
-/** For any program target/extension */
-/*@{*/
-#define MAX_PROGRAM_INSTRUCTIONS       (16 * 1024)
-
-/**
- * Per-program constants (power of two)
- *
- * \c MAX_PROGRAM_LOCAL_PARAMS and \c MAX_UNIFORMS are just the assembly shader
- * and GLSL shader names for the same thing.  They should \b always have the
- * same value.  Each refers to the number of vec4 values supplied as
- * per-program parameters.
- */
-/*@{*/
-#define MAX_PROGRAM_LOCAL_PARAMS       1024
-#define MAX_UNIFORMS                   1024
-/*@}*/
-
-/**
- * Per-context constants (power of two)
- *
- * \note
- * This value should always be less than or equal to \c MAX_PROGRAM_LOCAL_PARAMS
- * and \c MAX_VERTEX_PROGRAM_PARAMS.  Otherwise some applications will make
- * incorrect assumptions.
- */
-#define MAX_PROGRAM_ENV_PARAMS         256
-
-#define MAX_PROGRAM_MATRICES           8
-#define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
-#define MAX_PROGRAM_CALL_DEPTH         8
-#define MAX_PROGRAM_TEMPS              256
-#define MAX_PROGRAM_ADDRESS_REGS       2
-#define MAX_VARYING                    16    /**< number of float[4] vectors */
-#define MAX_SAMPLERS                   MAX_TEXTURE_IMAGE_UNITS
-#define MAX_PROGRAM_INPUTS             32
-#define MAX_PROGRAM_OUTPUTS            64
-/*@}*/
-
-/** For GL_ARB_vertex_program */
-/*@{*/
-#define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
-#define MAX_VERTEX_PROGRAM_PARAMS       MAX_UNIFORMS
-/*@}*/
-
-/** For GL_ARB_fragment_program */
-/*@{*/
-#define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 0
-/*@}*/
-
-/** For GL_NV_vertex_program */
-/*@{*/
-#define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128
-#define MAX_NV_VERTEX_PROGRAM_TEMPS         12
-#define MAX_NV_VERTEX_PROGRAM_PARAMS        96
-#define MAX_NV_VERTEX_PROGRAM_INPUTS        16
-#define MAX_NV_VERTEX_PROGRAM_OUTPUTS       15
-/*@}*/
-
-/** For GL_NV_fragment_program */
-/*@{*/
-#define MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS 1024 /* 72 for GL_ARB_f_p */
-#define MAX_NV_FRAGMENT_PROGRAM_TEMPS         96
-#define MAX_NV_FRAGMENT_PROGRAM_PARAMS        64
-#define MAX_NV_FRAGMENT_PROGRAM_INPUTS        12
-#define MAX_NV_FRAGMENT_PROGRAM_OUTPUTS        3
-#define MAX_NV_FRAGMENT_PROGRAM_WRITE_ONLYS    2
-/*@}*/
-
-
-/** For GL_ARB_vertex_shader */
-/*@{*/
-#define MAX_VERTEX_GENERIC_ATTRIBS 16
-#define MAX_VERTEX_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS
-#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_VERTEX_TEXTURE_IMAGE_UNITS + \
-					  MAX_TEXTURE_IMAGE_UNITS)
-/*@}*/
-
-
-/** For GL_ARB_draw_buffers */
-/*@{*/
-#define MAX_DRAW_BUFFERS 8
-/*@}*/
-
-
-/** For GL_EXT_framebuffer_object */
-/*@{*/
-#define MAX_COLOR_ATTACHMENTS 8
-/*@}*/
-
-/** For GL_ATI_envmap_bump - support bump mapping on first 8 units */
-#define SUPPORTED_ATI_BUMP_UNITS 0xff
-
-/** For GL_EXT_transform_feedback */
-#define MAX_FEEDBACK_ATTRIBS 32
-
-/** For GL_ARB_geometry_shader4 */
-/*@{*/
-#define MAX_GEOMETRY_TEXTURE_IMAGE_UNITS             8
-#define MAX_GEOMETRY_VARYING_COMPONENTS              32
-#define MAX_VERTEX_VARYING_COMPONENTS                32
-#define MAX_GEOMETRY_UNIFORM_COMPONENTS              512
-#define MAX_GEOMETRY_OUTPUT_VERTICES                 256
-#define MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS         1024
-/*@}*/
-
-
-/**
- * \name Mesa-specific parameters
- */
-/*@{*/
-
-
-/**
- * If non-zero use GLdouble for walking triangle edges, for better accuracy.
- */
-#define TRIANGLE_WALK_DOUBLE 0
-
-
-/**
- * Bits per depth buffer value (max is 32).
- */
-#ifndef DEFAULT_SOFTWARE_DEPTH_BITS
-#define DEFAULT_SOFTWARE_DEPTH_BITS 16
-#endif
-/** Depth buffer data type */
-#if DEFAULT_SOFTWARE_DEPTH_BITS <= 16
-#define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort
-#else
-#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint
-#endif
-
-
-/**
- * Bits per stencil value: 8
- */
-#define STENCIL_BITS 8
-
-
-/**
- * Bits per color channel:  8, 16 or 32
- */
-#ifndef CHAN_BITS
-#define CHAN_BITS 8
-#endif
-
-
-/*
- * Color channel component order
- * 
- * \note Changes will almost certainly cause problems at this time.
- */
-#define RCOMP 0
-#define GCOMP 1
-#define BCOMP 2
-#define ACOMP 3
-
-
-/**
- * Maximum number of temporary vertices required for clipping.  
- *
- * Used in array_cache and tnl modules.
- */
-#define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1)
-
-
-#endif /* MESA_CONFIG_H_INCLUDED */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ * 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, 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 config.h

+ * Tunable configuration parameters.

+ */

+

+#ifndef MESA_CONFIG_H_INCLUDED

+#define MESA_CONFIG_H_INCLUDED

+

+

+/**

+ * \name OpenGL implementation limits

+ */

+/*@{*/

+

+/** Maximum modelview matrix stack depth */

+#define MAX_MODELVIEW_STACK_DEPTH 32

+

+/** Maximum projection matrix stack depth */

+#define MAX_PROJECTION_STACK_DEPTH 32

+

+/** Maximum texture matrix stack depth */

+#define MAX_TEXTURE_STACK_DEPTH 10

+

+/** Maximum color matrix stack depth */

+#define MAX_COLOR_STACK_DEPTH 4

+

+/** Maximum attribute stack depth */

+#define MAX_ATTRIB_STACK_DEPTH 16

+

+/** Maximum client attribute stack depth */

+#define MAX_CLIENT_ATTRIB_STACK_DEPTH 16

+

+/** Maximum recursion depth of display list calls */

+#define MAX_LIST_NESTING 64

+

+/** Maximum number of lights */

+#define MAX_LIGHTS 8

+

+/** Maximum user-defined clipping planes */

+#define MAX_CLIP_PLANES 6

+

+/** Maximum pixel map lookup table size */

+#define MAX_PIXEL_MAP_TABLE 256

+

+/** Maximum number of auxillary color buffers */

+#define MAX_AUX_BUFFERS 1

+

+/** Maximum order (degree) of curves */

+#ifdef AMIGA

+#   define MAX_EVAL_ORDER 12

+#else

+#   define MAX_EVAL_ORDER 30

+#endif

+

+/** Maximum Name stack depth */

+#define MAX_NAME_STACK_DEPTH 64

+

+/** Minimum point size */

+#define MIN_POINT_SIZE 1.0

+/** Maximum point size */

+#define MAX_POINT_SIZE 60.0

+/** Point size granularity */

+#define POINT_SIZE_GRANULARITY 0.1

+

+/** Minimum line width */

+#define MIN_LINE_WIDTH 1.0

+/** Maximum line width */

+#define MAX_LINE_WIDTH 10.0

+/** Line width granularity */

+#define LINE_WIDTH_GRANULARITY 0.1

+

+/** Max texture palette / color table size */

+#define MAX_COLOR_TABLE_SIZE 256

+

+/** Max memory to allow for a single texture image (in megabytes) */

+#define MAX_TEXTURE_MBYTES 1024

+

+/** Number of 1D/2D texture mipmap levels */

+#define MAX_TEXTURE_LEVELS 15

+

+/** Number of 3D texture mipmap levels */

+#define MAX_3D_TEXTURE_LEVELS 15

+

+/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */

+#define MAX_CUBE_TEXTURE_LEVELS 15

+

+/** Maximum rectangular texture size - GL_NV_texture_rectangle */

+#define MAX_TEXTURE_RECT_SIZE 16384

+

+/** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */

+#define MAX_ARRAY_TEXTURE_LAYERS 64

+

+/**

+ * Max number of texture coordinate units.  This mainly just applies to

+ * the fixed-function vertex code.  This will be difficult to raise above

+ * eight because of various vertex attribute bitvectors.

+ */

+#define MAX_TEXTURE_COORD_UNITS 8

+

+/**

+ * Max number of texture image units.  Also determines number of texture

+ * samplers in shaders.

+ */

+#define MAX_TEXTURE_IMAGE_UNITS 16

+

+/**

+ * Larger of MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.

+ * This value is only used for dimensioning arrays.

+ * Either MAX_TEXTURE_COORD_UNITS or MAX_TEXTURE_IMAGE_UNITS (or the

+ * corresponding ctx->Const.MaxTextureCoord/ImageUnits fields) should be

+ * used almost everywhere else.

+ */

+#define MAX_TEXTURE_UNITS ((MAX_TEXTURE_COORD_UNITS > MAX_TEXTURE_IMAGE_UNITS) ? MAX_TEXTURE_COORD_UNITS : MAX_TEXTURE_IMAGE_UNITS)

+

+

+/** 

+ * Maximum viewport/image width. Must accomodate all texture sizes too. 

+ */

+

+#ifndef MAX_WIDTH

+#   define MAX_WIDTH 16384

+#endif

+/** Maximum viewport/image height */

+#ifndef MAX_HEIGHT

+#   define MAX_HEIGHT 16384

+#endif

+

+/* XXX: hack to prevent stack overflow on windows until all temporary arrays

+ * [MAX_WIDTH] are allocated from the heap */

+#ifdef WIN32

+#undef MAX_TEXTURE_LEVELS

+#undef MAX_3D_TEXTURE_LEVELS

+#undef MAX_CUBE_TEXTURE_LEVELS

+#undef MAX_TEXTURE_RECT_SIZE

+#undef MAX_WIDTH

+#undef MAX_HEIGHT

+#define MAX_TEXTURE_LEVELS 13

+#define MAX_3D_TEXTURE_LEVELS 9

+#define MAX_CUBE_TEXTURE_LEVELS 13

+#define MAX_TEXTURE_RECT_SIZE 4096

+#define MAX_WIDTH 4096

+#define MAX_HEIGHT 4096

+#endif

+

+/** Maxmimum size for CVA.  May be overridden by the drivers.  */

+#define MAX_ARRAY_LOCK_SIZE 3000

+

+/** Subpixel precision for antialiasing, window coordinate snapping */

+#define SUB_PIXEL_BITS 4

+

+/** Size of histogram tables */

+#define HISTOGRAM_TABLE_SIZE 256

+

+/** Max convolution filter width */

+#define MAX_CONVOLUTION_WIDTH 9

+/** Max convolution filter height */

+#define MAX_CONVOLUTION_HEIGHT 9

+

+/** For GL_ARB_texture_compression */

+#define MAX_COMPRESSED_TEXTURE_FORMATS 25

+

+/** For GL_EXT_texture_filter_anisotropic */

+#define MAX_TEXTURE_MAX_ANISOTROPY 16.0

+

+/** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */

+#define MAX_TEXTURE_LOD_BIAS 14.0

+

+/** For any program target/extension */

+/*@{*/

+#define MAX_PROGRAM_INSTRUCTIONS       (16 * 1024)

+

+/**

+ * Per-program constants (power of two)

+ *

+ * \c MAX_PROGRAM_LOCAL_PARAMS and \c MAX_UNIFORMS are just the assembly shader

+ * and GLSL shader names for the same thing.  They should \b always have the

+ * same value.  Each refers to the number of vec4 values supplied as

+ * per-program parameters.

+ */

+/*@{*/

+#define MAX_PROGRAM_LOCAL_PARAMS       1024

+#define MAX_UNIFORMS                   1024

+/*@}*/

+

+/**

+ * Per-context constants (power of two)

+ *

+ * \note

+ * This value should always be less than or equal to \c MAX_PROGRAM_LOCAL_PARAMS

+ * and \c MAX_VERTEX_PROGRAM_PARAMS.  Otherwise some applications will make

+ * incorrect assumptions.

+ */

+#define MAX_PROGRAM_ENV_PARAMS         256

+

+#define MAX_PROGRAM_MATRICES           8

+#define MAX_PROGRAM_MATRIX_STACK_DEPTH 4

+#define MAX_PROGRAM_CALL_DEPTH         8

+#define MAX_PROGRAM_TEMPS              256

+#define MAX_PROGRAM_ADDRESS_REGS       2

+#define MAX_VARYING                    16    /**< number of float[4] vectors */

+#define MAX_SAMPLERS                   MAX_TEXTURE_IMAGE_UNITS

+#define MAX_PROGRAM_INPUTS             32

+#define MAX_PROGRAM_OUTPUTS            64

+/*@}*/

+

+/** For GL_ARB_vertex_program */

+/*@{*/

+#define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1

+#define MAX_VERTEX_PROGRAM_PARAMS       MAX_UNIFORMS

+/*@}*/

+

+/** For GL_ARB_fragment_program */

+/*@{*/

+#define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 0

+/*@}*/

+

+/** For GL_NV_vertex_program */

+/*@{*/

+#define MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS 128

+#define MAX_NV_VERTEX_PROGRAM_TEMPS         12

+#define MAX_NV_VERTEX_PROGRAM_PARAMS        96

+#define MAX_NV_VERTEX_PROGRAM_INPUTS        16

+#define MAX_NV_VERTEX_PROGRAM_OUTPUTS       15

+/*@}*/

+

+/** For GL_NV_fragment_program */

+/*@{*/

+#define MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS 1024 /* 72 for GL_ARB_f_p */

+#define MAX_NV_FRAGMENT_PROGRAM_TEMPS         96

+#define MAX_NV_FRAGMENT_PROGRAM_PARAMS        64

+#define MAX_NV_FRAGMENT_PROGRAM_INPUTS        12

+#define MAX_NV_FRAGMENT_PROGRAM_OUTPUTS        3

+#define MAX_NV_FRAGMENT_PROGRAM_WRITE_ONLYS    2

+/*@}*/

+

+

+/** For GL_ARB_vertex_shader */

+/*@{*/

+#define MAX_VERTEX_GENERIC_ATTRIBS 16

+#define MAX_VERTEX_TEXTURE_IMAGE_UNITS MAX_TEXTURE_IMAGE_UNITS

+#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_VERTEX_TEXTURE_IMAGE_UNITS + \

+					  MAX_TEXTURE_IMAGE_UNITS)

+/*@}*/

+

+

+/** For GL_ARB_draw_buffers */

+/*@{*/

+#define MAX_DRAW_BUFFERS 8

+/*@}*/

+

+

+/** For GL_EXT_framebuffer_object */

+/*@{*/

+#define MAX_COLOR_ATTACHMENTS 8

+/*@}*/

+

+/** For GL_ATI_envmap_bump - support bump mapping on first 8 units */

+#define SUPPORTED_ATI_BUMP_UNITS 0xff

+

+/** For GL_EXT_transform_feedback */

+#define MAX_FEEDBACK_ATTRIBS 32

+

+/** For GL_ARB_geometry_shader4 */

+/*@{*/

+#define MAX_GEOMETRY_TEXTURE_IMAGE_UNITS             8

+#define MAX_GEOMETRY_VARYING_COMPONENTS              32

+#define MAX_VERTEX_VARYING_COMPONENTS                32

+#define MAX_GEOMETRY_UNIFORM_COMPONENTS              512

+#define MAX_GEOMETRY_OUTPUT_VERTICES                 256

+#define MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS         1024

+/*@}*/

+

+

+/**

+ * \name Mesa-specific parameters

+ */

+/*@{*/

+

+

+/**

+ * If non-zero use GLdouble for walking triangle edges, for better accuracy.

+ */

+#define TRIANGLE_WALK_DOUBLE 0

+

+

+/**

+ * Bits per depth buffer value (max is 32).

+ */

+#ifndef DEFAULT_SOFTWARE_DEPTH_BITS

+#define DEFAULT_SOFTWARE_DEPTH_BITS 16

+#endif

+/** Depth buffer data type */

+#if DEFAULT_SOFTWARE_DEPTH_BITS <= 16

+#define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort

+#else

+#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint

+#endif

+

+

+/**

+ * Bits per stencil value: 8

+ */

+#define STENCIL_BITS 8

+

+

+/**

+ * Bits per color channel:  8, 16 or 32

+ */

+#ifndef CHAN_BITS

+#define CHAN_BITS 8

+#endif

+

+

+/*

+ * Color channel component order

+ * 

+ * \note Changes will almost certainly cause problems at this time.

+ */

+#define RCOMP 0

+#define GCOMP 1

+#define BCOMP 2

+#define ACOMP 3

+

+

+/**

+ * Maximum number of temporary vertices required for clipping.  

+ *

+ * Used in array_cache and tnl modules.

+ */

+#define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1)

+

+

+#endif /* MESA_CONFIG_H_INCLUDED */

diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 3bddf2570..a18af86a3 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -1,1782 +1,1885 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
- * 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, 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 context.c
- * Mesa context/visual/framebuffer management functions.
- * \author Brian Paul
- */
-
-/**
- * \mainpage Mesa Main Module
- *
- * \section MainIntroduction Introduction
- *
- * The Mesa Main module consists of all the files in the main/ directory.
- * Among the features of this module are:
- * <UL>
- * <LI> Structures to represent most GL state </LI>
- * <LI> State set/get functions </LI>
- * <LI> Display lists </LI>
- * <LI> Texture unit, object and image handling </LI>
- * <LI> Matrix and attribute stacks </LI>
- * </UL>
- *
- * Other modules are responsible for API dispatch, vertex transformation,
- * point/line/triangle setup, rasterization, vertex array caching,
- * vertex/fragment programs/shaders, etc.
- *
- *
- * \section AboutDoxygen About Doxygen
- *
- * If you're viewing this information as Doxygen-generated HTML you'll
- * see the documentation index at the top of this page.
- *
- * The first line lists the Mesa source code modules.
- * The second line lists the indexes available for viewing the documentation
- * for each module.
- *
- * Selecting the <b>Main page</b> link will display a summary of the module
- * (this page).
- *
- * Selecting <b>Data Structures</b> will list all C structures.
- *
- * Selecting the <b>File List</b> link will list all the source files in
- * the module.
- * Selecting a filename will show a list of all functions defined in that file.
- *
- * Selecting the <b>Data Fields</b> link will display a list of all
- * documented structure members.
- *
- * Selecting the <b>Globals</b> link will display a list
- * of all functions, structures, global variables and macros in the module.
- *
- */
-
-
-#include "glheader.h"
-#include "mfeatures.h"
-#include "imports.h"
-#include "accum.h"
-#include "api_exec.h"
-#include "arrayobj.h"
-#include "attrib.h"
-#include "blend.h"
-#include "buffers.h"
-#include "bufferobj.h"
-#include "colortab.h"
-#include "context.h"
-#include "cpuinfo.h"
-#include "debug.h"
-#include "depth.h"
-#include "dlist.h"
-#include "eval.h"
-#include "extensions.h"
-#include "fbobject.h"
-#include "feedback.h"
-#include "fog.h"
-#include "framebuffer.h"
-#include "histogram.h"
-#include "hint.h"
-#include "hash.h"
-#include "light.h"
-#include "lines.h"
-#include "macros.h"
-#include "matrix.h"
-#include "multisample.h"
-#include "pixel.h"
-#include "pixelstore.h"
-#include "points.h"
-#include "polygon.h"
-#include "queryobj.h"
-#include "syncobj.h"
-#include "rastpos.h"
-#include "remap.h"
-#include "scissor.h"
-#include "shared.h"
-#include "shaderobj.h"
-#include "simple_list.h"
-#include "state.h"
-#include "stencil.h"
-#include "texcompress_s3tc.h"
-#include "texstate.h"
-#include "transformfeedback.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "version.h"
-#include "viewport.h"
-#include "vtxfmt.h"
-#include "program/program.h"
-#include "program/prog_print.h"
-#if _HAVE_FULL_GL
-#include "math/m_matrix.h"
-#endif
-
-#ifdef USE_SPARC_ASM
-#include "sparc/sparc.h"
-#endif
-
-#include "glsl_parser_extras.h"
-
-
-
-#ifndef MESA_VERBOSE
-int MESA_VERBOSE = 0;
-#endif
-
-#ifndef MESA_DEBUG_FLAGS
-int MESA_DEBUG_FLAGS = 0;
-#endif
-
-
-/* ubyte -> float conversion */
-GLfloat _mesa_ubyte_to_float_color_tab[256];
-
-
-
-/**
- * Swap buffers notification callback.
- * 
- * \param ctx GL context.
- *
- * Called by window system just before swapping buffers.
- * We have to finish any pending rendering.
- */
-void
-_mesa_notifySwapBuffers(__GLcontext *ctx)
-{
-   if (MESA_VERBOSE & VERBOSE_SWAPBUFFERS)
-      _mesa_debug(ctx, "SwapBuffers\n");
-   FLUSH_CURRENT( ctx, 0 );
-   if (ctx->Driver.Flush) {
-      ctx->Driver.Flush(ctx);
-   }
-}
-
-
-/**********************************************************************/
-/** \name GL Visual allocation/destruction                            */
-/**********************************************************************/
-/*@{*/
-
-/**
- * Allocates a GLvisual structure and initializes it via
- * _mesa_initialize_visual().
- * 
- * \param dbFlag double buffering
- * \param stereoFlag stereo buffer
- * \param depthBits requested bits per depth buffer value. Any value in [0, 32]
- * is acceptable but the actual depth type will be GLushort or GLuint as
- * needed.
- * \param stencilBits requested minimum bits per stencil buffer value
- * \param accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits number of bits per color component in accum buffer.
- * \param indexBits number of bits per pixel if \p rgbFlag is GL_FALSE
- * \param redBits number of bits per color component in frame buffer for RGB(A)
- * mode.  We always use 8 in core Mesa though.
- * \param greenBits same as above.
- * \param blueBits same as above.
- * \param alphaBits same as above.
- * \param numSamples not really used.
- * 
- * \return pointer to new GLvisual or NULL if requested parameters can't be
- * met.
- *
- * \note Need to add params for level and numAuxBuffers (at least)
- */
-GLvisual *
-_mesa_create_visual( GLboolean dbFlag,
-                     GLboolean stereoFlag,
-                     GLint redBits,
-                     GLint greenBits,
-                     GLint blueBits,
-                     GLint alphaBits,
-                     GLint depthBits,
-                     GLint stencilBits,
-                     GLint accumRedBits,
-                     GLint accumGreenBits,
-                     GLint accumBlueBits,
-                     GLint accumAlphaBits,
-                     GLint numSamples )
-{
-   GLvisual *vis = (GLvisual *) calloc(1, sizeof(GLvisual));
-   if (vis) {
-      if (!_mesa_initialize_visual(vis, dbFlag, stereoFlag,
-                                   redBits, greenBits, blueBits, alphaBits,
-                                   depthBits, stencilBits,
-                                   accumRedBits, accumGreenBits,
-                                   accumBlueBits, accumAlphaBits,
-                                   numSamples)) {
-         free(vis);
-         return NULL;
-      }
-   }
-   return vis;
-}
-
-/**
- * Makes some sanity checks and fills in the fields of the
- * GLvisual object with the given parameters.  If the caller needs
- * to set additional fields, he should just probably init the whole GLvisual
- * object himself.
- * \return GL_TRUE on success, or GL_FALSE on failure.
- *
- * \sa _mesa_create_visual() above for the parameter description.
- */
-GLboolean
-_mesa_initialize_visual( GLvisual *vis,
-                         GLboolean dbFlag,
-                         GLboolean stereoFlag,
-                         GLint redBits,
-                         GLint greenBits,
-                         GLint blueBits,
-                         GLint alphaBits,
-                         GLint depthBits,
-                         GLint stencilBits,
-                         GLint accumRedBits,
-                         GLint accumGreenBits,
-                         GLint accumBlueBits,
-                         GLint accumAlphaBits,
-                         GLint numSamples )
-{
-   assert(vis);
-
-   if (depthBits < 0 || depthBits > 32) {
-      return GL_FALSE;
-   }
-   if (stencilBits < 0 || stencilBits > STENCIL_BITS) {
-      return GL_FALSE;
-   }
-   assert(accumRedBits >= 0);
-   assert(accumGreenBits >= 0);
-   assert(accumBlueBits >= 0);
-   assert(accumAlphaBits >= 0);
-
-   vis->rgbMode          = GL_TRUE;
-   vis->doubleBufferMode = dbFlag;
-   vis->stereoMode       = stereoFlag;
-
-   vis->redBits          = redBits;
-   vis->greenBits        = greenBits;
-   vis->blueBits         = blueBits;
-   vis->alphaBits        = alphaBits;
-   vis->rgbBits          = redBits + greenBits + blueBits;
-
-   vis->indexBits      = 0;
-   vis->depthBits      = depthBits;
-   vis->stencilBits    = stencilBits;
-
-   vis->accumRedBits   = accumRedBits;
-   vis->accumGreenBits = accumGreenBits;
-   vis->accumBlueBits  = accumBlueBits;
-   vis->accumAlphaBits = accumAlphaBits;
-
-   vis->haveAccumBuffer   = accumRedBits > 0;
-   vis->haveDepthBuffer   = depthBits > 0;
-   vis->haveStencilBuffer = stencilBits > 0;
-
-   vis->numAuxBuffers = 0;
-   vis->level = 0;
-   vis->pixmapMode = 0;
-   vis->sampleBuffers = numSamples > 0 ? 1 : 0;
-   vis->samples = numSamples;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Destroy a visual and free its memory.
- *
- * \param vis visual.
- * 
- * Frees the visual structure.
- */
-void
-_mesa_destroy_visual( GLvisual *vis )
-{
-   free(vis);
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Context allocation, initialization, destroying
- *
- * The purpose of the most initialization functions here is to provide the
- * default state values according to the OpenGL specification.
- */
-/**********************************************************************/
-/*@{*/
-
-
-/**
- * This is lame.  gdb only seems to recognize enum types that are
- * actually used somewhere.  We want to be able to print/use enum
- * values such as TEXTURE_2D_INDEX in gdb.  But we don't actually use
- * the gl_texture_index type anywhere.  Thus, this lame function.
- */
-static void
-dummy_enum_func(void)
-{
-   gl_buffer_index bi = BUFFER_FRONT_LEFT;
-   gl_colortable_index ci = COLORTABLE_PRECONVOLUTION;
-   gl_face_index fi = FACE_POS_X;
-   gl_frag_attrib fa = FRAG_ATTRIB_WPOS;
-   gl_frag_result fr = FRAG_RESULT_DEPTH;
-   gl_texture_index ti = TEXTURE_2D_ARRAY_INDEX;
-   gl_vert_attrib va = VERT_ATTRIB_POS;
-   gl_vert_result vr = VERT_RESULT_HPOS;
-   gl_geom_attrib ga = GEOM_ATTRIB_POSITION;
-   gl_geom_result gr = GEOM_RESULT_POS;
-
-   (void) bi;
-   (void) ci;
-   (void) fi;
-   (void) fa;
-   (void) fr;
-   (void) ti;
-   (void) va;
-   (void) vr;
-   (void) ga;
-   (void) gr;
-}
-
-
-/**
- * One-time initialization mutex lock.
- *
- * \sa Used by one_time_init().
- */
-_glthread_DECLARE_STATIC_MUTEX(OneTimeLock);
-
-/**
- * Calls all the various one-time-init functions in Mesa.
- *
- * While holding a global mutex lock, calls several initialization functions,
- * and sets the glapi callbacks if the \c MESA_DEBUG environment variable is
- * defined.
- *
- * \sa _math_init().
- */
-static void
-one_time_init( GLcontext *ctx )
-{
-   static GLboolean alreadyCalled = GL_FALSE;
-   (void) ctx;
-   _glthread_LOCK_MUTEX(OneTimeLock);
-   if (!alreadyCalled) {
-      GLuint i;
-
-      /* do some implementation tests */
-      assert( sizeof(GLbyte) == 1 );
-      assert( sizeof(GLubyte) == 1 );
-      assert( sizeof(GLshort) == 2 );
-      assert( sizeof(GLushort) == 2 );
-      assert( sizeof(GLint) == 4 );
-      assert( sizeof(GLuint) == 4 );
-
-      _mesa_get_cpu_features();
-
-      switch (ctx->API) {
-#if FEATURE_GL
-      case API_OPENGL:
-	 _mesa_init_remap_table();
-	 break;
-#endif
-#if FEATURE_ES1
-      case API_OPENGLES:
-	 _mesa_init_remap_table_es1();
-	 break;
-#endif
-#if FEATURE_ES2
-      case API_OPENGLES2:
-	 _mesa_init_remap_table_es2();
-	 break;
-#endif
-      default:
-	 break;
-      }
-
-      _mesa_init_sqrt_table();
-      _mesa_init_get_hash(ctx);
-
-      for (i = 0; i < 256; i++) {
-         _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;
-      }
-
-#if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
-      _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
-                  MESA_VERSION_STRING, __DATE__, __TIME__);
-#endif
-
-      alreadyCalled = GL_TRUE;
-   }
-   _glthread_UNLOCK_MUTEX(OneTimeLock);
-
-   /* Hopefully atexit() is widely available.  If not, we may need some
-    * #ifdef tests here.
-    */
-   atexit(_mesa_destroy_shader_compiler);
-
-   dummy_enum_func();
-}
-
-
-/**
- * Initialize fields of gl_current_attrib (aka ctx->Current.*)
- */
-static void
-_mesa_init_current(GLcontext *ctx)
-{
-   GLuint i;
-
-   /* Init all to (0,0,0,1) */
-   for (i = 0; i < Elements(ctx->Current.Attrib); i++) {
-      ASSIGN_4V( ctx->Current.Attrib[i], 0.0, 0.0, 0.0, 1.0 );
-   }
-
-   /* redo special cases: */
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 1.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR0], 1.0, 1.0, 1.0, 1.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR1], 0.0, 0.0, 0.0, 1.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX], 1.0, 0.0, 0.0, 1.0 );
-   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG], 1.0, 0.0, 0.0, 1.0 );
-}
-
-
-/**
- * Init vertex/fragment/geometry program limits.
- * Important: drivers should override these with actual limits.
- */
-static void
-init_program_limits(GLenum type, struct gl_program_constants *prog)
-{
-   prog->MaxInstructions = MAX_PROGRAM_INSTRUCTIONS;
-   prog->MaxAluInstructions = MAX_PROGRAM_INSTRUCTIONS;
-   prog->MaxTexInstructions = MAX_PROGRAM_INSTRUCTIONS;
-   prog->MaxTexIndirections = MAX_PROGRAM_INSTRUCTIONS;
-   prog->MaxTemps = MAX_PROGRAM_TEMPS;
-   prog->MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
-   prog->MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
-   prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
-
-   switch (type) {
-   case GL_VERTEX_PROGRAM_ARB:
-      prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS;
-      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
-      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
-      prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;
-      prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;
-      break;
-   case MESA_GEOMETRY_PROGRAM:
-      prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
-      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
-      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
-
-      prog->MaxGeometryTextureImageUnits = MAX_GEOMETRY_TEXTURE_IMAGE_UNITS;
-      prog->MaxGeometryVaryingComponents = MAX_GEOMETRY_VARYING_COMPONENTS;
-      prog->MaxVertexVaryingComponents = MAX_VERTEX_VARYING_COMPONENTS;
-      prog->MaxGeometryUniformComponents = MAX_GEOMETRY_UNIFORM_COMPONENTS;
-      prog->MaxGeometryOutputVertices = MAX_GEOMETRY_OUTPUT_VERTICES;
-      prog->MaxGeometryTotalOutputComponents = MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS;
-      break;
-   default:
-      assert(0 && "Bad program type in init_program_limits()");
-   }
-
-   /* Set the native limits to zero.  This implies that there is no native
-    * support for shaders.  Let the drivers fill in the actual values.
-    */
-   prog->MaxNativeInstructions = 0;
-   prog->MaxNativeAluInstructions = 0;
-   prog->MaxNativeTexInstructions = 0;
-   prog->MaxNativeTexIndirections = 0;
-   prog->MaxNativeAttribs = 0;
-   prog->MaxNativeTemps = 0;
-   prog->MaxNativeAddressRegs = 0;
-   prog->MaxNativeParameters = 0;
-}
-
-
-/**
- * Initialize fields of gl_constants (aka ctx->Const.*).
- * Use defaults from config.h.  The device drivers will often override
- * some of these values (such as number of texture units).
- */
-static void 
-_mesa_init_constants(GLcontext *ctx)
-{
-   assert(ctx);
-
-   /* Constants, may be overriden (usually only reduced) by device drivers */
-   ctx->Const.MaxTextureLevels = MAX_TEXTURE_LEVELS;
-   ctx->Const.Max3DTextureLevels = MAX_3D_TEXTURE_LEVELS;
-   ctx->Const.MaxCubeTextureLevels = MAX_CUBE_TEXTURE_LEVELS;
-   ctx->Const.MaxTextureRectSize = MAX_TEXTURE_RECT_SIZE;
-   ctx->Const.MaxArrayTextureLayers = MAX_ARRAY_TEXTURE_LAYERS;
-   ctx->Const.MaxTextureCoordUnits = MAX_TEXTURE_COORD_UNITS;
-   ctx->Const.MaxTextureImageUnits = MAX_TEXTURE_IMAGE_UNITS;
-   ctx->Const.MaxTextureUnits = MIN2(ctx->Const.MaxTextureCoordUnits,
-                                     ctx->Const.MaxTextureImageUnits);
-   ctx->Const.MaxTextureMaxAnisotropy = MAX_TEXTURE_MAX_ANISOTROPY;
-   ctx->Const.MaxTextureLodBias = MAX_TEXTURE_LOD_BIAS;
-   ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE;
-   ctx->Const.SubPixelBits = SUB_PIXEL_BITS;
-   ctx->Const.MinPointSize = MIN_POINT_SIZE;
-   ctx->Const.MaxPointSize = MAX_POINT_SIZE;
-   ctx->Const.MinPointSizeAA = MIN_POINT_SIZE;
-   ctx->Const.MaxPointSizeAA = MAX_POINT_SIZE;
-   ctx->Const.PointSizeGranularity = (GLfloat) POINT_SIZE_GRANULARITY;
-   ctx->Const.MinLineWidth = MIN_LINE_WIDTH;
-   ctx->Const.MaxLineWidth = MAX_LINE_WIDTH;
-   ctx->Const.MinLineWidthAA = MIN_LINE_WIDTH;
-   ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;
-   ctx->Const.LineWidthGranularity = (GLfloat) LINE_WIDTH_GRANULARITY;
-   ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;
-   ctx->Const.MaxConvolutionWidth = MAX_CONVOLUTION_WIDTH;
-   ctx->Const.MaxConvolutionHeight = MAX_CONVOLUTION_HEIGHT;
-   ctx->Const.MaxClipPlanes = MAX_CLIP_PLANES;
-   ctx->Const.MaxLights = MAX_LIGHTS;
-   ctx->Const.MaxShininess = 128.0;
-   ctx->Const.MaxSpotExponent = 128.0;
-   ctx->Const.MaxViewportWidth = MAX_WIDTH;
-   ctx->Const.MaxViewportHeight = MAX_HEIGHT;
-#if FEATURE_ARB_vertex_program
-   init_program_limits(GL_VERTEX_PROGRAM_ARB, &ctx->Const.VertexProgram);
-#endif
-#if FEATURE_ARB_fragment_program
-   init_program_limits(GL_FRAGMENT_PROGRAM_ARB, &ctx->Const.FragmentProgram);
-#endif
-#if FEATURE_ARB_geometry_shader4
-   init_program_limits(MESA_GEOMETRY_PROGRAM, &ctx->Const.GeometryProgram);
-#endif
-   ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;
-   ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
-
-   /* CheckArrayBounds is overriden by drivers/x11 for X server */
-   ctx->Const.CheckArrayBounds = GL_FALSE;
-
-   /* GL_ARB_draw_buffers */
-   ctx->Const.MaxDrawBuffers = MAX_DRAW_BUFFERS;
-
-#if FEATURE_EXT_framebuffer_object
-   ctx->Const.MaxColorAttachments = MAX_COLOR_ATTACHMENTS;
-   ctx->Const.MaxRenderbufferSize = MAX_WIDTH;
-#endif
-
-#if FEATURE_ARB_vertex_shader
-   ctx->Const.MaxVertexTextureImageUnits = MAX_VERTEX_TEXTURE_IMAGE_UNITS;
-   ctx->Const.MaxCombinedTextureImageUnits = MAX_COMBINED_TEXTURE_IMAGE_UNITS;
-   ctx->Const.MaxVarying = MAX_VARYING;
-#endif
-
-   /* Shading language version */
-   if (ctx->API == API_OPENGL) {
-#if FEATURE_ARB_shading_language_120
-      ctx->Const.GLSLVersion = 120;
-#else
-      ctx->Const.GLSLVersion = 110;
-#endif
-   }
-   else if (ctx->API == API_OPENGLES2) {
-      ctx->Const.GLSLVersion = 100;
-   }
-   else if (ctx->API == API_OPENGLES) {
-      ctx->Const.GLSLVersion = 0; /* GLSL not supported */
-   }
-
-   /* GL_ARB_framebuffer_object */
-   ctx->Const.MaxSamples = 0;
-
-   /* GL_ARB_sync */
-   ctx->Const.MaxServerWaitTimeout = (GLuint64) ~0;
-
-   /* GL_ATI_envmap_bumpmap */
-   ctx->Const.SupportedBumpUnits = SUPPORTED_ATI_BUMP_UNITS;
-
-   /* GL_EXT_provoking_vertex */
-   ctx->Const.QuadsFollowProvokingVertexConvention = GL_TRUE;
-
-   /* GL_EXT_transform_feedback */
-   ctx->Const.MaxTransformFeedbackSeparateAttribs = MAX_FEEDBACK_ATTRIBS;
-   ctx->Const.MaxTransformFeedbackSeparateComponents = 4 * MAX_FEEDBACK_ATTRIBS;
-   ctx->Const.MaxTransformFeedbackInterleavedComponents = 4 * MAX_FEEDBACK_ATTRIBS;
-
-   /* GL 3.2: hard-coded for now: */
-   ctx->Const.ProfileMask = GL_CONTEXT_COMPATIBILITY_PROFILE_BIT;
-}
-
-
-/**
- * Do some sanity checks on the limits/constants for the given context.
- * Only called the first time a context is bound.
- */
-static void
-check_context_limits(GLcontext *ctx)
-{
-   /* check that we don't exceed the size of various bitfields */
-   assert(VERT_RESULT_MAX <=
-	  (8 * sizeof(ctx->VertexProgram._Current->Base.OutputsWritten)));
-   assert(FRAG_ATTRIB_MAX <=
-	  (8 * sizeof(ctx->FragmentProgram._Current->Base.InputsRead)));
-
-   assert(MAX_COMBINED_TEXTURE_IMAGE_UNITS <= 8 * sizeof(GLbitfield));
-
-   /* shader-related checks */
-   assert(ctx->Const.FragmentProgram.MaxLocalParams <= MAX_PROGRAM_LOCAL_PARAMS);
-   assert(ctx->Const.VertexProgram.MaxLocalParams <= MAX_PROGRAM_LOCAL_PARAMS);
-
-   assert(MAX_NV_FRAGMENT_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);
-   assert(MAX_NV_VERTEX_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);
-   assert(MAX_NV_VERTEX_PROGRAM_INPUTS <= VERT_ATTRIB_MAX);
-   assert(MAX_NV_VERTEX_PROGRAM_OUTPUTS <= VERT_RESULT_MAX);
-
-   /* Texture unit checks */
-   assert(ctx->Const.MaxTextureImageUnits > 0);
-   assert(ctx->Const.MaxTextureImageUnits <= MAX_TEXTURE_IMAGE_UNITS);
-   assert(ctx->Const.MaxTextureCoordUnits > 0);
-   assert(ctx->Const.MaxTextureCoordUnits <= MAX_TEXTURE_COORD_UNITS);
-   assert(ctx->Const.MaxTextureUnits > 0);
-   assert(ctx->Const.MaxTextureUnits <= MAX_TEXTURE_IMAGE_UNITS);
-   assert(ctx->Const.MaxTextureUnits <= MAX_TEXTURE_COORD_UNITS);
-   assert(ctx->Const.MaxTextureUnits == MIN2(ctx->Const.MaxTextureImageUnits,
-                                             ctx->Const.MaxTextureCoordUnits));
-   assert(ctx->Const.MaxCombinedTextureImageUnits > 0);
-   assert(ctx->Const.MaxCombinedTextureImageUnits <= MAX_COMBINED_TEXTURE_IMAGE_UNITS);
-   assert(ctx->Const.MaxTextureCoordUnits <= MAX_COMBINED_TEXTURE_IMAGE_UNITS);
-   /* number of coord units cannot be greater than number of image units */
-   assert(ctx->Const.MaxTextureCoordUnits <= ctx->Const.MaxTextureImageUnits);
-
-
-   /* Texture size checks */
-   assert(ctx->Const.MaxTextureLevels <= MAX_TEXTURE_LEVELS);
-   assert(ctx->Const.Max3DTextureLevels <= MAX_3D_TEXTURE_LEVELS);
-   assert(ctx->Const.MaxCubeTextureLevels <= MAX_CUBE_TEXTURE_LEVELS);
-   assert(ctx->Const.MaxTextureRectSize <= MAX_TEXTURE_RECT_SIZE);
-
-   /* make sure largest texture image is <= MAX_WIDTH in size */
-   assert((1 << (ctx->Const.MaxTextureLevels - 1)) <= MAX_WIDTH);
-   assert((1 << (ctx->Const.MaxCubeTextureLevels - 1)) <= MAX_WIDTH);
-   assert((1 << (ctx->Const.Max3DTextureLevels - 1)) <= MAX_WIDTH);
-
-   /* Texture level checks */
-   assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);
-   assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);
-
-   /* Max texture size should be <= max viewport size (render to texture) */
-   assert((1 << (MAX_TEXTURE_LEVELS - 1)) <= MAX_WIDTH);
-
-   assert(ctx->Const.MaxViewportWidth <= MAX_WIDTH);
-   assert(ctx->Const.MaxViewportHeight <= MAX_WIDTH);
-
-   assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS);
-
-   /* if this fails, add more enum values to gl_buffer_index */
-   assert(BUFFER_COLOR0 + MAX_DRAW_BUFFERS <= BUFFER_COUNT);
-
-   /* XXX probably add more tests */
-}
-
-
-/**
- * Initialize the attribute groups in a GL context.
- *
- * \param ctx GL context.
- *
- * Initializes all the attributes, calling the respective <tt>init*</tt>
- * functions for the more complex data structures.
- */
-static GLboolean
-init_attrib_groups(GLcontext *ctx)
-{
-   assert(ctx);
-
-   /* Constants */
-   _mesa_init_constants( ctx );
-
-   /* Extensions */
-   _mesa_init_extensions( ctx );
-
-   /* Attribute Groups */
-   _mesa_init_accum( ctx );
-   _mesa_init_attrib( ctx );
-   _mesa_init_buffer_objects( ctx );
-   _mesa_init_color( ctx );
-   _mesa_init_colortables( ctx );
-   _mesa_init_current( ctx );
-   _mesa_init_depth( ctx );
-   _mesa_init_debug( ctx );
-   _mesa_init_display_list( ctx );
-   _mesa_init_eval( ctx );
-   _mesa_init_fbobjects( ctx );
-   _mesa_init_feedback( ctx );
-   _mesa_init_fog( ctx );
-   _mesa_init_histogram( ctx );
-   _mesa_init_hint( ctx );
-   _mesa_init_line( ctx );
-   _mesa_init_lighting( ctx );
-   _mesa_init_matrix( ctx );
-   _mesa_init_multisample( ctx );
-   _mesa_init_pixel( ctx );
-   _mesa_init_pixelstore( ctx );
-   _mesa_init_point( ctx );
-   _mesa_init_polygon( ctx );
-   _mesa_init_program( ctx );
-   _mesa_init_queryobj( ctx );
-   _mesa_init_sync( ctx );
-   _mesa_init_rastpos( ctx );
-   _mesa_init_scissor( ctx );
-   _mesa_init_shader_state( ctx );
-   _mesa_init_stencil( ctx );
-   _mesa_init_transform( ctx );
-   _mesa_init_transform_feedback( ctx );
-   _mesa_init_varray( ctx );
-   _mesa_init_viewport( ctx );
-
-   if (!_mesa_init_texture( ctx ))
-      return GL_FALSE;
-
-   _mesa_init_texture_s3tc( ctx );
-
-   /* Miscellaneous */
-   ctx->NewState = _NEW_ALL;
-   ctx->ErrorValue = (GLenum) GL_NO_ERROR;
-   ctx->varying_vp_inputs = ~0;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Update default objects in a GL context with respect to shared state.
- *
- * \param ctx GL context.
- *
- * Removes references to old default objects, (texture objects, program
- * objects, etc.) and changes to reference those from the current shared
- * state.
- */
-static GLboolean
-update_default_objects(GLcontext *ctx)
-{
-   assert(ctx);
-
-   _mesa_update_default_objects_program(ctx);
-   _mesa_update_default_objects_texture(ctx);
-   _mesa_update_default_objects_buffer_objects(ctx);
-
-   return GL_TRUE;
-}
-
-
-/**
- * This is the default function we plug into all dispatch table slots
- * This helps prevents a segfault when someone calls a GL function without
- * first checking if the extension's supported.
- */
-static int
-generic_nop(void)
-{
-   _mesa_warning(NULL, "User called no-op dispatch function (an unsupported extension function?)");
-   return 0;
-}
-
-
-/**
- * Allocate and initialize a new dispatch table.
- */
-struct _glapi_table *
-_mesa_alloc_dispatch_table(int size)
-{
-   /* Find the larger of Mesa's dispatch table and libGL's dispatch table.
-    * In practice, this'll be the same for stand-alone Mesa.  But for DRI
-    * Mesa we do this to accomodate different versions of libGL and various
-    * DRI drivers.
-    */
-   GLint numEntries = MAX2(_glapi_get_dispatch_table_size(),
-                           size / sizeof(_glapi_proc));
-   struct _glapi_table *table =
-      (struct _glapi_table *) malloc(numEntries * sizeof(_glapi_proc));
-   if (table) {
-      _glapi_proc *entry = (_glapi_proc *) table;
-      GLint i;
-      for (i = 0; i < numEntries; i++) {
-         entry[i] = (_glapi_proc) generic_nop;
-      }
-   }
-   return table;
-}
-
-
-/**
- * Initialize a GLcontext struct (rendering context).
- *
- * This includes allocating all the other structs and arrays which hang off of
- * the context by pointers.
- * Note that the driver needs to pass in its dd_function_table here since
- * we need to at least call driverFunctions->NewTextureObject to create the
- * default texture objects.
- * 
- * Called by _mesa_create_context().
- *
- * Performs the imports and exports callback tables initialization, and
- * miscellaneous one-time initializations. If no shared context is supplied one
- * is allocated, and increase its reference count.  Setups the GL API dispatch
- * tables.  Initialize the TNL module. Sets the maximum Z buffer depth.
- * Finally queries the \c MESA_DEBUG and \c MESA_VERBOSE environment variables
- * for debug flags.
- *
- * \param ctx the context to initialize
- * \param api the GL API type to create the context for
- * \param visual describes the visual attributes for this context
- * \param share_list points to context to share textures, display lists,
- *        etc with, or NULL
- * \param driverFunctions table of device driver functions for this context
- *        to use
- * \param driverContext pointer to driver-specific context data
- */
-GLboolean
-_mesa_initialize_context_for_api(GLcontext *ctx,
-				 gl_api api,
-				 const GLvisual *visual,
-				 GLcontext *share_list,
-				 const struct dd_function_table *driverFunctions,
-				 void *driverContext)
-{
-   struct gl_shared_state *shared;
-   int i;
-
-   /*ASSERT(driverContext);*/
-   assert(driverFunctions->NewTextureObject);
-   assert(driverFunctions->FreeTexImageData);
-
-   ctx->API = api;
-   ctx->Visual = *visual;
-   ctx->DrawBuffer = NULL;
-   ctx->ReadBuffer = NULL;
-   ctx->WinSysDrawBuffer = NULL;
-   ctx->WinSysReadBuffer = NULL;
-
-   /* misc one-time initializations */
-   one_time_init(ctx);
-
-   /* Plug in driver functions and context pointer here.
-    * This is important because when we call alloc_shared_state() below
-    * we'll call ctx->Driver.NewTextureObject() to create the default
-    * textures.
-    */
-   ctx->Driver = *driverFunctions;
-   ctx->DriverCtx = driverContext;
-
-   if (share_list) {
-      /* share state with another context */
-      shared = share_list->Shared;
-   }
-   else {
-      /* allocate new, unshared state */
-      shared = _mesa_alloc_shared_state(ctx);
-      if (!shared)
-         return GL_FALSE;
-   }
-
-   _glthread_LOCK_MUTEX(shared->Mutex);
-   ctx->Shared = shared;
-   shared->RefCount++;
-   _glthread_UNLOCK_MUTEX(shared->Mutex);
-
-   if (!init_attrib_groups( ctx )) {
-      _mesa_release_shared_state(ctx, ctx->Shared);
-      return GL_FALSE;
-   }
-
-#if FEATURE_dispatch
-   /* setup the API dispatch tables */
-   switch (ctx->API) {
-#if FEATURE_GL
-   case API_OPENGL:
-      ctx->Exec = _mesa_create_exec_table();
-      break;
-#endif
-#if FEATURE_ES1
-   case API_OPENGLES:
-      ctx->Exec = _mesa_create_exec_table_es1();
-      break;
-#endif
-#if FEATURE_ES2
-   case API_OPENGLES2:
-      ctx->Exec = _mesa_create_exec_table_es2();
-      break;
-#endif
-   default:
-      _mesa_problem(ctx, "unknown or unsupported API");
-      break;
-   }
-
-   if (!ctx->Exec) {
-      _mesa_release_shared_state(ctx, ctx->Shared);
-      return GL_FALSE;
-   }
-#endif
-   ctx->CurrentDispatch = ctx->Exec;
-
-   ctx->FragmentProgram._MaintainTexEnvProgram
-      = (_mesa_getenv("MESA_TEX_PROG") != NULL);
-
-   ctx->VertexProgram._MaintainTnlProgram
-      = (_mesa_getenv("MESA_TNL_PROG") != NULL);
-   if (ctx->VertexProgram._MaintainTnlProgram) {
-      /* this is required... */
-      ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
-   }
-
-   switch (ctx->API) {
-   case API_OPENGL:
-      /* Neutral tnl module stuff */
-      _mesa_init_exec_vtxfmt( ctx ); 
-      ctx->TnlModule.Current = NULL;
-      ctx->TnlModule.SwapCount = 0;
-
-#if FEATURE_dlist
-      ctx->Save = _mesa_create_save_table();
-      if (!ctx->Save) {
-	 _mesa_release_shared_state(ctx, ctx->Shared);
-	 free(ctx->Exec);
-	 return GL_FALSE;
-      }
-
-      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-#endif
-      break;
-   case API_OPENGLES:
-      /**
-       * GL_OES_texture_cube_map says
-       * "Initially all texture generation modes are set to REFLECTION_MAP_OES"
-       */
-      for (i = 0; i < MAX_TEXTURE_UNITS; i++) {
-	 struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-	 texUnit->GenS.Mode = GL_REFLECTION_MAP_NV;
-	 texUnit->GenT.Mode = GL_REFLECTION_MAP_NV;
-	 texUnit->GenR.Mode = GL_REFLECTION_MAP_NV;
-	 texUnit->GenS._ModeBit = TEXGEN_REFLECTION_MAP_NV;
-	 texUnit->GenT._ModeBit = TEXGEN_REFLECTION_MAP_NV;
-	 texUnit->GenR._ModeBit = TEXGEN_REFLECTION_MAP_NV;
-      }
-      break;
-   case API_OPENGLES2:
-      ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
-      ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
-      ctx->Point.PointSprite = GL_TRUE;  /* always on for ES 2.x */
-      break;
-   }
-
-   ctx->FirstTimeCurrent = GL_TRUE;
-
-   return GL_TRUE;
-}
-
-GLboolean
-_mesa_initialize_context(GLcontext *ctx,
-                         const GLvisual *visual,
-                         GLcontext *share_list,
-                         const struct dd_function_table *driverFunctions,
-                         void *driverContext)
-{
-   return _mesa_initialize_context_for_api(ctx,
-					   API_OPENGL,
-					   visual,
-					   share_list,
-					   driverFunctions,
-					   driverContext);
-}
-
-/**
- * Allocate and initialize a GLcontext structure.
- * Note that the driver needs to pass in its dd_function_table here since
- * we need to at least call driverFunctions->NewTextureObject to initialize
- * the rendering context.
- *
- * \param api the GL API type to create the context for
- * \param visual a GLvisual pointer (we copy the struct contents)
- * \param share_list another context to share display lists with or NULL
- * \param driverFunctions points to the dd_function_table into which the
- *        driver has plugged in all its special functions.
- * \param driverContext points to the device driver's private context state
- * 
- * \return pointer to a new __GLcontextRec or NULL if error.
- */
-GLcontext *
-_mesa_create_context_for_api(gl_api api,
-			     const GLvisual *visual,
-			     GLcontext *share_list,
-			     const struct dd_function_table *driverFunctions,
-			     void *driverContext)
-{
-   GLcontext *ctx;
-
-   ASSERT(visual);
-   /*ASSERT(driverContext);*/
-
-   ctx = (GLcontext *) calloc(1, sizeof(GLcontext));
-   if (!ctx)
-      return NULL;
-
-   if (_mesa_initialize_context_for_api(ctx, api, visual, share_list,
-					driverFunctions, driverContext)) {
-      return ctx;
-   }
-   else {
-      free(ctx);
-      return NULL;
-   }
-}
-
-GLcontext *
-_mesa_create_context(const GLvisual *visual,
-		     GLcontext *share_list,
-		     const struct dd_function_table *driverFunctions,
-		     void *driverContext)
-{
-   return _mesa_create_context_for_api(API_OPENGL, visual,
-				       share_list,
-				       driverFunctions,
-				       driverContext);
-}
-
-/**
- * Free the data associated with the given context.
- * 
- * But doesn't free the GLcontext struct itself.
- *
- * \sa _mesa_initialize_context() and init_attrib_groups().
- */
-void
-_mesa_free_context_data( GLcontext *ctx )
-{
-   if (!_mesa_get_current_context()){
-      /* No current context, but we may need one in order to delete
-       * texture objs, etc.  So temporarily bind the context now.
-       */
-      _mesa_make_current(ctx, NULL, NULL);
-   }
-
-   /* unreference WinSysDraw/Read buffers */
-   _mesa_reference_framebuffer(&ctx->WinSysDrawBuffer, NULL);
-   _mesa_reference_framebuffer(&ctx->WinSysReadBuffer, NULL);
-   _mesa_reference_framebuffer(&ctx->DrawBuffer, NULL);
-   _mesa_reference_framebuffer(&ctx->ReadBuffer, NULL);
-
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, NULL);
-
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL);
-
-   _mesa_free_attrib_data(ctx);
-   _mesa_free_buffer_objects(ctx);
-   _mesa_free_lighting_data( ctx );
-   _mesa_free_eval_data( ctx );
-   _mesa_free_texture_data( ctx );
-   _mesa_free_matrix_data( ctx );
-   _mesa_free_viewport_data( ctx );
-   _mesa_free_colortables_data( ctx );
-   _mesa_free_program_data(ctx);
-   _mesa_free_shader_state(ctx);
-   _mesa_free_queryobj_data(ctx);
-   _mesa_free_sync_data(ctx);
-   _mesa_free_varray_data(ctx);
-   _mesa_free_transform_feedback(ctx);
-
-   _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
-
-#if FEATURE_ARB_pixel_buffer_object
-   _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, NULL);
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object
-   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
-#endif
-
-   /* free dispatch tables */
-   free(ctx->Exec);
-   free(ctx->Save);
-
-   /* Shared context state (display lists, textures, etc) */
-   _mesa_release_shared_state( ctx, ctx->Shared );
-
-   /* needs to be after freeing shared state */
-   _mesa_free_display_list_data(ctx);
-
-   if (ctx->Extensions.String)
-      free((void *) ctx->Extensions.String);
-
-   if (ctx->VersionString)
-      free(ctx->VersionString);
-
-   /* unbind the context if it's currently bound */
-   if (ctx == _mesa_get_current_context()) {
-      _mesa_make_current(NULL, NULL, NULL);
-   }
-}
-
-
-/**
- * Destroy a GLcontext structure.
- *
- * \param ctx GL context.
- * 
- * Calls _mesa_free_context_data() and frees the GLcontext structure itself.
- */
-void
-_mesa_destroy_context( GLcontext *ctx )
-{
-   if (ctx) {
-      _mesa_free_context_data(ctx);
-      free( (void *) ctx );
-   }
-}
-
-
-#if _HAVE_FULL_GL
-/**
- * Copy attribute groups from one context to another.
- * 
- * \param src source context
- * \param dst destination context
- * \param mask bitwise OR of GL_*_BIT flags
- *
- * According to the bits specified in \p mask, copies the corresponding
- * attributes from \p src into \p dst.  For many of the attributes a simple \c
- * memcpy is not enough due to the existence of internal pointers in their data
- * structures.
- */
-void
-_mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
-{
-   if (mask & GL_ACCUM_BUFFER_BIT) {
-      /* OK to memcpy */
-      dst->Accum = src->Accum;
-   }
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      /* OK to memcpy */
-      dst->Color = src->Color;
-   }
-   if (mask & GL_CURRENT_BIT) {
-      /* OK to memcpy */
-      dst->Current = src->Current;
-   }
-   if (mask & GL_DEPTH_BUFFER_BIT) {
-      /* OK to memcpy */
-      dst->Depth = src->Depth;
-   }
-   if (mask & GL_ENABLE_BIT) {
-      /* no op */
-   }
-   if (mask & GL_EVAL_BIT) {
-      /* OK to memcpy */
-      dst->Eval = src->Eval;
-   }
-   if (mask & GL_FOG_BIT) {
-      /* OK to memcpy */
-      dst->Fog = src->Fog;
-   }
-   if (mask & GL_HINT_BIT) {
-      /* OK to memcpy */
-      dst->Hint = src->Hint;
-   }
-   if (mask & GL_LIGHTING_BIT) {
-      GLuint i;
-      /* begin with memcpy */
-      dst->Light = src->Light;
-      /* fixup linked lists to prevent pointer insanity */
-      make_empty_list( &(dst->Light.EnabledList) );
-      for (i = 0; i < MAX_LIGHTS; i++) {
-         if (dst->Light.Light[i].Enabled) {
-            insert_at_tail(&(dst->Light.EnabledList), &(dst->Light.Light[i]));
-         }
-      }
-   }
-   if (mask & GL_LINE_BIT) {
-      /* OK to memcpy */
-      dst->Line = src->Line;
-   }
-   if (mask & GL_LIST_BIT) {
-      /* OK to memcpy */
-      dst->List = src->List;
-   }
-   if (mask & GL_PIXEL_MODE_BIT) {
-      /* OK to memcpy */
-      dst->Pixel = src->Pixel;
-   }
-   if (mask & GL_POINT_BIT) {
-      /* OK to memcpy */
-      dst->Point = src->Point;
-   }
-   if (mask & GL_POLYGON_BIT) {
-      /* OK to memcpy */
-      dst->Polygon = src->Polygon;
-   }
-   if (mask & GL_POLYGON_STIPPLE_BIT) {
-      /* Use loop instead of memcpy due to problem with Portland Group's
-       * C compiler.  Reported by John Stone.
-       */
-      GLuint i;
-      for (i = 0; i < 32; i++) {
-         dst->PolygonStipple[i] = src->PolygonStipple[i];
-      }
-   }
-   if (mask & GL_SCISSOR_BIT) {
-      /* OK to memcpy */
-      dst->Scissor = src->Scissor;
-   }
-   if (mask & GL_STENCIL_BUFFER_BIT) {
-      /* OK to memcpy */
-      dst->Stencil = src->Stencil;
-   }
-   if (mask & GL_TEXTURE_BIT) {
-      /* Cannot memcpy because of pointers */
-      _mesa_copy_texture_state(src, dst);
-   }
-   if (mask & GL_TRANSFORM_BIT) {
-      /* OK to memcpy */
-      dst->Transform = src->Transform;
-   }
-   if (mask & GL_VIEWPORT_BIT) {
-      /* Cannot use memcpy, because of pointers in GLmatrix _WindowMap */
-      dst->Viewport.X = src->Viewport.X;
-      dst->Viewport.Y = src->Viewport.Y;
-      dst->Viewport.Width = src->Viewport.Width;
-      dst->Viewport.Height = src->Viewport.Height;
-      dst->Viewport.Near = src->Viewport.Near;
-      dst->Viewport.Far = src->Viewport.Far;
-      _math_matrix_copy(&dst->Viewport._WindowMap, &src->Viewport._WindowMap);
-   }
-
-   /* XXX FIXME:  Call callbacks?
-    */
-   dst->NewState = _NEW_ALL;
-}
-#endif
-
-
-/**
- * Check if the given context can render into the given framebuffer
- * by checking visual attributes.
- *
- * Most of these tests could go away because Mesa is now pretty flexible
- * in terms of mixing rendering contexts with framebuffers.  As long
- * as RGB vs. CI mode agree, we're probably good.
- *
- * \return GL_TRUE if compatible, GL_FALSE otherwise.
- */
-static GLboolean 
-check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
-{
-   const GLvisual *ctxvis = &ctx->Visual;
-   const GLvisual *bufvis = &buffer->Visual;
-
-   if (ctxvis == bufvis)
-      return GL_TRUE;
-
-   if (buffer == _mesa_get_incomplete_framebuffer())
-      return GL_TRUE;
-
-#if 0
-   /* disabling this fixes the fgl_glxgears pbuffer demo */
-   if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode)
-      return GL_FALSE;
-#endif
-   if (ctxvis->stereoMode && !bufvis->stereoMode)
-      return GL_FALSE;
-   if (ctxvis->haveAccumBuffer && !bufvis->haveAccumBuffer)
-      return GL_FALSE;
-   if (ctxvis->haveDepthBuffer && !bufvis->haveDepthBuffer)
-      return GL_FALSE;
-   if (ctxvis->haveStencilBuffer && !bufvis->haveStencilBuffer)
-      return GL_FALSE;
-   if (ctxvis->redMask && ctxvis->redMask != bufvis->redMask)
-      return GL_FALSE;
-   if (ctxvis->greenMask && ctxvis->greenMask != bufvis->greenMask)
-      return GL_FALSE;
-   if (ctxvis->blueMask && ctxvis->blueMask != bufvis->blueMask)
-      return GL_FALSE;
-#if 0
-   /* disabled (see bug 11161) */
-   if (ctxvis->depthBits && ctxvis->depthBits != bufvis->depthBits)
-      return GL_FALSE;
-#endif
-   if (ctxvis->stencilBits && ctxvis->stencilBits != bufvis->stencilBits)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do one-time initialization for the given framebuffer.  Specifically,
- * ask the driver for the window's current size and update the framebuffer
- * object to match.
- * Really, the device driver should totally take care of this.
- */
-static void
-initialize_framebuffer_size(GLcontext *ctx, GLframebuffer *fb)
-{
-   GLuint width, height;
-   if (ctx->Driver.GetBufferSize) {
-      ctx->Driver.GetBufferSize(fb, &width, &height);
-      if (ctx->Driver.ResizeBuffers)
-         ctx->Driver.ResizeBuffers(ctx, fb, width, height);
-      fb->Initialized = GL_TRUE;
-   }
-}
-
-
-/**
- * Check if the viewport/scissor size has not yet been initialized.
- * Initialize the size if the given width and height are non-zero.
- */
-void
-_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height)
-{
-   if (!ctx->ViewportInitialized && width > 0 && height > 0) {
-      /* Note: set flag here, before calling _mesa_set_viewport(), to prevent
-       * potential infinite recursion.
-       */
-      ctx->ViewportInitialized = GL_TRUE;
-      _mesa_set_viewport(ctx, 0, 0, width, height);
-      _mesa_set_scissor(ctx, 0, 0, width, height);
-   }
-}
-
-
-/**
- * Bind the given context to the given drawBuffer and readBuffer and
- * make it the current context for the calling thread.
- * We'll render into the drawBuffer and read pixels from the
- * readBuffer (i.e. glRead/CopyPixels, glCopyTexImage, etc).
- *
- * We check that the context's and framebuffer's visuals are compatible
- * and return immediately if they're not.
- *
- * \param newCtx  the new GL context. If NULL then there will be no current GL
- *                context.
- * \param drawBuffer  the drawing framebuffer
- * \param readBuffer  the reading framebuffer
- */
-GLboolean
-_mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
-                    GLframebuffer *readBuffer )
-{
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(newCtx, "_mesa_make_current()\n");
-
-   /* Check that the context's and framebuffer's visuals are compatible.
-    */
-   if (newCtx && drawBuffer && newCtx->WinSysDrawBuffer != drawBuffer) {
-      if (!check_compatible(newCtx, drawBuffer)) {
-         _mesa_warning(newCtx,
-              "MakeCurrent: incompatible visuals for context and drawbuffer");
-         return GL_FALSE;
-      }
-   }
-   if (newCtx && readBuffer && newCtx->WinSysReadBuffer != readBuffer) {
-      if (!check_compatible(newCtx, readBuffer)) {
-         _mesa_warning(newCtx,
-              "MakeCurrent: incompatible visuals for context and readbuffer");
-         return GL_FALSE;
-      }
-   }
-
-   /* We used to call _glapi_check_multithread() here.  Now do it in drivers */
-   _glapi_set_context((void *) newCtx);
-   ASSERT(_mesa_get_current_context() == newCtx);
-
-   if (!newCtx) {
-      _glapi_set_dispatch(NULL);  /* none current */
-   }
-   else {
-      _glapi_set_dispatch(newCtx->CurrentDispatch);
-
-      if (drawBuffer && readBuffer) {
-	 /* TODO: check if newCtx and buffer's visual match??? */
-
-         ASSERT(drawBuffer->Name == 0);
-         ASSERT(readBuffer->Name == 0);
-         _mesa_reference_framebuffer(&newCtx->WinSysDrawBuffer, drawBuffer);
-         _mesa_reference_framebuffer(&newCtx->WinSysReadBuffer, readBuffer);
-
-         /*
-          * Only set the context's Draw/ReadBuffer fields if they're NULL
-          * or not bound to a user-created FBO.
-          */
-         if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) {
-            /* KW: merge conflict here, revisit. 
-             */
-            /* fix up the fb fields - these will end up wrong otherwise
-             * if the DRIdrawable changes, and everything relies on them.
-             * This is a bit messy (same as needed in _mesa_BindFramebufferEXT)
-             */
-            unsigned int i;
-            GLenum buffers[MAX_DRAW_BUFFERS];
-
-            _mesa_reference_framebuffer(&newCtx->DrawBuffer, drawBuffer);
-
-            for(i = 0; i < newCtx->Const.MaxDrawBuffers; i++) {
-               buffers[i] = newCtx->Color.DrawBuffer[i];
-            }
-
-            _mesa_drawbuffers(newCtx, newCtx->Const.MaxDrawBuffers, buffers, NULL);
-         }
-         if (!newCtx->ReadBuffer || newCtx->ReadBuffer->Name == 0) {
-            _mesa_reference_framebuffer(&newCtx->ReadBuffer, readBuffer);
-         }
-
-         /* XXX only set this flag if we're really changing the draw/read
-          * framebuffer bindings.
-          */
-	 newCtx->NewState |= _NEW_BUFFERS;
-
-#if 1
-         /* We want to get rid of these lines: */
-
-#if _HAVE_FULL_GL
-         if (!drawBuffer->Initialized) {
-            initialize_framebuffer_size(newCtx, drawBuffer);
-         }
-         if (readBuffer != drawBuffer && !readBuffer->Initialized) {
-            initialize_framebuffer_size(newCtx, readBuffer);
-         }
-
-	 _mesa_resizebuffers(newCtx);
-#endif
-
-#else
-         /* We want the drawBuffer and readBuffer to be initialized by
-          * the driver.
-          * This generally means the Width and Height match the actual
-          * window size and the renderbuffers (both hardware and software
-          * based) are allocated to match.  The later can generally be
-          * done with a call to _mesa_resize_framebuffer().
-          *
-          * It's theoretically possible for a buffer to have zero width
-          * or height, but for now, assert check that the driver did what's
-          * expected of it.
-          */
-         ASSERT(drawBuffer->Width > 0);
-         ASSERT(drawBuffer->Height > 0);
-#endif
-
-         if (drawBuffer) {
-            _mesa_check_init_viewport(newCtx,
-                                      drawBuffer->Width, drawBuffer->Height);
-         }
-      }
-
-      if (newCtx->FirstTimeCurrent) {
-         _mesa_compute_version(newCtx);
-
-         newCtx->Extensions.String = _mesa_make_extension_string(newCtx);
-
-         check_context_limits(newCtx);
-
-         /* We can use this to help debug user's problems.  Tell them to set
-          * the MESA_INFO env variable before running their app.  Then the
-          * first time each context is made current we'll print some useful
-          * information.
-          */
-	 if (_mesa_getenv("MESA_INFO")) {
-	    _mesa_print_info();
-	 }
-
-	 newCtx->FirstTimeCurrent = GL_FALSE;
-      }
-   }
-   
-   return GL_TRUE;
-}
-
-
-/**
- * Make context 'ctx' share the display lists, textures and programs
- * that are associated with 'ctxToShare'.
- * Any display lists, textures or programs associated with 'ctx' will
- * be deleted if nobody else is sharing them.
- */
-GLboolean
-_mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare)
-{
-   if (ctx && ctxToShare && ctx->Shared && ctxToShare->Shared) {
-      struct gl_shared_state *oldSharedState = ctx->Shared;
-
-      ctx->Shared = ctxToShare->Shared;
-      
-      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-      ctx->Shared->RefCount++;
-      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-      update_default_objects(ctx);
-
-      _mesa_release_shared_state(ctx, oldSharedState);
-
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-
-/**
- * \return pointer to the current GL context for this thread.
- * 
- * Calls _glapi_get_context(). This isn't the fastest way to get the current
- * context.  If you need speed, see the #GET_CURRENT_CONTEXT macro in
- * context.h.
- */
-GLcontext *
-_mesa_get_current_context( void )
-{
-   return (GLcontext *) _glapi_get_context();
-}
-
-
-/**
- * Get context's current API dispatch table.
- *
- * It'll either be the immediate-mode execute dispatcher or the display list
- * compile dispatcher.
- * 
- * \param ctx GL context.
- *
- * \return pointer to dispatch_table.
- *
- * Simply returns __GLcontextRec::CurrentDispatch.
- */
-struct _glapi_table *
-_mesa_get_dispatch(GLcontext *ctx)
-{
-   return ctx->CurrentDispatch;
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Miscellaneous functions                                     */
-/**********************************************************************/
-/*@{*/
-
-/**
- * Record an error.
- *
- * \param ctx GL context.
- * \param error error code.
- * 
- * Records the given error code and call the driver's dd_function_table::Error
- * function if defined.
- *
- * \sa
- * This is called via _mesa_error().
- */
-void
-_mesa_record_error(GLcontext *ctx, GLenum error)
-{
-   if (!ctx)
-      return;
-
-   if (ctx->ErrorValue == GL_NO_ERROR) {
-      ctx->ErrorValue = error;
-   }
-
-   /* Call device driver's error handler, if any.  This is used on the Mac. */
-   if (ctx->Driver.Error) {
-      ctx->Driver.Error(ctx);
-   }
-}
-
-
-/**
- * Flush commands and wait for completion.
- */
-void
-_mesa_finish(GLcontext *ctx)
-{
-   FLUSH_CURRENT( ctx, 0 );
-   if (ctx->Driver.Finish) {
-      ctx->Driver.Finish(ctx);
-   }
-}
-
-
-/**
- * Flush commands.
- */
-void
-_mesa_flush(GLcontext *ctx)
-{
-   FLUSH_CURRENT( ctx, 0 );
-   if (ctx->Driver.Flush) {
-      ctx->Driver.Flush(ctx);
-   }
-}
-
-
-
-/**
- * Execute glFinish().
- *
- * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
- * dd_function_table::Finish driver callback, if not NULL.
- */
-void GLAPIENTRY
-_mesa_Finish(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _mesa_finish(ctx);
-}
-
-
-/**
- * Execute glFlush().
- *
- * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the
- * dd_function_table::Flush driver callback, if not NULL.
- */
-void GLAPIENTRY
-_mesa_Flush(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _mesa_flush(ctx);
-}
-
-
-/**
- * Set mvp_with_dp4 flag.  If a driver has a preference for DP4 over
- * MUL/MAD, or vice versa, call this function to register that.
- * Otherwise we default to MUL/MAD.
- */
-void
-_mesa_set_mvp_with_dp4( GLcontext *ctx,
-                        GLboolean flag )
-{
-   ctx->mvp_with_dp4 = flag;
-}
-
-
-
-/**
- * Prior to drawing anything with glBegin, glDrawArrays, etc. this function
- * is called to see if it's valid to render.  This involves checking that
- * the current shader is valid and the framebuffer is complete.
- * If an error is detected it'll be recorded here.
- * \return GL_TRUE if OK to render, GL_FALSE if not
- */
-GLboolean
-_mesa_valid_to_render(GLcontext *ctx, const char *where)
-{
-   /* This depends on having up to date derived state (shaders) */
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   if (ctx->Shader.CurrentProgram) {
-      /* using shaders */
-      if (!ctx->Shader.CurrentProgram->LinkStatus) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(shader not linked)", where);
-         return GL_FALSE;
-      }
-#if 0 /* not normally enabled */
-      {
-         char errMsg[100];
-         if (!_mesa_validate_shader_program(ctx, ctx->Shader.CurrentProgram,
-                                            errMsg)) {
-            _mesa_warning(ctx, "Shader program %u is invalid: %s",
-                          ctx->Shader.CurrentProgram->Name, errMsg);
-         }
-      }
-#endif
-   }
-   else {
-      if (ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(vertex program not valid)", where);
-         return GL_FALSE;
-      }
-      if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(fragment program not valid)", where);
-         return GL_FALSE;
-      }
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "%s(incomplete framebuffer)", where);
-      return GL_FALSE;
-   }
-
-#ifdef DEBUG
-   if (ctx->Shader.Flags & GLSL_LOG) {
-      struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-      if (shProg) {
-         if (!shProg->_Used) {
-            /* This is the first time this shader is being used.
-             * Append shader's constants/uniforms to log file.
-             */
-            GLuint i;
-            for (i = 0; i < shProg->NumShaders; i++) {
-               struct gl_shader *sh = shProg->Shaders[i];
-               if (sh->Type == GL_VERTEX_SHADER) {
-                  _mesa_append_uniforms_to_file(sh,
-                                                &shProg->VertexProgram->Base);
-               }
-               else if (sh->Type == GL_FRAGMENT_SHADER) {
-                  _mesa_append_uniforms_to_file(sh,
-                                                &shProg->FragmentProgram->Base);
-               }
-            }
-            shProg->_Used = GL_TRUE;
-         }
-      }
-   }
-#endif
-
-   return GL_TRUE;
-}
-
-
-/*@}*/
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.3

+ *

+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

+ * 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, 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 context.c

+ * Mesa context/visual/framebuffer management functions.

+ * \author Brian Paul

+ */

+

+/**

+ * \mainpage Mesa Main Module

+ *

+ * \section MainIntroduction Introduction

+ *

+ * The Mesa Main module consists of all the files in the main/ directory.

+ * Among the features of this module are:

+ * <UL>

+ * <LI> Structures to represent most GL state </LI>

+ * <LI> State set/get functions </LI>

+ * <LI> Display lists </LI>

+ * <LI> Texture unit, object and image handling </LI>

+ * <LI> Matrix and attribute stacks </LI>

+ * </UL>

+ *

+ * Other modules are responsible for API dispatch, vertex transformation,

+ * point/line/triangle setup, rasterization, vertex array caching,

+ * vertex/fragment programs/shaders, etc.

+ *

+ *

+ * \section AboutDoxygen About Doxygen

+ *

+ * If you're viewing this information as Doxygen-generated HTML you'll

+ * see the documentation index at the top of this page.

+ *

+ * The first line lists the Mesa source code modules.

+ * The second line lists the indexes available for viewing the documentation

+ * for each module.

+ *

+ * Selecting the <b>Main page</b> link will display a summary of the module

+ * (this page).

+ *

+ * Selecting <b>Data Structures</b> will list all C structures.

+ *

+ * Selecting the <b>File List</b> link will list all the source files in

+ * the module.

+ * Selecting a filename will show a list of all functions defined in that file.

+ *

+ * Selecting the <b>Data Fields</b> link will display a list of all

+ * documented structure members.

+ *

+ * Selecting the <b>Globals</b> link will display a list

+ * of all functions, structures, global variables and macros in the module.

+ *

+ */

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+#include "imports.h"

+#include "accum.h"

+#include "api_exec.h"

+#include "arrayobj.h"

+#include "attrib.h"

+#include "blend.h"

+#include "buffers.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "cpuinfo.h"

+#include "debug.h"

+#include "depth.h"

+#include "dlist.h"

+#include "eval.h"

+#include "extensions.h"

+#include "fbobject.h"

+#include "feedback.h"

+#include "fog.h"

+#include "framebuffer.h"

+#include "hint.h"

+#include "hash.h"

+#include "light.h"

+#include "lines.h"

+#include "macros.h"

+#include "matrix.h"

+#include "multisample.h"

+#include "pixel.h"

+#include "pixelstore.h"

+#include "points.h"

+#include "polygon.h"

+#include "queryobj.h"

+#include "syncobj.h"

+#include "rastpos.h"

+#include "remap.h"

+#include "scissor.h"

+#include "shared.h"

+#include "shaderobj.h"

+#include "simple_list.h"

+#include "state.h"

+#include "stencil.h"

+#include "texcompress_s3tc.h"

+#include "texstate.h"

+#include "transformfeedback.h"

+#include "mtypes.h"

+#include "varray.h"

+#include "version.h"

+#include "viewport.h"

+#include "vtxfmt.h"

+#include "program/program.h"

+#include "program/prog_print.h"

+#if _HAVE_FULL_GL

+#include "math/m_matrix.h"

+#endif

+#include "main/dispatch.h" /* for _gloffset_COUNT */

+

+#ifdef USE_SPARC_ASM

+#include "sparc/sparc.h"

+#endif

+

+#include "glsl_parser_extras.h"

+#include <stdbool.h>

+

+

+#ifndef MESA_VERBOSE

+int MESA_VERBOSE = 0;

+#endif

+

+#ifndef MESA_DEBUG_FLAGS

+int MESA_DEBUG_FLAGS = 0;

+#endif

+

+

+/* ubyte -> float conversion */

+GLfloat _mesa_ubyte_to_float_color_tab[256];

+

+

+

+/**

+ * Swap buffers notification callback.

+ * 

+ * \param ctx GL context.

+ *

+ * Called by window system just before swapping buffers.

+ * We have to finish any pending rendering.

+ */

+void

+_mesa_notifySwapBuffers(struct gl_context *ctx)

+{

+   if (MESA_VERBOSE & VERBOSE_SWAPBUFFERS)

+      _mesa_debug(ctx, "SwapBuffers\n");

+   FLUSH_CURRENT( ctx, 0 );

+   if (ctx->Driver.Flush) {

+      ctx->Driver.Flush(ctx);

+   }

+}

+

+

+/**********************************************************************/

+/** \name GL Visual allocation/destruction                            */

+/**********************************************************************/

+/*@{*/

+

+/**

+ * Allocates a struct gl_config structure and initializes it via

+ * _mesa_initialize_visual().

+ * 

+ * \param dbFlag double buffering

+ * \param stereoFlag stereo buffer

+ * \param depthBits requested bits per depth buffer value. Any value in [0, 32]

+ * is acceptable but the actual depth type will be GLushort or GLuint as

+ * needed.

+ * \param stencilBits requested minimum bits per stencil buffer value

+ * \param accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits number of bits per color component in accum buffer.

+ * \param indexBits number of bits per pixel if \p rgbFlag is GL_FALSE

+ * \param redBits number of bits per color component in frame buffer for RGB(A)

+ * mode.  We always use 8 in core Mesa though.

+ * \param greenBits same as above.

+ * \param blueBits same as above.

+ * \param alphaBits same as above.

+ * \param numSamples not really used.

+ * 

+ * \return pointer to new struct gl_config or NULL if requested parameters can't be

+ * met.

+ *

+ * \note Need to add params for level and numAuxBuffers (at least)

+ */

+struct gl_config *

+_mesa_create_visual( GLboolean dbFlag,

+                     GLboolean stereoFlag,

+                     GLint redBits,

+                     GLint greenBits,

+                     GLint blueBits,

+                     GLint alphaBits,

+                     GLint depthBits,

+                     GLint stencilBits,

+                     GLint accumRedBits,

+                     GLint accumGreenBits,

+                     GLint accumBlueBits,

+                     GLint accumAlphaBits,

+                     GLint numSamples )

+{

+   struct gl_config *vis = CALLOC_STRUCT(gl_config);

+   if (vis) {

+      if (!_mesa_initialize_visual(vis, dbFlag, stereoFlag,

+                                   redBits, greenBits, blueBits, alphaBits,

+                                   depthBits, stencilBits,

+                                   accumRedBits, accumGreenBits,

+                                   accumBlueBits, accumAlphaBits,

+                                   numSamples)) {

+         free(vis);

+         return NULL;

+      }

+   }

+   return vis;

+}

+

+

+/**

+ * Makes some sanity checks and fills in the fields of the struct

+ * gl_config object with the given parameters.  If the caller needs to

+ * set additional fields, he should just probably init the whole

+ * gl_config object himself.

+ *

+ * \return GL_TRUE on success, or GL_FALSE on failure.

+ *

+ * \sa _mesa_create_visual() above for the parameter description.

+ */

+GLboolean

+_mesa_initialize_visual( struct gl_config *vis,

+                         GLboolean dbFlag,

+                         GLboolean stereoFlag,

+                         GLint redBits,

+                         GLint greenBits,

+                         GLint blueBits,

+                         GLint alphaBits,

+                         GLint depthBits,

+                         GLint stencilBits,

+                         GLint accumRedBits,

+                         GLint accumGreenBits,

+                         GLint accumBlueBits,

+                         GLint accumAlphaBits,

+                         GLint numSamples )

+{

+   assert(vis);

+

+   if (depthBits < 0 || depthBits > 32) {

+      return GL_FALSE;

+   }

+   if (stencilBits < 0 || stencilBits > STENCIL_BITS) {

+      return GL_FALSE;

+   }

+   assert(accumRedBits >= 0);

+   assert(accumGreenBits >= 0);

+   assert(accumBlueBits >= 0);

+   assert(accumAlphaBits >= 0);

+

+   vis->rgbMode          = GL_TRUE;

+   vis->doubleBufferMode = dbFlag;

+   vis->stereoMode       = stereoFlag;

+

+   vis->redBits          = redBits;

+   vis->greenBits        = greenBits;

+   vis->blueBits         = blueBits;

+   vis->alphaBits        = alphaBits;

+   vis->rgbBits          = redBits + greenBits + blueBits;

+

+   vis->indexBits      = 0;

+   vis->depthBits      = depthBits;

+   vis->stencilBits    = stencilBits;

+

+   vis->accumRedBits   = accumRedBits;

+   vis->accumGreenBits = accumGreenBits;

+   vis->accumBlueBits  = accumBlueBits;

+   vis->accumAlphaBits = accumAlphaBits;

+

+   vis->haveAccumBuffer   = accumRedBits > 0;

+   vis->haveDepthBuffer   = depthBits > 0;

+   vis->haveStencilBuffer = stencilBits > 0;

+

+   vis->numAuxBuffers = 0;

+   vis->level = 0;

+   vis->sampleBuffers = numSamples > 0 ? 1 : 0;

+   vis->samples = numSamples;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Destroy a visual and free its memory.

+ *

+ * \param vis visual.

+ * 

+ * Frees the visual structure.

+ */

+void

+_mesa_destroy_visual( struct gl_config *vis )

+{

+   free(vis);

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Context allocation, initialization, destroying

+ *

+ * The purpose of the most initialization functions here is to provide the

+ * default state values according to the OpenGL specification.

+ */

+/**********************************************************************/

+/*@{*/

+

+

+/**

+ * This is lame.  gdb only seems to recognize enum types that are

+ * actually used somewhere.  We want to be able to print/use enum

+ * values such as TEXTURE_2D_INDEX in gdb.  But we don't actually use

+ * the gl_texture_index type anywhere.  Thus, this lame function.

+ */

+static void

+dummy_enum_func(void)

+{

+   gl_buffer_index bi = BUFFER_FRONT_LEFT;

+   gl_face_index fi = FACE_POS_X;

+   gl_frag_attrib fa = FRAG_ATTRIB_WPOS;

+   gl_frag_result fr = FRAG_RESULT_DEPTH;

+   gl_texture_index ti = TEXTURE_2D_ARRAY_INDEX;

+   gl_vert_attrib va = VERT_ATTRIB_POS;

+   gl_vert_result vr = VERT_RESULT_HPOS;

+   gl_geom_attrib ga = GEOM_ATTRIB_POSITION;

+   gl_geom_result gr = GEOM_RESULT_POS;

+

+   (void) bi;

+   (void) fi;

+   (void) fa;

+   (void) fr;

+   (void) ti;

+   (void) va;

+   (void) vr;

+   (void) ga;

+   (void) gr;

+}

+

+

+/**

+ * One-time initialization mutex lock.

+ *

+ * \sa Used by one_time_init().

+ */

+_glthread_DECLARE_STATIC_MUTEX(OneTimeLock);

+

+

+

+/**

+ * Calls all the various one-time-init functions in Mesa.

+ *

+ * While holding a global mutex lock, calls several initialization functions,

+ * and sets the glapi callbacks if the \c MESA_DEBUG environment variable is

+ * defined.

+ *

+ * \sa _math_init().

+ */

+static void

+one_time_init( struct gl_context *ctx )

+{

+   static GLbitfield api_init_mask = 0x0;

+

+   _glthread_LOCK_MUTEX(OneTimeLock);

+

+   /* truly one-time init */

+   if (!api_init_mask) {

+      GLuint i;

+

+      /* do some implementation tests */

+      assert( sizeof(GLbyte) == 1 );

+      assert( sizeof(GLubyte) == 1 );

+      assert( sizeof(GLshort) == 2 );

+      assert( sizeof(GLushort) == 2 );

+      assert( sizeof(GLint) == 4 );

+      assert( sizeof(GLuint) == 4 );

+

+      _mesa_get_cpu_features();

+

+      _mesa_init_sqrt_table();

+

+      /* context dependence is never a one-time thing... */

+      _mesa_init_get_hash(ctx);

+

+      for (i = 0; i < 256; i++) {

+         _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F;

+      }

+

+#if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)

+      if (MESA_VERBOSE != 0) {

+	 _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",

+		     MESA_VERSION_STRING, __DATE__, __TIME__);

+      }

+#endif

+   }

+

+   /* per-API one-time init */

+   if (!(api_init_mask & (1 << ctx->API))) {

+      /*

+       * This is fine as ES does not use the remap table, but it may not be

+       * future-proof.  We cannot always initialize the remap table because

+       * when an app is linked to libGLES*, there are not enough dynamic

+       * entries.

+       */

+      if (ctx->API == API_OPENGL)

+         _mesa_init_remap_table();

+   }

+

+   api_init_mask |= 1 << ctx->API;

+

+   _glthread_UNLOCK_MUTEX(OneTimeLock);

+

+   /* Hopefully atexit() is widely available.  If not, we may need some

+    * #ifdef tests here.

+    */

+   atexit(_mesa_destroy_shader_compiler);

+

+   dummy_enum_func();

+}

+

+

+/**

+ * Initialize fields of gl_current_attrib (aka ctx->Current.*)

+ */

+static void

+_mesa_init_current(struct gl_context *ctx)

+{

+   GLuint i;

+

+   /* Init all to (0,0,0,1) */

+   for (i = 0; i < Elements(ctx->Current.Attrib); i++) {

+      ASSIGN_4V( ctx->Current.Attrib[i], 0.0, 0.0, 0.0, 1.0 );

+   }

+

+   /* redo special cases: */

+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 1.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_NORMAL], 0.0, 0.0, 1.0, 1.0 );

+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR0], 1.0, 1.0, 1.0, 1.0 );

+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR1], 0.0, 0.0, 0.0, 1.0 );

+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX], 1.0, 0.0, 0.0, 1.0 );

+   ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG], 1.0, 0.0, 0.0, 1.0 );

+}

+

+

+/**

+ * Init vertex/fragment/geometry program limits.

+ * Important: drivers should override these with actual limits.

+ */

+static void

+init_program_limits(GLenum type, struct gl_program_constants *prog)

+{

+   prog->MaxInstructions = MAX_PROGRAM_INSTRUCTIONS;

+   prog->MaxAluInstructions = MAX_PROGRAM_INSTRUCTIONS;

+   prog->MaxTexInstructions = MAX_PROGRAM_INSTRUCTIONS;

+   prog->MaxTexIndirections = MAX_PROGRAM_INSTRUCTIONS;

+   prog->MaxTemps = MAX_PROGRAM_TEMPS;

+   prog->MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;

+   prog->MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;

+   prog->MaxUniformComponents = 4 * MAX_UNIFORMS;

+

+   switch (type) {

+   case GL_VERTEX_PROGRAM_ARB:

+      prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS;

+      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;

+      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;

+      break;

+   case GL_FRAGMENT_PROGRAM_ARB:

+      prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS;

+      prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS;

+      prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS;

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;

+      prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;

+      prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;

+

+      prog->MaxGeometryTextureImageUnits = MAX_GEOMETRY_TEXTURE_IMAGE_UNITS;

+      prog->MaxGeometryVaryingComponents = MAX_GEOMETRY_VARYING_COMPONENTS;

+      prog->MaxVertexVaryingComponents = MAX_VERTEX_VARYING_COMPONENTS;

+      prog->MaxGeometryUniformComponents = MAX_GEOMETRY_UNIFORM_COMPONENTS;

+      prog->MaxGeometryOutputVertices = MAX_GEOMETRY_OUTPUT_VERTICES;

+      prog->MaxGeometryTotalOutputComponents = MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS;

+      break;

+   default:

+      assert(0 && "Bad program type in init_program_limits()");

+   }

+

+   /* Set the native limits to zero.  This implies that there is no native

+    * support for shaders.  Let the drivers fill in the actual values.

+    */

+   prog->MaxNativeInstructions = 0;

+   prog->MaxNativeAluInstructions = 0;

+   prog->MaxNativeTexInstructions = 0;

+   prog->MaxNativeTexIndirections = 0;

+   prog->MaxNativeAttribs = 0;

+   prog->MaxNativeTemps = 0;

+   prog->MaxNativeAddressRegs = 0;

+   prog->MaxNativeParameters = 0;

+}

+

+

+/**

+ * Initialize fields of gl_constants (aka ctx->Const.*).

+ * Use defaults from config.h.  The device drivers will often override

+ * some of these values (such as number of texture units).

+ */

+static void 

+_mesa_init_constants(struct gl_context *ctx)

+{

+   assert(ctx);

+

+   /* Constants, may be overriden (usually only reduced) by device drivers */

+   ctx->Const.MaxTextureMbytes = MAX_TEXTURE_MBYTES;

+   ctx->Const.MaxTextureLevels = MAX_TEXTURE_LEVELS;

+   ctx->Const.Max3DTextureLevels = MAX_3D_TEXTURE_LEVELS;

+   ctx->Const.MaxCubeTextureLevels = MAX_CUBE_TEXTURE_LEVELS;

+   ctx->Const.MaxTextureRectSize = MAX_TEXTURE_RECT_SIZE;

+   ctx->Const.MaxArrayTextureLayers = MAX_ARRAY_TEXTURE_LAYERS;

+   ctx->Const.MaxTextureCoordUnits = MAX_TEXTURE_COORD_UNITS;

+   ctx->Const.MaxTextureImageUnits = MAX_TEXTURE_IMAGE_UNITS;

+   ctx->Const.MaxTextureUnits = MIN2(ctx->Const.MaxTextureCoordUnits,

+                                     ctx->Const.MaxTextureImageUnits);

+   ctx->Const.MaxTextureMaxAnisotropy = MAX_TEXTURE_MAX_ANISOTROPY;

+   ctx->Const.MaxTextureLodBias = MAX_TEXTURE_LOD_BIAS;

+   ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE;

+   ctx->Const.SubPixelBits = SUB_PIXEL_BITS;

+   ctx->Const.MinPointSize = MIN_POINT_SIZE;

+   ctx->Const.MaxPointSize = MAX_POINT_SIZE;

+   ctx->Const.MinPointSizeAA = MIN_POINT_SIZE;

+   ctx->Const.MaxPointSizeAA = MAX_POINT_SIZE;

+   ctx->Const.PointSizeGranularity = (GLfloat) POINT_SIZE_GRANULARITY;

+   ctx->Const.MinLineWidth = MIN_LINE_WIDTH;

+   ctx->Const.MaxLineWidth = MAX_LINE_WIDTH;

+   ctx->Const.MinLineWidthAA = MIN_LINE_WIDTH;

+   ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;

+   ctx->Const.LineWidthGranularity = (GLfloat) LINE_WIDTH_GRANULARITY;

+   ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;

+   ctx->Const.MaxClipPlanes = MAX_CLIP_PLANES;

+   ctx->Const.MaxLights = MAX_LIGHTS;

+   ctx->Const.MaxShininess = 128.0;

+   ctx->Const.MaxSpotExponent = 128.0;

+   ctx->Const.MaxViewportWidth = MAX_WIDTH;

+   ctx->Const.MaxViewportHeight = MAX_HEIGHT;

+#if FEATURE_ARB_vertex_program

+   init_program_limits(GL_VERTEX_PROGRAM_ARB, &ctx->Const.VertexProgram);

+#endif

+#if FEATURE_ARB_fragment_program

+   init_program_limits(GL_FRAGMENT_PROGRAM_ARB, &ctx->Const.FragmentProgram);

+#endif

+#if FEATURE_ARB_geometry_shader4

+   init_program_limits(MESA_GEOMETRY_PROGRAM, &ctx->Const.GeometryProgram);

+#endif

+   ctx->Const.MaxProgramMatrices = MAX_PROGRAM_MATRICES;

+   ctx->Const.MaxProgramMatrixStackDepth = MAX_PROGRAM_MATRIX_STACK_DEPTH;

+

+   /* CheckArrayBounds is overriden by drivers/x11 for X server */

+   ctx->Const.CheckArrayBounds = GL_FALSE;

+

+   /* GL_ARB_draw_buffers */

+   ctx->Const.MaxDrawBuffers = MAX_DRAW_BUFFERS;

+

+#if FEATURE_EXT_framebuffer_object

+   ctx->Const.MaxColorAttachments = MAX_COLOR_ATTACHMENTS;

+   ctx->Const.MaxRenderbufferSize = MAX_WIDTH;

+#endif

+

+#if FEATURE_ARB_vertex_shader

+   ctx->Const.MaxVertexTextureImageUnits = MAX_VERTEX_TEXTURE_IMAGE_UNITS;

+   ctx->Const.MaxCombinedTextureImageUnits = MAX_COMBINED_TEXTURE_IMAGE_UNITS;

+   ctx->Const.MaxVarying = MAX_VARYING;

+#endif

+

+   /* Shading language version */

+   if (ctx->API == API_OPENGL) {

+      ctx->Const.GLSLVersion = 120;

+   }

+   else if (ctx->API == API_OPENGLES2) {

+      ctx->Const.GLSLVersion = 100;

+   }

+   else if (ctx->API == API_OPENGLES) {

+      ctx->Const.GLSLVersion = 0; /* GLSL not supported */

+   }

+

+   /* GL_ARB_framebuffer_object */

+   ctx->Const.MaxSamples = 0;

+

+   /* GL_ARB_sync */

+   ctx->Const.MaxServerWaitTimeout = (GLuint64) ~0;

+

+   /* GL_ATI_envmap_bumpmap */

+   ctx->Const.SupportedBumpUnits = SUPPORTED_ATI_BUMP_UNITS;

+

+   /* GL_EXT_provoking_vertex */

+   ctx->Const.QuadsFollowProvokingVertexConvention = GL_TRUE;

+

+   /* GL_EXT_transform_feedback */

+   ctx->Const.MaxTransformFeedbackSeparateAttribs = MAX_FEEDBACK_ATTRIBS;

+   ctx->Const.MaxTransformFeedbackSeparateComponents = 4 * MAX_FEEDBACK_ATTRIBS;

+   ctx->Const.MaxTransformFeedbackInterleavedComponents = 4 * MAX_FEEDBACK_ATTRIBS;

+

+   /* GL 3.2: hard-coded for now: */

+   ctx->Const.ProfileMask = GL_CONTEXT_COMPATIBILITY_PROFILE_BIT;

+

+   /** GL_EXT_gpu_shader4 */

+   ctx->Const.MinProgramTexelOffset = -8;

+   ctx->Const.MaxProgramTexelOffset = 7;

+}

+

+

+/**

+ * Do some sanity checks on the limits/constants for the given context.

+ * Only called the first time a context is bound.

+ */

+static void

+check_context_limits(struct gl_context *ctx)

+{

+   /* check that we don't exceed the size of various bitfields */

+   assert(VERT_RESULT_MAX <=

+	  (8 * sizeof(ctx->VertexProgram._Current->Base.OutputsWritten)));

+   assert(FRAG_ATTRIB_MAX <=

+	  (8 * sizeof(ctx->FragmentProgram._Current->Base.InputsRead)));

+

+   assert(MAX_COMBINED_TEXTURE_IMAGE_UNITS <= 8 * sizeof(GLbitfield));

+

+   /* shader-related checks */

+   assert(ctx->Const.FragmentProgram.MaxLocalParams <= MAX_PROGRAM_LOCAL_PARAMS);

+   assert(ctx->Const.VertexProgram.MaxLocalParams <= MAX_PROGRAM_LOCAL_PARAMS);

+

+   assert(MAX_NV_FRAGMENT_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);

+   assert(MAX_NV_VERTEX_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);

+   assert(MAX_NV_VERTEX_PROGRAM_INPUTS <= VERT_ATTRIB_MAX);

+   assert(MAX_NV_VERTEX_PROGRAM_OUTPUTS <= VERT_RESULT_MAX);

+

+   /* Texture unit checks */

+   assert(ctx->Const.MaxTextureImageUnits > 0);

+   assert(ctx->Const.MaxTextureImageUnits <= MAX_TEXTURE_IMAGE_UNITS);

+   assert(ctx->Const.MaxTextureCoordUnits > 0);

+   assert(ctx->Const.MaxTextureCoordUnits <= MAX_TEXTURE_COORD_UNITS);

+   assert(ctx->Const.MaxTextureUnits > 0);

+   assert(ctx->Const.MaxTextureUnits <= MAX_TEXTURE_IMAGE_UNITS);

+   assert(ctx->Const.MaxTextureUnits <= MAX_TEXTURE_COORD_UNITS);

+   assert(ctx->Const.MaxTextureUnits == MIN2(ctx->Const.MaxTextureImageUnits,

+                                             ctx->Const.MaxTextureCoordUnits));

+   assert(ctx->Const.MaxCombinedTextureImageUnits > 0);

+   assert(ctx->Const.MaxCombinedTextureImageUnits <= MAX_COMBINED_TEXTURE_IMAGE_UNITS);

+   assert(ctx->Const.MaxTextureCoordUnits <= MAX_COMBINED_TEXTURE_IMAGE_UNITS);

+   /* number of coord units cannot be greater than number of image units */

+   assert(ctx->Const.MaxTextureCoordUnits <= ctx->Const.MaxTextureImageUnits);

+

+

+   /* Texture size checks */

+   assert(ctx->Const.MaxTextureLevels <= MAX_TEXTURE_LEVELS);

+   assert(ctx->Const.Max3DTextureLevels <= MAX_3D_TEXTURE_LEVELS);

+   assert(ctx->Const.MaxCubeTextureLevels <= MAX_CUBE_TEXTURE_LEVELS);

+   assert(ctx->Const.MaxTextureRectSize <= MAX_TEXTURE_RECT_SIZE);

+

+   /* make sure largest texture image is <= MAX_WIDTH in size */

+   assert((1 << (ctx->Const.MaxTextureLevels - 1)) <= MAX_WIDTH);

+   assert((1 << (ctx->Const.MaxCubeTextureLevels - 1)) <= MAX_WIDTH);

+   assert((1 << (ctx->Const.Max3DTextureLevels - 1)) <= MAX_WIDTH);

+

+   /* Texture level checks */

+   assert(MAX_TEXTURE_LEVELS >= MAX_3D_TEXTURE_LEVELS);

+   assert(MAX_TEXTURE_LEVELS >= MAX_CUBE_TEXTURE_LEVELS);

+

+   /* Max texture size should be <= max viewport size (render to texture) */

+   assert((1 << (MAX_TEXTURE_LEVELS - 1)) <= MAX_WIDTH);

+

+   assert(ctx->Const.MaxViewportWidth <= MAX_WIDTH);

+   assert(ctx->Const.MaxViewportHeight <= MAX_WIDTH);

+

+   assert(ctx->Const.MaxDrawBuffers <= MAX_DRAW_BUFFERS);

+

+   /* if this fails, add more enum values to gl_buffer_index */

+   assert(BUFFER_COLOR0 + MAX_DRAW_BUFFERS <= BUFFER_COUNT);

+

+   /* XXX probably add more tests */

+}

+

+

+/**

+ * Initialize the attribute groups in a GL context.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes all the attributes, calling the respective <tt>init*</tt>

+ * functions for the more complex data structures.

+ */

+static GLboolean

+init_attrib_groups(struct gl_context *ctx)

+{

+   assert(ctx);

+

+   /* Constants */

+   _mesa_init_constants( ctx );

+

+   /* Extensions */

+   _mesa_init_extensions( ctx );

+

+   /* Attribute Groups */

+   _mesa_init_accum( ctx );

+   _mesa_init_attrib( ctx );

+   _mesa_init_buffer_objects( ctx );

+   _mesa_init_color( ctx );

+   _mesa_init_current( ctx );

+   _mesa_init_depth( ctx );

+   _mesa_init_debug( ctx );

+   _mesa_init_display_list( ctx );

+   _mesa_init_eval( ctx );

+   _mesa_init_fbobjects( ctx );

+   _mesa_init_feedback( ctx );

+   _mesa_init_fog( ctx );

+   _mesa_init_hint( ctx );

+   _mesa_init_line( ctx );

+   _mesa_init_lighting( ctx );

+   _mesa_init_matrix( ctx );

+   _mesa_init_multisample( ctx );

+   _mesa_init_pixel( ctx );

+   _mesa_init_pixelstore( ctx );

+   _mesa_init_point( ctx );

+   _mesa_init_polygon( ctx );

+   _mesa_init_program( ctx );

+   _mesa_init_queryobj( ctx );

+   _mesa_init_sync( ctx );

+   _mesa_init_rastpos( ctx );

+   _mesa_init_scissor( ctx );

+   _mesa_init_shader_state( ctx );

+   _mesa_init_stencil( ctx );

+   _mesa_init_transform( ctx );

+   _mesa_init_transform_feedback( ctx );

+   _mesa_init_varray( ctx );

+   _mesa_init_viewport( ctx );

+

+   if (!_mesa_init_texture( ctx ))

+      return GL_FALSE;

+

+   _mesa_init_texture_s3tc( ctx );

+

+   /* Miscellaneous */

+   ctx->NewState = _NEW_ALL;

+   ctx->ErrorValue = (GLenum) GL_NO_ERROR;

+   ctx->varying_vp_inputs = ~0;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Update default objects in a GL context with respect to shared state.

+ *

+ * \param ctx GL context.

+ *

+ * Removes references to old default objects, (texture objects, program

+ * objects, etc.) and changes to reference those from the current shared

+ * state.

+ */

+static GLboolean

+update_default_objects(struct gl_context *ctx)

+{

+   assert(ctx);

+

+   _mesa_update_default_objects_program(ctx);

+   _mesa_update_default_objects_texture(ctx);

+   _mesa_update_default_objects_buffer_objects(ctx);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * This is the default function we plug into all dispatch table slots

+ * This helps prevents a segfault when someone calls a GL function without

+ * first checking if the extension's supported.

+ */

+static int

+generic_nop(void)

+{

+   _mesa_warning(NULL, "User called no-op dispatch function (an unsupported extension function?)");

+   return 0;

+}

+

+

+/**

+ * Allocate and initialize a new dispatch table.

+ */

+struct _glapi_table *

+_mesa_alloc_dispatch_table(int size)

+{

+   /* Find the larger of Mesa's dispatch table and libGL's dispatch table.

+    * In practice, this'll be the same for stand-alone Mesa.  But for DRI

+    * Mesa we do this to accomodate different versions of libGL and various

+    * DRI drivers.

+    */

+   GLint numEntries = MAX2(_glapi_get_dispatch_table_size(), _gloffset_COUNT);

+   struct _glapi_table *table;

+

+   /* should never happen, but just in case */

+   numEntries = MAX2(numEntries, size);

+

+   table = (struct _glapi_table *) malloc(numEntries * sizeof(_glapi_proc));

+   if (table) {

+      _glapi_proc *entry = (_glapi_proc *) table;

+      GLint i;

+      for (i = 0; i < numEntries; i++) {

+         entry[i] = (_glapi_proc) generic_nop;

+      }

+   }

+   return table;

+}

+

+

+/**

+ * Initialize a struct gl_context struct (rendering context).

+ *

+ * This includes allocating all the other structs and arrays which hang off of

+ * the context by pointers.

+ * Note that the driver needs to pass in its dd_function_table here since

+ * we need to at least call driverFunctions->NewTextureObject to create the

+ * default texture objects.

+ * 

+ * Called by _mesa_create_context().

+ *

+ * Performs the imports and exports callback tables initialization, and

+ * miscellaneous one-time initializations. If no shared context is supplied one

+ * is allocated, and increase its reference count.  Setups the GL API dispatch

+ * tables.  Initialize the TNL module. Sets the maximum Z buffer depth.

+ * Finally queries the \c MESA_DEBUG and \c MESA_VERBOSE environment variables

+ * for debug flags.

+ *

+ * \param ctx the context to initialize

+ * \param api the GL API type to create the context for

+ * \param visual describes the visual attributes for this context

+ * \param share_list points to context to share textures, display lists,

+ *        etc with, or NULL

+ * \param driverFunctions table of device driver functions for this context

+ *        to use

+ * \param driverContext pointer to driver-specific context data

+ */

+GLboolean

+_mesa_initialize_context_for_api(struct gl_context *ctx,

+				 gl_api api,

+				 const struct gl_config *visual,

+				 struct gl_context *share_list,

+				 const struct dd_function_table *driverFunctions,

+				 void *driverContext)

+{

+   struct gl_shared_state *shared;

+   int i;

+

+   /*ASSERT(driverContext);*/

+   assert(driverFunctions->NewTextureObject);

+   assert(driverFunctions->FreeTexImageData);

+

+   ctx->API = api;

+   ctx->Visual = *visual;

+   ctx->DrawBuffer = NULL;

+   ctx->ReadBuffer = NULL;

+   ctx->WinSysDrawBuffer = NULL;

+   ctx->WinSysReadBuffer = NULL;

+

+   /* misc one-time initializations */

+   one_time_init(ctx);

+

+   /* Plug in driver functions and context pointer here.

+    * This is important because when we call alloc_shared_state() below

+    * we'll call ctx->Driver.NewTextureObject() to create the default

+    * textures.

+    */

+   ctx->Driver = *driverFunctions;

+   ctx->DriverCtx = driverContext;

+

+   if (share_list) {

+      /* share state with another context */

+      shared = share_list->Shared;

+   }

+   else {

+      /* allocate new, unshared state */

+      shared = _mesa_alloc_shared_state(ctx);

+      if (!shared)

+         return GL_FALSE;

+   }

+

+   _glthread_LOCK_MUTEX(shared->Mutex);

+   ctx->Shared = shared;

+   shared->RefCount++;

+   _glthread_UNLOCK_MUTEX(shared->Mutex);

+

+   if (!init_attrib_groups( ctx )) {

+      _mesa_release_shared_state(ctx, ctx->Shared);

+      return GL_FALSE;

+   }

+

+#if FEATURE_dispatch

+   /* setup the API dispatch tables */

+   switch (ctx->API) {

+#if FEATURE_GL

+   case API_OPENGL:

+      ctx->Exec = _mesa_create_exec_table();

+      break;

+#endif

+#if FEATURE_ES1

+   case API_OPENGLES:

+      ctx->Exec = _mesa_create_exec_table_es1();

+      break;

+#endif

+#if FEATURE_ES2

+   case API_OPENGLES2:

+      ctx->Exec = _mesa_create_exec_table_es2();

+      break;

+#endif

+   default:

+      _mesa_problem(ctx, "unknown or unsupported API");

+      break;

+   }

+

+   if (!ctx->Exec) {

+      _mesa_release_shared_state(ctx, ctx->Shared);

+      return GL_FALSE;

+   }

+#endif

+   ctx->CurrentDispatch = ctx->Exec;

+

+   ctx->FragmentProgram._MaintainTexEnvProgram

+      = (_mesa_getenv("MESA_TEX_PROG") != NULL);

+

+   ctx->VertexProgram._MaintainTnlProgram

+      = (_mesa_getenv("MESA_TNL_PROG") != NULL);

+   if (ctx->VertexProgram._MaintainTnlProgram) {

+      /* this is required... */

+      ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;

+   }

+

+   switch (ctx->API) {

+   case API_OPENGL:

+#if FEATURE_dlist

+      ctx->Save = _mesa_create_save_table();

+      if (!ctx->Save) {

+	 _mesa_release_shared_state(ctx, ctx->Shared);

+	 free(ctx->Exec);

+	 return GL_FALSE;

+      }

+

+      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );

+#endif

+      break;

+   case API_OPENGLES:

+      /**

+       * GL_OES_texture_cube_map says

+       * "Initially all texture generation modes are set to REFLECTION_MAP_OES"

+       */

+      for (i = 0; i < MAX_TEXTURE_UNITS; i++) {

+	 struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];

+	 texUnit->GenS.Mode = GL_REFLECTION_MAP_NV;

+	 texUnit->GenT.Mode = GL_REFLECTION_MAP_NV;

+	 texUnit->GenR.Mode = GL_REFLECTION_MAP_NV;

+	 texUnit->GenS._ModeBit = TEXGEN_REFLECTION_MAP_NV;

+	 texUnit->GenT._ModeBit = TEXGEN_REFLECTION_MAP_NV;

+	 texUnit->GenR._ModeBit = TEXGEN_REFLECTION_MAP_NV;

+      }

+      break;

+   case API_OPENGLES2:

+      ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;

+      ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;

+      ctx->Point.PointSprite = GL_TRUE;  /* always on for ES 2.x */

+      break;

+   }

+

+   ctx->FirstTimeCurrent = GL_TRUE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Initialize an OpenGL context.

+ */

+GLboolean

+_mesa_initialize_context(struct gl_context *ctx,

+                         const struct gl_config *visual,

+                         struct gl_context *share_list,

+                         const struct dd_function_table *driverFunctions,

+                         void *driverContext)

+{

+   return _mesa_initialize_context_for_api(ctx,

+					   API_OPENGL,

+					   visual,

+					   share_list,

+					   driverFunctions,

+					   driverContext);

+}

+

+

+/**

+ * Allocate and initialize a struct gl_context structure.

+ * Note that the driver needs to pass in its dd_function_table here since

+ * we need to at least call driverFunctions->NewTextureObject to initialize

+ * the rendering context.

+ *

+ * \param api the GL API type to create the context for

+ * \param visual a struct gl_config pointer (we copy the struct contents)

+ * \param share_list another context to share display lists with or NULL

+ * \param driverFunctions points to the dd_function_table into which the

+ *        driver has plugged in all its special functions.

+ * \param driverContext points to the device driver's private context state

+ * 

+ * \return pointer to a new __struct gl_contextRec or NULL if error.

+ */

+struct gl_context *

+_mesa_create_context_for_api(gl_api api,

+			     const struct gl_config *visual,

+			     struct gl_context *share_list,

+			     const struct dd_function_table *driverFunctions,

+			     void *driverContext)

+{

+   struct gl_context *ctx;

+

+   ASSERT(visual);

+   /*ASSERT(driverContext);*/

+

+   ctx = (struct gl_context *) calloc(1, sizeof(struct gl_context));

+   if (!ctx)

+      return NULL;

+

+   if (_mesa_initialize_context_for_api(ctx, api, visual, share_list,

+					driverFunctions, driverContext)) {

+      return ctx;

+   }

+   else {

+      free(ctx);

+      return NULL;

+   }

+}

+

+

+/**

+ * Create an OpenGL context.

+ */

+struct gl_context *

+_mesa_create_context(const struct gl_config *visual,

+		     struct gl_context *share_list,

+		     const struct dd_function_table *driverFunctions,

+		     void *driverContext)

+{

+   return _mesa_create_context_for_api(API_OPENGL, visual,

+				       share_list,

+				       driverFunctions,

+				       driverContext);

+}

+

+

+/**

+ * Free the data associated with the given context.

+ * 

+ * But doesn't free the struct gl_context struct itself.

+ *

+ * \sa _mesa_initialize_context() and init_attrib_groups().

+ */

+void

+_mesa_free_context_data( struct gl_context *ctx )

+{

+   if (!_mesa_get_current_context()){

+      /* No current context, but we may need one in order to delete

+       * texture objs, etc.  So temporarily bind the context now.

+       */

+      _mesa_make_current(ctx, NULL, NULL);

+   }

+

+   /* unreference WinSysDraw/Read buffers */

+   _mesa_reference_framebuffer(&ctx->WinSysDrawBuffer, NULL);

+   _mesa_reference_framebuffer(&ctx->WinSysReadBuffer, NULL);

+   _mesa_reference_framebuffer(&ctx->DrawBuffer, NULL);

+   _mesa_reference_framebuffer(&ctx->ReadBuffer, NULL);

+

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, NULL);

+

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL);

+

+   _mesa_free_attrib_data(ctx);

+   _mesa_free_buffer_objects(ctx);

+   _mesa_free_lighting_data( ctx );

+   _mesa_free_eval_data( ctx );

+   _mesa_free_texture_data( ctx );

+   _mesa_free_matrix_data( ctx );

+   _mesa_free_viewport_data( ctx );

+   _mesa_free_program_data(ctx);

+   _mesa_free_shader_state(ctx);

+   _mesa_free_queryobj_data(ctx);

+   _mesa_free_sync_data(ctx);

+   _mesa_free_varray_data(ctx);

+   _mesa_free_transform_feedback(ctx);

+

+   _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);

+

+#if FEATURE_ARB_pixel_buffer_object

+   _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, NULL);

+#endif

+

+#if FEATURE_ARB_vertex_buffer_object

+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);

+#endif

+

+   /* free dispatch tables */

+   free(ctx->Exec);

+   free(ctx->Save);

+

+   /* Shared context state (display lists, textures, etc) */

+   _mesa_release_shared_state( ctx, ctx->Shared );

+

+   /* needs to be after freeing shared state */

+   _mesa_free_display_list_data(ctx);

+

+   if (ctx->Extensions.String)

+      free((void *) ctx->Extensions.String);

+

+   if (ctx->VersionString)

+      free(ctx->VersionString);

+

+   /* unbind the context if it's currently bound */

+   if (ctx == _mesa_get_current_context()) {

+      _mesa_make_current(NULL, NULL, NULL);

+   }

+}

+

+

+/**

+ * Destroy a struct gl_context structure.

+ *

+ * \param ctx GL context.

+ * 

+ * Calls _mesa_free_context_data() and frees the gl_context object itself.

+ */

+void

+_mesa_destroy_context( struct gl_context *ctx )

+{

+   if (ctx) {

+      _mesa_free_context_data(ctx);

+      free( (void *) ctx );

+   }

+}

+

+

+#if _HAVE_FULL_GL

+/**

+ * Copy attribute groups from one context to another.

+ * 

+ * \param src source context

+ * \param dst destination context

+ * \param mask bitwise OR of GL_*_BIT flags

+ *

+ * According to the bits specified in \p mask, copies the corresponding

+ * attributes from \p src into \p dst.  For many of the attributes a simple \c

+ * memcpy is not enough due to the existence of internal pointers in their data

+ * structures.

+ */

+void

+_mesa_copy_context( const struct gl_context *src, struct gl_context *dst, GLuint mask )

+{

+   if (mask & GL_ACCUM_BUFFER_BIT) {

+      /* OK to memcpy */

+      dst->Accum = src->Accum;

+   }

+   if (mask & GL_COLOR_BUFFER_BIT) {

+      /* OK to memcpy */

+      dst->Color = src->Color;

+   }

+   if (mask & GL_CURRENT_BIT) {

+      /* OK to memcpy */

+      dst->Current = src->Current;

+   }

+   if (mask & GL_DEPTH_BUFFER_BIT) {

+      /* OK to memcpy */

+      dst->Depth = src->Depth;

+   }

+   if (mask & GL_ENABLE_BIT) {

+      /* no op */

+   }

+   if (mask & GL_EVAL_BIT) {

+      /* OK to memcpy */

+      dst->Eval = src->Eval;

+   }

+   if (mask & GL_FOG_BIT) {

+      /* OK to memcpy */

+      dst->Fog = src->Fog;

+   }

+   if (mask & GL_HINT_BIT) {

+      /* OK to memcpy */

+      dst->Hint = src->Hint;

+   }

+   if (mask & GL_LIGHTING_BIT) {

+      GLuint i;

+      /* begin with memcpy */

+      dst->Light = src->Light;

+      /* fixup linked lists to prevent pointer insanity */

+      make_empty_list( &(dst->Light.EnabledList) );

+      for (i = 0; i < MAX_LIGHTS; i++) {

+         if (dst->Light.Light[i].Enabled) {

+            insert_at_tail(&(dst->Light.EnabledList), &(dst->Light.Light[i]));

+         }

+      }

+   }

+   if (mask & GL_LINE_BIT) {

+      /* OK to memcpy */

+      dst->Line = src->Line;

+   }

+   if (mask & GL_LIST_BIT) {

+      /* OK to memcpy */

+      dst->List = src->List;

+   }

+   if (mask & GL_PIXEL_MODE_BIT) {

+      /* OK to memcpy */

+      dst->Pixel = src->Pixel;

+   }

+   if (mask & GL_POINT_BIT) {

+      /* OK to memcpy */

+      dst->Point = src->Point;

+   }

+   if (mask & GL_POLYGON_BIT) {

+      /* OK to memcpy */

+      dst->Polygon = src->Polygon;

+   }

+   if (mask & GL_POLYGON_STIPPLE_BIT) {

+      /* Use loop instead of memcpy due to problem with Portland Group's

+       * C compiler.  Reported by John Stone.

+       */

+      GLuint i;

+      for (i = 0; i < 32; i++) {

+         dst->PolygonStipple[i] = src->PolygonStipple[i];

+      }

+   }

+   if (mask & GL_SCISSOR_BIT) {

+      /* OK to memcpy */

+      dst->Scissor = src->Scissor;

+   }

+   if (mask & GL_STENCIL_BUFFER_BIT) {

+      /* OK to memcpy */

+      dst->Stencil = src->Stencil;

+   }

+   if (mask & GL_TEXTURE_BIT) {

+      /* Cannot memcpy because of pointers */

+      _mesa_copy_texture_state(src, dst);

+   }

+   if (mask & GL_TRANSFORM_BIT) {

+      /* OK to memcpy */

+      dst->Transform = src->Transform;

+   }

+   if (mask & GL_VIEWPORT_BIT) {

+      /* Cannot use memcpy, because of pointers in GLmatrix _WindowMap */

+      dst->Viewport.X = src->Viewport.X;

+      dst->Viewport.Y = src->Viewport.Y;

+      dst->Viewport.Width = src->Viewport.Width;

+      dst->Viewport.Height = src->Viewport.Height;

+      dst->Viewport.Near = src->Viewport.Near;

+      dst->Viewport.Far = src->Viewport.Far;

+      _math_matrix_copy(&dst->Viewport._WindowMap, &src->Viewport._WindowMap);

+   }

+

+   /* XXX FIXME:  Call callbacks?

+    */

+   dst->NewState = _NEW_ALL;

+}

+#endif

+

+

+/**

+ * Check if the given context can render into the given framebuffer

+ * by checking visual attributes.

+ *

+ * Most of these tests could go away because Mesa is now pretty flexible

+ * in terms of mixing rendering contexts with framebuffers.  As long

+ * as RGB vs. CI mode agree, we're probably good.

+ *

+ * \return GL_TRUE if compatible, GL_FALSE otherwise.

+ */

+static GLboolean 

+check_compatible(const struct gl_context *ctx,

+                 const struct gl_framebuffer *buffer)

+{

+   const struct gl_config *ctxvis = &ctx->Visual;

+   const struct gl_config *bufvis = &buffer->Visual;

+

+   if (buffer == _mesa_get_incomplete_framebuffer())

+      return GL_TRUE;

+

+#if 0

+   /* disabling this fixes the fgl_glxgears pbuffer demo */

+   if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode)

+      return GL_FALSE;

+#endif

+   if (ctxvis->stereoMode && !bufvis->stereoMode)

+      return GL_FALSE;

+   if (ctxvis->haveAccumBuffer && !bufvis->haveAccumBuffer)

+      return GL_FALSE;

+   if (ctxvis->haveDepthBuffer && !bufvis->haveDepthBuffer)

+      return GL_FALSE;

+   if (ctxvis->haveStencilBuffer && !bufvis->haveStencilBuffer)

+      return GL_FALSE;

+   if (ctxvis->redMask && ctxvis->redMask != bufvis->redMask)

+      return GL_FALSE;

+   if (ctxvis->greenMask && ctxvis->greenMask != bufvis->greenMask)

+      return GL_FALSE;

+   if (ctxvis->blueMask && ctxvis->blueMask != bufvis->blueMask)

+      return GL_FALSE;

+#if 0

+   /* disabled (see bug 11161) */

+   if (ctxvis->depthBits && ctxvis->depthBits != bufvis->depthBits)

+      return GL_FALSE;

+#endif

+   if (ctxvis->stencilBits && ctxvis->stencilBits != bufvis->stencilBits)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do one-time initialization for the given framebuffer.  Specifically,

+ * ask the driver for the window's current size and update the framebuffer

+ * object to match.

+ * Really, the device driver should totally take care of this.

+ */

+static void

+initialize_framebuffer_size(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   GLuint width, height;

+   if (ctx->Driver.GetBufferSize) {

+      ctx->Driver.GetBufferSize(fb, &width, &height);

+      if (ctx->Driver.ResizeBuffers)

+         ctx->Driver.ResizeBuffers(ctx, fb, width, height);

+      fb->Initialized = GL_TRUE;

+   }

+}

+

+

+/**

+ * Check if the viewport/scissor size has not yet been initialized.

+ * Initialize the size if the given width and height are non-zero.

+ */

+void

+_mesa_check_init_viewport(struct gl_context *ctx, GLuint width, GLuint height)

+{

+   if (!ctx->ViewportInitialized && width > 0 && height > 0) {

+      /* Note: set flag here, before calling _mesa_set_viewport(), to prevent

+       * potential infinite recursion.

+       */

+      ctx->ViewportInitialized = GL_TRUE;

+      _mesa_set_viewport(ctx, 0, 0, width, height);

+      _mesa_set_scissor(ctx, 0, 0, width, height);

+   }

+}

+

+

+/**

+ * Bind the given context to the given drawBuffer and readBuffer and

+ * make it the current context for the calling thread.

+ * We'll render into the drawBuffer and read pixels from the

+ * readBuffer (i.e. glRead/CopyPixels, glCopyTexImage, etc).

+ *

+ * We check that the context's and framebuffer's visuals are compatible

+ * and return immediately if they're not.

+ *

+ * \param newCtx  the new GL context. If NULL then there will be no current GL

+ *                context.

+ * \param drawBuffer  the drawing framebuffer

+ * \param readBuffer  the reading framebuffer

+ */

+GLboolean

+_mesa_make_current( struct gl_context *newCtx,

+                    struct gl_framebuffer *drawBuffer,

+                    struct gl_framebuffer *readBuffer )

+{

+   GET_CURRENT_CONTEXT(curCtx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(newCtx, "_mesa_make_current()\n");

+

+   /* Check that the context's and framebuffer's visuals are compatible.

+    */

+   if (newCtx && drawBuffer && newCtx->WinSysDrawBuffer != drawBuffer) {

+      if (!check_compatible(newCtx, drawBuffer)) {

+         _mesa_warning(newCtx,

+              "MakeCurrent: incompatible visuals for context and drawbuffer");

+         return GL_FALSE;

+      }

+   }

+   if (newCtx && readBuffer && newCtx->WinSysReadBuffer != readBuffer) {

+      if (!check_compatible(newCtx, readBuffer)) {

+         _mesa_warning(newCtx,

+              "MakeCurrent: incompatible visuals for context and readbuffer");

+         return GL_FALSE;

+      }

+   }

+

+   if (curCtx && 

+      (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) && /* make sure this context is valid for flushing */

+      curCtx != newCtx)

+      _mesa_flush(curCtx);

+

+   /* We used to call _glapi_check_multithread() here.  Now do it in drivers */

+   _glapi_set_context((void *) newCtx);

+   ASSERT(_mesa_get_current_context() == newCtx);

+

+   if (!newCtx) {

+      _glapi_set_dispatch(NULL);  /* none current */

+   }

+   else {

+      _glapi_set_dispatch(newCtx->CurrentDispatch);

+

+      if (drawBuffer && readBuffer) {

+	 /* TODO: check if newCtx and buffer's visual match??? */

+

+         ASSERT(drawBuffer->Name == 0);

+         ASSERT(readBuffer->Name == 0);

+         _mesa_reference_framebuffer(&newCtx->WinSysDrawBuffer, drawBuffer);

+         _mesa_reference_framebuffer(&newCtx->WinSysReadBuffer, readBuffer);

+

+         /*

+          * Only set the context's Draw/ReadBuffer fields if they're NULL

+          * or not bound to a user-created FBO.

+          */

+         if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) {

+            /* KW: merge conflict here, revisit. 

+             */

+            /* fix up the fb fields - these will end up wrong otherwise

+             * if the DRIdrawable changes, and everything relies on them.

+             * This is a bit messy (same as needed in _mesa_BindFramebufferEXT)

+             */

+            unsigned int i;

+            GLenum buffers[MAX_DRAW_BUFFERS];

+

+            _mesa_reference_framebuffer(&newCtx->DrawBuffer, drawBuffer);

+

+            for(i = 0; i < newCtx->Const.MaxDrawBuffers; i++) {

+               buffers[i] = newCtx->Color.DrawBuffer[i];

+            }

+

+            _mesa_drawbuffers(newCtx, newCtx->Const.MaxDrawBuffers,

+                              buffers, NULL);

+         }

+         if (!newCtx->ReadBuffer || newCtx->ReadBuffer->Name == 0) {

+            _mesa_reference_framebuffer(&newCtx->ReadBuffer, readBuffer);

+         }

+

+         /* XXX only set this flag if we're really changing the draw/read

+          * framebuffer bindings.

+          */

+	 newCtx->NewState |= _NEW_BUFFERS;

+

+#if 1

+         /* We want to get rid of these lines: */

+

+#if _HAVE_FULL_GL

+         if (!drawBuffer->Initialized) {

+            initialize_framebuffer_size(newCtx, drawBuffer);

+         }

+         if (readBuffer != drawBuffer && !readBuffer->Initialized) {

+            initialize_framebuffer_size(newCtx, readBuffer);

+         }

+

+	 _mesa_resizebuffers(newCtx);

+#endif

+

+#else

+         /* We want the drawBuffer and readBuffer to be initialized by

+          * the driver.

+          * This generally means the Width and Height match the actual

+          * window size and the renderbuffers (both hardware and software

+          * based) are allocated to match.  The later can generally be

+          * done with a call to _mesa_resize_framebuffer().

+          *

+          * It's theoretically possible for a buffer to have zero width

+          * or height, but for now, assert check that the driver did what's

+          * expected of it.

+          */

+         ASSERT(drawBuffer->Width > 0);

+         ASSERT(drawBuffer->Height > 0);

+#endif

+

+         if (drawBuffer) {

+            _mesa_check_init_viewport(newCtx,

+                                      drawBuffer->Width, drawBuffer->Height);

+         }

+      }

+

+      if (newCtx->FirstTimeCurrent) {

+         _mesa_compute_version(newCtx);

+

+         newCtx->Extensions.String = _mesa_make_extension_string(newCtx);

+

+         check_context_limits(newCtx);

+

+         /* We can use this to help debug user's problems.  Tell them to set

+          * the MESA_INFO env variable before running their app.  Then the

+          * first time each context is made current we'll print some useful

+          * information.

+          */

+	 if (_mesa_getenv("MESA_INFO")) {

+	    _mesa_print_info();

+	 }

+

+	 newCtx->FirstTimeCurrent = GL_FALSE;

+      }

+   }

+   

+   return GL_TRUE;

+}

+

+

+/**

+ * Make context 'ctx' share the display lists, textures and programs

+ * that are associated with 'ctxToShare'.

+ * Any display lists, textures or programs associated with 'ctx' will

+ * be deleted if nobody else is sharing them.

+ */

+GLboolean

+_mesa_share_state(struct gl_context *ctx, struct gl_context *ctxToShare)

+{

+   if (ctx && ctxToShare && ctx->Shared && ctxToShare->Shared) {

+      struct gl_shared_state *oldSharedState = ctx->Shared;

+

+      ctx->Shared = ctxToShare->Shared;

+      

+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+      ctx->Shared->RefCount++;

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+      update_default_objects(ctx);

+

+      _mesa_release_shared_state(ctx, oldSharedState);

+

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+

+

+/**

+ * \return pointer to the current GL context for this thread.

+ * 

+ * Calls _glapi_get_context(). This isn't the fastest way to get the current

+ * context.  If you need speed, see the #GET_CURRENT_CONTEXT macro in

+ * context.h.

+ */

+struct gl_context *

+_mesa_get_current_context( void )

+{

+   return (struct gl_context *) _glapi_get_context();

+}

+

+

+/**

+ * Get context's current API dispatch table.

+ *

+ * It'll either be the immediate-mode execute dispatcher or the display list

+ * compile dispatcher.

+ * 

+ * \param ctx GL context.

+ *

+ * \return pointer to dispatch_table.

+ *

+ * Simply returns __struct gl_contextRec::CurrentDispatch.

+ */

+struct _glapi_table *

+_mesa_get_dispatch(struct gl_context *ctx)

+{

+   return ctx->CurrentDispatch;

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Miscellaneous functions                                     */

+/**********************************************************************/

+/*@{*/

+

+/**

+ * Record an error.

+ *

+ * \param ctx GL context.

+ * \param error error code.

+ * 

+ * Records the given error code and call the driver's dd_function_table::Error

+ * function if defined.

+ *

+ * \sa

+ * This is called via _mesa_error().

+ */

+void

+_mesa_record_error(struct gl_context *ctx, GLenum error)

+{

+   if (!ctx)

+      return;

+

+   if (ctx->ErrorValue == GL_NO_ERROR) {

+      ctx->ErrorValue = error;

+   }

+

+   /* Call device driver's error handler, if any.  This is used on the Mac. */

+   if (ctx->Driver.Error) {

+      ctx->Driver.Error(ctx);

+   }

+}

+

+

+/**

+ * Flush commands and wait for completion.

+ */

+void

+_mesa_finish(struct gl_context *ctx)

+{

+   FLUSH_CURRENT( ctx, 0 );

+   if (ctx->Driver.Finish) {

+      ctx->Driver.Finish(ctx);

+   }

+}

+

+

+/**

+ * Flush commands.

+ */

+void

+_mesa_flush(struct gl_context *ctx)

+{

+   FLUSH_CURRENT( ctx, 0 );

+   if (ctx->Driver.Flush) {

+      ctx->Driver.Flush(ctx);

+   }

+}

+

+

+

+/**

+ * Execute glFinish().

+ *

+ * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the

+ * dd_function_table::Finish driver callback, if not NULL.

+ */

+void GLAPIENTRY

+_mesa_Finish(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_finish(ctx);

+}

+

+

+/**

+ * Execute glFlush().

+ *

+ * Calls the #ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH macro and the

+ * dd_function_table::Flush driver callback, if not NULL.

+ */

+void GLAPIENTRY

+_mesa_Flush(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_flush(ctx);

+}

+

+

+/**

+ * Set mvp_with_dp4 flag.  If a driver has a preference for DP4 over

+ * MUL/MAD, or vice versa, call this function to register that.

+ * Otherwise we default to MUL/MAD.

+ */

+void

+_mesa_set_mvp_with_dp4( struct gl_context *ctx,

+                        GLboolean flag )

+{

+   ctx->mvp_with_dp4 = flag;

+}

+

+

+

+/**

+ * Prior to drawing anything with glBegin, glDrawArrays, etc. this function

+ * is called to see if it's valid to render.  This involves checking that

+ * the current shader is valid and the framebuffer is complete.

+ * If an error is detected it'll be recorded here.

+ * \return GL_TRUE if OK to render, GL_FALSE if not

+ */

+GLboolean

+_mesa_valid_to_render(struct gl_context *ctx, const char *where)

+{

+   bool vert_from_glsl_shader = false;

+   bool geom_from_glsl_shader = false;

+   bool frag_from_glsl_shader = false;

+

+   /* This depends on having up to date derived state (shaders) */

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   if (ctx->Shader.CurrentVertexProgram) {

+      vert_from_glsl_shader = true;

+

+      if (!ctx->Shader.CurrentVertexProgram->LinkStatus) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "%s(shader not linked)", where);

+         return GL_FALSE;

+      }

+#if 0 /* not normally enabled */

+      {

+         char errMsg[100];

+         if (!_mesa_validate_shader_program(ctx,

+					    ctx->Shader.CurrentVertexProgram,

+                                            errMsg)) {

+            _mesa_warning(ctx, "Shader program %u is invalid: %s",

+                          ctx->Shader.CurrentVertexProgram->Name, errMsg);

+         }

+      }

+#endif

+   }

+

+   if (ctx->Shader.CurrentGeometryProgram) {

+      geom_from_glsl_shader = true;

+

+      if (!ctx->Shader.CurrentGeometryProgram->LinkStatus) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "%s(shader not linked)", where);

+         return GL_FALSE;

+      }

+#if 0 /* not normally enabled */

+      {

+         char errMsg[100];

+         if (!_mesa_validate_shader_program(ctx,

+					    ctx->Shader.CurrentGeometryProgram,

+                                            errMsg)) {

+            _mesa_warning(ctx, "Shader program %u is invalid: %s",

+                          ctx->Shader.CurrentGeometryProgram->Name, errMsg);

+         }

+      }

+#endif

+   }

+

+   if (ctx->Shader.CurrentFragmentProgram) {

+      frag_from_glsl_shader = true;

+

+      if (!ctx->Shader.CurrentFragmentProgram->LinkStatus) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "%s(shader not linked)", where);

+         return GL_FALSE;

+      }

+#if 0 /* not normally enabled */

+      {

+         char errMsg[100];

+         if (!_mesa_validate_shader_program(ctx,

+					    ctx->Shader.CurrentFragmentProgram,

+                                            errMsg)) {

+            _mesa_warning(ctx, "Shader program %u is invalid: %s",

+                          ctx->Shader.CurrentFragmentProgram->Name, errMsg);

+         }

+      }

+#endif

+   }

+

+   /* Any shader stages that are not supplied by the GLSL shader and have

+    * assembly shaders enabled must now be validated.

+    */

+   if (!vert_from_glsl_shader

+       && ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+		  "%s(vertex program not valid)", where);

+      return GL_FALSE;

+   }

+

+   /* FINISHME: If GL_NV_geometry_program4 is ever supported, the current

+    * FINISHME: geometry program should validated here.

+    */

+   (void) geom_from_glsl_shader;

+

+   if (!frag_from_glsl_shader) {

+      if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION,

+		     "%s(fragment program not valid)", where);

+	 return GL_FALSE;

+      }

+

+      /* If drawing to integer-valued color buffers, there must be an

+       * active fragment shader (GL_EXT_texture_integer).

+       */

+      if (ctx->DrawBuffer && ctx->DrawBuffer->_IntegerColor) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "%s(integer format but no fragment shader)", where);

+         return GL_FALSE;

+      }

+   }

+

+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                  "%s(incomplete framebuffer)", where);

+      return GL_FALSE;

+   }

+

+#ifdef DEBUG

+   if (ctx->Shader.Flags & GLSL_LOG) {

+      struct gl_shader_program *shProg[MESA_SHADER_TYPES];

+      gl_shader_type i;

+

+      shProg[MESA_SHADER_VERTEX] = ctx->Shader.CurrentVertexProgram;

+      shProg[MESA_SHADER_GEOMETRY] = ctx->Shader.CurrentGeometryProgram;

+      shProg[MESA_SHADER_FRAGMENT] = ctx->Shader.CurrentFragmentProgram;

+

+      for (i = 0; i < MESA_SHADER_TYPES; i++) {

+	 struct gl_shader *sh;

+

+	 if (shProg[i] == NULL || shProg[i]->_Used

+	     || shProg[i]->_LinkedShaders[i] == NULL)

+	    continue;

+

+	 /* This is the first time this shader is being used.

+	  * Append shader's constants/uniforms to log file.

+	  *

+	  * The logic is a little odd here.  We only want to log data for each

+	  * shader target that will actually be used, and we only want to log

+	  * it once.  It's possible to have a program bound to the vertex

+	  * shader target that also supplied a fragment shader.  If that

+	  * program isn't also bound to the fragment shader target we don't

+	  * want to log its fragment data.

+	  */

+	 sh = shProg[i]->_LinkedShaders[i];

+	 switch (sh->Type) {

+	 case GL_VERTEX_SHADER:

+	    _mesa_append_uniforms_to_file(sh, &shProg[i]->VertexProgram->Base);

+	    break;

+

+	 case GL_GEOMETRY_SHADER_ARB:

+	    _mesa_append_uniforms_to_file(sh,

+					  &shProg[i]->GeometryProgram->Base);

+	    break;

+

+	 case GL_FRAGMENT_SHADER:

+	    _mesa_append_uniforms_to_file(sh,

+					  &shProg[i]->FragmentProgram->Base);

+	    break;

+	 }

+      }

+

+      for (i = 0; i < MESA_SHADER_TYPES; i++) {

+	 if (shProg[i] != NULL)

+	    shProg[i]->_Used = GL_TRUE;

+      }

+   }

+#endif

+

+   return GL_TRUE;

+}

+

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h
index c61da6282..ab689f429 100644
--- a/mesalib/src/mesa/main/context.h
+++ b/mesalib/src/mesa/main/context.h
@@ -1,326 +1,326 @@
-/*
- * 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.
- */
-
-
-/**
- * \file context.h
- * Mesa context and visual-related functions.
- *
- * There are three large Mesa data types/classes which are meant to be
- * used by device drivers:
- * - GLcontext: this contains the Mesa rendering state
- * - GLvisual:  this describes the color buffer (RGB vs. ci), whether or not
- *   there's a depth buffer, stencil buffer, etc.
- * - GLframebuffer:  contains pointers to the depth buffer, stencil buffer,
- *   accum buffer and alpha buffers.
- *
- * These types should be encapsulated by corresponding device driver
- * data types.  See xmesa.h and xmesaP.h for an example.
- *
- * In OOP terms, GLcontext, GLvisual, and GLframebuffer are base classes
- * which the device driver must derive from.
- *
- * The following functions create and destroy these data types.
- */
-
-
-#ifndef CONTEXT_H
-#define CONTEXT_H
-
-
-#include "imports.h"
-#include "mtypes.h"
-
-
-struct _glapi_table;
-
-
-/** \name Visual-related functions */
-/*@{*/
- 
-extern GLvisual *
-_mesa_create_visual( GLboolean dbFlag,
-                     GLboolean stereoFlag,
-                     GLint redBits,
-                     GLint greenBits,
-                     GLint blueBits,
-                     GLint alphaBits,
-                     GLint depthBits,
-                     GLint stencilBits,
-                     GLint accumRedBits,
-                     GLint accumGreenBits,
-                     GLint accumBlueBits,
-                     GLint accumAlphaBits,
-                     GLint numSamples );
-
-extern GLboolean
-_mesa_initialize_visual( GLvisual *v,
-                         GLboolean dbFlag,
-                         GLboolean stereoFlag,
-                         GLint redBits,
-                         GLint greenBits,
-                         GLint blueBits,
-                         GLint alphaBits,
-                         GLint depthBits,
-                         GLint stencilBits,
-                         GLint accumRedBits,
-                         GLint accumGreenBits,
-                         GLint accumBlueBits,
-                         GLint accumAlphaBits,
-                         GLint numSamples );
-
-extern void
-_mesa_destroy_visual( GLvisual *vis );
-
-/*@}*/
-
-
-/** \name Context-related functions */
-/*@{*/
-
-extern GLcontext *
-_mesa_create_context( const GLvisual *visual,
-                      GLcontext *share_list,
-                      const struct dd_function_table *driverFunctions,
-                      void *driverContext );
-
-extern GLboolean
-_mesa_initialize_context( GLcontext *ctx,
-                          const GLvisual *visual,
-                          GLcontext *share_list,
-                          const struct dd_function_table *driverFunctions,
-                          void *driverContext );
-
-extern GLcontext *
-_mesa_create_context_for_api(gl_api api,
-			     const GLvisual *visual,
-			     GLcontext *share_list,
-			     const struct dd_function_table *driverFunctions,
-			     void *driverContext);
-
-extern GLboolean
-_mesa_initialize_context_for_api(GLcontext *ctx,
-				 gl_api api,
-				 const GLvisual *visual,
-				 GLcontext *share_list,
-				 const struct dd_function_table *driverFunctions,
-				 void *driverContext);
-
-extern void
-_mesa_free_context_data( GLcontext *ctx );
-
-extern void
-_mesa_destroy_context( GLcontext *ctx );
-
-
-extern void
-_mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
-
-
-extern void
-_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height);
-
-extern GLboolean
-_mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer,
-                    GLframebuffer *readBuffer );
-
-extern GLboolean
-_mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare);
-
-extern GLcontext *
-_mesa_get_current_context(void);
-
-/*@}*/
-
-extern void
-_mesa_init_get_hash(GLcontext *ctx);
-
-extern void
-_mesa_notifySwapBuffers(__GLcontext *gc);
-
-
-extern struct _glapi_table *
-_mesa_get_dispatch(GLcontext *ctx);
-
-
-void
-_mesa_set_mvp_with_dp4( GLcontext *ctx,
-                        GLboolean flag );
-
-
-extern GLboolean
-_mesa_valid_to_render(GLcontext *ctx, const char *where);
-
-
-
-/** \name Miscellaneous */
-/*@{*/
-
-extern void
-_mesa_record_error( GLcontext *ctx, GLenum error );
-
-
-extern void
-_mesa_finish(GLcontext *ctx);
-
-extern void
-_mesa_flush(GLcontext *ctx);
-
-
-extern void GLAPIENTRY
-_mesa_Finish( void );
-
-extern void GLAPIENTRY
-_mesa_Flush( void );
-
-/*@}*/
-
-
-/**
- * \name Macros for flushing buffered rendering commands before state changes,
- * checking if inside glBegin/glEnd, etc.
- */
-/*@{*/
-
-/**
- * Flush vertices.
- *
- * \param ctx GL context.
- * \param newstate new state.
- *
- * Checks if dd_function_table::NeedFlush is marked to flush stored vertices,
- * and calls dd_function_table::FlushVertices if so. Marks
- * __GLcontextRec::NewState with \p newstate.
- */
-#define FLUSH_VERTICES(ctx, newstate)				\
-do {								\
-   if (MESA_VERBOSE & VERBOSE_STATE)				\
-      _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", MESA_FUNCTION);\
-   if (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES)		\
-      ctx->Driver.FlushVertices(ctx, FLUSH_STORED_VERTICES);	\
-   ctx->NewState |= newstate;					\
-} while (0)
-
-/**
- * Flush current state.
- *
- * \param ctx GL context.
- * \param newstate new state.
- *
- * Checks if dd_function_table::NeedFlush is marked to flush current state,
- * and calls dd_function_table::FlushVertices if so. Marks
- * __GLcontextRec::NewState with \p newstate.
- */
-#define FLUSH_CURRENT(ctx, newstate)				\
-do {								\
-   if (MESA_VERBOSE & VERBOSE_STATE)				\
-      _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", MESA_FUNCTION);	\
-   if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)		\
-      ctx->Driver.FlushVertices(ctx, FLUSH_UPDATE_CURRENT);	\
-   ctx->NewState |= newstate;					\
-} 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_BEGIN_END_WITH_RETVAL(ctx, retval)		\
-do {									\
-   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {	\
-      _mesa_error(ctx, GL_INVALID_OPERATION, "Inside glBegin/glEnd");	\
-      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_BEGIN_END(ctx)					\
-do {									\
-   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {	\
-      _mesa_error(ctx, GL_INVALID_OPERATION, "Inside glBegin/glEnd");	\
-      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_BEGIN_END_AND_FLUSH(ctx)				\
-do {									\
-   ASSERT_OUTSIDE_BEGIN_END(ctx);					\
-   FLUSH_VERTICES(ctx, 0);						\
-} 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_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)	\
-do {									\
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval);			\
-   FLUSH_VERTICES(ctx, 0);						\
-} while (0)
-
-/*@}*/
-
-
-
-/**
- * Is the secondary color needed?
- */
-#define NEED_SECONDARY_COLOR(CTX)					\
-   (((CTX)->Light.Enabled &&						\
-     (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)	\
-    || (CTX)->Fog.ColorSumEnabled					\
-    || ((CTX)->VertexProgram._Current &&				\
-        ((CTX)->VertexProgram._Current != (CTX)->VertexProgram._TnlProgram) &&    \
-        ((CTX)->VertexProgram._Current->Base.InputsRead & VERT_BIT_COLOR1)) \
-    || ((CTX)->FragmentProgram._Current &&				\
-        ((CTX)->FragmentProgram._Current != (CTX)->FragmentProgram._TexEnvProgram) &&  \
-        ((CTX)->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL1)) \
-   )
-
-
-/**
- * Is RGBA LogicOp enabled?
- */
-#define RGBA_LOGICOP_ENABLED(CTX) \
-  ((CTX)->Color.ColorLogicOpEnabled || \
-   ((CTX)->Color.BlendEnabled && (CTX)->Color.BlendEquationRGB == GL_LOGIC_OP))
-
-
-#endif /* CONTEXT_H */
+/*

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

+ */

+

+

+/**

+ * \file context.h

+ * Mesa context and visual-related functions.

+ *

+ * There are three large Mesa data types/classes which are meant to be

+ * used by device drivers:

+ * - struct gl_context: this contains the Mesa rendering state

+ * - struct gl_config:  this describes the color buffer (RGB vs. ci), whether or not

+ *   there's a depth buffer, stencil buffer, etc.

+ * - struct gl_framebuffer:  contains pointers to the depth buffer, stencil buffer,

+ *   accum buffer and alpha buffers.

+ *

+ * These types should be encapsulated by corresponding device driver

+ * data types.  See xmesa.h and xmesaP.h for an example.

+ *

+ * In OOP terms, struct gl_context, struct gl_config, and struct gl_framebuffer are base classes

+ * which the device driver must derive from.

+ *

+ * The following functions create and destroy these data types.

+ */

+

+

+#ifndef CONTEXT_H

+#define CONTEXT_H

+

+

+#include "imports.h"

+#include "mtypes.h"

+

+

+struct _glapi_table;

+

+

+/** \name Visual-related functions */

+/*@{*/

+ 

+extern struct gl_config *

+_mesa_create_visual( GLboolean dbFlag,

+                     GLboolean stereoFlag,

+                     GLint redBits,

+                     GLint greenBits,

+                     GLint blueBits,

+                     GLint alphaBits,

+                     GLint depthBits,

+                     GLint stencilBits,

+                     GLint accumRedBits,

+                     GLint accumGreenBits,

+                     GLint accumBlueBits,

+                     GLint accumAlphaBits,

+                     GLint numSamples );

+

+extern GLboolean

+_mesa_initialize_visual( struct gl_config *v,

+                         GLboolean dbFlag,

+                         GLboolean stereoFlag,

+                         GLint redBits,

+                         GLint greenBits,

+                         GLint blueBits,

+                         GLint alphaBits,

+                         GLint depthBits,

+                         GLint stencilBits,

+                         GLint accumRedBits,

+                         GLint accumGreenBits,

+                         GLint accumBlueBits,

+                         GLint accumAlphaBits,

+                         GLint numSamples );

+

+extern void

+_mesa_destroy_visual( struct gl_config *vis );

+

+/*@}*/

+

+

+/** \name Context-related functions */

+/*@{*/

+

+extern struct gl_context *

+_mesa_create_context( const struct gl_config *visual,

+                      struct gl_context *share_list,

+                      const struct dd_function_table *driverFunctions,

+                      void *driverContext );

+

+extern GLboolean

+_mesa_initialize_context( struct gl_context *ctx,

+                          const struct gl_config *visual,

+                          struct gl_context *share_list,

+                          const struct dd_function_table *driverFunctions,

+                          void *driverContext );

+

+extern struct gl_context *

+_mesa_create_context_for_api(gl_api api,

+			     const struct gl_config *visual,

+			     struct gl_context *share_list,

+			     const struct dd_function_table *driverFunctions,

+			     void *driverContext);

+

+extern GLboolean

+_mesa_initialize_context_for_api(struct gl_context *ctx,

+				 gl_api api,

+				 const struct gl_config *visual,

+				 struct gl_context *share_list,

+				 const struct dd_function_table *driverFunctions,

+				 void *driverContext);

+

+extern void

+_mesa_free_context_data( struct gl_context *ctx );

+

+extern void

+_mesa_destroy_context( struct gl_context *ctx );

+

+

+extern void

+_mesa_copy_context(const struct gl_context *src, struct gl_context *dst, GLuint mask);

+

+

+extern void

+_mesa_check_init_viewport(struct gl_context *ctx, GLuint width, GLuint height);

+

+extern GLboolean

+_mesa_make_current( struct gl_context *ctx, struct gl_framebuffer *drawBuffer,

+                    struct gl_framebuffer *readBuffer );

+

+extern GLboolean

+_mesa_share_state(struct gl_context *ctx, struct gl_context *ctxToShare);

+

+extern struct gl_context *

+_mesa_get_current_context(void);

+

+/*@}*/

+

+extern void

+_mesa_init_get_hash(struct gl_context *ctx);

+

+extern void

+_mesa_notifySwapBuffers(struct gl_context *gc);

+

+

+extern struct _glapi_table *

+_mesa_get_dispatch(struct gl_context *ctx);

+

+

+void

+_mesa_set_mvp_with_dp4( struct gl_context *ctx,

+                        GLboolean flag );

+

+

+extern GLboolean

+_mesa_valid_to_render(struct gl_context *ctx, const char *where);

+

+

+

+/** \name Miscellaneous */

+/*@{*/

+

+extern void

+_mesa_record_error( struct gl_context *ctx, GLenum error );

+

+

+extern void

+_mesa_finish(struct gl_context *ctx);

+

+extern void

+_mesa_flush(struct gl_context *ctx);

+

+

+extern void GLAPIENTRY

+_mesa_Finish( void );

+

+extern void GLAPIENTRY

+_mesa_Flush( void );

+

+/*@}*/

+

+

+/**

+ * \name Macros for flushing buffered rendering commands before state changes,

+ * checking if inside glBegin/glEnd, etc.

+ */

+/*@{*/

+

+/**

+ * Flush vertices.

+ *

+ * \param ctx GL context.

+ * \param newstate new state.

+ *

+ * Checks if dd_function_table::NeedFlush is marked to flush stored vertices,

+ * and calls dd_function_table::FlushVertices if so. Marks

+ * __struct gl_contextRec::NewState with \p newstate.

+ */

+#define FLUSH_VERTICES(ctx, newstate)				\

+do {								\

+   if (MESA_VERBOSE & VERBOSE_STATE)				\

+      _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", MESA_FUNCTION);\

+   if (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES)		\

+      ctx->Driver.FlushVertices(ctx, FLUSH_STORED_VERTICES);	\

+   ctx->NewState |= newstate;					\

+} while (0)

+

+/**

+ * Flush current state.

+ *

+ * \param ctx GL context.

+ * \param newstate new state.

+ *

+ * Checks if dd_function_table::NeedFlush is marked to flush current state,

+ * and calls dd_function_table::FlushVertices if so. Marks

+ * __struct gl_contextRec::NewState with \p newstate.

+ */

+#define FLUSH_CURRENT(ctx, newstate)				\

+do {								\

+   if (MESA_VERBOSE & VERBOSE_STATE)				\

+      _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", MESA_FUNCTION);	\

+   if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)		\

+      ctx->Driver.FlushVertices(ctx, FLUSH_UPDATE_CURRENT);	\

+   ctx->NewState |= newstate;					\

+} 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_BEGIN_END_WITH_RETVAL(ctx, retval)		\

+do {									\

+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {	\

+      _mesa_error(ctx, GL_INVALID_OPERATION, "Inside glBegin/glEnd");	\

+      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_BEGIN_END(ctx)					\

+do {									\

+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {	\

+      _mesa_error(ctx, GL_INVALID_OPERATION, "Inside glBegin/glEnd");	\

+      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_BEGIN_END_AND_FLUSH(ctx)				\

+do {									\

+   ASSERT_OUTSIDE_BEGIN_END(ctx);					\

+   FLUSH_VERTICES(ctx, 0);						\

+} 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_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)	\

+do {									\

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval);			\

+   FLUSH_VERTICES(ctx, 0);						\

+} while (0)

+

+/*@}*/

+

+

+

+/**

+ * Is the secondary color needed?

+ */

+#define NEED_SECONDARY_COLOR(CTX)					\

+   (((CTX)->Light.Enabled &&						\

+     (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)	\

+    || (CTX)->Fog.ColorSumEnabled					\

+    || ((CTX)->VertexProgram._Current &&				\

+        ((CTX)->VertexProgram._Current != (CTX)->VertexProgram._TnlProgram) &&    \

+        ((CTX)->VertexProgram._Current->Base.InputsRead & VERT_BIT_COLOR1)) \

+    || ((CTX)->FragmentProgram._Current &&				\

+        ((CTX)->FragmentProgram._Current != (CTX)->FragmentProgram._TexEnvProgram) &&  \

+        ((CTX)->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL1)) \

+   )

+

+

+/**

+ * Is RGBA LogicOp enabled?

+ */

+#define RGBA_LOGICOP_ENABLED(CTX) \

+  ((CTX)->Color.ColorLogicOpEnabled || \

+   ((CTX)->Color.BlendEnabled && (CTX)->Color.BlendEquationRGB == GL_LOGIC_OP))

+

+

+#endif /* CONTEXT_H */

diff --git a/mesalib/src/mesa/main/convolve.c b/mesalib/src/mesa/main/convolve.c
index f63bddc44..cd725bb01 100644
--- a/mesalib/src/mesa/main/convolve.c
+++ b/mesalib/src/mesa/main/convolve.c
@@ -1,1461 +1,181 @@
-/*
- * 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.
- */
-
-
-/*
- * Image convolution functions.
- *
- * Notes: filter kernel elements are indexed by <n> and <m> as in
- * the GL spec.
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "convolve.h"
-#include "context.h"
-#include "image.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "state.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_convolve
-
-
-/*
- * Given an internalFormat token passed to glConvolutionFilter
- * or glSeparableFilter, return the corresponding base format.
- * Return -1 if invalid token.
- */
-static GLint
-base_filter_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 4:
-      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 */
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
-{
-   GLint baseFormat;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_1D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter1D(width)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter1D(format or type)");
-      return;
-   }
-
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(format or type)");
-      return;
-   }
-
-   ctx->Convolution1D.Format = format;
-   ctx->Convolution1D.InternalFormat = internalFormat;
-   ctx->Convolution1D.Width = width;
-   ctx->Convolution1D.Height = 1;
-
-   image = _mesa_map_validate_pbo_source(ctx, 
-                                        1, &ctx->Unpack, width, 1, 1,
-                                        format, type, image,
-                                        "glConvolutionFilter1D");
-   if (!image)
-      return;
-
-   _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
-                                 ctx->Convolution1D.Filter,
-                                 format, type, image, &ctx->Unpack,
-                                 0); /* transferOps */
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-
-   _mesa_scale_and_bias_rgba(width,
-                             (GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                             ctx->Pixel.ConvolutionFilterScale[0][0],
-                             ctx->Pixel.ConvolutionFilterScale[0][1],
-                             ctx->Pixel.ConvolutionFilterScale[0][2],
-                             ctx->Pixel.ConvolutionFilterScale[0][3],
-                             ctx->Pixel.ConvolutionFilterBias[0][0],
-                             ctx->Pixel.ConvolutionFilterBias[0][1],
-                             ctx->Pixel.ConvolutionFilterBias[0][2],
-                             ctx->Pixel.ConvolutionFilterBias[0][3]);
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-void GLAPIENTRY
-_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
-{
-   GLint baseFormat;
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(width)");
-      return;
-   }
-   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(height)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter2D(format or type)");
-      return;
-   }
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(format or type)");
-      return;
-   }
-
-   /* this should have been caught earlier */
-   assert(_mesa_components_in_format(format));
-
-   ctx->Convolution2D.Format = format;
-   ctx->Convolution2D.InternalFormat = internalFormat;
-   ctx->Convolution2D.Width = width;
-   ctx->Convolution2D.Height = height;
-
-   image = _mesa_map_validate_pbo_source(ctx, 
-                                         2, &ctx->Unpack, width, height, 1,
-                                         format, type, image,
-                                         "glConvolutionFilter2D");
-   if (!image)
-      return;
-
-   /* Unpack filter image.  We always store filters in RGBA format. */
-   for (i = 0; i < height; i++) {
-      const GLvoid *src = _mesa_image_address2d(&ctx->Unpack, image, width,
-                                                height, format, type, i, 0);
-      GLfloat *dst = ctx->Convolution2D.Filter + i * width * 4;
-      _mesa_unpack_color_span_float(ctx, width, GL_RGBA, dst,
-                                    format, type, src, &ctx->Unpack,
-                                    0); /* transferOps */
-   }
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-
-   _mesa_scale_and_bias_rgba(width * height,
-                             (GLfloat (*)[4]) ctx->Convolution2D.Filter,
-                             ctx->Pixel.ConvolutionFilterScale[1][0],
-                             ctx->Pixel.ConvolutionFilterScale[1][1],
-                             ctx->Pixel.ConvolutionFilterScale[1][2],
-                             ctx->Pixel.ConvolutionFilterScale[1][3],
-                             ctx->Pixel.ConvolutionFilterBias[1][0],
-                             ctx->Pixel.ConvolutionFilterBias[1][1],
-                             ctx->Pixel.ConvolutionFilterBias[1][2],
-                             ctx->Pixel.ConvolutionFilterBias[1][3]);
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-static void GLAPIENTRY
-_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (param == (GLfloat) GL_REDUCE ||
-             param == (GLfloat) GL_CONSTANT_BORDER ||
-             param == (GLfloat) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(params)");
-            return;
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(pname)");
-         return;
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-static void GLAPIENTRY
-_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-         COPY_4V(ctx->Pixel.ConvolutionBorderColor[c], params);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (params[0] == (GLfloat) GL_REDUCE ||
-             params[0] == (GLfloat) GL_CONSTANT_BORDER ||
-             params[0] == (GLfloat) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(params)");
-            return;
-         }
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-         COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params);
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-         COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(pname)");
-         return;
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-static void GLAPIENTRY
-_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (param == (GLint) GL_REDUCE ||
-             param == (GLint) GL_CONSTANT_BORDER ||
-             param == (GLint) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(params)");
-            return;
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(pname)");
-         return;
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-static void GLAPIENTRY
-_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-	 ctx->Pixel.ConvolutionBorderColor[c][0] = INT_TO_FLOAT(params[0]);
-	 ctx->Pixel.ConvolutionBorderColor[c][1] = INT_TO_FLOAT(params[1]);
-	 ctx->Pixel.ConvolutionBorderColor[c][2] = INT_TO_FLOAT(params[2]);
-	 ctx->Pixel.ConvolutionBorderColor[c][3] = INT_TO_FLOAT(params[3]);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (params[0] == (GLint) GL_REDUCE ||
-             params[0] == (GLint) GL_CONSTANT_BORDER ||
-             params[0] == (GLint) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(params)");
-            return;
-         }
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-	 /* COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params); */
-	 /* need cast to prevent compiler warnings */  
-	 ctx->Pixel.ConvolutionFilterScale[c][0] = (GLfloat) params[0]; 
-	 ctx->Pixel.ConvolutionFilterScale[c][1] = (GLfloat) params[1]; 
-	 ctx->Pixel.ConvolutionFilterScale[c][2] = (GLfloat) params[2]; 
-	 ctx->Pixel.ConvolutionFilterScale[c][3] = (GLfloat) params[3]; 
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-	 /* COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params); */
-	 /* need cast to prevent compiler warnings */  
-	 ctx->Pixel.ConvolutionFilterBias[c][0] = (GLfloat) params[0]; 
-	 ctx->Pixel.ConvolutionFilterBias[c][1] = (GLfloat) params[1]; 
-	 ctx->Pixel.ConvolutionFilterBias[c][2] = (GLfloat) params[2]; 
-	 ctx->Pixel.ConvolutionFilterBias[c][3] = (GLfloat) params[3]; 
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(pname)");
-         return;
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-static void GLAPIENTRY
-_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)
-{
-   GLint baseFormat;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_1D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter1D(width)");
-      return;
-   }
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      return;      /* no readbuffer - OK */
-   }
-
-   ctx->Driver.CopyConvolutionFilter1D( ctx, target, 
-					internalFormat, x, y, width);
-}
-
-
-static void GLAPIENTRY
-_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   GLint baseFormat;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(width)");
-      return;
-   }
-   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(height)");
-      return;
-   }
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      return;      /* no readbuffer - OK */
-   }
-
-   ctx->Driver.CopyConvolutionFilter2D( ctx, target, internalFormat, x, y, 
-					width, height );
-}
-
-
-static void GLAPIENTRY
-_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
-                           GLvoid *image)
-{
-   struct gl_convolution_attrib *filter;
-   GLuint row;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionFilter(format or type)");
-      return;
-   }
-
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
-      return;
-   }
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         filter = &(ctx->Convolution1D);
-         break;
-      case GL_CONVOLUTION_2D:
-         filter = &(ctx->Convolution2D);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(target)");
-         return;
-   }
-
-   image = _mesa_map_validate_pbo_dest(ctx, 2, &ctx->Pack,
-                                       filter->Width, filter->Height, 1,
-                                       format, type, image,
-                                       "glGetConvolutionFilter");
-   if (!image)
-      return;
-
-   for (row = 0; row < filter->Height; row++) {
-      GLvoid *dst = _mesa_image_address2d(&ctx->Pack, image, filter->Width,
-                                          filter->Height, format, type,
-                                          row, 0);
-      GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + row * filter->Width * 4);
-      _mesa_pack_rgba_span_float(ctx, filter->Width, src,
-                                 format, type, dst, &ctx->Pack, 0x0);
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-}
-
-
-static void GLAPIENTRY
-_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const struct gl_convolution_attrib *conv;
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         conv = &ctx->Convolution1D;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         conv = &ctx->Convolution2D;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         conv = &ctx->Separable2D;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-         COPY_4V(params, ctx->Pixel.ConvolutionBorderColor[c]);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         *params = (GLfloat) ctx->Pixel.ConvolutionBorderMode[c];
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-         COPY_4V(params, ctx->Pixel.ConvolutionFilterScale[c]);
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-         COPY_4V(params, ctx->Pixel.ConvolutionFilterBias[c]);
-         break;
-      case GL_CONVOLUTION_FORMAT:
-         *params = (GLfloat) conv->Format;
-         break;
-      case GL_CONVOLUTION_WIDTH:
-         *params = (GLfloat) conv->Width;
-         break;
-      case GL_CONVOLUTION_HEIGHT:
-         *params = (GLfloat) conv->Height;
-         break;
-      case GL_MAX_CONVOLUTION_WIDTH:
-         *params = (GLfloat) ctx->Const.MaxConvolutionWidth;
-         break;
-      case GL_MAX_CONVOLUTION_HEIGHT:
-         *params = (GLfloat) ctx->Const.MaxConvolutionHeight;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(pname)");
-         return;
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const struct gl_convolution_attrib *conv;
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         conv = &ctx->Convolution1D;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         conv = &ctx->Convolution2D;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         conv = &ctx->Separable2D;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-         params[0] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][0]);
-         params[1] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][1]);
-         params[2] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][2]);
-         params[3] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][3]);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         *params = (GLint) ctx->Pixel.ConvolutionBorderMode[c];
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-         params[0] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][0];
-         params[1] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][1];
-         params[2] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][2];
-         params[3] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][3];
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-         params[0] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][0];
-         params[1] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][1];
-         params[2] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][2];
-         params[3] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][3];
-         break;
-      case GL_CONVOLUTION_FORMAT:
-         *params = (GLint) conv->Format;
-         break;
-      case GL_CONVOLUTION_WIDTH:
-         *params = (GLint) conv->Width;
-         break;
-      case GL_CONVOLUTION_HEIGHT:
-         *params = (GLint) conv->Height;
-         break;
-      case GL_MAX_CONVOLUTION_WIDTH:
-         *params = (GLint) ctx->Const.MaxConvolutionWidth;
-         break;
-      case GL_MAX_CONVOLUTION_HEIGHT:
-         *params = (GLint) ctx->Const.MaxConvolutionHeight;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(pname)");
-         return;
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
-                         GLvoid *row, GLvoid *column, GLvoid *span)
-{
-   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
-   struct gl_convolution_attrib *filter;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (target != GL_SEPARABLE_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter(target)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetConvolutionFilter(format or type)");
-      return;
-   }
-
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
-      return;
-   }
-
-   filter = &ctx->Separable2D;
-
-   /* Get row filter */
-   row = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                     filter->Width, 1, 1,
-                                     format, type, row,
-                                     "glGetConvolutionFilter");
-   if (row) {
-      GLvoid *dst = _mesa_image_address1d(&ctx->Pack, row, filter->Width,
-                                          format, type, 0);
-      _mesa_pack_rgba_span_float(ctx, filter->Width,
-                                 (GLfloat (*)[4]) filter->Filter,
-                                 format, type, dst, &ctx->Pack, 0x0);
-      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-   }
-
-   /* get column filter */
-   column = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                        filter->Height, 1, 1,
-                                        format, type, column,
-                                        "glGetConvolutionFilter");
-   if (column) {
-      GLvoid *dst = _mesa_image_address1d(&ctx->Pack, column, filter->Height,
-                                          format, type, 0);
-      GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + colStart);
-      _mesa_pack_rgba_span_float(ctx, filter->Height, src,
-                                 format, type, dst, &ctx->Pack, 0x0);
-      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-   }
-
-   (void) span;  /* unused at this time */
-}
-
-
-static void GLAPIENTRY
-_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
-{
-   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
-   GLint baseFormat;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_SEPARABLE_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(width)");
-      return;
-   }
-   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(height)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSeparableFilter2D(format or type)");
-      return;
-   }
-
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(format or type)");
-      return;
-   }
-
-   ctx->Separable2D.Format = format;
-   ctx->Separable2D.InternalFormat = internalFormat;
-   ctx->Separable2D.Width = width;
-   ctx->Separable2D.Height = height;
-
-   /* unpack row filter */
-   row = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
-                                       width, 1, 1,
-                                       format, type, row,
-                                       "glSeparableFilter2D");
-   if (row) {
-      _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
-                                    ctx->Separable2D.Filter,
-                                    format, type, row, &ctx->Unpack,
-                                    0x0);  /* transferOps */
-      _mesa_scale_and_bias_rgba(width,
-                             (GLfloat (*)[4]) ctx->Separable2D.Filter,
-                             ctx->Pixel.ConvolutionFilterScale[2][0],
-                             ctx->Pixel.ConvolutionFilterScale[2][1],
-                             ctx->Pixel.ConvolutionFilterScale[2][2],
-                             ctx->Pixel.ConvolutionFilterScale[2][3],
-                             ctx->Pixel.ConvolutionFilterBias[2][0],
-                             ctx->Pixel.ConvolutionFilterBias[2][1],
-                             ctx->Pixel.ConvolutionFilterBias[2][2],
-                             ctx->Pixel.ConvolutionFilterBias[2][3]);
-      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-   }
-
-   /* unpack column filter */
-   column = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
-                                          height, 1, 1,
-                                          format, type, column,
-                                          "glSeparableFilter2D");
-   if (column) {
-      _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
-                                    &ctx->Separable2D.Filter[colStart],
-                                    format, type, column, &ctx->Unpack,
-                                    0); /* transferOps */
-
-      _mesa_scale_and_bias_rgba(height,
-                       (GLfloat (*)[4]) (ctx->Separable2D.Filter + colStart),
-                       ctx->Pixel.ConvolutionFilterScale[2][0],
-                       ctx->Pixel.ConvolutionFilterScale[2][1],
-                       ctx->Pixel.ConvolutionFilterScale[2][2],
-                       ctx->Pixel.ConvolutionFilterScale[2][3],
-                       ctx->Pixel.ConvolutionFilterBias[2][0],
-                       ctx->Pixel.ConvolutionFilterBias[2][1],
-                       ctx->Pixel.ConvolutionFilterBias[2][2],
-                       ctx->Pixel.ConvolutionFilterBias[2][3]);
-      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-   }
-
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-/**********************************************************************/
-/***                   image convolution functions                  ***/
-/**********************************************************************/
-
-static void
-convolve_1d_reduce(GLint srcWidth, const GLfloat src[][4],
-                   GLint filterWidth, const GLfloat filter[][4],
-                   GLfloat dest[][4])
-{
-   GLint dstWidth;
-   GLint i, n;
-
-   if (filterWidth >= 1)
-      dstWidth = srcWidth - (filterWidth - 1);
-   else
-      dstWidth = srcWidth;
-
-   if (dstWidth <= 0)
-      return;  /* null result */
-
-   for (i = 0; i < dstWidth; i++) {
-      GLfloat sumR = 0.0;
-      GLfloat sumG = 0.0;
-      GLfloat sumB = 0.0;
-      GLfloat sumA = 0.0;
-      for (n = 0; n < filterWidth; n++) {
-         sumR += src[i + n][RCOMP] * filter[n][RCOMP];
-         sumG += src[i + n][GCOMP] * filter[n][GCOMP];
-         sumB += src[i + n][BCOMP] * filter[n][BCOMP];
-         sumA += src[i + n][ACOMP] * filter[n][ACOMP];
-      }
-      dest[i][RCOMP] = sumR;
-      dest[i][GCOMP] = sumG;
-      dest[i][BCOMP] = sumB;
-      dest[i][ACOMP] = sumA;
-   }
-}
-
-
-static void
-convolve_1d_constant(GLint srcWidth, const GLfloat src[][4],
-                     GLint filterWidth, const GLfloat filter[][4],
-                     GLfloat dest[][4],
-                     const GLfloat borderColor[4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   GLint i, n;
-
-   for (i = 0; i < srcWidth; i++) {
-      GLfloat sumR = 0.0;
-      GLfloat sumG = 0.0;
-      GLfloat sumB = 0.0;
-      GLfloat sumA = 0.0;
-      for (n = 0; n < filterWidth; n++) {
-         if (i + n < halfFilterWidth || i + n - halfFilterWidth >= srcWidth) {
-            sumR += borderColor[RCOMP] * filter[n][RCOMP];
-            sumG += borderColor[GCOMP] * filter[n][GCOMP];
-            sumB += borderColor[BCOMP] * filter[n][BCOMP];
-            sumA += borderColor[ACOMP] * filter[n][ACOMP];
-         }
-         else {
-            sumR += src[i + n - halfFilterWidth][RCOMP] * filter[n][RCOMP];
-            sumG += src[i + n - halfFilterWidth][GCOMP] * filter[n][GCOMP];
-            sumB += src[i + n - halfFilterWidth][BCOMP] * filter[n][BCOMP];
-            sumA += src[i + n - halfFilterWidth][ACOMP] * filter[n][ACOMP];
-         }
-      }
-      dest[i][RCOMP] = sumR;
-      dest[i][GCOMP] = sumG;
-      dest[i][BCOMP] = sumB;
-      dest[i][ACOMP] = sumA;
-   }
-}
-
-
-static void
-convolve_1d_replicate(GLint srcWidth, const GLfloat src[][4],
-                      GLint filterWidth, const GLfloat filter[][4],
-                      GLfloat dest[][4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   GLint i, n;
-
-   for (i = 0; i < srcWidth; i++) {
-      GLfloat sumR = 0.0;
-      GLfloat sumG = 0.0;
-      GLfloat sumB = 0.0;
-      GLfloat sumA = 0.0;
-      for (n = 0; n < filterWidth; n++) {
-         if (i + n < halfFilterWidth) {
-            sumR += src[0][RCOMP] * filter[n][RCOMP];
-            sumG += src[0][GCOMP] * filter[n][GCOMP];
-            sumB += src[0][BCOMP] * filter[n][BCOMP];
-            sumA += src[0][ACOMP] * filter[n][ACOMP];
-         }
-         else if (i + n - halfFilterWidth >= srcWidth) {
-            sumR += src[srcWidth - 1][RCOMP] * filter[n][RCOMP];
-            sumG += src[srcWidth - 1][GCOMP] * filter[n][GCOMP];
-            sumB += src[srcWidth - 1][BCOMP] * filter[n][BCOMP];
-            sumA += src[srcWidth - 1][ACOMP] * filter[n][ACOMP];
-         }
-         else {
-            sumR += src[i + n - halfFilterWidth][RCOMP] * filter[n][RCOMP];
-            sumG += src[i + n - halfFilterWidth][GCOMP] * filter[n][GCOMP];
-            sumB += src[i + n - halfFilterWidth][BCOMP] * filter[n][BCOMP];
-            sumA += src[i + n - halfFilterWidth][ACOMP] * filter[n][ACOMP];
-         }
-      }
-      dest[i][RCOMP] = sumR;
-      dest[i][GCOMP] = sumG;
-      dest[i][BCOMP] = sumB;
-      dest[i][ACOMP] = sumA;
-   }
-}
-
-
-static void
-convolve_2d_reduce(GLint srcWidth, GLint srcHeight,
-                   const GLfloat src[][4],
-                   GLint filterWidth, GLint filterHeight,
-                   const GLfloat filter[][4],
-                   GLfloat dest[][4])
-{
-   GLint dstWidth, dstHeight;
-   GLint i, j, n, m;
-
-   if (filterWidth >= 1)
-      dstWidth = srcWidth - (filterWidth - 1);
-   else
-      dstWidth = srcWidth;
-
-   if (filterHeight >= 1)
-      dstHeight = srcHeight - (filterHeight - 1);
-   else
-      dstHeight = srcHeight;
-
-   if (dstWidth <= 0 || dstHeight <= 0)
-      return;
-
-   for (j = 0; j < dstHeight; j++) {
-      for (i = 0; i < dstWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint k = (j + m) * srcWidth + i + n;
-               const GLint f = m * filterWidth + n;
-               sumR += src[k][RCOMP] * filter[f][RCOMP];
-               sumG += src[k][GCOMP] * filter[f][GCOMP];
-               sumB += src[k][BCOMP] * filter[f][BCOMP];
-               sumA += src[k][ACOMP] * filter[f][ACOMP];
-            }
-         }
-         dest[j * dstWidth + i][RCOMP] = sumR;
-         dest[j * dstWidth + i][GCOMP] = sumG;
-         dest[j * dstWidth + i][BCOMP] = sumB;
-         dest[j * dstWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_2d_constant(GLint srcWidth, GLint srcHeight,
-                     const GLfloat src[][4],
-                     GLint filterWidth, GLint filterHeight,
-                     const GLfloat filter[][4],
-                     GLfloat dest[][4],
-                     const GLfloat borderColor[4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint f = m * filterWidth + n;
-               const GLint is = i + n - halfFilterWidth;
-               const GLint js = j + m - halfFilterHeight;
-               if (is < 0 || is >= srcWidth ||
-                   js < 0 || js >= srcHeight) {
-                  sumR += borderColor[RCOMP] * filter[f][RCOMP];
-                  sumG += borderColor[GCOMP] * filter[f][GCOMP];
-                  sumB += borderColor[BCOMP] * filter[f][BCOMP];
-                  sumA += borderColor[ACOMP] * filter[f][ACOMP];
-               }
-               else {
-                  const GLint k = js * srcWidth + is;
-                  sumR += src[k][RCOMP] * filter[f][RCOMP];
-                  sumG += src[k][GCOMP] * filter[f][GCOMP];
-                  sumB += src[k][BCOMP] * filter[f][BCOMP];
-                  sumA += src[k][ACOMP] * filter[f][ACOMP];
-               }
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_2d_replicate(GLint srcWidth, GLint srcHeight,
-                      const GLfloat src[][4],
-                      GLint filterWidth, GLint filterHeight,
-                      const GLfloat filter[][4],
-                      GLfloat dest[][4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint f = m * filterWidth + n;
-               GLint is = i + n - halfFilterWidth;
-               GLint js = j + m - halfFilterHeight;
-               GLint k;
-               if (is < 0)
-                  is = 0;
-               else if (is >= srcWidth)
-                  is = srcWidth - 1;
-               if (js < 0)
-                  js = 0;
-               else if (js >= srcHeight)
-                  js = srcHeight - 1;
-               k = js * srcWidth + is;
-               sumR += src[k][RCOMP] * filter[f][RCOMP];
-               sumG += src[k][GCOMP] * filter[f][GCOMP];
-               sumB += src[k][BCOMP] * filter[f][BCOMP];
-               sumA += src[k][ACOMP] * filter[f][ACOMP];
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_sep_reduce(GLint srcWidth, GLint srcHeight,
-                    const GLfloat src[][4],
-                    GLint filterWidth, GLint filterHeight,
-                    const GLfloat rowFilt[][4],
-                    const GLfloat colFilt[][4],
-                    GLfloat dest[][4])
-{
-   GLint dstWidth, dstHeight;
-   GLint i, j, n, m;
-
-   if (filterWidth >= 1)
-      dstWidth = srcWidth - (filterWidth - 1);
-   else
-      dstWidth = srcWidth;
-
-   if (filterHeight >= 1)
-      dstHeight = srcHeight - (filterHeight - 1);
-   else
-      dstHeight = srcHeight;
-
-   if (dstWidth <= 0 || dstHeight <= 0)
-      return;
-
-   for (j = 0; j < dstHeight; j++) {
-      for (i = 0; i < dstWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               GLint k = (j + m) * srcWidth + i + n;
-               sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-               sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-               sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-               sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-            }
-         }
-         dest[j * dstWidth + i][RCOMP] = sumR;
-         dest[j * dstWidth + i][GCOMP] = sumG;
-         dest[j * dstWidth + i][BCOMP] = sumB;
-         dest[j * dstWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_sep_constant(GLint srcWidth, GLint srcHeight,
-                      const GLfloat src[][4],
-                      GLint filterWidth, GLint filterHeight,
-                      const GLfloat rowFilt[][4],
-                      const GLfloat colFilt[][4],
-                      GLfloat dest[][4],
-                      const GLfloat borderColor[4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint is = i + n - halfFilterWidth;
-               const GLint js = j + m - halfFilterHeight;
-               if (is < 0 || is >= srcWidth ||
-                   js < 0 || js >= srcHeight) {
-                  sumR += borderColor[RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-                  sumG += borderColor[GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-                  sumB += borderColor[BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-                  sumA += borderColor[ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-               }
-               else {
-                  GLint k = js * srcWidth + is;
-                  sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-                  sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-                  sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-                  sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-               }
-
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_sep_replicate(GLint srcWidth, GLint srcHeight,
-                       const GLfloat src[][4],
-                       GLint filterWidth, GLint filterHeight,
-                       const GLfloat rowFilt[][4],
-                       const GLfloat colFilt[][4],
-                       GLfloat dest[][4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               GLint is = i + n - halfFilterWidth;
-               GLint js = j + m - halfFilterHeight;
-               GLint k;
-               if (is < 0)
-                  is = 0;
-               else if (is >= srcWidth)
-                  is = srcWidth - 1;
-               if (js < 0)
-                  js = 0;
-               else if (js >= srcHeight)
-                  js = srcHeight - 1;
-               k = js * srcWidth + is;
-               sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-               sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-               sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-               sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-
-void
-_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   switch (ctx->Pixel.ConvolutionBorderMode[0]) {
-      case GL_REDUCE:
-         convolve_1d_reduce(*width, (const GLfloat (*)[4]) srcImage,
-                            ctx->Convolution1D.Width,
-                            (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                            (GLfloat (*)[4]) dstImage);
-         *width = *width - (MAX2(ctx->Convolution1D.Width, 1) - 1);
-         break;
-      case GL_CONSTANT_BORDER:
-         convolve_1d_constant(*width, (const GLfloat (*)[4]) srcImage,
-                              ctx->Convolution1D.Width,
-                              (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                              (GLfloat (*)[4]) dstImage,
-                              ctx->Pixel.ConvolutionBorderColor[0]);
-         break;
-      case GL_REPLICATE_BORDER:
-         convolve_1d_replicate(*width, (const GLfloat (*)[4]) srcImage,
-                              ctx->Convolution1D.Width,
-                              (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                              (GLfloat (*)[4]) dstImage);
-         break;
-      default:
-         ;
-   }
-}
-
-
-void
-_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   switch (ctx->Pixel.ConvolutionBorderMode[1]) {
-      case GL_REDUCE:
-         convolve_2d_reduce(*width, *height,
-                            (const GLfloat (*)[4]) srcImage,
-                            ctx->Convolution2D.Width,
-                            ctx->Convolution2D.Height,
-                            (const GLfloat (*)[4]) ctx->Convolution2D.Filter,
-                            (GLfloat (*)[4]) dstImage);
-         *width = *width - (MAX2(ctx->Convolution2D.Width, 1) - 1);
-         *height = *height - (MAX2(ctx->Convolution2D.Height, 1) - 1);
-         break;
-      case GL_CONSTANT_BORDER:
-         convolve_2d_constant(*width, *height,
-                              (const GLfloat (*)[4]) srcImage,
-                              ctx->Convolution2D.Width,
-                              ctx->Convolution2D.Height,
-                              (const GLfloat (*)[4]) ctx->Convolution2D.Filter,
-                              (GLfloat (*)[4]) dstImage,
-                              ctx->Pixel.ConvolutionBorderColor[1]);
-         break;
-      case GL_REPLICATE_BORDER:
-         convolve_2d_replicate(*width, *height,
-                               (const GLfloat (*)[4]) srcImage,
-                               ctx->Convolution2D.Width,
-                               ctx->Convolution2D.Height,
-                               (const GLfloat (*)[4])ctx->Convolution2D.Filter,
-                               (GLfloat (*)[4]) dstImage);
-         break;
-      default:
-         ;
-      }
-}
-
-
-void
-_mesa_convolve_sep_image(const GLcontext *ctx,
-                         GLsizei *width, GLsizei *height,
-                         const GLfloat *srcImage, GLfloat *dstImage)
-{
-   const GLfloat *rowFilter = ctx->Separable2D.Filter;
-   const GLfloat *colFilter = rowFilter + 4 * MAX_CONVOLUTION_WIDTH;
-
-   switch (ctx->Pixel.ConvolutionBorderMode[2]) {
-      case GL_REDUCE:
-         convolve_sep_reduce(*width, *height,
-                             (const GLfloat (*)[4]) srcImage,
-                             ctx->Separable2D.Width,
-                             ctx->Separable2D.Height,
-                             (const GLfloat (*)[4]) rowFilter,
-                             (const GLfloat (*)[4]) colFilter,
-                             (GLfloat (*)[4]) dstImage);
-         *width = *width - (MAX2(ctx->Separable2D.Width, 1) - 1);
-         *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
-         break;
-      case GL_CONSTANT_BORDER:
-         convolve_sep_constant(*width, *height,
-                               (const GLfloat (*)[4]) srcImage,
-                               ctx->Separable2D.Width,
-                               ctx->Separable2D.Height,
-                               (const GLfloat (*)[4]) rowFilter,
-                               (const GLfloat (*)[4]) colFilter,
-                               (GLfloat (*)[4]) dstImage,
-                               ctx->Pixel.ConvolutionBorderColor[2]);
-         break;
-      case GL_REPLICATE_BORDER:
-         convolve_sep_replicate(*width, *height,
-                                (const GLfloat (*)[4]) srcImage,
-                                ctx->Separable2D.Width,
-                                ctx->Separable2D.Height,
-                                (const GLfloat (*)[4]) rowFilter,
-                                (const GLfloat (*)[4]) colFilter,
-                                (GLfloat (*)[4]) dstImage);
-         break;
-      default:
-         ;
-   }
-}
-
-
-
-/*
- * This function computes an image's size after convolution.
- * If the convolution border mode is GL_REDUCE, the post-convolution
- * image will be smaller than the original.
- */
-void
-_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
-                                   GLsizei *width, GLsizei *height)
-{
-   if (ctx->Pixel.Convolution1DEnabled
-       && dimensions == 1
-       && ctx->Pixel.ConvolutionBorderMode[0] == GL_REDUCE) {
-      *width = *width - (MAX2(ctx->Convolution1D.Width, 1) - 1);
-   }
-   else if (ctx->Pixel.Convolution2DEnabled
-            && dimensions > 1
-            && ctx->Pixel.ConvolutionBorderMode[1] == GL_REDUCE) {
-      *width = *width - (MAX2(ctx->Convolution2D.Width, 1) - 1);
-      *height = *height - (MAX2(ctx->Convolution2D.Height, 1) - 1);
-   }
-   else if (ctx->Pixel.Separable2DEnabled
-            && dimensions > 1
-            && ctx->Pixel.ConvolutionBorderMode[2] == GL_REDUCE) {
-      *width = *width - (MAX2(ctx->Separable2D.Width, 1) - 1);
-      *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
-   }
-}
-
-
-void
-_mesa_init_convolve_dispatch(struct _glapi_table *disp)
-{
-   SET_ConvolutionFilter1D(disp, _mesa_ConvolutionFilter1D);
-   SET_ConvolutionFilter2D(disp, _mesa_ConvolutionFilter2D);
-   SET_ConvolutionParameterf(disp, _mesa_ConvolutionParameterf);
-   SET_ConvolutionParameterfv(disp, _mesa_ConvolutionParameterfv);
-   SET_ConvolutionParameteri(disp, _mesa_ConvolutionParameteri);
-   SET_ConvolutionParameteriv(disp, _mesa_ConvolutionParameteriv);
-   SET_CopyConvolutionFilter1D(disp, _mesa_CopyConvolutionFilter1D);
-   SET_CopyConvolutionFilter2D(disp, _mesa_CopyConvolutionFilter2D);
-   SET_GetConvolutionFilter(disp, _mesa_GetConvolutionFilter);
-   SET_GetConvolutionParameterfv(disp, _mesa_GetConvolutionParameterfv);
-   SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv);
-   SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D);
-   SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter);
-}
-
-
-#endif /* FEATURE_convolve */
+/*

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

+ */

+

+

+/*

+ * Image convolution functions.

+ *

+ * Notes: filter kernel elements are indexed by <n> and <m> as in

+ * the GL spec.

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "colormac.h"

+#include "convolve.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_convolve

+

+static void GLAPIENTRY

+_mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D");

+}

+

+static void GLAPIENTRY

+_mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D");

+}

+

+

+static void GLAPIENTRY

+_mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf");

+}

+

+

+static void GLAPIENTRY

+_mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv");

+}

+

+

+static void GLAPIENTRY

+_mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri");

+}

+

+

+static void GLAPIENTRY

+_mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv");

+}

+

+

+static void GLAPIENTRY

+_mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D");

+}

+

+

+static void GLAPIENTRY

+_mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,

+                           GLvoid *image)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionFilter");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,

+                         GLvoid *row, GLvoid *column, GLvoid *span)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter");

+}

+

+

+static void GLAPIENTRY

+_mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D");

+}

+

+void

+_mesa_init_convolve_dispatch(struct _glapi_table *disp)

+{

+   SET_ConvolutionFilter1D(disp, _mesa_ConvolutionFilter1D);

+   SET_ConvolutionFilter2D(disp, _mesa_ConvolutionFilter2D);

+   SET_ConvolutionParameterf(disp, _mesa_ConvolutionParameterf);

+   SET_ConvolutionParameterfv(disp, _mesa_ConvolutionParameterfv);

+   SET_ConvolutionParameteri(disp, _mesa_ConvolutionParameteri);

+   SET_ConvolutionParameteriv(disp, _mesa_ConvolutionParameteriv);

+   SET_CopyConvolutionFilter1D(disp, _mesa_CopyConvolutionFilter1D);

+   SET_CopyConvolutionFilter2D(disp, _mesa_CopyConvolutionFilter2D);

+   SET_GetConvolutionFilter(disp, _mesa_GetConvolutionFilter);

+   SET_GetConvolutionParameterfv(disp, _mesa_GetConvolutionParameterfv);

+   SET_GetConvolutionParameteriv(disp, _mesa_GetConvolutionParameteriv);

+   SET_SeparableFilter2D(disp, _mesa_SeparableFilter2D);

+   SET_GetSeparableFilter(disp, _mesa_GetSeparableFilter);

+}

+

+

+#endif /* FEATURE_convolve */

diff --git a/mesalib/src/mesa/main/convolve.h b/mesalib/src/mesa/main/convolve.h
index 80caf942f..7ecfcd6b1 100644
--- a/mesalib/src/mesa/main/convolve.h
+++ b/mesalib/src/mesa/main/convolve.h
@@ -1,120 +1,51 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 CONVOLVE_H
-#define CONVOLVE_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_convolve
-
-extern void GLAPIENTRY
-_mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLenum format, GLenum type, const GLvoid *image);
-
-extern void GLAPIENTRY
-_mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLsizei height, GLenum format, GLenum type,
-                          const GLvoid *image);
-
-extern void
-_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
-                        const GLfloat *srcImage, GLfloat *dstImage);
-
-extern void
-_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
-                        const GLfloat *srcImage, GLfloat *dstImage);
-
-extern void
-_mesa_convolve_sep_image(const GLcontext *ctx,
-                         GLsizei *width, GLsizei *height,
-                         const GLfloat *srcImage, GLfloat *dstImage);
-
-extern void
-_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
-                                   GLsizei *width, GLsizei *height);
-
-extern void
-_mesa_init_convolve_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_convolve */
-
-#include "main/compiler.h"
-
-static INLINE void GLAPIENTRY
-_mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLenum format, GLenum type, const GLvoid *image)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void GLAPIENTRY
-_mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLsizei height, GLenum format, GLenum type,
-                          const GLvoid *image)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-
-static INLINE void
-_mesa_convolve_sep_image(const GLcontext *ctx,
-                         GLsizei *width, GLsizei *height,
-                         const GLfloat *srcImage, GLfloat *dstImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
-                                   GLsizei *width, GLsizei *height)
-{
-}
-
-static INLINE void
-_mesa_init_convolve_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_convolve */
-
-#endif /* CONVOLVE_H */
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 CONVOLVE_H

+#define CONVOLVE_H

+

+

+#include "compiler.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+

+

+#if FEATURE_convolve

+

+extern void

+_mesa_init_convolve_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_convolve */

+

+static INLINE void

+_mesa_init_convolve_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_convolve */

+

+#endif /* CONVOLVE_H */

diff --git a/mesalib/src/mesa/main/core.h b/mesalib/src/mesa/main/core.h
index ea6e6bf11..ee3e91593 100644
--- a/mesalib/src/mesa/main/core.h
+++ b/mesalib/src/mesa/main/core.h
@@ -1,66 +1,64 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.9
- *
- * Copyright (C) 2010 LunarG 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
- * 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.
- *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
- */
-
-
-/**
- * \file core.h
- * The public header of core mesa.
- *
- * This file is the (only) public header of core mesa.  It is supposed to be
- * used by GLX, WGL, and GLSL.  It is important that headers directly or
- * indirectly included here do not perform feature tests (#if FEATURE_xxx).
- */
-
-
-#ifndef CORE_H
-#define CORE_H
-
-
-#include "main/glheader.h"
-#include "main/compiler.h"
-#include "main/imports.h"
-#include "main/macros.h"
-
-#include "main/version.h" /* for MESA_VERSION_STRING */
-#include "main/context.h" /* for _mesa_share_state */
-#include "main/mtypes.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* for GLSL */
-#include "program/prog_parameter.h"
-#include "program/prog_uniform.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* CORE_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.9

+ *

+ * Copyright (C) 2010 LunarG 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

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

+ *

+ * Authors:

+ *    Chia-I Wu <olv@lunarg.com>

+ */

+

+

+/**

+ * \file core.h

+ * The public header of core mesa.

+ *

+ * This file is the (only) public header of core mesa.  It is supposed to be

+ * used by GLX, WGL, and GLSL.  It is important that headers directly or

+ * indirectly included here do not perform feature tests (#if FEATURE_xxx).

+ */

+

+

+#ifndef CORE_H

+#define CORE_H

+

+

+#include "main/glheader.h"

+#include "main/compiler.h"

+#include "main/imports.h"

+#include "main/macros.h"

+

+#include "main/mtypes.h"

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+/* for GLSL */

+#include "program/prog_parameter.h"

+#include "program/prog_uniform.h"

+

+#ifdef __cplusplus

+}

+#endif

+

+

+#endif /* CORE_H */

diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index 8a20a6636..15600ba93 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -1,1174 +1,1196 @@
-/**
- * \file dd.h
- * Device driver interfaces.
- */
-
-/*
- * 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 DD_INCLUDED
-#define DD_INCLUDED
-
-/* THIS FILE ONLY INCLUDED BY mtypes.h !!!!! */
-
-struct gl_pixelstore_attrib;
-struct gl_display_list;
-
-/* GL_ARB_vertex_buffer_object */
-/* Modifies GL_MAP_UNSYNCHRONIZED_BIT to allow driver to fail (return
- * NULL) if buffer is unavailable for immediate mapping.
- *
- * Does GL_MAP_INVALIDATE_RANGE_BIT do this?  It seems so, but it
- * would require more book-keeping in the driver than seems necessary
- * at this point.
- *
- * Does GL_MAP_INVALDIATE_BUFFER_BIT do this?  Not really -- we don't
- * want to provoke the driver to throw away the old storage, we will
- * respect the contents of already referenced data.
- */
-#define MESA_MAP_NOWAIT_BIT       0x0040
-
-
-/**
- * Device driver function table.
- * Core Mesa uses these function pointers to call into device drivers.
- * Most of these functions directly correspond to OpenGL state commands.
- * Core Mesa will call these functions after error checking has been done
- * so that the drivers don't have to worry about error testing.
- *
- * Vertex transformation/clipping/lighting is patched into the T&L module.
- * Rasterization functions are patched into the swrast module.
- *
- * Note: when new functions are added here, the drivers/common/driverfuncs.c
- * file should be updated too!!!
- */
-struct dd_function_table {
-   /**
-    * Return a string as needed by glGetString().
-    * Only the GL_RENDERER query must be implemented.  Otherwise, NULL can be
-    * returned.
-    */
-   const GLubyte * (*GetString)( GLcontext *ctx, GLenum name );
-
-   /**
-    * Notify the driver after Mesa has made some internal state changes.  
-    *
-    * This is in addition to any state change callbacks Mesa may already have
-    * made.
-    */
-   void (*UpdateState)( GLcontext *ctx, GLbitfield new_state );
-
-   /**
-    * Get the width and height of the named buffer/window.
-    *
-    * Mesa uses this to determine when the driver's window size has changed.
-    * XXX OBSOLETE: this function will be removed in the future.
-    */
-   void (*GetBufferSize)( GLframebuffer *buffer,
-                          GLuint *width, GLuint *height );
-
-   /**
-    * Resize the given framebuffer to the given size.
-    * XXX OBSOLETE: this function will be removed in the future.
-    */
-   void (*ResizeBuffers)( GLcontext *ctx, GLframebuffer *fb,
-                          GLuint width, GLuint height);
-
-   /**
-    * Called whenever an error is generated.  
-    * __GLcontextRec::ErrorValue contains the error value.
-    */
-   void (*Error)( GLcontext *ctx );
-
-   /**
-    * This is called whenever glFinish() is called.
-    */
-   void (*Finish)( GLcontext *ctx );
-
-   /**
-    * This is called whenever glFlush() is called.
-    */
-   void (*Flush)( GLcontext *ctx );
-
-   /**
-    * Clear the color/depth/stencil/accum buffer(s).
-    * \param buffers  a bitmask of BUFFER_BIT_* flags indicating which
-    *                 renderbuffers need to be cleared.
-    */
-   void (*Clear)( GLcontext *ctx, GLbitfield buffers );
-
-   /**
-    * Execute glAccum command.
-    */
-   void (*Accum)( GLcontext *ctx, GLenum op, GLfloat value );
-
-
-   /**
-    * Execute glRasterPos, updating the ctx->Current.Raster fields
-    */
-   void (*RasterPos)( GLcontext *ctx, const GLfloat v[4] );
-
-   /**
-    * \name Image-related functions
-    */
-   /*@{*/
-
-   /**
-    * Called by glDrawPixels().
-    * \p unpack describes how to unpack the source image data.
-    */
-   void (*DrawPixels)( GLcontext *ctx,
-		       GLint x, GLint y, GLsizei width, GLsizei height,
-		       GLenum format, GLenum type,
-		       const struct gl_pixelstore_attrib *unpack,
-		       const GLvoid *pixels );
-
-   /**
-    * Called by glReadPixels().
-    */
-   void (*ReadPixels)( GLcontext *ctx,
-		       GLint x, GLint y, GLsizei width, GLsizei height,
-		       GLenum format, GLenum type,
-		       const struct gl_pixelstore_attrib *unpack,
-		       GLvoid *dest );
-
-   /**
-    * Called by glCopyPixels().  
-    */
-   void (*CopyPixels)( GLcontext *ctx, GLint srcx, GLint srcy,
-                       GLsizei width, GLsizei height,
-                       GLint dstx, GLint dsty, GLenum type );
-
-   /**
-    * Called by glBitmap().  
-    */
-   void (*Bitmap)( GLcontext *ctx,
-		   GLint x, GLint y, GLsizei width, GLsizei height,
-		   const struct gl_pixelstore_attrib *unpack,
-		   const GLubyte *bitmap );
-   /*@}*/
-
-   
-   /**
-    * \name Texture image functions
-    */
-   /*@{*/
-
-   /**
-    * Choose texture format.
-    * 
-    * This is called by the \c _mesa_store_tex[sub]image[123]d() fallback
-    * functions.  The driver should examine \p internalFormat and return a
-    * gl_format value.
-    */
-   GLuint (*ChooseTextureFormat)( GLcontext *ctx, GLint internalFormat,
-                                     GLenum srcFormat, GLenum srcType );
-
-   /**
-    * Called by glTexImage1D().
-    * 
-    * \param target user specified.
-    * \param format user specified.
-    * \param type user specified.
-    * \param pixels user specified.
-    * \param packing indicates the image packing of pixels.
-    * \param texObj is the target texture object.
-    * \param texImage is the target texture image.  It will have the texture \p
-    * width, \p height, \p depth, \p border and \p internalFormat information.
-    * 
-    * \p retainInternalCopy is returned by this function and indicates whether
-    * core Mesa should keep an internal copy of the texture image.
-    *
-    * Drivers should call a fallback routine from texstore.c if needed.
-    */
-   void (*TexImage1D)( GLcontext *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 );
-
-   /**
-    * Called by glTexImage2D().
-    * 
-    * \sa dd_function_table::TexImage1D.
-    */
-   void (*TexImage2D)( GLcontext *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 );
-   
-   /**
-    * Called by glTexImage3D().
-    * 
-    * \sa dd_function_table::TexImage1D.
-    */
-   void (*TexImage3D)( GLcontext *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 );
-
-   /**
-    * Called by glTexSubImage1D().
-    *
-    * \param target user specified.
-    * \param level user specified.
-    * \param xoffset user specified.
-    * \param yoffset user specified.
-    * \param zoffset user specified.
-    * \param width user specified.
-    * \param height user specified.
-    * \param depth user specified.
-    * \param format user specified.
-    * \param type user specified.
-    * \param pixels user specified.
-    * \param packing indicates the image packing of pixels.
-    * \param texObj is the target texture object.
-    * \param texImage is the target texture image.  It will have the texture \p
-    * width, \p height, \p border and \p internalFormat information.
-    *
-    * The driver should use a fallback routine from texstore.c if needed.
-    */
-   void (*TexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLsizei width,
-                          GLenum format, GLenum type,
-                          const GLvoid *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage );
-   
-   /**
-    * Called by glTexSubImage2D().
-    *
-    * \sa dd_function_table::TexSubImage1D.
-    */
-   void (*TexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint yoffset,
-                          GLsizei width, GLsizei height,
-                          GLenum format, GLenum type,
-                          const GLvoid *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage );
-   
-   /**
-    * Called by glTexSubImage3D().
-    *
-    * \sa dd_function_table::TexSubImage1D.
-    */
-   void (*TexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint yoffset, GLint zoffset,
-                          GLsizei width, GLsizei 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 );
-
-   /**
-    * Called by glGetTexImage().
-    */
-   void (*GetTexImage)( GLcontext *ctx, GLenum target, GLint level,
-                        GLenum format, GLenum type, GLvoid *pixels,
-                        struct gl_texture_object *texObj,
-                        struct gl_texture_image *texImage );
-
-   /**
-    * Called by glCopyTexImage1D().
-    * 
-    * Drivers should use a fallback routine from texstore.c if needed.
-    */
-   void (*CopyTexImage1D)( GLcontext *ctx, GLenum target, GLint level,
-                           GLenum internalFormat, GLint x, GLint y,
-                           GLsizei width, GLint border );
-
-   /**
-    * Called by glCopyTexImage2D().
-    * 
-    * Drivers should use a fallback routine from texstore.c if needed.
-    */
-   void (*CopyTexImage2D)( GLcontext *ctx, GLenum target, GLint level,
-                           GLenum internalFormat, GLint x, GLint y,
-                           GLsizei width, GLsizei height, GLint border );
-
-   /**
-    * Called by glCopyTexSubImage1D().
-    * 
-    * Drivers should use a fallback routine from texstore.c if needed.
-    */
-   void (*CopyTexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
-                              GLint xoffset,
-                              GLint x, GLint y, GLsizei width );
-   /**
-    * Called by glCopyTexSubImage2D().
-    * 
-    * Drivers should use a fallback routine from texstore.c if needed.
-    */
-   void (*CopyTexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
-                              GLint xoffset, GLint yoffset,
-                              GLint x, GLint y,
-                              GLsizei width, GLsizei height );
-   /**
-    * Called by glCopyTexSubImage3D().
-    * 
-    * Drivers should use a fallback routine from texstore.c if needed.
-    */
-   void (*CopyTexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
-                              GLint xoffset, GLint yoffset, GLint zoffset,
-                              GLint x, GLint y,
-                              GLsizei width, GLsizei height );
-
-   /**
-    * Called by glGenerateMipmap() or when GL_GENERATE_MIPMAP_SGIS is enabled.
-    */
-   void (*GenerateMipmap)(GLcontext *ctx, GLenum target,
-                          struct gl_texture_object *texObj);
-
-   /**
-    * Called by glTexImage[123]D when user specifies a proxy texture
-    * target.  
-    *
-    * \return GL_TRUE if the proxy test passes, or GL_FALSE if the test fails.
-    */
-   GLboolean (*TestProxyTexImage)(GLcontext *ctx, GLenum target,
-                                  GLint level, GLint internalFormat,
-                                  GLenum format, GLenum type,
-                                  GLint width, GLint height,
-                                  GLint depth, GLint border);
-   /*@}*/
-
-   
-   /**
-    * \name Compressed texture functions
-    */
-   /*@{*/
-
-   /**
-    * Called by glCompressedTexImage1D().
-    *
-    * \param target user specified.
-    * \param format user specified.
-    * \param type user specified.
-    * \param pixels user specified.
-    * \param packing indicates the image packing of pixels.
-    * \param texObj is the target texture object.
-    * \param texImage is the target texture image.  It will have the texture \p
-    * width, \p height, \p depth, \p border and \p internalFormat information.
-    *      
-    * \a retainInternalCopy is returned by this function and indicates whether
-    * core Mesa should keep an internal copy of the texture image.
-    */
-   void (*CompressedTexImage1D)( GLcontext *ctx, GLenum target,
-                                 GLint level, GLint internalFormat,
-                                 GLsizei width, GLint border,
-                                 GLsizei imageSize, const GLvoid *data,
-                                 struct gl_texture_object *texObj,
-                                 struct gl_texture_image *texImage );
-   /**
-    * Called by glCompressedTexImage2D().
-    *
-    * \sa dd_function_table::CompressedTexImage1D.
-    */
-   void (*CompressedTexImage2D)( GLcontext *ctx, GLenum target,
-                                 GLint level, GLint internalFormat,
-                                 GLsizei width, GLsizei height, GLint border,
-                                 GLsizei imageSize, const GLvoid *data,
-                                 struct gl_texture_object *texObj,
-                                 struct gl_texture_image *texImage );
-   /**
-    * Called by glCompressedTexImage3D().
-    *
-    * \sa dd_function_table::CompressedTexImage3D.
-    */
-   void (*CompressedTexImage3D)( GLcontext *ctx, GLenum target,
-                                 GLint level, GLint internalFormat,
-                                 GLsizei width, GLsizei height, GLsizei depth,
-                                 GLint border,
-                                 GLsizei imageSize, const GLvoid *data,
-                                 struct gl_texture_object *texObj,
-                                 struct gl_texture_image *texImage );
-
-   /**
-    * Called by glCompressedTexSubImage1D().
-    * 
-    * \param target user specified.
-    * \param level user specified.
-    * \param xoffset user specified.
-    * \param yoffset user specified.
-    * \param zoffset user specified.
-    * \param width user specified.
-    * \param height user specified.
-    * \param depth user specified.
-    * \param imageSize user specified.
-    * \param data user specified.
-    * \param texObj is the target texture object.
-    * \param texImage is the target texture image.  It will have the texture \p
-    * width, \p height, \p depth, \p border and \p internalFormat information.
-    */
-   void (*CompressedTexSubImage1D)(GLcontext *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);
-   /**
-    * Called by glCompressedTexSubImage2D().
-    *
-    * \sa dd_function_table::CompressedTexImage3D.
-    */
-   void (*CompressedTexSubImage2D)(GLcontext *ctx, GLenum target, GLint level,
-                                   GLint xoffset, GLint yoffset,
-                                   GLsizei width, GLint height,
-                                   GLenum format,
-                                   GLsizei imageSize, const GLvoid *data,
-                                   struct gl_texture_object *texObj,
-                                   struct gl_texture_image *texImage);
-   /**
-    * Called by glCompressedTexSubImage3D().
-    *
-    * \sa dd_function_table::CompressedTexImage3D.
-    */
-   void (*CompressedTexSubImage3D)(GLcontext *ctx, GLenum target, GLint level,
-                                   GLint xoffset, GLint yoffset, GLint zoffset,
-                                   GLsizei width, GLint height, GLint depth,
-                                   GLenum format,
-                                   GLsizei imageSize, const GLvoid *data,
-                                   struct gl_texture_object *texObj,
-                                   struct gl_texture_image *texImage);
-
-
-   /**
-    * Called by glGetCompressedTexImage.
-    */
-   void (*GetCompressedTexImage)(GLcontext *ctx, GLenum target, GLint level,
-                                 GLvoid *img,
-                                 struct gl_texture_object *texObj,
-                                 struct gl_texture_image *texImage);
-
-   /*@}*/
-
-   /**
-    * \name Texture object functions
-    */
-   /*@{*/
-
-   /**
-    * Called by glBindTexture().
-    */
-   void (*BindTexture)( GLcontext *ctx, GLenum target,
-                        struct gl_texture_object *tObj );
-
-   /**
-    * Called to allocate a new texture object.
-    * A new gl_texture_object should be returned.  The driver should
-    * attach to it any device-specific info it needs.
-    */
-   struct gl_texture_object * (*NewTextureObject)( GLcontext *ctx, GLuint name,
-                                                   GLenum target );
-   /**
-    * Called when a texture object is about to be deallocated.  
-    *
-    * Driver should delete the gl_texture_object object and anything
-    * hanging off of it.
-    */
-   void (*DeleteTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
-
-   /**
-    * Called to allocate a new texture image object.
-    */
-   struct gl_texture_image * (*NewTextureImage)( GLcontext *ctx );
-
-   /** 
-    * Called to free tImage->Data.
-    */
-   void (*FreeTexImageData)( GLcontext *ctx, struct gl_texture_image *tImage );
-
-   /** Map texture image data into user space */
-   void (*MapTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
-   /** Unmap texture images from user space */
-   void (*UnmapTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
-
-   /**
-    * Note: no context argument.  This function doesn't initially look
-    * like it belongs here, except that the driver is the only entity
-    * that knows for sure how the texture memory is allocated - via
-    * the above callbacks.  There is then an argument that the driver
-    * knows what memcpy paths might be fast.  Typically this is invoked with
-    * 
-    * to -- a pointer into texture memory allocated by NewTextureImage() above.
-    * from -- a pointer into client memory or a mesa temporary.
-    * sz -- nr bytes to copy.
-    */
-   void* (*TextureMemCpy)( void *to, const void *from, size_t sz );
-
-   /**
-    * Called by glAreTextureResident().
-    */
-   GLboolean (*IsTextureResident)( GLcontext *ctx,
-                                   struct gl_texture_object *t );
-
-   /**
-    * Called when the texture's color lookup table is changed.
-    * 
-    * If \p tObj is NULL then the shared texture palette
-    * gl_texture_object::Palette is to be updated.
-    */
-   void (*UpdateTexturePalette)( GLcontext *ctx,
-                                 struct gl_texture_object *tObj );
-   /*@}*/
-
-   
-   /**
-    * \name Imaging functionality
-    */
-   /*@{*/
-   void (*CopyColorTable)( GLcontext *ctx,
-			   GLenum target, GLenum internalformat,
-			   GLint x, GLint y, GLsizei width );
-
-   void (*CopyColorSubTable)( GLcontext *ctx,
-			      GLenum target, GLsizei start,
-			      GLint x, GLint y, GLsizei width );
-
-   void (*CopyConvolutionFilter1D)( GLcontext *ctx, GLenum target,
-				    GLenum internalFormat,
-				    GLint x, GLint y, GLsizei width );
-
-   void (*CopyConvolutionFilter2D)( GLcontext *ctx, GLenum target,
-				    GLenum internalFormat,
-				    GLint x, GLint y,
-				    GLsizei width, GLsizei height );
-   /*@}*/
-
-
-   /**
-    * \name Vertex/fragment program functions
-    */
-   /*@{*/
-   /** Bind a vertex/fragment program */
-   void (*BindProgram)(GLcontext *ctx, GLenum target, struct gl_program *prog);
-   /** Allocate a new program */
-   struct gl_program * (*NewProgram)(GLcontext *ctx, GLenum target, GLuint id);
-   /** Delete a program */
-   void (*DeleteProgram)(GLcontext *ctx, struct gl_program *prog);   
-   /**
-    * Notify driver that a program string (and GPU code) has been specified
-    * or modified.  Return GL_TRUE or GL_FALSE to indicate if the program is
-    * supported by the driver.
-    */
-   GLboolean (*ProgramStringNotify)(GLcontext *ctx, GLenum target, 
-                                    struct gl_program *prog);
-
-   /** Query if program can be loaded onto hardware */
-   GLboolean (*IsProgramNative)(GLcontext *ctx, GLenum target, 
-				struct gl_program *prog);
-   
-   /*@}*/
-
-   /**
-    * \name GLSL shader/program functions.
-    */
-   /*@{*/
-   /**
-    * Called when a shader is compiled.
-    *
-    * Note that not all shader objects get ShaderCompile called on
-    * them.  Notably, the shaders containing builtin functions do not
-    * have CompileShader() called, so if lowering passes are done they
-    * need to also be performed in LinkShader().
-    */
-   GLboolean (*CompileShader)(GLcontext *ctx, struct gl_shader *shader);
-   /**
-    * Called when a shader program is linked.
-    *
-    * This gives drivers an opportunity to clone the IR and make their
-    * own transformations on it for the purposes of code generation.
-    */
-   GLboolean (*LinkShader)(GLcontext *ctx, struct gl_shader_program *shader);
-   /*@}*/
-
-   /**
-    * \name State-changing functions.
-    *
-    * \note drawing functions are above.
-    *
-    * These functions are called by their corresponding OpenGL API functions.
-    * They are \e also called by the gl_PopAttrib() function!!!
-    * May add more functions like these to the device driver in the future.
-    */
-   /*@{*/
-   /** Specify the alpha test function */
-   void (*AlphaFunc)(GLcontext *ctx, GLenum func, GLfloat ref);
-   /** Set the blend color */
-   void (*BlendColor)(GLcontext *ctx, const GLfloat color[4]);
-   /** Set the blend equation */
-   void (*BlendEquationSeparate)(GLcontext *ctx, GLenum modeRGB, GLenum modeA);
-   /** Specify pixel arithmetic */
-   void (*BlendFuncSeparate)(GLcontext *ctx,
-                             GLenum sfactorRGB, GLenum dfactorRGB,
-                             GLenum sfactorA, GLenum dfactorA);
-   /** Specify clear values for the color buffers */
-   void (*ClearColor)(GLcontext *ctx, const GLfloat color[4]);
-   /** Specify the clear value for the depth buffer */
-   void (*ClearDepth)(GLcontext *ctx, GLclampd d);
-   /** Specify the clear value for the stencil buffer */
-   void (*ClearStencil)(GLcontext *ctx, GLint s);
-   /** Specify a plane against which all geometry is clipped */
-   void (*ClipPlane)(GLcontext *ctx, GLenum plane, const GLfloat *equation );
-   /** Enable and disable writing of frame buffer color components */
-   void (*ColorMask)(GLcontext *ctx, GLboolean rmask, GLboolean gmask,
-                     GLboolean bmask, GLboolean amask );
-   void (*ColorMaskIndexed)(GLcontext *ctx, GLuint buf, GLboolean rmask,
-                            GLboolean gmask, GLboolean bmask, GLboolean amask);
-   /** Cause a material color to track the current color */
-   void (*ColorMaterial)(GLcontext *ctx, GLenum face, GLenum mode);
-   /** Specify whether front- or back-facing facets can be culled */
-   void (*CullFace)(GLcontext *ctx, GLenum mode);
-   /** Define front- and back-facing polygons */
-   void (*FrontFace)(GLcontext *ctx, GLenum mode);
-   /** Specify the value used for depth buffer comparisons */
-   void (*DepthFunc)(GLcontext *ctx, GLenum func);
-   /** Enable or disable writing into the depth buffer */
-   void (*DepthMask)(GLcontext *ctx, GLboolean flag);
-   /** Specify mapping of depth values from NDC to window coordinates */
-   void (*DepthRange)(GLcontext *ctx, GLclampd nearval, GLclampd farval);
-   /** Specify the current buffer for writing */
-   void (*DrawBuffer)( GLcontext *ctx, GLenum buffer );
-   /** Specify the buffers for writing for fragment programs*/
-   void (*DrawBuffers)( GLcontext *ctx, GLsizei n, const GLenum *buffers );
-   /** Enable or disable server-side gl capabilities */
-   void (*Enable)(GLcontext *ctx, GLenum cap, GLboolean state);
-   /** Specify fog parameters */
-   void (*Fogfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
-   /** Specify implementation-specific hints */
-   void (*Hint)(GLcontext *ctx, GLenum target, GLenum mode);
-   /** Set light source parameters.
-    * Note: for GL_POSITION and GL_SPOT_DIRECTION, params will have already
-    * been transformed to eye-space.
-    */
-   void (*Lightfv)(GLcontext *ctx, GLenum light,
-		   GLenum pname, const GLfloat *params );
-   /** Set the lighting model parameters */
-   void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
-   /** Specify the line stipple pattern */
-   void (*LineStipple)(GLcontext *ctx, GLint factor, GLushort pattern );
-   /** Specify the width of rasterized lines */
-   void (*LineWidth)(GLcontext *ctx, GLfloat width);
-   /** Specify a logical pixel operation for color index rendering */
-   void (*LogicOpcode)(GLcontext *ctx, GLenum opcode);
-   void (*PointParameterfv)(GLcontext *ctx, GLenum pname,
-                            const GLfloat *params);
-   /** Specify the diameter of rasterized points */
-   void (*PointSize)(GLcontext *ctx, GLfloat size);
-   /** Select a polygon rasterization mode */
-   void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode);
-   /** Set the scale and units used to calculate depth values */
-   void (*PolygonOffset)(GLcontext *ctx, GLfloat factor, GLfloat units);
-   /** Set the polygon stippling pattern */
-   void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask );
-   /* Specifies the current buffer for reading */
-   void (*ReadBuffer)( GLcontext *ctx, GLenum buffer );
-   /** Set rasterization mode */
-   void (*RenderMode)(GLcontext *ctx, GLenum mode );
-   /** Define the scissor box */
-   void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
-   /** Select flat or smooth shading */
-   void (*ShadeModel)(GLcontext *ctx, GLenum mode);
-   /** OpenGL 2.0 two-sided StencilFunc */
-   void (*StencilFuncSeparate)(GLcontext *ctx, GLenum face, GLenum func,
-                               GLint ref, GLuint mask);
-   /** OpenGL 2.0 two-sided StencilMask */
-   void (*StencilMaskSeparate)(GLcontext *ctx, GLenum face, GLuint mask);
-   /** OpenGL 2.0 two-sided StencilOp */
-   void (*StencilOpSeparate)(GLcontext *ctx, GLenum face, GLenum fail,
-                             GLenum zfail, GLenum zpass);
-   /** Control the generation of texture coordinates */
-   void (*TexGen)(GLcontext *ctx, GLenum coord, GLenum pname,
-		  const GLfloat *params);
-   /** Set texture environment parameters */
-   void (*TexEnv)(GLcontext *ctx, GLenum target, GLenum pname,
-                  const GLfloat *param);
-   /** Set texture parameters */
-   void (*TexParameter)(GLcontext *ctx, GLenum target,
-                        struct gl_texture_object *texObj,
-                        GLenum pname, const GLfloat *params);
-   /** Set the viewport */
-   void (*Viewport)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
-   /*@}*/
-
-
-   /**
-    * \name Vertex/pixel buffer object functions
-    */
-   /*@{*/
-   void (*BindBuffer)( GLcontext *ctx, GLenum target,
-		       struct gl_buffer_object *obj );
-
-   struct gl_buffer_object * (*NewBufferObject)( GLcontext *ctx, GLuint buffer,
-						 GLenum target );
-   
-   void (*DeleteBuffer)( GLcontext *ctx, struct gl_buffer_object *obj );
-
-   GLboolean (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
-                            const GLvoid *data, GLenum usage,
-                            struct gl_buffer_object *obj );
-
-   void (*BufferSubData)( GLcontext *ctx, GLenum target, GLintptrARB offset,
-			  GLsizeiptrARB size, const GLvoid *data,
-			  struct gl_buffer_object *obj );
-
-   void (*GetBufferSubData)( GLcontext *ctx, GLenum target,
-			     GLintptrARB offset, GLsizeiptrARB size,
-			     GLvoid *data, struct gl_buffer_object *obj );
-
-   void * (*MapBuffer)( GLcontext *ctx, GLenum target, GLenum access,
-			struct gl_buffer_object *obj );
-
-   void (*CopyBufferSubData)( GLcontext *ctx,
-                              struct gl_buffer_object *src,
-                              struct gl_buffer_object *dst,
-                              GLintptr readOffset, GLintptr writeOffset,
-                              GLsizeiptr size );
-
-   /* May return NULL if MESA_MAP_NOWAIT_BIT is set in access:
-    */
-   void * (*MapBufferRange)( GLcontext *ctx, GLenum target, GLintptr offset,
-                             GLsizeiptr length, GLbitfield access,
-                             struct gl_buffer_object *obj);
-
-   void (*FlushMappedBufferRange)(GLcontext *ctx, GLenum target, 
-                                  GLintptr offset, GLsizeiptr length,
-                                  struct gl_buffer_object *obj);
-
-   GLboolean (*UnmapBuffer)( GLcontext *ctx, GLenum target,
-			     struct gl_buffer_object *obj );
-   /*@}*/
-
-   /**
-    * \name Functions for GL_APPLE_object_purgeable
-    */
-   /*@{*/
-   /* variations on ObjectPurgeable */
-   GLenum (*BufferObjectPurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
-   GLenum (*RenderObjectPurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
-   GLenum (*TextureObjectPurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
-
-   /* variations on ObjectUnpurgeable */
-   GLenum (*BufferObjectUnpurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
-   GLenum (*RenderObjectUnpurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
-   GLenum (*TextureObjectUnpurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
-   /*@}*/
-
-   /**
-    * \name Functions for GL_EXT_framebuffer_{object,blit}.
-    */
-   /*@{*/
-   struct gl_framebuffer * (*NewFramebuffer)(GLcontext *ctx, GLuint name);
-   struct gl_renderbuffer * (*NewRenderbuffer)(GLcontext *ctx, GLuint name);
-   void (*BindFramebuffer)(GLcontext *ctx, GLenum target,
-                           struct gl_framebuffer *drawFb,
-                           struct gl_framebuffer *readFb);
-   void (*FramebufferRenderbuffer)(GLcontext *ctx, 
-                                   struct gl_framebuffer *fb,
-                                   GLenum attachment,
-                                   struct gl_renderbuffer *rb);
-   void (*RenderTexture)(GLcontext *ctx,
-                         struct gl_framebuffer *fb,
-                         struct gl_renderbuffer_attachment *att);
-   void (*FinishRenderTexture)(GLcontext *ctx,
-                               struct gl_renderbuffer_attachment *att);
-   void (*ValidateFramebuffer)(GLcontext *ctx,
-                               struct gl_framebuffer *fb);
-   /*@}*/
-   void (*BlitFramebuffer)(GLcontext *ctx,
-                           GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                           GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                           GLbitfield mask, GLenum filter);
-
-   /**
-    * \name Query objects
-    */
-   /*@{*/
-   struct gl_query_object * (*NewQueryObject)(GLcontext *ctx, GLuint id);
-   void (*DeleteQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*BeginQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*EndQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*CheckQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*WaitQuery)(GLcontext *ctx, struct gl_query_object *q);
-   /*@}*/
-
-
-   /**
-    * \name Vertex Array objects
-    */
-   /*@{*/
-   struct gl_array_object * (*NewArrayObject)(GLcontext *ctx, GLuint id);
-   void (*DeleteArrayObject)(GLcontext *ctx, struct gl_array_object *obj);
-   void (*BindArrayObject)(GLcontext *ctx, struct gl_array_object *obj);
-   /*@}*/
-
-   /**
-    * \name GLSL-related functions (ARB extensions and OpenGL 2.x)
-    */
-   /*@{*/
-   struct gl_shader *(*NewShader)(GLcontext *ctx, GLuint name, GLenum type);
-   void (*DeleteShader)(GLcontext *ctx, struct gl_shader *shader);
-   struct gl_shader_program *(*NewShaderProgram)(GLcontext *ctx, GLuint name);
-   void (*DeleteShaderProgram)(GLcontext *ctx,
-                               struct gl_shader_program *shProg);
-   void (*UseProgram)(GLcontext *ctx, struct gl_shader_program *shProg);
-   /*@}*/
-
-
-   /**
-    * \name Support for multiple T&L engines
-    */
-   /*@{*/
-
-   /**
-    * Bitmask of state changes that require the current T&L module to be
-    * validated, using ValidateTnlModule() below.
-    */
-   GLuint NeedValidate;
-
-   /**
-    * Validate the current T&L module. 
-    *
-    * This is called directly after UpdateState() when a state change that has
-    * occurred matches the dd_function_table::NeedValidate bitmask above.  This
-    * ensures all computed values are up to date, thus allowing the driver to
-    * decide if the current T&L module needs to be swapped out.
-    *
-    * This must be non-NULL if a driver installs a custom T&L module and sets
-    * the dd_function_table::NeedValidate bitmask, but may be NULL otherwise.
-    */
-   void (*ValidateTnlModule)( GLcontext *ctx, GLuint new_state );
-
-
-#define PRIM_OUTSIDE_BEGIN_END   (GL_POLYGON+1)
-#define PRIM_INSIDE_UNKNOWN_PRIM (GL_POLYGON+2)
-#define PRIM_UNKNOWN             (GL_POLYGON+3)
-
-   /**
-    * Set by the driver-supplied T&L engine.  
-    *
-    * Set to PRIM_OUTSIDE_BEGIN_END when outside glBegin()/glEnd().
-    */
-   GLuint CurrentExecPrimitive;
-
-   /**
-    * Current state of an in-progress compilation.  
-    *
-    * May take on any of the additional values PRIM_OUTSIDE_BEGIN_END,
-    * PRIM_INSIDE_UNKNOWN_PRIM or PRIM_UNKNOWN defined above.
-    */
-   GLuint CurrentSavePrimitive;
-
-
-#define FLUSH_STORED_VERTICES 0x1
-#define FLUSH_UPDATE_CURRENT  0x2
-   /**
-    * Set by the driver-supplied T&L engine whenever vertices are buffered
-    * between glBegin()/glEnd() objects or __GLcontextRec::Current is not
-    * updated.
-    *
-    * The dd_function_table::FlushVertices call below may be used to resolve
-    * these conditions.
-    */
-   GLuint NeedFlush;
-   GLuint SaveNeedFlush;
-
-
-   /* Called prior to any of the GLvertexformat functions being
-    * called.  Paired with Driver.FlushVertices().
-    */
-   void (*BeginVertices)( GLcontext *ctx );
-
-   /**
-    * If inside glBegin()/glEnd(), it should ASSERT(0).  Otherwise, if
-    * FLUSH_STORED_VERTICES bit in \p flags is set flushes any buffered
-    * vertices, if FLUSH_UPDATE_CURRENT bit is set updates
-    * __GLcontextRec::Current and gl_light_attrib::Material
-    *
-    * Note that the default T&L engine never clears the
-    * FLUSH_UPDATE_CURRENT bit, even after performing the update.
-    */
-   void (*FlushVertices)( GLcontext *ctx, GLuint flags );
-   void (*SaveFlushVertices)( GLcontext *ctx );
-
-   /**
-    * Give the driver the opportunity to hook in its own vtxfmt for
-    * compiling optimized display lists.  This is called on each valid
-    * glBegin() during list compilation.
-    */
-   GLboolean (*NotifySaveBegin)( GLcontext *ctx, GLenum mode );
-
-   /**
-    * Notify driver that the special derived value _NeedEyeCoords has
-    * changed.
-    */
-   void (*LightingSpaceChange)( GLcontext *ctx );
-
-   /**
-    * Called by glNewList().
-    *
-    * Let the T&L component know what is going on with display lists
-    * in time to make changes to dispatch tables, etc.
-    */
-   void (*NewList)( GLcontext *ctx, GLuint list, GLenum mode );
-   /**
-    * Called by glEndList().
-    *
-    * \sa dd_function_table::NewList.
-    */
-   void (*EndList)( GLcontext *ctx );
-
-   /**
-    * Called by glCallList(s).
-    *
-    * Notify the T&L component before and after calling a display list.
-    */
-   void (*BeginCallList)( GLcontext *ctx, 
-			  struct gl_display_list *dlist );
-   /**
-    * Called by glEndCallList().
-    *
-    * \sa dd_function_table::BeginCallList.
-    */
-   void (*EndCallList)( GLcontext *ctx );
-
-
-   /**
-    * \name GL_ARB_sync interfaces
-    */
-   /*@{*/
-   struct gl_sync_object * (*NewSyncObject)(GLcontext *, GLenum);
-   void (*FenceSync)(GLcontext *, struct gl_sync_object *, GLenum, GLbitfield);
-   void (*DeleteSyncObject)(GLcontext *, struct gl_sync_object *);
-   void (*CheckSync)(GLcontext *, struct gl_sync_object *);
-   void (*ClientWaitSync)(GLcontext *, struct gl_sync_object *,
-			  GLbitfield, GLuint64);
-   void (*ServerWaitSync)(GLcontext *, struct gl_sync_object *,
-			  GLbitfield, GLuint64);
-   /*@}*/
-
-   /** GL_NV_conditional_render */
-   void (*BeginConditionalRender)(GLcontext *ctx, struct gl_query_object *q,
-                                  GLenum mode);
-   void (*EndConditionalRender)(GLcontext *ctx, struct gl_query_object *q);
-
-   /**
-    * \name GL_OES_draw_texture interface
-    */
-   /*@{*/
-   void (*DrawTex)(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
-                   GLfloat width, GLfloat height);
-   /*@}*/
-
-   /**
-    * \name GL_OES_EGL_image interface
-    */
-   void (*EGLImageTargetTexture2D)(GLcontext *ctx, GLenum target,
-				   struct gl_texture_object *texObj,
-				   struct gl_texture_image *texImage,
-				   GLeglImageOES image_handle);
-   void (*EGLImageTargetRenderbufferStorage)(GLcontext *ctx,
-					     struct gl_renderbuffer *rb,
-					     void *image_handle);
-
-   /**
-    * \name GL_EXT_transform_feedback interface
-    */
-   struct gl_transform_feedback_object *
-        (*NewTransformFeedback)(GLcontext *ctx, GLuint name);
-   void (*DeleteTransformFeedback)(GLcontext *ctx,
-                                   struct gl_transform_feedback_object *obj);
-   void (*BeginTransformFeedback)(GLcontext *ctx, GLenum mode,
-                                  struct gl_transform_feedback_object *obj);
-   void (*EndTransformFeedback)(GLcontext *ctx,
-                                struct gl_transform_feedback_object *obj);
-   void (*PauseTransformFeedback)(GLcontext *ctx,
-                                  struct gl_transform_feedback_object *obj);
-   void (*ResumeTransformFeedback)(GLcontext *ctx,
-                                   struct gl_transform_feedback_object *obj);
-   void (*DrawTransformFeedback)(GLcontext *ctx, GLenum mode,
-                                 struct gl_transform_feedback_object *obj);
-};
-
-
-/**
- * Transform/Clip/Lighting interface
- *
- * Drivers present a reduced set of the functions possible in
- * glBegin()/glEnd() objects.  Core mesa provides translation stubs for the
- * remaining functions to map down to these entry points.
- *
- * These are the initial values to be installed into dispatch by
- * mesa.  If the T&L driver wants to modify the dispatch table
- * while installed, it must do so itself.  It would be possible for
- * the vertexformat to install its own initial values for these
- * functions, but this way there is an obvious list of what is
- * expected of the driver.
- *
- * If the driver wants to hook in entry points other than those
- * listed, it must restore them to their original values in
- * the disable() callback, below.
- */
-typedef struct {
-   /**
-    * \name Vertex
-    */
-   /*@{*/
-   void (GLAPIENTRYP ArrayElement)( GLint );
-   void (GLAPIENTRYP Color3f)( GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP Color3fv)( const GLfloat * );
-   void (GLAPIENTRYP Color4f)( GLfloat, GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP Color4fv)( const GLfloat * );
-   void (GLAPIENTRYP EdgeFlag)( GLboolean );
-   void (GLAPIENTRYP EvalCoord1f)( GLfloat );
-   void (GLAPIENTRYP EvalCoord1fv)( const GLfloat * );
-   void (GLAPIENTRYP EvalCoord2f)( GLfloat, GLfloat );
-   void (GLAPIENTRYP EvalCoord2fv)( const GLfloat * );
-   void (GLAPIENTRYP EvalPoint1)( GLint );
-   void (GLAPIENTRYP EvalPoint2)( GLint, GLint );
-   void (GLAPIENTRYP FogCoordfEXT)( GLfloat );
-   void (GLAPIENTRYP FogCoordfvEXT)( const GLfloat * );
-   void (GLAPIENTRYP Indexf)( GLfloat );
-   void (GLAPIENTRYP Indexfv)( const GLfloat * );
-   void (GLAPIENTRYP Materialfv)( GLenum face, GLenum pname, const GLfloat * );
-   void (GLAPIENTRYP MultiTexCoord1fARB)( GLenum, GLfloat );
-   void (GLAPIENTRYP MultiTexCoord1fvARB)( GLenum, const GLfloat * );
-   void (GLAPIENTRYP MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );
-   void (GLAPIENTRYP MultiTexCoord2fvARB)( GLenum, const GLfloat * );
-   void (GLAPIENTRYP MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP MultiTexCoord3fvARB)( GLenum, const GLfloat * );
-   void (GLAPIENTRYP MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP MultiTexCoord4fvARB)( GLenum, const GLfloat * );
-   void (GLAPIENTRYP Normal3f)( GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP Normal3fv)( const GLfloat * );
-   void (GLAPIENTRYP SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP SecondaryColor3fvEXT)( const GLfloat * );
-   void (GLAPIENTRYP TexCoord1f)( GLfloat );
-   void (GLAPIENTRYP TexCoord1fv)( const GLfloat * );
-   void (GLAPIENTRYP TexCoord2f)( GLfloat, GLfloat );
-   void (GLAPIENTRYP TexCoord2fv)( const GLfloat * );
-   void (GLAPIENTRYP TexCoord3f)( GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP TexCoord3fv)( const GLfloat * );
-   void (GLAPIENTRYP TexCoord4f)( GLfloat, GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP TexCoord4fv)( const GLfloat * );
-   void (GLAPIENTRYP Vertex2f)( GLfloat, GLfloat );
-   void (GLAPIENTRYP Vertex2fv)( const GLfloat * );
-   void (GLAPIENTRYP Vertex3f)( GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP Vertex3fv)( const GLfloat * );
-   void (GLAPIENTRYP Vertex4f)( GLfloat, GLfloat, GLfloat, GLfloat );
-   void (GLAPIENTRYP Vertex4fv)( const GLfloat * );
-   void (GLAPIENTRYP CallList)( GLuint );
-   void (GLAPIENTRYP CallLists)( GLsizei, GLenum, const GLvoid * );
-   void (GLAPIENTRYP Begin)( GLenum );
-   void (GLAPIENTRYP End)( void );
-   /* GL_NV_vertex_program */
-   void (GLAPIENTRYP VertexAttrib1fNV)( GLuint index, GLfloat x );
-   void (GLAPIENTRYP VertexAttrib1fvNV)( GLuint index, const GLfloat *v );
-   void (GLAPIENTRYP VertexAttrib2fNV)( GLuint index, GLfloat x, GLfloat y );
-   void (GLAPIENTRYP VertexAttrib2fvNV)( GLuint index, const GLfloat *v );
-   void (GLAPIENTRYP VertexAttrib3fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z );
-   void (GLAPIENTRYP VertexAttrib3fvNV)( GLuint index, const GLfloat *v );
-   void (GLAPIENTRYP VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-   void (GLAPIENTRYP VertexAttrib4fvNV)( GLuint index, const GLfloat *v );
-   /* GL_ARB_vertex_program */
-   void (GLAPIENTRYP VertexAttrib1fARB)( GLuint index, GLfloat x );
-   void (GLAPIENTRYP VertexAttrib1fvARB)( GLuint index, const GLfloat *v );
-   void (GLAPIENTRYP VertexAttrib2fARB)( GLuint index, GLfloat x, GLfloat y );
-   void (GLAPIENTRYP VertexAttrib2fvARB)( GLuint index, const GLfloat *v );
-   void (GLAPIENTRYP VertexAttrib3fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z );
-   void (GLAPIENTRYP VertexAttrib3fvARB)( GLuint index, const GLfloat *v );
-   void (GLAPIENTRYP VertexAttrib4fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-   void (GLAPIENTRYP VertexAttrib4fvARB)( GLuint index, const GLfloat *v );
-   /*@}*/
-
-   void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );
-
-   /**
-    * \name Array
-    */
-   /*@{*/
-   void (GLAPIENTRYP DrawArrays)( GLenum mode, GLint start, GLsizei count );
-   void (GLAPIENTRYP DrawElements)( GLenum mode, GLsizei count, GLenum type,
-			 const GLvoid *indices );
-   void (GLAPIENTRYP DrawRangeElements)( GLenum mode, GLuint start,
-			      GLuint end, GLsizei count,
-			      GLenum type, const GLvoid *indices );
-   void (GLAPIENTRYP MultiDrawElementsEXT)( GLenum mode, const GLsizei *count,
-					    GLenum type,
-					    const GLvoid **indices,
-					    GLsizei primcount);
-   void (GLAPIENTRYP DrawElementsBaseVertex)( GLenum mode, GLsizei count,
-					      GLenum type,
-					      const GLvoid *indices,
-					      GLint basevertex );
-   void (GLAPIENTRYP DrawRangeElementsBaseVertex)( GLenum mode, GLuint start,
-						   GLuint end, GLsizei count,
-						   GLenum type,
-						   const GLvoid *indices,
-						   GLint basevertex);
-   void (GLAPIENTRYP MultiDrawElementsBaseVertex)( GLenum mode,
-						   const GLsizei *count,
-						   GLenum type,
-						   const GLvoid **indices,
-						   GLsizei primcount,
-						   const GLint *basevertex);
-   void (GLAPIENTRYP DrawArraysInstanced)(GLenum mode, GLint first,
-                                          GLsizei count, GLsizei primcount);
-   void (GLAPIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count,
-                                            GLenum type, const GLvoid *indices,
-                                            GLsizei primcount);
-   /*@}*/
-
-   /**
-    * \name Eval
-    *
-    * If you don't support eval, fallback to the default vertex format
-    * on receiving an eval call and use the pipeline mechanism to
-    * provide partial T&L acceleration.
-    *
-    * Mesa will provide a set of helper functions to do eval within
-    * accelerated vertex formats, eventually...
-    */
-   /*@{*/
-   void (GLAPIENTRYP EvalMesh1)( GLenum mode, GLint i1, GLint i2 );
-   void (GLAPIENTRYP EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
-   /*@}*/
-
-} GLvertexformat;
-
-
-#endif /* DD_INCLUDED */
+/**

+ * \file dd.h

+ * Device driver interfaces.

+ */

+

+/*

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

+#define DD_INCLUDED

+

+/* THIS FILE ONLY INCLUDED BY mtypes.h !!!!! */

+

+#include "glheader.h"

+

+struct gl_buffer_object;

+struct gl_context;

+struct gl_display_list;

+struct gl_framebuffer;

+struct gl_pixelstore_attrib;

+struct gl_program;

+struct gl_renderbuffer;

+struct gl_renderbuffer_attachment;

+struct gl_shader;

+struct gl_shader_program;

+struct gl_texture_image;

+struct gl_texture_object;

+

+/* GL_ARB_vertex_buffer_object */

+/* Modifies GL_MAP_UNSYNCHRONIZED_BIT to allow driver to fail (return

+ * NULL) if buffer is unavailable for immediate mapping.

+ *

+ * Does GL_MAP_INVALIDATE_RANGE_BIT do this?  It seems so, but it

+ * would require more book-keeping in the driver than seems necessary

+ * at this point.

+ *

+ * Does GL_MAP_INVALDIATE_BUFFER_BIT do this?  Not really -- we don't

+ * want to provoke the driver to throw away the old storage, we will

+ * respect the contents of already referenced data.

+ */

+#define MESA_MAP_NOWAIT_BIT       0x0040

+

+

+/**

+ * Device driver function table.

+ * Core Mesa uses these function pointers to call into device drivers.

+ * Most of these functions directly correspond to OpenGL state commands.

+ * Core Mesa will call these functions after error checking has been done

+ * so that the drivers don't have to worry about error testing.

+ *

+ * Vertex transformation/clipping/lighting is patched into the T&L module.

+ * Rasterization functions are patched into the swrast module.

+ *

+ * Note: when new functions are added here, the drivers/common/driverfuncs.c

+ * file should be updated too!!!

+ */

+struct dd_function_table {

+   /**

+    * Return a string as needed by glGetString().

+    * Only the GL_RENDERER query must be implemented.  Otherwise, NULL can be

+    * returned.

+    */

+   const GLubyte * (*GetString)( struct gl_context *ctx, GLenum name );

+

+   /**

+    * Notify the driver after Mesa has made some internal state changes.  

+    *

+    * This is in addition to any state change callbacks Mesa may already have

+    * made.

+    */

+   void (*UpdateState)( struct gl_context *ctx, GLbitfield new_state );

+

+   /**

+    * Get the width and height of the named buffer/window.

+    *

+    * Mesa uses this to determine when the driver's window size has changed.

+    * XXX OBSOLETE: this function will be removed in the future.

+    */

+   void (*GetBufferSize)( struct gl_framebuffer *buffer,

+                          GLuint *width, GLuint *height );

+

+   /**

+    * Resize the given framebuffer to the given size.

+    * XXX OBSOLETE: this function will be removed in the future.

+    */

+   void (*ResizeBuffers)( struct gl_context *ctx, struct gl_framebuffer *fb,

+                          GLuint width, GLuint height);

+

+   /**

+    * Called whenever an error is generated.  

+    * __struct gl_contextRec::ErrorValue contains the error value.

+    */

+   void (*Error)( struct gl_context *ctx );

+

+   /**

+    * This is called whenever glFinish() is called.

+    */

+   void (*Finish)( struct gl_context *ctx );

+

+   /**

+    * This is called whenever glFlush() is called.

+    */

+   void (*Flush)( struct gl_context *ctx );

+

+   /**

+    * Clear the color/depth/stencil/accum buffer(s).

+    * \param buffers  a bitmask of BUFFER_BIT_* flags indicating which

+    *                 renderbuffers need to be cleared.

+    */

+   void (*Clear)( struct gl_context *ctx, GLbitfield buffers );

+

+   /**

+    * Execute glAccum command.

+    */

+   void (*Accum)( struct gl_context *ctx, GLenum op, GLfloat value );

+

+

+   /**

+    * Execute glRasterPos, updating the ctx->Current.Raster fields

+    */

+   void (*RasterPos)( struct gl_context *ctx, const GLfloat v[4] );

+

+   /**

+    * \name Image-related functions

+    */

+   /*@{*/

+

+   /**

+    * Called by glDrawPixels().

+    * \p unpack describes how to unpack the source image data.

+    */

+   void (*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 );

+

+   /**

+    * Called by glReadPixels().

+    */

+   void (*ReadPixels)( struct gl_context *ctx,

+		       GLint x, GLint y, GLsizei width, GLsizei height,

+		       GLenum format, GLenum type,

+		       const struct gl_pixelstore_attrib *unpack,

+		       GLvoid *dest );

+

+   /**

+    * Called by glCopyPixels().  

+    */

+   void (*CopyPixels)( struct gl_context *ctx, GLint srcx, GLint srcy,

+                       GLsizei width, GLsizei height,

+                       GLint dstx, GLint dsty, GLenum type );

+

+   /**

+    * Called by glBitmap().  

+    */

+   void (*Bitmap)( struct gl_context *ctx,

+		   GLint x, GLint y, GLsizei width, GLsizei height,

+		   const struct gl_pixelstore_attrib *unpack,

+		   const GLubyte *bitmap );

+   /*@}*/

+

+   

+   /**

+    * \name Texture image functions

+    */

+   /*@{*/

+

+   /**

+    * Choose texture format.

+    * 

+    * This is called by the \c _mesa_store_tex[sub]image[123]d() fallback

+    * functions.  The driver should examine \p internalFormat and return a

+    * gl_format value.

+    */

+   GLuint (*ChooseTextureFormat)( struct gl_context *ctx, GLint internalFormat,

+                                     GLenum srcFormat, GLenum srcType );

+

+   /**

+    * Called by glTexImage1D().

+    * 

+    * \param target user specified.

+    * \param format user specified.

+    * \param type user specified.

+    * \param pixels user specified.

+    * \param packing indicates the image packing of pixels.

+    * \param texObj is the target texture object.

+    * \param texImage is the target texture image.  It will have the texture \p

+    * width, \p height, \p depth, \p border and \p internalFormat information.

+    * 

+    * \p retainInternalCopy is returned by this function and indicates whether

+    * core Mesa should keep an internal copy of the texture image.

+    *

+    * Drivers should call a fallback routine from texstore.c if needed.

+    */

+   void (*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 );

+

+   /**

+    * Called by glTexImage2D().

+    * 

+    * \sa dd_function_table::TexImage1D.

+    */

+   void (*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 );

+   

+   /**

+    * Called by glTexImage3D().

+    * 

+    * \sa dd_function_table::TexImage1D.

+    */

+   void (*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 );

+

+   /**

+    * Called by glTexSubImage1D().

+    *

+    * \param target user specified.

+    * \param level user specified.

+    * \param xoffset user specified.

+    * \param yoffset user specified.

+    * \param zoffset user specified.

+    * \param width user specified.

+    * \param height user specified.

+    * \param depth user specified.

+    * \param format user specified.

+    * \param type user specified.

+    * \param pixels user specified.

+    * \param packing indicates the image packing of pixels.

+    * \param texObj is the target texture object.

+    * \param texImage is the target texture image.  It will have the texture \p

+    * width, \p height, \p border and \p internalFormat information.

+    *

+    * The driver should use a fallback routine from texstore.c if needed.

+    */

+   void (*TexSubImage1D)( struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLsizei width,

+                          GLenum format, GLenum type,

+                          const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage );

+   

+   /**

+    * Called by glTexSubImage2D().

+    *

+    * \sa dd_function_table::TexSubImage1D.

+    */

+   void (*TexSubImage2D)( struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint yoffset,

+                          GLsizei width, GLsizei height,

+                          GLenum format, GLenum type,

+                          const GLvoid *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage );

+   

+   /**

+    * Called by glTexSubImage3D().

+    *

+    * \sa dd_function_table::TexSubImage1D.

+    */

+   void (*TexSubImage3D)( struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint yoffset, GLint zoffset,

+                          GLsizei width, GLsizei 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 );

+

+   /**

+    * Called by glGetTexImage().

+    */

+   void (*GetTexImage)( struct gl_context *ctx, GLenum target, GLint level,

+                        GLenum format, GLenum type, GLvoid *pixels,

+                        struct gl_texture_object *texObj,

+                        struct gl_texture_image *texImage );

+

+   /**

+    * Called by glCopyTexImage1D().

+    * 

+    * Drivers should use a fallback routine from texstore.c if needed.

+    */

+   void (*CopyTexImage1D)( struct gl_context *ctx, GLenum target, GLint level,

+                           GLenum internalFormat, GLint x, GLint y,

+                           GLsizei width, GLint border );

+

+   /**

+    * Called by glCopyTexImage2D().

+    * 

+    * Drivers should use a fallback routine from texstore.c if needed.

+    */

+   void (*CopyTexImage2D)( struct gl_context *ctx, GLenum target, GLint level,

+                           GLenum internalFormat, GLint x, GLint y,

+                           GLsizei width, GLsizei height, GLint border );

+

+   /**

+    * Called by glCopyTexSubImage1D().

+    * 

+    * Drivers should use a fallback routine from texstore.c if needed.

+    */

+   void (*CopyTexSubImage1D)( struct gl_context *ctx, GLenum target, GLint level,

+                              GLint xoffset,

+                              GLint x, GLint y, GLsizei width );

+   /**

+    * Called by glCopyTexSubImage2D().

+    * 

+    * Drivers should use a fallback routine from texstore.c if needed.

+    */

+   void (*CopyTexSubImage2D)( struct gl_context *ctx, GLenum target, GLint level,

+                              GLint xoffset, GLint yoffset,

+                              GLint x, GLint y,

+                              GLsizei width, GLsizei height );

+   /**

+    * Called by glCopyTexSubImage3D().

+    * 

+    * Drivers should use a fallback routine from texstore.c if needed.

+    */

+   void (*CopyTexSubImage3D)( struct gl_context *ctx, GLenum target, GLint level,

+                              GLint xoffset, GLint yoffset, GLint zoffset,

+                              GLint x, GLint y,

+                              GLsizei width, GLsizei height );

+

+   /**

+    * Called by glGenerateMipmap() or when GL_GENERATE_MIPMAP_SGIS is enabled.

+    */

+   void (*GenerateMipmap)(struct gl_context *ctx, GLenum target,

+                          struct gl_texture_object *texObj);

+

+   /**

+    * Called by glTexImage[123]D when user specifies a proxy texture

+    * target.  

+    *

+    * \return GL_TRUE if the proxy test passes, or GL_FALSE if the test fails.

+    */

+   GLboolean (*TestProxyTexImage)(struct gl_context *ctx, GLenum target,

+                                  GLint level, GLint internalFormat,

+                                  GLenum format, GLenum type,

+                                  GLint width, GLint height,

+                                  GLint depth, GLint border);

+   /*@}*/

+

+   

+   /**

+    * \name Compressed texture functions

+    */

+   /*@{*/

+

+   /**

+    * Called by glCompressedTexImage1D().

+    *

+    * \param target user specified.

+    * \param format user specified.

+    * \param type user specified.

+    * \param pixels user specified.

+    * \param packing indicates the image packing of pixels.

+    * \param texObj is the target texture object.

+    * \param texImage is the target texture image.  It will have the texture \p

+    * width, \p height, \p depth, \p border and \p internalFormat information.

+    *      

+    * \a retainInternalCopy is returned by this function and indicates whether

+    * core Mesa should keep an internal copy of the texture image.

+    */

+   void (*CompressedTexImage1D)( struct gl_context *ctx, GLenum target,

+                                 GLint level, GLint internalFormat,

+                                 GLsizei width, GLint border,

+                                 GLsizei imageSize, const GLvoid *data,

+                                 struct gl_texture_object *texObj,

+                                 struct gl_texture_image *texImage );

+   /**

+    * Called by glCompressedTexImage2D().

+    *

+    * \sa dd_function_table::CompressedTexImage1D.

+    */

+   void (*CompressedTexImage2D)( struct gl_context *ctx, GLenum target,

+                                 GLint level, GLint internalFormat,

+                                 GLsizei width, GLsizei height, GLint border,

+                                 GLsizei imageSize, const GLvoid *data,

+                                 struct gl_texture_object *texObj,

+                                 struct gl_texture_image *texImage );

+   /**

+    * Called by glCompressedTexImage3D().

+    *

+    * \sa dd_function_table::CompressedTexImage3D.

+    */

+   void (*CompressedTexImage3D)( struct gl_context *ctx, GLenum target,

+                                 GLint level, GLint internalFormat,

+                                 GLsizei width, GLsizei height, GLsizei depth,

+                                 GLint border,

+                                 GLsizei imageSize, const GLvoid *data,

+                                 struct gl_texture_object *texObj,

+                                 struct gl_texture_image *texImage );

+

+   /**

+    * Called by glCompressedTexSubImage1D().

+    * 

+    * \param target user specified.

+    * \param level user specified.

+    * \param xoffset user specified.

+    * \param yoffset user specified.

+    * \param zoffset user specified.

+    * \param width user specified.

+    * \param height user specified.

+    * \param depth user specified.

+    * \param imageSize user specified.

+    * \param data user specified.

+    * \param texObj is the target texture object.

+    * \param texImage is the target texture image.  It will have the texture \p

+    * width, \p height, \p depth, \p border and \p internalFormat information.

+    */

+   void (*CompressedTexSubImage1D)(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);

+   /**

+    * Called by glCompressedTexSubImage2D().

+    *

+    * \sa dd_function_table::CompressedTexImage3D.

+    */

+   void (*CompressedTexSubImage2D)(struct gl_context *ctx, GLenum target, GLint level,

+                                   GLint xoffset, GLint yoffset,

+                                   GLsizei width, GLint height,

+                                   GLenum format,

+                                   GLsizei imageSize, const GLvoid *data,

+                                   struct gl_texture_object *texObj,

+                                   struct gl_texture_image *texImage);

+   /**

+    * Called by glCompressedTexSubImage3D().

+    *

+    * \sa dd_function_table::CompressedTexImage3D.

+    */

+   void (*CompressedTexSubImage3D)(struct gl_context *ctx, GLenum target, GLint level,

+                                   GLint xoffset, GLint yoffset, GLint zoffset,

+                                   GLsizei width, GLint height, GLint depth,

+                                   GLenum format,

+                                   GLsizei imageSize, const GLvoid *data,

+                                   struct gl_texture_object *texObj,

+                                   struct gl_texture_image *texImage);

+

+

+   /**

+    * Called by glGetCompressedTexImage.

+    */

+   void (*GetCompressedTexImage)(struct gl_context *ctx, GLenum target, GLint level,

+                                 GLvoid *img,

+                                 struct gl_texture_object *texObj,

+                                 struct gl_texture_image *texImage);

+

+   /*@}*/

+

+   /**

+    * \name Texture object functions

+    */

+   /*@{*/

+

+   /**

+    * Called by glBindTexture().

+    */

+   void (*BindTexture)( struct gl_context *ctx, GLenum target,

+                        struct gl_texture_object *tObj );

+

+   /**

+    * Called to allocate a new texture object.

+    * A new gl_texture_object should be returned.  The driver should

+    * attach to it any device-specific info it needs.

+    */

+   struct gl_texture_object * (*NewTextureObject)( struct gl_context *ctx, GLuint name,

+                                                   GLenum target );

+   /**

+    * Called when a texture object is about to be deallocated.  

+    *

+    * Driver should delete the gl_texture_object object and anything

+    * hanging off of it.

+    */

+   void (*DeleteTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );

+

+   /**

+    * Called to allocate a new texture image object.

+    */

+   struct gl_texture_image * (*NewTextureImage)( struct gl_context *ctx );

+

+   /** 

+    * Called to free tImage->Data.

+    */

+   void (*FreeTexImageData)( struct gl_context *ctx, struct gl_texture_image *tImage );

+

+   /** Map texture image data into user space */

+   void (*MapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );

+   /** Unmap texture images from user space */

+   void (*UnmapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );

+

+   /**

+    * Note: no context argument.  This function doesn't initially look

+    * like it belongs here, except that the driver is the only entity

+    * that knows for sure how the texture memory is allocated - via

+    * the above callbacks.  There is then an argument that the driver

+    * knows what memcpy paths might be fast.  Typically this is invoked with

+    * 

+    * to -- a pointer into texture memory allocated by NewTextureImage() above.

+    * from -- a pointer into client memory or a mesa temporary.

+    * sz -- nr bytes to copy.

+    */

+   void* (*TextureMemCpy)( void *to, const void *from, size_t sz );

+

+   /**

+    * Called by glAreTextureResident().

+    */

+   GLboolean (*IsTextureResident)( struct gl_context *ctx,

+                                   struct gl_texture_object *t );

+

+   /**

+    * Called when the texture's color lookup table is changed.

+    * 

+    * If \p tObj is NULL then the shared texture palette

+    * gl_texture_object::Palette is to be updated.

+    */

+   void (*UpdateTexturePalette)( struct gl_context *ctx,

+                                 struct gl_texture_object *tObj );

+   /*@}*/

+

+   

+   /**

+    * \name Imaging functionality

+    */

+   /*@{*/

+   void (*CopyColorTable)( struct gl_context *ctx,

+			   GLenum target, GLenum internalformat,

+			   GLint x, GLint y, GLsizei width );

+

+   void (*CopyColorSubTable)( struct gl_context *ctx,

+			      GLenum target, GLsizei start,

+			      GLint x, GLint y, GLsizei width );

+   /*@}*/

+

+

+   /**

+    * \name Vertex/fragment program functions

+    */

+   /*@{*/

+   /** Bind a vertex/fragment program */

+   void (*BindProgram)(struct gl_context *ctx, GLenum target, struct gl_program *prog);

+   /** Allocate a new program */

+   struct gl_program * (*NewProgram)(struct gl_context *ctx, GLenum target, GLuint id);

+   /** Delete a program */

+   void (*DeleteProgram)(struct gl_context *ctx, struct gl_program *prog);   

+   /**

+    * Notify driver that a program string (and GPU code) has been specified

+    * or modified.  Return GL_TRUE or GL_FALSE to indicate if the program is

+    * supported by the driver.

+    */

+   GLboolean (*ProgramStringNotify)(struct gl_context *ctx, GLenum target, 

+                                    struct gl_program *prog);

+

+   /** Query if program can be loaded onto hardware */

+   GLboolean (*IsProgramNative)(struct gl_context *ctx, GLenum target, 

+				struct gl_program *prog);

+   

+   /*@}*/

+

+   /**

+    * \name GLSL shader/program functions.

+    */

+   /*@{*/

+   /**

+    * Called when a shader is compiled.

+    *

+    * Note that not all shader objects get ShaderCompile called on

+    * them.  Notably, the shaders containing builtin functions do not

+    * have CompileShader() called, so if lowering passes are done they

+    * need to also be performed in LinkShader().

+    */

+   GLboolean (*CompileShader)(struct gl_context *ctx, struct gl_shader *shader);

+   /**

+    * Called when a shader program is linked.

+    *

+    * This gives drivers an opportunity to clone the IR and make their

+    * own transformations on it for the purposes of code generation.

+    */

+   GLboolean (*LinkShader)(struct gl_context *ctx, struct gl_shader_program *shader);

+   /*@}*/

+

+   /**

+    * \name State-changing functions.

+    *

+    * \note drawing functions are above.

+    *

+    * These functions are called by their corresponding OpenGL API functions.

+    * They are \e also called by the gl_PopAttrib() function!!!

+    * May add more functions like these to the device driver in the future.

+    */

+   /*@{*/

+   /** Specify the alpha test function */

+   void (*AlphaFunc)(struct gl_context *ctx, GLenum func, GLfloat ref);

+   /** Set the blend color */

+   void (*BlendColor)(struct gl_context *ctx, const GLfloat color[4]);

+   /** Set the blend equation */

+   void (*BlendEquationSeparate)(struct gl_context *ctx, GLenum modeRGB, GLenum modeA);

+   /** Specify pixel arithmetic */

+   void (*BlendFuncSeparate)(struct gl_context *ctx,

+                             GLenum sfactorRGB, GLenum dfactorRGB,

+                             GLenum sfactorA, GLenum dfactorA);

+   /** Specify clear values for the color buffers */

+   void (*ClearColor)(struct gl_context *ctx, const GLfloat color[4]);

+   /** Specify the clear value for the depth buffer */

+   void (*ClearDepth)(struct gl_context *ctx, GLclampd d);

+   /** Specify the clear value for the stencil buffer */

+   void (*ClearStencil)(struct gl_context *ctx, GLint s);

+   /** Specify a plane against which all geometry is clipped */

+   void (*ClipPlane)(struct gl_context *ctx, GLenum plane, const GLfloat *equation );

+   /** Enable and disable writing of frame buffer color components */

+   void (*ColorMask)(struct gl_context *ctx, GLboolean rmask, GLboolean gmask,

+                     GLboolean bmask, GLboolean amask );

+   void (*ColorMaskIndexed)(struct gl_context *ctx, GLuint buf, GLboolean rmask,

+                            GLboolean gmask, GLboolean bmask, GLboolean amask);

+   /** Cause a material color to track the current color */

+   void (*ColorMaterial)(struct gl_context *ctx, GLenum face, GLenum mode);

+   /** Specify whether front- or back-facing facets can be culled */

+   void (*CullFace)(struct gl_context *ctx, GLenum mode);

+   /** Define front- and back-facing polygons */

+   void (*FrontFace)(struct gl_context *ctx, GLenum mode);

+   /** Specify the value used for depth buffer comparisons */

+   void (*DepthFunc)(struct gl_context *ctx, GLenum func);

+   /** Enable or disable writing into the depth buffer */

+   void (*DepthMask)(struct gl_context *ctx, GLboolean flag);

+   /** Specify mapping of depth values from NDC to window coordinates */

+   void (*DepthRange)(struct gl_context *ctx, GLclampd nearval, GLclampd farval);

+   /** Specify the current buffer for writing */

+   void (*DrawBuffer)( struct gl_context *ctx, GLenum buffer );

+   /** Specify the buffers for writing for fragment programs*/

+   void (*DrawBuffers)( struct gl_context *ctx, GLsizei n, const GLenum *buffers );

+   /** Enable or disable server-side gl capabilities */

+   void (*Enable)(struct gl_context *ctx, GLenum cap, GLboolean state);

+   /** Specify fog parameters */

+   void (*Fogfv)(struct gl_context *ctx, GLenum pname, const GLfloat *params);

+   /** Specify implementation-specific hints */

+   void (*Hint)(struct gl_context *ctx, GLenum target, GLenum mode);

+   /** Set light source parameters.

+    * Note: for GL_POSITION and GL_SPOT_DIRECTION, params will have already

+    * been transformed to eye-space.

+    */

+   void (*Lightfv)(struct gl_context *ctx, GLenum light,

+		   GLenum pname, const GLfloat *params );

+   /** Set the lighting model parameters */

+   void (*LightModelfv)(struct gl_context *ctx, GLenum pname, const GLfloat *params);

+   /** Specify the line stipple pattern */

+   void (*LineStipple)(struct gl_context *ctx, GLint factor, GLushort pattern );

+   /** Specify the width of rasterized lines */

+   void (*LineWidth)(struct gl_context *ctx, GLfloat width);

+   /** Specify a logical pixel operation for color index rendering */

+   void (*LogicOpcode)(struct gl_context *ctx, GLenum opcode);

+   void (*PointParameterfv)(struct gl_context *ctx, GLenum pname,

+                            const GLfloat *params);

+   /** Specify the diameter of rasterized points */

+   void (*PointSize)(struct gl_context *ctx, GLfloat size);

+   /** Select a polygon rasterization mode */

+   void (*PolygonMode)(struct gl_context *ctx, GLenum face, GLenum mode);

+   /** Set the scale and units used to calculate depth values */

+   void (*PolygonOffset)(struct gl_context *ctx, GLfloat factor, GLfloat units);

+   /** Set the polygon stippling pattern */

+   void (*PolygonStipple)(struct gl_context *ctx, const GLubyte *mask );

+   /* Specifies the current buffer for reading */

+   void (*ReadBuffer)( struct gl_context *ctx, GLenum buffer );

+   /** Set rasterization mode */

+   void (*RenderMode)(struct gl_context *ctx, GLenum mode );

+   /** Define the scissor box */

+   void (*Scissor)(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h);

+   /** Select flat or smooth shading */

+   void (*ShadeModel)(struct gl_context *ctx, GLenum mode);

+   /** OpenGL 2.0 two-sided StencilFunc */

+   void (*StencilFuncSeparate)(struct gl_context *ctx, GLenum face, GLenum func,

+                               GLint ref, GLuint mask);

+   /** OpenGL 2.0 two-sided StencilMask */

+   void (*StencilMaskSeparate)(struct gl_context *ctx, GLenum face, GLuint mask);

+   /** OpenGL 2.0 two-sided StencilOp */

+   void (*StencilOpSeparate)(struct gl_context *ctx, GLenum face, GLenum fail,

+                             GLenum zfail, GLenum zpass);

+   /** Control the generation of texture coordinates */

+   void (*TexGen)(struct gl_context *ctx, GLenum coord, GLenum pname,

+		  const GLfloat *params);

+   /** Set texture environment parameters */

+   void (*TexEnv)(struct gl_context *ctx, GLenum target, GLenum pname,

+                  const GLfloat *param);

+   /** Set texture parameters */

+   void (*TexParameter)(struct gl_context *ctx, GLenum target,

+                        struct gl_texture_object *texObj,

+                        GLenum pname, const GLfloat *params);

+   /** Set the viewport */

+   void (*Viewport)(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h);

+   /*@}*/

+

+

+   /**

+    * \name Vertex/pixel buffer object functions

+    */

+   /*@{*/

+   void (*BindBuffer)( struct gl_context *ctx, GLenum target,

+		       struct gl_buffer_object *obj );

+

+   struct gl_buffer_object * (*NewBufferObject)( struct gl_context *ctx, GLuint buffer,

+						 GLenum target );

+   

+   void (*DeleteBuffer)( struct gl_context *ctx, struct gl_buffer_object *obj );

+

+   GLboolean (*BufferData)( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,

+                            const GLvoid *data, GLenum usage,

+                            struct gl_buffer_object *obj );

+

+   void (*BufferSubData)( struct gl_context *ctx, GLenum target, GLintptrARB offset,

+			  GLsizeiptrARB size, const GLvoid *data,

+			  struct gl_buffer_object *obj );

+

+   void (*GetBufferSubData)( struct gl_context *ctx, GLenum target,

+			     GLintptrARB offset, GLsizeiptrARB size,

+			     GLvoid *data, struct gl_buffer_object *obj );

+

+   void * (*MapBuffer)( struct gl_context *ctx, GLenum target, GLenum access,

+			struct gl_buffer_object *obj );

+

+   void (*CopyBufferSubData)( struct gl_context *ctx,

+                              struct gl_buffer_object *src,

+                              struct gl_buffer_object *dst,

+                              GLintptr readOffset, GLintptr writeOffset,

+                              GLsizeiptr size );

+

+   /* May return NULL if MESA_MAP_NOWAIT_BIT is set in access:

+    */

+   void * (*MapBufferRange)( struct gl_context *ctx, GLenum target, GLintptr offset,

+                             GLsizeiptr length, GLbitfield access,

+                             struct gl_buffer_object *obj);

+

+   void (*FlushMappedBufferRange)(struct gl_context *ctx, GLenum target, 

+                                  GLintptr offset, GLsizeiptr length,

+                                  struct gl_buffer_object *obj);

+

+   GLboolean (*UnmapBuffer)( struct gl_context *ctx, GLenum target,

+			     struct gl_buffer_object *obj );

+   /*@}*/

+

+   /**

+    * \name Functions for GL_APPLE_object_purgeable

+    */

+   /*@{*/

+   /* variations on ObjectPurgeable */

+   GLenum (*BufferObjectPurgeable)( struct gl_context *ctx, struct gl_buffer_object *obj, GLenum option );

+   GLenum (*RenderObjectPurgeable)( struct gl_context *ctx, struct gl_renderbuffer *obj, GLenum option );

+   GLenum (*TextureObjectPurgeable)( struct gl_context *ctx, struct gl_texture_object *obj, GLenum option );

+

+   /* variations on ObjectUnpurgeable */

+   GLenum (*BufferObjectUnpurgeable)( struct gl_context *ctx, struct gl_buffer_object *obj, GLenum option );

+   GLenum (*RenderObjectUnpurgeable)( struct gl_context *ctx, struct gl_renderbuffer *obj, GLenum option );

+   GLenum (*TextureObjectUnpurgeable)( struct gl_context *ctx, struct gl_texture_object *obj, GLenum option );

+   /*@}*/

+

+   /**

+    * \name Functions for GL_EXT_framebuffer_{object,blit}.

+    */

+   /*@{*/

+   struct gl_framebuffer * (*NewFramebuffer)(struct gl_context *ctx, GLuint name);

+   struct gl_renderbuffer * (*NewRenderbuffer)(struct gl_context *ctx, GLuint name);

+   void (*BindFramebuffer)(struct gl_context *ctx, GLenum target,

+                           struct gl_framebuffer *drawFb,

+                           struct gl_framebuffer *readFb);

+   void (*FramebufferRenderbuffer)(struct gl_context *ctx, 

+                                   struct gl_framebuffer *fb,

+                                   GLenum attachment,

+                                   struct gl_renderbuffer *rb);

+   void (*RenderTexture)(struct gl_context *ctx,

+                         struct gl_framebuffer *fb,

+                         struct gl_renderbuffer_attachment *att);

+   void (*FinishRenderTexture)(struct gl_context *ctx,

+                               struct gl_renderbuffer_attachment *att);

+   void (*ValidateFramebuffer)(struct gl_context *ctx,

+                               struct gl_framebuffer *fb);

+   /*@}*/

+   void (*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);

+

+   /**

+    * \name Query objects

+    */

+   /*@{*/

+   struct gl_query_object * (*NewQueryObject)(struct gl_context *ctx, GLuint id);

+   void (*DeleteQuery)(struct gl_context *ctx, struct gl_query_object *q);

+   void (*BeginQuery)(struct gl_context *ctx, struct gl_query_object *q);

+   void (*EndQuery)(struct gl_context *ctx, struct gl_query_object *q);

+   void (*CheckQuery)(struct gl_context *ctx, struct gl_query_object *q);

+   void (*WaitQuery)(struct gl_context *ctx, struct gl_query_object *q);

+   /*@}*/

+

+

+   /**

+    * \name Vertex Array objects

+    */

+   /*@{*/

+   struct gl_array_object * (*NewArrayObject)(struct gl_context *ctx, GLuint id);

+   void (*DeleteArrayObject)(struct gl_context *ctx, struct gl_array_object *obj);

+   void (*BindArrayObject)(struct gl_context *ctx, struct gl_array_object *obj);

+   /*@}*/

+

+   /**

+    * \name GLSL-related functions (ARB extensions and OpenGL 2.x)

+    */

+   /*@{*/

+   struct gl_shader *(*NewShader)(struct gl_context *ctx, GLuint name, GLenum type);

+   void (*DeleteShader)(struct gl_context *ctx, struct gl_shader *shader);

+   struct gl_shader_program *(*NewShaderProgram)(struct gl_context *ctx, GLuint name);

+   void (*DeleteShaderProgram)(struct gl_context *ctx,

+                               struct gl_shader_program *shProg);

+   void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg);

+   /*@}*/

+

+

+   /**

+    * \name Support for multiple T&L engines

+    */

+   /*@{*/

+

+   /**

+    * Bitmask of state changes that require the current T&L module to be

+    * validated, using ValidateTnlModule() below.

+    */

+   GLuint NeedValidate;

+

+   /**

+    * Validate the current T&L module. 

+    *

+    * This is called directly after UpdateState() when a state change that has

+    * occurred matches the dd_function_table::NeedValidate bitmask above.  This

+    * ensures all computed values are up to date, thus allowing the driver to

+    * decide if the current T&L module needs to be swapped out.

+    *

+    * This must be non-NULL if a driver installs a custom T&L module and sets

+    * the dd_function_table::NeedValidate bitmask, but may be NULL otherwise.

+    */

+   void (*ValidateTnlModule)( struct gl_context *ctx, GLuint new_state );

+

+

+#define PRIM_OUTSIDE_BEGIN_END   (GL_POLYGON+1)

+#define PRIM_INSIDE_UNKNOWN_PRIM (GL_POLYGON+2)

+#define PRIM_UNKNOWN             (GL_POLYGON+3)

+

+   /**

+    * Set by the driver-supplied T&L engine.  

+    *

+    * Set to PRIM_OUTSIDE_BEGIN_END when outside glBegin()/glEnd().

+    */

+   GLuint CurrentExecPrimitive;

+

+   /**

+    * Current state of an in-progress compilation.  

+    *

+    * May take on any of the additional values PRIM_OUTSIDE_BEGIN_END,

+    * PRIM_INSIDE_UNKNOWN_PRIM or PRIM_UNKNOWN defined above.

+    */

+   GLuint CurrentSavePrimitive;

+

+

+#define FLUSH_STORED_VERTICES 0x1

+#define FLUSH_UPDATE_CURRENT  0x2

+   /**

+    * Set by the driver-supplied T&L engine whenever vertices are buffered

+    * between glBegin()/glEnd() objects or __struct gl_contextRec::Current is not

+    * updated.

+    *

+    * The dd_function_table::FlushVertices call below may be used to resolve

+    * these conditions.

+    */

+   GLuint NeedFlush;

+   GLuint SaveNeedFlush;

+

+

+   /* Called prior to any of the GLvertexformat functions being

+    * called.  Paired with Driver.FlushVertices().

+    */

+   void (*BeginVertices)( struct gl_context *ctx );

+

+   /**

+    * If inside glBegin()/glEnd(), it should ASSERT(0).  Otherwise, if

+    * FLUSH_STORED_VERTICES bit in \p flags is set flushes any buffered

+    * vertices, if FLUSH_UPDATE_CURRENT bit is set updates

+    * __struct gl_contextRec::Current and gl_light_attrib::Material

+    *

+    * Note that the default T&L engine never clears the

+    * FLUSH_UPDATE_CURRENT bit, even after performing the update.

+    */

+   void (*FlushVertices)( struct gl_context *ctx, GLuint flags );

+   void (*SaveFlushVertices)( struct gl_context *ctx );

+

+   /**

+    * Give the driver the opportunity to hook in its own vtxfmt for

+    * compiling optimized display lists.  This is called on each valid

+    * glBegin() during list compilation.

+    */

+   GLboolean (*NotifySaveBegin)( struct gl_context *ctx, GLenum mode );

+

+   /**

+    * Notify driver that the special derived value _NeedEyeCoords has

+    * changed.

+    */

+   void (*LightingSpaceChange)( struct gl_context *ctx );

+

+   /**

+    * Called by glNewList().

+    *

+    * Let the T&L component know what is going on with display lists

+    * in time to make changes to dispatch tables, etc.

+    */

+   void (*NewList)( struct gl_context *ctx, GLuint list, GLenum mode );

+   /**

+    * Called by glEndList().

+    *

+    * \sa dd_function_table::NewList.

+    */

+   void (*EndList)( struct gl_context *ctx );

+

+   /**

+    * Called by glCallList(s).

+    *

+    * Notify the T&L component before and after calling a display list.

+    */

+   void (*BeginCallList)( struct gl_context *ctx, 

+			  struct gl_display_list *dlist );

+   /**

+    * Called by glEndCallList().

+    *

+    * \sa dd_function_table::BeginCallList.

+    */

+   void (*EndCallList)( struct gl_context *ctx );

+

+

+   /**

+    * \name GL_ARB_sync interfaces

+    */

+   /*@{*/

+   struct gl_sync_object * (*NewSyncObject)(struct gl_context *, GLenum);

+   void (*FenceSync)(struct gl_context *, struct gl_sync_object *, GLenum, GLbitfield);

+   void (*DeleteSyncObject)(struct gl_context *, struct gl_sync_object *);

+   void (*CheckSync)(struct gl_context *, struct gl_sync_object *);

+   void (*ClientWaitSync)(struct gl_context *, struct gl_sync_object *,

+			  GLbitfield, GLuint64);

+   void (*ServerWaitSync)(struct gl_context *, struct gl_sync_object *,

+			  GLbitfield, GLuint64);

+   /*@}*/

+

+   /** GL_NV_conditional_render */

+   void (*BeginConditionalRender)(struct gl_context *ctx, struct gl_query_object *q,

+                                  GLenum mode);

+   void (*EndConditionalRender)(struct gl_context *ctx, struct gl_query_object *q);

+

+   /**

+    * \name GL_OES_draw_texture interface

+    */

+   /*@{*/

+   void (*DrawTex)(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,

+                   GLfloat width, GLfloat height);

+   /*@}*/

+

+   /**

+    * \name GL_OES_EGL_image interface

+    */

+   void (*EGLImageTargetTexture2D)(struct gl_context *ctx, GLenum target,

+				   struct gl_texture_object *texObj,

+				   struct gl_texture_image *texImage,

+				   GLeglImageOES image_handle);

+   void (*EGLImageTargetRenderbufferStorage)(struct gl_context *ctx,

+					     struct gl_renderbuffer *rb,

+					     void *image_handle);

+

+   /**

+    * \name GL_EXT_transform_feedback interface

+    */

+   struct gl_transform_feedback_object *

+        (*NewTransformFeedback)(struct gl_context *ctx, GLuint name);

+   void (*DeleteTransformFeedback)(struct gl_context *ctx,

+                                   struct gl_transform_feedback_object *obj);

+   void (*BeginTransformFeedback)(struct gl_context *ctx, GLenum mode,

+                                  struct gl_transform_feedback_object *obj);

+   void (*EndTransformFeedback)(struct gl_context *ctx,

+                                struct gl_transform_feedback_object *obj);

+   void (*PauseTransformFeedback)(struct gl_context *ctx,

+                                  struct gl_transform_feedback_object *obj);

+   void (*ResumeTransformFeedback)(struct gl_context *ctx,

+                                   struct gl_transform_feedback_object *obj);

+   void (*DrawTransformFeedback)(struct gl_context *ctx, GLenum mode,

+                                 struct gl_transform_feedback_object *obj);

+};

+

+

+/**

+ * Transform/Clip/Lighting interface

+ *

+ * Drivers present a reduced set of the functions possible in

+ * glBegin()/glEnd() objects.  Core mesa provides translation stubs for the

+ * remaining functions to map down to these entry points.

+ *

+ * These are the initial values to be installed into dispatch by

+ * mesa.  If the T&L driver wants to modify the dispatch table

+ * while installed, it must do so itself.  It would be possible for

+ * the vertexformat to install its own initial values for these

+ * functions, but this way there is an obvious list of what is

+ * expected of the driver.

+ *

+ * If the driver wants to hook in entry points other than those

+ * listed, it must restore them to their original values in

+ * the disable() callback, below.

+ */

+typedef struct {

+   /**

+    * \name Vertex

+    */

+   /*@{*/

+   void (GLAPIENTRYP ArrayElement)( GLint );

+   void (GLAPIENTRYP Color3f)( GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP Color3fv)( const GLfloat * );

+   void (GLAPIENTRYP Color4f)( GLfloat, GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP Color4fv)( const GLfloat * );

+   void (GLAPIENTRYP EdgeFlag)( GLboolean );

+   void (GLAPIENTRYP EvalCoord1f)( GLfloat );

+   void (GLAPIENTRYP EvalCoord1fv)( const GLfloat * );

+   void (GLAPIENTRYP EvalCoord2f)( GLfloat, GLfloat );

+   void (GLAPIENTRYP EvalCoord2fv)( const GLfloat * );

+   void (GLAPIENTRYP EvalPoint1)( GLint );

+   void (GLAPIENTRYP EvalPoint2)( GLint, GLint );

+   void (GLAPIENTRYP FogCoordfEXT)( GLfloat );

+   void (GLAPIENTRYP FogCoordfvEXT)( const GLfloat * );

+   void (GLAPIENTRYP Indexf)( GLfloat );

+   void (GLAPIENTRYP Indexfv)( const GLfloat * );

+   void (GLAPIENTRYP Materialfv)( GLenum face, GLenum pname, const GLfloat * );

+   void (GLAPIENTRYP MultiTexCoord1fARB)( GLenum, GLfloat );

+   void (GLAPIENTRYP MultiTexCoord1fvARB)( GLenum, const GLfloat * );

+   void (GLAPIENTRYP MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );

+   void (GLAPIENTRYP MultiTexCoord2fvARB)( GLenum, const GLfloat * );

+   void (GLAPIENTRYP MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP MultiTexCoord3fvARB)( GLenum, const GLfloat * );

+   void (GLAPIENTRYP MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP MultiTexCoord4fvARB)( GLenum, const GLfloat * );

+   void (GLAPIENTRYP Normal3f)( GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP Normal3fv)( const GLfloat * );

+   void (GLAPIENTRYP SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP SecondaryColor3fvEXT)( const GLfloat * );

+   void (GLAPIENTRYP TexCoord1f)( GLfloat );

+   void (GLAPIENTRYP TexCoord1fv)( const GLfloat * );

+   void (GLAPIENTRYP TexCoord2f)( GLfloat, GLfloat );

+   void (GLAPIENTRYP TexCoord2fv)( const GLfloat * );

+   void (GLAPIENTRYP TexCoord3f)( GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP TexCoord3fv)( const GLfloat * );

+   void (GLAPIENTRYP TexCoord4f)( GLfloat, GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP TexCoord4fv)( const GLfloat * );

+   void (GLAPIENTRYP Vertex2f)( GLfloat, GLfloat );

+   void (GLAPIENTRYP Vertex2fv)( const GLfloat * );

+   void (GLAPIENTRYP Vertex3f)( GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP Vertex3fv)( const GLfloat * );

+   void (GLAPIENTRYP Vertex4f)( GLfloat, GLfloat, GLfloat, GLfloat );

+   void (GLAPIENTRYP Vertex4fv)( const GLfloat * );

+   void (GLAPIENTRYP CallList)( GLuint );

+   void (GLAPIENTRYP CallLists)( GLsizei, GLenum, const GLvoid * );

+   void (GLAPIENTRYP Begin)( GLenum );

+   void (GLAPIENTRYP End)( void );

+   void (GLAPIENTRYP PrimitiveRestartNV)( void );

+   /* GL_NV_vertex_program */

+   void (GLAPIENTRYP VertexAttrib1fNV)( GLuint index, GLfloat x );

+   void (GLAPIENTRYP VertexAttrib1fvNV)( GLuint index, const GLfloat *v );

+   void (GLAPIENTRYP VertexAttrib2fNV)( GLuint index, GLfloat x, GLfloat y );

+   void (GLAPIENTRYP VertexAttrib2fvNV)( GLuint index, const GLfloat *v );

+   void (GLAPIENTRYP VertexAttrib3fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z );

+   void (GLAPIENTRYP VertexAttrib3fvNV)( GLuint index, const GLfloat *v );

+   void (GLAPIENTRYP VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );

+   void (GLAPIENTRYP VertexAttrib4fvNV)( GLuint index, const GLfloat *v );

+   /* GL_ARB_vertex_program */

+   void (GLAPIENTRYP VertexAttrib1fARB)( GLuint index, GLfloat x );

+   void (GLAPIENTRYP VertexAttrib1fvARB)( GLuint index, const GLfloat *v );

+   void (GLAPIENTRYP VertexAttrib2fARB)( GLuint index, GLfloat x, GLfloat y );

+   void (GLAPIENTRYP VertexAttrib2fvARB)( GLuint index, const GLfloat *v );

+   void (GLAPIENTRYP VertexAttrib3fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z );

+   void (GLAPIENTRYP VertexAttrib3fvARB)( GLuint index, const GLfloat *v );

+   void (GLAPIENTRYP VertexAttrib4fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w );

+   void (GLAPIENTRYP VertexAttrib4fvARB)( GLuint index, const GLfloat *v );

+

+   /* GL_EXT_gpu_shader4 / GL 3.0 */

+   void (GLAPIENTRYP VertexAttribI1i)( GLuint index, GLint x);

+   void (GLAPIENTRYP VertexAttribI2i)( GLuint index, GLint x, GLint y);

+   void (GLAPIENTRYP VertexAttribI3i)( GLuint index, GLint x, GLint y, GLint z);

+   void (GLAPIENTRYP VertexAttribI4i)( GLuint index, GLint x, GLint y, GLint z, GLint w);

+   void (GLAPIENTRYP VertexAttribI2iv)( GLuint index, const GLint *v);

+   void (GLAPIENTRYP VertexAttribI3iv)( GLuint index, const GLint *v);

+   void (GLAPIENTRYP VertexAttribI4iv)( GLuint index, const GLint *v);

+

+   void (GLAPIENTRYP VertexAttribI1ui)( GLuint index, GLuint x);

+   void (GLAPIENTRYP VertexAttribI2ui)( GLuint index, GLuint x, GLuint y);

+   void (GLAPIENTRYP VertexAttribI3ui)( GLuint index, GLuint x, GLuint y, GLuint z);

+   void (GLAPIENTRYP VertexAttribI4ui)( GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);

+   void (GLAPIENTRYP VertexAttribI2uiv)( GLuint index, const GLuint *v);

+   void (GLAPIENTRYP VertexAttribI3uiv)( GLuint index, const GLuint *v);

+   void (GLAPIENTRYP VertexAttribI4uiv)( GLuint index, const GLuint *v);

+

+   /*@}*/

+

+   void (GLAPIENTRYP Rectf)( GLfloat, GLfloat, GLfloat, GLfloat );

+

+   /**

+    * \name Array

+    */

+   /*@{*/

+   void (GLAPIENTRYP DrawArrays)( GLenum mode, GLint start, GLsizei count );

+   void (GLAPIENTRYP DrawElements)( GLenum mode, GLsizei count, GLenum type,

+			 const GLvoid *indices );

+   void (GLAPIENTRYP DrawRangeElements)( GLenum mode, GLuint start,

+			      GLuint end, GLsizei count,

+			      GLenum type, const GLvoid *indices );

+   void (GLAPIENTRYP MultiDrawElementsEXT)( GLenum mode, const GLsizei *count,

+					    GLenum type,

+					    const GLvoid **indices,

+					    GLsizei primcount);

+   void (GLAPIENTRYP DrawElementsBaseVertex)( GLenum mode, GLsizei count,

+					      GLenum type,

+					      const GLvoid *indices,

+					      GLint basevertex );

+   void (GLAPIENTRYP DrawRangeElementsBaseVertex)( GLenum mode, GLuint start,

+						   GLuint end, GLsizei count,

+						   GLenum type,

+						   const GLvoid *indices,

+						   GLint basevertex);

+   void (GLAPIENTRYP MultiDrawElementsBaseVertex)( GLenum mode,

+						   const GLsizei *count,

+						   GLenum type,

+						   const GLvoid **indices,

+						   GLsizei primcount,

+						   const GLint *basevertex);

+   void (GLAPIENTRYP DrawArraysInstanced)(GLenum mode, GLint first,

+                                          GLsizei count, GLsizei primcount);

+   void (GLAPIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count,

+                                            GLenum type, const GLvoid *indices,

+                                            GLsizei primcount);

+   /*@}*/

+

+   /**

+    * \name Eval

+    *

+    * If you don't support eval, fallback to the default vertex format

+    * on receiving an eval call and use the pipeline mechanism to

+    * provide partial T&L acceleration.

+    *

+    * Mesa will provide a set of helper functions to do eval within

+    * accelerated vertex formats, eventually...

+    */

+   /*@{*/

+   void (GLAPIENTRYP EvalMesh1)( GLenum mode, GLint i1, GLint i2 );

+   void (GLAPIENTRYP EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );

+   /*@}*/

+

+} GLvertexformat;

+

+

+#endif /* DD_INCLUDED */

diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c
index 526145aec..f0752d1a3 100644
--- a/mesalib/src/mesa/main/debug.c
+++ b/mesalib/src/mesa/main/debug.c
@@ -1,636 +1,633 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 "mtypes.h"
-#include "attrib.h"
-#include "colormac.h"
-#include "enums.h"
-#include "formats.h"
-#include "hash.h"
-#include "imports.h"
-#include "debug.h"
-#include "get.h"
-#include "pixelstore.h"
-#include "readpix.h"
-#include "texobj.h"
-
-
-/**
- * Primitive names
- */
-const char *_mesa_prim_name[GL_POLYGON+4] = {
-   "GL_POINTS",
-   "GL_LINES",
-   "GL_LINE_LOOP",
-   "GL_LINE_STRIP",
-   "GL_TRIANGLES",
-   "GL_TRIANGLE_STRIP",
-   "GL_TRIANGLE_FAN",
-   "GL_QUADS",
-   "GL_QUAD_STRIP",
-   "GL_POLYGON",
-   "outside begin/end",
-   "inside unknown primitive",
-   "unknown state"
-};
-
-
-static const char *
-tex_target_name(GLenum tgt)
-{
-   static const struct {
-      GLenum target;
-      const char *name;
-   } tex_targets[] = {
-      { GL_TEXTURE_1D, "GL_TEXTURE_1D" },
-      { GL_TEXTURE_2D, "GL_TEXTURE_2D" },
-      { GL_TEXTURE_3D, "GL_TEXTURE_3D" },
-      { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" },
-      { GL_TEXTURE_RECTANGLE, "GL_TEXTURE_RECTANGLE" },
-      { GL_TEXTURE_1D_ARRAY_EXT, "GL_TEXTURE_1D_ARRAY" },
-      { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" }
-   };
-   GLuint i;
-   for (i = 0; i < Elements(tex_targets); i++) {
-      if (tex_targets[i].target == tgt)
-         return tex_targets[i].name;
-   }
-   return "UNKNOWN TEX TARGET";
-}
-
-
-void
-_mesa_print_state( const char *msg, GLuint state )
-{
-   _mesa_debug(NULL,
-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
-	   msg,
-	   state,
-	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",
-	   (state & _NEW_PROJECTION)      ? "ctx->Projection, " : "",
-	   (state & _NEW_TEXTURE_MATRIX)  ? "ctx->TextureMatrix, " : "",
-	   (state & _NEW_COLOR_MATRIX)    ? "ctx->ColorMatrix, " : "",
-	   (state & _NEW_ACCUM)           ? "ctx->Accum, " : "",
-	   (state & _NEW_COLOR)           ? "ctx->Color, " : "",
-	   (state & _NEW_DEPTH)           ? "ctx->Depth, " : "",
-	   (state & _NEW_EVAL)            ? "ctx->Eval/EvalMap, " : "",
-	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",
-	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",
-	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",
-	   (state & _NEW_LINE)            ? "ctx->Line, " : "",
-	   (state & _NEW_PIXEL)           ? "ctx->Pixel, " : "",
-	   (state & _NEW_POINT)           ? "ctx->Point, " : "",
-	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",
-	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",
-	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",
-	   (state & _NEW_STENCIL)         ? "ctx->Stencil, " : "",
-	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",
-	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",
-	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",
-	   (state & _NEW_PACKUNPACK)      ? "ctx->Pack/Unpack, " : "",
-	   (state & _NEW_ARRAY)           ? "ctx->Array, " : "",
-	   (state & _NEW_RENDERMODE)      ? "ctx->RenderMode, " : "",
-	   (state & _NEW_BUFFERS)         ? "ctx->Visual, ctx->DrawBuffer,, " : "");
-}
-
-
-
-void
-_mesa_print_tri_caps( const char *name, GLuint flags )
-{
-   _mesa_debug(NULL,
-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
-	   name,
-	   flags,
-	   (flags & DD_FLATSHADE)           ? "flat-shade, " : "",
-	   (flags & DD_SEPARATE_SPECULAR)   ? "separate-specular, " : "",
-	   (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",
-	   (flags & DD_TRI_TWOSTENCIL)      ? "tri-twostencil, " : "",
-	   (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",
-	   (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",
-	   (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",
-	   (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : "",
-	   (flags & DD_LINE_SMOOTH)         ? "line-smooth, " : "",
-	   (flags & DD_LINE_STIPPLE)        ? "line-stipple, " : "",
-	   (flags & DD_LINE_WIDTH)          ? "line-wide, " : "",
-	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "",
-	   (flags & DD_POINT_SIZE)          ? "point-size, " : "",
-	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "",
-	   (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : ""
-      );
-}
-
-
-/**
- * Print information about this Mesa version and build options.
- */
-void _mesa_print_info( void )
-{
-   _mesa_debug(NULL, "Mesa GL_VERSION = %s\n",
-	   (char *) _mesa_GetString(GL_VERSION));
-   _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n",
-	   (char *) _mesa_GetString(GL_RENDERER));
-   _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n",
-	   (char *) _mesa_GetString(GL_VENDOR));
-   _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n",
-	   (char *) _mesa_GetString(GL_EXTENSIONS));
-#if defined(THREADS)
-   _mesa_debug(NULL, "Mesa thread-safe: YES\n");
-#else
-   _mesa_debug(NULL, "Mesa thread-safe: NO\n");
-#endif
-#if defined(USE_X86_ASM)
-   _mesa_debug(NULL, "Mesa x86-optimized: YES\n");
-#else
-   _mesa_debug(NULL, "Mesa x86-optimized: NO\n");
-#endif
-#if defined(USE_SPARC_ASM)
-   _mesa_debug(NULL, "Mesa sparc-optimized: YES\n");
-#else
-   _mesa_debug(NULL, "Mesa sparc-optimized: NO\n");
-#endif
-}
-
-
-/**
- * Set the debugging flags.
- *
- * \param debug debug string
- *
- * If compiled with debugging support then search for keywords in \p debug and
- * enables the verbose debug output of the respective feature.
- */
-static void add_debug_flags( const char *debug )
-{
-#ifdef DEBUG
-   struct debug_option {
-      const char *name;
-      GLbitfield flag;
-   };
-   static const struct debug_option debug_opt[] = {
-      { "varray",    VERBOSE_VARRAY },
-      { "tex",       VERBOSE_TEXTURE },
-      { "mat",       VERBOSE_MATERIAL },
-      { "pipe",      VERBOSE_PIPELINE },
-      { "driver",    VERBOSE_DRIVER },
-      { "state",     VERBOSE_STATE },
-      { "api",       VERBOSE_API },
-      { "list",      VERBOSE_DISPLAY_LIST },
-      { "lighting",  VERBOSE_LIGHTING },
-      { "disassem",  VERBOSE_DISASSEM },
-      { "draw",      VERBOSE_DRAW },
-      { "swap",      VERBOSE_SWAPBUFFERS }
-   };
-   GLuint i;
-
-   MESA_VERBOSE = 0x0;
-   for (i = 0; i < Elements(debug_opt); i++) {
-      if (strstr(debug, debug_opt[i].name))
-         MESA_VERBOSE |= debug_opt[i].flag;
-   }
-
-   /* Debug flag:
-    */
-   if (strstr(debug, "flush"))
-      MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;
-
-#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
-   if (strstr(debug, "fpexceptions")) {
-      /* raise FP exceptions */
-      fpu_control_t mask;
-      _FPU_GETCW(mask);
-      mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM
-                | _FPU_MASK_OM | _FPU_MASK_UM);
-      _FPU_SETCW(mask);
-   }
-#endif
-
-#else
-   (void) debug;
-#endif
-}
-
-
-void 
-_mesa_init_debug( GLcontext *ctx )
-{
-   char *c;
-
-   /* Dither disable */
-   ctx->NoDither = _mesa_getenv("MESA_NO_DITHER") ? GL_TRUE : GL_FALSE;
-   if (ctx->NoDither) {
-      if (_mesa_getenv("MESA_DEBUG")) {
-         _mesa_debug(ctx, "MESA_NO_DITHER set - dithering disabled\n");
-      }
-      ctx->Color.DitherFlag = GL_FALSE;
-   }
-
-   c = _mesa_getenv("MESA_DEBUG");
-   if (c)
-      add_debug_flags(c);
-
-   c = _mesa_getenv("MESA_VERBOSE");
-   if (c)
-      add_debug_flags(c);
-}
-
-
-/*
- * Write ppm file
- */
-static void
-write_ppm(const char *filename, const GLubyte *buffer, int width, int height,
-          int comps, int rcomp, int gcomp, int bcomp, GLboolean invert)
-{
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int x, y;
-      const GLubyte *ptr = buffer;
-      fprintf(f,"P6\n");
-      fprintf(f,"# ppm-file created by osdemo.c\n");
-      fprintf(f,"%i %i\n", width,height);
-      fprintf(f,"255\n");
-      fclose(f);
-      f = fopen( filename, "ab" );  /* reopen in binary append mode */
-      for (y=0; y < height; y++) {
-         for (x = 0; x < width; x++) {
-            int yy = invert ? (height - 1 - y) : y;
-            int i = (yy * width + x) * comps;
-            fputc(ptr[i+rcomp], f); /* write red */
-            fputc(ptr[i+gcomp], f); /* write green */
-            fputc(ptr[i+bcomp], f); /* write blue */
-         }
-      }
-      fclose(f);
-   }
-}
-
-
-/**
- * Write a texture image to a ppm file.
- * \param face  cube face in [0,5]
- * \param level  mipmap level
- */
-static void
-write_texture_image(struct gl_texture_object *texObj,
-                    GLuint face, GLuint level)
-{
-   struct gl_texture_image *img = texObj->Image[face][level];
-   if (img) {
-      GET_CURRENT_CONTEXT(ctx);
-      struct gl_pixelstore_attrib store;
-      GLubyte *buffer;
-      char s[100];
-
-      buffer = (GLubyte *) malloc(img->Width * img->Height
-                                        * img->Depth * 4);
-
-      store = ctx->Pack; /* save */
-      ctx->Pack = ctx->DefaultPacking;
-
-      ctx->Driver.GetTexImage(ctx, texObj->Target, level,
-                              GL_RGBA, GL_UNSIGNED_BYTE,
-                              buffer, texObj, img);
-
-      /* make filename */
-      _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
-
-      printf("  Writing image level %u to %s\n", level, s);
-      write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);
-
-      ctx->Pack = store; /* restore */
-
-      free(buffer);
-   }
-}
-
-
-/**
- * Write renderbuffer image to a ppm file.
- */
-static void
-write_renderbuffer_image(const struct gl_renderbuffer *rb)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLubyte *buffer;
-   char s[100];
-   GLenum format, type;
-
-   if (rb->_BaseFormat == GL_RGB || 
-       rb->_BaseFormat == GL_RGBA) {
-      format = GL_RGBA;
-      type = GL_UNSIGNED_BYTE;
-   }
-   else if (rb->_BaseFormat == GL_DEPTH_STENCIL) {
-      format = GL_DEPTH_STENCIL;
-      type = GL_UNSIGNED_INT_24_8;
-   }
-   else {
-      return;
-   }
-
-   buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4);
-
-   ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height,
-                          format, type, &ctx->DefaultPacking, buffer);
-
-   /* make filename */
-   _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer%u.ppm", rb->Name);
-
-   printf("  Writing renderbuffer image to %s\n", s);
-   write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);
-
-   free(buffer);
-}
-
-
-/** How many texture images (mipmap levels, faces) to write to files */
-#define WRITE_NONE 0
-#define WRITE_ONE  1
-#define WRITE_ALL  2
-
-static GLuint WriteImages;
-
-
-static void
-dump_texture(struct gl_texture_object *texObj, GLuint writeImages)
-{
-   const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
-   GLboolean written = GL_FALSE;
-   GLuint i, j;
-
-   printf("Texture %u\n", texObj->Name);
-   printf("  Target %s\n", tex_target_name(texObj->Target));
-   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
-      for (j = 0; j < numFaces; j++) {
-         struct gl_texture_image *texImg = texObj->Image[j][i];
-         if (texImg) {
-            printf("  Face %u level %u: %d x %d x %d, format %s at %p\n",
-		   j, i,
-		   texImg->Width, texImg->Height, texImg->Depth,
-		   _mesa_get_format_name(texImg->TexFormat),
-		   texImg->Data);
-            if (writeImages == WRITE_ALL ||
-                (writeImages == WRITE_ONE && !written)) {
-               write_texture_image(texObj, j, i);
-               written = GL_TRUE;
-            }
-         }
-      }
-   }
-}
-
-
-/**
- * Dump a single texture.
- */
-void
-_mesa_dump_texture(GLuint texture, GLuint writeImages)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);
-   if (texObj) {
-      dump_texture(texObj, writeImages);
-   }
-}
-
-
-static void
-dump_texture_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_texture_object *texObj = (struct gl_texture_object *) data;
-   (void) userData;
-   dump_texture(texObj, WriteImages);
-}
-
-
-/**
- * Print basic info about all texture objext to stdout.
- * If dumpImages is true, write PPM of level[0] image to a file.
- */
-void
-_mesa_dump_textures(GLuint writeImages)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   WriteImages = writeImages;
-   _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx);
-}
-
-
-static void
-dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)
-{
-   printf("Renderbuffer %u: %u x %u  IntFormat = %s\n",
-	  rb->Name, rb->Width, rb->Height,
-	  _mesa_lookup_enum_by_nr(rb->InternalFormat));
-   if (writeImage) {
-      write_renderbuffer_image(rb);
-   }
-}
-
-
-static void
-dump_renderbuffer_cb(GLuint id, void *data, void *userData)
-{
-   const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data;
-   (void) userData;
-   dump_renderbuffer(rb, WriteImages);
-}
-
-
-/**
- * Print basic info about all renderbuffers to stdout.
- * If dumpImages is true, write PPM of level[0] image to a file.
- */
-void
-_mesa_dump_renderbuffers(GLboolean writeImages)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   WriteImages = writeImages;
-   _mesa_HashWalk(ctx->Shared->RenderBuffers, dump_renderbuffer_cb, ctx);
-}
-
-
-
-void
-_mesa_dump_color_buffer(const char *filename)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint w = ctx->DrawBuffer->Width;
-   const GLuint h = ctx->DrawBuffer->Height;
-   GLubyte *buf;
-
-   buf = (GLubyte *) malloc(w * h * 4);
-
-   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
-   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
-
-   _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
-
-   printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
-	  (void *) ctx->ReadBuffer->_ColorReadBuffer,
-	  ctx->ReadBuffer->ColorReadBuffer,
-	  (void *) ctx->DrawBuffer->_ColorDrawBuffers[0],
-	  ctx->DrawBuffer->ColorDrawBuffer[0]);
-   printf("Writing %d x %d color buffer to %s\n", w, h, filename);
-   write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);
-
-   _mesa_PopClientAttrib();
-
-   free(buf);
-}
-
-
-void
-_mesa_dump_depth_buffer(const char *filename)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint w = ctx->DrawBuffer->Width;
-   const GLuint h = ctx->DrawBuffer->Height;
-   GLuint *buf;
-   GLubyte *buf2;
-   GLuint i;
-
-   buf = (GLuint *) malloc(w * h * 4);  /* 4 bpp */
-   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */
-
-   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
-   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
-
-   _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);
-
-   /* spread 24 bits of Z across R, G, B */
-   for (i = 0; i < w * h; i++) {
-      buf2[i*3+0] = (buf[i] >> 24) & 0xff;
-      buf2[i*3+1] = (buf[i] >> 16) & 0xff;
-      buf2[i*3+2] = (buf[i] >>  8) & 0xff;
-   }
-
-   printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
-   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
-
-   _mesa_PopClientAttrib();
-
-   free(buf);
-   free(buf2);
-}
-
-
-void
-_mesa_dump_stencil_buffer(const char *filename)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint w = ctx->DrawBuffer->Width;
-   const GLuint h = ctx->DrawBuffer->Height;
-   GLubyte *buf;
-   GLubyte *buf2;
-   GLuint i;
-
-   buf = (GLubyte *) malloc(w * h);  /* 1 bpp */
-   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */
-
-   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
-   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
-
-   _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);
-
-   for (i = 0; i < w * h; i++) {
-      buf2[i*3+0] = buf[i];
-      buf2[i*3+1] = (buf[i] & 127) * 2;
-      buf2[i*3+2] = (buf[i] - 128) * 2;
-   }
-
-   printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
-   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
-
-   _mesa_PopClientAttrib();
-
-   free(buf);
-   free(buf2);
-}
-
-
-/**
- * Quick and dirty function to "print" a texture to stdout.
- */
-void
-_mesa_print_texture(GLcontext *ctx, const struct gl_texture_image *img)
-{
-#if CHAN_TYPE != GL_UNSIGNED_BYTE
-   _mesa_problem(NULL, "PrintTexture not supported");
-#else
-   GLuint i, j, c;
-   const GLubyte *data = (const GLubyte *) img->Data;
-
-   if (!data) {
-      printf("No texture data\n");
-      return;
-   }
-
-   /* XXX add more formats or make into a new format utility function */
-   switch (img->TexFormat) {
-      case MESA_FORMAT_A8:
-      case MESA_FORMAT_L8:
-      case MESA_FORMAT_I8:
-      case MESA_FORMAT_CI8:
-         c = 1;
-         break;
-      case MESA_FORMAT_AL88:
-      case MESA_FORMAT_AL88_REV:
-         c = 2;
-         break;
-      case MESA_FORMAT_RGB888:
-      case MESA_FORMAT_BGR888:
-         c = 3;
-         break;
-      case MESA_FORMAT_RGBA8888:
-      case MESA_FORMAT_ARGB8888:
-         c = 4;
-         break;
-      default:
-         _mesa_problem(NULL, "error in PrintTexture\n");
-         return;
-   }
-
-   for (i = 0; i < img->Height; i++) {
-      for (j = 0; j < img->Width; j++) {
-         if (c==1)
-            printf("%02x  ", data[0]);
-         else if (c==2)
-            printf("%02x%02x  ", data[0], data[1]);
-         else if (c==3)
-            printf("%02x%02x%02x  ", data[0], data[1], data[2]);
-         else if (c==4)
-            printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);
-         data += (img->RowStride - img->Width) * c;
-      }
-      /* XXX use img->ImageStride here */
-      printf("\n");
-   }
-#endif
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 "mtypes.h"

+#include "attrib.h"

+#include "colormac.h"

+#include "enums.h"

+#include "formats.h"

+#include "hash.h"

+#include "imports.h"

+#include "debug.h"

+#include "get.h"

+#include "pixelstore.h"

+#include "readpix.h"

+#include "texobj.h"

+

+

+/**

+ * Primitive names

+ */

+const char *_mesa_prim_name[GL_POLYGON+4] = {

+   "GL_POINTS",

+   "GL_LINES",

+   "GL_LINE_LOOP",

+   "GL_LINE_STRIP",

+   "GL_TRIANGLES",

+   "GL_TRIANGLE_STRIP",

+   "GL_TRIANGLE_FAN",

+   "GL_QUADS",

+   "GL_QUAD_STRIP",

+   "GL_POLYGON",

+   "outside begin/end",

+   "inside unknown primitive",

+   "unknown state"

+};

+

+

+static const char *

+tex_target_name(GLenum tgt)

+{

+   static const struct {

+      GLenum target;

+      const char *name;

+   } tex_targets[] = {

+      { GL_TEXTURE_1D, "GL_TEXTURE_1D" },

+      { GL_TEXTURE_2D, "GL_TEXTURE_2D" },

+      { GL_TEXTURE_3D, "GL_TEXTURE_3D" },

+      { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" },

+      { GL_TEXTURE_RECTANGLE, "GL_TEXTURE_RECTANGLE" },

+      { GL_TEXTURE_1D_ARRAY_EXT, "GL_TEXTURE_1D_ARRAY" },

+      { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" }

+   };

+   GLuint i;

+   for (i = 0; i < Elements(tex_targets); i++) {

+      if (tex_targets[i].target == tgt)

+         return tex_targets[i].name;

+   }

+   return "UNKNOWN TEX TARGET";

+}

+

+

+void

+_mesa_print_state( const char *msg, GLuint state )

+{

+   _mesa_debug(NULL,

+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",

+	   msg,

+	   state,

+	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",

+	   (state & _NEW_PROJECTION)      ? "ctx->Projection, " : "",

+	   (state & _NEW_TEXTURE_MATRIX)  ? "ctx->TextureMatrix, " : "",

+	   (state & _NEW_ACCUM)           ? "ctx->Accum, " : "",

+	   (state & _NEW_COLOR)           ? "ctx->Color, " : "",

+	   (state & _NEW_DEPTH)           ? "ctx->Depth, " : "",

+	   (state & _NEW_EVAL)            ? "ctx->Eval/EvalMap, " : "",

+	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",

+	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",

+	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",

+	   (state & _NEW_LINE)            ? "ctx->Line, " : "",

+	   (state & _NEW_PIXEL)           ? "ctx->Pixel, " : "",

+	   (state & _NEW_POINT)           ? "ctx->Point, " : "",

+	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",

+	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",

+	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",

+	   (state & _NEW_STENCIL)         ? "ctx->Stencil, " : "",

+	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",

+	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",

+	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",

+	   (state & _NEW_PACKUNPACK)      ? "ctx->Pack/Unpack, " : "",

+	   (state & _NEW_ARRAY)           ? "ctx->Array, " : "",

+	   (state & _NEW_RENDERMODE)      ? "ctx->RenderMode, " : "",

+	   (state & _NEW_BUFFERS)         ? "ctx->Visual, ctx->DrawBuffer,, " : "");

+}

+

+

+

+void

+_mesa_print_tri_caps( const char *name, GLuint flags )

+{

+   _mesa_debug(NULL,

+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s\n",

+	   name,

+	   flags,

+	   (flags & DD_FLATSHADE)           ? "flat-shade, " : "",

+	   (flags & DD_SEPARATE_SPECULAR)   ? "separate-specular, " : "",

+	   (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",

+	   (flags & DD_TRI_TWOSTENCIL)      ? "tri-twostencil, " : "",

+	   (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",

+	   (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",

+	   (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",

+	   (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : "",

+	   (flags & DD_LINE_SMOOTH)         ? "line-smooth, " : "",

+	   (flags & DD_LINE_STIPPLE)        ? "line-stipple, " : "",

+	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "",

+	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "",

+	   (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : ""

+      );

+}

+

+

+/**

+ * Print information about this Mesa version and build options.

+ */

+void _mesa_print_info( void )

+{

+   _mesa_debug(NULL, "Mesa GL_VERSION = %s\n",

+	   (char *) _mesa_GetString(GL_VERSION));

+   _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n",

+	   (char *) _mesa_GetString(GL_RENDERER));

+   _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n",

+	   (char *) _mesa_GetString(GL_VENDOR));

+   _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n",

+	   (char *) _mesa_GetString(GL_EXTENSIONS));

+#if defined(THREADS)

+   _mesa_debug(NULL, "Mesa thread-safe: YES\n");

+#else

+   _mesa_debug(NULL, "Mesa thread-safe: NO\n");

+#endif

+#if defined(USE_X86_ASM)

+   _mesa_debug(NULL, "Mesa x86-optimized: YES\n");

+#else

+   _mesa_debug(NULL, "Mesa x86-optimized: NO\n");

+#endif

+#if defined(USE_SPARC_ASM)

+   _mesa_debug(NULL, "Mesa sparc-optimized: YES\n");

+#else

+   _mesa_debug(NULL, "Mesa sparc-optimized: NO\n");

+#endif

+}

+

+

+/**

+ * Set the debugging flags.

+ *

+ * \param debug debug string

+ *

+ * If compiled with debugging support then search for keywords in \p debug and

+ * enables the verbose debug output of the respective feature.

+ */

+static void add_debug_flags( const char *debug )

+{

+#ifdef DEBUG

+   struct debug_option {

+      const char *name;

+      GLbitfield flag;

+   };

+   static const struct debug_option debug_opt[] = {

+      { "varray",    VERBOSE_VARRAY },

+      { "tex",       VERBOSE_TEXTURE },

+      { "mat",       VERBOSE_MATERIAL },

+      { "pipe",      VERBOSE_PIPELINE },

+      { "driver",    VERBOSE_DRIVER },

+      { "state",     VERBOSE_STATE },

+      { "api",       VERBOSE_API },

+      { "list",      VERBOSE_DISPLAY_LIST },

+      { "lighting",  VERBOSE_LIGHTING },

+      { "disassem",  VERBOSE_DISASSEM },

+      { "draw",      VERBOSE_DRAW },

+      { "swap",      VERBOSE_SWAPBUFFERS }

+   };

+   GLuint i;

+

+   MESA_VERBOSE = 0x0;

+   for (i = 0; i < Elements(debug_opt); i++) {

+      if (strstr(debug, debug_opt[i].name))

+         MESA_VERBOSE |= debug_opt[i].flag;

+   }

+

+   /* Debug flag:

+    */

+   if (strstr(debug, "flush"))

+      MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;

+

+#if defined(_FPU_GETCW) && defined(_FPU_SETCW)

+   if (strstr(debug, "fpexceptions")) {

+      /* raise FP exceptions */

+      fpu_control_t mask;

+      _FPU_GETCW(mask);

+      mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM

+                | _FPU_MASK_OM | _FPU_MASK_UM);

+      _FPU_SETCW(mask);

+   }

+#endif

+

+#else

+   (void) debug;

+#endif

+}

+

+

+void 

+_mesa_init_debug( struct gl_context *ctx )

+{

+   char *c;

+

+   /* Dither disable */

+   ctx->NoDither = _mesa_getenv("MESA_NO_DITHER") ? GL_TRUE : GL_FALSE;

+   if (ctx->NoDither) {

+      if (_mesa_getenv("MESA_DEBUG")) {

+         _mesa_debug(ctx, "MESA_NO_DITHER set - dithering disabled\n");

+      }

+      ctx->Color.DitherFlag = GL_FALSE;

+   }

+

+   c = _mesa_getenv("MESA_DEBUG");

+   if (c)

+      add_debug_flags(c);

+

+   c = _mesa_getenv("MESA_VERBOSE");

+   if (c)

+      add_debug_flags(c);

+}

+

+

+/*

+ * Write ppm file

+ */

+static void

+write_ppm(const char *filename, const GLubyte *buffer, int width, int height,

+          int comps, int rcomp, int gcomp, int bcomp, GLboolean invert)

+{

+   FILE *f = fopen( filename, "w" );

+   if (f) {

+      int x, y;

+      const GLubyte *ptr = buffer;

+      fprintf(f,"P6\n");

+      fprintf(f,"# ppm-file created by osdemo.c\n");

+      fprintf(f,"%i %i\n", width,height);

+      fprintf(f,"255\n");

+      fclose(f);

+      f = fopen( filename, "ab" );  /* reopen in binary append mode */

+      for (y=0; y < height; y++) {

+         for (x = 0; x < width; x++) {

+            int yy = invert ? (height - 1 - y) : y;

+            int i = (yy * width + x) * comps;

+            fputc(ptr[i+rcomp], f); /* write red */

+            fputc(ptr[i+gcomp], f); /* write green */

+            fputc(ptr[i+bcomp], f); /* write blue */

+         }

+      }

+      fclose(f);

+   }

+}

+

+

+/**

+ * Write a texture image to a ppm file.

+ * \param face  cube face in [0,5]

+ * \param level  mipmap level

+ */

+static void

+write_texture_image(struct gl_texture_object *texObj,

+                    GLuint face, GLuint level)

+{

+   struct gl_texture_image *img = texObj->Image[face][level];

+   if (img) {

+      GET_CURRENT_CONTEXT(ctx);

+      struct gl_pixelstore_attrib store;

+      GLubyte *buffer;

+      char s[100];

+

+      buffer = (GLubyte *) malloc(img->Width * img->Height

+                                        * img->Depth * 4);

+

+      store = ctx->Pack; /* save */

+      ctx->Pack = ctx->DefaultPacking;

+

+      ctx->Driver.GetTexImage(ctx, texObj->Target, level,

+                              GL_RGBA, GL_UNSIGNED_BYTE,

+                              buffer, texObj, img);

+

+      /* make filename */

+      _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);

+

+      printf("  Writing image level %u to %s\n", level, s);

+      write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);

+

+      ctx->Pack = store; /* restore */

+

+      free(buffer);

+   }

+}

+

+

+/**

+ * Write renderbuffer image to a ppm file.

+ */

+static void

+write_renderbuffer_image(const struct gl_renderbuffer *rb)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLubyte *buffer;

+   char s[100];

+   GLenum format, type;

+

+   if (rb->_BaseFormat == GL_RGB || 

+       rb->_BaseFormat == GL_RGBA) {

+      format = GL_RGBA;

+      type = GL_UNSIGNED_BYTE;

+   }

+   else if (rb->_BaseFormat == GL_DEPTH_STENCIL) {

+      format = GL_DEPTH_STENCIL;

+      type = GL_UNSIGNED_INT_24_8;

+   }

+   else {

+      return;

+   }

+

+   buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4);

+

+   ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height,

+                          format, type, &ctx->DefaultPacking, buffer);

+

+   /* make filename */

+   _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer%u.ppm", rb->Name);

+

+   printf("  Writing renderbuffer image to %s\n", s);

+   write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);

+

+   free(buffer);

+}

+

+

+/** How many texture images (mipmap levels, faces) to write to files */

+#define WRITE_NONE 0

+#define WRITE_ONE  1

+#define WRITE_ALL  2

+

+static GLuint WriteImages;

+

+

+static void

+dump_texture(struct gl_texture_object *texObj, GLuint writeImages)

+{

+   const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;

+   GLboolean written = GL_FALSE;

+   GLuint i, j;

+

+   printf("Texture %u\n", texObj->Name);

+   printf("  Target %s\n", tex_target_name(texObj->Target));

+   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {

+      for (j = 0; j < numFaces; j++) {

+         struct gl_texture_image *texImg = texObj->Image[j][i];

+         if (texImg) {

+            printf("  Face %u level %u: %d x %d x %d, format %s at %p\n",

+		   j, i,

+		   texImg->Width, texImg->Height, texImg->Depth,

+		   _mesa_get_format_name(texImg->TexFormat),

+		   texImg->Data);

+            if (writeImages == WRITE_ALL ||

+                (writeImages == WRITE_ONE && !written)) {

+               write_texture_image(texObj, j, i);

+               written = GL_TRUE;

+            }

+         }

+      }

+   }

+}

+

+

+/**

+ * Dump a single texture.

+ */

+void

+_mesa_dump_texture(GLuint texture, GLuint writeImages)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);

+   if (texObj) {

+      dump_texture(texObj, writeImages);

+   }

+}

+

+

+static void

+dump_texture_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_texture_object *texObj = (struct gl_texture_object *) data;

+   (void) userData;

+   dump_texture(texObj, WriteImages);

+}

+

+

+/**

+ * Print basic info about all texture objext to stdout.

+ * If dumpImages is true, write PPM of level[0] image to a file.

+ */

+void

+_mesa_dump_textures(GLuint writeImages)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   WriteImages = writeImages;

+   _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx);

+}

+

+

+static void

+dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)

+{

+   printf("Renderbuffer %u: %u x %u  IntFormat = %s\n",

+	  rb->Name, rb->Width, rb->Height,

+	  _mesa_lookup_enum_by_nr(rb->InternalFormat));

+   if (writeImage) {

+      write_renderbuffer_image(rb);

+   }

+}

+

+

+static void

+dump_renderbuffer_cb(GLuint id, void *data, void *userData)

+{

+   const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data;

+   (void) userData;

+   dump_renderbuffer(rb, WriteImages);

+}

+

+

+/**

+ * Print basic info about all renderbuffers to stdout.

+ * If dumpImages is true, write PPM of level[0] image to a file.

+ */

+void

+_mesa_dump_renderbuffers(GLboolean writeImages)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   WriteImages = writeImages;

+   _mesa_HashWalk(ctx->Shared->RenderBuffers, dump_renderbuffer_cb, ctx);

+}

+

+

+

+void

+_mesa_dump_color_buffer(const char *filename)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint w = ctx->DrawBuffer->Width;

+   const GLuint h = ctx->DrawBuffer->Height;

+   GLubyte *buf;

+

+   buf = (GLubyte *) malloc(w * h * 4);

+

+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);

+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);

+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);

+

+   _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);

+

+   printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",

+	  (void *) ctx->ReadBuffer->_ColorReadBuffer,

+	  ctx->ReadBuffer->ColorReadBuffer,

+	  (void *) ctx->DrawBuffer->_ColorDrawBuffers[0],

+	  ctx->DrawBuffer->ColorDrawBuffer[0]);

+   printf("Writing %d x %d color buffer to %s\n", w, h, filename);

+   write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);

+

+   _mesa_PopClientAttrib();

+

+   free(buf);

+}

+

+

+void

+_mesa_dump_depth_buffer(const char *filename)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint w = ctx->DrawBuffer->Width;

+   const GLuint h = ctx->DrawBuffer->Height;

+   GLuint *buf;

+   GLubyte *buf2;

+   GLuint i;

+

+   buf = (GLuint *) malloc(w * h * 4);  /* 4 bpp */

+   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */

+

+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);

+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);

+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);

+

+   _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);

+

+   /* spread 24 bits of Z across R, G, B */

+   for (i = 0; i < w * h; i++) {

+      buf2[i*3+0] = (buf[i] >> 24) & 0xff;

+      buf2[i*3+1] = (buf[i] >> 16) & 0xff;

+      buf2[i*3+2] = (buf[i] >>  8) & 0xff;

+   }

+

+   printf("Writing %d x %d depth buffer to %s\n", w, h, filename);

+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);

+

+   _mesa_PopClientAttrib();

+

+   free(buf);

+   free(buf2);

+}

+

+

+void

+_mesa_dump_stencil_buffer(const char *filename)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint w = ctx->DrawBuffer->Width;

+   const GLuint h = ctx->DrawBuffer->Height;

+   GLubyte *buf;

+   GLubyte *buf2;

+   GLuint i;

+

+   buf = (GLubyte *) malloc(w * h);  /* 1 bpp */

+   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */

+

+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);

+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);

+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);

+

+   _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);

+

+   for (i = 0; i < w * h; i++) {

+      buf2[i*3+0] = buf[i];

+      buf2[i*3+1] = (buf[i] & 127) * 2;

+      buf2[i*3+2] = (buf[i] - 128) * 2;

+   }

+

+   printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);

+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);

+

+   _mesa_PopClientAttrib();

+

+   free(buf);

+   free(buf2);

+}

+

+

+/**

+ * Quick and dirty function to "print" a texture to stdout.

+ */

+void

+_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img)

+{

+#if CHAN_TYPE != GL_UNSIGNED_BYTE

+   _mesa_problem(NULL, "PrintTexture not supported");

+#else

+   GLuint i, j, c;

+   const GLubyte *data = (const GLubyte *) img->Data;

+

+   if (!data) {

+      printf("No texture data\n");

+      return;

+   }

+

+   /* XXX add more formats or make into a new format utility function */

+   switch (img->TexFormat) {

+      case MESA_FORMAT_A8:

+      case MESA_FORMAT_L8:

+      case MESA_FORMAT_I8:

+      case MESA_FORMAT_CI8:

+         c = 1;

+         break;

+      case MESA_FORMAT_AL88:

+      case MESA_FORMAT_AL88_REV:

+         c = 2;

+         break;

+      case MESA_FORMAT_RGB888:

+      case MESA_FORMAT_BGR888:

+         c = 3;

+         break;

+      case MESA_FORMAT_RGBA8888:

+      case MESA_FORMAT_ARGB8888:

+         c = 4;

+         break;

+      default:

+         _mesa_problem(NULL, "error in PrintTexture\n");

+         return;

+   }

+

+   for (i = 0; i < img->Height; i++) {

+      for (j = 0; j < img->Width; j++) {

+         if (c==1)

+            printf("%02x  ", data[0]);

+         else if (c==2)

+            printf("%02x%02x  ", data[0], data[1]);

+         else if (c==3)

+            printf("%02x%02x%02x  ", data[0], data[1], data[2]);

+         else if (c==4)

+            printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);

+         data += (img->RowStride - img->Width) * c;

+      }

+      /* XXX use img->ImageStride here */

+      printf("\n");

+   }

+#endif

+}

diff --git a/mesalib/src/mesa/main/debug.h b/mesalib/src/mesa/main/debug.h
index b517cc825..ea397b72b 100644
--- a/mesalib/src/mesa/main/debug.h
+++ b/mesalib/src/mesa/main/debug.h
@@ -1,84 +1,87 @@
-/*
- * 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 "mtypes.h"
-
-#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( GLcontext *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_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_print_texture(GLcontext *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_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_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 f187205b9..9ab08df29 100644
--- a/mesalib/src/mesa/main/depth.c
+++ b/mesalib/src/mesa/main/depth.c
@@ -1,162 +1,162 @@
-/*
- * 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);
-
-   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_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 (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(GLcontext *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);

+

+   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_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 (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/depth.h b/mesalib/src/mesa/main/depth.h
index dcc0b4637..2a0bc81a6 100644
--- a/mesalib/src/mesa/main/depth.h
+++ b/mesalib/src/mesa/main/depth.h
@@ -1,62 +1,65 @@
-/**
- * \file depth.h
- * Depth buffer operations.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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 DEPTH_H
-#define DEPTH_H
-
-
-#include "mtypes.h"
-
-
-#if _HAVE_FULL_GL
-
-extern void GLAPIENTRY
-_mesa_ClearDepth( GLclampd depth );
-
-extern void GLAPIENTRY
-_mesa_DepthFunc( GLenum func );
-
-extern void GLAPIENTRY
-_mesa_DepthMask( GLboolean flag );
-
-extern void GLAPIENTRY
-_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );
-
-extern void 
-_mesa_init_depth( GLcontext * ctx );
-
-#else
-
-/** No-op */
-#define _mesa_init_depth( c ) ((void)0)
-
-#endif
-
-#endif
+/**

+ * \file depth.h

+ * Depth buffer operations.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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 DEPTH_H

+#define DEPTH_H

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+

+

+#if _HAVE_FULL_GL

+

+extern void GLAPIENTRY

+_mesa_ClearDepth( GLclampd depth );

+

+extern void GLAPIENTRY

+_mesa_DepthFunc( GLenum func );

+

+extern void GLAPIENTRY

+_mesa_DepthMask( GLboolean flag );

+

+extern void GLAPIENTRY

+_mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );

+

+extern void 

+_mesa_init_depth( struct gl_context * ctx );

+

+#else

+

+/** No-op */

+#define _mesa_init_depth( c ) ((void)0)

+

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/depthstencil.c b/mesalib/src/mesa/main/depthstencil.c
index dbaa84164..a1f206b9c 100644
--- a/mesalib/src/mesa/main/depthstencil.c
+++ b/mesalib/src/mesa/main/depthstencil.c
@@ -1,832 +1,832 @@
-/*
- * 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.
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "formats.h"
-#include "mtypes.h"
-#include "depthstencil.h"
-#include "renderbuffer.h"
-
-
-/**
- * Adaptor/wrappers for GL_DEPTH_STENCIL renderbuffers.
- *
- * The problem with a GL_DEPTH_STENCIL renderbuffer is that sometimes we
- * want to treat it as a stencil buffer, other times we want to treat it
- * as a depth/z buffer and still other times when we want to treat it as
- * a combined Z+stencil buffer!  That implies we need three different sets
- * of Get/Put functions.
- *
- * We solve this by wrapping the Z24_S8 or S8_Z24 renderbuffer with depth and
- * stencil adaptors, each with the right kind of depth/stencil Get/Put functions.
- */
-
-
-static void *
-nop_get_pointer(GLcontext *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
-{
-   (void) ctx;
-   (void) rb;
-   (void) x;
-   (void) y;
-   return NULL;
-}
-
-
-/**
- * Delete a depth or stencil wrapper renderbuffer.
- */
-static void
-delete_wrapper(struct gl_renderbuffer *rb)
-{
-   ASSERT(rb->Format == MESA_FORMAT_S8 ||
-          rb->Format == MESA_FORMAT_X8_Z24);
-   _mesa_reference_renderbuffer(&rb->Wrapped, NULL);
-   free(rb);
-}
-
-
-/**
- * Realloc storage for wrapper.
- */
-static GLboolean
-alloc_wrapper_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      GLenum internalFormat, GLuint width, GLuint height)
-{
-   /* just pass this on to the wrapped renderbuffer */
-   struct gl_renderbuffer *dsrb = rb->Wrapped;
-   GLboolean retVal;
-
-   (void) internalFormat;
-
-   ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||
-          dsrb->Format == MESA_FORMAT_Z24_X8 ||
-          dsrb->Format == MESA_FORMAT_S8_Z24 ||
-          dsrb->Format == MESA_FORMAT_X8_Z24);
-
-   retVal = dsrb->AllocStorage(ctx, dsrb, dsrb->InternalFormat, width, height);
-   if (retVal) {
-      rb->Width = width;
-      rb->Height = height;
-   }
-   return retVal;
-}
-
-
-
-
-/*======================================================================
- * Depth wrapper around depth/stencil renderbuffer
- */
-
-static void
-get_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
-            GLint x, GLint y, void *values)
-{
-   struct gl_renderbuffer *dsrb = z24rb->Wrapped;
-   GLuint temp[MAX_WIDTH], i;
-   GLuint *dst = (GLuint *) values;
-   const GLuint *src = (const GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);
-   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (!src) {
-      dsrb->GetRow(ctx, dsrb, count, x, y, temp);
-      src = temp;
-   }
-   if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-      for (i = 0; i < count; i++) {
-         dst[i] = src[i] >> 8;
-      }
-   }
-   else {
-      assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-      for (i = 0; i < count; i++) {
-         dst[i] = src[i] & 0xffffff;
-      }
-   }
-}
-
-static void
-get_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
-               const GLint x[], const GLint y[], void *values)
-{
-   struct gl_renderbuffer *dsrb = z24rb->Wrapped;
-   GLuint temp[MAX_WIDTH], i;
-   GLuint *dst = (GLuint *) values;
-   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   ASSERT(count <= MAX_WIDTH);
-   /* don't bother trying direct access */
-   dsrb->GetValues(ctx, dsrb, count, x, y, temp);
-   if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-      for (i = 0; i < count; i++) {
-         dst[i] = temp[i] >> 8;
-      }
-   }
-   else {
-      assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-      for (i = 0; i < count; i++) {
-         dst[i] = temp[i] & 0xffffff;
-      }
-   }
-}
-
-static void
-put_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
-            GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = z24rb->Wrapped;
-   const GLuint *src = (const GLuint *) values;
-   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);
-   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (dst) {
-      /* direct access */
-      GLuint i;
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = (src[i] << 8) | (dst[i] & 0xff);
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = (src[i] & 0xffffff) | (dst[i] & 0xff000000);
-            }
-         }
-      }
-   }
-   else {
-      /* get, modify, put */
-      GLuint temp[MAX_WIDTH], i;
-      dsrb->GetRow(ctx, dsrb, count, x, y, temp);
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (src[i] << 8) | (temp[i] & 0xff);
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (src[i] & 0xffffff) | (temp[i] & 0xff000000);
-            }
-         }
-      }
-      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);
-   }
-}
-
-static void
-put_mono_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
-                 GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = z24rb->Wrapped;
-   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);
-   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (dst) {
-      /* direct access */
-      GLuint i;
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         const GLuint shiftedVal = *((GLuint *) value) << 8;
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = shiftedVal | (dst[i] & 0xff);
-            }
-         }
-      }
-      else {
-         const GLuint shiftedVal = *((GLuint *) value);
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = shiftedVal | (dst[i] & 0xff000000);
-            }
-         }
-      }
-   }
-   else {
-      /* get, modify, put */
-      GLuint temp[MAX_WIDTH], i;
-      dsrb->GetRow(ctx, dsrb, count, x, y, temp);
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         const GLuint shiftedVal = *((GLuint *) value) << 8;
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = shiftedVal | (temp[i] & 0xff);
-            }
-         }
-      }
-      else {
-         const GLuint shiftedVal = *((GLuint *) value);
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = shiftedVal | (temp[i] & 0xff000000);
-            }
-         }
-      }
-      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);
-   }
-}
-
-static void
-put_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
-               const GLint x[], const GLint y[],
-               const void *values, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = z24rb->Wrapped;
-   const GLuint *src = (const GLuint *) values;
-   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (dsrb->GetPointer(ctx, dsrb, 0, 0)) {
-      /* direct access */
-      GLuint i;
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);
-               *dst = (src[i] << 8) | (*dst & 0xff);
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);
-               *dst = (src[i] & 0xffffff) | (*dst & 0xff000000);
-            }
-         }
-      }
-   }
-   else {
-      /* get, modify, put */
-      GLuint temp[MAX_WIDTH], i;
-      dsrb->GetValues(ctx, dsrb, count, x, y, temp);
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (src[i] << 8) | (temp[i] & 0xff);
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (src[i] & 0xffffff) | (temp[i] & 0xff000000);
-            }
-         }
-      }
-      dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);
-   }
-}
-
-static void
-put_mono_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb,
-                    GLuint count, const GLint x[], const GLint y[],
-                    const void *value, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = z24rb->Wrapped;
-   GLuint temp[MAX_WIDTH], i;
-   /* get, modify, put */
-   dsrb->GetValues(ctx, dsrb, count, x, y, temp);
-   if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-      const GLuint shiftedVal = *((GLuint *) value) << 8;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            temp[i] = shiftedVal | (temp[i] & 0xff);
-         }
-      }
-   }
-   else {
-      const GLuint shiftedVal = *((GLuint *) value);
-      assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            temp[i] = shiftedVal | (temp[i] & 0xff000000);
-         }
-      }
-   }
-   dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);
-}
-
-
-/**
- * Wrap the given GL_DEPTH_STENCIL renderbuffer so that it acts like
- * a depth renderbuffer.
- * \return new depth renderbuffer
- */
-struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
-                                   struct gl_renderbuffer *dsrb)
-{
-   struct gl_renderbuffer *z24rb;
-
-   ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||
-          dsrb->Format == MESA_FORMAT_Z24_X8 ||
-          dsrb->Format == MESA_FORMAT_S8_Z24 ||
-          dsrb->Format == MESA_FORMAT_X8_Z24);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-
-   z24rb = ctx->Driver.NewRenderbuffer(ctx, 0);
-   if (!z24rb)
-      return NULL;
-
-   /* NOTE: need to do manual refcounting here */
-   z24rb->Wrapped = dsrb;
-   dsrb->RefCount++;
-
-   z24rb->Name = dsrb->Name;
-   z24rb->RefCount = 0;
-   z24rb->Width = dsrb->Width;
-   z24rb->Height = dsrb->Height;
-   z24rb->InternalFormat = GL_DEPTH_COMPONENT24;
-   z24rb->Format = MESA_FORMAT_X8_Z24;
-   z24rb->_BaseFormat = GL_DEPTH_COMPONENT;
-   z24rb->DataType = GL_UNSIGNED_INT;
-   z24rb->Data = NULL;
-   z24rb->Delete = delete_wrapper;
-   z24rb->AllocStorage = alloc_wrapper_storage;
-   z24rb->GetPointer = nop_get_pointer;
-   z24rb->GetRow = get_row_z24;
-   z24rb->GetValues = get_values_z24;
-   z24rb->PutRow = put_row_z24;
-   z24rb->PutRowRGB = NULL;
-   z24rb->PutMonoRow = put_mono_row_z24;
-   z24rb->PutValues = put_values_z24;
-   z24rb->PutMonoValues = put_mono_values_z24;
-
-   return z24rb;
-}
-
-
-/*======================================================================
- * Stencil wrapper around depth/stencil renderbuffer
- */
-
-static void
-get_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
-           GLint x, GLint y, void *values)
-{
-   struct gl_renderbuffer *dsrb = s8rb->Wrapped;
-   GLuint temp[MAX_WIDTH], i;
-   GLubyte *dst = (GLubyte *) values;
-   const GLuint *src = (const GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);
-   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (!src) {
-      dsrb->GetRow(ctx, dsrb, count, x, y, temp);
-      src = temp;
-   }
-   if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-      for (i = 0; i < count; i++) {
-         dst[i] = src[i] & 0xff;
-      }
-   }
-   else {
-      assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-      for (i = 0; i < count; i++) {
-         dst[i] = src[i] >> 24;
-      }
-   }
-}
-
-static void
-get_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
-              const GLint x[], const GLint y[], void *values)
-{
-   struct gl_renderbuffer *dsrb = s8rb->Wrapped;
-   GLuint temp[MAX_WIDTH], i;
-   GLubyte *dst = (GLubyte *) values;
-   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   ASSERT(count <= MAX_WIDTH);
-   /* don't bother trying direct access */
-   dsrb->GetValues(ctx, dsrb, count, x, y, temp);
-   if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-      for (i = 0; i < count; i++) {
-         dst[i] = temp[i] & 0xff;
-      }
-   }
-   else {
-      assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-      for (i = 0; i < count; i++) {
-         dst[i] = temp[i] >> 24;
-      }
-   }
-}
-
-static void
-put_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
-           GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = s8rb->Wrapped;
-   const GLubyte *src = (const GLubyte *) values;
-   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);
-   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (dst) {
-      /* direct access */
-      GLuint i;
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = (dst[i] & 0xffffff00) | src[i];
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = (dst[i] & 0xffffff) | (src[i] << 24);
-            }
-         }
-      }
-   }
-   else {
-      /* get, modify, put */
-      GLuint temp[MAX_WIDTH], i;
-      dsrb->GetRow(ctx, dsrb, count, x, y, temp);
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (temp[i] & 0xffffff00) | src[i];
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (temp[i] & 0xffffff) | (src[i] << 24);
-            }
-         }
-      }
-      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);
-   }
-}
-
-static void
-put_mono_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
-                GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = s8rb->Wrapped;
-   const GLubyte val = *((GLubyte *) value);
-   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);
-   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (dst) {
-      /* direct access */
-      GLuint i;
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = (dst[i] & 0xffffff00) | val;
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               dst[i] = (dst[i] & 0xffffff) | (val << 24);
-            }
-         }
-      }
-   }
-   else {
-      /* get, modify, put */
-      GLuint temp[MAX_WIDTH], i;
-      dsrb->GetRow(ctx, dsrb, count, x, y, temp);
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (temp[i] & 0xffffff00) | val;
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (temp[i] & 0xffffff) | (val << 24);
-            }
-         }
-      }
-      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);
-   }
-}
-
-static void
-put_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
-              const GLint x[], const GLint y[],
-              const void *values, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = s8rb->Wrapped;
-   const GLubyte *src = (const GLubyte *) values;
-   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   if (dsrb->GetPointer(ctx, dsrb, 0, 0)) {
-      /* direct access */
-      GLuint i;
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);
-               *dst = (*dst & 0xffffff00) | src[i];
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);
-               *dst = (*dst & 0xffffff) | (src[i] << 24);
-            }
-         }
-      }
-   }
-   else {
-      /* get, modify, put */
-      GLuint temp[MAX_WIDTH], i;
-      dsrb->GetValues(ctx, dsrb, count, x, y, temp);
-      if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (temp[i] & 0xffffff00) | src[i];
-            }
-         }
-      }
-      else {
-         assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-         for (i = 0; i < count; i++) {
-            if (!mask || mask[i]) {
-               temp[i] = (temp[i] & 0xffffff) | (src[i] << 24);
-            }
-         }
-      }
-      dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);
-   }
-}
-
-static void
-put_mono_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
-                   const GLint x[], const GLint y[],
-                   const void *value, const GLubyte *mask)
-{
-   struct gl_renderbuffer *dsrb = s8rb->Wrapped;
-   GLuint temp[MAX_WIDTH], i;
-   const GLubyte val = *((GLubyte *) value);
-   /* get, modify, put */
-   dsrb->GetValues(ctx, dsrb, count, x, y, temp);
-   if (dsrb->Format == MESA_FORMAT_Z24_S8) {
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            temp[i] = (temp[i] & 0xffffff00) | val;
-         }
-      }
-   }
-   else {
-      assert(dsrb->Format == MESA_FORMAT_S8_Z24);
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            temp[i] = (temp[i] & 0xffffff) | (val << 24);
-         }
-      }
-   }
-   dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);
-}
-
-
-/**
- * Wrap the given GL_DEPTH_STENCIL renderbuffer so that it acts like
- * a stencil renderbuffer.
- * \return new stencil renderbuffer
- */
-struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx, struct gl_renderbuffer *dsrb)
-{
-   struct gl_renderbuffer *s8rb;
-
-   ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||
-          dsrb->Format == MESA_FORMAT_S8_Z24);
-   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-
-   s8rb = ctx->Driver.NewRenderbuffer(ctx, 0);
-   if (!s8rb)
-      return NULL;
-
-   /* NOTE: need to do manual refcounting here */
-   s8rb->Wrapped = dsrb;
-   dsrb->RefCount++;
-
-   s8rb->Name = dsrb->Name;
-   s8rb->RefCount = 0;
-   s8rb->Width = dsrb->Width;
-   s8rb->Height = dsrb->Height;
-   s8rb->InternalFormat = GL_STENCIL_INDEX8_EXT;
-   s8rb->Format = MESA_FORMAT_S8;
-   s8rb->_BaseFormat = GL_STENCIL_INDEX;
-   s8rb->DataType = GL_UNSIGNED_BYTE;
-   s8rb->Data = NULL;
-   s8rb->Delete = delete_wrapper;
-   s8rb->AllocStorage = alloc_wrapper_storage;
-   s8rb->GetPointer = nop_get_pointer;
-   s8rb->GetRow = get_row_s8;
-   s8rb->GetValues = get_values_s8;
-   s8rb->PutRow = put_row_s8;
-   s8rb->PutRowRGB = NULL;
-   s8rb->PutMonoRow = put_mono_row_s8;
-   s8rb->PutValues = put_values_s8;
-   s8rb->PutMonoValues = put_mono_values_s8;
-
-   return s8rb;
-}
-
-
-
-/**
- ** The following functions are useful for hardware drivers that only
- ** implement combined depth/stencil buffers.
- ** The GL_EXT_framebuffer_object extension allows indepedent depth and
- ** stencil buffers to be used in any combination.
- ** Therefore, we sometimes have to merge separate depth and stencil
- ** renderbuffers into a single depth+stencil renderbuffer.  And sometimes
- ** we have to split combined depth+stencil renderbuffers into separate
- ** renderbuffers.
- **/
-
-
-/**
- * Extract stencil values from the combined depth/stencil renderbuffer, storing
- * the values into a separate stencil renderbuffer.
- * \param dsRb  the source depth/stencil renderbuffer
- * \param stencilRb  the destination stencil renderbuffer
- *                   (either 8-bit or 32-bit)
- */
-void
-_mesa_extract_stencil(GLcontext *ctx,
-                      struct gl_renderbuffer *dsRb,
-                      struct gl_renderbuffer *stencilRb)
-{
-   GLuint row, width, height;
-
-   ASSERT(dsRb);
-   ASSERT(stencilRb);
-
-   ASSERT(dsRb->Format == MESA_FORMAT_Z24_S8);
-   ASSERT(dsRb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8 ||
-          stencilRb->Format == MESA_FORMAT_S8);
-   ASSERT(dsRb->Width == stencilRb->Width);
-   ASSERT(dsRb->Height == stencilRb->Height);
-
-   width = dsRb->Width;
-   height = dsRb->Height;
-
-   for (row = 0; row < height; row++) {
-      GLuint depthStencil[MAX_WIDTH];
-      dsRb->GetRow(ctx, dsRb, width, 0, row, depthStencil);
-      if (stencilRb->Format == MESA_FORMAT_S8) {
-         /* 8bpp stencil */
-         GLubyte stencil[MAX_WIDTH];
-         GLuint i;
-         for (i = 0; i < width; i++) {
-            stencil[i] = depthStencil[i] & 0xff;
-         }
-         stencilRb->PutRow(ctx, stencilRb, width, 0, row, stencil, NULL);
-      }
-      else {
-         /* 32bpp stencil */
-         /* the 24 depth bits will be ignored */
-         ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8);
-         ASSERT(stencilRb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-         stencilRb->PutRow(ctx, stencilRb, width, 0, row, depthStencil, NULL);
-      }
-   }
-}
-
-
-/**
- * Copy stencil values from a stencil renderbuffer into a combined
- * depth/stencil renderbuffer.
- * \param dsRb  the destination depth/stencil renderbuffer
- * \param stencilRb  the source stencil buffer (either 8-bit or 32-bit)
- */
-void
-_mesa_insert_stencil(GLcontext *ctx,
-                     struct gl_renderbuffer *dsRb,
-                     struct gl_renderbuffer *stencilRb)
-{
-   GLuint row, width, height;
-
-   ASSERT(dsRb);
-   ASSERT(stencilRb);
-
-   ASSERT(dsRb->Format == MESA_FORMAT_Z24_S8);
-   ASSERT(dsRb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8 ||
-          stencilRb->Format == MESA_FORMAT_S8);
-
-   ASSERT(dsRb->Width == stencilRb->Width);
-   ASSERT(dsRb->Height == stencilRb->Height);
-
-   width = dsRb->Width;
-   height = dsRb->Height;
-
-   for (row = 0; row < height; row++) {
-      GLuint depthStencil[MAX_WIDTH];
-
-      dsRb->GetRow(ctx, dsRb, width, 0, row, depthStencil);
-
-      if (stencilRb->Format == MESA_FORMAT_S8) {
-         /* 8bpp stencil */
-         GLubyte stencil[MAX_WIDTH];
-         GLuint i;
-         stencilRb->GetRow(ctx, stencilRb, width, 0, row, stencil);
-         for (i = 0; i < width; i++) {
-            depthStencil[i] = (depthStencil[i] & 0xffffff00) | stencil[i];
-         }
-      }
-      else {
-         /* 32bpp stencil buffer */
-         GLuint stencil[MAX_WIDTH], i;
-         ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8);
-         ASSERT(stencilRb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-         stencilRb->GetRow(ctx, stencilRb, width, 0, row, stencil);
-         for (i = 0; i < width; i++) {
-            depthStencil[i]
-               = (depthStencil[i] & 0xffffff00) | (stencil[i] & 0xff);
-         }
-      }
-
-      dsRb->PutRow(ctx, dsRb, width, 0, row, depthStencil, NULL);
-   }
-}
-
-
-/**
- * Convert the stencil buffer from 8bpp to 32bpp depth/stencil.
- * \param stencilRb  the stencil renderbuffer to promote
- */
-void
-_mesa_promote_stencil(GLcontext *ctx, struct gl_renderbuffer *stencilRb)
-{
-   const GLsizei width = stencilRb->Width;
-   const GLsizei height = stencilRb->Height;
-   GLubyte *data;
-   GLint i, j, k;
-
-   ASSERT(stencilRb->Format == MESA_FORMAT_S8);
-   ASSERT(stencilRb->Data);
-
-   data = (GLubyte *) stencilRb->Data;
-   stencilRb->Data = NULL;
-   stencilRb->AllocStorage(ctx, stencilRb, GL_DEPTH24_STENCIL8_EXT,
-                           width, height);
-
-   ASSERT(stencilRb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-
-   k = 0;
-   for (i = 0; i < height; i++) {
-      GLuint depthStencil[MAX_WIDTH];
-      for (j = 0; j < width; j++) {
-         depthStencil[j] = data[k++];
-      }
-      stencilRb->PutRow(ctx, stencilRb, width, 0, i, depthStencil, NULL);
-   }
-   free(data);
-}
+/*

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

+ */

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "formats.h"

+#include "mtypes.h"

+#include "depthstencil.h"

+#include "renderbuffer.h"

+

+

+/**

+ * Adaptor/wrappers for GL_DEPTH_STENCIL renderbuffers.

+ *

+ * The problem with a GL_DEPTH_STENCIL renderbuffer is that sometimes we

+ * want to treat it as a stencil buffer, other times we want to treat it

+ * as a depth/z buffer and still other times when we want to treat it as

+ * a combined Z+stencil buffer!  That implies we need three different sets

+ * of Get/Put functions.

+ *

+ * We solve this by wrapping the Z24_S8 or S8_Z24 renderbuffer with depth and

+ * stencil adaptors, each with the right kind of depth/stencil Get/Put functions.

+ */

+

+

+static void *

+nop_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)

+{

+   (void) ctx;

+   (void) rb;

+   (void) x;

+   (void) y;

+   return NULL;

+}

+

+

+/**

+ * Delete a depth or stencil wrapper renderbuffer.

+ */

+static void

+delete_wrapper(struct gl_renderbuffer *rb)

+{

+   ASSERT(rb->Format == MESA_FORMAT_S8 ||

+          rb->Format == MESA_FORMAT_X8_Z24);

+   _mesa_reference_renderbuffer(&rb->Wrapped, NULL);

+   free(rb);

+}

+

+

+/**

+ * Realloc storage for wrapper.

+ */

+static GLboolean

+alloc_wrapper_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                      GLenum internalFormat, GLuint width, GLuint height)

+{

+   /* just pass this on to the wrapped renderbuffer */

+   struct gl_renderbuffer *dsrb = rb->Wrapped;

+   GLboolean retVal;

+

+   (void) internalFormat;

+

+   ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||

+          dsrb->Format == MESA_FORMAT_Z24_X8 ||

+          dsrb->Format == MESA_FORMAT_S8_Z24 ||

+          dsrb->Format == MESA_FORMAT_X8_Z24);

+

+   retVal = dsrb->AllocStorage(ctx, dsrb, dsrb->InternalFormat, width, height);

+   if (retVal) {

+      rb->Width = width;

+      rb->Height = height;

+   }

+   return retVal;

+}

+

+

+

+

+/*======================================================================

+ * Depth wrapper around depth/stencil renderbuffer

+ */

+

+static void

+get_row_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,

+            GLint x, GLint y, void *values)

+{

+   struct gl_renderbuffer *dsrb = z24rb->Wrapped;

+   GLuint temp[MAX_WIDTH], i;

+   GLuint *dst = (GLuint *) values;

+   const GLuint *src = (const GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);

+   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (!src) {

+      dsrb->GetRow(ctx, dsrb, count, x, y, temp);

+      src = temp;

+   }

+   if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+      for (i = 0; i < count; i++) {

+         dst[i] = src[i] >> 8;

+      }

+   }

+   else {

+      assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+      for (i = 0; i < count; i++) {

+         dst[i] = src[i] & 0xffffff;

+      }

+   }

+}

+

+static void

+get_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,

+               const GLint x[], const GLint y[], void *values)

+{

+   struct gl_renderbuffer *dsrb = z24rb->Wrapped;

+   GLuint temp[MAX_WIDTH], i;

+   GLuint *dst = (GLuint *) values;

+   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   ASSERT(count <= MAX_WIDTH);

+   /* don't bother trying direct access */

+   dsrb->GetValues(ctx, dsrb, count, x, y, temp);

+   if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+      for (i = 0; i < count; i++) {

+         dst[i] = temp[i] >> 8;

+      }

+   }

+   else {

+      assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+      for (i = 0; i < count; i++) {

+         dst[i] = temp[i] & 0xffffff;

+      }

+   }

+}

+

+static void

+put_row_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,

+            GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = z24rb->Wrapped;

+   const GLuint *src = (const GLuint *) values;

+   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);

+   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (dst) {

+      /* direct access */

+      GLuint i;

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = (src[i] << 8) | (dst[i] & 0xff);

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = (src[i] & 0xffffff) | (dst[i] & 0xff000000);

+            }

+         }

+      }

+   }

+   else {

+      /* get, modify, put */

+      GLuint temp[MAX_WIDTH], i;

+      dsrb->GetRow(ctx, dsrb, count, x, y, temp);

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (src[i] << 8) | (temp[i] & 0xff);

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (src[i] & 0xffffff) | (temp[i] & 0xff000000);

+            }

+         }

+      }

+      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);

+   }

+}

+

+static void

+put_mono_row_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,

+                 GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = z24rb->Wrapped;

+   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);

+   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (dst) {

+      /* direct access */

+      GLuint i;

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         const GLuint shiftedVal = *((GLuint *) value) << 8;

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = shiftedVal | (dst[i] & 0xff);

+            }

+         }

+      }

+      else {

+         const GLuint shiftedVal = *((GLuint *) value);

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = shiftedVal | (dst[i] & 0xff000000);

+            }

+         }

+      }

+   }

+   else {

+      /* get, modify, put */

+      GLuint temp[MAX_WIDTH], i;

+      dsrb->GetRow(ctx, dsrb, count, x, y, temp);

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         const GLuint shiftedVal = *((GLuint *) value) << 8;

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = shiftedVal | (temp[i] & 0xff);

+            }

+         }

+      }

+      else {

+         const GLuint shiftedVal = *((GLuint *) value);

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = shiftedVal | (temp[i] & 0xff000000);

+            }

+         }

+      }

+      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);

+   }

+}

+

+static void

+put_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,

+               const GLint x[], const GLint y[],

+               const void *values, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = z24rb->Wrapped;

+   const GLuint *src = (const GLuint *) values;

+   ASSERT(z24rb->DataType == GL_UNSIGNED_INT);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (dsrb->GetPointer(ctx, dsrb, 0, 0)) {

+      /* direct access */

+      GLuint i;

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);

+               *dst = (src[i] << 8) | (*dst & 0xff);

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);

+               *dst = (src[i] & 0xffffff) | (*dst & 0xff000000);

+            }

+         }

+      }

+   }

+   else {

+      /* get, modify, put */

+      GLuint temp[MAX_WIDTH], i;

+      dsrb->GetValues(ctx, dsrb, count, x, y, temp);

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (src[i] << 8) | (temp[i] & 0xff);

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (src[i] & 0xffffff) | (temp[i] & 0xff000000);

+            }

+         }

+      }

+      dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);

+   }

+}

+

+static void

+put_mono_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb,

+                    GLuint count, const GLint x[], const GLint y[],

+                    const void *value, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = z24rb->Wrapped;

+   GLuint temp[MAX_WIDTH], i;

+   /* get, modify, put */

+   dsrb->GetValues(ctx, dsrb, count, x, y, temp);

+   if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+      const GLuint shiftedVal = *((GLuint *) value) << 8;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            temp[i] = shiftedVal | (temp[i] & 0xff);

+         }

+      }

+   }

+   else {

+      const GLuint shiftedVal = *((GLuint *) value);

+      assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            temp[i] = shiftedVal | (temp[i] & 0xff000000);

+         }

+      }

+   }

+   dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);

+}

+

+

+/**

+ * Wrap the given GL_DEPTH_STENCIL renderbuffer so that it acts like

+ * a depth renderbuffer.

+ * \return new depth renderbuffer

+ */

+struct gl_renderbuffer *

+_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,

+                                   struct gl_renderbuffer *dsrb)

+{

+   struct gl_renderbuffer *z24rb;

+

+   ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||

+          dsrb->Format == MESA_FORMAT_Z24_X8 ||

+          dsrb->Format == MESA_FORMAT_S8_Z24 ||

+          dsrb->Format == MESA_FORMAT_X8_Z24);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+

+   z24rb = ctx->Driver.NewRenderbuffer(ctx, 0);

+   if (!z24rb)

+      return NULL;

+

+   /* NOTE: need to do manual refcounting here */

+   z24rb->Wrapped = dsrb;

+   dsrb->RefCount++;

+

+   z24rb->Name = dsrb->Name;

+   z24rb->RefCount = 0;

+   z24rb->Width = dsrb->Width;

+   z24rb->Height = dsrb->Height;

+   z24rb->InternalFormat = GL_DEPTH_COMPONENT24;

+   z24rb->Format = MESA_FORMAT_X8_Z24;

+   z24rb->_BaseFormat = GL_DEPTH_COMPONENT;

+   z24rb->DataType = GL_UNSIGNED_INT;

+   z24rb->Data = NULL;

+   z24rb->Delete = delete_wrapper;

+   z24rb->AllocStorage = alloc_wrapper_storage;

+   z24rb->GetPointer = nop_get_pointer;

+   z24rb->GetRow = get_row_z24;

+   z24rb->GetValues = get_values_z24;

+   z24rb->PutRow = put_row_z24;

+   z24rb->PutRowRGB = NULL;

+   z24rb->PutMonoRow = put_mono_row_z24;

+   z24rb->PutValues = put_values_z24;

+   z24rb->PutMonoValues = put_mono_values_z24;

+

+   return z24rb;

+}

+

+

+/*======================================================================

+ * Stencil wrapper around depth/stencil renderbuffer

+ */

+

+static void

+get_row_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,

+           GLint x, GLint y, void *values)

+{

+   struct gl_renderbuffer *dsrb = s8rb->Wrapped;

+   GLuint temp[MAX_WIDTH], i;

+   GLubyte *dst = (GLubyte *) values;

+   const GLuint *src = (const GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);

+   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (!src) {

+      dsrb->GetRow(ctx, dsrb, count, x, y, temp);

+      src = temp;

+   }

+   if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+      for (i = 0; i < count; i++) {

+         dst[i] = src[i] & 0xff;

+      }

+   }

+   else {

+      assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+      for (i = 0; i < count; i++) {

+         dst[i] = src[i] >> 24;

+      }

+   }

+}

+

+static void

+get_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,

+              const GLint x[], const GLint y[], void *values)

+{

+   struct gl_renderbuffer *dsrb = s8rb->Wrapped;

+   GLuint temp[MAX_WIDTH], i;

+   GLubyte *dst = (GLubyte *) values;

+   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   ASSERT(count <= MAX_WIDTH);

+   /* don't bother trying direct access */

+   dsrb->GetValues(ctx, dsrb, count, x, y, temp);

+   if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+      for (i = 0; i < count; i++) {

+         dst[i] = temp[i] & 0xff;

+      }

+   }

+   else {

+      assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+      for (i = 0; i < count; i++) {

+         dst[i] = temp[i] >> 24;

+      }

+   }

+}

+

+static void

+put_row_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,

+           GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = s8rb->Wrapped;

+   const GLubyte *src = (const GLubyte *) values;

+   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);

+   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (dst) {

+      /* direct access */

+      GLuint i;

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = (dst[i] & 0xffffff00) | src[i];

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = (dst[i] & 0xffffff) | (src[i] << 24);

+            }

+         }

+      }

+   }

+   else {

+      /* get, modify, put */

+      GLuint temp[MAX_WIDTH], i;

+      dsrb->GetRow(ctx, dsrb, count, x, y, temp);

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (temp[i] & 0xffffff00) | src[i];

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (temp[i] & 0xffffff) | (src[i] << 24);

+            }

+         }

+      }

+      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);

+   }

+}

+

+static void

+put_mono_row_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,

+                GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = s8rb->Wrapped;

+   const GLubyte val = *((GLubyte *) value);

+   GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x, y);

+   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (dst) {

+      /* direct access */

+      GLuint i;

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = (dst[i] & 0xffffff00) | val;

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               dst[i] = (dst[i] & 0xffffff) | (val << 24);

+            }

+         }

+      }

+   }

+   else {

+      /* get, modify, put */

+      GLuint temp[MAX_WIDTH], i;

+      dsrb->GetRow(ctx, dsrb, count, x, y, temp);

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (temp[i] & 0xffffff00) | val;

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (temp[i] & 0xffffff) | (val << 24);

+            }

+         }

+      }

+      dsrb->PutRow(ctx, dsrb, count, x, y, temp, mask);

+   }

+}

+

+static void

+put_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,

+              const GLint x[], const GLint y[],

+              const void *values, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = s8rb->Wrapped;

+   const GLubyte *src = (const GLubyte *) values;

+   ASSERT(s8rb->DataType == GL_UNSIGNED_BYTE);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   if (dsrb->GetPointer(ctx, dsrb, 0, 0)) {

+      /* direct access */

+      GLuint i;

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);

+               *dst = (*dst & 0xffffff00) | src[i];

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               GLuint *dst = (GLuint *) dsrb->GetPointer(ctx, dsrb, x[i], y[i]);

+               *dst = (*dst & 0xffffff) | (src[i] << 24);

+            }

+         }

+      }

+   }

+   else {

+      /* get, modify, put */

+      GLuint temp[MAX_WIDTH], i;

+      dsrb->GetValues(ctx, dsrb, count, x, y, temp);

+      if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (temp[i] & 0xffffff00) | src[i];

+            }

+         }

+      }

+      else {

+         assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+         for (i = 0; i < count; i++) {

+            if (!mask || mask[i]) {

+               temp[i] = (temp[i] & 0xffffff) | (src[i] << 24);

+            }

+         }

+      }

+      dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);

+   }

+}

+

+static void

+put_mono_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,

+                   const GLint x[], const GLint y[],

+                   const void *value, const GLubyte *mask)

+{

+   struct gl_renderbuffer *dsrb = s8rb->Wrapped;

+   GLuint temp[MAX_WIDTH], i;

+   const GLubyte val = *((GLubyte *) value);

+   /* get, modify, put */

+   dsrb->GetValues(ctx, dsrb, count, x, y, temp);

+   if (dsrb->Format == MESA_FORMAT_Z24_S8) {

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            temp[i] = (temp[i] & 0xffffff00) | val;

+         }

+      }

+   }

+   else {

+      assert(dsrb->Format == MESA_FORMAT_S8_Z24);

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            temp[i] = (temp[i] & 0xffffff) | (val << 24);

+         }

+      }

+   }

+   dsrb->PutValues(ctx, dsrb, count, x, y, temp, mask);

+}

+

+

+/**

+ * Wrap the given GL_DEPTH_STENCIL renderbuffer so that it acts like

+ * a stencil renderbuffer.

+ * \return new stencil renderbuffer

+ */

+struct gl_renderbuffer *

+_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx, struct gl_renderbuffer *dsrb)

+{

+   struct gl_renderbuffer *s8rb;

+

+   ASSERT(dsrb->Format == MESA_FORMAT_Z24_S8 ||

+          dsrb->Format == MESA_FORMAT_S8_Z24);

+   ASSERT(dsrb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+

+   s8rb = ctx->Driver.NewRenderbuffer(ctx, 0);

+   if (!s8rb)

+      return NULL;

+

+   /* NOTE: need to do manual refcounting here */

+   s8rb->Wrapped = dsrb;

+   dsrb->RefCount++;

+

+   s8rb->Name = dsrb->Name;

+   s8rb->RefCount = 0;

+   s8rb->Width = dsrb->Width;

+   s8rb->Height = dsrb->Height;

+   s8rb->InternalFormat = GL_STENCIL_INDEX8_EXT;

+   s8rb->Format = MESA_FORMAT_S8;

+   s8rb->_BaseFormat = GL_STENCIL_INDEX;

+   s8rb->DataType = GL_UNSIGNED_BYTE;

+   s8rb->Data = NULL;

+   s8rb->Delete = delete_wrapper;

+   s8rb->AllocStorage = alloc_wrapper_storage;

+   s8rb->GetPointer = nop_get_pointer;

+   s8rb->GetRow = get_row_s8;

+   s8rb->GetValues = get_values_s8;

+   s8rb->PutRow = put_row_s8;

+   s8rb->PutRowRGB = NULL;

+   s8rb->PutMonoRow = put_mono_row_s8;

+   s8rb->PutValues = put_values_s8;

+   s8rb->PutMonoValues = put_mono_values_s8;

+

+   return s8rb;

+}

+

+

+

+/**

+ ** The following functions are useful for hardware drivers that only

+ ** implement combined depth/stencil buffers.

+ ** The GL_EXT_framebuffer_object extension allows indepedent depth and

+ ** stencil buffers to be used in any combination.

+ ** Therefore, we sometimes have to merge separate depth and stencil

+ ** renderbuffers into a single depth+stencil renderbuffer.  And sometimes

+ ** we have to split combined depth+stencil renderbuffers into separate

+ ** renderbuffers.

+ **/

+

+

+/**

+ * Extract stencil values from the combined depth/stencil renderbuffer, storing

+ * the values into a separate stencil renderbuffer.

+ * \param dsRb  the source depth/stencil renderbuffer

+ * \param stencilRb  the destination stencil renderbuffer

+ *                   (either 8-bit or 32-bit)

+ */

+void

+_mesa_extract_stencil(struct gl_context *ctx,

+                      struct gl_renderbuffer *dsRb,

+                      struct gl_renderbuffer *stencilRb)

+{

+   GLuint row, width, height;

+

+   ASSERT(dsRb);

+   ASSERT(stencilRb);

+

+   ASSERT(dsRb->Format == MESA_FORMAT_Z24_S8);

+   ASSERT(dsRb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8 ||

+          stencilRb->Format == MESA_FORMAT_S8);

+   ASSERT(dsRb->Width == stencilRb->Width);

+   ASSERT(dsRb->Height == stencilRb->Height);

+

+   width = dsRb->Width;

+   height = dsRb->Height;

+

+   for (row = 0; row < height; row++) {

+      GLuint depthStencil[MAX_WIDTH];

+      dsRb->GetRow(ctx, dsRb, width, 0, row, depthStencil);

+      if (stencilRb->Format == MESA_FORMAT_S8) {

+         /* 8bpp stencil */

+         GLubyte stencil[MAX_WIDTH];

+         GLuint i;

+         for (i = 0; i < width; i++) {

+            stencil[i] = depthStencil[i] & 0xff;

+         }

+         stencilRb->PutRow(ctx, stencilRb, width, 0, row, stencil, NULL);

+      }

+      else {

+         /* 32bpp stencil */

+         /* the 24 depth bits will be ignored */

+         ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8);

+         ASSERT(stencilRb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+         stencilRb->PutRow(ctx, stencilRb, width, 0, row, depthStencil, NULL);

+      }

+   }

+}

+

+

+/**

+ * Copy stencil values from a stencil renderbuffer into a combined

+ * depth/stencil renderbuffer.

+ * \param dsRb  the destination depth/stencil renderbuffer

+ * \param stencilRb  the source stencil buffer (either 8-bit or 32-bit)

+ */

+void

+_mesa_insert_stencil(struct gl_context *ctx,

+                     struct gl_renderbuffer *dsRb,

+                     struct gl_renderbuffer *stencilRb)

+{

+   GLuint row, width, height;

+

+   ASSERT(dsRb);

+   ASSERT(stencilRb);

+

+   ASSERT(dsRb->Format == MESA_FORMAT_Z24_S8);

+   ASSERT(dsRb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+   ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8 ||

+          stencilRb->Format == MESA_FORMAT_S8);

+

+   ASSERT(dsRb->Width == stencilRb->Width);

+   ASSERT(dsRb->Height == stencilRb->Height);

+

+   width = dsRb->Width;

+   height = dsRb->Height;

+

+   for (row = 0; row < height; row++) {

+      GLuint depthStencil[MAX_WIDTH];

+

+      dsRb->GetRow(ctx, dsRb, width, 0, row, depthStencil);

+

+      if (stencilRb->Format == MESA_FORMAT_S8) {

+         /* 8bpp stencil */

+         GLubyte stencil[MAX_WIDTH];

+         GLuint i;

+         stencilRb->GetRow(ctx, stencilRb, width, 0, row, stencil);

+         for (i = 0; i < width; i++) {

+            depthStencil[i] = (depthStencil[i] & 0xffffff00) | stencil[i];

+         }

+      }

+      else {

+         /* 32bpp stencil buffer */

+         GLuint stencil[MAX_WIDTH], i;

+         ASSERT(stencilRb->Format == MESA_FORMAT_Z24_S8);

+         ASSERT(stencilRb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+         stencilRb->GetRow(ctx, stencilRb, width, 0, row, stencil);

+         for (i = 0; i < width; i++) {

+            depthStencil[i]

+               = (depthStencil[i] & 0xffffff00) | (stencil[i] & 0xff);

+         }

+      }

+

+      dsRb->PutRow(ctx, dsRb, width, 0, row, depthStencil, NULL);

+   }

+}

+

+

+/**

+ * Convert the stencil buffer from 8bpp to 32bpp depth/stencil.

+ * \param stencilRb  the stencil renderbuffer to promote

+ */

+void

+_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb)

+{

+   const GLsizei width = stencilRb->Width;

+   const GLsizei height = stencilRb->Height;

+   GLubyte *data;

+   GLint i, j, k;

+

+   ASSERT(stencilRb->Format == MESA_FORMAT_S8);

+   ASSERT(stencilRb->Data);

+

+   data = (GLubyte *) stencilRb->Data;

+   stencilRb->Data = NULL;

+   stencilRb->AllocStorage(ctx, stencilRb, GL_DEPTH24_STENCIL8_EXT,

+                           width, height);

+

+   ASSERT(stencilRb->DataType == GL_UNSIGNED_INT_24_8_EXT);

+

+   k = 0;

+   for (i = 0; i < height; i++) {

+      GLuint depthStencil[MAX_WIDTH];

+      for (j = 0; j < width; j++) {

+         depthStencil[j] = data[k++];

+      }

+      stencilRb->PutRow(ctx, stencilRb, width, 0, i, depthStencil, NULL);

+   }

+   free(data);

+}

diff --git a/mesalib/src/mesa/main/depthstencil.h b/mesalib/src/mesa/main/depthstencil.h
index afbac77f0..a86f54d96 100644
--- a/mesalib/src/mesa/main/depthstencil.h
+++ b/mesalib/src/mesa/main/depthstencil.h
@@ -1,57 +1,57 @@
-/*
- * 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.
- */
-
-
-#ifndef DEPTHSTENCIL_H
-#define DEPTHSTENCIL_H
-
-#include "mtypes.h"
-
-extern struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
-                                   struct gl_renderbuffer *dsrb);
-
-
-extern struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx,
-                                  struct gl_renderbuffer *dsrb);
-
-
-extern void
-_mesa_extract_stencil(GLcontext *ctx,
-                      struct gl_renderbuffer *dsRb,
-                      struct gl_renderbuffer *stencilRb);
-
-
-extern void
-_mesa_insert_stencil(GLcontext *ctx,
-                     struct gl_renderbuffer *dsRb,
-                     struct gl_renderbuffer *stencilRb);
-
-
-extern void
-_mesa_promote_stencil(GLcontext *ctx, struct gl_renderbuffer *stencilRb);
-
-
-#endif /* DEPTHSTENCIL_H */
+/*

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

+ */

+

+

+#ifndef DEPTHSTENCIL_H

+#define DEPTHSTENCIL_H

+

+struct gl_context;

+

+extern struct gl_renderbuffer *

+_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,

+                                   struct gl_renderbuffer *dsrb);

+

+

+extern struct gl_renderbuffer *

+_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx,

+                                  struct gl_renderbuffer *dsrb);

+

+

+extern void

+_mesa_extract_stencil(struct gl_context *ctx,

+                      struct gl_renderbuffer *dsRb,

+                      struct gl_renderbuffer *stencilRb);

+

+

+extern void

+_mesa_insert_stencil(struct gl_context *ctx,

+                     struct gl_renderbuffer *dsRb,

+                     struct gl_renderbuffer *stencilRb);

+

+

+extern void

+_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb);

+

+

+#endif /* DEPTHSTENCIL_H */

diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index 27f80a506..420d448c8 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -1,37 +1,37 @@
-/*
- * (C) Copyright IBM Corporation 2005
- * 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
- * IBM,
- * 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.
- */
-
-#ifndef _DISPATCH_H
-#define _DISPATCH_H
-
-#ifdef IN_DRI_DRIVER
-#define _GLAPI_USE_REMAP_TABLE
-#endif
-
-#include "glapi/glapitable.h"
-#include "glapi/glapioffsets.h"
-#include "glapi/glapidispatch.h"
-
-#endif /* _DISPATCH_H */
+/*

+ * (C) Copyright IBM Corporation 2005

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

+ * IBM,

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

+ */

+

+#ifndef _DISPATCH_H

+#define _DISPATCH_H

+

+#include "main/mfeatures.h"

+

+#if FEATURE_remap_table

+#define _GLAPI_USE_REMAP_TABLE

+#endif

+

+#include "main/glapidispatch.h"

+

+#endif /* _DISPATCH_H */

diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index d847d4d5d..45517c994 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -1,10009 +1,10195 @@
-/*
- * 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 "dlist.h"
-#include "macros.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)( GLcontext *ctx, void *data );
-   void (*Destroy)( GLcontext *ctx, void *data );
-   void (*Print)( GLcontext *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_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_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,
-
-   /* 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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *ctx,
-                         GLuint size,
-                         void (*execute) (GLcontext *, void *),
-                         void (*destroy) (GLcontext *, void *),
-                         void (*print) (GLcontext *, 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(GLcontext *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));
-   }
-}
-
-static void invalidate_saved_current_state( GLcontext *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_POST_COLOR_MATRIX_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_POST_COLOR_MATRIX_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,
-                            GLuint num, const GLdouble *params)
-{
-   GLuint i;
-   for (i = 0; i < num; i++) {
-      save_ProgramEnvParameter4dvARB(target, index + i, params + 4 * i);
-   }
-}
-
-
-static void GLAPIENTRY
-save_ProgramParameters4fvNV(GLenum target, GLuint index,
-                            GLuint num, const GLfloat *params)
-{
-   GLuint 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));
-   }
-}
-
-
-
-/**
- * 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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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_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_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_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;
-
-         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);
-   /* VERY IMPORTANT:  Save the CompileFlag status, turn it off, */
-   /* execute the display list, and restore the CompileFlag. */
-
-   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;
-   }
-
-/*     mesa_print_display_list( list ); */
-
-   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(sizeof *table);
-   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 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
-
-   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(GLcontext *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(GLcontext *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(GLcontext *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 "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_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_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,

+

+   /* 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));

+   }

+}

+

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

+}

+

+

+

+

+

+/**

+ * 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_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_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_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);

+   /* VERY IMPORTANT:  Save the CompileFlag status, turn it off, */

+   /* execute the display list, and restore the CompileFlag. */

+

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

+   }

+

+/*     mesa_print_display_list( list ); */

+

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

+

+   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/dlist.h b/mesalib/src/mesa/main/dlist.h
index 86bb132e5..784368d1a 100644
--- a/mesalib/src/mesa/main/dlist.h
+++ b/mesalib/src/mesa/main/dlist.h
@@ -1,103 +1,103 @@
-/**
- * \file dlist.h
- * Display lists management.
- */
-
-/*
- * 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.
- */
-
-
-
-#ifndef DLIST_H
-#define DLIST_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_dlist
-
-#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \
-   do {                                      \
-      (vfmt)->CallList  = impl ## CallList;  \
-      (vfmt)->CallLists = impl ## CallLists; \
-   } while (0)
-
-extern void GLAPIENTRY _mesa_CallList( GLuint list );
-
-extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
-
-
-extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
-
-extern void *_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint sz);
-
-extern GLint _mesa_dlist_alloc_opcode( GLcontext *ctx, GLuint sz,
-                                       void (*execute)( GLcontext *, void * ),
-                                       void (*destroy)( GLcontext *, void * ),
-                                       void (*print)( GLcontext *, void * ) );
-
-extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
-
-extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
-
-extern struct _glapi_table *_mesa_create_save_table(void);
-
-extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
-                                       const GLvertexformat *vfmt);
-
-extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_dlist */
-
-#include "main/compiler.h"
-
-#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
-
-static INLINE void
-_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
-{
-   /* there should be no list to delete */
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
-                           const GLvertexformat *vfmt)
-{
-}
-
-static INLINE void
-_mesa_init_dlist_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_dlist */
-
-extern void _mesa_init_display_list( GLcontext * ctx );
-
-extern void _mesa_free_display_list_data(GLcontext *ctx);
-
-
-#endif /* DLIST_H */
+/**

+ * \file dlist.h

+ * Display lists management.

+ */

+

+/*

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

+ */

+

+

+

+#ifndef DLIST_H

+#define DLIST_H

+

+

+#include "main/mtypes.h"

+

+

+#if FEATURE_dlist

+

+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl)  \

+   do {                                      \

+      (vfmt)->CallList  = impl ## CallList;  \

+      (vfmt)->CallLists = impl ## CallLists; \

+   } while (0)

+

+extern void GLAPIENTRY _mesa_CallList( GLuint list );

+

+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );

+

+

+extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );

+

+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);

+

+extern GLint _mesa_dlist_alloc_opcode( struct gl_context *ctx, GLuint sz,

+                                       void (*execute)( struct gl_context *, void * ),

+                                       void (*destroy)( struct gl_context *, void * ),

+                                       void (*print)( struct gl_context *, void * ) );

+

+extern void _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);

+

+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );

+

+extern struct _glapi_table *_mesa_create_save_table(void);

+

+extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,

+                                       const GLvertexformat *vfmt);

+

+extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_dlist */

+

+#include "main/compiler.h"

+

+#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)

+

+static INLINE void

+_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)

+{

+   /* there should be no list to delete */

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,

+                           const GLvertexformat *vfmt)

+{

+}

+

+static INLINE void

+_mesa_init_dlist_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_dlist */

+

+extern void _mesa_init_display_list( struct gl_context * ctx );

+

+extern void _mesa_free_display_list_data(struct gl_context *ctx);

+

+

+#endif /* DLIST_H */

diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c
index bf36a7e7a..40a1cb5df 100644
--- a/mesalib/src/mesa/main/drawpix.c
+++ b/mesalib/src/mesa/main/drawpix.c
@@ -1,317 +1,279 @@
-/*
- * 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 "readpix.h"
-#include "state.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_drawpix
-
-
-/**
- * If a fragment program is enabled, check that it's valid.
- * \return GL_TRUE if valid, GL_FALSE otherwise
- */
-static GLboolean
-valid_fragment_program(GLcontext *ctx)
-{
-   return !(ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled);
-}
-
-
-/*
- * 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 (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
-    * it's own.
-    */
-   _mesa_set_vp_override(ctx, GL_TRUE);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (!valid_fragment_program(ctx)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glDrawPixels (invalid fragment program)");
-      goto end;
-   }
-
-   if (_mesa_error_check_format_type(ctx, format, type, GL_TRUE)) {
-      /* the error was already recorded */
-      goto end;
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glDrawPixels(incomplete framebuffer)" );
-      goto end;
-   }
-
-   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 (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.
-    */
-   _mesa_set_vp_override(ctx, GL_TRUE);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (!valid_fragment_program(ctx)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyPixels (invalid fragment program)");
-      goto end;
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
-       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 */
-   }
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (!valid_fragment_program(ctx)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBitmap (invalid fragment program)");
-      return;
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glBitmap(incomplete framebuffer)");
-      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 "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 (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 (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/drawpix.h b/mesalib/src/mesa/main/drawpix.h
index 1f95ff529..88d3ecc95 100644
--- a/mesalib/src/mesa/main/drawpix.h
+++ b/mesalib/src/mesa/main/drawpix.h
@@ -1,47 +1,50 @@
-/*
- * 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.
- */
-
-#ifndef DRAWPIX_H
-#define DRAWPIX_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_drawpix
-
-extern void
-_mesa_init_drawpix_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_drawpix */
-
-static INLINE void
-_mesa_init_drawpix_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_drawpix */
-
-
-#endif /* DRAWPIX_H */
+/*

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

+ */

+

+#ifndef DRAWPIX_H

+#define DRAWPIX_H

+

+

+#include "compiler.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+

+

+#if FEATURE_drawpix

+

+extern void

+_mesa_init_drawpix_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_drawpix */

+

+static INLINE void

+_mesa_init_drawpix_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_drawpix */

+

+

+#endif /* DRAWPIX_H */

diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c
index c2ad5f238..3e91f15bc 100644
--- a/mesalib/src/mesa/main/drawtex.c
+++ b/mesalib/src/mesa/main/drawtex.c
@@ -1,131 +1,131 @@
-/*
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- *
- * 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/drawtex.h"
-#include "main/state.h"
-#include "main/imports.h"
-
-
-#if FEATURE_OES_draw_texture
-
-
-static void
-draw_texture(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
-             GLfloat width, GLfloat height)
-{
-   if (!ctx->Extensions.OES_draw_texture) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glDrawTex(unsupported)");
-      return;
-   }
-   if (width <= 0.0f || height <= 0.0f) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTex(width or height <= 0)");
-      return;
-   }
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   ASSERT(ctx->Driver.DrawTex);
-   ctx->Driver.DrawTex(ctx, x, y, z, width, height);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx, x, y, z, width, height);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
-                (GLfloat) width, (GLfloat) height);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
-                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
-                (GLfloat) width, (GLfloat) height);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
-                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx,
-                (GLfloat) x / 65536.0f,
-                (GLfloat) y / 65536.0f,
-                (GLfloat) z / 65536.0f,
-                (GLfloat) width / 65536.0f,
-                (GLfloat) height / 65536.0f);
-}
-
-
-void GLAPIENTRY
-_mesa_DrawTexxv(const GLfixed *coords)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   draw_texture(ctx,
-                (GLfloat) coords[0] / 65536.0f,
-                (GLfloat) coords[1] / 65536.0f,
-                (GLfloat) coords[2] / 65536.0f,
-                (GLfloat) coords[3] / 65536.0f,
-                (GLfloat) coords[4] / 65536.0f);
-}
-
-#endif /* FEATURE_OES_draw_texture */
+/*

+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>

+ *

+ * 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/drawtex.h"

+#include "main/state.h"

+#include "main/imports.h"

+

+

+#if FEATURE_OES_draw_texture

+

+

+static void

+draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,

+             GLfloat width, GLfloat height)

+{

+   if (!ctx->Extensions.OES_draw_texture) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glDrawTex(unsupported)");

+      return;

+   }

+   if (width <= 0.0f || height <= 0.0f) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTex(width or height <= 0)");

+      return;

+   }

+

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   ASSERT(ctx->Driver.DrawTex);

+   ctx->Driver.DrawTex(ctx, x, y, z, width, height);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx, x, y, z, width, height);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexfv(const GLfloat *coords)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,

+                (GLfloat) width, (GLfloat) height);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexiv(const GLint *coords)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],

+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,

+                (GLfloat) width, (GLfloat) height);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexsv(const GLshort *coords)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],

+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx,

+                (GLfloat) x / 65536.0f,

+                (GLfloat) y / 65536.0f,

+                (GLfloat) z / 65536.0f,

+                (GLfloat) width / 65536.0f,

+                (GLfloat) height / 65536.0f);

+}

+

+

+void GLAPIENTRY

+_mesa_DrawTexxv(const GLfixed *coords)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   draw_texture(ctx,

+                (GLfloat) coords[0] / 65536.0f,

+                (GLfloat) coords[1] / 65536.0f,

+                (GLfloat) coords[2] / 65536.0f,

+                (GLfloat) coords[3] / 65536.0f,

+                (GLfloat) coords[4] / 65536.0f);

+}

+

+#endif /* FEATURE_OES_draw_texture */

diff --git a/mesalib/src/mesa/main/drawtex.h b/mesalib/src/mesa/main/drawtex.h
index d7d507566..78bbd5b45 100644
--- a/mesalib/src/mesa/main/drawtex.h
+++ b/mesalib/src/mesa/main/drawtex.h
@@ -1,60 +1,61 @@
-/*
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- *
- * 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 DRAWTEX_H
-#define DRAWTEX_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_OES_draw_texture
-
-extern void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords);
-
-extern void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords);
-
-extern void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords);
-
-extern void GLAPIENTRY
-_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-
-extern void GLAPIENTRY
-_mesa_DrawTexxv(const GLfixed *coords);
-
-#endif /* FEATURE_OES_draw_texture */
-
-
-#endif /* DRAWTEX_H */
+/*

+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>

+ *

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

+#define DRAWTEX_H

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+

+#if FEATURE_OES_draw_texture

+

+extern void GLAPIENTRY

+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);

+

+extern void GLAPIENTRY

+_mesa_DrawTexfv(const GLfloat *coords);

+

+extern void GLAPIENTRY

+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);

+

+extern void GLAPIENTRY

+_mesa_DrawTexiv(const GLint *coords);

+

+extern void GLAPIENTRY

+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);

+

+extern void GLAPIENTRY

+_mesa_DrawTexsv(const GLshort *coords);

+

+extern void GLAPIENTRY

+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);

+

+extern void GLAPIENTRY

+_mesa_DrawTexxv(const GLfixed *coords);

+

+#endif /* FEATURE_OES_draw_texture */

+

+

+#endif /* DRAWTEX_H */

diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c
index db30123c0..c3dbd4a29 100644
--- a/mesalib/src/mesa/main/enable.c
+++ b/mesalib/src/mesa/main/enable.c
@@ -1,1567 +1,1491 @@
-/**
- * \file enable.c
- * Enable/disable/query GL capabilities.
- */
-
-/*
- * 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 "glheader.h"
-#include "context.h"
-#include "enable.h"
-#include "light.h"
-#include "simple_list.h"
-#include "mtypes.h"
-#include "enums.h"
-#include "api_arrayelt.h"
-#include "texstate.h"
-
-
-
-#define CHECK_EXTENSION(EXTNAME, CAP)					\
-   if (!ctx->Extensions.EXTNAME) {					\
-      goto invalid_enum_error;						\
-   }
-
-
-/**
- * Helper to enable/disable client-side state.
- */
-static void
-client_state(GLcontext *ctx, GLenum cap, GLboolean state)
-{
-   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-   GLuint flag;
-   GLboolean *var;
-
-   switch (cap) {
-      case GL_VERTEX_ARRAY:
-         var = &arrayObj->Vertex.Enabled;
-         flag = _NEW_ARRAY_VERTEX;
-         break;
-      case GL_NORMAL_ARRAY:
-         var = &arrayObj->Normal.Enabled;
-         flag = _NEW_ARRAY_NORMAL;
-         break;
-      case GL_COLOR_ARRAY:
-         var = &arrayObj->Color.Enabled;
-         flag = _NEW_ARRAY_COLOR0;
-         break;
-      case GL_INDEX_ARRAY:
-         var = &arrayObj->Index.Enabled;
-         flag = _NEW_ARRAY_INDEX;
-         break;
-      case GL_TEXTURE_COORD_ARRAY:
-         var = &arrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled;
-         flag = _NEW_ARRAY_TEXCOORD(ctx->Array.ActiveTexture);
-         break;
-      case GL_EDGE_FLAG_ARRAY:
-         var = &arrayObj->EdgeFlag.Enabled;
-         flag = _NEW_ARRAY_EDGEFLAG;
-         break;
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-         var = &arrayObj->FogCoord.Enabled;
-         flag = _NEW_ARRAY_FOGCOORD;
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-         var = &arrayObj->SecondaryColor.Enabled;
-         flag = _NEW_ARRAY_COLOR1;
-         break;
-
-#if FEATURE_point_size_array
-      case GL_POINT_SIZE_ARRAY_OES:
-         var = &arrayObj->PointSize.Enabled;
-         flag = _NEW_ARRAY_POINT_SIZE;
-         break;
-#endif
-
-#if FEATURE_NV_vertex_program
-      case GL_VERTEX_ATTRIB_ARRAY0_NV:
-      case GL_VERTEX_ATTRIB_ARRAY1_NV:
-      case GL_VERTEX_ATTRIB_ARRAY2_NV:
-      case GL_VERTEX_ATTRIB_ARRAY3_NV:
-      case GL_VERTEX_ATTRIB_ARRAY4_NV:
-      case GL_VERTEX_ATTRIB_ARRAY5_NV:
-      case GL_VERTEX_ATTRIB_ARRAY6_NV:
-      case GL_VERTEX_ATTRIB_ARRAY7_NV:
-      case GL_VERTEX_ATTRIB_ARRAY8_NV:
-      case GL_VERTEX_ATTRIB_ARRAY9_NV:
-      case GL_VERTEX_ATTRIB_ARRAY10_NV:
-      case GL_VERTEX_ATTRIB_ARRAY11_NV:
-      case GL_VERTEX_ATTRIB_ARRAY12_NV:
-      case GL_VERTEX_ATTRIB_ARRAY13_NV:
-      case GL_VERTEX_ATTRIB_ARRAY14_NV:
-      case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXTENSION(NV_vertex_program, cap);
-         {
-            GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
-            ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));
-            var = &arrayObj->VertexAttrib[n].Enabled;
-            flag = _NEW_ARRAY_ATTRIB(n);
-         }
-         break;
-#endif /* FEATURE_NV_vertex_program */
-
-      default:
-         goto invalid_enum_error;
-   }
-
-   if (*var == state)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_ARRAY);
-   ctx->Array.NewState |= flag;
-
-   _ae_invalidate_state(ctx, _NEW_ARRAY);
-
-   *var = state;
-
-   if (state)
-      ctx->Array.ArrayObj->_Enabled |= flag;
-   else
-      ctx->Array.ArrayObj->_Enabled &= ~flag;
-
-   if (ctx->Driver.Enable) {
-      ctx->Driver.Enable( ctx, cap, state );
-   }
-
-   return;
-
-invalid_enum_error:
-   _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientState(0x%x)",
-               state ? "Enable" : "Disable", cap);
-}
-
-
-/**
- * Enable GL capability.
- * \param cap  state to enable/disable.
- *
- * Get's the current context, assures that we're outside glBegin()/glEnd() and
- * calls client_state().
- */
-void GLAPIENTRY
-_mesa_EnableClientState( GLenum cap )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   client_state( ctx, cap, GL_TRUE );
-}
-
-
-/**
- * Disable GL capability.
- * \param cap  state to enable/disable.
- *
- * Get's the current context, assures that we're outside glBegin()/glEnd() and
- * calls client_state().
- */
-void GLAPIENTRY
-_mesa_DisableClientState( GLenum cap )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   client_state( ctx, cap, GL_FALSE );
-}
-
-
-#undef CHECK_EXTENSION
-#define CHECK_EXTENSION(EXTNAME, CAP)					\
-   if (!ctx->Extensions.EXTNAME) {					\
-      goto invalid_enum_error;						\
-   }
-
-#define CHECK_EXTENSION2(EXT1, EXT2, CAP)				\
-   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {		\
-      goto invalid_enum_error;						\
-   }
-
-
-
-/**
- * Return pointer to current texture unit for setting/getting coordinate
- * state.
- * Note that we'll set GL_INVALID_OPERATION if the active texture unit is
- * higher than the number of supported coordinate units.  And we'll return NULL.
- */
-static struct gl_texture_unit *
-get_texcoord_unit(GLcontext *ctx)
-{
-   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glEnable/Disable(texcoord unit)");
-      return NULL;
-   }
-   else {
-      return &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   }
-}
-
-
-/**
- * Helper function to enable or disable a texture target.
- * \param bit  one of the TEXTURE_x_BIT values
- * \return GL_TRUE if state is changing or GL_FALSE if no change
- */
-static GLboolean
-enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit)
-{
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   const GLbitfield newenabled = state
-      ? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit);
-
-   if (texUnit->Enabled == newenabled)
-       return GL_FALSE;
-
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-   texUnit->Enabled = newenabled;
-   return GL_TRUE;
-}
-
-
-/**
- * Helper function to enable or disable state.
- *
- * \param ctx GL context.
- * \param cap  the state to enable/disable
- * \param state whether to enable or disable the specified capability.
- *
- * Updates the current context and flushes the vertices as needed. For
- * capabilities associated with extensions it verifies that those extensions
- * are effectivly present before updating. Notifies the driver via
- * dd_function_table::Enable.
- */
-void
-_mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
-{
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "%s %s (newstate is %x)\n",
-                  state ? "glEnable" : "glDisable",
-                  _mesa_lookup_enum_by_nr(cap),
-                  ctx->NewState);
-
-   switch (cap) {
-      case GL_ALPHA_TEST:
-         if (ctx->Color.AlphaEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_COLOR);
-         ctx->Color.AlphaEnabled = state;
-         break;
-      case GL_AUTO_NORMAL:
-         if (ctx->Eval.AutoNormal == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.AutoNormal = state;
-         break;
-      case GL_BLEND:
-         {
-            GLbitfield newEnabled = state * ((1 << ctx->Const.MaxDrawBuffers) - 1);
-            if (newEnabled != ctx->Color.BlendEnabled) {
-               FLUSH_VERTICES(ctx, _NEW_COLOR);
-               ctx->Color.BlendEnabled = newEnabled;
-            }
-         }
-         break;
-#if FEATURE_userclip
-      case GL_CLIP_PLANE0:
-      case GL_CLIP_PLANE1:
-      case GL_CLIP_PLANE2:
-      case GL_CLIP_PLANE3:
-      case GL_CLIP_PLANE4:
-      case GL_CLIP_PLANE5:
-         {
-            const GLuint p = cap - GL_CLIP_PLANE0;
-
-            if ((ctx->Transform.ClipPlanesEnabled & (1 << p)) == ((GLuint) state << p))
-               return;
-
-            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-
-            if (state) {
-               ctx->Transform.ClipPlanesEnabled |= (1 << p);
-
-               if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))
-                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
-
-               /* This derived state also calculated in clip.c and
-                * from _mesa_update_state() on changes to EyeUserPlane
-                * and ctx->ProjectionMatrix respectively.
-                */
-               _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
-                                    ctx->Transform.EyeUserPlane[p],
-                                    ctx->ProjectionMatrixStack.Top->inv );
-            }
-            else {
-               ctx->Transform.ClipPlanesEnabled &= ~(1 << p);
-            }               
-         }
-         break;
-#endif
-      case GL_COLOR_MATERIAL:
-         if (ctx->Light.ColorMaterialEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_LIGHT);
-         FLUSH_CURRENT(ctx, 0);
-         ctx->Light.ColorMaterialEnabled = state;
-         if (state) {
-            _mesa_update_color_material( ctx,
-                                  ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
-         }
-         break;
-      case GL_CULL_FACE:
-         if (ctx->Polygon.CullFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POLYGON);
-         ctx->Polygon.CullFlag = state;
-         break;
-      case GL_CULL_VERTEX_EXT:
-         CHECK_EXTENSION(EXT_cull_vertex, cap);
-         if (ctx->Transform.CullVertexFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-         ctx->Transform.CullVertexFlag = state;
-         break;
-      case GL_DEPTH_TEST:
-         if (ctx->Depth.Test == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_DEPTH);
-         ctx->Depth.Test = state;
-         break;
-      case GL_DITHER:
-         if (ctx->NoDither) {
-            state = GL_FALSE; /* MESA_NO_DITHER env var */
-         }
-         if (ctx->Color.DitherFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_COLOR);
-         ctx->Color.DitherFlag = state;
-         break;
-      case GL_FOG:
-         if (ctx->Fog.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_FOG);
-         ctx->Fog.Enabled = state;
-         break;
-      case GL_HISTOGRAM:
-         CHECK_EXTENSION(EXT_histogram, cap);
-         if (ctx->Pixel.HistogramEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.HistogramEnabled = state;
-         break;
-      case GL_LIGHT0:
-      case GL_LIGHT1:
-      case GL_LIGHT2:
-      case GL_LIGHT3:
-      case GL_LIGHT4:
-      case GL_LIGHT5:
-      case GL_LIGHT6:
-      case GL_LIGHT7:
-         if (ctx->Light.Light[cap-GL_LIGHT0].Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_LIGHT);
-         ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;
-         if (state) {
-            insert_at_tail(&ctx->Light.EnabledList,
-                           &ctx->Light.Light[cap-GL_LIGHT0]);
-         }
-         else {
-            remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]);
-         }
-         break;
-      case GL_LIGHTING:
-         if (ctx->Light.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_LIGHT);
-         ctx->Light.Enabled = state;
-         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
-            ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
-         else
-            ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
-         break;
-      case GL_LINE_SMOOTH:
-         if (ctx->Line.SmoothFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_LINE);
-         ctx->Line.SmoothFlag = state;
-         ctx->_TriangleCaps ^= DD_LINE_SMOOTH;
-         break;
-      case GL_LINE_STIPPLE:
-         if (ctx->Line.StippleFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_LINE);
-         ctx->Line.StippleFlag = state;
-         ctx->_TriangleCaps ^= DD_LINE_STIPPLE;
-         break;
-      case GL_INDEX_LOGIC_OP:
-         if (ctx->Color.IndexLogicOpEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_COLOR);
-         ctx->Color.IndexLogicOpEnabled = state;
-         break;
-      case GL_COLOR_LOGIC_OP:
-         if (ctx->Color.ColorLogicOpEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_COLOR);
-         ctx->Color.ColorLogicOpEnabled = state;
-         break;
-      case GL_MAP1_COLOR_4:
-         if (ctx->Eval.Map1Color4 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1Color4 = state;
-         break;
-      case GL_MAP1_INDEX:
-         if (ctx->Eval.Map1Index == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1Index = state;
-         break;
-      case GL_MAP1_NORMAL:
-         if (ctx->Eval.Map1Normal == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1Normal = state;
-         break;
-      case GL_MAP1_TEXTURE_COORD_1:
-         if (ctx->Eval.Map1TextureCoord1 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1TextureCoord1 = state;
-         break;
-      case GL_MAP1_TEXTURE_COORD_2:
-         if (ctx->Eval.Map1TextureCoord2 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1TextureCoord2 = state;
-         break;
-      case GL_MAP1_TEXTURE_COORD_3:
-         if (ctx->Eval.Map1TextureCoord3 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1TextureCoord3 = state;
-         break;
-      case GL_MAP1_TEXTURE_COORD_4:
-         if (ctx->Eval.Map1TextureCoord4 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1TextureCoord4 = state;
-         break;
-      case GL_MAP1_VERTEX_3:
-         if (ctx->Eval.Map1Vertex3 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1Vertex3 = state;
-         break;
-      case GL_MAP1_VERTEX_4:
-         if (ctx->Eval.Map1Vertex4 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map1Vertex4 = state;
-         break;
-      case GL_MAP2_COLOR_4:
-         if (ctx->Eval.Map2Color4 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2Color4 = state;
-         break;
-      case GL_MAP2_INDEX:
-         if (ctx->Eval.Map2Index == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2Index = state;
-         break;
-      case GL_MAP2_NORMAL:
-         if (ctx->Eval.Map2Normal == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2Normal = state;
-         break;
-      case GL_MAP2_TEXTURE_COORD_1:
-         if (ctx->Eval.Map2TextureCoord1 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2TextureCoord1 = state;
-         break;
-      case GL_MAP2_TEXTURE_COORD_2:
-         if (ctx->Eval.Map2TextureCoord2 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2TextureCoord2 = state;
-         break;
-      case GL_MAP2_TEXTURE_COORD_3:
-         if (ctx->Eval.Map2TextureCoord3 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2TextureCoord3 = state;
-         break;
-      case GL_MAP2_TEXTURE_COORD_4:
-         if (ctx->Eval.Map2TextureCoord4 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2TextureCoord4 = state;
-         break;
-      case GL_MAP2_VERTEX_3:
-         if (ctx->Eval.Map2Vertex3 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2Vertex3 = state;
-         break;
-      case GL_MAP2_VERTEX_4:
-         if (ctx->Eval.Map2Vertex4 == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_EVAL);
-         ctx->Eval.Map2Vertex4 = state;
-         break;
-      case GL_MINMAX:
-         if (ctx->Pixel.MinMaxEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.MinMaxEnabled = state;
-         break;
-      case GL_NORMALIZE:
-         if (ctx->Transform.Normalize == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-         ctx->Transform.Normalize = state;
-         break;
-      case GL_POINT_SMOOTH:
-         if (ctx->Point.SmoothFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POINT);
-         ctx->Point.SmoothFlag = state;
-         ctx->_TriangleCaps ^= DD_POINT_SMOOTH;
-         break;
-      case GL_POLYGON_SMOOTH:
-         if (ctx->Polygon.SmoothFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POLYGON);
-         ctx->Polygon.SmoothFlag = state;
-         ctx->_TriangleCaps ^= DD_TRI_SMOOTH;
-         break;
-      case GL_POLYGON_STIPPLE:
-         if (ctx->Polygon.StippleFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POLYGON);
-         ctx->Polygon.StippleFlag = state;
-         ctx->_TriangleCaps ^= DD_TRI_STIPPLE;
-         break;
-      case GL_POLYGON_OFFSET_POINT:
-         if (ctx->Polygon.OffsetPoint == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POLYGON);
-         ctx->Polygon.OffsetPoint = state;
-         break;
-      case GL_POLYGON_OFFSET_LINE:
-         if (ctx->Polygon.OffsetLine == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POLYGON);
-         ctx->Polygon.OffsetLine = state;
-         break;
-      case GL_POLYGON_OFFSET_FILL:
-         /*case GL_POLYGON_OFFSET_EXT:*/
-         if (ctx->Polygon.OffsetFill == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POLYGON);
-         ctx->Polygon.OffsetFill = state;
-         break;
-      case GL_RESCALE_NORMAL_EXT:
-         if (ctx->Transform.RescaleNormals == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-         ctx->Transform.RescaleNormals = state;
-         break;
-      case GL_SCISSOR_TEST:
-         if (ctx->Scissor.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_SCISSOR);
-         ctx->Scissor.Enabled = state;
-         break;
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         if (ctx->Texture.SharedPalette == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         ctx->Texture.SharedPalette = state;
-         break;
-      case GL_STENCIL_TEST:
-         if (ctx->Stencil.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_STENCIL);
-         ctx->Stencil.Enabled = state;
-         break;
-      case GL_TEXTURE_1D:
-         if (!enable_texture(ctx, state, TEXTURE_1D_BIT)) {
-            return;
-         }
-         break;
-      case GL_TEXTURE_2D:
-         if (!enable_texture(ctx, state, TEXTURE_2D_BIT)) {
-            return;
-         }
-         break;
-      case GL_TEXTURE_3D:
-         if (!enable_texture(ctx, state, TEXTURE_3D_BIT)) {
-            return;
-         }
-         break;
-      case GL_TEXTURE_GEN_Q:
-         {
-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               GLuint newenabled = texUnit->TexGenEnabled & ~Q_BIT;
-               if (state)
-                  newenabled |= Q_BIT;
-               if (texUnit->TexGenEnabled == newenabled)
-                  return;
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->TexGenEnabled = newenabled;
-            }
-         }
-         break;
-      case GL_TEXTURE_GEN_R:
-         {
-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               GLuint newenabled = texUnit->TexGenEnabled & ~R_BIT;
-               if (state)
-                  newenabled |= R_BIT;
-               if (texUnit->TexGenEnabled == newenabled)
-                  return;
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->TexGenEnabled = newenabled;
-            }
-         }
-         break;
-      case GL_TEXTURE_GEN_S:
-         {
-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               GLuint newenabled = texUnit->TexGenEnabled & ~S_BIT;
-               if (state)
-                  newenabled |= S_BIT;
-               if (texUnit->TexGenEnabled == newenabled)
-                  return;
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->TexGenEnabled = newenabled;
-            }
-         }
-         break;
-      case GL_TEXTURE_GEN_T:
-         {
-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               GLuint newenabled = texUnit->TexGenEnabled & ~T_BIT;
-               if (state)
-                  newenabled |= T_BIT;
-               if (texUnit->TexGenEnabled == newenabled)
-                  return;
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->TexGenEnabled = newenabled;
-            }
-         }
-         break;
-
-#if FEATURE_ES1
-      case GL_TEXTURE_GEN_STR_OES:
-	 /* disable S, T, and R at the same time */
-	 {
-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               GLuint newenabled =
-		  texUnit->TexGenEnabled & ~STR_BITS;
-               if (state)
-                  newenabled |= STR_BITS;
-               if (texUnit->TexGenEnabled == newenabled)
-                  return;
-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-               texUnit->TexGenEnabled = newenabled;
-            }
-         }
-         break;
-#endif
-
-      /*
-       * CLIENT STATE!!!
-       */
-      case GL_VERTEX_ARRAY:
-      case GL_NORMAL_ARRAY:
-      case GL_COLOR_ARRAY:
-      case GL_INDEX_ARRAY:
-      case GL_TEXTURE_COORD_ARRAY:
-      case GL_EDGE_FLAG_ARRAY:
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-      case GL_POINT_SIZE_ARRAY_OES:
-         client_state( ctx, cap, state );
-         return;
-
-      /* GL_SGI_color_table */
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table, cap);
-         if (ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION] == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION] = state;
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table, cap);
-         if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION] == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION] = state;
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table, cap);
-         if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX] == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX] = state;
-         break;
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_texture_color_table, cap);
-         if (ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-         ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled = state;
-         break;
-
-      /* GL_EXT_convolution */
-      case GL_CONVOLUTION_1D:
-         CHECK_EXTENSION(EXT_convolution, cap);
-         if (ctx->Pixel.Convolution1DEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.Convolution1DEnabled = state;
-         break;
-      case GL_CONVOLUTION_2D:
-         CHECK_EXTENSION(EXT_convolution, cap);
-         if (ctx->Pixel.Convolution2DEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.Convolution2DEnabled = state;
-         break;
-      case GL_SEPARABLE_2D:
-         CHECK_EXTENSION(EXT_convolution, cap);
-         if (ctx->Pixel.Separable2DEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.Separable2DEnabled = state;
-         break;
-
-      /* GL_ARB_texture_cube_map */
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXTENSION(ARB_texture_cube_map, cap);
-         if (!enable_texture(ctx, state, TEXTURE_CUBE_BIT)) {
-            return;
-         }
-         break;
-
-      /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT:
-         CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program, cap);
-         if (ctx->Fog.ColorSumEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_FOG);
-         ctx->Fog.ColorSumEnabled = state;
-         break;
-
-      /* GL_ARB_multisample */
-      case GL_MULTISAMPLE_ARB:
-         if (ctx->Multisample.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
-         ctx->Multisample.Enabled = state;
-         break;
-      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         if (ctx->Multisample.SampleAlphaToCoverage == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
-         ctx->Multisample.SampleAlphaToCoverage = state;
-         break;
-      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         if (ctx->Multisample.SampleAlphaToOne == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
-         ctx->Multisample.SampleAlphaToOne = state;
-         break;
-      case GL_SAMPLE_COVERAGE_ARB:
-         if (ctx->Multisample.SampleCoverage == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
-         ctx->Multisample.SampleCoverage = state;
-         break;
-      case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         if (ctx->Multisample.SampleCoverageInvert == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);
-         ctx->Multisample.SampleCoverageInvert = state;
-         break;
-
-      /* GL_IBM_rasterpos_clip */
-      case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXTENSION(IBM_rasterpos_clip, cap);
-         if (ctx->Transform.RasterPositionUnclipped == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-         ctx->Transform.RasterPositionUnclipped = state;
-         break;
-
-      /* GL_NV_point_sprite */
-      case GL_POINT_SPRITE_NV:
-         CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite, cap);
-         if (ctx->Point.PointSprite == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_POINT);
-         ctx->Point.PointSprite = state;
-         break;
-
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-      case GL_VERTEX_PROGRAM_ARB:
-         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);
-         if (ctx->VertexProgram.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PROGRAM); 
-         ctx->VertexProgram.Enabled = state;
-         break;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);
-         if (ctx->VertexProgram.PointSizeEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-         ctx->VertexProgram.PointSizeEnabled = state;
-         break;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);
-         if (ctx->VertexProgram.TwoSideEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PROGRAM); 
-         ctx->VertexProgram.TwoSideEnabled = state;
-         break;
-#endif
-#if FEATURE_NV_vertex_program
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION(NV_vertex_program, cap);
-         {
-            const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);
-            FLUSH_VERTICES(ctx, _NEW_EVAL);
-            ctx->Eval.Map1Attrib[map] = state;
-         }
-         break;
-      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION(NV_vertex_program, cap);
-         {
-            const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
-            FLUSH_VERTICES(ctx, _NEW_EVAL);
-            ctx->Eval.Map2Attrib[map] = state;
-         }
-         break;
-#endif /* FEATURE_NV_vertex_program */
-
-#if FEATURE_NV_fragment_program
-      case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXTENSION(NV_fragment_program, cap);
-         if (ctx->FragmentProgram.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-         ctx->FragmentProgram.Enabled = state;
-         break;
-#endif /* FEATURE_NV_fragment_program */
-
-      /* GL_NV_texture_rectangle */
-      case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXTENSION(NV_texture_rectangle, cap);
-         if (!enable_texture(ctx, state, TEXTURE_RECT_BIT)) {
-            return;
-         }
-         break;
-
-      /* GL_EXT_stencil_two_side */
-      case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXTENSION(EXT_stencil_two_side, cap);
-         if (ctx->Stencil.TestTwoSide == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_STENCIL);
-         ctx->Stencil.TestTwoSide = state;
-         if (state) {
-            ctx->Stencil._BackFace = 2;
-            ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
-         } else {
-            ctx->Stencil._BackFace = 1;
-            ctx->_TriangleCaps &= ~DD_TRI_TWOSTENCIL;
-         }
-         break;
-
-#if FEATURE_ARB_fragment_program
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXTENSION(ARB_fragment_program, cap);
-         if (ctx->FragmentProgram.Enabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-         ctx->FragmentProgram.Enabled = state;
-         break;
-#endif /* FEATURE_ARB_fragment_program */
-
-      /* GL_EXT_depth_bounds_test */
-      case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXTENSION(EXT_depth_bounds_test, cap);
-         if (ctx->Depth.BoundsTest == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_DEPTH);
-         ctx->Depth.BoundsTest = state;
-         break;
-
-      case GL_DEPTH_CLAMP:
-         if (ctx->Transform.DepthClamp == state)
-            return;
-	 CHECK_EXTENSION(ARB_depth_clamp, cap);
-         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-	 ctx->Transform.DepthClamp = state;
-	 break;
-
-#if FEATURE_ATI_fragment_shader
-      case GL_FRAGMENT_SHADER_ATI:
-        CHECK_EXTENSION(ATI_fragment_shader, cap);
-	if (ctx->ATIFragmentShader.Enabled == state)
-	  return;
-	FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-	ctx->ATIFragmentShader.Enabled = state;
-        break;
-#endif
-
-      /* GL_MESA_texture_array */
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         CHECK_EXTENSION(MESA_texture_array, cap);
-         if (!enable_texture(ctx, state, TEXTURE_1D_ARRAY_BIT)) {
-            return;
-         }
-         break;
-
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         CHECK_EXTENSION(MESA_texture_array, cap);
-         if (!enable_texture(ctx, state, TEXTURE_2D_ARRAY_BIT)) {
-            return;
-         }
-         break;
-
-      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-	 CHECK_EXTENSION(ARB_seamless_cube_map, cap);
-	 ctx->Texture.CubeMapSeamless = state;
-	 break;
-
-#if FEATURE_EXT_transform_feedback
-      case GL_RASTERIZER_DISCARD:
-	 CHECK_EXTENSION(EXT_transform_feedback, cap);
-         if (ctx->TransformFeedback.RasterDiscard != state) {
-            ctx->TransformFeedback.RasterDiscard = state;
-            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-         }
-         break;
-#endif
-
-      /* GL 3.1 primitive restart */
-      case GL_PRIMITIVE_RESTART:
-	 if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
-            goto invalid_enum_error;
-         }
-         if (ctx->Array.PrimitiveRestart != state) {
-            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-            ctx->Array.PrimitiveRestart = state;
-         }
-         break;
-
-      default:
-         goto invalid_enum_error;
-   }
-
-   if (ctx->Driver.Enable) {
-      ctx->Driver.Enable( ctx, cap, state );
-   }
-
-   return;
-
-invalid_enum_error:
-   _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(0x%x)",
-               state ? "Enable" : "Disable", cap);
-}
-
-
-/**
- * Enable GL capability.  Called by glEnable()
- * \param cap  state to enable.
- */
-void GLAPIENTRY
-_mesa_Enable( GLenum cap )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   _mesa_set_enable( ctx, cap, GL_TRUE );
-}
-
-
-/**
- * Disable GL capability.  Called by glDisable()
- * \param cap  state to disable.
- */
-void GLAPIENTRY
-_mesa_Disable( GLenum cap )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   _mesa_set_enable( ctx, cap, GL_FALSE );
-}
-
-
-
-/**
- * Enable/disable an indexed state var.
- */
-void
-_mesa_set_enablei(GLcontext *ctx, GLenum cap, GLuint index, GLboolean state)
-{
-   ASSERT(state == 0 || state == 1);
-   switch (cap) {
-   case GL_BLEND:
-      if (!ctx->Extensions.EXT_draw_buffers2) {
-         goto invalid_enum_error;
-      }
-      if (index >= ctx->Const.MaxDrawBuffers) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)",
-                     state ? "glEnableIndexed" : "glDisableIndexed", index);
-         return;
-      }
-      if (((ctx->Color.BlendEnabled >> index) & 1) != state) {
-         FLUSH_VERTICES(ctx, _NEW_COLOR);
-         if (state)
-            ctx->Color.BlendEnabled |= (1 << index);
-         else
-            ctx->Color.BlendEnabled &= ~(1 << index);
-      }
-      break;
-   default:
-      goto invalid_enum_error;
-   }
-   return;
-
-invalid_enum_error:
-    _mesa_error(ctx, GL_INVALID_ENUM, "%s(cap=%s)",
-                state ? "glEnablei" : "glDisablei",
-                _mesa_lookup_enum_by_nr(cap));
-}
-
-
-void GLAPIENTRY
-_mesa_DisableIndexed( GLenum cap, GLuint index )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   _mesa_set_enablei(ctx, cap, index, GL_FALSE);
-}
-
-
-void GLAPIENTRY
-_mesa_EnableIndexed( GLenum cap, GLuint index )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   _mesa_set_enablei(ctx, cap, index, GL_TRUE);
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsEnabledIndexed( GLenum cap, GLuint index )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   switch (cap) {
-   case GL_BLEND:
-      if (index >= ctx->Const.MaxDrawBuffers) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glIsEnabledIndexed(index=%u)",
-                     index);
-         return GL_FALSE;
-      }
-      return (ctx->Color.BlendEnabled >> index) & 1;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabledIndexed(cap=%s)",
-                  _mesa_lookup_enum_by_nr(cap));
-      return GL_FALSE;
-   }
-}
-
-
-
-
-#undef CHECK_EXTENSION
-#define CHECK_EXTENSION(EXTNAME)			\
-   if (!ctx->Extensions.EXTNAME) {			\
-      goto invalid_enum_error;				\
-   }
-
-#undef CHECK_EXTENSION2
-#define CHECK_EXTENSION2(EXT1, EXT2)				\
-   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {	\
-      goto invalid_enum_error;					\
-   }
-
-
-/**
- * Helper function to determine whether a texture target is enabled.
- */
-static GLboolean
-is_texture_enabled(GLcontext *ctx, GLbitfield bit)
-{
-   const struct gl_texture_unit *const texUnit =
-       &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   return (texUnit->Enabled & bit) ? GL_TRUE : GL_FALSE;
-}
-
-
-/**
- * Return simple enable/disable state.
- *
- * \param cap  state variable to query.
- *
- * Returns the state of the specified capability from the current GL context.
- * For the capabilities associated with extensions verifies that those
- * extensions are effectively present before reporting.
- */
-GLboolean GLAPIENTRY
-_mesa_IsEnabled( GLenum cap )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   switch (cap) {
-      case GL_ALPHA_TEST:
-         return ctx->Color.AlphaEnabled;
-      case GL_AUTO_NORMAL:
-	 return ctx->Eval.AutoNormal;
-      case GL_BLEND:
-         return ctx->Color.BlendEnabled & 1;  /* return state for buffer[0] */
-      case GL_CLIP_PLANE0:
-      case GL_CLIP_PLANE1:
-      case GL_CLIP_PLANE2:
-      case GL_CLIP_PLANE3:
-      case GL_CLIP_PLANE4:
-      case GL_CLIP_PLANE5:
-	 return (ctx->Transform.ClipPlanesEnabled >> (cap - GL_CLIP_PLANE0)) & 1;
-      case GL_COLOR_MATERIAL:
-	 return ctx->Light.ColorMaterialEnabled;
-      case GL_CULL_FACE:
-         return ctx->Polygon.CullFlag;
-      case GL_DEPTH_TEST:
-         return ctx->Depth.Test;
-      case GL_DITHER:
-	 return ctx->Color.DitherFlag;
-      case GL_FOG:
-	 return ctx->Fog.Enabled;
-      case GL_LIGHTING:
-         return ctx->Light.Enabled;
-      case GL_LIGHT0:
-      case GL_LIGHT1:
-      case GL_LIGHT2:
-      case GL_LIGHT3:
-      case GL_LIGHT4:
-      case GL_LIGHT5:
-      case GL_LIGHT6:
-      case GL_LIGHT7:
-         return ctx->Light.Light[cap-GL_LIGHT0].Enabled;
-      case GL_LINE_SMOOTH:
-	 return ctx->Line.SmoothFlag;
-      case GL_LINE_STIPPLE:
-	 return ctx->Line.StippleFlag;
-      case GL_INDEX_LOGIC_OP:
-	 return ctx->Color.IndexLogicOpEnabled;
-      case GL_COLOR_LOGIC_OP:
-	 return ctx->Color.ColorLogicOpEnabled;
-      case GL_MAP1_COLOR_4:
-	 return ctx->Eval.Map1Color4;
-      case GL_MAP1_INDEX:
-	 return ctx->Eval.Map1Index;
-      case GL_MAP1_NORMAL:
-	 return ctx->Eval.Map1Normal;
-      case GL_MAP1_TEXTURE_COORD_1:
-	 return ctx->Eval.Map1TextureCoord1;
-      case GL_MAP1_TEXTURE_COORD_2:
-	 return ctx->Eval.Map1TextureCoord2;
-      case GL_MAP1_TEXTURE_COORD_3:
-	 return ctx->Eval.Map1TextureCoord3;
-      case GL_MAP1_TEXTURE_COORD_4:
-	 return ctx->Eval.Map1TextureCoord4;
-      case GL_MAP1_VERTEX_3:
-	 return ctx->Eval.Map1Vertex3;
-      case GL_MAP1_VERTEX_4:
-	 return ctx->Eval.Map1Vertex4;
-      case GL_MAP2_COLOR_4:
-	 return ctx->Eval.Map2Color4;
-      case GL_MAP2_INDEX:
-	 return ctx->Eval.Map2Index;
-      case GL_MAP2_NORMAL:
-	 return ctx->Eval.Map2Normal;
-      case GL_MAP2_TEXTURE_COORD_1:
-	 return ctx->Eval.Map2TextureCoord1;
-      case GL_MAP2_TEXTURE_COORD_2:
-	 return ctx->Eval.Map2TextureCoord2;
-      case GL_MAP2_TEXTURE_COORD_3:
-	 return ctx->Eval.Map2TextureCoord3;
-      case GL_MAP2_TEXTURE_COORD_4:
-	 return ctx->Eval.Map2TextureCoord4;
-      case GL_MAP2_VERTEX_3:
-	 return ctx->Eval.Map2Vertex3;
-      case GL_MAP2_VERTEX_4:
-	 return ctx->Eval.Map2Vertex4;
-      case GL_NORMALIZE:
-	 return ctx->Transform.Normalize;
-      case GL_POINT_SMOOTH:
-	 return ctx->Point.SmoothFlag;
-      case GL_POLYGON_SMOOTH:
-	 return ctx->Polygon.SmoothFlag;
-      case GL_POLYGON_STIPPLE:
-	 return ctx->Polygon.StippleFlag;
-      case GL_POLYGON_OFFSET_POINT:
-	 return ctx->Polygon.OffsetPoint;
-      case GL_POLYGON_OFFSET_LINE:
-	 return ctx->Polygon.OffsetLine;
-      case GL_POLYGON_OFFSET_FILL:
-      /*case GL_POLYGON_OFFSET_EXT:*/
-	 return ctx->Polygon.OffsetFill;
-      case GL_RESCALE_NORMAL_EXT:
-         return ctx->Transform.RescaleNormals;
-      case GL_SCISSOR_TEST:
-	 return ctx->Scissor.Enabled;
-      case GL_SHARED_TEXTURE_PALETTE_EXT:
-         return ctx->Texture.SharedPalette;
-      case GL_STENCIL_TEST:
-	 return ctx->Stencil.Enabled;
-      case GL_TEXTURE_1D:
-         return is_texture_enabled(ctx, TEXTURE_1D_BIT);
-      case GL_TEXTURE_2D:
-         return is_texture_enabled(ctx, TEXTURE_2D_BIT);
-      case GL_TEXTURE_3D:
-         return is_texture_enabled(ctx, TEXTURE_3D_BIT);
-      case GL_TEXTURE_GEN_Q:
-         {
-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               return (texUnit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE;
-            }
-         }
-         return GL_FALSE;
-      case GL_TEXTURE_GEN_R:
-         {
-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               return (texUnit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE;
-            }
-         }
-         return GL_FALSE;
-      case GL_TEXTURE_GEN_S:
-         {
-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               return (texUnit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE;
-            }
-         }
-         return GL_FALSE;
-      case GL_TEXTURE_GEN_T:
-         {
-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-               return (texUnit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE;
-            }
-         }
-         return GL_FALSE;
-#if FEATURE_ES1
-      case GL_TEXTURE_GEN_STR_OES:
-	 {
-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);
-            if (texUnit) {
-		    return (texUnit->TexGenEnabled & STR_BITS) == STR_BITS ? GL_TRUE : GL_FALSE;
-            }
-         }
-#endif
-
-      /*
-       * CLIENT STATE!!!
-       */
-      case GL_VERTEX_ARRAY:
-         return (ctx->Array.ArrayObj->Vertex.Enabled != 0);
-      case GL_NORMAL_ARRAY:
-         return (ctx->Array.ArrayObj->Normal.Enabled != 0);
-      case GL_COLOR_ARRAY:
-         return (ctx->Array.ArrayObj->Color.Enabled != 0);
-      case GL_INDEX_ARRAY:
-         return (ctx->Array.ArrayObj->Index.Enabled != 0);
-      case GL_TEXTURE_COORD_ARRAY:
-         return (ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled != 0);
-      case GL_EDGE_FLAG_ARRAY:
-         return (ctx->Array.ArrayObj->EdgeFlag.Enabled != 0);
-      case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXTENSION(EXT_fog_coord);
-         return (ctx->Array.ArrayObj->FogCoord.Enabled != 0);
-      case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXTENSION(EXT_secondary_color);
-         return (ctx->Array.ArrayObj->SecondaryColor.Enabled != 0);
-#if FEATURE_point_size_array
-      case GL_POINT_SIZE_ARRAY_OES:
-         return (ctx->Array.ArrayObj->PointSize.Enabled != 0);
-#endif
-
-      /* GL_EXT_histogram */
-      case GL_HISTOGRAM:
-         CHECK_EXTENSION(EXT_histogram);
-         return ctx->Pixel.HistogramEnabled;
-      case GL_MINMAX:
-         CHECK_EXTENSION(EXT_histogram);
-         return ctx->Pixel.MinMaxEnabled;
-
-      /* GL_SGI_color_table */
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table);
-         return ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION];
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table);
-         return ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION];
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table);
-         return ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX];
-
-      /* GL_SGI_texture_color_table */
-      case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_texture_color_table);
-         return ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled;
-
-      /* GL_EXT_convolution */
-      case GL_CONVOLUTION_1D:
-         CHECK_EXTENSION(EXT_convolution);
-         return ctx->Pixel.Convolution1DEnabled;
-      case GL_CONVOLUTION_2D:
-         CHECK_EXTENSION(EXT_convolution);
-         return ctx->Pixel.Convolution2DEnabled;
-      case GL_SEPARABLE_2D:
-         CHECK_EXTENSION(EXT_convolution);
-         return ctx->Pixel.Separable2DEnabled;
-
-      /* GL_ARB_texture_cube_map */
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXTENSION(ARB_texture_cube_map);
-         return is_texture_enabled(ctx, TEXTURE_CUBE_BIT);
-
-      /* GL_EXT_secondary_color */
-      case GL_COLOR_SUM_EXT:
-         CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program);
-         return ctx->Fog.ColorSumEnabled;
-
-      /* GL_ARB_multisample */
-      case GL_MULTISAMPLE_ARB:
-         return ctx->Multisample.Enabled;
-      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         return ctx->Multisample.SampleAlphaToCoverage;
-      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         return ctx->Multisample.SampleAlphaToOne;
-      case GL_SAMPLE_COVERAGE_ARB:
-         return ctx->Multisample.SampleCoverage;
-      case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         return ctx->Multisample.SampleCoverageInvert;
-
-      /* GL_IBM_rasterpos_clip */
-      case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXTENSION(IBM_rasterpos_clip);
-         return ctx->Transform.RasterPositionUnclipped;
-
-      /* GL_NV_point_sprite */
-      case GL_POINT_SPRITE_NV:
-         CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite)
-         return ctx->Point.PointSprite;
-
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-      case GL_VERTEX_PROGRAM_ARB:
-         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
-         return ctx->VertexProgram.Enabled;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
-         return ctx->VertexProgram.PointSizeEnabled;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
-         return ctx->VertexProgram.TwoSideEnabled;
-#endif
-#if FEATURE_NV_vertex_program
-      case GL_VERTEX_ATTRIB_ARRAY0_NV:
-      case GL_VERTEX_ATTRIB_ARRAY1_NV:
-      case GL_VERTEX_ATTRIB_ARRAY2_NV:
-      case GL_VERTEX_ATTRIB_ARRAY3_NV:
-      case GL_VERTEX_ATTRIB_ARRAY4_NV:
-      case GL_VERTEX_ATTRIB_ARRAY5_NV:
-      case GL_VERTEX_ATTRIB_ARRAY6_NV:
-      case GL_VERTEX_ATTRIB_ARRAY7_NV:
-      case GL_VERTEX_ATTRIB_ARRAY8_NV:
-      case GL_VERTEX_ATTRIB_ARRAY9_NV:
-      case GL_VERTEX_ATTRIB_ARRAY10_NV:
-      case GL_VERTEX_ATTRIB_ARRAY11_NV:
-      case GL_VERTEX_ATTRIB_ARRAY12_NV:
-      case GL_VERTEX_ATTRIB_ARRAY13_NV:
-      case GL_VERTEX_ATTRIB_ARRAY14_NV:
-      case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXTENSION(NV_vertex_program);
-         {
-            GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
-            ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));
-            return (ctx->Array.ArrayObj->VertexAttrib[n].Enabled != 0);
-         }
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION(NV_vertex_program);
-         {
-            const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);
-            return ctx->Eval.Map1Attrib[map];
-         }
-      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION(NV_vertex_program);
-         {
-            const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
-            return ctx->Eval.Map2Attrib[map];
-         }
-#endif /* FEATURE_NV_vertex_program */
-
-#if FEATURE_NV_fragment_program
-      case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXTENSION(NV_fragment_program);
-         return ctx->FragmentProgram.Enabled;
-#endif /* FEATURE_NV_fragment_program */
-
-      /* GL_NV_texture_rectangle */
-      case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXTENSION(NV_texture_rectangle);
-         return is_texture_enabled(ctx, TEXTURE_RECT_BIT);
-
-      /* GL_EXT_stencil_two_side */
-      case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXTENSION(EXT_stencil_two_side);
-         return ctx->Stencil.TestTwoSide;
-
-#if FEATURE_ARB_fragment_program
-      case GL_FRAGMENT_PROGRAM_ARB:
-         return ctx->FragmentProgram.Enabled;
-#endif /* FEATURE_ARB_fragment_program */
-
-      /* GL_EXT_depth_bounds_test */
-      case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXTENSION(EXT_depth_bounds_test);
-         return ctx->Depth.BoundsTest;
-
-      /* GL_ARB_depth_clamp */
-      case GL_DEPTH_CLAMP:
-         CHECK_EXTENSION(ARB_depth_clamp);
-         return ctx->Transform.DepthClamp;
-
-#if FEATURE_ATI_fragment_shader
-      case GL_FRAGMENT_SHADER_ATI:
-	 CHECK_EXTENSION(ATI_fragment_shader);
-	 return ctx->ATIFragmentShader.Enabled;
-#endif /* FEATURE_ATI_fragment_shader */
-
-      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-	 CHECK_EXTENSION(ARB_seamless_cube_map);
-	 return ctx->Texture.CubeMapSeamless;
-
-#if FEATURE_EXT_transform_feedback
-      case GL_RASTERIZER_DISCARD:
-	 CHECK_EXTENSION(EXT_transform_feedback);
-         return ctx->TransformFeedback.RasterDiscard;
-#endif
-
-      /* GL 3.1 primitive restart */
-      case GL_PRIMITIVE_RESTART:
-	 if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
-            goto invalid_enum_error;
-         }
-         return ctx->Array.PrimitiveRestart;
-
-      default:
-         goto invalid_enum_error;
-   }
-
-   return GL_FALSE;
-
-invalid_enum_error:
-   _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled(0x%x)", (int) cap);
-   return GL_FALSE;
-}
+/**

+ * \file enable.c

+ * Enable/disable/query GL capabilities.

+ */

+

+/*

+ * 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 "glheader.h"

+#include "context.h"

+#include "enable.h"

+#include "light.h"

+#include "simple_list.h"

+#include "mtypes.h"

+#include "enums.h"

+#include "api_arrayelt.h"

+#include "texstate.h"

+

+

+

+#define CHECK_EXTENSION(EXTNAME, CAP)					\

+   if (!ctx->Extensions.EXTNAME) {					\

+      goto invalid_enum_error;						\

+   }

+

+

+/**

+ * Helper to enable/disable client-side state.

+ */

+static void

+client_state(struct gl_context *ctx, GLenum cap, GLboolean state)

+{

+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+   GLuint flag;

+   GLboolean *var;

+

+   switch (cap) {

+      case GL_VERTEX_ARRAY:

+         var = &arrayObj->Vertex.Enabled;

+         flag = _NEW_ARRAY_VERTEX;

+         break;

+      case GL_NORMAL_ARRAY:

+         var = &arrayObj->Normal.Enabled;

+         flag = _NEW_ARRAY_NORMAL;

+         break;

+      case GL_COLOR_ARRAY:

+         var = &arrayObj->Color.Enabled;

+         flag = _NEW_ARRAY_COLOR0;

+         break;

+      case GL_INDEX_ARRAY:

+         var = &arrayObj->Index.Enabled;

+         flag = _NEW_ARRAY_INDEX;

+         break;

+      case GL_TEXTURE_COORD_ARRAY:

+         var = &arrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled;

+         flag = _NEW_ARRAY_TEXCOORD(ctx->Array.ActiveTexture);

+         break;

+      case GL_EDGE_FLAG_ARRAY:

+         var = &arrayObj->EdgeFlag.Enabled;

+         flag = _NEW_ARRAY_EDGEFLAG;

+         break;

+      case GL_FOG_COORDINATE_ARRAY_EXT:

+         var = &arrayObj->FogCoord.Enabled;

+         flag = _NEW_ARRAY_FOGCOORD;

+         break;

+      case GL_SECONDARY_COLOR_ARRAY_EXT:

+         var = &arrayObj->SecondaryColor.Enabled;

+         flag = _NEW_ARRAY_COLOR1;

+         break;

+

+#if FEATURE_point_size_array

+      case GL_POINT_SIZE_ARRAY_OES:

+         var = &arrayObj->PointSize.Enabled;

+         flag = _NEW_ARRAY_POINT_SIZE;

+         break;

+#endif

+

+#if FEATURE_NV_vertex_program

+      case GL_VERTEX_ATTRIB_ARRAY0_NV:

+      case GL_VERTEX_ATTRIB_ARRAY1_NV:

+      case GL_VERTEX_ATTRIB_ARRAY2_NV:

+      case GL_VERTEX_ATTRIB_ARRAY3_NV:

+      case GL_VERTEX_ATTRIB_ARRAY4_NV:

+      case GL_VERTEX_ATTRIB_ARRAY5_NV:

+      case GL_VERTEX_ATTRIB_ARRAY6_NV:

+      case GL_VERTEX_ATTRIB_ARRAY7_NV:

+      case GL_VERTEX_ATTRIB_ARRAY8_NV:

+      case GL_VERTEX_ATTRIB_ARRAY9_NV:

+      case GL_VERTEX_ATTRIB_ARRAY10_NV:

+      case GL_VERTEX_ATTRIB_ARRAY11_NV:

+      case GL_VERTEX_ATTRIB_ARRAY12_NV:

+      case GL_VERTEX_ATTRIB_ARRAY13_NV:

+      case GL_VERTEX_ATTRIB_ARRAY14_NV:

+      case GL_VERTEX_ATTRIB_ARRAY15_NV:

+         CHECK_EXTENSION(NV_vertex_program, cap);

+         {

+            GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;

+            ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));

+            var = &arrayObj->VertexAttrib[n].Enabled;

+            flag = _NEW_ARRAY_ATTRIB(n);

+         }

+         break;

+#endif /* FEATURE_NV_vertex_program */

+

+      /* GL_NV_primitive_restart */

+      case GL_PRIMITIVE_RESTART_NV:

+	 if (!ctx->Extensions.NV_primitive_restart) {

+            goto invalid_enum_error;

+         }

+         var = &ctx->Array.PrimitiveRestart;

+         flag = 0;

+         break;

+

+      default:

+         goto invalid_enum_error;

+   }

+

+   if (*var == state)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_ARRAY);

+   ctx->Array.NewState |= flag;

+

+   _ae_invalidate_state(ctx, _NEW_ARRAY);

+

+   *var = state;

+

+   if (state)

+      ctx->Array.ArrayObj->_Enabled |= flag;

+   else

+      ctx->Array.ArrayObj->_Enabled &= ~flag;

+

+   if (ctx->Driver.Enable) {

+      ctx->Driver.Enable( ctx, cap, state );

+   }

+

+   return;

+

+invalid_enum_error:

+   _mesa_error(ctx, GL_INVALID_ENUM, "gl%sClientState(0x%x)",

+               state ? "Enable" : "Disable", cap);

+}

+

+

+/**

+ * Enable GL capability.

+ * \param cap  state to enable/disable.

+ *

+ * Get's the current context, assures that we're outside glBegin()/glEnd() and

+ * calls client_state().

+ */

+void GLAPIENTRY

+_mesa_EnableClientState( GLenum cap )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   client_state( ctx, cap, GL_TRUE );

+}

+

+

+/**

+ * Disable GL capability.

+ * \param cap  state to enable/disable.

+ *

+ * Get's the current context, assures that we're outside glBegin()/glEnd() and

+ * calls client_state().

+ */

+void GLAPIENTRY

+_mesa_DisableClientState( GLenum cap )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   client_state( ctx, cap, GL_FALSE );

+}

+

+

+#undef CHECK_EXTENSION

+#define CHECK_EXTENSION(EXTNAME, CAP)					\

+   if (!ctx->Extensions.EXTNAME) {					\

+      goto invalid_enum_error;						\

+   }

+

+#define CHECK_EXTENSION2(EXT1, EXT2, CAP)				\

+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {		\

+      goto invalid_enum_error;						\

+   }

+

+

+

+/**

+ * Return pointer to current texture unit for setting/getting coordinate

+ * state.

+ * Note that we'll set GL_INVALID_OPERATION if the active texture unit is

+ * higher than the number of supported coordinate units.  And we'll return NULL.

+ */

+static struct gl_texture_unit *

+get_texcoord_unit(struct gl_context *ctx)

+{

+   if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glEnable/Disable(texcoord unit)");

+      return NULL;

+   }

+   else {

+      return &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   }

+}

+

+

+/**

+ * Helper function to enable or disable a texture target.

+ * \param bit  one of the TEXTURE_x_BIT values

+ * \return GL_TRUE if state is changing or GL_FALSE if no change

+ */

+static GLboolean

+enable_texture(struct gl_context *ctx, GLboolean state, GLbitfield texBit)

+{

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   const GLbitfield newenabled = state

+      ? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit);

+

+   if (texUnit->Enabled == newenabled)

+       return GL_FALSE;

+

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+   texUnit->Enabled = newenabled;

+   return GL_TRUE;

+}

+

+

+/**

+ * Helper function to enable or disable state.

+ *

+ * \param ctx GL context.

+ * \param cap  the state to enable/disable

+ * \param state whether to enable or disable the specified capability.

+ *

+ * Updates the current context and flushes the vertices as needed. For

+ * capabilities associated with extensions it verifies that those extensions

+ * are effectivly present before updating. Notifies the driver via

+ * dd_function_table::Enable.

+ */

+void

+_mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)

+{

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "%s %s (newstate is %x)\n",

+                  state ? "glEnable" : "glDisable",

+                  _mesa_lookup_enum_by_nr(cap),

+                  ctx->NewState);

+

+   switch (cap) {

+      case GL_ALPHA_TEST:

+         if (ctx->Color.AlphaEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_COLOR);

+         ctx->Color.AlphaEnabled = state;

+         break;

+      case GL_AUTO_NORMAL:

+         if (ctx->Eval.AutoNormal == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.AutoNormal = state;

+         break;

+      case GL_BLEND:

+         {

+            GLbitfield newEnabled = state * ((1 << ctx->Const.MaxDrawBuffers) - 1);

+            if (newEnabled != ctx->Color.BlendEnabled) {

+               FLUSH_VERTICES(ctx, _NEW_COLOR);

+               ctx->Color.BlendEnabled = newEnabled;

+            }

+         }

+         break;

+#if FEATURE_userclip

+      case GL_CLIP_PLANE0:

+      case GL_CLIP_PLANE1:

+      case GL_CLIP_PLANE2:

+      case GL_CLIP_PLANE3:

+      case GL_CLIP_PLANE4:

+      case GL_CLIP_PLANE5:

+         {

+            const GLuint p = cap - GL_CLIP_PLANE0;

+

+            if ((ctx->Transform.ClipPlanesEnabled & (1 << p)) == ((GLuint) state << p))

+               return;

+

+            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+

+            if (state) {

+               ctx->Transform.ClipPlanesEnabled |= (1 << p);

+

+               if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))

+                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

+

+               /* This derived state also calculated in clip.c and

+                * from _mesa_update_state() on changes to EyeUserPlane

+                * and ctx->ProjectionMatrix respectively.

+                */

+               _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],

+                                    ctx->Transform.EyeUserPlane[p],

+                                    ctx->ProjectionMatrixStack.Top->inv );

+            }

+            else {

+               ctx->Transform.ClipPlanesEnabled &= ~(1 << p);

+            }               

+         }

+         break;

+#endif

+      case GL_COLOR_MATERIAL:

+         if (ctx->Light.ColorMaterialEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_LIGHT);

+         FLUSH_CURRENT(ctx, 0);

+         ctx->Light.ColorMaterialEnabled = state;

+         if (state) {

+            _mesa_update_color_material( ctx,

+                                  ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );

+         }

+         break;

+      case GL_CULL_FACE:

+         if (ctx->Polygon.CullFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POLYGON);

+         ctx->Polygon.CullFlag = state;

+         break;

+      case GL_DEPTH_TEST:

+         if (ctx->Depth.Test == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_DEPTH);

+         ctx->Depth.Test = state;

+         break;

+      case GL_DITHER:

+         if (ctx->NoDither) {

+            state = GL_FALSE; /* MESA_NO_DITHER env var */

+         }

+         if (ctx->Color.DitherFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_COLOR);

+         ctx->Color.DitherFlag = state;

+         break;

+      case GL_FOG:

+         if (ctx->Fog.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_FOG);

+         ctx->Fog.Enabled = state;

+         break;

+      case GL_LIGHT0:

+      case GL_LIGHT1:

+      case GL_LIGHT2:

+      case GL_LIGHT3:

+      case GL_LIGHT4:

+      case GL_LIGHT5:

+      case GL_LIGHT6:

+      case GL_LIGHT7:

+         if (ctx->Light.Light[cap-GL_LIGHT0].Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_LIGHT);

+         ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;

+         if (state) {

+            insert_at_tail(&ctx->Light.EnabledList,

+                           &ctx->Light.Light[cap-GL_LIGHT0]);

+         }

+         else {

+            remove_from_list(&ctx->Light.Light[cap-GL_LIGHT0]);

+         }

+         break;

+      case GL_LIGHTING:

+         if (ctx->Light.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_LIGHT);

+         ctx->Light.Enabled = state;

+         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)

+            ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;

+         else

+            ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;

+         break;

+      case GL_LINE_SMOOTH:

+         if (ctx->Line.SmoothFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_LINE);

+         ctx->Line.SmoothFlag = state;

+         ctx->_TriangleCaps ^= DD_LINE_SMOOTH;

+         break;

+      case GL_LINE_STIPPLE:

+         if (ctx->Line.StippleFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_LINE);

+         ctx->Line.StippleFlag = state;

+         ctx->_TriangleCaps ^= DD_LINE_STIPPLE;

+         break;

+      case GL_INDEX_LOGIC_OP:

+         if (ctx->Color.IndexLogicOpEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_COLOR);

+         ctx->Color.IndexLogicOpEnabled = state;

+         break;

+      case GL_COLOR_LOGIC_OP:

+         if (ctx->Color.ColorLogicOpEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_COLOR);

+         ctx->Color.ColorLogicOpEnabled = state;

+         break;

+      case GL_MAP1_COLOR_4:

+         if (ctx->Eval.Map1Color4 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1Color4 = state;

+         break;

+      case GL_MAP1_INDEX:

+         if (ctx->Eval.Map1Index == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1Index = state;

+         break;

+      case GL_MAP1_NORMAL:

+         if (ctx->Eval.Map1Normal == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1Normal = state;

+         break;

+      case GL_MAP1_TEXTURE_COORD_1:

+         if (ctx->Eval.Map1TextureCoord1 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1TextureCoord1 = state;

+         break;

+      case GL_MAP1_TEXTURE_COORD_2:

+         if (ctx->Eval.Map1TextureCoord2 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1TextureCoord2 = state;

+         break;

+      case GL_MAP1_TEXTURE_COORD_3:

+         if (ctx->Eval.Map1TextureCoord3 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1TextureCoord3 = state;

+         break;

+      case GL_MAP1_TEXTURE_COORD_4:

+         if (ctx->Eval.Map1TextureCoord4 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1TextureCoord4 = state;

+         break;

+      case GL_MAP1_VERTEX_3:

+         if (ctx->Eval.Map1Vertex3 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1Vertex3 = state;

+         break;

+      case GL_MAP1_VERTEX_4:

+         if (ctx->Eval.Map1Vertex4 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map1Vertex4 = state;

+         break;

+      case GL_MAP2_COLOR_4:

+         if (ctx->Eval.Map2Color4 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2Color4 = state;

+         break;

+      case GL_MAP2_INDEX:

+         if (ctx->Eval.Map2Index == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2Index = state;

+         break;

+      case GL_MAP2_NORMAL:

+         if (ctx->Eval.Map2Normal == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2Normal = state;

+         break;

+      case GL_MAP2_TEXTURE_COORD_1:

+         if (ctx->Eval.Map2TextureCoord1 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2TextureCoord1 = state;

+         break;

+      case GL_MAP2_TEXTURE_COORD_2:

+         if (ctx->Eval.Map2TextureCoord2 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2TextureCoord2 = state;

+         break;

+      case GL_MAP2_TEXTURE_COORD_3:

+         if (ctx->Eval.Map2TextureCoord3 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2TextureCoord3 = state;

+         break;

+      case GL_MAP2_TEXTURE_COORD_4:

+         if (ctx->Eval.Map2TextureCoord4 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2TextureCoord4 = state;

+         break;

+      case GL_MAP2_VERTEX_3:

+         if (ctx->Eval.Map2Vertex3 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2Vertex3 = state;

+         break;

+      case GL_MAP2_VERTEX_4:

+         if (ctx->Eval.Map2Vertex4 == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_EVAL);

+         ctx->Eval.Map2Vertex4 = state;

+         break;

+      case GL_NORMALIZE:

+         if (ctx->Transform.Normalize == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+         ctx->Transform.Normalize = state;

+         break;

+      case GL_POINT_SMOOTH:

+         if (ctx->Point.SmoothFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POINT);

+         ctx->Point.SmoothFlag = state;

+         ctx->_TriangleCaps ^= DD_POINT_SMOOTH;

+         break;

+      case GL_POLYGON_SMOOTH:

+         if (ctx->Polygon.SmoothFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POLYGON);

+         ctx->Polygon.SmoothFlag = state;

+         ctx->_TriangleCaps ^= DD_TRI_SMOOTH;

+         break;

+      case GL_POLYGON_STIPPLE:

+         if (ctx->Polygon.StippleFlag == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POLYGON);

+         ctx->Polygon.StippleFlag = state;

+         ctx->_TriangleCaps ^= DD_TRI_STIPPLE;

+         break;

+      case GL_POLYGON_OFFSET_POINT:

+         if (ctx->Polygon.OffsetPoint == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POLYGON);

+         ctx->Polygon.OffsetPoint = state;

+         break;

+      case GL_POLYGON_OFFSET_LINE:

+         if (ctx->Polygon.OffsetLine == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POLYGON);

+         ctx->Polygon.OffsetLine = state;

+         break;

+      case GL_POLYGON_OFFSET_FILL:

+         /*case GL_POLYGON_OFFSET_EXT:*/

+         if (ctx->Polygon.OffsetFill == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POLYGON);

+         ctx->Polygon.OffsetFill = state;

+         break;

+      case GL_RESCALE_NORMAL_EXT:

+         if (ctx->Transform.RescaleNormals == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+         ctx->Transform.RescaleNormals = state;

+         break;

+      case GL_SCISSOR_TEST:

+         if (ctx->Scissor.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_SCISSOR);

+         ctx->Scissor.Enabled = state;

+         break;

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         if (ctx->Texture.SharedPalette == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+         ctx->Texture.SharedPalette = state;

+         break;

+      case GL_STENCIL_TEST:

+         if (ctx->Stencil.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_STENCIL);

+         ctx->Stencil.Enabled = state;

+         break;

+      case GL_TEXTURE_1D:

+         if (!enable_texture(ctx, state, TEXTURE_1D_BIT)) {

+            return;

+         }

+         break;

+      case GL_TEXTURE_2D:

+         if (!enable_texture(ctx, state, TEXTURE_2D_BIT)) {

+            return;

+         }

+         break;

+      case GL_TEXTURE_3D:

+         if (!enable_texture(ctx, state, TEXTURE_3D_BIT)) {

+            return;

+         }

+         break;

+      case GL_TEXTURE_GEN_Q:

+         {

+            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               GLuint newenabled = texUnit->TexGenEnabled & ~Q_BIT;

+               if (state)

+                  newenabled |= Q_BIT;

+               if (texUnit->TexGenEnabled == newenabled)

+                  return;

+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+               texUnit->TexGenEnabled = newenabled;

+            }

+         }

+         break;

+      case GL_TEXTURE_GEN_R:

+         {

+            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               GLuint newenabled = texUnit->TexGenEnabled & ~R_BIT;

+               if (state)

+                  newenabled |= R_BIT;

+               if (texUnit->TexGenEnabled == newenabled)

+                  return;

+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+               texUnit->TexGenEnabled = newenabled;

+            }

+         }

+         break;

+      case GL_TEXTURE_GEN_S:

+         {

+            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               GLuint newenabled = texUnit->TexGenEnabled & ~S_BIT;

+               if (state)

+                  newenabled |= S_BIT;

+               if (texUnit->TexGenEnabled == newenabled)

+                  return;

+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+               texUnit->TexGenEnabled = newenabled;

+            }

+         }

+         break;

+      case GL_TEXTURE_GEN_T:

+         {

+            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               GLuint newenabled = texUnit->TexGenEnabled & ~T_BIT;

+               if (state)

+                  newenabled |= T_BIT;

+               if (texUnit->TexGenEnabled == newenabled)

+                  return;

+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+               texUnit->TexGenEnabled = newenabled;

+            }

+         }

+         break;

+

+#if FEATURE_ES1

+      case GL_TEXTURE_GEN_STR_OES:

+	 /* disable S, T, and R at the same time */

+	 {

+            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               GLuint newenabled =

+		  texUnit->TexGenEnabled & ~STR_BITS;

+               if (state)

+                  newenabled |= STR_BITS;

+               if (texUnit->TexGenEnabled == newenabled)

+                  return;

+               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+               texUnit->TexGenEnabled = newenabled;

+            }

+         }

+         break;

+#endif

+

+      /*

+       * CLIENT STATE!!!

+       */

+      case GL_VERTEX_ARRAY:

+      case GL_NORMAL_ARRAY:

+      case GL_COLOR_ARRAY:

+      case GL_INDEX_ARRAY:

+      case GL_TEXTURE_COORD_ARRAY:

+      case GL_EDGE_FLAG_ARRAY:

+      case GL_FOG_COORDINATE_ARRAY_EXT:

+      case GL_SECONDARY_COLOR_ARRAY_EXT:

+      case GL_POINT_SIZE_ARRAY_OES:

+         client_state( ctx, cap, state );

+         return;

+

+      /* GL_SGI_texture_color_table */

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         CHECK_EXTENSION(SGI_texture_color_table, cap);

+         if (ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+         ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled = state;

+         break;

+

+      /* GL_ARB_texture_cube_map */

+      case GL_TEXTURE_CUBE_MAP_ARB:

+         CHECK_EXTENSION(ARB_texture_cube_map, cap);

+         if (!enable_texture(ctx, state, TEXTURE_CUBE_BIT)) {

+            return;

+         }

+         break;

+

+      /* GL_EXT_secondary_color */

+      case GL_COLOR_SUM_EXT:

+         CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program, cap);

+         if (ctx->Fog.ColorSumEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_FOG);

+         ctx->Fog.ColorSumEnabled = state;

+         break;

+

+      /* GL_ARB_multisample */

+      case GL_MULTISAMPLE_ARB:

+         if (ctx->Multisample.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);

+         ctx->Multisample.Enabled = state;

+         break;

+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:

+         if (ctx->Multisample.SampleAlphaToCoverage == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);

+         ctx->Multisample.SampleAlphaToCoverage = state;

+         break;

+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:

+         if (ctx->Multisample.SampleAlphaToOne == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);

+         ctx->Multisample.SampleAlphaToOne = state;

+         break;

+      case GL_SAMPLE_COVERAGE_ARB:

+         if (ctx->Multisample.SampleCoverage == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);

+         ctx->Multisample.SampleCoverage = state;

+         break;

+      case GL_SAMPLE_COVERAGE_INVERT_ARB:

+         if (ctx->Multisample.SampleCoverageInvert == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_MULTISAMPLE);

+         ctx->Multisample.SampleCoverageInvert = state;

+         break;

+

+      /* GL_IBM_rasterpos_clip */

+      case GL_RASTER_POSITION_UNCLIPPED_IBM:

+         CHECK_EXTENSION(IBM_rasterpos_clip, cap);

+         if (ctx->Transform.RasterPositionUnclipped == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+         ctx->Transform.RasterPositionUnclipped = state;

+         break;

+

+      /* GL_NV_point_sprite */

+      case GL_POINT_SPRITE_NV:

+         CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite, cap);

+         if (ctx->Point.PointSprite == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_POINT);

+         ctx->Point.PointSprite = state;

+         break;

+

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

+      case GL_VERTEX_PROGRAM_ARB:

+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);

+         if (ctx->VertexProgram.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PROGRAM); 

+         ctx->VertexProgram.Enabled = state;

+         break;

+      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:

+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);

+         if (ctx->VertexProgram.PointSizeEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+         ctx->VertexProgram.PointSizeEnabled = state;

+         break;

+      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:

+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);

+         if (ctx->VertexProgram.TwoSideEnabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PROGRAM); 

+         ctx->VertexProgram.TwoSideEnabled = state;

+         break;

+#endif

+#if FEATURE_NV_vertex_program

+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:

+         CHECK_EXTENSION(NV_vertex_program, cap);

+         {

+            const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);

+            FLUSH_VERTICES(ctx, _NEW_EVAL);

+            ctx->Eval.Map1Attrib[map] = state;

+         }

+         break;

+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:

+         CHECK_EXTENSION(NV_vertex_program, cap);

+         {

+            const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);

+            FLUSH_VERTICES(ctx, _NEW_EVAL);

+            ctx->Eval.Map2Attrib[map] = state;

+         }

+         break;

+#endif /* FEATURE_NV_vertex_program */

+

+#if FEATURE_NV_fragment_program

+      case GL_FRAGMENT_PROGRAM_NV:

+         CHECK_EXTENSION(NV_fragment_program, cap);

+         if (ctx->FragmentProgram.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+         ctx->FragmentProgram.Enabled = state;

+         break;

+#endif /* FEATURE_NV_fragment_program */

+

+      /* GL_NV_texture_rectangle */

+      case GL_TEXTURE_RECTANGLE_NV:

+         CHECK_EXTENSION(NV_texture_rectangle, cap);

+         if (!enable_texture(ctx, state, TEXTURE_RECT_BIT)) {

+            return;

+         }

+         break;

+

+      /* GL_EXT_stencil_two_side */

+      case GL_STENCIL_TEST_TWO_SIDE_EXT:

+         CHECK_EXTENSION(EXT_stencil_two_side, cap);

+         if (ctx->Stencil.TestTwoSide == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_STENCIL);

+         ctx->Stencil.TestTwoSide = state;

+         if (state) {

+            ctx->Stencil._BackFace = 2;

+            ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;

+         } else {

+            ctx->Stencil._BackFace = 1;

+            ctx->_TriangleCaps &= ~DD_TRI_TWOSTENCIL;

+         }

+         break;

+

+#if FEATURE_ARB_fragment_program

+      case GL_FRAGMENT_PROGRAM_ARB:

+         CHECK_EXTENSION(ARB_fragment_program, cap);

+         if (ctx->FragmentProgram.Enabled == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+         ctx->FragmentProgram.Enabled = state;

+         break;

+#endif /* FEATURE_ARB_fragment_program */

+

+      /* GL_EXT_depth_bounds_test */

+      case GL_DEPTH_BOUNDS_TEST_EXT:

+         CHECK_EXTENSION(EXT_depth_bounds_test, cap);

+         if (ctx->Depth.BoundsTest == state)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_DEPTH);

+         ctx->Depth.BoundsTest = state;

+         break;

+

+      case GL_DEPTH_CLAMP:

+         if (ctx->Transform.DepthClamp == state)

+            return;

+	 CHECK_EXTENSION(ARB_depth_clamp, cap);

+         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+	 ctx->Transform.DepthClamp = state;

+	 break;

+

+#if FEATURE_ATI_fragment_shader

+      case GL_FRAGMENT_SHADER_ATI:

+        CHECK_EXTENSION(ATI_fragment_shader, cap);

+	if (ctx->ATIFragmentShader.Enabled == state)

+	  return;

+	FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+	ctx->ATIFragmentShader.Enabled = state;

+        break;

+#endif

+

+      /* GL_MESA_texture_array */

+      case GL_TEXTURE_1D_ARRAY_EXT:

+         CHECK_EXTENSION(MESA_texture_array, cap);

+         if (!enable_texture(ctx, state, TEXTURE_1D_ARRAY_BIT)) {

+            return;

+         }

+         break;

+

+      case GL_TEXTURE_2D_ARRAY_EXT:

+         CHECK_EXTENSION(MESA_texture_array, cap);

+         if (!enable_texture(ctx, state, TEXTURE_2D_ARRAY_BIT)) {

+            return;

+         }

+         break;

+

+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:

+	 CHECK_EXTENSION(ARB_seamless_cube_map, cap);

+	 ctx->Texture.CubeMapSeamless = state;

+	 break;

+

+#if FEATURE_EXT_transform_feedback

+      case GL_RASTERIZER_DISCARD:

+	 CHECK_EXTENSION(EXT_transform_feedback, cap);

+         if (ctx->TransformFeedback.RasterDiscard != state) {

+            ctx->TransformFeedback.RasterDiscard = state;

+            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+         }

+         break;

+#endif

+

+      /* GL 3.1 primitive restart.  Note: this enum is different from

+       * GL_PRIMITIVE_RESTART_NV (which is client state).

+       */

+      case GL_PRIMITIVE_RESTART:

+         if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {

+            goto invalid_enum_error;

+         }

+         if (ctx->Array.PrimitiveRestart != state) {

+            FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+            ctx->Array.PrimitiveRestart = state;

+         }

+         break;

+

+      default:

+         goto invalid_enum_error;

+   }

+

+   if (ctx->Driver.Enable) {

+      ctx->Driver.Enable( ctx, cap, state );

+   }

+

+   return;

+

+invalid_enum_error:

+   _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(0x%x)",

+               state ? "Enable" : "Disable", cap);

+}

+

+

+/**

+ * Enable GL capability.  Called by glEnable()

+ * \param cap  state to enable.

+ */

+void GLAPIENTRY

+_mesa_Enable( GLenum cap )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   _mesa_set_enable( ctx, cap, GL_TRUE );

+}

+

+

+/**

+ * Disable GL capability.  Called by glDisable()

+ * \param cap  state to disable.

+ */

+void GLAPIENTRY

+_mesa_Disable( GLenum cap )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   _mesa_set_enable( ctx, cap, GL_FALSE );

+}

+

+

+

+/**

+ * Enable/disable an indexed state var.

+ */

+void

+_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state)

+{

+   ASSERT(state == 0 || state == 1);

+   switch (cap) {

+   case GL_BLEND:

+      if (!ctx->Extensions.EXT_draw_buffers2) {

+         goto invalid_enum_error;

+      }

+      if (index >= ctx->Const.MaxDrawBuffers) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)",

+                     state ? "glEnableIndexed" : "glDisableIndexed", index);

+         return;

+      }

+      if (((ctx->Color.BlendEnabled >> index) & 1) != state) {

+         FLUSH_VERTICES(ctx, _NEW_COLOR);

+         if (state)

+            ctx->Color.BlendEnabled |= (1 << index);

+         else

+            ctx->Color.BlendEnabled &= ~(1 << index);

+      }

+      break;

+   default:

+      goto invalid_enum_error;

+   }

+   return;

+

+invalid_enum_error:

+    _mesa_error(ctx, GL_INVALID_ENUM, "%s(cap=%s)",

+                state ? "glEnablei" : "glDisablei",

+                _mesa_lookup_enum_by_nr(cap));

+}

+

+

+void GLAPIENTRY

+_mesa_DisableIndexed( GLenum cap, GLuint index )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   _mesa_set_enablei(ctx, cap, index, GL_FALSE);

+}

+

+

+void GLAPIENTRY

+_mesa_EnableIndexed( GLenum cap, GLuint index )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   _mesa_set_enablei(ctx, cap, index, GL_TRUE);

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsEnabledIndexed( GLenum cap, GLuint index )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   switch (cap) {

+   case GL_BLEND:

+      if (index >= ctx->Const.MaxDrawBuffers) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glIsEnabledIndexed(index=%u)",

+                     index);

+         return GL_FALSE;

+      }

+      return (ctx->Color.BlendEnabled >> index) & 1;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabledIndexed(cap=%s)",

+                  _mesa_lookup_enum_by_nr(cap));

+      return GL_FALSE;

+   }

+}

+

+

+

+

+#undef CHECK_EXTENSION

+#define CHECK_EXTENSION(EXTNAME)			\

+   if (!ctx->Extensions.EXTNAME) {			\

+      goto invalid_enum_error;				\

+   }

+

+#undef CHECK_EXTENSION2

+#define CHECK_EXTENSION2(EXT1, EXT2)				\

+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {	\

+      goto invalid_enum_error;					\

+   }

+

+

+/**

+ * Helper function to determine whether a texture target is enabled.

+ */

+static GLboolean

+is_texture_enabled(struct gl_context *ctx, GLbitfield bit)

+{

+   const struct gl_texture_unit *const texUnit =

+       &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   return (texUnit->Enabled & bit) ? GL_TRUE : GL_FALSE;

+}

+

+

+/**

+ * Return simple enable/disable state.

+ *

+ * \param cap  state variable to query.

+ *

+ * Returns the state of the specified capability from the current GL context.

+ * For the capabilities associated with extensions verifies that those

+ * extensions are effectively present before reporting.

+ */

+GLboolean GLAPIENTRY

+_mesa_IsEnabled( GLenum cap )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   switch (cap) {

+      case GL_ALPHA_TEST:

+         return ctx->Color.AlphaEnabled;

+      case GL_AUTO_NORMAL:

+	 return ctx->Eval.AutoNormal;

+      case GL_BLEND:

+         return ctx->Color.BlendEnabled & 1;  /* return state for buffer[0] */

+      case GL_CLIP_PLANE0:

+      case GL_CLIP_PLANE1:

+      case GL_CLIP_PLANE2:

+      case GL_CLIP_PLANE3:

+      case GL_CLIP_PLANE4:

+      case GL_CLIP_PLANE5:

+	 return (ctx->Transform.ClipPlanesEnabled >> (cap - GL_CLIP_PLANE0)) & 1;

+      case GL_COLOR_MATERIAL:

+	 return ctx->Light.ColorMaterialEnabled;

+      case GL_CULL_FACE:

+         return ctx->Polygon.CullFlag;

+      case GL_DEPTH_TEST:

+         return ctx->Depth.Test;

+      case GL_DITHER:

+	 return ctx->Color.DitherFlag;

+      case GL_FOG:

+	 return ctx->Fog.Enabled;

+      case GL_LIGHTING:

+         return ctx->Light.Enabled;

+      case GL_LIGHT0:

+      case GL_LIGHT1:

+      case GL_LIGHT2:

+      case GL_LIGHT3:

+      case GL_LIGHT4:

+      case GL_LIGHT5:

+      case GL_LIGHT6:

+      case GL_LIGHT7:

+         return ctx->Light.Light[cap-GL_LIGHT0].Enabled;

+      case GL_LINE_SMOOTH:

+	 return ctx->Line.SmoothFlag;

+      case GL_LINE_STIPPLE:

+	 return ctx->Line.StippleFlag;

+      case GL_INDEX_LOGIC_OP:

+	 return ctx->Color.IndexLogicOpEnabled;

+      case GL_COLOR_LOGIC_OP:

+	 return ctx->Color.ColorLogicOpEnabled;

+      case GL_MAP1_COLOR_4:

+	 return ctx->Eval.Map1Color4;

+      case GL_MAP1_INDEX:

+	 return ctx->Eval.Map1Index;

+      case GL_MAP1_NORMAL:

+	 return ctx->Eval.Map1Normal;

+      case GL_MAP1_TEXTURE_COORD_1:

+	 return ctx->Eval.Map1TextureCoord1;

+      case GL_MAP1_TEXTURE_COORD_2:

+	 return ctx->Eval.Map1TextureCoord2;

+      case GL_MAP1_TEXTURE_COORD_3:

+	 return ctx->Eval.Map1TextureCoord3;

+      case GL_MAP1_TEXTURE_COORD_4:

+	 return ctx->Eval.Map1TextureCoord4;

+      case GL_MAP1_VERTEX_3:

+	 return ctx->Eval.Map1Vertex3;

+      case GL_MAP1_VERTEX_4:

+	 return ctx->Eval.Map1Vertex4;

+      case GL_MAP2_COLOR_4:

+	 return ctx->Eval.Map2Color4;

+      case GL_MAP2_INDEX:

+	 return ctx->Eval.Map2Index;

+      case GL_MAP2_NORMAL:

+	 return ctx->Eval.Map2Normal;

+      case GL_MAP2_TEXTURE_COORD_1:

+	 return ctx->Eval.Map2TextureCoord1;

+      case GL_MAP2_TEXTURE_COORD_2:

+	 return ctx->Eval.Map2TextureCoord2;

+      case GL_MAP2_TEXTURE_COORD_3:

+	 return ctx->Eval.Map2TextureCoord3;

+      case GL_MAP2_TEXTURE_COORD_4:

+	 return ctx->Eval.Map2TextureCoord4;

+      case GL_MAP2_VERTEX_3:

+	 return ctx->Eval.Map2Vertex3;

+      case GL_MAP2_VERTEX_4:

+	 return ctx->Eval.Map2Vertex4;

+      case GL_NORMALIZE:

+	 return ctx->Transform.Normalize;

+      case GL_POINT_SMOOTH:

+	 return ctx->Point.SmoothFlag;

+      case GL_POLYGON_SMOOTH:

+	 return ctx->Polygon.SmoothFlag;

+      case GL_POLYGON_STIPPLE:

+	 return ctx->Polygon.StippleFlag;

+      case GL_POLYGON_OFFSET_POINT:

+	 return ctx->Polygon.OffsetPoint;

+      case GL_POLYGON_OFFSET_LINE:

+	 return ctx->Polygon.OffsetLine;

+      case GL_POLYGON_OFFSET_FILL:

+      /*case GL_POLYGON_OFFSET_EXT:*/

+	 return ctx->Polygon.OffsetFill;

+      case GL_RESCALE_NORMAL_EXT:

+         return ctx->Transform.RescaleNormals;

+      case GL_SCISSOR_TEST:

+	 return ctx->Scissor.Enabled;

+      case GL_SHARED_TEXTURE_PALETTE_EXT:

+         return ctx->Texture.SharedPalette;

+      case GL_STENCIL_TEST:

+	 return ctx->Stencil.Enabled;

+      case GL_TEXTURE_1D:

+         return is_texture_enabled(ctx, TEXTURE_1D_BIT);

+      case GL_TEXTURE_2D:

+         return is_texture_enabled(ctx, TEXTURE_2D_BIT);

+      case GL_TEXTURE_3D:

+         return is_texture_enabled(ctx, TEXTURE_3D_BIT);

+      case GL_TEXTURE_GEN_Q:

+         {

+            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               return (texUnit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE;

+            }

+         }

+         return GL_FALSE;

+      case GL_TEXTURE_GEN_R:

+         {

+            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               return (texUnit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE;

+            }

+         }

+         return GL_FALSE;

+      case GL_TEXTURE_GEN_S:

+         {

+            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               return (texUnit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE;

+            }

+         }

+         return GL_FALSE;

+      case GL_TEXTURE_GEN_T:

+         {

+            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+               return (texUnit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE;

+            }

+         }

+         return GL_FALSE;

+#if FEATURE_ES1

+      case GL_TEXTURE_GEN_STR_OES:

+	 {

+            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

+            if (texUnit) {

+		    return (texUnit->TexGenEnabled & STR_BITS) == STR_BITS ? GL_TRUE : GL_FALSE;

+            }

+         }

+#endif

+

+      /*

+       * CLIENT STATE!!!

+       */

+      case GL_VERTEX_ARRAY:

+         return (ctx->Array.ArrayObj->Vertex.Enabled != 0);

+      case GL_NORMAL_ARRAY:

+         return (ctx->Array.ArrayObj->Normal.Enabled != 0);

+      case GL_COLOR_ARRAY:

+         return (ctx->Array.ArrayObj->Color.Enabled != 0);

+      case GL_INDEX_ARRAY:

+         return (ctx->Array.ArrayObj->Index.Enabled != 0);

+      case GL_TEXTURE_COORD_ARRAY:

+         return (ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled != 0);

+      case GL_EDGE_FLAG_ARRAY:

+         return (ctx->Array.ArrayObj->EdgeFlag.Enabled != 0);

+      case GL_FOG_COORDINATE_ARRAY_EXT:

+         CHECK_EXTENSION(EXT_fog_coord);

+         return (ctx->Array.ArrayObj->FogCoord.Enabled != 0);

+      case GL_SECONDARY_COLOR_ARRAY_EXT:

+         CHECK_EXTENSION(EXT_secondary_color);

+         return (ctx->Array.ArrayObj->SecondaryColor.Enabled != 0);

+#if FEATURE_point_size_array

+      case GL_POINT_SIZE_ARRAY_OES:

+         return (ctx->Array.ArrayObj->PointSize.Enabled != 0);

+#endif

+

+      /* GL_SGI_texture_color_table */

+      case GL_TEXTURE_COLOR_TABLE_SGI:

+         CHECK_EXTENSION(SGI_texture_color_table);

+         return ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled;

+

+      /* GL_ARB_texture_cube_map */

+      case GL_TEXTURE_CUBE_MAP_ARB:

+         CHECK_EXTENSION(ARB_texture_cube_map);

+         return is_texture_enabled(ctx, TEXTURE_CUBE_BIT);

+

+      /* GL_EXT_secondary_color */

+      case GL_COLOR_SUM_EXT:

+         CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program);

+         return ctx->Fog.ColorSumEnabled;

+

+      /* GL_ARB_multisample */

+      case GL_MULTISAMPLE_ARB:

+         return ctx->Multisample.Enabled;

+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:

+         return ctx->Multisample.SampleAlphaToCoverage;

+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:

+         return ctx->Multisample.SampleAlphaToOne;

+      case GL_SAMPLE_COVERAGE_ARB:

+         return ctx->Multisample.SampleCoverage;

+      case GL_SAMPLE_COVERAGE_INVERT_ARB:

+         return ctx->Multisample.SampleCoverageInvert;

+

+      /* GL_IBM_rasterpos_clip */

+      case GL_RASTER_POSITION_UNCLIPPED_IBM:

+         CHECK_EXTENSION(IBM_rasterpos_clip);

+         return ctx->Transform.RasterPositionUnclipped;

+

+      /* GL_NV_point_sprite */

+      case GL_POINT_SPRITE_NV:

+         CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite)

+         return ctx->Point.PointSprite;

+

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

+      case GL_VERTEX_PROGRAM_ARB:

+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);

+         return ctx->VertexProgram.Enabled;

+      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:

+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);

+         return ctx->VertexProgram.PointSizeEnabled;

+      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:

+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);

+         return ctx->VertexProgram.TwoSideEnabled;

+#endif

+#if FEATURE_NV_vertex_program

+      case GL_VERTEX_ATTRIB_ARRAY0_NV:

+      case GL_VERTEX_ATTRIB_ARRAY1_NV:

+      case GL_VERTEX_ATTRIB_ARRAY2_NV:

+      case GL_VERTEX_ATTRIB_ARRAY3_NV:

+      case GL_VERTEX_ATTRIB_ARRAY4_NV:

+      case GL_VERTEX_ATTRIB_ARRAY5_NV:

+      case GL_VERTEX_ATTRIB_ARRAY6_NV:

+      case GL_VERTEX_ATTRIB_ARRAY7_NV:

+      case GL_VERTEX_ATTRIB_ARRAY8_NV:

+      case GL_VERTEX_ATTRIB_ARRAY9_NV:

+      case GL_VERTEX_ATTRIB_ARRAY10_NV:

+      case GL_VERTEX_ATTRIB_ARRAY11_NV:

+      case GL_VERTEX_ATTRIB_ARRAY12_NV:

+      case GL_VERTEX_ATTRIB_ARRAY13_NV:

+      case GL_VERTEX_ATTRIB_ARRAY14_NV:

+      case GL_VERTEX_ATTRIB_ARRAY15_NV:

+         CHECK_EXTENSION(NV_vertex_program);

+         {

+            GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;

+            ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));

+            return (ctx->Array.ArrayObj->VertexAttrib[n].Enabled != 0);

+         }

+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:

+         CHECK_EXTENSION(NV_vertex_program);

+         {

+            const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);

+            return ctx->Eval.Map1Attrib[map];

+         }

+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:

+         CHECK_EXTENSION(NV_vertex_program);

+         {

+            const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);

+            return ctx->Eval.Map2Attrib[map];

+         }

+#endif /* FEATURE_NV_vertex_program */

+

+#if FEATURE_NV_fragment_program

+      case GL_FRAGMENT_PROGRAM_NV:

+         CHECK_EXTENSION(NV_fragment_program);

+         return ctx->FragmentProgram.Enabled;

+#endif /* FEATURE_NV_fragment_program */

+

+      /* GL_NV_texture_rectangle */

+      case GL_TEXTURE_RECTANGLE_NV:

+         CHECK_EXTENSION(NV_texture_rectangle);

+         return is_texture_enabled(ctx, TEXTURE_RECT_BIT);

+

+      /* GL_EXT_stencil_two_side */

+      case GL_STENCIL_TEST_TWO_SIDE_EXT:

+         CHECK_EXTENSION(EXT_stencil_two_side);

+         return ctx->Stencil.TestTwoSide;

+

+#if FEATURE_ARB_fragment_program

+      case GL_FRAGMENT_PROGRAM_ARB:

+         return ctx->FragmentProgram.Enabled;

+#endif /* FEATURE_ARB_fragment_program */

+

+      /* GL_EXT_depth_bounds_test */

+      case GL_DEPTH_BOUNDS_TEST_EXT:

+         CHECK_EXTENSION(EXT_depth_bounds_test);

+         return ctx->Depth.BoundsTest;

+

+      /* GL_ARB_depth_clamp */

+      case GL_DEPTH_CLAMP:

+         CHECK_EXTENSION(ARB_depth_clamp);

+         return ctx->Transform.DepthClamp;

+

+#if FEATURE_ATI_fragment_shader

+      case GL_FRAGMENT_SHADER_ATI:

+	 CHECK_EXTENSION(ATI_fragment_shader);

+	 return ctx->ATIFragmentShader.Enabled;

+#endif /* FEATURE_ATI_fragment_shader */

+

+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:

+	 CHECK_EXTENSION(ARB_seamless_cube_map);

+	 return ctx->Texture.CubeMapSeamless;

+

+#if FEATURE_EXT_transform_feedback

+      case GL_RASTERIZER_DISCARD:

+	 CHECK_EXTENSION(EXT_transform_feedback);

+         return ctx->TransformFeedback.RasterDiscard;

+#endif

+

+      /* GL_NV_primitive_restart */

+      case GL_PRIMITIVE_RESTART_NV:

+	 if (!ctx->Extensions.NV_primitive_restart) {

+            goto invalid_enum_error;

+         }

+         return ctx->Array.PrimitiveRestart;

+

+      /* GL 3.1 primitive restart */

+      case GL_PRIMITIVE_RESTART:

+         if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {

+            goto invalid_enum_error;

+         }

+         return ctx->Array.PrimitiveRestart;

+

+      default:

+         goto invalid_enum_error;

+   }

+

+   return GL_FALSE;

+

+invalid_enum_error:

+   _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled(0x%x)", (int) cap);

+   return GL_FALSE;

+}

diff --git a/mesalib/src/mesa/main/enable.h b/mesalib/src/mesa/main/enable.h
index 24e3181a8..685e11d47 100644
--- a/mesalib/src/mesa/main/enable.h
+++ b/mesalib/src/mesa/main/enable.h
@@ -1,69 +1,71 @@
-/**
- * \file enable.h
- * Enable/disable/query GL capabilities.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 ENABLE_H
-#define ENABLE_H
-
-
-#include "mtypes.h"
-
-
-extern void
-_mesa_set_enable( GLcontext* ctx, GLenum cap, GLboolean state );
-
-extern void GLAPIENTRY
-_mesa_Disable( GLenum cap );
-
-extern void GLAPIENTRY
-_mesa_Enable( GLenum cap );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsEnabled( GLenum cap );
-
-extern void
-_mesa_set_enablei(GLcontext *ctx, GLenum cap, GLuint index, GLboolean state);
-
-extern void GLAPIENTRY
-_mesa_DisableIndexed( GLenum cap, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_EnableIndexed( GLenum cap, GLuint index );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsEnabledIndexed( GLenum cap, GLuint index );
-
-extern void GLAPIENTRY
-_mesa_EnableClientState( GLenum cap );
-
-extern void GLAPIENTRY
-_mesa_DisableClientState( GLenum cap );
-
-
-#endif
+/**

+ * \file enable.h

+ * Enable/disable/query GL capabilities.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 ENABLE_H

+#define ENABLE_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+

+extern void

+_mesa_set_enable( struct gl_context* ctx, GLenum cap, GLboolean state );

+

+extern void GLAPIENTRY

+_mesa_Disable( GLenum cap );

+

+extern void GLAPIENTRY

+_mesa_Enable( GLenum cap );

+

+extern GLboolean GLAPIENTRY

+_mesa_IsEnabled( GLenum cap );

+

+extern void

+_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state);

+

+extern void GLAPIENTRY

+_mesa_DisableIndexed( GLenum cap, GLuint index );

+

+extern void GLAPIENTRY

+_mesa_EnableIndexed( GLenum cap, GLuint index );

+

+extern GLboolean GLAPIENTRY

+_mesa_IsEnabledIndexed( GLenum cap, GLuint index );

+

+extern void GLAPIENTRY

+_mesa_EnableClientState( GLenum cap );

+

+extern void GLAPIENTRY

+_mesa_DisableClientState( GLenum cap );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index bc18e1b11..680b3f187 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -1,5694 +1,6280 @@
-/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */
-
-/*
- * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
- * 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
- * BRIAN PAUL,
- * 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.
- */
-
-#include "main/glheader.h"
-#include "main/mfeatures.h"
-#include "main/enums.h"
-#include "main/imports.h"
-
-typedef struct {
-   size_t offset;
-   int n;
-} enum_elt;
-
-LONGSTRING static const char enum_string_table[] = 
-   "GL_2D\0"
-   "GL_2_BYTES\0"
-   "GL_3D\0"
-   "GL_3D_COLOR\0"
-   "GL_3D_COLOR_TEXTURE\0"
-   "GL_3_BYTES\0"
-   "GL_4D_COLOR_TEXTURE\0"
-   "GL_4_BYTES\0"
-   "GL_ACCUM\0"
-   "GL_ACCUM_ALPHA_BITS\0"
-   "GL_ACCUM_BLUE_BITS\0"
-   "GL_ACCUM_BUFFER_BIT\0"
-   "GL_ACCUM_CLEAR_VALUE\0"
-   "GL_ACCUM_GREEN_BITS\0"
-   "GL_ACCUM_RED_BITS\0"
-   "GL_ACTIVE_ATTRIBUTES\0"
-   "GL_ACTIVE_ATTRIBUTE_MAX_LENGTH\0"
-   "GL_ACTIVE_STENCIL_FACE_EXT\0"
-   "GL_ACTIVE_TEXTURE\0"
-   "GL_ACTIVE_TEXTURE_ARB\0"
-   "GL_ACTIVE_UNIFORMS\0"
-   "GL_ACTIVE_UNIFORM_MAX_LENGTH\0"
-   "GL_ACTIVE_VERTEX_UNITS_ARB\0"
-   "GL_ADD\0"
-   "GL_ADD_SIGNED\0"
-   "GL_ADD_SIGNED_ARB\0"
-   "GL_ADD_SIGNED_EXT\0"
-   "GL_ALIASED_LINE_WIDTH_RANGE\0"
-   "GL_ALIASED_POINT_SIZE_RANGE\0"
-   "GL_ALL_ATTRIB_BITS\0"
-   "GL_ALL_CLIENT_ATTRIB_BITS\0"
-   "GL_ALPHA\0"
-   "GL_ALPHA12\0"
-   "GL_ALPHA12_EXT\0"
-   "GL_ALPHA16\0"
-   "GL_ALPHA16_EXT\0"
-   "GL_ALPHA4\0"
-   "GL_ALPHA4_EXT\0"
-   "GL_ALPHA8\0"
-   "GL_ALPHA8_EXT\0"
-   "GL_ALPHA_BIAS\0"
-   "GL_ALPHA_BITS\0"
-   "GL_ALPHA_SCALE\0"
-   "GL_ALPHA_TEST\0"
-   "GL_ALPHA_TEST_FUNC\0"
-   "GL_ALPHA_TEST_REF\0"
-   "GL_ALREADY_SIGNALED\0"
-   "GL_ALWAYS\0"
-   "GL_AMBIENT\0"
-   "GL_AMBIENT_AND_DIFFUSE\0"
-   "GL_AND\0"
-   "GL_AND_INVERTED\0"
-   "GL_AND_REVERSE\0"
-   "GL_ARRAY_BUFFER\0"
-   "GL_ARRAY_BUFFER_BINDING\0"
-   "GL_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_ATTACHED_SHADERS\0"
-   "GL_ATTRIB_ARRAY_POINTER_NV\0"
-   "GL_ATTRIB_ARRAY_SIZE_NV\0"
-   "GL_ATTRIB_ARRAY_STRIDE_NV\0"
-   "GL_ATTRIB_ARRAY_TYPE_NV\0"
-   "GL_ATTRIB_STACK_DEPTH\0"
-   "GL_AUTO_NORMAL\0"
-   "GL_AUX0\0"
-   "GL_AUX1\0"
-   "GL_AUX2\0"
-   "GL_AUX3\0"
-   "GL_AUX_BUFFERS\0"
-   "GL_BACK\0"
-   "GL_BACK_LEFT\0"
-   "GL_BACK_RIGHT\0"
-   "GL_BGR\0"
-   "GL_BGRA\0"
-   "GL_BGRA_EXT\0"
-   "GL_BITMAP\0"
-   "GL_BITMAP_TOKEN\0"
-   "GL_BLEND\0"
-   "GL_BLEND_COLOR\0"
-   "GL_BLEND_COLOR_EXT\0"
-   "GL_BLEND_DST\0"
-   "GL_BLEND_DST_ALPHA\0"
-   "GL_BLEND_DST_ALPHA_OES\0"
-   "GL_BLEND_DST_RGB\0"
-   "GL_BLEND_DST_RGB_OES\0"
-   "GL_BLEND_EQUATION\0"
-   "GL_BLEND_EQUATION_ALPHA\0"
-   "GL_BLEND_EQUATION_ALPHA_EXT\0"
-   "GL_BLEND_EQUATION_ALPHA_OES\0"
-   "GL_BLEND_EQUATION_EXT\0"
-   "GL_BLEND_EQUATION_OES\0"
-   "GL_BLEND_EQUATION_RGB\0"
-   "GL_BLEND_EQUATION_RGB_EXT\0"
-   "GL_BLEND_EQUATION_RGB_OES\0"
-   "GL_BLEND_SRC\0"
-   "GL_BLEND_SRC_ALPHA\0"
-   "GL_BLEND_SRC_ALPHA_OES\0"
-   "GL_BLEND_SRC_RGB\0"
-   "GL_BLEND_SRC_RGB_OES\0"
-   "GL_BLUE\0"
-   "GL_BLUE_BIAS\0"
-   "GL_BLUE_BITS\0"
-   "GL_BLUE_SCALE\0"
-   "GL_BOOL\0"
-   "GL_BOOL_ARB\0"
-   "GL_BOOL_VEC2\0"
-   "GL_BOOL_VEC2_ARB\0"
-   "GL_BOOL_VEC3\0"
-   "GL_BOOL_VEC3_ARB\0"
-   "GL_BOOL_VEC4\0"
-   "GL_BOOL_VEC4_ARB\0"
-   "GL_BUFFER_ACCESS\0"
-   "GL_BUFFER_ACCESS_ARB\0"
-   "GL_BUFFER_ACCESS_OES\0"
-   "GL_BUFFER_FLUSHING_UNMAP_APPLE\0"
-   "GL_BUFFER_MAPPED\0"
-   "GL_BUFFER_MAPPED_ARB\0"
-   "GL_BUFFER_MAPPED_OES\0"
-   "GL_BUFFER_MAP_POINTER\0"
-   "GL_BUFFER_MAP_POINTER_ARB\0"
-   "GL_BUFFER_MAP_POINTER_OES\0"
-   "GL_BUFFER_OBJECT_APPLE\0"
-   "GL_BUFFER_SERIALIZED_MODIFY_APPLE\0"
-   "GL_BUFFER_SIZE\0"
-   "GL_BUFFER_SIZE_ARB\0"
-   "GL_BUFFER_USAGE\0"
-   "GL_BUFFER_USAGE_ARB\0"
-   "GL_BUMP_ENVMAP_ATI\0"
-   "GL_BUMP_NUM_TEX_UNITS_ATI\0"
-   "GL_BUMP_ROT_MATRIX_ATI\0"
-   "GL_BUMP_ROT_MATRIX_SIZE_ATI\0"
-   "GL_BUMP_TARGET_ATI\0"
-   "GL_BUMP_TEX_UNITS_ATI\0"
-   "GL_BYTE\0"
-   "GL_C3F_V3F\0"
-   "GL_C4F_N3F_V3F\0"
-   "GL_C4UB_V2F\0"
-   "GL_C4UB_V3F\0"
-   "GL_CCW\0"
-   "GL_CLAMP\0"
-   "GL_CLAMP_TO_BORDER\0"
-   "GL_CLAMP_TO_BORDER_ARB\0"
-   "GL_CLAMP_TO_BORDER_SGIS\0"
-   "GL_CLAMP_TO_EDGE\0"
-   "GL_CLAMP_TO_EDGE_SGIS\0"
-   "GL_CLEAR\0"
-   "GL_CLIENT_ACTIVE_TEXTURE\0"
-   "GL_CLIENT_ACTIVE_TEXTURE_ARB\0"
-   "GL_CLIENT_ALL_ATTRIB_BITS\0"
-   "GL_CLIENT_ATTRIB_STACK_DEPTH\0"
-   "GL_CLIENT_PIXEL_STORE_BIT\0"
-   "GL_CLIENT_VERTEX_ARRAY_BIT\0"
-   "GL_CLIP_PLANE0\0"
-   "GL_CLIP_PLANE1\0"
-   "GL_CLIP_PLANE2\0"
-   "GL_CLIP_PLANE3\0"
-   "GL_CLIP_PLANE4\0"
-   "GL_CLIP_PLANE5\0"
-   "GL_CLIP_VOLUME_CLIPPING_HINT_EXT\0"
-   "GL_COEFF\0"
-   "GL_COLOR\0"
-   "GL_COLOR_ARRAY\0"
-   "GL_COLOR_ARRAY_BUFFER_BINDING\0"
-   "GL_COLOR_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_COLOR_ARRAY_POINTER\0"
-   "GL_COLOR_ARRAY_SIZE\0"
-   "GL_COLOR_ARRAY_STRIDE\0"
-   "GL_COLOR_ARRAY_TYPE\0"
-   "GL_COLOR_ATTACHMENT0\0"
-   "GL_COLOR_ATTACHMENT0_EXT\0"
-   "GL_COLOR_ATTACHMENT0_OES\0"
-   "GL_COLOR_ATTACHMENT1\0"
-   "GL_COLOR_ATTACHMENT10\0"
-   "GL_COLOR_ATTACHMENT10_EXT\0"
-   "GL_COLOR_ATTACHMENT11\0"
-   "GL_COLOR_ATTACHMENT11_EXT\0"
-   "GL_COLOR_ATTACHMENT12\0"
-   "GL_COLOR_ATTACHMENT12_EXT\0"
-   "GL_COLOR_ATTACHMENT13\0"
-   "GL_COLOR_ATTACHMENT13_EXT\0"
-   "GL_COLOR_ATTACHMENT14\0"
-   "GL_COLOR_ATTACHMENT14_EXT\0"
-   "GL_COLOR_ATTACHMENT15\0"
-   "GL_COLOR_ATTACHMENT15_EXT\0"
-   "GL_COLOR_ATTACHMENT1_EXT\0"
-   "GL_COLOR_ATTACHMENT2\0"
-   "GL_COLOR_ATTACHMENT2_EXT\0"
-   "GL_COLOR_ATTACHMENT3\0"
-   "GL_COLOR_ATTACHMENT3_EXT\0"
-   "GL_COLOR_ATTACHMENT4\0"
-   "GL_COLOR_ATTACHMENT4_EXT\0"
-   "GL_COLOR_ATTACHMENT5\0"
-   "GL_COLOR_ATTACHMENT5_EXT\0"
-   "GL_COLOR_ATTACHMENT6\0"
-   "GL_COLOR_ATTACHMENT6_EXT\0"
-   "GL_COLOR_ATTACHMENT7\0"
-   "GL_COLOR_ATTACHMENT7_EXT\0"
-   "GL_COLOR_ATTACHMENT8\0"
-   "GL_COLOR_ATTACHMENT8_EXT\0"
-   "GL_COLOR_ATTACHMENT9\0"
-   "GL_COLOR_ATTACHMENT9_EXT\0"
-   "GL_COLOR_BUFFER_BIT\0"
-   "GL_COLOR_CLEAR_VALUE\0"
-   "GL_COLOR_INDEX\0"
-   "GL_COLOR_INDEXES\0"
-   "GL_COLOR_LOGIC_OP\0"
-   "GL_COLOR_MATERIAL\0"
-   "GL_COLOR_MATERIAL_FACE\0"
-   "GL_COLOR_MATERIAL_PARAMETER\0"
-   "GL_COLOR_MATRIX\0"
-   "GL_COLOR_MATRIX_SGI\0"
-   "GL_COLOR_MATRIX_STACK_DEPTH\0"
-   "GL_COLOR_MATRIX_STACK_DEPTH_SGI\0"
-   "GL_COLOR_SUM\0"
-   "GL_COLOR_SUM_ARB\0"
-   "GL_COLOR_TABLE\0"
-   "GL_COLOR_TABLE_ALPHA_SIZE\0"
-   "GL_COLOR_TABLE_ALPHA_SIZE_EXT\0"
-   "GL_COLOR_TABLE_ALPHA_SIZE_SGI\0"
-   "GL_COLOR_TABLE_BIAS\0"
-   "GL_COLOR_TABLE_BIAS_SGI\0"
-   "GL_COLOR_TABLE_BLUE_SIZE\0"
-   "GL_COLOR_TABLE_BLUE_SIZE_EXT\0"
-   "GL_COLOR_TABLE_BLUE_SIZE_SGI\0"
-   "GL_COLOR_TABLE_FORMAT\0"
-   "GL_COLOR_TABLE_FORMAT_EXT\0"
-   "GL_COLOR_TABLE_FORMAT_SGI\0"
-   "GL_COLOR_TABLE_GREEN_SIZE\0"
-   "GL_COLOR_TABLE_GREEN_SIZE_EXT\0"
-   "GL_COLOR_TABLE_GREEN_SIZE_SGI\0"
-   "GL_COLOR_TABLE_INTENSITY_SIZE\0"
-   "GL_COLOR_TABLE_INTENSITY_SIZE_EXT\0"
-   "GL_COLOR_TABLE_INTENSITY_SIZE_SGI\0"
-   "GL_COLOR_TABLE_LUMINANCE_SIZE\0"
-   "GL_COLOR_TABLE_LUMINANCE_SIZE_EXT\0"
-   "GL_COLOR_TABLE_LUMINANCE_SIZE_SGI\0"
-   "GL_COLOR_TABLE_RED_SIZE\0"
-   "GL_COLOR_TABLE_RED_SIZE_EXT\0"
-   "GL_COLOR_TABLE_RED_SIZE_SGI\0"
-   "GL_COLOR_TABLE_SCALE\0"
-   "GL_COLOR_TABLE_SCALE_SGI\0"
-   "GL_COLOR_TABLE_WIDTH\0"
-   "GL_COLOR_TABLE_WIDTH_EXT\0"
-   "GL_COLOR_TABLE_WIDTH_SGI\0"
-   "GL_COLOR_WRITEMASK\0"
-   "GL_COMBINE\0"
-   "GL_COMBINE4\0"
-   "GL_COMBINE_ALPHA\0"
-   "GL_COMBINE_ALPHA_ARB\0"
-   "GL_COMBINE_ALPHA_EXT\0"
-   "GL_COMBINE_ARB\0"
-   "GL_COMBINE_EXT\0"
-   "GL_COMBINE_RGB\0"
-   "GL_COMBINE_RGB_ARB\0"
-   "GL_COMBINE_RGB_EXT\0"
-   "GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT\0"
-   "GL_COMPARE_R_TO_TEXTURE\0"
-   "GL_COMPARE_R_TO_TEXTURE_ARB\0"
-   "GL_COMPILE\0"
-   "GL_COMPILE_AND_EXECUTE\0"
-   "GL_COMPILE_STATUS\0"
-   "GL_COMPRESSED_ALPHA\0"
-   "GL_COMPRESSED_ALPHA_ARB\0"
-   "GL_COMPRESSED_INTENSITY\0"
-   "GL_COMPRESSED_INTENSITY_ARB\0"
-   "GL_COMPRESSED_LUMINANCE\0"
-   "GL_COMPRESSED_LUMINANCE_ALPHA\0"
-   "GL_COMPRESSED_LUMINANCE_ALPHA_ARB\0"
-   "GL_COMPRESSED_LUMINANCE_ARB\0"
-   "GL_COMPRESSED_RGB\0"
-   "GL_COMPRESSED_RGBA\0"
-   "GL_COMPRESSED_RGBA_ARB\0"
-   "GL_COMPRESSED_RGBA_FXT1_3DFX\0"
-   "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT\0"
-   "GL_COMPRESSED_RGBA_S3TC_DXT3_EXT\0"
-   "GL_COMPRESSED_RGBA_S3TC_DXT5_EXT\0"
-   "GL_COMPRESSED_RGB_ARB\0"
-   "GL_COMPRESSED_RGB_FXT1_3DFX\0"
-   "GL_COMPRESSED_RGB_S3TC_DXT1_EXT\0"
-   "GL_COMPRESSED_SLUMINANCE\0"
-   "GL_COMPRESSED_SLUMINANCE_ALPHA\0"
-   "GL_COMPRESSED_SRGB\0"
-   "GL_COMPRESSED_SRGB_ALPHA\0"
-   "GL_COMPRESSED_TEXTURE_FORMATS\0"
-   "GL_CONDITION_SATISFIED\0"
-   "GL_CONSTANT\0"
-   "GL_CONSTANT_ALPHA\0"
-   "GL_CONSTANT_ALPHA_EXT\0"
-   "GL_CONSTANT_ARB\0"
-   "GL_CONSTANT_ATTENUATION\0"
-   "GL_CONSTANT_BORDER_HP\0"
-   "GL_CONSTANT_COLOR\0"
-   "GL_CONSTANT_COLOR_EXT\0"
-   "GL_CONSTANT_EXT\0"
-   "GL_CONVOLUTION_1D\0"
-   "GL_CONVOLUTION_2D\0"
-   "GL_CONVOLUTION_BORDER_COLOR\0"
-   "GL_CONVOLUTION_BORDER_COLOR_HP\0"
-   "GL_CONVOLUTION_BORDER_MODE\0"
-   "GL_CONVOLUTION_BORDER_MODE_EXT\0"
-   "GL_CONVOLUTION_FILTER_BIAS\0"
-   "GL_CONVOLUTION_FILTER_BIAS_EXT\0"
-   "GL_CONVOLUTION_FILTER_SCALE\0"
-   "GL_CONVOLUTION_FILTER_SCALE_EXT\0"
-   "GL_CONVOLUTION_FORMAT\0"
-   "GL_CONVOLUTION_FORMAT_EXT\0"
-   "GL_CONVOLUTION_HEIGHT\0"
-   "GL_CONVOLUTION_HEIGHT_EXT\0"
-   "GL_CONVOLUTION_WIDTH\0"
-   "GL_CONVOLUTION_WIDTH_EXT\0"
-   "GL_COORD_REPLACE\0"
-   "GL_COORD_REPLACE_ARB\0"
-   "GL_COORD_REPLACE_NV\0"
-   "GL_COORD_REPLACE_OES\0"
-   "GL_COPY\0"
-   "GL_COPY_INVERTED\0"
-   "GL_COPY_PIXEL_TOKEN\0"
-   "GL_COPY_READ_BUFFER\0"
-   "GL_COPY_WRITE_BUFFER\0"
-   "GL_CULL_FACE\0"
-   "GL_CULL_FACE_MODE\0"
-   "GL_CULL_VERTEX_EXT\0"
-   "GL_CULL_VERTEX_EYE_POSITION_EXT\0"
-   "GL_CULL_VERTEX_OBJECT_POSITION_EXT\0"
-   "GL_CURRENT_ATTRIB_NV\0"
-   "GL_CURRENT_BIT\0"
-   "GL_CURRENT_COLOR\0"
-   "GL_CURRENT_FOG_COORD\0"
-   "GL_CURRENT_FOG_COORDINATE\0"
-   "GL_CURRENT_INDEX\0"
-   "GL_CURRENT_MATRIX_ARB\0"
-   "GL_CURRENT_MATRIX_INDEX_ARB\0"
-   "GL_CURRENT_MATRIX_NV\0"
-   "GL_CURRENT_MATRIX_STACK_DEPTH_ARB\0"
-   "GL_CURRENT_MATRIX_STACK_DEPTH_NV\0"
-   "GL_CURRENT_NORMAL\0"
-   "GL_CURRENT_PALETTE_MATRIX_ARB\0"
-   "GL_CURRENT_PALETTE_MATRIX_OES\0"
-   "GL_CURRENT_PROGRAM\0"
-   "GL_CURRENT_QUERY\0"
-   "GL_CURRENT_QUERY_ARB\0"
-   "GL_CURRENT_RASTER_COLOR\0"
-   "GL_CURRENT_RASTER_DISTANCE\0"
-   "GL_CURRENT_RASTER_INDEX\0"
-   "GL_CURRENT_RASTER_POSITION\0"
-   "GL_CURRENT_RASTER_POSITION_VALID\0"
-   "GL_CURRENT_RASTER_SECONDARY_COLOR\0"
-   "GL_CURRENT_RASTER_TEXTURE_COORDS\0"
-   "GL_CURRENT_SECONDARY_COLOR\0"
-   "GL_CURRENT_TEXTURE_COORDS\0"
-   "GL_CURRENT_VERTEX_ATTRIB\0"
-   "GL_CURRENT_VERTEX_ATTRIB_ARB\0"
-   "GL_CURRENT_WEIGHT_ARB\0"
-   "GL_CW\0"
-   "GL_DEBUG_ASSERT_MESA\0"
-   "GL_DEBUG_OBJECT_MESA\0"
-   "GL_DEBUG_PRINT_MESA\0"
-   "GL_DECAL\0"
-   "GL_DECR\0"
-   "GL_DECR_WRAP\0"
-   "GL_DECR_WRAP_EXT\0"
-   "GL_DELETE_STATUS\0"
-   "GL_DEPTH\0"
-   "GL_DEPTH24_STENCIL8\0"
-   "GL_DEPTH24_STENCIL8_EXT\0"
-   "GL_DEPTH24_STENCIL8_OES\0"
-   "GL_DEPTH_ATTACHMENT\0"
-   "GL_DEPTH_ATTACHMENT_EXT\0"
-   "GL_DEPTH_ATTACHMENT_OES\0"
-   "GL_DEPTH_BIAS\0"
-   "GL_DEPTH_BITS\0"
-   "GL_DEPTH_BOUNDS_EXT\0"
-   "GL_DEPTH_BOUNDS_TEST_EXT\0"
-   "GL_DEPTH_BUFFER_BIT\0"
-   "GL_DEPTH_CLAMP\0"
-   "GL_DEPTH_CLAMP_NV\0"
-   "GL_DEPTH_CLEAR_VALUE\0"
-   "GL_DEPTH_COMPONENT\0"
-   "GL_DEPTH_COMPONENT16\0"
-   "GL_DEPTH_COMPONENT16_ARB\0"
-   "GL_DEPTH_COMPONENT16_OES\0"
-   "GL_DEPTH_COMPONENT16_SGIX\0"
-   "GL_DEPTH_COMPONENT24\0"
-   "GL_DEPTH_COMPONENT24_ARB\0"
-   "GL_DEPTH_COMPONENT24_OES\0"
-   "GL_DEPTH_COMPONENT24_SGIX\0"
-   "GL_DEPTH_COMPONENT32\0"
-   "GL_DEPTH_COMPONENT32_ARB\0"
-   "GL_DEPTH_COMPONENT32_OES\0"
-   "GL_DEPTH_COMPONENT32_SGIX\0"
-   "GL_DEPTH_FUNC\0"
-   "GL_DEPTH_RANGE\0"
-   "GL_DEPTH_SCALE\0"
-   "GL_DEPTH_STENCIL\0"
-   "GL_DEPTH_STENCIL_ATTACHMENT\0"
-   "GL_DEPTH_STENCIL_EXT\0"
-   "GL_DEPTH_STENCIL_NV\0"
-   "GL_DEPTH_STENCIL_OES\0"
-   "GL_DEPTH_STENCIL_TO_BGRA_NV\0"
-   "GL_DEPTH_STENCIL_TO_RGBA_NV\0"
-   "GL_DEPTH_TEST\0"
-   "GL_DEPTH_TEXTURE_MODE\0"
-   "GL_DEPTH_TEXTURE_MODE_ARB\0"
-   "GL_DEPTH_WRITEMASK\0"
-   "GL_DIFFUSE\0"
-   "GL_DITHER\0"
-   "GL_DOMAIN\0"
-   "GL_DONT_CARE\0"
-   "GL_DOT3_RGB\0"
-   "GL_DOT3_RGBA\0"
-   "GL_DOT3_RGBA_ARB\0"
-   "GL_DOT3_RGBA_EXT\0"
-   "GL_DOT3_RGB_ARB\0"
-   "GL_DOT3_RGB_EXT\0"
-   "GL_DOUBLE\0"
-   "GL_DOUBLEBUFFER\0"
-   "GL_DRAW_BUFFER\0"
-   "GL_DRAW_BUFFER0\0"
-   "GL_DRAW_BUFFER0_ARB\0"
-   "GL_DRAW_BUFFER0_ATI\0"
-   "GL_DRAW_BUFFER1\0"
-   "GL_DRAW_BUFFER10\0"
-   "GL_DRAW_BUFFER10_ARB\0"
-   "GL_DRAW_BUFFER10_ATI\0"
-   "GL_DRAW_BUFFER11\0"
-   "GL_DRAW_BUFFER11_ARB\0"
-   "GL_DRAW_BUFFER11_ATI\0"
-   "GL_DRAW_BUFFER12\0"
-   "GL_DRAW_BUFFER12_ARB\0"
-   "GL_DRAW_BUFFER12_ATI\0"
-   "GL_DRAW_BUFFER13\0"
-   "GL_DRAW_BUFFER13_ARB\0"
-   "GL_DRAW_BUFFER13_ATI\0"
-   "GL_DRAW_BUFFER14\0"
-   "GL_DRAW_BUFFER14_ARB\0"
-   "GL_DRAW_BUFFER14_ATI\0"
-   "GL_DRAW_BUFFER15\0"
-   "GL_DRAW_BUFFER15_ARB\0"
-   "GL_DRAW_BUFFER15_ATI\0"
-   "GL_DRAW_BUFFER1_ARB\0"
-   "GL_DRAW_BUFFER1_ATI\0"
-   "GL_DRAW_BUFFER2\0"
-   "GL_DRAW_BUFFER2_ARB\0"
-   "GL_DRAW_BUFFER2_ATI\0"
-   "GL_DRAW_BUFFER3\0"
-   "GL_DRAW_BUFFER3_ARB\0"
-   "GL_DRAW_BUFFER3_ATI\0"
-   "GL_DRAW_BUFFER4\0"
-   "GL_DRAW_BUFFER4_ARB\0"
-   "GL_DRAW_BUFFER4_ATI\0"
-   "GL_DRAW_BUFFER5\0"
-   "GL_DRAW_BUFFER5_ARB\0"
-   "GL_DRAW_BUFFER5_ATI\0"
-   "GL_DRAW_BUFFER6\0"
-   "GL_DRAW_BUFFER6_ARB\0"
-   "GL_DRAW_BUFFER6_ATI\0"
-   "GL_DRAW_BUFFER7\0"
-   "GL_DRAW_BUFFER7_ARB\0"
-   "GL_DRAW_BUFFER7_ATI\0"
-   "GL_DRAW_BUFFER8\0"
-   "GL_DRAW_BUFFER8_ARB\0"
-   "GL_DRAW_BUFFER8_ATI\0"
-   "GL_DRAW_BUFFER9\0"
-   "GL_DRAW_BUFFER9_ARB\0"
-   "GL_DRAW_BUFFER9_ATI\0"
-   "GL_DRAW_FRAMEBUFFER\0"
-   "GL_DRAW_FRAMEBUFFER_BINDING\0"
-   "GL_DRAW_FRAMEBUFFER_BINDING_EXT\0"
-   "GL_DRAW_FRAMEBUFFER_EXT\0"
-   "GL_DRAW_PIXEL_TOKEN\0"
-   "GL_DST_ALPHA\0"
-   "GL_DST_COLOR\0"
-   "GL_DU8DV8_ATI\0"
-   "GL_DUDV_ATI\0"
-   "GL_DYNAMIC_COPY\0"
-   "GL_DYNAMIC_COPY_ARB\0"
-   "GL_DYNAMIC_DRAW\0"
-   "GL_DYNAMIC_DRAW_ARB\0"
-   "GL_DYNAMIC_READ\0"
-   "GL_DYNAMIC_READ_ARB\0"
-   "GL_EDGE_FLAG\0"
-   "GL_EDGE_FLAG_ARRAY\0"
-   "GL_EDGE_FLAG_ARRAY_BUFFER_BINDING\0"
-   "GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_EDGE_FLAG_ARRAY_POINTER\0"
-   "GL_EDGE_FLAG_ARRAY_STRIDE\0"
-   "GL_ELEMENT_ARRAY_BUFFER\0"
-   "GL_ELEMENT_ARRAY_BUFFER_BINDING\0"
-   "GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_EMISSION\0"
-   "GL_ENABLE_BIT\0"
-   "GL_EQUAL\0"
-   "GL_EQUIV\0"
-   "GL_EVAL_BIT\0"
-   "GL_EXP\0"
-   "GL_EXP2\0"
-   "GL_EXTENSIONS\0"
-   "GL_EYE_LINEAR\0"
-   "GL_EYE_PLANE\0"
-   "GL_EYE_PLANE_ABSOLUTE_NV\0"
-   "GL_EYE_RADIAL_NV\0"
-   "GL_FALSE\0"
-   "GL_FASTEST\0"
-   "GL_FEEDBACK\0"
-   "GL_FEEDBACK_BUFFER_POINTER\0"
-   "GL_FEEDBACK_BUFFER_SIZE\0"
-   "GL_FEEDBACK_BUFFER_TYPE\0"
-   "GL_FILL\0"
-   "GL_FIRST_VERTEX_CONVENTION\0"
-   "GL_FIRST_VERTEX_CONVENTION_EXT\0"
-   "GL_FIXED\0"
-   "GL_FIXED_OES\0"
-   "GL_FLAT\0"
-   "GL_FLOAT\0"
-   "GL_FLOAT_MAT2\0"
-   "GL_FLOAT_MAT2_ARB\0"
-   "GL_FLOAT_MAT2x3\0"
-   "GL_FLOAT_MAT2x4\0"
-   "GL_FLOAT_MAT3\0"
-   "GL_FLOAT_MAT3_ARB\0"
-   "GL_FLOAT_MAT3x2\0"
-   "GL_FLOAT_MAT3x4\0"
-   "GL_FLOAT_MAT4\0"
-   "GL_FLOAT_MAT4_ARB\0"
-   "GL_FLOAT_MAT4x2\0"
-   "GL_FLOAT_MAT4x3\0"
-   "GL_FLOAT_VEC2\0"
-   "GL_FLOAT_VEC2_ARB\0"
-   "GL_FLOAT_VEC3\0"
-   "GL_FLOAT_VEC3_ARB\0"
-   "GL_FLOAT_VEC4\0"
-   "GL_FLOAT_VEC4_ARB\0"
-   "GL_FOG\0"
-   "GL_FOG_BIT\0"
-   "GL_FOG_COLOR\0"
-   "GL_FOG_COORD\0"
-   "GL_FOG_COORDINATE\0"
-   "GL_FOG_COORDINATE_ARRAY\0"
-   "GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING\0"
-   "GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_FOG_COORDINATE_ARRAY_POINTER\0"
-   "GL_FOG_COORDINATE_ARRAY_STRIDE\0"
-   "GL_FOG_COORDINATE_ARRAY_TYPE\0"
-   "GL_FOG_COORDINATE_SOURCE\0"
-   "GL_FOG_COORD_ARRAY\0"
-   "GL_FOG_COORD_ARRAY_BUFFER_BINDING\0"
-   "GL_FOG_COORD_ARRAY_POINTER\0"
-   "GL_FOG_COORD_ARRAY_STRIDE\0"
-   "GL_FOG_COORD_ARRAY_TYPE\0"
-   "GL_FOG_COORD_SRC\0"
-   "GL_FOG_DENSITY\0"
-   "GL_FOG_DISTANCE_MODE_NV\0"
-   "GL_FOG_END\0"
-   "GL_FOG_HINT\0"
-   "GL_FOG_INDEX\0"
-   "GL_FOG_MODE\0"
-   "GL_FOG_OFFSET_SGIX\0"
-   "GL_FOG_OFFSET_VALUE_SGIX\0"
-   "GL_FOG_START\0"
-   "GL_FRAGMENT_DEPTH\0"
-   "GL_FRAGMENT_PROGRAM_ARB\0"
-   "GL_FRAGMENT_SHADER\0"
-   "GL_FRAGMENT_SHADER_ARB\0"
-   "GL_FRAGMENT_SHADER_DERIVATIVE_HINT\0"
-   "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES\0"
-   "GL_FRAMEBUFFER\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT\0"
-   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES\0"
-   "GL_FRAMEBUFFER_BINDING\0"
-   "GL_FRAMEBUFFER_BINDING_EXT\0"
-   "GL_FRAMEBUFFER_BINDING_OES\0"
-   "GL_FRAMEBUFFER_COMPLETE\0"
-   "GL_FRAMEBUFFER_COMPLETE_EXT\0"
-   "GL_FRAMEBUFFER_COMPLETE_OES\0"
-   "GL_FRAMEBUFFER_DEFAULT\0"
-   "GL_FRAMEBUFFER_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT\0"
-   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES\0"
-   "GL_FRAMEBUFFER_OES\0"
-   "GL_FRAMEBUFFER_STATUS_ERROR_EXT\0"
-   "GL_FRAMEBUFFER_UNDEFINED\0"
-   "GL_FRAMEBUFFER_UNSUPPORTED\0"
-   "GL_FRAMEBUFFER_UNSUPPORTED_EXT\0"
-   "GL_FRAMEBUFFER_UNSUPPORTED_OES\0"
-   "GL_FRONT\0"
-   "GL_FRONT_AND_BACK\0"
-   "GL_FRONT_FACE\0"
-   "GL_FRONT_LEFT\0"
-   "GL_FRONT_RIGHT\0"
-   "GL_FUNC_ADD\0"
-   "GL_FUNC_ADD_EXT\0"
-   "GL_FUNC_ADD_OES\0"
-   "GL_FUNC_REVERSE_SUBTRACT\0"
-   "GL_FUNC_REVERSE_SUBTRACT_EXT\0"
-   "GL_FUNC_REVERSE_SUBTRACT_OES\0"
-   "GL_FUNC_SUBTRACT\0"
-   "GL_FUNC_SUBTRACT_EXT\0"
-   "GL_FUNC_SUBTRACT_OES\0"
-   "GL_GENERATE_MIPMAP\0"
-   "GL_GENERATE_MIPMAP_HINT\0"
-   "GL_GENERATE_MIPMAP_HINT_SGIS\0"
-   "GL_GENERATE_MIPMAP_SGIS\0"
-   "GL_GEOMETRY_INPUT_TYPE_ARB\0"
-   "GL_GEOMETRY_OUTPUT_TYPE_ARB\0"
-   "GL_GEOMETRY_SHADER_ARB\0"
-   "GL_GEOMETRY_VERTICES_OUT_ARB\0"
-   "GL_GEQUAL\0"
-   "GL_GREATER\0"
-   "GL_GREEN\0"
-   "GL_GREEN_BIAS\0"
-   "GL_GREEN_BITS\0"
-   "GL_GREEN_SCALE\0"
-   "GL_HALF_FLOAT\0"
-   "GL_HALF_FLOAT_OES\0"
-   "GL_HIGH_FLOAT\0"
-   "GL_HIGH_INT\0"
-   "GL_HINT_BIT\0"
-   "GL_HISTOGRAM\0"
-   "GL_HISTOGRAM_ALPHA_SIZE\0"
-   "GL_HISTOGRAM_ALPHA_SIZE_EXT\0"
-   "GL_HISTOGRAM_BLUE_SIZE\0"
-   "GL_HISTOGRAM_BLUE_SIZE_EXT\0"
-   "GL_HISTOGRAM_EXT\0"
-   "GL_HISTOGRAM_FORMAT\0"
-   "GL_HISTOGRAM_FORMAT_EXT\0"
-   "GL_HISTOGRAM_GREEN_SIZE\0"
-   "GL_HISTOGRAM_GREEN_SIZE_EXT\0"
-   "GL_HISTOGRAM_LUMINANCE_SIZE\0"
-   "GL_HISTOGRAM_LUMINANCE_SIZE_EXT\0"
-   "GL_HISTOGRAM_RED_SIZE\0"
-   "GL_HISTOGRAM_RED_SIZE_EXT\0"
-   "GL_HISTOGRAM_SINK\0"
-   "GL_HISTOGRAM_SINK_EXT\0"
-   "GL_HISTOGRAM_WIDTH\0"
-   "GL_HISTOGRAM_WIDTH_EXT\0"
-   "GL_IDENTITY_NV\0"
-   "GL_IGNORE_BORDER_HP\0"
-   "GL_IMPLEMENTATION_COLOR_READ_FORMAT\0"
-   "GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES\0"
-   "GL_IMPLEMENTATION_COLOR_READ_TYPE\0"
-   "GL_IMPLEMENTATION_COLOR_READ_TYPE_OES\0"
-   "GL_INCR\0"
-   "GL_INCR_WRAP\0"
-   "GL_INCR_WRAP_EXT\0"
-   "GL_INDEX\0"
-   "GL_INDEX_ARRAY\0"
-   "GL_INDEX_ARRAY_BUFFER_BINDING\0"
-   "GL_INDEX_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_INDEX_ARRAY_POINTER\0"
-   "GL_INDEX_ARRAY_STRIDE\0"
-   "GL_INDEX_ARRAY_TYPE\0"
-   "GL_INDEX_BITS\0"
-   "GL_INDEX_CLEAR_VALUE\0"
-   "GL_INDEX_LOGIC_OP\0"
-   "GL_INDEX_MODE\0"
-   "GL_INDEX_OFFSET\0"
-   "GL_INDEX_SHIFT\0"
-   "GL_INDEX_WRITEMASK\0"
-   "GL_INFO_LOG_LENGTH\0"
-   "GL_INT\0"
-   "GL_INTENSITY\0"
-   "GL_INTENSITY12\0"
-   "GL_INTENSITY12_EXT\0"
-   "GL_INTENSITY16\0"
-   "GL_INTENSITY16_EXT\0"
-   "GL_INTENSITY4\0"
-   "GL_INTENSITY4_EXT\0"
-   "GL_INTENSITY8\0"
-   "GL_INTENSITY8_EXT\0"
-   "GL_INTENSITY_EXT\0"
-   "GL_INTERLEAVED_ATTRIBS_EXT\0"
-   "GL_INTERPOLATE\0"
-   "GL_INTERPOLATE_ARB\0"
-   "GL_INTERPOLATE_EXT\0"
-   "GL_INT_10_10_10_2_OES\0"
-   "GL_INT_VEC2\0"
-   "GL_INT_VEC2_ARB\0"
-   "GL_INT_VEC3\0"
-   "GL_INT_VEC3_ARB\0"
-   "GL_INT_VEC4\0"
-   "GL_INT_VEC4_ARB\0"
-   "GL_INVALID_ENUM\0"
-   "GL_INVALID_FRAMEBUFFER_OPERATION\0"
-   "GL_INVALID_FRAMEBUFFER_OPERATION_EXT\0"
-   "GL_INVALID_FRAMEBUFFER_OPERATION_OES\0"
-   "GL_INVALID_OPERATION\0"
-   "GL_INVALID_VALUE\0"
-   "GL_INVERSE_NV\0"
-   "GL_INVERSE_TRANSPOSE_NV\0"
-   "GL_INVERT\0"
-   "GL_KEEP\0"
-   "GL_LAST_VERTEX_CONVENTION\0"
-   "GL_LAST_VERTEX_CONVENTION_EXT\0"
-   "GL_LEFT\0"
-   "GL_LEQUAL\0"
-   "GL_LESS\0"
-   "GL_LIGHT0\0"
-   "GL_LIGHT1\0"
-   "GL_LIGHT2\0"
-   "GL_LIGHT3\0"
-   "GL_LIGHT4\0"
-   "GL_LIGHT5\0"
-   "GL_LIGHT6\0"
-   "GL_LIGHT7\0"
-   "GL_LIGHTING\0"
-   "GL_LIGHTING_BIT\0"
-   "GL_LIGHT_MODEL_AMBIENT\0"
-   "GL_LIGHT_MODEL_COLOR_CONTROL\0"
-   "GL_LIGHT_MODEL_COLOR_CONTROL_EXT\0"
-   "GL_LIGHT_MODEL_LOCAL_VIEWER\0"
-   "GL_LIGHT_MODEL_TWO_SIDE\0"
-   "GL_LINE\0"
-   "GL_LINEAR\0"
-   "GL_LINEAR_ATTENUATION\0"
-   "GL_LINEAR_CLIPMAP_LINEAR_SGIX\0"
-   "GL_LINEAR_CLIPMAP_NEAREST_SGIX\0"
-   "GL_LINEAR_MIPMAP_LINEAR\0"
-   "GL_LINEAR_MIPMAP_NEAREST\0"
-   "GL_LINES\0"
-   "GL_LINES_ADJACENCY_ARB\0"
-   "GL_LINE_BIT\0"
-   "GL_LINE_LOOP\0"
-   "GL_LINE_RESET_TOKEN\0"
-   "GL_LINE_SMOOTH\0"
-   "GL_LINE_SMOOTH_HINT\0"
-   "GL_LINE_STIPPLE\0"
-   "GL_LINE_STIPPLE_PATTERN\0"
-   "GL_LINE_STIPPLE_REPEAT\0"
-   "GL_LINE_STRIP\0"
-   "GL_LINE_STRIP_ADJACENCY_ARB\0"
-   "GL_LINE_TOKEN\0"
-   "GL_LINE_WIDTH\0"
-   "GL_LINE_WIDTH_GRANULARITY\0"
-   "GL_LINE_WIDTH_RANGE\0"
-   "GL_LINK_STATUS\0"
-   "GL_LIST_BASE\0"
-   "GL_LIST_BIT\0"
-   "GL_LIST_INDEX\0"
-   "GL_LIST_MODE\0"
-   "GL_LOAD\0"
-   "GL_LOGIC_OP\0"
-   "GL_LOGIC_OP_MODE\0"
-   "GL_LOWER_LEFT\0"
-   "GL_LOW_FLOAT\0"
-   "GL_LOW_INT\0"
-   "GL_LUMINANCE\0"
-   "GL_LUMINANCE12\0"
-   "GL_LUMINANCE12_ALPHA12\0"
-   "GL_LUMINANCE12_ALPHA12_EXT\0"
-   "GL_LUMINANCE12_ALPHA4\0"
-   "GL_LUMINANCE12_ALPHA4_EXT\0"
-   "GL_LUMINANCE12_EXT\0"
-   "GL_LUMINANCE16\0"
-   "GL_LUMINANCE16_ALPHA16\0"
-   "GL_LUMINANCE16_ALPHA16_EXT\0"
-   "GL_LUMINANCE16_EXT\0"
-   "GL_LUMINANCE4\0"
-   "GL_LUMINANCE4_ALPHA4\0"
-   "GL_LUMINANCE4_ALPHA4_EXT\0"
-   "GL_LUMINANCE4_EXT\0"
-   "GL_LUMINANCE6_ALPHA2\0"
-   "GL_LUMINANCE6_ALPHA2_EXT\0"
-   "GL_LUMINANCE8\0"
-   "GL_LUMINANCE8_ALPHA8\0"
-   "GL_LUMINANCE8_ALPHA8_EXT\0"
-   "GL_LUMINANCE8_EXT\0"
-   "GL_LUMINANCE_ALPHA\0"
-   "GL_MAP1_COLOR_4\0"
-   "GL_MAP1_GRID_DOMAIN\0"
-   "GL_MAP1_GRID_SEGMENTS\0"
-   "GL_MAP1_INDEX\0"
-   "GL_MAP1_NORMAL\0"
-   "GL_MAP1_TEXTURE_COORD_1\0"
-   "GL_MAP1_TEXTURE_COORD_2\0"
-   "GL_MAP1_TEXTURE_COORD_3\0"
-   "GL_MAP1_TEXTURE_COORD_4\0"
-   "GL_MAP1_VERTEX_3\0"
-   "GL_MAP1_VERTEX_4\0"
-   "GL_MAP1_VERTEX_ATTRIB0_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB10_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB11_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB12_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB13_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB14_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB15_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB1_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB2_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB3_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB4_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB5_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB6_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB7_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB8_4_NV\0"
-   "GL_MAP1_VERTEX_ATTRIB9_4_NV\0"
-   "GL_MAP2_COLOR_4\0"
-   "GL_MAP2_GRID_DOMAIN\0"
-   "GL_MAP2_GRID_SEGMENTS\0"
-   "GL_MAP2_INDEX\0"
-   "GL_MAP2_NORMAL\0"
-   "GL_MAP2_TEXTURE_COORD_1\0"
-   "GL_MAP2_TEXTURE_COORD_2\0"
-   "GL_MAP2_TEXTURE_COORD_3\0"
-   "GL_MAP2_TEXTURE_COORD_4\0"
-   "GL_MAP2_VERTEX_3\0"
-   "GL_MAP2_VERTEX_4\0"
-   "GL_MAP2_VERTEX_ATTRIB0_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB10_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB11_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB12_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB13_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB14_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB15_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB1_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB2_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB3_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB4_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB5_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB6_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB7_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB8_4_NV\0"
-   "GL_MAP2_VERTEX_ATTRIB9_4_NV\0"
-   "GL_MAP_COLOR\0"
-   "GL_MAP_FLUSH_EXPLICIT_BIT\0"
-   "GL_MAP_INVALIDATE_BUFFER_BIT\0"
-   "GL_MAP_INVALIDATE_RANGE_BIT\0"
-   "GL_MAP_READ_BIT\0"
-   "GL_MAP_STENCIL\0"
-   "GL_MAP_UNSYNCHRONIZED_BIT\0"
-   "GL_MAP_WRITE_BIT\0"
-   "GL_MATRIX0_ARB\0"
-   "GL_MATRIX0_NV\0"
-   "GL_MATRIX10_ARB\0"
-   "GL_MATRIX11_ARB\0"
-   "GL_MATRIX12_ARB\0"
-   "GL_MATRIX13_ARB\0"
-   "GL_MATRIX14_ARB\0"
-   "GL_MATRIX15_ARB\0"
-   "GL_MATRIX16_ARB\0"
-   "GL_MATRIX17_ARB\0"
-   "GL_MATRIX18_ARB\0"
-   "GL_MATRIX19_ARB\0"
-   "GL_MATRIX1_ARB\0"
-   "GL_MATRIX1_NV\0"
-   "GL_MATRIX20_ARB\0"
-   "GL_MATRIX21_ARB\0"
-   "GL_MATRIX22_ARB\0"
-   "GL_MATRIX23_ARB\0"
-   "GL_MATRIX24_ARB\0"
-   "GL_MATRIX25_ARB\0"
-   "GL_MATRIX26_ARB\0"
-   "GL_MATRIX27_ARB\0"
-   "GL_MATRIX28_ARB\0"
-   "GL_MATRIX29_ARB\0"
-   "GL_MATRIX2_ARB\0"
-   "GL_MATRIX2_NV\0"
-   "GL_MATRIX30_ARB\0"
-   "GL_MATRIX31_ARB\0"
-   "GL_MATRIX3_ARB\0"
-   "GL_MATRIX3_NV\0"
-   "GL_MATRIX4_ARB\0"
-   "GL_MATRIX4_NV\0"
-   "GL_MATRIX5_ARB\0"
-   "GL_MATRIX5_NV\0"
-   "GL_MATRIX6_ARB\0"
-   "GL_MATRIX6_NV\0"
-   "GL_MATRIX7_ARB\0"
-   "GL_MATRIX7_NV\0"
-   "GL_MATRIX8_ARB\0"
-   "GL_MATRIX9_ARB\0"
-   "GL_MATRIX_INDEX_ARRAY_ARB\0"
-   "GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES\0"
-   "GL_MATRIX_INDEX_ARRAY_OES\0"
-   "GL_MATRIX_INDEX_ARRAY_POINTER_ARB\0"
-   "GL_MATRIX_INDEX_ARRAY_POINTER_OES\0"
-   "GL_MATRIX_INDEX_ARRAY_SIZE_ARB\0"
-   "GL_MATRIX_INDEX_ARRAY_SIZE_OES\0"
-   "GL_MATRIX_INDEX_ARRAY_STRIDE_ARB\0"
-   "GL_MATRIX_INDEX_ARRAY_STRIDE_OES\0"
-   "GL_MATRIX_INDEX_ARRAY_TYPE_ARB\0"
-   "GL_MATRIX_INDEX_ARRAY_TYPE_OES\0"
-   "GL_MATRIX_MODE\0"
-   "GL_MATRIX_PALETTE_ARB\0"
-   "GL_MATRIX_PALETTE_OES\0"
-   "GL_MAX\0"
-   "GL_MAX_3D_TEXTURE_SIZE\0"
-   "GL_MAX_3D_TEXTURE_SIZE_OES\0"
-   "GL_MAX_ARRAY_TEXTURE_LAYERS_EXT\0"
-   "GL_MAX_ATTRIB_STACK_DEPTH\0"
-   "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH\0"
-   "GL_MAX_CLIPMAP_DEPTH_SGIX\0"
-   "GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX\0"
-   "GL_MAX_CLIP_PLANES\0"
-   "GL_MAX_COLOR_ATTACHMENTS\0"
-   "GL_MAX_COLOR_ATTACHMENTS_EXT\0"
-   "GL_MAX_COLOR_MATRIX_STACK_DEPTH\0"
-   "GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI\0"
-   "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS\0"
-   "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB\0"
-   "GL_MAX_CONVOLUTION_HEIGHT\0"
-   "GL_MAX_CONVOLUTION_HEIGHT_EXT\0"
-   "GL_MAX_CONVOLUTION_WIDTH\0"
-   "GL_MAX_CONVOLUTION_WIDTH_EXT\0"
-   "GL_MAX_CUBE_MAP_TEXTURE_SIZE\0"
-   "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB\0"
-   "GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES\0"
-   "GL_MAX_DRAW_BUFFERS\0"
-   "GL_MAX_DRAW_BUFFERS_ARB\0"
-   "GL_MAX_DRAW_BUFFERS_ATI\0"
-   "GL_MAX_ELEMENTS_INDICES\0"
-   "GL_MAX_ELEMENTS_VERTICES\0"
-   "GL_MAX_EVAL_ORDER\0"
-   "GL_MAX_EXT\0"
-   "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS\0"
-   "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB\0"
-   "GL_MAX_FRAGMENT_UNIFORM_VECTORS\0"
-   "GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB\0"
-   "GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB\0"
-   "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB\0"
-   "GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB\0"
-   "GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB\0"
-   "GL_MAX_LIGHTS\0"
-   "GL_MAX_LIST_NESTING\0"
-   "GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB\0"
-   "GL_MAX_MODELVIEW_STACK_DEPTH\0"
-   "GL_MAX_NAME_STACK_DEPTH\0"
-   "GL_MAX_PALETTE_MATRICES_ARB\0"
-   "GL_MAX_PALETTE_MATRICES_OES\0"
-   "GL_MAX_PIXEL_MAP_TABLE\0"
-   "GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB\0"
-   "GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB\0"
-   "GL_MAX_PROGRAM_ATTRIBS_ARB\0"
-   "GL_MAX_PROGRAM_CALL_DEPTH_NV\0"
-   "GL_MAX_PROGRAM_ENV_PARAMETERS_ARB\0"
-   "GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV\0"
-   "GL_MAX_PROGRAM_IF_DEPTH_NV\0"
-   "GL_MAX_PROGRAM_INSTRUCTIONS_ARB\0"
-   "GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB\0"
-   "GL_MAX_PROGRAM_LOOP_COUNT_NV\0"
-   "GL_MAX_PROGRAM_LOOP_DEPTH_NV\0"
-   "GL_MAX_PROGRAM_MATRICES_ARB\0"
-   "GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB\0"
-   "GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB\0"
-   "GL_MAX_PROGRAM_PARAMETERS_ARB\0"
-   "GL_MAX_PROGRAM_TEMPORARIES_ARB\0"
-   "GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB\0"
-   "GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB\0"
-   "GL_MAX_PROJECTION_STACK_DEPTH\0"
-   "GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB\0"
-   "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV\0"
-   "GL_MAX_RENDERBUFFER_SIZE\0"
-   "GL_MAX_RENDERBUFFER_SIZE_EXT\0"
-   "GL_MAX_RENDERBUFFER_SIZE_OES\0"
-   "GL_MAX_SAMPLES\0"
-   "GL_MAX_SAMPLES_EXT\0"
-   "GL_MAX_SERVER_WAIT_TIMEOUT\0"
-   "GL_MAX_SHININESS_NV\0"
-   "GL_MAX_SPOT_EXPONENT_NV\0"
-   "GL_MAX_TEXTURE_COORDS\0"
-   "GL_MAX_TEXTURE_COORDS_ARB\0"
-   "GL_MAX_TEXTURE_IMAGE_UNITS\0"
-   "GL_MAX_TEXTURE_IMAGE_UNITS_ARB\0"
-   "GL_MAX_TEXTURE_LOD_BIAS\0"
-   "GL_MAX_TEXTURE_LOD_BIAS_EXT\0"
-   "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT\0"
-   "GL_MAX_TEXTURE_SIZE\0"
-   "GL_MAX_TEXTURE_STACK_DEPTH\0"
-   "GL_MAX_TEXTURE_UNITS\0"
-   "GL_MAX_TEXTURE_UNITS_ARB\0"
-   "GL_MAX_TRACK_MATRICES_NV\0"
-   "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"
-   "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT\0"
-   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT\0"
-   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT\0"
-   "GL_MAX_VARYING_COMPONENTS\0"
-   "GL_MAX_VARYING_FLOATS\0"
-   "GL_MAX_VARYING_FLOATS_ARB\0"
-   "GL_MAX_VARYING_VECTORS\0"
-   "GL_MAX_VERTEX_ATTRIBS\0"
-   "GL_MAX_VERTEX_ATTRIBS_ARB\0"
-   "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"
-   "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"
-   "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"
-   "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB\0"
-   "GL_MAX_VERTEX_UNIFORM_VECTORS\0"
-   "GL_MAX_VERTEX_UNITS_ARB\0"
-   "GL_MAX_VERTEX_UNITS_OES\0"
-   "GL_MAX_VERTEX_VARYING_COMPONENTS_ARB\0"
-   "GL_MAX_VIEWPORT_DIMS\0"
-   "GL_MEDIUM_FLOAT\0"
-   "GL_MEDIUM_INT\0"
-   "GL_MIN\0"
-   "GL_MINMAX\0"
-   "GL_MINMAX_EXT\0"
-   "GL_MINMAX_FORMAT\0"
-   "GL_MINMAX_FORMAT_EXT\0"
-   "GL_MINMAX_SINK\0"
-   "GL_MINMAX_SINK_EXT\0"
-   "GL_MIN_EXT\0"
-   "GL_MIRRORED_REPEAT\0"
-   "GL_MIRRORED_REPEAT_ARB\0"
-   "GL_MIRRORED_REPEAT_IBM\0"
-   "GL_MIRROR_CLAMP_ATI\0"
-   "GL_MIRROR_CLAMP_EXT\0"
-   "GL_MIRROR_CLAMP_TO_BORDER_EXT\0"
-   "GL_MIRROR_CLAMP_TO_EDGE_ATI\0"
-   "GL_MIRROR_CLAMP_TO_EDGE_EXT\0"
-   "GL_MODELVIEW\0"
-   "GL_MODELVIEW0_ARB\0"
-   "GL_MODELVIEW10_ARB\0"
-   "GL_MODELVIEW11_ARB\0"
-   "GL_MODELVIEW12_ARB\0"
-   "GL_MODELVIEW13_ARB\0"
-   "GL_MODELVIEW14_ARB\0"
-   "GL_MODELVIEW15_ARB\0"
-   "GL_MODELVIEW16_ARB\0"
-   "GL_MODELVIEW17_ARB\0"
-   "GL_MODELVIEW18_ARB\0"
-   "GL_MODELVIEW19_ARB\0"
-   "GL_MODELVIEW1_ARB\0"
-   "GL_MODELVIEW20_ARB\0"
-   "GL_MODELVIEW21_ARB\0"
-   "GL_MODELVIEW22_ARB\0"
-   "GL_MODELVIEW23_ARB\0"
-   "GL_MODELVIEW24_ARB\0"
-   "GL_MODELVIEW25_ARB\0"
-   "GL_MODELVIEW26_ARB\0"
-   "GL_MODELVIEW27_ARB\0"
-   "GL_MODELVIEW28_ARB\0"
-   "GL_MODELVIEW29_ARB\0"
-   "GL_MODELVIEW2_ARB\0"
-   "GL_MODELVIEW30_ARB\0"
-   "GL_MODELVIEW31_ARB\0"
-   "GL_MODELVIEW3_ARB\0"
-   "GL_MODELVIEW4_ARB\0"
-   "GL_MODELVIEW5_ARB\0"
-   "GL_MODELVIEW6_ARB\0"
-   "GL_MODELVIEW7_ARB\0"
-   "GL_MODELVIEW8_ARB\0"
-   "GL_MODELVIEW9_ARB\0"
-   "GL_MODELVIEW_MATRIX\0"
-   "GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES\0"
-   "GL_MODELVIEW_PROJECTION_NV\0"
-   "GL_MODELVIEW_STACK_DEPTH\0"
-   "GL_MODULATE\0"
-   "GL_MODULATE_ADD_ATI\0"
-   "GL_MODULATE_SIGNED_ADD_ATI\0"
-   "GL_MODULATE_SUBTRACT_ATI\0"
-   "GL_MULT\0"
-   "GL_MULTISAMPLE\0"
-   "GL_MULTISAMPLE_3DFX\0"
-   "GL_MULTISAMPLE_ARB\0"
-   "GL_MULTISAMPLE_BIT\0"
-   "GL_MULTISAMPLE_BIT_3DFX\0"
-   "GL_MULTISAMPLE_BIT_ARB\0"
-   "GL_MULTISAMPLE_FILTER_HINT_NV\0"
-   "GL_N3F_V3F\0"
-   "GL_NAME_STACK_DEPTH\0"
-   "GL_NAND\0"
-   "GL_NEAREST\0"
-   "GL_NEAREST_CLIPMAP_LINEAR_SGIX\0"
-   "GL_NEAREST_CLIPMAP_NEAREST_SGIX\0"
-   "GL_NEAREST_MIPMAP_LINEAR\0"
-   "GL_NEAREST_MIPMAP_NEAREST\0"
-   "GL_NEVER\0"
-   "GL_NICEST\0"
-   "GL_NONE\0"
-   "GL_NONE_OES\0"
-   "GL_NOOP\0"
-   "GL_NOR\0"
-   "GL_NORMALIZE\0"
-   "GL_NORMAL_ARRAY\0"
-   "GL_NORMAL_ARRAY_BUFFER_BINDING\0"
-   "GL_NORMAL_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_NORMAL_ARRAY_POINTER\0"
-   "GL_NORMAL_ARRAY_STRIDE\0"
-   "GL_NORMAL_ARRAY_TYPE\0"
-   "GL_NORMAL_MAP\0"
-   "GL_NORMAL_MAP_ARB\0"
-   "GL_NORMAL_MAP_NV\0"
-   "GL_NORMAL_MAP_OES\0"
-   "GL_NOTEQUAL\0"
-   "GL_NO_ERROR\0"
-   "GL_NUM_COMPRESSED_TEXTURE_FORMATS\0"
-   "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB\0"
-   "GL_NUM_PROGRAM_BINARY_FORMATS_OES\0"
-   "GL_NUM_SHADER_BINARY_FORMATS\0"
-   "GL_OBJECT_ACTIVE_ATTRIBUTES_ARB\0"
-   "GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB\0"
-   "GL_OBJECT_ACTIVE_UNIFORMS_ARB\0"
-   "GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB\0"
-   "GL_OBJECT_ATTACHED_OBJECTS_ARB\0"
-   "GL_OBJECT_COMPILE_STATUS_ARB\0"
-   "GL_OBJECT_DELETE_STATUS_ARB\0"
-   "GL_OBJECT_INFO_LOG_LENGTH_ARB\0"
-   "GL_OBJECT_LINEAR\0"
-   "GL_OBJECT_LINK_STATUS_ARB\0"
-   "GL_OBJECT_PLANE\0"
-   "GL_OBJECT_SHADER_SOURCE_LENGTH_ARB\0"
-   "GL_OBJECT_SUBTYPE_ARB\0"
-   "GL_OBJECT_TYPE\0"
-   "GL_OBJECT_TYPE_ARB\0"
-   "GL_OBJECT_VALIDATE_STATUS_ARB\0"
-   "GL_OCCLUSION_TEST_HP\0"
-   "GL_OCCLUSION_TEST_RESULT_HP\0"
-   "GL_ONE\0"
-   "GL_ONE_MINUS_CONSTANT_ALPHA\0"
-   "GL_ONE_MINUS_CONSTANT_ALPHA_EXT\0"
-   "GL_ONE_MINUS_CONSTANT_COLOR\0"
-   "GL_ONE_MINUS_CONSTANT_COLOR_EXT\0"
-   "GL_ONE_MINUS_DST_ALPHA\0"
-   "GL_ONE_MINUS_DST_COLOR\0"
-   "GL_ONE_MINUS_SRC_ALPHA\0"
-   "GL_ONE_MINUS_SRC_COLOR\0"
-   "GL_OPERAND0_ALPHA\0"
-   "GL_OPERAND0_ALPHA_ARB\0"
-   "GL_OPERAND0_ALPHA_EXT\0"
-   "GL_OPERAND0_RGB\0"
-   "GL_OPERAND0_RGB_ARB\0"
-   "GL_OPERAND0_RGB_EXT\0"
-   "GL_OPERAND1_ALPHA\0"
-   "GL_OPERAND1_ALPHA_ARB\0"
-   "GL_OPERAND1_ALPHA_EXT\0"
-   "GL_OPERAND1_RGB\0"
-   "GL_OPERAND1_RGB_ARB\0"
-   "GL_OPERAND1_RGB_EXT\0"
-   "GL_OPERAND2_ALPHA\0"
-   "GL_OPERAND2_ALPHA_ARB\0"
-   "GL_OPERAND2_ALPHA_EXT\0"
-   "GL_OPERAND2_RGB\0"
-   "GL_OPERAND2_RGB_ARB\0"
-   "GL_OPERAND2_RGB_EXT\0"
-   "GL_OPERAND3_ALPHA_NV\0"
-   "GL_OPERAND3_RGB_NV\0"
-   "GL_OR\0"
-   "GL_ORDER\0"
-   "GL_OR_INVERTED\0"
-   "GL_OR_REVERSE\0"
-   "GL_OUT_OF_MEMORY\0"
-   "GL_PACK_ALIGNMENT\0"
-   "GL_PACK_IMAGE_HEIGHT\0"
-   "GL_PACK_INVERT_MESA\0"
-   "GL_PACK_LSB_FIRST\0"
-   "GL_PACK_ROW_LENGTH\0"
-   "GL_PACK_SKIP_IMAGES\0"
-   "GL_PACK_SKIP_PIXELS\0"
-   "GL_PACK_SKIP_ROWS\0"
-   "GL_PACK_SWAP_BYTES\0"
-   "GL_PALETTE4_R5_G6_B5_OES\0"
-   "GL_PALETTE4_RGB5_A1_OES\0"
-   "GL_PALETTE4_RGB8_OES\0"
-   "GL_PALETTE4_RGBA4_OES\0"
-   "GL_PALETTE4_RGBA8_OES\0"
-   "GL_PALETTE8_R5_G6_B5_OES\0"
-   "GL_PALETTE8_RGB5_A1_OES\0"
-   "GL_PALETTE8_RGB8_OES\0"
-   "GL_PALETTE8_RGBA4_OES\0"
-   "GL_PALETTE8_RGBA8_OES\0"
-   "GL_PASS_THROUGH_TOKEN\0"
-   "GL_PERSPECTIVE_CORRECTION_HINT\0"
-   "GL_PIXEL_MAP_A_TO_A\0"
-   "GL_PIXEL_MAP_A_TO_A_SIZE\0"
-   "GL_PIXEL_MAP_B_TO_B\0"
-   "GL_PIXEL_MAP_B_TO_B_SIZE\0"
-   "GL_PIXEL_MAP_G_TO_G\0"
-   "GL_PIXEL_MAP_G_TO_G_SIZE\0"
-   "GL_PIXEL_MAP_I_TO_A\0"
-   "GL_PIXEL_MAP_I_TO_A_SIZE\0"
-   "GL_PIXEL_MAP_I_TO_B\0"
-   "GL_PIXEL_MAP_I_TO_B_SIZE\0"
-   "GL_PIXEL_MAP_I_TO_G\0"
-   "GL_PIXEL_MAP_I_TO_G_SIZE\0"
-   "GL_PIXEL_MAP_I_TO_I\0"
-   "GL_PIXEL_MAP_I_TO_I_SIZE\0"
-   "GL_PIXEL_MAP_I_TO_R\0"
-   "GL_PIXEL_MAP_I_TO_R_SIZE\0"
-   "GL_PIXEL_MAP_R_TO_R\0"
-   "GL_PIXEL_MAP_R_TO_R_SIZE\0"
-   "GL_PIXEL_MAP_S_TO_S\0"
-   "GL_PIXEL_MAP_S_TO_S_SIZE\0"
-   "GL_PIXEL_MODE_BIT\0"
-   "GL_PIXEL_PACK_BUFFER\0"
-   "GL_PIXEL_PACK_BUFFER_BINDING\0"
-   "GL_PIXEL_PACK_BUFFER_BINDING_EXT\0"
-   "GL_PIXEL_PACK_BUFFER_EXT\0"
-   "GL_PIXEL_UNPACK_BUFFER\0"
-   "GL_PIXEL_UNPACK_BUFFER_BINDING\0"
-   "GL_PIXEL_UNPACK_BUFFER_BINDING_EXT\0"
-   "GL_PIXEL_UNPACK_BUFFER_EXT\0"
-   "GL_POINT\0"
-   "GL_POINTS\0"
-   "GL_POINT_BIT\0"
-   "GL_POINT_DISTANCE_ATTENUATION\0"
-   "GL_POINT_DISTANCE_ATTENUATION_ARB\0"
-   "GL_POINT_DISTANCE_ATTENUATION_EXT\0"
-   "GL_POINT_DISTANCE_ATTENUATION_SGIS\0"
-   "GL_POINT_FADE_THRESHOLD_SIZE\0"
-   "GL_POINT_FADE_THRESHOLD_SIZE_ARB\0"
-   "GL_POINT_FADE_THRESHOLD_SIZE_EXT\0"
-   "GL_POINT_FADE_THRESHOLD_SIZE_SGIS\0"
-   "GL_POINT_SIZE\0"
-   "GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES\0"
-   "GL_POINT_SIZE_ARRAY_OES\0"
-   "GL_POINT_SIZE_ARRAY_POINTER_OES\0"
-   "GL_POINT_SIZE_ARRAY_STRIDE_OES\0"
-   "GL_POINT_SIZE_ARRAY_TYPE_OES\0"
-   "GL_POINT_SIZE_GRANULARITY\0"
-   "GL_POINT_SIZE_MAX\0"
-   "GL_POINT_SIZE_MAX_ARB\0"
-   "GL_POINT_SIZE_MAX_EXT\0"
-   "GL_POINT_SIZE_MAX_SGIS\0"
-   "GL_POINT_SIZE_MIN\0"
-   "GL_POINT_SIZE_MIN_ARB\0"
-   "GL_POINT_SIZE_MIN_EXT\0"
-   "GL_POINT_SIZE_MIN_SGIS\0"
-   "GL_POINT_SIZE_RANGE\0"
-   "GL_POINT_SMOOTH\0"
-   "GL_POINT_SMOOTH_HINT\0"
-   "GL_POINT_SPRITE\0"
-   "GL_POINT_SPRITE_ARB\0"
-   "GL_POINT_SPRITE_COORD_ORIGIN\0"
-   "GL_POINT_SPRITE_NV\0"
-   "GL_POINT_SPRITE_OES\0"
-   "GL_POINT_SPRITE_R_MODE_NV\0"
-   "GL_POINT_TOKEN\0"
-   "GL_POLYGON\0"
-   "GL_POLYGON_BIT\0"
-   "GL_POLYGON_MODE\0"
-   "GL_POLYGON_OFFSET_BIAS\0"
-   "GL_POLYGON_OFFSET_FACTOR\0"
-   "GL_POLYGON_OFFSET_FILL\0"
-   "GL_POLYGON_OFFSET_LINE\0"
-   "GL_POLYGON_OFFSET_POINT\0"
-   "GL_POLYGON_OFFSET_UNITS\0"
-   "GL_POLYGON_SMOOTH\0"
-   "GL_POLYGON_SMOOTH_HINT\0"
-   "GL_POLYGON_STIPPLE\0"
-   "GL_POLYGON_STIPPLE_BIT\0"
-   "GL_POLYGON_TOKEN\0"
-   "GL_POSITION\0"
-   "GL_POST_COLOR_MATRIX_ALPHA_BIAS\0"
-   "GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI\0"
-   "GL_POST_COLOR_MATRIX_ALPHA_SCALE\0"
-   "GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI\0"
-   "GL_POST_COLOR_MATRIX_BLUE_BIAS\0"
-   "GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI\0"
-   "GL_POST_COLOR_MATRIX_BLUE_SCALE\0"
-   "GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI\0"
-   "GL_POST_COLOR_MATRIX_COLOR_TABLE\0"
-   "GL_POST_COLOR_MATRIX_GREEN_BIAS\0"
-   "GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI\0"
-   "GL_POST_COLOR_MATRIX_GREEN_SCALE\0"
-   "GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI\0"
-   "GL_POST_COLOR_MATRIX_RED_BIAS\0"
-   "GL_POST_COLOR_MATRIX_RED_BIAS_SGI\0"
-   "GL_POST_COLOR_MATRIX_RED_SCALE\0"
-   "GL_POST_COLOR_MATRIX_RED_SCALE_SGI\0"
-   "GL_POST_CONVOLUTION_ALPHA_BIAS\0"
-   "GL_POST_CONVOLUTION_ALPHA_BIAS_EXT\0"
-   "GL_POST_CONVOLUTION_ALPHA_SCALE\0"
-   "GL_POST_CONVOLUTION_ALPHA_SCALE_EXT\0"
-   "GL_POST_CONVOLUTION_BLUE_BIAS\0"
-   "GL_POST_CONVOLUTION_BLUE_BIAS_EXT\0"
-   "GL_POST_CONVOLUTION_BLUE_SCALE\0"
-   "GL_POST_CONVOLUTION_BLUE_SCALE_EXT\0"
-   "GL_POST_CONVOLUTION_COLOR_TABLE\0"
-   "GL_POST_CONVOLUTION_GREEN_BIAS\0"
-   "GL_POST_CONVOLUTION_GREEN_BIAS_EXT\0"
-   "GL_POST_CONVOLUTION_GREEN_SCALE\0"
-   "GL_POST_CONVOLUTION_GREEN_SCALE_EXT\0"
-   "GL_POST_CONVOLUTION_RED_BIAS\0"
-   "GL_POST_CONVOLUTION_RED_BIAS_EXT\0"
-   "GL_POST_CONVOLUTION_RED_SCALE\0"
-   "GL_POST_CONVOLUTION_RED_SCALE_EXT\0"
-   "GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX\0"
-   "GL_POST_TEXTURE_FILTER_BIAS_SGIX\0"
-   "GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX\0"
-   "GL_POST_TEXTURE_FILTER_SCALE_SGIX\0"
-   "GL_PREVIOUS\0"
-   "GL_PREVIOUS_ARB\0"
-   "GL_PREVIOUS_EXT\0"
-   "GL_PRIMARY_COLOR\0"
-   "GL_PRIMARY_COLOR_ARB\0"
-   "GL_PRIMARY_COLOR_EXT\0"
-   "GL_PRIMITIVES_GENERATED_EXT\0"
-   "GL_PROGRAM_ADDRESS_REGISTERS_ARB\0"
-   "GL_PROGRAM_ALU_INSTRUCTIONS_ARB\0"
-   "GL_PROGRAM_ATTRIBS_ARB\0"
-   "GL_PROGRAM_BINARY_FORMATS_OES\0"
-   "GL_PROGRAM_BINARY_LENGTH_OES\0"
-   "GL_PROGRAM_BINDING_ARB\0"
-   "GL_PROGRAM_ERROR_POSITION_ARB\0"
-   "GL_PROGRAM_ERROR_POSITION_NV\0"
-   "GL_PROGRAM_ERROR_STRING_ARB\0"
-   "GL_PROGRAM_FORMAT_ARB\0"
-   "GL_PROGRAM_FORMAT_ASCII_ARB\0"
-   "GL_PROGRAM_INSTRUCTIONS_ARB\0"
-   "GL_PROGRAM_LENGTH_ARB\0"
-   "GL_PROGRAM_LENGTH_NV\0"
-   "GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB\0"
-   "GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB\0"
-   "GL_PROGRAM_NATIVE_ATTRIBS_ARB\0"
-   "GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB\0"
-   "GL_PROGRAM_NATIVE_PARAMETERS_ARB\0"
-   "GL_PROGRAM_NATIVE_TEMPORARIES_ARB\0"
-   "GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB\0"
-   "GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB\0"
-   "GL_PROGRAM_OBJECT_ARB\0"
-   "GL_PROGRAM_PARAMETERS_ARB\0"
-   "GL_PROGRAM_PARAMETER_NV\0"
-   "GL_PROGRAM_POINT_SIZE_ARB\0"
-   "GL_PROGRAM_RESIDENT_NV\0"
-   "GL_PROGRAM_STRING_ARB\0"
-   "GL_PROGRAM_STRING_NV\0"
-   "GL_PROGRAM_TARGET_NV\0"
-   "GL_PROGRAM_TEMPORARIES_ARB\0"
-   "GL_PROGRAM_TEX_INDIRECTIONS_ARB\0"
-   "GL_PROGRAM_TEX_INSTRUCTIONS_ARB\0"
-   "GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB\0"
-   "GL_PROJECTION\0"
-   "GL_PROJECTION_MATRIX\0"
-   "GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES\0"
-   "GL_PROJECTION_STACK_DEPTH\0"
-   "GL_PROVOKING_VERTEX\0"
-   "GL_PROVOKING_VERTEX_EXT\0"
-   "GL_PROXY_COLOR_TABLE\0"
-   "GL_PROXY_HISTOGRAM\0"
-   "GL_PROXY_HISTOGRAM_EXT\0"
-   "GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE\0"
-   "GL_PROXY_POST_CONVOLUTION_COLOR_TABLE\0"
-   "GL_PROXY_TEXTURE_1D\0"
-   "GL_PROXY_TEXTURE_1D_ARRAY_EXT\0"
-   "GL_PROXY_TEXTURE_1D_EXT\0"
-   "GL_PROXY_TEXTURE_2D\0"
-   "GL_PROXY_TEXTURE_2D_ARRAY_EXT\0"
-   "GL_PROXY_TEXTURE_2D_EXT\0"
-   "GL_PROXY_TEXTURE_3D\0"
-   "GL_PROXY_TEXTURE_COLOR_TABLE_SGI\0"
-   "GL_PROXY_TEXTURE_CUBE_MAP\0"
-   "GL_PROXY_TEXTURE_CUBE_MAP_ARB\0"
-   "GL_PROXY_TEXTURE_RECTANGLE_ARB\0"
-   "GL_PROXY_TEXTURE_RECTANGLE_NV\0"
-   "GL_PURGEABLE_APPLE\0"
-   "GL_Q\0"
-   "GL_QUADRATIC_ATTENUATION\0"
-   "GL_QUADS\0"
-   "GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION\0"
-   "GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT\0"
-   "GL_QUAD_MESH_SUN\0"
-   "GL_QUAD_STRIP\0"
-   "GL_QUERY_BY_REGION_NO_WAIT_NV\0"
-   "GL_QUERY_BY_REGION_WAIT_NV\0"
-   "GL_QUERY_COUNTER_BITS\0"
-   "GL_QUERY_COUNTER_BITS_ARB\0"
-   "GL_QUERY_NO_WAIT_NV\0"
-   "GL_QUERY_RESULT\0"
-   "GL_QUERY_RESULT_ARB\0"
-   "GL_QUERY_RESULT_AVAILABLE\0"
-   "GL_QUERY_RESULT_AVAILABLE_ARB\0"
-   "GL_QUERY_WAIT_NV\0"
-   "GL_R\0"
-   "GL_R3_G3_B2\0"
-   "GL_RASTERIZER_DISCARD_EXT\0"
-   "GL_RASTER_POSITION_UNCLIPPED_IBM\0"
-   "GL_READ_BUFFER\0"
-   "GL_READ_FRAMEBUFFER\0"
-   "GL_READ_FRAMEBUFFER_BINDING\0"
-   "GL_READ_FRAMEBUFFER_BINDING_EXT\0"
-   "GL_READ_FRAMEBUFFER_EXT\0"
-   "GL_READ_ONLY\0"
-   "GL_READ_ONLY_ARB\0"
-   "GL_READ_WRITE\0"
-   "GL_READ_WRITE_ARB\0"
-   "GL_RED\0"
-   "GL_REDUCE\0"
-   "GL_REDUCE_EXT\0"
-   "GL_RED_BIAS\0"
-   "GL_RED_BITS\0"
-   "GL_RED_SCALE\0"
-   "GL_REFLECTION_MAP\0"
-   "GL_REFLECTION_MAP_ARB\0"
-   "GL_REFLECTION_MAP_NV\0"
-   "GL_REFLECTION_MAP_OES\0"
-   "GL_RELEASED_APPLE\0"
-   "GL_RENDER\0"
-   "GL_RENDERBUFFER\0"
-   "GL_RENDERBUFFER_ALPHA_SIZE\0"
-   "GL_RENDERBUFFER_ALPHA_SIZE_OES\0"
-   "GL_RENDERBUFFER_BINDING\0"
-   "GL_RENDERBUFFER_BINDING_EXT\0"
-   "GL_RENDERBUFFER_BINDING_OES\0"
-   "GL_RENDERBUFFER_BLUE_SIZE\0"
-   "GL_RENDERBUFFER_BLUE_SIZE_OES\0"
-   "GL_RENDERBUFFER_DEPTH_SIZE\0"
-   "GL_RENDERBUFFER_DEPTH_SIZE_OES\0"
-   "GL_RENDERBUFFER_EXT\0"
-   "GL_RENDERBUFFER_GREEN_SIZE\0"
-   "GL_RENDERBUFFER_GREEN_SIZE_OES\0"
-   "GL_RENDERBUFFER_HEIGHT\0"
-   "GL_RENDERBUFFER_HEIGHT_EXT\0"
-   "GL_RENDERBUFFER_HEIGHT_OES\0"
-   "GL_RENDERBUFFER_INTERNAL_FORMAT\0"
-   "GL_RENDERBUFFER_INTERNAL_FORMAT_EXT\0"
-   "GL_RENDERBUFFER_INTERNAL_FORMAT_OES\0"
-   "GL_RENDERBUFFER_OES\0"
-   "GL_RENDERBUFFER_RED_SIZE\0"
-   "GL_RENDERBUFFER_RED_SIZE_OES\0"
-   "GL_RENDERBUFFER_SAMPLES\0"
-   "GL_RENDERBUFFER_SAMPLES_EXT\0"
-   "GL_RENDERBUFFER_STENCIL_SIZE\0"
-   "GL_RENDERBUFFER_STENCIL_SIZE_OES\0"
-   "GL_RENDERBUFFER_WIDTH\0"
-   "GL_RENDERBUFFER_WIDTH_EXT\0"
-   "GL_RENDERBUFFER_WIDTH_OES\0"
-   "GL_RENDERER\0"
-   "GL_RENDER_MODE\0"
-   "GL_REPEAT\0"
-   "GL_REPLACE\0"
-   "GL_REPLACE_EXT\0"
-   "GL_REPLICATE_BORDER_HP\0"
-   "GL_RESCALE_NORMAL\0"
-   "GL_RESCALE_NORMAL_EXT\0"
-   "GL_RETAINED_APPLE\0"
-   "GL_RETURN\0"
-   "GL_RGB\0"
-   "GL_RGB10\0"
-   "GL_RGB10_A2\0"
-   "GL_RGB10_A2_EXT\0"
-   "GL_RGB10_EXT\0"
-   "GL_RGB12\0"
-   "GL_RGB12_EXT\0"
-   "GL_RGB16\0"
-   "GL_RGB16_EXT\0"
-   "GL_RGB2_EXT\0"
-   "GL_RGB4\0"
-   "GL_RGB4_EXT\0"
-   "GL_RGB4_S3TC\0"
-   "GL_RGB5\0"
-   "GL_RGB565\0"
-   "GL_RGB565_OES\0"
-   "GL_RGB5_A1\0"
-   "GL_RGB5_A1_EXT\0"
-   "GL_RGB5_A1_OES\0"
-   "GL_RGB5_EXT\0"
-   "GL_RGB8\0"
-   "GL_RGB8_EXT\0"
-   "GL_RGB8_OES\0"
-   "GL_RGBA\0"
-   "GL_RGBA12\0"
-   "GL_RGBA12_EXT\0"
-   "GL_RGBA16\0"
-   "GL_RGBA16_EXT\0"
-   "GL_RGBA2\0"
-   "GL_RGBA2_EXT\0"
-   "GL_RGBA4\0"
-   "GL_RGBA4_DXT5_S3TC\0"
-   "GL_RGBA4_EXT\0"
-   "GL_RGBA4_OES\0"
-   "GL_RGBA4_S3TC\0"
-   "GL_RGBA8\0"
-   "GL_RGBA8_EXT\0"
-   "GL_RGBA8_OES\0"
-   "GL_RGBA8_SNORM\0"
-   "GL_RGBA_DXT5_S3TC\0"
-   "GL_RGBA_MODE\0"
-   "GL_RGBA_S3TC\0"
-   "GL_RGBA_SNORM\0"
-   "GL_RGB_S3TC\0"
-   "GL_RGB_SCALE\0"
-   "GL_RGB_SCALE_ARB\0"
-   "GL_RGB_SCALE_EXT\0"
-   "GL_RIGHT\0"
-   "GL_S\0"
-   "GL_SAMPLER_1D\0"
-   "GL_SAMPLER_1D_SHADOW\0"
-   "GL_SAMPLER_2D\0"
-   "GL_SAMPLER_2D_SHADOW\0"
-   "GL_SAMPLER_3D\0"
-   "GL_SAMPLER_3D_OES\0"
-   "GL_SAMPLER_CUBE\0"
-   "GL_SAMPLES\0"
-   "GL_SAMPLES_3DFX\0"
-   "GL_SAMPLES_ARB\0"
-   "GL_SAMPLES_PASSED\0"
-   "GL_SAMPLES_PASSED_ARB\0"
-   "GL_SAMPLE_ALPHA_TO_COVERAGE\0"
-   "GL_SAMPLE_ALPHA_TO_COVERAGE_ARB\0"
-   "GL_SAMPLE_ALPHA_TO_ONE\0"
-   "GL_SAMPLE_ALPHA_TO_ONE_ARB\0"
-   "GL_SAMPLE_BUFFERS\0"
-   "GL_SAMPLE_BUFFERS_3DFX\0"
-   "GL_SAMPLE_BUFFERS_ARB\0"
-   "GL_SAMPLE_COVERAGE\0"
-   "GL_SAMPLE_COVERAGE_ARB\0"
-   "GL_SAMPLE_COVERAGE_INVERT\0"
-   "GL_SAMPLE_COVERAGE_INVERT_ARB\0"
-   "GL_SAMPLE_COVERAGE_VALUE\0"
-   "GL_SAMPLE_COVERAGE_VALUE_ARB\0"
-   "GL_SCISSOR_BIT\0"
-   "GL_SCISSOR_BOX\0"
-   "GL_SCISSOR_TEST\0"
-   "GL_SECONDARY_COLOR_ARRAY\0"
-   "GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING\0"
-   "GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_SECONDARY_COLOR_ARRAY_POINTER\0"
-   "GL_SECONDARY_COLOR_ARRAY_SIZE\0"
-   "GL_SECONDARY_COLOR_ARRAY_STRIDE\0"
-   "GL_SECONDARY_COLOR_ARRAY_TYPE\0"
-   "GL_SELECT\0"
-   "GL_SELECTION_BUFFER_POINTER\0"
-   "GL_SELECTION_BUFFER_SIZE\0"
-   "GL_SEPARABLE_2D\0"
-   "GL_SEPARATE_ATTRIBS_EXT\0"
-   "GL_SEPARATE_SPECULAR_COLOR\0"
-   "GL_SEPARATE_SPECULAR_COLOR_EXT\0"
-   "GL_SET\0"
-   "GL_SHADER_BINARY_FORMATS\0"
-   "GL_SHADER_COMPILER\0"
-   "GL_SHADER_OBJECT_ARB\0"
-   "GL_SHADER_SOURCE_LENGTH\0"
-   "GL_SHADER_TYPE\0"
-   "GL_SHADE_MODEL\0"
-   "GL_SHADING_LANGUAGE_VERSION\0"
-   "GL_SHADOW_AMBIENT_SGIX\0"
-   "GL_SHARED_TEXTURE_PALETTE_EXT\0"
-   "GL_SHININESS\0"
-   "GL_SHORT\0"
-   "GL_SIGNALED\0"
-   "GL_SIGNED_NORMALIZED\0"
-   "GL_SINGLE_COLOR\0"
-   "GL_SINGLE_COLOR_EXT\0"
-   "GL_SLICE_ACCUM_SUN\0"
-   "GL_SLUMINANCE\0"
-   "GL_SLUMINANCE8\0"
-   "GL_SLUMINANCE8_ALPHA8\0"
-   "GL_SLUMINANCE_ALPHA\0"
-   "GL_SMOOTH\0"
-   "GL_SMOOTH_LINE_WIDTH_GRANULARITY\0"
-   "GL_SMOOTH_LINE_WIDTH_RANGE\0"
-   "GL_SMOOTH_POINT_SIZE_GRANULARITY\0"
-   "GL_SMOOTH_POINT_SIZE_RANGE\0"
-   "GL_SOURCE0_ALPHA\0"
-   "GL_SOURCE0_ALPHA_ARB\0"
-   "GL_SOURCE0_ALPHA_EXT\0"
-   "GL_SOURCE0_RGB\0"
-   "GL_SOURCE0_RGB_ARB\0"
-   "GL_SOURCE0_RGB_EXT\0"
-   "GL_SOURCE1_ALPHA\0"
-   "GL_SOURCE1_ALPHA_ARB\0"
-   "GL_SOURCE1_ALPHA_EXT\0"
-   "GL_SOURCE1_RGB\0"
-   "GL_SOURCE1_RGB_ARB\0"
-   "GL_SOURCE1_RGB_EXT\0"
-   "GL_SOURCE2_ALPHA\0"
-   "GL_SOURCE2_ALPHA_ARB\0"
-   "GL_SOURCE2_ALPHA_EXT\0"
-   "GL_SOURCE2_RGB\0"
-   "GL_SOURCE2_RGB_ARB\0"
-   "GL_SOURCE2_RGB_EXT\0"
-   "GL_SOURCE3_ALPHA_NV\0"
-   "GL_SOURCE3_RGB_NV\0"
-   "GL_SPECULAR\0"
-   "GL_SPHERE_MAP\0"
-   "GL_SPOT_CUTOFF\0"
-   "GL_SPOT_DIRECTION\0"
-   "GL_SPOT_EXPONENT\0"
-   "GL_SRC0_ALPHA\0"
-   "GL_SRC0_RGB\0"
-   "GL_SRC1_ALPHA\0"
-   "GL_SRC1_RGB\0"
-   "GL_SRC2_ALPHA\0"
-   "GL_SRC2_RGB\0"
-   "GL_SRC_ALPHA\0"
-   "GL_SRC_ALPHA_SATURATE\0"
-   "GL_SRC_COLOR\0"
-   "GL_SRGB\0"
-   "GL_SRGB8\0"
-   "GL_SRGB8_ALPHA8\0"
-   "GL_SRGB_ALPHA\0"
-   "GL_STACK_OVERFLOW\0"
-   "GL_STACK_UNDERFLOW\0"
-   "GL_STATIC_COPY\0"
-   "GL_STATIC_COPY_ARB\0"
-   "GL_STATIC_DRAW\0"
-   "GL_STATIC_DRAW_ARB\0"
-   "GL_STATIC_READ\0"
-   "GL_STATIC_READ_ARB\0"
-   "GL_STENCIL\0"
-   "GL_STENCIL_ATTACHMENT\0"
-   "GL_STENCIL_ATTACHMENT_EXT\0"
-   "GL_STENCIL_ATTACHMENT_OES\0"
-   "GL_STENCIL_BACK_FAIL\0"
-   "GL_STENCIL_BACK_FAIL_ATI\0"
-   "GL_STENCIL_BACK_FUNC\0"
-   "GL_STENCIL_BACK_FUNC_ATI\0"
-   "GL_STENCIL_BACK_PASS_DEPTH_FAIL\0"
-   "GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI\0"
-   "GL_STENCIL_BACK_PASS_DEPTH_PASS\0"
-   "GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI\0"
-   "GL_STENCIL_BACK_REF\0"
-   "GL_STENCIL_BACK_VALUE_MASK\0"
-   "GL_STENCIL_BACK_WRITEMASK\0"
-   "GL_STENCIL_BITS\0"
-   "GL_STENCIL_BUFFER_BIT\0"
-   "GL_STENCIL_CLEAR_VALUE\0"
-   "GL_STENCIL_FAIL\0"
-   "GL_STENCIL_FUNC\0"
-   "GL_STENCIL_INDEX\0"
-   "GL_STENCIL_INDEX1\0"
-   "GL_STENCIL_INDEX16\0"
-   "GL_STENCIL_INDEX16_EXT\0"
-   "GL_STENCIL_INDEX1_EXT\0"
-   "GL_STENCIL_INDEX1_OES\0"
-   "GL_STENCIL_INDEX4\0"
-   "GL_STENCIL_INDEX4_EXT\0"
-   "GL_STENCIL_INDEX4_OES\0"
-   "GL_STENCIL_INDEX8\0"
-   "GL_STENCIL_INDEX8_EXT\0"
-   "GL_STENCIL_INDEX8_OES\0"
-   "GL_STENCIL_INDEX_EXT\0"
-   "GL_STENCIL_PASS_DEPTH_FAIL\0"
-   "GL_STENCIL_PASS_DEPTH_PASS\0"
-   "GL_STENCIL_REF\0"
-   "GL_STENCIL_TEST\0"
-   "GL_STENCIL_TEST_TWO_SIDE_EXT\0"
-   "GL_STENCIL_VALUE_MASK\0"
-   "GL_STENCIL_WRITEMASK\0"
-   "GL_STEREO\0"
-   "GL_STORAGE_CACHED_APPLE\0"
-   "GL_STORAGE_PRIVATE_APPLE\0"
-   "GL_STORAGE_SHARED_APPLE\0"
-   "GL_STREAM_COPY\0"
-   "GL_STREAM_COPY_ARB\0"
-   "GL_STREAM_DRAW\0"
-   "GL_STREAM_DRAW_ARB\0"
-   "GL_STREAM_READ\0"
-   "GL_STREAM_READ_ARB\0"
-   "GL_SUBPIXEL_BITS\0"
-   "GL_SUBTRACT\0"
-   "GL_SUBTRACT_ARB\0"
-   "GL_SYNC_CONDITION\0"
-   "GL_SYNC_FENCE\0"
-   "GL_SYNC_FLAGS\0"
-   "GL_SYNC_FLUSH_COMMANDS_BIT\0"
-   "GL_SYNC_GPU_COMMANDS_COMPLETE\0"
-   "GL_SYNC_STATUS\0"
-   "GL_T\0"
-   "GL_T2F_C3F_V3F\0"
-   "GL_T2F_C4F_N3F_V3F\0"
-   "GL_T2F_C4UB_V3F\0"
-   "GL_T2F_N3F_V3F\0"
-   "GL_T2F_V3F\0"
-   "GL_T4F_C4F_N3F_V4F\0"
-   "GL_T4F_V4F\0"
-   "GL_TABLE_TOO_LARGE_EXT\0"
-   "GL_TEXTURE\0"
-   "GL_TEXTURE0\0"
-   "GL_TEXTURE0_ARB\0"
-   "GL_TEXTURE1\0"
-   "GL_TEXTURE10\0"
-   "GL_TEXTURE10_ARB\0"
-   "GL_TEXTURE11\0"
-   "GL_TEXTURE11_ARB\0"
-   "GL_TEXTURE12\0"
-   "GL_TEXTURE12_ARB\0"
-   "GL_TEXTURE13\0"
-   "GL_TEXTURE13_ARB\0"
-   "GL_TEXTURE14\0"
-   "GL_TEXTURE14_ARB\0"
-   "GL_TEXTURE15\0"
-   "GL_TEXTURE15_ARB\0"
-   "GL_TEXTURE16\0"
-   "GL_TEXTURE16_ARB\0"
-   "GL_TEXTURE17\0"
-   "GL_TEXTURE17_ARB\0"
-   "GL_TEXTURE18\0"
-   "GL_TEXTURE18_ARB\0"
-   "GL_TEXTURE19\0"
-   "GL_TEXTURE19_ARB\0"
-   "GL_TEXTURE1_ARB\0"
-   "GL_TEXTURE2\0"
-   "GL_TEXTURE20\0"
-   "GL_TEXTURE20_ARB\0"
-   "GL_TEXTURE21\0"
-   "GL_TEXTURE21_ARB\0"
-   "GL_TEXTURE22\0"
-   "GL_TEXTURE22_ARB\0"
-   "GL_TEXTURE23\0"
-   "GL_TEXTURE23_ARB\0"
-   "GL_TEXTURE24\0"
-   "GL_TEXTURE24_ARB\0"
-   "GL_TEXTURE25\0"
-   "GL_TEXTURE25_ARB\0"
-   "GL_TEXTURE26\0"
-   "GL_TEXTURE26_ARB\0"
-   "GL_TEXTURE27\0"
-   "GL_TEXTURE27_ARB\0"
-   "GL_TEXTURE28\0"
-   "GL_TEXTURE28_ARB\0"
-   "GL_TEXTURE29\0"
-   "GL_TEXTURE29_ARB\0"
-   "GL_TEXTURE2_ARB\0"
-   "GL_TEXTURE3\0"
-   "GL_TEXTURE30\0"
-   "GL_TEXTURE30_ARB\0"
-   "GL_TEXTURE31\0"
-   "GL_TEXTURE31_ARB\0"
-   "GL_TEXTURE3_ARB\0"
-   "GL_TEXTURE4\0"
-   "GL_TEXTURE4_ARB\0"
-   "GL_TEXTURE5\0"
-   "GL_TEXTURE5_ARB\0"
-   "GL_TEXTURE6\0"
-   "GL_TEXTURE6_ARB\0"
-   "GL_TEXTURE7\0"
-   "GL_TEXTURE7_ARB\0"
-   "GL_TEXTURE8\0"
-   "GL_TEXTURE8_ARB\0"
-   "GL_TEXTURE9\0"
-   "GL_TEXTURE9_ARB\0"
-   "GL_TEXTURE_1D\0"
-   "GL_TEXTURE_1D_ARRAY_EXT\0"
-   "GL_TEXTURE_2D\0"
-   "GL_TEXTURE_2D_ARRAY_EXT\0"
-   "GL_TEXTURE_3D\0"
-   "GL_TEXTURE_3D_OES\0"
-   "GL_TEXTURE_ALPHA_SIZE\0"
-   "GL_TEXTURE_ALPHA_SIZE_EXT\0"
-   "GL_TEXTURE_BASE_LEVEL\0"
-   "GL_TEXTURE_BINDING_1D\0"
-   "GL_TEXTURE_BINDING_1D_ARRAY_EXT\0"
-   "GL_TEXTURE_BINDING_2D\0"
-   "GL_TEXTURE_BINDING_2D_ARRAY_EXT\0"
-   "GL_TEXTURE_BINDING_3D\0"
-   "GL_TEXTURE_BINDING_3D_OES\0"
-   "GL_TEXTURE_BINDING_CUBE_MAP\0"
-   "GL_TEXTURE_BINDING_CUBE_MAP_ARB\0"
-   "GL_TEXTURE_BINDING_CUBE_MAP_OES\0"
-   "GL_TEXTURE_BINDING_RECTANGLE_ARB\0"
-   "GL_TEXTURE_BINDING_RECTANGLE_NV\0"
-   "GL_TEXTURE_BIT\0"
-   "GL_TEXTURE_BLUE_SIZE\0"
-   "GL_TEXTURE_BLUE_SIZE_EXT\0"
-   "GL_TEXTURE_BORDER\0"
-   "GL_TEXTURE_BORDER_COLOR\0"
-   "GL_TEXTURE_CLIPMAP_CENTER_SGIX\0"
-   "GL_TEXTURE_CLIPMAP_DEPTH_SGIX\0"
-   "GL_TEXTURE_CLIPMAP_FRAME_SGIX\0"
-   "GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX\0"
-   "GL_TEXTURE_CLIPMAP_OFFSET_SGIX\0"
-   "GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX\0"
-   "GL_TEXTURE_COLOR_TABLE_SGI\0"
-   "GL_TEXTURE_COLOR_WRITEMASK_SGIS\0"
-   "GL_TEXTURE_COMPARE_FAIL_VALUE_ARB\0"
-   "GL_TEXTURE_COMPARE_FUNC\0"
-   "GL_TEXTURE_COMPARE_FUNC_ARB\0"
-   "GL_TEXTURE_COMPARE_MODE\0"
-   "GL_TEXTURE_COMPARE_MODE_ARB\0"
-   "GL_TEXTURE_COMPARE_OPERATOR_SGIX\0"
-   "GL_TEXTURE_COMPARE_SGIX\0"
-   "GL_TEXTURE_COMPONENTS\0"
-   "GL_TEXTURE_COMPRESSED\0"
-   "GL_TEXTURE_COMPRESSED_ARB\0"
-   "GL_TEXTURE_COMPRESSED_FORMATS_ARB\0"
-   "GL_TEXTURE_COMPRESSED_IMAGE_SIZE\0"
-   "GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB\0"
-   "GL_TEXTURE_COMPRESSION_HINT\0"
-   "GL_TEXTURE_COMPRESSION_HINT_ARB\0"
-   "GL_TEXTURE_COORD_ARRAY\0"
-   "GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING\0"
-   "GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_TEXTURE_COORD_ARRAY_POINTER\0"
-   "GL_TEXTURE_COORD_ARRAY_SIZE\0"
-   "GL_TEXTURE_COORD_ARRAY_STRIDE\0"
-   "GL_TEXTURE_COORD_ARRAY_TYPE\0"
-   "GL_TEXTURE_CROP_RECT_OES\0"
-   "GL_TEXTURE_CUBE_MAP\0"
-   "GL_TEXTURE_CUBE_MAP_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES\0"
-   "GL_TEXTURE_CUBE_MAP_OES\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_X\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB\0"
-   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES\0"
-   "GL_TEXTURE_CUBE_MAP_SEAMLESS\0"
-   "GL_TEXTURE_DEPTH\0"
-   "GL_TEXTURE_DEPTH_SIZE\0"
-   "GL_TEXTURE_DEPTH_SIZE_ARB\0"
-   "GL_TEXTURE_ENV\0"
-   "GL_TEXTURE_ENV_COLOR\0"
-   "GL_TEXTURE_ENV_MODE\0"
-   "GL_TEXTURE_FILTER_CONTROL\0"
-   "GL_TEXTURE_FILTER_CONTROL_EXT\0"
-   "GL_TEXTURE_GEN_MODE\0"
-   "GL_TEXTURE_GEN_MODE_OES\0"
-   "GL_TEXTURE_GEN_Q\0"
-   "GL_TEXTURE_GEN_R\0"
-   "GL_TEXTURE_GEN_S\0"
-   "GL_TEXTURE_GEN_STR_OES\0"
-   "GL_TEXTURE_GEN_T\0"
-   "GL_TEXTURE_GEQUAL_R_SGIX\0"
-   "GL_TEXTURE_GREEN_SIZE\0"
-   "GL_TEXTURE_GREEN_SIZE_EXT\0"
-   "GL_TEXTURE_HEIGHT\0"
-   "GL_TEXTURE_INDEX_SIZE_EXT\0"
-   "GL_TEXTURE_INTENSITY_SIZE\0"
-   "GL_TEXTURE_INTENSITY_SIZE_EXT\0"
-   "GL_TEXTURE_INTERNAL_FORMAT\0"
-   "GL_TEXTURE_LEQUAL_R_SGIX\0"
-   "GL_TEXTURE_LOD_BIAS\0"
-   "GL_TEXTURE_LOD_BIAS_EXT\0"
-   "GL_TEXTURE_LOD_BIAS_R_SGIX\0"
-   "GL_TEXTURE_LOD_BIAS_S_SGIX\0"
-   "GL_TEXTURE_LOD_BIAS_T_SGIX\0"
-   "GL_TEXTURE_LUMINANCE_SIZE\0"
-   "GL_TEXTURE_LUMINANCE_SIZE_EXT\0"
-   "GL_TEXTURE_MAG_FILTER\0"
-   "GL_TEXTURE_MATRIX\0"
-   "GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES\0"
-   "GL_TEXTURE_MAX_ANISOTROPY_EXT\0"
-   "GL_TEXTURE_MAX_CLAMP_R_SGIX\0"
-   "GL_TEXTURE_MAX_CLAMP_S_SGIX\0"
-   "GL_TEXTURE_MAX_CLAMP_T_SGIX\0"
-   "GL_TEXTURE_MAX_LEVEL\0"
-   "GL_TEXTURE_MAX_LOD\0"
-   "GL_TEXTURE_MIN_FILTER\0"
-   "GL_TEXTURE_MIN_LOD\0"
-   "GL_TEXTURE_PRIORITY\0"
-   "GL_TEXTURE_RANGE_LENGTH_APPLE\0"
-   "GL_TEXTURE_RANGE_POINTER_APPLE\0"
-   "GL_TEXTURE_RECTANGLE_ARB\0"
-   "GL_TEXTURE_RECTANGLE_NV\0"
-   "GL_TEXTURE_RED_SIZE\0"
-   "GL_TEXTURE_RED_SIZE_EXT\0"
-   "GL_TEXTURE_RESIDENT\0"
-   "GL_TEXTURE_STACK_DEPTH\0"
-   "GL_TEXTURE_STENCIL_SIZE\0"
-   "GL_TEXTURE_STENCIL_SIZE_EXT\0"
-   "GL_TEXTURE_STORAGE_HINT_APPLE\0"
-   "GL_TEXTURE_TOO_LARGE_EXT\0"
-   "GL_TEXTURE_UNSIGNED_REMAP_MODE_NV\0"
-   "GL_TEXTURE_WIDTH\0"
-   "GL_TEXTURE_WRAP_R\0"
-   "GL_TEXTURE_WRAP_R_OES\0"
-   "GL_TEXTURE_WRAP_S\0"
-   "GL_TEXTURE_WRAP_T\0"
-   "GL_TIMEOUT_EXPIRED\0"
-   "GL_TIME_ELAPSED_EXT\0"
-   "GL_TRACK_MATRIX_NV\0"
-   "GL_TRACK_MATRIX_TRANSFORM_NV\0"
-   "GL_TRANSFORM_BIT\0"
-   "GL_TRANSFORM_FEEDBACK\0"
-   "GL_TRANSFORM_FEEDBACK_BINDING\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_VARYINGS_EXT\0"
-   "GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT\0"
-   "GL_TRANSPOSE_COLOR_MATRIX\0"
-   "GL_TRANSPOSE_COLOR_MATRIX_ARB\0"
-   "GL_TRANSPOSE_CURRENT_MATRIX_ARB\0"
-   "GL_TRANSPOSE_MODELVIEW_MATRIX\0"
-   "GL_TRANSPOSE_MODELVIEW_MATRIX_ARB\0"
-   "GL_TRANSPOSE_NV\0"
-   "GL_TRANSPOSE_PROJECTION_MATRIX\0"
-   "GL_TRANSPOSE_PROJECTION_MATRIX_ARB\0"
-   "GL_TRANSPOSE_TEXTURE_MATRIX\0"
-   "GL_TRANSPOSE_TEXTURE_MATRIX_ARB\0"
-   "GL_TRIANGLES\0"
-   "GL_TRIANGLES_ADJACENCY_ARB\0"
-   "GL_TRIANGLE_FAN\0"
-   "GL_TRIANGLE_MESH_SUN\0"
-   "GL_TRIANGLE_STRIP\0"
-   "GL_TRIANGLE_STRIP_ADJACENCY_ARB\0"
-   "GL_TRUE\0"
-   "GL_UNDEFINED_APPLE\0"
-   "GL_UNPACK_ALIGNMENT\0"
-   "GL_UNPACK_IMAGE_HEIGHT\0"
-   "GL_UNPACK_LSB_FIRST\0"
-   "GL_UNPACK_ROW_LENGTH\0"
-   "GL_UNPACK_SKIP_IMAGES\0"
-   "GL_UNPACK_SKIP_PIXELS\0"
-   "GL_UNPACK_SKIP_ROWS\0"
-   "GL_UNPACK_SWAP_BYTES\0"
-   "GL_UNSIGNALED\0"
-   "GL_UNSIGNED_BYTE\0"
-   "GL_UNSIGNED_BYTE_2_3_3_REV\0"
-   "GL_UNSIGNED_BYTE_3_3_2\0"
-   "GL_UNSIGNED_INT\0"
-   "GL_UNSIGNED_INT_10_10_10_2\0"
-   "GL_UNSIGNED_INT_10_10_10_2_OES\0"
-   "GL_UNSIGNED_INT_24_8\0"
-   "GL_UNSIGNED_INT_24_8_EXT\0"
-   "GL_UNSIGNED_INT_24_8_NV\0"
-   "GL_UNSIGNED_INT_24_8_OES\0"
-   "GL_UNSIGNED_INT_2_10_10_10_REV\0"
-   "GL_UNSIGNED_INT_2_10_10_10_REV_EXT\0"
-   "GL_UNSIGNED_INT_8_8_8_8\0"
-   "GL_UNSIGNED_INT_8_8_8_8_REV\0"
-   "GL_UNSIGNED_NORMALIZED\0"
-   "GL_UNSIGNED_SHORT\0"
-   "GL_UNSIGNED_SHORT_1_5_5_5_REV\0"
-   "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT\0"
-   "GL_UNSIGNED_SHORT_4_4_4_4\0"
-   "GL_UNSIGNED_SHORT_4_4_4_4_REV\0"
-   "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT\0"
-   "GL_UNSIGNED_SHORT_5_5_5_1\0"
-   "GL_UNSIGNED_SHORT_5_6_5\0"
-   "GL_UNSIGNED_SHORT_5_6_5_REV\0"
-   "GL_UNSIGNED_SHORT_8_8_APPLE\0"
-   "GL_UNSIGNED_SHORT_8_8_MESA\0"
-   "GL_UNSIGNED_SHORT_8_8_REV_APPLE\0"
-   "GL_UNSIGNED_SHORT_8_8_REV_MESA\0"
-   "GL_UPPER_LEFT\0"
-   "GL_V2F\0"
-   "GL_V3F\0"
-   "GL_VALIDATE_STATUS\0"
-   "GL_VENDOR\0"
-   "GL_VERSION\0"
-   "GL_VERTEX_ARRAY\0"
-   "GL_VERTEX_ARRAY_BINDING\0"
-   "GL_VERTEX_ARRAY_BINDING_APPLE\0"
-   "GL_VERTEX_ARRAY_BUFFER_BINDING\0"
-   "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_VERTEX_ARRAY_POINTER\0"
-   "GL_VERTEX_ARRAY_SIZE\0"
-   "GL_VERTEX_ARRAY_STRIDE\0"
-   "GL_VERTEX_ARRAY_TYPE\0"
-   "GL_VERTEX_ATTRIB_ARRAY0_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY10_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY11_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY12_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY13_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY14_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY15_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY1_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY2_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY3_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY4_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY5_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY6_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY7_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY8_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY9_NV\0"
-   "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING\0"
-   "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_VERTEX_ATTRIB_ARRAY_ENABLED\0"
-   "GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB\0"
-   "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED\0"
-   "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB\0"
-   "GL_VERTEX_ATTRIB_ARRAY_POINTER\0"
-   "GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB\0"
-   "GL_VERTEX_ATTRIB_ARRAY_SIZE\0"
-   "GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB\0"
-   "GL_VERTEX_ATTRIB_ARRAY_STRIDE\0"
-   "GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB\0"
-   "GL_VERTEX_ATTRIB_ARRAY_TYPE\0"
-   "GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB\0"
-   "GL_VERTEX_BLEND_ARB\0"
-   "GL_VERTEX_PROGRAM_ARB\0"
-   "GL_VERTEX_PROGRAM_BINDING_NV\0"
-   "GL_VERTEX_PROGRAM_NV\0"
-   "GL_VERTEX_PROGRAM_POINT_SIZE\0"
-   "GL_VERTEX_PROGRAM_POINT_SIZE_ARB\0"
-   "GL_VERTEX_PROGRAM_POINT_SIZE_NV\0"
-   "GL_VERTEX_PROGRAM_TWO_SIDE\0"
-   "GL_VERTEX_PROGRAM_TWO_SIDE_ARB\0"
-   "GL_VERTEX_PROGRAM_TWO_SIDE_NV\0"
-   "GL_VERTEX_SHADER\0"
-   "GL_VERTEX_SHADER_ARB\0"
-   "GL_VERTEX_STATE_PROGRAM_NV\0"
-   "GL_VIEWPORT\0"
-   "GL_VIEWPORT_BIT\0"
-   "GL_VOLATILE_APPLE\0"
-   "GL_WAIT_FAILED\0"
-   "GL_WEIGHT_ARRAY_ARB\0"
-   "GL_WEIGHT_ARRAY_BUFFER_BINDING\0"
-   "GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB\0"
-   "GL_WEIGHT_ARRAY_BUFFER_BINDING_OES\0"
-   "GL_WEIGHT_ARRAY_OES\0"
-   "GL_WEIGHT_ARRAY_POINTER_ARB\0"
-   "GL_WEIGHT_ARRAY_POINTER_OES\0"
-   "GL_WEIGHT_ARRAY_SIZE_ARB\0"
-   "GL_WEIGHT_ARRAY_SIZE_OES\0"
-   "GL_WEIGHT_ARRAY_STRIDE_ARB\0"
-   "GL_WEIGHT_ARRAY_STRIDE_OES\0"
-   "GL_WEIGHT_ARRAY_TYPE_ARB\0"
-   "GL_WEIGHT_ARRAY_TYPE_OES\0"
-   "GL_WEIGHT_SUM_UNITY_ARB\0"
-   "GL_WRAP_BORDER_SUN\0"
-   "GL_WRITE_ONLY\0"
-   "GL_WRITE_ONLY_ARB\0"
-   "GL_WRITE_ONLY_OES\0"
-   "GL_XOR\0"
-   "GL_YCBCR_422_APPLE\0"
-   "GL_YCBCR_MESA\0"
-   "GL_ZERO\0"
-   "GL_ZOOM_X\0"
-   "GL_ZOOM_Y\0"
-   ;
-
-static const enum_elt all_enums[2065] =
-{
-   {     0, 0x00000600 }, /* GL_2D */
-   {     6, 0x00001407 }, /* GL_2_BYTES */
-   {    17, 0x00000601 }, /* GL_3D */
-   {    23, 0x00000602 }, /* GL_3D_COLOR */
-   {    35, 0x00000603 }, /* GL_3D_COLOR_TEXTURE */
-   {    55, 0x00001408 }, /* GL_3_BYTES */
-   {    66, 0x00000604 }, /* GL_4D_COLOR_TEXTURE */
-   {    86, 0x00001409 }, /* GL_4_BYTES */
-   {    97, 0x00000100 }, /* GL_ACCUM */
-   {   106, 0x00000D5B }, /* GL_ACCUM_ALPHA_BITS */
-   {   126, 0x00000D5A }, /* GL_ACCUM_BLUE_BITS */
-   {   145, 0x00000200 }, /* GL_ACCUM_BUFFER_BIT */
-   {   165, 0x00000B80 }, /* GL_ACCUM_CLEAR_VALUE */
-   {   186, 0x00000D59 }, /* GL_ACCUM_GREEN_BITS */
-   {   206, 0x00000D58 }, /* GL_ACCUM_RED_BITS */
-   {   224, 0x00008B89 }, /* GL_ACTIVE_ATTRIBUTES */
-   {   245, 0x00008B8A }, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-   {   276, 0x00008911 }, /* GL_ACTIVE_STENCIL_FACE_EXT */
-   {   303, 0x000084E0 }, /* GL_ACTIVE_TEXTURE */
-   {   321, 0x000084E0 }, /* GL_ACTIVE_TEXTURE_ARB */
-   {   343, 0x00008B86 }, /* GL_ACTIVE_UNIFORMS */
-   {   362, 0x00008B87 }, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-   {   391, 0x000086A5 }, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-   {   418, 0x00000104 }, /* GL_ADD */
-   {   425, 0x00008574 }, /* GL_ADD_SIGNED */
-   {   439, 0x00008574 }, /* GL_ADD_SIGNED_ARB */
-   {   457, 0x00008574 }, /* GL_ADD_SIGNED_EXT */
-   {   475, 0x0000846E }, /* GL_ALIASED_LINE_WIDTH_RANGE */
-   {   503, 0x0000846D }, /* GL_ALIASED_POINT_SIZE_RANGE */
-   {   531, 0x000FFFFF }, /* GL_ALL_ATTRIB_BITS */
-   {   550, 0xFFFFFFFF }, /* GL_ALL_CLIENT_ATTRIB_BITS */
-   {   576, 0x00001906 }, /* GL_ALPHA */
-   {   585, 0x0000803D }, /* GL_ALPHA12 */
-   {   596, 0x0000803D }, /* GL_ALPHA12_EXT */
-   {   611, 0x0000803E }, /* GL_ALPHA16 */
-   {   622, 0x0000803E }, /* GL_ALPHA16_EXT */
-   {   637, 0x0000803B }, /* GL_ALPHA4 */
-   {   647, 0x0000803B }, /* GL_ALPHA4_EXT */
-   {   661, 0x0000803C }, /* GL_ALPHA8 */
-   {   671, 0x0000803C }, /* GL_ALPHA8_EXT */
-   {   685, 0x00000D1D }, /* GL_ALPHA_BIAS */
-   {   699, 0x00000D55 }, /* GL_ALPHA_BITS */
-   {   713, 0x00000D1C }, /* GL_ALPHA_SCALE */
-   {   728, 0x00000BC0 }, /* GL_ALPHA_TEST */
-   {   742, 0x00000BC1 }, /* GL_ALPHA_TEST_FUNC */
-   {   761, 0x00000BC2 }, /* GL_ALPHA_TEST_REF */
-   {   779, 0x0000911A }, /* GL_ALREADY_SIGNALED */
-   {   799, 0x00000207 }, /* GL_ALWAYS */
-   {   809, 0x00001200 }, /* GL_AMBIENT */
-   {   820, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
-   {   843, 0x00001501 }, /* GL_AND */
-   {   850, 0x00001504 }, /* GL_AND_INVERTED */
-   {   866, 0x00001502 }, /* GL_AND_REVERSE */
-   {   881, 0x00008892 }, /* GL_ARRAY_BUFFER */
-   {   897, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
-   {   921, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
-   {   949, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
-   {   969, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
-   {   996, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
-   {  1020, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
-   {  1046, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
-   {  1070, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
-   {  1092, 0x00000D80 }, /* GL_AUTO_NORMAL */
-   {  1107, 0x00000409 }, /* GL_AUX0 */
-   {  1115, 0x0000040A }, /* GL_AUX1 */
-   {  1123, 0x0000040B }, /* GL_AUX2 */
-   {  1131, 0x0000040C }, /* GL_AUX3 */
-   {  1139, 0x00000C00 }, /* GL_AUX_BUFFERS */
-   {  1154, 0x00000405 }, /* GL_BACK */
-   {  1162, 0x00000402 }, /* GL_BACK_LEFT */
-   {  1175, 0x00000403 }, /* GL_BACK_RIGHT */
-   {  1189, 0x000080E0 }, /* GL_BGR */
-   {  1196, 0x000080E1 }, /* GL_BGRA */
-   {  1204, 0x000080E1 }, /* GL_BGRA_EXT */
-   {  1216, 0x00001A00 }, /* GL_BITMAP */
-   {  1226, 0x00000704 }, /* GL_BITMAP_TOKEN */
-   {  1242, 0x00000BE2 }, /* GL_BLEND */
-   {  1251, 0x00008005 }, /* GL_BLEND_COLOR */
-   {  1266, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
-   {  1285, 0x00000BE0 }, /* GL_BLEND_DST */
-   {  1298, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
-   {  1317, 0x000080CA }, /* GL_BLEND_DST_ALPHA_OES */
-   {  1340, 0x000080C8 }, /* GL_BLEND_DST_RGB */
-   {  1357, 0x000080C8 }, /* GL_BLEND_DST_RGB_OES */
-   {  1378, 0x00008009 }, /* GL_BLEND_EQUATION */
-   {  1396, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
-   {  1420, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
-   {  1448, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_OES */
-   {  1476, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
-   {  1498, 0x00008009 }, /* GL_BLEND_EQUATION_OES */
-   {  1520, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
-   {  1542, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
-   {  1568, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_OES */
-   {  1594, 0x00000BE1 }, /* GL_BLEND_SRC */
-   {  1607, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
-   {  1626, 0x000080CB }, /* GL_BLEND_SRC_ALPHA_OES */
-   {  1649, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
-   {  1666, 0x000080C9 }, /* GL_BLEND_SRC_RGB_OES */
-   {  1687, 0x00001905 }, /* GL_BLUE */
-   {  1695, 0x00000D1B }, /* GL_BLUE_BIAS */
-   {  1708, 0x00000D54 }, /* GL_BLUE_BITS */
-   {  1721, 0x00000D1A }, /* GL_BLUE_SCALE */
-   {  1735, 0x00008B56 }, /* GL_BOOL */
-   {  1743, 0x00008B56 }, /* GL_BOOL_ARB */
-   {  1755, 0x00008B57 }, /* GL_BOOL_VEC2 */
-   {  1768, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
-   {  1785, 0x00008B58 }, /* GL_BOOL_VEC3 */
-   {  1798, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
-   {  1815, 0x00008B59 }, /* GL_BOOL_VEC4 */
-   {  1828, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
-   {  1845, 0x000088BB }, /* GL_BUFFER_ACCESS */
-   {  1862, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  1883, 0x000088BB }, /* GL_BUFFER_ACCESS_OES */
-   {  1904, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-   {  1935, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  1952, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  1973, 0x000088BC }, /* GL_BUFFER_MAPPED_OES */
-   {  1994, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  2016, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  2042, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_OES */
-   {  2068, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */
-   {  2091, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-   {  2125, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  2140, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  2159, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  2175, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  2195, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  2214, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  2240, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  2263, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  2291, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  2310, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  2332, 0x00001400 }, /* GL_BYTE */
-   {  2340, 0x00002A24 }, /* GL_C3F_V3F */
-   {  2351, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  2366, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2378, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2390, 0x00000901 }, /* GL_CCW */
-   {  2397, 0x00002900 }, /* GL_CLAMP */
-   {  2406, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2425, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2448, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2472, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2489, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2511, 0x00001500 }, /* GL_CLEAR */
-   {  2520, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2545, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2574, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2600, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2629, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2655, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2682, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2697, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2712, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2727, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2742, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2757, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2772, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2805, 0x00000A00 }, /* GL_COEFF */
-   {  2814, 0x00001800 }, /* GL_COLOR */
-   {  2823, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2838, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2868, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2902, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2925, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2945, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2967, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2987, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  3008, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  3033, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_OES */
-   {  3058, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  3079, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  3101, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  3127, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  3149, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  3175, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  3197, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  3223, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  3245, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  3271, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  3293, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  3319, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  3341, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  3367, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  3392, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3413, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3438, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  3459, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  3484, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  3505, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  3530, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3551, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3576, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3597, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3622, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3643, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3668, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3689, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3714, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3735, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3760, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3780, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3801, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3816, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3833, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3851, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3869, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3892, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3920, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3936, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3956, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3984, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  4016, 0x00008458 }, /* GL_COLOR_SUM */
-   {  4029, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  4046, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  4061, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  4087, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  4117, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  4147, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  4167, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  4191, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  4216, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  4245, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  4274, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  4296, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  4322, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  4348, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  4374, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4404, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4434, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  4464, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  4498, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  4532, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4562, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4596, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4630, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4654, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4682, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4710, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4731, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4756, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4777, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4802, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4827, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4846, 0x00008570 }, /* GL_COMBINE */
-   {  4857, 0x00008503 }, /* GL_COMBINE4 */
-   {  4869, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4886, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4907, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4928, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4943, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4958, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4973, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4992, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  5011, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  5047, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  5071, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  5099, 0x00001300 }, /* GL_COMPILE */
-   {  5110, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  5133, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  5151, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  5171, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  5195, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  5219, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  5247, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  5271, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  5301, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  5335, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  5363, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  5381, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  5400, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  5423, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  5452, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  5485, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  5518, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5551, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5573, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5601, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5633, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
-   {  5658, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-   {  5689, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
-   {  5708, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
-   {  5733, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5763, 0x0000911C }, /* GL_CONDITION_SATISFIED */
-   {  5786, 0x00008576 }, /* GL_CONSTANT */
-   {  5798, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5816, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5838, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5854, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5878, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5900, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5918, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5940, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5956, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5974, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5992, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  6020, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  6051, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  6078, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  6109, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  6136, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  6167, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  6195, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  6227, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  6249, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  6275, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  6297, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  6323, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  6344, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  6369, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  6386, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  6407, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  6427, 0x00008862 }, /* GL_COORD_REPLACE_OES */
-   {  6448, 0x00001503 }, /* GL_COPY */
-   {  6456, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  6473, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  6493, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
-   {  6513, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
-   {  6534, 0x00000B44 }, /* GL_CULL_FACE */
-   {  6547, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  6565, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6584, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6616, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6651, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6672, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6687, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6704, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6725, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6751, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6768, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6790, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6818, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6839, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6873, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6906, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6924, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6954, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_OES */
-   {  6984, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  7003, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  7020, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  7041, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  7065, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  7092, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  7116, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  7143, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  7176, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  7210, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  7243, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  7270, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  7296, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  7321, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  7350, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  7372, 0x00000900 }, /* GL_CW */
-   {  7378, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  7399, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  7420, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  7440, 0x00002101 }, /* GL_DECAL */
-   {  7449, 0x00001E03 }, /* GL_DECR */
-   {  7457, 0x00008508 }, /* GL_DECR_WRAP */
-   {  7470, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  7487, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  7504, 0x00001801 }, /* GL_DEPTH */
-   {  7513, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  7533, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
-   {  7557, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */
-   {  7581, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7601, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7625, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */
-   {  7649, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7663, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7677, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7697, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7722, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7742, 0x0000864F }, /* GL_DEPTH_CLAMP */
-   {  7757, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7775, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7796, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7815, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7836, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7861, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */
-   {  7886, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7912, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7933, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7958, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */
-   {  7983, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  8009, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  8030, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  8055, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */
-   {  8080, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  8106, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  8120, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  8135, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  8150, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  8167, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  8195, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
-   {  8216, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  8236, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */
-   {  8257, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  8285, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  8313, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  8327, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  8349, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  8375, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  8394, 0x00001201 }, /* GL_DIFFUSE */
-   {  8405, 0x00000BD0 }, /* GL_DITHER */
-   {  8415, 0x00000A02 }, /* GL_DOMAIN */
-   {  8425, 0x00001100 }, /* GL_DONT_CARE */
-   {  8438, 0x000086AE }, /* GL_DOT3_RGB */
-   {  8450, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  8463, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  8480, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  8497, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  8513, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  8529, 0x0000140A }, /* GL_DOUBLE */
-   {  8539, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  8555, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  8570, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  8586, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  8606, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  8626, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  8642, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8659, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8680, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8701, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8718, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8739, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8760, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8777, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8798, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8819, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8836, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8857, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8878, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8895, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8916, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8937, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8954, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8975, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8996, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  9016, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  9036, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  9052, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  9072, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  9092, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  9108, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  9128, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  9148, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  9164, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  9184, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  9204, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  9220, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  9240, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  9260, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  9276, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  9296, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  9316, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  9332, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  9352, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  9372, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  9388, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  9408, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  9428, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  9444, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  9464, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  9484, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  9504, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
-   {  9532, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  9564, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  9588, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  9608, 0x00000304 }, /* GL_DST_ALPHA */
-   {  9621, 0x00000306 }, /* GL_DST_COLOR */
-   {  9634, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  9648, 0x00008779 }, /* GL_DUDV_ATI */
-   {  9660, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  9676, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9696, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9712, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9732, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9748, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9768, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9781, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9800, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9834, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9872, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9899, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9925, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9949, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9981, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   { 10017, 0x00001600 }, /* GL_EMISSION */
-   { 10029, 0x00002000 }, /* GL_ENABLE_BIT */
-   { 10043, 0x00000202 }, /* GL_EQUAL */
-   { 10052, 0x00001509 }, /* GL_EQUIV */
-   { 10061, 0x00010000 }, /* GL_EVAL_BIT */
-   { 10073, 0x00000800 }, /* GL_EXP */
-   { 10080, 0x00000801 }, /* GL_EXP2 */
-   { 10088, 0x00001F03 }, /* GL_EXTENSIONS */
-   { 10102, 0x00002400 }, /* GL_EYE_LINEAR */
-   { 10116, 0x00002502 }, /* GL_EYE_PLANE */
-   { 10129, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   { 10154, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   { 10171, 0x00000000 }, /* GL_FALSE */
-   { 10180, 0x00001101 }, /* GL_FASTEST */
-   { 10191, 0x00001C01 }, /* GL_FEEDBACK */
-   { 10203, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   { 10230, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   { 10254, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   { 10278, 0x00001B02 }, /* GL_FILL */
-   { 10286, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
-   { 10313, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   { 10344, 0x0000140C }, /* GL_FIXED */
-   { 10353, 0x0000140C }, /* GL_FIXED_OES */
-   { 10366, 0x00001D00 }, /* GL_FLAT */
-   { 10374, 0x00001406 }, /* GL_FLOAT */
-   { 10383, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   { 10397, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   { 10415, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   { 10431, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   { 10447, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   { 10461, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   { 10479, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   { 10495, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   { 10511, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   { 10525, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   { 10543, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   { 10559, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   { 10575, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   { 10589, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   { 10607, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   { 10621, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 10639, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 10653, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 10671, 0x00000B60 }, /* GL_FOG */
-   { 10678, 0x00000080 }, /* GL_FOG_BIT */
-   { 10689, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 10702, 0x00008451 }, /* GL_FOG_COORD */
-   { 10715, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10733, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10757, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10796, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10839, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10871, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10902, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10931, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10956, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10975, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 11009, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 11036, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 11062, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 11086, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 11103, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 11118, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 11142, 0x00000B64 }, /* GL_FOG_END */
-   { 11153, 0x00000C54 }, /* GL_FOG_HINT */
-   { 11165, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 11178, 0x00000B65 }, /* GL_FOG_MODE */
-   { 11190, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 11209, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 11234, 0x00000B63 }, /* GL_FOG_START */
-   { 11247, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 11265, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 11289, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 11308, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 11331, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 11366, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
-   { 11405, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 11420, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 11457, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 11493, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 11534, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 11575, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 11612, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 11649, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
-   { 11687, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 11725, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 11767, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
-   { 11809, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 11847, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11889, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
-   { 11931, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11966, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 12005, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 12054, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
-   { 12103, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 12151, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 12203, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
-   { 12255, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 12295, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 12339, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 12379, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 12423, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
-   { 12467, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
-   { 12490, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 12517, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
-   { 12544, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 12568, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 12596, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
-   { 12624, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 12647, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 12666, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 12703, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 12744, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
-   { 12785, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
-   { 12822, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 12863, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
-   { 12904, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-   { 12942, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 12984, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
-   { 13026, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 13077, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 13115, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
-   { 13153, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-   { 13195, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
-   { 13239, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 13284, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 13333, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
-   { 13382, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 13420, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
-   { 13462, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-   { 13500, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 13542, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
-   { 13584, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
-   { 13603, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 13635, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 13660, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 13687, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 13718, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
-   { 13749, 0x00000404 }, /* GL_FRONT */
-   { 13758, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 13776, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 13790, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 13804, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 13819, 0x00008006 }, /* GL_FUNC_ADD */
-   { 13831, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 13847, 0x00008006 }, /* GL_FUNC_ADD_OES */
-   { 13863, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 13888, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 13917, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
-   { 13946, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 13963, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 13984, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
-   { 14005, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 14024, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 14048, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 14077, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 14101, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-   { 14128, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-   { 14156, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
-   { 14179, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-   { 14208, 0x00000206 }, /* GL_GEQUAL */
-   { 14218, 0x00000204 }, /* GL_GREATER */
-   { 14229, 0x00001904 }, /* GL_GREEN */
-   { 14238, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 14252, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 14266, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 14281, 0x0000140B }, /* GL_HALF_FLOAT */
-   { 14295, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
-   { 14313, 0x00008DF2 }, /* GL_HIGH_FLOAT */
-   { 14327, 0x00008DF5 }, /* GL_HIGH_INT */
-   { 14339, 0x00008000 }, /* GL_HINT_BIT */
-   { 14351, 0x00008024 }, /* GL_HISTOGRAM */
-   { 14364, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 14388, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 14416, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 14439, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 14466, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 14483, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 14503, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 14527, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 14551, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 14579, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 14607, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 14639, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 14661, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 14687, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 14705, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 14727, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 14746, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 14769, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 14784, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 14804, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-   { 14840, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 14880, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-   { 14914, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 14952, 0x00001E02 }, /* GL_INCR */
-   { 14960, 0x00008507 }, /* GL_INCR_WRAP */
-   { 14973, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 14990, 0x00008222 }, /* GL_INDEX */
-   { 14999, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 15014, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 15044, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 15078, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 15101, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 15123, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 15143, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 15157, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 15178, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 15196, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 15210, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 15226, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 15241, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 15260, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 15279, 0x00001404 }, /* GL_INT */
-   { 15286, 0x00008049 }, /* GL_INTENSITY */
-   { 15299, 0x0000804C }, /* GL_INTENSITY12 */
-   { 15314, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 15333, 0x0000804D }, /* GL_INTENSITY16 */
-   { 15348, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 15367, 0x0000804A }, /* GL_INTENSITY4 */
-   { 15381, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 15399, 0x0000804B }, /* GL_INTENSITY8 */
-   { 15413, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 15431, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 15448, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
-   { 15475, 0x00008575 }, /* GL_INTERPOLATE */
-   { 15490, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 15509, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 15528, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
-   { 15550, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 15562, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 15578, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 15590, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 15606, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 15618, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 15634, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 15650, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 15683, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 15720, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
-   { 15757, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 15778, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 15795, 0x0000862B }, /* GL_INVERSE_NV */
-   { 15809, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 15833, 0x0000150A }, /* GL_INVERT */
-   { 15843, 0x00001E00 }, /* GL_KEEP */
-   { 15851, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
-   { 15877, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 15907, 0x00000406 }, /* GL_LEFT */
-   { 15915, 0x00000203 }, /* GL_LEQUAL */
-   { 15925, 0x00000201 }, /* GL_LESS */
-   { 15933, 0x00004000 }, /* GL_LIGHT0 */
-   { 15943, 0x00004001 }, /* GL_LIGHT1 */
-   { 15953, 0x00004002 }, /* GL_LIGHT2 */
-   { 15963, 0x00004003 }, /* GL_LIGHT3 */
-   { 15973, 0x00004004 }, /* GL_LIGHT4 */
-   { 15983, 0x00004005 }, /* GL_LIGHT5 */
-   { 15993, 0x00004006 }, /* GL_LIGHT6 */
-   { 16003, 0x00004007 }, /* GL_LIGHT7 */
-   { 16013, 0x00000B50 }, /* GL_LIGHTING */
-   { 16025, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 16041, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 16064, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 16093, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 16126, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 16154, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 16178, 0x00001B01 }, /* GL_LINE */
-   { 16186, 0x00002601 }, /* GL_LINEAR */
-   { 16196, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 16218, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 16248, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 16279, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 16303, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 16328, 0x00000001 }, /* GL_LINES */
-   { 16337, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
-   { 16360, 0x00000004 }, /* GL_LINE_BIT */
-   { 16372, 0x00000002 }, /* GL_LINE_LOOP */
-   { 16385, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 16405, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 16420, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 16440, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 16456, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 16480, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 16503, 0x00000003 }, /* GL_LINE_STRIP */
-   { 16517, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
-   { 16545, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 16559, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 16573, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 16599, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 16619, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 16634, 0x00000B32 }, /* GL_LIST_BASE */
-   { 16647, 0x00020000 }, /* GL_LIST_BIT */
-   { 16659, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 16673, 0x00000B30 }, /* GL_LIST_MODE */
-   { 16686, 0x00000101 }, /* GL_LOAD */
-   { 16694, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 16706, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 16723, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 16737, 0x00008DF0 }, /* GL_LOW_FLOAT */
-   { 16750, 0x00008DF3 }, /* GL_LOW_INT */
-   { 16761, 0x00001909 }, /* GL_LUMINANCE */
-   { 16774, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 16789, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 16812, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 16839, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 16861, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 16887, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 16906, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 16921, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 16944, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 16971, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 16990, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 17004, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 17025, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 17050, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 17068, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 17089, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 17114, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 17128, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 17149, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 17174, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 17192, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 17211, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 17227, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 17247, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 17269, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 17283, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 17298, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 17322, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 17346, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 17370, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 17394, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 17411, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 17428, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 17456, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 17485, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 17514, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 17543, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 17572, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 17601, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 17630, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 17658, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 17686, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 17714, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 17742, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 17770, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 17798, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 17826, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 17854, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 17882, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 17898, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 17918, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 17940, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 17954, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 17969, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 17993, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 18017, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 18041, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 18065, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 18082, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 18099, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 18127, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 18156, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 18185, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 18214, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 18243, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 18272, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 18301, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 18329, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 18357, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 18385, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 18413, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 18441, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 18469, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 18497, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 18525, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 18553, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 18566, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 18592, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 18621, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 18649, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 18665, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 18680, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 18706, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 18723, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 18738, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 18752, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 18768, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 18784, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 18800, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 18816, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 18832, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 18848, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 18864, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 18880, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 18896, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 18912, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 18927, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 18941, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 18957, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 18973, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 18989, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 19005, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 19021, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 19037, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 19053, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 19069, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 19085, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 19101, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 19116, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 19130, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 19146, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 19162, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 19177, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 19191, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 19206, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 19220, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 19235, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 19249, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 19264, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 19278, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 19293, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 19307, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 19322, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 19337, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 19363, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-   { 19404, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
-   { 19430, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 19464, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
-   { 19498, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 19529, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
-   { 19560, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 19593, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
-   { 19626, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 19657, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
-   { 19688, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 19703, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 19725, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
-   { 19747, 0x00008008 }, /* GL_MAX */
-   { 19754, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 19777, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
-   { 19804, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 19836, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 19862, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 19895, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 19921, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 19955, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 19974, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
-   { 19999, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 20028, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 20060, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 20096, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 20132, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 20172, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 20198, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 20228, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 20253, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 20282, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 20311, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 20344, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
-   { 20377, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 20397, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 20421, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 20445, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 20469, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 20494, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 20512, 0x00008008 }, /* GL_MAX_EXT */
-   { 20523, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 20558, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 20597, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-   { 20629, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
-   { 20665, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
-   { 20705, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
-   { 20749, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
-   { 20788, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-   { 20827, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 20841, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 20861, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 20899, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 20928, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 20952, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 20980, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
-   { 21008, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 21031, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 21068, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 21104, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 21131, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 21160, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 21194, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 21230, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 21257, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 21289, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 21325, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 21354, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 21383, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 21411, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 21449, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 21493, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 21536, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 21570, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 21609, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 21646, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 21684, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 21727, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 21770, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 21800, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 21831, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 21867, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 21903, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 21933, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 21967, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 22000, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 22025, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 22054, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
-   { 22083, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 22098, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 22117, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 22144, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 22164, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 22188, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 22210, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 22236, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 22263, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 22294, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 22318, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
-   { 22346, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 22380, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 22400, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 22427, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 22448, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 22473, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 22498, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 22533, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-   { 22586, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-   { 22633, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-   { 22683, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
-   { 22709, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 22731, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 22757, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
-   { 22780, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 22802, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 22828, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 22862, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 22900, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 22933, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 22970, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-   { 23000, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 23024, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
-   { 23048, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-   { 23085, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 23106, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
-   { 23122, 0x00008DF4 }, /* GL_MEDIUM_INT */
-   { 23136, 0x00008007 }, /* GL_MIN */
-   { 23143, 0x0000802E }, /* GL_MINMAX */
-   { 23153, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 23167, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 23184, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 23205, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 23220, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 23239, 0x00008007 }, /* GL_MIN_EXT */
-   { 23250, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 23269, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 23292, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 23315, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 23335, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 23355, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 23385, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 23413, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 23441, 0x00001700 }, /* GL_MODELVIEW */
-   { 23454, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 23472, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 23491, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 23510, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 23529, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 23548, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 23567, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 23586, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 23605, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 23624, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 23643, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 23662, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 23680, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 23699, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 23718, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 23737, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 23756, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 23775, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 23794, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 23813, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 23832, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 23851, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 23870, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 23888, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 23907, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 23926, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 23944, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 23962, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 23980, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 23998, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 24016, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 24034, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 24052, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 24072, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 24114, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 24141, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 24166, 0x00002100 }, /* GL_MODULATE */
-   { 24178, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 24198, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 24225, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 24250, 0x00000103 }, /* GL_MULT */
-   { 24258, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 24273, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 24293, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 24312, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 24331, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 24355, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 24378, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 24408, 0x00002A25 }, /* GL_N3F_V3F */
-   { 24419, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 24439, 0x0000150E }, /* GL_NAND */
-   { 24447, 0x00002600 }, /* GL_NEAREST */
-   { 24458, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 24489, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 24521, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 24546, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 24572, 0x00000200 }, /* GL_NEVER */
-   { 24581, 0x00001102 }, /* GL_NICEST */
-   { 24591, 0x00000000 }, /* GL_NONE */
-   { 24599, 0x00000000 }, /* GL_NONE_OES */
-   { 24611, 0x00001505 }, /* GL_NOOP */
-   { 24619, 0x00001508 }, /* GL_NOR */
-   { 24626, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 24639, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 24655, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 24686, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 24721, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 24745, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 24768, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 24789, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 24803, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 24821, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 24838, 0x00008511 }, /* GL_NORMAL_MAP_OES */
-   { 24856, 0x00000205 }, /* GL_NOTEQUAL */
-   { 24868, 0x00000000 }, /* GL_NO_ERROR */
-   { 24880, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 24914, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 24952, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 24986, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 25015, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 25047, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 25089, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 25119, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 25159, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 25190, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 25219, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 25247, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 25277, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 25294, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 25320, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 25336, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 25371, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 25393, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 25408, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 25427, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 25457, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 25478, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 25506, 0x00000001 }, /* GL_ONE */
-   { 25513, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 25541, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 25573, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 25601, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 25633, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 25656, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 25679, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 25702, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 25725, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 25743, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 25765, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 25787, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 25803, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 25823, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 25843, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 25861, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 25883, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 25905, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 25921, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 25941, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 25961, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 25979, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 26001, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 26023, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 26039, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 26059, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 26079, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 26100, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 26119, 0x00001507 }, /* GL_OR */
-   { 26125, 0x00000A01 }, /* GL_ORDER */
-   { 26134, 0x0000150D }, /* GL_OR_INVERTED */
-   { 26149, 0x0000150B }, /* GL_OR_REVERSE */
-   { 26163, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 26180, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 26198, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 26219, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 26239, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 26257, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 26276, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 26296, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 26316, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 26334, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 26353, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 26378, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 26402, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 26423, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 26445, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 26467, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 26492, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 26516, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 26537, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 26559, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 26581, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 26603, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 26634, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 26654, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 26679, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 26699, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 26724, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 26744, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 26769, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 26789, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 26814, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 26834, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 26859, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 26879, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 26904, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 26924, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 26949, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 26969, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 26994, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 27014, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 27039, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 27059, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 27084, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 27102, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 27123, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 27152, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 27185, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 27210, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 27233, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 27264, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 27299, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 27326, 0x00001B00 }, /* GL_POINT */
-   { 27335, 0x00000000 }, /* GL_POINTS */
-   { 27345, 0x00000002 }, /* GL_POINT_BIT */
-   { 27358, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 27388, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 27422, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 27456, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 27491, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 27520, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 27553, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 27586, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 27620, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 27634, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 27673, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 27697, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 27729, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 27760, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 27789, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 27815, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 27833, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 27855, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 27877, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 27900, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 27918, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 27940, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 27962, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 27985, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 28005, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 28021, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 28042, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 28058, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 28078, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 28107, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 28126, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 28146, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 28172, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 28187, 0x00000009 }, /* GL_POLYGON */
-   { 28198, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 28213, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 28229, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 28252, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 28277, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 28300, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 28323, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 28347, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 28371, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 28389, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 28412, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 28431, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 28454, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 28471, 0x00001203 }, /* GL_POSITION */
-   { 28483, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 28515, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 28551, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 28584, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 28621, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 28652, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 28687, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 28719, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 28755, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 28788, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 28820, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 28856, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 28889, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 28926, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 28956, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 28990, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 29021, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 29056, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 29087, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 29122, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 29154, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 29190, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 29220, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 29254, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 29285, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 29320, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 29352, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 29383, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 29418, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 29450, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 29486, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 29515, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 29548, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 29578, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 29612, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 29651, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 29684, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 29724, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 29758, 0x00008578 }, /* GL_PREVIOUS */
-   { 29770, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 29786, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 29802, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 29819, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 29840, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 29861, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 29889, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 29922, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 29954, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 29977, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 30007, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 30036, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 30059, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 30089, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 30118, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 30146, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 30168, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 30196, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 30224, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 30246, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 30267, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 30307, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 30346, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 30376, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 30411, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 30444, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 30478, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 30517, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 30556, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 30578, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 30604, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 30628, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 30654, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 30677, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 30699, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 30720, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 30741, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 30768, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 30800, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 30832, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 30867, 0x00001701 }, /* GL_PROJECTION */
-   { 30881, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 30902, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 30945, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 30971, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 30991, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 31015, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 31036, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 31055, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 31078, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31117, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 31155, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 31175, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 31205, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 31229, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 31249, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 31279, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 31303, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 31323, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 31356, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 31382, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 31412, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 31443, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 31473, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 31492, 0x00002003 }, /* GL_Q */
-   { 31497, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 31522, 0x00000007 }, /* GL_QUADS */
-   { 31531, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 31575, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 31623, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 31640, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 31654, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 31684, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 31711, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 31733, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 31759, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 31779, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 31795, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 31815, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 31841, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 31871, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 31888, 0x00002002 }, /* GL_R */
-   { 31893, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 31905, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 31931, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 31964, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 31979, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 31999, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 32027, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 32059, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 32083, 0x000088B8 }, /* GL_READ_ONLY */
-   { 32096, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 32113, 0x000088BA }, /* GL_READ_WRITE */
-   { 32127, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 32145, 0x00001903 }, /* GL_RED */
-   { 32152, 0x00008016 }, /* GL_REDUCE */
-   { 32162, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 32176, 0x00000D15 }, /* GL_RED_BIAS */
-   { 32188, 0x00000D52 }, /* GL_RED_BITS */
-   { 32200, 0x00000D14 }, /* GL_RED_SCALE */
-   { 32213, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 32231, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 32253, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 32274, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 32296, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 32314, 0x00001C00 }, /* GL_RENDER */
-   { 32324, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 32340, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 32367, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 32398, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 32422, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 32450, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 32478, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 32504, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 32534, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 32561, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 32592, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 32612, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 32639, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 32670, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 32693, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 32720, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 32747, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 32779, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 32815, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 32851, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 32871, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 32896, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 32925, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 32949, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 32977, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 33006, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 33039, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 33061, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 33087, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 33113, 0x00001F01 }, /* GL_RENDERER */
-   { 33125, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 33140, 0x00002901 }, /* GL_REPEAT */
-   { 33150, 0x00001E01 }, /* GL_REPLACE */
-   { 33161, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 33176, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 33199, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 33217, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 33239, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 33257, 0x00000102 }, /* GL_RETURN */
-   { 33267, 0x00001907 }, /* GL_RGB */
-   { 33274, 0x00008052 }, /* GL_RGB10 */
-   { 33283, 0x00008059 }, /* GL_RGB10_A2 */
-   { 33295, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 33311, 0x00008052 }, /* GL_RGB10_EXT */
-   { 33324, 0x00008053 }, /* GL_RGB12 */
-   { 33333, 0x00008053 }, /* GL_RGB12_EXT */
-   { 33346, 0x00008054 }, /* GL_RGB16 */
-   { 33355, 0x00008054 }, /* GL_RGB16_EXT */
-   { 33368, 0x0000804E }, /* GL_RGB2_EXT */
-   { 33380, 0x0000804F }, /* GL_RGB4 */
-   { 33388, 0x0000804F }, /* GL_RGB4_EXT */
-   { 33400, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 33413, 0x00008050 }, /* GL_RGB5 */
-   { 33421, 0x00008D62 }, /* GL_RGB565 */
-   { 33431, 0x00008D62 }, /* GL_RGB565_OES */
-   { 33445, 0x00008057 }, /* GL_RGB5_A1 */
-   { 33456, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 33471, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 33486, 0x00008050 }, /* GL_RGB5_EXT */
-   { 33498, 0x00008051 }, /* GL_RGB8 */
-   { 33506, 0x00008051 }, /* GL_RGB8_EXT */
-   { 33518, 0x00008051 }, /* GL_RGB8_OES */
-   { 33530, 0x00001908 }, /* GL_RGBA */
-   { 33538, 0x0000805A }, /* GL_RGBA12 */
-   { 33548, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 33562, 0x0000805B }, /* GL_RGBA16 */
-   { 33572, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 33586, 0x00008055 }, /* GL_RGBA2 */
-   { 33595, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 33608, 0x00008056 }, /* GL_RGBA4 */
-   { 33617, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 33636, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 33649, 0x00008056 }, /* GL_RGBA4_OES */
-   { 33662, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 33676, 0x00008058 }, /* GL_RGBA8 */
-   { 33685, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 33698, 0x00008058 }, /* GL_RGBA8_OES */
-   { 33711, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 33726, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 33744, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 33757, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 33770, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 33784, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 33796, 0x00008573 }, /* GL_RGB_SCALE */
-   { 33809, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 33826, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 33843, 0x00000407 }, /* GL_RIGHT */
-   { 33852, 0x00002000 }, /* GL_S */
-   { 33857, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 33871, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 33892, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 33906, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 33927, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 33941, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 33959, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 33975, 0x000080A9 }, /* GL_SAMPLES */
-   { 33986, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 34002, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 34017, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 34035, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 34057, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 34085, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 34117, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 34140, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 34167, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 34185, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 34208, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 34230, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 34249, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 34272, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 34298, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 34328, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 34353, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 34382, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 34397, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 34412, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 34428, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 34453, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 34493, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 34537, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 34570, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 34600, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 34632, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 34662, 0x00001C02 }, /* GL_SELECT */
-   { 34672, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 34700, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 34725, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 34741, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 34765, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 34792, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 34823, 0x0000150F }, /* GL_SET */
-   { 34830, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 34855, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 34874, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 34895, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 34919, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 34934, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 34949, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 34977, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 35000, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 35030, 0x00001601 }, /* GL_SHININESS */
-   { 35043, 0x00001402 }, /* GL_SHORT */
-   { 35052, 0x00009119 }, /* GL_SIGNALED */
-   { 35064, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 35085, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 35101, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 35121, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 35140, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 35154, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 35169, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 35191, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 35211, 0x00001D01 }, /* GL_SMOOTH */
-   { 35221, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 35254, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 35281, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 35314, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 35341, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 35358, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 35379, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 35400, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 35415, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 35434, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 35453, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 35470, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 35491, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 35512, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 35527, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 35546, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 35565, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 35582, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 35603, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 35624, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 35639, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 35658, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 35677, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 35697, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 35715, 0x00001202 }, /* GL_SPECULAR */
-   { 35727, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 35741, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 35756, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 35774, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 35791, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 35805, 0x00008580 }, /* GL_SRC0_RGB */
-   { 35817, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 35831, 0x00008581 }, /* GL_SRC1_RGB */
-   { 35843, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 35857, 0x00008582 }, /* GL_SRC2_RGB */
-   { 35869, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 35882, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 35904, 0x00000300 }, /* GL_SRC_COLOR */
-   { 35917, 0x00008C40 }, /* GL_SRGB */
-   { 35925, 0x00008C41 }, /* GL_SRGB8 */
-   { 35934, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 35950, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 35964, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 35982, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 36001, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 36016, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 36035, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 36050, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 36069, 0x000088E5 }, /* GL_STATIC_READ */
-   { 36084, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 36103, 0x00001802 }, /* GL_STENCIL */
-   { 36114, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 36136, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 36162, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 36188, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 36209, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 36234, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 36255, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 36280, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 36312, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 36348, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 36380, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 36416, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 36436, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 36463, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 36489, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 36505, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 36527, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 36550, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 36566, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 36582, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 36599, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 36617, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 36636, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 36659, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 36681, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 36703, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 36721, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 36743, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 36765, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 36783, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 36805, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 36827, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 36848, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 36875, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 36902, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 36917, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 36933, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 36962, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 36984, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 37005, 0x00000C33 }, /* GL_STEREO */
-   { 37015, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 37039, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 37064, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 37088, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 37103, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 37122, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 37137, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 37156, 0x000088E1 }, /* GL_STREAM_READ */
-   { 37171, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 37190, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 37207, 0x000084E7 }, /* GL_SUBTRACT */
-   { 37219, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 37235, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 37253, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 37267, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 37281, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 37308, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 37338, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 37353, 0x00002001 }, /* GL_T */
-   { 37358, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 37373, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 37392, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 37408, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 37423, 0x00002A27 }, /* GL_T2F_V3F */
-   { 37434, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 37453, 0x00002A28 }, /* GL_T4F_V4F */
-   { 37464, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 37487, 0x00001702 }, /* GL_TEXTURE */
-   { 37498, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 37510, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 37526, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 37538, 0x000084CA }, /* GL_TEXTURE10 */
-   { 37551, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 37568, 0x000084CB }, /* GL_TEXTURE11 */
-   { 37581, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 37598, 0x000084CC }, /* GL_TEXTURE12 */
-   { 37611, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 37628, 0x000084CD }, /* GL_TEXTURE13 */
-   { 37641, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 37658, 0x000084CE }, /* GL_TEXTURE14 */
-   { 37671, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 37688, 0x000084CF }, /* GL_TEXTURE15 */
-   { 37701, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 37718, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 37731, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 37748, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 37761, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 37778, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 37791, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 37808, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 37821, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 37838, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 37854, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 37866, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 37879, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 37896, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 37909, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 37926, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 37939, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 37956, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 37969, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 37986, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 37999, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 38016, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 38029, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 38046, 0x000084DA }, /* GL_TEXTURE26 */
-   { 38059, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 38076, 0x000084DB }, /* GL_TEXTURE27 */
-   { 38089, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 38106, 0x000084DC }, /* GL_TEXTURE28 */
-   { 38119, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 38136, 0x000084DD }, /* GL_TEXTURE29 */
-   { 38149, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 38166, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 38182, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 38194, 0x000084DE }, /* GL_TEXTURE30 */
-   { 38207, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 38224, 0x000084DF }, /* GL_TEXTURE31 */
-   { 38237, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 38254, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 38270, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 38282, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 38298, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 38310, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 38326, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 38338, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 38354, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 38366, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 38382, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 38394, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 38410, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 38422, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 38438, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 38452, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 38476, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 38490, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 38514, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 38528, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 38546, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 38568, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 38594, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 38616, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 38638, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 38670, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 38692, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 38724, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 38746, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 38772, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 38800, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 38832, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 38864, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 38897, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 38929, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 38944, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 38965, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 38990, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 39008, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 39032, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 39063, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 39093, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 39123, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 39158, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 39189, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 39227, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 39254, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 39286, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 39320, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 39344, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 39372, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 39396, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 39424, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 39457, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 39481, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 39503, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 39525, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 39551, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 39585, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 39618, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 39655, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 39683, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 39715, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 39738, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 39776, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 39818, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 39849, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 39877, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 39907, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 39935, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 39960, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 39980, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 40004, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 40035, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 40070, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 40105, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 40136, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 40171, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 40206, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 40237, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 40272, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 40307, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 40331, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 40362, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 40397, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 40432, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 40463, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 40498, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 40533, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 40564, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 40599, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 40634, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 40663, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 40680, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 40702, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 40728, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 40743, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 40764, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 40784, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 40810, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 40840, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 40860, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 40884, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 40901, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 40918, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 40935, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 40958, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 40975, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 41000, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 41022, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 41048, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 41066, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 41092, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 41118, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 41148, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 41175, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 41200, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 41220, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 41244, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 41271, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 41298, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 41325, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 41351, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 41381, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 41403, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 41421, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 41461, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 41491, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 41519, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 41547, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 41575, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 41596, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 41615, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 41637, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 41656, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 41676, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 41706, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 41737, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 41762, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 41786, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 41806, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 41830, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 41850, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 41873, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 41897, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 41925, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 41955, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 41980, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 42014, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 42031, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 42049, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 42071, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 42089, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 42107, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 42126, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 42146, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 42165, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 42194, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 42211, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 42233, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 42263, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 42299, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 42340, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 42373, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 42411, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 42447, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 42485, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 42524, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 42569, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 42604, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 42649, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 42675, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 42705, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 42737, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 42767, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 42801, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 42817, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 42848, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 42883, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 42911, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 42943, 0x00000004 }, /* GL_TRIANGLES */
-   { 42956, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 42983, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 42999, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 43020, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 43038, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 43070, 0x00000001 }, /* GL_TRUE */
-   { 43078, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 43097, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 43117, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 43140, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 43160, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 43181, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 43203, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 43225, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 43245, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 43266, 0x00009118 }, /* GL_UNSIGNALED */
-   { 43280, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 43297, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 43324, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 43347, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 43363, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 43390, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 43421, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 43442, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 43467, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 43491, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 43516, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 43547, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 43582, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 43606, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 43634, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 43657, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 43675, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 43705, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 43739, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 43765, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 43795, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 43829, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 43855, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 43879, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 43907, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 43935, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 43962, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 43994, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 44025, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 44039, 0x00002A20 }, /* GL_V2F */
-   { 44046, 0x00002A21 }, /* GL_V3F */
-   { 44053, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 44072, 0x00001F00 }, /* GL_VENDOR */
-   { 44082, 0x00001F02 }, /* GL_VERSION */
-   { 44093, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 44109, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 44133, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 44163, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 44194, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 44229, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 44253, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 44274, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 44297, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 44318, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 44345, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 44373, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 44401, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 44429, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 44457, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 44485, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 44513, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 44540, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 44567, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 44594, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 44621, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 44648, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 44675, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 44702, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 44729, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 44756, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 44794, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 44836, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 44867, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 44902, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 44936, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 44974, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 45005, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 45040, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 45068, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 45100, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 45130, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 45164, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 45192, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 45224, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 45244, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 45266, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 45295, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 45316, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 45345, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 45378, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 45410, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 45437, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 45468, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 45498, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 45515, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 45536, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 45563, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 45575, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 45591, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 45609, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 45624, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 45644, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 45675, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 45710, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 45745, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 45765, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 45793, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 45821, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 45846, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 45871, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 45898, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 45925, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 45950, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 45975, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 45999, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 46018, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 46032, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 46050, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 46068, 0x00001506 }, /* GL_XOR */
-   { 46075, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 46094, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 46108, 0x00000000 }, /* GL_ZERO */
-   { 46116, 0x00000D16 }, /* GL_ZOOM_X */
-   { 46126, 0x00000D17 }, /* GL_ZOOM_Y */
-};
-
-static const unsigned reduced_enums[1423] =
-{
-       500, /* GL_FALSE */
-       760, /* GL_LINES */
-       763, /* GL_LINE_LOOP */
-       770, /* GL_LINE_STRIP */
-      1934, /* GL_TRIANGLES */
-      1938, /* GL_TRIANGLE_STRIP */
-      1936, /* GL_TRIANGLE_FAN */
-      1393, /* GL_QUADS */
-      1397, /* GL_QUAD_STRIP */
-      1273, /* GL_POLYGON */
-       761, /* GL_LINES_ADJACENCY_ARB */
-       771, /* GL_LINE_STRIP_ADJACENCY_ARB */
-      1935, /* GL_TRIANGLES_ADJACENCY_ARB */
-      1939, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-      1285, /* GL_POLYGON_STIPPLE_BIT */
-      1228, /* GL_PIXEL_MODE_BIT */
-       747, /* GL_LIGHTING_BIT */
-       532, /* GL_FOG_BIT */
-         8, /* GL_ACCUM */
-       781, /* GL_LOAD */
-      1471, /* GL_RETURN */
-      1096, /* GL_MULT */
-        23, /* GL_ADD */
-      1112, /* GL_NEVER */
-       737, /* GL_LESS */
-       490, /* GL_EQUAL */
-       736, /* GL_LEQUAL */
-       649, /* GL_GREATER */
-      1129, /* GL_NOTEQUAL */
-       648, /* GL_GEQUAL */
-        47, /* GL_ALWAYS */
-      1622, /* GL_SRC_COLOR */
-      1161, /* GL_ONE_MINUS_SRC_COLOR */
-      1620, /* GL_SRC_ALPHA */
-      1160, /* GL_ONE_MINUS_SRC_ALPHA */
-       469, /* GL_DST_ALPHA */
-      1158, /* GL_ONE_MINUS_DST_ALPHA */
-       470, /* GL_DST_COLOR */
-      1159, /* GL_ONE_MINUS_DST_COLOR */
-      1621, /* GL_SRC_ALPHA_SATURATE */
-       629, /* GL_FRONT_LEFT */
-       630, /* GL_FRONT_RIGHT */
-        69, /* GL_BACK_LEFT */
-        70, /* GL_BACK_RIGHT */
-       626, /* GL_FRONT */
-        68, /* GL_BACK */
-       735, /* GL_LEFT */
-      1519, /* GL_RIGHT */
-       627, /* GL_FRONT_AND_BACK */
-        63, /* GL_AUX0 */
-        64, /* GL_AUX1 */
-        65, /* GL_AUX2 */
-        66, /* GL_AUX3 */
-       723, /* GL_INVALID_ENUM */
-       728, /* GL_INVALID_VALUE */
-       727, /* GL_INVALID_OPERATION */
-      1627, /* GL_STACK_OVERFLOW */
-      1628, /* GL_STACK_UNDERFLOW */
-      1186, /* GL_OUT_OF_MEMORY */
-       724, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-         0, /* GL_2D */
-         2, /* GL_3D */
-         3, /* GL_3D_COLOR */
-         4, /* GL_3D_COLOR_TEXTURE */
-         6, /* GL_4D_COLOR_TEXTURE */
-      1206, /* GL_PASS_THROUGH_TOKEN */
-      1272, /* GL_POINT_TOKEN */
-       772, /* GL_LINE_TOKEN */
-      1286, /* GL_POLYGON_TOKEN */
-        75, /* GL_BITMAP_TOKEN */
-       468, /* GL_DRAW_PIXEL_TOKEN */
-       315, /* GL_COPY_PIXEL_TOKEN */
-       764, /* GL_LINE_RESET_TOKEN */
-       493, /* GL_EXP */
-       494, /* GL_EXP2 */
-       352, /* GL_CW */
-       137, /* GL_CCW */
-       158, /* GL_COEFF */
-      1183, /* GL_ORDER */
-       405, /* GL_DOMAIN */
-       325, /* GL_CURRENT_COLOR */
-       328, /* GL_CURRENT_INDEX */
-       334, /* GL_CURRENT_NORMAL */
-       348, /* GL_CURRENT_TEXTURE_COORDS */
-       340, /* GL_CURRENT_RASTER_COLOR */
-       342, /* GL_CURRENT_RASTER_INDEX */
-       346, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       343, /* GL_CURRENT_RASTER_POSITION */
-       344, /* GL_CURRENT_RASTER_POSITION_VALID */
-       341, /* GL_CURRENT_RASTER_DISTANCE */
-      1264, /* GL_POINT_SMOOTH */
-      1248, /* GL_POINT_SIZE */
-      1263, /* GL_POINT_SIZE_RANGE */
-      1254, /* GL_POINT_SIZE_GRANULARITY */
-       765, /* GL_LINE_SMOOTH */
-       773, /* GL_LINE_WIDTH */
-       775, /* GL_LINE_WIDTH_RANGE */
-       774, /* GL_LINE_WIDTH_GRANULARITY */
-       767, /* GL_LINE_STIPPLE */
-       768, /* GL_LINE_STIPPLE_PATTERN */
-       769, /* GL_LINE_STIPPLE_REPEAT */
-       780, /* GL_LIST_MODE */
-       963, /* GL_MAX_LIST_NESTING */
-       777, /* GL_LIST_BASE */
-       779, /* GL_LIST_INDEX */
-      1275, /* GL_POLYGON_MODE */
-      1282, /* GL_POLYGON_SMOOTH */
-      1284, /* GL_POLYGON_STIPPLE */
-       479, /* GL_EDGE_FLAG */
-       318, /* GL_CULL_FACE */
-       319, /* GL_CULL_FACE_MODE */
-       628, /* GL_FRONT_FACE */
-       746, /* GL_LIGHTING */
-       751, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       752, /* GL_LIGHT_MODEL_TWO_SIDE */
-       748, /* GL_LIGHT_MODEL_AMBIENT */
-      1569, /* GL_SHADE_MODEL */
-       206, /* GL_COLOR_MATERIAL_FACE */
-       207, /* GL_COLOR_MATERIAL_PARAMETER */
-       205, /* GL_COLOR_MATERIAL */
-       531, /* GL_FOG */
-       553, /* GL_FOG_INDEX */
-       549, /* GL_FOG_DENSITY */
-       557, /* GL_FOG_START */
-       551, /* GL_FOG_END */
-       554, /* GL_FOG_MODE */
-       533, /* GL_FOG_COLOR */
-       390, /* GL_DEPTH_RANGE */
-       399, /* GL_DEPTH_TEST */
-       402, /* GL_DEPTH_WRITEMASK */
-       375, /* GL_DEPTH_CLEAR_VALUE */
-       389, /* GL_DEPTH_FUNC */
-        12, /* GL_ACCUM_CLEAR_VALUE */
-      1671, /* GL_STENCIL_TEST */
-      1652, /* GL_STENCIL_CLEAR_VALUE */
-      1654, /* GL_STENCIL_FUNC */
-      1673, /* GL_STENCIL_VALUE_MASK */
-      1653, /* GL_STENCIL_FAIL */
-      1668, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1669, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1670, /* GL_STENCIL_REF */
-      1674, /* GL_STENCIL_WRITEMASK */
-       922, /* GL_MATRIX_MODE */
-      1118, /* GL_NORMALIZE */
-      2037, /* GL_VIEWPORT */
-      1091, /* GL_MODELVIEW_STACK_DEPTH */
-      1370, /* GL_PROJECTION_STACK_DEPTH */
-      1896, /* GL_TEXTURE_STACK_DEPTH */
-      1088, /* GL_MODELVIEW_MATRIX */
-      1368, /* GL_PROJECTION_MATRIX */
-      1878, /* GL_TEXTURE_MATRIX */
-        61, /* GL_ATTRIB_STACK_DEPTH */
-       148, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-        43, /* GL_ALPHA_TEST */
-        44, /* GL_ALPHA_TEST_FUNC */
-        45, /* GL_ALPHA_TEST_REF */
-       404, /* GL_DITHER */
-        79, /* GL_BLEND_DST */
-        93, /* GL_BLEND_SRC */
-        76, /* GL_BLEND */
-       783, /* GL_LOGIC_OP_MODE */
-       695, /* GL_INDEX_LOGIC_OP */
-       204, /* GL_COLOR_LOGIC_OP */
-        67, /* GL_AUX_BUFFERS */
-       415, /* GL_DRAW_BUFFER */
-      1412, /* GL_READ_BUFFER */
-      1547, /* GL_SCISSOR_BOX */
-      1548, /* GL_SCISSOR_TEST */
-       694, /* GL_INDEX_CLEAR_VALUE */
-       699, /* GL_INDEX_WRITEMASK */
-       201, /* GL_COLOR_CLEAR_VALUE */
-       243, /* GL_COLOR_WRITEMASK */
-       696, /* GL_INDEX_MODE */
-      1512, /* GL_RGBA_MODE */
-       414, /* GL_DOUBLEBUFFER */
-      1675, /* GL_STEREO */
-      1463, /* GL_RENDER_MODE */
-      1207, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1265, /* GL_POINT_SMOOTH_HINT */
-       766, /* GL_LINE_SMOOTH_HINT */
-      1283, /* GL_POLYGON_SMOOTH_HINT */
-       552, /* GL_FOG_HINT */
-      1858, /* GL_TEXTURE_GEN_S */
-      1860, /* GL_TEXTURE_GEN_T */
-      1857, /* GL_TEXTURE_GEN_R */
-      1856, /* GL_TEXTURE_GEN_Q */
-      1220, /* GL_PIXEL_MAP_I_TO_I */
-      1226, /* GL_PIXEL_MAP_S_TO_S */
-      1222, /* GL_PIXEL_MAP_I_TO_R */
-      1218, /* GL_PIXEL_MAP_I_TO_G */
-      1216, /* GL_PIXEL_MAP_I_TO_B */
-      1214, /* GL_PIXEL_MAP_I_TO_A */
-      1224, /* GL_PIXEL_MAP_R_TO_R */
-      1212, /* GL_PIXEL_MAP_G_TO_G */
-      1210, /* GL_PIXEL_MAP_B_TO_B */
-      1208, /* GL_PIXEL_MAP_A_TO_A */
-      1221, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1227, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1223, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1219, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1217, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1215, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1225, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1213, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1211, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1209, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1949, /* GL_UNPACK_SWAP_BYTES */
-      1944, /* GL_UNPACK_LSB_FIRST */
-      1945, /* GL_UNPACK_ROW_LENGTH */
-      1948, /* GL_UNPACK_SKIP_ROWS */
-      1947, /* GL_UNPACK_SKIP_PIXELS */
-      1942, /* GL_UNPACK_ALIGNMENT */
-      1195, /* GL_PACK_SWAP_BYTES */
-      1190, /* GL_PACK_LSB_FIRST */
-      1191, /* GL_PACK_ROW_LENGTH */
-      1194, /* GL_PACK_SKIP_ROWS */
-      1193, /* GL_PACK_SKIP_PIXELS */
-      1187, /* GL_PACK_ALIGNMENT */
-       863, /* GL_MAP_COLOR */
-       868, /* GL_MAP_STENCIL */
-       698, /* GL_INDEX_SHIFT */
-       697, /* GL_INDEX_OFFSET */
-      1426, /* GL_RED_SCALE */
-      1424, /* GL_RED_BIAS */
-      2063, /* GL_ZOOM_X */
-      2064, /* GL_ZOOM_Y */
-       653, /* GL_GREEN_SCALE */
-       651, /* GL_GREEN_BIAS */
-       101, /* GL_BLUE_SCALE */
-        99, /* GL_BLUE_BIAS */
-        42, /* GL_ALPHA_SCALE */
-        40, /* GL_ALPHA_BIAS */
-       391, /* GL_DEPTH_SCALE */
-       368, /* GL_DEPTH_BIAS */
-       952, /* GL_MAX_EVAL_ORDER */
-       962, /* GL_MAX_LIGHTS */
-       933, /* GL_MAX_CLIP_PLANES */
-      1013, /* GL_MAX_TEXTURE_SIZE */
-       969, /* GL_MAX_PIXEL_MAP_TABLE */
-       929, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       965, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       966, /* GL_MAX_NAME_STACK_DEPTH */
-       995, /* GL_MAX_PROJECTION_STACK_DEPTH */
-      1014, /* GL_MAX_TEXTURE_STACK_DEPTH */
-      1036, /* GL_MAX_VIEWPORT_DIMS */
-       930, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1685, /* GL_SUBPIXEL_BITS */
-       693, /* GL_INDEX_BITS */
-      1425, /* GL_RED_BITS */
-       652, /* GL_GREEN_BITS */
-       100, /* GL_BLUE_BITS */
-        41, /* GL_ALPHA_BITS */
-       369, /* GL_DEPTH_BITS */
-      1650, /* GL_STENCIL_BITS */
-        14, /* GL_ACCUM_RED_BITS */
-        13, /* GL_ACCUM_GREEN_BITS */
-        10, /* GL_ACCUM_BLUE_BITS */
-         9, /* GL_ACCUM_ALPHA_BITS */
-      1105, /* GL_NAME_STACK_DEPTH */
-        62, /* GL_AUTO_NORMAL */
-       809, /* GL_MAP1_COLOR_4 */
-       812, /* GL_MAP1_INDEX */
-       813, /* GL_MAP1_NORMAL */
-       814, /* GL_MAP1_TEXTURE_COORD_1 */
-       815, /* GL_MAP1_TEXTURE_COORD_2 */
-       816, /* GL_MAP1_TEXTURE_COORD_3 */
-       817, /* GL_MAP1_TEXTURE_COORD_4 */
-       818, /* GL_MAP1_VERTEX_3 */
-       819, /* GL_MAP1_VERTEX_4 */
-       836, /* GL_MAP2_COLOR_4 */
-       839, /* GL_MAP2_INDEX */
-       840, /* GL_MAP2_NORMAL */
-       841, /* GL_MAP2_TEXTURE_COORD_1 */
-       842, /* GL_MAP2_TEXTURE_COORD_2 */
-       843, /* GL_MAP2_TEXTURE_COORD_3 */
-       844, /* GL_MAP2_TEXTURE_COORD_4 */
-       845, /* GL_MAP2_VERTEX_3 */
-       846, /* GL_MAP2_VERTEX_4 */
-       810, /* GL_MAP1_GRID_DOMAIN */
-       811, /* GL_MAP1_GRID_SEGMENTS */
-       837, /* GL_MAP2_GRID_DOMAIN */
-       838, /* GL_MAP2_GRID_SEGMENTS */
-      1768, /* GL_TEXTURE_1D */
-      1770, /* GL_TEXTURE_2D */
-       503, /* GL_FEEDBACK_BUFFER_POINTER */
-       504, /* GL_FEEDBACK_BUFFER_SIZE */
-       505, /* GL_FEEDBACK_BUFFER_TYPE */
-      1557, /* GL_SELECTION_BUFFER_POINTER */
-      1558, /* GL_SELECTION_BUFFER_SIZE */
-      1902, /* GL_TEXTURE_WIDTH */
-      1864, /* GL_TEXTURE_HEIGHT */
-      1808, /* GL_TEXTURE_COMPONENTS */
-      1792, /* GL_TEXTURE_BORDER_COLOR */
-      1791, /* GL_TEXTURE_BORDER */
-       406, /* GL_DONT_CARE */
-       501, /* GL_FASTEST */
-      1113, /* GL_NICEST */
-        48, /* GL_AMBIENT */
-       403, /* GL_DIFFUSE */
-      1609, /* GL_SPECULAR */
-      1287, /* GL_POSITION */
-      1612, /* GL_SPOT_DIRECTION */
-      1613, /* GL_SPOT_EXPONENT */
-      1611, /* GL_SPOT_CUTOFF */
-       288, /* GL_CONSTANT_ATTENUATION */
-       755, /* GL_LINEAR_ATTENUATION */
-      1392, /* GL_QUADRATIC_ATTENUATION */
-       257, /* GL_COMPILE */
-       258, /* GL_COMPILE_AND_EXECUTE */
-       132, /* GL_BYTE */
-      1951, /* GL_UNSIGNED_BYTE */
-      1574, /* GL_SHORT */
-      1966, /* GL_UNSIGNED_SHORT */
-       701, /* GL_INT */
-      1954, /* GL_UNSIGNED_INT */
-       512, /* GL_FLOAT */
-         1, /* GL_2_BYTES */
-         5, /* GL_3_BYTES */
-         7, /* GL_4_BYTES */
-       413, /* GL_DOUBLE */
-       654, /* GL_HALF_FLOAT */
-       509, /* GL_FIXED */
-       144, /* GL_CLEAR */
-        50, /* GL_AND */
-        52, /* GL_AND_REVERSE */
-       313, /* GL_COPY */
-        51, /* GL_AND_INVERTED */
-      1116, /* GL_NOOP */
-      2059, /* GL_XOR */
-      1182, /* GL_OR */
-      1117, /* GL_NOR */
-       491, /* GL_EQUIV */
-       731, /* GL_INVERT */
-      1185, /* GL_OR_REVERSE */
-       314, /* GL_COPY_INVERTED */
-      1184, /* GL_OR_INVERTED */
-      1106, /* GL_NAND */
-      1563, /* GL_SET */
-       488, /* GL_EMISSION */
-      1573, /* GL_SHININESS */
-        49, /* GL_AMBIENT_AND_DIFFUSE */
-       203, /* GL_COLOR_INDEXES */
-      1055, /* GL_MODELVIEW */
-      1367, /* GL_PROJECTION */
-      1703, /* GL_TEXTURE */
-       159, /* GL_COLOR */
-       361, /* GL_DEPTH */
-      1635, /* GL_STENCIL */
-       202, /* GL_COLOR_INDEX */
-      1655, /* GL_STENCIL_INDEX */
-       376, /* GL_DEPTH_COMPONENT */
-      1421, /* GL_RED */
-       650, /* GL_GREEN */
-        98, /* GL_BLUE */
-        31, /* GL_ALPHA */
-      1472, /* GL_RGB */
-      1495, /* GL_RGBA */
-       787, /* GL_LUMINANCE */
-       808, /* GL_LUMINANCE_ALPHA */
-        74, /* GL_BITMAP */
-      1237, /* GL_POINT */
-       753, /* GL_LINE */
-       506, /* GL_FILL */
-      1432, /* GL_RENDER */
-       502, /* GL_FEEDBACK */
-      1556, /* GL_SELECT */
-       511, /* GL_FLAT */
-      1584, /* GL_SMOOTH */
-       732, /* GL_KEEP */
-      1465, /* GL_REPLACE */
-       683, /* GL_INCR */
-       357, /* GL_DECR */
-      1983, /* GL_VENDOR */
-      1462, /* GL_RENDERER */
-      1984, /* GL_VERSION */
-       495, /* GL_EXTENSIONS */
-      1520, /* GL_S */
-      1694, /* GL_T */
-      1408, /* GL_R */
-      1391, /* GL_Q */
-      1092, /* GL_MODULATE */
-       356, /* GL_DECAL */
-      1851, /* GL_TEXTURE_ENV_MODE */
-      1850, /* GL_TEXTURE_ENV_COLOR */
-      1849, /* GL_TEXTURE_ENV */
-       496, /* GL_EYE_LINEAR */
-      1143, /* GL_OBJECT_LINEAR */
-      1610, /* GL_SPHERE_MAP */
-      1854, /* GL_TEXTURE_GEN_MODE */
-      1145, /* GL_OBJECT_PLANE */
-       497, /* GL_EYE_PLANE */
-      1107, /* GL_NEAREST */
-       754, /* GL_LINEAR */
-      1111, /* GL_NEAREST_MIPMAP_NEAREST */
-       759, /* GL_LINEAR_MIPMAP_NEAREST */
-      1110, /* GL_NEAREST_MIPMAP_LINEAR */
-       758, /* GL_LINEAR_MIPMAP_LINEAR */
-      1877, /* GL_TEXTURE_MAG_FILTER */
-      1886, /* GL_TEXTURE_MIN_FILTER */
-      1905, /* GL_TEXTURE_WRAP_S */
-      1906, /* GL_TEXTURE_WRAP_T */
-       138, /* GL_CLAMP */
-      1464, /* GL_REPEAT */
-      1281, /* GL_POLYGON_OFFSET_UNITS */
-      1280, /* GL_POLYGON_OFFSET_POINT */
-      1279, /* GL_POLYGON_OFFSET_LINE */
-      1409, /* GL_R3_G3_B2 */
-      1980, /* GL_V2F */
-      1981, /* GL_V3F */
-       135, /* GL_C4UB_V2F */
-       136, /* GL_C4UB_V3F */
-       133, /* GL_C3F_V3F */
-      1104, /* GL_N3F_V3F */
-       134, /* GL_C4F_N3F_V3F */
-      1699, /* GL_T2F_V3F */
-      1701, /* GL_T4F_V4F */
-      1697, /* GL_T2F_C4UB_V3F */
-      1695, /* GL_T2F_C3F_V3F */
-      1698, /* GL_T2F_N3F_V3F */
-      1696, /* GL_T2F_C4F_N3F_V3F */
-      1700, /* GL_T4F_C4F_N3F_V4F */
-       151, /* GL_CLIP_PLANE0 */
-       152, /* GL_CLIP_PLANE1 */
-       153, /* GL_CLIP_PLANE2 */
-       154, /* GL_CLIP_PLANE3 */
-       155, /* GL_CLIP_PLANE4 */
-       156, /* GL_CLIP_PLANE5 */
-       738, /* GL_LIGHT0 */
-       739, /* GL_LIGHT1 */
-       740, /* GL_LIGHT2 */
-       741, /* GL_LIGHT3 */
-       742, /* GL_LIGHT4 */
-       743, /* GL_LIGHT5 */
-       744, /* GL_LIGHT6 */
-       745, /* GL_LIGHT7 */
-       658, /* GL_HINT_BIT */
-       290, /* GL_CONSTANT_COLOR */
-      1156, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       285, /* GL_CONSTANT_ALPHA */
-      1154, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-        77, /* GL_BLEND_COLOR */
-       631, /* GL_FUNC_ADD */
-      1039, /* GL_MIN */
-       925, /* GL_MAX */
-        84, /* GL_BLEND_EQUATION */
-       637, /* GL_FUNC_SUBTRACT */
-       634, /* GL_FUNC_REVERSE_SUBTRACT */
-       293, /* GL_CONVOLUTION_1D */
-       294, /* GL_CONVOLUTION_2D */
-      1559, /* GL_SEPARABLE_2D */
-       297, /* GL_CONVOLUTION_BORDER_MODE */
-       301, /* GL_CONVOLUTION_FILTER_SCALE */
-       299, /* GL_CONVOLUTION_FILTER_BIAS */
-      1422, /* GL_REDUCE */
-       303, /* GL_CONVOLUTION_FORMAT */
-       307, /* GL_CONVOLUTION_WIDTH */
-       305, /* GL_CONVOLUTION_HEIGHT */
-       942, /* GL_MAX_CONVOLUTION_WIDTH */
-       940, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1320, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1316, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1311, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1307, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1318, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1314, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1309, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1305, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       659, /* GL_HISTOGRAM */
-      1374, /* GL_PROXY_HISTOGRAM */
-       675, /* GL_HISTOGRAM_WIDTH */
-       665, /* GL_HISTOGRAM_FORMAT */
-       671, /* GL_HISTOGRAM_RED_SIZE */
-       667, /* GL_HISTOGRAM_GREEN_SIZE */
-       662, /* GL_HISTOGRAM_BLUE_SIZE */
-       660, /* GL_HISTOGRAM_ALPHA_SIZE */
-       669, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       673, /* GL_HISTOGRAM_SINK */
-      1040, /* GL_MINMAX */
-      1042, /* GL_MINMAX_FORMAT */
-      1044, /* GL_MINMAX_SINK */
-      1702, /* GL_TABLE_TOO_LARGE_EXT */
-      1953, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1969, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1972, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1963, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1955, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1278, /* GL_POLYGON_OFFSET_FILL */
-      1277, /* GL_POLYGON_OFFSET_FACTOR */
-      1276, /* GL_POLYGON_OFFSET_BIAS */
-      1468, /* GL_RESCALE_NORMAL */
-        36, /* GL_ALPHA4 */
-        38, /* GL_ALPHA8 */
-        32, /* GL_ALPHA12 */
-        34, /* GL_ALPHA16 */
-       798, /* GL_LUMINANCE4 */
-       804, /* GL_LUMINANCE8 */
-       788, /* GL_LUMINANCE12 */
-       794, /* GL_LUMINANCE16 */
-       799, /* GL_LUMINANCE4_ALPHA4 */
-       802, /* GL_LUMINANCE6_ALPHA2 */
-       805, /* GL_LUMINANCE8_ALPHA8 */
-       791, /* GL_LUMINANCE12_ALPHA4 */
-       789, /* GL_LUMINANCE12_ALPHA12 */
-       795, /* GL_LUMINANCE16_ALPHA16 */
-       702, /* GL_INTENSITY */
-       707, /* GL_INTENSITY4 */
-       709, /* GL_INTENSITY8 */
-       703, /* GL_INTENSITY12 */
-       705, /* GL_INTENSITY16 */
-      1481, /* GL_RGB2_EXT */
-      1482, /* GL_RGB4 */
-      1485, /* GL_RGB5 */
-      1492, /* GL_RGB8 */
-      1473, /* GL_RGB10 */
-      1477, /* GL_RGB12 */
-      1479, /* GL_RGB16 */
-      1500, /* GL_RGBA2 */
-      1502, /* GL_RGBA4 */
-      1488, /* GL_RGB5_A1 */
-      1507, /* GL_RGBA8 */
-      1474, /* GL_RGB10_A2 */
-      1496, /* GL_RGBA12 */
-      1498, /* GL_RGBA16 */
-      1893, /* GL_TEXTURE_RED_SIZE */
-      1862, /* GL_TEXTURE_GREEN_SIZE */
-      1789, /* GL_TEXTURE_BLUE_SIZE */
-      1774, /* GL_TEXTURE_ALPHA_SIZE */
-      1875, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1866, /* GL_TEXTURE_INTENSITY_SIZE */
-      1466, /* GL_REPLACE_EXT */
-      1378, /* GL_PROXY_TEXTURE_1D */
-      1381, /* GL_PROXY_TEXTURE_2D */
-      1900, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1888, /* GL_TEXTURE_PRIORITY */
-      1895, /* GL_TEXTURE_RESIDENT */
-      1777, /* GL_TEXTURE_BINDING_1D */
-      1779, /* GL_TEXTURE_BINDING_2D */
-      1781, /* GL_TEXTURE_BINDING_3D */
-      1192, /* GL_PACK_SKIP_IMAGES */
-      1188, /* GL_PACK_IMAGE_HEIGHT */
-      1946, /* GL_UNPACK_SKIP_IMAGES */
-      1943, /* GL_UNPACK_IMAGE_HEIGHT */
-      1772, /* GL_TEXTURE_3D */
-      1384, /* GL_PROXY_TEXTURE_3D */
-      1846, /* GL_TEXTURE_DEPTH */
-      1903, /* GL_TEXTURE_WRAP_R */
-       926, /* GL_MAX_3D_TEXTURE_SIZE */
-      1985, /* GL_VERTEX_ARRAY */
-      1119, /* GL_NORMAL_ARRAY */
-       160, /* GL_COLOR_ARRAY */
-       687, /* GL_INDEX_ARRAY */
-      1816, /* GL_TEXTURE_COORD_ARRAY */
-       480, /* GL_EDGE_FLAG_ARRAY */
-      1991, /* GL_VERTEX_ARRAY_SIZE */
-      1993, /* GL_VERTEX_ARRAY_TYPE */
-      1992, /* GL_VERTEX_ARRAY_STRIDE */
-      1124, /* GL_NORMAL_ARRAY_TYPE */
-      1123, /* GL_NORMAL_ARRAY_STRIDE */
-       164, /* GL_COLOR_ARRAY_SIZE */
-       166, /* GL_COLOR_ARRAY_TYPE */
-       165, /* GL_COLOR_ARRAY_STRIDE */
-       692, /* GL_INDEX_ARRAY_TYPE */
-       691, /* GL_INDEX_ARRAY_STRIDE */
-      1820, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1822, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1821, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       484, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1990, /* GL_VERTEX_ARRAY_POINTER */
-      1122, /* GL_NORMAL_ARRAY_POINTER */
-       163, /* GL_COLOR_ARRAY_POINTER */
-       690, /* GL_INDEX_ARRAY_POINTER */
-      1819, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       483, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1097, /* GL_MULTISAMPLE */
-      1533, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1535, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1540, /* GL_SAMPLE_COVERAGE */
-      1537, /* GL_SAMPLE_BUFFERS */
-      1528, /* GL_SAMPLES */
-      1544, /* GL_SAMPLE_COVERAGE_VALUE */
-      1542, /* GL_SAMPLE_COVERAGE_INVERT */
-       208, /* GL_COLOR_MATRIX */
-       210, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       936, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1303, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1299, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1294, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1290, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1301, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1297, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1292, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1288, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1799, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1385, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1801, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-        82, /* GL_BLEND_DST_RGB */
-        96, /* GL_BLEND_SRC_RGB */
-        80, /* GL_BLEND_DST_ALPHA */
-        94, /* GL_BLEND_SRC_ALPHA */
-       214, /* GL_COLOR_TABLE */
-      1313, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1296, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1373, /* GL_PROXY_COLOR_TABLE */
-      1377, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1376, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       238, /* GL_COLOR_TABLE_SCALE */
-       218, /* GL_COLOR_TABLE_BIAS */
-       223, /* GL_COLOR_TABLE_FORMAT */
-       240, /* GL_COLOR_TABLE_WIDTH */
-       235, /* GL_COLOR_TABLE_RED_SIZE */
-       226, /* GL_COLOR_TABLE_GREEN_SIZE */
-       220, /* GL_COLOR_TABLE_BLUE_SIZE */
-       215, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       232, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       229, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-        71, /* GL_BGR */
-        72, /* GL_BGRA */
-       951, /* GL_MAX_ELEMENTS_VERTICES */
-       950, /* GL_MAX_ELEMENTS_INDICES */
-      1865, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       157, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1259, /* GL_POINT_SIZE_MIN */
-      1255, /* GL_POINT_SIZE_MAX */
-      1244, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1240, /* GL_POINT_DISTANCE_ATTENUATION */
-       139, /* GL_CLAMP_TO_BORDER */
-       142, /* GL_CLAMP_TO_EDGE */
-      1887, /* GL_TEXTURE_MIN_LOD */
-      1885, /* GL_TEXTURE_MAX_LOD */
-      1776, /* GL_TEXTURE_BASE_LEVEL */
-      1884, /* GL_TEXTURE_MAX_LEVEL */
-       678, /* GL_IGNORE_BORDER_HP */
-       289, /* GL_CONSTANT_BORDER_HP */
-      1467, /* GL_REPLICATE_BORDER_HP */
-       295, /* GL_CONVOLUTION_BORDER_COLOR */
-      1151, /* GL_OCCLUSION_TEST_HP */
-      1152, /* GL_OCCLUSION_TEST_RESULT_HP */
-       756, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1793, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1795, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1797, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1798, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1796, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1794, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       931, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       932, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1323, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1325, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1322, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1324, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1873, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1874, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1872, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       640, /* GL_GENERATE_MIPMAP */
-       641, /* GL_GENERATE_MIPMAP_HINT */
-       555, /* GL_FOG_OFFSET_SGIX */
-       556, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1807, /* GL_TEXTURE_COMPARE_SGIX */
-      1806, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1869, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1861, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       377, /* GL_DEPTH_COMPONENT16 */
-       381, /* GL_DEPTH_COMPONENT24 */
-       385, /* GL_DEPTH_COMPONENT32 */
-       320, /* GL_CULL_VERTEX_EXT */
-       322, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       321, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2055, /* GL_WRAP_BORDER_SUN */
-      1800, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       749, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1577, /* GL_SINGLE_COLOR */
-      1561, /* GL_SEPARATE_SPECULAR_COLOR */
-      1572, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       567, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       568, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       578, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       570, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       566, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       565, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       569, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       579, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       596, /* GL_FRAMEBUFFER_DEFAULT */
-       622, /* GL_FRAMEBUFFER_UNDEFINED */
-       393, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       686, /* GL_INDEX */
-      1952, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1973, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1974, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1970, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1967, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1964, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1961, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1882, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1883, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1881, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-      1047, /* GL_MIRRORED_REPEAT */
-      1515, /* GL_RGB_S3TC */
-      1484, /* GL_RGB4_S3TC */
-      1513, /* GL_RGBA_S3TC */
-      1506, /* GL_RGBA4_S3TC */
-      1511, /* GL_RGBA_DXT5_S3TC */
-      1503, /* GL_RGBA4_DXT5_S3TC */
-       277, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       272, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       273, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       274, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1109, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1108, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       757, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       542, /* GL_FOG_COORDINATE_SOURCE */
-       534, /* GL_FOG_COORD */
-       558, /* GL_FRAGMENT_DEPTH */
-       326, /* GL_CURRENT_FOG_COORD */
-       541, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       540, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       539, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       536, /* GL_FOG_COORDINATE_ARRAY */
-       212, /* GL_COLOR_SUM */
-       347, /* GL_CURRENT_SECONDARY_COLOR */
-      1553, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1555, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1554, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1552, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1549, /* GL_SECONDARY_COLOR_ARRAY */
-       345, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-        28, /* GL_ALIASED_POINT_SIZE_RANGE */
-        27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1704, /* GL_TEXTURE0 */
-      1706, /* GL_TEXTURE1 */
-      1728, /* GL_TEXTURE2 */
-      1750, /* GL_TEXTURE3 */
-      1756, /* GL_TEXTURE4 */
-      1758, /* GL_TEXTURE5 */
-      1760, /* GL_TEXTURE6 */
-      1762, /* GL_TEXTURE7 */
-      1764, /* GL_TEXTURE8 */
-      1766, /* GL_TEXTURE9 */
-      1707, /* GL_TEXTURE10 */
-      1709, /* GL_TEXTURE11 */
-      1711, /* GL_TEXTURE12 */
-      1713, /* GL_TEXTURE13 */
-      1715, /* GL_TEXTURE14 */
-      1717, /* GL_TEXTURE15 */
-      1719, /* GL_TEXTURE16 */
-      1721, /* GL_TEXTURE17 */
-      1723, /* GL_TEXTURE18 */
-      1725, /* GL_TEXTURE19 */
-      1729, /* GL_TEXTURE20 */
-      1731, /* GL_TEXTURE21 */
-      1733, /* GL_TEXTURE22 */
-      1735, /* GL_TEXTURE23 */
-      1737, /* GL_TEXTURE24 */
-      1739, /* GL_TEXTURE25 */
-      1741, /* GL_TEXTURE26 */
-      1743, /* GL_TEXTURE27 */
-      1745, /* GL_TEXTURE28 */
-      1747, /* GL_TEXTURE29 */
-      1751, /* GL_TEXTURE30 */
-      1753, /* GL_TEXTURE31 */
-        18, /* GL_ACTIVE_TEXTURE */
-       145, /* GL_CLIENT_ACTIVE_TEXTURE */
-      1015, /* GL_MAX_TEXTURE_UNITS */
-      1927, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1930, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1932, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1924, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1686, /* GL_SUBTRACT */
-       998, /* GL_MAX_RENDERBUFFER_SIZE */
-       260, /* GL_COMPRESSED_ALPHA */
-       264, /* GL_COMPRESSED_LUMINANCE */
-       265, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       262, /* GL_COMPRESSED_INTENSITY */
-       268, /* GL_COMPRESSED_RGB */
-       269, /* GL_COMPRESSED_RGBA */
-      1814, /* GL_TEXTURE_COMPRESSION_HINT */
-      1891, /* GL_TEXTURE_RECTANGLE_ARB */
-      1786, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1388, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       996, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       392, /* GL_DEPTH_STENCIL */
-      1957, /* GL_UNSIGNED_INT_24_8 */
-      1010, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1880, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-      1012, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1852, /* GL_TEXTURE_FILTER_CONTROL */
-      1870, /* GL_TEXTURE_LOD_BIAS */
-       245, /* GL_COMBINE4 */
-      1004, /* GL_MAX_SHININESS_NV */
-      1005, /* GL_MAX_SPOT_EXPONENT_NV */
-       684, /* GL_INCR_WRAP */
-       358, /* GL_DECR_WRAP */
-      1067, /* GL_MODELVIEW1_ARB */
-      1125, /* GL_NORMAL_MAP */
-      1427, /* GL_REFLECTION_MAP */
-      1824, /* GL_TEXTURE_CUBE_MAP */
-      1783, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1836, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1826, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1839, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1829, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1842, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1832, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1386, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       944, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1103, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       550, /* GL_FOG_DISTANCE_MODE_NV */
-       499, /* GL_EYE_RADIAL_NV */
-       498, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       244, /* GL_COMBINE */
-       251, /* GL_COMBINE_RGB */
-       246, /* GL_COMBINE_ALPHA */
-      1516, /* GL_RGB_SCALE */
-        24, /* GL_ADD_SIGNED */
-       713, /* GL_INTERPOLATE */
-       284, /* GL_CONSTANT */
-      1329, /* GL_PRIMARY_COLOR */
-      1326, /* GL_PREVIOUS */
-      1592, /* GL_SOURCE0_RGB */
-      1598, /* GL_SOURCE1_RGB */
-      1604, /* GL_SOURCE2_RGB */
-      1608, /* GL_SOURCE3_RGB_NV */
-      1589, /* GL_SOURCE0_ALPHA */
-      1595, /* GL_SOURCE1_ALPHA */
-      1601, /* GL_SOURCE2_ALPHA */
-      1607, /* GL_SOURCE3_ALPHA_NV */
-      1165, /* GL_OPERAND0_RGB */
-      1171, /* GL_OPERAND1_RGB */
-      1177, /* GL_OPERAND2_RGB */
-      1181, /* GL_OPERAND3_RGB_NV */
-      1162, /* GL_OPERAND0_ALPHA */
-      1168, /* GL_OPERAND1_ALPHA */
-      1174, /* GL_OPERAND2_ALPHA */
-      1180, /* GL_OPERAND3_ALPHA_NV */
-       120, /* GL_BUFFER_OBJECT_APPLE */
-      1986, /* GL_VERTEX_ARRAY_BINDING */
-      1889, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1890, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2060, /* GL_YCBCR_422_APPLE */
-      1975, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1977, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1899, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1677, /* GL_STORAGE_PRIVATE_APPLE */
-      1676, /* GL_STORAGE_CACHED_APPLE */
-      1678, /* GL_STORAGE_SHARED_APPLE */
-      1579, /* GL_SLICE_ACCUM_SUN */
-      1396, /* GL_QUAD_MESH_SUN */
-      1937, /* GL_TRIANGLE_MESH_SUN */
-      2025, /* GL_VERTEX_PROGRAM_ARB */
-      2036, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2012, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2018, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2020, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2022, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       349, /* GL_CURRENT_VERTEX_ATTRIB */
-      1345, /* GL_PROGRAM_LENGTH_ARB */
-      1360, /* GL_PROGRAM_STRING_ARB */
-      1090, /* GL_MODELVIEW_PROJECTION_NV */
-       677, /* GL_IDENTITY_NV */
-       729, /* GL_INVERSE_NV */
-      1929, /* GL_TRANSPOSE_NV */
-       730, /* GL_INVERSE_TRANSPOSE_NV */
-       982, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       981, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       872, /* GL_MATRIX0_NV */
-       884, /* GL_MATRIX1_NV */
-       896, /* GL_MATRIX2_NV */
-       900, /* GL_MATRIX3_NV */
-       902, /* GL_MATRIX4_NV */
-       904, /* GL_MATRIX5_NV */
-       906, /* GL_MATRIX6_NV */
-       908, /* GL_MATRIX7_NV */
-       332, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       329, /* GL_CURRENT_MATRIX_ARB */
-      2028, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      2031, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1357, /* GL_PROGRAM_PARAMETER_NV */
-      2016, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1362, /* GL_PROGRAM_TARGET_NV */
-      1359, /* GL_PROGRAM_RESIDENT_NV */
-      1909, /* GL_TRACK_MATRIX_NV */
-      1910, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2026, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1339, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       373, /* GL_DEPTH_CLAMP */
-      1994, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2001, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2002, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2003, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2004, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2005, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2006, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2007, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2008, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2009, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1995, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1996, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1997, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1998, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1999, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2000, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       820, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       827, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       828, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       829, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       830, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       831, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       832, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       833, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       834, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       835, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       821, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       822, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       823, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       824, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       825, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       826, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       847, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       854, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       855, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       856, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       857, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       858, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       859, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1338, /* GL_PROGRAM_BINDING_ARB */
-       861, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       862, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       848, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       849, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       850, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       851, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       852, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       853, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1812, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1809, /* GL_TEXTURE_COMPRESSED */
-      1131, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       282, /* GL_COMPRESSED_TEXTURE_FORMATS */
-      1033, /* GL_MAX_VERTEX_UNITS_ARB */
-        22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2054, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2024, /* GL_VERTEX_BLEND_ARB */
-       351, /* GL_CURRENT_WEIGHT_ARB */
-      2052, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2050, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2048, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2046, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2041, /* GL_WEIGHT_ARRAY_ARB */
-       407, /* GL_DOT3_RGB */
-       408, /* GL_DOT3_RGBA */
-       276, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       271, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1098, /* GL_MULTISAMPLE_3DFX */
-      1538, /* GL_SAMPLE_BUFFERS_3DFX */
-      1529, /* GL_SAMPLES_3DFX */
-      1078, /* GL_MODELVIEW2_ARB */
-      1081, /* GL_MODELVIEW3_ARB */
-      1082, /* GL_MODELVIEW4_ARB */
-      1083, /* GL_MODELVIEW5_ARB */
-      1084, /* GL_MODELVIEW6_ARB */
-      1085, /* GL_MODELVIEW7_ARB */
-      1086, /* GL_MODELVIEW8_ARB */
-      1087, /* GL_MODELVIEW9_ARB */
-      1057, /* GL_MODELVIEW10_ARB */
-      1058, /* GL_MODELVIEW11_ARB */
-      1059, /* GL_MODELVIEW12_ARB */
-      1060, /* GL_MODELVIEW13_ARB */
-      1061, /* GL_MODELVIEW14_ARB */
-      1062, /* GL_MODELVIEW15_ARB */
-      1063, /* GL_MODELVIEW16_ARB */
-      1064, /* GL_MODELVIEW17_ARB */
-      1065, /* GL_MODELVIEW18_ARB */
-      1066, /* GL_MODELVIEW19_ARB */
-      1068, /* GL_MODELVIEW20_ARB */
-      1069, /* GL_MODELVIEW21_ARB */
-      1070, /* GL_MODELVIEW22_ARB */
-      1071, /* GL_MODELVIEW23_ARB */
-      1072, /* GL_MODELVIEW24_ARB */
-      1073, /* GL_MODELVIEW25_ARB */
-      1074, /* GL_MODELVIEW26_ARB */
-      1075, /* GL_MODELVIEW27_ARB */
-      1076, /* GL_MODELVIEW28_ARB */
-      1077, /* GL_MODELVIEW29_ARB */
-      1079, /* GL_MODELVIEW30_ARB */
-      1080, /* GL_MODELVIEW31_ARB */
-       412, /* GL_DOT3_RGB_EXT */
-       410, /* GL_DOT3_RGBA_EXT */
-      1051, /* GL_MIRROR_CLAMP_EXT */
-      1054, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1093, /* GL_MODULATE_ADD_ATI */
-      1094, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1095, /* GL_MODULATE_SUBTRACT_ATI */
-      2061, /* GL_YCBCR_MESA */
-      1189, /* GL_PACK_INVERT_MESA */
-       354, /* GL_DEBUG_OBJECT_MESA */
-       355, /* GL_DEBUG_PRINT_MESA */
-       353, /* GL_DEBUG_ASSERT_MESA */
-       122, /* GL_BUFFER_SIZE */
-       124, /* GL_BUFFER_USAGE */
-       128, /* GL_BUMP_ROT_MATRIX_ATI */
-       129, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       127, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       131, /* GL_BUMP_TEX_UNITS_ATI */
-       472, /* GL_DUDV_ATI */
-       471, /* GL_DU8DV8_ATI */
-       126, /* GL_BUMP_ENVMAP_ATI */
-       130, /* GL_BUMP_TARGET_ATI */
-      1133, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-      1336, /* GL_PROGRAM_BINARY_FORMATS_OES */
-      1641, /* GL_STENCIL_BACK_FUNC */
-      1639, /* GL_STENCIL_BACK_FAIL */
-      1643, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1645, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       559, /* GL_FRAGMENT_PROGRAM_ARB */
-      1334, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1365, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1364, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1348, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1354, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1353, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       971, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       994, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       993, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       984, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       990, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       989, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       947, /* GL_MAX_DRAW_BUFFERS */
-       416, /* GL_DRAW_BUFFER0 */
-       419, /* GL_DRAW_BUFFER1 */
-       440, /* GL_DRAW_BUFFER2 */
-       443, /* GL_DRAW_BUFFER3 */
-       446, /* GL_DRAW_BUFFER4 */
-       449, /* GL_DRAW_BUFFER5 */
-       452, /* GL_DRAW_BUFFER6 */
-       455, /* GL_DRAW_BUFFER7 */
-       458, /* GL_DRAW_BUFFER8 */
-       461, /* GL_DRAW_BUFFER9 */
-       420, /* GL_DRAW_BUFFER10 */
-       423, /* GL_DRAW_BUFFER11 */
-       426, /* GL_DRAW_BUFFER12 */
-       429, /* GL_DRAW_BUFFER13 */
-       432, /* GL_DRAW_BUFFER14 */
-       435, /* GL_DRAW_BUFFER15 */
-        85, /* GL_BLEND_EQUATION_ALPHA */
-       923, /* GL_MATRIX_PALETTE_ARB */
-       964, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       967, /* GL_MAX_PALETTE_MATRICES_ARB */
-       335, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       911, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       330, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       916, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       920, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       918, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       914, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1847, /* GL_TEXTURE_DEPTH_SIZE */
-       400, /* GL_DEPTH_TEXTURE_MODE */
-      1804, /* GL_TEXTURE_COMPARE_MODE */
-      1802, /* GL_TEXTURE_COMPARE_FUNC */
-       255, /* GL_COMPARE_R_TO_TEXTURE */
-      1266, /* GL_POINT_SPRITE */
-       309, /* GL_COORD_REPLACE */
-      1271, /* GL_POINT_SPRITE_R_MODE_NV */
-      1400, /* GL_QUERY_COUNTER_BITS */
-       338, /* GL_CURRENT_QUERY */
-      1403, /* GL_QUERY_RESULT */
-      1405, /* GL_QUERY_RESULT_AVAILABLE */
-      1026, /* GL_MAX_VERTEX_ATTRIBS */
-      2014, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       398, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       397, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-      1006, /* GL_MAX_TEXTURE_COORDS */
-      1008, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1341, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1343, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1342, /* GL_PROGRAM_FORMAT_ARB */
-      1901, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       371, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       370, /* GL_DEPTH_BOUNDS_EXT */
-        53, /* GL_ARRAY_BUFFER */
-       485, /* GL_ELEMENT_ARRAY_BUFFER */
-        54, /* GL_ARRAY_BUFFER_BINDING */
-       486, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1988, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1120, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       161, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       688, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1817, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       481, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1550, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       537, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2042, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2010, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1344, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       977, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1350, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       986, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1363, /* GL_PROGRAM_TEMPORARIES_ARB */
-       992, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1352, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       988, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1356, /* GL_PROGRAM_PARAMETERS_ARB */
-       991, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1351, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       987, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1335, /* GL_PROGRAM_ATTRIBS_ARB */
-       972, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1349, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       985, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1333, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       970, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1347, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       983, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       978, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       974, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1366, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1926, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1417, /* GL_READ_ONLY */
-      2056, /* GL_WRITE_ONLY */
-      1419, /* GL_READ_WRITE */
-       110, /* GL_BUFFER_ACCESS */
-       114, /* GL_BUFFER_MAPPED */
-       117, /* GL_BUFFER_MAP_POINTER */
-      1908, /* GL_TIME_ELAPSED_EXT */
-       871, /* GL_MATRIX0_ARB */
-       883, /* GL_MATRIX1_ARB */
-       895, /* GL_MATRIX2_ARB */
-       899, /* GL_MATRIX3_ARB */
-       901, /* GL_MATRIX4_ARB */
-       903, /* GL_MATRIX5_ARB */
-       905, /* GL_MATRIX6_ARB */
-       907, /* GL_MATRIX7_ARB */
-       909, /* GL_MATRIX8_ARB */
-       910, /* GL_MATRIX9_ARB */
-       873, /* GL_MATRIX10_ARB */
-       874, /* GL_MATRIX11_ARB */
-       875, /* GL_MATRIX12_ARB */
-       876, /* GL_MATRIX13_ARB */
-       877, /* GL_MATRIX14_ARB */
-       878, /* GL_MATRIX15_ARB */
-       879, /* GL_MATRIX16_ARB */
-       880, /* GL_MATRIX17_ARB */
-       881, /* GL_MATRIX18_ARB */
-       882, /* GL_MATRIX19_ARB */
-       885, /* GL_MATRIX20_ARB */
-       886, /* GL_MATRIX21_ARB */
-       887, /* GL_MATRIX22_ARB */
-       888, /* GL_MATRIX23_ARB */
-       889, /* GL_MATRIX24_ARB */
-       890, /* GL_MATRIX25_ARB */
-       891, /* GL_MATRIX26_ARB */
-       892, /* GL_MATRIX27_ARB */
-       893, /* GL_MATRIX28_ARB */
-       894, /* GL_MATRIX29_ARB */
-       897, /* GL_MATRIX30_ARB */
-       898, /* GL_MATRIX31_ARB */
-      1681, /* GL_STREAM_DRAW */
-      1683, /* GL_STREAM_READ */
-      1679, /* GL_STREAM_COPY */
-      1631, /* GL_STATIC_DRAW */
-      1633, /* GL_STATIC_READ */
-      1629, /* GL_STATIC_COPY */
-       475, /* GL_DYNAMIC_DRAW */
-       477, /* GL_DYNAMIC_READ */
-       473, /* GL_DYNAMIC_COPY */
-      1229, /* GL_PIXEL_PACK_BUFFER */
-      1233, /* GL_PIXEL_UNPACK_BUFFER */
-      1230, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1234, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       362, /* GL_DEPTH24_STENCIL8 */
-      1897, /* GL_TEXTURE_STENCIL_SIZE */
-      1845, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-       973, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       976, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       980, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       979, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       928, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1672, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-        17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-      1052, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1531, /* GL_SAMPLES_PASSED */
-      1253, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1252, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1251, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-      1089, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1369, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1879, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-       121, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-       113, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1431, /* GL_RELEASED_APPLE */
-      2039, /* GL_VOLATILE_APPLE */
-      1470, /* GL_RETAINED_APPLE */
-      1941, /* GL_UNDEFINED_APPLE */
-      1390, /* GL_PURGEABLE_APPLE */
-       560, /* GL_FRAGMENT_SHADER */
-      2034, /* GL_VERTEX_SHADER */
-      1355, /* GL_PROGRAM_OBJECT_ARB */
-      1566, /* GL_SHADER_OBJECT_ARB */
-       954, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-      1030, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-      1023, /* GL_MAX_VARYING_FLOATS */
-      1028, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       938, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1149, /* GL_OBJECT_TYPE_ARB */
-      1568, /* GL_SHADER_TYPE */
-       525, /* GL_FLOAT_VEC2 */
-       527, /* GL_FLOAT_VEC3 */
-       529, /* GL_FLOAT_VEC4 */
-       717, /* GL_INT_VEC2 */
-       719, /* GL_INT_VEC3 */
-       721, /* GL_INT_VEC4 */
-       102, /* GL_BOOL */
-       104, /* GL_BOOL_VEC2 */
-       106, /* GL_BOOL_VEC3 */
-       108, /* GL_BOOL_VEC4 */
-       513, /* GL_FLOAT_MAT2 */
-       517, /* GL_FLOAT_MAT3 */
-       521, /* GL_FLOAT_MAT4 */
-      1521, /* GL_SAMPLER_1D */
-      1523, /* GL_SAMPLER_2D */
-      1525, /* GL_SAMPLER_3D */
-      1527, /* GL_SAMPLER_CUBE */
-      1522, /* GL_SAMPLER_1D_SHADOW */
-      1524, /* GL_SAMPLER_2D_SHADOW */
-       515, /* GL_FLOAT_MAT2x3 */
-       516, /* GL_FLOAT_MAT2x4 */
-       519, /* GL_FLOAT_MAT3x2 */
-       520, /* GL_FLOAT_MAT3x4 */
-       523, /* GL_FLOAT_MAT4x2 */
-       524, /* GL_FLOAT_MAT4x3 */
-       360, /* GL_DELETE_STATUS */
-       259, /* GL_COMPILE_STATUS */
-       776, /* GL_LINK_STATUS */
-      1982, /* GL_VALIDATE_STATUS */
-       700, /* GL_INFO_LOG_LENGTH */
-        56, /* GL_ATTACHED_SHADERS */
-        20, /* GL_ACTIVE_UNIFORMS */
-        21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1567, /* GL_SHADER_SOURCE_LENGTH */
-        15, /* GL_ACTIVE_ATTRIBUTES */
-        16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       562, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1570, /* GL_SHADING_LANGUAGE_VERSION */
-       337, /* GL_CURRENT_PROGRAM */
-      1198, /* GL_PALETTE4_RGB8_OES */
-      1200, /* GL_PALETTE4_RGBA8_OES */
-      1196, /* GL_PALETTE4_R5_G6_B5_OES */
-      1199, /* GL_PALETTE4_RGBA4_OES */
-      1197, /* GL_PALETTE4_RGB5_A1_OES */
-      1203, /* GL_PALETTE8_RGB8_OES */
-      1205, /* GL_PALETTE8_RGBA8_OES */
-      1201, /* GL_PALETTE8_R5_G6_B5_OES */
-      1204, /* GL_PALETTE8_RGBA4_OES */
-      1202, /* GL_PALETTE8_RGB5_A1_OES */
-       682, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       680, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1250, /* GL_POINT_SIZE_ARRAY_OES */
-      1823, /* GL_TEXTURE_CROP_RECT_OES */
-       912, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1249, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      1965, /* GL_UNSIGNED_NORMALIZED */
-      1769, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1379, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1771, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1382, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1778, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1780, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-       958, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
-      1623, /* GL_SRGB */
-      1624, /* GL_SRGB8 */
-      1626, /* GL_SRGB_ALPHA */
-      1625, /* GL_SRGB8_ALPHA8 */
-      1583, /* GL_SLUMINANCE_ALPHA */
-      1582, /* GL_SLUMINANCE8_ALPHA8 */
-      1580, /* GL_SLUMINANCE */
-      1581, /* GL_SLUMINANCE8 */
-       280, /* GL_COMPRESSED_SRGB */
-       281, /* GL_COMPRESSED_SRGB_ALPHA */
-       278, /* GL_COMPRESSED_SLUMINANCE */
-       279, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1923, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-      1917, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-      1021, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-      1922, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-      1920, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-      1919, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-      1332, /* GL_PRIMITIVES_GENERATED_EXT */
-      1921, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-      1410, /* GL_RASTERIZER_DISCARD_EXT */
-      1019, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-      1020, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-       712, /* GL_INTERLEAVED_ATTRIBS_EXT */
-      1560, /* GL_SEPARATE_ATTRIBS_EXT */
-      1916, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-      1915, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-      1268, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       784, /* GL_LOWER_LEFT */
-      1979, /* GL_UPPER_LEFT */
-      1647, /* GL_STENCIL_BACK_REF */
-      1648, /* GL_STENCIL_BACK_VALUE_MASK */
-      1649, /* GL_STENCIL_BACK_WRITEMASK */
-       465, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1436, /* GL_RENDERBUFFER_BINDING */
-      1413, /* GL_READ_FRAMEBUFFER */
-       464, /* GL_DRAW_FRAMEBUFFER */
-      1414, /* GL_READ_FRAMEBUFFER_BINDING */
-      1455, /* GL_RENDERBUFFER_SAMPLES */
-       575, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       572, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       587, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       582, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       585, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       593, /* GL_FRAMEBUFFER_COMPLETE */
-       598, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       612, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       607, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       602, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       608, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       604, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-       617, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-       623, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       621, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       934, /* GL_MAX_COLOR_ATTACHMENTS */
-       167, /* GL_COLOR_ATTACHMENT0 */
-       170, /* GL_COLOR_ATTACHMENT1 */
-       184, /* GL_COLOR_ATTACHMENT2 */
-       186, /* GL_COLOR_ATTACHMENT3 */
-       188, /* GL_COLOR_ATTACHMENT4 */
-       190, /* GL_COLOR_ATTACHMENT5 */
-       192, /* GL_COLOR_ATTACHMENT6 */
-       194, /* GL_COLOR_ATTACHMENT7 */
-       196, /* GL_COLOR_ATTACHMENT8 */
-       198, /* GL_COLOR_ATTACHMENT9 */
-       171, /* GL_COLOR_ATTACHMENT10 */
-       173, /* GL_COLOR_ATTACHMENT11 */
-       175, /* GL_COLOR_ATTACHMENT12 */
-       177, /* GL_COLOR_ATTACHMENT13 */
-       179, /* GL_COLOR_ATTACHMENT14 */
-       181, /* GL_COLOR_ATTACHMENT15 */
-       365, /* GL_DEPTH_ATTACHMENT */
-      1636, /* GL_STENCIL_ATTACHMENT */
-       564, /* GL_FRAMEBUFFER */
-      1433, /* GL_RENDERBUFFER */
-      1459, /* GL_RENDERBUFFER_WIDTH */
-      1446, /* GL_RENDERBUFFER_HEIGHT */
-      1449, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1667, /* GL_STENCIL_INDEX_EXT */
-      1656, /* GL_STENCIL_INDEX1 */
-      1661, /* GL_STENCIL_INDEX4 */
-      1664, /* GL_STENCIL_INDEX8 */
-      1657, /* GL_STENCIL_INDEX16 */
-      1453, /* GL_RENDERBUFFER_RED_SIZE */
-      1444, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1439, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1434, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1441, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1457, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       615, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-      1001, /* GL_MAX_SAMPLES */
-      1859, /* GL_TEXTURE_GEN_STR_OES */
-       655, /* GL_HALF_FLOAT_OES */
-      1487, /* GL_RGB565_OES */
-       571, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
-       611, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
-       610, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-       646, /* GL_GEOMETRY_SHADER_ARB */
-       647, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-       644, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-       645, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-       961, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-      1035, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-       960, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
-       957, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
-       959, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
-       785, /* GL_LOW_FLOAT */
-      1037, /* GL_MEDIUM_FLOAT */
-       656, /* GL_HIGH_FLOAT */
-       786, /* GL_LOW_INT */
-      1038, /* GL_MEDIUM_INT */
-       657, /* GL_HIGH_INT */
-      1956, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-       716, /* GL_INT_10_10_10_2_OES */
-      1564, /* GL_SHADER_BINARY_FORMATS */
-      1134, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1565, /* GL_SHADER_COMPILER */
-      1032, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-      1025, /* GL_MAX_VARYING_VECTORS */
-       956, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1407, /* GL_QUERY_WAIT_NV */
-      1402, /* GL_QUERY_NO_WAIT_NV */
-      1399, /* GL_QUERY_BY_REGION_WAIT_NV */
-      1398, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-      1912, /* GL_TRANSFORM_FEEDBACK */
-      1918, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      1914, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      1913, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1394, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-       507, /* GL_FIRST_VERTEX_CONVENTION */
-       733, /* GL_LAST_VERTEX_CONVENTION */
-      1371, /* GL_PROVOKING_VERTEX */
-       316, /* GL_COPY_READ_BUFFER */
-       317, /* GL_COPY_WRITE_BUFFER */
-      1514, /* GL_RGBA_SNORM */
-      1510, /* GL_RGBA8_SNORM */
-      1576, /* GL_SIGNED_NORMALIZED */
-      1003, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1148, /* GL_OBJECT_TYPE */
-      1688, /* GL_SYNC_CONDITION */
-      1693, /* GL_SYNC_STATUS */
-      1690, /* GL_SYNC_FLAGS */
-      1689, /* GL_SYNC_FENCE */
-      1692, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      1950, /* GL_UNSIGNALED */
-      1575, /* GL_SIGNALED */
-        46, /* GL_ALREADY_SIGNALED */
-      1907, /* GL_TIMEOUT_EXPIRED */
-       283, /* GL_CONDITION_SATISFIED */
-      2040, /* GL_WAIT_FAILED */
-       492, /* GL_EVAL_BIT */
-      1411, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       778, /* GL_LIST_BIT */
-      1788, /* GL_TEXTURE_BIT */
-      1546, /* GL_SCISSOR_BIT */
-        29, /* GL_ALL_ATTRIB_BITS */
-      1100, /* GL_MULTISAMPLE_BIT */
-        30, /* GL_ALL_CLIENT_ATTRIB_BITS */
-};
-
-typedef int (*cfunc)(const void *, const void *);
-
-/**
- * Compare a key name to an element in the \c all_enums array.
- *
- * \c bsearch always passes the key as the first parameter and the pointer
- * to the array element as the second parameter.  We can elimiate some
- * extra work by taking advantage of that fact.
- *
- * \param a  Pointer to the desired enum name.
- * \param b  Pointer to an element of the \c all_enums array.
- */
-static int compar_name( const char *a, const enum_elt *b )
-{
-   return strcmp( a, & enum_string_table[ b->offset ] );
-}
-
-/**
- * Compare a key enum value to an element in the \c all_enums array.
- *
- * \c bsearch always passes the key as the first parameter and the pointer
- * to the array element as the second parameter.  We can elimiate some
- * extra work by taking advantage of that fact.
- *
- * \param a  Pointer to the desired enum name.
- * \param b  Pointer to an index into the \c all_enums array.
- */
-static int compar_nr( const int *a, const unsigned *b )
-{
-   return a[0] - all_enums[*b].n;
-}
-
-
-static char token_tmp[20];
-
-const char *_mesa_lookup_enum_by_nr( int nr )
-{
-   unsigned * i;
-
-   i = (unsigned *) _mesa_bsearch(& nr, reduced_enums,
-                                  Elements(reduced_enums),
-                                  sizeof(reduced_enums[0]),
-                                  (cfunc) compar_nr);
-
-   if ( i != NULL ) {
-      return & enum_string_table[ all_enums[ *i ].offset ];
-   }
-   else {
-      /* this is not re-entrant safe, no big deal here */
-      _mesa_snprintf(token_tmp, sizeof(token_tmp) - 1, "0x%x", nr);
-      token_tmp[sizeof(token_tmp) - 1] = '\0';
-      return token_tmp;
-   }
-}
-
-/* Get the name of an enum given that it is a primitive type.  Avoids
- * GL_FALSE/GL_POINTS ambiguity and others.
- */
-const char *_mesa_lookup_prim_by_nr( int nr )
-{
-   switch (nr) {
-   case GL_POINTS: return "GL_POINTS";
-   case GL_LINES: return "GL_LINES";
-   case GL_LINE_STRIP: return "GL_LINE_STRIP";
-   case GL_LINE_LOOP: return "GL_LINE_LOOP";
-   case GL_TRIANGLES: return "GL_TRIANGLES";
-   case GL_TRIANGLE_STRIP: return "GL_TRIANGLE_STRIP";
-   case GL_TRIANGLE_FAN: return "GL_TRIANGLE_FAN";
-   case GL_QUADS: return "GL_QUADS";
-   case GL_QUAD_STRIP: return "GL_QUAD_STRIP";
-   case GL_POLYGON: return "GL_POLYGON";
-   case GL_POLYGON+1: return "OUTSIDE_BEGIN_END";
-   default: return "<invalid>";
-   }
-}
-
-
-
-int _mesa_lookup_enum_by_name( const char *symbol )
-{
-   enum_elt * f = NULL;
-
-   if ( symbol != NULL ) {
-      f = (enum_elt *) _mesa_bsearch(symbol, all_enums,
-                                     Elements(all_enums),
-                                     sizeof( enum_elt ),
-                                     (cfunc) compar_name);
-   }
-
-   return (f != NULL) ? f->n : -1;
-}
-
-
+/* DO NOT EDIT - This file generated automatically by gl_enums.py (from Mesa) script */

+

+/*

+ * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.

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

+ * BRIAN PAUL,

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

+ */

+

+#include "main/glheader.h"

+#include "main/mfeatures.h"

+#include "main/enums.h"

+#include "main/imports.h"

+

+typedef struct {

+   size_t offset;

+   int n;

+} enum_elt;

+

+LONGSTRING static const char enum_string_table[] = 

+   "GL_2D\0"

+   "GL_2_BYTES\0"

+   "GL_3D\0"

+   "GL_3D_COLOR\0"

+   "GL_3D_COLOR_TEXTURE\0"

+   "GL_3_BYTES\0"

+   "GL_4D_COLOR_TEXTURE\0"

+   "GL_4_BYTES\0"

+   "GL_ACCUM\0"

+   "GL_ACCUM_ALPHA_BITS\0"

+   "GL_ACCUM_BLUE_BITS\0"

+   "GL_ACCUM_BUFFER_BIT\0"

+   "GL_ACCUM_CLEAR_VALUE\0"

+   "GL_ACCUM_GREEN_BITS\0"

+   "GL_ACCUM_RED_BITS\0"

+   "GL_ACTIVE_ATTRIBUTES\0"

+   "GL_ACTIVE_ATTRIBUTE_MAX_LENGTH\0"

+   "GL_ACTIVE_PROGRAM_EXT\0"

+   "GL_ACTIVE_STENCIL_FACE_EXT\0"

+   "GL_ACTIVE_TEXTURE\0"

+   "GL_ACTIVE_TEXTURE_ARB\0"

+   "GL_ACTIVE_UNIFORMS\0"

+   "GL_ACTIVE_UNIFORM_MAX_LENGTH\0"

+   "GL_ACTIVE_VERTEX_UNITS_ARB\0"

+   "GL_ADD\0"

+   "GL_ADD_SIGNED\0"

+   "GL_ADD_SIGNED_ARB\0"

+   "GL_ADD_SIGNED_EXT\0"

+   "GL_ALIASED_LINE_WIDTH_RANGE\0"

+   "GL_ALIASED_POINT_SIZE_RANGE\0"

+   "GL_ALL_ATTRIB_BITS\0"

+   "GL_ALL_CLIENT_ATTRIB_BITS\0"

+   "GL_ALPHA\0"

+   "GL_ALPHA12\0"

+   "GL_ALPHA12_EXT\0"

+   "GL_ALPHA16\0"

+   "GL_ALPHA16I_EXT\0"

+   "GL_ALPHA16UI_EXT\0"

+   "GL_ALPHA16_EXT\0"

+   "GL_ALPHA32I_EXT\0"

+   "GL_ALPHA32UI_EXT\0"

+   "GL_ALPHA4\0"

+   "GL_ALPHA4_EXT\0"

+   "GL_ALPHA8\0"

+   "GL_ALPHA8I_EXT\0"

+   "GL_ALPHA8UI_EXT\0"

+   "GL_ALPHA8_EXT\0"

+   "GL_ALPHA_BIAS\0"

+   "GL_ALPHA_BITS\0"

+   "GL_ALPHA_INTEGER_EXT\0"

+   "GL_ALPHA_SCALE\0"

+   "GL_ALPHA_TEST\0"

+   "GL_ALPHA_TEST_FUNC\0"

+   "GL_ALPHA_TEST_REF\0"

+   "GL_ALREADY_SIGNALED\0"

+   "GL_ALWAYS\0"

+   "GL_AMBIENT\0"

+   "GL_AMBIENT_AND_DIFFUSE\0"

+   "GL_AND\0"

+   "GL_AND_INVERTED\0"

+   "GL_AND_REVERSE\0"

+   "GL_ARRAY_BUFFER\0"

+   "GL_ARRAY_BUFFER_BINDING\0"

+   "GL_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_ATTACHED_SHADERS\0"

+   "GL_ATTRIB_ARRAY_POINTER_NV\0"

+   "GL_ATTRIB_ARRAY_SIZE_NV\0"

+   "GL_ATTRIB_ARRAY_STRIDE_NV\0"

+   "GL_ATTRIB_ARRAY_TYPE_NV\0"

+   "GL_ATTRIB_STACK_DEPTH\0"

+   "GL_AUTO_NORMAL\0"

+   "GL_AUX0\0"

+   "GL_AUX1\0"

+   "GL_AUX2\0"

+   "GL_AUX3\0"

+   "GL_AUX_BUFFERS\0"

+   "GL_BACK\0"

+   "GL_BACK_LEFT\0"

+   "GL_BACK_RIGHT\0"

+   "GL_BGR\0"

+   "GL_BGRA\0"

+   "GL_BGRA_EXT\0"

+   "GL_BGRA_INTEGER\0"

+   "GL_BGRA_INTEGER_EXT\0"

+   "GL_BGR_INTEGER\0"

+   "GL_BGR_INTEGER_EXT\0"

+   "GL_BITMAP\0"

+   "GL_BITMAP_TOKEN\0"

+   "GL_BLEND\0"

+   "GL_BLEND_COLOR\0"

+   "GL_BLEND_COLOR_EXT\0"

+   "GL_BLEND_DST\0"

+   "GL_BLEND_DST_ALPHA\0"

+   "GL_BLEND_DST_ALPHA_OES\0"

+   "GL_BLEND_DST_RGB\0"

+   "GL_BLEND_DST_RGB_OES\0"

+   "GL_BLEND_EQUATION\0"

+   "GL_BLEND_EQUATION_ALPHA\0"

+   "GL_BLEND_EQUATION_ALPHA_EXT\0"

+   "GL_BLEND_EQUATION_ALPHA_OES\0"

+   "GL_BLEND_EQUATION_EXT\0"

+   "GL_BLEND_EQUATION_OES\0"

+   "GL_BLEND_EQUATION_RGB\0"

+   "GL_BLEND_EQUATION_RGB_EXT\0"

+   "GL_BLEND_EQUATION_RGB_OES\0"

+   "GL_BLEND_SRC\0"

+   "GL_BLEND_SRC_ALPHA\0"

+   "GL_BLEND_SRC_ALPHA_OES\0"

+   "GL_BLEND_SRC_RGB\0"

+   "GL_BLEND_SRC_RGB_OES\0"

+   "GL_BLUE\0"

+   "GL_BLUE_BIAS\0"

+   "GL_BLUE_BITS\0"

+   "GL_BLUE_INTEGER\0"

+   "GL_BLUE_INTEGER_EXT\0"

+   "GL_BLUE_SCALE\0"

+   "GL_BOOL\0"

+   "GL_BOOL_ARB\0"

+   "GL_BOOL_VEC2\0"

+   "GL_BOOL_VEC2_ARB\0"

+   "GL_BOOL_VEC3\0"

+   "GL_BOOL_VEC3_ARB\0"

+   "GL_BOOL_VEC4\0"

+   "GL_BOOL_VEC4_ARB\0"

+   "GL_BUFFER_ACCESS\0"

+   "GL_BUFFER_ACCESS_ARB\0"

+   "GL_BUFFER_ACCESS_FLAGS\0"

+   "GL_BUFFER_ACCESS_OES\0"

+   "GL_BUFFER_FLUSHING_UNMAP_APPLE\0"

+   "GL_BUFFER_MAPPED\0"

+   "GL_BUFFER_MAPPED_ARB\0"

+   "GL_BUFFER_MAPPED_OES\0"

+   "GL_BUFFER_MAP_LENGTH\0"

+   "GL_BUFFER_MAP_OFFSET\0"

+   "GL_BUFFER_MAP_POINTER\0"

+   "GL_BUFFER_MAP_POINTER_ARB\0"

+   "GL_BUFFER_MAP_POINTER_OES\0"

+   "GL_BUFFER_OBJECT_APPLE\0"

+   "GL_BUFFER_SERIALIZED_MODIFY_APPLE\0"

+   "GL_BUFFER_SIZE\0"

+   "GL_BUFFER_SIZE_ARB\0"

+   "GL_BUFFER_USAGE\0"

+   "GL_BUFFER_USAGE_ARB\0"

+   "GL_BUMP_ENVMAP_ATI\0"

+   "GL_BUMP_NUM_TEX_UNITS_ATI\0"

+   "GL_BUMP_ROT_MATRIX_ATI\0"

+   "GL_BUMP_ROT_MATRIX_SIZE_ATI\0"

+   "GL_BUMP_TARGET_ATI\0"

+   "GL_BUMP_TEX_UNITS_ATI\0"

+   "GL_BYTE\0"

+   "GL_C3F_V3F\0"

+   "GL_C4F_N3F_V3F\0"

+   "GL_C4UB_V2F\0"

+   "GL_C4UB_V3F\0"

+   "GL_CCW\0"

+   "GL_CLAMP\0"

+   "GL_CLAMP_READ_COLOR\0"

+   "GL_CLAMP_TO_BORDER\0"

+   "GL_CLAMP_TO_BORDER_ARB\0"

+   "GL_CLAMP_TO_BORDER_SGIS\0"

+   "GL_CLAMP_TO_EDGE\0"

+   "GL_CLAMP_TO_EDGE_SGIS\0"

+   "GL_CLEAR\0"

+   "GL_CLIENT_ACTIVE_TEXTURE\0"

+   "GL_CLIENT_ACTIVE_TEXTURE_ARB\0"

+   "GL_CLIENT_ALL_ATTRIB_BITS\0"

+   "GL_CLIENT_ATTRIB_STACK_DEPTH\0"

+   "GL_CLIENT_PIXEL_STORE_BIT\0"

+   "GL_CLIENT_VERTEX_ARRAY_BIT\0"

+   "GL_CLIP_DISTANCE0\0"

+   "GL_CLIP_DISTANCE1\0"

+   "GL_CLIP_DISTANCE2\0"

+   "GL_CLIP_DISTANCE3\0"

+   "GL_CLIP_DISTANCE4\0"

+   "GL_CLIP_DISTANCE5\0"

+   "GL_CLIP_DISTANCE6\0"

+   "GL_CLIP_DISTANCE7\0"

+   "GL_CLIP_PLANE0\0"

+   "GL_CLIP_PLANE1\0"

+   "GL_CLIP_PLANE2\0"

+   "GL_CLIP_PLANE3\0"

+   "GL_CLIP_PLANE4\0"

+   "GL_CLIP_PLANE5\0"

+   "GL_CLIP_VOLUME_CLIPPING_HINT_EXT\0"

+   "GL_COEFF\0"

+   "GL_COLOR\0"

+   "GL_COLOR_ARRAY\0"

+   "GL_COLOR_ARRAY_BUFFER_BINDING\0"

+   "GL_COLOR_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_COLOR_ARRAY_POINTER\0"

+   "GL_COLOR_ARRAY_SIZE\0"

+   "GL_COLOR_ARRAY_STRIDE\0"

+   "GL_COLOR_ARRAY_TYPE\0"

+   "GL_COLOR_ATTACHMENT0\0"

+   "GL_COLOR_ATTACHMENT0_EXT\0"

+   "GL_COLOR_ATTACHMENT0_OES\0"

+   "GL_COLOR_ATTACHMENT1\0"

+   "GL_COLOR_ATTACHMENT10\0"

+   "GL_COLOR_ATTACHMENT10_EXT\0"

+   "GL_COLOR_ATTACHMENT11\0"

+   "GL_COLOR_ATTACHMENT11_EXT\0"

+   "GL_COLOR_ATTACHMENT12\0"

+   "GL_COLOR_ATTACHMENT12_EXT\0"

+   "GL_COLOR_ATTACHMENT13\0"

+   "GL_COLOR_ATTACHMENT13_EXT\0"

+   "GL_COLOR_ATTACHMENT14\0"

+   "GL_COLOR_ATTACHMENT14_EXT\0"

+   "GL_COLOR_ATTACHMENT15\0"

+   "GL_COLOR_ATTACHMENT15_EXT\0"

+   "GL_COLOR_ATTACHMENT1_EXT\0"

+   "GL_COLOR_ATTACHMENT2\0"

+   "GL_COLOR_ATTACHMENT2_EXT\0"

+   "GL_COLOR_ATTACHMENT3\0"

+   "GL_COLOR_ATTACHMENT3_EXT\0"

+   "GL_COLOR_ATTACHMENT4\0"

+   "GL_COLOR_ATTACHMENT4_EXT\0"

+   "GL_COLOR_ATTACHMENT5\0"

+   "GL_COLOR_ATTACHMENT5_EXT\0"

+   "GL_COLOR_ATTACHMENT6\0"

+   "GL_COLOR_ATTACHMENT6_EXT\0"

+   "GL_COLOR_ATTACHMENT7\0"

+   "GL_COLOR_ATTACHMENT7_EXT\0"

+   "GL_COLOR_ATTACHMENT8\0"

+   "GL_COLOR_ATTACHMENT8_EXT\0"

+   "GL_COLOR_ATTACHMENT9\0"

+   "GL_COLOR_ATTACHMENT9_EXT\0"

+   "GL_COLOR_BUFFER_BIT\0"

+   "GL_COLOR_CLEAR_VALUE\0"

+   "GL_COLOR_INDEX\0"

+   "GL_COLOR_INDEXES\0"

+   "GL_COLOR_LOGIC_OP\0"

+   "GL_COLOR_MATERIAL\0"

+   "GL_COLOR_MATERIAL_FACE\0"

+   "GL_COLOR_MATERIAL_PARAMETER\0"

+   "GL_COLOR_MATRIX\0"

+   "GL_COLOR_MATRIX_SGI\0"

+   "GL_COLOR_MATRIX_STACK_DEPTH\0"

+   "GL_COLOR_MATRIX_STACK_DEPTH_SGI\0"

+   "GL_COLOR_SUM\0"

+   "GL_COLOR_SUM_ARB\0"

+   "GL_COLOR_TABLE\0"

+   "GL_COLOR_TABLE_ALPHA_SIZE\0"

+   "GL_COLOR_TABLE_ALPHA_SIZE_EXT\0"

+   "GL_COLOR_TABLE_ALPHA_SIZE_SGI\0"

+   "GL_COLOR_TABLE_BIAS\0"

+   "GL_COLOR_TABLE_BIAS_SGI\0"

+   "GL_COLOR_TABLE_BLUE_SIZE\0"

+   "GL_COLOR_TABLE_BLUE_SIZE_EXT\0"

+   "GL_COLOR_TABLE_BLUE_SIZE_SGI\0"

+   "GL_COLOR_TABLE_FORMAT\0"

+   "GL_COLOR_TABLE_FORMAT_EXT\0"

+   "GL_COLOR_TABLE_FORMAT_SGI\0"

+   "GL_COLOR_TABLE_GREEN_SIZE\0"

+   "GL_COLOR_TABLE_GREEN_SIZE_EXT\0"

+   "GL_COLOR_TABLE_GREEN_SIZE_SGI\0"

+   "GL_COLOR_TABLE_INTENSITY_SIZE\0"

+   "GL_COLOR_TABLE_INTENSITY_SIZE_EXT\0"

+   "GL_COLOR_TABLE_INTENSITY_SIZE_SGI\0"

+   "GL_COLOR_TABLE_LUMINANCE_SIZE\0"

+   "GL_COLOR_TABLE_LUMINANCE_SIZE_EXT\0"

+   "GL_COLOR_TABLE_LUMINANCE_SIZE_SGI\0"

+   "GL_COLOR_TABLE_RED_SIZE\0"

+   "GL_COLOR_TABLE_RED_SIZE_EXT\0"

+   "GL_COLOR_TABLE_RED_SIZE_SGI\0"

+   "GL_COLOR_TABLE_SCALE\0"

+   "GL_COLOR_TABLE_SCALE_SGI\0"

+   "GL_COLOR_TABLE_WIDTH\0"

+   "GL_COLOR_TABLE_WIDTH_EXT\0"

+   "GL_COLOR_TABLE_WIDTH_SGI\0"

+   "GL_COLOR_WRITEMASK\0"

+   "GL_COMBINE\0"

+   "GL_COMBINE4\0"

+   "GL_COMBINE_ALPHA\0"

+   "GL_COMBINE_ALPHA_ARB\0"

+   "GL_COMBINE_ALPHA_EXT\0"

+   "GL_COMBINE_ARB\0"

+   "GL_COMBINE_EXT\0"

+   "GL_COMBINE_RGB\0"

+   "GL_COMBINE_RGB_ARB\0"

+   "GL_COMBINE_RGB_EXT\0"

+   "GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT\0"

+   "GL_COMPARE_REF_TO_TEXTURE\0"

+   "GL_COMPARE_R_TO_TEXTURE\0"

+   "GL_COMPARE_R_TO_TEXTURE_ARB\0"

+   "GL_COMPILE\0"

+   "GL_COMPILE_AND_EXECUTE\0"

+   "GL_COMPILE_STATUS\0"

+   "GL_COMPRESSED_ALPHA\0"

+   "GL_COMPRESSED_ALPHA_ARB\0"

+   "GL_COMPRESSED_INTENSITY\0"

+   "GL_COMPRESSED_INTENSITY_ARB\0"

+   "GL_COMPRESSED_LUMINANCE\0"

+   "GL_COMPRESSED_LUMINANCE_ALPHA\0"

+   "GL_COMPRESSED_LUMINANCE_ALPHA_ARB\0"

+   "GL_COMPRESSED_LUMINANCE_ARB\0"

+   "GL_COMPRESSED_RED\0"

+   "GL_COMPRESSED_RG\0"

+   "GL_COMPRESSED_RGB\0"

+   "GL_COMPRESSED_RGBA\0"

+   "GL_COMPRESSED_RGBA_ARB\0"

+   "GL_COMPRESSED_RGBA_FXT1_3DFX\0"

+   "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT\0"

+   "GL_COMPRESSED_RGBA_S3TC_DXT3_EXT\0"

+   "GL_COMPRESSED_RGBA_S3TC_DXT5_EXT\0"

+   "GL_COMPRESSED_RGB_ARB\0"

+   "GL_COMPRESSED_RGB_FXT1_3DFX\0"

+   "GL_COMPRESSED_RGB_S3TC_DXT1_EXT\0"

+   "GL_COMPRESSED_SLUMINANCE\0"

+   "GL_COMPRESSED_SLUMINANCE_ALPHA\0"

+   "GL_COMPRESSED_SRGB\0"

+   "GL_COMPRESSED_SRGB_ALPHA\0"

+   "GL_COMPRESSED_TEXTURE_FORMATS\0"

+   "GL_CONDITION_SATISFIED\0"

+   "GL_CONSTANT\0"

+   "GL_CONSTANT_ALPHA\0"

+   "GL_CONSTANT_ALPHA_EXT\0"

+   "GL_CONSTANT_ARB\0"

+   "GL_CONSTANT_ATTENUATION\0"

+   "GL_CONSTANT_BORDER_HP\0"

+   "GL_CONSTANT_COLOR\0"

+   "GL_CONSTANT_COLOR_EXT\0"

+   "GL_CONSTANT_EXT\0"

+   "GL_CONTEXT_COMPATIBILITY_PROFILE_BIT\0"

+   "GL_CONTEXT_CORE_PROFILE_BIT\0"

+   "GL_CONTEXT_FLAGS\0"

+   "GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT\0"

+   "GL_CONTEXT_PROFILE_MASK\0"

+   "GL_CONVOLUTION_1D\0"

+   "GL_CONVOLUTION_2D\0"

+   "GL_CONVOLUTION_BORDER_COLOR\0"

+   "GL_CONVOLUTION_BORDER_COLOR_HP\0"

+   "GL_CONVOLUTION_BORDER_MODE\0"

+   "GL_CONVOLUTION_BORDER_MODE_EXT\0"

+   "GL_CONVOLUTION_FILTER_BIAS\0"

+   "GL_CONVOLUTION_FILTER_BIAS_EXT\0"

+   "GL_CONVOLUTION_FILTER_SCALE\0"

+   "GL_CONVOLUTION_FILTER_SCALE_EXT\0"

+   "GL_CONVOLUTION_FORMAT\0"

+   "GL_CONVOLUTION_FORMAT_EXT\0"

+   "GL_CONVOLUTION_HEIGHT\0"

+   "GL_CONVOLUTION_HEIGHT_EXT\0"

+   "GL_CONVOLUTION_WIDTH\0"

+   "GL_CONVOLUTION_WIDTH_EXT\0"

+   "GL_COORD_REPLACE\0"

+   "GL_COORD_REPLACE_ARB\0"

+   "GL_COORD_REPLACE_NV\0"

+   "GL_COORD_REPLACE_OES\0"

+   "GL_COPY\0"

+   "GL_COPY_INVERTED\0"

+   "GL_COPY_PIXEL_TOKEN\0"

+   "GL_COPY_READ_BUFFER\0"

+   "GL_COPY_WRITE_BUFFER\0"

+   "GL_CULL_FACE\0"

+   "GL_CULL_FACE_MODE\0"

+   "GL_CULL_VERTEX_EXT\0"

+   "GL_CULL_VERTEX_EYE_POSITION_EXT\0"

+   "GL_CULL_VERTEX_OBJECT_POSITION_EXT\0"

+   "GL_CURRENT_ATTRIB_NV\0"

+   "GL_CURRENT_BIT\0"

+   "GL_CURRENT_COLOR\0"

+   "GL_CURRENT_FOG_COORD\0"

+   "GL_CURRENT_FOG_COORDINATE\0"

+   "GL_CURRENT_INDEX\0"

+   "GL_CURRENT_MATRIX_ARB\0"

+   "GL_CURRENT_MATRIX_INDEX_ARB\0"

+   "GL_CURRENT_MATRIX_NV\0"

+   "GL_CURRENT_MATRIX_STACK_DEPTH_ARB\0"

+   "GL_CURRENT_MATRIX_STACK_DEPTH_NV\0"

+   "GL_CURRENT_NORMAL\0"

+   "GL_CURRENT_PALETTE_MATRIX_ARB\0"

+   "GL_CURRENT_PALETTE_MATRIX_OES\0"

+   "GL_CURRENT_PROGRAM\0"

+   "GL_CURRENT_QUERY\0"

+   "GL_CURRENT_QUERY_ARB\0"

+   "GL_CURRENT_RASTER_COLOR\0"

+   "GL_CURRENT_RASTER_DISTANCE\0"

+   "GL_CURRENT_RASTER_INDEX\0"

+   "GL_CURRENT_RASTER_POSITION\0"

+   "GL_CURRENT_RASTER_POSITION_VALID\0"

+   "GL_CURRENT_RASTER_SECONDARY_COLOR\0"

+   "GL_CURRENT_RASTER_TEXTURE_COORDS\0"

+   "GL_CURRENT_SECONDARY_COLOR\0"

+   "GL_CURRENT_TEXTURE_COORDS\0"

+   "GL_CURRENT_VERTEX_ATTRIB\0"

+   "GL_CURRENT_VERTEX_ATTRIB_ARB\0"

+   "GL_CURRENT_WEIGHT_ARB\0"

+   "GL_CW\0"

+   "GL_DEBUG_ASSERT_MESA\0"

+   "GL_DEBUG_OBJECT_MESA\0"

+   "GL_DEBUG_PRINT_MESA\0"

+   "GL_DECAL\0"

+   "GL_DECR\0"

+   "GL_DECR_WRAP\0"

+   "GL_DECR_WRAP_EXT\0"

+   "GL_DELETE_STATUS\0"

+   "GL_DEPTH\0"

+   "GL_DEPTH24_STENCIL8\0"

+   "GL_DEPTH24_STENCIL8_EXT\0"

+   "GL_DEPTH24_STENCIL8_OES\0"

+   "GL_DEPTH_ATTACHMENT\0"

+   "GL_DEPTH_ATTACHMENT_EXT\0"

+   "GL_DEPTH_ATTACHMENT_OES\0"

+   "GL_DEPTH_BIAS\0"

+   "GL_DEPTH_BITS\0"

+   "GL_DEPTH_BOUNDS_EXT\0"

+   "GL_DEPTH_BOUNDS_TEST_EXT\0"

+   "GL_DEPTH_BUFFER\0"

+   "GL_DEPTH_BUFFER_BIT\0"

+   "GL_DEPTH_CLAMP\0"

+   "GL_DEPTH_CLAMP_NV\0"

+   "GL_DEPTH_CLEAR_VALUE\0"

+   "GL_DEPTH_COMPONENT\0"

+   "GL_DEPTH_COMPONENT16\0"

+   "GL_DEPTH_COMPONENT16_ARB\0"

+   "GL_DEPTH_COMPONENT16_OES\0"

+   "GL_DEPTH_COMPONENT16_SGIX\0"

+   "GL_DEPTH_COMPONENT24\0"

+   "GL_DEPTH_COMPONENT24_ARB\0"

+   "GL_DEPTH_COMPONENT24_OES\0"

+   "GL_DEPTH_COMPONENT24_SGIX\0"

+   "GL_DEPTH_COMPONENT32\0"

+   "GL_DEPTH_COMPONENT32_ARB\0"

+   "GL_DEPTH_COMPONENT32_OES\0"

+   "GL_DEPTH_COMPONENT32_SGIX\0"

+   "GL_DEPTH_FUNC\0"

+   "GL_DEPTH_RANGE\0"

+   "GL_DEPTH_SCALE\0"

+   "GL_DEPTH_STENCIL\0"

+   "GL_DEPTH_STENCIL_ATTACHMENT\0"

+   "GL_DEPTH_STENCIL_EXT\0"

+   "GL_DEPTH_STENCIL_NV\0"

+   "GL_DEPTH_STENCIL_OES\0"

+   "GL_DEPTH_STENCIL_TO_BGRA_NV\0"

+   "GL_DEPTH_STENCIL_TO_RGBA_NV\0"

+   "GL_DEPTH_TEST\0"

+   "GL_DEPTH_TEXTURE_MODE\0"

+   "GL_DEPTH_TEXTURE_MODE_ARB\0"

+   "GL_DEPTH_WRITEMASK\0"

+   "GL_DIFFUSE\0"

+   "GL_DITHER\0"

+   "GL_DOMAIN\0"

+   "GL_DONT_CARE\0"

+   "GL_DOT3_RGB\0"

+   "GL_DOT3_RGBA\0"

+   "GL_DOT3_RGBA_ARB\0"

+   "GL_DOT3_RGBA_EXT\0"

+   "GL_DOT3_RGB_ARB\0"

+   "GL_DOT3_RGB_EXT\0"

+   "GL_DOUBLE\0"

+   "GL_DOUBLEBUFFER\0"

+   "GL_DRAW_BUFFER\0"

+   "GL_DRAW_BUFFER0\0"

+   "GL_DRAW_BUFFER0_ARB\0"

+   "GL_DRAW_BUFFER0_ATI\0"

+   "GL_DRAW_BUFFER1\0"

+   "GL_DRAW_BUFFER10\0"

+   "GL_DRAW_BUFFER10_ARB\0"

+   "GL_DRAW_BUFFER10_ATI\0"

+   "GL_DRAW_BUFFER11\0"

+   "GL_DRAW_BUFFER11_ARB\0"

+   "GL_DRAW_BUFFER11_ATI\0"

+   "GL_DRAW_BUFFER12\0"

+   "GL_DRAW_BUFFER12_ARB\0"

+   "GL_DRAW_BUFFER12_ATI\0"

+   "GL_DRAW_BUFFER13\0"

+   "GL_DRAW_BUFFER13_ARB\0"

+   "GL_DRAW_BUFFER13_ATI\0"

+   "GL_DRAW_BUFFER14\0"

+   "GL_DRAW_BUFFER14_ARB\0"

+   "GL_DRAW_BUFFER14_ATI\0"

+   "GL_DRAW_BUFFER15\0"

+   "GL_DRAW_BUFFER15_ARB\0"

+   "GL_DRAW_BUFFER15_ATI\0"

+   "GL_DRAW_BUFFER1_ARB\0"

+   "GL_DRAW_BUFFER1_ATI\0"

+   "GL_DRAW_BUFFER2\0"

+   "GL_DRAW_BUFFER2_ARB\0"

+   "GL_DRAW_BUFFER2_ATI\0"

+   "GL_DRAW_BUFFER3\0"

+   "GL_DRAW_BUFFER3_ARB\0"

+   "GL_DRAW_BUFFER3_ATI\0"

+   "GL_DRAW_BUFFER4\0"

+   "GL_DRAW_BUFFER4_ARB\0"

+   "GL_DRAW_BUFFER4_ATI\0"

+   "GL_DRAW_BUFFER5\0"

+   "GL_DRAW_BUFFER5_ARB\0"

+   "GL_DRAW_BUFFER5_ATI\0"

+   "GL_DRAW_BUFFER6\0"

+   "GL_DRAW_BUFFER6_ARB\0"

+   "GL_DRAW_BUFFER6_ATI\0"

+   "GL_DRAW_BUFFER7\0"

+   "GL_DRAW_BUFFER7_ARB\0"

+   "GL_DRAW_BUFFER7_ATI\0"

+   "GL_DRAW_BUFFER8\0"

+   "GL_DRAW_BUFFER8_ARB\0"

+   "GL_DRAW_BUFFER8_ATI\0"

+   "GL_DRAW_BUFFER9\0"

+   "GL_DRAW_BUFFER9_ARB\0"

+   "GL_DRAW_BUFFER9_ATI\0"

+   "GL_DRAW_FRAMEBUFFER\0"

+   "GL_DRAW_FRAMEBUFFER_BINDING\0"

+   "GL_DRAW_FRAMEBUFFER_BINDING_EXT\0"

+   "GL_DRAW_FRAMEBUFFER_EXT\0"

+   "GL_DRAW_PIXEL_TOKEN\0"

+   "GL_DST_ALPHA\0"

+   "GL_DST_COLOR\0"

+   "GL_DU8DV8_ATI\0"

+   "GL_DUDV_ATI\0"

+   "GL_DYNAMIC_COPY\0"

+   "GL_DYNAMIC_COPY_ARB\0"

+   "GL_DYNAMIC_DRAW\0"

+   "GL_DYNAMIC_DRAW_ARB\0"

+   "GL_DYNAMIC_READ\0"

+   "GL_DYNAMIC_READ_ARB\0"

+   "GL_EDGE_FLAG\0"

+   "GL_EDGE_FLAG_ARRAY\0"

+   "GL_EDGE_FLAG_ARRAY_BUFFER_BINDING\0"

+   "GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_EDGE_FLAG_ARRAY_POINTER\0"

+   "GL_EDGE_FLAG_ARRAY_STRIDE\0"

+   "GL_ELEMENT_ARRAY_BUFFER\0"

+   "GL_ELEMENT_ARRAY_BUFFER_BINDING\0"

+   "GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_EMISSION\0"

+   "GL_ENABLE_BIT\0"

+   "GL_EQUAL\0"

+   "GL_EQUIV\0"

+   "GL_EVAL_BIT\0"

+   "GL_EXP\0"

+   "GL_EXP2\0"

+   "GL_EXTENSIONS\0"

+   "GL_EYE_LINEAR\0"

+   "GL_EYE_PLANE\0"

+   "GL_EYE_PLANE_ABSOLUTE_NV\0"

+   "GL_EYE_RADIAL_NV\0"

+   "GL_FALSE\0"

+   "GL_FASTEST\0"

+   "GL_FEEDBACK\0"

+   "GL_FEEDBACK_BUFFER_POINTER\0"

+   "GL_FEEDBACK_BUFFER_SIZE\0"

+   "GL_FEEDBACK_BUFFER_TYPE\0"

+   "GL_FILL\0"

+   "GL_FIRST_VERTEX_CONVENTION\0"

+   "GL_FIRST_VERTEX_CONVENTION_EXT\0"

+   "GL_FIXED\0"

+   "GL_FIXED_OES\0"

+   "GL_FIXED_ONLY\0"

+   "GL_FLAT\0"

+   "GL_FLOAT\0"

+   "GL_FLOAT_MAT2\0"

+   "GL_FLOAT_MAT2_ARB\0"

+   "GL_FLOAT_MAT2x3\0"

+   "GL_FLOAT_MAT2x4\0"

+   "GL_FLOAT_MAT3\0"

+   "GL_FLOAT_MAT3_ARB\0"

+   "GL_FLOAT_MAT3x2\0"

+   "GL_FLOAT_MAT3x4\0"

+   "GL_FLOAT_MAT4\0"

+   "GL_FLOAT_MAT4_ARB\0"

+   "GL_FLOAT_MAT4x2\0"

+   "GL_FLOAT_MAT4x3\0"

+   "GL_FLOAT_VEC2\0"

+   "GL_FLOAT_VEC2_ARB\0"

+   "GL_FLOAT_VEC3\0"

+   "GL_FLOAT_VEC3_ARB\0"

+   "GL_FLOAT_VEC4\0"

+   "GL_FLOAT_VEC4_ARB\0"

+   "GL_FOG\0"

+   "GL_FOG_BIT\0"

+   "GL_FOG_COLOR\0"

+   "GL_FOG_COORD\0"

+   "GL_FOG_COORDINATE\0"

+   "GL_FOG_COORDINATE_ARRAY\0"

+   "GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING\0"

+   "GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_FOG_COORDINATE_ARRAY_POINTER\0"

+   "GL_FOG_COORDINATE_ARRAY_STRIDE\0"

+   "GL_FOG_COORDINATE_ARRAY_TYPE\0"

+   "GL_FOG_COORDINATE_SOURCE\0"

+   "GL_FOG_COORD_ARRAY\0"

+   "GL_FOG_COORD_ARRAY_BUFFER_BINDING\0"

+   "GL_FOG_COORD_ARRAY_POINTER\0"

+   "GL_FOG_COORD_ARRAY_STRIDE\0"

+   "GL_FOG_COORD_ARRAY_TYPE\0"

+   "GL_FOG_COORD_SRC\0"

+   "GL_FOG_DENSITY\0"

+   "GL_FOG_DISTANCE_MODE_NV\0"

+   "GL_FOG_END\0"

+   "GL_FOG_HINT\0"

+   "GL_FOG_INDEX\0"

+   "GL_FOG_MODE\0"

+   "GL_FOG_OFFSET_SGIX\0"

+   "GL_FOG_OFFSET_VALUE_SGIX\0"

+   "GL_FOG_START\0"

+   "GL_FRAGMENT_DEPTH\0"

+   "GL_FRAGMENT_PROGRAM_ARB\0"

+   "GL_FRAGMENT_SHADER\0"

+   "GL_FRAGMENT_SHADER_ARB\0"

+   "GL_FRAGMENT_SHADER_DERIVATIVE_HINT\0"

+   "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES\0"

+   "GL_FRAMEBUFFER\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_LAYERED\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT\0"

+   "GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES\0"

+   "GL_FRAMEBUFFER_BINDING\0"

+   "GL_FRAMEBUFFER_BINDING_EXT\0"

+   "GL_FRAMEBUFFER_BINDING_OES\0"

+   "GL_FRAMEBUFFER_COMPLETE\0"

+   "GL_FRAMEBUFFER_COMPLETE_EXT\0"

+   "GL_FRAMEBUFFER_COMPLETE_OES\0"

+   "GL_FRAMEBUFFER_DEFAULT\0"

+   "GL_FRAMEBUFFER_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT\0"

+   "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES\0"

+   "GL_FRAMEBUFFER_OES\0"

+   "GL_FRAMEBUFFER_STATUS_ERROR_EXT\0"

+   "GL_FRAMEBUFFER_UNDEFINED\0"

+   "GL_FRAMEBUFFER_UNSUPPORTED\0"

+   "GL_FRAMEBUFFER_UNSUPPORTED_EXT\0"

+   "GL_FRAMEBUFFER_UNSUPPORTED_OES\0"

+   "GL_FRONT\0"

+   "GL_FRONT_AND_BACK\0"

+   "GL_FRONT_FACE\0"

+   "GL_FRONT_LEFT\0"

+   "GL_FRONT_RIGHT\0"

+   "GL_FUNC_ADD\0"

+   "GL_FUNC_ADD_EXT\0"

+   "GL_FUNC_ADD_OES\0"

+   "GL_FUNC_REVERSE_SUBTRACT\0"

+   "GL_FUNC_REVERSE_SUBTRACT_EXT\0"

+   "GL_FUNC_REVERSE_SUBTRACT_OES\0"

+   "GL_FUNC_SUBTRACT\0"

+   "GL_FUNC_SUBTRACT_EXT\0"

+   "GL_FUNC_SUBTRACT_OES\0"

+   "GL_GENERATE_MIPMAP\0"

+   "GL_GENERATE_MIPMAP_HINT\0"

+   "GL_GENERATE_MIPMAP_HINT_SGIS\0"

+   "GL_GENERATE_MIPMAP_SGIS\0"

+   "GL_GEOMETRY_INPUT_TYPE\0"

+   "GL_GEOMETRY_INPUT_TYPE_ARB\0"

+   "GL_GEOMETRY_OUTPUT_TYPE\0"

+   "GL_GEOMETRY_OUTPUT_TYPE_ARB\0"

+   "GL_GEOMETRY_SHADER\0"

+   "GL_GEOMETRY_SHADER_ARB\0"

+   "GL_GEOMETRY_VERTICES_OUT\0"

+   "GL_GEOMETRY_VERTICES_OUT_ARB\0"

+   "GL_GEQUAL\0"

+   "GL_GREATER\0"

+   "GL_GREEN\0"

+   "GL_GREEN_BIAS\0"

+   "GL_GREEN_BITS\0"

+   "GL_GREEN_INTEGER\0"

+   "GL_GREEN_INTEGER_EXT\0"

+   "GL_GREEN_SCALE\0"

+   "GL_HALF_FLOAT\0"

+   "GL_HALF_FLOAT_OES\0"

+   "GL_HIGH_FLOAT\0"

+   "GL_HIGH_INT\0"

+   "GL_HINT_BIT\0"

+   "GL_HISTOGRAM\0"

+   "GL_HISTOGRAM_ALPHA_SIZE\0"

+   "GL_HISTOGRAM_ALPHA_SIZE_EXT\0"

+   "GL_HISTOGRAM_BLUE_SIZE\0"

+   "GL_HISTOGRAM_BLUE_SIZE_EXT\0"

+   "GL_HISTOGRAM_EXT\0"

+   "GL_HISTOGRAM_FORMAT\0"

+   "GL_HISTOGRAM_FORMAT_EXT\0"

+   "GL_HISTOGRAM_GREEN_SIZE\0"

+   "GL_HISTOGRAM_GREEN_SIZE_EXT\0"

+   "GL_HISTOGRAM_LUMINANCE_SIZE\0"

+   "GL_HISTOGRAM_LUMINANCE_SIZE_EXT\0"

+   "GL_HISTOGRAM_RED_SIZE\0"

+   "GL_HISTOGRAM_RED_SIZE_EXT\0"

+   "GL_HISTOGRAM_SINK\0"

+   "GL_HISTOGRAM_SINK_EXT\0"

+   "GL_HISTOGRAM_WIDTH\0"

+   "GL_HISTOGRAM_WIDTH_EXT\0"

+   "GL_IDENTITY_NV\0"

+   "GL_IGNORE_BORDER_HP\0"

+   "GL_IMPLEMENTATION_COLOR_READ_FORMAT\0"

+   "GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES\0"

+   "GL_IMPLEMENTATION_COLOR_READ_TYPE\0"

+   "GL_IMPLEMENTATION_COLOR_READ_TYPE_OES\0"

+   "GL_INCR\0"

+   "GL_INCR_WRAP\0"

+   "GL_INCR_WRAP_EXT\0"

+   "GL_INDEX\0"

+   "GL_INDEX_ARRAY\0"

+   "GL_INDEX_ARRAY_BUFFER_BINDING\0"

+   "GL_INDEX_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_INDEX_ARRAY_POINTER\0"

+   "GL_INDEX_ARRAY_STRIDE\0"

+   "GL_INDEX_ARRAY_TYPE\0"

+   "GL_INDEX_BITS\0"

+   "GL_INDEX_CLEAR_VALUE\0"

+   "GL_INDEX_LOGIC_OP\0"

+   "GL_INDEX_MODE\0"

+   "GL_INDEX_OFFSET\0"

+   "GL_INDEX_SHIFT\0"

+   "GL_INDEX_WRITEMASK\0"

+   "GL_INFO_LOG_LENGTH\0"

+   "GL_INT\0"

+   "GL_INTENSITY\0"

+   "GL_INTENSITY12\0"

+   "GL_INTENSITY12_EXT\0"

+   "GL_INTENSITY16\0"

+   "GL_INTENSITY16I_EXT\0"

+   "GL_INTENSITY16UI_EXT\0"

+   "GL_INTENSITY16_EXT\0"

+   "GL_INTENSITY32I_EXT\0"

+   "GL_INTENSITY32UI_EXT\0"

+   "GL_INTENSITY4\0"

+   "GL_INTENSITY4_EXT\0"

+   "GL_INTENSITY8\0"

+   "GL_INTENSITY8I_EXT\0"

+   "GL_INTENSITY8UI_EXT\0"

+   "GL_INTENSITY8_EXT\0"

+   "GL_INTENSITY_EXT\0"

+   "GL_INTERLEAVED_ATTRIBS\0"

+   "GL_INTERLEAVED_ATTRIBS_EXT\0"

+   "GL_INTERPOLATE\0"

+   "GL_INTERPOLATE_ARB\0"

+   "GL_INTERPOLATE_EXT\0"

+   "GL_INT_10_10_10_2_OES\0"

+   "GL_INT_SAMPLER_1D\0"

+   "GL_INT_SAMPLER_1D_ARRAY\0"

+   "GL_INT_SAMPLER_1D_ARRAY_EXT\0"

+   "GL_INT_SAMPLER_1D_EXT\0"

+   "GL_INT_SAMPLER_2D\0"

+   "GL_INT_SAMPLER_2D_ARRAY\0"

+   "GL_INT_SAMPLER_2D_ARRAY_EXT\0"

+   "GL_INT_SAMPLER_2D_EXT\0"

+   "GL_INT_SAMPLER_2D_RECT\0"

+   "GL_INT_SAMPLER_2D_RECT_EXT\0"

+   "GL_INT_SAMPLER_3D\0"

+   "GL_INT_SAMPLER_3D_EXT\0"

+   "GL_INT_SAMPLER_BUFFER\0"

+   "GL_INT_SAMPLER_BUFFER_EXT\0"

+   "GL_INT_SAMPLER_CUBE\0"

+   "GL_INT_SAMPLER_CUBE_EXT\0"

+   "GL_INT_VEC2\0"

+   "GL_INT_VEC2_ARB\0"

+   "GL_INT_VEC3\0"

+   "GL_INT_VEC3_ARB\0"

+   "GL_INT_VEC4\0"

+   "GL_INT_VEC4_ARB\0"

+   "GL_INVALID_ENUM\0"

+   "GL_INVALID_FRAMEBUFFER_OPERATION\0"

+   "GL_INVALID_FRAMEBUFFER_OPERATION_EXT\0"

+   "GL_INVALID_FRAMEBUFFER_OPERATION_OES\0"

+   "GL_INVALID_OPERATION\0"

+   "GL_INVALID_VALUE\0"

+   "GL_INVERSE_NV\0"

+   "GL_INVERSE_TRANSPOSE_NV\0"

+   "GL_INVERT\0"

+   "GL_KEEP\0"

+   "GL_LAST_VERTEX_CONVENTION\0"

+   "GL_LAST_VERTEX_CONVENTION_EXT\0"

+   "GL_LEFT\0"

+   "GL_LEQUAL\0"

+   "GL_LESS\0"

+   "GL_LIGHT0\0"

+   "GL_LIGHT1\0"

+   "GL_LIGHT2\0"

+   "GL_LIGHT3\0"

+   "GL_LIGHT4\0"

+   "GL_LIGHT5\0"

+   "GL_LIGHT6\0"

+   "GL_LIGHT7\0"

+   "GL_LIGHTING\0"

+   "GL_LIGHTING_BIT\0"

+   "GL_LIGHT_MODEL_AMBIENT\0"

+   "GL_LIGHT_MODEL_COLOR_CONTROL\0"

+   "GL_LIGHT_MODEL_COLOR_CONTROL_EXT\0"

+   "GL_LIGHT_MODEL_LOCAL_VIEWER\0"

+   "GL_LIGHT_MODEL_TWO_SIDE\0"

+   "GL_LINE\0"

+   "GL_LINEAR\0"

+   "GL_LINEAR_ATTENUATION\0"

+   "GL_LINEAR_CLIPMAP_LINEAR_SGIX\0"

+   "GL_LINEAR_CLIPMAP_NEAREST_SGIX\0"

+   "GL_LINEAR_MIPMAP_LINEAR\0"

+   "GL_LINEAR_MIPMAP_NEAREST\0"

+   "GL_LINES\0"

+   "GL_LINES_ADJACENCY\0"

+   "GL_LINES_ADJACENCY_ARB\0"

+   "GL_LINE_BIT\0"

+   "GL_LINE_LOOP\0"

+   "GL_LINE_RESET_TOKEN\0"

+   "GL_LINE_SMOOTH\0"

+   "GL_LINE_SMOOTH_HINT\0"

+   "GL_LINE_STIPPLE\0"

+   "GL_LINE_STIPPLE_PATTERN\0"

+   "GL_LINE_STIPPLE_REPEAT\0"

+   "GL_LINE_STRIP\0"

+   "GL_LINE_STRIP_ADJACENCY\0"

+   "GL_LINE_STRIP_ADJACENCY_ARB\0"

+   "GL_LINE_TOKEN\0"

+   "GL_LINE_WIDTH\0"

+   "GL_LINE_WIDTH_GRANULARITY\0"

+   "GL_LINE_WIDTH_RANGE\0"

+   "GL_LINK_STATUS\0"

+   "GL_LIST_BASE\0"

+   "GL_LIST_BIT\0"

+   "GL_LIST_INDEX\0"

+   "GL_LIST_MODE\0"

+   "GL_LOAD\0"

+   "GL_LOGIC_OP\0"

+   "GL_LOGIC_OP_MODE\0"

+   "GL_LOWER_LEFT\0"

+   "GL_LOW_FLOAT\0"

+   "GL_LOW_INT\0"

+   "GL_LUMINANCE\0"

+   "GL_LUMINANCE12\0"

+   "GL_LUMINANCE12_ALPHA12\0"

+   "GL_LUMINANCE12_ALPHA12_EXT\0"

+   "GL_LUMINANCE12_ALPHA4\0"

+   "GL_LUMINANCE12_ALPHA4_EXT\0"

+   "GL_LUMINANCE12_EXT\0"

+   "GL_LUMINANCE16\0"

+   "GL_LUMINANCE16I_EXT\0"

+   "GL_LUMINANCE16UI_EXT\0"

+   "GL_LUMINANCE16_ALPHA16\0"

+   "GL_LUMINANCE16_ALPHA16_EXT\0"

+   "GL_LUMINANCE16_EXT\0"

+   "GL_LUMINANCE32I_EXT\0"

+   "GL_LUMINANCE32UI_EXT\0"

+   "GL_LUMINANCE4\0"

+   "GL_LUMINANCE4_ALPHA4\0"

+   "GL_LUMINANCE4_ALPHA4_EXT\0"

+   "GL_LUMINANCE4_EXT\0"

+   "GL_LUMINANCE6_ALPHA2\0"

+   "GL_LUMINANCE6_ALPHA2_EXT\0"

+   "GL_LUMINANCE8\0"

+   "GL_LUMINANCE8I_EXT\0"

+   "GL_LUMINANCE8UI_EXT\0"

+   "GL_LUMINANCE8_ALPHA8\0"

+   "GL_LUMINANCE8_ALPHA8_EXT\0"

+   "GL_LUMINANCE8_EXT\0"

+   "GL_LUMINANCE_ALPHA\0"

+   "GL_LUMINANCE_ALPHA16I_EXT\0"

+   "GL_LUMINANCE_ALPHA16UI_EXT\0"

+   "GL_LUMINANCE_ALPHA32I_EXT\0"

+   "GL_LUMINANCE_ALPHA32UI_EXT\0"

+   "GL_LUMINANCE_ALPHA8I_EXT\0"

+   "GL_LUMINANCE_ALPHA8UI_EXT\0"

+   "GL_LUMINANCE_ALPHA_INTEGER_EXT\0"

+   "GL_LUMINANCE_INTEGER_EXT\0"

+   "GL_MAJOR_VERSION\0"

+   "GL_MAP1_COLOR_4\0"

+   "GL_MAP1_GRID_DOMAIN\0"

+   "GL_MAP1_GRID_SEGMENTS\0"

+   "GL_MAP1_INDEX\0"

+   "GL_MAP1_NORMAL\0"

+   "GL_MAP1_TEXTURE_COORD_1\0"

+   "GL_MAP1_TEXTURE_COORD_2\0"

+   "GL_MAP1_TEXTURE_COORD_3\0"

+   "GL_MAP1_TEXTURE_COORD_4\0"

+   "GL_MAP1_VERTEX_3\0"

+   "GL_MAP1_VERTEX_4\0"

+   "GL_MAP1_VERTEX_ATTRIB0_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB10_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB11_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB12_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB13_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB14_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB15_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB1_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB2_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB3_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB4_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB5_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB6_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB7_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB8_4_NV\0"

+   "GL_MAP1_VERTEX_ATTRIB9_4_NV\0"

+   "GL_MAP2_COLOR_4\0"

+   "GL_MAP2_GRID_DOMAIN\0"

+   "GL_MAP2_GRID_SEGMENTS\0"

+   "GL_MAP2_INDEX\0"

+   "GL_MAP2_NORMAL\0"

+   "GL_MAP2_TEXTURE_COORD_1\0"

+   "GL_MAP2_TEXTURE_COORD_2\0"

+   "GL_MAP2_TEXTURE_COORD_3\0"

+   "GL_MAP2_TEXTURE_COORD_4\0"

+   "GL_MAP2_VERTEX_3\0"

+   "GL_MAP2_VERTEX_4\0"

+   "GL_MAP2_VERTEX_ATTRIB0_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB10_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB11_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB12_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB13_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB14_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB15_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB1_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB2_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB3_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB4_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB5_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB6_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB7_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB8_4_NV\0"

+   "GL_MAP2_VERTEX_ATTRIB9_4_NV\0"

+   "GL_MAP_COLOR\0"

+   "GL_MAP_FLUSH_EXPLICIT_BIT\0"

+   "GL_MAP_INVALIDATE_BUFFER_BIT\0"

+   "GL_MAP_INVALIDATE_RANGE_BIT\0"

+   "GL_MAP_READ_BIT\0"

+   "GL_MAP_STENCIL\0"

+   "GL_MAP_UNSYNCHRONIZED_BIT\0"

+   "GL_MAP_WRITE_BIT\0"

+   "GL_MATRIX0_ARB\0"

+   "GL_MATRIX0_NV\0"

+   "GL_MATRIX10_ARB\0"

+   "GL_MATRIX11_ARB\0"

+   "GL_MATRIX12_ARB\0"

+   "GL_MATRIX13_ARB\0"

+   "GL_MATRIX14_ARB\0"

+   "GL_MATRIX15_ARB\0"

+   "GL_MATRIX16_ARB\0"

+   "GL_MATRIX17_ARB\0"

+   "GL_MATRIX18_ARB\0"

+   "GL_MATRIX19_ARB\0"

+   "GL_MATRIX1_ARB\0"

+   "GL_MATRIX1_NV\0"

+   "GL_MATRIX20_ARB\0"

+   "GL_MATRIX21_ARB\0"

+   "GL_MATRIX22_ARB\0"

+   "GL_MATRIX23_ARB\0"

+   "GL_MATRIX24_ARB\0"

+   "GL_MATRIX25_ARB\0"

+   "GL_MATRIX26_ARB\0"

+   "GL_MATRIX27_ARB\0"

+   "GL_MATRIX28_ARB\0"

+   "GL_MATRIX29_ARB\0"

+   "GL_MATRIX2_ARB\0"

+   "GL_MATRIX2_NV\0"

+   "GL_MATRIX30_ARB\0"

+   "GL_MATRIX31_ARB\0"

+   "GL_MATRIX3_ARB\0"

+   "GL_MATRIX3_NV\0"

+   "GL_MATRIX4_ARB\0"

+   "GL_MATRIX4_NV\0"

+   "GL_MATRIX5_ARB\0"

+   "GL_MATRIX5_NV\0"

+   "GL_MATRIX6_ARB\0"

+   "GL_MATRIX6_NV\0"

+   "GL_MATRIX7_ARB\0"

+   "GL_MATRIX7_NV\0"

+   "GL_MATRIX8_ARB\0"

+   "GL_MATRIX9_ARB\0"

+   "GL_MATRIX_INDEX_ARRAY_ARB\0"

+   "GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES\0"

+   "GL_MATRIX_INDEX_ARRAY_OES\0"

+   "GL_MATRIX_INDEX_ARRAY_POINTER_ARB\0"

+   "GL_MATRIX_INDEX_ARRAY_POINTER_OES\0"

+   "GL_MATRIX_INDEX_ARRAY_SIZE_ARB\0"

+   "GL_MATRIX_INDEX_ARRAY_SIZE_OES\0"

+   "GL_MATRIX_INDEX_ARRAY_STRIDE_ARB\0"

+   "GL_MATRIX_INDEX_ARRAY_STRIDE_OES\0"

+   "GL_MATRIX_INDEX_ARRAY_TYPE_ARB\0"

+   "GL_MATRIX_INDEX_ARRAY_TYPE_OES\0"

+   "GL_MATRIX_MODE\0"

+   "GL_MATRIX_PALETTE_ARB\0"

+   "GL_MATRIX_PALETTE_OES\0"

+   "GL_MAX\0"

+   "GL_MAX_3D_TEXTURE_SIZE\0"

+   "GL_MAX_3D_TEXTURE_SIZE_OES\0"

+   "GL_MAX_ARRAY_TEXTURE_LAYERS\0"

+   "GL_MAX_ARRAY_TEXTURE_LAYERS_EXT\0"

+   "GL_MAX_ATTRIB_STACK_DEPTH\0"

+   "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH\0"

+   "GL_MAX_CLIPMAP_DEPTH_SGIX\0"

+   "GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX\0"

+   "GL_MAX_CLIP_DISTANCES\0"

+   "GL_MAX_CLIP_PLANES\0"

+   "GL_MAX_COLOR_ATTACHMENTS\0"

+   "GL_MAX_COLOR_ATTACHMENTS_EXT\0"

+   "GL_MAX_COLOR_MATRIX_STACK_DEPTH\0"

+   "GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI\0"

+   "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS\0"

+   "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB\0"

+   "GL_MAX_CONVOLUTION_HEIGHT\0"

+   "GL_MAX_CONVOLUTION_HEIGHT_EXT\0"

+   "GL_MAX_CONVOLUTION_WIDTH\0"

+   "GL_MAX_CONVOLUTION_WIDTH_EXT\0"

+   "GL_MAX_CUBE_MAP_TEXTURE_SIZE\0"

+   "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB\0"

+   "GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES\0"

+   "GL_MAX_DRAW_BUFFERS\0"

+   "GL_MAX_DRAW_BUFFERS_ARB\0"

+   "GL_MAX_DRAW_BUFFERS_ATI\0"

+   "GL_MAX_ELEMENTS_INDICES\0"

+   "GL_MAX_ELEMENTS_VERTICES\0"

+   "GL_MAX_EVAL_ORDER\0"

+   "GL_MAX_EXT\0"

+   "GL_MAX_FRAGMENT_INPUT_COMPONENTS\0"

+   "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS\0"

+   "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB\0"

+   "GL_MAX_FRAGMENT_UNIFORM_VECTORS\0"

+   "GL_MAX_GEOMETRY_INPUT_COMPONENTS\0"

+   "GL_MAX_GEOMETRY_OUTPUT_COMPONENTS\0"

+   "GL_MAX_GEOMETRY_OUTPUT_VERTICES\0"

+   "GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB\0"

+   "GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS\0"

+   "GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB\0"

+   "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS\0"

+   "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB\0"

+   "GL_MAX_GEOMETRY_UNIFORM_COMPONENTS\0"

+   "GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB\0"

+   "GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB\0"

+   "GL_MAX_LIGHTS\0"

+   "GL_MAX_LIST_NESTING\0"

+   "GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB\0"

+   "GL_MAX_MODELVIEW_STACK_DEPTH\0"

+   "GL_MAX_NAME_STACK_DEPTH\0"

+   "GL_MAX_PALETTE_MATRICES_ARB\0"

+   "GL_MAX_PALETTE_MATRICES_OES\0"

+   "GL_MAX_PIXEL_MAP_TABLE\0"

+   "GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB\0"

+   "GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB\0"

+   "GL_MAX_PROGRAM_ATTRIBS_ARB\0"

+   "GL_MAX_PROGRAM_CALL_DEPTH_NV\0"

+   "GL_MAX_PROGRAM_ENV_PARAMETERS_ARB\0"

+   "GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV\0"

+   "GL_MAX_PROGRAM_IF_DEPTH_NV\0"

+   "GL_MAX_PROGRAM_INSTRUCTIONS_ARB\0"

+   "GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB\0"

+   "GL_MAX_PROGRAM_LOOP_COUNT_NV\0"

+   "GL_MAX_PROGRAM_LOOP_DEPTH_NV\0"

+   "GL_MAX_PROGRAM_MATRICES_ARB\0"

+   "GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB\0"

+   "GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB\0"

+   "GL_MAX_PROGRAM_PARAMETERS_ARB\0"

+   "GL_MAX_PROGRAM_TEMPORARIES_ARB\0"

+   "GL_MAX_PROGRAM_TEXEL_OFFSET\0"

+   "GL_MAX_PROGRAM_TEXEL_OFFSET_EXT\0"

+   "GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB\0"

+   "GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB\0"

+   "GL_MAX_PROJECTION_STACK_DEPTH\0"

+   "GL_MAX_RECTANGLE_TEXTURE_SIZE\0"

+   "GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB\0"

+   "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV\0"

+   "GL_MAX_RENDERBUFFER_SIZE\0"

+   "GL_MAX_RENDERBUFFER_SIZE_EXT\0"

+   "GL_MAX_RENDERBUFFER_SIZE_OES\0"

+   "GL_MAX_SAMPLES\0"

+   "GL_MAX_SAMPLES_EXT\0"

+   "GL_MAX_SERVER_WAIT_TIMEOUT\0"

+   "GL_MAX_SHININESS_NV\0"

+   "GL_MAX_SPOT_EXPONENT_NV\0"

+   "GL_MAX_TEXTURE_BUFFER_SIZE\0"

+   "GL_MAX_TEXTURE_COORDS\0"

+   "GL_MAX_TEXTURE_COORDS_ARB\0"

+   "GL_MAX_TEXTURE_IMAGE_UNITS\0"

+   "GL_MAX_TEXTURE_IMAGE_UNITS_ARB\0"

+   "GL_MAX_TEXTURE_LOD_BIAS\0"

+   "GL_MAX_TEXTURE_LOD_BIAS_EXT\0"

+   "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT\0"

+   "GL_MAX_TEXTURE_SIZE\0"

+   "GL_MAX_TEXTURE_STACK_DEPTH\0"

+   "GL_MAX_TEXTURE_UNITS\0"

+   "GL_MAX_TEXTURE_UNITS_ARB\0"

+   "GL_MAX_TRACK_MATRICES_NV\0"

+   "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV\0"

+   "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS\0"

+   "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT\0"

+   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS\0"

+   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT\0"

+   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS\0"

+   "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT\0"

+   "GL_MAX_VARYING_COMPONENTS\0"

+   "GL_MAX_VARYING_FLOATS\0"

+   "GL_MAX_VARYING_FLOATS_ARB\0"

+   "GL_MAX_VARYING_VECTORS\0"

+   "GL_MAX_VERTEX_ATTRIBS\0"

+   "GL_MAX_VERTEX_ATTRIBS_ARB\0"

+   "GL_MAX_VERTEX_OUTPUT_COMPONENTS\0"

+   "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS\0"

+   "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB\0"

+   "GL_MAX_VERTEX_UNIFORM_COMPONENTS\0"

+   "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB\0"

+   "GL_MAX_VERTEX_UNIFORM_VECTORS\0"

+   "GL_MAX_VERTEX_UNITS_ARB\0"

+   "GL_MAX_VERTEX_UNITS_OES\0"

+   "GL_MAX_VERTEX_VARYING_COMPONENTS_ARB\0"

+   "GL_MAX_VIEWPORT_DIMS\0"

+   "GL_MEDIUM_FLOAT\0"

+   "GL_MEDIUM_INT\0"

+   "GL_MIN\0"

+   "GL_MINMAX\0"

+   "GL_MINMAX_EXT\0"

+   "GL_MINMAX_FORMAT\0"

+   "GL_MINMAX_FORMAT_EXT\0"

+   "GL_MINMAX_SINK\0"

+   "GL_MINMAX_SINK_EXT\0"

+   "GL_MINOR_VERSION\0"

+   "GL_MIN_EXT\0"

+   "GL_MIN_PROGRAM_TEXEL_OFFSET\0"

+   "GL_MIN_PROGRAM_TEXEL_OFFSET_EXT\0"

+   "GL_MIRRORED_REPEAT\0"

+   "GL_MIRRORED_REPEAT_ARB\0"

+   "GL_MIRRORED_REPEAT_IBM\0"

+   "GL_MIRROR_CLAMP_ATI\0"

+   "GL_MIRROR_CLAMP_EXT\0"

+   "GL_MIRROR_CLAMP_TO_BORDER_EXT\0"

+   "GL_MIRROR_CLAMP_TO_EDGE_ATI\0"

+   "GL_MIRROR_CLAMP_TO_EDGE_EXT\0"

+   "GL_MODELVIEW\0"

+   "GL_MODELVIEW0_ARB\0"

+   "GL_MODELVIEW10_ARB\0"

+   "GL_MODELVIEW11_ARB\0"

+   "GL_MODELVIEW12_ARB\0"

+   "GL_MODELVIEW13_ARB\0"

+   "GL_MODELVIEW14_ARB\0"

+   "GL_MODELVIEW15_ARB\0"

+   "GL_MODELVIEW16_ARB\0"

+   "GL_MODELVIEW17_ARB\0"

+   "GL_MODELVIEW18_ARB\0"

+   "GL_MODELVIEW19_ARB\0"

+   "GL_MODELVIEW1_ARB\0"

+   "GL_MODELVIEW20_ARB\0"

+   "GL_MODELVIEW21_ARB\0"

+   "GL_MODELVIEW22_ARB\0"

+   "GL_MODELVIEW23_ARB\0"

+   "GL_MODELVIEW24_ARB\0"

+   "GL_MODELVIEW25_ARB\0"

+   "GL_MODELVIEW26_ARB\0"

+   "GL_MODELVIEW27_ARB\0"

+   "GL_MODELVIEW28_ARB\0"

+   "GL_MODELVIEW29_ARB\0"

+   "GL_MODELVIEW2_ARB\0"

+   "GL_MODELVIEW30_ARB\0"

+   "GL_MODELVIEW31_ARB\0"

+   "GL_MODELVIEW3_ARB\0"

+   "GL_MODELVIEW4_ARB\0"

+   "GL_MODELVIEW5_ARB\0"

+   "GL_MODELVIEW6_ARB\0"

+   "GL_MODELVIEW7_ARB\0"

+   "GL_MODELVIEW8_ARB\0"

+   "GL_MODELVIEW9_ARB\0"

+   "GL_MODELVIEW_MATRIX\0"

+   "GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES\0"

+   "GL_MODELVIEW_PROJECTION_NV\0"

+   "GL_MODELVIEW_STACK_DEPTH\0"

+   "GL_MODULATE\0"

+   "GL_MODULATE_ADD_ATI\0"

+   "GL_MODULATE_SIGNED_ADD_ATI\0"

+   "GL_MODULATE_SUBTRACT_ATI\0"

+   "GL_MULT\0"

+   "GL_MULTISAMPLE\0"

+   "GL_MULTISAMPLE_3DFX\0"

+   "GL_MULTISAMPLE_ARB\0"

+   "GL_MULTISAMPLE_BIT\0"

+   "GL_MULTISAMPLE_BIT_3DFX\0"

+   "GL_MULTISAMPLE_BIT_ARB\0"

+   "GL_MULTISAMPLE_FILTER_HINT_NV\0"

+   "GL_N3F_V3F\0"

+   "GL_NAME_STACK_DEPTH\0"

+   "GL_NAND\0"

+   "GL_NEAREST\0"

+   "GL_NEAREST_CLIPMAP_LINEAR_SGIX\0"

+   "GL_NEAREST_CLIPMAP_NEAREST_SGIX\0"

+   "GL_NEAREST_MIPMAP_LINEAR\0"

+   "GL_NEAREST_MIPMAP_NEAREST\0"

+   "GL_NEVER\0"

+   "GL_NICEST\0"

+   "GL_NONE\0"

+   "GL_NONE_OES\0"

+   "GL_NOOP\0"

+   "GL_NOR\0"

+   "GL_NORMALIZE\0"

+   "GL_NORMAL_ARRAY\0"

+   "GL_NORMAL_ARRAY_BUFFER_BINDING\0"

+   "GL_NORMAL_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_NORMAL_ARRAY_POINTER\0"

+   "GL_NORMAL_ARRAY_STRIDE\0"

+   "GL_NORMAL_ARRAY_TYPE\0"

+   "GL_NORMAL_MAP\0"

+   "GL_NORMAL_MAP_ARB\0"

+   "GL_NORMAL_MAP_NV\0"

+   "GL_NORMAL_MAP_OES\0"

+   "GL_NOTEQUAL\0"

+   "GL_NO_ERROR\0"

+   "GL_NUM_COMPRESSED_TEXTURE_FORMATS\0"

+   "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB\0"

+   "GL_NUM_EXTENSIONS\0"

+   "GL_NUM_PROGRAM_BINARY_FORMATS_OES\0"

+   "GL_NUM_SHADER_BINARY_FORMATS\0"

+   "GL_OBJECT_ACTIVE_ATTRIBUTES_ARB\0"

+   "GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB\0"

+   "GL_OBJECT_ACTIVE_UNIFORMS_ARB\0"

+   "GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB\0"

+   "GL_OBJECT_ATTACHED_OBJECTS_ARB\0"

+   "GL_OBJECT_COMPILE_STATUS_ARB\0"

+   "GL_OBJECT_DELETE_STATUS_ARB\0"

+   "GL_OBJECT_INFO_LOG_LENGTH_ARB\0"

+   "GL_OBJECT_LINEAR\0"

+   "GL_OBJECT_LINK_STATUS_ARB\0"

+   "GL_OBJECT_PLANE\0"

+   "GL_OBJECT_SHADER_SOURCE_LENGTH_ARB\0"

+   "GL_OBJECT_SUBTYPE_ARB\0"

+   "GL_OBJECT_TYPE\0"

+   "GL_OBJECT_TYPE_ARB\0"

+   "GL_OBJECT_VALIDATE_STATUS_ARB\0"

+   "GL_OCCLUSION_TEST_HP\0"

+   "GL_OCCLUSION_TEST_RESULT_HP\0"

+   "GL_ONE\0"

+   "GL_ONE_MINUS_CONSTANT_ALPHA\0"

+   "GL_ONE_MINUS_CONSTANT_ALPHA_EXT\0"

+   "GL_ONE_MINUS_CONSTANT_COLOR\0"

+   "GL_ONE_MINUS_CONSTANT_COLOR_EXT\0"

+   "GL_ONE_MINUS_DST_ALPHA\0"

+   "GL_ONE_MINUS_DST_COLOR\0"

+   "GL_ONE_MINUS_SRC_ALPHA\0"

+   "GL_ONE_MINUS_SRC_COLOR\0"

+   "GL_OPERAND0_ALPHA\0"

+   "GL_OPERAND0_ALPHA_ARB\0"

+   "GL_OPERAND0_ALPHA_EXT\0"

+   "GL_OPERAND0_RGB\0"

+   "GL_OPERAND0_RGB_ARB\0"

+   "GL_OPERAND0_RGB_EXT\0"

+   "GL_OPERAND1_ALPHA\0"

+   "GL_OPERAND1_ALPHA_ARB\0"

+   "GL_OPERAND1_ALPHA_EXT\0"

+   "GL_OPERAND1_RGB\0"

+   "GL_OPERAND1_RGB_ARB\0"

+   "GL_OPERAND1_RGB_EXT\0"

+   "GL_OPERAND2_ALPHA\0"

+   "GL_OPERAND2_ALPHA_ARB\0"

+   "GL_OPERAND2_ALPHA_EXT\0"

+   "GL_OPERAND2_RGB\0"

+   "GL_OPERAND2_RGB_ARB\0"

+   "GL_OPERAND2_RGB_EXT\0"

+   "GL_OPERAND3_ALPHA_NV\0"

+   "GL_OPERAND3_RGB_NV\0"

+   "GL_OR\0"

+   "GL_ORDER\0"

+   "GL_OR_INVERTED\0"

+   "GL_OR_REVERSE\0"

+   "GL_OUT_OF_MEMORY\0"

+   "GL_PACK_ALIGNMENT\0"

+   "GL_PACK_IMAGE_HEIGHT\0"

+   "GL_PACK_INVERT_MESA\0"

+   "GL_PACK_LSB_FIRST\0"

+   "GL_PACK_ROW_LENGTH\0"

+   "GL_PACK_SKIP_IMAGES\0"

+   "GL_PACK_SKIP_PIXELS\0"

+   "GL_PACK_SKIP_ROWS\0"

+   "GL_PACK_SWAP_BYTES\0"

+   "GL_PALETTE4_R5_G6_B5_OES\0"

+   "GL_PALETTE4_RGB5_A1_OES\0"

+   "GL_PALETTE4_RGB8_OES\0"

+   "GL_PALETTE4_RGBA4_OES\0"

+   "GL_PALETTE4_RGBA8_OES\0"

+   "GL_PALETTE8_R5_G6_B5_OES\0"

+   "GL_PALETTE8_RGB5_A1_OES\0"

+   "GL_PALETTE8_RGB8_OES\0"

+   "GL_PALETTE8_RGBA4_OES\0"

+   "GL_PALETTE8_RGBA8_OES\0"

+   "GL_PASS_THROUGH_TOKEN\0"

+   "GL_PERSPECTIVE_CORRECTION_HINT\0"

+   "GL_PIXEL_MAP_A_TO_A\0"

+   "GL_PIXEL_MAP_A_TO_A_SIZE\0"

+   "GL_PIXEL_MAP_B_TO_B\0"

+   "GL_PIXEL_MAP_B_TO_B_SIZE\0"

+   "GL_PIXEL_MAP_G_TO_G\0"

+   "GL_PIXEL_MAP_G_TO_G_SIZE\0"

+   "GL_PIXEL_MAP_I_TO_A\0"

+   "GL_PIXEL_MAP_I_TO_A_SIZE\0"

+   "GL_PIXEL_MAP_I_TO_B\0"

+   "GL_PIXEL_MAP_I_TO_B_SIZE\0"

+   "GL_PIXEL_MAP_I_TO_G\0"

+   "GL_PIXEL_MAP_I_TO_G_SIZE\0"

+   "GL_PIXEL_MAP_I_TO_I\0"

+   "GL_PIXEL_MAP_I_TO_I_SIZE\0"

+   "GL_PIXEL_MAP_I_TO_R\0"

+   "GL_PIXEL_MAP_I_TO_R_SIZE\0"

+   "GL_PIXEL_MAP_R_TO_R\0"

+   "GL_PIXEL_MAP_R_TO_R_SIZE\0"

+   "GL_PIXEL_MAP_S_TO_S\0"

+   "GL_PIXEL_MAP_S_TO_S_SIZE\0"

+   "GL_PIXEL_MODE_BIT\0"

+   "GL_PIXEL_PACK_BUFFER\0"

+   "GL_PIXEL_PACK_BUFFER_BINDING\0"

+   "GL_PIXEL_PACK_BUFFER_BINDING_EXT\0"

+   "GL_PIXEL_PACK_BUFFER_EXT\0"

+   "GL_PIXEL_UNPACK_BUFFER\0"

+   "GL_PIXEL_UNPACK_BUFFER_BINDING\0"

+   "GL_PIXEL_UNPACK_BUFFER_BINDING_EXT\0"

+   "GL_PIXEL_UNPACK_BUFFER_EXT\0"

+   "GL_POINT\0"

+   "GL_POINTS\0"

+   "GL_POINT_BIT\0"

+   "GL_POINT_DISTANCE_ATTENUATION\0"

+   "GL_POINT_DISTANCE_ATTENUATION_ARB\0"

+   "GL_POINT_DISTANCE_ATTENUATION_EXT\0"

+   "GL_POINT_DISTANCE_ATTENUATION_SGIS\0"

+   "GL_POINT_FADE_THRESHOLD_SIZE\0"

+   "GL_POINT_FADE_THRESHOLD_SIZE_ARB\0"

+   "GL_POINT_FADE_THRESHOLD_SIZE_EXT\0"

+   "GL_POINT_FADE_THRESHOLD_SIZE_SGIS\0"

+   "GL_POINT_SIZE\0"

+   "GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES\0"

+   "GL_POINT_SIZE_ARRAY_OES\0"

+   "GL_POINT_SIZE_ARRAY_POINTER_OES\0"

+   "GL_POINT_SIZE_ARRAY_STRIDE_OES\0"

+   "GL_POINT_SIZE_ARRAY_TYPE_OES\0"

+   "GL_POINT_SIZE_GRANULARITY\0"

+   "GL_POINT_SIZE_MAX\0"

+   "GL_POINT_SIZE_MAX_ARB\0"

+   "GL_POINT_SIZE_MAX_EXT\0"

+   "GL_POINT_SIZE_MAX_SGIS\0"

+   "GL_POINT_SIZE_MIN\0"

+   "GL_POINT_SIZE_MIN_ARB\0"

+   "GL_POINT_SIZE_MIN_EXT\0"

+   "GL_POINT_SIZE_MIN_SGIS\0"

+   "GL_POINT_SIZE_RANGE\0"

+   "GL_POINT_SMOOTH\0"

+   "GL_POINT_SMOOTH_HINT\0"

+   "GL_POINT_SPRITE\0"

+   "GL_POINT_SPRITE_ARB\0"

+   "GL_POINT_SPRITE_COORD_ORIGIN\0"

+   "GL_POINT_SPRITE_NV\0"

+   "GL_POINT_SPRITE_OES\0"

+   "GL_POINT_SPRITE_R_MODE_NV\0"

+   "GL_POINT_TOKEN\0"

+   "GL_POLYGON\0"

+   "GL_POLYGON_BIT\0"

+   "GL_POLYGON_MODE\0"

+   "GL_POLYGON_OFFSET_BIAS\0"

+   "GL_POLYGON_OFFSET_FACTOR\0"

+   "GL_POLYGON_OFFSET_FILL\0"

+   "GL_POLYGON_OFFSET_LINE\0"

+   "GL_POLYGON_OFFSET_POINT\0"

+   "GL_POLYGON_OFFSET_UNITS\0"

+   "GL_POLYGON_SMOOTH\0"

+   "GL_POLYGON_SMOOTH_HINT\0"

+   "GL_POLYGON_STIPPLE\0"

+   "GL_POLYGON_STIPPLE_BIT\0"

+   "GL_POLYGON_TOKEN\0"

+   "GL_POSITION\0"

+   "GL_POST_COLOR_MATRIX_ALPHA_BIAS\0"

+   "GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI\0"

+   "GL_POST_COLOR_MATRIX_ALPHA_SCALE\0"

+   "GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI\0"

+   "GL_POST_COLOR_MATRIX_BLUE_BIAS\0"

+   "GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI\0"

+   "GL_POST_COLOR_MATRIX_BLUE_SCALE\0"

+   "GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI\0"

+   "GL_POST_COLOR_MATRIX_COLOR_TABLE\0"

+   "GL_POST_COLOR_MATRIX_GREEN_BIAS\0"

+   "GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI\0"

+   "GL_POST_COLOR_MATRIX_GREEN_SCALE\0"

+   "GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI\0"

+   "GL_POST_COLOR_MATRIX_RED_BIAS\0"

+   "GL_POST_COLOR_MATRIX_RED_BIAS_SGI\0"

+   "GL_POST_COLOR_MATRIX_RED_SCALE\0"

+   "GL_POST_COLOR_MATRIX_RED_SCALE_SGI\0"

+   "GL_POST_CONVOLUTION_ALPHA_BIAS\0"

+   "GL_POST_CONVOLUTION_ALPHA_BIAS_EXT\0"

+   "GL_POST_CONVOLUTION_ALPHA_SCALE\0"

+   "GL_POST_CONVOLUTION_ALPHA_SCALE_EXT\0"

+   "GL_POST_CONVOLUTION_BLUE_BIAS\0"

+   "GL_POST_CONVOLUTION_BLUE_BIAS_EXT\0"

+   "GL_POST_CONVOLUTION_BLUE_SCALE\0"

+   "GL_POST_CONVOLUTION_BLUE_SCALE_EXT\0"

+   "GL_POST_CONVOLUTION_COLOR_TABLE\0"

+   "GL_POST_CONVOLUTION_GREEN_BIAS\0"

+   "GL_POST_CONVOLUTION_GREEN_BIAS_EXT\0"

+   "GL_POST_CONVOLUTION_GREEN_SCALE\0"

+   "GL_POST_CONVOLUTION_GREEN_SCALE_EXT\0"

+   "GL_POST_CONVOLUTION_RED_BIAS\0"

+   "GL_POST_CONVOLUTION_RED_BIAS_EXT\0"

+   "GL_POST_CONVOLUTION_RED_SCALE\0"

+   "GL_POST_CONVOLUTION_RED_SCALE_EXT\0"

+   "GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX\0"

+   "GL_POST_TEXTURE_FILTER_BIAS_SGIX\0"

+   "GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX\0"

+   "GL_POST_TEXTURE_FILTER_SCALE_SGIX\0"

+   "GL_PREVIOUS\0"

+   "GL_PREVIOUS_ARB\0"

+   "GL_PREVIOUS_EXT\0"

+   "GL_PRIMARY_COLOR\0"

+   "GL_PRIMARY_COLOR_ARB\0"

+   "GL_PRIMARY_COLOR_EXT\0"

+   "GL_PRIMITIVES_GENERATED\0"

+   "GL_PRIMITIVES_GENERATED_EXT\0"

+   "GL_PRIMITIVE_RESTART\0"

+   "GL_PRIMITIVE_RESTART_INDEX\0"

+   "GL_PRIMITIVE_RESTART_INDEX_NV\0"

+   "GL_PRIMITIVE_RESTART_NV\0"

+   "GL_PROGRAM_ADDRESS_REGISTERS_ARB\0"

+   "GL_PROGRAM_ALU_INSTRUCTIONS_ARB\0"

+   "GL_PROGRAM_ATTRIBS_ARB\0"

+   "GL_PROGRAM_BINARY_FORMATS_OES\0"

+   "GL_PROGRAM_BINARY_LENGTH_OES\0"

+   "GL_PROGRAM_BINDING_ARB\0"

+   "GL_PROGRAM_ERROR_POSITION_ARB\0"

+   "GL_PROGRAM_ERROR_POSITION_NV\0"

+   "GL_PROGRAM_ERROR_STRING_ARB\0"

+   "GL_PROGRAM_FORMAT_ARB\0"

+   "GL_PROGRAM_FORMAT_ASCII_ARB\0"

+   "GL_PROGRAM_INSTRUCTIONS_ARB\0"

+   "GL_PROGRAM_LENGTH_ARB\0"

+   "GL_PROGRAM_LENGTH_NV\0"

+   "GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB\0"

+   "GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB\0"

+   "GL_PROGRAM_NATIVE_ATTRIBS_ARB\0"

+   "GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB\0"

+   "GL_PROGRAM_NATIVE_PARAMETERS_ARB\0"

+   "GL_PROGRAM_NATIVE_TEMPORARIES_ARB\0"

+   "GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB\0"

+   "GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB\0"

+   "GL_PROGRAM_OBJECT_ARB\0"

+   "GL_PROGRAM_PARAMETERS_ARB\0"

+   "GL_PROGRAM_PARAMETER_NV\0"

+   "GL_PROGRAM_POINT_SIZE\0"

+   "GL_PROGRAM_POINT_SIZE_ARB\0"

+   "GL_PROGRAM_RESIDENT_NV\0"

+   "GL_PROGRAM_STRING_ARB\0"

+   "GL_PROGRAM_STRING_NV\0"

+   "GL_PROGRAM_TARGET_NV\0"

+   "GL_PROGRAM_TEMPORARIES_ARB\0"

+   "GL_PROGRAM_TEX_INDIRECTIONS_ARB\0"

+   "GL_PROGRAM_TEX_INSTRUCTIONS_ARB\0"

+   "GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB\0"

+   "GL_PROJECTION\0"

+   "GL_PROJECTION_MATRIX\0"

+   "GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES\0"

+   "GL_PROJECTION_STACK_DEPTH\0"

+   "GL_PROVOKING_VERTEX\0"

+   "GL_PROVOKING_VERTEX_EXT\0"

+   "GL_PROXY_COLOR_TABLE\0"

+   "GL_PROXY_HISTOGRAM\0"

+   "GL_PROXY_HISTOGRAM_EXT\0"

+   "GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE\0"

+   "GL_PROXY_POST_CONVOLUTION_COLOR_TABLE\0"

+   "GL_PROXY_TEXTURE_1D\0"

+   "GL_PROXY_TEXTURE_1D_ARRAY\0"

+   "GL_PROXY_TEXTURE_1D_ARRAY_EXT\0"

+   "GL_PROXY_TEXTURE_1D_EXT\0"

+   "GL_PROXY_TEXTURE_2D\0"

+   "GL_PROXY_TEXTURE_2D_ARRAY\0"

+   "GL_PROXY_TEXTURE_2D_ARRAY_EXT\0"

+   "GL_PROXY_TEXTURE_2D_EXT\0"

+   "GL_PROXY_TEXTURE_3D\0"

+   "GL_PROXY_TEXTURE_COLOR_TABLE_SGI\0"

+   "GL_PROXY_TEXTURE_CUBE_MAP\0"

+   "GL_PROXY_TEXTURE_CUBE_MAP_ARB\0"

+   "GL_PROXY_TEXTURE_RECTANGLE\0"

+   "GL_PROXY_TEXTURE_RECTANGLE_ARB\0"

+   "GL_PROXY_TEXTURE_RECTANGLE_NV\0"

+   "GL_PURGEABLE_APPLE\0"

+   "GL_Q\0"

+   "GL_QUADRATIC_ATTENUATION\0"

+   "GL_QUADS\0"

+   "GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION\0"

+   "GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT\0"

+   "GL_QUAD_MESH_SUN\0"

+   "GL_QUAD_STRIP\0"

+   "GL_QUERY_BY_REGION_NO_WAIT\0"

+   "GL_QUERY_BY_REGION_NO_WAIT_NV\0"

+   "GL_QUERY_BY_REGION_WAIT\0"

+   "GL_QUERY_BY_REGION_WAIT_NV\0"

+   "GL_QUERY_COUNTER_BITS\0"

+   "GL_QUERY_COUNTER_BITS_ARB\0"

+   "GL_QUERY_NO_WAIT\0"

+   "GL_QUERY_NO_WAIT_NV\0"

+   "GL_QUERY_RESULT\0"

+   "GL_QUERY_RESULT_ARB\0"

+   "GL_QUERY_RESULT_AVAILABLE\0"

+   "GL_QUERY_RESULT_AVAILABLE_ARB\0"

+   "GL_QUERY_WAIT\0"

+   "GL_QUERY_WAIT_NV\0"

+   "GL_R\0"

+   "GL_R11F_G11F_B10F\0"

+   "GL_R16_SNORM\0"

+   "GL_R3_G3_B2\0"

+   "GL_R8_SNORM\0"

+   "GL_RASTERIZER_DISCARD\0"

+   "GL_RASTERIZER_DISCARD_EXT\0"

+   "GL_RASTER_POSITION_UNCLIPPED_IBM\0"

+   "GL_READ_BUFFER\0"

+   "GL_READ_FRAMEBUFFER\0"

+   "GL_READ_FRAMEBUFFER_BINDING\0"

+   "GL_READ_FRAMEBUFFER_BINDING_EXT\0"

+   "GL_READ_FRAMEBUFFER_EXT\0"

+   "GL_READ_ONLY\0"

+   "GL_READ_ONLY_ARB\0"

+   "GL_READ_WRITE\0"

+   "GL_READ_WRITE_ARB\0"

+   "GL_RED\0"

+   "GL_REDUCE\0"

+   "GL_REDUCE_EXT\0"

+   "GL_RED_BIAS\0"

+   "GL_RED_BITS\0"

+   "GL_RED_INTEGER\0"

+   "GL_RED_INTEGER_EXT\0"

+   "GL_RED_SCALE\0"

+   "GL_RED_SNORM\0"

+   "GL_REFLECTION_MAP\0"

+   "GL_REFLECTION_MAP_ARB\0"

+   "GL_REFLECTION_MAP_NV\0"

+   "GL_REFLECTION_MAP_OES\0"

+   "GL_RELEASED_APPLE\0"

+   "GL_RENDER\0"

+   "GL_RENDERBUFFER\0"

+   "GL_RENDERBUFFER_ALPHA_SIZE\0"

+   "GL_RENDERBUFFER_ALPHA_SIZE_OES\0"

+   "GL_RENDERBUFFER_BINDING\0"

+   "GL_RENDERBUFFER_BINDING_EXT\0"

+   "GL_RENDERBUFFER_BINDING_OES\0"

+   "GL_RENDERBUFFER_BLUE_SIZE\0"

+   "GL_RENDERBUFFER_BLUE_SIZE_OES\0"

+   "GL_RENDERBUFFER_DEPTH_SIZE\0"

+   "GL_RENDERBUFFER_DEPTH_SIZE_OES\0"

+   "GL_RENDERBUFFER_EXT\0"

+   "GL_RENDERBUFFER_GREEN_SIZE\0"

+   "GL_RENDERBUFFER_GREEN_SIZE_OES\0"

+   "GL_RENDERBUFFER_HEIGHT\0"

+   "GL_RENDERBUFFER_HEIGHT_EXT\0"

+   "GL_RENDERBUFFER_HEIGHT_OES\0"

+   "GL_RENDERBUFFER_INTERNAL_FORMAT\0"

+   "GL_RENDERBUFFER_INTERNAL_FORMAT_EXT\0"

+   "GL_RENDERBUFFER_INTERNAL_FORMAT_OES\0"

+   "GL_RENDERBUFFER_OES\0"

+   "GL_RENDERBUFFER_RED_SIZE\0"

+   "GL_RENDERBUFFER_RED_SIZE_OES\0"

+   "GL_RENDERBUFFER_SAMPLES\0"

+   "GL_RENDERBUFFER_SAMPLES_EXT\0"

+   "GL_RENDERBUFFER_STENCIL_SIZE\0"

+   "GL_RENDERBUFFER_STENCIL_SIZE_OES\0"

+   "GL_RENDERBUFFER_WIDTH\0"

+   "GL_RENDERBUFFER_WIDTH_EXT\0"

+   "GL_RENDERBUFFER_WIDTH_OES\0"

+   "GL_RENDERER\0"

+   "GL_RENDER_MODE\0"

+   "GL_REPEAT\0"

+   "GL_REPLACE\0"

+   "GL_REPLACE_EXT\0"

+   "GL_REPLICATE_BORDER_HP\0"

+   "GL_RESCALE_NORMAL\0"

+   "GL_RESCALE_NORMAL_EXT\0"

+   "GL_RETAINED_APPLE\0"

+   "GL_RETURN\0"

+   "GL_RG16_SNORM\0"

+   "GL_RG8_SNORM\0"

+   "GL_RGB\0"

+   "GL_RGB10\0"

+   "GL_RGB10_A2\0"

+   "GL_RGB10_A2_EXT\0"

+   "GL_RGB10_EXT\0"

+   "GL_RGB12\0"

+   "GL_RGB12_EXT\0"

+   "GL_RGB16\0"

+   "GL_RGB16F\0"

+   "GL_RGB16I\0"

+   "GL_RGB16I_EXT\0"

+   "GL_RGB16UI\0"

+   "GL_RGB16UI_EXT\0"

+   "GL_RGB16_EXT\0"

+   "GL_RGB16_SNORM\0"

+   "GL_RGB2_EXT\0"

+   "GL_RGB32F\0"

+   "GL_RGB32I\0"

+   "GL_RGB32I_EXT\0"

+   "GL_RGB32UI\0"

+   "GL_RGB32UI_EXT\0"

+   "GL_RGB4\0"

+   "GL_RGB4_EXT\0"

+   "GL_RGB4_S3TC\0"

+   "GL_RGB5\0"

+   "GL_RGB565\0"

+   "GL_RGB565_OES\0"

+   "GL_RGB5_A1\0"

+   "GL_RGB5_A1_EXT\0"

+   "GL_RGB5_A1_OES\0"

+   "GL_RGB5_EXT\0"

+   "GL_RGB8\0"

+   "GL_RGB8I\0"

+   "GL_RGB8I_EXT\0"

+   "GL_RGB8UI\0"

+   "GL_RGB8UI_EXT\0"

+   "GL_RGB8_EXT\0"

+   "GL_RGB8_OES\0"

+   "GL_RGB8_SNORM\0"

+   "GL_RGB9_E5\0"

+   "GL_RGBA\0"

+   "GL_RGBA12\0"

+   "GL_RGBA12_EXT\0"

+   "GL_RGBA16\0"

+   "GL_RGBA16F\0"

+   "GL_RGBA16I\0"

+   "GL_RGBA16I_EXT\0"

+   "GL_RGBA16UI\0"

+   "GL_RGBA16UI_EXT\0"

+   "GL_RGBA16_EXT\0"

+   "GL_RGBA16_SNORM\0"

+   "GL_RGBA2\0"

+   "GL_RGBA2_EXT\0"

+   "GL_RGBA32F\0"

+   "GL_RGBA32I\0"

+   "GL_RGBA32I_EXT\0"

+   "GL_RGBA32UI\0"

+   "GL_RGBA32UI_EXT\0"

+   "GL_RGBA4\0"

+   "GL_RGBA4_DXT5_S3TC\0"

+   "GL_RGBA4_EXT\0"

+   "GL_RGBA4_OES\0"

+   "GL_RGBA4_S3TC\0"

+   "GL_RGBA8\0"

+   "GL_RGBA8I\0"

+   "GL_RGBA8I_EXT\0"

+   "GL_RGBA8UI\0"

+   "GL_RGBA8UI_EXT\0"

+   "GL_RGBA8_EXT\0"

+   "GL_RGBA8_OES\0"

+   "GL_RGBA8_SNORM\0"

+   "GL_RGBA_DXT5_S3TC\0"

+   "GL_RGBA_INTEGER\0"

+   "GL_RGBA_INTEGER_EXT\0"

+   "GL_RGBA_INTEGER_MODE_EXT\0"

+   "GL_RGBA_MODE\0"

+   "GL_RGBA_S3TC\0"

+   "GL_RGBA_SNORM\0"

+   "GL_RGB_INTEGER\0"

+   "GL_RGB_INTEGER_EXT\0"

+   "GL_RGB_S3TC\0"

+   "GL_RGB_SCALE\0"

+   "GL_RGB_SCALE_ARB\0"

+   "GL_RGB_SCALE_EXT\0"

+   "GL_RGB_SNORM\0"

+   "GL_RG_SNORM\0"

+   "GL_RIGHT\0"

+   "GL_S\0"

+   "GL_SAMPLER_1D\0"

+   "GL_SAMPLER_1D_ARRAY\0"

+   "GL_SAMPLER_1D_ARRAY_EXT\0"

+   "GL_SAMPLER_1D_ARRAY_SHADOW\0"

+   "GL_SAMPLER_1D_ARRAY_SHADOW_EXT\0"

+   "GL_SAMPLER_1D_SHADOW\0"

+   "GL_SAMPLER_2D\0"

+   "GL_SAMPLER_2D_ARRAY\0"

+   "GL_SAMPLER_2D_ARRAY_EXT\0"

+   "GL_SAMPLER_2D_ARRAY_SHADOW\0"

+   "GL_SAMPLER_2D_ARRAY_SHADOW_EXT\0"

+   "GL_SAMPLER_2D_RECT\0"

+   "GL_SAMPLER_2D_RECT_SHADOW\0"

+   "GL_SAMPLER_2D_SHADOW\0"

+   "GL_SAMPLER_3D\0"

+   "GL_SAMPLER_3D_OES\0"

+   "GL_SAMPLER_BUFFER\0"

+   "GL_SAMPLER_BUFFER_EXT\0"

+   "GL_SAMPLER_CUBE\0"

+   "GL_SAMPLER_CUBE_SHADOW\0"

+   "GL_SAMPLER_CUBE_SHADOW_EXT\0"

+   "GL_SAMPLES\0"

+   "GL_SAMPLES_3DFX\0"

+   "GL_SAMPLES_ARB\0"

+   "GL_SAMPLES_PASSED\0"

+   "GL_SAMPLES_PASSED_ARB\0"

+   "GL_SAMPLE_ALPHA_TO_COVERAGE\0"

+   "GL_SAMPLE_ALPHA_TO_COVERAGE_ARB\0"

+   "GL_SAMPLE_ALPHA_TO_ONE\0"

+   "GL_SAMPLE_ALPHA_TO_ONE_ARB\0"

+   "GL_SAMPLE_BUFFERS\0"

+   "GL_SAMPLE_BUFFERS_3DFX\0"

+   "GL_SAMPLE_BUFFERS_ARB\0"

+   "GL_SAMPLE_COVERAGE\0"

+   "GL_SAMPLE_COVERAGE_ARB\0"

+   "GL_SAMPLE_COVERAGE_INVERT\0"

+   "GL_SAMPLE_COVERAGE_INVERT_ARB\0"

+   "GL_SAMPLE_COVERAGE_VALUE\0"

+   "GL_SAMPLE_COVERAGE_VALUE_ARB\0"

+   "GL_SCISSOR_BIT\0"

+   "GL_SCISSOR_BOX\0"

+   "GL_SCISSOR_TEST\0"

+   "GL_SECONDARY_COLOR_ARRAY\0"

+   "GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING\0"

+   "GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_SECONDARY_COLOR_ARRAY_POINTER\0"

+   "GL_SECONDARY_COLOR_ARRAY_SIZE\0"

+   "GL_SECONDARY_COLOR_ARRAY_STRIDE\0"

+   "GL_SECONDARY_COLOR_ARRAY_TYPE\0"

+   "GL_SELECT\0"

+   "GL_SELECTION_BUFFER_POINTER\0"

+   "GL_SELECTION_BUFFER_SIZE\0"

+   "GL_SEPARABLE_2D\0"

+   "GL_SEPARATE_ATTRIBS\0"

+   "GL_SEPARATE_ATTRIBS_EXT\0"

+   "GL_SEPARATE_SPECULAR_COLOR\0"

+   "GL_SEPARATE_SPECULAR_COLOR_EXT\0"

+   "GL_SET\0"

+   "GL_SHADER_BINARY_FORMATS\0"

+   "GL_SHADER_COMPILER\0"

+   "GL_SHADER_OBJECT_ARB\0"

+   "GL_SHADER_SOURCE_LENGTH\0"

+   "GL_SHADER_TYPE\0"

+   "GL_SHADE_MODEL\0"

+   "GL_SHADING_LANGUAGE_VERSION\0"

+   "GL_SHADOW_AMBIENT_SGIX\0"

+   "GL_SHARED_TEXTURE_PALETTE_EXT\0"

+   "GL_SHININESS\0"

+   "GL_SHORT\0"

+   "GL_SIGNALED\0"

+   "GL_SIGNED_NORMALIZED\0"

+   "GL_SINGLE_COLOR\0"

+   "GL_SINGLE_COLOR_EXT\0"

+   "GL_SLICE_ACCUM_SUN\0"

+   "GL_SLUMINANCE\0"

+   "GL_SLUMINANCE8\0"

+   "GL_SLUMINANCE8_ALPHA8\0"

+   "GL_SLUMINANCE_ALPHA\0"

+   "GL_SMOOTH\0"

+   "GL_SMOOTH_LINE_WIDTH_GRANULARITY\0"

+   "GL_SMOOTH_LINE_WIDTH_RANGE\0"

+   "GL_SMOOTH_POINT_SIZE_GRANULARITY\0"

+   "GL_SMOOTH_POINT_SIZE_RANGE\0"

+   "GL_SOURCE0_ALPHA\0"

+   "GL_SOURCE0_ALPHA_ARB\0"

+   "GL_SOURCE0_ALPHA_EXT\0"

+   "GL_SOURCE0_RGB\0"

+   "GL_SOURCE0_RGB_ARB\0"

+   "GL_SOURCE0_RGB_EXT\0"

+   "GL_SOURCE1_ALPHA\0"

+   "GL_SOURCE1_ALPHA_ARB\0"

+   "GL_SOURCE1_ALPHA_EXT\0"

+   "GL_SOURCE1_RGB\0"

+   "GL_SOURCE1_RGB_ARB\0"

+   "GL_SOURCE1_RGB_EXT\0"

+   "GL_SOURCE2_ALPHA\0"

+   "GL_SOURCE2_ALPHA_ARB\0"

+   "GL_SOURCE2_ALPHA_EXT\0"

+   "GL_SOURCE2_RGB\0"

+   "GL_SOURCE2_RGB_ARB\0"

+   "GL_SOURCE2_RGB_EXT\0"

+   "GL_SOURCE3_ALPHA_NV\0"

+   "GL_SOURCE3_RGB_NV\0"

+   "GL_SPECULAR\0"

+   "GL_SPHERE_MAP\0"

+   "GL_SPOT_CUTOFF\0"

+   "GL_SPOT_DIRECTION\0"

+   "GL_SPOT_EXPONENT\0"

+   "GL_SRC0_ALPHA\0"

+   "GL_SRC0_RGB\0"

+   "GL_SRC1_ALPHA\0"

+   "GL_SRC1_RGB\0"

+   "GL_SRC2_ALPHA\0"

+   "GL_SRC2_RGB\0"

+   "GL_SRC_ALPHA\0"

+   "GL_SRC_ALPHA_SATURATE\0"

+   "GL_SRC_COLOR\0"

+   "GL_SRGB\0"

+   "GL_SRGB8\0"

+   "GL_SRGB8_ALPHA8\0"

+   "GL_SRGB_ALPHA\0"

+   "GL_STACK_OVERFLOW\0"

+   "GL_STACK_UNDERFLOW\0"

+   "GL_STATIC_COPY\0"

+   "GL_STATIC_COPY_ARB\0"

+   "GL_STATIC_DRAW\0"

+   "GL_STATIC_DRAW_ARB\0"

+   "GL_STATIC_READ\0"

+   "GL_STATIC_READ_ARB\0"

+   "GL_STENCIL\0"

+   "GL_STENCIL_ATTACHMENT\0"

+   "GL_STENCIL_ATTACHMENT_EXT\0"

+   "GL_STENCIL_ATTACHMENT_OES\0"

+   "GL_STENCIL_BACK_FAIL\0"

+   "GL_STENCIL_BACK_FAIL_ATI\0"

+   "GL_STENCIL_BACK_FUNC\0"

+   "GL_STENCIL_BACK_FUNC_ATI\0"

+   "GL_STENCIL_BACK_PASS_DEPTH_FAIL\0"

+   "GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI\0"

+   "GL_STENCIL_BACK_PASS_DEPTH_PASS\0"

+   "GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI\0"

+   "GL_STENCIL_BACK_REF\0"

+   "GL_STENCIL_BACK_VALUE_MASK\0"

+   "GL_STENCIL_BACK_WRITEMASK\0"

+   "GL_STENCIL_BITS\0"

+   "GL_STENCIL_BUFFER\0"

+   "GL_STENCIL_BUFFER_BIT\0"

+   "GL_STENCIL_CLEAR_VALUE\0"

+   "GL_STENCIL_FAIL\0"

+   "GL_STENCIL_FUNC\0"

+   "GL_STENCIL_INDEX\0"

+   "GL_STENCIL_INDEX1\0"

+   "GL_STENCIL_INDEX16\0"

+   "GL_STENCIL_INDEX16_EXT\0"

+   "GL_STENCIL_INDEX1_EXT\0"

+   "GL_STENCIL_INDEX1_OES\0"

+   "GL_STENCIL_INDEX4\0"

+   "GL_STENCIL_INDEX4_EXT\0"

+   "GL_STENCIL_INDEX4_OES\0"

+   "GL_STENCIL_INDEX8\0"

+   "GL_STENCIL_INDEX8_EXT\0"

+   "GL_STENCIL_INDEX8_OES\0"

+   "GL_STENCIL_INDEX_EXT\0"

+   "GL_STENCIL_PASS_DEPTH_FAIL\0"

+   "GL_STENCIL_PASS_DEPTH_PASS\0"

+   "GL_STENCIL_REF\0"

+   "GL_STENCIL_TEST\0"

+   "GL_STENCIL_TEST_TWO_SIDE_EXT\0"

+   "GL_STENCIL_VALUE_MASK\0"

+   "GL_STENCIL_WRITEMASK\0"

+   "GL_STEREO\0"

+   "GL_STORAGE_CACHED_APPLE\0"

+   "GL_STORAGE_PRIVATE_APPLE\0"

+   "GL_STORAGE_SHARED_APPLE\0"

+   "GL_STREAM_COPY\0"

+   "GL_STREAM_COPY_ARB\0"

+   "GL_STREAM_DRAW\0"

+   "GL_STREAM_DRAW_ARB\0"

+   "GL_STREAM_READ\0"

+   "GL_STREAM_READ_ARB\0"

+   "GL_SUBPIXEL_BITS\0"

+   "GL_SUBTRACT\0"

+   "GL_SUBTRACT_ARB\0"

+   "GL_SYNC_CONDITION\0"

+   "GL_SYNC_FENCE\0"

+   "GL_SYNC_FLAGS\0"

+   "GL_SYNC_FLUSH_COMMANDS_BIT\0"

+   "GL_SYNC_GPU_COMMANDS_COMPLETE\0"

+   "GL_SYNC_STATUS\0"

+   "GL_T\0"

+   "GL_T2F_C3F_V3F\0"

+   "GL_T2F_C4F_N3F_V3F\0"

+   "GL_T2F_C4UB_V3F\0"

+   "GL_T2F_N3F_V3F\0"

+   "GL_T2F_V3F\0"

+   "GL_T4F_C4F_N3F_V4F\0"

+   "GL_T4F_V4F\0"

+   "GL_TABLE_TOO_LARGE_EXT\0"

+   "GL_TEXTURE\0"

+   "GL_TEXTURE0\0"

+   "GL_TEXTURE0_ARB\0"

+   "GL_TEXTURE1\0"

+   "GL_TEXTURE10\0"

+   "GL_TEXTURE10_ARB\0"

+   "GL_TEXTURE11\0"

+   "GL_TEXTURE11_ARB\0"

+   "GL_TEXTURE12\0"

+   "GL_TEXTURE12_ARB\0"

+   "GL_TEXTURE13\0"

+   "GL_TEXTURE13_ARB\0"

+   "GL_TEXTURE14\0"

+   "GL_TEXTURE14_ARB\0"

+   "GL_TEXTURE15\0"

+   "GL_TEXTURE15_ARB\0"

+   "GL_TEXTURE16\0"

+   "GL_TEXTURE16_ARB\0"

+   "GL_TEXTURE17\0"

+   "GL_TEXTURE17_ARB\0"

+   "GL_TEXTURE18\0"

+   "GL_TEXTURE18_ARB\0"

+   "GL_TEXTURE19\0"

+   "GL_TEXTURE19_ARB\0"

+   "GL_TEXTURE1_ARB\0"

+   "GL_TEXTURE2\0"

+   "GL_TEXTURE20\0"

+   "GL_TEXTURE20_ARB\0"

+   "GL_TEXTURE21\0"

+   "GL_TEXTURE21_ARB\0"

+   "GL_TEXTURE22\0"

+   "GL_TEXTURE22_ARB\0"

+   "GL_TEXTURE23\0"

+   "GL_TEXTURE23_ARB\0"

+   "GL_TEXTURE24\0"

+   "GL_TEXTURE24_ARB\0"

+   "GL_TEXTURE25\0"

+   "GL_TEXTURE25_ARB\0"

+   "GL_TEXTURE26\0"

+   "GL_TEXTURE26_ARB\0"

+   "GL_TEXTURE27\0"

+   "GL_TEXTURE27_ARB\0"

+   "GL_TEXTURE28\0"

+   "GL_TEXTURE28_ARB\0"

+   "GL_TEXTURE29\0"

+   "GL_TEXTURE29_ARB\0"

+   "GL_TEXTURE2_ARB\0"

+   "GL_TEXTURE3\0"

+   "GL_TEXTURE30\0"

+   "GL_TEXTURE30_ARB\0"

+   "GL_TEXTURE31\0"

+   "GL_TEXTURE31_ARB\0"

+   "GL_TEXTURE3_ARB\0"

+   "GL_TEXTURE4\0"

+   "GL_TEXTURE4_ARB\0"

+   "GL_TEXTURE5\0"

+   "GL_TEXTURE5_ARB\0"

+   "GL_TEXTURE6\0"

+   "GL_TEXTURE6_ARB\0"

+   "GL_TEXTURE7\0"

+   "GL_TEXTURE7_ARB\0"

+   "GL_TEXTURE8\0"

+   "GL_TEXTURE8_ARB\0"

+   "GL_TEXTURE9\0"

+   "GL_TEXTURE9_ARB\0"

+   "GL_TEXTURE_1D\0"

+   "GL_TEXTURE_1D_ARRAY\0"

+   "GL_TEXTURE_1D_ARRAY_EXT\0"

+   "GL_TEXTURE_2D\0"

+   "GL_TEXTURE_2D_ARRAY\0"

+   "GL_TEXTURE_2D_ARRAY_EXT\0"

+   "GL_TEXTURE_3D\0"

+   "GL_TEXTURE_3D_OES\0"

+   "GL_TEXTURE_ALPHA_SIZE\0"

+   "GL_TEXTURE_ALPHA_SIZE_EXT\0"

+   "GL_TEXTURE_BASE_LEVEL\0"

+   "GL_TEXTURE_BINDING_1D\0"

+   "GL_TEXTURE_BINDING_1D_ARRAY\0"

+   "GL_TEXTURE_BINDING_1D_ARRAY_EXT\0"

+   "GL_TEXTURE_BINDING_2D\0"

+   "GL_TEXTURE_BINDING_2D_ARRAY\0"

+   "GL_TEXTURE_BINDING_2D_ARRAY_EXT\0"

+   "GL_TEXTURE_BINDING_3D\0"

+   "GL_TEXTURE_BINDING_3D_OES\0"

+   "GL_TEXTURE_BINDING_BUFFER\0"

+   "GL_TEXTURE_BINDING_CUBE_MAP\0"

+   "GL_TEXTURE_BINDING_CUBE_MAP_ARB\0"

+   "GL_TEXTURE_BINDING_CUBE_MAP_OES\0"

+   "GL_TEXTURE_BINDING_RECTANGLE\0"

+   "GL_TEXTURE_BINDING_RECTANGLE_ARB\0"

+   "GL_TEXTURE_BINDING_RECTANGLE_NV\0"

+   "GL_TEXTURE_BIT\0"

+   "GL_TEXTURE_BLUE_SIZE\0"

+   "GL_TEXTURE_BLUE_SIZE_EXT\0"

+   "GL_TEXTURE_BORDER\0"

+   "GL_TEXTURE_BORDER_COLOR\0"

+   "GL_TEXTURE_BUFFER\0"

+   "GL_TEXTURE_BUFFER_DATA_STORE_BINDING\0"

+   "GL_TEXTURE_BUFFER_FORMAT\0"

+   "GL_TEXTURE_CLIPMAP_CENTER_SGIX\0"

+   "GL_TEXTURE_CLIPMAP_DEPTH_SGIX\0"

+   "GL_TEXTURE_CLIPMAP_FRAME_SGIX\0"

+   "GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX\0"

+   "GL_TEXTURE_CLIPMAP_OFFSET_SGIX\0"

+   "GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX\0"

+   "GL_TEXTURE_COLOR_TABLE_SGI\0"

+   "GL_TEXTURE_COLOR_WRITEMASK_SGIS\0"

+   "GL_TEXTURE_COMPARE_FAIL_VALUE_ARB\0"

+   "GL_TEXTURE_COMPARE_FUNC\0"

+   "GL_TEXTURE_COMPARE_FUNC_ARB\0"

+   "GL_TEXTURE_COMPARE_MODE\0"

+   "GL_TEXTURE_COMPARE_MODE_ARB\0"

+   "GL_TEXTURE_COMPARE_OPERATOR_SGIX\0"

+   "GL_TEXTURE_COMPARE_SGIX\0"

+   "GL_TEXTURE_COMPONENTS\0"

+   "GL_TEXTURE_COMPRESSED\0"

+   "GL_TEXTURE_COMPRESSED_ARB\0"

+   "GL_TEXTURE_COMPRESSED_FORMATS_ARB\0"

+   "GL_TEXTURE_COMPRESSED_IMAGE_SIZE\0"

+   "GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB\0"

+   "GL_TEXTURE_COMPRESSION_HINT\0"

+   "GL_TEXTURE_COMPRESSION_HINT_ARB\0"

+   "GL_TEXTURE_COORD_ARRAY\0"

+   "GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING\0"

+   "GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_TEXTURE_COORD_ARRAY_POINTER\0"

+   "GL_TEXTURE_COORD_ARRAY_SIZE\0"

+   "GL_TEXTURE_COORD_ARRAY_STRIDE\0"

+   "GL_TEXTURE_COORD_ARRAY_TYPE\0"

+   "GL_TEXTURE_CROP_RECT_OES\0"

+   "GL_TEXTURE_CUBE_MAP\0"

+   "GL_TEXTURE_CUBE_MAP_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES\0"

+   "GL_TEXTURE_CUBE_MAP_OES\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_X\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB\0"

+   "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES\0"

+   "GL_TEXTURE_CUBE_MAP_SEAMLESS\0"

+   "GL_TEXTURE_DEPTH\0"

+   "GL_TEXTURE_DEPTH_SIZE\0"

+   "GL_TEXTURE_DEPTH_SIZE_ARB\0"

+   "GL_TEXTURE_ENV\0"

+   "GL_TEXTURE_ENV_COLOR\0"

+   "GL_TEXTURE_ENV_MODE\0"

+   "GL_TEXTURE_FILTER_CONTROL\0"

+   "GL_TEXTURE_FILTER_CONTROL_EXT\0"

+   "GL_TEXTURE_GEN_MODE\0"

+   "GL_TEXTURE_GEN_MODE_OES\0"

+   "GL_TEXTURE_GEN_Q\0"

+   "GL_TEXTURE_GEN_R\0"

+   "GL_TEXTURE_GEN_S\0"

+   "GL_TEXTURE_GEN_STR_OES\0"

+   "GL_TEXTURE_GEN_T\0"

+   "GL_TEXTURE_GEQUAL_R_SGIX\0"

+   "GL_TEXTURE_GREEN_SIZE\0"

+   "GL_TEXTURE_GREEN_SIZE_EXT\0"

+   "GL_TEXTURE_HEIGHT\0"

+   "GL_TEXTURE_INDEX_SIZE_EXT\0"

+   "GL_TEXTURE_INTENSITY_SIZE\0"

+   "GL_TEXTURE_INTENSITY_SIZE_EXT\0"

+   "GL_TEXTURE_INTERNAL_FORMAT\0"

+   "GL_TEXTURE_LEQUAL_R_SGIX\0"

+   "GL_TEXTURE_LOD_BIAS\0"

+   "GL_TEXTURE_LOD_BIAS_EXT\0"

+   "GL_TEXTURE_LOD_BIAS_R_SGIX\0"

+   "GL_TEXTURE_LOD_BIAS_S_SGIX\0"

+   "GL_TEXTURE_LOD_BIAS_T_SGIX\0"

+   "GL_TEXTURE_LUMINANCE_SIZE\0"

+   "GL_TEXTURE_LUMINANCE_SIZE_EXT\0"

+   "GL_TEXTURE_MAG_FILTER\0"

+   "GL_TEXTURE_MATRIX\0"

+   "GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES\0"

+   "GL_TEXTURE_MAX_ANISOTROPY_EXT\0"

+   "GL_TEXTURE_MAX_CLAMP_R_SGIX\0"

+   "GL_TEXTURE_MAX_CLAMP_S_SGIX\0"

+   "GL_TEXTURE_MAX_CLAMP_T_SGIX\0"

+   "GL_TEXTURE_MAX_LEVEL\0"

+   "GL_TEXTURE_MAX_LOD\0"

+   "GL_TEXTURE_MIN_FILTER\0"

+   "GL_TEXTURE_MIN_LOD\0"

+   "GL_TEXTURE_PRIORITY\0"

+   "GL_TEXTURE_RANGE_LENGTH_APPLE\0"

+   "GL_TEXTURE_RANGE_POINTER_APPLE\0"

+   "GL_TEXTURE_RECTANGLE\0"

+   "GL_TEXTURE_RECTANGLE_ARB\0"

+   "GL_TEXTURE_RECTANGLE_NV\0"

+   "GL_TEXTURE_RED_SIZE\0"

+   "GL_TEXTURE_RED_SIZE_EXT\0"

+   "GL_TEXTURE_RESIDENT\0"

+   "GL_TEXTURE_SHARED_SIZE\0"

+   "GL_TEXTURE_STACK_DEPTH\0"

+   "GL_TEXTURE_STENCIL_SIZE\0"

+   "GL_TEXTURE_STENCIL_SIZE_EXT\0"

+   "GL_TEXTURE_STORAGE_HINT_APPLE\0"

+   "GL_TEXTURE_TOO_LARGE_EXT\0"

+   "GL_TEXTURE_UNSIGNED_REMAP_MODE_NV\0"

+   "GL_TEXTURE_WIDTH\0"

+   "GL_TEXTURE_WRAP_R\0"

+   "GL_TEXTURE_WRAP_R_OES\0"

+   "GL_TEXTURE_WRAP_S\0"

+   "GL_TEXTURE_WRAP_T\0"

+   "GL_TIMEOUT_EXPIRED\0"

+   "GL_TIME_ELAPSED_EXT\0"

+   "GL_TRACK_MATRIX_NV\0"

+   "GL_TRACK_MATRIX_TRANSFORM_NV\0"

+   "GL_TRANSFORM_BIT\0"

+   "GL_TRANSFORM_FEEDBACK\0"

+   "GL_TRANSFORM_FEEDBACK_BINDING\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_BINDING\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_MODE\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_SIZE\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_START\0"

+   "GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN\0"

+   "GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_VARYINGS\0"

+   "GL_TRANSFORM_FEEDBACK_VARYINGS_EXT\0"

+   "GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH\0"

+   "GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT\0"

+   "GL_TRANSPOSE_COLOR_MATRIX\0"

+   "GL_TRANSPOSE_COLOR_MATRIX_ARB\0"

+   "GL_TRANSPOSE_CURRENT_MATRIX_ARB\0"

+   "GL_TRANSPOSE_MODELVIEW_MATRIX\0"

+   "GL_TRANSPOSE_MODELVIEW_MATRIX_ARB\0"

+   "GL_TRANSPOSE_NV\0"

+   "GL_TRANSPOSE_PROJECTION_MATRIX\0"

+   "GL_TRANSPOSE_PROJECTION_MATRIX_ARB\0"

+   "GL_TRANSPOSE_TEXTURE_MATRIX\0"

+   "GL_TRANSPOSE_TEXTURE_MATRIX_ARB\0"

+   "GL_TRIANGLES\0"

+   "GL_TRIANGLES_ADJACENCY\0"

+   "GL_TRIANGLES_ADJACENCY_ARB\0"

+   "GL_TRIANGLE_FAN\0"

+   "GL_TRIANGLE_MESH_SUN\0"

+   "GL_TRIANGLE_STRIP\0"

+   "GL_TRIANGLE_STRIP_ADJACENCY\0"

+   "GL_TRIANGLE_STRIP_ADJACENCY_ARB\0"

+   "GL_TRUE\0"

+   "GL_UNDEFINED_APPLE\0"

+   "GL_UNPACK_ALIGNMENT\0"

+   "GL_UNPACK_IMAGE_HEIGHT\0"

+   "GL_UNPACK_LSB_FIRST\0"

+   "GL_UNPACK_ROW_LENGTH\0"

+   "GL_UNPACK_SKIP_IMAGES\0"

+   "GL_UNPACK_SKIP_PIXELS\0"

+   "GL_UNPACK_SKIP_ROWS\0"

+   "GL_UNPACK_SWAP_BYTES\0"

+   "GL_UNSIGNALED\0"

+   "GL_UNSIGNED_BYTE\0"

+   "GL_UNSIGNED_BYTE_2_3_3_REV\0"

+   "GL_UNSIGNED_BYTE_3_3_2\0"

+   "GL_UNSIGNED_INT\0"

+   "GL_UNSIGNED_INT_10F_11F_11F_REV\0"

+   "GL_UNSIGNED_INT_10_10_10_2\0"

+   "GL_UNSIGNED_INT_10_10_10_2_OES\0"

+   "GL_UNSIGNED_INT_24_8\0"

+   "GL_UNSIGNED_INT_24_8_EXT\0"

+   "GL_UNSIGNED_INT_24_8_NV\0"

+   "GL_UNSIGNED_INT_24_8_OES\0"

+   "GL_UNSIGNED_INT_2_10_10_10_REV\0"

+   "GL_UNSIGNED_INT_2_10_10_10_REV_EXT\0"

+   "GL_UNSIGNED_INT_5_9_9_9_REV\0"

+   "GL_UNSIGNED_INT_8_8_8_8\0"

+   "GL_UNSIGNED_INT_8_8_8_8_REV\0"

+   "GL_UNSIGNED_INT_SAMPLER_1D\0"

+   "GL_UNSIGNED_INT_SAMPLER_1D_ARRAY\0"

+   "GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_1D_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_2D\0"

+   "GL_UNSIGNED_INT_SAMPLER_2D_ARRAY\0"

+   "GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_2D_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_2D_RECT\0"

+   "GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_3D\0"

+   "GL_UNSIGNED_INT_SAMPLER_3D_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_BUFFER\0"

+   "GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT\0"

+   "GL_UNSIGNED_INT_SAMPLER_CUBE\0"

+   "GL_UNSIGNED_INT_SAMPLER_CUBE_EXT\0"

+   "GL_UNSIGNED_INT_VEC2\0"

+   "GL_UNSIGNED_INT_VEC2_EXT\0"

+   "GL_UNSIGNED_INT_VEC3\0"

+   "GL_UNSIGNED_INT_VEC3_EXT\0"

+   "GL_UNSIGNED_INT_VEC4\0"

+   "GL_UNSIGNED_INT_VEC4_EXT\0"

+   "GL_UNSIGNED_NORMALIZED\0"

+   "GL_UNSIGNED_SHORT\0"

+   "GL_UNSIGNED_SHORT_1_5_5_5_REV\0"

+   "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT\0"

+   "GL_UNSIGNED_SHORT_4_4_4_4\0"

+   "GL_UNSIGNED_SHORT_4_4_4_4_REV\0"

+   "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT\0"

+   "GL_UNSIGNED_SHORT_5_5_5_1\0"

+   "GL_UNSIGNED_SHORT_5_6_5\0"

+   "GL_UNSIGNED_SHORT_5_6_5_REV\0"

+   "GL_UNSIGNED_SHORT_8_8_APPLE\0"

+   "GL_UNSIGNED_SHORT_8_8_MESA\0"

+   "GL_UNSIGNED_SHORT_8_8_REV_APPLE\0"

+   "GL_UNSIGNED_SHORT_8_8_REV_MESA\0"

+   "GL_UPPER_LEFT\0"

+   "GL_V2F\0"

+   "GL_V3F\0"

+   "GL_VALIDATE_STATUS\0"

+   "GL_VENDOR\0"

+   "GL_VERSION\0"

+   "GL_VERTEX_ARRAY\0"

+   "GL_VERTEX_ARRAY_BINDING\0"

+   "GL_VERTEX_ARRAY_BINDING_APPLE\0"

+   "GL_VERTEX_ARRAY_BUFFER_BINDING\0"

+   "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_VERTEX_ARRAY_POINTER\0"

+   "GL_VERTEX_ARRAY_SIZE\0"

+   "GL_VERTEX_ARRAY_STRIDE\0"

+   "GL_VERTEX_ARRAY_TYPE\0"

+   "GL_VERTEX_ATTRIB_ARRAY0_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY10_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY11_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY12_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY13_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY14_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY15_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY1_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY2_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY3_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY4_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY5_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY6_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY7_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY8_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY9_NV\0"

+   "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING\0"

+   "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_VERTEX_ATTRIB_ARRAY_ENABLED\0"

+   "GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB\0"

+   "GL_VERTEX_ATTRIB_ARRAY_INTEGER\0"

+   "GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT\0"

+   "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED\0"

+   "GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB\0"

+   "GL_VERTEX_ATTRIB_ARRAY_POINTER\0"

+   "GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB\0"

+   "GL_VERTEX_ATTRIB_ARRAY_SIZE\0"

+   "GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB\0"

+   "GL_VERTEX_ATTRIB_ARRAY_STRIDE\0"

+   "GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB\0"

+   "GL_VERTEX_ATTRIB_ARRAY_TYPE\0"

+   "GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB\0"

+   "GL_VERTEX_BLEND_ARB\0"

+   "GL_VERTEX_PROGRAM_ARB\0"

+   "GL_VERTEX_PROGRAM_BINDING_NV\0"

+   "GL_VERTEX_PROGRAM_NV\0"

+   "GL_VERTEX_PROGRAM_POINT_SIZE\0"

+   "GL_VERTEX_PROGRAM_POINT_SIZE_ARB\0"

+   "GL_VERTEX_PROGRAM_POINT_SIZE_NV\0"

+   "GL_VERTEX_PROGRAM_TWO_SIDE\0"

+   "GL_VERTEX_PROGRAM_TWO_SIDE_ARB\0"

+   "GL_VERTEX_PROGRAM_TWO_SIDE_NV\0"

+   "GL_VERTEX_SHADER\0"

+   "GL_VERTEX_SHADER_ARB\0"

+   "GL_VERTEX_STATE_PROGRAM_NV\0"

+   "GL_VIEWPORT\0"

+   "GL_VIEWPORT_BIT\0"

+   "GL_VOLATILE_APPLE\0"

+   "GL_WAIT_FAILED\0"

+   "GL_WEIGHT_ARRAY_ARB\0"

+   "GL_WEIGHT_ARRAY_BUFFER_BINDING\0"

+   "GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB\0"

+   "GL_WEIGHT_ARRAY_BUFFER_BINDING_OES\0"

+   "GL_WEIGHT_ARRAY_OES\0"

+   "GL_WEIGHT_ARRAY_POINTER_ARB\0"

+   "GL_WEIGHT_ARRAY_POINTER_OES\0"

+   "GL_WEIGHT_ARRAY_SIZE_ARB\0"

+   "GL_WEIGHT_ARRAY_SIZE_OES\0"

+   "GL_WEIGHT_ARRAY_STRIDE_ARB\0"

+   "GL_WEIGHT_ARRAY_STRIDE_OES\0"

+   "GL_WEIGHT_ARRAY_TYPE_ARB\0"

+   "GL_WEIGHT_ARRAY_TYPE_OES\0"

+   "GL_WEIGHT_SUM_UNITY_ARB\0"

+   "GL_WRAP_BORDER_SUN\0"

+   "GL_WRITE_ONLY\0"

+   "GL_WRITE_ONLY_ARB\0"

+   "GL_WRITE_ONLY_OES\0"

+   "GL_XOR\0"

+   "GL_YCBCR_422_APPLE\0"

+   "GL_YCBCR_MESA\0"

+   "GL_ZERO\0"

+   "GL_ZOOM_X\0"

+   "GL_ZOOM_Y\0"

+   ;

+

+static const enum_elt all_enums[2294] =

+{

+   {     0, 0x00000600 }, /* GL_2D */

+   {     6, 0x00001407 }, /* GL_2_BYTES */

+   {    17, 0x00000601 }, /* GL_3D */

+   {    23, 0x00000602 }, /* GL_3D_COLOR */

+   {    35, 0x00000603 }, /* GL_3D_COLOR_TEXTURE */

+   {    55, 0x00001408 }, /* GL_3_BYTES */

+   {    66, 0x00000604 }, /* GL_4D_COLOR_TEXTURE */

+   {    86, 0x00001409 }, /* GL_4_BYTES */

+   {    97, 0x00000100 }, /* GL_ACCUM */

+   {   106, 0x00000D5B }, /* GL_ACCUM_ALPHA_BITS */

+   {   126, 0x00000D5A }, /* GL_ACCUM_BLUE_BITS */

+   {   145, 0x00000200 }, /* GL_ACCUM_BUFFER_BIT */

+   {   165, 0x00000B80 }, /* GL_ACCUM_CLEAR_VALUE */

+   {   186, 0x00000D59 }, /* GL_ACCUM_GREEN_BITS */

+   {   206, 0x00000D58 }, /* GL_ACCUM_RED_BITS */

+   {   224, 0x00008B89 }, /* GL_ACTIVE_ATTRIBUTES */

+   {   245, 0x00008B8A }, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */

+   {   276, 0x00008B8D }, /* GL_ACTIVE_PROGRAM_EXT */

+   {   298, 0x00008911 }, /* GL_ACTIVE_STENCIL_FACE_EXT */

+   {   325, 0x000084E0 }, /* GL_ACTIVE_TEXTURE */

+   {   343, 0x000084E0 }, /* GL_ACTIVE_TEXTURE_ARB */

+   {   365, 0x00008B86 }, /* GL_ACTIVE_UNIFORMS */

+   {   384, 0x00008B87 }, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */

+   {   413, 0x000086A5 }, /* GL_ACTIVE_VERTEX_UNITS_ARB */

+   {   440, 0x00000104 }, /* GL_ADD */

+   {   447, 0x00008574 }, /* GL_ADD_SIGNED */

+   {   461, 0x00008574 }, /* GL_ADD_SIGNED_ARB */

+   {   479, 0x00008574 }, /* GL_ADD_SIGNED_EXT */

+   {   497, 0x0000846E }, /* GL_ALIASED_LINE_WIDTH_RANGE */

+   {   525, 0x0000846D }, /* GL_ALIASED_POINT_SIZE_RANGE */

+   {   553, 0x000FFFFF }, /* GL_ALL_ATTRIB_BITS */

+   {   572, 0xFFFFFFFF }, /* GL_ALL_CLIENT_ATTRIB_BITS */

+   {   598, 0x00001906 }, /* GL_ALPHA */

+   {   607, 0x0000803D }, /* GL_ALPHA12 */

+   {   618, 0x0000803D }, /* GL_ALPHA12_EXT */

+   {   633, 0x0000803E }, /* GL_ALPHA16 */

+   {   644, 0x00008D8A }, /* GL_ALPHA16I_EXT */

+   {   660, 0x00008D78 }, /* GL_ALPHA16UI_EXT */

+   {   677, 0x0000803E }, /* GL_ALPHA16_EXT */

+   {   692, 0x00008D84 }, /* GL_ALPHA32I_EXT */

+   {   708, 0x00008D72 }, /* GL_ALPHA32UI_EXT */

+   {   725, 0x0000803B }, /* GL_ALPHA4 */

+   {   735, 0x0000803B }, /* GL_ALPHA4_EXT */

+   {   749, 0x0000803C }, /* GL_ALPHA8 */

+   {   759, 0x00008D90 }, /* GL_ALPHA8I_EXT */

+   {   774, 0x00008D7E }, /* GL_ALPHA8UI_EXT */

+   {   790, 0x0000803C }, /* GL_ALPHA8_EXT */

+   {   804, 0x00000D1D }, /* GL_ALPHA_BIAS */

+   {   818, 0x00000D55 }, /* GL_ALPHA_BITS */

+   {   832, 0x00008D97 }, /* GL_ALPHA_INTEGER_EXT */

+   {   853, 0x00000D1C }, /* GL_ALPHA_SCALE */

+   {   868, 0x00000BC0 }, /* GL_ALPHA_TEST */

+   {   882, 0x00000BC1 }, /* GL_ALPHA_TEST_FUNC */

+   {   901, 0x00000BC2 }, /* GL_ALPHA_TEST_REF */

+   {   919, 0x0000911A }, /* GL_ALREADY_SIGNALED */

+   {   939, 0x00000207 }, /* GL_ALWAYS */

+   {   949, 0x00001200 }, /* GL_AMBIENT */

+   {   960, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */

+   {   983, 0x00001501 }, /* GL_AND */

+   {   990, 0x00001504 }, /* GL_AND_INVERTED */

+   {  1006, 0x00001502 }, /* GL_AND_REVERSE */

+   {  1021, 0x00008892 }, /* GL_ARRAY_BUFFER */

+   {  1037, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */

+   {  1061, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */

+   {  1089, 0x00008B85 }, /* GL_ATTACHED_SHADERS */

+   {  1109, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */

+   {  1136, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */

+   {  1160, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */

+   {  1186, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */

+   {  1210, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */

+   {  1232, 0x00000D80 }, /* GL_AUTO_NORMAL */

+   {  1247, 0x00000409 }, /* GL_AUX0 */

+   {  1255, 0x0000040A }, /* GL_AUX1 */

+   {  1263, 0x0000040B }, /* GL_AUX2 */

+   {  1271, 0x0000040C }, /* GL_AUX3 */

+   {  1279, 0x00000C00 }, /* GL_AUX_BUFFERS */

+   {  1294, 0x00000405 }, /* GL_BACK */

+   {  1302, 0x00000402 }, /* GL_BACK_LEFT */

+   {  1315, 0x00000403 }, /* GL_BACK_RIGHT */

+   {  1329, 0x000080E0 }, /* GL_BGR */

+   {  1336, 0x000080E1 }, /* GL_BGRA */

+   {  1344, 0x000080E1 }, /* GL_BGRA_EXT */

+   {  1356, 0x00008D9B }, /* GL_BGRA_INTEGER */

+   {  1372, 0x00008D9B }, /* GL_BGRA_INTEGER_EXT */

+   {  1392, 0x00008D9A }, /* GL_BGR_INTEGER */

+   {  1407, 0x00008D9A }, /* GL_BGR_INTEGER_EXT */

+   {  1426, 0x00001A00 }, /* GL_BITMAP */

+   {  1436, 0x00000704 }, /* GL_BITMAP_TOKEN */

+   {  1452, 0x00000BE2 }, /* GL_BLEND */

+   {  1461, 0x00008005 }, /* GL_BLEND_COLOR */

+   {  1476, 0x00008005 }, /* GL_BLEND_COLOR_EXT */

+   {  1495, 0x00000BE0 }, /* GL_BLEND_DST */

+   {  1508, 0x000080CA }, /* GL_BLEND_DST_ALPHA */

+   {  1527, 0x000080CA }, /* GL_BLEND_DST_ALPHA_OES */

+   {  1550, 0x000080C8 }, /* GL_BLEND_DST_RGB */

+   {  1567, 0x000080C8 }, /* GL_BLEND_DST_RGB_OES */

+   {  1588, 0x00008009 }, /* GL_BLEND_EQUATION */

+   {  1606, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */

+   {  1630, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */

+   {  1658, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_OES */

+   {  1686, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */

+   {  1708, 0x00008009 }, /* GL_BLEND_EQUATION_OES */

+   {  1730, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */

+   {  1752, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */

+   {  1778, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_OES */

+   {  1804, 0x00000BE1 }, /* GL_BLEND_SRC */

+   {  1817, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */

+   {  1836, 0x000080CB }, /* GL_BLEND_SRC_ALPHA_OES */

+   {  1859, 0x000080C9 }, /* GL_BLEND_SRC_RGB */

+   {  1876, 0x000080C9 }, /* GL_BLEND_SRC_RGB_OES */

+   {  1897, 0x00001905 }, /* GL_BLUE */

+   {  1905, 0x00000D1B }, /* GL_BLUE_BIAS */

+   {  1918, 0x00000D54 }, /* GL_BLUE_BITS */

+   {  1931, 0x00008D96 }, /* GL_BLUE_INTEGER */

+   {  1947, 0x00008D96 }, /* GL_BLUE_INTEGER_EXT */

+   {  1967, 0x00000D1A }, /* GL_BLUE_SCALE */

+   {  1981, 0x00008B56 }, /* GL_BOOL */

+   {  1989, 0x00008B56 }, /* GL_BOOL_ARB */

+   {  2001, 0x00008B57 }, /* GL_BOOL_VEC2 */

+   {  2014, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */

+   {  2031, 0x00008B58 }, /* GL_BOOL_VEC3 */

+   {  2044, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */

+   {  2061, 0x00008B59 }, /* GL_BOOL_VEC4 */

+   {  2074, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */

+   {  2091, 0x000088BB }, /* GL_BUFFER_ACCESS */

+   {  2108, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */

+   {  2129, 0x0000911F }, /* GL_BUFFER_ACCESS_FLAGS */

+   {  2152, 0x000088BB }, /* GL_BUFFER_ACCESS_OES */

+   {  2173, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */

+   {  2204, 0x000088BC }, /* GL_BUFFER_MAPPED */

+   {  2221, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */

+   {  2242, 0x000088BC }, /* GL_BUFFER_MAPPED_OES */

+   {  2263, 0x00009120 }, /* GL_BUFFER_MAP_LENGTH */

+   {  2284, 0x00009121 }, /* GL_BUFFER_MAP_OFFSET */

+   {  2305, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */

+   {  2327, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */

+   {  2353, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_OES */

+   {  2379, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */

+   {  2402, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */

+   {  2436, 0x00008764 }, /* GL_BUFFER_SIZE */

+   {  2451, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */

+   {  2470, 0x00008765 }, /* GL_BUFFER_USAGE */

+   {  2486, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */

+   {  2506, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */

+   {  2525, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */

+   {  2551, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */

+   {  2574, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */

+   {  2602, 0x0000877C }, /* GL_BUMP_TARGET_ATI */

+   {  2621, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */

+   {  2643, 0x00001400 }, /* GL_BYTE */

+   {  2651, 0x00002A24 }, /* GL_C3F_V3F */

+   {  2662, 0x00002A26 }, /* GL_C4F_N3F_V3F */

+   {  2677, 0x00002A22 }, /* GL_C4UB_V2F */

+   {  2689, 0x00002A23 }, /* GL_C4UB_V3F */

+   {  2701, 0x00000901 }, /* GL_CCW */

+   {  2708, 0x00002900 }, /* GL_CLAMP */

+   {  2717, 0x0000891C }, /* GL_CLAMP_READ_COLOR */

+   {  2737, 0x0000812D }, /* GL_CLAMP_TO_BORDER */

+   {  2756, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */

+   {  2779, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */

+   {  2803, 0x0000812F }, /* GL_CLAMP_TO_EDGE */

+   {  2820, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */

+   {  2842, 0x00001500 }, /* GL_CLEAR */

+   {  2851, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */

+   {  2876, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */

+   {  2905, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */

+   {  2931, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */

+   {  2960, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */

+   {  2986, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */

+   {  3013, 0x00003000 }, /* GL_CLIP_DISTANCE0 */

+   {  3031, 0x00003001 }, /* GL_CLIP_DISTANCE1 */

+   {  3049, 0x00003002 }, /* GL_CLIP_DISTANCE2 */

+   {  3067, 0x00003003 }, /* GL_CLIP_DISTANCE3 */

+   {  3085, 0x00003004 }, /* GL_CLIP_DISTANCE4 */

+   {  3103, 0x00003005 }, /* GL_CLIP_DISTANCE5 */

+   {  3121, 0x00003006 }, /* GL_CLIP_DISTANCE6 */

+   {  3139, 0x00003007 }, /* GL_CLIP_DISTANCE7 */

+   {  3157, 0x00003000 }, /* GL_CLIP_PLANE0 */

+   {  3172, 0x00003001 }, /* GL_CLIP_PLANE1 */

+   {  3187, 0x00003002 }, /* GL_CLIP_PLANE2 */

+   {  3202, 0x00003003 }, /* GL_CLIP_PLANE3 */

+   {  3217, 0x00003004 }, /* GL_CLIP_PLANE4 */

+   {  3232, 0x00003005 }, /* GL_CLIP_PLANE5 */

+   {  3247, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */

+   {  3280, 0x00000A00 }, /* GL_COEFF */

+   {  3289, 0x00001800 }, /* GL_COLOR */

+   {  3298, 0x00008076 }, /* GL_COLOR_ARRAY */

+   {  3313, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */

+   {  3343, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */

+   {  3377, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */

+   {  3400, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */

+   {  3420, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */

+   {  3442, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */

+   {  3462, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */

+   {  3483, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */

+   {  3508, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_OES */

+   {  3533, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */

+   {  3554, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */

+   {  3576, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */

+   {  3602, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */

+   {  3624, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */

+   {  3650, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */

+   {  3672, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */

+   {  3698, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */

+   {  3720, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */

+   {  3746, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */

+   {  3768, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */

+   {  3794, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */

+   {  3816, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */

+   {  3842, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */

+   {  3867, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */

+   {  3888, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */

+   {  3913, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */

+   {  3934, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */

+   {  3959, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */

+   {  3980, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */

+   {  4005, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */

+   {  4026, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */

+   {  4051, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */

+   {  4072, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */

+   {  4097, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */

+   {  4118, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */

+   {  4143, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */

+   {  4164, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */

+   {  4189, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */

+   {  4210, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */

+   {  4235, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */

+   {  4255, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */

+   {  4276, 0x00001900 }, /* GL_COLOR_INDEX */

+   {  4291, 0x00001603 }, /* GL_COLOR_INDEXES */

+   {  4308, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */

+   {  4326, 0x00000B57 }, /* GL_COLOR_MATERIAL */

+   {  4344, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */

+   {  4367, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */

+   {  4395, 0x000080B1 }, /* GL_COLOR_MATRIX */

+   {  4411, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */

+   {  4431, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */

+   {  4459, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */

+   {  4491, 0x00008458 }, /* GL_COLOR_SUM */

+   {  4504, 0x00008458 }, /* GL_COLOR_SUM_ARB */

+   {  4521, 0x000080D0 }, /* GL_COLOR_TABLE */

+   {  4536, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */

+   {  4562, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */

+   {  4592, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */

+   {  4622, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */

+   {  4642, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */

+   {  4666, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */

+   {  4691, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */

+   {  4720, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */

+   {  4749, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */

+   {  4771, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */

+   {  4797, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */

+   {  4823, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */

+   {  4849, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */

+   {  4879, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */

+   {  4909, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */

+   {  4939, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */

+   {  4973, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */

+   {  5007, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */

+   {  5037, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */

+   {  5071, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */

+   {  5105, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */

+   {  5129, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */

+   {  5157, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */

+   {  5185, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */

+   {  5206, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */

+   {  5231, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */

+   {  5252, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */

+   {  5277, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */

+   {  5302, 0x00000C23 }, /* GL_COLOR_WRITEMASK */

+   {  5321, 0x00008570 }, /* GL_COMBINE */

+   {  5332, 0x00008503 }, /* GL_COMBINE4 */

+   {  5344, 0x00008572 }, /* GL_COMBINE_ALPHA */

+   {  5361, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */

+   {  5382, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */

+   {  5403, 0x00008570 }, /* GL_COMBINE_ARB */

+   {  5418, 0x00008570 }, /* GL_COMBINE_EXT */

+   {  5433, 0x00008571 }, /* GL_COMBINE_RGB */

+   {  5448, 0x00008571 }, /* GL_COMBINE_RGB_ARB */

+   {  5467, 0x00008571 }, /* GL_COMBINE_RGB_EXT */

+   {  5486, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */

+   {  5522, 0x0000884E }, /* GL_COMPARE_REF_TO_TEXTURE */

+   {  5548, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */

+   {  5572, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */

+   {  5600, 0x00001300 }, /* GL_COMPILE */

+   {  5611, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */

+   {  5634, 0x00008B81 }, /* GL_COMPILE_STATUS */

+   {  5652, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */

+   {  5672, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */

+   {  5696, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */

+   {  5720, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */

+   {  5748, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */

+   {  5772, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */

+   {  5802, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */

+   {  5836, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */

+   {  5864, 0x00008225 }, /* GL_COMPRESSED_RED */

+   {  5882, 0x00008226 }, /* GL_COMPRESSED_RG */

+   {  5899, 0x000084ED }, /* GL_COMPRESSED_RGB */

+   {  5917, 0x000084EE }, /* GL_COMPRESSED_RGBA */

+   {  5936, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */

+   {  5959, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */

+   {  5988, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */

+   {  6021, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */

+   {  6054, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */

+   {  6087, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */

+   {  6109, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */

+   {  6137, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */

+   {  6169, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */

+   {  6194, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */

+   {  6225, 0x00008C48 }, /* GL_COMPRESSED_SRGB */

+   {  6244, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */

+   {  6269, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */

+   {  6299, 0x0000911C }, /* GL_CONDITION_SATISFIED */

+   {  6322, 0x00008576 }, /* GL_CONSTANT */

+   {  6334, 0x00008003 }, /* GL_CONSTANT_ALPHA */

+   {  6352, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */

+   {  6374, 0x00008576 }, /* GL_CONSTANT_ARB */

+   {  6390, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */

+   {  6414, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */

+   {  6436, 0x00008001 }, /* GL_CONSTANT_COLOR */

+   {  6454, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */

+   {  6476, 0x00008576 }, /* GL_CONSTANT_EXT */

+   {  6492, 0x00000002 }, /* GL_CONTEXT_COMPATIBILITY_PROFILE_BIT */

+   {  6529, 0x00000001 }, /* GL_CONTEXT_CORE_PROFILE_BIT */

+   {  6557, 0x0000821E }, /* GL_CONTEXT_FLAGS */

+   {  6574, 0x00000001 }, /* GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT */

+   {  6613, 0x00009126 }, /* GL_CONTEXT_PROFILE_MASK */

+   {  6637, 0x00008010 }, /* GL_CONVOLUTION_1D */

+   {  6655, 0x00008011 }, /* GL_CONVOLUTION_2D */

+   {  6673, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */

+   {  6701, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */

+   {  6732, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */

+   {  6759, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */

+   {  6790, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */

+   {  6817, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */

+   {  6848, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */

+   {  6876, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */

+   {  6908, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */

+   {  6930, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */

+   {  6956, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */

+   {  6978, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */

+   {  7004, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */

+   {  7025, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */

+   {  7050, 0x00008862 }, /* GL_COORD_REPLACE */

+   {  7067, 0x00008862 }, /* GL_COORD_REPLACE_ARB */

+   {  7088, 0x00008862 }, /* GL_COORD_REPLACE_NV */

+   {  7108, 0x00008862 }, /* GL_COORD_REPLACE_OES */

+   {  7129, 0x00001503 }, /* GL_COPY */

+   {  7137, 0x0000150C }, /* GL_COPY_INVERTED */

+   {  7154, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */

+   {  7174, 0x00008F36 }, /* GL_COPY_READ_BUFFER */

+   {  7194, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */

+   {  7215, 0x00000B44 }, /* GL_CULL_FACE */

+   {  7228, 0x00000B45 }, /* GL_CULL_FACE_MODE */

+   {  7246, 0x000081AA }, /* GL_CULL_VERTEX_EXT */

+   {  7265, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */

+   {  7297, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */

+   {  7332, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */

+   {  7353, 0x00000001 }, /* GL_CURRENT_BIT */

+   {  7368, 0x00000B00 }, /* GL_CURRENT_COLOR */

+   {  7385, 0x00008453 }, /* GL_CURRENT_FOG_COORD */

+   {  7406, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */

+   {  7432, 0x00000B01 }, /* GL_CURRENT_INDEX */

+   {  7449, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */

+   {  7471, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */

+   {  7499, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */

+   {  7520, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */

+   {  7554, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */

+   {  7587, 0x00000B02 }, /* GL_CURRENT_NORMAL */

+   {  7605, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */

+   {  7635, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_OES */

+   {  7665, 0x00008B8D }, /* GL_CURRENT_PROGRAM */

+   {  7684, 0x00008865 }, /* GL_CURRENT_QUERY */

+   {  7701, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */

+   {  7722, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */

+   {  7746, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */

+   {  7773, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */

+   {  7797, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */

+   {  7824, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */

+   {  7857, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */

+   {  7891, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */

+   {  7924, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */

+   {  7951, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */

+   {  7977, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */

+   {  8002, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */

+   {  8031, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */

+   {  8053, 0x00000900 }, /* GL_CW */

+   {  8059, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */

+   {  8080, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */

+   {  8101, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */

+   {  8121, 0x00002101 }, /* GL_DECAL */

+   {  8130, 0x00001E03 }, /* GL_DECR */

+   {  8138, 0x00008508 }, /* GL_DECR_WRAP */

+   {  8151, 0x00008508 }, /* GL_DECR_WRAP_EXT */

+   {  8168, 0x00008B80 }, /* GL_DELETE_STATUS */

+   {  8185, 0x00001801 }, /* GL_DEPTH */

+   {  8194, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */

+   {  8214, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */

+   {  8238, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */

+   {  8262, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */

+   {  8282, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */

+   {  8306, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */

+   {  8330, 0x00000D1F }, /* GL_DEPTH_BIAS */

+   {  8344, 0x00000D56 }, /* GL_DEPTH_BITS */

+   {  8358, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */

+   {  8378, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */

+   {  8403, 0x00008223 }, /* GL_DEPTH_BUFFER */

+   {  8419, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */

+   {  8439, 0x0000864F }, /* GL_DEPTH_CLAMP */

+   {  8454, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */

+   {  8472, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */

+   {  8493, 0x00001902 }, /* GL_DEPTH_COMPONENT */

+   {  8512, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */

+   {  8533, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */

+   {  8558, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */

+   {  8583, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */

+   {  8609, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */

+   {  8630, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */

+   {  8655, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */

+   {  8680, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */

+   {  8706, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */

+   {  8727, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */

+   {  8752, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */

+   {  8777, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */

+   {  8803, 0x00000B74 }, /* GL_DEPTH_FUNC */

+   {  8817, 0x00000B70 }, /* GL_DEPTH_RANGE */

+   {  8832, 0x00000D1E }, /* GL_DEPTH_SCALE */

+   {  8847, 0x000084F9 }, /* GL_DEPTH_STENCIL */

+   {  8864, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */

+   {  8892, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */

+   {  8913, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */

+   {  8933, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */

+   {  8954, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */

+   {  8982, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */

+   {  9010, 0x00000B71 }, /* GL_DEPTH_TEST */

+   {  9024, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */

+   {  9046, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */

+   {  9072, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */

+   {  9091, 0x00001201 }, /* GL_DIFFUSE */

+   {  9102, 0x00000BD0 }, /* GL_DITHER */

+   {  9112, 0x00000A02 }, /* GL_DOMAIN */

+   {  9122, 0x00001100 }, /* GL_DONT_CARE */

+   {  9135, 0x000086AE }, /* GL_DOT3_RGB */

+   {  9147, 0x000086AF }, /* GL_DOT3_RGBA */

+   {  9160, 0x000086AF }, /* GL_DOT3_RGBA_ARB */

+   {  9177, 0x00008741 }, /* GL_DOT3_RGBA_EXT */

+   {  9194, 0x000086AE }, /* GL_DOT3_RGB_ARB */

+   {  9210, 0x00008740 }, /* GL_DOT3_RGB_EXT */

+   {  9226, 0x0000140A }, /* GL_DOUBLE */

+   {  9236, 0x00000C32 }, /* GL_DOUBLEBUFFER */

+   {  9252, 0x00000C01 }, /* GL_DRAW_BUFFER */

+   {  9267, 0x00008825 }, /* GL_DRAW_BUFFER0 */

+   {  9283, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */

+   {  9303, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */

+   {  9323, 0x00008826 }, /* GL_DRAW_BUFFER1 */

+   {  9339, 0x0000882F }, /* GL_DRAW_BUFFER10 */

+   {  9356, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */

+   {  9377, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */

+   {  9398, 0x00008830 }, /* GL_DRAW_BUFFER11 */

+   {  9415, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */

+   {  9436, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */

+   {  9457, 0x00008831 }, /* GL_DRAW_BUFFER12 */

+   {  9474, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */

+   {  9495, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */

+   {  9516, 0x00008832 }, /* GL_DRAW_BUFFER13 */

+   {  9533, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */

+   {  9554, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */

+   {  9575, 0x00008833 }, /* GL_DRAW_BUFFER14 */

+   {  9592, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */

+   {  9613, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */

+   {  9634, 0x00008834 }, /* GL_DRAW_BUFFER15 */

+   {  9651, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */

+   {  9672, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */

+   {  9693, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */

+   {  9713, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */

+   {  9733, 0x00008827 }, /* GL_DRAW_BUFFER2 */

+   {  9749, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */

+   {  9769, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */

+   {  9789, 0x00008828 }, /* GL_DRAW_BUFFER3 */

+   {  9805, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */

+   {  9825, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */

+   {  9845, 0x00008829 }, /* GL_DRAW_BUFFER4 */

+   {  9861, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */

+   {  9881, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */

+   {  9901, 0x0000882A }, /* GL_DRAW_BUFFER5 */

+   {  9917, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */

+   {  9937, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */

+   {  9957, 0x0000882B }, /* GL_DRAW_BUFFER6 */

+   {  9973, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */

+   {  9993, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */

+   { 10013, 0x0000882C }, /* GL_DRAW_BUFFER7 */

+   { 10029, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */

+   { 10049, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */

+   { 10069, 0x0000882D }, /* GL_DRAW_BUFFER8 */

+   { 10085, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */

+   { 10105, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */

+   { 10125, 0x0000882E }, /* GL_DRAW_BUFFER9 */

+   { 10141, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */

+   { 10161, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */

+   { 10181, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */

+   { 10201, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */

+   { 10229, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */

+   { 10261, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */

+   { 10285, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */

+   { 10305, 0x00000304 }, /* GL_DST_ALPHA */

+   { 10318, 0x00000306 }, /* GL_DST_COLOR */

+   { 10331, 0x0000877A }, /* GL_DU8DV8_ATI */

+   { 10345, 0x00008779 }, /* GL_DUDV_ATI */

+   { 10357, 0x000088EA }, /* GL_DYNAMIC_COPY */

+   { 10373, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */

+   { 10393, 0x000088E8 }, /* GL_DYNAMIC_DRAW */

+   { 10409, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */

+   { 10429, 0x000088E9 }, /* GL_DYNAMIC_READ */

+   { 10445, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */

+   { 10465, 0x00000B43 }, /* GL_EDGE_FLAG */

+   { 10478, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */

+   { 10497, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */

+   { 10531, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */

+   { 10569, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */

+   { 10596, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */

+   { 10622, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */

+   { 10646, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */

+   { 10678, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */

+   { 10714, 0x00001600 }, /* GL_EMISSION */

+   { 10726, 0x00002000 }, /* GL_ENABLE_BIT */

+   { 10740, 0x00000202 }, /* GL_EQUAL */

+   { 10749, 0x00001509 }, /* GL_EQUIV */

+   { 10758, 0x00010000 }, /* GL_EVAL_BIT */

+   { 10770, 0x00000800 }, /* GL_EXP */

+   { 10777, 0x00000801 }, /* GL_EXP2 */

+   { 10785, 0x00001F03 }, /* GL_EXTENSIONS */

+   { 10799, 0x00002400 }, /* GL_EYE_LINEAR */

+   { 10813, 0x00002502 }, /* GL_EYE_PLANE */

+   { 10826, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */

+   { 10851, 0x0000855B }, /* GL_EYE_RADIAL_NV */

+   { 10868, 0x00000000 }, /* GL_FALSE */

+   { 10877, 0x00001101 }, /* GL_FASTEST */

+   { 10888, 0x00001C01 }, /* GL_FEEDBACK */

+   { 10900, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */

+   { 10927, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */

+   { 10951, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */

+   { 10975, 0x00001B02 }, /* GL_FILL */

+   { 10983, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */

+   { 11010, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */

+   { 11041, 0x0000140C }, /* GL_FIXED */

+   { 11050, 0x0000140C }, /* GL_FIXED_OES */

+   { 11063, 0x0000891D }, /* GL_FIXED_ONLY */

+   { 11077, 0x00001D00 }, /* GL_FLAT */

+   { 11085, 0x00001406 }, /* GL_FLOAT */

+   { 11094, 0x00008B5A }, /* GL_FLOAT_MAT2 */

+   { 11108, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */

+   { 11126, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */

+   { 11142, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */

+   { 11158, 0x00008B5B }, /* GL_FLOAT_MAT3 */

+   { 11172, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */

+   { 11190, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */

+   { 11206, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */

+   { 11222, 0x00008B5C }, /* GL_FLOAT_MAT4 */

+   { 11236, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */

+   { 11254, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */

+   { 11270, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */

+   { 11286, 0x00008B50 }, /* GL_FLOAT_VEC2 */

+   { 11300, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */

+   { 11318, 0x00008B51 }, /* GL_FLOAT_VEC3 */

+   { 11332, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */

+   { 11350, 0x00008B52 }, /* GL_FLOAT_VEC4 */

+   { 11364, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */

+   { 11382, 0x00000B60 }, /* GL_FOG */

+   { 11389, 0x00000080 }, /* GL_FOG_BIT */

+   { 11400, 0x00000B66 }, /* GL_FOG_COLOR */

+   { 11413, 0x00008451 }, /* GL_FOG_COORD */

+   { 11426, 0x00008451 }, /* GL_FOG_COORDINATE */

+   { 11444, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */

+   { 11468, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */

+   { 11507, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */

+   { 11550, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */

+   { 11582, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */

+   { 11613, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */

+   { 11642, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */

+   { 11667, 0x00008457 }, /* GL_FOG_COORD_ARRAY */

+   { 11686, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */

+   { 11720, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */

+   { 11747, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */

+   { 11773, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */

+   { 11797, 0x00008450 }, /* GL_FOG_COORD_SRC */

+   { 11814, 0x00000B62 }, /* GL_FOG_DENSITY */

+   { 11829, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */

+   { 11853, 0x00000B64 }, /* GL_FOG_END */

+   { 11864, 0x00000C54 }, /* GL_FOG_HINT */

+   { 11876, 0x00000B61 }, /* GL_FOG_INDEX */

+   { 11889, 0x00000B65 }, /* GL_FOG_MODE */

+   { 11901, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */

+   { 11920, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */

+   { 11945, 0x00000B63 }, /* GL_FOG_START */

+   { 11958, 0x00008452 }, /* GL_FRAGMENT_DEPTH */

+   { 11976, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */

+   { 12000, 0x00008B30 }, /* GL_FRAGMENT_SHADER */

+   { 12019, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */

+   { 12042, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */

+   { 12077, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */

+   { 12116, 0x00008D40 }, /* GL_FRAMEBUFFER */

+   { 12131, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */

+   { 12168, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */

+   { 12204, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */

+   { 12245, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */

+   { 12286, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */

+   { 12323, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */

+   { 12360, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */

+   { 12394, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */

+   { 12432, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */

+   { 12470, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */

+   { 12512, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */

+   { 12554, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */

+   { 12592, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */

+   { 12634, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */

+   { 12676, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */

+   { 12711, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */

+   { 12750, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */

+   { 12799, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */

+   { 12848, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */

+   { 12896, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */

+   { 12948, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */

+   { 13000, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */

+   { 13040, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */

+   { 13084, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */

+   { 13124, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */

+   { 13168, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */

+   { 13212, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */

+   { 13235, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */

+   { 13262, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */

+   { 13289, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */

+   { 13313, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */

+   { 13341, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */

+   { 13369, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */

+   { 13392, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */

+   { 13411, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */

+   { 13448, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */

+   { 13489, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */

+   { 13530, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */

+   { 13567, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */

+   { 13608, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */

+   { 13649, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */

+   { 13687, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */

+   { 13729, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */

+   { 13771, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */

+   { 13822, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */

+   { 13860, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */

+   { 13898, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */

+   { 13940, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */

+   { 13980, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */

+   { 14024, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */

+   { 14069, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */

+   { 14118, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */

+   { 14167, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */

+   { 14205, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */

+   { 14247, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */

+   { 14285, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */

+   { 14327, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */

+   { 14369, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */

+   { 14388, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */

+   { 14420, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */

+   { 14445, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */

+   { 14472, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */

+   { 14503, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */

+   { 14534, 0x00000404 }, /* GL_FRONT */

+   { 14543, 0x00000408 }, /* GL_FRONT_AND_BACK */

+   { 14561, 0x00000B46 }, /* GL_FRONT_FACE */

+   { 14575, 0x00000400 }, /* GL_FRONT_LEFT */

+   { 14589, 0x00000401 }, /* GL_FRONT_RIGHT */

+   { 14604, 0x00008006 }, /* GL_FUNC_ADD */

+   { 14616, 0x00008006 }, /* GL_FUNC_ADD_EXT */

+   { 14632, 0x00008006 }, /* GL_FUNC_ADD_OES */

+   { 14648, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */

+   { 14673, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */

+   { 14702, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */

+   { 14731, 0x0000800A }, /* GL_FUNC_SUBTRACT */

+   { 14748, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */

+   { 14769, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */

+   { 14790, 0x00008191 }, /* GL_GENERATE_MIPMAP */

+   { 14809, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */

+   { 14833, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */

+   { 14862, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */

+   { 14886, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */

+   { 14909, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */

+   { 14936, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */

+   { 14960, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */

+   { 14988, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */

+   { 15007, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */

+   { 15030, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */

+   { 15055, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */

+   { 15084, 0x00000206 }, /* GL_GEQUAL */

+   { 15094, 0x00000204 }, /* GL_GREATER */

+   { 15105, 0x00001904 }, /* GL_GREEN */

+   { 15114, 0x00000D19 }, /* GL_GREEN_BIAS */

+   { 15128, 0x00000D53 }, /* GL_GREEN_BITS */

+   { 15142, 0x00008D95 }, /* GL_GREEN_INTEGER */

+   { 15159, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */

+   { 15180, 0x00000D18 }, /* GL_GREEN_SCALE */

+   { 15195, 0x0000140B }, /* GL_HALF_FLOAT */

+   { 15209, 0x00008D61 }, /* GL_HALF_FLOAT_OES */

+   { 15227, 0x00008DF2 }, /* GL_HIGH_FLOAT */

+   { 15241, 0x00008DF5 }, /* GL_HIGH_INT */

+   { 15253, 0x00008000 }, /* GL_HINT_BIT */

+   { 15265, 0x00008024 }, /* GL_HISTOGRAM */

+   { 15278, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */

+   { 15302, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */

+   { 15330, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */

+   { 15353, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */

+   { 15380, 0x00008024 }, /* GL_HISTOGRAM_EXT */

+   { 15397, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */

+   { 15417, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */

+   { 15441, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */

+   { 15465, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */

+   { 15493, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */

+   { 15521, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */

+   { 15553, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */

+   { 15575, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */

+   { 15601, 0x0000802D }, /* GL_HISTOGRAM_SINK */

+   { 15619, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */

+   { 15641, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */

+   { 15660, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */

+   { 15683, 0x0000862A }, /* GL_IDENTITY_NV */

+   { 15698, 0x00008150 }, /* GL_IGNORE_BORDER_HP */

+   { 15718, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */

+   { 15754, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */

+   { 15794, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */

+   { 15828, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */

+   { 15866, 0x00001E02 }, /* GL_INCR */

+   { 15874, 0x00008507 }, /* GL_INCR_WRAP */

+   { 15887, 0x00008507 }, /* GL_INCR_WRAP_EXT */

+   { 15904, 0x00008222 }, /* GL_INDEX */

+   { 15913, 0x00008077 }, /* GL_INDEX_ARRAY */

+   { 15928, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */

+   { 15958, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */

+   { 15992, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */

+   { 16015, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */

+   { 16037, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */

+   { 16057, 0x00000D51 }, /* GL_INDEX_BITS */

+   { 16071, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */

+   { 16092, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */

+   { 16110, 0x00000C30 }, /* GL_INDEX_MODE */

+   { 16124, 0x00000D13 }, /* GL_INDEX_OFFSET */

+   { 16140, 0x00000D12 }, /* GL_INDEX_SHIFT */

+   { 16155, 0x00000C21 }, /* GL_INDEX_WRITEMASK */

+   { 16174, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */

+   { 16193, 0x00001404 }, /* GL_INT */

+   { 16200, 0x00008049 }, /* GL_INTENSITY */

+   { 16213, 0x0000804C }, /* GL_INTENSITY12 */

+   { 16228, 0x0000804C }, /* GL_INTENSITY12_EXT */

+   { 16247, 0x0000804D }, /* GL_INTENSITY16 */

+   { 16262, 0x00008D8B }, /* GL_INTENSITY16I_EXT */

+   { 16282, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */

+   { 16303, 0x0000804D }, /* GL_INTENSITY16_EXT */

+   { 16322, 0x00008D85 }, /* GL_INTENSITY32I_EXT */

+   { 16342, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */

+   { 16363, 0x0000804A }, /* GL_INTENSITY4 */

+   { 16377, 0x0000804A }, /* GL_INTENSITY4_EXT */

+   { 16395, 0x0000804B }, /* GL_INTENSITY8 */

+   { 16409, 0x00008D91 }, /* GL_INTENSITY8I_EXT */

+   { 16428, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */

+   { 16448, 0x0000804B }, /* GL_INTENSITY8_EXT */

+   { 16466, 0x00008049 }, /* GL_INTENSITY_EXT */

+   { 16483, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */

+   { 16506, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */

+   { 16533, 0x00008575 }, /* GL_INTERPOLATE */

+   { 16548, 0x00008575 }, /* GL_INTERPOLATE_ARB */

+   { 16567, 0x00008575 }, /* GL_INTERPOLATE_EXT */

+   { 16586, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */

+   { 16608, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */

+   { 16626, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */

+   { 16650, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */

+   { 16678, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */

+   { 16700, 0x00008DCA }, /* GL_INT_SAMPLER_2D */

+   { 16718, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */

+   { 16742, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */

+   { 16770, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */

+   { 16792, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */

+   { 16815, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */

+   { 16842, 0x00008DCB }, /* GL_INT_SAMPLER_3D */

+   { 16860, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */

+   { 16882, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */

+   { 16904, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */

+   { 16930, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */

+   { 16950, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */

+   { 16974, 0x00008B53 }, /* GL_INT_VEC2 */

+   { 16986, 0x00008B53 }, /* GL_INT_VEC2_ARB */

+   { 17002, 0x00008B54 }, /* GL_INT_VEC3 */

+   { 17014, 0x00008B54 }, /* GL_INT_VEC3_ARB */

+   { 17030, 0x00008B55 }, /* GL_INT_VEC4 */

+   { 17042, 0x00008B55 }, /* GL_INT_VEC4_ARB */

+   { 17058, 0x00000500 }, /* GL_INVALID_ENUM */

+   { 17074, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */

+   { 17107, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */

+   { 17144, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */

+   { 17181, 0x00000502 }, /* GL_INVALID_OPERATION */

+   { 17202, 0x00000501 }, /* GL_INVALID_VALUE */

+   { 17219, 0x0000862B }, /* GL_INVERSE_NV */

+   { 17233, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */

+   { 17257, 0x0000150A }, /* GL_INVERT */

+   { 17267, 0x00001E00 }, /* GL_KEEP */

+   { 17275, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */

+   { 17301, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */

+   { 17331, 0x00000406 }, /* GL_LEFT */

+   { 17339, 0x00000203 }, /* GL_LEQUAL */

+   { 17349, 0x00000201 }, /* GL_LESS */

+   { 17357, 0x00004000 }, /* GL_LIGHT0 */

+   { 17367, 0x00004001 }, /* GL_LIGHT1 */

+   { 17377, 0x00004002 }, /* GL_LIGHT2 */

+   { 17387, 0x00004003 }, /* GL_LIGHT3 */

+   { 17397, 0x00004004 }, /* GL_LIGHT4 */

+   { 17407, 0x00004005 }, /* GL_LIGHT5 */

+   { 17417, 0x00004006 }, /* GL_LIGHT6 */

+   { 17427, 0x00004007 }, /* GL_LIGHT7 */

+   { 17437, 0x00000B50 }, /* GL_LIGHTING */

+   { 17449, 0x00000040 }, /* GL_LIGHTING_BIT */

+   { 17465, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */

+   { 17488, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */

+   { 17517, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */

+   { 17550, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */

+   { 17578, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */

+   { 17602, 0x00001B01 }, /* GL_LINE */

+   { 17610, 0x00002601 }, /* GL_LINEAR */

+   { 17620, 0x00001208 }, /* GL_LINEAR_ATTENUATION */

+   { 17642, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */

+   { 17672, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */

+   { 17703, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */

+   { 17727, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */

+   { 17752, 0x00000001 }, /* GL_LINES */

+   { 17761, 0x0000000A }, /* GL_LINES_ADJACENCY */

+   { 17780, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */

+   { 17803, 0x00000004 }, /* GL_LINE_BIT */

+   { 17815, 0x00000002 }, /* GL_LINE_LOOP */

+   { 17828, 0x00000707 }, /* GL_LINE_RESET_TOKEN */

+   { 17848, 0x00000B20 }, /* GL_LINE_SMOOTH */

+   { 17863, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */

+   { 17883, 0x00000B24 }, /* GL_LINE_STIPPLE */

+   { 17899, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */

+   { 17923, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */

+   { 17946, 0x00000003 }, /* GL_LINE_STRIP */

+   { 17960, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */

+   { 17984, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */

+   { 18012, 0x00000702 }, /* GL_LINE_TOKEN */

+   { 18026, 0x00000B21 }, /* GL_LINE_WIDTH */

+   { 18040, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */

+   { 18066, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */

+   { 18086, 0x00008B82 }, /* GL_LINK_STATUS */

+   { 18101, 0x00000B32 }, /* GL_LIST_BASE */

+   { 18114, 0x00020000 }, /* GL_LIST_BIT */

+   { 18126, 0x00000B33 }, /* GL_LIST_INDEX */

+   { 18140, 0x00000B30 }, /* GL_LIST_MODE */

+   { 18153, 0x00000101 }, /* GL_LOAD */

+   { 18161, 0x00000BF1 }, /* GL_LOGIC_OP */

+   { 18173, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */

+   { 18190, 0x00008CA1 }, /* GL_LOWER_LEFT */

+   { 18204, 0x00008DF0 }, /* GL_LOW_FLOAT */

+   { 18217, 0x00008DF3 }, /* GL_LOW_INT */

+   { 18228, 0x00001909 }, /* GL_LUMINANCE */

+   { 18241, 0x00008041 }, /* GL_LUMINANCE12 */

+   { 18256, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */

+   { 18279, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */

+   { 18306, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */

+   { 18328, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */

+   { 18354, 0x00008041 }, /* GL_LUMINANCE12_EXT */

+   { 18373, 0x00008042 }, /* GL_LUMINANCE16 */

+   { 18388, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */

+   { 18408, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */

+   { 18429, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */

+   { 18452, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */

+   { 18479, 0x00008042 }, /* GL_LUMINANCE16_EXT */

+   { 18498, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */

+   { 18518, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */

+   { 18539, 0x0000803F }, /* GL_LUMINANCE4 */

+   { 18553, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */

+   { 18574, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */

+   { 18599, 0x0000803F }, /* GL_LUMINANCE4_EXT */

+   { 18617, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */

+   { 18638, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */

+   { 18663, 0x00008040 }, /* GL_LUMINANCE8 */

+   { 18677, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */

+   { 18696, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */

+   { 18716, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */

+   { 18737, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */

+   { 18762, 0x00008040 }, /* GL_LUMINANCE8_EXT */

+   { 18780, 0x0000190A }, /* GL_LUMINANCE_ALPHA */

+   { 18799, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */

+   { 18825, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */

+   { 18852, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */

+   { 18878, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */

+   { 18905, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */

+   { 18930, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */

+   { 18956, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */

+   { 18987, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */

+   { 19012, 0x0000821B }, /* GL_MAJOR_VERSION */

+   { 19029, 0x00000D90 }, /* GL_MAP1_COLOR_4 */

+   { 19045, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */

+   { 19065, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */

+   { 19087, 0x00000D91 }, /* GL_MAP1_INDEX */

+   { 19101, 0x00000D92 }, /* GL_MAP1_NORMAL */

+   { 19116, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */

+   { 19140, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */

+   { 19164, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */

+   { 19188, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */

+   { 19212, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */

+   { 19229, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */

+   { 19246, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */

+   { 19274, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */

+   { 19303, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */

+   { 19332, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */

+   { 19361, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */

+   { 19390, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */

+   { 19419, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */

+   { 19448, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */

+   { 19476, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */

+   { 19504, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */

+   { 19532, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */

+   { 19560, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */

+   { 19588, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */

+   { 19616, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */

+   { 19644, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */

+   { 19672, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */

+   { 19700, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */

+   { 19716, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */

+   { 19736, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */

+   { 19758, 0x00000DB1 }, /* GL_MAP2_INDEX */

+   { 19772, 0x00000DB2 }, /* GL_MAP2_NORMAL */

+   { 19787, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */

+   { 19811, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */

+   { 19835, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */

+   { 19859, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */

+   { 19883, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */

+   { 19900, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */

+   { 19917, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */

+   { 19945, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */

+   { 19974, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */

+   { 20003, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */

+   { 20032, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */

+   { 20061, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */

+   { 20090, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */

+   { 20119, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */

+   { 20147, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */

+   { 20175, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */

+   { 20203, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */

+   { 20231, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */

+   { 20259, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */

+   { 20287, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */

+   { 20315, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */

+   { 20343, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */

+   { 20371, 0x00000D10 }, /* GL_MAP_COLOR */

+   { 20384, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */

+   { 20410, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */

+   { 20439, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */

+   { 20467, 0x00000001 }, /* GL_MAP_READ_BIT */

+   { 20483, 0x00000D11 }, /* GL_MAP_STENCIL */

+   { 20498, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */

+   { 20524, 0x00000002 }, /* GL_MAP_WRITE_BIT */

+   { 20541, 0x000088C0 }, /* GL_MATRIX0_ARB */

+   { 20556, 0x00008630 }, /* GL_MATRIX0_NV */

+   { 20570, 0x000088CA }, /* GL_MATRIX10_ARB */

+   { 20586, 0x000088CB }, /* GL_MATRIX11_ARB */

+   { 20602, 0x000088CC }, /* GL_MATRIX12_ARB */

+   { 20618, 0x000088CD }, /* GL_MATRIX13_ARB */

+   { 20634, 0x000088CE }, /* GL_MATRIX14_ARB */

+   { 20650, 0x000088CF }, /* GL_MATRIX15_ARB */

+   { 20666, 0x000088D0 }, /* GL_MATRIX16_ARB */

+   { 20682, 0x000088D1 }, /* GL_MATRIX17_ARB */

+   { 20698, 0x000088D2 }, /* GL_MATRIX18_ARB */

+   { 20714, 0x000088D3 }, /* GL_MATRIX19_ARB */

+   { 20730, 0x000088C1 }, /* GL_MATRIX1_ARB */

+   { 20745, 0x00008631 }, /* GL_MATRIX1_NV */

+   { 20759, 0x000088D4 }, /* GL_MATRIX20_ARB */

+   { 20775, 0x000088D5 }, /* GL_MATRIX21_ARB */

+   { 20791, 0x000088D6 }, /* GL_MATRIX22_ARB */

+   { 20807, 0x000088D7 }, /* GL_MATRIX23_ARB */

+   { 20823, 0x000088D8 }, /* GL_MATRIX24_ARB */

+   { 20839, 0x000088D9 }, /* GL_MATRIX25_ARB */

+   { 20855, 0x000088DA }, /* GL_MATRIX26_ARB */

+   { 20871, 0x000088DB }, /* GL_MATRIX27_ARB */

+   { 20887, 0x000088DC }, /* GL_MATRIX28_ARB */

+   { 20903, 0x000088DD }, /* GL_MATRIX29_ARB */

+   { 20919, 0x000088C2 }, /* GL_MATRIX2_ARB */

+   { 20934, 0x00008632 }, /* GL_MATRIX2_NV */

+   { 20948, 0x000088DE }, /* GL_MATRIX30_ARB */

+   { 20964, 0x000088DF }, /* GL_MATRIX31_ARB */

+   { 20980, 0x000088C3 }, /* GL_MATRIX3_ARB */

+   { 20995, 0x00008633 }, /* GL_MATRIX3_NV */

+   { 21009, 0x000088C4 }, /* GL_MATRIX4_ARB */

+   { 21024, 0x00008634 }, /* GL_MATRIX4_NV */

+   { 21038, 0x000088C5 }, /* GL_MATRIX5_ARB */

+   { 21053, 0x00008635 }, /* GL_MATRIX5_NV */

+   { 21067, 0x000088C6 }, /* GL_MATRIX6_ARB */

+   { 21082, 0x00008636 }, /* GL_MATRIX6_NV */

+   { 21096, 0x000088C7 }, /* GL_MATRIX7_ARB */

+   { 21111, 0x00008637 }, /* GL_MATRIX7_NV */

+   { 21125, 0x000088C8 }, /* GL_MATRIX8_ARB */

+   { 21140, 0x000088C9 }, /* GL_MATRIX9_ARB */

+   { 21155, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */

+   { 21181, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */

+   { 21222, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */

+   { 21248, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */

+   { 21282, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */

+   { 21316, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */

+   { 21347, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */

+   { 21378, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */

+   { 21411, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */

+   { 21444, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */

+   { 21475, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */

+   { 21506, 0x00000BA0 }, /* GL_MATRIX_MODE */

+   { 21521, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */

+   { 21543, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */

+   { 21565, 0x00008008 }, /* GL_MAX */

+   { 21572, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */

+   { 21595, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */

+   { 21622, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */

+   { 21650, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */

+   { 21682, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */

+   { 21708, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */

+   { 21741, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */

+   { 21767, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */

+   { 21801, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */

+   { 21823, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */

+   { 21842, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */

+   { 21867, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */

+   { 21896, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */

+   { 21928, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */

+   { 21964, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */

+   { 22000, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */

+   { 22040, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */

+   { 22066, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */

+   { 22096, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */

+   { 22121, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */

+   { 22150, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */

+   { 22179, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */

+   { 22212, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */

+   { 22245, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */

+   { 22265, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */

+   { 22289, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */

+   { 22313, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */

+   { 22337, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */

+   { 22362, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */

+   { 22380, 0x00008008 }, /* GL_MAX_EXT */

+   { 22391, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */

+   { 22424, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */

+   { 22459, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */

+   { 22498, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */

+   { 22530, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */

+   { 22563, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */

+   { 22597, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */

+   { 22629, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */

+   { 22665, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */

+   { 22701, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */

+   { 22741, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */

+   { 22781, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */

+   { 22825, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */

+   { 22860, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */

+   { 22899, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */

+   { 22938, 0x00000D31 }, /* GL_MAX_LIGHTS */

+   { 22952, 0x00000B31 }, /* GL_MAX_LIST_NESTING */

+   { 22972, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */

+   { 23010, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */

+   { 23039, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */

+   { 23063, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */

+   { 23091, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */

+   { 23119, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */

+   { 23142, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */

+   { 23179, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */

+   { 23215, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */

+   { 23242, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */

+   { 23271, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */

+   { 23305, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */

+   { 23341, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */

+   { 23368, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */

+   { 23400, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */

+   { 23436, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */

+   { 23465, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */

+   { 23494, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */

+   { 23522, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */

+   { 23560, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */

+   { 23604, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */

+   { 23647, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */

+   { 23681, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */

+   { 23720, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */

+   { 23757, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */

+   { 23795, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */

+   { 23838, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */

+   { 23881, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */

+   { 23911, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */

+   { 23942, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */

+   { 23970, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET_EXT */

+   { 24002, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */

+   { 24038, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */

+   { 24074, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */

+   { 24104, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */

+   { 24134, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */

+   { 24168, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */

+   { 24201, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */

+   { 24226, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */

+   { 24255, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */

+   { 24284, 0x00008D57 }, /* GL_MAX_SAMPLES */

+   { 24299, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */

+   { 24318, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */

+   { 24345, 0x00008504 }, /* GL_MAX_SHININESS_NV */

+   { 24365, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */

+   { 24389, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */

+   { 24416, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */

+   { 24438, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */

+   { 24464, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */

+   { 24491, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */

+   { 24522, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */

+   { 24546, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */

+   { 24574, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */

+   { 24608, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */

+   { 24628, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */

+   { 24655, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */

+   { 24676, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */

+   { 24701, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */

+   { 24726, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */

+   { 24761, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */

+   { 24810, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */

+   { 24863, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */

+   { 24906, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */

+   { 24953, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */

+   { 24999, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */

+   { 25049, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */

+   { 25075, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */

+   { 25097, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */

+   { 25123, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */

+   { 25146, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */

+   { 25168, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */

+   { 25194, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */

+   { 25226, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */

+   { 25260, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */

+   { 25298, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */

+   { 25331, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */

+   { 25368, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */

+   { 25398, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */

+   { 25422, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */

+   { 25446, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */

+   { 25483, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */

+   { 25504, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */

+   { 25520, 0x00008DF4 }, /* GL_MEDIUM_INT */

+   { 25534, 0x00008007 }, /* GL_MIN */

+   { 25541, 0x0000802E }, /* GL_MINMAX */

+   { 25551, 0x0000802E }, /* GL_MINMAX_EXT */

+   { 25565, 0x0000802F }, /* GL_MINMAX_FORMAT */

+   { 25582, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */

+   { 25603, 0x00008030 }, /* GL_MINMAX_SINK */

+   { 25618, 0x00008030 }, /* GL_MINMAX_SINK_EXT */

+   { 25637, 0x0000821C }, /* GL_MINOR_VERSION */

+   { 25654, 0x00008007 }, /* GL_MIN_EXT */

+   { 25665, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */

+   { 25693, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET_EXT */

+   { 25725, 0x00008370 }, /* GL_MIRRORED_REPEAT */

+   { 25744, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */

+   { 25767, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */

+   { 25790, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */

+   { 25810, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */

+   { 25830, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */

+   { 25860, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */

+   { 25888, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */

+   { 25916, 0x00001700 }, /* GL_MODELVIEW */

+   { 25929, 0x00001700 }, /* GL_MODELVIEW0_ARB */

+   { 25947, 0x0000872A }, /* GL_MODELVIEW10_ARB */

+   { 25966, 0x0000872B }, /* GL_MODELVIEW11_ARB */

+   { 25985, 0x0000872C }, /* GL_MODELVIEW12_ARB */

+   { 26004, 0x0000872D }, /* GL_MODELVIEW13_ARB */

+   { 26023, 0x0000872E }, /* GL_MODELVIEW14_ARB */

+   { 26042, 0x0000872F }, /* GL_MODELVIEW15_ARB */

+   { 26061, 0x00008730 }, /* GL_MODELVIEW16_ARB */

+   { 26080, 0x00008731 }, /* GL_MODELVIEW17_ARB */

+   { 26099, 0x00008732 }, /* GL_MODELVIEW18_ARB */

+   { 26118, 0x00008733 }, /* GL_MODELVIEW19_ARB */

+   { 26137, 0x0000850A }, /* GL_MODELVIEW1_ARB */

+   { 26155, 0x00008734 }, /* GL_MODELVIEW20_ARB */

+   { 26174, 0x00008735 }, /* GL_MODELVIEW21_ARB */

+   { 26193, 0x00008736 }, /* GL_MODELVIEW22_ARB */

+   { 26212, 0x00008737 }, /* GL_MODELVIEW23_ARB */

+   { 26231, 0x00008738 }, /* GL_MODELVIEW24_ARB */

+   { 26250, 0x00008739 }, /* GL_MODELVIEW25_ARB */

+   { 26269, 0x0000873A }, /* GL_MODELVIEW26_ARB */

+   { 26288, 0x0000873B }, /* GL_MODELVIEW27_ARB */

+   { 26307, 0x0000873C }, /* GL_MODELVIEW28_ARB */

+   { 26326, 0x0000873D }, /* GL_MODELVIEW29_ARB */

+   { 26345, 0x00008722 }, /* GL_MODELVIEW2_ARB */

+   { 26363, 0x0000873E }, /* GL_MODELVIEW30_ARB */

+   { 26382, 0x0000873F }, /* GL_MODELVIEW31_ARB */

+   { 26401, 0x00008723 }, /* GL_MODELVIEW3_ARB */

+   { 26419, 0x00008724 }, /* GL_MODELVIEW4_ARB */

+   { 26437, 0x00008725 }, /* GL_MODELVIEW5_ARB */

+   { 26455, 0x00008726 }, /* GL_MODELVIEW6_ARB */

+   { 26473, 0x00008727 }, /* GL_MODELVIEW7_ARB */

+   { 26491, 0x00008728 }, /* GL_MODELVIEW8_ARB */

+   { 26509, 0x00008729 }, /* GL_MODELVIEW9_ARB */

+   { 26527, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */

+   { 26547, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */

+   { 26589, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */

+   { 26616, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */

+   { 26641, 0x00002100 }, /* GL_MODULATE */

+   { 26653, 0x00008744 }, /* GL_MODULATE_ADD_ATI */

+   { 26673, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */

+   { 26700, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */

+   { 26725, 0x00000103 }, /* GL_MULT */

+   { 26733, 0x0000809D }, /* GL_MULTISAMPLE */

+   { 26748, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */

+   { 26768, 0x0000809D }, /* GL_MULTISAMPLE_ARB */

+   { 26787, 0x20000000 }, /* GL_MULTISAMPLE_BIT */

+   { 26806, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */

+   { 26830, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */

+   { 26853, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */

+   { 26883, 0x00002A25 }, /* GL_N3F_V3F */

+   { 26894, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */

+   { 26914, 0x0000150E }, /* GL_NAND */

+   { 26922, 0x00002600 }, /* GL_NEAREST */

+   { 26933, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */

+   { 26964, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */

+   { 26996, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */

+   { 27021, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */

+   { 27047, 0x00000200 }, /* GL_NEVER */

+   { 27056, 0x00001102 }, /* GL_NICEST */

+   { 27066, 0x00000000 }, /* GL_NONE */

+   { 27074, 0x00000000 }, /* GL_NONE_OES */

+   { 27086, 0x00001505 }, /* GL_NOOP */

+   { 27094, 0x00001508 }, /* GL_NOR */

+   { 27101, 0x00000BA1 }, /* GL_NORMALIZE */

+   { 27114, 0x00008075 }, /* GL_NORMAL_ARRAY */

+   { 27130, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */

+   { 27161, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */

+   { 27196, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */

+   { 27220, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */

+   { 27243, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */

+   { 27264, 0x00008511 }, /* GL_NORMAL_MAP */

+   { 27278, 0x00008511 }, /* GL_NORMAL_MAP_ARB */

+   { 27296, 0x00008511 }, /* GL_NORMAL_MAP_NV */

+   { 27313, 0x00008511 }, /* GL_NORMAL_MAP_OES */

+   { 27331, 0x00000205 }, /* GL_NOTEQUAL */

+   { 27343, 0x00000000 }, /* GL_NO_ERROR */

+   { 27355, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */

+   { 27389, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */

+   { 27427, 0x0000821D }, /* GL_NUM_EXTENSIONS */

+   { 27445, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */

+   { 27479, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */

+   { 27508, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */

+   { 27540, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */

+   { 27582, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */

+   { 27612, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */

+   { 27652, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */

+   { 27683, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */

+   { 27712, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */

+   { 27740, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */

+   { 27770, 0x00002401 }, /* GL_OBJECT_LINEAR */

+   { 27787, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */

+   { 27813, 0x00002501 }, /* GL_OBJECT_PLANE */

+   { 27829, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */

+   { 27864, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */

+   { 27886, 0x00009112 }, /* GL_OBJECT_TYPE */

+   { 27901, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */

+   { 27920, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */

+   { 27950, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */

+   { 27971, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */

+   { 27999, 0x00000001 }, /* GL_ONE */

+   { 28006, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */

+   { 28034, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */

+   { 28066, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */

+   { 28094, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */

+   { 28126, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */

+   { 28149, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */

+   { 28172, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */

+   { 28195, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */

+   { 28218, 0x00008598 }, /* GL_OPERAND0_ALPHA */

+   { 28236, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */

+   { 28258, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */

+   { 28280, 0x00008590 }, /* GL_OPERAND0_RGB */

+   { 28296, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */

+   { 28316, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */

+   { 28336, 0x00008599 }, /* GL_OPERAND1_ALPHA */

+   { 28354, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */

+   { 28376, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */

+   { 28398, 0x00008591 }, /* GL_OPERAND1_RGB */

+   { 28414, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */

+   { 28434, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */

+   { 28454, 0x0000859A }, /* GL_OPERAND2_ALPHA */

+   { 28472, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */

+   { 28494, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */

+   { 28516, 0x00008592 }, /* GL_OPERAND2_RGB */

+   { 28532, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */

+   { 28552, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */

+   { 28572, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */

+   { 28593, 0x00008593 }, /* GL_OPERAND3_RGB_NV */

+   { 28612, 0x00001507 }, /* GL_OR */

+   { 28618, 0x00000A01 }, /* GL_ORDER */

+   { 28627, 0x0000150D }, /* GL_OR_INVERTED */

+   { 28642, 0x0000150B }, /* GL_OR_REVERSE */

+   { 28656, 0x00000505 }, /* GL_OUT_OF_MEMORY */

+   { 28673, 0x00000D05 }, /* GL_PACK_ALIGNMENT */

+   { 28691, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */

+   { 28712, 0x00008758 }, /* GL_PACK_INVERT_MESA */

+   { 28732, 0x00000D01 }, /* GL_PACK_LSB_FIRST */

+   { 28750, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */

+   { 28769, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */

+   { 28789, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */

+   { 28809, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */

+   { 28827, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */

+   { 28846, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */

+   { 28871, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */

+   { 28895, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */

+   { 28916, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */

+   { 28938, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */

+   { 28960, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */

+   { 28985, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */

+   { 29009, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */

+   { 29030, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */

+   { 29052, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */

+   { 29074, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */

+   { 29096, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */

+   { 29127, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */

+   { 29147, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */

+   { 29172, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */

+   { 29192, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */

+   { 29217, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */

+   { 29237, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */

+   { 29262, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */

+   { 29282, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */

+   { 29307, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */

+   { 29327, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */

+   { 29352, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */

+   { 29372, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */

+   { 29397, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */

+   { 29417, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */

+   { 29442, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */

+   { 29462, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */

+   { 29487, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */

+   { 29507, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */

+   { 29532, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */

+   { 29552, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */

+   { 29577, 0x00000020 }, /* GL_PIXEL_MODE_BIT */

+   { 29595, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */

+   { 29616, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */

+   { 29645, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */

+   { 29678, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */

+   { 29703, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */

+   { 29726, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */

+   { 29757, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */

+   { 29792, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */

+   { 29819, 0x00001B00 }, /* GL_POINT */

+   { 29828, 0x00000000 }, /* GL_POINTS */

+   { 29838, 0x00000002 }, /* GL_POINT_BIT */

+   { 29851, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */

+   { 29881, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */

+   { 29915, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */

+   { 29949, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */

+   { 29984, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */

+   { 30013, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */

+   { 30046, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */

+   { 30079, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */

+   { 30113, 0x00000B11 }, /* GL_POINT_SIZE */

+   { 30127, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */

+   { 30166, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */

+   { 30190, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */

+   { 30222, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */

+   { 30253, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */

+   { 30282, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */

+   { 30308, 0x00008127 }, /* GL_POINT_SIZE_MAX */

+   { 30326, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */

+   { 30348, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */

+   { 30370, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */

+   { 30393, 0x00008126 }, /* GL_POINT_SIZE_MIN */

+   { 30411, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */

+   { 30433, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */

+   { 30455, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */

+   { 30478, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */

+   { 30498, 0x00000B10 }, /* GL_POINT_SMOOTH */

+   { 30514, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */

+   { 30535, 0x00008861 }, /* GL_POINT_SPRITE */

+   { 30551, 0x00008861 }, /* GL_POINT_SPRITE_ARB */

+   { 30571, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */

+   { 30600, 0x00008861 }, /* GL_POINT_SPRITE_NV */

+   { 30619, 0x00008861 }, /* GL_POINT_SPRITE_OES */

+   { 30639, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */

+   { 30665, 0x00000701 }, /* GL_POINT_TOKEN */

+   { 30680, 0x00000009 }, /* GL_POLYGON */

+   { 30691, 0x00000008 }, /* GL_POLYGON_BIT */

+   { 30706, 0x00000B40 }, /* GL_POLYGON_MODE */

+   { 30722, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */

+   { 30745, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */

+   { 30770, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */

+   { 30793, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */

+   { 30816, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */

+   { 30840, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */

+   { 30864, 0x00000B41 }, /* GL_POLYGON_SMOOTH */

+   { 30882, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */

+   { 30905, 0x00000B42 }, /* GL_POLYGON_STIPPLE */

+   { 30924, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */

+   { 30947, 0x00000703 }, /* GL_POLYGON_TOKEN */

+   { 30964, 0x00001203 }, /* GL_POSITION */

+   { 30976, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */

+   { 31008, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */

+   { 31044, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */

+   { 31077, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */

+   { 31114, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */

+   { 31145, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */

+   { 31180, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */

+   { 31212, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */

+   { 31248, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */

+   { 31281, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */

+   { 31313, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */

+   { 31349, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */

+   { 31382, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */

+   { 31419, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */

+   { 31449, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */

+   { 31483, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */

+   { 31514, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */

+   { 31549, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */

+   { 31580, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */

+   { 31615, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */

+   { 31647, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */

+   { 31683, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */

+   { 31713, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */

+   { 31747, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */

+   { 31778, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */

+   { 31813, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */

+   { 31845, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */

+   { 31876, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */

+   { 31911, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */

+   { 31943, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */

+   { 31979, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */

+   { 32008, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */

+   { 32041, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */

+   { 32071, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */

+   { 32105, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */

+   { 32144, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */

+   { 32177, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */

+   { 32217, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */

+   { 32251, 0x00008578 }, /* GL_PREVIOUS */

+   { 32263, 0x00008578 }, /* GL_PREVIOUS_ARB */

+   { 32279, 0x00008578 }, /* GL_PREVIOUS_EXT */

+   { 32295, 0x00008577 }, /* GL_PRIMARY_COLOR */

+   { 32312, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */

+   { 32333, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */

+   { 32354, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */

+   { 32378, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */

+   { 32406, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */

+   { 32427, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */

+   { 32454, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */

+   { 32484, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */

+   { 32508, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */

+   { 32541, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */

+   { 32573, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */

+   { 32596, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */

+   { 32626, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */

+   { 32655, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */

+   { 32678, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */

+   { 32708, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */

+   { 32737, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */

+   { 32765, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */

+   { 32787, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */

+   { 32815, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */

+   { 32843, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */

+   { 32865, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */

+   { 32886, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */

+   { 32926, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */

+   { 32965, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */

+   { 32995, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */

+   { 33030, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */

+   { 33063, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */

+   { 33097, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */

+   { 33136, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */

+   { 33175, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */

+   { 33197, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */

+   { 33223, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */

+   { 33247, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */

+   { 33269, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */

+   { 33295, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */

+   { 33318, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */

+   { 33340, 0x00008628 }, /* GL_PROGRAM_STRING_NV */

+   { 33361, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */

+   { 33382, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */

+   { 33409, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */

+   { 33441, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */

+   { 33473, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */

+   { 33508, 0x00001701 }, /* GL_PROJECTION */

+   { 33522, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */

+   { 33543, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */

+   { 33586, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */

+   { 33612, 0x00008E4F }, /* GL_PROVOKING_VERTEX */

+   { 33632, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */

+   { 33656, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */

+   { 33677, 0x00008025 }, /* GL_PROXY_HISTOGRAM */

+   { 33696, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */

+   { 33719, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */

+   { 33758, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */

+   { 33796, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */

+   { 33816, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */

+   { 33842, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */

+   { 33872, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */

+   { 33896, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */

+   { 33916, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */

+   { 33942, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */

+   { 33972, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */

+   { 33996, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */

+   { 34016, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */

+   { 34049, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */

+   { 34075, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */

+   { 34105, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */

+   { 34132, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */

+   { 34163, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */

+   { 34193, 0x00008A1D }, /* GL_PURGEABLE_APPLE */

+   { 34212, 0x00002003 }, /* GL_Q */

+   { 34217, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */

+   { 34242, 0x00000007 }, /* GL_QUADS */

+   { 34251, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */

+   { 34295, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */

+   { 34343, 0x00008614 }, /* GL_QUAD_MESH_SUN */

+   { 34360, 0x00000008 }, /* GL_QUAD_STRIP */

+   { 34374, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */

+   { 34401, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */

+   { 34431, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */

+   { 34455, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */

+   { 34482, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */

+   { 34504, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */

+   { 34530, 0x00008E14 }, /* GL_QUERY_NO_WAIT */

+   { 34547, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */

+   { 34567, 0x00008866 }, /* GL_QUERY_RESULT */

+   { 34583, 0x00008866 }, /* GL_QUERY_RESULT_ARB */

+   { 34603, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */

+   { 34629, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */

+   { 34659, 0x00008E13 }, /* GL_QUERY_WAIT */

+   { 34673, 0x00008E13 }, /* GL_QUERY_WAIT_NV */

+   { 34690, 0x00002002 }, /* GL_R */

+   { 34695, 0x00008C3A }, /* GL_R11F_G11F_B10F */

+   { 34713, 0x00008F98 }, /* GL_R16_SNORM */

+   { 34726, 0x00002A10 }, /* GL_R3_G3_B2 */

+   { 34738, 0x00008F94 }, /* GL_R8_SNORM */

+   { 34750, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */

+   { 34772, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */

+   { 34798, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */

+   { 34831, 0x00000C02 }, /* GL_READ_BUFFER */

+   { 34846, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */

+   { 34866, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */

+   { 34894, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */

+   { 34926, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */

+   { 34950, 0x000088B8 }, /* GL_READ_ONLY */

+   { 34963, 0x000088B8 }, /* GL_READ_ONLY_ARB */

+   { 34980, 0x000088BA }, /* GL_READ_WRITE */

+   { 34994, 0x000088BA }, /* GL_READ_WRITE_ARB */

+   { 35012, 0x00001903 }, /* GL_RED */

+   { 35019, 0x00008016 }, /* GL_REDUCE */

+   { 35029, 0x00008016 }, /* GL_REDUCE_EXT */

+   { 35043, 0x00000D15 }, /* GL_RED_BIAS */

+   { 35055, 0x00000D52 }, /* GL_RED_BITS */

+   { 35067, 0x00008D94 }, /* GL_RED_INTEGER */

+   { 35082, 0x00008D94 }, /* GL_RED_INTEGER_EXT */

+   { 35101, 0x00000D14 }, /* GL_RED_SCALE */

+   { 35114, 0x00008F90 }, /* GL_RED_SNORM */

+   { 35127, 0x00008512 }, /* GL_REFLECTION_MAP */

+   { 35145, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */

+   { 35167, 0x00008512 }, /* GL_REFLECTION_MAP_NV */

+   { 35188, 0x00008512 }, /* GL_REFLECTION_MAP_OES */

+   { 35210, 0x00008A19 }, /* GL_RELEASED_APPLE */

+   { 35228, 0x00001C00 }, /* GL_RENDER */

+   { 35238, 0x00008D41 }, /* GL_RENDERBUFFER */

+   { 35254, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */

+   { 35281, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */

+   { 35312, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */

+   { 35336, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */

+   { 35364, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */

+   { 35392, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */

+   { 35418, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */

+   { 35448, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */

+   { 35475, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */

+   { 35506, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */

+   { 35526, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */

+   { 35553, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */

+   { 35584, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */

+   { 35607, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */

+   { 35634, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */

+   { 35661, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */

+   { 35693, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */

+   { 35729, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */

+   { 35765, 0x00008D41 }, /* GL_RENDERBUFFER_OES */

+   { 35785, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */

+   { 35810, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */

+   { 35839, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */

+   { 35863, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */

+   { 35891, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */

+   { 35920, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */

+   { 35953, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */

+   { 35975, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */

+   { 36001, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */

+   { 36027, 0x00001F01 }, /* GL_RENDERER */

+   { 36039, 0x00000C40 }, /* GL_RENDER_MODE */

+   { 36054, 0x00002901 }, /* GL_REPEAT */

+   { 36064, 0x00001E01 }, /* GL_REPLACE */

+   { 36075, 0x00008062 }, /* GL_REPLACE_EXT */

+   { 36090, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */

+   { 36113, 0x0000803A }, /* GL_RESCALE_NORMAL */

+   { 36131, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */

+   { 36153, 0x00008A1B }, /* GL_RETAINED_APPLE */

+   { 36171, 0x00000102 }, /* GL_RETURN */

+   { 36181, 0x00008F99 }, /* GL_RG16_SNORM */

+   { 36195, 0x00008F95 }, /* GL_RG8_SNORM */

+   { 36208, 0x00001907 }, /* GL_RGB */

+   { 36215, 0x00008052 }, /* GL_RGB10 */

+   { 36224, 0x00008059 }, /* GL_RGB10_A2 */

+   { 36236, 0x00008059 }, /* GL_RGB10_A2_EXT */

+   { 36252, 0x00008052 }, /* GL_RGB10_EXT */

+   { 36265, 0x00008053 }, /* GL_RGB12 */

+   { 36274, 0x00008053 }, /* GL_RGB12_EXT */

+   { 36287, 0x00008054 }, /* GL_RGB16 */

+   { 36296, 0x0000881B }, /* GL_RGB16F */

+   { 36306, 0x00008D89 }, /* GL_RGB16I */

+   { 36316, 0x00008D89 }, /* GL_RGB16I_EXT */

+   { 36330, 0x00008D77 }, /* GL_RGB16UI */

+   { 36341, 0x00008D77 }, /* GL_RGB16UI_EXT */

+   { 36356, 0x00008054 }, /* GL_RGB16_EXT */

+   { 36369, 0x00008F9A }, /* GL_RGB16_SNORM */

+   { 36384, 0x0000804E }, /* GL_RGB2_EXT */

+   { 36396, 0x00008815 }, /* GL_RGB32F */

+   { 36406, 0x00008D83 }, /* GL_RGB32I */

+   { 36416, 0x00008D83 }, /* GL_RGB32I_EXT */

+   { 36430, 0x00008D71 }, /* GL_RGB32UI */

+   { 36441, 0x00008D71 }, /* GL_RGB32UI_EXT */

+   { 36456, 0x0000804F }, /* GL_RGB4 */

+   { 36464, 0x0000804F }, /* GL_RGB4_EXT */

+   { 36476, 0x000083A1 }, /* GL_RGB4_S3TC */

+   { 36489, 0x00008050 }, /* GL_RGB5 */

+   { 36497, 0x00008D62 }, /* GL_RGB565 */

+   { 36507, 0x00008D62 }, /* GL_RGB565_OES */

+   { 36521, 0x00008057 }, /* GL_RGB5_A1 */

+   { 36532, 0x00008057 }, /* GL_RGB5_A1_EXT */

+   { 36547, 0x00008057 }, /* GL_RGB5_A1_OES */

+   { 36562, 0x00008050 }, /* GL_RGB5_EXT */

+   { 36574, 0x00008051 }, /* GL_RGB8 */

+   { 36582, 0x00008D8F }, /* GL_RGB8I */

+   { 36591, 0x00008D8F }, /* GL_RGB8I_EXT */

+   { 36604, 0x00008D7D }, /* GL_RGB8UI */

+   { 36614, 0x00008D7D }, /* GL_RGB8UI_EXT */

+   { 36628, 0x00008051 }, /* GL_RGB8_EXT */

+   { 36640, 0x00008051 }, /* GL_RGB8_OES */

+   { 36652, 0x00008F96 }, /* GL_RGB8_SNORM */

+   { 36666, 0x00008C3D }, /* GL_RGB9_E5 */

+   { 36677, 0x00001908 }, /* GL_RGBA */

+   { 36685, 0x0000805A }, /* GL_RGBA12 */

+   { 36695, 0x0000805A }, /* GL_RGBA12_EXT */

+   { 36709, 0x0000805B }, /* GL_RGBA16 */

+   { 36719, 0x0000881A }, /* GL_RGBA16F */

+   { 36730, 0x00008D88 }, /* GL_RGBA16I */

+   { 36741, 0x00008D88 }, /* GL_RGBA16I_EXT */

+   { 36756, 0x00008D76 }, /* GL_RGBA16UI */

+   { 36768, 0x00008D76 }, /* GL_RGBA16UI_EXT */

+   { 36784, 0x0000805B }, /* GL_RGBA16_EXT */

+   { 36798, 0x00008F9B }, /* GL_RGBA16_SNORM */

+   { 36814, 0x00008055 }, /* GL_RGBA2 */

+   { 36823, 0x00008055 }, /* GL_RGBA2_EXT */

+   { 36836, 0x00008814 }, /* GL_RGBA32F */

+   { 36847, 0x00008D82 }, /* GL_RGBA32I */

+   { 36858, 0x00008D82 }, /* GL_RGBA32I_EXT */

+   { 36873, 0x00008D70 }, /* GL_RGBA32UI */

+   { 36885, 0x00008D70 }, /* GL_RGBA32UI_EXT */

+   { 36901, 0x00008056 }, /* GL_RGBA4 */

+   { 36910, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */

+   { 36929, 0x00008056 }, /* GL_RGBA4_EXT */

+   { 36942, 0x00008056 }, /* GL_RGBA4_OES */

+   { 36955, 0x000083A3 }, /* GL_RGBA4_S3TC */

+   { 36969, 0x00008058 }, /* GL_RGBA8 */

+   { 36978, 0x00008D8E }, /* GL_RGBA8I */

+   { 36988, 0x00008D8E }, /* GL_RGBA8I_EXT */

+   { 37002, 0x00008D7C }, /* GL_RGBA8UI */

+   { 37013, 0x00008D7C }, /* GL_RGBA8UI_EXT */

+   { 37028, 0x00008058 }, /* GL_RGBA8_EXT */

+   { 37041, 0x00008058 }, /* GL_RGBA8_OES */

+   { 37054, 0x00008F97 }, /* GL_RGBA8_SNORM */

+   { 37069, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */

+   { 37087, 0x00008D99 }, /* GL_RGBA_INTEGER */

+   { 37103, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */

+   { 37123, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */

+   { 37148, 0x00000C31 }, /* GL_RGBA_MODE */

+   { 37161, 0x000083A2 }, /* GL_RGBA_S3TC */

+   { 37174, 0x00008F93 }, /* GL_RGBA_SNORM */

+   { 37188, 0x00008D98 }, /* GL_RGB_INTEGER */

+   { 37203, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */

+   { 37222, 0x000083A0 }, /* GL_RGB_S3TC */

+   { 37234, 0x00008573 }, /* GL_RGB_SCALE */

+   { 37247, 0x00008573 }, /* GL_RGB_SCALE_ARB */

+   { 37264, 0x00008573 }, /* GL_RGB_SCALE_EXT */

+   { 37281, 0x00008F92 }, /* GL_RGB_SNORM */

+   { 37294, 0x00008F91 }, /* GL_RG_SNORM */

+   { 37306, 0x00000407 }, /* GL_RIGHT */

+   { 37315, 0x00002000 }, /* GL_S */

+   { 37320, 0x00008B5D }, /* GL_SAMPLER_1D */

+   { 37334, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */

+   { 37354, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */

+   { 37378, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */

+   { 37405, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */

+   { 37436, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */

+   { 37457, 0x00008B5E }, /* GL_SAMPLER_2D */

+   { 37471, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */

+   { 37491, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */

+   { 37515, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */

+   { 37542, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */

+   { 37573, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */

+   { 37592, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */

+   { 37618, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */

+   { 37639, 0x00008B5F }, /* GL_SAMPLER_3D */

+   { 37653, 0x00008B5F }, /* GL_SAMPLER_3D_OES */

+   { 37671, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */

+   { 37689, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */

+   { 37711, 0x00008B60 }, /* GL_SAMPLER_CUBE */

+   { 37727, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */

+   { 37750, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */

+   { 37777, 0x000080A9 }, /* GL_SAMPLES */

+   { 37788, 0x000086B4 }, /* GL_SAMPLES_3DFX */

+   { 37804, 0x000080A9 }, /* GL_SAMPLES_ARB */

+   { 37819, 0x00008914 }, /* GL_SAMPLES_PASSED */

+   { 37837, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */

+   { 37859, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */

+   { 37887, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */

+   { 37919, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */

+   { 37942, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */

+   { 37969, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */

+   { 37987, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */

+   { 38010, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */

+   { 38032, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */

+   { 38051, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */

+   { 38074, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */

+   { 38100, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */

+   { 38130, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */

+   { 38155, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */

+   { 38184, 0x00080000 }, /* GL_SCISSOR_BIT */

+   { 38199, 0x00000C10 }, /* GL_SCISSOR_BOX */

+   { 38214, 0x00000C11 }, /* GL_SCISSOR_TEST */

+   { 38230, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */

+   { 38255, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */

+   { 38295, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */

+   { 38339, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */

+   { 38372, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */

+   { 38402, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */

+   { 38434, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */

+   { 38464, 0x00001C02 }, /* GL_SELECT */

+   { 38474, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */

+   { 38502, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */

+   { 38527, 0x00008012 }, /* GL_SEPARABLE_2D */

+   { 38543, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */

+   { 38563, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */

+   { 38587, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */

+   { 38614, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */

+   { 38645, 0x0000150F }, /* GL_SET */

+   { 38652, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */

+   { 38677, 0x00008DFA }, /* GL_SHADER_COMPILER */

+   { 38696, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */

+   { 38717, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */

+   { 38741, 0x00008B4F }, /* GL_SHADER_TYPE */

+   { 38756, 0x00000B54 }, /* GL_SHADE_MODEL */

+   { 38771, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */

+   { 38799, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */

+   { 38822, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */

+   { 38852, 0x00001601 }, /* GL_SHININESS */

+   { 38865, 0x00001402 }, /* GL_SHORT */

+   { 38874, 0x00009119 }, /* GL_SIGNALED */

+   { 38886, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */

+   { 38907, 0x000081F9 }, /* GL_SINGLE_COLOR */

+   { 38923, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */

+   { 38943, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */

+   { 38962, 0x00008C46 }, /* GL_SLUMINANCE */

+   { 38976, 0x00008C47 }, /* GL_SLUMINANCE8 */

+   { 38991, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */

+   { 39013, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */

+   { 39033, 0x00001D01 }, /* GL_SMOOTH */

+   { 39043, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */

+   { 39076, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */

+   { 39103, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */

+   { 39136, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */

+   { 39163, 0x00008588 }, /* GL_SOURCE0_ALPHA */

+   { 39180, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */

+   { 39201, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */

+   { 39222, 0x00008580 }, /* GL_SOURCE0_RGB */

+   { 39237, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */

+   { 39256, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */

+   { 39275, 0x00008589 }, /* GL_SOURCE1_ALPHA */

+   { 39292, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */

+   { 39313, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */

+   { 39334, 0x00008581 }, /* GL_SOURCE1_RGB */

+   { 39349, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */

+   { 39368, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */

+   { 39387, 0x0000858A }, /* GL_SOURCE2_ALPHA */

+   { 39404, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */

+   { 39425, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */

+   { 39446, 0x00008582 }, /* GL_SOURCE2_RGB */

+   { 39461, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */

+   { 39480, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */

+   { 39499, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */

+   { 39519, 0x00008583 }, /* GL_SOURCE3_RGB_NV */

+   { 39537, 0x00001202 }, /* GL_SPECULAR */

+   { 39549, 0x00002402 }, /* GL_SPHERE_MAP */

+   { 39563, 0x00001206 }, /* GL_SPOT_CUTOFF */

+   { 39578, 0x00001204 }, /* GL_SPOT_DIRECTION */

+   { 39596, 0x00001205 }, /* GL_SPOT_EXPONENT */

+   { 39613, 0x00008588 }, /* GL_SRC0_ALPHA */

+   { 39627, 0x00008580 }, /* GL_SRC0_RGB */

+   { 39639, 0x00008589 }, /* GL_SRC1_ALPHA */

+   { 39653, 0x00008581 }, /* GL_SRC1_RGB */

+   { 39665, 0x0000858A }, /* GL_SRC2_ALPHA */

+   { 39679, 0x00008582 }, /* GL_SRC2_RGB */

+   { 39691, 0x00000302 }, /* GL_SRC_ALPHA */

+   { 39704, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */

+   { 39726, 0x00000300 }, /* GL_SRC_COLOR */

+   { 39739, 0x00008C40 }, /* GL_SRGB */

+   { 39747, 0x00008C41 }, /* GL_SRGB8 */

+   { 39756, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */

+   { 39772, 0x00008C42 }, /* GL_SRGB_ALPHA */

+   { 39786, 0x00000503 }, /* GL_STACK_OVERFLOW */

+   { 39804, 0x00000504 }, /* GL_STACK_UNDERFLOW */

+   { 39823, 0x000088E6 }, /* GL_STATIC_COPY */

+   { 39838, 0x000088E6 }, /* GL_STATIC_COPY_ARB */

+   { 39857, 0x000088E4 }, /* GL_STATIC_DRAW */

+   { 39872, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */

+   { 39891, 0x000088E5 }, /* GL_STATIC_READ */

+   { 39906, 0x000088E5 }, /* GL_STATIC_READ_ARB */

+   { 39925, 0x00001802 }, /* GL_STENCIL */

+   { 39936, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */

+   { 39958, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */

+   { 39984, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */

+   { 40010, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */

+   { 40031, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */

+   { 40056, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */

+   { 40077, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */

+   { 40102, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */

+   { 40134, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */

+   { 40170, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */

+   { 40202, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */

+   { 40238, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */

+   { 40258, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */

+   { 40285, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */

+   { 40311, 0x00000D57 }, /* GL_STENCIL_BITS */

+   { 40327, 0x00008224 }, /* GL_STENCIL_BUFFER */

+   { 40345, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */

+   { 40367, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */

+   { 40390, 0x00000B94 }, /* GL_STENCIL_FAIL */

+   { 40406, 0x00000B92 }, /* GL_STENCIL_FUNC */

+   { 40422, 0x00001901 }, /* GL_STENCIL_INDEX */

+   { 40439, 0x00008D46 }, /* GL_STENCIL_INDEX1 */

+   { 40457, 0x00008D49 }, /* GL_STENCIL_INDEX16 */

+   { 40476, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */

+   { 40499, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */

+   { 40521, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */

+   { 40543, 0x00008D47 }, /* GL_STENCIL_INDEX4 */

+   { 40561, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */

+   { 40583, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */

+   { 40605, 0x00008D48 }, /* GL_STENCIL_INDEX8 */

+   { 40623, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */

+   { 40645, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */

+   { 40667, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */

+   { 40688, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */

+   { 40715, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */

+   { 40742, 0x00000B97 }, /* GL_STENCIL_REF */

+   { 40757, 0x00000B90 }, /* GL_STENCIL_TEST */

+   { 40773, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */

+   { 40802, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */

+   { 40824, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */

+   { 40845, 0x00000C33 }, /* GL_STEREO */

+   { 40855, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */

+   { 40879, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */

+   { 40904, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */

+   { 40928, 0x000088E2 }, /* GL_STREAM_COPY */

+   { 40943, 0x000088E2 }, /* GL_STREAM_COPY_ARB */

+   { 40962, 0x000088E0 }, /* GL_STREAM_DRAW */

+   { 40977, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */

+   { 40996, 0x000088E1 }, /* GL_STREAM_READ */

+   { 41011, 0x000088E1 }, /* GL_STREAM_READ_ARB */

+   { 41030, 0x00000D50 }, /* GL_SUBPIXEL_BITS */

+   { 41047, 0x000084E7 }, /* GL_SUBTRACT */

+   { 41059, 0x000084E7 }, /* GL_SUBTRACT_ARB */

+   { 41075, 0x00009113 }, /* GL_SYNC_CONDITION */

+   { 41093, 0x00009116 }, /* GL_SYNC_FENCE */

+   { 41107, 0x00009115 }, /* GL_SYNC_FLAGS */

+   { 41121, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */

+   { 41148, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */

+   { 41178, 0x00009114 }, /* GL_SYNC_STATUS */

+   { 41193, 0x00002001 }, /* GL_T */

+   { 41198, 0x00002A2A }, /* GL_T2F_C3F_V3F */

+   { 41213, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */

+   { 41232, 0x00002A29 }, /* GL_T2F_C4UB_V3F */

+   { 41248, 0x00002A2B }, /* GL_T2F_N3F_V3F */

+   { 41263, 0x00002A27 }, /* GL_T2F_V3F */

+   { 41274, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */

+   { 41293, 0x00002A28 }, /* GL_T4F_V4F */

+   { 41304, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */

+   { 41327, 0x00001702 }, /* GL_TEXTURE */

+   { 41338, 0x000084C0 }, /* GL_TEXTURE0 */

+   { 41350, 0x000084C0 }, /* GL_TEXTURE0_ARB */

+   { 41366, 0x000084C1 }, /* GL_TEXTURE1 */

+   { 41378, 0x000084CA }, /* GL_TEXTURE10 */

+   { 41391, 0x000084CA }, /* GL_TEXTURE10_ARB */

+   { 41408, 0x000084CB }, /* GL_TEXTURE11 */

+   { 41421, 0x000084CB }, /* GL_TEXTURE11_ARB */

+   { 41438, 0x000084CC }, /* GL_TEXTURE12 */

+   { 41451, 0x000084CC }, /* GL_TEXTURE12_ARB */

+   { 41468, 0x000084CD }, /* GL_TEXTURE13 */

+   { 41481, 0x000084CD }, /* GL_TEXTURE13_ARB */

+   { 41498, 0x000084CE }, /* GL_TEXTURE14 */

+   { 41511, 0x000084CE }, /* GL_TEXTURE14_ARB */

+   { 41528, 0x000084CF }, /* GL_TEXTURE15 */

+   { 41541, 0x000084CF }, /* GL_TEXTURE15_ARB */

+   { 41558, 0x000084D0 }, /* GL_TEXTURE16 */

+   { 41571, 0x000084D0 }, /* GL_TEXTURE16_ARB */

+   { 41588, 0x000084D1 }, /* GL_TEXTURE17 */

+   { 41601, 0x000084D1 }, /* GL_TEXTURE17_ARB */

+   { 41618, 0x000084D2 }, /* GL_TEXTURE18 */

+   { 41631, 0x000084D2 }, /* GL_TEXTURE18_ARB */

+   { 41648, 0x000084D3 }, /* GL_TEXTURE19 */

+   { 41661, 0x000084D3 }, /* GL_TEXTURE19_ARB */

+   { 41678, 0x000084C1 }, /* GL_TEXTURE1_ARB */

+   { 41694, 0x000084C2 }, /* GL_TEXTURE2 */

+   { 41706, 0x000084D4 }, /* GL_TEXTURE20 */

+   { 41719, 0x000084D4 }, /* GL_TEXTURE20_ARB */

+   { 41736, 0x000084D5 }, /* GL_TEXTURE21 */

+   { 41749, 0x000084D5 }, /* GL_TEXTURE21_ARB */

+   { 41766, 0x000084D6 }, /* GL_TEXTURE22 */

+   { 41779, 0x000084D6 }, /* GL_TEXTURE22_ARB */

+   { 41796, 0x000084D7 }, /* GL_TEXTURE23 */

+   { 41809, 0x000084D7 }, /* GL_TEXTURE23_ARB */

+   { 41826, 0x000084D8 }, /* GL_TEXTURE24 */

+   { 41839, 0x000084D8 }, /* GL_TEXTURE24_ARB */

+   { 41856, 0x000084D9 }, /* GL_TEXTURE25 */

+   { 41869, 0x000084D9 }, /* GL_TEXTURE25_ARB */

+   { 41886, 0x000084DA }, /* GL_TEXTURE26 */

+   { 41899, 0x000084DA }, /* GL_TEXTURE26_ARB */

+   { 41916, 0x000084DB }, /* GL_TEXTURE27 */

+   { 41929, 0x000084DB }, /* GL_TEXTURE27_ARB */

+   { 41946, 0x000084DC }, /* GL_TEXTURE28 */

+   { 41959, 0x000084DC }, /* GL_TEXTURE28_ARB */

+   { 41976, 0x000084DD }, /* GL_TEXTURE29 */

+   { 41989, 0x000084DD }, /* GL_TEXTURE29_ARB */

+   { 42006, 0x000084C2 }, /* GL_TEXTURE2_ARB */

+   { 42022, 0x000084C3 }, /* GL_TEXTURE3 */

+   { 42034, 0x000084DE }, /* GL_TEXTURE30 */

+   { 42047, 0x000084DE }, /* GL_TEXTURE30_ARB */

+   { 42064, 0x000084DF }, /* GL_TEXTURE31 */

+   { 42077, 0x000084DF }, /* GL_TEXTURE31_ARB */

+   { 42094, 0x000084C3 }, /* GL_TEXTURE3_ARB */

+   { 42110, 0x000084C4 }, /* GL_TEXTURE4 */

+   { 42122, 0x000084C4 }, /* GL_TEXTURE4_ARB */

+   { 42138, 0x000084C5 }, /* GL_TEXTURE5 */

+   { 42150, 0x000084C5 }, /* GL_TEXTURE5_ARB */

+   { 42166, 0x000084C6 }, /* GL_TEXTURE6 */

+   { 42178, 0x000084C6 }, /* GL_TEXTURE6_ARB */

+   { 42194, 0x000084C7 }, /* GL_TEXTURE7 */

+   { 42206, 0x000084C7 }, /* GL_TEXTURE7_ARB */

+   { 42222, 0x000084C8 }, /* GL_TEXTURE8 */

+   { 42234, 0x000084C8 }, /* GL_TEXTURE8_ARB */

+   { 42250, 0x000084C9 }, /* GL_TEXTURE9 */

+   { 42262, 0x000084C9 }, /* GL_TEXTURE9_ARB */

+   { 42278, 0x00000DE0 }, /* GL_TEXTURE_1D */

+   { 42292, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */

+   { 42312, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */

+   { 42336, 0x00000DE1 }, /* GL_TEXTURE_2D */

+   { 42350, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */

+   { 42370, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */

+   { 42394, 0x0000806F }, /* GL_TEXTURE_3D */

+   { 42408, 0x0000806F }, /* GL_TEXTURE_3D_OES */

+   { 42426, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */

+   { 42448, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */

+   { 42474, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */

+   { 42496, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */

+   { 42518, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */

+   { 42546, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */

+   { 42578, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */

+   { 42600, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */

+   { 42628, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */

+   { 42660, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */

+   { 42682, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */

+   { 42708, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */

+   { 42734, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */

+   { 42762, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */

+   { 42794, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */

+   { 42826, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */

+   { 42855, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */

+   { 42888, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */

+   { 42920, 0x00040000 }, /* GL_TEXTURE_BIT */

+   { 42935, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */

+   { 42956, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */

+   { 42981, 0x00001005 }, /* GL_TEXTURE_BORDER */

+   { 42999, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */

+   { 43023, 0x00008C2A }, /* GL_TEXTURE_BUFFER */

+   { 43041, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */

+   { 43078, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */

+   { 43103, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */

+   { 43134, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */

+   { 43164, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */

+   { 43194, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */

+   { 43229, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */

+   { 43260, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */

+   { 43298, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */

+   { 43325, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */

+   { 43357, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */

+   { 43391, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */

+   { 43415, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */

+   { 43443, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */

+   { 43467, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */

+   { 43495, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */

+   { 43528, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */

+   { 43552, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */

+   { 43574, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */

+   { 43596, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */

+   { 43622, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */

+   { 43656, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */

+   { 43689, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */

+   { 43726, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */

+   { 43754, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */

+   { 43786, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */

+   { 43809, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */

+   { 43847, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */

+   { 43889, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */

+   { 43920, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */

+   { 43948, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */

+   { 43978, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */

+   { 44006, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */

+   { 44031, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */

+   { 44051, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */

+   { 44075, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */

+   { 44106, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */

+   { 44141, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */

+   { 44176, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */

+   { 44207, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */

+   { 44242, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */

+   { 44277, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */

+   { 44308, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */

+   { 44343, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */

+   { 44378, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */

+   { 44402, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */

+   { 44433, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */

+   { 44468, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */

+   { 44503, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */

+   { 44534, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */

+   { 44569, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */

+   { 44604, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */

+   { 44635, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */

+   { 44670, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */

+   { 44705, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */

+   { 44734, 0x00008071 }, /* GL_TEXTURE_DEPTH */

+   { 44751, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */

+   { 44773, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */

+   { 44799, 0x00002300 }, /* GL_TEXTURE_ENV */

+   { 44814, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */

+   { 44835, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */

+   { 44855, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */

+   { 44881, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */

+   { 44911, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */

+   { 44931, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */

+   { 44955, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */

+   { 44972, 0x00000C62 }, /* GL_TEXTURE_GEN_R */

+   { 44989, 0x00000C60 }, /* GL_TEXTURE_GEN_S */

+   { 45006, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */

+   { 45029, 0x00000C61 }, /* GL_TEXTURE_GEN_T */

+   { 45046, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */

+   { 45071, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */

+   { 45093, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */

+   { 45119, 0x00001001 }, /* GL_TEXTURE_HEIGHT */

+   { 45137, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */

+   { 45163, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */

+   { 45189, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */

+   { 45219, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */

+   { 45246, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */

+   { 45271, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */

+   { 45291, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */

+   { 45315, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */

+   { 45342, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */

+   { 45369, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */

+   { 45396, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */

+   { 45422, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */

+   { 45452, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */

+   { 45474, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */

+   { 45492, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */

+   { 45532, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */

+   { 45562, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */

+   { 45590, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */

+   { 45618, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */

+   { 45646, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */

+   { 45667, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */

+   { 45686, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */

+   { 45708, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */

+   { 45727, 0x00008066 }, /* GL_TEXTURE_PRIORITY */

+   { 45747, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */

+   { 45777, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */

+   { 45808, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */

+   { 45829, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */

+   { 45854, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */

+   { 45878, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */

+   { 45898, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */

+   { 45922, 0x00008067 }, /* GL_TEXTURE_RESIDENT */

+   { 45942, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */

+   { 45965, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */

+   { 45988, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */

+   { 46012, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */

+   { 46040, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */

+   { 46070, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */

+   { 46095, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */

+   { 46129, 0x00001000 }, /* GL_TEXTURE_WIDTH */

+   { 46146, 0x00008072 }, /* GL_TEXTURE_WRAP_R */

+   { 46164, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */

+   { 46186, 0x00002802 }, /* GL_TEXTURE_WRAP_S */

+   { 46204, 0x00002803 }, /* GL_TEXTURE_WRAP_T */

+   { 46222, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */

+   { 46241, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */

+   { 46261, 0x00008648 }, /* GL_TRACK_MATRIX_NV */

+   { 46280, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */

+   { 46309, 0x00001000 }, /* GL_TRANSFORM_BIT */

+   { 46326, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */

+   { 46348, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */

+   { 46378, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */

+   { 46407, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */

+   { 46443, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */

+   { 46480, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */

+   { 46521, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */

+   { 46554, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */

+   { 46588, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */

+   { 46626, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */

+   { 46662, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */

+   { 46696, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */

+   { 46734, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */

+   { 46769, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */

+   { 46808, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */

+   { 46849, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */

+   { 46894, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */

+   { 46925, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */

+   { 46960, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */

+   { 47001, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */

+   { 47046, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */

+   { 47072, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */

+   { 47102, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */

+   { 47134, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */

+   { 47164, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */

+   { 47198, 0x0000862C }, /* GL_TRANSPOSE_NV */

+   { 47214, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */

+   { 47245, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */

+   { 47280, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */

+   { 47308, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */

+   { 47340, 0x00000004 }, /* GL_TRIANGLES */

+   { 47353, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */

+   { 47376, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */

+   { 47403, 0x00000006 }, /* GL_TRIANGLE_FAN */

+   { 47419, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */

+   { 47440, 0x00000005 }, /* GL_TRIANGLE_STRIP */

+   { 47458, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */

+   { 47486, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */

+   { 47518, 0x00000001 }, /* GL_TRUE */

+   { 47526, 0x00008A1C }, /* GL_UNDEFINED_APPLE */

+   { 47545, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */

+   { 47565, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */

+   { 47588, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */

+   { 47608, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */

+   { 47629, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */

+   { 47651, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */

+   { 47673, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */

+   { 47693, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */

+   { 47714, 0x00009118 }, /* GL_UNSIGNALED */

+   { 47728, 0x00001401 }, /* GL_UNSIGNED_BYTE */

+   { 47745, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */

+   { 47772, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */

+   { 47795, 0x00001405 }, /* GL_UNSIGNED_INT */

+   { 47811, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */

+   { 47843, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */

+   { 47870, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */

+   { 47901, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */

+   { 47922, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */

+   { 47947, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */

+   { 47971, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */

+   { 47996, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */

+   { 48027, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */

+   { 48062, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */

+   { 48090, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */

+   { 48114, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */

+   { 48142, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */

+   { 48169, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */

+   { 48202, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */

+   { 48239, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */

+   { 48270, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */

+   { 48297, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */

+   { 48330, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */

+   { 48367, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */

+   { 48398, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */

+   { 48430, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */

+   { 48466, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */

+   { 48493, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */

+   { 48524, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */

+   { 48555, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */

+   { 48590, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */

+   { 48619, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */

+   { 48652, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */

+   { 48673, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */

+   { 48698, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */

+   { 48719, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */

+   { 48744, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */

+   { 48765, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */

+   { 48790, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */

+   { 48813, 0x00001403 }, /* GL_UNSIGNED_SHORT */

+   { 48831, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */

+   { 48861, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */

+   { 48895, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */

+   { 48921, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */

+   { 48951, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */

+   { 48985, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */

+   { 49011, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */

+   { 49035, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */

+   { 49063, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */

+   { 49091, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */

+   { 49118, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */

+   { 49150, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */

+   { 49181, 0x00008CA2 }, /* GL_UPPER_LEFT */

+   { 49195, 0x00002A20 }, /* GL_V2F */

+   { 49202, 0x00002A21 }, /* GL_V3F */

+   { 49209, 0x00008B83 }, /* GL_VALIDATE_STATUS */

+   { 49228, 0x00001F00 }, /* GL_VENDOR */

+   { 49238, 0x00001F02 }, /* GL_VERSION */

+   { 49249, 0x00008074 }, /* GL_VERTEX_ARRAY */

+   { 49265, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */

+   { 49289, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */

+   { 49319, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */

+   { 49350, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */

+   { 49385, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */

+   { 49409, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */

+   { 49430, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */

+   { 49453, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */

+   { 49474, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */

+   { 49501, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */

+   { 49529, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */

+   { 49557, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */

+   { 49585, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */

+   { 49613, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */

+   { 49641, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */

+   { 49669, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */

+   { 49696, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */

+   { 49723, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */

+   { 49750, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */

+   { 49777, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */

+   { 49804, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */

+   { 49831, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */

+   { 49858, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */

+   { 49885, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */

+   { 49912, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */

+   { 49950, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */

+   { 49992, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */

+   { 50023, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */

+   { 50058, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */

+   { 50089, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */

+   { 50124, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */

+   { 50158, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */

+   { 50196, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */

+   { 50227, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */

+   { 50262, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */

+   { 50290, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */

+   { 50322, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */

+   { 50352, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */

+   { 50386, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */

+   { 50414, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */

+   { 50446, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */

+   { 50466, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */

+   { 50488, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */

+   { 50517, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */

+   { 50538, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */

+   { 50567, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */

+   { 50600, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */

+   { 50632, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */

+   { 50659, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */

+   { 50690, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */

+   { 50720, 0x00008B31 }, /* GL_VERTEX_SHADER */

+   { 50737, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */

+   { 50758, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */

+   { 50785, 0x00000BA2 }, /* GL_VIEWPORT */

+   { 50797, 0x00000800 }, /* GL_VIEWPORT_BIT */

+   { 50813, 0x00008A1A }, /* GL_VOLATILE_APPLE */

+   { 50831, 0x0000911D }, /* GL_WAIT_FAILED */

+   { 50846, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */

+   { 50866, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */

+   { 50897, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */

+   { 50932, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */

+   { 50967, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */

+   { 50987, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */

+   { 51015, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */

+   { 51043, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */

+   { 51068, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */

+   { 51093, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */

+   { 51120, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */

+   { 51147, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */

+   { 51172, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */

+   { 51197, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */

+   { 51221, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */

+   { 51240, 0x000088B9 }, /* GL_WRITE_ONLY */

+   { 51254, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */

+   { 51272, 0x000088B9 }, /* GL_WRITE_ONLY_OES */

+   { 51290, 0x00001506 }, /* GL_XOR */

+   { 51297, 0x000085B9 }, /* GL_YCBCR_422_APPLE */

+   { 51316, 0x00008757 }, /* GL_YCBCR_MESA */

+   { 51330, 0x00000000 }, /* GL_ZERO */

+   { 51338, 0x00000D16 }, /* GL_ZOOM_X */

+   { 51348, 0x00000D17 }, /* GL_ZOOM_Y */

+};

+

+static const unsigned reduced_enums[1551] =

+{

+       535, /* GL_FALSE */

+       827, /* GL_LINES */

+       831, /* GL_LINE_LOOP */

+       838, /* GL_LINE_STRIP */

+      2135, /* GL_TRIANGLES */

+      2140, /* GL_TRIANGLE_STRIP */

+      2138, /* GL_TRIANGLE_FAN */

+      1507, /* GL_QUADS */

+      1511, /* GL_QUAD_STRIP */

+      1378, /* GL_POLYGON */

+       828, /* GL_LINES_ADJACENCY */

+       839, /* GL_LINE_STRIP_ADJACENCY */

+      2136, /* GL_TRIANGLES_ADJACENCY */

+      2141, /* GL_TRIANGLE_STRIP_ADJACENCY */

+      1390, /* GL_POLYGON_STIPPLE_BIT */

+      1333, /* GL_PIXEL_MODE_BIT */

+       814, /* GL_LIGHTING_BIT */

+       568, /* GL_FOG_BIT */

+         8, /* GL_ACCUM */

+       850, /* GL_LOAD */

+      1596, /* GL_RETURN */

+      1200, /* GL_MULT */

+        24, /* GL_ADD */

+      1216, /* GL_NEVER */

+       804, /* GL_LESS */

+       525, /* GL_EQUAL */

+       803, /* GL_LEQUAL */

+       691, /* GL_GREATER */

+      1233, /* GL_NOTEQUAL */

+       690, /* GL_GEQUAL */

+        55, /* GL_ALWAYS */

+      1803, /* GL_SRC_COLOR */

+      1266, /* GL_ONE_MINUS_SRC_COLOR */

+      1801, /* GL_SRC_ALPHA */

+      1265, /* GL_ONE_MINUS_SRC_ALPHA */

+       504, /* GL_DST_ALPHA */

+      1263, /* GL_ONE_MINUS_DST_ALPHA */

+       505, /* GL_DST_COLOR */

+      1264, /* GL_ONE_MINUS_DST_COLOR */

+      1802, /* GL_SRC_ALPHA_SATURATE */

+       667, /* GL_FRONT_LEFT */

+       668, /* GL_FRONT_RIGHT */

+        77, /* GL_BACK_LEFT */

+        78, /* GL_BACK_RIGHT */

+       664, /* GL_FRONT */

+        76, /* GL_BACK */

+       802, /* GL_LEFT */

+      1685, /* GL_RIGHT */

+       665, /* GL_FRONT_AND_BACK */

+        71, /* GL_AUX0 */

+        72, /* GL_AUX1 */

+        73, /* GL_AUX2 */

+        74, /* GL_AUX3 */

+       790, /* GL_INVALID_ENUM */

+       795, /* GL_INVALID_VALUE */

+       794, /* GL_INVALID_OPERATION */

+      1808, /* GL_STACK_OVERFLOW */

+      1809, /* GL_STACK_UNDERFLOW */

+      1291, /* GL_OUT_OF_MEMORY */

+       791, /* GL_INVALID_FRAMEBUFFER_OPERATION */

+         0, /* GL_2D */

+         2, /* GL_3D */

+         3, /* GL_3D_COLOR */

+         4, /* GL_3D_COLOR_TEXTURE */

+         6, /* GL_4D_COLOR_TEXTURE */

+      1311, /* GL_PASS_THROUGH_TOKEN */

+      1377, /* GL_POINT_TOKEN */

+       841, /* GL_LINE_TOKEN */

+      1391, /* GL_POLYGON_TOKEN */

+        87, /* GL_BITMAP_TOKEN */

+       503, /* GL_DRAW_PIXEL_TOKEN */

+       349, /* GL_COPY_PIXEL_TOKEN */

+       832, /* GL_LINE_RESET_TOKEN */

+       528, /* GL_EXP */

+       529, /* GL_EXP2 */

+       386, /* GL_CW */

+       154, /* GL_CCW */

+       184, /* GL_COEFF */

+      1288, /* GL_ORDER */

+       440, /* GL_DOMAIN */

+       359, /* GL_CURRENT_COLOR */

+       362, /* GL_CURRENT_INDEX */

+       368, /* GL_CURRENT_NORMAL */

+       382, /* GL_CURRENT_TEXTURE_COORDS */

+       374, /* GL_CURRENT_RASTER_COLOR */

+       376, /* GL_CURRENT_RASTER_INDEX */

+       380, /* GL_CURRENT_RASTER_TEXTURE_COORDS */

+       377, /* GL_CURRENT_RASTER_POSITION */

+       378, /* GL_CURRENT_RASTER_POSITION_VALID */

+       375, /* GL_CURRENT_RASTER_DISTANCE */

+      1369, /* GL_POINT_SMOOTH */

+      1353, /* GL_POINT_SIZE */

+      1368, /* GL_POINT_SIZE_RANGE */

+      1359, /* GL_POINT_SIZE_GRANULARITY */

+       833, /* GL_LINE_SMOOTH */

+       842, /* GL_LINE_WIDTH */

+       844, /* GL_LINE_WIDTH_RANGE */

+       843, /* GL_LINE_WIDTH_GRANULARITY */

+       835, /* GL_LINE_STIPPLE */

+       836, /* GL_LINE_STIPPLE_PATTERN */

+       837, /* GL_LINE_STIPPLE_REPEAT */

+       849, /* GL_LIST_MODE */

+      1056, /* GL_MAX_LIST_NESTING */

+       846, /* GL_LIST_BASE */

+       848, /* GL_LIST_INDEX */

+      1380, /* GL_POLYGON_MODE */

+      1387, /* GL_POLYGON_SMOOTH */

+      1389, /* GL_POLYGON_STIPPLE */

+       514, /* GL_EDGE_FLAG */

+       352, /* GL_CULL_FACE */

+       353, /* GL_CULL_FACE_MODE */

+       666, /* GL_FRONT_FACE */

+       813, /* GL_LIGHTING */

+       818, /* GL_LIGHT_MODEL_LOCAL_VIEWER */

+       819, /* GL_LIGHT_MODEL_TWO_SIDE */

+       815, /* GL_LIGHT_MODEL_AMBIENT */

+      1750, /* GL_SHADE_MODEL */

+       232, /* GL_COLOR_MATERIAL_FACE */

+       233, /* GL_COLOR_MATERIAL_PARAMETER */

+       231, /* GL_COLOR_MATERIAL */

+       567, /* GL_FOG */

+       589, /* GL_FOG_INDEX */

+       585, /* GL_FOG_DENSITY */

+       593, /* GL_FOG_START */

+       587, /* GL_FOG_END */

+       590, /* GL_FOG_MODE */

+       569, /* GL_FOG_COLOR */

+       425, /* GL_DEPTH_RANGE */

+       434, /* GL_DEPTH_TEST */

+       437, /* GL_DEPTH_WRITEMASK */

+       410, /* GL_DEPTH_CLEAR_VALUE */

+       424, /* GL_DEPTH_FUNC */

+        12, /* GL_ACCUM_CLEAR_VALUE */

+      1853, /* GL_STENCIL_TEST */

+      1834, /* GL_STENCIL_CLEAR_VALUE */

+      1836, /* GL_STENCIL_FUNC */

+      1855, /* GL_STENCIL_VALUE_MASK */

+      1835, /* GL_STENCIL_FAIL */

+      1850, /* GL_STENCIL_PASS_DEPTH_FAIL */

+      1851, /* GL_STENCIL_PASS_DEPTH_PASS */

+      1852, /* GL_STENCIL_REF */

+      1856, /* GL_STENCIL_WRITEMASK */

+      1006, /* GL_MATRIX_MODE */

+      1222, /* GL_NORMALIZE */

+      2266, /* GL_VIEWPORT */

+      1195, /* GL_MODELVIEW_STACK_DEPTH */

+      1481, /* GL_PROJECTION_STACK_DEPTH */

+      2089, /* GL_TEXTURE_STACK_DEPTH */

+      1192, /* GL_MODELVIEW_MATRIX */

+      1479, /* GL_PROJECTION_MATRIX */

+      2069, /* GL_TEXTURE_MATRIX */

+        69, /* GL_ATTRIB_STACK_DEPTH */

+       166, /* GL_CLIENT_ATTRIB_STACK_DEPTH */

+        51, /* GL_ALPHA_TEST */

+        52, /* GL_ALPHA_TEST_FUNC */

+        53, /* GL_ALPHA_TEST_REF */

+       439, /* GL_DITHER */

+        91, /* GL_BLEND_DST */

+       105, /* GL_BLEND_SRC */

+        88, /* GL_BLEND */

+       852, /* GL_LOGIC_OP_MODE */

+       739, /* GL_INDEX_LOGIC_OP */

+       230, /* GL_COLOR_LOGIC_OP */

+        75, /* GL_AUX_BUFFERS */

+       450, /* GL_DRAW_BUFFER */

+      1534, /* GL_READ_BUFFER */

+      1727, /* GL_SCISSOR_BOX */

+      1728, /* GL_SCISSOR_TEST */

+       738, /* GL_INDEX_CLEAR_VALUE */

+       743, /* GL_INDEX_WRITEMASK */

+       227, /* GL_COLOR_CLEAR_VALUE */

+       269, /* GL_COLOR_WRITEMASK */

+       740, /* GL_INDEX_MODE */

+      1674, /* GL_RGBA_MODE */

+       449, /* GL_DOUBLEBUFFER */

+      1857, /* GL_STEREO */

+      1588, /* GL_RENDER_MODE */

+      1312, /* GL_PERSPECTIVE_CORRECTION_HINT */

+      1370, /* GL_POINT_SMOOTH_HINT */

+       834, /* GL_LINE_SMOOTH_HINT */

+      1388, /* GL_POLYGON_SMOOTH_HINT */

+       588, /* GL_FOG_HINT */

+      2049, /* GL_TEXTURE_GEN_S */

+      2051, /* GL_TEXTURE_GEN_T */

+      2048, /* GL_TEXTURE_GEN_R */

+      2047, /* GL_TEXTURE_GEN_Q */

+      1325, /* GL_PIXEL_MAP_I_TO_I */

+      1331, /* GL_PIXEL_MAP_S_TO_S */

+      1327, /* GL_PIXEL_MAP_I_TO_R */

+      1323, /* GL_PIXEL_MAP_I_TO_G */

+      1321, /* GL_PIXEL_MAP_I_TO_B */

+      1319, /* GL_PIXEL_MAP_I_TO_A */

+      1329, /* GL_PIXEL_MAP_R_TO_R */

+      1317, /* GL_PIXEL_MAP_G_TO_G */

+      1315, /* GL_PIXEL_MAP_B_TO_B */

+      1313, /* GL_PIXEL_MAP_A_TO_A */

+      1326, /* GL_PIXEL_MAP_I_TO_I_SIZE */

+      1332, /* GL_PIXEL_MAP_S_TO_S_SIZE */

+      1328, /* GL_PIXEL_MAP_I_TO_R_SIZE */

+      1324, /* GL_PIXEL_MAP_I_TO_G_SIZE */

+      1322, /* GL_PIXEL_MAP_I_TO_B_SIZE */

+      1320, /* GL_PIXEL_MAP_I_TO_A_SIZE */

+      1330, /* GL_PIXEL_MAP_R_TO_R_SIZE */

+      1318, /* GL_PIXEL_MAP_G_TO_G_SIZE */

+      1316, /* GL_PIXEL_MAP_B_TO_B_SIZE */

+      1314, /* GL_PIXEL_MAP_A_TO_A_SIZE */

+      2152, /* GL_UNPACK_SWAP_BYTES */

+      2147, /* GL_UNPACK_LSB_FIRST */

+      2148, /* GL_UNPACK_ROW_LENGTH */

+      2151, /* GL_UNPACK_SKIP_ROWS */

+      2150, /* GL_UNPACK_SKIP_PIXELS */

+      2145, /* GL_UNPACK_ALIGNMENT */

+      1300, /* GL_PACK_SWAP_BYTES */

+      1295, /* GL_PACK_LSB_FIRST */

+      1296, /* GL_PACK_ROW_LENGTH */

+      1299, /* GL_PACK_SKIP_ROWS */

+      1298, /* GL_PACK_SKIP_PIXELS */

+      1292, /* GL_PACK_ALIGNMENT */

+       947, /* GL_MAP_COLOR */

+       952, /* GL_MAP_STENCIL */

+       742, /* GL_INDEX_SHIFT */

+       741, /* GL_INDEX_OFFSET */

+      1550, /* GL_RED_SCALE */

+      1546, /* GL_RED_BIAS */

+      2292, /* GL_ZOOM_X */

+      2293, /* GL_ZOOM_Y */

+       697, /* GL_GREEN_SCALE */

+       693, /* GL_GREEN_BIAS */

+       115, /* GL_BLUE_SCALE */

+       111, /* GL_BLUE_BIAS */

+        50, /* GL_ALPHA_SCALE */

+        47, /* GL_ALPHA_BIAS */

+       426, /* GL_DEPTH_SCALE */

+       402, /* GL_DEPTH_BIAS */

+      1038, /* GL_MAX_EVAL_ORDER */

+      1055, /* GL_MAX_LIGHTS */

+      1018, /* GL_MAX_CLIP_DISTANCES */

+      1110, /* GL_MAX_TEXTURE_SIZE */

+      1062, /* GL_MAX_PIXEL_MAP_TABLE */

+      1014, /* GL_MAX_ATTRIB_STACK_DEPTH */

+      1058, /* GL_MAX_MODELVIEW_STACK_DEPTH */

+      1059, /* GL_MAX_NAME_STACK_DEPTH */

+      1090, /* GL_MAX_PROJECTION_STACK_DEPTH */

+      1111, /* GL_MAX_TEXTURE_STACK_DEPTH */

+      1137, /* GL_MAX_VIEWPORT_DIMS */

+      1015, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */

+      1867, /* GL_SUBPIXEL_BITS */

+       737, /* GL_INDEX_BITS */

+      1547, /* GL_RED_BITS */

+       694, /* GL_GREEN_BITS */

+       112, /* GL_BLUE_BITS */

+        48, /* GL_ALPHA_BITS */

+       403, /* GL_DEPTH_BITS */

+      1831, /* GL_STENCIL_BITS */

+        14, /* GL_ACCUM_RED_BITS */

+        13, /* GL_ACCUM_GREEN_BITS */

+        10, /* GL_ACCUM_BLUE_BITS */

+         9, /* GL_ACCUM_ALPHA_BITS */

+      1209, /* GL_NAME_STACK_DEPTH */

+        70, /* GL_AUTO_NORMAL */

+       893, /* GL_MAP1_COLOR_4 */

+       896, /* GL_MAP1_INDEX */

+       897, /* GL_MAP1_NORMAL */

+       898, /* GL_MAP1_TEXTURE_COORD_1 */

+       899, /* GL_MAP1_TEXTURE_COORD_2 */

+       900, /* GL_MAP1_TEXTURE_COORD_3 */

+       901, /* GL_MAP1_TEXTURE_COORD_4 */

+       902, /* GL_MAP1_VERTEX_3 */

+       903, /* GL_MAP1_VERTEX_4 */

+       920, /* GL_MAP2_COLOR_4 */

+       923, /* GL_MAP2_INDEX */

+       924, /* GL_MAP2_NORMAL */

+       925, /* GL_MAP2_TEXTURE_COORD_1 */

+       926, /* GL_MAP2_TEXTURE_COORD_2 */

+       927, /* GL_MAP2_TEXTURE_COORD_3 */

+       928, /* GL_MAP2_TEXTURE_COORD_4 */

+       929, /* GL_MAP2_VERTEX_3 */

+       930, /* GL_MAP2_VERTEX_4 */

+       894, /* GL_MAP1_GRID_DOMAIN */

+       895, /* GL_MAP1_GRID_SEGMENTS */

+       921, /* GL_MAP2_GRID_DOMAIN */

+       922, /* GL_MAP2_GRID_SEGMENTS */

+      1950, /* GL_TEXTURE_1D */

+      1953, /* GL_TEXTURE_2D */

+       538, /* GL_FEEDBACK_BUFFER_POINTER */

+       539, /* GL_FEEDBACK_BUFFER_SIZE */

+       540, /* GL_FEEDBACK_BUFFER_TYPE */

+      1737, /* GL_SELECTION_BUFFER_POINTER */

+      1738, /* GL_SELECTION_BUFFER_SIZE */

+      2095, /* GL_TEXTURE_WIDTH */

+      2055, /* GL_TEXTURE_HEIGHT */

+      1999, /* GL_TEXTURE_COMPONENTS */

+      1980, /* GL_TEXTURE_BORDER_COLOR */

+      1979, /* GL_TEXTURE_BORDER */

+       441, /* GL_DONT_CARE */

+       536, /* GL_FASTEST */

+      1217, /* GL_NICEST */

+        56, /* GL_AMBIENT */

+       438, /* GL_DIFFUSE */

+      1790, /* GL_SPECULAR */

+      1392, /* GL_POSITION */

+      1793, /* GL_SPOT_DIRECTION */

+      1794, /* GL_SPOT_EXPONENT */

+      1792, /* GL_SPOT_CUTOFF */

+       317, /* GL_CONSTANT_ATTENUATION */

+       822, /* GL_LINEAR_ATTENUATION */

+      1506, /* GL_QUADRATIC_ATTENUATION */

+       284, /* GL_COMPILE */

+       285, /* GL_COMPILE_AND_EXECUTE */

+       149, /* GL_BYTE */

+      2154, /* GL_UNSIGNED_BYTE */

+      1755, /* GL_SHORT */

+      2193, /* GL_UNSIGNED_SHORT */

+       745, /* GL_INT */

+      2157, /* GL_UNSIGNED_INT */

+       548, /* GL_FLOAT */

+         1, /* GL_2_BYTES */

+         5, /* GL_3_BYTES */

+         7, /* GL_4_BYTES */

+       448, /* GL_DOUBLE */

+       698, /* GL_HALF_FLOAT */

+       544, /* GL_FIXED */

+       162, /* GL_CLEAR */

+        58, /* GL_AND */

+        60, /* GL_AND_REVERSE */

+       347, /* GL_COPY */

+        59, /* GL_AND_INVERTED */

+      1220, /* GL_NOOP */

+      2288, /* GL_XOR */

+      1287, /* GL_OR */

+      1221, /* GL_NOR */

+       526, /* GL_EQUIV */

+       798, /* GL_INVERT */

+      1290, /* GL_OR_REVERSE */

+       348, /* GL_COPY_INVERTED */

+      1289, /* GL_OR_INVERTED */

+      1210, /* GL_NAND */

+      1744, /* GL_SET */

+       523, /* GL_EMISSION */

+      1754, /* GL_SHININESS */

+        57, /* GL_AMBIENT_AND_DIFFUSE */

+       229, /* GL_COLOR_INDEXES */

+      1159, /* GL_MODELVIEW */

+      1478, /* GL_PROJECTION */

+      1885, /* GL_TEXTURE */

+       185, /* GL_COLOR */

+       395, /* GL_DEPTH */

+      1816, /* GL_STENCIL */

+       228, /* GL_COLOR_INDEX */

+      1837, /* GL_STENCIL_INDEX */

+       411, /* GL_DEPTH_COMPONENT */

+      1543, /* GL_RED */

+       692, /* GL_GREEN */

+       110, /* GL_BLUE */

+        32, /* GL_ALPHA */

+      1599, /* GL_RGB */

+      1639, /* GL_RGBA */

+       856, /* GL_LUMINANCE */

+       883, /* GL_LUMINANCE_ALPHA */

+        86, /* GL_BITMAP */

+      1342, /* GL_POINT */

+       820, /* GL_LINE */

+       541, /* GL_FILL */

+      1557, /* GL_RENDER */

+       537, /* GL_FEEDBACK */

+      1736, /* GL_SELECT */

+       547, /* GL_FLAT */

+      1765, /* GL_SMOOTH */

+       799, /* GL_KEEP */

+      1590, /* GL_REPLACE */

+       727, /* GL_INCR */

+       391, /* GL_DECR */

+      2210, /* GL_VENDOR */

+      1587, /* GL_RENDERER */

+      2211, /* GL_VERSION */

+       530, /* GL_EXTENSIONS */

+      1686, /* GL_S */

+      1876, /* GL_T */

+      1526, /* GL_R */

+      1505, /* GL_Q */

+      1196, /* GL_MODULATE */

+       390, /* GL_DECAL */

+      2042, /* GL_TEXTURE_ENV_MODE */

+      2041, /* GL_TEXTURE_ENV_COLOR */

+      2040, /* GL_TEXTURE_ENV */

+       531, /* GL_EYE_LINEAR */

+      1248, /* GL_OBJECT_LINEAR */

+      1791, /* GL_SPHERE_MAP */

+      2045, /* GL_TEXTURE_GEN_MODE */

+      1250, /* GL_OBJECT_PLANE */

+       532, /* GL_EYE_PLANE */

+      1211, /* GL_NEAREST */

+       821, /* GL_LINEAR */

+      1215, /* GL_NEAREST_MIPMAP_NEAREST */

+       826, /* GL_LINEAR_MIPMAP_NEAREST */

+      1214, /* GL_NEAREST_MIPMAP_LINEAR */

+       825, /* GL_LINEAR_MIPMAP_LINEAR */

+      2068, /* GL_TEXTURE_MAG_FILTER */

+      2077, /* GL_TEXTURE_MIN_FILTER */

+      2098, /* GL_TEXTURE_WRAP_S */

+      2099, /* GL_TEXTURE_WRAP_T */

+       155, /* GL_CLAMP */

+      1589, /* GL_REPEAT */

+      1386, /* GL_POLYGON_OFFSET_UNITS */

+      1385, /* GL_POLYGON_OFFSET_POINT */

+      1384, /* GL_POLYGON_OFFSET_LINE */

+      1529, /* GL_R3_G3_B2 */

+      2207, /* GL_V2F */

+      2208, /* GL_V3F */

+       152, /* GL_C4UB_V2F */

+       153, /* GL_C4UB_V3F */

+       150, /* GL_C3F_V3F */

+      1208, /* GL_N3F_V3F */

+       151, /* GL_C4F_N3F_V3F */

+      1881, /* GL_T2F_V3F */

+      1883, /* GL_T4F_V4F */

+      1879, /* GL_T2F_C4UB_V3F */

+      1877, /* GL_T2F_C3F_V3F */

+      1880, /* GL_T2F_N3F_V3F */

+      1878, /* GL_T2F_C4F_N3F_V3F */

+      1882, /* GL_T4F_C4F_N3F_V4F */

+       169, /* GL_CLIP_DISTANCE0 */

+       170, /* GL_CLIP_DISTANCE1 */

+       171, /* GL_CLIP_DISTANCE2 */

+       172, /* GL_CLIP_DISTANCE3 */

+       173, /* GL_CLIP_DISTANCE4 */

+       174, /* GL_CLIP_DISTANCE5 */

+       175, /* GL_CLIP_DISTANCE6 */

+       176, /* GL_CLIP_DISTANCE7 */

+       805, /* GL_LIGHT0 */

+       806, /* GL_LIGHT1 */

+       807, /* GL_LIGHT2 */

+       808, /* GL_LIGHT3 */

+       809, /* GL_LIGHT4 */

+       810, /* GL_LIGHT5 */

+       811, /* GL_LIGHT6 */

+       812, /* GL_LIGHT7 */

+       702, /* GL_HINT_BIT */

+       319, /* GL_CONSTANT_COLOR */

+      1261, /* GL_ONE_MINUS_CONSTANT_COLOR */

+       314, /* GL_CONSTANT_ALPHA */

+      1259, /* GL_ONE_MINUS_CONSTANT_ALPHA */

+        89, /* GL_BLEND_COLOR */

+       669, /* GL_FUNC_ADD */

+      1140, /* GL_MIN */

+      1009, /* GL_MAX */

+        96, /* GL_BLEND_EQUATION */

+       675, /* GL_FUNC_SUBTRACT */

+       672, /* GL_FUNC_REVERSE_SUBTRACT */

+       327, /* GL_CONVOLUTION_1D */

+       328, /* GL_CONVOLUTION_2D */

+      1739, /* GL_SEPARABLE_2D */

+       331, /* GL_CONVOLUTION_BORDER_MODE */

+       335, /* GL_CONVOLUTION_FILTER_SCALE */

+       333, /* GL_CONVOLUTION_FILTER_BIAS */

+      1544, /* GL_REDUCE */

+       337, /* GL_CONVOLUTION_FORMAT */

+       341, /* GL_CONVOLUTION_WIDTH */

+       339, /* GL_CONVOLUTION_HEIGHT */

+      1028, /* GL_MAX_CONVOLUTION_WIDTH */

+      1026, /* GL_MAX_CONVOLUTION_HEIGHT */

+      1425, /* GL_POST_CONVOLUTION_RED_SCALE */

+      1421, /* GL_POST_CONVOLUTION_GREEN_SCALE */

+      1416, /* GL_POST_CONVOLUTION_BLUE_SCALE */

+      1412, /* GL_POST_CONVOLUTION_ALPHA_SCALE */

+      1423, /* GL_POST_CONVOLUTION_RED_BIAS */

+      1419, /* GL_POST_CONVOLUTION_GREEN_BIAS */

+      1414, /* GL_POST_CONVOLUTION_BLUE_BIAS */

+      1410, /* GL_POST_CONVOLUTION_ALPHA_BIAS */

+       703, /* GL_HISTOGRAM */

+      1485, /* GL_PROXY_HISTOGRAM */

+       719, /* GL_HISTOGRAM_WIDTH */

+       709, /* GL_HISTOGRAM_FORMAT */

+       715, /* GL_HISTOGRAM_RED_SIZE */

+       711, /* GL_HISTOGRAM_GREEN_SIZE */

+       706, /* GL_HISTOGRAM_BLUE_SIZE */

+       704, /* GL_HISTOGRAM_ALPHA_SIZE */

+       713, /* GL_HISTOGRAM_LUMINANCE_SIZE */

+       717, /* GL_HISTOGRAM_SINK */

+      1141, /* GL_MINMAX */

+      1143, /* GL_MINMAX_FORMAT */

+      1145, /* GL_MINMAX_SINK */

+      1884, /* GL_TABLE_TOO_LARGE_EXT */

+      2156, /* GL_UNSIGNED_BYTE_3_3_2 */

+      2196, /* GL_UNSIGNED_SHORT_4_4_4_4 */

+      2199, /* GL_UNSIGNED_SHORT_5_5_5_1 */

+      2168, /* GL_UNSIGNED_INT_8_8_8_8 */

+      2159, /* GL_UNSIGNED_INT_10_10_10_2 */

+      1383, /* GL_POLYGON_OFFSET_FILL */

+      1382, /* GL_POLYGON_OFFSET_FACTOR */

+      1381, /* GL_POLYGON_OFFSET_BIAS */

+      1593, /* GL_RESCALE_NORMAL */

+        41, /* GL_ALPHA4 */

+        43, /* GL_ALPHA8 */

+        33, /* GL_ALPHA12 */

+        35, /* GL_ALPHA16 */

+       871, /* GL_LUMINANCE4 */

+       877, /* GL_LUMINANCE8 */

+       857, /* GL_LUMINANCE12 */

+       863, /* GL_LUMINANCE16 */

+       872, /* GL_LUMINANCE4_ALPHA4 */

+       875, /* GL_LUMINANCE6_ALPHA2 */

+       880, /* GL_LUMINANCE8_ALPHA8 */

+       860, /* GL_LUMINANCE12_ALPHA4 */

+       858, /* GL_LUMINANCE12_ALPHA12 */

+       866, /* GL_LUMINANCE16_ALPHA16 */

+       746, /* GL_INTENSITY */

+       755, /* GL_INTENSITY4 */

+       757, /* GL_INTENSITY8 */

+       747, /* GL_INTENSITY12 */

+       749, /* GL_INTENSITY16 */

+      1614, /* GL_RGB2_EXT */

+      1620, /* GL_RGB4 */

+      1623, /* GL_RGB5 */

+      1630, /* GL_RGB8 */

+      1600, /* GL_RGB10 */

+      1604, /* GL_RGB12 */

+      1606, /* GL_RGB16 */

+      1650, /* GL_RGBA2 */

+      1657, /* GL_RGBA4 */

+      1626, /* GL_RGB5_A1 */

+      1662, /* GL_RGBA8 */

+      1601, /* GL_RGB10_A2 */

+      1640, /* GL_RGBA12 */

+      1642, /* GL_RGBA16 */

+      2085, /* GL_TEXTURE_RED_SIZE */

+      2053, /* GL_TEXTURE_GREEN_SIZE */

+      1977, /* GL_TEXTURE_BLUE_SIZE */

+      1958, /* GL_TEXTURE_ALPHA_SIZE */

+      2066, /* GL_TEXTURE_LUMINANCE_SIZE */

+      2057, /* GL_TEXTURE_INTENSITY_SIZE */

+      1591, /* GL_REPLACE_EXT */

+      1489, /* GL_PROXY_TEXTURE_1D */

+      1493, /* GL_PROXY_TEXTURE_2D */

+      2093, /* GL_TEXTURE_TOO_LARGE_EXT */

+      2079, /* GL_TEXTURE_PRIORITY */

+      2087, /* GL_TEXTURE_RESIDENT */

+      1961, /* GL_TEXTURE_BINDING_1D */

+      1964, /* GL_TEXTURE_BINDING_2D */

+      1967, /* GL_TEXTURE_BINDING_3D */

+      1297, /* GL_PACK_SKIP_IMAGES */

+      1293, /* GL_PACK_IMAGE_HEIGHT */

+      2149, /* GL_UNPACK_SKIP_IMAGES */

+      2146, /* GL_UNPACK_IMAGE_HEIGHT */

+      1956, /* GL_TEXTURE_3D */

+      1497, /* GL_PROXY_TEXTURE_3D */

+      2037, /* GL_TEXTURE_DEPTH */

+      2096, /* GL_TEXTURE_WRAP_R */

+      1010, /* GL_MAX_3D_TEXTURE_SIZE */

+      2212, /* GL_VERTEX_ARRAY */

+      1223, /* GL_NORMAL_ARRAY */

+       186, /* GL_COLOR_ARRAY */

+       731, /* GL_INDEX_ARRAY */

+      2007, /* GL_TEXTURE_COORD_ARRAY */

+       515, /* GL_EDGE_FLAG_ARRAY */

+      2218, /* GL_VERTEX_ARRAY_SIZE */

+      2220, /* GL_VERTEX_ARRAY_TYPE */

+      2219, /* GL_VERTEX_ARRAY_STRIDE */

+      1228, /* GL_NORMAL_ARRAY_TYPE */

+      1227, /* GL_NORMAL_ARRAY_STRIDE */

+       190, /* GL_COLOR_ARRAY_SIZE */

+       192, /* GL_COLOR_ARRAY_TYPE */

+       191, /* GL_COLOR_ARRAY_STRIDE */

+       736, /* GL_INDEX_ARRAY_TYPE */

+       735, /* GL_INDEX_ARRAY_STRIDE */

+      2011, /* GL_TEXTURE_COORD_ARRAY_SIZE */

+      2013, /* GL_TEXTURE_COORD_ARRAY_TYPE */

+      2012, /* GL_TEXTURE_COORD_ARRAY_STRIDE */

+       519, /* GL_EDGE_FLAG_ARRAY_STRIDE */

+      2217, /* GL_VERTEX_ARRAY_POINTER */

+      1226, /* GL_NORMAL_ARRAY_POINTER */

+       189, /* GL_COLOR_ARRAY_POINTER */

+       734, /* GL_INDEX_ARRAY_POINTER */

+      2010, /* GL_TEXTURE_COORD_ARRAY_POINTER */

+       518, /* GL_EDGE_FLAG_ARRAY_POINTER */

+      1201, /* GL_MULTISAMPLE */

+      1713, /* GL_SAMPLE_ALPHA_TO_COVERAGE */

+      1715, /* GL_SAMPLE_ALPHA_TO_ONE */

+      1720, /* GL_SAMPLE_COVERAGE */

+      1717, /* GL_SAMPLE_BUFFERS */

+      1708, /* GL_SAMPLES */

+      1724, /* GL_SAMPLE_COVERAGE_VALUE */

+      1722, /* GL_SAMPLE_COVERAGE_INVERT */

+       234, /* GL_COLOR_MATRIX */

+       236, /* GL_COLOR_MATRIX_STACK_DEPTH */

+      1022, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */

+      1408, /* GL_POST_COLOR_MATRIX_RED_SCALE */

+      1404, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */

+      1399, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */

+      1395, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */

+      1406, /* GL_POST_COLOR_MATRIX_RED_BIAS */

+      1402, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */

+      1397, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */

+      1393, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */

+      1990, /* GL_TEXTURE_COLOR_TABLE_SGI */

+      1498, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */

+      1992, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */

+        94, /* GL_BLEND_DST_RGB */

+       108, /* GL_BLEND_SRC_RGB */

+        92, /* GL_BLEND_DST_ALPHA */

+       106, /* GL_BLEND_SRC_ALPHA */

+       240, /* GL_COLOR_TABLE */

+      1418, /* GL_POST_CONVOLUTION_COLOR_TABLE */

+      1401, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */

+      1484, /* GL_PROXY_COLOR_TABLE */

+      1488, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */

+      1487, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */

+       264, /* GL_COLOR_TABLE_SCALE */

+       244, /* GL_COLOR_TABLE_BIAS */

+       249, /* GL_COLOR_TABLE_FORMAT */

+       266, /* GL_COLOR_TABLE_WIDTH */

+       261, /* GL_COLOR_TABLE_RED_SIZE */

+       252, /* GL_COLOR_TABLE_GREEN_SIZE */

+       246, /* GL_COLOR_TABLE_BLUE_SIZE */

+       241, /* GL_COLOR_TABLE_ALPHA_SIZE */

+       258, /* GL_COLOR_TABLE_LUMINANCE_SIZE */

+       255, /* GL_COLOR_TABLE_INTENSITY_SIZE */

+        79, /* GL_BGR */

+        80, /* GL_BGRA */

+      1037, /* GL_MAX_ELEMENTS_VERTICES */

+      1036, /* GL_MAX_ELEMENTS_INDICES */

+      2056, /* GL_TEXTURE_INDEX_SIZE_EXT */

+       183, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */

+      1364, /* GL_POINT_SIZE_MIN */

+      1360, /* GL_POINT_SIZE_MAX */

+      1349, /* GL_POINT_FADE_THRESHOLD_SIZE */

+      1345, /* GL_POINT_DISTANCE_ATTENUATION */

+       157, /* GL_CLAMP_TO_BORDER */

+       160, /* GL_CLAMP_TO_EDGE */

+      2078, /* GL_TEXTURE_MIN_LOD */

+      2076, /* GL_TEXTURE_MAX_LOD */

+      1960, /* GL_TEXTURE_BASE_LEVEL */

+      2075, /* GL_TEXTURE_MAX_LEVEL */

+       722, /* GL_IGNORE_BORDER_HP */

+       318, /* GL_CONSTANT_BORDER_HP */

+      1592, /* GL_REPLICATE_BORDER_HP */

+       329, /* GL_CONVOLUTION_BORDER_COLOR */

+      1256, /* GL_OCCLUSION_TEST_HP */

+      1257, /* GL_OCCLUSION_TEST_RESULT_HP */

+       823, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */

+      1984, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */

+      1986, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */

+      1988, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */

+      1989, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */

+      1987, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */

+      1985, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */

+      1016, /* GL_MAX_CLIPMAP_DEPTH_SGIX */

+      1017, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */

+      1428, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */

+      1430, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */

+      1427, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */

+      1429, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */

+      2064, /* GL_TEXTURE_LOD_BIAS_S_SGIX */

+      2065, /* GL_TEXTURE_LOD_BIAS_T_SGIX */

+      2063, /* GL_TEXTURE_LOD_BIAS_R_SGIX */

+       678, /* GL_GENERATE_MIPMAP */

+       679, /* GL_GENERATE_MIPMAP_HINT */

+       591, /* GL_FOG_OFFSET_SGIX */

+       592, /* GL_FOG_OFFSET_VALUE_SGIX */

+      1998, /* GL_TEXTURE_COMPARE_SGIX */

+      1997, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */

+      2060, /* GL_TEXTURE_LEQUAL_R_SGIX */

+      2052, /* GL_TEXTURE_GEQUAL_R_SGIX */

+       412, /* GL_DEPTH_COMPONENT16 */

+       416, /* GL_DEPTH_COMPONENT24 */

+       420, /* GL_DEPTH_COMPONENT32 */

+       354, /* GL_CULL_VERTEX_EXT */

+       356, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */

+       355, /* GL_CULL_VERTEX_EYE_POSITION_EXT */

+      2284, /* GL_WRAP_BORDER_SUN */

+      1991, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */

+       816, /* GL_LIGHT_MODEL_COLOR_CONTROL */

+      1758, /* GL_SINGLE_COLOR */

+      1742, /* GL_SEPARATE_SPECULAR_COLOR */

+      1753, /* GL_SHARED_TEXTURE_PALETTE_EXT */

+       603, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */

+       604, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */

+       615, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */

+       606, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */

+       602, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */

+       601, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */

+       605, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */

+       616, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */

+       633, /* GL_FRAMEBUFFER_DEFAULT */

+       660, /* GL_FRAMEBUFFER_UNDEFINED */

+       428, /* GL_DEPTH_STENCIL_ATTACHMENT */

+       892, /* GL_MAJOR_VERSION */

+      1147, /* GL_MINOR_VERSION */

+      1237, /* GL_NUM_EXTENSIONS */

+       324, /* GL_CONTEXT_FLAGS */

+       730, /* GL_INDEX */

+       406, /* GL_DEPTH_BUFFER */

+      1832, /* GL_STENCIL_BUFFER */

+       295, /* GL_COMPRESSED_RED */

+       296, /* GL_COMPRESSED_RG */

+      2155, /* GL_UNSIGNED_BYTE_2_3_3_REV */

+      2200, /* GL_UNSIGNED_SHORT_5_6_5 */

+      2201, /* GL_UNSIGNED_SHORT_5_6_5_REV */

+      2197, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */

+      2194, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */

+      2169, /* GL_UNSIGNED_INT_8_8_8_8_REV */

+      2165, /* GL_UNSIGNED_INT_2_10_10_10_REV */

+      2073, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */

+      2074, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */

+      2072, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */

+      1151, /* GL_MIRRORED_REPEAT */

+      1679, /* GL_RGB_S3TC */

+      1622, /* GL_RGB4_S3TC */

+      1675, /* GL_RGBA_S3TC */

+      1661, /* GL_RGBA4_S3TC */

+      1670, /* GL_RGBA_DXT5_S3TC */

+      1658, /* GL_RGBA4_DXT5_S3TC */

+       306, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */

+       301, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */

+       302, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */

+       303, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */

+      1213, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */

+      1212, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */

+       824, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */

+       578, /* GL_FOG_COORDINATE_SOURCE */

+       570, /* GL_FOG_COORD */

+       594, /* GL_FRAGMENT_DEPTH */

+       360, /* GL_CURRENT_FOG_COORD */

+       577, /* GL_FOG_COORDINATE_ARRAY_TYPE */

+       576, /* GL_FOG_COORDINATE_ARRAY_STRIDE */

+       575, /* GL_FOG_COORDINATE_ARRAY_POINTER */

+       572, /* GL_FOG_COORDINATE_ARRAY */

+       238, /* GL_COLOR_SUM */

+       381, /* GL_CURRENT_SECONDARY_COLOR */

+      1733, /* GL_SECONDARY_COLOR_ARRAY_SIZE */

+      1735, /* GL_SECONDARY_COLOR_ARRAY_TYPE */

+      1734, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */

+      1732, /* GL_SECONDARY_COLOR_ARRAY_POINTER */

+      1729, /* GL_SECONDARY_COLOR_ARRAY */

+       379, /* GL_CURRENT_RASTER_SECONDARY_COLOR */

+        29, /* GL_ALIASED_POINT_SIZE_RANGE */

+        28, /* GL_ALIASED_LINE_WIDTH_RANGE */

+      1886, /* GL_TEXTURE0 */

+      1888, /* GL_TEXTURE1 */

+      1910, /* GL_TEXTURE2 */

+      1932, /* GL_TEXTURE3 */

+      1938, /* GL_TEXTURE4 */

+      1940, /* GL_TEXTURE5 */

+      1942, /* GL_TEXTURE6 */

+      1944, /* GL_TEXTURE7 */

+      1946, /* GL_TEXTURE8 */

+      1948, /* GL_TEXTURE9 */

+      1889, /* GL_TEXTURE10 */

+      1891, /* GL_TEXTURE11 */

+      1893, /* GL_TEXTURE12 */

+      1895, /* GL_TEXTURE13 */

+      1897, /* GL_TEXTURE14 */

+      1899, /* GL_TEXTURE15 */

+      1901, /* GL_TEXTURE16 */

+      1903, /* GL_TEXTURE17 */

+      1905, /* GL_TEXTURE18 */

+      1907, /* GL_TEXTURE19 */

+      1911, /* GL_TEXTURE20 */

+      1913, /* GL_TEXTURE21 */

+      1915, /* GL_TEXTURE22 */

+      1917, /* GL_TEXTURE23 */

+      1919, /* GL_TEXTURE24 */

+      1921, /* GL_TEXTURE25 */

+      1923, /* GL_TEXTURE26 */

+      1925, /* GL_TEXTURE27 */

+      1927, /* GL_TEXTURE28 */

+      1929, /* GL_TEXTURE29 */

+      1933, /* GL_TEXTURE30 */

+      1935, /* GL_TEXTURE31 */

+        19, /* GL_ACTIVE_TEXTURE */

+       163, /* GL_CLIENT_ACTIVE_TEXTURE */

+      1112, /* GL_MAX_TEXTURE_UNITS */

+      2128, /* GL_TRANSPOSE_MODELVIEW_MATRIX */

+      2131, /* GL_TRANSPOSE_PROJECTION_MATRIX */

+      2133, /* GL_TRANSPOSE_TEXTURE_MATRIX */

+      2125, /* GL_TRANSPOSE_COLOR_MATRIX */

+      1868, /* GL_SUBTRACT */

+      1094, /* GL_MAX_RENDERBUFFER_SIZE */

+       287, /* GL_COMPRESSED_ALPHA */

+       291, /* GL_COMPRESSED_LUMINANCE */

+       292, /* GL_COMPRESSED_LUMINANCE_ALPHA */

+       289, /* GL_COMPRESSED_INTENSITY */

+       297, /* GL_COMPRESSED_RGB */

+       298, /* GL_COMPRESSED_RGBA */

+      2005, /* GL_TEXTURE_COMPRESSION_HINT */

+      2082, /* GL_TEXTURE_RECTANGLE */

+      1973, /* GL_TEXTURE_BINDING_RECTANGLE */

+      1501, /* GL_PROXY_TEXTURE_RECTANGLE */

+      1091, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */

+       427, /* GL_DEPTH_STENCIL */

+      2161, /* GL_UNSIGNED_INT_24_8 */

+      1107, /* GL_MAX_TEXTURE_LOD_BIAS */

+      2071, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */

+      1109, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */

+      2043, /* GL_TEXTURE_FILTER_CONTROL */

+      2061, /* GL_TEXTURE_LOD_BIAS */

+       271, /* GL_COMBINE4 */

+      1100, /* GL_MAX_SHININESS_NV */

+      1101, /* GL_MAX_SPOT_EXPONENT_NV */

+       728, /* GL_INCR_WRAP */

+       392, /* GL_DECR_WRAP */

+      1171, /* GL_MODELVIEW1_ARB */

+      1229, /* GL_NORMAL_MAP */

+      1552, /* GL_REFLECTION_MAP */

+      2015, /* GL_TEXTURE_CUBE_MAP */

+      1970, /* GL_TEXTURE_BINDING_CUBE_MAP */

+      2027, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */

+      2017, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */

+      2030, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */

+      2020, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */

+      2033, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */

+      2023, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */

+      1499, /* GL_PROXY_TEXTURE_CUBE_MAP */

+      1030, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */

+      1207, /* GL_MULTISAMPLE_FILTER_HINT_NV */

+      1442, /* GL_PRIMITIVE_RESTART_NV */

+      1441, /* GL_PRIMITIVE_RESTART_INDEX_NV */

+       586, /* GL_FOG_DISTANCE_MODE_NV */

+       534, /* GL_EYE_RADIAL_NV */

+       533, /* GL_EYE_PLANE_ABSOLUTE_NV */

+       270, /* GL_COMBINE */

+       277, /* GL_COMBINE_RGB */

+       272, /* GL_COMBINE_ALPHA */

+      1680, /* GL_RGB_SCALE */

+        25, /* GL_ADD_SIGNED */

+       764, /* GL_INTERPOLATE */

+       313, /* GL_CONSTANT */

+      1434, /* GL_PRIMARY_COLOR */

+      1431, /* GL_PREVIOUS */

+      1773, /* GL_SOURCE0_RGB */

+      1779, /* GL_SOURCE1_RGB */

+      1785, /* GL_SOURCE2_RGB */

+      1789, /* GL_SOURCE3_RGB_NV */

+      1770, /* GL_SOURCE0_ALPHA */

+      1776, /* GL_SOURCE1_ALPHA */

+      1782, /* GL_SOURCE2_ALPHA */

+      1788, /* GL_SOURCE3_ALPHA_NV */

+      1270, /* GL_OPERAND0_RGB */

+      1276, /* GL_OPERAND1_RGB */

+      1282, /* GL_OPERAND2_RGB */

+      1286, /* GL_OPERAND3_RGB_NV */

+      1267, /* GL_OPERAND0_ALPHA */

+      1273, /* GL_OPERAND1_ALPHA */

+      1279, /* GL_OPERAND2_ALPHA */

+      1285, /* GL_OPERAND3_ALPHA_NV */

+       137, /* GL_BUFFER_OBJECT_APPLE */

+      2213, /* GL_VERTEX_ARRAY_BINDING */

+      2080, /* GL_TEXTURE_RANGE_LENGTH_APPLE */

+      2081, /* GL_TEXTURE_RANGE_POINTER_APPLE */

+      2289, /* GL_YCBCR_422_APPLE */

+      2202, /* GL_UNSIGNED_SHORT_8_8_APPLE */

+      2204, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */

+      2092, /* GL_TEXTURE_STORAGE_HINT_APPLE */

+      1859, /* GL_STORAGE_PRIVATE_APPLE */

+      1858, /* GL_STORAGE_CACHED_APPLE */

+      1860, /* GL_STORAGE_SHARED_APPLE */

+      1760, /* GL_SLICE_ACCUM_SUN */

+      1510, /* GL_QUAD_MESH_SUN */

+      2139, /* GL_TRIANGLE_MESH_SUN */

+      2254, /* GL_VERTEX_PROGRAM_ARB */

+      2265, /* GL_VERTEX_STATE_PROGRAM_NV */

+      2239, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */

+      2247, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */

+      2249, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */

+      2251, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */

+       383, /* GL_CURRENT_VERTEX_ATTRIB */

+      1455, /* GL_PROGRAM_LENGTH_ARB */

+      1471, /* GL_PROGRAM_STRING_ARB */

+      1194, /* GL_MODELVIEW_PROJECTION_NV */

+       721, /* GL_IDENTITY_NV */

+       796, /* GL_INVERSE_NV */

+      2130, /* GL_TRANSPOSE_NV */

+       797, /* GL_INVERSE_TRANSPOSE_NV */

+      1075, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */

+      1074, /* GL_MAX_PROGRAM_MATRICES_ARB */

+       956, /* GL_MATRIX0_NV */

+       968, /* GL_MATRIX1_NV */

+       980, /* GL_MATRIX2_NV */

+       984, /* GL_MATRIX3_NV */

+       986, /* GL_MATRIX4_NV */

+       988, /* GL_MATRIX5_NV */

+       990, /* GL_MATRIX6_NV */

+       992, /* GL_MATRIX7_NV */

+       366, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */

+       363, /* GL_CURRENT_MATRIX_ARB */

+      1468, /* GL_PROGRAM_POINT_SIZE */

+      2260, /* GL_VERTEX_PROGRAM_TWO_SIDE */

+      1467, /* GL_PROGRAM_PARAMETER_NV */

+      2245, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */

+      1473, /* GL_PROGRAM_TARGET_NV */

+      1470, /* GL_PROGRAM_RESIDENT_NV */

+      2102, /* GL_TRACK_MATRIX_NV */

+      2103, /* GL_TRACK_MATRIX_TRANSFORM_NV */

+      2255, /* GL_VERTEX_PROGRAM_BINDING_NV */

+      1449, /* GL_PROGRAM_ERROR_POSITION_ARB */

+       408, /* GL_DEPTH_CLAMP */

+      2221, /* GL_VERTEX_ATTRIB_ARRAY0_NV */

+      2228, /* GL_VERTEX_ATTRIB_ARRAY1_NV */

+      2229, /* GL_VERTEX_ATTRIB_ARRAY2_NV */

+      2230, /* GL_VERTEX_ATTRIB_ARRAY3_NV */

+      2231, /* GL_VERTEX_ATTRIB_ARRAY4_NV */

+      2232, /* GL_VERTEX_ATTRIB_ARRAY5_NV */

+      2233, /* GL_VERTEX_ATTRIB_ARRAY6_NV */

+      2234, /* GL_VERTEX_ATTRIB_ARRAY7_NV */

+      2235, /* GL_VERTEX_ATTRIB_ARRAY8_NV */

+      2236, /* GL_VERTEX_ATTRIB_ARRAY9_NV */

+      2222, /* GL_VERTEX_ATTRIB_ARRAY10_NV */

+      2223, /* GL_VERTEX_ATTRIB_ARRAY11_NV */

+      2224, /* GL_VERTEX_ATTRIB_ARRAY12_NV */

+      2225, /* GL_VERTEX_ATTRIB_ARRAY13_NV */

+      2226, /* GL_VERTEX_ATTRIB_ARRAY14_NV */

+      2227, /* GL_VERTEX_ATTRIB_ARRAY15_NV */

+       904, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */

+       911, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */

+       912, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */

+       913, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */

+       914, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */

+       915, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */

+       916, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */

+       917, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */

+       918, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */

+       919, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */

+       905, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */

+       906, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */

+       907, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */

+       908, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */

+       909, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */

+       910, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */

+       931, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */

+       938, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */

+       939, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */

+       940, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */

+       941, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */

+       942, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */

+       943, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */

+      1448, /* GL_PROGRAM_BINDING_ARB */

+       945, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */

+       946, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */

+       932, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */

+       933, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */

+       934, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */

+       935, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */

+       936, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */

+       937, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */

+      2003, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */

+      2000, /* GL_TEXTURE_COMPRESSED */

+      1235, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */

+       311, /* GL_COMPRESSED_TEXTURE_FORMATS */

+      1134, /* GL_MAX_VERTEX_UNITS_ARB */

+        23, /* GL_ACTIVE_VERTEX_UNITS_ARB */

+      2283, /* GL_WEIGHT_SUM_UNITY_ARB */

+      2253, /* GL_VERTEX_BLEND_ARB */

+       385, /* GL_CURRENT_WEIGHT_ARB */

+      2281, /* GL_WEIGHT_ARRAY_TYPE_ARB */

+      2279, /* GL_WEIGHT_ARRAY_STRIDE_ARB */

+      2277, /* GL_WEIGHT_ARRAY_SIZE_ARB */

+      2275, /* GL_WEIGHT_ARRAY_POINTER_ARB */

+      2270, /* GL_WEIGHT_ARRAY_ARB */

+       442, /* GL_DOT3_RGB */

+       443, /* GL_DOT3_RGBA */

+       305, /* GL_COMPRESSED_RGB_FXT1_3DFX */

+       300, /* GL_COMPRESSED_RGBA_FXT1_3DFX */

+      1202, /* GL_MULTISAMPLE_3DFX */

+      1718, /* GL_SAMPLE_BUFFERS_3DFX */

+      1709, /* GL_SAMPLES_3DFX */

+      1182, /* GL_MODELVIEW2_ARB */

+      1185, /* GL_MODELVIEW3_ARB */

+      1186, /* GL_MODELVIEW4_ARB */

+      1187, /* GL_MODELVIEW5_ARB */

+      1188, /* GL_MODELVIEW6_ARB */

+      1189, /* GL_MODELVIEW7_ARB */

+      1190, /* GL_MODELVIEW8_ARB */

+      1191, /* GL_MODELVIEW9_ARB */

+      1161, /* GL_MODELVIEW10_ARB */

+      1162, /* GL_MODELVIEW11_ARB */

+      1163, /* GL_MODELVIEW12_ARB */

+      1164, /* GL_MODELVIEW13_ARB */

+      1165, /* GL_MODELVIEW14_ARB */

+      1166, /* GL_MODELVIEW15_ARB */

+      1167, /* GL_MODELVIEW16_ARB */

+      1168, /* GL_MODELVIEW17_ARB */

+      1169, /* GL_MODELVIEW18_ARB */

+      1170, /* GL_MODELVIEW19_ARB */

+      1172, /* GL_MODELVIEW20_ARB */

+      1173, /* GL_MODELVIEW21_ARB */

+      1174, /* GL_MODELVIEW22_ARB */

+      1175, /* GL_MODELVIEW23_ARB */

+      1176, /* GL_MODELVIEW24_ARB */

+      1177, /* GL_MODELVIEW25_ARB */

+      1178, /* GL_MODELVIEW26_ARB */

+      1179, /* GL_MODELVIEW27_ARB */

+      1180, /* GL_MODELVIEW28_ARB */

+      1181, /* GL_MODELVIEW29_ARB */

+      1183, /* GL_MODELVIEW30_ARB */

+      1184, /* GL_MODELVIEW31_ARB */

+       447, /* GL_DOT3_RGB_EXT */

+       445, /* GL_DOT3_RGBA_EXT */

+      1155, /* GL_MIRROR_CLAMP_EXT */

+      1158, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */

+      1197, /* GL_MODULATE_ADD_ATI */

+      1198, /* GL_MODULATE_SIGNED_ADD_ATI */

+      1199, /* GL_MODULATE_SUBTRACT_ATI */

+      2290, /* GL_YCBCR_MESA */

+      1294, /* GL_PACK_INVERT_MESA */

+       388, /* GL_DEBUG_OBJECT_MESA */

+       389, /* GL_DEBUG_PRINT_MESA */

+       387, /* GL_DEBUG_ASSERT_MESA */

+       139, /* GL_BUFFER_SIZE */

+       141, /* GL_BUFFER_USAGE */

+       145, /* GL_BUMP_ROT_MATRIX_ATI */

+       146, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */

+       144, /* GL_BUMP_NUM_TEX_UNITS_ATI */

+       148, /* GL_BUMP_TEX_UNITS_ATI */

+       507, /* GL_DUDV_ATI */

+       506, /* GL_DU8DV8_ATI */

+       143, /* GL_BUMP_ENVMAP_ATI */

+       147, /* GL_BUMP_TARGET_ATI */

+      1238, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */

+      1446, /* GL_PROGRAM_BINARY_FORMATS_OES */

+      1822, /* GL_STENCIL_BACK_FUNC */

+      1820, /* GL_STENCIL_BACK_FAIL */

+      1824, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */

+      1826, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */

+       595, /* GL_FRAGMENT_PROGRAM_ARB */

+      1444, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */

+      1476, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */

+      1475, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */

+      1458, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */

+      1464, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */

+      1463, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */

+      1064, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */

+      1089, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */

+      1088, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */

+      1077, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */

+      1083, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */

+      1082, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */

+      1652, /* GL_RGBA32F */

+      1615, /* GL_RGB32F */

+      1643, /* GL_RGBA16F */

+      1607, /* GL_RGB16F */

+      1033, /* GL_MAX_DRAW_BUFFERS */

+       451, /* GL_DRAW_BUFFER0 */

+       454, /* GL_DRAW_BUFFER1 */

+       475, /* GL_DRAW_BUFFER2 */

+       478, /* GL_DRAW_BUFFER3 */

+       481, /* GL_DRAW_BUFFER4 */

+       484, /* GL_DRAW_BUFFER5 */

+       487, /* GL_DRAW_BUFFER6 */

+       490, /* GL_DRAW_BUFFER7 */

+       493, /* GL_DRAW_BUFFER8 */

+       496, /* GL_DRAW_BUFFER9 */

+       455, /* GL_DRAW_BUFFER10 */

+       458, /* GL_DRAW_BUFFER11 */

+       461, /* GL_DRAW_BUFFER12 */

+       464, /* GL_DRAW_BUFFER13 */

+       467, /* GL_DRAW_BUFFER14 */

+       470, /* GL_DRAW_BUFFER15 */

+        97, /* GL_BLEND_EQUATION_ALPHA */

+      1007, /* GL_MATRIX_PALETTE_ARB */

+      1057, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */

+      1060, /* GL_MAX_PALETTE_MATRICES_ARB */

+       369, /* GL_CURRENT_PALETTE_MATRIX_ARB */

+       995, /* GL_MATRIX_INDEX_ARRAY_ARB */

+       364, /* GL_CURRENT_MATRIX_INDEX_ARB */

+      1000, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */

+      1004, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */

+      1002, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */

+       998, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */

+      2038, /* GL_TEXTURE_DEPTH_SIZE */

+       435, /* GL_DEPTH_TEXTURE_MODE */

+      1995, /* GL_TEXTURE_COMPARE_MODE */

+      1993, /* GL_TEXTURE_COMPARE_FUNC */

+       281, /* GL_COMPARE_REF_TO_TEXTURE */

+      1371, /* GL_POINT_SPRITE */

+       343, /* GL_COORD_REPLACE */

+      1376, /* GL_POINT_SPRITE_R_MODE_NV */

+      1516, /* GL_QUERY_COUNTER_BITS */

+       372, /* GL_CURRENT_QUERY */

+      1520, /* GL_QUERY_RESULT */

+      1522, /* GL_QUERY_RESULT_AVAILABLE */

+      1126, /* GL_MAX_VERTEX_ATTRIBS */

+      2243, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */

+       433, /* GL_DEPTH_STENCIL_TO_RGBA_NV */

+       432, /* GL_DEPTH_STENCIL_TO_BGRA_NV */

+      1103, /* GL_MAX_TEXTURE_COORDS */

+      1105, /* GL_MAX_TEXTURE_IMAGE_UNITS */

+      1451, /* GL_PROGRAM_ERROR_STRING_ARB */

+      1453, /* GL_PROGRAM_FORMAT_ASCII_ARB */

+      1452, /* GL_PROGRAM_FORMAT_ARB */

+      2094, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */

+       405, /* GL_DEPTH_BOUNDS_TEST_EXT */

+       404, /* GL_DEPTH_BOUNDS_EXT */

+        61, /* GL_ARRAY_BUFFER */

+       520, /* GL_ELEMENT_ARRAY_BUFFER */

+        62, /* GL_ARRAY_BUFFER_BINDING */

+       521, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */

+      2215, /* GL_VERTEX_ARRAY_BUFFER_BINDING */

+      1224, /* GL_NORMAL_ARRAY_BUFFER_BINDING */

+       187, /* GL_COLOR_ARRAY_BUFFER_BINDING */

+       732, /* GL_INDEX_ARRAY_BUFFER_BINDING */

+      2008, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */

+       516, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */

+      1730, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */

+       573, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */

+      2271, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */

+      2237, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */

+      1454, /* GL_PROGRAM_INSTRUCTIONS_ARB */

+      1070, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */

+      1460, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */

+      1079, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */

+      1474, /* GL_PROGRAM_TEMPORARIES_ARB */

+      1085, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */

+      1462, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */

+      1081, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */

+      1466, /* GL_PROGRAM_PARAMETERS_ARB */

+      1084, /* GL_MAX_PROGRAM_PARAMETERS_ARB */

+      1461, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */

+      1080, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */

+      1445, /* GL_PROGRAM_ATTRIBS_ARB */

+      1065, /* GL_MAX_PROGRAM_ATTRIBS_ARB */

+      1459, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */

+      1078, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */

+      1443, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */

+      1063, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */

+      1457, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */

+      1076, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */

+      1071, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */

+      1067, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */

+      1477, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */

+      2127, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */

+      1539, /* GL_READ_ONLY */

+      2285, /* GL_WRITE_ONLY */

+      1541, /* GL_READ_WRITE */

+       124, /* GL_BUFFER_ACCESS */

+       129, /* GL_BUFFER_MAPPED */

+       134, /* GL_BUFFER_MAP_POINTER */

+      2101, /* GL_TIME_ELAPSED_EXT */

+       955, /* GL_MATRIX0_ARB */

+       967, /* GL_MATRIX1_ARB */

+       979, /* GL_MATRIX2_ARB */

+       983, /* GL_MATRIX3_ARB */

+       985, /* GL_MATRIX4_ARB */

+       987, /* GL_MATRIX5_ARB */

+       989, /* GL_MATRIX6_ARB */

+       991, /* GL_MATRIX7_ARB */

+       993, /* GL_MATRIX8_ARB */

+       994, /* GL_MATRIX9_ARB */

+       957, /* GL_MATRIX10_ARB */

+       958, /* GL_MATRIX11_ARB */

+       959, /* GL_MATRIX12_ARB */

+       960, /* GL_MATRIX13_ARB */

+       961, /* GL_MATRIX14_ARB */

+       962, /* GL_MATRIX15_ARB */

+       963, /* GL_MATRIX16_ARB */

+       964, /* GL_MATRIX17_ARB */

+       965, /* GL_MATRIX18_ARB */

+       966, /* GL_MATRIX19_ARB */

+       969, /* GL_MATRIX20_ARB */

+       970, /* GL_MATRIX21_ARB */

+       971, /* GL_MATRIX22_ARB */

+       972, /* GL_MATRIX23_ARB */

+       973, /* GL_MATRIX24_ARB */

+       974, /* GL_MATRIX25_ARB */

+       975, /* GL_MATRIX26_ARB */

+       976, /* GL_MATRIX27_ARB */

+       977, /* GL_MATRIX28_ARB */

+       978, /* GL_MATRIX29_ARB */

+       981, /* GL_MATRIX30_ARB */

+       982, /* GL_MATRIX31_ARB */

+      1863, /* GL_STREAM_DRAW */

+      1865, /* GL_STREAM_READ */

+      1861, /* GL_STREAM_COPY */

+      1812, /* GL_STATIC_DRAW */

+      1814, /* GL_STATIC_READ */

+      1810, /* GL_STATIC_COPY */

+       510, /* GL_DYNAMIC_DRAW */

+       512, /* GL_DYNAMIC_READ */

+       508, /* GL_DYNAMIC_COPY */

+      1334, /* GL_PIXEL_PACK_BUFFER */

+      1338, /* GL_PIXEL_UNPACK_BUFFER */

+      1335, /* GL_PIXEL_PACK_BUFFER_BINDING */

+      1339, /* GL_PIXEL_UNPACK_BUFFER_BINDING */

+       396, /* GL_DEPTH24_STENCIL8 */

+      2090, /* GL_TEXTURE_STENCIL_SIZE */

+      2036, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */

+      1066, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */

+      1069, /* GL_MAX_PROGRAM_IF_DEPTH_NV */

+      1073, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */

+      1072, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */

+      2241, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */

+      1012, /* GL_MAX_ARRAY_TEXTURE_LAYERS */

+      1149, /* GL_MIN_PROGRAM_TEXEL_OFFSET */

+      1086, /* GL_MAX_PROGRAM_TEXEL_OFFSET */

+      1854, /* GL_STENCIL_TEST_TWO_SIDE_EXT */

+        18, /* GL_ACTIVE_STENCIL_FACE_EXT */

+      1156, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */

+      1711, /* GL_SAMPLES_PASSED */

+       688, /* GL_GEOMETRY_VERTICES_OUT */

+       682, /* GL_GEOMETRY_INPUT_TYPE */

+       684, /* GL_GEOMETRY_OUTPUT_TYPE */

+       156, /* GL_CLAMP_READ_COLOR */

+       546, /* GL_FIXED_ONLY */

+      1358, /* GL_POINT_SIZE_ARRAY_TYPE_OES */

+      1357, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */

+      1356, /* GL_POINT_SIZE_ARRAY_POINTER_OES */

+      1193, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */

+      1480, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */

+      2070, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */

+       138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */

+       128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */

+      1556, /* GL_RELEASED_APPLE */

+      2268, /* GL_VOLATILE_APPLE */

+      1595, /* GL_RETAINED_APPLE */

+      2144, /* GL_UNDEFINED_APPLE */

+      1504, /* GL_PURGEABLE_APPLE */

+       596, /* GL_FRAGMENT_SHADER */

+      2263, /* GL_VERTEX_SHADER */

+      1465, /* GL_PROGRAM_OBJECT_ARB */

+      1747, /* GL_SHADER_OBJECT_ARB */

+      1041, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */

+      1131, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */

+      1122, /* GL_MAX_VARYING_COMPONENTS */

+      1129, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */

+      1024, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */

+      1254, /* GL_OBJECT_TYPE_ARB */

+      1749, /* GL_SHADER_TYPE */

+       561, /* GL_FLOAT_VEC2 */

+       563, /* GL_FLOAT_VEC3 */

+       565, /* GL_FLOAT_VEC4 */

+       784, /* GL_INT_VEC2 */

+       786, /* GL_INT_VEC3 */

+       788, /* GL_INT_VEC4 */

+       116, /* GL_BOOL */

+       118, /* GL_BOOL_VEC2 */

+       120, /* GL_BOOL_VEC3 */

+       122, /* GL_BOOL_VEC4 */

+       549, /* GL_FLOAT_MAT2 */

+       553, /* GL_FLOAT_MAT3 */

+       557, /* GL_FLOAT_MAT4 */

+      1687, /* GL_SAMPLER_1D */

+      1693, /* GL_SAMPLER_2D */

+      1701, /* GL_SAMPLER_3D */

+      1705, /* GL_SAMPLER_CUBE */

+      1692, /* GL_SAMPLER_1D_SHADOW */

+      1700, /* GL_SAMPLER_2D_SHADOW */

+      1698, /* GL_SAMPLER_2D_RECT */

+      1699, /* GL_SAMPLER_2D_RECT_SHADOW */

+       551, /* GL_FLOAT_MAT2x3 */

+       552, /* GL_FLOAT_MAT2x4 */

+       555, /* GL_FLOAT_MAT3x2 */

+       556, /* GL_FLOAT_MAT3x4 */

+       559, /* GL_FLOAT_MAT4x2 */

+       560, /* GL_FLOAT_MAT4x3 */

+       394, /* GL_DELETE_STATUS */

+       286, /* GL_COMPILE_STATUS */

+       845, /* GL_LINK_STATUS */

+      2209, /* GL_VALIDATE_STATUS */

+       744, /* GL_INFO_LOG_LENGTH */

+        64, /* GL_ATTACHED_SHADERS */

+        21, /* GL_ACTIVE_UNIFORMS */

+        22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */

+      1748, /* GL_SHADER_SOURCE_LENGTH */

+        15, /* GL_ACTIVE_ATTRIBUTES */

+        16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */

+       598, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */

+      1751, /* GL_SHADING_LANGUAGE_VERSION */

+       371, /* GL_CURRENT_PROGRAM */

+      1303, /* GL_PALETTE4_RGB8_OES */

+      1305, /* GL_PALETTE4_RGBA8_OES */

+      1301, /* GL_PALETTE4_R5_G6_B5_OES */

+      1304, /* GL_PALETTE4_RGBA4_OES */

+      1302, /* GL_PALETTE4_RGB5_A1_OES */

+      1308, /* GL_PALETTE8_RGB8_OES */

+      1310, /* GL_PALETTE8_RGBA8_OES */

+      1306, /* GL_PALETTE8_R5_G6_B5_OES */

+      1309, /* GL_PALETTE8_RGBA4_OES */

+      1307, /* GL_PALETTE8_RGB5_A1_OES */

+       726, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */

+       724, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */

+      1355, /* GL_POINT_SIZE_ARRAY_OES */

+      2014, /* GL_TEXTURE_CROP_RECT_OES */

+       996, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */

+      1354, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */

+      2192, /* GL_UNSIGNED_NORMALIZED */

+      1951, /* GL_TEXTURE_1D_ARRAY */

+      1490, /* GL_PROXY_TEXTURE_1D_ARRAY */

+      1954, /* GL_TEXTURE_2D_ARRAY */

+      1494, /* GL_PROXY_TEXTURE_2D_ARRAY */

+      1962, /* GL_TEXTURE_BINDING_1D_ARRAY */

+      1965, /* GL_TEXTURE_BINDING_2D_ARRAY */

+      1048, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */

+      1981, /* GL_TEXTURE_BUFFER */

+      1102, /* GL_MAX_TEXTURE_BUFFER_SIZE */

+      1969, /* GL_TEXTURE_BINDING_BUFFER */

+      1982, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */

+      1983, /* GL_TEXTURE_BUFFER_FORMAT */

+      1527, /* GL_R11F_G11F_B10F */

+      2158, /* GL_UNSIGNED_INT_10F_11F_11F_REV */

+      1638, /* GL_RGB9_E5 */

+      2167, /* GL_UNSIGNED_INT_5_9_9_9_REV */

+      2088, /* GL_TEXTURE_SHARED_SIZE */

+      1804, /* GL_SRGB */

+      1805, /* GL_SRGB8 */

+      1807, /* GL_SRGB_ALPHA */

+      1806, /* GL_SRGB8_ALPHA8 */

+      1764, /* GL_SLUMINANCE_ALPHA */

+      1763, /* GL_SLUMINANCE8_ALPHA8 */

+      1761, /* GL_SLUMINANCE */

+      1762, /* GL_SLUMINANCE8 */

+       309, /* GL_COMPRESSED_SRGB */

+       310, /* GL_COMPRESSED_SRGB_ALPHA */

+       307, /* GL_COMPRESSED_SLUMINANCE */

+       308, /* GL_COMPRESSED_SLUMINANCE_ALPHA */

+      2123, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */

+      2112, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */

+      1120, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */

+      2121, /* GL_TRANSFORM_FEEDBACK_VARYINGS */

+      2117, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */

+      2115, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */

+      1437, /* GL_PRIMITIVES_GENERATED */

+      2119, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */

+      1531, /* GL_RASTERIZER_DISCARD */

+      1116, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */

+      1118, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */

+       762, /* GL_INTERLEAVED_ATTRIBS */

+      1740, /* GL_SEPARATE_ATTRIBS */

+      2107, /* GL_TRANSFORM_FEEDBACK_BUFFER */

+      2109, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */

+      1373, /* GL_POINT_SPRITE_COORD_ORIGIN */

+       853, /* GL_LOWER_LEFT */

+      2206, /* GL_UPPER_LEFT */

+      1828, /* GL_STENCIL_BACK_REF */

+      1829, /* GL_STENCIL_BACK_VALUE_MASK */

+      1830, /* GL_STENCIL_BACK_WRITEMASK */

+       500, /* GL_DRAW_FRAMEBUFFER_BINDING */

+      1561, /* GL_RENDERBUFFER_BINDING */

+      1535, /* GL_READ_FRAMEBUFFER */

+       499, /* GL_DRAW_FRAMEBUFFER */

+      1536, /* GL_READ_FRAMEBUFFER_BINDING */

+      1580, /* GL_RENDERBUFFER_SAMPLES */

+       612, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */

+       609, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */

+       624, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */

+       619, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */

+       622, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */

+       630, /* GL_FRAMEBUFFER_COMPLETE */

+       635, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */

+       650, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */

+       644, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */

+       639, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */

+       645, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */

+       641, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */

+       655, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */

+       661, /* GL_FRAMEBUFFER_UNSUPPORTED */

+       659, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */

+      1020, /* GL_MAX_COLOR_ATTACHMENTS */

+       193, /* GL_COLOR_ATTACHMENT0 */

+       196, /* GL_COLOR_ATTACHMENT1 */

+       210, /* GL_COLOR_ATTACHMENT2 */

+       212, /* GL_COLOR_ATTACHMENT3 */

+       214, /* GL_COLOR_ATTACHMENT4 */

+       216, /* GL_COLOR_ATTACHMENT5 */

+       218, /* GL_COLOR_ATTACHMENT6 */

+       220, /* GL_COLOR_ATTACHMENT7 */

+       222, /* GL_COLOR_ATTACHMENT8 */

+       224, /* GL_COLOR_ATTACHMENT9 */

+       197, /* GL_COLOR_ATTACHMENT10 */

+       199, /* GL_COLOR_ATTACHMENT11 */

+       201, /* GL_COLOR_ATTACHMENT12 */

+       203, /* GL_COLOR_ATTACHMENT13 */

+       205, /* GL_COLOR_ATTACHMENT14 */

+       207, /* GL_COLOR_ATTACHMENT15 */

+       399, /* GL_DEPTH_ATTACHMENT */

+      1817, /* GL_STENCIL_ATTACHMENT */

+       600, /* GL_FRAMEBUFFER */

+      1558, /* GL_RENDERBUFFER */

+      1584, /* GL_RENDERBUFFER_WIDTH */

+      1571, /* GL_RENDERBUFFER_HEIGHT */

+      1574, /* GL_RENDERBUFFER_INTERNAL_FORMAT */

+      1849, /* GL_STENCIL_INDEX_EXT */

+      1838, /* GL_STENCIL_INDEX1 */

+      1843, /* GL_STENCIL_INDEX4 */

+      1846, /* GL_STENCIL_INDEX8 */

+      1839, /* GL_STENCIL_INDEX16 */

+      1578, /* GL_RENDERBUFFER_RED_SIZE */

+      1569, /* GL_RENDERBUFFER_GREEN_SIZE */

+      1564, /* GL_RENDERBUFFER_BLUE_SIZE */

+      1559, /* GL_RENDERBUFFER_ALPHA_SIZE */

+      1566, /* GL_RENDERBUFFER_DEPTH_SIZE */

+      1582, /* GL_RENDERBUFFER_STENCIL_SIZE */

+       653, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */

+      1097, /* GL_MAX_SAMPLES */

+      2050, /* GL_TEXTURE_GEN_STR_OES */

+       699, /* GL_HALF_FLOAT_OES */

+      1625, /* GL_RGB565_OES */

+      1655, /* GL_RGBA32UI */

+      1618, /* GL_RGB32UI */

+        40, /* GL_ALPHA32UI_EXT */

+       754, /* GL_INTENSITY32UI_EXT */

+       870, /* GL_LUMINANCE32UI_EXT */

+       887, /* GL_LUMINANCE_ALPHA32UI_EXT */

+      1646, /* GL_RGBA16UI */

+      1610, /* GL_RGB16UI */

+        37, /* GL_ALPHA16UI_EXT */

+       751, /* GL_INTENSITY16UI_EXT */

+       865, /* GL_LUMINANCE16UI_EXT */

+       885, /* GL_LUMINANCE_ALPHA16UI_EXT */

+      1665, /* GL_RGBA8UI */

+      1633, /* GL_RGB8UI */

+        45, /* GL_ALPHA8UI_EXT */

+       759, /* GL_INTENSITY8UI_EXT */

+       879, /* GL_LUMINANCE8UI_EXT */

+       889, /* GL_LUMINANCE_ALPHA8UI_EXT */

+      1653, /* GL_RGBA32I */

+      1616, /* GL_RGB32I */

+        39, /* GL_ALPHA32I_EXT */

+       753, /* GL_INTENSITY32I_EXT */

+       869, /* GL_LUMINANCE32I_EXT */

+       886, /* GL_LUMINANCE_ALPHA32I_EXT */

+      1644, /* GL_RGBA16I */

+      1608, /* GL_RGB16I */

+        36, /* GL_ALPHA16I_EXT */

+       750, /* GL_INTENSITY16I_EXT */

+       864, /* GL_LUMINANCE16I_EXT */

+       884, /* GL_LUMINANCE_ALPHA16I_EXT */

+      1663, /* GL_RGBA8I */

+      1631, /* GL_RGB8I */

+        44, /* GL_ALPHA8I_EXT */

+       758, /* GL_INTENSITY8I_EXT */

+       878, /* GL_LUMINANCE8I_EXT */

+       888, /* GL_LUMINANCE_ALPHA8I_EXT */

+      1548, /* GL_RED_INTEGER */

+       695, /* GL_GREEN_INTEGER */

+       113, /* GL_BLUE_INTEGER */

+        49, /* GL_ALPHA_INTEGER_EXT */

+      1677, /* GL_RGB_INTEGER */

+      1671, /* GL_RGBA_INTEGER */

+        84, /* GL_BGR_INTEGER */

+        82, /* GL_BGRA_INTEGER */

+       891, /* GL_LUMINANCE_INTEGER_EXT */

+       890, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */

+      1673, /* GL_RGBA_INTEGER_MODE_EXT */

+       607, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */

+       648, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */

+       647, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */

+      1688, /* GL_SAMPLER_1D_ARRAY */

+      1694, /* GL_SAMPLER_2D_ARRAY */

+      1703, /* GL_SAMPLER_BUFFER */

+      1690, /* GL_SAMPLER_1D_ARRAY_SHADOW */

+      1696, /* GL_SAMPLER_2D_ARRAY_SHADOW */

+      1706, /* GL_SAMPLER_CUBE_SHADOW */

+      2186, /* GL_UNSIGNED_INT_VEC2 */

+      2188, /* GL_UNSIGNED_INT_VEC3 */

+      2190, /* GL_UNSIGNED_INT_VEC4 */

+       768, /* GL_INT_SAMPLER_1D */

+       772, /* GL_INT_SAMPLER_2D */

+       778, /* GL_INT_SAMPLER_3D */

+       782, /* GL_INT_SAMPLER_CUBE */

+       776, /* GL_INT_SAMPLER_2D_RECT */

+       769, /* GL_INT_SAMPLER_1D_ARRAY */

+       773, /* GL_INT_SAMPLER_2D_ARRAY */

+       780, /* GL_INT_SAMPLER_BUFFER */

+      2170, /* GL_UNSIGNED_INT_SAMPLER_1D */

+      2174, /* GL_UNSIGNED_INT_SAMPLER_2D */

+      2180, /* GL_UNSIGNED_INT_SAMPLER_3D */

+      2184, /* GL_UNSIGNED_INT_SAMPLER_CUBE */

+      2178, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */

+      2171, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */

+      2175, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */

+      2182, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */

+       686, /* GL_GEOMETRY_SHADER */

+       689, /* GL_GEOMETRY_VERTICES_OUT_ARB */

+       683, /* GL_GEOMETRY_INPUT_TYPE_ARB */

+       685, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */

+      1054, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */

+      1136, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */

+      1052, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */

+      1046, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */

+      1050, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */

+       854, /* GL_LOW_FLOAT */

+      1138, /* GL_MEDIUM_FLOAT */

+       700, /* GL_HIGH_FLOAT */

+       855, /* GL_LOW_INT */

+      1139, /* GL_MEDIUM_INT */

+       701, /* GL_HIGH_INT */

+      2160, /* GL_UNSIGNED_INT_10_10_10_2_OES */

+       767, /* GL_INT_10_10_10_2_OES */

+      1745, /* GL_SHADER_BINARY_FORMATS */

+      1239, /* GL_NUM_SHADER_BINARY_FORMATS */

+      1746, /* GL_SHADER_COMPILER */

+      1133, /* GL_MAX_VERTEX_UNIFORM_VECTORS */

+      1125, /* GL_MAX_VARYING_VECTORS */

+      1043, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */

+      1524, /* GL_QUERY_WAIT */

+      1518, /* GL_QUERY_NO_WAIT */

+      1514, /* GL_QUERY_BY_REGION_WAIT */

+      1512, /* GL_QUERY_BY_REGION_NO_WAIT */

+      2105, /* GL_TRANSFORM_FEEDBACK */

+      2114, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */

+      2108, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */

+      2106, /* GL_TRANSFORM_FEEDBACK_BINDING */

+      1508, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */

+       542, /* GL_FIRST_VERTEX_CONVENTION */

+       800, /* GL_LAST_VERTEX_CONVENTION */

+      1482, /* GL_PROVOKING_VERTEX */

+       350, /* GL_COPY_READ_BUFFER */

+       351, /* GL_COPY_WRITE_BUFFER */

+      1551, /* GL_RED_SNORM */

+      1684, /* GL_RG_SNORM */

+      1683, /* GL_RGB_SNORM */

+      1676, /* GL_RGBA_SNORM */

+      1530, /* GL_R8_SNORM */

+      1598, /* GL_RG8_SNORM */

+      1637, /* GL_RGB8_SNORM */

+      1669, /* GL_RGBA8_SNORM */

+      1528, /* GL_R16_SNORM */

+      1597, /* GL_RG16_SNORM */

+      1613, /* GL_RGB16_SNORM */

+      1649, /* GL_RGBA16_SNORM */

+      1757, /* GL_SIGNED_NORMALIZED */

+      1439, /* GL_PRIMITIVE_RESTART */

+      1440, /* GL_PRIMITIVE_RESTART_INDEX */

+      1099, /* GL_MAX_SERVER_WAIT_TIMEOUT */

+      1253, /* GL_OBJECT_TYPE */

+      1870, /* GL_SYNC_CONDITION */

+      1875, /* GL_SYNC_STATUS */

+      1872, /* GL_SYNC_FLAGS */

+      1871, /* GL_SYNC_FENCE */

+      1874, /* GL_SYNC_GPU_COMMANDS_COMPLETE */

+      2153, /* GL_UNSIGNALED */

+      1756, /* GL_SIGNALED */

+        54, /* GL_ALREADY_SIGNALED */

+      2100, /* GL_TIMEOUT_EXPIRED */

+       312, /* GL_CONDITION_SATISFIED */

+      2269, /* GL_WAIT_FAILED */

+       126, /* GL_BUFFER_ACCESS_FLAGS */

+       132, /* GL_BUFFER_MAP_LENGTH */

+       133, /* GL_BUFFER_MAP_OFFSET */

+      1128, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */

+      1044, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */

+      1045, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */

+      1040, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */

+       326, /* GL_CONTEXT_PROFILE_MASK */

+       527, /* GL_EVAL_BIT */

+      1533, /* GL_RASTER_POSITION_UNCLIPPED_IBM */

+       847, /* GL_LIST_BIT */

+      1976, /* GL_TEXTURE_BIT */

+      1726, /* GL_SCISSOR_BIT */

+        30, /* GL_ALL_ATTRIB_BITS */

+      1204, /* GL_MULTISAMPLE_BIT */

+        31, /* GL_ALL_CLIENT_ATTRIB_BITS */

+};

+

+typedef int (*cfunc)(const void *, const void *);

+

+/**

+ * Compare a key name to an element in the \c all_enums array.

+ *

+ * \c bsearch always passes the key as the first parameter and the pointer

+ * to the array element as the second parameter.  We can elimiate some

+ * extra work by taking advantage of that fact.

+ *

+ * \param a  Pointer to the desired enum name.

+ * \param b  Pointer to an element of the \c all_enums array.

+ */

+static int compar_name( const char *a, const enum_elt *b )

+{

+   return strcmp( a, & enum_string_table[ b->offset ] );

+}

+

+/**

+ * Compare a key enum value to an element in the \c all_enums array.

+ *

+ * \c bsearch always passes the key as the first parameter and the pointer

+ * to the array element as the second parameter.  We can elimiate some

+ * extra work by taking advantage of that fact.

+ *

+ * \param a  Pointer to the desired enum name.

+ * \param b  Pointer to an index into the \c all_enums array.

+ */

+static int compar_nr( const int *a, const unsigned *b )

+{

+   return a[0] - all_enums[*b].n;

+}

+

+

+static char token_tmp[20];

+

+const char *_mesa_lookup_enum_by_nr( int nr )

+{

+   unsigned * i;

+

+   i = (unsigned *) _mesa_bsearch(& nr, reduced_enums,

+                                  Elements(reduced_enums),

+                                  sizeof(reduced_enums[0]),

+                                  (cfunc) compar_nr);

+

+   if ( i != NULL ) {

+      return & enum_string_table[ all_enums[ *i ].offset ];

+   }

+   else {

+      /* this is not re-entrant safe, no big deal here */

+      _mesa_snprintf(token_tmp, sizeof(token_tmp) - 1, "0x%x", nr);

+      token_tmp[sizeof(token_tmp) - 1] = '\0';

+      return token_tmp;

+   }

+}

+

+/* Get the name of an enum given that it is a primitive type.  Avoids

+ * GL_FALSE/GL_POINTS ambiguity and others.

+ */

+const char *_mesa_lookup_prim_by_nr( int nr )

+{

+   switch (nr) {

+   case GL_POINTS: return "GL_POINTS";

+   case GL_LINES: return "GL_LINES";

+   case GL_LINE_STRIP: return "GL_LINE_STRIP";

+   case GL_LINE_LOOP: return "GL_LINE_LOOP";

+   case GL_TRIANGLES: return "GL_TRIANGLES";

+   case GL_TRIANGLE_STRIP: return "GL_TRIANGLE_STRIP";

+   case GL_TRIANGLE_FAN: return "GL_TRIANGLE_FAN";

+   case GL_QUADS: return "GL_QUADS";

+   case GL_QUAD_STRIP: return "GL_QUAD_STRIP";

+   case GL_POLYGON: return "GL_POLYGON";

+   case GL_POLYGON+1: return "OUTSIDE_BEGIN_END";

+   default: return "<invalid>";

+   }

+}

+

+

+

+int _mesa_lookup_enum_by_name( const char *symbol )

+{

+   enum_elt * f = NULL;

+

+   if ( symbol != NULL ) {

+      f = (enum_elt *) _mesa_bsearch(symbol, all_enums,

+                                     Elements(all_enums),

+                                     sizeof( enum_elt ),

+                                     (cfunc) compar_name);

+   }

+

+   return (f != NULL) ? f->n : -1;

+}

+

+

diff --git a/mesalib/src/mesa/main/enums.h b/mesalib/src/mesa/main/enums.h
index b5f69001b..b3ad3f92c 100644
--- a/mesalib/src/mesa/main/enums.h
+++ b/mesalib/src/mesa/main/enums.h
@@ -1,61 +1,62 @@
-/**
- * \file enums.h
- * Enumeration name/number lookup functions.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * 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.
- */
-
-
-#ifndef _ENUMS_H_
-#define _ENUMS_H_
-
-
-#if defined(_HAVE_FULL_GL) && _HAVE_FULL_GL
-
-extern const char *_mesa_lookup_enum_by_nr( int nr );
-
-/* Get the name of an enum given that it is a primitive type.  Avoids
- * GL_FALSE/GL_POINTS ambiguity and others.
- */
-const char *_mesa_lookup_prim_by_nr( int nr );
-
-extern int _mesa_lookup_enum_by_name( const char *symbol );
-
-#else
-
-/** No-op */
-#define _mesa_lookup_enum_by_name( s ) 0
-
-/** No-op */
-#define _mesa_lookup_enum_by_nr( n ) "unknown"
-
-#endif
-
-#endif
+/**

+ * \file enums.h

+ * Enumeration name/number lookup functions.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

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

+ */

+

+

+#ifndef _ENUMS_H_

+#define _ENUMS_H_

+

+#include "mfeatures.h"

+

+#if defined(_HAVE_FULL_GL) && _HAVE_FULL_GL

+

+extern const char *_mesa_lookup_enum_by_nr( int nr );

+

+/* Get the name of an enum given that it is a primitive type.  Avoids

+ * GL_FALSE/GL_POINTS ambiguity and others.

+ */

+const char *_mesa_lookup_prim_by_nr( int nr );

+

+extern int _mesa_lookup_enum_by_name( const char *symbol );

+

+#else

+

+/** No-op */

+#define _mesa_lookup_enum_by_name( s ) 0

+

+/** No-op */

+#define _mesa_lookup_enum_by_nr( n ) "unknown"

+

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/es_generator.py b/mesalib/src/mesa/main/es_generator.py
index ecb34bb5c..36bd14d6c 100644
--- a/mesalib/src/mesa/main/es_generator.py
+++ b/mesalib/src/mesa/main/es_generator.py
@@ -1,743 +1,760 @@
-#*************************************************************************
-# 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, 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
-# TUNGSTEN GRAPHICS 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 sys, os
-import APIspecutil as apiutil
-
-# These dictionary entries are used for automatic conversion.
-# The string will be used as a format string with the conversion
-# variable.
-Converters = {
-    'GLfloat': {
-        'GLdouble': "(GLdouble) (%s)",
-        'GLfixed' : "(GLint) (%s * 65536)",
-    },
-    'GLfixed': {
-        'GLfloat': "(GLfloat) (%s / 65536.0f)",
-        'GLdouble': "(GLdouble) (%s / 65536.0)",
-    },
-    'GLdouble': {
-        'GLfloat': "(GLfloat) (%s)",
-        'GLfixed': "(GLfixed) (%s * 65536)",
-    },
-    'GLclampf': {
-        'GLclampd': "(GLclampd) (%s)",
-        'GLclampx': "(GLclampx) (%s * 65536)",
-    },
-    'GLclampx': {
-        'GLclampf': "(GLclampf) (%s / 65536.0f)",
-        'GLclampd': "(GLclampd) (%s / 65536.0)",
-    },
-    'GLubyte': {
-        'GLfloat': "(GLfloat) (%s / 255.0f)",
-    },
-}
-
-def GetBaseType(type):
-    typeTokens = type.split(' ')
-    baseType = None
-    typeModifiers = []
-    for t in typeTokens:
-        if t in ['const', '*']:
-            typeModifiers.append(t)
-        else:
-            baseType = t
-    return (baseType, typeModifiers)
-
-def ConvertValue(value, fromType, toType):
-    """Returns a string that represents the given parameter string, 
-    type-converted if necessary."""
-
-    if not Converters.has_key(fromType):
-        print >> sys.stderr, "No base converter for type '%s' found.  Ignoring." % fromType
-        return value
-
-    if not Converters[fromType].has_key(toType):
-        print >> sys.stderr, "No converter found for type '%s' to type '%s'.  Ignoring." % (fromType, toType)
-        return value
-
-    # This part is simple.  Return the proper conversion.
-    conversionString = Converters[fromType][toType]
-    return conversionString % value
-
-FormatStrings = {
-    'GLenum' : '0x%x',
-    'GLfloat' : '%f',
-    'GLint' : '%d',
-    'GLbitfield' : '0x%x',
-}
-def GetFormatString(type):
-    if FormatStrings.has_key(type):
-        return FormatStrings[type]
-    else:
-        return None
-
-
-######################################################################
-# Version-specific values to be used in the main script
-# header: which header file to include
-# api: what text specifies an API-level function
-VersionSpecificValues = {
-    'GLES1.1' : {
-        'description' : 'GLES1.1 functions',
-        'header' : 'GLES/gl.h',
-        'extheader' : 'GLES/glext.h',
-        'shortname' : 'es1'
-    },
-    'GLES2.0': {
-        'description' : 'GLES2.0 functions',
-        'header' : 'GLES2/gl2.h',
-        'extheader' : 'GLES2/gl2ext.h',
-        'shortname' : 'es2'
-    }
-}
-
-
-######################################################################
-# Main code for the script begins here.
-
-# Get the name of the program (without the directory part) for use in
-# error messages.
-program = os.path.basename(sys.argv[0])
-
-# Set default values
-verbose = 0
-functionList = "APIspec.xml"
-version = "GLES1.1"
-
-# Allow for command-line switches
-import getopt, time
-options = "hvV:S:"
-try:
-    optlist, args = getopt.getopt(sys.argv[1:], options)
-except getopt.GetoptError, message:
-    sys.stderr.write("%s: %s.  Use -h for help.\n" % (program, message))
-    sys.exit(1)
-
-for option, optarg in optlist:
-    if option == "-h":
-        sys.stderr.write("Usage: %s [-%s]\n" % (program, options))
-        sys.stderr.write("Parse an API specification file and generate wrapper functions for a given GLES version\n")
-        sys.stderr.write("-h gives help\n")
-        sys.stderr.write("-v is verbose\n")
-        sys.stderr.write("-V specifies GLES version to generate [%s]:\n" % version)
-        for key in VersionSpecificValues.keys():
-            sys.stderr.write("    %s - %s\n" % (key, VersionSpecificValues[key]['description']))
-        sys.stderr.write("-S specifies API specification file to use [%s]\n" % functionList)
-        sys.exit(1)
-    elif option == "-v":
-        verbose += 1
-    elif option == "-V":
-        version = optarg
-    elif option == "-S":
-        functionList = optarg
-
-# Beyond switches, we support no further command-line arguments
-if len(args) >  0:
-    sys.stderr.write("%s: only switch arguments are supported - use -h for help\n" % program)
-    sys.exit(1)
-
-# If we don't have a valid version, abort.
-if not VersionSpecificValues.has_key(version):
-    sys.stderr.write("%s: version '%s' is not valid - use -h for help\n" % (program, version))
-    sys.exit(1)
-
-# Grab the version-specific items we need to use
-versionHeader = VersionSpecificValues[version]['header']
-versionExtHeader = VersionSpecificValues[version]['extheader']
-shortname = VersionSpecificValues[version]['shortname']
-
-# If we get to here, we're good to go.  The "version" parameter
-# directs GetDispatchedFunctions to only allow functions from
-# that "category" (version in our parlance).  This allows 
-# functions with different declarations in different categories
-# to exist (glTexImage2D, for example, is different between
-# GLES1 and GLES2).
-keys = apiutil.GetAllFunctions(functionList, version)
-
-allSpecials = apiutil.AllSpecials()
-
-print """/* DO NOT EDIT *************************************************
- * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT
- * API specification file:   %s
- * GLES version:             %s
- * date:                     %s
- */
-""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S"))
-
-# The headers we choose are version-specific.
-print """
-#include "%s"
-#include "%s"
-#include "main/mfeatures.h"
-
-#if FEATURE_%s
-""" % (versionHeader, versionExtHeader, shortname.upper())
-
-# Everyone needs these types.
-print """
-/* These types are needed for the Mesa veneer, but are not defined in
- * the standard GLES headers.
- */
-typedef double GLdouble;
-typedef double GLclampd;
-
-/* Mesa error handling requires these */
-extern void *_mesa_get_current_context(void);
-extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
-
-#include "main/compiler.h"
-#include "main/api_exec.h"
-#include "main/remap.h"
-
-/* cannot include main/dispatch.h here */
-#ifdef IN_DRI_DRIVER
-#define _GLAPI_USE_REMAP_TABLE
-#endif
-/* glapi uses GLAPIENTRY while GLES headers define GL_APIENTRY */
-#ifndef GLAPIENTRY
-#define GLAPIENTRY GL_APIENTRY
-#endif
-#include "%sapi/glapi/glapitable.h"
-#include "%sapi/glapi/glapioffsets.h"
-#include "%sapi/glapi/glapidispatch.h"
-
-#if FEATURE_remap_table
-
-#if !FEATURE_GL
-int driDispatchRemapTable[driDispatchRemapTable_size];
-#endif
-
-#define need_MESA_remap_table
-
-#include "%sapi/main/remap_helper.h"
-
-void
-_mesa_init_remap_table_%s(void)
-{
-   _mesa_do_init_remap_table(_mesa_function_pool,
-                             driDispatchRemapTable_size,
-                             MESA_remap_table_functions);
-}
-
-void
-_mesa_map_static_functions_%s(void)
-{
-}
-
-#endif
-
-typedef void (*_glapi_proc)(void); /* generic function pointer */
-""" % (shortname, shortname, shortname, shortname, shortname, shortname);
-
-# Finally we get to the all-important functions
-print """/*************************************************************
- * Generated functions begin here
- */
-"""
-for funcName in keys:
-    if verbose > 0: sys.stderr.write("%s: processing function %s\n" % (program, funcName))
-
-    # start figuring out what this function will look like.
-    returnType = apiutil.ReturnType(funcName)
-    props = apiutil.Properties(funcName)
-    params = apiutil.Parameters(funcName)
-    declarationString = apiutil.MakeDeclarationString(params)
-
-    # In case of error, a function may have to return.  Make
-    # sure we have valid return values in this case.
-    if returnType == "void":
-        errorReturn = "return"
-    elif returnType == "GLboolean":
-        errorReturn = "return GL_FALSE"
-    else:
-        errorReturn = "return (%s) 0" % returnType
-
-    # These are the output of this large calculation block.
-    # passthroughDeclarationString: a typed set of parameters that
-    # will be used to create the "extern" reference for the
-    # underlying Mesa or support function.  Note that as generated
-    # these have an extra ", " at the beginning, which will be
-    # removed before use.
-    # 
-    # passthroughDeclarationString: an untyped list of parameters
-    # that will be used to call the underlying Mesa or support
-    # function (including references to converted parameters).
-    # This will also be generated with an extra ", " at the
-    # beginning, which will be removed before use.
-    #
-    # variables: C code to create any local variables determined to
-    # be necessary.
-    # conversionCodeOutgoing: C code to convert application parameters
-    # to a necessary type before calling the underlying support code.
-    # May be empty if no conversion is required.  
-    # conversionCodeIncoming: C code to do the converse: convert 
-    # values returned by underlying Mesa code to the types needed
-    # by the application.
-    # Note that *either* the conversionCodeIncoming will be used (for
-    # generated query functions), *or* the conversionCodeOutgoing will
-    # be used (for generated non-query functions), never both.
-    passthroughFuncName = ""
-    passthroughDeclarationString = ""
-    passthroughCallString = ""
-    prefixOverride = None
-    variables = []
-    conversionCodeOutgoing = []
-    conversionCodeIncoming = []
-    switchCode = []
-
-    # Calculate the name of the underlying support function to call.
-    # By default, the passthrough function is named _mesa_<funcName>.
-    # We're allowed to override the prefix and/or the function name
-    # for each function record, though.  The "ConversionFunction"
-    # utility is poorly named, BTW...
-    if funcName in allSpecials:
-        # perform checks and pass through
-        funcPrefix = "_check_"
-        aliasprefix = "_es_"
-    else:
-        funcPrefix = "_es_"
-        aliasprefix = apiutil.AliasPrefix(funcName)
-    alias = apiutil.ConversionFunction(funcName)
-    prefixOverride = apiutil.FunctionPrefix(funcName)
-    if prefixOverride != "_mesa_":
-        aliasprefix = apiutil.FunctionPrefix(funcName)
-    if not alias:
-        # There may still be a Mesa alias for the function
-        if apiutil.Alias(funcName):
-            passthroughFuncName = "%s%s" % (aliasprefix, apiutil.Alias(funcName))
-        else:
-            passthroughFuncName = "%s%s" % (aliasprefix, funcName)
-    else: # a specific alias is provided
-        passthroughFuncName = "%s%s" % (aliasprefix, alias)
-
-    # Look at every parameter: each one may have only specific
-    # allowed values, or dependent parameters to check, or 
-    # variant-sized vector arrays to calculate
-    for (paramName, paramType, paramMaxVecSize, paramConvertToType, paramValidValues, paramValueConversion) in params:
-        # We'll need this below if we're doing conversions
-        (paramBaseType, paramTypeModifiers) = GetBaseType(paramType)
-
-        # Conversion management.
-        # We'll handle three cases, easiest to hardest: a parameter
-        # that doesn't require conversion, a scalar parameter that
-        # requires conversion, and a vector parameter that requires
-        # conversion.
-        if paramConvertToType == None:
-            # Unconverted parameters are easy, whether they're vector
-            # or scalar - just add them to the call list.  No conversions
-            # or anything to worry about.
-            passthroughDeclarationString += ", %s %s" % (paramType, paramName)
-            passthroughCallString += ", %s" % paramName
-
-        elif paramMaxVecSize == 0: # a scalar parameter that needs conversion
-            # A scalar to hold a converted parameter
-            variables.append("    %s converted_%s;" % (paramConvertToType, paramName))
-
-            # Outgoing conversion depends on whether we have to conditionally
-            # perform value conversion.
-            if paramValueConversion == "none":
-                conversionCodeOutgoing.append("    converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))
-            elif paramValueConversion == "some":
-                # We'll need a conditional variable to keep track of
-                # whether we're converting values or not.
-                if ("    int convert_%s_value = 1;" % paramName) not in variables:
-                    variables.append("    int convert_%s_value = 1;" % paramName)
-
-                # Write code based on that conditional.
-                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)
-                conversionCodeOutgoing.append("        converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType))) 
-                conversionCodeOutgoing.append("    } else {")
-                conversionCodeOutgoing.append("        converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))
-                conversionCodeOutgoing.append("    }")
-            else: # paramValueConversion == "all"
-                conversionCodeOutgoing.append("    converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType)))
-
-            # Note that there can be no incoming conversion for a
-            # scalar parameter; changing the scalar will only change
-            # the local value, and won't ultimately change anything
-            # that passes back to the application.
-
-            # Call strings.  The unusual " ".join() call will join the
-            # array of parameter modifiers with spaces as separators.
-            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)
-            passthroughCallString += ", converted_%s" % paramName
-
-        else: # a vector parameter that needs conversion
-            # We'll need an index variable for conversions
-            if "    register unsigned int i;" not in variables:
-                variables.append("    register unsigned int i;")
-
-            # This variable will hold the (possibly variant) size of
-            # this array needing conversion.  By default, we'll set
-            # it to the maximal size (which is correct for functions
-            # with a constant-sized vector parameter); for true
-            # variant arrays, we'll modify it with other code.
-            variables.append("    unsigned int n_%s = %d;" % (paramName, paramMaxVecSize))
-
-            # This array will hold the actual converted values.
-            variables.append("    %s converted_%s[%d];" % (paramConvertToType, paramName, paramMaxVecSize))
-
-            # Again, we choose the conversion code based on whether we
-            # have to always convert values, never convert values, or 
-            # conditionally convert values.
-            if paramValueConversion == "none":
-                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("        converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))
-                conversionCodeOutgoing.append("    }")
-            elif paramValueConversion == "some":
-                # We'll need a conditional variable to keep track of
-                # whether we're converting values or not.
-                if ("    int convert_%s_value = 1;" % paramName) not in variables:
-                    variables.append("    int convert_%s_value = 1;" % paramName)
-                # Write code based on that conditional.
-                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)
-                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("            converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType))) 
-                conversionCodeOutgoing.append("        }")
-                conversionCodeOutgoing.append("    } else {")
-                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("            converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))
-                conversionCodeOutgoing.append("        }")
-                conversionCodeOutgoing.append("    }")
-            else: # paramValueConversion == "all"
-                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("        converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType)))
-
-                conversionCodeOutgoing.append("    }")
-
-            # If instead we need an incoming conversion (i.e. results
-            # from Mesa have to be converted before handing back
-            # to the application), this is it.  Fortunately, we don't
-            # have to worry about conditional value conversion - the
-            # functions that do (e.g. glGetFixedv()) are handled
-            # specially, outside this code generation.
-            #
-            # Whether we use incoming conversion or outgoing conversion
-            # is determined later - we only ever use one or the other.
-
-            if paramValueConversion == "none":
-                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("        %s[i] = (%s) converted_%s[i];" % (paramName, paramConvertToType, paramName))
-                conversionCodeIncoming.append("    }")
-            elif paramValueConversion == "some":
-                # We'll need a conditional variable to keep track of
-                # whether we're converting values or not.
-                if ("    int convert_%s_value = 1;" % paramName) not in variables:
-                    variables.append("    int convert_%s_value = 1;" % paramName)
-
-                # Write code based on that conditional.
-                conversionCodeIncoming.append("    if (convert_%s_value) {" % paramName)
-                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("            %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType))) 
-                conversionCodeIncoming.append("        }")
-                conversionCodeIncoming.append("    } else {")
-                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("            %s[i] = (%s) converted_%s[i];" % (paramName, paramBaseType, paramName))
-                conversionCodeIncoming.append("        }")
-                conversionCodeIncoming.append("    }")
-            else: # paramValueConversion == "all"
-                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("        %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType)))
-                conversionCodeIncoming.append("    }")
-
-            # Call strings.  The unusual " ".join() call will join the
-            # array of parameter modifiers with spaces as separators.
-            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)
-            passthroughCallString += ", converted_%s" % paramName
-
-        # endif conversion management
-
-        # Parameter checking.  If the parameter has a specific list of
-        # valid values, we have to make sure that the passed-in values
-        # match these, or we make an error.
-        if len(paramValidValues) > 0:
-            # We're about to make a big switch statement with an
-            # error at the end.  By default, the error is GL_INVALID_ENUM,
-            # unless we find a "case" statement in the middle with a
-            # non-GLenum value.
-            errorDefaultCase = "GL_INVALID_ENUM"
-
-            # This parameter has specific valid values.  Make a big
-            # switch statement to handle it.  Note that the original
-            # parameters are always what is checked, not the
-            # converted parameters.
-            switchCode.append("    switch(%s) {" % paramName)
-
-            for valueIndex in range(len(paramValidValues)):
-                (paramValue, dependentVecSize, dependentParamName, dependentValidValues, errorCode, valueConvert) = paramValidValues[valueIndex]
-
-                # We're going to need information on the dependent param
-                # as well.
-                if dependentParamName:
-                    depParamIndex = apiutil.FindParamIndex(params, dependentParamName)
-                    if depParamIndex == None:
-                        sys.stderr.write("%s: can't find dependent param '%s' for function '%s'\n" % (program, dependentParamName, funcName))
-
-                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = params[depParamIndex]
-                else:
-                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = (None, None, None, None, [], None)
-
-                # This is a sneaky trick.  It's valid syntax for a parameter
-                # that is *not* going to be converted to be declared
-                # with a dependent vector size; but in this case, the
-                # dependent vector size is unused and unnecessary.
-                # So check for this and ignore the dependent vector size
-                # if the parameter is not going to be converted.
-                if depParamConvertToType:
-                    usedDependentVecSize = dependentVecSize
-                else:
-                    usedDependentVecSize = None
-
-                # We'll peek ahead at the next parameter, to see whether
-                # we can combine cases
-                if valueIndex + 1 < len(paramValidValues) :
-                    (nextParamValue, nextDependentVecSize, nextDependentParamName, nextDependentValidValues, nextErrorCode, nextValueConvert) = paramValidValues[valueIndex + 1]
-                    if depParamConvertToType:
-                        usedNextDependentVecSize = nextDependentVecSize
-                    else:
-                        usedNextDependentVecSize = None
-
-                # Create a case for this value.  As a mnemonic,
-                # if we have a dependent vector size that we're ignoring,
-                # add it as a comment.
-                if usedDependentVecSize == None and dependentVecSize != None:
-                    switchCode.append("        case %s: /* size %s */" % (paramValue, dependentVecSize))
-                else:
-                    switchCode.append("        case %s:" % paramValue)
-
-                # If this is not a GLenum case, then switch our error
-                # if no value is matched to be GL_INVALID_VALUE instead
-                # of GL_INVALID_ENUM.  (Yes, this does get confused
-                # if there are both values and GLenums in the same
-                # switch statement, which shouldn't happen.)
-                if paramValue[0:3] != "GL_":
-                    errorDefaultCase = "GL_INVALID_VALUE"
-
-                # If all the remaining parameters are identical to the
-                # next set, then we're done - we'll just create the
-                # official code on the next pass through, and the two
-                # cases will share the code.
-                if valueIndex + 1 < len(paramValidValues) and usedDependentVecSize == usedNextDependentVecSize and dependentParamName == nextDependentParamName and dependentValidValues == nextDependentValidValues and errorCode == nextErrorCode and valueConvert == nextValueConvert:
-                    continue
-
-                # Otherwise, we'll have to generate code for this case.
-                # Start off with a check: if there is a dependent parameter,
-                # and a list of valid values for that parameter, we need
-                # to generate an error if something other than one
-                # of those values is passed.
-                if len(dependentValidValues) > 0:
-                    conditional=""
-
-                    # If the parameter being checked is actually an array,
-                    # check only its first element.
-                    if depParamMaxVecSize == 0:
-                        valueToCheck = dependentParamName
-                    else:
-                        valueToCheck = "%s[0]" % dependentParamName
-
-                    for v in dependentValidValues:
-                        conditional += " && %s != %s" % (valueToCheck, v)
-                    switchCode.append("            if (%s) {" % conditional[4:])
-                    if errorCode == None:
-                        errorCode = "GL_INVALID_ENUM"
-                    switchCode.append('                _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=0x%s)", %s);' % (errorCode, funcName, paramName, "%x", paramName))
-                    switchCode.append("                %s;" % errorReturn)
-                    switchCode.append("            }")
-                # endif there are dependent valid values
-
-                # The dependent parameter may require conditional
-                # value conversion.  If it does, and we don't want
-                # to convert values, we'll have to generate code for that
-                if depParamValueConversion == "some" and valueConvert == "noconvert":
-                    switchCode.append("            convert_%s_value = 0;" % dependentParamName)
-
-                # If there's a dependent vector size for this parameter
-                # that we're actually going to use (i.e. we need conversion),
-                # mark it.
-                if usedDependentVecSize:
-                    switchCode.append("            n_%s = %s;" % (dependentParamName, dependentVecSize))
-
-                # In all cases, break out of the switch if any valid
-                # value is found.
-                switchCode.append("            break;")
-
-
-            # Need a default case to catch all the other, invalid
-            # parameter values.  These will all generate errors.
-            switchCode.append("        default:")
-            if errorCode == None:
-                errorCode = "GL_INVALID_ENUM"
-            formatString = GetFormatString(paramType)
-            if formatString == None:
-                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s)");' % (errorCode, funcName, paramName))
-            else:
-                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=%s)", %s);' % (errorCode, funcName, paramName, formatString, paramName))
-            switchCode.append("            %s;" % errorReturn)
-
-            # End of our switch code.
-            switchCode.append("    }")
-
-        # endfor every recognized parameter value
-
-    # endfor every param
-
-    # Here, the passthroughDeclarationString and passthroughCallString
-    # are complete; remove the extra ", " at the front of each.
-    passthroughDeclarationString = passthroughDeclarationString[2:]
-    passthroughCallString = passthroughCallString[2:]
-    if not passthroughDeclarationString:
-        passthroughDeclarationString = "void"
-
-    # The Mesa functions are scattered across all the Mesa
-    # header files.  The easiest way to manage declarations
-    # is to create them ourselves.
-    if funcName in allSpecials:
-        print "/* this function is special and is defined elsewhere */"
-    print "extern %s GL_APIENTRY %s(%s);" % (returnType, passthroughFuncName, passthroughDeclarationString)
-
-    # A function may be a core function (i.e. it exists in
-    # the core specification), a core addition (extension
-    # functions added officially to the core), a required
-    # extension (usually an extension for an earlier version
-    # that has been officially adopted), or an optional extension.
-    #
-    # Core functions have a simple category (e.g. "GLES1.1");
-    # we generate only a simple callback for them.
-    #
-    # Core additions have two category listings, one simple
-    # and one compound (e.g.  ["GLES1.1", "GLES1.1:OES_fixed_point"]).  
-    # We generate the core function, and also an extension function.
-    #
-    # Required extensions and implemented optional extensions
-    # have a single compound category "GLES1.1:OES_point_size_array".
-    # For these we generate just the extension function.
-    for categorySpec in apiutil.Categories(funcName):
-        compoundCategory = categorySpec.split(":")
-
-        # This category isn't for us, if the base category doesn't match
-        # our version
-        if compoundCategory[0] != version:
-            continue
-
-        # Otherwise, determine if we're writing code for a core
-        # function (no suffix) or an extension function.
-        if len(compoundCategory) == 1:
-            # This is a core function
-            extensionName = None
-            extensionSuffix = ""
-        else:
-            # This is an extension function.  We'll need to append
-            # the extension suffix.
-            extensionName = compoundCategory[1]
-            extensionSuffix = extensionName.split("_")[0]
-        fullFuncName = funcPrefix + funcName + extensionSuffix
-
-        # Now the generated function.  The text used to mark an API-level
-        # function, oddly, is version-specific.
-        if extensionName:
-            print "/* Extension %s */" % extensionName
-
-        if (not variables and
-            not switchCode and
-            not conversionCodeOutgoing and
-            not conversionCodeIncoming):
-            # pass through directly
-            print "#define %s %s" % (fullFuncName, passthroughFuncName)
-            print
-            continue
-
-        print "static %s GL_APIENTRY %s(%s)" % (returnType, fullFuncName, declarationString)
-        print "{"
-
-        # Start printing our code pieces.  Start with any local
-        # variables we need.  This unusual syntax joins the 
-        # lines in the variables[] array with the "\n" separator.
-        if len(variables) > 0:
-            print "\n".join(variables) + "\n"
-
-        # If there's any sort of parameter checking or variable
-        # array sizing, the switch code will contain it.
-        if len(switchCode) > 0:
-            print "\n".join(switchCode) + "\n"
-
-        # In the case of an outgoing conversion (i.e. parameters must
-        # be converted before calling the underlying Mesa function),
-        # use the appropriate code.
-        if "get" not in props and len(conversionCodeOutgoing) > 0:
-            print "\n".join(conversionCodeOutgoing) + "\n"
-
-        # Call the Mesa function.  Note that there are very few functions
-        # that return a value (i.e. returnType is not "void"), and that
-        # none of them require incoming translation; so we're safe
-        # to generate code that directly returns in those cases,
-        # even though it's not completely independent.
-
-        if returnType == "void":
-            print "    %s(%s);" % (passthroughFuncName, passthroughCallString)
-        else:
-            print "    return %s(%s);" % (passthroughFuncName, passthroughCallString)
-
-        # If the function is one that returns values (i.e. "get" in props),
-        # it might return values of a different type than we need, that
-        # require conversion before passing back to the application.
-        if "get" in props and len(conversionCodeIncoming) > 0:
-            print "\n".join(conversionCodeIncoming)
-
-        # All done.
-        print "}"
-        print
-    # end for each category provided for a function
-
-# end for each function
-
-print """
-struct _glapi_table *
-_mesa_create_exec_table_%s(void)
-{
-   struct _glapi_table *exec;
-   exec = _mesa_alloc_dispatch_table(sizeof *exec);
-   if (exec == NULL)
-      return NULL;
-
-""" % shortname
-
-for func in keys:
-    prefix = "_es_" if func not in allSpecials else "_check_"
-    for spec in apiutil.Categories(func):
-        ext = spec.split(":")
-        # version does not match
-        if ext.pop(0) != version:
-            continue
-        entry = func
-        if ext:
-            suffix = ext[0].split("_")[0]
-            entry += suffix
-        print "    SET_%s(exec, %s%s);" % (entry, prefix, entry)
-print ""
-print "   return exec;"
-print "}"
-
-print """
-#endif /* FEATURE_%s */""" % (shortname.upper())
+#*************************************************************************

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

+# TUNGSTEN GRAPHICS 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 sys, os

+import APIspecutil as apiutil

+

+# These dictionary entries are used for automatic conversion.

+# The string will be used as a format string with the conversion

+# variable.

+Converters = {

+    'GLfloat': {

+        'GLdouble': "(GLdouble) (%s)",

+        'GLfixed' : "(GLint) (%s * 65536)",

+    },

+    'GLfixed': {

+        'GLfloat': "(GLfloat) (%s / 65536.0f)",

+        'GLdouble': "(GLdouble) (%s / 65536.0)",

+    },

+    'GLdouble': {

+        'GLfloat': "(GLfloat) (%s)",

+        'GLfixed': "(GLfixed) (%s * 65536)",

+    },

+    'GLclampf': {

+        'GLclampd': "(GLclampd) (%s)",

+        'GLclampx': "(GLclampx) (%s * 65536)",

+    },

+    'GLclampx': {

+        'GLclampf': "(GLclampf) (%s / 65536.0f)",

+        'GLclampd': "(GLclampd) (%s / 65536.0)",

+    },

+    'GLubyte': {

+        'GLfloat': "(GLfloat) (%s / 255.0f)",

+    },

+}

+

+def GetBaseType(type):

+    typeTokens = type.split(' ')

+    baseType = None

+    typeModifiers = []

+    for t in typeTokens:

+        if t in ['const', '*']:

+            typeModifiers.append(t)

+        else:

+            baseType = t

+    return (baseType, typeModifiers)

+

+def ConvertValue(value, fromType, toType):

+    """Returns a string that represents the given parameter string, 

+    type-converted if necessary."""

+

+    if not Converters.has_key(fromType):

+        print >> sys.stderr, "No base converter for type '%s' found.  Ignoring." % fromType

+        return value

+

+    if not Converters[fromType].has_key(toType):

+        print >> sys.stderr, "No converter found for type '%s' to type '%s'.  Ignoring." % (fromType, toType)

+        return value

+

+    # This part is simple.  Return the proper conversion.

+    conversionString = Converters[fromType][toType]

+    return conversionString % value

+

+FormatStrings = {

+    'GLenum' : '0x%x',

+    'GLfloat' : '%f',

+    'GLint' : '%d',

+    'GLbitfield' : '0x%x',

+}

+def GetFormatString(type):

+    if FormatStrings.has_key(type):

+        return FormatStrings[type]

+    else:

+        return None

+

+

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

+# Version-specific values to be used in the main script

+# header: which header file to include

+# api: what text specifies an API-level function

+VersionSpecificValues = {

+    'GLES1.1' : {

+        'description' : 'GLES1.1 functions',

+        'header' : 'GLES/gl.h',

+        'extheader' : 'GLES/glext.h',

+        'shortname' : 'es1'

+    },

+    'GLES2.0': {

+        'description' : 'GLES2.0 functions',

+        'header' : 'GLES2/gl2.h',

+        'extheader' : 'GLES2/gl2ext.h',

+        'shortname' : 'es2'

+    }

+}

+

+

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

+# Main code for the script begins here.

+

+# Get the name of the program (without the directory part) for use in

+# error messages.

+program = os.path.basename(sys.argv[0])

+

+# Set default values

+verbose = 0

+functionList = "APIspec.xml"

+version = "GLES1.1"

+

+# Allow for command-line switches

+import getopt, time

+options = "hvV:S:"

+try:

+    optlist, args = getopt.getopt(sys.argv[1:], options)

+except getopt.GetoptError, message:

+    sys.stderr.write("%s: %s.  Use -h for help.\n" % (program, message))

+    sys.exit(1)

+

+for option, optarg in optlist:

+    if option == "-h":

+        sys.stderr.write("Usage: %s [-%s]\n" % (program, options))

+        sys.stderr.write("Parse an API specification file and generate wrapper functions for a given GLES version\n")

+        sys.stderr.write("-h gives help\n")

+        sys.stderr.write("-v is verbose\n")

+        sys.stderr.write("-V specifies GLES version to generate [%s]:\n" % version)

+        for key in VersionSpecificValues.keys():

+            sys.stderr.write("    %s - %s\n" % (key, VersionSpecificValues[key]['description']))

+        sys.stderr.write("-S specifies API specification file to use [%s]\n" % functionList)

+        sys.exit(1)

+    elif option == "-v":

+        verbose += 1

+    elif option == "-V":

+        version = optarg

+    elif option == "-S":

+        functionList = optarg

+

+# Beyond switches, we support no further command-line arguments

+if len(args) >  0:

+    sys.stderr.write("%s: only switch arguments are supported - use -h for help\n" % program)

+    sys.exit(1)

+

+# If we don't have a valid version, abort.

+if not VersionSpecificValues.has_key(version):

+    sys.stderr.write("%s: version '%s' is not valid - use -h for help\n" % (program, version))

+    sys.exit(1)

+

+# Grab the version-specific items we need to use

+versionHeader = VersionSpecificValues[version]['header']

+versionExtHeader = VersionSpecificValues[version]['extheader']

+shortname = VersionSpecificValues[version]['shortname']

+

+# If we get to here, we're good to go.  The "version" parameter

+# directs GetDispatchedFunctions to only allow functions from

+# that "category" (version in our parlance).  This allows 

+# functions with different declarations in different categories

+# to exist (glTexImage2D, for example, is different between

+# GLES1 and GLES2).

+keys = apiutil.GetAllFunctions(functionList, version)

+

+allSpecials = apiutil.AllSpecials()

+

+print """/* DO NOT EDIT *************************************************

+ * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT

+ * API specification file:   %s

+ * GLES version:             %s

+ * date:                     %s

+ */

+""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S"))

+

+# The headers we choose are version-specific.

+print """

+#include "%s"

+#include "%s"

+#include "main/mfeatures.h"

+#include "main/compiler.h"

+#include "main/api_exec.h"

+

+#if FEATURE_%s

+""" % (versionHeader, versionExtHeader, shortname.upper())

+

+# Everyone needs these types.

+print """

+/* These types are needed for the Mesa veneer, but are not defined in

+ * the standard GLES headers.

+ */

+typedef double GLdouble;

+typedef double GLclampd;

+

+/* Mesa error handling requires these */

+extern void *_mesa_get_current_context(void);

+extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );

+"""

+

+# Finally we get to the all-important functions

+print """/*************************************************************

+ * Generated functions begin here

+ */

+"""

+for funcName in keys:

+    if verbose > 0: sys.stderr.write("%s: processing function %s\n" % (program, funcName))

+

+    # start figuring out what this function will look like.

+    returnType = apiutil.ReturnType(funcName)

+    props = apiutil.Properties(funcName)

+    params = apiutil.Parameters(funcName)

+    declarationString = apiutil.MakeDeclarationString(params)

+

+    # In case of error, a function may have to return.  Make

+    # sure we have valid return values in this case.

+    if returnType == "void":

+        errorReturn = "return"

+    elif returnType == "GLboolean":

+        errorReturn = "return GL_FALSE"

+    else:

+        errorReturn = "return (%s) 0" % returnType

+

+    # These are the output of this large calculation block.

+    # passthroughDeclarationString: a typed set of parameters that

+    # will be used to create the "extern" reference for the

+    # underlying Mesa or support function.  Note that as generated

+    # these have an extra ", " at the beginning, which will be

+    # removed before use.

+    # 

+    # passthroughDeclarationString: an untyped list of parameters

+    # that will be used to call the underlying Mesa or support

+    # function (including references to converted parameters).

+    # This will also be generated with an extra ", " at the

+    # beginning, which will be removed before use.

+    #

+    # variables: C code to create any local variables determined to

+    # be necessary.

+    # conversionCodeOutgoing: C code to convert application parameters

+    # to a necessary type before calling the underlying support code.

+    # May be empty if no conversion is required.  

+    # conversionCodeIncoming: C code to do the converse: convert 

+    # values returned by underlying Mesa code to the types needed

+    # by the application.

+    # Note that *either* the conversionCodeIncoming will be used (for

+    # generated query functions), *or* the conversionCodeOutgoing will

+    # be used (for generated non-query functions), never both.

+    passthroughFuncName = ""

+    passthroughDeclarationString = ""

+    passthroughCallString = ""

+    prefixOverride = None

+    variables = []

+    conversionCodeOutgoing = []

+    conversionCodeIncoming = []

+    switchCode = []

+

+    # Calculate the name of the underlying support function to call.

+    # By default, the passthrough function is named _mesa_<funcName>.

+    # We're allowed to override the prefix and/or the function name

+    # for each function record, though.  The "ConversionFunction"

+    # utility is poorly named, BTW...

+    if funcName in allSpecials:

+        # perform checks and pass through

+        funcPrefix = "_check_"

+        aliasprefix = "_es_"

+    else:

+        funcPrefix = "_es_"

+        aliasprefix = apiutil.AliasPrefix(funcName)

+    alias = apiutil.ConversionFunction(funcName)

+    prefixOverride = apiutil.FunctionPrefix(funcName)

+    if prefixOverride != "_mesa_":

+        aliasprefix = apiutil.FunctionPrefix(funcName)

+    if not alias:

+        # There may still be a Mesa alias for the function

+        if apiutil.Alias(funcName):

+            passthroughFuncName = "%s%s" % (aliasprefix, apiutil.Alias(funcName))

+        else:

+            passthroughFuncName = "%s%s" % (aliasprefix, funcName)

+    else: # a specific alias is provided

+        passthroughFuncName = "%s%s" % (aliasprefix, alias)

+

+    # Look at every parameter: each one may have only specific

+    # allowed values, or dependent parameters to check, or 

+    # variant-sized vector arrays to calculate

+    for (paramName, paramType, paramMaxVecSize, paramConvertToType, paramValidValues, paramValueConversion) in params:

+        # We'll need this below if we're doing conversions

+        (paramBaseType, paramTypeModifiers) = GetBaseType(paramType)

+

+        # Conversion management.

+        # We'll handle three cases, easiest to hardest: a parameter

+        # that doesn't require conversion, a scalar parameter that

+        # requires conversion, and a vector parameter that requires

+        # conversion.

+        if paramConvertToType == None:

+            # Unconverted parameters are easy, whether they're vector

+            # or scalar - just add them to the call list.  No conversions

+            # or anything to worry about.

+            passthroughDeclarationString += ", %s %s" % (paramType, paramName)

+            passthroughCallString += ", %s" % paramName

+

+        elif paramMaxVecSize == 0: # a scalar parameter that needs conversion

+            # A scalar to hold a converted parameter

+            variables.append("    %s converted_%s;" % (paramConvertToType, paramName))

+

+            # Outgoing conversion depends on whether we have to conditionally

+            # perform value conversion.

+            if paramValueConversion == "none":

+                conversionCodeOutgoing.append("    converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))

+            elif paramValueConversion == "some":

+                # We'll need a conditional variable to keep track of

+                # whether we're converting values or not.

+                if ("    int convert_%s_value = 1;" % paramName) not in variables:

+                    variables.append("    int convert_%s_value = 1;" % paramName)

+

+                # Write code based on that conditional.

+                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)

+                conversionCodeOutgoing.append("        converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType))) 

+                conversionCodeOutgoing.append("    } else {")

+                conversionCodeOutgoing.append("        converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))

+                conversionCodeOutgoing.append("    }")

+            else: # paramValueConversion == "all"

+                conversionCodeOutgoing.append("    converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType)))

+

+            # Note that there can be no incoming conversion for a

+            # scalar parameter; changing the scalar will only change

+            # the local value, and won't ultimately change anything

+            # that passes back to the application.

+

+            # Call strings.  The unusual " ".join() call will join the

+            # array of parameter modifiers with spaces as separators.

+            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)

+            passthroughCallString += ", converted_%s" % paramName

+

+        else: # a vector parameter that needs conversion

+            # We'll need an index variable for conversions

+            if "    register unsigned int i;" not in variables:

+                variables.append("    register unsigned int i;")

+

+            # This variable will hold the (possibly variant) size of

+            # this array needing conversion.  By default, we'll set

+            # it to the maximal size (which is correct for functions

+            # with a constant-sized vector parameter); for true

+            # variant arrays, we'll modify it with other code.

+            variables.append("    unsigned int n_%s = %d;" % (paramName, paramMaxVecSize))

+

+            # This array will hold the actual converted values.

+            variables.append("    %s converted_%s[%d];" % (paramConvertToType, paramName, paramMaxVecSize))

+

+            # Again, we choose the conversion code based on whether we

+            # have to always convert values, never convert values, or 

+            # conditionally convert values.

+            if paramValueConversion == "none":

+                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeOutgoing.append("        converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))

+                conversionCodeOutgoing.append("    }")

+            elif paramValueConversion == "some":

+                # We'll need a conditional variable to keep track of

+                # whether we're converting values or not.

+                if ("    int convert_%s_value = 1;" % paramName) not in variables:

+                    variables.append("    int convert_%s_value = 1;" % paramName)

+                # Write code based on that conditional.

+                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)

+                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeOutgoing.append("            converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType))) 

+                conversionCodeOutgoing.append("        }")

+                conversionCodeOutgoing.append("    } else {")

+                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeOutgoing.append("            converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))

+                conversionCodeOutgoing.append("        }")

+                conversionCodeOutgoing.append("    }")

+            else: # paramValueConversion == "all"

+                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeOutgoing.append("        converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType)))

+

+                conversionCodeOutgoing.append("    }")

+

+            # If instead we need an incoming conversion (i.e. results

+            # from Mesa have to be converted before handing back

+            # to the application), this is it.  Fortunately, we don't

+            # have to worry about conditional value conversion - the

+            # functions that do (e.g. glGetFixedv()) are handled

+            # specially, outside this code generation.

+            #

+            # Whether we use incoming conversion or outgoing conversion

+            # is determined later - we only ever use one or the other.

+

+            if paramValueConversion == "none":

+                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeIncoming.append("        %s[i] = (%s) converted_%s[i];" % (paramName, paramConvertToType, paramName))

+                conversionCodeIncoming.append("    }")

+            elif paramValueConversion == "some":

+                # We'll need a conditional variable to keep track of

+                # whether we're converting values or not.

+                if ("    int convert_%s_value = 1;" % paramName) not in variables:

+                    variables.append("    int convert_%s_value = 1;" % paramName)

+

+                # Write code based on that conditional.

+                conversionCodeIncoming.append("    if (convert_%s_value) {" % paramName)

+                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeIncoming.append("            %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType))) 

+                conversionCodeIncoming.append("        }")

+                conversionCodeIncoming.append("    } else {")

+                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeIncoming.append("            %s[i] = (%s) converted_%s[i];" % (paramName, paramBaseType, paramName))

+                conversionCodeIncoming.append("        }")

+                conversionCodeIncoming.append("    }")

+            else: # paramValueConversion == "all"

+                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)

+                conversionCodeIncoming.append("        %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType)))

+                conversionCodeIncoming.append("    }")

+

+            # Call strings.  The unusual " ".join() call will join the

+            # array of parameter modifiers with spaces as separators.

+            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)

+            passthroughCallString += ", converted_%s" % paramName

+

+        # endif conversion management

+

+        # Parameter checking.  If the parameter has a specific list of

+        # valid values, we have to make sure that the passed-in values

+        # match these, or we make an error.

+        if len(paramValidValues) > 0:

+            # We're about to make a big switch statement with an

+            # error at the end.  By default, the error is GL_INVALID_ENUM,

+            # unless we find a "case" statement in the middle with a

+            # non-GLenum value.

+            errorDefaultCase = "GL_INVALID_ENUM"

+

+            # This parameter has specific valid values.  Make a big

+            # switch statement to handle it.  Note that the original

+            # parameters are always what is checked, not the

+            # converted parameters.

+            switchCode.append("    switch(%s) {" % paramName)

+

+            for valueIndex in range(len(paramValidValues)):

+                (paramValue, dependentVecSize, dependentParamName, dependentValidValues, errorCode, valueConvert) = paramValidValues[valueIndex]

+

+                # We're going to need information on the dependent param

+                # as well.

+                if dependentParamName:

+                    depParamIndex = apiutil.FindParamIndex(params, dependentParamName)

+                    if depParamIndex == None:

+                        sys.stderr.write("%s: can't find dependent param '%s' for function '%s'\n" % (program, dependentParamName, funcName))

+

+                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = params[depParamIndex]

+                else:

+                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = (None, None, None, None, [], None)

+

+                # This is a sneaky trick.  It's valid syntax for a parameter

+                # that is *not* going to be converted to be declared

+                # with a dependent vector size; but in this case, the

+                # dependent vector size is unused and unnecessary.

+                # So check for this and ignore the dependent vector size

+                # if the parameter is not going to be converted.

+                if depParamConvertToType:

+                    usedDependentVecSize = dependentVecSize

+                else:

+                    usedDependentVecSize = None

+

+                # We'll peek ahead at the next parameter, to see whether

+                # we can combine cases

+                if valueIndex + 1 < len(paramValidValues) :

+                    (nextParamValue, nextDependentVecSize, nextDependentParamName, nextDependentValidValues, nextErrorCode, nextValueConvert) = paramValidValues[valueIndex + 1]

+                    if depParamConvertToType:

+                        usedNextDependentVecSize = nextDependentVecSize

+                    else:

+                        usedNextDependentVecSize = None

+

+                # Create a case for this value.  As a mnemonic,

+                # if we have a dependent vector size that we're ignoring,

+                # add it as a comment.

+                if usedDependentVecSize == None and dependentVecSize != None:

+                    switchCode.append("        case %s: /* size %s */" % (paramValue, dependentVecSize))

+                else:

+                    switchCode.append("        case %s:" % paramValue)

+

+                # If this is not a GLenum case, then switch our error

+                # if no value is matched to be GL_INVALID_VALUE instead

+                # of GL_INVALID_ENUM.  (Yes, this does get confused

+                # if there are both values and GLenums in the same

+                # switch statement, which shouldn't happen.)

+                if paramValue[0:3] != "GL_":

+                    errorDefaultCase = "GL_INVALID_VALUE"

+

+                # If all the remaining parameters are identical to the

+                # next set, then we're done - we'll just create the

+                # official code on the next pass through, and the two

+                # cases will share the code.

+                if valueIndex + 1 < len(paramValidValues) and usedDependentVecSize == usedNextDependentVecSize and dependentParamName == nextDependentParamName and dependentValidValues == nextDependentValidValues and errorCode == nextErrorCode and valueConvert == nextValueConvert:

+                    continue

+

+                # Otherwise, we'll have to generate code for this case.

+                # Start off with a check: if there is a dependent parameter,

+                # and a list of valid values for that parameter, we need

+                # to generate an error if something other than one

+                # of those values is passed.

+                if len(dependentValidValues) > 0:

+                    conditional=""

+

+                    # If the parameter being checked is actually an array,

+                    # check only its first element.

+                    if depParamMaxVecSize == 0:

+                        valueToCheck = dependentParamName

+                    else:

+                        valueToCheck = "%s[0]" % dependentParamName

+

+                    for v in dependentValidValues:

+                        conditional += " && %s != %s" % (valueToCheck, v)

+                    switchCode.append("            if (%s) {" % conditional[4:])

+                    if errorCode == None:

+                        errorCode = "GL_INVALID_ENUM"

+                    switchCode.append('                _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=0x%s)", %s);' % (errorCode, funcName, paramName, "%x", paramName))

+                    switchCode.append("                %s;" % errorReturn)

+                    switchCode.append("            }")

+                # endif there are dependent valid values

+

+                # The dependent parameter may require conditional

+                # value conversion.  If it does, and we don't want

+                # to convert values, we'll have to generate code for that

+                if depParamValueConversion == "some" and valueConvert == "noconvert":

+                    switchCode.append("            convert_%s_value = 0;" % dependentParamName)

+

+                # If there's a dependent vector size for this parameter

+                # that we're actually going to use (i.e. we need conversion),

+                # mark it.

+                if usedDependentVecSize:

+                    switchCode.append("            n_%s = %s;" % (dependentParamName, dependentVecSize))

+

+                # In all cases, break out of the switch if any valid

+                # value is found.

+                switchCode.append("            break;")

+

+

+            # Need a default case to catch all the other, invalid

+            # parameter values.  These will all generate errors.

+            switchCode.append("        default:")

+            if errorCode == None:

+                errorCode = "GL_INVALID_ENUM"

+            formatString = GetFormatString(paramType)

+            if formatString == None:

+                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s)");' % (errorCode, funcName, paramName))

+            else:

+                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=%s)", %s);' % (errorCode, funcName, paramName, formatString, paramName))

+            switchCode.append("            %s;" % errorReturn)

+

+            # End of our switch code.

+            switchCode.append("    }")

+

+        # endfor every recognized parameter value

+

+    # endfor every param

+

+    # Here, the passthroughDeclarationString and passthroughCallString

+    # are complete; remove the extra ", " at the front of each.

+    passthroughDeclarationString = passthroughDeclarationString[2:]

+    passthroughCallString = passthroughCallString[2:]

+    if not passthroughDeclarationString:

+        passthroughDeclarationString = "void"

+

+    # The Mesa functions are scattered across all the Mesa

+    # header files.  The easiest way to manage declarations

+    # is to create them ourselves.

+    if funcName in allSpecials:

+        print "/* this function is special and is defined elsewhere */"

+    print "extern %s GL_APIENTRY %s(%s);" % (returnType, passthroughFuncName, passthroughDeclarationString)

+

+    # A function may be a core function (i.e. it exists in

+    # the core specification), a core addition (extension

+    # functions added officially to the core), a required

+    # extension (usually an extension for an earlier version

+    # that has been officially adopted), or an optional extension.

+    #

+    # Core functions have a simple category (e.g. "GLES1.1");

+    # we generate only a simple callback for them.

+    #

+    # Core additions have two category listings, one simple

+    # and one compound (e.g.  ["GLES1.1", "GLES1.1:OES_fixed_point"]).  

+    # We generate the core function, and also an extension function.

+    #

+    # Required extensions and implemented optional extensions

+    # have a single compound category "GLES1.1:OES_point_size_array".

+    # For these we generate just the extension function.

+    for categorySpec in apiutil.Categories(funcName):

+        compoundCategory = categorySpec.split(":")

+

+        # This category isn't for us, if the base category doesn't match

+        # our version

+        if compoundCategory[0] != version:

+            continue

+

+        # Otherwise, determine if we're writing code for a core

+        # function (no suffix) or an extension function.

+        if len(compoundCategory) == 1:

+            # This is a core function

+            extensionName = None

+            extensionSuffix = ""

+        else:

+            # This is an extension function.  We'll need to append

+            # the extension suffix.

+            extensionName = compoundCategory[1]

+            extensionSuffix = extensionName.split("_")[0]

+        fullFuncName = funcPrefix + funcName + extensionSuffix

+

+        # Now the generated function.  The text used to mark an API-level

+        # function, oddly, is version-specific.

+        if extensionName:

+            print "/* Extension %s */" % extensionName

+

+        if (not variables and

+            not switchCode and

+            not conversionCodeOutgoing and

+            not conversionCodeIncoming):

+            # pass through directly

+            print "#define %s %s" % (fullFuncName, passthroughFuncName)

+            print

+            continue

+

+        print "static %s GL_APIENTRY %s(%s)" % (returnType, fullFuncName, declarationString)

+        print "{"

+

+        # Start printing our code pieces.  Start with any local

+        # variables we need.  This unusual syntax joins the 

+        # lines in the variables[] array with the "\n" separator.

+        if len(variables) > 0:

+            print "\n".join(variables) + "\n"

+

+        # If there's any sort of parameter checking or variable

+        # array sizing, the switch code will contain it.

+        if len(switchCode) > 0:

+            print "\n".join(switchCode) + "\n"

+

+        # In the case of an outgoing conversion (i.e. parameters must

+        # be converted before calling the underlying Mesa function),

+        # use the appropriate code.

+        if "get" not in props and len(conversionCodeOutgoing) > 0:

+            print "\n".join(conversionCodeOutgoing) + "\n"

+

+        # Call the Mesa function.  Note that there are very few functions

+        # that return a value (i.e. returnType is not "void"), and that

+        # none of them require incoming translation; so we're safe

+        # to generate code that directly returns in those cases,

+        # even though it's not completely independent.

+

+        if returnType == "void":

+            print "    %s(%s);" % (passthroughFuncName, passthroughCallString)

+        else:

+            print "    return %s(%s);" % (passthroughFuncName, passthroughCallString)

+

+        # If the function is one that returns values (i.e. "get" in props),

+        # it might return values of a different type than we need, that

+        # require conversion before passing back to the application.

+        if "get" in props and len(conversionCodeIncoming) > 0:

+            print "\n".join(conversionCodeIncoming)

+

+        # All done.

+        print "}"

+        print

+    # end for each category provided for a function

+

+# end for each function

+

+print """

+#include "glapi/glapi.h"

+

+#if FEATURE_remap_table

+

+/* cannot include main/dispatch.h here */

+#define _GLAPI_USE_REMAP_TABLE

+#include "%sapi/main/glapidispatch.h"

+

+#define need_MESA_remap_table

+#include "%sapi/main/remap_helper.h"

+

+/* force SET_* macros to use the local remap table */

+#define driDispatchRemapTable remap_table

+static int remap_table[driDispatchRemapTable_size];

+

+static void

+init_remap_table(void)

+{

+   _glthread_DECLARE_STATIC_MUTEX(mutex);

+   static GLboolean initialized = GL_FALSE;

+   const struct gl_function_pool_remap *remap = MESA_remap_table_functions;

+   int i;

+

+   _glthread_LOCK_MUTEX(mutex);

+   if (initialized) {

+      _glthread_UNLOCK_MUTEX(mutex);

+      return;

+   }

+

+   for (i = 0; i < driDispatchRemapTable_size; i++) {

+      GLint offset;

+      const char *spec;

+

+      /* sanity check */

+      ASSERT(i == remap[i].remap_index);

+      spec = _mesa_function_pool + remap[i].pool_index;

+

+      offset = _mesa_map_function_spec(spec);

+      remap_table[i] = offset;

+   }

+   initialized = GL_TRUE;

+   _glthread_UNLOCK_MUTEX(mutex);

+}

+

+#else /* FEATURE_remap_table */

+

+/* cannot include main/dispatch.h here */

+#include "%sapi/main/glapidispatch.h"

+

+static INLINE void

+init_remap_table(void)

+{

+}

+

+#endif /* FEATURE_remap_table */

+

+struct _glapi_table *

+_mesa_create_exec_table_%s(void)

+{

+   struct _glapi_table *exec;

+

+   exec = _mesa_alloc_dispatch_table(_gloffset_COUNT);

+   if (exec == NULL)

+      return NULL;

+

+   init_remap_table();

+""" % (shortname, shortname, shortname, shortname)

+

+for func in keys:

+    prefix = "_es_" if func not in allSpecials else "_check_"

+    for spec in apiutil.Categories(func):

+        ext = spec.split(":")

+        # version does not match

+        if ext.pop(0) != version:

+            continue

+        entry = func

+        if ext:

+            suffix = ext[0].split("_")[0]

+            entry += suffix

+        print "    SET_%s(exec, %s%s);" % (entry, prefix, entry)

+print ""

+print "   return exec;"

+print "}"

+

+print """

+#endif /* FEATURE_%s */""" % (shortname.upper())

diff --git a/mesalib/src/mesa/main/eval.c b/mesalib/src/mesa/main/eval.c
index bd2e1177f..d7666a630 100644
--- a/mesalib/src/mesa/main/eval.c
+++ b/mesalib/src/mesa/main/eval.c
@@ -1,1001 +1,1001 @@
-
-/*
- * 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.
- */
-
-
-/*
- * eval.c was written by
- * Bernd Barsuhn (bdbarsuh@cip.informatik.uni-erlangen.de) and
- * Volker Weiss (vrweiss@cip.informatik.uni-erlangen.de).
- *
- * My original implementation of evaluators was simplistic and didn't
- * compute surface normal vectors properly.  Bernd and Volker applied
- * used more sophisticated methods to get better results.
- *
- * Thanks guys!
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "context.h"
-#include "eval.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_evaluators
-
-
-/*
- * Return the number of components per control point for any type of
- * evaluator.  Return 0 if bad target.
- * See table 5.1 in the OpenGL 1.2 spec.
- */
-GLuint _mesa_evaluator_components( GLenum target )
-{
-   switch (target) {
-      case GL_MAP1_VERTEX_3:		return 3;
-      case GL_MAP1_VERTEX_4:		return 4;
-      case GL_MAP1_INDEX:		return 1;
-      case GL_MAP1_COLOR_4:		return 4;
-      case GL_MAP1_NORMAL:		return 3;
-      case GL_MAP1_TEXTURE_COORD_1:	return 1;
-      case GL_MAP1_TEXTURE_COORD_2:	return 2;
-      case GL_MAP1_TEXTURE_COORD_3:	return 3;
-      case GL_MAP1_TEXTURE_COORD_4:	return 4;
-      case GL_MAP2_VERTEX_3:		return 3;
-      case GL_MAP2_VERTEX_4:		return 4;
-      case GL_MAP2_INDEX:		return 1;
-      case GL_MAP2_COLOR_4:		return 4;
-      case GL_MAP2_NORMAL:		return 3;
-      case GL_MAP2_TEXTURE_COORD_1:	return 1;
-      case GL_MAP2_TEXTURE_COORD_2:	return 2;
-      case GL_MAP2_TEXTURE_COORD_3:	return 3;
-      case GL_MAP2_TEXTURE_COORD_4:	return 4;
-      default:				break;
-   }
-
-   /* XXX need to check for the vertex program extension
-   if (!ctx->Extensions.NV_vertex_program)
-      return 0;
-   */
-
-   if (target >= GL_MAP1_VERTEX_ATTRIB0_4_NV &&
-       target <= GL_MAP1_VERTEX_ATTRIB15_4_NV)
-      return 4;
-
-   if (target >= GL_MAP2_VERTEX_ATTRIB0_4_NV &&
-       target <= GL_MAP2_VERTEX_ATTRIB15_4_NV)
-      return 4;
-
-   return 0;
-}
-
-
-/*
- * Return pointer to the gl_1d_map struct for the named target.
- */
-static struct gl_1d_map *
-get_1d_map( GLcontext *ctx, GLenum target )
-{
-   switch (target) {
-      case GL_MAP1_VERTEX_3:
-         return &ctx->EvalMap.Map1Vertex3;
-      case GL_MAP1_VERTEX_4:
-         return &ctx->EvalMap.Map1Vertex4;
-      case GL_MAP1_INDEX:
-         return &ctx->EvalMap.Map1Index;
-      case GL_MAP1_COLOR_4:
-         return &ctx->EvalMap.Map1Color4;
-      case GL_MAP1_NORMAL:
-         return &ctx->EvalMap.Map1Normal;
-      case GL_MAP1_TEXTURE_COORD_1:
-         return &ctx->EvalMap.Map1Texture1;
-      case GL_MAP1_TEXTURE_COORD_2:
-         return &ctx->EvalMap.Map1Texture2;
-      case GL_MAP1_TEXTURE_COORD_3:
-         return &ctx->EvalMap.Map1Texture3;
-      case GL_MAP1_TEXTURE_COORD_4:
-         return &ctx->EvalMap.Map1Texture4;
-      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         if (!ctx->Extensions.NV_vertex_program)
-            return NULL;
-         return &ctx->EvalMap.Map1Attrib[target - GL_MAP1_VERTEX_ATTRIB0_4_NV];
-      default:
-         return NULL;
-   }
-}
-
-
-/*
- * Return pointer to the gl_2d_map struct for the named target.
- */
-static struct gl_2d_map *
-get_2d_map( GLcontext *ctx, GLenum target )
-{
-   switch (target) {
-      case GL_MAP2_VERTEX_3:
-         return &ctx->EvalMap.Map2Vertex3;
-      case GL_MAP2_VERTEX_4:
-         return &ctx->EvalMap.Map2Vertex4;
-      case GL_MAP2_INDEX:
-         return &ctx->EvalMap.Map2Index;
-      case GL_MAP2_COLOR_4:
-         return &ctx->EvalMap.Map2Color4;
-      case GL_MAP2_NORMAL:
-         return &ctx->EvalMap.Map2Normal;
-      case GL_MAP2_TEXTURE_COORD_1:
-         return &ctx->EvalMap.Map2Texture1;
-      case GL_MAP2_TEXTURE_COORD_2:
-         return &ctx->EvalMap.Map2Texture2;
-      case GL_MAP2_TEXTURE_COORD_3:
-         return &ctx->EvalMap.Map2Texture3;
-      case GL_MAP2_TEXTURE_COORD_4:
-         return &ctx->EvalMap.Map2Texture4;
-      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
-      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
-         if (!ctx->Extensions.NV_vertex_program)
-            return NULL;
-         return &ctx->EvalMap.Map2Attrib[target - GL_MAP2_VERTEX_ATTRIB0_4_NV];
-      default:
-         return NULL;
-   }
-}
-
-
-/**********************************************************************/
-/***            Copy and deallocate control points                  ***/
-/**********************************************************************/
-
-
-/*
- * Copy 1-parametric evaluator control points from user-specified
- * memory space to a buffer of contiguous control points.
- * \param see glMap1f for details
- * \return pointer to buffer of contiguous control points or NULL if out
- *          of memory.
- */
-GLfloat *_mesa_copy_map_points1f( GLenum target, GLint ustride, GLint uorder,
-                                  const GLfloat *points )
-{
-   GLfloat *buffer, *p;
-   GLint i, k, size = _mesa_evaluator_components(target);
-
-   if (!points || !size)
-      return NULL;
-
-   buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));
-
-   if (buffer)
-      for (i = 0, p = buffer; i < uorder; i++, points += ustride)
-	for (k = 0; k < size; k++)
-	  *p++ = points[k];
-
-   return buffer;
-}
-
-
-
-/*
- * Same as above but convert doubles to floats.
- */
-GLfloat *_mesa_copy_map_points1d( GLenum target, GLint ustride, GLint uorder,
-                                  const GLdouble *points )
-{
-   GLfloat *buffer, *p;
-   GLint i, k, size = _mesa_evaluator_components(target);
-
-   if (!points || !size)
-      return NULL;
-
-   buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));
-
-   if (buffer)
-      for (i = 0, p = buffer; i < uorder; i++, points += ustride)
-	for (k = 0; k < size; k++)
-	  *p++ = (GLfloat) points[k];
-
-   return buffer;
-}
-
-
-
-/*
- * Copy 2-parametric evaluator control points from user-specified
- * memory space to a buffer of contiguous control points.
- * Additional memory is allocated to be used by the horner and
- * de Casteljau evaluation schemes.
- *
- * \param see glMap2f for details
- * \return pointer to buffer of contiguous control points or NULL if out
- *          of memory.
- */
-GLfloat *_mesa_copy_map_points2f( GLenum target,
-                                  GLint ustride, GLint uorder,
-                                  GLint vstride, GLint vorder,
-                                  const GLfloat *points )
-{
-   GLfloat *buffer, *p;
-   GLint i, j, k, size, dsize, hsize;
-   GLint uinc;
-
-   size = _mesa_evaluator_components(target);
-
-   if (!points || size==0) {
-      return NULL;
-   }
-
-   /* max(uorder, vorder) additional points are used in      */
-   /* horner evaluation and uorder*vorder additional */
-   /* values are needed for de Casteljau                     */
-   dsize = (uorder == 2 && vorder == 2)? 0 : uorder*vorder;
-   hsize = (uorder > vorder ? uorder : vorder)*size;
-
-   if(hsize>dsize)
-     buffer = (GLfloat *) MALLOC((uorder*vorder*size+hsize)*sizeof(GLfloat));
-   else
-     buffer = (GLfloat *) MALLOC((uorder*vorder*size+dsize)*sizeof(GLfloat));
-
-   /* compute the increment value for the u-loop */
-   uinc = ustride - vorder*vstride;
-
-   if (buffer)
-      for (i=0, p=buffer; i<uorder; i++, points += uinc)
-	 for (j=0; j<vorder; j++, points += vstride)
-	    for (k=0; k<size; k++)
-	       *p++ = points[k];
-
-   return buffer;
-}
-
-
-
-/*
- * Same as above but convert doubles to floats.
- */
-GLfloat *_mesa_copy_map_points2d(GLenum target,
-                                 GLint ustride, GLint uorder,
-                                 GLint vstride, GLint vorder,
-                                 const GLdouble *points )
-{
-   GLfloat *buffer, *p;
-   GLint i, j, k, size, hsize, dsize;
-   GLint uinc;
-
-   size = _mesa_evaluator_components(target);
-
-   if (!points || size==0) {
-      return NULL;
-   }
-
-   /* max(uorder, vorder) additional points are used in      */
-   /* horner evaluation and uorder*vorder additional */
-   /* values are needed for de Casteljau                     */
-   dsize = (uorder == 2 && vorder == 2)? 0 : uorder*vorder;
-   hsize = (uorder > vorder ? uorder : vorder)*size;
-
-   if(hsize>dsize)
-     buffer = (GLfloat *) MALLOC((uorder*vorder*size+hsize)*sizeof(GLfloat));
-   else
-     buffer = (GLfloat *) MALLOC((uorder*vorder*size+dsize)*sizeof(GLfloat));
-
-   /* compute the increment value for the u-loop */
-   uinc = ustride - vorder*vstride;
-
-   if (buffer)
-      for (i=0, p=buffer; i<uorder; i++, points += uinc)
-	 for (j=0; j<vorder; j++, points += vstride)
-	    for (k=0; k<size; k++)
-	       *p++ = (GLfloat) points[k];
-
-   return buffer;
-}
-
-
-
-
-/**********************************************************************/
-/***                      API entry points                          ***/
-/**********************************************************************/
-
-
-/*
- * This does the work of glMap1[fd].
- */
-static void
-map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
-     GLint uorder, const GLvoid *points, GLenum type )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint k;
-   GLfloat *pnts;
-   struct gl_1d_map *map = NULL;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   ASSERT(type == GL_FLOAT || type == GL_DOUBLE);
-
-   if (u1 == u2) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(u1,u2)" );
-      return;
-   }
-   if (uorder < 1 || uorder > MAX_EVAL_ORDER) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(order)" );
-      return;
-   }
-   if (!points) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(points)" );
-      return;
-   }
-
-   k = _mesa_evaluator_components( target );
-   if (k == 0) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glMap1(target)" );
-   }
-
-   if (ustride < k) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(stride)" );
-      return;
-   }
-
-   if (ctx->Texture.CurrentUnit != 0) {
-      /* See OpenGL 1.2.1 spec, section F.2.13 */
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );
-      return;
-   }
-
-   map = get_1d_map(ctx, target);
-   if (!map) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glMap1(target)" );
-      return;
-   }
-
-   /* make copy of the control points */
-   if (type == GL_FLOAT)
-      pnts = _mesa_copy_map_points1f(target, ustride, uorder, (GLfloat*) points);
-   else
-      pnts = _mesa_copy_map_points1d(target, ustride, uorder, (GLdouble*) points);
-
-
-   FLUSH_VERTICES(ctx, _NEW_EVAL);
-   map->Order = uorder;
-   map->u1 = u1;
-   map->u2 = u2;
-   map->du = 1.0F / (u2 - u1);
-   if (map->Points)
-      FREE( map->Points );
-   map->Points = pnts;
-}
-
-
-
-static void GLAPIENTRY
-_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,
-             GLint order, const GLfloat *points )
-{
-   map1(target, u1, u2, stride, order, points, GL_FLOAT);
-}
-
-
-static void GLAPIENTRY
-_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,
-             GLint order, const GLdouble *points )
-{
-   map1(target, (GLfloat) u1, (GLfloat) u2, stride, order, points, GL_DOUBLE);
-}
-
-
-static void
-map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
-      GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
-      const GLvoid *points, GLenum type )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint k;
-   GLfloat *pnts;
-   struct gl_2d_map *map = NULL;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   ASSERT(type == GL_FLOAT || type == GL_DOUBLE);
-
-   if (u1==u2) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(u1,u2)" );
-      return;
-   }
-
-   if (v1==v2) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(v1,v2)" );
-      return;
-   }
-
-   if (uorder<1 || uorder>MAX_EVAL_ORDER) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(uorder)" );
-      return;
-   }
-
-   if (vorder<1 || vorder>MAX_EVAL_ORDER) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(vorder)" );
-      return;
-   }
-
-   k = _mesa_evaluator_components( target );
-   if (k==0) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glMap2(target)" );
-   }
-
-   if (ustride < k) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(ustride)" );
-      return;
-   }
-   if (vstride < k) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(vstride)" );
-      return;
-   }
-
-   if (ctx->Texture.CurrentUnit != 0) {
-      /* See OpenGL 1.2.1 spec, section F.2.13 */
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );
-      return;
-   }
-
-   map = get_2d_map(ctx, target);
-   if (!map) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glMap2(target)" );
-      return;
-   }
-
-   /* make copy of the control points */
-   if (type == GL_FLOAT)
-      pnts = _mesa_copy_map_points2f(target, ustride, uorder,
-                                  vstride, vorder, (GLfloat*) points);
-   else
-      pnts = _mesa_copy_map_points2d(target, ustride, uorder,
-                                  vstride, vorder, (GLdouble*) points);
-
-
-   FLUSH_VERTICES(ctx, _NEW_EVAL);
-   map->Uorder = uorder;
-   map->u1 = u1;
-   map->u2 = u2;
-   map->du = 1.0F / (u2 - u1);
-   map->Vorder = vorder;
-   map->v1 = v1;
-   map->v2 = v2;
-   map->dv = 1.0F / (v2 - v1);
-   if (map->Points)
-      FREE( map->Points );
-   map->Points = pnts;
-}
-
-
-static void GLAPIENTRY
-_mesa_Map2f( GLenum target,
-             GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
-             GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
-             const GLfloat *points)
-{
-   map2(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,
-        points, GL_FLOAT);
-}
-
-
-static void GLAPIENTRY
-_mesa_Map2d( GLenum target,
-             GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
-             GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
-             const GLdouble *points )
-{
-   map2(target, (GLfloat) u1, (GLfloat) u2, ustride, uorder, 
-	(GLfloat) v1, (GLfloat) v2, vstride, vorder, points, GL_DOUBLE);
-}
-
-
-
-static void GLAPIENTRY
-_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_1d_map *map1d;
-   struct gl_2d_map *map2d;
-   GLint i, n;
-   GLfloat *data;
-   GLuint comps;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   comps = _mesa_evaluator_components(target);
-   if (!comps) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapdv(target)" );
-      return;
-   }
-
-   map1d = get_1d_map(ctx, target);
-   map2d = get_2d_map(ctx, target);
-   ASSERT(map1d || map2d);
-
-   switch (query) {
-      case GL_COEFF:
-         if (map1d) {
-            data = map1d->Points;
-            n = map1d->Order * comps;
-         }
-         else {
-            data = map2d->Points;
-            n = map2d->Uorder * map2d->Vorder * comps;
-         }
-	 if (data) {
-	    for (i=0;i<n;i++) {
-	       v[i] = data[i];
-	    }
-	 }
-         break;
-      case GL_ORDER:
-         if (map1d) {
-            v[0] = (GLdouble) map1d->Order;
-         }
-         else {
-            v[0] = (GLdouble) map2d->Uorder;
-            v[1] = (GLdouble) map2d->Vorder;
-         }
-         break;
-      case GL_DOMAIN:
-         if (map1d) {
-            v[0] = (GLdouble) map1d->u1;
-            v[1] = (GLdouble) map1d->u2;
-         }
-         else {
-            v[0] = (GLdouble) map2d->u1;
-            v[1] = (GLdouble) map2d->u2;
-            v[2] = (GLdouble) map2d->v1;
-            v[3] = (GLdouble) map2d->v2;
-         }
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapdv(query)" );
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_1d_map *map1d;
-   struct gl_2d_map *map2d;
-   GLint i, n;
-   GLfloat *data;
-   GLuint comps;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   comps = _mesa_evaluator_components(target);
-   if (!comps) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapfv(target)" );
-      return;
-   }
-
-   map1d = get_1d_map(ctx, target);
-   map2d = get_2d_map(ctx, target);
-   ASSERT(map1d || map2d);
-
-   switch (query) {
-      case GL_COEFF:
-         if (map1d) {
-            data = map1d->Points;
-            n = map1d->Order * comps;
-         }
-         else {
-            data = map2d->Points;
-            n = map2d->Uorder * map2d->Vorder * comps;
-         }
-	 if (data) {
-	    for (i=0;i<n;i++) {
-	       v[i] = data[i];
-	    }
-	 }
-         break;
-      case GL_ORDER:
-         if (map1d) {
-            v[0] = (GLfloat) map1d->Order;
-         }
-         else {
-            v[0] = (GLfloat) map2d->Uorder;
-            v[1] = (GLfloat) map2d->Vorder;
-         }
-         break;
-      case GL_DOMAIN:
-         if (map1d) {
-            v[0] = map1d->u1;
-            v[1] = map1d->u2;
-         }
-         else {
-            v[0] = map2d->u1;
-            v[1] = map2d->u2;
-            v[2] = map2d->v1;
-            v[3] = map2d->v2;
-         }
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapfv(query)" );
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetMapiv( GLenum target, GLenum query, GLint *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_1d_map *map1d;
-   struct gl_2d_map *map2d;
-   GLuint i, n;
-   GLfloat *data;
-   GLuint comps;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   comps = _mesa_evaluator_components(target);
-   if (!comps) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapiv(target)" );
-      return;
-   }
-
-   map1d = get_1d_map(ctx, target);
-   map2d = get_2d_map(ctx, target);
-   ASSERT(map1d || map2d);
-
-   switch (query) {
-      case GL_COEFF:
-         if (map1d) {
-            data = map1d->Points;
-            n = map1d->Order * comps;
-         }
-         else {
-            data = map2d->Points;
-            n = map2d->Uorder * map2d->Vorder * comps;
-         }
-	 if (data) {
-	    for (i=0;i<n;i++) {
-	       v[i] = IROUND(data[i]);
-	    }
-	 }
-         break;
-      case GL_ORDER:
-         if (map1d) {
-            v[0] = map1d->Order;
-         }
-         else {
-            v[0] = map2d->Uorder;
-            v[1] = map2d->Vorder;
-         }
-         break;
-      case GL_DOMAIN:
-         if (map1d) {
-            v[0] = IROUND(map1d->u1);
-            v[1] = IROUND(map1d->u2);
-         }
-         else {
-            v[0] = IROUND(map2d->u1);
-            v[1] = IROUND(map2d->u2);
-            v[2] = IROUND(map2d->v1);
-            v[3] = IROUND(map2d->v2);
-         }
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapiv(query)" );
-   }
-}
-
-
-
-static void GLAPIENTRY
-_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (un<1) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid1f" );
-      return;
-   }
-   FLUSH_VERTICES(ctx, _NEW_EVAL);
-   ctx->Eval.MapGrid1un = un;
-   ctx->Eval.MapGrid1u1 = u1;
-   ctx->Eval.MapGrid1u2 = u2;
-   ctx->Eval.MapGrid1du = (u2 - u1) / (GLfloat) un;
-}
-
-
-static void GLAPIENTRY
-_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 )
-{
-   _mesa_MapGrid1f( un, (GLfloat) u1, (GLfloat) u2 );
-}
-
-
-static void GLAPIENTRY
-_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,
-                 GLint vn, GLfloat v1, GLfloat v2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (un<1) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid2f(un)" );
-      return;
-   }
-   if (vn<1) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid2f(vn)" );
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_EVAL);
-   ctx->Eval.MapGrid2un = un;
-   ctx->Eval.MapGrid2u1 = u1;
-   ctx->Eval.MapGrid2u2 = u2;
-   ctx->Eval.MapGrid2du = (u2 - u1) / (GLfloat) un;
-   ctx->Eval.MapGrid2vn = vn;
-   ctx->Eval.MapGrid2v1 = v1;
-   ctx->Eval.MapGrid2v2 = v2;
-   ctx->Eval.MapGrid2dv = (v2 - v1) / (GLfloat) vn;
-}
-
-
-static void GLAPIENTRY
-_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
-                 GLint vn, GLdouble v1, GLdouble v2 )
-{
-   _mesa_MapGrid2f( un, (GLfloat) u1, (GLfloat) u2, 
-		    vn, (GLfloat) v1, (GLfloat) v2 );
-}
-
-
-void
-_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
-                          const GLvertexformat *vfmt)
-{
-   SET_EvalCoord1f(disp, vfmt->EvalCoord1f);
-   SET_EvalCoord1fv(disp, vfmt->EvalCoord1fv);
-   SET_EvalCoord2f(disp, vfmt->EvalCoord2f);
-   SET_EvalCoord2fv(disp, vfmt->EvalCoord2fv);
-   SET_EvalPoint1(disp, vfmt->EvalPoint1);
-   SET_EvalPoint2(disp, vfmt->EvalPoint2);
-
-   SET_EvalMesh1(disp, vfmt->EvalMesh1);
-   SET_EvalMesh2(disp, vfmt->EvalMesh2);
-}
-
-
-void
-_mesa_init_eval_dispatch(struct _glapi_table *disp)
-{
-   SET_GetMapdv(disp, _mesa_GetMapdv);
-   SET_GetMapfv(disp, _mesa_GetMapfv);
-   SET_GetMapiv(disp, _mesa_GetMapiv);
-   SET_Map1d(disp, _mesa_Map1d);
-   SET_Map1f(disp, _mesa_Map1f);
-   SET_Map2d(disp, _mesa_Map2d);
-   SET_Map2f(disp, _mesa_Map2f);
-   SET_MapGrid1d(disp, _mesa_MapGrid1d);
-   SET_MapGrid1f(disp, _mesa_MapGrid1f);
-   SET_MapGrid2d(disp, _mesa_MapGrid2d);
-   SET_MapGrid2f(disp, _mesa_MapGrid2f);
-}
-
-
-#endif /* FEATURE_evaluators */
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-/**
- * Initialize a 1-D evaluator map.
- */
-static void
-init_1d_map( struct gl_1d_map *map, int n, const float *initial )
-{
-   map->Order = 1;
-   map->u1 = 0.0;
-   map->u2 = 1.0;
-   map->Points = (GLfloat *) MALLOC(n * sizeof(GLfloat));
-   if (map->Points) {
-      GLint i;
-      for (i=0;i<n;i++)
-         map->Points[i] = initial[i];
-   }
-}
-
-
-/**
- * Initialize a 2-D evaluator map 
- */
-static void
-init_2d_map( struct gl_2d_map *map, int n, const float *initial )
-{
-   map->Uorder = 1;
-   map->Vorder = 1;
-   map->u1 = 0.0;
-   map->u2 = 1.0;
-   map->v1 = 0.0;
-   map->v2 = 1.0;
-   map->Points = (GLfloat *) MALLOC(n * sizeof(GLfloat));
-   if (map->Points) {
-      GLint i;
-      for (i=0;i<n;i++)
-         map->Points[i] = initial[i];
-   }
-}
-
-
-void _mesa_init_eval( GLcontext *ctx )
-{
-   int i;
-
-   /* Evaluators group */
-   ctx->Eval.Map1Color4 = GL_FALSE;
-   ctx->Eval.Map1Index = GL_FALSE;
-   ctx->Eval.Map1Normal = GL_FALSE;
-   ctx->Eval.Map1TextureCoord1 = GL_FALSE;
-   ctx->Eval.Map1TextureCoord2 = GL_FALSE;
-   ctx->Eval.Map1TextureCoord3 = GL_FALSE;
-   ctx->Eval.Map1TextureCoord4 = GL_FALSE;
-   ctx->Eval.Map1Vertex3 = GL_FALSE;
-   ctx->Eval.Map1Vertex4 = GL_FALSE;
-   memset(ctx->Eval.Map1Attrib, 0, sizeof(ctx->Eval.Map1Attrib));
-   ctx->Eval.Map2Color4 = GL_FALSE;
-   ctx->Eval.Map2Index = GL_FALSE;
-   ctx->Eval.Map2Normal = GL_FALSE;
-   ctx->Eval.Map2TextureCoord1 = GL_FALSE;
-   ctx->Eval.Map2TextureCoord2 = GL_FALSE;
-   ctx->Eval.Map2TextureCoord3 = GL_FALSE;
-   ctx->Eval.Map2TextureCoord4 = GL_FALSE;
-   ctx->Eval.Map2Vertex3 = GL_FALSE;
-   ctx->Eval.Map2Vertex4 = GL_FALSE;
-   memset(ctx->Eval.Map2Attrib, 0, sizeof(ctx->Eval.Map2Attrib));
-   ctx->Eval.AutoNormal = GL_FALSE;
-   ctx->Eval.MapGrid1un = 1;
-   ctx->Eval.MapGrid1u1 = 0.0;
-   ctx->Eval.MapGrid1u2 = 1.0;
-   ctx->Eval.MapGrid2un = 1;
-   ctx->Eval.MapGrid2vn = 1;
-   ctx->Eval.MapGrid2u1 = 0.0;
-   ctx->Eval.MapGrid2u2 = 1.0;
-   ctx->Eval.MapGrid2v1 = 0.0;
-   ctx->Eval.MapGrid2v2 = 1.0;
-
-   /* Evaluator data */
-   {
-      static GLfloat vertex[4] = { 0.0, 0.0, 0.0, 1.0 };
-      static GLfloat normal[3] = { 0.0, 0.0, 1.0 };
-      static GLfloat index[1] = { 1.0 };
-      static GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 };
-      static GLfloat texcoord[4] = { 0.0, 0.0, 0.0, 1.0 };
-      static GLfloat attrib[4] = { 0.0, 0.0, 0.0, 1.0 };
-
-      init_1d_map( &ctx->EvalMap.Map1Vertex3, 3, vertex );
-      init_1d_map( &ctx->EvalMap.Map1Vertex4, 4, vertex );
-      init_1d_map( &ctx->EvalMap.Map1Index, 1, index );
-      init_1d_map( &ctx->EvalMap.Map1Color4, 4, color );
-      init_1d_map( &ctx->EvalMap.Map1Normal, 3, normal );
-      init_1d_map( &ctx->EvalMap.Map1Texture1, 1, texcoord );
-      init_1d_map( &ctx->EvalMap.Map1Texture2, 2, texcoord );
-      init_1d_map( &ctx->EvalMap.Map1Texture3, 3, texcoord );
-      init_1d_map( &ctx->EvalMap.Map1Texture4, 4, texcoord );
-      for (i = 0; i < 16; i++)
-         init_1d_map( ctx->EvalMap.Map1Attrib + i, 4, attrib );
-
-      init_2d_map( &ctx->EvalMap.Map2Vertex3, 3, vertex );
-      init_2d_map( &ctx->EvalMap.Map2Vertex4, 4, vertex );
-      init_2d_map( &ctx->EvalMap.Map2Index, 1, index );
-      init_2d_map( &ctx->EvalMap.Map2Color4, 4, color );
-      init_2d_map( &ctx->EvalMap.Map2Normal, 3, normal );
-      init_2d_map( &ctx->EvalMap.Map2Texture1, 1, texcoord );
-      init_2d_map( &ctx->EvalMap.Map2Texture2, 2, texcoord );
-      init_2d_map( &ctx->EvalMap.Map2Texture3, 3, texcoord );
-      init_2d_map( &ctx->EvalMap.Map2Texture4, 4, texcoord );
-      for (i = 0; i < 16; i++)
-         init_2d_map( ctx->EvalMap.Map2Attrib + i, 4, attrib );
-   }
-}
-
-
-void _mesa_free_eval_data( GLcontext *ctx )
-{
-   int i;
-
-   /* Free evaluator data */
-   if (ctx->EvalMap.Map1Vertex3.Points)
-      FREE( ctx->EvalMap.Map1Vertex3.Points );
-   if (ctx->EvalMap.Map1Vertex4.Points)
-      FREE( ctx->EvalMap.Map1Vertex4.Points );
-   if (ctx->EvalMap.Map1Index.Points)
-      FREE( ctx->EvalMap.Map1Index.Points );
-   if (ctx->EvalMap.Map1Color4.Points)
-      FREE( ctx->EvalMap.Map1Color4.Points );
-   if (ctx->EvalMap.Map1Normal.Points)
-      FREE( ctx->EvalMap.Map1Normal.Points );
-   if (ctx->EvalMap.Map1Texture1.Points)
-      FREE( ctx->EvalMap.Map1Texture1.Points );
-   if (ctx->EvalMap.Map1Texture2.Points)
-      FREE( ctx->EvalMap.Map1Texture2.Points );
-   if (ctx->EvalMap.Map1Texture3.Points)
-      FREE( ctx->EvalMap.Map1Texture3.Points );
-   if (ctx->EvalMap.Map1Texture4.Points)
-      FREE( ctx->EvalMap.Map1Texture4.Points );
-   for (i = 0; i < 16; i++)
-      FREE((ctx->EvalMap.Map1Attrib[i].Points));
-
-   if (ctx->EvalMap.Map2Vertex3.Points)
-      FREE( ctx->EvalMap.Map2Vertex3.Points );
-   if (ctx->EvalMap.Map2Vertex4.Points)
-      FREE( ctx->EvalMap.Map2Vertex4.Points );
-   if (ctx->EvalMap.Map2Index.Points)
-      FREE( ctx->EvalMap.Map2Index.Points );
-   if (ctx->EvalMap.Map2Color4.Points)
-      FREE( ctx->EvalMap.Map2Color4.Points );
-   if (ctx->EvalMap.Map2Normal.Points)
-      FREE( ctx->EvalMap.Map2Normal.Points );
-   if (ctx->EvalMap.Map2Texture1.Points)
-      FREE( ctx->EvalMap.Map2Texture1.Points );
-   if (ctx->EvalMap.Map2Texture2.Points)
-      FREE( ctx->EvalMap.Map2Texture2.Points );
-   if (ctx->EvalMap.Map2Texture3.Points)
-      FREE( ctx->EvalMap.Map2Texture3.Points );
-   if (ctx->EvalMap.Map2Texture4.Points)
-      FREE( ctx->EvalMap.Map2Texture4.Points );
-   for (i = 0; i < 16; i++)
-      FREE((ctx->EvalMap.Map2Attrib[i].Points));
-}
+

+/*

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

+ */

+

+

+/*

+ * eval.c was written by

+ * Bernd Barsuhn (bdbarsuh@cip.informatik.uni-erlangen.de) and

+ * Volker Weiss (vrweiss@cip.informatik.uni-erlangen.de).

+ *

+ * My original implementation of evaluators was simplistic and didn't

+ * compute surface normal vectors properly.  Bernd and Volker applied

+ * used more sophisticated methods to get better results.

+ *

+ * Thanks guys!

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "colormac.h"

+#include "context.h"

+#include "eval.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_evaluators

+

+

+/*

+ * Return the number of components per control point for any type of

+ * evaluator.  Return 0 if bad target.

+ * See table 5.1 in the OpenGL 1.2 spec.

+ */

+GLuint _mesa_evaluator_components( GLenum target )

+{

+   switch (target) {

+      case GL_MAP1_VERTEX_3:		return 3;

+      case GL_MAP1_VERTEX_4:		return 4;

+      case GL_MAP1_INDEX:		return 1;

+      case GL_MAP1_COLOR_4:		return 4;

+      case GL_MAP1_NORMAL:		return 3;

+      case GL_MAP1_TEXTURE_COORD_1:	return 1;

+      case GL_MAP1_TEXTURE_COORD_2:	return 2;

+      case GL_MAP1_TEXTURE_COORD_3:	return 3;

+      case GL_MAP1_TEXTURE_COORD_4:	return 4;

+      case GL_MAP2_VERTEX_3:		return 3;

+      case GL_MAP2_VERTEX_4:		return 4;

+      case GL_MAP2_INDEX:		return 1;

+      case GL_MAP2_COLOR_4:		return 4;

+      case GL_MAP2_NORMAL:		return 3;

+      case GL_MAP2_TEXTURE_COORD_1:	return 1;

+      case GL_MAP2_TEXTURE_COORD_2:	return 2;

+      case GL_MAP2_TEXTURE_COORD_3:	return 3;

+      case GL_MAP2_TEXTURE_COORD_4:	return 4;

+      default:				break;

+   }

+

+   /* XXX need to check for the vertex program extension

+   if (!ctx->Extensions.NV_vertex_program)

+      return 0;

+   */

+

+   if (target >= GL_MAP1_VERTEX_ATTRIB0_4_NV &&

+       target <= GL_MAP1_VERTEX_ATTRIB15_4_NV)

+      return 4;

+

+   if (target >= GL_MAP2_VERTEX_ATTRIB0_4_NV &&

+       target <= GL_MAP2_VERTEX_ATTRIB15_4_NV)

+      return 4;

+

+   return 0;

+}

+

+

+/*

+ * Return pointer to the gl_1d_map struct for the named target.

+ */

+static struct gl_1d_map *

+get_1d_map( struct gl_context *ctx, GLenum target )

+{

+   switch (target) {

+      case GL_MAP1_VERTEX_3:

+         return &ctx->EvalMap.Map1Vertex3;

+      case GL_MAP1_VERTEX_4:

+         return &ctx->EvalMap.Map1Vertex4;

+      case GL_MAP1_INDEX:

+         return &ctx->EvalMap.Map1Index;

+      case GL_MAP1_COLOR_4:

+         return &ctx->EvalMap.Map1Color4;

+      case GL_MAP1_NORMAL:

+         return &ctx->EvalMap.Map1Normal;

+      case GL_MAP1_TEXTURE_COORD_1:

+         return &ctx->EvalMap.Map1Texture1;

+      case GL_MAP1_TEXTURE_COORD_2:

+         return &ctx->EvalMap.Map1Texture2;

+      case GL_MAP1_TEXTURE_COORD_3:

+         return &ctx->EvalMap.Map1Texture3;

+      case GL_MAP1_TEXTURE_COORD_4:

+         return &ctx->EvalMap.Map1Texture4;

+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:

+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:

+         if (!ctx->Extensions.NV_vertex_program)

+            return NULL;

+         return &ctx->EvalMap.Map1Attrib[target - GL_MAP1_VERTEX_ATTRIB0_4_NV];

+      default:

+         return NULL;

+   }

+}

+

+

+/*

+ * Return pointer to the gl_2d_map struct for the named target.

+ */

+static struct gl_2d_map *

+get_2d_map( struct gl_context *ctx, GLenum target )

+{

+   switch (target) {

+      case GL_MAP2_VERTEX_3:

+         return &ctx->EvalMap.Map2Vertex3;

+      case GL_MAP2_VERTEX_4:

+         return &ctx->EvalMap.Map2Vertex4;

+      case GL_MAP2_INDEX:

+         return &ctx->EvalMap.Map2Index;

+      case GL_MAP2_COLOR_4:

+         return &ctx->EvalMap.Map2Color4;

+      case GL_MAP2_NORMAL:

+         return &ctx->EvalMap.Map2Normal;

+      case GL_MAP2_TEXTURE_COORD_1:

+         return &ctx->EvalMap.Map2Texture1;

+      case GL_MAP2_TEXTURE_COORD_2:

+         return &ctx->EvalMap.Map2Texture2;

+      case GL_MAP2_TEXTURE_COORD_3:

+         return &ctx->EvalMap.Map2Texture3;

+      case GL_MAP2_TEXTURE_COORD_4:

+         return &ctx->EvalMap.Map2Texture4;

+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:

+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:

+         if (!ctx->Extensions.NV_vertex_program)

+            return NULL;

+         return &ctx->EvalMap.Map2Attrib[target - GL_MAP2_VERTEX_ATTRIB0_4_NV];

+      default:

+         return NULL;

+   }

+}

+

+

+/**********************************************************************/

+/***            Copy and deallocate control points                  ***/

+/**********************************************************************/

+

+

+/*

+ * Copy 1-parametric evaluator control points from user-specified

+ * memory space to a buffer of contiguous control points.

+ * \param see glMap1f for details

+ * \return pointer to buffer of contiguous control points or NULL if out

+ *          of memory.

+ */

+GLfloat *_mesa_copy_map_points1f( GLenum target, GLint ustride, GLint uorder,

+                                  const GLfloat *points )

+{

+   GLfloat *buffer, *p;

+   GLint i, k, size = _mesa_evaluator_components(target);

+

+   if (!points || !size)

+      return NULL;

+

+   buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));

+

+   if (buffer)

+      for (i = 0, p = buffer; i < uorder; i++, points += ustride)

+	for (k = 0; k < size; k++)

+	  *p++ = points[k];

+

+   return buffer;

+}

+

+

+

+/*

+ * Same as above but convert doubles to floats.

+ */

+GLfloat *_mesa_copy_map_points1d( GLenum target, GLint ustride, GLint uorder,

+                                  const GLdouble *points )

+{

+   GLfloat *buffer, *p;

+   GLint i, k, size = _mesa_evaluator_components(target);

+

+   if (!points || !size)

+      return NULL;

+

+   buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));

+

+   if (buffer)

+      for (i = 0, p = buffer; i < uorder; i++, points += ustride)

+	for (k = 0; k < size; k++)

+	  *p++ = (GLfloat) points[k];

+

+   return buffer;

+}

+

+

+

+/*

+ * Copy 2-parametric evaluator control points from user-specified

+ * memory space to a buffer of contiguous control points.

+ * Additional memory is allocated to be used by the horner and

+ * de Casteljau evaluation schemes.

+ *

+ * \param see glMap2f for details

+ * \return pointer to buffer of contiguous control points or NULL if out

+ *          of memory.

+ */

+GLfloat *_mesa_copy_map_points2f( GLenum target,

+                                  GLint ustride, GLint uorder,

+                                  GLint vstride, GLint vorder,

+                                  const GLfloat *points )

+{

+   GLfloat *buffer, *p;

+   GLint i, j, k, size, dsize, hsize;

+   GLint uinc;

+

+   size = _mesa_evaluator_components(target);

+

+   if (!points || size==0) {

+      return NULL;

+   }

+

+   /* max(uorder, vorder) additional points are used in      */

+   /* horner evaluation and uorder*vorder additional */

+   /* values are needed for de Casteljau                     */

+   dsize = (uorder == 2 && vorder == 2)? 0 : uorder*vorder;

+   hsize = (uorder > vorder ? uorder : vorder)*size;

+

+   if(hsize>dsize)

+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+hsize)*sizeof(GLfloat));

+   else

+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+dsize)*sizeof(GLfloat));

+

+   /* compute the increment value for the u-loop */

+   uinc = ustride - vorder*vstride;

+

+   if (buffer)

+      for (i=0, p=buffer; i<uorder; i++, points += uinc)

+	 for (j=0; j<vorder; j++, points += vstride)

+	    for (k=0; k<size; k++)

+	       *p++ = points[k];

+

+   return buffer;

+}

+

+

+

+/*

+ * Same as above but convert doubles to floats.

+ */

+GLfloat *_mesa_copy_map_points2d(GLenum target,

+                                 GLint ustride, GLint uorder,

+                                 GLint vstride, GLint vorder,

+                                 const GLdouble *points )

+{

+   GLfloat *buffer, *p;

+   GLint i, j, k, size, hsize, dsize;

+   GLint uinc;

+

+   size = _mesa_evaluator_components(target);

+

+   if (!points || size==0) {

+      return NULL;

+   }

+

+   /* max(uorder, vorder) additional points are used in      */

+   /* horner evaluation and uorder*vorder additional */

+   /* values are needed for de Casteljau                     */

+   dsize = (uorder == 2 && vorder == 2)? 0 : uorder*vorder;

+   hsize = (uorder > vorder ? uorder : vorder)*size;

+

+   if(hsize>dsize)

+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+hsize)*sizeof(GLfloat));

+   else

+     buffer = (GLfloat *) MALLOC((uorder*vorder*size+dsize)*sizeof(GLfloat));

+

+   /* compute the increment value for the u-loop */

+   uinc = ustride - vorder*vstride;

+

+   if (buffer)

+      for (i=0, p=buffer; i<uorder; i++, points += uinc)

+	 for (j=0; j<vorder; j++, points += vstride)

+	    for (k=0; k<size; k++)

+	       *p++ = (GLfloat) points[k];

+

+   return buffer;

+}

+

+

+

+

+/**********************************************************************/

+/***                      API entry points                          ***/

+/**********************************************************************/

+

+

+/*

+ * This does the work of glMap1[fd].

+ */

+static void

+map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,

+     GLint uorder, const GLvoid *points, GLenum type )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint k;

+   GLfloat *pnts;

+   struct gl_1d_map *map = NULL;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   ASSERT(type == GL_FLOAT || type == GL_DOUBLE);

+

+   if (u1 == u2) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(u1,u2)" );

+      return;

+   }

+   if (uorder < 1 || uorder > MAX_EVAL_ORDER) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(order)" );

+      return;

+   }

+   if (!points) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(points)" );

+      return;

+   }

+

+   k = _mesa_evaluator_components( target );

+   if (k == 0) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap1(target)" );

+   }

+

+   if (ustride < k) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap1(stride)" );

+      return;

+   }

+

+   if (ctx->Texture.CurrentUnit != 0) {

+      /* See OpenGL 1.2.1 spec, section F.2.13 */

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );

+      return;

+   }

+

+   map = get_1d_map(ctx, target);

+   if (!map) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap1(target)" );

+      return;

+   }

+

+   /* make copy of the control points */

+   if (type == GL_FLOAT)

+      pnts = _mesa_copy_map_points1f(target, ustride, uorder, (GLfloat*) points);

+   else

+      pnts = _mesa_copy_map_points1d(target, ustride, uorder, (GLdouble*) points);

+

+

+   FLUSH_VERTICES(ctx, _NEW_EVAL);

+   map->Order = uorder;

+   map->u1 = u1;

+   map->u2 = u2;

+   map->du = 1.0F / (u2 - u1);

+   if (map->Points)

+      FREE( map->Points );

+   map->Points = pnts;

+}

+

+

+

+static void GLAPIENTRY

+_mesa_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride,

+             GLint order, const GLfloat *points )

+{

+   map1(target, u1, u2, stride, order, points, GL_FLOAT);

+}

+

+

+static void GLAPIENTRY

+_mesa_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride,

+             GLint order, const GLdouble *points )

+{

+   map1(target, (GLfloat) u1, (GLfloat) u2, stride, order, points, GL_DOUBLE);

+}

+

+

+static void

+map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,

+      GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,

+      const GLvoid *points, GLenum type )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint k;

+   GLfloat *pnts;

+   struct gl_2d_map *map = NULL;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   ASSERT(type == GL_FLOAT || type == GL_DOUBLE);

+

+   if (u1==u2) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(u1,u2)" );

+      return;

+   }

+

+   if (v1==v2) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(v1,v2)" );

+      return;

+   }

+

+   if (uorder<1 || uorder>MAX_EVAL_ORDER) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(uorder)" );

+      return;

+   }

+

+   if (vorder<1 || vorder>MAX_EVAL_ORDER) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(vorder)" );

+      return;

+   }

+

+   k = _mesa_evaluator_components( target );

+   if (k==0) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap2(target)" );

+   }

+

+   if (ustride < k) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(ustride)" );

+      return;

+   }

+   if (vstride < k) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMap2(vstride)" );

+      return;

+   }

+

+   if (ctx->Texture.CurrentUnit != 0) {

+      /* See OpenGL 1.2.1 spec, section F.2.13 */

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glMap2(ACTIVE_TEXTURE != 0)" );

+      return;

+   }

+

+   map = get_2d_map(ctx, target);

+   if (!map) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glMap2(target)" );

+      return;

+   }

+

+   /* make copy of the control points */

+   if (type == GL_FLOAT)

+      pnts = _mesa_copy_map_points2f(target, ustride, uorder,

+                                  vstride, vorder, (GLfloat*) points);

+   else

+      pnts = _mesa_copy_map_points2d(target, ustride, uorder,

+                                  vstride, vorder, (GLdouble*) points);

+

+

+   FLUSH_VERTICES(ctx, _NEW_EVAL);

+   map->Uorder = uorder;

+   map->u1 = u1;

+   map->u2 = u2;

+   map->du = 1.0F / (u2 - u1);

+   map->Vorder = vorder;

+   map->v1 = v1;

+   map->v2 = v2;

+   map->dv = 1.0F / (v2 - v1);

+   if (map->Points)

+      FREE( map->Points );

+   map->Points = pnts;

+}

+

+

+static void GLAPIENTRY

+_mesa_Map2f( GLenum target,

+             GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,

+             GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,

+             const GLfloat *points)

+{

+   map2(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder,

+        points, GL_FLOAT);

+}

+

+

+static void GLAPIENTRY

+_mesa_Map2d( GLenum target,

+             GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,

+             GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,

+             const GLdouble *points )

+{

+   map2(target, (GLfloat) u1, (GLfloat) u2, ustride, uorder, 

+	(GLfloat) v1, (GLfloat) v2, vstride, vorder, points, GL_DOUBLE);

+}

+

+

+

+static void GLAPIENTRY

+_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_1d_map *map1d;

+   struct gl_2d_map *map2d;

+   GLint i, n;

+   GLfloat *data;

+   GLuint comps;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   comps = _mesa_evaluator_components(target);

+   if (!comps) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapdv(target)" );

+      return;

+   }

+

+   map1d = get_1d_map(ctx, target);

+   map2d = get_2d_map(ctx, target);

+   ASSERT(map1d || map2d);

+

+   switch (query) {

+      case GL_COEFF:

+         if (map1d) {

+            data = map1d->Points;

+            n = map1d->Order * comps;

+         }

+         else {

+            data = map2d->Points;

+            n = map2d->Uorder * map2d->Vorder * comps;

+         }

+	 if (data) {

+	    for (i=0;i<n;i++) {

+	       v[i] = data[i];

+	    }

+	 }

+         break;

+      case GL_ORDER:

+         if (map1d) {

+            v[0] = (GLdouble) map1d->Order;

+         }

+         else {

+            v[0] = (GLdouble) map2d->Uorder;

+            v[1] = (GLdouble) map2d->Vorder;

+         }

+         break;

+      case GL_DOMAIN:

+         if (map1d) {

+            v[0] = (GLdouble) map1d->u1;

+            v[1] = (GLdouble) map1d->u2;

+         }

+         else {

+            v[0] = (GLdouble) map2d->u1;

+            v[1] = (GLdouble) map2d->u2;

+            v[2] = (GLdouble) map2d->v1;

+            v[3] = (GLdouble) map2d->v2;

+         }

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapdv(query)" );

+   }

+}

+

+

+static void GLAPIENTRY

+_mesa_GetMapfv( GLenum target, GLenum query, GLfloat *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_1d_map *map1d;

+   struct gl_2d_map *map2d;

+   GLint i, n;

+   GLfloat *data;

+   GLuint comps;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   comps = _mesa_evaluator_components(target);

+   if (!comps) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapfv(target)" );

+      return;

+   }

+

+   map1d = get_1d_map(ctx, target);

+   map2d = get_2d_map(ctx, target);

+   ASSERT(map1d || map2d);

+

+   switch (query) {

+      case GL_COEFF:

+         if (map1d) {

+            data = map1d->Points;

+            n = map1d->Order * comps;

+         }

+         else {

+            data = map2d->Points;

+            n = map2d->Uorder * map2d->Vorder * comps;

+         }

+	 if (data) {

+	    for (i=0;i<n;i++) {

+	       v[i] = data[i];

+	    }

+	 }

+         break;

+      case GL_ORDER:

+         if (map1d) {

+            v[0] = (GLfloat) map1d->Order;

+         }

+         else {

+            v[0] = (GLfloat) map2d->Uorder;

+            v[1] = (GLfloat) map2d->Vorder;

+         }

+         break;

+      case GL_DOMAIN:

+         if (map1d) {

+            v[0] = map1d->u1;

+            v[1] = map1d->u2;

+         }

+         else {

+            v[0] = map2d->u1;

+            v[1] = map2d->u2;

+            v[2] = map2d->v1;

+            v[3] = map2d->v2;

+         }

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapfv(query)" );

+   }

+}

+

+

+static void GLAPIENTRY

+_mesa_GetMapiv( GLenum target, GLenum query, GLint *v )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_1d_map *map1d;

+   struct gl_2d_map *map2d;

+   GLuint i, n;

+   GLfloat *data;

+   GLuint comps;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   comps = _mesa_evaluator_components(target);

+   if (!comps) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapiv(target)" );

+      return;

+   }

+

+   map1d = get_1d_map(ctx, target);

+   map2d = get_2d_map(ctx, target);

+   ASSERT(map1d || map2d);

+

+   switch (query) {

+      case GL_COEFF:

+         if (map1d) {

+            data = map1d->Points;

+            n = map1d->Order * comps;

+         }

+         else {

+            data = map2d->Points;

+            n = map2d->Uorder * map2d->Vorder * comps;

+         }

+	 if (data) {

+	    for (i=0;i<n;i++) {

+	       v[i] = IROUND(data[i]);

+	    }

+	 }

+         break;

+      case GL_ORDER:

+         if (map1d) {

+            v[0] = map1d->Order;

+         }

+         else {

+            v[0] = map2d->Uorder;

+            v[1] = map2d->Vorder;

+         }

+         break;

+      case GL_DOMAIN:

+         if (map1d) {

+            v[0] = IROUND(map1d->u1);

+            v[1] = IROUND(map1d->u2);

+         }

+         else {

+            v[0] = IROUND(map2d->u1);

+            v[1] = IROUND(map2d->u2);

+            v[2] = IROUND(map2d->v1);

+            v[3] = IROUND(map2d->v2);

+         }

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMapiv(query)" );

+   }

+}

+

+

+

+static void GLAPIENTRY

+_mesa_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (un<1) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid1f" );

+      return;

+   }

+   FLUSH_VERTICES(ctx, _NEW_EVAL);

+   ctx->Eval.MapGrid1un = un;

+   ctx->Eval.MapGrid1u1 = u1;

+   ctx->Eval.MapGrid1u2 = u2;

+   ctx->Eval.MapGrid1du = (u2 - u1) / (GLfloat) un;

+}

+

+

+static void GLAPIENTRY

+_mesa_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 )

+{

+   _mesa_MapGrid1f( un, (GLfloat) u1, (GLfloat) u2 );

+}

+

+

+static void GLAPIENTRY

+_mesa_MapGrid2f( GLint un, GLfloat u1, GLfloat u2,

+                 GLint vn, GLfloat v1, GLfloat v2 )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (un<1) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid2f(un)" );

+      return;

+   }

+   if (vn<1) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glMapGrid2f(vn)" );

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_EVAL);

+   ctx->Eval.MapGrid2un = un;

+   ctx->Eval.MapGrid2u1 = u1;

+   ctx->Eval.MapGrid2u2 = u2;

+   ctx->Eval.MapGrid2du = (u2 - u1) / (GLfloat) un;

+   ctx->Eval.MapGrid2vn = vn;

+   ctx->Eval.MapGrid2v1 = v1;

+   ctx->Eval.MapGrid2v2 = v2;

+   ctx->Eval.MapGrid2dv = (v2 - v1) / (GLfloat) vn;

+}

+

+

+static void GLAPIENTRY

+_mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,

+                 GLint vn, GLdouble v1, GLdouble v2 )

+{

+   _mesa_MapGrid2f( un, (GLfloat) u1, (GLfloat) u2, 

+		    vn, (GLfloat) v1, (GLfloat) v2 );

+}

+

+

+void

+_mesa_install_eval_vtxfmt(struct _glapi_table *disp,

+                          const GLvertexformat *vfmt)

+{

+   SET_EvalCoord1f(disp, vfmt->EvalCoord1f);

+   SET_EvalCoord1fv(disp, vfmt->EvalCoord1fv);

+   SET_EvalCoord2f(disp, vfmt->EvalCoord2f);

+   SET_EvalCoord2fv(disp, vfmt->EvalCoord2fv);

+   SET_EvalPoint1(disp, vfmt->EvalPoint1);

+   SET_EvalPoint2(disp, vfmt->EvalPoint2);

+

+   SET_EvalMesh1(disp, vfmt->EvalMesh1);

+   SET_EvalMesh2(disp, vfmt->EvalMesh2);

+}

+

+

+void

+_mesa_init_eval_dispatch(struct _glapi_table *disp)

+{

+   SET_GetMapdv(disp, _mesa_GetMapdv);

+   SET_GetMapfv(disp, _mesa_GetMapfv);

+   SET_GetMapiv(disp, _mesa_GetMapiv);

+   SET_Map1d(disp, _mesa_Map1d);

+   SET_Map1f(disp, _mesa_Map1f);

+   SET_Map2d(disp, _mesa_Map2d);

+   SET_Map2f(disp, _mesa_Map2f);

+   SET_MapGrid1d(disp, _mesa_MapGrid1d);

+   SET_MapGrid1f(disp, _mesa_MapGrid1f);

+   SET_MapGrid2d(disp, _mesa_MapGrid2d);

+   SET_MapGrid2f(disp, _mesa_MapGrid2f);

+}

+

+

+#endif /* FEATURE_evaluators */

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+/**

+ * Initialize a 1-D evaluator map.

+ */

+static void

+init_1d_map( struct gl_1d_map *map, int n, const float *initial )

+{

+   map->Order = 1;

+   map->u1 = 0.0;

+   map->u2 = 1.0;

+   map->Points = (GLfloat *) MALLOC(n * sizeof(GLfloat));

+   if (map->Points) {

+      GLint i;

+      for (i=0;i<n;i++)

+         map->Points[i] = initial[i];

+   }

+}

+

+

+/**

+ * Initialize a 2-D evaluator map 

+ */

+static void

+init_2d_map( struct gl_2d_map *map, int n, const float *initial )

+{

+   map->Uorder = 1;

+   map->Vorder = 1;

+   map->u1 = 0.0;

+   map->u2 = 1.0;

+   map->v1 = 0.0;

+   map->v2 = 1.0;

+   map->Points = (GLfloat *) MALLOC(n * sizeof(GLfloat));

+   if (map->Points) {

+      GLint i;

+      for (i=0;i<n;i++)

+         map->Points[i] = initial[i];

+   }

+}

+

+

+void _mesa_init_eval( struct gl_context *ctx )

+{

+   int i;

+

+   /* Evaluators group */

+   ctx->Eval.Map1Color4 = GL_FALSE;

+   ctx->Eval.Map1Index = GL_FALSE;

+   ctx->Eval.Map1Normal = GL_FALSE;

+   ctx->Eval.Map1TextureCoord1 = GL_FALSE;

+   ctx->Eval.Map1TextureCoord2 = GL_FALSE;

+   ctx->Eval.Map1TextureCoord3 = GL_FALSE;

+   ctx->Eval.Map1TextureCoord4 = GL_FALSE;

+   ctx->Eval.Map1Vertex3 = GL_FALSE;

+   ctx->Eval.Map1Vertex4 = GL_FALSE;

+   memset(ctx->Eval.Map1Attrib, 0, sizeof(ctx->Eval.Map1Attrib));

+   ctx->Eval.Map2Color4 = GL_FALSE;

+   ctx->Eval.Map2Index = GL_FALSE;

+   ctx->Eval.Map2Normal = GL_FALSE;

+   ctx->Eval.Map2TextureCoord1 = GL_FALSE;

+   ctx->Eval.Map2TextureCoord2 = GL_FALSE;

+   ctx->Eval.Map2TextureCoord3 = GL_FALSE;

+   ctx->Eval.Map2TextureCoord4 = GL_FALSE;

+   ctx->Eval.Map2Vertex3 = GL_FALSE;

+   ctx->Eval.Map2Vertex4 = GL_FALSE;

+   memset(ctx->Eval.Map2Attrib, 0, sizeof(ctx->Eval.Map2Attrib));

+   ctx->Eval.AutoNormal = GL_FALSE;

+   ctx->Eval.MapGrid1un = 1;

+   ctx->Eval.MapGrid1u1 = 0.0;

+   ctx->Eval.MapGrid1u2 = 1.0;

+   ctx->Eval.MapGrid2un = 1;

+   ctx->Eval.MapGrid2vn = 1;

+   ctx->Eval.MapGrid2u1 = 0.0;

+   ctx->Eval.MapGrid2u2 = 1.0;

+   ctx->Eval.MapGrid2v1 = 0.0;

+   ctx->Eval.MapGrid2v2 = 1.0;

+

+   /* Evaluator data */

+   {

+      static GLfloat vertex[4] = { 0.0, 0.0, 0.0, 1.0 };

+      static GLfloat normal[3] = { 0.0, 0.0, 1.0 };

+      static GLfloat index[1] = { 1.0 };

+      static GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 };

+      static GLfloat texcoord[4] = { 0.0, 0.0, 0.0, 1.0 };

+      static GLfloat attrib[4] = { 0.0, 0.0, 0.0, 1.0 };

+

+      init_1d_map( &ctx->EvalMap.Map1Vertex3, 3, vertex );

+      init_1d_map( &ctx->EvalMap.Map1Vertex4, 4, vertex );

+      init_1d_map( &ctx->EvalMap.Map1Index, 1, index );

+      init_1d_map( &ctx->EvalMap.Map1Color4, 4, color );

+      init_1d_map( &ctx->EvalMap.Map1Normal, 3, normal );

+      init_1d_map( &ctx->EvalMap.Map1Texture1, 1, texcoord );

+      init_1d_map( &ctx->EvalMap.Map1Texture2, 2, texcoord );

+      init_1d_map( &ctx->EvalMap.Map1Texture3, 3, texcoord );

+      init_1d_map( &ctx->EvalMap.Map1Texture4, 4, texcoord );

+      for (i = 0; i < 16; i++)

+         init_1d_map( ctx->EvalMap.Map1Attrib + i, 4, attrib );

+

+      init_2d_map( &ctx->EvalMap.Map2Vertex3, 3, vertex );

+      init_2d_map( &ctx->EvalMap.Map2Vertex4, 4, vertex );

+      init_2d_map( &ctx->EvalMap.Map2Index, 1, index );

+      init_2d_map( &ctx->EvalMap.Map2Color4, 4, color );

+      init_2d_map( &ctx->EvalMap.Map2Normal, 3, normal );

+      init_2d_map( &ctx->EvalMap.Map2Texture1, 1, texcoord );

+      init_2d_map( &ctx->EvalMap.Map2Texture2, 2, texcoord );

+      init_2d_map( &ctx->EvalMap.Map2Texture3, 3, texcoord );

+      init_2d_map( &ctx->EvalMap.Map2Texture4, 4, texcoord );

+      for (i = 0; i < 16; i++)

+         init_2d_map( ctx->EvalMap.Map2Attrib + i, 4, attrib );

+   }

+}

+

+

+void _mesa_free_eval_data( struct gl_context *ctx )

+{

+   int i;

+

+   /* Free evaluator data */

+   if (ctx->EvalMap.Map1Vertex3.Points)

+      FREE( ctx->EvalMap.Map1Vertex3.Points );

+   if (ctx->EvalMap.Map1Vertex4.Points)

+      FREE( ctx->EvalMap.Map1Vertex4.Points );

+   if (ctx->EvalMap.Map1Index.Points)

+      FREE( ctx->EvalMap.Map1Index.Points );

+   if (ctx->EvalMap.Map1Color4.Points)

+      FREE( ctx->EvalMap.Map1Color4.Points );

+   if (ctx->EvalMap.Map1Normal.Points)

+      FREE( ctx->EvalMap.Map1Normal.Points );

+   if (ctx->EvalMap.Map1Texture1.Points)

+      FREE( ctx->EvalMap.Map1Texture1.Points );

+   if (ctx->EvalMap.Map1Texture2.Points)

+      FREE( ctx->EvalMap.Map1Texture2.Points );

+   if (ctx->EvalMap.Map1Texture3.Points)

+      FREE( ctx->EvalMap.Map1Texture3.Points );

+   if (ctx->EvalMap.Map1Texture4.Points)

+      FREE( ctx->EvalMap.Map1Texture4.Points );

+   for (i = 0; i < 16; i++)

+      FREE((ctx->EvalMap.Map1Attrib[i].Points));

+

+   if (ctx->EvalMap.Map2Vertex3.Points)

+      FREE( ctx->EvalMap.Map2Vertex3.Points );

+   if (ctx->EvalMap.Map2Vertex4.Points)

+      FREE( ctx->EvalMap.Map2Vertex4.Points );

+   if (ctx->EvalMap.Map2Index.Points)

+      FREE( ctx->EvalMap.Map2Index.Points );

+   if (ctx->EvalMap.Map2Color4.Points)

+      FREE( ctx->EvalMap.Map2Color4.Points );

+   if (ctx->EvalMap.Map2Normal.Points)

+      FREE( ctx->EvalMap.Map2Normal.Points );

+   if (ctx->EvalMap.Map2Texture1.Points)

+      FREE( ctx->EvalMap.Map2Texture1.Points );

+   if (ctx->EvalMap.Map2Texture2.Points)

+      FREE( ctx->EvalMap.Map2Texture2.Points );

+   if (ctx->EvalMap.Map2Texture3.Points)

+      FREE( ctx->EvalMap.Map2Texture3.Points );

+   if (ctx->EvalMap.Map2Texture4.Points)

+      FREE( ctx->EvalMap.Map2Texture4.Points );

+   for (i = 0; i < 16; i++)

+      FREE((ctx->EvalMap.Map2Attrib[i].Points));

+}

diff --git a/mesalib/src/mesa/main/eval.h b/mesalib/src/mesa/main/eval.h
index ffd1bab76..b92e41e9f 100644
--- a/mesalib/src/mesa/main/eval.h
+++ b/mesalib/src/mesa/main/eval.h
@@ -1,110 +1,110 @@
-/**
- * \file eval.h
- * Eval operations.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 EVAL_H
-#define EVAL_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_evaluators
-
-#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl)         \
-   do {                                            \
-      (vfmt)->EvalCoord1f  = impl ## EvalCoord1f;  \
-      (vfmt)->EvalCoord1fv = impl ## EvalCoord1fv; \
-      (vfmt)->EvalCoord2f  = impl ## EvalCoord2f;  \
-      (vfmt)->EvalCoord2fv = impl ## EvalCoord2fv; \
-      (vfmt)->EvalPoint1   = impl ## EvalPoint1;   \
-      (vfmt)->EvalPoint2   = impl ## EvalPoint2;   \
-      (vfmt)->EvalMesh1    = impl ## EvalMesh1;    \
-      (vfmt)->EvalMesh2    = impl ## EvalMesh2;    \
-   } while (0)
-
-extern GLuint _mesa_evaluator_components( GLenum target );
-
-
-extern void gl_free_control_points( GLcontext *ctx,
-                                    GLenum target, GLfloat *data );
-
-
-extern GLfloat *_mesa_copy_map_points1f( GLenum target,
-                                      GLint ustride, GLint uorder,
-                                      const GLfloat *points );
-
-extern GLfloat *_mesa_copy_map_points1d( GLenum target,
-                                      GLint ustride, GLint uorder,
-                                      const GLdouble *points );
-
-extern GLfloat *_mesa_copy_map_points2f( GLenum target,
-                                      GLint ustride, GLint uorder,
-                                      GLint vstride, GLint vorder,
-                                      const GLfloat *points );
-
-extern GLfloat *_mesa_copy_map_points2d(GLenum target,
-                                     GLint ustride, GLint uorder,
-                                     GLint vstride, GLint vorder,
-                                     const GLdouble *points );
-
-extern void
-_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
-                          const GLvertexformat *vfmt);
-
-extern void
-_mesa_init_eval_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_evaluators */
-
-#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0)
-
-static INLINE void
-_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
-                          const GLvertexformat *vfmt)
-{
-}
-
-static INLINE void
-_mesa_init_eval_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_evaluators */
-
-extern void _mesa_init_eval( GLcontext *ctx );
-extern void _mesa_free_eval_data( GLcontext *ctx );
-
-
-#endif /* EVAL_H */
+/**

+ * \file eval.h

+ * Eval operations.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 EVAL_H

+#define EVAL_H

+

+

+#include "main/mtypes.h"

+

+

+#if FEATURE_evaluators

+

+#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl)         \

+   do {                                            \

+      (vfmt)->EvalCoord1f  = impl ## EvalCoord1f;  \

+      (vfmt)->EvalCoord1fv = impl ## EvalCoord1fv; \

+      (vfmt)->EvalCoord2f  = impl ## EvalCoord2f;  \

+      (vfmt)->EvalCoord2fv = impl ## EvalCoord2fv; \

+      (vfmt)->EvalPoint1   = impl ## EvalPoint1;   \

+      (vfmt)->EvalPoint2   = impl ## EvalPoint2;   \

+      (vfmt)->EvalMesh1    = impl ## EvalMesh1;    \

+      (vfmt)->EvalMesh2    = impl ## EvalMesh2;    \

+   } while (0)

+

+extern GLuint _mesa_evaluator_components( GLenum target );

+

+

+extern void gl_free_control_points( struct gl_context *ctx,

+                                    GLenum target, GLfloat *data );

+

+

+extern GLfloat *_mesa_copy_map_points1f( GLenum target,

+                                      GLint ustride, GLint uorder,

+                                      const GLfloat *points );

+

+extern GLfloat *_mesa_copy_map_points1d( GLenum target,

+                                      GLint ustride, GLint uorder,

+                                      const GLdouble *points );

+

+extern GLfloat *_mesa_copy_map_points2f( GLenum target,

+                                      GLint ustride, GLint uorder,

+                                      GLint vstride, GLint vorder,

+                                      const GLfloat *points );

+

+extern GLfloat *_mesa_copy_map_points2d(GLenum target,

+                                     GLint ustride, GLint uorder,

+                                     GLint vstride, GLint vorder,

+                                     const GLdouble *points );

+

+extern void

+_mesa_install_eval_vtxfmt(struct _glapi_table *disp,

+                          const GLvertexformat *vfmt);

+

+extern void

+_mesa_init_eval_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_evaluators */

+

+#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0)

+

+static INLINE void

+_mesa_install_eval_vtxfmt(struct _glapi_table *disp,

+                          const GLvertexformat *vfmt)

+{

+}

+

+static INLINE void

+_mesa_init_eval_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_evaluators */

+

+extern void _mesa_init_eval( struct gl_context *ctx );

+extern void _mesa_free_eval_data( struct gl_context *ctx );

+

+

+#endif /* EVAL_H */

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 080fa98df..81978b3c1 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -1,989 +1,987 @@
-/*
- * 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.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "extensions.h"
-#include "mtypes.h"
-
-
-#define F(x) offsetof(struct gl_extensions, x)
-#define ON GL_TRUE
-#define OFF GL_FALSE
-
-
-/*
- * Note: The GL_MESAX_* extensions are placeholders for future ARB extensions.
- */
-static const struct {
-   GLboolean enabled;
-   const char *name;
-   int flag_offset;
-} default_extensions[] = {
-   { OFF, "GL_ARB_blend_func_extended",        F(ARB_blend_func_extended) },
-   { OFF, "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },
-   { OFF, "GL_ARB_depth_buffer_float",         F(ARB_depth_buffer_float) },
-   { OFF, "GL_ARB_depth_clamp",                F(ARB_depth_clamp) },
-   { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
-   { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
-   { OFF, "GL_ARB_draw_elements_base_vertex",  F(ARB_draw_elements_base_vertex) },
-   { OFF, "GL_ARB_draw_instanced",             F(ARB_draw_instanced) },
-   { OFF, "GL_ARB_fragment_coord_conventions", F(ARB_fragment_coord_conventions) },
-   { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
-   { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
-   { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
-   { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },
-   { OFF, "GL_ARB_explicit_attrib_location",   F(ARB_explicit_attrib_location) },
-   /* TODO: reenable this when the new GLSL compiler actually supports them */
-   /* { OFF, "GL_ARB_geometry_shader4",           F(ARB_geometry_shader4) }, */
-   { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
-   { OFF, "GL_ARB_half_float_vertex",          F(ARB_half_float_vertex) },
-   { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
-   { OFF, "GL_ARB_instanced_arrays",           F(ARB_instanced_arrays) },
-   { OFF, "GL_ARB_map_buffer_range",           F(ARB_map_buffer_range) },
-   { ON,  "GL_ARB_multisample",                F(ARB_multisample) },
-   { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
-   { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },
-   { OFF, "GL_ARB_occlusion_query2",           F(ARB_occlusion_query2) },
-   { OFF, "GL_ARB_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
-   { OFF, "GL_ARB_point_parameters",           F(EXT_point_parameters) },
-   { OFF, "GL_ARB_point_sprite",               F(ARB_point_sprite) },
-   { OFF, "GL_ARB_provoking_vertex",           F(EXT_provoking_vertex) },
-   { OFF, "GL_ARB_sampler_objects",            F(ARB_sampler_objects) },
-   { OFF, "GL_ARB_seamless_cube_map",          F(ARB_seamless_cube_map) },
-   { OFF, "GL_ARB_shader_objects",             F(ARB_shader_objects) },
-   { OFF, "GL_ARB_shading_language_100",       F(ARB_shading_language_100) },
-   { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
-   { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
-   { OFF, "GL_ARB_sync",                       F(ARB_sync) },
-   { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
-   { OFF, "GL_ARB_texture_buffer_object",      F(ARB_texture_buffer_object) },
-   { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },
-   { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
-   { OFF, "GL_ARB_texture_env_add",            F(EXT_texture_env_add) },
-   { OFF, "GL_ARB_texture_env_combine",        F(ARB_texture_env_combine) },
-   { OFF, "GL_ARB_texture_env_crossbar",       F(ARB_texture_env_crossbar) },
-   { OFF, "GL_ARB_texture_env_dot3",           F(ARB_texture_env_dot3) },
-   { OFF, "GL_MESAX_texture_float",            F(ARB_texture_float) },
-   { OFF, "GL_ARB_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
-   { OFF, "GL_ARB_texture_multisample",        F(ARB_texture_multisample) },
-   { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},
-   { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },
-   { OFF, "GL_ARB_texture_rg",                 F(ARB_texture_rg) },
-   { OFF, "GL_ARB_texture_rgb10_a2ui",         F(ARB_texture_rgb10_a2ui) },
-   { OFF, "GL_ARB_texture_swizzle",            F(EXT_texture_swizzle) },
-   { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },
-   { OFF, "GL_ARB_transform_feedback2",        F(ARB_transform_feedback2) },
-   { OFF, "GL_ARB_uniform_buffer_object",      F(ARB_uniform_buffer_object) },
-   { OFF, "GL_ARB_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
-   { OFF, "GL_ARB_vertex_array_object",        F(ARB_vertex_array_object) },
-   { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },
-   { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },
-   { OFF, "GL_ARB_vertex_shader",              F(ARB_vertex_shader) },
-   { OFF, "GL_ARB_vertex_type_2_10_10_10_rev", F(ARB_vertex_type_2_10_10_10_rev) },
-   { ON,  "GL_ARB_window_pos",                 F(ARB_window_pos) },
-   { ON,  "GL_EXT_abgr",                       F(EXT_abgr) },
-   { ON,  "GL_EXT_bgra",                       F(EXT_bgra) },
-   { OFF, "GL_EXT_blend_color",                F(EXT_blend_color) },
-   { OFF, "GL_EXT_blend_equation_separate",    F(EXT_blend_equation_separate) },
-   { OFF, "GL_EXT_blend_func_separate",        F(EXT_blend_func_separate) },
-   { OFF, "GL_EXT_blend_logic_op",             F(EXT_blend_logic_op) },
-   { OFF, "GL_EXT_blend_minmax",               F(EXT_blend_minmax) },
-   { OFF, "GL_EXT_blend_subtract",             F(EXT_blend_subtract) },
-   { OFF, "GL_EXT_clip_volume_hint",           F(EXT_clip_volume_hint) },
-   { OFF, "GL_EXT_cull_vertex",                F(EXT_cull_vertex) },
-   { ON,  "GL_EXT_compiled_vertex_array",      F(EXT_compiled_vertex_array) },
-   { OFF, "GL_EXT_convolution",                F(EXT_convolution) },
-   { ON,  "GL_EXT_copy_texture",               F(EXT_copy_texture) },
-   { OFF, "GL_EXT_depth_bounds_test",          F(EXT_depth_bounds_test) },
-   { OFF, "GL_EXT_draw_buffers2",              F(EXT_draw_buffers2) },
-   { OFF, "GL_EXT_draw_instanced",             F(ARB_draw_instanced) },
-   { ON,  "GL_EXT_draw_range_elements",        F(EXT_draw_range_elements) },
-   { OFF, "GL_EXT_framebuffer_blit",           F(EXT_framebuffer_blit) },
-   { OFF, "GL_EXT_framebuffer_multisample",    F(EXT_framebuffer_multisample) },
-   { OFF, "GL_EXT_framebuffer_object",         F(EXT_framebuffer_object) },
-   { OFF, "GL_EXT_framebuffer_sRGB",           F(EXT_framebuffer_sRGB) },
-   { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },
-   { OFF, "GL_EXT_gpu_program_parameters",     F(EXT_gpu_program_parameters) },
-   { OFF, "GL_EXT_histogram",                  F(EXT_histogram) },
-   { ON,  "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
-   { OFF, "GL_EXT_packed_depth_stencil",       F(EXT_packed_depth_stencil) },
-   { OFF, "GL_EXT_packed_float",               F(EXT_packed_float) },
-   { ON,  "GL_EXT_packed_pixels",              F(EXT_packed_pixels) },
-   { OFF, "GL_EXT_paletted_texture",           F(EXT_paletted_texture) },
-   { OFF, "GL_EXT_pixel_buffer_object",        F(EXT_pixel_buffer_object) },
-   { OFF, "GL_EXT_point_parameters",           F(EXT_point_parameters) },
-   { ON,  "GL_EXT_polygon_offset",             F(EXT_polygon_offset) },
-   { OFF, "GL_EXT_provoking_vertex",           F(EXT_provoking_vertex) },
-   { ON,  "GL_EXT_rescale_normal",             F(EXT_rescale_normal) },
-   { OFF, "GL_EXT_secondary_color",            F(EXT_secondary_color) },
-   { ON,  "GL_EXT_separate_specular_color",    F(EXT_separate_specular_color) },
-   { OFF, "GL_EXT_shadow_funcs",               F(EXT_shadow_funcs) },
-   { OFF, "GL_EXT_shared_texture_palette",     F(EXT_shared_texture_palette) },
-   { OFF, "GL_EXT_stencil_two_side",           F(EXT_stencil_two_side) },
-   { OFF, "GL_EXT_stencil_wrap",               F(EXT_stencil_wrap) },
-   { ON,  "GL_EXT_subtexture",                 F(EXT_subtexture) },
-   { ON,  "GL_EXT_texture",                    F(EXT_texture) },
-   { ON,  "GL_EXT_texture3D",                  F(EXT_texture3D) },
-   { OFF, "GL_EXT_texture_array",              F(EXT_texture_array) },
-   { OFF, "GL_EXT_texture_compression_s3tc",   F(EXT_texture_compression_s3tc) },
-   { OFF, "GL_EXT_texture_compression_rgtc",   F(EXT_texture_compression_rgtc) },
-   { OFF, "GL_EXT_texture_cube_map",           F(ARB_texture_cube_map) },
-   { ON,  "GL_EXT_texture_edge_clamp",         F(SGIS_texture_edge_clamp) },
-   { OFF, "GL_EXT_texture_env_add",            F(EXT_texture_env_add) },
-   { OFF, "GL_EXT_texture_env_combine",        F(EXT_texture_env_combine) },
-   { OFF, "GL_EXT_texture_env_dot3",           F(EXT_texture_env_dot3) },
-   { OFF, "GL_EXT_texture_filter_anisotropic", F(EXT_texture_filter_anisotropic) },
-   { OFF, "GL_EXT_texture_integer",            F(EXT_texture_integer) },
-   { OFF, "GL_EXT_texture_lod_bias",           F(EXT_texture_lod_bias) },
-   { OFF, "GL_EXT_texture_mirror_clamp",       F(EXT_texture_mirror_clamp) },
-   { ON,  "GL_EXT_texture_object",             F(EXT_texture_object) },
-   { OFF, "GL_EXT_texture_rectangle",          F(NV_texture_rectangle) },
-   { OFF, "GL_EXT_texture_shared_exponent",    F(EXT_texture_shared_exponent) },
-   { OFF, "GL_EXT_texture_sRGB",               F(EXT_texture_sRGB) },
-   { OFF, "GL_EXT_texture_swizzle",            F(EXT_texture_swizzle) },
-   { OFF, "GL_EXT_timer_query",                F(EXT_timer_query) },
-   { OFF, "GL_EXT_transform_feedback",         F(EXT_transform_feedback) },
-   { ON,  "GL_EXT_vertex_array",               F(EXT_vertex_array) },
-   { OFF, "GL_EXT_vertex_array_bgra",          F(EXT_vertex_array_bgra) },
-   { OFF, "GL_EXT_vertex_array_set",           F(EXT_vertex_array_set) },
-   { OFF, "GL_3DFX_texture_compression_FXT1",  F(TDFX_texture_compression_FXT1) },
-   { OFF, "GL_APPLE_client_storage",           F(APPLE_client_storage) },
-   { ON,  "GL_APPLE_packed_pixels",            F(APPLE_packed_pixels) },
-   { OFF, "GL_APPLE_vertex_array_object",      F(APPLE_vertex_array_object) },
-   { OFF, "GL_APPLE_object_purgeable",         F(APPLE_object_purgeable) },
-   { OFF, "GL_ATI_blend_equation_separate",    F(EXT_blend_equation_separate) },
-   { OFF, "GL_ATI_envmap_bumpmap",             F(ATI_envmap_bumpmap) },
-   { OFF, "GL_ATI_texture_env_combine3",       F(ATI_texture_env_combine3)},
-   { OFF, "GL_ATI_texture_mirror_once",        F(ATI_texture_mirror_once)},
-   { OFF, "GL_ATI_fragment_shader",            F(ATI_fragment_shader)},
-   { OFF, "GL_ATI_separate_stencil",           F(ATI_separate_stencil)},
-   { ON,  "GL_IBM_multimode_draw_arrays",      F(IBM_multimode_draw_arrays) },
-   { ON,  "GL_IBM_rasterpos_clip",             F(IBM_rasterpos_clip) },
-   { OFF, "GL_IBM_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
-   { OFF, "GL_INGR_blend_func_separate",       F(EXT_blend_func_separate) },
-   { OFF, "GL_MESA_pack_invert",               F(MESA_pack_invert) },
-   { OFF, "GL_MESA_packed_depth_stencil",      F(MESA_packed_depth_stencil) },
-   { OFF, "GL_MESA_resize_buffers",            F(MESA_resize_buffers) },
-   { OFF, "GL_MESA_texture_array",             F(MESA_texture_array) },
-   { OFF, "GL_MESA_texture_signed_rgba",       F(MESA_texture_signed_rgba) },
-   { OFF, "GL_MESA_ycbcr_texture",             F(MESA_ycbcr_texture) },
-   { ON,  "GL_MESA_window_pos",                F(ARB_window_pos) },
-   { OFF, "GL_NV_blend_square",                F(NV_blend_square) },
-   { OFF, "GL_NV_conditional_render",          F(NV_conditional_render) },
-   { OFF, "GL_NV_depth_clamp",                 F(ARB_depth_clamp) },
-   { OFF, "GL_NV_fragment_program",            F(NV_fragment_program) },
-   { OFF, "GL_NV_fragment_program_option",     F(NV_fragment_program_option) },
-   { ON,  "GL_NV_light_max_exponent",          F(NV_light_max_exponent) },
-   { OFF, "GL_NV_packed_depth_stencil",        F(EXT_packed_depth_stencil) },
-   { OFF, "GL_NV_point_sprite",                F(NV_point_sprite) },
-   { OFF, "GL_NV_primitive_restart",           F(NV_primitive_restart) },
-   { ON,  "GL_NV_texgen_reflection",           F(NV_texgen_reflection) },
-   { OFF, "GL_NV_texture_env_combine4",        F(NV_texture_env_combine4) },
-   { OFF, "GL_NV_texture_rectangle",           F(NV_texture_rectangle) },
-   { OFF, "GL_NV_vertex_program",              F(NV_vertex_program) },
-   { OFF, "GL_NV_vertex_program1_1",           F(NV_vertex_program1_1) },
-   { ON,  "GL_OES_read_format",                F(OES_read_format) },
-   { OFF, "GL_SGI_color_matrix",               F(SGI_color_matrix) },
-   { OFF, "GL_SGI_color_table",                F(SGI_color_table) },
-   { OFF, "GL_SGI_texture_color_table",        F(SGI_texture_color_table) },
-   { OFF, "GL_SGIS_generate_mipmap",           F(SGIS_generate_mipmap) },
-   { OFF, "GL_SGIS_texture_border_clamp",      F(ARB_texture_border_clamp) },
-   { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },
-   { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
-   { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
-   { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
-#if FEATURE_OES_EGL_image
-   { OFF, "GL_OES_EGL_image",                  F(OES_EGL_image) },
-#endif
-#if FEATURE_OES_draw_texture
-   { OFF, "GL_OES_draw_texture",               F(OES_draw_texture) },
-#endif /* FEATURE_OES_draw_texture */
-};
-
-
-
-/**
- * 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(GLcontext *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_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
-   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_imaging = 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;
-#endif
-   ctx->Extensions.ARB_point_sprite = 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.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_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_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_convolution = 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_histogram = GL_TRUE;
-   /*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_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;
-#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.SGI_color_matrix = GL_TRUE;
-   ctx->Extensions.SGI_color_table = GL_TRUE;
-   ctx->Extensions.SGI_texture_color_table = GL_TRUE;
-   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 GL_ARB_imaging and all the EXT extensions that are subsets of it.
- */
-void
-_mesa_enable_imaging_extensions(GLcontext *ctx)
-{
-   ctx->Extensions.ARB_imaging = GL_TRUE;
-   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;
-   ctx->Extensions.EXT_convolution = GL_TRUE;
-   ctx->Extensions.EXT_histogram = GL_TRUE;
-   ctx->Extensions.SGI_color_matrix = GL_TRUE;
-   ctx->Extensions.SGI_color_table = GL_TRUE;
-}
-
-
-
-/**
- * Enable all OpenGL 1.3 features and extensions.
- * A convenience function to be called by drivers.
- */
-void
-_mesa_enable_1_3_extensions(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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( GLcontext *ctx, const char *name, GLboolean state )
-{
-   GLboolean *base = (GLboolean *) &ctx->Extensions;
-   GLuint i;
-
-   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;
-   }
-
-   for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (strcmp(default_extensions[i].name, name) == 0) {
-         if (default_extensions[i].flag_offset) {
-            GLboolean *enabled = base + default_extensions[i].flag_offset;
-            *enabled = state;
-         }
-         return GL_TRUE;
-      }
-   }
-   return GL_FALSE;
-}
-
-
-/**
- * Enable the named extension.
- * Typically called by drivers.
- */
-void
-_mesa_enable_extension( GLcontext *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( GLcontext *ctx, const char *name )
-{
-   if (!set_extension(ctx, name, GL_FALSE))
-      _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);
-}
-
-
-/**
- * Check if the i-th extension is enabled.
- */
-static GLboolean
-extension_enabled(GLcontext *ctx, GLuint index)
-{
-   const GLboolean *base = (const GLboolean *) &ctx->Extensions;
-   if (!default_extensions[index].flag_offset ||
-       *(base + default_extensions[index].flag_offset)) {
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Test if the named extension is enabled in this context.
- */
-GLboolean
-_mesa_extension_is_enabled( GLcontext *ctx, const char *name )
-{
-   GLuint i;
-
-   for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (strcmp(default_extensions[i].name, name) == 0) {
-         return extension_enabled(ctx, i);
-      }
-   }
-   return GL_FALSE;
-}
-
-
-/**
- * Append string 'b' onto string 'a'.  Free 'a' and return new string.
- */
-static char *
-append(const char *a, const char *b)
-{
-   const GLuint aLen = a ? strlen(a) : 0;
-   const GLuint bLen = b ? strlen(b) : 0;
-   char *s = calloc(1, aLen + bLen + 1);
-   if (s) {
-      if (a)
-         memcpy(s, a, aLen);
-      if (b)
-         memcpy(s + aLen, b, bLen);
-      s[aLen + bLen] = '\0';
-   }
-   if (a)
-      free((void *) a);
-   return s;
-}
-
-
-/**
- * Check the MESA_EXTENSION_OVERRIDE env var.
- * For extension names that are recognized, turn them on.  For extension
- * names that are recognized and prefixed with '-', turn them off.
- * Return a string of the unknown/leftover names.
- */
-static const char *
-get_extension_override( GLcontext *ctx )
-{
-   const char *envExt = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
-   char *extraExt = NULL;
-   char ext[1000];
-   GLuint extLen = 0;
-   GLuint i;
-   GLboolean disableExt = GL_FALSE;
-
-   if (!envExt)
-      return NULL;
-
-   for (i = 0; ; i++) {
-      if (envExt[i] == '\0' || envExt[i] == ' ') {
-         /* terminate/process 'ext' if extLen > 0 */
-         if (extLen > 0) {
-            assert(extLen < sizeof(ext));
-            /* enable extension named by 'ext' */
-            ext[extLen] = 0;
-            if (!set_extension(ctx, ext, !disableExt)) {
-               /* unknown extension name, append it to extraExt */
-               if (extraExt) {
-                  extraExt = append(extraExt, " ");
-               }
-               extraExt = append(extraExt, ext);
-            }
-            extLen = 0;
-            disableExt = GL_FALSE;
-         }
-         if (envExt[i] == '\0')
-            break;
-      }
-      else if (envExt[i] == '-') {
-         disableExt = GL_TRUE;
-      }
-      else {
-         /* accumulate this non-space character */
-         ext[extLen++] = envExt[i];
-      }
-   }
-
-   return extraExt;
-}
-
-
-/**
- * Run through the default_extensions array above and set the
- * ctx->Extensions.ARB/EXT_* flags accordingly.
- * To be called during context initialization.
- */
-void
-_mesa_init_extensions( GLcontext *ctx )
-{
-   GLboolean *base = (GLboolean *) &ctx->Extensions;
-   GLuint i;
-
-   for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (default_extensions[i].enabled &&
-          default_extensions[i].flag_offset) {
-         *(base + default_extensions[i].flag_offset) = GL_TRUE;
-      }
-   }
-}
-
-
-/**
- * Construct the GL_EXTENSIONS string.  Called the first time that
- * glGetString(GL_EXTENSIONS) is called.
- */
-static GLubyte *
-compute_extensions( GLcontext *ctx )
-{
-   const char *extraExt = get_extension_override(ctx);
-   GLuint extStrLen = 0;
-   char *s;
-   GLuint i;
-
-   /* first, compute length of the extension string */
-   for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (extension_enabled(ctx, i)) {
-         extStrLen += (GLuint) strlen(default_extensions[i].name) + 1;
-      }
-   }
-
-   if (extraExt)
-      extStrLen += strlen(extraExt) + 1; /* +1 for space */
-
-   /* allocate the extension string */
-   s = (char *) malloc(extStrLen);
-   if (!s)
-      return NULL;
-
-   /* second, build the extension string */
-   extStrLen = 0;
-   for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (extension_enabled(ctx, i)) {
-         GLuint len = (GLuint) strlen(default_extensions[i].name);
-         memcpy(s + extStrLen, default_extensions[i].name, len);
-         extStrLen += len;
-         s[extStrLen] = ' ';
-         extStrLen++;
-      }
-   }
-   ASSERT(extStrLen > 0);
-
-   s[extStrLen - 1] = 0; /* -1 to overwrite trailing the ' ' */
-
-   if (extraExt) {
-      s = append(s, " ");
-      s = append(s, extraExt);
-   }
-
-   return (GLubyte *) s;
-}
-
-static size_t
-append_extension(GLubyte **str, const char *ext)
-{
-   GLubyte *s = *str;
-   size_t len = strlen(ext);
-
-   if (s) {
-      memcpy(s, ext, len);
-      s[len++] = ' ';
-      s[len] = '\0';
-
-      *str += len;
-   }
-   else {
-      len++;
-   }
-
-   return len;
-}
-
-
-static size_t
-make_extension_string_es1(const GLcontext *ctx, GLubyte *str)
-{
-   size_t len = 0;
-
-   /* Core additions */
-   len += append_extension(&str, "GL_OES_byte_coordinates");
-   len += append_extension(&str, "GL_OES_fixed_point");
-   len += append_extension(&str, "GL_OES_single_precision");
-   len += append_extension(&str, "GL_OES_matrix_get");
-
-   /* 1.1 required extensions */
-   len += append_extension(&str, "GL_OES_read_format");
-   len += append_extension(&str, "GL_OES_compressed_paletted_texture");
-   len += append_extension(&str, "GL_OES_point_size_array");
-   len += append_extension(&str, "GL_OES_point_sprite");
-
-   /* 1.1 deprecated extensions */
-   len += append_extension(&str, "GL_OES_query_matrix");
-
-#if FEATURE_OES_draw_texture
-   if (ctx->Extensions.OES_draw_texture)
-      len += append_extension(&str, "GL_OES_draw_texture");
-#endif
-
-   if (ctx->Extensions.EXT_blend_equation_separate)
-      len += append_extension(&str, "GL_OES_blend_equation_separate");
-   if (ctx->Extensions.EXT_blend_func_separate)
-      len += append_extension(&str, "GL_OES_blend_func_separate");
-   if (ctx->Extensions.EXT_blend_subtract)
-      len += append_extension(&str, "GL_OES_blend_subtract");
-
-   if (ctx->Extensions.EXT_stencil_wrap)
-      len += append_extension(&str, "GL_OES_stencil_wrap");
-
-   if (ctx->Extensions.ARB_texture_cube_map)
-      len += append_extension(&str, "GL_OES_texture_cube_map");
-   if (ctx->Extensions.ARB_texture_env_crossbar)
-      len += append_extension(&str, "GL_OES_texture_env_crossbar");
-   if (ctx->Extensions.ARB_texture_mirrored_repeat)
-      len += append_extension(&str, "GL_OES_texture_mirrored_repeat");
-
-   if (ctx->Extensions.ARB_framebuffer_object) {
-      len += append_extension(&str, "GL_OES_framebuffer_object");
-      len += append_extension(&str, "GL_OES_depth24");
-      len += append_extension(&str, "GL_OES_depth32");
-      len += append_extension(&str, "GL_OES_fbo_render_mipmap");
-      len += append_extension(&str, "GL_OES_rgb8_rgba8");
-      len += append_extension(&str, "GL_OES_stencil1");
-      len += append_extension(&str, "GL_OES_stencil4");
-      len += append_extension(&str, "GL_OES_stencil8");
-   }
-
-   if (ctx->Extensions.EXT_vertex_array)
-      len += append_extension(&str, "GL_OES_element_index_uint");
-   if (ctx->Extensions.ARB_vertex_buffer_object)
-      len += append_extension(&str, "GL_OES_mapbuffer");
-   if (ctx->Extensions.EXT_texture_filter_anisotropic)
-      len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");
-
-   /* some applications check this for NPOT support */
-   if (ctx->Extensions.ARB_texture_non_power_of_two)
-      len += append_extension(&str, "GL_ARB_texture_non_power_of_two");
-
-   if (ctx->Extensions.EXT_texture_compression_s3tc)
-      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");
-   if (ctx->Extensions.EXT_texture_lod_bias)
-      len += append_extension(&str, "GL_EXT_texture_lod_bias");
-   if (ctx->Extensions.EXT_blend_minmax)
-      len += append_extension(&str, "GL_EXT_blend_minmax");
-   if (ctx->Extensions.EXT_multi_draw_arrays)
-      len += append_extension(&str, "GL_EXT_multi_draw_arrays");
-
-#if FEATURE_OES_EGL_image
-   if (ctx->Extensions.OES_EGL_image)
-      len += append_extension(&str, "GL_OES_EGL_image");
-#endif
-
-   return len;
-}
-
-
-static GLubyte *
-compute_extensions_es1(const GLcontext *ctx)
-{
-   GLubyte *s;
-   unsigned int len;
-   
-   len = make_extension_string_es1(ctx, NULL);
-   s = malloc(len + 1);
-   if (!s)
-      return NULL;
-   make_extension_string_es1(ctx, s);
-   
-   return s;
-}
-
-static size_t
-make_extension_string_es2(const GLcontext *ctx, GLubyte *str)
-{
-   size_t len = 0;
-
-   len += append_extension(&str, "GL_OES_compressed_paletted_texture");
-
-   if (ctx->Extensions.ARB_framebuffer_object) {
-      len += append_extension(&str, "GL_OES_depth24");
-      len += append_extension(&str, "GL_OES_depth32");
-      len += append_extension(&str, "GL_OES_fbo_render_mipmap");
-      len += append_extension(&str, "GL_OES_rgb8_rgba8");
-      len += append_extension(&str, "GL_OES_stencil1");
-      len += append_extension(&str, "GL_OES_stencil4");
-   }
-
-   if (ctx->Extensions.EXT_vertex_array)
-      len += append_extension(&str, "GL_OES_element_index_uint");
-   if (ctx->Extensions.ARB_vertex_buffer_object)
-      len += append_extension(&str, "GL_OES_mapbuffer");
-
-   if (ctx->Extensions.EXT_texture3D)
-      len += append_extension(&str, "GL_OES_texture_3D");
-   if (ctx->Extensions.ARB_texture_non_power_of_two)
-      len += append_extension(&str, "GL_OES_texture_npot");
-   if (ctx->Extensions.EXT_texture_filter_anisotropic)
-      len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");
-
-   len += append_extension(&str, "GL_EXT_texture_type_2_10_10_10_REV");
-   if (ctx->Extensions.ARB_depth_texture)
-      len += append_extension(&str, "GL_OES_depth_texture");
-   if (ctx->Extensions.EXT_packed_depth_stencil)
-      len += append_extension(&str, "GL_OES_packed_depth_stencil");
-   if (ctx->Extensions.ARB_fragment_shader)
-      len += append_extension(&str, "GL_OES_standard_derivatives");
-
-   if (ctx->Extensions.EXT_texture_compression_s3tc)
-      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");
-   if (ctx->Extensions.EXT_blend_minmax)
-      len += append_extension(&str, "GL_EXT_blend_minmax");
-   if (ctx->Extensions.EXT_multi_draw_arrays)
-      len += append_extension(&str, "GL_EXT_multi_draw_arrays");
-
-#if FEATURE_OES_EGL_image
-   if (ctx->Extensions.OES_EGL_image)
-      len += append_extension(&str, "GL_OES_EGL_image");
-#endif
-
-   return len;
-}
-
-static GLubyte *
-compute_extensions_es2(GLcontext *ctx)
-{
-   GLubyte *s;
-   unsigned int len;
-
-   len = make_extension_string_es2(ctx, NULL);
-   s = malloc(len + 1);
-   if (!s)
-      return NULL;
-   make_extension_string_es2(ctx, s);
-   
-   return s;
-}
-
-
-GLubyte *
-_mesa_make_extension_string(GLcontext *ctx)
-{
-   switch (ctx->API) {
-   case API_OPENGL:
-      return compute_extensions(ctx);
-   case API_OPENGLES2:
-      return compute_extensions_es2(ctx);
-   case API_OPENGLES:
-      return compute_extensions_es1(ctx);
-   default:
-      assert(0);
-      return NULL;
-   }
-}
-
-/**
- * Return number of enabled extensions.
- */
-GLuint
-_mesa_get_extension_count(GLcontext *ctx)
-{
-   GLuint i;
-
-   /* only count once */
-   if (!ctx->Extensions.Count) {
-      for (i = 0; i < Elements(default_extensions); i++) {
-         if (extension_enabled(ctx, i)) {
-            ctx->Extensions.Count++;
-         }
-      }
-   }
-
-   if (0)
-      _mesa_debug(ctx, "%u of %d extensions enabled\n", ctx->Extensions.Count,
-                  (int) Elements(default_extensions));
-
-   return ctx->Extensions.Count;
-}
-
-
-/**
- * Return name of i-th enabled extension
- */
-const GLubyte *
-_mesa_get_enabled_extension(GLcontext *ctx, GLuint index)
-{
-   GLuint i;
-
-   for (i = 0; i < Elements(default_extensions); i++) {
-      if (extension_enabled(ctx, i)) {
-         if (index == 0)
-            return (const GLubyte *) default_extensions[i].name;
-         index--;
-      }
-   }
-
-   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.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "extensions.h"

+#include "mtypes.h"

+

+

+#define F(x) offsetof(struct gl_extensions, x)

+#define ON GL_TRUE

+#define OFF GL_FALSE

+

+

+/*

+ * Note: The GL_MESAX_* extensions are placeholders for future ARB extensions.

+ */

+static const struct {

+   GLboolean enabled;

+   const char *name;

+   int flag_offset;

+} default_extensions[] = {

+   { OFF, "GL_ARB_blend_func_extended",        F(ARB_blend_func_extended) },

+   { ON,  "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },

+   { OFF, "GL_ARB_depth_buffer_float",         F(ARB_depth_buffer_float) },

+   { OFF, "GL_ARB_depth_clamp",                F(ARB_depth_clamp) },

+   { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },

+   { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },

+   { OFF, "GL_ARB_draw_elements_base_vertex",  F(ARB_draw_elements_base_vertex) },

+   { OFF, "GL_ARB_draw_instanced",             F(ARB_draw_instanced) },

+   { OFF, "GL_ARB_explicit_attrib_location",   F(ARB_explicit_attrib_location) },

+   { OFF, "GL_ARB_fragment_coord_conventions", F(ARB_fragment_coord_conventions) },

+   { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },

+   { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },

+   { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },

+   { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },

+   /* TODO: reenable this when the new GLSL compiler actually supports them */

+   /* { OFF, "GL_ARB_geometry_shader4",           F(ARB_geometry_shader4) }, */

+   { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },

+   { OFF, "GL_ARB_half_float_vertex",          F(ARB_half_float_vertex) },

+   { OFF, "GL_ARB_instanced_arrays",           F(ARB_instanced_arrays) },

+   { OFF, "GL_ARB_map_buffer_range",           F(ARB_map_buffer_range) },

+   { ON,  "GL_ARB_multisample",                F(ARB_multisample) },

+   { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },

+   { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },

+   { OFF, "GL_ARB_occlusion_query2",           F(ARB_occlusion_query2) },

+   { OFF, "GL_ARB_pixel_buffer_object",        F(EXT_pixel_buffer_object) },

+   { OFF, "GL_ARB_point_parameters",           F(EXT_point_parameters) },

+   { OFF, "GL_ARB_point_sprite",               F(ARB_point_sprite) },

+   { OFF, "GL_ARB_provoking_vertex",           F(EXT_provoking_vertex) },

+   { OFF, "GL_ARB_sampler_objects",            F(ARB_sampler_objects) },

+   { OFF, "GL_ARB_seamless_cube_map",          F(ARB_seamless_cube_map) },

+   { OFF, "GL_ARB_shader_objects",             F(ARB_shader_objects) },

+   { OFF, "GL_ARB_shader_stencil_export",      F(ARB_shader_stencil_export) },

+   { OFF, "GL_ARB_shading_language_100",       F(ARB_shading_language_100) },

+   { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },

+   { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },

+   { OFF, "GL_ARB_sync",                       F(ARB_sync) },

+   { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },

+   { OFF, "GL_ARB_texture_buffer_object",      F(ARB_texture_buffer_object) },

+   { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },

+   { OFF, "GL_ARB_texture_compression_rgtc",   F(ARB_texture_compression_rgtc) },

+   { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },

+   { OFF, "GL_ARB_texture_env_add",            F(EXT_texture_env_add) },

+   { OFF, "GL_ARB_texture_env_combine",        F(ARB_texture_env_combine) },

+   { OFF, "GL_ARB_texture_env_crossbar",       F(ARB_texture_env_crossbar) },

+   { OFF, "GL_ARB_texture_env_dot3",           F(ARB_texture_env_dot3) },

+   { OFF, "GL_MESAX_texture_float",            F(ARB_texture_float) },

+   { OFF, "GL_ARB_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},

+   { OFF, "GL_ARB_texture_multisample",        F(ARB_texture_multisample) },

+   { OFF, "GL_ARB_texture_non_power_of_two",   F(ARB_texture_non_power_of_two)},

+   { OFF, "GL_ARB_texture_rectangle",          F(NV_texture_rectangle) },

+   { OFF, "GL_ARB_texture_rg",                 F(ARB_texture_rg) },

+   { OFF, "GL_ARB_texture_rgb10_a2ui",         F(ARB_texture_rgb10_a2ui) },

+   { OFF, "GL_ARB_texture_swizzle",            F(EXT_texture_swizzle) },

+   { ON,  "GL_ARB_transpose_matrix",           F(ARB_transpose_matrix) },

+   { OFF, "GL_ARB_transform_feedback2",        F(ARB_transform_feedback2) },

+   { OFF, "GL_ARB_uniform_buffer_object",      F(ARB_uniform_buffer_object) },

+   { OFF, "GL_ARB_vertex_array_bgra",          F(EXT_vertex_array_bgra) },

+   { OFF, "GL_ARB_vertex_array_object",        F(ARB_vertex_array_object) },

+   { ON,  "GL_ARB_vertex_buffer_object",       F(ARB_vertex_buffer_object) },

+   { OFF, "GL_ARB_vertex_program",             F(ARB_vertex_program) },

+   { OFF, "GL_ARB_vertex_shader",              F(ARB_vertex_shader) },

+   { OFF, "GL_ARB_vertex_type_2_10_10_10_rev", F(ARB_vertex_type_2_10_10_10_rev) },

+   { ON,  "GL_ARB_window_pos",                 F(ARB_window_pos) },

+   { ON,  "GL_EXT_abgr",                       F(EXT_abgr) },

+   { ON,  "GL_EXT_bgra",                       F(EXT_bgra) },

+   { OFF, "GL_EXT_blend_color",                F(EXT_blend_color) },

+   { OFF, "GL_EXT_blend_equation_separate",    F(EXT_blend_equation_separate) },

+   { OFF, "GL_EXT_blend_func_separate",        F(EXT_blend_func_separate) },

+   { OFF, "GL_EXT_blend_logic_op",             F(EXT_blend_logic_op) },

+   { OFF, "GL_EXT_blend_minmax",               F(EXT_blend_minmax) },

+   { OFF, "GL_EXT_blend_subtract",             F(EXT_blend_subtract) },

+   { OFF, "GL_EXT_clip_volume_hint",           F(EXT_clip_volume_hint) },

+   { ON,  "GL_EXT_compiled_vertex_array",      F(EXT_compiled_vertex_array) },

+   { ON,  "GL_EXT_copy_texture",               F(EXT_copy_texture) },

+   { OFF, "GL_EXT_depth_bounds_test",          F(EXT_depth_bounds_test) },

+   { OFF, "GL_EXT_draw_buffers2",              F(EXT_draw_buffers2) },

+   { OFF, "GL_EXT_draw_instanced",             F(ARB_draw_instanced) },

+   { ON,  "GL_EXT_draw_range_elements",        F(EXT_draw_range_elements) },

+   { OFF, "GL_EXT_framebuffer_blit",           F(EXT_framebuffer_blit) },

+   { OFF, "GL_EXT_framebuffer_multisample",    F(EXT_framebuffer_multisample) },

+   { OFF, "GL_EXT_framebuffer_object",         F(EXT_framebuffer_object) },

+   { OFF, "GL_EXT_framebuffer_sRGB",           F(EXT_framebuffer_sRGB) },

+   { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },

+   { OFF, "GL_EXT_gpu_program_parameters",     F(EXT_gpu_program_parameters) },

+   { OFF, "GL_EXT_gpu_shader4",                F(EXT_gpu_shader4) },

+   { ON,  "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },

+   { OFF, "GL_EXT_packed_depth_stencil",       F(EXT_packed_depth_stencil) },

+   { OFF, "GL_EXT_packed_float",               F(EXT_packed_float) },

+   { ON,  "GL_EXT_packed_pixels",              F(EXT_packed_pixels) },

+   { OFF, "GL_EXT_paletted_texture",           F(EXT_paletted_texture) },

+   { OFF, "GL_EXT_pixel_buffer_object",        F(EXT_pixel_buffer_object) },

+   { OFF, "GL_EXT_point_parameters",           F(EXT_point_parameters) },

+   { ON,  "GL_EXT_polygon_offset",             F(EXT_polygon_offset) },

+   { OFF, "GL_EXT_provoking_vertex",           F(EXT_provoking_vertex) },

+   { ON,  "GL_EXT_rescale_normal",             F(EXT_rescale_normal) },

+   { OFF, "GL_EXT_secondary_color",            F(EXT_secondary_color) },

+   { OFF, "GL_EXT_separate_shader_objects",    F(EXT_separate_shader_objects) },

+   { ON,  "GL_EXT_separate_specular_color",    F(EXT_separate_specular_color) },

+   { OFF, "GL_EXT_shadow_funcs",               F(EXT_shadow_funcs) },

+   { OFF, "GL_EXT_shared_texture_palette",     F(EXT_shared_texture_palette) },

+   { OFF, "GL_EXT_stencil_two_side",           F(EXT_stencil_two_side) },

+   { OFF, "GL_EXT_stencil_wrap",               F(EXT_stencil_wrap) },

+   { ON,  "GL_EXT_subtexture",                 F(EXT_subtexture) },

+   { ON,  "GL_EXT_texture",                    F(EXT_texture) },

+   { ON,  "GL_EXT_texture3D",                  F(EXT_texture3D) },

+   { OFF, "GL_EXT_texture_array",              F(EXT_texture_array) },

+   { OFF, "GL_EXT_texture_compression_s3tc",   F(EXT_texture_compression_s3tc) },

+   { OFF, "GL_EXT_texture_compression_rgtc",   F(ARB_texture_compression_rgtc) },

+   { OFF, "GL_EXT_texture_cube_map",           F(ARB_texture_cube_map) },

+   { ON,  "GL_EXT_texture_edge_clamp",         F(SGIS_texture_edge_clamp) },

+   { OFF, "GL_EXT_texture_env_add",            F(EXT_texture_env_add) },

+   { OFF, "GL_EXT_texture_env_combine",        F(EXT_texture_env_combine) },

+   { OFF, "GL_EXT_texture_env_dot3",           F(EXT_texture_env_dot3) },

+   { OFF, "GL_EXT_texture_filter_anisotropic", F(EXT_texture_filter_anisotropic) },

+   { OFF, "GL_EXT_texture_integer",            F(EXT_texture_integer) },

+   { OFF, "GL_EXT_texture_lod_bias",           F(EXT_texture_lod_bias) },

+   { OFF, "GL_EXT_texture_mirror_clamp",       F(EXT_texture_mirror_clamp) },

+   { ON,  "GL_EXT_texture_object",             F(EXT_texture_object) },

+   { OFF, "GL_EXT_texture_rectangle",          F(NV_texture_rectangle) },

+   { OFF, "GL_EXT_texture_shared_exponent",    F(EXT_texture_shared_exponent) },

+   { OFF, "GL_EXT_texture_sRGB",               F(EXT_texture_sRGB) },

+   { OFF, "GL_EXT_texture_swizzle",            F(EXT_texture_swizzle) },

+   { OFF, "GL_EXT_timer_query",                F(EXT_timer_query) },

+   { OFF, "GL_EXT_transform_feedback",         F(EXT_transform_feedback) },

+   { ON,  "GL_EXT_vertex_array",               F(EXT_vertex_array) },

+   { OFF, "GL_EXT_vertex_array_bgra",          F(EXT_vertex_array_bgra) },

+   { OFF, "GL_EXT_vertex_array_set",           F(EXT_vertex_array_set) },

+   { OFF, "GL_3DFX_texture_compression_FXT1",  F(TDFX_texture_compression_FXT1) },

+   { OFF, "GL_APPLE_client_storage",           F(APPLE_client_storage) },

+   { ON,  "GL_APPLE_packed_pixels",            F(APPLE_packed_pixels) },

+   { OFF, "GL_APPLE_vertex_array_object",      F(APPLE_vertex_array_object) },

+   { OFF, "GL_APPLE_object_purgeable",         F(APPLE_object_purgeable) },

+   { OFF, "GL_ATI_blend_equation_separate",    F(EXT_blend_equation_separate) },

+   { OFF, "GL_ATI_envmap_bumpmap",             F(ATI_envmap_bumpmap) },

+   { OFF, "GL_ATI_texture_env_combine3",       F(ATI_texture_env_combine3)},

+   { OFF, "GL_ATI_texture_mirror_once",        F(ATI_texture_mirror_once)},

+   { OFF, "GL_ATI_fragment_shader",            F(ATI_fragment_shader)},

+   { OFF, "GL_ATI_separate_stencil",           F(ATI_separate_stencil)},

+   { ON,  "GL_IBM_multimode_draw_arrays",      F(IBM_multimode_draw_arrays) },

+   { ON,  "GL_IBM_rasterpos_clip",             F(IBM_rasterpos_clip) },

+   { OFF, "GL_IBM_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},

+   { OFF, "GL_INGR_blend_func_separate",       F(EXT_blend_func_separate) },

+   { OFF, "GL_MESA_pack_invert",               F(MESA_pack_invert) },

+   { OFF, "GL_MESA_resize_buffers",            F(MESA_resize_buffers) },

+   { OFF, "GL_MESA_texture_array",             F(MESA_texture_array) },

+   { OFF, "GL_MESA_texture_signed_rgba",       F(MESA_texture_signed_rgba) },

+   { OFF, "GL_MESA_ycbcr_texture",             F(MESA_ycbcr_texture) },

+   { ON,  "GL_MESA_window_pos",                F(ARB_window_pos) },

+   { OFF, "GL_NV_blend_square",                F(NV_blend_square) },

+   { OFF, "GL_NV_conditional_render",          F(NV_conditional_render) },

+   { OFF, "GL_NV_depth_clamp",                 F(ARB_depth_clamp) },

+   { OFF, "GL_NV_fragment_program",            F(NV_fragment_program) },

+   { OFF, "GL_NV_fragment_program_option",     F(NV_fragment_program_option) },

+   { ON,  "GL_NV_light_max_exponent",          F(NV_light_max_exponent) },

+   { OFF, "GL_NV_packed_depth_stencil",        F(EXT_packed_depth_stencil) },

+   { OFF, "GL_NV_point_sprite",                F(NV_point_sprite) },

+   { OFF, "GL_NV_primitive_restart",           F(NV_primitive_restart) },

+   { ON,  "GL_NV_texgen_reflection",           F(NV_texgen_reflection) },

+   { OFF, "GL_NV_texture_env_combine4",        F(NV_texture_env_combine4) },

+   { OFF, "GL_NV_texture_rectangle",           F(NV_texture_rectangle) },

+   { OFF, "GL_NV_vertex_program",              F(NV_vertex_program) },

+   { OFF, "GL_NV_vertex_program1_1",           F(NV_vertex_program1_1) },

+   { ON,  "GL_OES_read_format",                F(OES_read_format) },

+   { OFF, "GL_SGI_texture_color_table",        F(SGI_texture_color_table) },

+   { ON,  "GL_SGIS_generate_mipmap",           F(SGIS_generate_mipmap) },

+   { OFF, "GL_SGIS_texture_border_clamp",      F(ARB_texture_border_clamp) },

+   { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },

+   { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },

+   { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },

+   { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },

+   { OFF, "GL_EXT_texture_format_BGRA8888",    F(EXT_texture_format_BGRA8888) },

+#if FEATURE_OES_EGL_image

+   { OFF, "GL_OES_EGL_image",                  F(OES_EGL_image) },

+#endif

+#if FEATURE_OES_draw_texture

+   { OFF, "GL_OES_draw_texture",               F(OES_draw_texture) },

+#endif /* FEATURE_OES_draw_texture */

+};

+

+

+

+/**

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

+#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.SGI_texture_color_table = GL_TRUE;

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

+{

+   GLboolean *base = (GLboolean *) &ctx->Extensions;

+   GLuint i;

+

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

+   }

+

+   for (i = 0 ; i < Elements(default_extensions) ; i++) {

+      if (strcmp(default_extensions[i].name, name) == 0) {

+         if (default_extensions[i].flag_offset) {

+            GLboolean *enabled = base + default_extensions[i].flag_offset;

+            *enabled = state;

+         }

+         return GL_TRUE;

+      }

+   }

+   return GL_FALSE;

+}

+

+

+/**

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

+}

+

+

+/**

+ * Check if the i-th extension is enabled.

+ */

+static GLboolean

+extension_enabled(struct gl_context *ctx, GLuint index)

+{

+   const GLboolean *base = (const GLboolean *) &ctx->Extensions;

+   if (!default_extensions[index].flag_offset ||

+       *(base + default_extensions[index].flag_offset)) {

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if the named extension is enabled in this context.

+ */

+GLboolean

+_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )

+{

+   GLuint i;

+

+   for (i = 0 ; i < Elements(default_extensions) ; i++) {

+      if (strcmp(default_extensions[i].name, name) == 0) {

+         return extension_enabled(ctx, i);

+      }

+   }

+   return GL_FALSE;

+}

+

+

+/**

+ * Append string 'b' onto string 'a'.  Free 'a' and return new string.

+ */

+static char *

+append(const char *a, const char *b)

+{

+   const GLuint aLen = a ? strlen(a) : 0;

+   const GLuint bLen = b ? strlen(b) : 0;

+   char *s = calloc(1, aLen + bLen + 1);

+   if (s) {

+      if (a)

+         memcpy(s, a, aLen);

+      if (b)

+         memcpy(s + aLen, b, bLen);

+      s[aLen + bLen] = '\0';

+   }

+   if (a)

+      free((void *) a);

+   return s;

+}

+

+

+/**

+ * Check the MESA_EXTENSION_OVERRIDE env var.

+ * For extension names that are recognized, turn them on.  For extension

+ * names that are recognized and prefixed with '-', turn them off.

+ * Return a string of the unknown/leftover names.

+ */

+static const char *

+get_extension_override( struct gl_context *ctx )

+{

+   const char *envExt = _mesa_getenv("MESA_EXTENSION_OVERRIDE");

+   char *extraExt = NULL;

+   char ext[1000];

+   GLuint extLen = 0;

+   GLuint i;

+   GLboolean disableExt = GL_FALSE;

+

+   if (!envExt)

+      return NULL;

+

+   for (i = 0; ; i++) {

+      if (envExt[i] == '\0' || envExt[i] == ' ') {

+         /* terminate/process 'ext' if extLen > 0 */

+         if (extLen > 0) {

+            assert(extLen < sizeof(ext));

+            /* enable extension named by 'ext' */

+            ext[extLen] = 0;

+            if (!set_extension(ctx, ext, !disableExt)) {

+               /* unknown extension name, append it to extraExt */

+               if (extraExt) {

+                  extraExt = append(extraExt, " ");

+               }

+               extraExt = append(extraExt, ext);

+            }

+            extLen = 0;

+            disableExt = GL_FALSE;

+         }

+         if (envExt[i] == '\0')

+            break;

+      }

+      else if (envExt[i] == '-') {

+         disableExt = GL_TRUE;

+      }

+      else {

+         /* accumulate this non-space character */

+         ext[extLen++] = envExt[i];

+      }

+   }

+

+   return extraExt;

+}

+

+

+/**

+ * Run through the default_extensions array above and set the

+ * ctx->Extensions.ARB/EXT_* flags accordingly.

+ * To be called during context initialization.

+ */

+void

+_mesa_init_extensions( struct gl_context *ctx )

+{

+   GLboolean *base = (GLboolean *) &ctx->Extensions;

+   GLuint i;

+

+   for (i = 0 ; i < Elements(default_extensions) ; i++) {

+      if (default_extensions[i].enabled &&

+          default_extensions[i].flag_offset) {

+         *(base + default_extensions[i].flag_offset) = GL_TRUE;

+      }

+   }

+}

+

+

+/**

+ * Construct the GL_EXTENSIONS string.  Called the first time that

+ * glGetString(GL_EXTENSIONS) is called.

+ */

+static GLubyte *

+compute_extensions( struct gl_context *ctx )

+{

+   const char *extraExt = get_extension_override(ctx);

+   GLuint extStrLen = 0;

+   char *s;

+   GLuint i;

+

+   /* first, compute length of the extension string */

+   for (i = 0 ; i < Elements(default_extensions) ; i++) {

+      if (extension_enabled(ctx, i)) {

+         extStrLen += (GLuint) strlen(default_extensions[i].name) + 1;

+      }

+   }

+

+   if (extraExt)

+      extStrLen += strlen(extraExt) + 1; /* +1 for space */

+

+   /* allocate the extension string */

+   s = (char *) malloc(extStrLen);

+   if (!s)

+      return NULL;

+

+   /* second, build the extension string */

+   extStrLen = 0;

+   for (i = 0 ; i < Elements(default_extensions) ; i++) {

+      if (extension_enabled(ctx, i)) {

+         GLuint len = (GLuint) strlen(default_extensions[i].name);

+         memcpy(s + extStrLen, default_extensions[i].name, len);

+         extStrLen += len;

+         s[extStrLen] = ' ';

+         extStrLen++;

+      }

+   }

+   ASSERT(extStrLen > 0);

+

+   s[extStrLen - 1] = 0; /* -1 to overwrite trailing the ' ' */

+

+   if (extraExt) {

+      s = append(s, " ");

+      s = append(s, extraExt);

+   }

+

+   return (GLubyte *) s;

+}

+

+static size_t

+append_extension(GLubyte **str, const char *ext)

+{

+   GLubyte *s = *str;

+   size_t len = strlen(ext);

+

+   if (s) {

+      memcpy(s, ext, len);

+      s[len++] = ' ';

+      s[len] = '\0';

+

+      *str += len;

+   }

+   else {

+      len++;

+   }

+

+   return len;

+}

+

+

+static size_t

+make_extension_string_es1(const struct gl_context *ctx, GLubyte *str)

+{

+   size_t len = 0;

+

+   /* Core additions */

+   len += append_extension(&str, "GL_OES_byte_coordinates");

+   len += append_extension(&str, "GL_OES_fixed_point");

+   len += append_extension(&str, "GL_OES_single_precision");

+   len += append_extension(&str, "GL_OES_matrix_get");

+

+   /* 1.1 required extensions */

+   len += append_extension(&str, "GL_OES_read_format");

+   len += append_extension(&str, "GL_OES_compressed_paletted_texture");

+   len += append_extension(&str, "GL_OES_point_size_array");

+   len += append_extension(&str, "GL_OES_point_sprite");

+

+   /* 1.1 deprecated extensions */

+   len += append_extension(&str, "GL_OES_query_matrix");

+

+#if FEATURE_OES_draw_texture

+   if (ctx->Extensions.OES_draw_texture)

+      len += append_extension(&str, "GL_OES_draw_texture");

+#endif

+

+   if (ctx->Extensions.EXT_blend_equation_separate)

+      len += append_extension(&str, "GL_OES_blend_equation_separate");

+   if (ctx->Extensions.EXT_blend_func_separate)

+      len += append_extension(&str, "GL_OES_blend_func_separate");

+   if (ctx->Extensions.EXT_blend_subtract)

+      len += append_extension(&str, "GL_OES_blend_subtract");

+

+   if (ctx->Extensions.EXT_stencil_wrap)

+      len += append_extension(&str, "GL_OES_stencil_wrap");

+

+   if (ctx->Extensions.ARB_texture_cube_map)

+      len += append_extension(&str, "GL_OES_texture_cube_map");

+   if (ctx->Extensions.ARB_texture_env_crossbar)

+      len += append_extension(&str, "GL_OES_texture_env_crossbar");

+   if (ctx->Extensions.ARB_texture_mirrored_repeat)

+      len += append_extension(&str, "GL_OES_texture_mirrored_repeat");

+

+   if (ctx->Extensions.ARB_framebuffer_object) {

+      len += append_extension(&str, "GL_OES_framebuffer_object");

+      len += append_extension(&str, "GL_OES_depth24");

+      len += append_extension(&str, "GL_OES_depth32");

+      len += append_extension(&str, "GL_OES_fbo_render_mipmap");

+      len += append_extension(&str, "GL_OES_rgb8_rgba8");

+      len += append_extension(&str, "GL_OES_stencil1");

+      len += append_extension(&str, "GL_OES_stencil4");

+      len += append_extension(&str, "GL_OES_stencil8");

+   }

+

+   if (ctx->Extensions.EXT_vertex_array)

+      len += append_extension(&str, "GL_OES_element_index_uint");

+   if (ctx->Extensions.ARB_vertex_buffer_object)

+      len += append_extension(&str, "GL_OES_mapbuffer");

+   if (ctx->Extensions.EXT_texture_filter_anisotropic)

+      len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");

+

+   /* some applications check this for NPOT support */

+   if (ctx->Extensions.ARB_texture_non_power_of_two)

+      len += append_extension(&str, "GL_ARB_texture_non_power_of_two");

+

+   if (ctx->Extensions.EXT_texture_compression_s3tc)

+      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");

+   if (ctx->Extensions.EXT_texture_lod_bias)

+      len += append_extension(&str, "GL_EXT_texture_lod_bias");

+   if (ctx->Extensions.EXT_blend_minmax)

+      len += append_extension(&str, "GL_EXT_blend_minmax");

+   if (ctx->Extensions.EXT_multi_draw_arrays)

+      len += append_extension(&str, "GL_EXT_multi_draw_arrays");

+

+#if FEATURE_OES_EGL_image

+   if (ctx->Extensions.OES_EGL_image)

+      len += append_extension(&str, "GL_OES_EGL_image");

+#endif

+

+   return len;

+}

+

+

+static GLubyte *

+compute_extensions_es1(const struct gl_context *ctx)

+{

+   GLubyte *s;

+   unsigned int len;

+   

+   len = make_extension_string_es1(ctx, NULL);

+   s = malloc(len + 1);

+   if (!s)

+      return NULL;

+   make_extension_string_es1(ctx, s);

+   

+   return s;

+}

+

+static size_t

+make_extension_string_es2(const struct gl_context *ctx, GLubyte *str)

+{

+   size_t len = 0;

+

+   if (ctx->Extensions.ARB_framebuffer_object) {

+      len += append_extension(&str, "GL_OES_depth24");

+      len += append_extension(&str, "GL_OES_depth32");

+      len += append_extension(&str, "GL_OES_fbo_render_mipmap");

+      len += append_extension(&str, "GL_OES_rgb8_rgba8");

+      len += append_extension(&str, "GL_OES_stencil1");

+      len += append_extension(&str, "GL_OES_stencil4");

+   }

+

+   if (ctx->Extensions.EXT_vertex_array)

+      len += append_extension(&str, "GL_OES_element_index_uint");

+   if (ctx->Extensions.ARB_vertex_buffer_object)

+      len += append_extension(&str, "GL_OES_mapbuffer");

+

+#if 0

+   /* disabled because of missing GLSL support */

+   if (ctx->Extensions.EXT_texture3D)

+      len += append_extension(&str, "GL_OES_texture_3D");

+#endif

+

+   if (ctx->Extensions.ARB_texture_non_power_of_two)

+      len += append_extension(&str, "GL_OES_texture_npot");

+   if (ctx->Extensions.EXT_texture_filter_anisotropic)

+      len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");

+

+   len += append_extension(&str, "GL_EXT_texture_type_2_10_10_10_REV");

+   if (ctx->Extensions.ARB_depth_texture)

+      len += append_extension(&str, "GL_OES_depth_texture");

+   if (ctx->Extensions.EXT_packed_depth_stencil)

+      len += append_extension(&str, "GL_OES_packed_depth_stencil");

+   if (ctx->Extensions.ARB_fragment_shader)

+      len += append_extension(&str, "GL_OES_standard_derivatives");

+

+   if (ctx->Extensions.EXT_texture_compression_s3tc)

+      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");

+   if (ctx->Extensions.EXT_blend_minmax)

+      len += append_extension(&str, "GL_EXT_blend_minmax");

+   if (ctx->Extensions.EXT_multi_draw_arrays)

+      len += append_extension(&str, "GL_EXT_multi_draw_arrays");

+

+#if FEATURE_OES_EGL_image

+   if (ctx->Extensions.OES_EGL_image)

+      len += append_extension(&str, "GL_OES_EGL_image");

+#endif

+

+   if (ctx->Extensions.EXT_texture_format_BGRA8888)

+      len += append_extension(&str, "GL_EXT_texture_format_BGRA8888");

+

+   return len;

+}

+

+static GLubyte *

+compute_extensions_es2(struct gl_context *ctx)

+{

+   GLubyte *s;

+   unsigned int len;

+

+   len = make_extension_string_es2(ctx, NULL);

+   s = malloc(len + 1);

+   if (!s)

+      return NULL;

+   make_extension_string_es2(ctx, s);

+   

+   return s;

+}

+

+

+GLubyte *

+_mesa_make_extension_string(struct gl_context *ctx)

+{

+   switch (ctx->API) {

+   case API_OPENGL:

+      return compute_extensions(ctx);

+   case API_OPENGLES2:

+      return compute_extensions_es2(ctx);

+   case API_OPENGLES:

+      return compute_extensions_es1(ctx);

+   default:

+      assert(0);

+      return NULL;

+   }

+}

+

+/**

+ * Return number of enabled extensions.

+ */

+GLuint

+_mesa_get_extension_count(struct gl_context *ctx)

+{

+   GLuint i;

+

+   /* only count once */

+   if (!ctx->Extensions.Count) {

+      for (i = 0; i < Elements(default_extensions); i++) {

+         if (extension_enabled(ctx, i)) {

+            ctx->Extensions.Count++;

+         }

+      }

+   }

+

+   if (0)

+      _mesa_debug(ctx, "%u of %d extensions enabled\n", ctx->Extensions.Count,

+                  (int) Elements(default_extensions));

+

+   return ctx->Extensions.Count;

+}

+

+

+/**

+ * Return name of i-th enabled extension

+ */

+const GLubyte *

+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)

+{

+   GLuint i;

+

+   for (i = 0; i < Elements(default_extensions); i++) {

+      if (extension_enabled(ctx, i)) {

+         if (index == 0)

+            return (const GLubyte *) default_extensions[i].name;

+         index--;

+      }

+   }

+

+   return NULL;

+}

diff --git a/mesalib/src/mesa/main/extensions.h b/mesalib/src/mesa/main/extensions.h
index a25472440..078e184a9 100644
--- a/mesalib/src/mesa/main/extensions.h
+++ b/mesalib/src/mesa/main/extensions.h
@@ -1,93 +1,96 @@
-/**
- * \file extensions.h
- * Extension handling.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * 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.
- */
-
-
-#ifndef _EXTENSIONS_H_
-#define _EXTENSIONS_H_
-
-#include "mtypes.h"
-
-#if _HAVE_FULL_GL
-
-extern void _mesa_enable_sw_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_1_3_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_1_4_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_1_5_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_2_0_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_2_1_extensions(GLcontext *ctx);
-
-extern void _mesa_enable_extension(GLcontext *ctx, const char *name);
-
-extern void _mesa_disable_extension(GLcontext *ctx, const char *name);
-
-extern GLboolean _mesa_extension_is_enabled(GLcontext *ctx, const char *name);
-
-extern void _mesa_init_extensions(GLcontext *ctx);
-
-extern GLubyte *_mesa_make_extension_string(GLcontext *ctx);
-
-extern GLuint
-_mesa_get_extension_count(GLcontext *ctx);
-
-extern const GLubyte *
-_mesa_get_enabled_extension(GLcontext *ctx, GLuint index);
-
-
-#else
-
-/** No-op */
-#define _mesa_extensions_dtr( ctx ) ((void)0)
-
-/** No-op */
-#define _mesa_extensions_ctr( ctx ) ((void)0)
-
-/** No-op */
-#define _mesa_extensions_get_string( ctx ) "GL_EXT_texture_object"
-
-/** No-op */
-#define _mesa_enable_imaging_extensions( c ) ((void)0)
-
-/** No-op */
-#define _mesa_enable_extension( c, n ) ((void)0)
-
-#endif
-
-#endif
+/**

+ * \file extensions.h

+ * Extension handling.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

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

+ */

+

+

+#ifndef _EXTENSIONS_H_

+#define _EXTENSIONS_H_

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+

+#if _HAVE_FULL_GL

+

+extern void _mesa_enable_sw_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_1_3_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_1_4_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_1_5_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_2_0_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_2_1_extensions(struct gl_context *ctx);

+

+extern void _mesa_enable_extension(struct gl_context *ctx, const char *name);

+

+extern void _mesa_disable_extension(struct gl_context *ctx, const char *name);

+

+extern GLboolean _mesa_extension_is_enabled(struct gl_context *ctx, const char *name);

+

+extern void _mesa_init_extensions(struct gl_context *ctx);

+

+extern GLubyte *_mesa_make_extension_string(struct gl_context *ctx);

+

+extern GLuint

+_mesa_get_extension_count(struct gl_context *ctx);

+

+extern const GLubyte *

+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index);

+

+

+#else

+

+/** No-op */

+#define _mesa_extensions_dtr( ctx ) ((void)0)

+

+/** No-op */

+#define _mesa_extensions_ctr( ctx ) ((void)0)

+

+/** No-op */

+#define _mesa_extensions_get_string( ctx ) "GL_EXT_texture_object"

+

+/** No-op */

+#define _mesa_enable_imaging_extensions( c ) ((void)0)

+

+/** No-op */

+#define _mesa_enable_extension( c, n ) ((void)0)

+

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 5201f5025..fce9e5bba 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -1,2342 +1,2393 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (C) 1999-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.
- */
-
-
-/*
- * GL_EXT/ARB_framebuffer_object extensions
- *
- * Authors:
- *   Brian Paul
- */
-
-
-#include "buffers.h"
-#include "context.h"
-#include "enums.h"
-#include "fbobject.h"
-#include "formats.h"
-#include "framebuffer.h"
-#include "hash.h"
-#include "macros.h"
-#include "renderbuffer.h"
-#include "state.h"
-#include "teximage.h"
-#include "texobj.h"
-
-
-/** Set this to 1 to help debug FBO incompleteness problems */
-#define DEBUG_FBO 0
-
-/** Set this to 1 to debug/log glBlitFramebuffer() calls */
-#define DEBUG_BLIT 0
-
-
-/**
- * Notes:
- *
- * None of the GL_EXT_framebuffer_object functions are compiled into
- * display lists.
- */
-
-
-
-/*
- * When glGenRender/FramebuffersEXT() is called we insert pointers to
- * these placeholder objects into the hash table.
- * Later, when the object ID is first bound, we replace the placeholder
- * with the real frame/renderbuffer.
- */
-static struct gl_framebuffer DummyFramebuffer;
-static struct gl_renderbuffer DummyRenderbuffer;
-
-/* We bind this framebuffer when applications pass a NULL
- * drawable/surface in make current. */
-static struct gl_framebuffer IncompleteFramebuffer;
-
-
-#define IS_CUBE_FACE(TARGET) \
-   ((TARGET) >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && \
-    (TARGET) <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z)
-
-
-static void
-delete_dummy_renderbuffer(struct gl_renderbuffer *rb)
-{
-   /* no op */
-}
-
-static void
-delete_dummy_framebuffer(struct gl_framebuffer *fb)
-{
-   /* no op */
-}
-
-
-void
-_mesa_init_fbobjects(GLcontext *ctx)
-{
-   _glthread_INIT_MUTEX(DummyFramebuffer.Mutex);
-   _glthread_INIT_MUTEX(DummyRenderbuffer.Mutex);
-   _glthread_INIT_MUTEX(IncompleteFramebuffer.Mutex);
-   DummyFramebuffer.Delete = delete_dummy_framebuffer;
-   DummyRenderbuffer.Delete = delete_dummy_renderbuffer;
-   IncompleteFramebuffer.Delete = delete_dummy_framebuffer;
-}
-
-struct gl_framebuffer *
-_mesa_get_incomplete_framebuffer(void)
-{
-   return &IncompleteFramebuffer;
-}
-
-/**
- * Helper routine for getting a gl_renderbuffer.
- */
-struct gl_renderbuffer *
-_mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id)
-{
-   struct gl_renderbuffer *rb;
-
-   if (id == 0)
-      return NULL;
-
-   rb = (struct gl_renderbuffer *)
-      _mesa_HashLookup(ctx->Shared->RenderBuffers, id);
-   return rb;
-}
-
-
-/**
- * Helper routine for getting a gl_framebuffer.
- */
-struct gl_framebuffer *
-_mesa_lookup_framebuffer(GLcontext *ctx, GLuint id)
-{
-   struct gl_framebuffer *fb;
-
-   if (id == 0)
-      return NULL;
-
-   fb = (struct gl_framebuffer *)
-      _mesa_HashLookup(ctx->Shared->FrameBuffers, id);
-   return fb;
-}
-
-
-/**
- * Mark the given framebuffer as invalid.  This will force the
- * test for framebuffer completeness to be done before the framebuffer
- * is used.
- */
-static void
-invalidate_framebuffer(struct gl_framebuffer *fb)
-{
-   fb->_Status = 0; /* "indeterminate" */
-}
-
-
-/**
- * Given a GL_*_ATTACHMENTn token, return a pointer to the corresponding
- * gl_renderbuffer_attachment object.
- * This function is only used for user-created FB objects, not the
- * default / window-system FB object.
- * If \p attachment is GL_DEPTH_STENCIL_ATTACHMENT, return a pointer to
- * the depth buffer attachment point.
- */
-struct gl_renderbuffer_attachment *
-_mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
-                     GLenum attachment)
-{
-   GLuint i;
-
-   assert(fb->Name > 0);
-
-   switch (attachment) {
-   case GL_COLOR_ATTACHMENT0_EXT:
-   case GL_COLOR_ATTACHMENT1_EXT:
-   case GL_COLOR_ATTACHMENT2_EXT:
-   case GL_COLOR_ATTACHMENT3_EXT:
-   case GL_COLOR_ATTACHMENT4_EXT:
-   case GL_COLOR_ATTACHMENT5_EXT:
-   case GL_COLOR_ATTACHMENT6_EXT:
-   case GL_COLOR_ATTACHMENT7_EXT:
-   case GL_COLOR_ATTACHMENT8_EXT:
-   case GL_COLOR_ATTACHMENT9_EXT:
-   case GL_COLOR_ATTACHMENT10_EXT:
-   case GL_COLOR_ATTACHMENT11_EXT:
-   case GL_COLOR_ATTACHMENT12_EXT:
-   case GL_COLOR_ATTACHMENT13_EXT:
-   case GL_COLOR_ATTACHMENT14_EXT:
-   case GL_COLOR_ATTACHMENT15_EXT:
-      i = attachment - GL_COLOR_ATTACHMENT0_EXT;
-      if (i >= ctx->Const.MaxColorAttachments) {
-	 return NULL;
-      }
-      return &fb->Attachment[BUFFER_COLOR0 + i];
-   case GL_DEPTH_STENCIL_ATTACHMENT:
-      /* fall-through */
-   case GL_DEPTH_BUFFER:
-      /* fall-through / new in GL 3.0 */
-   case GL_DEPTH_ATTACHMENT_EXT:
-      return &fb->Attachment[BUFFER_DEPTH];
-   case GL_STENCIL_BUFFER:
-      /* fall-through / new in GL 3.0 */
-   case GL_STENCIL_ATTACHMENT_EXT:
-      return &fb->Attachment[BUFFER_STENCIL];
-   default:
-      return NULL;
-   }
-}
-
-
-/**
- * As above, but only used for getting attachments of the default /
- * window-system framebuffer (not user-created framebuffer objects).
- */
-static struct gl_renderbuffer_attachment *
-_mesa_get_fb0_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
-                         GLenum attachment)
-{
-   assert(fb->Name == 0);
-
-   switch (attachment) {
-   case GL_FRONT_LEFT:
-      return &fb->Attachment[BUFFER_FRONT_LEFT];
-   case GL_FRONT_RIGHT:
-      return &fb->Attachment[BUFFER_FRONT_RIGHT];
-   case GL_BACK_LEFT:
-      return &fb->Attachment[BUFFER_BACK_LEFT];
-   case GL_BACK_RIGHT:
-      return &fb->Attachment[BUFFER_BACK_RIGHT];
-   case GL_AUX0:
-      if (fb->Visual.numAuxBuffers == 1) {
-         return &fb->Attachment[BUFFER_AUX0];
-      }
-      return NULL;
-   case GL_DEPTH_BUFFER:
-      /* fall-through / new in GL 3.0 */
-   case GL_DEPTH_ATTACHMENT_EXT:
-      return &fb->Attachment[BUFFER_DEPTH];
-   case GL_STENCIL_BUFFER:
-      /* fall-through / new in GL 3.0 */
-   case GL_STENCIL_ATTACHMENT_EXT:
-      return &fb->Attachment[BUFFER_STENCIL];
-   default:
-      return NULL;
-   }
-}
-
-
-
-/**
- * Remove any texture or renderbuffer attached to the given attachment
- * point.  Update reference counts, etc.
- */
-void
-_mesa_remove_attachment(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
-{
-   if (att->Type == GL_TEXTURE) {
-      ASSERT(att->Texture);
-      if (ctx->Driver.FinishRenderTexture) {
-         /* tell driver that we're done rendering to this texture. */
-         ctx->Driver.FinishRenderTexture(ctx, att);
-      }
-      _mesa_reference_texobj(&att->Texture, NULL); /* unbind */
-      ASSERT(!att->Texture);
-   }
-   if (att->Type == GL_TEXTURE || att->Type == GL_RENDERBUFFER_EXT) {
-      ASSERT(!att->Texture);
-      _mesa_reference_renderbuffer(&att->Renderbuffer, NULL); /* unbind */
-      ASSERT(!att->Renderbuffer);
-   }
-   att->Type = GL_NONE;
-   att->Complete = GL_TRUE;
-}
-
-
-/**
- * Bind a texture object to an attachment point.
- * The previous binding, if any, will be removed first.
- */
-void
-_mesa_set_texture_attachment(GLcontext *ctx,
-                             struct gl_framebuffer *fb,
-                             struct gl_renderbuffer_attachment *att,
-                             struct gl_texture_object *texObj,
-                             GLenum texTarget, GLuint level, GLuint zoffset)
-{
-   if (att->Texture == texObj) {
-      /* re-attaching same texture */
-      ASSERT(att->Type == GL_TEXTURE);
-      if (ctx->Driver.FinishRenderTexture)
-	 ctx->Driver.FinishRenderTexture(ctx, att);
-   }
-   else {
-      /* new attachment */
-      if (ctx->Driver.FinishRenderTexture && att->Texture)
-	 ctx->Driver.FinishRenderTexture(ctx, att);
-      _mesa_remove_attachment(ctx, att);
-      att->Type = GL_TEXTURE;
-      assert(!att->Texture);
-      _mesa_reference_texobj(&att->Texture, texObj);
-   }
-
-   /* always update these fields */
-   att->TextureLevel = level;
-   att->CubeMapFace = _mesa_tex_target_to_face(texTarget);
-   att->Zoffset = zoffset;
-   att->Complete = GL_FALSE;
-
-   if (att->Texture->Image[att->CubeMapFace][att->TextureLevel]) {
-      ctx->Driver.RenderTexture(ctx, fb, att);
-   }
-
-   invalidate_framebuffer(fb);
-}
-
-
-/**
- * Bind a renderbuffer to an attachment point.
- * The previous binding, if any, will be removed first.
- */
-void
-_mesa_set_renderbuffer_attachment(GLcontext *ctx,
-                                  struct gl_renderbuffer_attachment *att,
-                                  struct gl_renderbuffer *rb)
-{
-   /* XXX check if re-doing same attachment, exit early */
-   _mesa_remove_attachment(ctx, att);
-   att->Type = GL_RENDERBUFFER_EXT;
-   att->Texture = NULL; /* just to be safe */
-   att->Complete = GL_FALSE;
-   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);
-}
-
-
-/**
- * Fallback for ctx->Driver.FramebufferRenderbuffer()
- * Attach a renderbuffer object to a framebuffer object.
- */
-void
-_mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                               GLenum attachment, struct gl_renderbuffer *rb)
-{
-   struct gl_renderbuffer_attachment *att;
-
-   _glthread_LOCK_MUTEX(fb->Mutex);
-
-   att = _mesa_get_attachment(ctx, fb, attachment);
-   ASSERT(att);
-   if (rb) {
-      _mesa_set_renderbuffer_attachment(ctx, att, rb);
-      if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-         /* do stencil attachment here (depth already done above) */
-         att = _mesa_get_attachment(ctx, fb, GL_STENCIL_ATTACHMENT_EXT);
-         assert(att);
-         _mesa_set_renderbuffer_attachment(ctx, att, rb);
-      }
-   }
-   else {
-      _mesa_remove_attachment(ctx, att);
-   }
-
-   invalidate_framebuffer(fb);
-
-   _glthread_UNLOCK_MUTEX(fb->Mutex);
-}
-
-
-/**
- * For debug only.
- */
-static void
-att_incomplete(const char *msg)
-{
-#if DEBUG_FBO
-   _mesa_debug(NULL, "attachment incomplete: %s\n", msg);
-#else
-   (void) msg;
-#endif
-}
-
-
-/**
- * For debug only.
- */
-static void
-fbo_incomplete(const char *msg, int index)
-{
-#if DEBUG_FBO
-   _mesa_debug(NULL, "FBO Incomplete: %s [%d]\n", msg, index);
-#else
-   (void) msg;
-   (void) index;
-#endif
-}
-
-
-
-
-/**
- * Test if an attachment point is complete and update its Complete field.
- * \param format if GL_COLOR, this is a color attachment point,
- *               if GL_DEPTH, this is a depth component attachment point,
- *               if GL_STENCIL, this is a stencil component attachment point.
- */
-static void
-test_attachment_completeness(const GLcontext *ctx, GLenum format,
-                             struct gl_renderbuffer_attachment *att)
-{
-   assert(format == GL_COLOR || format == GL_DEPTH || format == GL_STENCIL);
-
-   /* assume complete */
-   att->Complete = GL_TRUE;
-
-   /* Look for reasons why the attachment might be incomplete */
-   if (att->Type == GL_TEXTURE) {
-      const struct gl_texture_object *texObj = att->Texture;
-      struct gl_texture_image *texImage;
-      GLenum baseFormat;
-
-      if (!texObj) {
-         att_incomplete("no texobj");
-         att->Complete = GL_FALSE;
-         return;
-      }
-
-      texImage = texObj->Image[att->CubeMapFace][att->TextureLevel];
-      if (!texImage) {
-         att_incomplete("no teximage");
-         att->Complete = GL_FALSE;
-         return;
-      }
-      if (texImage->Width < 1 || texImage->Height < 1) {
-         att_incomplete("teximage width/height=0");
-         printf("texobj = %u\n", texObj->Name);
-         printf("level = %d\n", att->TextureLevel);
-         att->Complete = GL_FALSE;
-         return;
-      }
-      if (texObj->Target == GL_TEXTURE_3D && att->Zoffset >= texImage->Depth) {
-         att_incomplete("bad z offset");
-         att->Complete = GL_FALSE;
-         return;
-      }
-
-      baseFormat = _mesa_get_format_base_format(texImage->TexFormat);
-
-      if (format == GL_COLOR) {
-         if (baseFormat != GL_RGB &&
-             baseFormat != GL_RGBA &&
-	     (!ctx->Extensions.ARB_framebuffer_object ||
-	      baseFormat != GL_ALPHA)) {
-            att_incomplete("bad format");
-            att->Complete = GL_FALSE;
-            return;
-         }
-         if (_mesa_is_format_compressed(texImage->TexFormat)) {
-            att_incomplete("compressed internalformat");
-            att->Complete = GL_FALSE;
-            return;
-         }
-      }
-      else if (format == GL_DEPTH) {
-         if (baseFormat == GL_DEPTH_COMPONENT) {
-            /* OK */
-         }
-         else if (ctx->Extensions.EXT_packed_depth_stencil &&
-                  ctx->Extensions.ARB_depth_texture &&
-                  baseFormat == GL_DEPTH_STENCIL_EXT) {
-            /* OK */
-         }
-         else {
-            att->Complete = GL_FALSE;
-            att_incomplete("bad depth format");
-            return;
-         }
-      }
-      else {
-         ASSERT(format == GL_STENCIL);
-         if (ctx->Extensions.EXT_packed_depth_stencil &&
-             ctx->Extensions.ARB_depth_texture &&
-             baseFormat == GL_DEPTH_STENCIL_EXT) {
-            /* OK */
-         }
-         else {
-            /* no such thing as stencil-only textures */
-            att_incomplete("illegal stencil texture");
-            att->Complete = GL_FALSE;
-            return;
-         }
-      }
-   }
-   else if (att->Type == GL_RENDERBUFFER_EXT) {
-      const GLenum baseFormat =
-         _mesa_get_format_base_format(att->Renderbuffer->Format);
-
-      ASSERT(att->Renderbuffer);
-      if (!att->Renderbuffer->InternalFormat ||
-          att->Renderbuffer->Width < 1 ||
-          att->Renderbuffer->Height < 1) {
-         att_incomplete("0x0 renderbuffer");
-         att->Complete = GL_FALSE;
-         return;
-      }
-      if (format == GL_COLOR) {
-         if (baseFormat != GL_RGB &&
-             baseFormat != GL_RGBA) {
-            att_incomplete("bad renderbuffer color format");
-            att->Complete = GL_FALSE;
-            return;
-         }
-      }
-      else if (format == GL_DEPTH) {
-         if (baseFormat == GL_DEPTH_COMPONENT) {
-            /* OK */
-         }
-         else if (ctx->Extensions.EXT_packed_depth_stencil &&
-                  baseFormat == GL_DEPTH_STENCIL_EXT) {
-            /* OK */
-         }
-         else {
-            att_incomplete("bad renderbuffer depth format");
-            att->Complete = GL_FALSE;
-            return;
-         }
-      }
-      else {
-         assert(format == GL_STENCIL);
-         if (baseFormat == GL_STENCIL_INDEX) {
-            /* OK */
-         }
-         else if (ctx->Extensions.EXT_packed_depth_stencil &&
-                  baseFormat == GL_DEPTH_STENCIL_EXT) {
-            /* OK */
-         }
-         else {
-            att->Complete = GL_FALSE;
-            att_incomplete("bad renderbuffer stencil format");
-            return;
-         }
-      }
-   }
-   else {
-      ASSERT(att->Type == GL_NONE);
-      /* complete */
-      return;
-   }
-}
-
-
-/**
- * Test if the given framebuffer object is complete and update its
- * Status field with the results.
- * Calls the ctx->Driver.ValidateFramebuffer() function to allow the
- * driver to make hardware-specific validation/completeness checks.
- * Also update the framebuffer's Width and Height fields if the
- * framebuffer is complete.
- */
-void
-_mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   GLuint numImages;
-   GLenum intFormat = GL_NONE; /* color buffers' internal format */
-   GLuint minWidth = ~0, minHeight = ~0, maxWidth = 0, maxHeight = 0;
-   GLint numSamples = -1;
-   GLint i;
-   GLuint j;
-
-   assert(fb->Name != 0);
-
-   numImages = 0;
-   fb->Width = 0;
-   fb->Height = 0;
-
-   /* Start at -2 to more easily loop over all attachment points.
-    *  -2: depth buffer
-    *  -1: stencil buffer
-    * >=0: color buffer
-    */
-   for (i = -2; i < (GLint) ctx->Const.MaxColorAttachments; i++) {
-      struct gl_renderbuffer_attachment *att;
-      GLenum f;
-
-      /*
-       * XXX for ARB_fbo, only check color buffers that are named by
-       * GL_READ_BUFFER and GL_DRAW_BUFFERi.
-       */
-
-      /* check for attachment completeness
-       */
-      if (i == -2) {
-         att = &fb->Attachment[BUFFER_DEPTH];
-         test_attachment_completeness(ctx, GL_DEPTH, att);
-         if (!att->Complete) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;
-            fbo_incomplete("depth attachment incomplete", -1);
-            return;
-         }
-      }
-      else if (i == -1) {
-         att = &fb->Attachment[BUFFER_STENCIL];
-         test_attachment_completeness(ctx, GL_STENCIL, att);
-         if (!att->Complete) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;
-            fbo_incomplete("stencil attachment incomplete", -1);
-            return;
-         }
-      }
-      else {
-         att = &fb->Attachment[BUFFER_COLOR0 + i];
-         test_attachment_completeness(ctx, GL_COLOR, att);
-         if (!att->Complete) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;
-            fbo_incomplete("color attachment incomplete", i);
-            return;
-         }
-      }
-
-      /* get width, height, format of the renderbuffer/texture
-       */
-      if (att->Type == GL_TEXTURE) {
-         const struct gl_texture_image *texImg
-            = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
-         minWidth = MIN2(minWidth, texImg->Width);
-         maxWidth = MAX2(maxWidth, texImg->Width);
-         minHeight = MIN2(minHeight, texImg->Height);
-         maxHeight = MAX2(maxHeight, texImg->Height);
-         f = texImg->_BaseFormat;
-         numImages++;
-         if (f != GL_RGB && f != GL_RGBA && f != GL_DEPTH_COMPONENT
-             && f != GL_DEPTH_STENCIL_EXT
-	     && (!ctx->Extensions.ARB_framebuffer_object || f != GL_ALPHA)) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
-            fbo_incomplete("texture attachment incomplete", -1);
-            return;
-         }
-      }
-      else if (att->Type == GL_RENDERBUFFER_EXT) {
-         minWidth = MIN2(minWidth, att->Renderbuffer->Width);
-         maxWidth = MAX2(minWidth, att->Renderbuffer->Width);
-         minHeight = MIN2(minHeight, att->Renderbuffer->Height);
-         maxHeight = MAX2(minHeight, att->Renderbuffer->Height);
-         f = att->Renderbuffer->InternalFormat;
-         numImages++;
-      }
-      else {
-         assert(att->Type == GL_NONE);
-         continue;
-      }
-
-      if (numSamples < 0) {
-         /* first buffer */
-         numSamples = att->Renderbuffer->NumSamples;
-      }
-
-      /* Error-check width, height, format, samples
-       */
-      if (numImages == 1) {
-         /* save format, num samples */
-         if (i >= 0) {
-            intFormat = f;
-         }
-      }
-      else {
-         if (!ctx->Extensions.ARB_framebuffer_object) {
-            /* check that width, height, format are same */
-            if (minWidth != maxWidth || minHeight != maxHeight) {
-               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT;
-               fbo_incomplete("width or height mismatch", -1);
-               return;
-            }
-            /* check that all color buffer have same format */
-            if (intFormat != GL_NONE && f != intFormat) {
-               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
-               fbo_incomplete("format mismatch", -1);
-               return;
-            }
-         }
-         if (att->Renderbuffer &&
-             att->Renderbuffer->NumSamples != numSamples) {
-            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE;
-            fbo_incomplete("inconsistant number of samples", i);
-            return;
-         }            
-
-      }
-   }
-
-#if FEATURE_GL
-   if (ctx->API == API_OPENGL) {
-      /* Check that all DrawBuffers are present */
-      for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
-	 if (fb->ColorDrawBuffer[j] != GL_NONE) {
-	    const struct gl_renderbuffer_attachment *att
-	       = _mesa_get_attachment(ctx, fb, fb->ColorDrawBuffer[j]);
-	    assert(att);
-	    if (att->Type == GL_NONE) {
-	       fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
-	       fbo_incomplete("missing drawbuffer", j);
-	       return;
-	    }
-	 }
-      }
-
-      /* Check that the ReadBuffer is present */
-      if (fb->ColorReadBuffer != GL_NONE) {
-	 const struct gl_renderbuffer_attachment *att
-	    = _mesa_get_attachment(ctx, fb, fb->ColorReadBuffer);
-	 assert(att);
-	 if (att->Type == GL_NONE) {
-	    fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
-            fbo_incomplete("missing readbuffer", -1);
-	    return;
-	 }
-      }
-   }
-#else
-   (void) j;
-#endif
-
-   if (numImages == 0) {
-      fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;
-      fbo_incomplete("no attachments", -1);
-      return;
-   }
-
-   /* Provisionally set status = COMPLETE ... */
-   fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;
-
-   /* ... but the driver may say the FB is incomplete.
-    * Drivers will most likely set the status to GL_FRAMEBUFFER_UNSUPPORTED
-    * if anything.
-    */
-   if (ctx->Driver.ValidateFramebuffer) {
-      ctx->Driver.ValidateFramebuffer(ctx, fb);
-      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-         fbo_incomplete("driver marked FBO as incomplete", -1);
-      }
-   }
-
-   if (fb->_Status == GL_FRAMEBUFFER_COMPLETE_EXT) {
-      /*
-       * Note that if ARB_framebuffer_object is supported and the attached
-       * renderbuffers/textures are different sizes, the framebuffer
-       * width/height will be set to the smallest width/height.
-       */
-      fb->Width = minWidth;
-      fb->Height = minHeight;
-
-      /* finally, update the visual info for the framebuffer */
-      _mesa_update_framebuffer_visual(fb);
-   }
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-   if (renderbuffer) {
-      struct gl_renderbuffer *rb = _mesa_lookup_renderbuffer(ctx, renderbuffer);
-      if (rb != NULL && rb != &DummyRenderbuffer)
-         return GL_TRUE;
-   }
-   return GL_FALSE;
-}
-
-
-void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
-{
-   struct gl_renderbuffer *newRb;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target != GL_RENDERBUFFER_EXT) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindRenderbufferEXT(target)");
-      return;
-   }
-
-   /* No need to flush here since the render buffer binding has no
-    * effect on rendering state.
-    */
-
-   if (renderbuffer) {
-      newRb = _mesa_lookup_renderbuffer(ctx, renderbuffer);
-      if (newRb == &DummyRenderbuffer) {
-         /* ID was reserved, but no real renderbuffer object made yet */
-         newRb = NULL;
-      }
-      else if (!newRb && ctx->Extensions.ARB_framebuffer_object) {
-         /* All RB IDs must be Gen'd */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindRenderbuffer(buffer)");
-         return;
-      }
-
-      if (!newRb) {
-	 /* create new renderbuffer object */
-	 newRb = ctx->Driver.NewRenderbuffer(ctx, renderbuffer);
-	 if (!newRb) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindRenderbufferEXT");
-	    return;
-	 }
-         ASSERT(newRb->AllocStorage);
-         _mesa_HashInsert(ctx->Shared->RenderBuffers, renderbuffer, newRb);
-         newRb->RefCount = 1; /* referenced by hash table */
-      }
-   }
-   else {
-      newRb = NULL;
-   }
-
-   ASSERT(newRb != &DummyRenderbuffer);
-
-   _mesa_reference_renderbuffer(&ctx->CurrentRenderbuffer, newRb);
-}
-
-
-/**
- * If the given renderbuffer is anywhere attached to the framebuffer, detach
- * the renderbuffer.
- * This is used when a renderbuffer object is deleted.
- * The spec calls for unbinding.
- */
-static void
-detach_renderbuffer(GLcontext *ctx,
-                    struct gl_framebuffer *fb,
-                    struct gl_renderbuffer *rb)
-{
-   GLuint i;
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      if (fb->Attachment[i].Renderbuffer == rb) {
-         _mesa_remove_attachment(ctx, &fb->Attachment[i]);
-      }
-   }
-   invalidate_framebuffer(fb);
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
-{
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   for (i = 0; i < n; i++) {
-      if (renderbuffers[i] > 0) {
-	 struct gl_renderbuffer *rb;
-	 rb = _mesa_lookup_renderbuffer(ctx, renderbuffers[i]);
-	 if (rb) {
-            /* check if deleting currently bound renderbuffer object */
-            if (rb == ctx->CurrentRenderbuffer) {
-               /* bind default */
-               ASSERT(rb->RefCount >= 2);
-               _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
-            }
-
-            if (ctx->DrawBuffer->Name) {
-               detach_renderbuffer(ctx, ctx->DrawBuffer, rb);
-            }
-            if (ctx->ReadBuffer->Name && ctx->ReadBuffer != ctx->DrawBuffer) {
-               detach_renderbuffer(ctx, ctx->ReadBuffer, rb);
-            }
-
-	    /* Remove from hash table immediately, to free the ID.
-             * But the object will not be freed until it's no longer
-             * referenced anywhere else.
-             */
-	    _mesa_HashRemove(ctx->Shared->RenderBuffers, renderbuffers[i]);
-
-            if (rb != &DummyRenderbuffer) {
-               /* no longer referenced by hash table */
-               _mesa_reference_renderbuffer(&rb, NULL);
-	    }
-	 }
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint first;
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenRenderbuffersEXT(n)");
-      return;
-   }
-
-   if (!renderbuffers)
-      return;
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->RenderBuffers, n);
-
-   for (i = 0; i < n; i++) {
-      GLuint name = first + i;
-      renderbuffers[i] = name;
-      /* insert dummy placeholder into hash table */
-      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-      _mesa_HashInsert(ctx->Shared->RenderBuffers, name, &DummyRenderbuffer);
-      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-   }
-}
-
-
-/**
- * Given an internal format token for a render buffer, return the
- * corresponding base format.
- * This is very similar to _mesa_base_tex_format() but the set of valid
- * internal formats is somewhat different.
- *
- * \return one of GL_RGB, GL_RGBA, GL_STENCIL_INDEX, GL_DEPTH_COMPONENT
- *  GL_DEPTH_STENCIL_EXT or zero if error.
- *
- * XXX in the future when we support red-only and red-green formats
- * we'll also return GL_RED and GL_RG.
- */
-GLenum
-_mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat)
-{
-   switch (internalFormat) {
-   case GL_ALPHA:
-   case GL_ALPHA4:
-   case GL_ALPHA8:
-   case GL_ALPHA12:
-   case GL_ALPHA16:
-      return GL_ALPHA;
-   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:
-   case GL_RGBA16_SNORM:
-      return GL_RGBA;
-   case GL_STENCIL_INDEX:
-   case GL_STENCIL_INDEX1_EXT:
-   case GL_STENCIL_INDEX4_EXT:
-   case GL_STENCIL_INDEX8_EXT:
-   case GL_STENCIL_INDEX16_EXT:
-      return GL_STENCIL_INDEX;
-   case GL_DEPTH_COMPONENT:
-   case GL_DEPTH_COMPONENT16:
-   case GL_DEPTH_COMPONENT24:
-   case GL_DEPTH_COMPONENT32:
-      return GL_DEPTH_COMPONENT;
-   case GL_DEPTH_STENCIL_EXT:
-   case GL_DEPTH24_STENCIL8_EXT:
-      if (ctx->Extensions.EXT_packed_depth_stencil)
-         return GL_DEPTH_STENCIL_EXT;
-      else
-         return 0;
-   /* XXX add floating point formats eventually */
-   default:
-      return 0;
-   }
-}
-
-
-/** sentinal value, see below */
-#define NO_SAMPLES 1000
-
-
-/**
- * Helper function used by _mesa_RenderbufferStorageEXT() and 
- * _mesa_RenderbufferStorageMultisample().
- * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT().
- */
-static void
-renderbuffer_storage(GLenum target, GLenum internalFormat,
-                     GLsizei width, GLsizei height, GLsizei samples)
-{
-   const char *func = samples == NO_SAMPLES ?
-      "glRenderbufferStorage" : "RenderbufferStorageMultisample";
-   struct gl_renderbuffer *rb;
-   GLenum baseFormat;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target != GL_RENDERBUFFER_EXT) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", func);
-      return;
-   }
-
-   baseFormat = _mesa_base_fbo_format(ctx, internalFormat);
-   if (baseFormat == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "%s(internalFormat)", func);
-      return;
-   }
-
-   if (width < 1 || width > (GLsizei) ctx->Const.MaxRenderbufferSize) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(width)", func);
-      return;
-   }
-
-   if (height < 1 || height > (GLsizei) ctx->Const.MaxRenderbufferSize) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(height)", func);
-      return;
-   }
-
-   if (samples == NO_SAMPLES) {
-      /* NumSamples == 0 indicates non-multisampling */
-      samples = 0;
-   }
-   else if (samples > (GLsizei) ctx->Const.MaxSamples) {
-      /* note: driver may choose to use more samples than what's requested */
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(samples)", func);
-      return;
-   }
-
-   rb = ctx->CurrentRenderbuffer;
-   if (!rb) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   if (rb->InternalFormat == internalFormat &&
-       rb->Width == (GLuint) width &&
-       rb->Height == (GLuint) height) {
-      /* no change in allocation needed */
-      return;
-   }
-
-   /* These MUST get set by the AllocStorage func */
-   rb->Format = MESA_FORMAT_NONE;
-   rb->NumSamples = samples;
-
-   /* Now allocate the storage */
-   ASSERT(rb->AllocStorage);
-   if (rb->AllocStorage(ctx, rb, internalFormat, width, height)) {
-      /* No error - check/set fields now */
-      assert(rb->Format != MESA_FORMAT_NONE);
-      assert(rb->Width == (GLuint) width);
-      assert(rb->Height == (GLuint) height);
-      rb->InternalFormat = internalFormat;
-      rb->_BaseFormat = baseFormat;
-      assert(rb->_BaseFormat != 0);
-   }
-   else {
-      /* Probably ran out of memory - clear the fields */
-      rb->Width = 0;
-      rb->Height = 0;
-      rb->Format = MESA_FORMAT_NONE;
-      rb->InternalFormat = GL_NONE;
-      rb->_BaseFormat = GL_NONE;
-      rb->NumSamples = 0;
-   }
-
-   /*
-   test_framebuffer_completeness(ctx, fb);
-   */
-   /* XXX if this renderbuffer is attached anywhere, invalidate attachment
-    * points???
-    */
-}
-
-
-#if FEATURE_OES_EGL_image
-void GLAPIENTRY
-_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
-{
-   struct gl_renderbuffer *rb;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.OES_EGL_image) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glEGLImageTargetRenderbufferStorageOES(unsupported)");
-      return;
-   }
-
-   if (target != GL_RENDERBUFFER) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "EGLImageTargetRenderbufferStorageOES");
-      return;
-   }
-
-   rb = ctx->CurrentRenderbuffer;
-   if (!rb) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "EGLImageTargetRenderbufferStorageOES");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image);
-}
-#endif
-
-
-/**
- * Helper function for _mesa_GetRenderbufferParameterivEXT() and
- * _mesa_GetFramebufferAttachmentParameterivEXT()
- * We have to be careful to respect the base format.  For example, if a
- * renderbuffer/texture was created with internalFormat=GL_RGB but the
- * driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE
- * we need to return zero.
- */
-static GLint
-get_component_bits(GLenum pname, GLenum baseFormat, gl_format format)
-{
-   switch (pname) {
-   case GL_RENDERBUFFER_RED_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
-   case GL_RENDERBUFFER_GREEN_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
-   case GL_RENDERBUFFER_BLUE_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
-      if (baseFormat == GL_RGB || baseFormat == GL_RGBA)
-         return _mesa_get_format_bits(format, pname);
-      else
-         return 0;
-   case GL_RENDERBUFFER_ALPHA_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
-      if (baseFormat == GL_RGBA || baseFormat == GL_ALPHA)
-         return _mesa_get_format_bits(format, pname);
-      else
-         return 0;
-   case GL_RENDERBUFFER_DEPTH_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
-      if (baseFormat == GL_DEPTH_COMPONENT || baseFormat == GL_DEPTH_STENCIL)
-         return _mesa_get_format_bits(format, pname);
-      else
-         return 0;
-   case GL_RENDERBUFFER_STENCIL_SIZE_EXT:
-   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
-      if (baseFormat == GL_STENCIL_INDEX || baseFormat == GL_DEPTH_STENCIL)
-         return _mesa_get_format_bits(format, pname);
-      else
-         return 0;
-   default:
-      return 0;
-   }
-}
-
-
-
-void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-                             GLsizei width, GLsizei height)
-{
-   /* GL_ARB_fbo says calling this function is equivalent to calling
-    * glRenderbufferStorageMultisample() with samples=0.  We pass in
-    * a token value here just for error reporting purposes.
-    */
-   renderbuffer_storage(target, internalFormat, width, height, NO_SAMPLES);
-}
-
-
-void GLAPIENTRY
-_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
-                                     GLenum internalFormat,
-                                     GLsizei width, GLsizei height)
-{
-   renderbuffer_storage(target, internalFormat, width, height, samples);
-}
-
-
-/**
- * OpenGL ES version of glRenderBufferStorage.
- */
-void GLAPIENTRY
-_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-			   GLsizei width, GLsizei height)
-{
-   switch (internalFormat) {
-   case GL_RGB565:
-      /* XXX this confuses GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-      /* choose a closest format */
-      internalFormat = GL_RGB5;
-      break;
-   default:
-      break;
-   }
-
-   renderbuffer_storage(target, internalFormat, width, height, 0);
-}
-
-
-void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
-{
-   struct gl_renderbuffer *rb;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target != GL_RENDERBUFFER_EXT) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetRenderbufferParameterivEXT(target)");
-      return;
-   }
-
-   rb = ctx->CurrentRenderbuffer;
-   if (!rb) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetRenderbufferParameterivEXT");
-      return;
-   }
-
-   /* No need to flush here since we're just quering state which is
-    * not effected by rendering.
-    */
-
-   switch (pname) {
-   case GL_RENDERBUFFER_WIDTH_EXT:
-      *params = rb->Width;
-      return;
-   case GL_RENDERBUFFER_HEIGHT_EXT:
-      *params = rb->Height;
-      return;
-   case GL_RENDERBUFFER_INTERNAL_FORMAT_EXT:
-      *params = rb->InternalFormat;
-      return;
-   case GL_RENDERBUFFER_RED_SIZE_EXT:
-   case GL_RENDERBUFFER_GREEN_SIZE_EXT:
-   case GL_RENDERBUFFER_BLUE_SIZE_EXT:
-   case GL_RENDERBUFFER_ALPHA_SIZE_EXT:
-   case GL_RENDERBUFFER_DEPTH_SIZE_EXT:
-   case GL_RENDERBUFFER_STENCIL_SIZE_EXT:
-      *params = get_component_bits(pname, rb->_BaseFormat, rb->Format);
-      break;
-   case GL_RENDERBUFFER_SAMPLES:
-      if (ctx->Extensions.ARB_framebuffer_object) {
-         *params = rb->NumSamples;
-         break;
-      }
-      /* fallthrough */
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetRenderbufferParameterivEXT(target)");
-      return;
-   }
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-   if (framebuffer) {
-      struct gl_framebuffer *rb = _mesa_lookup_framebuffer(ctx, framebuffer);
-      if (rb != NULL && rb != &DummyFramebuffer)
-         return GL_TRUE;
-   }
-   return GL_FALSE;
-}
-
-
-/**
- * Check if any of the attachments of the given framebuffer are textures
- * (render to texture).  Call ctx->Driver.RenderTexture() for such
- * attachments.
- */
-static void
-check_begin_texture_render(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   GLuint i;
-   ASSERT(ctx->Driver.RenderTexture);
-
-   if (fb->Name == 0)
-      return; /* can't render to texture with winsys framebuffers */
-
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      struct gl_renderbuffer_attachment *att = fb->Attachment + i;
-      struct gl_texture_object *texObj = att->Texture;
-      if (texObj
-          && texObj->Image[att->CubeMapFace][att->TextureLevel]) {
-         ctx->Driver.RenderTexture(ctx, fb, att);
-      }
-   }
-}
-
-
-/**
- * Examine all the framebuffer's attachments to see if any are textures.
- * If so, call ctx->Driver.FinishRenderTexture() for each texture to
- * notify the device driver that the texture image may have changed.
- */
-static void
-check_end_texture_render(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   if (fb->Name == 0)
-      return; /* can't render to texture with winsys framebuffers */
-
-   if (ctx->Driver.FinishRenderTexture) {
-      GLuint i;
-      for (i = 0; i < BUFFER_COUNT; i++) {
-         struct gl_renderbuffer_attachment *att = fb->Attachment + i;
-         if (att->Texture && att->Renderbuffer) {
-            ctx->Driver.FinishRenderTexture(ctx, att);
-         }
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
-{
-   struct gl_framebuffer *newDrawFb, *newReadFb;
-   struct gl_framebuffer *oldDrawFb, *oldReadFb;
-   GLboolean bindReadBuf, bindDrawBuf;
-   GET_CURRENT_CONTEXT(ctx);
-
-#ifdef DEBUG
-   if (ctx->Extensions.ARB_framebuffer_object) {
-      ASSERT(ctx->Extensions.EXT_framebuffer_object);
-      ASSERT(ctx->Extensions.EXT_framebuffer_blit);
-   }
-#endif
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_framebuffer_object) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindFramebufferEXT(unsupported)");
-      return;
-   }
-
-   switch (target) {
-#if FEATURE_EXT_framebuffer_blit
-   case GL_DRAW_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");
-         return;
-      }
-      bindDrawBuf = GL_TRUE;
-      bindReadBuf = GL_FALSE;
-      break;
-   case GL_READ_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");
-         return;
-      }
-      bindDrawBuf = GL_FALSE;
-      bindReadBuf = GL_TRUE;
-      break;
-#endif
-   case GL_FRAMEBUFFER_EXT:
-      bindDrawBuf = GL_TRUE;
-      bindReadBuf = GL_TRUE;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");
-      return;
-   }
-
-   if (framebuffer) {
-      /* Binding a user-created framebuffer object */
-      newDrawFb = _mesa_lookup_framebuffer(ctx, framebuffer);
-      if (newDrawFb == &DummyFramebuffer) {
-         /* ID was reserved, but no real framebuffer object made yet */
-         newDrawFb = NULL;
-      }
-      else if (!newDrawFb && ctx->Extensions.ARB_framebuffer_object) {
-         /* All FBO IDs must be Gen'd */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFramebuffer(buffer)");
-         return;
-      }
-
-      if (!newDrawFb) {
-	 /* create new framebuffer object */
-	 newDrawFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
-	 if (!newDrawFb) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
-	    return;
-	 }
-         _mesa_HashInsert(ctx->Shared->FrameBuffers, framebuffer, newDrawFb);
-      }
-      newReadFb = newDrawFb;
-   }
-   else {
-      /* Binding the window system framebuffer (which was originally set
-       * with MakeCurrent).
-       */
-      newDrawFb = ctx->WinSysDrawBuffer;
-      newReadFb = ctx->WinSysReadBuffer;
-   }
-
-   ASSERT(newDrawFb);
-   ASSERT(newDrawFb != &DummyFramebuffer);
-
-   /* save pointers to current/old framebuffers */
-   oldDrawFb = ctx->DrawBuffer;
-   oldReadFb = ctx->ReadBuffer;
-
-   /* check if really changing bindings */
-   if (oldDrawFb == newDrawFb)
-      bindDrawBuf = GL_FALSE;
-   if (oldReadFb == newReadFb)
-      bindReadBuf = GL_FALSE;
-
-   /*
-    * OK, now bind the new Draw/Read framebuffers, if they're changing.
-    *
-    * We also check if we're beginning and/or ending render-to-texture.
-    * When a framebuffer with texture attachments is unbound, call
-    * ctx->Driver.FinishRenderTexture().
-    * When a framebuffer with texture attachments is bound, call
-    * ctx->Driver.RenderTexture().
-    *
-    * Note that if the ReadBuffer has texture attachments we don't consider
-    * that a render-to-texture case.
-    */
-   if (bindReadBuf) {
-      FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-      /* check if old readbuffer was render-to-texture */
-      check_end_texture_render(ctx, oldReadFb);
-
-      _mesa_reference_framebuffer(&ctx->ReadBuffer, newReadFb);
-   }
-
-   if (bindDrawBuf) {
-      FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-      /* check if old read/draw buffers were render-to-texture */
-      if (!bindReadBuf)
-         check_end_texture_render(ctx, oldReadFb);
-
-      if (oldDrawFb != oldReadFb)
-         check_end_texture_render(ctx, oldDrawFb);
-
-      /* check if newly bound framebuffer has any texture attachments */
-      check_begin_texture_render(ctx, newDrawFb);
-
-      _mesa_reference_framebuffer(&ctx->DrawBuffer, newDrawFb);
-   }
-
-   if ((bindDrawBuf || bindReadBuf) && ctx->Driver.BindFramebuffer) {
-      ctx->Driver.BindFramebuffer(ctx, target, newDrawFb, newReadFb);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
-{
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   for (i = 0; i < n; i++) {
-      if (framebuffers[i] > 0) {
-	 struct gl_framebuffer *fb;
-	 fb = _mesa_lookup_framebuffer(ctx, framebuffers[i]);
-	 if (fb) {
-            ASSERT(fb == &DummyFramebuffer || fb->Name == framebuffers[i]);
-
-            /* check if deleting currently bound framebuffer object */
-            if (ctx->Extensions.EXT_framebuffer_blit) {
-               /* separate draw/read binding points */
-               if (fb == ctx->DrawBuffer) {
-                  /* bind default */
-                  ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);
-               }
-               if (fb == ctx->ReadBuffer) {
-                  /* bind default */
-                  ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
-               }
-            }
-            else {
-               /* only one binding point for read/draw buffers */
-               if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) {
-                  /* bind default */
-                  ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-               }    
-            }
-
-	    /* remove from hash table immediately, to free the ID */
-	    _mesa_HashRemove(ctx->Shared->FrameBuffers, framebuffers[i]);
-
-            if (fb != &DummyFramebuffer) {
-               /* But the object will not be freed until it's no longer
-                * bound in any context.
-                */
-               _mesa_reference_framebuffer(&fb, NULL);
-	    }
-	 }
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint first;
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenFramebuffersEXT(n)");
-      return;
-   }
-
-   if (!framebuffers)
-      return;
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->FrameBuffers, n);
-
-   for (i = 0; i < n; i++) {
-      GLuint name = first + i;
-      framebuffers[i] = name;
-      /* insert dummy placeholder into hash table */
-      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-      _mesa_HashInsert(ctx->Shared->FrameBuffers, name, &DummyFramebuffer);
-      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-   }
-}
-
-
-
-GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target)
-{
-   struct gl_framebuffer *buffer;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   switch (target) {
-#if FEATURE_EXT_framebuffer_blit
-   case GL_DRAW_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glCheckFramebufferStatus(target)");
-         return 0;
-      }
-      buffer = ctx->DrawBuffer;
-      break;
-   case GL_READ_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glCheckFramebufferStatus(target)");
-         return 0;
-      }
-      buffer = ctx->ReadBuffer;
-      break;
-#endif
-   case GL_FRAMEBUFFER_EXT:
-      buffer = ctx->DrawBuffer;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCheckFramebufferStatus(target)");
-      return 0; /* formerly GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   }
-
-   if (buffer->Name == 0) {
-      /* The window system / default framebuffer is always complete */
-      return GL_FRAMEBUFFER_COMPLETE_EXT;
-   }
-
-   /* No need to flush here */
-
-   if (buffer->_Status != GL_FRAMEBUFFER_COMPLETE) {
-      _mesa_test_framebuffer_completeness(ctx, buffer);
-   }
-
-   return buffer->_Status;
-}
-
-
-
-/**
- * Common code called by glFramebufferTexture1D/2D/3DEXT().
- */
-static void
-framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target, 
-                    GLenum attachment, GLenum textarget, GLuint texture,
-                    GLint level, GLint zoffset)
-{
-   struct gl_renderbuffer_attachment *att;
-   struct gl_texture_object *texObj = NULL;
-   struct gl_framebuffer *fb;
-   GLboolean error = GL_FALSE;
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-   case GL_READ_FRAMEBUFFER_EXT:
-      error = !ctx->Extensions.EXT_framebuffer_blit;
-      fb = ctx->ReadBuffer;
-      break;
-   case GL_DRAW_FRAMEBUFFER_EXT:
-      error = !ctx->Extensions.EXT_framebuffer_blit;
-      /* fall-through */
-   case GL_FRAMEBUFFER_EXT:
-      fb = ctx->DrawBuffer;
-      break;
-   default:
-      error = GL_TRUE;
-   }
-
-   if (error) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferTexture%sEXT(target=0x%x)", caller, target);
-      return;
-   }
-
-   ASSERT(fb);
-
-   /* check framebuffer binding */
-   if (fb->Name == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFramebufferTexture%sEXT", caller);
-      return;
-   }
-
-
-   /* The textarget, level, and zoffset parameters are only validated if
-    * texture is non-zero.
-    */
-   if (texture) {
-      GLboolean err = GL_TRUE;
-
-      texObj = _mesa_lookup_texture(ctx, texture);
-      if (texObj != NULL) {
-         if (textarget == 0) {
-            /* XXX what's the purpose of this? */
-            err = (texObj->Target != GL_TEXTURE_3D) &&
-                (texObj->Target != GL_TEXTURE_1D_ARRAY_EXT) &&
-                (texObj->Target != GL_TEXTURE_2D_ARRAY_EXT);
-         }
-         else {
-            err = (texObj->Target == GL_TEXTURE_CUBE_MAP)
-                ? !IS_CUBE_FACE(textarget)
-                : (texObj->Target != textarget);
-         }
-      }
-      else {
-         /* can't render to a non-existant texture */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glFramebufferTexture%sEXT(non existant texture)",
-                     caller);
-         return;
-      }
-
-      if (err) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glFramebufferTexture%sEXT(texture target mismatch)",
-                     caller);
-         return;
-      }
-
-      if (texObj->Target == GL_TEXTURE_3D) {
-         const GLint maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
-         if (zoffset < 0 || zoffset >= maxSize) {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glFramebufferTexture%sEXT(zoffset)", caller);
-            return;
-         }
-      }
-      else if ((texObj->Target == GL_TEXTURE_1D_ARRAY_EXT) ||
-               (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT)) {
-         if (zoffset < 0 || zoffset >= ctx->Const.MaxArrayTextureLayers) {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glFramebufferTexture%sEXT(layer)", caller);
-            return;
-         }
-      }
-
-      if ((level < 0) || 
-          (level >= _mesa_max_texture_levels(ctx, texObj->Target))) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glFramebufferTexture%sEXT(level)", caller);
-         return;
-      }
-   }
-
-   att = _mesa_get_attachment(ctx, fb, attachment);
-   if (att == NULL) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferTexture%sEXT(attachment)", caller);
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   _glthread_LOCK_MUTEX(fb->Mutex);
-   if (texObj) {
-      _mesa_set_texture_attachment(ctx, fb, att, texObj, textarget,
-                                   level, zoffset);
-      /* Set the render-to-texture flag.  We'll check this flag in
-       * glTexImage() and friends to determine if we need to revalidate
-       * any FBOs that might be rendering into this texture.
-       * This flag never gets cleared since it's non-trivial to determine
-       * when all FBOs might be done rendering to this texture.  That's OK
-       * though since it's uncommon to render to a texture then repeatedly
-       * call glTexImage() to change images in the texture.
-       */
-      texObj->_RenderToTexture = GL_TRUE;
-   }
-   else {
-      _mesa_remove_attachment(ctx, att);
-   }
-
-   invalidate_framebuffer(fb);
-
-   _glthread_UNLOCK_MUTEX(fb->Mutex);
-}
-
-
-
-void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if ((texture != 0) && (textarget != GL_TEXTURE_1D)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferTexture1DEXT(textarget)");
-      return;
-   }
-
-   framebuffer_texture(ctx, "1D", target, attachment, textarget, texture,
-                       level, 0);
-}
-
-
-void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if ((texture != 0) &&
-       (textarget != GL_TEXTURE_2D) &&
-       (textarget != GL_TEXTURE_RECTANGLE_ARB) &&
-       (!IS_CUBE_FACE(textarget))) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFramebufferTexture2DEXT(textarget=0x%x)", textarget);
-      return;
-   }
-
-   framebuffer_texture(ctx, "2D", target, attachment, textarget, texture,
-                       level, 0);
-}
-
-
-void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture,
-                              GLint level, GLint zoffset)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if ((texture != 0) && (textarget != GL_TEXTURE_3D)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferTexture3DEXT(textarget)");
-      return;
-   }
-
-   framebuffer_texture(ctx, "3D", target, attachment, textarget, texture,
-                       level, zoffset);
-}
-
-
-void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
-                                 GLuint texture, GLint level, GLint layer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   framebuffer_texture(ctx, "Layer", target, attachment, 0, texture,
-                       level, layer);
-}
-
-
-void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
-                                 GLenum renderbufferTarget,
-                                 GLuint renderbuffer)
-{
-   struct gl_renderbuffer_attachment *att;
-   struct gl_framebuffer *fb;
-   struct gl_renderbuffer *rb;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-#if FEATURE_EXT_framebuffer_blit
-   case GL_DRAW_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glFramebufferRenderbufferEXT(target)");
-         return;
-      }
-      fb = ctx->DrawBuffer;
-      break;
-   case GL_READ_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glFramebufferRenderbufferEXT(target)");
-         return;
-      }
-      fb = ctx->ReadBuffer;
-      break;
-#endif
-   case GL_FRAMEBUFFER_EXT:
-      fb = ctx->DrawBuffer;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferRenderbufferEXT(target)");
-      return;
-   }
-
-   if (renderbufferTarget != GL_RENDERBUFFER_EXT) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferRenderbufferEXT(renderbufferTarget)");
-      return;
-   }
-
-   if (fb->Name == 0) {
-      /* Can't attach new renderbuffers to a window system framebuffer */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glFramebufferRenderbufferEXT");
-      return;
-   }
-
-   att = _mesa_get_attachment(ctx, fb, attachment);
-   if (att == NULL) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferRenderbufferEXT(invalid attachment %s)",
-                  _mesa_lookup_enum_by_nr(attachment));
-      return;
-   }
-
-   if (renderbuffer) {
-      rb = _mesa_lookup_renderbuffer(ctx, renderbuffer);
-      if (!rb) {
-	 _mesa_error(ctx, GL_INVALID_OPERATION,
-		     "glFramebufferRenderbufferEXT(non-existant"
-                     " renderbuffer %u)", renderbuffer);
-	 return;
-      }
-   }
-   else {
-      /* remove renderbuffer attachment */
-      rb = NULL;
-   }
-
-   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT &&
-       rb && rb->Format != MESA_FORMAT_NONE) {
-      /* make sure the renderbuffer is a depth/stencil format */
-      const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);
-      if (baseFormat != GL_DEPTH_STENCIL) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glFramebufferRenderbufferEXT(renderbuffer"
-                     " is not DEPTH_STENCIL format)");
-         return;
-      }
-   }
-
-
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   assert(ctx->Driver.FramebufferRenderbuffer);
-   ctx->Driver.FramebufferRenderbuffer(ctx, fb, attachment, rb);
-
-   /* Some subsequent GL commands may depend on the framebuffer's visual
-    * after the binding is updated.  Update visual info now.
-    */
-   _mesa_update_framebuffer_visual(fb);
-}
-
-
-void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
-                                             GLenum pname, GLint *params)
-{
-   const struct gl_renderbuffer_attachment *att;
-   struct gl_framebuffer *buffer;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-#if FEATURE_EXT_framebuffer_blit
-   case GL_DRAW_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetFramebufferAttachmentParameterivEXT(target)");
-         return;
-      }
-      buffer = ctx->DrawBuffer;
-      break;
-   case GL_READ_FRAMEBUFFER_EXT:
-      if (!ctx->Extensions.EXT_framebuffer_blit) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetFramebufferAttachmentParameterivEXT(target)");
-         return;
-      }
-      buffer = ctx->ReadBuffer;
-      break;
-#endif
-   case GL_FRAMEBUFFER_EXT:
-      buffer = ctx->DrawBuffer;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetFramebufferAttachmentParameterivEXT(target)");
-      return;
-   }
-
-   if (buffer->Name == 0) {
-      /* the default / window-system FBO */
-      att = _mesa_get_fb0_attachment(ctx, buffer, attachment);
-   }
-   else {
-      /* user-created framebuffer FBO */
-      att = _mesa_get_attachment(ctx, buffer, attachment);
-   }
-
-   if (att == NULL) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetFramebufferAttachmentParameterivEXT(attachment)");
-      return;
-   }
-
-   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-      /* the depth and stencil attachments must point to the same buffer */
-      const struct gl_renderbuffer_attachment *depthAtt, *stencilAtt;
-      depthAtt = _mesa_get_attachment(ctx, buffer, GL_DEPTH_ATTACHMENT);
-      stencilAtt = _mesa_get_attachment(ctx, buffer, GL_STENCIL_ATTACHMENT);
-      if (depthAtt->Renderbuffer != stencilAtt->Renderbuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetFramebufferAttachmentParameterivEXT(DEPTH/STENCIL"
-                     " attachments differ)");
-         return;
-      }
-   }
-
-   /* No need to flush here */
-
-   switch (pname) {
-   case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
-      *params = att->Type;
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
-      if (att->Type == GL_RENDERBUFFER_EXT) {
-	 *params = att->Renderbuffer->Name;
-      }
-      else if (att->Type == GL_TEXTURE) {
-	 *params = att->Texture->Name;
-      }
-      else {
-	 _mesa_error(ctx, GL_INVALID_ENUM,
-		     "glGetFramebufferAttachmentParameterivEXT(pname)");
-      }
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
-      if (att->Type == GL_TEXTURE) {
-	 *params = att->TextureLevel;
-      }
-      else {
-	 _mesa_error(ctx, GL_INVALID_ENUM,
-		     "glGetFramebufferAttachmentParameterivEXT(pname)");
-      }
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
-      if (att->Type == GL_TEXTURE) {
-         if (att->Texture && att->Texture->Target == GL_TEXTURE_CUBE_MAP) {
-            *params = GL_TEXTURE_CUBE_MAP_POSITIVE_X + att->CubeMapFace;
-         }
-         else {
-            *params = 0;
-         }
-      }
-      else {
-	 _mesa_error(ctx, GL_INVALID_ENUM,
-		     "glGetFramebufferAttachmentParameterivEXT(pname)");
-      }
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
-      if (att->Type == GL_TEXTURE) {
-         if (att->Texture && att->Texture->Target == GL_TEXTURE_3D) {
-            *params = att->Zoffset;
-         }
-         else {
-            *params = 0;
-         }
-      }
-      else {
-	 _mesa_error(ctx, GL_INVALID_ENUM,
-		     "glGetFramebufferAttachmentParameterivEXT(pname)");
-      }
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING:
-      if (!ctx->Extensions.ARB_framebuffer_object) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetFramebufferAttachmentParameterivEXT(pname)");
-      }
-      else {
-         *params = _mesa_get_format_color_encoding(att->Renderbuffer->Format);
-      }
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
-      if (!ctx->Extensions.ARB_framebuffer_object) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetFramebufferAttachmentParameterivEXT(pname)");
-         return;
-      }
-      else {
-         gl_format format = att->Renderbuffer->Format;
-         if (format == MESA_FORMAT_CI8 || format == MESA_FORMAT_S8) {
-            /* special cases */
-            *params = GL_INDEX;
-         }
-         else {
-            *params = _mesa_get_format_datatype(format);
-         }
-      }
-      return;
-   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
-   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
-   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
-   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
-   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
-   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
-      if (!ctx->Extensions.ARB_framebuffer_object) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetFramebufferAttachmentParameterivEXT(pname)");
-      }
-      else if (att->Texture) {
-         const struct gl_texture_image *texImage =
-            _mesa_select_tex_image(ctx, att->Texture, att->Texture->Target,
-                                   att->TextureLevel);
-         if (texImage) {
-            *params = get_component_bits(pname, texImage->_BaseFormat,
-                                         texImage->TexFormat);
-         }
-         else {
-            *params = 0;
-         }
-      }
-      else if (att->Renderbuffer) {
-         *params = get_component_bits(pname, att->Renderbuffer->_BaseFormat,
-                                      att->Renderbuffer->Format);
-      }
-      else {
-         *params = 0;
-      }
-      return;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetFramebufferAttachmentParameterivEXT(pname)");
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target)
-{
-   struct gl_texture_object *texObj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   switch (target) {
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_3D:
-   case GL_TEXTURE_CUBE_MAP:
-      /* OK, legal value */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGenerateMipmapEXT(target)");
-      return;
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   if (texObj->BaseLevel >= texObj->MaxLevel) {
-      /* nothing to do */
-      return;
-   }
-
-   _mesa_lock_texture(ctx, texObj);
-   if (target == GL_TEXTURE_CUBE_MAP) {
-      GLuint face;
-      for (face = 0; face < 6; face++)
-	 ctx->Driver.GenerateMipmap(ctx,
-				    GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB + face,
-				    texObj);
-   }
-   else {
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-#if FEATURE_EXT_framebuffer_blit
-
-static const struct gl_renderbuffer_attachment *
-find_attachment(const struct gl_framebuffer *fb, const struct gl_renderbuffer *rb)
-{
-   GLuint i;
-   for (i = 0; i < Elements(fb->Attachment); i++) {
-      if (fb->Attachment[i].Renderbuffer == rb)
-         return &fb->Attachment[i];
-   }
-   return NULL;
-}
-
-
-
-/**
- * Blit rectangular region, optionally from one framebuffer to another.
- *
- * Note, if the src buffer is multisampled and the dest is not, this is
- * when the samples must be resolved to a single color.
- */
-void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                         GLbitfield mask, GLenum filter)
-{
-   const GLbitfield legalMaskBits = (GL_COLOR_BUFFER_BIT |
-                                     GL_DEPTH_BUFFER_BIT |
-                                     GL_STENCIL_BUFFER_BIT);
-   const struct gl_framebuffer *readFb, *drawFb;
-   const struct gl_renderbuffer *colorReadRb, *colorDrawRb;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   readFb = ctx->ReadBuffer;
-   drawFb = ctx->DrawBuffer;
-
-   if (!readFb || !drawFb) {
-      /* This will normally never happen but someday we may want to
-       * support MakeCurrent() with no drawables.
-       */
-      return;
-   }
-
-   /* check for complete framebuffers */
-   if (drawFb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
-       readFb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glBlitFramebufferEXT(incomplete draw/read buffers)");
-      return;
-   }
-
-   if (filter != GL_NEAREST && filter != GL_LINEAR) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBlitFramebufferEXT(filter)");
-      return;
-   }
-
-   if (mask & ~legalMaskBits) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glBlitFramebufferEXT(mask)");
-      return;
-   }
-
-   /* depth/stencil must be blitted with nearest filtering */
-   if ((mask & (GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT))
-        && filter != GL_NEAREST) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-             "glBlitFramebufferEXT(depth/stencil requires GL_NEAREST filter");
-      return;
-   }
-
-   /* get color read/draw renderbuffers */
-   if (mask & GL_COLOR_BUFFER_BIT) {
-      colorReadRb = readFb->_ColorReadBuffer;
-      colorDrawRb = drawFb->_ColorDrawBuffers[0];
-   }
-   else {
-      colorReadRb = colorDrawRb = NULL;
-   }
-
-   if (mask & GL_STENCIL_BUFFER_BIT) {
-      struct gl_renderbuffer *readRb = readFb->_StencilBuffer;
-      struct gl_renderbuffer *drawRb = drawFb->_StencilBuffer;
-      if (!readRb ||
-          !drawRb ||
-          _mesa_get_format_bits(readRb->Format, GL_STENCIL_BITS) != 
-          _mesa_get_format_bits(drawRb->Format, GL_STENCIL_BITS)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glBlitFramebufferEXT(stencil buffer size mismatch");
-         return;
-      }
-   }
-
-   if (mask & GL_DEPTH_BUFFER_BIT) {
-      struct gl_renderbuffer *readRb = readFb->_DepthBuffer;
-      struct gl_renderbuffer *drawRb = drawFb->_DepthBuffer;
-      if (!readRb ||
-          !drawRb ||
-          _mesa_get_format_bits(readRb->Format, GL_DEPTH_BITS) != 
-          _mesa_get_format_bits(drawRb->Format, GL_DEPTH_BITS)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glBlitFramebufferEXT(depth buffer size mismatch");
-         return;
-      }
-   }
-
-   if (readFb->Visual.samples > 0 &&
-       drawFb->Visual.samples > 0 &&
-       readFb->Visual.samples != drawFb->Visual.samples) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBlitFramebufferEXT(mismatched samples");
-      return;
-   }
-
-   /* extra checks for multisample copies... */
-   if (readFb->Visual.samples > 0 || drawFb->Visual.samples > 0) {
-      /* src and dest region sizes must be the same */
-      if (srcX1 - srcX0 != dstX1 - dstX0 ||
-          srcY1 - srcY0 != dstY1 - dstY0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                "glBlitFramebufferEXT(bad src/dst multisample region sizes");
-         return;
-      }
-
-      /* color formats must match */
-      if (colorReadRb &&
-          colorDrawRb &&
-          colorReadRb->Format != colorDrawRb->Format) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                "glBlitFramebufferEXT(bad src/dst multisample pixel formats");
-         return;
-      }
-   }
-
-   if (!ctx->Extensions.EXT_framebuffer_blit) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBlitFramebufferEXT");
-      return;
-   }
-
-   /* Debug code */
-   if (DEBUG_BLIT) {
-      printf("glBlitFramebuffer(%d, %d, %d, %d,  %d, %d, %d, %d,"
-	     " 0x%x, 0x%x)\n",
-	     srcX0, srcY0, srcX1, srcY1,
-	     dstX0, dstY0, dstX1, dstY1,
-	     mask, filter);
-      if (colorReadRb) {
-         const struct gl_renderbuffer_attachment *att;
-
-         att = find_attachment(readFb, colorReadRb);
-         printf("  Src FBO %u  RB %u (%dx%d)  ",
-		readFb->Name, colorReadRb->Name,
-		colorReadRb->Width, colorReadRb->Height);
-         if (att && att->Texture) {
-            printf("Tex %u  tgt 0x%x  level %u  face %u",
-		   att->Texture->Name,
-		   att->Texture->Target,
-		   att->TextureLevel,
-		   att->CubeMapFace);
-         }
-         printf("\n");
-
-         att = find_attachment(drawFb, colorDrawRb);
-         printf("  Dst FBO %u  RB %u (%dx%d)  ",
-		drawFb->Name, colorDrawRb->Name,
-		colorDrawRb->Width, colorDrawRb->Height);
-         if (att && att->Texture) {
-            printf("Tex %u  tgt 0x%x  level %u  face %u",
-		   att->Texture->Name,
-		   att->Texture->Target,
-		   att->TextureLevel,
-		   att->CubeMapFace);
-         }
-         printf("\n");
-      }
-   }
-
-   ASSERT(ctx->Driver.BlitFramebuffer);
-   ctx->Driver.BlitFramebuffer(ctx,
-                               srcX0, srcY0, srcX1, srcY1,
-                               dstX0, dstY0, dstX1, dstY1,
-                               mask, filter);
-}
-#endif /* FEATURE_EXT_framebuffer_blit */
-
-#if FEATURE_ARB_geometry_shader4
-void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glFramebufferTextureARB "
-               "not implemented!");
-}
-
-void GLAPIENTRY
-_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
-                                GLuint texture, GLint level, GLenum face)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glFramebufferTextureFaceARB "
-               "not implemented!");
-}
-#endif /* FEATURE_ARB_geometry_shader4 */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 1999-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.

+ */

+

+

+/*

+ * GL_EXT/ARB_framebuffer_object extensions

+ *

+ * Authors:

+ *   Brian Paul

+ */

+

+

+#include "buffers.h"

+#include "context.h"

+#include "enums.h"

+#include "fbobject.h"

+#include "formats.h"

+#include "framebuffer.h"

+#include "hash.h"

+#include "macros.h"

+#include "renderbuffer.h"

+#include "state.h"

+#include "teximage.h"

+#include "texobj.h"

+

+

+/** Set this to 1 to help debug FBO incompleteness problems */

+#define DEBUG_FBO 0

+

+/** Set this to 1 to debug/log glBlitFramebuffer() calls */

+#define DEBUG_BLIT 0

+

+

+/**

+ * Notes:

+ *

+ * None of the GL_EXT_framebuffer_object functions are compiled into

+ * display lists.

+ */

+

+

+

+/*

+ * When glGenRender/FramebuffersEXT() is called we insert pointers to

+ * these placeholder objects into the hash table.

+ * Later, when the object ID is first bound, we replace the placeholder

+ * with the real frame/renderbuffer.

+ */

+static struct gl_framebuffer DummyFramebuffer;

+static struct gl_renderbuffer DummyRenderbuffer;

+

+/* We bind this framebuffer when applications pass a NULL

+ * drawable/surface in make current. */

+static struct gl_framebuffer IncompleteFramebuffer;

+

+

+#define IS_CUBE_FACE(TARGET) \

+   ((TARGET) >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && \

+    (TARGET) <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z)

+

+

+static void

+delete_dummy_renderbuffer(struct gl_renderbuffer *rb)

+{

+   /* no op */

+}

+

+static void

+delete_dummy_framebuffer(struct gl_framebuffer *fb)

+{

+   /* no op */

+}

+

+

+void

+_mesa_init_fbobjects(struct gl_context *ctx)

+{

+   _glthread_INIT_MUTEX(DummyFramebuffer.Mutex);

+   _glthread_INIT_MUTEX(DummyRenderbuffer.Mutex);

+   _glthread_INIT_MUTEX(IncompleteFramebuffer.Mutex);

+   DummyFramebuffer.Delete = delete_dummy_framebuffer;

+   DummyRenderbuffer.Delete = delete_dummy_renderbuffer;

+   IncompleteFramebuffer.Delete = delete_dummy_framebuffer;

+}

+

+struct gl_framebuffer *

+_mesa_get_incomplete_framebuffer(void)

+{

+   return &IncompleteFramebuffer;

+}

+

+/**

+ * Helper routine for getting a gl_renderbuffer.

+ */

+struct gl_renderbuffer *

+_mesa_lookup_renderbuffer(struct gl_context *ctx, GLuint id)

+{

+   struct gl_renderbuffer *rb;

+

+   if (id == 0)

+      return NULL;

+

+   rb = (struct gl_renderbuffer *)

+      _mesa_HashLookup(ctx->Shared->RenderBuffers, id);

+   return rb;

+}

+

+

+/**

+ * Helper routine for getting a gl_framebuffer.

+ */

+struct gl_framebuffer *

+_mesa_lookup_framebuffer(struct gl_context *ctx, GLuint id)

+{

+   struct gl_framebuffer *fb;

+

+   if (id == 0)

+      return NULL;

+

+   fb = (struct gl_framebuffer *)

+      _mesa_HashLookup(ctx->Shared->FrameBuffers, id);

+   return fb;

+}

+

+

+/**

+ * Mark the given framebuffer as invalid.  This will force the

+ * test for framebuffer completeness to be done before the framebuffer

+ * is used.

+ */

+static void

+invalidate_framebuffer(struct gl_framebuffer *fb)

+{

+   fb->_Status = 0; /* "indeterminate" */

+}

+

+

+/**

+ * Given a GL_*_ATTACHMENTn token, return a pointer to the corresponding

+ * gl_renderbuffer_attachment object.

+ * This function is only used for user-created FB objects, not the

+ * default / window-system FB object.

+ * If \p attachment is GL_DEPTH_STENCIL_ATTACHMENT, return a pointer to

+ * the depth buffer attachment point.

+ */

+struct gl_renderbuffer_attachment *

+_mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,

+                     GLenum attachment)

+{

+   GLuint i;

+

+   assert(fb->Name > 0);

+

+   switch (attachment) {

+   case GL_COLOR_ATTACHMENT0_EXT:

+   case GL_COLOR_ATTACHMENT1_EXT:

+   case GL_COLOR_ATTACHMENT2_EXT:

+   case GL_COLOR_ATTACHMENT3_EXT:

+   case GL_COLOR_ATTACHMENT4_EXT:

+   case GL_COLOR_ATTACHMENT5_EXT:

+   case GL_COLOR_ATTACHMENT6_EXT:

+   case GL_COLOR_ATTACHMENT7_EXT:

+   case GL_COLOR_ATTACHMENT8_EXT:

+   case GL_COLOR_ATTACHMENT9_EXT:

+   case GL_COLOR_ATTACHMENT10_EXT:

+   case GL_COLOR_ATTACHMENT11_EXT:

+   case GL_COLOR_ATTACHMENT12_EXT:

+   case GL_COLOR_ATTACHMENT13_EXT:

+   case GL_COLOR_ATTACHMENT14_EXT:

+   case GL_COLOR_ATTACHMENT15_EXT:

+      i = attachment - GL_COLOR_ATTACHMENT0_EXT;

+      if (i >= ctx->Const.MaxColorAttachments) {

+	 return NULL;

+      }

+      return &fb->Attachment[BUFFER_COLOR0 + i];

+   case GL_DEPTH_STENCIL_ATTACHMENT:

+      /* fall-through */

+   case GL_DEPTH_BUFFER:

+      /* fall-through / new in GL 3.0 */

+   case GL_DEPTH_ATTACHMENT_EXT:

+      return &fb->Attachment[BUFFER_DEPTH];

+   case GL_STENCIL_BUFFER:

+      /* fall-through / new in GL 3.0 */

+   case GL_STENCIL_ATTACHMENT_EXT:

+      return &fb->Attachment[BUFFER_STENCIL];

+   default:

+      return NULL;

+   }

+}

+

+

+/**

+ * As above, but only used for getting attachments of the default /

+ * window-system framebuffer (not user-created framebuffer objects).

+ */

+static struct gl_renderbuffer_attachment *

+_mesa_get_fb0_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,

+                         GLenum attachment)

+{

+   assert(fb->Name == 0);

+

+   switch (attachment) {

+   case GL_FRONT_LEFT:

+      return &fb->Attachment[BUFFER_FRONT_LEFT];

+   case GL_FRONT_RIGHT:

+      return &fb->Attachment[BUFFER_FRONT_RIGHT];

+   case GL_BACK_LEFT:

+      return &fb->Attachment[BUFFER_BACK_LEFT];

+   case GL_BACK_RIGHT:

+      return &fb->Attachment[BUFFER_BACK_RIGHT];

+   case GL_AUX0:

+      if (fb->Visual.numAuxBuffers == 1) {

+         return &fb->Attachment[BUFFER_AUX0];

+      }

+      return NULL;

+   case GL_DEPTH_BUFFER:

+      /* fall-through / new in GL 3.0 */

+   case GL_DEPTH_ATTACHMENT_EXT:

+      return &fb->Attachment[BUFFER_DEPTH];

+   case GL_STENCIL_BUFFER:

+      /* fall-through / new in GL 3.0 */

+   case GL_STENCIL_ATTACHMENT_EXT:

+      return &fb->Attachment[BUFFER_STENCIL];

+   default:

+      return NULL;

+   }

+}

+

+

+

+/**

+ * Remove any texture or renderbuffer attached to the given attachment

+ * point.  Update reference counts, etc.

+ */

+void

+_mesa_remove_attachment(struct gl_context *ctx,

+                        struct gl_renderbuffer_attachment *att)

+{

+   if (att->Type == GL_TEXTURE) {

+      ASSERT(att->Texture);

+      if (ctx->Driver.FinishRenderTexture) {

+         /* tell driver that we're done rendering to this texture. */

+         ctx->Driver.FinishRenderTexture(ctx, att);

+      }

+      _mesa_reference_texobj(&att->Texture, NULL); /* unbind */

+      ASSERT(!att->Texture);

+   }

+   if (att->Type == GL_TEXTURE || att->Type == GL_RENDERBUFFER_EXT) {

+      ASSERT(!att->Texture);

+      _mesa_reference_renderbuffer(&att->Renderbuffer, NULL); /* unbind */

+      ASSERT(!att->Renderbuffer);

+   }

+   att->Type = GL_NONE;

+   att->Complete = GL_TRUE;

+}

+

+

+/**

+ * Bind a texture object to an attachment point.

+ * The previous binding, if any, will be removed first.

+ */

+void

+_mesa_set_texture_attachment(struct gl_context *ctx,

+                             struct gl_framebuffer *fb,

+                             struct gl_renderbuffer_attachment *att,

+                             struct gl_texture_object *texObj,

+                             GLenum texTarget, GLuint level, GLuint zoffset)

+{

+   if (att->Texture == texObj) {

+      /* re-attaching same texture */

+      ASSERT(att->Type == GL_TEXTURE);

+      if (ctx->Driver.FinishRenderTexture)

+	 ctx->Driver.FinishRenderTexture(ctx, att);

+   }

+   else {

+      /* new attachment */

+      if (ctx->Driver.FinishRenderTexture && att->Texture)

+	 ctx->Driver.FinishRenderTexture(ctx, att);

+      _mesa_remove_attachment(ctx, att);

+      att->Type = GL_TEXTURE;

+      assert(!att->Texture);

+      _mesa_reference_texobj(&att->Texture, texObj);

+   }

+

+   /* always update these fields */

+   att->TextureLevel = level;

+   att->CubeMapFace = _mesa_tex_target_to_face(texTarget);

+   att->Zoffset = zoffset;

+   att->Complete = GL_FALSE;

+

+   if (att->Texture->Image[att->CubeMapFace][att->TextureLevel]) {

+      ctx->Driver.RenderTexture(ctx, fb, att);

+   }

+

+   invalidate_framebuffer(fb);

+}

+

+

+/**

+ * Bind a renderbuffer to an attachment point.

+ * The previous binding, if any, will be removed first.

+ */

+void

+_mesa_set_renderbuffer_attachment(struct gl_context *ctx,

+                                  struct gl_renderbuffer_attachment *att,

+                                  struct gl_renderbuffer *rb)

+{

+   /* XXX check if re-doing same attachment, exit early */

+   _mesa_remove_attachment(ctx, att);

+   att->Type = GL_RENDERBUFFER_EXT;

+   att->Texture = NULL; /* just to be safe */

+   att->Complete = GL_FALSE;

+   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);

+}

+

+

+/**

+ * Fallback for ctx->Driver.FramebufferRenderbuffer()

+ * Attach a renderbuffer object to a framebuffer object.

+ */

+void

+_mesa_framebuffer_renderbuffer(struct gl_context *ctx,

+                               struct gl_framebuffer *fb,

+                               GLenum attachment, struct gl_renderbuffer *rb)

+{

+   struct gl_renderbuffer_attachment *att;

+

+   _glthread_LOCK_MUTEX(fb->Mutex);

+

+   att = _mesa_get_attachment(ctx, fb, attachment);

+   ASSERT(att);

+   if (rb) {

+      _mesa_set_renderbuffer_attachment(ctx, att, rb);

+      if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {

+         /* do stencil attachment here (depth already done above) */

+         att = _mesa_get_attachment(ctx, fb, GL_STENCIL_ATTACHMENT_EXT);

+         assert(att);

+         _mesa_set_renderbuffer_attachment(ctx, att, rb);

+      }

+   }

+   else {

+      _mesa_remove_attachment(ctx, att);

+   }

+

+   invalidate_framebuffer(fb);

+

+   _glthread_UNLOCK_MUTEX(fb->Mutex);

+}

+

+

+/**

+ * For debug only.

+ */

+static void

+att_incomplete(const char *msg)

+{

+#if DEBUG_FBO

+   _mesa_debug(NULL, "attachment incomplete: %s\n", msg);

+#else

+   (void) msg;

+#endif

+}

+

+

+/**

+ * For debug only.

+ */

+static void

+fbo_incomplete(const char *msg, int index)

+{

+#if DEBUG_FBO

+   _mesa_debug(NULL, "FBO Incomplete: %s [%d]\n", msg, index);

+#else

+   (void) msg;

+   (void) index;

+#endif

+}

+

+

+/**

+ * Is the given base format a legal format for a color renderbuffer?

+ */

+static GLboolean

+is_legal_color_format(const struct gl_context *ctx, GLenum baseFormat)

+{

+   switch (baseFormat) {

+   case GL_RGB:

+   case GL_RGBA:

+      return GL_TRUE;

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_ALPHA:

+   case GL_INTENSITY:

+   case GL_ALPHA:

+      return ctx->Extensions.ARB_framebuffer_object;

+   case GL_RED:

+   case GL_RG:

+      return ctx->Extensions.ARB_texture_rg;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Is the given base format a legal format for a depth/stencil renderbuffer?

+ */

+static GLboolean

+is_legal_depth_format(const struct gl_context *ctx, GLenum baseFormat)

+{

+   switch (baseFormat) {

+   case GL_DEPTH_COMPONENT:

+   case GL_DEPTH_STENCIL_EXT:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test if an attachment point is complete and update its Complete field.

+ * \param format if GL_COLOR, this is a color attachment point,

+ *               if GL_DEPTH, this is a depth component attachment point,

+ *               if GL_STENCIL, this is a stencil component attachment point.

+ */

+static void

+test_attachment_completeness(const struct gl_context *ctx, GLenum format,

+                             struct gl_renderbuffer_attachment *att)

+{

+   assert(format == GL_COLOR || format == GL_DEPTH || format == GL_STENCIL);

+

+   /* assume complete */

+   att->Complete = GL_TRUE;

+

+   /* Look for reasons why the attachment might be incomplete */

+   if (att->Type == GL_TEXTURE) {

+      const struct gl_texture_object *texObj = att->Texture;

+      struct gl_texture_image *texImage;

+      GLenum baseFormat;

+

+      if (!texObj) {

+         att_incomplete("no texobj");

+         att->Complete = GL_FALSE;

+         return;

+      }

+

+      texImage = texObj->Image[att->CubeMapFace][att->TextureLevel];

+      if (!texImage) {

+         att_incomplete("no teximage");

+         att->Complete = GL_FALSE;

+         return;

+      }

+      if (texImage->Width < 1 || texImage->Height < 1) {

+         att_incomplete("teximage width/height=0");

+         printf("texobj = %u\n", texObj->Name);

+         printf("level = %d\n", att->TextureLevel);

+         att->Complete = GL_FALSE;

+         return;

+      }

+      if (texObj->Target == GL_TEXTURE_3D && att->Zoffset >= texImage->Depth) {

+         att_incomplete("bad z offset");

+         att->Complete = GL_FALSE;

+         return;

+      }

+

+      baseFormat = _mesa_get_format_base_format(texImage->TexFormat);

+

+      if (format == GL_COLOR) {

+         if (!is_legal_color_format(ctx, baseFormat)) {

+            att_incomplete("bad format");

+            att->Complete = GL_FALSE;

+            return;

+         }

+         if (_mesa_is_format_compressed(texImage->TexFormat)) {

+            att_incomplete("compressed internalformat");

+            att->Complete = GL_FALSE;

+            return;

+         }

+      }

+      else if (format == GL_DEPTH) {

+         if (baseFormat == GL_DEPTH_COMPONENT) {

+            /* OK */

+         }

+         else if (ctx->Extensions.EXT_packed_depth_stencil &&

+                  ctx->Extensions.ARB_depth_texture &&

+                  baseFormat == GL_DEPTH_STENCIL_EXT) {

+            /* OK */

+         }

+         else {

+            att->Complete = GL_FALSE;

+            att_incomplete("bad depth format");

+            return;

+         }

+      }

+      else {

+         ASSERT(format == GL_STENCIL);

+         if (ctx->Extensions.EXT_packed_depth_stencil &&

+             ctx->Extensions.ARB_depth_texture &&

+             baseFormat == GL_DEPTH_STENCIL_EXT) {

+            /* OK */

+         }

+         else {

+            /* no such thing as stencil-only textures */

+            att_incomplete("illegal stencil texture");

+            att->Complete = GL_FALSE;

+            return;

+         }

+      }

+   }

+   else if (att->Type == GL_RENDERBUFFER_EXT) {

+      const GLenum baseFormat =

+         _mesa_get_format_base_format(att->Renderbuffer->Format);

+

+      ASSERT(att->Renderbuffer);

+      if (!att->Renderbuffer->InternalFormat ||

+          att->Renderbuffer->Width < 1 ||

+          att->Renderbuffer->Height < 1) {

+         att_incomplete("0x0 renderbuffer");

+         att->Complete = GL_FALSE;

+         return;

+      }

+      if (format == GL_COLOR) {

+         if (baseFormat != GL_RGB &&

+             baseFormat != GL_RGBA) {

+            att_incomplete("bad renderbuffer color format");

+            att->Complete = GL_FALSE;

+            return;

+         }

+      }

+      else if (format == GL_DEPTH) {

+         if (baseFormat == GL_DEPTH_COMPONENT) {

+            /* OK */

+         }

+         else if (ctx->Extensions.EXT_packed_depth_stencil &&

+                  baseFormat == GL_DEPTH_STENCIL_EXT) {

+            /* OK */

+         }

+         else {

+            att_incomplete("bad renderbuffer depth format");

+            att->Complete = GL_FALSE;

+            return;

+         }

+      }

+      else {

+         assert(format == GL_STENCIL);

+         if (baseFormat == GL_STENCIL_INDEX) {

+            /* OK */

+         }

+         else if (ctx->Extensions.EXT_packed_depth_stencil &&

+                  baseFormat == GL_DEPTH_STENCIL_EXT) {

+            /* OK */

+         }

+         else {

+            att->Complete = GL_FALSE;

+            att_incomplete("bad renderbuffer stencil format");

+            return;

+         }

+      }

+   }

+   else {

+      ASSERT(att->Type == GL_NONE);

+      /* complete */

+      return;

+   }

+}

+

+

+/**

+ * Test if the given framebuffer object is complete and update its

+ * Status field with the results.

+ * Calls the ctx->Driver.ValidateFramebuffer() function to allow the

+ * driver to make hardware-specific validation/completeness checks.

+ * Also update the framebuffer's Width and Height fields if the

+ * framebuffer is complete.

+ */

+void

+_mesa_test_framebuffer_completeness(struct gl_context *ctx,

+                                    struct gl_framebuffer *fb)

+{

+   GLuint numImages;

+   GLenum intFormat = GL_NONE; /* color buffers' internal format */

+   GLuint minWidth = ~0, minHeight = ~0, maxWidth = 0, maxHeight = 0;

+   GLint numSamples = -1;

+   GLint i;

+   GLuint j;

+

+   assert(fb->Name != 0);

+

+   numImages = 0;

+   fb->Width = 0;

+   fb->Height = 0;

+

+   /* Start at -2 to more easily loop over all attachment points.

+    *  -2: depth buffer

+    *  -1: stencil buffer

+    * >=0: color buffer

+    */

+   for (i = -2; i < (GLint) ctx->Const.MaxColorAttachments; i++) {

+      struct gl_renderbuffer_attachment *att;

+      GLenum f;

+      gl_format mesaFormat;

+

+      /*

+       * XXX for ARB_fbo, only check color buffers that are named by

+       * GL_READ_BUFFER and GL_DRAW_BUFFERi.

+       */

+

+      /* check for attachment completeness

+       */

+      if (i == -2) {

+         att = &fb->Attachment[BUFFER_DEPTH];

+         test_attachment_completeness(ctx, GL_DEPTH, att);

+         if (!att->Complete) {

+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;

+            fbo_incomplete("depth attachment incomplete", -1);

+            return;

+         }

+      }

+      else if (i == -1) {

+         att = &fb->Attachment[BUFFER_STENCIL];

+         test_attachment_completeness(ctx, GL_STENCIL, att);

+         if (!att->Complete) {

+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;

+            fbo_incomplete("stencil attachment incomplete", -1);

+            return;

+         }

+      }

+      else {

+         att = &fb->Attachment[BUFFER_COLOR0 + i];

+         test_attachment_completeness(ctx, GL_COLOR, att);

+         if (!att->Complete) {

+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;

+            fbo_incomplete("color attachment incomplete", i);

+            return;

+         }

+      }

+

+      /* get width, height, format of the renderbuffer/texture

+       */

+      if (att->Type == GL_TEXTURE) {

+         const struct gl_texture_image *texImg

+            = att->Texture->Image[att->CubeMapFace][att->TextureLevel];

+         minWidth = MIN2(minWidth, texImg->Width);

+         maxWidth = MAX2(maxWidth, texImg->Width);

+         minHeight = MIN2(minHeight, texImg->Height);

+         maxHeight = MAX2(maxHeight, texImg->Height);

+         f = texImg->_BaseFormat;

+         mesaFormat = texImg->TexFormat;

+         numImages++;

+         if (!is_legal_color_format(ctx, f) &&

+             !is_legal_depth_format(ctx, f)) {

+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;

+            fbo_incomplete("texture attachment incomplete", -1);

+            return;

+         }

+      }

+      else if (att->Type == GL_RENDERBUFFER_EXT) {

+         minWidth = MIN2(minWidth, att->Renderbuffer->Width);

+         maxWidth = MAX2(minWidth, att->Renderbuffer->Width);

+         minHeight = MIN2(minHeight, att->Renderbuffer->Height);

+         maxHeight = MAX2(minHeight, att->Renderbuffer->Height);

+         f = att->Renderbuffer->InternalFormat;

+         mesaFormat = att->Renderbuffer->Format;

+         numImages++;

+      }

+      else {

+         assert(att->Type == GL_NONE);

+         continue;

+      }

+

+      if (numSamples < 0) {

+         /* first buffer */

+         numSamples = att->Renderbuffer->NumSamples;

+      }

+

+      /* check if integer color */

+      fb->_IntegerColor = _mesa_is_format_integer_color(mesaFormat);

+

+      /* Error-check width, height, format, samples

+       */

+      if (numImages == 1) {

+         /* save format, num samples */

+         if (i >= 0) {

+            intFormat = f;

+         }

+      }

+      else {

+         if (!ctx->Extensions.ARB_framebuffer_object) {

+            /* check that width, height, format are same */

+            if (minWidth != maxWidth || minHeight != maxHeight) {

+               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT;

+               fbo_incomplete("width or height mismatch", -1);

+               return;

+            }

+            /* check that all color buffer have same format */

+            if (intFormat != GL_NONE && f != intFormat) {

+               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;

+               fbo_incomplete("format mismatch", -1);

+               return;

+            }

+         }

+         if (att->Renderbuffer &&

+             att->Renderbuffer->NumSamples != numSamples) {

+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE;

+            fbo_incomplete("inconsistant number of samples", i);

+            return;

+         }            

+

+      }

+   }

+

+#if FEATURE_GL

+   if (ctx->API == API_OPENGL) {

+      /* Check that all DrawBuffers are present */

+      for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {

+	 if (fb->ColorDrawBuffer[j] != GL_NONE) {

+	    const struct gl_renderbuffer_attachment *att

+	       = _mesa_get_attachment(ctx, fb, fb->ColorDrawBuffer[j]);

+	    assert(att);

+	    if (att->Type == GL_NONE) {

+	       fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;

+	       fbo_incomplete("missing drawbuffer", j);

+	       return;

+	    }

+	 }

+      }

+

+      /* Check that the ReadBuffer is present */

+      if (fb->ColorReadBuffer != GL_NONE) {

+	 const struct gl_renderbuffer_attachment *att

+	    = _mesa_get_attachment(ctx, fb, fb->ColorReadBuffer);

+	 assert(att);

+	 if (att->Type == GL_NONE) {

+	    fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;

+            fbo_incomplete("missing readbuffer", -1);

+	    return;

+	 }

+      }

+   }

+#else

+   (void) j;

+#endif

+

+   if (numImages == 0) {

+      fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;

+      fbo_incomplete("no attachments", -1);

+      return;

+   }

+

+   /* Provisionally set status = COMPLETE ... */

+   fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;

+

+   /* ... but the driver may say the FB is incomplete.

+    * Drivers will most likely set the status to GL_FRAMEBUFFER_UNSUPPORTED

+    * if anything.

+    */

+   if (ctx->Driver.ValidateFramebuffer) {

+      ctx->Driver.ValidateFramebuffer(ctx, fb);

+      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+         fbo_incomplete("driver marked FBO as incomplete", -1);

+      }

+   }

+

+   if (fb->_Status == GL_FRAMEBUFFER_COMPLETE_EXT) {

+      /*

+       * Note that if ARB_framebuffer_object is supported and the attached

+       * renderbuffers/textures are different sizes, the framebuffer

+       * width/height will be set to the smallest width/height.

+       */

+      fb->Width = minWidth;

+      fb->Height = minHeight;

+

+      /* finally, update the visual info for the framebuffer */

+      _mesa_update_framebuffer_visual(fb);

+   }

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsRenderbufferEXT(GLuint renderbuffer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+   if (renderbuffer) {

+      struct gl_renderbuffer *rb = _mesa_lookup_renderbuffer(ctx, renderbuffer);

+      if (rb != NULL && rb != &DummyRenderbuffer)

+         return GL_TRUE;

+   }

+   return GL_FALSE;

+}

+

+

+void GLAPIENTRY

+_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)

+{

+   struct gl_renderbuffer *newRb;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target != GL_RENDERBUFFER_EXT) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindRenderbufferEXT(target)");

+      return;

+   }

+

+   /* No need to flush here since the render buffer binding has no

+    * effect on rendering state.

+    */

+

+   if (renderbuffer) {

+      newRb = _mesa_lookup_renderbuffer(ctx, renderbuffer);

+      if (newRb == &DummyRenderbuffer) {

+         /* ID was reserved, but no real renderbuffer object made yet */

+         newRb = NULL;

+      }

+      else if (!newRb && ctx->Extensions.ARB_framebuffer_object) {

+         /* All RB IDs must be Gen'd */

+         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindRenderbuffer(buffer)");

+         return;

+      }

+

+      if (!newRb) {

+	 /* create new renderbuffer object */

+	 newRb = ctx->Driver.NewRenderbuffer(ctx, renderbuffer);

+	 if (!newRb) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindRenderbufferEXT");

+	    return;

+	 }

+         ASSERT(newRb->AllocStorage);

+         _mesa_HashInsert(ctx->Shared->RenderBuffers, renderbuffer, newRb);

+         newRb->RefCount = 1; /* referenced by hash table */

+      }

+   }

+   else {

+      newRb = NULL;

+   }

+

+   ASSERT(newRb != &DummyRenderbuffer);

+

+   _mesa_reference_renderbuffer(&ctx->CurrentRenderbuffer, newRb);

+}

+

+

+/**

+ * If the given renderbuffer is anywhere attached to the framebuffer, detach

+ * the renderbuffer.

+ * This is used when a renderbuffer object is deleted.

+ * The spec calls for unbinding.

+ */

+static void

+detach_renderbuffer(struct gl_context *ctx,

+                    struct gl_framebuffer *fb,

+                    struct gl_renderbuffer *rb)

+{

+   GLuint i;

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      if (fb->Attachment[i].Renderbuffer == rb) {

+         _mesa_remove_attachment(ctx, &fb->Attachment[i]);

+      }

+   }

+   invalidate_framebuffer(fb);

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)

+{

+   GLint i;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   for (i = 0; i < n; i++) {

+      if (renderbuffers[i] > 0) {

+	 struct gl_renderbuffer *rb;

+	 rb = _mesa_lookup_renderbuffer(ctx, renderbuffers[i]);

+	 if (rb) {

+            /* check if deleting currently bound renderbuffer object */

+            if (rb == ctx->CurrentRenderbuffer) {

+               /* bind default */

+               ASSERT(rb->RefCount >= 2);

+               _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);

+            }

+

+            if (ctx->DrawBuffer->Name) {

+               detach_renderbuffer(ctx, ctx->DrawBuffer, rb);

+            }

+            if (ctx->ReadBuffer->Name && ctx->ReadBuffer != ctx->DrawBuffer) {

+               detach_renderbuffer(ctx, ctx->ReadBuffer, rb);

+            }

+

+	    /* Remove from hash table immediately, to free the ID.

+             * But the object will not be freed until it's no longer

+             * referenced anywhere else.

+             */

+	    _mesa_HashRemove(ctx->Shared->RenderBuffers, renderbuffers[i]);

+

+            if (rb != &DummyRenderbuffer) {

+               /* no longer referenced by hash table */

+               _mesa_reference_renderbuffer(&rb, NULL);

+	    }

+	 }

+      }

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint first;

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenRenderbuffersEXT(n)");

+      return;

+   }

+

+   if (!renderbuffers)

+      return;

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->RenderBuffers, n);

+

+   for (i = 0; i < n; i++) {

+      GLuint name = first + i;

+      renderbuffers[i] = name;

+      /* insert dummy placeholder into hash table */

+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+      _mesa_HashInsert(ctx->Shared->RenderBuffers, name, &DummyRenderbuffer);

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+   }

+}

+

+

+/**

+ * Given an internal format token for a render buffer, return the

+ * corresponding base format.

+ * This is very similar to _mesa_base_tex_format() but the set of valid

+ * internal formats is somewhat different.

+ *

+ * \return one of GL_RGB, GL_RGBA, GL_STENCIL_INDEX, GL_DEPTH_COMPONENT

+ *  GL_DEPTH_STENCIL_EXT or zero if error.

+ *

+ * XXX in the future when we support red-only and red-green formats

+ * we'll also return GL_RED and GL_RG.

+ */

+GLenum

+_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)

+{

+   switch (internalFormat) {

+   case GL_ALPHA:

+   case GL_ALPHA4:

+   case GL_ALPHA8:

+   case GL_ALPHA12:

+   case GL_ALPHA16:

+      return GL_ALPHA;

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

+   case GL_RGBA16_SNORM:

+      return GL_RGBA;

+   case GL_STENCIL_INDEX:

+   case GL_STENCIL_INDEX1_EXT:

+   case GL_STENCIL_INDEX4_EXT:

+   case GL_STENCIL_INDEX8_EXT:

+   case GL_STENCIL_INDEX16_EXT:

+      return GL_STENCIL_INDEX;

+   case GL_DEPTH_COMPONENT:

+   case GL_DEPTH_COMPONENT16:

+   case GL_DEPTH_COMPONENT24:

+   case GL_DEPTH_COMPONENT32:

+      return GL_DEPTH_COMPONENT;

+   case GL_DEPTH_STENCIL_EXT:

+   case GL_DEPTH24_STENCIL8_EXT:

+      if (ctx->Extensions.EXT_packed_depth_stencil)

+         return GL_DEPTH_STENCIL_EXT;

+      else

+         return 0;

+   /* XXX add floating point formats eventually */

+   default:

+      return 0;

+   }

+}

+

+

+/** sentinal value, see below */

+#define NO_SAMPLES 1000

+

+

+/**

+ * Helper function used by _mesa_RenderbufferStorageEXT() and 

+ * _mesa_RenderbufferStorageMultisample().

+ * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT().

+ */

+static void

+renderbuffer_storage(GLenum target, GLenum internalFormat,

+                     GLsizei width, GLsizei height, GLsizei samples)

+{

+   const char *func = samples == NO_SAMPLES ?

+      "glRenderbufferStorage" : "RenderbufferStorageMultisample";

+   struct gl_renderbuffer *rb;

+   GLenum baseFormat;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target != GL_RENDERBUFFER_EXT) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", func);

+      return;

+   }

+

+   baseFormat = _mesa_base_fbo_format(ctx, internalFormat);

+   if (baseFormat == 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(internalFormat)", func);

+      return;

+   }

+

+   if (width < 1 || width > (GLsizei) ctx->Const.MaxRenderbufferSize) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(width)", func);

+      return;

+   }

+

+   if (height < 1 || height > (GLsizei) ctx->Const.MaxRenderbufferSize) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(height)", func);

+      return;

+   }

+

+   if (samples == NO_SAMPLES) {

+      /* NumSamples == 0 indicates non-multisampling */

+      samples = 0;

+   }

+   else if (samples > (GLsizei) ctx->Const.MaxSamples) {

+      /* note: driver may choose to use more samples than what's requested */

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(samples)", func);

+      return;

+   }

+

+   rb = ctx->CurrentRenderbuffer;

+   if (!rb) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   if (rb->InternalFormat == internalFormat &&

+       rb->Width == (GLuint) width &&

+       rb->Height == (GLuint) height) {

+      /* no change in allocation needed */

+      return;

+   }

+

+   /* These MUST get set by the AllocStorage func */

+   rb->Format = MESA_FORMAT_NONE;

+   rb->NumSamples = samples;

+

+   /* Now allocate the storage */

+   ASSERT(rb->AllocStorage);

+   if (rb->AllocStorage(ctx, rb, internalFormat, width, height)) {

+      /* No error - check/set fields now */

+      assert(rb->Format != MESA_FORMAT_NONE);

+      assert(rb->Width == (GLuint) width);

+      assert(rb->Height == (GLuint) height);

+      rb->InternalFormat = internalFormat;

+      rb->_BaseFormat = baseFormat;

+      assert(rb->_BaseFormat != 0);

+   }

+   else {

+      /* Probably ran out of memory - clear the fields */

+      rb->Width = 0;

+      rb->Height = 0;

+      rb->Format = MESA_FORMAT_NONE;

+      rb->InternalFormat = GL_NONE;

+      rb->_BaseFormat = GL_NONE;

+      rb->NumSamples = 0;

+   }

+

+   /*

+   test_framebuffer_completeness(ctx, fb);

+   */

+   /* XXX if this renderbuffer is attached anywhere, invalidate attachment

+    * points???

+    */

+}

+

+

+#if FEATURE_OES_EGL_image

+void GLAPIENTRY

+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)

+{

+   struct gl_renderbuffer *rb;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.OES_EGL_image) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glEGLImageTargetRenderbufferStorageOES(unsupported)");

+      return;

+   }

+

+   if (target != GL_RENDERBUFFER) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "EGLImageTargetRenderbufferStorageOES");

+      return;

+   }

+

+   rb = ctx->CurrentRenderbuffer;

+   if (!rb) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "EGLImageTargetRenderbufferStorageOES");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image);

+}

+#endif

+

+

+/**

+ * Helper function for _mesa_GetRenderbufferParameterivEXT() and

+ * _mesa_GetFramebufferAttachmentParameterivEXT()

+ * We have to be careful to respect the base format.  For example, if a

+ * renderbuffer/texture was created with internalFormat=GL_RGB but the

+ * driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE

+ * we need to return zero.

+ */

+static GLint

+get_component_bits(GLenum pname, GLenum baseFormat, gl_format format)

+{

+   switch (pname) {

+   case GL_RENDERBUFFER_RED_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:

+   case GL_RENDERBUFFER_GREEN_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:

+   case GL_RENDERBUFFER_BLUE_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:

+      if (baseFormat == GL_RGB || baseFormat == GL_RGBA)

+         return _mesa_get_format_bits(format, pname);

+      else

+         return 0;

+   case GL_RENDERBUFFER_ALPHA_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:

+      if (baseFormat == GL_RGBA || baseFormat == GL_ALPHA)

+         return _mesa_get_format_bits(format, pname);

+      else

+         return 0;

+   case GL_RENDERBUFFER_DEPTH_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:

+      if (baseFormat == GL_DEPTH_COMPONENT || baseFormat == GL_DEPTH_STENCIL)

+         return _mesa_get_format_bits(format, pname);

+      else

+         return 0;

+   case GL_RENDERBUFFER_STENCIL_SIZE_EXT:

+   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:

+      if (baseFormat == GL_STENCIL_INDEX || baseFormat == GL_DEPTH_STENCIL)

+         return _mesa_get_format_bits(format, pname);

+      else

+         return 0;

+   default:

+      return 0;

+   }

+}

+

+

+

+void GLAPIENTRY

+_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,

+                             GLsizei width, GLsizei height)

+{

+   /* GL_ARB_fbo says calling this function is equivalent to calling

+    * glRenderbufferStorageMultisample() with samples=0.  We pass in

+    * a token value here just for error reporting purposes.

+    */

+   renderbuffer_storage(target, internalFormat, width, height, NO_SAMPLES);

+}

+

+

+void GLAPIENTRY

+_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,

+                                     GLenum internalFormat,

+                                     GLsizei width, GLsizei height)

+{

+   renderbuffer_storage(target, internalFormat, width, height, samples);

+}

+

+

+/**

+ * OpenGL ES version of glRenderBufferStorage.

+ */

+void GLAPIENTRY

+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,

+			   GLsizei width, GLsizei height)

+{

+   switch (internalFormat) {

+   case GL_RGB565:

+      /* XXX this confuses GL_RENDERBUFFER_INTERNAL_FORMAT_OES */

+      /* choose a closest format */

+      internalFormat = GL_RGB5;

+      break;

+   default:

+      break;

+   }

+

+   renderbuffer_storage(target, internalFormat, width, height, 0);

+}

+

+

+void GLAPIENTRY

+_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)

+{

+   struct gl_renderbuffer *rb;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target != GL_RENDERBUFFER_EXT) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetRenderbufferParameterivEXT(target)");

+      return;

+   }

+

+   rb = ctx->CurrentRenderbuffer;

+   if (!rb) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetRenderbufferParameterivEXT");

+      return;

+   }

+

+   /* No need to flush here since we're just quering state which is

+    * not effected by rendering.

+    */

+

+   switch (pname) {

+   case GL_RENDERBUFFER_WIDTH_EXT:

+      *params = rb->Width;

+      return;

+   case GL_RENDERBUFFER_HEIGHT_EXT:

+      *params = rb->Height;

+      return;

+   case GL_RENDERBUFFER_INTERNAL_FORMAT_EXT:

+      *params = rb->InternalFormat;

+      return;

+   case GL_RENDERBUFFER_RED_SIZE_EXT:

+   case GL_RENDERBUFFER_GREEN_SIZE_EXT:

+   case GL_RENDERBUFFER_BLUE_SIZE_EXT:

+   case GL_RENDERBUFFER_ALPHA_SIZE_EXT:

+   case GL_RENDERBUFFER_DEPTH_SIZE_EXT:

+   case GL_RENDERBUFFER_STENCIL_SIZE_EXT:

+      *params = get_component_bits(pname, rb->_BaseFormat, rb->Format);

+      break;

+   case GL_RENDERBUFFER_SAMPLES:

+      if (ctx->Extensions.ARB_framebuffer_object) {

+         *params = rb->NumSamples;

+         break;

+      }

+      /* fallthrough */

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetRenderbufferParameterivEXT(target)");

+      return;

+   }

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsFramebufferEXT(GLuint framebuffer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+   if (framebuffer) {

+      struct gl_framebuffer *rb = _mesa_lookup_framebuffer(ctx, framebuffer);

+      if (rb != NULL && rb != &DummyFramebuffer)

+         return GL_TRUE;

+   }

+   return GL_FALSE;

+}

+

+

+/**

+ * Check if any of the attachments of the given framebuffer are textures

+ * (render to texture).  Call ctx->Driver.RenderTexture() for such

+ * attachments.

+ */

+static void

+check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   GLuint i;

+   ASSERT(ctx->Driver.RenderTexture);

+

+   if (fb->Name == 0)

+      return; /* can't render to texture with winsys framebuffers */

+

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      struct gl_renderbuffer_attachment *att = fb->Attachment + i;

+      struct gl_texture_object *texObj = att->Texture;

+      if (texObj

+          && texObj->Image[att->CubeMapFace][att->TextureLevel]) {

+         ctx->Driver.RenderTexture(ctx, fb, att);

+      }

+   }

+}

+

+

+/**

+ * Examine all the framebuffer's attachments to see if any are textures.

+ * If so, call ctx->Driver.FinishRenderTexture() for each texture to

+ * notify the device driver that the texture image may have changed.

+ */

+static void

+check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   if (fb->Name == 0)

+      return; /* can't render to texture with winsys framebuffers */

+

+   if (ctx->Driver.FinishRenderTexture) {

+      GLuint i;

+      for (i = 0; i < BUFFER_COUNT; i++) {

+         struct gl_renderbuffer_attachment *att = fb->Attachment + i;

+         if (att->Texture && att->Renderbuffer) {

+            ctx->Driver.FinishRenderTexture(ctx, att);

+         }

+      }

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)

+{

+   struct gl_framebuffer *newDrawFb, *newReadFb;

+   struct gl_framebuffer *oldDrawFb, *oldReadFb;

+   GLboolean bindReadBuf, bindDrawBuf;

+   GET_CURRENT_CONTEXT(ctx);

+

+#ifdef DEBUG

+   if (ctx->Extensions.ARB_framebuffer_object) {

+      ASSERT(ctx->Extensions.EXT_framebuffer_object);

+      ASSERT(ctx->Extensions.EXT_framebuffer_blit);

+   }

+#endif

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.EXT_framebuffer_object) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindFramebufferEXT(unsupported)");

+      return;

+   }

+

+   switch (target) {

+#if FEATURE_EXT_framebuffer_blit

+   case GL_DRAW_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");

+         return;

+      }

+      bindDrawBuf = GL_TRUE;

+      bindReadBuf = GL_FALSE;

+      break;

+   case GL_READ_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");

+         return;

+      }

+      bindDrawBuf = GL_FALSE;

+      bindReadBuf = GL_TRUE;

+      break;

+#endif

+   case GL_FRAMEBUFFER_EXT:

+      bindDrawBuf = GL_TRUE;

+      bindReadBuf = GL_TRUE;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindFramebufferEXT(target)");

+      return;

+   }

+

+   if (framebuffer) {

+      /* Binding a user-created framebuffer object */

+      newDrawFb = _mesa_lookup_framebuffer(ctx, framebuffer);

+      if (newDrawFb == &DummyFramebuffer) {

+         /* ID was reserved, but no real framebuffer object made yet */

+         newDrawFb = NULL;

+      }

+      else if (!newDrawFb && ctx->Extensions.ARB_framebuffer_object) {

+         /* All FBO IDs must be Gen'd */

+         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFramebuffer(buffer)");

+         return;

+      }

+

+      if (!newDrawFb) {

+	 /* create new framebuffer object */

+	 newDrawFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);

+	 if (!newDrawFb) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");

+	    return;

+	 }

+         _mesa_HashInsert(ctx->Shared->FrameBuffers, framebuffer, newDrawFb);

+      }

+      newReadFb = newDrawFb;

+   }

+   else {

+      /* Binding the window system framebuffer (which was originally set

+       * with MakeCurrent).

+       */

+      newDrawFb = ctx->WinSysDrawBuffer;

+      newReadFb = ctx->WinSysReadBuffer;

+   }

+

+   ASSERT(newDrawFb);

+   ASSERT(newDrawFb != &DummyFramebuffer);

+

+   /* save pointers to current/old framebuffers */

+   oldDrawFb = ctx->DrawBuffer;

+   oldReadFb = ctx->ReadBuffer;

+

+   /* check if really changing bindings */

+   if (oldDrawFb == newDrawFb)

+      bindDrawBuf = GL_FALSE;

+   if (oldReadFb == newReadFb)

+      bindReadBuf = GL_FALSE;

+

+   /*

+    * OK, now bind the new Draw/Read framebuffers, if they're changing.

+    *

+    * We also check if we're beginning and/or ending render-to-texture.

+    * When a framebuffer with texture attachments is unbound, call

+    * ctx->Driver.FinishRenderTexture().

+    * When a framebuffer with texture attachments is bound, call

+    * ctx->Driver.RenderTexture().

+    *

+    * Note that if the ReadBuffer has texture attachments we don't consider

+    * that a render-to-texture case.

+    */

+   if (bindReadBuf) {

+      FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+      /* check if old readbuffer was render-to-texture */

+      check_end_texture_render(ctx, oldReadFb);

+

+      _mesa_reference_framebuffer(&ctx->ReadBuffer, newReadFb);

+   }

+

+   if (bindDrawBuf) {

+      FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+      /* check if old read/draw buffers were render-to-texture */

+      if (!bindReadBuf)

+         check_end_texture_render(ctx, oldReadFb);

+

+      if (oldDrawFb != oldReadFb)

+         check_end_texture_render(ctx, oldDrawFb);

+

+      /* check if newly bound framebuffer has any texture attachments */

+      check_begin_texture_render(ctx, newDrawFb);

+

+      _mesa_reference_framebuffer(&ctx->DrawBuffer, newDrawFb);

+   }

+

+   if ((bindDrawBuf || bindReadBuf) && ctx->Driver.BindFramebuffer) {

+      ctx->Driver.BindFramebuffer(ctx, target, newDrawFb, newReadFb);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)

+{

+   GLint i;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   for (i = 0; i < n; i++) {

+      if (framebuffers[i] > 0) {

+	 struct gl_framebuffer *fb;

+	 fb = _mesa_lookup_framebuffer(ctx, framebuffers[i]);

+	 if (fb) {

+            ASSERT(fb == &DummyFramebuffer || fb->Name == framebuffers[i]);

+

+            /* check if deleting currently bound framebuffer object */

+            if (ctx->Extensions.EXT_framebuffer_blit) {

+               /* separate draw/read binding points */

+               if (fb == ctx->DrawBuffer) {

+                  /* bind default */

+                  ASSERT(fb->RefCount >= 2);

+                  _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);

+               }

+               if (fb == ctx->ReadBuffer) {

+                  /* bind default */

+                  ASSERT(fb->RefCount >= 2);

+                  _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);

+               }

+            }

+            else {

+               /* only one binding point for read/draw buffers */

+               if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) {

+                  /* bind default */

+                  ASSERT(fb->RefCount >= 2);

+                  _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);

+               }    

+            }

+

+	    /* remove from hash table immediately, to free the ID */

+	    _mesa_HashRemove(ctx->Shared->FrameBuffers, framebuffers[i]);

+

+            if (fb != &DummyFramebuffer) {

+               /* But the object will not be freed until it's no longer

+                * bound in any context.

+                */

+               _mesa_reference_framebuffer(&fb, NULL);

+	    }

+	 }

+      }

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint first;

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenFramebuffersEXT(n)");

+      return;

+   }

+

+   if (!framebuffers)

+      return;

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->FrameBuffers, n);

+

+   for (i = 0; i < n; i++) {

+      GLuint name = first + i;

+      framebuffers[i] = name;

+      /* insert dummy placeholder into hash table */

+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+      _mesa_HashInsert(ctx->Shared->FrameBuffers, name, &DummyFramebuffer);

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+   }

+}

+

+

+

+GLenum GLAPIENTRY

+_mesa_CheckFramebufferStatusEXT(GLenum target)

+{

+   struct gl_framebuffer *buffer;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   switch (target) {

+#if FEATURE_EXT_framebuffer_blit

+   case GL_DRAW_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glCheckFramebufferStatus(target)");

+         return 0;

+      }

+      buffer = ctx->DrawBuffer;

+      break;

+   case GL_READ_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glCheckFramebufferStatus(target)");

+         return 0;

+      }

+      buffer = ctx->ReadBuffer;

+      break;

+#endif

+   case GL_FRAMEBUFFER_EXT:

+      buffer = ctx->DrawBuffer;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glCheckFramebufferStatus(target)");

+      return 0; /* formerly GL_FRAMEBUFFER_STATUS_ERROR_EXT */

+   }

+

+   if (buffer->Name == 0) {

+      /* The window system / default framebuffer is always complete */

+      return GL_FRAMEBUFFER_COMPLETE_EXT;

+   }

+

+   /* No need to flush here */

+

+   if (buffer->_Status != GL_FRAMEBUFFER_COMPLETE) {

+      _mesa_test_framebuffer_completeness(ctx, buffer);

+   }

+

+   return buffer->_Status;

+}

+

+

+

+/**

+ * Common code called by glFramebufferTexture1D/2D/3DEXT().

+ */

+static void

+framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, 

+                    GLenum attachment, GLenum textarget, GLuint texture,

+                    GLint level, GLint zoffset)

+{

+   struct gl_renderbuffer_attachment *att;

+   struct gl_texture_object *texObj = NULL;

+   struct gl_framebuffer *fb;

+   GLboolean error = GL_FALSE;

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (target) {

+   case GL_READ_FRAMEBUFFER_EXT:

+      error = !ctx->Extensions.EXT_framebuffer_blit;

+      fb = ctx->ReadBuffer;

+      break;

+   case GL_DRAW_FRAMEBUFFER_EXT:

+      error = !ctx->Extensions.EXT_framebuffer_blit;

+      /* fall-through */

+   case GL_FRAMEBUFFER_EXT:

+      fb = ctx->DrawBuffer;

+      break;

+   default:

+      error = GL_TRUE;

+   }

+

+   if (error) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferTexture%sEXT(target=0x%x)", caller, target);

+      return;

+   }

+

+   ASSERT(fb);

+

+   /* check framebuffer binding */

+   if (fb->Name == 0) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glFramebufferTexture%sEXT", caller);

+      return;

+   }

+

+

+   /* The textarget, level, and zoffset parameters are only validated if

+    * texture is non-zero.

+    */

+   if (texture) {

+      GLboolean err = GL_TRUE;

+

+      texObj = _mesa_lookup_texture(ctx, texture);

+      if (texObj != NULL) {

+         if (textarget == 0) {

+            /* XXX what's the purpose of this? */

+            err = (texObj->Target != GL_TEXTURE_3D) &&

+                (texObj->Target != GL_TEXTURE_1D_ARRAY_EXT) &&

+                (texObj->Target != GL_TEXTURE_2D_ARRAY_EXT);

+         }

+         else {

+            err = (texObj->Target == GL_TEXTURE_CUBE_MAP)

+                ? !IS_CUBE_FACE(textarget)

+                : (texObj->Target != textarget);

+         }

+      }

+      else {

+         /* can't render to a non-existant texture */

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glFramebufferTexture%sEXT(non existant texture)",

+                     caller);

+         return;

+      }

+

+      if (err) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glFramebufferTexture%sEXT(texture target mismatch)",

+                     caller);

+         return;

+      }

+

+      if (texObj->Target == GL_TEXTURE_3D) {

+         const GLint maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);

+         if (zoffset < 0 || zoffset >= maxSize) {

+            _mesa_error(ctx, GL_INVALID_VALUE,

+                        "glFramebufferTexture%sEXT(zoffset)", caller);

+            return;

+         }

+      }

+      else if ((texObj->Target == GL_TEXTURE_1D_ARRAY_EXT) ||

+               (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT)) {

+         if (zoffset < 0 || zoffset >= ctx->Const.MaxArrayTextureLayers) {

+            _mesa_error(ctx, GL_INVALID_VALUE,

+                        "glFramebufferTexture%sEXT(layer)", caller);

+            return;

+         }

+      }

+

+      if ((level < 0) || 

+          (level >= _mesa_max_texture_levels(ctx, texObj->Target))) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glFramebufferTexture%sEXT(level)", caller);

+         return;

+      }

+   }

+

+   att = _mesa_get_attachment(ctx, fb, attachment);

+   if (att == NULL) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferTexture%sEXT(attachment)", caller);

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   _glthread_LOCK_MUTEX(fb->Mutex);

+   if (texObj) {

+      _mesa_set_texture_attachment(ctx, fb, att, texObj, textarget,

+                                   level, zoffset);

+      /* Set the render-to-texture flag.  We'll check this flag in

+       * glTexImage() and friends to determine if we need to revalidate

+       * any FBOs that might be rendering into this texture.

+       * This flag never gets cleared since it's non-trivial to determine

+       * when all FBOs might be done rendering to this texture.  That's OK

+       * though since it's uncommon to render to a texture then repeatedly

+       * call glTexImage() to change images in the texture.

+       */

+      texObj->_RenderToTexture = GL_TRUE;

+   }

+   else {

+      _mesa_remove_attachment(ctx, att);

+   }

+

+   invalidate_framebuffer(fb);

+

+   _glthread_UNLOCK_MUTEX(fb->Mutex);

+}

+

+

+

+void GLAPIENTRY

+_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,

+                              GLenum textarget, GLuint texture, GLint level)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if ((texture != 0) && (textarget != GL_TEXTURE_1D)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferTexture1DEXT(textarget)");

+      return;

+   }

+

+   framebuffer_texture(ctx, "1D", target, attachment, textarget, texture,

+                       level, 0);

+}

+

+

+void GLAPIENTRY

+_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,

+                              GLenum textarget, GLuint texture, GLint level)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if ((texture != 0) &&

+       (textarget != GL_TEXTURE_2D) &&

+       (textarget != GL_TEXTURE_RECTANGLE_ARB) &&

+       (!IS_CUBE_FACE(textarget))) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glFramebufferTexture2DEXT(textarget=0x%x)", textarget);

+      return;

+   }

+

+   framebuffer_texture(ctx, "2D", target, attachment, textarget, texture,

+                       level, 0);

+}

+

+

+void GLAPIENTRY

+_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,

+                              GLenum textarget, GLuint texture,

+                              GLint level, GLint zoffset)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if ((texture != 0) && (textarget != GL_TEXTURE_3D)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferTexture3DEXT(textarget)");

+      return;

+   }

+

+   framebuffer_texture(ctx, "3D", target, attachment, textarget, texture,

+                       level, zoffset);

+}

+

+

+void GLAPIENTRY

+_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,

+                                 GLuint texture, GLint level, GLint layer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   framebuffer_texture(ctx, "Layer", target, attachment, 0, texture,

+                       level, layer);

+}

+

+

+void GLAPIENTRY

+_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,

+                                 GLenum renderbufferTarget,

+                                 GLuint renderbuffer)

+{

+   struct gl_renderbuffer_attachment *att;

+   struct gl_framebuffer *fb;

+   struct gl_renderbuffer *rb;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (target) {

+#if FEATURE_EXT_framebuffer_blit

+   case GL_DRAW_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glFramebufferRenderbufferEXT(target)");

+         return;

+      }

+      fb = ctx->DrawBuffer;

+      break;

+   case GL_READ_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glFramebufferRenderbufferEXT(target)");

+         return;

+      }

+      fb = ctx->ReadBuffer;

+      break;

+#endif

+   case GL_FRAMEBUFFER_EXT:

+      fb = ctx->DrawBuffer;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferRenderbufferEXT(target)");

+      return;

+   }

+

+   if (renderbufferTarget != GL_RENDERBUFFER_EXT) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferRenderbufferEXT(renderbufferTarget)");

+      return;

+   }

+

+   if (fb->Name == 0) {

+      /* Can't attach new renderbuffers to a window system framebuffer */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glFramebufferRenderbufferEXT");

+      return;

+   }

+

+   att = _mesa_get_attachment(ctx, fb, attachment);

+   if (att == NULL) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glFramebufferRenderbufferEXT(invalid attachment %s)",

+                  _mesa_lookup_enum_by_nr(attachment));

+      return;

+   }

+

+   if (renderbuffer) {

+      rb = _mesa_lookup_renderbuffer(ctx, renderbuffer);

+      if (!rb) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION,

+		     "glFramebufferRenderbufferEXT(non-existant"

+                     " renderbuffer %u)", renderbuffer);

+	 return;

+      }

+   }

+   else {

+      /* remove renderbuffer attachment */

+      rb = NULL;

+   }

+

+   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT &&

+       rb && rb->Format != MESA_FORMAT_NONE) {

+      /* make sure the renderbuffer is a depth/stencil format */

+      const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);

+      if (baseFormat != GL_DEPTH_STENCIL) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glFramebufferRenderbufferEXT(renderbuffer"

+                     " is not DEPTH_STENCIL format)");

+         return;

+      }

+   }

+

+

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   assert(ctx->Driver.FramebufferRenderbuffer);

+   ctx->Driver.FramebufferRenderbuffer(ctx, fb, attachment, rb);

+

+   /* Some subsequent GL commands may depend on the framebuffer's visual

+    * after the binding is updated.  Update visual info now.

+    */

+   _mesa_update_framebuffer_visual(fb);

+}

+

+

+void GLAPIENTRY

+_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,

+                                             GLenum pname, GLint *params)

+{

+   const struct gl_renderbuffer_attachment *att;

+   struct gl_framebuffer *buffer;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (target) {

+#if FEATURE_EXT_framebuffer_blit

+   case GL_DRAW_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glGetFramebufferAttachmentParameterivEXT(target)");

+         return;

+      }

+      buffer = ctx->DrawBuffer;

+      break;

+   case GL_READ_FRAMEBUFFER_EXT:

+      if (!ctx->Extensions.EXT_framebuffer_blit) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glGetFramebufferAttachmentParameterivEXT(target)");

+         return;

+      }

+      buffer = ctx->ReadBuffer;

+      break;

+#endif

+   case GL_FRAMEBUFFER_EXT:

+      buffer = ctx->DrawBuffer;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetFramebufferAttachmentParameterivEXT(target)");

+      return;

+   }

+

+   if (buffer->Name == 0) {

+      /* the default / window-system FBO */

+      att = _mesa_get_fb0_attachment(ctx, buffer, attachment);

+   }

+   else {

+      /* user-created framebuffer FBO */

+      att = _mesa_get_attachment(ctx, buffer, attachment);

+   }

+

+   if (att == NULL) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetFramebufferAttachmentParameterivEXT(attachment)");

+      return;

+   }

+

+   if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {

+      /* the depth and stencil attachments must point to the same buffer */

+      const struct gl_renderbuffer_attachment *depthAtt, *stencilAtt;

+      depthAtt = _mesa_get_attachment(ctx, buffer, GL_DEPTH_ATTACHMENT);

+      stencilAtt = _mesa_get_attachment(ctx, buffer, GL_STENCIL_ATTACHMENT);

+      if (depthAtt->Renderbuffer != stencilAtt->Renderbuffer) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetFramebufferAttachmentParameterivEXT(DEPTH/STENCIL"

+                     " attachments differ)");

+         return;

+      }

+   }

+

+   /* No need to flush here */

+

+   switch (pname) {

+   case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:

+      *params = buffer->Name == 0 ? GL_FRAMEBUFFER_DEFAULT : att->Type;

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:

+      if (att->Type == GL_RENDERBUFFER_EXT) {

+	 *params = att->Renderbuffer->Name;

+      }

+      else if (att->Type == GL_TEXTURE) {

+	 *params = att->Texture->Name;

+      }

+      else {

+         assert(att->Type == GL_NONE);

+         *params = 0;

+      }

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:

+      if (att->Type == GL_TEXTURE) {

+	 *params = att->TextureLevel;

+      }

+      else {

+	 _mesa_error(ctx, GL_INVALID_ENUM,

+		     "glGetFramebufferAttachmentParameterivEXT(pname)");

+      }

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:

+      if (att->Type == GL_TEXTURE) {

+         if (att->Texture && att->Texture->Target == GL_TEXTURE_CUBE_MAP) {

+            *params = GL_TEXTURE_CUBE_MAP_POSITIVE_X + att->CubeMapFace;

+         }

+         else {

+            *params = 0;

+         }

+      }

+      else {

+	 _mesa_error(ctx, GL_INVALID_ENUM,

+		     "glGetFramebufferAttachmentParameterivEXT(pname)");

+      }

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:

+      if (att->Type == GL_TEXTURE) {

+         if (att->Texture && att->Texture->Target == GL_TEXTURE_3D) {

+            *params = att->Zoffset;

+         }

+         else {

+            *params = 0;

+         }

+      }

+      else {

+	 _mesa_error(ctx, GL_INVALID_ENUM,

+		     "glGetFramebufferAttachmentParameterivEXT(pname)");

+      }

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING:

+      if (!ctx->Extensions.ARB_framebuffer_object) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glGetFramebufferAttachmentParameterivEXT(pname)");

+      }

+      else {

+         *params = _mesa_get_format_color_encoding(att->Renderbuffer->Format);

+      }

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:

+      if (!ctx->Extensions.ARB_framebuffer_object) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glGetFramebufferAttachmentParameterivEXT(pname)");

+         return;

+      }

+      else {

+         gl_format format = att->Renderbuffer->Format;

+         if (format == MESA_FORMAT_CI8 || format == MESA_FORMAT_S8) {

+            /* special cases */

+            *params = GL_INDEX;

+         }

+         else {

+            *params = _mesa_get_format_datatype(format);

+         }

+      }

+      return;

+   case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:

+   case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:

+   case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:

+   case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:

+   case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:

+   case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:

+      if (!ctx->Extensions.ARB_framebuffer_object) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glGetFramebufferAttachmentParameterivEXT(pname)");

+      }

+      else if (att->Texture) {

+         const struct gl_texture_image *texImage =

+            _mesa_select_tex_image(ctx, att->Texture, att->Texture->Target,

+                                   att->TextureLevel);

+         if (texImage) {

+            *params = get_component_bits(pname, texImage->_BaseFormat,

+                                         texImage->TexFormat);

+         }

+         else {

+            *params = 0;

+         }

+      }

+      else if (att->Renderbuffer) {

+         *params = get_component_bits(pname, att->Renderbuffer->_BaseFormat,

+                                      att->Renderbuffer->Format);

+      }

+      else {

+         *params = 0;

+      }

+      return;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetFramebufferAttachmentParameterivEXT(pname)");

+      return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GenerateMipmapEXT(GLenum target)

+{

+   struct gl_texture_object *texObj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   switch (target) {

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_3D:

+   case GL_TEXTURE_CUBE_MAP:

+      /* OK, legal value */

+      break;

+   default:

+      /* XXX need to implement GL_TEXTURE_1D_ARRAY and GL_TEXTURE_2D_ARRAY */

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGenerateMipmapEXT(target)");

+      return;

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+

+   if (texObj->BaseLevel >= texObj->MaxLevel) {

+      /* nothing to do */

+      return;

+   }

+

+   if (texObj->Target == GL_TEXTURE_CUBE_MAP &&

+       !_mesa_cube_complete(texObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGenerateMipmap(incomplete cube map)");

+      return;

+   }

+

+   _mesa_lock_texture(ctx, texObj);

+   if (target == GL_TEXTURE_CUBE_MAP) {

+      GLuint face;

+      for (face = 0; face < 6; face++)

+	 ctx->Driver.GenerateMipmap(ctx,

+				    GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB + face,

+				    texObj);

+   }

+   else {

+      ctx->Driver.GenerateMipmap(ctx, target, texObj);

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+#if FEATURE_EXT_framebuffer_blit

+

+static const struct gl_renderbuffer_attachment *

+find_attachment(const struct gl_framebuffer *fb, const struct gl_renderbuffer *rb)

+{

+   GLuint i;

+   for (i = 0; i < Elements(fb->Attachment); i++) {

+      if (fb->Attachment[i].Renderbuffer == rb)

+         return &fb->Attachment[i];

+   }

+   return NULL;

+}

+

+

+

+/**

+ * Blit rectangular region, optionally from one framebuffer to another.

+ *

+ * Note, if the src buffer is multisampled and the dest is not, this is

+ * when the samples must be resolved to a single color.

+ */

+void GLAPIENTRY

+_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                         GLbitfield mask, GLenum filter)

+{

+   const GLbitfield legalMaskBits = (GL_COLOR_BUFFER_BIT |

+                                     GL_DEPTH_BUFFER_BIT |

+                                     GL_STENCIL_BUFFER_BIT);

+   const struct gl_framebuffer *readFb, *drawFb;

+   const struct gl_renderbuffer *colorReadRb, *colorDrawRb;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);

+

+   if (ctx->NewState) {

+      _mesa_update_state(ctx);

+   }

+

+   readFb = ctx->ReadBuffer;

+   drawFb = ctx->DrawBuffer;

+

+   if (!readFb || !drawFb) {

+      /* This will normally never happen but someday we may want to

+       * support MakeCurrent() with no drawables.

+       */

+      return;

+   }

+

+   /* check for complete framebuffers */

+   if (drawFb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||

+       readFb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                  "glBlitFramebufferEXT(incomplete draw/read buffers)");

+      return;

+   }

+

+   if (filter != GL_NEAREST && filter != GL_LINEAR) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBlitFramebufferEXT(filter)");

+      return;

+   }

+

+   if (mask & ~legalMaskBits) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glBlitFramebufferEXT(mask)");

+      return;

+   }

+

+   /* depth/stencil must be blitted with nearest filtering */

+   if ((mask & (GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT))

+        && filter != GL_NEAREST) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+             "glBlitFramebufferEXT(depth/stencil requires GL_NEAREST filter");

+      return;

+   }

+

+   /* get color read/draw renderbuffers */

+   if (mask & GL_COLOR_BUFFER_BIT) {

+      colorReadRb = readFb->_ColorReadBuffer;

+      colorDrawRb = drawFb->_ColorDrawBuffers[0];

+   }

+   else {

+      colorReadRb = colorDrawRb = NULL;

+   }

+

+   if (mask & GL_STENCIL_BUFFER_BIT) {

+      struct gl_renderbuffer *readRb = readFb->_StencilBuffer;

+      struct gl_renderbuffer *drawRb = drawFb->_StencilBuffer;

+      if (!readRb ||

+          !drawRb ||

+          _mesa_get_format_bits(readRb->Format, GL_STENCIL_BITS) != 

+          _mesa_get_format_bits(drawRb->Format, GL_STENCIL_BITS)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glBlitFramebufferEXT(stencil buffer size mismatch");

+         return;

+      }

+   }

+

+   if (mask & GL_DEPTH_BUFFER_BIT) {

+      struct gl_renderbuffer *readRb = readFb->_DepthBuffer;

+      struct gl_renderbuffer *drawRb = drawFb->_DepthBuffer;

+      if (!readRb ||

+          !drawRb ||

+          _mesa_get_format_bits(readRb->Format, GL_DEPTH_BITS) != 

+          _mesa_get_format_bits(drawRb->Format, GL_DEPTH_BITS)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glBlitFramebufferEXT(depth buffer size mismatch");

+         return;

+      }

+   }

+

+   if (readFb->Visual.samples > 0 &&

+       drawFb->Visual.samples > 0 &&

+       readFb->Visual.samples != drawFb->Visual.samples) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBlitFramebufferEXT(mismatched samples");

+      return;

+   }

+

+   /* extra checks for multisample copies... */

+   if (readFb->Visual.samples > 0 || drawFb->Visual.samples > 0) {

+      /* src and dest region sizes must be the same */

+      if (srcX1 - srcX0 != dstX1 - dstX0 ||

+          srcY1 - srcY0 != dstY1 - dstY0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                "glBlitFramebufferEXT(bad src/dst multisample region sizes");

+         return;

+      }

+

+      /* color formats must match */

+      if (colorReadRb &&

+          colorDrawRb &&

+          colorReadRb->Format != colorDrawRb->Format) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                "glBlitFramebufferEXT(bad src/dst multisample pixel formats");

+         return;

+      }

+   }

+

+   if (!ctx->Extensions.EXT_framebuffer_blit) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBlitFramebufferEXT");

+      return;

+   }

+

+   /* Debug code */

+   if (DEBUG_BLIT) {

+      printf("glBlitFramebuffer(%d, %d, %d, %d,  %d, %d, %d, %d,"

+	     " 0x%x, 0x%x)\n",

+	     srcX0, srcY0, srcX1, srcY1,

+	     dstX0, dstY0, dstX1, dstY1,

+	     mask, filter);

+      if (colorReadRb) {

+         const struct gl_renderbuffer_attachment *att;

+

+         att = find_attachment(readFb, colorReadRb);

+         printf("  Src FBO %u  RB %u (%dx%d)  ",

+		readFb->Name, colorReadRb->Name,

+		colorReadRb->Width, colorReadRb->Height);

+         if (att && att->Texture) {

+            printf("Tex %u  tgt 0x%x  level %u  face %u",

+		   att->Texture->Name,

+		   att->Texture->Target,

+		   att->TextureLevel,

+		   att->CubeMapFace);

+         }

+         printf("\n");

+

+         att = find_attachment(drawFb, colorDrawRb);

+         printf("  Dst FBO %u  RB %u (%dx%d)  ",

+		drawFb->Name, colorDrawRb->Name,

+		colorDrawRb->Width, colorDrawRb->Height);

+         if (att && att->Texture) {

+            printf("Tex %u  tgt 0x%x  level %u  face %u",

+		   att->Texture->Name,

+		   att->Texture->Target,

+		   att->TextureLevel,

+		   att->CubeMapFace);

+         }

+         printf("\n");

+      }

+   }

+

+   ASSERT(ctx->Driver.BlitFramebuffer);

+   ctx->Driver.BlitFramebuffer(ctx,

+                               srcX0, srcY0, srcX1, srcY1,

+                               dstX0, dstY0, dstX1, dstY1,

+                               mask, filter);

+}

+#endif /* FEATURE_EXT_framebuffer_blit */

+

+#if FEATURE_ARB_geometry_shader4

+void GLAPIENTRY

+_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,

+                            GLuint texture, GLint level)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_error(ctx, GL_INVALID_OPERATION,

+               "glFramebufferTextureARB "

+               "not implemented!");

+}

+

+void GLAPIENTRY

+_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,

+                                GLuint texture, GLint level, GLenum face)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_error(ctx, GL_INVALID_OPERATION,

+               "glFramebufferTextureFaceARB "

+               "not implemented!");

+}

+#endif /* FEATURE_ARB_geometry_shader4 */

diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h
index 9850ee9aa..5d250fba1 100644
--- a/mesalib/src/mesa/main/fbobject.h
+++ b/mesalib/src/mesa/main/fbobject.h
@@ -1,165 +1,168 @@
-/*
- * 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.
- */
-
-
-#ifndef FBOBJECT_H
-#define FBOBJECT_H
-
-#include "mtypes.h"
-
-extern void
-_mesa_init_fbobjects(GLcontext *ctx);
-
-extern struct gl_framebuffer *
-_mesa_get_incomplete_framebuffer(void);
-
-extern struct gl_renderbuffer *
-_mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id);
-
-extern struct gl_framebuffer *
-_mesa_lookup_framebuffer(GLcontext *ctx, GLuint id);
-
-extern struct gl_renderbuffer_attachment *
-_mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
-                     GLenum attachment);
-
-
-extern void
-_mesa_remove_attachment(GLcontext *ctx,
-                        struct gl_renderbuffer_attachment *att);
-
-extern void
-_mesa_set_texture_attachment(GLcontext *ctx,
-                             struct gl_framebuffer *fb,
-                             struct gl_renderbuffer_attachment *att,
-                             struct gl_texture_object *texObj,
-                             GLenum texTarget, GLuint level, GLuint zoffset);
-
-extern void
-_mesa_set_renderbuffer_attachment(GLcontext *ctx,
-                                  struct gl_renderbuffer_attachment *att,
-                                  struct gl_renderbuffer *rb);
-
-extern void
-_mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                               GLenum attachment, struct gl_renderbuffer *rb);
-
-extern void
-_mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb);
-
-extern GLenum
-_mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
-                             GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
-                                     GLenum internalformat,
-                                     GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-			   GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
-
-extern void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
-                                    GLint *params);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
-
-extern void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
-
-extern GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture,
-                              GLint level, GLint zoffset);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
-                                 GLuint texture, GLint level, GLint layer);
-
-extern void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
-                                 GLenum renderbuffertarget,
-                                 GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
-                                             GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target);
-
-
-extern void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                         GLbitfield mask, GLenum filter);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
-                                GLuint texture, GLint level, GLenum face);
-
-
-#endif /* FBOBJECT_H */
+/*

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

+ */

+

+

+#ifndef FBOBJECT_H

+#define FBOBJECT_H

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_texture_object;

+

+extern void

+_mesa_init_fbobjects(struct gl_context *ctx);

+

+extern struct gl_framebuffer *

+_mesa_get_incomplete_framebuffer(void);

+

+extern struct gl_renderbuffer *

+_mesa_lookup_renderbuffer(struct gl_context *ctx, GLuint id);

+

+extern struct gl_framebuffer *

+_mesa_lookup_framebuffer(struct gl_context *ctx, GLuint id);

+

+extern struct gl_renderbuffer_attachment *

+_mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,

+                     GLenum attachment);

+

+

+extern void

+_mesa_remove_attachment(struct gl_context *ctx,

+                        struct gl_renderbuffer_attachment *att);

+

+extern void

+_mesa_set_texture_attachment(struct gl_context *ctx,

+                             struct gl_framebuffer *fb,

+                             struct gl_renderbuffer_attachment *att,

+                             struct gl_texture_object *texObj,

+                             GLenum texTarget, GLuint level, GLuint zoffset);

+

+extern void

+_mesa_set_renderbuffer_attachment(struct gl_context *ctx,

+                                  struct gl_renderbuffer_attachment *att,

+                                  struct gl_renderbuffer *rb);

+

+extern void

+_mesa_framebuffer_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                               GLenum attachment, struct gl_renderbuffer *rb);

+

+extern void

+_mesa_test_framebuffer_completeness(struct gl_context *ctx, struct gl_framebuffer *fb);

+

+extern GLenum

+_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsRenderbufferEXT(GLuint renderbuffer);

+

+extern void GLAPIENTRY

+_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);

+

+extern void GLAPIENTRY

+_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);

+

+extern void GLAPIENTRY

+_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);

+

+extern void GLAPIENTRY

+_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,

+                             GLsizei width, GLsizei height);

+

+extern void GLAPIENTRY

+_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,

+                                     GLenum internalformat,

+                                     GLsizei width, GLsizei height);

+

+extern void GLAPIENTRY

+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,

+			   GLsizei width, GLsizei height);

+

+extern void GLAPIENTRY

+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);

+

+extern void GLAPIENTRY

+_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,

+                                    GLint *params);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsFramebufferEXT(GLuint framebuffer);

+

+extern void GLAPIENTRY

+_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);

+

+extern void GLAPIENTRY

+_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);

+

+extern void GLAPIENTRY

+_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);

+

+extern GLenum GLAPIENTRY

+_mesa_CheckFramebufferStatusEXT(GLenum target);

+

+extern void GLAPIENTRY

+_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,

+                              GLenum textarget, GLuint texture, GLint level);

+

+extern void GLAPIENTRY

+_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,

+                              GLenum textarget, GLuint texture, GLint level);

+

+extern void GLAPIENTRY

+_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,

+                              GLenum textarget, GLuint texture,

+                              GLint level, GLint zoffset);

+

+extern void GLAPIENTRY

+_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,

+                                 GLuint texture, GLint level, GLint layer);

+

+extern void GLAPIENTRY

+_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,

+                                 GLenum renderbuffertarget,

+                                 GLuint renderbuffer);

+

+extern void GLAPIENTRY

+_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,

+                                             GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GenerateMipmapEXT(GLenum target);

+

+

+extern void GLAPIENTRY

+_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+                         GLbitfield mask, GLenum filter);

+

+extern void GLAPIENTRY

+_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,

+                            GLuint texture, GLint level);

+

+extern void GLAPIENTRY

+_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,

+                                GLuint texture, GLint level, GLenum face);

+

+

+#endif /* FBOBJECT_H */

diff --git a/mesalib/src/mesa/main/feedback.c b/mesalib/src/mesa/main/feedback.c
index c72b91280..5ce0880c2 100644
--- a/mesalib/src/mesa/main/feedback.c
+++ b/mesalib/src/mesa/main/feedback.c
@@ -1,541 +1,541 @@
-/*
- * 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 feedback.c
- * Selection and feedback modes functions.
- */
-
-
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "enums.h"
-#include "feedback.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_feedback
-
-
-#define FB_3D		0x01
-#define FB_4D		0x02
-#define FB_COLOR	0x04
-#define FB_TEXTURE	0X08
-
-
-
-static void GLAPIENTRY
-_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->RenderMode==GL_FEEDBACK) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
-      return;
-   }
-   if (size<0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
-      return;
-   }
-   if (!buffer) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
-      ctx->Feedback.BufferSize = 0;
-      return;
-   }
-
-   switch (type) {
-      case GL_2D:
-	 ctx->Feedback._Mask = 0;
-	 break;
-      case GL_3D:
-	 ctx->Feedback._Mask = FB_3D;
-	 break;
-      case GL_3D_COLOR:
-	 ctx->Feedback._Mask = (FB_3D | FB_COLOR);
-	 break;
-      case GL_3D_COLOR_TEXTURE:
-	 ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);
-	 break;
-      case GL_4D_COLOR_TEXTURE:
-	 ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
-	 return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* Always flush */
-   ctx->Feedback.Type = type;
-   ctx->Feedback.BufferSize = size;
-   ctx->Feedback.Buffer = buffer;
-   ctx->Feedback.Count = 0;	              /* Becaues of this. */
-}
-
-
-static void GLAPIENTRY
-_mesa_PassThrough( GLfloat token )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->RenderMode==GL_FEEDBACK) {
-      FLUSH_VERTICES(ctx, 0);
-      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );
-      _mesa_feedback_token( ctx, token );
-   }
-}
-
-
-/**
- * Put a vertex into the feedback buffer.
- */
-void
-_mesa_feedback_vertex(GLcontext *ctx,
-                      const GLfloat win[4],
-                      const GLfloat color[4],
-                      const GLfloat texcoord[4])
-{
-   _mesa_feedback_token( ctx, win[0] );
-   _mesa_feedback_token( ctx, win[1] );
-   if (ctx->Feedback._Mask & FB_3D) {
-      _mesa_feedback_token( ctx, win[2] );
-   }
-   if (ctx->Feedback._Mask & FB_4D) {
-      _mesa_feedback_token( ctx, win[3] );
-   }
-   if (ctx->Feedback._Mask & FB_COLOR) {
-      _mesa_feedback_token( ctx, color[0] );
-      _mesa_feedback_token( ctx, color[1] );
-      _mesa_feedback_token( ctx, color[2] );
-      _mesa_feedback_token( ctx, color[3] );
-   }
-   if (ctx->Feedback._Mask & FB_TEXTURE) {
-      _mesa_feedback_token( ctx, texcoord[0] );
-      _mesa_feedback_token( ctx, texcoord[1] );
-      _mesa_feedback_token( ctx, texcoord[2] );
-      _mesa_feedback_token( ctx, texcoord[3] );
-   }
-}
-
-
-/**********************************************************************/
-/** \name Selection */
-/*@{*/
-
-/**
- * Establish a buffer for selection mode values.
- * 
- * \param size buffer size.
- * \param buffer buffer.
- *
- * \sa glSelectBuffer().
- * 
- * \note this function can't be put in a display list.
- * 
- * Verifies we're not in selection mode, flushes the vertices and initialize
- * the fields in __GLcontextRec::Select with the given buffer.
- */
-static void GLAPIENTRY
-_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->RenderMode==GL_SELECT) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
-      return;			/* KW: added return */
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); 
-   ctx->Select.Buffer = buffer;
-   ctx->Select.BufferSize = size;
-   ctx->Select.BufferCount = 0;
-   ctx->Select.HitFlag = GL_FALSE;
-   ctx->Select.HitMinZ = 1.0;
-   ctx->Select.HitMaxZ = 0.0;
-}
-
-
-/**
- * Write a value of a record into the selection buffer.
- * 
- * \param ctx GL context.
- * \param value value.
- *
- * Verifies there is free space in the buffer to write the value and
- * increments the pointer.
- */
-static INLINE void
-write_record(GLcontext *ctx, GLuint value)
-{
-   if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
-      ctx->Select.Buffer[ctx->Select.BufferCount] = value;
-   }
-   ctx->Select.BufferCount++;
-}
-
-
-/**
- * Update the hit flag and the maximum and minimum depth values.
- *
- * \param ctx GL context.
- * \param z depth.
- *
- * Sets gl_selection::HitFlag and updates gl_selection::HitMinZ and
- * gl_selection::HitMaxZ.
- */
-void
-_mesa_update_hitflag(GLcontext *ctx, GLfloat z)
-{
-   ctx->Select.HitFlag = GL_TRUE;
-   if (z < ctx->Select.HitMinZ) {
-      ctx->Select.HitMinZ = z;
-   }
-   if (z > ctx->Select.HitMaxZ) {
-      ctx->Select.HitMaxZ = z;
-   }
-}
-
-
-/**
- * Write the hit record.
- *
- * \param ctx GL context.
- *
- * Write the hit record, i.e., the number of names in the stack, the minimum and
- * maximum depth values and the number of names in the name stack at the time
- * of the event. Resets the hit flag. 
- *
- * \sa gl_selection.
- */
-static void
-write_hit_record(GLcontext *ctx)
-{
-   GLuint i;
-   GLuint zmin, zmax, zscale = (~0u);
-
-   /* HitMinZ and HitMaxZ are in [0,1].  Multiply these values by */
-   /* 2^32-1 and round to nearest unsigned integer. */
-
-   assert( ctx != NULL ); /* this line magically fixes a SunOS 5.x/gcc bug */
-   zmin = (GLuint) ((GLfloat) zscale * ctx->Select.HitMinZ);
-   zmax = (GLuint) ((GLfloat) zscale * ctx->Select.HitMaxZ);
-
-   write_record( ctx, ctx->Select.NameStackDepth );
-   write_record( ctx, zmin );
-   write_record( ctx, zmax );
-   for (i = 0; i < ctx->Select.NameStackDepth; i++) {
-      write_record( ctx, ctx->Select.NameStack[i] );
-   }
-
-   ctx->Select.Hits++;
-   ctx->Select.HitFlag = GL_FALSE;
-   ctx->Select.HitMinZ = 1.0;
-   ctx->Select.HitMaxZ = -1.0;
-}
-
-
-/**
- * Initialize the name stack.
- *
- * Verifies we are in select mode and resets the name stack depth and resets
- * the hit record data in gl_selection. Marks new render mode in
- * __GLcontextRec::NewState.
- */
-static void GLAPIENTRY
-_mesa_InitNames( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   /* Record the hit before the HitFlag is wiped out again. */
-   if (ctx->RenderMode == GL_SELECT) {
-      if (ctx->Select.HitFlag) {
-         write_hit_record( ctx );
-      }
-   }
-   ctx->Select.NameStackDepth = 0;
-   ctx->Select.HitFlag = GL_FALSE;
-   ctx->Select.HitMinZ = 1.0;
-   ctx->Select.HitMaxZ = 0.0;
-   ctx->NewState |= _NEW_RENDERMODE;
-}
-
-
-/**
- * Load the top-most name of the name stack.
- *
- * \param name name.
- *
- * Verifies we are in selection mode and that the name stack is not empty.
- * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
- * and replace the top-most name in the stack.
- *
- * sa __GLcontextRec::Select.
- */
-static void GLAPIENTRY
-_mesa_LoadName( GLuint name )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->RenderMode != GL_SELECT) {
-      return;
-   }
-   if (ctx->Select.NameStackDepth == 0) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
-
-   if (ctx->Select.HitFlag) {
-      write_hit_record( ctx );
-   }
-   if (ctx->Select.NameStackDepth < MAX_NAME_STACK_DEPTH) {
-      ctx->Select.NameStack[ctx->Select.NameStackDepth-1] = name;
-   }
-   else {
-      ctx->Select.NameStack[MAX_NAME_STACK_DEPTH-1] = name;
-   }
-}
-
-
-/**
- * Push a name into the name stack.
- *
- * \param name name.
- *
- * Verifies we are in selection mode and that the name stack is not full.
- * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
- * and adds the name to the top of the name stack.
- *
- * sa __GLcontextRec::Select.
- */
-static void GLAPIENTRY
-_mesa_PushName( GLuint name )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->RenderMode != GL_SELECT) {
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
-   if (ctx->Select.HitFlag) {
-      write_hit_record( ctx );
-   }
-   if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {
-      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
-   }
-   else
-      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;
-}
-
-
-/**
- * Pop a name into the name stack.
- *
- * Verifies we are in selection mode and that the name stack is not empty.
- * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
- * and removes top-most name in the name stack.
- *
- * sa __GLcontextRec::Select.
- */
-static void GLAPIENTRY
-_mesa_PopName( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->RenderMode != GL_SELECT) {
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
-   if (ctx->Select.HitFlag) {
-      write_hit_record( ctx );
-   }
-   if (ctx->Select.NameStackDepth == 0) {
-      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
-   }
-   else
-      ctx->Select.NameStackDepth--;
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Render Mode */
-/*@{*/
-
-/**
- * Set rasterization mode.
- *
- * \param mode rasterization mode.
- *
- * \note this function can't be put in a display list.
- *
- * \sa glRenderMode().
- * 
- * Flushes the vertices and do the necessary cleanup according to the previous
- * rasterization mode, such as writing the hit record or resent the select
- * buffer index when exiting the select mode. Updates
- * __GLcontextRec::RenderMode and notifies the driver via the
- * dd_function_table::RenderMode callback.
- */
-static GLint GLAPIENTRY
-_mesa_RenderMode( GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint result;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));
-
-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
-
-   switch (ctx->RenderMode) {
-      case GL_RENDER:
-	 result = 0;
-	 break;
-      case GL_SELECT:
-	 if (ctx->Select.HitFlag) {
-	    write_hit_record( ctx );
-	 }
-	 if (ctx->Select.BufferCount > ctx->Select.BufferSize) {
-	    /* overflow */
-#ifdef DEBUG
-            _mesa_warning(ctx, "Feedback buffer overflow");
-#endif
-	    result = -1;
-	 }
-	 else {
-	    result = ctx->Select.Hits;
-	 }
-	 ctx->Select.BufferCount = 0;
-	 ctx->Select.Hits = 0;
-	 ctx->Select.NameStackDepth = 0;
-	 break;
-#if _HAVE_FULL_GL
-      case GL_FEEDBACK:
-	 if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {
-	    /* overflow */
-	    result = -1;
-	 }
-	 else {
-	    result = ctx->Feedback.Count;
-	 }
-	 ctx->Feedback.Count = 0;
-	 break;
-#endif
-      default:
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
-	 return 0;
-   }
-
-   switch (mode) {
-      case GL_RENDER:
-         break;
-      case GL_SELECT:
-	 if (ctx->Select.BufferSize==0) {
-	    /* haven't called glSelectBuffer yet */
-	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
-	 }
-	 break;
-#if _HAVE_FULL_GL
-      case GL_FEEDBACK:
-	 if (ctx->Feedback.BufferSize==0) {
-	    /* haven't called glFeedbackBuffer yet */
-	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
-	 }
-	 break;
-#endif
-      default:
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
-	 return 0;
-   }
-
-   ctx->RenderMode = mode;
-   if (ctx->Driver.RenderMode)
-      ctx->Driver.RenderMode( ctx, mode );
-
-   return result;
-}
-
-/*@}*/
-
-
-void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp)
-{
-   SET_InitNames(disp, _mesa_InitNames);
-   SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer);
-   SET_LoadName(disp, _mesa_LoadName);
-   SET_PassThrough(disp, _mesa_PassThrough);
-   SET_PopName(disp, _mesa_PopName);
-   SET_PushName(disp, _mesa_PushName);
-   SET_SelectBuffer(disp, _mesa_SelectBuffer);
-   SET_RenderMode(disp, _mesa_RenderMode);
-}
-
-
-#endif /* FEATURE_feedback */
-
-
-/**********************************************************************/
-/** \name Initialization */
-/*@{*/
-
-/**
- * Initialize context feedback data.
- */
-void _mesa_init_feedback( GLcontext * ctx )
-{
-   /* Feedback */
-   ctx->Feedback.Type = GL_2D;   /* TODO: verify */
-   ctx->Feedback.Buffer = NULL;
-   ctx->Feedback.BufferSize = 0;
-   ctx->Feedback.Count = 0;
-
-   /* Selection/picking */
-   ctx->Select.Buffer = NULL;
-   ctx->Select.BufferSize = 0;
-   ctx->Select.BufferCount = 0;
-   ctx->Select.Hits = 0;
-   ctx->Select.NameStackDepth = 0;
-
-   /* Miscellaneous */
-   ctx->RenderMode = GL_RENDER;
-}
-
-/*@}*/
+/*

+ * 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 feedback.c

+ * Selection and feedback modes functions.

+ */

+

+

+#include "glheader.h"

+#include "colormac.h"

+#include "context.h"

+#include "enums.h"

+#include "feedback.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_feedback

+

+

+#define FB_3D		0x01

+#define FB_4D		0x02

+#define FB_COLOR	0x04

+#define FB_TEXTURE	0X08

+

+

+

+static void GLAPIENTRY

+_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->RenderMode==GL_FEEDBACK) {

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );

+      return;

+   }

+   if (size<0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );

+      return;

+   }

+   if (!buffer) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );

+      ctx->Feedback.BufferSize = 0;

+      return;

+   }

+

+   switch (type) {

+      case GL_2D:

+	 ctx->Feedback._Mask = 0;

+	 break;

+      case GL_3D:

+	 ctx->Feedback._Mask = FB_3D;

+	 break;

+      case GL_3D_COLOR:

+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR);

+	 break;

+      case GL_3D_COLOR_TEXTURE:

+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);

+	 break;

+      case GL_4D_COLOR_TEXTURE:

+	 ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);

+	 break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );

+	 return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* Always flush */

+   ctx->Feedback.Type = type;

+   ctx->Feedback.BufferSize = size;

+   ctx->Feedback.Buffer = buffer;

+   ctx->Feedback.Count = 0;	              /* Becaues of this. */

+}

+

+

+static void GLAPIENTRY

+_mesa_PassThrough( GLfloat token )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->RenderMode==GL_FEEDBACK) {

+      FLUSH_VERTICES(ctx, 0);

+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );

+      _mesa_feedback_token( ctx, token );

+   }

+}

+

+

+/**

+ * Put a vertex into the feedback buffer.

+ */

+void

+_mesa_feedback_vertex(struct gl_context *ctx,

+                      const GLfloat win[4],

+                      const GLfloat color[4],

+                      const GLfloat texcoord[4])

+{

+   _mesa_feedback_token( ctx, win[0] );

+   _mesa_feedback_token( ctx, win[1] );

+   if (ctx->Feedback._Mask & FB_3D) {

+      _mesa_feedback_token( ctx, win[2] );

+   }

+   if (ctx->Feedback._Mask & FB_4D) {

+      _mesa_feedback_token( ctx, win[3] );

+   }

+   if (ctx->Feedback._Mask & FB_COLOR) {

+      _mesa_feedback_token( ctx, color[0] );

+      _mesa_feedback_token( ctx, color[1] );

+      _mesa_feedback_token( ctx, color[2] );

+      _mesa_feedback_token( ctx, color[3] );

+   }

+   if (ctx->Feedback._Mask & FB_TEXTURE) {

+      _mesa_feedback_token( ctx, texcoord[0] );

+      _mesa_feedback_token( ctx, texcoord[1] );

+      _mesa_feedback_token( ctx, texcoord[2] );

+      _mesa_feedback_token( ctx, texcoord[3] );

+   }

+}

+

+

+/**********************************************************************/

+/** \name Selection */

+/*@{*/

+

+/**

+ * Establish a buffer for selection mode values.

+ * 

+ * \param size buffer size.

+ * \param buffer buffer.

+ *

+ * \sa glSelectBuffer().

+ * 

+ * \note this function can't be put in a display list.

+ * 

+ * Verifies we're not in selection mode, flushes the vertices and initialize

+ * the fields in __struct gl_contextRec::Select with the given buffer.

+ */

+static void GLAPIENTRY

+_mesa_SelectBuffer( GLsizei size, GLuint *buffer )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->RenderMode==GL_SELECT) {

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );

+      return;			/* KW: added return */

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); 

+   ctx->Select.Buffer = buffer;

+   ctx->Select.BufferSize = size;

+   ctx->Select.BufferCount = 0;

+   ctx->Select.HitFlag = GL_FALSE;

+   ctx->Select.HitMinZ = 1.0;

+   ctx->Select.HitMaxZ = 0.0;

+}

+

+

+/**

+ * Write a value of a record into the selection buffer.

+ * 

+ * \param ctx GL context.

+ * \param value value.

+ *

+ * Verifies there is free space in the buffer to write the value and

+ * increments the pointer.

+ */

+static INLINE void

+write_record(struct gl_context *ctx, GLuint value)

+{

+   if (ctx->Select.BufferCount < ctx->Select.BufferSize) {

+      ctx->Select.Buffer[ctx->Select.BufferCount] = value;

+   }

+   ctx->Select.BufferCount++;

+}

+

+

+/**

+ * Update the hit flag and the maximum and minimum depth values.

+ *

+ * \param ctx GL context.

+ * \param z depth.

+ *

+ * Sets gl_selection::HitFlag and updates gl_selection::HitMinZ and

+ * gl_selection::HitMaxZ.

+ */

+void

+_mesa_update_hitflag(struct gl_context *ctx, GLfloat z)

+{

+   ctx->Select.HitFlag = GL_TRUE;

+   if (z < ctx->Select.HitMinZ) {

+      ctx->Select.HitMinZ = z;

+   }

+   if (z > ctx->Select.HitMaxZ) {

+      ctx->Select.HitMaxZ = z;

+   }

+}

+

+

+/**

+ * Write the hit record.

+ *

+ * \param ctx GL context.

+ *

+ * Write the hit record, i.e., the number of names in the stack, the minimum and

+ * maximum depth values and the number of names in the name stack at the time

+ * of the event. Resets the hit flag. 

+ *

+ * \sa gl_selection.

+ */

+static void

+write_hit_record(struct gl_context *ctx)

+{

+   GLuint i;

+   GLuint zmin, zmax, zscale = (~0u);

+

+   /* HitMinZ and HitMaxZ are in [0,1].  Multiply these values by */

+   /* 2^32-1 and round to nearest unsigned integer. */

+

+   assert( ctx != NULL ); /* this line magically fixes a SunOS 5.x/gcc bug */

+   zmin = (GLuint) ((GLfloat) zscale * ctx->Select.HitMinZ);

+   zmax = (GLuint) ((GLfloat) zscale * ctx->Select.HitMaxZ);

+

+   write_record( ctx, ctx->Select.NameStackDepth );

+   write_record( ctx, zmin );

+   write_record( ctx, zmax );

+   for (i = 0; i < ctx->Select.NameStackDepth; i++) {

+      write_record( ctx, ctx->Select.NameStack[i] );

+   }

+

+   ctx->Select.Hits++;

+   ctx->Select.HitFlag = GL_FALSE;

+   ctx->Select.HitMinZ = 1.0;

+   ctx->Select.HitMaxZ = -1.0;

+}

+

+

+/**

+ * Initialize the name stack.

+ *

+ * Verifies we are in select mode and resets the name stack depth and resets

+ * the hit record data in gl_selection. Marks new render mode in

+ * __struct gl_contextRec::NewState.

+ */

+static void GLAPIENTRY

+_mesa_InitNames( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   /* Record the hit before the HitFlag is wiped out again. */

+   if (ctx->RenderMode == GL_SELECT) {

+      if (ctx->Select.HitFlag) {

+         write_hit_record( ctx );

+      }

+   }

+   ctx->Select.NameStackDepth = 0;

+   ctx->Select.HitFlag = GL_FALSE;

+   ctx->Select.HitMinZ = 1.0;

+   ctx->Select.HitMaxZ = 0.0;

+   ctx->NewState |= _NEW_RENDERMODE;

+}

+

+

+/**

+ * Load the top-most name of the name stack.

+ *

+ * \param name name.

+ *

+ * Verifies we are in selection mode and that the name stack is not empty.

+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),

+ * and replace the top-most name in the stack.

+ *

+ * sa __struct gl_contextRec::Select.

+ */

+static void GLAPIENTRY

+_mesa_LoadName( GLuint name )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->RenderMode != GL_SELECT) {

+      return;

+   }

+   if (ctx->Select.NameStackDepth == 0) {

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

+

+   if (ctx->Select.HitFlag) {

+      write_hit_record( ctx );

+   }

+   if (ctx->Select.NameStackDepth < MAX_NAME_STACK_DEPTH) {

+      ctx->Select.NameStack[ctx->Select.NameStackDepth-1] = name;

+   }

+   else {

+      ctx->Select.NameStack[MAX_NAME_STACK_DEPTH-1] = name;

+   }

+}

+

+

+/**

+ * Push a name into the name stack.

+ *

+ * \param name name.

+ *

+ * Verifies we are in selection mode and that the name stack is not full.

+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),

+ * and adds the name to the top of the name stack.

+ *

+ * sa __struct gl_contextRec::Select.

+ */

+static void GLAPIENTRY

+_mesa_PushName( GLuint name )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->RenderMode != GL_SELECT) {

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

+   if (ctx->Select.HitFlag) {

+      write_hit_record( ctx );

+   }

+   if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {

+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );

+   }

+   else

+      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;

+}

+

+

+/**

+ * Pop a name into the name stack.

+ *

+ * Verifies we are in selection mode and that the name stack is not empty.

+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),

+ * and removes top-most name in the name stack.

+ *

+ * sa __struct gl_contextRec::Select.

+ */

+static void GLAPIENTRY

+_mesa_PopName( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->RenderMode != GL_SELECT) {

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

+   if (ctx->Select.HitFlag) {

+      write_hit_record( ctx );

+   }

+   if (ctx->Select.NameStackDepth == 0) {

+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );

+   }

+   else

+      ctx->Select.NameStackDepth--;

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Render Mode */

+/*@{*/

+

+/**

+ * Set rasterization mode.

+ *

+ * \param mode rasterization mode.

+ *

+ * \note this function can't be put in a display list.

+ *

+ * \sa glRenderMode().

+ * 

+ * Flushes the vertices and do the necessary cleanup according to the previous

+ * rasterization mode, such as writing the hit record or resent the select

+ * buffer index when exiting the select mode. Updates

+ * __struct gl_contextRec::RenderMode and notifies the driver via the

+ * dd_function_table::RenderMode callback.

+ */

+static GLint GLAPIENTRY

+_mesa_RenderMode( GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint result;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));

+

+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

+

+   switch (ctx->RenderMode) {

+      case GL_RENDER:

+	 result = 0;

+	 break;

+      case GL_SELECT:

+	 if (ctx->Select.HitFlag) {

+	    write_hit_record( ctx );

+	 }

+	 if (ctx->Select.BufferCount > ctx->Select.BufferSize) {

+	    /* overflow */

+#ifdef DEBUG

+            _mesa_warning(ctx, "Feedback buffer overflow");

+#endif

+	    result = -1;

+	 }

+	 else {

+	    result = ctx->Select.Hits;

+	 }

+	 ctx->Select.BufferCount = 0;

+	 ctx->Select.Hits = 0;

+	 ctx->Select.NameStackDepth = 0;

+	 break;

+#if _HAVE_FULL_GL

+      case GL_FEEDBACK:

+	 if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {

+	    /* overflow */

+	    result = -1;

+	 }

+	 else {

+	    result = ctx->Feedback.Count;

+	 }

+	 ctx->Feedback.Count = 0;

+	 break;

+#endif

+      default:

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );

+	 return 0;

+   }

+

+   switch (mode) {

+      case GL_RENDER:

+         break;

+      case GL_SELECT:

+	 if (ctx->Select.BufferSize==0) {

+	    /* haven't called glSelectBuffer yet */

+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );

+	 }

+	 break;

+#if _HAVE_FULL_GL

+      case GL_FEEDBACK:

+	 if (ctx->Feedback.BufferSize==0) {

+	    /* haven't called glFeedbackBuffer yet */

+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );

+	 }

+	 break;

+#endif

+      default:

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );

+	 return 0;

+   }

+

+   ctx->RenderMode = mode;

+   if (ctx->Driver.RenderMode)

+      ctx->Driver.RenderMode( ctx, mode );

+

+   return result;

+}

+

+/*@}*/

+

+

+void

+_mesa_init_feedback_dispatch(struct _glapi_table *disp)

+{

+   SET_InitNames(disp, _mesa_InitNames);

+   SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer);

+   SET_LoadName(disp, _mesa_LoadName);

+   SET_PassThrough(disp, _mesa_PassThrough);

+   SET_PopName(disp, _mesa_PopName);

+   SET_PushName(disp, _mesa_PushName);

+   SET_SelectBuffer(disp, _mesa_SelectBuffer);

+   SET_RenderMode(disp, _mesa_RenderMode);

+}

+

+

+#endif /* FEATURE_feedback */

+

+

+/**********************************************************************/

+/** \name Initialization */

+/*@{*/

+

+/**

+ * Initialize context feedback data.

+ */

+void _mesa_init_feedback( struct gl_context * ctx )

+{

+   /* Feedback */

+   ctx->Feedback.Type = GL_2D;   /* TODO: verify */

+   ctx->Feedback.Buffer = NULL;

+   ctx->Feedback.BufferSize = 0;

+   ctx->Feedback.Count = 0;

+

+   /* Selection/picking */

+   ctx->Select.Buffer = NULL;

+   ctx->Select.BufferSize = 0;

+   ctx->Select.BufferCount = 0;

+   ctx->Select.Hits = 0;

+   ctx->Select.NameStackDepth = 0;

+

+   /* Miscellaneous */

+   ctx->RenderMode = GL_RENDER;

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h
index c6354b97b..06a07725d 100644
--- a/mesalib/src/mesa/main/feedback.h
+++ b/mesalib/src/mesa/main/feedback.h
@@ -1,98 +1,98 @@
-/*
- * 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.
- */
-
-#ifndef FEEDBACK_H
-#define FEEDBACK_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_feedback
-
-extern void
-_mesa_feedback_vertex( GLcontext *ctx,
-                       const GLfloat win[4],
-                       const GLfloat color[4],
-                       const GLfloat texcoord[4] );
-
-
-static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
-{
-   if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
-      ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
-   }
-   ctx->Feedback.Count++;
-}
-
-
-extern void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z );
-
-
-extern void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_feedback */
-
-#include "main/compiler.h"
-
-static INLINE void
-_mesa_feedback_vertex( GLcontext *ctx,
-                       const GLfloat win[4],
-                       const GLfloat color[4],
-                       const GLfloat texcoord[4] )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-
-static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_feedback */
-
-extern void
-_mesa_init_feedback( GLcontext *ctx );
-
-#endif /* FEEDBACK_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.

+ */

+

+#ifndef FEEDBACK_H

+#define FEEDBACK_H

+

+

+#include "main/mtypes.h"

+

+

+#if FEATURE_feedback

+

+extern void

+_mesa_feedback_vertex( struct gl_context *ctx,

+                       const GLfloat win[4],

+                       const GLfloat color[4],

+                       const GLfloat texcoord[4] );

+

+

+static INLINE void

+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )

+{

+   if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {

+      ctx->Feedback.Buffer[ctx->Feedback.Count] = token;

+   }

+   ctx->Feedback.Count++;

+}

+

+

+extern void

+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );

+

+

+extern void

+_mesa_init_feedback_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_feedback */

+

+#include "main/compiler.h"

+

+static INLINE void

+_mesa_feedback_vertex( struct gl_context *ctx,

+                       const GLfloat win[4],

+                       const GLfloat color[4],

+                       const GLfloat texcoord[4] )

+{

+   /* render mode is always GL_RENDER */

+   ASSERT_NO_FEATURE();

+}

+

+

+static INLINE void

+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )

+{

+   /* render mode is always GL_RENDER */

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )

+{

+   /* render mode is always GL_RENDER */

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_init_feedback_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_feedback */

+

+extern void

+_mesa_init_feedback( struct gl_context *ctx );

+

+#endif /* FEEDBACK_H */

diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c
index 92fec09ba..60b200419 100644
--- a/mesalib/src/mesa/main/ffvertex_prog.c
+++ b/mesalib/src/mesa/main/ffvertex_prog.c
@@ -1,1679 +1,1679 @@
-/**************************************************************************
- *
- * 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.
- *
- **************************************************************************/
-
-/**
- * \file ffvertex_prog.c
- *
- * Create a vertex program to execute the current fixed function T&L pipeline.
- * \author Keith Whitwell
- */
-
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/enums.h"
-#include "main/ffvertex_prog.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 "program/prog_statevars.h"
-
-
-/** Max of number of lights and texture coord units */
-#define NUM_UNITS MAX2(MAX_TEXTURE_COORD_UNITS, MAX_LIGHTS)
-
-struct state_key {
-   unsigned light_color_material_mask:12;
-   unsigned light_global_enabled:1;
-   unsigned light_local_viewer:1;
-   unsigned light_twoside:1;
-   unsigned material_shininess_is_zero:1;
-   unsigned need_eye_coords:1;
-   unsigned normalize:1;
-   unsigned rescale_normals:1;
-
-   unsigned fog_source_is_depth:1;
-   unsigned separate_specular:1;
-   unsigned point_attenuated:1;
-   unsigned point_array:1;
-   unsigned texture_enabled_global:1;
-   unsigned fragprog_inputs_read:12;
-
-   unsigned varying_vp_inputs;
-
-   struct {
-      unsigned light_enabled:1;
-      unsigned light_eyepos3_is_zero:1;
-      unsigned light_spotcutoff_is_180:1;
-      unsigned light_attenuated:1;
-      unsigned texunit_really_enabled:1;
-      unsigned texmat_enabled:1;
-      unsigned coord_replace:1;
-      unsigned texgen_enabled:4;
-      unsigned texgen_mode0:4;
-      unsigned texgen_mode1:4;
-      unsigned texgen_mode2:4;
-      unsigned texgen_mode3:4;
-   } unit[NUM_UNITS];
-};
-
-
-#define TXG_NONE           0
-#define TXG_OBJ_LINEAR     1
-#define TXG_EYE_LINEAR     2
-#define TXG_SPHERE_MAP     3
-#define TXG_REFLECTION_MAP 4
-#define TXG_NORMAL_MAP     5
-
-static GLuint translate_texgen( GLboolean enabled, GLenum mode )
-{
-   if (!enabled)
-      return TXG_NONE;
-
-   switch (mode) {
-   case GL_OBJECT_LINEAR: return TXG_OBJ_LINEAR;
-   case GL_EYE_LINEAR: return TXG_EYE_LINEAR;
-   case GL_SPHERE_MAP: return TXG_SPHERE_MAP;
-   case GL_REFLECTION_MAP_NV: return TXG_REFLECTION_MAP;
-   case GL_NORMAL_MAP_NV: return TXG_NORMAL_MAP;
-   default: return TXG_NONE;
-   }
-}
-
-
-
-static GLboolean check_active_shininess( GLcontext *ctx,
-                                         const struct state_key *key,
-                                         GLuint side )
-{
-   GLuint bit = 1 << (MAT_ATTRIB_FRONT_SHININESS + side);
-
-   if ((key->varying_vp_inputs & VERT_BIT_COLOR0) &&
-       (key->light_color_material_mask & bit))
-      return GL_TRUE;
-
-   if (key->varying_vp_inputs & (bit << 16))
-      return GL_TRUE;
-
-   if (ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS + side][0] != 0.0F)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-static void make_state_key( GLcontext *ctx, struct state_key *key )
-{
-   const struct gl_fragment_program *fp;
-   GLuint i;
-
-   memset(key, 0, sizeof(struct state_key));
-   fp = ctx->FragmentProgram._Current;
-
-   /* This now relies on texenvprogram.c being active:
-    */
-   assert(fp);
-
-   key->need_eye_coords = ctx->_NeedEyeCoords;
-
-   key->fragprog_inputs_read = fp->Base.InputsRead;
-   key->varying_vp_inputs = ctx->varying_vp_inputs;
-
-   if (ctx->RenderMode == GL_FEEDBACK) {
-      /* make sure the vertprog emits color and tex0 */
-      key->fragprog_inputs_read |= (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
-   }
-
-   key->separate_specular = (ctx->Light.Model.ColorControl ==
-			     GL_SEPARATE_SPECULAR_COLOR);
-
-   if (ctx->Light.Enabled) {
-      key->light_global_enabled = 1;
-
-      if (ctx->Light.Model.LocalViewer)
-	 key->light_local_viewer = 1;
-
-      if (ctx->Light.Model.TwoSide)
-	 key->light_twoside = 1;
-
-      if (ctx->Light.ColorMaterialEnabled) {
-	 key->light_color_material_mask = ctx->Light.ColorMaterialBitmask;
-      }
-
-      for (i = 0; i < MAX_LIGHTS; i++) {
-	 struct gl_light *light = &ctx->Light.Light[i];
-
-	 if (light->Enabled) {
-	    key->unit[i].light_enabled = 1;
-
-	    if (light->EyePosition[3] == 0.0)
-	       key->unit[i].light_eyepos3_is_zero = 1;
-
-	    if (light->SpotCutoff == 180.0)
-	       key->unit[i].light_spotcutoff_is_180 = 1;
-
-	    if (light->ConstantAttenuation != 1.0 ||
-		light->LinearAttenuation != 0.0 ||
-		light->QuadraticAttenuation != 0.0)
-	       key->unit[i].light_attenuated = 1;
-	 }
-      }
-
-      if (check_active_shininess(ctx, key, 0)) {
-         key->material_shininess_is_zero = 0;
-      }
-      else if (key->light_twoside &&
-               check_active_shininess(ctx, key, 1)) {
-         key->material_shininess_is_zero = 0;
-      }
-      else {
-         key->material_shininess_is_zero = 1;
-      }
-   }
-
-   if (ctx->Transform.Normalize)
-      key->normalize = 1;
-
-   if (ctx->Transform.RescaleNormals)
-      key->rescale_normals = 1;
-
-   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT)
-      key->fog_source_is_depth = 1;
-
-   if (ctx->Point._Attenuated)
-      key->point_attenuated = 1;
-
-#if FEATURE_point_size_array
-   if (ctx->Array.ArrayObj->PointSize.Enabled)
-      key->point_array = 1;
-#endif
-
-   if (ctx->Texture._TexGenEnabled ||
-       ctx->Texture._TexMatEnabled ||
-       ctx->Texture._EnabledUnits)
-      key->texture_enabled_global = 1;
-
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-
-      if (texUnit->_ReallyEnabled)
-	 key->unit[i].texunit_really_enabled = 1;
-
-      if (ctx->Point.PointSprite)
-	 if (ctx->Point.CoordReplace[i])
-	    key->unit[i].coord_replace = 1;
-
-      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))
-	 key->unit[i].texmat_enabled = 1;
-
-      if (texUnit->TexGenEnabled) {
-	 key->unit[i].texgen_enabled = 1;
-
-	 key->unit[i].texgen_mode0 =
-	    translate_texgen( texUnit->TexGenEnabled & (1<<0),
-			      texUnit->GenS.Mode );
-	 key->unit[i].texgen_mode1 =
-	    translate_texgen( texUnit->TexGenEnabled & (1<<1),
-			      texUnit->GenT.Mode );
-	 key->unit[i].texgen_mode2 =
-	    translate_texgen( texUnit->TexGenEnabled & (1<<2),
-			      texUnit->GenR.Mode );
-	 key->unit[i].texgen_mode3 =
-	    translate_texgen( texUnit->TexGenEnabled & (1<<3),
-			      texUnit->GenQ.Mode );
-      }
-   }
-}
-
-
-
-/* Very useful debugging tool - produces annotated listing of
- * generated program with line/function references for each
- * instruction back into this file:
- */
-#define DISASSEM 0
-
-
-/* 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;
-   GLint idx:9;      /* relative addressing may be negative */
-                     /* sizeof(idx) should == sizeof(prog_src_reg::Index) */
-   GLuint negate:1;
-   GLuint swz:12;
-   GLuint pad:6;
-};
-
-
-struct tnl_program {
-   const struct state_key *state;
-   struct gl_vertex_program *program;
-   GLint max_inst;  /** number of instructions allocated for program */
-   GLboolean mvp_with_dp4;
-
-   GLuint temp_in_use;
-   GLuint temp_reserved;
-
-   struct ureg eye_position;
-   struct ureg eye_position_z;
-   struct ureg eye_position_normalized;
-   struct ureg transformed_normal;
-   struct ureg identity;
-
-   GLuint materials;
-   GLuint color_materials;
-};
-
-
-static const struct ureg undef = {
-   PROGRAM_UNDEFINED,
-   0,
-   0,
-   0,
-   0
-};
-
-/* Local shorthand:
- */
-#define X    SWIZZLE_X
-#define Y    SWIZZLE_Y
-#define Z    SWIZZLE_Z
-#define W    SWIZZLE_W
-
-
-/* Construct a ureg:
- */
-static struct ureg make_ureg(GLuint file, GLint idx)
-{
-   struct ureg reg;
-   reg.file = file;
-   reg.idx = idx;
-   reg.negate = 0;
-   reg.swz = SWIZZLE_NOOP;
-   reg.pad = 0;
-   return reg;
-}
-
-
-
-static struct ureg negate( struct ureg reg )
-{
-   reg.negate ^= 1;
-   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 get_temp( struct tnl_program *p )
-{
-   int 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 reserve_temp( struct tnl_program *p )
-{
-   struct ureg temp = get_temp( p );
-   p->temp_reserved |= 1<<temp.idx;
-   return temp;
-}
-
-
-static void release_temp( struct tnl_program *p, struct ureg reg )
-{
-   if (reg.file == PROGRAM_TEMPORARY) {
-      p->temp_in_use &= ~(1<<reg.idx);
-      p->temp_in_use |= p->temp_reserved; /* can't release reserved temps */
-   }
-}
-
-static void release_temps( struct tnl_program *p )
-{
-   p->temp_in_use = p->temp_reserved;
-}
-
-
-static struct ureg register_param5(struct tnl_program *p,
-				   GLint s0,
-				   GLint s1,
-				   GLint s2,
-				   GLint s3,
-                                   GLint s4)
-{
-   gl_state_index tokens[STATE_LENGTH];
-   GLint 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, 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)
-
-
-
-/**
- * \param input  one of VERT_ATTRIB_x tokens.
- */
-static struct ureg register_input( struct tnl_program *p, GLuint input )
-{
-   assert(input < 32);
-
-   if (p->state->varying_vp_inputs & (1<<input)) {
-      p->program->Base.InputsRead |= (1<<input);
-      return make_ureg(PROGRAM_INPUT, input);
-   }
-   else {
-      return register_param3( p, STATE_INTERNAL, STATE_CURRENT_ATTRIB, input );
-   }
-}
-
-
-/**
- * \param input  one of VERT_RESULT_x tokens.
- */
-static struct ureg register_output( struct tnl_program *p, GLuint output )
-{
-   p->program->Base.OutputsWritten |= BITFIELD64_BIT(output);
-   return make_ureg(PROGRAM_OUTPUT, output);
-}
-
-
-static struct ureg register_const4f( struct tnl_program *p,
-			      GLfloat s0,
-			      GLfloat s1,
-			      GLfloat s2,
-			      GLfloat s3)
-{
-   GLfloat values[4];
-   GLint idx;
-   GLuint swizzle;
-   values[0] = s0;
-   values[1] = s1;
-   values[2] = s2;
-   values[3] = s3;
-   idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,
-                                     &swizzle );
-   ASSERT(swizzle == SWIZZLE_NOOP);
-   return make_ureg(PROGRAM_CONSTANT, idx);
-}
-
-#define register_const1f(p, s0)         register_const4f(p, s0, 0, 0, 1)
-#define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)
-#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 GLboolean is_undef( struct ureg reg )
-{
-   return reg.file == PROGRAM_UNDEFINED;
-}
-
-
-static struct ureg get_identity_param( struct tnl_program *p )
-{
-   if (is_undef(p->identity))
-      p->identity = register_const4f(p, 0,0,0,1);
-
-   return p->identity;
-}
-
-static void register_matrix_param5( struct tnl_program *p,
-				    GLint s0, /* modelview, projection, etc */
-				    GLint s1, /* texture matrix number */
-				    GLint s2, /* first row */
-				    GLint s3, /* last row */
-				    GLint s4, /* inverse, transpose, etc */
-				    struct ureg *matrix )
-{
-   GLint i;
-
-   /* This is a bit sad as the support is there to pull the whole
-    * matrix out in one go:
-    */
-   for (i = 0; i <= s3 - s2; i++)
-      matrix[i] = register_param5( p, s0, s1, i, i, s4 );
-}
-
-
-static void emit_arg( struct prog_src_register *src,
-		      struct ureg reg )
-{
-   src->File = reg.file;
-   src->Index = reg.idx;
-   src->Swizzle = reg.swz;
-   src->Negate = reg.negate ? NEGATE_XYZW : NEGATE_NONE;
-   src->Abs = 0;
-   src->RelAddr = 0;
-   /* Check that bitfield sizes aren't exceeded */
-   ASSERT(src->Index == reg.idx);
-}
-
-
-static void emit_dst( struct prog_dst_register *dst,
-		      struct ureg reg, GLuint mask )
-{
-   dst->File = reg.file;
-   dst->Index = reg.idx;
-   /* allow zero as a shorthand for xyzw */
-   dst->WriteMask = mask ? mask : WRITEMASK_XYZW;
-   dst->CondMask = COND_TR;  /* always pass cond test */
-   dst->CondSwizzle = SWIZZLE_NOOP;
-   dst->CondSrc = 0;
-   /* Check that bitfield sizes aren't exceeded */
-   ASSERT(dst->Index == reg.idx);
-}
-
-
-static void debug_insn( struct prog_instruction *inst, const char *fn,
-			GLuint line )
-{
-   if (DISASSEM) {
-      static const char *last_fn;
-
-      if (fn != last_fn) {
-	 last_fn = fn;
-	 printf("%s:\n", fn);
-      }
-
-      printf("%d:\t", line);
-      _mesa_print_instruction(inst);
-   }
-}
-
-
-static void emit_op3fn(struct tnl_program *p,
-                       enum prog_opcode op,
-		       struct ureg dest,
-		       GLuint mask,
-		       struct ureg src0,
-		       struct ureg src1,
-		       struct ureg src2,
-		       const char *fn,
-		       GLuint line)
-{
-   GLuint nr;
-   struct prog_instruction *inst;
-
-   assert((GLint) p->program->Base.NumInstructions <= p->max_inst);
-
-   if (p->program->Base.NumInstructions == p->max_inst) {
-      /* need to extend the program's instruction array */
-      struct prog_instruction *newInst;
-
-      /* double the size */
-      p->max_inst *= 2;
-
-      newInst = _mesa_alloc_instructions(p->max_inst);
-      if (!newInst) {
-         _mesa_error(NULL, GL_OUT_OF_MEMORY, "vertex program build");
-         return;
-      }
-
-      _mesa_copy_instructions(newInst,
-                              p->program->Base.Instructions,
-                              p->program->Base.NumInstructions);
-
-      _mesa_free_instructions(p->program->Base.Instructions,
-                              p->program->Base.NumInstructions);
-
-      p->program->Base.Instructions = newInst;
-   }
-
-   nr = p->program->Base.NumInstructions++;
-
-   inst = &p->program->Base.Instructions[nr];
-   inst->Opcode = (enum prog_opcode) op;
-   inst->Data = 0;
-
-   emit_arg( &inst->SrcReg[0], src0 );
-   emit_arg( &inst->SrcReg[1], src1 );
-   emit_arg( &inst->SrcReg[2], src2 );
-
-   emit_dst( &inst->DstReg, dest, mask );
-
-   debug_insn(inst, fn, line);
-}
-
-
-#define emit_op3(p, op, dst, mask, src0, src1, src2) \
-   emit_op3fn(p, op, dst, mask, src0, src1, src2, __FUNCTION__, __LINE__)
-
-#define emit_op2(p, op, dst, mask, src0, src1) \
-    emit_op3fn(p, op, dst, mask, src0, src1, undef, __FUNCTION__, __LINE__)
-
-#define emit_op1(p, op, dst, mask, src0) \
-    emit_op3fn(p, op, dst, mask, src0, undef, undef, __FUNCTION__, __LINE__)
-
-
-static struct ureg make_temp( struct tnl_program *p, struct ureg reg )
-{
-   if (reg.file == PROGRAM_TEMPORARY &&
-       !(p->temp_reserved & (1<<reg.idx)))
-      return reg;
-   else {
-      struct ureg temp = get_temp(p);
-      emit_op1(p, OPCODE_MOV, temp, 0, reg);
-      return temp;
-   }
-}
-
-
-/* Currently no tracking performed of input/output/register size or
- * active elements.  Could be used to reduce these operations, as
- * could the matrix type.
- */
-static void emit_matrix_transform_vec4( struct tnl_program *p,
-					struct ureg dest,
-					const struct ureg *mat,
-					struct ureg src)
-{
-   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_X, src, mat[0]);
-   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_Y, src, mat[1]);
-   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_Z, src, mat[2]);
-   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_W, src, mat[3]);
-}
-
-
-/* This version is much easier to implement if writemasks are not
- * supported natively on the target or (like SSE), the target doesn't
- * have a clean/obvious dotproduct implementation.
- */
-static void emit_transpose_matrix_transform_vec4( struct tnl_program *p,
-						  struct ureg dest,
-						  const struct ureg *mat,
-						  struct ureg src)
-{
-   struct ureg tmp;
-
-   if (dest.file != PROGRAM_TEMPORARY)
-      tmp = get_temp(p);
-   else
-      tmp = dest;
-
-   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);
-
-   if (dest.file != PROGRAM_TEMPORARY)
-      release_temp(p, tmp);
-}
-
-
-static void emit_matrix_transform_vec3( struct tnl_program *p,
-					struct ureg dest,
-					const struct ureg *mat,
-					struct ureg src)
-{
-   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_X, src, mat[0]);
-   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_Y, src, mat[1]);
-   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_Z, src, mat[2]);
-}
-
-
-static void emit_normalize_vec3( struct tnl_program *p,
-				 struct ureg dest,
-				 struct ureg src )
-{
-#if 0
-   /* XXX use this when drivers are ready for NRM3 */
-   emit_op1(p, OPCODE_NRM3, dest, WRITEMASK_XYZ, src);
-#else
-   struct ureg tmp = get_temp(p);
-   emit_op2(p, OPCODE_DP3, tmp, WRITEMASK_X, src, src);
-   emit_op1(p, OPCODE_RSQ, tmp, WRITEMASK_X, tmp);
-   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(tmp, X));
-   release_temp(p, tmp);
-#endif
-}
-
-
-static void emit_passthrough( struct tnl_program *p,
-			      GLuint input,
-			      GLuint output )
-{
-   struct ureg out = register_output(p, output);
-   emit_op1(p, OPCODE_MOV, out, 0, register_input(p, input));
-}
-
-
-static struct ureg get_eye_position( struct tnl_program *p )
-{
-   if (is_undef(p->eye_position)) {
-      struct ureg pos = register_input( p, VERT_ATTRIB_POS );
-      struct ureg modelview[4];
-
-      p->eye_position = reserve_temp(p);
-
-      if (p->mvp_with_dp4) {
-	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
-                                 0, modelview );
-
-	 emit_matrix_transform_vec4(p, p->eye_position, modelview, pos);
-      }
-      else {
-	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
-				 STATE_MATRIX_TRANSPOSE, modelview );
-
-	 emit_transpose_matrix_transform_vec4(p, p->eye_position, modelview, pos);
-      }
-   }
-
-   return p->eye_position;
-}
-
-
-static struct ureg get_eye_position_z( struct tnl_program *p )
-{
-   if (!is_undef(p->eye_position))
-      return swizzle1(p->eye_position, Z);
-
-   if (is_undef(p->eye_position_z)) {
-      struct ureg pos = register_input( p, VERT_ATTRIB_POS );
-      struct ureg modelview[4];
-
-      p->eye_position_z = reserve_temp(p);
-
-      register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,
-                              0, modelview );
-
-      emit_op2(p, OPCODE_DP4, p->eye_position_z, 0, pos, modelview[2]);
-   }
-
-   return p->eye_position_z;
-}
-
-
-static struct ureg get_eye_position_normalized( struct tnl_program *p )
-{
-   if (is_undef(p->eye_position_normalized)) {
-      struct ureg eye = get_eye_position(p);
-      p->eye_position_normalized = reserve_temp(p);
-      emit_normalize_vec3(p, p->eye_position_normalized, eye);
-   }
-
-   return p->eye_position_normalized;
-}
-
-
-static struct ureg get_transformed_normal( struct tnl_program *p )
-{
-   if (is_undef(p->transformed_normal) &&
-       !p->state->need_eye_coords &&
-       !p->state->normalize &&
-       !(p->state->need_eye_coords == p->state->rescale_normals))
-   {
-      p->transformed_normal = register_input(p, VERT_ATTRIB_NORMAL );
-   }
-   else if (is_undef(p->transformed_normal))
-   {
-      struct ureg normal = register_input(p, VERT_ATTRIB_NORMAL );
-      struct ureg mvinv[3];
-      struct ureg transformed_normal = reserve_temp(p);
-
-      if (p->state->need_eye_coords) {
-         register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 2,
-                                 STATE_MATRIX_INVTRANS, mvinv );
-
-         /* Transform to eye space:
-          */
-         emit_matrix_transform_vec3( p, transformed_normal, mvinv, normal );
-         normal = transformed_normal;
-      }
-
-      /* Normalize/Rescale:
-       */
-      if (p->state->normalize) {
-	 emit_normalize_vec3( p, transformed_normal, normal );
-         normal = transformed_normal;
-      }
-      else if (p->state->need_eye_coords == p->state->rescale_normals) {
-         /* This is already adjusted for eye/non-eye rendering:
-          */
-	 struct ureg rescale = register_param2(p, STATE_INTERNAL,
-                                               STATE_NORMAL_SCALE);
-
-	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal, rescale );
-         normal = transformed_normal;
-      }
-
-      assert(normal.file == PROGRAM_TEMPORARY);
-      p->transformed_normal = normal;
-   }
-
-   return p->transformed_normal;
-}
-
-
-static void build_hpos( struct tnl_program *p )
-{
-   struct ureg pos = register_input( p, VERT_ATTRIB_POS );
-   struct ureg hpos = register_output( p, VERT_RESULT_HPOS );
-   struct ureg mvp[4];
-
-   if (p->mvp_with_dp4) {
-      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3,
-			      0, mvp );
-      emit_matrix_transform_vec4( p, hpos, mvp, pos );
-   }
-   else {
-      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3,
-			      STATE_MATRIX_TRANSPOSE, mvp );
-      emit_transpose_matrix_transform_vec4( p, hpos, mvp, pos );
-   }
-}
-
-
-static GLuint material_attrib( GLuint side, GLuint property )
-{
-   return (property - STATE_AMBIENT) * 2 + side;
-}
-
-
-/**
- * Get a bitmask of which material values vary on a per-vertex basis.
- */
-static void set_material_flags( struct tnl_program *p )
-{
-   p->color_materials = 0;
-   p->materials = 0;
-
-   if (p->state->varying_vp_inputs & VERT_BIT_COLOR0) {
-      p->materials =
-	 p->color_materials = p->state->light_color_material_mask;
-   }
-
-   p->materials |= (p->state->varying_vp_inputs >> 16);
-}
-
-
-static struct ureg get_material( struct tnl_program *p, GLuint side,
-				 GLuint property )
-{
-   GLuint attrib = material_attrib(side, property);
-
-   if (p->color_materials & (1<<attrib))
-      return register_input(p, VERT_ATTRIB_COLOR0);
-   else if (p->materials & (1<<attrib)) {
-      /* Put material values in the GENERIC slots -- they are not used
-       * for anything in fixed function mode.
-       */
-      return register_input( p, attrib + VERT_ATTRIB_GENERIC0 );
-   }
-   else
-      return register_param3( p, STATE_MATERIAL, side, property );
-}
-
-#define SCENE_COLOR_BITS(side) (( MAT_BIT_FRONT_EMISSION | \
-				   MAT_BIT_FRONT_AMBIENT | \
-				   MAT_BIT_FRONT_DIFFUSE) << (side))
-
-
-/**
- * Either return a precalculated constant value or emit code to
- * calculate these values dynamically in the case where material calls
- * are present between begin/end pairs.
- *
- * Probably want to shift this to the program compilation phase - if
- * we always emitted the calculation here, a smart compiler could
- * detect that it was constant (given a certain set of inputs), and
- * lift it out of the main loop.  That way the programs created here
- * would be independent of the vertex_buffer details.
- */
-static struct ureg get_scenecolor( struct tnl_program *p, GLuint side )
-{
-   if (p->materials & SCENE_COLOR_BITS(side)) {
-      struct ureg lm_ambient = register_param1(p, STATE_LIGHTMODEL_AMBIENT);
-      struct ureg material_emission = get_material(p, side, STATE_EMISSION);
-      struct ureg material_ambient = get_material(p, side, STATE_AMBIENT);
-      struct ureg material_diffuse = get_material(p, side, STATE_DIFFUSE);
-      struct ureg tmp = make_temp(p, material_diffuse);
-      emit_op3(p, OPCODE_MAD, tmp, WRITEMASK_XYZ, lm_ambient,
-	       material_ambient, material_emission);
-      return tmp;
-   }
-   else
-      return register_param2( p, STATE_LIGHTMODEL_SCENECOLOR, side );
-}
-
-
-static struct ureg get_lightprod( struct tnl_program *p, GLuint light,
-				  GLuint side, GLuint property )
-{
-   GLuint attrib = material_attrib(side, property);
-   if (p->materials & (1<<attrib)) {
-      struct ureg light_value =
-	 register_param3(p, STATE_LIGHT, light, property);
-      struct ureg material_value = get_material(p, side, property);
-      struct ureg tmp = get_temp(p);
-      emit_op2(p, OPCODE_MUL, tmp, 0, light_value, material_value);
-      return tmp;
-   }
-   else
-      return register_param4(p, STATE_LIGHTPROD, light, side, property);
-}
-
-
-static struct ureg calculate_light_attenuation( struct tnl_program *p,
-						GLuint i,
-						struct ureg VPpli,
-						struct ureg dist )
-{
-   struct ureg attenuation = register_param3(p, STATE_LIGHT, i,
-					     STATE_ATTENUATION);
-   struct ureg att = get_temp(p);
-
-   /* Calculate spot attenuation:
-    */
-   if (!p->state->unit[i].light_spotcutoff_is_180) {
-      struct ureg spot_dir_norm = register_param3(p, STATE_INTERNAL,
-						  STATE_LIGHT_SPOT_DIR_NORMALIZED, i);
-      struct ureg spot = get_temp(p);
-      struct ureg slt = get_temp(p);
-
-      emit_op2(p, OPCODE_DP3, spot, 0, negate(VPpli), spot_dir_norm);
-      emit_op2(p, OPCODE_SLT, slt, 0, swizzle1(spot_dir_norm,W), spot);
-      emit_op2(p, OPCODE_POW, spot, 0, spot, swizzle1(attenuation, W));
-      emit_op2(p, OPCODE_MUL, att, 0, slt, spot);
-
-      release_temp(p, spot);
-      release_temp(p, slt);
-   }
-
-   /* Calculate distance attenuation:
-    */
-   if (p->state->unit[i].light_attenuated) {
-      /* 1/d,d,d,1/d */
-      emit_op1(p, OPCODE_RCP, dist, WRITEMASK_YZ, dist);
-      /* 1,d,d*d,1/d */
-      emit_op2(p, OPCODE_MUL, dist, WRITEMASK_XZ, dist, swizzle1(dist,Y));
-      /* 1/dist-atten */
-      emit_op2(p, OPCODE_DP3, dist, 0, attenuation, dist);
-
-      if (!p->state->unit[i].light_spotcutoff_is_180) {
-	 /* dist-atten */
-	 emit_op1(p, OPCODE_RCP, dist, 0, dist);
-	 /* spot-atten * dist-atten */
-	 emit_op2(p, OPCODE_MUL, att, 0, dist, att);
-      }
-      else {
-	 /* dist-atten */
-	 emit_op1(p, OPCODE_RCP, att, 0, dist);
-      }
-   }
-
-   return att;
-}
-
-
-/**
- * Compute:
- *   lit.y = MAX(0, dots.x)
- *   lit.z = SLT(0, dots.x)
- */
-static void emit_degenerate_lit( struct tnl_program *p,
-                                 struct ureg lit,
-                                 struct ureg dots )
-{
-   struct ureg id = get_identity_param(p);  /* id = {0,0,0,1} */
-
-   /* Note that lit.x & lit.w will not be examined.  Note also that
-    * dots.xyzw == dots.xxxx.
-    */
-
-   /* MAX lit, id, dots;
-    */
-   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_XYZW, id, dots);
-
-   /* result[2] = (in > 0 ? 1 : 0)
-    * SLT lit.z, id.z, dots;   # lit.z = (0 < dots.z) ? 1 : 0
-    */
-   emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, swizzle1(id,Z), dots);
-}
-
-
-/* Need to add some addtional parameters to allow lighting in object
- * space - STATE_SPOT_DIRECTION and STATE_HALF_VECTOR implicitly assume eye
- * space lighting.
- */
-static void build_lighting( struct tnl_program *p )
-{
-   const GLboolean twoside = p->state->light_twoside;
-   const GLboolean separate = p->state->separate_specular;
-   GLuint nr_lights = 0, count = 0;
-   struct ureg normal = get_transformed_normal(p);
-   struct ureg lit = get_temp(p);
-   struct ureg dots = get_temp(p);
-   struct ureg _col0 = undef, _col1 = undef;
-   struct ureg _bfc0 = undef, _bfc1 = undef;
-   GLuint i;
-
-   /*
-    * NOTE:
-    * dots.x = dot(normal, VPpli)
-    * dots.y = dot(normal, halfAngle)
-    * dots.z = back.shininess
-    * dots.w = front.shininess
-    */
-
-   for (i = 0; i < MAX_LIGHTS; i++)
-      if (p->state->unit[i].light_enabled)
-	 nr_lights++;
-
-   set_material_flags(p);
-
-   {
-      if (!p->state->material_shininess_is_zero) {
-         struct ureg shininess = get_material(p, 0, STATE_SHININESS);
-         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_W, swizzle1(shininess,X));
-         release_temp(p, shininess);
-      }
-
-      _col0 = make_temp(p, get_scenecolor(p, 0));
-      if (separate)
-	 _col1 = make_temp(p, get_identity_param(p));
-      else
-	 _col1 = _col0;
-   }
-
-   if (twoside) {
-      if (!p->state->material_shininess_is_zero) {
-         /* Note that we negate the back-face specular exponent here.
-          * The negation will be un-done later in the back-face code below.
-          */
-         struct ureg shininess = get_material(p, 1, STATE_SHININESS);
-         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z,
-                  negate(swizzle1(shininess,X)));
-         release_temp(p, shininess);
-      }
-
-      _bfc0 = make_temp(p, get_scenecolor(p, 1));
-      if (separate)
-	 _bfc1 = make_temp(p, get_identity_param(p));
-      else
-	 _bfc1 = _bfc0;
-   }
-
-   /* If no lights, still need to emit the scenecolor.
-    */
-   {
-      struct ureg res0 = register_output( p, VERT_RESULT_COL0 );
-      emit_op1(p, OPCODE_MOV, res0, 0, _col0);
-   }
-
-   if (separate) {
-      struct ureg res1 = register_output( p, VERT_RESULT_COL1 );
-      emit_op1(p, OPCODE_MOV, res1, 0, _col1);
-   }
-
-   if (twoside) {
-      struct ureg res0 = register_output( p, VERT_RESULT_BFC0 );
-      emit_op1(p, OPCODE_MOV, res0, 0, _bfc0);
-   }
-
-   if (twoside && separate) {
-      struct ureg res1 = register_output( p, VERT_RESULT_BFC1 );
-      emit_op1(p, OPCODE_MOV, res1, 0, _bfc1);
-   }
-
-   if (nr_lights == 0) {
-      release_temps(p);
-      return;
-   }
-
-   for (i = 0; i < MAX_LIGHTS; i++) {
-      if (p->state->unit[i].light_enabled) {
-	 struct ureg half = undef;
-	 struct ureg att = undef, VPpli = undef;
-
-	 count++;
-
-	 if (p->state->unit[i].light_eyepos3_is_zero) {
-	    /* Can used precomputed constants in this case.
-	     * Attenuation never applies to infinite lights.
-	     */
-	    VPpli = register_param3(p, STATE_INTERNAL,
-				    STATE_LIGHT_POSITION_NORMALIZED, i);
-
-            if (!p->state->material_shininess_is_zero) {
-               if (p->state->light_local_viewer) {
-                  struct ureg eye_hat = get_eye_position_normalized(p);
-                  half = get_temp(p);
-                  emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
-                  emit_normalize_vec3(p, half, half);
-               }
-               else {
-                  half = register_param3(p, STATE_INTERNAL,
-                                         STATE_LIGHT_HALF_VECTOR, i);
-               }
-            }
-	 }
-	 else {
-	    struct ureg Ppli = register_param3(p, STATE_INTERNAL,
-					       STATE_LIGHT_POSITION, i);
-	    struct ureg V = get_eye_position(p);
-	    struct ureg dist = get_temp(p);
-
-	    VPpli = get_temp(p);
-
-	    /* Calculate VPpli vector
-	     */
-	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V);
-
-	    /* Normalize VPpli.  The dist value also used in
-	     * attenuation below.
-	     */
-	    emit_op2(p, OPCODE_DP3, dist, 0, VPpli, VPpli);
-	    emit_op1(p, OPCODE_RSQ, dist, 0, dist);
-	    emit_op2(p, OPCODE_MUL, VPpli, 0, VPpli, dist);
-
-	    /* Calculate attenuation:
-	     */
-	    if (!p->state->unit[i].light_spotcutoff_is_180 ||
-		p->state->unit[i].light_attenuated) {
-	       att = calculate_light_attenuation(p, i, VPpli, dist);
-	    }
-
-	    /* Calculate viewer direction, or use infinite viewer:
-	     */
-            if (!p->state->material_shininess_is_zero) {
-               half = get_temp(p);
-
-               if (p->state->light_local_viewer) {
-                  struct ureg eye_hat = get_eye_position_normalized(p);
-                  emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
-               }
-               else {
-                  struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z);
-                  emit_op2(p, OPCODE_ADD, half, 0, VPpli, z_dir);
-               }
-
-               emit_normalize_vec3(p, half, half);
-            }
-
-	    release_temp(p, dist);
-	 }
-
-	 /* Calculate dot products:
-	  */
-         if (p->state->material_shininess_is_zero) {
-            emit_op2(p, OPCODE_DP3, dots, 0, normal, VPpli);
-         }
-         else {
-            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
-            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
-         }
-
-	 /* Front face lighting:
-	  */
-	 {
-	    struct ureg ambient = get_lightprod(p, i, 0, STATE_AMBIENT);
-	    struct ureg diffuse = get_lightprod(p, i, 0, STATE_DIFFUSE);
-	    struct ureg specular = get_lightprod(p, i, 0, STATE_SPECULAR);
-	    struct ureg res0, res1;
-	    GLuint mask0, mask1;
-
-	    if (count == nr_lights) {
-	       if (separate) {
-		  mask0 = WRITEMASK_XYZ;
-		  mask1 = WRITEMASK_XYZ;
-		  res0 = register_output( p, VERT_RESULT_COL0 );
-		  res1 = register_output( p, VERT_RESULT_COL1 );
-	       }
-	       else {
-		  mask0 = 0;
-		  mask1 = WRITEMASK_XYZ;
-		  res0 = _col0;
-		  res1 = register_output( p, VERT_RESULT_COL0 );
-	       }
-	    }
-            else {
-	       mask0 = 0;
-	       mask1 = 0;
-	       res0 = _col0;
-	       res1 = _col1;
-	    }
-
-	    if (!is_undef(att)) {
-               /* light is attenuated by distance */
-               emit_op1(p, OPCODE_LIT, lit, 0, dots);
-               emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
-               emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);
-            }
-            else if (!p->state->material_shininess_is_zero) {
-               /* there's a non-zero specular term */
-               emit_op1(p, OPCODE_LIT, lit, 0, dots);
-               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
-            }
-            else {
-               /* no attenutation, no specular */
-               emit_degenerate_lit(p, lit, dots);
-               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);
-            }
-
-	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _col0);
-	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _col1);
-
-	    release_temp(p, ambient);
-	    release_temp(p, diffuse);
-	    release_temp(p, specular);
-	 }
-
-	 /* Back face lighting:
-	  */
-	 if (twoside) {
-	    struct ureg ambient = get_lightprod(p, i, 1, STATE_AMBIENT);
-	    struct ureg diffuse = get_lightprod(p, i, 1, STATE_DIFFUSE);
-	    struct ureg specular = get_lightprod(p, i, 1, STATE_SPECULAR);
-	    struct ureg res0, res1;
-	    GLuint mask0, mask1;
-
-	    if (count == nr_lights) {
-	       if (separate) {
-		  mask0 = WRITEMASK_XYZ;
-		  mask1 = WRITEMASK_XYZ;
-		  res0 = register_output( p, VERT_RESULT_BFC0 );
-		  res1 = register_output( p, VERT_RESULT_BFC1 );
-	       }
-	       else {
-		  mask0 = 0;
-		  mask1 = WRITEMASK_XYZ;
-		  res0 = _bfc0;
-		  res1 = register_output( p, VERT_RESULT_BFC0 );
-	       }
-	    }
-            else {
-	       res0 = _bfc0;
-	       res1 = _bfc1;
-	       mask0 = 0;
-	       mask1 = 0;
-	    }
-
-            /* For the back face we need to negate the X and Y component
-             * dot products.  dots.Z has the negated back-face specular
-             * exponent.  We swizzle that into the W position.  This
-             * negation makes the back-face specular term positive again.
-             */
-            dots = negate(swizzle(dots,X,Y,W,Z));
-
-	    if (!is_undef(att)) {
-               emit_op1(p, OPCODE_LIT, lit, 0, dots);
-	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);
-               emit_op3(p, OPCODE_MAD, _bfc0, 0, swizzle1(lit,X), ambient, _bfc0);
-            }
-            else if (!p->state->material_shininess_is_zero) {
-               emit_op1(p, OPCODE_LIT, lit, 0, dots);
-               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0); /**/
-            }
-            else {
-               emit_degenerate_lit(p, lit, dots);
-               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);
-            }
-
-	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);
-	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);
-            /* restore dots to its original state for subsequent lights
-             * by negating and swizzling again.
-             */
-            dots = negate(swizzle(dots,X,Y,W,Z));
-
-	    release_temp(p, ambient);
-	    release_temp(p, diffuse);
-	    release_temp(p, specular);
-	 }
-
-	 release_temp(p, half);
-	 release_temp(p, VPpli);
-	 release_temp(p, att);
-      }
-   }
-
-   release_temps( p );
-}
-
-
-static void build_fog( struct tnl_program *p )
-{
-   struct ureg fog = register_output(p, VERT_RESULT_FOGC);
-   struct ureg input;
-
-   if (p->state->fog_source_is_depth) {
-      input = get_eye_position_z(p);
-   }
-   else {
-      input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
-   }
-
-   /* result.fog = {abs(f),0,0,1}; */
-   emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input);
-   emit_op1(p, OPCODE_MOV, fog, WRITEMASK_YZW, get_identity_param(p));
-}
-
-
-static void build_reflect_texgen( struct tnl_program *p,
-				  struct ureg dest,
-				  GLuint writemask )
-{
-   struct ureg normal = get_transformed_normal(p);
-   struct ureg eye_hat = get_eye_position_normalized(p);
-   struct ureg tmp = get_temp(p);
-
-   /* n.u */
-   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat);
-   /* 2n.u */
-   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp);
-   /* (-2n.u)n + u */
-   emit_op3(p, OPCODE_MAD, dest, writemask, negate(tmp), normal, eye_hat);
-
-   release_temp(p, tmp);
-}
-
-
-static void build_sphere_texgen( struct tnl_program *p,
-				 struct ureg dest,
-				 GLuint writemask )
-{
-   struct ureg normal = get_transformed_normal(p);
-   struct ureg eye_hat = get_eye_position_normalized(p);
-   struct ureg tmp = get_temp(p);
-   struct ureg half = register_scalar_const(p, .5);
-   struct ureg r = get_temp(p);
-   struct ureg inv_m = get_temp(p);
-   struct ureg id = get_identity_param(p);
-
-   /* Could share the above calculations, but it would be
-    * a fairly odd state for someone to set (both sphere and
-    * reflection active for different texture coordinate
-    * components.  Of course - if two texture units enable
-    * reflect and/or sphere, things start to tilt in favour
-    * of seperating this out:
-    */
-
-   /* n.u */
-   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat);
-   /* 2n.u */
-   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp);
-   /* (-2n.u)n + u */
-   emit_op3(p, OPCODE_MAD, r, 0, negate(tmp), normal, eye_hat);
-   /* r + 0,0,1 */
-   emit_op2(p, OPCODE_ADD, tmp, 0, r, swizzle(id,X,Y,W,Z));
-   /* rx^2 + ry^2 + (rz+1)^2 */
-   emit_op2(p, OPCODE_DP3, tmp, 0, tmp, tmp);
-   /* 2/m */
-   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp);
-   /* 1/m */
-   emit_op2(p, OPCODE_MUL, inv_m, 0, tmp, half);
-   /* r/m + 1/2 */
-   emit_op3(p, OPCODE_MAD, dest, writemask, r, inv_m, half);
-
-   release_temp(p, tmp);
-   release_temp(p, r);
-   release_temp(p, inv_m);
-}
-
-
-static void build_texture_transform( struct tnl_program *p )
-{
-   GLuint i, j;
-
-   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-
-      if (!(p->state->fragprog_inputs_read & FRAG_BIT_TEX(i)))
-	 continue;
-
-      if (p->state->unit[i].coord_replace)
-  	 continue;
-
-      if (p->state->unit[i].texgen_enabled ||
-	  p->state->unit[i].texmat_enabled) {
-
-	 GLuint texmat_enabled = p->state->unit[i].texmat_enabled;
-	 struct ureg out = register_output(p, VERT_RESULT_TEX0 + i);
-	 struct ureg out_texgen = undef;
-
-	 if (p->state->unit[i].texgen_enabled) {
-	    GLuint copy_mask = 0;
-	    GLuint sphere_mask = 0;
-	    GLuint reflect_mask = 0;
-	    GLuint normal_mask = 0;
-	    GLuint modes[4];
-
-	    if (texmat_enabled)
-	       out_texgen = get_temp(p);
-	    else
-	       out_texgen = out;
-
-	    modes[0] = p->state->unit[i].texgen_mode0;
-	    modes[1] = p->state->unit[i].texgen_mode1;
-	    modes[2] = p->state->unit[i].texgen_mode2;
-	    modes[3] = p->state->unit[i].texgen_mode3;
-
-	    for (j = 0; j < 4; j++) {
-	       switch (modes[j]) {
-	       case TXG_OBJ_LINEAR: {
-		  struct ureg obj = register_input(p, VERT_ATTRIB_POS);
-		  struct ureg plane =
-		     register_param3(p, STATE_TEXGEN, i,
-				     STATE_TEXGEN_OBJECT_S + j);
-
-		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j,
-			   obj, plane );
-		  break;
-	       }
-	       case TXG_EYE_LINEAR: {
-		  struct ureg eye = get_eye_position(p);
-		  struct ureg plane =
-		     register_param3(p, STATE_TEXGEN, i,
-				     STATE_TEXGEN_EYE_S + j);
-
-		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j,
-			   eye, plane );
-		  break;
-	       }
-	       case TXG_SPHERE_MAP:
-		  sphere_mask |= WRITEMASK_X << j;
-		  break;
-	       case TXG_REFLECTION_MAP:
-		  reflect_mask |= WRITEMASK_X << j;
-		  break;
-	       case TXG_NORMAL_MAP:
-		  normal_mask |= WRITEMASK_X << j;
-		  break;
-	       case TXG_NONE:
-		  copy_mask |= WRITEMASK_X << j;
-	       }
-	    }
-
-	    if (sphere_mask) {
-	       build_sphere_texgen(p, out_texgen, sphere_mask);
-	    }
-
-	    if (reflect_mask) {
-	       build_reflect_texgen(p, out_texgen, reflect_mask);
-	    }
-
-	    if (normal_mask) {
-	       struct ureg normal = get_transformed_normal(p);
-	       emit_op1(p, OPCODE_MOV, out_texgen, normal_mask, normal );
-	    }
-
-	    if (copy_mask) {
-	       struct ureg in = register_input(p, VERT_ATTRIB_TEX0+i);
-	       emit_op1(p, OPCODE_MOV, out_texgen, copy_mask, in );
-	    }
-	 }
-
-	 if (texmat_enabled) {
-	    struct ureg texmat[4];
-	    struct ureg in = (!is_undef(out_texgen) ?
-			      out_texgen :
-			      register_input(p, VERT_ATTRIB_TEX0+i));
-	    if (p->mvp_with_dp4) {
-	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
-				       0, texmat );
-	       emit_matrix_transform_vec4( p, out, texmat, in );
-	    }
-	    else {
-	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,
-				       STATE_MATRIX_TRANSPOSE, texmat );
-	       emit_transpose_matrix_transform_vec4( p, out, texmat, in );
-	    }
-	 }
-
-	 release_temps(p);
-      }
-      else {
-	 emit_passthrough(p, VERT_ATTRIB_TEX0+i, VERT_RESULT_TEX0+i);
-      }
-   }
-}
-
-
-/**
- * Point size attenuation computation.
- */
-static void build_atten_pointsize( struct tnl_program *p )
-{
-   struct ureg eye = get_eye_position_z(p);
-   struct ureg state_size = register_param2(p, STATE_INTERNAL, STATE_POINT_SIZE_CLAMPED);
-   struct ureg state_attenuation = register_param1(p, STATE_POINT_ATTENUATION);
-   struct ureg out = register_output(p, VERT_RESULT_PSIZ);
-   struct ureg ut = get_temp(p);
-
-   /* dist = |eyez| */
-   emit_op1(p, OPCODE_ABS, ut, WRITEMASK_Y, swizzle1(eye, Z));
-   /* p1 + dist * (p2 + dist * p3); */
-   emit_op3(p, OPCODE_MAD, ut, WRITEMASK_X, swizzle1(ut, Y),
-		swizzle1(state_attenuation, Z), swizzle1(state_attenuation, Y));
-   emit_op3(p, OPCODE_MAD, ut, WRITEMASK_X, swizzle1(ut, Y),
-		ut, swizzle1(state_attenuation, X));
-
-   /* 1 / sqrt(factor) */
-   emit_op1(p, OPCODE_RSQ, ut, WRITEMASK_X, ut );
-
-#if 0
-   /* out = pointSize / sqrt(factor) */
-   emit_op2(p, OPCODE_MUL, out, WRITEMASK_X, ut, state_size);
-#else
-   /* this is a good place to clamp the point size since there's likely
-    * no hardware registers to clamp point size at rasterization time.
-    */
-   emit_op2(p, OPCODE_MUL, ut, WRITEMASK_X, ut, state_size);
-   emit_op2(p, OPCODE_MAX, ut, WRITEMASK_X, ut, swizzle1(state_size, Y));
-   emit_op2(p, OPCODE_MIN, out, WRITEMASK_X, ut, swizzle1(state_size, Z));
-#endif
-
-   release_temp(p, ut);
-}
-
-
-/**
- * Pass-though per-vertex point size, from user's point size array.
- */
-static void build_array_pointsize( struct tnl_program *p )
-{
-   struct ureg in = register_input(p, VERT_ATTRIB_POINT_SIZE);
-   struct ureg out = register_output(p, VERT_RESULT_PSIZ);
-   emit_op1(p, OPCODE_MOV, out, WRITEMASK_X, in);
-}
-
-
-static void build_tnl_program( struct tnl_program *p )
-{
-   /* Emit the program, starting with modelviewproject:
-    */
-   build_hpos(p);
-
-   /* Lighting calculations:
-    */
-   if (p->state->fragprog_inputs_read & (FRAG_BIT_COL0|FRAG_BIT_COL1)) {
-      if (p->state->light_global_enabled)
-	 build_lighting(p);
-      else {
-	 if (p->state->fragprog_inputs_read & FRAG_BIT_COL0)
-	    emit_passthrough(p, VERT_ATTRIB_COLOR0, VERT_RESULT_COL0);
-
-	 if (p->state->fragprog_inputs_read & FRAG_BIT_COL1)
-	    emit_passthrough(p, VERT_ATTRIB_COLOR1, VERT_RESULT_COL1);
-      }
-   }
-
-   if (p->state->fragprog_inputs_read & FRAG_BIT_FOGC)
-      build_fog(p);
-
-   if (p->state->fragprog_inputs_read & FRAG_BITS_TEX_ANY)
-      build_texture_transform(p);
-
-   if (p->state->point_attenuated)
-      build_atten_pointsize(p);
-   else if (p->state->point_array)
-      build_array_pointsize(p);
-
-   /* Finish up:
-    */
-   emit_op1(p, OPCODE_END, undef, 0, undef);
-
-   /* Disassemble:
-    */
-   if (DISASSEM) {
-      printf ("\n");
-   }
-}
-
-
-static void
-create_new_program( const struct state_key *key,
-                    struct gl_vertex_program *program,
-                    GLboolean mvp_with_dp4,
-                    GLuint max_temps)
-{
-   struct tnl_program p;
-
-   memset(&p, 0, sizeof(p));
-   p.state = key;
-   p.program = program;
-   p.eye_position = undef;
-   p.eye_position_z = undef;
-   p.eye_position_normalized = undef;
-   p.transformed_normal = undef;
-   p.identity = undef;
-   p.temp_in_use = 0;
-   p.mvp_with_dp4 = mvp_with_dp4;
-
-   if (max_temps >= sizeof(int) * 8)
-      p.temp_reserved = 0;
-   else
-      p.temp_reserved = ~((1<<max_temps)-1);
-
-   /* Start by allocating 32 instructions.
-    * If we need more, we'll grow the instruction array as needed.
-    */
-   p.max_inst = 32;
-   p.program->Base.Instructions = _mesa_alloc_instructions(p.max_inst);
-   p.program->Base.String = NULL;
-   p.program->Base.NumInstructions =
-   p.program->Base.NumTemporaries =
-   p.program->Base.NumParameters =
-   p.program->Base.NumAttributes = p.program->Base.NumAddressRegs = 0;
-   p.program->Base.Parameters = _mesa_new_parameter_list();
-   p.program->Base.InputsRead = 0;
-   p.program->Base.OutputsWritten = 0;
-
-   build_tnl_program( &p );
-}
-
-
-/**
- * Return a vertex program which implements the current fixed-function
- * transform/lighting/texgen operations.
- * XXX move this into core mesa (main/)
- */
-struct gl_vertex_program *
-_mesa_get_fixed_func_vertex_program(GLcontext *ctx)
-{
-   struct gl_vertex_program *prog;
-   struct state_key key;
-
-   /* Grab all the relevent state and put it in a single structure:
-    */
-   make_state_key(ctx, &key);
-
-   /* Look for an already-prepared program for this state:
-    */
-   prog = (struct gl_vertex_program *)
-      _mesa_search_program_cache(ctx->VertexProgram.Cache, &key, sizeof(key));
-
-   if (!prog) {
-      /* OK, we'll have to build a new one */
-      if (0)
-         printf("Build new TNL program\n");
-
-      prog = (struct gl_vertex_program *)
-         ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
-      if (!prog)
-         return NULL;
-
-      create_new_program( &key, prog,
-                          ctx->mvp_with_dp4,
-                          ctx->Const.VertexProgram.MaxTemps );
-
-#if 0
-      if (ctx->Driver.ProgramStringNotify)
-         ctx->Driver.ProgramStringNotify( ctx, GL_VERTEX_PROGRAM_ARB,
-                                          &prog->Base );
-#endif
-      _mesa_program_cache_insert(ctx, ctx->VertexProgram.Cache,
-                                 &key, sizeof(key), &prog->Base);
-   }
-
-   return prog;
-}
+/**************************************************************************

+ *

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

+ *

+ **************************************************************************/

+

+/**

+ * \file ffvertex_prog.c

+ *

+ * Create a vertex program to execute the current fixed function T&L pipeline.

+ * \author Keith Whitwell

+ */

+

+

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "main/macros.h"

+#include "main/enums.h"

+#include "main/ffvertex_prog.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 "program/prog_statevars.h"

+

+

+/** Max of number of lights and texture coord units */

+#define NUM_UNITS MAX2(MAX_TEXTURE_COORD_UNITS, MAX_LIGHTS)

+

+struct state_key {

+   unsigned light_color_material_mask:12;

+   unsigned light_global_enabled:1;

+   unsigned light_local_viewer:1;

+   unsigned light_twoside:1;

+   unsigned material_shininess_is_zero:1;

+   unsigned need_eye_coords:1;

+   unsigned normalize:1;

+   unsigned rescale_normals:1;

+

+   unsigned fog_source_is_depth:1;

+   unsigned separate_specular:1;

+   unsigned point_attenuated:1;

+   unsigned point_array:1;

+   unsigned texture_enabled_global:1;

+   unsigned fragprog_inputs_read:12;

+

+   unsigned varying_vp_inputs;

+

+   struct {

+      unsigned light_enabled:1;

+      unsigned light_eyepos3_is_zero:1;

+      unsigned light_spotcutoff_is_180:1;

+      unsigned light_attenuated:1;

+      unsigned texunit_really_enabled:1;

+      unsigned texmat_enabled:1;

+      unsigned coord_replace:1;

+      unsigned texgen_enabled:4;

+      unsigned texgen_mode0:4;

+      unsigned texgen_mode1:4;

+      unsigned texgen_mode2:4;

+      unsigned texgen_mode3:4;

+   } unit[NUM_UNITS];

+};

+

+

+#define TXG_NONE           0

+#define TXG_OBJ_LINEAR     1

+#define TXG_EYE_LINEAR     2

+#define TXG_SPHERE_MAP     3

+#define TXG_REFLECTION_MAP 4

+#define TXG_NORMAL_MAP     5

+

+static GLuint translate_texgen( GLboolean enabled, GLenum mode )

+{

+   if (!enabled)

+      return TXG_NONE;

+

+   switch (mode) {

+   case GL_OBJECT_LINEAR: return TXG_OBJ_LINEAR;

+   case GL_EYE_LINEAR: return TXG_EYE_LINEAR;

+   case GL_SPHERE_MAP: return TXG_SPHERE_MAP;

+   case GL_REFLECTION_MAP_NV: return TXG_REFLECTION_MAP;

+   case GL_NORMAL_MAP_NV: return TXG_NORMAL_MAP;

+   default: return TXG_NONE;

+   }

+}

+

+

+

+static GLboolean check_active_shininess( struct gl_context *ctx,

+                                         const struct state_key *key,

+                                         GLuint side )

+{

+   GLuint bit = 1 << (MAT_ATTRIB_FRONT_SHININESS + side);

+

+   if ((key->varying_vp_inputs & VERT_BIT_COLOR0) &&

+       (key->light_color_material_mask & bit))

+      return GL_TRUE;

+

+   if (key->varying_vp_inputs & (bit << 16))

+      return GL_TRUE;

+

+   if (ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS + side][0] != 0.0F)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+static void make_state_key( struct gl_context *ctx, struct state_key *key )

+{

+   const struct gl_fragment_program *fp;

+   GLuint i;

+

+   memset(key, 0, sizeof(struct state_key));

+   fp = ctx->FragmentProgram._Current;

+

+   /* This now relies on texenvprogram.c being active:

+    */

+   assert(fp);

+

+   key->need_eye_coords = ctx->_NeedEyeCoords;

+

+   key->fragprog_inputs_read = fp->Base.InputsRead;

+   key->varying_vp_inputs = ctx->varying_vp_inputs;

+

+   if (ctx->RenderMode == GL_FEEDBACK) {

+      /* make sure the vertprog emits color and tex0 */

+      key->fragprog_inputs_read |= (FRAG_BIT_COL0 | FRAG_BIT_TEX0);

+   }

+

+   key->separate_specular = (ctx->Light.Model.ColorControl ==

+			     GL_SEPARATE_SPECULAR_COLOR);

+

+   if (ctx->Light.Enabled) {

+      key->light_global_enabled = 1;

+

+      if (ctx->Light.Model.LocalViewer)

+	 key->light_local_viewer = 1;

+

+      if (ctx->Light.Model.TwoSide)

+	 key->light_twoside = 1;

+

+      if (ctx->Light.ColorMaterialEnabled) {

+	 key->light_color_material_mask = ctx->Light.ColorMaterialBitmask;

+      }

+

+      for (i = 0; i < MAX_LIGHTS; i++) {

+	 struct gl_light *light = &ctx->Light.Light[i];

+

+	 if (light->Enabled) {

+	    key->unit[i].light_enabled = 1;

+

+	    if (light->EyePosition[3] == 0.0)

+	       key->unit[i].light_eyepos3_is_zero = 1;

+

+	    if (light->SpotCutoff == 180.0)

+	       key->unit[i].light_spotcutoff_is_180 = 1;

+

+	    if (light->ConstantAttenuation != 1.0 ||

+		light->LinearAttenuation != 0.0 ||

+		light->QuadraticAttenuation != 0.0)

+	       key->unit[i].light_attenuated = 1;

+	 }

+      }

+

+      if (check_active_shininess(ctx, key, 0)) {

+         key->material_shininess_is_zero = 0;

+      }

+      else if (key->light_twoside &&

+               check_active_shininess(ctx, key, 1)) {

+         key->material_shininess_is_zero = 0;

+      }

+      else {

+         key->material_shininess_is_zero = 1;

+      }

+   }

+

+   if (ctx->Transform.Normalize)

+      key->normalize = 1;

+

+   if (ctx->Transform.RescaleNormals)

+      key->rescale_normals = 1;

+

+   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT)

+      key->fog_source_is_depth = 1;

+

+   if (ctx->Point._Attenuated)

+      key->point_attenuated = 1;

+

+#if FEATURE_point_size_array

+   if (ctx->Array.ArrayObj->PointSize.Enabled)

+      key->point_array = 1;

+#endif

+

+   if (ctx->Texture._TexGenEnabled ||

+       ctx->Texture._TexMatEnabled ||

+       ctx->Texture._EnabledUnits)

+      key->texture_enabled_global = 1;

+

+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {

+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];

+

+      if (texUnit->_ReallyEnabled)

+	 key->unit[i].texunit_really_enabled = 1;

+

+      if (ctx->Point.PointSprite)

+	 if (ctx->Point.CoordReplace[i])

+	    key->unit[i].coord_replace = 1;

+

+      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))

+	 key->unit[i].texmat_enabled = 1;

+

+      if (texUnit->TexGenEnabled) {

+	 key->unit[i].texgen_enabled = 1;

+

+	 key->unit[i].texgen_mode0 =

+	    translate_texgen( texUnit->TexGenEnabled & (1<<0),

+			      texUnit->GenS.Mode );

+	 key->unit[i].texgen_mode1 =

+	    translate_texgen( texUnit->TexGenEnabled & (1<<1),

+			      texUnit->GenT.Mode );

+	 key->unit[i].texgen_mode2 =

+	    translate_texgen( texUnit->TexGenEnabled & (1<<2),

+			      texUnit->GenR.Mode );

+	 key->unit[i].texgen_mode3 =

+	    translate_texgen( texUnit->TexGenEnabled & (1<<3),

+			      texUnit->GenQ.Mode );

+      }

+   }

+}

+

+

+

+/* Very useful debugging tool - produces annotated listing of

+ * generated program with line/function references for each

+ * instruction back into this file:

+ */

+#define DISASSEM 0

+

+

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

+   GLint idx:9;      /* relative addressing may be negative */

+                     /* sizeof(idx) should == sizeof(prog_src_reg::Index) */

+   GLuint negate:1;

+   GLuint swz:12;

+   GLuint pad:6;

+};

+

+

+struct tnl_program {

+   const struct state_key *state;

+   struct gl_vertex_program *program;

+   GLint max_inst;  /** number of instructions allocated for program */

+   GLboolean mvp_with_dp4;

+

+   GLuint temp_in_use;

+   GLuint temp_reserved;

+

+   struct ureg eye_position;

+   struct ureg eye_position_z;

+   struct ureg eye_position_normalized;

+   struct ureg transformed_normal;

+   struct ureg identity;

+

+   GLuint materials;

+   GLuint color_materials;

+};

+

+

+static const struct ureg undef = {

+   PROGRAM_UNDEFINED,

+   0,

+   0,

+   0,

+   0

+};

+

+/* Local shorthand:

+ */

+#define X    SWIZZLE_X

+#define Y    SWIZZLE_Y

+#define Z    SWIZZLE_Z

+#define W    SWIZZLE_W

+

+

+/* Construct a ureg:

+ */

+static struct ureg make_ureg(GLuint file, GLint idx)

+{

+   struct ureg reg;

+   reg.file = file;

+   reg.idx = idx;

+   reg.negate = 0;

+   reg.swz = SWIZZLE_NOOP;

+   reg.pad = 0;

+   return reg;

+}

+

+

+

+static struct ureg negate( struct ureg reg )

+{

+   reg.negate ^= 1;

+   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 get_temp( struct tnl_program *p )

+{

+   int 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 reserve_temp( struct tnl_program *p )

+{

+   struct ureg temp = get_temp( p );

+   p->temp_reserved |= 1<<temp.idx;

+   return temp;

+}

+

+

+static void release_temp( struct tnl_program *p, struct ureg reg )

+{

+   if (reg.file == PROGRAM_TEMPORARY) {

+      p->temp_in_use &= ~(1<<reg.idx);

+      p->temp_in_use |= p->temp_reserved; /* can't release reserved temps */

+   }

+}

+

+static void release_temps( struct tnl_program *p )

+{

+   p->temp_in_use = p->temp_reserved;

+}

+

+

+static struct ureg register_param5(struct tnl_program *p,

+				   GLint s0,

+				   GLint s1,

+				   GLint s2,

+				   GLint s3,

+                                   GLint s4)

+{

+   gl_state_index tokens[STATE_LENGTH];

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

+

+

+

+/**

+ * \param input  one of VERT_ATTRIB_x tokens.

+ */

+static struct ureg register_input( struct tnl_program *p, GLuint input )

+{

+   assert(input < 32);

+

+   if (p->state->varying_vp_inputs & (1<<input)) {

+      p->program->Base.InputsRead |= (1<<input);

+      return make_ureg(PROGRAM_INPUT, input);

+   }

+   else {

+      return register_param3( p, STATE_INTERNAL, STATE_CURRENT_ATTRIB, input );

+   }

+}

+

+

+/**

+ * \param input  one of VERT_RESULT_x tokens.

+ */

+static struct ureg register_output( struct tnl_program *p, GLuint output )

+{

+   p->program->Base.OutputsWritten |= BITFIELD64_BIT(output);

+   return make_ureg(PROGRAM_OUTPUT, output);

+}

+

+

+static struct ureg register_const4f( struct tnl_program *p,

+			      GLfloat s0,

+			      GLfloat s1,

+			      GLfloat s2,

+			      GLfloat s3)

+{

+   GLfloat values[4];

+   GLint idx;

+   GLuint swizzle;

+   values[0] = s0;

+   values[1] = s1;

+   values[2] = s2;

+   values[3] = s3;

+   idx = _mesa_add_unnamed_constant( p->program->Base.Parameters, values, 4,

+                                     &swizzle );

+   ASSERT(swizzle == SWIZZLE_NOOP);

+   return make_ureg(PROGRAM_CONSTANT, idx);

+}

+

+#define register_const1f(p, s0)         register_const4f(p, s0, 0, 0, 1)

+#define register_scalar_const(p, s0)    register_const4f(p, s0, s0, s0, s0)

+#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 GLboolean is_undef( struct ureg reg )

+{

+   return reg.file == PROGRAM_UNDEFINED;

+}

+

+

+static struct ureg get_identity_param( struct tnl_program *p )

+{

+   if (is_undef(p->identity))

+      p->identity = register_const4f(p, 0,0,0,1);

+

+   return p->identity;

+}

+

+static void register_matrix_param5( struct tnl_program *p,

+				    GLint s0, /* modelview, projection, etc */

+				    GLint s1, /* texture matrix number */

+				    GLint s2, /* first row */

+				    GLint s3, /* last row */

+				    GLint s4, /* inverse, transpose, etc */

+				    struct ureg *matrix )

+{

+   GLint i;

+

+   /* This is a bit sad as the support is there to pull the whole

+    * matrix out in one go:

+    */

+   for (i = 0; i <= s3 - s2; i++)

+      matrix[i] = register_param5( p, s0, s1, i, i, s4 );

+}

+

+

+static void emit_arg( struct prog_src_register *src,

+		      struct ureg reg )

+{

+   src->File = reg.file;

+   src->Index = reg.idx;

+   src->Swizzle = reg.swz;

+   src->Negate = reg.negate ? NEGATE_XYZW : NEGATE_NONE;

+   src->Abs = 0;

+   src->RelAddr = 0;

+   /* Check that bitfield sizes aren't exceeded */

+   ASSERT(src->Index == reg.idx);

+}

+

+

+static void emit_dst( struct prog_dst_register *dst,

+		      struct ureg reg, GLuint mask )

+{

+   dst->File = reg.file;

+   dst->Index = reg.idx;

+   /* allow zero as a shorthand for xyzw */

+   dst->WriteMask = mask ? mask : WRITEMASK_XYZW;

+   dst->CondMask = COND_TR;  /* always pass cond test */

+   dst->CondSwizzle = SWIZZLE_NOOP;

+   dst->CondSrc = 0;

+   /* Check that bitfield sizes aren't exceeded */

+   ASSERT(dst->Index == reg.idx);

+}

+

+

+static void debug_insn( struct prog_instruction *inst, const char *fn,

+			GLuint line )

+{

+   if (DISASSEM) {

+      static const char *last_fn;

+

+      if (fn != last_fn) {

+	 last_fn = fn;

+	 printf("%s:\n", fn);

+      }

+

+      printf("%d:\t", line);

+      _mesa_print_instruction(inst);

+   }

+}

+

+

+static void emit_op3fn(struct tnl_program *p,

+                       enum prog_opcode op,

+		       struct ureg dest,

+		       GLuint mask,

+		       struct ureg src0,

+		       struct ureg src1,

+		       struct ureg src2,

+		       const char *fn,

+		       GLuint line)

+{

+   GLuint nr;

+   struct prog_instruction *inst;

+

+   assert((GLint) p->program->Base.NumInstructions <= p->max_inst);

+

+   if (p->program->Base.NumInstructions == p->max_inst) {

+      /* need to extend the program's instruction array */

+      struct prog_instruction *newInst;

+

+      /* double the size */

+      p->max_inst *= 2;

+

+      newInst = _mesa_alloc_instructions(p->max_inst);

+      if (!newInst) {

+         _mesa_error(NULL, GL_OUT_OF_MEMORY, "vertex program build");

+         return;

+      }

+

+      _mesa_copy_instructions(newInst,

+                              p->program->Base.Instructions,

+                              p->program->Base.NumInstructions);

+

+      _mesa_free_instructions(p->program->Base.Instructions,

+                              p->program->Base.NumInstructions);

+

+      p->program->Base.Instructions = newInst;

+   }

+

+   nr = p->program->Base.NumInstructions++;

+

+   inst = &p->program->Base.Instructions[nr];

+   inst->Opcode = (enum prog_opcode) op;

+   inst->Data = 0;

+

+   emit_arg( &inst->SrcReg[0], src0 );

+   emit_arg( &inst->SrcReg[1], src1 );

+   emit_arg( &inst->SrcReg[2], src2 );

+

+   emit_dst( &inst->DstReg, dest, mask );

+

+   debug_insn(inst, fn, line);

+}

+

+

+#define emit_op3(p, op, dst, mask, src0, src1, src2) \

+   emit_op3fn(p, op, dst, mask, src0, src1, src2, __FUNCTION__, __LINE__)

+

+#define emit_op2(p, op, dst, mask, src0, src1) \

+    emit_op3fn(p, op, dst, mask, src0, src1, undef, __FUNCTION__, __LINE__)

+

+#define emit_op1(p, op, dst, mask, src0) \

+    emit_op3fn(p, op, dst, mask, src0, undef, undef, __FUNCTION__, __LINE__)

+

+

+static struct ureg make_temp( struct tnl_program *p, struct ureg reg )

+{

+   if (reg.file == PROGRAM_TEMPORARY &&

+       !(p->temp_reserved & (1<<reg.idx)))

+      return reg;

+   else {

+      struct ureg temp = get_temp(p);

+      emit_op1(p, OPCODE_MOV, temp, 0, reg);

+      return temp;

+   }

+}

+

+

+/* Currently no tracking performed of input/output/register size or

+ * active elements.  Could be used to reduce these operations, as

+ * could the matrix type.

+ */

+static void emit_matrix_transform_vec4( struct tnl_program *p,

+					struct ureg dest,

+					const struct ureg *mat,

+					struct ureg src)

+{

+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_X, src, mat[0]);

+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_Y, src, mat[1]);

+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_Z, src, mat[2]);

+   emit_op2(p, OPCODE_DP4, dest, WRITEMASK_W, src, mat[3]);

+}

+

+

+/* This version is much easier to implement if writemasks are not

+ * supported natively on the target or (like SSE), the target doesn't

+ * have a clean/obvious dotproduct implementation.

+ */

+static void emit_transpose_matrix_transform_vec4( struct tnl_program *p,

+						  struct ureg dest,

+						  const struct ureg *mat,

+						  struct ureg src)

+{

+   struct ureg tmp;

+

+   if (dest.file != PROGRAM_TEMPORARY)

+      tmp = get_temp(p);

+   else

+      tmp = dest;

+

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

+

+   if (dest.file != PROGRAM_TEMPORARY)

+      release_temp(p, tmp);

+}

+

+

+static void emit_matrix_transform_vec3( struct tnl_program *p,

+					struct ureg dest,

+					const struct ureg *mat,

+					struct ureg src)

+{

+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_X, src, mat[0]);

+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_Y, src, mat[1]);

+   emit_op2(p, OPCODE_DP3, dest, WRITEMASK_Z, src, mat[2]);

+}

+

+

+static void emit_normalize_vec3( struct tnl_program *p,

+				 struct ureg dest,

+				 struct ureg src )

+{

+#if 0

+   /* XXX use this when drivers are ready for NRM3 */

+   emit_op1(p, OPCODE_NRM3, dest, WRITEMASK_XYZ, src);

+#else

+   struct ureg tmp = get_temp(p);

+   emit_op2(p, OPCODE_DP3, tmp, WRITEMASK_X, src, src);

+   emit_op1(p, OPCODE_RSQ, tmp, WRITEMASK_X, tmp);

+   emit_op2(p, OPCODE_MUL, dest, 0, src, swizzle1(tmp, X));

+   release_temp(p, tmp);

+#endif

+}

+

+

+static void emit_passthrough( struct tnl_program *p,

+			      GLuint input,

+			      GLuint output )

+{

+   struct ureg out = register_output(p, output);

+   emit_op1(p, OPCODE_MOV, out, 0, register_input(p, input));

+}

+

+

+static struct ureg get_eye_position( struct tnl_program *p )

+{

+   if (is_undef(p->eye_position)) {

+      struct ureg pos = register_input( p, VERT_ATTRIB_POS );

+      struct ureg modelview[4];

+

+      p->eye_position = reserve_temp(p);

+

+      if (p->mvp_with_dp4) {

+	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,

+                                 0, modelview );

+

+	 emit_matrix_transform_vec4(p, p->eye_position, modelview, pos);

+      }

+      else {

+	 register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,

+				 STATE_MATRIX_TRANSPOSE, modelview );

+

+	 emit_transpose_matrix_transform_vec4(p, p->eye_position, modelview, pos);

+      }

+   }

+

+   return p->eye_position;

+}

+

+

+static struct ureg get_eye_position_z( struct tnl_program *p )

+{

+   if (!is_undef(p->eye_position))

+      return swizzle1(p->eye_position, Z);

+

+   if (is_undef(p->eye_position_z)) {

+      struct ureg pos = register_input( p, VERT_ATTRIB_POS );

+      struct ureg modelview[4];

+

+      p->eye_position_z = reserve_temp(p);

+

+      register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 3,

+                              0, modelview );

+

+      emit_op2(p, OPCODE_DP4, p->eye_position_z, 0, pos, modelview[2]);

+   }

+

+   return p->eye_position_z;

+}

+

+

+static struct ureg get_eye_position_normalized( struct tnl_program *p )

+{

+   if (is_undef(p->eye_position_normalized)) {

+      struct ureg eye = get_eye_position(p);

+      p->eye_position_normalized = reserve_temp(p);

+      emit_normalize_vec3(p, p->eye_position_normalized, eye);

+   }

+

+   return p->eye_position_normalized;

+}

+

+

+static struct ureg get_transformed_normal( struct tnl_program *p )

+{

+   if (is_undef(p->transformed_normal) &&

+       !p->state->need_eye_coords &&

+       !p->state->normalize &&

+       !(p->state->need_eye_coords == p->state->rescale_normals))

+   {

+      p->transformed_normal = register_input(p, VERT_ATTRIB_NORMAL );

+   }

+   else if (is_undef(p->transformed_normal))

+   {

+      struct ureg normal = register_input(p, VERT_ATTRIB_NORMAL );

+      struct ureg mvinv[3];

+      struct ureg transformed_normal = reserve_temp(p);

+

+      if (p->state->need_eye_coords) {

+         register_matrix_param5( p, STATE_MODELVIEW_MATRIX, 0, 0, 2,

+                                 STATE_MATRIX_INVTRANS, mvinv );

+

+         /* Transform to eye space:

+          */

+         emit_matrix_transform_vec3( p, transformed_normal, mvinv, normal );

+         normal = transformed_normal;

+      }

+

+      /* Normalize/Rescale:

+       */

+      if (p->state->normalize) {

+	 emit_normalize_vec3( p, transformed_normal, normal );

+         normal = transformed_normal;

+      }

+      else if (p->state->need_eye_coords == p->state->rescale_normals) {

+         /* This is already adjusted for eye/non-eye rendering:

+          */

+	 struct ureg rescale = register_param2(p, STATE_INTERNAL,

+                                               STATE_NORMAL_SCALE);

+

+	 emit_op2( p, OPCODE_MUL, transformed_normal, 0, normal, rescale );

+         normal = transformed_normal;

+      }

+

+      assert(normal.file == PROGRAM_TEMPORARY);

+      p->transformed_normal = normal;

+   }

+

+   return p->transformed_normal;

+}

+

+

+static void build_hpos( struct tnl_program *p )

+{

+   struct ureg pos = register_input( p, VERT_ATTRIB_POS );

+   struct ureg hpos = register_output( p, VERT_RESULT_HPOS );

+   struct ureg mvp[4];

+

+   if (p->mvp_with_dp4) {

+      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3,

+			      0, mvp );

+      emit_matrix_transform_vec4( p, hpos, mvp, pos );

+   }

+   else {

+      register_matrix_param5( p, STATE_MVP_MATRIX, 0, 0, 3,

+			      STATE_MATRIX_TRANSPOSE, mvp );

+      emit_transpose_matrix_transform_vec4( p, hpos, mvp, pos );

+   }

+}

+

+

+static GLuint material_attrib( GLuint side, GLuint property )

+{

+   return (property - STATE_AMBIENT) * 2 + side;

+}

+

+

+/**

+ * Get a bitmask of which material values vary on a per-vertex basis.

+ */

+static void set_material_flags( struct tnl_program *p )

+{

+   p->color_materials = 0;

+   p->materials = 0;

+

+   if (p->state->varying_vp_inputs & VERT_BIT_COLOR0) {

+      p->materials =

+	 p->color_materials = p->state->light_color_material_mask;

+   }

+

+   p->materials |= (p->state->varying_vp_inputs >> 16);

+}

+

+

+static struct ureg get_material( struct tnl_program *p, GLuint side,

+				 GLuint property )

+{

+   GLuint attrib = material_attrib(side, property);

+

+   if (p->color_materials & (1<<attrib))

+      return register_input(p, VERT_ATTRIB_COLOR0);

+   else if (p->materials & (1<<attrib)) {

+      /* Put material values in the GENERIC slots -- they are not used

+       * for anything in fixed function mode.

+       */

+      return register_input( p, attrib + VERT_ATTRIB_GENERIC0 );

+   }

+   else

+      return register_param3( p, STATE_MATERIAL, side, property );

+}

+

+#define SCENE_COLOR_BITS(side) (( MAT_BIT_FRONT_EMISSION | \

+				   MAT_BIT_FRONT_AMBIENT | \

+				   MAT_BIT_FRONT_DIFFUSE) << (side))

+

+

+/**

+ * Either return a precalculated constant value or emit code to

+ * calculate these values dynamically in the case where material calls

+ * are present between begin/end pairs.

+ *

+ * Probably want to shift this to the program compilation phase - if

+ * we always emitted the calculation here, a smart compiler could

+ * detect that it was constant (given a certain set of inputs), and

+ * lift it out of the main loop.  That way the programs created here

+ * would be independent of the vertex_buffer details.

+ */

+static struct ureg get_scenecolor( struct tnl_program *p, GLuint side )

+{

+   if (p->materials & SCENE_COLOR_BITS(side)) {

+      struct ureg lm_ambient = register_param1(p, STATE_LIGHTMODEL_AMBIENT);

+      struct ureg material_emission = get_material(p, side, STATE_EMISSION);

+      struct ureg material_ambient = get_material(p, side, STATE_AMBIENT);

+      struct ureg material_diffuse = get_material(p, side, STATE_DIFFUSE);

+      struct ureg tmp = make_temp(p, material_diffuse);

+      emit_op3(p, OPCODE_MAD, tmp, WRITEMASK_XYZ, lm_ambient,

+	       material_ambient, material_emission);

+      return tmp;

+   }

+   else

+      return register_param2( p, STATE_LIGHTMODEL_SCENECOLOR, side );

+}

+

+

+static struct ureg get_lightprod( struct tnl_program *p, GLuint light,

+				  GLuint side, GLuint property )

+{

+   GLuint attrib = material_attrib(side, property);

+   if (p->materials & (1<<attrib)) {

+      struct ureg light_value =

+	 register_param3(p, STATE_LIGHT, light, property);

+      struct ureg material_value = get_material(p, side, property);

+      struct ureg tmp = get_temp(p);

+      emit_op2(p, OPCODE_MUL, tmp, 0, light_value, material_value);

+      return tmp;

+   }

+   else

+      return register_param4(p, STATE_LIGHTPROD, light, side, property);

+}

+

+

+static struct ureg calculate_light_attenuation( struct tnl_program *p,

+						GLuint i,

+						struct ureg VPpli,

+						struct ureg dist )

+{

+   struct ureg attenuation = register_param3(p, STATE_LIGHT, i,

+					     STATE_ATTENUATION);

+   struct ureg att = get_temp(p);

+

+   /* Calculate spot attenuation:

+    */

+   if (!p->state->unit[i].light_spotcutoff_is_180) {

+      struct ureg spot_dir_norm = register_param3(p, STATE_INTERNAL,

+						  STATE_LIGHT_SPOT_DIR_NORMALIZED, i);

+      struct ureg spot = get_temp(p);

+      struct ureg slt = get_temp(p);

+

+      emit_op2(p, OPCODE_DP3, spot, 0, negate(VPpli), spot_dir_norm);

+      emit_op2(p, OPCODE_SLT, slt, 0, swizzle1(spot_dir_norm,W), spot);

+      emit_op2(p, OPCODE_POW, spot, 0, spot, swizzle1(attenuation, W));

+      emit_op2(p, OPCODE_MUL, att, 0, slt, spot);

+

+      release_temp(p, spot);

+      release_temp(p, slt);

+   }

+

+   /* Calculate distance attenuation:

+    */

+   if (p->state->unit[i].light_attenuated) {

+      /* 1/d,d,d,1/d */

+      emit_op1(p, OPCODE_RCP, dist, WRITEMASK_YZ, dist);

+      /* 1,d,d*d,1/d */

+      emit_op2(p, OPCODE_MUL, dist, WRITEMASK_XZ, dist, swizzle1(dist,Y));

+      /* 1/dist-atten */

+      emit_op2(p, OPCODE_DP3, dist, 0, attenuation, dist);

+

+      if (!p->state->unit[i].light_spotcutoff_is_180) {

+	 /* dist-atten */

+	 emit_op1(p, OPCODE_RCP, dist, 0, dist);

+	 /* spot-atten * dist-atten */

+	 emit_op2(p, OPCODE_MUL, att, 0, dist, att);

+      }

+      else {

+	 /* dist-atten */

+	 emit_op1(p, OPCODE_RCP, att, 0, dist);

+      }

+   }

+

+   return att;

+}

+

+

+/**

+ * Compute:

+ *   lit.y = MAX(0, dots.x)

+ *   lit.z = SLT(0, dots.x)

+ */

+static void emit_degenerate_lit( struct tnl_program *p,

+                                 struct ureg lit,

+                                 struct ureg dots )

+{

+   struct ureg id = get_identity_param(p);  /* id = {0,0,0,1} */

+

+   /* Note that lit.x & lit.w will not be examined.  Note also that

+    * dots.xyzw == dots.xxxx.

+    */

+

+   /* MAX lit, id, dots;

+    */

+   emit_op2(p, OPCODE_MAX, lit, WRITEMASK_XYZW, id, dots);

+

+   /* result[2] = (in > 0 ? 1 : 0)

+    * SLT lit.z, id.z, dots;   # lit.z = (0 < dots.z) ? 1 : 0

+    */

+   emit_op2(p, OPCODE_SLT, lit, WRITEMASK_Z, swizzle1(id,Z), dots);

+}

+

+

+/* Need to add some addtional parameters to allow lighting in object

+ * space - STATE_SPOT_DIRECTION and STATE_HALF_VECTOR implicitly assume eye

+ * space lighting.

+ */

+static void build_lighting( struct tnl_program *p )

+{

+   const GLboolean twoside = p->state->light_twoside;

+   const GLboolean separate = p->state->separate_specular;

+   GLuint nr_lights = 0, count = 0;

+   struct ureg normal = get_transformed_normal(p);

+   struct ureg lit = get_temp(p);

+   struct ureg dots = get_temp(p);

+   struct ureg _col0 = undef, _col1 = undef;

+   struct ureg _bfc0 = undef, _bfc1 = undef;

+   GLuint i;

+

+   /*

+    * NOTE:

+    * dots.x = dot(normal, VPpli)

+    * dots.y = dot(normal, halfAngle)

+    * dots.z = back.shininess

+    * dots.w = front.shininess

+    */

+

+   for (i = 0; i < MAX_LIGHTS; i++)

+      if (p->state->unit[i].light_enabled)

+	 nr_lights++;

+

+   set_material_flags(p);

+

+   {

+      if (!p->state->material_shininess_is_zero) {

+         struct ureg shininess = get_material(p, 0, STATE_SHININESS);

+         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_W, swizzle1(shininess,X));

+         release_temp(p, shininess);

+      }

+

+      _col0 = make_temp(p, get_scenecolor(p, 0));

+      if (separate)

+	 _col1 = make_temp(p, get_identity_param(p));

+      else

+	 _col1 = _col0;

+   }

+

+   if (twoside) {

+      if (!p->state->material_shininess_is_zero) {

+         /* Note that we negate the back-face specular exponent here.

+          * The negation will be un-done later in the back-face code below.

+          */

+         struct ureg shininess = get_material(p, 1, STATE_SHININESS);

+         emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z,

+                  negate(swizzle1(shininess,X)));

+         release_temp(p, shininess);

+      }

+

+      _bfc0 = make_temp(p, get_scenecolor(p, 1));

+      if (separate)

+	 _bfc1 = make_temp(p, get_identity_param(p));

+      else

+	 _bfc1 = _bfc0;

+   }

+

+   /* If no lights, still need to emit the scenecolor.

+    */

+   {

+      struct ureg res0 = register_output( p, VERT_RESULT_COL0 );

+      emit_op1(p, OPCODE_MOV, res0, 0, _col0);

+   }

+

+   if (separate) {

+      struct ureg res1 = register_output( p, VERT_RESULT_COL1 );

+      emit_op1(p, OPCODE_MOV, res1, 0, _col1);

+   }

+

+   if (twoside) {

+      struct ureg res0 = register_output( p, VERT_RESULT_BFC0 );

+      emit_op1(p, OPCODE_MOV, res0, 0, _bfc0);

+   }

+

+   if (twoside && separate) {

+      struct ureg res1 = register_output( p, VERT_RESULT_BFC1 );

+      emit_op1(p, OPCODE_MOV, res1, 0, _bfc1);

+   }

+

+   if (nr_lights == 0) {

+      release_temps(p);

+      return;

+   }

+

+   for (i = 0; i < MAX_LIGHTS; i++) {

+      if (p->state->unit[i].light_enabled) {

+	 struct ureg half = undef;

+	 struct ureg att = undef, VPpli = undef;

+

+	 count++;

+

+	 if (p->state->unit[i].light_eyepos3_is_zero) {

+	    /* Can used precomputed constants in this case.

+	     * Attenuation never applies to infinite lights.

+	     */

+	    VPpli = register_param3(p, STATE_INTERNAL,

+				    STATE_LIGHT_POSITION_NORMALIZED, i);

+

+            if (!p->state->material_shininess_is_zero) {

+               if (p->state->light_local_viewer) {

+                  struct ureg eye_hat = get_eye_position_normalized(p);

+                  half = get_temp(p);

+                  emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);

+                  emit_normalize_vec3(p, half, half);

+               }

+               else {

+                  half = register_param3(p, STATE_INTERNAL,

+                                         STATE_LIGHT_HALF_VECTOR, i);

+               }

+            }

+	 }

+	 else {

+	    struct ureg Ppli = register_param3(p, STATE_INTERNAL,

+					       STATE_LIGHT_POSITION, i);

+	    struct ureg V = get_eye_position(p);

+	    struct ureg dist = get_temp(p);

+

+	    VPpli = get_temp(p);

+

+	    /* Calculate VPpli vector

+	     */

+	    emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V);

+

+	    /* Normalize VPpli.  The dist value also used in

+	     * attenuation below.

+	     */

+	    emit_op2(p, OPCODE_DP3, dist, 0, VPpli, VPpli);

+	    emit_op1(p, OPCODE_RSQ, dist, 0, dist);

+	    emit_op2(p, OPCODE_MUL, VPpli, 0, VPpli, dist);

+

+	    /* Calculate attenuation:

+	     */

+	    if (!p->state->unit[i].light_spotcutoff_is_180 ||

+		p->state->unit[i].light_attenuated) {

+	       att = calculate_light_attenuation(p, i, VPpli, dist);

+	    }

+

+	    /* Calculate viewer direction, or use infinite viewer:

+	     */

+            if (!p->state->material_shininess_is_zero) {

+               half = get_temp(p);

+

+               if (p->state->light_local_viewer) {

+                  struct ureg eye_hat = get_eye_position_normalized(p);

+                  emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);

+               }

+               else {

+                  struct ureg z_dir = swizzle(get_identity_param(p),X,Y,W,Z);

+                  emit_op2(p, OPCODE_ADD, half, 0, VPpli, z_dir);

+               }

+

+               emit_normalize_vec3(p, half, half);

+            }

+

+	    release_temp(p, dist);

+	 }

+

+	 /* Calculate dot products:

+	  */

+         if (p->state->material_shininess_is_zero) {

+            emit_op2(p, OPCODE_DP3, dots, 0, normal, VPpli);

+         }

+         else {

+            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);

+            emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);

+         }

+

+	 /* Front face lighting:

+	  */

+	 {

+	    struct ureg ambient = get_lightprod(p, i, 0, STATE_AMBIENT);

+	    struct ureg diffuse = get_lightprod(p, i, 0, STATE_DIFFUSE);

+	    struct ureg specular = get_lightprod(p, i, 0, STATE_SPECULAR);

+	    struct ureg res0, res1;

+	    GLuint mask0, mask1;

+

+	    if (count == nr_lights) {

+	       if (separate) {

+		  mask0 = WRITEMASK_XYZ;

+		  mask1 = WRITEMASK_XYZ;

+		  res0 = register_output( p, VERT_RESULT_COL0 );

+		  res1 = register_output( p, VERT_RESULT_COL1 );

+	       }

+	       else {

+		  mask0 = 0;

+		  mask1 = WRITEMASK_XYZ;

+		  res0 = _col0;

+		  res1 = register_output( p, VERT_RESULT_COL0 );

+	       }

+	    }

+            else {

+	       mask0 = 0;

+	       mask1 = 0;

+	       res0 = _col0;

+	       res1 = _col1;

+	    }

+

+	    if (!is_undef(att)) {

+               /* light is attenuated by distance */

+               emit_op1(p, OPCODE_LIT, lit, 0, dots);

+               emit_op2(p, OPCODE_MUL, lit, 0, lit, att);

+               emit_op3(p, OPCODE_MAD, _col0, 0, swizzle1(lit,X), ambient, _col0);

+            }

+            else if (!p->state->material_shininess_is_zero) {

+               /* there's a non-zero specular term */

+               emit_op1(p, OPCODE_LIT, lit, 0, dots);

+               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);

+            }

+            else {

+               /* no attenutation, no specular */

+               emit_degenerate_lit(p, lit, dots);

+               emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0);

+            }

+

+	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _col0);

+	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _col1);

+

+	    release_temp(p, ambient);

+	    release_temp(p, diffuse);

+	    release_temp(p, specular);

+	 }

+

+	 /* Back face lighting:

+	  */

+	 if (twoside) {

+	    struct ureg ambient = get_lightprod(p, i, 1, STATE_AMBIENT);

+	    struct ureg diffuse = get_lightprod(p, i, 1, STATE_DIFFUSE);

+	    struct ureg specular = get_lightprod(p, i, 1, STATE_SPECULAR);

+	    struct ureg res0, res1;

+	    GLuint mask0, mask1;

+

+	    if (count == nr_lights) {

+	       if (separate) {

+		  mask0 = WRITEMASK_XYZ;

+		  mask1 = WRITEMASK_XYZ;

+		  res0 = register_output( p, VERT_RESULT_BFC0 );

+		  res1 = register_output( p, VERT_RESULT_BFC1 );

+	       }

+	       else {

+		  mask0 = 0;

+		  mask1 = WRITEMASK_XYZ;

+		  res0 = _bfc0;

+		  res1 = register_output( p, VERT_RESULT_BFC0 );

+	       }

+	    }

+            else {

+	       res0 = _bfc0;

+	       res1 = _bfc1;

+	       mask0 = 0;

+	       mask1 = 0;

+	    }

+

+            /* For the back face we need to negate the X and Y component

+             * dot products.  dots.Z has the negated back-face specular

+             * exponent.  We swizzle that into the W position.  This

+             * negation makes the back-face specular term positive again.

+             */

+            dots = negate(swizzle(dots,X,Y,W,Z));

+

+	    if (!is_undef(att)) {

+               emit_op1(p, OPCODE_LIT, lit, 0, dots);

+	       emit_op2(p, OPCODE_MUL, lit, 0, lit, att);

+               emit_op3(p, OPCODE_MAD, _bfc0, 0, swizzle1(lit,X), ambient, _bfc0);

+            }

+            else if (!p->state->material_shininess_is_zero) {

+               emit_op1(p, OPCODE_LIT, lit, 0, dots);

+               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0); /**/

+            }

+            else {

+               emit_degenerate_lit(p, lit, dots);

+               emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0);

+            }

+

+	    emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0);

+	    emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1);

+            /* restore dots to its original state for subsequent lights

+             * by negating and swizzling again.

+             */

+            dots = negate(swizzle(dots,X,Y,W,Z));

+

+	    release_temp(p, ambient);

+	    release_temp(p, diffuse);

+	    release_temp(p, specular);

+	 }

+

+	 release_temp(p, half);

+	 release_temp(p, VPpli);

+	 release_temp(p, att);

+      }

+   }

+

+   release_temps( p );

+}

+

+

+static void build_fog( struct tnl_program *p )

+{

+   struct ureg fog = register_output(p, VERT_RESULT_FOGC);

+   struct ureg input;

+

+   if (p->state->fog_source_is_depth) {

+      input = get_eye_position_z(p);

+   }

+   else {

+      input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);

+   }

+

+   /* result.fog = {abs(f),0,0,1}; */

+   emit_op1(p, OPCODE_ABS, fog, WRITEMASK_X, input);

+   emit_op1(p, OPCODE_MOV, fog, WRITEMASK_YZW, get_identity_param(p));

+}

+

+

+static void build_reflect_texgen( struct tnl_program *p,

+				  struct ureg dest,

+				  GLuint writemask )

+{

+   struct ureg normal = get_transformed_normal(p);

+   struct ureg eye_hat = get_eye_position_normalized(p);

+   struct ureg tmp = get_temp(p);

+

+   /* n.u */

+   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat);

+   /* 2n.u */

+   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp);

+   /* (-2n.u)n + u */

+   emit_op3(p, OPCODE_MAD, dest, writemask, negate(tmp), normal, eye_hat);

+

+   release_temp(p, tmp);

+}

+

+

+static void build_sphere_texgen( struct tnl_program *p,

+				 struct ureg dest,

+				 GLuint writemask )

+{

+   struct ureg normal = get_transformed_normal(p);

+   struct ureg eye_hat = get_eye_position_normalized(p);

+   struct ureg tmp = get_temp(p);

+   struct ureg half = register_scalar_const(p, .5);

+   struct ureg r = get_temp(p);

+   struct ureg inv_m = get_temp(p);

+   struct ureg id = get_identity_param(p);

+

+   /* Could share the above calculations, but it would be

+    * a fairly odd state for someone to set (both sphere and

+    * reflection active for different texture coordinate

+    * components.  Of course - if two texture units enable

+    * reflect and/or sphere, things start to tilt in favour

+    * of seperating this out:

+    */

+

+   /* n.u */

+   emit_op2(p, OPCODE_DP3, tmp, 0, normal, eye_hat);

+   /* 2n.u */

+   emit_op2(p, OPCODE_ADD, tmp, 0, tmp, tmp);

+   /* (-2n.u)n + u */

+   emit_op3(p, OPCODE_MAD, r, 0, negate(tmp), normal, eye_hat);

+   /* r + 0,0,1 */

+   emit_op2(p, OPCODE_ADD, tmp, 0, r, swizzle(id,X,Y,W,Z));

+   /* rx^2 + ry^2 + (rz+1)^2 */

+   emit_op2(p, OPCODE_DP3, tmp, 0, tmp, tmp);

+   /* 2/m */

+   emit_op1(p, OPCODE_RSQ, tmp, 0, tmp);

+   /* 1/m */

+   emit_op2(p, OPCODE_MUL, inv_m, 0, tmp, half);

+   /* r/m + 1/2 */

+   emit_op3(p, OPCODE_MAD, dest, writemask, r, inv_m, half);

+

+   release_temp(p, tmp);

+   release_temp(p, r);

+   release_temp(p, inv_m);

+}

+

+

+static void build_texture_transform( struct tnl_program *p )

+{

+   GLuint i, j;

+

+   for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {

+

+      if (!(p->state->fragprog_inputs_read & FRAG_BIT_TEX(i)))

+	 continue;

+

+      if (p->state->unit[i].coord_replace)

+  	 continue;

+

+      if (p->state->unit[i].texgen_enabled ||

+	  p->state->unit[i].texmat_enabled) {

+

+	 GLuint texmat_enabled = p->state->unit[i].texmat_enabled;

+	 struct ureg out = register_output(p, VERT_RESULT_TEX0 + i);

+	 struct ureg out_texgen = undef;

+

+	 if (p->state->unit[i].texgen_enabled) {

+	    GLuint copy_mask = 0;

+	    GLuint sphere_mask = 0;

+	    GLuint reflect_mask = 0;

+	    GLuint normal_mask = 0;

+	    GLuint modes[4];

+

+	    if (texmat_enabled)

+	       out_texgen = get_temp(p);

+	    else

+	       out_texgen = out;

+

+	    modes[0] = p->state->unit[i].texgen_mode0;

+	    modes[1] = p->state->unit[i].texgen_mode1;

+	    modes[2] = p->state->unit[i].texgen_mode2;

+	    modes[3] = p->state->unit[i].texgen_mode3;

+

+	    for (j = 0; j < 4; j++) {

+	       switch (modes[j]) {

+	       case TXG_OBJ_LINEAR: {

+		  struct ureg obj = register_input(p, VERT_ATTRIB_POS);

+		  struct ureg plane =

+		     register_param3(p, STATE_TEXGEN, i,

+				     STATE_TEXGEN_OBJECT_S + j);

+

+		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j,

+			   obj, plane );

+		  break;

+	       }

+	       case TXG_EYE_LINEAR: {

+		  struct ureg eye = get_eye_position(p);

+		  struct ureg plane =

+		     register_param3(p, STATE_TEXGEN, i,

+				     STATE_TEXGEN_EYE_S + j);

+

+		  emit_op2(p, OPCODE_DP4, out_texgen, WRITEMASK_X << j,

+			   eye, plane );

+		  break;

+	       }

+	       case TXG_SPHERE_MAP:

+		  sphere_mask |= WRITEMASK_X << j;

+		  break;

+	       case TXG_REFLECTION_MAP:

+		  reflect_mask |= WRITEMASK_X << j;

+		  break;

+	       case TXG_NORMAL_MAP:

+		  normal_mask |= WRITEMASK_X << j;

+		  break;

+	       case TXG_NONE:

+		  copy_mask |= WRITEMASK_X << j;

+	       }

+	    }

+

+	    if (sphere_mask) {

+	       build_sphere_texgen(p, out_texgen, sphere_mask);

+	    }

+

+	    if (reflect_mask) {

+	       build_reflect_texgen(p, out_texgen, reflect_mask);

+	    }

+

+	    if (normal_mask) {

+	       struct ureg normal = get_transformed_normal(p);

+	       emit_op1(p, OPCODE_MOV, out_texgen, normal_mask, normal );

+	    }

+

+	    if (copy_mask) {

+	       struct ureg in = register_input(p, VERT_ATTRIB_TEX0+i);

+	       emit_op1(p, OPCODE_MOV, out_texgen, copy_mask, in );

+	    }

+	 }

+

+	 if (texmat_enabled) {

+	    struct ureg texmat[4];

+	    struct ureg in = (!is_undef(out_texgen) ?

+			      out_texgen :

+			      register_input(p, VERT_ATTRIB_TEX0+i));

+	    if (p->mvp_with_dp4) {

+	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,

+				       0, texmat );

+	       emit_matrix_transform_vec4( p, out, texmat, in );

+	    }

+	    else {

+	       register_matrix_param5( p, STATE_TEXTURE_MATRIX, i, 0, 3,

+				       STATE_MATRIX_TRANSPOSE, texmat );

+	       emit_transpose_matrix_transform_vec4( p, out, texmat, in );

+	    }

+	 }

+

+	 release_temps(p);

+      }

+      else {

+	 emit_passthrough(p, VERT_ATTRIB_TEX0+i, VERT_RESULT_TEX0+i);

+      }

+   }

+}

+

+

+/**

+ * Point size attenuation computation.

+ */

+static void build_atten_pointsize( struct tnl_program *p )

+{

+   struct ureg eye = get_eye_position_z(p);

+   struct ureg state_size = register_param2(p, STATE_INTERNAL, STATE_POINT_SIZE_CLAMPED);

+   struct ureg state_attenuation = register_param1(p, STATE_POINT_ATTENUATION);

+   struct ureg out = register_output(p, VERT_RESULT_PSIZ);

+   struct ureg ut = get_temp(p);

+

+   /* dist = |eyez| */

+   emit_op1(p, OPCODE_ABS, ut, WRITEMASK_Y, swizzle1(eye, Z));

+   /* p1 + dist * (p2 + dist * p3); */

+   emit_op3(p, OPCODE_MAD, ut, WRITEMASK_X, swizzle1(ut, Y),

+		swizzle1(state_attenuation, Z), swizzle1(state_attenuation, Y));

+   emit_op3(p, OPCODE_MAD, ut, WRITEMASK_X, swizzle1(ut, Y),

+		ut, swizzle1(state_attenuation, X));

+

+   /* 1 / sqrt(factor) */

+   emit_op1(p, OPCODE_RSQ, ut, WRITEMASK_X, ut );

+

+#if 0

+   /* out = pointSize / sqrt(factor) */

+   emit_op2(p, OPCODE_MUL, out, WRITEMASK_X, ut, state_size);

+#else

+   /* this is a good place to clamp the point size since there's likely

+    * no hardware registers to clamp point size at rasterization time.

+    */

+   emit_op2(p, OPCODE_MUL, ut, WRITEMASK_X, ut, state_size);

+   emit_op2(p, OPCODE_MAX, ut, WRITEMASK_X, ut, swizzle1(state_size, Y));

+   emit_op2(p, OPCODE_MIN, out, WRITEMASK_X, ut, swizzle1(state_size, Z));

+#endif

+

+   release_temp(p, ut);

+}

+

+

+/**

+ * Pass-though per-vertex point size, from user's point size array.

+ */

+static void build_array_pointsize( struct tnl_program *p )

+{

+   struct ureg in = register_input(p, VERT_ATTRIB_POINT_SIZE);

+   struct ureg out = register_output(p, VERT_RESULT_PSIZ);

+   emit_op1(p, OPCODE_MOV, out, WRITEMASK_X, in);

+}

+

+

+static void build_tnl_program( struct tnl_program *p )

+{

+   /* Emit the program, starting with modelviewproject:

+    */

+   build_hpos(p);

+

+   /* Lighting calculations:

+    */

+   if (p->state->fragprog_inputs_read & (FRAG_BIT_COL0|FRAG_BIT_COL1)) {

+      if (p->state->light_global_enabled)

+	 build_lighting(p);

+      else {

+	 if (p->state->fragprog_inputs_read & FRAG_BIT_COL0)

+	    emit_passthrough(p, VERT_ATTRIB_COLOR0, VERT_RESULT_COL0);

+

+	 if (p->state->fragprog_inputs_read & FRAG_BIT_COL1)

+	    emit_passthrough(p, VERT_ATTRIB_COLOR1, VERT_RESULT_COL1);

+      }

+   }

+

+   if (p->state->fragprog_inputs_read & FRAG_BIT_FOGC)

+      build_fog(p);

+

+   if (p->state->fragprog_inputs_read & FRAG_BITS_TEX_ANY)

+      build_texture_transform(p);

+

+   if (p->state->point_attenuated)

+      build_atten_pointsize(p);

+   else if (p->state->point_array)

+      build_array_pointsize(p);

+

+   /* Finish up:

+    */

+   emit_op1(p, OPCODE_END, undef, 0, undef);

+

+   /* Disassemble:

+    */

+   if (DISASSEM) {

+      printf ("\n");

+   }

+}

+

+

+static void

+create_new_program( const struct state_key *key,

+                    struct gl_vertex_program *program,

+                    GLboolean mvp_with_dp4,

+                    GLuint max_temps)

+{

+   struct tnl_program p;

+

+   memset(&p, 0, sizeof(p));

+   p.state = key;

+   p.program = program;

+   p.eye_position = undef;

+   p.eye_position_z = undef;

+   p.eye_position_normalized = undef;

+   p.transformed_normal = undef;

+   p.identity = undef;

+   p.temp_in_use = 0;

+   p.mvp_with_dp4 = mvp_with_dp4;

+

+   if (max_temps >= sizeof(int) * 8)

+      p.temp_reserved = 0;

+   else

+      p.temp_reserved = ~((1<<max_temps)-1);

+

+   /* Start by allocating 32 instructions.

+    * If we need more, we'll grow the instruction array as needed.

+    */

+   p.max_inst = 32;

+   p.program->Base.Instructions = _mesa_alloc_instructions(p.max_inst);

+   p.program->Base.String = NULL;

+   p.program->Base.NumInstructions =

+   p.program->Base.NumTemporaries =

+   p.program->Base.NumParameters =

+   p.program->Base.NumAttributes = p.program->Base.NumAddressRegs = 0;

+   p.program->Base.Parameters = _mesa_new_parameter_list();

+   p.program->Base.InputsRead = 0;

+   p.program->Base.OutputsWritten = 0;

+

+   build_tnl_program( &p );

+}

+

+

+/**

+ * Return a vertex program which implements the current fixed-function

+ * transform/lighting/texgen operations.

+ * XXX move this into core mesa (main/)

+ */

+struct gl_vertex_program *

+_mesa_get_fixed_func_vertex_program(struct gl_context *ctx)

+{

+   struct gl_vertex_program *prog;

+   struct state_key key;

+

+   /* Grab all the relevent state and put it in a single structure:

+    */

+   make_state_key(ctx, &key);

+

+   /* Look for an already-prepared program for this state:

+    */

+   prog = (struct gl_vertex_program *)

+      _mesa_search_program_cache(ctx->VertexProgram.Cache, &key, sizeof(key));

+

+   if (!prog) {

+      /* OK, we'll have to build a new one */

+      if (0)

+         printf("Build new TNL program\n");

+

+      prog = (struct gl_vertex_program *)

+         ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);

+      if (!prog)

+         return NULL;

+

+      create_new_program( &key, prog,

+                          ctx->mvp_with_dp4,

+                          ctx->Const.VertexProgram.MaxTemps );

+

+#if 0

+      if (ctx->Driver.ProgramStringNotify)

+         ctx->Driver.ProgramStringNotify( ctx, GL_VERTEX_PROGRAM_ARB,

+                                          &prog->Base );

+#endif

+      _mesa_program_cache_insert(ctx, ctx->VertexProgram.Cache,

+                                 &key, sizeof(key), &prog->Base);

+   }

+

+   return prog;

+}

diff --git a/mesalib/src/mesa/main/ffvertex_prog.h b/mesalib/src/mesa/main/ffvertex_prog.h
index 38dc5fbb8..6d485bb2a 100644
--- a/mesalib/src/mesa/main/ffvertex_prog.h
+++ b/mesalib/src/mesa/main/ffvertex_prog.h
@@ -1,40 +1,40 @@
-/**************************************************************************
- * 
- * 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.
- * 
- **************************************************************************/
-
-
-#ifndef FFVERTEX_PROG_H
-#define FFVERTEX_PROG_H
-
-
-#include "main/mtypes.h"
-
-struct gl_vertex_program *
-_mesa_get_fixed_func_vertex_program(GLcontext *ctx);
-
-
-
-#endif /* FFVERTEX_PROG_H */
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef FFVERTEX_PROG_H

+#define FFVERTEX_PROG_H

+

+

+struct gl_context;

+

+struct gl_vertex_program *

+_mesa_get_fixed_func_vertex_program(struct gl_context *ctx);

+

+

+

+#endif /* FFVERTEX_PROG_H */

diff --git a/mesalib/src/mesa/main/fog.c b/mesalib/src/mesa/main/fog.c
index 9f26c012d..b4356c198 100644
--- a/mesalib/src/mesa/main/fog.c
+++ b/mesalib/src/mesa/main/fog.c
@@ -1,194 +1,194 @@
-/*
- * 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);
-}
-
-
-#define UPDATE_FOG_SCALE(ctx) do {\
-      if (ctx->Fog.End == ctx->Fog.Start)\
-         ctx->Fog._Scale = 1.0f;\
-      else\
-         ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);\
-   } while(0)
-
-
-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.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( GLcontext * 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 );
-   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);

+}

+

+

+#define UPDATE_FOG_SCALE(ctx) do {\

+      if (ctx->Fog.End == ctx->Fog.Start)\

+         ctx->Fog._Scale = 1.0f;\

+      else\

+         ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);\

+   } while(0)

+

+

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

+   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/fog.h b/mesalib/src/mesa/main/fog.h
index a14d19cdb..72a0657af 100644
--- a/mesalib/src/mesa/main/fog.h
+++ b/mesalib/src/mesa/main/fog.h
@@ -1,66 +1,69 @@
-/**
- * \file fog.h
- * Fog operations.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 FOG_H
-#define FOG_H
-
-
-#include "mtypes.h"
-
-
-#if _HAVE_FULL_GL
-
-extern void GLAPIENTRY
-_mesa_Fogf(GLenum pname, GLfloat param);
-
-extern void GLAPIENTRY
-_mesa_Fogi(GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_Fogfv(GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_Fogiv(GLenum pname, const GLint *params );
-
-extern void _mesa_init_fog( GLcontext * ctx );
-
-#else
-
-/** No-op */
-#define _mesa_init_fog( c ) ((void)0)
-
-#endif
-
-#endif
+/**

+ * \file fog.h

+ * Fog operations.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 FOG_H

+#define FOG_H

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+

+

+#if _HAVE_FULL_GL

+

+extern void GLAPIENTRY

+_mesa_Fogf(GLenum pname, GLfloat param);

+

+extern void GLAPIENTRY

+_mesa_Fogi(GLenum pname, GLint param );

+

+extern void GLAPIENTRY

+_mesa_Fogfv(GLenum pname, const GLfloat *params );

+

+extern void GLAPIENTRY

+_mesa_Fogiv(GLenum pname, const GLint *params );

+

+extern void _mesa_init_fog( struct gl_context * ctx );

+

+#else

+

+/** No-op */

+#define _mesa_init_fog( c ) ((void)0)

+

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 9db9f1c56..b7aecb396 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -1,1340 +1,1548 @@
-/*
- * 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_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 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_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_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_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_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_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_RGBA,                      /* 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,
-      "MESA_FORMAT_SIGNED_RG88",
-      GL_RGBA,
-      GL_SIGNED_NORMALIZED,
-      8, 8, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_RGBX8888,
-      "MESA_FORMAT_SIGNED_RGBX8888",
-      GL_RGBA,
-      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_R_16,
-      "MESA_FORMAT_SIGNED_R_16",
-      GL_RGBA,
-      GL_SIGNED_NORMALIZED,
-      16, 0, 0, 0,
-      0, 0, 0, 0, 0,
-      1, 1, 2
-   },
-   {
-      MESA_FORMAT_SIGNED_RG_16,
-      "MESA_FORMAT_SIGNED_RG_16",
-      GL_RGBA,
-      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_RGBA,
-      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
-   }
-};
-
-
-
-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);
-   ASSERT(info->BytesPerBlock);
-   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_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;
-}
-
-
-/**
- * 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;
-   }
-}
-
-
-/**
- * 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 */
-      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;
-      return sz;
-   }
-   else {
-      /* non-compressed */
-      const GLuint sz = width * height * 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;
-   }
-}
-
-
-
-/**
- * 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_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_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);
-      }
-
-   }
-}
-
-
-
-/**
- * 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:
-      *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_AL88:
-   case MESA_FORMAT_AL88_REV:
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 2;
-      return;
-
-   case MESA_FORMAT_AL1616:
-   case MESA_FORMAT_AL1616_REV:
-      *datatype = GL_UNSIGNED_SHORT;
-      *comps = 2;
-      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:
-      *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_RGBA8888:
-   case MESA_FORMAT_SIGNED_RGBA8888_REV:
-      *datatype = GL_BYTE;
-      *comps = 4;
-      return;
-
-   case MESA_FORMAT_SIGNED_R_16:
-      *datatype = GL_SHORT;
-      *comps = 1;
-      return;
-   case MESA_FORMAT_SIGNED_RG_16:
-      *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
-      /* XXX generate error instead? */
-      *datatype = GL_UNSIGNED_BYTE;
-      *comps = 0;
-      return;
-#endif
-
-   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;
-
-
-   default:
-      _mesa_problem(NULL, "bad format in _mesa_format_to_type_and_comps");
-      *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_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 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_RGBA,                      /* 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,

+      "MESA_FORMAT_SIGNED_RG88",

+      GL_RGBA,

+      GL_SIGNED_NORMALIZED,

+      8, 8, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_RGBX8888,

+      "MESA_FORMAT_SIGNED_RGBX8888",

+      GL_RGBA,

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

+      "MESA_FORMAT_SIGNED_R_16",

+      GL_RGBA,

+      GL_SIGNED_NORMALIZED,

+      16, 0, 0, 0,

+      0, 0, 0, 0, 0,

+      1, 1, 2

+   },

+   {

+      MESA_FORMAT_SIGNED_RG_16,

+      "MESA_FORMAT_SIGNED_RG_16",

+      GL_RGBA,

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

+      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

+   }

+};

+

+

+

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

+   }

+}

+

+

+/**

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

+   }

+}

+

+

+

+/**

+ * 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_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);

+      }

+

+   }

+}

+

+

+

+/**

+ * 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: /* XXX this isn't plain GL_UNSIGNED_BYTE */

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

+      *datatype = GL_BYTE;

+      *comps = 1;

+      return;

+   case MESA_FORMAT_SIGNED_RG88:

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

+      *datatype = GL_SHORT;

+      *comps = 1;

+      return;

+   case MESA_FORMAT_SIGNED_RG_16:

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

+      /* 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 e9467f486..0d5e75526 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -1,213 +1,231 @@
-/*
- * 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>
-
-
-
-/**
- * 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_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_L8,		/*                               LLLL LLLL */
-   MESA_FORMAT_I8,		/*                               IIII IIII */
-   MESA_FORMAT_CI8,		/*                               CCCC CCCC */
-   MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
-   MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
-   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,       /*                     RRRR RRRR GGGG GGGG */
-   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_R_16,       /* ushort[0]=R */
-   MESA_FORMAT_SIGNED_RG_16,      /* ushort[0]=R, ushort[1]=G */
-   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_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 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 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);
-
-#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>

+

+

+

+/**

+ * 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,       /*                     RRRR RRRR GGGG GGGG */

+   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_R_16,       /* ushort[0]=R */

+   MESA_FORMAT_SIGNED_RG_16,      /* ushort[0]=R, ushort[1]=G */

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

+

+#endif /* FORMATS_H */

diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index a98c09cfb..f8c0c6379 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -1,1063 +1,1084 @@
-/*
- * 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.
- */
-
-
-/**
- * Functions for allocating/managing framebuffers and renderbuffers.
- * Also, routines for reading/writing renderbuffer data as ubytes,
- * ushorts, uints, etc.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "buffers.h"
-#include "context.h"
-#include "depthstencil.h"
-#include "enums.h"
-#include "formats.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "fbobject.h"
-#include "framebuffer.h"
-#include "renderbuffer.h"
-#include "texobj.h"
-
-
-
-/**
- * Compute/set the _DepthMax field for the given framebuffer.
- * This value depends on the Z buffer resolution.
- */
-static void
-compute_depth_max(struct gl_framebuffer *fb)
-{
-   if (fb->Visual.depthBits == 0) {
-      /* Special case.  Even if we don't have a depth buffer we need
-       * good values for DepthMax for Z vertex transformation purposes
-       * and for per-fragment fog computation.
-       */
-      fb->_DepthMax = (1 << 16) - 1;
-   }
-   else if (fb->Visual.depthBits < 32) {
-      fb->_DepthMax = (1 << fb->Visual.depthBits) - 1;
-   }
-   else {
-      /* Special case since shift values greater than or equal to the
-       * number of bits in the left hand expression's type are undefined.
-       */
-      fb->_DepthMax = 0xffffffff;
-   }
-   fb->_DepthMaxF = (GLfloat) fb->_DepthMax;
-
-   /* Minimum resolvable depth value, for polygon offset */
-   fb->_MRD = (GLfloat)1.0 / fb->_DepthMaxF;
-}
-
-/**
- * Create and initialize a gl_framebuffer object.
- * This is intended for creating _window_system_ framebuffers, not generic
- * framebuffer objects ala GL_EXT_framebuffer_object.
- *
- * \sa _mesa_new_framebuffer
- */
-struct gl_framebuffer *
-_mesa_create_framebuffer(const GLvisual *visual)
-{
-   struct gl_framebuffer *fb = CALLOC_STRUCT(gl_framebuffer);
-   assert(visual);
-   if (fb) {
-      _mesa_initialize_window_framebuffer(fb, visual);
-   }
-   return fb;
-}
-
-
-/**
- * Allocate a new gl_framebuffer object.
- * This is the default function for ctx->Driver.NewFramebuffer().
- * This is for allocating user-created framebuffers, not window-system
- * framebuffers!
- * \sa _mesa_create_framebuffer
- */
-struct gl_framebuffer *
-_mesa_new_framebuffer(GLcontext *ctx, GLuint name)
-{
-   struct gl_framebuffer *fb;
-   (void) ctx;
-   assert(name != 0);
-   fb = CALLOC_STRUCT(gl_framebuffer);
-   if (fb) {
-      _mesa_initialize_user_framebuffer(fb, name);
-   }
-   return fb;
-}
-
-
-/**
- * Initialize a gl_framebuffer object.  Typically used to initialize
- * window system-created framebuffers, not user-created framebuffers.
- * \sa _mesa_initialize_user_framebuffer
- */
-void
-_mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,
-				     const GLvisual *visual)
-{
-   assert(fb);
-   assert(visual);
-
-   memset(fb, 0, sizeof(struct gl_framebuffer));
-
-   _glthread_INIT_MUTEX(fb->Mutex);
-
-   fb->RefCount = 1;
-
-   /* save the visual */
-   fb->Visual = *visual;
-
-   /* Init read/draw renderbuffer state */
-   if (visual->doubleBufferMode) {
-      fb->_NumColorDrawBuffers = 1;
-      fb->ColorDrawBuffer[0] = GL_BACK;
-      fb->_ColorDrawBufferIndexes[0] = BUFFER_BACK_LEFT;
-      fb->ColorReadBuffer = GL_BACK;
-      fb->_ColorReadBufferIndex = BUFFER_BACK_LEFT;
-   }
-   else {
-      fb->_NumColorDrawBuffers = 1;
-      fb->ColorDrawBuffer[0] = GL_FRONT;
-      fb->_ColorDrawBufferIndexes[0] = BUFFER_FRONT_LEFT;
-      fb->ColorReadBuffer = GL_FRONT;
-      fb->_ColorReadBufferIndex = BUFFER_FRONT_LEFT;
-   }
-
-   fb->Delete = _mesa_destroy_framebuffer;
-   fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;
-
-   compute_depth_max(fb);
-}
-
-
-/**
- * Initialize a user-created gl_framebuffer object.
- * \sa _mesa_initialize_window_framebuffer
- */
-void
-_mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name)
-{
-   assert(fb);
-   assert(name);
-
-   memset(fb, 0, sizeof(struct gl_framebuffer));
-
-   fb->Name = name;
-   fb->RefCount = 1;
-   fb->_NumColorDrawBuffers = 1;
-   fb->ColorDrawBuffer[0] = GL_COLOR_ATTACHMENT0_EXT;
-   fb->_ColorDrawBufferIndexes[0] = BUFFER_COLOR0;
-   fb->ColorReadBuffer = GL_COLOR_ATTACHMENT0_EXT;
-   fb->_ColorReadBufferIndex = BUFFER_COLOR0;
-   fb->Delete = _mesa_destroy_framebuffer;
-   _glthread_INIT_MUTEX(fb->Mutex);
-}
-
-
-/**
- * Deallocate buffer and everything attached to it.
- * Typically called via the gl_framebuffer->Delete() method.
- */
-void
-_mesa_destroy_framebuffer(struct gl_framebuffer *fb)
-{
-   if (fb) {
-      _mesa_free_framebuffer_data(fb);
-      free(fb);
-   }
-}
-
-
-/**
- * Free all the data hanging off the given gl_framebuffer, but don't free
- * the gl_framebuffer object itself.
- */
-void
-_mesa_free_framebuffer_data(struct gl_framebuffer *fb)
-{
-   GLuint i;
-
-   assert(fb);
-   assert(fb->RefCount == 0);
-
-   _glthread_DESTROY_MUTEX(fb->Mutex);
-
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
-      if (att->Renderbuffer) {
-         _mesa_reference_renderbuffer(&att->Renderbuffer, NULL);
-      }
-      if (att->Texture) {
-         _mesa_reference_texobj(&att->Texture, NULL);
-      }
-      ASSERT(!att->Renderbuffer);
-      ASSERT(!att->Texture);
-      att->Type = GL_NONE;
-   }
-
-   /* unbind _Depth/_StencilBuffer to decr ref counts */
-   _mesa_reference_renderbuffer(&fb->_DepthBuffer, NULL);
-   _mesa_reference_renderbuffer(&fb->_StencilBuffer, NULL);
-}
-
-
-/**
- * Set *ptr to point to fb, with refcounting and locking.
- */
-void
-_mesa_reference_framebuffer(struct gl_framebuffer **ptr,
-                            struct gl_framebuffer *fb)
-{
-   assert(ptr);
-   if (*ptr == fb) {
-      /* no change */
-      return;
-   }
-
-   if (*ptr) {
-      /* unreference old renderbuffer */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_framebuffer *oldFb = *ptr;
-
-      _glthread_LOCK_MUTEX(oldFb->Mutex);
-      ASSERT(oldFb->RefCount > 0);
-      oldFb->RefCount--;
-      deleteFlag = (oldFb->RefCount == 0);
-      _glthread_UNLOCK_MUTEX(oldFb->Mutex);
-      
-      if (deleteFlag)
-         oldFb->Delete(oldFb);
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (fb) {
-      _glthread_LOCK_MUTEX(fb->Mutex);
-      fb->RefCount++;
-      _glthread_UNLOCK_MUTEX(fb->Mutex);
-      *ptr = fb;
-   }
-}
-
-
-/**
- * Resize the given framebuffer's renderbuffers to the new width and height.
- * This should only be used for window-system framebuffers, not
- * user-created renderbuffers (i.e. made with GL_EXT_framebuffer_object).
- * This will typically be called via ctx->Driver.ResizeBuffers() or directly
- * from a device driver.
- *
- * \note it's possible for ctx to be null since a window can be resized
- * without a currently bound rendering context.
- */
-void
-_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                         GLuint width, GLuint height)
-{
-   GLuint i;
-
-   /* XXX I think we could check if the size is not changing
-    * and return early.
-    */
-
-   /* For window system framebuffers, Name is zero */
-   assert(fb->Name == 0);
-
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
-      if (att->Type == GL_RENDERBUFFER_EXT && att->Renderbuffer) {
-         struct gl_renderbuffer *rb = att->Renderbuffer;
-         /* only resize if size is changing */
-         if (rb->Width != width || rb->Height != height) {
-            if (rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {
-               ASSERT(rb->Width == width);
-               ASSERT(rb->Height == height);
-            }
-            else {
-               _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
-               /* no return */
-            }
-         }
-      }
-   }
-
-   if (fb->_DepthBuffer) {
-      struct gl_renderbuffer *rb = fb->_DepthBuffer;
-      if (rb->Width != width || rb->Height != height) {
-         if (!rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
-         }
-      }
-   }
-
-   if (fb->_StencilBuffer) {
-      struct gl_renderbuffer *rb = fb->_StencilBuffer;
-      if (rb->Width != width || rb->Height != height) {
-         if (!rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
-         }
-      }
-   }
-
-   fb->Width = width;
-   fb->Height = height;
-
-   if (ctx) {
-      /* update scissor / window bounds */
-      _mesa_update_draw_buffer_bounds(ctx);
-      /* Signal new buffer state so that swrast will update its clipping
-       * info (the CLIP_BIT flag).
-       */
-      ctx->NewState |= _NEW_BUFFERS;
-   }
-}
-
-
-
-/**
- * XXX THIS IS OBSOLETE - drivers should take care of detecting window
- * size changes and act accordingly, likely calling _mesa_resize_framebuffer().
- *
- * GL_MESA_resize_buffers extension.
- *
- * When this function is called, we'll ask the window system how large
- * the current window is.  If it's a new size, we'll call the driver's
- * ResizeBuffers function.  The driver will then resize its color buffers
- * as needed, and maybe call the swrast's routine for reallocating
- * swrast-managed depth/stencil/accum/etc buffers.
- * \note This function should only be called through the GL API, not
- * from device drivers (as was done in the past).
- */
-void
-_mesa_resizebuffers( GLcontext *ctx )
-{
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glResizeBuffersMESA\n");
-
-   if (!ctx->Driver.GetBufferSize) {
-      return;
-   }
-
-   if (ctx->WinSysDrawBuffer) {
-      GLuint newWidth, newHeight;
-      GLframebuffer *buffer = ctx->WinSysDrawBuffer;
-
-      assert(buffer->Name == 0);
-
-      /* ask device driver for size of output buffer */
-      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );
-
-      /* see if size of device driver's color buffer (window) has changed */
-      if (buffer->Width != newWidth || buffer->Height != newHeight) {
-         if (ctx->Driver.ResizeBuffers)
-            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );
-      }
-   }
-
-   if (ctx->WinSysReadBuffer
-       && ctx->WinSysReadBuffer != ctx->WinSysDrawBuffer) {
-      GLuint newWidth, newHeight;
-      GLframebuffer *buffer = ctx->WinSysReadBuffer;
-
-      assert(buffer->Name == 0);
-
-      /* ask device driver for size of read buffer */
-      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );
-
-      /* see if size of device driver's color buffer (window) has changed */
-      if (buffer->Width != newWidth || buffer->Height != newHeight) {
-         if (ctx->Driver.ResizeBuffers)
-            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );
-      }
-   }
-
-   ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */
-}
-
-
-/*
- * XXX THIS IS OBSOLETE
- */
-void GLAPIENTRY
-_mesa_ResizeBuffersMESA( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->Extensions.MESA_resize_buffers)
-      _mesa_resizebuffers( ctx );
-}
-
-
-
-/**
- * Examine all the framebuffer's renderbuffers to update the Width/Height
- * fields of the framebuffer.  If we have renderbuffers with different
- * sizes, set the framebuffer's width and height to the min size.
- * Note: this is only intended for user-created framebuffers, not
- * window-system framebuffes.
- */
-static void
-update_framebuffer_size(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   GLuint minWidth = ~0, minHeight = ~0;
-   GLuint i;
-
-   /* user-created framebuffers only */
-   assert(fb->Name);
-
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
-      const struct gl_renderbuffer *rb = att->Renderbuffer;
-      if (rb) {
-         minWidth = MIN2(minWidth, rb->Width);
-         minHeight = MIN2(minHeight, rb->Height);
-      }
-   }
-
-   if (minWidth != ~0) {
-      fb->Width = minWidth;
-      fb->Height = minHeight;
-   }
-   else {
-      fb->Width = 0;
-      fb->Height = 0;
-   }
-}
-
-
-/**
- * Update the context's current drawing buffer's Xmin, Xmax, Ymin, Ymax fields.
- * These values are computed from the buffer's width and height and
- * the scissor box, if it's enabled.
- * \param ctx  the GL context.
- */
-void
-_mesa_update_draw_buffer_bounds(GLcontext *ctx)
-{
-   struct gl_framebuffer *buffer = ctx->DrawBuffer;
-
-   if (!buffer)
-      return;
-
-   if (buffer->Name) {
-      /* user-created framebuffer size depends on the renderbuffers */
-      update_framebuffer_size(ctx, buffer);
-   }
-
-   buffer->_Xmin = 0;
-   buffer->_Ymin = 0;
-   buffer->_Xmax = buffer->Width;
-   buffer->_Ymax = buffer->Height;
-
-   if (ctx->Scissor.Enabled) {
-      if (ctx->Scissor.X > buffer->_Xmin) {
-	 buffer->_Xmin = ctx->Scissor.X;
-      }
-      if (ctx->Scissor.Y > buffer->_Ymin) {
-	 buffer->_Ymin = ctx->Scissor.Y;
-      }
-      if (ctx->Scissor.X + ctx->Scissor.Width < buffer->_Xmax) {
-	 buffer->_Xmax = ctx->Scissor.X + ctx->Scissor.Width;
-      }
-      if (ctx->Scissor.Y + ctx->Scissor.Height < buffer->_Ymax) {
-	 buffer->_Ymax = ctx->Scissor.Y + ctx->Scissor.Height;
-      }
-      /* finally, check for empty region */
-      if (buffer->_Xmin > buffer->_Xmax) {
-         buffer->_Xmin = buffer->_Xmax;
-      }
-      if (buffer->_Ymin > buffer->_Ymax) {
-         buffer->_Ymin = buffer->_Ymax;
-      }
-   }
-
-   ASSERT(buffer->_Xmin <= buffer->_Xmax);
-   ASSERT(buffer->_Ymin <= buffer->_Ymax);
-}
-
-
-/**
- * The glGet queries of the framebuffer red/green/blue size, stencil size,
- * etc. are satisfied by the fields of ctx->DrawBuffer->Visual.  These can
- * change depending on the renderbuffer bindings.  This function updates
- * the given framebuffer's Visual from the current renderbuffer bindings.
- *
- * This may apply to user-created framebuffers or window system framebuffers.
- *
- * Also note: ctx->DrawBuffer->Visual.depthBits might not equal
- * ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer.DepthBits.
- * The former one is used to convert floating point depth values into
- * integer Z values.
- */
-void
-_mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
-{
-   GLuint i;
-
-   memset(&fb->Visual, 0, sizeof(fb->Visual));
-   fb->Visual.rgbMode = GL_TRUE; /* assume this */
-
-#if 0 /* this _might_ be needed */
-   if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      /* leave visual fields zero'd */
-      return;
-   }
-#endif
-
-   /* find first RGB renderbuffer */
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      if (fb->Attachment[i].Renderbuffer) {
-         const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;
-         const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);
-         const gl_format fmt = rb->Format;
-         
-         if (baseFormat == GL_RGBA || baseFormat == GL_RGB ||
-	     baseFormat == GL_ALPHA) {
-            fb->Visual.redBits = _mesa_get_format_bits(fmt, GL_RED_BITS);
-            fb->Visual.greenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);
-            fb->Visual.blueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);
-            fb->Visual.alphaBits = _mesa_get_format_bits(fmt, GL_ALPHA_BITS);
-            fb->Visual.rgbBits = fb->Visual.redBits
-               + fb->Visual.greenBits + fb->Visual.blueBits;
-            fb->Visual.floatMode = GL_FALSE;
-            fb->Visual.samples = rb->NumSamples;
-            break;
-         }
-      }
-   }
-
-   if (fb->Attachment[BUFFER_DEPTH].Renderbuffer) {
-      const struct gl_renderbuffer *rb =
-         fb->Attachment[BUFFER_DEPTH].Renderbuffer;
-      const gl_format fmt = rb->Format;
-      fb->Visual.haveDepthBuffer = GL_TRUE;
-      fb->Visual.depthBits = _mesa_get_format_bits(fmt, GL_DEPTH_BITS);
-   }
-
-   if (fb->Attachment[BUFFER_STENCIL].Renderbuffer) {
-      const struct gl_renderbuffer *rb =
-         fb->Attachment[BUFFER_STENCIL].Renderbuffer;
-      const gl_format fmt = rb->Format;
-      fb->Visual.haveStencilBuffer = GL_TRUE;
-      fb->Visual.stencilBits = _mesa_get_format_bits(fmt, GL_STENCIL_BITS);
-   }
-
-   if (fb->Attachment[BUFFER_ACCUM].Renderbuffer) {
-      const struct gl_renderbuffer *rb =
-         fb->Attachment[BUFFER_ACCUM].Renderbuffer;
-      const gl_format fmt = rb->Format;
-      fb->Visual.haveAccumBuffer = GL_TRUE;
-      fb->Visual.accumRedBits = _mesa_get_format_bits(fmt, GL_RED_BITS);
-      fb->Visual.accumGreenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);
-      fb->Visual.accumBlueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);
-      fb->Visual.accumAlphaBits = _mesa_get_format_bits(fmt, GL_ALPHA_BITS);
-   }
-
-   compute_depth_max(fb);
-}
-
-
-/**
- * Update the framebuffer's _DepthBuffer field using the renderbuffer
- * found at the given attachment index.
- *
- * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,
- * create and install a depth wrapper/adaptor.
- *
- * \param fb  the framebuffer whose _DepthBuffer field to update
- * \param attIndex  indicates the renderbuffer to possibly wrap
- */
-void
-_mesa_update_depth_buffer(GLcontext *ctx,
-                          struct gl_framebuffer *fb,
-                          GLuint attIndex)
-{
-   struct gl_renderbuffer *depthRb;
-
-   /* only one possiblity for now */
-   ASSERT(attIndex == BUFFER_DEPTH);
-
-   depthRb = fb->Attachment[attIndex].Renderbuffer;
-
-   if (depthRb && _mesa_is_format_packed_depth_stencil(depthRb->Format)) {
-      /* The attached depth buffer is a GL_DEPTH_STENCIL renderbuffer */
-      if (!fb->_DepthBuffer
-          || fb->_DepthBuffer->Wrapped != depthRb
-          || _mesa_get_format_base_format(fb->_DepthBuffer->Format) != GL_DEPTH_COMPONENT) {
-         /* need to update wrapper */
-         struct gl_renderbuffer *wrapper
-            = _mesa_new_z24_renderbuffer_wrapper(ctx, depthRb);
-         _mesa_reference_renderbuffer(&fb->_DepthBuffer, wrapper);
-         ASSERT(fb->_DepthBuffer->Wrapped == depthRb);
-      }
-   }
-   else {
-      /* depthRb may be null */
-      _mesa_reference_renderbuffer(&fb->_DepthBuffer, depthRb);
-   }
-}
-
-
-/**
- * Update the framebuffer's _StencilBuffer field using the renderbuffer
- * found at the given attachment index.
- *
- * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,
- * create and install a stencil wrapper/adaptor.
- *
- * \param fb  the framebuffer whose _StencilBuffer field to update
- * \param attIndex  indicates the renderbuffer to possibly wrap
- */
-void
-_mesa_update_stencil_buffer(GLcontext *ctx,
-                            struct gl_framebuffer *fb,
-                            GLuint attIndex)
-{
-   struct gl_renderbuffer *stencilRb;
-
-   ASSERT(attIndex == BUFFER_DEPTH ||
-          attIndex == BUFFER_STENCIL);
-
-   stencilRb = fb->Attachment[attIndex].Renderbuffer;
-
-   if (stencilRb && _mesa_is_format_packed_depth_stencil(stencilRb->Format)) {
-      /* The attached stencil buffer is a GL_DEPTH_STENCIL renderbuffer */
-      if (!fb->_StencilBuffer
-          || fb->_StencilBuffer->Wrapped != stencilRb
-          || _mesa_get_format_base_format(fb->_StencilBuffer->Format) != GL_STENCIL_INDEX) {
-         /* need to update wrapper */
-         struct gl_renderbuffer *wrapper
-            = _mesa_new_s8_renderbuffer_wrapper(ctx, stencilRb);
-         _mesa_reference_renderbuffer(&fb->_StencilBuffer, wrapper);
-         ASSERT(fb->_StencilBuffer->Wrapped == stencilRb);
-      }
-   }
-   else {
-      /* stencilRb may be null */
-      _mesa_reference_renderbuffer(&fb->_StencilBuffer, stencilRb);
-   }
-}
-
-
-/*
- * Example DrawBuffers scenarios:
- *
- * 1. glDrawBuffer(GL_FRONT_AND_BACK), fixed-func or shader writes to
- * "gl_FragColor" or program writes to the "result.color" register:
- *
- *   fragment color output   renderbuffer
- *   ---------------------   ---------------
- *   color[0]                Front, Back
- *
- *
- * 2. glDrawBuffers(3, [GL_FRONT, GL_AUX0, GL_AUX1]), shader writes to
- * gl_FragData[i] or program writes to result.color[i] registers:
- *
- *   fragment color output   renderbuffer
- *   ---------------------   ---------------
- *   color[0]                Front
- *   color[1]                Aux0
- *   color[3]                Aux1
- *
- *
- * 3. glDrawBuffers(3, [GL_FRONT, GL_AUX0, GL_AUX1]) and shader writes to
- * gl_FragColor, or fixed function:
- *
- *   fragment color output   renderbuffer
- *   ---------------------   ---------------
- *   color[0]                Front, Aux0, Aux1
- *
- *
- * In either case, the list of renderbuffers is stored in the
- * framebuffer->_ColorDrawBuffers[] array and
- * framebuffer->_NumColorDrawBuffers indicates the number of buffers.
- * The renderer (like swrast) has to look at the current fragment shader
- * to see if it writes to gl_FragColor vs. gl_FragData[i] to determine
- * how to map color outputs to renderbuffers.
- *
- * Note that these two calls are equivalent (for fixed function fragment
- * shading anyway):
- *   a)  glDrawBuffer(GL_FRONT_AND_BACK);  (assuming non-stereo framebuffer)
- *   b)  glDrawBuffers(2, [GL_FRONT_LEFT, GL_BACK_LEFT]);
- */
-
-
-
-
-/**
- * Update the (derived) list of color drawing renderbuffer pointers.
- * Later, when we're rendering we'll loop from 0 to _NumColorDrawBuffers
- * writing colors.
- */
-static void
-update_color_draw_buffers(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   GLuint output;
-
-   /* set 0th buffer to NULL now in case _NumColorDrawBuffers is zero */
-   fb->_ColorDrawBuffers[0] = NULL;
-
-   for (output = 0; output < fb->_NumColorDrawBuffers; output++) {
-      GLint buf = fb->_ColorDrawBufferIndexes[output];
-      if (buf >= 0) {
-         fb->_ColorDrawBuffers[output] = fb->Attachment[buf].Renderbuffer;
-      }
-      else {
-         fb->_ColorDrawBuffers[output] = NULL;
-      }
-   }
-}
-
-
-/**
- * Update the (derived) color read renderbuffer pointer.
- * Unlike the DrawBuffer, we can only read from one (or zero) color buffers.
- */
-static void
-update_color_read_buffer(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   (void) ctx;
-   if (fb->_ColorReadBufferIndex == -1 ||
-       fb->DeletePending ||
-       fb->Width == 0 ||
-       fb->Height == 0) {
-      fb->_ColorReadBuffer = NULL; /* legal! */
-   }
-   else {
-      ASSERT(fb->_ColorReadBufferIndex >= 0);
-      ASSERT(fb->_ColorReadBufferIndex < BUFFER_COUNT);
-      fb->_ColorReadBuffer
-         = fb->Attachment[fb->_ColorReadBufferIndex].Renderbuffer;
-   }
-}
-
-
-/**
- * Update a gl_framebuffer's derived state.
- *
- * Specifically, update these framebuffer fields:
- *    _ColorDrawBuffers
- *    _NumColorDrawBuffers
- *    _ColorReadBuffer
- *    _DepthBuffer
- *    _StencilBuffer
- *
- * If the framebuffer is user-created, make sure it's complete.
- *
- * The following functions (at least) can effect framebuffer state:
- * glReadBuffer, glDrawBuffer, glDrawBuffersARB, glFramebufferRenderbufferEXT,
- * glRenderbufferStorageEXT.
- */
-static void
-update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
-{
-   if (fb->Name == 0) {
-      /* This is a window-system framebuffer */
-      /* Need to update the FB's GL_DRAW_BUFFER state to match the
-       * context state (GL_READ_BUFFER too).
-       */
-      if (fb->ColorDrawBuffer[0] != ctx->Color.DrawBuffer[0]) {
-         _mesa_drawbuffers(ctx, ctx->Const.MaxDrawBuffers,
-                           ctx->Color.DrawBuffer, NULL);
-      }
-      if (fb->ColorReadBuffer != ctx->Pixel.ReadBuffer) {
-         
-      }
-   }
-   else {
-      /* This is a user-created framebuffer.
-       * Completeness only matters for user-created framebuffers.
-       */
-      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE) {
-         _mesa_test_framebuffer_completeness(ctx, fb);
-      }
-   }
-
-   /* Strictly speaking, we don't need to update the draw-state
-    * if this FB is bound as ctx->ReadBuffer (and conversely, the
-    * read-state if this FB is bound as ctx->DrawBuffer), but no
-    * harm.
-    */
-   update_color_draw_buffers(ctx, fb);
-   update_color_read_buffer(ctx, fb);
-   _mesa_update_depth_buffer(ctx, fb, BUFFER_DEPTH);
-   _mesa_update_stencil_buffer(ctx, fb, BUFFER_STENCIL);
-
-   compute_depth_max(fb);
-}
-
-
-/**
- * Update state related to the current draw/read framebuffers.
- */
-void
-_mesa_update_framebuffer(GLcontext *ctx)
-{
-   struct gl_framebuffer *drawFb;
-   struct gl_framebuffer *readFb;
-
-   assert(ctx);
-   drawFb = ctx->DrawBuffer;
-   readFb = ctx->ReadBuffer;
-
-   update_framebuffer(ctx, drawFb);
-   if (readFb != drawFb)
-      update_framebuffer(ctx, readFb);
-}
-
-
-/**
- * Check if the renderbuffer for a read operation (glReadPixels, glCopyPixels,
- * glCopyTex[Sub]Image, etc) exists.
- * \param format  a basic image format such as GL_RGB, GL_RGBA, GL_ALPHA,
- *                GL_DEPTH_COMPONENT, etc. or GL_COLOR, GL_DEPTH, GL_STENCIL.
- * \return GL_TRUE if buffer exists, GL_FALSE otherwise
- */
-GLboolean
-_mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
-{
-   const struct gl_renderbuffer_attachment *att = ctx->ReadBuffer->Attachment;
-
-   /* If we don't know the framebuffer status, update it now */
-   if (ctx->ReadBuffer->_Status == 0) {
-      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);
-   }
-
-   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      return GL_FALSE;
-   }
-
-   switch (format) {
-   case GL_COLOR:
-   case GL_RED:
-   case GL_GREEN:
-   case GL_BLUE:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_ALPHA:
-   case GL_INTENSITY:
-   case GL_RGB:
-   case GL_BGR:
-   case GL_RGBA:
-   case GL_BGRA:
-   case GL_ABGR_EXT:
-   case GL_COLOR_INDEX:
-      if (ctx->ReadBuffer->_ColorReadBuffer == NULL) {
-         return GL_FALSE;
-      }
-      ASSERT(_mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_RED_BITS) > 0 ||
-             _mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_ALPHA_BITS) > 0 ||
-             _mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_INDEX_BITS) > 0);
-      break;
-   case GL_DEPTH:
-   case GL_DEPTH_COMPONENT:
-      if (!att[BUFFER_DEPTH].Renderbuffer) {
-         return GL_FALSE;
-      }
-      /*ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);*/
-      break;
-   case GL_STENCIL:
-   case GL_STENCIL_INDEX:
-      if (!att[BUFFER_STENCIL].Renderbuffer) {
-         return GL_FALSE;
-      }
-      /*ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);*/
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-      if (!att[BUFFER_DEPTH].Renderbuffer ||
-          !att[BUFFER_STENCIL].Renderbuffer) {
-         return GL_FALSE;
-      }
-      /*
-      ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);
-      ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);
-      */
-      break;
-   default:
-      _mesa_problem(ctx,
-                    "Unexpected format 0x%x in _mesa_source_buffer_exists",
-                    format);
-      return GL_FALSE;
-   }
-
-   /* OK */
-   return GL_TRUE;
-}
-
-
-/**
- * As above, but for drawing operations.
- * XXX could do some code merging w/ above function.
- */
-GLboolean
-_mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
-{
-   const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;
-
-   /* If we don't know the framebuffer status, update it now */
-   if (ctx->DrawBuffer->_Status == 0) {
-      _mesa_test_framebuffer_completeness(ctx, ctx->DrawBuffer);
-   }
-
-   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      return GL_FALSE;
-   }
-
-   switch (format) {
-   case GL_COLOR:
-   case GL_RED:
-   case GL_GREEN:
-   case GL_BLUE:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_ALPHA:
-   case GL_INTENSITY:
-   case GL_RGB:
-   case GL_BGR:
-   case GL_RGBA:
-   case GL_BGRA:
-   case GL_ABGR_EXT:
-   case GL_COLOR_INDEX:
-      /* Nothing special since GL_DRAW_BUFFER could be GL_NONE. */
-      /* Could assert that colorbuffer has RedBits > 0 */
-      break;
-   case GL_DEPTH:
-   case GL_DEPTH_COMPONENT:
-      if (!att[BUFFER_DEPTH].Renderbuffer) {
-         return GL_FALSE;
-      }
-      /*ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);*/
-      break;
-   case GL_STENCIL:
-   case GL_STENCIL_INDEX:
-      if (!att[BUFFER_STENCIL].Renderbuffer) {
-         return GL_FALSE;
-      }
-      /*ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);*/
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-      if (!att[BUFFER_DEPTH].Renderbuffer ||
-          !att[BUFFER_STENCIL].Renderbuffer) {
-         return GL_FALSE;
-      }
-      /*
-      ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);
-      ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);
-      */
-      break;
-   default:
-      _mesa_problem(ctx,
-                    "Unexpected format 0x%x in _mesa_dest_buffer_exists",
-                    format);
-      return GL_FALSE;
-   }
-
-   /* OK */
-   return GL_TRUE;
-}
-
-
-/**
- * Used to answer the GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES query.
- */
-GLenum
-_mesa_get_color_read_format(GLcontext *ctx)
-{
-   switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
-   case MESA_FORMAT_ARGB8888:
-      return GL_BGRA;
-   case MESA_FORMAT_RGB565:
-      return GL_BGR;
-   default:
-      return GL_RGBA;
-   }
-}
-
-
-/**
- * Used to answer the GL_IMPLEMENTATION_COLOR_READ_TYPE_OES query.
- */
-GLenum
-_mesa_get_color_read_type(GLcontext *ctx)
-{
-   switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
-   case MESA_FORMAT_ARGB8888:
-      return GL_UNSIGNED_BYTE;
-   case MESA_FORMAT_RGB565:
-      return GL_UNSIGNED_SHORT_5_6_5_REV;
-   default:
-      return GL_UNSIGNED_BYTE;
-   }
-}
-
-
-/**
- * Print framebuffer info to stderr, for debugging.
- */
-void
-_mesa_print_framebuffer(const struct gl_framebuffer *fb)
-{
-   GLuint i;
-
-   fprintf(stderr, "Mesa Framebuffer %u at %p\n", fb->Name, (void *) fb);
-   fprintf(stderr, "  Size: %u x %u  Status: %s\n", fb->Width, fb->Height,
-           _mesa_lookup_enum_by_nr(fb->_Status));
-   fprintf(stderr, "  Attachments:\n");
-
-   for (i = 0; i < BUFFER_COUNT; i++) {
-      const struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
-      if (att->Type == GL_TEXTURE) {
-         const struct gl_texture_image *texImage;
-         fprintf(stderr,
-                 "  %2d: Texture %u, level %u, face %u, slice %u, complete %d\n",
-                 i, att->Texture->Name, att->TextureLevel, att->CubeMapFace,
-                 att->Zoffset, att->Complete);
-         texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
-         fprintf(stderr, "       Size: %u x %u x %u  Format %s\n",
-                 texImage->Width, texImage->Height, texImage->Depth,
-                 _mesa_get_format_name(texImage->TexFormat));
-      }
-      else if (att->Type == GL_RENDERBUFFER) {
-         fprintf(stderr, "  %2d: Renderbuffer %u, complete %d\n",
-                 i, att->Renderbuffer->Name, att->Complete);
-         fprintf(stderr, "       Size: %u x %u  Format %s\n",
-                 att->Renderbuffer->Width, att->Renderbuffer->Height,
-                 _mesa_get_format_name(att->Renderbuffer->Format));
-      }
-      else {
-         fprintf(stderr, "  %2d: none\n", i);
-      }
-   }
-}
+/*

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

+ */

+

+

+/**

+ * Functions for allocating/managing framebuffers and renderbuffers.

+ * Also, routines for reading/writing renderbuffer data as ubytes,

+ * ushorts, uints, etc.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "buffers.h"

+#include "context.h"

+#include "depthstencil.h"

+#include "enums.h"

+#include "formats.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "fbobject.h"

+#include "framebuffer.h"

+#include "renderbuffer.h"

+#include "texobj.h"

+

+

+

+/**

+ * Compute/set the _DepthMax field for the given framebuffer.

+ * This value depends on the Z buffer resolution.

+ */

+static void

+compute_depth_max(struct gl_framebuffer *fb)

+{

+   if (fb->Visual.depthBits == 0) {

+      /* Special case.  Even if we don't have a depth buffer we need

+       * good values for DepthMax for Z vertex transformation purposes

+       * and for per-fragment fog computation.

+       */

+      fb->_DepthMax = (1 << 16) - 1;

+   }

+   else if (fb->Visual.depthBits < 32) {

+      fb->_DepthMax = (1 << fb->Visual.depthBits) - 1;

+   }

+   else {

+      /* Special case since shift values greater than or equal to the

+       * number of bits in the left hand expression's type are undefined.

+       */

+      fb->_DepthMax = 0xffffffff;

+   }

+   fb->_DepthMaxF = (GLfloat) fb->_DepthMax;

+

+   /* Minimum resolvable depth value, for polygon offset */

+   fb->_MRD = (GLfloat)1.0 / fb->_DepthMaxF;

+}

+

+/**

+ * Create and initialize a gl_framebuffer object.

+ * This is intended for creating _window_system_ framebuffers, not generic

+ * framebuffer objects ala GL_EXT_framebuffer_object.

+ *

+ * \sa _mesa_new_framebuffer

+ */

+struct gl_framebuffer *

+_mesa_create_framebuffer(const struct gl_config *visual)

+{

+   struct gl_framebuffer *fb = CALLOC_STRUCT(gl_framebuffer);

+   assert(visual);

+   if (fb) {

+      _mesa_initialize_window_framebuffer(fb, visual);

+   }

+   return fb;

+}

+

+

+/**

+ * Allocate a new gl_framebuffer object.

+ * This is the default function for ctx->Driver.NewFramebuffer().

+ * This is for allocating user-created framebuffers, not window-system

+ * framebuffers!

+ * \sa _mesa_create_framebuffer

+ */

+struct gl_framebuffer *

+_mesa_new_framebuffer(struct gl_context *ctx, GLuint name)

+{

+   struct gl_framebuffer *fb;

+   (void) ctx;

+   assert(name != 0);

+   fb = CALLOC_STRUCT(gl_framebuffer);

+   if (fb) {

+      _mesa_initialize_user_framebuffer(fb, name);

+   }

+   return fb;

+}

+

+

+/**

+ * Initialize a gl_framebuffer object.  Typically used to initialize

+ * window system-created framebuffers, not user-created framebuffers.

+ * \sa _mesa_initialize_user_framebuffer

+ */

+void

+_mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,

+				     const struct gl_config *visual)

+{

+   assert(fb);

+   assert(visual);

+

+   memset(fb, 0, sizeof(struct gl_framebuffer));

+

+   _glthread_INIT_MUTEX(fb->Mutex);

+

+   fb->RefCount = 1;

+

+   /* save the visual */

+   fb->Visual = *visual;

+

+   /* Init read/draw renderbuffer state */

+   if (visual->doubleBufferMode) {

+      fb->_NumColorDrawBuffers = 1;

+      fb->ColorDrawBuffer[0] = GL_BACK;

+      fb->_ColorDrawBufferIndexes[0] = BUFFER_BACK_LEFT;

+      fb->ColorReadBuffer = GL_BACK;

+      fb->_ColorReadBufferIndex = BUFFER_BACK_LEFT;

+   }

+   else {

+      fb->_NumColorDrawBuffers = 1;

+      fb->ColorDrawBuffer[0] = GL_FRONT;

+      fb->_ColorDrawBufferIndexes[0] = BUFFER_FRONT_LEFT;

+      fb->ColorReadBuffer = GL_FRONT;

+      fb->_ColorReadBufferIndex = BUFFER_FRONT_LEFT;

+   }

+

+   fb->Delete = _mesa_destroy_framebuffer;

+   fb->_Status = GL_FRAMEBUFFER_COMPLETE_EXT;

+

+   compute_depth_max(fb);

+}

+

+

+/**

+ * Initialize a user-created gl_framebuffer object.

+ * \sa _mesa_initialize_window_framebuffer

+ */

+void

+_mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name)

+{

+   assert(fb);

+   assert(name);

+

+   memset(fb, 0, sizeof(struct gl_framebuffer));

+

+   fb->Name = name;

+   fb->RefCount = 1;

+   fb->_NumColorDrawBuffers = 1;

+   fb->ColorDrawBuffer[0] = GL_COLOR_ATTACHMENT0_EXT;

+   fb->_ColorDrawBufferIndexes[0] = BUFFER_COLOR0;

+   fb->ColorReadBuffer = GL_COLOR_ATTACHMENT0_EXT;

+   fb->_ColorReadBufferIndex = BUFFER_COLOR0;

+   fb->Delete = _mesa_destroy_framebuffer;

+   _glthread_INIT_MUTEX(fb->Mutex);

+}

+

+

+/**

+ * Deallocate buffer and everything attached to it.

+ * Typically called via the gl_framebuffer->Delete() method.

+ */

+void

+_mesa_destroy_framebuffer(struct gl_framebuffer *fb)

+{

+   if (fb) {

+      _mesa_free_framebuffer_data(fb);

+      free(fb);

+   }

+}

+

+

+/**

+ * Free all the data hanging off the given gl_framebuffer, but don't free

+ * the gl_framebuffer object itself.

+ */

+void

+_mesa_free_framebuffer_data(struct gl_framebuffer *fb)

+{

+   GLuint i;

+

+   assert(fb);

+   assert(fb->RefCount == 0);

+

+   _glthread_DESTROY_MUTEX(fb->Mutex);

+

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      struct gl_renderbuffer_attachment *att = &fb->Attachment[i];

+      if (att->Renderbuffer) {

+         _mesa_reference_renderbuffer(&att->Renderbuffer, NULL);

+      }

+      if (att->Texture) {

+         _mesa_reference_texobj(&att->Texture, NULL);

+      }

+      ASSERT(!att->Renderbuffer);

+      ASSERT(!att->Texture);

+      att->Type = GL_NONE;

+   }

+

+   /* unbind _Depth/_StencilBuffer to decr ref counts */

+   _mesa_reference_renderbuffer(&fb->_DepthBuffer, NULL);

+   _mesa_reference_renderbuffer(&fb->_StencilBuffer, NULL);

+}

+

+

+/**

+ * Set *ptr to point to fb, with refcounting and locking.

+ */

+void

+_mesa_reference_framebuffer(struct gl_framebuffer **ptr,

+                            struct gl_framebuffer *fb)

+{

+   assert(ptr);

+   if (*ptr == fb) {

+      /* no change */

+      return;

+   }

+

+   if (*ptr) {

+      /* unreference old renderbuffer */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_framebuffer *oldFb = *ptr;

+

+      _glthread_LOCK_MUTEX(oldFb->Mutex);

+      ASSERT(oldFb->RefCount > 0);

+      oldFb->RefCount--;

+      deleteFlag = (oldFb->RefCount == 0);

+      _glthread_UNLOCK_MUTEX(oldFb->Mutex);

+      

+      if (deleteFlag)

+         oldFb->Delete(oldFb);

+

+      *ptr = NULL;

+   }

+   assert(!*ptr);

+

+   if (fb) {

+      _glthread_LOCK_MUTEX(fb->Mutex);

+      fb->RefCount++;

+      _glthread_UNLOCK_MUTEX(fb->Mutex);

+      *ptr = fb;

+   }

+}

+

+

+/**

+ * Resize the given framebuffer's renderbuffers to the new width and height.

+ * This should only be used for window-system framebuffers, not

+ * user-created renderbuffers (i.e. made with GL_EXT_framebuffer_object).

+ * This will typically be called via ctx->Driver.ResizeBuffers() or directly

+ * from a device driver.

+ *

+ * \note it's possible for ctx to be null since a window can be resized

+ * without a currently bound rendering context.

+ */

+void

+_mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                         GLuint width, GLuint height)

+{

+   GLuint i;

+

+   /* XXX I think we could check if the size is not changing

+    * and return early.

+    */

+

+   /* For window system framebuffers, Name is zero */

+   assert(fb->Name == 0);

+

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      struct gl_renderbuffer_attachment *att = &fb->Attachment[i];

+      if (att->Type == GL_RENDERBUFFER_EXT && att->Renderbuffer) {

+         struct gl_renderbuffer *rb = att->Renderbuffer;

+         /* only resize if size is changing */

+         if (rb->Width != width || rb->Height != height) {

+            if (rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {

+               ASSERT(rb->Width == width);

+               ASSERT(rb->Height == height);

+            }

+            else {

+               _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");

+               /* no return */

+            }

+         }

+      }

+   }

+

+   if (fb->_DepthBuffer) {

+      struct gl_renderbuffer *rb = fb->_DepthBuffer;

+      if (rb->Width != width || rb->Height != height) {

+         if (!rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");

+         }

+      }

+   }

+

+   if (fb->_StencilBuffer) {

+      struct gl_renderbuffer *rb = fb->_StencilBuffer;

+      if (rb->Width != width || rb->Height != height) {

+         if (!rb->AllocStorage(ctx, rb, rb->InternalFormat, width, height)) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");

+         }

+      }

+   }

+

+   fb->Width = width;

+   fb->Height = height;

+

+   if (ctx) {

+      /* update scissor / window bounds */

+      _mesa_update_draw_buffer_bounds(ctx);

+      /* Signal new buffer state so that swrast will update its clipping

+       * info (the CLIP_BIT flag).

+       */

+      ctx->NewState |= _NEW_BUFFERS;

+   }

+}

+

+

+

+/**

+ * XXX THIS IS OBSOLETE - drivers should take care of detecting window

+ * size changes and act accordingly, likely calling _mesa_resize_framebuffer().

+ *

+ * GL_MESA_resize_buffers extension.

+ *

+ * When this function is called, we'll ask the window system how large

+ * the current window is.  If it's a new size, we'll call the driver's

+ * ResizeBuffers function.  The driver will then resize its color buffers

+ * as needed, and maybe call the swrast's routine for reallocating

+ * swrast-managed depth/stencil/accum/etc buffers.

+ * \note This function should only be called through the GL API, not

+ * from device drivers (as was done in the past).

+ */

+void

+_mesa_resizebuffers( struct gl_context *ctx )

+{

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glResizeBuffersMESA\n");

+

+   if (!ctx->Driver.GetBufferSize) {

+      return;

+   }

+

+   if (ctx->WinSysDrawBuffer) {

+      GLuint newWidth, newHeight;

+      struct gl_framebuffer *buffer = ctx->WinSysDrawBuffer;

+

+      assert(buffer->Name == 0);

+

+      /* ask device driver for size of output buffer */

+      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );

+

+      /* see if size of device driver's color buffer (window) has changed */

+      if (buffer->Width != newWidth || buffer->Height != newHeight) {

+         if (ctx->Driver.ResizeBuffers)

+            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );

+      }

+   }

+

+   if (ctx->WinSysReadBuffer

+       && ctx->WinSysReadBuffer != ctx->WinSysDrawBuffer) {

+      GLuint newWidth, newHeight;

+      struct gl_framebuffer *buffer = ctx->WinSysReadBuffer;

+

+      assert(buffer->Name == 0);

+

+      /* ask device driver for size of read buffer */

+      ctx->Driver.GetBufferSize( buffer, &newWidth, &newHeight );

+

+      /* see if size of device driver's color buffer (window) has changed */

+      if (buffer->Width != newWidth || buffer->Height != newHeight) {

+         if (ctx->Driver.ResizeBuffers)

+            ctx->Driver.ResizeBuffers(ctx, buffer, newWidth, newHeight );

+      }

+   }

+

+   ctx->NewState |= _NEW_BUFFERS;  /* to update scissor / window bounds */

+}

+

+

+/*

+ * XXX THIS IS OBSOLETE

+ */

+void GLAPIENTRY

+_mesa_ResizeBuffersMESA( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (ctx->Extensions.MESA_resize_buffers)

+      _mesa_resizebuffers( ctx );

+}

+

+

+

+/**

+ * Examine all the framebuffer's renderbuffers to update the Width/Height

+ * fields of the framebuffer.  If we have renderbuffers with different

+ * sizes, set the framebuffer's width and height to the min size.

+ * Note: this is only intended for user-created framebuffers, not

+ * window-system framebuffes.

+ */

+static void

+update_framebuffer_size(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   GLuint minWidth = ~0, minHeight = ~0;

+   GLuint i;

+

+   /* user-created framebuffers only */

+   assert(fb->Name);

+

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      struct gl_renderbuffer_attachment *att = &fb->Attachment[i];

+      const struct gl_renderbuffer *rb = att->Renderbuffer;

+      if (rb) {

+         minWidth = MIN2(minWidth, rb->Width);

+         minHeight = MIN2(minHeight, rb->Height);

+      }

+   }

+

+   if (minWidth != ~0) {

+      fb->Width = minWidth;

+      fb->Height = minHeight;

+   }

+   else {

+      fb->Width = 0;

+      fb->Height = 0;

+   }

+}

+

+

+/**

+ * Update the context's current drawing buffer's Xmin, Xmax, Ymin, Ymax fields.

+ * These values are computed from the buffer's width and height and

+ * the scissor box, if it's enabled.

+ * \param ctx  the GL context.

+ */

+void

+_mesa_update_draw_buffer_bounds(struct gl_context *ctx)

+{

+   struct gl_framebuffer *buffer = ctx->DrawBuffer;

+

+   if (!buffer)

+      return;

+

+   if (buffer->Name) {

+      /* user-created framebuffer size depends on the renderbuffers */

+      update_framebuffer_size(ctx, buffer);

+   }

+

+   buffer->_Xmin = 0;

+   buffer->_Ymin = 0;

+   buffer->_Xmax = buffer->Width;

+   buffer->_Ymax = buffer->Height;

+

+   if (ctx->Scissor.Enabled) {

+      if (ctx->Scissor.X > buffer->_Xmin) {

+	 buffer->_Xmin = ctx->Scissor.X;

+      }

+      if (ctx->Scissor.Y > buffer->_Ymin) {

+	 buffer->_Ymin = ctx->Scissor.Y;

+      }

+      if (ctx->Scissor.X + ctx->Scissor.Width < buffer->_Xmax) {

+	 buffer->_Xmax = ctx->Scissor.X + ctx->Scissor.Width;

+      }

+      if (ctx->Scissor.Y + ctx->Scissor.Height < buffer->_Ymax) {

+	 buffer->_Ymax = ctx->Scissor.Y + ctx->Scissor.Height;

+      }

+      /* finally, check for empty region */

+      if (buffer->_Xmin > buffer->_Xmax) {

+         buffer->_Xmin = buffer->_Xmax;

+      }

+      if (buffer->_Ymin > buffer->_Ymax) {

+         buffer->_Ymin = buffer->_Ymax;

+      }

+   }

+

+   ASSERT(buffer->_Xmin <= buffer->_Xmax);

+   ASSERT(buffer->_Ymin <= buffer->_Ymax);

+}

+

+

+/**

+ * The glGet queries of the framebuffer red/green/blue size, stencil size,

+ * etc. are satisfied by the fields of ctx->DrawBuffer->Visual.  These can

+ * change depending on the renderbuffer bindings.  This function updates

+ * the given framebuffer's Visual from the current renderbuffer bindings.

+ *

+ * This may apply to user-created framebuffers or window system framebuffers.

+ *

+ * Also note: ctx->DrawBuffer->Visual.depthBits might not equal

+ * ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer.DepthBits.

+ * The former one is used to convert floating point depth values into

+ * integer Z values.

+ */

+void

+_mesa_update_framebuffer_visual(struct gl_framebuffer *fb)

+{

+   GLuint i;

+

+   memset(&fb->Visual, 0, sizeof(fb->Visual));

+   fb->Visual.rgbMode = GL_TRUE; /* assume this */

+

+#if 0 /* this _might_ be needed */

+   if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      /* leave visual fields zero'd */

+      return;

+   }

+#endif

+

+   /* find first RGB renderbuffer */

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      if (fb->Attachment[i].Renderbuffer) {

+         const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;

+         const GLenum baseFormat = _mesa_get_format_base_format(rb->Format);

+         const gl_format fmt = rb->Format;

+         

+         if (baseFormat == GL_RGBA || baseFormat == GL_RGB ||

+	     baseFormat == GL_ALPHA) {

+            fb->Visual.redBits = _mesa_get_format_bits(fmt, GL_RED_BITS);

+            fb->Visual.greenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);

+            fb->Visual.blueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);

+            fb->Visual.alphaBits = _mesa_get_format_bits(fmt, GL_ALPHA_BITS);

+            fb->Visual.rgbBits = fb->Visual.redBits

+               + fb->Visual.greenBits + fb->Visual.blueBits;

+            fb->Visual.floatMode = GL_FALSE;

+            fb->Visual.samples = rb->NumSamples;

+            break;

+         }

+      }

+   }

+

+   if (fb->Attachment[BUFFER_DEPTH].Renderbuffer) {

+      const struct gl_renderbuffer *rb =

+         fb->Attachment[BUFFER_DEPTH].Renderbuffer;

+      const gl_format fmt = rb->Format;

+      fb->Visual.haveDepthBuffer = GL_TRUE;

+      fb->Visual.depthBits = _mesa_get_format_bits(fmt, GL_DEPTH_BITS);

+   }

+

+   if (fb->Attachment[BUFFER_STENCIL].Renderbuffer) {

+      const struct gl_renderbuffer *rb =

+         fb->Attachment[BUFFER_STENCIL].Renderbuffer;

+      const gl_format fmt = rb->Format;

+      fb->Visual.haveStencilBuffer = GL_TRUE;

+      fb->Visual.stencilBits = _mesa_get_format_bits(fmt, GL_STENCIL_BITS);

+   }

+

+   if (fb->Attachment[BUFFER_ACCUM].Renderbuffer) {

+      const struct gl_renderbuffer *rb =

+         fb->Attachment[BUFFER_ACCUM].Renderbuffer;

+      const gl_format fmt = rb->Format;

+      fb->Visual.haveAccumBuffer = GL_TRUE;

+      fb->Visual.accumRedBits = _mesa_get_format_bits(fmt, GL_RED_BITS);

+      fb->Visual.accumGreenBits = _mesa_get_format_bits(fmt, GL_GREEN_BITS);

+      fb->Visual.accumBlueBits = _mesa_get_format_bits(fmt, GL_BLUE_BITS);

+      fb->Visual.accumAlphaBits = _mesa_get_format_bits(fmt, GL_ALPHA_BITS);

+   }

+

+   compute_depth_max(fb);

+}

+

+

+/**

+ * Update the framebuffer's _DepthBuffer field using the renderbuffer

+ * found at the given attachment index.

+ *

+ * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,

+ * create and install a depth wrapper/adaptor.

+ *

+ * \param fb  the framebuffer whose _DepthBuffer field to update

+ * \param attIndex  indicates the renderbuffer to possibly wrap

+ */

+void

+_mesa_update_depth_buffer(struct gl_context *ctx,

+                          struct gl_framebuffer *fb,

+                          GLuint attIndex)

+{

+   struct gl_renderbuffer *depthRb;

+

+   /* only one possiblity for now */

+   ASSERT(attIndex == BUFFER_DEPTH);

+

+   depthRb = fb->Attachment[attIndex].Renderbuffer;

+

+   if (depthRb && _mesa_is_format_packed_depth_stencil(depthRb->Format)) {

+      /* The attached depth buffer is a GL_DEPTH_STENCIL renderbuffer */

+      if (!fb->_DepthBuffer

+          || fb->_DepthBuffer->Wrapped != depthRb

+          || _mesa_get_format_base_format(fb->_DepthBuffer->Format) != GL_DEPTH_COMPONENT) {

+         /* need to update wrapper */

+         struct gl_renderbuffer *wrapper

+            = _mesa_new_z24_renderbuffer_wrapper(ctx, depthRb);

+         _mesa_reference_renderbuffer(&fb->_DepthBuffer, wrapper);

+         ASSERT(fb->_DepthBuffer->Wrapped == depthRb);

+      }

+   }

+   else {

+      /* depthRb may be null */

+      _mesa_reference_renderbuffer(&fb->_DepthBuffer, depthRb);

+   }

+}

+

+

+/**

+ * Update the framebuffer's _StencilBuffer field using the renderbuffer

+ * found at the given attachment index.

+ *

+ * If that attachment points to a combined GL_DEPTH_STENCIL renderbuffer,

+ * create and install a stencil wrapper/adaptor.

+ *

+ * \param fb  the framebuffer whose _StencilBuffer field to update

+ * \param attIndex  indicates the renderbuffer to possibly wrap

+ */

+void

+_mesa_update_stencil_buffer(struct gl_context *ctx,

+                            struct gl_framebuffer *fb,

+                            GLuint attIndex)

+{

+   struct gl_renderbuffer *stencilRb;

+

+   ASSERT(attIndex == BUFFER_DEPTH ||

+          attIndex == BUFFER_STENCIL);

+

+   stencilRb = fb->Attachment[attIndex].Renderbuffer;

+

+   if (stencilRb && _mesa_is_format_packed_depth_stencil(stencilRb->Format)) {

+      /* The attached stencil buffer is a GL_DEPTH_STENCIL renderbuffer */

+      if (!fb->_StencilBuffer

+          || fb->_StencilBuffer->Wrapped != stencilRb

+          || _mesa_get_format_base_format(fb->_StencilBuffer->Format) != GL_STENCIL_INDEX) {

+         /* need to update wrapper */

+         struct gl_renderbuffer *wrapper

+            = _mesa_new_s8_renderbuffer_wrapper(ctx, stencilRb);

+         _mesa_reference_renderbuffer(&fb->_StencilBuffer, wrapper);

+         ASSERT(fb->_StencilBuffer->Wrapped == stencilRb);

+      }

+   }

+   else {

+      /* stencilRb may be null */

+      _mesa_reference_renderbuffer(&fb->_StencilBuffer, stencilRb);

+   }

+}

+

+

+/*

+ * Example DrawBuffers scenarios:

+ *

+ * 1. glDrawBuffer(GL_FRONT_AND_BACK), fixed-func or shader writes to

+ * "gl_FragColor" or program writes to the "result.color" register:

+ *

+ *   fragment color output   renderbuffer

+ *   ---------------------   ---------------

+ *   color[0]                Front, Back

+ *

+ *

+ * 2. glDrawBuffers(3, [GL_FRONT, GL_AUX0, GL_AUX1]), shader writes to

+ * gl_FragData[i] or program writes to result.color[i] registers:

+ *

+ *   fragment color output   renderbuffer

+ *   ---------------------   ---------------

+ *   color[0]                Front

+ *   color[1]                Aux0

+ *   color[3]                Aux1

+ *

+ *

+ * 3. glDrawBuffers(3, [GL_FRONT, GL_AUX0, GL_AUX1]) and shader writes to

+ * gl_FragColor, or fixed function:

+ *

+ *   fragment color output   renderbuffer

+ *   ---------------------   ---------------

+ *   color[0]                Front, Aux0, Aux1

+ *

+ *

+ * In either case, the list of renderbuffers is stored in the

+ * framebuffer->_ColorDrawBuffers[] array and

+ * framebuffer->_NumColorDrawBuffers indicates the number of buffers.

+ * The renderer (like swrast) has to look at the current fragment shader

+ * to see if it writes to gl_FragColor vs. gl_FragData[i] to determine

+ * how to map color outputs to renderbuffers.

+ *

+ * Note that these two calls are equivalent (for fixed function fragment

+ * shading anyway):

+ *   a)  glDrawBuffer(GL_FRONT_AND_BACK);  (assuming non-stereo framebuffer)

+ *   b)  glDrawBuffers(2, [GL_FRONT_LEFT, GL_BACK_LEFT]);

+ */

+

+

+

+

+/**

+ * Update the (derived) list of color drawing renderbuffer pointers.

+ * Later, when we're rendering we'll loop from 0 to _NumColorDrawBuffers

+ * writing colors.

+ */

+static void

+update_color_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   GLuint output;

+

+   /* set 0th buffer to NULL now in case _NumColorDrawBuffers is zero */

+   fb->_ColorDrawBuffers[0] = NULL;

+

+   for (output = 0; output < fb->_NumColorDrawBuffers; output++) {

+      GLint buf = fb->_ColorDrawBufferIndexes[output];

+      if (buf >= 0) {

+         fb->_ColorDrawBuffers[output] = fb->Attachment[buf].Renderbuffer;

+      }

+      else {

+         fb->_ColorDrawBuffers[output] = NULL;

+      }

+   }

+}

+

+

+/**

+ * Update the (derived) color read renderbuffer pointer.

+ * Unlike the DrawBuffer, we can only read from one (or zero) color buffers.

+ */

+static void

+update_color_read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   (void) ctx;

+   if (fb->_ColorReadBufferIndex == -1 ||

+       fb->DeletePending ||

+       fb->Width == 0 ||

+       fb->Height == 0) {

+      fb->_ColorReadBuffer = NULL; /* legal! */

+   }

+   else {

+      ASSERT(fb->_ColorReadBufferIndex >= 0);

+      ASSERT(fb->_ColorReadBufferIndex < BUFFER_COUNT);

+      fb->_ColorReadBuffer

+         = fb->Attachment[fb->_ColorReadBufferIndex].Renderbuffer;

+   }

+}

+

+

+/**

+ * Update a gl_framebuffer's derived state.

+ *

+ * Specifically, update these framebuffer fields:

+ *    _ColorDrawBuffers

+ *    _NumColorDrawBuffers

+ *    _ColorReadBuffer

+ *    _DepthBuffer

+ *    _StencilBuffer

+ *

+ * If the framebuffer is user-created, make sure it's complete.

+ *

+ * The following functions (at least) can effect framebuffer state:

+ * glReadBuffer, glDrawBuffer, glDrawBuffersARB, glFramebufferRenderbufferEXT,

+ * glRenderbufferStorageEXT.

+ */

+static void

+update_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   if (fb->Name == 0) {

+      /* This is a window-system framebuffer */

+      /* Need to update the FB's GL_DRAW_BUFFER state to match the

+       * context state (GL_READ_BUFFER too).

+       */

+      if (fb->ColorDrawBuffer[0] != ctx->Color.DrawBuffer[0]) {

+         _mesa_drawbuffers(ctx, ctx->Const.MaxDrawBuffers,

+                           ctx->Color.DrawBuffer, NULL);

+      }

+      if (fb->ColorReadBuffer != ctx->Pixel.ReadBuffer) {

+         

+      }

+   }

+   else {

+      /* This is a user-created framebuffer.

+       * Completeness only matters for user-created framebuffers.

+       */

+      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE) {

+         _mesa_test_framebuffer_completeness(ctx, fb);

+      }

+   }

+

+   /* Strictly speaking, we don't need to update the draw-state

+    * if this FB is bound as ctx->ReadBuffer (and conversely, the

+    * read-state if this FB is bound as ctx->DrawBuffer), but no

+    * harm.

+    */

+   update_color_draw_buffers(ctx, fb);

+   update_color_read_buffer(ctx, fb);

+   _mesa_update_depth_buffer(ctx, fb, BUFFER_DEPTH);

+   _mesa_update_stencil_buffer(ctx, fb, BUFFER_STENCIL);

+

+   compute_depth_max(fb);

+}

+

+

+/**

+ * Update state related to the current draw/read framebuffers.

+ */

+void

+_mesa_update_framebuffer(struct gl_context *ctx)

+{

+   struct gl_framebuffer *drawFb;

+   struct gl_framebuffer *readFb;

+

+   assert(ctx);

+   drawFb = ctx->DrawBuffer;

+   readFb = ctx->ReadBuffer;

+

+   update_framebuffer(ctx, drawFb);

+   if (readFb != drawFb)

+      update_framebuffer(ctx, readFb);

+}

+

+

+/**

+ * Check if the renderbuffer for a read operation (glReadPixels, glCopyPixels,

+ * glCopyTex[Sub]Image, etc) exists.

+ * \param format  a basic image format such as GL_RGB, GL_RGBA, GL_ALPHA,

+ *                GL_DEPTH_COMPONENT, etc. or GL_COLOR, GL_DEPTH, GL_STENCIL.

+ * \return GL_TRUE if buffer exists, GL_FALSE otherwise

+ */

+GLboolean

+_mesa_source_buffer_exists(struct gl_context *ctx, GLenum format)

+{

+   const struct gl_renderbuffer_attachment *att = ctx->ReadBuffer->Attachment;

+

+   /* If we don't know the framebuffer status, update it now */

+   if (ctx->ReadBuffer->_Status == 0) {

+      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);

+   }

+

+   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      return GL_FALSE;

+   }

+

+   switch (format) {

+   case GL_COLOR:

+   case GL_RED:

+   case GL_GREEN:

+   case GL_BLUE:

+   case GL_ALPHA:

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_ALPHA:

+   case GL_INTENSITY:

+   case GL_RG:

+   case GL_RGB:

+   case GL_BGR:

+   case GL_RGBA:

+   case GL_BGRA:

+   case GL_ABGR_EXT:

+   case GL_COLOR_INDEX:

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

+      if (ctx->ReadBuffer->_ColorReadBuffer == NULL) {

+         return GL_FALSE;

+      }

+      ASSERT(_mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_RED_BITS) > 0 ||

+             _mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_ALPHA_BITS) > 0 ||

+             _mesa_get_format_bits(ctx->ReadBuffer->_ColorReadBuffer->Format, GL_INDEX_BITS) > 0);

+      break;

+   case GL_DEPTH:

+   case GL_DEPTH_COMPONENT:

+      if (!att[BUFFER_DEPTH].Renderbuffer) {

+         return GL_FALSE;

+      }

+      /*ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);*/

+      break;

+   case GL_STENCIL:

+   case GL_STENCIL_INDEX:

+      if (!att[BUFFER_STENCIL].Renderbuffer) {

+         return GL_FALSE;

+      }

+      /*ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);*/

+      break;

+   case GL_DEPTH_STENCIL_EXT:

+      if (!att[BUFFER_DEPTH].Renderbuffer ||

+          !att[BUFFER_STENCIL].Renderbuffer) {

+         return GL_FALSE;

+      }

+      /*

+      ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);

+      ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);

+      */

+      break;

+   default:

+      _mesa_problem(ctx,

+                    "Unexpected format 0x%x in _mesa_source_buffer_exists",

+                    format);

+      return GL_FALSE;

+   }

+

+   /* OK */

+   return GL_TRUE;

+}

+

+

+/**

+ * As above, but for drawing operations.

+ * XXX could do some code merging w/ above function.

+ */

+GLboolean

+_mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format)

+{

+   const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;

+

+   /* If we don't know the framebuffer status, update it now */

+   if (ctx->DrawBuffer->_Status == 0) {

+      _mesa_test_framebuffer_completeness(ctx, ctx->DrawBuffer);

+   }

+

+   if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      return GL_FALSE;

+   }

+

+   switch (format) {

+   case GL_COLOR:

+   case GL_RED:

+   case GL_GREEN:

+   case GL_BLUE:

+   case GL_ALPHA:

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_ALPHA:

+   case GL_INTENSITY:

+   case GL_RGB:

+   case GL_BGR:

+   case GL_RGBA:

+   case GL_BGRA:

+   case GL_ABGR_EXT:

+   case GL_COLOR_INDEX:

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

+      /* Nothing special since GL_DRAW_BUFFER could be GL_NONE. */

+      /* Could assert that colorbuffer has RedBits > 0 */

+      break;

+   case GL_DEPTH:

+   case GL_DEPTH_COMPONENT:

+      if (!att[BUFFER_DEPTH].Renderbuffer) {

+         return GL_FALSE;

+      }

+      /*ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);*/

+      break;

+   case GL_STENCIL:

+   case GL_STENCIL_INDEX:

+      if (!att[BUFFER_STENCIL].Renderbuffer) {

+         return GL_FALSE;

+      }

+      /*ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);*/

+      break;

+   case GL_DEPTH_STENCIL_EXT:

+      if (!att[BUFFER_DEPTH].Renderbuffer ||

+          !att[BUFFER_STENCIL].Renderbuffer) {

+         return GL_FALSE;

+      }

+      /*

+      ASSERT(att[BUFFER_DEPTH].Renderbuffer->DepthBits > 0);

+      ASSERT(att[BUFFER_STENCIL].Renderbuffer->StencilBits > 0);

+      */

+      break;

+   default:

+      _mesa_problem(ctx,

+                    "Unexpected format 0x%x in _mesa_dest_buffer_exists",

+                    format);

+      return GL_FALSE;

+   }

+

+   /* OK */

+   return GL_TRUE;

+}

+

+

+/**

+ * Used to answer the GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES query.

+ */

+GLenum

+_mesa_get_color_read_format(struct gl_context *ctx)

+{

+   switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {

+   case MESA_FORMAT_ARGB8888:

+      return GL_BGRA;

+   case MESA_FORMAT_RGB565:

+      return GL_BGR;

+   default:

+      return GL_RGBA;

+   }

+}

+

+

+/**

+ * Used to answer the GL_IMPLEMENTATION_COLOR_READ_TYPE_OES query.

+ */

+GLenum

+_mesa_get_color_read_type(struct gl_context *ctx)

+{

+   switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {

+   case MESA_FORMAT_ARGB8888:

+      return GL_UNSIGNED_BYTE;

+   case MESA_FORMAT_RGB565:

+      return GL_UNSIGNED_SHORT_5_6_5_REV;

+   default:

+      return GL_UNSIGNED_BYTE;

+   }

+}

+

+

+/**

+ * Print framebuffer info to stderr, for debugging.

+ */

+void

+_mesa_print_framebuffer(const struct gl_framebuffer *fb)

+{

+   GLuint i;

+

+   fprintf(stderr, "Mesa Framebuffer %u at %p\n", fb->Name, (void *) fb);

+   fprintf(stderr, "  Size: %u x %u  Status: %s\n", fb->Width, fb->Height,

+           _mesa_lookup_enum_by_nr(fb->_Status));

+   fprintf(stderr, "  Attachments:\n");

+

+   for (i = 0; i < BUFFER_COUNT; i++) {

+      const struct gl_renderbuffer_attachment *att = &fb->Attachment[i];

+      if (att->Type == GL_TEXTURE) {

+         const struct gl_texture_image *texImage;

+         fprintf(stderr,

+                 "  %2d: Texture %u, level %u, face %u, slice %u, complete %d\n",

+                 i, att->Texture->Name, att->TextureLevel, att->CubeMapFace,

+                 att->Zoffset, att->Complete);

+         texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];

+         fprintf(stderr, "       Size: %u x %u x %u  Format %s\n",

+                 texImage->Width, texImage->Height, texImage->Depth,

+                 _mesa_get_format_name(texImage->TexFormat));

+      }

+      else if (att->Type == GL_RENDERBUFFER) {

+         fprintf(stderr, "  %2d: Renderbuffer %u, complete %d\n",

+                 i, att->Renderbuffer->Name, att->Complete);

+         fprintf(stderr, "       Size: %u x %u  Format %s\n",

+                 att->Renderbuffer->Width, att->Renderbuffer->Height,

+                 _mesa_get_format_name(att->Renderbuffer->Format));

+      }

+      else {

+         fprintf(stderr, "  %2d: none\n", i);

+      }

+   }

+}

diff --git a/mesalib/src/mesa/main/framebuffer.h b/mesalib/src/mesa/main/framebuffer.h
index 2e9844282..6b705146a 100644
--- a/mesalib/src/mesa/main/framebuffer.h
+++ b/mesalib/src/mesa/main/framebuffer.h
@@ -1,98 +1,101 @@
-/*
- * 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.
- */
-
-
-#ifndef FRAMEBUFFER_H
-#define FRAMEBUFFER_H
-
-#include "mtypes.h"
-
-extern struct gl_framebuffer *
-_mesa_create_framebuffer(const GLvisual *visual);
-
-extern struct gl_framebuffer *
-_mesa_new_framebuffer(GLcontext *ctx, GLuint name);
-
-extern void
-_mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,
-				     const GLvisual *visual);
-
-extern void
-_mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name);
-
-extern void
-_mesa_destroy_framebuffer(struct gl_framebuffer *buffer);
-
-extern void
-_mesa_free_framebuffer_data(struct gl_framebuffer *buffer);
-
-extern void
-_mesa_reference_framebuffer(struct gl_framebuffer **ptr,
-                            struct gl_framebuffer *fb);
-
-extern void
-_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                         GLuint width, GLuint height);
-
-
-extern void
-_mesa_resizebuffers( GLcontext *ctx );
-
-extern void GLAPIENTRY
-_mesa_ResizeBuffersMESA( void );
-
-
-extern void 
-_mesa_update_draw_buffer_bounds(GLcontext *ctx);
-
-extern void
-_mesa_update_framebuffer_visual(struct gl_framebuffer *fb);
-
-extern void
-_mesa_update_depth_buffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                            GLuint attIndex);
-
-extern void
-_mesa_update_stencil_buffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                            GLuint attIndex);
-
-extern void
-_mesa_update_framebuffer(GLcontext *ctx);
-
-extern GLboolean
-_mesa_source_buffer_exists(GLcontext *ctx, GLenum format);
-
-extern GLboolean
-_mesa_dest_buffer_exists(GLcontext *ctx, GLenum format);
-
-extern GLenum
-_mesa_get_color_read_type(GLcontext *ctx);
-
-extern GLenum
-_mesa_get_color_read_format(GLcontext *ctx);
-
-extern void
-_mesa_print_framebuffer(const struct gl_framebuffer *fb);
-
-#endif /* FRAMEBUFFER_H */
+/*

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

+ */

+

+

+#ifndef FRAMEBUFFER_H

+#define FRAMEBUFFER_H

+

+#include "glheader.h"

+

+struct gl_config;

+struct gl_context;

+

+extern struct gl_framebuffer *

+_mesa_create_framebuffer(const struct gl_config *visual);

+

+extern struct gl_framebuffer *

+_mesa_new_framebuffer(struct gl_context *ctx, GLuint name);

+

+extern void

+_mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,

+				     const struct gl_config *visual);

+

+extern void

+_mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name);

+

+extern void

+_mesa_destroy_framebuffer(struct gl_framebuffer *buffer);

+

+extern void

+_mesa_free_framebuffer_data(struct gl_framebuffer *buffer);

+

+extern void

+_mesa_reference_framebuffer(struct gl_framebuffer **ptr,

+                            struct gl_framebuffer *fb);

+

+extern void

+_mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                         GLuint width, GLuint height);

+

+

+extern void

+_mesa_resizebuffers( struct gl_context *ctx );

+

+extern void GLAPIENTRY

+_mesa_ResizeBuffersMESA( void );

+

+

+extern void 

+_mesa_update_draw_buffer_bounds(struct gl_context *ctx);

+

+extern void

+_mesa_update_framebuffer_visual(struct gl_framebuffer *fb);

+

+extern void

+_mesa_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                            GLuint attIndex);

+

+extern void

+_mesa_update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                            GLuint attIndex);

+

+extern void

+_mesa_update_framebuffer(struct gl_context *ctx);

+

+extern GLboolean

+_mesa_source_buffer_exists(struct gl_context *ctx, GLenum format);

+

+extern GLboolean

+_mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format);

+

+extern GLenum

+_mesa_get_color_read_type(struct gl_context *ctx);

+

+extern GLenum

+_mesa_get_color_read_format(struct gl_context *ctx);

+

+extern void

+_mesa_print_framebuffer(const struct gl_framebuffer *fb);

+

+#endif /* FRAMEBUFFER_H */

diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 2062134a3..cb6880a6f 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -1,2472 +1,2464 @@
-/*
- * Copyright (C) 2010  Brian Paul   All Rights Reserved.
- * Copyright (C) 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.
- *
- * Author: Kristian Høgsberg <krh@bitplanet.net>
- */
-
-#include "glheader.h"
-#include "context.h"
-#include "enable.h"
-#include "enums.h"
-#include "extensions.h"
-#include "get.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "state.h"
-#include "texcompress.h"
-#include "framebuffer.h"
-
-/* This is a table driven implemetation of the glGet*v() functions.
- * The basic idea is that most getters just look up an int somewhere
- * in GLcontext and then convert it to a bool or float according to
- * which of glGetIntegerv() glGetBooleanv() etc is being called.
- * Instead of generating code to do this, we can just record the enum
- * value and the offset into GLcontext in an array of structs.  Then
- * in glGet*(), we lookup the struct for the enum in question, and use
- * the offset to get the int we need.
- *
- * Sometimes we need to look up a float, a boolean, a bit in a
- * bitfield, a matrix or other types instead, so we need to track the
- * type of the value in GLcontext.  And sometimes the value isn't in
- * GLcontext but in the drawbuffer, the array object, current texture
- * unit, or maybe it's a computed value.  So we need to also track
- * where or how to find the value.  Finally, we sometimes need to
- * check that one of a number of extensions are enabled, the GL
- * version or flush or call _mesa_update_state().  This is done by
- * attaching optional extra information to the value description
- * struct, it's sort of like an array of opcodes that describe extra
- * checks or actions.
- *
- * Putting all this together we end up with struct value_desc below,
- * and with a couple of macros to help, the table of struct value_desc
- * is about as concise as the specification in the old python script.
- */
-
-#undef CONST
-
-#define FLOAT_TO_BOOLEAN(X)   ( (X) ? GL_TRUE : GL_FALSE )
-#define FLOAT_TO_FIXED(F)     ( ((F) * 65536.0f > INT_MAX) ? INT_MAX : \
-                                ((F) * 65536.0f < INT_MIN) ? INT_MIN : \
-                                (GLint) ((F) * 65536.0f) )
-
-#define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
-#define INT_TO_FIXED(I)       ( ((I) > SHRT_MAX) ? INT_MAX : \
-                                ((I) < SHRT_MIN) ? INT_MIN : \
-                                (GLint) ((I) * 65536) )
-
-#define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )
-#define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
-
-#define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
-#define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
-#define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
-#define BOOLEAN_TO_FIXED(B)   ( (GLint) ((B) ? 1 : 0) << 16 )
-
-#define ENUM_TO_INT64(E)      ( (GLint64) (E) )
-#define ENUM_TO_FIXED(E)      (E)
-
-enum value_type {
-   TYPE_INVALID,
-   TYPE_API_MASK,
-   TYPE_INT,
-   TYPE_INT_2,
-   TYPE_INT_3,
-   TYPE_INT_4,
-   TYPE_INT_N,
-   TYPE_INT64,
-   TYPE_ENUM,
-   TYPE_ENUM_2,
-   TYPE_BOOLEAN,
-   TYPE_BIT_0,
-   TYPE_BIT_1,
-   TYPE_BIT_2,
-   TYPE_BIT_3,
-   TYPE_BIT_4,
-   TYPE_BIT_5,
-   TYPE_FLOAT,
-   TYPE_FLOAT_2,
-   TYPE_FLOAT_3,
-   TYPE_FLOAT_4,
-   TYPE_FLOATN,
-   TYPE_FLOATN_2,
-   TYPE_FLOATN_3,
-   TYPE_FLOATN_4,
-   TYPE_DOUBLEN,
-   TYPE_MATRIX,
-   TYPE_MATRIX_T,
-   TYPE_CONST
-};
-
-enum value_location {
-   LOC_BUFFER,
-   LOC_CONTEXT,
-   LOC_ARRAY,
-   LOC_TEXUNIT,
-   LOC_CUSTOM
-};
-
-enum value_extra {
-   EXTRA_END = 0x8000,
-   EXTRA_VERSION_30,
-   EXTRA_VERSION_31,
-   EXTRA_VERSION_32,
-   EXTRA_VERSION_ES2,
-   EXTRA_NEW_BUFFERS, 
-   EXTRA_VALID_DRAW_BUFFER,
-   EXTRA_VALID_TEXTURE_UNIT,
-   EXTRA_FLUSH_CURRENT,
-};
-
-#define NO_EXTRA NULL
-#define NO_OFFSET 0
-
-struct value_desc {
-   GLenum pname;
-   GLubyte location;  /**< enum value_location */
-   GLubyte type;      /**< enum value_type */
-   int offset;
-   const int *extra;
-};
-
-union value {
-   GLfloat value_float;
-   GLfloat value_float_4[4];
-   GLmatrix *value_matrix;
-   GLint value_int;
-   GLint value_int_4[4];
-   GLint64 value_int64;
-   GLenum value_enum;
-
-   /* Sigh, see GL_COMPRESSED_TEXTURE_FORMATS_ARB handling */
-   struct {
-      GLint n, ints[100];
-   } value_int_n;
-   GLboolean value_bool;
-};
-
-#define BUFFER_FIELD(field, type) \
-   LOC_BUFFER, type, offsetof(struct gl_framebuffer, field)
-#define CONTEXT_FIELD(field, type) \
-   LOC_CONTEXT, type, offsetof(GLcontext, field)
-#define ARRAY_FIELD(field, type) \
-   LOC_ARRAY, type, offsetof(struct gl_array_object, field)
-#define CONST(value) \
-   LOC_CONTEXT, TYPE_CONST, value
-
-#define BUFFER_INT(field) BUFFER_FIELD(field, TYPE_INT)
-#define BUFFER_ENUM(field) BUFFER_FIELD(field, TYPE_ENUM)
-
-#define CONTEXT_INT(field) CONTEXT_FIELD(field, TYPE_INT)
-#define CONTEXT_INT2(field) CONTEXT_FIELD(field, TYPE_INT_2)
-#define CONTEXT_INT64(field) CONTEXT_FIELD(field, TYPE_INT64)
-#define CONTEXT_ENUM(field) CONTEXT_FIELD(field, TYPE_ENUM)
-#define CONTEXT_ENUM2(field) CONTEXT_FIELD(field, TYPE_ENUM_2)
-#define CONTEXT_BOOL(field) CONTEXT_FIELD(field, TYPE_BOOLEAN)
-#define CONTEXT_BIT0(field) CONTEXT_FIELD(field, TYPE_BIT_0)
-#define CONTEXT_BIT1(field) CONTEXT_FIELD(field, TYPE_BIT_1)
-#define CONTEXT_BIT2(field) CONTEXT_FIELD(field, TYPE_BIT_2)
-#define CONTEXT_BIT3(field) CONTEXT_FIELD(field, TYPE_BIT_3)
-#define CONTEXT_BIT4(field) CONTEXT_FIELD(field, TYPE_BIT_4)
-#define CONTEXT_BIT5(field) CONTEXT_FIELD(field, TYPE_BIT_5)
-#define CONTEXT_FLOAT(field) CONTEXT_FIELD(field, TYPE_FLOAT)
-#define CONTEXT_FLOAT2(field) CONTEXT_FIELD(field, TYPE_FLOAT_2)
-#define CONTEXT_FLOAT3(field) CONTEXT_FIELD(field, TYPE_FLOAT_3)
-#define CONTEXT_FLOAT4(field) CONTEXT_FIELD(field, TYPE_FLOAT_4)
-#define CONTEXT_MATRIX(field) CONTEXT_FIELD(field, TYPE_MATRIX)
-#define CONTEXT_MATRIX_T(field) CONTEXT_FIELD(field, TYPE_MATRIX_T)
-
-#define ARRAY_INT(field) ARRAY_FIELD(field, TYPE_INT)
-#define ARRAY_ENUM(field) ARRAY_FIELD(field, TYPE_ENUM)
-#define ARRAY_BOOL(field) ARRAY_FIELD(field, TYPE_BOOLEAN)
-
-#define EXT(f)					\
-   offsetof(struct gl_extensions, f)
-
-#define EXTRA_EXT(e)				\
-   static const int extra_##e[] = {		\
-      EXT(e), EXTRA_END				\
-   }
-
-#define EXTRA_EXT2(e1, e2)			\
-   static const int extra_##e1##_##e2[] = {	\
-      EXT(e1), EXT(e2), EXTRA_END		\
-   }
-
-/* The 'extra' mechanism is a way to specify extra checks (such as
- * extensions or specific gl versions) or actions (flush current, new
- * buffers) that we need to do before looking up an enum.  We need to
- * declare them all up front so we can refer to them in the value_desc
- * structs below. */
-
-static const int extra_new_buffers[] = {
-   EXTRA_NEW_BUFFERS,
-   EXTRA_END
-};
-
-static const int extra_valid_draw_buffer[] = {
-   EXTRA_VALID_DRAW_BUFFER,
-   EXTRA_END
-};
-
-static const int extra_valid_texture_unit[] = {
-   EXTRA_VALID_TEXTURE_UNIT,
-   EXTRA_END
-};
-
-static const int extra_flush_current_valid_texture_unit[] = {
-   EXTRA_FLUSH_CURRENT,
-   EXTRA_VALID_TEXTURE_UNIT,
-   EXTRA_END
-};
-
-static const int extra_flush_current[] = {
-   EXTRA_FLUSH_CURRENT,
-   EXTRA_END
-};
-
-static const int extra_new_buffers_OES_read_format[] = {
-   EXTRA_NEW_BUFFERS,
-   EXT(OES_read_format),
-   EXTRA_END
-};
-
-static const int extra_EXT_secondary_color_flush_current[] = {
-   EXT(EXT_secondary_color),
-   EXTRA_FLUSH_CURRENT,
-   EXTRA_END
-};
-
-static const int extra_EXT_fog_coord_flush_current[] = {
-   EXT(EXT_fog_coord),
-   EXTRA_FLUSH_CURRENT,
-   EXTRA_END
-};
-
-EXTRA_EXT(ARB_multitexture);
-EXTRA_EXT(ARB_texture_cube_map);
-EXTRA_EXT(MESA_texture_array);
-EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program);
-EXTRA_EXT(EXT_secondary_color);
-EXTRA_EXT(EXT_fog_coord);
-EXTRA_EXT(EXT_texture_lod_bias);
-EXTRA_EXT(EXT_texture_filter_anisotropic);
-EXTRA_EXT(IBM_rasterpos_clip);
-EXTRA_EXT(NV_point_sprite);
-EXTRA_EXT(SGIS_generate_mipmap);
-EXTRA_EXT(NV_vertex_program);
-EXTRA_EXT(NV_fragment_program);
-EXTRA_EXT(NV_texture_rectangle);
-EXTRA_EXT(EXT_stencil_two_side);
-EXTRA_EXT(NV_light_max_exponent);
-EXTRA_EXT(EXT_convolution);
-EXTRA_EXT(EXT_histogram);
-EXTRA_EXT(SGI_color_table);
-EXTRA_EXT(SGI_texture_color_table);
-EXTRA_EXT(EXT_depth_bounds_test);
-EXTRA_EXT(ARB_depth_clamp);
-EXTRA_EXT(ATI_fragment_shader);
-EXTRA_EXT(EXT_framebuffer_blit);
-EXTRA_EXT(ARB_shader_objects);
-EXTRA_EXT(EXT_provoking_vertex);
-EXTRA_EXT(ARB_fragment_shader);
-EXTRA_EXT(ARB_fragment_program);
-EXTRA_EXT(ARB_framebuffer_object);
-EXTRA_EXT(EXT_framebuffer_object);
-EXTRA_EXT(APPLE_vertex_array_object);
-EXTRA_EXT(ARB_seamless_cube_map);
-EXTRA_EXT(EXT_compiled_vertex_array);
-EXTRA_EXT(ARB_sync);
-EXTRA_EXT(ARB_vertex_shader);
-EXTRA_EXT(EXT_transform_feedback);
-EXTRA_EXT(ARB_transform_feedback2);
-EXTRA_EXT(EXT_pixel_buffer_object);
-EXTRA_EXT(ARB_vertex_program);
-EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);
-EXTRA_EXT2(ARB_fragment_program, NV_fragment_program);
-EXTRA_EXT2(ARB_vertex_program, NV_vertex_program);
-EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);
-EXTRA_EXT(ARB_vertex_buffer_object);
-EXTRA_EXT(ARB_geometry_shader4);
-
-static const int
-extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {
-   EXT(ARB_vertex_program),
-   EXT(ARB_fragment_program),
-   EXT(NV_vertex_program),
-   EXTRA_END
-};
-
-static const int
-extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {
-   EXT(NV_vertex_program),
-   EXT(ARB_vertex_program),
-   EXT(ARB_fragment_program),
-   EXT(NV_vertex_program),
-   EXTRA_END
-};
-
-static const int extra_version_30[] = { EXTRA_VERSION_30, EXTRA_END };
-static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END };
-static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END };
-
-static const int
-extra_ARB_vertex_program_version_es2[] = {
-   EXT(ARB_vertex_program),
-   EXTRA_VERSION_ES2,
-   EXTRA_END
-};
-
-#define API_OPENGL_BIT (1 << API_OPENGL)
-#define API_OPENGLES_BIT (1 << API_OPENGLES)
-#define API_OPENGLES2_BIT (1 << API_OPENGLES2)
-
-/* This is the big table describing all the enums we accept in
- * glGet*v().  The table is partitioned into six parts: enums
- * understood by all GL APIs (OpenGL, GLES and GLES2), enums shared
- * between OpenGL and GLES, enums exclusive to GLES, etc for the
- * remaining combinations.  When we add the enums to the hash table in
- * _mesa_init_get_hash(), we only add the enums for the API we're
- * instantiating and the different sections are guarded by #if
- * FEATURE_GL etc to make sure we only compile in the enums we may
- * need. */
-
-static const struct value_desc values[] = {
-   /* Enums shared between OpenGL, GLES1 and GLES2 */
-   { 0, 0, TYPE_API_MASK,
-     API_OPENGL_BIT | API_OPENGLES_BIT | API_OPENGLES2_BIT, NO_EXTRA},
-   { GL_ALPHA_BITS, BUFFER_INT(Visual.alphaBits), extra_new_buffers },
-   { GL_BLEND, CONTEXT_BIT0(Color.BlendEnabled), NO_EXTRA },
-   { GL_BLEND_SRC, CONTEXT_ENUM(Color.BlendSrcRGB), NO_EXTRA },
-   { GL_BLUE_BITS, BUFFER_INT(Visual.blueBits), extra_new_buffers },
-   { GL_COLOR_CLEAR_VALUE, CONTEXT_FIELD(Color.ClearColor[0], TYPE_FLOATN_4), NO_EXTRA },
-   { GL_COLOR_WRITEMASK, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
-   { GL_CULL_FACE, CONTEXT_BOOL(Polygon.CullFlag), NO_EXTRA },
-   { GL_CULL_FACE_MODE, CONTEXT_ENUM(Polygon.CullFaceMode), NO_EXTRA },
-   { GL_DEPTH_BITS, BUFFER_INT(Visual.depthBits), NO_EXTRA },
-   { GL_DEPTH_CLEAR_VALUE, CONTEXT_FIELD(Depth.Clear, TYPE_DOUBLEN), NO_EXTRA },
-   { GL_DEPTH_FUNC, CONTEXT_ENUM(Depth.Func), NO_EXTRA },
-   { GL_DEPTH_RANGE, CONTEXT_FIELD(Viewport.Near, TYPE_FLOATN_2), NO_EXTRA },
-   { GL_DEPTH_TEST, CONTEXT_BOOL(Depth.Test), NO_EXTRA },
-   { GL_DEPTH_WRITEMASK, CONTEXT_BOOL(Depth.Mask), NO_EXTRA },
-   { GL_DITHER, CONTEXT_BOOL(Color.DitherFlag), NO_EXTRA },
-   { GL_FRONT_FACE, CONTEXT_ENUM(Polygon.FrontFace), NO_EXTRA },
-   { GL_GREEN_BITS, BUFFER_INT(Visual.greenBits), extra_new_buffers },
-   { GL_LINE_WIDTH, CONTEXT_FLOAT(Line.Width), NO_EXTRA },
-   { GL_ALIASED_LINE_WIDTH_RANGE, CONTEXT_FLOAT2(Const.MinLineWidth), NO_EXTRA },
-   { GL_MAX_ELEMENTS_VERTICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },
-   { GL_MAX_ELEMENTS_INDICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },
-   { GL_MAX_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.MaxTextureLevels), NO_EXTRA },
-   { GL_MAX_VIEWPORT_DIMS, CONTEXT_INT2(Const.MaxViewportWidth), NO_EXTRA },
-   { GL_PACK_ALIGNMENT, CONTEXT_INT(Pack.Alignment), NO_EXTRA },
-   { GL_ALIASED_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSize), NO_EXTRA },
-   { GL_POLYGON_OFFSET_FACTOR, CONTEXT_FLOAT(Polygon.OffsetFactor ), NO_EXTRA },
-   { GL_POLYGON_OFFSET_UNITS, CONTEXT_FLOAT(Polygon.OffsetUnits ), NO_EXTRA },
-   { GL_POLYGON_OFFSET_FILL, CONTEXT_BOOL(Polygon.OffsetFill), NO_EXTRA },
-   { GL_RED_BITS, BUFFER_INT(Visual.redBits), extra_new_buffers },
-   { GL_SCISSOR_BOX, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
-   { GL_SCISSOR_TEST, CONTEXT_BOOL(Scissor.Enabled), NO_EXTRA },
-   { GL_STENCIL_BITS, BUFFER_INT(Visual.stencilBits), NO_EXTRA },
-   { GL_STENCIL_CLEAR_VALUE, CONTEXT_INT(Stencil.Clear), NO_EXTRA },
-   { GL_STENCIL_FAIL, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
-   { GL_STENCIL_FUNC, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
-   { GL_STENCIL_PASS_DEPTH_FAIL, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
-   { GL_STENCIL_PASS_DEPTH_PASS, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
-   { GL_STENCIL_REF, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
-   { GL_STENCIL_TEST, CONTEXT_BOOL(Stencil.Enabled), NO_EXTRA },
-   { GL_STENCIL_VALUE_MASK, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
-   { GL_STENCIL_WRITEMASK, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
-   { GL_SUBPIXEL_BITS, CONTEXT_INT(Const.SubPixelBits), NO_EXTRA },
-   { GL_TEXTURE_BINDING_2D, LOC_CUSTOM, TYPE_INT, TEXTURE_2D_INDEX, NO_EXTRA },
-   { GL_UNPACK_ALIGNMENT, CONTEXT_INT(Unpack.Alignment), NO_EXTRA },
-   { GL_VIEWPORT, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },
-
-   /* GL_ARB_multitexture */
-   { GL_ACTIVE_TEXTURE_ARB,
-     LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },
-
-   /* Note that all the OES_* extensions require that the Mesa "struct
-    * gl_extensions" include a member with the name of the extension.
-    * That structure does not yet include OES extensions (and we're
-    * not sure whether it will).  If it does, all the OES_*
-    * extensions below should mark the dependency. */
-
-   /* GL_ARB_texture_cube_map */
-   { GL_TEXTURE_BINDING_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_INT,
-     TEXTURE_CUBE_INDEX, extra_ARB_texture_cube_map },
-   { GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.MaxCubeTextureLevels),
-     extra_ARB_texture_cube_map }, /* XXX: OES_texture_cube_map */
-
-   /* XXX: OES_blend_subtract */
-   { GL_BLEND_SRC_RGB_EXT, CONTEXT_ENUM(Color.BlendSrcRGB), NO_EXTRA },
-   { GL_BLEND_DST_RGB_EXT, CONTEXT_ENUM(Color.BlendDstRGB), NO_EXTRA },
-   { GL_BLEND_SRC_ALPHA_EXT, CONTEXT_ENUM(Color.BlendSrcA), NO_EXTRA },
-   { GL_BLEND_DST_ALPHA_EXT, CONTEXT_ENUM(Color.BlendDstA), NO_EXTRA },
-
-   /* GL_BLEND_EQUATION_RGB, which is what we're really after, is
-    * defined identically to GL_BLEND_EQUATION. */
-   { GL_BLEND_EQUATION, CONTEXT_ENUM(Color.BlendEquationRGB), NO_EXTRA },
-   { GL_BLEND_EQUATION_ALPHA_EXT, CONTEXT_ENUM(Color.BlendEquationA), NO_EXTRA },
-
-   /* GL_ARB_texture_compression */
-   { GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
-   { GL_COMPRESSED_TEXTURE_FORMATS_ARB, LOC_CUSTOM, TYPE_INT_N, 0, NO_EXTRA },
-
-   /* GL_ARB_multisample */
-   { GL_SAMPLE_ALPHA_TO_COVERAGE_ARB,
-     CONTEXT_BOOL(Multisample.SampleAlphaToCoverage), NO_EXTRA },
-   { GL_SAMPLE_COVERAGE_ARB, CONTEXT_BOOL(Multisample.SampleCoverage), NO_EXTRA },
-   { GL_SAMPLE_COVERAGE_VALUE_ARB,
-     CONTEXT_FLOAT(Multisample.SampleCoverageValue), NO_EXTRA },
-   { GL_SAMPLE_COVERAGE_INVERT_ARB,
-     CONTEXT_BOOL(Multisample.SampleCoverageInvert), NO_EXTRA },
-   { GL_SAMPLE_BUFFERS_ARB, BUFFER_INT(Visual.sampleBuffers), NO_EXTRA },
-   { GL_SAMPLES_ARB, BUFFER_INT(Visual.samples), NO_EXTRA },
-
-   /* GL_SGIS_generate_mipmap */
-   { GL_GENERATE_MIPMAP_HINT_SGIS, CONTEXT_ENUM(Hint.GenerateMipmap),
-     extra_SGIS_generate_mipmap },
-
-   /* GL_ARB_vertex_buffer_object */
-   { GL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
-
-   /* GL_ARB_vertex_buffer_object */
-   /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported */
-   { GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0,
-     extra_ARB_vertex_buffer_object },
-
-   /* GL_OES_read_format */
-   { GL_IMPLEMENTATION_COLOR_READ_TYPE_OES, LOC_CUSTOM, TYPE_INT, 0,
-     extra_new_buffers_OES_read_format },
-   { GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES, LOC_CUSTOM, TYPE_INT, 0,
-     extra_new_buffers_OES_read_format },
-
-   /* GL_EXT_framebuffer_object */
-   { GL_FRAMEBUFFER_BINDING_EXT, BUFFER_INT(Name),
-     extra_EXT_framebuffer_object },
-   { GL_RENDERBUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
-     extra_EXT_framebuffer_object },
-   { GL_MAX_RENDERBUFFER_SIZE_EXT, CONTEXT_INT(Const.MaxRenderbufferSize),
-     extra_EXT_framebuffer_object },
-
-   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's
-    * GLSL: */
-   { GL_MAX_CLIP_PLANES, CONTEXT_INT(Const.MaxClipPlanes), NO_EXTRA },
-
-#if FEATURE_GL || FEATURE_ES1
-   /* Enums in OpenGL and GLES1 */
-   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES_BIT, NO_EXTRA },
-   { GL_LIGHT0, CONTEXT_BOOL(Light.Light[0].Enabled), NO_EXTRA },
-   { GL_LIGHT1, CONTEXT_BOOL(Light.Light[1].Enabled), NO_EXTRA },
-   { GL_LIGHT2, CONTEXT_BOOL(Light.Light[2].Enabled), NO_EXTRA },
-   { GL_LIGHT3, CONTEXT_BOOL(Light.Light[3].Enabled), NO_EXTRA },
-   { GL_LIGHT4, CONTEXT_BOOL(Light.Light[4].Enabled), NO_EXTRA },
-   { GL_LIGHT5, CONTEXT_BOOL(Light.Light[5].Enabled), NO_EXTRA },
-   { GL_LIGHT6, CONTEXT_BOOL(Light.Light[6].Enabled), NO_EXTRA },
-   { GL_LIGHT7, CONTEXT_BOOL(Light.Light[7].Enabled), NO_EXTRA },
-   { GL_LIGHTING, CONTEXT_BOOL(Light.Enabled), NO_EXTRA },
-   { GL_LIGHT_MODEL_AMBIENT,
-     CONTEXT_FIELD(Light.Model.Ambient[0], TYPE_FLOATN_4), NO_EXTRA },
-   { GL_LIGHT_MODEL_TWO_SIDE, CONTEXT_BOOL(Light.Model.TwoSide), NO_EXTRA },
-   { GL_ALPHA_TEST, CONTEXT_BOOL(Color.AlphaEnabled), NO_EXTRA },
-   { GL_ALPHA_TEST_FUNC, CONTEXT_ENUM(Color.AlphaFunc), NO_EXTRA },
-   { GL_ALPHA_TEST_REF, CONTEXT_FIELD(Color.AlphaRef, TYPE_FLOATN), NO_EXTRA },
-   { GL_BLEND_DST, CONTEXT_ENUM(Color.BlendDstRGB), NO_EXTRA },
-   { GL_CLIP_PLANE0, CONTEXT_BIT0(Transform.ClipPlanesEnabled), NO_EXTRA },
-   { GL_CLIP_PLANE1, CONTEXT_BIT1(Transform.ClipPlanesEnabled), NO_EXTRA },
-   { GL_CLIP_PLANE2, CONTEXT_BIT2(Transform.ClipPlanesEnabled), NO_EXTRA },
-   { GL_CLIP_PLANE3, CONTEXT_BIT3(Transform.ClipPlanesEnabled), NO_EXTRA },
-   { GL_CLIP_PLANE4, CONTEXT_BIT4(Transform.ClipPlanesEnabled), NO_EXTRA },
-   { GL_CLIP_PLANE5, CONTEXT_BIT5(Transform.ClipPlanesEnabled), NO_EXTRA },
-   { GL_COLOR_MATERIAL, CONTEXT_BOOL(Light.ColorMaterialEnabled), NO_EXTRA },
-   { GL_CURRENT_COLOR,
-     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR0][0], TYPE_FLOATN_4),
-     extra_flush_current },
-   { GL_CURRENT_NORMAL,
-     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_NORMAL][0], TYPE_FLOATN_3),
-     extra_flush_current },
-   { GL_CURRENT_TEXTURE_COORDS, LOC_CUSTOM, TYPE_FLOAT_4, 0,
-     extra_flush_current_valid_texture_unit },
-   { GL_DISTANCE_ATTENUATION_EXT, CONTEXT_FLOAT3(Point.Params[0]), NO_EXTRA },
-   { GL_FOG, CONTEXT_BOOL(Fog.Enabled), NO_EXTRA },
-   { GL_FOG_COLOR, CONTEXT_FIELD(Fog.Color[0], TYPE_FLOATN_4), NO_EXTRA },
-   { GL_FOG_DENSITY, CONTEXT_FLOAT(Fog.Density), NO_EXTRA },
-   { GL_FOG_END, CONTEXT_FLOAT(Fog.End), NO_EXTRA },
-   { GL_FOG_HINT, CONTEXT_ENUM(Hint.Fog), NO_EXTRA },
-   { GL_FOG_MODE, CONTEXT_ENUM(Fog.Mode), NO_EXTRA },
-   { GL_FOG_START, CONTEXT_FLOAT(Fog.Start), NO_EXTRA },
-   { GL_LINE_SMOOTH, CONTEXT_BOOL(Line.SmoothFlag), NO_EXTRA },
-   { GL_LINE_SMOOTH_HINT, CONTEXT_ENUM(Hint.LineSmooth), NO_EXTRA },
-   { GL_LINE_WIDTH_RANGE, CONTEXT_FLOAT2(Const.MinLineWidthAA), NO_EXTRA },
-   { GL_COLOR_LOGIC_OP, CONTEXT_BOOL(Color.ColorLogicOpEnabled), NO_EXTRA },
-   { GL_LOGIC_OP_MODE, CONTEXT_ENUM(Color.LogicOp), NO_EXTRA },
-   { GL_MATRIX_MODE, CONTEXT_ENUM(Transform.MatrixMode), NO_EXTRA },
-   { GL_MAX_MODELVIEW_STACK_DEPTH, CONST(MAX_MODELVIEW_STACK_DEPTH), NO_EXTRA },
-   { GL_MAX_PROJECTION_STACK_DEPTH, CONST(MAX_PROJECTION_STACK_DEPTH), NO_EXTRA },
-   { GL_MAX_TEXTURE_STACK_DEPTH, CONST(MAX_TEXTURE_STACK_DEPTH), NO_EXTRA },
-   { GL_MODELVIEW_MATRIX, CONTEXT_MATRIX(ModelviewMatrixStack.Top), NO_EXTRA },
-   { GL_MODELVIEW_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, ModelviewMatrixStack.Depth), NO_EXTRA },
-   { GL_NORMALIZE, CONTEXT_BOOL(Transform.Normalize), NO_EXTRA },
-   { GL_PACK_SKIP_IMAGES_EXT, CONTEXT_INT(Pack.SkipImages), NO_EXTRA },
-   { GL_PERSPECTIVE_CORRECTION_HINT, CONTEXT_ENUM(Hint.PerspectiveCorrection), NO_EXTRA },
-   { GL_POINT_SIZE, CONTEXT_FLOAT(Point.Size), NO_EXTRA },
-   { GL_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSizeAA), NO_EXTRA },
-   { GL_POINT_SMOOTH, CONTEXT_BOOL(Point.SmoothFlag), NO_EXTRA },
-   { GL_POINT_SMOOTH_HINT, CONTEXT_ENUM(Hint.PointSmooth), NO_EXTRA },
-   { GL_POINT_SIZE_MIN_EXT, CONTEXT_FLOAT(Point.MinSize), NO_EXTRA },
-   { GL_POINT_SIZE_MAX_EXT, CONTEXT_FLOAT(Point.MaxSize), NO_EXTRA },
-   { GL_POINT_FADE_THRESHOLD_SIZE_EXT, CONTEXT_FLOAT(Point.Threshold), NO_EXTRA },
-   { GL_PROJECTION_MATRIX, CONTEXT_MATRIX(ProjectionMatrixStack.Top), NO_EXTRA },
-   { GL_PROJECTION_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, ProjectionMatrixStack.Depth), NO_EXTRA },
-   { GL_RESCALE_NORMAL, CONTEXT_BOOL(Transform.RescaleNormals), NO_EXTRA },
-   { GL_SHADE_MODEL, CONTEXT_ENUM(Light.ShadeModel), NO_EXTRA },
-   { GL_TEXTURE_2D, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
-   { GL_TEXTURE_MATRIX, LOC_CUSTOM, TYPE_MATRIX, 0, extra_valid_texture_unit },
-   { GL_TEXTURE_STACK_DEPTH, LOC_CUSTOM, TYPE_INT, 0,
-     extra_valid_texture_unit  },
-
-   { GL_VERTEX_ARRAY, ARRAY_BOOL(Vertex.Enabled), NO_EXTRA },
-   { GL_VERTEX_ARRAY_SIZE, ARRAY_INT(Vertex.Size), NO_EXTRA },
-   { GL_VERTEX_ARRAY_TYPE, ARRAY_ENUM(Vertex.Type), NO_EXTRA },
-   { GL_VERTEX_ARRAY_STRIDE, ARRAY_INT(Vertex.Stride), NO_EXTRA },
-   { GL_NORMAL_ARRAY, ARRAY_ENUM(Normal.Enabled), NO_EXTRA },
-   { GL_NORMAL_ARRAY_TYPE, ARRAY_ENUM(Normal.Type), NO_EXTRA },
-   { GL_NORMAL_ARRAY_STRIDE, ARRAY_INT(Normal.Stride), NO_EXTRA },
-   { GL_COLOR_ARRAY, ARRAY_BOOL(Color.Enabled), NO_EXTRA },
-   { GL_COLOR_ARRAY_SIZE, ARRAY_INT(Color.Size), NO_EXTRA },
-   { GL_COLOR_ARRAY_TYPE, ARRAY_ENUM(Color.Type), NO_EXTRA },
-   { GL_COLOR_ARRAY_STRIDE, ARRAY_INT(Color.Stride), NO_EXTRA },
-   { GL_TEXTURE_COORD_ARRAY,
-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Enabled), NO_EXTRA },
-   { GL_TEXTURE_COORD_ARRAY_SIZE,
-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Size), NO_EXTRA },
-   { GL_TEXTURE_COORD_ARRAY_TYPE,
-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Type), NO_EXTRA },
-   { GL_TEXTURE_COORD_ARRAY_STRIDE,
-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Stride), NO_EXTRA },
-
-   /* GL_ARB_multitexture */
-   { GL_MAX_TEXTURE_UNITS_ARB,
-     CONTEXT_INT(Const.MaxTextureUnits), extra_ARB_multitexture },
-   { GL_CLIENT_ACTIVE_TEXTURE_ARB,
-     LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },
-
-   /* GL_ARB_texture_cube_map */
-   { GL_TEXTURE_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
-   /* S, T, and R are always set at the same time */
-   { GL_TEXTURE_GEN_STR_OES, LOC_TEXUNIT, TYPE_BIT_0,
-     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
-
-   /* GL_ARB_multisample */
-   { GL_MULTISAMPLE_ARB, CONTEXT_BOOL(Multisample.Enabled), NO_EXTRA },
-   { GL_SAMPLE_ALPHA_TO_ONE_ARB, CONTEXT_BOOL(Multisample.SampleAlphaToOne), NO_EXTRA },
-
-   /* GL_ARB_vertex_buffer_object */
-   { GL_VERTEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, Vertex.BufferObj), NO_EXTRA },
-   { GL_NORMAL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, Normal.BufferObj), NO_EXTRA },
-   { GL_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, Color.BufferObj), NO_EXTRA },
-   { GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
-
-   /* GL_OES_point_sprite */
-   { GL_POINT_SPRITE_NV,
-     CONTEXT_BOOL(Point.PointSprite),
-     extra_NV_point_sprite_ARB_point_sprite },
-
-   /* GL_ARB_fragment_shader */
-   { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB,
-     CONTEXT_INT(Const.FragmentProgram.MaxUniformComponents),
-     extra_ARB_fragment_shader },
-
-   /* GL_ARB_vertex_shader */
-   { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB,
-     CONTEXT_INT(Const.VertexProgram.MaxUniformComponents),
-     extra_ARB_vertex_shader },
-   { GL_MAX_VARYING_FLOATS_ARB, LOC_CUSTOM, TYPE_INT, 0,
-     extra_ARB_vertex_shader },
-
-   /* GL_EXT_texture_lod_bias */
-   { GL_MAX_TEXTURE_LOD_BIAS_EXT, CONTEXT_FLOAT(Const.MaxTextureLodBias),
-	 extra_EXT_texture_lod_bias },
-
-   /* GL_EXT_texture_filter_anisotropic */
-   { GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
-     CONTEXT_FLOAT(Const.MaxTextureMaxAnisotropy),
-     extra_EXT_texture_filter_anisotropic },
-#endif /* FEATURE_GL || FEATURE_ES1 */
-
-#if FEATURE_ES1
-   { 0, 0, TYPE_API_MASK, API_OPENGLES_BIT },
-   /* XXX: OES_matrix_get */
-   { GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES },
-   { GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES },
-   { GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES },
-
-   /* OES_point_size_array */
-   { GL_POINT_SIZE_ARRAY_OES, ARRAY_FIELD(PointSize.Enabled, TYPE_BOOLEAN) },
-   { GL_POINT_SIZE_ARRAY_TYPE_OES, ARRAY_FIELD(PointSize.Type, TYPE_ENUM) },
-   { GL_POINT_SIZE_ARRAY_STRIDE_OES, ARRAY_FIELD(PointSize.Stride, TYPE_INT) },
-   { GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES, LOC_CUSTOM, TYPE_INT, 0 },
-#endif /* FEATURE_ES1 */
-
-#if FEATURE_GL || FEATURE_ES2
-   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES2_BIT, NO_EXTRA },
-   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's GLSL: */
-   { GL_MAX_LIGHTS, CONTEXT_INT(Const.MaxLights), NO_EXTRA },
-   { GL_MAX_TEXTURE_COORDS_ARB, /* == GL_MAX_TEXTURE_COORDS_NV */
-     CONTEXT_INT(Const.MaxTextureCoordUnits),
-     extra_ARB_fragment_program_NV_fragment_program },
-
-   /* GL_ARB_draw_buffers */
-   { GL_MAX_DRAW_BUFFERS_ARB, CONTEXT_INT(Const.MaxDrawBuffers), NO_EXTRA },
-
-   { GL_BLEND_COLOR_EXT, CONTEXT_FIELD(Color.BlendColor[0], TYPE_FLOATN_4), NO_EXTRA },
-   /* GL_ARB_fragment_program */
-   { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, /* == GL_MAX_TEXTURE_IMAGE_UNITS_NV */
-     CONTEXT_INT(Const.MaxTextureImageUnits),
-     extra_ARB_fragment_program_NV_fragment_program },
-   { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB,
-     CONTEXT_INT(Const.MaxVertexTextureImageUnits), extra_ARB_vertex_shader },
-   { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB,
-     CONTEXT_INT(Const.MaxCombinedTextureImageUnits),
-     extra_ARB_vertex_shader },
-
-   /* GL_ARB_shader_objects
-    * Actually, this token isn't part of GL_ARB_shader_objects, but is
-    * close enough for now. */
-   { GL_CURRENT_PROGRAM, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_shader_objects },
-
-   /* OpenGL 2.0 */
-   { GL_STENCIL_BACK_FUNC, CONTEXT_ENUM(Stencil.Function[1]), NO_EXTRA },
-   { GL_STENCIL_BACK_VALUE_MASK, CONTEXT_INT(Stencil.ValueMask[1]), NO_EXTRA },
-   { GL_STENCIL_BACK_WRITEMASK, CONTEXT_INT(Stencil.WriteMask[1]), NO_EXTRA },
-   { GL_STENCIL_BACK_REF, CONTEXT_INT(Stencil.Ref[1]), NO_EXTRA },
-   { GL_STENCIL_BACK_FAIL, CONTEXT_ENUM(Stencil.FailFunc[1]), NO_EXTRA },
-   { GL_STENCIL_BACK_PASS_DEPTH_FAIL, CONTEXT_ENUM(Stencil.ZFailFunc[1]), NO_EXTRA },
-   { GL_STENCIL_BACK_PASS_DEPTH_PASS, CONTEXT_ENUM(Stencil.ZPassFunc[1]), NO_EXTRA },
-
-   { GL_MAX_VERTEX_ATTRIBS_ARB,
-     CONTEXT_INT(Const.VertexProgram.MaxAttribs),
-     extra_ARB_vertex_program_version_es2 },
-
-   /* OES_texture_3D */
-   { GL_TEXTURE_BINDING_3D, LOC_CUSTOM, TYPE_INT, TEXTURE_3D_INDEX, NO_EXTRA },
-   { GL_MAX_3D_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.Max3DTextureLevels), NO_EXTRA },
-
-   /* GL_ARB_fragment_program/OES_standard_derivatives */
-   { GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB,
-     CONTEXT_ENUM(Hint.FragmentShaderDerivative), extra_ARB_fragment_shader },
-#endif /* FEATURE_GL || FEATURE_ES2 */
-
-#if FEATURE_ES2
-   /* Enums unique to OpenGL ES 2.0 */
-   { 0, 0, TYPE_API_MASK, API_OPENGLES2_BIT, NO_EXTRA },
-   { GL_MAX_FRAGMENT_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.FragmentProgram.MaxUniformComponents), NO_EXTRA },
-   { GL_MAX_VARYING_VECTORS, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.MaxVarying), NO_EXTRA },
-   { GL_MAX_VERTEX_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.VertexProgram.MaxUniformComponents), NO_EXTRA },
-   { GL_SHADER_COMPILER, CONST(1), NO_EXTRA },
-   /* OES_get_program_binary */
-   { GL_NUM_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },
-   { GL_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },
-#endif /* FEATURE_ES2 */
-
-#if FEATURE_GL
-   /* Remaining enums are only in OpenGL */
-   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT, NO_EXTRA },
-   { GL_ACCUM_RED_BITS, BUFFER_INT(Visual.accumRedBits), NO_EXTRA },
-   { GL_ACCUM_GREEN_BITS, BUFFER_INT(Visual.accumGreenBits), NO_EXTRA },
-   { GL_ACCUM_BLUE_BITS, BUFFER_INT(Visual.accumBlueBits), NO_EXTRA },
-   { GL_ACCUM_ALPHA_BITS, BUFFER_INT(Visual.accumAlphaBits), NO_EXTRA },
-   { GL_ACCUM_CLEAR_VALUE, CONTEXT_FIELD(Accum.ClearColor[0], TYPE_FLOATN_4), NO_EXTRA },
-   { GL_ALPHA_BIAS, CONTEXT_FLOAT(Pixel.AlphaBias), NO_EXTRA },
-   { GL_ALPHA_SCALE, CONTEXT_FLOAT(Pixel.AlphaScale), NO_EXTRA },
-   { GL_ATTRIB_STACK_DEPTH, CONTEXT_INT(AttribStackDepth), NO_EXTRA },
-   { GL_AUTO_NORMAL, CONTEXT_BOOL(Eval.AutoNormal), NO_EXTRA },
-   { GL_AUX_BUFFERS, BUFFER_INT(Visual.numAuxBuffers), NO_EXTRA },
-   { GL_BLUE_BIAS, CONTEXT_FLOAT(Pixel.BlueBias), NO_EXTRA },
-   { GL_BLUE_SCALE, CONTEXT_FLOAT(Pixel.BlueScale), NO_EXTRA },
-   { GL_CLIENT_ATTRIB_STACK_DEPTH, CONTEXT_INT(ClientAttribStackDepth), NO_EXTRA },
-   { GL_COLOR_MATERIAL_FACE, CONTEXT_ENUM(Light.ColorMaterialFace), NO_EXTRA },
-   { GL_COLOR_MATERIAL_PARAMETER, CONTEXT_ENUM(Light.ColorMaterialMode), NO_EXTRA },
-   { GL_CURRENT_INDEX,
-     CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]),
-     extra_flush_current },
-   { GL_CURRENT_RASTER_COLOR,
-     CONTEXT_FIELD(Current.RasterColor[0], TYPE_FLOATN_4), NO_EXTRA },
-   { GL_CURRENT_RASTER_DISTANCE, CONTEXT_FLOAT(Current.RasterDistance), NO_EXTRA },
-   { GL_CURRENT_RASTER_INDEX, CONST(1), NO_EXTRA },
-   { GL_CURRENT_RASTER_POSITION, CONTEXT_FLOAT4(Current.RasterPos[0]), NO_EXTRA },
-   { GL_CURRENT_RASTER_SECONDARY_COLOR,
-     CONTEXT_FIELD(Current.RasterSecondaryColor[0], TYPE_FLOATN_4), NO_EXTRA },
-   { GL_CURRENT_RASTER_TEXTURE_COORDS, LOC_CUSTOM, TYPE_FLOAT_4, 0,
-     extra_valid_texture_unit },
-   { GL_CURRENT_RASTER_POSITION_VALID, CONTEXT_BOOL(Current.RasterPosValid), NO_EXTRA },
-   { GL_DEPTH_BIAS, CONTEXT_FLOAT(Pixel.DepthBias), NO_EXTRA },
-   { GL_DEPTH_SCALE, CONTEXT_FLOAT(Pixel.DepthScale), NO_EXTRA },
-   { GL_DOUBLEBUFFER, BUFFER_INT(Visual.doubleBufferMode), NO_EXTRA },
-   { GL_DRAW_BUFFER, BUFFER_ENUM(ColorDrawBuffer[0]), NO_EXTRA },
-   { GL_EDGE_FLAG, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
-   { GL_FEEDBACK_BUFFER_SIZE, CONTEXT_INT(Feedback.BufferSize), NO_EXTRA },
-   { GL_FEEDBACK_BUFFER_TYPE, CONTEXT_ENUM(Feedback.Type), NO_EXTRA },
-   { GL_FOG_INDEX, CONTEXT_FLOAT(Fog.Index), NO_EXTRA },
-   { GL_GREEN_BIAS, CONTEXT_FLOAT(Pixel.GreenBias), NO_EXTRA },
-   { GL_GREEN_SCALE, CONTEXT_FLOAT(Pixel.GreenScale), NO_EXTRA },
-   { GL_INDEX_BITS, BUFFER_INT(Visual.indexBits), extra_new_buffers },
-   { GL_INDEX_CLEAR_VALUE, CONTEXT_INT(Color.ClearIndex), NO_EXTRA },
-   { GL_INDEX_MODE, CONST(0) , NO_EXTRA}, 
-   { GL_INDEX_OFFSET, CONTEXT_INT(Pixel.IndexOffset), NO_EXTRA },
-   { GL_INDEX_SHIFT, CONTEXT_INT(Pixel.IndexShift), NO_EXTRA },
-   { GL_INDEX_WRITEMASK, CONTEXT_INT(Color.IndexMask), NO_EXTRA },
-   { GL_LIGHT_MODEL_COLOR_CONTROL, CONTEXT_ENUM(Light.Model.ColorControl), NO_EXTRA },
-   { GL_LIGHT_MODEL_LOCAL_VIEWER, CONTEXT_BOOL(Light.Model.LocalViewer), NO_EXTRA },
-   { GL_LINE_STIPPLE, CONTEXT_BOOL(Line.StippleFlag), NO_EXTRA },
-   { GL_LINE_STIPPLE_PATTERN, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
-   { GL_LINE_STIPPLE_REPEAT, CONTEXT_INT(Line.StippleFactor), NO_EXTRA },
-   { GL_LINE_WIDTH_GRANULARITY, CONTEXT_FLOAT(Const.LineWidthGranularity), NO_EXTRA },
-   { GL_LIST_BASE, CONTEXT_INT(List.ListBase), NO_EXTRA },
-   { GL_LIST_INDEX, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
-   { GL_LIST_MODE, LOC_CUSTOM, TYPE_ENUM, 0, NO_EXTRA },
-   { GL_INDEX_LOGIC_OP, CONTEXT_BOOL(Color.IndexLogicOpEnabled), NO_EXTRA },
-   { GL_MAP1_COLOR_4, CONTEXT_BOOL(Eval.Map1Color4), NO_EXTRA },
-   { GL_MAP1_GRID_DOMAIN, CONTEXT_FLOAT2(Eval.MapGrid1u1), NO_EXTRA },
-   { GL_MAP1_GRID_SEGMENTS, CONTEXT_INT(Eval.MapGrid1un), NO_EXTRA },
-   { GL_MAP1_INDEX, CONTEXT_BOOL(Eval.Map1Index), NO_EXTRA },
-   { GL_MAP1_NORMAL, CONTEXT_BOOL(Eval.Map1Normal), NO_EXTRA },
-   { GL_MAP1_TEXTURE_COORD_1, CONTEXT_BOOL(Eval.Map1TextureCoord1), NO_EXTRA },
-   { GL_MAP1_TEXTURE_COORD_2, CONTEXT_BOOL(Eval.Map1TextureCoord2), NO_EXTRA },
-   { GL_MAP1_TEXTURE_COORD_3, CONTEXT_BOOL(Eval.Map1TextureCoord3), NO_EXTRA },
-   { GL_MAP1_TEXTURE_COORD_4, CONTEXT_BOOL(Eval.Map1TextureCoord4), NO_EXTRA },
-   { GL_MAP1_VERTEX_3, CONTEXT_BOOL(Eval.Map1Vertex3), NO_EXTRA },
-   { GL_MAP1_VERTEX_4, CONTEXT_BOOL(Eval.Map1Vertex4), NO_EXTRA },
-   { GL_MAP2_COLOR_4, CONTEXT_BOOL(Eval.Map2Color4), NO_EXTRA },
-   { GL_MAP2_GRID_DOMAIN, LOC_CUSTOM, TYPE_FLOAT_4, 0, NO_EXTRA },
-   { GL_MAP2_GRID_SEGMENTS, CONTEXT_INT2(Eval.MapGrid2un), NO_EXTRA },
-   { GL_MAP2_INDEX, CONTEXT_BOOL(Eval.Map2Index), NO_EXTRA },
-   { GL_MAP2_NORMAL, CONTEXT_BOOL(Eval.Map2Normal), NO_EXTRA },
-   { GL_MAP2_TEXTURE_COORD_1, CONTEXT_BOOL(Eval.Map2TextureCoord1), NO_EXTRA },
-   { GL_MAP2_TEXTURE_COORD_2, CONTEXT_BOOL(Eval.Map2TextureCoord2), NO_EXTRA },
-   { GL_MAP2_TEXTURE_COORD_3, CONTEXT_BOOL(Eval.Map2TextureCoord3), NO_EXTRA },
-   { GL_MAP2_TEXTURE_COORD_4, CONTEXT_BOOL(Eval.Map2TextureCoord4), NO_EXTRA },
-   { GL_MAP2_VERTEX_3, CONTEXT_BOOL(Eval.Map2Vertex3), NO_EXTRA },
-   { GL_MAP2_VERTEX_4, CONTEXT_BOOL(Eval.Map2Vertex4), NO_EXTRA },
-   { GL_MAP_COLOR, CONTEXT_BOOL(Pixel.MapColorFlag), NO_EXTRA },
-   { GL_MAP_STENCIL, CONTEXT_BOOL(Pixel.MapStencilFlag), NO_EXTRA },
-   { GL_MAX_ATTRIB_STACK_DEPTH, CONST(MAX_ATTRIB_STACK_DEPTH), NO_EXTRA },
-   { GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, CONST(MAX_CLIENT_ATTRIB_STACK_DEPTH), NO_EXTRA },
-
-   { GL_MAX_EVAL_ORDER, CONST(MAX_EVAL_ORDER), NO_EXTRA },
-   { GL_MAX_LIST_NESTING, CONST(MAX_LIST_NESTING), NO_EXTRA },
-   { GL_MAX_NAME_STACK_DEPTH, CONST(MAX_NAME_STACK_DEPTH), NO_EXTRA },
-   { GL_MAX_PIXEL_MAP_TABLE, CONST(MAX_PIXEL_MAP_TABLE), NO_EXTRA },
-   { GL_NAME_STACK_DEPTH, CONTEXT_INT(Select.NameStackDepth), NO_EXTRA },
-   { GL_PACK_LSB_FIRST, CONTEXT_BOOL(Pack.LsbFirst), NO_EXTRA },
-   { GL_PACK_ROW_LENGTH, CONTEXT_INT(Pack.RowLength), NO_EXTRA },
-   { GL_PACK_SKIP_PIXELS, CONTEXT_INT(Pack.SkipPixels), NO_EXTRA },
-   { GL_PACK_SKIP_ROWS, CONTEXT_INT(Pack.SkipRows), NO_EXTRA },
-   { GL_PACK_SWAP_BYTES, CONTEXT_BOOL(Pack.SwapBytes), NO_EXTRA },
-   { GL_PACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Pack.ImageHeight), NO_EXTRA },
-   { GL_PACK_INVERT_MESA, CONTEXT_BOOL(Pack.Invert), NO_EXTRA },
-   { GL_PIXEL_MAP_A_TO_A_SIZE, CONTEXT_INT(PixelMaps.AtoA.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_B_TO_B_SIZE, CONTEXT_INT(PixelMaps.BtoB.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_G_TO_G_SIZE, CONTEXT_INT(PixelMaps.GtoG.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_I_TO_A_SIZE, CONTEXT_INT(PixelMaps.ItoA.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_I_TO_B_SIZE, CONTEXT_INT(PixelMaps.ItoB.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_I_TO_G_SIZE, CONTEXT_INT(PixelMaps.ItoG.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_I_TO_I_SIZE, CONTEXT_INT(PixelMaps.ItoI.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_I_TO_R_SIZE, CONTEXT_INT(PixelMaps.ItoR.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_R_TO_R_SIZE, CONTEXT_INT(PixelMaps.RtoR.Size), NO_EXTRA },
-   { GL_PIXEL_MAP_S_TO_S_SIZE, CONTEXT_INT(PixelMaps.StoS.Size), NO_EXTRA },
-   { GL_POINT_SIZE_GRANULARITY, CONTEXT_FLOAT(Const.PointSizeGranularity), NO_EXTRA },
-   { GL_POLYGON_MODE, CONTEXT_ENUM2(Polygon.FrontMode), NO_EXTRA },
-   { GL_POLYGON_OFFSET_BIAS_EXT, CONTEXT_FLOAT(Polygon.OffsetUnits), NO_EXTRA },
-   { GL_POLYGON_OFFSET_POINT, CONTEXT_BOOL(Polygon.OffsetPoint), NO_EXTRA },
-   { GL_POLYGON_OFFSET_LINE, CONTEXT_BOOL(Polygon.OffsetLine), NO_EXTRA },
-   { GL_POLYGON_SMOOTH, CONTEXT_BOOL(Polygon.SmoothFlag), NO_EXTRA },
-   { GL_POLYGON_SMOOTH_HINT, CONTEXT_ENUM(Hint.PolygonSmooth), NO_EXTRA },
-   { GL_POLYGON_STIPPLE, CONTEXT_BOOL(Polygon.StippleFlag), NO_EXTRA },
-   { GL_READ_BUFFER, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
-   { GL_RED_BIAS, CONTEXT_FLOAT(Pixel.RedBias), NO_EXTRA },
-   { GL_RED_SCALE, CONTEXT_FLOAT(Pixel.RedScale), NO_EXTRA },
-   { GL_RENDER_MODE, CONTEXT_ENUM(RenderMode), NO_EXTRA },
-   { GL_RGBA_MODE, CONST(1), NO_EXTRA },
-   { GL_SELECTION_BUFFER_SIZE, CONTEXT_INT(Select.BufferSize), NO_EXTRA },
-   { GL_SHARED_TEXTURE_PALETTE_EXT, CONTEXT_BOOL(Texture.SharedPalette), NO_EXTRA },
-
-   { GL_STEREO, BUFFER_INT(Visual.stereoMode), NO_EXTRA },
-
-   { GL_TEXTURE_1D, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
-   { GL_TEXTURE_3D, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
-   { GL_TEXTURE_1D_ARRAY_EXT, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
-   { GL_TEXTURE_2D_ARRAY_EXT, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },
-
-   { GL_TEXTURE_BINDING_1D, LOC_CUSTOM, TYPE_INT, TEXTURE_1D_INDEX, NO_EXTRA },
-   { GL_TEXTURE_BINDING_1D_ARRAY, LOC_CUSTOM, TYPE_INT,
-     TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array },
-   { GL_TEXTURE_BINDING_2D_ARRAY, LOC_CUSTOM, TYPE_INT,
-     TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array },
-   { GL_MAX_ARRAY_TEXTURE_LAYERS_EXT,
-     CONTEXT_INT(Const.MaxArrayTextureLayers), extra_MESA_texture_array },
-
-   { GL_TEXTURE_GEN_S, LOC_TEXUNIT, TYPE_BIT_0,
-     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
-   { GL_TEXTURE_GEN_T, LOC_TEXUNIT, TYPE_BIT_1,
-     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
-   { GL_TEXTURE_GEN_R, LOC_TEXUNIT, TYPE_BIT_2,
-     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
-   { GL_TEXTURE_GEN_Q, LOC_TEXUNIT, TYPE_BIT_3,
-     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },
-   { GL_UNPACK_LSB_FIRST, CONTEXT_BOOL(Unpack.LsbFirst), NO_EXTRA },
-   { GL_UNPACK_ROW_LENGTH, CONTEXT_INT(Unpack.RowLength), NO_EXTRA },
-   { GL_UNPACK_SKIP_PIXELS, CONTEXT_INT(Unpack.SkipPixels), NO_EXTRA },
-   { GL_UNPACK_SKIP_ROWS, CONTEXT_INT(Unpack.SkipRows), NO_EXTRA },
-   { GL_UNPACK_SWAP_BYTES, CONTEXT_BOOL(Unpack.SwapBytes), NO_EXTRA },
-   { GL_UNPACK_SKIP_IMAGES_EXT, CONTEXT_INT(Unpack.SkipImages), NO_EXTRA },
-   { GL_UNPACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Unpack.ImageHeight), NO_EXTRA },
-   { GL_UNPACK_CLIENT_STORAGE_APPLE, CONTEXT_BOOL(Unpack.ClientStorage), NO_EXTRA },
-   { GL_ZOOM_X, CONTEXT_FLOAT(Pixel.ZoomX), NO_EXTRA },
-   { GL_ZOOM_Y, CONTEXT_FLOAT(Pixel.ZoomY), NO_EXTRA },
-
-   /* Vertex arrays */
-   { GL_VERTEX_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
-   { GL_NORMAL_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
-   { GL_COLOR_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
-   { GL_INDEX_ARRAY, ARRAY_BOOL(Index.Enabled), NO_EXTRA },
-   { GL_INDEX_ARRAY_TYPE, ARRAY_ENUM(Index.Type), NO_EXTRA },
-   { GL_INDEX_ARRAY_STRIDE, ARRAY_INT(Index.Stride), NO_EXTRA },
-   { GL_INDEX_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
-   { GL_TEXTURE_COORD_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
-   { GL_EDGE_FLAG_ARRAY, ARRAY_BOOL(EdgeFlag.Enabled), NO_EXTRA },
-   { GL_EDGE_FLAG_ARRAY_STRIDE, ARRAY_INT(EdgeFlag.Stride), NO_EXTRA },
-   { GL_EDGE_FLAG_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },
-
-   /* GL_ARB_texture_compression */
-   { GL_TEXTURE_COMPRESSION_HINT_ARB, CONTEXT_INT(Hint.TextureCompression), NO_EXTRA },
-
-   /* GL_EXT_compiled_vertex_array */
-   { GL_ARRAY_ELEMENT_LOCK_FIRST_EXT, CONTEXT_INT(Array.LockFirst),
-     extra_EXT_compiled_vertex_array },
-   { GL_ARRAY_ELEMENT_LOCK_COUNT_EXT, CONTEXT_INT(Array.LockCount),
-     extra_EXT_compiled_vertex_array },
-
-   /* GL_ARB_transpose_matrix */
-   { GL_TRANSPOSE_COLOR_MATRIX_ARB, CONTEXT_MATRIX_T(ColorMatrixStack.Top), NO_EXTRA },
-   { GL_TRANSPOSE_MODELVIEW_MATRIX_ARB,
-     CONTEXT_MATRIX_T(ModelviewMatrixStack), NO_EXTRA },
-   { GL_TRANSPOSE_PROJECTION_MATRIX_ARB,
-     CONTEXT_MATRIX_T(ProjectionMatrixStack.Top), NO_EXTRA },
-   { GL_TRANSPOSE_TEXTURE_MATRIX_ARB, CONTEXT_MATRIX_T(TextureMatrixStack), NO_EXTRA },
-
-   /* GL_SGI_color_matrix (also in 1.2 imaging) */
-   { GL_COLOR_MATRIX_SGI, CONTEXT_MATRIX(ColorMatrixStack.Top), NO_EXTRA },
-   { GL_COLOR_MATRIX_STACK_DEPTH_SGI, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, ColorMatrixStack.Depth), NO_EXTRA },
-   { GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI,
-     CONST(MAX_COLOR_STACK_DEPTH), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_RED_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[0]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[1]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[2]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[3]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_RED_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[0]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[1]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[2]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[3]), NO_EXTRA },
-
-   /* GL_EXT_convolution (also in 1.2 imaging) */
-   { GL_CONVOLUTION_1D_EXT, CONTEXT_BOOL(Pixel.Convolution1DEnabled),
-     extra_EXT_convolution },
-   { GL_CONVOLUTION_2D_EXT, CONTEXT_BOOL(Pixel.Convolution2DEnabled),
-     extra_EXT_convolution },
-   { GL_SEPARABLE_2D_EXT, CONTEXT_BOOL(Pixel.Separable2DEnabled),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_RED_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[0]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_GREEN_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[1]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_BLUE_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[2]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_ALPHA_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[3]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_RED_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[0]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_GREEN_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[1]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_BLUE_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[2]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_ALPHA_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[3]),
-     extra_EXT_convolution },
-
-   /* GL_EXT_histogram / GL_ARB_imaging */
-   { GL_HISTOGRAM, CONTEXT_BOOL(Pixel.HistogramEnabled),
-     extra_EXT_histogram },
-   { GL_MINMAX, CONTEXT_BOOL(Pixel.MinMaxEnabled), extra_EXT_histogram },
-
-   /* GL_SGI_color_table / GL_ARB_imaging */
-   { GL_COLOR_TABLE_SGI,
-     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]),
-     extra_SGI_color_table },
-   { GL_POST_CONVOLUTION_COLOR_TABLE_SGI,
-     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]),
-     extra_SGI_color_table },
-   { GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI,
-     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]),
-     extra_SGI_color_table },
-
-   /* GL_SGI_texture_color_table */
-   { GL_TEXTURE_COLOR_TABLE_SGI, LOC_TEXUNIT, TYPE_BOOLEAN,
-     offsetof(struct gl_texture_unit, ColorTableEnabled),
-     extra_SGI_texture_color_table },
-
-   /* GL_EXT_secondary_color */
-   { GL_COLOR_SUM_EXT, CONTEXT_BOOL(Fog.ColorSumEnabled),
-     extra_EXT_secondary_color_ARB_vertex_program },
-   { GL_CURRENT_SECONDARY_COLOR_EXT,
-     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR1][0], TYPE_FLOATN_4),
-     extra_EXT_secondary_color_flush_current },
-   { GL_SECONDARY_COLOR_ARRAY_EXT, ARRAY_BOOL(SecondaryColor.Enabled),
-     extra_EXT_secondary_color },
-   { GL_SECONDARY_COLOR_ARRAY_TYPE_EXT, ARRAY_ENUM(SecondaryColor.Type),
-     extra_EXT_secondary_color },
-   { GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT, ARRAY_INT(SecondaryColor.Stride),
-     extra_EXT_secondary_color },
-   { GL_SECONDARY_COLOR_ARRAY_SIZE_EXT, ARRAY_INT(SecondaryColor.Size),
-     extra_EXT_secondary_color },
-
-   /* GL_EXT_fog_coord */
-   { GL_CURRENT_FOG_COORDINATE_EXT,
-     CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_FOG][0]),
-     extra_EXT_fog_coord_flush_current },
-   { GL_FOG_COORDINATE_ARRAY_EXT, ARRAY_BOOL(FogCoord.Enabled),
-     extra_EXT_fog_coord },
-   { GL_FOG_COORDINATE_ARRAY_TYPE_EXT, ARRAY_ENUM(FogCoord.Type),
-     extra_EXT_fog_coord },
-   { GL_FOG_COORDINATE_ARRAY_STRIDE_EXT, ARRAY_INT(FogCoord.Stride),
-     extra_EXT_fog_coord },
-   { GL_FOG_COORDINATE_SOURCE_EXT, CONTEXT_ENUM(Fog.FogCoordinateSource),
-     extra_EXT_fog_coord },
-
-   /* GL_IBM_rasterpos_clip */
-   { GL_RASTER_POSITION_UNCLIPPED_IBM,
-     CONTEXT_BOOL(Transform.RasterPositionUnclipped),
-     extra_IBM_rasterpos_clip },
-
-   /* GL_NV_point_sprite */
-   { GL_POINT_SPRITE_R_MODE_NV,
-     CONTEXT_ENUM(Point.SpriteRMode), extra_NV_point_sprite },
-   { GL_POINT_SPRITE_COORD_ORIGIN, CONTEXT_ENUM(Point.SpriteOrigin),
-     extra_NV_point_sprite_ARB_point_sprite },
-
-   /* GL_NV_vertex_program */
-   { GL_VERTEX_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY0_NV, ARRAY_BOOL(VertexAttrib[0].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY1_NV, ARRAY_BOOL(VertexAttrib[1].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY2_NV, ARRAY_BOOL(VertexAttrib[2].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY3_NV, ARRAY_BOOL(VertexAttrib[3].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY4_NV, ARRAY_BOOL(VertexAttrib[4].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY5_NV, ARRAY_BOOL(VertexAttrib[5].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY6_NV, ARRAY_BOOL(VertexAttrib[6].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY7_NV, ARRAY_BOOL(VertexAttrib[7].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY8_NV, ARRAY_BOOL(VertexAttrib[8].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY9_NV, ARRAY_BOOL(VertexAttrib[9].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY10_NV, ARRAY_BOOL(VertexAttrib[10].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY11_NV, ARRAY_BOOL(VertexAttrib[11].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY12_NV, ARRAY_BOOL(VertexAttrib[12].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY13_NV, ARRAY_BOOL(VertexAttrib[13].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY14_NV, ARRAY_BOOL(VertexAttrib[14].Enabled),
-     extra_NV_vertex_program },
-   { GL_VERTEX_ATTRIB_ARRAY15_NV, ARRAY_BOOL(VertexAttrib[15].Enabled),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB0_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[0]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB1_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[1]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB2_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[2]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB3_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[3]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB4_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[4]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB5_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[5]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB6_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[6]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB7_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[7]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB8_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[8]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB9_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[9]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB10_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[10]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB11_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[11]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB12_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[12]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB13_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[13]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB14_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[14]),
-     extra_NV_vertex_program },
-   { GL_MAP1_VERTEX_ATTRIB15_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[15]),
-     extra_NV_vertex_program },
-
-   /* GL_NV_fragment_program */
-   { GL_FRAGMENT_PROGRAM_NV, CONTEXT_BOOL(FragmentProgram.Enabled),
-     extra_NV_fragment_program },
-   { GL_FRAGMENT_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,
-     extra_NV_fragment_program },
-   { GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV,
-     CONST(MAX_NV_FRAGMENT_PROGRAM_PARAMS),
-     extra_NV_fragment_program },
-
-   /* GL_NV_texture_rectangle */
-   { GL_TEXTURE_RECTANGLE_NV,
-     LOC_CUSTOM, TYPE_BOOLEAN, 0, extra_NV_texture_rectangle },
-   { GL_TEXTURE_BINDING_RECTANGLE_NV,
-     LOC_CUSTOM, TYPE_INT, TEXTURE_RECT_INDEX, extra_NV_texture_rectangle },
-   { GL_MAX_RECTANGLE_TEXTURE_SIZE_NV,
-     CONTEXT_INT(Const.MaxTextureRectSize), extra_NV_texture_rectangle },
-
-   /* GL_EXT_stencil_two_side */
-   { GL_STENCIL_TEST_TWO_SIDE_EXT, CONTEXT_BOOL(Stencil.TestTwoSide),
-	 extra_EXT_stencil_two_side },
-   { GL_ACTIVE_STENCIL_FACE_EXT, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },
-
-   /* GL_NV_light_max_exponent */
-   { GL_MAX_SHININESS_NV, CONTEXT_FLOAT(Const.MaxShininess),
-     extra_NV_light_max_exponent },
-   { GL_MAX_SPOT_EXPONENT_NV, CONTEXT_FLOAT(Const.MaxSpotExponent),
-     extra_NV_light_max_exponent },
-     
-   /* GL_ARB_vertex_buffer_object */
-   { GL_INDEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, Index.BufferObj), NO_EXTRA },
-   { GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, EdgeFlag.BufferObj), NO_EXTRA },
-   { GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, SecondaryColor.BufferObj), NO_EXTRA },
-   { GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(struct gl_array_object, FogCoord.BufferObj), NO_EXTRA },
-
-   /* GL_EXT_pixel_buffer_object */
-   { GL_PIXEL_PACK_BUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
-     extra_EXT_pixel_buffer_object },
-   { GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
-     extra_EXT_pixel_buffer_object },
-
-   /* GL_ARB_vertex_program */
-   { GL_VERTEX_PROGRAM_ARB, /* == GL_VERTEX_PROGRAM_NV */
-     CONTEXT_BOOL(VertexProgram.Enabled),
-     extra_ARB_vertex_program_NV_vertex_program },
-   { GL_VERTEX_PROGRAM_POINT_SIZE_ARB, /* == GL_VERTEX_PROGRAM_POINT_SIZE_NV*/
-     CONTEXT_BOOL(VertexProgram.PointSizeEnabled),
-     extra_ARB_vertex_program_NV_vertex_program },
-   { GL_VERTEX_PROGRAM_TWO_SIDE_ARB, /* == GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-     CONTEXT_BOOL(VertexProgram.TwoSideEnabled),
-     extra_ARB_vertex_program_NV_vertex_program },
-   { GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB, /* == GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-     CONTEXT_INT(Const.MaxProgramMatrixStackDepth),
-     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
-   { GL_MAX_PROGRAM_MATRICES_ARB, /* == GL_MAX_TRACK_MATRICES_NV */
-     CONTEXT_INT(Const.MaxProgramMatrices),
-     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
-   { GL_CURRENT_MATRIX_STACK_DEPTH_ARB, /* == GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-     LOC_CUSTOM, TYPE_INT, 0,
-     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
-
-   { GL_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */
-     LOC_CUSTOM, TYPE_MATRIX, 0,
-     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
-   { GL_TRANSPOSE_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */
-     LOC_CUSTOM, TYPE_MATRIX, 0,
-     extra_ARB_vertex_program_ARB_fragment_program },
-
-   { GL_PROGRAM_ERROR_POSITION_ARB, /* == GL_PROGRAM_ERROR_POSITION_NV */
-     CONTEXT_INT(Program.ErrorPos),
-     extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
-
-   /* GL_ARB_fragment_program */
-   { GL_FRAGMENT_PROGRAM_ARB, CONTEXT_BOOL(FragmentProgram.Enabled),
-     extra_ARB_fragment_program },
-
-   /* GL_EXT_depth_bounds_test */
-   { GL_DEPTH_BOUNDS_TEST_EXT, CONTEXT_BOOL(Depth.BoundsTest),
-     extra_EXT_depth_bounds_test },
-   { GL_DEPTH_BOUNDS_EXT, CONTEXT_FLOAT2(Depth.BoundsMin),
-     extra_EXT_depth_bounds_test },
-
-   /* GL_ARB_depth_clamp*/
-   { GL_DEPTH_CLAMP, CONTEXT_BOOL(Transform.DepthClamp),
-     extra_ARB_depth_clamp },
-
-   /* GL_ARB_draw_buffers */
-   { GL_DRAW_BUFFER0_ARB, BUFFER_ENUM(ColorDrawBuffer[0]), NO_EXTRA },
-   { GL_DRAW_BUFFER1_ARB, BUFFER_ENUM(ColorDrawBuffer[1]),
-     extra_valid_draw_buffer },
-   { GL_DRAW_BUFFER2_ARB, BUFFER_ENUM(ColorDrawBuffer[2]),
-     extra_valid_draw_buffer },
-   { GL_DRAW_BUFFER3_ARB, BUFFER_ENUM(ColorDrawBuffer[3]),
-     extra_valid_draw_buffer },
-
-   /* GL_ATI_fragment_shader */
-   { GL_NUM_FRAGMENT_REGISTERS_ATI, CONST(6), extra_ATI_fragment_shader },
-   { GL_NUM_FRAGMENT_CONSTANTS_ATI, CONST(8), extra_ATI_fragment_shader },
-   { GL_NUM_PASSES_ATI, CONST(2), extra_ATI_fragment_shader },
-   { GL_NUM_INSTRUCTIONS_PER_PASS_ATI, CONST(8), extra_ATI_fragment_shader },
-   { GL_NUM_INSTRUCTIONS_TOTAL_ATI, CONST(16), extra_ATI_fragment_shader },
-   { GL_COLOR_ALPHA_PAIRING_ATI, CONST(GL_TRUE), extra_ATI_fragment_shader },
-   { GL_NUM_LOOPBACK_COMPONENTS_ATI, CONST(3), extra_ATI_fragment_shader },
-   { GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI,
-     CONST(3), extra_ATI_fragment_shader },
-
-   /* GL_EXT_framebuffer_object */
-   { GL_MAX_COLOR_ATTACHMENTS_EXT, CONTEXT_INT(Const.MaxColorAttachments),
-     extra_EXT_framebuffer_object },
-   
-   /* GL_EXT_framebuffer_blit
-    * NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT */
-   { GL_READ_FRAMEBUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,
-     extra_EXT_framebuffer_blit },
-
-   /* GL_EXT_provoking_vertex */
-   { GL_PROVOKING_VERTEX_EXT,
-     CONTEXT_BOOL(Light.ProvokingVertex), extra_EXT_provoking_vertex },
-   { GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT,
-     CONTEXT_BOOL(Const.QuadsFollowProvokingVertexConvention),
-     extra_EXT_provoking_vertex },
-
-   /* GL_ARB_framebuffer_object */
-   { GL_MAX_SAMPLES, CONTEXT_INT(Const.MaxSamples),
-     extra_ARB_framebuffer_object },
-
-   /* GL_APPLE_vertex_array_object */
-   { GL_VERTEX_ARRAY_BINDING_APPLE, ARRAY_INT(Name),
-     extra_APPLE_vertex_array_object },
-
-   /* GL_ARB_seamless_cube_map */
-   { GL_TEXTURE_CUBE_MAP_SEAMLESS,
-     CONTEXT_BOOL(Texture.CubeMapSeamless), extra_ARB_seamless_cube_map },
-
-   /* GL_ARB_sync */
-   { GL_MAX_SERVER_WAIT_TIMEOUT,
-     CONTEXT_INT64(Const.MaxServerWaitTimeout), extra_ARB_sync },
-
-   /* GL_EXT_transform_feedback */
-   { GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, LOC_CUSTOM, TYPE_INT, 0,
-     extra_EXT_transform_feedback },
-   { GL_RASTERIZER_DISCARD, CONTEXT_BOOL(TransformFeedback.RasterDiscard),
-     extra_EXT_transform_feedback },
-   { GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS,
-     CONTEXT_INT(Const.MaxTransformFeedbackInterleavedComponents),
-     extra_EXT_transform_feedback },
-   { GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS,
-     CONTEXT_INT(Const.MaxTransformFeedbackSeparateAttribs),
-     extra_EXT_transform_feedback },
-   { GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS,
-     CONTEXT_INT(Const.MaxTransformFeedbackSeparateComponents),
-     extra_EXT_transform_feedback },
-
-   /* GL_ARB_transform_feedback2 */
-   { GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED, LOC_CUSTOM, TYPE_BOOLEAN, 0,
-     extra_ARB_transform_feedback2 },
-   { GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE, LOC_CUSTOM, TYPE_BOOLEAN, 0,
-     extra_ARB_transform_feedback2 },
-   { GL_TRANSFORM_FEEDBACK_BINDING, LOC_CUSTOM, TYPE_INT, 0,
-     extra_ARB_transform_feedback2 },
-
-   /* GL_ARB_geometry_shader4 */
-   { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB,
-     CONTEXT_INT(Const.GeometryProgram.MaxGeometryTextureImageUnits),
-     extra_ARB_geometry_shader4 },
-   { GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB,
-     CONTEXT_INT(Const.GeometryProgram.MaxGeometryOutputVertices),
-     extra_ARB_geometry_shader4 },
-   { GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB,
-     CONTEXT_INT(Const.GeometryProgram.MaxGeometryTotalOutputComponents),
-     extra_ARB_geometry_shader4 },
-   { GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB,
-     CONTEXT_INT(Const.GeometryProgram.MaxGeometryUniformComponents),
-     extra_ARB_geometry_shader4 },
-   { GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB,
-     CONTEXT_INT(Const.GeometryProgram.MaxGeometryVaryingComponents),
-     extra_ARB_geometry_shader4 },
-   { GL_MAX_VERTEX_VARYING_COMPONENTS_ARB,
-     CONTEXT_INT(Const.GeometryProgram.MaxVertexVaryingComponents),
-     extra_ARB_geometry_shader4 },
-
-   /* GL 3.0 */
-   { GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_version_30 },
-   { GL_MAJOR_VERSION, CONTEXT_INT(VersionMajor), extra_version_30 },
-   { GL_MINOR_VERSION, CONTEXT_INT(VersionMinor), extra_version_30  },
-   { GL_CONTEXT_FLAGS, CONTEXT_INT(Const.ContextFlags), extra_version_30  },
-
-   /* GL 3.1 */
-   { GL_PRIMITIVE_RESTART, CONTEXT_BOOL(Array.PrimitiveRestart),
-     extra_version_31 },
-   { GL_PRIMITIVE_RESTART_INDEX, CONTEXT_INT(Array.RestartIndex),
-     extra_version_31 },
- 
-   /* GL 3.2 */
-   { GL_CONTEXT_PROFILE_MASK, CONTEXT_INT(Const.ProfileMask),
-     extra_version_32 },
-#endif /* FEATURE_GL */
-};
-
-/* All we need now is a way to look up the value struct from the enum.
- * The code generated by gcc for the old generated big switch
- * statement is a big, balanced, open coded if/else tree, essentially
- * an unrolled binary search.  It would be natural to sort the new
- * enum table and use bsearch(), but we will use a read-only hash
- * table instead.  bsearch() has a nice guaranteed worst case
- * performance, but we're also guaranteed to hit that worst case
- * (log2(n) iterations) for about half the enums.  Instead, using an
- * open addressing hash table, we can find the enum on the first try
- * for 80% of the enums, 1 collision for 10% and never more than 5
- * collisions for any enum (typical numbers).  And the code is very
- * simple, even though it feels a little magic. */
-
-static unsigned short table[1024];
-static const int prime_factor = 89, prime_step = 281;
-
-#ifdef GET_DEBUG
-static void
-print_table_stats(void)
-{
-   int i, j, collisions[11], count, hash, mask;
-   const struct value_desc *d;
-
-   count = 0;
-   mask = Elements(table) - 1;
-   memset(collisions, 0, sizeof collisions);
-
-   for (i = 0; i < Elements(table); i++) {
-      if (!table[i])
-	 continue;
-      count++;
-      d = &values[table[i]];
-      hash = (d->pname * prime_factor);
-      j = 0;
-      while (1) {
-	 if (values[table[hash & mask]].pname == d->pname)
-	    break;
-	 hash += prime_step;
-	 j++;
-      }
-
-      if (j < 10)
-	 collisions[j]++;
-      else
-	 collisions[10]++;
-   }
-
-   printf("number of enums: %d (total %d)\n", count, Elements(values));
-   for (i = 0; i < Elements(collisions) - 1; i++)
-      if (collisions[i] > 0)
-	 printf("  %d enums with %d %scollisions\n",
-		collisions[i], i, i == 10 ? "or more " : "");
-}
-#endif
-
-/**
- * Initialize the enum hash for a given API 
- *
- * This is called from one_time_init() to insert the enum values that
- * are valid for the API in question into the enum hash table.
- *
- * \param the current context, for determining the API in question
- */
-void _mesa_init_get_hash(GLcontext *ctx)
-{
-   int i, hash, index, mask;
-   int api_mask = 0, api_bit;
-
-   mask = Elements(table) - 1;
-   api_bit = 1 << ctx->API;
-
-   for (i = 0; i < Elements(values); i++) {
-      if (values[i].type == TYPE_API_MASK) {
-	 api_mask = values[i].offset;
-	 continue;
-      }
-      if (!(api_mask & api_bit))
-	 continue;
-
-      hash = (values[i].pname * prime_factor) & mask;
-      while (1) {
-	 index = hash & mask;
-	 if (!table[index]) {
-	    table[index] = i;
-	    break;
-	 }
-	 hash += prime_step;
-      }
-   }
-
-#ifdef GET_DEBUG
-   print_table_stats();
-#endif
-}
-
-/**
- * Handle irregular enums
- *
- * Some values don't conform to the "well-known type at context
- * pointer + offset" pattern, so we have this function to catch all
- * the corner cases.  Typically, it's a computed value or a one-off
- * pointer to a custom struct or something.
- *
- * In this case we can't return a pointer to the value, so we'll have
- * to use the temporary variable 'v' declared back in the calling
- * glGet*v() function to store the result.
- *
- * \param ctx the current context
- * \param d the struct value_desc that describes the enum
- * \param v pointer to the tmp declared in the calling glGet*v() function
- */
-static void
-find_custom_value(GLcontext *ctx, const struct value_desc *d, union value *v)
-{
-   struct gl_buffer_object *buffer_obj;
-   struct gl_client_array *array;
-   GLuint unit, *p;
-
-   switch (d->pname) {
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_3D:
-   case GL_TEXTURE_1D_ARRAY_EXT:
-   case GL_TEXTURE_2D_ARRAY_EXT:
-   case GL_TEXTURE_CUBE_MAP_ARB:
-   case GL_TEXTURE_RECTANGLE_NV:
-      v->value_bool = _mesa_IsEnabled(d->pname);
-      break;
-
-   case GL_LINE_STIPPLE_PATTERN:
-      /* This is the only GLushort, special case it here by promoting
-       * to an int rather than introducing a new type. */
-      v->value_int = ctx->Line.StipplePattern;
-      break;
-
-   case GL_CURRENT_RASTER_TEXTURE_COORDS:
-      unit = ctx->Texture.CurrentUnit;
-      v->value_float_4[0] = ctx->Current.RasterTexCoords[unit][0];
-      v->value_float_4[1] = ctx->Current.RasterTexCoords[unit][1];
-      v->value_float_4[2] = ctx->Current.RasterTexCoords[unit][2];
-      v->value_float_4[3] = ctx->Current.RasterTexCoords[unit][3];
-      break;
-
-   case GL_CURRENT_TEXTURE_COORDS:
-      unit = ctx->Texture.CurrentUnit;
-      v->value_float_4[0] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0];
-      v->value_float_4[1] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1];
-      v->value_float_4[2] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2];
-      v->value_float_4[3] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3];
-      break;
-
-   case GL_COLOR_WRITEMASK:
-      v->value_int_4[0] = ctx->Color.ColorMask[0][RCOMP] ? 1 : 0;
-      v->value_int_4[1] = ctx->Color.ColorMask[0][GCOMP] ? 1 : 0;
-      v->value_int_4[2] = ctx->Color.ColorMask[0][BCOMP] ? 1 : 0;
-      v->value_int_4[3] = ctx->Color.ColorMask[0][ACOMP] ? 1 : 0;
-      break;
-
-   case GL_EDGE_FLAG:
-      v->value_bool = ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0;
-      break;
-
-   case GL_READ_BUFFER:
-      v->value_enum = ctx->ReadBuffer->ColorReadBuffer;
-      break;
-
-   case GL_MAP2_GRID_DOMAIN:
-      v->value_float_4[0] = ctx->Eval.MapGrid2u1;
-      v->value_float_4[1] = ctx->Eval.MapGrid2u2;
-      v->value_float_4[2] = ctx->Eval.MapGrid2v1;
-      v->value_float_4[3] = ctx->Eval.MapGrid2v2;
-      break;
-
-   case GL_TEXTURE_STACK_DEPTH:
-      unit = ctx->Texture.CurrentUnit;
-      v->value_int = ctx->TextureMatrixStack[unit].Depth + 1;
-      break;
-   case GL_TEXTURE_MATRIX:
-      unit = ctx->Texture.CurrentUnit;
-      v->value_matrix = ctx->TextureMatrixStack[unit].Top;
-      break;
-
-   case GL_TEXTURE_COORD_ARRAY:
-   case GL_TEXTURE_COORD_ARRAY_SIZE:
-   case GL_TEXTURE_COORD_ARRAY_TYPE:
-   case GL_TEXTURE_COORD_ARRAY_STRIDE:
-      array = &ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture];
-      v->value_int = *(GLuint *) ((char *) array + d->offset);
-      break;
-
-   case GL_ACTIVE_TEXTURE_ARB:
-      v->value_int = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
-      break;
-   case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-      v->value_int = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
-      break;
-
-   case GL_MODELVIEW_STACK_DEPTH:
-   case GL_PROJECTION_STACK_DEPTH:
-   case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
-      v->value_int = *(GLint *) ((char *) ctx + d->offset) + 1;
-      break;
-
-   case GL_MAX_TEXTURE_SIZE:
-   case GL_MAX_3D_TEXTURE_SIZE:
-   case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-      p = (GLuint *) ((char *) ctx + d->offset);
-      v->value_int = 1 << (*p - 1);
-      break;
-
-   case GL_SCISSOR_BOX:
-      v->value_int_4[0] = ctx->Scissor.X;
-      v->value_int_4[1] = ctx->Scissor.Y;
-      v->value_int_4[2] = ctx->Scissor.Width;
-      v->value_int_4[3] = ctx->Scissor.Height;
-      break;
-
-   case GL_LIST_INDEX:
-      v->value_int =
-	 ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0;
-      break;
-   case GL_LIST_MODE:
-      if (!ctx->CompileFlag)
-	 v->value_enum = 0;
-      else if (ctx->ExecuteFlag)
-	 v->value_enum = GL_COMPILE_AND_EXECUTE;
-      else
-	 v->value_enum = GL_COMPILE;
-      break;
-
-   case GL_VIEWPORT:
-      v->value_int_4[0] = ctx->Viewport.X;
-      v->value_int_4[1] = ctx->Viewport.Y;
-      v->value_int_4[2] = ctx->Viewport.Width;
-      v->value_int_4[3] = ctx->Viewport.Height;
-      break;
-
-   case GL_ACTIVE_STENCIL_FACE_EXT:
-      v->value_enum = ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT;
-      break;
-
-   case GL_STENCIL_FAIL:
-      v->value_enum = ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace];
-      break;
-   case GL_STENCIL_FUNC:
-      v->value_enum = ctx->Stencil.Function[ctx->Stencil.ActiveFace];
-      break;
-   case GL_STENCIL_PASS_DEPTH_FAIL:
-      v->value_enum = ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace];
-      break;
-   case GL_STENCIL_PASS_DEPTH_PASS:
-      v->value_enum = ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace];
-      break;
-   case GL_STENCIL_REF:
-      v->value_int = ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
-      break;
-   case GL_STENCIL_VALUE_MASK:
-      v->value_int = ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
-      break;
-   case GL_STENCIL_WRITEMASK:
-      v->value_int = ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
-      break;
-
-   case GL_NUM_EXTENSIONS:
-      v->value_int = _mesa_get_extension_count(ctx);
-      break;
-
-   case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-      v->value_int = _mesa_get_color_read_type(ctx);
-      break;
-   case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-      v->value_int = _mesa_get_color_read_format(ctx);
-      break;
-
-   case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-      v->value_int = ctx->CurrentStack->Depth + 1;
-      break;
-   case GL_CURRENT_MATRIX_ARB:
-   case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-      v->value_matrix = ctx->CurrentStack->Top;
-      break;
-
-   case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-      v->value_int = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);
-      break;
-   case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-      v->value_int_n.n = 
-	 _mesa_get_compressed_formats(ctx, v->value_int_n.ints, GL_FALSE);
-      ASSERT(v->value_int_n.n <= 100);
-      break;
-
-   case GL_MAX_VARYING_FLOATS_ARB:
-      v->value_int = ctx->Const.MaxVarying * 4;
-      break;
-
-   /* Various object names */
-
-   case GL_TEXTURE_BINDING_1D:
-   case GL_TEXTURE_BINDING_2D:
-   case GL_TEXTURE_BINDING_3D:
-   case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-   case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-   case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-   case GL_TEXTURE_BINDING_RECTANGLE_NV:
-      unit = ctx->Texture.CurrentUnit;
-      v->value_int =
-	 ctx->Texture.Unit[unit].CurrentTex[d->offset]->Name;
-      break;
-
-   /* GL_ARB_vertex_buffer_object */
-   case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-   case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-   case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-   case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-   case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-   case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-   case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-      buffer_obj = (struct gl_buffer_object *)
-	 ((char *) ctx->Array.ArrayObj + d->offset);
-      v->value_int = buffer_obj->Name;
-      break;
-   case GL_ARRAY_BUFFER_BINDING_ARB:
-      v->value_int = ctx->Array.ArrayBufferObj->Name;
-      break;
-   case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-      v->value_int =
-	 ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
-      break;
-   case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-      v->value_int = ctx->Array.ElementArrayBufferObj->Name;
-      break;
-
-   case GL_FRAGMENT_PROGRAM_BINDING_NV:
-      v->value_int = 
-	 ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
-      break;
-   case GL_VERTEX_PROGRAM_BINDING_NV:
-      v->value_int =
-	 ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0;
-      break;
-   case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-      v->value_int = ctx->Pack.BufferObj->Name;
-      break;
-   case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-      v->value_int = ctx->Unpack.BufferObj->Name;
-      break;
-   case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
-      v->value_int = ctx->TransformFeedback.CurrentBuffer->Name;
-      break;
-   case GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED:
-      v->value_int = ctx->TransformFeedback.CurrentObject->Paused;
-      break;
-   case GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE:
-      v->value_int = ctx->TransformFeedback.CurrentObject->Active;
-      break;
-   case GL_TRANSFORM_FEEDBACK_BINDING:
-      v->value_int = ctx->TransformFeedback.CurrentObject->Name;
-      break;
-   case GL_CURRENT_PROGRAM:
-      v->value_int =
-	 ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
-      break;
-   case GL_READ_FRAMEBUFFER_BINDING_EXT:
-      v->value_int = ctx->ReadBuffer->Name;
-      break;
-   case GL_RENDERBUFFER_BINDING_EXT:
-      v->value_int =
-	 ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
-      break;
-   case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:
-      v->value_int = ctx->Array.ArrayObj->PointSize.BufferObj->Name;
-      break;
-   }   
-}
-
-/**
- * Check extra constraints on a struct value_desc descriptor
- *
- * If a struct value_desc has a non-NULL extra pointer, it means that
- * there are a number of extra constraints to check or actions to
- * perform.  The extras is just an integer array where each integer
- * encode different constraints or actions.
- *
- * \param ctx current context
- * \param func name of calling glGet*v() function for error reporting
- * \param d the struct value_desc that has the extra constraints
- *
- * \return GL_FALSE if one of the constraints was not satisfied,
- *     otherwise GL_TRUE.
- */
-static GLboolean
-check_extra(GLcontext *ctx, const char *func, const struct value_desc *d)
-{
-   const GLuint version = ctx->VersionMajor * 10 + ctx->VersionMinor;
-   int total, enabled;
-   const int *e;
-
-   total = 0;
-   enabled = 0;
-   for (e = d->extra; *e != EXTRA_END; e++)
-      switch (*e) {
-      case EXTRA_VERSION_30:
-	 if (version >= 30) {
-	    total++;
-	    enabled++;
-	 }
-	 break;
-      case EXTRA_VERSION_31:
-	 if (version >= 31) {
-	    total++;
-	    enabled++;
-	 }
-	 break;
-      case EXTRA_VERSION_32:
-	 if (version >= 32) {
-	    total++;
-	    enabled++;
-	 }
-	 break;
-      case EXTRA_VERSION_ES2:
-	 if (ctx->API == API_OPENGLES2) {
-	    total++;
-	    enabled++;
-	 }
-	 break;
-      case EXTRA_NEW_BUFFERS:
-	 if (ctx->NewState & _NEW_BUFFERS)
-	    _mesa_update_state(ctx);
-	 break;
-      case EXTRA_FLUSH_CURRENT:
-	 FLUSH_CURRENT(ctx, 0);
-	 break;
-      case EXTRA_VALID_DRAW_BUFFER:
-	 if (d->pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
-	    _mesa_error(ctx, GL_INVALID_OPERATION, "%s(draw buffer %u)",
-			func, d->pname - GL_DRAW_BUFFER0_ARB);
-	    return GL_FALSE;
-	 }
-	 break;
-      case EXTRA_VALID_TEXTURE_UNIT:
-	 if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-	    _mesa_error(ctx, GL_INVALID_OPERATION, "%s(texture %u)",
-			func, ctx->Texture.CurrentUnit);
-	    return GL_FALSE;
-	 }
-	 break;
-      case EXTRA_END:
-	 break;
-      default: /* *e is a offset into the extension struct */
-	 total++;
-	 if (*(GLboolean *) ((char *) &ctx->Extensions + *e))
-	    enabled++;
-	 break;
-      }
-
-   if (total > 0 && enabled == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
-                  _mesa_lookup_enum_by_nr(d->pname));
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-static const struct value_desc error_value =
-   { 0, 0, TYPE_INVALID, NO_OFFSET, NO_EXTRA };
-
-/**
- * Find the struct value_desc corresponding to the enum 'pname'.
- * 
- * We hash the enum value to get an index into the 'table' array,
- * which holds the index in the 'values' array of struct value_desc.
- * Once we've found the entry, we do the extra checks, if any, then
- * look up the value and return a pointer to it.
- *
- * If the value has to be computed (for example, it's the result of a
- * function call or we need to add 1 to it), we use the tmp 'v' to
- * store the result.
- * 
- * \param func name of glGet*v() func for error reporting
- * \param pname the enum value we're looking up
- * \param p is were we return the pointer to the value
- * \param v a tmp union value variable in the calling glGet*v() function
- *
- * \return the struct value_desc corresponding to the enum or a struct
- *     value_desc of TYPE_INVALID if not found.  This lets the calling
- *     glGet*v() function jump right into a switch statement and
- *     handle errors there instead of having to check for NULL.
- */
-static const struct value_desc *
-find_value(const char *func, GLenum pname, void **p, union value *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *unit;
-   int mask, hash;
-   const struct value_desc *d;
-
-   mask = Elements(table) - 1;
-   hash = (pname * prime_factor);
-   while (1) {
-      d = &values[table[hash & mask]];
-      if (likely(d->pname == pname))
-	 break;
-
-      /* If the enum isn't valid, the hash walk ends with index 0,
-       * which is the API mask entry at the beginning of values[]. */
-      if (d->type == TYPE_API_MASK) {
-	 _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
-                     _mesa_lookup_enum_by_nr(pname));
-	 return &error_value;
-      }
-      hash += prime_step;
-   }
-
-   if (unlikely(d->extra && !check_extra(ctx, func, d)))
-      return &error_value;
-
-   switch (d->location) {
-   case LOC_BUFFER:
-      *p = ((char *) ctx->DrawBuffer + d->offset);
-      return d;
-   case LOC_CONTEXT:
-      *p = ((char *) ctx + d->offset);
-      return d;
-   case LOC_ARRAY:
-      *p = ((char *) ctx->Array.ArrayObj + d->offset);
-      return d;
-   case LOC_TEXUNIT:
-      unit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-      *p = ((char *) unit + d->offset);
-      return d;
-   case LOC_CUSTOM:
-      find_custom_value(ctx, d, v);
-      *p = v;
-      return d;
-   default:
-      assert(0);
-      break;
-   }
-
-   /* silence warning */
-   return &error_value;
-}
-
-static const int transpose[] = {
-   0, 4,  8, 12,
-   1, 5,  9, 13,
-   2, 6, 10, 14,
-   3, 7, 11, 15
-};
-
-void GLAPIENTRY
-_mesa_GetBooleanv(GLenum pname, GLboolean *params)
-{
-   const struct value_desc *d;
-   union value v;
-   GLmatrix *m;
-   int shift, i;
-   void *p;
-
-   d = find_value("glGetBooleanv", pname, &p, &v);
-   switch (d->type) {
-   case TYPE_INVALID:
-      break;
-   case TYPE_CONST:
-      params[0] = INT_TO_BOOLEAN(d->offset);
-      break;
-
-   case TYPE_FLOAT_4:
-   case TYPE_FLOATN_4:
-      params[3] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[3]);
-   case TYPE_FLOAT_3:
-   case TYPE_FLOATN_3:
-      params[2] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[2]);
-   case TYPE_FLOAT_2:
-   case TYPE_FLOATN_2:
-      params[1] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[1]);
-   case TYPE_FLOAT:
-   case TYPE_FLOATN:
-      params[0] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[0]);
-      break;
-
-   case TYPE_DOUBLEN:
-      params[0] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[0]);
-      break;
-
-   case TYPE_INT_4:
-      params[3] = INT_TO_BOOLEAN(((GLint *) p)[3]);
-   case TYPE_INT_3:
-      params[2] = INT_TO_BOOLEAN(((GLint *) p)[2]);
-   case TYPE_INT_2:
-   case TYPE_ENUM_2:
-      params[1] = INT_TO_BOOLEAN(((GLint *) p)[1]);
-   case TYPE_INT:
-   case TYPE_ENUM:
-      params[0] = INT_TO_BOOLEAN(((GLint *) p)[0]);
-      break;
-
-   case TYPE_INT_N:
-      for (i = 0; i < v.value_int_n.n; i++)
-	 params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);
-      break;
-
-   case TYPE_INT64:
-      params[0] = INT64_TO_BOOLEAN(((GLint64 *) p)[0]);
-      break;
-
-   case TYPE_BOOLEAN:
-      params[0] = ((GLboolean*) p)[0];
-      break;		
-
-   case TYPE_MATRIX:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_BOOLEAN(m->m[i]);
-      break;
-
-   case TYPE_MATRIX_T:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_BOOLEAN(m->m[transpose[i]]);
-      break;
-
-   case TYPE_BIT_0:
-   case TYPE_BIT_1:
-   case TYPE_BIT_2:
-   case TYPE_BIT_3:
-   case TYPE_BIT_4:
-   case TYPE_BIT_5:
-      shift = d->type - TYPE_BIT_0;
-      params[0] = (*(GLbitfield *) p >> shift) & 1;
-      break;
-   }
-}
-
-void GLAPIENTRY
-_mesa_GetFloatv(GLenum pname, GLfloat *params)
-{
-   const struct value_desc *d;
-   union value v;
-   GLmatrix *m;
-   int shift, i;
-   void *p;
-
-   d = find_value("glGetFloatv", pname, &p, &v);
-   switch (d->type) {
-   case TYPE_INVALID:
-      break;
-   case TYPE_CONST:
-      params[0] = (GLfloat) d->offset;
-      break;
-
-   case TYPE_FLOAT_4:
-   case TYPE_FLOATN_4:
-      params[3] = ((GLfloat *) p)[3];
-   case TYPE_FLOAT_3:
-   case TYPE_FLOATN_3:
-      params[2] = ((GLfloat *) p)[2];
-   case TYPE_FLOAT_2:
-   case TYPE_FLOATN_2:
-      params[1] = ((GLfloat *) p)[1];
-   case TYPE_FLOAT:
-   case TYPE_FLOATN:
-      params[0] = ((GLfloat *) p)[0];
-      break;
-
-   case TYPE_DOUBLEN:
-      params[0] = ((GLdouble *) p)[0];
-      break;
-
-   case TYPE_INT_4:
-      params[3] = (GLfloat) (((GLint *) p)[3]);
-   case TYPE_INT_3:
-      params[2] = (GLfloat) (((GLint *) p)[2]);
-   case TYPE_INT_2:
-   case TYPE_ENUM_2:
-      params[1] = (GLfloat) (((GLint *) p)[1]);
-   case TYPE_INT:
-   case TYPE_ENUM:
-      params[0] = (GLfloat) (((GLint *) p)[0]);
-      break;
-
-   case TYPE_INT_N:
-      for (i = 0; i < v.value_int_n.n; i++)
-	 params[i] = INT_TO_FLOAT(v.value_int_n.ints[i]);
-      break;
-
-   case TYPE_INT64:
-      params[0] = ((GLint64 *) p)[0];
-      break;
-
-   case TYPE_BOOLEAN:
-      params[0] = BOOLEAN_TO_FLOAT(*(GLboolean*) p);
-      break;		
-
-   case TYPE_MATRIX:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = m->m[i];
-      break;
-
-   case TYPE_MATRIX_T:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = m->m[transpose[i]];
-      break;
-
-   case TYPE_BIT_0:
-   case TYPE_BIT_1:
-   case TYPE_BIT_2:
-   case TYPE_BIT_3:
-   case TYPE_BIT_4:
-   case TYPE_BIT_5:
-      shift = d->type - TYPE_BIT_0;
-      params[0] = BOOLEAN_TO_FLOAT((*(GLbitfield *) p >> shift) & 1);
-      break;
-   }
-}
-
-void GLAPIENTRY
-_mesa_GetIntegerv(GLenum pname, GLint *params)
-{
-   const struct value_desc *d;
-   union value v;
-   GLmatrix *m;
-   int shift, i;
-   void *p;
-
-   d = find_value("glGetIntegerv", pname, &p, &v);
-   switch (d->type) {
-   case TYPE_INVALID:
-      break;
-   case TYPE_CONST:
-      params[0] = d->offset;
-      break;
-
-   case TYPE_FLOAT_4:
-      params[3] = IROUND(((GLfloat *) p)[3]);
-   case TYPE_FLOAT_3:
-      params[2] = IROUND(((GLfloat *) p)[2]);
-   case TYPE_FLOAT_2:
-      params[1] = IROUND(((GLfloat *) p)[1]);
-   case TYPE_FLOAT:
-      params[0] = IROUND(((GLfloat *) p)[0]);
-      break;
-
-   case TYPE_FLOATN_4:
-      params[3] = FLOAT_TO_INT(((GLfloat *) p)[3]);
-   case TYPE_FLOATN_3:
-      params[2] = FLOAT_TO_INT(((GLfloat *) p)[2]);
-   case TYPE_FLOATN_2:
-      params[1] = FLOAT_TO_INT(((GLfloat *) p)[1]);
-   case TYPE_FLOATN:
-      params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]);
-      break;
-
-   case TYPE_DOUBLEN:
-      params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]);
-      break;
-
-   case TYPE_INT_4:
-      params[3] = ((GLint *) p)[3];
-   case TYPE_INT_3:
-      params[2] = ((GLint *) p)[2];
-   case TYPE_INT_2:
-   case TYPE_ENUM_2:
-      params[1] = ((GLint *) p)[1];
-   case TYPE_INT:
-   case TYPE_ENUM:
-      params[0] = ((GLint *) p)[0];
-      break;
-
-   case TYPE_INT_N:
-      for (i = 0; i < v.value_int_n.n; i++)
-	 params[i] = v.value_int_n.ints[i];
-      break;
-
-   case TYPE_INT64:
-      params[0] = INT64_TO_INT(((GLint64 *) p)[0]);
-      break;
-
-   case TYPE_BOOLEAN:
-      params[0] = BOOLEAN_TO_INT(*(GLboolean*) p);
-      break;		
-
-   case TYPE_MATRIX:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_INT(m->m[i]);
-      break;
-
-   case TYPE_MATRIX_T:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_INT(m->m[transpose[i]]);
-      break;
-
-   case TYPE_BIT_0:
-   case TYPE_BIT_1:
-   case TYPE_BIT_2:
-   case TYPE_BIT_3:
-   case TYPE_BIT_4:
-   case TYPE_BIT_5:
-      shift = d->type - TYPE_BIT_0;
-      params[0] = (*(GLbitfield *) p >> shift) & 1;
-      break;
-   }
-}
-
-#if FEATURE_ARB_sync
-void GLAPIENTRY
-_mesa_GetInteger64v(GLenum pname, GLint64 *params)
-{
-   const struct value_desc *d;
-   union value v;
-   GLmatrix *m;
-   int shift, i;
-   void *p;
-
-   d = find_value("glGetInteger64v", pname, &p, &v);
-   switch (d->type) {
-   case TYPE_INVALID:
-      break;
-   case TYPE_CONST:
-      params[0] = d->offset;
-      break;
-
-   case TYPE_FLOAT_4:
-      params[3] = IROUND64(((GLfloat *) p)[3]);
-   case TYPE_FLOAT_3:
-      params[2] = IROUND64(((GLfloat *) p)[2]);
-   case TYPE_FLOAT_2:
-      params[1] = IROUND64(((GLfloat *) p)[1]);
-   case TYPE_FLOAT:
-      params[0] = IROUND64(((GLfloat *) p)[0]);
-      break;
-
-   case TYPE_FLOATN_4:
-      params[3] = FLOAT_TO_INT64(((GLfloat *) p)[3]);
-   case TYPE_FLOATN_3:
-      params[2] = FLOAT_TO_INT64(((GLfloat *) p)[2]);
-   case TYPE_FLOATN_2:
-      params[1] = FLOAT_TO_INT64(((GLfloat *) p)[1]);
-   case TYPE_FLOATN:
-      params[0] = FLOAT_TO_INT64(((GLfloat *) p)[0]);
-      break;
-
-   case TYPE_DOUBLEN:
-      params[0] = FLOAT_TO_INT64(((GLdouble *) p)[0]);
-      break;
-
-   case TYPE_INT_4:
-      params[3] = ((GLint *) p)[3];
-   case TYPE_INT_3:
-      params[2] = ((GLint *) p)[2];
-   case TYPE_INT_2:
-   case TYPE_ENUM_2:
-      params[1] = ((GLint *) p)[1];
-   case TYPE_INT:
-   case TYPE_ENUM:
-      params[0] = ((GLint *) p)[0];
-      break;
-
-   case TYPE_INT_N:
-      for (i = 0; i < v.value_int_n.n; i++)
-	 params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);
-      break;
-
-   case TYPE_INT64:
-      params[0] = ((GLint64 *) p)[0];
-      break;
-
-   case TYPE_BOOLEAN:
-      params[0] = ((GLboolean*) p)[0];
-      break;		
-
-   case TYPE_MATRIX:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_INT64(m->m[i]);
-      break;
-
-   case TYPE_MATRIX_T:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_INT64(m->m[transpose[i]]);
-      break;
-
-   case TYPE_BIT_0:
-   case TYPE_BIT_1:
-   case TYPE_BIT_2:
-   case TYPE_BIT_3:
-   case TYPE_BIT_4:
-   case TYPE_BIT_5:
-      shift = d->type - TYPE_BIT_0;
-      params[0] = (*(GLbitfield *) p >> shift) & 1;
-      break;
-   }
-}
-#endif /* FEATURE_ARB_sync */
-
-void GLAPIENTRY
-_mesa_GetDoublev(GLenum pname, GLdouble *params)
-{
-   const struct value_desc *d;
-   union value v;
-   GLmatrix *m;
-   int shift, i;
-   void *p;
-
-   d = find_value("glGetDoublev", pname, &p, &v);
-   switch (d->type) {
-   case TYPE_INVALID:
-      break;
-   case TYPE_CONST:
-      params[0] = d->offset;
-      break;
-
-   case TYPE_FLOAT_4:
-   case TYPE_FLOATN_4:
-      params[3] = ((GLfloat *) p)[3];
-   case TYPE_FLOAT_3:
-   case TYPE_FLOATN_3:
-      params[2] = ((GLfloat *) p)[2];
-   case TYPE_FLOAT_2:
-   case TYPE_FLOATN_2:
-      params[1] = ((GLfloat *) p)[1];
-   case TYPE_FLOAT:
-   case TYPE_FLOATN:
-      params[0] = ((GLfloat *) p)[0];
-      break;
-
-   case TYPE_DOUBLEN:
-      params[0] = ((GLdouble *) p)[0];
-      break;
-
-   case TYPE_INT_4:
-      params[3] = ((GLint *) p)[3];
-   case TYPE_INT_3:
-      params[2] = ((GLint *) p)[2];
-   case TYPE_INT_2:
-   case TYPE_ENUM_2:
-      params[1] = ((GLint *) p)[1];
-   case TYPE_INT:
-   case TYPE_ENUM:
-      params[0] = ((GLint *) p)[0];
-      break;
-
-   case TYPE_INT_N:
-      for (i = 0; i < v.value_int_n.n; i++)
-	 params[i] = v.value_int_n.ints[i];
-      break;
-
-   case TYPE_INT64:
-      params[0] = ((GLint64 *) p)[0];
-      break;
-
-   case TYPE_BOOLEAN:
-      params[0] = *(GLboolean*) p;
-      break;		
-
-   case TYPE_MATRIX:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = m->m[i];
-      break;
-
-   case TYPE_MATRIX_T:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = m->m[transpose[i]];
-      break;
-
-   case TYPE_BIT_0:
-   case TYPE_BIT_1:
-   case TYPE_BIT_2:
-   case TYPE_BIT_3:
-   case TYPE_BIT_4:
-   case TYPE_BIT_5:
-      shift = d->type - TYPE_BIT_0;
-      params[0] = (*(GLbitfield *) p >> shift) & 1;
-      break;
-   }
-}
-
-static enum value_type
-find_value_indexed(const char *func, GLenum pname, int index, union value *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   switch (pname) {
-
-   case GL_BLEND:
-      if (index >= ctx->Const.MaxDrawBuffers)
-	 goto invalid_value;
-      if (!ctx->Extensions.EXT_draw_buffers2)
-	 goto invalid_enum;
-      v->value_int = (ctx->Color.BlendEnabled >> index) & 1;
-      return TYPE_INT;
-
-   case GL_COLOR_WRITEMASK:
-      if (index >= ctx->Const.MaxDrawBuffers)
-	 goto invalid_value;
-      if (!ctx->Extensions.EXT_draw_buffers2)
-	 goto invalid_enum;
-      v->value_int_4[0] = ctx->Color.ColorMask[index][RCOMP] ? 1 : 0;
-      v->value_int_4[1] = ctx->Color.ColorMask[index][GCOMP] ? 1 : 0;
-      v->value_int_4[2] = ctx->Color.ColorMask[index][BCOMP] ? 1 : 0;
-      v->value_int_4[3] = ctx->Color.ColorMask[index][ACOMP] ? 1 : 0;
-      return TYPE_INT_4;
-
-   case GL_TRANSFORM_FEEDBACK_BUFFER_START:
-      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)
-	 goto invalid_value;
-      if (!ctx->Extensions.EXT_transform_feedback)
-	 goto invalid_enum;
-      v->value_int64 = ctx->TransformFeedback.CurrentObject->Offset[index];
-      return TYPE_INT64;
-
-   case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:
-      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)
-	 goto invalid_value;
-      if (!ctx->Extensions.EXT_transform_feedback)
-	 goto invalid_enum;
-      v->value_int64 = ctx->TransformFeedback.CurrentObject->Size[index];
-      return TYPE_INT64;
-
-   case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
-      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)
-	 goto invalid_value;
-      if (!ctx->Extensions.EXT_transform_feedback)
-	 goto invalid_enum;
-      v->value_int = ctx->TransformFeedback.CurrentObject->Buffers[index]->Name;
-      return TYPE_INT;
-   }
-
- invalid_enum:
-   _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
-               _mesa_lookup_enum_by_nr(pname));
-   return TYPE_INVALID;
- invalid_value:
-   _mesa_error(ctx, GL_INVALID_VALUE, "%s(pname=%s)", func,
-               _mesa_lookup_enum_by_nr(pname));
-   return TYPE_INVALID;
-}
-
-void GLAPIENTRY
-_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
-{
-   union value v;
-
-   switch (find_value_indexed("glGetBooleanIndexedv", pname, index, &v)) {
-   case TYPE_INT:
-      params[0] = INT_TO_BOOLEAN(v.value_int);
-      break;
-   case TYPE_INT_4:
-      params[0] = INT_TO_BOOLEAN(v.value_int_4[0]);
-      params[1] = INT_TO_BOOLEAN(v.value_int_4[1]);
-      params[2] = INT_TO_BOOLEAN(v.value_int_4[2]);
-      params[3] = INT_TO_BOOLEAN(v.value_int_4[3]);
-      break;
-   case TYPE_INT64:
-      params[0] = INT64_TO_BOOLEAN(v.value_int);
-      break;
-   default:
-      assert(0);
-   }
-}
-
-void GLAPIENTRY
-_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
-{
-   union value v;
-
-   switch (find_value_indexed("glGetIntegerIndexedv", pname, index, &v)) {
-   case TYPE_INT:
-      params[0] = v.value_int;
-      break;
-   case TYPE_INT_4:
-      params[0] = v.value_int_4[0];
-      params[1] = v.value_int_4[1];
-      params[2] = v.value_int_4[2];
-      params[3] = v.value_int_4[3];
-      break;
-   case TYPE_INT64:
-      params[0] = INT64_TO_INT(v.value_int);
-      break;
-   default:
-      assert(0);
-   }
-}
-
-#if FEATURE_ARB_sync
-void GLAPIENTRY
-_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
-{
-   union value v;
-
-   switch (find_value_indexed("glGetIntegerIndexedv", pname, index, &v)) {
-   case TYPE_INT:
-      params[0] = v.value_int;
-      break;
-   case TYPE_INT_4:
-      params[0] = v.value_int_4[0];
-      params[1] = v.value_int_4[1];
-      params[2] = v.value_int_4[2];
-      params[3] = v.value_int_4[3];
-      break;
-   case TYPE_INT64:
-      params[0] = v.value_int;
-      break;
-   default:
-      assert(0);
-   }
-}
-#endif /* FEATURE_ARB_sync */
-
-#if FEATURE_ES1
-void GLAPIENTRY
-_mesa_GetFixedv(GLenum pname, GLfixed *params)
-{
-   const struct value_desc *d;
-   union value v;
-   GLmatrix *m;
-   int shift, i;
-   void *p;
-
-   d = find_value("glGetDoublev", pname, &p, &v);
-   switch (d->type) {
-   case TYPE_INVALID:
-      break;
-   case TYPE_CONST:
-      params[0] = INT_TO_FIXED(d->offset);
-      break;
-
-   case TYPE_FLOAT_4:
-   case TYPE_FLOATN_4:
-      params[3] = FLOAT_TO_FIXED(((GLfloat *) p)[3]);
-   case TYPE_FLOAT_3:
-   case TYPE_FLOATN_3:
-      params[2] = FLOAT_TO_FIXED(((GLfloat *) p)[2]);
-   case TYPE_FLOAT_2:
-   case TYPE_FLOATN_2:
-      params[1] = FLOAT_TO_FIXED(((GLfloat *) p)[1]);
-   case TYPE_FLOAT:
-   case TYPE_FLOATN:
-      params[0] = FLOAT_TO_FIXED(((GLfloat *) p)[0]);
-      break;
-
-   case TYPE_DOUBLEN:
-      params[0] = FLOAT_TO_FIXED(((GLdouble *) p)[0]);
-      break;
-
-   case TYPE_INT_4:
-      params[3] = INT_TO_FIXED(((GLint *) p)[3]);
-   case TYPE_INT_3:
-      params[2] = INT_TO_FIXED(((GLint *) p)[2]);
-   case TYPE_INT_2:
-   case TYPE_ENUM_2:
-      params[1] = INT_TO_FIXED(((GLint *) p)[1]);
-   case TYPE_INT:
-   case TYPE_ENUM:
-      params[0] = INT_TO_FIXED(((GLint *) p)[0]);
-      break;
-
-   case TYPE_INT_N:
-      for (i = 0; i < v.value_int_n.n; i++)
-	 params[i] = INT_TO_FIXED(v.value_int_n.ints[i]);
-      break;
-
-   case TYPE_INT64:
-      params[0] = ((GLint64 *) p)[0];
-      break;
-
-   case TYPE_BOOLEAN:
-      params[0] = BOOLEAN_TO_FIXED(((GLboolean*) p)[0]);
-      break;		
-
-   case TYPE_MATRIX:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_FIXED(m->m[i]);
-      break;
-
-   case TYPE_MATRIX_T:
-      m = *(GLmatrix **) p;
-      for (i = 0; i < 16; i++)
-	 params[i] = FLOAT_TO_FIXED(m->m[transpose[i]]);
-      break;
-
-   case TYPE_BIT_0:
-   case TYPE_BIT_1:
-   case TYPE_BIT_2:
-   case TYPE_BIT_3:
-   case TYPE_BIT_4:
-   case TYPE_BIT_5:
-      shift = d->type - TYPE_BIT_0;
-      params[0] = BOOLEAN_TO_FIXED((*(GLbitfield *) p >> shift) & 1);
-      break;
-   }
-}
-#endif
+/*

+ * Copyright (C) 2010  Brian Paul   All Rights Reserved.

+ * Copyright (C) 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.

+ *

+ * Author: Kristian Høgsberg <krh@bitplanet.net>

+ */

+

+#include "glheader.h"

+#include "context.h"

+#include "enable.h"

+#include "enums.h"

+#include "extensions.h"

+#include "get.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "state.h"

+#include "texcompress.h"

+#include "framebuffer.h"

+

+/* This is a table driven implemetation of the glGet*v() functions.

+ * The basic idea is that most getters just look up an int somewhere

+ * in struct gl_context and then convert it to a bool or float according to

+ * which of glGetIntegerv() glGetBooleanv() etc is being called.

+ * Instead of generating code to do this, we can just record the enum

+ * value and the offset into struct gl_context in an array of structs.  Then

+ * in glGet*(), we lookup the struct for the enum in question, and use

+ * the offset to get the int we need.

+ *

+ * Sometimes we need to look up a float, a boolean, a bit in a

+ * bitfield, a matrix or other types instead, so we need to track the

+ * type of the value in struct gl_context.  And sometimes the value isn't in

+ * struct gl_context but in the drawbuffer, the array object, current texture

+ * unit, or maybe it's a computed value.  So we need to also track

+ * where or how to find the value.  Finally, we sometimes need to

+ * check that one of a number of extensions are enabled, the GL

+ * version or flush or call _mesa_update_state().  This is done by

+ * attaching optional extra information to the value description

+ * struct, it's sort of like an array of opcodes that describe extra

+ * checks or actions.

+ *

+ * Putting all this together we end up with struct value_desc below,

+ * and with a couple of macros to help, the table of struct value_desc

+ * is about as concise as the specification in the old python script.

+ */

+

+#undef CONST

+

+#define FLOAT_TO_BOOLEAN(X)   ( (X) ? GL_TRUE : GL_FALSE )

+#define FLOAT_TO_FIXED(F)     ( ((F) * 65536.0f > INT_MAX) ? INT_MAX : \

+                                ((F) * 65536.0f < INT_MIN) ? INT_MIN : \

+                                (GLint) ((F) * 65536.0f) )

+

+#define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )

+#define INT_TO_FIXED(I)       ( ((I) > SHRT_MAX) ? INT_MAX : \

+                                ((I) < SHRT_MIN) ? INT_MIN : \

+                                (GLint) ((I) * 65536) )

+

+#define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )

+#define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )

+

+#define BOOLEAN_TO_INT(B)     ( (GLint) (B) )

+#define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )

+#define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )

+#define BOOLEAN_TO_FIXED(B)   ( (GLint) ((B) ? 1 : 0) << 16 )

+

+#define ENUM_TO_INT64(E)      ( (GLint64) (E) )

+#define ENUM_TO_FIXED(E)      (E)

+

+enum value_type {

+   TYPE_INVALID,

+   TYPE_API_MASK,

+   TYPE_INT,

+   TYPE_INT_2,

+   TYPE_INT_3,

+   TYPE_INT_4,

+   TYPE_INT_N,

+   TYPE_INT64,

+   TYPE_ENUM,

+   TYPE_ENUM_2,

+   TYPE_BOOLEAN,

+   TYPE_BIT_0,

+   TYPE_BIT_1,

+   TYPE_BIT_2,

+   TYPE_BIT_3,

+   TYPE_BIT_4,

+   TYPE_BIT_5,

+   TYPE_FLOAT,

+   TYPE_FLOAT_2,

+   TYPE_FLOAT_3,

+   TYPE_FLOAT_4,

+   TYPE_FLOATN,

+   TYPE_FLOATN_2,

+   TYPE_FLOATN_3,

+   TYPE_FLOATN_4,

+   TYPE_DOUBLEN,

+   TYPE_MATRIX,

+   TYPE_MATRIX_T,

+   TYPE_CONST

+};

+

+enum value_location {

+   LOC_BUFFER,

+   LOC_CONTEXT,

+   LOC_ARRAY,

+   LOC_TEXUNIT,

+   LOC_CUSTOM

+};

+

+enum value_extra {

+   EXTRA_END = 0x8000,

+   EXTRA_VERSION_30,

+   EXTRA_VERSION_31,

+   EXTRA_VERSION_32,

+   EXTRA_VERSION_ES2,

+   EXTRA_NEW_BUFFERS, 

+   EXTRA_VALID_DRAW_BUFFER,

+   EXTRA_VALID_TEXTURE_UNIT,

+   EXTRA_FLUSH_CURRENT,

+};

+

+#define NO_EXTRA NULL

+#define NO_OFFSET 0

+

+struct value_desc {

+   GLenum pname;

+   GLubyte location;  /**< enum value_location */

+   GLubyte type;      /**< enum value_type */

+   int offset;

+   const int *extra;

+};

+

+union value {

+   GLfloat value_float;

+   GLfloat value_float_4[4];

+   GLmatrix *value_matrix;

+   GLint value_int;

+   GLint value_int_4[4];

+   GLint64 value_int64;

+   GLenum value_enum;

+

+   /* Sigh, see GL_COMPRESSED_TEXTURE_FORMATS_ARB handling */

+   struct {

+      GLint n, ints[100];

+   } value_int_n;

+   GLboolean value_bool;

+};

+

+#define BUFFER_FIELD(field, type) \

+   LOC_BUFFER, type, offsetof(struct gl_framebuffer, field)

+#define CONTEXT_FIELD(field, type) \

+   LOC_CONTEXT, type, offsetof(struct gl_context, field)

+#define ARRAY_FIELD(field, type) \

+   LOC_ARRAY, type, offsetof(struct gl_array_object, field)

+#define CONST(value) \

+   LOC_CONTEXT, TYPE_CONST, value

+

+#define BUFFER_INT(field) BUFFER_FIELD(field, TYPE_INT)

+#define BUFFER_ENUM(field) BUFFER_FIELD(field, TYPE_ENUM)

+#define BUFFER_BOOL(field) BUFFER_FIELD(field, TYPE_BOOLEAN)

+

+#define CONTEXT_INT(field) CONTEXT_FIELD(field, TYPE_INT)

+#define CONTEXT_INT2(field) CONTEXT_FIELD(field, TYPE_INT_2)

+#define CONTEXT_INT64(field) CONTEXT_FIELD(field, TYPE_INT64)

+#define CONTEXT_ENUM(field) CONTEXT_FIELD(field, TYPE_ENUM)

+#define CONTEXT_ENUM2(field) CONTEXT_FIELD(field, TYPE_ENUM_2)

+#define CONTEXT_BOOL(field) CONTEXT_FIELD(field, TYPE_BOOLEAN)

+#define CONTEXT_BIT0(field) CONTEXT_FIELD(field, TYPE_BIT_0)

+#define CONTEXT_BIT1(field) CONTEXT_FIELD(field, TYPE_BIT_1)

+#define CONTEXT_BIT2(field) CONTEXT_FIELD(field, TYPE_BIT_2)

+#define CONTEXT_BIT3(field) CONTEXT_FIELD(field, TYPE_BIT_3)

+#define CONTEXT_BIT4(field) CONTEXT_FIELD(field, TYPE_BIT_4)

+#define CONTEXT_BIT5(field) CONTEXT_FIELD(field, TYPE_BIT_5)

+#define CONTEXT_FLOAT(field) CONTEXT_FIELD(field, TYPE_FLOAT)

+#define CONTEXT_FLOAT2(field) CONTEXT_FIELD(field, TYPE_FLOAT_2)

+#define CONTEXT_FLOAT3(field) CONTEXT_FIELD(field, TYPE_FLOAT_3)

+#define CONTEXT_FLOAT4(field) CONTEXT_FIELD(field, TYPE_FLOAT_4)

+#define CONTEXT_MATRIX(field) CONTEXT_FIELD(field, TYPE_MATRIX)

+#define CONTEXT_MATRIX_T(field) CONTEXT_FIELD(field, TYPE_MATRIX_T)

+

+#define ARRAY_INT(field) ARRAY_FIELD(field, TYPE_INT)

+#define ARRAY_ENUM(field) ARRAY_FIELD(field, TYPE_ENUM)

+#define ARRAY_BOOL(field) ARRAY_FIELD(field, TYPE_BOOLEAN)

+

+#define EXT(f)					\

+   offsetof(struct gl_extensions, f)

+

+#define EXTRA_EXT(e)				\

+   static const int extra_##e[] = {		\

+      EXT(e), EXTRA_END				\

+   }

+

+#define EXTRA_EXT2(e1, e2)			\

+   static const int extra_##e1##_##e2[] = {	\

+      EXT(e1), EXT(e2), EXTRA_END		\

+   }

+

+/* The 'extra' mechanism is a way to specify extra checks (such as

+ * extensions or specific gl versions) or actions (flush current, new

+ * buffers) that we need to do before looking up an enum.  We need to

+ * declare them all up front so we can refer to them in the value_desc

+ * structs below. */

+

+static const int extra_new_buffers[] = {

+   EXTRA_NEW_BUFFERS,

+   EXTRA_END

+};

+

+static const int extra_valid_draw_buffer[] = {

+   EXTRA_VALID_DRAW_BUFFER,

+   EXTRA_END

+};

+

+static const int extra_valid_texture_unit[] = {

+   EXTRA_VALID_TEXTURE_UNIT,

+   EXTRA_END

+};

+

+static const int extra_flush_current_valid_texture_unit[] = {

+   EXTRA_FLUSH_CURRENT,

+   EXTRA_VALID_TEXTURE_UNIT,

+   EXTRA_END

+};

+

+static const int extra_flush_current[] = {

+   EXTRA_FLUSH_CURRENT,

+   EXTRA_END

+};

+

+static const int extra_new_buffers_OES_read_format[] = {

+   EXTRA_NEW_BUFFERS,

+   EXT(OES_read_format),

+   EXTRA_END

+};

+

+static const int extra_EXT_secondary_color_flush_current[] = {

+   EXT(EXT_secondary_color),

+   EXTRA_FLUSH_CURRENT,

+   EXTRA_END

+};

+

+static const int extra_EXT_fog_coord_flush_current[] = {

+   EXT(EXT_fog_coord),

+   EXTRA_FLUSH_CURRENT,

+   EXTRA_END

+};

+

+static const int extra_EXT_texture_integer[] = {

+   EXT(EXT_texture_integer),

+   EXTRA_END

+};

+

+static const int extra_EXT_gpu_shader4[] = {

+   EXT(EXT_gpu_shader4),

+   EXTRA_END

+};

+

+

+EXTRA_EXT(ARB_multitexture);

+EXTRA_EXT(ARB_texture_cube_map);

+EXTRA_EXT(MESA_texture_array);

+EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program);

+EXTRA_EXT(EXT_secondary_color);

+EXTRA_EXT(EXT_fog_coord);

+EXTRA_EXT(EXT_texture_lod_bias);

+EXTRA_EXT(EXT_texture_filter_anisotropic);

+EXTRA_EXT(IBM_rasterpos_clip);

+EXTRA_EXT(NV_point_sprite);

+EXTRA_EXT(SGIS_generate_mipmap);

+EXTRA_EXT(NV_vertex_program);

+EXTRA_EXT(NV_fragment_program);

+EXTRA_EXT(NV_texture_rectangle);

+EXTRA_EXT(EXT_stencil_two_side);

+EXTRA_EXT(NV_light_max_exponent);

+EXTRA_EXT(SGI_texture_color_table);

+EXTRA_EXT(EXT_depth_bounds_test);

+EXTRA_EXT(ARB_depth_clamp);

+EXTRA_EXT(ATI_fragment_shader);

+EXTRA_EXT(EXT_framebuffer_blit);

+EXTRA_EXT(ARB_shader_objects);

+EXTRA_EXT(EXT_provoking_vertex);

+EXTRA_EXT(ARB_fragment_shader);

+EXTRA_EXT(ARB_fragment_program);

+EXTRA_EXT2(ARB_framebuffer_object, EXT_framebuffer_multisample);

+EXTRA_EXT(EXT_framebuffer_object);

+EXTRA_EXT(APPLE_vertex_array_object);

+EXTRA_EXT(ARB_seamless_cube_map);

+EXTRA_EXT(EXT_compiled_vertex_array);

+EXTRA_EXT(ARB_sync);

+EXTRA_EXT(ARB_vertex_shader);

+EXTRA_EXT(EXT_transform_feedback);

+EXTRA_EXT(ARB_transform_feedback2);

+EXTRA_EXT(EXT_pixel_buffer_object);

+EXTRA_EXT(ARB_vertex_program);

+EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);

+EXTRA_EXT2(ARB_fragment_program, NV_fragment_program);

+EXTRA_EXT2(ARB_vertex_program, NV_vertex_program);

+EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);

+EXTRA_EXT(ARB_vertex_buffer_object);

+EXTRA_EXT(ARB_geometry_shader4);

+EXTRA_EXT(ARB_copy_buffer);

+

+static const int

+extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {

+   EXT(ARB_vertex_program),

+   EXT(ARB_fragment_program),

+   EXT(NV_vertex_program),

+   EXTRA_END

+};

+

+static const int

+extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {

+   EXT(NV_vertex_program),

+   EXT(ARB_vertex_program),

+   EXT(ARB_fragment_program),

+   EXT(NV_vertex_program),

+   EXTRA_END

+};

+

+static const int

+extra_NV_primitive_restart[] = {

+   EXT(NV_primitive_restart),

+   EXTRA_END

+};

+

+static const int extra_version_30[] = { EXTRA_VERSION_30, EXTRA_END };

+static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END };

+static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END };

+

+static const int

+extra_ARB_vertex_program_version_es2[] = {

+   EXT(ARB_vertex_program),

+   EXTRA_VERSION_ES2,

+   EXTRA_END

+};

+

+#define API_OPENGL_BIT (1 << API_OPENGL)

+#define API_OPENGLES_BIT (1 << API_OPENGLES)

+#define API_OPENGLES2_BIT (1 << API_OPENGLES2)

+

+/* This is the big table describing all the enums we accept in

+ * glGet*v().  The table is partitioned into six parts: enums

+ * understood by all GL APIs (OpenGL, GLES and GLES2), enums shared

+ * between OpenGL and GLES, enums exclusive to GLES, etc for the

+ * remaining combinations.  When we add the enums to the hash table in

+ * _mesa_init_get_hash(), we only add the enums for the API we're

+ * instantiating and the different sections are guarded by #if

+ * FEATURE_GL etc to make sure we only compile in the enums we may

+ * need. */

+

+static const struct value_desc values[] = {

+   /* Enums shared between OpenGL, GLES1 and GLES2 */

+   { 0, 0, TYPE_API_MASK,

+     API_OPENGL_BIT | API_OPENGLES_BIT | API_OPENGLES2_BIT, NO_EXTRA},

+   { GL_ALPHA_BITS, BUFFER_INT(Visual.alphaBits), extra_new_buffers },

+   { GL_BLEND, CONTEXT_BIT0(Color.BlendEnabled), NO_EXTRA },

+   { GL_BLEND_SRC, CONTEXT_ENUM(Color.BlendSrcRGB), NO_EXTRA },

+   { GL_BLUE_BITS, BUFFER_INT(Visual.blueBits), extra_new_buffers },

+   { GL_COLOR_CLEAR_VALUE, CONTEXT_FIELD(Color.ClearColor[0], TYPE_FLOATN_4), NO_EXTRA },

+   { GL_COLOR_WRITEMASK, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },

+   { GL_CULL_FACE, CONTEXT_BOOL(Polygon.CullFlag), NO_EXTRA },

+   { GL_CULL_FACE_MODE, CONTEXT_ENUM(Polygon.CullFaceMode), NO_EXTRA },

+   { GL_DEPTH_BITS, BUFFER_INT(Visual.depthBits), NO_EXTRA },

+   { GL_DEPTH_CLEAR_VALUE, CONTEXT_FIELD(Depth.Clear, TYPE_DOUBLEN), NO_EXTRA },

+   { GL_DEPTH_FUNC, CONTEXT_ENUM(Depth.Func), NO_EXTRA },

+   { GL_DEPTH_RANGE, CONTEXT_FIELD(Viewport.Near, TYPE_FLOATN_2), NO_EXTRA },

+   { GL_DEPTH_TEST, CONTEXT_BOOL(Depth.Test), NO_EXTRA },

+   { GL_DEPTH_WRITEMASK, CONTEXT_BOOL(Depth.Mask), NO_EXTRA },

+   { GL_DITHER, CONTEXT_BOOL(Color.DitherFlag), NO_EXTRA },

+   { GL_FRONT_FACE, CONTEXT_ENUM(Polygon.FrontFace), NO_EXTRA },

+   { GL_GREEN_BITS, BUFFER_INT(Visual.greenBits), extra_new_buffers },

+   { GL_LINE_WIDTH, CONTEXT_FLOAT(Line.Width), NO_EXTRA },

+   { GL_ALIASED_LINE_WIDTH_RANGE, CONTEXT_FLOAT2(Const.MinLineWidth), NO_EXTRA },

+   { GL_MAX_ELEMENTS_VERTICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },

+   { GL_MAX_ELEMENTS_INDICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },

+   { GL_MAX_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_context, Const.MaxTextureLevels), NO_EXTRA },

+   { GL_MAX_VIEWPORT_DIMS, CONTEXT_INT2(Const.MaxViewportWidth), NO_EXTRA },

+   { GL_PACK_ALIGNMENT, CONTEXT_INT(Pack.Alignment), NO_EXTRA },

+   { GL_ALIASED_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSize), NO_EXTRA },

+   { GL_POLYGON_OFFSET_FACTOR, CONTEXT_FLOAT(Polygon.OffsetFactor ), NO_EXTRA },

+   { GL_POLYGON_OFFSET_UNITS, CONTEXT_FLOAT(Polygon.OffsetUnits ), NO_EXTRA },

+   { GL_POLYGON_OFFSET_FILL, CONTEXT_BOOL(Polygon.OffsetFill), NO_EXTRA },

+   { GL_RED_BITS, BUFFER_INT(Visual.redBits), extra_new_buffers },

+   { GL_SCISSOR_BOX, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },

+   { GL_SCISSOR_TEST, CONTEXT_BOOL(Scissor.Enabled), NO_EXTRA },

+   { GL_STENCIL_BITS, BUFFER_INT(Visual.stencilBits), NO_EXTRA },

+   { GL_STENCIL_CLEAR_VALUE, CONTEXT_INT(Stencil.Clear), NO_EXTRA },

+   { GL_STENCIL_FAIL, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },

+   { GL_STENCIL_FUNC, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },

+   { GL_STENCIL_PASS_DEPTH_FAIL, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },

+   { GL_STENCIL_PASS_DEPTH_PASS, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },

+   { GL_STENCIL_REF, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },

+   { GL_STENCIL_TEST, CONTEXT_BOOL(Stencil.Enabled), NO_EXTRA },

+   { GL_STENCIL_VALUE_MASK, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },

+   { GL_STENCIL_WRITEMASK, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },

+   { GL_SUBPIXEL_BITS, CONTEXT_INT(Const.SubPixelBits), NO_EXTRA },

+   { GL_TEXTURE_BINDING_2D, LOC_CUSTOM, TYPE_INT, TEXTURE_2D_INDEX, NO_EXTRA },

+   { GL_UNPACK_ALIGNMENT, CONTEXT_INT(Unpack.Alignment), NO_EXTRA },

+   { GL_VIEWPORT, LOC_CUSTOM, TYPE_INT_4, 0, NO_EXTRA },

+

+   /* GL_ARB_multitexture */

+   { GL_ACTIVE_TEXTURE_ARB,

+     LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },

+

+   /* Note that all the OES_* extensions require that the Mesa "struct

+    * gl_extensions" include a member with the name of the extension.

+    * That structure does not yet include OES extensions (and we're

+    * not sure whether it will).  If it does, all the OES_*

+    * extensions below should mark the dependency. */

+

+   /* GL_ARB_texture_cube_map */

+   { GL_TEXTURE_BINDING_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_INT,

+     TEXTURE_CUBE_INDEX, extra_ARB_texture_cube_map },

+   { GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_context, Const.MaxCubeTextureLevels),

+     extra_ARB_texture_cube_map }, /* XXX: OES_texture_cube_map */

+

+   /* XXX: OES_blend_subtract */

+   { GL_BLEND_SRC_RGB_EXT, CONTEXT_ENUM(Color.BlendSrcRGB), NO_EXTRA },

+   { GL_BLEND_DST_RGB_EXT, CONTEXT_ENUM(Color.BlendDstRGB), NO_EXTRA },

+   { GL_BLEND_SRC_ALPHA_EXT, CONTEXT_ENUM(Color.BlendSrcA), NO_EXTRA },

+   { GL_BLEND_DST_ALPHA_EXT, CONTEXT_ENUM(Color.BlendDstA), NO_EXTRA },

+

+   /* GL_BLEND_EQUATION_RGB, which is what we're really after, is

+    * defined identically to GL_BLEND_EQUATION. */

+   { GL_BLEND_EQUATION, CONTEXT_ENUM(Color.BlendEquationRGB), NO_EXTRA },

+   { GL_BLEND_EQUATION_ALPHA_EXT, CONTEXT_ENUM(Color.BlendEquationA), NO_EXTRA },

+

+   /* GL_ARB_texture_compression */

+   { GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },

+   { GL_COMPRESSED_TEXTURE_FORMATS_ARB, LOC_CUSTOM, TYPE_INT_N, 0, NO_EXTRA },

+

+   /* GL_ARB_multisample */

+   { GL_SAMPLE_ALPHA_TO_COVERAGE_ARB,

+     CONTEXT_BOOL(Multisample.SampleAlphaToCoverage), NO_EXTRA },

+   { GL_SAMPLE_COVERAGE_ARB, CONTEXT_BOOL(Multisample.SampleCoverage), NO_EXTRA },

+   { GL_SAMPLE_COVERAGE_VALUE_ARB,

+     CONTEXT_FLOAT(Multisample.SampleCoverageValue), NO_EXTRA },

+   { GL_SAMPLE_COVERAGE_INVERT_ARB,

+     CONTEXT_BOOL(Multisample.SampleCoverageInvert), NO_EXTRA },

+   { GL_SAMPLE_BUFFERS_ARB, BUFFER_INT(Visual.sampleBuffers), NO_EXTRA },

+   { GL_SAMPLES_ARB, BUFFER_INT(Visual.samples), NO_EXTRA },

+

+   /* GL_SGIS_generate_mipmap */

+   { GL_GENERATE_MIPMAP_HINT_SGIS, CONTEXT_ENUM(Hint.GenerateMipmap),

+     extra_SGIS_generate_mipmap },

+

+   /* GL_ARB_vertex_buffer_object */

+   { GL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },

+

+   /* GL_ARB_vertex_buffer_object */

+   /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported */

+   { GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0,

+     extra_ARB_vertex_buffer_object },

+

+   /* GL_ARB_copy_buffer */

+   { GL_COPY_READ_BUFFER, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_copy_buffer },

+   { GL_COPY_WRITE_BUFFER, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_copy_buffer },

+

+   /* GL_OES_read_format */

+   { GL_IMPLEMENTATION_COLOR_READ_TYPE_OES, LOC_CUSTOM, TYPE_INT, 0,

+     extra_new_buffers_OES_read_format },

+   { GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES, LOC_CUSTOM, TYPE_INT, 0,

+     extra_new_buffers_OES_read_format },

+

+   /* GL_EXT_framebuffer_object */

+   { GL_FRAMEBUFFER_BINDING_EXT, BUFFER_INT(Name),

+     extra_EXT_framebuffer_object },

+   { GL_RENDERBUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,

+     extra_EXT_framebuffer_object },

+   { GL_MAX_RENDERBUFFER_SIZE_EXT, CONTEXT_INT(Const.MaxRenderbufferSize),

+     extra_EXT_framebuffer_object },

+

+   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's

+    * GLSL: */

+   { GL_MAX_CLIP_PLANES, CONTEXT_INT(Const.MaxClipPlanes), NO_EXTRA },

+

+#if FEATURE_GL || FEATURE_ES1

+   /* Enums in OpenGL and GLES1 */

+   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES_BIT, NO_EXTRA },

+   { GL_LIGHT0, CONTEXT_BOOL(Light.Light[0].Enabled), NO_EXTRA },

+   { GL_LIGHT1, CONTEXT_BOOL(Light.Light[1].Enabled), NO_EXTRA },

+   { GL_LIGHT2, CONTEXT_BOOL(Light.Light[2].Enabled), NO_EXTRA },

+   { GL_LIGHT3, CONTEXT_BOOL(Light.Light[3].Enabled), NO_EXTRA },

+   { GL_LIGHT4, CONTEXT_BOOL(Light.Light[4].Enabled), NO_EXTRA },

+   { GL_LIGHT5, CONTEXT_BOOL(Light.Light[5].Enabled), NO_EXTRA },

+   { GL_LIGHT6, CONTEXT_BOOL(Light.Light[6].Enabled), NO_EXTRA },

+   { GL_LIGHT7, CONTEXT_BOOL(Light.Light[7].Enabled), NO_EXTRA },

+   { GL_LIGHTING, CONTEXT_BOOL(Light.Enabled), NO_EXTRA },

+   { GL_LIGHT_MODEL_AMBIENT,

+     CONTEXT_FIELD(Light.Model.Ambient[0], TYPE_FLOATN_4), NO_EXTRA },

+   { GL_LIGHT_MODEL_TWO_SIDE, CONTEXT_BOOL(Light.Model.TwoSide), NO_EXTRA },

+   { GL_ALPHA_TEST, CONTEXT_BOOL(Color.AlphaEnabled), NO_EXTRA },

+   { GL_ALPHA_TEST_FUNC, CONTEXT_ENUM(Color.AlphaFunc), NO_EXTRA },

+   { GL_ALPHA_TEST_REF, CONTEXT_FIELD(Color.AlphaRef, TYPE_FLOATN), NO_EXTRA },

+   { GL_BLEND_DST, CONTEXT_ENUM(Color.BlendDstRGB), NO_EXTRA },

+   { GL_CLIP_PLANE0, CONTEXT_BIT0(Transform.ClipPlanesEnabled), NO_EXTRA },

+   { GL_CLIP_PLANE1, CONTEXT_BIT1(Transform.ClipPlanesEnabled), NO_EXTRA },

+   { GL_CLIP_PLANE2, CONTEXT_BIT2(Transform.ClipPlanesEnabled), NO_EXTRA },

+   { GL_CLIP_PLANE3, CONTEXT_BIT3(Transform.ClipPlanesEnabled), NO_EXTRA },

+   { GL_CLIP_PLANE4, CONTEXT_BIT4(Transform.ClipPlanesEnabled), NO_EXTRA },

+   { GL_CLIP_PLANE5, CONTEXT_BIT5(Transform.ClipPlanesEnabled), NO_EXTRA },

+   { GL_COLOR_MATERIAL, CONTEXT_BOOL(Light.ColorMaterialEnabled), NO_EXTRA },

+   { GL_CURRENT_COLOR,

+     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR0][0], TYPE_FLOATN_4),

+     extra_flush_current },

+   { GL_CURRENT_NORMAL,

+     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_NORMAL][0], TYPE_FLOATN_3),

+     extra_flush_current },

+   { GL_CURRENT_TEXTURE_COORDS, LOC_CUSTOM, TYPE_FLOAT_4, 0,

+     extra_flush_current_valid_texture_unit },

+   { GL_DISTANCE_ATTENUATION_EXT, CONTEXT_FLOAT3(Point.Params[0]), NO_EXTRA },

+   { GL_FOG, CONTEXT_BOOL(Fog.Enabled), NO_EXTRA },

+   { GL_FOG_COLOR, CONTEXT_FIELD(Fog.Color[0], TYPE_FLOATN_4), NO_EXTRA },

+   { GL_FOG_DENSITY, CONTEXT_FLOAT(Fog.Density), NO_EXTRA },

+   { GL_FOG_END, CONTEXT_FLOAT(Fog.End), NO_EXTRA },

+   { GL_FOG_HINT, CONTEXT_ENUM(Hint.Fog), NO_EXTRA },

+   { GL_FOG_MODE, CONTEXT_ENUM(Fog.Mode), NO_EXTRA },

+   { GL_FOG_START, CONTEXT_FLOAT(Fog.Start), NO_EXTRA },

+   { GL_LINE_SMOOTH, CONTEXT_BOOL(Line.SmoothFlag), NO_EXTRA },

+   { GL_LINE_SMOOTH_HINT, CONTEXT_ENUM(Hint.LineSmooth), NO_EXTRA },

+   { GL_LINE_WIDTH_RANGE, CONTEXT_FLOAT2(Const.MinLineWidthAA), NO_EXTRA },

+   { GL_COLOR_LOGIC_OP, CONTEXT_BOOL(Color.ColorLogicOpEnabled), NO_EXTRA },

+   { GL_LOGIC_OP_MODE, CONTEXT_ENUM(Color.LogicOp), NO_EXTRA },

+   { GL_MATRIX_MODE, CONTEXT_ENUM(Transform.MatrixMode), NO_EXTRA },

+   { GL_MAX_MODELVIEW_STACK_DEPTH, CONST(MAX_MODELVIEW_STACK_DEPTH), NO_EXTRA },

+   { GL_MAX_PROJECTION_STACK_DEPTH, CONST(MAX_PROJECTION_STACK_DEPTH), NO_EXTRA },

+   { GL_MAX_TEXTURE_STACK_DEPTH, CONST(MAX_TEXTURE_STACK_DEPTH), NO_EXTRA },

+   { GL_MODELVIEW_MATRIX, CONTEXT_MATRIX(ModelviewMatrixStack.Top), NO_EXTRA },

+   { GL_MODELVIEW_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_context, ModelviewMatrixStack.Depth), NO_EXTRA },

+   { GL_NORMALIZE, CONTEXT_BOOL(Transform.Normalize), NO_EXTRA },

+   { GL_PACK_SKIP_IMAGES_EXT, CONTEXT_INT(Pack.SkipImages), NO_EXTRA },

+   { GL_PERSPECTIVE_CORRECTION_HINT, CONTEXT_ENUM(Hint.PerspectiveCorrection), NO_EXTRA },

+   { GL_POINT_SIZE, CONTEXT_FLOAT(Point.Size), NO_EXTRA },

+   { GL_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSizeAA), NO_EXTRA },

+   { GL_POINT_SMOOTH, CONTEXT_BOOL(Point.SmoothFlag), NO_EXTRA },

+   { GL_POINT_SMOOTH_HINT, CONTEXT_ENUM(Hint.PointSmooth), NO_EXTRA },

+   { GL_POINT_SIZE_MIN_EXT, CONTEXT_FLOAT(Point.MinSize), NO_EXTRA },

+   { GL_POINT_SIZE_MAX_EXT, CONTEXT_FLOAT(Point.MaxSize), NO_EXTRA },

+   { GL_POINT_FADE_THRESHOLD_SIZE_EXT, CONTEXT_FLOAT(Point.Threshold), NO_EXTRA },

+   { GL_PROJECTION_MATRIX, CONTEXT_MATRIX(ProjectionMatrixStack.Top), NO_EXTRA },

+   { GL_PROJECTION_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_context, ProjectionMatrixStack.Depth), NO_EXTRA },

+   { GL_RESCALE_NORMAL, CONTEXT_BOOL(Transform.RescaleNormals), NO_EXTRA },

+   { GL_SHADE_MODEL, CONTEXT_ENUM(Light.ShadeModel), NO_EXTRA },

+   { GL_TEXTURE_2D, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },

+   { GL_TEXTURE_MATRIX, LOC_CUSTOM, TYPE_MATRIX, 0, extra_valid_texture_unit },

+   { GL_TEXTURE_STACK_DEPTH, LOC_CUSTOM, TYPE_INT, 0,

+     extra_valid_texture_unit  },

+

+   { GL_VERTEX_ARRAY, ARRAY_BOOL(Vertex.Enabled), NO_EXTRA },

+   { GL_VERTEX_ARRAY_SIZE, ARRAY_INT(Vertex.Size), NO_EXTRA },

+   { GL_VERTEX_ARRAY_TYPE, ARRAY_ENUM(Vertex.Type), NO_EXTRA },

+   { GL_VERTEX_ARRAY_STRIDE, ARRAY_INT(Vertex.Stride), NO_EXTRA },

+   { GL_NORMAL_ARRAY, ARRAY_ENUM(Normal.Enabled), NO_EXTRA },

+   { GL_NORMAL_ARRAY_TYPE, ARRAY_ENUM(Normal.Type), NO_EXTRA },

+   { GL_NORMAL_ARRAY_STRIDE, ARRAY_INT(Normal.Stride), NO_EXTRA },

+   { GL_COLOR_ARRAY, ARRAY_BOOL(Color.Enabled), NO_EXTRA },

+   { GL_COLOR_ARRAY_SIZE, ARRAY_INT(Color.Size), NO_EXTRA },

+   { GL_COLOR_ARRAY_TYPE, ARRAY_ENUM(Color.Type), NO_EXTRA },

+   { GL_COLOR_ARRAY_STRIDE, ARRAY_INT(Color.Stride), NO_EXTRA },

+   { GL_TEXTURE_COORD_ARRAY,

+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Enabled), NO_EXTRA },

+   { GL_TEXTURE_COORD_ARRAY_SIZE,

+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Size), NO_EXTRA },

+   { GL_TEXTURE_COORD_ARRAY_TYPE,

+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Type), NO_EXTRA },

+   { GL_TEXTURE_COORD_ARRAY_STRIDE,

+     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Stride), NO_EXTRA },

+

+   /* GL_ARB_multitexture */

+   { GL_MAX_TEXTURE_UNITS_ARB,

+     CONTEXT_INT(Const.MaxTextureUnits), extra_ARB_multitexture },

+   { GL_CLIENT_ACTIVE_TEXTURE_ARB,

+     LOC_CUSTOM, TYPE_INT, 0, extra_ARB_multitexture },

+

+   /* GL_ARB_texture_cube_map */

+   { GL_TEXTURE_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },

+   /* S, T, and R are always set at the same time */

+   { GL_TEXTURE_GEN_STR_OES, LOC_TEXUNIT, TYPE_BIT_0,

+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },

+

+   /* GL_ARB_multisample */

+   { GL_MULTISAMPLE_ARB, CONTEXT_BOOL(Multisample.Enabled), NO_EXTRA },

+   { GL_SAMPLE_ALPHA_TO_ONE_ARB, CONTEXT_BOOL(Multisample.SampleAlphaToOne), NO_EXTRA },

+

+   /* GL_ARB_vertex_buffer_object */

+   { GL_VERTEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, Vertex.BufferObj), NO_EXTRA },

+   { GL_NORMAL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, Normal.BufferObj), NO_EXTRA },

+   { GL_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, Color.BufferObj), NO_EXTRA },

+   { GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },

+

+   /* GL_OES_point_sprite */

+   { GL_POINT_SPRITE_NV,

+     CONTEXT_BOOL(Point.PointSprite),

+     extra_NV_point_sprite_ARB_point_sprite },

+

+   /* GL_ARB_fragment_shader */

+   { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB,

+     CONTEXT_INT(Const.FragmentProgram.MaxUniformComponents),

+     extra_ARB_fragment_shader },

+

+   /* GL_ARB_vertex_shader */

+   { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB,

+     CONTEXT_INT(Const.VertexProgram.MaxUniformComponents),

+     extra_ARB_vertex_shader },

+   { GL_MAX_VARYING_FLOATS_ARB, LOC_CUSTOM, TYPE_INT, 0,

+     extra_ARB_vertex_shader },

+

+   /* GL_EXT_texture_lod_bias */

+   { GL_MAX_TEXTURE_LOD_BIAS_EXT, CONTEXT_FLOAT(Const.MaxTextureLodBias),

+	 extra_EXT_texture_lod_bias },

+

+   /* GL_EXT_texture_filter_anisotropic */

+   { GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,

+     CONTEXT_FLOAT(Const.MaxTextureMaxAnisotropy),

+     extra_EXT_texture_filter_anisotropic },

+#endif /* FEATURE_GL || FEATURE_ES1 */

+

+#if FEATURE_ES1

+   { 0, 0, TYPE_API_MASK, API_OPENGLES_BIT },

+   /* XXX: OES_matrix_get */

+   { GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES },

+   { GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES },

+   { GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES },

+

+   /* OES_point_size_array */

+   { GL_POINT_SIZE_ARRAY_OES, ARRAY_FIELD(PointSize.Enabled, TYPE_BOOLEAN) },

+   { GL_POINT_SIZE_ARRAY_TYPE_OES, ARRAY_FIELD(PointSize.Type, TYPE_ENUM) },

+   { GL_POINT_SIZE_ARRAY_STRIDE_OES, ARRAY_FIELD(PointSize.Stride, TYPE_INT) },

+   { GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES, LOC_CUSTOM, TYPE_INT, 0 },

+#endif /* FEATURE_ES1 */

+

+#if FEATURE_GL || FEATURE_ES2

+   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES2_BIT, NO_EXTRA },

+   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's GLSL: */

+   { GL_MAX_LIGHTS, CONTEXT_INT(Const.MaxLights), NO_EXTRA },

+   { GL_MAX_TEXTURE_COORDS_ARB, /* == GL_MAX_TEXTURE_COORDS_NV */

+     CONTEXT_INT(Const.MaxTextureCoordUnits),

+     extra_ARB_fragment_program_NV_fragment_program },

+

+   /* GL_ARB_draw_buffers */

+   { GL_MAX_DRAW_BUFFERS_ARB, CONTEXT_INT(Const.MaxDrawBuffers), NO_EXTRA },

+

+   { GL_BLEND_COLOR_EXT, CONTEXT_FIELD(Color.BlendColor[0], TYPE_FLOATN_4), NO_EXTRA },

+   /* GL_ARB_fragment_program */

+   { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, /* == GL_MAX_TEXTURE_IMAGE_UNITS_NV */

+     CONTEXT_INT(Const.MaxTextureImageUnits),

+     extra_ARB_fragment_program_NV_fragment_program },

+   { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB,

+     CONTEXT_INT(Const.MaxVertexTextureImageUnits), extra_ARB_vertex_shader },

+   { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB,

+     CONTEXT_INT(Const.MaxCombinedTextureImageUnits),

+     extra_ARB_vertex_shader },

+

+   /* GL_ARB_shader_objects

+    * Actually, this token isn't part of GL_ARB_shader_objects, but is

+    * close enough for now. */

+   { GL_CURRENT_PROGRAM, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_shader_objects },

+

+   /* OpenGL 2.0 */

+   { GL_STENCIL_BACK_FUNC, CONTEXT_ENUM(Stencil.Function[1]), NO_EXTRA },

+   { GL_STENCIL_BACK_VALUE_MASK, CONTEXT_INT(Stencil.ValueMask[1]), NO_EXTRA },

+   { GL_STENCIL_BACK_WRITEMASK, CONTEXT_INT(Stencil.WriteMask[1]), NO_EXTRA },

+   { GL_STENCIL_BACK_REF, CONTEXT_INT(Stencil.Ref[1]), NO_EXTRA },

+   { GL_STENCIL_BACK_FAIL, CONTEXT_ENUM(Stencil.FailFunc[1]), NO_EXTRA },

+   { GL_STENCIL_BACK_PASS_DEPTH_FAIL, CONTEXT_ENUM(Stencil.ZFailFunc[1]), NO_EXTRA },

+   { GL_STENCIL_BACK_PASS_DEPTH_PASS, CONTEXT_ENUM(Stencil.ZPassFunc[1]), NO_EXTRA },

+

+   { GL_MAX_VERTEX_ATTRIBS_ARB,

+     CONTEXT_INT(Const.VertexProgram.MaxAttribs),

+     extra_ARB_vertex_program_version_es2 },

+

+   /* OES_texture_3D */

+   { GL_TEXTURE_BINDING_3D, LOC_CUSTOM, TYPE_INT, TEXTURE_3D_INDEX, NO_EXTRA },

+   { GL_MAX_3D_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_context, Const.Max3DTextureLevels), NO_EXTRA },

+

+   /* GL_ARB_fragment_program/OES_standard_derivatives */

+   { GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB,

+     CONTEXT_ENUM(Hint.FragmentShaderDerivative), extra_ARB_fragment_shader },

+#endif /* FEATURE_GL || FEATURE_ES2 */

+

+#if FEATURE_ES2

+   /* Enums unique to OpenGL ES 2.0 */

+   { 0, 0, TYPE_API_MASK, API_OPENGLES2_BIT, NO_EXTRA },

+   { GL_MAX_FRAGMENT_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },

+   { GL_MAX_VARYING_VECTORS, CONTEXT_INT(Const.MaxVarying), NO_EXTRA },

+   { GL_MAX_VERTEX_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },

+   { GL_SHADER_COMPILER, CONST(1), NO_EXTRA },

+   /* OES_get_program_binary */

+   { GL_NUM_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },

+   { GL_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },

+#endif /* FEATURE_ES2 */

+

+#if FEATURE_GL

+   /* Remaining enums are only in OpenGL */

+   { 0, 0, TYPE_API_MASK, API_OPENGL_BIT, NO_EXTRA },

+   { GL_ACCUM_RED_BITS, BUFFER_INT(Visual.accumRedBits), NO_EXTRA },

+   { GL_ACCUM_GREEN_BITS, BUFFER_INT(Visual.accumGreenBits), NO_EXTRA },

+   { GL_ACCUM_BLUE_BITS, BUFFER_INT(Visual.accumBlueBits), NO_EXTRA },

+   { GL_ACCUM_ALPHA_BITS, BUFFER_INT(Visual.accumAlphaBits), NO_EXTRA },

+   { GL_ACCUM_CLEAR_VALUE, CONTEXT_FIELD(Accum.ClearColor[0], TYPE_FLOATN_4), NO_EXTRA },

+   { GL_ALPHA_BIAS, CONTEXT_FLOAT(Pixel.AlphaBias), NO_EXTRA },

+   { GL_ALPHA_SCALE, CONTEXT_FLOAT(Pixel.AlphaScale), NO_EXTRA },

+   { GL_ATTRIB_STACK_DEPTH, CONTEXT_INT(AttribStackDepth), NO_EXTRA },

+   { GL_AUTO_NORMAL, CONTEXT_BOOL(Eval.AutoNormal), NO_EXTRA },

+   { GL_AUX_BUFFERS, BUFFER_INT(Visual.numAuxBuffers), NO_EXTRA },

+   { GL_BLUE_BIAS, CONTEXT_FLOAT(Pixel.BlueBias), NO_EXTRA },

+   { GL_BLUE_SCALE, CONTEXT_FLOAT(Pixel.BlueScale), NO_EXTRA },

+   { GL_CLIENT_ATTRIB_STACK_DEPTH, CONTEXT_INT(ClientAttribStackDepth), NO_EXTRA },

+   { GL_COLOR_MATERIAL_FACE, CONTEXT_ENUM(Light.ColorMaterialFace), NO_EXTRA },

+   { GL_COLOR_MATERIAL_PARAMETER, CONTEXT_ENUM(Light.ColorMaterialMode), NO_EXTRA },

+   { GL_CURRENT_INDEX,

+     CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]),

+     extra_flush_current },

+   { GL_CURRENT_RASTER_COLOR,

+     CONTEXT_FIELD(Current.RasterColor[0], TYPE_FLOATN_4), NO_EXTRA },

+   { GL_CURRENT_RASTER_DISTANCE, CONTEXT_FLOAT(Current.RasterDistance), NO_EXTRA },

+   { GL_CURRENT_RASTER_INDEX, CONST(1), NO_EXTRA },

+   { GL_CURRENT_RASTER_POSITION, CONTEXT_FLOAT4(Current.RasterPos[0]), NO_EXTRA },

+   { GL_CURRENT_RASTER_SECONDARY_COLOR,

+     CONTEXT_FIELD(Current.RasterSecondaryColor[0], TYPE_FLOATN_4), NO_EXTRA },

+   { GL_CURRENT_RASTER_TEXTURE_COORDS, LOC_CUSTOM, TYPE_FLOAT_4, 0,

+     extra_valid_texture_unit },

+   { GL_CURRENT_RASTER_POSITION_VALID, CONTEXT_BOOL(Current.RasterPosValid), NO_EXTRA },

+   { GL_DEPTH_BIAS, CONTEXT_FLOAT(Pixel.DepthBias), NO_EXTRA },

+   { GL_DEPTH_SCALE, CONTEXT_FLOAT(Pixel.DepthScale), NO_EXTRA },

+   { GL_DOUBLEBUFFER, BUFFER_INT(Visual.doubleBufferMode), NO_EXTRA },

+   { GL_DRAW_BUFFER, BUFFER_ENUM(ColorDrawBuffer[0]), NO_EXTRA },

+   { GL_EDGE_FLAG, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },

+   { GL_FEEDBACK_BUFFER_SIZE, CONTEXT_INT(Feedback.BufferSize), NO_EXTRA },

+   { GL_FEEDBACK_BUFFER_TYPE, CONTEXT_ENUM(Feedback.Type), NO_EXTRA },

+   { GL_FOG_INDEX, CONTEXT_FLOAT(Fog.Index), NO_EXTRA },

+   { GL_GREEN_BIAS, CONTEXT_FLOAT(Pixel.GreenBias), NO_EXTRA },

+   { GL_GREEN_SCALE, CONTEXT_FLOAT(Pixel.GreenScale), NO_EXTRA },

+   { GL_INDEX_BITS, BUFFER_INT(Visual.indexBits), extra_new_buffers },

+   { GL_INDEX_CLEAR_VALUE, CONTEXT_INT(Color.ClearIndex), NO_EXTRA },

+   { GL_INDEX_MODE, CONST(0) , NO_EXTRA}, 

+   { GL_INDEX_OFFSET, CONTEXT_INT(Pixel.IndexOffset), NO_EXTRA },

+   { GL_INDEX_SHIFT, CONTEXT_INT(Pixel.IndexShift), NO_EXTRA },

+   { GL_INDEX_WRITEMASK, CONTEXT_INT(Color.IndexMask), NO_EXTRA },

+   { GL_LIGHT_MODEL_COLOR_CONTROL, CONTEXT_ENUM(Light.Model.ColorControl), NO_EXTRA },

+   { GL_LIGHT_MODEL_LOCAL_VIEWER, CONTEXT_BOOL(Light.Model.LocalViewer), NO_EXTRA },

+   { GL_LINE_STIPPLE, CONTEXT_BOOL(Line.StippleFlag), NO_EXTRA },

+   { GL_LINE_STIPPLE_PATTERN, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },

+   { GL_LINE_STIPPLE_REPEAT, CONTEXT_INT(Line.StippleFactor), NO_EXTRA },

+   { GL_LINE_WIDTH_GRANULARITY, CONTEXT_FLOAT(Const.LineWidthGranularity), NO_EXTRA },

+   { GL_LIST_BASE, CONTEXT_INT(List.ListBase), NO_EXTRA },

+   { GL_LIST_INDEX, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },

+   { GL_LIST_MODE, LOC_CUSTOM, TYPE_ENUM, 0, NO_EXTRA },

+   { GL_INDEX_LOGIC_OP, CONTEXT_BOOL(Color.IndexLogicOpEnabled), NO_EXTRA },

+   { GL_MAP1_COLOR_4, CONTEXT_BOOL(Eval.Map1Color4), NO_EXTRA },

+   { GL_MAP1_GRID_DOMAIN, CONTEXT_FLOAT2(Eval.MapGrid1u1), NO_EXTRA },

+   { GL_MAP1_GRID_SEGMENTS, CONTEXT_INT(Eval.MapGrid1un), NO_EXTRA },

+   { GL_MAP1_INDEX, CONTEXT_BOOL(Eval.Map1Index), NO_EXTRA },

+   { GL_MAP1_NORMAL, CONTEXT_BOOL(Eval.Map1Normal), NO_EXTRA },

+   { GL_MAP1_TEXTURE_COORD_1, CONTEXT_BOOL(Eval.Map1TextureCoord1), NO_EXTRA },

+   { GL_MAP1_TEXTURE_COORD_2, CONTEXT_BOOL(Eval.Map1TextureCoord2), NO_EXTRA },

+   { GL_MAP1_TEXTURE_COORD_3, CONTEXT_BOOL(Eval.Map1TextureCoord3), NO_EXTRA },

+   { GL_MAP1_TEXTURE_COORD_4, CONTEXT_BOOL(Eval.Map1TextureCoord4), NO_EXTRA },

+   { GL_MAP1_VERTEX_3, CONTEXT_BOOL(Eval.Map1Vertex3), NO_EXTRA },

+   { GL_MAP1_VERTEX_4, CONTEXT_BOOL(Eval.Map1Vertex4), NO_EXTRA },

+   { GL_MAP2_COLOR_4, CONTEXT_BOOL(Eval.Map2Color4), NO_EXTRA },

+   { GL_MAP2_GRID_DOMAIN, LOC_CUSTOM, TYPE_FLOAT_4, 0, NO_EXTRA },

+   { GL_MAP2_GRID_SEGMENTS, CONTEXT_INT2(Eval.MapGrid2un), NO_EXTRA },

+   { GL_MAP2_INDEX, CONTEXT_BOOL(Eval.Map2Index), NO_EXTRA },

+   { GL_MAP2_NORMAL, CONTEXT_BOOL(Eval.Map2Normal), NO_EXTRA },

+   { GL_MAP2_TEXTURE_COORD_1, CONTEXT_BOOL(Eval.Map2TextureCoord1), NO_EXTRA },

+   { GL_MAP2_TEXTURE_COORD_2, CONTEXT_BOOL(Eval.Map2TextureCoord2), NO_EXTRA },

+   { GL_MAP2_TEXTURE_COORD_3, CONTEXT_BOOL(Eval.Map2TextureCoord3), NO_EXTRA },

+   { GL_MAP2_TEXTURE_COORD_4, CONTEXT_BOOL(Eval.Map2TextureCoord4), NO_EXTRA },

+   { GL_MAP2_VERTEX_3, CONTEXT_BOOL(Eval.Map2Vertex3), NO_EXTRA },

+   { GL_MAP2_VERTEX_4, CONTEXT_BOOL(Eval.Map2Vertex4), NO_EXTRA },

+   { GL_MAP_COLOR, CONTEXT_BOOL(Pixel.MapColorFlag), NO_EXTRA },

+   { GL_MAP_STENCIL, CONTEXT_BOOL(Pixel.MapStencilFlag), NO_EXTRA },

+   { GL_MAX_ATTRIB_STACK_DEPTH, CONST(MAX_ATTRIB_STACK_DEPTH), NO_EXTRA },

+   { GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, CONST(MAX_CLIENT_ATTRIB_STACK_DEPTH), NO_EXTRA },

+

+   { GL_MAX_EVAL_ORDER, CONST(MAX_EVAL_ORDER), NO_EXTRA },

+   { GL_MAX_LIST_NESTING, CONST(MAX_LIST_NESTING), NO_EXTRA },

+   { GL_MAX_NAME_STACK_DEPTH, CONST(MAX_NAME_STACK_DEPTH), NO_EXTRA },

+   { GL_MAX_PIXEL_MAP_TABLE, CONST(MAX_PIXEL_MAP_TABLE), NO_EXTRA },

+   { GL_NAME_STACK_DEPTH, CONTEXT_INT(Select.NameStackDepth), NO_EXTRA },

+   { GL_PACK_LSB_FIRST, CONTEXT_BOOL(Pack.LsbFirst), NO_EXTRA },

+   { GL_PACK_ROW_LENGTH, CONTEXT_INT(Pack.RowLength), NO_EXTRA },

+   { GL_PACK_SKIP_PIXELS, CONTEXT_INT(Pack.SkipPixels), NO_EXTRA },

+   { GL_PACK_SKIP_ROWS, CONTEXT_INT(Pack.SkipRows), NO_EXTRA },

+   { GL_PACK_SWAP_BYTES, CONTEXT_BOOL(Pack.SwapBytes), NO_EXTRA },

+   { GL_PACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Pack.ImageHeight), NO_EXTRA },

+   { GL_PACK_INVERT_MESA, CONTEXT_BOOL(Pack.Invert), NO_EXTRA },

+   { GL_PIXEL_MAP_A_TO_A_SIZE, CONTEXT_INT(PixelMaps.AtoA.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_B_TO_B_SIZE, CONTEXT_INT(PixelMaps.BtoB.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_G_TO_G_SIZE, CONTEXT_INT(PixelMaps.GtoG.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_I_TO_A_SIZE, CONTEXT_INT(PixelMaps.ItoA.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_I_TO_B_SIZE, CONTEXT_INT(PixelMaps.ItoB.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_I_TO_G_SIZE, CONTEXT_INT(PixelMaps.ItoG.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_I_TO_I_SIZE, CONTEXT_INT(PixelMaps.ItoI.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_I_TO_R_SIZE, CONTEXT_INT(PixelMaps.ItoR.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_R_TO_R_SIZE, CONTEXT_INT(PixelMaps.RtoR.Size), NO_EXTRA },

+   { GL_PIXEL_MAP_S_TO_S_SIZE, CONTEXT_INT(PixelMaps.StoS.Size), NO_EXTRA },

+   { GL_POINT_SIZE_GRANULARITY, CONTEXT_FLOAT(Const.PointSizeGranularity), NO_EXTRA },

+   { GL_POLYGON_MODE, CONTEXT_ENUM2(Polygon.FrontMode), NO_EXTRA },

+   { GL_POLYGON_OFFSET_BIAS_EXT, CONTEXT_FLOAT(Polygon.OffsetUnits), NO_EXTRA },

+   { GL_POLYGON_OFFSET_POINT, CONTEXT_BOOL(Polygon.OffsetPoint), NO_EXTRA },

+   { GL_POLYGON_OFFSET_LINE, CONTEXT_BOOL(Polygon.OffsetLine), NO_EXTRA },

+   { GL_POLYGON_SMOOTH, CONTEXT_BOOL(Polygon.SmoothFlag), NO_EXTRA },

+   { GL_POLYGON_SMOOTH_HINT, CONTEXT_ENUM(Hint.PolygonSmooth), NO_EXTRA },

+   { GL_POLYGON_STIPPLE, CONTEXT_BOOL(Polygon.StippleFlag), NO_EXTRA },

+   { GL_READ_BUFFER, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },

+   { GL_RED_BIAS, CONTEXT_FLOAT(Pixel.RedBias), NO_EXTRA },

+   { GL_RED_SCALE, CONTEXT_FLOAT(Pixel.RedScale), NO_EXTRA },

+   { GL_RENDER_MODE, CONTEXT_ENUM(RenderMode), NO_EXTRA },

+   { GL_RGBA_MODE, CONST(1), NO_EXTRA },

+   { GL_SELECTION_BUFFER_SIZE, CONTEXT_INT(Select.BufferSize), NO_EXTRA },

+   { GL_SHARED_TEXTURE_PALETTE_EXT, CONTEXT_BOOL(Texture.SharedPalette), NO_EXTRA },

+

+   { GL_STEREO, BUFFER_INT(Visual.stereoMode), NO_EXTRA },

+

+   { GL_TEXTURE_1D, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },

+   { GL_TEXTURE_3D, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },

+   { GL_TEXTURE_1D_ARRAY_EXT, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },

+   { GL_TEXTURE_2D_ARRAY_EXT, LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA },

+

+   { GL_TEXTURE_BINDING_1D, LOC_CUSTOM, TYPE_INT, TEXTURE_1D_INDEX, NO_EXTRA },

+   { GL_TEXTURE_BINDING_1D_ARRAY, LOC_CUSTOM, TYPE_INT,

+     TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array },

+   { GL_TEXTURE_BINDING_2D_ARRAY, LOC_CUSTOM, TYPE_INT,

+     TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array },

+   { GL_MAX_ARRAY_TEXTURE_LAYERS_EXT,

+     CONTEXT_INT(Const.MaxArrayTextureLayers), extra_MESA_texture_array },

+

+   { GL_TEXTURE_GEN_S, LOC_TEXUNIT, TYPE_BIT_0,

+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },

+   { GL_TEXTURE_GEN_T, LOC_TEXUNIT, TYPE_BIT_1,

+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },

+   { GL_TEXTURE_GEN_R, LOC_TEXUNIT, TYPE_BIT_2,

+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },

+   { GL_TEXTURE_GEN_Q, LOC_TEXUNIT, TYPE_BIT_3,

+     offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA },

+   { GL_UNPACK_LSB_FIRST, CONTEXT_BOOL(Unpack.LsbFirst), NO_EXTRA },

+   { GL_UNPACK_ROW_LENGTH, CONTEXT_INT(Unpack.RowLength), NO_EXTRA },

+   { GL_UNPACK_SKIP_PIXELS, CONTEXT_INT(Unpack.SkipPixels), NO_EXTRA },

+   { GL_UNPACK_SKIP_ROWS, CONTEXT_INT(Unpack.SkipRows), NO_EXTRA },

+   { GL_UNPACK_SWAP_BYTES, CONTEXT_BOOL(Unpack.SwapBytes), NO_EXTRA },

+   { GL_UNPACK_SKIP_IMAGES_EXT, CONTEXT_INT(Unpack.SkipImages), NO_EXTRA },

+   { GL_UNPACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Unpack.ImageHeight), NO_EXTRA },

+   { GL_UNPACK_CLIENT_STORAGE_APPLE, CONTEXT_BOOL(Unpack.ClientStorage), NO_EXTRA },

+   { GL_ZOOM_X, CONTEXT_FLOAT(Pixel.ZoomX), NO_EXTRA },

+   { GL_ZOOM_Y, CONTEXT_FLOAT(Pixel.ZoomY), NO_EXTRA },

+

+   /* Vertex arrays */

+   { GL_VERTEX_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },

+   { GL_NORMAL_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },

+   { GL_COLOR_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },

+   { GL_INDEX_ARRAY, ARRAY_BOOL(Index.Enabled), NO_EXTRA },

+   { GL_INDEX_ARRAY_TYPE, ARRAY_ENUM(Index.Type), NO_EXTRA },

+   { GL_INDEX_ARRAY_STRIDE, ARRAY_INT(Index.Stride), NO_EXTRA },

+   { GL_INDEX_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },

+   { GL_TEXTURE_COORD_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },

+   { GL_EDGE_FLAG_ARRAY, ARRAY_BOOL(EdgeFlag.Enabled), NO_EXTRA },

+   { GL_EDGE_FLAG_ARRAY_STRIDE, ARRAY_INT(EdgeFlag.Stride), NO_EXTRA },

+   { GL_EDGE_FLAG_ARRAY_COUNT_EXT, CONST(0), NO_EXTRA },

+

+   /* GL_ARB_texture_compression */

+   { GL_TEXTURE_COMPRESSION_HINT_ARB, CONTEXT_INT(Hint.TextureCompression), NO_EXTRA },

+

+   /* GL_EXT_compiled_vertex_array */

+   { GL_ARRAY_ELEMENT_LOCK_FIRST_EXT, CONTEXT_INT(Array.LockFirst),

+     extra_EXT_compiled_vertex_array },

+   { GL_ARRAY_ELEMENT_LOCK_COUNT_EXT, CONTEXT_INT(Array.LockCount),

+     extra_EXT_compiled_vertex_array },

+

+   /* GL_ARB_transpose_matrix */

+   { GL_TRANSPOSE_MODELVIEW_MATRIX_ARB,

+     CONTEXT_MATRIX_T(ModelviewMatrixStack), NO_EXTRA },

+   { GL_TRANSPOSE_PROJECTION_MATRIX_ARB,

+     CONTEXT_MATRIX_T(ProjectionMatrixStack.Top), NO_EXTRA },

+   { GL_TRANSPOSE_TEXTURE_MATRIX_ARB, CONTEXT_MATRIX_T(TextureMatrixStack), NO_EXTRA },

+

+   /* GL_SGI_texture_color_table */

+   { GL_TEXTURE_COLOR_TABLE_SGI, LOC_TEXUNIT, TYPE_BOOLEAN,

+     offsetof(struct gl_texture_unit, ColorTableEnabled),

+     extra_SGI_texture_color_table },

+

+   /* GL_EXT_secondary_color */

+   { GL_COLOR_SUM_EXT, CONTEXT_BOOL(Fog.ColorSumEnabled),

+     extra_EXT_secondary_color_ARB_vertex_program },

+   { GL_CURRENT_SECONDARY_COLOR_EXT,

+     CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR1][0], TYPE_FLOATN_4),

+     extra_EXT_secondary_color_flush_current },

+   { GL_SECONDARY_COLOR_ARRAY_EXT, ARRAY_BOOL(SecondaryColor.Enabled),

+     extra_EXT_secondary_color },

+   { GL_SECONDARY_COLOR_ARRAY_TYPE_EXT, ARRAY_ENUM(SecondaryColor.Type),

+     extra_EXT_secondary_color },

+   { GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT, ARRAY_INT(SecondaryColor.Stride),

+     extra_EXT_secondary_color },

+   { GL_SECONDARY_COLOR_ARRAY_SIZE_EXT, ARRAY_INT(SecondaryColor.Size),

+     extra_EXT_secondary_color },

+

+   /* GL_EXT_fog_coord */

+   { GL_CURRENT_FOG_COORDINATE_EXT,

+     CONTEXT_FLOAT(Current.Attrib[VERT_ATTRIB_FOG][0]),

+     extra_EXT_fog_coord_flush_current },

+   { GL_FOG_COORDINATE_ARRAY_EXT, ARRAY_BOOL(FogCoord.Enabled),

+     extra_EXT_fog_coord },

+   { GL_FOG_COORDINATE_ARRAY_TYPE_EXT, ARRAY_ENUM(FogCoord.Type),

+     extra_EXT_fog_coord },

+   { GL_FOG_COORDINATE_ARRAY_STRIDE_EXT, ARRAY_INT(FogCoord.Stride),

+     extra_EXT_fog_coord },

+   { GL_FOG_COORDINATE_SOURCE_EXT, CONTEXT_ENUM(Fog.FogCoordinateSource),

+     extra_EXT_fog_coord },

+

+   /* GL_IBM_rasterpos_clip */

+   { GL_RASTER_POSITION_UNCLIPPED_IBM,

+     CONTEXT_BOOL(Transform.RasterPositionUnclipped),

+     extra_IBM_rasterpos_clip },

+

+   /* GL_NV_point_sprite */

+   { GL_POINT_SPRITE_R_MODE_NV,

+     CONTEXT_ENUM(Point.SpriteRMode), extra_NV_point_sprite },

+   { GL_POINT_SPRITE_COORD_ORIGIN, CONTEXT_ENUM(Point.SpriteOrigin),

+     extra_NV_point_sprite_ARB_point_sprite },

+

+   /* GL_NV_vertex_program */

+   { GL_VERTEX_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY0_NV, ARRAY_BOOL(VertexAttrib[0].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY1_NV, ARRAY_BOOL(VertexAttrib[1].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY2_NV, ARRAY_BOOL(VertexAttrib[2].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY3_NV, ARRAY_BOOL(VertexAttrib[3].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY4_NV, ARRAY_BOOL(VertexAttrib[4].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY5_NV, ARRAY_BOOL(VertexAttrib[5].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY6_NV, ARRAY_BOOL(VertexAttrib[6].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY7_NV, ARRAY_BOOL(VertexAttrib[7].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY8_NV, ARRAY_BOOL(VertexAttrib[8].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY9_NV, ARRAY_BOOL(VertexAttrib[9].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY10_NV, ARRAY_BOOL(VertexAttrib[10].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY11_NV, ARRAY_BOOL(VertexAttrib[11].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY12_NV, ARRAY_BOOL(VertexAttrib[12].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY13_NV, ARRAY_BOOL(VertexAttrib[13].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY14_NV, ARRAY_BOOL(VertexAttrib[14].Enabled),

+     extra_NV_vertex_program },

+   { GL_VERTEX_ATTRIB_ARRAY15_NV, ARRAY_BOOL(VertexAttrib[15].Enabled),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB0_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[0]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB1_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[1]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB2_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[2]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB3_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[3]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB4_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[4]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB5_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[5]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB6_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[6]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB7_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[7]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB8_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[8]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB9_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[9]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB10_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[10]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB11_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[11]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB12_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[12]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB13_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[13]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB14_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[14]),

+     extra_NV_vertex_program },

+   { GL_MAP1_VERTEX_ATTRIB15_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[15]),

+     extra_NV_vertex_program },

+

+   /* GL_NV_fragment_program */

+   { GL_FRAGMENT_PROGRAM_NV, CONTEXT_BOOL(FragmentProgram.Enabled),

+     extra_NV_fragment_program },

+   { GL_FRAGMENT_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,

+     extra_NV_fragment_program },

+   { GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV,

+     CONST(MAX_NV_FRAGMENT_PROGRAM_PARAMS),

+     extra_NV_fragment_program },

+

+   /* GL_NV_texture_rectangle */

+   { GL_TEXTURE_RECTANGLE_NV,

+     LOC_CUSTOM, TYPE_BOOLEAN, 0, extra_NV_texture_rectangle },

+   { GL_TEXTURE_BINDING_RECTANGLE_NV,

+     LOC_CUSTOM, TYPE_INT, TEXTURE_RECT_INDEX, extra_NV_texture_rectangle },

+   { GL_MAX_RECTANGLE_TEXTURE_SIZE_NV,

+     CONTEXT_INT(Const.MaxTextureRectSize), extra_NV_texture_rectangle },

+

+   /* GL_EXT_stencil_two_side */

+   { GL_STENCIL_TEST_TWO_SIDE_EXT, CONTEXT_BOOL(Stencil.TestTwoSide),

+	 extra_EXT_stencil_two_side },

+   { GL_ACTIVE_STENCIL_FACE_EXT, LOC_CUSTOM, TYPE_ENUM, NO_OFFSET, NO_EXTRA },

+

+   /* GL_NV_light_max_exponent */

+   { GL_MAX_SHININESS_NV, CONTEXT_FLOAT(Const.MaxShininess),

+     extra_NV_light_max_exponent },

+   { GL_MAX_SPOT_EXPONENT_NV, CONTEXT_FLOAT(Const.MaxSpotExponent),

+     extra_NV_light_max_exponent },

+     

+   /* GL_NV_primitive_restart */

+   { GL_PRIMITIVE_RESTART_NV, CONTEXT_BOOL(Array.PrimitiveRestart),

+     extra_NV_primitive_restart },

+   { GL_PRIMITIVE_RESTART_INDEX_NV, CONTEXT_INT(Array.RestartIndex),

+     extra_NV_primitive_restart },

+ 

+   /* GL_ARB_vertex_buffer_object */

+   { GL_INDEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, Index.BufferObj), NO_EXTRA },

+   { GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, EdgeFlag.BufferObj), NO_EXTRA },

+   { GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, SecondaryColor.BufferObj), NO_EXTRA },

+   { GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,

+     offsetof(struct gl_array_object, FogCoord.BufferObj), NO_EXTRA },

+

+   /* GL_EXT_pixel_buffer_object */

+   { GL_PIXEL_PACK_BUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,

+     extra_EXT_pixel_buffer_object },

+   { GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,

+     extra_EXT_pixel_buffer_object },

+

+   /* GL_ARB_vertex_program */

+   { GL_VERTEX_PROGRAM_ARB, /* == GL_VERTEX_PROGRAM_NV */

+     CONTEXT_BOOL(VertexProgram.Enabled),

+     extra_ARB_vertex_program_NV_vertex_program },

+   { GL_VERTEX_PROGRAM_POINT_SIZE_ARB, /* == GL_VERTEX_PROGRAM_POINT_SIZE_NV*/

+     CONTEXT_BOOL(VertexProgram.PointSizeEnabled),

+     extra_ARB_vertex_program_NV_vertex_program },

+   { GL_VERTEX_PROGRAM_TWO_SIDE_ARB, /* == GL_VERTEX_PROGRAM_TWO_SIDE_NV */

+     CONTEXT_BOOL(VertexProgram.TwoSideEnabled),

+     extra_ARB_vertex_program_NV_vertex_program },

+   { GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB, /* == GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */

+     CONTEXT_INT(Const.MaxProgramMatrixStackDepth),

+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },

+   { GL_MAX_PROGRAM_MATRICES_ARB, /* == GL_MAX_TRACK_MATRICES_NV */

+     CONTEXT_INT(Const.MaxProgramMatrices),

+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },

+   { GL_CURRENT_MATRIX_STACK_DEPTH_ARB, /* == GL_CURRENT_MATRIX_STACK_DEPTH_NV */

+     LOC_CUSTOM, TYPE_INT, 0,

+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },

+

+   { GL_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */

+     LOC_CUSTOM, TYPE_MATRIX, 0,

+     extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },

+   { GL_TRANSPOSE_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */

+     LOC_CUSTOM, TYPE_MATRIX, 0,

+     extra_ARB_vertex_program_ARB_fragment_program },

+

+   { GL_PROGRAM_ERROR_POSITION_ARB, /* == GL_PROGRAM_ERROR_POSITION_NV */

+     CONTEXT_INT(Program.ErrorPos),

+     extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },

+

+   /* GL_ARB_fragment_program */

+   { GL_FRAGMENT_PROGRAM_ARB, CONTEXT_BOOL(FragmentProgram.Enabled),

+     extra_ARB_fragment_program },

+

+   /* GL_EXT_depth_bounds_test */

+   { GL_DEPTH_BOUNDS_TEST_EXT, CONTEXT_BOOL(Depth.BoundsTest),

+     extra_EXT_depth_bounds_test },

+   { GL_DEPTH_BOUNDS_EXT, CONTEXT_FLOAT2(Depth.BoundsMin),

+     extra_EXT_depth_bounds_test },

+

+   /* GL_ARB_depth_clamp*/

+   { GL_DEPTH_CLAMP, CONTEXT_BOOL(Transform.DepthClamp),

+     extra_ARB_depth_clamp },

+

+   /* GL_ARB_draw_buffers */

+   { GL_DRAW_BUFFER0_ARB, BUFFER_ENUM(ColorDrawBuffer[0]), NO_EXTRA },

+   { GL_DRAW_BUFFER1_ARB, BUFFER_ENUM(ColorDrawBuffer[1]),

+     extra_valid_draw_buffer },

+   { GL_DRAW_BUFFER2_ARB, BUFFER_ENUM(ColorDrawBuffer[2]),

+     extra_valid_draw_buffer },

+   { GL_DRAW_BUFFER3_ARB, BUFFER_ENUM(ColorDrawBuffer[3]),

+     extra_valid_draw_buffer },

+   { GL_DRAW_BUFFER4_ARB, BUFFER_ENUM(ColorDrawBuffer[4]),

+     extra_valid_draw_buffer },

+   { GL_DRAW_BUFFER5_ARB, BUFFER_ENUM(ColorDrawBuffer[5]),

+     extra_valid_draw_buffer },

+   { GL_DRAW_BUFFER6_ARB, BUFFER_ENUM(ColorDrawBuffer[6]),

+     extra_valid_draw_buffer },

+   { GL_DRAW_BUFFER7_ARB, BUFFER_ENUM(ColorDrawBuffer[7]),

+     extra_valid_draw_buffer },

+

+   /* GL_ATI_fragment_shader */

+   { GL_NUM_FRAGMENT_REGISTERS_ATI, CONST(6), extra_ATI_fragment_shader },

+   { GL_NUM_FRAGMENT_CONSTANTS_ATI, CONST(8), extra_ATI_fragment_shader },

+   { GL_NUM_PASSES_ATI, CONST(2), extra_ATI_fragment_shader },

+   { GL_NUM_INSTRUCTIONS_PER_PASS_ATI, CONST(8), extra_ATI_fragment_shader },

+   { GL_NUM_INSTRUCTIONS_TOTAL_ATI, CONST(16), extra_ATI_fragment_shader },

+   { GL_COLOR_ALPHA_PAIRING_ATI, CONST(GL_TRUE), extra_ATI_fragment_shader },

+   { GL_NUM_LOOPBACK_COMPONENTS_ATI, CONST(3), extra_ATI_fragment_shader },

+   { GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI,

+     CONST(3), extra_ATI_fragment_shader },

+

+   /* GL_EXT_framebuffer_object */

+   { GL_MAX_COLOR_ATTACHMENTS_EXT, CONTEXT_INT(Const.MaxColorAttachments),

+     extra_EXT_framebuffer_object },

+   

+   /* GL_EXT_framebuffer_blit

+    * NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT */

+   { GL_READ_FRAMEBUFFER_BINDING_EXT, LOC_CUSTOM, TYPE_INT, 0,

+     extra_EXT_framebuffer_blit },

+

+   /* GL_EXT_provoking_vertex */

+   { GL_PROVOKING_VERTEX_EXT,

+     CONTEXT_BOOL(Light.ProvokingVertex), extra_EXT_provoking_vertex },

+   { GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT,

+     CONTEXT_BOOL(Const.QuadsFollowProvokingVertexConvention),

+     extra_EXT_provoking_vertex },

+

+   /* GL_ARB_framebuffer_object */

+   { GL_MAX_SAMPLES, CONTEXT_INT(Const.MaxSamples),

+     extra_ARB_framebuffer_object_EXT_framebuffer_multisample },

+

+   /* GL_APPLE_vertex_array_object */

+   { GL_VERTEX_ARRAY_BINDING_APPLE, ARRAY_INT(Name),

+     extra_APPLE_vertex_array_object },

+

+   /* GL_ARB_seamless_cube_map */

+   { GL_TEXTURE_CUBE_MAP_SEAMLESS,

+     CONTEXT_BOOL(Texture.CubeMapSeamless), extra_ARB_seamless_cube_map },

+

+   /* GL_ARB_sync */

+   { GL_MAX_SERVER_WAIT_TIMEOUT,

+     CONTEXT_INT64(Const.MaxServerWaitTimeout), extra_ARB_sync },

+

+   /* GL_EXT_texture_integer */

+   { GL_RGBA_INTEGER_MODE_EXT, BUFFER_BOOL(_IntegerColor),

+     extra_EXT_texture_integer },

+

+   /* GL_EXT_transform_feedback */

+   { GL_TRANSFORM_FEEDBACK_BUFFER_BINDING, LOC_CUSTOM, TYPE_INT, 0,

+     extra_EXT_transform_feedback },

+   { GL_RASTERIZER_DISCARD, CONTEXT_BOOL(TransformFeedback.RasterDiscard),

+     extra_EXT_transform_feedback },

+   { GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS,

+     CONTEXT_INT(Const.MaxTransformFeedbackInterleavedComponents),

+     extra_EXT_transform_feedback },

+   { GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS,

+     CONTEXT_INT(Const.MaxTransformFeedbackSeparateAttribs),

+     extra_EXT_transform_feedback },

+   { GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS,

+     CONTEXT_INT(Const.MaxTransformFeedbackSeparateComponents),

+     extra_EXT_transform_feedback },

+

+   /* GL_ARB_transform_feedback2 */

+   { GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED, LOC_CUSTOM, TYPE_BOOLEAN, 0,

+     extra_ARB_transform_feedback2 },

+   { GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE, LOC_CUSTOM, TYPE_BOOLEAN, 0,

+     extra_ARB_transform_feedback2 },

+   { GL_TRANSFORM_FEEDBACK_BINDING, LOC_CUSTOM, TYPE_INT, 0,

+     extra_ARB_transform_feedback2 },

+

+   /* GL_ARB_geometry_shader4 */

+   { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB,

+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryTextureImageUnits),

+     extra_ARB_geometry_shader4 },

+   { GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB,

+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryOutputVertices),

+     extra_ARB_geometry_shader4 },

+   { GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB,

+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryTotalOutputComponents),

+     extra_ARB_geometry_shader4 },

+   { GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB,

+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryUniformComponents),

+     extra_ARB_geometry_shader4 },

+   { GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB,

+     CONTEXT_INT(Const.GeometryProgram.MaxGeometryVaryingComponents),

+     extra_ARB_geometry_shader4 },

+   { GL_MAX_VERTEX_VARYING_COMPONENTS_ARB,

+     CONTEXT_INT(Const.GeometryProgram.MaxVertexVaryingComponents),

+     extra_ARB_geometry_shader4 },

+

+   /* GL_EXT_gpu_shader4 / GL 3.0 */

+   { GL_MIN_PROGRAM_TEXEL_OFFSET,

+     CONTEXT_INT(Const.MinProgramTexelOffset),

+     extra_EXT_gpu_shader4 },

+   { GL_MAX_PROGRAM_TEXEL_OFFSET,

+     CONTEXT_INT(Const.MaxProgramTexelOffset),

+     extra_EXT_gpu_shader4 },

+

+   /* GL 3.0 */

+   { GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_version_30 },

+   { GL_MAJOR_VERSION, CONTEXT_INT(VersionMajor), extra_version_30 },

+   { GL_MINOR_VERSION, CONTEXT_INT(VersionMinor), extra_version_30  },

+   { GL_CONTEXT_FLAGS, CONTEXT_INT(Const.ContextFlags), extra_version_30  },

+

+   /* GL 3.1 */

+   /* NOTE: different enum values for GL_PRIMITIVE_RESTART_NV

+    * vs. GL_PRIMITIVE_RESTART!

+    */

+   { GL_PRIMITIVE_RESTART, CONTEXT_BOOL(Array.PrimitiveRestart),

+     extra_version_31 },

+   { GL_PRIMITIVE_RESTART_INDEX, CONTEXT_INT(Array.RestartIndex),

+     extra_version_31 },

+ 

+

+   /* GL 3.2 */

+   { GL_CONTEXT_PROFILE_MASK, CONTEXT_INT(Const.ProfileMask),

+     extra_version_32 },

+#endif /* FEATURE_GL */

+};

+

+/* All we need now is a way to look up the value struct from the enum.

+ * The code generated by gcc for the old generated big switch

+ * statement is a big, balanced, open coded if/else tree, essentially

+ * an unrolled binary search.  It would be natural to sort the new

+ * enum table and use bsearch(), but we will use a read-only hash

+ * table instead.  bsearch() has a nice guaranteed worst case

+ * performance, but we're also guaranteed to hit that worst case

+ * (log2(n) iterations) for about half the enums.  Instead, using an

+ * open addressing hash table, we can find the enum on the first try

+ * for 80% of the enums, 1 collision for 10% and never more than 5

+ * collisions for any enum (typical numbers).  And the code is very

+ * simple, even though it feels a little magic. */

+

+static unsigned short table[1024];

+static const int prime_factor = 89, prime_step = 281;

+

+#ifdef GET_DEBUG

+static void

+print_table_stats(void)

+{

+   int i, j, collisions[11], count, hash, mask;

+   const struct value_desc *d;

+

+   count = 0;

+   mask = Elements(table) - 1;

+   memset(collisions, 0, sizeof collisions);

+

+   for (i = 0; i < Elements(table); i++) {

+      if (!table[i])

+	 continue;

+      count++;

+      d = &values[table[i]];

+      hash = (d->pname * prime_factor);

+      j = 0;

+      while (1) {

+	 if (values[table[hash & mask]].pname == d->pname)

+	    break;

+	 hash += prime_step;

+	 j++;

+      }

+

+      if (j < 10)

+	 collisions[j]++;

+      else

+	 collisions[10]++;

+   }

+

+   printf("number of enums: %d (total %d)\n", count, Elements(values));

+   for (i = 0; i < Elements(collisions) - 1; i++)

+      if (collisions[i] > 0)

+	 printf("  %d enums with %d %scollisions\n",

+		collisions[i], i, i == 10 ? "or more " : "");

+}

+#endif

+

+/**

+ * Initialize the enum hash for a given API 

+ *

+ * This is called from one_time_init() to insert the enum values that

+ * are valid for the API in question into the enum hash table.

+ *

+ * \param the current context, for determining the API in question

+ */

+void _mesa_init_get_hash(struct gl_context *ctx)

+{

+   int i, hash, index, mask;

+   int api_mask = 0, api_bit;

+

+   mask = Elements(table) - 1;

+   api_bit = 1 << ctx->API;

+

+   for (i = 0; i < Elements(values); i++) {

+      if (values[i].type == TYPE_API_MASK) {

+	 api_mask = values[i].offset;

+	 continue;

+      }

+      if (!(api_mask & api_bit))

+	 continue;

+

+      hash = (values[i].pname * prime_factor) & mask;

+      while (1) {

+	 index = hash & mask;

+	 if (!table[index]) {

+	    table[index] = i;

+	    break;

+	 }

+	 hash += prime_step;

+      }

+   }

+

+#ifdef GET_DEBUG

+   print_table_stats();

+#endif

+}

+

+/**

+ * Handle irregular enums

+ *

+ * Some values don't conform to the "well-known type at context

+ * pointer + offset" pattern, so we have this function to catch all

+ * the corner cases.  Typically, it's a computed value or a one-off

+ * pointer to a custom struct or something.

+ *

+ * In this case we can't return a pointer to the value, so we'll have

+ * to use the temporary variable 'v' declared back in the calling

+ * glGet*v() function to store the result.

+ *

+ * \param ctx the current context

+ * \param d the struct value_desc that describes the enum

+ * \param v pointer to the tmp declared in the calling glGet*v() function

+ */

+static void

+find_custom_value(struct gl_context *ctx, const struct value_desc *d, union value *v)

+{

+   struct gl_buffer_object *buffer_obj;

+   struct gl_client_array *array;

+   GLuint unit, *p;

+

+   switch (d->pname) {

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_3D:

+   case GL_TEXTURE_1D_ARRAY_EXT:

+   case GL_TEXTURE_2D_ARRAY_EXT:

+   case GL_TEXTURE_CUBE_MAP_ARB:

+   case GL_TEXTURE_RECTANGLE_NV:

+      v->value_bool = _mesa_IsEnabled(d->pname);

+      break;

+

+   case GL_LINE_STIPPLE_PATTERN:

+      /* This is the only GLushort, special case it here by promoting

+       * to an int rather than introducing a new type. */

+      v->value_int = ctx->Line.StipplePattern;

+      break;

+

+   case GL_CURRENT_RASTER_TEXTURE_COORDS:

+      unit = ctx->Texture.CurrentUnit;

+      v->value_float_4[0] = ctx->Current.RasterTexCoords[unit][0];

+      v->value_float_4[1] = ctx->Current.RasterTexCoords[unit][1];

+      v->value_float_4[2] = ctx->Current.RasterTexCoords[unit][2];

+      v->value_float_4[3] = ctx->Current.RasterTexCoords[unit][3];

+      break;

+

+   case GL_CURRENT_TEXTURE_COORDS:

+      unit = ctx->Texture.CurrentUnit;

+      v->value_float_4[0] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][0];

+      v->value_float_4[1] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][1];

+      v->value_float_4[2] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][2];

+      v->value_float_4[3] = ctx->Current.Attrib[VERT_ATTRIB_TEX0 + unit][3];

+      break;

+

+   case GL_COLOR_WRITEMASK:

+      v->value_int_4[0] = ctx->Color.ColorMask[0][RCOMP] ? 1 : 0;

+      v->value_int_4[1] = ctx->Color.ColorMask[0][GCOMP] ? 1 : 0;

+      v->value_int_4[2] = ctx->Color.ColorMask[0][BCOMP] ? 1 : 0;

+      v->value_int_4[3] = ctx->Color.ColorMask[0][ACOMP] ? 1 : 0;

+      break;

+

+   case GL_EDGE_FLAG:

+      v->value_bool = ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0;

+      break;

+

+   case GL_READ_BUFFER:

+      v->value_enum = ctx->ReadBuffer->ColorReadBuffer;

+      break;

+

+   case GL_MAP2_GRID_DOMAIN:

+      v->value_float_4[0] = ctx->Eval.MapGrid2u1;

+      v->value_float_4[1] = ctx->Eval.MapGrid2u2;

+      v->value_float_4[2] = ctx->Eval.MapGrid2v1;

+      v->value_float_4[3] = ctx->Eval.MapGrid2v2;

+      break;

+

+   case GL_TEXTURE_STACK_DEPTH:

+      unit = ctx->Texture.CurrentUnit;

+      v->value_int = ctx->TextureMatrixStack[unit].Depth + 1;

+      break;

+   case GL_TEXTURE_MATRIX:

+      unit = ctx->Texture.CurrentUnit;

+      v->value_matrix = ctx->TextureMatrixStack[unit].Top;

+      break;

+

+   case GL_TEXTURE_COORD_ARRAY:

+   case GL_TEXTURE_COORD_ARRAY_SIZE:

+   case GL_TEXTURE_COORD_ARRAY_TYPE:

+   case GL_TEXTURE_COORD_ARRAY_STRIDE:

+      array = &ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture];

+      v->value_int = *(GLuint *) ((char *) array + d->offset);

+      break;

+

+   case GL_ACTIVE_TEXTURE_ARB:

+      v->value_int = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;

+      break;

+   case GL_CLIENT_ACTIVE_TEXTURE_ARB:

+      v->value_int = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;

+      break;

+

+   case GL_MODELVIEW_STACK_DEPTH:

+   case GL_PROJECTION_STACK_DEPTH:

+      v->value_int = *(GLint *) ((char *) ctx + d->offset) + 1;

+      break;

+

+   case GL_MAX_TEXTURE_SIZE:

+   case GL_MAX_3D_TEXTURE_SIZE:

+   case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:

+      p = (GLuint *) ((char *) ctx + d->offset);

+      v->value_int = 1 << (*p - 1);

+      break;

+

+   case GL_SCISSOR_BOX:

+      v->value_int_4[0] = ctx->Scissor.X;

+      v->value_int_4[1] = ctx->Scissor.Y;

+      v->value_int_4[2] = ctx->Scissor.Width;

+      v->value_int_4[3] = ctx->Scissor.Height;

+      break;

+

+   case GL_LIST_INDEX:

+      v->value_int =

+	 ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0;

+      break;

+   case GL_LIST_MODE:

+      if (!ctx->CompileFlag)

+	 v->value_enum = 0;

+      else if (ctx->ExecuteFlag)

+	 v->value_enum = GL_COMPILE_AND_EXECUTE;

+      else

+	 v->value_enum = GL_COMPILE;

+      break;

+

+   case GL_VIEWPORT:

+      v->value_int_4[0] = ctx->Viewport.X;

+      v->value_int_4[1] = ctx->Viewport.Y;

+      v->value_int_4[2] = ctx->Viewport.Width;

+      v->value_int_4[3] = ctx->Viewport.Height;

+      break;

+

+   case GL_ACTIVE_STENCIL_FACE_EXT:

+      v->value_enum = ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT;

+      break;

+

+   case GL_STENCIL_FAIL:

+      v->value_enum = ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace];

+      break;

+   case GL_STENCIL_FUNC:

+      v->value_enum = ctx->Stencil.Function[ctx->Stencil.ActiveFace];

+      break;

+   case GL_STENCIL_PASS_DEPTH_FAIL:

+      v->value_enum = ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace];

+      break;

+   case GL_STENCIL_PASS_DEPTH_PASS:

+      v->value_enum = ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace];

+      break;

+   case GL_STENCIL_REF:

+      v->value_int = ctx->Stencil.Ref[ctx->Stencil.ActiveFace];

+      break;

+   case GL_STENCIL_VALUE_MASK:

+      v->value_int = ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];

+      break;

+   case GL_STENCIL_WRITEMASK:

+      v->value_int = ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];

+      break;

+

+   case GL_NUM_EXTENSIONS:

+      v->value_int = _mesa_get_extension_count(ctx);

+      break;

+

+   case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:

+      v->value_int = _mesa_get_color_read_type(ctx);

+      break;

+   case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:

+      v->value_int = _mesa_get_color_read_format(ctx);

+      break;

+

+   case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:

+      v->value_int = ctx->CurrentStack->Depth + 1;

+      break;

+   case GL_CURRENT_MATRIX_ARB:

+   case GL_TRANSPOSE_CURRENT_MATRIX_ARB:

+      v->value_matrix = ctx->CurrentStack->Top;

+      break;

+

+   case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:

+      v->value_int = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);

+      break;

+   case GL_COMPRESSED_TEXTURE_FORMATS_ARB:

+      v->value_int_n.n = 

+	 _mesa_get_compressed_formats(ctx, v->value_int_n.ints, GL_FALSE);

+      ASSERT(v->value_int_n.n <= 100);

+      break;

+

+   case GL_MAX_VARYING_FLOATS_ARB:

+      v->value_int = ctx->Const.MaxVarying * 4;

+      break;

+

+   /* Various object names */

+

+   case GL_TEXTURE_BINDING_1D:

+   case GL_TEXTURE_BINDING_2D:

+   case GL_TEXTURE_BINDING_3D:

+   case GL_TEXTURE_BINDING_1D_ARRAY_EXT:

+   case GL_TEXTURE_BINDING_2D_ARRAY_EXT:

+   case GL_TEXTURE_BINDING_CUBE_MAP_ARB:

+   case GL_TEXTURE_BINDING_RECTANGLE_NV:

+      unit = ctx->Texture.CurrentUnit;

+      v->value_int =

+	 ctx->Texture.Unit[unit].CurrentTex[d->offset]->Name;

+      break;

+

+   /* GL_ARB_vertex_buffer_object */

+   case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:

+   case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:

+   case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:

+   case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:

+   case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:

+   case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:

+   case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:

+      buffer_obj = (struct gl_buffer_object *)

+	 ((char *) ctx->Array.ArrayObj + d->offset);

+      v->value_int = buffer_obj->Name;

+      break;

+   case GL_ARRAY_BUFFER_BINDING_ARB:

+      v->value_int = ctx->Array.ArrayBufferObj->Name;

+      break;

+   case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:

+      v->value_int =

+	 ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;

+      break;

+   case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:

+      v->value_int = ctx->Array.ElementArrayBufferObj->Name;

+      break;

+

+   /* ARB_copy_buffer */

+   case GL_COPY_READ_BUFFER:

+      v->value_int = ctx->CopyReadBuffer->Name;

+      break;

+   case GL_COPY_WRITE_BUFFER:

+      v->value_int = ctx->CopyWriteBuffer->Name;

+      break;

+

+   case GL_FRAGMENT_PROGRAM_BINDING_NV:

+      v->value_int = 

+	 ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;

+      break;

+   case GL_VERTEX_PROGRAM_BINDING_NV:

+      v->value_int =

+	 ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0;

+      break;

+   case GL_PIXEL_PACK_BUFFER_BINDING_EXT:

+      v->value_int = ctx->Pack.BufferObj->Name;

+      break;

+   case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:

+      v->value_int = ctx->Unpack.BufferObj->Name;

+      break;

+   case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:

+      v->value_int = ctx->TransformFeedback.CurrentBuffer->Name;

+      break;

+   case GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED:

+      v->value_int = ctx->TransformFeedback.CurrentObject->Paused;

+      break;

+   case GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE:

+      v->value_int = ctx->TransformFeedback.CurrentObject->Active;

+      break;

+   case GL_TRANSFORM_FEEDBACK_BINDING:

+      v->value_int = ctx->TransformFeedback.CurrentObject->Name;

+      break;

+   case GL_CURRENT_PROGRAM:

+      v->value_int =

+	 ctx->Shader.ActiveProgram ? ctx->Shader.ActiveProgram->Name : 0;

+      break;

+   case GL_READ_FRAMEBUFFER_BINDING_EXT:

+      v->value_int = ctx->ReadBuffer->Name;

+      break;

+   case GL_RENDERBUFFER_BINDING_EXT:

+      v->value_int =

+	 ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;

+      break;

+   case GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES:

+      v->value_int = ctx->Array.ArrayObj->PointSize.BufferObj->Name;

+      break;

+

+   case GL_MAX_VERTEX_UNIFORM_VECTORS:

+      v->value_int = ctx->Const.VertexProgram.MaxUniformComponents / 4;

+      break;

+

+   case GL_MAX_FRAGMENT_UNIFORM_VECTORS:

+      v->value_int = ctx->Const.FragmentProgram.MaxUniformComponents / 4;

+      break;

+   }   

+}

+

+/**

+ * Check extra constraints on a struct value_desc descriptor

+ *

+ * If a struct value_desc has a non-NULL extra pointer, it means that

+ * there are a number of extra constraints to check or actions to

+ * perform.  The extras is just an integer array where each integer

+ * encode different constraints or actions.

+ *

+ * \param ctx current context

+ * \param func name of calling glGet*v() function for error reporting

+ * \param d the struct value_desc that has the extra constraints

+ *

+ * \return GL_FALSE if one of the constraints was not satisfied,

+ *     otherwise GL_TRUE.

+ */

+static GLboolean

+check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d)

+{

+   const GLuint version = ctx->VersionMajor * 10 + ctx->VersionMinor;

+   int total, enabled;

+   const int *e;

+

+   total = 0;

+   enabled = 0;

+   for (e = d->extra; *e != EXTRA_END; e++)

+      switch (*e) {

+      case EXTRA_VERSION_30:

+	 if (version >= 30) {

+	    total++;

+	    enabled++;

+	 }

+	 break;

+      case EXTRA_VERSION_31:

+	 if (version >= 31) {

+	    total++;

+	    enabled++;

+	 }

+	 break;

+      case EXTRA_VERSION_32:

+	 if (version >= 32) {

+	    total++;

+	    enabled++;

+	 }

+	 break;

+      case EXTRA_VERSION_ES2:

+	 if (ctx->API == API_OPENGLES2) {

+	    total++;

+	    enabled++;

+	 }

+	 break;

+      case EXTRA_NEW_BUFFERS:

+	 if (ctx->NewState & _NEW_BUFFERS)

+	    _mesa_update_state(ctx);

+	 break;

+      case EXTRA_FLUSH_CURRENT:

+	 FLUSH_CURRENT(ctx, 0);

+	 break;

+      case EXTRA_VALID_DRAW_BUFFER:

+	 if (d->pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {

+	    _mesa_error(ctx, GL_INVALID_OPERATION, "%s(draw buffer %u)",

+			func, d->pname - GL_DRAW_BUFFER0_ARB);

+	    return GL_FALSE;

+	 }

+	 break;

+      case EXTRA_VALID_TEXTURE_UNIT:

+	 if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {

+	    _mesa_error(ctx, GL_INVALID_OPERATION, "%s(texture %u)",

+			func, ctx->Texture.CurrentUnit);

+	    return GL_FALSE;

+	 }

+	 break;

+      case EXTRA_END:

+	 break;

+      default: /* *e is a offset into the extension struct */

+	 total++;

+	 if (*(GLboolean *) ((char *) &ctx->Extensions + *e))

+	    enabled++;

+	 break;

+      }

+

+   if (total > 0 && enabled == 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,

+                  _mesa_lookup_enum_by_nr(d->pname));

+      return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+static const struct value_desc error_value =

+   { 0, 0, TYPE_INVALID, NO_OFFSET, NO_EXTRA };

+

+/**

+ * Find the struct value_desc corresponding to the enum 'pname'.

+ * 

+ * We hash the enum value to get an index into the 'table' array,

+ * which holds the index in the 'values' array of struct value_desc.

+ * Once we've found the entry, we do the extra checks, if any, then

+ * look up the value and return a pointer to it.

+ *

+ * If the value has to be computed (for example, it's the result of a

+ * function call or we need to add 1 to it), we use the tmp 'v' to

+ * store the result.

+ * 

+ * \param func name of glGet*v() func for error reporting

+ * \param pname the enum value we're looking up

+ * \param p is were we return the pointer to the value

+ * \param v a tmp union value variable in the calling glGet*v() function

+ *

+ * \return the struct value_desc corresponding to the enum or a struct

+ *     value_desc of TYPE_INVALID if not found.  This lets the calling

+ *     glGet*v() function jump right into a switch statement and

+ *     handle errors there instead of having to check for NULL.

+ */

+static const struct value_desc *

+find_value(const char *func, GLenum pname, void **p, union value *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *unit;

+   int mask, hash;

+   const struct value_desc *d;

+

+   mask = Elements(table) - 1;

+   hash = (pname * prime_factor);

+   while (1) {

+      d = &values[table[hash & mask]];

+

+      /* If the enum isn't valid, the hash walk ends with index 0,

+       * which is the API mask entry at the beginning of values[]. */

+      if (unlikely(d->type == TYPE_API_MASK)) {

+	 _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,

+                     _mesa_lookup_enum_by_nr(pname));

+	 return &error_value;

+      }

+

+      if (likely(d->pname == pname))

+	 break;

+

+      hash += prime_step;

+   }

+

+   if (unlikely(d->extra && !check_extra(ctx, func, d)))

+      return &error_value;

+

+   switch (d->location) {

+   case LOC_BUFFER:

+      *p = ((char *) ctx->DrawBuffer + d->offset);

+      return d;

+   case LOC_CONTEXT:

+      *p = ((char *) ctx + d->offset);

+      return d;

+   case LOC_ARRAY:

+      *p = ((char *) ctx->Array.ArrayObj + d->offset);

+      return d;

+   case LOC_TEXUNIT:

+      unit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+      *p = ((char *) unit + d->offset);

+      return d;

+   case LOC_CUSTOM:

+      find_custom_value(ctx, d, v);

+      *p = v;

+      return d;

+   default:

+      assert(0);

+      break;

+   }

+

+   /* silence warning */

+   return &error_value;

+}

+

+static const int transpose[] = {

+   0, 4,  8, 12,

+   1, 5,  9, 13,

+   2, 6, 10, 14,

+   3, 7, 11, 15

+};

+

+void GLAPIENTRY

+_mesa_GetBooleanv(GLenum pname, GLboolean *params)

+{

+   const struct value_desc *d;

+   union value v;

+   GLmatrix *m;

+   int shift, i;

+   void *p;

+

+   d = find_value("glGetBooleanv", pname, &p, &v);

+   switch (d->type) {

+   case TYPE_INVALID:

+      break;

+   case TYPE_CONST:

+      params[0] = INT_TO_BOOLEAN(d->offset);

+      break;

+

+   case TYPE_FLOAT_4:

+   case TYPE_FLOATN_4:

+      params[3] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[3]);

+   case TYPE_FLOAT_3:

+   case TYPE_FLOATN_3:

+      params[2] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[2]);

+   case TYPE_FLOAT_2:

+   case TYPE_FLOATN_2:

+      params[1] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[1]);

+   case TYPE_FLOAT:

+   case TYPE_FLOATN:

+      params[0] = FLOAT_TO_BOOLEAN(((GLfloat *) p)[0]);

+      break;

+

+   case TYPE_DOUBLEN:

+      params[0] = FLOAT_TO_BOOLEAN(((GLdouble *) p)[0]);

+      break;

+

+   case TYPE_INT_4:

+      params[3] = INT_TO_BOOLEAN(((GLint *) p)[3]);

+   case TYPE_INT_3:

+      params[2] = INT_TO_BOOLEAN(((GLint *) p)[2]);

+   case TYPE_INT_2:

+   case TYPE_ENUM_2:

+      params[1] = INT_TO_BOOLEAN(((GLint *) p)[1]);

+   case TYPE_INT:

+   case TYPE_ENUM:

+      params[0] = INT_TO_BOOLEAN(((GLint *) p)[0]);

+      break;

+

+   case TYPE_INT_N:

+      for (i = 0; i < v.value_int_n.n; i++)

+	 params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);

+      break;

+

+   case TYPE_INT64:

+      params[0] = INT64_TO_BOOLEAN(((GLint64 *) p)[0]);

+      break;

+

+   case TYPE_BOOLEAN:

+      params[0] = ((GLboolean*) p)[0];

+      break;		

+

+   case TYPE_MATRIX:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_BOOLEAN(m->m[i]);

+      break;

+

+   case TYPE_MATRIX_T:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_BOOLEAN(m->m[transpose[i]]);

+      break;

+

+   case TYPE_BIT_0:

+   case TYPE_BIT_1:

+   case TYPE_BIT_2:

+   case TYPE_BIT_3:

+   case TYPE_BIT_4:

+   case TYPE_BIT_5:

+      shift = d->type - TYPE_BIT_0;

+      params[0] = (*(GLbitfield *) p >> shift) & 1;

+      break;

+   }

+}

+

+void GLAPIENTRY

+_mesa_GetFloatv(GLenum pname, GLfloat *params)

+{

+   const struct value_desc *d;

+   union value v;

+   GLmatrix *m;

+   int shift, i;

+   void *p;

+

+   d = find_value("glGetFloatv", pname, &p, &v);

+   switch (d->type) {

+   case TYPE_INVALID:

+      break;

+   case TYPE_CONST:

+      params[0] = (GLfloat) d->offset;

+      break;

+

+   case TYPE_FLOAT_4:

+   case TYPE_FLOATN_4:

+      params[3] = ((GLfloat *) p)[3];

+   case TYPE_FLOAT_3:

+   case TYPE_FLOATN_3:

+      params[2] = ((GLfloat *) p)[2];

+   case TYPE_FLOAT_2:

+   case TYPE_FLOATN_2:

+      params[1] = ((GLfloat *) p)[1];

+   case TYPE_FLOAT:

+   case TYPE_FLOATN:

+      params[0] = ((GLfloat *) p)[0];

+      break;

+

+   case TYPE_DOUBLEN:

+      params[0] = ((GLdouble *) p)[0];

+      break;

+

+   case TYPE_INT_4:

+      params[3] = (GLfloat) (((GLint *) p)[3]);

+   case TYPE_INT_3:

+      params[2] = (GLfloat) (((GLint *) p)[2]);

+   case TYPE_INT_2:

+   case TYPE_ENUM_2:

+      params[1] = (GLfloat) (((GLint *) p)[1]);

+   case TYPE_INT:

+   case TYPE_ENUM:

+      params[0] = (GLfloat) (((GLint *) p)[0]);

+      break;

+

+   case TYPE_INT_N:

+      for (i = 0; i < v.value_int_n.n; i++)

+	 params[i] = INT_TO_FLOAT(v.value_int_n.ints[i]);

+      break;

+

+   case TYPE_INT64:

+      params[0] = ((GLint64 *) p)[0];

+      break;

+

+   case TYPE_BOOLEAN:

+      params[0] = BOOLEAN_TO_FLOAT(*(GLboolean*) p);

+      break;		

+

+   case TYPE_MATRIX:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = m->m[i];

+      break;

+

+   case TYPE_MATRIX_T:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = m->m[transpose[i]];

+      break;

+

+   case TYPE_BIT_0:

+   case TYPE_BIT_1:

+   case TYPE_BIT_2:

+   case TYPE_BIT_3:

+   case TYPE_BIT_4:

+   case TYPE_BIT_5:

+      shift = d->type - TYPE_BIT_0;

+      params[0] = BOOLEAN_TO_FLOAT((*(GLbitfield *) p >> shift) & 1);

+      break;

+   }

+}

+

+void GLAPIENTRY

+_mesa_GetIntegerv(GLenum pname, GLint *params)

+{

+   const struct value_desc *d;

+   union value v;

+   GLmatrix *m;

+   int shift, i;

+   void *p;

+

+   d = find_value("glGetIntegerv", pname, &p, &v);

+   switch (d->type) {

+   case TYPE_INVALID:

+      break;

+   case TYPE_CONST:

+      params[0] = d->offset;

+      break;

+

+   case TYPE_FLOAT_4:

+      params[3] = IROUND(((GLfloat *) p)[3]);

+   case TYPE_FLOAT_3:

+      params[2] = IROUND(((GLfloat *) p)[2]);

+   case TYPE_FLOAT_2:

+      params[1] = IROUND(((GLfloat *) p)[1]);

+   case TYPE_FLOAT:

+      params[0] = IROUND(((GLfloat *) p)[0]);

+      break;

+

+   case TYPE_FLOATN_4:

+      params[3] = FLOAT_TO_INT(((GLfloat *) p)[3]);

+   case TYPE_FLOATN_3:

+      params[2] = FLOAT_TO_INT(((GLfloat *) p)[2]);

+   case TYPE_FLOATN_2:

+      params[1] = FLOAT_TO_INT(((GLfloat *) p)[1]);

+   case TYPE_FLOATN:

+      params[0] = FLOAT_TO_INT(((GLfloat *) p)[0]);

+      break;

+

+   case TYPE_DOUBLEN:

+      params[0] = FLOAT_TO_INT(((GLdouble *) p)[0]);

+      break;

+

+   case TYPE_INT_4:

+      params[3] = ((GLint *) p)[3];

+   case TYPE_INT_3:

+      params[2] = ((GLint *) p)[2];

+   case TYPE_INT_2:

+   case TYPE_ENUM_2:

+      params[1] = ((GLint *) p)[1];

+   case TYPE_INT:

+   case TYPE_ENUM:

+      params[0] = ((GLint *) p)[0];

+      break;

+

+   case TYPE_INT_N:

+      for (i = 0; i < v.value_int_n.n; i++)

+	 params[i] = v.value_int_n.ints[i];

+      break;

+

+   case TYPE_INT64:

+      params[0] = INT64_TO_INT(((GLint64 *) p)[0]);

+      break;

+

+   case TYPE_BOOLEAN:

+      params[0] = BOOLEAN_TO_INT(*(GLboolean*) p);

+      break;		

+

+   case TYPE_MATRIX:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_INT(m->m[i]);

+      break;

+

+   case TYPE_MATRIX_T:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_INT(m->m[transpose[i]]);

+      break;

+

+   case TYPE_BIT_0:

+   case TYPE_BIT_1:

+   case TYPE_BIT_2:

+   case TYPE_BIT_3:

+   case TYPE_BIT_4:

+   case TYPE_BIT_5:

+      shift = d->type - TYPE_BIT_0;

+      params[0] = (*(GLbitfield *) p >> shift) & 1;

+      break;

+   }

+}

+

+#if FEATURE_ARB_sync

+void GLAPIENTRY

+_mesa_GetInteger64v(GLenum pname, GLint64 *params)

+{

+   const struct value_desc *d;

+   union value v;

+   GLmatrix *m;

+   int shift, i;

+   void *p;

+

+   d = find_value("glGetInteger64v", pname, &p, &v);

+   switch (d->type) {

+   case TYPE_INVALID:

+      break;

+   case TYPE_CONST:

+      params[0] = d->offset;

+      break;

+

+   case TYPE_FLOAT_4:

+      params[3] = IROUND64(((GLfloat *) p)[3]);

+   case TYPE_FLOAT_3:

+      params[2] = IROUND64(((GLfloat *) p)[2]);

+   case TYPE_FLOAT_2:

+      params[1] = IROUND64(((GLfloat *) p)[1]);

+   case TYPE_FLOAT:

+      params[0] = IROUND64(((GLfloat *) p)[0]);

+      break;

+

+   case TYPE_FLOATN_4:

+      params[3] = FLOAT_TO_INT64(((GLfloat *) p)[3]);

+   case TYPE_FLOATN_3:

+      params[2] = FLOAT_TO_INT64(((GLfloat *) p)[2]);

+   case TYPE_FLOATN_2:

+      params[1] = FLOAT_TO_INT64(((GLfloat *) p)[1]);

+   case TYPE_FLOATN:

+      params[0] = FLOAT_TO_INT64(((GLfloat *) p)[0]);

+      break;

+

+   case TYPE_DOUBLEN:

+      params[0] = FLOAT_TO_INT64(((GLdouble *) p)[0]);

+      break;

+

+   case TYPE_INT_4:

+      params[3] = ((GLint *) p)[3];

+   case TYPE_INT_3:

+      params[2] = ((GLint *) p)[2];

+   case TYPE_INT_2:

+   case TYPE_ENUM_2:

+      params[1] = ((GLint *) p)[1];

+   case TYPE_INT:

+   case TYPE_ENUM:

+      params[0] = ((GLint *) p)[0];

+      break;

+

+   case TYPE_INT_N:

+      for (i = 0; i < v.value_int_n.n; i++)

+	 params[i] = INT_TO_BOOLEAN(v.value_int_n.ints[i]);

+      break;

+

+   case TYPE_INT64:

+      params[0] = ((GLint64 *) p)[0];

+      break;

+

+   case TYPE_BOOLEAN:

+      params[0] = ((GLboolean*) p)[0];

+      break;		

+

+   case TYPE_MATRIX:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_INT64(m->m[i]);

+      break;

+

+   case TYPE_MATRIX_T:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_INT64(m->m[transpose[i]]);

+      break;

+

+   case TYPE_BIT_0:

+   case TYPE_BIT_1:

+   case TYPE_BIT_2:

+   case TYPE_BIT_3:

+   case TYPE_BIT_4:

+   case TYPE_BIT_5:

+      shift = d->type - TYPE_BIT_0;

+      params[0] = (*(GLbitfield *) p >> shift) & 1;

+      break;

+   }

+}

+#endif /* FEATURE_ARB_sync */

+

+void GLAPIENTRY

+_mesa_GetDoublev(GLenum pname, GLdouble *params)

+{

+   const struct value_desc *d;

+   union value v;

+   GLmatrix *m;

+   int shift, i;

+   void *p;

+

+   d = find_value("glGetDoublev", pname, &p, &v);

+   switch (d->type) {

+   case TYPE_INVALID:

+      break;

+   case TYPE_CONST:

+      params[0] = d->offset;

+      break;

+

+   case TYPE_FLOAT_4:

+   case TYPE_FLOATN_4:

+      params[3] = ((GLfloat *) p)[3];

+   case TYPE_FLOAT_3:

+   case TYPE_FLOATN_3:

+      params[2] = ((GLfloat *) p)[2];

+   case TYPE_FLOAT_2:

+   case TYPE_FLOATN_2:

+      params[1] = ((GLfloat *) p)[1];

+   case TYPE_FLOAT:

+   case TYPE_FLOATN:

+      params[0] = ((GLfloat *) p)[0];

+      break;

+

+   case TYPE_DOUBLEN:

+      params[0] = ((GLdouble *) p)[0];

+      break;

+

+   case TYPE_INT_4:

+      params[3] = ((GLint *) p)[3];

+   case TYPE_INT_3:

+      params[2] = ((GLint *) p)[2];

+   case TYPE_INT_2:

+   case TYPE_ENUM_2:

+      params[1] = ((GLint *) p)[1];

+   case TYPE_INT:

+   case TYPE_ENUM:

+      params[0] = ((GLint *) p)[0];

+      break;

+

+   case TYPE_INT_N:

+      for (i = 0; i < v.value_int_n.n; i++)

+	 params[i] = v.value_int_n.ints[i];

+      break;

+

+   case TYPE_INT64:

+      params[0] = ((GLint64 *) p)[0];

+      break;

+

+   case TYPE_BOOLEAN:

+      params[0] = *(GLboolean*) p;

+      break;		

+

+   case TYPE_MATRIX:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = m->m[i];

+      break;

+

+   case TYPE_MATRIX_T:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = m->m[transpose[i]];

+      break;

+

+   case TYPE_BIT_0:

+   case TYPE_BIT_1:

+   case TYPE_BIT_2:

+   case TYPE_BIT_3:

+   case TYPE_BIT_4:

+   case TYPE_BIT_5:

+      shift = d->type - TYPE_BIT_0;

+      params[0] = (*(GLbitfield *) p >> shift) & 1;

+      break;

+   }

+}

+

+static enum value_type

+find_value_indexed(const char *func, GLenum pname, int index, union value *v)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   switch (pname) {

+

+   case GL_BLEND:

+      if (index >= ctx->Const.MaxDrawBuffers)

+	 goto invalid_value;

+      if (!ctx->Extensions.EXT_draw_buffers2)

+	 goto invalid_enum;

+      v->value_int = (ctx->Color.BlendEnabled >> index) & 1;

+      return TYPE_INT;

+

+   case GL_COLOR_WRITEMASK:

+      if (index >= ctx->Const.MaxDrawBuffers)

+	 goto invalid_value;

+      if (!ctx->Extensions.EXT_draw_buffers2)

+	 goto invalid_enum;

+      v->value_int_4[0] = ctx->Color.ColorMask[index][RCOMP] ? 1 : 0;

+      v->value_int_4[1] = ctx->Color.ColorMask[index][GCOMP] ? 1 : 0;

+      v->value_int_4[2] = ctx->Color.ColorMask[index][BCOMP] ? 1 : 0;

+      v->value_int_4[3] = ctx->Color.ColorMask[index][ACOMP] ? 1 : 0;

+      return TYPE_INT_4;

+

+   case GL_TRANSFORM_FEEDBACK_BUFFER_START:

+      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)

+	 goto invalid_value;

+      if (!ctx->Extensions.EXT_transform_feedback)

+	 goto invalid_enum;

+      v->value_int64 = ctx->TransformFeedback.CurrentObject->Offset[index];

+      return TYPE_INT64;

+

+   case GL_TRANSFORM_FEEDBACK_BUFFER_SIZE:

+      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)

+	 goto invalid_value;

+      if (!ctx->Extensions.EXT_transform_feedback)

+	 goto invalid_enum;

+      v->value_int64 = ctx->TransformFeedback.CurrentObject->Size[index];

+      return TYPE_INT64;

+

+   case GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:

+      if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs)

+	 goto invalid_value;

+      if (!ctx->Extensions.EXT_transform_feedback)

+	 goto invalid_enum;

+      v->value_int = ctx->TransformFeedback.CurrentObject->Buffers[index]->Name;

+      return TYPE_INT;

+   }

+

+ invalid_enum:

+   _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,

+               _mesa_lookup_enum_by_nr(pname));

+   return TYPE_INVALID;

+ invalid_value:

+   _mesa_error(ctx, GL_INVALID_VALUE, "%s(pname=%s)", func,

+               _mesa_lookup_enum_by_nr(pname));

+   return TYPE_INVALID;

+}

+

+void GLAPIENTRY

+_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )

+{

+   union value v;

+

+   switch (find_value_indexed("glGetBooleanIndexedv", pname, index, &v)) {

+   case TYPE_INT:

+      params[0] = INT_TO_BOOLEAN(v.value_int);

+      break;

+   case TYPE_INT_4:

+      params[0] = INT_TO_BOOLEAN(v.value_int_4[0]);

+      params[1] = INT_TO_BOOLEAN(v.value_int_4[1]);

+      params[2] = INT_TO_BOOLEAN(v.value_int_4[2]);

+      params[3] = INT_TO_BOOLEAN(v.value_int_4[3]);

+      break;

+   case TYPE_INT64:

+      params[0] = INT64_TO_BOOLEAN(v.value_int);

+      break;

+   default:

+      assert(0);

+   }

+}

+

+void GLAPIENTRY

+_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )

+{

+   union value v;

+

+   switch (find_value_indexed("glGetIntegerIndexedv", pname, index, &v)) {

+   case TYPE_INT:

+      params[0] = v.value_int;

+      break;

+   case TYPE_INT_4:

+      params[0] = v.value_int_4[0];

+      params[1] = v.value_int_4[1];

+      params[2] = v.value_int_4[2];

+      params[3] = v.value_int_4[3];

+      break;

+   case TYPE_INT64:

+      params[0] = INT64_TO_INT(v.value_int);

+      break;

+   default:

+      assert(0);

+   }

+}

+

+#if FEATURE_ARB_sync

+void GLAPIENTRY

+_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )

+{

+   union value v;

+

+   switch (find_value_indexed("glGetIntegerIndexedv", pname, index, &v)) {

+   case TYPE_INT:

+      params[0] = v.value_int;

+      break;

+   case TYPE_INT_4:

+      params[0] = v.value_int_4[0];

+      params[1] = v.value_int_4[1];

+      params[2] = v.value_int_4[2];

+      params[3] = v.value_int_4[3];

+      break;

+   case TYPE_INT64:

+      params[0] = v.value_int;

+      break;

+   default:

+      assert(0);

+   }

+}

+#endif /* FEATURE_ARB_sync */

+

+#if FEATURE_ES1

+void GLAPIENTRY

+_mesa_GetFixedv(GLenum pname, GLfixed *params)

+{

+   const struct value_desc *d;

+   union value v;

+   GLmatrix *m;

+   int shift, i;

+   void *p;

+

+   d = find_value("glGetDoublev", pname, &p, &v);

+   switch (d->type) {

+   case TYPE_INVALID:

+      break;

+   case TYPE_CONST:

+      params[0] = INT_TO_FIXED(d->offset);

+      break;

+

+   case TYPE_FLOAT_4:

+   case TYPE_FLOATN_4:

+      params[3] = FLOAT_TO_FIXED(((GLfloat *) p)[3]);

+   case TYPE_FLOAT_3:

+   case TYPE_FLOATN_3:

+      params[2] = FLOAT_TO_FIXED(((GLfloat *) p)[2]);

+   case TYPE_FLOAT_2:

+   case TYPE_FLOATN_2:

+      params[1] = FLOAT_TO_FIXED(((GLfloat *) p)[1]);

+   case TYPE_FLOAT:

+   case TYPE_FLOATN:

+      params[0] = FLOAT_TO_FIXED(((GLfloat *) p)[0]);

+      break;

+

+   case TYPE_DOUBLEN:

+      params[0] = FLOAT_TO_FIXED(((GLdouble *) p)[0]);

+      break;

+

+   case TYPE_INT_4:

+      params[3] = INT_TO_FIXED(((GLint *) p)[3]);

+   case TYPE_INT_3:

+      params[2] = INT_TO_FIXED(((GLint *) p)[2]);

+   case TYPE_INT_2:

+   case TYPE_ENUM_2:

+      params[1] = INT_TO_FIXED(((GLint *) p)[1]);

+   case TYPE_INT:

+   case TYPE_ENUM:

+      params[0] = INT_TO_FIXED(((GLint *) p)[0]);

+      break;

+

+   case TYPE_INT_N:

+      for (i = 0; i < v.value_int_n.n; i++)

+	 params[i] = INT_TO_FIXED(v.value_int_n.ints[i]);

+      break;

+

+   case TYPE_INT64:

+      params[0] = ((GLint64 *) p)[0];

+      break;

+

+   case TYPE_BOOLEAN:

+      params[0] = BOOLEAN_TO_FIXED(((GLboolean*) p)[0]);

+      break;		

+

+   case TYPE_MATRIX:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_FIXED(m->m[i]);

+      break;

+

+   case TYPE_MATRIX_T:

+      m = *(GLmatrix **) p;

+      for (i = 0; i < 16; i++)

+	 params[i] = FLOAT_TO_FIXED(m->m[transpose[i]]);

+      break;

+

+   case TYPE_BIT_0:

+   case TYPE_BIT_1:

+   case TYPE_BIT_2:

+   case TYPE_BIT_3:

+   case TYPE_BIT_4:

+   case TYPE_BIT_5:

+      shift = d->type - TYPE_BIT_0;

+      params[0] = BOOLEAN_TO_FIXED((*(GLbitfield *) p >> shift) & 1);

+      break;

+   }

+}

+#endif

diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c
index 3910047fb..103a4942a 100644
--- a/mesalib/src/mesa/main/getstring.c
+++ b/mesalib/src/mesa/main/getstring.c
@@ -1,251 +1,251 @@
-/*
- * 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 "context.h"
-#include "get.h"
-#include "enums.h"
-#include "extensions.h"
-
-
-/**
- * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.
- */
-static const GLubyte *
-shading_language_version(GLcontext *ctx)
-{
-   switch (ctx->API) {
-   case API_OPENGL:
-      if (!ctx->Extensions.ARB_shader_objects) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetString");
-         return (const GLubyte *) 0;
-      }
-
-      switch (ctx->Const.GLSLVersion) {
-      case 110:
-         return (const GLubyte *) "1.10";
-      case 120:
-         return (const GLubyte *) "1.20";
-      case 130:
-         return (const GLubyte *) "1.30";
-      default:
-         _mesa_problem(ctx,
-                       "Invalid GLSL version in shading_language_version()");
-         return (const GLubyte *) 0;
-      }
-      break;
-
-   case API_OPENGLES2:
-      return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16";
-
-   case API_OPENGLES:
-      /* fall-through */
-
-   default:
-      _mesa_problem(ctx, "Unexpected API value in shading_language_version()");
-      return (const GLubyte *) 0;
-   }
-}
-
-
-/**
- * Query string-valued state.  The return value should _not_ be freed by
- * the caller.
- *
- * \param name  the state variable to query.
- *
- * \sa glGetString().
- *
- * Tries to get the string from dd_function_table::GetString, otherwise returns
- * the hardcoded strings.
- */
-const GLubyte * GLAPIENTRY
-_mesa_GetString( GLenum name )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   static const char *vendor = "Brian Paul";
-   static const char *renderer = "Mesa";
-
-   if (!ctx)
-      return NULL;
-
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
-
-   /* this is a required driver function */
-   assert(ctx->Driver.GetString);
-   {
-      /* Give the driver the chance to handle this query */
-      const GLubyte *str = (*ctx->Driver.GetString)(ctx, name);
-      if (str)
-         return str;
-   }
-
-   switch (name) {
-      case GL_VENDOR:
-         return (const GLubyte *) vendor;
-      case GL_RENDERER:
-         return (const GLubyte *) renderer;
-      case GL_VERSION:
-         return (const GLubyte *) ctx->VersionString;
-      case GL_EXTENSIONS:
-         return (const GLubyte *) ctx->Extensions.String;
-#if FEATURE_ARB_shading_language_100 || FEATURE_ES2
-      case GL_SHADING_LANGUAGE_VERSION:
-	 return shading_language_version(ctx);
-#endif
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
-    FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-      case GL_PROGRAM_ERROR_STRING_NV:
-         if (ctx->Extensions.NV_fragment_program ||
-             ctx->Extensions.ARB_fragment_program ||
-             ctx->Extensions.NV_vertex_program ||
-             ctx->Extensions.ARB_vertex_program) {
-            return (const GLubyte *) ctx->Program.ErrorString;
-         }
-         /* FALL-THROUGH */
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
-         return (const GLubyte *) 0;
-   }
-}
-
-
-/**
- * GL3
- */
-const GLubyte * GLAPIENTRY
-_mesa_GetStringi(GLenum name, GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (!ctx)
-      return NULL;
-
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
-
-   switch (name) {
-   case GL_EXTENSIONS:
-      if (index >= _mesa_get_extension_count(ctx)) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glGetStringi(index=%u)", index);
-         return (const GLubyte *) 0;
-      }
-      return _mesa_get_enabled_extension(ctx, index);
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
-      return (const GLubyte *) 0;
-   }
-}
-
-
-
-/**
- * Return pointer-valued state, such as a vertex array pointer.
- *
- * \param pname  names state to be queried
- * \param params  returns the pointer value
- *
- * \sa glGetPointerv().
- *
- * Tries to get the specified pointer via dd_function_table::GetPointerv,
- * otherwise gets the specified pointer from the current context.
- */
-void GLAPIENTRY
-_mesa_GetPointerv( GLenum pname, GLvoid **params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint clientUnit = ctx->Array.ActiveTexture;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!params)
-      return;
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));
-
-   switch (pname) {
-      case GL_VERTEX_ARRAY_POINTER:
-         *params = (GLvoid *) ctx->Array.ArrayObj->Vertex.Ptr;
-         break;
-      case GL_NORMAL_ARRAY_POINTER:
-         *params = (GLvoid *) ctx->Array.ArrayObj->Normal.Ptr;
-         break;
-      case GL_COLOR_ARRAY_POINTER:
-         *params = (GLvoid *) ctx->Array.ArrayObj->Color.Ptr;
-         break;
-      case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT:
-         *params = (GLvoid *) ctx->Array.ArrayObj->SecondaryColor.Ptr;
-         break;
-      case GL_FOG_COORDINATE_ARRAY_POINTER_EXT:
-         *params = (GLvoid *) ctx->Array.ArrayObj->FogCoord.Ptr;
-         break;
-      case GL_INDEX_ARRAY_POINTER:
-         *params = (GLvoid *) ctx->Array.ArrayObj->Index.Ptr;
-         break;
-      case GL_TEXTURE_COORD_ARRAY_POINTER:
-         *params = (GLvoid *) ctx->Array.ArrayObj->TexCoord[clientUnit].Ptr;
-         break;
-      case GL_EDGE_FLAG_ARRAY_POINTER:
-         *params = (GLvoid *) ctx->Array.ArrayObj->EdgeFlag.Ptr;
-         break;
-      case GL_FEEDBACK_BUFFER_POINTER:
-         *params = ctx->Feedback.Buffer;
-         break;
-      case GL_SELECTION_BUFFER_POINTER:
-         *params = ctx->Select.Buffer;
-         break;
-#if FEATURE_point_size_array
-      case GL_POINT_SIZE_ARRAY_POINTER_OES:
-         *params = (GLvoid *) ctx->Array.ArrayObj->PointSize.Ptr;
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
-         return;
-   }
-}
-
-
-/**
- * Returns the current GL error code, or GL_NO_ERROR.
- * \return current error code
- *
- * Returns __GLcontextRec::ErrorValue.
- */
-GLenum GLAPIENTRY
-_mesa_GetError( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLenum e = ctx->ErrorValue;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));
-
-   ctx->ErrorValue = (GLenum) GL_NO_ERROR;
-   ctx->ErrorDebugCount = 0;
-   return e;
-}
+/*

+ * 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 "context.h"

+#include "get.h"

+#include "enums.h"

+#include "extensions.h"

+

+

+/**

+ * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.

+ */

+static const GLubyte *

+shading_language_version(struct gl_context *ctx)

+{

+   switch (ctx->API) {

+   case API_OPENGL:

+      if (!ctx->Extensions.ARB_shader_objects) {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetString");

+         return (const GLubyte *) 0;

+      }

+

+      switch (ctx->Const.GLSLVersion) {

+      case 110:

+         return (const GLubyte *) "1.10";

+      case 120:

+         return (const GLubyte *) "1.20";

+      case 130:

+         return (const GLubyte *) "1.30";

+      default:

+         _mesa_problem(ctx,

+                       "Invalid GLSL version in shading_language_version()");

+         return (const GLubyte *) 0;

+      }

+      break;

+

+   case API_OPENGLES2:

+      return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16";

+

+   case API_OPENGLES:

+      /* fall-through */

+

+   default:

+      _mesa_problem(ctx, "Unexpected API value in shading_language_version()");

+      return (const GLubyte *) 0;

+   }

+}

+

+

+/**

+ * Query string-valued state.  The return value should _not_ be freed by

+ * the caller.

+ *

+ * \param name  the state variable to query.

+ *

+ * \sa glGetString().

+ *

+ * Tries to get the string from dd_function_table::GetString, otherwise returns

+ * the hardcoded strings.

+ */

+const GLubyte * GLAPIENTRY

+_mesa_GetString( GLenum name )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   static const char *vendor = "Brian Paul";

+   static const char *renderer = "Mesa";

+

+   if (!ctx)

+      return NULL;

+

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

+

+   /* this is a required driver function */

+   assert(ctx->Driver.GetString);

+   {

+      /* Give the driver the chance to handle this query */

+      const GLubyte *str = (*ctx->Driver.GetString)(ctx, name);

+      if (str)

+         return str;

+   }

+

+   switch (name) {

+      case GL_VENDOR:

+         return (const GLubyte *) vendor;

+      case GL_RENDERER:

+         return (const GLubyte *) renderer;

+      case GL_VERSION:

+         return (const GLubyte *) ctx->VersionString;

+      case GL_EXTENSIONS:

+         return (const GLubyte *) ctx->Extensions.String;

+#if FEATURE_ARB_shading_language_100 || FEATURE_ES2

+      case GL_SHADING_LANGUAGE_VERSION:

+	 return shading_language_version(ctx);

+#endif

+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \

+    FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

+      case GL_PROGRAM_ERROR_STRING_NV:

+         if (ctx->Extensions.NV_fragment_program ||

+             ctx->Extensions.ARB_fragment_program ||

+             ctx->Extensions.NV_vertex_program ||

+             ctx->Extensions.ARB_vertex_program) {

+            return (const GLubyte *) ctx->Program.ErrorString;

+         }

+         /* FALL-THROUGH */

+#endif

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );

+         return (const GLubyte *) 0;

+   }

+}

+

+

+/**

+ * GL3

+ */

+const GLubyte * GLAPIENTRY

+_mesa_GetStringi(GLenum name, GLuint index)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (!ctx)

+      return NULL;

+

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

+

+   switch (name) {

+   case GL_EXTENSIONS:

+      if (index >= _mesa_get_extension_count(ctx)) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glGetStringi(index=%u)", index);

+         return (const GLubyte *) 0;

+      }

+      return _mesa_get_enabled_extension(ctx, index);

+   default:

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );

+      return (const GLubyte *) 0;

+   }

+}

+

+

+

+/**

+ * Return pointer-valued state, such as a vertex array pointer.

+ *

+ * \param pname  names state to be queried

+ * \param params  returns the pointer value

+ *

+ * \sa glGetPointerv().

+ *

+ * Tries to get the specified pointer via dd_function_table::GetPointerv,

+ * otherwise gets the specified pointer from the current context.

+ */

+void GLAPIENTRY

+_mesa_GetPointerv( GLenum pname, GLvoid **params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint clientUnit = ctx->Array.ActiveTexture;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!params)

+      return;

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));

+

+   switch (pname) {

+      case GL_VERTEX_ARRAY_POINTER:

+         *params = (GLvoid *) ctx->Array.ArrayObj->Vertex.Ptr;

+         break;

+      case GL_NORMAL_ARRAY_POINTER:

+         *params = (GLvoid *) ctx->Array.ArrayObj->Normal.Ptr;

+         break;

+      case GL_COLOR_ARRAY_POINTER:

+         *params = (GLvoid *) ctx->Array.ArrayObj->Color.Ptr;

+         break;

+      case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT:

+         *params = (GLvoid *) ctx->Array.ArrayObj->SecondaryColor.Ptr;

+         break;

+      case GL_FOG_COORDINATE_ARRAY_POINTER_EXT:

+         *params = (GLvoid *) ctx->Array.ArrayObj->FogCoord.Ptr;

+         break;

+      case GL_INDEX_ARRAY_POINTER:

+         *params = (GLvoid *) ctx->Array.ArrayObj->Index.Ptr;

+         break;

+      case GL_TEXTURE_COORD_ARRAY_POINTER:

+         *params = (GLvoid *) ctx->Array.ArrayObj->TexCoord[clientUnit].Ptr;

+         break;

+      case GL_EDGE_FLAG_ARRAY_POINTER:

+         *params = (GLvoid *) ctx->Array.ArrayObj->EdgeFlag.Ptr;

+         break;

+      case GL_FEEDBACK_BUFFER_POINTER:

+         *params = ctx->Feedback.Buffer;

+         break;

+      case GL_SELECTION_BUFFER_POINTER:

+         *params = ctx->Select.Buffer;

+         break;

+#if FEATURE_point_size_array

+      case GL_POINT_SIZE_ARRAY_POINTER_OES:

+         *params = (GLvoid *) ctx->Array.ArrayObj->PointSize.Ptr;

+         break;

+#endif

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );

+         return;

+   }

+}

+

+

+/**

+ * Returns the current GL error code, or GL_NO_ERROR.

+ * \return current error code

+ *

+ * Returns __struct gl_contextRec::ErrorValue.

+ */

+GLenum GLAPIENTRY

+_mesa_GetError( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLenum e = ctx->ErrorValue;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));

+

+   ctx->ErrorValue = (GLenum) GL_NO_ERROR;

+   ctx->ErrorDebugCount = 0;

+   return e;

+}

diff --git a/mesalib/src/mesa/main/glapidispatch.h b/mesalib/src/mesa/main/glapidispatch.h
new file mode 100644
index 000000000..140ea831c
--- /dev/null
+++ b/mesalib/src/mesa/main/glapidispatch.h
@@ -0,0 +1,4548 @@
+/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */

+

+/*

+ * (C) Copyright IBM Corporation 2005

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

+ * IBM,

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

+ */

+

+#if !defined( _GLAPI_DISPATCH_H_ )

+#  define _GLAPI_DISPATCH_H_

+

+

+/* this file should not be included directly in mesa */

+

+/**

+ * \file glapidispatch.h

+ * Macros for handling GL dispatch tables.

+ *

+ * For each known GL function, there are 3 macros in this file.  The first

+ * macro is named CALL_FuncName and is used to call that GL function using

+ * the specified dispatch table.  The other 2 macros, called GET_FuncName

+ * can SET_FuncName, are used to get and set the dispatch pointer for the

+ * named function in the specified dispatch table.

+ */

+

+#define CALL_by_offset(disp, cast, offset, parameters) \

+    (*(cast (GET_by_offset(disp, offset)))) parameters

+#define GET_by_offset(disp, offset) \

+    (offset >= 0) ? (((_glapi_proc *)(disp))[offset]) : NULL

+#define SET_by_offset(disp, offset, fn) \

+    do { \

+        if ( (offset) < 0 ) { \

+            /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \

+            /*         __func__, __LINE__, disp, offset, # fn); */ \

+            /* abort(); */ \

+        } \

+        else { \

+            ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \

+        } \

+    } while(0)

+

+/* total number of offsets below */

+#define _gloffset_COUNT 881

+

+#define _gloffset_NewList 0

+#define _gloffset_EndList 1

+#define _gloffset_CallList 2

+#define _gloffset_CallLists 3

+#define _gloffset_DeleteLists 4

+#define _gloffset_GenLists 5

+#define _gloffset_ListBase 6

+#define _gloffset_Begin 7

+#define _gloffset_Bitmap 8

+#define _gloffset_Color3b 9

+#define _gloffset_Color3bv 10

+#define _gloffset_Color3d 11

+#define _gloffset_Color3dv 12

+#define _gloffset_Color3f 13

+#define _gloffset_Color3fv 14

+#define _gloffset_Color3i 15

+#define _gloffset_Color3iv 16

+#define _gloffset_Color3s 17

+#define _gloffset_Color3sv 18

+#define _gloffset_Color3ub 19

+#define _gloffset_Color3ubv 20

+#define _gloffset_Color3ui 21

+#define _gloffset_Color3uiv 22

+#define _gloffset_Color3us 23

+#define _gloffset_Color3usv 24

+#define _gloffset_Color4b 25

+#define _gloffset_Color4bv 26

+#define _gloffset_Color4d 27

+#define _gloffset_Color4dv 28

+#define _gloffset_Color4f 29

+#define _gloffset_Color4fv 30

+#define _gloffset_Color4i 31

+#define _gloffset_Color4iv 32

+#define _gloffset_Color4s 33

+#define _gloffset_Color4sv 34

+#define _gloffset_Color4ub 35

+#define _gloffset_Color4ubv 36

+#define _gloffset_Color4ui 37

+#define _gloffset_Color4uiv 38

+#define _gloffset_Color4us 39

+#define _gloffset_Color4usv 40

+#define _gloffset_EdgeFlag 41

+#define _gloffset_EdgeFlagv 42

+#define _gloffset_End 43

+#define _gloffset_Indexd 44

+#define _gloffset_Indexdv 45

+#define _gloffset_Indexf 46

+#define _gloffset_Indexfv 47

+#define _gloffset_Indexi 48

+#define _gloffset_Indexiv 49

+#define _gloffset_Indexs 50

+#define _gloffset_Indexsv 51

+#define _gloffset_Normal3b 52

+#define _gloffset_Normal3bv 53

+#define _gloffset_Normal3d 54

+#define _gloffset_Normal3dv 55

+#define _gloffset_Normal3f 56

+#define _gloffset_Normal3fv 57

+#define _gloffset_Normal3i 58

+#define _gloffset_Normal3iv 59

+#define _gloffset_Normal3s 60

+#define _gloffset_Normal3sv 61

+#define _gloffset_RasterPos2d 62

+#define _gloffset_RasterPos2dv 63

+#define _gloffset_RasterPos2f 64

+#define _gloffset_RasterPos2fv 65

+#define _gloffset_RasterPos2i 66

+#define _gloffset_RasterPos2iv 67

+#define _gloffset_RasterPos2s 68

+#define _gloffset_RasterPos2sv 69

+#define _gloffset_RasterPos3d 70

+#define _gloffset_RasterPos3dv 71

+#define _gloffset_RasterPos3f 72

+#define _gloffset_RasterPos3fv 73

+#define _gloffset_RasterPos3i 74

+#define _gloffset_RasterPos3iv 75

+#define _gloffset_RasterPos3s 76

+#define _gloffset_RasterPos3sv 77

+#define _gloffset_RasterPos4d 78

+#define _gloffset_RasterPos4dv 79

+#define _gloffset_RasterPos4f 80

+#define _gloffset_RasterPos4fv 81

+#define _gloffset_RasterPos4i 82

+#define _gloffset_RasterPos4iv 83

+#define _gloffset_RasterPos4s 84

+#define _gloffset_RasterPos4sv 85

+#define _gloffset_Rectd 86

+#define _gloffset_Rectdv 87

+#define _gloffset_Rectf 88

+#define _gloffset_Rectfv 89

+#define _gloffset_Recti 90

+#define _gloffset_Rectiv 91

+#define _gloffset_Rects 92

+#define _gloffset_Rectsv 93

+#define _gloffset_TexCoord1d 94

+#define _gloffset_TexCoord1dv 95

+#define _gloffset_TexCoord1f 96

+#define _gloffset_TexCoord1fv 97

+#define _gloffset_TexCoord1i 98

+#define _gloffset_TexCoord1iv 99

+#define _gloffset_TexCoord1s 100

+#define _gloffset_TexCoord1sv 101

+#define _gloffset_TexCoord2d 102

+#define _gloffset_TexCoord2dv 103

+#define _gloffset_TexCoord2f 104

+#define _gloffset_TexCoord2fv 105

+#define _gloffset_TexCoord2i 106

+#define _gloffset_TexCoord2iv 107

+#define _gloffset_TexCoord2s 108

+#define _gloffset_TexCoord2sv 109

+#define _gloffset_TexCoord3d 110

+#define _gloffset_TexCoord3dv 111

+#define _gloffset_TexCoord3f 112

+#define _gloffset_TexCoord3fv 113

+#define _gloffset_TexCoord3i 114

+#define _gloffset_TexCoord3iv 115

+#define _gloffset_TexCoord3s 116

+#define _gloffset_TexCoord3sv 117

+#define _gloffset_TexCoord4d 118

+#define _gloffset_TexCoord4dv 119

+#define _gloffset_TexCoord4f 120

+#define _gloffset_TexCoord4fv 121

+#define _gloffset_TexCoord4i 122

+#define _gloffset_TexCoord4iv 123

+#define _gloffset_TexCoord4s 124

+#define _gloffset_TexCoord4sv 125

+#define _gloffset_Vertex2d 126

+#define _gloffset_Vertex2dv 127

+#define _gloffset_Vertex2f 128

+#define _gloffset_Vertex2fv 129

+#define _gloffset_Vertex2i 130

+#define _gloffset_Vertex2iv 131

+#define _gloffset_Vertex2s 132

+#define _gloffset_Vertex2sv 133

+#define _gloffset_Vertex3d 134

+#define _gloffset_Vertex3dv 135

+#define _gloffset_Vertex3f 136

+#define _gloffset_Vertex3fv 137

+#define _gloffset_Vertex3i 138

+#define _gloffset_Vertex3iv 139

+#define _gloffset_Vertex3s 140

+#define _gloffset_Vertex3sv 141

+#define _gloffset_Vertex4d 142

+#define _gloffset_Vertex4dv 143

+#define _gloffset_Vertex4f 144

+#define _gloffset_Vertex4fv 145

+#define _gloffset_Vertex4i 146

+#define _gloffset_Vertex4iv 147

+#define _gloffset_Vertex4s 148

+#define _gloffset_Vertex4sv 149

+#define _gloffset_ClipPlane 150

+#define _gloffset_ColorMaterial 151

+#define _gloffset_CullFace 152

+#define _gloffset_Fogf 153

+#define _gloffset_Fogfv 154

+#define _gloffset_Fogi 155

+#define _gloffset_Fogiv 156

+#define _gloffset_FrontFace 157

+#define _gloffset_Hint 158

+#define _gloffset_Lightf 159

+#define _gloffset_Lightfv 160

+#define _gloffset_Lighti 161

+#define _gloffset_Lightiv 162

+#define _gloffset_LightModelf 163

+#define _gloffset_LightModelfv 164

+#define _gloffset_LightModeli 165

+#define _gloffset_LightModeliv 166

+#define _gloffset_LineStipple 167

+#define _gloffset_LineWidth 168

+#define _gloffset_Materialf 169

+#define _gloffset_Materialfv 170

+#define _gloffset_Materiali 171

+#define _gloffset_Materialiv 172

+#define _gloffset_PointSize 173

+#define _gloffset_PolygonMode 174

+#define _gloffset_PolygonStipple 175

+#define _gloffset_Scissor 176

+#define _gloffset_ShadeModel 177

+#define _gloffset_TexParameterf 178

+#define _gloffset_TexParameterfv 179

+#define _gloffset_TexParameteri 180

+#define _gloffset_TexParameteriv 181

+#define _gloffset_TexImage1D 182

+#define _gloffset_TexImage2D 183

+#define _gloffset_TexEnvf 184

+#define _gloffset_TexEnvfv 185

+#define _gloffset_TexEnvi 186

+#define _gloffset_TexEnviv 187

+#define _gloffset_TexGend 188

+#define _gloffset_TexGendv 189

+#define _gloffset_TexGenf 190

+#define _gloffset_TexGenfv 191

+#define _gloffset_TexGeni 192

+#define _gloffset_TexGeniv 193

+#define _gloffset_FeedbackBuffer 194

+#define _gloffset_SelectBuffer 195

+#define _gloffset_RenderMode 196

+#define _gloffset_InitNames 197

+#define _gloffset_LoadName 198

+#define _gloffset_PassThrough 199

+#define _gloffset_PopName 200

+#define _gloffset_PushName 201

+#define _gloffset_DrawBuffer 202

+#define _gloffset_Clear 203

+#define _gloffset_ClearAccum 204

+#define _gloffset_ClearIndex 205

+#define _gloffset_ClearColor 206

+#define _gloffset_ClearStencil 207

+#define _gloffset_ClearDepth 208

+#define _gloffset_StencilMask 209

+#define _gloffset_ColorMask 210

+#define _gloffset_DepthMask 211

+#define _gloffset_IndexMask 212

+#define _gloffset_Accum 213

+#define _gloffset_Disable 214

+#define _gloffset_Enable 215

+#define _gloffset_Finish 216

+#define _gloffset_Flush 217

+#define _gloffset_PopAttrib 218

+#define _gloffset_PushAttrib 219

+#define _gloffset_Map1d 220

+#define _gloffset_Map1f 221

+#define _gloffset_Map2d 222

+#define _gloffset_Map2f 223

+#define _gloffset_MapGrid1d 224

+#define _gloffset_MapGrid1f 225

+#define _gloffset_MapGrid2d 226

+#define _gloffset_MapGrid2f 227

+#define _gloffset_EvalCoord1d 228

+#define _gloffset_EvalCoord1dv 229

+#define _gloffset_EvalCoord1f 230

+#define _gloffset_EvalCoord1fv 231

+#define _gloffset_EvalCoord2d 232

+#define _gloffset_EvalCoord2dv 233

+#define _gloffset_EvalCoord2f 234

+#define _gloffset_EvalCoord2fv 235

+#define _gloffset_EvalMesh1 236

+#define _gloffset_EvalPoint1 237

+#define _gloffset_EvalMesh2 238

+#define _gloffset_EvalPoint2 239

+#define _gloffset_AlphaFunc 240

+#define _gloffset_BlendFunc 241

+#define _gloffset_LogicOp 242

+#define _gloffset_StencilFunc 243

+#define _gloffset_StencilOp 244

+#define _gloffset_DepthFunc 245

+#define _gloffset_PixelZoom 246

+#define _gloffset_PixelTransferf 247

+#define _gloffset_PixelTransferi 248

+#define _gloffset_PixelStoref 249

+#define _gloffset_PixelStorei 250

+#define _gloffset_PixelMapfv 251

+#define _gloffset_PixelMapuiv 252

+#define _gloffset_PixelMapusv 253

+#define _gloffset_ReadBuffer 254

+#define _gloffset_CopyPixels 255

+#define _gloffset_ReadPixels 256

+#define _gloffset_DrawPixels 257

+#define _gloffset_GetBooleanv 258

+#define _gloffset_GetClipPlane 259

+#define _gloffset_GetDoublev 260

+#define _gloffset_GetError 261

+#define _gloffset_GetFloatv 262

+#define _gloffset_GetIntegerv 263

+#define _gloffset_GetLightfv 264

+#define _gloffset_GetLightiv 265

+#define _gloffset_GetMapdv 266

+#define _gloffset_GetMapfv 267

+#define _gloffset_GetMapiv 268

+#define _gloffset_GetMaterialfv 269

+#define _gloffset_GetMaterialiv 270

+#define _gloffset_GetPixelMapfv 271

+#define _gloffset_GetPixelMapuiv 272

+#define _gloffset_GetPixelMapusv 273

+#define _gloffset_GetPolygonStipple 274

+#define _gloffset_GetString 275

+#define _gloffset_GetTexEnvfv 276

+#define _gloffset_GetTexEnviv 277

+#define _gloffset_GetTexGendv 278

+#define _gloffset_GetTexGenfv 279

+#define _gloffset_GetTexGeniv 280

+#define _gloffset_GetTexImage 281

+#define _gloffset_GetTexParameterfv 282

+#define _gloffset_GetTexParameteriv 283

+#define _gloffset_GetTexLevelParameterfv 284

+#define _gloffset_GetTexLevelParameteriv 285

+#define _gloffset_IsEnabled 286

+#define _gloffset_IsList 287

+#define _gloffset_DepthRange 288

+#define _gloffset_Frustum 289

+#define _gloffset_LoadIdentity 290

+#define _gloffset_LoadMatrixf 291

+#define _gloffset_LoadMatrixd 292

+#define _gloffset_MatrixMode 293

+#define _gloffset_MultMatrixf 294

+#define _gloffset_MultMatrixd 295

+#define _gloffset_Ortho 296

+#define _gloffset_PopMatrix 297

+#define _gloffset_PushMatrix 298

+#define _gloffset_Rotated 299

+#define _gloffset_Rotatef 300

+#define _gloffset_Scaled 301

+#define _gloffset_Scalef 302

+#define _gloffset_Translated 303

+#define _gloffset_Translatef 304

+#define _gloffset_Viewport 305

+#define _gloffset_ArrayElement 306

+#define _gloffset_BindTexture 307

+#define _gloffset_ColorPointer 308

+#define _gloffset_DisableClientState 309

+#define _gloffset_DrawArrays 310

+#define _gloffset_DrawElements 311

+#define _gloffset_EdgeFlagPointer 312

+#define _gloffset_EnableClientState 313

+#define _gloffset_IndexPointer 314

+#define _gloffset_Indexub 315

+#define _gloffset_Indexubv 316

+#define _gloffset_InterleavedArrays 317

+#define _gloffset_NormalPointer 318

+#define _gloffset_PolygonOffset 319

+#define _gloffset_TexCoordPointer 320

+#define _gloffset_VertexPointer 321

+#define _gloffset_AreTexturesResident 322

+#define _gloffset_CopyTexImage1D 323

+#define _gloffset_CopyTexImage2D 324

+#define _gloffset_CopyTexSubImage1D 325

+#define _gloffset_CopyTexSubImage2D 326

+#define _gloffset_DeleteTextures 327

+#define _gloffset_GenTextures 328

+#define _gloffset_GetPointerv 329

+#define _gloffset_IsTexture 330

+#define _gloffset_PrioritizeTextures 331

+#define _gloffset_TexSubImage1D 332

+#define _gloffset_TexSubImage2D 333

+#define _gloffset_PopClientAttrib 334

+#define _gloffset_PushClientAttrib 335

+#define _gloffset_BlendColor 336

+#define _gloffset_BlendEquation 337

+#define _gloffset_DrawRangeElements 338

+#define _gloffset_ColorTable 339

+#define _gloffset_ColorTableParameterfv 340

+#define _gloffset_ColorTableParameteriv 341

+#define _gloffset_CopyColorTable 342

+#define _gloffset_GetColorTable 343

+#define _gloffset_GetColorTableParameterfv 344

+#define _gloffset_GetColorTableParameteriv 345

+#define _gloffset_ColorSubTable 346

+#define _gloffset_CopyColorSubTable 347

+#define _gloffset_ConvolutionFilter1D 348

+#define _gloffset_ConvolutionFilter2D 349

+#define _gloffset_ConvolutionParameterf 350

+#define _gloffset_ConvolutionParameterfv 351

+#define _gloffset_ConvolutionParameteri 352

+#define _gloffset_ConvolutionParameteriv 353

+#define _gloffset_CopyConvolutionFilter1D 354

+#define _gloffset_CopyConvolutionFilter2D 355

+#define _gloffset_GetConvolutionFilter 356

+#define _gloffset_GetConvolutionParameterfv 357

+#define _gloffset_GetConvolutionParameteriv 358

+#define _gloffset_GetSeparableFilter 359

+#define _gloffset_SeparableFilter2D 360

+#define _gloffset_GetHistogram 361

+#define _gloffset_GetHistogramParameterfv 362

+#define _gloffset_GetHistogramParameteriv 363

+#define _gloffset_GetMinmax 364

+#define _gloffset_GetMinmaxParameterfv 365

+#define _gloffset_GetMinmaxParameteriv 366

+#define _gloffset_Histogram 367

+#define _gloffset_Minmax 368

+#define _gloffset_ResetHistogram 369

+#define _gloffset_ResetMinmax 370

+#define _gloffset_TexImage3D 371

+#define _gloffset_TexSubImage3D 372

+#define _gloffset_CopyTexSubImage3D 373

+#define _gloffset_ActiveTextureARB 374

+#define _gloffset_ClientActiveTextureARB 375

+#define _gloffset_MultiTexCoord1dARB 376

+#define _gloffset_MultiTexCoord1dvARB 377

+#define _gloffset_MultiTexCoord1fARB 378

+#define _gloffset_MultiTexCoord1fvARB 379

+#define _gloffset_MultiTexCoord1iARB 380

+#define _gloffset_MultiTexCoord1ivARB 381

+#define _gloffset_MultiTexCoord1sARB 382

+#define _gloffset_MultiTexCoord1svARB 383

+#define _gloffset_MultiTexCoord2dARB 384

+#define _gloffset_MultiTexCoord2dvARB 385

+#define _gloffset_MultiTexCoord2fARB 386

+#define _gloffset_MultiTexCoord2fvARB 387

+#define _gloffset_MultiTexCoord2iARB 388

+#define _gloffset_MultiTexCoord2ivARB 389

+#define _gloffset_MultiTexCoord2sARB 390

+#define _gloffset_MultiTexCoord2svARB 391

+#define _gloffset_MultiTexCoord3dARB 392

+#define _gloffset_MultiTexCoord3dvARB 393

+#define _gloffset_MultiTexCoord3fARB 394

+#define _gloffset_MultiTexCoord3fvARB 395

+#define _gloffset_MultiTexCoord3iARB 396

+#define _gloffset_MultiTexCoord3ivARB 397

+#define _gloffset_MultiTexCoord3sARB 398

+#define _gloffset_MultiTexCoord3svARB 399

+#define _gloffset_MultiTexCoord4dARB 400

+#define _gloffset_MultiTexCoord4dvARB 401

+#define _gloffset_MultiTexCoord4fARB 402

+#define _gloffset_MultiTexCoord4fvARB 403

+#define _gloffset_MultiTexCoord4iARB 404

+#define _gloffset_MultiTexCoord4ivARB 405

+#define _gloffset_MultiTexCoord4sARB 406

+#define _gloffset_MultiTexCoord4svARB 407

+

+#if !defined(_GLAPI_USE_REMAP_TABLE)

+

+#define _gloffset_AttachShader 408

+#define _gloffset_CreateProgram 409

+#define _gloffset_CreateShader 410

+#define _gloffset_DeleteProgram 411

+#define _gloffset_DeleteShader 412

+#define _gloffset_DetachShader 413

+#define _gloffset_GetAttachedShaders 414

+#define _gloffset_GetProgramInfoLog 415

+#define _gloffset_GetProgramiv 416

+#define _gloffset_GetShaderInfoLog 417

+#define _gloffset_GetShaderiv 418

+#define _gloffset_IsProgram 419

+#define _gloffset_IsShader 420

+#define _gloffset_StencilFuncSeparate 421

+#define _gloffset_StencilMaskSeparate 422

+#define _gloffset_StencilOpSeparate 423

+#define _gloffset_UniformMatrix2x3fv 424

+#define _gloffset_UniformMatrix2x4fv 425

+#define _gloffset_UniformMatrix3x2fv 426

+#define _gloffset_UniformMatrix3x4fv 427

+#define _gloffset_UniformMatrix4x2fv 428

+#define _gloffset_UniformMatrix4x3fv 429

+#define _gloffset_ClampColor 430

+#define _gloffset_ClearBufferfi 431

+#define _gloffset_ClearBufferfv 432

+#define _gloffset_ClearBufferiv 433

+#define _gloffset_ClearBufferuiv 434

+#define _gloffset_GetStringi 435

+#define _gloffset_TexBuffer 436

+#define _gloffset_FramebufferTexture 437

+#define _gloffset_GetBufferParameteri64v 438

+#define _gloffset_GetInteger64i_v 439

+#define _gloffset_VertexAttribDivisor 440

+#define _gloffset_LoadTransposeMatrixdARB 441

+#define _gloffset_LoadTransposeMatrixfARB 442

+#define _gloffset_MultTransposeMatrixdARB 443

+#define _gloffset_MultTransposeMatrixfARB 444

+#define _gloffset_SampleCoverageARB 445

+#define _gloffset_CompressedTexImage1DARB 446

+#define _gloffset_CompressedTexImage2DARB 447

+#define _gloffset_CompressedTexImage3DARB 448

+#define _gloffset_CompressedTexSubImage1DARB 449

+#define _gloffset_CompressedTexSubImage2DARB 450

+#define _gloffset_CompressedTexSubImage3DARB 451

+#define _gloffset_GetCompressedTexImageARB 452

+#define _gloffset_DisableVertexAttribArrayARB 453

+#define _gloffset_EnableVertexAttribArrayARB 454

+#define _gloffset_GetProgramEnvParameterdvARB 455

+#define _gloffset_GetProgramEnvParameterfvARB 456

+#define _gloffset_GetProgramLocalParameterdvARB 457

+#define _gloffset_GetProgramLocalParameterfvARB 458

+#define _gloffset_GetProgramStringARB 459

+#define _gloffset_GetProgramivARB 460

+#define _gloffset_GetVertexAttribdvARB 461

+#define _gloffset_GetVertexAttribfvARB 462

+#define _gloffset_GetVertexAttribivARB 463

+#define _gloffset_ProgramEnvParameter4dARB 464

+#define _gloffset_ProgramEnvParameter4dvARB 465

+#define _gloffset_ProgramEnvParameter4fARB 466

+#define _gloffset_ProgramEnvParameter4fvARB 467

+#define _gloffset_ProgramLocalParameter4dARB 468

+#define _gloffset_ProgramLocalParameter4dvARB 469

+#define _gloffset_ProgramLocalParameter4fARB 470

+#define _gloffset_ProgramLocalParameter4fvARB 471

+#define _gloffset_ProgramStringARB 472

+#define _gloffset_VertexAttrib1dARB 473

+#define _gloffset_VertexAttrib1dvARB 474

+#define _gloffset_VertexAttrib1fARB 475

+#define _gloffset_VertexAttrib1fvARB 476

+#define _gloffset_VertexAttrib1sARB 477

+#define _gloffset_VertexAttrib1svARB 478

+#define _gloffset_VertexAttrib2dARB 479

+#define _gloffset_VertexAttrib2dvARB 480

+#define _gloffset_VertexAttrib2fARB 481

+#define _gloffset_VertexAttrib2fvARB 482

+#define _gloffset_VertexAttrib2sARB 483

+#define _gloffset_VertexAttrib2svARB 484

+#define _gloffset_VertexAttrib3dARB 485

+#define _gloffset_VertexAttrib3dvARB 486

+#define _gloffset_VertexAttrib3fARB 487

+#define _gloffset_VertexAttrib3fvARB 488

+#define _gloffset_VertexAttrib3sARB 489

+#define _gloffset_VertexAttrib3svARB 490

+#define _gloffset_VertexAttrib4NbvARB 491

+#define _gloffset_VertexAttrib4NivARB 492

+#define _gloffset_VertexAttrib4NsvARB 493

+#define _gloffset_VertexAttrib4NubARB 494

+#define _gloffset_VertexAttrib4NubvARB 495

+#define _gloffset_VertexAttrib4NuivARB 496

+#define _gloffset_VertexAttrib4NusvARB 497

+#define _gloffset_VertexAttrib4bvARB 498

+#define _gloffset_VertexAttrib4dARB 499

+#define _gloffset_VertexAttrib4dvARB 500

+#define _gloffset_VertexAttrib4fARB 501

+#define _gloffset_VertexAttrib4fvARB 502

+#define _gloffset_VertexAttrib4ivARB 503

+#define _gloffset_VertexAttrib4sARB 504

+#define _gloffset_VertexAttrib4svARB 505

+#define _gloffset_VertexAttrib4ubvARB 506

+#define _gloffset_VertexAttrib4uivARB 507

+#define _gloffset_VertexAttrib4usvARB 508

+#define _gloffset_VertexAttribPointerARB 509

+#define _gloffset_BindBufferARB 510

+#define _gloffset_BufferDataARB 511

+#define _gloffset_BufferSubDataARB 512

+#define _gloffset_DeleteBuffersARB 513

+#define _gloffset_GenBuffersARB 514

+#define _gloffset_GetBufferParameterivARB 515

+#define _gloffset_GetBufferPointervARB 516

+#define _gloffset_GetBufferSubDataARB 517

+#define _gloffset_IsBufferARB 518

+#define _gloffset_MapBufferARB 519

+#define _gloffset_UnmapBufferARB 520

+#define _gloffset_BeginQueryARB 521

+#define _gloffset_DeleteQueriesARB 522

+#define _gloffset_EndQueryARB 523

+#define _gloffset_GenQueriesARB 524

+#define _gloffset_GetQueryObjectivARB 525

+#define _gloffset_GetQueryObjectuivARB 526

+#define _gloffset_GetQueryivARB 527

+#define _gloffset_IsQueryARB 528

+#define _gloffset_AttachObjectARB 529

+#define _gloffset_CompileShaderARB 530

+#define _gloffset_CreateProgramObjectARB 531

+#define _gloffset_CreateShaderObjectARB 532

+#define _gloffset_DeleteObjectARB 533

+#define _gloffset_DetachObjectARB 534

+#define _gloffset_GetActiveUniformARB 535

+#define _gloffset_GetAttachedObjectsARB 536

+#define _gloffset_GetHandleARB 537

+#define _gloffset_GetInfoLogARB 538

+#define _gloffset_GetObjectParameterfvARB 539

+#define _gloffset_GetObjectParameterivARB 540

+#define _gloffset_GetShaderSourceARB 541

+#define _gloffset_GetUniformLocationARB 542

+#define _gloffset_GetUniformfvARB 543

+#define _gloffset_GetUniformivARB 544

+#define _gloffset_LinkProgramARB 545

+#define _gloffset_ShaderSourceARB 546

+#define _gloffset_Uniform1fARB 547

+#define _gloffset_Uniform1fvARB 548

+#define _gloffset_Uniform1iARB 549

+#define _gloffset_Uniform1ivARB 550

+#define _gloffset_Uniform2fARB 551

+#define _gloffset_Uniform2fvARB 552

+#define _gloffset_Uniform2iARB 553

+#define _gloffset_Uniform2ivARB 554

+#define _gloffset_Uniform3fARB 555

+#define _gloffset_Uniform3fvARB 556

+#define _gloffset_Uniform3iARB 557

+#define _gloffset_Uniform3ivARB 558

+#define _gloffset_Uniform4fARB 559

+#define _gloffset_Uniform4fvARB 560

+#define _gloffset_Uniform4iARB 561

+#define _gloffset_Uniform4ivARB 562

+#define _gloffset_UniformMatrix2fvARB 563

+#define _gloffset_UniformMatrix3fvARB 564

+#define _gloffset_UniformMatrix4fvARB 565

+#define _gloffset_UseProgramObjectARB 566

+#define _gloffset_ValidateProgramARB 567

+#define _gloffset_BindAttribLocationARB 568

+#define _gloffset_GetActiveAttribARB 569

+#define _gloffset_GetAttribLocationARB 570

+#define _gloffset_DrawBuffersARB 571

+#define _gloffset_DrawArraysInstancedARB 572

+#define _gloffset_DrawElementsInstancedARB 573

+#define _gloffset_RenderbufferStorageMultisample 574

+#define _gloffset_FramebufferTextureARB 575

+#define _gloffset_FramebufferTextureFaceARB 576

+#define _gloffset_ProgramParameteriARB 577

+#define _gloffset_FlushMappedBufferRange 578

+#define _gloffset_MapBufferRange 579

+#define _gloffset_BindVertexArray 580

+#define _gloffset_GenVertexArrays 581

+#define _gloffset_CopyBufferSubData 582

+#define _gloffset_ClientWaitSync 583

+#define _gloffset_DeleteSync 584

+#define _gloffset_FenceSync 585

+#define _gloffset_GetInteger64v 586

+#define _gloffset_GetSynciv 587

+#define _gloffset_IsSync 588

+#define _gloffset_WaitSync 589

+#define _gloffset_DrawElementsBaseVertex 590

+#define _gloffset_DrawRangeElementsBaseVertex 591

+#define _gloffset_MultiDrawElementsBaseVertex 592

+#define _gloffset_BindTransformFeedback 593

+#define _gloffset_DeleteTransformFeedbacks 594

+#define _gloffset_DrawTransformFeedback 595

+#define _gloffset_GenTransformFeedbacks 596

+#define _gloffset_IsTransformFeedback 597

+#define _gloffset_PauseTransformFeedback 598

+#define _gloffset_ResumeTransformFeedback 599

+#define _gloffset_PolygonOffsetEXT 600

+#define _gloffset_GetPixelTexGenParameterfvSGIS 601

+#define _gloffset_GetPixelTexGenParameterivSGIS 602

+#define _gloffset_PixelTexGenParameterfSGIS 603

+#define _gloffset_PixelTexGenParameterfvSGIS 604

+#define _gloffset_PixelTexGenParameteriSGIS 605

+#define _gloffset_PixelTexGenParameterivSGIS 606

+#define _gloffset_SampleMaskSGIS 607

+#define _gloffset_SamplePatternSGIS 608

+#define _gloffset_ColorPointerEXT 609

+#define _gloffset_EdgeFlagPointerEXT 610

+#define _gloffset_IndexPointerEXT 611

+#define _gloffset_NormalPointerEXT 612

+#define _gloffset_TexCoordPointerEXT 613

+#define _gloffset_VertexPointerEXT 614

+#define _gloffset_PointParameterfEXT 615

+#define _gloffset_PointParameterfvEXT 616

+#define _gloffset_LockArraysEXT 617

+#define _gloffset_UnlockArraysEXT 618

+#define _gloffset_SecondaryColor3bEXT 619

+#define _gloffset_SecondaryColor3bvEXT 620

+#define _gloffset_SecondaryColor3dEXT 621

+#define _gloffset_SecondaryColor3dvEXT 622

+#define _gloffset_SecondaryColor3fEXT 623

+#define _gloffset_SecondaryColor3fvEXT 624

+#define _gloffset_SecondaryColor3iEXT 625

+#define _gloffset_SecondaryColor3ivEXT 626

+#define _gloffset_SecondaryColor3sEXT 627

+#define _gloffset_SecondaryColor3svEXT 628

+#define _gloffset_SecondaryColor3ubEXT 629

+#define _gloffset_SecondaryColor3ubvEXT 630

+#define _gloffset_SecondaryColor3uiEXT 631

+#define _gloffset_SecondaryColor3uivEXT 632

+#define _gloffset_SecondaryColor3usEXT 633

+#define _gloffset_SecondaryColor3usvEXT 634

+#define _gloffset_SecondaryColorPointerEXT 635

+#define _gloffset_MultiDrawArraysEXT 636

+#define _gloffset_MultiDrawElementsEXT 637

+#define _gloffset_FogCoordPointerEXT 638

+#define _gloffset_FogCoorddEXT 639

+#define _gloffset_FogCoorddvEXT 640

+#define _gloffset_FogCoordfEXT 641

+#define _gloffset_FogCoordfvEXT 642

+#define _gloffset_PixelTexGenSGIX 643

+#define _gloffset_BlendFuncSeparateEXT 644

+#define _gloffset_FlushVertexArrayRangeNV 645

+#define _gloffset_VertexArrayRangeNV 646

+#define _gloffset_CombinerInputNV 647

+#define _gloffset_CombinerOutputNV 648

+#define _gloffset_CombinerParameterfNV 649

+#define _gloffset_CombinerParameterfvNV 650

+#define _gloffset_CombinerParameteriNV 651

+#define _gloffset_CombinerParameterivNV 652

+#define _gloffset_FinalCombinerInputNV 653

+#define _gloffset_GetCombinerInputParameterfvNV 654

+#define _gloffset_GetCombinerInputParameterivNV 655

+#define _gloffset_GetCombinerOutputParameterfvNV 656

+#define _gloffset_GetCombinerOutputParameterivNV 657

+#define _gloffset_GetFinalCombinerInputParameterfvNV 658

+#define _gloffset_GetFinalCombinerInputParameterivNV 659

+#define _gloffset_ResizeBuffersMESA 660

+#define _gloffset_WindowPos2dMESA 661

+#define _gloffset_WindowPos2dvMESA 662

+#define _gloffset_WindowPos2fMESA 663

+#define _gloffset_WindowPos2fvMESA 664

+#define _gloffset_WindowPos2iMESA 665

+#define _gloffset_WindowPos2ivMESA 666

+#define _gloffset_WindowPos2sMESA 667

+#define _gloffset_WindowPos2svMESA 668

+#define _gloffset_WindowPos3dMESA 669

+#define _gloffset_WindowPos3dvMESA 670

+#define _gloffset_WindowPos3fMESA 671

+#define _gloffset_WindowPos3fvMESA 672

+#define _gloffset_WindowPos3iMESA 673

+#define _gloffset_WindowPos3ivMESA 674

+#define _gloffset_WindowPos3sMESA 675

+#define _gloffset_WindowPos3svMESA 676

+#define _gloffset_WindowPos4dMESA 677

+#define _gloffset_WindowPos4dvMESA 678

+#define _gloffset_WindowPos4fMESA 679

+#define _gloffset_WindowPos4fvMESA 680

+#define _gloffset_WindowPos4iMESA 681

+#define _gloffset_WindowPos4ivMESA 682

+#define _gloffset_WindowPos4sMESA 683

+#define _gloffset_WindowPos4svMESA 684

+#define _gloffset_MultiModeDrawArraysIBM 685

+#define _gloffset_MultiModeDrawElementsIBM 686

+#define _gloffset_DeleteFencesNV 687

+#define _gloffset_FinishFenceNV 688

+#define _gloffset_GenFencesNV 689

+#define _gloffset_GetFenceivNV 690

+#define _gloffset_IsFenceNV 691

+#define _gloffset_SetFenceNV 692

+#define _gloffset_TestFenceNV 693

+#define _gloffset_AreProgramsResidentNV 694

+#define _gloffset_BindProgramNV 695

+#define _gloffset_DeleteProgramsNV 696

+#define _gloffset_ExecuteProgramNV 697

+#define _gloffset_GenProgramsNV 698

+#define _gloffset_GetProgramParameterdvNV 699

+#define _gloffset_GetProgramParameterfvNV 700

+#define _gloffset_GetProgramStringNV 701

+#define _gloffset_GetProgramivNV 702

+#define _gloffset_GetTrackMatrixivNV 703

+#define _gloffset_GetVertexAttribPointervNV 704

+#define _gloffset_GetVertexAttribdvNV 705

+#define _gloffset_GetVertexAttribfvNV 706

+#define _gloffset_GetVertexAttribivNV 707

+#define _gloffset_IsProgramNV 708

+#define _gloffset_LoadProgramNV 709

+#define _gloffset_ProgramParameters4dvNV 710

+#define _gloffset_ProgramParameters4fvNV 711

+#define _gloffset_RequestResidentProgramsNV 712

+#define _gloffset_TrackMatrixNV 713

+#define _gloffset_VertexAttrib1dNV 714

+#define _gloffset_VertexAttrib1dvNV 715

+#define _gloffset_VertexAttrib1fNV 716

+#define _gloffset_VertexAttrib1fvNV 717

+#define _gloffset_VertexAttrib1sNV 718

+#define _gloffset_VertexAttrib1svNV 719

+#define _gloffset_VertexAttrib2dNV 720

+#define _gloffset_VertexAttrib2dvNV 721

+#define _gloffset_VertexAttrib2fNV 722

+#define _gloffset_VertexAttrib2fvNV 723

+#define _gloffset_VertexAttrib2sNV 724

+#define _gloffset_VertexAttrib2svNV 725

+#define _gloffset_VertexAttrib3dNV 726

+#define _gloffset_VertexAttrib3dvNV 727

+#define _gloffset_VertexAttrib3fNV 728

+#define _gloffset_VertexAttrib3fvNV 729

+#define _gloffset_VertexAttrib3sNV 730

+#define _gloffset_VertexAttrib3svNV 731

+#define _gloffset_VertexAttrib4dNV 732

+#define _gloffset_VertexAttrib4dvNV 733

+#define _gloffset_VertexAttrib4fNV 734

+#define _gloffset_VertexAttrib4fvNV 735

+#define _gloffset_VertexAttrib4sNV 736

+#define _gloffset_VertexAttrib4svNV 737

+#define _gloffset_VertexAttrib4ubNV 738

+#define _gloffset_VertexAttrib4ubvNV 739

+#define _gloffset_VertexAttribPointerNV 740

+#define _gloffset_VertexAttribs1dvNV 741

+#define _gloffset_VertexAttribs1fvNV 742

+#define _gloffset_VertexAttribs1svNV 743

+#define _gloffset_VertexAttribs2dvNV 744

+#define _gloffset_VertexAttribs2fvNV 745

+#define _gloffset_VertexAttribs2svNV 746

+#define _gloffset_VertexAttribs3dvNV 747

+#define _gloffset_VertexAttribs3fvNV 748

+#define _gloffset_VertexAttribs3svNV 749

+#define _gloffset_VertexAttribs4dvNV 750

+#define _gloffset_VertexAttribs4fvNV 751

+#define _gloffset_VertexAttribs4svNV 752

+#define _gloffset_VertexAttribs4ubvNV 753

+#define _gloffset_GetTexBumpParameterfvATI 754

+#define _gloffset_GetTexBumpParameterivATI 755

+#define _gloffset_TexBumpParameterfvATI 756

+#define _gloffset_TexBumpParameterivATI 757

+#define _gloffset_AlphaFragmentOp1ATI 758

+#define _gloffset_AlphaFragmentOp2ATI 759

+#define _gloffset_AlphaFragmentOp3ATI 760

+#define _gloffset_BeginFragmentShaderATI 761

+#define _gloffset_BindFragmentShaderATI 762

+#define _gloffset_ColorFragmentOp1ATI 763

+#define _gloffset_ColorFragmentOp2ATI 764

+#define _gloffset_ColorFragmentOp3ATI 765

+#define _gloffset_DeleteFragmentShaderATI 766

+#define _gloffset_EndFragmentShaderATI 767

+#define _gloffset_GenFragmentShadersATI 768

+#define _gloffset_PassTexCoordATI 769

+#define _gloffset_SampleMapATI 770

+#define _gloffset_SetFragmentShaderConstantATI 771

+#define _gloffset_PointParameteriNV 772

+#define _gloffset_PointParameterivNV 773

+#define _gloffset_ActiveStencilFaceEXT 774

+#define _gloffset_BindVertexArrayAPPLE 775

+#define _gloffset_DeleteVertexArraysAPPLE 776

+#define _gloffset_GenVertexArraysAPPLE 777

+#define _gloffset_IsVertexArrayAPPLE 778

+#define _gloffset_GetProgramNamedParameterdvNV 779

+#define _gloffset_GetProgramNamedParameterfvNV 780

+#define _gloffset_ProgramNamedParameter4dNV 781

+#define _gloffset_ProgramNamedParameter4dvNV 782

+#define _gloffset_ProgramNamedParameter4fNV 783

+#define _gloffset_ProgramNamedParameter4fvNV 784

+#define _gloffset_PrimitiveRestartIndexNV 785

+#define _gloffset_PrimitiveRestartNV 786

+#define _gloffset_DepthBoundsEXT 787

+#define _gloffset_BlendEquationSeparateEXT 788

+#define _gloffset_BindFramebufferEXT 789

+#define _gloffset_BindRenderbufferEXT 790

+#define _gloffset_CheckFramebufferStatusEXT 791

+#define _gloffset_DeleteFramebuffersEXT 792

+#define _gloffset_DeleteRenderbuffersEXT 793

+#define _gloffset_FramebufferRenderbufferEXT 794

+#define _gloffset_FramebufferTexture1DEXT 795

+#define _gloffset_FramebufferTexture2DEXT 796

+#define _gloffset_FramebufferTexture3DEXT 797

+#define _gloffset_GenFramebuffersEXT 798

+#define _gloffset_GenRenderbuffersEXT 799

+#define _gloffset_GenerateMipmapEXT 800

+#define _gloffset_GetFramebufferAttachmentParameterivEXT 801

+#define _gloffset_GetRenderbufferParameterivEXT 802

+#define _gloffset_IsFramebufferEXT 803

+#define _gloffset_IsRenderbufferEXT 804

+#define _gloffset_RenderbufferStorageEXT 805

+#define _gloffset_BlitFramebufferEXT 806

+#define _gloffset_BufferParameteriAPPLE 807

+#define _gloffset_FlushMappedBufferRangeAPPLE 808

+#define _gloffset_BindFragDataLocationEXT 809

+#define _gloffset_GetFragDataLocationEXT 810

+#define _gloffset_GetUniformuivEXT 811

+#define _gloffset_GetVertexAttribIivEXT 812

+#define _gloffset_GetVertexAttribIuivEXT 813

+#define _gloffset_Uniform1uiEXT 814

+#define _gloffset_Uniform1uivEXT 815

+#define _gloffset_Uniform2uiEXT 816

+#define _gloffset_Uniform2uivEXT 817

+#define _gloffset_Uniform3uiEXT 818

+#define _gloffset_Uniform3uivEXT 819

+#define _gloffset_Uniform4uiEXT 820

+#define _gloffset_Uniform4uivEXT 821

+#define _gloffset_VertexAttribI1iEXT 822

+#define _gloffset_VertexAttribI1ivEXT 823

+#define _gloffset_VertexAttribI1uiEXT 824

+#define _gloffset_VertexAttribI1uivEXT 825

+#define _gloffset_VertexAttribI2iEXT 826

+#define _gloffset_VertexAttribI2ivEXT 827

+#define _gloffset_VertexAttribI2uiEXT 828

+#define _gloffset_VertexAttribI2uivEXT 829

+#define _gloffset_VertexAttribI3iEXT 830

+#define _gloffset_VertexAttribI3ivEXT 831

+#define _gloffset_VertexAttribI3uiEXT 832

+#define _gloffset_VertexAttribI3uivEXT 833

+#define _gloffset_VertexAttribI4bvEXT 834

+#define _gloffset_VertexAttribI4iEXT 835

+#define _gloffset_VertexAttribI4ivEXT 836

+#define _gloffset_VertexAttribI4svEXT 837

+#define _gloffset_VertexAttribI4ubvEXT 838

+#define _gloffset_VertexAttribI4uiEXT 839

+#define _gloffset_VertexAttribI4uivEXT 840

+#define _gloffset_VertexAttribI4usvEXT 841

+#define _gloffset_VertexAttribIPointerEXT 842

+#define _gloffset_FramebufferTextureLayerEXT 843

+#define _gloffset_ColorMaskIndexedEXT 844

+#define _gloffset_DisableIndexedEXT 845

+#define _gloffset_EnableIndexedEXT 846

+#define _gloffset_GetBooleanIndexedvEXT 847

+#define _gloffset_GetIntegerIndexedvEXT 848

+#define _gloffset_IsEnabledIndexedEXT 849

+#define _gloffset_ClearColorIiEXT 850

+#define _gloffset_ClearColorIuiEXT 851

+#define _gloffset_GetTexParameterIivEXT 852

+#define _gloffset_GetTexParameterIuivEXT 853

+#define _gloffset_TexParameterIivEXT 854

+#define _gloffset_TexParameterIuivEXT 855

+#define _gloffset_BeginConditionalRenderNV 856

+#define _gloffset_EndConditionalRenderNV 857

+#define _gloffset_BeginTransformFeedbackEXT 858

+#define _gloffset_BindBufferBaseEXT 859

+#define _gloffset_BindBufferOffsetEXT 860

+#define _gloffset_BindBufferRangeEXT 861

+#define _gloffset_EndTransformFeedbackEXT 862

+#define _gloffset_GetTransformFeedbackVaryingEXT 863

+#define _gloffset_TransformFeedbackVaryingsEXT 864

+#define _gloffset_ProvokingVertexEXT 865

+#define _gloffset_GetTexParameterPointervAPPLE 866

+#define _gloffset_TextureRangeAPPLE 867

+#define _gloffset_GetObjectParameterivAPPLE 868

+#define _gloffset_ObjectPurgeableAPPLE 869

+#define _gloffset_ObjectUnpurgeableAPPLE 870

+#define _gloffset_ActiveProgramEXT 871

+#define _gloffset_CreateShaderProgramEXT 872

+#define _gloffset_UseShaderProgramEXT 873

+#define _gloffset_StencilFuncSeparateATI 874

+#define _gloffset_ProgramEnvParameters4fvEXT 875

+#define _gloffset_ProgramLocalParameters4fvEXT 876

+#define _gloffset_GetQueryObjecti64vEXT 877

+#define _gloffset_GetQueryObjectui64vEXT 878

+#define _gloffset_EGLImageTargetRenderbufferStorageOES 879

+#define _gloffset_EGLImageTargetTexture2DOES 880

+

+#else /* !_GLAPI_USE_REMAP_TABLE */

+

+#define driDispatchRemapTable_size 473

+extern int driDispatchRemapTable[ driDispatchRemapTable_size ];

+

+#define AttachShader_remap_index 0

+#define CreateProgram_remap_index 1

+#define CreateShader_remap_index 2

+#define DeleteProgram_remap_index 3

+#define DeleteShader_remap_index 4

+#define DetachShader_remap_index 5

+#define GetAttachedShaders_remap_index 6

+#define GetProgramInfoLog_remap_index 7

+#define GetProgramiv_remap_index 8

+#define GetShaderInfoLog_remap_index 9

+#define GetShaderiv_remap_index 10

+#define IsProgram_remap_index 11

+#define IsShader_remap_index 12

+#define StencilFuncSeparate_remap_index 13

+#define StencilMaskSeparate_remap_index 14

+#define StencilOpSeparate_remap_index 15

+#define UniformMatrix2x3fv_remap_index 16

+#define UniformMatrix2x4fv_remap_index 17

+#define UniformMatrix3x2fv_remap_index 18

+#define UniformMatrix3x4fv_remap_index 19

+#define UniformMatrix4x2fv_remap_index 20

+#define UniformMatrix4x3fv_remap_index 21

+#define ClampColor_remap_index 22

+#define ClearBufferfi_remap_index 23

+#define ClearBufferfv_remap_index 24

+#define ClearBufferiv_remap_index 25

+#define ClearBufferuiv_remap_index 26

+#define GetStringi_remap_index 27

+#define TexBuffer_remap_index 28

+#define FramebufferTexture_remap_index 29

+#define GetBufferParameteri64v_remap_index 30

+#define GetInteger64i_v_remap_index 31

+#define VertexAttribDivisor_remap_index 32

+#define LoadTransposeMatrixdARB_remap_index 33

+#define LoadTransposeMatrixfARB_remap_index 34

+#define MultTransposeMatrixdARB_remap_index 35

+#define MultTransposeMatrixfARB_remap_index 36

+#define SampleCoverageARB_remap_index 37

+#define CompressedTexImage1DARB_remap_index 38

+#define CompressedTexImage2DARB_remap_index 39

+#define CompressedTexImage3DARB_remap_index 40

+#define CompressedTexSubImage1DARB_remap_index 41

+#define CompressedTexSubImage2DARB_remap_index 42

+#define CompressedTexSubImage3DARB_remap_index 43

+#define GetCompressedTexImageARB_remap_index 44

+#define DisableVertexAttribArrayARB_remap_index 45

+#define EnableVertexAttribArrayARB_remap_index 46

+#define GetProgramEnvParameterdvARB_remap_index 47

+#define GetProgramEnvParameterfvARB_remap_index 48

+#define GetProgramLocalParameterdvARB_remap_index 49

+#define GetProgramLocalParameterfvARB_remap_index 50

+#define GetProgramStringARB_remap_index 51

+#define GetProgramivARB_remap_index 52

+#define GetVertexAttribdvARB_remap_index 53

+#define GetVertexAttribfvARB_remap_index 54

+#define GetVertexAttribivARB_remap_index 55

+#define ProgramEnvParameter4dARB_remap_index 56

+#define ProgramEnvParameter4dvARB_remap_index 57

+#define ProgramEnvParameter4fARB_remap_index 58

+#define ProgramEnvParameter4fvARB_remap_index 59

+#define ProgramLocalParameter4dARB_remap_index 60

+#define ProgramLocalParameter4dvARB_remap_index 61

+#define ProgramLocalParameter4fARB_remap_index 62

+#define ProgramLocalParameter4fvARB_remap_index 63

+#define ProgramStringARB_remap_index 64

+#define VertexAttrib1dARB_remap_index 65

+#define VertexAttrib1dvARB_remap_index 66

+#define VertexAttrib1fARB_remap_index 67

+#define VertexAttrib1fvARB_remap_index 68

+#define VertexAttrib1sARB_remap_index 69

+#define VertexAttrib1svARB_remap_index 70

+#define VertexAttrib2dARB_remap_index 71

+#define VertexAttrib2dvARB_remap_index 72

+#define VertexAttrib2fARB_remap_index 73

+#define VertexAttrib2fvARB_remap_index 74

+#define VertexAttrib2sARB_remap_index 75

+#define VertexAttrib2svARB_remap_index 76

+#define VertexAttrib3dARB_remap_index 77

+#define VertexAttrib3dvARB_remap_index 78

+#define VertexAttrib3fARB_remap_index 79

+#define VertexAttrib3fvARB_remap_index 80

+#define VertexAttrib3sARB_remap_index 81

+#define VertexAttrib3svARB_remap_index 82

+#define VertexAttrib4NbvARB_remap_index 83

+#define VertexAttrib4NivARB_remap_index 84

+#define VertexAttrib4NsvARB_remap_index 85

+#define VertexAttrib4NubARB_remap_index 86

+#define VertexAttrib4NubvARB_remap_index 87

+#define VertexAttrib4NuivARB_remap_index 88

+#define VertexAttrib4NusvARB_remap_index 89

+#define VertexAttrib4bvARB_remap_index 90

+#define VertexAttrib4dARB_remap_index 91

+#define VertexAttrib4dvARB_remap_index 92

+#define VertexAttrib4fARB_remap_index 93

+#define VertexAttrib4fvARB_remap_index 94

+#define VertexAttrib4ivARB_remap_index 95

+#define VertexAttrib4sARB_remap_index 96

+#define VertexAttrib4svARB_remap_index 97

+#define VertexAttrib4ubvARB_remap_index 98

+#define VertexAttrib4uivARB_remap_index 99

+#define VertexAttrib4usvARB_remap_index 100

+#define VertexAttribPointerARB_remap_index 101

+#define BindBufferARB_remap_index 102

+#define BufferDataARB_remap_index 103

+#define BufferSubDataARB_remap_index 104

+#define DeleteBuffersARB_remap_index 105

+#define GenBuffersARB_remap_index 106

+#define GetBufferParameterivARB_remap_index 107

+#define GetBufferPointervARB_remap_index 108

+#define GetBufferSubDataARB_remap_index 109

+#define IsBufferARB_remap_index 110

+#define MapBufferARB_remap_index 111

+#define UnmapBufferARB_remap_index 112

+#define BeginQueryARB_remap_index 113

+#define DeleteQueriesARB_remap_index 114

+#define EndQueryARB_remap_index 115

+#define GenQueriesARB_remap_index 116

+#define GetQueryObjectivARB_remap_index 117

+#define GetQueryObjectuivARB_remap_index 118

+#define GetQueryivARB_remap_index 119

+#define IsQueryARB_remap_index 120

+#define AttachObjectARB_remap_index 121

+#define CompileShaderARB_remap_index 122

+#define CreateProgramObjectARB_remap_index 123

+#define CreateShaderObjectARB_remap_index 124

+#define DeleteObjectARB_remap_index 125

+#define DetachObjectARB_remap_index 126

+#define GetActiveUniformARB_remap_index 127

+#define GetAttachedObjectsARB_remap_index 128

+#define GetHandleARB_remap_index 129

+#define GetInfoLogARB_remap_index 130

+#define GetObjectParameterfvARB_remap_index 131

+#define GetObjectParameterivARB_remap_index 132

+#define GetShaderSourceARB_remap_index 133

+#define GetUniformLocationARB_remap_index 134

+#define GetUniformfvARB_remap_index 135

+#define GetUniformivARB_remap_index 136

+#define LinkProgramARB_remap_index 137

+#define ShaderSourceARB_remap_index 138

+#define Uniform1fARB_remap_index 139

+#define Uniform1fvARB_remap_index 140

+#define Uniform1iARB_remap_index 141

+#define Uniform1ivARB_remap_index 142

+#define Uniform2fARB_remap_index 143

+#define Uniform2fvARB_remap_index 144

+#define Uniform2iARB_remap_index 145

+#define Uniform2ivARB_remap_index 146

+#define Uniform3fARB_remap_index 147

+#define Uniform3fvARB_remap_index 148

+#define Uniform3iARB_remap_index 149

+#define Uniform3ivARB_remap_index 150

+#define Uniform4fARB_remap_index 151

+#define Uniform4fvARB_remap_index 152

+#define Uniform4iARB_remap_index 153

+#define Uniform4ivARB_remap_index 154

+#define UniformMatrix2fvARB_remap_index 155

+#define UniformMatrix3fvARB_remap_index 156

+#define UniformMatrix4fvARB_remap_index 157

+#define UseProgramObjectARB_remap_index 158

+#define ValidateProgramARB_remap_index 159

+#define BindAttribLocationARB_remap_index 160

+#define GetActiveAttribARB_remap_index 161

+#define GetAttribLocationARB_remap_index 162

+#define DrawBuffersARB_remap_index 163

+#define DrawArraysInstancedARB_remap_index 164

+#define DrawElementsInstancedARB_remap_index 165

+#define RenderbufferStorageMultisample_remap_index 166

+#define FramebufferTextureARB_remap_index 167

+#define FramebufferTextureFaceARB_remap_index 168

+#define ProgramParameteriARB_remap_index 169

+#define FlushMappedBufferRange_remap_index 170

+#define MapBufferRange_remap_index 171

+#define BindVertexArray_remap_index 172

+#define GenVertexArrays_remap_index 173

+#define CopyBufferSubData_remap_index 174

+#define ClientWaitSync_remap_index 175

+#define DeleteSync_remap_index 176

+#define FenceSync_remap_index 177

+#define GetInteger64v_remap_index 178

+#define GetSynciv_remap_index 179

+#define IsSync_remap_index 180

+#define WaitSync_remap_index 181

+#define DrawElementsBaseVertex_remap_index 182

+#define DrawRangeElementsBaseVertex_remap_index 183

+#define MultiDrawElementsBaseVertex_remap_index 184

+#define BindTransformFeedback_remap_index 185

+#define DeleteTransformFeedbacks_remap_index 186

+#define DrawTransformFeedback_remap_index 187

+#define GenTransformFeedbacks_remap_index 188

+#define IsTransformFeedback_remap_index 189

+#define PauseTransformFeedback_remap_index 190

+#define ResumeTransformFeedback_remap_index 191

+#define PolygonOffsetEXT_remap_index 192

+#define GetPixelTexGenParameterfvSGIS_remap_index 193

+#define GetPixelTexGenParameterivSGIS_remap_index 194

+#define PixelTexGenParameterfSGIS_remap_index 195

+#define PixelTexGenParameterfvSGIS_remap_index 196

+#define PixelTexGenParameteriSGIS_remap_index 197

+#define PixelTexGenParameterivSGIS_remap_index 198

+#define SampleMaskSGIS_remap_index 199

+#define SamplePatternSGIS_remap_index 200

+#define ColorPointerEXT_remap_index 201

+#define EdgeFlagPointerEXT_remap_index 202

+#define IndexPointerEXT_remap_index 203

+#define NormalPointerEXT_remap_index 204

+#define TexCoordPointerEXT_remap_index 205

+#define VertexPointerEXT_remap_index 206

+#define PointParameterfEXT_remap_index 207

+#define PointParameterfvEXT_remap_index 208

+#define LockArraysEXT_remap_index 209

+#define UnlockArraysEXT_remap_index 210

+#define SecondaryColor3bEXT_remap_index 211

+#define SecondaryColor3bvEXT_remap_index 212

+#define SecondaryColor3dEXT_remap_index 213

+#define SecondaryColor3dvEXT_remap_index 214

+#define SecondaryColor3fEXT_remap_index 215

+#define SecondaryColor3fvEXT_remap_index 216

+#define SecondaryColor3iEXT_remap_index 217

+#define SecondaryColor3ivEXT_remap_index 218

+#define SecondaryColor3sEXT_remap_index 219

+#define SecondaryColor3svEXT_remap_index 220

+#define SecondaryColor3ubEXT_remap_index 221

+#define SecondaryColor3ubvEXT_remap_index 222

+#define SecondaryColor3uiEXT_remap_index 223

+#define SecondaryColor3uivEXT_remap_index 224

+#define SecondaryColor3usEXT_remap_index 225

+#define SecondaryColor3usvEXT_remap_index 226

+#define SecondaryColorPointerEXT_remap_index 227

+#define MultiDrawArraysEXT_remap_index 228

+#define MultiDrawElementsEXT_remap_index 229

+#define FogCoordPointerEXT_remap_index 230

+#define FogCoorddEXT_remap_index 231

+#define FogCoorddvEXT_remap_index 232

+#define FogCoordfEXT_remap_index 233

+#define FogCoordfvEXT_remap_index 234

+#define PixelTexGenSGIX_remap_index 235

+#define BlendFuncSeparateEXT_remap_index 236

+#define FlushVertexArrayRangeNV_remap_index 237

+#define VertexArrayRangeNV_remap_index 238

+#define CombinerInputNV_remap_index 239

+#define CombinerOutputNV_remap_index 240

+#define CombinerParameterfNV_remap_index 241

+#define CombinerParameterfvNV_remap_index 242

+#define CombinerParameteriNV_remap_index 243

+#define CombinerParameterivNV_remap_index 244

+#define FinalCombinerInputNV_remap_index 245

+#define GetCombinerInputParameterfvNV_remap_index 246

+#define GetCombinerInputParameterivNV_remap_index 247

+#define GetCombinerOutputParameterfvNV_remap_index 248

+#define GetCombinerOutputParameterivNV_remap_index 249

+#define GetFinalCombinerInputParameterfvNV_remap_index 250

+#define GetFinalCombinerInputParameterivNV_remap_index 251

+#define ResizeBuffersMESA_remap_index 252

+#define WindowPos2dMESA_remap_index 253

+#define WindowPos2dvMESA_remap_index 254

+#define WindowPos2fMESA_remap_index 255

+#define WindowPos2fvMESA_remap_index 256

+#define WindowPos2iMESA_remap_index 257

+#define WindowPos2ivMESA_remap_index 258

+#define WindowPos2sMESA_remap_index 259

+#define WindowPos2svMESA_remap_index 260

+#define WindowPos3dMESA_remap_index 261

+#define WindowPos3dvMESA_remap_index 262

+#define WindowPos3fMESA_remap_index 263

+#define WindowPos3fvMESA_remap_index 264

+#define WindowPos3iMESA_remap_index 265

+#define WindowPos3ivMESA_remap_index 266

+#define WindowPos3sMESA_remap_index 267

+#define WindowPos3svMESA_remap_index 268

+#define WindowPos4dMESA_remap_index 269

+#define WindowPos4dvMESA_remap_index 270

+#define WindowPos4fMESA_remap_index 271

+#define WindowPos4fvMESA_remap_index 272

+#define WindowPos4iMESA_remap_index 273

+#define WindowPos4ivMESA_remap_index 274

+#define WindowPos4sMESA_remap_index 275

+#define WindowPos4svMESA_remap_index 276

+#define MultiModeDrawArraysIBM_remap_index 277

+#define MultiModeDrawElementsIBM_remap_index 278

+#define DeleteFencesNV_remap_index 279

+#define FinishFenceNV_remap_index 280

+#define GenFencesNV_remap_index 281

+#define GetFenceivNV_remap_index 282

+#define IsFenceNV_remap_index 283

+#define SetFenceNV_remap_index 284

+#define TestFenceNV_remap_index 285

+#define AreProgramsResidentNV_remap_index 286

+#define BindProgramNV_remap_index 287

+#define DeleteProgramsNV_remap_index 288

+#define ExecuteProgramNV_remap_index 289

+#define GenProgramsNV_remap_index 290

+#define GetProgramParameterdvNV_remap_index 291

+#define GetProgramParameterfvNV_remap_index 292

+#define GetProgramStringNV_remap_index 293

+#define GetProgramivNV_remap_index 294

+#define GetTrackMatrixivNV_remap_index 295

+#define GetVertexAttribPointervNV_remap_index 296

+#define GetVertexAttribdvNV_remap_index 297

+#define GetVertexAttribfvNV_remap_index 298

+#define GetVertexAttribivNV_remap_index 299

+#define IsProgramNV_remap_index 300

+#define LoadProgramNV_remap_index 301

+#define ProgramParameters4dvNV_remap_index 302

+#define ProgramParameters4fvNV_remap_index 303

+#define RequestResidentProgramsNV_remap_index 304

+#define TrackMatrixNV_remap_index 305

+#define VertexAttrib1dNV_remap_index 306

+#define VertexAttrib1dvNV_remap_index 307

+#define VertexAttrib1fNV_remap_index 308

+#define VertexAttrib1fvNV_remap_index 309

+#define VertexAttrib1sNV_remap_index 310

+#define VertexAttrib1svNV_remap_index 311

+#define VertexAttrib2dNV_remap_index 312

+#define VertexAttrib2dvNV_remap_index 313

+#define VertexAttrib2fNV_remap_index 314

+#define VertexAttrib2fvNV_remap_index 315

+#define VertexAttrib2sNV_remap_index 316

+#define VertexAttrib2svNV_remap_index 317

+#define VertexAttrib3dNV_remap_index 318

+#define VertexAttrib3dvNV_remap_index 319

+#define VertexAttrib3fNV_remap_index 320

+#define VertexAttrib3fvNV_remap_index 321

+#define VertexAttrib3sNV_remap_index 322

+#define VertexAttrib3svNV_remap_index 323

+#define VertexAttrib4dNV_remap_index 324

+#define VertexAttrib4dvNV_remap_index 325

+#define VertexAttrib4fNV_remap_index 326

+#define VertexAttrib4fvNV_remap_index 327

+#define VertexAttrib4sNV_remap_index 328

+#define VertexAttrib4svNV_remap_index 329

+#define VertexAttrib4ubNV_remap_index 330

+#define VertexAttrib4ubvNV_remap_index 331

+#define VertexAttribPointerNV_remap_index 332

+#define VertexAttribs1dvNV_remap_index 333

+#define VertexAttribs1fvNV_remap_index 334

+#define VertexAttribs1svNV_remap_index 335

+#define VertexAttribs2dvNV_remap_index 336

+#define VertexAttribs2fvNV_remap_index 337

+#define VertexAttribs2svNV_remap_index 338

+#define VertexAttribs3dvNV_remap_index 339

+#define VertexAttribs3fvNV_remap_index 340

+#define VertexAttribs3svNV_remap_index 341

+#define VertexAttribs4dvNV_remap_index 342

+#define VertexAttribs4fvNV_remap_index 343

+#define VertexAttribs4svNV_remap_index 344

+#define VertexAttribs4ubvNV_remap_index 345

+#define GetTexBumpParameterfvATI_remap_index 346

+#define GetTexBumpParameterivATI_remap_index 347

+#define TexBumpParameterfvATI_remap_index 348

+#define TexBumpParameterivATI_remap_index 349

+#define AlphaFragmentOp1ATI_remap_index 350

+#define AlphaFragmentOp2ATI_remap_index 351

+#define AlphaFragmentOp3ATI_remap_index 352

+#define BeginFragmentShaderATI_remap_index 353

+#define BindFragmentShaderATI_remap_index 354

+#define ColorFragmentOp1ATI_remap_index 355

+#define ColorFragmentOp2ATI_remap_index 356

+#define ColorFragmentOp3ATI_remap_index 357

+#define DeleteFragmentShaderATI_remap_index 358

+#define EndFragmentShaderATI_remap_index 359

+#define GenFragmentShadersATI_remap_index 360

+#define PassTexCoordATI_remap_index 361

+#define SampleMapATI_remap_index 362

+#define SetFragmentShaderConstantATI_remap_index 363

+#define PointParameteriNV_remap_index 364

+#define PointParameterivNV_remap_index 365

+#define ActiveStencilFaceEXT_remap_index 366

+#define BindVertexArrayAPPLE_remap_index 367

+#define DeleteVertexArraysAPPLE_remap_index 368

+#define GenVertexArraysAPPLE_remap_index 369

+#define IsVertexArrayAPPLE_remap_index 370

+#define GetProgramNamedParameterdvNV_remap_index 371

+#define GetProgramNamedParameterfvNV_remap_index 372

+#define ProgramNamedParameter4dNV_remap_index 373

+#define ProgramNamedParameter4dvNV_remap_index 374

+#define ProgramNamedParameter4fNV_remap_index 375

+#define ProgramNamedParameter4fvNV_remap_index 376

+#define PrimitiveRestartIndexNV_remap_index 377

+#define PrimitiveRestartNV_remap_index 378

+#define DepthBoundsEXT_remap_index 379

+#define BlendEquationSeparateEXT_remap_index 380

+#define BindFramebufferEXT_remap_index 381

+#define BindRenderbufferEXT_remap_index 382

+#define CheckFramebufferStatusEXT_remap_index 383

+#define DeleteFramebuffersEXT_remap_index 384

+#define DeleteRenderbuffersEXT_remap_index 385

+#define FramebufferRenderbufferEXT_remap_index 386

+#define FramebufferTexture1DEXT_remap_index 387

+#define FramebufferTexture2DEXT_remap_index 388

+#define FramebufferTexture3DEXT_remap_index 389

+#define GenFramebuffersEXT_remap_index 390

+#define GenRenderbuffersEXT_remap_index 391

+#define GenerateMipmapEXT_remap_index 392

+#define GetFramebufferAttachmentParameterivEXT_remap_index 393

+#define GetRenderbufferParameterivEXT_remap_index 394

+#define IsFramebufferEXT_remap_index 395

+#define IsRenderbufferEXT_remap_index 396

+#define RenderbufferStorageEXT_remap_index 397

+#define BlitFramebufferEXT_remap_index 398

+#define BufferParameteriAPPLE_remap_index 399

+#define FlushMappedBufferRangeAPPLE_remap_index 400

+#define BindFragDataLocationEXT_remap_index 401

+#define GetFragDataLocationEXT_remap_index 402

+#define GetUniformuivEXT_remap_index 403

+#define GetVertexAttribIivEXT_remap_index 404

+#define GetVertexAttribIuivEXT_remap_index 405

+#define Uniform1uiEXT_remap_index 406

+#define Uniform1uivEXT_remap_index 407

+#define Uniform2uiEXT_remap_index 408

+#define Uniform2uivEXT_remap_index 409

+#define Uniform3uiEXT_remap_index 410

+#define Uniform3uivEXT_remap_index 411

+#define Uniform4uiEXT_remap_index 412

+#define Uniform4uivEXT_remap_index 413

+#define VertexAttribI1iEXT_remap_index 414

+#define VertexAttribI1ivEXT_remap_index 415

+#define VertexAttribI1uiEXT_remap_index 416

+#define VertexAttribI1uivEXT_remap_index 417

+#define VertexAttribI2iEXT_remap_index 418

+#define VertexAttribI2ivEXT_remap_index 419

+#define VertexAttribI2uiEXT_remap_index 420

+#define VertexAttribI2uivEXT_remap_index 421

+#define VertexAttribI3iEXT_remap_index 422

+#define VertexAttribI3ivEXT_remap_index 423

+#define VertexAttribI3uiEXT_remap_index 424

+#define VertexAttribI3uivEXT_remap_index 425

+#define VertexAttribI4bvEXT_remap_index 426

+#define VertexAttribI4iEXT_remap_index 427

+#define VertexAttribI4ivEXT_remap_index 428

+#define VertexAttribI4svEXT_remap_index 429

+#define VertexAttribI4ubvEXT_remap_index 430

+#define VertexAttribI4uiEXT_remap_index 431

+#define VertexAttribI4uivEXT_remap_index 432

+#define VertexAttribI4usvEXT_remap_index 433

+#define VertexAttribIPointerEXT_remap_index 434

+#define FramebufferTextureLayerEXT_remap_index 435

+#define ColorMaskIndexedEXT_remap_index 436

+#define DisableIndexedEXT_remap_index 437

+#define EnableIndexedEXT_remap_index 438

+#define GetBooleanIndexedvEXT_remap_index 439

+#define GetIntegerIndexedvEXT_remap_index 440

+#define IsEnabledIndexedEXT_remap_index 441

+#define ClearColorIiEXT_remap_index 442

+#define ClearColorIuiEXT_remap_index 443

+#define GetTexParameterIivEXT_remap_index 444

+#define GetTexParameterIuivEXT_remap_index 445

+#define TexParameterIivEXT_remap_index 446

+#define TexParameterIuivEXT_remap_index 447

+#define BeginConditionalRenderNV_remap_index 448

+#define EndConditionalRenderNV_remap_index 449

+#define BeginTransformFeedbackEXT_remap_index 450

+#define BindBufferBaseEXT_remap_index 451

+#define BindBufferOffsetEXT_remap_index 452

+#define BindBufferRangeEXT_remap_index 453

+#define EndTransformFeedbackEXT_remap_index 454

+#define GetTransformFeedbackVaryingEXT_remap_index 455

+#define TransformFeedbackVaryingsEXT_remap_index 456

+#define ProvokingVertexEXT_remap_index 457

+#define GetTexParameterPointervAPPLE_remap_index 458

+#define TextureRangeAPPLE_remap_index 459

+#define GetObjectParameterivAPPLE_remap_index 460

+#define ObjectPurgeableAPPLE_remap_index 461

+#define ObjectUnpurgeableAPPLE_remap_index 462

+#define ActiveProgramEXT_remap_index 463

+#define CreateShaderProgramEXT_remap_index 464

+#define UseShaderProgramEXT_remap_index 465

+#define StencilFuncSeparateATI_remap_index 466

+#define ProgramEnvParameters4fvEXT_remap_index 467

+#define ProgramLocalParameters4fvEXT_remap_index 468

+#define GetQueryObjecti64vEXT_remap_index 469

+#define GetQueryObjectui64vEXT_remap_index 470

+#define EGLImageTargetRenderbufferStorageOES_remap_index 471

+#define EGLImageTargetTexture2DOES_remap_index 472

+

+#define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]

+#define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]

+#define _gloffset_CreateShader driDispatchRemapTable[CreateShader_remap_index]

+#define _gloffset_DeleteProgram driDispatchRemapTable[DeleteProgram_remap_index]

+#define _gloffset_DeleteShader driDispatchRemapTable[DeleteShader_remap_index]

+#define _gloffset_DetachShader driDispatchRemapTable[DetachShader_remap_index]

+#define _gloffset_GetAttachedShaders driDispatchRemapTable[GetAttachedShaders_remap_index]

+#define _gloffset_GetProgramInfoLog driDispatchRemapTable[GetProgramInfoLog_remap_index]

+#define _gloffset_GetProgramiv driDispatchRemapTable[GetProgramiv_remap_index]

+#define _gloffset_GetShaderInfoLog driDispatchRemapTable[GetShaderInfoLog_remap_index]

+#define _gloffset_GetShaderiv driDispatchRemapTable[GetShaderiv_remap_index]

+#define _gloffset_IsProgram driDispatchRemapTable[IsProgram_remap_index]

+#define _gloffset_IsShader driDispatchRemapTable[IsShader_remap_index]

+#define _gloffset_StencilFuncSeparate driDispatchRemapTable[StencilFuncSeparate_remap_index]

+#define _gloffset_StencilMaskSeparate driDispatchRemapTable[StencilMaskSeparate_remap_index]

+#define _gloffset_StencilOpSeparate driDispatchRemapTable[StencilOpSeparate_remap_index]

+#define _gloffset_UniformMatrix2x3fv driDispatchRemapTable[UniformMatrix2x3fv_remap_index]

+#define _gloffset_UniformMatrix2x4fv driDispatchRemapTable[UniformMatrix2x4fv_remap_index]

+#define _gloffset_UniformMatrix3x2fv driDispatchRemapTable[UniformMatrix3x2fv_remap_index]

+#define _gloffset_UniformMatrix3x4fv driDispatchRemapTable[UniformMatrix3x4fv_remap_index]

+#define _gloffset_UniformMatrix4x2fv driDispatchRemapTable[UniformMatrix4x2fv_remap_index]

+#define _gloffset_UniformMatrix4x3fv driDispatchRemapTable[UniformMatrix4x3fv_remap_index]

+#define _gloffset_ClampColor driDispatchRemapTable[ClampColor_remap_index]

+#define _gloffset_ClearBufferfi driDispatchRemapTable[ClearBufferfi_remap_index]

+#define _gloffset_ClearBufferfv driDispatchRemapTable[ClearBufferfv_remap_index]

+#define _gloffset_ClearBufferiv driDispatchRemapTable[ClearBufferiv_remap_index]

+#define _gloffset_ClearBufferuiv driDispatchRemapTable[ClearBufferuiv_remap_index]

+#define _gloffset_GetStringi driDispatchRemapTable[GetStringi_remap_index]

+#define _gloffset_TexBuffer driDispatchRemapTable[TexBuffer_remap_index]

+#define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index]

+#define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index]

+#define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]

+#define _gloffset_VertexAttribDivisor driDispatchRemapTable[VertexAttribDivisor_remap_index]

+#define _gloffset_LoadTransposeMatrixdARB driDispatchRemapTable[LoadTransposeMatrixdARB_remap_index]

+#define _gloffset_LoadTransposeMatrixfARB driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index]

+#define _gloffset_MultTransposeMatrixdARB driDispatchRemapTable[MultTransposeMatrixdARB_remap_index]

+#define _gloffset_MultTransposeMatrixfARB driDispatchRemapTable[MultTransposeMatrixfARB_remap_index]

+#define _gloffset_SampleCoverageARB driDispatchRemapTable[SampleCoverageARB_remap_index]

+#define _gloffset_CompressedTexImage1DARB driDispatchRemapTable[CompressedTexImage1DARB_remap_index]

+#define _gloffset_CompressedTexImage2DARB driDispatchRemapTable[CompressedTexImage2DARB_remap_index]

+#define _gloffset_CompressedTexImage3DARB driDispatchRemapTable[CompressedTexImage3DARB_remap_index]

+#define _gloffset_CompressedTexSubImage1DARB driDispatchRemapTable[CompressedTexSubImage1DARB_remap_index]

+#define _gloffset_CompressedTexSubImage2DARB driDispatchRemapTable[CompressedTexSubImage2DARB_remap_index]

+#define _gloffset_CompressedTexSubImage3DARB driDispatchRemapTable[CompressedTexSubImage3DARB_remap_index]

+#define _gloffset_GetCompressedTexImageARB driDispatchRemapTable[GetCompressedTexImageARB_remap_index]

+#define _gloffset_DisableVertexAttribArrayARB driDispatchRemapTable[DisableVertexAttribArrayARB_remap_index]

+#define _gloffset_EnableVertexAttribArrayARB driDispatchRemapTable[EnableVertexAttribArrayARB_remap_index]

+#define _gloffset_GetProgramEnvParameterdvARB driDispatchRemapTable[GetProgramEnvParameterdvARB_remap_index]

+#define _gloffset_GetProgramEnvParameterfvARB driDispatchRemapTable[GetProgramEnvParameterfvARB_remap_index]

+#define _gloffset_GetProgramLocalParameterdvARB driDispatchRemapTable[GetProgramLocalParameterdvARB_remap_index]

+#define _gloffset_GetProgramLocalParameterfvARB driDispatchRemapTable[GetProgramLocalParameterfvARB_remap_index]

+#define _gloffset_GetProgramStringARB driDispatchRemapTable[GetProgramStringARB_remap_index]

+#define _gloffset_GetProgramivARB driDispatchRemapTable[GetProgramivARB_remap_index]

+#define _gloffset_GetVertexAttribdvARB driDispatchRemapTable[GetVertexAttribdvARB_remap_index]

+#define _gloffset_GetVertexAttribfvARB driDispatchRemapTable[GetVertexAttribfvARB_remap_index]

+#define _gloffset_GetVertexAttribivARB driDispatchRemapTable[GetVertexAttribivARB_remap_index]

+#define _gloffset_ProgramEnvParameter4dARB driDispatchRemapTable[ProgramEnvParameter4dARB_remap_index]

+#define _gloffset_ProgramEnvParameter4dvARB driDispatchRemapTable[ProgramEnvParameter4dvARB_remap_index]

+#define _gloffset_ProgramEnvParameter4fARB driDispatchRemapTable[ProgramEnvParameter4fARB_remap_index]

+#define _gloffset_ProgramEnvParameter4fvARB driDispatchRemapTable[ProgramEnvParameter4fvARB_remap_index]

+#define _gloffset_ProgramLocalParameter4dARB driDispatchRemapTable[ProgramLocalParameter4dARB_remap_index]

+#define _gloffset_ProgramLocalParameter4dvARB driDispatchRemapTable[ProgramLocalParameter4dvARB_remap_index]

+#define _gloffset_ProgramLocalParameter4fARB driDispatchRemapTable[ProgramLocalParameter4fARB_remap_index]

+#define _gloffset_ProgramLocalParameter4fvARB driDispatchRemapTable[ProgramLocalParameter4fvARB_remap_index]

+#define _gloffset_ProgramStringARB driDispatchRemapTable[ProgramStringARB_remap_index]

+#define _gloffset_VertexAttrib1dARB driDispatchRemapTable[VertexAttrib1dARB_remap_index]

+#define _gloffset_VertexAttrib1dvARB driDispatchRemapTable[VertexAttrib1dvARB_remap_index]

+#define _gloffset_VertexAttrib1fARB driDispatchRemapTable[VertexAttrib1fARB_remap_index]

+#define _gloffset_VertexAttrib1fvARB driDispatchRemapTable[VertexAttrib1fvARB_remap_index]

+#define _gloffset_VertexAttrib1sARB driDispatchRemapTable[VertexAttrib1sARB_remap_index]

+#define _gloffset_VertexAttrib1svARB driDispatchRemapTable[VertexAttrib1svARB_remap_index]

+#define _gloffset_VertexAttrib2dARB driDispatchRemapTable[VertexAttrib2dARB_remap_index]

+#define _gloffset_VertexAttrib2dvARB driDispatchRemapTable[VertexAttrib2dvARB_remap_index]

+#define _gloffset_VertexAttrib2fARB driDispatchRemapTable[VertexAttrib2fARB_remap_index]

+#define _gloffset_VertexAttrib2fvARB driDispatchRemapTable[VertexAttrib2fvARB_remap_index]

+#define _gloffset_VertexAttrib2sARB driDispatchRemapTable[VertexAttrib2sARB_remap_index]

+#define _gloffset_VertexAttrib2svARB driDispatchRemapTable[VertexAttrib2svARB_remap_index]

+#define _gloffset_VertexAttrib3dARB driDispatchRemapTable[VertexAttrib3dARB_remap_index]

+#define _gloffset_VertexAttrib3dvARB driDispatchRemapTable[VertexAttrib3dvARB_remap_index]

+#define _gloffset_VertexAttrib3fARB driDispatchRemapTable[VertexAttrib3fARB_remap_index]

+#define _gloffset_VertexAttrib3fvARB driDispatchRemapTable[VertexAttrib3fvARB_remap_index]

+#define _gloffset_VertexAttrib3sARB driDispatchRemapTable[VertexAttrib3sARB_remap_index]

+#define _gloffset_VertexAttrib3svARB driDispatchRemapTable[VertexAttrib3svARB_remap_index]

+#define _gloffset_VertexAttrib4NbvARB driDispatchRemapTable[VertexAttrib4NbvARB_remap_index]

+#define _gloffset_VertexAttrib4NivARB driDispatchRemapTable[VertexAttrib4NivARB_remap_index]

+#define _gloffset_VertexAttrib4NsvARB driDispatchRemapTable[VertexAttrib4NsvARB_remap_index]

+#define _gloffset_VertexAttrib4NubARB driDispatchRemapTable[VertexAttrib4NubARB_remap_index]

+#define _gloffset_VertexAttrib4NubvARB driDispatchRemapTable[VertexAttrib4NubvARB_remap_index]

+#define _gloffset_VertexAttrib4NuivARB driDispatchRemapTable[VertexAttrib4NuivARB_remap_index]

+#define _gloffset_VertexAttrib4NusvARB driDispatchRemapTable[VertexAttrib4NusvARB_remap_index]

+#define _gloffset_VertexAttrib4bvARB driDispatchRemapTable[VertexAttrib4bvARB_remap_index]

+#define _gloffset_VertexAttrib4dARB driDispatchRemapTable[VertexAttrib4dARB_remap_index]

+#define _gloffset_VertexAttrib4dvARB driDispatchRemapTable[VertexAttrib4dvARB_remap_index]

+#define _gloffset_VertexAttrib4fARB driDispatchRemapTable[VertexAttrib4fARB_remap_index]

+#define _gloffset_VertexAttrib4fvARB driDispatchRemapTable[VertexAttrib4fvARB_remap_index]

+#define _gloffset_VertexAttrib4ivARB driDispatchRemapTable[VertexAttrib4ivARB_remap_index]

+#define _gloffset_VertexAttrib4sARB driDispatchRemapTable[VertexAttrib4sARB_remap_index]

+#define _gloffset_VertexAttrib4svARB driDispatchRemapTable[VertexAttrib4svARB_remap_index]

+#define _gloffset_VertexAttrib4ubvARB driDispatchRemapTable[VertexAttrib4ubvARB_remap_index]

+#define _gloffset_VertexAttrib4uivARB driDispatchRemapTable[VertexAttrib4uivARB_remap_index]

+#define _gloffset_VertexAttrib4usvARB driDispatchRemapTable[VertexAttrib4usvARB_remap_index]

+#define _gloffset_VertexAttribPointerARB driDispatchRemapTable[VertexAttribPointerARB_remap_index]

+#define _gloffset_BindBufferARB driDispatchRemapTable[BindBufferARB_remap_index]

+#define _gloffset_BufferDataARB driDispatchRemapTable[BufferDataARB_remap_index]

+#define _gloffset_BufferSubDataARB driDispatchRemapTable[BufferSubDataARB_remap_index]

+#define _gloffset_DeleteBuffersARB driDispatchRemapTable[DeleteBuffersARB_remap_index]

+#define _gloffset_GenBuffersARB driDispatchRemapTable[GenBuffersARB_remap_index]

+#define _gloffset_GetBufferParameterivARB driDispatchRemapTable[GetBufferParameterivARB_remap_index]

+#define _gloffset_GetBufferPointervARB driDispatchRemapTable[GetBufferPointervARB_remap_index]

+#define _gloffset_GetBufferSubDataARB driDispatchRemapTable[GetBufferSubDataARB_remap_index]

+#define _gloffset_IsBufferARB driDispatchRemapTable[IsBufferARB_remap_index]

+#define _gloffset_MapBufferARB driDispatchRemapTable[MapBufferARB_remap_index]

+#define _gloffset_UnmapBufferARB driDispatchRemapTable[UnmapBufferARB_remap_index]

+#define _gloffset_BeginQueryARB driDispatchRemapTable[BeginQueryARB_remap_index]

+#define _gloffset_DeleteQueriesARB driDispatchRemapTable[DeleteQueriesARB_remap_index]

+#define _gloffset_EndQueryARB driDispatchRemapTable[EndQueryARB_remap_index]

+#define _gloffset_GenQueriesARB driDispatchRemapTable[GenQueriesARB_remap_index]

+#define _gloffset_GetQueryObjectivARB driDispatchRemapTable[GetQueryObjectivARB_remap_index]

+#define _gloffset_GetQueryObjectuivARB driDispatchRemapTable[GetQueryObjectuivARB_remap_index]

+#define _gloffset_GetQueryivARB driDispatchRemapTable[GetQueryivARB_remap_index]

+#define _gloffset_IsQueryARB driDispatchRemapTable[IsQueryARB_remap_index]

+#define _gloffset_AttachObjectARB driDispatchRemapTable[AttachObjectARB_remap_index]

+#define _gloffset_CompileShaderARB driDispatchRemapTable[CompileShaderARB_remap_index]

+#define _gloffset_CreateProgramObjectARB driDispatchRemapTable[CreateProgramObjectARB_remap_index]

+#define _gloffset_CreateShaderObjectARB driDispatchRemapTable[CreateShaderObjectARB_remap_index]

+#define _gloffset_DeleteObjectARB driDispatchRemapTable[DeleteObjectARB_remap_index]

+#define _gloffset_DetachObjectARB driDispatchRemapTable[DetachObjectARB_remap_index]

+#define _gloffset_GetActiveUniformARB driDispatchRemapTable[GetActiveUniformARB_remap_index]

+#define _gloffset_GetAttachedObjectsARB driDispatchRemapTable[GetAttachedObjectsARB_remap_index]

+#define _gloffset_GetHandleARB driDispatchRemapTable[GetHandleARB_remap_index]

+#define _gloffset_GetInfoLogARB driDispatchRemapTable[GetInfoLogARB_remap_index]

+#define _gloffset_GetObjectParameterfvARB driDispatchRemapTable[GetObjectParameterfvARB_remap_index]

+#define _gloffset_GetObjectParameterivARB driDispatchRemapTable[GetObjectParameterivARB_remap_index]

+#define _gloffset_GetShaderSourceARB driDispatchRemapTable[GetShaderSourceARB_remap_index]

+#define _gloffset_GetUniformLocationARB driDispatchRemapTable[GetUniformLocationARB_remap_index]

+#define _gloffset_GetUniformfvARB driDispatchRemapTable[GetUniformfvARB_remap_index]

+#define _gloffset_GetUniformivARB driDispatchRemapTable[GetUniformivARB_remap_index]

+#define _gloffset_LinkProgramARB driDispatchRemapTable[LinkProgramARB_remap_index]

+#define _gloffset_ShaderSourceARB driDispatchRemapTable[ShaderSourceARB_remap_index]

+#define _gloffset_Uniform1fARB driDispatchRemapTable[Uniform1fARB_remap_index]

+#define _gloffset_Uniform1fvARB driDispatchRemapTable[Uniform1fvARB_remap_index]

+#define _gloffset_Uniform1iARB driDispatchRemapTable[Uniform1iARB_remap_index]

+#define _gloffset_Uniform1ivARB driDispatchRemapTable[Uniform1ivARB_remap_index]

+#define _gloffset_Uniform2fARB driDispatchRemapTable[Uniform2fARB_remap_index]

+#define _gloffset_Uniform2fvARB driDispatchRemapTable[Uniform2fvARB_remap_index]

+#define _gloffset_Uniform2iARB driDispatchRemapTable[Uniform2iARB_remap_index]

+#define _gloffset_Uniform2ivARB driDispatchRemapTable[Uniform2ivARB_remap_index]

+#define _gloffset_Uniform3fARB driDispatchRemapTable[Uniform3fARB_remap_index]

+#define _gloffset_Uniform3fvARB driDispatchRemapTable[Uniform3fvARB_remap_index]

+#define _gloffset_Uniform3iARB driDispatchRemapTable[Uniform3iARB_remap_index]

+#define _gloffset_Uniform3ivARB driDispatchRemapTable[Uniform3ivARB_remap_index]

+#define _gloffset_Uniform4fARB driDispatchRemapTable[Uniform4fARB_remap_index]

+#define _gloffset_Uniform4fvARB driDispatchRemapTable[Uniform4fvARB_remap_index]

+#define _gloffset_Uniform4iARB driDispatchRemapTable[Uniform4iARB_remap_index]

+#define _gloffset_Uniform4ivARB driDispatchRemapTable[Uniform4ivARB_remap_index]

+#define _gloffset_UniformMatrix2fvARB driDispatchRemapTable[UniformMatrix2fvARB_remap_index]

+#define _gloffset_UniformMatrix3fvARB driDispatchRemapTable[UniformMatrix3fvARB_remap_index]

+#define _gloffset_UniformMatrix4fvARB driDispatchRemapTable[UniformMatrix4fvARB_remap_index]

+#define _gloffset_UseProgramObjectARB driDispatchRemapTable[UseProgramObjectARB_remap_index]

+#define _gloffset_ValidateProgramARB driDispatchRemapTable[ValidateProgramARB_remap_index]

+#define _gloffset_BindAttribLocationARB driDispatchRemapTable[BindAttribLocationARB_remap_index]

+#define _gloffset_GetActiveAttribARB driDispatchRemapTable[GetActiveAttribARB_remap_index]

+#define _gloffset_GetAttribLocationARB driDispatchRemapTable[GetAttribLocationARB_remap_index]

+#define _gloffset_DrawBuffersARB driDispatchRemapTable[DrawBuffersARB_remap_index]

+#define _gloffset_DrawArraysInstancedARB driDispatchRemapTable[DrawArraysInstancedARB_remap_index]

+#define _gloffset_DrawElementsInstancedARB driDispatchRemapTable[DrawElementsInstancedARB_remap_index]

+#define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]

+#define _gloffset_FramebufferTextureARB driDispatchRemapTable[FramebufferTextureARB_remap_index]

+#define _gloffset_FramebufferTextureFaceARB driDispatchRemapTable[FramebufferTextureFaceARB_remap_index]

+#define _gloffset_ProgramParameteriARB driDispatchRemapTable[ProgramParameteriARB_remap_index]

+#define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]

+#define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]

+#define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]

+#define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]

+#define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]

+#define _gloffset_ClientWaitSync driDispatchRemapTable[ClientWaitSync_remap_index]

+#define _gloffset_DeleteSync driDispatchRemapTable[DeleteSync_remap_index]

+#define _gloffset_FenceSync driDispatchRemapTable[FenceSync_remap_index]

+#define _gloffset_GetInteger64v driDispatchRemapTable[GetInteger64v_remap_index]

+#define _gloffset_GetSynciv driDispatchRemapTable[GetSynciv_remap_index]

+#define _gloffset_IsSync driDispatchRemapTable[IsSync_remap_index]

+#define _gloffset_WaitSync driDispatchRemapTable[WaitSync_remap_index]

+#define _gloffset_DrawElementsBaseVertex driDispatchRemapTable[DrawElementsBaseVertex_remap_index]

+#define _gloffset_DrawRangeElementsBaseVertex driDispatchRemapTable[DrawRangeElementsBaseVertex_remap_index]

+#define _gloffset_MultiDrawElementsBaseVertex driDispatchRemapTable[MultiDrawElementsBaseVertex_remap_index]

+#define _gloffset_BindTransformFeedback driDispatchRemapTable[BindTransformFeedback_remap_index]

+#define _gloffset_DeleteTransformFeedbacks driDispatchRemapTable[DeleteTransformFeedbacks_remap_index]

+#define _gloffset_DrawTransformFeedback driDispatchRemapTable[DrawTransformFeedback_remap_index]

+#define _gloffset_GenTransformFeedbacks driDispatchRemapTable[GenTransformFeedbacks_remap_index]

+#define _gloffset_IsTransformFeedback driDispatchRemapTable[IsTransformFeedback_remap_index]

+#define _gloffset_PauseTransformFeedback driDispatchRemapTable[PauseTransformFeedback_remap_index]

+#define _gloffset_ResumeTransformFeedback driDispatchRemapTable[ResumeTransformFeedback_remap_index]

+#define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]

+#define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]

+#define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]

+#define _gloffset_PixelTexGenParameterfSGIS driDispatchRemapTable[PixelTexGenParameterfSGIS_remap_index]

+#define _gloffset_PixelTexGenParameterfvSGIS driDispatchRemapTable[PixelTexGenParameterfvSGIS_remap_index]

+#define _gloffset_PixelTexGenParameteriSGIS driDispatchRemapTable[PixelTexGenParameteriSGIS_remap_index]

+#define _gloffset_PixelTexGenParameterivSGIS driDispatchRemapTable[PixelTexGenParameterivSGIS_remap_index]

+#define _gloffset_SampleMaskSGIS driDispatchRemapTable[SampleMaskSGIS_remap_index]

+#define _gloffset_SamplePatternSGIS driDispatchRemapTable[SamplePatternSGIS_remap_index]

+#define _gloffset_ColorPointerEXT driDispatchRemapTable[ColorPointerEXT_remap_index]

+#define _gloffset_EdgeFlagPointerEXT driDispatchRemapTable[EdgeFlagPointerEXT_remap_index]

+#define _gloffset_IndexPointerEXT driDispatchRemapTable[IndexPointerEXT_remap_index]

+#define _gloffset_NormalPointerEXT driDispatchRemapTable[NormalPointerEXT_remap_index]

+#define _gloffset_TexCoordPointerEXT driDispatchRemapTable[TexCoordPointerEXT_remap_index]

+#define _gloffset_VertexPointerEXT driDispatchRemapTable[VertexPointerEXT_remap_index]

+#define _gloffset_PointParameterfEXT driDispatchRemapTable[PointParameterfEXT_remap_index]

+#define _gloffset_PointParameterfvEXT driDispatchRemapTable[PointParameterfvEXT_remap_index]

+#define _gloffset_LockArraysEXT driDispatchRemapTable[LockArraysEXT_remap_index]

+#define _gloffset_UnlockArraysEXT driDispatchRemapTable[UnlockArraysEXT_remap_index]

+#define _gloffset_SecondaryColor3bEXT driDispatchRemapTable[SecondaryColor3bEXT_remap_index]

+#define _gloffset_SecondaryColor3bvEXT driDispatchRemapTable[SecondaryColor3bvEXT_remap_index]

+#define _gloffset_SecondaryColor3dEXT driDispatchRemapTable[SecondaryColor3dEXT_remap_index]

+#define _gloffset_SecondaryColor3dvEXT driDispatchRemapTable[SecondaryColor3dvEXT_remap_index]

+#define _gloffset_SecondaryColor3fEXT driDispatchRemapTable[SecondaryColor3fEXT_remap_index]

+#define _gloffset_SecondaryColor3fvEXT driDispatchRemapTable[SecondaryColor3fvEXT_remap_index]

+#define _gloffset_SecondaryColor3iEXT driDispatchRemapTable[SecondaryColor3iEXT_remap_index]

+#define _gloffset_SecondaryColor3ivEXT driDispatchRemapTable[SecondaryColor3ivEXT_remap_index]

+#define _gloffset_SecondaryColor3sEXT driDispatchRemapTable[SecondaryColor3sEXT_remap_index]

+#define _gloffset_SecondaryColor3svEXT driDispatchRemapTable[SecondaryColor3svEXT_remap_index]

+#define _gloffset_SecondaryColor3ubEXT driDispatchRemapTable[SecondaryColor3ubEXT_remap_index]

+#define _gloffset_SecondaryColor3ubvEXT driDispatchRemapTable[SecondaryColor3ubvEXT_remap_index]

+#define _gloffset_SecondaryColor3uiEXT driDispatchRemapTable[SecondaryColor3uiEXT_remap_index]

+#define _gloffset_SecondaryColor3uivEXT driDispatchRemapTable[SecondaryColor3uivEXT_remap_index]

+#define _gloffset_SecondaryColor3usEXT driDispatchRemapTable[SecondaryColor3usEXT_remap_index]

+#define _gloffset_SecondaryColor3usvEXT driDispatchRemapTable[SecondaryColor3usvEXT_remap_index]

+#define _gloffset_SecondaryColorPointerEXT driDispatchRemapTable[SecondaryColorPointerEXT_remap_index]

+#define _gloffset_MultiDrawArraysEXT driDispatchRemapTable[MultiDrawArraysEXT_remap_index]

+#define _gloffset_MultiDrawElementsEXT driDispatchRemapTable[MultiDrawElementsEXT_remap_index]

+#define _gloffset_FogCoordPointerEXT driDispatchRemapTable[FogCoordPointerEXT_remap_index]

+#define _gloffset_FogCoorddEXT driDispatchRemapTable[FogCoorddEXT_remap_index]

+#define _gloffset_FogCoorddvEXT driDispatchRemapTable[FogCoorddvEXT_remap_index]

+#define _gloffset_FogCoordfEXT driDispatchRemapTable[FogCoordfEXT_remap_index]

+#define _gloffset_FogCoordfvEXT driDispatchRemapTable[FogCoordfvEXT_remap_index]

+#define _gloffset_PixelTexGenSGIX driDispatchRemapTable[PixelTexGenSGIX_remap_index]

+#define _gloffset_BlendFuncSeparateEXT driDispatchRemapTable[BlendFuncSeparateEXT_remap_index]

+#define _gloffset_FlushVertexArrayRangeNV driDispatchRemapTable[FlushVertexArrayRangeNV_remap_index]

+#define _gloffset_VertexArrayRangeNV driDispatchRemapTable[VertexArrayRangeNV_remap_index]

+#define _gloffset_CombinerInputNV driDispatchRemapTable[CombinerInputNV_remap_index]

+#define _gloffset_CombinerOutputNV driDispatchRemapTable[CombinerOutputNV_remap_index]

+#define _gloffset_CombinerParameterfNV driDispatchRemapTable[CombinerParameterfNV_remap_index]

+#define _gloffset_CombinerParameterfvNV driDispatchRemapTable[CombinerParameterfvNV_remap_index]

+#define _gloffset_CombinerParameteriNV driDispatchRemapTable[CombinerParameteriNV_remap_index]

+#define _gloffset_CombinerParameterivNV driDispatchRemapTable[CombinerParameterivNV_remap_index]

+#define _gloffset_FinalCombinerInputNV driDispatchRemapTable[FinalCombinerInputNV_remap_index]

+#define _gloffset_GetCombinerInputParameterfvNV driDispatchRemapTable[GetCombinerInputParameterfvNV_remap_index]

+#define _gloffset_GetCombinerInputParameterivNV driDispatchRemapTable[GetCombinerInputParameterivNV_remap_index]

+#define _gloffset_GetCombinerOutputParameterfvNV driDispatchRemapTable[GetCombinerOutputParameterfvNV_remap_index]

+#define _gloffset_GetCombinerOutputParameterivNV driDispatchRemapTable[GetCombinerOutputParameterivNV_remap_index]

+#define _gloffset_GetFinalCombinerInputParameterfvNV driDispatchRemapTable[GetFinalCombinerInputParameterfvNV_remap_index]

+#define _gloffset_GetFinalCombinerInputParameterivNV driDispatchRemapTable[GetFinalCombinerInputParameterivNV_remap_index]

+#define _gloffset_ResizeBuffersMESA driDispatchRemapTable[ResizeBuffersMESA_remap_index]

+#define _gloffset_WindowPos2dMESA driDispatchRemapTable[WindowPos2dMESA_remap_index]

+#define _gloffset_WindowPos2dvMESA driDispatchRemapTable[WindowPos2dvMESA_remap_index]

+#define _gloffset_WindowPos2fMESA driDispatchRemapTable[WindowPos2fMESA_remap_index]

+#define _gloffset_WindowPos2fvMESA driDispatchRemapTable[WindowPos2fvMESA_remap_index]

+#define _gloffset_WindowPos2iMESA driDispatchRemapTable[WindowPos2iMESA_remap_index]

+#define _gloffset_WindowPos2ivMESA driDispatchRemapTable[WindowPos2ivMESA_remap_index]

+#define _gloffset_WindowPos2sMESA driDispatchRemapTable[WindowPos2sMESA_remap_index]

+#define _gloffset_WindowPos2svMESA driDispatchRemapTable[WindowPos2svMESA_remap_index]

+#define _gloffset_WindowPos3dMESA driDispatchRemapTable[WindowPos3dMESA_remap_index]

+#define _gloffset_WindowPos3dvMESA driDispatchRemapTable[WindowPos3dvMESA_remap_index]

+#define _gloffset_WindowPos3fMESA driDispatchRemapTable[WindowPos3fMESA_remap_index]

+#define _gloffset_WindowPos3fvMESA driDispatchRemapTable[WindowPos3fvMESA_remap_index]

+#define _gloffset_WindowPos3iMESA driDispatchRemapTable[WindowPos3iMESA_remap_index]

+#define _gloffset_WindowPos3ivMESA driDispatchRemapTable[WindowPos3ivMESA_remap_index]

+#define _gloffset_WindowPos3sMESA driDispatchRemapTable[WindowPos3sMESA_remap_index]

+#define _gloffset_WindowPos3svMESA driDispatchRemapTable[WindowPos3svMESA_remap_index]

+#define _gloffset_WindowPos4dMESA driDispatchRemapTable[WindowPos4dMESA_remap_index]

+#define _gloffset_WindowPos4dvMESA driDispatchRemapTable[WindowPos4dvMESA_remap_index]

+#define _gloffset_WindowPos4fMESA driDispatchRemapTable[WindowPos4fMESA_remap_index]

+#define _gloffset_WindowPos4fvMESA driDispatchRemapTable[WindowPos4fvMESA_remap_index]

+#define _gloffset_WindowPos4iMESA driDispatchRemapTable[WindowPos4iMESA_remap_index]

+#define _gloffset_WindowPos4ivMESA driDispatchRemapTable[WindowPos4ivMESA_remap_index]

+#define _gloffset_WindowPos4sMESA driDispatchRemapTable[WindowPos4sMESA_remap_index]

+#define _gloffset_WindowPos4svMESA driDispatchRemapTable[WindowPos4svMESA_remap_index]

+#define _gloffset_MultiModeDrawArraysIBM driDispatchRemapTable[MultiModeDrawArraysIBM_remap_index]

+#define _gloffset_MultiModeDrawElementsIBM driDispatchRemapTable[MultiModeDrawElementsIBM_remap_index]

+#define _gloffset_DeleteFencesNV driDispatchRemapTable[DeleteFencesNV_remap_index]

+#define _gloffset_FinishFenceNV driDispatchRemapTable[FinishFenceNV_remap_index]

+#define _gloffset_GenFencesNV driDispatchRemapTable[GenFencesNV_remap_index]

+#define _gloffset_GetFenceivNV driDispatchRemapTable[GetFenceivNV_remap_index]

+#define _gloffset_IsFenceNV driDispatchRemapTable[IsFenceNV_remap_index]

+#define _gloffset_SetFenceNV driDispatchRemapTable[SetFenceNV_remap_index]

+#define _gloffset_TestFenceNV driDispatchRemapTable[TestFenceNV_remap_index]

+#define _gloffset_AreProgramsResidentNV driDispatchRemapTable[AreProgramsResidentNV_remap_index]

+#define _gloffset_BindProgramNV driDispatchRemapTable[BindProgramNV_remap_index]

+#define _gloffset_DeleteProgramsNV driDispatchRemapTable[DeleteProgramsNV_remap_index]

+#define _gloffset_ExecuteProgramNV driDispatchRemapTable[ExecuteProgramNV_remap_index]

+#define _gloffset_GenProgramsNV driDispatchRemapTable[GenProgramsNV_remap_index]

+#define _gloffset_GetProgramParameterdvNV driDispatchRemapTable[GetProgramParameterdvNV_remap_index]

+#define _gloffset_GetProgramParameterfvNV driDispatchRemapTable[GetProgramParameterfvNV_remap_index]

+#define _gloffset_GetProgramStringNV driDispatchRemapTable[GetProgramStringNV_remap_index]

+#define _gloffset_GetProgramivNV driDispatchRemapTable[GetProgramivNV_remap_index]

+#define _gloffset_GetTrackMatrixivNV driDispatchRemapTable[GetTrackMatrixivNV_remap_index]

+#define _gloffset_GetVertexAttribPointervNV driDispatchRemapTable[GetVertexAttribPointervNV_remap_index]

+#define _gloffset_GetVertexAttribdvNV driDispatchRemapTable[GetVertexAttribdvNV_remap_index]

+#define _gloffset_GetVertexAttribfvNV driDispatchRemapTable[GetVertexAttribfvNV_remap_index]

+#define _gloffset_GetVertexAttribivNV driDispatchRemapTable[GetVertexAttribivNV_remap_index]

+#define _gloffset_IsProgramNV driDispatchRemapTable[IsProgramNV_remap_index]

+#define _gloffset_LoadProgramNV driDispatchRemapTable[LoadProgramNV_remap_index]

+#define _gloffset_ProgramParameters4dvNV driDispatchRemapTable[ProgramParameters4dvNV_remap_index]

+#define _gloffset_ProgramParameters4fvNV driDispatchRemapTable[ProgramParameters4fvNV_remap_index]

+#define _gloffset_RequestResidentProgramsNV driDispatchRemapTable[RequestResidentProgramsNV_remap_index]

+#define _gloffset_TrackMatrixNV driDispatchRemapTable[TrackMatrixNV_remap_index]

+#define _gloffset_VertexAttrib1dNV driDispatchRemapTable[VertexAttrib1dNV_remap_index]

+#define _gloffset_VertexAttrib1dvNV driDispatchRemapTable[VertexAttrib1dvNV_remap_index]

+#define _gloffset_VertexAttrib1fNV driDispatchRemapTable[VertexAttrib1fNV_remap_index]

+#define _gloffset_VertexAttrib1fvNV driDispatchRemapTable[VertexAttrib1fvNV_remap_index]

+#define _gloffset_VertexAttrib1sNV driDispatchRemapTable[VertexAttrib1sNV_remap_index]

+#define _gloffset_VertexAttrib1svNV driDispatchRemapTable[VertexAttrib1svNV_remap_index]

+#define _gloffset_VertexAttrib2dNV driDispatchRemapTable[VertexAttrib2dNV_remap_index]

+#define _gloffset_VertexAttrib2dvNV driDispatchRemapTable[VertexAttrib2dvNV_remap_index]

+#define _gloffset_VertexAttrib2fNV driDispatchRemapTable[VertexAttrib2fNV_remap_index]

+#define _gloffset_VertexAttrib2fvNV driDispatchRemapTable[VertexAttrib2fvNV_remap_index]

+#define _gloffset_VertexAttrib2sNV driDispatchRemapTable[VertexAttrib2sNV_remap_index]

+#define _gloffset_VertexAttrib2svNV driDispatchRemapTable[VertexAttrib2svNV_remap_index]

+#define _gloffset_VertexAttrib3dNV driDispatchRemapTable[VertexAttrib3dNV_remap_index]

+#define _gloffset_VertexAttrib3dvNV driDispatchRemapTable[VertexAttrib3dvNV_remap_index]

+#define _gloffset_VertexAttrib3fNV driDispatchRemapTable[VertexAttrib3fNV_remap_index]

+#define _gloffset_VertexAttrib3fvNV driDispatchRemapTable[VertexAttrib3fvNV_remap_index]

+#define _gloffset_VertexAttrib3sNV driDispatchRemapTable[VertexAttrib3sNV_remap_index]

+#define _gloffset_VertexAttrib3svNV driDispatchRemapTable[VertexAttrib3svNV_remap_index]

+#define _gloffset_VertexAttrib4dNV driDispatchRemapTable[VertexAttrib4dNV_remap_index]

+#define _gloffset_VertexAttrib4dvNV driDispatchRemapTable[VertexAttrib4dvNV_remap_index]

+#define _gloffset_VertexAttrib4fNV driDispatchRemapTable[VertexAttrib4fNV_remap_index]

+#define _gloffset_VertexAttrib4fvNV driDispatchRemapTable[VertexAttrib4fvNV_remap_index]

+#define _gloffset_VertexAttrib4sNV driDispatchRemapTable[VertexAttrib4sNV_remap_index]

+#define _gloffset_VertexAttrib4svNV driDispatchRemapTable[VertexAttrib4svNV_remap_index]

+#define _gloffset_VertexAttrib4ubNV driDispatchRemapTable[VertexAttrib4ubNV_remap_index]

+#define _gloffset_VertexAttrib4ubvNV driDispatchRemapTable[VertexAttrib4ubvNV_remap_index]

+#define _gloffset_VertexAttribPointerNV driDispatchRemapTable[VertexAttribPointerNV_remap_index]

+#define _gloffset_VertexAttribs1dvNV driDispatchRemapTable[VertexAttribs1dvNV_remap_index]

+#define _gloffset_VertexAttribs1fvNV driDispatchRemapTable[VertexAttribs1fvNV_remap_index]

+#define _gloffset_VertexAttribs1svNV driDispatchRemapTable[VertexAttribs1svNV_remap_index]

+#define _gloffset_VertexAttribs2dvNV driDispatchRemapTable[VertexAttribs2dvNV_remap_index]

+#define _gloffset_VertexAttribs2fvNV driDispatchRemapTable[VertexAttribs2fvNV_remap_index]

+#define _gloffset_VertexAttribs2svNV driDispatchRemapTable[VertexAttribs2svNV_remap_index]

+#define _gloffset_VertexAttribs3dvNV driDispatchRemapTable[VertexAttribs3dvNV_remap_index]

+#define _gloffset_VertexAttribs3fvNV driDispatchRemapTable[VertexAttribs3fvNV_remap_index]

+#define _gloffset_VertexAttribs3svNV driDispatchRemapTable[VertexAttribs3svNV_remap_index]

+#define _gloffset_VertexAttribs4dvNV driDispatchRemapTable[VertexAttribs4dvNV_remap_index]

+#define _gloffset_VertexAttribs4fvNV driDispatchRemapTable[VertexAttribs4fvNV_remap_index]

+#define _gloffset_VertexAttribs4svNV driDispatchRemapTable[VertexAttribs4svNV_remap_index]

+#define _gloffset_VertexAttribs4ubvNV driDispatchRemapTable[VertexAttribs4ubvNV_remap_index]

+#define _gloffset_GetTexBumpParameterfvATI driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index]

+#define _gloffset_GetTexBumpParameterivATI driDispatchRemapTable[GetTexBumpParameterivATI_remap_index]

+#define _gloffset_TexBumpParameterfvATI driDispatchRemapTable[TexBumpParameterfvATI_remap_index]

+#define _gloffset_TexBumpParameterivATI driDispatchRemapTable[TexBumpParameterivATI_remap_index]

+#define _gloffset_AlphaFragmentOp1ATI driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index]

+#define _gloffset_AlphaFragmentOp2ATI driDispatchRemapTable[AlphaFragmentOp2ATI_remap_index]

+#define _gloffset_AlphaFragmentOp3ATI driDispatchRemapTable[AlphaFragmentOp3ATI_remap_index]

+#define _gloffset_BeginFragmentShaderATI driDispatchRemapTable[BeginFragmentShaderATI_remap_index]

+#define _gloffset_BindFragmentShaderATI driDispatchRemapTable[BindFragmentShaderATI_remap_index]

+#define _gloffset_ColorFragmentOp1ATI driDispatchRemapTable[ColorFragmentOp1ATI_remap_index]

+#define _gloffset_ColorFragmentOp2ATI driDispatchRemapTable[ColorFragmentOp2ATI_remap_index]

+#define _gloffset_ColorFragmentOp3ATI driDispatchRemapTable[ColorFragmentOp3ATI_remap_index]

+#define _gloffset_DeleteFragmentShaderATI driDispatchRemapTable[DeleteFragmentShaderATI_remap_index]

+#define _gloffset_EndFragmentShaderATI driDispatchRemapTable[EndFragmentShaderATI_remap_index]

+#define _gloffset_GenFragmentShadersATI driDispatchRemapTable[GenFragmentShadersATI_remap_index]

+#define _gloffset_PassTexCoordATI driDispatchRemapTable[PassTexCoordATI_remap_index]

+#define _gloffset_SampleMapATI driDispatchRemapTable[SampleMapATI_remap_index]

+#define _gloffset_SetFragmentShaderConstantATI driDispatchRemapTable[SetFragmentShaderConstantATI_remap_index]

+#define _gloffset_PointParameteriNV driDispatchRemapTable[PointParameteriNV_remap_index]

+#define _gloffset_PointParameterivNV driDispatchRemapTable[PointParameterivNV_remap_index]

+#define _gloffset_ActiveStencilFaceEXT driDispatchRemapTable[ActiveStencilFaceEXT_remap_index]

+#define _gloffset_BindVertexArrayAPPLE driDispatchRemapTable[BindVertexArrayAPPLE_remap_index]

+#define _gloffset_DeleteVertexArraysAPPLE driDispatchRemapTable[DeleteVertexArraysAPPLE_remap_index]

+#define _gloffset_GenVertexArraysAPPLE driDispatchRemapTable[GenVertexArraysAPPLE_remap_index]

+#define _gloffset_IsVertexArrayAPPLE driDispatchRemapTable[IsVertexArrayAPPLE_remap_index]

+#define _gloffset_GetProgramNamedParameterdvNV driDispatchRemapTable[GetProgramNamedParameterdvNV_remap_index]

+#define _gloffset_GetProgramNamedParameterfvNV driDispatchRemapTable[GetProgramNamedParameterfvNV_remap_index]

+#define _gloffset_ProgramNamedParameter4dNV driDispatchRemapTable[ProgramNamedParameter4dNV_remap_index]

+#define _gloffset_ProgramNamedParameter4dvNV driDispatchRemapTable[ProgramNamedParameter4dvNV_remap_index]

+#define _gloffset_ProgramNamedParameter4fNV driDispatchRemapTable[ProgramNamedParameter4fNV_remap_index]

+#define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index]

+#define _gloffset_PrimitiveRestartIndexNV driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index]

+#define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index]

+#define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index]

+#define _gloffset_BlendEquationSeparateEXT driDispatchRemapTable[BlendEquationSeparateEXT_remap_index]

+#define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index]

+#define _gloffset_BindRenderbufferEXT driDispatchRemapTable[BindRenderbufferEXT_remap_index]

+#define _gloffset_CheckFramebufferStatusEXT driDispatchRemapTable[CheckFramebufferStatusEXT_remap_index]

+#define _gloffset_DeleteFramebuffersEXT driDispatchRemapTable[DeleteFramebuffersEXT_remap_index]

+#define _gloffset_DeleteRenderbuffersEXT driDispatchRemapTable[DeleteRenderbuffersEXT_remap_index]

+#define _gloffset_FramebufferRenderbufferEXT driDispatchRemapTable[FramebufferRenderbufferEXT_remap_index]

+#define _gloffset_FramebufferTexture1DEXT driDispatchRemapTable[FramebufferTexture1DEXT_remap_index]

+#define _gloffset_FramebufferTexture2DEXT driDispatchRemapTable[FramebufferTexture2DEXT_remap_index]

+#define _gloffset_FramebufferTexture3DEXT driDispatchRemapTable[FramebufferTexture3DEXT_remap_index]

+#define _gloffset_GenFramebuffersEXT driDispatchRemapTable[GenFramebuffersEXT_remap_index]

+#define _gloffset_GenRenderbuffersEXT driDispatchRemapTable[GenRenderbuffersEXT_remap_index]

+#define _gloffset_GenerateMipmapEXT driDispatchRemapTable[GenerateMipmapEXT_remap_index]

+#define _gloffset_GetFramebufferAttachmentParameterivEXT driDispatchRemapTable[GetFramebufferAttachmentParameterivEXT_remap_index]

+#define _gloffset_GetRenderbufferParameterivEXT driDispatchRemapTable[GetRenderbufferParameterivEXT_remap_index]

+#define _gloffset_IsFramebufferEXT driDispatchRemapTable[IsFramebufferEXT_remap_index]

+#define _gloffset_IsRenderbufferEXT driDispatchRemapTable[IsRenderbufferEXT_remap_index]

+#define _gloffset_RenderbufferStorageEXT driDispatchRemapTable[RenderbufferStorageEXT_remap_index]

+#define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index]

+#define _gloffset_BufferParameteriAPPLE driDispatchRemapTable[BufferParameteriAPPLE_remap_index]

+#define _gloffset_FlushMappedBufferRangeAPPLE driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index]

+#define _gloffset_BindFragDataLocationEXT driDispatchRemapTable[BindFragDataLocationEXT_remap_index]

+#define _gloffset_GetFragDataLocationEXT driDispatchRemapTable[GetFragDataLocationEXT_remap_index]

+#define _gloffset_GetUniformuivEXT driDispatchRemapTable[GetUniformuivEXT_remap_index]

+#define _gloffset_GetVertexAttribIivEXT driDispatchRemapTable[GetVertexAttribIivEXT_remap_index]

+#define _gloffset_GetVertexAttribIuivEXT driDispatchRemapTable[GetVertexAttribIuivEXT_remap_index]

+#define _gloffset_Uniform1uiEXT driDispatchRemapTable[Uniform1uiEXT_remap_index]

+#define _gloffset_Uniform1uivEXT driDispatchRemapTable[Uniform1uivEXT_remap_index]

+#define _gloffset_Uniform2uiEXT driDispatchRemapTable[Uniform2uiEXT_remap_index]

+#define _gloffset_Uniform2uivEXT driDispatchRemapTable[Uniform2uivEXT_remap_index]

+#define _gloffset_Uniform3uiEXT driDispatchRemapTable[Uniform3uiEXT_remap_index]

+#define _gloffset_Uniform3uivEXT driDispatchRemapTable[Uniform3uivEXT_remap_index]

+#define _gloffset_Uniform4uiEXT driDispatchRemapTable[Uniform4uiEXT_remap_index]

+#define _gloffset_Uniform4uivEXT driDispatchRemapTable[Uniform4uivEXT_remap_index]

+#define _gloffset_VertexAttribI1iEXT driDispatchRemapTable[VertexAttribI1iEXT_remap_index]

+#define _gloffset_VertexAttribI1ivEXT driDispatchRemapTable[VertexAttribI1ivEXT_remap_index]

+#define _gloffset_VertexAttribI1uiEXT driDispatchRemapTable[VertexAttribI1uiEXT_remap_index]

+#define _gloffset_VertexAttribI1uivEXT driDispatchRemapTable[VertexAttribI1uivEXT_remap_index]

+#define _gloffset_VertexAttribI2iEXT driDispatchRemapTable[VertexAttribI2iEXT_remap_index]

+#define _gloffset_VertexAttribI2ivEXT driDispatchRemapTable[VertexAttribI2ivEXT_remap_index]

+#define _gloffset_VertexAttribI2uiEXT driDispatchRemapTable[VertexAttribI2uiEXT_remap_index]

+#define _gloffset_VertexAttribI2uivEXT driDispatchRemapTable[VertexAttribI2uivEXT_remap_index]

+#define _gloffset_VertexAttribI3iEXT driDispatchRemapTable[VertexAttribI3iEXT_remap_index]

+#define _gloffset_VertexAttribI3ivEXT driDispatchRemapTable[VertexAttribI3ivEXT_remap_index]

+#define _gloffset_VertexAttribI3uiEXT driDispatchRemapTable[VertexAttribI3uiEXT_remap_index]

+#define _gloffset_VertexAttribI3uivEXT driDispatchRemapTable[VertexAttribI3uivEXT_remap_index]

+#define _gloffset_VertexAttribI4bvEXT driDispatchRemapTable[VertexAttribI4bvEXT_remap_index]

+#define _gloffset_VertexAttribI4iEXT driDispatchRemapTable[VertexAttribI4iEXT_remap_index]

+#define _gloffset_VertexAttribI4ivEXT driDispatchRemapTable[VertexAttribI4ivEXT_remap_index]

+#define _gloffset_VertexAttribI4svEXT driDispatchRemapTable[VertexAttribI4svEXT_remap_index]

+#define _gloffset_VertexAttribI4ubvEXT driDispatchRemapTable[VertexAttribI4ubvEXT_remap_index]

+#define _gloffset_VertexAttribI4uiEXT driDispatchRemapTable[VertexAttribI4uiEXT_remap_index]

+#define _gloffset_VertexAttribI4uivEXT driDispatchRemapTable[VertexAttribI4uivEXT_remap_index]

+#define _gloffset_VertexAttribI4usvEXT driDispatchRemapTable[VertexAttribI4usvEXT_remap_index]

+#define _gloffset_VertexAttribIPointerEXT driDispatchRemapTable[VertexAttribIPointerEXT_remap_index]

+#define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]

+#define _gloffset_ColorMaskIndexedEXT driDispatchRemapTable[ColorMaskIndexedEXT_remap_index]

+#define _gloffset_DisableIndexedEXT driDispatchRemapTable[DisableIndexedEXT_remap_index]

+#define _gloffset_EnableIndexedEXT driDispatchRemapTable[EnableIndexedEXT_remap_index]

+#define _gloffset_GetBooleanIndexedvEXT driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index]

+#define _gloffset_GetIntegerIndexedvEXT driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index]

+#define _gloffset_IsEnabledIndexedEXT driDispatchRemapTable[IsEnabledIndexedEXT_remap_index]

+#define _gloffset_ClearColorIiEXT driDispatchRemapTable[ClearColorIiEXT_remap_index]

+#define _gloffset_ClearColorIuiEXT driDispatchRemapTable[ClearColorIuiEXT_remap_index]

+#define _gloffset_GetTexParameterIivEXT driDispatchRemapTable[GetTexParameterIivEXT_remap_index]

+#define _gloffset_GetTexParameterIuivEXT driDispatchRemapTable[GetTexParameterIuivEXT_remap_index]

+#define _gloffset_TexParameterIivEXT driDispatchRemapTable[TexParameterIivEXT_remap_index]

+#define _gloffset_TexParameterIuivEXT driDispatchRemapTable[TexParameterIuivEXT_remap_index]

+#define _gloffset_BeginConditionalRenderNV driDispatchRemapTable[BeginConditionalRenderNV_remap_index]

+#define _gloffset_EndConditionalRenderNV driDispatchRemapTable[EndConditionalRenderNV_remap_index]

+#define _gloffset_BeginTransformFeedbackEXT driDispatchRemapTable[BeginTransformFeedbackEXT_remap_index]

+#define _gloffset_BindBufferBaseEXT driDispatchRemapTable[BindBufferBaseEXT_remap_index]

+#define _gloffset_BindBufferOffsetEXT driDispatchRemapTable[BindBufferOffsetEXT_remap_index]

+#define _gloffset_BindBufferRangeEXT driDispatchRemapTable[BindBufferRangeEXT_remap_index]

+#define _gloffset_EndTransformFeedbackEXT driDispatchRemapTable[EndTransformFeedbackEXT_remap_index]

+#define _gloffset_GetTransformFeedbackVaryingEXT driDispatchRemapTable[GetTransformFeedbackVaryingEXT_remap_index]

+#define _gloffset_TransformFeedbackVaryingsEXT driDispatchRemapTable[TransformFeedbackVaryingsEXT_remap_index]

+#define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index]

+#define _gloffset_GetTexParameterPointervAPPLE driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index]

+#define _gloffset_TextureRangeAPPLE driDispatchRemapTable[TextureRangeAPPLE_remap_index]

+#define _gloffset_GetObjectParameterivAPPLE driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index]

+#define _gloffset_ObjectPurgeableAPPLE driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index]

+#define _gloffset_ObjectUnpurgeableAPPLE driDispatchRemapTable[ObjectUnpurgeableAPPLE_remap_index]

+#define _gloffset_ActiveProgramEXT driDispatchRemapTable[ActiveProgramEXT_remap_index]

+#define _gloffset_CreateShaderProgramEXT driDispatchRemapTable[CreateShaderProgramEXT_remap_index]

+#define _gloffset_UseShaderProgramEXT driDispatchRemapTable[UseShaderProgramEXT_remap_index]

+#define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]

+#define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]

+#define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]

+#define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index]

+#define _gloffset_GetQueryObjectui64vEXT driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index]

+#define _gloffset_EGLImageTargetRenderbufferStorageOES driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index]

+#define _gloffset_EGLImageTargetTexture2DOES driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index]

+

+#endif /* _GLAPI_USE_REMAP_TABLE */

+

+#define CALL_NewList(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum)), _gloffset_NewList, parameters)

+#define GET_NewList(disp) GET_by_offset(disp, _gloffset_NewList)

+#define SET_NewList(disp, fn) SET_by_offset(disp, _gloffset_NewList, fn)

+#define CALL_EndList(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_EndList, parameters)

+#define GET_EndList(disp) GET_by_offset(disp, _gloffset_EndList)

+#define SET_EndList(disp, fn) SET_by_offset(disp, _gloffset_EndList, fn)

+#define CALL_CallList(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_CallList, parameters)

+#define GET_CallList(disp) GET_by_offset(disp, _gloffset_CallList)

+#define SET_CallList(disp, fn) SET_by_offset(disp, _gloffset_CallList, fn)

+#define CALL_CallLists(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLenum, const GLvoid *)), _gloffset_CallLists, parameters)

+#define GET_CallLists(disp) GET_by_offset(disp, _gloffset_CallLists)

+#define SET_CallLists(disp, fn) SET_by_offset(disp, _gloffset_CallLists, fn)

+#define CALL_DeleteLists(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei)), _gloffset_DeleteLists, parameters)

+#define GET_DeleteLists(disp) GET_by_offset(disp, _gloffset_DeleteLists)

+#define SET_DeleteLists(disp, fn) SET_by_offset(disp, _gloffset_DeleteLists, fn)

+#define CALL_GenLists(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(GLsizei)), _gloffset_GenLists, parameters)

+#define GET_GenLists(disp) GET_by_offset(disp, _gloffset_GenLists)

+#define SET_GenLists(disp, fn) SET_by_offset(disp, _gloffset_GenLists, fn)

+#define CALL_ListBase(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_ListBase, parameters)

+#define GET_ListBase(disp) GET_by_offset(disp, _gloffset_ListBase)

+#define SET_ListBase(disp, fn) SET_by_offset(disp, _gloffset_ListBase, fn)

+#define CALL_Begin(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_Begin, parameters)

+#define GET_Begin(disp) GET_by_offset(disp, _gloffset_Begin)

+#define SET_Begin(disp, fn) SET_by_offset(disp, _gloffset_Begin, fn)

+#define CALL_Bitmap(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *)), _gloffset_Bitmap, parameters)

+#define GET_Bitmap(disp) GET_by_offset(disp, _gloffset_Bitmap)

+#define SET_Bitmap(disp, fn) SET_by_offset(disp, _gloffset_Bitmap, fn)

+#define CALL_Color3b(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbyte, GLbyte, GLbyte)), _gloffset_Color3b, parameters)

+#define GET_Color3b(disp) GET_by_offset(disp, _gloffset_Color3b)

+#define SET_Color3b(disp, fn) SET_by_offset(disp, _gloffset_Color3b, fn)

+#define CALL_Color3bv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLbyte *)), _gloffset_Color3bv, parameters)

+#define GET_Color3bv(disp) GET_by_offset(disp, _gloffset_Color3bv)

+#define SET_Color3bv(disp, fn) SET_by_offset(disp, _gloffset_Color3bv, fn)

+#define CALL_Color3d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_Color3d, parameters)

+#define GET_Color3d(disp) GET_by_offset(disp, _gloffset_Color3d)

+#define SET_Color3d(disp, fn) SET_by_offset(disp, _gloffset_Color3d, fn)

+#define CALL_Color3dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Color3dv, parameters)

+#define GET_Color3dv(disp) GET_by_offset(disp, _gloffset_Color3dv)

+#define SET_Color3dv(disp, fn) SET_by_offset(disp, _gloffset_Color3dv, fn)

+#define CALL_Color3f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_Color3f, parameters)

+#define GET_Color3f(disp) GET_by_offset(disp, _gloffset_Color3f)

+#define SET_Color3f(disp, fn) SET_by_offset(disp, _gloffset_Color3f, fn)

+#define CALL_Color3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Color3fv, parameters)

+#define GET_Color3fv(disp) GET_by_offset(disp, _gloffset_Color3fv)

+#define SET_Color3fv(disp, fn) SET_by_offset(disp, _gloffset_Color3fv, fn)

+#define CALL_Color3i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_Color3i, parameters)

+#define GET_Color3i(disp) GET_by_offset(disp, _gloffset_Color3i)

+#define SET_Color3i(disp, fn) SET_by_offset(disp, _gloffset_Color3i, fn)

+#define CALL_Color3iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Color3iv, parameters)

+#define GET_Color3iv(disp) GET_by_offset(disp, _gloffset_Color3iv)

+#define SET_Color3iv(disp, fn) SET_by_offset(disp, _gloffset_Color3iv, fn)

+#define CALL_Color3s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_Color3s, parameters)

+#define GET_Color3s(disp) GET_by_offset(disp, _gloffset_Color3s)

+#define SET_Color3s(disp, fn) SET_by_offset(disp, _gloffset_Color3s, fn)

+#define CALL_Color3sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Color3sv, parameters)

+#define GET_Color3sv(disp) GET_by_offset(disp, _gloffset_Color3sv)

+#define SET_Color3sv(disp, fn) SET_by_offset(disp, _gloffset_Color3sv, fn)

+#define CALL_Color3ub(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLubyte, GLubyte, GLubyte)), _gloffset_Color3ub, parameters)

+#define GET_Color3ub(disp) GET_by_offset(disp, _gloffset_Color3ub)

+#define SET_Color3ub(disp, fn) SET_by_offset(disp, _gloffset_Color3ub, fn)

+#define CALL_Color3ubv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLubyte *)), _gloffset_Color3ubv, parameters)

+#define GET_Color3ubv(disp) GET_by_offset(disp, _gloffset_Color3ubv)

+#define SET_Color3ubv(disp, fn) SET_by_offset(disp, _gloffset_Color3ubv, fn)

+#define CALL_Color3ui(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint)), _gloffset_Color3ui, parameters)

+#define GET_Color3ui(disp) GET_by_offset(disp, _gloffset_Color3ui)

+#define SET_Color3ui(disp, fn) SET_by_offset(disp, _gloffset_Color3ui, fn)

+#define CALL_Color3uiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLuint *)), _gloffset_Color3uiv, parameters)

+#define GET_Color3uiv(disp) GET_by_offset(disp, _gloffset_Color3uiv)

+#define SET_Color3uiv(disp, fn) SET_by_offset(disp, _gloffset_Color3uiv, fn)

+#define CALL_Color3us(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLushort, GLushort, GLushort)), _gloffset_Color3us, parameters)

+#define GET_Color3us(disp) GET_by_offset(disp, _gloffset_Color3us)

+#define SET_Color3us(disp, fn) SET_by_offset(disp, _gloffset_Color3us, fn)

+#define CALL_Color3usv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLushort *)), _gloffset_Color3usv, parameters)

+#define GET_Color3usv(disp) GET_by_offset(disp, _gloffset_Color3usv)

+#define SET_Color3usv(disp, fn) SET_by_offset(disp, _gloffset_Color3usv, fn)

+#define CALL_Color4b(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbyte, GLbyte, GLbyte, GLbyte)), _gloffset_Color4b, parameters)

+#define GET_Color4b(disp) GET_by_offset(disp, _gloffset_Color4b)

+#define SET_Color4b(disp, fn) SET_by_offset(disp, _gloffset_Color4b, fn)

+#define CALL_Color4bv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLbyte *)), _gloffset_Color4bv, parameters)

+#define GET_Color4bv(disp) GET_by_offset(disp, _gloffset_Color4bv)

+#define SET_Color4bv(disp, fn) SET_by_offset(disp, _gloffset_Color4bv, fn)

+#define CALL_Color4d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_Color4d, parameters)

+#define GET_Color4d(disp) GET_by_offset(disp, _gloffset_Color4d)

+#define SET_Color4d(disp, fn) SET_by_offset(disp, _gloffset_Color4d, fn)

+#define CALL_Color4dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Color4dv, parameters)

+#define GET_Color4dv(disp) GET_by_offset(disp, _gloffset_Color4dv)

+#define SET_Color4dv(disp, fn) SET_by_offset(disp, _gloffset_Color4dv, fn)

+#define CALL_Color4f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_Color4f, parameters)

+#define GET_Color4f(disp) GET_by_offset(disp, _gloffset_Color4f)

+#define SET_Color4f(disp, fn) SET_by_offset(disp, _gloffset_Color4f, fn)

+#define CALL_Color4fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Color4fv, parameters)

+#define GET_Color4fv(disp) GET_by_offset(disp, _gloffset_Color4fv)

+#define SET_Color4fv(disp, fn) SET_by_offset(disp, _gloffset_Color4fv, fn)

+#define CALL_Color4i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_Color4i, parameters)

+#define GET_Color4i(disp) GET_by_offset(disp, _gloffset_Color4i)

+#define SET_Color4i(disp, fn) SET_by_offset(disp, _gloffset_Color4i, fn)

+#define CALL_Color4iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Color4iv, parameters)

+#define GET_Color4iv(disp) GET_by_offset(disp, _gloffset_Color4iv)

+#define SET_Color4iv(disp, fn) SET_by_offset(disp, _gloffset_Color4iv, fn)

+#define CALL_Color4s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort, GLshort)), _gloffset_Color4s, parameters)

+#define GET_Color4s(disp) GET_by_offset(disp, _gloffset_Color4s)

+#define SET_Color4s(disp, fn) SET_by_offset(disp, _gloffset_Color4s, fn)

+#define CALL_Color4sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Color4sv, parameters)

+#define GET_Color4sv(disp) GET_by_offset(disp, _gloffset_Color4sv)

+#define SET_Color4sv(disp, fn) SET_by_offset(disp, _gloffset_Color4sv, fn)

+#define CALL_Color4ub(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLubyte, GLubyte, GLubyte, GLubyte)), _gloffset_Color4ub, parameters)

+#define GET_Color4ub(disp) GET_by_offset(disp, _gloffset_Color4ub)

+#define SET_Color4ub(disp, fn) SET_by_offset(disp, _gloffset_Color4ub, fn)

+#define CALL_Color4ubv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLubyte *)), _gloffset_Color4ubv, parameters)

+#define GET_Color4ubv(disp) GET_by_offset(disp, _gloffset_Color4ubv)

+#define SET_Color4ubv(disp, fn) SET_by_offset(disp, _gloffset_Color4ubv, fn)

+#define CALL_Color4ui(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint, GLuint)), _gloffset_Color4ui, parameters)

+#define GET_Color4ui(disp) GET_by_offset(disp, _gloffset_Color4ui)

+#define SET_Color4ui(disp, fn) SET_by_offset(disp, _gloffset_Color4ui, fn)

+#define CALL_Color4uiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLuint *)), _gloffset_Color4uiv, parameters)

+#define GET_Color4uiv(disp) GET_by_offset(disp, _gloffset_Color4uiv)

+#define SET_Color4uiv(disp, fn) SET_by_offset(disp, _gloffset_Color4uiv, fn)

+#define CALL_Color4us(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLushort, GLushort, GLushort, GLushort)), _gloffset_Color4us, parameters)

+#define GET_Color4us(disp) GET_by_offset(disp, _gloffset_Color4us)

+#define SET_Color4us(disp, fn) SET_by_offset(disp, _gloffset_Color4us, fn)

+#define CALL_Color4usv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLushort *)), _gloffset_Color4usv, parameters)

+#define GET_Color4usv(disp) GET_by_offset(disp, _gloffset_Color4usv)

+#define SET_Color4usv(disp, fn) SET_by_offset(disp, _gloffset_Color4usv, fn)

+#define CALL_EdgeFlag(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLboolean)), _gloffset_EdgeFlag, parameters)

+#define GET_EdgeFlag(disp) GET_by_offset(disp, _gloffset_EdgeFlag)

+#define SET_EdgeFlag(disp, fn) SET_by_offset(disp, _gloffset_EdgeFlag, fn)

+#define CALL_EdgeFlagv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLboolean *)), _gloffset_EdgeFlagv, parameters)

+#define GET_EdgeFlagv(disp) GET_by_offset(disp, _gloffset_EdgeFlagv)

+#define SET_EdgeFlagv(disp, fn) SET_by_offset(disp, _gloffset_EdgeFlagv, fn)

+#define CALL_End(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_End, parameters)

+#define GET_End(disp) GET_by_offset(disp, _gloffset_End)

+#define SET_End(disp, fn) SET_by_offset(disp, _gloffset_End, fn)

+#define CALL_Indexd(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble)), _gloffset_Indexd, parameters)

+#define GET_Indexd(disp) GET_by_offset(disp, _gloffset_Indexd)

+#define SET_Indexd(disp, fn) SET_by_offset(disp, _gloffset_Indexd, fn)

+#define CALL_Indexdv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Indexdv, parameters)

+#define GET_Indexdv(disp) GET_by_offset(disp, _gloffset_Indexdv)

+#define SET_Indexdv(disp, fn) SET_by_offset(disp, _gloffset_Indexdv, fn)

+#define CALL_Indexf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_Indexf, parameters)

+#define GET_Indexf(disp) GET_by_offset(disp, _gloffset_Indexf)

+#define SET_Indexf(disp, fn) SET_by_offset(disp, _gloffset_Indexf, fn)

+#define CALL_Indexfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Indexfv, parameters)

+#define GET_Indexfv(disp) GET_by_offset(disp, _gloffset_Indexfv)

+#define SET_Indexfv(disp, fn) SET_by_offset(disp, _gloffset_Indexfv, fn)

+#define CALL_Indexi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint)), _gloffset_Indexi, parameters)

+#define GET_Indexi(disp) GET_by_offset(disp, _gloffset_Indexi)

+#define SET_Indexi(disp, fn) SET_by_offset(disp, _gloffset_Indexi, fn)

+#define CALL_Indexiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Indexiv, parameters)

+#define GET_Indexiv(disp) GET_by_offset(disp, _gloffset_Indexiv)

+#define SET_Indexiv(disp, fn) SET_by_offset(disp, _gloffset_Indexiv, fn)

+#define CALL_Indexs(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort)), _gloffset_Indexs, parameters)

+#define GET_Indexs(disp) GET_by_offset(disp, _gloffset_Indexs)

+#define SET_Indexs(disp, fn) SET_by_offset(disp, _gloffset_Indexs, fn)

+#define CALL_Indexsv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Indexsv, parameters)

+#define GET_Indexsv(disp) GET_by_offset(disp, _gloffset_Indexsv)

+#define SET_Indexsv(disp, fn) SET_by_offset(disp, _gloffset_Indexsv, fn)

+#define CALL_Normal3b(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbyte, GLbyte, GLbyte)), _gloffset_Normal3b, parameters)

+#define GET_Normal3b(disp) GET_by_offset(disp, _gloffset_Normal3b)

+#define SET_Normal3b(disp, fn) SET_by_offset(disp, _gloffset_Normal3b, fn)

+#define CALL_Normal3bv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLbyte *)), _gloffset_Normal3bv, parameters)

+#define GET_Normal3bv(disp) GET_by_offset(disp, _gloffset_Normal3bv)

+#define SET_Normal3bv(disp, fn) SET_by_offset(disp, _gloffset_Normal3bv, fn)

+#define CALL_Normal3d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_Normal3d, parameters)

+#define GET_Normal3d(disp) GET_by_offset(disp, _gloffset_Normal3d)

+#define SET_Normal3d(disp, fn) SET_by_offset(disp, _gloffset_Normal3d, fn)

+#define CALL_Normal3dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Normal3dv, parameters)

+#define GET_Normal3dv(disp) GET_by_offset(disp, _gloffset_Normal3dv)

+#define SET_Normal3dv(disp, fn) SET_by_offset(disp, _gloffset_Normal3dv, fn)

+#define CALL_Normal3f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_Normal3f, parameters)

+#define GET_Normal3f(disp) GET_by_offset(disp, _gloffset_Normal3f)

+#define SET_Normal3f(disp, fn) SET_by_offset(disp, _gloffset_Normal3f, fn)

+#define CALL_Normal3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Normal3fv, parameters)

+#define GET_Normal3fv(disp) GET_by_offset(disp, _gloffset_Normal3fv)

+#define SET_Normal3fv(disp, fn) SET_by_offset(disp, _gloffset_Normal3fv, fn)

+#define CALL_Normal3i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_Normal3i, parameters)

+#define GET_Normal3i(disp) GET_by_offset(disp, _gloffset_Normal3i)

+#define SET_Normal3i(disp, fn) SET_by_offset(disp, _gloffset_Normal3i, fn)

+#define CALL_Normal3iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Normal3iv, parameters)

+#define GET_Normal3iv(disp) GET_by_offset(disp, _gloffset_Normal3iv)

+#define SET_Normal3iv(disp, fn) SET_by_offset(disp, _gloffset_Normal3iv, fn)

+#define CALL_Normal3s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_Normal3s, parameters)

+#define GET_Normal3s(disp) GET_by_offset(disp, _gloffset_Normal3s)

+#define SET_Normal3s(disp, fn) SET_by_offset(disp, _gloffset_Normal3s, fn)

+#define CALL_Normal3sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Normal3sv, parameters)

+#define GET_Normal3sv(disp) GET_by_offset(disp, _gloffset_Normal3sv)

+#define SET_Normal3sv(disp, fn) SET_by_offset(disp, _gloffset_Normal3sv, fn)

+#define CALL_RasterPos2d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble)), _gloffset_RasterPos2d, parameters)

+#define GET_RasterPos2d(disp) GET_by_offset(disp, _gloffset_RasterPos2d)

+#define SET_RasterPos2d(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2d, fn)

+#define CALL_RasterPos2dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_RasterPos2dv, parameters)

+#define GET_RasterPos2dv(disp) GET_by_offset(disp, _gloffset_RasterPos2dv)

+#define SET_RasterPos2dv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2dv, fn)

+#define CALL_RasterPos2f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_RasterPos2f, parameters)

+#define GET_RasterPos2f(disp) GET_by_offset(disp, _gloffset_RasterPos2f)

+#define SET_RasterPos2f(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2f, fn)

+#define CALL_RasterPos2fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_RasterPos2fv, parameters)

+#define GET_RasterPos2fv(disp) GET_by_offset(disp, _gloffset_RasterPos2fv)

+#define SET_RasterPos2fv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2fv, fn)

+#define CALL_RasterPos2i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint)), _gloffset_RasterPos2i, parameters)

+#define GET_RasterPos2i(disp) GET_by_offset(disp, _gloffset_RasterPos2i)

+#define SET_RasterPos2i(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2i, fn)

+#define CALL_RasterPos2iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_RasterPos2iv, parameters)

+#define GET_RasterPos2iv(disp) GET_by_offset(disp, _gloffset_RasterPos2iv)

+#define SET_RasterPos2iv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2iv, fn)

+#define CALL_RasterPos2s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort)), _gloffset_RasterPos2s, parameters)

+#define GET_RasterPos2s(disp) GET_by_offset(disp, _gloffset_RasterPos2s)

+#define SET_RasterPos2s(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2s, fn)

+#define CALL_RasterPos2sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_RasterPos2sv, parameters)

+#define GET_RasterPos2sv(disp) GET_by_offset(disp, _gloffset_RasterPos2sv)

+#define SET_RasterPos2sv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos2sv, fn)

+#define CALL_RasterPos3d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_RasterPos3d, parameters)

+#define GET_RasterPos3d(disp) GET_by_offset(disp, _gloffset_RasterPos3d)

+#define SET_RasterPos3d(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3d, fn)

+#define CALL_RasterPos3dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_RasterPos3dv, parameters)

+#define GET_RasterPos3dv(disp) GET_by_offset(disp, _gloffset_RasterPos3dv)

+#define SET_RasterPos3dv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3dv, fn)

+#define CALL_RasterPos3f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_RasterPos3f, parameters)

+#define GET_RasterPos3f(disp) GET_by_offset(disp, _gloffset_RasterPos3f)

+#define SET_RasterPos3f(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3f, fn)

+#define CALL_RasterPos3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_RasterPos3fv, parameters)

+#define GET_RasterPos3fv(disp) GET_by_offset(disp, _gloffset_RasterPos3fv)

+#define SET_RasterPos3fv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3fv, fn)

+#define CALL_RasterPos3i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_RasterPos3i, parameters)

+#define GET_RasterPos3i(disp) GET_by_offset(disp, _gloffset_RasterPos3i)

+#define SET_RasterPos3i(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3i, fn)

+#define CALL_RasterPos3iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_RasterPos3iv, parameters)

+#define GET_RasterPos3iv(disp) GET_by_offset(disp, _gloffset_RasterPos3iv)

+#define SET_RasterPos3iv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3iv, fn)

+#define CALL_RasterPos3s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_RasterPos3s, parameters)

+#define GET_RasterPos3s(disp) GET_by_offset(disp, _gloffset_RasterPos3s)

+#define SET_RasterPos3s(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3s, fn)

+#define CALL_RasterPos3sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_RasterPos3sv, parameters)

+#define GET_RasterPos3sv(disp) GET_by_offset(disp, _gloffset_RasterPos3sv)

+#define SET_RasterPos3sv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos3sv, fn)

+#define CALL_RasterPos4d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_RasterPos4d, parameters)

+#define GET_RasterPos4d(disp) GET_by_offset(disp, _gloffset_RasterPos4d)

+#define SET_RasterPos4d(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4d, fn)

+#define CALL_RasterPos4dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_RasterPos4dv, parameters)

+#define GET_RasterPos4dv(disp) GET_by_offset(disp, _gloffset_RasterPos4dv)

+#define SET_RasterPos4dv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4dv, fn)

+#define CALL_RasterPos4f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_RasterPos4f, parameters)

+#define GET_RasterPos4f(disp) GET_by_offset(disp, _gloffset_RasterPos4f)

+#define SET_RasterPos4f(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4f, fn)

+#define CALL_RasterPos4fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_RasterPos4fv, parameters)

+#define GET_RasterPos4fv(disp) GET_by_offset(disp, _gloffset_RasterPos4fv)

+#define SET_RasterPos4fv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4fv, fn)

+#define CALL_RasterPos4i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_RasterPos4i, parameters)

+#define GET_RasterPos4i(disp) GET_by_offset(disp, _gloffset_RasterPos4i)

+#define SET_RasterPos4i(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4i, fn)

+#define CALL_RasterPos4iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_RasterPos4iv, parameters)

+#define GET_RasterPos4iv(disp) GET_by_offset(disp, _gloffset_RasterPos4iv)

+#define SET_RasterPos4iv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4iv, fn)

+#define CALL_RasterPos4s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort, GLshort)), _gloffset_RasterPos4s, parameters)

+#define GET_RasterPos4s(disp) GET_by_offset(disp, _gloffset_RasterPos4s)

+#define SET_RasterPos4s(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4s, fn)

+#define CALL_RasterPos4sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_RasterPos4sv, parameters)

+#define GET_RasterPos4sv(disp) GET_by_offset(disp, _gloffset_RasterPos4sv)

+#define SET_RasterPos4sv(disp, fn) SET_by_offset(disp, _gloffset_RasterPos4sv, fn)

+#define CALL_Rectd(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_Rectd, parameters)

+#define GET_Rectd(disp) GET_by_offset(disp, _gloffset_Rectd)

+#define SET_Rectd(disp, fn) SET_by_offset(disp, _gloffset_Rectd, fn)

+#define CALL_Rectdv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *, const GLdouble *)), _gloffset_Rectdv, parameters)

+#define GET_Rectdv(disp) GET_by_offset(disp, _gloffset_Rectdv)

+#define SET_Rectdv(disp, fn) SET_by_offset(disp, _gloffset_Rectdv, fn)

+#define CALL_Rectf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_Rectf, parameters)

+#define GET_Rectf(disp) GET_by_offset(disp, _gloffset_Rectf)

+#define SET_Rectf(disp, fn) SET_by_offset(disp, _gloffset_Rectf, fn)

+#define CALL_Rectfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *, const GLfloat *)), _gloffset_Rectfv, parameters)

+#define GET_Rectfv(disp) GET_by_offset(disp, _gloffset_Rectfv)

+#define SET_Rectfv(disp, fn) SET_by_offset(disp, _gloffset_Rectfv, fn)

+#define CALL_Recti(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_Recti, parameters)

+#define GET_Recti(disp) GET_by_offset(disp, _gloffset_Recti)

+#define SET_Recti(disp, fn) SET_by_offset(disp, _gloffset_Recti, fn)

+#define CALL_Rectiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *, const GLint *)), _gloffset_Rectiv, parameters)

+#define GET_Rectiv(disp) GET_by_offset(disp, _gloffset_Rectiv)

+#define SET_Rectiv(disp, fn) SET_by_offset(disp, _gloffset_Rectiv, fn)

+#define CALL_Rects(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort, GLshort)), _gloffset_Rects, parameters)

+#define GET_Rects(disp) GET_by_offset(disp, _gloffset_Rects)

+#define SET_Rects(disp, fn) SET_by_offset(disp, _gloffset_Rects, fn)

+#define CALL_Rectsv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *, const GLshort *)), _gloffset_Rectsv, parameters)

+#define GET_Rectsv(disp) GET_by_offset(disp, _gloffset_Rectsv)

+#define SET_Rectsv(disp, fn) SET_by_offset(disp, _gloffset_Rectsv, fn)

+#define CALL_TexCoord1d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble)), _gloffset_TexCoord1d, parameters)

+#define GET_TexCoord1d(disp) GET_by_offset(disp, _gloffset_TexCoord1d)

+#define SET_TexCoord1d(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1d, fn)

+#define CALL_TexCoord1dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_TexCoord1dv, parameters)

+#define GET_TexCoord1dv(disp) GET_by_offset(disp, _gloffset_TexCoord1dv)

+#define SET_TexCoord1dv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1dv, fn)

+#define CALL_TexCoord1f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_TexCoord1f, parameters)

+#define GET_TexCoord1f(disp) GET_by_offset(disp, _gloffset_TexCoord1f)

+#define SET_TexCoord1f(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1f, fn)

+#define CALL_TexCoord1fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_TexCoord1fv, parameters)

+#define GET_TexCoord1fv(disp) GET_by_offset(disp, _gloffset_TexCoord1fv)

+#define SET_TexCoord1fv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1fv, fn)

+#define CALL_TexCoord1i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint)), _gloffset_TexCoord1i, parameters)

+#define GET_TexCoord1i(disp) GET_by_offset(disp, _gloffset_TexCoord1i)

+#define SET_TexCoord1i(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1i, fn)

+#define CALL_TexCoord1iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_TexCoord1iv, parameters)

+#define GET_TexCoord1iv(disp) GET_by_offset(disp, _gloffset_TexCoord1iv)

+#define SET_TexCoord1iv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1iv, fn)

+#define CALL_TexCoord1s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort)), _gloffset_TexCoord1s, parameters)

+#define GET_TexCoord1s(disp) GET_by_offset(disp, _gloffset_TexCoord1s)

+#define SET_TexCoord1s(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1s, fn)

+#define CALL_TexCoord1sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_TexCoord1sv, parameters)

+#define GET_TexCoord1sv(disp) GET_by_offset(disp, _gloffset_TexCoord1sv)

+#define SET_TexCoord1sv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord1sv, fn)

+#define CALL_TexCoord2d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble)), _gloffset_TexCoord2d, parameters)

+#define GET_TexCoord2d(disp) GET_by_offset(disp, _gloffset_TexCoord2d)

+#define SET_TexCoord2d(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2d, fn)

+#define CALL_TexCoord2dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_TexCoord2dv, parameters)

+#define GET_TexCoord2dv(disp) GET_by_offset(disp, _gloffset_TexCoord2dv)

+#define SET_TexCoord2dv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2dv, fn)

+#define CALL_TexCoord2f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_TexCoord2f, parameters)

+#define GET_TexCoord2f(disp) GET_by_offset(disp, _gloffset_TexCoord2f)

+#define SET_TexCoord2f(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2f, fn)

+#define CALL_TexCoord2fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_TexCoord2fv, parameters)

+#define GET_TexCoord2fv(disp) GET_by_offset(disp, _gloffset_TexCoord2fv)

+#define SET_TexCoord2fv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2fv, fn)

+#define CALL_TexCoord2i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint)), _gloffset_TexCoord2i, parameters)

+#define GET_TexCoord2i(disp) GET_by_offset(disp, _gloffset_TexCoord2i)

+#define SET_TexCoord2i(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2i, fn)

+#define CALL_TexCoord2iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_TexCoord2iv, parameters)

+#define GET_TexCoord2iv(disp) GET_by_offset(disp, _gloffset_TexCoord2iv)

+#define SET_TexCoord2iv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2iv, fn)

+#define CALL_TexCoord2s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort)), _gloffset_TexCoord2s, parameters)

+#define GET_TexCoord2s(disp) GET_by_offset(disp, _gloffset_TexCoord2s)

+#define SET_TexCoord2s(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2s, fn)

+#define CALL_TexCoord2sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_TexCoord2sv, parameters)

+#define GET_TexCoord2sv(disp) GET_by_offset(disp, _gloffset_TexCoord2sv)

+#define SET_TexCoord2sv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord2sv, fn)

+#define CALL_TexCoord3d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_TexCoord3d, parameters)

+#define GET_TexCoord3d(disp) GET_by_offset(disp, _gloffset_TexCoord3d)

+#define SET_TexCoord3d(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3d, fn)

+#define CALL_TexCoord3dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_TexCoord3dv, parameters)

+#define GET_TexCoord3dv(disp) GET_by_offset(disp, _gloffset_TexCoord3dv)

+#define SET_TexCoord3dv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3dv, fn)

+#define CALL_TexCoord3f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_TexCoord3f, parameters)

+#define GET_TexCoord3f(disp) GET_by_offset(disp, _gloffset_TexCoord3f)

+#define SET_TexCoord3f(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3f, fn)

+#define CALL_TexCoord3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_TexCoord3fv, parameters)

+#define GET_TexCoord3fv(disp) GET_by_offset(disp, _gloffset_TexCoord3fv)

+#define SET_TexCoord3fv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3fv, fn)

+#define CALL_TexCoord3i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_TexCoord3i, parameters)

+#define GET_TexCoord3i(disp) GET_by_offset(disp, _gloffset_TexCoord3i)

+#define SET_TexCoord3i(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3i, fn)

+#define CALL_TexCoord3iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_TexCoord3iv, parameters)

+#define GET_TexCoord3iv(disp) GET_by_offset(disp, _gloffset_TexCoord3iv)

+#define SET_TexCoord3iv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3iv, fn)

+#define CALL_TexCoord3s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_TexCoord3s, parameters)

+#define GET_TexCoord3s(disp) GET_by_offset(disp, _gloffset_TexCoord3s)

+#define SET_TexCoord3s(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3s, fn)

+#define CALL_TexCoord3sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_TexCoord3sv, parameters)

+#define GET_TexCoord3sv(disp) GET_by_offset(disp, _gloffset_TexCoord3sv)

+#define SET_TexCoord3sv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord3sv, fn)

+#define CALL_TexCoord4d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_TexCoord4d, parameters)

+#define GET_TexCoord4d(disp) GET_by_offset(disp, _gloffset_TexCoord4d)

+#define SET_TexCoord4d(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4d, fn)

+#define CALL_TexCoord4dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_TexCoord4dv, parameters)

+#define GET_TexCoord4dv(disp) GET_by_offset(disp, _gloffset_TexCoord4dv)

+#define SET_TexCoord4dv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4dv, fn)

+#define CALL_TexCoord4f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_TexCoord4f, parameters)

+#define GET_TexCoord4f(disp) GET_by_offset(disp, _gloffset_TexCoord4f)

+#define SET_TexCoord4f(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4f, fn)

+#define CALL_TexCoord4fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_TexCoord4fv, parameters)

+#define GET_TexCoord4fv(disp) GET_by_offset(disp, _gloffset_TexCoord4fv)

+#define SET_TexCoord4fv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4fv, fn)

+#define CALL_TexCoord4i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_TexCoord4i, parameters)

+#define GET_TexCoord4i(disp) GET_by_offset(disp, _gloffset_TexCoord4i)

+#define SET_TexCoord4i(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4i, fn)

+#define CALL_TexCoord4iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_TexCoord4iv, parameters)

+#define GET_TexCoord4iv(disp) GET_by_offset(disp, _gloffset_TexCoord4iv)

+#define SET_TexCoord4iv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4iv, fn)

+#define CALL_TexCoord4s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort, GLshort)), _gloffset_TexCoord4s, parameters)

+#define GET_TexCoord4s(disp) GET_by_offset(disp, _gloffset_TexCoord4s)

+#define SET_TexCoord4s(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4s, fn)

+#define CALL_TexCoord4sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_TexCoord4sv, parameters)

+#define GET_TexCoord4sv(disp) GET_by_offset(disp, _gloffset_TexCoord4sv)

+#define SET_TexCoord4sv(disp, fn) SET_by_offset(disp, _gloffset_TexCoord4sv, fn)

+#define CALL_Vertex2d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble)), _gloffset_Vertex2d, parameters)

+#define GET_Vertex2d(disp) GET_by_offset(disp, _gloffset_Vertex2d)

+#define SET_Vertex2d(disp, fn) SET_by_offset(disp, _gloffset_Vertex2d, fn)

+#define CALL_Vertex2dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Vertex2dv, parameters)

+#define GET_Vertex2dv(disp) GET_by_offset(disp, _gloffset_Vertex2dv)

+#define SET_Vertex2dv(disp, fn) SET_by_offset(disp, _gloffset_Vertex2dv, fn)

+#define CALL_Vertex2f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_Vertex2f, parameters)

+#define GET_Vertex2f(disp) GET_by_offset(disp, _gloffset_Vertex2f)

+#define SET_Vertex2f(disp, fn) SET_by_offset(disp, _gloffset_Vertex2f, fn)

+#define CALL_Vertex2fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Vertex2fv, parameters)

+#define GET_Vertex2fv(disp) GET_by_offset(disp, _gloffset_Vertex2fv)

+#define SET_Vertex2fv(disp, fn) SET_by_offset(disp, _gloffset_Vertex2fv, fn)

+#define CALL_Vertex2i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint)), _gloffset_Vertex2i, parameters)

+#define GET_Vertex2i(disp) GET_by_offset(disp, _gloffset_Vertex2i)

+#define SET_Vertex2i(disp, fn) SET_by_offset(disp, _gloffset_Vertex2i, fn)

+#define CALL_Vertex2iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Vertex2iv, parameters)

+#define GET_Vertex2iv(disp) GET_by_offset(disp, _gloffset_Vertex2iv)

+#define SET_Vertex2iv(disp, fn) SET_by_offset(disp, _gloffset_Vertex2iv, fn)

+#define CALL_Vertex2s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort)), _gloffset_Vertex2s, parameters)

+#define GET_Vertex2s(disp) GET_by_offset(disp, _gloffset_Vertex2s)

+#define SET_Vertex2s(disp, fn) SET_by_offset(disp, _gloffset_Vertex2s, fn)

+#define CALL_Vertex2sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Vertex2sv, parameters)

+#define GET_Vertex2sv(disp) GET_by_offset(disp, _gloffset_Vertex2sv)

+#define SET_Vertex2sv(disp, fn) SET_by_offset(disp, _gloffset_Vertex2sv, fn)

+#define CALL_Vertex3d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_Vertex3d, parameters)

+#define GET_Vertex3d(disp) GET_by_offset(disp, _gloffset_Vertex3d)

+#define SET_Vertex3d(disp, fn) SET_by_offset(disp, _gloffset_Vertex3d, fn)

+#define CALL_Vertex3dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Vertex3dv, parameters)

+#define GET_Vertex3dv(disp) GET_by_offset(disp, _gloffset_Vertex3dv)

+#define SET_Vertex3dv(disp, fn) SET_by_offset(disp, _gloffset_Vertex3dv, fn)

+#define CALL_Vertex3f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_Vertex3f, parameters)

+#define GET_Vertex3f(disp) GET_by_offset(disp, _gloffset_Vertex3f)

+#define SET_Vertex3f(disp, fn) SET_by_offset(disp, _gloffset_Vertex3f, fn)

+#define CALL_Vertex3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Vertex3fv, parameters)

+#define GET_Vertex3fv(disp) GET_by_offset(disp, _gloffset_Vertex3fv)

+#define SET_Vertex3fv(disp, fn) SET_by_offset(disp, _gloffset_Vertex3fv, fn)

+#define CALL_Vertex3i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_Vertex3i, parameters)

+#define GET_Vertex3i(disp) GET_by_offset(disp, _gloffset_Vertex3i)

+#define SET_Vertex3i(disp, fn) SET_by_offset(disp, _gloffset_Vertex3i, fn)

+#define CALL_Vertex3iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Vertex3iv, parameters)

+#define GET_Vertex3iv(disp) GET_by_offset(disp, _gloffset_Vertex3iv)

+#define SET_Vertex3iv(disp, fn) SET_by_offset(disp, _gloffset_Vertex3iv, fn)

+#define CALL_Vertex3s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_Vertex3s, parameters)

+#define GET_Vertex3s(disp) GET_by_offset(disp, _gloffset_Vertex3s)

+#define SET_Vertex3s(disp, fn) SET_by_offset(disp, _gloffset_Vertex3s, fn)

+#define CALL_Vertex3sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Vertex3sv, parameters)

+#define GET_Vertex3sv(disp) GET_by_offset(disp, _gloffset_Vertex3sv)

+#define SET_Vertex3sv(disp, fn) SET_by_offset(disp, _gloffset_Vertex3sv, fn)

+#define CALL_Vertex4d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_Vertex4d, parameters)

+#define GET_Vertex4d(disp) GET_by_offset(disp, _gloffset_Vertex4d)

+#define SET_Vertex4d(disp, fn) SET_by_offset(disp, _gloffset_Vertex4d, fn)

+#define CALL_Vertex4dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_Vertex4dv, parameters)

+#define GET_Vertex4dv(disp) GET_by_offset(disp, _gloffset_Vertex4dv)

+#define SET_Vertex4dv(disp, fn) SET_by_offset(disp, _gloffset_Vertex4dv, fn)

+#define CALL_Vertex4f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_Vertex4f, parameters)

+#define GET_Vertex4f(disp) GET_by_offset(disp, _gloffset_Vertex4f)

+#define SET_Vertex4f(disp, fn) SET_by_offset(disp, _gloffset_Vertex4f, fn)

+#define CALL_Vertex4fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_Vertex4fv, parameters)

+#define GET_Vertex4fv(disp) GET_by_offset(disp, _gloffset_Vertex4fv)

+#define SET_Vertex4fv(disp, fn) SET_by_offset(disp, _gloffset_Vertex4fv, fn)

+#define CALL_Vertex4i(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_Vertex4i, parameters)

+#define GET_Vertex4i(disp) GET_by_offset(disp, _gloffset_Vertex4i)

+#define SET_Vertex4i(disp, fn) SET_by_offset(disp, _gloffset_Vertex4i, fn)

+#define CALL_Vertex4iv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_Vertex4iv, parameters)

+#define GET_Vertex4iv(disp) GET_by_offset(disp, _gloffset_Vertex4iv)

+#define SET_Vertex4iv(disp, fn) SET_by_offset(disp, _gloffset_Vertex4iv, fn)

+#define CALL_Vertex4s(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort, GLshort)), _gloffset_Vertex4s, parameters)

+#define GET_Vertex4s(disp) GET_by_offset(disp, _gloffset_Vertex4s)

+#define SET_Vertex4s(disp, fn) SET_by_offset(disp, _gloffset_Vertex4s, fn)

+#define CALL_Vertex4sv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_Vertex4sv, parameters)

+#define GET_Vertex4sv(disp) GET_by_offset(disp, _gloffset_Vertex4sv)

+#define SET_Vertex4sv(disp, fn) SET_by_offset(disp, _gloffset_Vertex4sv, fn)

+#define CALL_ClipPlane(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLdouble *)), _gloffset_ClipPlane, parameters)

+#define GET_ClipPlane(disp) GET_by_offset(disp, _gloffset_ClipPlane)

+#define SET_ClipPlane(disp, fn) SET_by_offset(disp, _gloffset_ClipPlane, fn)

+#define CALL_ColorMaterial(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_ColorMaterial, parameters)

+#define GET_ColorMaterial(disp) GET_by_offset(disp, _gloffset_ColorMaterial)

+#define SET_ColorMaterial(disp, fn) SET_by_offset(disp, _gloffset_ColorMaterial, fn)

+#define CALL_CullFace(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_CullFace, parameters)

+#define GET_CullFace(disp) GET_by_offset(disp, _gloffset_CullFace)

+#define SET_CullFace(disp, fn) SET_by_offset(disp, _gloffset_CullFace, fn)

+#define CALL_Fogf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_Fogf, parameters)

+#define GET_Fogf(disp) GET_by_offset(disp, _gloffset_Fogf)

+#define SET_Fogf(disp, fn) SET_by_offset(disp, _gloffset_Fogf, fn)

+#define CALL_Fogfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_Fogfv, parameters)

+#define GET_Fogfv(disp) GET_by_offset(disp, _gloffset_Fogfv)

+#define SET_Fogfv(disp, fn) SET_by_offset(disp, _gloffset_Fogfv, fn)

+#define CALL_Fogi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_Fogi, parameters)

+#define GET_Fogi(disp) GET_by_offset(disp, _gloffset_Fogi)

+#define SET_Fogi(disp, fn) SET_by_offset(disp, _gloffset_Fogi, fn)

+#define CALL_Fogiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_Fogiv, parameters)

+#define GET_Fogiv(disp) GET_by_offset(disp, _gloffset_Fogiv)

+#define SET_Fogiv(disp, fn) SET_by_offset(disp, _gloffset_Fogiv, fn)

+#define CALL_FrontFace(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_FrontFace, parameters)

+#define GET_FrontFace(disp) GET_by_offset(disp, _gloffset_FrontFace)

+#define SET_FrontFace(disp, fn) SET_by_offset(disp, _gloffset_FrontFace, fn)

+#define CALL_Hint(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_Hint, parameters)

+#define GET_Hint(disp) GET_by_offset(disp, _gloffset_Hint)

+#define SET_Hint(disp, fn) SET_by_offset(disp, _gloffset_Hint, fn)

+#define CALL_Lightf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat)), _gloffset_Lightf, parameters)

+#define GET_Lightf(disp) GET_by_offset(disp, _gloffset_Lightf)

+#define SET_Lightf(disp, fn) SET_by_offset(disp, _gloffset_Lightf, fn)

+#define CALL_Lightfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_Lightfv, parameters)

+#define GET_Lightfv(disp) GET_by_offset(disp, _gloffset_Lightfv)

+#define SET_Lightfv(disp, fn) SET_by_offset(disp, _gloffset_Lightfv, fn)

+#define CALL_Lighti(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_Lighti, parameters)

+#define GET_Lighti(disp) GET_by_offset(disp, _gloffset_Lighti)

+#define SET_Lighti(disp, fn) SET_by_offset(disp, _gloffset_Lighti, fn)

+#define CALL_Lightiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_Lightiv, parameters)

+#define GET_Lightiv(disp) GET_by_offset(disp, _gloffset_Lightiv)

+#define SET_Lightiv(disp, fn) SET_by_offset(disp, _gloffset_Lightiv, fn)

+#define CALL_LightModelf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_LightModelf, parameters)

+#define GET_LightModelf(disp) GET_by_offset(disp, _gloffset_LightModelf)

+#define SET_LightModelf(disp, fn) SET_by_offset(disp, _gloffset_LightModelf, fn)

+#define CALL_LightModelfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_LightModelfv, parameters)

+#define GET_LightModelfv(disp) GET_by_offset(disp, _gloffset_LightModelfv)

+#define SET_LightModelfv(disp, fn) SET_by_offset(disp, _gloffset_LightModelfv, fn)

+#define CALL_LightModeli(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_LightModeli, parameters)

+#define GET_LightModeli(disp) GET_by_offset(disp, _gloffset_LightModeli)

+#define SET_LightModeli(disp, fn) SET_by_offset(disp, _gloffset_LightModeli, fn)

+#define CALL_LightModeliv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_LightModeliv, parameters)

+#define GET_LightModeliv(disp) GET_by_offset(disp, _gloffset_LightModeliv)

+#define SET_LightModeliv(disp, fn) SET_by_offset(disp, _gloffset_LightModeliv, fn)

+#define CALL_LineStipple(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLushort)), _gloffset_LineStipple, parameters)

+#define GET_LineStipple(disp) GET_by_offset(disp, _gloffset_LineStipple)

+#define SET_LineStipple(disp, fn) SET_by_offset(disp, _gloffset_LineStipple, fn)

+#define CALL_LineWidth(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_LineWidth, parameters)

+#define GET_LineWidth(disp) GET_by_offset(disp, _gloffset_LineWidth)

+#define SET_LineWidth(disp, fn) SET_by_offset(disp, _gloffset_LineWidth, fn)

+#define CALL_Materialf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat)), _gloffset_Materialf, parameters)

+#define GET_Materialf(disp) GET_by_offset(disp, _gloffset_Materialf)

+#define SET_Materialf(disp, fn) SET_by_offset(disp, _gloffset_Materialf, fn)

+#define CALL_Materialfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_Materialfv, parameters)

+#define GET_Materialfv(disp) GET_by_offset(disp, _gloffset_Materialfv)

+#define SET_Materialfv(disp, fn) SET_by_offset(disp, _gloffset_Materialfv, fn)

+#define CALL_Materiali(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_Materiali, parameters)

+#define GET_Materiali(disp) GET_by_offset(disp, _gloffset_Materiali)

+#define SET_Materiali(disp, fn) SET_by_offset(disp, _gloffset_Materiali, fn)

+#define CALL_Materialiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_Materialiv, parameters)

+#define GET_Materialiv(disp) GET_by_offset(disp, _gloffset_Materialiv)

+#define SET_Materialiv(disp, fn) SET_by_offset(disp, _gloffset_Materialiv, fn)

+#define CALL_PointSize(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_PointSize, parameters)

+#define GET_PointSize(disp) GET_by_offset(disp, _gloffset_PointSize)

+#define SET_PointSize(disp, fn) SET_by_offset(disp, _gloffset_PointSize, fn)

+#define CALL_PolygonMode(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_PolygonMode, parameters)

+#define GET_PolygonMode(disp) GET_by_offset(disp, _gloffset_PolygonMode)

+#define SET_PolygonMode(disp, fn) SET_by_offset(disp, _gloffset_PolygonMode, fn)

+#define CALL_PolygonStipple(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLubyte *)), _gloffset_PolygonStipple, parameters)

+#define GET_PolygonStipple(disp) GET_by_offset(disp, _gloffset_PolygonStipple)

+#define SET_PolygonStipple(disp, fn) SET_by_offset(disp, _gloffset_PolygonStipple, fn)

+#define CALL_Scissor(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLsizei, GLsizei)), _gloffset_Scissor, parameters)

+#define GET_Scissor(disp) GET_by_offset(disp, _gloffset_Scissor)

+#define SET_Scissor(disp, fn) SET_by_offset(disp, _gloffset_Scissor, fn)

+#define CALL_ShadeModel(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ShadeModel, parameters)

+#define GET_ShadeModel(disp) GET_by_offset(disp, _gloffset_ShadeModel)

+#define SET_ShadeModel(disp, fn) SET_by_offset(disp, _gloffset_ShadeModel, fn)

+#define CALL_TexParameterf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat)), _gloffset_TexParameterf, parameters)

+#define GET_TexParameterf(disp) GET_by_offset(disp, _gloffset_TexParameterf)

+#define SET_TexParameterf(disp, fn) SET_by_offset(disp, _gloffset_TexParameterf, fn)

+#define CALL_TexParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_TexParameterfv, parameters)

+#define GET_TexParameterfv(disp) GET_by_offset(disp, _gloffset_TexParameterfv)

+#define SET_TexParameterfv(disp, fn) SET_by_offset(disp, _gloffset_TexParameterfv, fn)

+#define CALL_TexParameteri(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_TexParameteri, parameters)

+#define GET_TexParameteri(disp) GET_by_offset(disp, _gloffset_TexParameteri)

+#define SET_TexParameteri(disp, fn) SET_by_offset(disp, _gloffset_TexParameteri, fn)

+#define CALL_TexParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_TexParameteriv, parameters)

+#define GET_TexParameteriv(disp) GET_by_offset(disp, _gloffset_TexParameteriv)

+#define SET_TexParameteriv(disp, fn) SET_by_offset(disp, _gloffset_TexParameteriv, fn)

+#define CALL_TexImage1D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *)), _gloffset_TexImage1D, parameters)

+#define GET_TexImage1D(disp) GET_by_offset(disp, _gloffset_TexImage1D)

+#define SET_TexImage1D(disp, fn) SET_by_offset(disp, _gloffset_TexImage1D, fn)

+#define CALL_TexImage2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)), _gloffset_TexImage2D, parameters)

+#define GET_TexImage2D(disp) GET_by_offset(disp, _gloffset_TexImage2D)

+#define SET_TexImage2D(disp, fn) SET_by_offset(disp, _gloffset_TexImage2D, fn)

+#define CALL_TexEnvf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat)), _gloffset_TexEnvf, parameters)

+#define GET_TexEnvf(disp) GET_by_offset(disp, _gloffset_TexEnvf)

+#define SET_TexEnvf(disp, fn) SET_by_offset(disp, _gloffset_TexEnvf, fn)

+#define CALL_TexEnvfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_TexEnvfv, parameters)

+#define GET_TexEnvfv(disp) GET_by_offset(disp, _gloffset_TexEnvfv)

+#define SET_TexEnvfv(disp, fn) SET_by_offset(disp, _gloffset_TexEnvfv, fn)

+#define CALL_TexEnvi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_TexEnvi, parameters)

+#define GET_TexEnvi(disp) GET_by_offset(disp, _gloffset_TexEnvi)

+#define SET_TexEnvi(disp, fn) SET_by_offset(disp, _gloffset_TexEnvi, fn)

+#define CALL_TexEnviv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_TexEnviv, parameters)

+#define GET_TexEnviv(disp) GET_by_offset(disp, _gloffset_TexEnviv)

+#define SET_TexEnviv(disp, fn) SET_by_offset(disp, _gloffset_TexEnviv, fn)

+#define CALL_TexGend(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLdouble)), _gloffset_TexGend, parameters)

+#define GET_TexGend(disp) GET_by_offset(disp, _gloffset_TexGend)

+#define SET_TexGend(disp, fn) SET_by_offset(disp, _gloffset_TexGend, fn)

+#define CALL_TexGendv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLdouble *)), _gloffset_TexGendv, parameters)

+#define GET_TexGendv(disp) GET_by_offset(disp, _gloffset_TexGendv)

+#define SET_TexGendv(disp, fn) SET_by_offset(disp, _gloffset_TexGendv, fn)

+#define CALL_TexGenf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat)), _gloffset_TexGenf, parameters)

+#define GET_TexGenf(disp) GET_by_offset(disp, _gloffset_TexGenf)

+#define SET_TexGenf(disp, fn) SET_by_offset(disp, _gloffset_TexGenf, fn)

+#define CALL_TexGenfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_TexGenfv, parameters)

+#define GET_TexGenfv(disp) GET_by_offset(disp, _gloffset_TexGenfv)

+#define SET_TexGenfv(disp, fn) SET_by_offset(disp, _gloffset_TexGenfv, fn)

+#define CALL_TexGeni(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_TexGeni, parameters)

+#define GET_TexGeni(disp) GET_by_offset(disp, _gloffset_TexGeni)

+#define SET_TexGeni(disp, fn) SET_by_offset(disp, _gloffset_TexGeni, fn)

+#define CALL_TexGeniv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_TexGeniv, parameters)

+#define GET_TexGeniv(disp) GET_by_offset(disp, _gloffset_TexGeniv)

+#define SET_TexGeniv(disp, fn) SET_by_offset(disp, _gloffset_TexGeniv, fn)

+#define CALL_FeedbackBuffer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLenum, GLfloat *)), _gloffset_FeedbackBuffer, parameters)

+#define GET_FeedbackBuffer(disp) GET_by_offset(disp, _gloffset_FeedbackBuffer)

+#define SET_FeedbackBuffer(disp, fn) SET_by_offset(disp, _gloffset_FeedbackBuffer, fn)

+#define CALL_SelectBuffer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_SelectBuffer, parameters)

+#define GET_SelectBuffer(disp) GET_by_offset(disp, _gloffset_SelectBuffer)

+#define SET_SelectBuffer(disp, fn) SET_by_offset(disp, _gloffset_SelectBuffer, fn)

+#define CALL_RenderMode(disp, parameters) CALL_by_offset(disp, (GLint (GLAPIENTRYP)(GLenum)), _gloffset_RenderMode, parameters)

+#define GET_RenderMode(disp) GET_by_offset(disp, _gloffset_RenderMode)

+#define SET_RenderMode(disp, fn) SET_by_offset(disp, _gloffset_RenderMode, fn)

+#define CALL_InitNames(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_InitNames, parameters)

+#define GET_InitNames(disp) GET_by_offset(disp, _gloffset_InitNames)

+#define SET_InitNames(disp, fn) SET_by_offset(disp, _gloffset_InitNames, fn)

+#define CALL_LoadName(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_LoadName, parameters)

+#define GET_LoadName(disp) GET_by_offset(disp, _gloffset_LoadName)

+#define SET_LoadName(disp, fn) SET_by_offset(disp, _gloffset_LoadName, fn)

+#define CALL_PassThrough(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_PassThrough, parameters)

+#define GET_PassThrough(disp) GET_by_offset(disp, _gloffset_PassThrough)

+#define SET_PassThrough(disp, fn) SET_by_offset(disp, _gloffset_PassThrough, fn)

+#define CALL_PopName(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PopName, parameters)

+#define GET_PopName(disp) GET_by_offset(disp, _gloffset_PopName)

+#define SET_PopName(disp, fn) SET_by_offset(disp, _gloffset_PopName, fn)

+#define CALL_PushName(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_PushName, parameters)

+#define GET_PushName(disp) GET_by_offset(disp, _gloffset_PushName)

+#define SET_PushName(disp, fn) SET_by_offset(disp, _gloffset_PushName, fn)

+#define CALL_DrawBuffer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_DrawBuffer, parameters)

+#define GET_DrawBuffer(disp) GET_by_offset(disp, _gloffset_DrawBuffer)

+#define SET_DrawBuffer(disp, fn) SET_by_offset(disp, _gloffset_DrawBuffer, fn)

+#define CALL_Clear(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbitfield)), _gloffset_Clear, parameters)

+#define GET_Clear(disp) GET_by_offset(disp, _gloffset_Clear)

+#define SET_Clear(disp, fn) SET_by_offset(disp, _gloffset_Clear, fn)

+#define CALL_ClearAccum(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_ClearAccum, parameters)

+#define GET_ClearAccum(disp) GET_by_offset(disp, _gloffset_ClearAccum)

+#define SET_ClearAccum(disp, fn) SET_by_offset(disp, _gloffset_ClearAccum, fn)

+#define CALL_ClearIndex(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_ClearIndex, parameters)

+#define GET_ClearIndex(disp) GET_by_offset(disp, _gloffset_ClearIndex)

+#define SET_ClearIndex(disp, fn) SET_by_offset(disp, _gloffset_ClearIndex, fn)

+#define CALL_ClearColor(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampf, GLclampf, GLclampf, GLclampf)), _gloffset_ClearColor, parameters)

+#define GET_ClearColor(disp) GET_by_offset(disp, _gloffset_ClearColor)

+#define SET_ClearColor(disp, fn) SET_by_offset(disp, _gloffset_ClearColor, fn)

+#define CALL_ClearStencil(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint)), _gloffset_ClearStencil, parameters)

+#define GET_ClearStencil(disp) GET_by_offset(disp, _gloffset_ClearStencil)

+#define SET_ClearStencil(disp, fn) SET_by_offset(disp, _gloffset_ClearStencil, fn)

+#define CALL_ClearDepth(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampd)), _gloffset_ClearDepth, parameters)

+#define GET_ClearDepth(disp) GET_by_offset(disp, _gloffset_ClearDepth)

+#define SET_ClearDepth(disp, fn) SET_by_offset(disp, _gloffset_ClearDepth, fn)

+#define CALL_StencilMask(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_StencilMask, parameters)

+#define GET_StencilMask(disp) GET_by_offset(disp, _gloffset_StencilMask)

+#define SET_StencilMask(disp, fn) SET_by_offset(disp, _gloffset_StencilMask, fn)

+#define CALL_ColorMask(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLboolean, GLboolean, GLboolean, GLboolean)), _gloffset_ColorMask, parameters)

+#define GET_ColorMask(disp) GET_by_offset(disp, _gloffset_ColorMask)

+#define SET_ColorMask(disp, fn) SET_by_offset(disp, _gloffset_ColorMask, fn)

+#define CALL_DepthMask(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLboolean)), _gloffset_DepthMask, parameters)

+#define GET_DepthMask(disp) GET_by_offset(disp, _gloffset_DepthMask)

+#define SET_DepthMask(disp, fn) SET_by_offset(disp, _gloffset_DepthMask, fn)

+#define CALL_IndexMask(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_IndexMask, parameters)

+#define GET_IndexMask(disp) GET_by_offset(disp, _gloffset_IndexMask)

+#define SET_IndexMask(disp, fn) SET_by_offset(disp, _gloffset_IndexMask, fn)

+#define CALL_Accum(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_Accum, parameters)

+#define GET_Accum(disp) GET_by_offset(disp, _gloffset_Accum)

+#define SET_Accum(disp, fn) SET_by_offset(disp, _gloffset_Accum, fn)

+#define CALL_Disable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_Disable, parameters)

+#define GET_Disable(disp) GET_by_offset(disp, _gloffset_Disable)

+#define SET_Disable(disp, fn) SET_by_offset(disp, _gloffset_Disable, fn)

+#define CALL_Enable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_Enable, parameters)

+#define GET_Enable(disp) GET_by_offset(disp, _gloffset_Enable)

+#define SET_Enable(disp, fn) SET_by_offset(disp, _gloffset_Enable, fn)

+#define CALL_Finish(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_Finish, parameters)

+#define GET_Finish(disp) GET_by_offset(disp, _gloffset_Finish)

+#define SET_Finish(disp, fn) SET_by_offset(disp, _gloffset_Finish, fn)

+#define CALL_Flush(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_Flush, parameters)

+#define GET_Flush(disp) GET_by_offset(disp, _gloffset_Flush)

+#define SET_Flush(disp, fn) SET_by_offset(disp, _gloffset_Flush, fn)

+#define CALL_PopAttrib(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PopAttrib, parameters)

+#define GET_PopAttrib(disp) GET_by_offset(disp, _gloffset_PopAttrib)

+#define SET_PopAttrib(disp, fn) SET_by_offset(disp, _gloffset_PopAttrib, fn)

+#define CALL_PushAttrib(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbitfield)), _gloffset_PushAttrib, parameters)

+#define GET_PushAttrib(disp) GET_by_offset(disp, _gloffset_PushAttrib)

+#define SET_PushAttrib(disp, fn) SET_by_offset(disp, _gloffset_PushAttrib, fn)

+#define CALL_Map1d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *)), _gloffset_Map1d, parameters)

+#define GET_Map1d(disp) GET_by_offset(disp, _gloffset_Map1d)

+#define SET_Map1d(disp, fn) SET_by_offset(disp, _gloffset_Map1d, fn)

+#define CALL_Map1f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *)), _gloffset_Map1f, parameters)

+#define GET_Map1f(disp) GET_by_offset(disp, _gloffset_Map1f)

+#define SET_Map1f(disp, fn) SET_by_offset(disp, _gloffset_Map1f, fn)

+#define CALL_Map2d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *)), _gloffset_Map2d, parameters)

+#define GET_Map2d(disp) GET_by_offset(disp, _gloffset_Map2d)

+#define SET_Map2d(disp, fn) SET_by_offset(disp, _gloffset_Map2d, fn)

+#define CALL_Map2f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *)), _gloffset_Map2f, parameters)

+#define GET_Map2f(disp) GET_by_offset(disp, _gloffset_Map2f)

+#define SET_Map2f(disp, fn) SET_by_offset(disp, _gloffset_Map2f, fn)

+#define CALL_MapGrid1d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLdouble, GLdouble)), _gloffset_MapGrid1d, parameters)

+#define GET_MapGrid1d(disp) GET_by_offset(disp, _gloffset_MapGrid1d)

+#define SET_MapGrid1d(disp, fn) SET_by_offset(disp, _gloffset_MapGrid1d, fn)

+#define CALL_MapGrid1f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLfloat, GLfloat)), _gloffset_MapGrid1f, parameters)

+#define GET_MapGrid1f(disp) GET_by_offset(disp, _gloffset_MapGrid1f)

+#define SET_MapGrid1f(disp, fn) SET_by_offset(disp, _gloffset_MapGrid1f, fn)

+#define CALL_MapGrid2d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble)), _gloffset_MapGrid2d, parameters)

+#define GET_MapGrid2d(disp) GET_by_offset(disp, _gloffset_MapGrid2d)

+#define SET_MapGrid2d(disp, fn) SET_by_offset(disp, _gloffset_MapGrid2d, fn)

+#define CALL_MapGrid2f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat)), _gloffset_MapGrid2f, parameters)

+#define GET_MapGrid2f(disp) GET_by_offset(disp, _gloffset_MapGrid2f)

+#define SET_MapGrid2f(disp, fn) SET_by_offset(disp, _gloffset_MapGrid2f, fn)

+#define CALL_EvalCoord1d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble)), _gloffset_EvalCoord1d, parameters)

+#define GET_EvalCoord1d(disp) GET_by_offset(disp, _gloffset_EvalCoord1d)

+#define SET_EvalCoord1d(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord1d, fn)

+#define CALL_EvalCoord1dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_EvalCoord1dv, parameters)

+#define GET_EvalCoord1dv(disp) GET_by_offset(disp, _gloffset_EvalCoord1dv)

+#define SET_EvalCoord1dv(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord1dv, fn)

+#define CALL_EvalCoord1f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_EvalCoord1f, parameters)

+#define GET_EvalCoord1f(disp) GET_by_offset(disp, _gloffset_EvalCoord1f)

+#define SET_EvalCoord1f(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord1f, fn)

+#define CALL_EvalCoord1fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_EvalCoord1fv, parameters)

+#define GET_EvalCoord1fv(disp) GET_by_offset(disp, _gloffset_EvalCoord1fv)

+#define SET_EvalCoord1fv(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord1fv, fn)

+#define CALL_EvalCoord2d(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble)), _gloffset_EvalCoord2d, parameters)

+#define GET_EvalCoord2d(disp) GET_by_offset(disp, _gloffset_EvalCoord2d)

+#define SET_EvalCoord2d(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord2d, fn)

+#define CALL_EvalCoord2dv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_EvalCoord2dv, parameters)

+#define GET_EvalCoord2dv(disp) GET_by_offset(disp, _gloffset_EvalCoord2dv)

+#define SET_EvalCoord2dv(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord2dv, fn)

+#define CALL_EvalCoord2f(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_EvalCoord2f, parameters)

+#define GET_EvalCoord2f(disp) GET_by_offset(disp, _gloffset_EvalCoord2f)

+#define SET_EvalCoord2f(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord2f, fn)

+#define CALL_EvalCoord2fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_EvalCoord2fv, parameters)

+#define GET_EvalCoord2fv(disp) GET_by_offset(disp, _gloffset_EvalCoord2fv)

+#define SET_EvalCoord2fv(disp, fn) SET_by_offset(disp, _gloffset_EvalCoord2fv, fn)

+#define CALL_EvalMesh1(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint)), _gloffset_EvalMesh1, parameters)

+#define GET_EvalMesh1(disp) GET_by_offset(disp, _gloffset_EvalMesh1)

+#define SET_EvalMesh1(disp, fn) SET_by_offset(disp, _gloffset_EvalMesh1, fn)

+#define CALL_EvalPoint1(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint)), _gloffset_EvalPoint1, parameters)

+#define GET_EvalPoint1(disp) GET_by_offset(disp, _gloffset_EvalPoint1)

+#define SET_EvalPoint1(disp, fn) SET_by_offset(disp, _gloffset_EvalPoint1, fn)

+#define CALL_EvalMesh2(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint)), _gloffset_EvalMesh2, parameters)

+#define GET_EvalMesh2(disp) GET_by_offset(disp, _gloffset_EvalMesh2)

+#define SET_EvalMesh2(disp, fn) SET_by_offset(disp, _gloffset_EvalMesh2, fn)

+#define CALL_EvalPoint2(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint)), _gloffset_EvalPoint2, parameters)

+#define GET_EvalPoint2(disp) GET_by_offset(disp, _gloffset_EvalPoint2)

+#define SET_EvalPoint2(disp, fn) SET_by_offset(disp, _gloffset_EvalPoint2, fn)

+#define CALL_AlphaFunc(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLclampf)), _gloffset_AlphaFunc, parameters)

+#define GET_AlphaFunc(disp) GET_by_offset(disp, _gloffset_AlphaFunc)

+#define SET_AlphaFunc(disp, fn) SET_by_offset(disp, _gloffset_AlphaFunc, fn)

+#define CALL_BlendFunc(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_BlendFunc, parameters)

+#define GET_BlendFunc(disp) GET_by_offset(disp, _gloffset_BlendFunc)

+#define SET_BlendFunc(disp, fn) SET_by_offset(disp, _gloffset_BlendFunc, fn)

+#define CALL_LogicOp(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_LogicOp, parameters)

+#define GET_LogicOp(disp) GET_by_offset(disp, _gloffset_LogicOp)

+#define SET_LogicOp(disp, fn) SET_by_offset(disp, _gloffset_LogicOp, fn)

+#define CALL_StencilFunc(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLuint)), _gloffset_StencilFunc, parameters)

+#define GET_StencilFunc(disp) GET_by_offset(disp, _gloffset_StencilFunc)

+#define SET_StencilFunc(disp, fn) SET_by_offset(disp, _gloffset_StencilFunc, fn)

+#define CALL_StencilOp(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum)), _gloffset_StencilOp, parameters)

+#define GET_StencilOp(disp) GET_by_offset(disp, _gloffset_StencilOp)

+#define SET_StencilOp(disp, fn) SET_by_offset(disp, _gloffset_StencilOp, fn)

+#define CALL_DepthFunc(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_DepthFunc, parameters)

+#define GET_DepthFunc(disp) GET_by_offset(disp, _gloffset_DepthFunc)

+#define SET_DepthFunc(disp, fn) SET_by_offset(disp, _gloffset_DepthFunc, fn)

+#define CALL_PixelZoom(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_PixelZoom, parameters)

+#define GET_PixelZoom(disp) GET_by_offset(disp, _gloffset_PixelZoom)

+#define SET_PixelZoom(disp, fn) SET_by_offset(disp, _gloffset_PixelZoom, fn)

+#define CALL_PixelTransferf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_PixelTransferf, parameters)

+#define GET_PixelTransferf(disp) GET_by_offset(disp, _gloffset_PixelTransferf)

+#define SET_PixelTransferf(disp, fn) SET_by_offset(disp, _gloffset_PixelTransferf, fn)

+#define CALL_PixelTransferi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_PixelTransferi, parameters)

+#define GET_PixelTransferi(disp) GET_by_offset(disp, _gloffset_PixelTransferi)

+#define SET_PixelTransferi(disp, fn) SET_by_offset(disp, _gloffset_PixelTransferi, fn)

+#define CALL_PixelStoref(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_PixelStoref, parameters)

+#define GET_PixelStoref(disp) GET_by_offset(disp, _gloffset_PixelStoref)

+#define SET_PixelStoref(disp, fn) SET_by_offset(disp, _gloffset_PixelStoref, fn)

+#define CALL_PixelStorei(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_PixelStorei, parameters)

+#define GET_PixelStorei(disp) GET_by_offset(disp, _gloffset_PixelStorei)

+#define SET_PixelStorei(disp, fn) SET_by_offset(disp, _gloffset_PixelStorei, fn)

+#define CALL_PixelMapfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLfloat *)), _gloffset_PixelMapfv, parameters)

+#define GET_PixelMapfv(disp) GET_by_offset(disp, _gloffset_PixelMapfv)

+#define SET_PixelMapfv(disp, fn) SET_by_offset(disp, _gloffset_PixelMapfv, fn)

+#define CALL_PixelMapuiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLuint *)), _gloffset_PixelMapuiv, parameters)

+#define GET_PixelMapuiv(disp) GET_by_offset(disp, _gloffset_PixelMapuiv)

+#define SET_PixelMapuiv(disp, fn) SET_by_offset(disp, _gloffset_PixelMapuiv, fn)

+#define CALL_PixelMapusv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLushort *)), _gloffset_PixelMapusv, parameters)

+#define GET_PixelMapusv(disp) GET_by_offset(disp, _gloffset_PixelMapusv)

+#define SET_PixelMapusv(disp, fn) SET_by_offset(disp, _gloffset_PixelMapusv, fn)

+#define CALL_ReadBuffer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ReadBuffer, parameters)

+#define GET_ReadBuffer(disp) GET_by_offset(disp, _gloffset_ReadBuffer)

+#define SET_ReadBuffer(disp, fn) SET_by_offset(disp, _gloffset_ReadBuffer, fn)

+#define CALL_CopyPixels(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLsizei, GLsizei, GLenum)), _gloffset_CopyPixels, parameters)

+#define GET_CopyPixels(disp) GET_by_offset(disp, _gloffset_CopyPixels)

+#define SET_CopyPixels(disp, fn) SET_by_offset(disp, _gloffset_CopyPixels, fn)

+#define CALL_ReadPixels(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *)), _gloffset_ReadPixels, parameters)

+#define GET_ReadPixels(disp) GET_by_offset(disp, _gloffset_ReadPixels)

+#define SET_ReadPixels(disp, fn) SET_by_offset(disp, _gloffset_ReadPixels, fn)

+#define CALL_DrawPixels(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_DrawPixels, parameters)

+#define GET_DrawPixels(disp) GET_by_offset(disp, _gloffset_DrawPixels)

+#define SET_DrawPixels(disp, fn) SET_by_offset(disp, _gloffset_DrawPixels, fn)

+#define CALL_GetBooleanv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLboolean *)), _gloffset_GetBooleanv, parameters)

+#define GET_GetBooleanv(disp) GET_by_offset(disp, _gloffset_GetBooleanv)

+#define SET_GetBooleanv(disp, fn) SET_by_offset(disp, _gloffset_GetBooleanv, fn)

+#define CALL_GetClipPlane(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble *)), _gloffset_GetClipPlane, parameters)

+#define GET_GetClipPlane(disp) GET_by_offset(disp, _gloffset_GetClipPlane)

+#define SET_GetClipPlane(disp, fn) SET_by_offset(disp, _gloffset_GetClipPlane, fn)

+#define CALL_GetDoublev(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble *)), _gloffset_GetDoublev, parameters)

+#define GET_GetDoublev(disp) GET_by_offset(disp, _gloffset_GetDoublev)

+#define SET_GetDoublev(disp, fn) SET_by_offset(disp, _gloffset_GetDoublev, fn)

+#define CALL_GetError(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(void)), _gloffset_GetError, parameters)

+#define GET_GetError(disp) GET_by_offset(disp, _gloffset_GetError)

+#define SET_GetError(disp, fn) SET_by_offset(disp, _gloffset_GetError, fn)

+#define CALL_GetFloatv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat *)), _gloffset_GetFloatv, parameters)

+#define GET_GetFloatv(disp) GET_by_offset(disp, _gloffset_GetFloatv)

+#define SET_GetFloatv(disp, fn) SET_by_offset(disp, _gloffset_GetFloatv, fn)

+#define CALL_GetIntegerv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint *)), _gloffset_GetIntegerv, parameters)

+#define GET_GetIntegerv(disp) GET_by_offset(disp, _gloffset_GetIntegerv)

+#define SET_GetIntegerv(disp, fn) SET_by_offset(disp, _gloffset_GetIntegerv, fn)

+#define CALL_GetLightfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetLightfv, parameters)

+#define GET_GetLightfv(disp) GET_by_offset(disp, _gloffset_GetLightfv)

+#define SET_GetLightfv(disp, fn) SET_by_offset(disp, _gloffset_GetLightfv, fn)

+#define CALL_GetLightiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetLightiv, parameters)

+#define GET_GetLightiv(disp) GET_by_offset(disp, _gloffset_GetLightiv)

+#define SET_GetLightiv(disp, fn) SET_by_offset(disp, _gloffset_GetLightiv, fn)

+#define CALL_GetMapdv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLdouble *)), _gloffset_GetMapdv, parameters)

+#define GET_GetMapdv(disp) GET_by_offset(disp, _gloffset_GetMapdv)

+#define SET_GetMapdv(disp, fn) SET_by_offset(disp, _gloffset_GetMapdv, fn)

+#define CALL_GetMapfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetMapfv, parameters)

+#define GET_GetMapfv(disp) GET_by_offset(disp, _gloffset_GetMapfv)

+#define SET_GetMapfv(disp, fn) SET_by_offset(disp, _gloffset_GetMapfv, fn)

+#define CALL_GetMapiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetMapiv, parameters)

+#define GET_GetMapiv(disp) GET_by_offset(disp, _gloffset_GetMapiv)

+#define SET_GetMapiv(disp, fn) SET_by_offset(disp, _gloffset_GetMapiv, fn)

+#define CALL_GetMaterialfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetMaterialfv, parameters)

+#define GET_GetMaterialfv(disp) GET_by_offset(disp, _gloffset_GetMaterialfv)

+#define SET_GetMaterialfv(disp, fn) SET_by_offset(disp, _gloffset_GetMaterialfv, fn)

+#define CALL_GetMaterialiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetMaterialiv, parameters)

+#define GET_GetMaterialiv(disp) GET_by_offset(disp, _gloffset_GetMaterialiv)

+#define SET_GetMaterialiv(disp, fn) SET_by_offset(disp, _gloffset_GetMaterialiv, fn)

+#define CALL_GetPixelMapfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat *)), _gloffset_GetPixelMapfv, parameters)

+#define GET_GetPixelMapfv(disp) GET_by_offset(disp, _gloffset_GetPixelMapfv)

+#define SET_GetPixelMapfv(disp, fn) SET_by_offset(disp, _gloffset_GetPixelMapfv, fn)

+#define CALL_GetPixelMapuiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint *)), _gloffset_GetPixelMapuiv, parameters)

+#define GET_GetPixelMapuiv(disp) GET_by_offset(disp, _gloffset_GetPixelMapuiv)

+#define SET_GetPixelMapuiv(disp, fn) SET_by_offset(disp, _gloffset_GetPixelMapuiv, fn)

+#define CALL_GetPixelMapusv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLushort *)), _gloffset_GetPixelMapusv, parameters)

+#define GET_GetPixelMapusv(disp) GET_by_offset(disp, _gloffset_GetPixelMapusv)

+#define SET_GetPixelMapusv(disp, fn) SET_by_offset(disp, _gloffset_GetPixelMapusv, fn)

+#define CALL_GetPolygonStipple(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLubyte *)), _gloffset_GetPolygonStipple, parameters)

+#define GET_GetPolygonStipple(disp) GET_by_offset(disp, _gloffset_GetPolygonStipple)

+#define SET_GetPolygonStipple(disp, fn) SET_by_offset(disp, _gloffset_GetPolygonStipple, fn)

+#define CALL_GetString(disp, parameters) CALL_by_offset(disp, (const GLubyte * (GLAPIENTRYP)(GLenum)), _gloffset_GetString, parameters)

+#define GET_GetString(disp) GET_by_offset(disp, _gloffset_GetString)

+#define SET_GetString(disp, fn) SET_by_offset(disp, _gloffset_GetString, fn)

+#define CALL_GetTexEnvfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetTexEnvfv, parameters)

+#define GET_GetTexEnvfv(disp) GET_by_offset(disp, _gloffset_GetTexEnvfv)

+#define SET_GetTexEnvfv(disp, fn) SET_by_offset(disp, _gloffset_GetTexEnvfv, fn)

+#define CALL_GetTexEnviv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetTexEnviv, parameters)

+#define GET_GetTexEnviv(disp) GET_by_offset(disp, _gloffset_GetTexEnviv)

+#define SET_GetTexEnviv(disp, fn) SET_by_offset(disp, _gloffset_GetTexEnviv, fn)

+#define CALL_GetTexGendv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLdouble *)), _gloffset_GetTexGendv, parameters)

+#define GET_GetTexGendv(disp) GET_by_offset(disp, _gloffset_GetTexGendv)

+#define SET_GetTexGendv(disp, fn) SET_by_offset(disp, _gloffset_GetTexGendv, fn)

+#define CALL_GetTexGenfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetTexGenfv, parameters)

+#define GET_GetTexGenfv(disp) GET_by_offset(disp, _gloffset_GetTexGenfv)

+#define SET_GetTexGenfv(disp, fn) SET_by_offset(disp, _gloffset_GetTexGenfv, fn)

+#define CALL_GetTexGeniv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetTexGeniv, parameters)

+#define GET_GetTexGeniv(disp) GET_by_offset(disp, _gloffset_GetTexGeniv)

+#define SET_GetTexGeniv(disp, fn) SET_by_offset(disp, _gloffset_GetTexGeniv, fn)

+#define CALL_GetTexImage(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLenum, GLvoid *)), _gloffset_GetTexImage, parameters)

+#define GET_GetTexImage(disp) GET_by_offset(disp, _gloffset_GetTexImage)

+#define SET_GetTexImage(disp, fn) SET_by_offset(disp, _gloffset_GetTexImage, fn)

+#define CALL_GetTexParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetTexParameterfv, parameters)

+#define GET_GetTexParameterfv(disp) GET_by_offset(disp, _gloffset_GetTexParameterfv)

+#define SET_GetTexParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetTexParameterfv, fn)

+#define CALL_GetTexParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetTexParameteriv, parameters)

+#define GET_GetTexParameteriv(disp) GET_by_offset(disp, _gloffset_GetTexParameteriv)

+#define SET_GetTexParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetTexParameteriv, fn)

+#define CALL_GetTexLevelParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLfloat *)), _gloffset_GetTexLevelParameterfv, parameters)

+#define GET_GetTexLevelParameterfv(disp) GET_by_offset(disp, _gloffset_GetTexLevelParameterfv)

+#define SET_GetTexLevelParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetTexLevelParameterfv, fn)

+#define CALL_GetTexLevelParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLint *)), _gloffset_GetTexLevelParameteriv, parameters)

+#define GET_GetTexLevelParameteriv(disp) GET_by_offset(disp, _gloffset_GetTexLevelParameteriv)

+#define SET_GetTexLevelParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetTexLevelParameteriv, fn)

+#define CALL_IsEnabled(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLenum)), _gloffset_IsEnabled, parameters)

+#define GET_IsEnabled(disp) GET_by_offset(disp, _gloffset_IsEnabled)

+#define SET_IsEnabled(disp, fn) SET_by_offset(disp, _gloffset_IsEnabled, fn)

+#define CALL_IsList(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsList, parameters)

+#define GET_IsList(disp) GET_by_offset(disp, _gloffset_IsList)

+#define SET_IsList(disp, fn) SET_by_offset(disp, _gloffset_IsList, fn)

+#define CALL_DepthRange(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampd, GLclampd)), _gloffset_DepthRange, parameters)

+#define GET_DepthRange(disp) GET_by_offset(disp, _gloffset_DepthRange)

+#define SET_DepthRange(disp, fn) SET_by_offset(disp, _gloffset_DepthRange, fn)

+#define CALL_Frustum(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_Frustum, parameters)

+#define GET_Frustum(disp) GET_by_offset(disp, _gloffset_Frustum)

+#define SET_Frustum(disp, fn) SET_by_offset(disp, _gloffset_Frustum, fn)

+#define CALL_LoadIdentity(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_LoadIdentity, parameters)

+#define GET_LoadIdentity(disp) GET_by_offset(disp, _gloffset_LoadIdentity)

+#define SET_LoadIdentity(disp, fn) SET_by_offset(disp, _gloffset_LoadIdentity, fn)

+#define CALL_LoadMatrixf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_LoadMatrixf, parameters)

+#define GET_LoadMatrixf(disp) GET_by_offset(disp, _gloffset_LoadMatrixf)

+#define SET_LoadMatrixf(disp, fn) SET_by_offset(disp, _gloffset_LoadMatrixf, fn)

+#define CALL_LoadMatrixd(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_LoadMatrixd, parameters)

+#define GET_LoadMatrixd(disp) GET_by_offset(disp, _gloffset_LoadMatrixd)

+#define SET_LoadMatrixd(disp, fn) SET_by_offset(disp, _gloffset_LoadMatrixd, fn)

+#define CALL_MatrixMode(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_MatrixMode, parameters)

+#define GET_MatrixMode(disp) GET_by_offset(disp, _gloffset_MatrixMode)

+#define SET_MatrixMode(disp, fn) SET_by_offset(disp, _gloffset_MatrixMode, fn)

+#define CALL_MultMatrixf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_MultMatrixf, parameters)

+#define GET_MultMatrixf(disp) GET_by_offset(disp, _gloffset_MultMatrixf)

+#define SET_MultMatrixf(disp, fn) SET_by_offset(disp, _gloffset_MultMatrixf, fn)

+#define CALL_MultMatrixd(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_MultMatrixd, parameters)

+#define GET_MultMatrixd(disp) GET_by_offset(disp, _gloffset_MultMatrixd)

+#define SET_MultMatrixd(disp, fn) SET_by_offset(disp, _gloffset_MultMatrixd, fn)

+#define CALL_Ortho(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_Ortho, parameters)

+#define GET_Ortho(disp) GET_by_offset(disp, _gloffset_Ortho)

+#define SET_Ortho(disp, fn) SET_by_offset(disp, _gloffset_Ortho, fn)

+#define CALL_PopMatrix(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PopMatrix, parameters)

+#define GET_PopMatrix(disp) GET_by_offset(disp, _gloffset_PopMatrix)

+#define SET_PopMatrix(disp, fn) SET_by_offset(disp, _gloffset_PopMatrix, fn)

+#define CALL_PushMatrix(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PushMatrix, parameters)

+#define GET_PushMatrix(disp) GET_by_offset(disp, _gloffset_PushMatrix)

+#define SET_PushMatrix(disp, fn) SET_by_offset(disp, _gloffset_PushMatrix, fn)

+#define CALL_Rotated(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_Rotated, parameters)

+#define GET_Rotated(disp) GET_by_offset(disp, _gloffset_Rotated)

+#define SET_Rotated(disp, fn) SET_by_offset(disp, _gloffset_Rotated, fn)

+#define CALL_Rotatef(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_Rotatef, parameters)

+#define GET_Rotatef(disp) GET_by_offset(disp, _gloffset_Rotatef)

+#define SET_Rotatef(disp, fn) SET_by_offset(disp, _gloffset_Rotatef, fn)

+#define CALL_Scaled(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_Scaled, parameters)

+#define GET_Scaled(disp) GET_by_offset(disp, _gloffset_Scaled)

+#define SET_Scaled(disp, fn) SET_by_offset(disp, _gloffset_Scaled, fn)

+#define CALL_Scalef(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_Scalef, parameters)

+#define GET_Scalef(disp) GET_by_offset(disp, _gloffset_Scalef)

+#define SET_Scalef(disp, fn) SET_by_offset(disp, _gloffset_Scalef, fn)

+#define CALL_Translated(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_Translated, parameters)

+#define GET_Translated(disp) GET_by_offset(disp, _gloffset_Translated)

+#define SET_Translated(disp, fn) SET_by_offset(disp, _gloffset_Translated, fn)

+#define CALL_Translatef(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_Translatef, parameters)

+#define GET_Translatef(disp) GET_by_offset(disp, _gloffset_Translatef)

+#define SET_Translatef(disp, fn) SET_by_offset(disp, _gloffset_Translatef, fn)

+#define CALL_Viewport(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLsizei, GLsizei)), _gloffset_Viewport, parameters)

+#define GET_Viewport(disp) GET_by_offset(disp, _gloffset_Viewport)

+#define SET_Viewport(disp, fn) SET_by_offset(disp, _gloffset_Viewport, fn)

+#define CALL_ArrayElement(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint)), _gloffset_ArrayElement, parameters)

+#define GET_ArrayElement(disp) GET_by_offset(disp, _gloffset_ArrayElement)

+#define SET_ArrayElement(disp, fn) SET_by_offset(disp, _gloffset_ArrayElement, fn)

+#define CALL_BindTexture(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindTexture, parameters)

+#define GET_BindTexture(disp) GET_by_offset(disp, _gloffset_BindTexture)

+#define SET_BindTexture(disp, fn) SET_by_offset(disp, _gloffset_BindTexture, fn)

+#define CALL_ColorPointer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, const GLvoid *)), _gloffset_ColorPointer, parameters)

+#define GET_ColorPointer(disp) GET_by_offset(disp, _gloffset_ColorPointer)

+#define SET_ColorPointer(disp, fn) SET_by_offset(disp, _gloffset_ColorPointer, fn)

+#define CALL_DisableClientState(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_DisableClientState, parameters)

+#define GET_DisableClientState(disp) GET_by_offset(disp, _gloffset_DisableClientState)

+#define SET_DisableClientState(disp, fn) SET_by_offset(disp, _gloffset_DisableClientState, fn)

+#define CALL_DrawArrays(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLsizei)), _gloffset_DrawArrays, parameters)

+#define GET_DrawArrays(disp) GET_by_offset(disp, _gloffset_DrawArrays)

+#define SET_DrawArrays(disp, fn) SET_by_offset(disp, _gloffset_DrawArrays, fn)

+#define CALL_DrawElements(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, const GLvoid *)), _gloffset_DrawElements, parameters)

+#define GET_DrawElements(disp) GET_by_offset(disp, _gloffset_DrawElements)

+#define SET_DrawElements(disp, fn) SET_by_offset(disp, _gloffset_DrawElements, fn)

+#define CALL_EdgeFlagPointer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLvoid *)), _gloffset_EdgeFlagPointer, parameters)

+#define GET_EdgeFlagPointer(disp) GET_by_offset(disp, _gloffset_EdgeFlagPointer)

+#define SET_EdgeFlagPointer(disp, fn) SET_by_offset(disp, _gloffset_EdgeFlagPointer, fn)

+#define CALL_EnableClientState(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_EnableClientState, parameters)

+#define GET_EnableClientState(disp) GET_by_offset(disp, _gloffset_EnableClientState)

+#define SET_EnableClientState(disp, fn) SET_by_offset(disp, _gloffset_EnableClientState, fn)

+#define CALL_IndexPointer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLvoid *)), _gloffset_IndexPointer, parameters)

+#define GET_IndexPointer(disp) GET_by_offset(disp, _gloffset_IndexPointer)

+#define SET_IndexPointer(disp, fn) SET_by_offset(disp, _gloffset_IndexPointer, fn)

+#define CALL_Indexub(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLubyte)), _gloffset_Indexub, parameters)

+#define GET_Indexub(disp) GET_by_offset(disp, _gloffset_Indexub)

+#define SET_Indexub(disp, fn) SET_by_offset(disp, _gloffset_Indexub, fn)

+#define CALL_Indexubv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLubyte *)), _gloffset_Indexubv, parameters)

+#define GET_Indexubv(disp) GET_by_offset(disp, _gloffset_Indexubv)

+#define SET_Indexubv(disp, fn) SET_by_offset(disp, _gloffset_Indexubv, fn)

+#define CALL_InterleavedArrays(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLvoid *)), _gloffset_InterleavedArrays, parameters)

+#define GET_InterleavedArrays(disp) GET_by_offset(disp, _gloffset_InterleavedArrays)

+#define SET_InterleavedArrays(disp, fn) SET_by_offset(disp, _gloffset_InterleavedArrays, fn)

+#define CALL_NormalPointer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLvoid *)), _gloffset_NormalPointer, parameters)

+#define GET_NormalPointer(disp) GET_by_offset(disp, _gloffset_NormalPointer)

+#define SET_NormalPointer(disp, fn) SET_by_offset(disp, _gloffset_NormalPointer, fn)

+#define CALL_PolygonOffset(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_PolygonOffset, parameters)

+#define GET_PolygonOffset(disp) GET_by_offset(disp, _gloffset_PolygonOffset)

+#define SET_PolygonOffset(disp, fn) SET_by_offset(disp, _gloffset_PolygonOffset, fn)

+#define CALL_TexCoordPointer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, const GLvoid *)), _gloffset_TexCoordPointer, parameters)

+#define GET_TexCoordPointer(disp) GET_by_offset(disp, _gloffset_TexCoordPointer)

+#define SET_TexCoordPointer(disp, fn) SET_by_offset(disp, _gloffset_TexCoordPointer, fn)

+#define CALL_VertexPointer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, const GLvoid *)), _gloffset_VertexPointer, parameters)

+#define GET_VertexPointer(disp) GET_by_offset(disp, _gloffset_VertexPointer)

+#define SET_VertexPointer(disp, fn) SET_by_offset(disp, _gloffset_VertexPointer, fn)

+#define CALL_AreTexturesResident(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLsizei, const GLuint *, GLboolean *)), _gloffset_AreTexturesResident, parameters)

+#define GET_AreTexturesResident(disp) GET_by_offset(disp, _gloffset_AreTexturesResident)

+#define SET_AreTexturesResident(disp, fn) SET_by_offset(disp, _gloffset_AreTexturesResident, fn)

+#define CALL_CopyTexImage1D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint)), _gloffset_CopyTexImage1D, parameters)

+#define GET_CopyTexImage1D(disp) GET_by_offset(disp, _gloffset_CopyTexImage1D)

+#define SET_CopyTexImage1D(disp, fn) SET_by_offset(disp, _gloffset_CopyTexImage1D, fn)

+#define CALL_CopyTexImage2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint)), _gloffset_CopyTexImage2D, parameters)

+#define GET_CopyTexImage2D(disp) GET_by_offset(disp, _gloffset_CopyTexImage2D)

+#define SET_CopyTexImage2D(disp, fn) SET_by_offset(disp, _gloffset_CopyTexImage2D, fn)

+#define CALL_CopyTexSubImage1D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei)), _gloffset_CopyTexSubImage1D, parameters)

+#define GET_CopyTexSubImage1D(disp) GET_by_offset(disp, _gloffset_CopyTexSubImage1D)

+#define SET_CopyTexSubImage1D(disp, fn) SET_by_offset(disp, _gloffset_CopyTexSubImage1D, fn)

+#define CALL_CopyTexSubImage2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)), _gloffset_CopyTexSubImage2D, parameters)

+#define GET_CopyTexSubImage2D(disp) GET_by_offset(disp, _gloffset_CopyTexSubImage2D)

+#define SET_CopyTexSubImage2D(disp, fn) SET_by_offset(disp, _gloffset_CopyTexSubImage2D, fn)

+#define CALL_DeleteTextures(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteTextures, parameters)

+#define GET_DeleteTextures(disp) GET_by_offset(disp, _gloffset_DeleteTextures)

+#define SET_DeleteTextures(disp, fn) SET_by_offset(disp, _gloffset_DeleteTextures, fn)

+#define CALL_GenTextures(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenTextures, parameters)

+#define GET_GenTextures(disp) GET_by_offset(disp, _gloffset_GenTextures)

+#define SET_GenTextures(disp, fn) SET_by_offset(disp, _gloffset_GenTextures, fn)

+#define CALL_GetPointerv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLvoid **)), _gloffset_GetPointerv, parameters)

+#define GET_GetPointerv(disp) GET_by_offset(disp, _gloffset_GetPointerv)

+#define SET_GetPointerv(disp, fn) SET_by_offset(disp, _gloffset_GetPointerv, fn)

+#define CALL_IsTexture(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsTexture, parameters)

+#define GET_IsTexture(disp) GET_by_offset(disp, _gloffset_IsTexture)

+#define SET_IsTexture(disp, fn) SET_by_offset(disp, _gloffset_IsTexture, fn)

+#define CALL_PrioritizeTextures(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *, const GLclampf *)), _gloffset_PrioritizeTextures, parameters)

+#define GET_PrioritizeTextures(disp) GET_by_offset(disp, _gloffset_PrioritizeTextures)

+#define SET_PrioritizeTextures(disp, fn) SET_by_offset(disp, _gloffset_PrioritizeTextures, fn)

+#define CALL_TexSubImage1D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_TexSubImage1D, parameters)

+#define GET_TexSubImage1D(disp) GET_by_offset(disp, _gloffset_TexSubImage1D)

+#define SET_TexSubImage1D(disp, fn) SET_by_offset(disp, _gloffset_TexSubImage1D, fn)

+#define CALL_TexSubImage2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_TexSubImage2D, parameters)

+#define GET_TexSubImage2D(disp) GET_by_offset(disp, _gloffset_TexSubImage2D)

+#define SET_TexSubImage2D(disp, fn) SET_by_offset(disp, _gloffset_TexSubImage2D, fn)

+#define CALL_PopClientAttrib(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PopClientAttrib, parameters)

+#define GET_PopClientAttrib(disp) GET_by_offset(disp, _gloffset_PopClientAttrib)

+#define SET_PopClientAttrib(disp, fn) SET_by_offset(disp, _gloffset_PopClientAttrib, fn)

+#define CALL_PushClientAttrib(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbitfield)), _gloffset_PushClientAttrib, parameters)

+#define GET_PushClientAttrib(disp) GET_by_offset(disp, _gloffset_PushClientAttrib)

+#define SET_PushClientAttrib(disp, fn) SET_by_offset(disp, _gloffset_PushClientAttrib, fn)

+#define CALL_BlendColor(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampf, GLclampf, GLclampf, GLclampf)), _gloffset_BlendColor, parameters)

+#define GET_BlendColor(disp) GET_by_offset(disp, _gloffset_BlendColor)

+#define SET_BlendColor(disp, fn) SET_by_offset(disp, _gloffset_BlendColor, fn)

+#define CALL_BlendEquation(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_BlendEquation, parameters)

+#define GET_BlendEquation(disp) GET_by_offset(disp, _gloffset_BlendEquation)

+#define SET_BlendEquation(disp, fn) SET_by_offset(disp, _gloffset_BlendEquation, fn)

+#define CALL_DrawRangeElements(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *)), _gloffset_DrawRangeElements, parameters)

+#define GET_DrawRangeElements(disp) GET_by_offset(disp, _gloffset_DrawRangeElements)

+#define SET_DrawRangeElements(disp, fn) SET_by_offset(disp, _gloffset_DrawRangeElements, fn)

+#define CALL_ColorTable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_ColorTable, parameters)

+#define GET_ColorTable(disp) GET_by_offset(disp, _gloffset_ColorTable)

+#define SET_ColorTable(disp, fn) SET_by_offset(disp, _gloffset_ColorTable, fn)

+#define CALL_ColorTableParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_ColorTableParameterfv, parameters)

+#define GET_ColorTableParameterfv(disp) GET_by_offset(disp, _gloffset_ColorTableParameterfv)

+#define SET_ColorTableParameterfv(disp, fn) SET_by_offset(disp, _gloffset_ColorTableParameterfv, fn)

+#define CALL_ColorTableParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_ColorTableParameteriv, parameters)

+#define GET_ColorTableParameteriv(disp) GET_by_offset(disp, _gloffset_ColorTableParameteriv)

+#define SET_ColorTableParameteriv(disp, fn) SET_by_offset(disp, _gloffset_ColorTableParameteriv, fn)

+#define CALL_CopyColorTable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLint, GLsizei)), _gloffset_CopyColorTable, parameters)

+#define GET_CopyColorTable(disp) GET_by_offset(disp, _gloffset_CopyColorTable)

+#define SET_CopyColorTable(disp, fn) SET_by_offset(disp, _gloffset_CopyColorTable, fn)

+#define CALL_GetColorTable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLvoid *)), _gloffset_GetColorTable, parameters)

+#define GET_GetColorTable(disp) GET_by_offset(disp, _gloffset_GetColorTable)

+#define SET_GetColorTable(disp, fn) SET_by_offset(disp, _gloffset_GetColorTable, fn)

+#define CALL_GetColorTableParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetColorTableParameterfv, parameters)

+#define GET_GetColorTableParameterfv(disp) GET_by_offset(disp, _gloffset_GetColorTableParameterfv)

+#define SET_GetColorTableParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetColorTableParameterfv, fn)

+#define CALL_GetColorTableParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetColorTableParameteriv, parameters)

+#define GET_GetColorTableParameteriv(disp) GET_by_offset(disp, _gloffset_GetColorTableParameteriv)

+#define SET_GetColorTableParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetColorTableParameteriv, fn)

+#define CALL_ColorSubTable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_ColorSubTable, parameters)

+#define GET_ColorSubTable(disp) GET_by_offset(disp, _gloffset_ColorSubTable)

+#define SET_ColorSubTable(disp, fn) SET_by_offset(disp, _gloffset_ColorSubTable, fn)

+#define CALL_CopyColorSubTable(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLint, GLint, GLsizei)), _gloffset_CopyColorSubTable, parameters)

+#define GET_CopyColorSubTable(disp) GET_by_offset(disp, _gloffset_CopyColorSubTable)

+#define SET_CopyColorSubTable(disp, fn) SET_by_offset(disp, _gloffset_CopyColorSubTable, fn)

+#define CALL_ConvolutionFilter1D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_ConvolutionFilter1D, parameters)

+#define GET_ConvolutionFilter1D(disp) GET_by_offset(disp, _gloffset_ConvolutionFilter1D)

+#define SET_ConvolutionFilter1D(disp, fn) SET_by_offset(disp, _gloffset_ConvolutionFilter1D, fn)

+#define CALL_ConvolutionFilter2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_ConvolutionFilter2D, parameters)

+#define GET_ConvolutionFilter2D(disp) GET_by_offset(disp, _gloffset_ConvolutionFilter2D)

+#define SET_ConvolutionFilter2D(disp, fn) SET_by_offset(disp, _gloffset_ConvolutionFilter2D, fn)

+#define CALL_ConvolutionParameterf(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat)), _gloffset_ConvolutionParameterf, parameters)

+#define GET_ConvolutionParameterf(disp) GET_by_offset(disp, _gloffset_ConvolutionParameterf)

+#define SET_ConvolutionParameterf(disp, fn) SET_by_offset(disp, _gloffset_ConvolutionParameterf, fn)

+#define CALL_ConvolutionParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLfloat *)), _gloffset_ConvolutionParameterfv, parameters)

+#define GET_ConvolutionParameterfv(disp) GET_by_offset(disp, _gloffset_ConvolutionParameterfv)

+#define SET_ConvolutionParameterfv(disp, fn) SET_by_offset(disp, _gloffset_ConvolutionParameterfv, fn)

+#define CALL_ConvolutionParameteri(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_ConvolutionParameteri, parameters)

+#define GET_ConvolutionParameteri(disp) GET_by_offset(disp, _gloffset_ConvolutionParameteri)

+#define SET_ConvolutionParameteri(disp, fn) SET_by_offset(disp, _gloffset_ConvolutionParameteri, fn)

+#define CALL_ConvolutionParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_ConvolutionParameteriv, parameters)

+#define GET_ConvolutionParameteriv(disp) GET_by_offset(disp, _gloffset_ConvolutionParameteriv)

+#define SET_ConvolutionParameteriv(disp, fn) SET_by_offset(disp, _gloffset_ConvolutionParameteriv, fn)

+#define CALL_CopyConvolutionFilter1D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLint, GLsizei)), _gloffset_CopyConvolutionFilter1D, parameters)

+#define GET_CopyConvolutionFilter1D(disp) GET_by_offset(disp, _gloffset_CopyConvolutionFilter1D)

+#define SET_CopyConvolutionFilter1D(disp, fn) SET_by_offset(disp, _gloffset_CopyConvolutionFilter1D, fn)

+#define CALL_CopyConvolutionFilter2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei)), _gloffset_CopyConvolutionFilter2D, parameters)

+#define GET_CopyConvolutionFilter2D(disp) GET_by_offset(disp, _gloffset_CopyConvolutionFilter2D)

+#define SET_CopyConvolutionFilter2D(disp, fn) SET_by_offset(disp, _gloffset_CopyConvolutionFilter2D, fn)

+#define CALL_GetConvolutionFilter(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLvoid *)), _gloffset_GetConvolutionFilter, parameters)

+#define GET_GetConvolutionFilter(disp) GET_by_offset(disp, _gloffset_GetConvolutionFilter)

+#define SET_GetConvolutionFilter(disp, fn) SET_by_offset(disp, _gloffset_GetConvolutionFilter, fn)

+#define CALL_GetConvolutionParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetConvolutionParameterfv, parameters)

+#define GET_GetConvolutionParameterfv(disp) GET_by_offset(disp, _gloffset_GetConvolutionParameterfv)

+#define SET_GetConvolutionParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetConvolutionParameterfv, fn)

+#define CALL_GetConvolutionParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetConvolutionParameteriv, parameters)

+#define GET_GetConvolutionParameteriv(disp) GET_by_offset(disp, _gloffset_GetConvolutionParameteriv)

+#define SET_GetConvolutionParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetConvolutionParameteriv, fn)

+#define CALL_GetSeparableFilter(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *)), _gloffset_GetSeparableFilter, parameters)

+#define GET_GetSeparableFilter(disp) GET_by_offset(disp, _gloffset_GetSeparableFilter)

+#define SET_GetSeparableFilter(disp, fn) SET_by_offset(disp, _gloffset_GetSeparableFilter, fn)

+#define CALL_SeparableFilter2D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *)), _gloffset_SeparableFilter2D, parameters)

+#define GET_SeparableFilter2D(disp) GET_by_offset(disp, _gloffset_SeparableFilter2D)

+#define SET_SeparableFilter2D(disp, fn) SET_by_offset(disp, _gloffset_SeparableFilter2D, fn)

+#define CALL_GetHistogram(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)), _gloffset_GetHistogram, parameters)

+#define GET_GetHistogram(disp) GET_by_offset(disp, _gloffset_GetHistogram)

+#define SET_GetHistogram(disp, fn) SET_by_offset(disp, _gloffset_GetHistogram, fn)

+#define CALL_GetHistogramParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetHistogramParameterfv, parameters)

+#define GET_GetHistogramParameterfv(disp) GET_by_offset(disp, _gloffset_GetHistogramParameterfv)

+#define SET_GetHistogramParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetHistogramParameterfv, fn)

+#define CALL_GetHistogramParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetHistogramParameteriv, parameters)

+#define GET_GetHistogramParameteriv(disp) GET_by_offset(disp, _gloffset_GetHistogramParameteriv)

+#define SET_GetHistogramParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetHistogramParameteriv, fn)

+#define CALL_GetMinmax(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)), _gloffset_GetMinmax, parameters)

+#define GET_GetMinmax(disp) GET_by_offset(disp, _gloffset_GetMinmax)

+#define SET_GetMinmax(disp, fn) SET_by_offset(disp, _gloffset_GetMinmax, fn)

+#define CALL_GetMinmaxParameterfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetMinmaxParameterfv, parameters)

+#define GET_GetMinmaxParameterfv(disp) GET_by_offset(disp, _gloffset_GetMinmaxParameterfv)

+#define SET_GetMinmaxParameterfv(disp, fn) SET_by_offset(disp, _gloffset_GetMinmaxParameterfv, fn)

+#define CALL_GetMinmaxParameteriv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetMinmaxParameteriv, parameters)

+#define GET_GetMinmaxParameteriv(disp) GET_by_offset(disp, _gloffset_GetMinmaxParameteriv)

+#define SET_GetMinmaxParameteriv(disp, fn) SET_by_offset(disp, _gloffset_GetMinmaxParameteriv, fn)

+#define CALL_Histogram(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, GLboolean)), _gloffset_Histogram, parameters)

+#define GET_Histogram(disp) GET_by_offset(disp, _gloffset_Histogram)

+#define SET_Histogram(disp, fn) SET_by_offset(disp, _gloffset_Histogram, fn)

+#define CALL_Minmax(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLboolean)), _gloffset_Minmax, parameters)

+#define GET_Minmax(disp) GET_by_offset(disp, _gloffset_Minmax)

+#define SET_Minmax(disp, fn) SET_by_offset(disp, _gloffset_Minmax, fn)

+#define CALL_ResetHistogram(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ResetHistogram, parameters)

+#define GET_ResetHistogram(disp) GET_by_offset(disp, _gloffset_ResetHistogram)

+#define SET_ResetHistogram(disp, fn) SET_by_offset(disp, _gloffset_ResetHistogram, fn)

+#define CALL_ResetMinmax(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ResetMinmax, parameters)

+#define GET_ResetMinmax(disp) GET_by_offset(disp, _gloffset_ResetMinmax)

+#define SET_ResetMinmax(disp, fn) SET_by_offset(disp, _gloffset_ResetMinmax, fn)

+#define CALL_TexImage3D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)), _gloffset_TexImage3D, parameters)

+#define GET_TexImage3D(disp) GET_by_offset(disp, _gloffset_TexImage3D)

+#define SET_TexImage3D(disp, fn) SET_by_offset(disp, _gloffset_TexImage3D, fn)

+#define CALL_TexSubImage3D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)), _gloffset_TexSubImage3D, parameters)

+#define GET_TexSubImage3D(disp) GET_by_offset(disp, _gloffset_TexSubImage3D)

+#define SET_TexSubImage3D(disp, fn) SET_by_offset(disp, _gloffset_TexSubImage3D, fn)

+#define CALL_CopyTexSubImage3D(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)), _gloffset_CopyTexSubImage3D, parameters)

+#define GET_CopyTexSubImage3D(disp) GET_by_offset(disp, _gloffset_CopyTexSubImage3D)

+#define SET_CopyTexSubImage3D(disp, fn) SET_by_offset(disp, _gloffset_CopyTexSubImage3D, fn)

+#define CALL_ActiveTextureARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ActiveTextureARB, parameters)

+#define GET_ActiveTextureARB(disp) GET_by_offset(disp, _gloffset_ActiveTextureARB)

+#define SET_ActiveTextureARB(disp, fn) SET_by_offset(disp, _gloffset_ActiveTextureARB, fn)

+#define CALL_ClientActiveTextureARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ClientActiveTextureARB, parameters)

+#define GET_ClientActiveTextureARB(disp) GET_by_offset(disp, _gloffset_ClientActiveTextureARB)

+#define SET_ClientActiveTextureARB(disp, fn) SET_by_offset(disp, _gloffset_ClientActiveTextureARB, fn)

+#define CALL_MultiTexCoord1dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble)), _gloffset_MultiTexCoord1dARB, parameters)

+#define GET_MultiTexCoord1dARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1dARB)

+#define SET_MultiTexCoord1dARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1dARB, fn)

+#define CALL_MultiTexCoord1dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLdouble *)), _gloffset_MultiTexCoord1dvARB, parameters)

+#define GET_MultiTexCoord1dvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1dvARB)

+#define SET_MultiTexCoord1dvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1dvARB, fn)

+#define CALL_MultiTexCoord1fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_MultiTexCoord1fARB, parameters)

+#define GET_MultiTexCoord1fARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1fARB)

+#define SET_MultiTexCoord1fARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1fARB, fn)

+#define CALL_MultiTexCoord1fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_MultiTexCoord1fvARB, parameters)

+#define GET_MultiTexCoord1fvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1fvARB)

+#define SET_MultiTexCoord1fvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1fvARB, fn)

+#define CALL_MultiTexCoord1iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_MultiTexCoord1iARB, parameters)

+#define GET_MultiTexCoord1iARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1iARB)

+#define SET_MultiTexCoord1iARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1iARB, fn)

+#define CALL_MultiTexCoord1ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_MultiTexCoord1ivARB, parameters)

+#define GET_MultiTexCoord1ivARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1ivARB)

+#define SET_MultiTexCoord1ivARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1ivARB, fn)

+#define CALL_MultiTexCoord1sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLshort)), _gloffset_MultiTexCoord1sARB, parameters)

+#define GET_MultiTexCoord1sARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1sARB)

+#define SET_MultiTexCoord1sARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1sARB, fn)

+#define CALL_MultiTexCoord1svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLshort *)), _gloffset_MultiTexCoord1svARB, parameters)

+#define GET_MultiTexCoord1svARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord1svARB)

+#define SET_MultiTexCoord1svARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord1svARB, fn)

+#define CALL_MultiTexCoord2dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble, GLdouble)), _gloffset_MultiTexCoord2dARB, parameters)

+#define GET_MultiTexCoord2dARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2dARB)

+#define SET_MultiTexCoord2dARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2dARB, fn)

+#define CALL_MultiTexCoord2dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLdouble *)), _gloffset_MultiTexCoord2dvARB, parameters)

+#define GET_MultiTexCoord2dvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2dvARB)

+#define SET_MultiTexCoord2dvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2dvARB, fn)

+#define CALL_MultiTexCoord2fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat, GLfloat)), _gloffset_MultiTexCoord2fARB, parameters)

+#define GET_MultiTexCoord2fARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2fARB)

+#define SET_MultiTexCoord2fARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2fARB, fn)

+#define CALL_MultiTexCoord2fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_MultiTexCoord2fvARB, parameters)

+#define GET_MultiTexCoord2fvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2fvARB)

+#define SET_MultiTexCoord2fvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2fvARB, fn)

+#define CALL_MultiTexCoord2iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint)), _gloffset_MultiTexCoord2iARB, parameters)

+#define GET_MultiTexCoord2iARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2iARB)

+#define SET_MultiTexCoord2iARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2iARB, fn)

+#define CALL_MultiTexCoord2ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_MultiTexCoord2ivARB, parameters)

+#define GET_MultiTexCoord2ivARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2ivARB)

+#define SET_MultiTexCoord2ivARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2ivARB, fn)

+#define CALL_MultiTexCoord2sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLshort, GLshort)), _gloffset_MultiTexCoord2sARB, parameters)

+#define GET_MultiTexCoord2sARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2sARB)

+#define SET_MultiTexCoord2sARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2sARB, fn)

+#define CALL_MultiTexCoord2svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLshort *)), _gloffset_MultiTexCoord2svARB, parameters)

+#define GET_MultiTexCoord2svARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord2svARB)

+#define SET_MultiTexCoord2svARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord2svARB, fn)

+#define CALL_MultiTexCoord3dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble, GLdouble, GLdouble)), _gloffset_MultiTexCoord3dARB, parameters)

+#define GET_MultiTexCoord3dARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3dARB)

+#define SET_MultiTexCoord3dARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3dARB, fn)

+#define CALL_MultiTexCoord3dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLdouble *)), _gloffset_MultiTexCoord3dvARB, parameters)

+#define GET_MultiTexCoord3dvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3dvARB)

+#define SET_MultiTexCoord3dvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3dvARB, fn)

+#define CALL_MultiTexCoord3fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat, GLfloat, GLfloat)), _gloffset_MultiTexCoord3fARB, parameters)

+#define GET_MultiTexCoord3fARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3fARB)

+#define SET_MultiTexCoord3fARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3fARB, fn)

+#define CALL_MultiTexCoord3fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_MultiTexCoord3fvARB, parameters)

+#define GET_MultiTexCoord3fvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3fvARB)

+#define SET_MultiTexCoord3fvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3fvARB, fn)

+#define CALL_MultiTexCoord3iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint)), _gloffset_MultiTexCoord3iARB, parameters)

+#define GET_MultiTexCoord3iARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3iARB)

+#define SET_MultiTexCoord3iARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3iARB, fn)

+#define CALL_MultiTexCoord3ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_MultiTexCoord3ivARB, parameters)

+#define GET_MultiTexCoord3ivARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3ivARB)

+#define SET_MultiTexCoord3ivARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3ivARB, fn)

+#define CALL_MultiTexCoord3sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLshort, GLshort, GLshort)), _gloffset_MultiTexCoord3sARB, parameters)

+#define GET_MultiTexCoord3sARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3sARB)

+#define SET_MultiTexCoord3sARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3sARB, fn)

+#define CALL_MultiTexCoord3svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLshort *)), _gloffset_MultiTexCoord3svARB, parameters)

+#define GET_MultiTexCoord3svARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord3svARB)

+#define SET_MultiTexCoord3svARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord3svARB, fn)

+#define CALL_MultiTexCoord4dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_MultiTexCoord4dARB, parameters)

+#define GET_MultiTexCoord4dARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4dARB)

+#define SET_MultiTexCoord4dARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4dARB, fn)

+#define CALL_MultiTexCoord4dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLdouble *)), _gloffset_MultiTexCoord4dvARB, parameters)

+#define GET_MultiTexCoord4dvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4dvARB)

+#define SET_MultiTexCoord4dvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4dvARB, fn)

+#define CALL_MultiTexCoord4fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_MultiTexCoord4fARB, parameters)

+#define GET_MultiTexCoord4fARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4fARB)

+#define SET_MultiTexCoord4fARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4fARB, fn)

+#define CALL_MultiTexCoord4fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_MultiTexCoord4fvARB, parameters)

+#define GET_MultiTexCoord4fvARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4fvARB)

+#define SET_MultiTexCoord4fvARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4fvARB, fn)

+#define CALL_MultiTexCoord4iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint)), _gloffset_MultiTexCoord4iARB, parameters)

+#define GET_MultiTexCoord4iARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4iARB)

+#define SET_MultiTexCoord4iARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4iARB, fn)

+#define CALL_MultiTexCoord4ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_MultiTexCoord4ivARB, parameters)

+#define GET_MultiTexCoord4ivARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4ivARB)

+#define SET_MultiTexCoord4ivARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4ivARB, fn)

+#define CALL_MultiTexCoord4sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLshort, GLshort, GLshort, GLshort)), _gloffset_MultiTexCoord4sARB, parameters)

+#define GET_MultiTexCoord4sARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4sARB)

+#define SET_MultiTexCoord4sARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4sARB, fn)

+#define CALL_MultiTexCoord4svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLshort *)), _gloffset_MultiTexCoord4svARB, parameters)

+#define GET_MultiTexCoord4svARB(disp) GET_by_offset(disp, _gloffset_MultiTexCoord4svARB)

+#define SET_MultiTexCoord4svARB(disp, fn) SET_by_offset(disp, _gloffset_MultiTexCoord4svARB, fn)

+#define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), _gloffset_AttachShader, parameters)

+#define GET_AttachShader(disp) GET_by_offset(disp, _gloffset_AttachShader)

+#define SET_AttachShader(disp, fn) SET_by_offset(disp, _gloffset_AttachShader, fn)

+#define CALL_CreateProgram(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(void)), _gloffset_CreateProgram, parameters)

+#define GET_CreateProgram(disp) GET_by_offset(disp, _gloffset_CreateProgram)

+#define SET_CreateProgram(disp, fn) SET_by_offset(disp, _gloffset_CreateProgram, fn)

+#define CALL_CreateShader(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(GLenum)), _gloffset_CreateShader, parameters)

+#define GET_CreateShader(disp) GET_by_offset(disp, _gloffset_CreateShader)

+#define SET_CreateShader(disp, fn) SET_by_offset(disp, _gloffset_CreateShader, fn)

+#define CALL_DeleteProgram(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_DeleteProgram, parameters)

+#define GET_DeleteProgram(disp) GET_by_offset(disp, _gloffset_DeleteProgram)

+#define SET_DeleteProgram(disp, fn) SET_by_offset(disp, _gloffset_DeleteProgram, fn)

+#define CALL_DeleteShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_DeleteShader, parameters)

+#define GET_DeleteShader(disp) GET_by_offset(disp, _gloffset_DeleteShader)

+#define SET_DeleteShader(disp, fn) SET_by_offset(disp, _gloffset_DeleteShader, fn)

+#define CALL_DetachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), _gloffset_DetachShader, parameters)

+#define GET_DetachShader(disp) GET_by_offset(disp, _gloffset_DetachShader)

+#define SET_DetachShader(disp, fn) SET_by_offset(disp, _gloffset_DetachShader, fn)

+#define CALL_GetAttachedShaders(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, GLsizei *, GLuint *)), _gloffset_GetAttachedShaders, parameters)

+#define GET_GetAttachedShaders(disp) GET_by_offset(disp, _gloffset_GetAttachedShaders)

+#define SET_GetAttachedShaders(disp, fn) SET_by_offset(disp, _gloffset_GetAttachedShaders, fn)

+#define CALL_GetProgramInfoLog(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, GLsizei *, GLchar *)), _gloffset_GetProgramInfoLog, parameters)

+#define GET_GetProgramInfoLog(disp) GET_by_offset(disp, _gloffset_GetProgramInfoLog)

+#define SET_GetProgramInfoLog(disp, fn) SET_by_offset(disp, _gloffset_GetProgramInfoLog, fn)

+#define CALL_GetProgramiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetProgramiv, parameters)

+#define GET_GetProgramiv(disp) GET_by_offset(disp, _gloffset_GetProgramiv)

+#define SET_GetProgramiv(disp, fn) SET_by_offset(disp, _gloffset_GetProgramiv, fn)

+#define CALL_GetShaderInfoLog(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, GLsizei *, GLchar *)), _gloffset_GetShaderInfoLog, parameters)

+#define GET_GetShaderInfoLog(disp) GET_by_offset(disp, _gloffset_GetShaderInfoLog)

+#define SET_GetShaderInfoLog(disp, fn) SET_by_offset(disp, _gloffset_GetShaderInfoLog, fn)

+#define CALL_GetShaderiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetShaderiv, parameters)

+#define GET_GetShaderiv(disp) GET_by_offset(disp, _gloffset_GetShaderiv)

+#define SET_GetShaderiv(disp, fn) SET_by_offset(disp, _gloffset_GetShaderiv, fn)

+#define CALL_IsProgram(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsProgram, parameters)

+#define GET_IsProgram(disp) GET_by_offset(disp, _gloffset_IsProgram)

+#define SET_IsProgram(disp, fn) SET_by_offset(disp, _gloffset_IsProgram, fn)

+#define CALL_IsShader(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsShader, parameters)

+#define GET_IsShader(disp) GET_by_offset(disp, _gloffset_IsShader)

+#define SET_IsShader(disp, fn) SET_by_offset(disp, _gloffset_IsShader, fn)

+#define CALL_StencilFuncSeparate(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLuint)), _gloffset_StencilFuncSeparate, parameters)

+#define GET_StencilFuncSeparate(disp) GET_by_offset(disp, _gloffset_StencilFuncSeparate)

+#define SET_StencilFuncSeparate(disp, fn) SET_by_offset(disp, _gloffset_StencilFuncSeparate, fn)

+#define CALL_StencilMaskSeparate(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_StencilMaskSeparate, parameters)

+#define GET_StencilMaskSeparate(disp) GET_by_offset(disp, _gloffset_StencilMaskSeparate)

+#define SET_StencilMaskSeparate(disp, fn) SET_by_offset(disp, _gloffset_StencilMaskSeparate, fn)

+#define CALL_StencilOpSeparate(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum)), _gloffset_StencilOpSeparate, parameters)

+#define GET_StencilOpSeparate(disp) GET_by_offset(disp, _gloffset_StencilOpSeparate)

+#define SET_StencilOpSeparate(disp, fn) SET_by_offset(disp, _gloffset_StencilOpSeparate, fn)

+#define CALL_UniformMatrix2x3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix2x3fv, parameters)

+#define GET_UniformMatrix2x3fv(disp) GET_by_offset(disp, _gloffset_UniformMatrix2x3fv)

+#define SET_UniformMatrix2x3fv(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix2x3fv, fn)

+#define CALL_UniformMatrix2x4fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix2x4fv, parameters)

+#define GET_UniformMatrix2x4fv(disp) GET_by_offset(disp, _gloffset_UniformMatrix2x4fv)

+#define SET_UniformMatrix2x4fv(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix2x4fv, fn)

+#define CALL_UniformMatrix3x2fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix3x2fv, parameters)

+#define GET_UniformMatrix3x2fv(disp) GET_by_offset(disp, _gloffset_UniformMatrix3x2fv)

+#define SET_UniformMatrix3x2fv(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix3x2fv, fn)

+#define CALL_UniformMatrix3x4fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix3x4fv, parameters)

+#define GET_UniformMatrix3x4fv(disp) GET_by_offset(disp, _gloffset_UniformMatrix3x4fv)

+#define SET_UniformMatrix3x4fv(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix3x4fv, fn)

+#define CALL_UniformMatrix4x2fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix4x2fv, parameters)

+#define GET_UniformMatrix4x2fv(disp) GET_by_offset(disp, _gloffset_UniformMatrix4x2fv)

+#define SET_UniformMatrix4x2fv(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix4x2fv, fn)

+#define CALL_UniformMatrix4x3fv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix4x3fv, parameters)

+#define GET_UniformMatrix4x3fv(disp) GET_by_offset(disp, _gloffset_UniformMatrix4x3fv)

+#define SET_UniformMatrix4x3fv(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix4x3fv, fn)

+#define CALL_ClampColor(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_ClampColor, parameters)

+#define GET_ClampColor(disp) GET_by_offset(disp, _gloffset_ClampColor)

+#define SET_ClampColor(disp, fn) SET_by_offset(disp, _gloffset_ClampColor, fn)

+#define CALL_ClearBufferfi(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, const GLfloat, const GLint)), _gloffset_ClearBufferfi, parameters)

+#define GET_ClearBufferfi(disp) GET_by_offset(disp, _gloffset_ClearBufferfi)

+#define SET_ClearBufferfi(disp, fn) SET_by_offset(disp, _gloffset_ClearBufferfi, fn)

+#define CALL_ClearBufferfv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, const GLfloat *)), _gloffset_ClearBufferfv, parameters)

+#define GET_ClearBufferfv(disp) GET_by_offset(disp, _gloffset_ClearBufferfv)

+#define SET_ClearBufferfv(disp, fn) SET_by_offset(disp, _gloffset_ClearBufferfv, fn)

+#define CALL_ClearBufferiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, const GLint *)), _gloffset_ClearBufferiv, parameters)

+#define GET_ClearBufferiv(disp) GET_by_offset(disp, _gloffset_ClearBufferiv)

+#define SET_ClearBufferiv(disp, fn) SET_by_offset(disp, _gloffset_ClearBufferiv, fn)

+#define CALL_ClearBufferuiv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, const GLuint *)), _gloffset_ClearBufferuiv, parameters)

+#define GET_ClearBufferuiv(disp) GET_by_offset(disp, _gloffset_ClearBufferuiv)

+#define SET_ClearBufferuiv(disp, fn) SET_by_offset(disp, _gloffset_ClearBufferuiv, fn)

+#define CALL_GetStringi(disp, parameters) CALL_by_offset(disp, (const GLubyte * (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_GetStringi, parameters)

+#define GET_GetStringi(disp) GET_by_offset(disp, _gloffset_GetStringi)

+#define SET_GetStringi(disp, fn) SET_by_offset(disp, _gloffset_GetStringi, fn)

+#define CALL_TexBuffer(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint)), _gloffset_TexBuffer, parameters)

+#define GET_TexBuffer(disp) GET_by_offset(disp, _gloffset_TexBuffer)

+#define SET_TexBuffer(disp, fn) SET_by_offset(disp, _gloffset_TexBuffer, fn)

+#define CALL_FramebufferTexture(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint)), _gloffset_FramebufferTexture, parameters)

+#define GET_FramebufferTexture(disp) GET_by_offset(disp, _gloffset_FramebufferTexture)

+#define SET_FramebufferTexture(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTexture, fn)

+#define CALL_GetBufferParameteri64v(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint64 *)), _gloffset_GetBufferParameteri64v, parameters)

+#define GET_GetBufferParameteri64v(disp) GET_by_offset(disp, _gloffset_GetBufferParameteri64v)

+#define SET_GetBufferParameteri64v(disp, fn) SET_by_offset(disp, _gloffset_GetBufferParameteri64v, fn)

+#define CALL_GetInteger64i_v(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLint64 *)), _gloffset_GetInteger64i_v, parameters)

+#define GET_GetInteger64i_v(disp) GET_by_offset(disp, _gloffset_GetInteger64i_v)

+#define SET_GetInteger64i_v(disp, fn) SET_by_offset(disp, _gloffset_GetInteger64i_v, fn)

+#define CALL_VertexAttribDivisor(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), _gloffset_VertexAttribDivisor, parameters)

+#define GET_VertexAttribDivisor(disp) GET_by_offset(disp, _gloffset_VertexAttribDivisor)

+#define SET_VertexAttribDivisor(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn)

+#define CALL_LoadTransposeMatrixdARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_LoadTransposeMatrixdARB, parameters)

+#define GET_LoadTransposeMatrixdARB(disp) GET_by_offset(disp, _gloffset_LoadTransposeMatrixdARB)

+#define SET_LoadTransposeMatrixdARB(disp, fn) SET_by_offset(disp, _gloffset_LoadTransposeMatrixdARB, fn)

+#define CALL_LoadTransposeMatrixfARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_LoadTransposeMatrixfARB, parameters)

+#define GET_LoadTransposeMatrixfARB(disp) GET_by_offset(disp, _gloffset_LoadTransposeMatrixfARB)

+#define SET_LoadTransposeMatrixfARB(disp, fn) SET_by_offset(disp, _gloffset_LoadTransposeMatrixfARB, fn)

+#define CALL_MultTransposeMatrixdARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_MultTransposeMatrixdARB, parameters)

+#define GET_MultTransposeMatrixdARB(disp) GET_by_offset(disp, _gloffset_MultTransposeMatrixdARB)

+#define SET_MultTransposeMatrixdARB(disp, fn) SET_by_offset(disp, _gloffset_MultTransposeMatrixdARB, fn)

+#define CALL_MultTransposeMatrixfARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_MultTransposeMatrixfARB, parameters)

+#define GET_MultTransposeMatrixfARB(disp) GET_by_offset(disp, _gloffset_MultTransposeMatrixfARB)

+#define SET_MultTransposeMatrixfARB(disp, fn) SET_by_offset(disp, _gloffset_MultTransposeMatrixfARB, fn)

+#define CALL_SampleCoverageARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampf, GLboolean)), _gloffset_SampleCoverageARB, parameters)

+#define GET_SampleCoverageARB(disp) GET_by_offset(disp, _gloffset_SampleCoverageARB)

+#define SET_SampleCoverageARB(disp, fn) SET_by_offset(disp, _gloffset_SampleCoverageARB, fn)

+#define CALL_CompressedTexImage1DARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *)), _gloffset_CompressedTexImage1DARB, parameters)

+#define GET_CompressedTexImage1DARB(disp) GET_by_offset(disp, _gloffset_CompressedTexImage1DARB)

+#define SET_CompressedTexImage1DARB(disp, fn) SET_by_offset(disp, _gloffset_CompressedTexImage1DARB, fn)

+#define CALL_CompressedTexImage2DARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)), _gloffset_CompressedTexImage2DARB, parameters)

+#define GET_CompressedTexImage2DARB(disp) GET_by_offset(disp, _gloffset_CompressedTexImage2DARB)

+#define SET_CompressedTexImage2DARB(disp, fn) SET_by_offset(disp, _gloffset_CompressedTexImage2DARB, fn)

+#define CALL_CompressedTexImage3DARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)), _gloffset_CompressedTexImage3DARB, parameters)

+#define GET_CompressedTexImage3DARB(disp) GET_by_offset(disp, _gloffset_CompressedTexImage3DARB)

+#define SET_CompressedTexImage3DARB(disp, fn) SET_by_offset(disp, _gloffset_CompressedTexImage3DARB, fn)

+#define CALL_CompressedTexSubImage1DARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *)), _gloffset_CompressedTexSubImage1DARB, parameters)

+#define GET_CompressedTexSubImage1DARB(disp) GET_by_offset(disp, _gloffset_CompressedTexSubImage1DARB)

+#define SET_CompressedTexSubImage1DARB(disp, fn) SET_by_offset(disp, _gloffset_CompressedTexSubImage1DARB, fn)

+#define CALL_CompressedTexSubImage2DARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)), _gloffset_CompressedTexSubImage2DARB, parameters)

+#define GET_CompressedTexSubImage2DARB(disp) GET_by_offset(disp, _gloffset_CompressedTexSubImage2DARB)

+#define SET_CompressedTexSubImage2DARB(disp, fn) SET_by_offset(disp, _gloffset_CompressedTexSubImage2DARB, fn)

+#define CALL_CompressedTexSubImage3DARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)), _gloffset_CompressedTexSubImage3DARB, parameters)

+#define GET_CompressedTexSubImage3DARB(disp) GET_by_offset(disp, _gloffset_CompressedTexSubImage3DARB)

+#define SET_CompressedTexSubImage3DARB(disp, fn) SET_by_offset(disp, _gloffset_CompressedTexSubImage3DARB, fn)

+#define CALL_GetCompressedTexImageARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLvoid *)), _gloffset_GetCompressedTexImageARB, parameters)

+#define GET_GetCompressedTexImageARB(disp) GET_by_offset(disp, _gloffset_GetCompressedTexImageARB)

+#define SET_GetCompressedTexImageARB(disp, fn) SET_by_offset(disp, _gloffset_GetCompressedTexImageARB, fn)

+#define CALL_DisableVertexAttribArrayARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_DisableVertexAttribArrayARB, parameters)

+#define GET_DisableVertexAttribArrayARB(disp) GET_by_offset(disp, _gloffset_DisableVertexAttribArrayARB)

+#define SET_DisableVertexAttribArrayARB(disp, fn) SET_by_offset(disp, _gloffset_DisableVertexAttribArrayARB, fn)

+#define CALL_EnableVertexAttribArrayARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_EnableVertexAttribArrayARB, parameters)

+#define GET_EnableVertexAttribArrayARB(disp) GET_by_offset(disp, _gloffset_EnableVertexAttribArrayARB)

+#define SET_EnableVertexAttribArrayARB(disp, fn) SET_by_offset(disp, _gloffset_EnableVertexAttribArrayARB, fn)

+#define CALL_GetProgramEnvParameterdvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLdouble *)), _gloffset_GetProgramEnvParameterdvARB, parameters)

+#define GET_GetProgramEnvParameterdvARB(disp) GET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB)

+#define SET_GetProgramEnvParameterdvARB(disp, fn) SET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB, fn)

+#define CALL_GetProgramEnvParameterfvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLfloat *)), _gloffset_GetProgramEnvParameterfvARB, parameters)

+#define GET_GetProgramEnvParameterfvARB(disp) GET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB)

+#define SET_GetProgramEnvParameterfvARB(disp, fn) SET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB, fn)

+#define CALL_GetProgramLocalParameterdvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLdouble *)), _gloffset_GetProgramLocalParameterdvARB, parameters)

+#define GET_GetProgramLocalParameterdvARB(disp) GET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB)

+#define SET_GetProgramLocalParameterdvARB(disp, fn) SET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB, fn)

+#define CALL_GetProgramLocalParameterfvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLfloat *)), _gloffset_GetProgramLocalParameterfvARB, parameters)

+#define GET_GetProgramLocalParameterfvARB(disp) GET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB)

+#define SET_GetProgramLocalParameterfvARB(disp, fn) SET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB, fn)

+#define CALL_GetProgramStringARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLvoid *)), _gloffset_GetProgramStringARB, parameters)

+#define GET_GetProgramStringARB(disp) GET_by_offset(disp, _gloffset_GetProgramStringARB)

+#define SET_GetProgramStringARB(disp, fn) SET_by_offset(disp, _gloffset_GetProgramStringARB, fn)

+#define CALL_GetProgramivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetProgramivARB, parameters)

+#define GET_GetProgramivARB(disp) GET_by_offset(disp, _gloffset_GetProgramivARB)

+#define SET_GetProgramivARB(disp, fn) SET_by_offset(disp, _gloffset_GetProgramivARB, fn)

+#define CALL_GetVertexAttribdvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLdouble *)), _gloffset_GetVertexAttribdvARB, parameters)

+#define GET_GetVertexAttribdvARB(disp) GET_by_offset(disp, _gloffset_GetVertexAttribdvARB)

+#define SET_GetVertexAttribdvARB(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribdvARB, fn)

+#define CALL_GetVertexAttribfvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLfloat *)), _gloffset_GetVertexAttribfvARB, parameters)

+#define GET_GetVertexAttribfvARB(disp) GET_by_offset(disp, _gloffset_GetVertexAttribfvARB)

+#define SET_GetVertexAttribfvARB(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribfvARB, fn)

+#define CALL_GetVertexAttribivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetVertexAttribivARB, parameters)

+#define GET_GetVertexAttribivARB(disp) GET_by_offset(disp, _gloffset_GetVertexAttribivARB)

+#define SET_GetVertexAttribivARB(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribivARB, fn)

+#define CALL_ProgramEnvParameter4dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_ProgramEnvParameter4dARB, parameters)

+#define GET_ProgramEnvParameter4dARB(disp) GET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB)

+#define SET_ProgramEnvParameter4dARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB, fn)

+#define CALL_ProgramEnvParameter4dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLdouble *)), _gloffset_ProgramEnvParameter4dvARB, parameters)

+#define GET_ProgramEnvParameter4dvARB(disp) GET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB)

+#define SET_ProgramEnvParameter4dvARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB, fn)

+#define CALL_ProgramEnvParameter4fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_ProgramEnvParameter4fARB, parameters)

+#define GET_ProgramEnvParameter4fARB(disp) GET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB)

+#define SET_ProgramEnvParameter4fARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB, fn)

+#define CALL_ProgramEnvParameter4fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLfloat *)), _gloffset_ProgramEnvParameter4fvARB, parameters)

+#define GET_ProgramEnvParameter4fvARB(disp) GET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB)

+#define SET_ProgramEnvParameter4fvARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB, fn)

+#define CALL_ProgramLocalParameter4dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_ProgramLocalParameter4dARB, parameters)

+#define GET_ProgramLocalParameter4dARB(disp) GET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB)

+#define SET_ProgramLocalParameter4dARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB, fn)

+#define CALL_ProgramLocalParameter4dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLdouble *)), _gloffset_ProgramLocalParameter4dvARB, parameters)

+#define GET_ProgramLocalParameter4dvARB(disp) GET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB)

+#define SET_ProgramLocalParameter4dvARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB, fn)

+#define CALL_ProgramLocalParameter4fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_ProgramLocalParameter4fARB, parameters)

+#define GET_ProgramLocalParameter4fARB(disp) GET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB)

+#define SET_ProgramLocalParameter4fARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB, fn)

+#define CALL_ProgramLocalParameter4fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLfloat *)), _gloffset_ProgramLocalParameter4fvARB, parameters)

+#define GET_ProgramLocalParameter4fvARB(disp) GET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB)

+#define SET_ProgramLocalParameter4fvARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB, fn)

+#define CALL_ProgramStringARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLsizei, const GLvoid *)), _gloffset_ProgramStringARB, parameters)

+#define GET_ProgramStringARB(disp) GET_by_offset(disp, _gloffset_ProgramStringARB)

+#define SET_ProgramStringARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramStringARB, fn)

+#define CALL_VertexAttrib1dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble)), _gloffset_VertexAttrib1dARB, parameters)

+#define GET_VertexAttrib1dARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib1dARB)

+#define SET_VertexAttrib1dARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1dARB, fn)

+#define CALL_VertexAttrib1dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib1dvARB, parameters)

+#define GET_VertexAttrib1dvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib1dvARB)

+#define SET_VertexAttrib1dvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1dvARB, fn)

+#define CALL_VertexAttrib1fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat)), _gloffset_VertexAttrib1fARB, parameters)

+#define GET_VertexAttrib1fARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib1fARB)

+#define SET_VertexAttrib1fARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1fARB, fn)

+#define CALL_VertexAttrib1fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib1fvARB, parameters)

+#define GET_VertexAttrib1fvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib1fvARB)

+#define SET_VertexAttrib1fvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1fvARB, fn)

+#define CALL_VertexAttrib1sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort)), _gloffset_VertexAttrib1sARB, parameters)

+#define GET_VertexAttrib1sARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib1sARB)

+#define SET_VertexAttrib1sARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1sARB, fn)

+#define CALL_VertexAttrib1svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib1svARB, parameters)

+#define GET_VertexAttrib1svARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib1svARB)

+#define SET_VertexAttrib1svARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1svARB, fn)

+#define CALL_VertexAttrib2dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble, GLdouble)), _gloffset_VertexAttrib2dARB, parameters)

+#define GET_VertexAttrib2dARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib2dARB)

+#define SET_VertexAttrib2dARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2dARB, fn)

+#define CALL_VertexAttrib2dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib2dvARB, parameters)

+#define GET_VertexAttrib2dvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib2dvARB)

+#define SET_VertexAttrib2dvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2dvARB, fn)

+#define CALL_VertexAttrib2fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat, GLfloat)), _gloffset_VertexAttrib2fARB, parameters)

+#define GET_VertexAttrib2fARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib2fARB)

+#define SET_VertexAttrib2fARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2fARB, fn)

+#define CALL_VertexAttrib2fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib2fvARB, parameters)

+#define GET_VertexAttrib2fvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib2fvARB)

+#define SET_VertexAttrib2fvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2fvARB, fn)

+#define CALL_VertexAttrib2sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort, GLshort)), _gloffset_VertexAttrib2sARB, parameters)

+#define GET_VertexAttrib2sARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib2sARB)

+#define SET_VertexAttrib2sARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2sARB, fn)

+#define CALL_VertexAttrib2svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib2svARB, parameters)

+#define GET_VertexAttrib2svARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib2svARB)

+#define SET_VertexAttrib2svARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2svARB, fn)

+#define CALL_VertexAttrib3dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble, GLdouble, GLdouble)), _gloffset_VertexAttrib3dARB, parameters)

+#define GET_VertexAttrib3dARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib3dARB)

+#define SET_VertexAttrib3dARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3dARB, fn)

+#define CALL_VertexAttrib3dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib3dvARB, parameters)

+#define GET_VertexAttrib3dvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib3dvARB)

+#define SET_VertexAttrib3dvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3dvARB, fn)

+#define CALL_VertexAttrib3fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat, GLfloat, GLfloat)), _gloffset_VertexAttrib3fARB, parameters)

+#define GET_VertexAttrib3fARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib3fARB)

+#define SET_VertexAttrib3fARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3fARB, fn)

+#define CALL_VertexAttrib3fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib3fvARB, parameters)

+#define GET_VertexAttrib3fvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib3fvARB)

+#define SET_VertexAttrib3fvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3fvARB, fn)

+#define CALL_VertexAttrib3sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort, GLshort, GLshort)), _gloffset_VertexAttrib3sARB, parameters)

+#define GET_VertexAttrib3sARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib3sARB)

+#define SET_VertexAttrib3sARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3sARB, fn)

+#define CALL_VertexAttrib3svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib3svARB, parameters)

+#define GET_VertexAttrib3svARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib3svARB)

+#define SET_VertexAttrib3svARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3svARB, fn)

+#define CALL_VertexAttrib4NbvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLbyte *)), _gloffset_VertexAttrib4NbvARB, parameters)

+#define GET_VertexAttrib4NbvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NbvARB)

+#define SET_VertexAttrib4NbvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NbvARB, fn)

+#define CALL_VertexAttrib4NivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLint *)), _gloffset_VertexAttrib4NivARB, parameters)

+#define GET_VertexAttrib4NivARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NivARB)

+#define SET_VertexAttrib4NivARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NivARB, fn)

+#define CALL_VertexAttrib4NsvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib4NsvARB, parameters)

+#define GET_VertexAttrib4NsvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NsvARB)

+#define SET_VertexAttrib4NsvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NsvARB, fn)

+#define CALL_VertexAttrib4NubARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)), _gloffset_VertexAttrib4NubARB, parameters)

+#define GET_VertexAttrib4NubARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NubARB)

+#define SET_VertexAttrib4NubARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NubARB, fn)

+#define CALL_VertexAttrib4NubvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLubyte *)), _gloffset_VertexAttrib4NubvARB, parameters)

+#define GET_VertexAttrib4NubvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NubvARB)

+#define SET_VertexAttrib4NubvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NubvARB, fn)

+#define CALL_VertexAttrib4NuivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLuint *)), _gloffset_VertexAttrib4NuivARB, parameters)

+#define GET_VertexAttrib4NuivARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NuivARB)

+#define SET_VertexAttrib4NuivARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NuivARB, fn)

+#define CALL_VertexAttrib4NusvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLushort *)), _gloffset_VertexAttrib4NusvARB, parameters)

+#define GET_VertexAttrib4NusvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4NusvARB)

+#define SET_VertexAttrib4NusvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4NusvARB, fn)

+#define CALL_VertexAttrib4bvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLbyte *)), _gloffset_VertexAttrib4bvARB, parameters)

+#define GET_VertexAttrib4bvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4bvARB)

+#define SET_VertexAttrib4bvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4bvARB, fn)

+#define CALL_VertexAttrib4dARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_VertexAttrib4dARB, parameters)

+#define GET_VertexAttrib4dARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4dARB)

+#define SET_VertexAttrib4dARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4dARB, fn)

+#define CALL_VertexAttrib4dvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib4dvARB, parameters)

+#define GET_VertexAttrib4dvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4dvARB)

+#define SET_VertexAttrib4dvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4dvARB, fn)

+#define CALL_VertexAttrib4fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_VertexAttrib4fARB, parameters)

+#define GET_VertexAttrib4fARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4fARB)

+#define SET_VertexAttrib4fARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4fARB, fn)

+#define CALL_VertexAttrib4fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib4fvARB, parameters)

+#define GET_VertexAttrib4fvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4fvARB)

+#define SET_VertexAttrib4fvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4fvARB, fn)

+#define CALL_VertexAttrib4ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLint *)), _gloffset_VertexAttrib4ivARB, parameters)

+#define GET_VertexAttrib4ivARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4ivARB)

+#define SET_VertexAttrib4ivARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4ivARB, fn)

+#define CALL_VertexAttrib4sARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort, GLshort, GLshort, GLshort)), _gloffset_VertexAttrib4sARB, parameters)

+#define GET_VertexAttrib4sARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4sARB)

+#define SET_VertexAttrib4sARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4sARB, fn)

+#define CALL_VertexAttrib4svARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib4svARB, parameters)

+#define GET_VertexAttrib4svARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4svARB)

+#define SET_VertexAttrib4svARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4svARB, fn)

+#define CALL_VertexAttrib4ubvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLubyte *)), _gloffset_VertexAttrib4ubvARB, parameters)

+#define GET_VertexAttrib4ubvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4ubvARB)

+#define SET_VertexAttrib4ubvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4ubvARB, fn)

+#define CALL_VertexAttrib4uivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLuint *)), _gloffset_VertexAttrib4uivARB, parameters)

+#define GET_VertexAttrib4uivARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4uivARB)

+#define SET_VertexAttrib4uivARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4uivARB, fn)

+#define CALL_VertexAttrib4usvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLushort *)), _gloffset_VertexAttrib4usvARB, parameters)

+#define GET_VertexAttrib4usvARB(disp) GET_by_offset(disp, _gloffset_VertexAttrib4usvARB)

+#define SET_VertexAttrib4usvARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4usvARB, fn)

+#define CALL_VertexAttribPointerARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *)), _gloffset_VertexAttribPointerARB, parameters)

+#define GET_VertexAttribPointerARB(disp) GET_by_offset(disp, _gloffset_VertexAttribPointerARB)

+#define SET_VertexAttribPointerARB(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribPointerARB, fn)

+#define CALL_BindBufferARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindBufferARB, parameters)

+#define GET_BindBufferARB(disp) GET_by_offset(disp, _gloffset_BindBufferARB)

+#define SET_BindBufferARB(disp, fn) SET_by_offset(disp, _gloffset_BindBufferARB, fn)

+#define CALL_BufferDataARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizeiptrARB, const GLvoid *, GLenum)), _gloffset_BufferDataARB, parameters)

+#define GET_BufferDataARB(disp) GET_by_offset(disp, _gloffset_BufferDataARB)

+#define SET_BufferDataARB(disp, fn) SET_by_offset(disp, _gloffset_BufferDataARB, fn)

+#define CALL_BufferSubDataARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *)), _gloffset_BufferSubDataARB, parameters)

+#define GET_BufferSubDataARB(disp) GET_by_offset(disp, _gloffset_BufferSubDataARB)

+#define SET_BufferSubDataARB(disp, fn) SET_by_offset(disp, _gloffset_BufferSubDataARB, fn)

+#define CALL_DeleteBuffersARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteBuffersARB, parameters)

+#define GET_DeleteBuffersARB(disp) GET_by_offset(disp, _gloffset_DeleteBuffersARB)

+#define SET_DeleteBuffersARB(disp, fn) SET_by_offset(disp, _gloffset_DeleteBuffersARB, fn)

+#define CALL_GenBuffersARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenBuffersARB, parameters)

+#define GET_GenBuffersARB(disp) GET_by_offset(disp, _gloffset_GenBuffersARB)

+#define SET_GenBuffersARB(disp, fn) SET_by_offset(disp, _gloffset_GenBuffersARB, fn)

+#define CALL_GetBufferParameterivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetBufferParameterivARB, parameters)

+#define GET_GetBufferParameterivARB(disp) GET_by_offset(disp, _gloffset_GetBufferParameterivARB)

+#define SET_GetBufferParameterivARB(disp, fn) SET_by_offset(disp, _gloffset_GetBufferParameterivARB, fn)

+#define CALL_GetBufferPointervARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLvoid **)), _gloffset_GetBufferPointervARB, parameters)

+#define GET_GetBufferPointervARB(disp) GET_by_offset(disp, _gloffset_GetBufferPointervARB)

+#define SET_GetBufferPointervARB(disp, fn) SET_by_offset(disp, _gloffset_GetBufferPointervARB, fn)

+#define CALL_GetBufferSubDataARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *)), _gloffset_GetBufferSubDataARB, parameters)

+#define GET_GetBufferSubDataARB(disp) GET_by_offset(disp, _gloffset_GetBufferSubDataARB)

+#define SET_GetBufferSubDataARB(disp, fn) SET_by_offset(disp, _gloffset_GetBufferSubDataARB, fn)

+#define CALL_IsBufferARB(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsBufferARB, parameters)

+#define GET_IsBufferARB(disp) GET_by_offset(disp, _gloffset_IsBufferARB)

+#define SET_IsBufferARB(disp, fn) SET_by_offset(disp, _gloffset_IsBufferARB, fn)

+#define CALL_MapBufferARB(disp, parameters) CALL_by_offset(disp, (GLvoid * (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_MapBufferARB, parameters)

+#define GET_MapBufferARB(disp) GET_by_offset(disp, _gloffset_MapBufferARB)

+#define SET_MapBufferARB(disp, fn) SET_by_offset(disp, _gloffset_MapBufferARB, fn)

+#define CALL_UnmapBufferARB(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLenum)), _gloffset_UnmapBufferARB, parameters)

+#define GET_UnmapBufferARB(disp) GET_by_offset(disp, _gloffset_UnmapBufferARB)

+#define SET_UnmapBufferARB(disp, fn) SET_by_offset(disp, _gloffset_UnmapBufferARB, fn)

+#define CALL_BeginQueryARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BeginQueryARB, parameters)

+#define GET_BeginQueryARB(disp) GET_by_offset(disp, _gloffset_BeginQueryARB)

+#define SET_BeginQueryARB(disp, fn) SET_by_offset(disp, _gloffset_BeginQueryARB, fn)

+#define CALL_DeleteQueriesARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteQueriesARB, parameters)

+#define GET_DeleteQueriesARB(disp) GET_by_offset(disp, _gloffset_DeleteQueriesARB)

+#define SET_DeleteQueriesARB(disp, fn) SET_by_offset(disp, _gloffset_DeleteQueriesARB, fn)

+#define CALL_EndQueryARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_EndQueryARB, parameters)

+#define GET_EndQueryARB(disp) GET_by_offset(disp, _gloffset_EndQueryARB)

+#define SET_EndQueryARB(disp, fn) SET_by_offset(disp, _gloffset_EndQueryARB, fn)

+#define CALL_GenQueriesARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenQueriesARB, parameters)

+#define GET_GenQueriesARB(disp) GET_by_offset(disp, _gloffset_GenQueriesARB)

+#define SET_GenQueriesARB(disp, fn) SET_by_offset(disp, _gloffset_GenQueriesARB, fn)

+#define CALL_GetQueryObjectivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetQueryObjectivARB, parameters)

+#define GET_GetQueryObjectivARB(disp) GET_by_offset(disp, _gloffset_GetQueryObjectivARB)

+#define SET_GetQueryObjectivARB(disp, fn) SET_by_offset(disp, _gloffset_GetQueryObjectivARB, fn)

+#define CALL_GetQueryObjectuivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLuint *)), _gloffset_GetQueryObjectuivARB, parameters)

+#define GET_GetQueryObjectuivARB(disp) GET_by_offset(disp, _gloffset_GetQueryObjectuivARB)

+#define SET_GetQueryObjectuivARB(disp, fn) SET_by_offset(disp, _gloffset_GetQueryObjectuivARB, fn)

+#define CALL_GetQueryivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetQueryivARB, parameters)

+#define GET_GetQueryivARB(disp) GET_by_offset(disp, _gloffset_GetQueryivARB)

+#define SET_GetQueryivARB(disp, fn) SET_by_offset(disp, _gloffset_GetQueryivARB, fn)

+#define CALL_IsQueryARB(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsQueryARB, parameters)

+#define GET_IsQueryARB(disp) GET_by_offset(disp, _gloffset_IsQueryARB)

+#define SET_IsQueryARB(disp, fn) SET_by_offset(disp, _gloffset_IsQueryARB, fn)

+#define CALL_AttachObjectARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLhandleARB)), _gloffset_AttachObjectARB, parameters)

+#define GET_AttachObjectARB(disp) GET_by_offset(disp, _gloffset_AttachObjectARB)

+#define SET_AttachObjectARB(disp, fn) SET_by_offset(disp, _gloffset_AttachObjectARB, fn)

+#define CALL_CompileShaderARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB)), _gloffset_CompileShaderARB, parameters)

+#define GET_CompileShaderARB(disp) GET_by_offset(disp, _gloffset_CompileShaderARB)

+#define SET_CompileShaderARB(disp, fn) SET_by_offset(disp, _gloffset_CompileShaderARB, fn)

+#define CALL_CreateProgramObjectARB(disp, parameters) CALL_by_offset(disp, (GLhandleARB (GLAPIENTRYP)(void)), _gloffset_CreateProgramObjectARB, parameters)

+#define GET_CreateProgramObjectARB(disp) GET_by_offset(disp, _gloffset_CreateProgramObjectARB)

+#define SET_CreateProgramObjectARB(disp, fn) SET_by_offset(disp, _gloffset_CreateProgramObjectARB, fn)

+#define CALL_CreateShaderObjectARB(disp, parameters) CALL_by_offset(disp, (GLhandleARB (GLAPIENTRYP)(GLenum)), _gloffset_CreateShaderObjectARB, parameters)

+#define GET_CreateShaderObjectARB(disp) GET_by_offset(disp, _gloffset_CreateShaderObjectARB)

+#define SET_CreateShaderObjectARB(disp, fn) SET_by_offset(disp, _gloffset_CreateShaderObjectARB, fn)

+#define CALL_DeleteObjectARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB)), _gloffset_DeleteObjectARB, parameters)

+#define GET_DeleteObjectARB(disp) GET_by_offset(disp, _gloffset_DeleteObjectARB)

+#define SET_DeleteObjectARB(disp, fn) SET_by_offset(disp, _gloffset_DeleteObjectARB, fn)

+#define CALL_DetachObjectARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLhandleARB)), _gloffset_DetachObjectARB, parameters)

+#define GET_DetachObjectARB(disp) GET_by_offset(disp, _gloffset_DetachObjectARB)

+#define SET_DetachObjectARB(disp, fn) SET_by_offset(disp, _gloffset_DetachObjectARB, fn)

+#define CALL_GetActiveUniformARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)), _gloffset_GetActiveUniformARB, parameters)

+#define GET_GetActiveUniformARB(disp) GET_by_offset(disp, _gloffset_GetActiveUniformARB)

+#define SET_GetActiveUniformARB(disp, fn) SET_by_offset(disp, _gloffset_GetActiveUniformARB, fn)

+#define CALL_GetAttachedObjectsARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *)), _gloffset_GetAttachedObjectsARB, parameters)

+#define GET_GetAttachedObjectsARB(disp) GET_by_offset(disp, _gloffset_GetAttachedObjectsARB)

+#define SET_GetAttachedObjectsARB(disp, fn) SET_by_offset(disp, _gloffset_GetAttachedObjectsARB, fn)

+#define CALL_GetHandleARB(disp, parameters) CALL_by_offset(disp, (GLhandleARB (GLAPIENTRYP)(GLenum)), _gloffset_GetHandleARB, parameters)

+#define GET_GetHandleARB(disp) GET_by_offset(disp, _gloffset_GetHandleARB)

+#define SET_GetHandleARB(disp, fn) SET_by_offset(disp, _gloffset_GetHandleARB, fn)

+#define CALL_GetInfoLogARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)), _gloffset_GetInfoLogARB, parameters)

+#define GET_GetInfoLogARB(disp) GET_by_offset(disp, _gloffset_GetInfoLogARB)

+#define SET_GetInfoLogARB(disp, fn) SET_by_offset(disp, _gloffset_GetInfoLogARB, fn)

+#define CALL_GetObjectParameterfvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLenum, GLfloat *)), _gloffset_GetObjectParameterfvARB, parameters)

+#define GET_GetObjectParameterfvARB(disp) GET_by_offset(disp, _gloffset_GetObjectParameterfvARB)

+#define SET_GetObjectParameterfvARB(disp, fn) SET_by_offset(disp, _gloffset_GetObjectParameterfvARB, fn)

+#define CALL_GetObjectParameterivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLenum, GLint *)), _gloffset_GetObjectParameterivARB, parameters)

+#define GET_GetObjectParameterivARB(disp) GET_by_offset(disp, _gloffset_GetObjectParameterivARB)

+#define SET_GetObjectParameterivARB(disp, fn) SET_by_offset(disp, _gloffset_GetObjectParameterivARB, fn)

+#define CALL_GetShaderSourceARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)), _gloffset_GetShaderSourceARB, parameters)

+#define GET_GetShaderSourceARB(disp) GET_by_offset(disp, _gloffset_GetShaderSourceARB)

+#define SET_GetShaderSourceARB(disp, fn) SET_by_offset(disp, _gloffset_GetShaderSourceARB, fn)

+#define CALL_GetUniformLocationARB(disp, parameters) CALL_by_offset(disp, (GLint (GLAPIENTRYP)(GLhandleARB, const GLcharARB *)), _gloffset_GetUniformLocationARB, parameters)

+#define GET_GetUniformLocationARB(disp) GET_by_offset(disp, _gloffset_GetUniformLocationARB)

+#define SET_GetUniformLocationARB(disp, fn) SET_by_offset(disp, _gloffset_GetUniformLocationARB, fn)

+#define CALL_GetUniformfvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLint, GLfloat *)), _gloffset_GetUniformfvARB, parameters)

+#define GET_GetUniformfvARB(disp) GET_by_offset(disp, _gloffset_GetUniformfvARB)

+#define SET_GetUniformfvARB(disp, fn) SET_by_offset(disp, _gloffset_GetUniformfvARB, fn)

+#define CALL_GetUniformivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLint, GLint *)), _gloffset_GetUniformivARB, parameters)

+#define GET_GetUniformivARB(disp) GET_by_offset(disp, _gloffset_GetUniformivARB)

+#define SET_GetUniformivARB(disp, fn) SET_by_offset(disp, _gloffset_GetUniformivARB, fn)

+#define CALL_LinkProgramARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB)), _gloffset_LinkProgramARB, parameters)

+#define GET_LinkProgramARB(disp) GET_by_offset(disp, _gloffset_LinkProgramARB)

+#define SET_LinkProgramARB(disp, fn) SET_by_offset(disp, _gloffset_LinkProgramARB, fn)

+#define CALL_ShaderSourceARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLsizei, const GLcharARB **, const GLint *)), _gloffset_ShaderSourceARB, parameters)

+#define GET_ShaderSourceARB(disp) GET_by_offset(disp, _gloffset_ShaderSourceARB)

+#define SET_ShaderSourceARB(disp, fn) SET_by_offset(disp, _gloffset_ShaderSourceARB, fn)

+#define CALL_Uniform1fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLfloat)), _gloffset_Uniform1fARB, parameters)

+#define GET_Uniform1fARB(disp) GET_by_offset(disp, _gloffset_Uniform1fARB)

+#define SET_Uniform1fARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform1fARB, fn)

+#define CALL_Uniform1fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLfloat *)), _gloffset_Uniform1fvARB, parameters)

+#define GET_Uniform1fvARB(disp) GET_by_offset(disp, _gloffset_Uniform1fvARB)

+#define SET_Uniform1fvARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform1fvARB, fn)

+#define CALL_Uniform1iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint)), _gloffset_Uniform1iARB, parameters)

+#define GET_Uniform1iARB(disp) GET_by_offset(disp, _gloffset_Uniform1iARB)

+#define SET_Uniform1iARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform1iARB, fn)

+#define CALL_Uniform1ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLint *)), _gloffset_Uniform1ivARB, parameters)

+#define GET_Uniform1ivARB(disp) GET_by_offset(disp, _gloffset_Uniform1ivARB)

+#define SET_Uniform1ivARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform1ivARB, fn)

+#define CALL_Uniform2fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLfloat, GLfloat)), _gloffset_Uniform2fARB, parameters)

+#define GET_Uniform2fARB(disp) GET_by_offset(disp, _gloffset_Uniform2fARB)

+#define SET_Uniform2fARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform2fARB, fn)

+#define CALL_Uniform2fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLfloat *)), _gloffset_Uniform2fvARB, parameters)

+#define GET_Uniform2fvARB(disp) GET_by_offset(disp, _gloffset_Uniform2fvARB)

+#define SET_Uniform2fvARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform2fvARB, fn)

+#define CALL_Uniform2iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_Uniform2iARB, parameters)

+#define GET_Uniform2iARB(disp) GET_by_offset(disp, _gloffset_Uniform2iARB)

+#define SET_Uniform2iARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform2iARB, fn)

+#define CALL_Uniform2ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLint *)), _gloffset_Uniform2ivARB, parameters)

+#define GET_Uniform2ivARB(disp) GET_by_offset(disp, _gloffset_Uniform2ivARB)

+#define SET_Uniform2ivARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform2ivARB, fn)

+#define CALL_Uniform3fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLfloat, GLfloat, GLfloat)), _gloffset_Uniform3fARB, parameters)

+#define GET_Uniform3fARB(disp) GET_by_offset(disp, _gloffset_Uniform3fARB)

+#define SET_Uniform3fARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform3fARB, fn)

+#define CALL_Uniform3fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLfloat *)), _gloffset_Uniform3fvARB, parameters)

+#define GET_Uniform3fvARB(disp) GET_by_offset(disp, _gloffset_Uniform3fvARB)

+#define SET_Uniform3fvARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform3fvARB, fn)

+#define CALL_Uniform3iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_Uniform3iARB, parameters)

+#define GET_Uniform3iARB(disp) GET_by_offset(disp, _gloffset_Uniform3iARB)

+#define SET_Uniform3iARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform3iARB, fn)

+#define CALL_Uniform3ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLint *)), _gloffset_Uniform3ivARB, parameters)

+#define GET_Uniform3ivARB(disp) GET_by_offset(disp, _gloffset_Uniform3ivARB)

+#define SET_Uniform3ivARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform3ivARB, fn)

+#define CALL_Uniform4fARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_Uniform4fARB, parameters)

+#define GET_Uniform4fARB(disp) GET_by_offset(disp, _gloffset_Uniform4fARB)

+#define SET_Uniform4fARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform4fARB, fn)

+#define CALL_Uniform4fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLfloat *)), _gloffset_Uniform4fvARB, parameters)

+#define GET_Uniform4fvARB(disp) GET_by_offset(disp, _gloffset_Uniform4fvARB)

+#define SET_Uniform4fvARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform4fvARB, fn)

+#define CALL_Uniform4iARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint, GLint)), _gloffset_Uniform4iARB, parameters)

+#define GET_Uniform4iARB(disp) GET_by_offset(disp, _gloffset_Uniform4iARB)

+#define SET_Uniform4iARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform4iARB, fn)

+#define CALL_Uniform4ivARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLint *)), _gloffset_Uniform4ivARB, parameters)

+#define GET_Uniform4ivARB(disp) GET_by_offset(disp, _gloffset_Uniform4ivARB)

+#define SET_Uniform4ivARB(disp, fn) SET_by_offset(disp, _gloffset_Uniform4ivARB, fn)

+#define CALL_UniformMatrix2fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix2fvARB, parameters)

+#define GET_UniformMatrix2fvARB(disp) GET_by_offset(disp, _gloffset_UniformMatrix2fvARB)

+#define SET_UniformMatrix2fvARB(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix2fvARB, fn)

+#define CALL_UniformMatrix3fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix3fvARB, parameters)

+#define GET_UniformMatrix3fvARB(disp) GET_by_offset(disp, _gloffset_UniformMatrix3fvARB)

+#define SET_UniformMatrix3fvARB(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix3fvARB, fn)

+#define CALL_UniformMatrix4fvARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, GLboolean, const GLfloat *)), _gloffset_UniformMatrix4fvARB, parameters)

+#define GET_UniformMatrix4fvARB(disp) GET_by_offset(disp, _gloffset_UniformMatrix4fvARB)

+#define SET_UniformMatrix4fvARB(disp, fn) SET_by_offset(disp, _gloffset_UniformMatrix4fvARB, fn)

+#define CALL_UseProgramObjectARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB)), _gloffset_UseProgramObjectARB, parameters)

+#define GET_UseProgramObjectARB(disp) GET_by_offset(disp, _gloffset_UseProgramObjectARB)

+#define SET_UseProgramObjectARB(disp, fn) SET_by_offset(disp, _gloffset_UseProgramObjectARB, fn)

+#define CALL_ValidateProgramARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB)), _gloffset_ValidateProgramARB, parameters)

+#define GET_ValidateProgramARB(disp) GET_by_offset(disp, _gloffset_ValidateProgramARB)

+#define SET_ValidateProgramARB(disp, fn) SET_by_offset(disp, _gloffset_ValidateProgramARB, fn)

+#define CALL_BindAttribLocationARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLuint, const GLcharARB *)), _gloffset_BindAttribLocationARB, parameters)

+#define GET_BindAttribLocationARB(disp) GET_by_offset(disp, _gloffset_BindAttribLocationARB)

+#define SET_BindAttribLocationARB(disp, fn) SET_by_offset(disp, _gloffset_BindAttribLocationARB, fn)

+#define CALL_GetActiveAttribARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *)), _gloffset_GetActiveAttribARB, parameters)

+#define GET_GetActiveAttribARB(disp) GET_by_offset(disp, _gloffset_GetActiveAttribARB)

+#define SET_GetActiveAttribARB(disp, fn) SET_by_offset(disp, _gloffset_GetActiveAttribARB, fn)

+#define CALL_GetAttribLocationARB(disp, parameters) CALL_by_offset(disp, (GLint (GLAPIENTRYP)(GLhandleARB, const GLcharARB *)), _gloffset_GetAttribLocationARB, parameters)

+#define GET_GetAttribLocationARB(disp) GET_by_offset(disp, _gloffset_GetAttribLocationARB)

+#define SET_GetAttribLocationARB(disp, fn) SET_by_offset(disp, _gloffset_GetAttribLocationARB, fn)

+#define CALL_DrawBuffersARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLenum *)), _gloffset_DrawBuffersARB, parameters)

+#define GET_DrawBuffersARB(disp) GET_by_offset(disp, _gloffset_DrawBuffersARB)

+#define SET_DrawBuffersARB(disp, fn) SET_by_offset(disp, _gloffset_DrawBuffersARB, fn)

+#define CALL_DrawArraysInstancedARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint, GLsizei, GLsizei)), _gloffset_DrawArraysInstancedARB, parameters)

+#define GET_DrawArraysInstancedARB(disp) GET_by_offset(disp, _gloffset_DrawArraysInstancedARB)

+#define SET_DrawArraysInstancedARB(disp, fn) SET_by_offset(disp, _gloffset_DrawArraysInstancedARB, fn)

+#define CALL_DrawElementsInstancedARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei)), _gloffset_DrawElementsInstancedARB, parameters)

+#define GET_DrawElementsInstancedARB(disp) GET_by_offset(disp, _gloffset_DrawElementsInstancedARB)

+#define SET_DrawElementsInstancedARB(disp, fn) SET_by_offset(disp, _gloffset_DrawElementsInstancedARB, fn)

+#define CALL_RenderbufferStorageMultisample(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)), _gloffset_RenderbufferStorageMultisample, parameters)

+#define GET_RenderbufferStorageMultisample(disp) GET_by_offset(disp, _gloffset_RenderbufferStorageMultisample)

+#define SET_RenderbufferStorageMultisample(disp, fn) SET_by_offset(disp, _gloffset_RenderbufferStorageMultisample, fn)

+#define CALL_FramebufferTextureARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint)), _gloffset_FramebufferTextureARB, parameters)

+#define GET_FramebufferTextureARB(disp) GET_by_offset(disp, _gloffset_FramebufferTextureARB)

+#define SET_FramebufferTextureARB(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTextureARB, fn)

+#define CALL_FramebufferTextureFaceARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint, GLenum)), _gloffset_FramebufferTextureFaceARB, parameters)

+#define GET_FramebufferTextureFaceARB(disp) GET_by_offset(disp, _gloffset_FramebufferTextureFaceARB)

+#define SET_FramebufferTextureFaceARB(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTextureFaceARB, fn)

+#define CALL_ProgramParameteriARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint)), _gloffset_ProgramParameteriARB, parameters)

+#define GET_ProgramParameteriARB(disp) GET_by_offset(disp, _gloffset_ProgramParameteriARB)

+#define SET_ProgramParameteriARB(disp, fn) SET_by_offset(disp, _gloffset_ProgramParameteriARB, fn)

+#define CALL_FlushMappedBufferRange(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr)), _gloffset_FlushMappedBufferRange, parameters)

+#define GET_FlushMappedBufferRange(disp) GET_by_offset(disp, _gloffset_FlushMappedBufferRange)

+#define SET_FlushMappedBufferRange(disp, fn) SET_by_offset(disp, _gloffset_FlushMappedBufferRange, fn)

+#define CALL_MapBufferRange(disp, parameters) CALL_by_offset(disp, (GLvoid * (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr, GLbitfield)), _gloffset_MapBufferRange, parameters)

+#define GET_MapBufferRange(disp) GET_by_offset(disp, _gloffset_MapBufferRange)

+#define SET_MapBufferRange(disp, fn) SET_by_offset(disp, _gloffset_MapBufferRange, fn)

+#define CALL_BindVertexArray(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_BindVertexArray, parameters)

+#define GET_BindVertexArray(disp) GET_by_offset(disp, _gloffset_BindVertexArray)

+#define SET_BindVertexArray(disp, fn) SET_by_offset(disp, _gloffset_BindVertexArray, fn)

+#define CALL_GenVertexArrays(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenVertexArrays, parameters)

+#define GET_GenVertexArrays(disp) GET_by_offset(disp, _gloffset_GenVertexArrays)

+#define SET_GenVertexArrays(disp, fn) SET_by_offset(disp, _gloffset_GenVertexArrays, fn)

+#define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), _gloffset_CopyBufferSubData, parameters)

+#define GET_CopyBufferSubData(disp) GET_by_offset(disp, _gloffset_CopyBufferSubData)

+#define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, _gloffset_CopyBufferSubData, fn)

+#define CALL_ClientWaitSync(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(GLsync, GLbitfield, GLuint64)), _gloffset_ClientWaitSync, parameters)

+#define GET_ClientWaitSync(disp) GET_by_offset(disp, _gloffset_ClientWaitSync)

+#define SET_ClientWaitSync(disp, fn) SET_by_offset(disp, _gloffset_ClientWaitSync, fn)

+#define CALL_DeleteSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync)), _gloffset_DeleteSync, parameters)

+#define GET_DeleteSync(disp) GET_by_offset(disp, _gloffset_DeleteSync)

+#define SET_DeleteSync(disp, fn) SET_by_offset(disp, _gloffset_DeleteSync, fn)

+#define CALL_FenceSync(disp, parameters) CALL_by_offset(disp, (GLsync (GLAPIENTRYP)(GLenum, GLbitfield)), _gloffset_FenceSync, parameters)

+#define GET_FenceSync(disp) GET_by_offset(disp, _gloffset_FenceSync)

+#define SET_FenceSync(disp, fn) SET_by_offset(disp, _gloffset_FenceSync, fn)

+#define CALL_GetInteger64v(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint64 *)), _gloffset_GetInteger64v, parameters)

+#define GET_GetInteger64v(disp) GET_by_offset(disp, _gloffset_GetInteger64v)

+#define SET_GetInteger64v(disp, fn) SET_by_offset(disp, _gloffset_GetInteger64v, fn)

+#define CALL_GetSynciv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLenum, GLsizei, GLsizei *, GLint *)), _gloffset_GetSynciv, parameters)

+#define GET_GetSynciv(disp) GET_by_offset(disp, _gloffset_GetSynciv)

+#define SET_GetSynciv(disp, fn) SET_by_offset(disp, _gloffset_GetSynciv, fn)

+#define CALL_IsSync(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLsync)), _gloffset_IsSync, parameters)

+#define GET_IsSync(disp) GET_by_offset(disp, _gloffset_IsSync)

+#define SET_IsSync(disp, fn) SET_by_offset(disp, _gloffset_IsSync, fn)

+#define CALL_WaitSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLbitfield, GLuint64)), _gloffset_WaitSync, parameters)

+#define GET_WaitSync(disp) GET_by_offset(disp, _gloffset_WaitSync)

+#define SET_WaitSync(disp, fn) SET_by_offset(disp, _gloffset_WaitSync, fn)

+#define CALL_DrawElementsBaseVertex(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLenum, const GLvoid *, GLint)), _gloffset_DrawElementsBaseVertex, parameters)

+#define GET_DrawElementsBaseVertex(disp) GET_by_offset(disp, _gloffset_DrawElementsBaseVertex)

+#define SET_DrawElementsBaseVertex(disp, fn) SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn)

+#define CALL_DrawRangeElementsBaseVertex(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint)), _gloffset_DrawRangeElementsBaseVertex, parameters)

+#define GET_DrawRangeElementsBaseVertex(disp) GET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex)

+#define SET_DrawRangeElementsBaseVertex(disp, fn) SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn)

+#define CALL_MultiDrawElementsBaseVertex(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *)), _gloffset_MultiDrawElementsBaseVertex, parameters)

+#define GET_MultiDrawElementsBaseVertex(disp) GET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex)

+#define SET_MultiDrawElementsBaseVertex(disp, fn) SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn)

+#define CALL_BindTransformFeedback(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindTransformFeedback, parameters)

+#define GET_BindTransformFeedback(disp) GET_by_offset(disp, _gloffset_BindTransformFeedback)

+#define SET_BindTransformFeedback(disp, fn) SET_by_offset(disp, _gloffset_BindTransformFeedback, fn)

+#define CALL_DeleteTransformFeedbacks(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteTransformFeedbacks, parameters)

+#define GET_DeleteTransformFeedbacks(disp) GET_by_offset(disp, _gloffset_DeleteTransformFeedbacks)

+#define SET_DeleteTransformFeedbacks(disp, fn) SET_by_offset(disp, _gloffset_DeleteTransformFeedbacks, fn)

+#define CALL_DrawTransformFeedback(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_DrawTransformFeedback, parameters)

+#define GET_DrawTransformFeedback(disp) GET_by_offset(disp, _gloffset_DrawTransformFeedback)

+#define SET_DrawTransformFeedback(disp, fn) SET_by_offset(disp, _gloffset_DrawTransformFeedback, fn)

+#define CALL_GenTransformFeedbacks(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenTransformFeedbacks, parameters)

+#define GET_GenTransformFeedbacks(disp) GET_by_offset(disp, _gloffset_GenTransformFeedbacks)

+#define SET_GenTransformFeedbacks(disp, fn) SET_by_offset(disp, _gloffset_GenTransformFeedbacks, fn)

+#define CALL_IsTransformFeedback(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsTransformFeedback, parameters)

+#define GET_IsTransformFeedback(disp) GET_by_offset(disp, _gloffset_IsTransformFeedback)

+#define SET_IsTransformFeedback(disp, fn) SET_by_offset(disp, _gloffset_IsTransformFeedback, fn)

+#define CALL_PauseTransformFeedback(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PauseTransformFeedback, parameters)

+#define GET_PauseTransformFeedback(disp) GET_by_offset(disp, _gloffset_PauseTransformFeedback)

+#define SET_PauseTransformFeedback(disp, fn) SET_by_offset(disp, _gloffset_PauseTransformFeedback, fn)

+#define CALL_ResumeTransformFeedback(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_ResumeTransformFeedback, parameters)

+#define GET_ResumeTransformFeedback(disp) GET_by_offset(disp, _gloffset_ResumeTransformFeedback)

+#define SET_ResumeTransformFeedback(disp, fn) SET_by_offset(disp, _gloffset_ResumeTransformFeedback, fn)

+#define CALL_PolygonOffsetEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_PolygonOffsetEXT, parameters)

+#define GET_PolygonOffsetEXT(disp) GET_by_offset(disp, _gloffset_PolygonOffsetEXT)

+#define SET_PolygonOffsetEXT(disp, fn) SET_by_offset(disp, _gloffset_PolygonOffsetEXT, fn)

+#define CALL_GetPixelTexGenParameterfvSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat *)), _gloffset_GetPixelTexGenParameterfvSGIS, parameters)

+#define GET_GetPixelTexGenParameterfvSGIS(disp) GET_by_offset(disp, _gloffset_GetPixelTexGenParameterfvSGIS)

+#define SET_GetPixelTexGenParameterfvSGIS(disp, fn) SET_by_offset(disp, _gloffset_GetPixelTexGenParameterfvSGIS, fn)

+#define CALL_GetPixelTexGenParameterivSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint *)), _gloffset_GetPixelTexGenParameterivSGIS, parameters)

+#define GET_GetPixelTexGenParameterivSGIS(disp) GET_by_offset(disp, _gloffset_GetPixelTexGenParameterivSGIS)

+#define SET_GetPixelTexGenParameterivSGIS(disp, fn) SET_by_offset(disp, _gloffset_GetPixelTexGenParameterivSGIS, fn)

+#define CALL_PixelTexGenParameterfSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_PixelTexGenParameterfSGIS, parameters)

+#define GET_PixelTexGenParameterfSGIS(disp) GET_by_offset(disp, _gloffset_PixelTexGenParameterfSGIS)

+#define SET_PixelTexGenParameterfSGIS(disp, fn) SET_by_offset(disp, _gloffset_PixelTexGenParameterfSGIS, fn)

+#define CALL_PixelTexGenParameterfvSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_PixelTexGenParameterfvSGIS, parameters)

+#define GET_PixelTexGenParameterfvSGIS(disp) GET_by_offset(disp, _gloffset_PixelTexGenParameterfvSGIS)

+#define SET_PixelTexGenParameterfvSGIS(disp, fn) SET_by_offset(disp, _gloffset_PixelTexGenParameterfvSGIS, fn)

+#define CALL_PixelTexGenParameteriSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_PixelTexGenParameteriSGIS, parameters)

+#define GET_PixelTexGenParameteriSGIS(disp) GET_by_offset(disp, _gloffset_PixelTexGenParameteriSGIS)

+#define SET_PixelTexGenParameteriSGIS(disp, fn) SET_by_offset(disp, _gloffset_PixelTexGenParameteriSGIS, fn)

+#define CALL_PixelTexGenParameterivSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_PixelTexGenParameterivSGIS, parameters)

+#define GET_PixelTexGenParameterivSGIS(disp) GET_by_offset(disp, _gloffset_PixelTexGenParameterivSGIS)

+#define SET_PixelTexGenParameterivSGIS(disp, fn) SET_by_offset(disp, _gloffset_PixelTexGenParameterivSGIS, fn)

+#define CALL_SampleMaskSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampf, GLboolean)), _gloffset_SampleMaskSGIS, parameters)

+#define GET_SampleMaskSGIS(disp) GET_by_offset(disp, _gloffset_SampleMaskSGIS)

+#define SET_SampleMaskSGIS(disp, fn) SET_by_offset(disp, _gloffset_SampleMaskSGIS, fn)

+#define CALL_SamplePatternSGIS(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_SamplePatternSGIS, parameters)

+#define GET_SamplePatternSGIS(disp) GET_by_offset(disp, _gloffset_SamplePatternSGIS)

+#define SET_SamplePatternSGIS(disp, fn) SET_by_offset(disp, _gloffset_SamplePatternSGIS, fn)

+#define CALL_ColorPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)), _gloffset_ColorPointerEXT, parameters)

+#define GET_ColorPointerEXT(disp) GET_by_offset(disp, _gloffset_ColorPointerEXT)

+#define SET_ColorPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_ColorPointerEXT, fn)

+#define CALL_EdgeFlagPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLsizei, const GLboolean *)), _gloffset_EdgeFlagPointerEXT, parameters)

+#define GET_EdgeFlagPointerEXT(disp) GET_by_offset(disp, _gloffset_EdgeFlagPointerEXT)

+#define SET_EdgeFlagPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_EdgeFlagPointerEXT, fn)

+#define CALL_IndexPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLsizei, const GLvoid *)), _gloffset_IndexPointerEXT, parameters)

+#define GET_IndexPointerEXT(disp) GET_by_offset(disp, _gloffset_IndexPointerEXT)

+#define SET_IndexPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_IndexPointerEXT, fn)

+#define CALL_NormalPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLsizei, const GLvoid *)), _gloffset_NormalPointerEXT, parameters)

+#define GET_NormalPointerEXT(disp) GET_by_offset(disp, _gloffset_NormalPointerEXT)

+#define SET_NormalPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_NormalPointerEXT, fn)

+#define CALL_TexCoordPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)), _gloffset_TexCoordPointerEXT, parameters)

+#define GET_TexCoordPointerEXT(disp) GET_by_offset(disp, _gloffset_TexCoordPointerEXT)

+#define SET_TexCoordPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_TexCoordPointerEXT, fn)

+#define CALL_VertexPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)), _gloffset_VertexPointerEXT, parameters)

+#define GET_VertexPointerEXT(disp) GET_by_offset(disp, _gloffset_VertexPointerEXT)

+#define SET_VertexPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexPointerEXT, fn)

+#define CALL_PointParameterfEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_PointParameterfEXT, parameters)

+#define GET_PointParameterfEXT(disp) GET_by_offset(disp, _gloffset_PointParameterfEXT)

+#define SET_PointParameterfEXT(disp, fn) SET_by_offset(disp, _gloffset_PointParameterfEXT, fn)

+#define CALL_PointParameterfvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_PointParameterfvEXT, parameters)

+#define GET_PointParameterfvEXT(disp) GET_by_offset(disp, _gloffset_PointParameterfvEXT)

+#define SET_PointParameterfvEXT(disp, fn) SET_by_offset(disp, _gloffset_PointParameterfvEXT, fn)

+#define CALL_LockArraysEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei)), _gloffset_LockArraysEXT, parameters)

+#define GET_LockArraysEXT(disp) GET_by_offset(disp, _gloffset_LockArraysEXT)

+#define SET_LockArraysEXT(disp, fn) SET_by_offset(disp, _gloffset_LockArraysEXT, fn)

+#define CALL_UnlockArraysEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_UnlockArraysEXT, parameters)

+#define GET_UnlockArraysEXT(disp) GET_by_offset(disp, _gloffset_UnlockArraysEXT)

+#define SET_UnlockArraysEXT(disp, fn) SET_by_offset(disp, _gloffset_UnlockArraysEXT, fn)

+#define CALL_SecondaryColor3bEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLbyte, GLbyte, GLbyte)), _gloffset_SecondaryColor3bEXT, parameters)

+#define GET_SecondaryColor3bEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3bEXT)

+#define SET_SecondaryColor3bEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3bEXT, fn)

+#define CALL_SecondaryColor3bvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLbyte *)), _gloffset_SecondaryColor3bvEXT, parameters)

+#define GET_SecondaryColor3bvEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3bvEXT)

+#define SET_SecondaryColor3bvEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3bvEXT, fn)

+#define CALL_SecondaryColor3dEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_SecondaryColor3dEXT, parameters)

+#define GET_SecondaryColor3dEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3dEXT)

+#define SET_SecondaryColor3dEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3dEXT, fn)

+#define CALL_SecondaryColor3dvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_SecondaryColor3dvEXT, parameters)

+#define GET_SecondaryColor3dvEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3dvEXT)

+#define SET_SecondaryColor3dvEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3dvEXT, fn)

+#define CALL_SecondaryColor3fEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_SecondaryColor3fEXT, parameters)

+#define GET_SecondaryColor3fEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3fEXT)

+#define SET_SecondaryColor3fEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3fEXT, fn)

+#define CALL_SecondaryColor3fvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_SecondaryColor3fvEXT, parameters)

+#define GET_SecondaryColor3fvEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3fvEXT)

+#define SET_SecondaryColor3fvEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3fvEXT, fn)

+#define CALL_SecondaryColor3iEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_SecondaryColor3iEXT, parameters)

+#define GET_SecondaryColor3iEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3iEXT)

+#define SET_SecondaryColor3iEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3iEXT, fn)

+#define CALL_SecondaryColor3ivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_SecondaryColor3ivEXT, parameters)

+#define GET_SecondaryColor3ivEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3ivEXT)

+#define SET_SecondaryColor3ivEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3ivEXT, fn)

+#define CALL_SecondaryColor3sEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_SecondaryColor3sEXT, parameters)

+#define GET_SecondaryColor3sEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3sEXT)

+#define SET_SecondaryColor3sEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3sEXT, fn)

+#define CALL_SecondaryColor3svEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_SecondaryColor3svEXT, parameters)

+#define GET_SecondaryColor3svEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3svEXT)

+#define SET_SecondaryColor3svEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3svEXT, fn)

+#define CALL_SecondaryColor3ubEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLubyte, GLubyte, GLubyte)), _gloffset_SecondaryColor3ubEXT, parameters)

+#define GET_SecondaryColor3ubEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3ubEXT)

+#define SET_SecondaryColor3ubEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3ubEXT, fn)

+#define CALL_SecondaryColor3ubvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLubyte *)), _gloffset_SecondaryColor3ubvEXT, parameters)

+#define GET_SecondaryColor3ubvEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3ubvEXT)

+#define SET_SecondaryColor3ubvEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3ubvEXT, fn)

+#define CALL_SecondaryColor3uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint)), _gloffset_SecondaryColor3uiEXT, parameters)

+#define GET_SecondaryColor3uiEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3uiEXT)

+#define SET_SecondaryColor3uiEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3uiEXT, fn)

+#define CALL_SecondaryColor3uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLuint *)), _gloffset_SecondaryColor3uivEXT, parameters)

+#define GET_SecondaryColor3uivEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3uivEXT)

+#define SET_SecondaryColor3uivEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3uivEXT, fn)

+#define CALL_SecondaryColor3usEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLushort, GLushort, GLushort)), _gloffset_SecondaryColor3usEXT, parameters)

+#define GET_SecondaryColor3usEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3usEXT)

+#define SET_SecondaryColor3usEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3usEXT, fn)

+#define CALL_SecondaryColor3usvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLushort *)), _gloffset_SecondaryColor3usvEXT, parameters)

+#define GET_SecondaryColor3usvEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColor3usvEXT)

+#define SET_SecondaryColor3usvEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColor3usvEXT, fn)

+#define CALL_SecondaryColorPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLenum, GLsizei, const GLvoid *)), _gloffset_SecondaryColorPointerEXT, parameters)

+#define GET_SecondaryColorPointerEXT(disp) GET_by_offset(disp, _gloffset_SecondaryColorPointerEXT)

+#define SET_SecondaryColorPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_SecondaryColorPointerEXT, fn)

+#define CALL_MultiDrawArraysEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *, const GLsizei *, GLsizei)), _gloffset_MultiDrawArraysEXT, parameters)

+#define GET_MultiDrawArraysEXT(disp) GET_by_offset(disp, _gloffset_MultiDrawArraysEXT)

+#define SET_MultiDrawArraysEXT(disp, fn) SET_by_offset(disp, _gloffset_MultiDrawArraysEXT, fn)

+#define CALL_MultiDrawElementsEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei)), _gloffset_MultiDrawElementsEXT, parameters)

+#define GET_MultiDrawElementsEXT(disp) GET_by_offset(disp, _gloffset_MultiDrawElementsEXT)

+#define SET_MultiDrawElementsEXT(disp, fn) SET_by_offset(disp, _gloffset_MultiDrawElementsEXT, fn)

+#define CALL_FogCoordPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, const GLvoid *)), _gloffset_FogCoordPointerEXT, parameters)

+#define GET_FogCoordPointerEXT(disp) GET_by_offset(disp, _gloffset_FogCoordPointerEXT)

+#define SET_FogCoordPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_FogCoordPointerEXT, fn)

+#define CALL_FogCoorddEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble)), _gloffset_FogCoorddEXT, parameters)

+#define GET_FogCoorddEXT(disp) GET_by_offset(disp, _gloffset_FogCoorddEXT)

+#define SET_FogCoorddEXT(disp, fn) SET_by_offset(disp, _gloffset_FogCoorddEXT, fn)

+#define CALL_FogCoorddvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_FogCoorddvEXT, parameters)

+#define GET_FogCoorddvEXT(disp) GET_by_offset(disp, _gloffset_FogCoorddvEXT)

+#define SET_FogCoorddvEXT(disp, fn) SET_by_offset(disp, _gloffset_FogCoorddvEXT, fn)

+#define CALL_FogCoordfEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat)), _gloffset_FogCoordfEXT, parameters)

+#define GET_FogCoordfEXT(disp) GET_by_offset(disp, _gloffset_FogCoordfEXT)

+#define SET_FogCoordfEXT(disp, fn) SET_by_offset(disp, _gloffset_FogCoordfEXT, fn)

+#define CALL_FogCoordfvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_FogCoordfvEXT, parameters)

+#define GET_FogCoordfvEXT(disp) GET_by_offset(disp, _gloffset_FogCoordfvEXT)

+#define SET_FogCoordfvEXT(disp, fn) SET_by_offset(disp, _gloffset_FogCoordfvEXT, fn)

+#define CALL_PixelTexGenSGIX(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_PixelTexGenSGIX, parameters)

+#define GET_PixelTexGenSGIX(disp) GET_by_offset(disp, _gloffset_PixelTexGenSGIX)

+#define SET_PixelTexGenSGIX(disp, fn) SET_by_offset(disp, _gloffset_PixelTexGenSGIX, fn)

+#define CALL_BlendFuncSeparateEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum)), _gloffset_BlendFuncSeparateEXT, parameters)

+#define GET_BlendFuncSeparateEXT(disp) GET_by_offset(disp, _gloffset_BlendFuncSeparateEXT)

+#define SET_BlendFuncSeparateEXT(disp, fn) SET_by_offset(disp, _gloffset_BlendFuncSeparateEXT, fn)

+#define CALL_FlushVertexArrayRangeNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_FlushVertexArrayRangeNV, parameters)

+#define GET_FlushVertexArrayRangeNV(disp) GET_by_offset(disp, _gloffset_FlushVertexArrayRangeNV)

+#define SET_FlushVertexArrayRangeNV(disp, fn) SET_by_offset(disp, _gloffset_FlushVertexArrayRangeNV, fn)

+#define CALL_VertexArrayRangeNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLvoid *)), _gloffset_VertexArrayRangeNV, parameters)

+#define GET_VertexArrayRangeNV(disp) GET_by_offset(disp, _gloffset_VertexArrayRangeNV)

+#define SET_VertexArrayRangeNV(disp, fn) SET_by_offset(disp, _gloffset_VertexArrayRangeNV, fn)

+#define CALL_CombinerInputNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum)), _gloffset_CombinerInputNV, parameters)

+#define GET_CombinerInputNV(disp) GET_by_offset(disp, _gloffset_CombinerInputNV)

+#define SET_CombinerInputNV(disp, fn) SET_by_offset(disp, _gloffset_CombinerInputNV, fn)

+#define CALL_CombinerOutputNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean)), _gloffset_CombinerOutputNV, parameters)

+#define GET_CombinerOutputNV(disp) GET_by_offset(disp, _gloffset_CombinerOutputNV)

+#define SET_CombinerOutputNV(disp, fn) SET_by_offset(disp, _gloffset_CombinerOutputNV, fn)

+#define CALL_CombinerParameterfNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat)), _gloffset_CombinerParameterfNV, parameters)

+#define GET_CombinerParameterfNV(disp) GET_by_offset(disp, _gloffset_CombinerParameterfNV)

+#define SET_CombinerParameterfNV(disp, fn) SET_by_offset(disp, _gloffset_CombinerParameterfNV, fn)

+#define CALL_CombinerParameterfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_CombinerParameterfvNV, parameters)

+#define GET_CombinerParameterfvNV(disp) GET_by_offset(disp, _gloffset_CombinerParameterfvNV)

+#define SET_CombinerParameterfvNV(disp, fn) SET_by_offset(disp, _gloffset_CombinerParameterfvNV, fn)

+#define CALL_CombinerParameteriNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_CombinerParameteriNV, parameters)

+#define GET_CombinerParameteriNV(disp) GET_by_offset(disp, _gloffset_CombinerParameteriNV)

+#define SET_CombinerParameteriNV(disp, fn) SET_by_offset(disp, _gloffset_CombinerParameteriNV, fn)

+#define CALL_CombinerParameterivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_CombinerParameterivNV, parameters)

+#define GET_CombinerParameterivNV(disp) GET_by_offset(disp, _gloffset_CombinerParameterivNV)

+#define SET_CombinerParameterivNV(disp, fn) SET_by_offset(disp, _gloffset_CombinerParameterivNV, fn)

+#define CALL_FinalCombinerInputNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum)), _gloffset_FinalCombinerInputNV, parameters)

+#define GET_FinalCombinerInputNV(disp) GET_by_offset(disp, _gloffset_FinalCombinerInputNV)

+#define SET_FinalCombinerInputNV(disp, fn) SET_by_offset(disp, _gloffset_FinalCombinerInputNV, fn)

+#define CALL_GetCombinerInputParameterfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum, GLfloat *)), _gloffset_GetCombinerInputParameterfvNV, parameters)

+#define GET_GetCombinerInputParameterfvNV(disp) GET_by_offset(disp, _gloffset_GetCombinerInputParameterfvNV)

+#define SET_GetCombinerInputParameterfvNV(disp, fn) SET_by_offset(disp, _gloffset_GetCombinerInputParameterfvNV, fn)

+#define CALL_GetCombinerInputParameterivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLenum, GLint *)), _gloffset_GetCombinerInputParameterivNV, parameters)

+#define GET_GetCombinerInputParameterivNV(disp) GET_by_offset(disp, _gloffset_GetCombinerInputParameterivNV)

+#define SET_GetCombinerInputParameterivNV(disp, fn) SET_by_offset(disp, _gloffset_GetCombinerInputParameterivNV, fn)

+#define CALL_GetCombinerOutputParameterfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLfloat *)), _gloffset_GetCombinerOutputParameterfvNV, parameters)

+#define GET_GetCombinerOutputParameterfvNV(disp) GET_by_offset(disp, _gloffset_GetCombinerOutputParameterfvNV)

+#define SET_GetCombinerOutputParameterfvNV(disp, fn) SET_by_offset(disp, _gloffset_GetCombinerOutputParameterfvNV, fn)

+#define CALL_GetCombinerOutputParameterivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLint *)), _gloffset_GetCombinerOutputParameterivNV, parameters)

+#define GET_GetCombinerOutputParameterivNV(disp) GET_by_offset(disp, _gloffset_GetCombinerOutputParameterivNV)

+#define SET_GetCombinerOutputParameterivNV(disp, fn) SET_by_offset(disp, _gloffset_GetCombinerOutputParameterivNV, fn)

+#define CALL_GetFinalCombinerInputParameterfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLfloat *)), _gloffset_GetFinalCombinerInputParameterfvNV, parameters)

+#define GET_GetFinalCombinerInputParameterfvNV(disp) GET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterfvNV)

+#define SET_GetFinalCombinerInputParameterfvNV(disp, fn) SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterfvNV, fn)

+#define CALL_GetFinalCombinerInputParameterivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetFinalCombinerInputParameterivNV, parameters)

+#define GET_GetFinalCombinerInputParameterivNV(disp) GET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterivNV)

+#define SET_GetFinalCombinerInputParameterivNV(disp, fn) SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterivNV, fn)

+#define CALL_ResizeBuffersMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_ResizeBuffersMESA, parameters)

+#define GET_ResizeBuffersMESA(disp) GET_by_offset(disp, _gloffset_ResizeBuffersMESA)

+#define SET_ResizeBuffersMESA(disp, fn) SET_by_offset(disp, _gloffset_ResizeBuffersMESA, fn)

+#define CALL_WindowPos2dMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble)), _gloffset_WindowPos2dMESA, parameters)

+#define GET_WindowPos2dMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2dMESA)

+#define SET_WindowPos2dMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2dMESA, fn)

+#define CALL_WindowPos2dvMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_WindowPos2dvMESA, parameters)

+#define GET_WindowPos2dvMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2dvMESA)

+#define SET_WindowPos2dvMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2dvMESA, fn)

+#define CALL_WindowPos2fMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), _gloffset_WindowPos2fMESA, parameters)

+#define GET_WindowPos2fMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2fMESA)

+#define SET_WindowPos2fMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2fMESA, fn)

+#define CALL_WindowPos2fvMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_WindowPos2fvMESA, parameters)

+#define GET_WindowPos2fvMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2fvMESA)

+#define SET_WindowPos2fvMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2fvMESA, fn)

+#define CALL_WindowPos2iMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint)), _gloffset_WindowPos2iMESA, parameters)

+#define GET_WindowPos2iMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2iMESA)

+#define SET_WindowPos2iMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2iMESA, fn)

+#define CALL_WindowPos2ivMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_WindowPos2ivMESA, parameters)

+#define GET_WindowPos2ivMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2ivMESA)

+#define SET_WindowPos2ivMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2ivMESA, fn)

+#define CALL_WindowPos2sMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort)), _gloffset_WindowPos2sMESA, parameters)

+#define GET_WindowPos2sMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2sMESA)

+#define SET_WindowPos2sMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2sMESA, fn)

+#define CALL_WindowPos2svMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_WindowPos2svMESA, parameters)

+#define GET_WindowPos2svMESA(disp) GET_by_offset(disp, _gloffset_WindowPos2svMESA)

+#define SET_WindowPos2svMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos2svMESA, fn)

+#define CALL_WindowPos3dMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble)), _gloffset_WindowPos3dMESA, parameters)

+#define GET_WindowPos3dMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3dMESA)

+#define SET_WindowPos3dMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3dMESA, fn)

+#define CALL_WindowPos3dvMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_WindowPos3dvMESA, parameters)

+#define GET_WindowPos3dvMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3dvMESA)

+#define SET_WindowPos3dvMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3dvMESA, fn)

+#define CALL_WindowPos3fMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat)), _gloffset_WindowPos3fMESA, parameters)

+#define GET_WindowPos3fMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3fMESA)

+#define SET_WindowPos3fMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3fMESA, fn)

+#define CALL_WindowPos3fvMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_WindowPos3fvMESA, parameters)

+#define GET_WindowPos3fvMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3fvMESA)

+#define SET_WindowPos3fvMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3fvMESA, fn)

+#define CALL_WindowPos3iMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint)), _gloffset_WindowPos3iMESA, parameters)

+#define GET_WindowPos3iMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3iMESA)

+#define SET_WindowPos3iMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3iMESA, fn)

+#define CALL_WindowPos3ivMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_WindowPos3ivMESA, parameters)

+#define GET_WindowPos3ivMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3ivMESA)

+#define SET_WindowPos3ivMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3ivMESA, fn)

+#define CALL_WindowPos3sMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort)), _gloffset_WindowPos3sMESA, parameters)

+#define GET_WindowPos3sMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3sMESA)

+#define SET_WindowPos3sMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3sMESA, fn)

+#define CALL_WindowPos3svMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_WindowPos3svMESA, parameters)

+#define GET_WindowPos3svMESA(disp) GET_by_offset(disp, _gloffset_WindowPos3svMESA)

+#define SET_WindowPos3svMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos3svMESA, fn)

+#define CALL_WindowPos4dMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_WindowPos4dMESA, parameters)

+#define GET_WindowPos4dMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4dMESA)

+#define SET_WindowPos4dMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4dMESA, fn)

+#define CALL_WindowPos4dvMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLdouble *)), _gloffset_WindowPos4dvMESA, parameters)

+#define GET_WindowPos4dvMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4dvMESA)

+#define SET_WindowPos4dvMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4dvMESA, fn)

+#define CALL_WindowPos4fMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_WindowPos4fMESA, parameters)

+#define GET_WindowPos4fMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4fMESA)

+#define SET_WindowPos4fMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4fMESA, fn)

+#define CALL_WindowPos4fvMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), _gloffset_WindowPos4fvMESA, parameters)

+#define GET_WindowPos4fvMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4fvMESA)

+#define SET_WindowPos4fvMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4fvMESA, fn)

+#define CALL_WindowPos4iMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_WindowPos4iMESA, parameters)

+#define GET_WindowPos4iMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4iMESA)

+#define SET_WindowPos4iMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4iMESA, fn)

+#define CALL_WindowPos4ivMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLint *)), _gloffset_WindowPos4ivMESA, parameters)

+#define GET_WindowPos4ivMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4ivMESA)

+#define SET_WindowPos4ivMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4ivMESA, fn)

+#define CALL_WindowPos4sMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLshort, GLshort, GLshort, GLshort)), _gloffset_WindowPos4sMESA, parameters)

+#define GET_WindowPos4sMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4sMESA)

+#define SET_WindowPos4sMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4sMESA, fn)

+#define CALL_WindowPos4svMESA(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLshort *)), _gloffset_WindowPos4svMESA, parameters)

+#define GET_WindowPos4svMESA(disp) GET_by_offset(disp, _gloffset_WindowPos4svMESA)

+#define SET_WindowPos4svMESA(disp, fn) SET_by_offset(disp, _gloffset_WindowPos4svMESA, fn)

+#define CALL_MultiModeDrawArraysIBM(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint)), _gloffset_MultiModeDrawArraysIBM, parameters)

+#define GET_MultiModeDrawArraysIBM(disp) GET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM)

+#define SET_MultiModeDrawArraysIBM(disp, fn) SET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM, fn)

+#define CALL_MultiModeDrawElementsIBM(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint)), _gloffset_MultiModeDrawElementsIBM, parameters)

+#define GET_MultiModeDrawElementsIBM(disp) GET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM)

+#define SET_MultiModeDrawElementsIBM(disp, fn) SET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM, fn)

+#define CALL_DeleteFencesNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteFencesNV, parameters)

+#define GET_DeleteFencesNV(disp) GET_by_offset(disp, _gloffset_DeleteFencesNV)

+#define SET_DeleteFencesNV(disp, fn) SET_by_offset(disp, _gloffset_DeleteFencesNV, fn)

+#define CALL_FinishFenceNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_FinishFenceNV, parameters)

+#define GET_FinishFenceNV(disp) GET_by_offset(disp, _gloffset_FinishFenceNV)

+#define SET_FinishFenceNV(disp, fn) SET_by_offset(disp, _gloffset_FinishFenceNV, fn)

+#define CALL_GenFencesNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenFencesNV, parameters)

+#define GET_GenFencesNV(disp) GET_by_offset(disp, _gloffset_GenFencesNV)

+#define SET_GenFencesNV(disp, fn) SET_by_offset(disp, _gloffset_GenFencesNV, fn)

+#define CALL_GetFenceivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetFenceivNV, parameters)

+#define GET_GetFenceivNV(disp) GET_by_offset(disp, _gloffset_GetFenceivNV)

+#define SET_GetFenceivNV(disp, fn) SET_by_offset(disp, _gloffset_GetFenceivNV, fn)

+#define CALL_IsFenceNV(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsFenceNV, parameters)

+#define GET_IsFenceNV(disp) GET_by_offset(disp, _gloffset_IsFenceNV)

+#define SET_IsFenceNV(disp, fn) SET_by_offset(disp, _gloffset_IsFenceNV, fn)

+#define CALL_SetFenceNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum)), _gloffset_SetFenceNV, parameters)

+#define GET_SetFenceNV(disp) GET_by_offset(disp, _gloffset_SetFenceNV)

+#define SET_SetFenceNV(disp, fn) SET_by_offset(disp, _gloffset_SetFenceNV, fn)

+#define CALL_TestFenceNV(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_TestFenceNV, parameters)

+#define GET_TestFenceNV(disp) GET_by_offset(disp, _gloffset_TestFenceNV)

+#define SET_TestFenceNV(disp, fn) SET_by_offset(disp, _gloffset_TestFenceNV, fn)

+#define CALL_AreProgramsResidentNV(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLsizei, const GLuint *, GLboolean *)), _gloffset_AreProgramsResidentNV, parameters)

+#define GET_AreProgramsResidentNV(disp) GET_by_offset(disp, _gloffset_AreProgramsResidentNV)

+#define SET_AreProgramsResidentNV(disp, fn) SET_by_offset(disp, _gloffset_AreProgramsResidentNV, fn)

+#define CALL_BindProgramNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindProgramNV, parameters)

+#define GET_BindProgramNV(disp) GET_by_offset(disp, _gloffset_BindProgramNV)

+#define SET_BindProgramNV(disp, fn) SET_by_offset(disp, _gloffset_BindProgramNV, fn)

+#define CALL_DeleteProgramsNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteProgramsNV, parameters)

+#define GET_DeleteProgramsNV(disp) GET_by_offset(disp, _gloffset_DeleteProgramsNV)

+#define SET_DeleteProgramsNV(disp, fn) SET_by_offset(disp, _gloffset_DeleteProgramsNV, fn)

+#define CALL_ExecuteProgramNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLfloat *)), _gloffset_ExecuteProgramNV, parameters)

+#define GET_ExecuteProgramNV(disp) GET_by_offset(disp, _gloffset_ExecuteProgramNV)

+#define SET_ExecuteProgramNV(disp, fn) SET_by_offset(disp, _gloffset_ExecuteProgramNV, fn)

+#define CALL_GenProgramsNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenProgramsNV, parameters)

+#define GET_GenProgramsNV(disp) GET_by_offset(disp, _gloffset_GenProgramsNV)

+#define SET_GenProgramsNV(disp, fn) SET_by_offset(disp, _gloffset_GenProgramsNV, fn)

+#define CALL_GetProgramParameterdvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLenum, GLdouble *)), _gloffset_GetProgramParameterdvNV, parameters)

+#define GET_GetProgramParameterdvNV(disp) GET_by_offset(disp, _gloffset_GetProgramParameterdvNV)

+#define SET_GetProgramParameterdvNV(disp, fn) SET_by_offset(disp, _gloffset_GetProgramParameterdvNV, fn)

+#define CALL_GetProgramParameterfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLenum, GLfloat *)), _gloffset_GetProgramParameterfvNV, parameters)

+#define GET_GetProgramParameterfvNV(disp) GET_by_offset(disp, _gloffset_GetProgramParameterfvNV)

+#define SET_GetProgramParameterfvNV(disp, fn) SET_by_offset(disp, _gloffset_GetProgramParameterfvNV, fn)

+#define CALL_GetProgramStringNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLubyte *)), _gloffset_GetProgramStringNV, parameters)

+#define GET_GetProgramStringNV(disp) GET_by_offset(disp, _gloffset_GetProgramStringNV)

+#define SET_GetProgramStringNV(disp, fn) SET_by_offset(disp, _gloffset_GetProgramStringNV, fn)

+#define CALL_GetProgramivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetProgramivNV, parameters)

+#define GET_GetProgramivNV(disp) GET_by_offset(disp, _gloffset_GetProgramivNV)

+#define SET_GetProgramivNV(disp, fn) SET_by_offset(disp, _gloffset_GetProgramivNV, fn)

+#define CALL_GetTrackMatrixivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLenum, GLint *)), _gloffset_GetTrackMatrixivNV, parameters)

+#define GET_GetTrackMatrixivNV(disp) GET_by_offset(disp, _gloffset_GetTrackMatrixivNV)

+#define SET_GetTrackMatrixivNV(disp, fn) SET_by_offset(disp, _gloffset_GetTrackMatrixivNV, fn)

+#define CALL_GetVertexAttribPointervNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLvoid **)), _gloffset_GetVertexAttribPointervNV, parameters)

+#define GET_GetVertexAttribPointervNV(disp) GET_by_offset(disp, _gloffset_GetVertexAttribPointervNV)

+#define SET_GetVertexAttribPointervNV(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribPointervNV, fn)

+#define CALL_GetVertexAttribdvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLdouble *)), _gloffset_GetVertexAttribdvNV, parameters)

+#define GET_GetVertexAttribdvNV(disp) GET_by_offset(disp, _gloffset_GetVertexAttribdvNV)

+#define SET_GetVertexAttribdvNV(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribdvNV, fn)

+#define CALL_GetVertexAttribfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLfloat *)), _gloffset_GetVertexAttribfvNV, parameters)

+#define GET_GetVertexAttribfvNV(disp) GET_by_offset(disp, _gloffset_GetVertexAttribfvNV)

+#define SET_GetVertexAttribfvNV(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribfvNV, fn)

+#define CALL_GetVertexAttribivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetVertexAttribivNV, parameters)

+#define GET_GetVertexAttribivNV(disp) GET_by_offset(disp, _gloffset_GetVertexAttribivNV)

+#define SET_GetVertexAttribivNV(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribivNV, fn)

+#define CALL_IsProgramNV(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsProgramNV, parameters)

+#define GET_IsProgramNV(disp) GET_by_offset(disp, _gloffset_IsProgramNV)

+#define SET_IsProgramNV(disp, fn) SET_by_offset(disp, _gloffset_IsProgramNV, fn)

+#define CALL_LoadProgramNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLubyte *)), _gloffset_LoadProgramNV, parameters)

+#define GET_LoadProgramNV(disp) GET_by_offset(disp, _gloffset_LoadProgramNV)

+#define SET_LoadProgramNV(disp, fn) SET_by_offset(disp, _gloffset_LoadProgramNV, fn)

+#define CALL_ProgramParameters4dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLdouble *)), _gloffset_ProgramParameters4dvNV, parameters)

+#define GET_ProgramParameters4dvNV(disp) GET_by_offset(disp, _gloffset_ProgramParameters4dvNV)

+#define SET_ProgramParameters4dvNV(disp, fn) SET_by_offset(disp, _gloffset_ProgramParameters4dvNV, fn)

+#define CALL_ProgramParameters4fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLfloat *)), _gloffset_ProgramParameters4fvNV, parameters)

+#define GET_ProgramParameters4fvNV(disp) GET_by_offset(disp, _gloffset_ProgramParameters4fvNV)

+#define SET_ProgramParameters4fvNV(disp, fn) SET_by_offset(disp, _gloffset_ProgramParameters4fvNV, fn)

+#define CALL_RequestResidentProgramsNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_RequestResidentProgramsNV, parameters)

+#define GET_RequestResidentProgramsNV(disp) GET_by_offset(disp, _gloffset_RequestResidentProgramsNV)

+#define SET_RequestResidentProgramsNV(disp, fn) SET_by_offset(disp, _gloffset_RequestResidentProgramsNV, fn)

+#define CALL_TrackMatrixNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLenum, GLenum)), _gloffset_TrackMatrixNV, parameters)

+#define GET_TrackMatrixNV(disp) GET_by_offset(disp, _gloffset_TrackMatrixNV)

+#define SET_TrackMatrixNV(disp, fn) SET_by_offset(disp, _gloffset_TrackMatrixNV, fn)

+#define CALL_VertexAttrib1dNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble)), _gloffset_VertexAttrib1dNV, parameters)

+#define GET_VertexAttrib1dNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib1dNV)

+#define SET_VertexAttrib1dNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1dNV, fn)

+#define CALL_VertexAttrib1dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib1dvNV, parameters)

+#define GET_VertexAttrib1dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib1dvNV)

+#define SET_VertexAttrib1dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1dvNV, fn)

+#define CALL_VertexAttrib1fNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat)), _gloffset_VertexAttrib1fNV, parameters)

+#define GET_VertexAttrib1fNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib1fNV)

+#define SET_VertexAttrib1fNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1fNV, fn)

+#define CALL_VertexAttrib1fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib1fvNV, parameters)

+#define GET_VertexAttrib1fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib1fvNV)

+#define SET_VertexAttrib1fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1fvNV, fn)

+#define CALL_VertexAttrib1sNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort)), _gloffset_VertexAttrib1sNV, parameters)

+#define GET_VertexAttrib1sNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib1sNV)

+#define SET_VertexAttrib1sNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1sNV, fn)

+#define CALL_VertexAttrib1svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib1svNV, parameters)

+#define GET_VertexAttrib1svNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib1svNV)

+#define SET_VertexAttrib1svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib1svNV, fn)

+#define CALL_VertexAttrib2dNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble, GLdouble)), _gloffset_VertexAttrib2dNV, parameters)

+#define GET_VertexAttrib2dNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib2dNV)

+#define SET_VertexAttrib2dNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2dNV, fn)

+#define CALL_VertexAttrib2dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib2dvNV, parameters)

+#define GET_VertexAttrib2dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib2dvNV)

+#define SET_VertexAttrib2dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2dvNV, fn)

+#define CALL_VertexAttrib2fNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat, GLfloat)), _gloffset_VertexAttrib2fNV, parameters)

+#define GET_VertexAttrib2fNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib2fNV)

+#define SET_VertexAttrib2fNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2fNV, fn)

+#define CALL_VertexAttrib2fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib2fvNV, parameters)

+#define GET_VertexAttrib2fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib2fvNV)

+#define SET_VertexAttrib2fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2fvNV, fn)

+#define CALL_VertexAttrib2sNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort, GLshort)), _gloffset_VertexAttrib2sNV, parameters)

+#define GET_VertexAttrib2sNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib2sNV)

+#define SET_VertexAttrib2sNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2sNV, fn)

+#define CALL_VertexAttrib2svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib2svNV, parameters)

+#define GET_VertexAttrib2svNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib2svNV)

+#define SET_VertexAttrib2svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib2svNV, fn)

+#define CALL_VertexAttrib3dNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble, GLdouble, GLdouble)), _gloffset_VertexAttrib3dNV, parameters)

+#define GET_VertexAttrib3dNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib3dNV)

+#define SET_VertexAttrib3dNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3dNV, fn)

+#define CALL_VertexAttrib3dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib3dvNV, parameters)

+#define GET_VertexAttrib3dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib3dvNV)

+#define SET_VertexAttrib3dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3dvNV, fn)

+#define CALL_VertexAttrib3fNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat, GLfloat, GLfloat)), _gloffset_VertexAttrib3fNV, parameters)

+#define GET_VertexAttrib3fNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib3fNV)

+#define SET_VertexAttrib3fNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3fNV, fn)

+#define CALL_VertexAttrib3fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib3fvNV, parameters)

+#define GET_VertexAttrib3fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib3fvNV)

+#define SET_VertexAttrib3fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3fvNV, fn)

+#define CALL_VertexAttrib3sNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort, GLshort, GLshort)), _gloffset_VertexAttrib3sNV, parameters)

+#define GET_VertexAttrib3sNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib3sNV)

+#define SET_VertexAttrib3sNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3sNV, fn)

+#define CALL_VertexAttrib3svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib3svNV, parameters)

+#define GET_VertexAttrib3svNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib3svNV)

+#define SET_VertexAttrib3svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib3svNV, fn)

+#define CALL_VertexAttrib4dNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_VertexAttrib4dNV, parameters)

+#define GET_VertexAttrib4dNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4dNV)

+#define SET_VertexAttrib4dNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4dNV, fn)

+#define CALL_VertexAttrib4dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLdouble *)), _gloffset_VertexAttrib4dvNV, parameters)

+#define GET_VertexAttrib4dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4dvNV)

+#define SET_VertexAttrib4dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4dvNV, fn)

+#define CALL_VertexAttrib4fNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_VertexAttrib4fNV, parameters)

+#define GET_VertexAttrib4fNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4fNV)

+#define SET_VertexAttrib4fNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4fNV, fn)

+#define CALL_VertexAttrib4fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_VertexAttrib4fvNV, parameters)

+#define GET_VertexAttrib4fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4fvNV)

+#define SET_VertexAttrib4fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4fvNV, fn)

+#define CALL_VertexAttrib4sNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLshort, GLshort, GLshort, GLshort)), _gloffset_VertexAttrib4sNV, parameters)

+#define GET_VertexAttrib4sNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4sNV)

+#define SET_VertexAttrib4sNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4sNV, fn)

+#define CALL_VertexAttrib4svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttrib4svNV, parameters)

+#define GET_VertexAttrib4svNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4svNV)

+#define SET_VertexAttrib4svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4svNV, fn)

+#define CALL_VertexAttrib4ubNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)), _gloffset_VertexAttrib4ubNV, parameters)

+#define GET_VertexAttrib4ubNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4ubNV)

+#define SET_VertexAttrib4ubNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4ubNV, fn)

+#define CALL_VertexAttrib4ubvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLubyte *)), _gloffset_VertexAttrib4ubvNV, parameters)

+#define GET_VertexAttrib4ubvNV(disp) GET_by_offset(disp, _gloffset_VertexAttrib4ubvNV)

+#define SET_VertexAttrib4ubvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttrib4ubvNV, fn)

+#define CALL_VertexAttribPointerNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)), _gloffset_VertexAttribPointerNV, parameters)

+#define GET_VertexAttribPointerNV(disp) GET_by_offset(disp, _gloffset_VertexAttribPointerNV)

+#define SET_VertexAttribPointerNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribPointerNV, fn)

+#define CALL_VertexAttribs1dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLdouble *)), _gloffset_VertexAttribs1dvNV, parameters)

+#define GET_VertexAttribs1dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs1dvNV)

+#define SET_VertexAttribs1dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs1dvNV, fn)

+#define CALL_VertexAttribs1fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLfloat *)), _gloffset_VertexAttribs1fvNV, parameters)

+#define GET_VertexAttribs1fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs1fvNV)

+#define SET_VertexAttribs1fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs1fvNV, fn)

+#define CALL_VertexAttribs1svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLshort *)), _gloffset_VertexAttribs1svNV, parameters)

+#define GET_VertexAttribs1svNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs1svNV)

+#define SET_VertexAttribs1svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs1svNV, fn)

+#define CALL_VertexAttribs2dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLdouble *)), _gloffset_VertexAttribs2dvNV, parameters)

+#define GET_VertexAttribs2dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs2dvNV)

+#define SET_VertexAttribs2dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs2dvNV, fn)

+#define CALL_VertexAttribs2fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLfloat *)), _gloffset_VertexAttribs2fvNV, parameters)

+#define GET_VertexAttribs2fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs2fvNV)

+#define SET_VertexAttribs2fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs2fvNV, fn)

+#define CALL_VertexAttribs2svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLshort *)), _gloffset_VertexAttribs2svNV, parameters)

+#define GET_VertexAttribs2svNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs2svNV)

+#define SET_VertexAttribs2svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs2svNV, fn)

+#define CALL_VertexAttribs3dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLdouble *)), _gloffset_VertexAttribs3dvNV, parameters)

+#define GET_VertexAttribs3dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs3dvNV)

+#define SET_VertexAttribs3dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs3dvNV, fn)

+#define CALL_VertexAttribs3fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLfloat *)), _gloffset_VertexAttribs3fvNV, parameters)

+#define GET_VertexAttribs3fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs3fvNV)

+#define SET_VertexAttribs3fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs3fvNV, fn)

+#define CALL_VertexAttribs3svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLshort *)), _gloffset_VertexAttribs3svNV, parameters)

+#define GET_VertexAttribs3svNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs3svNV)

+#define SET_VertexAttribs3svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs3svNV, fn)

+#define CALL_VertexAttribs4dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLdouble *)), _gloffset_VertexAttribs4dvNV, parameters)

+#define GET_VertexAttribs4dvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs4dvNV)

+#define SET_VertexAttribs4dvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs4dvNV, fn)

+#define CALL_VertexAttribs4fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLfloat *)), _gloffset_VertexAttribs4fvNV, parameters)

+#define GET_VertexAttribs4fvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs4fvNV)

+#define SET_VertexAttribs4fvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs4fvNV, fn)

+#define CALL_VertexAttribs4svNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLshort *)), _gloffset_VertexAttribs4svNV, parameters)

+#define GET_VertexAttribs4svNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs4svNV)

+#define SET_VertexAttribs4svNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs4svNV, fn)

+#define CALL_VertexAttribs4ubvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *)), _gloffset_VertexAttribs4ubvNV, parameters)

+#define GET_VertexAttribs4ubvNV(disp) GET_by_offset(disp, _gloffset_VertexAttribs4ubvNV)

+#define SET_VertexAttribs4ubvNV(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribs4ubvNV, fn)

+#define CALL_GetTexBumpParameterfvATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLfloat *)), _gloffset_GetTexBumpParameterfvATI, parameters)

+#define GET_GetTexBumpParameterfvATI(disp) GET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI)

+#define SET_GetTexBumpParameterfvATI(disp, fn) SET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI, fn)

+#define CALL_GetTexBumpParameterivATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint *)), _gloffset_GetTexBumpParameterivATI, parameters)

+#define GET_GetTexBumpParameterivATI(disp) GET_by_offset(disp, _gloffset_GetTexBumpParameterivATI)

+#define SET_GetTexBumpParameterivATI(disp, fn) SET_by_offset(disp, _gloffset_GetTexBumpParameterivATI, fn)

+#define CALL_TexBumpParameterfvATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLfloat *)), _gloffset_TexBumpParameterfvATI, parameters)

+#define GET_TexBumpParameterfvATI(disp) GET_by_offset(disp, _gloffset_TexBumpParameterfvATI)

+#define SET_TexBumpParameterfvATI(disp, fn) SET_by_offset(disp, _gloffset_TexBumpParameterfvATI, fn)

+#define CALL_TexBumpParameterivATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_TexBumpParameterivATI, parameters)

+#define GET_TexBumpParameterivATI(disp) GET_by_offset(disp, _gloffset_TexBumpParameterivATI)

+#define SET_TexBumpParameterivATI(disp, fn) SET_by_offset(disp, _gloffset_TexBumpParameterivATI, fn)

+#define CALL_AlphaFragmentOp1ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_AlphaFragmentOp1ATI, parameters)

+#define GET_AlphaFragmentOp1ATI(disp) GET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI)

+#define SET_AlphaFragmentOp1ATI(disp, fn) SET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI, fn)

+#define CALL_AlphaFragmentOp2ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_AlphaFragmentOp2ATI, parameters)

+#define GET_AlphaFragmentOp2ATI(disp) GET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI)

+#define SET_AlphaFragmentOp2ATI(disp, fn) SET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI, fn)

+#define CALL_AlphaFragmentOp3ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_AlphaFragmentOp3ATI, parameters)

+#define GET_AlphaFragmentOp3ATI(disp) GET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI)

+#define SET_AlphaFragmentOp3ATI(disp, fn) SET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI, fn)

+#define CALL_BeginFragmentShaderATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_BeginFragmentShaderATI, parameters)

+#define GET_BeginFragmentShaderATI(disp) GET_by_offset(disp, _gloffset_BeginFragmentShaderATI)

+#define SET_BeginFragmentShaderATI(disp, fn) SET_by_offset(disp, _gloffset_BeginFragmentShaderATI, fn)

+#define CALL_BindFragmentShaderATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_BindFragmentShaderATI, parameters)

+#define GET_BindFragmentShaderATI(disp) GET_by_offset(disp, _gloffset_BindFragmentShaderATI)

+#define SET_BindFragmentShaderATI(disp, fn) SET_by_offset(disp, _gloffset_BindFragmentShaderATI, fn)

+#define CALL_ColorFragmentOp1ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_ColorFragmentOp1ATI, parameters)

+#define GET_ColorFragmentOp1ATI(disp) GET_by_offset(disp, _gloffset_ColorFragmentOp1ATI)

+#define SET_ColorFragmentOp1ATI(disp, fn) SET_by_offset(disp, _gloffset_ColorFragmentOp1ATI, fn)

+#define CALL_ColorFragmentOp2ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_ColorFragmentOp2ATI, parameters)

+#define GET_ColorFragmentOp2ATI(disp) GET_by_offset(disp, _gloffset_ColorFragmentOp2ATI)

+#define SET_ColorFragmentOp2ATI(disp, fn) SET_by_offset(disp, _gloffset_ColorFragmentOp2ATI, fn)

+#define CALL_ColorFragmentOp3ATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_ColorFragmentOp3ATI, parameters)

+#define GET_ColorFragmentOp3ATI(disp) GET_by_offset(disp, _gloffset_ColorFragmentOp3ATI)

+#define SET_ColorFragmentOp3ATI(disp, fn) SET_by_offset(disp, _gloffset_ColorFragmentOp3ATI, fn)

+#define CALL_DeleteFragmentShaderATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_DeleteFragmentShaderATI, parameters)

+#define GET_DeleteFragmentShaderATI(disp) GET_by_offset(disp, _gloffset_DeleteFragmentShaderATI)

+#define SET_DeleteFragmentShaderATI(disp, fn) SET_by_offset(disp, _gloffset_DeleteFragmentShaderATI, fn)

+#define CALL_EndFragmentShaderATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_EndFragmentShaderATI, parameters)

+#define GET_EndFragmentShaderATI(disp) GET_by_offset(disp, _gloffset_EndFragmentShaderATI)

+#define SET_EndFragmentShaderATI(disp, fn) SET_by_offset(disp, _gloffset_EndFragmentShaderATI, fn)

+#define CALL_GenFragmentShadersATI(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(GLuint)), _gloffset_GenFragmentShadersATI, parameters)

+#define GET_GenFragmentShadersATI(disp) GET_by_offset(disp, _gloffset_GenFragmentShadersATI)

+#define SET_GenFragmentShadersATI(disp, fn) SET_by_offset(disp, _gloffset_GenFragmentShadersATI, fn)

+#define CALL_PassTexCoordATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLenum)), _gloffset_PassTexCoordATI, parameters)

+#define GET_PassTexCoordATI(disp) GET_by_offset(disp, _gloffset_PassTexCoordATI)

+#define SET_PassTexCoordATI(disp, fn) SET_by_offset(disp, _gloffset_PassTexCoordATI, fn)

+#define CALL_SampleMapATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLenum)), _gloffset_SampleMapATI, parameters)

+#define GET_SampleMapATI(disp) GET_by_offset(disp, _gloffset_SampleMapATI)

+#define SET_SampleMapATI(disp, fn) SET_by_offset(disp, _gloffset_SampleMapATI, fn)

+#define CALL_SetFragmentShaderConstantATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLfloat *)), _gloffset_SetFragmentShaderConstantATI, parameters)

+#define GET_SetFragmentShaderConstantATI(disp) GET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI)

+#define SET_SetFragmentShaderConstantATI(disp, fn) SET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI, fn)

+#define CALL_PointParameteriNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint)), _gloffset_PointParameteriNV, parameters)

+#define GET_PointParameteriNV(disp) GET_by_offset(disp, _gloffset_PointParameteriNV)

+#define SET_PointParameteriNV(disp, fn) SET_by_offset(disp, _gloffset_PointParameteriNV, fn)

+#define CALL_PointParameterivNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, const GLint *)), _gloffset_PointParameterivNV, parameters)

+#define GET_PointParameterivNV(disp) GET_by_offset(disp, _gloffset_PointParameterivNV)

+#define SET_PointParameterivNV(disp, fn) SET_by_offset(disp, _gloffset_PointParameterivNV, fn)

+#define CALL_ActiveStencilFaceEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ActiveStencilFaceEXT, parameters)

+#define GET_ActiveStencilFaceEXT(disp) GET_by_offset(disp, _gloffset_ActiveStencilFaceEXT)

+#define SET_ActiveStencilFaceEXT(disp, fn) SET_by_offset(disp, _gloffset_ActiveStencilFaceEXT, fn)

+#define CALL_BindVertexArrayAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_BindVertexArrayAPPLE, parameters)

+#define GET_BindVertexArrayAPPLE(disp) GET_by_offset(disp, _gloffset_BindVertexArrayAPPLE)

+#define SET_BindVertexArrayAPPLE(disp, fn) SET_by_offset(disp, _gloffset_BindVertexArrayAPPLE, fn)

+#define CALL_DeleteVertexArraysAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteVertexArraysAPPLE, parameters)

+#define GET_DeleteVertexArraysAPPLE(disp) GET_by_offset(disp, _gloffset_DeleteVertexArraysAPPLE)

+#define SET_DeleteVertexArraysAPPLE(disp, fn) SET_by_offset(disp, _gloffset_DeleteVertexArraysAPPLE, fn)

+#define CALL_GenVertexArraysAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenVertexArraysAPPLE, parameters)

+#define GET_GenVertexArraysAPPLE(disp) GET_by_offset(disp, _gloffset_GenVertexArraysAPPLE)

+#define SET_GenVertexArraysAPPLE(disp, fn) SET_by_offset(disp, _gloffset_GenVertexArraysAPPLE, fn)

+#define CALL_IsVertexArrayAPPLE(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsVertexArrayAPPLE, parameters)

+#define GET_IsVertexArrayAPPLE(disp) GET_by_offset(disp, _gloffset_IsVertexArrayAPPLE)

+#define SET_IsVertexArrayAPPLE(disp, fn) SET_by_offset(disp, _gloffset_IsVertexArrayAPPLE, fn)

+#define CALL_GetProgramNamedParameterdvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, GLdouble *)), _gloffset_GetProgramNamedParameterdvNV, parameters)

+#define GET_GetProgramNamedParameterdvNV(disp) GET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV)

+#define SET_GetProgramNamedParameterdvNV(disp, fn) SET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV, fn)

+#define CALL_GetProgramNamedParameterfvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, GLfloat *)), _gloffset_GetProgramNamedParameterfvNV, parameters)

+#define GET_GetProgramNamedParameterfvNV(disp) GET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV)

+#define SET_GetProgramNamedParameterfvNV(disp, fn) SET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV, fn)

+#define CALL_ProgramNamedParameter4dNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble)), _gloffset_ProgramNamedParameter4dNV, parameters)

+#define GET_ProgramNamedParameter4dNV(disp) GET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV)

+#define SET_ProgramNamedParameter4dNV(disp, fn) SET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV, fn)

+#define CALL_ProgramNamedParameter4dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, const GLdouble *)), _gloffset_ProgramNamedParameter4dvNV, parameters)

+#define GET_ProgramNamedParameter4dvNV(disp) GET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV)

+#define SET_ProgramNamedParameter4dvNV(disp, fn) SET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV, fn)

+#define CALL_ProgramNamedParameter4fNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat)), _gloffset_ProgramNamedParameter4fNV, parameters)

+#define GET_ProgramNamedParameter4fNV(disp) GET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV)

+#define SET_ProgramNamedParameter4fNV(disp, fn) SET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV, fn)

+#define CALL_ProgramNamedParameter4fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, const GLfloat *)), _gloffset_ProgramNamedParameter4fvNV, parameters)

+#define GET_ProgramNamedParameter4fvNV(disp) GET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV)

+#define SET_ProgramNamedParameter4fvNV(disp, fn) SET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV, fn)

+#define CALL_PrimitiveRestartIndexNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_PrimitiveRestartIndexNV, parameters)

+#define GET_PrimitiveRestartIndexNV(disp) GET_by_offset(disp, _gloffset_PrimitiveRestartIndexNV)

+#define SET_PrimitiveRestartIndexNV(disp, fn) SET_by_offset(disp, _gloffset_PrimitiveRestartIndexNV, fn)

+#define CALL_PrimitiveRestartNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_PrimitiveRestartNV, parameters)

+#define GET_PrimitiveRestartNV(disp) GET_by_offset(disp, _gloffset_PrimitiveRestartNV)

+#define SET_PrimitiveRestartNV(disp, fn) SET_by_offset(disp, _gloffset_PrimitiveRestartNV, fn)

+#define CALL_DepthBoundsEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampd, GLclampd)), _gloffset_DepthBoundsEXT, parameters)

+#define GET_DepthBoundsEXT(disp) GET_by_offset(disp, _gloffset_DepthBoundsEXT)

+#define SET_DepthBoundsEXT(disp, fn) SET_by_offset(disp, _gloffset_DepthBoundsEXT, fn)

+#define CALL_BlendEquationSeparateEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum)), _gloffset_BlendEquationSeparateEXT, parameters)

+#define GET_BlendEquationSeparateEXT(disp) GET_by_offset(disp, _gloffset_BlendEquationSeparateEXT)

+#define SET_BlendEquationSeparateEXT(disp, fn) SET_by_offset(disp, _gloffset_BlendEquationSeparateEXT, fn)

+#define CALL_BindFramebufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindFramebufferEXT, parameters)

+#define GET_BindFramebufferEXT(disp) GET_by_offset(disp, _gloffset_BindFramebufferEXT)

+#define SET_BindFramebufferEXT(disp, fn) SET_by_offset(disp, _gloffset_BindFramebufferEXT, fn)

+#define CALL_BindRenderbufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_BindRenderbufferEXT, parameters)

+#define GET_BindRenderbufferEXT(disp) GET_by_offset(disp, _gloffset_BindRenderbufferEXT)

+#define SET_BindRenderbufferEXT(disp, fn) SET_by_offset(disp, _gloffset_BindRenderbufferEXT, fn)

+#define CALL_CheckFramebufferStatusEXT(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(GLenum)), _gloffset_CheckFramebufferStatusEXT, parameters)

+#define GET_CheckFramebufferStatusEXT(disp) GET_by_offset(disp, _gloffset_CheckFramebufferStatusEXT)

+#define SET_CheckFramebufferStatusEXT(disp, fn) SET_by_offset(disp, _gloffset_CheckFramebufferStatusEXT, fn)

+#define CALL_DeleteFramebuffersEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteFramebuffersEXT, parameters)

+#define GET_DeleteFramebuffersEXT(disp) GET_by_offset(disp, _gloffset_DeleteFramebuffersEXT)

+#define SET_DeleteFramebuffersEXT(disp, fn) SET_by_offset(disp, _gloffset_DeleteFramebuffersEXT, fn)

+#define CALL_DeleteRenderbuffersEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, const GLuint *)), _gloffset_DeleteRenderbuffersEXT, parameters)

+#define GET_DeleteRenderbuffersEXT(disp) GET_by_offset(disp, _gloffset_DeleteRenderbuffersEXT)

+#define SET_DeleteRenderbuffersEXT(disp, fn) SET_by_offset(disp, _gloffset_DeleteRenderbuffersEXT, fn)

+#define CALL_FramebufferRenderbufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLuint)), _gloffset_FramebufferRenderbufferEXT, parameters)

+#define GET_FramebufferRenderbufferEXT(disp) GET_by_offset(disp, _gloffset_FramebufferRenderbufferEXT)

+#define SET_FramebufferRenderbufferEXT(disp, fn) SET_by_offset(disp, _gloffset_FramebufferRenderbufferEXT, fn)

+#define CALL_FramebufferTexture1DEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLuint, GLint)), _gloffset_FramebufferTexture1DEXT, parameters)

+#define GET_FramebufferTexture1DEXT(disp) GET_by_offset(disp, _gloffset_FramebufferTexture1DEXT)

+#define SET_FramebufferTexture1DEXT(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTexture1DEXT, fn)

+#define CALL_FramebufferTexture2DEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLuint, GLint)), _gloffset_FramebufferTexture2DEXT, parameters)

+#define GET_FramebufferTexture2DEXT(disp) GET_by_offset(disp, _gloffset_FramebufferTexture2DEXT)

+#define SET_FramebufferTexture2DEXT(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTexture2DEXT, fn)

+#define CALL_FramebufferTexture3DEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLuint, GLint, GLint)), _gloffset_FramebufferTexture3DEXT, parameters)

+#define GET_FramebufferTexture3DEXT(disp) GET_by_offset(disp, _gloffset_FramebufferTexture3DEXT)

+#define SET_FramebufferTexture3DEXT(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTexture3DEXT, fn)

+#define CALL_GenFramebuffersEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenFramebuffersEXT, parameters)

+#define GET_GenFramebuffersEXT(disp) GET_by_offset(disp, _gloffset_GenFramebuffersEXT)

+#define SET_GenFramebuffersEXT(disp, fn) SET_by_offset(disp, _gloffset_GenFramebuffersEXT, fn)

+#define CALL_GenRenderbuffersEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsizei, GLuint *)), _gloffset_GenRenderbuffersEXT, parameters)

+#define GET_GenRenderbuffersEXT(disp) GET_by_offset(disp, _gloffset_GenRenderbuffersEXT)

+#define SET_GenRenderbuffersEXT(disp, fn) SET_by_offset(disp, _gloffset_GenRenderbuffersEXT, fn)

+#define CALL_GenerateMipmapEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_GenerateMipmapEXT, parameters)

+#define GET_GenerateMipmapEXT(disp) GET_by_offset(disp, _gloffset_GenerateMipmapEXT)

+#define SET_GenerateMipmapEXT(disp, fn) SET_by_offset(disp, _gloffset_GenerateMipmapEXT, fn)

+#define CALL_GetFramebufferAttachmentParameterivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLenum, GLint *)), _gloffset_GetFramebufferAttachmentParameterivEXT, parameters)

+#define GET_GetFramebufferAttachmentParameterivEXT(disp) GET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameterivEXT)

+#define SET_GetFramebufferAttachmentParameterivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameterivEXT, fn)

+#define CALL_GetRenderbufferParameterivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetRenderbufferParameterivEXT, parameters)

+#define GET_GetRenderbufferParameterivEXT(disp) GET_by_offset(disp, _gloffset_GetRenderbufferParameterivEXT)

+#define SET_GetRenderbufferParameterivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetRenderbufferParameterivEXT, fn)

+#define CALL_IsFramebufferEXT(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsFramebufferEXT, parameters)

+#define GET_IsFramebufferEXT(disp) GET_by_offset(disp, _gloffset_IsFramebufferEXT)

+#define SET_IsFramebufferEXT(disp, fn) SET_by_offset(disp, _gloffset_IsFramebufferEXT, fn)

+#define CALL_IsRenderbufferEXT(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLuint)), _gloffset_IsRenderbufferEXT, parameters)

+#define GET_IsRenderbufferEXT(disp) GET_by_offset(disp, _gloffset_IsRenderbufferEXT)

+#define SET_IsRenderbufferEXT(disp, fn) SET_by_offset(disp, _gloffset_IsRenderbufferEXT, fn)

+#define CALL_RenderbufferStorageEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLsizei, GLsizei)), _gloffset_RenderbufferStorageEXT, parameters)

+#define GET_RenderbufferStorageEXT(disp) GET_by_offset(disp, _gloffset_RenderbufferStorageEXT)

+#define SET_RenderbufferStorageEXT(disp, fn) SET_by_offset(disp, _gloffset_RenderbufferStorageEXT, fn)

+#define CALL_BlitFramebufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)), _gloffset_BlitFramebufferEXT, parameters)

+#define GET_BlitFramebufferEXT(disp) GET_by_offset(disp, _gloffset_BlitFramebufferEXT)

+#define SET_BlitFramebufferEXT(disp, fn) SET_by_offset(disp, _gloffset_BlitFramebufferEXT, fn)

+#define CALL_BufferParameteriAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint)), _gloffset_BufferParameteriAPPLE, parameters)

+#define GET_BufferParameteriAPPLE(disp) GET_by_offset(disp, _gloffset_BufferParameteriAPPLE)

+#define SET_BufferParameteriAPPLE(disp, fn) SET_by_offset(disp, _gloffset_BufferParameteriAPPLE, fn)

+#define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr)), _gloffset_FlushMappedBufferRangeAPPLE, parameters)

+#define GET_FlushMappedBufferRangeAPPLE(disp) GET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE)

+#define SET_FlushMappedBufferRangeAPPLE(disp, fn) SET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE, fn)

+#define CALL_BindFragDataLocationEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, const GLchar *)), _gloffset_BindFragDataLocationEXT, parameters)

+#define GET_BindFragDataLocationEXT(disp) GET_by_offset(disp, _gloffset_BindFragDataLocationEXT)

+#define SET_BindFragDataLocationEXT(disp, fn) SET_by_offset(disp, _gloffset_BindFragDataLocationEXT, fn)

+#define CALL_GetFragDataLocationEXT(disp, parameters) CALL_by_offset(disp, (GLint (GLAPIENTRYP)(GLuint, const GLchar *)), _gloffset_GetFragDataLocationEXT, parameters)

+#define GET_GetFragDataLocationEXT(disp) GET_by_offset(disp, _gloffset_GetFragDataLocationEXT)

+#define SET_GetFragDataLocationEXT(disp, fn) SET_by_offset(disp, _gloffset_GetFragDataLocationEXT, fn)

+#define CALL_GetUniformuivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLuint *)), _gloffset_GetUniformuivEXT, parameters)

+#define GET_GetUniformuivEXT(disp) GET_by_offset(disp, _gloffset_GetUniformuivEXT)

+#define SET_GetUniformuivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetUniformuivEXT, fn)

+#define CALL_GetVertexAttribIivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint *)), _gloffset_GetVertexAttribIivEXT, parameters)

+#define GET_GetVertexAttribIivEXT(disp) GET_by_offset(disp, _gloffset_GetVertexAttribIivEXT)

+#define SET_GetVertexAttribIivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribIivEXT, fn)

+#define CALL_GetVertexAttribIuivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLuint *)), _gloffset_GetVertexAttribIuivEXT, parameters)

+#define GET_GetVertexAttribIuivEXT(disp) GET_by_offset(disp, _gloffset_GetVertexAttribIuivEXT)

+#define SET_GetVertexAttribIuivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetVertexAttribIuivEXT, fn)

+#define CALL_Uniform1uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLuint)), _gloffset_Uniform1uiEXT, parameters)

+#define GET_Uniform1uiEXT(disp) GET_by_offset(disp, _gloffset_Uniform1uiEXT)

+#define SET_Uniform1uiEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform1uiEXT, fn)

+#define CALL_Uniform1uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLuint *)), _gloffset_Uniform1uivEXT, parameters)

+#define GET_Uniform1uivEXT(disp) GET_by_offset(disp, _gloffset_Uniform1uivEXT)

+#define SET_Uniform1uivEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform1uivEXT, fn)

+#define CALL_Uniform2uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLuint, GLuint)), _gloffset_Uniform2uiEXT, parameters)

+#define GET_Uniform2uiEXT(disp) GET_by_offset(disp, _gloffset_Uniform2uiEXT)

+#define SET_Uniform2uiEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform2uiEXT, fn)

+#define CALL_Uniform2uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLuint *)), _gloffset_Uniform2uivEXT, parameters)

+#define GET_Uniform2uivEXT(disp) GET_by_offset(disp, _gloffset_Uniform2uivEXT)

+#define SET_Uniform2uivEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform2uivEXT, fn)

+#define CALL_Uniform3uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLuint, GLuint, GLuint)), _gloffset_Uniform3uiEXT, parameters)

+#define GET_Uniform3uiEXT(disp) GET_by_offset(disp, _gloffset_Uniform3uiEXT)

+#define SET_Uniform3uiEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform3uiEXT, fn)

+#define CALL_Uniform3uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLuint *)), _gloffset_Uniform3uivEXT, parameters)

+#define GET_Uniform3uivEXT(disp) GET_by_offset(disp, _gloffset_Uniform3uivEXT)

+#define SET_Uniform3uivEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform3uivEXT, fn)

+#define CALL_Uniform4uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLuint, GLuint, GLuint, GLuint)), _gloffset_Uniform4uiEXT, parameters)

+#define GET_Uniform4uiEXT(disp) GET_by_offset(disp, _gloffset_Uniform4uiEXT)

+#define SET_Uniform4uiEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform4uiEXT, fn)

+#define CALL_Uniform4uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLsizei, const GLuint *)), _gloffset_Uniform4uivEXT, parameters)

+#define GET_Uniform4uivEXT(disp) GET_by_offset(disp, _gloffset_Uniform4uivEXT)

+#define SET_Uniform4uivEXT(disp, fn) SET_by_offset(disp, _gloffset_Uniform4uivEXT, fn)

+#define CALL_VertexAttribI1iEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint)), _gloffset_VertexAttribI1iEXT, parameters)

+#define GET_VertexAttribI1iEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI1iEXT)

+#define SET_VertexAttribI1iEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI1iEXT, fn)

+#define CALL_VertexAttribI1ivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLint *)), _gloffset_VertexAttribI1ivEXT, parameters)

+#define GET_VertexAttribI1ivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI1ivEXT)

+#define SET_VertexAttribI1ivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI1ivEXT, fn)

+#define CALL_VertexAttribI1uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), _gloffset_VertexAttribI1uiEXT, parameters)

+#define GET_VertexAttribI1uiEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI1uiEXT)

+#define SET_VertexAttribI1uiEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI1uiEXT, fn)

+#define CALL_VertexAttribI1uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLuint *)), _gloffset_VertexAttribI1uivEXT, parameters)

+#define GET_VertexAttribI1uivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI1uivEXT)

+#define SET_VertexAttribI1uivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI1uivEXT, fn)

+#define CALL_VertexAttribI2iEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLint)), _gloffset_VertexAttribI2iEXT, parameters)

+#define GET_VertexAttribI2iEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI2iEXT)

+#define SET_VertexAttribI2iEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI2iEXT, fn)

+#define CALL_VertexAttribI2ivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLint *)), _gloffset_VertexAttribI2ivEXT, parameters)

+#define GET_VertexAttribI2ivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI2ivEXT)

+#define SET_VertexAttribI2ivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI2ivEXT, fn)

+#define CALL_VertexAttribI2uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint)), _gloffset_VertexAttribI2uiEXT, parameters)

+#define GET_VertexAttribI2uiEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI2uiEXT)

+#define SET_VertexAttribI2uiEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI2uiEXT, fn)

+#define CALL_VertexAttribI2uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLuint *)), _gloffset_VertexAttribI2uivEXT, parameters)

+#define GET_VertexAttribI2uivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI2uivEXT)

+#define SET_VertexAttribI2uivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI2uivEXT, fn)

+#define CALL_VertexAttribI3iEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLint, GLint)), _gloffset_VertexAttribI3iEXT, parameters)

+#define GET_VertexAttribI3iEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI3iEXT)

+#define SET_VertexAttribI3iEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI3iEXT, fn)

+#define CALL_VertexAttribI3ivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLint *)), _gloffset_VertexAttribI3ivEXT, parameters)

+#define GET_VertexAttribI3ivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI3ivEXT)

+#define SET_VertexAttribI3ivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI3ivEXT, fn)

+#define CALL_VertexAttribI3uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint, GLuint)), _gloffset_VertexAttribI3uiEXT, parameters)

+#define GET_VertexAttribI3uiEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI3uiEXT)

+#define SET_VertexAttribI3uiEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI3uiEXT, fn)

+#define CALL_VertexAttribI3uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLuint *)), _gloffset_VertexAttribI3uivEXT, parameters)

+#define GET_VertexAttribI3uivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI3uivEXT)

+#define SET_VertexAttribI3uivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI3uivEXT, fn)

+#define CALL_VertexAttribI4bvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLbyte *)), _gloffset_VertexAttribI4bvEXT, parameters)

+#define GET_VertexAttribI4bvEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4bvEXT)

+#define SET_VertexAttribI4bvEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4bvEXT, fn)

+#define CALL_VertexAttribI4iEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLint, GLint, GLint)), _gloffset_VertexAttribI4iEXT, parameters)

+#define GET_VertexAttribI4iEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4iEXT)

+#define SET_VertexAttribI4iEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4iEXT, fn)

+#define CALL_VertexAttribI4ivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLint *)), _gloffset_VertexAttribI4ivEXT, parameters)

+#define GET_VertexAttribI4ivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4ivEXT)

+#define SET_VertexAttribI4ivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4ivEXT, fn)

+#define CALL_VertexAttribI4svEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLshort *)), _gloffset_VertexAttribI4svEXT, parameters)

+#define GET_VertexAttribI4svEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4svEXT)

+#define SET_VertexAttribI4svEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4svEXT, fn)

+#define CALL_VertexAttribI4ubvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLubyte *)), _gloffset_VertexAttribI4ubvEXT, parameters)

+#define GET_VertexAttribI4ubvEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4ubvEXT)

+#define SET_VertexAttribI4ubvEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4ubvEXT, fn)

+#define CALL_VertexAttribI4uiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint, GLuint, GLuint)), _gloffset_VertexAttribI4uiEXT, parameters)

+#define GET_VertexAttribI4uiEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4uiEXT)

+#define SET_VertexAttribI4uiEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4uiEXT, fn)

+#define CALL_VertexAttribI4uivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLuint *)), _gloffset_VertexAttribI4uivEXT, parameters)

+#define GET_VertexAttribI4uivEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4uivEXT)

+#define SET_VertexAttribI4uivEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4uivEXT, fn)

+#define CALL_VertexAttribI4usvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, const GLushort *)), _gloffset_VertexAttribI4usvEXT, parameters)

+#define GET_VertexAttribI4usvEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribI4usvEXT)

+#define SET_VertexAttribI4usvEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribI4usvEXT, fn)

+#define CALL_VertexAttribIPointerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)), _gloffset_VertexAttribIPointerEXT, parameters)

+#define GET_VertexAttribIPointerEXT(disp) GET_by_offset(disp, _gloffset_VertexAttribIPointerEXT)

+#define SET_VertexAttribIPointerEXT(disp, fn) SET_by_offset(disp, _gloffset_VertexAttribIPointerEXT, fn)

+#define CALL_FramebufferTextureLayerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint, GLint)), _gloffset_FramebufferTextureLayerEXT, parameters)

+#define GET_FramebufferTextureLayerEXT(disp) GET_by_offset(disp, _gloffset_FramebufferTextureLayerEXT)

+#define SET_FramebufferTextureLayerEXT(disp, fn) SET_by_offset(disp, _gloffset_FramebufferTextureLayerEXT, fn)

+#define CALL_ColorMaskIndexedEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean)), _gloffset_ColorMaskIndexedEXT, parameters)

+#define GET_ColorMaskIndexedEXT(disp) GET_by_offset(disp, _gloffset_ColorMaskIndexedEXT)

+#define SET_ColorMaskIndexedEXT(disp, fn) SET_by_offset(disp, _gloffset_ColorMaskIndexedEXT, fn)

+#define CALL_DisableIndexedEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_DisableIndexedEXT, parameters)

+#define GET_DisableIndexedEXT(disp) GET_by_offset(disp, _gloffset_DisableIndexedEXT)

+#define SET_DisableIndexedEXT(disp, fn) SET_by_offset(disp, _gloffset_DisableIndexedEXT, fn)

+#define CALL_EnableIndexedEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_EnableIndexedEXT, parameters)

+#define GET_EnableIndexedEXT(disp) GET_by_offset(disp, _gloffset_EnableIndexedEXT)

+#define SET_EnableIndexedEXT(disp, fn) SET_by_offset(disp, _gloffset_EnableIndexedEXT, fn)

+#define CALL_GetBooleanIndexedvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLboolean *)), _gloffset_GetBooleanIndexedvEXT, parameters)

+#define GET_GetBooleanIndexedvEXT(disp) GET_by_offset(disp, _gloffset_GetBooleanIndexedvEXT)

+#define SET_GetBooleanIndexedvEXT(disp, fn) SET_by_offset(disp, _gloffset_GetBooleanIndexedvEXT, fn)

+#define CALL_GetIntegerIndexedvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLint *)), _gloffset_GetIntegerIndexedvEXT, parameters)

+#define GET_GetIntegerIndexedvEXT(disp) GET_by_offset(disp, _gloffset_GetIntegerIndexedvEXT)

+#define SET_GetIntegerIndexedvEXT(disp, fn) SET_by_offset(disp, _gloffset_GetIntegerIndexedvEXT, fn)

+#define CALL_IsEnabledIndexedEXT(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_IsEnabledIndexedEXT, parameters)

+#define GET_IsEnabledIndexedEXT(disp) GET_by_offset(disp, _gloffset_IsEnabledIndexedEXT)

+#define SET_IsEnabledIndexedEXT(disp, fn) SET_by_offset(disp, _gloffset_IsEnabledIndexedEXT, fn)

+#define CALL_ClearColorIiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint)), _gloffset_ClearColorIiEXT, parameters)

+#define GET_ClearColorIiEXT(disp) GET_by_offset(disp, _gloffset_ClearColorIiEXT)

+#define SET_ClearColorIiEXT(disp, fn) SET_by_offset(disp, _gloffset_ClearColorIiEXT, fn)

+#define CALL_ClearColorIuiEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLuint, GLuint)), _gloffset_ClearColorIuiEXT, parameters)

+#define GET_ClearColorIuiEXT(disp) GET_by_offset(disp, _gloffset_ClearColorIuiEXT)

+#define SET_ClearColorIuiEXT(disp, fn) SET_by_offset(disp, _gloffset_ClearColorIuiEXT, fn)

+#define CALL_GetTexParameterIivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint *)), _gloffset_GetTexParameterIivEXT, parameters)

+#define GET_GetTexParameterIivEXT(disp) GET_by_offset(disp, _gloffset_GetTexParameterIivEXT)

+#define SET_GetTexParameterIivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetTexParameterIivEXT, fn)

+#define CALL_GetTexParameterIuivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint *)), _gloffset_GetTexParameterIuivEXT, parameters)

+#define GET_GetTexParameterIuivEXT(disp) GET_by_offset(disp, _gloffset_GetTexParameterIuivEXT)

+#define SET_GetTexParameterIuivEXT(disp, fn) SET_by_offset(disp, _gloffset_GetTexParameterIuivEXT, fn)

+#define CALL_TexParameterIivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLint *)), _gloffset_TexParameterIivEXT, parameters)

+#define GET_TexParameterIivEXT(disp) GET_by_offset(disp, _gloffset_TexParameterIivEXT)

+#define SET_TexParameterIivEXT(disp, fn) SET_by_offset(disp, _gloffset_TexParameterIivEXT, fn)

+#define CALL_TexParameterIuivEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, const GLuint *)), _gloffset_TexParameterIuivEXT, parameters)

+#define GET_TexParameterIuivEXT(disp) GET_by_offset(disp, _gloffset_TexParameterIuivEXT)

+#define SET_TexParameterIuivEXT(disp, fn) SET_by_offset(disp, _gloffset_TexParameterIuivEXT, fn)

+#define CALL_BeginConditionalRenderNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum)), _gloffset_BeginConditionalRenderNV, parameters)

+#define GET_BeginConditionalRenderNV(disp) GET_by_offset(disp, _gloffset_BeginConditionalRenderNV)

+#define SET_BeginConditionalRenderNV(disp, fn) SET_by_offset(disp, _gloffset_BeginConditionalRenderNV, fn)

+#define CALL_EndConditionalRenderNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_EndConditionalRenderNV, parameters)

+#define GET_EndConditionalRenderNV(disp) GET_by_offset(disp, _gloffset_EndConditionalRenderNV)

+#define SET_EndConditionalRenderNV(disp, fn) SET_by_offset(disp, _gloffset_EndConditionalRenderNV, fn)

+#define CALL_BeginTransformFeedbackEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_BeginTransformFeedbackEXT, parameters)

+#define GET_BeginTransformFeedbackEXT(disp) GET_by_offset(disp, _gloffset_BeginTransformFeedbackEXT)

+#define SET_BeginTransformFeedbackEXT(disp, fn) SET_by_offset(disp, _gloffset_BeginTransformFeedbackEXT, fn)

+#define CALL_BindBufferBaseEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint)), _gloffset_BindBufferBaseEXT, parameters)

+#define GET_BindBufferBaseEXT(disp) GET_by_offset(disp, _gloffset_BindBufferBaseEXT)

+#define SET_BindBufferBaseEXT(disp, fn) SET_by_offset(disp, _gloffset_BindBufferBaseEXT, fn)

+#define CALL_BindBufferOffsetEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLintptr)), _gloffset_BindBufferOffsetEXT, parameters)

+#define GET_BindBufferOffsetEXT(disp) GET_by_offset(disp, _gloffset_BindBufferOffsetEXT)

+#define SET_BindBufferOffsetEXT(disp, fn) SET_by_offset(disp, _gloffset_BindBufferOffsetEXT, fn)

+#define CALL_BindBufferRangeEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr)), _gloffset_BindBufferRangeEXT, parameters)

+#define GET_BindBufferRangeEXT(disp) GET_by_offset(disp, _gloffset_BindBufferRangeEXT)

+#define SET_BindBufferRangeEXT(disp, fn) SET_by_offset(disp, _gloffset_BindBufferRangeEXT, fn)

+#define CALL_EndTransformFeedbackEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), _gloffset_EndTransformFeedbackEXT, parameters)

+#define GET_EndTransformFeedbackEXT(disp) GET_by_offset(disp, _gloffset_EndTransformFeedbackEXT)

+#define SET_EndTransformFeedbackEXT(disp, fn) SET_by_offset(disp, _gloffset_EndTransformFeedbackEXT, fn)

+#define CALL_GetTransformFeedbackVaryingEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)), _gloffset_GetTransformFeedbackVaryingEXT, parameters)

+#define GET_GetTransformFeedbackVaryingEXT(disp) GET_by_offset(disp, _gloffset_GetTransformFeedbackVaryingEXT)

+#define SET_GetTransformFeedbackVaryingEXT(disp, fn) SET_by_offset(disp, _gloffset_GetTransformFeedbackVaryingEXT, fn)

+#define CALL_TransformFeedbackVaryingsEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const char **, GLenum)), _gloffset_TransformFeedbackVaryingsEXT, parameters)

+#define GET_TransformFeedbackVaryingsEXT(disp) GET_by_offset(disp, _gloffset_TransformFeedbackVaryingsEXT)

+#define SET_TransformFeedbackVaryingsEXT(disp, fn) SET_by_offset(disp, _gloffset_TransformFeedbackVaryingsEXT, fn)

+#define CALL_ProvokingVertexEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), _gloffset_ProvokingVertexEXT, parameters)

+#define GET_ProvokingVertexEXT(disp) GET_by_offset(disp, _gloffset_ProvokingVertexEXT)

+#define SET_ProvokingVertexEXT(disp, fn) SET_by_offset(disp, _gloffset_ProvokingVertexEXT, fn)

+#define CALL_GetTexParameterPointervAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLvoid **)), _gloffset_GetTexParameterPointervAPPLE, parameters)

+#define GET_GetTexParameterPointervAPPLE(disp) GET_by_offset(disp, _gloffset_GetTexParameterPointervAPPLE)

+#define SET_GetTexParameterPointervAPPLE(disp, fn) SET_by_offset(disp, _gloffset_GetTexParameterPointervAPPLE, fn)

+#define CALL_TextureRangeAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLsizei, GLvoid *)), _gloffset_TextureRangeAPPLE, parameters)

+#define GET_TextureRangeAPPLE(disp) GET_by_offset(disp, _gloffset_TextureRangeAPPLE)

+#define SET_TextureRangeAPPLE(disp, fn) SET_by_offset(disp, _gloffset_TextureRangeAPPLE, fn)

+#define CALL_GetObjectParameterivAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLenum, GLint *)), _gloffset_GetObjectParameterivAPPLE, parameters)

+#define GET_GetObjectParameterivAPPLE(disp) GET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE)

+#define SET_GetObjectParameterivAPPLE(disp, fn) SET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE, fn)

+#define CALL_ObjectPurgeableAPPLE(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(GLenum, GLuint, GLenum)), _gloffset_ObjectPurgeableAPPLE, parameters)

+#define GET_ObjectPurgeableAPPLE(disp) GET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE)

+#define SET_ObjectPurgeableAPPLE(disp, fn) SET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE, fn)

+#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(GLenum, GLuint, GLenum)), _gloffset_ObjectUnpurgeableAPPLE, parameters)

+#define GET_ObjectUnpurgeableAPPLE(disp) GET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE)

+#define SET_ObjectUnpurgeableAPPLE(disp, fn) SET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE, fn)

+#define CALL_ActiveProgramEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_ActiveProgramEXT, parameters)

+#define GET_ActiveProgramEXT(disp) GET_by_offset(disp, _gloffset_ActiveProgramEXT)

+#define SET_ActiveProgramEXT(disp, fn) SET_by_offset(disp, _gloffset_ActiveProgramEXT, fn)

+#define CALL_CreateShaderProgramEXT(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(GLenum, const GLchar *)), _gloffset_CreateShaderProgramEXT, parameters)

+#define GET_CreateShaderProgramEXT(disp) GET_by_offset(disp, _gloffset_CreateShaderProgramEXT)

+#define SET_CreateShaderProgramEXT(disp, fn) SET_by_offset(disp, _gloffset_CreateShaderProgramEXT, fn)

+#define CALL_UseShaderProgramEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), _gloffset_UseShaderProgramEXT, parameters)

+#define GET_UseShaderProgramEXT(disp) GET_by_offset(disp, _gloffset_UseShaderProgramEXT)

+#define SET_UseShaderProgramEXT(disp, fn) SET_by_offset(disp, _gloffset_UseShaderProgramEXT, fn)

+#define CALL_StencilFuncSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLuint)), _gloffset_StencilFuncSeparateATI, parameters)

+#define GET_StencilFuncSeparateATI(disp) GET_by_offset(disp, _gloffset_StencilFuncSeparateATI)

+#define SET_StencilFuncSeparateATI(disp, fn) SET_by_offset(disp, _gloffset_StencilFuncSeparateATI, fn)

+#define CALL_ProgramEnvParameters4fvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLfloat *)), _gloffset_ProgramEnvParameters4fvEXT, parameters)

+#define GET_ProgramEnvParameters4fvEXT(disp) GET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT)

+#define SET_ProgramEnvParameters4fvEXT(disp, fn) SET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT, fn)

+#define CALL_ProgramLocalParameters4fvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLfloat *)), _gloffset_ProgramLocalParameters4fvEXT, parameters)

+#define GET_ProgramLocalParameters4fvEXT(disp) GET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT)

+#define SET_ProgramLocalParameters4fvEXT(disp, fn) SET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT, fn)

+#define CALL_GetQueryObjecti64vEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLint64EXT *)), _gloffset_GetQueryObjecti64vEXT, parameters)

+#define GET_GetQueryObjecti64vEXT(disp) GET_by_offset(disp, _gloffset_GetQueryObjecti64vEXT)

+#define SET_GetQueryObjecti64vEXT(disp, fn) SET_by_offset(disp, _gloffset_GetQueryObjecti64vEXT, fn)

+#define CALL_GetQueryObjectui64vEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLuint64EXT *)), _gloffset_GetQueryObjectui64vEXT, parameters)

+#define GET_GetQueryObjectui64vEXT(disp) GET_by_offset(disp, _gloffset_GetQueryObjectui64vEXT)

+#define SET_GetQueryObjectui64vEXT(disp, fn) SET_by_offset(disp, _gloffset_GetQueryObjectui64vEXT, fn)

+#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLvoid *)), _gloffset_EGLImageTargetRenderbufferStorageOES, parameters)

+#define GET_EGLImageTargetRenderbufferStorageOES(disp) GET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES)

+#define SET_EGLImageTargetRenderbufferStorageOES(disp, fn) SET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES, fn)

+#define CALL_EGLImageTargetTexture2DOES(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLvoid *)), _gloffset_EGLImageTargetTexture2DOES, parameters)

+#define GET_EGLImageTargetTexture2DOES(disp) GET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES)

+#define SET_EGLImageTargetTexture2DOES(disp, fn) SET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES, fn)

+

+#endif /* !defined( _GLAPI_DISPATCH_H_ ) */

diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h
index 45f7b55ad..5ca44deb0 100644
--- a/mesalib/src/mesa/main/glheader.h
+++ b/mesalib/src/mesa/main/glheader.h
@@ -1,145 +1,163 @@
-/*
- * 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"
-#include "GL/internal/glcore.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
-
-
-
-/**
- * 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
-
-
-
-#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

+

+

+

+/**

+ * 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/hash.c b/mesalib/src/mesa/main/hash.c
index b624e6eca..63f5c90fa 100644
--- a/mesalib/src/mesa/main/hash.c
+++ b/mesalib/src/mesa/main/hash.c
@@ -1,547 +1,547 @@
-/**
- * \file hash.c
- * Generic hash table. 
- *
- * Used for display lists, texture objects, vertex/fragment programs,
- * buffer objects, etc.  The hash functions are thread-safe.
- * 
- * \note key=0 is illegal.
- *
- * \author Brian Paul
- */
-
-/*
- * 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 "glapi/glthread.h"
-#include "hash.h"
-
-
-#define TABLE_SIZE 1023  /**< Size of lookup table/array */
-
-#define HASH_FUNC(K)  ((K) % TABLE_SIZE)
-
-
-/**
- * An entry in the hash table.  
- */
-struct HashEntry {
-   GLuint Key;             /**< the entry's key */
-   void *Data;             /**< the entry's data */
-   struct HashEntry *Next; /**< pointer to next entry */
-};
-
-
-/**
- * The hash table data structure.  
- */
-struct _mesa_HashTable {
-   struct HashEntry *Table[TABLE_SIZE];  /**< the lookup table */
-   GLuint MaxKey;                        /**< highest key inserted so far */
-   _glthread_Mutex Mutex;                /**< mutual exclusion lock */
-   _glthread_Mutex WalkMutex;            /**< for _mesa_HashWalk() */
-   GLboolean InDeleteAll;                /**< Debug check */
-};
-
-
-
-/**
- * Create a new hash table.
- * 
- * \return pointer to a new, empty hash table.
- */
-struct _mesa_HashTable *
-_mesa_NewHashTable(void)
-{
-   struct _mesa_HashTable *table = CALLOC_STRUCT(_mesa_HashTable);
-   if (table) {
-      _glthread_INIT_MUTEX(table->Mutex);
-      _glthread_INIT_MUTEX(table->WalkMutex);
-   }
-   return table;
-}
-
-
-
-/**
- * Delete a hash table.
- * Frees each entry on the hash table and then the hash table structure itself.
- * Note that the caller should have already traversed the table and deleted
- * the objects in the table (i.e. We don't free the entries' data pointer).
- *
- * \param table the hash table to delete.
- */
-void
-_mesa_DeleteHashTable(struct _mesa_HashTable *table)
-{
-   GLuint pos;
-   assert(table);
-   for (pos = 0; pos < TABLE_SIZE; pos++) {
-      struct HashEntry *entry = table->Table[pos];
-      while (entry) {
-	 struct HashEntry *next = entry->Next;
-         if (entry->Data) {
-            _mesa_problem(NULL,
-                          "In _mesa_DeleteHashTable, found non-freed data");
-         }
-	 free(entry);
-	 entry = next;
-      }
-   }
-   _glthread_DESTROY_MUTEX(table->Mutex);
-   _glthread_DESTROY_MUTEX(table->WalkMutex);
-   free(table);
-}
-
-
-
-/**
- * Lookup an entry in the hash table, without locking.
- * \sa _mesa_HashLookup
- */
-static INLINE void *
-_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
-{
-   GLuint pos;
-   const struct HashEntry *entry;
-
-   assert(table);
-   assert(key);
-
-   pos = HASH_FUNC(key);
-   entry = table->Table[pos];
-   while (entry) {
-      if (entry->Key == key) {
-         return entry->Data;
-      }
-      entry = entry->Next;
-   }
-   return NULL;
-}
-
-
-/**
- * Lookup an entry in the hash table.
- * 
- * \param table the hash table.
- * \param key the key.
- * 
- * \return pointer to user's data or NULL if key not in table
- */
-void *
-_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
-{
-   void *res;
-   assert(table);
-   _glthread_LOCK_MUTEX(table->Mutex);
-   res = _mesa_HashLookup_unlocked(table, key);
-   _glthread_UNLOCK_MUTEX(table->Mutex);
-   return res;
-}
-
-
-/**
- * Insert a key/pointer pair into the hash table.  
- * If an entry with this key already exists we'll replace the existing entry.
- * 
- * \param table the hash table.
- * \param key the key (not zero).
- * \param data pointer to user data.
- */
-void
-_mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
-{
-   /* search for existing entry with this key */
-   GLuint pos;
-   struct HashEntry *entry;
-
-   assert(table);
-   assert(key);
-
-   _glthread_LOCK_MUTEX(table->Mutex);
-
-   if (key > table->MaxKey)
-      table->MaxKey = key;
-
-   pos = HASH_FUNC(key);
-
-   /* check if replacing an existing entry with same key */
-   for (entry = table->Table[pos]; entry; entry = entry->Next) {
-      if (entry->Key == key) {
-         /* replace entry's data */
-#if 0 /* not sure this check is always valid */
-         if (entry->Data) {
-            _mesa_problem(NULL, "Memory leak detected in _mesa_HashInsert");
-         }
-#endif
-	 entry->Data = data;
-         _glthread_UNLOCK_MUTEX(table->Mutex);
-	 return;
-      }
-   }
-
-   /* alloc and insert new table entry */
-   entry = MALLOC_STRUCT(HashEntry);
-   if (entry) {
-      entry->Key = key;
-      entry->Data = data;
-      entry->Next = table->Table[pos];
-      table->Table[pos] = entry;
-   }
-
-   _glthread_UNLOCK_MUTEX(table->Mutex);
-}
-
-
-
-/**
- * Remove an entry from the hash table.
- * 
- * \param table the hash table.
- * \param key key of entry to remove.
- *
- * While holding the hash table's lock, searches the entry with the matching
- * key and unlinks it.
- */
-void
-_mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
-{
-   GLuint pos;
-   struct HashEntry *entry, *prev;
-
-   assert(table);
-   assert(key);
-
-   /* have to check this outside of mutex lock */
-   if (table->InDeleteAll) {
-      _mesa_problem(NULL, "_mesa_HashRemove illegally called from "
-                    "_mesa_HashDeleteAll callback function");
-      return;
-   }
-
-   _glthread_LOCK_MUTEX(table->Mutex);
-
-   pos = HASH_FUNC(key);
-   prev = NULL;
-   entry = table->Table[pos];
-   while (entry) {
-      if (entry->Key == key) {
-         /* found it! */
-         if (prev) {
-            prev->Next = entry->Next;
-         }
-         else {
-            table->Table[pos] = entry->Next;
-         }
-         free(entry);
-         _glthread_UNLOCK_MUTEX(table->Mutex);
-	 return;
-      }
-      prev = entry;
-      entry = entry->Next;
-   }
-
-   _glthread_UNLOCK_MUTEX(table->Mutex);
-}
-
-
-
-/**
- * Delete all entries in a hash table, but don't delete the table itself.
- * Invoke the given callback function for each table entry.
- *
- * \param table  the hash table to delete
- * \param callback  the callback function
- * \param userData  arbitrary pointer to pass along to the callback
- *                  (this is typically a GLcontext pointer)
- */
-void
-_mesa_HashDeleteAll(struct _mesa_HashTable *table,
-                    void (*callback)(GLuint key, void *data, void *userData),
-                    void *userData)
-{
-   GLuint pos;
-   ASSERT(table);
-   ASSERT(callback);
-   _glthread_LOCK_MUTEX(table->Mutex);
-   table->InDeleteAll = GL_TRUE;
-   for (pos = 0; pos < TABLE_SIZE; pos++) {
-      struct HashEntry *entry, *next;
-      for (entry = table->Table[pos]; entry; entry = next) {
-         callback(entry->Key, entry->Data, userData);
-         next = entry->Next;
-         free(entry);
-      }
-      table->Table[pos] = NULL;
-   }
-   table->InDeleteAll = GL_FALSE;
-   _glthread_UNLOCK_MUTEX(table->Mutex);
-}
-
-
-/**
- * Walk over all entries in a hash table, calling callback function for each.
- * Note: we use a separate mutex in this function to avoid a recursive
- * locking deadlock (in case the callback calls _mesa_HashRemove()) and to
- * prevent multiple threads/contexts from getting tangled up.
- * A lock-less version of this function could be used when the table will
- * not be modified.
- * \param table  the hash table to walk
- * \param callback  the callback function
- * \param userData  arbitrary pointer to pass along to the callback
- *                  (this is typically a GLcontext pointer)
- */
-void
-_mesa_HashWalk(const struct _mesa_HashTable *table,
-               void (*callback)(GLuint key, void *data, void *userData),
-               void *userData)
-{
-   /* cast-away const */
-   struct _mesa_HashTable *table2 = (struct _mesa_HashTable *) table;
-   GLuint pos;
-   ASSERT(table);
-   ASSERT(callback);
-   _glthread_LOCK_MUTEX(table2->WalkMutex);
-   for (pos = 0; pos < TABLE_SIZE; pos++) {
-      struct HashEntry *entry, *next;
-      for (entry = table->Table[pos]; entry; entry = next) {
-         /* save 'next' pointer now in case the callback deletes the entry */
-         next = entry->Next;
-         callback(entry->Key, entry->Data, userData);
-      }
-   }
-   _glthread_UNLOCK_MUTEX(table2->WalkMutex);
-}
-
-
-/**
- * Return the key of the "first" entry in the hash table.
- * While holding the lock, walks through all table positions until finding
- * the first entry of the first non-empty one.
- * 
- * \param table  the hash table
- * \return key for the "first" entry in the hash table.
- */
-GLuint
-_mesa_HashFirstEntry(struct _mesa_HashTable *table)
-{
-   GLuint pos;
-   assert(table);
-   _glthread_LOCK_MUTEX(table->Mutex);
-   for (pos = 0; pos < TABLE_SIZE; pos++) {
-      if (table->Table[pos]) {
-         _glthread_UNLOCK_MUTEX(table->Mutex);
-         return table->Table[pos]->Key;
-      }
-   }
-   _glthread_UNLOCK_MUTEX(table->Mutex);
-   return 0;
-}
-
-
-/**
- * Given a hash table key, return the next key.  This is used to walk
- * over all entries in the table.  Note that the keys returned during
- * walking won't be in any particular order.
- * \return next hash key or 0 if end of table.
- */
-GLuint
-_mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key)
-{
-   const struct HashEntry *entry;
-   GLuint pos;
-
-   assert(table);
-   assert(key);
-
-   /* Find the entry with given key */
-   pos = HASH_FUNC(key);
-   for (entry = table->Table[pos]; entry ; entry = entry->Next) {
-      if (entry->Key == key) {
-         break;
-      }
-   }
-
-   if (!entry) {
-      /* the given key was not found, so we can't find the next entry */
-      return 0;
-   }
-
-   if (entry->Next) {
-      /* return next in linked list */
-      return entry->Next->Key;
-   }
-   else {
-      /* look for next non-empty table slot */
-      pos++;
-      while (pos < TABLE_SIZE) {
-         if (table->Table[pos]) {
-            return table->Table[pos]->Key;
-         }
-         pos++;
-      }
-      return 0;
-   }
-}
-
-
-/**
- * Dump contents of hash table for debugging.
- * 
- * \param table the hash table.
- */
-void
-_mesa_HashPrint(const struct _mesa_HashTable *table)
-{
-   GLuint pos;
-   assert(table);
-   for (pos = 0; pos < TABLE_SIZE; pos++) {
-      const struct HashEntry *entry = table->Table[pos];
-      while (entry) {
-	 _mesa_debug(NULL, "%u %p\n", entry->Key, entry->Data);
-	 entry = entry->Next;
-      }
-   }
-}
-
-
-
-/**
- * Find a block of adjacent unused hash keys.
- * 
- * \param table the hash table.
- * \param numKeys number of keys needed.
- * 
- * \return Starting key of free block or 0 if failure.
- *
- * If there are enough free keys between the maximum key existing in the table
- * (_mesa_HashTable::MaxKey) and the maximum key possible, then simply return
- * the adjacent key. Otherwise do a full search for a free key block in the
- * allowable key range.
- */
-GLuint
-_mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
-{
-   const GLuint maxKey = ~((GLuint) 0);
-   _glthread_LOCK_MUTEX(table->Mutex);
-   if (maxKey - numKeys > table->MaxKey) {
-      /* the quick solution */
-      _glthread_UNLOCK_MUTEX(table->Mutex);
-      return table->MaxKey + 1;
-   }
-   else {
-      /* the slow solution */
-      GLuint freeCount = 0;
-      GLuint freeStart = 1;
-      GLuint key;
-      for (key = 1; key != maxKey; key++) {
-	 if (_mesa_HashLookup_unlocked(table, key)) {
-	    /* darn, this key is already in use */
-	    freeCount = 0;
-	    freeStart = key+1;
-	 }
-	 else {
-	    /* this key not in use, check if we've found enough */
-	    freeCount++;
-	    if (freeCount == numKeys) {
-               _glthread_UNLOCK_MUTEX(table->Mutex);
-	       return freeStart;
-	    }
-	 }
-      }
-      /* cannot allocate a block of numKeys consecutive keys */
-      _glthread_UNLOCK_MUTEX(table->Mutex);
-      return 0;
-   }
-}
-
-
-#if 0 /* debug only */
-
-/**
- * Test walking over all the entries in a hash table.
- */
-static void
-test_hash_walking(void)
-{
-   struct _mesa_HashTable *t = _mesa_NewHashTable();
-   const GLuint limit = 50000;
-   GLuint i;
-
-   /* create some entries */
-   for (i = 0; i < limit; i++) {
-      GLuint dummy;
-      GLuint k = (rand() % (limit * 10)) + 1;
-      while (_mesa_HashLookup(t, k)) {
-         /* id already in use, try another */
-         k = (rand() % (limit * 10)) + 1;
-      }
-      _mesa_HashInsert(t, k, &dummy);
-   }
-
-   /* walk over all entries */
-   {
-      GLuint k = _mesa_HashFirstEntry(t);
-      GLuint count = 0;
-      while (k) {
-         GLuint knext = _mesa_HashNextEntry(t, k);
-         assert(knext != k);
-         _mesa_HashRemove(t, k);
-         count++;
-         k = knext;
-      }
-      assert(count == limit);
-      k = _mesa_HashFirstEntry(t);
-      assert(k==0);
-   }
-
-   _mesa_DeleteHashTable(t);
-}
-
-
-void
-_mesa_test_hash_functions(void)
-{
-   int a, b, c;
-   struct _mesa_HashTable *t;
-
-   t = _mesa_NewHashTable();
-   _mesa_HashInsert(t, 501, &a);
-   _mesa_HashInsert(t, 10, &c);
-   _mesa_HashInsert(t, 0xfffffff8, &b);
-   /*_mesa_HashPrint(t);*/
-
-   assert(_mesa_HashLookup(t,501));
-   assert(!_mesa_HashLookup(t,1313));
-   assert(_mesa_HashFindFreeKeyBlock(t, 100));
-
-   _mesa_DeleteHashTable(t);
-
-   test_hash_walking();
-}
-
-#endif
+/**

+ * \file hash.c

+ * Generic hash table. 

+ *

+ * Used for display lists, texture objects, vertex/fragment programs,

+ * buffer objects, etc.  The hash functions are thread-safe.

+ * 

+ * \note key=0 is illegal.

+ *

+ * \author Brian Paul

+ */

+

+/*

+ * 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 "glapi/glthread.h"

+#include "hash.h"

+

+

+#define TABLE_SIZE 1023  /**< Size of lookup table/array */

+

+#define HASH_FUNC(K)  ((K) % TABLE_SIZE)

+

+

+/**

+ * An entry in the hash table.  

+ */

+struct HashEntry {

+   GLuint Key;             /**< the entry's key */

+   void *Data;             /**< the entry's data */

+   struct HashEntry *Next; /**< pointer to next entry */

+};

+

+

+/**

+ * The hash table data structure.  

+ */

+struct _mesa_HashTable {

+   struct HashEntry *Table[TABLE_SIZE];  /**< the lookup table */

+   GLuint MaxKey;                        /**< highest key inserted so far */

+   _glthread_Mutex Mutex;                /**< mutual exclusion lock */

+   _glthread_Mutex WalkMutex;            /**< for _mesa_HashWalk() */

+   GLboolean InDeleteAll;                /**< Debug check */

+};

+

+

+

+/**

+ * Create a new hash table.

+ * 

+ * \return pointer to a new, empty hash table.

+ */

+struct _mesa_HashTable *

+_mesa_NewHashTable(void)

+{

+   struct _mesa_HashTable *table = CALLOC_STRUCT(_mesa_HashTable);

+   if (table) {

+      _glthread_INIT_MUTEX(table->Mutex);

+      _glthread_INIT_MUTEX(table->WalkMutex);

+   }

+   return table;

+}

+

+

+

+/**

+ * Delete a hash table.

+ * Frees each entry on the hash table and then the hash table structure itself.

+ * Note that the caller should have already traversed the table and deleted

+ * the objects in the table (i.e. We don't free the entries' data pointer).

+ *

+ * \param table the hash table to delete.

+ */

+void

+_mesa_DeleteHashTable(struct _mesa_HashTable *table)

+{

+   GLuint pos;

+   assert(table);

+   for (pos = 0; pos < TABLE_SIZE; pos++) {

+      struct HashEntry *entry = table->Table[pos];

+      while (entry) {

+	 struct HashEntry *next = entry->Next;

+         if (entry->Data) {

+            _mesa_problem(NULL,

+                          "In _mesa_DeleteHashTable, found non-freed data");

+         }

+	 free(entry);

+	 entry = next;

+      }

+   }

+   _glthread_DESTROY_MUTEX(table->Mutex);

+   _glthread_DESTROY_MUTEX(table->WalkMutex);

+   free(table);

+}

+

+

+

+/**

+ * Lookup an entry in the hash table, without locking.

+ * \sa _mesa_HashLookup

+ */

+static INLINE void *

+_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)

+{

+   GLuint pos;

+   const struct HashEntry *entry;

+

+   assert(table);

+   assert(key);

+

+   pos = HASH_FUNC(key);

+   entry = table->Table[pos];

+   while (entry) {

+      if (entry->Key == key) {

+         return entry->Data;

+      }

+      entry = entry->Next;

+   }

+   return NULL;

+}

+

+

+/**

+ * Lookup an entry in the hash table.

+ * 

+ * \param table the hash table.

+ * \param key the key.

+ * 

+ * \return pointer to user's data or NULL if key not in table

+ */

+void *

+_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)

+{

+   void *res;

+   assert(table);

+   _glthread_LOCK_MUTEX(table->Mutex);

+   res = _mesa_HashLookup_unlocked(table, key);

+   _glthread_UNLOCK_MUTEX(table->Mutex);

+   return res;

+}

+

+

+/**

+ * Insert a key/pointer pair into the hash table.  

+ * If an entry with this key already exists we'll replace the existing entry.

+ * 

+ * \param table the hash table.

+ * \param key the key (not zero).

+ * \param data pointer to user data.

+ */

+void

+_mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)

+{

+   /* search for existing entry with this key */

+   GLuint pos;

+   struct HashEntry *entry;

+

+   assert(table);

+   assert(key);

+

+   _glthread_LOCK_MUTEX(table->Mutex);

+

+   if (key > table->MaxKey)

+      table->MaxKey = key;

+

+   pos = HASH_FUNC(key);

+

+   /* check if replacing an existing entry with same key */

+   for (entry = table->Table[pos]; entry; entry = entry->Next) {

+      if (entry->Key == key) {

+         /* replace entry's data */

+#if 0 /* not sure this check is always valid */

+         if (entry->Data) {

+            _mesa_problem(NULL, "Memory leak detected in _mesa_HashInsert");

+         }

+#endif

+	 entry->Data = data;

+         _glthread_UNLOCK_MUTEX(table->Mutex);

+	 return;

+      }

+   }

+

+   /* alloc and insert new table entry */

+   entry = MALLOC_STRUCT(HashEntry);

+   if (entry) {

+      entry->Key = key;

+      entry->Data = data;

+      entry->Next = table->Table[pos];

+      table->Table[pos] = entry;

+   }

+

+   _glthread_UNLOCK_MUTEX(table->Mutex);

+}

+

+

+

+/**

+ * Remove an entry from the hash table.

+ * 

+ * \param table the hash table.

+ * \param key key of entry to remove.

+ *

+ * While holding the hash table's lock, searches the entry with the matching

+ * key and unlinks it.

+ */

+void

+_mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)

+{

+   GLuint pos;

+   struct HashEntry *entry, *prev;

+

+   assert(table);

+   assert(key);

+

+   /* have to check this outside of mutex lock */

+   if (table->InDeleteAll) {

+      _mesa_problem(NULL, "_mesa_HashRemove illegally called from "

+                    "_mesa_HashDeleteAll callback function");

+      return;

+   }

+

+   _glthread_LOCK_MUTEX(table->Mutex);

+

+   pos = HASH_FUNC(key);

+   prev = NULL;

+   entry = table->Table[pos];

+   while (entry) {

+      if (entry->Key == key) {

+         /* found it! */

+         if (prev) {

+            prev->Next = entry->Next;

+         }

+         else {

+            table->Table[pos] = entry->Next;

+         }

+         free(entry);

+         _glthread_UNLOCK_MUTEX(table->Mutex);

+	 return;

+      }

+      prev = entry;

+      entry = entry->Next;

+   }

+

+   _glthread_UNLOCK_MUTEX(table->Mutex);

+}

+

+

+

+/**

+ * Delete all entries in a hash table, but don't delete the table itself.

+ * Invoke the given callback function for each table entry.

+ *

+ * \param table  the hash table to delete

+ * \param callback  the callback function

+ * \param userData  arbitrary pointer to pass along to the callback

+ *                  (this is typically a struct gl_context pointer)

+ */

+void

+_mesa_HashDeleteAll(struct _mesa_HashTable *table,

+                    void (*callback)(GLuint key, void *data, void *userData),

+                    void *userData)

+{

+   GLuint pos;

+   ASSERT(table);

+   ASSERT(callback);

+   _glthread_LOCK_MUTEX(table->Mutex);

+   table->InDeleteAll = GL_TRUE;

+   for (pos = 0; pos < TABLE_SIZE; pos++) {

+      struct HashEntry *entry, *next;

+      for (entry = table->Table[pos]; entry; entry = next) {

+         callback(entry->Key, entry->Data, userData);

+         next = entry->Next;

+         free(entry);

+      }

+      table->Table[pos] = NULL;

+   }

+   table->InDeleteAll = GL_FALSE;

+   _glthread_UNLOCK_MUTEX(table->Mutex);

+}

+

+

+/**

+ * Walk over all entries in a hash table, calling callback function for each.

+ * Note: we use a separate mutex in this function to avoid a recursive

+ * locking deadlock (in case the callback calls _mesa_HashRemove()) and to

+ * prevent multiple threads/contexts from getting tangled up.

+ * A lock-less version of this function could be used when the table will

+ * not be modified.

+ * \param table  the hash table to walk

+ * \param callback  the callback function

+ * \param userData  arbitrary pointer to pass along to the callback

+ *                  (this is typically a struct gl_context pointer)

+ */

+void

+_mesa_HashWalk(const struct _mesa_HashTable *table,

+               void (*callback)(GLuint key, void *data, void *userData),

+               void *userData)

+{

+   /* cast-away const */

+   struct _mesa_HashTable *table2 = (struct _mesa_HashTable *) table;

+   GLuint pos;

+   ASSERT(table);

+   ASSERT(callback);

+   _glthread_LOCK_MUTEX(table2->WalkMutex);

+   for (pos = 0; pos < TABLE_SIZE; pos++) {

+      struct HashEntry *entry, *next;

+      for (entry = table->Table[pos]; entry; entry = next) {

+         /* save 'next' pointer now in case the callback deletes the entry */

+         next = entry->Next;

+         callback(entry->Key, entry->Data, userData);

+      }

+   }

+   _glthread_UNLOCK_MUTEX(table2->WalkMutex);

+}

+

+

+/**

+ * Return the key of the "first" entry in the hash table.

+ * While holding the lock, walks through all table positions until finding

+ * the first entry of the first non-empty one.

+ * 

+ * \param table  the hash table

+ * \return key for the "first" entry in the hash table.

+ */

+GLuint

+_mesa_HashFirstEntry(struct _mesa_HashTable *table)

+{

+   GLuint pos;

+   assert(table);

+   _glthread_LOCK_MUTEX(table->Mutex);

+   for (pos = 0; pos < TABLE_SIZE; pos++) {

+      if (table->Table[pos]) {

+         _glthread_UNLOCK_MUTEX(table->Mutex);

+         return table->Table[pos]->Key;

+      }

+   }

+   _glthread_UNLOCK_MUTEX(table->Mutex);

+   return 0;

+}

+

+

+/**

+ * Given a hash table key, return the next key.  This is used to walk

+ * over all entries in the table.  Note that the keys returned during

+ * walking won't be in any particular order.

+ * \return next hash key or 0 if end of table.

+ */

+GLuint

+_mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key)

+{

+   const struct HashEntry *entry;

+   GLuint pos;

+

+   assert(table);

+   assert(key);

+

+   /* Find the entry with given key */

+   pos = HASH_FUNC(key);

+   for (entry = table->Table[pos]; entry ; entry = entry->Next) {

+      if (entry->Key == key) {

+         break;

+      }

+   }

+

+   if (!entry) {

+      /* the given key was not found, so we can't find the next entry */

+      return 0;

+   }

+

+   if (entry->Next) {

+      /* return next in linked list */

+      return entry->Next->Key;

+   }

+   else {

+      /* look for next non-empty table slot */

+      pos++;

+      while (pos < TABLE_SIZE) {

+         if (table->Table[pos]) {

+            return table->Table[pos]->Key;

+         }

+         pos++;

+      }

+      return 0;

+   }

+}

+

+

+/**

+ * Dump contents of hash table for debugging.

+ * 

+ * \param table the hash table.

+ */

+void

+_mesa_HashPrint(const struct _mesa_HashTable *table)

+{

+   GLuint pos;

+   assert(table);

+   for (pos = 0; pos < TABLE_SIZE; pos++) {

+      const struct HashEntry *entry = table->Table[pos];

+      while (entry) {

+	 _mesa_debug(NULL, "%u %p\n", entry->Key, entry->Data);

+	 entry = entry->Next;

+      }

+   }

+}

+

+

+

+/**

+ * Find a block of adjacent unused hash keys.

+ * 

+ * \param table the hash table.

+ * \param numKeys number of keys needed.

+ * 

+ * \return Starting key of free block or 0 if failure.

+ *

+ * If there are enough free keys between the maximum key existing in the table

+ * (_mesa_HashTable::MaxKey) and the maximum key possible, then simply return

+ * the adjacent key. Otherwise do a full search for a free key block in the

+ * allowable key range.

+ */

+GLuint

+_mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)

+{

+   const GLuint maxKey = ~((GLuint) 0);

+   _glthread_LOCK_MUTEX(table->Mutex);

+   if (maxKey - numKeys > table->MaxKey) {

+      /* the quick solution */

+      _glthread_UNLOCK_MUTEX(table->Mutex);

+      return table->MaxKey + 1;

+   }

+   else {

+      /* the slow solution */

+      GLuint freeCount = 0;

+      GLuint freeStart = 1;

+      GLuint key;

+      for (key = 1; key != maxKey; key++) {

+	 if (_mesa_HashLookup_unlocked(table, key)) {

+	    /* darn, this key is already in use */

+	    freeCount = 0;

+	    freeStart = key+1;

+	 }

+	 else {

+	    /* this key not in use, check if we've found enough */

+	    freeCount++;

+	    if (freeCount == numKeys) {

+               _glthread_UNLOCK_MUTEX(table->Mutex);

+	       return freeStart;

+	    }

+	 }

+      }

+      /* cannot allocate a block of numKeys consecutive keys */

+      _glthread_UNLOCK_MUTEX(table->Mutex);

+      return 0;

+   }

+}

+

+

+#if 0 /* debug only */

+

+/**

+ * Test walking over all the entries in a hash table.

+ */

+static void

+test_hash_walking(void)

+{

+   struct _mesa_HashTable *t = _mesa_NewHashTable();

+   const GLuint limit = 50000;

+   GLuint i;

+

+   /* create some entries */

+   for (i = 0; i < limit; i++) {

+      GLuint dummy;

+      GLuint k = (rand() % (limit * 10)) + 1;

+      while (_mesa_HashLookup(t, k)) {

+         /* id already in use, try another */

+         k = (rand() % (limit * 10)) + 1;

+      }

+      _mesa_HashInsert(t, k, &dummy);

+   }

+

+   /* walk over all entries */

+   {

+      GLuint k = _mesa_HashFirstEntry(t);

+      GLuint count = 0;

+      while (k) {

+         GLuint knext = _mesa_HashNextEntry(t, k);

+         assert(knext != k);

+         _mesa_HashRemove(t, k);

+         count++;

+         k = knext;

+      }

+      assert(count == limit);

+      k = _mesa_HashFirstEntry(t);

+      assert(k==0);

+   }

+

+   _mesa_DeleteHashTable(t);

+}

+

+

+void

+_mesa_test_hash_functions(void)

+{

+   int a, b, c;

+   struct _mesa_HashTable *t;

+

+   t = _mesa_NewHashTable();

+   _mesa_HashInsert(t, 501, &a);

+   _mesa_HashInsert(t, 10, &c);

+   _mesa_HashInsert(t, 0xfffffff8, &b);

+   /*_mesa_HashPrint(t);*/

+

+   assert(_mesa_HashLookup(t,501));

+   assert(!_mesa_HashLookup(t,1313));

+   assert(_mesa_HashFindFreeKeyBlock(t, 100));

+

+   _mesa_DeleteHashTable(t);

+

+   test_hash_walking();

+}

+

+#endif

diff --git a/mesalib/src/mesa/main/hint.c b/mesalib/src/mesa/main/hint.c
index e2d4129a3..ccec1d285 100644
--- a/mesalib/src/mesa/main/hint.c
+++ b/mesalib/src/mesa/main/hint.c
@@ -1,149 +1,145 @@
-
-/*
- * 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"
-
-
-
-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 %d\n",
-                  _mesa_lookup_enum_by_nr(target), 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->Extensions.SGIS_generate_mipmap) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-	    return;
-         }
-         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( GLcontext * 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"

+

+

+

+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 %d\n",

+                  _mesa_lookup_enum_by_nr(target), 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/hint.h b/mesalib/src/mesa/main/hint.h
index bfc388710..3cdd2d650 100644
--- a/mesalib/src/mesa/main/hint.h
+++ b/mesalib/src/mesa/main/hint.h
@@ -1,57 +1,59 @@
-/**
- * \file hint.h
- * Hints operations.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * 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.
- */
-
-
-#ifndef HINT_H
-#define HINT_H
-
-
-#include "mtypes.h"
-
-#if _HAVE_FULL_GL
-
-extern void GLAPIENTRY
-_mesa_Hint( GLenum target, GLenum mode );
-
-extern void 
-_mesa_init_hint( GLcontext * ctx );
-
-#else
-
-/** No-op */
-#define _mesa_init_hint( c ) ((void) 0)
-
-#endif
-
-#endif
+/**

+ * \file hint.h

+ * Hints operations.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

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

+ */

+

+

+#ifndef HINT_H

+#define HINT_H

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+

+#if _HAVE_FULL_GL

+

+extern void GLAPIENTRY

+_mesa_Hint( GLenum target, GLenum mode );

+

+extern void 

+_mesa_init_hint( struct gl_context * ctx );

+

+#else

+

+/** No-op */

+#define _mesa_init_hint( c ) ((void) 0)

+

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/histogram.c b/mesalib/src/mesa/main/histogram.c
index 4e482bcd5..f12428121 100644
--- a/mesalib/src/mesa/main/histogram.c
+++ b/mesalib/src/mesa/main/histogram.c
@@ -1,1105 +1,150 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * 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.
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "context.h"
-#include "image.h"
-#include "histogram.h"
-#include "macros.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_histogram
-
-
-/*
- * XXX the packed pixel formats haven't been tested.
- */
-static void
-pack_histogram( GLcontext *ctx,
-                GLuint n, CONST GLuint rgba[][4],
-                GLenum format, GLenum type, GLvoid *destination,
-                const struct gl_pixelstore_attrib *packing )
-{
-   const GLint comps = _mesa_components_in_format(format);
-   GLuint luminance[MAX_WIDTH];
-
-   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
-      }
-   }
-
-#define PACK_MACRO(TYPE)					\
-   {								\
-      GLuint i;							\
-      switch (format) {						\
-         case GL_RED:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][RCOMP];			\
-            break;						\
-         case GL_GREEN:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][GCOMP];			\
-            break;						\
-         case GL_BLUE:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][BCOMP];			\
-            break;						\
-         case GL_ALPHA:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][ACOMP];			\
-            break;						\
-         case GL_LUMINANCE:					\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) luminance[i];			\
-            break;						\
-         case GL_LUMINANCE_ALPHA:				\
-            for (i=0;i<n;i++) {					\
-               dst[i*2+0] = (TYPE) luminance[i];		\
-               dst[i*2+1] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_RGB:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*3+0] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*3+2] = (TYPE) rgba[i][BCOMP];		\
-            }							\
-            break;						\
-         case GL_RGBA:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_BGR:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*3+0] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*3+2] = (TYPE) rgba[i][RCOMP];		\
-            }							\
-            break;						\
-         case GL_BGRA:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_ABGR_EXT:					\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][ACOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][RCOMP];		\
-            }							\
-            break;						\
-         default:						\
-            _mesa_problem(ctx, "bad format in pack_histogram");	\
-      }								\
-   }
-
-   switch (type) {
-      case GL_UNSIGNED_BYTE:
-         {
-            GLubyte *dst = (GLubyte *) destination;
-            PACK_MACRO(GLubyte);
-         }
-         break;
-      case GL_BYTE:
-         {
-            GLbyte *dst = (GLbyte *) destination;
-            PACK_MACRO(GLbyte);
-         }
-         break;
-      case GL_UNSIGNED_SHORT:
-         {
-            GLushort *dst = (GLushort *) destination;
-            PACK_MACRO(GLushort);
-            if (packing->SwapBytes) {
-               _mesa_swap2(dst, n * comps);
-            }
-         }
-         break;
-      case GL_SHORT:
-         {
-            GLshort *dst = (GLshort *) destination;
-            PACK_MACRO(GLshort);
-            if (packing->SwapBytes) {
-               _mesa_swap2((GLushort *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT:
-         {
-            GLuint *dst = (GLuint *) destination;
-            PACK_MACRO(GLuint);
-            if (packing->SwapBytes) {
-               _mesa_swap4(dst, n * comps);
-            }
-         }
-         break;
-      case GL_INT:
-         {
-            GLint *dst = (GLint *) destination;
-            PACK_MACRO(GLint);
-            if (packing->SwapBytes) {
-               _mesa_swap4((GLuint *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_FLOAT:
-         {
-            GLfloat *dst = (GLfloat *) destination;
-            PACK_MACRO(GLfloat);
-            if (packing->SwapBytes) {
-               _mesa_swap4((GLuint *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_HALF_FLOAT_ARB:
-         {
-            /* temporarily store as GLuints */
-            GLuint temp[4*HISTOGRAM_TABLE_SIZE];
-            GLuint *dst = temp;
-            GLhalfARB *half = (GLhalfARB *) destination;
-            GLuint i;
-            /* get GLuint values */
-            PACK_MACRO(GLuint);
-            /* convert to GLhalf */
-            for (i = 0; i < n * comps; i++) {
-               half[i] = _mesa_float_to_half((GLfloat) temp[i]);
-            }
-            if (packing->SwapBytes) {
-               _mesa_swap2((GLushort *) half, n * comps);
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-         if (format == GL_RGB) {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x7) << 5)
-                      | ((rgba[i][GCOMP] & 0x7) << 2)
-                      | ((rgba[i][BCOMP] & 0x3)     );
-            }
-         }
-         else {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x7) << 5)
-                      | ((rgba[i][GCOMP] & 0x7) << 2)
-                      | ((rgba[i][RCOMP] & 0x3)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         if (format == GL_RGB) {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3) << 6)
-                      | ((rgba[i][GCOMP] & 0x7) << 3)
-                      | ((rgba[i][BCOMP] & 0x7)     );
-            }
-         }
-         else {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x3) << 6)
-                      | ((rgba[i][GCOMP] & 0x7) << 3)
-                      | ((rgba[i][RCOMP] & 0x7)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-         if (format == GL_RGB) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][BCOMP] & 0x1f)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][RCOMP] & 0x1f)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (format == GL_RGB) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][RCOMP] & 0x1f)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][BCOMP] & 0x1f)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][BCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][RCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][BCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][RCOMP] & 0xf)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][BCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][RCOMP] & 0xf)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][RCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][BCOMP] & 0xf)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][BCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][RCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][RCOMP] & 0x1)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][RCOMP] & 0x1)       );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][RCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][BCOMP] & 0x1)       );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][BCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][RCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][BCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][RCOMP] & 0xff)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][BCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][RCOMP] & 0xff)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][RCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][BCOMP] & 0xff)      );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][BCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_10_10_10_2:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][RCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][RCOMP] & 0x3)        );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][RCOMP] & 0x3)        );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][RCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][BCOMP] & 0x3)        );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         break;
-      default:
-         _mesa_problem(ctx, "Bad type in pack_histogram");
-   }
-
-#undef PACK_MACRO
-}
-
-
-/*
- * Given an internalFormat token passed to glHistogram or glMinMax,
- * return the corresponding base format.
- * Return -1 if invalid token.
- */
-static GLint
-base_histogram_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_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 */
-   }
-}
-
-
-
-/**********************************************************************
- * API functions
- */
-
-
-/* this is defined below */
-static void GLAPIENTRY _mesa_ResetMinmax(GLenum target);
-
-
-static void GLAPIENTRY
-_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)");
-      return;
-   }
-
-   if (format != GL_RED &&
-       format != GL_GREEN &&
-       format != GL_BLUE &&
-       format != GL_ALPHA &&
-       format != GL_RGB &&
-       format != GL_BGR &&
-       format != GL_RGBA &&
-       format != GL_BGRA &&
-       format != GL_ABGR_EXT &&
-       format != GL_LUMINANCE &&
-       format != GL_LUMINANCE_ALPHA) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMax(format)");
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax(format or type)");
-      return;
-   }
-
-
-   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack, 2, 1, 1,
-                                        format, type, values, "glGetMinmax");
-   if (!values)
-      return;
-
-   {
-      GLfloat minmax[2][4];
-      minmax[0][RCOMP] = CLAMP(ctx->MinMax.Min[RCOMP], 0.0F, 1.0F);
-      minmax[0][GCOMP] = CLAMP(ctx->MinMax.Min[GCOMP], 0.0F, 1.0F);
-      minmax[0][BCOMP] = CLAMP(ctx->MinMax.Min[BCOMP], 0.0F, 1.0F);
-      minmax[0][ACOMP] = CLAMP(ctx->MinMax.Min[ACOMP], 0.0F, 1.0F);
-      minmax[1][RCOMP] = CLAMP(ctx->MinMax.Max[RCOMP], 0.0F, 1.0F);
-      minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F);
-      minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
-      minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
-      _mesa_pack_rgba_span_float(ctx, 2, minmax,
-                                 format, type, values, &ctx->Pack, 0x0);
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   if (reset) {
-      _mesa_ResetMinmax(GL_MINMAX);
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)");
-      return;
-   }
-
-   if (format != GL_RED &&
-       format != GL_GREEN &&
-       format != GL_BLUE &&
-       format != GL_ALPHA &&
-       format != GL_RGB &&
-       format != GL_BGR &&
-       format != GL_RGBA &&
-       format != GL_BGRA &&
-       format != GL_ABGR_EXT &&
-       format != GL_LUMINANCE &&
-       format != GL_LUMINANCE_ALPHA) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(format)");
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram(format or type)");
-      return;
-   }
-
-   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                        ctx->Histogram.Width, 1, 1,
-                                        format, type, values,
-                                        "glGetHistogram");
-   if (!values)
-      return;
-
-   pack_histogram(ctx, ctx->Histogram.Width,
-                  (CONST GLuint (*)[4]) ctx->Histogram.Count,
-                  format, type, values, &ctx->Pack);
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   if (reset) {
-      GLuint i;
-      for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-         ctx->Histogram.Count[i][0] = 0;
-         ctx->Histogram.Count[i][1] = 0;
-         ctx->Histogram.Count[i][2] = 0;
-         ctx->Histogram.Count[i][3] = 0;
-      }
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_HISTOGRAM_WIDTH:
-         *params = (GLfloat) ctx->Histogram.Width;
-         break;
-      case GL_HISTOGRAM_FORMAT:
-         *params = (GLfloat) ctx->Histogram.Format;
-         break;
-      case GL_HISTOGRAM_RED_SIZE:
-         *params = (GLfloat) ctx->Histogram.RedSize;
-         break;
-      case GL_HISTOGRAM_GREEN_SIZE:
-         *params = (GLfloat) ctx->Histogram.GreenSize;
-         break;
-      case GL_HISTOGRAM_BLUE_SIZE:
-         *params = (GLfloat) ctx->Histogram.BlueSize;
-         break;
-      case GL_HISTOGRAM_ALPHA_SIZE:
-         *params = (GLfloat) ctx->Histogram.AlphaSize;
-         break;
-      case GL_HISTOGRAM_LUMINANCE_SIZE:
-         *params = (GLfloat) ctx->Histogram.LuminanceSize;
-         break;
-      case GL_HISTOGRAM_SINK:
-         *params = (GLfloat) ctx->Histogram.Sink;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)");
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_HISTOGRAM_WIDTH:
-         *params = (GLint) ctx->Histogram.Width;
-         break;
-      case GL_HISTOGRAM_FORMAT:
-         *params = (GLint) ctx->Histogram.Format;
-         break;
-      case GL_HISTOGRAM_RED_SIZE:
-         *params = (GLint) ctx->Histogram.RedSize;
-         break;
-      case GL_HISTOGRAM_GREEN_SIZE:
-         *params = (GLint) ctx->Histogram.GreenSize;
-         break;
-      case GL_HISTOGRAM_BLUE_SIZE:
-         *params = (GLint) ctx->Histogram.BlueSize;
-         break;
-      case GL_HISTOGRAM_ALPHA_SIZE:
-         *params = (GLint) ctx->Histogram.AlphaSize;
-         break;
-      case GL_HISTOGRAM_LUMINANCE_SIZE:
-         *params = (GLint) ctx->Histogram.LuminanceSize;
-         break;
-      case GL_HISTOGRAM_SINK:
-         *params = (GLint) ctx->Histogram.Sink;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)");
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
-      return;
-   }
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)");
-      return;
-   }
-   if (pname == GL_MINMAX_FORMAT) {
-      *params = (GLfloat) ctx->MinMax.Format;
-   }
-   else if (pname == GL_MINMAX_SINK) {
-      *params = (GLfloat) ctx->MinMax.Sink;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)");
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
-      return;
-   }
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)");
-      return;
-   }
-   if (pname == GL_MINMAX_FORMAT) {
-      *params = (GLint) ctx->MinMax.Format;
-   }
-   else if (pname == GL_MINMAX_SINK) {
-      *params = (GLint) ctx->MinMax.Sink;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)");
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
-{
-   GLuint i;
-   GLboolean error = GL_FALSE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(target)");
-      return;
-   }
-
-   if (width < 0 || width > HISTOGRAM_TABLE_SIZE) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         if (width < 0)
-            _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
-         else
-            _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)");
-         return;
-      }
-   }
-
-   if (width != 0 && !_mesa_is_pow_two(width)) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
-         return;
-      }
-   }
-
-   if (base_histogram_format(internalFormat) < 0) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(internalFormat)");
-         return;
-      }
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-
-   /* reset histograms */
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-
-   if (error) {
-      ctx->Histogram.Width = 0;
-      ctx->Histogram.Format = 0;
-      ctx->Histogram.RedSize       = 0;
-      ctx->Histogram.GreenSize     = 0;
-      ctx->Histogram.BlueSize      = 0;
-      ctx->Histogram.AlphaSize     = 0;
-      ctx->Histogram.LuminanceSize = 0;
-   }
-   else {
-      ctx->Histogram.Width = width;
-      ctx->Histogram.Format = internalFormat;
-      ctx->Histogram.Sink = sink;
-      ctx->Histogram.RedSize       = 8 * sizeof(GLuint);
-      ctx->Histogram.GreenSize     = 8 * sizeof(GLuint);
-      ctx->Histogram.BlueSize      = 8 * sizeof(GLuint);
-      ctx->Histogram.AlphaSize     = 8 * sizeof(GLuint);
-      ctx->Histogram.LuminanceSize = 8 * sizeof(GLuint);
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(target)");
-      return;
-   }
-
-   if (base_histogram_format(internalFormat) < 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)");
-      return;
-   }
-
-   if (ctx->MinMax.Sink == sink)
-      return;
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-   ctx->MinMax.Sink = sink;
-}
-
-
-static void GLAPIENTRY
-_mesa_ResetHistogram(GLenum target)
-{
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)");
-      return;
-   }
-
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-}
-
-
-static void GLAPIENTRY
-_mesa_ResetMinmax(GLenum target)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)");
-      return;
-   }
-
-   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
-   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
-   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
-   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
-}
-
-
-void
-_mesa_init_histogram_dispatch(struct _glapi_table *disp)
-{
-   SET_GetHistogram(disp, _mesa_GetHistogram);
-   SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv);
-   SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv);
-   SET_GetMinmax(disp, _mesa_GetMinmax);
-   SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv);
-   SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv);
-   SET_Histogram(disp, _mesa_Histogram);
-   SET_Minmax(disp, _mesa_Minmax);
-   SET_ResetHistogram(disp, _mesa_ResetHistogram);
-   SET_ResetMinmax(disp, _mesa_ResetMinmax);
-}
-
-
-#endif /* FEATURE_histogram */
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-void _mesa_init_histogram( GLcontext * ctx )
-{
-   int i;
-
-   /* Histogram group */
-   ctx->Histogram.Width = 0;
-   ctx->Histogram.Format = GL_RGBA;
-   ctx->Histogram.Sink = GL_FALSE;
-   ctx->Histogram.RedSize       = 0;
-   ctx->Histogram.GreenSize     = 0;
-   ctx->Histogram.BlueSize      = 0;
-   ctx->Histogram.AlphaSize     = 0;
-   ctx->Histogram.LuminanceSize = 0;
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-
-   /* Min/Max group */
-   ctx->MinMax.Format = GL_RGBA;
-   ctx->MinMax.Sink = GL_FALSE;
-   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
-   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
-   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
-   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

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

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "colormac.h"

+#include "histogram.h"

+#include "macros.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_histogram

+

+/**********************************************************************

+ * API functions

+ */

+

+

+/* this is defined below */

+static void GLAPIENTRY _mesa_ResetMinmax(GLenum target);

+

+

+static void GLAPIENTRY

+_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");

+}

+

+

+static void GLAPIENTRY

+_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");

+}

+

+

+static void GLAPIENTRY

+_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");

+}

+

+

+static void GLAPIENTRY

+_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");

+}

+

+

+static void GLAPIENTRY

+_mesa_ResetHistogram(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");

+}

+

+

+static void GLAPIENTRY

+_mesa_ResetMinmax(GLenum target)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");

+}

+

+

+void

+_mesa_init_histogram_dispatch(struct _glapi_table *disp)

+{

+   SET_GetHistogram(disp, _mesa_GetHistogram);

+   SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv);

+   SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv);

+   SET_GetMinmax(disp, _mesa_GetMinmax);

+   SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv);

+   SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv);

+   SET_Histogram(disp, _mesa_Histogram);

+   SET_Minmax(disp, _mesa_Minmax);

+   SET_ResetHistogram(disp, _mesa_ResetHistogram);

+   SET_ResetMinmax(disp, _mesa_ResetMinmax);

+}

+

+#endif /* FEATURE_histogram */

diff --git a/mesalib/src/mesa/main/histogram.h b/mesalib/src/mesa/main/histogram.h
index dbae1bbd0..f9c7310fe 100644
--- a/mesalib/src/mesa/main/histogram.h
+++ b/mesalib/src/mesa/main/histogram.h
@@ -1,57 +1,58 @@
-/**
- * \file histogram.h
- * Histogram.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
-/*
- * 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.
- */
-
-
-#ifndef HISTOGRAM_H
-#define HISTOGRAM_H
-
-#include "main/mtypes.h"
-
-#if FEATURE_histogram
-
-extern void
-_mesa_init_histogram_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_histogram */
-
-static INLINE void
-_mesa_init_histogram_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_histogram */
-
-extern void _mesa_init_histogram( GLcontext * ctx );
-
-#endif /* HISTOGRAM_H */
+/**

+ * \file histogram.h

+ * Histogram.

+ * 

+ * \if subset

+ * (No-op)

+ *

+ * \endif

+ */

+

+/*

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

+ */

+

+

+#ifndef HISTOGRAM_H

+#define HISTOGRAM_H

+

+#include "compiler.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+

+#if FEATURE_histogram

+

+extern void

+_mesa_init_histogram_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_histogram */

+

+static INLINE void

+_mesa_init_histogram_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_histogram */

+

+#endif /* HISTOGRAM_H */

diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index 86aa6d0d7..08d25c8d1 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -1,6073 +1,1874 @@
-/*
- * 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 "enums.h"
-#include "image.h"
-#include "imports.h"
-#include "macros.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 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 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;
-   }
-}
-
-
-/**
- * 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);
-      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 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:
-	 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)
-            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)
-            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)
-            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)
-            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( GLcontext *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_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;
-         }
-      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:
-         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 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_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_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 */
-         return GL_TRUE;
-      /* signed texture formats */
-      case GL_RGBA_SNORM:
-      case GL_RGBA8_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) {
-   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:
-      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(GLcontext *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;
-   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;
-}
-
-
-#if _HAVE_FULL_GL
-
-/*
- * 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;
-}
-
-
-/*
- * 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;
-   }
-}
-
-
-/**
- * "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
-}
-
-
-/**********************************************************************/
-/*****                  Pixel processing functions               ******/
-/**********************************************************************/
-
-/*
- * Apply scale and bias factors to an array of RGBA pixels.
- */
-void
-_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
-                          GLfloat rScale, GLfloat gScale,
-                          GLfloat bScale, GLfloat aScale,
-                          GLfloat rBias, GLfloat gBias,
-                          GLfloat bBias, GLfloat aBias)
-{
-   if (rScale != 1.0 || rBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;
-      }
-   }
-   if (gScale != 1.0 || gBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;
-      }
-   }
-   if (bScale != 1.0 || bBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;
-      }
-   }
-   if (aScale != 1.0 || aBias != 0.0) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;
-      }
-   }
-}
-
-
-/*
- * Apply pixel mapping to an array of floating point RGBA pixels.
- */
-void
-_mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
-{
-   const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);
-   const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);
-   const GLfloat bscale = (GLfloat) (ctx->PixelMaps.BtoB.Size - 1);
-   const GLfloat ascale = (GLfloat) (ctx->PixelMaps.AtoA.Size - 1);
-   const GLfloat *rMap = ctx->PixelMaps.RtoR.Map;
-   const GLfloat *gMap = ctx->PixelMaps.GtoG.Map;
-   const GLfloat *bMap = ctx->PixelMaps.BtoB.Map;
-   const GLfloat *aMap = ctx->PixelMaps.AtoA.Map;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
-      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
-      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
-      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
-      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];
-      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];
-      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];
-      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];
-   }
-}
-
-
-/*
- * Apply the color matrix and post color matrix scaling and biasing.
- */
-void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
-{
-   const GLfloat rs = ctx->Pixel.PostColorMatrixScale[0];
-   const GLfloat rb = ctx->Pixel.PostColorMatrixBias[0];
-   const GLfloat gs = ctx->Pixel.PostColorMatrixScale[1];
-   const GLfloat gb = ctx->Pixel.PostColorMatrixBias[1];
-   const GLfloat bs = ctx->Pixel.PostColorMatrixScale[2];
-   const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2];
-   const GLfloat as = ctx->Pixel.PostColorMatrixScale[3];
-   const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3];
-   const GLfloat *m = ctx->ColorMatrixStack.Top->m;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      const GLfloat r = rgba[i][RCOMP];
-      const GLfloat g = rgba[i][GCOMP];
-      const GLfloat b = rgba[i][BCOMP];
-      const GLfloat a = rgba[i][ACOMP];
-      rgba[i][RCOMP] = (m[0] * r + m[4] * g + m[ 8] * b + m[12] * a) * rs + rb;
-      rgba[i][GCOMP] = (m[1] * r + m[5] * g + m[ 9] * b + m[13] * a) * gs + gb;
-      rgba[i][BCOMP] = (m[2] * r + m[6] * g + m[10] * b + m[14] * a) * bs + bb;
-      rgba[i][ACOMP] = (m[3] * r + m[7] * g + m[11] * b + m[15] * a) * as + ab;
-   }
-}
-
-
-/**
- * Apply a color table lookup to an array of floating point RGBA colors.
- */
-void
-_mesa_lookup_rgba_float(const struct gl_color_table *table,
-                        GLuint n, GLfloat rgba[][4])
-{
-   const GLint max = table->Size - 1;
-   const GLfloat scale = (GLfloat) max;
-   const GLfloat *lut = table->TableF;
-   GLuint i;
-
-   if (!table->TableF || table->Size == 0)
-      return;
-
-   switch (table->_BaseFormat) {
-      case GL_INTENSITY:
-         /* replace RGBA with I */
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND(rgba[i][RCOMP] * scale);
-            GLfloat c = lut[CLAMP(j, 0, max)];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = c;
-         }
-         break;
-      case GL_LUMINANCE:
-         /* replace RGB with L */
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND(rgba[i][RCOMP] * scale);
-            GLfloat c = lut[CLAMP(j, 0, max)];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = c;
-         }
-         break;
-      case GL_ALPHA:
-         /* replace A with A */
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND(rgba[i][ACOMP] * scale);
-            rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];
-         }
-         break;
-      case GL_LUMINANCE_ALPHA:
-         /* replace RGBA with LLLA */
-         for (i = 0; i < n; i++) {
-            GLint jL = IROUND(rgba[i][RCOMP] * scale);
-            GLint jA = IROUND(rgba[i][ACOMP] * scale);
-            GLfloat luminance, alpha;
-            jL = CLAMP(jL, 0, max);
-            jA = CLAMP(jA, 0, max);
-            luminance = lut[jL * 2 + 0];
-            alpha     = lut[jA * 2 + 1];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = luminance;
-            rgba[i][ACOMP] = alpha;;
-         }
-         break;
-      case GL_RGB:
-         /* replace RGB with RGB */
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND(rgba[i][RCOMP] * scale);
-            GLint jG = IROUND(rgba[i][GCOMP] * scale);
-            GLint jB = IROUND(rgba[i][BCOMP] * scale);
-            jR = CLAMP(jR, 0, max);
-            jG = CLAMP(jG, 0, max);
-            jB = CLAMP(jB, 0, max);
-            rgba[i][RCOMP] = lut[jR * 3 + 0];
-            rgba[i][GCOMP] = lut[jG * 3 + 1];
-            rgba[i][BCOMP] = lut[jB * 3 + 2];
-         }
-         break;
-      case GL_RGBA:
-         /* replace RGBA with RGBA */
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND(rgba[i][RCOMP] * scale);
-            GLint jG = IROUND(rgba[i][GCOMP] * scale);
-            GLint jB = IROUND(rgba[i][BCOMP] * scale);
-            GLint jA = IROUND(rgba[i][ACOMP] * scale);
-            jR = CLAMP(jR, 0, max);
-            jG = CLAMP(jG, 0, max);
-            jB = CLAMP(jB, 0, max);
-            jA = CLAMP(jA, 0, max);
-            rgba[i][RCOMP] = lut[jR * 4 + 0];
-            rgba[i][GCOMP] = lut[jG * 4 + 1];
-            rgba[i][BCOMP] = lut[jB * 4 + 2];
-            rgba[i][ACOMP] = lut[jA * 4 + 3];
-         }
-         break;
-      default:
-         _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_float");
-         return;
-   }
-}
-
-
-
-/**
- * Apply a color table lookup to an array of ubyte/RGBA colors.
- */
-void
-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
-                        GLuint n, GLubyte rgba[][4])
-{
-   const GLubyte *lut = table->TableUB;
-   const GLfloat scale = (GLfloat) (table->Size - 1) / (GLfloat)255.0;
-   GLuint i;
-
-   if (!table->TableUB || table->Size == 0)
-      return;
-
-   switch (table->_BaseFormat) {
-   case GL_INTENSITY:
-      /* replace RGBA with I */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            const GLubyte c = lut[rgba[i][RCOMP]];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = c;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] =
-            rgba[i][ACOMP] = lut[j];
-         }
-      }
-      break;
-   case GL_LUMINANCE:
-      /* replace RGB with L */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            const GLubyte c = lut[rgba[i][RCOMP]];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = c;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = lut[j];
-         }
-      }
-      break;
-   case GL_ALPHA:
-      /* replace A with A */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            rgba[i][ACOMP] = lut[rgba[i][ACOMP]];
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);
-            rgba[i][ACOMP] = lut[j];
-         }
-      }
-      break;
-   case GL_LUMINANCE_ALPHA:
-      /* replace RGBA with LLLA */
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            GLubyte l = lut[rgba[i][RCOMP] * 2 + 0];
-            GLubyte a = lut[rgba[i][ACOMP] * 2 + 1];;
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = l;
-            rgba[i][ACOMP] = a;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
-            GLubyte luminance = lut[jL * 2 + 0];
-            GLubyte alpha     = lut[jA * 2 + 1];
-            rgba[i][RCOMP] =
-            rgba[i][GCOMP] =
-            rgba[i][BCOMP] = luminance;
-            rgba[i][ACOMP] = alpha;
-         }
-      }
-      break;
-   case GL_RGB:
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 3 + 0];
-            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 3 + 1];
-            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 3 + 2];
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
-            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
-            rgba[i][RCOMP] = lut[jR * 3 + 0];
-            rgba[i][GCOMP] = lut[jG * 3 + 1];
-            rgba[i][BCOMP] = lut[jB * 3 + 2];
-         }
-      }
-      break;
-   case GL_RGBA:
-      if (table->Size == 256) {
-         for (i = 0; i < n; i++) {
-            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 4 + 0];
-            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 4 + 1];
-            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 4 + 2];
-            rgba[i][ACOMP] = lut[rgba[i][ACOMP] * 4 + 3];
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);
-            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);
-            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);
-            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);
-            CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);
-         }
-      }
-      break;
-   default:
-      _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_chan");
-      return;
-   }
-}
-
-
-
-/*
- * Map color indexes to float rgba values.
- */
-void
-_mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
-                      const GLuint index[], GLfloat rgba[][4] )
-{
-   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
-   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
-   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
-   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
-   const GLfloat *rMap = ctx->PixelMaps.ItoR.Map;
-   const GLfloat *gMap = ctx->PixelMaps.ItoG.Map;
-   const GLfloat *bMap = ctx->PixelMaps.ItoB.Map;
-   const GLfloat *aMap = ctx->PixelMaps.ItoA.Map;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      rgba[i][RCOMP] = rMap[index[i] & rmask];
-      rgba[i][GCOMP] = gMap[index[i] & gmask];
-      rgba[i][BCOMP] = bMap[index[i] & bmask];
-      rgba[i][ACOMP] = aMap[index[i] & amask];
-   }
-}
-
-
-/**
- * Map ubyte color indexes to ubyte/RGBA values.
- */
-void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
-                       GLubyte rgba[][4])
-{
-   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
-   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;
-   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;
-   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;
-   const GLubyte *rMap = ctx->PixelMaps.ItoR.Map8;
-   const GLubyte *gMap = ctx->PixelMaps.ItoG.Map8;
-   const GLubyte *bMap = ctx->PixelMaps.ItoB.Map8;
-   const GLubyte *aMap = ctx->PixelMaps.ItoA.Map8;
-   GLuint i;
-   for (i=0;i<n;i++) {
-      rgba[i][RCOMP] = rMap[index[i] & rmask];
-      rgba[i][GCOMP] = gMap[index[i] & gmask];
-      rgba[i][BCOMP] = bMap[index[i] & bmask];
-      rgba[i][ACOMP] = aMap[index[i] & amask];
-   }
-}
-
-
-void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
-                           GLfloat depthValues[])
-{
-   const GLfloat scale = ctx->Pixel.DepthScale;
-   const GLfloat bias = ctx->Pixel.DepthBias;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLfloat d = depthValues[i] * scale + bias;
-      depthValues[i] = CLAMP(d, 0.0F, 1.0F);
-   }
-}
-
-
-void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
-                                GLuint depthValues[])
-{
-   const GLdouble max = (double) 0xffffffff;
-   const GLdouble scale = ctx->Pixel.DepthScale;
-   const GLdouble bias = ctx->Pixel.DepthBias * max;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      GLdouble d = (GLdouble) depthValues[i] * scale + bias;
-      d = CLAMP(d, 0.0, max);
-      depthValues[i] = (GLuint) d;
-   }
-}
-
-
-
-/*
- * Update the min/max values from an array of fragment colors.
- */
-static void
-update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      /* update mins */
-      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
-         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
-         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
-         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
-         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
-
-      /* update maxs */
-      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
-         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
-         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
-         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
-         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
-   }
-}
-
-
-/*
- * Update the histogram values from an array of fragment colors.
- */
-static void
-update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   const GLint max = ctx->Histogram.Width - 1;
-   GLfloat w = (GLfloat) max;
-   GLuint i;
-
-   if (ctx->Histogram.Width == 0)
-      return;
-
-   for (i = 0; i < n; i++) {
-      GLint ri = IROUND(rgba[i][RCOMP] * w);
-      GLint gi = IROUND(rgba[i][GCOMP] * w);
-      GLint bi = IROUND(rgba[i][BCOMP] * w);
-      GLint ai = IROUND(rgba[i][ACOMP] * w);
-      ri = CLAMP(ri, 0, max);
-      gi = CLAMP(gi, 0, max);
-      bi = CLAMP(bi, 0, max);
-      ai = CLAMP(ai, 0, max);
-      ctx->Histogram.Count[ri][RCOMP]++;
-      ctx->Histogram.Count[gi][GCOMP]++;
-      ctx->Histogram.Count[bi][BCOMP]++;
-      ctx->Histogram.Count[ai][ACOMP]++;
-   }
-}
-
-
-/**
- * Apply various pixel transfer operations to an array of RGBA pixels
- * as indicated by the transferOps bitmask
- */
-void
-_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
-                              GLuint n, GLfloat rgba[][4])
-{
-   /* scale & bias */
-   if (transferOps & IMAGE_SCALE_BIAS_BIT) {
-      _mesa_scale_and_bias_rgba(n, rgba,
-                                ctx->Pixel.RedScale, ctx->Pixel.GreenScale,
-                                ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,
-                                ctx->Pixel.RedBias, ctx->Pixel.GreenBias,
-                                ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);
-   }
-   /* color map lookup */
-   if (transferOps & IMAGE_MAP_COLOR_BIT) {
-      _mesa_map_rgba( ctx, n, rgba );
-   }
-   /* GL_COLOR_TABLE lookup */
-   if (transferOps & IMAGE_COLOR_TABLE_BIT) {
-      _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_PRECONVOLUTION], n, rgba);
-   }
-   /* convolution */
-   if (transferOps & IMAGE_CONVOLUTION_BIT) {
-      /* this has to be done in the calling code */
-      _mesa_problem(ctx, "IMAGE_CONVOLUTION_BIT set in _mesa_apply_transfer_ops");
-   }
-   /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
-   if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
-      _mesa_scale_and_bias_rgba(n, rgba,
-                                ctx->Pixel.PostConvolutionScale[RCOMP],
-                                ctx->Pixel.PostConvolutionScale[GCOMP],
-                                ctx->Pixel.PostConvolutionScale[BCOMP],
-                                ctx->Pixel.PostConvolutionScale[ACOMP],
-                                ctx->Pixel.PostConvolutionBias[RCOMP],
-                                ctx->Pixel.PostConvolutionBias[GCOMP],
-                                ctx->Pixel.PostConvolutionBias[BCOMP],
-                                ctx->Pixel.PostConvolutionBias[ACOMP]);
-   }
-   /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
-   if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
-      _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_POSTCONVOLUTION], n, rgba);
-   }
-   /* color matrix transform */
-   if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
-      _mesa_transform_rgba(ctx, n, rgba);
-   }
-   /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
-   if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
-      _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX], n, rgba);
-   }
-   /* update histogram count */
-   if (transferOps & IMAGE_HISTOGRAM_BIT) {
-      update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
-   }
-   /* update min/max values */
-   if (transferOps & IMAGE_MIN_MAX_BIT) {
-      update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
-   }
-   /* clamping to [0,1] */
-   if (transferOps & IMAGE_CLAMP_BIT) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
-         rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
-         rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
-         rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
-      }
-   }
-}
-
-
-/*
- * Apply color index shift and offset to an array of pixels.
- */
-static void
-shift_and_offset_ci( const GLcontext *ctx, GLuint n, GLuint indexes[] )
-{
-   GLint shift = ctx->Pixel.IndexShift;
-   GLint offset = ctx->Pixel.IndexOffset;
-   GLuint i;
-   if (shift > 0) {
-      for (i=0;i<n;i++) {
-         indexes[i] = (indexes[i] << shift) + offset;
-      }
-   }
-   else if (shift < 0) {
-      shift = -shift;
-      for (i=0;i<n;i++) {
-         indexes[i] = (indexes[i] >> shift) + offset;
-      }
-   }
-   else {
-      for (i=0;i<n;i++) {
-         indexes[i] = indexes[i] + offset;
-      }
-   }
-}
-
-
-
-/**
- * Apply color index shift, offset and table lookup to an array
- * of color indexes;
- */
-void
-_mesa_apply_ci_transfer_ops(const GLcontext *ctx, GLbitfield transferOps,
-                            GLuint n, GLuint indexes[])
-{
-   if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-      shift_and_offset_ci(ctx, n, indexes);
-   }
-   if (transferOps & IMAGE_MAP_COLOR_BIT) {
-      const GLuint mask = ctx->PixelMaps.ItoI.Size - 1;
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         const GLuint j = indexes[i] & mask;
-         indexes[i] = IROUND(ctx->PixelMaps.ItoI.Map[j]);
-      }
-   }
-}
-
-
-/**
- * Apply stencil index shift, offset and table lookup to an array
- * of stencil values.
- */
-void
-_mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
-                                 GLstencil stencil[])
-{
-   if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) {
-      const GLint offset = ctx->Pixel.IndexOffset;
-      GLint shift = ctx->Pixel.IndexShift;
-      GLuint i;
-      if (shift > 0) {
-         for (i = 0; i < n; i++) {
-            stencil[i] = (stencil[i] << shift) + offset;
-         }
-      }
-      else if (shift < 0) {
-         shift = -shift;
-         for (i = 0; i < n; i++) {
-            stencil[i] = (stencil[i] >> shift) + offset;
-         }
-      }
-      else {
-         for (i = 0; i < n; i++) {
-            stencil[i] = stencil[i] + offset;
-         }
-      }
-   }
-   if (ctx->Pixel.MapStencilFlag) {
-      GLuint mask = ctx->PixelMaps.StoS.Size - 1;
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         stencil[i] = (GLstencil)ctx->PixelMaps.StoS.Map[ stencil[i] & mask ];
-      }
-   }
-}
-
-
-/**
- * Used to pack an array [][4] of RGBA float colors as specified
- * by the dstFormat, dstType and dstPacking.  Used by glReadPixels,
- * glGetConvolutionFilter(), etc.
- * Note: the rgba values will be modified by this function when any pixel
- * transfer ops are enabled.
- */
-void
-_mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
-                           GLenum dstFormat, GLenum dstType,
-                           GLvoid *dstAddr,
-                           const struct gl_pixelstore_attrib *dstPacking,
-                           GLbitfield transferOps)
-{
-   GLfloat luminance[MAX_WIDTH];
-   const GLint comps = _mesa_components_in_format(dstFormat);
-   GLuint i;
-
-   /* XXX
-    * This test should probably go away.  Have the caller set/clear the
-    * IMAGE_CLAMP_BIT as needed.
-    */
-   if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
-      /* need to clamp to [0, 1] */
-      transferOps |= IMAGE_CLAMP_BIT;
-   }
-
-   if (transferOps) {
-      _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
-      if ((transferOps & IMAGE_MIN_MAX_BIT) && ctx->MinMax.Sink) {
-         return;
-      }
-   }
-
-   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_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_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_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_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_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_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_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_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_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_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_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;
-               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_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_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);
-         }
-      }
-   }
-}
-
-
-#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;
-   }
-}
-
-
-/*
- * 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 redIndex, greenIndex, blueIndex, alphaIndex;
-   GLint stride;
-   GLint rComp, bComp, gComp, aComp;
-   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_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);
-
-   rComp = gComp = bComp = aComp = -1;
-
-   switch (srcFormat) {
-      case GL_RED:
-      case GL_RED_INTEGER_EXT:
-         redIndex = 0;
-         greenIndex = blueIndex = alphaIndex = -1;
-         stride = 1;
-         break;
-      case GL_GREEN:
-      case GL_GREEN_INTEGER_EXT:
-         greenIndex = 0;
-         redIndex = blueIndex = alphaIndex = -1;
-         stride = 1;
-         break;
-      case GL_BLUE:
-      case GL_BLUE_INTEGER_EXT:
-         blueIndex = 0;
-         redIndex = greenIndex = alphaIndex = -1;
-         stride = 1;
-         break;
-      case GL_ALPHA:
-      case GL_ALPHA_INTEGER_EXT:
-         redIndex = greenIndex = blueIndex = -1;
-         alphaIndex = 0;
-         stride = 1;
-         break;
-      case GL_LUMINANCE:
-      case GL_LUMINANCE_INTEGER_EXT:
-         redIndex = greenIndex = blueIndex = 0;
-         alphaIndex = -1;
-         stride = 1;
-         break;
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE_ALPHA_INTEGER_EXT:
-         redIndex = greenIndex = blueIndex = 0;
-         alphaIndex = 1;
-         stride = 2;
-         break;
-      case GL_INTENSITY:
-         redIndex = greenIndex = blueIndex = alphaIndex = 0;
-         stride = 1;
-         break;
-      case GL_RGB:
-      case GL_RGB_INTEGER:
-         redIndex = 0;
-         greenIndex = 1;
-         blueIndex = 2;
-         alphaIndex = -1;
-         rComp = 0;
-         gComp = 1;
-         bComp = 2;
-         aComp = 3;
-         stride = 3;
-         break;
-      case GL_BGR:
-         redIndex = 2;
-         greenIndex = 1;
-         blueIndex = 0;
-         alphaIndex = -1;
-         rComp = 2;
-         gComp = 1;
-         bComp = 0;
-         aComp = 3;
-         stride = 3;
-         break;
-      case GL_RGBA:
-      case GL_RGBA_INTEGER:
-         redIndex = 0;
-         greenIndex = 1;
-         blueIndex = 2;
-         alphaIndex = 3;
-         rComp = 0;
-         gComp = 1;
-         bComp = 2;
-         aComp = 3;
-         stride = 4;
-         break;
-      case GL_BGRA:
-         redIndex = 2;
-         greenIndex = 1;
-         blueIndex = 0;
-         alphaIndex = 3;
-         rComp = 2;
-         gComp = 1;
-         bComp = 0;
-         aComp = 3;
-         stride = 4;
-         break;
-      case GL_ABGR_EXT:
-         redIndex = 3;
-         greenIndex = 2;
-         blueIndex = 1;
-         alphaIndex = 0;
-         rComp = 3;
-         gComp = 2;
-         bComp = 1;
-         aComp = 0;
-         stride = 4;
-         break;
-      case GL_DU8DV8_ATI:
-      case GL_DUDV_ATI:
-         redIndex = 0;
-         greenIndex = 1;
-         blueIndex = -1;
-         alphaIndex = -1;
-         stride = 2;
-         break;
-      default:
-         _mesa_problem(NULL, "bad srcFormat %s in extract float data",
-                       _mesa_lookup_enum_by_nr(srcFormat));
-         return;
-   }
-
-   intFormat = _mesa_is_integer_format(srcFormat);
-
-#define PROCESS(INDEX, CHANNEL, DEFAULT, DEFAULT_INT, TYPE, CONVERSION) \
-   if ((INDEX) < 0) {							\
-      GLuint i;								\
-      if (intFormat) {							\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][CHANNEL] = DEFAULT_INT;				\
-         }								\
-      }									\
-      else {								\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][CHANNEL] = DEFAULT;					\
-         }								\
-      }									\
-   }									\
-   else if (swapBytes) {						\
-      const TYPE *s = (const TYPE *) src;				\
-      GLuint i;								\
-      for (i = 0; i < n; i++) {						\
-         TYPE value = s[INDEX];						\
-         if (sizeof(TYPE) == 2) {					\
-            SWAP2BYTE(value);						\
-         }								\
-         else if (sizeof(TYPE) == 4) {					\
-            SWAP4BYTE(value);						\
-         }								\
-         if (intFormat)							\
-            rgba[i][CHANNEL] = (GLfloat) value;				\
-         else								\
-            rgba[i][CHANNEL] = (GLfloat) CONVERSION(value);		\
-         s += stride;							\
-      }									\
-   }									\
-   else {								\
-      const TYPE *s = (const TYPE *) src;				\
-      GLuint i;								\
-      if (intFormat) {							\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][CHANNEL] = (GLfloat) s[INDEX];			\
-            s += stride;						\
-         }								\
-      }									\
-      else {								\
-         for (i = 0; i < n; i++) {					\
-            rgba[i][CHANNEL] = (GLfloat) CONVERSION(s[INDEX]);		\
-            s += stride;						\
-         }								\
-      }									\
-   }
-
-   switch (srcType) {
-      case GL_UNSIGNED_BYTE:
-         PROCESS(redIndex,   RCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F,   0, GLubyte, UBYTE_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, 255, GLubyte, UBYTE_TO_FLOAT);
-         break;
-      case GL_BYTE:
-         PROCESS(redIndex,   RCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F,   0, GLbyte, BYTE_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, 127, GLbyte, BYTE_TO_FLOAT);
-         break;
-      case GL_UNSIGNED_SHORT:
-         PROCESS(redIndex,   RCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F,      0, GLushort, USHORT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, 0xffff, GLushort, USHORT_TO_FLOAT);
-         break;
-      case GL_SHORT:
-         PROCESS(redIndex,   RCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F,     0, GLshort, SHORT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, 32767, GLshort, SHORT_TO_FLOAT);
-         break;
-      case GL_UNSIGNED_INT:
-         PROCESS(redIndex,   RCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F,          0, GLuint, UINT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, 0xffffffff, GLuint, UINT_TO_FLOAT);
-         break;
-      case GL_INT:
-         PROCESS(redIndex,   RCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
-         PROCESS(greenIndex, GCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
-         PROCESS(blueIndex,  BCOMP, 0.0F,          0, GLint, INT_TO_FLOAT);
-         PROCESS(alphaIndex, ACOMP, 1.0F, 2147483647, GLint, INT_TO_FLOAT);
-         break;
-      case GL_FLOAT:
-         PROCESS(redIndex,   RCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
-         PROCESS(greenIndex, GCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
-         PROCESS(blueIndex,  BCOMP, 0.0F, 0.0F, GLfloat, (GLfloat));
-         PROCESS(alphaIndex, ACOMP, 1.0F, 1.0F, GLfloat, (GLfloat));
-         break;
-      case GL_HALF_FLOAT_ARB:
-         PROCESS(redIndex,   RCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(greenIndex, GCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(blueIndex,  BCOMP, 0.0F, 0.0F, GLhalfARB, _mesa_half_to_float);
-         PROCESS(alphaIndex, 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][rComp] = ((p >> 5)      ) * rs;
-               rgba[i][gComp] = ((p >> 2) & 0x7) * gs;
-               rgba[i][bComp] = ((p     ) & 0x3) * bs;
-               rgba[i][aComp] = 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][rComp] = ((p     ) & 0x7) * rs;
-               rgba[i][gComp] = ((p >> 3) & 0x7) * gs;
-               rgba[i][bComp] = ((p >> 6)      ) * bs;
-               rgba[i][aComp] = 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][rComp] = ((p >> 11)       ) * rs;
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bComp] = ((p      ) & 0x1f) * bs;
-               rgba[i][aComp] = 1.0F;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p >> 11)       ) * rs;
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bComp] = ((p      ) & 0x1f) * bs;
-               rgba[i][aComp] = 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][rComp] = ((p      ) & 0x1f) * rs;
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bComp] = ((p >> 11)       ) * bs;
-               rgba[i][aComp] = 1.0F;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p      ) & 0x1f) * rs;
-               rgba[i][gComp] = ((p >>  5) & 0x3f) * gs;
-               rgba[i][bComp] = ((p >> 11)       ) * bs;
-               rgba[i][aComp] = 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][rComp] = ((p >> 12)      ) * rs;
-               rgba[i][gComp] = ((p >>  8) & 0xf) * gs;
-               rgba[i][bComp] = ((p >>  4) & 0xf) * bs;
-               rgba[i][aComp] = ((p      ) & 0xf) * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p >> 12)      ) * rs;
-               rgba[i][gComp] = ((p >>  8) & 0xf) * gs;
-               rgba[i][bComp] = ((p >>  4) & 0xf) * bs;
-               rgba[i][aComp] = ((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][rComp] = ((p      ) & 0xf) * rs;
-               rgba[i][gComp] = ((p >>  4) & 0xf) * gs;
-               rgba[i][bComp] = ((p >>  8) & 0xf) * bs;
-               rgba[i][aComp] = ((p >> 12)      ) * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p      ) & 0xf) * rs;
-               rgba[i][gComp] = ((p >>  4) & 0xf) * gs;
-               rgba[i][bComp] = ((p >>  8) & 0xf) * bs;
-               rgba[i][aComp] = ((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][rComp] = ((p >> 11)       ) * rs;
-               rgba[i][gComp] = ((p >>  6) & 0x1f) * gs;
-               rgba[i][bComp] = ((p >>  1) & 0x1f) * bs;
-               rgba[i][aComp] = ((p      ) & 0x1)  * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p >> 11)       ) * rs;
-               rgba[i][gComp] = ((p >>  6) & 0x1f) * gs;
-               rgba[i][bComp] = ((p >>  1) & 0x1f) * bs;
-               rgba[i][aComp] = ((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][rComp] = ((p      ) & 0x1f) * rs;
-               rgba[i][gComp] = ((p >>  5) & 0x1f) * gs;
-               rgba[i][bComp] = ((p >> 10) & 0x1f) * bs;
-               rgba[i][aComp] = ((p >> 15)       ) * as;
-            }
-         }
-         else {
-            const GLushort *ussrc = (const GLushort *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLushort p = ussrc[i];
-               rgba[i][rComp] = ((p      ) & 0x1f) * rs;
-               rgba[i][gComp] = ((p >>  5) & 0x1f) * gs;
-               rgba[i][bComp] = ((p >> 10) & 0x1f) * bs;
-               rgba[i][aComp] = ((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][rComp] = (GLfloat) ((p      ) & 0xff);
-                  rgba[i][gComp] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][bComp] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][aComp] = (GLfloat) ((p >> 24)       );
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
-                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][aComp] = 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][rComp] = (GLfloat) ((p >> 24)       );
-                  rgba[i][gComp] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][bComp] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][aComp] = (GLfloat) ((p      ) & 0xff);
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
-                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][aComp] = 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][rComp] = (GLfloat) ((p >> 24)       );
-                  rgba[i][gComp] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][bComp] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][aComp] = (GLfloat) ((p      ) & 0xff);
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rComp] = UBYTE_TO_FLOAT((p >> 24)       );
-                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][aComp] = 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][rComp] = (GLfloat) ((p      ) & 0xff);
-                  rgba[i][gComp] = (GLfloat) ((p >>  8) & 0xff);
-                  rgba[i][bComp] = (GLfloat) ((p >> 16) & 0xff);
-                  rgba[i][aComp] = (GLfloat) ((p >> 24)       );
-               }
-            }
-            else {
-               for (i = 0; i < n; i ++) {
-                  GLuint p = uisrc[i];
-                  rgba[i][rComp] = UBYTE_TO_FLOAT((p      ) & 0xff);
-                  rgba[i][gComp] = UBYTE_TO_FLOAT((p >>  8) & 0xff);
-                  rgba[i][bComp] = UBYTE_TO_FLOAT((p >> 16) & 0xff);
-                  rgba[i][aComp] = 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][rComp] = ((p >> 22)        ) * rs;
-               rgba[i][gComp] = ((p >> 12) & 0x3ff) * gs;
-               rgba[i][bComp] = ((p >>  2) & 0x3ff) * bs;
-               rgba[i][aComp] = ((p      ) & 0x3  ) * as;
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rComp] = ((p >> 22)        ) * rs;
-               rgba[i][gComp] = ((p >> 12) & 0x3ff) * gs;
-               rgba[i][bComp] = ((p >>  2) & 0x3ff) * bs;
-               rgba[i][aComp] = ((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][rComp] = ((p      ) & 0x3ff) * rs;
-               rgba[i][gComp] = ((p >> 10) & 0x3ff) * gs;
-               rgba[i][bComp] = ((p >> 20) & 0x3ff) * bs;
-               rgba[i][aComp] = ((p >> 30)        ) * as;
-            }
-         }
-         else {
-            const GLuint *uisrc = (const GLuint *) src;
-            GLuint i;
-            for (i = 0; i < n; i ++) {
-               GLuint p = uisrc[i];
-               rgba[i][rComp] = ((p      ) & 0x3ff) * rs;
-               rgba[i][gComp] = ((p >> 10) & 0x3ff) * gs;
-               rgba[i][bComp] = ((p >> 20) & 0x3ff) * bs;
-               rgba[i][aComp] = ((p >> 30)        ) * as;
-            }
-         }
-         break;
-      default:
-         _mesa_problem(NULL, "bad srcType in extract float data");
-         break;
-   }
-}
-
-
-/*
- * 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( GLcontext *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_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_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 dstRedIndex, dstGreenIndex, dstBlueIndex, dstAlphaIndex;
-      GLint dstLuminanceIndex, dstIntensityIndex;
-      GLfloat rgba[MAX_WIDTH][4];
-
-      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
-       */
-      assert(n <= MAX_WIDTH);
-      if (srcFormat == GL_COLOR_INDEX) {
-         GLuint indexes[MAX_WIDTH];
-         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);
-            }
-            return;
-         }
-         else {
-            /* Convert indexes to RGBA */
-            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-               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);
-      }
-      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);
-      }
-
-      /* Now determine which color channels we need to produce.
-       * And determine the dest index (offset) within each color tuple.
-       */
-      switch (dstFormat) {
-         case GL_ALPHA:
-            dstAlphaIndex = 0;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
-            dstLuminanceIndex = dstIntensityIndex = -1;
-            break;
-         case GL_LUMINANCE:
-            dstLuminanceIndex = 0;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
-            dstIntensityIndex = -1;
-            break;
-         case GL_LUMINANCE_ALPHA:
-            dstLuminanceIndex = 0;
-            dstAlphaIndex = 1;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
-            dstIntensityIndex = -1;
-            break;
-         case GL_INTENSITY:
-            dstIntensityIndex = 0;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
-            dstLuminanceIndex = -1;
-            break;
-         case GL_RGB:
-            dstRedIndex = 0;
-            dstGreenIndex = 1;
-            dstBlueIndex = 2;
-            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
-            break;
-         case GL_RGBA:
-            dstRedIndex = 0;
-            dstGreenIndex = 1;
-            dstBlueIndex = 2;
-            dstAlphaIndex = 3;
-            dstLuminanceIndex = dstIntensityIndex = -1;
-            break;
-         default:
-            _mesa_problem(ctx, "bad dstFormat in _mesa_unpack_chan_span()");
-            return;
-      }
-
-
-      /* Now return the GLchan data in the requested dstFormat */
-
-      if (dstRedIndex >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[dstRedIndex], rgba[i][RCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (dstGreenIndex >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[dstGreenIndex], rgba[i][GCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (dstBlueIndex >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[dstBlueIndex], rgba[i][BCOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (dstAlphaIndex >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            CLAMPED_FLOAT_TO_CHAN(dst[dstAlphaIndex], rgba[i][ACOMP]);
-            dst += dstComponents;
-         }
-      }
-
-      if (dstIntensityIndex >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         assert(dstIntensityIndex == 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 (dstLuminanceIndex >= 0) {
-         GLchan *dst = dest;
-         GLuint i;
-         assert(dstLuminanceIndex == 0);
-         for (i = 0; i < n; i++) {
-            /* Luminance comes from red channel */
-            CLAMPED_FLOAT_TO_CHAN(dst[0], rgba[i][RCOMP]);
-            dst += dstComponents;
-         }
-      }
-   }
-}
-
-
-/**
- * Same as _mesa_unpack_color_span_chan(), but return GLfloat data
- * instead of GLchan.
- */
-void
-_mesa_unpack_color_span_float( GLcontext *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_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_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 dstRedIndex, dstGreenIndex, dstBlueIndex, dstAlphaIndex;
-      GLint dstLuminanceIndex, dstIntensityIndex;
-      GLfloat rgba[MAX_WIDTH][4];
-
-      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
-       */
-      assert(n <= MAX_WIDTH);
-      if (srcFormat == GL_COLOR_INDEX) {
-         GLuint indexes[MAX_WIDTH];
-         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);
-            }
-            return;
-         }
-         else {
-            /* Convert indexes to RGBA */
-            if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-               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);
-      }
-      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);
-      }
-
-      /* Now determine which color channels we need to produce.
-       * And determine the dest index (offset) within each color tuple.
-       */
-      switch (dstFormat) {
-         case GL_ALPHA:
-            dstAlphaIndex = 0;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
-            dstLuminanceIndex = dstIntensityIndex = -1;
-            break;
-         case GL_LUMINANCE:
-            dstLuminanceIndex = 0;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
-            dstIntensityIndex = -1;
-            break;
-         case GL_LUMINANCE_ALPHA:
-            dstLuminanceIndex = 0;
-            dstAlphaIndex = 1;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
-            dstIntensityIndex = -1;
-            break;
-         case GL_INTENSITY:
-            dstIntensityIndex = 0;
-            dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
-            dstLuminanceIndex = -1;
-            break;
-         case GL_RGB:
-            dstRedIndex = 0;
-            dstGreenIndex = 1;
-            dstBlueIndex = 2;
-            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
-            break;
-         case GL_RGBA:
-            dstRedIndex = 0;
-            dstGreenIndex = 1;
-            dstBlueIndex = 2;
-            dstAlphaIndex = 3;
-            dstLuminanceIndex = dstIntensityIndex = -1;
-            break;
-         default:
-            _mesa_problem(ctx, "bad dstFormat in _mesa_unpack_color_span_float()");
-            return;
-      }
-
-      /* Now pack results in the requested dstFormat */
-      if (dstRedIndex >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[dstRedIndex] = rgba[i][RCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (dstGreenIndex >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[dstGreenIndex] = rgba[i][GCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (dstBlueIndex >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[dstBlueIndex] = rgba[i][BCOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (dstAlphaIndex >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         for (i = 0; i < n; i++) {
-            dst[dstAlphaIndex] = rgba[i][ACOMP];
-            dst += dstComponents;
-         }
-      }
-
-      if (dstIntensityIndex >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         assert(dstIntensityIndex == 0);
-         assert(dstComponents == 1);
-         for (i = 0; i < n; i++) {
-            /* Intensity comes from red channel */
-            dst[i] = rgba[i][RCOMP];
-         }
-      }
-
-      if (dstLuminanceIndex >= 0) {
-         GLfloat *dst = dest;
-         GLuint i;
-         assert(dstLuminanceIndex == 0);
-         for (i = 0; i < n; i++) {
-            /* Luminance comes from red channel */
-            dst[0] = rgba[i][RCOMP];
-            dst += dstComponents;
-         }
-      }
-   }
-}
-
-/**
- * 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( GLcontext *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;
-      GLfloat rgba[MAX_WIDTH][4];
-      GLbyte *dst = dest;
-      GLuint i;
-
-      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
-       */
-      assert(n <= MAX_WIDTH);
-      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;
-      }
-   }
-}
-
-/*
- * 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( const GLcontext *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[MAX_WIDTH];
-      assert(n <= MAX_WIDTH);
-
-      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");
-      }
-   }
-}
-
-
-void
-_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
-                       GLenum dstType, GLvoid *dest, const GLuint *source,
-                       const struct gl_pixelstore_attrib *dstPacking,
-                       GLbitfield transferOps )
-{
-   GLuint indexes[MAX_WIDTH];
-
-   ASSERT(n <= MAX_WIDTH);
-
-   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");
-   }
-}
-
-
-/*
- * 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( const GLcontext *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[MAX_WIDTH];
-      assert(n <= MAX_WIDTH);
-
-      extract_uint_indexes(n, indexes, GL_STENCIL_INDEX, srcType, source,
-                           srcPacking);
-
-      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-         /* shift and offset indexes */
-         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");
-      }
-   }
-}
-
-
-void
-_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, const GLstencil *source,
-                         const struct gl_pixelstore_attrib *dstPacking )
-{
-   GLstencil stencil[MAX_WIDTH];
-
-   ASSERT(n <= MAX_WIDTH);
-
-   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");
-   }
-}
-
-#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( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, GLuint depthMax,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking )
-{
-   GLfloat depthTemp[MAX_WIDTH], *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 */
-
-   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()");
-         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);*/
-   }
-}
-
-
-/*
- * Pack an array of depth values.  The values are floats in [0,1].
- */
-void
-_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
-                       GLenum dstType, const GLfloat *depthSpan,
-                       const struct gl_pixelstore_attrib *dstPacking )
-{
-   GLfloat depthCopy[MAX_WIDTH];
-
-   ASSERT(n <= MAX_WIDTH);
-
-   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");
-   }
-}
-
-
-
-/**
- * Pack depth and stencil values as GL_DEPTH_STENCIL/GL_UNSIGNED_INT_24_8.
- */
-void
-_mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
-                              const GLfloat *depthVals,
-                              const GLstencil *stencilVals,
-                              const struct gl_pixelstore_attrib *dstPacking)
-{
-   GLfloat depthCopy[MAX_WIDTH];
-   GLstencil stencilCopy[MAX_WIDTH];
-   GLuint i;
-
-   ASSERT(n <= MAX_WIDTH);
-
-   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);
-   }
-}
-
-
-
-
-/**
- * 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;
-   }
-}
-
-#endif /* _HAVE_FULL_GL */
-
-
-
-/**
- * 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 GLcontext *ctx,
-                      GLint *destX, GLint *destY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *unpack)
-{
-   const GLframebuffer *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 image is ready for drawing or
- *          GL_FALSE if image was completely clipped away (draw nothing)
- */
-GLboolean
-_mesa_clip_readpixels(const GLcontext *ctx,
-                      GLint *srcX, GLint *srcY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *pack)
-{
-   const GLframebuffer *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 GLcontext *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(GLcontext *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"

+

+

+/**

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

+      /* signed, normalized texture formats */

+      case GL_RGBA_SNORM:

+      case GL_RGBA8_SNORM:

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

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

+   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 image is ready for drawing or

+ *          GL_FALSE if image was completely clipped away (draw nothing)

+ */

+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/image.h b/mesalib/src/mesa/main/image.h
index 8b180d6bf..6fa93924c 100644
--- a/mesalib/src/mesa/main/image.h
+++ b/mesalib/src/mesa/main/image.h
@@ -1,336 +1,176 @@
-/*
- * 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.
- */
-
-
-#ifndef IMAGE_H
-#define IMAGE_H
-
-
-#include "mtypes.h"
-
-
-extern void
-_mesa_swap2( GLushort *p, GLuint n );
-
-extern void
-_mesa_swap4( GLuint *p, GLuint n );
-
-extern GLboolean
-_mesa_type_is_packed(GLenum type);
-
-extern GLint
-_mesa_sizeof_type( GLenum type );
-
-extern GLint
-_mesa_sizeof_packed_type( GLenum type );
-
-extern GLint
-_mesa_components_in_format( GLenum format );
-
-extern GLint
-_mesa_bytes_per_pixel( GLenum format, GLenum type );
-
-extern GLboolean
-_mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type );
-
-extern GLboolean
-_mesa_is_color_format(GLenum format);
-
-extern GLboolean
-_mesa_is_index_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depth_format(GLenum format);
-
-extern GLboolean
-_mesa_is_stencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_ycbcr_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depthstencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depth_or_stencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_dudv_format(GLenum format);
-
-extern GLboolean
-_mesa_is_integer_format(GLenum format);
-
-extern GLboolean
-_mesa_is_compressed_format(GLcontext *ctx, GLenum format);
-
-extern 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 );
-
-extern GLvoid *
-_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width,
-                       GLenum format, GLenum type,
-                       GLint column );
-
-extern 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 );
-
-extern 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 );
-
-
-extern GLint
-_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
-                        GLint width, GLenum format, GLenum type );
-
-
-extern GLint
-_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
-                          GLint width, GLint height,
-                          GLenum format, GLenum type );
-
-extern void
-_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
-                              const struct gl_pixelstore_attrib *unpacking );
-
-
-extern void
-_mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest,
-                            const struct gl_pixelstore_attrib *packing );
-
-
-extern GLvoid *
-_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
-                     const struct gl_pixelstore_attrib *packing );
-
-extern void
-_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
-                   GLubyte *dest, const struct gl_pixelstore_attrib *packing );
-
-extern void
-_mesa_expand_bitmap(GLsizei width, GLsizei height,
-                    const struct gl_pixelstore_attrib *unpack,
-                    const GLubyte *bitmap,
-                    GLubyte *destBuffer, GLint destStride,
-                    GLubyte onValue);
-
-
-/** \name Pixel processing functions */
-/*@{*/
-
-extern void
-_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
-                          GLfloat rScale, GLfloat gScale,
-                          GLfloat bScale, GLfloat aScale,
-                          GLfloat rBias, GLfloat gBias,
-                          GLfloat bBias, GLfloat aBias);
-
-extern void
-_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_lookup_rgba_float(const struct gl_color_table *table,
-                        GLuint n, GLfloat rgba[][4]);
-
-extern void
-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
-                        GLuint n, GLubyte rgba[][4]);
-
-
-extern void
-_mesa_map_ci_to_rgba(const GLcontext *ctx,
-                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
-
-
-extern void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
-                       GLubyte rgba[][4]);
-
-
-extern void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
-                           GLfloat depthValues[]);
-
-extern void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
-                                GLuint depthValues[]);
-
-extern void
-_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
-                              GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_apply_ci_transfer_ops(const GLcontext *ctx, GLbitfield transferOps,
-                            GLuint n, GLuint indexes[]);
-
-
-extern void
-_mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
-                                 GLstencil stencil[]);
-
-
-extern void
-_mesa_pack_rgba_span_float( GLcontext *ctx, GLuint n, GLfloat rgba[][4],
-                            GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
-                            const struct gl_pixelstore_attrib *dstPacking,
-                            GLbitfield transferOps );
-
-
-extern void
-_mesa_unpack_color_span_chan( GLcontext *ctx,
-                              GLuint n, GLenum dstFormat, GLchan dest[],
-                              GLenum srcFormat, GLenum srcType,
-                              const GLvoid *source,
-                              const struct gl_pixelstore_attrib *srcPacking,
-                              GLbitfield transferOps );
-
-
-extern void
-_mesa_unpack_color_span_float( GLcontext *ctx,
-                               GLuint n, GLenum dstFormat, GLfloat dest[],
-                               GLenum srcFormat, GLenum srcType,
-                               const GLvoid *source,
-                               const struct gl_pixelstore_attrib *srcPacking,
-                               GLbitfield transferOps );
-
-extern void
-_mesa_unpack_dudv_span_byte( GLcontext *ctx,
-                             GLuint n, GLenum dstFormat, GLbyte dest[],
-                             GLenum srcFormat, GLenum srcType,
-                             const GLvoid *source,
-                             const struct gl_pixelstore_attrib *srcPacking,
-                             GLbitfield transferOps );
-
-extern void
-_mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking,
-                         GLbitfield transferOps );
-
-
-extern void
-_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
-                       GLenum dstType, GLvoid *dest, const GLuint *source,
-                       const struct gl_pixelstore_attrib *dstPacking,
-                       GLbitfield transferOps );
-
-
-extern void
-_mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
-                           GLenum dstType, GLvoid *dest,
-                           GLenum srcType, const GLvoid *source,
-                           const struct gl_pixelstore_attrib *srcPacking,
-                           GLbitfield transferOps );
-
-extern void
-_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, const GLstencil *source,
-                         const struct gl_pixelstore_attrib *dstPacking );
-
-
-extern void
-_mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, GLuint depthMax,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking );
-
-extern void
-_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
-                       GLenum dstType, const GLfloat *depthSpan,
-                       const struct gl_pixelstore_attrib *dstPacking );
-
-
-extern void
-_mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
-                              const GLfloat *depthVals,
-                              const GLstencil *stencilVals,
-                              const struct gl_pixelstore_attrib *dstPacking);
-
-
-extern 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 );
-
-
-extern void
-_mesa_convert_colors(GLenum srcType, const GLvoid *src,
-                     GLenum dstType, GLvoid *dst,
-                     GLuint count, const GLubyte mask[]);
-
-
-extern GLboolean
-_mesa_clip_drawpixels(const GLcontext *ctx,
-                      GLint *destX, GLint *destY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *unpack);
-
-
-extern GLboolean
-_mesa_clip_readpixels(const GLcontext *ctx,
-                      GLint *srcX, GLint *srcY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *pack);
-
-extern GLboolean
-_mesa_clip_copytexsubimage(const GLcontext *ctx,
-                           GLint *destX, GLint *destY,
-                           GLint *srcX, GLint *srcY,
-                           GLsizei *width, GLsizei *height);
-                           
-extern GLboolean
-_mesa_clip_to_region(GLint xmin, GLint ymin,
-                     GLint xmax, GLint ymax,
-                     GLint *x, GLint *y,
-                     GLsizei *width, GLsizei *height );
-
-extern GLboolean
-_mesa_clip_blit(GLcontext *ctx,
-                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
-                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);
-
-
-#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.

+ */

+

+

+#ifndef IMAGE_H

+#define IMAGE_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_pixelstore_attrib;

+

+extern void

+_mesa_swap2( GLushort *p, GLuint n );

+

+extern void

+_mesa_swap4( GLuint *p, GLuint n );

+

+extern GLboolean

+_mesa_type_is_packed(GLenum type);

+

+extern GLint

+_mesa_sizeof_type( GLenum type );

+

+extern GLint

+_mesa_sizeof_packed_type( GLenum type );

+

+extern GLint

+_mesa_components_in_format( GLenum format );

+

+extern GLint

+_mesa_bytes_per_pixel( GLenum format, GLenum type );

+

+extern GLboolean

+_mesa_is_legal_format_and_type(const struct gl_context *ctx,

+                               GLenum format, GLenum type);

+

+extern GLboolean

+_mesa_is_color_format(GLenum format);

+

+extern GLboolean

+_mesa_is_index_format(GLenum format);

+

+extern GLboolean

+_mesa_is_depth_format(GLenum format);

+

+extern GLboolean

+_mesa_is_stencil_format(GLenum format);

+

+extern GLboolean

+_mesa_is_ycbcr_format(GLenum format);

+

+extern GLboolean

+_mesa_is_depthstencil_format(GLenum format);

+

+extern GLboolean

+_mesa_is_depth_or_stencil_format(GLenum format);

+

+extern GLboolean

+_mesa_is_dudv_format(GLenum format);

+

+extern GLboolean

+_mesa_is_integer_format(GLenum format);

+

+extern GLboolean

+_mesa_is_compressed_format(struct gl_context *ctx, GLenum format);

+

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

+

+extern GLvoid *

+_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width,

+                       GLenum format, GLenum type,

+                       GLint column );

+

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

+

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

+

+

+extern GLint

+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,

+                        GLint width, GLenum format, GLenum type );

+

+

+extern GLint

+_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,

+                          GLint width, GLint height,

+                          GLenum format, GLenum type );

+

+

+extern void

+_mesa_expand_bitmap(GLsizei width, GLsizei height,

+                    const struct gl_pixelstore_attrib *unpack,

+                    const GLubyte *bitmap,

+                    GLubyte *destBuffer, GLint destStride,

+                    GLubyte onValue);

+

+

+extern void

+_mesa_convert_colors(GLenum srcType, const GLvoid *src,

+                     GLenum dstType, GLvoid *dst,

+                     GLuint count, const GLubyte mask[]);

+

+

+extern GLboolean

+_mesa_clip_drawpixels(const struct gl_context *ctx,

+                      GLint *destX, GLint *destY,

+                      GLsizei *width, GLsizei *height,

+                      struct gl_pixelstore_attrib *unpack);

+

+

+extern GLboolean

+_mesa_clip_readpixels(const struct gl_context *ctx,

+                      GLint *srcX, GLint *srcY,

+                      GLsizei *width, GLsizei *height,

+                      struct gl_pixelstore_attrib *pack);

+

+extern GLboolean

+_mesa_clip_copytexsubimage(const struct gl_context *ctx,

+                           GLint *destX, GLint *destY,

+                           GLint *srcX, GLint *srcY,

+                           GLsizei *width, GLsizei *height);

+                           

+extern GLboolean

+_mesa_clip_to_region(GLint xmin, GLint ymin,

+                     GLint xmax, GLint ymax,

+                     GLint *x, GLint *y,

+                     GLsizei *width, GLsizei *height );

+

+extern GLboolean

+_mesa_clip_blit(struct gl_context *ctx,

+                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,

+                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index 46e5c932d..6bfa734b8 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -1,1031 +1,1032 @@
-/**
- * \file imports.c
- * Standard C library function wrappers.
- * 
- * Imports are services which the device driver or window system or
- * operating system provides to the core renderer.  The core renderer (Mesa)
- * will call these functions in order to do memory allocation, simple I/O,
- * etc.
- *
- * Some drivers will want to override/replace this file with something
- * specialized, but that'll be rare.
- *
- * Eventually, I want to move roll the glheader.h file into this.
- *
- * \todo Functions still needed:
- * - scanf
- * - qsort
- * - rand and RAND_MAX
- */
-
-/*
- * 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 "imports.h"
-#include "context.h"
-#include "version.h"
-
-#ifdef _GNU_SOURCE
-#include <locale.h>
-#ifdef __APPLE__
-#include <xlocale.h>
-#endif
-#endif
-
-
-#define MAXSTRING 4000  /* for vsnprintf() */
-
-#ifdef WIN32
-#define vsnprintf _vsnprintf
-#elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )
-extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
-#ifdef __VMS
-#include "vsnprintf.c"
-#endif
-#endif
-
-/**********************************************************************/
-/** \name Memory */
-/*@{*/
-
-/**
- * Allocate aligned memory.
- *
- * \param bytes number of bytes to allocate.
- * \param alignment alignment (must be greater than zero).
- * 
- * Allocates extra memory to accommodate rounding up the address for
- * alignment and to record the real malloc address.
- *
- * \sa _mesa_align_free().
- */
-void *
-_mesa_align_malloc(size_t bytes, unsigned long alignment)
-{
-#if defined(HAVE_POSIX_MEMALIGN)
-   void *mem;
-   int err = posix_memalign(& mem, alignment, bytes);
-   (void) err;
-   return mem;
-#elif defined(_WIN32) && defined(_MSC_VER)
-   return _aligned_malloc(bytes, alignment);
-#else
-   uintptr_t ptr, buf;
-
-   ASSERT( alignment > 0 );
-
-   ptr = (uintptr_t) malloc(bytes + alignment + sizeof(void *));
-   if (!ptr)
-      return NULL;
-
-   buf = (ptr + alignment + sizeof(void *)) & ~(uintptr_t)(alignment - 1);
-   *(uintptr_t *)(buf - sizeof(void *)) = ptr;
-
-#ifdef DEBUG
-   /* mark the non-aligned area */
-   while ( ptr < buf - sizeof(void *) ) {
-      *(unsigned long *)ptr = 0xcdcdcdcd;
-      ptr += sizeof(unsigned long);
-   }
-#endif
-
-   return (void *) buf;
-#endif /* defined(HAVE_POSIX_MEMALIGN) */
-}
-
-/**
- * Same as _mesa_align_malloc(), but using calloc(1, ) instead of
- * malloc()
- */
-void *
-_mesa_align_calloc(size_t bytes, unsigned long alignment)
-{
-#if defined(HAVE_POSIX_MEMALIGN)
-   void *mem;
-   
-   mem = _mesa_align_malloc(bytes, alignment);
-   if (mem != NULL) {
-      (void) memset(mem, 0, bytes);
-   }
-
-   return mem;
-#elif defined(_WIN32) && defined(_MSC_VER)
-   void *mem;
-
-   mem = _aligned_malloc(bytes, alignment);
-   if (mem != NULL) {
-      (void) memset(mem, 0, bytes);
-   }
-
-   return mem;
-#else
-   uintptr_t ptr, buf;
-
-   ASSERT( alignment > 0 );
-
-   ptr = (uintptr_t) calloc(1, bytes + alignment + sizeof(void *));
-   if (!ptr)
-      return NULL;
-
-   buf = (ptr + alignment + sizeof(void *)) & ~(uintptr_t)(alignment - 1);
-   *(uintptr_t *)(buf - sizeof(void *)) = ptr;
-
-#ifdef DEBUG
-   /* mark the non-aligned area */
-   while ( ptr < buf - sizeof(void *) ) {
-      *(unsigned long *)ptr = 0xcdcdcdcd;
-      ptr += sizeof(unsigned long);
-   }
-#endif
-
-   return (void *)buf;
-#endif /* defined(HAVE_POSIX_MEMALIGN) */
-}
-
-/**
- * Free memory which was allocated with either _mesa_align_malloc()
- * or _mesa_align_calloc().
- * \param ptr pointer to the memory to be freed.
- * The actual address to free is stored in the word immediately before the
- * address the client sees.
- */
-void
-_mesa_align_free(void *ptr)
-{
-#if defined(HAVE_POSIX_MEMALIGN)
-   free(ptr);
-#elif defined(_WIN32) && defined(_MSC_VER)
-   _aligned_free(ptr);
-#else
-   void **cubbyHole = (void **) ((char *) ptr - sizeof(void *));
-   void *realAddr = *cubbyHole;
-   free(realAddr);
-#endif /* defined(HAVE_POSIX_MEMALIGN) */
-}
-
-/**
- * Reallocate memory, with alignment.
- */
-void *
-_mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize,
-                    unsigned long alignment)
-{
-#if defined(_WIN32) && defined(_MSC_VER)
-   (void) oldSize;
-   return _aligned_realloc(oldBuffer, newSize, alignment);
-#else
-   const size_t copySize = (oldSize < newSize) ? oldSize : newSize;
-   void *newBuf = _mesa_align_malloc(newSize, alignment);
-   if (newBuf && oldBuffer && copySize > 0) {
-      memcpy(newBuf, oldBuffer, copySize);
-   }
-   if (oldBuffer)
-      _mesa_align_free(oldBuffer);
-   return newBuf;
-#endif
-}
-
-
-
-/** Reallocate memory */
-void *
-_mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
-{
-   const size_t copySize = (oldSize < newSize) ? oldSize : newSize;
-   void *newBuffer = malloc(newSize);
-   if (newBuffer && oldBuffer && copySize > 0)
-      memcpy(newBuffer, oldBuffer, copySize);
-   if (oldBuffer)
-      free(oldBuffer);
-   return newBuffer;
-}
-
-/**
- * Fill memory with a constant 16bit word.
- * \param dst destination pointer.
- * \param val value.
- * \param n number of words.
- */
-void
-_mesa_memset16( unsigned short *dst, unsigned short val, size_t n )
-{
-   while (n-- > 0)
-      *dst++ = val;
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Math */
-/*@{*/
-
-/** Wrapper around sqrt() */
-double
-_mesa_sqrtd(double x)
-{
-   return sqrt(x);
-}
-
-
-/*
- * A High Speed, Low Precision Square Root
- * by Paul Lalonde and Robert Dawson
- * from "Graphics Gems", Academic Press, 1990
- *
- * SPARC implementation of a fast square root by table
- * lookup.
- * SPARC floating point format is as follows:
- *
- * BIT 31 	30 	23 	22 	0
- *     sign	exponent	mantissa
- */
-static short sqrttab[0x100];    /* declare table of square roots */
-
-void
-_mesa_init_sqrt_table(void)
-{
-#if defined(USE_IEEE) && !defined(DEBUG)
-   unsigned short i;
-   fi_type fi;     /* to access the bits of a float in  C quickly  */
-                   /* we use a union defined in glheader.h         */
-
-   for(i=0; i<= 0x7f; i++) {
-      fi.i = 0;
-
-      /*
-       * Build a float with the bit pattern i as mantissa
-       * and an exponent of 0, stored as 127
-       */
-
-      fi.i = (i << 16) | (127 << 23);
-      fi.f = _mesa_sqrtd(fi.f);
-
-      /*
-       * Take the square root then strip the first 7 bits of
-       * the mantissa into the table
-       */
-
-      sqrttab[i] = (fi.i & 0x7fffff) >> 16;
-
-      /*
-       * Repeat the process, this time with an exponent of
-       * 1, stored as 128
-       */
-
-      fi.i = 0;
-      fi.i = (i << 16) | (128 << 23);
-      fi.f = sqrt(fi.f);
-      sqrttab[i+0x80] = (fi.i & 0x7fffff) >> 16;
-   }
-#else
-   (void) sqrttab;  /* silence compiler warnings */
-#endif /*HAVE_FAST_MATH*/
-}
-
-
-/**
- * Single precision square root.
- */
-float
-_mesa_sqrtf( float x )
-{
-#if defined(USE_IEEE) && !defined(DEBUG)
-   fi_type num;
-                                /* to access the bits of a float in C
-                                 * we use a union from glheader.h     */
-
-   short e;                     /* the exponent */
-   if (x == 0.0F) return 0.0F;  /* check for square root of 0 */
-   num.f = x;
-   e = (num.i >> 23) - 127;     /* get the exponent - on a SPARC the */
-                                /* exponent is stored with 127 added */
-   num.i &= 0x7fffff;           /* leave only the mantissa */
-   if (e & 0x01) num.i |= 0x800000;
-                                /* the exponent is odd so we have to */
-                                /* look it up in the second half of  */
-                                /* the lookup table, so we set the   */
-                                /* high bit                                */
-   e >>= 1;                     /* divide the exponent by two */
-                                /* note that in C the shift */
-                                /* operators are sign preserving */
-                                /* for signed operands */
-   /* Do the table lookup, based on the quaternary mantissa,
-    * then reconstruct the result back into a float
-    */
-   num.i = ((sqrttab[num.i >> 16]) << 16) | ((e + 127) << 23);
-
-   return num.f;
-#else
-   return (float) _mesa_sqrtd((double) x);
-#endif
-}
-
-
-/**
- inv_sqrt - A single precision 1/sqrt routine for IEEE format floats.
- written by Josh Vanderhoof, based on newsgroup posts by James Van Buskirk
- and Vesa Karvonen.
-*/
-float
-_mesa_inv_sqrtf(float n)
-{
-#if defined(USE_IEEE) && !defined(DEBUG)
-        float r0, x0, y0;
-        float r1, x1, y1;
-        float r2, x2, y2;
-#if 0 /* not used, see below -BP */
-        float r3, x3, y3;
-#endif
-        fi_type u;
-        unsigned int magic;
-
-        /*
-         Exponent part of the magic number -
-
-         We want to:
-         1. subtract the bias from the exponent,
-         2. negate it
-         3. divide by two (rounding towards -inf)
-         4. add the bias back
-
-         Which is the same as subtracting the exponent from 381 and dividing
-         by 2.
-
-         floor(-(x - 127) / 2) + 127 = floor((381 - x) / 2)
-        */
-
-        magic = 381 << 23;
-
-        /*
-         Significand part of magic number -
-
-         With the current magic number, "(magic - u.i) >> 1" will give you:
-
-         for 1 <= u.f <= 2: 1.25 - u.f / 4
-         for 2 <= u.f <= 4: 1.00 - u.f / 8
-
-         This isn't a bad approximation of 1/sqrt.  The maximum difference from
-         1/sqrt will be around .06.  After three Newton-Raphson iterations, the
-         maximum difference is less than 4.5e-8.  (Which is actually close
-         enough to make the following bias academic...)
-
-         To get a better approximation you can add a bias to the magic
-         number.  For example, if you subtract 1/2 of the maximum difference in
-         the first approximation (.03), you will get the following function:
-
-         for 1 <= u.f <= 2:    1.22 - u.f / 4
-         for 2 <= u.f <= 3.76: 0.97 - u.f / 8
-         for 3.76 <= u.f <= 4: 0.72 - u.f / 16
-         (The 3.76 to 4 range is where the result is < .5.)
-
-         This is the closest possible initial approximation, but with a maximum
-         error of 8e-11 after three NR iterations, it is still not perfect.  If
-         you subtract 0.0332281 instead of .03, the maximum error will be
-         2.5e-11 after three NR iterations, which should be about as close as
-         is possible.
-
-         for 1 <= u.f <= 2:    1.2167719 - u.f / 4
-         for 2 <= u.f <= 3.73: 0.9667719 - u.f / 8
-         for 3.73 <= u.f <= 4: 0.7167719 - u.f / 16
-
-        */
-
-        magic -= (int)(0.0332281 * (1 << 25));
-
-        u.f = n;
-        u.i = (magic - u.i) >> 1;
-
-        /*
-         Instead of Newton-Raphson, we use Goldschmidt's algorithm, which
-         allows more parallelism.  From what I understand, the parallelism
-         comes at the cost of less precision, because it lets error
-         accumulate across iterations.
-        */
-        x0 = 1.0f;
-        y0 = 0.5f * n;
-        r0 = u.f;
-
-        x1 = x0 * r0;
-        y1 = y0 * r0 * r0;
-        r1 = 1.5f - y1;
-
-        x2 = x1 * r1;
-        y2 = y1 * r1 * r1;
-        r2 = 1.5f - y2;
-
-#if 1
-        return x2 * r2;  /* we can stop here, and be conformant -BP */
-#else
-        x3 = x2 * r2;
-        y3 = y2 * r2 * r2;
-        r3 = 1.5f - y3;
-
-        return x3 * r3;
-#endif
-#else
-        return (float) (1.0 / sqrt(n));
-#endif
-}
-
-/**
- * Find the first bit set in a word.
- */
-int
-_mesa_ffs(int32_t i)
-{
-#if (defined(_WIN32) ) || defined(__IBMC__) || defined(__IBMCPP__)
-   register int bit = 0;
-   if (i != 0) {
-      if ((i & 0xffff) == 0) {
-         bit += 16;
-         i >>= 16;
-      }
-      if ((i & 0xff) == 0) {
-         bit += 8;
-         i >>= 8;
-      }
-      if ((i & 0xf) == 0) {
-         bit += 4;
-         i >>= 4;
-      }
-      while ((i & 1) == 0) {
-         bit++;
-         i >>= 1;
-      }
-      bit++;
-   }
-   return bit;
-#else
-   return ffs(i);
-#endif
-}
-
-
-/**
- * Find position of first bit set in given value.
- * XXX Warning: this function can only be used on 64-bit systems!
- * \return  position of least-significant bit set, starting at 1, return zero
- *          if no bits set.
- */
-int
-_mesa_ffsll(int64_t val)
-{
-#ifdef ffsll
-   return ffsll(val);
-#else
-   int bit;
-
-   assert(sizeof(val) == 8);
-
-   bit = _mesa_ffs((int32_t)val);
-   if (bit != 0)
-      return bit;
-
-   bit = _mesa_ffs((int32_t)(val >> 32));
-   if (bit != 0)
-      return 32 + bit;
-
-   return 0;
-#endif
-}
-
-
-/**
- * Return number of bits set in given GLuint.
- */
-unsigned int
-_mesa_bitcount(unsigned int n)
-{
-#if defined(__GNUC__) && \
-	((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
-   return __builtin_popcount(n);
-#else
-   unsigned int bits;
-   for (bits = 0; n > 0; n = n >> 1) {
-      bits += (n & 1);
-   }
-   return bits;
-#endif
-}
-
-
-/**
- * Convert a 4-byte float to a 2-byte half float.
- * Based on code from:
- * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html
- */
-GLhalfARB
-_mesa_float_to_half(float val)
-{
-   const fi_type fi = {val};
-   const int flt_m = fi.i & 0x7fffff;
-   const int flt_e = (fi.i >> 23) & 0xff;
-   const int flt_s = (fi.i >> 31) & 0x1;
-   int s, e, m = 0;
-   GLhalfARB result;
-   
-   /* sign bit */
-   s = flt_s;
-
-   /* handle special cases */
-   if ((flt_e == 0) && (flt_m == 0)) {
-      /* zero */
-      /* m = 0; - already set */
-      e = 0;
-   }
-   else if ((flt_e == 0) && (flt_m != 0)) {
-      /* denorm -- denorm float maps to 0 half */
-      /* m = 0; - already set */
-      e = 0;
-   }
-   else if ((flt_e == 0xff) && (flt_m == 0)) {
-      /* infinity */
-      /* m = 0; - already set */
-      e = 31;
-   }
-   else if ((flt_e == 0xff) && (flt_m != 0)) {
-      /* NaN */
-      m = 1;
-      e = 31;
-   }
-   else {
-      /* regular number */
-      const int new_exp = flt_e - 127;
-      if (new_exp < -24) {
-         /* this maps to 0 */
-         /* m = 0; - already set */
-         e = 0;
-      }
-      else if (new_exp < -14) {
-         /* this maps to a denorm */
-         unsigned int exp_val = (unsigned int) (-14 - new_exp); /* 2^-exp_val*/
-         e = 0;
-         switch (exp_val) {
-            case 0:
-               _mesa_warning(NULL,
-                   "float_to_half: logical error in denorm creation!\n");
-               /* m = 0; - already set */
-               break;
-            case 1: m = 512 + (flt_m >> 14); break;
-            case 2: m = 256 + (flt_m >> 15); break;
-            case 3: m = 128 + (flt_m >> 16); break;
-            case 4: m = 64 + (flt_m >> 17); break;
-            case 5: m = 32 + (flt_m >> 18); break;
-            case 6: m = 16 + (flt_m >> 19); break;
-            case 7: m = 8 + (flt_m >> 20); break;
-            case 8: m = 4 + (flt_m >> 21); break;
-            case 9: m = 2 + (flt_m >> 22); break;
-            case 10: m = 1; break;
-         }
-      }
-      else if (new_exp > 15) {
-         /* map this value to infinity */
-         /* m = 0; - already set */
-         e = 31;
-      }
-      else {
-         /* regular */
-         e = new_exp + 15;
-         m = flt_m >> 13;
-      }
-   }
-
-   result = (s << 15) | (e << 10) | m;
-   return result;
-}
-
-
-/**
- * Convert a 2-byte half float to a 4-byte float.
- * Based on code from:
- * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html
- */
-float
-_mesa_half_to_float(GLhalfARB val)
-{
-   /* XXX could also use a 64K-entry lookup table */
-   const int m = val & 0x3ff;
-   const int e = (val >> 10) & 0x1f;
-   const int s = (val >> 15) & 0x1;
-   int flt_m, flt_e, flt_s;
-   fi_type fi;
-   float result;
-
-   /* sign bit */
-   flt_s = s;
-
-   /* handle special cases */
-   if ((e == 0) && (m == 0)) {
-      /* zero */
-      flt_m = 0;
-      flt_e = 0;
-   }
-   else if ((e == 0) && (m != 0)) {
-      /* denorm -- denorm half will fit in non-denorm single */
-      const float half_denorm = 1.0f / 16384.0f; /* 2^-14 */
-      float mantissa = ((float) (m)) / 1024.0f;
-      float sign = s ? -1.0f : 1.0f;
-      return sign * mantissa * half_denorm;
-   }
-   else if ((e == 31) && (m == 0)) {
-      /* infinity */
-      flt_e = 0xff;
-      flt_m = 0;
-   }
-   else if ((e == 31) && (m != 0)) {
-      /* NaN */
-      flt_e = 0xff;
-      flt_m = 1;
-   }
-   else {
-      /* regular */
-      flt_e = e + 112;
-      flt_m = m << 13;
-   }
-
-   fi.i = (flt_s << 31) | (flt_e << 23) | flt_m;
-   result = fi.f;
-   return result;
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Sort & Search */
-/*@{*/
-
-/**
- * Wrapper for bsearch().
- */
-void *
-_mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, 
-               int (*compar)(const void *, const void *) )
-{
-#if defined(_WIN32_WCE)
-   void *mid;
-   int cmp;
-   while (nmemb) {
-      nmemb >>= 1;
-      mid = (char *)base + nmemb * size;
-      cmp = (*compar)(key, mid);
-      if (cmp == 0)
-	 return mid;
-      if (cmp > 0) {
-	 base = (char *)mid + size;
-	 --nmemb;
-      }
-   }
-   return NULL;
-#else
-   return bsearch(key, base, nmemb, size, compar);
-#endif
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Environment vars */
-/*@{*/
-
-/**
- * Wrapper for getenv().
- */
-char *
-_mesa_getenv( const char *var )
-{
-#if defined(_XBOX) || defined(_WIN32_WCE)
-   return NULL;
-#else
-   return getenv(var);
-#endif
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name String */
-/*@{*/
-
-/**
- * Implemented using malloc() and strcpy.
- * Note that NULL is handled accordingly.
- */
-char *
-_mesa_strdup( const char *s )
-{
-   if (s) {
-      size_t l = strlen(s);
-      char *s2 = (char *) malloc(l + 1);
-      if (s2)
-         strcpy(s2, s);
-      return s2;
-   }
-   else {
-      return NULL;
-   }
-}
-
-/** Wrapper around strtof() */
-float
-_mesa_strtof( const char *s, char **end )
-{
-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
-   static locale_t loc = NULL;
-   if (!loc) {
-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
-   }
-   return strtof_l(s, end, loc);
-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
-   return strtof(s, end);
-#else
-   return (float)strtod(s, end);
-#endif
-}
-
-/** Compute simple checksum/hash for a string */
-unsigned int
-_mesa_str_checksum(const char *str)
-{
-   /* This could probably be much better */
-   unsigned int sum, i;
-   const char *c;
-   sum = i = 1;
-   for (c = str; *c; c++, i++)
-      sum += *c * (i % 100);
-   return sum + i;
-}
-
-
-/*@}*/
-
-
-/** Wrapper around vsnprintf() */
-int
-_mesa_snprintf( char *str, size_t size, const char *fmt, ... )
-{
-   int r;
-   va_list args;
-   va_start( args, fmt );  
-   r = vsnprintf( str, size, fmt, args );
-   va_end( args );
-   return r;
-}
-
-
-/**********************************************************************/
-/** \name Diagnostics */
-/*@{*/
-
-static void
-output_if_debug(const char *prefixString, const char *outputString,
-                GLboolean newline)
-{
-   static int debug = -1;
-
-   /* Check the MESA_DEBUG environment variable if it hasn't
-    * been checked yet.  We only have to check it once...
-    */
-   if (debug == -1) {
-      char *env = _mesa_getenv("MESA_DEBUG");
-
-      /* In a debug build, we print warning messages *unless*
-       * MESA_DEBUG is 0.  In a non-debug build, we don't
-       * print warning messages *unless* MESA_DEBUG is
-       * set *to any value*.
-       */
-#ifdef DEBUG
-      debug = (env != NULL && atoi(env) == 0) ? 0 : 1;
-#else
-      debug = (env != NULL) ? 1 : 0;
-#endif
-   }
-
-   /* Now only print the string if we're required to do so. */
-   if (debug) {
-      fprintf(stderr, "%s: %s", prefixString, outputString);
-      if (newline)
-         fprintf(stderr, "\n");
-
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-      /* stderr from windows applications without console is not usually 
-       * visible, so communicate with the debugger instead */ 
-      {
-         char buf[4096];
-         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
-         OutputDebugStringA(buf);
-      }
-#endif
-   }
-}
-
-
-/**
- * Return string version of GL error code.
- */
-static const char *
-error_string( GLenum error )
-{
-   switch (error) {
-   case GL_NO_ERROR:
-      return "GL_NO_ERROR";
-   case GL_INVALID_VALUE:
-      return "GL_INVALID_VALUE";
-   case GL_INVALID_ENUM:
-      return "GL_INVALID_ENUM";
-   case GL_INVALID_OPERATION:
-      return "GL_INVALID_OPERATION";
-   case GL_STACK_OVERFLOW:
-      return "GL_STACK_OVERFLOW";
-   case GL_STACK_UNDERFLOW:
-      return "GL_STACK_UNDERFLOW";
-   case GL_OUT_OF_MEMORY:
-      return "GL_OUT_OF_MEMORY";
-   case GL_TABLE_TOO_LARGE:
-      return "GL_TABLE_TOO_LARGE";
-   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
-      return "GL_INVALID_FRAMEBUFFER_OPERATION";
-   default:
-      return "unknown";
-   }
-}
-
-
-/**
- * When a new type of error is recorded, print a message describing
- * previous errors which were accumulated.
- */
-static void
-flush_delayed_errors( GLcontext *ctx )
-{
-   char s[MAXSTRING];
-
-   if (ctx->ErrorDebugCount) {
-      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 
-                     ctx->ErrorDebugCount,
-                     error_string(ctx->ErrorValue));
-
-      output_if_debug("Mesa", s, GL_TRUE);
-
-      ctx->ErrorDebugCount = 0;
-   }
-}
-
-
-/**
- * Report a warning (a recoverable error condition) to stderr if
- * either DEBUG is defined or the MESA_DEBUG env var is set.
- *
- * \param ctx GL context.
- * \param fmtString printf()-like format string.
- */
-void
-_mesa_warning( GLcontext *ctx, const char *fmtString, ... )
-{
-   char str[MAXSTRING];
-   va_list args;
-   va_start( args, fmtString );  
-   (void) vsnprintf( str, MAXSTRING, fmtString, args );
-   va_end( args );
-   
-   if (ctx)
-      flush_delayed_errors( ctx );
-
-   output_if_debug("Mesa warning", str, GL_TRUE);
-}
-
-
-/**
- * Report an internal implementation problem.
- * Prints the message to stderr via fprintf().
- *
- * \param ctx GL context.
- * \param fmtString problem description string.
- */
-void
-_mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
-{
-   va_list args;
-   char str[MAXSTRING];
-   (void) ctx;
-
-   va_start( args, fmtString );  
-   vsnprintf( str, MAXSTRING, fmtString, args );
-   va_end( args );
-
-   fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);
-   fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
-}
-
-
-/**
- * Record an OpenGL state error.  These usually occur when the user
- * passes invalid parameters to a GL function.
- *
- * If debugging is enabled (either at compile-time via the DEBUG macro, or
- * run-time via the MESA_DEBUG environment variable), report the error with
- * _mesa_debug().
- * 
- * \param ctx the GL context.
- * \param error the error value.
- * \param fmtString printf() style format string, followed by optional args
- */
-void
-_mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
-{
-   static GLint debug = -1;
-
-   /* Check debug environment variable only once:
-    */
-   if (debug == -1) {
-      const char *debugEnv = _mesa_getenv("MESA_DEBUG");
-
-#ifdef DEBUG
-      if (debugEnv && strstr(debugEnv, "silent"))
-         debug = GL_FALSE;
-      else
-         debug = GL_TRUE;
-#else
-      if (debugEnv)
-         debug = GL_TRUE;
-      else
-         debug = GL_FALSE;
-#endif
-   }
-
-   if (debug) {      
-      if (ctx->ErrorValue == error &&
-          ctx->ErrorDebugFmtString == fmtString) {
-         ctx->ErrorDebugCount++;
-      }
-      else {
-         char s[MAXSTRING], s2[MAXSTRING];
-         va_list args;
-
-         flush_delayed_errors( ctx );
-         
-         va_start(args, fmtString);
-         vsnprintf(s, MAXSTRING, fmtString, args);
-         va_end(args);
-
-         _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
-         output_if_debug("Mesa: User error", s2, GL_TRUE);
-         
-         ctx->ErrorDebugFmtString = fmtString;
-         ctx->ErrorDebugCount = 0;
-      }
-   }
-
-   _mesa_record_error(ctx, error);
-}
-
-
-/**
- * Report debug information.  Print error message to stderr via fprintf().
- * No-op if DEBUG mode not enabled.
- * 
- * \param ctx GL context.
- * \param fmtString printf()-style format string, followed by optional args.
- */
-void
-_mesa_debug( const GLcontext *ctx, const char *fmtString, ... )
-{
-#ifdef DEBUG
-   char s[MAXSTRING];
-   va_list args;
-   va_start(args, fmtString);
-   vsnprintf(s, MAXSTRING, fmtString, args);
-   va_end(args);
-   output_if_debug("Mesa", s, GL_FALSE);
-#endif /* DEBUG */
-   (void) ctx;
-   (void) fmtString;
-}
-
-/*@}*/
+/**

+ * \file imports.c

+ * Standard C library function wrappers.

+ * 

+ * Imports are services which the device driver or window system or

+ * operating system provides to the core renderer.  The core renderer (Mesa)

+ * will call these functions in order to do memory allocation, simple I/O,

+ * etc.

+ *

+ * Some drivers will want to override/replace this file with something

+ * specialized, but that'll be rare.

+ *

+ * Eventually, I want to move roll the glheader.h file into this.

+ *

+ * \todo Functions still needed:

+ * - scanf

+ * - qsort

+ * - rand and RAND_MAX

+ */

+

+/*

+ * 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 "imports.h"

+#include "context.h"

+#include "version.h"

+

+#ifdef _GNU_SOURCE

+#include <locale.h>

+#ifdef __APPLE__

+#include <xlocale.h>

+#endif

+#endif

+

+

+#define MAXSTRING 4000  /* for vsnprintf() */

+

+#ifdef WIN32

+#define vsnprintf _vsnprintf

+#elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )

+extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);

+#ifdef __VMS

+#include "vsnprintf.c"

+#endif

+#endif

+

+/**********************************************************************/

+/** \name Memory */

+/*@{*/

+

+/**

+ * Allocate aligned memory.

+ *

+ * \param bytes number of bytes to allocate.

+ * \param alignment alignment (must be greater than zero).

+ * 

+ * Allocates extra memory to accommodate rounding up the address for

+ * alignment and to record the real malloc address.

+ *

+ * \sa _mesa_align_free().

+ */

+void *

+_mesa_align_malloc(size_t bytes, unsigned long alignment)

+{

+#if defined(HAVE_POSIX_MEMALIGN)

+   void *mem;

+   int err = posix_memalign(& mem, alignment, bytes);

+   if (err)

+      return NULL;

+   return mem;

+#elif defined(_WIN32) && defined(_MSC_VER)

+   return _aligned_malloc(bytes, alignment);

+#else

+   uintptr_t ptr, buf;

+

+   ASSERT( alignment > 0 );

+

+   ptr = (uintptr_t) malloc(bytes + alignment + sizeof(void *));

+   if (!ptr)

+      return NULL;

+

+   buf = (ptr + alignment + sizeof(void *)) & ~(uintptr_t)(alignment - 1);

+   *(uintptr_t *)(buf - sizeof(void *)) = ptr;

+

+#ifdef DEBUG

+   /* mark the non-aligned area */

+   while ( ptr < buf - sizeof(void *) ) {

+      *(unsigned long *)ptr = 0xcdcdcdcd;

+      ptr += sizeof(unsigned long);

+   }

+#endif

+

+   return (void *) buf;

+#endif /* defined(HAVE_POSIX_MEMALIGN) */

+}

+

+/**

+ * Same as _mesa_align_malloc(), but using calloc(1, ) instead of

+ * malloc()

+ */

+void *

+_mesa_align_calloc(size_t bytes, unsigned long alignment)

+{

+#if defined(HAVE_POSIX_MEMALIGN)

+   void *mem;

+   

+   mem = _mesa_align_malloc(bytes, alignment);

+   if (mem != NULL) {

+      (void) memset(mem, 0, bytes);

+   }

+

+   return mem;

+#elif defined(_WIN32) && defined(_MSC_VER)

+   void *mem;

+

+   mem = _aligned_malloc(bytes, alignment);

+   if (mem != NULL) {

+      (void) memset(mem, 0, bytes);

+   }

+

+   return mem;

+#else

+   uintptr_t ptr, buf;

+

+   ASSERT( alignment > 0 );

+

+   ptr = (uintptr_t) calloc(1, bytes + alignment + sizeof(void *));

+   if (!ptr)

+      return NULL;

+

+   buf = (ptr + alignment + sizeof(void *)) & ~(uintptr_t)(alignment - 1);

+   *(uintptr_t *)(buf - sizeof(void *)) = ptr;

+

+#ifdef DEBUG

+   /* mark the non-aligned area */

+   while ( ptr < buf - sizeof(void *) ) {

+      *(unsigned long *)ptr = 0xcdcdcdcd;

+      ptr += sizeof(unsigned long);

+   }

+#endif

+

+   return (void *)buf;

+#endif /* defined(HAVE_POSIX_MEMALIGN) */

+}

+

+/**

+ * Free memory which was allocated with either _mesa_align_malloc()

+ * or _mesa_align_calloc().

+ * \param ptr pointer to the memory to be freed.

+ * The actual address to free is stored in the word immediately before the

+ * address the client sees.

+ */

+void

+_mesa_align_free(void *ptr)

+{

+#if defined(HAVE_POSIX_MEMALIGN)

+   free(ptr);

+#elif defined(_WIN32) && defined(_MSC_VER)

+   _aligned_free(ptr);

+#else

+   void **cubbyHole = (void **) ((char *) ptr - sizeof(void *));

+   void *realAddr = *cubbyHole;

+   free(realAddr);

+#endif /* defined(HAVE_POSIX_MEMALIGN) */

+}

+

+/**

+ * Reallocate memory, with alignment.

+ */

+void *

+_mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize,

+                    unsigned long alignment)

+{

+#if defined(_WIN32) && defined(_MSC_VER)

+   (void) oldSize;

+   return _aligned_realloc(oldBuffer, newSize, alignment);

+#else

+   const size_t copySize = (oldSize < newSize) ? oldSize : newSize;

+   void *newBuf = _mesa_align_malloc(newSize, alignment);

+   if (newBuf && oldBuffer && copySize > 0) {

+      memcpy(newBuf, oldBuffer, copySize);

+   }

+   if (oldBuffer)

+      _mesa_align_free(oldBuffer);

+   return newBuf;

+#endif

+}

+

+

+

+/** Reallocate memory */

+void *

+_mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)

+{

+   const size_t copySize = (oldSize < newSize) ? oldSize : newSize;

+   void *newBuffer = malloc(newSize);

+   if (newBuffer && oldBuffer && copySize > 0)

+      memcpy(newBuffer, oldBuffer, copySize);

+   if (oldBuffer)

+      free(oldBuffer);

+   return newBuffer;

+}

+

+/**

+ * Fill memory with a constant 16bit word.

+ * \param dst destination pointer.

+ * \param val value.

+ * \param n number of words.

+ */

+void

+_mesa_memset16( unsigned short *dst, unsigned short val, size_t n )

+{

+   while (n-- > 0)

+      *dst++ = val;

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Math */

+/*@{*/

+

+/** Wrapper around sqrt() */

+double

+_mesa_sqrtd(double x)

+{

+   return sqrt(x);

+}

+

+

+/*

+ * A High Speed, Low Precision Square Root

+ * by Paul Lalonde and Robert Dawson

+ * from "Graphics Gems", Academic Press, 1990

+ *

+ * SPARC implementation of a fast square root by table

+ * lookup.

+ * SPARC floating point format is as follows:

+ *

+ * BIT 31 	30 	23 	22 	0

+ *     sign	exponent	mantissa

+ */

+static short sqrttab[0x100];    /* declare table of square roots */

+

+void

+_mesa_init_sqrt_table(void)

+{

+#if defined(USE_IEEE) && !defined(DEBUG)

+   unsigned short i;

+   fi_type fi;     /* to access the bits of a float in  C quickly  */

+                   /* we use a union defined in glheader.h         */

+

+   for(i=0; i<= 0x7f; i++) {

+      fi.i = 0;

+

+      /*

+       * Build a float with the bit pattern i as mantissa

+       * and an exponent of 0, stored as 127

+       */

+

+      fi.i = (i << 16) | (127 << 23);

+      fi.f = _mesa_sqrtd(fi.f);

+

+      /*

+       * Take the square root then strip the first 7 bits of

+       * the mantissa into the table

+       */

+

+      sqrttab[i] = (fi.i & 0x7fffff) >> 16;

+

+      /*

+       * Repeat the process, this time with an exponent of

+       * 1, stored as 128

+       */

+

+      fi.i = 0;

+      fi.i = (i << 16) | (128 << 23);

+      fi.f = sqrt(fi.f);

+      sqrttab[i+0x80] = (fi.i & 0x7fffff) >> 16;

+   }

+#else

+   (void) sqrttab;  /* silence compiler warnings */

+#endif /*HAVE_FAST_MATH*/

+}

+

+

+/**

+ * Single precision square root.

+ */

+float

+_mesa_sqrtf( float x )

+{

+#if defined(USE_IEEE) && !defined(DEBUG)

+   fi_type num;

+                                /* to access the bits of a float in C

+                                 * we use a union from glheader.h     */

+

+   short e;                     /* the exponent */

+   if (x == 0.0F) return 0.0F;  /* check for square root of 0 */

+   num.f = x;

+   e = (num.i >> 23) - 127;     /* get the exponent - on a SPARC the */

+                                /* exponent is stored with 127 added */

+   num.i &= 0x7fffff;           /* leave only the mantissa */

+   if (e & 0x01) num.i |= 0x800000;

+                                /* the exponent is odd so we have to */

+                                /* look it up in the second half of  */

+                                /* the lookup table, so we set the   */

+                                /* high bit                                */

+   e >>= 1;                     /* divide the exponent by two */

+                                /* note that in C the shift */

+                                /* operators are sign preserving */

+                                /* for signed operands */

+   /* Do the table lookup, based on the quaternary mantissa,

+    * then reconstruct the result back into a float

+    */

+   num.i = ((sqrttab[num.i >> 16]) << 16) | ((e + 127) << 23);

+

+   return num.f;

+#else

+   return (float) _mesa_sqrtd((double) x);

+#endif

+}

+

+

+/**

+ inv_sqrt - A single precision 1/sqrt routine for IEEE format floats.

+ written by Josh Vanderhoof, based on newsgroup posts by James Van Buskirk

+ and Vesa Karvonen.

+*/

+float

+_mesa_inv_sqrtf(float n)

+{

+#if defined(USE_IEEE) && !defined(DEBUG)

+        float r0, x0, y0;

+        float r1, x1, y1;

+        float r2, x2, y2;

+#if 0 /* not used, see below -BP */

+        float r3, x3, y3;

+#endif

+        fi_type u;

+        unsigned int magic;

+

+        /*

+         Exponent part of the magic number -

+

+         We want to:

+         1. subtract the bias from the exponent,

+         2. negate it

+         3. divide by two (rounding towards -inf)

+         4. add the bias back

+

+         Which is the same as subtracting the exponent from 381 and dividing

+         by 2.

+

+         floor(-(x - 127) / 2) + 127 = floor((381 - x) / 2)

+        */

+

+        magic = 381 << 23;

+

+        /*

+         Significand part of magic number -

+

+         With the current magic number, "(magic - u.i) >> 1" will give you:

+

+         for 1 <= u.f <= 2: 1.25 - u.f / 4

+         for 2 <= u.f <= 4: 1.00 - u.f / 8

+

+         This isn't a bad approximation of 1/sqrt.  The maximum difference from

+         1/sqrt will be around .06.  After three Newton-Raphson iterations, the

+         maximum difference is less than 4.5e-8.  (Which is actually close

+         enough to make the following bias academic...)

+

+         To get a better approximation you can add a bias to the magic

+         number.  For example, if you subtract 1/2 of the maximum difference in

+         the first approximation (.03), you will get the following function:

+

+         for 1 <= u.f <= 2:    1.22 - u.f / 4

+         for 2 <= u.f <= 3.76: 0.97 - u.f / 8

+         for 3.76 <= u.f <= 4: 0.72 - u.f / 16

+         (The 3.76 to 4 range is where the result is < .5.)

+

+         This is the closest possible initial approximation, but with a maximum

+         error of 8e-11 after three NR iterations, it is still not perfect.  If

+         you subtract 0.0332281 instead of .03, the maximum error will be

+         2.5e-11 after three NR iterations, which should be about as close as

+         is possible.

+

+         for 1 <= u.f <= 2:    1.2167719 - u.f / 4

+         for 2 <= u.f <= 3.73: 0.9667719 - u.f / 8

+         for 3.73 <= u.f <= 4: 0.7167719 - u.f / 16

+

+        */

+

+        magic -= (int)(0.0332281 * (1 << 25));

+

+        u.f = n;

+        u.i = (magic - u.i) >> 1;

+

+        /*

+         Instead of Newton-Raphson, we use Goldschmidt's algorithm, which

+         allows more parallelism.  From what I understand, the parallelism

+         comes at the cost of less precision, because it lets error

+         accumulate across iterations.

+        */

+        x0 = 1.0f;

+        y0 = 0.5f * n;

+        r0 = u.f;

+

+        x1 = x0 * r0;

+        y1 = y0 * r0 * r0;

+        r1 = 1.5f - y1;

+

+        x2 = x1 * r1;

+        y2 = y1 * r1 * r1;

+        r2 = 1.5f - y2;

+

+#if 1

+        return x2 * r2;  /* we can stop here, and be conformant -BP */

+#else

+        x3 = x2 * r2;

+        y3 = y2 * r2 * r2;

+        r3 = 1.5f - y3;

+

+        return x3 * r3;

+#endif

+#else

+        return (float) (1.0 / sqrt(n));

+#endif

+}

+

+/**

+ * Find the first bit set in a word.

+ */

+int

+_mesa_ffs(int32_t i)

+{

+#if (defined(_WIN32) ) || defined(__IBMC__) || defined(__IBMCPP__)

+   register int bit = 0;

+   if (i != 0) {

+      if ((i & 0xffff) == 0) {

+         bit += 16;

+         i >>= 16;

+      }

+      if ((i & 0xff) == 0) {

+         bit += 8;

+         i >>= 8;

+      }

+      if ((i & 0xf) == 0) {

+         bit += 4;

+         i >>= 4;

+      }

+      while ((i & 1) == 0) {

+         bit++;

+         i >>= 1;

+      }

+      bit++;

+   }

+   return bit;

+#else

+   return ffs(i);

+#endif

+}

+

+

+/**

+ * Find position of first bit set in given value.

+ * XXX Warning: this function can only be used on 64-bit systems!

+ * \return  position of least-significant bit set, starting at 1, return zero

+ *          if no bits set.

+ */

+int

+_mesa_ffsll(int64_t val)

+{

+#ifdef ffsll

+   return ffsll(val);

+#else

+   int bit;

+

+   assert(sizeof(val) == 8);

+

+   bit = _mesa_ffs((int32_t)val);

+   if (bit != 0)

+      return bit;

+

+   bit = _mesa_ffs((int32_t)(val >> 32));

+   if (bit != 0)

+      return 32 + bit;

+

+   return 0;

+#endif

+}

+

+

+/**

+ * Return number of bits set in given GLuint.

+ */

+unsigned int

+_mesa_bitcount(unsigned int n)

+{

+#if defined(__GNUC__) && \

+	((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)

+   return __builtin_popcount(n);

+#else

+   unsigned int bits;

+   for (bits = 0; n > 0; n = n >> 1) {

+      bits += (n & 1);

+   }

+   return bits;

+#endif

+}

+

+

+/**

+ * Convert a 4-byte float to a 2-byte half float.

+ * Based on code from:

+ * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html

+ */

+GLhalfARB

+_mesa_float_to_half(float val)

+{

+   const fi_type fi = {val};

+   const int flt_m = fi.i & 0x7fffff;

+   const int flt_e = (fi.i >> 23) & 0xff;

+   const int flt_s = (fi.i >> 31) & 0x1;

+   int s, e, m = 0;

+   GLhalfARB result;

+   

+   /* sign bit */

+   s = flt_s;

+

+   /* handle special cases */

+   if ((flt_e == 0) && (flt_m == 0)) {

+      /* zero */

+      /* m = 0; - already set */

+      e = 0;

+   }

+   else if ((flt_e == 0) && (flt_m != 0)) {

+      /* denorm -- denorm float maps to 0 half */

+      /* m = 0; - already set */

+      e = 0;

+   }

+   else if ((flt_e == 0xff) && (flt_m == 0)) {

+      /* infinity */

+      /* m = 0; - already set */

+      e = 31;

+   }

+   else if ((flt_e == 0xff) && (flt_m != 0)) {

+      /* NaN */

+      m = 1;

+      e = 31;

+   }

+   else {

+      /* regular number */

+      const int new_exp = flt_e - 127;

+      if (new_exp < -24) {

+         /* this maps to 0 */

+         /* m = 0; - already set */

+         e = 0;

+      }

+      else if (new_exp < -14) {

+         /* this maps to a denorm */

+         unsigned int exp_val = (unsigned int) (-14 - new_exp); /* 2^-exp_val*/

+         e = 0;

+         switch (exp_val) {

+            case 0:

+               _mesa_warning(NULL,

+                   "float_to_half: logical error in denorm creation!\n");

+               /* m = 0; - already set */

+               break;

+            case 1: m = 512 + (flt_m >> 14); break;

+            case 2: m = 256 + (flt_m >> 15); break;

+            case 3: m = 128 + (flt_m >> 16); break;

+            case 4: m = 64 + (flt_m >> 17); break;

+            case 5: m = 32 + (flt_m >> 18); break;

+            case 6: m = 16 + (flt_m >> 19); break;

+            case 7: m = 8 + (flt_m >> 20); break;

+            case 8: m = 4 + (flt_m >> 21); break;

+            case 9: m = 2 + (flt_m >> 22); break;

+            case 10: m = 1; break;

+         }

+      }

+      else if (new_exp > 15) {

+         /* map this value to infinity */

+         /* m = 0; - already set */

+         e = 31;

+      }

+      else {

+         /* regular */

+         e = new_exp + 15;

+         m = flt_m >> 13;

+      }

+   }

+

+   result = (s << 15) | (e << 10) | m;

+   return result;

+}

+

+

+/**

+ * Convert a 2-byte half float to a 4-byte float.

+ * Based on code from:

+ * http://www.opengl.org/discussion_boards/ubb/Forum3/HTML/008786.html

+ */

+float

+_mesa_half_to_float(GLhalfARB val)

+{

+   /* XXX could also use a 64K-entry lookup table */

+   const int m = val & 0x3ff;

+   const int e = (val >> 10) & 0x1f;

+   const int s = (val >> 15) & 0x1;

+   int flt_m, flt_e, flt_s;

+   fi_type fi;

+   float result;

+

+   /* sign bit */

+   flt_s = s;

+

+   /* handle special cases */

+   if ((e == 0) && (m == 0)) {

+      /* zero */

+      flt_m = 0;

+      flt_e = 0;

+   }

+   else if ((e == 0) && (m != 0)) {

+      /* denorm -- denorm half will fit in non-denorm single */

+      const float half_denorm = 1.0f / 16384.0f; /* 2^-14 */

+      float mantissa = ((float) (m)) / 1024.0f;

+      float sign = s ? -1.0f : 1.0f;

+      return sign * mantissa * half_denorm;

+   }

+   else if ((e == 31) && (m == 0)) {

+      /* infinity */

+      flt_e = 0xff;

+      flt_m = 0;

+   }

+   else if ((e == 31) && (m != 0)) {

+      /* NaN */

+      flt_e = 0xff;

+      flt_m = 1;

+   }

+   else {

+      /* regular */

+      flt_e = e + 112;

+      flt_m = m << 13;

+   }

+

+   fi.i = (flt_s << 31) | (flt_e << 23) | flt_m;

+   result = fi.f;

+   return result;

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Sort & Search */

+/*@{*/

+

+/**

+ * Wrapper for bsearch().

+ */

+void *

+_mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size, 

+               int (*compar)(const void *, const void *) )

+{

+#if defined(_WIN32_WCE)

+   void *mid;

+   int cmp;

+   while (nmemb) {

+      nmemb >>= 1;

+      mid = (char *)base + nmemb * size;

+      cmp = (*compar)(key, mid);

+      if (cmp == 0)

+	 return mid;

+      if (cmp > 0) {

+	 base = (char *)mid + size;

+	 --nmemb;

+      }

+   }

+   return NULL;

+#else

+   return bsearch(key, base, nmemb, size, compar);

+#endif

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Environment vars */

+/*@{*/

+

+/**

+ * Wrapper for getenv().

+ */

+char *

+_mesa_getenv( const char *var )

+{

+#if defined(_XBOX) || defined(_WIN32_WCE)

+   return NULL;

+#else

+   return getenv(var);

+#endif

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name String */

+/*@{*/

+

+/**

+ * Implemented using malloc() and strcpy.

+ * Note that NULL is handled accordingly.

+ */

+char *

+_mesa_strdup( const char *s )

+{

+   if (s) {

+      size_t l = strlen(s);

+      char *s2 = (char *) malloc(l + 1);

+      if (s2)

+         strcpy(s2, s);

+      return s2;

+   }

+   else {

+      return NULL;

+   }

+}

+

+/** Wrapper around strtof() */

+float

+_mesa_strtof( const char *s, char **end )

+{

+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)

+   static locale_t loc = NULL;

+   if (!loc) {

+      loc = newlocale(LC_CTYPE_MASK, "C", NULL);

+   }

+   return strtof_l(s, end, loc);

+#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)

+   return strtof(s, end);

+#else

+   return (float)strtod(s, end);

+#endif

+}

+

+/** Compute simple checksum/hash for a string */

+unsigned int

+_mesa_str_checksum(const char *str)

+{

+   /* This could probably be much better */

+   unsigned int sum, i;

+   const char *c;

+   sum = i = 1;

+   for (c = str; *c; c++, i++)

+      sum += *c * (i % 100);

+   return sum + i;

+}

+

+

+/*@}*/

+

+

+/** Wrapper around vsnprintf() */

+int

+_mesa_snprintf( char *str, size_t size, const char *fmt, ... )

+{

+   int r;

+   va_list args;

+   va_start( args, fmt );  

+   r = vsnprintf( str, size, fmt, args );

+   va_end( args );

+   return r;

+}

+

+

+/**********************************************************************/

+/** \name Diagnostics */

+/*@{*/

+

+static void

+output_if_debug(const char *prefixString, const char *outputString,

+                GLboolean newline)

+{

+   static int debug = -1;

+

+   /* Check the MESA_DEBUG environment variable if it hasn't

+    * been checked yet.  We only have to check it once...

+    */

+   if (debug == -1) {

+      char *env = _mesa_getenv("MESA_DEBUG");

+

+      /* In a debug build, we print warning messages *unless*

+       * MESA_DEBUG is 0.  In a non-debug build, we don't

+       * print warning messages *unless* MESA_DEBUG is

+       * set *to any value*.

+       */

+#ifdef DEBUG

+      debug = (env != NULL && atoi(env) == 0) ? 0 : 1;

+#else

+      debug = (env != NULL) ? 1 : 0;

+#endif

+   }

+

+   /* Now only print the string if we're required to do so. */

+   if (debug) {

+      fprintf(stderr, "%s: %s", prefixString, outputString);

+      if (newline)

+         fprintf(stderr, "\n");

+

+#if defined(_WIN32) && !defined(_WIN32_WCE)

+      /* stderr from windows applications without console is not usually 

+       * visible, so communicate with the debugger instead */ 

+      {

+         char buf[4096];

+         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");

+         OutputDebugStringA(buf);

+      }

+#endif

+   }

+}

+

+

+/**

+ * Return string version of GL error code.

+ */

+static const char *

+error_string( GLenum error )

+{

+   switch (error) {

+   case GL_NO_ERROR:

+      return "GL_NO_ERROR";

+   case GL_INVALID_VALUE:

+      return "GL_INVALID_VALUE";

+   case GL_INVALID_ENUM:

+      return "GL_INVALID_ENUM";

+   case GL_INVALID_OPERATION:

+      return "GL_INVALID_OPERATION";

+   case GL_STACK_OVERFLOW:

+      return "GL_STACK_OVERFLOW";

+   case GL_STACK_UNDERFLOW:

+      return "GL_STACK_UNDERFLOW";

+   case GL_OUT_OF_MEMORY:

+      return "GL_OUT_OF_MEMORY";

+   case GL_TABLE_TOO_LARGE:

+      return "GL_TABLE_TOO_LARGE";

+   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:

+      return "GL_INVALID_FRAMEBUFFER_OPERATION";

+   default:

+      return "unknown";

+   }

+}

+

+

+/**

+ * When a new type of error is recorded, print a message describing

+ * previous errors which were accumulated.

+ */

+static void

+flush_delayed_errors( struct gl_context *ctx )

+{

+   char s[MAXSTRING];

+

+   if (ctx->ErrorDebugCount) {

+      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 

+                     ctx->ErrorDebugCount,

+                     error_string(ctx->ErrorValue));

+

+      output_if_debug("Mesa", s, GL_TRUE);

+

+      ctx->ErrorDebugCount = 0;

+   }

+}

+

+

+/**

+ * Report a warning (a recoverable error condition) to stderr if

+ * either DEBUG is defined or the MESA_DEBUG env var is set.

+ *

+ * \param ctx GL context.

+ * \param fmtString printf()-like format string.

+ */

+void

+_mesa_warning( struct gl_context *ctx, const char *fmtString, ... )

+{

+   char str[MAXSTRING];

+   va_list args;

+   va_start( args, fmtString );  

+   (void) vsnprintf( str, MAXSTRING, fmtString, args );

+   va_end( args );

+   

+   if (ctx)

+      flush_delayed_errors( ctx );

+

+   output_if_debug("Mesa warning", str, GL_TRUE);

+}

+

+

+/**

+ * Report an internal implementation problem.

+ * Prints the message to stderr via fprintf().

+ *

+ * \param ctx GL context.

+ * \param fmtString problem description string.

+ */

+void

+_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )

+{

+   va_list args;

+   char str[MAXSTRING];

+   (void) ctx;

+

+   va_start( args, fmtString );  

+   vsnprintf( str, MAXSTRING, fmtString, args );

+   va_end( args );

+

+   fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);

+   fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");

+}

+

+

+/**

+ * Record an OpenGL state error.  These usually occur when the user

+ * passes invalid parameters to a GL function.

+ *

+ * If debugging is enabled (either at compile-time via the DEBUG macro, or

+ * run-time via the MESA_DEBUG environment variable), report the error with

+ * _mesa_debug().

+ * 

+ * \param ctx the GL context.

+ * \param error the error value.

+ * \param fmtString printf() style format string, followed by optional args

+ */

+void

+_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... )

+{

+   static GLint debug = -1;

+

+   /* Check debug environment variable only once:

+    */

+   if (debug == -1) {

+      const char *debugEnv = _mesa_getenv("MESA_DEBUG");

+

+#ifdef DEBUG

+      if (debugEnv && strstr(debugEnv, "silent"))

+         debug = GL_FALSE;

+      else

+         debug = GL_TRUE;

+#else

+      if (debugEnv)

+         debug = GL_TRUE;

+      else

+         debug = GL_FALSE;

+#endif

+   }

+

+   if (debug) {      

+      if (ctx->ErrorValue == error &&

+          ctx->ErrorDebugFmtString == fmtString) {

+         ctx->ErrorDebugCount++;

+      }

+      else {

+         char s[MAXSTRING], s2[MAXSTRING];

+         va_list args;

+

+         flush_delayed_errors( ctx );

+         

+         va_start(args, fmtString);

+         vsnprintf(s, MAXSTRING, fmtString, args);

+         va_end(args);

+

+         _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);

+         output_if_debug("Mesa: User error", s2, GL_TRUE);

+         

+         ctx->ErrorDebugFmtString = fmtString;

+         ctx->ErrorDebugCount = 0;

+      }

+   }

+

+   _mesa_record_error(ctx, error);

+}

+

+

+/**

+ * Report debug information.  Print error message to stderr via fprintf().

+ * No-op if DEBUG mode not enabled.

+ * 

+ * \param ctx GL context.

+ * \param fmtString printf()-style format string, followed by optional args.

+ */

+void

+_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... )

+{

+#ifdef DEBUG

+   char s[MAXSTRING];

+   va_list args;

+   va_start(args, fmtString);

+   vsnprintf(s, MAXSTRING, fmtString, args);

+   va_end(args);

+   output_if_debug("Mesa", s, GL_FALSE);

+#endif /* DEBUG */

+   (void) ctx;

+   (void) fmtString;

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index 751f20650..af7a8cc00 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -1,594 +1,602 @@
-/*
- * 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))
-#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 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);
-
-extern int
-_mesa_ffs(int32_t i);
-
-extern int
-_mesa_ffsll(int64_t i);
-
-extern unsigned int
-_mesa_bitcount(unsigned int n);
-
-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);
-
-extern void
-_mesa_warning( __GLcontext *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-extern void
-_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-extern void
-_mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
-
-extern void
-_mesa_debug( const __GLcontext *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);

+

+extern int

+_mesa_ffs(int32_t i);

+

+extern int

+_mesa_ffsll(int64_t i);

+

+extern unsigned int

+_mesa_bitcount(unsigned int n);

+

+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/light.c b/mesalib/src/mesa/main/light.c
index 43ae28c25..888e5622e 100644
--- a/mesalib/src/mesa/main/light.c
+++ b/mesalib/src/mesa/main/light.c
@@ -1,1430 +1,1430 @@
-/*
- * 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 "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "enums.h"
-#include "light.h"
-#include "macros.h"
-#include "simple_list.h"
-#include "mtypes.h"
-#include "math/m_matrix.h"
-
-
-void GLAPIENTRY
-_mesa_ShadeModel( GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glShadeModel %s\n", _mesa_lookup_enum_by_nr(mode));
-
-   if (mode != GL_FLAT && mode != GL_SMOOTH) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glShadeModel");
-      return;
-   }
-
-   if (ctx->Light.ShadeModel == mode)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_LIGHT);
-   ctx->Light.ShadeModel = mode;
-   if (mode == GL_FLAT)
-      ctx->_TriangleCaps |= DD_FLATSHADE;
-   else
-      ctx->_TriangleCaps &= ~DD_FLATSHADE;
-
-   if (ctx->Driver.ShadeModel)
-      ctx->Driver.ShadeModel( ctx, mode );
-}
-
-
-/**
- * Set the provoking vertex (the vertex which specifies the prim's
- * color when flat shading) to either the first or last vertex of the
- * triangle or line.
- */
-void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glProvokingVertexEXT 0x%x\n", mode);
-
-   switch (mode) {
-   case GL_FIRST_VERTEX_CONVENTION_EXT:
-   case GL_LAST_VERTEX_CONVENTION_EXT:
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProvokingVertexEXT(0x%x)", mode);
-      return;
-   }
-
-   if (ctx->Light.ProvokingVertex == mode)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_LIGHT);
-   ctx->Light.ProvokingVertex = mode;
-}
-
-
-/**
- * Helper function called by _mesa_Lightfv and _mesa_PopAttrib to set
- * per-light state.
- * For GL_POSITION and GL_SPOT_DIRECTION the params position/direction
- * will have already been transformed by the modelview matrix!
- * Also, all error checking should have already been done.
- */
-void
-_mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
-{
-   struct gl_light *light;
-
-   ASSERT(lnum < MAX_LIGHTS);
-   light = &ctx->Light.Light[lnum];
-
-   switch (pname) {
-   case GL_AMBIENT:
-      if (TEST_EQ_4V(light->Ambient, params))
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      COPY_4V( light->Ambient, params );
-      break;
-   case GL_DIFFUSE:
-      if (TEST_EQ_4V(light->Diffuse, params))
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      COPY_4V( light->Diffuse, params );
-      break;
-   case GL_SPECULAR:
-      if (TEST_EQ_4V(light->Specular, params))
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      COPY_4V( light->Specular, params );
-      break;
-   case GL_POSITION:
-      /* NOTE: position has already been transformed by ModelView! */
-      if (TEST_EQ_4V(light->EyePosition, params))
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      COPY_4V(light->EyePosition, params);
-      if (light->EyePosition[3] != 0.0F)
-	 light->_Flags |= LIGHT_POSITIONAL;
-      else
-	 light->_Flags &= ~LIGHT_POSITIONAL;
-      break;
-   case GL_SPOT_DIRECTION:
-      /* NOTE: Direction already transformed by inverse ModelView! */
-      if (TEST_EQ_3V(light->SpotDirection, params))
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      COPY_3V(light->SpotDirection, params);
-      break;
-   case GL_SPOT_EXPONENT:
-      ASSERT(params[0] >= 0.0);
-      ASSERT(params[0] <= ctx->Const.MaxSpotExponent);
-      if (light->SpotExponent == params[0])
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      light->SpotExponent = params[0];
-      _mesa_invalidate_spot_exp_table(light);
-      break;
-   case GL_SPOT_CUTOFF:
-      ASSERT(params[0] == 180.0 || (params[0] >= 0.0 && params[0] <= 90.0));
-      if (light->SpotCutoff == params[0])
-         return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      light->SpotCutoff = params[0];
-      light->_CosCutoffNeg = (GLfloat) (cos(light->SpotCutoff * DEG2RAD));
-      if (light->_CosCutoffNeg < 0)
-         light->_CosCutoff = 0;
-      else
-         light->_CosCutoff = light->_CosCutoffNeg;
-      if (light->SpotCutoff != 180.0F)
-         light->_Flags |= LIGHT_SPOT;
-      else
-         light->_Flags &= ~LIGHT_SPOT;
-      break;
-   case GL_CONSTANT_ATTENUATION:
-      ASSERT(params[0] >= 0.0);
-      if (light->ConstantAttenuation == params[0])
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      light->ConstantAttenuation = params[0];
-      break;
-   case GL_LINEAR_ATTENUATION:
-      ASSERT(params[0] >= 0.0);
-      if (light->LinearAttenuation == params[0])
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      light->LinearAttenuation = params[0];
-      break;
-   case GL_QUADRATIC_ATTENUATION:
-      ASSERT(params[0] >= 0.0);
-      if (light->QuadraticAttenuation == params[0])
-	 return;
-      FLUSH_VERTICES(ctx, _NEW_LIGHT);
-      light->QuadraticAttenuation = params[0];
-      break;
-   default:
-      _mesa_problem(ctx, "Unexpected pname in _mesa_light()");
-      return;
-   }
-
-   if (ctx->Driver.Lightfv)
-      ctx->Driver.Lightfv( ctx, GL_LIGHT0 + lnum, pname, params );
-}
-
-
-void GLAPIENTRY
-_mesa_Lightf( GLenum light, GLenum pname, GLfloat param )
-{
-   GLfloat fparam[4];
-   fparam[0] = param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   _mesa_Lightfv( light, pname, fparam );
-}
-
-
-void GLAPIENTRY
-_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i = (GLint) (light - GL_LIGHT0);
-   GLfloat temp[4];
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (i < 0 || i >= (GLint) ctx->Const.MaxLights) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glLight(light=0x%x)", light );
-      return;
-   }
-
-   /* do particular error checks, transformations */
-   switch (pname) {
-   case GL_AMBIENT:
-   case GL_DIFFUSE:
-   case GL_SPECULAR:
-      /* nothing */
-      break;
-   case GL_POSITION:
-      /* transform position by ModelView matrix */
-      TRANSFORM_POINT(temp, ctx->ModelviewMatrixStack.Top->m, params);
-      params = temp;
-      break;
-   case GL_SPOT_DIRECTION:
-      /* transform direction by inverse modelview */
-      if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {
-	 _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);
-      }
-      TRANSFORM_DIRECTION(temp, params, ctx->ModelviewMatrixStack.Top->m);
-      params = temp;
-      break;
-   case GL_SPOT_EXPONENT:
-      if (params[0] < 0.0 || params[0] > ctx->Const.MaxSpotExponent) {
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");
-	 return;
-      }
-      break;
-   case GL_SPOT_CUTOFF:
-      if ((params[0] < 0.0 || params[0] > 90.0) && params[0] != 180.0) {
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");
-	 return;
-      }
-      break;
-   case GL_CONSTANT_ATTENUATION:
-      if (params[0] < 0.0) {
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");
-	 return;
-      }
-      break;
-   case GL_LINEAR_ATTENUATION:
-      if (params[0] < 0.0) {
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");
-	 return;
-      }
-      break;
-   case GL_QUADRATIC_ATTENUATION:
-      if (params[0] < 0.0) {
-	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");
-	 return;
-      }
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glLight(pname=0x%x)", pname);
-      return;
-   }
-
-   _mesa_light(ctx, i, pname, params);
-}
-
-
-void GLAPIENTRY
-_mesa_Lighti( GLenum light, GLenum pname, GLint param )
-{
-   GLint iparam[4];
-   iparam[0] = param;
-   iparam[1] = iparam[2] = iparam[3] = 0;
-   _mesa_Lightiv( light, pname, iparam );
-}
-
-
-void GLAPIENTRY
-_mesa_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 */
-         ;
-   }
-
-   _mesa_Lightfv( light, pname, fparam );
-}
-
-
-
-void GLAPIENTRY
-_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint l = (GLint) (light - GL_LIGHT0);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (l < 0 || l >= (GLint) ctx->Const.MaxLights) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
-      return;
-   }
-
-   switch (pname) {
-      case GL_AMBIENT:
-         COPY_4V( params, ctx->Light.Light[l].Ambient );
-         break;
-      case GL_DIFFUSE:
-         COPY_4V( params, ctx->Light.Light[l].Diffuse );
-         break;
-      case GL_SPECULAR:
-         COPY_4V( params, ctx->Light.Light[l].Specular );
-         break;
-      case GL_POSITION:
-         COPY_4V( params, ctx->Light.Light[l].EyePosition );
-         break;
-      case GL_SPOT_DIRECTION:
-         COPY_3V( params, ctx->Light.Light[l].SpotDirection );
-         break;
-      case GL_SPOT_EXPONENT:
-         params[0] = ctx->Light.Light[l].SpotExponent;
-         break;
-      case GL_SPOT_CUTOFF:
-         params[0] = ctx->Light.Light[l].SpotCutoff;
-         break;
-      case GL_CONSTANT_ATTENUATION:
-         params[0] = ctx->Light.Light[l].ConstantAttenuation;
-         break;
-      case GL_LINEAR_ATTENUATION:
-         params[0] = ctx->Light.Light[l].LinearAttenuation;
-         break;
-      case GL_QUADRATIC_ATTENUATION:
-         params[0] = ctx->Light.Light[l].QuadraticAttenuation;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );
-         break;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint l = (GLint) (light - GL_LIGHT0);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (l < 0 || l >= (GLint) ctx->Const.MaxLights) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
-      return;
-   }
-
-   switch (pname) {
-      case GL_AMBIENT:
-         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[0]);
-         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[1]);
-         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[2]);
-         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[3]);
-         break;
-      case GL_DIFFUSE:
-         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[0]);
-         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[1]);
-         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[2]);
-         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[3]);
-         break;
-      case GL_SPECULAR:
-         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[0]);
-         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[1]);
-         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[2]);
-         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[3]);
-         break;
-      case GL_POSITION:
-         params[0] = (GLint) ctx->Light.Light[l].EyePosition[0];
-         params[1] = (GLint) ctx->Light.Light[l].EyePosition[1];
-         params[2] = (GLint) ctx->Light.Light[l].EyePosition[2];
-         params[3] = (GLint) ctx->Light.Light[l].EyePosition[3];
-         break;
-      case GL_SPOT_DIRECTION:
-         params[0] = (GLint) ctx->Light.Light[l].SpotDirection[0];
-         params[1] = (GLint) ctx->Light.Light[l].SpotDirection[1];
-         params[2] = (GLint) ctx->Light.Light[l].SpotDirection[2];
-         break;
-      case GL_SPOT_EXPONENT:
-         params[0] = (GLint) ctx->Light.Light[l].SpotExponent;
-         break;
-      case GL_SPOT_CUTOFF:
-         params[0] = (GLint) ctx->Light.Light[l].SpotCutoff;
-         break;
-      case GL_CONSTANT_ATTENUATION:
-         params[0] = (GLint) ctx->Light.Light[l].ConstantAttenuation;
-         break;
-      case GL_LINEAR_ATTENUATION:
-         params[0] = (GLint) ctx->Light.Light[l].LinearAttenuation;
-         break;
-      case GL_QUADRATIC_ATTENUATION:
-         params[0] = (GLint) ctx->Light.Light[l].QuadraticAttenuation;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );
-         break;
-   }
-}
-
-
-
-/**********************************************************************/
-/***                        Light Model                             ***/
-/**********************************************************************/
-
-
-void GLAPIENTRY
-_mesa_LightModelfv( GLenum pname, const GLfloat *params )
-{
-   GLenum newenum;
-   GLboolean newbool;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (pname) {
-      case GL_LIGHT_MODEL_AMBIENT:
-         if (TEST_EQ_4V( ctx->Light.Model.Ambient, params ))
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
-         COPY_4V( ctx->Light.Model.Ambient, params );
-         break;
-      case GL_LIGHT_MODEL_LOCAL_VIEWER:
-         newbool = (params[0]!=0.0);
-	 if (ctx->Light.Model.LocalViewer == newbool)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
-	 ctx->Light.Model.LocalViewer = newbool;
-         break;
-      case GL_LIGHT_MODEL_TWO_SIDE:
-         newbool = (params[0]!=0.0);
-	 if (ctx->Light.Model.TwoSide == newbool)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
-	 ctx->Light.Model.TwoSide = newbool;
-         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
-            ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
-         else
-            ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
-         break;
-      case GL_LIGHT_MODEL_COLOR_CONTROL:
-         if (params[0] == (GLfloat) GL_SINGLE_COLOR)
-	    newenum = GL_SINGLE_COLOR;
-         else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR)
-	    newenum = GL_SEPARATE_SPECULAR_COLOR;
-	 else {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(param=0x0%x)",
-                         (GLint) params[0] );
-	    return;
-         }
-	 if (ctx->Light.Model.ColorControl == newenum)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
-	 ctx->Light.Model.ColorControl = newenum;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(pname=0x%x)", pname );
-         break;
-   }
-
-   if (ctx->Driver.LightModelfv)
-      ctx->Driver.LightModelfv( ctx, pname, params );
-}
-
-
-void GLAPIENTRY
-_mesa_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];
-         break;
-      default:
-         /* Error will be caught later in gl_LightModelfv */
-         ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F);
-   }
-   _mesa_LightModelfv( pname, fparam );
-}
-
-
-void GLAPIENTRY
-_mesa_LightModeli( GLenum pname, GLint param )
-{
-   GLint iparam[4];
-   iparam[0] = param;
-   iparam[1] = iparam[2] = iparam[3] = 0;
-   _mesa_LightModeliv( pname, iparam );
-}
-
-
-void GLAPIENTRY
-_mesa_LightModelf( GLenum pname, GLfloat param )
-{
-   GLfloat fparam[4];
-   fparam[0] = param;
-   fparam[1] = fparam[2] = fparam[3] = 0.0F;
-   _mesa_LightModelfv( pname, fparam );
-}
-
-
-
-/********** MATERIAL **********/
-
-
-/*
- * Given a face and pname value (ala glColorMaterial), compute a bitmask
- * of the targeted material values.
- */
-GLuint
-_mesa_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
-                        GLuint legal, const char *where )
-{
-   GLuint bitmask = 0;
-
-   /* Make a bitmask indicating what material attribute(s) we're updating */
-   switch (pname) {
-      case GL_EMISSION:
-         bitmask |= MAT_BIT_FRONT_EMISSION | MAT_BIT_BACK_EMISSION;
-         break;
-      case GL_AMBIENT:
-         bitmask |= MAT_BIT_FRONT_AMBIENT | MAT_BIT_BACK_AMBIENT;
-         break;
-      case GL_DIFFUSE:
-         bitmask |= MAT_BIT_FRONT_DIFFUSE | MAT_BIT_BACK_DIFFUSE;
-         break;
-      case GL_SPECULAR:
-         bitmask |= MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_SPECULAR;
-         break;
-      case GL_SHININESS:
-         bitmask |= MAT_BIT_FRONT_SHININESS | MAT_BIT_BACK_SHININESS;
-         break;
-      case GL_AMBIENT_AND_DIFFUSE:
-         bitmask |= MAT_BIT_FRONT_AMBIENT | MAT_BIT_BACK_AMBIENT;
-         bitmask |= MAT_BIT_FRONT_DIFFUSE | MAT_BIT_BACK_DIFFUSE;
-         break;
-      case GL_COLOR_INDEXES:
-         bitmask |= MAT_BIT_FRONT_INDEXES  | MAT_BIT_BACK_INDEXES;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );
-         return 0;
-   }
-
-   if (face==GL_FRONT) {
-      bitmask &= FRONT_MATERIAL_BITS;
-   }
-   else if (face==GL_BACK) {
-      bitmask &= BACK_MATERIAL_BITS;
-   }
-   else if (face != GL_FRONT_AND_BACK) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );
-      return 0;
-   }
-
-   if (bitmask & ~legal) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );
-      return 0;
-   }
-
-   return bitmask;
-}
-
-
-
-/* Perform a straight copy between materials.
- */
-void
-_mesa_copy_materials( struct gl_material *dst,
-                      const struct gl_material *src,
-                      GLuint bitmask )
-{
-   int i;
-
-   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
-      if (bitmask & (1<<i))
-	 COPY_4FV( dst->Attrib[i], src->Attrib[i] );
-}
-
-
-
-/* Update derived values following a change in ctx->Light.Material
- */
-void
-_mesa_update_material( GLcontext *ctx, GLuint bitmask )
-{
-   struct gl_light *light, *list = &ctx->Light.EnabledList;
-   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
-
-   if (MESA_VERBOSE & VERBOSE_MATERIAL) 
-      _mesa_debug(ctx, "_mesa_update_material, mask 0x%x\n", bitmask);
-
-   if (!bitmask)
-      return;
-
-   /* update material ambience */
-   if (bitmask & MAT_BIT_FRONT_AMBIENT) {
-      foreach (light, list) {
-         SCALE_3V( light->_MatAmbient[0], light->Ambient, 
-		   mat[MAT_ATTRIB_FRONT_AMBIENT]);
-      }
-   }
-
-   if (bitmask & MAT_BIT_BACK_AMBIENT) {
-      foreach (light, list) {
-         SCALE_3V( light->_MatAmbient[1], light->Ambient, 
-		   mat[MAT_ATTRIB_BACK_AMBIENT]);
-      }
-   }
-
-   /* update BaseColor = emission + scene's ambience * material's ambience */
-   if (bitmask & (MAT_BIT_FRONT_EMISSION | MAT_BIT_FRONT_AMBIENT)) {
-      COPY_3V( ctx->Light._BaseColor[0], mat[MAT_ATTRIB_FRONT_EMISSION] );
-      ACC_SCALE_3V( ctx->Light._BaseColor[0], mat[MAT_ATTRIB_FRONT_AMBIENT],
-		    ctx->Light.Model.Ambient );
-   }
-
-   if (bitmask & (MAT_BIT_BACK_EMISSION | MAT_BIT_BACK_AMBIENT)) {
-      COPY_3V( ctx->Light._BaseColor[1], mat[MAT_ATTRIB_BACK_EMISSION] );
-      ACC_SCALE_3V( ctx->Light._BaseColor[1], mat[MAT_ATTRIB_BACK_AMBIENT],
-		    ctx->Light.Model.Ambient );
-   }
-
-   /* update material diffuse values */
-   if (bitmask & MAT_BIT_FRONT_DIFFUSE) {
-      foreach (light, list) {
-	 SCALE_3V( light->_MatDiffuse[0], light->Diffuse, 
-		   mat[MAT_ATTRIB_FRONT_DIFFUSE] );
-      }
-   }
-
-   if (bitmask & MAT_BIT_BACK_DIFFUSE) {
-      foreach (light, list) {
-	 SCALE_3V( light->_MatDiffuse[1], light->Diffuse, 
-		   mat[MAT_ATTRIB_BACK_DIFFUSE] );
-      }
-   }
-
-   /* update material specular values */
-   if (bitmask & MAT_BIT_FRONT_SPECULAR) {
-      foreach (light, list) {
-	 SCALE_3V( light->_MatSpecular[0], light->Specular, 
-		   mat[MAT_ATTRIB_FRONT_SPECULAR]);
-      }
-   }
-
-   if (bitmask & MAT_BIT_BACK_SPECULAR) {
-      foreach (light, list) {
-	 SCALE_3V( light->_MatSpecular[1], light->Specular,
-		   mat[MAT_ATTRIB_BACK_SPECULAR]);
-      }
-   }
-
-   if (bitmask & MAT_BIT_FRONT_SHININESS) {
-      _mesa_invalidate_shine_table( ctx, 0 );
-   }
-
-   if (bitmask & MAT_BIT_BACK_SHININESS) {
-      _mesa_invalidate_shine_table( ctx, 1 );
-   }
-}
-
-
-/*
- * Update the current materials from the given rgba color
- * according to the bitmask in ColorMaterialBitmask, which is
- * set by glColorMaterial().
- */
-void
-_mesa_update_color_material( GLcontext *ctx, const GLfloat color[4] )
-{
-   GLuint bitmask = ctx->Light.ColorMaterialBitmask;
-   struct gl_material *mat = &ctx->Light.Material;
-   int i;
-
-   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 
-      if (bitmask & (1<<i))
-	 COPY_4FV( mat->Attrib[i], color );
-
-   _mesa_update_material( ctx, bitmask );
-}
-
-
-void GLAPIENTRY
-_mesa_ColorMaterial( GLenum face, GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint bitmask;
-   GLuint legal = (MAT_BIT_FRONT_EMISSION | MAT_BIT_BACK_EMISSION |
-		   MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_SPECULAR |
-		   MAT_BIT_FRONT_DIFFUSE  | MAT_BIT_BACK_DIFFUSE  |
-		   MAT_BIT_FRONT_AMBIENT  | MAT_BIT_BACK_AMBIENT);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glColorMaterial %s %s\n",
-                  _mesa_lookup_enum_by_nr(face),
-                  _mesa_lookup_enum_by_nr(mode));
-
-   bitmask = _mesa_material_bitmask(ctx, face, mode, legal, "glColorMaterial");
-
-   if (ctx->Light.ColorMaterialBitmask == bitmask &&
-       ctx->Light.ColorMaterialFace == face &&
-       ctx->Light.ColorMaterialMode == mode)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_LIGHT);
-   ctx->Light.ColorMaterialBitmask = bitmask;
-   ctx->Light.ColorMaterialFace = face;
-   ctx->Light.ColorMaterialMode = mode;
-
-   if (ctx->Light.ColorMaterialEnabled) {
-      FLUSH_CURRENT( ctx, 0 );
-      _mesa_update_color_material(ctx,ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
-   }
-
-   if (ctx->Driver.ColorMaterial)
-      ctx->Driver.ColorMaterial( ctx, face, mode );
-}
-
-
-void GLAPIENTRY
-_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint f;
-   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */
-
-   FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */
-
-   if (face==GL_FRONT) {
-      f = 0;
-   }
-   else if (face==GL_BACK) {
-      f = 1;
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(face)" );
-      return;
-   }
-
-   switch (pname) {
-      case GL_AMBIENT:
-         COPY_4FV( params, mat[MAT_ATTRIB_AMBIENT(f)] );
-         break;
-      case GL_DIFFUSE:
-         COPY_4FV( params, mat[MAT_ATTRIB_DIFFUSE(f)] );
-	 break;
-      case GL_SPECULAR:
-         COPY_4FV( params, mat[MAT_ATTRIB_SPECULAR(f)] );
-	 break;
-      case GL_EMISSION:
-	 COPY_4FV( params, mat[MAT_ATTRIB_EMISSION(f)] );
-	 break;
-      case GL_SHININESS:
-	 *params = mat[MAT_ATTRIB_SHININESS(f)][0];
-	 break;
-      case GL_COLOR_INDEXES:
-	 params[0] = mat[MAT_ATTRIB_INDEXES(f)][0];
-	 params[1] = mat[MAT_ATTRIB_INDEXES(f)][1];
-	 params[2] = mat[MAT_ATTRIB_INDEXES(f)][2];
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint f;
-   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */
-
-   FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */
-
-   if (face==GL_FRONT) {
-      f = 0;
-   }
-   else if (face==GL_BACK) {
-      f = 1;
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialiv(face)" );
-      return;
-   }
-   switch (pname) {
-      case GL_AMBIENT:
-         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][0] );
-         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][1] );
-         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][2] );
-         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][3] );
-         break;
-      case GL_DIFFUSE:
-         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][0] );
-         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][1] );
-         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][2] );
-         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][3] );
-	 break;
-      case GL_SPECULAR:
-         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][0] );
-         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][1] );
-         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][2] );
-         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][3] );
-	 break;
-      case GL_EMISSION:
-         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][0] );
-         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][1] );
-         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][2] );
-         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][3] );
-	 break;
-      case GL_SHININESS:
-         *params = IROUND( mat[MAT_ATTRIB_SHININESS(f)][0] );
-	 break;
-      case GL_COLOR_INDEXES:
-	 params[0] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][0] );
-	 params[1] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][1] );
-	 params[2] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][2] );
-	 break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );
-   }
-}
-
-
-
-/**********************************************************************/
-/*****                  Lighting computation                      *****/
-/**********************************************************************/
-
-
-/*
- * Notes:
- *   When two-sided lighting is enabled we compute the color (or index)
- *   for both the front and back side of the primitive.  Then, when the
- *   orientation of the facet is later learned, we can determine which
- *   color (or index) to use for rendering.
- *
- *   KW: We now know orientation in advance and only shade for
- *       the side or sides which are actually required.
- *
- * Variables:
- *   n = normal vector
- *   V = vertex position
- *   P = light source position
- *   Pe = (0,0,0,1)
- *
- * Precomputed:
- *   IF P[3]==0 THEN
- *       // light at infinity
- *       IF local_viewer THEN
- *           _VP_inf_norm = unit vector from V to P      // Precompute
- *       ELSE
- *           // eye at infinity
- *           _h_inf_norm = Normalize( VP + <0,0,1> )     // Precompute
- *       ENDIF
- *   ENDIF
- *
- * Functions:
- *   Normalize( v ) = normalized vector v
- *   Magnitude( v ) = length of vector v
- */
-
-
-
-/*
- * Whenever the spotlight exponent for a light changes we must call
- * this function to recompute the exponent lookup table.
- */
-void
-_mesa_invalidate_spot_exp_table( struct gl_light *l )
-{
-   l->_SpotExpTable[0][0] = -1;
-}
-
-
-static void
-validate_spot_exp_table( struct gl_light *l )
-{
-   GLint i;
-   GLdouble exponent = l->SpotExponent;
-   GLdouble tmp = 0;
-   GLint clamp = 0;
-
-   l->_SpotExpTable[0][0] = 0.0;
-
-   for (i = EXP_TABLE_SIZE - 1; i > 0 ;i--) {
-      if (clamp == 0) {
-	 tmp = pow(i / (GLdouble) (EXP_TABLE_SIZE - 1), exponent);
-	 if (tmp < FLT_MIN * 100.0) {
-	    tmp = 0.0;
-	    clamp = 1;
-	 }
-      }
-      l->_SpotExpTable[i][0] = (GLfloat) tmp;
-   }
-   for (i = 0; i < EXP_TABLE_SIZE - 1; i++) {
-      l->_SpotExpTable[i][1] = (l->_SpotExpTable[i+1][0] -
-				l->_SpotExpTable[i][0]);
-   }
-   l->_SpotExpTable[EXP_TABLE_SIZE-1][1] = 0.0;
-}
-
-
-
-/* Calculate a new shine table.  Doing this here saves a branch in
- * lighting, and the cost of doing it early may be partially offset
- * by keeping a MRU cache of shine tables for various shine values.
- */
-void
-_mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
-{
-   ASSERT(side < 2);
-   if (ctx->_ShineTable[side])
-      ctx->_ShineTable[side]->refcount--;
-   ctx->_ShineTable[side] = NULL;
-}
-
-
-static void
-validate_shine_table( GLcontext *ctx, GLuint side, GLfloat shininess )
-{
-   struct gl_shine_tab *list = ctx->_ShineTabList;
-   struct gl_shine_tab *s;
-
-   ASSERT(side < 2);
-
-   foreach(s, list)
-      if ( s->shininess == shininess )
-	 break;
-
-   if (s == list) {
-      GLint j;
-      GLfloat *m;
-
-      foreach(s, list)
-	 if (s->refcount == 0)
-	    break;
-
-      m = s->tab;
-      m[0] = 0.0;
-      if (shininess == 0.0) {
-	 for (j = 1 ; j <= SHINE_TABLE_SIZE ; j++)
-	    m[j] = 1.0;
-      }
-      else {
-	 for (j = 1 ; j < SHINE_TABLE_SIZE ; j++) {
-            GLdouble t, x = j / (GLfloat) (SHINE_TABLE_SIZE - 1);
-            if (x < 0.005) /* underflow check */
-               x = 0.005;
-            t = pow(x, shininess);
-	    if (t > 1e-20)
-	       m[j] = (GLfloat) t;
-	    else
-	       m[j] = 0.0;
-	 }
-	 m[SHINE_TABLE_SIZE] = 1.0;
-      }
-
-      s->shininess = shininess;
-   }
-
-   if (ctx->_ShineTable[side])
-      ctx->_ShineTable[side]->refcount--;
-
-   ctx->_ShineTable[side] = s;
-   move_to_tail( list, s );
-   s->refcount++;
-}
-
-
-void
-_mesa_validate_all_lighting_tables( GLcontext *ctx )
-{
-   GLuint i;
-   GLfloat shininess;
-   
-   shininess = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS][0];
-   if (!ctx->_ShineTable[0] || ctx->_ShineTable[0]->shininess != shininess)
-      validate_shine_table( ctx, 0, shininess );
-
-   shininess = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_SHININESS][0];
-   if (!ctx->_ShineTable[1] || ctx->_ShineTable[1]->shininess != shininess)
-      validate_shine_table( ctx, 1, shininess );
-
-   for (i = 0; i < ctx->Const.MaxLights; i++)
-      if (ctx->Light.Light[i]._SpotExpTable[0][0] == -1)
-	 validate_spot_exp_table( &ctx->Light.Light[i] );
-}
-
-
-/**
- * Examine current lighting parameters to determine if the optimized lighting
- * function can be used.
- * Also, precompute some lighting values such as the products of light
- * source and material ambient, diffuse and specular coefficients.
- */
-void
-_mesa_update_lighting( GLcontext *ctx )
-{
-   struct gl_light *light;
-   ctx->Light._NeedEyeCoords = GL_FALSE;
-   ctx->Light._Flags = 0;
-
-   if (!ctx->Light.Enabled)
-      return;
-
-   foreach(light, &ctx->Light.EnabledList) {
-      ctx->Light._Flags |= light->_Flags;
-   }
-
-   ctx->Light._NeedVertices =
-      ((ctx->Light._Flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) ||
-       ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR ||
-       ctx->Light.Model.LocalViewer);
-
-   ctx->Light._NeedEyeCoords = ((ctx->Light._Flags & LIGHT_POSITIONAL) ||
-				ctx->Light.Model.LocalViewer);
-
-   /* XXX: This test is overkill & needs to be fixed both for software and
-    * hardware t&l drivers.  The above should be sufficient & should
-    * be tested to verify this.
-    */
-   if (ctx->Light._NeedVertices)
-      ctx->Light._NeedEyeCoords = GL_TRUE;
-
-   /* Precompute some shading values.  Although we reference
-    * Light.Material here, we can get away without flushing
-    * FLUSH_UPDATE_CURRENT, as when any outstanding material changes
-    * are flushed, they will update the derived state at that time.
-    */
-   if (ctx->Light.Model.TwoSide)
-      _mesa_update_material(ctx,
-			    MAT_BIT_FRONT_EMISSION |
-			    MAT_BIT_FRONT_AMBIENT |
-			    MAT_BIT_FRONT_DIFFUSE |
-			    MAT_BIT_FRONT_SPECULAR |
-			    MAT_BIT_BACK_EMISSION |
-			    MAT_BIT_BACK_AMBIENT |
-			    MAT_BIT_BACK_DIFFUSE |
-			    MAT_BIT_BACK_SPECULAR);
-   else
-      _mesa_update_material(ctx,
-			    MAT_BIT_FRONT_EMISSION |
-			    MAT_BIT_FRONT_AMBIENT |
-			    MAT_BIT_FRONT_DIFFUSE |
-			    MAT_BIT_FRONT_SPECULAR);
-}
-
-
-/**
- * Update state derived from light position, spot direction.
- * Called upon:
- *   _NEW_MODELVIEW
- *   _NEW_LIGHT
- *   _TNL_NEW_NEED_EYE_COORDS
- *
- * Update on (_NEW_MODELVIEW | _NEW_LIGHT) when lighting is enabled.
- * Also update on lighting space changes.
- */
-static void
-compute_light_positions( GLcontext *ctx )
-{
-   struct gl_light *light;
-   static const GLfloat eye_z[3] = { 0, 0, 1 };
-
-   if (!ctx->Light.Enabled)
-      return;
-
-   if (ctx->_NeedEyeCoords) {
-      COPY_3V( ctx->_EyeZDir, eye_z );
-   }
-   else {
-      TRANSFORM_NORMAL( ctx->_EyeZDir, eye_z, ctx->ModelviewMatrixStack.Top->m );
-   }
-
-   foreach (light, &ctx->Light.EnabledList) {
-
-      if (ctx->_NeedEyeCoords) {
-         /* _Position is in eye coordinate space */
-	 COPY_4FV( light->_Position, light->EyePosition );
-      }
-      else {
-         /* _Position is in object coordinate space */
-	 TRANSFORM_POINT( light->_Position, ctx->ModelviewMatrixStack.Top->inv,
-			  light->EyePosition );
-      }
-
-      if (!(light->_Flags & LIGHT_POSITIONAL)) {
-	 /* VP (VP) = Normalize( Position ) */
-	 COPY_3V( light->_VP_inf_norm, light->_Position );
-	 NORMALIZE_3FV( light->_VP_inf_norm );
-
-	 if (!ctx->Light.Model.LocalViewer) {
-	    /* _h_inf_norm = Normalize( V_to_P + <0,0,1> ) */
-	    ADD_3V( light->_h_inf_norm, light->_VP_inf_norm, ctx->_EyeZDir);
-	    NORMALIZE_3FV( light->_h_inf_norm );
-	 }
-	 light->_VP_inf_spot_attenuation = 1.0;
-      }
-      else {
-         /* positional light w/ homogeneous coordinate, divide by W */
-         GLfloat wInv = (GLfloat)1.0 / light->_Position[3];
-         light->_Position[0] *= wInv;
-         light->_Position[1] *= wInv;
-         light->_Position[2] *= wInv;
-      }
-
-      if (light->_Flags & LIGHT_SPOT) {
-         /* Note: we normalize the spot direction now */
-
-	 if (ctx->_NeedEyeCoords) {
-	    COPY_3V( light->_NormSpotDirection, light->SpotDirection );
-            NORMALIZE_3FV( light->_NormSpotDirection );
-	 }
-         else {
-            GLfloat spotDir[3];
-            COPY_3V(spotDir, light->SpotDirection);
-            NORMALIZE_3FV(spotDir);
-	    TRANSFORM_NORMAL( light->_NormSpotDirection,
-			      spotDir,
-			      ctx->ModelviewMatrixStack.Top->m);
-	 }
-
-	 NORMALIZE_3FV( light->_NormSpotDirection );
-
-	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
-	    GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,
-					light->_NormSpotDirection);
-
-	    if (PV_dot_dir > light->_CosCutoff) {
-	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
-	       int k = (int) x;
-	       light->_VP_inf_spot_attenuation =
-		  (GLfloat) (light->_SpotExpTable[k][0] +
-		   (x-k)*light->_SpotExpTable[k][1]);
-	    }
-	    else {
-	       light->_VP_inf_spot_attenuation = 0;
-            }
-	 }
-      }
-   }
-}
-
-
-
-static void
-update_modelview_scale( GLcontext *ctx )
-{
-   ctx->_ModelViewInvScale = 1.0F;
-   if (!_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top)) {
-      const GLfloat *m = ctx->ModelviewMatrixStack.Top->inv;
-      GLfloat f = m[2] * m[2] + m[6] * m[6] + m[10] * m[10];
-      if (f < 1e-12) f = 1.0;
-      if (ctx->_NeedEyeCoords)
-	 ctx->_ModelViewInvScale = (GLfloat) INV_SQRTF(f);
-      else
-	 ctx->_ModelViewInvScale = (GLfloat) SQRTF(f);
-   }
-}
-
-
-/**
- * Bring up to date any state that relies on _NeedEyeCoords.
- */
-void
-_mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
-{
-   const GLuint oldneedeyecoords = ctx->_NeedEyeCoords;
-
-   (void) new_state;
-   ctx->_NeedEyeCoords = GL_FALSE;
-
-   if (ctx->_ForceEyeCoords ||
-       (ctx->Texture._GenFlags & TEXGEN_NEED_EYE_COORD) ||
-       ctx->Point._Attenuated ||
-       ctx->Light._NeedEyeCoords)
-      ctx->_NeedEyeCoords = GL_TRUE;
-
-   if (ctx->Light.Enabled &&
-       !_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top))
-      ctx->_NeedEyeCoords = GL_TRUE;
-
-   /* Check if the truth-value interpretations of the bitfields have
-    * changed:
-    */
-   if (oldneedeyecoords != ctx->_NeedEyeCoords) {
-      /* Recalculate all state that depends on _NeedEyeCoords.
-       */
-      update_modelview_scale(ctx);
-      compute_light_positions( ctx );
-
-      if (ctx->Driver.LightingSpaceChange)
-	 ctx->Driver.LightingSpaceChange( ctx );
-   }
-   else {
-      GLuint new_state2 = ctx->NewState;
-
-      /* Recalculate that same state only if it has been invalidated
-       * by other statechanges.
-       */
-      if (new_state2 & _NEW_MODELVIEW)
-	 update_modelview_scale(ctx);
-
-      if (new_state2 & (_NEW_LIGHT|_NEW_MODELVIEW))
-	 compute_light_positions( ctx );
-   }
-}
-
-
-/**
- * Drivers may need this if the hardware tnl unit doesn't support the
- * light-in-modelspace optimization.  It's also useful for debugging.
- */
-void
-_mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag )
-{
-   ctx->_ForceEyeCoords = !flag;
-   ctx->NewState |= _NEW_POINT;	/* one of the bits from
-				 * _MESA_NEW_NEED_EYE_COORDS.
-				 */
-}
-
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-/**
- * Initialize the n-th light data structure.
- *
- * \param l pointer to the gl_light structure to be initialized.
- * \param n number of the light. 
- * \note The defaults for light 0 are different than the other lights.
- */
-static void
-init_light( struct gl_light *l, GLuint n )
-{
-   make_empty_list( l );
-
-   ASSIGN_4V( l->Ambient, 0.0, 0.0, 0.0, 1.0 );
-   if (n==0) {
-      ASSIGN_4V( l->Diffuse, 1.0, 1.0, 1.0, 1.0 );
-      ASSIGN_4V( l->Specular, 1.0, 1.0, 1.0, 1.0 );
-   }
-   else {
-      ASSIGN_4V( l->Diffuse, 0.0, 0.0, 0.0, 1.0 );
-      ASSIGN_4V( l->Specular, 0.0, 0.0, 0.0, 1.0 );
-   }
-   ASSIGN_4V( l->EyePosition, 0.0, 0.0, 1.0, 0.0 );
-   ASSIGN_3V( l->SpotDirection, 0.0, 0.0, -1.0 );
-   l->SpotExponent = 0.0;
-   _mesa_invalidate_spot_exp_table( l );
-   l->SpotCutoff = 180.0;
-   l->_CosCutoffNeg = -1.0f;
-   l->_CosCutoff = 0.0;		/* KW: -ve values not admitted */
-   l->ConstantAttenuation = 1.0;
-   l->LinearAttenuation = 0.0;
-   l->QuadraticAttenuation = 0.0;
-   l->Enabled = GL_FALSE;
-}
-
-
-/**
- * Initialize the light model data structure.
- *
- * \param lm pointer to the gl_lightmodel structure to be initialized.
- */
-static void
-init_lightmodel( struct gl_lightmodel *lm )
-{
-   ASSIGN_4V( lm->Ambient, 0.2F, 0.2F, 0.2F, 1.0F );
-   lm->LocalViewer = GL_FALSE;
-   lm->TwoSide = GL_FALSE;
-   lm->ColorControl = GL_SINGLE_COLOR;
-}
-
-
-/**
- * Initialize the material data structure.
- * 
- * \param m pointer to the gl_material structure to be initialized.
- */
-static void
-init_material( struct gl_material *m )
-{
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_AMBIENT],  0.2F, 0.2F, 0.2F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_DIFFUSE],  0.8F, 0.8F, 0.8F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_SPECULAR], 0.0F, 0.0F, 0.0F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_EMISSION], 0.0F, 0.0F, 0.0F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_SHININESS], 0.0F, 0.0F, 0.0F, 0.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_INDEXES], 0.0F, 1.0F, 1.0F, 0.0F );
- 
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_AMBIENT],  0.2F, 0.2F, 0.2F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_DIFFUSE],  0.8F, 0.8F, 0.8F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_SPECULAR], 0.0F, 0.0F, 0.0F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_EMISSION], 0.0F, 0.0F, 0.0F, 1.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_SHININESS], 0.0F, 0.0F, 0.0F, 0.0F );
-   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_INDEXES], 0.0F, 1.0F, 1.0F, 0.0F );
-}
-
-
-/**
- * Initialize all lighting state for the given context.
- */
-void
-_mesa_init_lighting( GLcontext *ctx )
-{
-   GLuint i;
-
-   /* Lighting group */
-   for (i = 0; i < MAX_LIGHTS; i++) {
-      init_light( &ctx->Light.Light[i], i );
-   }
-   make_empty_list( &ctx->Light.EnabledList );
-
-   init_lightmodel( &ctx->Light.Model );
-   init_material( &ctx->Light.Material );
-   ctx->Light.ShadeModel = GL_SMOOTH;
-   ctx->Light.ProvokingVertex = GL_LAST_VERTEX_CONVENTION_EXT;
-   ctx->Light.Enabled = GL_FALSE;
-   ctx->Light.ColorMaterialFace = GL_FRONT_AND_BACK;
-   ctx->Light.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE;
-   ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx,
-                                               GL_FRONT_AND_BACK,
-                                               GL_AMBIENT_AND_DIFFUSE, ~0,
-                                               NULL );
-
-   ctx->Light.ColorMaterialEnabled = GL_FALSE;
-   ctx->Light.ClampVertexColor = GL_TRUE;
-
-   /* Lighting miscellaneous */
-   ctx->_ShineTabList = MALLOC_STRUCT( gl_shine_tab );
-   make_empty_list( ctx->_ShineTabList );
-   /* Allocate 10 (arbitrary) shininess lookup tables */
-   for (i = 0 ; i < 10 ; i++) {
-      struct gl_shine_tab *s = MALLOC_STRUCT( gl_shine_tab );
-      s->shininess = -1;
-      s->refcount = 0;
-      insert_at_tail( ctx->_ShineTabList, s );
-   }
-
-   /* Miscellaneous */
-   ctx->Light._NeedEyeCoords = GL_FALSE;
-   ctx->_NeedEyeCoords = GL_FALSE;
-   ctx->_ForceEyeCoords = GL_FALSE;
-   ctx->_ModelViewInvScale = 1.0;
-}
-
-
-/**
- * Deallocate malloc'd lighting state attached to given context.
- */
-void
-_mesa_free_lighting_data( GLcontext *ctx )
-{
-   struct gl_shine_tab *s, *tmps;
-
-   /* Free lighting shininess exponentiation table */
-   foreach_s( s, tmps, ctx->_ShineTabList ) {
-      free( s );
-   }
-   free( ctx->_ShineTabList );
-}
+/*

+ * 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 "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "enums.h"

+#include "light.h"

+#include "macros.h"

+#include "simple_list.h"

+#include "mtypes.h"

+#include "math/m_matrix.h"

+

+

+void GLAPIENTRY

+_mesa_ShadeModel( GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glShadeModel %s\n", _mesa_lookup_enum_by_nr(mode));

+

+   if (mode != GL_FLAT && mode != GL_SMOOTH) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glShadeModel");

+      return;

+   }

+

+   if (ctx->Light.ShadeModel == mode)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_LIGHT);

+   ctx->Light.ShadeModel = mode;

+   if (mode == GL_FLAT)

+      ctx->_TriangleCaps |= DD_FLATSHADE;

+   else

+      ctx->_TriangleCaps &= ~DD_FLATSHADE;

+

+   if (ctx->Driver.ShadeModel)

+      ctx->Driver.ShadeModel( ctx, mode );

+}

+

+

+/**

+ * Set the provoking vertex (the vertex which specifies the prim's

+ * color when flat shading) to either the first or last vertex of the

+ * triangle or line.

+ */

+void GLAPIENTRY

+_mesa_ProvokingVertexEXT(GLenum mode)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glProvokingVertexEXT 0x%x\n", mode);

+

+   switch (mode) {

+   case GL_FIRST_VERTEX_CONVENTION_EXT:

+   case GL_LAST_VERTEX_CONVENTION_EXT:

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glProvokingVertexEXT(0x%x)", mode);

+      return;

+   }

+

+   if (ctx->Light.ProvokingVertex == mode)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_LIGHT);

+   ctx->Light.ProvokingVertex = mode;

+}

+

+

+/**

+ * Helper function called by _mesa_Lightfv and _mesa_PopAttrib to set

+ * per-light state.

+ * For GL_POSITION and GL_SPOT_DIRECTION the params position/direction

+ * will have already been transformed by the modelview matrix!

+ * Also, all error checking should have already been done.

+ */

+void

+_mesa_light(struct gl_context *ctx, GLuint lnum, GLenum pname, const GLfloat *params)

+{

+   struct gl_light *light;

+

+   ASSERT(lnum < MAX_LIGHTS);

+   light = &ctx->Light.Light[lnum];

+

+   switch (pname) {

+   case GL_AMBIENT:

+      if (TEST_EQ_4V(light->Ambient, params))

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      COPY_4V( light->Ambient, params );

+      break;

+   case GL_DIFFUSE:

+      if (TEST_EQ_4V(light->Diffuse, params))

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      COPY_4V( light->Diffuse, params );

+      break;

+   case GL_SPECULAR:

+      if (TEST_EQ_4V(light->Specular, params))

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      COPY_4V( light->Specular, params );

+      break;

+   case GL_POSITION:

+      /* NOTE: position has already been transformed by ModelView! */

+      if (TEST_EQ_4V(light->EyePosition, params))

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      COPY_4V(light->EyePosition, params);

+      if (light->EyePosition[3] != 0.0F)

+	 light->_Flags |= LIGHT_POSITIONAL;

+      else

+	 light->_Flags &= ~LIGHT_POSITIONAL;

+      break;

+   case GL_SPOT_DIRECTION:

+      /* NOTE: Direction already transformed by inverse ModelView! */

+      if (TEST_EQ_3V(light->SpotDirection, params))

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      COPY_3V(light->SpotDirection, params);

+      break;

+   case GL_SPOT_EXPONENT:

+      ASSERT(params[0] >= 0.0);

+      ASSERT(params[0] <= ctx->Const.MaxSpotExponent);

+      if (light->SpotExponent == params[0])

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      light->SpotExponent = params[0];

+      _mesa_invalidate_spot_exp_table(light);

+      break;

+   case GL_SPOT_CUTOFF:

+      ASSERT(params[0] == 180.0 || (params[0] >= 0.0 && params[0] <= 90.0));

+      if (light->SpotCutoff == params[0])

+         return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      light->SpotCutoff = params[0];

+      light->_CosCutoffNeg = (GLfloat) (cos(light->SpotCutoff * DEG2RAD));

+      if (light->_CosCutoffNeg < 0)

+         light->_CosCutoff = 0;

+      else

+         light->_CosCutoff = light->_CosCutoffNeg;

+      if (light->SpotCutoff != 180.0F)

+         light->_Flags |= LIGHT_SPOT;

+      else

+         light->_Flags &= ~LIGHT_SPOT;

+      break;

+   case GL_CONSTANT_ATTENUATION:

+      ASSERT(params[0] >= 0.0);

+      if (light->ConstantAttenuation == params[0])

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      light->ConstantAttenuation = params[0];

+      break;

+   case GL_LINEAR_ATTENUATION:

+      ASSERT(params[0] >= 0.0);

+      if (light->LinearAttenuation == params[0])

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      light->LinearAttenuation = params[0];

+      break;

+   case GL_QUADRATIC_ATTENUATION:

+      ASSERT(params[0] >= 0.0);

+      if (light->QuadraticAttenuation == params[0])

+	 return;

+      FLUSH_VERTICES(ctx, _NEW_LIGHT);

+      light->QuadraticAttenuation = params[0];

+      break;

+   default:

+      _mesa_problem(ctx, "Unexpected pname in _mesa_light()");

+      return;

+   }

+

+   if (ctx->Driver.Lightfv)

+      ctx->Driver.Lightfv( ctx, GL_LIGHT0 + lnum, pname, params );

+}

+

+

+void GLAPIENTRY

+_mesa_Lightf( GLenum light, GLenum pname, GLfloat param )

+{

+   GLfloat fparam[4];

+   fparam[0] = param;

+   fparam[1] = fparam[2] = fparam[3] = 0.0F;

+   _mesa_Lightfv( light, pname, fparam );

+}

+

+

+void GLAPIENTRY

+_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i = (GLint) (light - GL_LIGHT0);

+   GLfloat temp[4];

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (i < 0 || i >= (GLint) ctx->Const.MaxLights) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glLight(light=0x%x)", light );

+      return;

+   }

+

+   /* do particular error checks, transformations */

+   switch (pname) {

+   case GL_AMBIENT:

+   case GL_DIFFUSE:

+   case GL_SPECULAR:

+      /* nothing */

+      break;

+   case GL_POSITION:

+      /* transform position by ModelView matrix */

+      TRANSFORM_POINT(temp, ctx->ModelviewMatrixStack.Top->m, params);

+      params = temp;

+      break;

+   case GL_SPOT_DIRECTION:

+      /* transform direction by inverse modelview */

+      if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) {

+	 _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);

+      }

+      TRANSFORM_DIRECTION(temp, params, ctx->ModelviewMatrixStack.Top->m);

+      params = temp;

+      break;

+   case GL_SPOT_EXPONENT:

+      if (params[0] < 0.0 || params[0] > ctx->Const.MaxSpotExponent) {

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");

+	 return;

+      }

+      break;

+   case GL_SPOT_CUTOFF:

+      if ((params[0] < 0.0 || params[0] > 90.0) && params[0] != 180.0) {

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");

+	 return;

+      }

+      break;

+   case GL_CONSTANT_ATTENUATION:

+      if (params[0] < 0.0) {

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");

+	 return;

+      }

+      break;

+   case GL_LINEAR_ATTENUATION:

+      if (params[0] < 0.0) {

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");

+	 return;

+      }

+      break;

+   case GL_QUADRATIC_ATTENUATION:

+      if (params[0] < 0.0) {

+	 _mesa_error(ctx, GL_INVALID_VALUE, "glLight");

+	 return;

+      }

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glLight(pname=0x%x)", pname);

+      return;

+   }

+

+   _mesa_light(ctx, i, pname, params);

+}

+

+

+void GLAPIENTRY

+_mesa_Lighti( GLenum light, GLenum pname, GLint param )

+{

+   GLint iparam[4];

+   iparam[0] = param;

+   iparam[1] = iparam[2] = iparam[3] = 0;

+   _mesa_Lightiv( light, pname, iparam );

+}

+

+

+void GLAPIENTRY

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

+         ;

+   }

+

+   _mesa_Lightfv( light, pname, fparam );

+}

+

+

+

+void GLAPIENTRY

+_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint l = (GLint) (light - GL_LIGHT0);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (l < 0 || l >= (GLint) ctx->Const.MaxLights) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );

+      return;

+   }

+

+   switch (pname) {

+      case GL_AMBIENT:

+         COPY_4V( params, ctx->Light.Light[l].Ambient );

+         break;

+      case GL_DIFFUSE:

+         COPY_4V( params, ctx->Light.Light[l].Diffuse );

+         break;

+      case GL_SPECULAR:

+         COPY_4V( params, ctx->Light.Light[l].Specular );

+         break;

+      case GL_POSITION:

+         COPY_4V( params, ctx->Light.Light[l].EyePosition );

+         break;

+      case GL_SPOT_DIRECTION:

+         COPY_3V( params, ctx->Light.Light[l].SpotDirection );

+         break;

+      case GL_SPOT_EXPONENT:

+         params[0] = ctx->Light.Light[l].SpotExponent;

+         break;

+      case GL_SPOT_CUTOFF:

+         params[0] = ctx->Light.Light[l].SpotCutoff;

+         break;

+      case GL_CONSTANT_ATTENUATION:

+         params[0] = ctx->Light.Light[l].ConstantAttenuation;

+         break;

+      case GL_LINEAR_ATTENUATION:

+         params[0] = ctx->Light.Light[l].LinearAttenuation;

+         break;

+      case GL_QUADRATIC_ATTENUATION:

+         params[0] = ctx->Light.Light[l].QuadraticAttenuation;

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightfv" );

+         break;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint l = (GLint) (light - GL_LIGHT0);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (l < 0 || l >= (GLint) ctx->Const.MaxLights) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );

+      return;

+   }

+

+   switch (pname) {

+      case GL_AMBIENT:

+         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[0]);

+         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[1]);

+         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[2]);

+         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Ambient[3]);

+         break;

+      case GL_DIFFUSE:

+         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[0]);

+         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[1]);

+         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[2]);

+         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Diffuse[3]);

+         break;

+      case GL_SPECULAR:

+         params[0] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[0]);

+         params[1] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[1]);

+         params[2] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[2]);

+         params[3] = FLOAT_TO_INT(ctx->Light.Light[l].Specular[3]);

+         break;

+      case GL_POSITION:

+         params[0] = (GLint) ctx->Light.Light[l].EyePosition[0];

+         params[1] = (GLint) ctx->Light.Light[l].EyePosition[1];

+         params[2] = (GLint) ctx->Light.Light[l].EyePosition[2];

+         params[3] = (GLint) ctx->Light.Light[l].EyePosition[3];

+         break;

+      case GL_SPOT_DIRECTION:

+         params[0] = (GLint) ctx->Light.Light[l].SpotDirection[0];

+         params[1] = (GLint) ctx->Light.Light[l].SpotDirection[1];

+         params[2] = (GLint) ctx->Light.Light[l].SpotDirection[2];

+         break;

+      case GL_SPOT_EXPONENT:

+         params[0] = (GLint) ctx->Light.Light[l].SpotExponent;

+         break;

+      case GL_SPOT_CUTOFF:

+         params[0] = (GLint) ctx->Light.Light[l].SpotCutoff;

+         break;

+      case GL_CONSTANT_ATTENUATION:

+         params[0] = (GLint) ctx->Light.Light[l].ConstantAttenuation;

+         break;

+      case GL_LINEAR_ATTENUATION:

+         params[0] = (GLint) ctx->Light.Light[l].LinearAttenuation;

+         break;

+      case GL_QUADRATIC_ATTENUATION:

+         params[0] = (GLint) ctx->Light.Light[l].QuadraticAttenuation;

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetLightiv" );

+         break;

+   }

+}

+

+

+

+/**********************************************************************/

+/***                        Light Model                             ***/

+/**********************************************************************/

+

+

+void GLAPIENTRY

+_mesa_LightModelfv( GLenum pname, const GLfloat *params )

+{

+   GLenum newenum;

+   GLboolean newbool;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (pname) {

+      case GL_LIGHT_MODEL_AMBIENT:

+         if (TEST_EQ_4V( ctx->Light.Model.Ambient, params ))

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);

+         COPY_4V( ctx->Light.Model.Ambient, params );

+         break;

+      case GL_LIGHT_MODEL_LOCAL_VIEWER:

+         newbool = (params[0]!=0.0);

+	 if (ctx->Light.Model.LocalViewer == newbool)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);

+	 ctx->Light.Model.LocalViewer = newbool;

+         break;

+      case GL_LIGHT_MODEL_TWO_SIDE:

+         newbool = (params[0]!=0.0);

+	 if (ctx->Light.Model.TwoSide == newbool)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);

+	 ctx->Light.Model.TwoSide = newbool;

+         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)

+            ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;

+         else

+            ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;

+         break;

+      case GL_LIGHT_MODEL_COLOR_CONTROL:

+         if (params[0] == (GLfloat) GL_SINGLE_COLOR)

+	    newenum = GL_SINGLE_COLOR;

+         else if (params[0] == (GLfloat) GL_SEPARATE_SPECULAR_COLOR)

+	    newenum = GL_SEPARATE_SPECULAR_COLOR;

+	 else {

+            _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(param=0x0%x)",

+                         (GLint) params[0] );

+	    return;

+         }

+	 if (ctx->Light.Model.ColorControl == newenum)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_LIGHT);

+	 ctx->Light.Model.ColorControl = newenum;

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glLightModel(pname=0x%x)", pname );

+         break;

+   }

+

+   if (ctx->Driver.LightModelfv)

+      ctx->Driver.LightModelfv( ctx, pname, params );

+}

+

+

+void GLAPIENTRY

+_mesa_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];

+         break;

+      default:

+         /* Error will be caught later in gl_LightModelfv */

+         ASSIGN_4V(fparam, 0.0F, 0.0F, 0.0F, 0.0F);

+   }

+   _mesa_LightModelfv( pname, fparam );

+}

+

+

+void GLAPIENTRY

+_mesa_LightModeli( GLenum pname, GLint param )

+{

+   GLint iparam[4];

+   iparam[0] = param;

+   iparam[1] = iparam[2] = iparam[3] = 0;

+   _mesa_LightModeliv( pname, iparam );

+}

+

+

+void GLAPIENTRY

+_mesa_LightModelf( GLenum pname, GLfloat param )

+{

+   GLfloat fparam[4];

+   fparam[0] = param;

+   fparam[1] = fparam[2] = fparam[3] = 0.0F;

+   _mesa_LightModelfv( pname, fparam );

+}

+

+

+

+/********** MATERIAL **********/

+

+

+/*

+ * Given a face and pname value (ala glColorMaterial), compute a bitmask

+ * of the targeted material values.

+ */

+GLuint

+_mesa_material_bitmask( struct gl_context *ctx, GLenum face, GLenum pname,

+                        GLuint legal, const char *where )

+{

+   GLuint bitmask = 0;

+

+   /* Make a bitmask indicating what material attribute(s) we're updating */

+   switch (pname) {

+      case GL_EMISSION:

+         bitmask |= MAT_BIT_FRONT_EMISSION | MAT_BIT_BACK_EMISSION;

+         break;

+      case GL_AMBIENT:

+         bitmask |= MAT_BIT_FRONT_AMBIENT | MAT_BIT_BACK_AMBIENT;

+         break;

+      case GL_DIFFUSE:

+         bitmask |= MAT_BIT_FRONT_DIFFUSE | MAT_BIT_BACK_DIFFUSE;

+         break;

+      case GL_SPECULAR:

+         bitmask |= MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_SPECULAR;

+         break;

+      case GL_SHININESS:

+         bitmask |= MAT_BIT_FRONT_SHININESS | MAT_BIT_BACK_SHININESS;

+         break;

+      case GL_AMBIENT_AND_DIFFUSE:

+         bitmask |= MAT_BIT_FRONT_AMBIENT | MAT_BIT_BACK_AMBIENT;

+         bitmask |= MAT_BIT_FRONT_DIFFUSE | MAT_BIT_BACK_DIFFUSE;

+         break;

+      case GL_COLOR_INDEXES:

+         bitmask |= MAT_BIT_FRONT_INDEXES  | MAT_BIT_BACK_INDEXES;

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );

+         return 0;

+   }

+

+   if (face==GL_FRONT) {

+      bitmask &= FRONT_MATERIAL_BITS;

+   }

+   else if (face==GL_BACK) {

+      bitmask &= BACK_MATERIAL_BITS;

+   }

+   else if (face != GL_FRONT_AND_BACK) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );

+      return 0;

+   }

+

+   if (bitmask & ~legal) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "%s", where );

+      return 0;

+   }

+

+   return bitmask;

+}

+

+

+

+/* Perform a straight copy between materials.

+ */

+void

+_mesa_copy_materials( struct gl_material *dst,

+                      const struct gl_material *src,

+                      GLuint bitmask )

+{

+   int i;

+

+   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 

+      if (bitmask & (1<<i))

+	 COPY_4FV( dst->Attrib[i], src->Attrib[i] );

+}

+

+

+

+/* Update derived values following a change in ctx->Light.Material

+ */

+void

+_mesa_update_material( struct gl_context *ctx, GLuint bitmask )

+{

+   struct gl_light *light, *list = &ctx->Light.EnabledList;

+   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;

+

+   if (MESA_VERBOSE & VERBOSE_MATERIAL) 

+      _mesa_debug(ctx, "_mesa_update_material, mask 0x%x\n", bitmask);

+

+   if (!bitmask)

+      return;

+

+   /* update material ambience */

+   if (bitmask & MAT_BIT_FRONT_AMBIENT) {

+      foreach (light, list) {

+         SCALE_3V( light->_MatAmbient[0], light->Ambient, 

+		   mat[MAT_ATTRIB_FRONT_AMBIENT]);

+      }

+   }

+

+   if (bitmask & MAT_BIT_BACK_AMBIENT) {

+      foreach (light, list) {

+         SCALE_3V( light->_MatAmbient[1], light->Ambient, 

+		   mat[MAT_ATTRIB_BACK_AMBIENT]);

+      }

+   }

+

+   /* update BaseColor = emission + scene's ambience * material's ambience */

+   if (bitmask & (MAT_BIT_FRONT_EMISSION | MAT_BIT_FRONT_AMBIENT)) {

+      COPY_3V( ctx->Light._BaseColor[0], mat[MAT_ATTRIB_FRONT_EMISSION] );

+      ACC_SCALE_3V( ctx->Light._BaseColor[0], mat[MAT_ATTRIB_FRONT_AMBIENT],

+		    ctx->Light.Model.Ambient );

+   }

+

+   if (bitmask & (MAT_BIT_BACK_EMISSION | MAT_BIT_BACK_AMBIENT)) {

+      COPY_3V( ctx->Light._BaseColor[1], mat[MAT_ATTRIB_BACK_EMISSION] );

+      ACC_SCALE_3V( ctx->Light._BaseColor[1], mat[MAT_ATTRIB_BACK_AMBIENT],

+		    ctx->Light.Model.Ambient );

+   }

+

+   /* update material diffuse values */

+   if (bitmask & MAT_BIT_FRONT_DIFFUSE) {

+      foreach (light, list) {

+	 SCALE_3V( light->_MatDiffuse[0], light->Diffuse, 

+		   mat[MAT_ATTRIB_FRONT_DIFFUSE] );

+      }

+   }

+

+   if (bitmask & MAT_BIT_BACK_DIFFUSE) {

+      foreach (light, list) {

+	 SCALE_3V( light->_MatDiffuse[1], light->Diffuse, 

+		   mat[MAT_ATTRIB_BACK_DIFFUSE] );

+      }

+   }

+

+   /* update material specular values */

+   if (bitmask & MAT_BIT_FRONT_SPECULAR) {

+      foreach (light, list) {

+	 SCALE_3V( light->_MatSpecular[0], light->Specular, 

+		   mat[MAT_ATTRIB_FRONT_SPECULAR]);

+      }

+   }

+

+   if (bitmask & MAT_BIT_BACK_SPECULAR) {

+      foreach (light, list) {

+	 SCALE_3V( light->_MatSpecular[1], light->Specular,

+		   mat[MAT_ATTRIB_BACK_SPECULAR]);

+      }

+   }

+

+   if (bitmask & MAT_BIT_FRONT_SHININESS) {

+      _mesa_invalidate_shine_table( ctx, 0 );

+   }

+

+   if (bitmask & MAT_BIT_BACK_SHININESS) {

+      _mesa_invalidate_shine_table( ctx, 1 );

+   }

+}

+

+

+/*

+ * Update the current materials from the given rgba color

+ * according to the bitmask in ColorMaterialBitmask, which is

+ * set by glColorMaterial().

+ */

+void

+_mesa_update_color_material( struct gl_context *ctx, const GLfloat color[4] )

+{

+   GLuint bitmask = ctx->Light.ColorMaterialBitmask;

+   struct gl_material *mat = &ctx->Light.Material;

+   int i;

+

+   for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) 

+      if (bitmask & (1<<i))

+	 COPY_4FV( mat->Attrib[i], color );

+

+   _mesa_update_material( ctx, bitmask );

+}

+

+

+void GLAPIENTRY

+_mesa_ColorMaterial( GLenum face, GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint bitmask;

+   GLuint legal = (MAT_BIT_FRONT_EMISSION | MAT_BIT_BACK_EMISSION |

+		   MAT_BIT_FRONT_SPECULAR | MAT_BIT_BACK_SPECULAR |

+		   MAT_BIT_FRONT_DIFFUSE  | MAT_BIT_BACK_DIFFUSE  |

+		   MAT_BIT_FRONT_AMBIENT  | MAT_BIT_BACK_AMBIENT);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glColorMaterial %s %s\n",

+                  _mesa_lookup_enum_by_nr(face),

+                  _mesa_lookup_enum_by_nr(mode));

+

+   bitmask = _mesa_material_bitmask(ctx, face, mode, legal, "glColorMaterial");

+

+   if (ctx->Light.ColorMaterialBitmask == bitmask &&

+       ctx->Light.ColorMaterialFace == face &&

+       ctx->Light.ColorMaterialMode == mode)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_LIGHT);

+   ctx->Light.ColorMaterialBitmask = bitmask;

+   ctx->Light.ColorMaterialFace = face;

+   ctx->Light.ColorMaterialMode = mode;

+

+   if (ctx->Light.ColorMaterialEnabled) {

+      FLUSH_CURRENT( ctx, 0 );

+      _mesa_update_color_material(ctx,ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);

+   }

+

+   if (ctx->Driver.ColorMaterial)

+      ctx->Driver.ColorMaterial( ctx, face, mode );

+}

+

+

+void GLAPIENTRY

+_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint f;

+   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */

+

+   FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */

+

+   if (face==GL_FRONT) {

+      f = 0;

+   }

+   else if (face==GL_BACK) {

+      f = 1;

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(face)" );

+      return;

+   }

+

+   switch (pname) {

+      case GL_AMBIENT:

+         COPY_4FV( params, mat[MAT_ATTRIB_AMBIENT(f)] );

+         break;

+      case GL_DIFFUSE:

+         COPY_4FV( params, mat[MAT_ATTRIB_DIFFUSE(f)] );

+	 break;

+      case GL_SPECULAR:

+         COPY_4FV( params, mat[MAT_ATTRIB_SPECULAR(f)] );

+	 break;

+      case GL_EMISSION:

+	 COPY_4FV( params, mat[MAT_ATTRIB_EMISSION(f)] );

+	 break;

+      case GL_SHININESS:

+	 *params = mat[MAT_ATTRIB_SHININESS(f)][0];

+	 break;

+      case GL_COLOR_INDEXES:

+	 params[0] = mat[MAT_ATTRIB_INDEXES(f)][0];

+	 params[1] = mat[MAT_ATTRIB_INDEXES(f)][1];

+	 params[2] = mat[MAT_ATTRIB_INDEXES(f)][2];

+	 break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint f;

+   GLfloat (*mat)[4] = ctx->Light.Material.Attrib;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* update materials */

+

+   FLUSH_CURRENT(ctx, 0); /* update ctx->Light.Material from vertex buffer */

+

+   if (face==GL_FRONT) {

+      f = 0;

+   }

+   else if (face==GL_BACK) {

+      f = 1;

+   }

+   else {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialiv(face)" );

+      return;

+   }

+   switch (pname) {

+      case GL_AMBIENT:

+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][0] );

+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][1] );

+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][2] );

+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_AMBIENT(f)][3] );

+         break;

+      case GL_DIFFUSE:

+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][0] );

+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][1] );

+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][2] );

+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_DIFFUSE(f)][3] );

+	 break;

+      case GL_SPECULAR:

+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][0] );

+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][1] );

+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][2] );

+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_SPECULAR(f)][3] );

+	 break;

+      case GL_EMISSION:

+         params[0] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][0] );

+         params[1] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][1] );

+         params[2] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][2] );

+         params[3] = FLOAT_TO_INT( mat[MAT_ATTRIB_EMISSION(f)][3] );

+	 break;

+      case GL_SHININESS:

+         *params = IROUND( mat[MAT_ATTRIB_SHININESS(f)][0] );

+	 break;

+      case GL_COLOR_INDEXES:

+	 params[0] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][0] );

+	 params[1] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][1] );

+	 params[2] = IROUND( mat[MAT_ATTRIB_INDEXES(f)][2] );

+	 break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetMaterialfv(pname)" );

+   }

+}

+

+

+

+/**********************************************************************/

+/*****                  Lighting computation                      *****/

+/**********************************************************************/

+

+

+/*

+ * Notes:

+ *   When two-sided lighting is enabled we compute the color (or index)

+ *   for both the front and back side of the primitive.  Then, when the

+ *   orientation of the facet is later learned, we can determine which

+ *   color (or index) to use for rendering.

+ *

+ *   KW: We now know orientation in advance and only shade for

+ *       the side or sides which are actually required.

+ *

+ * Variables:

+ *   n = normal vector

+ *   V = vertex position

+ *   P = light source position

+ *   Pe = (0,0,0,1)

+ *

+ * Precomputed:

+ *   IF P[3]==0 THEN

+ *       // light at infinity

+ *       IF local_viewer THEN

+ *           _VP_inf_norm = unit vector from V to P      // Precompute

+ *       ELSE

+ *           // eye at infinity

+ *           _h_inf_norm = Normalize( VP + <0,0,1> )     // Precompute

+ *       ENDIF

+ *   ENDIF

+ *

+ * Functions:

+ *   Normalize( v ) = normalized vector v

+ *   Magnitude( v ) = length of vector v

+ */

+

+

+

+/*

+ * Whenever the spotlight exponent for a light changes we must call

+ * this function to recompute the exponent lookup table.

+ */

+void

+_mesa_invalidate_spot_exp_table( struct gl_light *l )

+{

+   l->_SpotExpTable[0][0] = -1;

+}

+

+

+static void

+validate_spot_exp_table( struct gl_light *l )

+{

+   GLint i;

+   GLdouble exponent = l->SpotExponent;

+   GLdouble tmp = 0;

+   GLint clamp = 0;

+

+   l->_SpotExpTable[0][0] = 0.0;

+

+   for (i = EXP_TABLE_SIZE - 1; i > 0 ;i--) {

+      if (clamp == 0) {

+	 tmp = pow(i / (GLdouble) (EXP_TABLE_SIZE - 1), exponent);

+	 if (tmp < FLT_MIN * 100.0) {

+	    tmp = 0.0;

+	    clamp = 1;

+	 }

+      }

+      l->_SpotExpTable[i][0] = (GLfloat) tmp;

+   }

+   for (i = 0; i < EXP_TABLE_SIZE - 1; i++) {

+      l->_SpotExpTable[i][1] = (l->_SpotExpTable[i+1][0] -

+				l->_SpotExpTable[i][0]);

+   }

+   l->_SpotExpTable[EXP_TABLE_SIZE-1][1] = 0.0;

+}

+

+

+

+/* Calculate a new shine table.  Doing this here saves a branch in

+ * lighting, and the cost of doing it early may be partially offset

+ * by keeping a MRU cache of shine tables for various shine values.

+ */

+void

+_mesa_invalidate_shine_table( struct gl_context *ctx, GLuint side )

+{

+   ASSERT(side < 2);

+   if (ctx->_ShineTable[side])

+      ctx->_ShineTable[side]->refcount--;

+   ctx->_ShineTable[side] = NULL;

+}

+

+

+static void

+validate_shine_table( struct gl_context *ctx, GLuint side, GLfloat shininess )

+{

+   struct gl_shine_tab *list = ctx->_ShineTabList;

+   struct gl_shine_tab *s;

+

+   ASSERT(side < 2);

+

+   foreach(s, list)

+      if ( s->shininess == shininess )

+	 break;

+

+   if (s == list) {

+      GLint j;

+      GLfloat *m;

+

+      foreach(s, list)

+	 if (s->refcount == 0)

+	    break;

+

+      m = s->tab;

+      m[0] = 0.0;

+      if (shininess == 0.0) {

+	 for (j = 1 ; j <= SHINE_TABLE_SIZE ; j++)

+	    m[j] = 1.0;

+      }

+      else {

+	 for (j = 1 ; j < SHINE_TABLE_SIZE ; j++) {

+            GLdouble t, x = j / (GLfloat) (SHINE_TABLE_SIZE - 1);

+            if (x < 0.005) /* underflow check */

+               x = 0.005;

+            t = pow(x, shininess);

+	    if (t > 1e-20)

+	       m[j] = (GLfloat) t;

+	    else

+	       m[j] = 0.0;

+	 }

+	 m[SHINE_TABLE_SIZE] = 1.0;

+      }

+

+      s->shininess = shininess;

+   }

+

+   if (ctx->_ShineTable[side])

+      ctx->_ShineTable[side]->refcount--;

+

+   ctx->_ShineTable[side] = s;

+   move_to_tail( list, s );

+   s->refcount++;

+}

+

+

+void

+_mesa_validate_all_lighting_tables( struct gl_context *ctx )

+{

+   GLuint i;

+   GLfloat shininess;

+   

+   shininess = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_SHININESS][0];

+   if (!ctx->_ShineTable[0] || ctx->_ShineTable[0]->shininess != shininess)

+      validate_shine_table( ctx, 0, shininess );

+

+   shininess = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_SHININESS][0];

+   if (!ctx->_ShineTable[1] || ctx->_ShineTable[1]->shininess != shininess)

+      validate_shine_table( ctx, 1, shininess );

+

+   for (i = 0; i < ctx->Const.MaxLights; i++)

+      if (ctx->Light.Light[i]._SpotExpTable[0][0] == -1)

+	 validate_spot_exp_table( &ctx->Light.Light[i] );

+}

+

+

+/**

+ * Examine current lighting parameters to determine if the optimized lighting

+ * function can be used.

+ * Also, precompute some lighting values such as the products of light

+ * source and material ambient, diffuse and specular coefficients.

+ */

+void

+_mesa_update_lighting( struct gl_context *ctx )

+{

+   struct gl_light *light;

+   ctx->Light._NeedEyeCoords = GL_FALSE;

+   ctx->Light._Flags = 0;

+

+   if (!ctx->Light.Enabled)

+      return;

+

+   foreach(light, &ctx->Light.EnabledList) {

+      ctx->Light._Flags |= light->_Flags;

+   }

+

+   ctx->Light._NeedVertices =

+      ((ctx->Light._Flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) ||

+       ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR ||

+       ctx->Light.Model.LocalViewer);

+

+   ctx->Light._NeedEyeCoords = ((ctx->Light._Flags & LIGHT_POSITIONAL) ||

+				ctx->Light.Model.LocalViewer);

+

+   /* XXX: This test is overkill & needs to be fixed both for software and

+    * hardware t&l drivers.  The above should be sufficient & should

+    * be tested to verify this.

+    */

+   if (ctx->Light._NeedVertices)

+      ctx->Light._NeedEyeCoords = GL_TRUE;

+

+   /* Precompute some shading values.  Although we reference

+    * Light.Material here, we can get away without flushing

+    * FLUSH_UPDATE_CURRENT, as when any outstanding material changes

+    * are flushed, they will update the derived state at that time.

+    */

+   if (ctx->Light.Model.TwoSide)

+      _mesa_update_material(ctx,

+			    MAT_BIT_FRONT_EMISSION |

+			    MAT_BIT_FRONT_AMBIENT |

+			    MAT_BIT_FRONT_DIFFUSE |

+			    MAT_BIT_FRONT_SPECULAR |

+			    MAT_BIT_BACK_EMISSION |

+			    MAT_BIT_BACK_AMBIENT |

+			    MAT_BIT_BACK_DIFFUSE |

+			    MAT_BIT_BACK_SPECULAR);

+   else

+      _mesa_update_material(ctx,

+			    MAT_BIT_FRONT_EMISSION |

+			    MAT_BIT_FRONT_AMBIENT |

+			    MAT_BIT_FRONT_DIFFUSE |

+			    MAT_BIT_FRONT_SPECULAR);

+}

+

+

+/**

+ * Update state derived from light position, spot direction.

+ * Called upon:

+ *   _NEW_MODELVIEW

+ *   _NEW_LIGHT

+ *   _TNL_NEW_NEED_EYE_COORDS

+ *

+ * Update on (_NEW_MODELVIEW | _NEW_LIGHT) when lighting is enabled.

+ * Also update on lighting space changes.

+ */

+static void

+compute_light_positions( struct gl_context *ctx )

+{

+   struct gl_light *light;

+   static const GLfloat eye_z[3] = { 0, 0, 1 };

+

+   if (!ctx->Light.Enabled)

+      return;

+

+   if (ctx->_NeedEyeCoords) {

+      COPY_3V( ctx->_EyeZDir, eye_z );

+   }

+   else {

+      TRANSFORM_NORMAL( ctx->_EyeZDir, eye_z, ctx->ModelviewMatrixStack.Top->m );

+   }

+

+   foreach (light, &ctx->Light.EnabledList) {

+

+      if (ctx->_NeedEyeCoords) {

+         /* _Position is in eye coordinate space */

+	 COPY_4FV( light->_Position, light->EyePosition );

+      }

+      else {

+         /* _Position is in object coordinate space */

+	 TRANSFORM_POINT( light->_Position, ctx->ModelviewMatrixStack.Top->inv,

+			  light->EyePosition );

+      }

+

+      if (!(light->_Flags & LIGHT_POSITIONAL)) {

+	 /* VP (VP) = Normalize( Position ) */

+	 COPY_3V( light->_VP_inf_norm, light->_Position );

+	 NORMALIZE_3FV( light->_VP_inf_norm );

+

+	 if (!ctx->Light.Model.LocalViewer) {

+	    /* _h_inf_norm = Normalize( V_to_P + <0,0,1> ) */

+	    ADD_3V( light->_h_inf_norm, light->_VP_inf_norm, ctx->_EyeZDir);

+	    NORMALIZE_3FV( light->_h_inf_norm );

+	 }

+	 light->_VP_inf_spot_attenuation = 1.0;

+      }

+      else {

+         /* positional light w/ homogeneous coordinate, divide by W */

+         GLfloat wInv = (GLfloat)1.0 / light->_Position[3];

+         light->_Position[0] *= wInv;

+         light->_Position[1] *= wInv;

+         light->_Position[2] *= wInv;

+      }

+

+      if (light->_Flags & LIGHT_SPOT) {

+         /* Note: we normalize the spot direction now */

+

+	 if (ctx->_NeedEyeCoords) {

+	    COPY_3V( light->_NormSpotDirection, light->SpotDirection );

+            NORMALIZE_3FV( light->_NormSpotDirection );

+	 }

+         else {

+            GLfloat spotDir[3];

+            COPY_3V(spotDir, light->SpotDirection);

+            NORMALIZE_3FV(spotDir);

+	    TRANSFORM_NORMAL( light->_NormSpotDirection,

+			      spotDir,

+			      ctx->ModelviewMatrixStack.Top->m);

+	 }

+

+	 NORMALIZE_3FV( light->_NormSpotDirection );

+

+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {

+	    GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,

+					light->_NormSpotDirection);

+

+	    if (PV_dot_dir > light->_CosCutoff) {

+	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);

+	       int k = (int) x;

+	       light->_VP_inf_spot_attenuation =

+		  (GLfloat) (light->_SpotExpTable[k][0] +

+		   (x-k)*light->_SpotExpTable[k][1]);

+	    }

+	    else {

+	       light->_VP_inf_spot_attenuation = 0;

+            }

+	 }

+      }

+   }

+}

+

+

+

+static void

+update_modelview_scale( struct gl_context *ctx )

+{

+   ctx->_ModelViewInvScale = 1.0F;

+   if (!_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top)) {

+      const GLfloat *m = ctx->ModelviewMatrixStack.Top->inv;

+      GLfloat f = m[2] * m[2] + m[6] * m[6] + m[10] * m[10];

+      if (f < 1e-12) f = 1.0;

+      if (ctx->_NeedEyeCoords)

+	 ctx->_ModelViewInvScale = (GLfloat) INV_SQRTF(f);

+      else

+	 ctx->_ModelViewInvScale = (GLfloat) SQRTF(f);

+   }

+}

+

+

+/**

+ * Bring up to date any state that relies on _NeedEyeCoords.

+ */

+void

+_mesa_update_tnl_spaces( struct gl_context *ctx, GLuint new_state )

+{

+   const GLuint oldneedeyecoords = ctx->_NeedEyeCoords;

+

+   (void) new_state;

+   ctx->_NeedEyeCoords = GL_FALSE;

+

+   if (ctx->_ForceEyeCoords ||

+       (ctx->Texture._GenFlags & TEXGEN_NEED_EYE_COORD) ||

+       ctx->Point._Attenuated ||

+       ctx->Light._NeedEyeCoords)

+      ctx->_NeedEyeCoords = GL_TRUE;

+

+   if (ctx->Light.Enabled &&

+       !_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top))

+      ctx->_NeedEyeCoords = GL_TRUE;

+

+   /* Check if the truth-value interpretations of the bitfields have

+    * changed:

+    */

+   if (oldneedeyecoords != ctx->_NeedEyeCoords) {

+      /* Recalculate all state that depends on _NeedEyeCoords.

+       */

+      update_modelview_scale(ctx);

+      compute_light_positions( ctx );

+

+      if (ctx->Driver.LightingSpaceChange)

+	 ctx->Driver.LightingSpaceChange( ctx );

+   }

+   else {

+      GLuint new_state2 = ctx->NewState;

+

+      /* Recalculate that same state only if it has been invalidated

+       * by other statechanges.

+       */

+      if (new_state2 & _NEW_MODELVIEW)

+	 update_modelview_scale(ctx);

+

+      if (new_state2 & (_NEW_LIGHT|_NEW_MODELVIEW))

+	 compute_light_positions( ctx );

+   }

+}

+

+

+/**

+ * Drivers may need this if the hardware tnl unit doesn't support the

+ * light-in-modelspace optimization.  It's also useful for debugging.

+ */

+void

+_mesa_allow_light_in_model( struct gl_context *ctx, GLboolean flag )

+{

+   ctx->_ForceEyeCoords = !flag;

+   ctx->NewState |= _NEW_POINT;	/* one of the bits from

+				 * _MESA_NEW_NEED_EYE_COORDS.

+				 */

+}

+

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+/**

+ * Initialize the n-th light data structure.

+ *

+ * \param l pointer to the gl_light structure to be initialized.

+ * \param n number of the light. 

+ * \note The defaults for light 0 are different than the other lights.

+ */

+static void

+init_light( struct gl_light *l, GLuint n )

+{

+   make_empty_list( l );

+

+   ASSIGN_4V( l->Ambient, 0.0, 0.0, 0.0, 1.0 );

+   if (n==0) {

+      ASSIGN_4V( l->Diffuse, 1.0, 1.0, 1.0, 1.0 );

+      ASSIGN_4V( l->Specular, 1.0, 1.0, 1.0, 1.0 );

+   }

+   else {

+      ASSIGN_4V( l->Diffuse, 0.0, 0.0, 0.0, 1.0 );

+      ASSIGN_4V( l->Specular, 0.0, 0.0, 0.0, 1.0 );

+   }

+   ASSIGN_4V( l->EyePosition, 0.0, 0.0, 1.0, 0.0 );

+   ASSIGN_3V( l->SpotDirection, 0.0, 0.0, -1.0 );

+   l->SpotExponent = 0.0;

+   _mesa_invalidate_spot_exp_table( l );

+   l->SpotCutoff = 180.0;

+   l->_CosCutoffNeg = -1.0f;

+   l->_CosCutoff = 0.0;		/* KW: -ve values not admitted */

+   l->ConstantAttenuation = 1.0;

+   l->LinearAttenuation = 0.0;

+   l->QuadraticAttenuation = 0.0;

+   l->Enabled = GL_FALSE;

+}

+

+

+/**

+ * Initialize the light model data structure.

+ *

+ * \param lm pointer to the gl_lightmodel structure to be initialized.

+ */

+static void

+init_lightmodel( struct gl_lightmodel *lm )

+{

+   ASSIGN_4V( lm->Ambient, 0.2F, 0.2F, 0.2F, 1.0F );

+   lm->LocalViewer = GL_FALSE;

+   lm->TwoSide = GL_FALSE;

+   lm->ColorControl = GL_SINGLE_COLOR;

+}

+

+

+/**

+ * Initialize the material data structure.

+ * 

+ * \param m pointer to the gl_material structure to be initialized.

+ */

+static void

+init_material( struct gl_material *m )

+{

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_AMBIENT],  0.2F, 0.2F, 0.2F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_DIFFUSE],  0.8F, 0.8F, 0.8F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_SPECULAR], 0.0F, 0.0F, 0.0F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_EMISSION], 0.0F, 0.0F, 0.0F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_SHININESS], 0.0F, 0.0F, 0.0F, 0.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_FRONT_INDEXES], 0.0F, 1.0F, 1.0F, 0.0F );

+ 

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_AMBIENT],  0.2F, 0.2F, 0.2F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_DIFFUSE],  0.8F, 0.8F, 0.8F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_SPECULAR], 0.0F, 0.0F, 0.0F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_EMISSION], 0.0F, 0.0F, 0.0F, 1.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_SHININESS], 0.0F, 0.0F, 0.0F, 0.0F );

+   ASSIGN_4V( m->Attrib[MAT_ATTRIB_BACK_INDEXES], 0.0F, 1.0F, 1.0F, 0.0F );

+}

+

+

+/**

+ * Initialize all lighting state for the given context.

+ */

+void

+_mesa_init_lighting( struct gl_context *ctx )

+{

+   GLuint i;

+

+   /* Lighting group */

+   for (i = 0; i < MAX_LIGHTS; i++) {

+      init_light( &ctx->Light.Light[i], i );

+   }

+   make_empty_list( &ctx->Light.EnabledList );

+

+   init_lightmodel( &ctx->Light.Model );

+   init_material( &ctx->Light.Material );

+   ctx->Light.ShadeModel = GL_SMOOTH;

+   ctx->Light.ProvokingVertex = GL_LAST_VERTEX_CONVENTION_EXT;

+   ctx->Light.Enabled = GL_FALSE;

+   ctx->Light.ColorMaterialFace = GL_FRONT_AND_BACK;

+   ctx->Light.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE;

+   ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx,

+                                               GL_FRONT_AND_BACK,

+                                               GL_AMBIENT_AND_DIFFUSE, ~0,

+                                               NULL );

+

+   ctx->Light.ColorMaterialEnabled = GL_FALSE;

+   ctx->Light.ClampVertexColor = GL_TRUE;

+

+   /* Lighting miscellaneous */

+   ctx->_ShineTabList = MALLOC_STRUCT( gl_shine_tab );

+   make_empty_list( ctx->_ShineTabList );

+   /* Allocate 10 (arbitrary) shininess lookup tables */

+   for (i = 0 ; i < 10 ; i++) {

+      struct gl_shine_tab *s = MALLOC_STRUCT( gl_shine_tab );

+      s->shininess = -1;

+      s->refcount = 0;

+      insert_at_tail( ctx->_ShineTabList, s );

+   }

+

+   /* Miscellaneous */

+   ctx->Light._NeedEyeCoords = GL_FALSE;

+   ctx->_NeedEyeCoords = GL_FALSE;

+   ctx->_ForceEyeCoords = GL_FALSE;

+   ctx->_ModelViewInvScale = 1.0;

+}

+

+

+/**

+ * Deallocate malloc'd lighting state attached to given context.

+ */

+void

+_mesa_free_lighting_data( struct gl_context *ctx )

+{

+   struct gl_shine_tab *s, *tmps;

+

+   /* Free lighting shininess exponentiation table */

+   foreach_s( s, tmps, ctx->_ShineTabList ) {

+      free( s );

+   }

+   free( ctx->_ShineTabList );

+}

diff --git a/mesalib/src/mesa/main/light.h b/mesalib/src/mesa/main/light.h
index b3436114d..cd8aeaeb6 100644
--- a/mesalib/src/mesa/main/light.h
+++ b/mesalib/src/mesa/main/light.h
@@ -1,146 +1,151 @@
-/*
- * 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.
- */
-
-
-#ifndef LIGHT_H
-#define LIGHT_H
-
-
-#include "mtypes.h"
-
-extern void GLAPIENTRY
-_mesa_ShadeModel( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode);
-
-
-#if _HAVE_FULL_GL
-extern void GLAPIENTRY
-_mesa_ColorMaterial( GLenum face, GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_Lightf( GLenum light, GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_Lighti( GLenum light, GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_LightModelf( GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_LightModelfv( GLenum pname, const GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_LightModeli( GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_LightModeliv( GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params );
-
-extern void GLAPIENTRY
-_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
-
-extern void GLAPIENTRY
-_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
-
-
-extern void
-_mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params);
-
-
-/* Lerp between adjacent values in the f(x) lookup table, giving a
- * continuous function, with adequeate overall accuracy.  (Though
- * still pretty good compared to a straight lookup).
- * Result should be a GLfloat.
- */
-#define GET_SHINE_TAB_ENTRY( table, dp, result )			\
-do {									\
-   struct gl_shine_tab *_tab = table;					\
-   float f = (dp * (SHINE_TABLE_SIZE-1));				\
-   int k = (int) f;							\
-   if (k < 0 /* gcc may cast an overflow float value to negative int value*/ \
-	|| k > SHINE_TABLE_SIZE-2)					\
-      result = (GLfloat) pow( dp, _tab->shininess );		\
-   else									\
-      result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]);	\
-} while (0)
-
-
-extern GLuint _mesa_material_bitmask( GLcontext *ctx,
-                                      GLenum face, GLenum pname,
-                                      GLuint legal,
-                                      const char * );
-
-extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );
-
-extern void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i );
-
-extern void _mesa_validate_all_lighting_tables( GLcontext *ctx );
-
-extern void _mesa_update_lighting( GLcontext *ctx );
-
-extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
-
-extern void _mesa_update_material( GLcontext *ctx,
-                                   GLuint bitmask );
-
-extern void _mesa_copy_materials( struct gl_material *dst,
-				  const struct gl_material *src,
-				  GLuint bitmask );
-
-extern void _mesa_update_color_material( GLcontext *ctx,
-                                         const GLfloat rgba[4] );
-
-extern void _mesa_init_lighting( GLcontext *ctx );
-
-extern void _mesa_free_lighting_data( GLcontext *ctx );
-
-extern void _mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag );
-
-#else
-#define _mesa_update_color_material( c, r ) ((void)0)
-#define _mesa_validate_all_lighting_tables( c ) ((void)0)
-#define _mesa_invalidate_spot_exp_table( l ) ((void)0)
-#define _mesa_material_bitmask( c, f, p, l, s ) 0
-#define _mesa_init_lighting( c ) ((void)0)
-#define _mesa_free_lighting_data( c ) ((void)0)
-#define _mesa_update_lighting( c ) ((void)0)
-#define _mesa_update_tnl_spaces( c, n ) ((void)0)
-#define GET_SHINE_TAB_ENTRY( table, dp, result )  ((result)=0)
-#endif
-
-#endif
+/*

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

+ */

+

+

+#ifndef LIGHT_H

+#define LIGHT_H

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+struct gl_light;

+struct gl_material;

+

+extern void GLAPIENTRY

+_mesa_ShadeModel( GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_ProvokingVertexEXT(GLenum mode);

+

+

+#if _HAVE_FULL_GL

+extern void GLAPIENTRY

+_mesa_ColorMaterial( GLenum face, GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_Lightf( GLenum light, GLenum pname, GLfloat param );

+

+extern void GLAPIENTRY

+_mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params );

+

+extern void GLAPIENTRY

+_mesa_Lightiv( GLenum light, GLenum pname, const GLint *params );

+

+extern void GLAPIENTRY

+_mesa_Lighti( GLenum light, GLenum pname, GLint param );

+

+extern void GLAPIENTRY

+_mesa_LightModelf( GLenum pname, GLfloat param );

+

+extern void GLAPIENTRY

+_mesa_LightModelfv( GLenum pname, const GLfloat *params );

+

+extern void GLAPIENTRY

+_mesa_LightModeli( GLenum pname, GLint param );

+

+extern void GLAPIENTRY

+_mesa_LightModeliv( GLenum pname, const GLint *params );

+

+extern void GLAPIENTRY

+_mesa_GetLightfv( GLenum light, GLenum pname, GLfloat *params );

+

+extern void GLAPIENTRY

+_mesa_GetLightiv( GLenum light, GLenum pname, GLint *params );

+

+extern void GLAPIENTRY

+_mesa_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params );

+

+extern void GLAPIENTRY

+_mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );

+

+

+extern void

+_mesa_light(struct gl_context *ctx, GLuint lnum, GLenum pname, const GLfloat *params);

+

+

+/* Lerp between adjacent values in the f(x) lookup table, giving a

+ * continuous function, with adequeate overall accuracy.  (Though

+ * still pretty good compared to a straight lookup).

+ * Result should be a GLfloat.

+ */

+#define GET_SHINE_TAB_ENTRY( table, dp, result )			\

+do {									\

+   struct gl_shine_tab *_tab = table;					\

+   float f = (dp * (SHINE_TABLE_SIZE-1));				\

+   int k = (int) f;							\

+   if (k < 0 /* gcc may cast an overflow float value to negative int value*/ \

+	|| k > SHINE_TABLE_SIZE-2)					\

+      result = (GLfloat) pow( dp, _tab->shininess );		\

+   else									\

+      result = _tab->tab[k] + (f-k)*(_tab->tab[k+1]-_tab->tab[k]);	\

+} while (0)

+

+

+extern GLuint _mesa_material_bitmask( struct gl_context *ctx,

+                                      GLenum face, GLenum pname,

+                                      GLuint legal,

+                                      const char * );

+

+extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );

+

+extern void _mesa_invalidate_shine_table( struct gl_context *ctx, GLuint i );

+

+extern void _mesa_validate_all_lighting_tables( struct gl_context *ctx );

+

+extern void _mesa_update_lighting( struct gl_context *ctx );

+

+extern void _mesa_update_tnl_spaces( struct gl_context *ctx, GLuint new_state );

+

+extern void _mesa_update_material( struct gl_context *ctx,

+                                   GLuint bitmask );

+

+extern void _mesa_copy_materials( struct gl_material *dst,

+				  const struct gl_material *src,

+				  GLuint bitmask );

+

+extern void _mesa_update_color_material( struct gl_context *ctx,

+                                         const GLfloat rgba[4] );

+

+extern void _mesa_init_lighting( struct gl_context *ctx );

+

+extern void _mesa_free_lighting_data( struct gl_context *ctx );

+

+extern void _mesa_allow_light_in_model( struct gl_context *ctx, GLboolean flag );

+

+#else

+#define _mesa_update_color_material( c, r ) ((void)0)

+#define _mesa_validate_all_lighting_tables( c ) ((void)0)

+#define _mesa_invalidate_spot_exp_table( l ) ((void)0)

+#define _mesa_material_bitmask( c, f, p, l, s ) 0

+#define _mesa_init_lighting( c ) ((void)0)

+#define _mesa_free_lighting_data( c ) ((void)0)

+#define _mesa_update_lighting( c ) ((void)0)

+#define _mesa_update_tnl_spaces( c, n ) ((void)0)

+#define GET_SHINE_TAB_ENTRY( table, dp, result )  ((result)=0)

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/lines.c b/mesalib/src/mesa/main/lines.c
index cc63a759e..79385cd75 100644
--- a/mesalib/src/mesa/main/lines.c
+++ b/mesalib/src/mesa/main/lines.c
@@ -1,116 +1,111 @@
-/*
- * 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 (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 (width != 1.0F)
-      ctx->_TriangleCaps |= DD_LINE_WIDTH;
-   else
-      ctx->_TriangleCaps &= ~DD_LINE_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);
-
-   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 __GLcontextRec::Line and line related constants in
- * __GLcontextRec::Const.
- */
-void GLAPIENTRY
-_mesa_init_line( GLcontext * 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 (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);

+

+   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/lines.h b/mesalib/src/mesa/main/lines.h
index 5a47e9858..c882fc679 100644
--- a/mesalib/src/mesa/main/lines.h
+++ b/mesalib/src/mesa/main/lines.h
@@ -1,48 +1,49 @@
-/**
- * \file lines.h
- * Line operations.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 LINES_H
-#define LINES_H
-
-
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_LineWidth( GLfloat width );
-
-extern void GLAPIENTRY
-_mesa_LineStipple( GLint factor, GLushort pattern );
-
-extern void GLAPIENTRY 
-_mesa_init_line( GLcontext * ctx );
-
-#endif
+/**

+ * \file lines.h

+ * Line operations.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 LINES_H

+#define LINES_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_LineWidth( GLfloat width );

+

+extern void GLAPIENTRY

+_mesa_LineStipple( GLint factor, GLushort pattern );

+

+extern void GLAPIENTRY 

+_mesa_init_line( struct gl_context * ctx );

+

+#endif

diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c
index 4b8c00b5b..3fae85cad 100644
--- a/mesalib/src/mesa/main/matrix.c
+++ b/mesalib/src/mesa/main/matrix.c
@@ -1,793 +1,787 @@
-/*
- * 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 matrix.c
- * Matrix operations.
- *
- * \note
- * -# 4x4 transformation matrices are stored in memory in column major order.
- * -# Points/vertices are to be thought of as column vectors.
- * -# Transformation of a point p by a matrix M is: p' = M * p
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "enums.h"
-#include "macros.h"
-#include "matrix.h"
-#include "mtypes.h"
-#include "math/m_matrix.h"
-
-
-/**
- * Apply a perspective projection matrix.
- *
- * \param left left clipping plane coordinate.
- * \param right right clipping plane coordinate.
- * \param bottom bottom clipping plane coordinate.
- * \param top top clipping plane coordinate.
- * \param nearval distance to the near clipping plane.
- * \param farval distance to the far clipping plane.
- *
- * \sa glFrustum().
- *
- * Flushes vertices and validates parameters. Calls _math_matrix_frustum() with
- * the top matrix of the current matrix stack and sets
- * __GLcontextRec::NewState.
- */
-void GLAPIENTRY
-_mesa_Frustum( GLdouble left, GLdouble right,
-               GLdouble bottom, GLdouble top,
-               GLdouble nearval, GLdouble farval )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (nearval <= 0.0 ||
-       farval <= 0.0 ||
-       nearval == farval ||
-       left == right ||
-       top == bottom)
-   {
-      _mesa_error( ctx,  GL_INVALID_VALUE, "glFrustum" );
-      return;
-   }
-
-   _math_matrix_frustum( ctx->CurrentStack->Top,
-                         (GLfloat) left, (GLfloat) right, 
-			 (GLfloat) bottom, (GLfloat) top, 
-			 (GLfloat) nearval, (GLfloat) farval );
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
-
-/**
- * Apply an orthographic projection matrix.
- *
- * \param left left clipping plane coordinate.
- * \param right right clipping plane coordinate.
- * \param bottom bottom clipping plane coordinate.
- * \param top top clipping plane coordinate.
- * \param nearval distance to the near clipping plane.
- * \param farval distance to the far clipping plane.
- *
- * \sa glOrtho().
- *
- * Flushes vertices and validates parameters. Calls _math_matrix_ortho() with
- * the top matrix of the current matrix stack and sets
- * __GLcontextRec::NewState.
- */
-void GLAPIENTRY
-_mesa_Ortho( GLdouble left, GLdouble right,
-             GLdouble bottom, GLdouble top,
-             GLdouble nearval, GLdouble farval )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glOrtho(%f, %f, %f, %f, %f, %f)\n",
-                  left, right, bottom, top, nearval, farval);
-
-   if (left == right ||
-       bottom == top ||
-       nearval == farval)
-   {
-      _mesa_error( ctx,  GL_INVALID_VALUE, "glOrtho" );
-      return;
-   }
-
-   _math_matrix_ortho( ctx->CurrentStack->Top,
-                       (GLfloat) left, (GLfloat) right, 
-		       (GLfloat) bottom, (GLfloat) top, 
-		       (GLfloat) nearval, (GLfloat) farval );
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
-
-/**
- * Set the current matrix stack.
- *
- * \param mode matrix stack.
- *
- * \sa glMatrixMode().
- *
- * Flushes the vertices, validates the parameter and updates
- * __GLcontextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
- * specified matrix stack.
- */
-void GLAPIENTRY
-_mesa_MatrixMode( GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->Transform.MatrixMode == mode && mode != GL_TEXTURE)
-      return;
-   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-
-   switch (mode) {
-   case GL_MODELVIEW:
-      ctx->CurrentStack = &ctx->ModelviewMatrixStack;
-      break;
-   case GL_PROJECTION:
-      ctx->CurrentStack = &ctx->ProjectionMatrixStack;
-      break;
-   case GL_TEXTURE:
-      /* This error check is disabled because if we're called from
-       * glPopAttrib() when the active texture unit is >= MaxTextureCoordUnits
-       * we'll generate an unexpected error.
-       * From the GL_ARB_vertex_shader spec it sounds like we should instead
-       * do error checking in other places when we actually try to access
-       * texture matrices beyond MaxTextureCoordUnits.
-       */
-#if 0
-      if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid tex unit %d)",
-                     ctx->Texture.CurrentUnit);
-         return;
-      }
-#endif
-      ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->TextureMatrixStack));
-      ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];
-      break;
-   case GL_COLOR:
-      ctx->CurrentStack = &ctx->ColorMatrixStack;
-      break;
-   case GL_MATRIX0_NV:
-   case GL_MATRIX1_NV:
-   case GL_MATRIX2_NV:
-   case GL_MATRIX3_NV:
-   case GL_MATRIX4_NV:
-   case GL_MATRIX5_NV:
-   case GL_MATRIX6_NV:
-   case GL_MATRIX7_NV:
-      if (ctx->Extensions.NV_vertex_program) {
-         ctx->CurrentStack = &ctx->ProgramMatrixStack[mode - GL_MATRIX0_NV];
-      }
-      else {
-         _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );
-         return;
-      }
-      break;
-   case GL_MATRIX0_ARB:
-   case GL_MATRIX1_ARB:
-   case GL_MATRIX2_ARB:
-   case GL_MATRIX3_ARB:
-   case GL_MATRIX4_ARB:
-   case GL_MATRIX5_ARB:
-   case GL_MATRIX6_ARB:
-   case GL_MATRIX7_ARB:
-      if (ctx->Extensions.ARB_vertex_program ||
-          ctx->Extensions.ARB_fragment_program) {
-         const GLuint m = mode - GL_MATRIX0_ARB;
-         if (m > ctx->Const.MaxProgramMatrices) {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glMatrixMode(GL_MATRIX%d_ARB)", m);
-            return;
-         }
-         ctx->CurrentStack = &ctx->ProgramMatrixStack[m];
-      }
-      else {
-         _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );
-         return;
-      }
-      break;
-   default:
-      _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );
-      return;
-   }
-
-   ctx->Transform.MatrixMode = mode;
-}
-
-
-/**
- * Push the current matrix stack.
- *
- * \sa glPushMatrix().
- * 
- * Verifies the current matrix stack is not full, and duplicates the top-most
- * matrix in the stack. Marks __GLcontextRec::NewState with the stack dirty
- * flag.
- */
-void GLAPIENTRY
-_mesa_PushMatrix( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_matrix_stack *stack = ctx->CurrentStack;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glPushMatrix %s\n",
-                  _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));
-
-   if (stack->Depth + 1 >= stack->MaxDepth) {
-      if (ctx->Transform.MatrixMode == GL_TEXTURE) {
-         _mesa_error(ctx,  GL_STACK_OVERFLOW,
-                     "glPushMatrix(mode=GL_TEXTURE, unit=%d)",
-                      ctx->Texture.CurrentUnit);
-      }
-      else {
-         _mesa_error(ctx,  GL_STACK_OVERFLOW, "glPushMatrix(mode=%s)",
-                     _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));
-      }
-      return;
-   }
-   _math_matrix_copy( &stack->Stack[stack->Depth + 1],
-                      &stack->Stack[stack->Depth] );
-   stack->Depth++;
-   stack->Top = &(stack->Stack[stack->Depth]);
-   ctx->NewState |= stack->DirtyFlag;
-}
-
-
-/**
- * Pop the current matrix stack.
- *
- * \sa glPopMatrix().
- * 
- * Flushes the vertices, verifies the current matrix stack is not empty, and
- * moves the stack head down. Marks __GLcontextRec::NewState with the dirty
- * stack flag.
- */
-void GLAPIENTRY
-_mesa_PopMatrix( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_matrix_stack *stack = ctx->CurrentStack;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glPopMatrix %s\n",
-                  _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));
-
-   if (stack->Depth == 0) {
-      if (ctx->Transform.MatrixMode == GL_TEXTURE) {
-         _mesa_error(ctx,  GL_STACK_UNDERFLOW,
-                     "glPopMatrix(mode=GL_TEXTURE, unit=%d)",
-                      ctx->Texture.CurrentUnit);
-      }
-      else {
-         _mesa_error(ctx,  GL_STACK_UNDERFLOW, "glPopMatrix(mode=%s)",
-                     _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));
-      }
-      return;
-   }
-   stack->Depth--;
-   stack->Top = &(stack->Stack[stack->Depth]);
-   ctx->NewState |= stack->DirtyFlag;
-}
-
-
-/**
- * Replace the current matrix with the identity matrix.
- *
- * \sa glLoadIdentity().
- *
- * Flushes the vertices and calls _math_matrix_set_identity() with the top-most
- * matrix in the current stack. Marks __GLcontextRec::NewState with the stack
- * dirty flag.
- */
-void GLAPIENTRY
-_mesa_LoadIdentity( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glLoadIdentity()\n");
-
-   _math_matrix_set_identity( ctx->CurrentStack->Top );
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
-
-/**
- * Replace the current matrix with a given matrix.
- *
- * \param m matrix.
- *
- * \sa glLoadMatrixf().
- *
- * Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix
- * in the current stack and the given matrix. Marks __GLcontextRec::NewState
- * with the dirty stack flag.
- */
-void GLAPIENTRY
-_mesa_LoadMatrixf( const GLfloat *m )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (!m) return;
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx,
-          "glLoadMatrix(%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f\n",
-          m[0], m[4], m[8], m[12],
-          m[1], m[5], m[9], m[13],
-          m[2], m[6], m[10], m[14],
-          m[3], m[7], m[11], m[15]);
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _math_matrix_loadf( ctx->CurrentStack->Top, m );
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
-
-/**
- * Multiply the current matrix with a given matrix.
- *
- * \param m matrix.
- *
- * \sa glMultMatrixf().
- *
- * Flushes the vertices and calls _math_matrix_mul_floats() with the top-most
- * matrix in the current stack and the given matrix. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
- */
-void GLAPIENTRY
-_mesa_MultMatrixf( const GLfloat *m )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (!m) return;
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx,
-          "glMultMatrix(%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f\n",
-          m[0], m[4], m[8], m[12],
-          m[1], m[5], m[9], m[13],
-          m[2], m[6], m[10], m[14],
-          m[3], m[7], m[11], m[15]);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _math_matrix_mul_floats( ctx->CurrentStack->Top, m );
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
-
-/**
- * Multiply the current matrix with a rotation matrix.
- *
- * \param angle angle of rotation, in degrees.
- * \param x rotation vector x coordinate.
- * \param y rotation vector y coordinate.
- * \param z rotation vector z coordinate.
- *
- * \sa glRotatef().
- *
- * Flushes the vertices and calls _math_matrix_rotate() with the top-most
- * matrix in the current stack and the given parameters. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
- */
-void GLAPIENTRY
-_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   if (angle != 0.0F) {
-      _math_matrix_rotate( ctx->CurrentStack->Top, angle, x, y, z);
-      ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-   }
-}
-
-
-/**
- * Multiply the current matrix with a general scaling matrix.
- *
- * \param x x axis scale factor.
- * \param y y axis scale factor.
- * \param z z axis scale factor.
- *
- * \sa glScalef().
- *
- * Flushes the vertices and calls _math_matrix_scale() with the top-most
- * matrix in the current stack and the given parameters. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
- */
-void GLAPIENTRY
-_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _math_matrix_scale( ctx->CurrentStack->Top, x, y, z);
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
-
-/**
- * Multiply the current matrix with a translation matrix.
- *
- * \param x translation vector x coordinate.
- * \param y translation vector y coordinate.
- * \param z translation vector z coordinate.
- *
- * \sa glTranslatef().
- *
- * Flushes the vertices and calls _math_matrix_translate() with the top-most
- * matrix in the current stack and the given parameters. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
- */
-void GLAPIENTRY
-_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _math_matrix_translate( ctx->CurrentStack->Top, x, y, z);
-   ctx->NewState |= ctx->CurrentStack->DirtyFlag;
-}
-
- 
-#if _HAVE_FULL_GL
-void GLAPIENTRY
-_mesa_LoadMatrixd( const GLdouble *m )
-{
-   GLint i;
-   GLfloat f[16];
-   if (!m) return;
-   for (i = 0; i < 16; i++)
-      f[i] = (GLfloat) m[i];
-   _mesa_LoadMatrixf(f);
-}
-
-void GLAPIENTRY
-_mesa_MultMatrixd( const GLdouble *m )
-{
-   GLint i;
-   GLfloat f[16];
-   if (!m) return;
-   for (i = 0; i < 16; i++)
-      f[i] = (GLfloat) m[i];
-   _mesa_MultMatrixf( f );
-}
-
-
-void GLAPIENTRY
-_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z )
-{
-   _mesa_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-
-void GLAPIENTRY
-_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z )
-{
-   _mesa_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-
-
-void GLAPIENTRY
-_mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
-{
-   _mesa_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);
-}
-#endif
-
-
-#if _HAVE_FULL_GL
-void GLAPIENTRY
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m )
-{
-   GLfloat tm[16];
-   if (!m) return;
-   _math_transposef(tm, m);
-   _mesa_LoadMatrixf(tm);
-}
-
-
-void GLAPIENTRY
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m )
-{
-   GLfloat tm[16];
-   if (!m) return;
-   _math_transposefd(tm, m);
-   _mesa_LoadMatrixf(tm);
-}
-
-
-void GLAPIENTRY
-_mesa_MultTransposeMatrixfARB( const GLfloat *m )
-{
-   GLfloat tm[16];
-   if (!m) return;
-   _math_transposef(tm, m);
-   _mesa_MultMatrixf(tm);
-}
-
-
-void GLAPIENTRY
-_mesa_MultTransposeMatrixdARB( const GLdouble *m )
-{
-   GLfloat tm[16];
-   if (!m) return;
-   _math_transposefd(tm, m);
-   _mesa_MultMatrixf(tm);
-}
-#endif
-
-
-
-/**********************************************************************/
-/** \name State management */
-/*@{*/
-
-
-/**
- * Update the projection matrix stack.
- *
- * \param ctx GL context.
- *
- * Calls _math_matrix_analyse() with the top-matrix of the projection matrix
- * stack, and recomputes user clip positions if necessary.
- * 
- * \note This routine references __GLcontextRec::Tranform attribute values to
- * compute userclip positions in clip space, but is only called on
- * _NEW_PROJECTION.  The _mesa_ClipPlane() function keeps these values up to
- * date across changes to the __GLcontextRec::Transform attributes.
- */
-static void
-update_projection( GLcontext *ctx )
-{
-   _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
-
-#if FEATURE_userclip
-   /* Recompute clip plane positions in clipspace.  This is also done
-    * in _mesa_ClipPlane().
-    */
-   if (ctx->Transform.ClipPlanesEnabled) {
-      GLuint p;
-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-	    _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],
-				 ctx->Transform.EyeUserPlane[p],
-				 ctx->ProjectionMatrixStack.Top->inv );
-	 }
-      }
-   }
-#endif
-}
-
-
-/**
- * Calculate the combined modelview-projection matrix.
- *
- * \param ctx GL context.
- *
- * Multiplies the top matrices of the projection and model view stacks into
- * __GLcontextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and
- * analyzes the resulting matrix via _math_matrix_analyse().
- */
-static void
-calculate_model_project_matrix( GLcontext *ctx )
-{
-   _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
-                            ctx->ProjectionMatrixStack.Top,
-                            ctx->ModelviewMatrixStack.Top );
-
-   _math_matrix_analyse( &ctx->_ModelProjectMatrix );
-}
-
-
-/**
- * Updates the combined modelview-projection matrix.
- *
- * \param ctx GL context.
- * \param new_state new state bit mask.
- *
- * If there is a new model view matrix then analyzes it. If there is a new
- * projection matrix, updates it. Finally calls
- * calculate_model_project_matrix() to recalculate the modelview-projection
- * matrix.
- */
-void _mesa_update_modelview_project( GLcontext *ctx, GLuint new_state )
-{
-   if (new_state & _NEW_MODELVIEW) {
-      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
-    
-      /* Bring cull position uptodate.
-       */
-      TRANSFORM_POINT3( ctx->Transform.CullObjPos, 
-			ctx->ModelviewMatrixStack.Top->inv,
-			ctx->Transform.CullEyePos );
-   }
-
-
-   if (new_state & _NEW_PROJECTION)
-      update_projection( ctx );
-
-   /* Keep ModelviewProject uptodate always to allow tnl
-    * implementations that go model->clip even when eye is required.
-    */
-   calculate_model_project_matrix(ctx);
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** Matrix stack initialization */
-/*@{*/
-
-
-/**
- * Initialize a matrix stack.
- *
- * \param stack matrix stack.
- * \param maxDepth maximum stack depth.
- * \param dirtyFlag dirty flag.
- * 
- * Allocates an array of \p maxDepth elements for the matrix stack and calls
- * _math_matrix_ctr() and _math_matrix_alloc_inv() for each element to
- * initialize it.
- */
-static void
-init_matrix_stack( struct gl_matrix_stack *stack,
-                   GLuint maxDepth, GLuint dirtyFlag )
-{
-   GLuint i;
-
-   stack->Depth = 0;
-   stack->MaxDepth = maxDepth;
-   stack->DirtyFlag = dirtyFlag;
-   /* The stack */
-   stack->Stack = (GLmatrix *) CALLOC(maxDepth * sizeof(GLmatrix));
-   for (i = 0; i < maxDepth; i++) {
-      _math_matrix_ctr(&stack->Stack[i]);
-      _math_matrix_alloc_inv(&stack->Stack[i]);
-   }
-   stack->Top = stack->Stack;
-}
-
-/**
- * Free matrix stack.
- * 
- * \param stack matrix stack.
- * 
- * Calls _math_matrix_dtr() for each element of the matrix stack and
- * frees the array.
- */
-static void
-free_matrix_stack( struct gl_matrix_stack *stack )
-{
-   GLuint i;
-   for (i = 0; i < stack->MaxDepth; i++) {
-      _math_matrix_dtr(&stack->Stack[i]);
-   }
-   FREE(stack->Stack);
-   stack->Stack = stack->Top = NULL;
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Initialization */
-/*@{*/
-
-
-/**
- * Initialize the context matrix data.
- *
- * \param ctx GL context.
- *
- * Initializes each of the matrix stacks and the combined modelview-projection
- * matrix.
- */
-void _mesa_init_matrix( GLcontext * ctx )
-{
-   GLint i;
-
-   /* Initialize matrix stacks */
-   init_matrix_stack(&ctx->ModelviewMatrixStack, MAX_MODELVIEW_STACK_DEPTH,
-                     _NEW_MODELVIEW);
-   init_matrix_stack(&ctx->ProjectionMatrixStack, MAX_PROJECTION_STACK_DEPTH,
-                     _NEW_PROJECTION);
-   init_matrix_stack(&ctx->ColorMatrixStack, MAX_COLOR_STACK_DEPTH,
-                     _NEW_COLOR_MATRIX);
-   for (i = 0; i < Elements(ctx->TextureMatrixStack); i++)
-      init_matrix_stack(&ctx->TextureMatrixStack[i], MAX_TEXTURE_STACK_DEPTH,
-                        _NEW_TEXTURE_MATRIX);
-   for (i = 0; i < Elements(ctx->ProgramMatrixStack); i++)
-      init_matrix_stack(&ctx->ProgramMatrixStack[i], 
-		        MAX_PROGRAM_MATRIX_STACK_DEPTH, _NEW_TRACK_MATRIX);
-   ctx->CurrentStack = &ctx->ModelviewMatrixStack;
-
-   /* Init combined Modelview*Projection matrix */
-   _math_matrix_ctr( &ctx->_ModelProjectMatrix );
-}
-
-
-/**
- * Free the context matrix data.
- * 
- * \param ctx GL context.
- *
- * Frees each of the matrix stacks and the combined modelview-projection
- * matrix.
- */
-void _mesa_free_matrix_data( GLcontext *ctx )
-{
-   GLint i;
-
-   free_matrix_stack(&ctx->ModelviewMatrixStack);
-   free_matrix_stack(&ctx->ProjectionMatrixStack);
-   free_matrix_stack(&ctx->ColorMatrixStack);
-   for (i = 0; i < Elements(ctx->TextureMatrixStack); i++)
-      free_matrix_stack(&ctx->TextureMatrixStack[i]);
-   for (i = 0; i < Elements(ctx->ProgramMatrixStack); i++)
-      free_matrix_stack(&ctx->ProgramMatrixStack[i]);
-   /* combined Modelview*Projection matrix */
-   _math_matrix_dtr( &ctx->_ModelProjectMatrix );
-
-}
-
-
-/** 
- * Initialize the context transform attribute group.
- *
- * \param ctx GL context.
- *
- * \todo Move this to a new file with other 'transform' routines.
- */
-void _mesa_init_transform( GLcontext *ctx )
-{
-   GLint i;
-
-   /* Transformation group */
-   ctx->Transform.MatrixMode = GL_MODELVIEW;
-   ctx->Transform.Normalize = GL_FALSE;
-   ctx->Transform.RescaleNormals = GL_FALSE;
-   ctx->Transform.RasterPositionUnclipped = GL_FALSE;
-   for (i=0;i<MAX_CLIP_PLANES;i++) {
-      ASSIGN_4V( ctx->Transform.EyeUserPlane[i], 0.0, 0.0, 0.0, 0.0 );
-   }
-   ctx->Transform.ClipPlanesEnabled = 0;
-
-   ASSIGN_4V( ctx->Transform.CullObjPos, 0.0, 0.0, 1.0, 0.0 );
-   ASSIGN_4V( ctx->Transform.CullEyePos, 0.0, 0.0, 1.0, 0.0 );
-}
-
-
-/*@}*/
+/*

+ * 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 matrix.c

+ * Matrix operations.

+ *

+ * \note

+ * -# 4x4 transformation matrices are stored in memory in column major order.

+ * -# Points/vertices are to be thought of as column vectors.

+ * -# Transformation of a point p by a matrix M is: p' = M * p

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "enums.h"

+#include "macros.h"

+#include "matrix.h"

+#include "mtypes.h"

+#include "math/m_matrix.h"

+

+

+/**

+ * Apply a perspective projection matrix.

+ *

+ * \param left left clipping plane coordinate.

+ * \param right right clipping plane coordinate.

+ * \param bottom bottom clipping plane coordinate.

+ * \param top top clipping plane coordinate.

+ * \param nearval distance to the near clipping plane.

+ * \param farval distance to the far clipping plane.

+ *

+ * \sa glFrustum().

+ *

+ * Flushes vertices and validates parameters. Calls _math_matrix_frustum() with

+ * the top matrix of the current matrix stack and sets

+ * __struct gl_contextRec::NewState.

+ */

+void GLAPIENTRY

+_mesa_Frustum( GLdouble left, GLdouble right,

+               GLdouble bottom, GLdouble top,

+               GLdouble nearval, GLdouble farval )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (nearval <= 0.0 ||

+       farval <= 0.0 ||

+       nearval == farval ||

+       left == right ||

+       top == bottom)

+   {

+      _mesa_error( ctx,  GL_INVALID_VALUE, "glFrustum" );

+      return;

+   }

+

+   _math_matrix_frustum( ctx->CurrentStack->Top,

+                         (GLfloat) left, (GLfloat) right, 

+			 (GLfloat) bottom, (GLfloat) top, 

+			 (GLfloat) nearval, (GLfloat) farval );

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+

+/**

+ * Apply an orthographic projection matrix.

+ *

+ * \param left left clipping plane coordinate.

+ * \param right right clipping plane coordinate.

+ * \param bottom bottom clipping plane coordinate.

+ * \param top top clipping plane coordinate.

+ * \param nearval distance to the near clipping plane.

+ * \param farval distance to the far clipping plane.

+ *

+ * \sa glOrtho().

+ *

+ * Flushes vertices and validates parameters. Calls _math_matrix_ortho() with

+ * the top matrix of the current matrix stack and sets

+ * __struct gl_contextRec::NewState.

+ */

+void GLAPIENTRY

+_mesa_Ortho( GLdouble left, GLdouble right,

+             GLdouble bottom, GLdouble top,

+             GLdouble nearval, GLdouble farval )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glOrtho(%f, %f, %f, %f, %f, %f)\n",

+                  left, right, bottom, top, nearval, farval);

+

+   if (left == right ||

+       bottom == top ||

+       nearval == farval)

+   {

+      _mesa_error( ctx,  GL_INVALID_VALUE, "glOrtho" );

+      return;

+   }

+

+   _math_matrix_ortho( ctx->CurrentStack->Top,

+                       (GLfloat) left, (GLfloat) right, 

+		       (GLfloat) bottom, (GLfloat) top, 

+		       (GLfloat) nearval, (GLfloat) farval );

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+

+/**

+ * Set the current matrix stack.

+ *

+ * \param mode matrix stack.

+ *

+ * \sa glMatrixMode().

+ *

+ * Flushes the vertices, validates the parameter and updates

+ * __struct gl_contextRec::CurrentStack and gl_transform_attrib::MatrixMode with the

+ * specified matrix stack.

+ */

+void GLAPIENTRY

+_mesa_MatrixMode( GLenum mode )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (ctx->Transform.MatrixMode == mode && mode != GL_TEXTURE)

+      return;

+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+

+   switch (mode) {

+   case GL_MODELVIEW:

+      ctx->CurrentStack = &ctx->ModelviewMatrixStack;

+      break;

+   case GL_PROJECTION:

+      ctx->CurrentStack = &ctx->ProjectionMatrixStack;

+      break;

+   case GL_TEXTURE:

+      /* This error check is disabled because if we're called from

+       * glPopAttrib() when the active texture unit is >= MaxTextureCoordUnits

+       * we'll generate an unexpected error.

+       * From the GL_ARB_vertex_shader spec it sounds like we should instead

+       * do error checking in other places when we actually try to access

+       * texture matrices beyond MaxTextureCoordUnits.

+       */

+#if 0

+      if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {

+         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid tex unit %d)",

+                     ctx->Texture.CurrentUnit);

+         return;

+      }

+#endif

+      ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->TextureMatrixStack));

+      ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];

+      break;

+   case GL_MATRIX0_NV:

+   case GL_MATRIX1_NV:

+   case GL_MATRIX2_NV:

+   case GL_MATRIX3_NV:

+   case GL_MATRIX4_NV:

+   case GL_MATRIX5_NV:

+   case GL_MATRIX6_NV:

+   case GL_MATRIX7_NV:

+      if (ctx->Extensions.NV_vertex_program) {

+         ctx->CurrentStack = &ctx->ProgramMatrixStack[mode - GL_MATRIX0_NV];

+      }

+      else {

+         _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );

+         return;

+      }

+      break;

+   case GL_MATRIX0_ARB:

+   case GL_MATRIX1_ARB:

+   case GL_MATRIX2_ARB:

+   case GL_MATRIX3_ARB:

+   case GL_MATRIX4_ARB:

+   case GL_MATRIX5_ARB:

+   case GL_MATRIX6_ARB:

+   case GL_MATRIX7_ARB:

+      if (ctx->Extensions.ARB_vertex_program ||

+          ctx->Extensions.ARB_fragment_program) {

+         const GLuint m = mode - GL_MATRIX0_ARB;

+         if (m > ctx->Const.MaxProgramMatrices) {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glMatrixMode(GL_MATRIX%d_ARB)", m);

+            return;

+         }

+         ctx->CurrentStack = &ctx->ProgramMatrixStack[m];

+      }

+      else {

+         _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );

+         return;

+      }

+      break;

+   default:

+      _mesa_error( ctx,  GL_INVALID_ENUM, "glMatrixMode(mode)" );

+      return;

+   }

+

+   ctx->Transform.MatrixMode = mode;

+}

+

+

+/**

+ * Push the current matrix stack.

+ *

+ * \sa glPushMatrix().

+ * 

+ * Verifies the current matrix stack is not full, and duplicates the top-most

+ * matrix in the stack. Marks __struct gl_contextRec::NewState with the stack dirty

+ * flag.

+ */

+void GLAPIENTRY

+_mesa_PushMatrix( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_matrix_stack *stack = ctx->CurrentStack;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glPushMatrix %s\n",

+                  _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));

+

+   if (stack->Depth + 1 >= stack->MaxDepth) {

+      if (ctx->Transform.MatrixMode == GL_TEXTURE) {

+         _mesa_error(ctx,  GL_STACK_OVERFLOW,

+                     "glPushMatrix(mode=GL_TEXTURE, unit=%d)",

+                      ctx->Texture.CurrentUnit);

+      }

+      else {

+         _mesa_error(ctx,  GL_STACK_OVERFLOW, "glPushMatrix(mode=%s)",

+                     _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));

+      }

+      return;

+   }

+   _math_matrix_copy( &stack->Stack[stack->Depth + 1],

+                      &stack->Stack[stack->Depth] );

+   stack->Depth++;

+   stack->Top = &(stack->Stack[stack->Depth]);

+   ctx->NewState |= stack->DirtyFlag;

+}

+

+

+/**

+ * Pop the current matrix stack.

+ *

+ * \sa glPopMatrix().

+ * 

+ * Flushes the vertices, verifies the current matrix stack is not empty, and

+ * moves the stack head down. Marks __struct gl_contextRec::NewState with the dirty

+ * stack flag.

+ */

+void GLAPIENTRY

+_mesa_PopMatrix( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_matrix_stack *stack = ctx->CurrentStack;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glPopMatrix %s\n",

+                  _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));

+

+   if (stack->Depth == 0) {

+      if (ctx->Transform.MatrixMode == GL_TEXTURE) {

+         _mesa_error(ctx,  GL_STACK_UNDERFLOW,

+                     "glPopMatrix(mode=GL_TEXTURE, unit=%d)",

+                      ctx->Texture.CurrentUnit);

+      }

+      else {

+         _mesa_error(ctx,  GL_STACK_UNDERFLOW, "glPopMatrix(mode=%s)",

+                     _mesa_lookup_enum_by_nr(ctx->Transform.MatrixMode));

+      }

+      return;

+   }

+   stack->Depth--;

+   stack->Top = &(stack->Stack[stack->Depth]);

+   ctx->NewState |= stack->DirtyFlag;

+}

+

+

+/**

+ * Replace the current matrix with the identity matrix.

+ *

+ * \sa glLoadIdentity().

+ *

+ * Flushes the vertices and calls _math_matrix_set_identity() with the top-most

+ * matrix in the current stack. Marks __struct gl_contextRec::NewState with the stack

+ * dirty flag.

+ */

+void GLAPIENTRY

+_mesa_LoadIdentity( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glLoadIdentity()\n");

+

+   _math_matrix_set_identity( ctx->CurrentStack->Top );

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+

+/**

+ * Replace the current matrix with a given matrix.

+ *

+ * \param m matrix.

+ *

+ * \sa glLoadMatrixf().

+ *

+ * Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix

+ * in the current stack and the given matrix. Marks __struct gl_contextRec::NewState

+ * with the dirty stack flag.

+ */

+void GLAPIENTRY

+_mesa_LoadMatrixf( const GLfloat *m )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (!m) return;

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx,

+          "glLoadMatrix(%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f\n",

+          m[0], m[4], m[8], m[12],

+          m[1], m[5], m[9], m[13],

+          m[2], m[6], m[10], m[14],

+          m[3], m[7], m[11], m[15]);

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _math_matrix_loadf( ctx->CurrentStack->Top, m );

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+

+/**

+ * Multiply the current matrix with a given matrix.

+ *

+ * \param m matrix.

+ *

+ * \sa glMultMatrixf().

+ *

+ * Flushes the vertices and calls _math_matrix_mul_floats() with the top-most

+ * matrix in the current stack and the given matrix. Marks

+ * __struct gl_contextRec::NewState with the dirty stack flag.

+ */

+void GLAPIENTRY

+_mesa_MultMatrixf( const GLfloat *m )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (!m) return;

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx,

+          "glMultMatrix(%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f\n",

+          m[0], m[4], m[8], m[12],

+          m[1], m[5], m[9], m[13],

+          m[2], m[6], m[10], m[14],

+          m[3], m[7], m[11], m[15]);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _math_matrix_mul_floats( ctx->CurrentStack->Top, m );

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+

+/**

+ * Multiply the current matrix with a rotation matrix.

+ *

+ * \param angle angle of rotation, in degrees.

+ * \param x rotation vector x coordinate.

+ * \param y rotation vector y coordinate.

+ * \param z rotation vector z coordinate.

+ *

+ * \sa glRotatef().

+ *

+ * Flushes the vertices and calls _math_matrix_rotate() with the top-most

+ * matrix in the current stack and the given parameters. Marks

+ * __struct gl_contextRec::NewState with the dirty stack flag.

+ */

+void GLAPIENTRY

+_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   if (angle != 0.0F) {

+      _math_matrix_rotate( ctx->CurrentStack->Top, angle, x, y, z);

+      ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+   }

+}

+

+

+/**

+ * Multiply the current matrix with a general scaling matrix.

+ *

+ * \param x x axis scale factor.

+ * \param y y axis scale factor.

+ * \param z z axis scale factor.

+ *

+ * \sa glScalef().

+ *

+ * Flushes the vertices and calls _math_matrix_scale() with the top-most

+ * matrix in the current stack and the given parameters. Marks

+ * __struct gl_contextRec::NewState with the dirty stack flag.

+ */

+void GLAPIENTRY

+_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _math_matrix_scale( ctx->CurrentStack->Top, x, y, z);

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+

+/**

+ * Multiply the current matrix with a translation matrix.

+ *

+ * \param x translation vector x coordinate.

+ * \param y translation vector y coordinate.

+ * \param z translation vector z coordinate.

+ *

+ * \sa glTranslatef().

+ *

+ * Flushes the vertices and calls _math_matrix_translate() with the top-most

+ * matrix in the current stack and the given parameters. Marks

+ * __struct gl_contextRec::NewState with the dirty stack flag.

+ */

+void GLAPIENTRY

+_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _math_matrix_translate( ctx->CurrentStack->Top, x, y, z);

+   ctx->NewState |= ctx->CurrentStack->DirtyFlag;

+}

+

+ 

+#if _HAVE_FULL_GL

+void GLAPIENTRY

+_mesa_LoadMatrixd( const GLdouble *m )

+{

+   GLint i;

+   GLfloat f[16];

+   if (!m) return;

+   for (i = 0; i < 16; i++)

+      f[i] = (GLfloat) m[i];

+   _mesa_LoadMatrixf(f);

+}

+

+void GLAPIENTRY

+_mesa_MultMatrixd( const GLdouble *m )

+{

+   GLint i;

+   GLfloat f[16];

+   if (!m) return;

+   for (i = 0; i < 16; i++)

+      f[i] = (GLfloat) m[i];

+   _mesa_MultMatrixf( f );

+}

+

+

+void GLAPIENTRY

+_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z )

+{

+   _mesa_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+

+void GLAPIENTRY

+_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z )

+{

+   _mesa_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+

+

+void GLAPIENTRY

+_mesa_Translated( GLdouble x, GLdouble y, GLdouble z )

+{

+   _mesa_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z);

+}

+#endif

+

+

+#if _HAVE_FULL_GL

+void GLAPIENTRY

+_mesa_LoadTransposeMatrixfARB( const GLfloat *m )

+{

+   GLfloat tm[16];

+   if (!m) return;

+   _math_transposef(tm, m);

+   _mesa_LoadMatrixf(tm);

+}

+

+

+void GLAPIENTRY

+_mesa_LoadTransposeMatrixdARB( const GLdouble *m )

+{

+   GLfloat tm[16];

+   if (!m) return;

+   _math_transposefd(tm, m);

+   _mesa_LoadMatrixf(tm);

+}

+

+

+void GLAPIENTRY

+_mesa_MultTransposeMatrixfARB( const GLfloat *m )

+{

+   GLfloat tm[16];

+   if (!m) return;

+   _math_transposef(tm, m);

+   _mesa_MultMatrixf(tm);

+}

+

+

+void GLAPIENTRY

+_mesa_MultTransposeMatrixdARB( const GLdouble *m )

+{

+   GLfloat tm[16];

+   if (!m) return;

+   _math_transposefd(tm, m);

+   _mesa_MultMatrixf(tm);

+}

+#endif

+

+

+

+/**********************************************************************/

+/** \name State management */

+/*@{*/

+

+

+/**

+ * Update the projection matrix stack.

+ *

+ * \param ctx GL context.

+ *

+ * Calls _math_matrix_analyse() with the top-matrix of the projection matrix

+ * stack, and recomputes user clip positions if necessary.

+ * 

+ * \note This routine references __struct gl_contextRec::Tranform attribute values to

+ * compute userclip positions in clip space, but is only called on

+ * _NEW_PROJECTION.  The _mesa_ClipPlane() function keeps these values up to

+ * date across changes to the __struct gl_contextRec::Transform attributes.

+ */

+static void

+update_projection( struct gl_context *ctx )

+{

+   _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

+

+#if FEATURE_userclip

+   /* Recompute clip plane positions in clipspace.  This is also done

+    * in _mesa_ClipPlane().

+    */

+   if (ctx->Transform.ClipPlanesEnabled) {

+      GLuint p;

+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+	    _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],

+				 ctx->Transform.EyeUserPlane[p],

+				 ctx->ProjectionMatrixStack.Top->inv );

+	 }

+      }

+   }

+#endif

+}

+

+

+/**

+ * Calculate the combined modelview-projection matrix.

+ *

+ * \param ctx GL context.

+ *

+ * Multiplies the top matrices of the projection and model view stacks into

+ * __struct gl_contextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and

+ * analyzes the resulting matrix via _math_matrix_analyse().

+ */

+static void

+calculate_model_project_matrix( struct gl_context *ctx )

+{

+   _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,

+                            ctx->ProjectionMatrixStack.Top,

+                            ctx->ModelviewMatrixStack.Top );

+

+   _math_matrix_analyse( &ctx->_ModelProjectMatrix );

+}

+

+

+/**

+ * Updates the combined modelview-projection matrix.

+ *

+ * \param ctx GL context.

+ * \param new_state new state bit mask.

+ *

+ * If there is a new model view matrix then analyzes it. If there is a new

+ * projection matrix, updates it. Finally calls

+ * calculate_model_project_matrix() to recalculate the modelview-projection

+ * matrix.

+ */

+void _mesa_update_modelview_project( struct gl_context *ctx, GLuint new_state )

+{

+   if (new_state & _NEW_MODELVIEW) {

+      _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );

+    

+      /* Bring cull position uptodate.

+       */

+      TRANSFORM_POINT3( ctx->Transform.CullObjPos, 

+			ctx->ModelviewMatrixStack.Top->inv,

+			ctx->Transform.CullEyePos );

+   }

+

+

+   if (new_state & _NEW_PROJECTION)

+      update_projection( ctx );

+

+   /* Keep ModelviewProject uptodate always to allow tnl

+    * implementations that go model->clip even when eye is required.

+    */

+   calculate_model_project_matrix(ctx);

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** Matrix stack initialization */

+/*@{*/

+

+

+/**

+ * Initialize a matrix stack.

+ *

+ * \param stack matrix stack.

+ * \param maxDepth maximum stack depth.

+ * \param dirtyFlag dirty flag.

+ * 

+ * Allocates an array of \p maxDepth elements for the matrix stack and calls

+ * _math_matrix_ctr() and _math_matrix_alloc_inv() for each element to

+ * initialize it.

+ */

+static void

+init_matrix_stack( struct gl_matrix_stack *stack,

+                   GLuint maxDepth, GLuint dirtyFlag )

+{

+   GLuint i;

+

+   stack->Depth = 0;

+   stack->MaxDepth = maxDepth;

+   stack->DirtyFlag = dirtyFlag;

+   /* The stack */

+   stack->Stack = (GLmatrix *) CALLOC(maxDepth * sizeof(GLmatrix));

+   for (i = 0; i < maxDepth; i++) {

+      _math_matrix_ctr(&stack->Stack[i]);

+      _math_matrix_alloc_inv(&stack->Stack[i]);

+   }

+   stack->Top = stack->Stack;

+}

+

+/**

+ * Free matrix stack.

+ * 

+ * \param stack matrix stack.

+ * 

+ * Calls _math_matrix_dtr() for each element of the matrix stack and

+ * frees the array.

+ */

+static void

+free_matrix_stack( struct gl_matrix_stack *stack )

+{

+   GLuint i;

+   for (i = 0; i < stack->MaxDepth; i++) {

+      _math_matrix_dtr(&stack->Stack[i]);

+   }

+   FREE(stack->Stack);

+   stack->Stack = stack->Top = NULL;

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Initialization */

+/*@{*/

+

+

+/**

+ * Initialize the context matrix data.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes each of the matrix stacks and the combined modelview-projection

+ * matrix.

+ */

+void _mesa_init_matrix( struct gl_context * ctx )

+{

+   GLint i;

+

+   /* Initialize matrix stacks */

+   init_matrix_stack(&ctx->ModelviewMatrixStack, MAX_MODELVIEW_STACK_DEPTH,

+                     _NEW_MODELVIEW);

+   init_matrix_stack(&ctx->ProjectionMatrixStack, MAX_PROJECTION_STACK_DEPTH,

+                     _NEW_PROJECTION);

+   for (i = 0; i < Elements(ctx->TextureMatrixStack); i++)

+      init_matrix_stack(&ctx->TextureMatrixStack[i], MAX_TEXTURE_STACK_DEPTH,

+                        _NEW_TEXTURE_MATRIX);

+   for (i = 0; i < Elements(ctx->ProgramMatrixStack); i++)

+      init_matrix_stack(&ctx->ProgramMatrixStack[i], 

+		        MAX_PROGRAM_MATRIX_STACK_DEPTH, _NEW_TRACK_MATRIX);

+   ctx->CurrentStack = &ctx->ModelviewMatrixStack;

+

+   /* Init combined Modelview*Projection matrix */

+   _math_matrix_ctr( &ctx->_ModelProjectMatrix );

+}

+

+

+/**

+ * Free the context matrix data.

+ * 

+ * \param ctx GL context.

+ *

+ * Frees each of the matrix stacks and the combined modelview-projection

+ * matrix.

+ */

+void _mesa_free_matrix_data( struct gl_context *ctx )

+{

+   GLint i;

+

+   free_matrix_stack(&ctx->ModelviewMatrixStack);

+   free_matrix_stack(&ctx->ProjectionMatrixStack);

+   for (i = 0; i < Elements(ctx->TextureMatrixStack); i++)

+      free_matrix_stack(&ctx->TextureMatrixStack[i]);

+   for (i = 0; i < Elements(ctx->ProgramMatrixStack); i++)

+      free_matrix_stack(&ctx->ProgramMatrixStack[i]);

+   /* combined Modelview*Projection matrix */

+   _math_matrix_dtr( &ctx->_ModelProjectMatrix );

+

+}

+

+

+/** 

+ * Initialize the context transform attribute group.

+ *

+ * \param ctx GL context.

+ *

+ * \todo Move this to a new file with other 'transform' routines.

+ */

+void _mesa_init_transform( struct gl_context *ctx )

+{

+   GLint i;

+

+   /* Transformation group */

+   ctx->Transform.MatrixMode = GL_MODELVIEW;

+   ctx->Transform.Normalize = GL_FALSE;

+   ctx->Transform.RescaleNormals = GL_FALSE;

+   ctx->Transform.RasterPositionUnclipped = GL_FALSE;

+   for (i=0;i<MAX_CLIP_PLANES;i++) {

+      ASSIGN_4V( ctx->Transform.EyeUserPlane[i], 0.0, 0.0, 0.0, 0.0 );

+   }

+   ctx->Transform.ClipPlanesEnabled = 0;

+

+   ASSIGN_4V( ctx->Transform.CullObjPos, 0.0, 0.0, 1.0, 0.0 );

+   ASSIGN_4V( ctx->Transform.CullEyePos, 0.0, 0.0, 1.0, 0.0 );

+}

+

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/matrix.h b/mesalib/src/mesa/main/matrix.h
index a53d1045c..a4e7f7cfd 100644
--- a/mesalib/src/mesa/main/matrix.h
+++ b/mesalib/src/mesa/main/matrix.h
@@ -1,112 +1,113 @@
-/*
- * 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.
- */
-
-
-#ifndef MATRIX_H
-#define MATRIX_H
-
-
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_Frustum( GLdouble left, GLdouble right,
-               GLdouble bottom, GLdouble top,
-               GLdouble nearval, GLdouble farval );
-
-extern void GLAPIENTRY
-_mesa_Ortho( GLdouble left, GLdouble right,
-             GLdouble bottom, GLdouble top,
-             GLdouble nearval, GLdouble farval );
-
-extern void GLAPIENTRY
-_mesa_PushMatrix( void );
-
-extern void GLAPIENTRY
-_mesa_PopMatrix( void );
-
-extern void GLAPIENTRY
-_mesa_LoadIdentity( void );
-
-extern void GLAPIENTRY
-_mesa_LoadMatrixf( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_LoadMatrixd( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MatrixMode( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_MultMatrixf( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_MultMatrixd( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );
-
-extern void GLAPIENTRY
-_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
-
-extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
-
-extern void GLAPIENTRY
-_mesa_MultTransposeMatrixfARB( const GLfloat *m );
-
-extern void GLAPIENTRY
-_mesa_MultTransposeMatrixdARB( const GLdouble *m );
-
-
-extern void 
-_mesa_init_matrix( GLcontext * ctx );
-
-extern void 
-_mesa_init_transform( GLcontext *ctx );
-
-extern void
-_mesa_free_matrix_data( GLcontext *ctx );
-
-extern void 
-_mesa_update_modelview_project( GLcontext *ctx, GLuint newstate );
-
-
-#endif
+/*

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

+ */

+

+

+#ifndef MATRIX_H

+#define MATRIX_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_Frustum( GLdouble left, GLdouble right,

+               GLdouble bottom, GLdouble top,

+               GLdouble nearval, GLdouble farval );

+

+extern void GLAPIENTRY

+_mesa_Ortho( GLdouble left, GLdouble right,

+             GLdouble bottom, GLdouble top,

+             GLdouble nearval, GLdouble farval );

+

+extern void GLAPIENTRY

+_mesa_PushMatrix( void );

+

+extern void GLAPIENTRY

+_mesa_PopMatrix( void );

+

+extern void GLAPIENTRY

+_mesa_LoadIdentity( void );

+

+extern void GLAPIENTRY

+_mesa_LoadMatrixf( const GLfloat *m );

+

+extern void GLAPIENTRY

+_mesa_LoadMatrixd( const GLdouble *m );

+

+extern void GLAPIENTRY

+_mesa_MatrixMode( GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_MultMatrixf( const GLfloat *m );

+

+extern void GLAPIENTRY

+_mesa_MultMatrixd( const GLdouble *m );

+

+extern void GLAPIENTRY

+_mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );

+

+extern void GLAPIENTRY

+_mesa_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );

+

+extern void GLAPIENTRY

+_mesa_Scalef( GLfloat x, GLfloat y, GLfloat z );

+

+extern void GLAPIENTRY

+_mesa_Scaled( GLdouble x, GLdouble y, GLdouble z );

+

+extern void GLAPIENTRY

+_mesa_Translatef( GLfloat x, GLfloat y, GLfloat z );

+

+extern void GLAPIENTRY

+_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );

+

+extern void GLAPIENTRY

+_mesa_LoadTransposeMatrixfARB( const GLfloat *m );

+

+extern void GLAPIENTRY

+_mesa_LoadTransposeMatrixdARB( const GLdouble *m );

+

+extern void GLAPIENTRY

+_mesa_MultTransposeMatrixfARB( const GLfloat *m );

+

+extern void GLAPIENTRY

+_mesa_MultTransposeMatrixdARB( const GLdouble *m );

+

+

+extern void 

+_mesa_init_matrix( struct gl_context * ctx );

+

+extern void 

+_mesa_init_transform( struct gl_context *ctx );

+

+extern void

+_mesa_free_matrix_data( struct gl_context *ctx );

+

+extern void 

+_mesa_update_modelview_project( struct gl_context *ctx, GLuint newstate );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/mfeatures.h b/mesalib/src/mesa/main/mfeatures.h
index 92311ef7f..b549d90bd 100644
--- a/mesalib/src/mesa/main/mfeatures.h
+++ b/mesalib/src/mesa/main/mfeatures.h
@@ -1,149 +1,145 @@
-/*
- * 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 mfeatures.h
- * Flags to enable/disable specific parts of the API.
- */
-
-#ifndef FEATURES_H
-#define FEATURES_H
-
-
-#ifndef _HAVE_FULL_GL
-#define _HAVE_FULL_GL 1
-#endif
-
-/* assert that a feature is disabled and should never be used */
-#define ASSERT_NO_FEATURE() ASSERT(0)
-
-/**
- * A feature can be anything.  But most of them share certain characteristics.
- *
- * When a feature defines vtxfmt entries, they can be initialized and
- * installed by
- *   _MESA_INIT_<FEATURE>_VTXFMT
- *   _mesa_install_<feature>_vtxfmt
- *
- * When a feature defines dispatch entries, they are initialized by
- *   _mesa_init_<feature>_dispatch
- *
- * When a feature has states, they are initialized and freed by
- *   _mesa_init_<feature>
- *   _mesa_free_<feature>_data
- *
- * Except for states, the others compile to no-op when a feature is disabled.
- *
- * The GLAPIENTRYs and helper functions defined by a feature should also
- * compile to no-op when it is disabled.  But to save typings and to catch
- * bugs, some of them may be unavailable, or compile to ASSERT_NO_FEATURE()
- * when the feature is disabled.
- *
- * A feature following the conventions may be used without knowing if it is
- * enabled or not.
- */
-
-#ifndef FEATURE_ES1
-#define FEATURE_ES1 0
-#endif
-#ifndef FEATURE_ES2
-#define FEATURE_ES2 0
-#endif
-
-#define FEATURE_ES (FEATURE_ES1 || FEATURE_ES2)
-
-#ifndef FEATURE_GL
-#define FEATURE_GL !FEATURE_ES
-#endif
-
-#ifdef IN_DRI_DRIVER
-#define FEATURE_remap_table               1
-#else
-#define FEATURE_remap_table               0
-#endif
-
-#define FEATURE_dispatch                  1
-#define FEATURE_texgen                    1
-#define FEATURE_userclip                  1
-
-#define FEATURE_accum                     FEATURE_GL
-#define FEATURE_arrayelt                  FEATURE_GL
-#define FEATURE_attrib_stack              FEATURE_GL
-/* this disables vtxfmt, api_loopback, and api_noop completely */
-#define FEATURE_beginend                  FEATURE_GL
-#define FEATURE_colortable                FEATURE_GL
-#define FEATURE_convolve                  FEATURE_GL
-#define FEATURE_dlist                     (FEATURE_GL && FEATURE_arrayelt && FEATURE_beginend)
-#define FEATURE_draw_read_buffer          FEATURE_GL
-#define FEATURE_drawpix                   FEATURE_GL
-#define FEATURE_evaluators                FEATURE_GL
-#define FEATURE_feedback                  FEATURE_GL
-#define FEATURE_histogram                 FEATURE_GL
-#define FEATURE_pixel_transfer            FEATURE_GL
-#define FEATURE_queryobj                  FEATURE_GL
-#define FEATURE_rastpos                   FEATURE_GL
-#define FEATURE_texture_fxt1              FEATURE_GL
-#define FEATURE_texture_s3tc              FEATURE_GL
-
-#define FEATURE_extra_context_init        FEATURE_ES
-#define FEATURE_fixedpt                   FEATURE_ES
-#define FEATURE_point_size_array          FEATURE_ES
-#define FEATURE_vertex_array_byte         FEATURE_ES
-
-#define FEATURE_es2_glsl                  FEATURE_ES2
-
-#define FEATURE_ARB_fragment_program      1
-#define FEATURE_ARB_vertex_program        1
-#define FEATURE_ARB_vertex_shader         1
-#define FEATURE_ARB_fragment_shader       1
-#define FEATURE_ARB_shader_objects        (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
-#define FEATURE_ARB_shading_language_100  FEATURE_ARB_shader_objects
-#define FEATURE_ARB_shading_language_120  FEATURE_ARB_shader_objects
-#define FEATURE_ARB_geometry_shader4      FEATURE_ARB_shader_objects
-
-#define FEATURE_ARB_framebuffer_object    (FEATURE_GL && FEATURE_EXT_framebuffer_object)
-#define FEATURE_ARB_map_buffer_range      FEATURE_GL
-#define FEATURE_ARB_pixel_buffer_object   (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)
-#define FEATURE_ARB_sync                  FEATURE_GL
-#define FEATURE_ARB_vertex_buffer_object  1
-
-#define FEATURE_EXT_framebuffer_blit      FEATURE_GL
-#define FEATURE_EXT_framebuffer_object    1
-#define FEATURE_EXT_pixel_buffer_object   1
-#define FEATURE_EXT_texture_sRGB          FEATURE_GL
-#define FEATURE_EXT_transform_feedback    FEATURE_GL
-
-#define FEATURE_APPLE_object_purgeable    FEATURE_GL
-#define FEATURE_ATI_fragment_shader       FEATURE_GL
-#define FEATURE_NV_fence                  FEATURE_GL
-#define FEATURE_NV_fragment_program       FEATURE_GL
-#define FEATURE_NV_vertex_program         FEATURE_GL
-
-#define FEATURE_OES_EGL_image             1
-#define FEATURE_OES_draw_texture          FEATURE_ES1
-#define FEATURE_OES_framebuffer_object    FEATURE_ES
-#define FEATURE_OES_mapbuffer             FEATURE_ES
-
-#endif /* FEATURES_H */
+/*

+ * 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 mfeatures.h

+ * Flags to enable/disable specific parts of the API.

+ */

+

+#ifndef FEATURES_H

+#define FEATURES_H

+

+

+#ifndef _HAVE_FULL_GL

+#define _HAVE_FULL_GL 1

+#endif

+

+/* assert that a feature is disabled and should never be used */

+#define ASSERT_NO_FEATURE() ASSERT(0)

+

+/**

+ * A feature can be anything.  But most of them share certain characteristics.

+ *

+ * When a feature defines vtxfmt entries, they can be initialized and

+ * installed by

+ *   _MESA_INIT_<FEATURE>_VTXFMT

+ *   _mesa_install_<feature>_vtxfmt

+ *

+ * When a feature defines dispatch entries, they are initialized by

+ *   _mesa_init_<feature>_dispatch

+ *

+ * When a feature has states, they are initialized and freed by

+ *   _mesa_init_<feature>

+ *   _mesa_free_<feature>_data

+ *

+ * Except for states, the others compile to no-op when a feature is disabled.

+ *

+ * The GLAPIENTRYs and helper functions defined by a feature should also

+ * compile to no-op when it is disabled.  But to save typings and to catch

+ * bugs, some of them may be unavailable, or compile to ASSERT_NO_FEATURE()

+ * when the feature is disabled.

+ *

+ * A feature following the conventions may be used without knowing if it is

+ * enabled or not.

+ */

+

+#ifndef FEATURE_ES1

+#define FEATURE_ES1 0

+#endif

+#ifndef FEATURE_ES2

+#define FEATURE_ES2 0

+#endif

+

+#define FEATURE_ES (FEATURE_ES1 || FEATURE_ES2)

+

+#ifndef FEATURE_GL

+#define FEATURE_GL !FEATURE_ES

+#endif

+

+#if defined(IN_DRI_DRIVER) || (FEATURE_GL + FEATURE_ES1 + FEATURE_ES2 > 1)

+#define FEATURE_remap_table               1

+#else

+#define FEATURE_remap_table               0

+#endif

+

+#define FEATURE_dispatch                  1

+#define FEATURE_texgen                    1

+#define FEATURE_userclip                  1

+

+#define FEATURE_accum                     FEATURE_GL

+#define FEATURE_arrayelt                  FEATURE_GL

+#define FEATURE_attrib_stack              FEATURE_GL

+/* this disables vtxfmt, api_loopback, and api_noop completely */

+#define FEATURE_beginend                  FEATURE_GL

+#define FEATURE_colortable                FEATURE_GL

+#define FEATURE_convolve                  FEATURE_GL

+#define FEATURE_dlist                     (FEATURE_GL && FEATURE_arrayelt && FEATURE_beginend)

+#define FEATURE_draw_read_buffer          FEATURE_GL

+#define FEATURE_drawpix                   FEATURE_GL

+#define FEATURE_evaluators                FEATURE_GL

+#define FEATURE_feedback                  FEATURE_GL

+#define FEATURE_pixel_transfer            FEATURE_GL

+#define FEATURE_queryobj                  FEATURE_GL

+#define FEATURE_rastpos                   FEATURE_GL

+#define FEATURE_texture_fxt1              FEATURE_GL

+#define FEATURE_texture_s3tc              FEATURE_GL

+

+#define FEATURE_extra_context_init        FEATURE_ES

+#define FEATURE_point_size_array          FEATURE_ES

+

+#define FEATURE_es2_glsl                  FEATURE_ES2

+

+#define FEATURE_ARB_fragment_program      1

+#define FEATURE_ARB_vertex_program        1

+#define FEATURE_ARB_vertex_shader         1

+#define FEATURE_ARB_fragment_shader       1

+#define FEATURE_ARB_shader_objects        (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)

+#define FEATURE_ARB_shading_language_100  FEATURE_ARB_shader_objects

+#define FEATURE_ARB_geometry_shader4      FEATURE_ARB_shader_objects

+

+#define FEATURE_ARB_framebuffer_object    (FEATURE_GL && FEATURE_EXT_framebuffer_object)

+#define FEATURE_ARB_map_buffer_range      FEATURE_GL

+#define FEATURE_ARB_pixel_buffer_object   (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)

+#define FEATURE_ARB_sync                  FEATURE_GL

+#define FEATURE_ARB_vertex_buffer_object  1

+

+#define FEATURE_EXT_framebuffer_blit      FEATURE_GL

+#define FEATURE_EXT_framebuffer_object    1

+#define FEATURE_EXT_pixel_buffer_object   1

+#define FEATURE_EXT_texture_sRGB          FEATURE_GL

+#define FEATURE_EXT_transform_feedback    FEATURE_GL

+

+#define FEATURE_APPLE_object_purgeable    FEATURE_GL

+#define FEATURE_ATI_fragment_shader       FEATURE_GL

+#define FEATURE_NV_fence                  FEATURE_GL

+#define FEATURE_NV_fragment_program       FEATURE_GL

+#define FEATURE_NV_vertex_program         FEATURE_GL

+

+#define FEATURE_OES_EGL_image             1

+#define FEATURE_OES_draw_texture          FEATURE_ES1

+#define FEATURE_OES_framebuffer_object    FEATURE_ES

+#define FEATURE_OES_mapbuffer             FEATURE_ES

+

+#endif /* FEATURES_H */

diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index 3d1a4c49c..cf85782bc 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -1,1800 +1,1966 @@
-/*
- * 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 "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_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_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 {
-      _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);
-      }
-   }
-   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_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_BYTE_3_3_2) && (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] & 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 {
-      _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(GLcontext *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_RGBA) {
-         convertFormat = MESA_FORMAT_RGBA8888;
-         components = 4;
-      }
-      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);
-      dstImage->DriverData = NULL;
-      dstImage->TexFormat = srcImage->TexFormat;
-      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 "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 {

+      _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(GLushort);

+

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

+      _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_RGBA) {

+         convertFormat = MESA_FORMAT_RGBA8888;

+         components = 4;

+      }

+      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/mipmap.h b/mesalib/src/mesa/main/mipmap.h
index 22094c343..c0c6c2592 100644
--- a/mesalib/src/mesa/main/mipmap.h
+++ b/mesalib/src/mesa/main/mipmap.h
@@ -1,64 +1,64 @@
-/*
- * 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 MIPMAP_H
-#define MIPMAP_H
-
-#include "mtypes.h"
-
-
-extern 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);
-
-
-extern void
-_mesa_generate_mipmap(GLcontext *ctx, GLenum target,
-                      struct gl_texture_object *texObj);
-
-
-extern void
-_mesa_rescale_teximage2d(GLuint bytesPerPixel,
-                         GLuint srcStrideInPixels,
-                         GLuint dstRowStride,
-                         GLint srcWidth, GLint srcHeight,
-                         GLint dstWidth, GLint dstHeight,
-                         const GLvoid *srcImage, GLvoid *dstImage);
-
-extern void
-_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,
-                         GLsizei outWidth, GLsizei outHeight,
-                         GLint comps, const GLchan *src, GLint srcRowStride,
-                         GLchan *dest);
-
-
-#endif /* MIPMAP_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.

+ */

+

+

+#ifndef MIPMAP_H

+#define MIPMAP_H

+

+#include "mtypes.h"

+

+

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

+

+

+extern void

+_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,

+                      struct gl_texture_object *texObj);

+

+

+extern void

+_mesa_rescale_teximage2d(GLuint bytesPerPixel,

+                         GLuint srcStrideInPixels,

+                         GLuint dstRowStride,

+                         GLint srcWidth, GLint srcHeight,

+                         GLint dstWidth, GLint dstHeight,

+                         const GLvoid *srcImage, GLvoid *dstImage);

+

+extern void

+_mesa_upscale_teximage2d(GLsizei inWidth, GLsizei inHeight,

+                         GLsizei outWidth, GLsizei outHeight,

+                         GLint comps, const GLchan *src, GLint srcRowStride,

+                         GLchan *dest);

+

+

+#endif /* MIPMAP_H */

diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 5494be8f4..7cac96c1d 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1,3362 +1,3311 @@
-/*
- * 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 mtypes.h
- * Main Mesa data structures.
- *
- * Please try to mark derived values with a leading underscore ('_').
- */
-
-#ifndef MTYPES_H
-#define MTYPES_H
-
-
-#include "main/glheader.h"
-#include "main/config.h"
-#include "main/mfeatures.h"
-#include "glapi/glapi.h"
-#include "math/m_matrix.h"	/* GLmatrix */
-#include "main/simple_list.h"	/* struct simple_node */
-
-/* Shader stages. Note that these will become 5 with tessellation.
- * These MUST have the same values as PIPE_SHADER_*
- */
-#define MESA_SHADER_VERTEX   0
-#define MESA_SHADER_FRAGMENT 1
-#define MESA_SHADER_GEOMETRY 2
-#define MESA_SHADER_TYPES    3
-
-
-/**
- * Color channel data type.
- */
-#if CHAN_BITS == 8
-   typedef GLubyte GLchan;
-#define CHAN_MAX 255
-#define CHAN_MAXF 255.0F
-#define CHAN_TYPE GL_UNSIGNED_BYTE
-#elif CHAN_BITS == 16
-   typedef GLushort GLchan;
-#define CHAN_MAX 65535
-#define CHAN_MAXF 65535.0F
-#define CHAN_TYPE GL_UNSIGNED_SHORT
-#elif CHAN_BITS == 32
-   typedef GLfloat GLchan;
-#define CHAN_MAX 1.0
-#define CHAN_MAXF 1.0F
-#define CHAN_TYPE GL_FLOAT
-#else
-#error "illegal number of color channel bits"
-#endif
-
-
-/**
- * Stencil buffer data type.
- */
-#if STENCIL_BITS==8
-   typedef GLubyte GLstencil;
-#elif STENCIL_BITS==16
-   typedef GLushort GLstencil;
-#else
-#  error "illegal number of stencil bits"
-#endif
-
-
-/**
- * \name 64-bit extension of GLbitfield.
- */
-/*@{*/
-typedef GLuint64 GLbitfield64;
-
-#define BITFIELD64_ONE         1ULL
-#define BITFIELD64_ALLONES     ~0ULL
-
-/** Set a single bit */
-#define BITFIELD64_BIT(b)      (BITFIELD64_ONE << (b))
-
-/** Set a mask of the least significant \c b bits */
-#define BITFIELD64_MASK(b)     (((b) >= 64) ? BITFIELD64_ALLONES : \
-				(BITFIELD64_BIT(b) - 1))
-
-/**
- * Set all bits from l (low bit) to h (high bit), inclusive.
- *
- * \note \C BITFIELD_64_RANGE(0, 63) return 64 set bits.
- */
-#define BITFIELD64_RANGE(l, h) (BITFIELD64_MASK((h) + 1) & ~BITFIELD64_MASK(l))
-/*@}*/
-
-
-/**
- * \name Some forward type declarations
- */
-/*@{*/
-struct _mesa_HashTable;
-struct gl_attrib_node;
-struct gl_list_extensions;
-struct gl_meta_state;
-struct gl_pixelstore_attrib;
-struct gl_program_cache;
-struct gl_texture_format;
-struct gl_texture_image;
-struct gl_texture_object;
-struct st_context;
-typedef struct __GLcontextRec GLcontext;
-typedef struct __GLcontextModesRec GLvisual;
-typedef struct gl_framebuffer GLframebuffer;
-/*@}*/
-
-
-
-/**
- * Indexes for vertex program attributes.
- * GL_NV_vertex_program aliases generic attributes over the conventional
- * attributes.  In GL_ARB_vertex_program shader the aliasing is optional.
- * In GL_ARB_vertex_shader / OpenGL 2.0 the aliasing is disallowed (the
- * generic attributes are distinct/separate).
- */
-typedef enum
-{
-   VERT_ATTRIB_POS = 0,
-   VERT_ATTRIB_WEIGHT = 1,
-   VERT_ATTRIB_NORMAL = 2,
-   VERT_ATTRIB_COLOR0 = 3,
-   VERT_ATTRIB_COLOR1 = 4,
-   VERT_ATTRIB_FOG = 5,
-   VERT_ATTRIB_COLOR_INDEX = 6,
-   VERT_ATTRIB_POINT_SIZE = 6,  /*alias*/
-   VERT_ATTRIB_EDGEFLAG = 7,
-   VERT_ATTRIB_TEX0 = 8,
-   VERT_ATTRIB_TEX1 = 9,
-   VERT_ATTRIB_TEX2 = 10,
-   VERT_ATTRIB_TEX3 = 11,
-   VERT_ATTRIB_TEX4 = 12,
-   VERT_ATTRIB_TEX5 = 13,
-   VERT_ATTRIB_TEX6 = 14,
-   VERT_ATTRIB_TEX7 = 15,
-   VERT_ATTRIB_GENERIC0 = 16,
-   VERT_ATTRIB_GENERIC1 = 17,
-   VERT_ATTRIB_GENERIC2 = 18,
-   VERT_ATTRIB_GENERIC3 = 19,
-   VERT_ATTRIB_GENERIC4 = 20,
-   VERT_ATTRIB_GENERIC5 = 21,
-   VERT_ATTRIB_GENERIC6 = 22,
-   VERT_ATTRIB_GENERIC7 = 23,
-   VERT_ATTRIB_GENERIC8 = 24,
-   VERT_ATTRIB_GENERIC9 = 25,
-   VERT_ATTRIB_GENERIC10 = 26,
-   VERT_ATTRIB_GENERIC11 = 27,
-   VERT_ATTRIB_GENERIC12 = 28,
-   VERT_ATTRIB_GENERIC13 = 29,
-   VERT_ATTRIB_GENERIC14 = 30,
-   VERT_ATTRIB_GENERIC15 = 31,
-   VERT_ATTRIB_MAX = 32
-} gl_vert_attrib;
-
-/**
- * Bitflags for vertex attributes.
- * These are used in bitfields in many places.
- */
-/*@{*/
-#define VERT_BIT_POS         (1 << VERT_ATTRIB_POS)
-#define VERT_BIT_WEIGHT      (1 << VERT_ATTRIB_WEIGHT)
-#define VERT_BIT_NORMAL      (1 << VERT_ATTRIB_NORMAL)
-#define VERT_BIT_COLOR0      (1 << VERT_ATTRIB_COLOR0)
-#define VERT_BIT_COLOR1      (1 << VERT_ATTRIB_COLOR1)
-#define VERT_BIT_FOG         (1 << VERT_ATTRIB_FOG)
-#define VERT_BIT_COLOR_INDEX (1 << VERT_ATTRIB_COLOR_INDEX)
-#define VERT_BIT_EDGEFLAG    (1 << VERT_ATTRIB_EDGEFLAG)
-#define VERT_BIT_TEX0        (1 << VERT_ATTRIB_TEX0)
-#define VERT_BIT_TEX1        (1 << VERT_ATTRIB_TEX1)
-#define VERT_BIT_TEX2        (1 << VERT_ATTRIB_TEX2)
-#define VERT_BIT_TEX3        (1 << VERT_ATTRIB_TEX3)
-#define VERT_BIT_TEX4        (1 << VERT_ATTRIB_TEX4)
-#define VERT_BIT_TEX5        (1 << VERT_ATTRIB_TEX5)
-#define VERT_BIT_TEX6        (1 << VERT_ATTRIB_TEX6)
-#define VERT_BIT_TEX7        (1 << VERT_ATTRIB_TEX7)
-#define VERT_BIT_GENERIC0    (1 << VERT_ATTRIB_GENERIC0)
-#define VERT_BIT_GENERIC1    (1 << VERT_ATTRIB_GENERIC1)
-#define VERT_BIT_GENERIC2    (1 << VERT_ATTRIB_GENERIC2)
-#define VERT_BIT_GENERIC3    (1 << VERT_ATTRIB_GENERIC3)
-#define VERT_BIT_GENERIC4    (1 << VERT_ATTRIB_GENERIC4)
-#define VERT_BIT_GENERIC5    (1 << VERT_ATTRIB_GENERIC5)
-#define VERT_BIT_GENERIC6    (1 << VERT_ATTRIB_GENERIC6)
-#define VERT_BIT_GENERIC7    (1 << VERT_ATTRIB_GENERIC7)
-#define VERT_BIT_GENERIC8    (1 << VERT_ATTRIB_GENERIC8)
-#define VERT_BIT_GENERIC9    (1 << VERT_ATTRIB_GENERIC9)
-#define VERT_BIT_GENERIC10   (1 << VERT_ATTRIB_GENERIC10)
-#define VERT_BIT_GENERIC11   (1 << VERT_ATTRIB_GENERIC11)
-#define VERT_BIT_GENERIC12   (1 << VERT_ATTRIB_GENERIC12)
-#define VERT_BIT_GENERIC13   (1 << VERT_ATTRIB_GENERIC13)
-#define VERT_BIT_GENERIC14   (1 << VERT_ATTRIB_GENERIC14)
-#define VERT_BIT_GENERIC15   (1 << VERT_ATTRIB_GENERIC15)
-
-#define VERT_BIT_TEX(u)  (1 << (VERT_ATTRIB_TEX0 + (u)))
-#define VERT_BIT_GENERIC(g)  (1 << (VERT_ATTRIB_GENERIC0 + (g)))
-/*@}*/
-
-
-/**
- * Indexes for vertex program result attributes
- */
-typedef enum
-{
-   VERT_RESULT_HPOS = 0,
-   VERT_RESULT_COL0 = 1,
-   VERT_RESULT_COL1 = 2,
-   VERT_RESULT_FOGC = 3,
-   VERT_RESULT_TEX0 = 4,
-   VERT_RESULT_TEX1 = 5,
-   VERT_RESULT_TEX2 = 6,
-   VERT_RESULT_TEX3 = 7,
-   VERT_RESULT_TEX4 = 8,
-   VERT_RESULT_TEX5 = 9,
-   VERT_RESULT_TEX6 = 10,
-   VERT_RESULT_TEX7 = 11,
-   VERT_RESULT_PSIZ = 12,
-   VERT_RESULT_BFC0 = 13,
-   VERT_RESULT_BFC1 = 14,
-   VERT_RESULT_EDGE = 15,
-   VERT_RESULT_VAR0 = 16,  /**< shader varying */
-   VERT_RESULT_MAX = (VERT_RESULT_VAR0 + MAX_VARYING)
-} gl_vert_result;
-
-
-/*********************************************/
-
-/**
- * Indexes for geometry program attributes.
- */
-typedef enum
-{
-   GEOM_ATTRIB_POSITION = 0,
-   GEOM_ATTRIB_COLOR0 = 1,
-   GEOM_ATTRIB_COLOR1 = 2,
-   GEOM_ATTRIB_SECONDARY_COLOR0 = 3,
-   GEOM_ATTRIB_SECONDARY_COLOR1 = 4,
-   GEOM_ATTRIB_FOG_FRAG_COORD = 5,
-   GEOM_ATTRIB_POINT_SIZE = 6,
-   GEOM_ATTRIB_CLIP_VERTEX = 7,
-   GEOM_ATTRIB_PRIMITIVE_ID = 8,
-   GEOM_ATTRIB_TEX_COORD = 9,
-
-   GEOM_ATTRIB_VAR0 = 16,
-   GEOM_ATTRIB_MAX = (GEOM_ATTRIB_VAR0 + MAX_VARYING)
-} gl_geom_attrib;
-
-/**
- * Bitflags for geometry attributes.
- * These are used in bitfields in many places.
- */
-/*@{*/
-#define GEOM_BIT_COLOR0      (1 << GEOM_ATTRIB_COLOR0)
-#define GEOM_BIT_COLOR1      (1 << GEOM_ATTRIB_COLOR1)
-#define GEOM_BIT_SCOLOR0     (1 << GEOM_ATTRIB_SECONDARY_COLOR0)
-#define GEOM_BIT_SCOLOR1     (1 << GEOM_ATTRIB_SECONDARY_COLOR1)
-#define GEOM_BIT_TEX_COORD   (1 << GEOM_ATTRIB_TEX_COORD)
-#define GEOM_BIT_FOG_COORD   (1 << GEOM_ATTRIB_FOG_FRAG_COORD)
-#define GEOM_BIT_POSITION    (1 << GEOM_ATTRIB_POSITION)
-#define GEOM_BIT_POINT_SIDE  (1 << GEOM_ATTRIB_POINT_SIZE)
-#define GEOM_BIT_CLIP_VERTEX (1 << GEOM_ATTRIB_CLIP_VERTEX)
-#define GEOM_BIT_PRIM_ID     (1 << GEOM_ATTRIB_PRIMITIVE_ID)
-#define GEOM_BIT_VAR0        (1 << GEOM_ATTRIB_VAR0)
-
-#define GEOM_BIT_VAR(g)  (1 << (GEOM_BIT_VAR0 + (g)))
-/*@}*/
-
-
-/**
- * Indexes for geometry program result attributes
- */
-/*@{*/
-typedef enum {
-   GEOM_RESULT_POS  = 0,
-   GEOM_RESULT_COL0  = 1,
-   GEOM_RESULT_COL1  = 2,
-   GEOM_RESULT_SCOL0 = 3,
-   GEOM_RESULT_SCOL1 = 4,
-   GEOM_RESULT_FOGC = 5,
-   GEOM_RESULT_TEX0 = 6,
-   GEOM_RESULT_TEX1 = 7,
-   GEOM_RESULT_TEX2 = 8,
-   GEOM_RESULT_TEX3 = 9,
-   GEOM_RESULT_TEX4 = 10,
-   GEOM_RESULT_TEX5 = 11,
-   GEOM_RESULT_TEX6 = 12,
-   GEOM_RESULT_TEX7 = 13,
-   GEOM_RESULT_PSIZ = 14,
-   GEOM_RESULT_CLPV = 15,
-   GEOM_RESULT_PRID = 16,
-   GEOM_RESULT_LAYR = 17,
-   GEOM_RESULT_VAR0 = 18,  /**< shader varying, should really be 16 */
-   /* ### we need to -2 because var0 is 18 instead 16 like in the others */
-   GEOM_RESULT_MAX  =  (GEOM_RESULT_VAR0 + MAX_VARYING - 2)
-} gl_geom_result;
-/*@}*/
-
-/**
- * Indexes for fragment program input attributes.
- */
-typedef enum
-{
-   FRAG_ATTRIB_WPOS = 0,
-   FRAG_ATTRIB_COL0 = 1,
-   FRAG_ATTRIB_COL1 = 2,
-   FRAG_ATTRIB_FOGC = 3,
-   FRAG_ATTRIB_TEX0 = 4,
-   FRAG_ATTRIB_TEX1 = 5,
-   FRAG_ATTRIB_TEX2 = 6,
-   FRAG_ATTRIB_TEX3 = 7,
-   FRAG_ATTRIB_TEX4 = 8,
-   FRAG_ATTRIB_TEX5 = 9,
-   FRAG_ATTRIB_TEX6 = 10,
-   FRAG_ATTRIB_TEX7 = 11,
-   FRAG_ATTRIB_FACE = 12,  /**< front/back face */
-   FRAG_ATTRIB_PNTC = 13,  /**< sprite/point coord */
-   FRAG_ATTRIB_VAR0 = 14,  /**< shader varying */
-   FRAG_ATTRIB_MAX = (FRAG_ATTRIB_VAR0 + MAX_VARYING)
-} gl_frag_attrib;
-
-/**
- * Bitflags for fragment program input attributes.
- */
-/*@{*/
-#define FRAG_BIT_WPOS  (1 << FRAG_ATTRIB_WPOS)
-#define FRAG_BIT_COL0  (1 << FRAG_ATTRIB_COL0)
-#define FRAG_BIT_COL1  (1 << FRAG_ATTRIB_COL1)
-#define FRAG_BIT_FOGC  (1 << FRAG_ATTRIB_FOGC)
-#define FRAG_BIT_FACE  (1 << FRAG_ATTRIB_FACE)
-#define FRAG_BIT_PNTC  (1 << FRAG_ATTRIB_PNTC)
-#define FRAG_BIT_TEX0  (1 << FRAG_ATTRIB_TEX0)
-#define FRAG_BIT_TEX1  (1 << FRAG_ATTRIB_TEX1)
-#define FRAG_BIT_TEX2  (1 << FRAG_ATTRIB_TEX2)
-#define FRAG_BIT_TEX3  (1 << FRAG_ATTRIB_TEX3)
-#define FRAG_BIT_TEX4  (1 << FRAG_ATTRIB_TEX4)
-#define FRAG_BIT_TEX5  (1 << FRAG_ATTRIB_TEX5)
-#define FRAG_BIT_TEX6  (1 << FRAG_ATTRIB_TEX6)
-#define FRAG_BIT_TEX7  (1 << FRAG_ATTRIB_TEX7)
-#define FRAG_BIT_VAR0  (1 << FRAG_ATTRIB_VAR0)
-
-#define FRAG_BIT_TEX(U)  (FRAG_BIT_TEX0 << (U))
-#define FRAG_BIT_VAR(V)  (FRAG_BIT_VAR0 << (V))
-
-#define FRAG_BITS_TEX_ANY (FRAG_BIT_TEX0|	\
-			   FRAG_BIT_TEX1|	\
-			   FRAG_BIT_TEX2|	\
-			   FRAG_BIT_TEX3|	\
-			   FRAG_BIT_TEX4|	\
-			   FRAG_BIT_TEX5|	\
-			   FRAG_BIT_TEX6|	\
-			   FRAG_BIT_TEX7)
-/*@}*/
-
-
-/**
- * Fragment program results
- */
-typedef enum
-{
-   FRAG_RESULT_DEPTH = 0,
-   FRAG_RESULT_COLOR = 1,
-   FRAG_RESULT_DATA0 = 2,
-   FRAG_RESULT_MAX = (FRAG_RESULT_DATA0 + MAX_DRAW_BUFFERS)
-} gl_frag_result;
-
-
-/**
- * Indexes for all renderbuffers
- */
-typedef enum
-{
-   /* the four standard color buffers */
-   BUFFER_FRONT_LEFT,
-   BUFFER_BACK_LEFT,
-   BUFFER_FRONT_RIGHT,
-   BUFFER_BACK_RIGHT,
-   BUFFER_DEPTH,
-   BUFFER_STENCIL,
-   BUFFER_ACCUM,
-   /* optional aux buffer */
-   BUFFER_AUX0,
-   /* generic renderbuffers */
-   BUFFER_COLOR0,
-   BUFFER_COLOR1,
-   BUFFER_COLOR2,
-   BUFFER_COLOR3,
-   BUFFER_COLOR4,
-   BUFFER_COLOR5,
-   BUFFER_COLOR6,
-   BUFFER_COLOR7,
-   BUFFER_COUNT
-} gl_buffer_index;
-
-/**
- * Bit flags for all renderbuffers
- */
-#define BUFFER_BIT_FRONT_LEFT   (1 << BUFFER_FRONT_LEFT)
-#define BUFFER_BIT_BACK_LEFT    (1 << BUFFER_BACK_LEFT)
-#define BUFFER_BIT_FRONT_RIGHT  (1 << BUFFER_FRONT_RIGHT)
-#define BUFFER_BIT_BACK_RIGHT   (1 << BUFFER_BACK_RIGHT)
-#define BUFFER_BIT_AUX0         (1 << BUFFER_AUX0)
-#define BUFFER_BIT_AUX1         (1 << BUFFER_AUX1)
-#define BUFFER_BIT_AUX2         (1 << BUFFER_AUX2)
-#define BUFFER_BIT_AUX3         (1 << BUFFER_AUX3)
-#define BUFFER_BIT_DEPTH        (1 << BUFFER_DEPTH)
-#define BUFFER_BIT_STENCIL      (1 << BUFFER_STENCIL)
-#define BUFFER_BIT_ACCUM        (1 << BUFFER_ACCUM)
-#define BUFFER_BIT_COLOR0       (1 << BUFFER_COLOR0)
-#define BUFFER_BIT_COLOR1       (1 << BUFFER_COLOR1)
-#define BUFFER_BIT_COLOR2       (1 << BUFFER_COLOR2)
-#define BUFFER_BIT_COLOR3       (1 << BUFFER_COLOR3)
-#define BUFFER_BIT_COLOR4       (1 << BUFFER_COLOR4)
-#define BUFFER_BIT_COLOR5       (1 << BUFFER_COLOR5)
-#define BUFFER_BIT_COLOR6       (1 << BUFFER_COLOR6)
-#define BUFFER_BIT_COLOR7       (1 << BUFFER_COLOR7)
-
-/**
- * Mask of all the color buffer bits (but not accum).
- */
-#define BUFFER_BITS_COLOR  (BUFFER_BIT_FRONT_LEFT | \
-                            BUFFER_BIT_BACK_LEFT | \
-                            BUFFER_BIT_FRONT_RIGHT | \
-                            BUFFER_BIT_BACK_RIGHT | \
-                            BUFFER_BIT_AUX0 | \
-                            BUFFER_BIT_COLOR0 | \
-                            BUFFER_BIT_COLOR1 | \
-                            BUFFER_BIT_COLOR2 | \
-                            BUFFER_BIT_COLOR3 | \
-                            BUFFER_BIT_COLOR4 | \
-                            BUFFER_BIT_COLOR5 | \
-                            BUFFER_BIT_COLOR6 | \
-                            BUFFER_BIT_COLOR7)
-
-
-/** The pixel transfer path has three color tables: */
-typedef enum
-{
-   COLORTABLE_PRECONVOLUTION,
-   COLORTABLE_POSTCONVOLUTION,
-   COLORTABLE_POSTCOLORMATRIX,
-   COLORTABLE_MAX
-} gl_colortable_index;
-
-
-/**
- * Data structure for color tables
- */
-struct gl_color_table
-{
-   GLenum InternalFormat;      /**< The user-specified format */
-   GLenum _BaseFormat;         /**< GL_ALPHA, GL_RGBA, GL_RGB, etc */
-   GLuint Size;                /**< number of entries in table */
-   GLfloat *TableF;            /**< Color table, floating point values */
-   GLubyte *TableUB;           /**< Color table, ubyte values */
-   GLubyte RedSize;
-   GLubyte GreenSize;
-   GLubyte BlueSize;
-   GLubyte AlphaSize;
-   GLubyte LuminanceSize;
-   GLubyte IntensitySize;
-};
-
-
-/**
- * \name Bit flags used for updating material values.
- */
-/*@{*/
-#define MAT_ATTRIB_FRONT_AMBIENT           0 
-#define MAT_ATTRIB_BACK_AMBIENT            1
-#define MAT_ATTRIB_FRONT_DIFFUSE           2 
-#define MAT_ATTRIB_BACK_DIFFUSE            3
-#define MAT_ATTRIB_FRONT_SPECULAR          4 
-#define MAT_ATTRIB_BACK_SPECULAR           5
-#define MAT_ATTRIB_FRONT_EMISSION          6
-#define MAT_ATTRIB_BACK_EMISSION           7
-#define MAT_ATTRIB_FRONT_SHININESS         8
-#define MAT_ATTRIB_BACK_SHININESS          9
-#define MAT_ATTRIB_FRONT_INDEXES           10
-#define MAT_ATTRIB_BACK_INDEXES            11
-#define MAT_ATTRIB_MAX                     12
-
-#define MAT_ATTRIB_AMBIENT(f)  (MAT_ATTRIB_FRONT_AMBIENT+(f))  
-#define MAT_ATTRIB_DIFFUSE(f)  (MAT_ATTRIB_FRONT_DIFFUSE+(f))  
-#define MAT_ATTRIB_SPECULAR(f) (MAT_ATTRIB_FRONT_SPECULAR+(f)) 
-#define MAT_ATTRIB_EMISSION(f) (MAT_ATTRIB_FRONT_EMISSION+(f)) 
-#define MAT_ATTRIB_SHININESS(f)(MAT_ATTRIB_FRONT_SHININESS+(f))
-#define MAT_ATTRIB_INDEXES(f)  (MAT_ATTRIB_FRONT_INDEXES+(f))  
-
-#define MAT_INDEX_AMBIENT  0
-#define MAT_INDEX_DIFFUSE  1
-#define MAT_INDEX_SPECULAR 2
-
-#define MAT_BIT_FRONT_AMBIENT         (1<<MAT_ATTRIB_FRONT_AMBIENT)
-#define MAT_BIT_BACK_AMBIENT          (1<<MAT_ATTRIB_BACK_AMBIENT)
-#define MAT_BIT_FRONT_DIFFUSE         (1<<MAT_ATTRIB_FRONT_DIFFUSE)
-#define MAT_BIT_BACK_DIFFUSE          (1<<MAT_ATTRIB_BACK_DIFFUSE)
-#define MAT_BIT_FRONT_SPECULAR        (1<<MAT_ATTRIB_FRONT_SPECULAR)
-#define MAT_BIT_BACK_SPECULAR         (1<<MAT_ATTRIB_BACK_SPECULAR)
-#define MAT_BIT_FRONT_EMISSION        (1<<MAT_ATTRIB_FRONT_EMISSION)
-#define MAT_BIT_BACK_EMISSION         (1<<MAT_ATTRIB_BACK_EMISSION)
-#define MAT_BIT_FRONT_SHININESS       (1<<MAT_ATTRIB_FRONT_SHININESS)
-#define MAT_BIT_BACK_SHININESS        (1<<MAT_ATTRIB_BACK_SHININESS)
-#define MAT_BIT_FRONT_INDEXES         (1<<MAT_ATTRIB_FRONT_INDEXES)
-#define MAT_BIT_BACK_INDEXES          (1<<MAT_ATTRIB_BACK_INDEXES)
-
-
-#define FRONT_MATERIAL_BITS	(MAT_BIT_FRONT_EMISSION | 	\
-				 MAT_BIT_FRONT_AMBIENT |	\
-				 MAT_BIT_FRONT_DIFFUSE | 	\
-				 MAT_BIT_FRONT_SPECULAR |	\
-				 MAT_BIT_FRONT_SHININESS | 	\
-				 MAT_BIT_FRONT_INDEXES)
-
-#define BACK_MATERIAL_BITS	(MAT_BIT_BACK_EMISSION |	\
-				 MAT_BIT_BACK_AMBIENT |		\
-				 MAT_BIT_BACK_DIFFUSE |		\
-				 MAT_BIT_BACK_SPECULAR |	\
-				 MAT_BIT_BACK_SHININESS |	\
-				 MAT_BIT_BACK_INDEXES)
-
-#define ALL_MATERIAL_BITS	(FRONT_MATERIAL_BITS | BACK_MATERIAL_BITS)
-/*@}*/
-
-
-#define EXP_TABLE_SIZE 512	/**< Specular exponent lookup table sizes */
-#define SHINE_TABLE_SIZE 256	/**< Material shininess lookup table sizes */
-
-/**
- * Material shininess lookup table.
- */
-struct gl_shine_tab
-{
-   struct gl_shine_tab *next, *prev;
-   GLfloat tab[SHINE_TABLE_SIZE+1];
-   GLfloat shininess;
-   GLuint refcount;
-};
-
-
-/**
- * Light source state.
- */
-struct gl_light
-{
-   struct gl_light *next;	/**< double linked list with sentinel */
-   struct gl_light *prev;
-
-   GLfloat Ambient[4];		/**< ambient color */
-   GLfloat Diffuse[4];		/**< diffuse color */
-   GLfloat Specular[4];		/**< specular color */
-   GLfloat EyePosition[4];	/**< position in eye coordinates */
-   GLfloat SpotDirection[4];	/**< spotlight direction in eye coordinates */
-   GLfloat SpotExponent;
-   GLfloat SpotCutoff;		/**< in degrees */
-   GLfloat _CosCutoffNeg;	/**< = cos(SpotCutoff) */
-   GLfloat _CosCutoff;		/**< = MAX(0, cos(SpotCutoff)) */
-   GLfloat ConstantAttenuation;
-   GLfloat LinearAttenuation;
-   GLfloat QuadraticAttenuation;
-   GLboolean Enabled;		/**< On/off flag */
-
-   /** 
-    * \name Derived fields
-    */
-   /*@{*/
-   GLbitfield _Flags;		/**< State */
-
-   GLfloat _Position[4];	/**< position in eye/obj coordinates */
-   GLfloat _VP_inf_norm[3];	/**< Norm direction to infinite light */
-   GLfloat _h_inf_norm[3];	/**< Norm( _VP_inf_norm + <0,0,1> ) */
-   GLfloat _NormSpotDirection[4]; /**< normalized spotlight direction */
-   GLfloat _VP_inf_spot_attenuation;
-
-   GLfloat _SpotExpTable[EXP_TABLE_SIZE][2];  /**< to replace a pow() call */
-   GLfloat _MatAmbient[2][3];	/**< material ambient * light ambient */
-   GLfloat _MatDiffuse[2][3];	/**< material diffuse * light diffuse */
-   GLfloat _MatSpecular[2][3];	/**< material spec * light specular */
-   GLfloat _dli;		/**< CI diffuse light intensity */
-   GLfloat _sli;		/**< CI specular light intensity */
-   /*@}*/
-};
-
-
-/**
- * Light model state.
- */
-struct gl_lightmodel
-{
-   GLfloat Ambient[4];		/**< ambient color */
-   GLboolean LocalViewer;	/**< Local (or infinite) view point? */
-   GLboolean TwoSide;		/**< Two (or one) sided lighting? */
-   GLenum ColorControl;		/**< either GL_SINGLE_COLOR
-				 *    or GL_SEPARATE_SPECULAR_COLOR */
-};
-
-
-/**
- * Material state.
- */
-struct gl_material
-{
-   GLfloat Attrib[MAT_ATTRIB_MAX][4];
-};
-
-
-/**
- * Accumulation buffer attribute group (GL_ACCUM_BUFFER_BIT)
- */
-struct gl_accum_attrib
-{
-   GLfloat ClearColor[4];	/**< Accumulation buffer clear color */
-};
-
-
-/**
- * Color buffer attribute group (GL_COLOR_BUFFER_BIT).
- */
-struct gl_colorbuffer_attrib
-{
-   GLuint ClearIndex;			/**< Index to use for glClear */
-   GLclampf ClearColor[4];		/**< Color to use for glClear */
-
-   GLuint IndexMask;			/**< Color index write mask */
-   GLubyte ColorMask[MAX_DRAW_BUFFERS][4];/**< Each flag is 0xff or 0x0 */
-
-   GLenum DrawBuffer[MAX_DRAW_BUFFERS];	/**< Which buffer to draw into */
-
-   /** 
-    * \name alpha testing
-    */
-   /*@{*/
-   GLboolean AlphaEnabled;		/**< Alpha test enabled flag */
-   GLenum AlphaFunc;			/**< Alpha test function */
-   GLclampf AlphaRef;			/**< Alpha reference value */
-   /*@}*/
-
-   /** 
-    * \name Blending
-    */
-   /*@{*/
-   GLbitfield BlendEnabled;		/**< Per-buffer blend enable flags */
-   GLenum BlendSrcRGB;			/**< Blending source operator */
-   GLenum BlendDstRGB;			/**< Blending destination operator */
-   GLenum BlendSrcA;			/**< GL_INGR_blend_func_separate */
-   GLenum BlendDstA;			/**< GL_INGR_blend_func_separate */
-   GLenum BlendEquationRGB;		/**< Blending equation */
-   GLenum BlendEquationA;		/**< GL_EXT_blend_equation_separate */
-   GLfloat BlendColor[4];		/**< Blending color */
-   /*@}*/
-
-   /** 
-    * \name Logic op
-    */
-   /*@{*/
-   GLenum LogicOp;			/**< Logic operator */
-   GLboolean IndexLogicOpEnabled;	/**< Color index logic op enabled flag */
-   GLboolean ColorLogicOpEnabled;	/**< RGBA logic op enabled flag */
-   GLboolean _LogicOpEnabled;		/**< RGBA logic op + EXT_blend_logic_op enabled flag */
-   /*@}*/
-
-   GLboolean DitherFlag;		/**< Dither enable flag */
-
-   GLenum ClampFragmentColor; /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */
-   GLenum ClampReadColor;     /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */
-};
-
-
-/**
- * Current attribute group (GL_CURRENT_BIT).
- */
-struct gl_current_attrib
-{
-   /**
-    * \name Current vertex attributes.
-    * \note Values are valid only after FLUSH_VERTICES has been called.
-    * \note Index and Edgeflag current values are stored as floats in the 
-    * SIX and SEVEN attribute slots.
-    */
-   GLfloat Attrib[VERT_ATTRIB_MAX][4];	/**< Position, color, texcoords, etc */
-
-   /**
-    * \name Current raster position attributes (always valid).
-    * \note This set of attributes is very similar to the SWvertex struct.
-    */
-   /*@{*/
-   GLfloat RasterPos[4];
-   GLfloat RasterDistance;
-   GLfloat RasterColor[4];
-   GLfloat RasterSecondaryColor[4];
-   GLfloat RasterTexCoords[MAX_TEXTURE_COORD_UNITS][4];
-   GLboolean RasterPosValid;
-   /*@}*/
-};
-
-
-/**
- * Depth buffer attribute group (GL_DEPTH_BUFFER_BIT).
- */
-struct gl_depthbuffer_attrib
-{
-   GLenum Func;			/**< Function for depth buffer compare */
-   GLclampd Clear;		/**< Value to clear depth buffer to */
-   GLboolean Test;		/**< Depth buffering enabled flag */
-   GLboolean Mask;		/**< Depth buffer writable? */
-   GLboolean BoundsTest;        /**< GL_EXT_depth_bounds_test */
-   GLfloat BoundsMin, BoundsMax;/**< GL_EXT_depth_bounds_test */
-};
-
-
-/**
- * Evaluator attribute group (GL_EVAL_BIT).
- */
-struct gl_eval_attrib
-{
-   /**
-    * \name Enable bits 
-    */
-   /*@{*/
-   GLboolean Map1Color4;
-   GLboolean Map1Index;
-   GLboolean Map1Normal;
-   GLboolean Map1TextureCoord1;
-   GLboolean Map1TextureCoord2;
-   GLboolean Map1TextureCoord3;
-   GLboolean Map1TextureCoord4;
-   GLboolean Map1Vertex3;
-   GLboolean Map1Vertex4;
-   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */
-   GLboolean Map2Color4;
-   GLboolean Map2Index;
-   GLboolean Map2Normal;
-   GLboolean Map2TextureCoord1;
-   GLboolean Map2TextureCoord2;
-   GLboolean Map2TextureCoord3;
-   GLboolean Map2TextureCoord4;
-   GLboolean Map2Vertex3;
-   GLboolean Map2Vertex4;
-   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
-   GLboolean AutoNormal;
-   /*@}*/
-   
-   /**
-    * \name Map Grid endpoints and divisions and calculated du values
-    */
-   /*@{*/
-   GLint MapGrid1un;
-   GLfloat MapGrid1u1, MapGrid1u2, MapGrid1du;
-   GLint MapGrid2un, MapGrid2vn;
-   GLfloat MapGrid2u1, MapGrid2u2, MapGrid2du;
-   GLfloat MapGrid2v1, MapGrid2v2, MapGrid2dv;
-   /*@}*/
-};
-
-
-/**
- * Fog attribute group (GL_FOG_BIT).
- */
-struct gl_fog_attrib
-{
-   GLboolean Enabled;		/**< Fog enabled flag */
-   GLfloat Color[4];		/**< Fog color */
-   GLfloat Density;		/**< Density >= 0.0 */
-   GLfloat Start;		/**< Start distance in eye coords */
-   GLfloat End;			/**< End distance in eye coords */
-   GLfloat Index;		/**< Fog index */
-   GLenum Mode;			/**< Fog mode */
-   GLboolean ColorSumEnabled;
-   GLenum FogCoordinateSource;  /**< GL_EXT_fog_coord */
-   GLfloat _Scale;		/**< (End == Start) ? 1.0 : 1.0 / (End - Start) */
-};
-
-
-/** 
- * Hint attribute group (GL_HINT_BIT).
- * 
- * Values are always one of GL_FASTEST, GL_NICEST, or GL_DONT_CARE.
- */
-struct gl_hint_attrib
-{
-   GLenum PerspectiveCorrection;
-   GLenum PointSmooth;
-   GLenum LineSmooth;
-   GLenum PolygonSmooth;
-   GLenum Fog;
-   GLenum ClipVolumeClipping;   /**< GL_EXT_clip_volume_hint */
-   GLenum TextureCompression;   /**< GL_ARB_texture_compression */
-   GLenum GenerateMipmap;       /**< GL_SGIS_generate_mipmap */
-   GLenum FragmentShaderDerivative; /**< GL_ARB_fragment_shader */
-};
-
-
-/**
- * Histogram attributes.
- */
-struct gl_histogram_attrib
-{
-   GLuint Width;                            /**< number of table entries */
-   GLint Format;                            /**< GL_ALPHA, GL_RGB, etc */
-   GLuint Count[HISTOGRAM_TABLE_SIZE][4];   /**< the histogram */
-   GLboolean Sink;                          /**< terminate image transfer? */
-   GLubyte RedSize;                         /**< Bits per counter */
-   GLubyte GreenSize;
-   GLubyte BlueSize;
-   GLubyte AlphaSize;
-   GLubyte LuminanceSize;
-};
-
-
-/**
- * Color Min/max state.
- */
-struct gl_minmax_attrib
-{
-   GLenum Format;
-   GLboolean Sink;
-   GLfloat Min[4], Max[4];   /**< RGBA */
-};
-
-
-/**
- * Image convolution state.
- */
-struct gl_convolution_attrib
-{
-   GLenum Format;
-   GLenum InternalFormat;
-   GLuint Width;
-   GLuint Height;
-   GLfloat Filter[MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_HEIGHT * 4];
-};
-
-
-/**
- * Light state flags.
- */
-/*@{*/
-#define LIGHT_SPOT         0x1
-#define LIGHT_LOCAL_VIEWER 0x2
-#define LIGHT_POSITIONAL   0x4
-#define LIGHT_NEED_VERTICES (LIGHT_POSITIONAL|LIGHT_LOCAL_VIEWER)
-/*@}*/
-
-
-/**
- * Lighting attribute group (GL_LIGHT_BIT).
- */
-struct gl_light_attrib
-{
-   struct gl_light Light[MAX_LIGHTS];	/**< Array of light sources */
-   struct gl_lightmodel Model;		/**< Lighting model */
-
-   /**
-    * Must flush FLUSH_VERTICES before referencing:
-    */
-   /*@{*/
-   struct gl_material Material; 	/**< Includes front & back values */
-   /*@}*/
-
-   GLboolean Enabled;			/**< Lighting enabled flag */
-   GLenum ShadeModel;			/**< GL_FLAT or GL_SMOOTH */
-   GLenum ProvokingVertex;              /**< GL_EXT_provoking_vertex */
-   GLenum ColorMaterialFace;		/**< GL_FRONT, BACK or FRONT_AND_BACK */
-   GLenum ColorMaterialMode;		/**< GL_AMBIENT, GL_DIFFUSE, etc */
-   GLbitfield ColorMaterialBitmask;	/**< bitmask formed from Face and Mode */
-   GLboolean ColorMaterialEnabled;
-   GLenum ClampVertexColor;
-
-   struct gl_light EnabledList;         /**< List sentinel */
-
-   /** 
-    * Derived state for optimizations: 
-    */
-   /*@{*/
-   GLboolean _NeedEyeCoords;		
-   GLboolean _NeedVertices;		/**< Use fast shader? */
-   GLbitfield _Flags;		        /**< LIGHT_* flags, see above */
-   GLfloat _BaseColor[2][3];
-   /*@}*/
-};
-
-
-/**
- * Line attribute group (GL_LINE_BIT).
- */
-struct gl_line_attrib
-{
-   GLboolean SmoothFlag;	/**< GL_LINE_SMOOTH enabled? */
-   GLboolean StippleFlag;	/**< GL_LINE_STIPPLE enabled? */
-   GLushort StipplePattern;	/**< Stipple pattern */
-   GLint StippleFactor;		/**< Stipple repeat factor */
-   GLfloat Width;		/**< Line width */
-};
-
-
-/**
- * Display list attribute group (GL_LIST_BIT).
- */
-struct gl_list_attrib
-{
-   GLuint ListBase;
-};
-
-
-/**
- * Multisample attribute group (GL_MULTISAMPLE_BIT).
- */
-struct gl_multisample_attrib
-{
-   GLboolean Enabled;
-   GLboolean _Enabled;   /**< true if Enabled and multisample buffer */
-   GLboolean SampleAlphaToCoverage;
-   GLboolean SampleAlphaToOne;
-   GLboolean SampleCoverage;
-   GLfloat SampleCoverageValue;
-   GLboolean SampleCoverageInvert;
-};
-
-
-/**
- * A pixelmap (see glPixelMap)
- */
-struct gl_pixelmap
-{
-   GLint Size;
-   GLfloat Map[MAX_PIXEL_MAP_TABLE];
-   GLubyte Map8[MAX_PIXEL_MAP_TABLE];  /**< converted to 8-bit color */
-};
-
-
-/**
- * Collection of all pixelmaps
- */
-struct gl_pixelmaps
-{
-   struct gl_pixelmap RtoR;  /**< i.e. GL_PIXEL_MAP_R_TO_R */
-   struct gl_pixelmap GtoG;
-   struct gl_pixelmap BtoB;
-   struct gl_pixelmap AtoA;
-   struct gl_pixelmap ItoR;
-   struct gl_pixelmap ItoG;
-   struct gl_pixelmap ItoB;
-   struct gl_pixelmap ItoA;
-   struct gl_pixelmap ItoI;
-   struct gl_pixelmap StoS;
-};
-
-
-/**
- * Pixel attribute group (GL_PIXEL_MODE_BIT).
- */
-struct gl_pixel_attrib
-{
-   GLenum ReadBuffer;		/**< source buffer for glRead/CopyPixels() */
-
-   /*--- Begin Pixel Transfer State ---*/
-   /* Fields are in the order in which they're applied... */
-
-   /** Scale & Bias (index shift, offset) */
-   /*@{*/
-   GLfloat RedBias, RedScale;
-   GLfloat GreenBias, GreenScale;
-   GLfloat BlueBias, BlueScale;
-   GLfloat AlphaBias, AlphaScale;
-   GLfloat DepthBias, DepthScale;
-   GLint IndexShift, IndexOffset;
-   /*@}*/
-
-   /* Pixel Maps */
-   /* Note: actual pixel maps are not part of this attrib group */
-   GLboolean MapColorFlag;
-   GLboolean MapStencilFlag;
-
-   /* There are multiple color table stages: */
-   GLboolean ColorTableEnabled[COLORTABLE_MAX];
-   GLfloat ColorTableScale[COLORTABLE_MAX][4];  /**< RGBA */
-   GLfloat ColorTableBias[COLORTABLE_MAX][4];   /**< RGBA */
-
-   /* Convolution (GL_EXT_convolution) */
-   GLboolean Convolution1DEnabled;
-   GLboolean Convolution2DEnabled;
-   GLboolean Separable2DEnabled;
-   GLfloat ConvolutionBorderColor[3][4];  /**< RGBA */
-   GLenum ConvolutionBorderMode[3];
-   GLfloat ConvolutionFilterScale[3][4];  /**< RGBA */
-   GLfloat ConvolutionFilterBias[3][4];   /**< RGBA */
-   GLfloat PostConvolutionScale[4];  /**< RGBA */
-   GLfloat PostConvolutionBias[4];   /**< RGBA */
-
-   /* Color matrix (GL_SGI_color_matrix) */
-   /* Note: the color matrix is not part of this attrib group */
-   GLfloat PostColorMatrixScale[4];  /**< RGBA */
-   GLfloat PostColorMatrixBias[4];   /**< RGBA */
-
-   /* Histogram & minmax (GL_EXT_histogram) */
-   /* Note: histogram and minmax data are not part of this attrib group */
-   GLboolean HistogramEnabled;
-   GLboolean MinMaxEnabled;
-
-   /*--- End Pixel Transfer State ---*/
-
-   /** glPixelZoom */
-   GLfloat ZoomX, ZoomY;
-
-   /** GL_SGI_texture_color_table */
-   GLfloat TextureColorTableScale[4]; /**< RGBA */
-   GLfloat TextureColorTableBias[4];  /**< RGBA */
-};
-
-
-/**
- * Point attribute group (GL_POINT_BIT).
- */
-struct gl_point_attrib
-{
-   GLboolean SmoothFlag;	/**< True if GL_POINT_SMOOTH is enabled */
-   GLfloat Size;		/**< User-specified point size */
-   GLfloat Params[3];		/**< GL_EXT_point_parameters */
-   GLfloat MinSize, MaxSize;	/**< GL_EXT_point_parameters */
-   GLfloat Threshold;		/**< GL_EXT_point_parameters */
-   GLboolean _Attenuated;	/**< True if Params != [1, 0, 0] */
-   GLboolean PointSprite;	/**< GL_NV/ARB_point_sprite */
-   GLboolean CoordReplace[MAX_TEXTURE_COORD_UNITS]; /**< GL_ARB_point_sprite*/
-   GLenum SpriteRMode;		/**< GL_NV_point_sprite (only!) */
-   GLenum SpriteOrigin;		/**< GL_ARB_point_sprite */
-};
-
-
-/**
- * Polygon attribute group (GL_POLYGON_BIT).
- */
-struct gl_polygon_attrib
-{
-   GLenum FrontFace;		/**< Either GL_CW or GL_CCW */
-   GLenum FrontMode;		/**< Either GL_POINT, GL_LINE or GL_FILL */
-   GLenum BackMode;		/**< Either GL_POINT, GL_LINE or GL_FILL */
-   GLboolean _FrontBit;		/**< 0=GL_CCW, 1=GL_CW */
-   GLboolean CullFlag;		/**< Culling on/off flag */
-   GLboolean SmoothFlag;	/**< True if GL_POLYGON_SMOOTH is enabled */
-   GLboolean StippleFlag;	/**< True if GL_POLYGON_STIPPLE is enabled */
-   GLenum CullFaceMode;		/**< Culling mode GL_FRONT or GL_BACK */
-   GLfloat OffsetFactor;	/**< Polygon offset factor, from user */
-   GLfloat OffsetUnits;		/**< Polygon offset units, from user */
-   GLboolean OffsetPoint;	/**< Offset in GL_POINT mode */
-   GLboolean OffsetLine;	/**< Offset in GL_LINE mode */
-   GLboolean OffsetFill;	/**< Offset in GL_FILL mode */
-};
-
-
-/**
- * Scissor attributes (GL_SCISSOR_BIT).
- */
-struct gl_scissor_attrib
-{
-   GLboolean Enabled;		/**< Scissor test enabled? */
-   GLint X, Y;			/**< Lower left corner of box */
-   GLsizei Width, Height;	/**< Size of box */
-};
-
-
-/**
- * Stencil attribute group (GL_STENCIL_BUFFER_BIT).
- *
- * Three sets of stencil data are tracked so that OpenGL 2.0,
- * GL_EXT_stencil_two_side, and GL_ATI_separate_stencil can all be supported
- * simultaneously.  In each of the stencil state arrays, element 0 corresponds
- * to GL_FRONT.  Element 1 corresponds to the OpenGL 2.0 /
- * GL_ATI_separate_stencil GL_BACK state.  Element 2 corresponds to the
- * GL_EXT_stencil_two_side GL_BACK state.
- *
- * The derived value \c _BackFace is either 1 or 2 depending on whether or
- * not GL_STENCIL_TEST_TWO_SIDE_EXT is enabled.
- *
- * The derived value \c _TestTwoSide is set when the front-face and back-face
- * stencil state are different.
- */
-struct gl_stencil_attrib
-{
-   GLboolean Enabled;		/**< Enabled flag */
-   GLboolean TestTwoSide;	/**< GL_EXT_stencil_two_side */
-   GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 2) */
-   GLboolean _Enabled;          /**< Enabled and stencil buffer present */
-   GLboolean _TestTwoSide;
-   GLubyte _BackFace;           /**< Current back stencil state (1 or 2) */
-   GLenum Function[3];		/**< Stencil function */
-   GLenum FailFunc[3];		/**< Fail function */
-   GLenum ZPassFunc[3];		/**< Depth buffer pass function */
-   GLenum ZFailFunc[3];		/**< Depth buffer fail function */
-   GLint Ref[3];		/**< Reference value */
-   GLuint ValueMask[3];		/**< Value mask */
-   GLuint WriteMask[3];		/**< Write mask */
-   GLuint Clear;		/**< Clear value */
-};
-
-
-/**
- * An index for each type of texture object.  These correspond to the GL
- * texture target enums, such as GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, etc.
- * Note: the order is from highest priority to lowest priority.
- */
-typedef enum
-{
-   TEXTURE_2D_ARRAY_INDEX,
-   TEXTURE_1D_ARRAY_INDEX,
-   TEXTURE_CUBE_INDEX,
-   TEXTURE_3D_INDEX,
-   TEXTURE_RECT_INDEX,
-   TEXTURE_2D_INDEX,
-   TEXTURE_1D_INDEX,
-   NUM_TEXTURE_TARGETS
-} gl_texture_index;
-
-
-/**
- * Bit flags for each type of texture object
- * Used for Texture.Unit[]._ReallyEnabled flags.
- */
-/*@{*/
-#define TEXTURE_2D_ARRAY_BIT (1 << TEXTURE_2D_ARRAY_INDEX)
-#define TEXTURE_1D_ARRAY_BIT (1 << TEXTURE_1D_ARRAY_INDEX)
-#define TEXTURE_CUBE_BIT     (1 << TEXTURE_CUBE_INDEX)
-#define TEXTURE_3D_BIT       (1 << TEXTURE_3D_INDEX)
-#define TEXTURE_RECT_BIT     (1 << TEXTURE_RECT_INDEX)
-#define TEXTURE_2D_BIT       (1 << TEXTURE_2D_INDEX)
-#define TEXTURE_1D_BIT       (1 << TEXTURE_1D_INDEX)
-/*@}*/
-
-
-/**
- * TexGenEnabled flags.
- */
-/*@{*/
-#define S_BIT 1
-#define T_BIT 2
-#define R_BIT 4
-#define Q_BIT 8
-#define STR_BITS (S_BIT | T_BIT | R_BIT)
-/*@}*/
-
-
-/**
- * Bit flag versions of the corresponding GL_ constants.
- */
-/*@{*/
-#define TEXGEN_SPHERE_MAP        0x1
-#define TEXGEN_OBJ_LINEAR        0x2
-#define TEXGEN_EYE_LINEAR        0x4
-#define TEXGEN_REFLECTION_MAP_NV 0x8
-#define TEXGEN_NORMAL_MAP_NV     0x10
-
-#define TEXGEN_NEED_NORMALS      (TEXGEN_SPHERE_MAP        | \
-				  TEXGEN_REFLECTION_MAP_NV | \
-				  TEXGEN_NORMAL_MAP_NV)
-#define TEXGEN_NEED_EYE_COORD    (TEXGEN_SPHERE_MAP        | \
-				  TEXGEN_REFLECTION_MAP_NV | \
-				  TEXGEN_NORMAL_MAP_NV     | \
-				  TEXGEN_EYE_LINEAR)
-/*@}*/
-
-
-
-/** Tex-gen enabled for texture unit? */
-#define ENABLE_TEXGEN(unit) (1 << (unit))
-
-/** Non-identity texture matrix for texture unit? */
-#define ENABLE_TEXMAT(unit) (1 << (unit))
-
-
-/**
- * Texel fetch function prototype.  We use texel fetch functions to
- * extract RGBA, color indexes and depth components out of 1D, 2D and 3D
- * texture images.  These functions help to isolate us from the gritty
- * details of all the various texture image encodings.
- * 
- * \param texImage texture image.
- * \param col texel column.
- * \param row texel row.
- * \param img texel image level/layer.
- * \param texelOut output texel (up to 4 GLchans)
- */
-typedef void (*FetchTexelFuncC)( const struct gl_texture_image *texImage,
-                                 GLint col, GLint row, GLint img,
-                                 GLchan *texelOut );
-
-/**
- * As above, but returns floats.
- * Used for depth component images and for upcoming signed/float
- * texture images.
- */
-typedef void (*FetchTexelFuncF)( const struct gl_texture_image *texImage,
-                                 GLint col, GLint row, GLint img,
-                                 GLfloat *texelOut );
-
-
-typedef void (*StoreTexelFunc)(struct gl_texture_image *texImage,
-                               GLint col, GLint row, GLint img,
-                               const void *texel);
-
-
-/**
- * Texture image state.  Describes the dimensions of a texture image,
- * the texel format and pointers to Texel Fetch functions.
- */
-struct gl_texture_image
-{
-   GLint InternalFormat;	/**< Internal format as given by the user */
-   GLenum _BaseFormat;		/**< Either GL_RGB, GL_RGBA, GL_ALPHA,
-				 *   GL_LUMINANCE, GL_LUMINANCE_ALPHA,
-				 *   GL_INTENSITY, GL_COLOR_INDEX,
-				 *   GL_DEPTH_COMPONENT or GL_DEPTH_STENCIL_EXT
-                                 *   only. Used for choosing TexEnv arithmetic.
-				 */
-   GLuint TexFormat;            /**< The actual format: MESA_FORMAT_x */
-
-   GLuint Border;		/**< 0 or 1 */
-   GLuint Width;		/**< = 2^WidthLog2 + 2*Border */
-   GLuint Height;		/**< = 2^HeightLog2 + 2*Border */
-   GLuint Depth;		/**< = 2^DepthLog2 + 2*Border */
-   GLuint Width2;		/**< = Width - 2*Border */
-   GLuint Height2;		/**< = Height - 2*Border */
-   GLuint Depth2;		/**< = Depth - 2*Border */
-   GLuint WidthLog2;		/**< = log2(Width2) */
-   GLuint HeightLog2;		/**< = log2(Height2) */
-   GLuint DepthLog2;		/**< = log2(Depth2) */
-   GLuint MaxLog2;		/**< = MAX(WidthLog2, HeightLog2) */
-   GLfloat WidthScale;		/**< used for mipmap LOD computation */
-   GLfloat HeightScale;		/**< used for mipmap LOD computation */
-   GLfloat DepthScale;		/**< used for mipmap LOD computation */
-   GLboolean IsClientData;	/**< Data owned by client? */
-   GLboolean _IsPowerOfTwo;	/**< Are all dimensions powers of two? */
-
-   struct gl_texture_object *TexObject;  /**< Pointer back to parent object */
-
-   FetchTexelFuncC FetchTexelc;	/**< GLchan texel fetch function pointer */
-   FetchTexelFuncF FetchTexelf;	/**< Float texel fetch function pointer */
-
-   GLuint RowStride;		/**< Padded width in units of texels */
-   GLuint *ImageOffsets;        /**< if 3D texture: array [Depth] of offsets to
-                                     each 2D slice in 'Data', in texels */
-   GLvoid *Data;		/**< Image data, accessed via FetchTexel() */
-
-   /**
-    * \name For device driver:
-    */
-   /*@{*/
-   void *DriverData;		/**< Arbitrary device driver data */
-   /*@}*/
-};
-
-
-/**
- * Indexes for cube map faces.
- */
-typedef enum
-{
-   FACE_POS_X = 0,
-   FACE_NEG_X = 1,
-   FACE_POS_Y = 2,
-   FACE_NEG_Y = 3,
-   FACE_POS_Z = 4,
-   FACE_NEG_Z = 5,
-   MAX_FACES = 6
-} gl_face_index;
-
-
-/**
- * Texture object state.  Contains the array of mipmap images, border color,
- * wrap modes, filter modes, shadow/texcompare state, and the per-texture
- * color palette.
- */
-struct gl_texture_object
-{
-   _glthread_Mutex Mutex;	/**< for thread safety */
-   GLint RefCount;		/**< reference count */
-   GLuint Name;			/**< the user-visible texture object ID */
-   GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */
-   GLfloat Priority;		/**< in [0,1] */
-   union {
-      GLfloat f[4];
-      GLuint ui[4];
-      GLint i[4];
-   } BorderColor;               /**< Interpreted according to texture format */
-   GLenum WrapS;		/**< S-axis texture image wrap mode */
-   GLenum WrapT;		/**< T-axis texture image wrap mode */
-   GLenum WrapR;		/**< R-axis texture image wrap mode */
-   GLenum MinFilter;		/**< minification filter */
-   GLenum MagFilter;		/**< magnification filter */
-   GLfloat MinLod;		/**< min lambda, OpenGL 1.2 */
-   GLfloat MaxLod;		/**< max lambda, OpenGL 1.2 */
-   GLfloat LodBias;		/**< OpenGL 1.4 */
-   GLint BaseLevel;		/**< min mipmap level, OpenGL 1.2 */
-   GLint MaxLevel;		/**< max mipmap level, OpenGL 1.2 */
-   GLfloat MaxAnisotropy;	/**< GL_EXT_texture_filter_anisotropic */
-   GLenum CompareMode;		/**< GL_ARB_shadow */
-   GLenum CompareFunc;		/**< GL_ARB_shadow */
-   GLfloat CompareFailValue;    /**< GL_ARB_shadow_ambient */
-   GLenum DepthMode;		/**< GL_ARB_depth_texture */
-   GLint _MaxLevel;		/**< actual max mipmap level (q in the spec) */
-   GLfloat _MaxLambda;		/**< = _MaxLevel - BaseLevel (q - b in spec) */
-   GLint CropRect[4];           /**< GL_OES_draw_texture */
-   GLenum Swizzle[4];           /**< GL_EXT_texture_swizzle */
-   GLuint _Swizzle;             /**< same as Swizzle, but SWIZZLE_* format */
-   GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */
-   GLboolean _Complete;		/**< Is texture object complete? */
-   GLboolean _RenderToTexture;  /**< Any rendering to this texture? */
-   GLboolean Purgeable;         /**< Is the buffer purgeable under memory pressure? */
-
-   /** Actual texture images, indexed by [cube face] and [mipmap level] */
-   struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS];
-
-   /** GL_EXT_paletted_texture */
-   struct gl_color_table Palette;
-
-   /**
-    * \name For device driver.
-    * Note: instead of attaching driver data to this pointer, it's preferable
-    * to instead use this struct as a base class for your own texture object
-    * class.  Driver->NewTextureObject() can be used to implement the
-    * allocation.
-    */
-   void *DriverData;	/**< Arbitrary device driver data */
-};
-
-
-/** Up to four combiner sources are possible with GL_NV_texture_env_combine4 */
-#define MAX_COMBINER_TERMS 4
-
-
-/**
- * Texture combine environment state.
- */
-struct gl_tex_env_combine_state
-{
-   GLenum ModeRGB;       /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
-   GLenum ModeA;         /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */
-   /** Source terms: GL_PRIMARY_COLOR, GL_TEXTURE, etc */
-   GLenum SourceRGB[MAX_COMBINER_TERMS];
-   GLenum SourceA[MAX_COMBINER_TERMS];
-   /** Source operands: GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, etc */
-   GLenum OperandRGB[MAX_COMBINER_TERMS];
-   GLenum OperandA[MAX_COMBINER_TERMS];
-   GLuint ScaleShiftRGB; /**< 0, 1 or 2 */
-   GLuint ScaleShiftA;   /**< 0, 1 or 2 */
-   GLuint _NumArgsRGB;   /**< Number of inputs used for the RGB combiner */
-   GLuint _NumArgsA;     /**< Number of inputs used for the A combiner */
-};
-
-
-/**
- * Texture coord generation state.
- */
-struct gl_texgen
-{
-   GLenum Mode;         /**< GL_EYE_LINEAR, GL_SPHERE_MAP, etc */
-   GLbitfield _ModeBit; /**< TEXGEN_x bit corresponding to Mode */
-   GLfloat ObjectPlane[4];
-   GLfloat EyePlane[4];
-};
-
-
-/**
- * Texture unit state.  Contains enable flags, texture environment/function/
- * combiners, texgen state, pointers to current texture objects and
- * post-filter color tables.
- */
-struct gl_texture_unit
-{
-   GLbitfield Enabled;          /**< bitmask of TEXTURE_*_BIT flags */
-   GLbitfield _ReallyEnabled;   /**< 0 or exactly one of TEXTURE_*_BIT flags */
-
-   GLenum EnvMode;              /**< GL_MODULATE, GL_DECAL, GL_BLEND, etc. */
-   GLfloat EnvColor[4];
-
-   struct gl_texgen GenS;
-   struct gl_texgen GenT;
-   struct gl_texgen GenR;
-   struct gl_texgen GenQ;
-   GLbitfield TexGenEnabled;	/**< Bitwise-OR of [STRQ]_BIT values */
-   GLbitfield _GenFlags;	/**< Bitwise-OR of Gen[STRQ]._ModeBit */
-
-   GLfloat LodBias;		/**< for biasing mipmap levels */
-   GLenum BumpTarget;
-   GLfloat RotMatrix[4]; /* 2x2 matrix */
-
-   /** 
-    * \name GL_EXT_texture_env_combine 
-    */
-   struct gl_tex_env_combine_state Combine;
-
-   /**
-    * Derived state based on \c EnvMode and the \c BaseFormat of the
-    * currently enabled texture.
-    */
-   struct gl_tex_env_combine_state _EnvMode;
-
-   /**
-    * Currently enabled combiner state.  This will point to either
-    * \c Combine or \c _EnvMode.
-    */
-   struct gl_tex_env_combine_state *_CurrentCombine;
-
-   /** Current texture object pointers */
-   struct gl_texture_object *CurrentTex[NUM_TEXTURE_TARGETS];
-
-   /** Points to highest priority, complete and enabled texture object */
-   struct gl_texture_object *_Current;
-
-   /** GL_SGI_texture_color_table */
-   /*@{*/
-   struct gl_color_table ColorTable;
-   struct gl_color_table ProxyColorTable;
-   GLboolean ColorTableEnabled;
-   /*@}*/
-};
-
-
-/**
- * Texture attribute group (GL_TEXTURE_BIT).
- */
-struct gl_texture_attrib
-{
-   GLuint CurrentUnit;   /**< GL_ACTIVE_TEXTURE */
-   struct gl_texture_unit Unit[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
-
-   struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
-
-   /** GL_ARB_seamless_cubemap */
-   GLboolean CubeMapSeamless;
-
-   /** GL_EXT_shared_texture_palette */
-   GLboolean SharedPalette;
-   struct gl_color_table Palette;
-
-   /** Texture units/samplers used by vertex or fragment texturing */
-   GLbitfield _EnabledUnits;
-
-   /** Texture coord units/sets used for fragment texturing */
-   GLbitfield _EnabledCoordUnits;
-
-   /** Texture coord units that have texgen enabled */
-   GLbitfield _TexGenEnabled;
-
-   /** Texture coord units that have non-identity matrices */
-   GLbitfield _TexMatEnabled;
-
-   /** Bitwise-OR of all Texture.Unit[i]._GenFlags */
-   GLbitfield _GenFlags;
-};
-
-
-/**
- * Transformation attribute group (GL_TRANSFORM_BIT).
- */
-struct gl_transform_attrib
-{
-   GLenum MatrixMode;				/**< Matrix mode */
-   GLfloat EyeUserPlane[MAX_CLIP_PLANES][4];	/**< User clip planes */
-   GLfloat _ClipUserPlane[MAX_CLIP_PLANES][4];	/**< derived */
-   GLbitfield ClipPlanesEnabled;                /**< on/off bitmask */
-   GLboolean Normalize;				/**< Normalize all normals? */
-   GLboolean RescaleNormals;			/**< GL_EXT_rescale_normal */
-   GLboolean RasterPositionUnclipped;           /**< GL_IBM_rasterpos_clip */
-   GLboolean DepthClamp;			/**< GL_ARB_depth_clamp */
-
-   GLboolean CullVertexFlag;	/**< True if GL_CULL_VERTEX_EXT is enabled */
-   GLfloat CullEyePos[4];
-   GLfloat CullObjPos[4];
-};
-
-
-/**
- * Viewport attribute group (GL_VIEWPORT_BIT).
- */
-struct gl_viewport_attrib
-{
-   GLint X, Y;			/**< position */
-   GLsizei Width, Height;	/**< size */
-   GLfloat Near, Far;		/**< Depth buffer range */
-   GLmatrix _WindowMap;		/**< Mapping transformation as a matrix. */
-};
-
-
-/**
- * GL_ARB_vertex/pixel_buffer_object buffer object
- */
-struct gl_buffer_object
-{
-   _glthread_Mutex Mutex;
-   GLint RefCount;
-   GLuint Name;
-   GLenum Usage;        /**< GL_STREAM_DRAW_ARB, GL_STREAM_READ_ARB, etc. */
-   GLsizeiptrARB Size;  /**< Size of buffer storage in bytes */
-   GLubyte *Data;       /**< Location of storage either in RAM or VRAM. */
-   /** Fields describing a mapped buffer */
-   /*@{*/
-   GLbitfield AccessFlags; /**< Mask of GL_MAP_x_BIT flags */
-   GLvoid *Pointer;     /**< User-space address of mapping */
-   GLintptr Offset;     /**< Mapped offset */
-   GLsizeiptr Length;   /**< Mapped length */
-   /*@}*/
-   GLboolean Written;   /**< Ever written to? (for debugging) */
-   GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */
-};
-
-
-/**
- * Client pixel packing/unpacking attributes
- */
-struct gl_pixelstore_attrib
-{
-   GLint Alignment;
-   GLint RowLength;
-   GLint SkipPixels;
-   GLint SkipRows;
-   GLint ImageHeight;
-   GLint SkipImages;
-   GLboolean SwapBytes;
-   GLboolean LsbFirst;
-   GLboolean ClientStorage; /**< GL_APPLE_client_storage */
-   GLboolean Invert;        /**< GL_MESA_pack_invert */
-   struct gl_buffer_object *BufferObj; /**< GL_ARB_pixel_buffer_object */
-};
-
-
-/**
- * Client vertex array attributes
- */
-struct gl_client_array
-{
-   GLint Size;                  /**< components per element (1,2,3,4) */
-   GLenum Type;                 /**< datatype: GL_FLOAT, GL_INT, etc */
-   GLenum Format;               /**< default: GL_RGBA, but may be GL_BGRA */
-   GLsizei Stride;		/**< user-specified stride */
-   GLsizei StrideB;		/**< actual stride in bytes */
-   const GLubyte *Ptr;          /**< Points to array data */
-   GLboolean Enabled;		/**< Enabled flag is a boolean */
-   GLboolean Normalized;        /**< GL_ARB_vertex_program */
-   GLuint _ElementSize;         /**< size of each element in bytes */
-
-   struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */
-   GLuint _MaxElement;          /**< max element index into array buffer + 1 */
-};
-
-
-/**
- * Collection of vertex arrays.  Defined by the GL_APPLE_vertex_array_object
- * extension, but a nice encapsulation in any case.
- */
-struct gl_array_object
-{
-   /** Name of the array object as received from glGenVertexArrayAPPLE. */
-   GLuint Name;
-
-   GLint RefCount;
-   _glthread_Mutex Mutex;
-   GLboolean VBOonly;  /**< require all arrays to live in VBOs? */
-
-   /** Conventional vertex arrays */
-   /*@{*/
-   struct gl_client_array Vertex;
-   struct gl_client_array Weight;
-   struct gl_client_array Normal;
-   struct gl_client_array Color;
-   struct gl_client_array SecondaryColor;
-   struct gl_client_array FogCoord;
-   struct gl_client_array Index;
-   struct gl_client_array EdgeFlag;
-   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];
-   struct gl_client_array PointSize;
-   /*@}*/
-
-   /**
-    * Generic arrays for vertex programs/shaders.
-    * For NV vertex programs, these attributes alias and take priority
-    * over the conventional attribs above.  For ARB vertex programs and
-    * GLSL vertex shaders, these attributes are separate.
-    */
-   struct gl_client_array VertexAttrib[MAX_VERTEX_GENERIC_ATTRIBS];
-
-   /** Mask of _NEW_ARRAY_* values indicating which arrays are enabled */
-   GLbitfield _Enabled;
-
-   /**
-    * Min of all enabled arrays' _MaxElement.  When arrays reside inside VBOs
-    * we can determine the max legal (in bounds) glDrawElements array index.
-    */
-   GLuint _MaxElement;
-};
-
-
-/**
- * Vertex array state
- */
-struct gl_array_attrib
-{
-   /** Currently bound array object. See _mesa_BindVertexArrayAPPLE() */
-   struct gl_array_object *ArrayObj;
-
-   /** The default vertex array object */
-   struct gl_array_object *DefaultArrayObj;
-
-   /** Array objects (GL_ARB/APPLE_vertex_array_object) */
-   struct _mesa_HashTable *Objects;
-
-   GLint ActiveTexture;		/**< Client Active Texture */
-   GLuint LockFirst;            /**< GL_EXT_compiled_vertex_array */
-   GLuint LockCount;            /**< GL_EXT_compiled_vertex_array */
-
-   /** GL 3.1 (slightly different from GL_NV_primitive_restart) */
-   GLboolean PrimitiveRestart;
-   GLuint RestartIndex;
-
-   GLbitfield NewState;		/**< mask of _NEW_ARRAY_* values */
-
-   /* GL_ARB_vertex_buffer_object */
-   struct gl_buffer_object *ArrayBufferObj;
-   struct gl_buffer_object *ElementArrayBufferObj;
-};
-
-
-/**
- * Feedback buffer state
- */
-struct gl_feedback
-{
-   GLenum Type;
-   GLbitfield _Mask;    /**< FB_* bits */
-   GLfloat *Buffer;
-   GLuint BufferSize;
-   GLuint Count;
-};
-
-
-/**
- * Selection buffer state
- */
-struct gl_selection
-{
-   GLuint *Buffer;	/**< selection buffer */
-   GLuint BufferSize;	/**< size of the selection buffer */
-   GLuint BufferCount;	/**< number of values in the selection buffer */
-   GLuint Hits;		/**< number of records in the selection buffer */
-   GLuint NameStackDepth; /**< name stack depth */
-   GLuint NameStack[MAX_NAME_STACK_DEPTH]; /**< name stack */
-   GLboolean HitFlag;	/**< hit flag */
-   GLfloat HitMinZ;	/**< minimum hit depth */
-   GLfloat HitMaxZ;	/**< maximum hit depth */
-};
-
-
-/**
- * 1-D Evaluator control points
- */
-struct gl_1d_map
-{
-   GLuint Order;	/**< Number of control points */
-   GLfloat u1, u2, du;	/**< u1, u2, 1.0/(u2-u1) */
-   GLfloat *Points;	/**< Points to contiguous control points */
-};
-
-
-/**
- * 2-D Evaluator control points
- */
-struct gl_2d_map
-{
-   GLuint Uorder;		/**< Number of control points in U dimension */
-   GLuint Vorder;		/**< Number of control points in V dimension */
-   GLfloat u1, u2, du;
-   GLfloat v1, v2, dv;
-   GLfloat *Points;		/**< Points to contiguous control points */
-};
-
-
-/**
- * All evaluator control point state
- */
-struct gl_evaluators
-{
-   /** 
-    * \name 1-D maps
-    */
-   /*@{*/
-   struct gl_1d_map Map1Vertex3;
-   struct gl_1d_map Map1Vertex4;
-   struct gl_1d_map Map1Index;
-   struct gl_1d_map Map1Color4;
-   struct gl_1d_map Map1Normal;
-   struct gl_1d_map Map1Texture1;
-   struct gl_1d_map Map1Texture2;
-   struct gl_1d_map Map1Texture3;
-   struct gl_1d_map Map1Texture4;
-   struct gl_1d_map Map1Attrib[16];  /**< GL_NV_vertex_program */
-   /*@}*/
-
-   /** 
-    * \name 2-D maps 
-    */
-   /*@{*/
-   struct gl_2d_map Map2Vertex3;
-   struct gl_2d_map Map2Vertex4;
-   struct gl_2d_map Map2Index;
-   struct gl_2d_map Map2Color4;
-   struct gl_2d_map Map2Normal;
-   struct gl_2d_map Map2Texture1;
-   struct gl_2d_map Map2Texture2;
-   struct gl_2d_map Map2Texture3;
-   struct gl_2d_map Map2Texture4;
-   struct gl_2d_map Map2Attrib[16];  /**< GL_NV_vertex_program */
-   /*@}*/
-};
-
-
-/**
- * Names of the various vertex/fragment program register files, etc.
- *
- * NOTE: first four tokens must fit into 2 bits (see t_vb_arbprogram.c)
- * All values should fit in a 4-bit field.
- *
- * NOTE: PROGRAM_ENV_PARAM, PROGRAM_STATE_VAR, PROGRAM_NAMED_PARAM,
- * PROGRAM_CONSTANT, and PROGRAM_UNIFORM can all be considered to
- * be "uniform" variables since they can only be set outside glBegin/End.
- * They're also all stored in the same Parameters array.
- */
-typedef enum
-{
-   PROGRAM_TEMPORARY,   /**< machine->Temporary[] */
-   PROGRAM_INPUT,       /**< machine->Inputs[] */
-   PROGRAM_OUTPUT,      /**< machine->Outputs[] */
-   PROGRAM_VARYING,     /**< machine->Inputs[]/Outputs[] */
-   PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */
-   PROGRAM_ENV_PARAM,   /**< gl_program->Parameters[] */
-   PROGRAM_STATE_VAR,   /**< gl_program->Parameters[] */
-   PROGRAM_NAMED_PARAM, /**< gl_program->Parameters[] */
-   PROGRAM_CONSTANT,    /**< gl_program->Parameters[] */
-   PROGRAM_UNIFORM,     /**< gl_program->Parameters[] */
-   PROGRAM_WRITE_ONLY,  /**< A dummy, write-only register */
-   PROGRAM_ADDRESS,     /**< machine->AddressReg */
-   PROGRAM_SAMPLER,     /**< for shader samplers, compile-time only */
-   PROGRAM_UNDEFINED,   /**< Invalid/TBD value */
-   PROGRAM_FILE_MAX
-} gl_register_file;
-
-
-/** Vertex and fragment instructions */
-struct prog_instruction;
-struct gl_program_parameter_list;
-struct gl_uniform_list;
-
-
-/**
- * Base class for any kind of program object
- */
-struct gl_program
-{
-   GLuint Id;
-   GLubyte *String;  /**< Null-terminated program text */
-   GLint RefCount;
-   GLenum Target;    /**< GL_VERTEX/FRAGMENT_PROGRAM_ARB, GL_FRAGMENT_PROGRAM_NV */
-   GLenum Format;    /**< String encoding format */
-   GLboolean Resident;
-
-   struct prog_instruction *Instructions;
-
-   GLbitfield InputsRead;     /**< Bitmask of which input regs are read */
-   GLbitfield64 OutputsWritten; /**< Bitmask of which output regs are written */
-   GLbitfield InputFlags[MAX_PROGRAM_INPUTS];   /**< PROG_PARAM_BIT_x flags */
-   GLbitfield OutputFlags[MAX_PROGRAM_OUTPUTS]; /**< PROG_PARAM_BIT_x flags */
-   GLbitfield TexturesUsed[MAX_TEXTURE_UNITS];  /**< TEXTURE_x_BIT bitmask */
-   GLbitfield SamplersUsed;   /**< Bitfield of which samplers are used */
-   GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */
-
-
-   /** Named parameters, constants, etc. from program text */
-   struct gl_program_parameter_list *Parameters;
-   /** Numbered local parameters */
-   GLfloat LocalParams[MAX_PROGRAM_LOCAL_PARAMS][4];
-
-   /** Vertex/fragment shader varying vars */
-   struct gl_program_parameter_list *Varying;
-   /** Vertex program user-defined attributes */
-   struct gl_program_parameter_list *Attributes;
-
-   /** Map from sampler unit to texture unit (set by glUniform1i()) */
-   GLubyte SamplerUnits[MAX_SAMPLERS];
-   /** Which texture target is being sampled (TEXTURE_1D/2D/3D/etc_INDEX) */
-   gl_texture_index SamplerTargets[MAX_SAMPLERS];
-
-   /** Bitmask of which register files are read/written with indirect
-    * addressing.  Mask of (1 << PROGRAM_x) bits.
-    */
-   GLbitfield IndirectRegisterFiles;
-
-   /** Logical counts */
-   /*@{*/
-   GLuint NumInstructions;
-   GLuint NumTemporaries;
-   GLuint NumParameters;
-   GLuint NumAttributes;
-   GLuint NumAddressRegs;
-   GLuint NumAluInstructions;
-   GLuint NumTexInstructions;
-   GLuint NumTexIndirections;
-   /*@}*/
-   /** Native, actual h/w counts */
-   /*@{*/
-   GLuint NumNativeInstructions;
-   GLuint NumNativeTemporaries;
-   GLuint NumNativeParameters;
-   GLuint NumNativeAttributes;
-   GLuint NumNativeAddressRegs;
-   GLuint NumNativeAluInstructions;
-   GLuint NumNativeTexInstructions;
-   GLuint NumNativeTexIndirections;
-   /*@}*/
-};
-
-
-/** Vertex program object */
-struct gl_vertex_program
-{
-   struct gl_program Base;   /**< base class */
-   GLboolean IsNVProgram;    /**< is this a GL_NV_vertex_program program? */
-   GLboolean IsPositionInvariant;
-};
-
-
-/** Geometry program object */
-struct gl_geometry_program
-{
-   struct gl_program Base;   /**< base class */
-
-   GLint VerticesOut;
-   GLenum InputType;  /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,
-                           GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */
-   GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */
-};
-
-
-/** Fragment program object */
-struct gl_fragment_program
-{
-   struct gl_program Base;   /**< base class */
-   GLenum FogOption;
-   GLboolean UsesKill;          /**< shader uses KIL instruction */
-   GLboolean OriginUpperLeft;
-   GLboolean PixelCenterInteger;
-};
-
-
-/**
- * State common to vertex and fragment programs.
- */
-struct gl_program_state
-{
-   GLint ErrorPos;                       /* GL_PROGRAM_ERROR_POSITION_ARB/NV */
-   const char *ErrorString;              /* GL_PROGRAM_ERROR_STRING_ARB/NV */
-};
-
-
-/**
- * Context state for vertex programs.
- */
-struct gl_vertex_program_state
-{
-   GLboolean Enabled;            /**< User-set GL_VERTEX_PROGRAM_ARB/NV flag */
-   GLboolean _Enabled;           /**< Enabled and _valid_ user program? */
-   GLboolean PointSizeEnabled;   /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */
-   GLboolean TwoSideEnabled;     /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */
-   struct gl_vertex_program *Current;  /**< User-bound vertex program */
-
-   /** Currently enabled and valid vertex program (including internal
-    * programs, user-defined vertex programs and GLSL vertex shaders).
-    * This is the program we must use when rendering.
-    */
-   struct gl_vertex_program *_Current;
-
-   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
-
-   /* For GL_NV_vertex_program only: */
-   GLenum TrackMatrix[MAX_PROGRAM_ENV_PARAMS / 4];
-   GLenum TrackMatrixTransform[MAX_PROGRAM_ENV_PARAMS / 4];
-
-   /** Should fixed-function T&L be implemented with a vertex prog? */
-   GLboolean _MaintainTnlProgram;
-
-   /** Program to emulate fixed-function T&L (see above) */
-   struct gl_vertex_program *_TnlProgram;
-
-   /** Cache of fixed-function programs */
-   struct gl_program_cache *Cache;
-
-   GLboolean _Overriden;
-};
-
-
-/**
- * Context state for geometry programs.
- */
-struct gl_geometry_program_state
-{
-   GLboolean Enabled;               /**< GL_ARB_GEOMETRY_SHADER4 */
-   GLboolean _Enabled;              /**< Enabled and valid program? */
-   struct gl_geometry_program *Current;  /**< user-bound geometry program */
-
-   /** Currently enabled and valid program (including internal programs
-    * and compiled shader programs).
-    */
-   struct gl_geometry_program *_Current;
-
-   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
-
-   /** Cache of fixed-function programs */
-   struct gl_program_cache *Cache;
-};
-
-/**
- * Context state for fragment programs.
- */
-struct gl_fragment_program_state
-{
-   GLboolean Enabled;     /**< User-set fragment program enable flag */
-   GLboolean _Enabled;    /**< Enabled and _valid_ user program? */
-   struct gl_fragment_program *Current;  /**< User-bound fragment program */
-
-   /** Currently enabled and valid fragment program (including internal
-    * programs, user-defined fragment programs and GLSL fragment shaders).
-    * This is the program we must use when rendering.
-    */
-   struct gl_fragment_program *_Current;
-
-   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
-
-   /** Should fixed-function texturing be implemented with a fragment prog? */
-   GLboolean _MaintainTexEnvProgram;
-
-   /** Program to emulate fixed-function texture env/combine (see above) */
-   struct gl_fragment_program *_TexEnvProgram;
-
-   /** Cache of fixed-function programs */
-   struct gl_program_cache *Cache;
-};
-
-
-/**
- * ATI_fragment_shader runtime state
- */
-#define ATI_FS_INPUT_PRIMARY 0
-#define ATI_FS_INPUT_SECONDARY 1
-
-struct atifs_instruction;
-struct atifs_setupinst;
-
-/**
- * ATI fragment shader
- */
-struct ati_fragment_shader
-{
-   GLuint Id;
-   GLint RefCount;
-   struct atifs_instruction *Instructions[2];
-   struct atifs_setupinst *SetupInst[2];
-   GLfloat Constants[8][4];
-   GLbitfield LocalConstDef;  /**< Indicates which constants have been set */
-   GLubyte numArithInstr[2];
-   GLubyte regsAssigned[2];
-   GLubyte NumPasses;         /**< 1 or 2 */
-   GLubyte cur_pass;
-   GLubyte last_optype;
-   GLboolean interpinp1;
-   GLboolean isValid;
-   GLuint swizzlerq;
-};
-
-/**
- * Context state for GL_ATI_fragment_shader
- */
-struct gl_ati_fragment_shader_state
-{
-   GLboolean Enabled;
-   GLboolean _Enabled;                  /**< enabled and valid shader? */
-   GLboolean Compiling;
-   GLfloat GlobalConstants[8][4];
-   struct ati_fragment_shader *Current;
-};
-
-
-/**
- * Occlusion/timer query object.
- */
-struct gl_query_object
-{
-   GLenum Target;      /**< The query target, when active */
-   GLuint Id;          /**< hash table ID/name */
-   GLuint64EXT Result; /**< the counter */
-   GLboolean Active;   /**< inside Begin/EndQuery */
-   GLboolean Ready;    /**< result is ready? */
-};
-
-
-/**
- * Context state for query objects.
- */
-struct gl_query_state
-{
-   struct _mesa_HashTable *QueryObjects;
-   struct gl_query_object *CurrentOcclusionObject; /* GL_ARB_occlusion_query */
-   struct gl_query_object *CurrentTimerObject;     /* GL_EXT_timer_query */
-
-   /** GL_NV_conditional_render */
-   struct gl_query_object *CondRenderQuery;
-
-   /** GL_EXT_transform_feedback */
-   struct gl_query_object *PrimitivesGenerated;
-   struct gl_query_object *PrimitivesWritten;
-
-   /** GL_ARB_timer_query */
-   struct gl_query_object *TimeElapsed;
-
-   GLenum CondRenderMode;
-};
-
-
-/** Sync object state */
-struct gl_sync_object {
-   struct simple_node link;
-   GLenum Type;               /**< GL_SYNC_FENCE */
-   GLuint Name;               /**< Fence name */
-   GLint RefCount;            /**< Reference count */
-   GLboolean DeletePending;   /**< Object was deleted while there were still
-			       * live references (e.g., sync not yet finished)
-			       */
-   GLenum SyncCondition;
-   GLbitfield Flags;          /**< Flags passed to glFenceSync */
-   GLuint StatusFlag:1;       /**< Has the sync object been signaled? */
-};
-
-
-/** Set by #pragma directives */
-struct gl_sl_pragmas
-{
-   GLboolean IgnoreOptimize;  /**< ignore #pragma optimize(on/off) ? */
-   GLboolean IgnoreDebug;     /**< ignore #pragma debug(on/off) ? */
-   GLboolean Optimize;  /**< defaults on */
-   GLboolean Debug;     /**< defaults off */
-};
-
-
-/**
- * A GLSL vertex or fragment shader object.
- */
-struct gl_shader
-{
-   GLenum Type;  /**< GL_FRAGMENT_SHADER || GL_VERTEX_SHADER || GL_GEOMETRY_SHADER_ARB (first field!) */
-   GLuint Name;  /**< AKA the handle */
-   GLint RefCount;  /**< Reference count */
-   GLboolean DeletePending;
-   GLboolean CompileStatus;
-   GLboolean Main;  /**< shader defines main() */
-   GLboolean UnresolvedRefs;
-   const GLchar *Source;  /**< Source code string */
-   GLuint SourceChecksum;       /**< for debug/logging purposes */
-   struct gl_program *Program;  /**< Post-compile assembly code */
-   GLchar *InfoLog;
-   struct gl_sl_pragmas Pragmas;
-
-   unsigned Version;       /**< GLSL version used for linking */
-
-   struct exec_list *ir;
-   struct glsl_symbol_table *symbols;
-
-   /** Shaders containing built-in functions that are used for linking. */
-   struct gl_shader *builtins_to_link[16];
-   unsigned num_builtins_to_link;
-};
-
-
-/**
- * A GLSL program object.
- * Basically a linked collection of vertex and fragment shaders.
- */
-struct gl_shader_program
-{
-   GLenum Type;  /**< Always GL_SHADER_PROGRAM (internal token) */
-   GLuint Name;  /**< aka handle or ID */
-   GLint RefCount;  /**< Reference count */
-   GLboolean DeletePending;
-
-   GLuint NumShaders;          /**< number of attached shaders */
-   struct gl_shader **Shaders; /**< List of attached the shaders */
-
-   /** User-defined attribute bindings (glBindAttribLocation) */
-   struct gl_program_parameter_list *Attributes;
-
-   /** Transform feedback varyings */
-   struct {
-      GLenum BufferMode;
-      GLuint NumVarying;
-      GLchar **VaryingNames;  /**< Array [NumVarying] of char * */
-   } TransformFeedback;
-
-   /** Geometry shader state - copied into gl_geometry_program at link time */
-   struct {
-      GLint VerticesOut;
-      GLenum InputType;  /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,
-                              GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */
-      GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */
-   } Geom;
-
-   /* post-link info: */
-   struct gl_vertex_program *VertexProgram;     /**< Linked vertex program */
-   struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
-   struct gl_geometry_program *GeometryProgram; /**< Linked geometry prog */
-   struct gl_uniform_list *Uniforms;
-   struct gl_program_parameter_list *Varying;
-   GLboolean LinkStatus;   /**< GL_LINK_STATUS */
-   GLboolean Validated;
-   GLboolean _Used;        /**< Ever used for drawing? */
-   GLchar *InfoLog;
-
-   unsigned Version;       /**< GLSL version used for linking */
-
-   /**
-    * Per-stage shaders resulting from the first stage of linking.
-    */
-   /*@{*/
-   GLuint _NumLinkedShaders;
-   struct gl_shader *_LinkedShaders[2];
-   /*@}*/
-};   
-
-
-#define GLSL_DUMP      0x1  /**< Dump shaders to stdout */
-#define GLSL_LOG       0x2  /**< Write shaders to files */
-#define GLSL_OPT       0x4  /**< Force optimizations (override pragmas) */
-#define GLSL_NO_OPT    0x8  /**< Force no optimizations (override pragmas) */
-#define GLSL_UNIFORMS 0x10  /**< Print glUniform calls */
-#define GLSL_NOP_VERT 0x20  /**< Force no-op vertex shaders */
-#define GLSL_NOP_FRAG 0x40  /**< Force no-op fragment shaders */
-#define GLSL_USE_PROG 0x80  /**< Log glUseProgram calls */
-
-
-/**
- * Context state for GLSL vertex/fragment shaders.
- */
-struct gl_shader_state
-{
-   struct gl_shader_program *CurrentProgram; /**< The user-bound program */
-   void *MemPool;
-
-   GLbitfield Flags;                    /**< Mask of GLSL_x flags */
-};
-
-/**
- * Compiler options for a single GLSL shaders type
- */
-struct gl_shader_compiler_options
-{
-   /** Driver-selectable options: */
-   GLboolean EmitCondCodes;             /**< Use condition codes? */
-   GLboolean EmitNVTempInitialization;  /**< 0-fill NV temp registers */
-   /**
-    * Attempts to flatten all ir_if (OPCODE_IF) for GPUs that can't
-    * support control flow.
-    */
-   GLboolean EmitNoIfs;
-   GLboolean EmitNoLoops;
-   GLboolean EmitNoFunctions;
-   GLboolean EmitNoCont;                  /**< Emit CONT opcode? */
-   GLboolean EmitNoMainReturn;            /**< Emit CONT/RET opcodes? */
-   GLboolean EmitNoNoise;                 /**< Emit NOISE opcodes? */
-
-   /**
-    * \name Forms of indirect addressing the driver cannot do.
-    */
-   /*@{*/
-   GLboolean EmitNoIndirectInput;   /**< No indirect addressing of inputs */
-   GLboolean EmitNoIndirectOutput;  /**< No indirect addressing of outputs */
-   GLboolean EmitNoIndirectTemp;    /**< No indirect addressing of temps */
-   GLboolean EmitNoIndirectUniform; /**< No indirect addressing of constants */
-   /*@}*/
-
-   GLuint MaxUnrollIterations;
-
-   struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */
-};
-
-/**
- * Transform feedback object state
- */
-struct gl_transform_feedback_object
-{
-   GLuint Name;  /**< AKA the object ID */
-   GLint RefCount;
-   GLboolean Active;  /**< Is transform feedback enabled? */
-   GLboolean Paused;  /**< Is transform feedback paused? */
-
-   /** The feedback buffers */
-   GLuint BufferNames[MAX_FEEDBACK_ATTRIBS];
-   struct gl_buffer_object *Buffers[MAX_FEEDBACK_ATTRIBS];
-
-   /** Start of feedback data in dest buffer */
-   GLintptr Offset[MAX_FEEDBACK_ATTRIBS];
-   /** Max data to put into dest buffer (in bytes) */
-   GLsizeiptr Size[MAX_FEEDBACK_ATTRIBS];
-};
-
-
-/**
- * Context state for transform feedback.
- */
-struct gl_transform_feedback
-{
-   GLenum Mode;       /**< GL_POINTS, GL_LINES or GL_TRIANGLES */
-
-   GLboolean RasterDiscard;  /**< GL_RASTERIZER_DISCARD */
-
-   /** The general binding point (GL_TRANSFORM_FEEDBACK_BUFFER) */
-   struct gl_buffer_object *CurrentBuffer;
-
-   /** The table of all transform feedback objects */
-   struct _mesa_HashTable *Objects;
-
-   /** The current xform-fb object (GL_TRANSFORM_FEEDBACK_BINDING) */
-   struct gl_transform_feedback_object *CurrentObject;
-
-   /** The default xform-fb object (Name==0) */
-   struct gl_transform_feedback_object *DefaultObject;
-};
-
-
-
-/**
- * State which can be shared by multiple contexts:
- */
-struct gl_shared_state
-{
-   _glthread_Mutex Mutex;		   /**< for thread safety */
-   GLint RefCount;			   /**< Reference count */
-   struct _mesa_HashTable *DisplayList;	   /**< Display lists hash table */
-   struct _mesa_HashTable *TexObjects;	   /**< Texture objects hash table */
-
-   /** Default texture objects (shared by all texture units) */
-   struct gl_texture_object *DefaultTex[NUM_TEXTURE_TARGETS];
-
-   /** Fallback texture used when a bound texture is incomplete */
-   struct gl_texture_object *FallbackTex;
-
-   /**
-    * \name Thread safety and statechange notification for texture
-    * objects. 
-    *
-    * \todo Improve the granularity of locking.
-    */
-   /*@{*/
-   _glthread_Mutex TexMutex;		/**< texobj thread safety */
-   GLuint TextureStateStamp;	        /**< state notification for shared tex */
-   /*@}*/
-
-   /** Default buffer object for vertex arrays that aren't in VBOs */
-   struct gl_buffer_object *NullBufferObj;
-
-   /**
-    * \name Vertex/geometry/fragment programs
-    */
-   /*@{*/
-   struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */
-   struct gl_vertex_program *DefaultVertexProgram;
-   struct gl_fragment_program *DefaultFragmentProgram;
-   struct gl_geometry_program *DefaultGeometryProgram;
-   /*@}*/
-
-   /* GL_ATI_fragment_shader */
-   struct _mesa_HashTable *ATIShaders;
-   struct ati_fragment_shader *DefaultFragmentShader;
-
-   struct _mesa_HashTable *BufferObjects;
-
-   /** Table of both gl_shader and gl_shader_program objects */
-   struct _mesa_HashTable *ShaderObjects;
-
-   /* GL_EXT_framebuffer_object */
-   struct _mesa_HashTable *RenderBuffers;
-   struct _mesa_HashTable *FrameBuffers;
-
-   /* GL_ARB_sync */
-   struct simple_node SyncObjects;
-
-   void *DriverData;  /**< Device driver shared state */
-};
-
-
-
-
-/**
- * A renderbuffer stores colors or depth values or stencil values.
- * A framebuffer object will have a collection of these.
- * Data are read/written to the buffer with a handful of Get/Put functions.
- *
- * Instances of this object are allocated with the Driver's NewRenderbuffer
- * hook.  Drivers will likely wrap this class inside a driver-specific
- * class to simulate inheritance.
- */
-struct gl_renderbuffer
-{
-#define RB_MAGIC 0xaabbccdd
-   int Magic; /** XXX TEMPORARY DEBUG INFO */
-   _glthread_Mutex Mutex;		   /**< for thread safety */
-   GLuint ClassID;        /**< Useful for drivers */
-   GLuint Name;
-   GLint RefCount;
-   GLuint Width, Height;
-   GLboolean Purgeable;   /**< Is the buffer purgeable under memory pressure? */
-
-   GLenum InternalFormat; /**< The user-specified format */
-   GLenum _BaseFormat;    /**< Either GL_RGB, GL_RGBA, GL_DEPTH_COMPONENT or
-                               GL_STENCIL_INDEX. */
-   GLuint Format;         /**< The actual format: MESA_FORMAT_x */
-
-   GLubyte NumSamples;
-
-   GLenum DataType;      /**< Type of values passed to the Get/Put functions */
-   GLvoid *Data;        /**< This may not be used by some kinds of RBs */
-
-   /* Used to wrap one renderbuffer around another: */
-   struct gl_renderbuffer *Wrapped;
-
-   /* Delete this renderbuffer */
-   void (*Delete)(struct gl_renderbuffer *rb);
-
-   /* Allocate new storage for this renderbuffer */
-   GLboolean (*AllocStorage)(GLcontext *ctx, struct gl_renderbuffer *rb,
-                             GLenum internalFormat,
-                             GLuint width, GLuint height);
-
-   /* Lock/Unlock are called before/after calling the Get/Put functions.
-    * Not sure this is the right place for these yet.
-   void (*Lock)(GLcontext *ctx, struct gl_renderbuffer *rb);
-   void (*Unlock)(GLcontext *ctx, struct gl_renderbuffer *rb);
-    */
-
-   /* Return a pointer to the element/pixel at (x,y).
-    * Should return NULL if the buffer memory can't be directly addressed.
-    */
-   void *(*GetPointer)(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       GLint x, GLint y);
-
-   /* Get/Read a row of values.
-    * The values will be of format _BaseFormat and type DataType.
-    */
-   void (*GetRow)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  GLint x, GLint y, void *values);
-
-   /* Get/Read values at arbitrary locations.
-    * The values will be of format _BaseFormat and type DataType.
-    */
-   void (*GetValues)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                     const GLint x[], const GLint y[], void *values);
-
-   /* Put/Write a row of values.
-    * The values will be of format _BaseFormat and type DataType.
-    */
-   void (*PutRow)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                  GLint x, GLint y, const void *values, const GLubyte *mask);
-
-   /* Put/Write a row of RGB values.  This is a special-case routine that's
-    * only used for RGBA renderbuffers when the source data is GL_RGB. That's
-    * a common case for glDrawPixels and some triangle routines.
-    * The values will be of format GL_RGB and type DataType.
-    */
-   void (*PutRowRGB)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                    GLint x, GLint y, const void *values, const GLubyte *mask);
-
-
-   /* Put/Write a row of identical values.
-    * The values will be of format _BaseFormat and type DataType.
-    */
-   void (*PutMonoRow)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                     GLint x, GLint y, const void *value, const GLubyte *mask);
-
-   /* Put/Write values at arbitrary locations.
-    * The values will be of format _BaseFormat and type DataType.
-    */
-   void (*PutValues)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                     const GLint x[], const GLint y[], const void *values,
-                     const GLubyte *mask);
-   /* Put/Write identical values at arbitrary locations.
-    * The values will be of format _BaseFormat and type DataType.
-    */
-   void (*PutMonoValues)(GLcontext *ctx, struct gl_renderbuffer *rb,
-                         GLuint count, const GLint x[], const GLint y[],
-                         const void *value, const GLubyte *mask);
-};
-
-
-/**
- * A renderbuffer attachment points to either a texture object (and specifies
- * a mipmap level, cube face or 3D texture slice) or points to a renderbuffer.
- */
-struct gl_renderbuffer_attachment
-{
-   GLenum Type;  /**< \c GL_NONE or \c GL_TEXTURE or \c GL_RENDERBUFFER_EXT */
-   GLboolean Complete;
-
-   /**
-    * If \c Type is \c GL_RENDERBUFFER_EXT, this stores a pointer to the
-    * application supplied renderbuffer object.
-    */
-   struct gl_renderbuffer *Renderbuffer;
-
-   /**
-    * If \c Type is \c GL_TEXTURE, this stores a pointer to the application
-    * supplied texture object.
-    */
-   struct gl_texture_object *Texture;
-   GLuint TextureLevel; /**< Attached mipmap level. */
-   GLuint CubeMapFace;  /**< 0 .. 5, for cube map textures. */
-   GLuint Zoffset;      /**< Slice for 3D textures,  or layer for both 1D
-                         * and 2D array textures */
-};
-
-
-/**
- * A framebuffer is a collection of renderbuffers (color, depth, stencil, etc).
- * In C++ terms, think of this as a base class from which device drivers
- * will make derived classes.
- */
-struct gl_framebuffer
-{
-   _glthread_Mutex Mutex;  /**< for thread safety */
-   /**
-    * If zero, this is a window system framebuffer.  If non-zero, this
-    * is a FBO framebuffer; note that for some devices (i.e. those with
-    * a natural pixel coordinate system for FBOs that differs from the
-    * OpenGL/Mesa coordinate system), this means that the viewport,
-    * polygon face orientation, and polygon stipple will have to be inverted.
-    */
-   GLuint Name;
-
-   GLint RefCount;
-   GLboolean DeletePending;
-
-   /**
-    * The framebuffer's visual. Immutable if this is a window system buffer.
-    * Computed from attachments if user-made FBO.
-    */
-   GLvisual Visual;
-
-   GLboolean Initialized;
-
-   GLuint Width, Height;	/**< size of frame buffer in pixels */
-
-   /** \name  Drawing bounds (Intersection of buffer size and scissor box) */
-   /*@{*/
-   GLint _Xmin, _Xmax;  /**< inclusive */
-   GLint _Ymin, _Ymax;  /**< exclusive */
-   /*@}*/
-
-   /** \name  Derived Z buffer stuff */
-   /*@{*/
-   GLuint _DepthMax;	/**< Max depth buffer value */
-   GLfloat _DepthMaxF;	/**< Float max depth buffer value */
-   GLfloat _MRD;	/**< minimum resolvable difference in Z values */
-   /*@}*/
-
-   /** One of the GL_FRAMEBUFFER_(IN)COMPLETE_* tokens */
-   GLenum _Status;
-
-   /** Array of all renderbuffer attachments, indexed by BUFFER_* tokens. */
-   struct gl_renderbuffer_attachment Attachment[BUFFER_COUNT];
-
-   /* In unextended OpenGL these vars are part of the GL_COLOR_BUFFER
-    * attribute group and GL_PIXEL attribute group, respectively.
-    */
-   GLenum ColorDrawBuffer[MAX_DRAW_BUFFERS];
-   GLenum ColorReadBuffer;
-
-   /** Computed from ColorDraw/ReadBuffer above */
-   GLuint _NumColorDrawBuffers;
-   GLint _ColorDrawBufferIndexes[MAX_DRAW_BUFFERS]; /**< BUFFER_x or -1 */
-   GLint _ColorReadBufferIndex; /* -1 = None */
-   struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS];
-   struct gl_renderbuffer *_ColorReadBuffer;
-
-   /** The Actual depth/stencil buffers to use.  May be wrappers around the
-    * depth/stencil buffers attached above. */
-   struct gl_renderbuffer *_DepthBuffer;
-   struct gl_renderbuffer *_StencilBuffer;
-
-   /** Delete this framebuffer */
-   void (*Delete)(struct gl_framebuffer *fb);
-};
-
-
-/**
- * Limits for vertex and fragment programs/shaders.
- */
-struct gl_program_constants
-{
-   /* logical limits */
-   GLuint MaxInstructions;
-   GLuint MaxAluInstructions;
-   GLuint MaxTexInstructions;
-   GLuint MaxTexIndirections;
-   GLuint MaxAttribs;
-   GLuint MaxTemps;
-   GLuint MaxAddressRegs;
-   GLuint MaxParameters;
-   GLuint MaxLocalParams;
-   GLuint MaxEnvParams;
-   /* native/hardware limits */
-   GLuint MaxNativeInstructions;
-   GLuint MaxNativeAluInstructions;
-   GLuint MaxNativeTexInstructions;
-   GLuint MaxNativeTexIndirections;
-   GLuint MaxNativeAttribs;
-   GLuint MaxNativeTemps;
-   GLuint MaxNativeAddressRegs;
-   GLuint MaxNativeParameters;
-   /* For shaders */
-   GLuint MaxUniformComponents;
-   /* GL_ARB_geometry_shader4 */
-   GLuint MaxGeometryTextureImageUnits;
-   GLuint MaxGeometryVaryingComponents;
-   GLuint MaxVertexVaryingComponents;
-   GLuint MaxGeometryUniformComponents;
-   GLuint MaxGeometryOutputVertices;
-   GLuint MaxGeometryTotalOutputComponents;
-};
-
-
-/**
- * Constants which may be overridden by device driver during context creation
- * but are never changed after that.
- */
-struct gl_constants
-{
-   GLint MaxTextureLevels;      /**< Max mipmap levels. */ 
-   GLint Max3DTextureLevels;    /**< Max mipmap levels for 3D textures */
-   GLint MaxCubeTextureLevels;  /**< Max mipmap levels for cube textures */
-   GLint MaxArrayTextureLayers; /**< Max layers in array textures */
-   GLint MaxTextureRectSize;    /**< Max rectangle texture size, in pixes */
-   GLuint MaxTextureCoordUnits;
-   GLuint MaxTextureImageUnits;
-   GLuint MaxVertexTextureImageUnits;
-   GLuint MaxCombinedTextureImageUnits;
-   GLuint MaxTextureUnits;           /**< = MIN(CoordUnits, ImageUnits) */
-   GLfloat MaxTextureMaxAnisotropy;  /**< GL_EXT_texture_filter_anisotropic */
-   GLfloat MaxTextureLodBias;        /**< GL_EXT_texture_lod_bias */
-
-   GLuint MaxArrayLockSize;
-
-   GLint SubPixelBits;
-
-   GLfloat MinPointSize, MaxPointSize;	     /**< aliased */
-   GLfloat MinPointSizeAA, MaxPointSizeAA;   /**< antialiased */
-   GLfloat PointSizeGranularity;
-   GLfloat MinLineWidth, MaxLineWidth;       /**< aliased */
-   GLfloat MinLineWidthAA, MaxLineWidthAA;   /**< antialiased */
-   GLfloat LineWidthGranularity;
-
-   GLuint MaxColorTableSize;
-   GLuint MaxConvolutionWidth;
-   GLuint MaxConvolutionHeight;
-
-   GLuint MaxClipPlanes;
-   GLuint MaxLights;
-   GLfloat MaxShininess;                     /**< GL_NV_light_max_exponent */
-   GLfloat MaxSpotExponent;                  /**< GL_NV_light_max_exponent */
-
-   GLuint MaxViewportWidth, MaxViewportHeight;
-
-   struct gl_program_constants VertexProgram;   /**< GL_ARB_vertex_program */
-   struct gl_program_constants FragmentProgram; /**< GL_ARB_fragment_program */
-   struct gl_program_constants GeometryProgram;  /**< GL_ARB_geometry_shader4 */
-   GLuint MaxProgramMatrices;
-   GLuint MaxProgramMatrixStackDepth;
-
-   /** vertex array / buffer object bounds checking */
-   GLboolean CheckArrayBounds;
-
-   GLuint MaxDrawBuffers;    /**< GL_ARB_draw_buffers */
-
-   GLuint MaxColorAttachments;   /**< GL_EXT_framebuffer_object */
-   GLuint MaxRenderbufferSize;   /**< GL_EXT_framebuffer_object */
-   GLuint MaxSamples;            /**< GL_ARB_framebuffer_object */
-
-   GLuint MaxVarying;  /**< Number of float[4] varying parameters */
-
-   GLuint GLSLVersion;  /**< GLSL version supported (ex: 120 = 1.20) */
-
-   /** Which texture units support GL_ATI_envmap_bumpmap as targets */
-   GLbitfield SupportedBumpUnits;
-
-   /**
-    * Maximum amount of time, measured in nanseconds, that the server can wait.
-    */
-   GLuint64 MaxServerWaitTimeout;
-
-   /** GL_EXT_provoking_vertex */
-   GLboolean QuadsFollowProvokingVertexConvention;
-
-   /** OpenGL version 3.0 */
-   GLbitfield ContextFlags;  /**< Ex: GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT */
-
-   /** OpenGL version 3.2 */
-   GLbitfield ProfileMask;   /**< Mask of CONTEXT_x_PROFILE_BIT */
-
-   /** GL_EXT_transform_feedback */
-   GLuint MaxTransformFeedbackSeparateAttribs;
-   GLuint MaxTransformFeedbackSeparateComponents;
-   GLuint MaxTransformFeedbackInterleavedComponents;
-};
-
-
-/**
- * Enable flag for each OpenGL extension.  Different device drivers will
- * enable different extensions at runtime.
- */
-struct gl_extensions
-{
-   GLboolean dummy;  /* don't remove this! */
-   GLboolean ARB_blend_func_extended;
-   GLboolean ARB_copy_buffer;
-   GLboolean ARB_depth_buffer_float;
-   GLboolean ARB_depth_clamp;
-   GLboolean ARB_depth_texture;
-   GLboolean ARB_draw_buffers;
-   GLboolean ARB_draw_elements_base_vertex;
-   GLboolean ARB_draw_instanced;
-   GLboolean ARB_fragment_coord_conventions;
-   GLboolean ARB_fragment_program;
-   GLboolean ARB_fragment_program_shadow;
-   GLboolean ARB_fragment_shader;
-   GLboolean ARB_framebuffer_object;
-   GLboolean ARB_explicit_attrib_location;
-   GLboolean ARB_geometry_shader4;
-   GLboolean ARB_half_float_pixel;
-   GLboolean ARB_half_float_vertex;
-   GLboolean ARB_imaging;
-   GLboolean ARB_instanced_arrays;
-   GLboolean ARB_map_buffer_range;
-   GLboolean ARB_multisample;
-   GLboolean ARB_multitexture;
-   GLboolean ARB_occlusion_query;
-   GLboolean ARB_occlusion_query2;
-   GLboolean ARB_point_sprite;
-   GLboolean ARB_sampler_objects;
-   GLboolean ARB_seamless_cube_map;
-   GLboolean ARB_shader_objects;
-   GLboolean ARB_shading_language_100;
-   GLboolean ARB_shadow;
-   GLboolean ARB_shadow_ambient;
-   GLboolean ARB_sync;
-   GLboolean ARB_texture_border_clamp;
-   GLboolean ARB_texture_buffer_object;
-   GLboolean ARB_texture_compression;
-   GLboolean ARB_texture_cube_map;
-   GLboolean ARB_texture_env_combine;
-   GLboolean ARB_texture_env_crossbar;
-   GLboolean ARB_texture_env_dot3;
-   GLboolean ARB_texture_float;
-   GLboolean ARB_texture_mirrored_repeat;
-   GLboolean ARB_texture_multisample;
-   GLboolean ARB_texture_non_power_of_two;
-   GLboolean ARB_texture_rg;
-   GLboolean ARB_texture_rgb10_a2ui;
-   GLboolean ARB_timer_query;
-   GLboolean ARB_transform_feedback2;
-   GLboolean ARB_transpose_matrix;
-   GLboolean ARB_uniform_buffer_object;
-   GLboolean ARB_vertex_array_object;
-   GLboolean ARB_vertex_buffer_object;
-   GLboolean ARB_vertex_program;
-   GLboolean ARB_vertex_shader;
-   GLboolean ARB_vertex_type_2_10_10_10_rev;
-   GLboolean ARB_window_pos;
-   GLboolean EXT_abgr;
-   GLboolean EXT_bgra;
-   GLboolean EXT_blend_color;
-   GLboolean EXT_blend_equation_separate;
-   GLboolean EXT_blend_func_separate;
-   GLboolean EXT_blend_logic_op;
-   GLboolean EXT_blend_minmax;
-   GLboolean EXT_blend_subtract;
-   GLboolean EXT_clip_volume_hint;
-   GLboolean EXT_cull_vertex;
-   GLboolean EXT_convolution;
-   GLboolean EXT_compiled_vertex_array;
-   GLboolean EXT_copy_texture;
-   GLboolean EXT_depth_bounds_test;
-   GLboolean EXT_draw_buffers2;
-   GLboolean EXT_draw_range_elements;
-   GLboolean EXT_fog_coord;
-   GLboolean EXT_framebuffer_blit;
-   GLboolean EXT_framebuffer_multisample;
-   GLboolean EXT_framebuffer_object;
-   GLboolean EXT_framebuffer_sRGB;
-   GLboolean EXT_gpu_program_parameters;
-   GLboolean EXT_histogram;
-   GLboolean EXT_multi_draw_arrays;
-   GLboolean EXT_paletted_texture;
-   GLboolean EXT_packed_depth_stencil;
-   GLboolean EXT_packed_float;
-   GLboolean EXT_packed_pixels;
-   GLboolean EXT_pixel_buffer_object;
-   GLboolean EXT_point_parameters;
-   GLboolean EXT_polygon_offset;
-   GLboolean EXT_provoking_vertex;
-   GLboolean EXT_rescale_normal;
-   GLboolean EXT_shadow_funcs;
-   GLboolean EXT_secondary_color;
-   GLboolean EXT_separate_specular_color;
-   GLboolean EXT_shared_texture_palette;
-   GLboolean EXT_stencil_wrap;
-   GLboolean EXT_stencil_two_side;
-   GLboolean EXT_subtexture;
-   GLboolean EXT_texture;
-   GLboolean EXT_texture_object;
-   GLboolean EXT_texture3D;
-   GLboolean EXT_texture_array;
-   GLboolean EXT_texture_compression_s3tc;
-   GLboolean EXT_texture_compression_rgtc;
-   GLboolean EXT_texture_env_add;
-   GLboolean EXT_texture_env_combine;
-   GLboolean EXT_texture_env_dot3;
-   GLboolean EXT_texture_filter_anisotropic;
-   GLboolean EXT_texture_integer;
-   GLboolean EXT_texture_lod_bias;
-   GLboolean EXT_texture_mirror_clamp;
-   GLboolean EXT_texture_shared_exponent;
-   GLboolean EXT_texture_sRGB;
-   GLboolean EXT_texture_swizzle;
-   GLboolean EXT_transform_feedback;
-   GLboolean EXT_timer_query;
-   GLboolean EXT_vertex_array;
-   GLboolean EXT_vertex_array_bgra;
-   GLboolean EXT_vertex_array_set;
-   /* vendor extensions */
-   GLboolean APPLE_client_storage;
-   GLboolean APPLE_packed_pixels;
-   GLboolean APPLE_vertex_array_object;
-   GLboolean APPLE_object_purgeable;
-   GLboolean ATI_envmap_bumpmap;
-   GLboolean ATI_texture_mirror_once;
-   GLboolean ATI_texture_env_combine3;
-   GLboolean ATI_fragment_shader;
-   GLboolean ATI_separate_stencil;
-   GLboolean IBM_rasterpos_clip;
-   GLboolean IBM_multimode_draw_arrays;
-   GLboolean MESA_pack_invert;
-   GLboolean MESA_packed_depth_stencil;
-   GLboolean MESA_resize_buffers;
-   GLboolean MESA_ycbcr_texture;
-   GLboolean MESA_texture_array;
-   GLboolean MESA_texture_signed_rgba;
-   GLboolean NV_blend_square;
-   GLboolean NV_conditional_render;
-   GLboolean NV_fragment_program;
-   GLboolean NV_fragment_program_option;
-   GLboolean NV_light_max_exponent;
-   GLboolean NV_point_sprite;
-   GLboolean NV_primitive_restart;
-   GLboolean NV_texgen_reflection;
-   GLboolean NV_texture_env_combine4;
-   GLboolean NV_texture_rectangle;
-   GLboolean NV_vertex_program;
-   GLboolean NV_vertex_program1_1;
-   GLboolean OES_read_format;
-   GLboolean SGI_color_matrix;
-   GLboolean SGI_color_table;
-   GLboolean SGI_texture_color_table;
-   GLboolean SGIS_generate_mipmap;
-   GLboolean SGIS_texture_edge_clamp;
-   GLboolean SGIS_texture_lod;
-   GLboolean TDFX_texture_compression_FXT1;
-   GLboolean S3_s3tc;
-   GLboolean OES_EGL_image;
-   GLboolean OES_draw_texture;
-   /** The extension string */
-   const GLubyte *String;
-   /** Number of supported extensions */
-   GLuint Count;
-};
-
-
-/**
- * A stack of matrices (projection, modelview, color, texture, etc).
- */
-struct gl_matrix_stack
-{
-   GLmatrix *Top;      /**< points into Stack */
-   GLmatrix *Stack;    /**< array [MaxDepth] of GLmatrix */
-   GLuint Depth;       /**< 0 <= Depth < MaxDepth */
-   GLuint MaxDepth;    /**< size of Stack[] array */
-   GLuint DirtyFlag;   /**< _NEW_MODELVIEW or _NEW_PROJECTION, for example */
-};
-
-
-/**
- * \name Bits for image transfer operations 
- * \sa __GLcontextRec::ImageTransferState.
- */
-/*@{*/
-#define IMAGE_SCALE_BIAS_BIT                      0x1
-#define IMAGE_SHIFT_OFFSET_BIT                    0x2
-#define IMAGE_MAP_COLOR_BIT                       0x4
-#define IMAGE_COLOR_TABLE_BIT                     0x8
-#define IMAGE_CONVOLUTION_BIT                     0x10
-#define IMAGE_POST_CONVOLUTION_SCALE_BIAS         0x20
-#define IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT    0x40
-#define IMAGE_COLOR_MATRIX_BIT                    0x80
-#define IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT   0x100
-#define IMAGE_HISTOGRAM_BIT                       0x200
-#define IMAGE_MIN_MAX_BIT                         0x400
-#define IMAGE_CLAMP_BIT                           0x800
-
-
-/** Pixel Transfer ops up to convolution */
-#define IMAGE_PRE_CONVOLUTION_BITS (IMAGE_SCALE_BIAS_BIT |     \
-                                    IMAGE_SHIFT_OFFSET_BIT |   \
-                                    IMAGE_MAP_COLOR_BIT |      \
-                                    IMAGE_COLOR_TABLE_BIT)
-
-/** Pixel transfer ops after convolution */
-#define IMAGE_POST_CONVOLUTION_BITS (IMAGE_POST_CONVOLUTION_SCALE_BIAS |      \
-                                     IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT | \
-                                     IMAGE_COLOR_MATRIX_BIT |                 \
-                                     IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT |\
-                                     IMAGE_HISTOGRAM_BIT |                    \
-                                     IMAGE_MIN_MAX_BIT)
-/*@}*/
-
-
-/**
- * \name Bits to indicate what state has changed.  
- *
- * 4 unused flags.
- */
-/*@{*/
-#define _NEW_MODELVIEW		0x1        /**< __GLcontextRec::ModelView */
-#define _NEW_PROJECTION		0x2        /**< __GLcontextRec::Projection */
-#define _NEW_TEXTURE_MATRIX	0x4        /**< __GLcontextRec::TextureMatrix */
-#define _NEW_COLOR_MATRIX	0x8        /**< __GLcontextRec::ColorMatrix */
-#define _NEW_ACCUM		0x10       /**< __GLcontextRec::Accum */
-#define _NEW_COLOR		0x20       /**< __GLcontextRec::Color */
-#define _NEW_DEPTH		0x40       /**< __GLcontextRec::Depth */
-#define _NEW_EVAL		0x80       /**< __GLcontextRec::Eval, __GLcontextRec::EvalMap */
-#define _NEW_FOG		0x100      /**< __GLcontextRec::Fog */
-#define _NEW_HINT		0x200      /**< __GLcontextRec::Hint */
-#define _NEW_LIGHT		0x400      /**< __GLcontextRec::Light */
-#define _NEW_LINE		0x800      /**< __GLcontextRec::Line */
-#define _NEW_PIXEL		0x1000     /**< __GLcontextRec::Pixel */
-#define _NEW_POINT		0x2000     /**< __GLcontextRec::Point */
-#define _NEW_POLYGON		0x4000     /**< __GLcontextRec::Polygon */
-#define _NEW_POLYGONSTIPPLE	0x8000     /**< __GLcontextRec::PolygonStipple */
-#define _NEW_SCISSOR		0x10000    /**< __GLcontextRec::Scissor */
-#define _NEW_STENCIL		0x20000    /**< __GLcontextRec::Stencil */
-#define _NEW_TEXTURE		0x40000    /**< __GLcontextRec::Texture */
-#define _NEW_TRANSFORM		0x80000    /**< __GLcontextRec::Transform */
-#define _NEW_VIEWPORT		0x100000   /**< __GLcontextRec::Viewport */
-#define _NEW_PACKUNPACK		0x200000   /**< __GLcontextRec::Pack, __GLcontextRec::Unpack */
-#define _NEW_ARRAY	        0x400000   /**< __GLcontextRec::Array */
-#define _NEW_RENDERMODE		0x800000   /**< __GLcontextRec::RenderMode, __GLcontextRec::Feedback, __GLcontextRec::Select */
-#define _NEW_BUFFERS            0x1000000  /**< __GLcontextRec::Visual, __GLcontextRec::DrawBuffer, */
-#define _NEW_MULTISAMPLE        0x2000000  /**< __GLcontextRec::Multisample */
-#define _NEW_TRACK_MATRIX       0x4000000  /**< __GLcontextRec::VertexProgram */
-#define _NEW_PROGRAM            0x8000000  /**< __GLcontextRec::VertexProgram */
-#define _NEW_CURRENT_ATTRIB     0x10000000  /**< __GLcontextRec::Current */
-#define _NEW_PROGRAM_CONSTANTS  0x20000000
-#define _NEW_BUFFER_OBJECT      0x40000000
-#define _NEW_ALL ~0
-/*@}*/
-
-
-/**
- * \name Bits to track array state changes 
- *
- * Also used to summarize array enabled.
- */
-/*@{*/
-#define _NEW_ARRAY_VERTEX           VERT_BIT_POS
-#define _NEW_ARRAY_WEIGHT           VERT_BIT_WEIGHT
-#define _NEW_ARRAY_NORMAL           VERT_BIT_NORMAL
-#define _NEW_ARRAY_COLOR0           VERT_BIT_COLOR0
-#define _NEW_ARRAY_COLOR1           VERT_BIT_COLOR1
-#define _NEW_ARRAY_FOGCOORD         VERT_BIT_FOG
-#define _NEW_ARRAY_INDEX            VERT_BIT_COLOR_INDEX
-#define _NEW_ARRAY_EDGEFLAG         VERT_BIT_EDGEFLAG
-#define _NEW_ARRAY_POINT_SIZE       VERT_BIT_COLOR_INDEX  /* aliased */
-#define _NEW_ARRAY_TEXCOORD_0       VERT_BIT_TEX0
-#define _NEW_ARRAY_TEXCOORD_1       VERT_BIT_TEX1
-#define _NEW_ARRAY_TEXCOORD_2       VERT_BIT_TEX2
-#define _NEW_ARRAY_TEXCOORD_3       VERT_BIT_TEX3
-#define _NEW_ARRAY_TEXCOORD_4       VERT_BIT_TEX4
-#define _NEW_ARRAY_TEXCOORD_5       VERT_BIT_TEX5
-#define _NEW_ARRAY_TEXCOORD_6       VERT_BIT_TEX6
-#define _NEW_ARRAY_TEXCOORD_7       VERT_BIT_TEX7
-#define _NEW_ARRAY_ATTRIB_0         VERT_BIT_GENERIC0  /* start at bit 16 */
-#define _NEW_ARRAY_ALL              0xffffffff
-
-
-#define _NEW_ARRAY_TEXCOORD(i) (_NEW_ARRAY_TEXCOORD_0 << (i))
-#define _NEW_ARRAY_ATTRIB(i) (_NEW_ARRAY_ATTRIB_0 << (i))
-/*@}*/
-
-
-
-/**
- * \name A bunch of flags that we think might be useful to drivers.
- * 
- * Set in the __GLcontextRec::_TriangleCaps bitfield.
- */
-/*@{*/
-#define DD_FLATSHADE                0x1
-#define DD_SEPARATE_SPECULAR        0x2
-#define DD_TRI_CULL_FRONT_BACK      0x4 /* special case on some hw */
-#define DD_TRI_LIGHT_TWOSIDE        0x8
-#define DD_TRI_UNFILLED             0x10
-#define DD_TRI_SMOOTH               0x20
-#define DD_TRI_STIPPLE              0x40
-#define DD_TRI_OFFSET               0x80
-#define DD_LINE_SMOOTH              0x100
-#define DD_LINE_STIPPLE             0x200
-#define DD_LINE_WIDTH               0x400
-#define DD_POINT_SMOOTH             0x800
-#define DD_POINT_SIZE               0x1000
-#define DD_POINT_ATTEN              0x2000
-#define DD_TRI_TWOSTENCIL           0x4000
-/*@}*/
-
-
-/**
- * \name Define the state changes under which each of these bits might change
- */
-/*@{*/
-#define _DD_NEW_FLATSHADE                _NEW_LIGHT
-#define _DD_NEW_SEPARATE_SPECULAR        (_NEW_LIGHT | _NEW_FOG | _NEW_PROGRAM)
-#define _DD_NEW_TRI_CULL_FRONT_BACK      _NEW_POLYGON
-#define _DD_NEW_TRI_LIGHT_TWOSIDE        _NEW_LIGHT
-#define _DD_NEW_TRI_UNFILLED             _NEW_POLYGON
-#define _DD_NEW_TRI_SMOOTH               _NEW_POLYGON
-#define _DD_NEW_TRI_STIPPLE              _NEW_POLYGON
-#define _DD_NEW_TRI_OFFSET               _NEW_POLYGON
-#define _DD_NEW_LINE_SMOOTH              _NEW_LINE
-#define _DD_NEW_LINE_STIPPLE             _NEW_LINE
-#define _DD_NEW_LINE_WIDTH               _NEW_LINE
-#define _DD_NEW_POINT_SMOOTH             _NEW_POINT
-#define _DD_NEW_POINT_SIZE               _NEW_POINT
-#define _DD_NEW_POINT_ATTEN              _NEW_POINT
-/*@}*/
-
-
-/**
- * Composite state flags
- */
-/*@{*/
-#define _MESA_NEW_NEED_EYE_COORDS         (_NEW_LIGHT |		\
-                                           _NEW_TEXTURE |	\
-                                           _NEW_POINT |		\
-                                           _NEW_PROGRAM |	\
-                                           _NEW_MODELVIEW)
-
-#define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\
-                                           _NEW_TEXTURE)
-
-#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL |		\
-                                           _NEW_COLOR_MATRIX)
-/*@}*/
-
-
-
-
-/* This has to be included here. */
-#include "dd.h"
-
-
-#define NUM_VERTEX_FORMAT_ENTRIES (sizeof(GLvertexformat) / sizeof(void *))
-
-/**
- * Core Mesa's support for tnl modules:
- */
-struct gl_tnl_module
-{
-   /**
-    * Vertex format to be lazily swapped into current dispatch.
-    */
-   const GLvertexformat *Current;
-
-   /**
-    * \name Record of functions swapped out.  
-    * On restore, only need to swap these functions back in.
-    */
-   /*@{*/
-   struct {
-       _glapi_proc * location;
-       _glapi_proc function;
-   } Swapped[NUM_VERTEX_FORMAT_ENTRIES];
-   GLuint SwapCount;
-   /*@}*/
-};
-
-
-/**
- * Display list flags.
- * Strictly this is a tnl-private concept, but it doesn't seem
- * worthwhile adding a tnl private structure just to hold this one bit
- * of information:
- */
-#define DLIST_DANGLING_REFS     0x1 
-
-
-/** Opaque declaration of display list payload data type */
-union gl_dlist_node;
-
-
-/**
- * Provide a location where information about a display list can be
- * collected.  Could be extended with driverPrivate structures,
- * etc. in the future.
- */
-struct gl_display_list
-{
-   GLuint Name;
-   GLbitfield Flags;  /**< DLIST_x flags */
-   /** The dlist commands are in a linked list of nodes */
-   union gl_dlist_node *Head;
-};
-
-
-/**
- * State used during display list compilation and execution.
- */
-struct gl_dlist_state
-{
-   GLuint CallDepth;		/**< Current recursion calling depth */
-
-   struct gl_display_list *CurrentList; /**< List currently being compiled */
-   union gl_dlist_node *CurrentBlock; /**< Pointer to current block of nodes */
-   GLuint CurrentPos;		/**< Index into current block of nodes */
-
-   GLvertexformat ListVtxfmt;
-
-   GLubyte ActiveAttribSize[VERT_ATTRIB_MAX];
-   GLfloat CurrentAttrib[VERT_ATTRIB_MAX][4];
-   
-   GLubyte ActiveMaterialSize[MAT_ATTRIB_MAX];
-   GLfloat CurrentMaterial[MAT_ATTRIB_MAX][4];
-
-   GLubyte ActiveIndex;
-   GLfloat CurrentIndex;
-   
-   GLubyte ActiveEdgeFlag;
-   GLboolean CurrentEdgeFlag;
-
-   struct {
-      /* State known to have been set by the currently-compiling display
-       * list.  Used to eliminate some redundant state changes.
-       */
-      GLenum ShadeModel;
-   } Current;
-};
-
-/**
- * Enum for the OpenGL APIs we know about and may support.
- */
-typedef enum {
-   API_OPENGL,
-   API_OPENGLES,
-   API_OPENGLES2
-} gl_api;
-
-/**
- * Mesa rendering context.
- *
- * This is the central context data structure for Mesa.  Almost all
- * OpenGL state is contained in this structure.
- * Think of this as a base class from which device drivers will derive
- * sub classes.
- *
- * The GLcontext typedef names this structure.
- */
-struct __GLcontextRec
-{
-   /** State possibly shared with other contexts in the address space */
-   struct gl_shared_state *Shared;
-
-   /** \name API function pointer tables */
-   /*@{*/
-   gl_api API;
-   struct _glapi_table *Save;	/**< Display list save functions */
-   struct _glapi_table *Exec;	/**< Execute functions */
-   struct _glapi_table *CurrentDispatch;  /**< == Save or Exec !! */
-   /*@}*/
-
-   GLvisual Visual;
-   GLframebuffer *DrawBuffer;	/**< buffer for writing */
-   GLframebuffer *ReadBuffer;	/**< buffer for reading */
-   GLframebuffer *WinSysDrawBuffer;  /**< set with MakeCurrent */
-   GLframebuffer *WinSysReadBuffer;  /**< set with MakeCurrent */
-
-   /**
-    * Device driver function pointer table
-    */
-   struct dd_function_table Driver;
-
-   void *DriverCtx;	/**< Points to device driver context/state */
-
-   /** Core/Driver constants */
-   struct gl_constants Const;
-
-   /** \name The various 4x4 matrix stacks */
-   /*@{*/
-   struct gl_matrix_stack ModelviewMatrixStack;
-   struct gl_matrix_stack ProjectionMatrixStack;
-   struct gl_matrix_stack ColorMatrixStack;
-   struct gl_matrix_stack TextureMatrixStack[MAX_TEXTURE_UNITS];
-   struct gl_matrix_stack ProgramMatrixStack[MAX_PROGRAM_MATRICES];
-   struct gl_matrix_stack *CurrentStack; /**< Points to one of the above stacks */
-   /*@}*/
-
-   /** Combined modelview and projection matrix */
-   GLmatrix _ModelProjectMatrix;
-
-   /** \name Display lists */
-   struct gl_dlist_state ListState;
-
-   GLboolean ExecuteFlag;	/**< Execute GL commands? */
-   GLboolean CompileFlag;	/**< Compile GL commands into display list? */
-
-   /** Extension information */
-   struct gl_extensions Extensions;
-
-   /** Version info */
-   GLuint VersionMajor, VersionMinor;
-   char *VersionString;
-
-   /** \name State attribute stack (for glPush/PopAttrib) */
-   /*@{*/
-   GLuint AttribStackDepth;
-   struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];
-   /*@}*/
-
-   /** \name Renderer attribute groups
-    * 
-    * We define a struct for each attribute group to make pushing and popping
-    * attributes easy.  Also it's a good organization.
-    */
-   /*@{*/
-   struct gl_accum_attrib	Accum;		/**< Accum buffer attributes */
-   struct gl_colorbuffer_attrib	Color;		/**< Color buffer attributes */
-   struct gl_current_attrib	Current;	/**< Current attributes */
-   struct gl_depthbuffer_attrib	Depth;		/**< Depth buffer attributes */
-   struct gl_eval_attrib	Eval;		/**< Eval attributes */
-   struct gl_fog_attrib		Fog;		/**< Fog attributes */
-   struct gl_hint_attrib	Hint;		/**< Hint attributes */
-   struct gl_light_attrib	Light;		/**< Light attributes */
-   struct gl_line_attrib	Line;		/**< Line attributes */
-   struct gl_list_attrib	List;		/**< List attributes */
-   struct gl_multisample_attrib Multisample;
-   struct gl_pixel_attrib	Pixel;		/**< Pixel attributes */
-   struct gl_point_attrib	Point;		/**< Point attributes */
-   struct gl_polygon_attrib	Polygon;	/**< Polygon attributes */
-   GLuint PolygonStipple[32];			/**< Polygon stipple */
-   struct gl_scissor_attrib	Scissor;	/**< Scissor attributes */
-   struct gl_stencil_attrib	Stencil;	/**< Stencil buffer attributes */
-   struct gl_texture_attrib	Texture;	/**< Texture attributes */
-   struct gl_transform_attrib	Transform;	/**< Transformation attributes */
-   struct gl_viewport_attrib	Viewport;	/**< Viewport attributes */
-   /*@}*/
-
-   /** \name Client attribute stack */
-   /*@{*/
-   GLuint ClientAttribStackDepth;
-   struct gl_attrib_node *ClientAttribStack[MAX_CLIENT_ATTRIB_STACK_DEPTH];
-   /*@}*/
-
-   /** \name Client attribute groups */
-   /*@{*/
-   struct gl_array_attrib	Array;	/**< Vertex arrays */
-   struct gl_pixelstore_attrib	Pack;	/**< Pixel packing */
-   struct gl_pixelstore_attrib	Unpack;	/**< Pixel unpacking */
-   struct gl_pixelstore_attrib	DefaultPacking;	/**< Default params */
-   /*@}*/
-
-   /** \name Other assorted state (not pushed/popped on attribute stack) */
-   /*@{*/
-   struct gl_pixelmaps          PixelMaps;
-   struct gl_histogram_attrib	Histogram;
-   struct gl_minmax_attrib	MinMax;
-   struct gl_convolution_attrib Convolution1D;
-   struct gl_convolution_attrib Convolution2D;
-   struct gl_convolution_attrib Separable2D;
-
-   struct gl_evaluators EvalMap;   /**< All evaluators */
-   struct gl_feedback   Feedback;  /**< Feedback */
-   struct gl_selection  Select;    /**< Selection */
-
-   struct gl_color_table ColorTable[COLORTABLE_MAX];
-   struct gl_color_table ProxyColorTable[COLORTABLE_MAX];
-
-   struct gl_program_state Program;  /**< general program state */
-   struct gl_vertex_program_state VertexProgram;
-   struct gl_fragment_program_state FragmentProgram;
-   struct gl_geometry_program_state GeometryProgram;
-   struct gl_ati_fragment_shader_state ATIFragmentShader;
-
-   struct gl_shader_state Shader; /**< GLSL shader object state */
-   struct gl_shader_compiler_options ShaderCompilerOptions[MESA_SHADER_TYPES];
-
-   struct gl_query_state Query;  /**< occlusion, timer queries */
-
-   struct gl_transform_feedback TransformFeedback;
-
-   struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */
-   struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */
-   /*@}*/
-
-   struct gl_meta_state *Meta;  /**< for "meta" operations */
-
-   /* GL_EXT_framebuffer_object */
-   struct gl_renderbuffer *CurrentRenderbuffer;
-
-   GLenum ErrorValue;        /**< Last error code */
-
-   /**
-    * Recognize and silence repeated error debug messages in buggy apps.
-    */
-   const char *ErrorDebugFmtString;
-   GLuint ErrorDebugCount;
-
-   GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
-   GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */
-
-   GLboolean ViewportInitialized;  /**< has viewport size been initialized? */
-
-   GLbitfield varying_vp_inputs;  /**< mask of VERT_BIT_* flags */
-
-   /** \name Derived state */
-   /*@{*/
-   /** Bitwise-or of DD_* flags.  Note that this bitfield may be used before
-    * state validation so they need to always be current.
-    */
-   GLbitfield _TriangleCaps;
-   GLbitfield _ImageTransferState;/**< bitwise-or of IMAGE_*_BIT flags */
-   GLfloat _EyeZDir[3];
-   GLfloat _ModelViewInvScale;
-   GLboolean _NeedEyeCoords;
-   GLboolean _ForceEyeCoords; 
-
-   GLuint TextureStateTimestamp; /**< detect changes to shared state */
-
-   struct gl_shine_tab *_ShineTable[2]; /**< Active shine tables */
-   struct gl_shine_tab *_ShineTabList;  /**< MRU list of inactive shine tables */
-   /**@}*/
-
-   struct gl_list_extensions *ListExt; /**< driver dlist extensions */
-
-   /** \name For debugging/development only */
-   /*@{*/
-   GLboolean FirstTimeCurrent;
-   /*@}*/
-
-   /** Dither disable via MESA_NO_DITHER env var */
-   GLboolean NoDither;
-
-   /** software compression/decompression supported or not */
-   GLboolean Mesa_DXTn;
-
-   /** 
-    * Use dp4 (rather than mul/mad) instructions for position
-    * transformation?
-    */
-   GLboolean mvp_with_dp4;
-
-   /** Core tnl module support */
-   struct gl_tnl_module TnlModule;
-
-   /**
-    * \name Hooks for module contexts.  
-    *
-    * These will eventually live in the driver or elsewhere.
-    */
-   /*@{*/
-   void *swrast_context;
-   void *swsetup_context;
-   void *swtnl_context;
-   void *swtnl_im;
-   struct st_context *st;
-   void *aelt_context;
-   /*@}*/
-};
-
-
-/** The string names for GL_POINT, GL_LINE_LOOP, etc */
-extern const char *_mesa_prim_name[GL_POLYGON+4];
-
-
-#ifdef DEBUG
-extern int MESA_VERBOSE;
-extern int MESA_DEBUG_FLAGS;
-# define MESA_FUNCTION __FUNCTION__
-#else
-# define MESA_VERBOSE 0
-# define MESA_DEBUG_FLAGS 0
-# define MESA_FUNCTION "a function"
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-
-
-/** The MESA_VERBOSE var is a bitmask of these flags */
-enum _verbose
-{
-   VERBOSE_VARRAY		= 0x0001,
-   VERBOSE_TEXTURE		= 0x0002,
-   VERBOSE_MATERIAL		= 0x0004,
-   VERBOSE_PIPELINE		= 0x0008,
-   VERBOSE_DRIVER		= 0x0010,
-   VERBOSE_STATE		= 0x0020,
-   VERBOSE_API			= 0x0040,
-   VERBOSE_DISPLAY_LIST		= 0x0100,
-   VERBOSE_LIGHTING		= 0x0200,
-   VERBOSE_PRIMS		= 0x0400,
-   VERBOSE_VERTS		= 0x0800,
-   VERBOSE_DISASSEM		= 0x1000,
-   VERBOSE_DRAW                 = 0x2000,
-   VERBOSE_SWAPBUFFERS          = 0x4000
-};
-
-
-/** The MESA_DEBUG_FLAGS var is a bitmask of these flags */
-enum _debug
-{
-   DEBUG_ALWAYS_FLUSH		= 0x1
-};
-
-
-
-#endif /* MTYPES_H */
+/*

+ * 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 mtypes.h

+ * Main Mesa data structures.

+ *

+ * Please try to mark derived values with a leading underscore ('_').

+ */

+

+#ifndef MTYPES_H

+#define MTYPES_H

+

+

+#include "main/glheader.h"

+#include "main/config.h"

+#include "main/mfeatures.h"

+#include "glapi/glapi.h"

+#include "math/m_matrix.h"	/* GLmatrix */

+#include "main/simple_list.h"	/* struct simple_node */

+

+

+/**

+ * Color channel data type.

+ */

+#if CHAN_BITS == 8

+   typedef GLubyte GLchan;

+#define CHAN_MAX 255

+#define CHAN_MAXF 255.0F

+#define CHAN_TYPE GL_UNSIGNED_BYTE

+#elif CHAN_BITS == 16

+   typedef GLushort GLchan;

+#define CHAN_MAX 65535

+#define CHAN_MAXF 65535.0F

+#define CHAN_TYPE GL_UNSIGNED_SHORT

+#elif CHAN_BITS == 32

+   typedef GLfloat GLchan;

+#define CHAN_MAX 1.0

+#define CHAN_MAXF 1.0F

+#define CHAN_TYPE GL_FLOAT

+#else

+#error "illegal number of color channel bits"

+#endif

+

+

+/**

+ * Stencil buffer data type.

+ */

+#if STENCIL_BITS==8

+   typedef GLubyte GLstencil;

+#elif STENCIL_BITS==16

+   typedef GLushort GLstencil;

+#else

+#  error "illegal number of stencil bits"

+#endif

+

+

+/**

+ * \name 64-bit extension of GLbitfield.

+ */

+/*@{*/

+typedef GLuint64 GLbitfield64;

+

+#define BITFIELD64_ONE         1ULL

+#define BITFIELD64_ALLONES     ~0ULL

+

+/** Set a single bit */

+#define BITFIELD64_BIT(b)      (BITFIELD64_ONE << (b))

+

+/** Set a mask of the least significant \c b bits */

+#define BITFIELD64_MASK(b)     (((b) >= 64) ? BITFIELD64_ALLONES : \

+				(BITFIELD64_BIT(b) - 1))

+

+/**

+ * Set all bits from l (low bit) to h (high bit), inclusive.

+ *

+ * \note \C BITFIELD_64_RANGE(0, 63) return 64 set bits.

+ */

+#define BITFIELD64_RANGE(l, h) (BITFIELD64_MASK((h) + 1) & ~BITFIELD64_MASK(l))

+/*@}*/

+

+

+/**

+ * \name Some forward type declarations

+ */

+/*@{*/

+struct _mesa_HashTable;

+struct gl_attrib_node;

+struct gl_list_extensions;

+struct gl_meta_state;

+struct gl_pixelstore_attrib;

+struct gl_program_cache;

+struct gl_texture_format;

+struct gl_texture_image;

+struct gl_texture_object;

+struct gl_context;

+struct st_context;

+/*@}*/

+

+

+

+/**

+ * Shader stages. Note that these will become 5 with tessellation.

+ * These MUST have the same values as gallium's PIPE_SHADER_*

+ */

+typedef enum

+{

+   MESA_SHADER_VERTEX = 0,

+   MESA_SHADER_FRAGMENT = 1,

+   MESA_SHADER_GEOMETRY = 2,

+   MESA_SHADER_TYPES = 3

+} gl_shader_type;

+

+

+

+/**

+ * Indexes for vertex program attributes.

+ * GL_NV_vertex_program aliases generic attributes over the conventional

+ * attributes.  In GL_ARB_vertex_program shader the aliasing is optional.

+ * In GL_ARB_vertex_shader / OpenGL 2.0 the aliasing is disallowed (the

+ * generic attributes are distinct/separate).

+ */

+typedef enum

+{

+   VERT_ATTRIB_POS = 0,

+   VERT_ATTRIB_WEIGHT = 1,

+   VERT_ATTRIB_NORMAL = 2,

+   VERT_ATTRIB_COLOR0 = 3,

+   VERT_ATTRIB_COLOR1 = 4,

+   VERT_ATTRIB_FOG = 5,

+   VERT_ATTRIB_COLOR_INDEX = 6,

+   VERT_ATTRIB_POINT_SIZE = 6,  /*alias*/

+   VERT_ATTRIB_EDGEFLAG = 7,

+   VERT_ATTRIB_TEX0 = 8,

+   VERT_ATTRIB_TEX1 = 9,

+   VERT_ATTRIB_TEX2 = 10,

+   VERT_ATTRIB_TEX3 = 11,

+   VERT_ATTRIB_TEX4 = 12,

+   VERT_ATTRIB_TEX5 = 13,

+   VERT_ATTRIB_TEX6 = 14,

+   VERT_ATTRIB_TEX7 = 15,

+   VERT_ATTRIB_GENERIC0 = 16,

+   VERT_ATTRIB_GENERIC1 = 17,

+   VERT_ATTRIB_GENERIC2 = 18,

+   VERT_ATTRIB_GENERIC3 = 19,

+   VERT_ATTRIB_GENERIC4 = 20,

+   VERT_ATTRIB_GENERIC5 = 21,

+   VERT_ATTRIB_GENERIC6 = 22,

+   VERT_ATTRIB_GENERIC7 = 23,

+   VERT_ATTRIB_GENERIC8 = 24,

+   VERT_ATTRIB_GENERIC9 = 25,

+   VERT_ATTRIB_GENERIC10 = 26,

+   VERT_ATTRIB_GENERIC11 = 27,

+   VERT_ATTRIB_GENERIC12 = 28,

+   VERT_ATTRIB_GENERIC13 = 29,

+   VERT_ATTRIB_GENERIC14 = 30,

+   VERT_ATTRIB_GENERIC15 = 31,

+   VERT_ATTRIB_MAX = 32

+} gl_vert_attrib;

+

+/**

+ * Bitflags for vertex attributes.

+ * These are used in bitfields in many places.

+ */

+/*@{*/

+#define VERT_BIT_POS         (1 << VERT_ATTRIB_POS)

+#define VERT_BIT_WEIGHT      (1 << VERT_ATTRIB_WEIGHT)

+#define VERT_BIT_NORMAL      (1 << VERT_ATTRIB_NORMAL)

+#define VERT_BIT_COLOR0      (1 << VERT_ATTRIB_COLOR0)

+#define VERT_BIT_COLOR1      (1 << VERT_ATTRIB_COLOR1)

+#define VERT_BIT_FOG         (1 << VERT_ATTRIB_FOG)

+#define VERT_BIT_COLOR_INDEX (1 << VERT_ATTRIB_COLOR_INDEX)

+#define VERT_BIT_EDGEFLAG    (1 << VERT_ATTRIB_EDGEFLAG)

+#define VERT_BIT_TEX0        (1 << VERT_ATTRIB_TEX0)

+#define VERT_BIT_TEX1        (1 << VERT_ATTRIB_TEX1)

+#define VERT_BIT_TEX2        (1 << VERT_ATTRIB_TEX2)

+#define VERT_BIT_TEX3        (1 << VERT_ATTRIB_TEX3)

+#define VERT_BIT_TEX4        (1 << VERT_ATTRIB_TEX4)

+#define VERT_BIT_TEX5        (1 << VERT_ATTRIB_TEX5)

+#define VERT_BIT_TEX6        (1 << VERT_ATTRIB_TEX6)

+#define VERT_BIT_TEX7        (1 << VERT_ATTRIB_TEX7)

+#define VERT_BIT_GENERIC0    (1 << VERT_ATTRIB_GENERIC0)

+#define VERT_BIT_GENERIC1    (1 << VERT_ATTRIB_GENERIC1)

+#define VERT_BIT_GENERIC2    (1 << VERT_ATTRIB_GENERIC2)

+#define VERT_BIT_GENERIC3    (1 << VERT_ATTRIB_GENERIC3)

+#define VERT_BIT_GENERIC4    (1 << VERT_ATTRIB_GENERIC4)

+#define VERT_BIT_GENERIC5    (1 << VERT_ATTRIB_GENERIC5)

+#define VERT_BIT_GENERIC6    (1 << VERT_ATTRIB_GENERIC6)

+#define VERT_BIT_GENERIC7    (1 << VERT_ATTRIB_GENERIC7)

+#define VERT_BIT_GENERIC8    (1 << VERT_ATTRIB_GENERIC8)

+#define VERT_BIT_GENERIC9    (1 << VERT_ATTRIB_GENERIC9)

+#define VERT_BIT_GENERIC10   (1 << VERT_ATTRIB_GENERIC10)

+#define VERT_BIT_GENERIC11   (1 << VERT_ATTRIB_GENERIC11)

+#define VERT_BIT_GENERIC12   (1 << VERT_ATTRIB_GENERIC12)

+#define VERT_BIT_GENERIC13   (1 << VERT_ATTRIB_GENERIC13)

+#define VERT_BIT_GENERIC14   (1 << VERT_ATTRIB_GENERIC14)

+#define VERT_BIT_GENERIC15   (1 << VERT_ATTRIB_GENERIC15)

+

+#define VERT_BIT_TEX(u)  (1 << (VERT_ATTRIB_TEX0 + (u)))

+#define VERT_BIT_GENERIC(g)  (1 << (VERT_ATTRIB_GENERIC0 + (g)))

+/*@}*/

+

+

+/**

+ * Indexes for vertex program result attributes

+ */

+typedef enum

+{

+   VERT_RESULT_HPOS = 0,

+   VERT_RESULT_COL0 = 1,

+   VERT_RESULT_COL1 = 2,

+   VERT_RESULT_FOGC = 3,

+   VERT_RESULT_TEX0 = 4,

+   VERT_RESULT_TEX1 = 5,

+   VERT_RESULT_TEX2 = 6,

+   VERT_RESULT_TEX3 = 7,

+   VERT_RESULT_TEX4 = 8,

+   VERT_RESULT_TEX5 = 9,

+   VERT_RESULT_TEX6 = 10,

+   VERT_RESULT_TEX7 = 11,

+   VERT_RESULT_PSIZ = 12,

+   VERT_RESULT_BFC0 = 13,

+   VERT_RESULT_BFC1 = 14,

+   VERT_RESULT_EDGE = 15,

+   VERT_RESULT_VAR0 = 16,  /**< shader varying */

+   VERT_RESULT_MAX = (VERT_RESULT_VAR0 + MAX_VARYING)

+} gl_vert_result;

+

+

+/*********************************************/

+

+/**

+ * Indexes for geometry program attributes.

+ */

+typedef enum

+{

+   GEOM_ATTRIB_POSITION = 0,

+   GEOM_ATTRIB_COLOR0 = 1,

+   GEOM_ATTRIB_COLOR1 = 2,

+   GEOM_ATTRIB_SECONDARY_COLOR0 = 3,

+   GEOM_ATTRIB_SECONDARY_COLOR1 = 4,

+   GEOM_ATTRIB_FOG_FRAG_COORD = 5,

+   GEOM_ATTRIB_POINT_SIZE = 6,

+   GEOM_ATTRIB_CLIP_VERTEX = 7,

+   GEOM_ATTRIB_PRIMITIVE_ID = 8,

+   GEOM_ATTRIB_TEX_COORD = 9,

+

+   GEOM_ATTRIB_VAR0 = 16,

+   GEOM_ATTRIB_MAX = (GEOM_ATTRIB_VAR0 + MAX_VARYING)

+} gl_geom_attrib;

+

+/**

+ * Bitflags for geometry attributes.

+ * These are used in bitfields in many places.

+ */

+/*@{*/

+#define GEOM_BIT_COLOR0      (1 << GEOM_ATTRIB_COLOR0)

+#define GEOM_BIT_COLOR1      (1 << GEOM_ATTRIB_COLOR1)

+#define GEOM_BIT_SCOLOR0     (1 << GEOM_ATTRIB_SECONDARY_COLOR0)

+#define GEOM_BIT_SCOLOR1     (1 << GEOM_ATTRIB_SECONDARY_COLOR1)

+#define GEOM_BIT_TEX_COORD   (1 << GEOM_ATTRIB_TEX_COORD)

+#define GEOM_BIT_FOG_COORD   (1 << GEOM_ATTRIB_FOG_FRAG_COORD)

+#define GEOM_BIT_POSITION    (1 << GEOM_ATTRIB_POSITION)

+#define GEOM_BIT_POINT_SIDE  (1 << GEOM_ATTRIB_POINT_SIZE)

+#define GEOM_BIT_CLIP_VERTEX (1 << GEOM_ATTRIB_CLIP_VERTEX)

+#define GEOM_BIT_PRIM_ID     (1 << GEOM_ATTRIB_PRIMITIVE_ID)

+#define GEOM_BIT_VAR0        (1 << GEOM_ATTRIB_VAR0)

+

+#define GEOM_BIT_VAR(g)  (1 << (GEOM_BIT_VAR0 + (g)))

+/*@}*/

+

+

+/**

+ * Indexes for geometry program result attributes

+ */

+/*@{*/

+typedef enum {

+   GEOM_RESULT_POS  = 0,

+   GEOM_RESULT_COL0  = 1,

+   GEOM_RESULT_COL1  = 2,

+   GEOM_RESULT_SCOL0 = 3,

+   GEOM_RESULT_SCOL1 = 4,

+   GEOM_RESULT_FOGC = 5,

+   GEOM_RESULT_TEX0 = 6,

+   GEOM_RESULT_TEX1 = 7,

+   GEOM_RESULT_TEX2 = 8,

+   GEOM_RESULT_TEX3 = 9,

+   GEOM_RESULT_TEX4 = 10,

+   GEOM_RESULT_TEX5 = 11,

+   GEOM_RESULT_TEX6 = 12,

+   GEOM_RESULT_TEX7 = 13,

+   GEOM_RESULT_PSIZ = 14,

+   GEOM_RESULT_CLPV = 15,

+   GEOM_RESULT_PRID = 16,

+   GEOM_RESULT_LAYR = 17,

+   GEOM_RESULT_VAR0 = 18,  /**< shader varying, should really be 16 */

+   /* ### we need to -2 because var0 is 18 instead 16 like in the others */

+   GEOM_RESULT_MAX  =  (GEOM_RESULT_VAR0 + MAX_VARYING - 2)

+} gl_geom_result;

+/*@}*/

+

+/**

+ * Indexes for fragment program input attributes.

+ */

+typedef enum

+{

+   FRAG_ATTRIB_WPOS = 0,

+   FRAG_ATTRIB_COL0 = 1,

+   FRAG_ATTRIB_COL1 = 2,

+   FRAG_ATTRIB_FOGC = 3,

+   FRAG_ATTRIB_TEX0 = 4,

+   FRAG_ATTRIB_TEX1 = 5,

+   FRAG_ATTRIB_TEX2 = 6,

+   FRAG_ATTRIB_TEX3 = 7,

+   FRAG_ATTRIB_TEX4 = 8,

+   FRAG_ATTRIB_TEX5 = 9,

+   FRAG_ATTRIB_TEX6 = 10,

+   FRAG_ATTRIB_TEX7 = 11,

+   FRAG_ATTRIB_FACE = 12,  /**< front/back face */

+   FRAG_ATTRIB_PNTC = 13,  /**< sprite/point coord */

+   FRAG_ATTRIB_VAR0 = 14,  /**< shader varying */

+   FRAG_ATTRIB_MAX = (FRAG_ATTRIB_VAR0 + MAX_VARYING)

+} gl_frag_attrib;

+

+/**

+ * Bitflags for fragment program input attributes.

+ */

+/*@{*/

+#define FRAG_BIT_WPOS  (1 << FRAG_ATTRIB_WPOS)

+#define FRAG_BIT_COL0  (1 << FRAG_ATTRIB_COL0)

+#define FRAG_BIT_COL1  (1 << FRAG_ATTRIB_COL1)

+#define FRAG_BIT_FOGC  (1 << FRAG_ATTRIB_FOGC)

+#define FRAG_BIT_FACE  (1 << FRAG_ATTRIB_FACE)

+#define FRAG_BIT_PNTC  (1 << FRAG_ATTRIB_PNTC)

+#define FRAG_BIT_TEX0  (1 << FRAG_ATTRIB_TEX0)

+#define FRAG_BIT_TEX1  (1 << FRAG_ATTRIB_TEX1)

+#define FRAG_BIT_TEX2  (1 << FRAG_ATTRIB_TEX2)

+#define FRAG_BIT_TEX3  (1 << FRAG_ATTRIB_TEX3)

+#define FRAG_BIT_TEX4  (1 << FRAG_ATTRIB_TEX4)

+#define FRAG_BIT_TEX5  (1 << FRAG_ATTRIB_TEX5)

+#define FRAG_BIT_TEX6  (1 << FRAG_ATTRIB_TEX6)

+#define FRAG_BIT_TEX7  (1 << FRAG_ATTRIB_TEX7)

+#define FRAG_BIT_VAR0  (1 << FRAG_ATTRIB_VAR0)

+

+#define FRAG_BIT_TEX(U)  (FRAG_BIT_TEX0 << (U))

+#define FRAG_BIT_VAR(V)  (FRAG_BIT_VAR0 << (V))

+

+#define FRAG_BITS_TEX_ANY (FRAG_BIT_TEX0|	\

+			   FRAG_BIT_TEX1|	\

+			   FRAG_BIT_TEX2|	\

+			   FRAG_BIT_TEX3|	\

+			   FRAG_BIT_TEX4|	\

+			   FRAG_BIT_TEX5|	\

+			   FRAG_BIT_TEX6|	\

+			   FRAG_BIT_TEX7)

+/*@}*/

+

+

+/**

+ * Fragment program results

+ */

+typedef enum

+{

+   FRAG_RESULT_DEPTH = 0,

+   FRAG_RESULT_STENCIL = 1,

+   FRAG_RESULT_COLOR = 2,

+   FRAG_RESULT_DATA0 = 3,

+   FRAG_RESULT_MAX = (FRAG_RESULT_DATA0 + MAX_DRAW_BUFFERS)

+} gl_frag_result;

+

+

+/**

+ * Indexes for all renderbuffers

+ */

+typedef enum

+{

+   /* the four standard color buffers */

+   BUFFER_FRONT_LEFT,

+   BUFFER_BACK_LEFT,

+   BUFFER_FRONT_RIGHT,

+   BUFFER_BACK_RIGHT,

+   BUFFER_DEPTH,

+   BUFFER_STENCIL,

+   BUFFER_ACCUM,

+   /* optional aux buffer */

+   BUFFER_AUX0,

+   /* generic renderbuffers */

+   BUFFER_COLOR0,

+   BUFFER_COLOR1,

+   BUFFER_COLOR2,

+   BUFFER_COLOR3,

+   BUFFER_COLOR4,

+   BUFFER_COLOR5,

+   BUFFER_COLOR6,

+   BUFFER_COLOR7,

+   BUFFER_COUNT

+} gl_buffer_index;

+

+/**

+ * Bit flags for all renderbuffers

+ */

+#define BUFFER_BIT_FRONT_LEFT   (1 << BUFFER_FRONT_LEFT)

+#define BUFFER_BIT_BACK_LEFT    (1 << BUFFER_BACK_LEFT)

+#define BUFFER_BIT_FRONT_RIGHT  (1 << BUFFER_FRONT_RIGHT)

+#define BUFFER_BIT_BACK_RIGHT   (1 << BUFFER_BACK_RIGHT)

+#define BUFFER_BIT_AUX0         (1 << BUFFER_AUX0)

+#define BUFFER_BIT_AUX1         (1 << BUFFER_AUX1)

+#define BUFFER_BIT_AUX2         (1 << BUFFER_AUX2)

+#define BUFFER_BIT_AUX3         (1 << BUFFER_AUX3)

+#define BUFFER_BIT_DEPTH        (1 << BUFFER_DEPTH)

+#define BUFFER_BIT_STENCIL      (1 << BUFFER_STENCIL)

+#define BUFFER_BIT_ACCUM        (1 << BUFFER_ACCUM)

+#define BUFFER_BIT_COLOR0       (1 << BUFFER_COLOR0)

+#define BUFFER_BIT_COLOR1       (1 << BUFFER_COLOR1)

+#define BUFFER_BIT_COLOR2       (1 << BUFFER_COLOR2)

+#define BUFFER_BIT_COLOR3       (1 << BUFFER_COLOR3)

+#define BUFFER_BIT_COLOR4       (1 << BUFFER_COLOR4)

+#define BUFFER_BIT_COLOR5       (1 << BUFFER_COLOR5)

+#define BUFFER_BIT_COLOR6       (1 << BUFFER_COLOR6)

+#define BUFFER_BIT_COLOR7       (1 << BUFFER_COLOR7)

+

+/**

+ * Mask of all the color buffer bits (but not accum).

+ */

+#define BUFFER_BITS_COLOR  (BUFFER_BIT_FRONT_LEFT | \

+                            BUFFER_BIT_BACK_LEFT | \

+                            BUFFER_BIT_FRONT_RIGHT | \

+                            BUFFER_BIT_BACK_RIGHT | \

+                            BUFFER_BIT_AUX0 | \

+                            BUFFER_BIT_COLOR0 | \

+                            BUFFER_BIT_COLOR1 | \

+                            BUFFER_BIT_COLOR2 | \

+                            BUFFER_BIT_COLOR3 | \

+                            BUFFER_BIT_COLOR4 | \

+                            BUFFER_BIT_COLOR5 | \

+                            BUFFER_BIT_COLOR6 | \

+                            BUFFER_BIT_COLOR7)

+

+

+/**

+ * Framebuffer configuration (aka visual / pixelformat)

+ * Note: some of these fields should be boolean, but it appears that

+ * code in drivers/dri/common/util.c requires int-sized fields.

+ */

+struct gl_config

+{

+   GLboolean rgbMode;

+   GLboolean floatMode;

+   GLboolean colorIndexMode;  /* XXX is this used anywhere? */

+   GLuint doubleBufferMode;

+   GLuint stereoMode;

+

+   GLboolean haveAccumBuffer;

+   GLboolean haveDepthBuffer;

+   GLboolean haveStencilBuffer;

+

+   GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */

+   GLuint redMask, greenMask, blueMask, alphaMask;

+   GLint rgbBits;		/* total bits for rgb */

+   GLint indexBits;		/* total bits for colorindex */

+

+   GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;

+   GLint depthBits;

+   GLint stencilBits;

+

+   GLint numAuxBuffers;

+

+   GLint level;

+

+   /* EXT_visual_rating / GLX 1.2 */

+   GLint visualRating;

+

+   /* EXT_visual_info / GLX 1.2 */

+   GLint transparentPixel;

+   /*    colors are floats scaled to ints */

+   GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha;

+   GLint transparentIndex;

+

+   /* ARB_multisample / SGIS_multisample */

+   GLint sampleBuffers;

+   GLint samples;

+

+   /* SGIX_pbuffer / GLX 1.3 */

+   GLint maxPbufferWidth;

+   GLint maxPbufferHeight;

+   GLint maxPbufferPixels;

+   GLint optimalPbufferWidth;   /* Only for SGIX_pbuffer. */

+   GLint optimalPbufferHeight;  /* Only for SGIX_pbuffer. */

+

+   /* OML_swap_method */

+   GLint swapMethod;

+

+   /* EXT_texture_from_pixmap */

+   GLint bindToTextureRgb;

+   GLint bindToTextureRgba;

+   GLint bindToMipmapTexture;

+   GLint bindToTextureTargets;

+   GLint yInverted;

+};

+

+

+/**

+ * Data structure for color tables

+ */

+struct gl_color_table

+{

+   GLenum InternalFormat;      /**< The user-specified format */

+   GLenum _BaseFormat;         /**< GL_ALPHA, GL_RGBA, GL_RGB, etc */

+   GLuint Size;                /**< number of entries in table */

+   GLfloat *TableF;            /**< Color table, floating point values */

+   GLubyte *TableUB;           /**< Color table, ubyte values */

+   GLubyte RedSize;

+   GLubyte GreenSize;

+   GLubyte BlueSize;

+   GLubyte AlphaSize;

+   GLubyte LuminanceSize;

+   GLubyte IntensitySize;

+};

+

+

+/**

+ * \name Bit flags used for updating material values.

+ */

+/*@{*/

+#define MAT_ATTRIB_FRONT_AMBIENT           0 

+#define MAT_ATTRIB_BACK_AMBIENT            1

+#define MAT_ATTRIB_FRONT_DIFFUSE           2 

+#define MAT_ATTRIB_BACK_DIFFUSE            3

+#define MAT_ATTRIB_FRONT_SPECULAR          4 

+#define MAT_ATTRIB_BACK_SPECULAR           5

+#define MAT_ATTRIB_FRONT_EMISSION          6

+#define MAT_ATTRIB_BACK_EMISSION           7

+#define MAT_ATTRIB_FRONT_SHININESS         8

+#define MAT_ATTRIB_BACK_SHININESS          9

+#define MAT_ATTRIB_FRONT_INDEXES           10

+#define MAT_ATTRIB_BACK_INDEXES            11

+#define MAT_ATTRIB_MAX                     12

+

+#define MAT_ATTRIB_AMBIENT(f)  (MAT_ATTRIB_FRONT_AMBIENT+(f))  

+#define MAT_ATTRIB_DIFFUSE(f)  (MAT_ATTRIB_FRONT_DIFFUSE+(f))  

+#define MAT_ATTRIB_SPECULAR(f) (MAT_ATTRIB_FRONT_SPECULAR+(f)) 

+#define MAT_ATTRIB_EMISSION(f) (MAT_ATTRIB_FRONT_EMISSION+(f)) 

+#define MAT_ATTRIB_SHININESS(f)(MAT_ATTRIB_FRONT_SHININESS+(f))

+#define MAT_ATTRIB_INDEXES(f)  (MAT_ATTRIB_FRONT_INDEXES+(f))  

+

+#define MAT_INDEX_AMBIENT  0

+#define MAT_INDEX_DIFFUSE  1

+#define MAT_INDEX_SPECULAR 2

+

+#define MAT_BIT_FRONT_AMBIENT         (1<<MAT_ATTRIB_FRONT_AMBIENT)

+#define MAT_BIT_BACK_AMBIENT          (1<<MAT_ATTRIB_BACK_AMBIENT)

+#define MAT_BIT_FRONT_DIFFUSE         (1<<MAT_ATTRIB_FRONT_DIFFUSE)

+#define MAT_BIT_BACK_DIFFUSE          (1<<MAT_ATTRIB_BACK_DIFFUSE)

+#define MAT_BIT_FRONT_SPECULAR        (1<<MAT_ATTRIB_FRONT_SPECULAR)

+#define MAT_BIT_BACK_SPECULAR         (1<<MAT_ATTRIB_BACK_SPECULAR)

+#define MAT_BIT_FRONT_EMISSION        (1<<MAT_ATTRIB_FRONT_EMISSION)

+#define MAT_BIT_BACK_EMISSION         (1<<MAT_ATTRIB_BACK_EMISSION)

+#define MAT_BIT_FRONT_SHININESS       (1<<MAT_ATTRIB_FRONT_SHININESS)

+#define MAT_BIT_BACK_SHININESS        (1<<MAT_ATTRIB_BACK_SHININESS)

+#define MAT_BIT_FRONT_INDEXES         (1<<MAT_ATTRIB_FRONT_INDEXES)

+#define MAT_BIT_BACK_INDEXES          (1<<MAT_ATTRIB_BACK_INDEXES)

+

+

+#define FRONT_MATERIAL_BITS	(MAT_BIT_FRONT_EMISSION | 	\

+				 MAT_BIT_FRONT_AMBIENT |	\

+				 MAT_BIT_FRONT_DIFFUSE | 	\

+				 MAT_BIT_FRONT_SPECULAR |	\

+				 MAT_BIT_FRONT_SHININESS | 	\

+				 MAT_BIT_FRONT_INDEXES)

+

+#define BACK_MATERIAL_BITS	(MAT_BIT_BACK_EMISSION |	\

+				 MAT_BIT_BACK_AMBIENT |		\

+				 MAT_BIT_BACK_DIFFUSE |		\

+				 MAT_BIT_BACK_SPECULAR |	\

+				 MAT_BIT_BACK_SHININESS |	\

+				 MAT_BIT_BACK_INDEXES)

+

+#define ALL_MATERIAL_BITS	(FRONT_MATERIAL_BITS | BACK_MATERIAL_BITS)

+/*@}*/

+

+

+#define EXP_TABLE_SIZE 512	/**< Specular exponent lookup table sizes */

+#define SHINE_TABLE_SIZE 256	/**< Material shininess lookup table sizes */

+

+/**

+ * Material shininess lookup table.

+ */

+struct gl_shine_tab

+{

+   struct gl_shine_tab *next, *prev;

+   GLfloat tab[SHINE_TABLE_SIZE+1];

+   GLfloat shininess;

+   GLuint refcount;

+};

+

+

+/**

+ * Light source state.

+ */

+struct gl_light

+{

+   struct gl_light *next;	/**< double linked list with sentinel */

+   struct gl_light *prev;

+

+   GLfloat Ambient[4];		/**< ambient color */

+   GLfloat Diffuse[4];		/**< diffuse color */

+   GLfloat Specular[4];		/**< specular color */

+   GLfloat EyePosition[4];	/**< position in eye coordinates */

+   GLfloat SpotDirection[4];	/**< spotlight direction in eye coordinates */

+   GLfloat SpotExponent;

+   GLfloat SpotCutoff;		/**< in degrees */

+   GLfloat _CosCutoffNeg;	/**< = cos(SpotCutoff) */

+   GLfloat _CosCutoff;		/**< = MAX(0, cos(SpotCutoff)) */

+   GLfloat ConstantAttenuation;

+   GLfloat LinearAttenuation;

+   GLfloat QuadraticAttenuation;

+   GLboolean Enabled;		/**< On/off flag */

+

+   /** 

+    * \name Derived fields

+    */

+   /*@{*/

+   GLbitfield _Flags;		/**< State */

+

+   GLfloat _Position[4];	/**< position in eye/obj coordinates */

+   GLfloat _VP_inf_norm[3];	/**< Norm direction to infinite light */

+   GLfloat _h_inf_norm[3];	/**< Norm( _VP_inf_norm + <0,0,1> ) */

+   GLfloat _NormSpotDirection[4]; /**< normalized spotlight direction */

+   GLfloat _VP_inf_spot_attenuation;

+

+   GLfloat _SpotExpTable[EXP_TABLE_SIZE][2];  /**< to replace a pow() call */

+   GLfloat _MatAmbient[2][3];	/**< material ambient * light ambient */

+   GLfloat _MatDiffuse[2][3];	/**< material diffuse * light diffuse */

+   GLfloat _MatSpecular[2][3];	/**< material spec * light specular */

+   GLfloat _dli;		/**< CI diffuse light intensity */

+   GLfloat _sli;		/**< CI specular light intensity */

+   /*@}*/

+};

+

+

+/**

+ * Light model state.

+ */

+struct gl_lightmodel

+{

+   GLfloat Ambient[4];		/**< ambient color */

+   GLboolean LocalViewer;	/**< Local (or infinite) view point? */

+   GLboolean TwoSide;		/**< Two (or one) sided lighting? */

+   GLenum ColorControl;		/**< either GL_SINGLE_COLOR

+				 *    or GL_SEPARATE_SPECULAR_COLOR */

+};

+

+

+/**

+ * Material state.

+ */

+struct gl_material

+{

+   GLfloat Attrib[MAT_ATTRIB_MAX][4];

+};

+

+

+/**

+ * Accumulation buffer attribute group (GL_ACCUM_BUFFER_BIT)

+ */

+struct gl_accum_attrib

+{

+   GLfloat ClearColor[4];	/**< Accumulation buffer clear color */

+};

+

+

+/**

+ * Color buffer attribute group (GL_COLOR_BUFFER_BIT).

+ */

+struct gl_colorbuffer_attrib

+{

+   GLuint ClearIndex;			/**< Index to use for glClear */

+   GLclampf ClearColor[4];		/**< Color to use for glClear */

+

+   GLuint IndexMask;			/**< Color index write mask */

+   GLubyte ColorMask[MAX_DRAW_BUFFERS][4];/**< Each flag is 0xff or 0x0 */

+

+   GLenum DrawBuffer[MAX_DRAW_BUFFERS];	/**< Which buffer to draw into */

+

+   /** 

+    * \name alpha testing

+    */

+   /*@{*/

+   GLboolean AlphaEnabled;		/**< Alpha test enabled flag */

+   GLenum AlphaFunc;			/**< Alpha test function */

+   GLclampf AlphaRef;			/**< Alpha reference value */

+   /*@}*/

+

+   /** 

+    * \name Blending

+    */

+   /*@{*/

+   GLbitfield BlendEnabled;		/**< Per-buffer blend enable flags */

+   GLenum BlendSrcRGB;			/**< Blending source operator */

+   GLenum BlendDstRGB;			/**< Blending destination operator */

+   GLenum BlendSrcA;			/**< GL_INGR_blend_func_separate */

+   GLenum BlendDstA;			/**< GL_INGR_blend_func_separate */

+   GLenum BlendEquationRGB;		/**< Blending equation */

+   GLenum BlendEquationA;		/**< GL_EXT_blend_equation_separate */

+   GLfloat BlendColor[4];		/**< Blending color */

+   /*@}*/

+

+   /** 

+    * \name Logic op

+    */

+   /*@{*/

+   GLenum LogicOp;			/**< Logic operator */

+   GLboolean IndexLogicOpEnabled;	/**< Color index logic op enabled flag */

+   GLboolean ColorLogicOpEnabled;	/**< RGBA logic op enabled flag */

+   GLboolean _LogicOpEnabled;		/**< RGBA logic op + EXT_blend_logic_op enabled flag */

+   /*@}*/

+

+   GLboolean DitherFlag;		/**< Dither enable flag */

+

+   GLenum ClampFragmentColor; /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */

+   GLenum ClampReadColor;     /**< GL_TRUE, GL_FALSE or GL_FIXED_ONLY_ARB */

+};

+

+

+/**

+ * Current attribute group (GL_CURRENT_BIT).

+ */

+struct gl_current_attrib

+{

+   /**

+    * \name Current vertex attributes.

+    * \note Values are valid only after FLUSH_VERTICES has been called.

+    * \note Index and Edgeflag current values are stored as floats in the 

+    * SIX and SEVEN attribute slots.

+    */

+   GLfloat Attrib[VERT_ATTRIB_MAX][4];	/**< Position, color, texcoords, etc */

+

+   /**

+    * \name Current raster position attributes (always valid).

+    * \note This set of attributes is very similar to the SWvertex struct.

+    */

+   /*@{*/

+   GLfloat RasterPos[4];

+   GLfloat RasterDistance;

+   GLfloat RasterColor[4];

+   GLfloat RasterSecondaryColor[4];

+   GLfloat RasterTexCoords[MAX_TEXTURE_COORD_UNITS][4];

+   GLboolean RasterPosValid;

+   /*@}*/

+};

+

+

+/**

+ * Depth buffer attribute group (GL_DEPTH_BUFFER_BIT).

+ */

+struct gl_depthbuffer_attrib

+{

+   GLenum Func;			/**< Function for depth buffer compare */

+   GLclampd Clear;		/**< Value to clear depth buffer to */

+   GLboolean Test;		/**< Depth buffering enabled flag */

+   GLboolean Mask;		/**< Depth buffer writable? */

+   GLboolean BoundsTest;        /**< GL_EXT_depth_bounds_test */

+   GLfloat BoundsMin, BoundsMax;/**< GL_EXT_depth_bounds_test */

+};

+

+

+/**

+ * Evaluator attribute group (GL_EVAL_BIT).

+ */

+struct gl_eval_attrib

+{

+   /**

+    * \name Enable bits 

+    */

+   /*@{*/

+   GLboolean Map1Color4;

+   GLboolean Map1Index;

+   GLboolean Map1Normal;

+   GLboolean Map1TextureCoord1;

+   GLboolean Map1TextureCoord2;

+   GLboolean Map1TextureCoord3;

+   GLboolean Map1TextureCoord4;

+   GLboolean Map1Vertex3;

+   GLboolean Map1Vertex4;

+   GLboolean Map1Attrib[16];  /* GL_NV_vertex_program */

+   GLboolean Map2Color4;

+   GLboolean Map2Index;

+   GLboolean Map2Normal;

+   GLboolean Map2TextureCoord1;

+   GLboolean Map2TextureCoord2;

+   GLboolean Map2TextureCoord3;

+   GLboolean Map2TextureCoord4;

+   GLboolean Map2Vertex3;

+   GLboolean Map2Vertex4;

+   GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */

+   GLboolean AutoNormal;

+   /*@}*/

+   

+   /**

+    * \name Map Grid endpoints and divisions and calculated du values

+    */

+   /*@{*/

+   GLint MapGrid1un;

+   GLfloat MapGrid1u1, MapGrid1u2, MapGrid1du;

+   GLint MapGrid2un, MapGrid2vn;

+   GLfloat MapGrid2u1, MapGrid2u2, MapGrid2du;

+   GLfloat MapGrid2v1, MapGrid2v2, MapGrid2dv;

+   /*@}*/

+};

+

+

+/**

+ * Fog attribute group (GL_FOG_BIT).

+ */

+struct gl_fog_attrib

+{

+   GLboolean Enabled;		/**< Fog enabled flag */

+   GLfloat Color[4];		/**< Fog color */

+   GLfloat Density;		/**< Density >= 0.0 */

+   GLfloat Start;		/**< Start distance in eye coords */

+   GLfloat End;			/**< End distance in eye coords */

+   GLfloat Index;		/**< Fog index */

+   GLenum Mode;			/**< Fog mode */

+   GLboolean ColorSumEnabled;

+   GLenum FogCoordinateSource;  /**< GL_EXT_fog_coord */

+   GLfloat _Scale;		/**< (End == Start) ? 1.0 : 1.0 / (End - Start) */

+};

+

+

+/** 

+ * Hint attribute group (GL_HINT_BIT).

+ * 

+ * Values are always one of GL_FASTEST, GL_NICEST, or GL_DONT_CARE.

+ */

+struct gl_hint_attrib

+{

+   GLenum PerspectiveCorrection;

+   GLenum PointSmooth;

+   GLenum LineSmooth;

+   GLenum PolygonSmooth;

+   GLenum Fog;

+   GLenum ClipVolumeClipping;   /**< GL_EXT_clip_volume_hint */

+   GLenum TextureCompression;   /**< GL_ARB_texture_compression */

+   GLenum GenerateMipmap;       /**< GL_SGIS_generate_mipmap */

+   GLenum FragmentShaderDerivative; /**< GL_ARB_fragment_shader */

+};

+

+/**

+ * Light state flags.

+ */

+/*@{*/

+#define LIGHT_SPOT         0x1

+#define LIGHT_LOCAL_VIEWER 0x2

+#define LIGHT_POSITIONAL   0x4

+#define LIGHT_NEED_VERTICES (LIGHT_POSITIONAL|LIGHT_LOCAL_VIEWER)

+/*@}*/

+

+

+/**

+ * Lighting attribute group (GL_LIGHT_BIT).

+ */

+struct gl_light_attrib

+{

+   struct gl_light Light[MAX_LIGHTS];	/**< Array of light sources */

+   struct gl_lightmodel Model;		/**< Lighting model */

+

+   /**

+    * Must flush FLUSH_VERTICES before referencing:

+    */

+   /*@{*/

+   struct gl_material Material; 	/**< Includes front & back values */

+   /*@}*/

+

+   GLboolean Enabled;			/**< Lighting enabled flag */

+   GLenum ShadeModel;			/**< GL_FLAT or GL_SMOOTH */

+   GLenum ProvokingVertex;              /**< GL_EXT_provoking_vertex */

+   GLenum ColorMaterialFace;		/**< GL_FRONT, BACK or FRONT_AND_BACK */

+   GLenum ColorMaterialMode;		/**< GL_AMBIENT, GL_DIFFUSE, etc */

+   GLbitfield ColorMaterialBitmask;	/**< bitmask formed from Face and Mode */

+   GLboolean ColorMaterialEnabled;

+   GLenum ClampVertexColor;

+

+   struct gl_light EnabledList;         /**< List sentinel */

+

+   /** 

+    * Derived state for optimizations: 

+    */

+   /*@{*/

+   GLboolean _NeedEyeCoords;		

+   GLboolean _NeedVertices;		/**< Use fast shader? */

+   GLbitfield _Flags;		        /**< LIGHT_* flags, see above */

+   GLfloat _BaseColor[2][3];

+   /*@}*/

+};

+

+

+/**

+ * Line attribute group (GL_LINE_BIT).

+ */

+struct gl_line_attrib

+{

+   GLboolean SmoothFlag;	/**< GL_LINE_SMOOTH enabled? */

+   GLboolean StippleFlag;	/**< GL_LINE_STIPPLE enabled? */

+   GLushort StipplePattern;	/**< Stipple pattern */

+   GLint StippleFactor;		/**< Stipple repeat factor */

+   GLfloat Width;		/**< Line width */

+};

+

+

+/**

+ * Display list attribute group (GL_LIST_BIT).

+ */

+struct gl_list_attrib

+{

+   GLuint ListBase;

+};

+

+

+/**

+ * Multisample attribute group (GL_MULTISAMPLE_BIT).

+ */

+struct gl_multisample_attrib

+{

+   GLboolean Enabled;

+   GLboolean _Enabled;   /**< true if Enabled and multisample buffer */

+   GLboolean SampleAlphaToCoverage;

+   GLboolean SampleAlphaToOne;

+   GLboolean SampleCoverage;

+   GLfloat SampleCoverageValue;

+   GLboolean SampleCoverageInvert;

+};

+

+

+/**

+ * A pixelmap (see glPixelMap)

+ */

+struct gl_pixelmap

+{

+   GLint Size;

+   GLfloat Map[MAX_PIXEL_MAP_TABLE];

+   GLubyte Map8[MAX_PIXEL_MAP_TABLE];  /**< converted to 8-bit color */

+};

+

+

+/**

+ * Collection of all pixelmaps

+ */

+struct gl_pixelmaps

+{

+   struct gl_pixelmap RtoR;  /**< i.e. GL_PIXEL_MAP_R_TO_R */

+   struct gl_pixelmap GtoG;

+   struct gl_pixelmap BtoB;

+   struct gl_pixelmap AtoA;

+   struct gl_pixelmap ItoR;

+   struct gl_pixelmap ItoG;

+   struct gl_pixelmap ItoB;

+   struct gl_pixelmap ItoA;

+   struct gl_pixelmap ItoI;

+   struct gl_pixelmap StoS;

+};

+

+

+/**

+ * Pixel attribute group (GL_PIXEL_MODE_BIT).

+ */

+struct gl_pixel_attrib

+{

+   GLenum ReadBuffer;		/**< source buffer for glRead/CopyPixels() */

+

+   /*--- Begin Pixel Transfer State ---*/

+   /* Fields are in the order in which they're applied... */

+

+   /** Scale & Bias (index shift, offset) */

+   /*@{*/

+   GLfloat RedBias, RedScale;

+   GLfloat GreenBias, GreenScale;

+   GLfloat BlueBias, BlueScale;

+   GLfloat AlphaBias, AlphaScale;

+   GLfloat DepthBias, DepthScale;

+   GLint IndexShift, IndexOffset;

+   /*@}*/

+

+   /* Pixel Maps */

+   /* Note: actual pixel maps are not part of this attrib group */

+   GLboolean MapColorFlag;

+   GLboolean MapStencilFlag;

+

+   /*--- End Pixel Transfer State ---*/

+

+   /** glPixelZoom */

+   GLfloat ZoomX, ZoomY;

+

+   /** GL_SGI_texture_color_table */

+   GLfloat TextureColorTableScale[4]; /**< RGBA */

+   GLfloat TextureColorTableBias[4];  /**< RGBA */

+};

+

+

+/**

+ * Point attribute group (GL_POINT_BIT).

+ */

+struct gl_point_attrib

+{

+   GLboolean SmoothFlag;	/**< True if GL_POINT_SMOOTH is enabled */

+   GLfloat Size;		/**< User-specified point size */

+   GLfloat Params[3];		/**< GL_EXT_point_parameters */

+   GLfloat MinSize, MaxSize;	/**< GL_EXT_point_parameters */

+   GLfloat Threshold;		/**< GL_EXT_point_parameters */

+   GLboolean _Attenuated;	/**< True if Params != [1, 0, 0] */

+   GLboolean PointSprite;	/**< GL_NV/ARB_point_sprite */

+   GLboolean CoordReplace[MAX_TEXTURE_COORD_UNITS]; /**< GL_ARB_point_sprite*/

+   GLenum SpriteRMode;		/**< GL_NV_point_sprite (only!) */

+   GLenum SpriteOrigin;		/**< GL_ARB_point_sprite */

+};

+

+

+/**

+ * Polygon attribute group (GL_POLYGON_BIT).

+ */

+struct gl_polygon_attrib

+{

+   GLenum FrontFace;		/**< Either GL_CW or GL_CCW */

+   GLenum FrontMode;		/**< Either GL_POINT, GL_LINE or GL_FILL */

+   GLenum BackMode;		/**< Either GL_POINT, GL_LINE or GL_FILL */

+   GLboolean _FrontBit;		/**< 0=GL_CCW, 1=GL_CW */

+   GLboolean CullFlag;		/**< Culling on/off flag */

+   GLboolean SmoothFlag;	/**< True if GL_POLYGON_SMOOTH is enabled */

+   GLboolean StippleFlag;	/**< True if GL_POLYGON_STIPPLE is enabled */

+   GLenum CullFaceMode;		/**< Culling mode GL_FRONT or GL_BACK */

+   GLfloat OffsetFactor;	/**< Polygon offset factor, from user */

+   GLfloat OffsetUnits;		/**< Polygon offset units, from user */

+   GLboolean OffsetPoint;	/**< Offset in GL_POINT mode */

+   GLboolean OffsetLine;	/**< Offset in GL_LINE mode */

+   GLboolean OffsetFill;	/**< Offset in GL_FILL mode */

+};

+

+

+/**

+ * Scissor attributes (GL_SCISSOR_BIT).

+ */

+struct gl_scissor_attrib

+{

+   GLboolean Enabled;		/**< Scissor test enabled? */

+   GLint X, Y;			/**< Lower left corner of box */

+   GLsizei Width, Height;	/**< Size of box */

+};

+

+

+/**

+ * Stencil attribute group (GL_STENCIL_BUFFER_BIT).

+ *

+ * Three sets of stencil data are tracked so that OpenGL 2.0,

+ * GL_EXT_stencil_two_side, and GL_ATI_separate_stencil can all be supported

+ * simultaneously.  In each of the stencil state arrays, element 0 corresponds

+ * to GL_FRONT.  Element 1 corresponds to the OpenGL 2.0 /

+ * GL_ATI_separate_stencil GL_BACK state.  Element 2 corresponds to the

+ * GL_EXT_stencil_two_side GL_BACK state.

+ *

+ * The derived value \c _BackFace is either 1 or 2 depending on whether or

+ * not GL_STENCIL_TEST_TWO_SIDE_EXT is enabled.

+ *

+ * The derived value \c _TestTwoSide is set when the front-face and back-face

+ * stencil state are different.

+ */

+struct gl_stencil_attrib

+{

+   GLboolean Enabled;		/**< Enabled flag */

+   GLboolean TestTwoSide;	/**< GL_EXT_stencil_two_side */

+   GLubyte ActiveFace;		/**< GL_EXT_stencil_two_side (0 or 2) */

+   GLboolean _Enabled;          /**< Enabled and stencil buffer present */

+   GLboolean _TestTwoSide;

+   GLubyte _BackFace;           /**< Current back stencil state (1 or 2) */

+   GLenum Function[3];		/**< Stencil function */

+   GLenum FailFunc[3];		/**< Fail function */

+   GLenum ZPassFunc[3];		/**< Depth buffer pass function */

+   GLenum ZFailFunc[3];		/**< Depth buffer fail function */

+   GLint Ref[3];		/**< Reference value */

+   GLuint ValueMask[3];		/**< Value mask */

+   GLuint WriteMask[3];		/**< Write mask */

+   GLuint Clear;		/**< Clear value */

+};

+

+

+/**

+ * An index for each type of texture object.  These correspond to the GL

+ * texture target enums, such as GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, etc.

+ * Note: the order is from highest priority to lowest priority.

+ */

+typedef enum

+{

+   TEXTURE_2D_ARRAY_INDEX,

+   TEXTURE_1D_ARRAY_INDEX,

+   TEXTURE_CUBE_INDEX,

+   TEXTURE_3D_INDEX,

+   TEXTURE_RECT_INDEX,

+   TEXTURE_2D_INDEX,

+   TEXTURE_1D_INDEX,

+   NUM_TEXTURE_TARGETS

+} gl_texture_index;

+

+

+/**

+ * Bit flags for each type of texture object

+ * Used for Texture.Unit[]._ReallyEnabled flags.

+ */

+/*@{*/

+#define TEXTURE_2D_ARRAY_BIT (1 << TEXTURE_2D_ARRAY_INDEX)

+#define TEXTURE_1D_ARRAY_BIT (1 << TEXTURE_1D_ARRAY_INDEX)

+#define TEXTURE_CUBE_BIT     (1 << TEXTURE_CUBE_INDEX)

+#define TEXTURE_3D_BIT       (1 << TEXTURE_3D_INDEX)

+#define TEXTURE_RECT_BIT     (1 << TEXTURE_RECT_INDEX)

+#define TEXTURE_2D_BIT       (1 << TEXTURE_2D_INDEX)

+#define TEXTURE_1D_BIT       (1 << TEXTURE_1D_INDEX)

+/*@}*/

+

+

+/**

+ * TexGenEnabled flags.

+ */

+/*@{*/

+#define S_BIT 1

+#define T_BIT 2

+#define R_BIT 4

+#define Q_BIT 8

+#define STR_BITS (S_BIT | T_BIT | R_BIT)

+/*@}*/

+

+

+/**

+ * Bit flag versions of the corresponding GL_ constants.

+ */

+/*@{*/

+#define TEXGEN_SPHERE_MAP        0x1

+#define TEXGEN_OBJ_LINEAR        0x2

+#define TEXGEN_EYE_LINEAR        0x4

+#define TEXGEN_REFLECTION_MAP_NV 0x8

+#define TEXGEN_NORMAL_MAP_NV     0x10

+

+#define TEXGEN_NEED_NORMALS      (TEXGEN_SPHERE_MAP        | \

+				  TEXGEN_REFLECTION_MAP_NV | \

+				  TEXGEN_NORMAL_MAP_NV)

+#define TEXGEN_NEED_EYE_COORD    (TEXGEN_SPHERE_MAP        | \

+				  TEXGEN_REFLECTION_MAP_NV | \

+				  TEXGEN_NORMAL_MAP_NV     | \

+				  TEXGEN_EYE_LINEAR)

+/*@}*/

+

+

+

+/** Tex-gen enabled for texture unit? */

+#define ENABLE_TEXGEN(unit) (1 << (unit))

+

+/** Non-identity texture matrix for texture unit? */

+#define ENABLE_TEXMAT(unit) (1 << (unit))

+

+

+/**

+ * Texel fetch function prototype.  We use texel fetch functions to

+ * extract RGBA, color indexes and depth components out of 1D, 2D and 3D

+ * texture images.  These functions help to isolate us from the gritty

+ * details of all the various texture image encodings.

+ * 

+ * \param texImage texture image.

+ * \param col texel column.

+ * \param row texel row.

+ * \param img texel image level/layer.

+ * \param texelOut output texel (up to 4 GLchans)

+ */

+typedef void (*FetchTexelFuncC)( const struct gl_texture_image *texImage,

+                                 GLint col, GLint row, GLint img,

+                                 GLchan *texelOut );

+

+/**

+ * As above, but returns floats.

+ * Used for depth component images and for upcoming signed/float

+ * texture images.

+ */

+typedef void (*FetchTexelFuncF)( const struct gl_texture_image *texImage,

+                                 GLint col, GLint row, GLint img,

+                                 GLfloat *texelOut );

+

+

+typedef void (*StoreTexelFunc)(struct gl_texture_image *texImage,

+                               GLint col, GLint row, GLint img,

+                               const void *texel);

+

+

+/**

+ * Texture image state.  Describes the dimensions of a texture image,

+ * the texel format and pointers to Texel Fetch functions.

+ */

+struct gl_texture_image

+{

+   GLint InternalFormat;	/**< Internal format as given by the user */

+   GLenum _BaseFormat;		/**< Either GL_RGB, GL_RGBA, GL_ALPHA,

+				 *   GL_LUMINANCE, GL_LUMINANCE_ALPHA,

+				 *   GL_INTENSITY, GL_COLOR_INDEX,

+				 *   GL_DEPTH_COMPONENT or GL_DEPTH_STENCIL_EXT

+                                 *   only. Used for choosing TexEnv arithmetic.

+				 */

+   GLuint TexFormat;            /**< The actual format: MESA_FORMAT_x */

+

+   GLuint Border;		/**< 0 or 1 */

+   GLuint Width;		/**< = 2^WidthLog2 + 2*Border */

+   GLuint Height;		/**< = 2^HeightLog2 + 2*Border */

+   GLuint Depth;		/**< = 2^DepthLog2 + 2*Border */

+   GLuint Width2;		/**< = Width - 2*Border */

+   GLuint Height2;		/**< = Height - 2*Border */

+   GLuint Depth2;		/**< = Depth - 2*Border */

+   GLuint WidthLog2;		/**< = log2(Width2) */

+   GLuint HeightLog2;		/**< = log2(Height2) */

+   GLuint DepthLog2;		/**< = log2(Depth2) */

+   GLuint MaxLog2;		/**< = MAX(WidthLog2, HeightLog2) */

+   GLfloat WidthScale;		/**< used for mipmap LOD computation */

+   GLfloat HeightScale;		/**< used for mipmap LOD computation */

+   GLfloat DepthScale;		/**< used for mipmap LOD computation */

+   GLboolean IsClientData;	/**< Data owned by client? */

+   GLboolean _IsPowerOfTwo;	/**< Are all dimensions powers of two? */

+

+   struct gl_texture_object *TexObject;  /**< Pointer back to parent object */

+

+   FetchTexelFuncC FetchTexelc;	/**< GLchan texel fetch function pointer */

+   FetchTexelFuncF FetchTexelf;	/**< Float texel fetch function pointer */

+

+   GLuint RowStride;		/**< Padded width in units of texels */

+   GLuint *ImageOffsets;        /**< if 3D texture: array [Depth] of offsets to

+                                     each 2D slice in 'Data', in texels */

+   GLvoid *Data;		/**< Image data, accessed via FetchTexel() */

+

+   /**

+    * \name For device driver:

+    */

+   /*@{*/

+   void *DriverData;		/**< Arbitrary device driver data */

+   /*@}*/

+};

+

+

+/**

+ * Indexes for cube map faces.

+ */

+typedef enum

+{

+   FACE_POS_X = 0,

+   FACE_NEG_X = 1,

+   FACE_POS_Y = 2,

+   FACE_NEG_Y = 3,

+   FACE_POS_Z = 4,

+   FACE_NEG_Z = 5,

+   MAX_FACES = 6

+} gl_face_index;

+

+

+/**

+ * Texture object state.  Contains the array of mipmap images, border color,

+ * wrap modes, filter modes, shadow/texcompare state, and the per-texture

+ * color palette.

+ */

+struct gl_texture_object

+{

+   _glthread_Mutex Mutex;	/**< for thread safety */

+   GLint RefCount;		/**< reference count */

+   GLuint Name;			/**< the user-visible texture object ID */

+   GLenum Target;               /**< GL_TEXTURE_1D, GL_TEXTURE_2D, etc. */

+   GLfloat Priority;		/**< in [0,1] */

+   union {

+      GLfloat f[4];

+      GLuint ui[4];

+      GLint i[4];

+   } BorderColor;               /**< Interpreted according to texture format */

+   GLenum WrapS;		/**< S-axis texture image wrap mode */

+   GLenum WrapT;		/**< T-axis texture image wrap mode */

+   GLenum WrapR;		/**< R-axis texture image wrap mode */

+   GLenum MinFilter;		/**< minification filter */

+   GLenum MagFilter;		/**< magnification filter */

+   GLfloat MinLod;		/**< min lambda, OpenGL 1.2 */

+   GLfloat MaxLod;		/**< max lambda, OpenGL 1.2 */

+   GLfloat LodBias;		/**< OpenGL 1.4 */

+   GLint BaseLevel;		/**< min mipmap level, OpenGL 1.2 */

+   GLint MaxLevel;		/**< max mipmap level, OpenGL 1.2 */

+   GLfloat MaxAnisotropy;	/**< GL_EXT_texture_filter_anisotropic */

+   GLenum CompareMode;		/**< GL_ARB_shadow */

+   GLenum CompareFunc;		/**< GL_ARB_shadow */

+   GLfloat CompareFailValue;    /**< GL_ARB_shadow_ambient */

+   GLenum DepthMode;		/**< GL_ARB_depth_texture */

+   GLint _MaxLevel;		/**< actual max mipmap level (q in the spec) */

+   GLfloat _MaxLambda;		/**< = _MaxLevel - BaseLevel (q - b in spec) */

+   GLint CropRect[4];           /**< GL_OES_draw_texture */

+   GLenum Swizzle[4];           /**< GL_EXT_texture_swizzle */

+   GLuint _Swizzle;             /**< same as Swizzle, but SWIZZLE_* format */

+   GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */

+   GLboolean _Complete;		/**< Is texture object complete? */

+   GLboolean _RenderToTexture;  /**< Any rendering to this texture? */

+   GLboolean Purgeable;         /**< Is the buffer purgeable under memory pressure? */

+

+   /** Actual texture images, indexed by [cube face] and [mipmap level] */

+   struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS];

+

+   /** GL_EXT_paletted_texture */

+   struct gl_color_table Palette;

+

+   /**

+    * \name For device driver.

+    * Note: instead of attaching driver data to this pointer, it's preferable

+    * to instead use this struct as a base class for your own texture object

+    * class.  Driver->NewTextureObject() can be used to implement the

+    * allocation.

+    */

+   void *DriverData;	/**< Arbitrary device driver data */

+};

+

+

+/** Up to four combiner sources are possible with GL_NV_texture_env_combine4 */

+#define MAX_COMBINER_TERMS 4

+

+

+/**

+ * Texture combine environment state.

+ */

+struct gl_tex_env_combine_state

+{

+   GLenum ModeRGB;       /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */

+   GLenum ModeA;         /**< GL_REPLACE, GL_DECAL, GL_ADD, etc. */

+   /** Source terms: GL_PRIMARY_COLOR, GL_TEXTURE, etc */

+   GLenum SourceRGB[MAX_COMBINER_TERMS];

+   GLenum SourceA[MAX_COMBINER_TERMS];

+   /** Source operands: GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, etc */

+   GLenum OperandRGB[MAX_COMBINER_TERMS];

+   GLenum OperandA[MAX_COMBINER_TERMS];

+   GLuint ScaleShiftRGB; /**< 0, 1 or 2 */

+   GLuint ScaleShiftA;   /**< 0, 1 or 2 */

+   GLuint _NumArgsRGB;   /**< Number of inputs used for the RGB combiner */

+   GLuint _NumArgsA;     /**< Number of inputs used for the A combiner */

+};

+

+

+/**

+ * Texture coord generation state.

+ */

+struct gl_texgen

+{

+   GLenum Mode;         /**< GL_EYE_LINEAR, GL_SPHERE_MAP, etc */

+   GLbitfield _ModeBit; /**< TEXGEN_x bit corresponding to Mode */

+   GLfloat ObjectPlane[4];

+   GLfloat EyePlane[4];

+};

+

+

+/**

+ * Texture unit state.  Contains enable flags, texture environment/function/

+ * combiners, texgen state, pointers to current texture objects and

+ * post-filter color tables.

+ */

+struct gl_texture_unit

+{

+   GLbitfield Enabled;          /**< bitmask of TEXTURE_*_BIT flags */

+   GLbitfield _ReallyEnabled;   /**< 0 or exactly one of TEXTURE_*_BIT flags */

+

+   GLenum EnvMode;              /**< GL_MODULATE, GL_DECAL, GL_BLEND, etc. */

+   GLfloat EnvColor[4];

+

+   struct gl_texgen GenS;

+   struct gl_texgen GenT;

+   struct gl_texgen GenR;

+   struct gl_texgen GenQ;

+   GLbitfield TexGenEnabled;	/**< Bitwise-OR of [STRQ]_BIT values */

+   GLbitfield _GenFlags;	/**< Bitwise-OR of Gen[STRQ]._ModeBit */

+

+   GLfloat LodBias;		/**< for biasing mipmap levels */

+   GLenum BumpTarget;

+   GLfloat RotMatrix[4]; /* 2x2 matrix */

+

+   /** 

+    * \name GL_EXT_texture_env_combine 

+    */

+   struct gl_tex_env_combine_state Combine;

+

+   /**

+    * Derived state based on \c EnvMode and the \c BaseFormat of the

+    * currently enabled texture.

+    */

+   struct gl_tex_env_combine_state _EnvMode;

+

+   /**

+    * Currently enabled combiner state.  This will point to either

+    * \c Combine or \c _EnvMode.

+    */

+   struct gl_tex_env_combine_state *_CurrentCombine;

+

+   /** Current texture object pointers */

+   struct gl_texture_object *CurrentTex[NUM_TEXTURE_TARGETS];

+

+   /** Points to highest priority, complete and enabled texture object */

+   struct gl_texture_object *_Current;

+

+   /** GL_SGI_texture_color_table */

+   /*@{*/

+   struct gl_color_table ColorTable;

+   struct gl_color_table ProxyColorTable;

+   GLboolean ColorTableEnabled;

+   /*@}*/

+};

+

+

+/**

+ * Texture attribute group (GL_TEXTURE_BIT).

+ */

+struct gl_texture_attrib

+{

+   GLuint CurrentUnit;   /**< GL_ACTIVE_TEXTURE */

+   struct gl_texture_unit Unit[MAX_COMBINED_TEXTURE_IMAGE_UNITS];

+

+   struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];

+

+   /** GL_ARB_seamless_cubemap */

+   GLboolean CubeMapSeamless;

+

+   /** GL_EXT_shared_texture_palette */

+   GLboolean SharedPalette;

+   struct gl_color_table Palette;

+

+   /** Texture units/samplers used by vertex or fragment texturing */

+   GLbitfield _EnabledUnits;

+

+   /** Texture coord units/sets used for fragment texturing */

+   GLbitfield _EnabledCoordUnits;

+

+   /** Texture coord units that have texgen enabled */

+   GLbitfield _TexGenEnabled;

+

+   /** Texture coord units that have non-identity matrices */

+   GLbitfield _TexMatEnabled;

+

+   /** Bitwise-OR of all Texture.Unit[i]._GenFlags */

+   GLbitfield _GenFlags;

+};

+

+

+/**

+ * Transformation attribute group (GL_TRANSFORM_BIT).

+ */

+struct gl_transform_attrib

+{

+   GLenum MatrixMode;				/**< Matrix mode */

+   GLfloat EyeUserPlane[MAX_CLIP_PLANES][4];	/**< User clip planes */

+   GLfloat _ClipUserPlane[MAX_CLIP_PLANES][4];	/**< derived */

+   GLbitfield ClipPlanesEnabled;                /**< on/off bitmask */

+   GLboolean Normalize;				/**< Normalize all normals? */

+   GLboolean RescaleNormals;			/**< GL_EXT_rescale_normal */

+   GLboolean RasterPositionUnclipped;           /**< GL_IBM_rasterpos_clip */

+   GLboolean DepthClamp;			/**< GL_ARB_depth_clamp */

+

+   GLfloat CullEyePos[4];

+   GLfloat CullObjPos[4];

+};

+

+

+/**

+ * Viewport attribute group (GL_VIEWPORT_BIT).

+ */

+struct gl_viewport_attrib

+{

+   GLint X, Y;			/**< position */

+   GLsizei Width, Height;	/**< size */

+   GLfloat Near, Far;		/**< Depth buffer range */

+   GLmatrix _WindowMap;		/**< Mapping transformation as a matrix. */

+};

+

+

+/**

+ * GL_ARB_vertex/pixel_buffer_object buffer object

+ */

+struct gl_buffer_object

+{

+   _glthread_Mutex Mutex;

+   GLint RefCount;

+   GLuint Name;

+   GLenum Usage;        /**< GL_STREAM_DRAW_ARB, GL_STREAM_READ_ARB, etc. */

+   GLsizeiptrARB Size;  /**< Size of buffer storage in bytes */

+   GLubyte *Data;       /**< Location of storage either in RAM or VRAM. */

+   /** Fields describing a mapped buffer */

+   /*@{*/

+   GLbitfield AccessFlags; /**< Mask of GL_MAP_x_BIT flags */

+   GLvoid *Pointer;     /**< User-space address of mapping */

+   GLintptr Offset;     /**< Mapped offset */

+   GLsizeiptr Length;   /**< Mapped length */

+   /*@}*/

+   GLboolean Written;   /**< Ever written to? (for debugging) */

+   GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */

+};

+

+

+/**

+ * Client pixel packing/unpacking attributes

+ */

+struct gl_pixelstore_attrib

+{

+   GLint Alignment;

+   GLint RowLength;

+   GLint SkipPixels;

+   GLint SkipRows;

+   GLint ImageHeight;

+   GLint SkipImages;

+   GLboolean SwapBytes;

+   GLboolean LsbFirst;

+   GLboolean ClientStorage; /**< GL_APPLE_client_storage */

+   GLboolean Invert;        /**< GL_MESA_pack_invert */

+   struct gl_buffer_object *BufferObj; /**< GL_ARB_pixel_buffer_object */

+};

+

+

+/**

+ * Client vertex array attributes

+ */

+struct gl_client_array

+{

+   GLint Size;                  /**< components per element (1,2,3,4) */

+   GLenum Type;                 /**< datatype: GL_FLOAT, GL_INT, etc */

+   GLenum Format;               /**< default: GL_RGBA, but may be GL_BGRA */

+   GLsizei Stride;		/**< user-specified stride */

+   GLsizei StrideB;		/**< actual stride in bytes */

+   const GLubyte *Ptr;          /**< Points to array data */

+   GLboolean Enabled;		/**< Enabled flag is a boolean */

+   GLboolean Normalized;        /**< GL_ARB_vertex_program */

+   GLboolean Integer;           /**< Integer-valued? */

+   GLuint _ElementSize;         /**< size of each element in bytes */

+

+   struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */

+   GLuint _MaxElement;          /**< max element index into array buffer + 1 */

+};

+

+

+/**

+ * Collection of vertex arrays.  Defined by the GL_APPLE_vertex_array_object

+ * extension, but a nice encapsulation in any case.

+ */

+struct gl_array_object

+{

+   /** Name of the array object as received from glGenVertexArrayAPPLE. */

+   GLuint Name;

+

+   GLint RefCount;

+   _glthread_Mutex Mutex;

+   GLboolean VBOonly;  /**< require all arrays to live in VBOs? */

+

+   /** Conventional vertex arrays */

+   /*@{*/

+   struct gl_client_array Vertex;

+   struct gl_client_array Weight;

+   struct gl_client_array Normal;

+   struct gl_client_array Color;

+   struct gl_client_array SecondaryColor;

+   struct gl_client_array FogCoord;

+   struct gl_client_array Index;

+   struct gl_client_array EdgeFlag;

+   struct gl_client_array TexCoord[MAX_TEXTURE_COORD_UNITS];

+   struct gl_client_array PointSize;

+   /*@}*/

+

+   /**

+    * Generic arrays for vertex programs/shaders.

+    * For NV vertex programs, these attributes alias and take priority

+    * over the conventional attribs above.  For ARB vertex programs and

+    * GLSL vertex shaders, these attributes are separate.

+    */

+   struct gl_client_array VertexAttrib[MAX_VERTEX_GENERIC_ATTRIBS];

+

+   /** Mask of _NEW_ARRAY_* values indicating which arrays are enabled */

+   GLbitfield _Enabled;

+

+   /**

+    * Min of all enabled arrays' _MaxElement.  When arrays reside inside VBOs

+    * we can determine the max legal (in bounds) glDrawElements array index.

+    */

+   GLuint _MaxElement;

+};

+

+

+/**

+ * Vertex array state

+ */

+struct gl_array_attrib

+{

+   /** Currently bound array object. See _mesa_BindVertexArrayAPPLE() */

+   struct gl_array_object *ArrayObj;

+

+   /** The default vertex array object */

+   struct gl_array_object *DefaultArrayObj;

+

+   /** Array objects (GL_ARB/APPLE_vertex_array_object) */

+   struct _mesa_HashTable *Objects;

+

+   GLint ActiveTexture;		/**< Client Active Texture */

+   GLuint LockFirst;            /**< GL_EXT_compiled_vertex_array */

+   GLuint LockCount;            /**< GL_EXT_compiled_vertex_array */

+

+   /** GL 3.1 (slightly different from GL_NV_primitive_restart) */

+   GLboolean PrimitiveRestart;

+   GLuint RestartIndex;

+

+   GLbitfield NewState;		/**< mask of _NEW_ARRAY_* values */

+

+   /* GL_ARB_vertex_buffer_object */

+   struct gl_buffer_object *ArrayBufferObj;

+   struct gl_buffer_object *ElementArrayBufferObj;

+};

+

+

+/**

+ * Feedback buffer state

+ */

+struct gl_feedback

+{

+   GLenum Type;

+   GLbitfield _Mask;    /**< FB_* bits */

+   GLfloat *Buffer;

+   GLuint BufferSize;

+   GLuint Count;

+};

+

+

+/**

+ * Selection buffer state

+ */

+struct gl_selection

+{

+   GLuint *Buffer;	/**< selection buffer */

+   GLuint BufferSize;	/**< size of the selection buffer */

+   GLuint BufferCount;	/**< number of values in the selection buffer */

+   GLuint Hits;		/**< number of records in the selection buffer */

+   GLuint NameStackDepth; /**< name stack depth */

+   GLuint NameStack[MAX_NAME_STACK_DEPTH]; /**< name stack */

+   GLboolean HitFlag;	/**< hit flag */

+   GLfloat HitMinZ;	/**< minimum hit depth */

+   GLfloat HitMaxZ;	/**< maximum hit depth */

+};

+

+

+/**

+ * 1-D Evaluator control points

+ */

+struct gl_1d_map

+{

+   GLuint Order;	/**< Number of control points */

+   GLfloat u1, u2, du;	/**< u1, u2, 1.0/(u2-u1) */

+   GLfloat *Points;	/**< Points to contiguous control points */

+};

+

+

+/**

+ * 2-D Evaluator control points

+ */

+struct gl_2d_map

+{

+   GLuint Uorder;		/**< Number of control points in U dimension */

+   GLuint Vorder;		/**< Number of control points in V dimension */

+   GLfloat u1, u2, du;

+   GLfloat v1, v2, dv;

+   GLfloat *Points;		/**< Points to contiguous control points */

+};

+

+

+/**

+ * All evaluator control point state

+ */

+struct gl_evaluators

+{

+   /** 

+    * \name 1-D maps

+    */

+   /*@{*/

+   struct gl_1d_map Map1Vertex3;

+   struct gl_1d_map Map1Vertex4;

+   struct gl_1d_map Map1Index;

+   struct gl_1d_map Map1Color4;

+   struct gl_1d_map Map1Normal;

+   struct gl_1d_map Map1Texture1;

+   struct gl_1d_map Map1Texture2;

+   struct gl_1d_map Map1Texture3;

+   struct gl_1d_map Map1Texture4;

+   struct gl_1d_map Map1Attrib[16];  /**< GL_NV_vertex_program */

+   /*@}*/

+

+   /** 

+    * \name 2-D maps 

+    */

+   /*@{*/

+   struct gl_2d_map Map2Vertex3;

+   struct gl_2d_map Map2Vertex4;

+   struct gl_2d_map Map2Index;

+   struct gl_2d_map Map2Color4;

+   struct gl_2d_map Map2Normal;

+   struct gl_2d_map Map2Texture1;

+   struct gl_2d_map Map2Texture2;

+   struct gl_2d_map Map2Texture3;

+   struct gl_2d_map Map2Texture4;

+   struct gl_2d_map Map2Attrib[16];  /**< GL_NV_vertex_program */

+   /*@}*/

+};

+

+

+/**

+ * Names of the various vertex/fragment program register files, etc.

+ *

+ * NOTE: first four tokens must fit into 2 bits (see t_vb_arbprogram.c)

+ * All values should fit in a 4-bit field.

+ *

+ * NOTE: PROGRAM_ENV_PARAM, PROGRAM_STATE_VAR, PROGRAM_NAMED_PARAM,

+ * PROGRAM_CONSTANT, and PROGRAM_UNIFORM can all be considered to

+ * be "uniform" variables since they can only be set outside glBegin/End.

+ * They're also all stored in the same Parameters array.

+ */

+typedef enum

+{

+   PROGRAM_TEMPORARY,   /**< machine->Temporary[] */

+   PROGRAM_INPUT,       /**< machine->Inputs[] */

+   PROGRAM_OUTPUT,      /**< machine->Outputs[] */

+   PROGRAM_VARYING,     /**< machine->Inputs[]/Outputs[] */

+   PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */

+   PROGRAM_ENV_PARAM,   /**< gl_program->Parameters[] */

+   PROGRAM_STATE_VAR,   /**< gl_program->Parameters[] */

+   PROGRAM_NAMED_PARAM, /**< gl_program->Parameters[] */

+   PROGRAM_CONSTANT,    /**< gl_program->Parameters[] */

+   PROGRAM_UNIFORM,     /**< gl_program->Parameters[] */

+   PROGRAM_WRITE_ONLY,  /**< A dummy, write-only register */

+   PROGRAM_ADDRESS,     /**< machine->AddressReg */

+   PROGRAM_SAMPLER,     /**< for shader samplers, compile-time only */

+   PROGRAM_UNDEFINED,   /**< Invalid/TBD value */

+   PROGRAM_FILE_MAX

+} gl_register_file;

+

+

+/** Vertex and fragment instructions */

+struct prog_instruction;

+struct gl_program_parameter_list;

+struct gl_uniform_list;

+

+

+/**

+ * Base class for any kind of program object

+ */

+struct gl_program

+{

+   GLuint Id;

+   GLubyte *String;  /**< Null-terminated program text */

+   GLint RefCount;

+   GLenum Target;    /**< GL_VERTEX/FRAGMENT_PROGRAM_ARB, GL_FRAGMENT_PROGRAM_NV */

+   GLenum Format;    /**< String encoding format */

+   GLboolean Resident;

+

+   struct prog_instruction *Instructions;

+

+   GLbitfield InputsRead;     /**< Bitmask of which input regs are read */

+   GLbitfield64 OutputsWritten; /**< Bitmask of which output regs are written */

+   GLbitfield InputFlags[MAX_PROGRAM_INPUTS];   /**< PROG_PARAM_BIT_x flags */

+   GLbitfield OutputFlags[MAX_PROGRAM_OUTPUTS]; /**< PROG_PARAM_BIT_x flags */

+   GLbitfield TexturesUsed[MAX_TEXTURE_UNITS];  /**< TEXTURE_x_BIT bitmask */

+   GLbitfield SamplersUsed;   /**< Bitfield of which samplers are used */

+   GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */

+

+

+   /** Named parameters, constants, etc. from program text */

+   struct gl_program_parameter_list *Parameters;

+   /** Numbered local parameters */

+   GLfloat LocalParams[MAX_PROGRAM_LOCAL_PARAMS][4];

+

+   /** Vertex/fragment shader varying vars */

+   struct gl_program_parameter_list *Varying;

+   /** Vertex program user-defined attributes */

+   struct gl_program_parameter_list *Attributes;

+

+   /** Map from sampler unit to texture unit (set by glUniform1i()) */

+   GLubyte SamplerUnits[MAX_SAMPLERS];

+   /** Which texture target is being sampled (TEXTURE_1D/2D/3D/etc_INDEX) */

+   gl_texture_index SamplerTargets[MAX_SAMPLERS];

+

+   /** Bitmask of which register files are read/written with indirect

+    * addressing.  Mask of (1 << PROGRAM_x) bits.

+    */

+   GLbitfield IndirectRegisterFiles;

+

+   /** Logical counts */

+   /*@{*/

+   GLuint NumInstructions;

+   GLuint NumTemporaries;

+   GLuint NumParameters;

+   GLuint NumAttributes;

+   GLuint NumAddressRegs;

+   GLuint NumAluInstructions;

+   GLuint NumTexInstructions;

+   GLuint NumTexIndirections;

+   /*@}*/

+   /** Native, actual h/w counts */

+   /*@{*/

+   GLuint NumNativeInstructions;

+   GLuint NumNativeTemporaries;

+   GLuint NumNativeParameters;

+   GLuint NumNativeAttributes;

+   GLuint NumNativeAddressRegs;

+   GLuint NumNativeAluInstructions;

+   GLuint NumNativeTexInstructions;

+   GLuint NumNativeTexIndirections;

+   /*@}*/

+};

+

+

+/** Vertex program object */

+struct gl_vertex_program

+{

+   struct gl_program Base;   /**< base class */

+   GLboolean IsNVProgram;    /**< is this a GL_NV_vertex_program program? */

+   GLboolean IsPositionInvariant;

+};

+

+

+/** Geometry program object */

+struct gl_geometry_program

+{

+   struct gl_program Base;   /**< base class */

+

+   GLint VerticesOut;

+   GLenum InputType;  /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,

+                           GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */

+   GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */

+};

+

+

+/** Fragment program object */

+struct gl_fragment_program

+{

+   struct gl_program Base;   /**< base class */

+   GLenum FogOption;

+   GLboolean UsesKill;          /**< shader uses KIL instruction */

+   GLboolean OriginUpperLeft;

+   GLboolean PixelCenterInteger;

+};

+

+

+/**

+ * State common to vertex and fragment programs.

+ */

+struct gl_program_state

+{

+   GLint ErrorPos;                       /* GL_PROGRAM_ERROR_POSITION_ARB/NV */

+   const char *ErrorString;              /* GL_PROGRAM_ERROR_STRING_ARB/NV */

+};

+

+

+/**

+ * Context state for vertex programs.

+ */

+struct gl_vertex_program_state

+{

+   GLboolean Enabled;            /**< User-set GL_VERTEX_PROGRAM_ARB/NV flag */

+   GLboolean _Enabled;           /**< Enabled and _valid_ user program? */

+   GLboolean PointSizeEnabled;   /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */

+   GLboolean TwoSideEnabled;     /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */

+   struct gl_vertex_program *Current;  /**< User-bound vertex program */

+

+   /** Currently enabled and valid vertex program (including internal

+    * programs, user-defined vertex programs and GLSL vertex shaders).

+    * This is the program we must use when rendering.

+    */

+   struct gl_vertex_program *_Current;

+

+   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */

+

+   /* For GL_NV_vertex_program only: */

+   GLenum TrackMatrix[MAX_PROGRAM_ENV_PARAMS / 4];

+   GLenum TrackMatrixTransform[MAX_PROGRAM_ENV_PARAMS / 4];

+

+   /** Should fixed-function T&L be implemented with a vertex prog? */

+   GLboolean _MaintainTnlProgram;

+

+   /** Program to emulate fixed-function T&L (see above) */

+   struct gl_vertex_program *_TnlProgram;

+

+   /** Cache of fixed-function programs */

+   struct gl_program_cache *Cache;

+

+   GLboolean _Overriden;

+};

+

+

+/**

+ * Context state for geometry programs.

+ */

+struct gl_geometry_program_state

+{

+   GLboolean Enabled;               /**< GL_ARB_GEOMETRY_SHADER4 */

+   GLboolean _Enabled;              /**< Enabled and valid program? */

+   struct gl_geometry_program *Current;  /**< user-bound geometry program */

+

+   /** Currently enabled and valid program (including internal programs

+    * and compiled shader programs).

+    */

+   struct gl_geometry_program *_Current;

+

+   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */

+

+   /** Cache of fixed-function programs */

+   struct gl_program_cache *Cache;

+};

+

+/**

+ * Context state for fragment programs.

+ */

+struct gl_fragment_program_state

+{

+   GLboolean Enabled;     /**< User-set fragment program enable flag */

+   GLboolean _Enabled;    /**< Enabled and _valid_ user program? */

+   struct gl_fragment_program *Current;  /**< User-bound fragment program */

+

+   /** Currently enabled and valid fragment program (including internal

+    * programs, user-defined fragment programs and GLSL fragment shaders).

+    * This is the program we must use when rendering.

+    */

+   struct gl_fragment_program *_Current;

+

+   GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */

+

+   /** Should fixed-function texturing be implemented with a fragment prog? */

+   GLboolean _MaintainTexEnvProgram;

+

+   /** Program to emulate fixed-function texture env/combine (see above) */

+   struct gl_fragment_program *_TexEnvProgram;

+

+   /** Cache of fixed-function programs */

+   struct gl_program_cache *Cache;

+};

+

+

+/**

+ * ATI_fragment_shader runtime state

+ */

+#define ATI_FS_INPUT_PRIMARY 0

+#define ATI_FS_INPUT_SECONDARY 1

+

+struct atifs_instruction;

+struct atifs_setupinst;

+

+/**

+ * ATI fragment shader

+ */

+struct ati_fragment_shader

+{

+   GLuint Id;

+   GLint RefCount;

+   struct atifs_instruction *Instructions[2];

+   struct atifs_setupinst *SetupInst[2];

+   GLfloat Constants[8][4];

+   GLbitfield LocalConstDef;  /**< Indicates which constants have been set */

+   GLubyte numArithInstr[2];

+   GLubyte regsAssigned[2];

+   GLubyte NumPasses;         /**< 1 or 2 */

+   GLubyte cur_pass;

+   GLubyte last_optype;

+   GLboolean interpinp1;

+   GLboolean isValid;

+   GLuint swizzlerq;

+};

+

+/**

+ * Context state for GL_ATI_fragment_shader

+ */

+struct gl_ati_fragment_shader_state

+{

+   GLboolean Enabled;

+   GLboolean _Enabled;                  /**< enabled and valid shader? */

+   GLboolean Compiling;

+   GLfloat GlobalConstants[8][4];

+   struct ati_fragment_shader *Current;

+};

+

+

+/**

+ * Occlusion/timer query object.

+ */

+struct gl_query_object

+{

+   GLenum Target;      /**< The query target, when active */

+   GLuint Id;          /**< hash table ID/name */

+   GLuint64EXT Result; /**< the counter */

+   GLboolean Active;   /**< inside Begin/EndQuery */

+   GLboolean Ready;    /**< result is ready? */

+};

+

+

+/**

+ * Context state for query objects.

+ */

+struct gl_query_state

+{

+   struct _mesa_HashTable *QueryObjects;

+   struct gl_query_object *CurrentOcclusionObject; /* GL_ARB_occlusion_query */

+   struct gl_query_object *CurrentTimerObject;     /* GL_EXT_timer_query */

+

+   /** GL_NV_conditional_render */

+   struct gl_query_object *CondRenderQuery;

+

+   /** GL_EXT_transform_feedback */

+   struct gl_query_object *PrimitivesGenerated;

+   struct gl_query_object *PrimitivesWritten;

+

+   /** GL_ARB_timer_query */

+   struct gl_query_object *TimeElapsed;

+

+   GLenum CondRenderMode;

+};

+

+

+/** Sync object state */

+struct gl_sync_object {

+   struct simple_node link;

+   GLenum Type;               /**< GL_SYNC_FENCE */

+   GLuint Name;               /**< Fence name */

+   GLint RefCount;            /**< Reference count */

+   GLboolean DeletePending;   /**< Object was deleted while there were still

+			       * live references (e.g., sync not yet finished)

+			       */

+   GLenum SyncCondition;

+   GLbitfield Flags;          /**< Flags passed to glFenceSync */

+   GLuint StatusFlag:1;       /**< Has the sync object been signaled? */

+};

+

+

+/** Set by #pragma directives */

+struct gl_sl_pragmas

+{

+   GLboolean IgnoreOptimize;  /**< ignore #pragma optimize(on/off) ? */

+   GLboolean IgnoreDebug;     /**< ignore #pragma debug(on/off) ? */

+   GLboolean Optimize;  /**< defaults on */

+   GLboolean Debug;     /**< defaults off */

+};

+

+

+/**

+ * A GLSL vertex or fragment shader object.

+ */

+struct gl_shader

+{

+   GLenum Type;  /**< GL_FRAGMENT_SHADER || GL_VERTEX_SHADER || GL_GEOMETRY_SHADER_ARB (first field!) */

+   GLuint Name;  /**< AKA the handle */

+   GLint RefCount;  /**< Reference count */

+   GLboolean DeletePending;

+   GLboolean CompileStatus;

+   GLboolean Main;  /**< shader defines main() */

+   GLboolean UnresolvedRefs;

+   const GLchar *Source;  /**< Source code string */

+   GLuint SourceChecksum;       /**< for debug/logging purposes */

+   struct gl_program *Program;  /**< Post-compile assembly code */

+   GLchar *InfoLog;

+   struct gl_sl_pragmas Pragmas;

+

+   unsigned Version;       /**< GLSL version used for linking */

+

+   struct exec_list *ir;

+   struct glsl_symbol_table *symbols;

+

+   /** Shaders containing built-in functions that are used for linking. */

+   struct gl_shader *builtins_to_link[16];

+   unsigned num_builtins_to_link;

+};

+

+

+/**

+ * A GLSL program object.

+ * Basically a linked collection of vertex and fragment shaders.

+ */

+struct gl_shader_program

+{

+   GLenum Type;  /**< Always GL_SHADER_PROGRAM (internal token) */

+   GLuint Name;  /**< aka handle or ID */

+   GLint RefCount;  /**< Reference count */

+   GLboolean DeletePending;

+

+   GLuint NumShaders;          /**< number of attached shaders */

+   struct gl_shader **Shaders; /**< List of attached the shaders */

+

+   /** User-defined attribute bindings (glBindAttribLocation) */

+   struct gl_program_parameter_list *Attributes;

+

+   /** Transform feedback varyings */

+   struct {

+      GLenum BufferMode;

+      GLuint NumVarying;

+      GLchar **VaryingNames;  /**< Array [NumVarying] of char * */

+   } TransformFeedback;

+

+   /** Geometry shader state - copied into gl_geometry_program at link time */

+   struct {

+      GLint VerticesOut;

+      GLenum InputType;  /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,

+                              GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */

+      GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */

+   } Geom;

+

+   /* post-link info: */

+   struct gl_vertex_program *VertexProgram;     /**< Linked vertex program */

+   struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */

+   struct gl_geometry_program *GeometryProgram; /**< Linked geometry prog */

+   struct gl_uniform_list *Uniforms;

+   struct gl_program_parameter_list *Varying;

+   GLboolean LinkStatus;   /**< GL_LINK_STATUS */

+   GLboolean Validated;

+   GLboolean _Used;        /**< Ever used for drawing? */

+   GLchar *InfoLog;

+

+   unsigned Version;       /**< GLSL version used for linking */

+

+   /**

+    * Per-stage shaders resulting from the first stage of linking.

+    *

+    * Set of linked shaders for this program.  The array is accessed using the

+    * \c MESA_SHADER_* defines.  Entries for non-existent stages will be

+    * \c NULL.

+    */

+   struct gl_shader *_LinkedShaders[MESA_SHADER_TYPES];

+};   

+

+

+#define GLSL_DUMP      0x1  /**< Dump shaders to stdout */

+#define GLSL_LOG       0x2  /**< Write shaders to files */

+#define GLSL_OPT       0x4  /**< Force optimizations (override pragmas) */

+#define GLSL_NO_OPT    0x8  /**< Force no optimizations (override pragmas) */

+#define GLSL_UNIFORMS 0x10  /**< Print glUniform calls */

+#define GLSL_NOP_VERT 0x20  /**< Force no-op vertex shaders */

+#define GLSL_NOP_FRAG 0x40  /**< Force no-op fragment shaders */

+#define GLSL_USE_PROG 0x80  /**< Log glUseProgram calls */

+

+

+/**

+ * Context state for GLSL vertex/fragment shaders.

+ */

+struct gl_shader_state

+{

+   /**

+    * Programs used for rendering

+    *

+    * There is a separate program set for each shader stage.  If

+    * GL_EXT_separate_shader_objects is not supported, each of these must point

+    * to \c NULL or to the same program.

+    */

+   struct gl_shader_program *CurrentVertexProgram;

+   struct gl_shader_program *CurrentGeometryProgram;

+   struct gl_shader_program *CurrentFragmentProgram;

+

+   /**

+    * Program used by glUniform calls.

+    *

+    * Explicitly set by \c glUseProgram and \c glActiveProgramEXT.

+    */

+   struct gl_shader_program *ActiveProgram;

+

+   void *MemPool;

+

+   GLbitfield Flags;                    /**< Mask of GLSL_x flags */

+};

+

+/**

+ * Compiler options for a single GLSL shaders type

+ */

+struct gl_shader_compiler_options

+{

+   /** Driver-selectable options: */

+   GLboolean EmitCondCodes;             /**< Use condition codes? */

+   GLboolean EmitNVTempInitialization;  /**< 0-fill NV temp registers */

+   /**

+    * Attempts to flatten all ir_if (OPCODE_IF) for GPUs that can't

+    * support control flow.

+    */

+   GLboolean EmitNoIfs;

+   GLboolean EmitNoLoops;

+   GLboolean EmitNoFunctions;

+   GLboolean EmitNoCont;                  /**< Emit CONT opcode? */

+   GLboolean EmitNoMainReturn;            /**< Emit CONT/RET opcodes? */

+   GLboolean EmitNoNoise;                 /**< Emit NOISE opcodes? */

+   GLboolean EmitNoPow;                   /**< Emit POW opcodes? */

+

+   /**

+    * \name Forms of indirect addressing the driver cannot do.

+    */

+   /*@{*/

+   GLboolean EmitNoIndirectInput;   /**< No indirect addressing of inputs */

+   GLboolean EmitNoIndirectOutput;  /**< No indirect addressing of outputs */

+   GLboolean EmitNoIndirectTemp;    /**< No indirect addressing of temps */

+   GLboolean EmitNoIndirectUniform; /**< No indirect addressing of constants */

+   /*@}*/

+

+   GLuint MaxUnrollIterations;

+

+   struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */

+};

+

+/**

+ * Transform feedback object state

+ */

+struct gl_transform_feedback_object

+{

+   GLuint Name;  /**< AKA the object ID */

+   GLint RefCount;

+   GLboolean Active;  /**< Is transform feedback enabled? */

+   GLboolean Paused;  /**< Is transform feedback paused? */

+

+   /** The feedback buffers */

+   GLuint BufferNames[MAX_FEEDBACK_ATTRIBS];

+   struct gl_buffer_object *Buffers[MAX_FEEDBACK_ATTRIBS];

+

+   /** Start of feedback data in dest buffer */

+   GLintptr Offset[MAX_FEEDBACK_ATTRIBS];

+   /** Max data to put into dest buffer (in bytes) */

+   GLsizeiptr Size[MAX_FEEDBACK_ATTRIBS];

+};

+

+

+/**

+ * Context state for transform feedback.

+ */

+struct gl_transform_feedback

+{

+   GLenum Mode;       /**< GL_POINTS, GL_LINES or GL_TRIANGLES */

+

+   GLboolean RasterDiscard;  /**< GL_RASTERIZER_DISCARD */

+

+   /** The general binding point (GL_TRANSFORM_FEEDBACK_BUFFER) */

+   struct gl_buffer_object *CurrentBuffer;

+

+   /** The table of all transform feedback objects */

+   struct _mesa_HashTable *Objects;

+

+   /** The current xform-fb object (GL_TRANSFORM_FEEDBACK_BINDING) */

+   struct gl_transform_feedback_object *CurrentObject;

+

+   /** The default xform-fb object (Name==0) */

+   struct gl_transform_feedback_object *DefaultObject;

+};

+

+

+

+/**

+ * State which can be shared by multiple contexts:

+ */

+struct gl_shared_state

+{

+   _glthread_Mutex Mutex;		   /**< for thread safety */

+   GLint RefCount;			   /**< Reference count */

+   struct _mesa_HashTable *DisplayList;	   /**< Display lists hash table */

+   struct _mesa_HashTable *TexObjects;	   /**< Texture objects hash table */

+

+   /** Default texture objects (shared by all texture units) */

+   struct gl_texture_object *DefaultTex[NUM_TEXTURE_TARGETS];

+

+   /** Fallback texture used when a bound texture is incomplete */

+   struct gl_texture_object *FallbackTex;

+

+   /**

+    * \name Thread safety and statechange notification for texture

+    * objects. 

+    *

+    * \todo Improve the granularity of locking.

+    */

+   /*@{*/

+   _glthread_Mutex TexMutex;		/**< texobj thread safety */

+   GLuint TextureStateStamp;	        /**< state notification for shared tex */

+   /*@}*/

+

+   /** Default buffer object for vertex arrays that aren't in VBOs */

+   struct gl_buffer_object *NullBufferObj;

+

+   /**

+    * \name Vertex/geometry/fragment programs

+    */

+   /*@{*/

+   struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */

+   struct gl_vertex_program *DefaultVertexProgram;

+   struct gl_fragment_program *DefaultFragmentProgram;

+   struct gl_geometry_program *DefaultGeometryProgram;

+   /*@}*/

+

+   /* GL_ATI_fragment_shader */

+   struct _mesa_HashTable *ATIShaders;

+   struct ati_fragment_shader *DefaultFragmentShader;

+

+   struct _mesa_HashTable *BufferObjects;

+

+   /** Table of both gl_shader and gl_shader_program objects */

+   struct _mesa_HashTable *ShaderObjects;

+

+   /* GL_EXT_framebuffer_object */

+   struct _mesa_HashTable *RenderBuffers;

+   struct _mesa_HashTable *FrameBuffers;

+

+   /* GL_ARB_sync */

+   struct simple_node SyncObjects;

+

+   void *DriverData;  /**< Device driver shared state */

+};

+

+

+

+

+/**

+ * A renderbuffer stores colors or depth values or stencil values.

+ * A framebuffer object will have a collection of these.

+ * Data are read/written to the buffer with a handful of Get/Put functions.

+ *

+ * Instances of this object are allocated with the Driver's NewRenderbuffer

+ * hook.  Drivers will likely wrap this class inside a driver-specific

+ * class to simulate inheritance.

+ */

+struct gl_renderbuffer

+{

+#define RB_MAGIC 0xaabbccdd

+   int Magic; /** XXX TEMPORARY DEBUG INFO */

+   _glthread_Mutex Mutex;		   /**< for thread safety */

+   GLuint ClassID;        /**< Useful for drivers */

+   GLuint Name;

+   GLint RefCount;

+   GLuint Width, Height;

+   GLboolean Purgeable;   /**< Is the buffer purgeable under memory pressure? */

+

+   GLenum InternalFormat; /**< The user-specified format */

+   GLenum _BaseFormat;    /**< Either GL_RGB, GL_RGBA, GL_DEPTH_COMPONENT or

+                               GL_STENCIL_INDEX. */

+   GLuint Format;         /**< The actual format: MESA_FORMAT_x */

+

+   GLubyte NumSamples;

+

+   GLenum DataType;      /**< Type of values passed to the Get/Put functions */

+   GLvoid *Data;        /**< This may not be used by some kinds of RBs */

+

+   /* Used to wrap one renderbuffer around another: */

+   struct gl_renderbuffer *Wrapped;

+

+   /* Delete this renderbuffer */

+   void (*Delete)(struct gl_renderbuffer *rb);

+

+   /* Allocate new storage for this renderbuffer */

+   GLboolean (*AllocStorage)(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                             GLenum internalFormat,

+                             GLuint width, GLuint height);

+

+   /* Lock/Unlock are called before/after calling the Get/Put functions.

+    * Not sure this is the right place for these yet.

+   void (*Lock)(struct gl_context *ctx, struct gl_renderbuffer *rb);

+   void (*Unlock)(struct gl_context *ctx, struct gl_renderbuffer *rb);

+    */

+

+   /* Return a pointer to the element/pixel at (x,y).

+    * Should return NULL if the buffer memory can't be directly addressed.

+    */

+   void *(*GetPointer)(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLint x, GLint y);

+

+   /* Get/Read a row of values.

+    * The values will be of format _BaseFormat and type DataType.

+    */

+   void (*GetRow)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  GLint x, GLint y, void *values);

+

+   /* Get/Read values at arbitrary locations.

+    * The values will be of format _BaseFormat and type DataType.

+    */

+   void (*GetValues)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                     const GLint x[], const GLint y[], void *values);

+

+   /* Put/Write a row of values.

+    * The values will be of format _BaseFormat and type DataType.

+    */

+   void (*PutRow)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                  GLint x, GLint y, const void *values, const GLubyte *mask);

+

+   /* Put/Write a row of RGB values.  This is a special-case routine that's

+    * only used for RGBA renderbuffers when the source data is GL_RGB. That's

+    * a common case for glDrawPixels and some triangle routines.

+    * The values will be of format GL_RGB and type DataType.

+    */

+   void (*PutRowRGB)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                    GLint x, GLint y, const void *values, const GLubyte *mask);

+

+

+   /* Put/Write a row of identical values.

+    * The values will be of format _BaseFormat and type DataType.

+    */

+   void (*PutMonoRow)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                     GLint x, GLint y, const void *value, const GLubyte *mask);

+

+   /* Put/Write values at arbitrary locations.

+    * The values will be of format _BaseFormat and type DataType.

+    */

+   void (*PutValues)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                     const GLint x[], const GLint y[], const void *values,

+                     const GLubyte *mask);

+   /* Put/Write identical values at arbitrary locations.

+    * The values will be of format _BaseFormat and type DataType.

+    */

+   void (*PutMonoValues)(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                         GLuint count, const GLint x[], const GLint y[],

+                         const void *value, const GLubyte *mask);

+};

+

+

+/**

+ * A renderbuffer attachment points to either a texture object (and specifies

+ * a mipmap level, cube face or 3D texture slice) or points to a renderbuffer.

+ */

+struct gl_renderbuffer_attachment

+{

+   GLenum Type;  /**< \c GL_NONE or \c GL_TEXTURE or \c GL_RENDERBUFFER_EXT */

+   GLboolean Complete;

+

+   /**

+    * If \c Type is \c GL_RENDERBUFFER_EXT, this stores a pointer to the

+    * application supplied renderbuffer object.

+    */

+   struct gl_renderbuffer *Renderbuffer;

+

+   /**

+    * If \c Type is \c GL_TEXTURE, this stores a pointer to the application

+    * supplied texture object.

+    */

+   struct gl_texture_object *Texture;

+   GLuint TextureLevel; /**< Attached mipmap level. */

+   GLuint CubeMapFace;  /**< 0 .. 5, for cube map textures. */

+   GLuint Zoffset;      /**< Slice for 3D textures,  or layer for both 1D

+                         * and 2D array textures */

+};

+

+

+/**

+ * A framebuffer is a collection of renderbuffers (color, depth, stencil, etc).

+ * In C++ terms, think of this as a base class from which device drivers

+ * will make derived classes.

+ */

+struct gl_framebuffer

+{

+   _glthread_Mutex Mutex;  /**< for thread safety */

+   /**

+    * If zero, this is a window system framebuffer.  If non-zero, this

+    * is a FBO framebuffer; note that for some devices (i.e. those with

+    * a natural pixel coordinate system for FBOs that differs from the

+    * OpenGL/Mesa coordinate system), this means that the viewport,

+    * polygon face orientation, and polygon stipple will have to be inverted.

+    */

+   GLuint Name;

+

+   GLint RefCount;

+   GLboolean DeletePending;

+

+   /**

+    * The framebuffer's visual. Immutable if this is a window system buffer.

+    * Computed from attachments if user-made FBO.

+    */

+   struct gl_config Visual;

+

+   GLboolean Initialized;

+

+   GLuint Width, Height;	/**< size of frame buffer in pixels */

+

+   /** \name  Drawing bounds (Intersection of buffer size and scissor box) */

+   /*@{*/

+   GLint _Xmin, _Xmax;  /**< inclusive */

+   GLint _Ymin, _Ymax;  /**< exclusive */

+   /*@}*/

+

+   /** \name  Derived Z buffer stuff */

+   /*@{*/

+   GLuint _DepthMax;	/**< Max depth buffer value */

+   GLfloat _DepthMaxF;	/**< Float max depth buffer value */

+   GLfloat _MRD;	/**< minimum resolvable difference in Z values */

+   /*@}*/

+

+   /** One of the GL_FRAMEBUFFER_(IN)COMPLETE_* tokens */

+   GLenum _Status;

+

+   /** Integer color values */

+   GLboolean _IntegerColor;

+

+   /** Array of all renderbuffer attachments, indexed by BUFFER_* tokens. */

+   struct gl_renderbuffer_attachment Attachment[BUFFER_COUNT];

+

+   /* In unextended OpenGL these vars are part of the GL_COLOR_BUFFER

+    * attribute group and GL_PIXEL attribute group, respectively.

+    */

+   GLenum ColorDrawBuffer[MAX_DRAW_BUFFERS];

+   GLenum ColorReadBuffer;

+

+   /** Computed from ColorDraw/ReadBuffer above */

+   GLuint _NumColorDrawBuffers;

+   GLint _ColorDrawBufferIndexes[MAX_DRAW_BUFFERS]; /**< BUFFER_x or -1 */

+   GLint _ColorReadBufferIndex; /* -1 = None */

+   struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS];

+   struct gl_renderbuffer *_ColorReadBuffer;

+

+   /** The Actual depth/stencil buffers to use.  May be wrappers around the

+    * depth/stencil buffers attached above. */

+   struct gl_renderbuffer *_DepthBuffer;

+   struct gl_renderbuffer *_StencilBuffer;

+

+   /** Delete this framebuffer */

+   void (*Delete)(struct gl_framebuffer *fb);

+};

+

+

+/**

+ * Limits for vertex and fragment programs/shaders.

+ */

+struct gl_program_constants

+{

+   /* logical limits */

+   GLuint MaxInstructions;

+   GLuint MaxAluInstructions;

+   GLuint MaxTexInstructions;

+   GLuint MaxTexIndirections;

+   GLuint MaxAttribs;

+   GLuint MaxTemps;

+   GLuint MaxAddressRegs;

+   GLuint MaxParameters;

+   GLuint MaxLocalParams;

+   GLuint MaxEnvParams;

+   /* native/hardware limits */

+   GLuint MaxNativeInstructions;

+   GLuint MaxNativeAluInstructions;

+   GLuint MaxNativeTexInstructions;

+   GLuint MaxNativeTexIndirections;

+   GLuint MaxNativeAttribs;

+   GLuint MaxNativeTemps;

+   GLuint MaxNativeAddressRegs;

+   GLuint MaxNativeParameters;

+   /* For shaders */

+   GLuint MaxUniformComponents;

+   /* GL_ARB_geometry_shader4 */

+   GLuint MaxGeometryTextureImageUnits;

+   GLuint MaxGeometryVaryingComponents;

+   GLuint MaxVertexVaryingComponents;

+   GLuint MaxGeometryUniformComponents;

+   GLuint MaxGeometryOutputVertices;

+   GLuint MaxGeometryTotalOutputComponents;

+};

+

+

+/**

+ * Constants which may be overridden by device driver during context creation

+ * but are never changed after that.

+ */

+struct gl_constants

+{

+   GLint MaxTextureMbytes;      /**< Max memory per image, in MB */

+   GLint MaxTextureLevels;      /**< Max mipmap levels. */ 

+   GLint Max3DTextureLevels;    /**< Max mipmap levels for 3D textures */

+   GLint MaxCubeTextureLevels;  /**< Max mipmap levels for cube textures */

+   GLint MaxArrayTextureLayers; /**< Max layers in array textures */

+   GLint MaxTextureRectSize;    /**< Max rectangle texture size, in pixes */

+   GLuint MaxTextureCoordUnits;

+   GLuint MaxTextureImageUnits;

+   GLuint MaxVertexTextureImageUnits;

+   GLuint MaxCombinedTextureImageUnits;

+   GLuint MaxTextureUnits;           /**< = MIN(CoordUnits, ImageUnits) */

+   GLfloat MaxTextureMaxAnisotropy;  /**< GL_EXT_texture_filter_anisotropic */

+   GLfloat MaxTextureLodBias;        /**< GL_EXT_texture_lod_bias */

+

+   GLuint MaxArrayLockSize;

+

+   GLint SubPixelBits;

+

+   GLfloat MinPointSize, MaxPointSize;	     /**< aliased */

+   GLfloat MinPointSizeAA, MaxPointSizeAA;   /**< antialiased */

+   GLfloat PointSizeGranularity;

+   GLfloat MinLineWidth, MaxLineWidth;       /**< aliased */

+   GLfloat MinLineWidthAA, MaxLineWidthAA;   /**< antialiased */

+   GLfloat LineWidthGranularity;

+

+   GLuint MaxColorTableSize;

+

+   GLuint MaxClipPlanes;

+   GLuint MaxLights;

+   GLfloat MaxShininess;                     /**< GL_NV_light_max_exponent */

+   GLfloat MaxSpotExponent;                  /**< GL_NV_light_max_exponent */

+

+   GLuint MaxViewportWidth, MaxViewportHeight;

+

+   struct gl_program_constants VertexProgram;   /**< GL_ARB_vertex_program */

+   struct gl_program_constants FragmentProgram; /**< GL_ARB_fragment_program */

+   struct gl_program_constants GeometryProgram;  /**< GL_ARB_geometry_shader4 */

+   GLuint MaxProgramMatrices;

+   GLuint MaxProgramMatrixStackDepth;

+

+   /** vertex array / buffer object bounds checking */

+   GLboolean CheckArrayBounds;

+

+   GLuint MaxDrawBuffers;    /**< GL_ARB_draw_buffers */

+

+   GLuint MaxColorAttachments;   /**< GL_EXT_framebuffer_object */

+   GLuint MaxRenderbufferSize;   /**< GL_EXT_framebuffer_object */

+   GLuint MaxSamples;            /**< GL_ARB_framebuffer_object */

+

+   GLuint MaxVarying;  /**< Number of float[4] varying parameters */

+

+   GLuint GLSLVersion;  /**< GLSL version supported (ex: 120 = 1.20) */

+

+   /** Which texture units support GL_ATI_envmap_bumpmap as targets */

+   GLbitfield SupportedBumpUnits;

+

+   /**

+    * Maximum amount of time, measured in nanseconds, that the server can wait.

+    */

+   GLuint64 MaxServerWaitTimeout;

+

+   /** GL_EXT_provoking_vertex */

+   GLboolean QuadsFollowProvokingVertexConvention;

+

+   /** OpenGL version 3.0 */

+   GLbitfield ContextFlags;  /**< Ex: GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT */

+

+   /** OpenGL version 3.2 */

+   GLbitfield ProfileMask;   /**< Mask of CONTEXT_x_PROFILE_BIT */

+

+   /** GL_EXT_transform_feedback */

+   GLuint MaxTransformFeedbackSeparateAttribs;

+   GLuint MaxTransformFeedbackSeparateComponents;

+   GLuint MaxTransformFeedbackInterleavedComponents;

+

+   /** GL_EXT_gpu_shader4 */

+   GLint MinProgramTexelOffset, MaxProgramTexelOffset;

+};

+

+

+/**

+ * Enable flag for each OpenGL extension.  Different device drivers will

+ * enable different extensions at runtime.

+ */

+struct gl_extensions

+{

+   GLboolean dummy;  /* don't remove this! */

+   GLboolean ARB_blend_func_extended;

+   GLboolean ARB_copy_buffer;

+   GLboolean ARB_depth_buffer_float;

+   GLboolean ARB_depth_clamp;

+   GLboolean ARB_depth_texture;

+   GLboolean ARB_draw_buffers;

+   GLboolean ARB_draw_elements_base_vertex;

+   GLboolean ARB_draw_instanced;

+   GLboolean ARB_fragment_coord_conventions;

+   GLboolean ARB_fragment_program;

+   GLboolean ARB_fragment_program_shadow;

+   GLboolean ARB_fragment_shader;

+   GLboolean ARB_framebuffer_object;

+   GLboolean ARB_explicit_attrib_location;

+   GLboolean ARB_geometry_shader4;

+   GLboolean ARB_half_float_pixel;

+   GLboolean ARB_half_float_vertex;

+   GLboolean ARB_instanced_arrays;

+   GLboolean ARB_map_buffer_range;

+   GLboolean ARB_multisample;

+   GLboolean ARB_multitexture;

+   GLboolean ARB_occlusion_query;

+   GLboolean ARB_occlusion_query2;

+   GLboolean ARB_point_sprite;

+   GLboolean ARB_sampler_objects;

+   GLboolean ARB_seamless_cube_map;

+   GLboolean ARB_shader_objects;

+   GLboolean ARB_shader_stencil_export;

+   GLboolean ARB_shading_language_100;

+   GLboolean ARB_shadow;

+   GLboolean ARB_shadow_ambient;

+   GLboolean ARB_sync;

+   GLboolean ARB_texture_border_clamp;

+   GLboolean ARB_texture_buffer_object;

+   GLboolean ARB_texture_compression;

+   GLboolean ARB_texture_compression_rgtc;

+   GLboolean ARB_texture_cube_map;

+   GLboolean ARB_texture_env_combine;

+   GLboolean ARB_texture_env_crossbar;

+   GLboolean ARB_texture_env_dot3;

+   GLboolean ARB_texture_float;

+   GLboolean ARB_texture_mirrored_repeat;

+   GLboolean ARB_texture_multisample;

+   GLboolean ARB_texture_non_power_of_two;

+   GLboolean ARB_texture_rg;

+   GLboolean ARB_texture_rgb10_a2ui;

+   GLboolean ARB_timer_query;

+   GLboolean ARB_transform_feedback2;

+   GLboolean ARB_transpose_matrix;

+   GLboolean ARB_uniform_buffer_object;

+   GLboolean ARB_vertex_array_object;

+   GLboolean ARB_vertex_buffer_object;

+   GLboolean ARB_vertex_program;

+   GLboolean ARB_vertex_shader;

+   GLboolean ARB_vertex_type_2_10_10_10_rev;

+   GLboolean ARB_window_pos;

+   GLboolean EXT_abgr;

+   GLboolean EXT_bgra;

+   GLboolean EXT_blend_color;

+   GLboolean EXT_blend_equation_separate;

+   GLboolean EXT_blend_func_separate;

+   GLboolean EXT_blend_logic_op;

+   GLboolean EXT_blend_minmax;

+   GLboolean EXT_blend_subtract;

+   GLboolean EXT_clip_volume_hint;

+   GLboolean EXT_compiled_vertex_array;

+   GLboolean EXT_copy_texture;

+   GLboolean EXT_depth_bounds_test;

+   GLboolean EXT_draw_buffers2;

+   GLboolean EXT_draw_range_elements;

+   GLboolean EXT_fog_coord;

+   GLboolean EXT_framebuffer_blit;

+   GLboolean EXT_framebuffer_multisample;

+   GLboolean EXT_framebuffer_object;

+   GLboolean EXT_framebuffer_sRGB;

+   GLboolean EXT_gpu_program_parameters;

+   GLboolean EXT_gpu_shader4;

+   GLboolean EXT_multi_draw_arrays;

+   GLboolean EXT_paletted_texture;

+   GLboolean EXT_packed_depth_stencil;

+   GLboolean EXT_packed_float;

+   GLboolean EXT_packed_pixels;

+   GLboolean EXT_pixel_buffer_object;

+   GLboolean EXT_point_parameters;

+   GLboolean EXT_polygon_offset;

+   GLboolean EXT_provoking_vertex;

+   GLboolean EXT_rescale_normal;

+   GLboolean EXT_shadow_funcs;

+   GLboolean EXT_secondary_color;

+   GLboolean EXT_separate_shader_objects;

+   GLboolean EXT_separate_specular_color;

+   GLboolean EXT_shared_texture_palette;

+   GLboolean EXT_stencil_wrap;

+   GLboolean EXT_stencil_two_side;

+   GLboolean EXT_subtexture;

+   GLboolean EXT_texture;

+   GLboolean EXT_texture_object;

+   GLboolean EXT_texture3D;

+   GLboolean EXT_texture_array;

+   GLboolean EXT_texture_compression_s3tc;

+   GLboolean EXT_texture_env_add;

+   GLboolean EXT_texture_env_combine;

+   GLboolean EXT_texture_env_dot3;

+   GLboolean EXT_texture_filter_anisotropic;

+   GLboolean EXT_texture_integer;

+   GLboolean EXT_texture_lod_bias;

+   GLboolean EXT_texture_mirror_clamp;

+   GLboolean EXT_texture_shared_exponent;

+   GLboolean EXT_texture_sRGB;

+   GLboolean EXT_texture_swizzle;

+   GLboolean EXT_transform_feedback;

+   GLboolean EXT_timer_query;

+   GLboolean EXT_vertex_array;

+   GLboolean EXT_vertex_array_bgra;

+   GLboolean EXT_vertex_array_set;

+   /* vendor extensions */

+   GLboolean APPLE_client_storage;

+   GLboolean APPLE_packed_pixels;

+   GLboolean APPLE_vertex_array_object;

+   GLboolean APPLE_object_purgeable;

+   GLboolean ATI_envmap_bumpmap;

+   GLboolean ATI_texture_mirror_once;

+   GLboolean ATI_texture_env_combine3;

+   GLboolean ATI_fragment_shader;

+   GLboolean ATI_separate_stencil;

+   GLboolean IBM_rasterpos_clip;

+   GLboolean IBM_multimode_draw_arrays;

+   GLboolean MESA_pack_invert;

+   GLboolean MESA_resize_buffers;

+   GLboolean MESA_ycbcr_texture;

+   GLboolean MESA_texture_array;

+   GLboolean MESA_texture_signed_rgba;

+   GLboolean NV_blend_square;

+   GLboolean NV_conditional_render;

+   GLboolean NV_fragment_program;

+   GLboolean NV_fragment_program_option;

+   GLboolean NV_light_max_exponent;

+   GLboolean NV_point_sprite;

+   GLboolean NV_primitive_restart;

+   GLboolean NV_texgen_reflection;

+   GLboolean NV_texture_env_combine4;

+   GLboolean NV_texture_rectangle;

+   GLboolean NV_vertex_program;

+   GLboolean NV_vertex_program1_1;

+   GLboolean OES_read_format;

+   GLboolean SGI_texture_color_table;

+   GLboolean SGIS_generate_mipmap;

+   GLboolean SGIS_texture_edge_clamp;

+   GLboolean SGIS_texture_lod;

+   GLboolean TDFX_texture_compression_FXT1;

+   GLboolean S3_s3tc;

+   GLboolean OES_EGL_image;

+   GLboolean OES_draw_texture;

+   GLboolean EXT_texture_format_BGRA8888;

+   /** The extension string */

+   const GLubyte *String;

+   /** Number of supported extensions */

+   GLuint Count;

+};

+

+

+/**

+ * A stack of matrices (projection, modelview, color, texture, etc).

+ */

+struct gl_matrix_stack

+{

+   GLmatrix *Top;      /**< points into Stack */

+   GLmatrix *Stack;    /**< array [MaxDepth] of GLmatrix */

+   GLuint Depth;       /**< 0 <= Depth < MaxDepth */

+   GLuint MaxDepth;    /**< size of Stack[] array */

+   GLuint DirtyFlag;   /**< _NEW_MODELVIEW or _NEW_PROJECTION, for example */

+};

+

+

+/**

+ * \name Bits for image transfer operations 

+ * \sa __struct gl_contextRec::ImageTransferState.

+ */

+/*@{*/

+#define IMAGE_SCALE_BIAS_BIT                      0x1

+#define IMAGE_SHIFT_OFFSET_BIT                    0x2

+#define IMAGE_MAP_COLOR_BIT                       0x4

+#define IMAGE_CLAMP_BIT                           0x800

+

+

+/** Pixel Transfer ops */

+#define IMAGE_BITS (IMAGE_SCALE_BIAS_BIT |			\

+		    IMAGE_SHIFT_OFFSET_BIT |			\

+		    IMAGE_MAP_COLOR_BIT)

+

+/**

+ * \name Bits to indicate what state has changed.  

+ *

+ * 4 unused flags.

+ */

+/*@{*/

+#define _NEW_MODELVIEW		0x1        /**< __struct gl_contextRec::ModelView */

+#define _NEW_PROJECTION		0x2        /**< __struct gl_contextRec::Projection */

+#define _NEW_TEXTURE_MATRIX	0x4        /**< __struct gl_contextRec::TextureMatrix */

+#define _NEW_ACCUM		0x10       /**< __struct gl_contextRec::Accum */

+#define _NEW_COLOR		0x20       /**< __struct gl_contextRec::Color */

+#define _NEW_DEPTH		0x40       /**< __struct gl_contextRec::Depth */

+#define _NEW_EVAL		0x80       /**< __struct gl_contextRec::Eval, __struct gl_contextRec::EvalMap */

+#define _NEW_FOG		0x100      /**< __struct gl_contextRec::Fog */

+#define _NEW_HINT		0x200      /**< __struct gl_contextRec::Hint */

+#define _NEW_LIGHT		0x400      /**< __struct gl_contextRec::Light */

+#define _NEW_LINE		0x800      /**< __struct gl_contextRec::Line */

+#define _NEW_PIXEL		0x1000     /**< __struct gl_contextRec::Pixel */

+#define _NEW_POINT		0x2000     /**< __struct gl_contextRec::Point */

+#define _NEW_POLYGON		0x4000     /**< __struct gl_contextRec::Polygon */

+#define _NEW_POLYGONSTIPPLE	0x8000     /**< __struct gl_contextRec::PolygonStipple */

+#define _NEW_SCISSOR		0x10000    /**< __struct gl_contextRec::Scissor */

+#define _NEW_STENCIL		0x20000    /**< __struct gl_contextRec::Stencil */

+#define _NEW_TEXTURE		0x40000    /**< __struct gl_contextRec::Texture */

+#define _NEW_TRANSFORM		0x80000    /**< __struct gl_contextRec::Transform */

+#define _NEW_VIEWPORT		0x100000   /**< __struct gl_contextRec::Viewport */

+#define _NEW_PACKUNPACK		0x200000   /**< __struct gl_contextRec::Pack, __struct gl_contextRec::Unpack */

+#define _NEW_ARRAY	        0x400000   /**< __struct gl_contextRec::Array */

+#define _NEW_RENDERMODE		0x800000   /**< __struct gl_contextRec::RenderMode, __struct gl_contextRec::Feedback, __struct gl_contextRec::Select */

+#define _NEW_BUFFERS            0x1000000  /**< __struct gl_contextRec::Visual, __struct gl_contextRec::DrawBuffer, */

+#define _NEW_MULTISAMPLE        0x2000000  /**< __struct gl_contextRec::Multisample */

+#define _NEW_TRACK_MATRIX       0x4000000  /**< __struct gl_contextRec::VertexProgram */

+#define _NEW_PROGRAM            0x8000000  /**< __struct gl_contextRec::VertexProgram */

+#define _NEW_CURRENT_ATTRIB     0x10000000  /**< __struct gl_contextRec::Current */

+#define _NEW_PROGRAM_CONSTANTS  0x20000000

+#define _NEW_BUFFER_OBJECT      0x40000000

+#define _NEW_ALL ~0

+/*@}*/

+

+

+/**

+ * \name Bits to track array state changes 

+ *

+ * Also used to summarize array enabled.

+ */

+/*@{*/

+#define _NEW_ARRAY_VERTEX           VERT_BIT_POS

+#define _NEW_ARRAY_WEIGHT           VERT_BIT_WEIGHT

+#define _NEW_ARRAY_NORMAL           VERT_BIT_NORMAL

+#define _NEW_ARRAY_COLOR0           VERT_BIT_COLOR0

+#define _NEW_ARRAY_COLOR1           VERT_BIT_COLOR1

+#define _NEW_ARRAY_FOGCOORD         VERT_BIT_FOG

+#define _NEW_ARRAY_INDEX            VERT_BIT_COLOR_INDEX

+#define _NEW_ARRAY_EDGEFLAG         VERT_BIT_EDGEFLAG

+#define _NEW_ARRAY_POINT_SIZE       VERT_BIT_COLOR_INDEX  /* aliased */

+#define _NEW_ARRAY_TEXCOORD_0       VERT_BIT_TEX0

+#define _NEW_ARRAY_TEXCOORD_1       VERT_BIT_TEX1

+#define _NEW_ARRAY_TEXCOORD_2       VERT_BIT_TEX2

+#define _NEW_ARRAY_TEXCOORD_3       VERT_BIT_TEX3

+#define _NEW_ARRAY_TEXCOORD_4       VERT_BIT_TEX4

+#define _NEW_ARRAY_TEXCOORD_5       VERT_BIT_TEX5

+#define _NEW_ARRAY_TEXCOORD_6       VERT_BIT_TEX6

+#define _NEW_ARRAY_TEXCOORD_7       VERT_BIT_TEX7

+#define _NEW_ARRAY_ATTRIB_0         VERT_BIT_GENERIC0  /* start at bit 16 */

+#define _NEW_ARRAY_ALL              0xffffffff

+

+

+#define _NEW_ARRAY_TEXCOORD(i) (_NEW_ARRAY_TEXCOORD_0 << (i))

+#define _NEW_ARRAY_ATTRIB(i) (_NEW_ARRAY_ATTRIB_0 << (i))

+/*@}*/

+

+

+

+/**

+ * \name A bunch of flags that we think might be useful to drivers.

+ * 

+ * Set in the __struct gl_contextRec::_TriangleCaps bitfield.

+ */

+/*@{*/

+#define DD_FLATSHADE                0x1

+#define DD_SEPARATE_SPECULAR        0x2

+#define DD_TRI_CULL_FRONT_BACK      0x4 /* special case on some hw */

+#define DD_TRI_LIGHT_TWOSIDE        0x8

+#define DD_TRI_UNFILLED             0x10

+#define DD_TRI_SMOOTH               0x20

+#define DD_TRI_STIPPLE              0x40

+#define DD_TRI_OFFSET               0x80

+#define DD_LINE_SMOOTH              0x100

+#define DD_LINE_STIPPLE             0x200

+#define DD_POINT_SMOOTH             0x400

+#define DD_POINT_ATTEN              0x800

+#define DD_TRI_TWOSTENCIL           0x1000

+/*@}*/

+

+

+/**

+ * \name Define the state changes under which each of these bits might change

+ */

+/*@{*/

+#define _DD_NEW_FLATSHADE                _NEW_LIGHT

+#define _DD_NEW_SEPARATE_SPECULAR        (_NEW_LIGHT | _NEW_FOG | _NEW_PROGRAM)

+#define _DD_NEW_TRI_CULL_FRONT_BACK      _NEW_POLYGON

+#define _DD_NEW_TRI_LIGHT_TWOSIDE        _NEW_LIGHT

+#define _DD_NEW_TRI_UNFILLED             _NEW_POLYGON

+#define _DD_NEW_TRI_SMOOTH               _NEW_POLYGON

+#define _DD_NEW_TRI_STIPPLE              _NEW_POLYGON

+#define _DD_NEW_TRI_OFFSET               _NEW_POLYGON

+#define _DD_NEW_LINE_SMOOTH              _NEW_LINE

+#define _DD_NEW_LINE_STIPPLE             _NEW_LINE

+#define _DD_NEW_LINE_WIDTH               _NEW_LINE

+#define _DD_NEW_POINT_SMOOTH             _NEW_POINT

+#define _DD_NEW_POINT_SIZE               _NEW_POINT

+#define _DD_NEW_POINT_ATTEN              _NEW_POINT

+/*@}*/

+

+

+/**

+ * Composite state flags

+ */

+/*@{*/

+#define _MESA_NEW_NEED_EYE_COORDS         (_NEW_LIGHT |		\

+                                           _NEW_TEXTURE |	\

+                                           _NEW_POINT |		\

+                                           _NEW_PROGRAM |	\

+                                           _NEW_MODELVIEW)

+

+#define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\

+                                           _NEW_TEXTURE)

+

+#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL)

+/*@}*/

+

+

+

+

+/* This has to be included here. */

+#include "dd.h"

+

+

+/**

+ * Display list flags.

+ * Strictly this is a tnl-private concept, but it doesn't seem

+ * worthwhile adding a tnl private structure just to hold this one bit

+ * of information:

+ */

+#define DLIST_DANGLING_REFS     0x1 

+

+

+/** Opaque declaration of display list payload data type */

+union gl_dlist_node;

+

+

+/**

+ * Provide a location where information about a display list can be

+ * collected.  Could be extended with driverPrivate structures,

+ * etc. in the future.

+ */

+struct gl_display_list

+{

+   GLuint Name;

+   GLbitfield Flags;  /**< DLIST_x flags */

+   /** The dlist commands are in a linked list of nodes */

+   union gl_dlist_node *Head;

+};

+

+

+/**

+ * State used during display list compilation and execution.

+ */

+struct gl_dlist_state

+{

+   GLuint CallDepth;		/**< Current recursion calling depth */

+

+   struct gl_display_list *CurrentList; /**< List currently being compiled */

+   union gl_dlist_node *CurrentBlock; /**< Pointer to current block of nodes */

+   GLuint CurrentPos;		/**< Index into current block of nodes */

+

+   GLvertexformat ListVtxfmt;

+

+   GLubyte ActiveAttribSize[VERT_ATTRIB_MAX];

+   GLfloat CurrentAttrib[VERT_ATTRIB_MAX][4];

+   

+   GLubyte ActiveMaterialSize[MAT_ATTRIB_MAX];

+   GLfloat CurrentMaterial[MAT_ATTRIB_MAX][4];

+

+   GLubyte ActiveIndex;

+   GLfloat CurrentIndex;

+   

+   GLubyte ActiveEdgeFlag;

+   GLboolean CurrentEdgeFlag;

+

+   struct {

+      /* State known to have been set by the currently-compiling display

+       * list.  Used to eliminate some redundant state changes.

+       */

+      GLenum ShadeModel;

+   } Current;

+};

+

+/**

+ * Enum for the OpenGL APIs we know about and may support.

+ */

+typedef enum {

+   API_OPENGL,

+   API_OPENGLES,

+   API_OPENGLES2

+} gl_api;

+

+/**

+ * Mesa rendering context.

+ *

+ * This is the central context data structure for Mesa.  Almost all

+ * OpenGL state is contained in this structure.

+ * Think of this as a base class from which device drivers will derive

+ * sub classes.

+ *

+ * The struct gl_context typedef names this structure.

+ */

+struct gl_context

+{

+   /** State possibly shared with other contexts in the address space */

+   struct gl_shared_state *Shared;

+

+   /** \name API function pointer tables */

+   /*@{*/

+   gl_api API;

+   struct _glapi_table *Save;	/**< Display list save functions */

+   struct _glapi_table *Exec;	/**< Execute functions */

+   struct _glapi_table *CurrentDispatch;  /**< == Save or Exec !! */

+   /*@}*/

+

+   struct gl_config Visual;

+   struct gl_framebuffer *DrawBuffer;	/**< buffer for writing */

+   struct gl_framebuffer *ReadBuffer;	/**< buffer for reading */

+   struct gl_framebuffer *WinSysDrawBuffer;  /**< set with MakeCurrent */

+   struct gl_framebuffer *WinSysReadBuffer;  /**< set with MakeCurrent */

+

+   /**

+    * Device driver function pointer table

+    */

+   struct dd_function_table Driver;

+

+   void *DriverCtx;	/**< Points to device driver context/state */

+

+   /** Core/Driver constants */

+   struct gl_constants Const;

+

+   /** \name The various 4x4 matrix stacks */

+   /*@{*/

+   struct gl_matrix_stack ModelviewMatrixStack;

+   struct gl_matrix_stack ProjectionMatrixStack;

+   struct gl_matrix_stack TextureMatrixStack[MAX_TEXTURE_UNITS];

+   struct gl_matrix_stack ProgramMatrixStack[MAX_PROGRAM_MATRICES];

+   struct gl_matrix_stack *CurrentStack; /**< Points to one of the above stacks */

+   /*@}*/

+

+   /** Combined modelview and projection matrix */

+   GLmatrix _ModelProjectMatrix;

+

+   /** \name Display lists */

+   struct gl_dlist_state ListState;

+

+   GLboolean ExecuteFlag;	/**< Execute GL commands? */

+   GLboolean CompileFlag;	/**< Compile GL commands into display list? */

+

+   /** Extension information */

+   struct gl_extensions Extensions;

+

+   /** Version info */

+   GLuint VersionMajor, VersionMinor;

+   char *VersionString;

+

+   /** \name State attribute stack (for glPush/PopAttrib) */

+   /*@{*/

+   GLuint AttribStackDepth;

+   struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];

+   /*@}*/

+

+   /** \name Renderer attribute groups

+    * 

+    * We define a struct for each attribute group to make pushing and popping

+    * attributes easy.  Also it's a good organization.

+    */

+   /*@{*/

+   struct gl_accum_attrib	Accum;		/**< Accum buffer attributes */

+   struct gl_colorbuffer_attrib	Color;		/**< Color buffer attributes */

+   struct gl_current_attrib	Current;	/**< Current attributes */

+   struct gl_depthbuffer_attrib	Depth;		/**< Depth buffer attributes */

+   struct gl_eval_attrib	Eval;		/**< Eval attributes */

+   struct gl_fog_attrib		Fog;		/**< Fog attributes */

+   struct gl_hint_attrib	Hint;		/**< Hint attributes */

+   struct gl_light_attrib	Light;		/**< Light attributes */

+   struct gl_line_attrib	Line;		/**< Line attributes */

+   struct gl_list_attrib	List;		/**< List attributes */

+   struct gl_multisample_attrib Multisample;

+   struct gl_pixel_attrib	Pixel;		/**< Pixel attributes */

+   struct gl_point_attrib	Point;		/**< Point attributes */

+   struct gl_polygon_attrib	Polygon;	/**< Polygon attributes */

+   GLuint PolygonStipple[32];			/**< Polygon stipple */

+   struct gl_scissor_attrib	Scissor;	/**< Scissor attributes */

+   struct gl_stencil_attrib	Stencil;	/**< Stencil buffer attributes */

+   struct gl_texture_attrib	Texture;	/**< Texture attributes */

+   struct gl_transform_attrib	Transform;	/**< Transformation attributes */

+   struct gl_viewport_attrib	Viewport;	/**< Viewport attributes */

+   /*@}*/

+

+   /** \name Client attribute stack */

+   /*@{*/

+   GLuint ClientAttribStackDepth;

+   struct gl_attrib_node *ClientAttribStack[MAX_CLIENT_ATTRIB_STACK_DEPTH];

+   /*@}*/

+

+   /** \name Client attribute groups */

+   /*@{*/

+   struct gl_array_attrib	Array;	/**< Vertex arrays */

+   struct gl_pixelstore_attrib	Pack;	/**< Pixel packing */

+   struct gl_pixelstore_attrib	Unpack;	/**< Pixel unpacking */

+   struct gl_pixelstore_attrib	DefaultPacking;	/**< Default params */

+   /*@}*/

+

+   /** \name Other assorted state (not pushed/popped on attribute stack) */

+   /*@{*/

+   struct gl_pixelmaps          PixelMaps;

+

+   struct gl_evaluators EvalMap;   /**< All evaluators */

+   struct gl_feedback   Feedback;  /**< Feedback */

+   struct gl_selection  Select;    /**< Selection */

+

+   struct gl_program_state Program;  /**< general program state */

+   struct gl_vertex_program_state VertexProgram;

+   struct gl_fragment_program_state FragmentProgram;

+   struct gl_geometry_program_state GeometryProgram;

+   struct gl_ati_fragment_shader_state ATIFragmentShader;

+

+   struct gl_shader_state Shader; /**< GLSL shader object state */

+   struct gl_shader_compiler_options ShaderCompilerOptions[MESA_SHADER_TYPES];

+

+   struct gl_query_state Query;  /**< occlusion, timer queries */

+

+   struct gl_transform_feedback TransformFeedback;

+

+   struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */

+   struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */

+   /*@}*/

+

+   struct gl_meta_state *Meta;  /**< for "meta" operations */

+

+   /* GL_EXT_framebuffer_object */

+   struct gl_renderbuffer *CurrentRenderbuffer;

+

+   GLenum ErrorValue;        /**< Last error code */

+

+   /**

+    * Recognize and silence repeated error debug messages in buggy apps.

+    */

+   const char *ErrorDebugFmtString;

+   GLuint ErrorDebugCount;

+

+   GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */

+   GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */

+

+   GLboolean ViewportInitialized;  /**< has viewport size been initialized? */

+

+   GLbitfield varying_vp_inputs;  /**< mask of VERT_BIT_* flags */

+

+   /** \name Derived state */

+   /*@{*/

+   /** Bitwise-or of DD_* flags.  Note that this bitfield may be used before

+    * state validation so they need to always be current.

+    */

+   GLbitfield _TriangleCaps;

+   GLbitfield _ImageTransferState;/**< bitwise-or of IMAGE_*_BIT flags */

+   GLfloat _EyeZDir[3];

+   GLfloat _ModelViewInvScale;

+   GLboolean _NeedEyeCoords;

+   GLboolean _ForceEyeCoords; 

+

+   GLuint TextureStateTimestamp; /**< detect changes to shared state */

+

+   struct gl_shine_tab *_ShineTable[2]; /**< Active shine tables */

+   struct gl_shine_tab *_ShineTabList;  /**< MRU list of inactive shine tables */

+   /**@}*/

+

+   struct gl_list_extensions *ListExt; /**< driver dlist extensions */

+

+   /** \name For debugging/development only */

+   /*@{*/

+   GLboolean FirstTimeCurrent;

+   /*@}*/

+

+   /** Dither disable via MESA_NO_DITHER env var */

+   GLboolean NoDither;

+

+   /** software compression/decompression supported or not */

+   GLboolean Mesa_DXTn;

+

+   /** 

+    * Use dp4 (rather than mul/mad) instructions for position

+    * transformation?

+    */

+   GLboolean mvp_with_dp4;

+

+   /**

+    * \name Hooks for module contexts.  

+    *

+    * These will eventually live in the driver or elsewhere.

+    */

+   /*@{*/

+   void *swrast_context;

+   void *swsetup_context;

+   void *swtnl_context;

+   void *swtnl_im;

+   struct st_context *st;

+   void *aelt_context;

+   /*@}*/

+};

+

+

+/** The string names for GL_POINT, GL_LINE_LOOP, etc */

+extern const char *_mesa_prim_name[GL_POLYGON+4];

+

+

+#ifdef DEBUG

+extern int MESA_VERBOSE;

+extern int MESA_DEBUG_FLAGS;

+# define MESA_FUNCTION __FUNCTION__

+#else

+# define MESA_VERBOSE 0

+# define MESA_DEBUG_FLAGS 0

+# define MESA_FUNCTION "a function"

+# ifndef NDEBUG

+#  define NDEBUG

+# endif

+#endif

+

+

+/** The MESA_VERBOSE var is a bitmask of these flags */

+enum _verbose

+{

+   VERBOSE_VARRAY		= 0x0001,

+   VERBOSE_TEXTURE		= 0x0002,

+   VERBOSE_MATERIAL		= 0x0004,

+   VERBOSE_PIPELINE		= 0x0008,

+   VERBOSE_DRIVER		= 0x0010,

+   VERBOSE_STATE		= 0x0020,

+   VERBOSE_API			= 0x0040,

+   VERBOSE_DISPLAY_LIST		= 0x0100,

+   VERBOSE_LIGHTING		= 0x0200,

+   VERBOSE_PRIMS		= 0x0400,

+   VERBOSE_VERTS		= 0x0800,

+   VERBOSE_DISASSEM		= 0x1000,

+   VERBOSE_DRAW                 = 0x2000,

+   VERBOSE_SWAPBUFFERS          = 0x4000

+};

+

+

+/** The MESA_DEBUG_FLAGS var is a bitmask of these flags */

+enum _debug

+{

+   DEBUG_ALWAYS_FLUSH		= 0x1

+};

+

+

+

+#endif /* MTYPES_H */

diff --git a/mesalib/src/mesa/main/multisample.c b/mesalib/src/mesa/main/multisample.c
index 01b68df7a..824778195 100644
--- a/mesalib/src/mesa/main/multisample.c
+++ b/mesalib/src/mesa/main/multisample.c
@@ -1,61 +1,61 @@
-/*
- * 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/context.h"
-#include "main/macros.h"
-#include "main/multisample.h"
-
-
-/**
- * Called via glSampleCoverageARB
- */
-void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
-
-   ctx->Multisample.SampleCoverageValue = (GLfloat) CLAMP(value, 0.0, 1.0);
-   ctx->Multisample.SampleCoverageInvert = invert;
-   ctx->NewState |= _NEW_MULTISAMPLE;
-}
-
-
-/**
- * Initialize the context's multisample state.
- * \param ctx  the GL context.
- */
-void
-_mesa_init_multisample(GLcontext *ctx)
-{
-   ctx->Multisample.Enabled = GL_TRUE;
-   ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;
-   ctx->Multisample.SampleAlphaToOne = GL_FALSE;
-   ctx->Multisample.SampleCoverage = GL_FALSE;
-   ctx->Multisample.SampleCoverageValue = 1.0;
-   ctx->Multisample.SampleCoverageInvert = GL_FALSE;
-}
+/*

+ * 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/context.h"

+#include "main/macros.h"

+#include "main/multisample.h"

+

+

+/**

+ * Called via glSampleCoverageARB

+ */

+void GLAPIENTRY

+_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );

+

+   ctx->Multisample.SampleCoverageValue = (GLfloat) CLAMP(value, 0.0, 1.0);

+   ctx->Multisample.SampleCoverageInvert = invert;

+   ctx->NewState |= _NEW_MULTISAMPLE;

+}

+

+

+/**

+ * Initialize the context's multisample state.

+ * \param ctx  the GL context.

+ */

+void

+_mesa_init_multisample(struct gl_context *ctx)

+{

+   ctx->Multisample.Enabled = GL_TRUE;

+   ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;

+   ctx->Multisample.SampleAlphaToOne = GL_FALSE;

+   ctx->Multisample.SampleCoverage = GL_FALSE;

+   ctx->Multisample.SampleCoverageValue = 1.0;

+   ctx->Multisample.SampleCoverageInvert = GL_FALSE;

+}

diff --git a/mesalib/src/mesa/main/multisample.h b/mesalib/src/mesa/main/multisample.h
index 998488ef4..c1c967bbe 100644
--- a/mesalib/src/mesa/main/multisample.h
+++ b/mesalib/src/mesa/main/multisample.h
@@ -1,39 +1,41 @@
-/*
- * 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 MULTISAMPLE_H
-#define MULTISAMPLE_H
-
-#include "mtypes.h"
-
-extern void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
-
-
-extern void
-_mesa_init_multisample(GLcontext *ctx);
-
-
-#endif
+/*

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

+#define MULTISAMPLE_H

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);

+

+

+extern void

+_mesa_init_multisample(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/nvprogram.c b/mesalib/src/mesa/main/nvprogram.c
index 3a570b7dd..89b9bc426 100644
--- a/mesalib/src/mesa/main/nvprogram.c
+++ b/mesalib/src/mesa/main/nvprogram.c
@@ -1,919 +1,919 @@
-/*
- * 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.
- */
-
-/**
- * \file nvprogram.c
- * NVIDIA vertex/fragment program state management functions.
- * \author Brian Paul
- */
-
-/*
- * Regarding GL_NV_fragment/vertex_program, GL_NV_vertex_program1_1, etc:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/hash.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/nvprogram.h"
-#include "program/arbprogparse.h"
-#include "program/nvfragparse.h"
-#include "program/nvvertparse.h"
-#include "program/program.h"
-#include "program/prog_instruction.h"
-#include "program/prog_parameter.h"
-
-
-
-/**
- * Execute a vertex state program.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
-{
-   struct gl_vertex_program *vprog;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target != GL_VERTEX_STATE_PROGRAM_NV) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glExecuteProgramNV");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   vprog = (struct gl_vertex_program *) _mesa_lookup_program(ctx, id);
-
-   if (!vprog || vprog->Base.Target != GL_VERTEX_STATE_PROGRAM_NV) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glExecuteProgramNV");
-      return;
-   }
-   
-   _mesa_problem(ctx, "glExecuteProgramNV() not supported");
-}
-
-
-/**
- * Determine if a set of programs is resident in hardware.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-GLboolean GLAPIENTRY
-_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids,
-                            GLboolean *residences)
-{
-   GLint i, j;
-   GLboolean allResident = GL_TRUE;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV(n)");
-      return GL_FALSE;
-   }
-
-   for (i = 0; i < n; i++) {
-      const struct gl_program *prog;
-      if (ids[i] == 0) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV");
-         return GL_FALSE;
-      }
-      prog = _mesa_lookup_program(ctx, ids[i]);
-      if (!prog) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV");
-         return GL_FALSE;
-      }
-      if (prog->Resident) {
-	 if (!allResident)
-	    residences[i] = GL_TRUE;
-      }
-      else {
-         if (allResident) {
-	    allResident = GL_FALSE;
-	    for (j = 0; j < i; j++)
-	       residences[j] = GL_TRUE;
-	 }
-	 residences[i] = GL_FALSE;
-      }
-   }
-
-   return allResident;
-}
-
-
-/**
- * Request that a set of programs be resident in hardware.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids)
-{
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(n)");
-      return;
-   }
-
-   /* just error checking for now */
-   for (i = 0; i < n; i++) {
-      struct gl_program *prog;
-
-      if (ids[i] == 0) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(id)");
-         return;
-      }
-
-      prog = _mesa_lookup_program(ctx, ids[i]);
-      if (!prog) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(id)");
-         return;
-      }
-
-      /* XXX this is really a hardware thing we should hook out */
-      prog->Resident = GL_TRUE;
-   }
-}
-
-
-/**
- * Get a program parameter register.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetProgramParameterfvNV(GLenum target, GLuint index,
-                              GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_NV) {
-      if (pname == GL_PROGRAM_PARAMETER_NV) {
-         if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
-            COPY_4V(params, ctx->VertexProgram.Parameters[index]);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glGetProgramParameterfvNV(index)");
-            return;
-         }
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(pname)");
-         return;
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(target)");
-      return;
-   }
-}
-
-
-/**
- * Get a program parameter register.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetProgramParameterdvNV(GLenum target, GLuint index,
-                              GLenum pname, GLdouble *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_NV) {
-      if (pname == GL_PROGRAM_PARAMETER_NV) {
-         if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {
-            COPY_4V(params, ctx->VertexProgram.Parameters[index]);
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_VALUE,
-                        "glGetProgramParameterdvNV(index)");
-            return;
-         }
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(pname)");
-         return;
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(target)");
-      return;
-   }
-}
-
-
-/**
- * Get a program attribute.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)
-{
-   struct gl_program *prog;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   prog = _mesa_lookup_program(ctx, id);
-   if (!prog) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramivNV");
-      return;
-   }
-
-   switch (pname) {
-      case GL_PROGRAM_TARGET_NV:
-         *params = prog->Target;
-         return;
-      case GL_PROGRAM_LENGTH_NV:
-         *params = prog->String ?(GLint) strlen((char *) prog->String) : 0;
-         return;
-      case GL_PROGRAM_RESIDENT_NV:
-         *params = prog->Resident;
-         return;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivNV(pname)");
-         return;
-   }
-}
-
-
-/**
- * Get the program source code.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
-{
-   struct gl_program *prog;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname != GL_PROGRAM_STRING_NV) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramStringNV(pname)");
-      return;
-   }
-
-   prog = _mesa_lookup_program(ctx, id);
-   if (!prog) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramStringNV");
-      return;
-   }
-
-   if (prog->String) {
-      memcpy(program, prog->String, strlen((char *) prog->String));
-   }
-   else {
-      program[0] = 0;
-   }
-}
-
-
-/**
- * Get matrix tracking information.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetTrackMatrixivNV(GLenum target, GLuint address,
-                         GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_NV
-       && ctx->Extensions.NV_vertex_program) {
-      GLuint i;
-
-      if ((address & 0x3) || address >= MAX_NV_VERTEX_PROGRAM_PARAMS) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glGetTrackMatrixivNV(address)");
-         return;
-      }
-
-      i = address / 4;
-
-      switch (pname) {
-         case GL_TRACK_MATRIX_NV:
-            params[0] = (GLint) ctx->VertexProgram.TrackMatrix[i];
-            return;
-         case GL_TRACK_MATRIX_TRANSFORM_NV:
-            params[0] = (GLint) ctx->VertexProgram.TrackMatrixTransform[i];
-            return;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTrackMatrixivNV");
-            return;
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTrackMatrixivNV");
-      return;
-   }
-}
-
-
-/**
- * Get a vertex (or vertex array) attribute.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
-{
-   const struct gl_client_array *array;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");
-      return;
-   }
-
-   array = &ctx->Array.ArrayObj->VertexAttrib[index];
-
-   switch (pname) {
-      case GL_ATTRIB_ARRAY_SIZE_NV:
-         params[0] = array->Size;
-         break;
-      case GL_ATTRIB_ARRAY_STRIDE_NV:
-         params[0] = array->Stride;
-         break;
-      case GL_ATTRIB_ARRAY_TYPE_NV:
-         params[0] = array->Type;
-         break;
-      case GL_CURRENT_ATTRIB_NV:
-         if (index == 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetVertexAttribdvNV(index == 0)");
-            return;
-         }
-	 FLUSH_CURRENT(ctx, 0);
-         COPY_4V(params, ctx->Current.Attrib[index]);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
-         return;
-   }
-}
-
-/**
- * Get a vertex (or vertex array) attribute.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
-{
-   const struct gl_client_array *array;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");
-      return;
-   }
-
-   array = &ctx->Array.ArrayObj->VertexAttrib[index];
-
-   switch (pname) {
-      case GL_ATTRIB_ARRAY_SIZE_NV:
-         params[0] = (GLfloat) array->Size;
-         break;
-      case GL_ATTRIB_ARRAY_STRIDE_NV:
-         params[0] = (GLfloat) array->Stride;
-         break;
-      case GL_ATTRIB_ARRAY_TYPE_NV:
-         params[0] = (GLfloat) array->Type;
-         break;
-      case GL_CURRENT_ATTRIB_NV:
-         if (index == 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetVertexAttribfvNV(index == 0)");
-            return;
-         }
-	 FLUSH_CURRENT(ctx, 0);
-         COPY_4V(params, ctx->Current.Attrib[index]);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
-         return;
-   }
-}
-
-/**
- * Get a vertex (or vertex array) attribute.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
-{
-   const struct gl_client_array *array;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");
-      return;
-   }
-
-   array = &ctx->Array.ArrayObj->VertexAttrib[index];
-
-   switch (pname) {
-      case GL_ATTRIB_ARRAY_SIZE_NV:
-         params[0] = array->Size;
-         break;
-      case GL_ATTRIB_ARRAY_STRIDE_NV:
-         params[0] = array->Stride;
-         break;
-      case GL_ATTRIB_ARRAY_TYPE_NV:
-         params[0] = array->Type;
-         break;
-      case GL_CURRENT_ATTRIB_NV:
-         if (index == 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glGetVertexAttribivNV(index == 0)");
-            return;
-         }
-	 FLUSH_CURRENT(ctx, 0);
-         params[0] = (GLint) ctx->Current.Attrib[index][0];
-         params[1] = (GLint) ctx->Current.Attrib[index][1];
-         params[2] = (GLint) ctx->Current.Attrib[index][2];
-         params[3] = (GLint) ctx->Current.Attrib[index][3];
-         break;
-      case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-         params[0] = array->BufferObj->Name;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
-         return;
-   }
-}
-
-
-/**
- * Get a vertex array attribute pointer.
- * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerNV(index)");
-      return;
-   }
-
-   if (pname != GL_ATTRIB_ARRAY_POINTER_NV) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerNV(pname)");
-      return;
-   }
-
-   *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;
-}
-
-void
-_mesa_emit_nv_temp_initialization(GLcontext *ctx,
-				  struct gl_program *program)
-{
-   struct prog_instruction *inst;
-   GLuint i;
-   struct gl_shader_compiler_options* options =
-         &ctx->ShaderCompilerOptions[_mesa_program_target_to_index(program->Target)];
-
-   if (!options->EmitNVTempInitialization)
-      return;
-
-   /* We'll swizzle up a zero temporary so we can use it for the
-    * ARL.
-    */
-   if (program->NumTemporaries == 0)
-      program->NumTemporaries = 1;
-
-   _mesa_insert_instructions(program, 0, program->NumTemporaries + 1);
-
-   for (i = 0; i < program->NumTemporaries; i++) {
-      struct prog_instruction *inst = &program->Instructions[i];
-
-      inst->Opcode = OPCODE_SWZ;
-      inst->DstReg.File = PROGRAM_TEMPORARY;
-      inst->DstReg.Index = i;
-      inst->DstReg.WriteMask = WRITEMASK_XYZW;
-      inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-      inst->SrcReg[0].Index = 0;
-      inst->SrcReg[0].Swizzle = MAKE_SWIZZLE4(SWIZZLE_ZERO,
-					      SWIZZLE_ZERO,
-					      SWIZZLE_ZERO,
-					      SWIZZLE_ZERO);
-   }
-
-   inst = &program->Instructions[i];
-   inst->Opcode = OPCODE_ARL;
-   inst->DstReg.File = PROGRAM_ADDRESS;
-   inst->DstReg.Index = 0;
-   inst->DstReg.WriteMask = WRITEMASK_XYZW;
-   inst->SrcReg[0].File = PROGRAM_TEMPORARY;
-   inst->SrcReg[0].Index = 0;
-   inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;
-
-   if (program->NumAddressRegs == 0)
-      program->NumAddressRegs = 1;
-}
-
-void
-_mesa_setup_nv_temporary_count(GLcontext *ctx, struct gl_program *program)
-{
-   GLuint i;
-
-   program->NumTemporaries = 0;
-   for (i = 0; i < program->NumInstructions; i++) {
-      struct prog_instruction *inst = &program->Instructions[i];
-
-      if (inst->DstReg.File == PROGRAM_TEMPORARY) {
-	 program->NumTemporaries = MAX2(program->NumTemporaries,
-					inst->DstReg.Index + 1);
-      }
-      if (inst->SrcReg[0].File == PROGRAM_TEMPORARY) {
-	 program->NumTemporaries = MAX2((GLint)program->NumTemporaries,
-					inst->SrcReg[0].Index + 1);
-      }
-      if (inst->SrcReg[1].File == PROGRAM_TEMPORARY) {
-	 program->NumTemporaries = MAX2((GLint)program->NumTemporaries,
-					inst->SrcReg[1].Index + 1);
-      }
-      if (inst->SrcReg[2].File == PROGRAM_TEMPORARY) {
-	 program->NumTemporaries = MAX2((GLint)program->NumTemporaries,
-					inst->SrcReg[2].Index + 1);
-      }
-   }
-}
-
-/**
- * Load/parse/compile a program.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
-                    const GLubyte *program)
-{
-   struct gl_program *prog;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.NV_vertex_program
-       && !ctx->Extensions.NV_fragment_program) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV()");
-      return;
-   }
-
-   if (id == 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glLoadProgramNV(id)");
-      return;
-   }
-
-   if (len < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glLoadProgramNV(len)");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   prog = _mesa_lookup_program(ctx, id);
-
-   if (prog && prog->Target != 0 && prog->Target != target) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(target)");
-      return;
-   }
-
-   if ((target == GL_VERTEX_PROGRAM_NV ||
-        target == GL_VERTEX_STATE_PROGRAM_NV)
-       && ctx->Extensions.NV_vertex_program) {
-      struct gl_vertex_program *vprog = (struct gl_vertex_program *) prog;
-      if (!vprog || prog == &_mesa_DummyProgram) {
-         vprog = (struct gl_vertex_program *)
-            ctx->Driver.NewProgram(ctx, target, id);
-         if (!vprog) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-            return;
-         }
-         _mesa_HashInsert(ctx->Shared->Programs, id, vprog);
-      }
-
-      if (ctx->Extensions.ARB_vertex_program
-	  && (strncmp((char *) program, "!!ARB", 5) == 0)) {
-	 _mesa_parse_arb_vertex_program(ctx, target, program, len, vprog);
-      } else {
-	 _mesa_parse_nv_vertex_program(ctx, target, program, len, vprog);
-      }
-   }
-   else if (target == GL_FRAGMENT_PROGRAM_NV
-            && ctx->Extensions.NV_fragment_program) {
-      struct gl_fragment_program *fprog = (struct gl_fragment_program *) prog;
-      if (!fprog || prog == &_mesa_DummyProgram) {
-         fprog = (struct gl_fragment_program *)
-            ctx->Driver.NewProgram(ctx, target, id);
-         if (!fprog) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-            return;
-         }
-         _mesa_HashInsert(ctx->Shared->Programs, id, fprog);
-      }
-      _mesa_parse_nv_fragment_program(ctx, target, program, len, fprog);
-   }
-   else if (target == GL_FRAGMENT_PROGRAM_ARB
-            && ctx->Extensions.ARB_fragment_program) {
-      struct gl_fragment_program *fprog = (struct gl_fragment_program *) prog;
-      if (!fprog || prog == &_mesa_DummyProgram) {
-         fprog = (struct gl_fragment_program *)
-            ctx->Driver.NewProgram(ctx, target, id);
-         if (!fprog) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-            return;
-         }
-         _mesa_HashInsert(ctx->Shared->Programs, id, fprog);
-      }
-      _mesa_parse_arb_fragment_program(ctx, target, program, len, fprog);
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glLoadProgramNV(target)");
-   }
-}
-
-
-
-/**
- * Set a sequence of program parameter registers.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ProgramParameters4dvNV(GLenum target, GLuint index,
-                             GLuint num, const GLdouble *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
-      GLuint i;
-      if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4dvNV");
-         return;
-      }
-      for (i = 0; i < num; i++) {
-         ctx->VertexProgram.Parameters[index + i][0] = (GLfloat) params[0];
-         ctx->VertexProgram.Parameters[index + i][1] = (GLfloat) params[1];
-         ctx->VertexProgram.Parameters[index + i][2] = (GLfloat) params[2];
-         ctx->VertexProgram.Parameters[index + i][3] = (GLfloat) params[3];
-         params += 4;
-      };
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4dvNV");
-      return;
-   }
-}
-
-
-/**
- * Set a sequence of program parameter registers.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_ProgramParameters4fvNV(GLenum target, GLuint index,
-                             GLuint num, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
-      GLuint i;
-      if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4fvNV");
-         return;
-      }
-      for (i = 0; i < num; i++) {
-         COPY_4V(ctx->VertexProgram.Parameters[index + i], params);
-         params += 4;
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4fvNV");
-      return;
-   }
-}
-
-
-
-/**
- * Setup tracking of matrices into program parameter registers.
- * \note Called from the GL API dispatcher.
- */
-void GLAPIENTRY
-_mesa_TrackMatrixNV(GLenum target, GLuint address,
-                    GLenum matrix, GLenum transform)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {
-      if (address & 0x3) {
-         /* addr must be multiple of four */
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTrackMatrixNV(address)");
-         return;
-      }
-
-      switch (matrix) {
-         case GL_NONE:
-         case GL_MODELVIEW:
-         case GL_PROJECTION:
-         case GL_TEXTURE:
-         case GL_COLOR:
-         case GL_MODELVIEW_PROJECTION_NV:
-         case GL_MATRIX0_NV:
-         case GL_MATRIX1_NV:
-         case GL_MATRIX2_NV:
-         case GL_MATRIX3_NV:
-         case GL_MATRIX4_NV:
-         case GL_MATRIX5_NV:
-         case GL_MATRIX6_NV:
-         case GL_MATRIX7_NV:
-            /* OK, fallthrough */
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(matrix)");
-            return;
-      }
-
-      switch (transform) {
-         case GL_IDENTITY_NV:
-         case GL_INVERSE_NV:
-         case GL_TRANSPOSE_NV:
-         case GL_INVERSE_TRANSPOSE_NV:
-            /* OK, fallthrough */
-            break;
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(transform)");
-            return;
-      }
-
-      ctx->VertexProgram.TrackMatrix[address / 4] = matrix;
-      ctx->VertexProgram.TrackMatrixTransform[address / 4] = transform;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(target)");
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
-                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   struct gl_program *prog;
-   struct gl_fragment_program *fragProg;
-   GLfloat *v;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   prog = _mesa_lookup_program(ctx, id);
-   if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glProgramNamedParameterNV");
-      return;
-   }
-
-   if (len <= 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glProgramNamedParameterNV(len)");
-      return;
-   }
-
-   fragProg = (struct gl_fragment_program *) prog;
-   v = _mesa_lookup_parameter_value(fragProg->Base.Parameters, len,
-                                    (char *) name);
-   if (v) {
-      v[0] = x;
-      v[1] = y;
-      v[2] = z;
-      v[3] = w;
-      return;
-   }
-
-   _mesa_error(ctx, GL_INVALID_VALUE, "glProgramNamedParameterNV(name)");
-}
-
-
-void GLAPIENTRY
-_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                 const float v[])
-{
-   _mesa_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);
-}
-
-
-void GLAPIENTRY
-_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
-                                GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   _mesa_ProgramNamedParameter4fNV(id, len, name, (GLfloat)x, (GLfloat)y, 
-                                   (GLfloat)z, (GLfloat)w);
-}
-
-
-void GLAPIENTRY
-_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                 const double v[])
-{
-   _mesa_ProgramNamedParameter4fNV(id, len, name,
-                                   (GLfloat)v[0], (GLfloat)v[1],
-                                   (GLfloat)v[2], (GLfloat)v[3]);
-}
-
-
-void GLAPIENTRY
-_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                   GLfloat *params)
-{
-   struct gl_program *prog;
-   struct gl_fragment_program *fragProg;
-   const GLfloat *v;
-
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   prog = _mesa_lookup_program(ctx, id);
-   if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramNamedParameterNV");
-      return;
-   }
-
-   if (len <= 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramNamedParameterNV");
-      return;
-   }
-
-   fragProg = (struct gl_fragment_program *) prog;
-   v = _mesa_lookup_parameter_value(fragProg->Base.Parameters,
-                                    len, (char *) name);
-   if (v) {
-      params[0] = v[0];
-      params[1] = v[1];
-      params[2] = v[2];
-      params[3] = v[3];
-      return;
-   }
-
-   _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramNamedParameterNV");
-}
-
-
-void GLAPIENTRY
-_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                   GLdouble *params)
-{
-   GLfloat floatParams[4];
-   _mesa_GetProgramNamedParameterfvNV(id, len, name, floatParams);
-   COPY_4V(params, floatParams);
-}
+/*

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

+ */

+

+/**

+ * \file nvprogram.c

+ * NVIDIA vertex/fragment program state management functions.

+ * \author Brian Paul

+ */

+

+/*

+ * Regarding GL_NV_fragment/vertex_program, GL_NV_vertex_program1_1, etc:

+ *

+ * Portions of this software may use or implement intellectual

+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims

+ * any and all warranties with respect to such intellectual property,

+ * including any use thereof or modifications thereto.

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/hash.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/nvprogram.h"

+#include "program/arbprogparse.h"

+#include "program/nvfragparse.h"

+#include "program/nvvertparse.h"

+#include "program/program.h"

+#include "program/prog_instruction.h"

+#include "program/prog_parameter.h"

+

+

+

+/**

+ * Execute a vertex state program.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)

+{

+   struct gl_vertex_program *vprog;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target != GL_VERTEX_STATE_PROGRAM_NV) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glExecuteProgramNV");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+

+   vprog = (struct gl_vertex_program *) _mesa_lookup_program(ctx, id);

+

+   if (!vprog || vprog->Base.Target != GL_VERTEX_STATE_PROGRAM_NV) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glExecuteProgramNV");

+      return;

+   }

+   

+   _mesa_problem(ctx, "glExecuteProgramNV() not supported");

+}

+

+

+/**

+ * Determine if a set of programs is resident in hardware.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+GLboolean GLAPIENTRY

+_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids,

+                            GLboolean *residences)

+{

+   GLint i, j;

+   GLboolean allResident = GL_TRUE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV(n)");

+      return GL_FALSE;

+   }

+

+   for (i = 0; i < n; i++) {

+      const struct gl_program *prog;

+      if (ids[i] == 0) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV");

+         return GL_FALSE;

+      }

+      prog = _mesa_lookup_program(ctx, ids[i]);

+      if (!prog) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreProgramsResidentNV");

+         return GL_FALSE;

+      }

+      if (prog->Resident) {

+	 if (!allResident)

+	    residences[i] = GL_TRUE;

+      }

+      else {

+         if (allResident) {

+	    allResident = GL_FALSE;

+	    for (j = 0; j < i; j++)

+	       residences[j] = GL_TRUE;

+	 }

+	 residences[i] = GL_FALSE;

+      }

+   }

+

+   return allResident;

+}

+

+

+/**

+ * Request that a set of programs be resident in hardware.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids)

+{

+   GLint i;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(n)");

+      return;

+   }

+

+   /* just error checking for now */

+   for (i = 0; i < n; i++) {

+      struct gl_program *prog;

+

+      if (ids[i] == 0) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(id)");

+         return;

+      }

+

+      prog = _mesa_lookup_program(ctx, ids[i]);

+      if (!prog) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glRequestResidentProgramsNV(id)");

+         return;

+      }

+

+      /* XXX this is really a hardware thing we should hook out */

+      prog->Resident = GL_TRUE;

+   }

+}

+

+

+/**

+ * Get a program parameter register.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetProgramParameterfvNV(GLenum target, GLuint index,

+                              GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target == GL_VERTEX_PROGRAM_NV) {

+      if (pname == GL_PROGRAM_PARAMETER_NV) {

+         if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {

+            COPY_4V(params, ctx->VertexProgram.Parameters[index]);

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_VALUE,

+                        "glGetProgramParameterfvNV(index)");

+            return;

+         }

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(pname)");

+         return;

+      }

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterfvNV(target)");

+      return;

+   }

+}

+

+

+/**

+ * Get a program parameter register.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetProgramParameterdvNV(GLenum target, GLuint index,

+                              GLenum pname, GLdouble *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target == GL_VERTEX_PROGRAM_NV) {

+      if (pname == GL_PROGRAM_PARAMETER_NV) {

+         if (index < MAX_NV_VERTEX_PROGRAM_PARAMS) {

+            COPY_4V(params, ctx->VertexProgram.Parameters[index]);

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_VALUE,

+                        "glGetProgramParameterdvNV(index)");

+            return;

+         }

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(pname)");

+         return;

+      }

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramParameterdvNV(target)");

+      return;

+   }

+}

+

+

+/**

+ * Get a program attribute.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)

+{

+   struct gl_program *prog;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   prog = _mesa_lookup_program(ctx, id);

+   if (!prog) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramivNV");

+      return;

+   }

+

+   switch (pname) {

+      case GL_PROGRAM_TARGET_NV:

+         *params = prog->Target;

+         return;

+      case GL_PROGRAM_LENGTH_NV:

+         *params = prog->String ?(GLint) strlen((char *) prog->String) : 0;

+         return;

+      case GL_PROGRAM_RESIDENT_NV:

+         *params = prog->Resident;

+         return;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramivNV(pname)");

+         return;

+   }

+}

+

+

+/**

+ * Get the program source code.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)

+{

+   struct gl_program *prog;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname != GL_PROGRAM_STRING_NV) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramStringNV(pname)");

+      return;

+   }

+

+   prog = _mesa_lookup_program(ctx, id);

+   if (!prog) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramStringNV");

+      return;

+   }

+

+   if (prog->String) {

+      memcpy(program, prog->String, strlen((char *) prog->String));

+   }

+   else {

+      program[0] = 0;

+   }

+}

+

+

+/**

+ * Get matrix tracking information.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetTrackMatrixivNV(GLenum target, GLuint address,

+                         GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target == GL_VERTEX_PROGRAM_NV

+       && ctx->Extensions.NV_vertex_program) {

+      GLuint i;

+

+      if ((address & 0x3) || address >= MAX_NV_VERTEX_PROGRAM_PARAMS) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glGetTrackMatrixivNV(address)");

+         return;

+      }

+

+      i = address / 4;

+

+      switch (pname) {

+         case GL_TRACK_MATRIX_NV:

+            params[0] = (GLint) ctx->VertexProgram.TrackMatrix[i];

+            return;

+         case GL_TRACK_MATRIX_TRANSFORM_NV:

+            params[0] = (GLint) ctx->VertexProgram.TrackMatrixTransform[i];

+            return;

+         default:

+            _mesa_error(ctx, GL_INVALID_ENUM, "glGetTrackMatrixivNV");

+            return;

+      }

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTrackMatrixivNV");

+      return;

+   }

+}

+

+

+/**

+ * Get a vertex (or vertex array) attribute.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)

+{

+   const struct gl_client_array *array;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");

+      return;

+   }

+

+   array = &ctx->Array.ArrayObj->VertexAttrib[index];

+

+   switch (pname) {

+      case GL_ATTRIB_ARRAY_SIZE_NV:

+         params[0] = array->Size;

+         break;

+      case GL_ATTRIB_ARRAY_STRIDE_NV:

+         params[0] = array->Stride;

+         break;

+      case GL_ATTRIB_ARRAY_TYPE_NV:

+         params[0] = array->Type;

+         break;

+      case GL_CURRENT_ATTRIB_NV:

+         if (index == 0) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glGetVertexAttribdvNV(index == 0)");

+            return;

+         }

+	 FLUSH_CURRENT(ctx, 0);

+         COPY_4V(params, ctx->Current.Attrib[index]);

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");

+         return;

+   }

+}

+

+/**

+ * Get a vertex (or vertex array) attribute.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)

+{

+   const struct gl_client_array *array;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");

+      return;

+   }

+

+   array = &ctx->Array.ArrayObj->VertexAttrib[index];

+

+   switch (pname) {

+      case GL_ATTRIB_ARRAY_SIZE_NV:

+         params[0] = (GLfloat) array->Size;

+         break;

+      case GL_ATTRIB_ARRAY_STRIDE_NV:

+         params[0] = (GLfloat) array->Stride;

+         break;

+      case GL_ATTRIB_ARRAY_TYPE_NV:

+         params[0] = (GLfloat) array->Type;

+         break;

+      case GL_CURRENT_ATTRIB_NV:

+         if (index == 0) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glGetVertexAttribfvNV(index == 0)");

+            return;

+         }

+	 FLUSH_CURRENT(ctx, 0);

+         COPY_4V(params, ctx->Current.Attrib[index]);

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");

+         return;

+   }

+}

+

+/**

+ * Get a vertex (or vertex array) attribute.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)

+{

+   const struct gl_client_array *array;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribdvNV(index)");

+      return;

+   }

+

+   array = &ctx->Array.ArrayObj->VertexAttrib[index];

+

+   switch (pname) {

+      case GL_ATTRIB_ARRAY_SIZE_NV:

+         params[0] = array->Size;

+         break;

+      case GL_ATTRIB_ARRAY_STRIDE_NV:

+         params[0] = array->Stride;

+         break;

+      case GL_ATTRIB_ARRAY_TYPE_NV:

+         params[0] = array->Type;

+         break;

+      case GL_CURRENT_ATTRIB_NV:

+         if (index == 0) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glGetVertexAttribivNV(index == 0)");

+            return;

+         }

+	 FLUSH_CURRENT(ctx, 0);

+         params[0] = (GLint) ctx->Current.Attrib[index][0];

+         params[1] = (GLint) ctx->Current.Attrib[index][1];

+         params[2] = (GLint) ctx->Current.Attrib[index][2];

+         params[3] = (GLint) ctx->Current.Attrib[index][3];

+         break;

+      case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:

+         params[0] = array->BufferObj->Name;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");

+         return;

+   }

+}

+

+

+/**

+ * Get a vertex array attribute pointer.

+ * \note Not compiled into display lists.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerNV(index)");

+      return;

+   }

+

+   if (pname != GL_ATTRIB_ARRAY_POINTER_NV) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerNV(pname)");

+      return;

+   }

+

+   *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;

+}

+

+void

+_mesa_emit_nv_temp_initialization(struct gl_context *ctx,

+				  struct gl_program *program)

+{

+   struct prog_instruction *inst;

+   GLuint i;

+   struct gl_shader_compiler_options* options =

+         &ctx->ShaderCompilerOptions[_mesa_program_target_to_index(program->Target)];

+

+   if (!options->EmitNVTempInitialization)

+      return;

+

+   /* We'll swizzle up a zero temporary so we can use it for the

+    * ARL.

+    */

+   if (program->NumTemporaries == 0)

+      program->NumTemporaries = 1;

+

+   _mesa_insert_instructions(program, 0, program->NumTemporaries + 1);

+

+   for (i = 0; i < program->NumTemporaries; i++) {

+      struct prog_instruction *inst = &program->Instructions[i];

+

+      inst->Opcode = OPCODE_SWZ;

+      inst->DstReg.File = PROGRAM_TEMPORARY;

+      inst->DstReg.Index = i;

+      inst->DstReg.WriteMask = WRITEMASK_XYZW;

+      inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+      inst->SrcReg[0].Index = 0;

+      inst->SrcReg[0].Swizzle = MAKE_SWIZZLE4(SWIZZLE_ZERO,

+					      SWIZZLE_ZERO,

+					      SWIZZLE_ZERO,

+					      SWIZZLE_ZERO);

+   }

+

+   inst = &program->Instructions[i];

+   inst->Opcode = OPCODE_ARL;

+   inst->DstReg.File = PROGRAM_ADDRESS;

+   inst->DstReg.Index = 0;

+   inst->DstReg.WriteMask = WRITEMASK_XYZW;

+   inst->SrcReg[0].File = PROGRAM_TEMPORARY;

+   inst->SrcReg[0].Index = 0;

+   inst->SrcReg[0].Swizzle = SWIZZLE_XXXX;

+

+   if (program->NumAddressRegs == 0)

+      program->NumAddressRegs = 1;

+}

+

+void

+_mesa_setup_nv_temporary_count(struct gl_context *ctx, struct gl_program *program)

+{

+   GLuint i;

+

+   program->NumTemporaries = 0;

+   for (i = 0; i < program->NumInstructions; i++) {

+      struct prog_instruction *inst = &program->Instructions[i];

+

+      if (inst->DstReg.File == PROGRAM_TEMPORARY) {

+	 program->NumTemporaries = MAX2(program->NumTemporaries,

+					inst->DstReg.Index + 1);

+      }

+      if (inst->SrcReg[0].File == PROGRAM_TEMPORARY) {

+	 program->NumTemporaries = MAX2((GLint)program->NumTemporaries,

+					inst->SrcReg[0].Index + 1);

+      }

+      if (inst->SrcReg[1].File == PROGRAM_TEMPORARY) {

+	 program->NumTemporaries = MAX2((GLint)program->NumTemporaries,

+					inst->SrcReg[1].Index + 1);

+      }

+      if (inst->SrcReg[2].File == PROGRAM_TEMPORARY) {

+	 program->NumTemporaries = MAX2((GLint)program->NumTemporaries,

+					inst->SrcReg[2].Index + 1);

+      }

+   }

+}

+

+/**

+ * Load/parse/compile a program.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,

+                    const GLubyte *program)

+{

+   struct gl_program *prog;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!ctx->Extensions.NV_vertex_program

+       && !ctx->Extensions.NV_fragment_program) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV()");

+      return;

+   }

+

+   if (id == 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glLoadProgramNV(id)");

+      return;

+   }

+

+   if (len < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glLoadProgramNV(len)");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+

+   prog = _mesa_lookup_program(ctx, id);

+

+   if (prog && prog->Target != 0 && prog->Target != target) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(target)");

+      return;

+   }

+

+   if ((target == GL_VERTEX_PROGRAM_NV ||

+        target == GL_VERTEX_STATE_PROGRAM_NV)

+       && ctx->Extensions.NV_vertex_program) {

+      struct gl_vertex_program *vprog = (struct gl_vertex_program *) prog;

+      if (!vprog || prog == &_mesa_DummyProgram) {

+         vprog = (struct gl_vertex_program *)

+            ctx->Driver.NewProgram(ctx, target, id);

+         if (!vprog) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+            return;

+         }

+         _mesa_HashInsert(ctx->Shared->Programs, id, vprog);

+      }

+

+      if (ctx->Extensions.ARB_vertex_program

+	  && (strncmp((char *) program, "!!ARB", 5) == 0)) {

+	 _mesa_parse_arb_vertex_program(ctx, target, program, len, vprog);

+      } else {

+	 _mesa_parse_nv_vertex_program(ctx, target, program, len, vprog);

+      }

+   }

+   else if (target == GL_FRAGMENT_PROGRAM_NV

+            && ctx->Extensions.NV_fragment_program) {

+      struct gl_fragment_program *fprog = (struct gl_fragment_program *) prog;

+      if (!fprog || prog == &_mesa_DummyProgram) {

+         fprog = (struct gl_fragment_program *)

+            ctx->Driver.NewProgram(ctx, target, id);

+         if (!fprog) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+            return;

+         }

+         _mesa_HashInsert(ctx->Shared->Programs, id, fprog);

+      }

+      _mesa_parse_nv_fragment_program(ctx, target, program, len, fprog);

+   }

+   else if (target == GL_FRAGMENT_PROGRAM_ARB

+            && ctx->Extensions.ARB_fragment_program) {

+      struct gl_fragment_program *fprog = (struct gl_fragment_program *) prog;

+      if (!fprog || prog == &_mesa_DummyProgram) {

+         fprog = (struct gl_fragment_program *)

+            ctx->Driver.NewProgram(ctx, target, id);

+         if (!fprog) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+            return;

+         }

+         _mesa_HashInsert(ctx->Shared->Programs, id, fprog);

+      }

+      _mesa_parse_arb_fragment_program(ctx, target, program, len, fprog);

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glLoadProgramNV(target)");

+   }

+}

+

+

+

+/**

+ * Set a sequence of program parameter registers.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_ProgramParameters4dvNV(GLenum target, GLuint index,

+                             GLsizei num, const GLdouble *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {

+      GLint i;

+      if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4dvNV");

+         return;

+      }

+      for (i = 0; i < num; i++) {

+         ctx->VertexProgram.Parameters[index + i][0] = (GLfloat) params[0];

+         ctx->VertexProgram.Parameters[index + i][1] = (GLfloat) params[1];

+         ctx->VertexProgram.Parameters[index + i][2] = (GLfloat) params[2];

+         ctx->VertexProgram.Parameters[index + i][3] = (GLfloat) params[3];

+         params += 4;

+      };

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4dvNV");

+      return;

+   }

+}

+

+

+/**

+ * Set a sequence of program parameter registers.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_ProgramParameters4fvNV(GLenum target, GLuint index,

+                             GLsizei num, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {

+      GLint i;

+      if (index + num > MAX_NV_VERTEX_PROGRAM_PARAMS) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramParameters4fvNV");

+         return;

+      }

+      for (i = 0; i < num; i++) {

+         COPY_4V(ctx->VertexProgram.Parameters[index + i], params);

+         params += 4;

+      }

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameters4fvNV");

+      return;

+   }

+}

+

+

+

+/**

+ * Setup tracking of matrices into program parameter registers.

+ * \note Called from the GL API dispatcher.

+ */

+void GLAPIENTRY

+_mesa_TrackMatrixNV(GLenum target, GLuint address,

+                    GLenum matrix, GLenum transform)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+

+   if (target == GL_VERTEX_PROGRAM_NV && ctx->Extensions.NV_vertex_program) {

+      if (address & 0x3) {

+         /* addr must be multiple of four */

+         _mesa_error(ctx, GL_INVALID_VALUE, "glTrackMatrixNV(address)");

+         return;

+      }

+

+      switch (matrix) {

+         case GL_NONE:

+         case GL_MODELVIEW:

+         case GL_PROJECTION:

+         case GL_TEXTURE:

+         case GL_COLOR:

+         case GL_MODELVIEW_PROJECTION_NV:

+         case GL_MATRIX0_NV:

+         case GL_MATRIX1_NV:

+         case GL_MATRIX2_NV:

+         case GL_MATRIX3_NV:

+         case GL_MATRIX4_NV:

+         case GL_MATRIX5_NV:

+         case GL_MATRIX6_NV:

+         case GL_MATRIX7_NV:

+            /* OK, fallthrough */

+            break;

+         default:

+            _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(matrix)");

+            return;

+      }

+

+      switch (transform) {

+         case GL_IDENTITY_NV:

+         case GL_INVERSE_NV:

+         case GL_TRANSPOSE_NV:

+         case GL_INVERSE_TRANSPOSE_NV:

+            /* OK, fallthrough */

+            break;

+         default:

+            _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(transform)");

+            return;

+      }

+

+      ctx->VertexProgram.TrackMatrix[address / 4] = matrix;

+      ctx->VertexProgram.TrackMatrixTransform[address / 4] = transform;

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTrackMatrixNV(target)");

+      return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,

+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   struct gl_program *prog;

+   struct gl_fragment_program *fragProg;

+   GLfloat *v;

+

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);

+

+   prog = _mesa_lookup_program(ctx, id);

+   if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glProgramNamedParameterNV");

+      return;

+   }

+

+   if (len <= 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glProgramNamedParameterNV(len)");

+      return;

+   }

+

+   fragProg = (struct gl_fragment_program *) prog;

+   v = _mesa_lookup_parameter_value(fragProg->Base.Parameters, len,

+                                    (char *) name);

+   if (v) {

+      v[0] = x;

+      v[1] = y;

+      v[2] = z;

+      v[3] = w;

+      return;

+   }

+

+   _mesa_error(ctx, GL_INVALID_VALUE, "glProgramNamedParameterNV(name)");

+}

+

+

+void GLAPIENTRY

+_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                 const float v[])

+{

+   _mesa_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);

+}

+

+

+void GLAPIENTRY

+_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,

+                                GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   _mesa_ProgramNamedParameter4fNV(id, len, name, (GLfloat)x, (GLfloat)y, 

+                                   (GLfloat)z, (GLfloat)w);

+}

+

+

+void GLAPIENTRY

+_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                 const double v[])

+{

+   _mesa_ProgramNamedParameter4fNV(id, len, name,

+                                   (GLfloat)v[0], (GLfloat)v[1],

+                                   (GLfloat)v[2], (GLfloat)v[3]);

+}

+

+

+void GLAPIENTRY

+_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                   GLfloat *params)

+{

+   struct gl_program *prog;

+   struct gl_fragment_program *fragProg;

+   const GLfloat *v;

+

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   prog = _mesa_lookup_program(ctx, id);

+   if (!prog || prog->Target != GL_FRAGMENT_PROGRAM_NV) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetProgramNamedParameterNV");

+      return;

+   }

+

+   if (len <= 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramNamedParameterNV");

+      return;

+   }

+

+   fragProg = (struct gl_fragment_program *) prog;

+   v = _mesa_lookup_parameter_value(fragProg->Base.Parameters,

+                                    len, (char *) name);

+   if (v) {

+      params[0] = v[0];

+      params[1] = v[1];

+      params[2] = v[2];

+      params[3] = v[3];

+      return;

+   }

+

+   _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramNamedParameterNV");

+}

+

+

+void GLAPIENTRY

+_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                   GLdouble *params)

+{

+   GLfloat floatParams[4];

+   _mesa_GetProgramNamedParameterfvNV(id, len, name, floatParams);

+   COPY_4V(params, floatParams);

+}

diff --git a/mesalib/src/mesa/main/nvprogram.h b/mesalib/src/mesa/main/nvprogram.h
index 260a25ba9..3d12b4e33 100644
--- a/mesalib/src/mesa/main/nvprogram.h
+++ b/mesalib/src/mesa/main/nvprogram.h
@@ -1,115 +1,119 @@
-/*
- * 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.
- *
- * Authors:
- *    Brian Paul
- */
-
-
-#ifndef NVPROGRAM_H
-#define NVPROGRAM_H
-
-#include "glheader.h"
-#include "mtypes.h"
-
-extern void GLAPIENTRY
-_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);
-
-extern GLboolean GLAPIENTRY 
-_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences);
-
-extern void GLAPIENTRY
-_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);
-
-extern void GLAPIENTRY
-_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program);
-
-extern void GLAPIENTRY
-_mesa_GetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);
-
-extern void GLAPIENTRY
-_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLuint num, const GLdouble *params);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLuint num, const GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);
-
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,
-                                GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                 const float v[]);
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,
-                                GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-extern void GLAPIENTRY
-_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                 const double v[]);
-
-extern void GLAPIENTRY
-_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                   GLfloat *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
-                                   GLdouble *params);
-
-extern void
-_mesa_setup_nv_temporary_count(GLcontext *ctx, struct gl_program *program);
-
-extern void
-_mesa_emit_nv_temp_initialization(GLcontext *ctx,
-				  struct gl_program *program);
-
-#endif
+/*

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

+ *

+ * Authors:

+ *    Brian Paul

+ */

+

+

+#ifndef NVPROGRAM_H

+#define NVPROGRAM_H

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_program;

+

+extern void GLAPIENTRY

+_mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params);

+

+extern GLboolean GLAPIENTRY 

+_mesa_AreProgramsResidentNV(GLsizei n, const GLuint *ids, GLboolean *residences);

+

+extern void GLAPIENTRY

+_mesa_RequestResidentProgramsNV(GLsizei n, const GLuint *ids);

+

+extern void GLAPIENTRY

+_mesa_GetProgramParameterfvNV(GLenum target, GLuint index, GLenum pname, GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramParameterdvNV(GLenum target, GLuint index, GLenum pname, GLdouble *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program);

+

+extern void GLAPIENTRY

+_mesa_GetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer);

+

+extern void GLAPIENTRY

+_mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len, const GLubyte *program);

+

+extern void GLAPIENTRY

+_mesa_ProgramParameters4dvNV(GLenum target, GLuint index, GLsizei num,

+                             const GLdouble *params);

+

+extern void GLAPIENTRY

+_mesa_ProgramParameters4fvNV(GLenum target, GLuint index, GLsizei num,

+                             const GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_TrackMatrixNV(GLenum target, GLuint address, GLenum matrix, GLenum transform);

+

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name,

+                                GLfloat x, GLfloat y, GLfloat z, GLfloat w);

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                 const float v[]);

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name,

+                                GLdouble x, GLdouble y, GLdouble z, GLdouble w);

+

+extern void GLAPIENTRY

+_mesa_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                 const double v[]);

+

+extern void GLAPIENTRY

+_mesa_GetProgramNamedParameterfvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                   GLfloat *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,

+                                   GLdouble *params);

+

+extern void

+_mesa_setup_nv_temporary_count(struct gl_context *ctx, struct gl_program *program);

+

+extern void

+_mesa_emit_nv_temp_initialization(struct gl_context *ctx,

+				  struct gl_program *program);

+

+#endif

diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c
new file mode 100644
index 000000000..f323c51f1
--- /dev/null
+++ b/mesalib/src/mesa/main/pack.c
@@ -0,0 +1,5063 @@
+/*

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

+   }

+

+   /* XXX

+    * This test should probably go away.  Have the caller set/clear the

+    * IMAGE_CLAMP_BIT as needed.

+    */

+   if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {

+      if (!intDstFormat) {

+         /* need to clamp to [0, 1] */

+         transferOps |= IMAGE_CLAMP_BIT;

+      }

+   }

+

+   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/pack.h b/mesalib/src/mesa/main/pack.h
new file mode 100644
index 000000000..1f19a5a7c
--- /dev/null
+++ b/mesalib/src/mesa/main/pack.h
@@ -0,0 +1,147 @@
+/*

+ * Mesa 3-D graphics library

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (C) 1999-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

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

+ */

+

+

+#ifndef PACK_H

+#define PACK_H

+

+

+#include "mtypes.h"

+

+

+extern void

+_mesa_unpack_polygon_stipple(const GLubyte *pattern, GLuint dest[32],

+                             const struct gl_pixelstore_attrib *unpacking);

+

+

+extern void

+_mesa_pack_polygon_stipple(const GLuint pattern[32], GLubyte *dest,

+                           const struct gl_pixelstore_attrib *packing);

+

+

+extern GLvoid *

+_mesa_unpack_bitmap(GLint width, GLint height, const GLubyte *pixels,

+                    const struct gl_pixelstore_attrib *packing);

+

+extern void

+_mesa_pack_bitmap(GLint width, GLint height, const GLubyte *source,

+                  GLubyte *dest, const struct gl_pixelstore_attrib *packing);

+

+

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

+

+

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

+

+

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

+

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

+

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

+

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

+

+

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

+

+

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

+

+extern void

+_mesa_pack_stencil_span(struct gl_context *ctx, GLuint n,

+                        GLenum dstType, GLvoid *dest, const GLstencil *source,

+                        const struct gl_pixelstore_attrib *dstPacking);

+

+

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

+

+extern void

+_mesa_pack_depth_span(struct gl_context *ctx, GLuint n, GLvoid *dest,

+                      GLenum dstType, const GLfloat *depthSpan,

+                      const struct gl_pixelstore_attrib *dstPacking);

+

+

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

+

+

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

+

+

+#endif

diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c
index 675e933ca..db1f05a58 100644
--- a/mesalib/src/mesa/main/pixel.c
+++ b/mesalib/src/mesa/main/pixel.c
@@ -1,870 +1,700 @@
-/*
- * 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 "pixel.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(GLcontext *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(GLcontext *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(GLcontext *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;
-      case GL_POST_COLOR_MATRIX_RED_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[0] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_RED_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[0] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_GREEN_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[1] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_GREEN_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[1] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_BLUE_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[2] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_BLUE_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[2] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[3] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[3] = param;
-	 break;
-      case GL_POST_CONVOLUTION_RED_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[0] = param;
-	 break;
-      case GL_POST_CONVOLUTION_RED_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[0] = param;
-	 break;
-      case GL_POST_CONVOLUTION_GREEN_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[1] = param;
-	 break;
-      case GL_POST_CONVOLUTION_GREEN_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[1] = param;
-	 break;
-      case GL_POST_CONVOLUTION_BLUE_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[2] = param;
-	 break;
-      case GL_POST_CONVOLUTION_BLUE_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[2] = param;
-	 break;
-      case GL_POST_CONVOLUTION_ALPHA_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[3] = param;
-	 break;
-      case GL_POST_CONVOLUTION_ALPHA_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[3] = 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(GLcontext *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;
-
-   if (ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION])
-      mask |= IMAGE_COLOR_TABLE_BIT;
-
-   if (ctx->Pixel.Convolution1DEnabled ||
-       ctx->Pixel.Convolution2DEnabled ||
-       ctx->Pixel.Separable2DEnabled) {
-      mask |= IMAGE_CONVOLUTION_BIT;
-      if (ctx->Pixel.PostConvolutionScale[0] != 1.0F ||
-          ctx->Pixel.PostConvolutionScale[1] != 1.0F ||
-          ctx->Pixel.PostConvolutionScale[2] != 1.0F ||
-          ctx->Pixel.PostConvolutionScale[3] != 1.0F ||
-          ctx->Pixel.PostConvolutionBias[0] != 0.0F ||
-          ctx->Pixel.PostConvolutionBias[1] != 0.0F ||
-          ctx->Pixel.PostConvolutionBias[2] != 0.0F ||
-          ctx->Pixel.PostConvolutionBias[3] != 0.0F) {
-         mask |= IMAGE_POST_CONVOLUTION_SCALE_BIAS;
-      }
-   }
-
-   if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION])
-      mask |= IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT;
-
-   if (ctx->ColorMatrixStack.Top->type != MATRIX_IDENTITY ||
-       ctx->Pixel.PostColorMatrixScale[0] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[0]  != 0.0F ||
-       ctx->Pixel.PostColorMatrixScale[1] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[1]  != 0.0F ||
-       ctx->Pixel.PostColorMatrixScale[2] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[2]  != 0.0F ||
-       ctx->Pixel.PostColorMatrixScale[3] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[3]  != 0.0F)
-      mask |= IMAGE_COLOR_MATRIX_BIT;
-
-   if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX])
-      mask |= IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT;
-
-   if (ctx->Pixel.HistogramEnabled)
-      mask |= IMAGE_HISTOGRAM_BIT;
-
-   if (ctx->Pixel.MinMaxEnabled)
-      mask |= IMAGE_MIN_MAX_BIT;
-
-   ctx->_ImageTransferState = mask;
-}
-
-
-/**
- * Update mesa pixel transfer derived state.
- */
-void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
-{
-   if (new_state & _NEW_COLOR_MATRIX)
-      _math_matrix_analyse( ctx->ColorMatrixStack.Top );
-
-   /* References ColorMatrix.type (derived above).
-    */
-   if (new_state & _MESA_NEW_TRANSFER_STATE)
-      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( GLcontext *ctx )
-{
-   int i;
-
-   /* 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);
-   ctx->Pixel.HistogramEnabled = GL_FALSE;
-   ctx->Pixel.MinMaxEnabled = GL_FALSE;
-   ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0);
-   ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0);
-   for (i = 0; i < COLORTABLE_MAX; i++) {
-      ASSIGN_4V(ctx->Pixel.ColorTableScale[i], 1.0, 1.0, 1.0, 1.0);
-      ASSIGN_4V(ctx->Pixel.ColorTableBias[i], 0.0, 0.0, 0.0, 0.0);
-      ctx->Pixel.ColorTableEnabled[i] = GL_FALSE;
-   }
-   ctx->Pixel.Convolution1DEnabled = GL_FALSE;
-   ctx->Pixel.Convolution2DEnabled = GL_FALSE;
-   ctx->Pixel.Separable2DEnabled = GL_FALSE;
-   for (i = 0; i < 3; i++) {
-      ASSIGN_4V(ctx->Pixel.ConvolutionBorderColor[i], 0.0, 0.0, 0.0, 0.0);
-      ctx->Pixel.ConvolutionBorderMode[i] = GL_REDUCE;
-      ASSIGN_4V(ctx->Pixel.ConvolutionFilterScale[i], 1.0, 1.0, 1.0, 1.0);
-      ASSIGN_4V(ctx->Pixel.ConvolutionFilterBias[i], 0.0, 0.0, 0.0, 0.0);
-   }
-   for (i = 0; i < MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_WIDTH * 4; i++) {
-      ctx->Convolution1D.Filter[i] = 0.0;
-      ctx->Convolution2D.Filter[i] = 0.0;
-      ctx->Separable2D.Filter[i] = 0.0;
-   }
-   ASSIGN_4V(ctx->Pixel.PostConvolutionScale, 1.0, 1.0, 1.0, 1.0);
-   ASSIGN_4V(ctx->Pixel.PostConvolutionBias, 0.0, 0.0, 0.0, 0.0);
-   /* GL_SGI_texture_color_table */
-   ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
-   ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);
-
-   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 "pixel.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 & _MESA_NEW_TRANSFER_STATE)

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

+   /* GL_SGI_texture_color_table */

+   ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);

+   ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);

+

+   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/pixel.h b/mesalib/src/mesa/main/pixel.h
index f4d3f1efd..c54b1fc5e 100644
--- a/mesalib/src/mesa/main/pixel.h
+++ b/mesalib/src/mesa/main/pixel.h
@@ -1,67 +1,72 @@
-/*
- * 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.h
- * Pixel operations.
- */
-
-
-#ifndef PIXEL_H
-#define PIXEL_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_pixel_transfer
-
-extern void 
-_mesa_update_pixel( GLcontext *ctx, GLuint newstate );
-
-extern void
-_mesa_init_pixel_dispatch( struct _glapi_table * disp );
-
-#else /* FEATURE_pixel_transfer */
-
-static INLINE void
-_mesa_update_pixel(GLcontext *ctx, GLuint newstate)
-{
-}
-
-static INLINE void
-_mesa_init_pixel_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_pixel_transfer */
-
-
-extern void 
-_mesa_init_pixel( GLcontext * ctx );
-
-/*@}*/
-
-#endif /* PIXEL_H */
+/*

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

+ * Pixel operations.

+ */

+

+

+#ifndef PIXEL_H

+#define PIXEL_H

+

+

+#include "compiler.h"

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct gl_context;

+

+

+#if FEATURE_pixel_transfer

+

+extern void 

+_mesa_update_pixel( struct gl_context *ctx, GLuint newstate );

+

+extern void

+_mesa_init_pixel_dispatch( struct _glapi_table * disp );

+

+#else /* FEATURE_pixel_transfer */

+

+static INLINE void

+_mesa_update_pixel(struct gl_context *ctx, GLuint newstate)

+{

+}

+

+static INLINE void

+_mesa_init_pixel_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_pixel_transfer */

+

+

+extern void 

+_mesa_init_pixel( struct gl_context * ctx );

+

+/*@}*/

+

+#endif /* PIXEL_H */

diff --git a/mesalib/src/mesa/main/pixelstore.c b/mesalib/src/mesa/main/pixelstore.c
index ec585ef0c..5d90391ca 100644
--- a/mesalib/src/mesa/main/pixelstore.c
+++ b/mesalib/src/mesa/main/pixelstore.c
@@ -1,283 +1,283 @@
-/*
- * 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 pixelstore.c
- * glPixelStore functions.
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "pixelstore.h"
-#include "mtypes.h"
-
-
-void GLAPIENTRY
-_mesa_PixelStorei( GLenum pname, GLint param )
-{
-   /* NOTE: this call can't be compiled into the display list */
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (pname) {
-      case GL_PACK_SWAP_BYTES:
-	 if (param == (GLint)ctx->Pack.SwapBytes)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_PACK_LSB_FIRST:
-	 if (param == (GLint)ctx->Pack.LsbFirst)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_PACK_ROW_LENGTH:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.RowLength == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.RowLength = param;
-	 break;
-      case GL_PACK_IMAGE_HEIGHT:
-         if (param<0) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.ImageHeight == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.ImageHeight = param;
-         break;
-      case GL_PACK_SKIP_PIXELS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.SkipPixels == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.SkipPixels = param;
-	 break;
-      case GL_PACK_SKIP_ROWS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.SkipRows == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.SkipRows = param;
-	 break;
-      case GL_PACK_SKIP_IMAGES:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.SkipImages == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.SkipImages = param;
-	 break;
-      case GL_PACK_ALIGNMENT:
-         if (param!=1 && param!=2 && param!=4 && param!=8) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Pack.Alignment == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Pack.Alignment = param;
-	 break;
-      case GL_PACK_INVERT_MESA:
-         if (!ctx->Extensions.MESA_pack_invert) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glPixelstore(pname)" );
-            return;
-         }
-         if (ctx->Pack.Invert == param)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Pack.Invert = param;
-         break;
-
-      case GL_UNPACK_SWAP_BYTES:
-	 if (param == (GLint)ctx->Unpack.SwapBytes)
-	    return;
-	 if ((GLint)ctx->Unpack.SwapBytes == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE;
-         break;
-      case GL_UNPACK_LSB_FIRST:
-	 if (param == (GLint)ctx->Unpack.LsbFirst)
-	    return;
-	 if ((GLint)ctx->Unpack.LsbFirst == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.LsbFirst = param ? GL_TRUE : GL_FALSE;
-	 break;
-      case GL_UNPACK_ROW_LENGTH:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.RowLength == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.RowLength = param;
-	 break;
-      case GL_UNPACK_IMAGE_HEIGHT:
-         if (param<0) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.ImageHeight == param)
-	    return;
-
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.ImageHeight = param;
-         break;
-      case GL_UNPACK_SKIP_PIXELS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.SkipPixels == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SkipPixels = param;
-	 break;
-      case GL_UNPACK_SKIP_ROWS:
-	 if (param<0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.SkipRows == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SkipRows = param;
-	 break;
-      case GL_UNPACK_SKIP_IMAGES:
-	 if (param < 0) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
-	    return;
-	 }
-	 if (ctx->Unpack.SkipImages == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.SkipImages = param;
-	 break;
-      case GL_UNPACK_ALIGNMENT:
-         if (param!=1 && param!=2 && param!=4 && param!=8) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore" );
-	    return;
-	 }
-	 if (ctx->Unpack.Alignment == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-	 ctx->Unpack.Alignment = param;
-	 break;
-      case GL_UNPACK_CLIENT_STORAGE_APPLE:
-         if (param == (GLint)ctx->Unpack.ClientStorage)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
-         ctx->Unpack.ClientStorage = param ? GL_TRUE : GL_FALSE;
-         break;
-      default:
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glPixelStore" );
-	 return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_PixelStoref( GLenum pname, GLfloat param )
-{
-   _mesa_PixelStorei( pname, (GLint) param );
-}
-
-
-
-/**
- * Initialize the context's pixel store state.
- */
-void
-_mesa_init_pixelstore( GLcontext *ctx )
-{
-   /* Pixel transfer */
-   ctx->Pack.Alignment = 4;
-   ctx->Pack.RowLength = 0;
-   ctx->Pack.ImageHeight = 0;
-   ctx->Pack.SkipPixels = 0;
-   ctx->Pack.SkipRows = 0;
-   ctx->Pack.SkipImages = 0;
-   ctx->Pack.SwapBytes = GL_FALSE;
-   ctx->Pack.LsbFirst = GL_FALSE;
-   ctx->Pack.ClientStorage = GL_FALSE;
-   ctx->Pack.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
-   _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj,
-                                 ctx->Shared->NullBufferObj);
-#endif
-   ctx->Unpack.Alignment = 4;
-   ctx->Unpack.RowLength = 0;
-   ctx->Unpack.ImageHeight = 0;
-   ctx->Unpack.SkipPixels = 0;
-   ctx->Unpack.SkipRows = 0;
-   ctx->Unpack.SkipImages = 0;
-   ctx->Unpack.SwapBytes = GL_FALSE;
-   ctx->Unpack.LsbFirst = GL_FALSE;
-   ctx->Unpack.ClientStorage = GL_FALSE;
-   ctx->Unpack.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
-   _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj,
-                                 ctx->Shared->NullBufferObj);
-#endif
-
-   /*
-    * _mesa_unpack_image() returns image data in this format.  When we
-    * execute image commands (glDrawPixels(), glTexImage(), etc) from
-    * within display lists we have to be sure to set the current
-    * unpacking parameters to these values!
-    */
-   ctx->DefaultPacking.Alignment = 1;
-   ctx->DefaultPacking.RowLength = 0;
-   ctx->DefaultPacking.SkipPixels = 0;
-   ctx->DefaultPacking.SkipRows = 0;
-   ctx->DefaultPacking.ImageHeight = 0;
-   ctx->DefaultPacking.SkipImages = 0;
-   ctx->DefaultPacking.SwapBytes = GL_FALSE;
-   ctx->DefaultPacking.LsbFirst = GL_FALSE;
-   ctx->DefaultPacking.ClientStorage = GL_FALSE;
-   ctx->DefaultPacking.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
-   _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj,
-                                 ctx->Shared->NullBufferObj);
-#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 pixelstore.c

+ * glPixelStore functions.

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "pixelstore.h"

+#include "mtypes.h"

+

+

+void GLAPIENTRY

+_mesa_PixelStorei( GLenum pname, GLint param )

+{

+   /* NOTE: this call can't be compiled into the display list */

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (pname) {

+      case GL_PACK_SWAP_BYTES:

+	 if (param == (GLint)ctx->Pack.SwapBytes)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+         ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE;

+	 break;

+      case GL_PACK_LSB_FIRST:

+	 if (param == (GLint)ctx->Pack.LsbFirst)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+         ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE;

+	 break;

+      case GL_PACK_ROW_LENGTH:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Pack.RowLength == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Pack.RowLength = param;

+	 break;

+      case GL_PACK_IMAGE_HEIGHT:

+         if (param<0) {

+            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Pack.ImageHeight == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Pack.ImageHeight = param;

+         break;

+      case GL_PACK_SKIP_PIXELS:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Pack.SkipPixels == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Pack.SkipPixels = param;

+	 break;

+      case GL_PACK_SKIP_ROWS:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Pack.SkipRows == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Pack.SkipRows = param;

+	 break;

+      case GL_PACK_SKIP_IMAGES:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Pack.SkipImages == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Pack.SkipImages = param;

+	 break;

+      case GL_PACK_ALIGNMENT:

+         if (param!=1 && param!=2 && param!=4 && param!=8) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Pack.Alignment == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Pack.Alignment = param;

+	 break;

+      case GL_PACK_INVERT_MESA:

+         if (!ctx->Extensions.MESA_pack_invert) {

+            _mesa_error( ctx, GL_INVALID_ENUM, "glPixelstore(pname)" );

+            return;

+         }

+         if (ctx->Pack.Invert == param)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+         ctx->Pack.Invert = param;

+         break;

+

+      case GL_UNPACK_SWAP_BYTES:

+	 if (param == (GLint)ctx->Unpack.SwapBytes)

+	    return;

+	 if ((GLint)ctx->Unpack.SwapBytes == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE;

+         break;

+      case GL_UNPACK_LSB_FIRST:

+	 if (param == (GLint)ctx->Unpack.LsbFirst)

+	    return;

+	 if ((GLint)ctx->Unpack.LsbFirst == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.LsbFirst = param ? GL_TRUE : GL_FALSE;

+	 break;

+      case GL_UNPACK_ROW_LENGTH:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Unpack.RowLength == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.RowLength = param;

+	 break;

+      case GL_UNPACK_IMAGE_HEIGHT:

+         if (param<0) {

+            _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Unpack.ImageHeight == param)

+	    return;

+

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.ImageHeight = param;

+         break;

+      case GL_UNPACK_SKIP_PIXELS:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Unpack.SkipPixels == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.SkipPixels = param;

+	 break;

+      case GL_UNPACK_SKIP_ROWS:

+	 if (param<0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Unpack.SkipRows == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.SkipRows = param;

+	 break;

+      case GL_UNPACK_SKIP_IMAGES:

+	 if (param < 0) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );

+	    return;

+	 }

+	 if (ctx->Unpack.SkipImages == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.SkipImages = param;

+	 break;

+      case GL_UNPACK_ALIGNMENT:

+         if (param!=1 && param!=2 && param!=4 && param!=8) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glPixelStore" );

+	    return;

+	 }

+	 if (ctx->Unpack.Alignment == param)

+	    return;

+	 FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+	 ctx->Unpack.Alignment = param;

+	 break;

+      case GL_UNPACK_CLIENT_STORAGE_APPLE:

+         if (param == (GLint)ctx->Unpack.ClientStorage)

+            return;

+         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);

+         ctx->Unpack.ClientStorage = param ? GL_TRUE : GL_FALSE;

+         break;

+      default:

+	 _mesa_error( ctx, GL_INVALID_ENUM, "glPixelStore" );

+	 return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_PixelStoref( GLenum pname, GLfloat param )

+{

+   _mesa_PixelStorei( pname, (GLint) param );

+}

+

+

+

+/**

+ * Initialize the context's pixel store state.

+ */

+void

+_mesa_init_pixelstore( struct gl_context *ctx )

+{

+   /* Pixel transfer */

+   ctx->Pack.Alignment = 4;

+   ctx->Pack.RowLength = 0;

+   ctx->Pack.ImageHeight = 0;

+   ctx->Pack.SkipPixels = 0;

+   ctx->Pack.SkipRows = 0;

+   ctx->Pack.SkipImages = 0;

+   ctx->Pack.SwapBytes = GL_FALSE;

+   ctx->Pack.LsbFirst = GL_FALSE;

+   ctx->Pack.ClientStorage = GL_FALSE;

+   ctx->Pack.Invert = GL_FALSE;

+#if FEATURE_EXT_pixel_buffer_object

+   _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj,

+                                 ctx->Shared->NullBufferObj);

+#endif

+   ctx->Unpack.Alignment = 4;

+   ctx->Unpack.RowLength = 0;

+   ctx->Unpack.ImageHeight = 0;

+   ctx->Unpack.SkipPixels = 0;

+   ctx->Unpack.SkipRows = 0;

+   ctx->Unpack.SkipImages = 0;

+   ctx->Unpack.SwapBytes = GL_FALSE;

+   ctx->Unpack.LsbFirst = GL_FALSE;

+   ctx->Unpack.ClientStorage = GL_FALSE;

+   ctx->Unpack.Invert = GL_FALSE;

+#if FEATURE_EXT_pixel_buffer_object

+   _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj,

+                                 ctx->Shared->NullBufferObj);

+#endif

+

+   /*

+    * _mesa_unpack_image() returns image data in this format.  When we

+    * execute image commands (glDrawPixels(), glTexImage(), etc) from

+    * within display lists we have to be sure to set the current

+    * unpacking parameters to these values!

+    */

+   ctx->DefaultPacking.Alignment = 1;

+   ctx->DefaultPacking.RowLength = 0;

+   ctx->DefaultPacking.SkipPixels = 0;

+   ctx->DefaultPacking.SkipRows = 0;

+   ctx->DefaultPacking.ImageHeight = 0;

+   ctx->DefaultPacking.SkipImages = 0;

+   ctx->DefaultPacking.SwapBytes = GL_FALSE;

+   ctx->DefaultPacking.LsbFirst = GL_FALSE;

+   ctx->DefaultPacking.ClientStorage = GL_FALSE;

+   ctx->DefaultPacking.Invert = GL_FALSE;

+#if FEATURE_EXT_pixel_buffer_object

+   _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj,

+                                 ctx->Shared->NullBufferObj);

+#endif

+}

diff --git a/mesalib/src/mesa/main/pixelstore.h b/mesalib/src/mesa/main/pixelstore.h
index 47bff4276..2995beb10 100644
--- a/mesalib/src/mesa/main/pixelstore.h
+++ b/mesalib/src/mesa/main/pixelstore.h
@@ -1,51 +1,52 @@
-/*
- * 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 pixelstore.h
- * glPixelStore functions.
- */
-
-
-#ifndef PIXELSTORE_H
-#define PIXELSTORE_H
-
-
-#include "glheader.h"
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_PixelStorei( GLenum pname, GLint param );
-
-
-extern void GLAPIENTRY
-_mesa_PixelStoref( GLenum pname, GLfloat param );
-
-
-extern void
-_mesa_init_pixelstore( GLcontext *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 pixelstore.h

+ * glPixelStore functions.

+ */

+

+

+#ifndef PIXELSTORE_H

+#define PIXELSTORE_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+

+extern void GLAPIENTRY

+_mesa_PixelStorei( GLenum pname, GLint param );

+

+

+extern void GLAPIENTRY

+_mesa_PixelStoref( GLenum pname, GLfloat param );

+

+

+extern void

+_mesa_init_pixelstore( struct gl_context *ctx );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/pixeltransfer.c b/mesalib/src/mesa/main/pixeltransfer.c
new file mode 100644
index 000000000..67173ce3e
--- /dev/null
+++ b/mesalib/src/mesa/main/pixeltransfer.c
@@ -0,0 +1,566 @@
+/*

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

+ * THE 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 pixeltransfer.c

+ * Pixel transfer operations (scale, bias, table lookups, etc)

+ */

+

+

+#include "glheader.h"

+#include "colormac.h"

+#include "pixeltransfer.h"

+#include "imports.h"

+

+

+/*

+ * Apply scale and bias factors to an array of RGBA pixels.

+ */

+void

+_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],

+                          GLfloat rScale, GLfloat gScale,

+                          GLfloat bScale, GLfloat aScale,

+                          GLfloat rBias, GLfloat gBias,

+                          GLfloat bBias, GLfloat aBias)

+{

+   if (rScale != 1.0 || rBias != 0.0) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         rgba[i][RCOMP] = rgba[i][RCOMP] * rScale + rBias;

+      }

+   }

+   if (gScale != 1.0 || gBias != 0.0) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         rgba[i][GCOMP] = rgba[i][GCOMP] * gScale + gBias;

+      }

+   }

+   if (bScale != 1.0 || bBias != 0.0) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         rgba[i][BCOMP] = rgba[i][BCOMP] * bScale + bBias;

+      }

+   }

+   if (aScale != 1.0 || aBias != 0.0) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         rgba[i][ACOMP] = rgba[i][ACOMP] * aScale + aBias;

+      }

+   }

+}

+

+

+/*

+ * Apply pixel mapping to an array of floating point RGBA pixels.

+ */

+void

+_mesa_map_rgba( const struct gl_context *ctx, GLuint n, GLfloat rgba[][4] )

+{

+   const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);

+   const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);

+   const GLfloat bscale = (GLfloat) (ctx->PixelMaps.BtoB.Size - 1);

+   const GLfloat ascale = (GLfloat) (ctx->PixelMaps.AtoA.Size - 1);

+   const GLfloat *rMap = ctx->PixelMaps.RtoR.Map;

+   const GLfloat *gMap = ctx->PixelMaps.GtoG.Map;

+   const GLfloat *bMap = ctx->PixelMaps.BtoB.Map;

+   const GLfloat *aMap = ctx->PixelMaps.AtoA.Map;

+   GLuint i;

+   for (i=0;i<n;i++) {

+      GLfloat r = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);

+      GLfloat g = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);

+      GLfloat b = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);

+      GLfloat a = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);

+      rgba[i][RCOMP] = rMap[IROUND(r * rscale)];

+      rgba[i][GCOMP] = gMap[IROUND(g * gscale)];

+      rgba[i][BCOMP] = bMap[IROUND(b * bscale)];

+      rgba[i][ACOMP] = aMap[IROUND(a * ascale)];

+   }

+}

+

+/**

+ * Apply a color table lookup to an array of floating point RGBA colors.

+ */

+void

+_mesa_lookup_rgba_float(const struct gl_color_table *table,

+                        GLuint n, GLfloat rgba[][4])

+{

+   const GLint max = table->Size - 1;

+   const GLfloat scale = (GLfloat) max;

+   const GLfloat *lut = table->TableF;

+   GLuint i;

+

+   if (!table->TableF || table->Size == 0)

+      return;

+

+   switch (table->_BaseFormat) {

+      case GL_INTENSITY:

+         /* replace RGBA with I */

+         for (i = 0; i < n; i++) {

+            GLint j = IROUND(rgba[i][RCOMP] * scale);

+            GLfloat c = lut[CLAMP(j, 0, max)];

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] =

+            rgba[i][ACOMP] = c;

+         }

+         break;

+      case GL_LUMINANCE:

+         /* replace RGB with L */

+         for (i = 0; i < n; i++) {

+            GLint j = IROUND(rgba[i][RCOMP] * scale);

+            GLfloat c = lut[CLAMP(j, 0, max)];

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = c;

+         }

+         break;

+      case GL_ALPHA:

+         /* replace A with A */

+         for (i = 0; i < n; i++) {

+            GLint j = IROUND(rgba[i][ACOMP] * scale);

+            rgba[i][ACOMP] = lut[CLAMP(j, 0, max)];

+         }

+         break;

+      case GL_LUMINANCE_ALPHA:

+         /* replace RGBA with LLLA */

+         for (i = 0; i < n; i++) {

+            GLint jL = IROUND(rgba[i][RCOMP] * scale);

+            GLint jA = IROUND(rgba[i][ACOMP] * scale);

+            GLfloat luminance, alpha;

+            jL = CLAMP(jL, 0, max);

+            jA = CLAMP(jA, 0, max);

+            luminance = lut[jL * 2 + 0];

+            alpha     = lut[jA * 2 + 1];

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = luminance;

+            rgba[i][ACOMP] = alpha;;

+         }

+         break;

+      case GL_RED:

+         /* replace RGB with RGB */

+         for (i = 0; i < n; i++) {

+            GLint jR = IROUND(rgba[i][RCOMP] * scale);

+            jR = CLAMP(jR, 0, max);

+            rgba[i][RCOMP] = lut[jR * 3 + 0];

+         }

+         break;

+      case GL_RG:

+         /* replace RG with RG */

+         for (i = 0; i < n; i++) {

+            GLint jR = IROUND(rgba[i][RCOMP] * scale);

+            GLint jG = IROUND(rgba[i][GCOMP] * scale);

+            jR = CLAMP(jR, 0, max);

+            jG = CLAMP(jG, 0, max);

+            rgba[i][RCOMP] = lut[jR * 3 + 0];

+            rgba[i][GCOMP] = lut[jG * 3 + 1];

+         }

+         break;

+      case GL_RGB:

+         /* replace RGB with RGB */

+         for (i = 0; i < n; i++) {

+            GLint jR = IROUND(rgba[i][RCOMP] * scale);

+            GLint jG = IROUND(rgba[i][GCOMP] * scale);

+            GLint jB = IROUND(rgba[i][BCOMP] * scale);

+            jR = CLAMP(jR, 0, max);

+            jG = CLAMP(jG, 0, max);

+            jB = CLAMP(jB, 0, max);

+            rgba[i][RCOMP] = lut[jR * 3 + 0];

+            rgba[i][GCOMP] = lut[jG * 3 + 1];

+            rgba[i][BCOMP] = lut[jB * 3 + 2];

+         }

+         break;

+      case GL_RGBA:

+         /* replace RGBA with RGBA */

+         for (i = 0; i < n; i++) {

+            GLint jR = IROUND(rgba[i][RCOMP] * scale);

+            GLint jG = IROUND(rgba[i][GCOMP] * scale);

+            GLint jB = IROUND(rgba[i][BCOMP] * scale);

+            GLint jA = IROUND(rgba[i][ACOMP] * scale);

+            jR = CLAMP(jR, 0, max);

+            jG = CLAMP(jG, 0, max);

+            jB = CLAMP(jB, 0, max);

+            jA = CLAMP(jA, 0, max);

+            rgba[i][RCOMP] = lut[jR * 4 + 0];

+            rgba[i][GCOMP] = lut[jG * 4 + 1];

+            rgba[i][BCOMP] = lut[jB * 4 + 2];

+            rgba[i][ACOMP] = lut[jA * 4 + 3];

+         }

+         break;

+      default:

+         _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_float");

+         return;

+   }

+}

+

+

+

+/**

+ * Apply a color table lookup to an array of ubyte/RGBA colors.

+ */

+void

+_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,

+                        GLuint n, GLubyte rgba[][4])

+{

+   const GLubyte *lut = table->TableUB;

+   const GLfloat scale = (GLfloat) (table->Size - 1) / (GLfloat)255.0;

+   GLuint i;

+

+   if (!table->TableUB || table->Size == 0)

+      return;

+

+   switch (table->_BaseFormat) {

+   case GL_INTENSITY:

+      /* replace RGBA with I */

+      if (table->Size == 256) {

+         for (i = 0; i < n; i++) {

+            const GLubyte c = lut[rgba[i][RCOMP]];

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] =

+            rgba[i][ACOMP] = c;

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] =

+            rgba[i][ACOMP] = lut[j];

+         }

+      }

+      break;

+   case GL_LUMINANCE:

+      /* replace RGB with L */

+      if (table->Size == 256) {

+         for (i = 0; i < n; i++) {

+            const GLubyte c = lut[rgba[i][RCOMP]];

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = c;

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            GLint j = IROUND((GLfloat) rgba[i][RCOMP] * scale);

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = lut[j];

+         }

+      }

+      break;

+   case GL_ALPHA:

+      /* replace A with A */

+      if (table->Size == 256) {

+         for (i = 0; i < n; i++) {

+            rgba[i][ACOMP] = lut[rgba[i][ACOMP]];

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            GLint j = IROUND((GLfloat) rgba[i][ACOMP] * scale);

+            rgba[i][ACOMP] = lut[j];

+         }

+      }

+      break;

+   case GL_LUMINANCE_ALPHA:

+      /* replace RGBA with LLLA */

+      if (table->Size == 256) {

+         for (i = 0; i < n; i++) {

+            GLubyte l = lut[rgba[i][RCOMP] * 2 + 0];

+            GLubyte a = lut[rgba[i][ACOMP] * 2 + 1];;

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = l;

+            rgba[i][ACOMP] = a;

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            GLint jL = IROUND((GLfloat) rgba[i][RCOMP] * scale);

+            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);

+            GLubyte luminance = lut[jL * 2 + 0];

+            GLubyte alpha     = lut[jA * 2 + 1];

+            rgba[i][RCOMP] =

+            rgba[i][GCOMP] =

+            rgba[i][BCOMP] = luminance;

+            rgba[i][ACOMP] = alpha;

+         }

+      }

+      break;

+   case GL_RGB:

+      if (table->Size == 256) {

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 3 + 0];

+            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 3 + 1];

+            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 3 + 2];

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);

+            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);

+            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);

+            rgba[i][RCOMP] = lut[jR * 3 + 0];

+            rgba[i][GCOMP] = lut[jG * 3 + 1];

+            rgba[i][BCOMP] = lut[jB * 3 + 2];

+         }

+      }

+      break;

+   case GL_RGBA:

+      if (table->Size == 256) {

+         for (i = 0; i < n; i++) {

+            rgba[i][RCOMP] = lut[rgba[i][RCOMP] * 4 + 0];

+            rgba[i][GCOMP] = lut[rgba[i][GCOMP] * 4 + 1];

+            rgba[i][BCOMP] = lut[rgba[i][BCOMP] * 4 + 2];

+            rgba[i][ACOMP] = lut[rgba[i][ACOMP] * 4 + 3];

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            GLint jR = IROUND((GLfloat) rgba[i][RCOMP] * scale);

+            GLint jG = IROUND((GLfloat) rgba[i][GCOMP] * scale);

+            GLint jB = IROUND((GLfloat) rgba[i][BCOMP] * scale);

+            GLint jA = IROUND((GLfloat) rgba[i][ACOMP] * scale);

+            CLAMPED_FLOAT_TO_CHAN(rgba[i][RCOMP], lut[jR * 4 + 0]);

+            CLAMPED_FLOAT_TO_CHAN(rgba[i][GCOMP], lut[jG * 4 + 1]);

+            CLAMPED_FLOAT_TO_CHAN(rgba[i][BCOMP], lut[jB * 4 + 2]);

+            CLAMPED_FLOAT_TO_CHAN(rgba[i][ACOMP], lut[jA * 4 + 3]);

+         }

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "Bad format in _mesa_lookup_rgba_chan");

+      return;

+   }

+}

+

+

+

+/*

+ * Map color indexes to float rgba values.

+ */

+void

+_mesa_map_ci_to_rgba( const struct gl_context *ctx, GLuint n,

+                      const GLuint index[], GLfloat rgba[][4] )

+{

+   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;

+   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;

+   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;

+   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;

+   const GLfloat *rMap = ctx->PixelMaps.ItoR.Map;

+   const GLfloat *gMap = ctx->PixelMaps.ItoG.Map;

+   const GLfloat *bMap = ctx->PixelMaps.ItoB.Map;

+   const GLfloat *aMap = ctx->PixelMaps.ItoA.Map;

+   GLuint i;

+   for (i=0;i<n;i++) {

+      rgba[i][RCOMP] = rMap[index[i] & rmask];

+      rgba[i][GCOMP] = gMap[index[i] & gmask];

+      rgba[i][BCOMP] = bMap[index[i] & bmask];

+      rgba[i][ACOMP] = aMap[index[i] & amask];

+   }

+}

+

+

+/**

+ * Map ubyte color indexes to ubyte/RGBA values.

+ */

+void

+_mesa_map_ci8_to_rgba8(const struct gl_context *ctx,

+                       GLuint n, const GLubyte index[],

+                       GLubyte rgba[][4])

+{

+   GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;

+   GLuint gmask = ctx->PixelMaps.ItoG.Size - 1;

+   GLuint bmask = ctx->PixelMaps.ItoB.Size - 1;

+   GLuint amask = ctx->PixelMaps.ItoA.Size - 1;

+   const GLubyte *rMap = ctx->PixelMaps.ItoR.Map8;

+   const GLubyte *gMap = ctx->PixelMaps.ItoG.Map8;

+   const GLubyte *bMap = ctx->PixelMaps.ItoB.Map8;

+   const GLubyte *aMap = ctx->PixelMaps.ItoA.Map8;

+   GLuint i;

+   for (i=0;i<n;i++) {

+      rgba[i][RCOMP] = rMap[index[i] & rmask];

+      rgba[i][GCOMP] = gMap[index[i] & gmask];

+      rgba[i][BCOMP] = bMap[index[i] & bmask];

+      rgba[i][ACOMP] = aMap[index[i] & amask];

+   }

+}

+

+

+void

+_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,

+                           GLfloat depthValues[])

+{

+   const GLfloat scale = ctx->Pixel.DepthScale;

+   const GLfloat bias = ctx->Pixel.DepthBias;

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      GLfloat d = depthValues[i] * scale + bias;

+      depthValues[i] = CLAMP(d, 0.0F, 1.0F);

+   }

+}

+

+

+void

+_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,

+                                GLuint depthValues[])

+{

+   const GLdouble max = (double) 0xffffffff;

+   const GLdouble scale = ctx->Pixel.DepthScale;

+   const GLdouble bias = ctx->Pixel.DepthBias * max;

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      GLdouble d = (GLdouble) depthValues[i] * scale + bias;

+      d = CLAMP(d, 0.0, max);

+      depthValues[i] = (GLuint) d;

+   }

+}

+

+/**

+ * Apply various pixel transfer operations to an array of RGBA pixels

+ * as indicated by the transferOps bitmask

+ */

+void

+_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,

+                              GLuint n, GLfloat rgba[][4])

+{

+   /* scale & bias */

+   if (transferOps & IMAGE_SCALE_BIAS_BIT) {

+      _mesa_scale_and_bias_rgba(n, rgba,

+                                ctx->Pixel.RedScale, ctx->Pixel.GreenScale,

+                                ctx->Pixel.BlueScale, ctx->Pixel.AlphaScale,

+                                ctx->Pixel.RedBias, ctx->Pixel.GreenBias,

+                                ctx->Pixel.BlueBias, ctx->Pixel.AlphaBias);

+   }

+   /* color map lookup */

+   if (transferOps & IMAGE_MAP_COLOR_BIT) {

+      _mesa_map_rgba( ctx, n, rgba );

+   }

+

+   /* clamping to [0,1] */

+   if (transferOps & IMAGE_CLAMP_BIT) {

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);

+         rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);

+         rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);

+         rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);

+      }

+   }

+}

+

+

+/*

+ * Apply color index shift and offset to an array of pixels.

+ */

+void

+_mesa_shift_and_offset_ci(const struct gl_context *ctx,

+                          GLuint n, GLuint indexes[])

+{

+   GLint shift = ctx->Pixel.IndexShift;

+   GLint offset = ctx->Pixel.IndexOffset;

+   GLuint i;

+   if (shift > 0) {

+      for (i=0;i<n;i++) {

+         indexes[i] = (indexes[i] << shift) + offset;

+      }

+   }

+   else if (shift < 0) {

+      shift = -shift;

+      for (i=0;i<n;i++) {

+         indexes[i] = (indexes[i] >> shift) + offset;

+      }

+   }

+   else {

+      for (i=0;i<n;i++) {

+         indexes[i] = indexes[i] + offset;

+      }

+   }

+}

+

+

+

+/**

+ * Apply color index shift, offset and table lookup to an array

+ * of color indexes;

+ */

+void

+_mesa_apply_ci_transfer_ops(const struct gl_context *ctx,

+                            GLbitfield transferOps,

+                            GLuint n, GLuint indexes[])

+{

+   if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {

+      _mesa_shift_and_offset_ci(ctx, n, indexes);

+   }

+   if (transferOps & IMAGE_MAP_COLOR_BIT) {

+      const GLuint mask = ctx->PixelMaps.ItoI.Size - 1;

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         const GLuint j = indexes[i] & mask;

+         indexes[i] = IROUND(ctx->PixelMaps.ItoI.Map[j]);

+      }

+   }

+}

+

+

+/**

+ * Apply stencil index shift, offset and table lookup to an array

+ * of stencil values.

+ */

+void

+_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,

+                                 GLstencil stencil[])

+{

+   if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) {

+      const GLint offset = ctx->Pixel.IndexOffset;

+      GLint shift = ctx->Pixel.IndexShift;

+      GLuint i;

+      if (shift > 0) {

+         for (i = 0; i < n; i++) {

+            stencil[i] = (stencil[i] << shift) + offset;

+         }

+      }

+      else if (shift < 0) {

+         shift = -shift;

+         for (i = 0; i < n; i++) {

+            stencil[i] = (stencil[i] >> shift) + offset;

+         }

+      }

+      else {

+         for (i = 0; i < n; i++) {

+            stencil[i] = stencil[i] + offset;

+         }

+      }

+   }

+   if (ctx->Pixel.MapStencilFlag) {

+      GLuint mask = ctx->PixelMaps.StoS.Size - 1;

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         stencil[i] = (GLstencil)ctx->PixelMaps.StoS.Map[ stencil[i] & mask ];

+      }

+   }

+}

diff --git a/mesalib/src/mesa/main/pixeltransfer.h b/mesalib/src/mesa/main/pixeltransfer.h
new file mode 100644
index 000000000..c00da3f2a
--- /dev/null
+++ b/mesalib/src/mesa/main/pixeltransfer.h
@@ -0,0 +1,90 @@
+/*

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

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

+ */

+

+

+#ifndef PIXELTRANSFER_H

+#define PIXELTRANSFER_H

+

+

+#include "mtypes.h"

+

+

+extern void

+_mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],

+                          GLfloat rScale, GLfloat gScale,

+                          GLfloat bScale, GLfloat aScale,

+                          GLfloat rBias, GLfloat gBias,

+                          GLfloat bBias, GLfloat aBias);

+

+extern void

+_mesa_map_rgba(const struct gl_context *ctx, GLuint n, GLfloat rgba[][4]);

+

+extern void

+_mesa_lookup_rgba_float(const struct gl_color_table *table,

+                        GLuint n, GLfloat rgba[][4]);

+

+extern void

+_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,

+                        GLuint n, GLubyte rgba[][4]);

+

+

+extern void

+_mesa_map_ci_to_rgba(const struct gl_context *ctx,

+                     GLuint n, const GLuint index[], GLfloat rgba[][4]);

+

+

+extern void

+_mesa_map_ci8_to_rgba8(const struct gl_context *ctx,

+                       GLuint n, const GLubyte index[],

+                       GLubyte rgba[][4]);

+

+

+extern void

+_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,

+                           GLfloat depthValues[]);

+

+extern void

+_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,

+                                GLuint depthValues[]);

+

+extern void

+_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,

+                              GLuint n, GLfloat rgba[][4]);

+

+extern void

+_mesa_shift_and_offset_ci(const struct gl_context *ctx,

+                          GLuint n, GLuint indexes[]);

+

+extern void

+_mesa_apply_ci_transfer_ops(const struct gl_context *ctx,

+                            GLbitfield transferOps,

+                            GLuint n, GLuint indexes[]);

+

+

+extern void

+_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,

+                                 GLstencil stencil[]);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/points.c b/mesalib/src/mesa/main/points.c
index eab9d13d6..78d40f61c 100644
--- a/mesalib/src/mesa/main/points.c
+++ b/mesalib/src/mesa/main/points.c
@@ -1,272 +1,272 @@
-/**
- * \file points.c
- * Point operations.
- */
-
-/*
- * 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 "context.h"
-#include "macros.h"
-#include "points.h"
-#include "mtypes.h"
-
-
-/**
- * Set current point size.
- * \param size  point diameter in pixels
- * \sa glPointSize().
- */
-void GLAPIENTRY
-_mesa_PointSize( GLfloat size )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (size <= 0.0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glPointSize" );
-      return;
-   }
-
-   if (ctx->Point.Size == size)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_POINT);
-   ctx->Point.Size = size;
-
-   if (ctx->Driver.PointSize)
-      ctx->Driver.PointSize(ctx, size);
-}
-
-
-#if _HAVE_FULL_GL
-
-
-void GLAPIENTRY
-_mesa_PointParameteri( GLenum pname, GLint param )
-{
-   GLfloat p[3];
-   p[0] = (GLfloat) param;
-   p[1] = p[2] = 0.0F;
-   _mesa_PointParameterfv(pname, p);
-}
-
-
-void GLAPIENTRY
-_mesa_PointParameteriv( GLenum pname, const GLint *params )
-{
-   GLfloat p[3];
-   p[0] = (GLfloat) params[0];
-   if (pname == GL_DISTANCE_ATTENUATION_EXT) {
-      p[1] = (GLfloat) params[1];
-      p[2] = (GLfloat) params[2];
-   }
-   _mesa_PointParameterfv(pname, p);
-}
-
-
-void GLAPIENTRY
-_mesa_PointParameterf( GLenum pname, GLfloat param)
-{
-   GLfloat p[3];
-   p[0] = param;
-   p[1] = p[2] = 0.0F;
-   _mesa_PointParameterfv(pname, p);
-}
-
-
-void GLAPIENTRY
-_mesa_PointParameterfv( GLenum pname, const GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (pname) {
-      case GL_DISTANCE_ATTENUATION_EXT:
-         if (ctx->Extensions.EXT_point_parameters) {
-            if (TEST_EQ_3V(ctx->Point.Params, params))
-	       return;
-	    FLUSH_VERTICES(ctx, _NEW_POINT);
-            COPY_3V(ctx->Point.Params, params);
-            ctx->Point._Attenuated = (ctx->Point.Params[0] != 1.0 ||
-                                      ctx->Point.Params[1] != 0.0 ||
-                                      ctx->Point.Params[2] != 0.0);
-
-            if (ctx->Point._Attenuated)
-               ctx->_TriangleCaps |= DD_POINT_ATTEN;
-            else
-               ctx->_TriangleCaps &= ~DD_POINT_ATTEN;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glPointParameterf[v]{EXT,ARB}(pname)");
-            return;
-         }
-         break;
-      case GL_POINT_SIZE_MIN_EXT:
-         if (ctx->Extensions.EXT_point_parameters) {
-            if (params[0] < 0.0F) {
-               _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glPointParameterf[v]{EXT,ARB}(param)" );
-               return;
-            }
-            if (ctx->Point.MinSize == params[0])
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.MinSize = params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glPointParameterf[v]{EXT,ARB}(pname)");
-            return;
-         }
-         break;
-      case GL_POINT_SIZE_MAX_EXT:
-         if (ctx->Extensions.EXT_point_parameters) {
-            if (params[0] < 0.0F) {
-               _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glPointParameterf[v]{EXT,ARB}(param)" );
-               return;
-            }
-            if (ctx->Point.MaxSize == params[0])
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.MaxSize = params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glPointParameterf[v]{EXT,ARB}(pname)");
-            return;
-         }
-         break;
-      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
-         if (ctx->Extensions.EXT_point_parameters) {
-            if (params[0] < 0.0F) {
-               _mesa_error( ctx, GL_INVALID_VALUE,
-                            "glPointParameterf[v]{EXT,ARB}(param)" );
-               return;
-            }
-            if (ctx->Point.Threshold == params[0])
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.Threshold = params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glPointParameterf[v]{EXT,ARB}(pname)");
-            return;
-         }
-         break;
-      case GL_POINT_SPRITE_R_MODE_NV:
-         /* This is one area where ARB_point_sprite and NV_point_sprite
-	  * differ.  In ARB_point_sprite the POINT_SPRITE_R_MODE is
-	  * always ZERO.  NV_point_sprite adds the S and R modes.
-	  */
-         if (ctx->Extensions.NV_point_sprite) {
-            GLenum value = (GLenum) params[0];
-            if (value != GL_ZERO && value != GL_S && value != GL_R) {
-               _mesa_error(ctx, GL_INVALID_VALUE,
-                           "glPointParameterf[v]{EXT,ARB}(param)");
-               return;
-            }
-            if (ctx->Point.SpriteRMode == value)
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.SpriteRMode = value;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glPointParameterf[v]{EXT,ARB}(pname)");
-            return;
-         }
-         break;
-      case GL_POINT_SPRITE_COORD_ORIGIN:
-	 /* This is not completely correct.  GL_POINT_SPRITE_COORD_ORIGIN was
-	  * added to point sprites when the extension was merged into OpenGL
-	  * 2.0.  It is expected that an implementation supporting OpenGL 1.4
-	  * and GL_ARB_point_sprite will generate an error here.
-	  */
-         if (ctx->Extensions.ARB_point_sprite) {
-            GLenum value = (GLenum) params[0];
-            if (value != GL_LOWER_LEFT && value != GL_UPPER_LEFT) {
-               _mesa_error(ctx, GL_INVALID_VALUE,
-                           "glPointParameterf[v]{EXT,ARB}(param)");
-               return;
-            }
-            if (ctx->Point.SpriteOrigin == value)
-               return;
-            FLUSH_VERTICES(ctx, _NEW_POINT);
-            ctx->Point.SpriteOrigin = value;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glPointParameterf[v]{EXT,ARB}(pname)");
-            return;
-         }
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM,
-                      "glPointParameterf[v]{EXT,ARB}(pname)" );
-         return;
-   }
-
-   if (ctx->Driver.PointParameterfv)
-      (*ctx->Driver.PointParameterfv)(ctx, pname, params);
-}
-#endif
-
-
-
-/**
- * Initialize the context point state.
- *
- * \param ctx GL context.
- *
- * Initializes __GLcontextRec::Point and point related constants in
- * __GLcontextRec::Const.
- */
-void
-_mesa_init_point(GLcontext *ctx)
-{
-   GLuint i;
-
-   ctx->Point.SmoothFlag = GL_FALSE;
-   ctx->Point.Size = 1.0;
-   ctx->Point.Params[0] = 1.0;
-   ctx->Point.Params[1] = 0.0;
-   ctx->Point.Params[2] = 0.0;
-   ctx->Point._Attenuated = GL_FALSE;
-   ctx->Point.MinSize = 0.0;
-   ctx->Point.MaxSize
-      = MAX2(ctx->Const.MaxPointSize, ctx->Const.MaxPointSizeAA);
-   ctx->Point.Threshold = 1.0;
-   ctx->Point.PointSprite = GL_FALSE; /* GL_ARB/NV_point_sprite */
-   ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
-   ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */
-   for (i = 0; i < Elements(ctx->Point.CoordReplace); i++) {
-      ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_ARB/NV_point_sprite */
-   }
-}
+/**

+ * \file points.c

+ * Point operations.

+ */

+

+/*

+ * 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 "context.h"

+#include "macros.h"

+#include "points.h"

+#include "mtypes.h"

+

+

+/**

+ * Set current point size.

+ * \param size  point diameter in pixels

+ * \sa glPointSize().

+ */

+void GLAPIENTRY

+_mesa_PointSize( GLfloat size )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (size <= 0.0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glPointSize" );

+      return;

+   }

+

+   if (ctx->Point.Size == size)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_POINT);

+   ctx->Point.Size = size;

+

+   if (ctx->Driver.PointSize)

+      ctx->Driver.PointSize(ctx, size);

+}

+

+

+#if _HAVE_FULL_GL

+

+

+void GLAPIENTRY

+_mesa_PointParameteri( GLenum pname, GLint param )

+{

+   GLfloat p[3];

+   p[0] = (GLfloat) param;

+   p[1] = p[2] = 0.0F;

+   _mesa_PointParameterfv(pname, p);

+}

+

+

+void GLAPIENTRY

+_mesa_PointParameteriv( GLenum pname, const GLint *params )

+{

+   GLfloat p[3];

+   p[0] = (GLfloat) params[0];

+   if (pname == GL_DISTANCE_ATTENUATION_EXT) {

+      p[1] = (GLfloat) params[1];

+      p[2] = (GLfloat) params[2];

+   }

+   _mesa_PointParameterfv(pname, p);

+}

+

+

+void GLAPIENTRY

+_mesa_PointParameterf( GLenum pname, GLfloat param)

+{

+   GLfloat p[3];

+   p[0] = param;

+   p[1] = p[2] = 0.0F;

+   _mesa_PointParameterfv(pname, p);

+}

+

+

+void GLAPIENTRY

+_mesa_PointParameterfv( GLenum pname, const GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   switch (pname) {

+      case GL_DISTANCE_ATTENUATION_EXT:

+         if (ctx->Extensions.EXT_point_parameters) {

+            if (TEST_EQ_3V(ctx->Point.Params, params))

+	       return;

+	    FLUSH_VERTICES(ctx, _NEW_POINT);

+            COPY_3V(ctx->Point.Params, params);

+            ctx->Point._Attenuated = (ctx->Point.Params[0] != 1.0 ||

+                                      ctx->Point.Params[1] != 0.0 ||

+                                      ctx->Point.Params[2] != 0.0);

+

+            if (ctx->Point._Attenuated)

+               ctx->_TriangleCaps |= DD_POINT_ATTEN;

+            else

+               ctx->_TriangleCaps &= ~DD_POINT_ATTEN;

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glPointParameterf[v]{EXT,ARB}(pname)");

+            return;

+         }

+         break;

+      case GL_POINT_SIZE_MIN_EXT:

+         if (ctx->Extensions.EXT_point_parameters) {

+            if (params[0] < 0.0F) {

+               _mesa_error( ctx, GL_INVALID_VALUE,

+                            "glPointParameterf[v]{EXT,ARB}(param)" );

+               return;

+            }

+            if (ctx->Point.MinSize == params[0])

+               return;

+            FLUSH_VERTICES(ctx, _NEW_POINT);

+            ctx->Point.MinSize = params[0];

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glPointParameterf[v]{EXT,ARB}(pname)");

+            return;

+         }

+         break;

+      case GL_POINT_SIZE_MAX_EXT:

+         if (ctx->Extensions.EXT_point_parameters) {

+            if (params[0] < 0.0F) {

+               _mesa_error( ctx, GL_INVALID_VALUE,

+                            "glPointParameterf[v]{EXT,ARB}(param)" );

+               return;

+            }

+            if (ctx->Point.MaxSize == params[0])

+               return;

+            FLUSH_VERTICES(ctx, _NEW_POINT);

+            ctx->Point.MaxSize = params[0];

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glPointParameterf[v]{EXT,ARB}(pname)");

+            return;

+         }

+         break;

+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:

+         if (ctx->Extensions.EXT_point_parameters) {

+            if (params[0] < 0.0F) {

+               _mesa_error( ctx, GL_INVALID_VALUE,

+                            "glPointParameterf[v]{EXT,ARB}(param)" );

+               return;

+            }

+            if (ctx->Point.Threshold == params[0])

+               return;

+            FLUSH_VERTICES(ctx, _NEW_POINT);

+            ctx->Point.Threshold = params[0];

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glPointParameterf[v]{EXT,ARB}(pname)");

+            return;

+         }

+         break;

+      case GL_POINT_SPRITE_R_MODE_NV:

+         /* This is one area where ARB_point_sprite and NV_point_sprite

+	  * differ.  In ARB_point_sprite the POINT_SPRITE_R_MODE is

+	  * always ZERO.  NV_point_sprite adds the S and R modes.

+	  */

+         if (ctx->Extensions.NV_point_sprite) {

+            GLenum value = (GLenum) params[0];

+            if (value != GL_ZERO && value != GL_S && value != GL_R) {

+               _mesa_error(ctx, GL_INVALID_VALUE,

+                           "glPointParameterf[v]{EXT,ARB}(param)");

+               return;

+            }

+            if (ctx->Point.SpriteRMode == value)

+               return;

+            FLUSH_VERTICES(ctx, _NEW_POINT);

+            ctx->Point.SpriteRMode = value;

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glPointParameterf[v]{EXT,ARB}(pname)");

+            return;

+         }

+         break;

+      case GL_POINT_SPRITE_COORD_ORIGIN:

+	 /* This is not completely correct.  GL_POINT_SPRITE_COORD_ORIGIN was

+	  * added to point sprites when the extension was merged into OpenGL

+	  * 2.0.  It is expected that an implementation supporting OpenGL 1.4

+	  * and GL_ARB_point_sprite will generate an error here.

+	  */

+         if (ctx->Extensions.ARB_point_sprite) {

+            GLenum value = (GLenum) params[0];

+            if (value != GL_LOWER_LEFT && value != GL_UPPER_LEFT) {

+               _mesa_error(ctx, GL_INVALID_VALUE,

+                           "glPointParameterf[v]{EXT,ARB}(param)");

+               return;

+            }

+            if (ctx->Point.SpriteOrigin == value)

+               return;

+            FLUSH_VERTICES(ctx, _NEW_POINT);

+            ctx->Point.SpriteOrigin = value;

+         }

+         else {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glPointParameterf[v]{EXT,ARB}(pname)");

+            return;

+         }

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM,

+                      "glPointParameterf[v]{EXT,ARB}(pname)" );

+         return;

+   }

+

+   if (ctx->Driver.PointParameterfv)

+      (*ctx->Driver.PointParameterfv)(ctx, pname, params);

+}

+#endif

+

+

+

+/**

+ * Initialize the context point state.

+ *

+ * \param ctx GL context.

+ *

+ * Initializes __struct gl_contextRec::Point and point related constants in

+ * __struct gl_contextRec::Const.

+ */

+void

+_mesa_init_point(struct gl_context *ctx)

+{

+   GLuint i;

+

+   ctx->Point.SmoothFlag = GL_FALSE;

+   ctx->Point.Size = 1.0;

+   ctx->Point.Params[0] = 1.0;

+   ctx->Point.Params[1] = 0.0;

+   ctx->Point.Params[2] = 0.0;

+   ctx->Point._Attenuated = GL_FALSE;

+   ctx->Point.MinSize = 0.0;

+   ctx->Point.MaxSize

+      = MAX2(ctx->Const.MaxPointSize, ctx->Const.MaxPointSizeAA);

+   ctx->Point.Threshold = 1.0;

+   ctx->Point.PointSprite = GL_FALSE; /* GL_ARB/NV_point_sprite */

+   ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */

+   ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */

+   for (i = 0; i < Elements(ctx->Point.CoordReplace); i++) {

+      ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_ARB/NV_point_sprite */

+   }

+}

diff --git a/mesalib/src/mesa/main/points.h b/mesalib/src/mesa/main/points.h
index 156641eab..442053c8f 100644
--- a/mesalib/src/mesa/main/points.h
+++ b/mesalib/src/mesa/main/points.h
@@ -1,57 +1,59 @@
-/**
- * \file points.h
- * Point operations.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 POINTS_H
-#define POINTS_H
-
-
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_PointSize( GLfloat size );
-
-extern void GLAPIENTRY
-_mesa_PointParameteri( GLenum pname, GLint param );
-
-extern void GLAPIENTRY
-_mesa_PointParameteriv( GLenum pname, const GLint *params );
-
-extern void GLAPIENTRY
-_mesa_PointParameterf( GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
-_mesa_PointParameterfv( GLenum pname, const GLfloat *params );
-
-extern void 
-_mesa_init_point( GLcontext * ctx );
-
-
-#endif
+/**

+ * \file points.h

+ * Point operations.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 POINTS_H

+#define POINTS_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+

+extern void GLAPIENTRY

+_mesa_PointSize( GLfloat size );

+

+extern void GLAPIENTRY

+_mesa_PointParameteri( GLenum pname, GLint param );

+

+extern void GLAPIENTRY

+_mesa_PointParameteriv( GLenum pname, const GLint *params );

+

+extern void GLAPIENTRY

+_mesa_PointParameterf( GLenum pname, GLfloat param );

+

+extern void GLAPIENTRY

+_mesa_PointParameterfv( GLenum pname, const GLfloat *params );

+

+extern void 

+_mesa_init_point( struct gl_context * ctx );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/polygon.c b/mesalib/src/mesa/main/polygon.c
index 30e4a606b..71ef929fc 100644
--- a/mesalib/src/mesa/main/polygon.c
+++ b/mesalib/src/mesa/main/polygon.c
@@ -1,321 +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 "bufferobj.h"
-#include "context.h"
-#include "image.h"
-#include "enums.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(GLcontext *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 __GLcontextRec::Polygon and __GLcontextRec::PolygonStipple
- * attribute groups.
- */
-void _mesa_init_polygon( GLcontext * 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 "bufferobj.h"

+#include "context.h"

+#include "image.h"

+#include "enums.h"

+#include "pack.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/polygon.h b/mesalib/src/mesa/main/polygon.h
index 78e8394d0..1357d4b01 100644
--- a/mesalib/src/mesa/main/polygon.h
+++ b/mesalib/src/mesa/main/polygon.h
@@ -1,66 +1,67 @@
-/**
- * \file polygon.h
- * 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.
- */
-
-
-#ifndef POLYGON_H
-#define POLYGON_H
-
-
-#include "mtypes.h"
-
-
-extern void
-_mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern);
-
-
-extern void GLAPIENTRY
-_mesa_CullFace( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_FrontFace( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_PolygonMode( GLenum face, GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_PolygonOffset( GLfloat factor, GLfloat units );
-
-extern void GLAPIENTRY
-_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias );
-
-extern void GLAPIENTRY
-_mesa_PolygonStipple( const GLubyte *mask );
-
-extern void GLAPIENTRY
-_mesa_GetPolygonStipple( GLubyte *mask );
-
-extern void 
-_mesa_init_polygon( GLcontext * ctx );
-
-#endif
+/**

+ * \file polygon.h

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

+ */

+

+

+#ifndef POLYGON_H

+#define POLYGON_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void

+_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern);

+

+

+extern void GLAPIENTRY

+_mesa_CullFace( GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_FrontFace( GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_PolygonMode( GLenum face, GLenum mode );

+

+extern void GLAPIENTRY

+_mesa_PolygonOffset( GLfloat factor, GLfloat units );

+

+extern void GLAPIENTRY

+_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias );

+

+extern void GLAPIENTRY

+_mesa_PolygonStipple( const GLubyte *mask );

+

+extern void GLAPIENTRY

+_mesa_GetPolygonStipple( GLubyte *mask );

+

+extern void 

+_mesa_init_polygon( struct gl_context * ctx );

+

+#endif

diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c
index 36236eb9a..aade8a614 100644
--- a/mesalib/src/mesa/main/querymatrix.c
+++ b/mesalib/src/mesa/main/querymatrix.c
@@ -1,216 +1,212 @@
-/**************************************************************************
- *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- **************************************************************************/
-
-
-/**
- * Code to implement GL_OES_query_matrix.  See the spec at:
- * http://www.khronos.org/registry/gles/extensions/OES/OES_query_matrix.txt
- */
-
-
-#include <stdlib.h>
-#include <math.h>
-#include "GLES/gl.h"
-#include "GLES/glext.h"
-
-
-/**
- * This is from the GL_OES_query_matrix extension specification:
- *
- *  GLbitfield glQueryMatrixxOES( GLfixed mantissa[16],
- *                                GLint   exponent[16] )
- *  mantissa[16] contains the contents of the current matrix in GLfixed
- *  format.  exponent[16] contains the unbiased exponents applied to the
- *  matrix components, so that the internal representation of component i
- *  is close to mantissa[i] * 2^exponent[i].  The function returns a status
- *  word which is zero if all the components are valid. If
- *  status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf).
- *  The implementations are not required to keep track of overflows.  In
- *  that case, the invalid bits are never set.
- */
-
-#define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))
-#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
-
-#if defined(_MSC_VER)
-/* Oddly, the fpclassify() function doesn't exist in such a form
- * on MSVC.  This is an implementation using slightly different
- * lower-level Windows functions.
- */
-#include <float.h>
-
-enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
-fpclassify(double x)
-{
-    switch(_fpclass(x)) {
-        case _FPCLASS_SNAN: /* signaling NaN */
-        case _FPCLASS_QNAN: /* quiet NaN */
-            return FP_NAN;
-        case _FPCLASS_NINF: /* negative infinity */
-        case _FPCLASS_PINF: /* positive infinity */
-            return FP_INFINITE;
-        case _FPCLASS_NN:   /* negative normal */
-        case _FPCLASS_PN:   /* positive normal */
-            return FP_NORMAL;
-        case _FPCLASS_ND:   /* negative denormalized */
-        case _FPCLASS_PD:   /* positive denormalized */
-            return FP_SUBNORMAL;
-        case _FPCLASS_NZ:   /* negative zero */
-        case _FPCLASS_PZ:   /* positive zero */
-            return FP_ZERO;
-        default:
-            /* Should never get here; but if we do, this will guarantee
-             * that the pattern is not treated like a number.
-             */
-            return FP_NAN;
-    }
-}
-
-#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
-     defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
-     (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
-     (defined(__sun) && defined(__GNUC__))
-
-/* fpclassify is available. */
-
-#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600
-
-enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
-fpclassify(double x)
-{
-   /* XXX do something better someday */
-   return FP_NORMAL;
-}
-
-#endif
-
-extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
-
-/* The Mesa functions we'll need */
-extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);
-extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);
-
-GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
-{
-    GLfloat matrix[16];
-    GLint tmp;
-    GLenum currentMode = GL_FALSE;
-    GLenum desiredMatrix = GL_FALSE;
-    /* The bitfield returns 1 for each component that is invalid (i.e.
-     * NaN or Inf).  In case of error, everything is invalid.
-     */
-    GLbitfield rv;
-    register unsigned int i;
-    unsigned int bit;
-
-    /* This data structure defines the mapping between the current matrix
-     * mode and the desired matrix identifier.
-     */
-    static struct {
-        GLenum currentMode;
-        GLenum desiredMatrix;
-    } modes[] = {
-        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
-        {GL_PROJECTION, GL_PROJECTION_MATRIX},
-        {GL_TEXTURE, GL_TEXTURE_MATRIX},
-#if 0
-        /* this doesn't exist in GLES */
-        {GL_COLOR, GL_COLOR_MATRIX},
-#endif
-    };
-
-    /* Call Mesa to get the current matrix in floating-point form.  First,
-     * we have to figure out what the current matrix mode is.
-     */
-    _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);
-    currentMode = (GLenum) tmp;
-
-    /* The mode is either GL_FALSE, if for some reason we failed to query
-     * the mode, or a given mode from the above table.  Search for the
-     * returned mode to get the desired matrix; if we don't find it,
-     * we can return immediately, as _mesa_GetInteger() will have
-     * logged the necessary error already.
-     */
-    for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {
-        if (modes[i].currentMode == currentMode) {
-            desiredMatrix = modes[i].desiredMatrix;
-            break;
-        }
-    }
-    if (desiredMatrix == GL_FALSE) {
-        /* Early error means all values are invalid. */
-        return 0xffff;
-    }
-
-    /* Now pull the matrix itself. */
-    _mesa_GetFloatv(desiredMatrix, matrix);
-
-    rv = 0;
-    for (i = 0, bit = 1; i < 16; i++, bit<<=1) {
-        float normalizedFraction;
-        int exp;
-
-        switch (fpclassify(matrix[i])) {
-            /* A "subnormal" or denormalized number is too small to be
-             * represented in normal format; but despite that it's a
-             * valid floating point number.  FP_ZERO and FP_NORMAL
-             * are both valid as well.  We should be fine treating
-             * these three cases as legitimate floating-point numbers.
-             */
-            case FP_SUBNORMAL:
-            case FP_NORMAL:
-            case FP_ZERO:
-                normalizedFraction = (GLfloat)frexp(matrix[i], &exp);
-                mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);
-                exponent[i] = (GLint) exp;
-                break;
-
-            /* If the entry is not-a-number or an infinity, then the
-             * matrix component is invalid.  The invalid flag for
-             * the component is already set; might as well set the
-             * other return values to known values.  We'll set
-             * distinct values so that a savvy end user could determine
-             * whether the matrix component was a NaN or an infinity,
-             * but this is more useful for debugging than anything else
-             * since the standard doesn't specify any such magic
-             * values to return.
-             */
-            case FP_NAN:
-                mantissa[i] = INT_TO_FIXED(0);
-                exponent[i] = (GLint) 0;
-                rv |= bit;
-                break;
-
-            case FP_INFINITE:
-                /* Return +/- 1 based on whether it's a positive or
-                 * negative infinity.
-                 */
-                if (matrix[i] > 0) {
-                    mantissa[i] = INT_TO_FIXED(1);
-                }
-                else {
-                    mantissa[i] = -INT_TO_FIXED(1);
-                }
-                exponent[i] = (GLint) 0;
-                rv |= bit;
-                break;
-
-            /* We should never get here; but here's a catching case
-             * in case fpclassify() is returnings something unexpected.
-             */
-            default:
-                mantissa[i] = INT_TO_FIXED(2);
-                exponent[i] = (GLint) 0;
-                rv |= bit;
-                break;
-        }
-
-    } /* for each component */
-
-    /* All done */
-    return rv;
-}
+/**************************************************************************

+ *

+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ **************************************************************************/

+

+

+/**

+ * Code to implement GL_OES_query_matrix.  See the spec at:

+ * http://www.khronos.org/registry/gles/extensions/OES/OES_query_matrix.txt

+ */

+

+

+#include <stdlib.h>

+#include <math.h>

+#include "GLES/gl.h"

+#include "GLES/glext.h"

+

+

+/**

+ * This is from the GL_OES_query_matrix extension specification:

+ *

+ *  GLbitfield glQueryMatrixxOES( GLfixed mantissa[16],

+ *                                GLint   exponent[16] )

+ *  mantissa[16] contains the contents of the current matrix in GLfixed

+ *  format.  exponent[16] contains the unbiased exponents applied to the

+ *  matrix components, so that the internal representation of component i

+ *  is close to mantissa[i] * 2^exponent[i].  The function returns a status

+ *  word which is zero if all the components are valid. If

+ *  status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf).

+ *  The implementations are not required to keep track of overflows.  In

+ *  that case, the invalid bits are never set.

+ */

+

+#define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))

+#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))

+

+#if defined(_MSC_VER)

+/* Oddly, the fpclassify() function doesn't exist in such a form

+ * on MSVC.  This is an implementation using slightly different

+ * lower-level Windows functions.

+ */

+#include <float.h>

+

+enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}

+fpclassify(double x)

+{

+    switch(_fpclass(x)) {

+        case _FPCLASS_SNAN: /* signaling NaN */

+        case _FPCLASS_QNAN: /* quiet NaN */

+            return FP_NAN;

+        case _FPCLASS_NINF: /* negative infinity */

+        case _FPCLASS_PINF: /* positive infinity */

+            return FP_INFINITE;

+        case _FPCLASS_NN:   /* negative normal */

+        case _FPCLASS_PN:   /* positive normal */

+            return FP_NORMAL;

+        case _FPCLASS_ND:   /* negative denormalized */

+        case _FPCLASS_PD:   /* positive denormalized */

+            return FP_SUBNORMAL;

+        case _FPCLASS_NZ:   /* negative zero */

+        case _FPCLASS_PZ:   /* positive zero */

+            return FP_ZERO;

+        default:

+            /* Should never get here; but if we do, this will guarantee

+             * that the pattern is not treated like a number.

+             */

+            return FP_NAN;

+    }

+}

+

+#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \

+     defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \

+     (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \

+     (defined(__sun) && defined(__GNUC__))

+

+/* fpclassify is available. */

+

+#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600

+

+enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}

+fpclassify(double x)

+{

+   /* XXX do something better someday */

+   return FP_NORMAL;

+}

+

+#endif

+

+extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);

+

+/* The Mesa functions we'll need */

+extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);

+extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);

+

+GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])

+{

+    GLfloat matrix[16];

+    GLint tmp;

+    GLenum currentMode = GL_FALSE;

+    GLenum desiredMatrix = GL_FALSE;

+    /* The bitfield returns 1 for each component that is invalid (i.e.

+     * NaN or Inf).  In case of error, everything is invalid.

+     */

+    GLbitfield rv;

+    register unsigned int i;

+    unsigned int bit;

+

+    /* This data structure defines the mapping between the current matrix

+     * mode and the desired matrix identifier.

+     */

+    static struct {

+        GLenum currentMode;

+        GLenum desiredMatrix;

+    } modes[] = {

+        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},

+        {GL_PROJECTION, GL_PROJECTION_MATRIX},

+        {GL_TEXTURE, GL_TEXTURE_MATRIX},

+    };

+

+    /* Call Mesa to get the current matrix in floating-point form.  First,

+     * we have to figure out what the current matrix mode is.

+     */

+    _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);

+    currentMode = (GLenum) tmp;

+

+    /* The mode is either GL_FALSE, if for some reason we failed to query

+     * the mode, or a given mode from the above table.  Search for the

+     * returned mode to get the desired matrix; if we don't find it,

+     * we can return immediately, as _mesa_GetInteger() will have

+     * logged the necessary error already.

+     */

+    for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {

+        if (modes[i].currentMode == currentMode) {

+            desiredMatrix = modes[i].desiredMatrix;

+            break;

+        }

+    }

+    if (desiredMatrix == GL_FALSE) {

+        /* Early error means all values are invalid. */

+        return 0xffff;

+    }

+

+    /* Now pull the matrix itself. */

+    _mesa_GetFloatv(desiredMatrix, matrix);

+

+    rv = 0;

+    for (i = 0, bit = 1; i < 16; i++, bit<<=1) {

+        float normalizedFraction;

+        int exp;

+

+        switch (fpclassify(matrix[i])) {

+            /* A "subnormal" or denormalized number is too small to be

+             * represented in normal format; but despite that it's a

+             * valid floating point number.  FP_ZERO and FP_NORMAL

+             * are both valid as well.  We should be fine treating

+             * these three cases as legitimate floating-point numbers.

+             */

+            case FP_SUBNORMAL:

+            case FP_NORMAL:

+            case FP_ZERO:

+                normalizedFraction = (GLfloat)frexp(matrix[i], &exp);

+                mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);

+                exponent[i] = (GLint) exp;

+                break;

+

+            /* If the entry is not-a-number or an infinity, then the

+             * matrix component is invalid.  The invalid flag for

+             * the component is already set; might as well set the

+             * other return values to known values.  We'll set

+             * distinct values so that a savvy end user could determine

+             * whether the matrix component was a NaN or an infinity,

+             * but this is more useful for debugging than anything else

+             * since the standard doesn't specify any such magic

+             * values to return.

+             */

+            case FP_NAN:

+                mantissa[i] = INT_TO_FIXED(0);

+                exponent[i] = (GLint) 0;

+                rv |= bit;

+                break;

+

+            case FP_INFINITE:

+                /* Return +/- 1 based on whether it's a positive or

+                 * negative infinity.

+                 */

+                if (matrix[i] > 0) {

+                    mantissa[i] = INT_TO_FIXED(1);

+                }

+                else {

+                    mantissa[i] = -INT_TO_FIXED(1);

+                }

+                exponent[i] = (GLint) 0;

+                rv |= bit;

+                break;

+

+            /* We should never get here; but here's a catching case

+             * in case fpclassify() is returnings something unexpected.

+             */

+            default:

+                mantissa[i] = INT_TO_FIXED(2);

+                exponent[i] = (GLint) 0;

+                rv |= bit;

+                break;

+        }

+

+    } /* for each component */

+

+    /* All done */

+    return rv;

+}

diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index a907dac83..a8e1e8101 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -1,565 +1,584 @@
-/*
- * 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 "context.h"
-#include "hash.h"
-#include "imports.h"
-#include "queryobj.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_queryobj
-
-
-/**
- * Allocate a new query object.  This is a fallback routine called via
- * ctx->Driver.NewQueryObject().
- * \param ctx - rendering context
- * \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 *
-_mesa_new_query_object(GLcontext *ctx, GLuint id)
-{
-   struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
-   (void) ctx;
-   if (q) {
-      q->Id = id;
-      q->Result = 0;
-      q->Active = GL_FALSE;
-      q->Ready = GL_TRUE;   /* correct, see spec */
-   }
-   return q;
-}
-
-
-/**
- * Begin a query.  Software driver fallback.
- * Called via ctx->Driver.BeginQuery().
- */
-static void
-_mesa_begin_query(GLcontext *ctx, struct gl_query_object *q)
-{
-   /* no-op */
-}
-
-
-/**
- * End a query.  Software driver fallback.
- * Called via ctx->Driver.EndQuery().
- */
-static void
-_mesa_end_query(GLcontext *ctx, struct gl_query_object *q)
-{
-   q->Ready = GL_TRUE;
-}
-
-
-/**
- * Wait for query to complete.  Software driver fallback.
- * Called via ctx->Driver.WaitQuery().
- */
-static void
-_mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
-{
-   /* For software drivers, _mesa_end_query() should have completed the query.
-    * For real hardware, implement a proper WaitQuery() driver function,
-    * which may require issuing a flush.
-    */
-   assert(q->Ready);
-}
-
-
-/**
- * Check if a query results are ready.  Software driver fallback.
- * Called via ctx->Driver.CheckQuery().
- */
-static void
-_mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
-{
-   /* No-op for sw rendering.
-    * HW drivers may need to flush at this time.
-    */
-}
-
-
-/**
- * Delete a query object.  Called via ctx->Driver.DeleteQuery().
- * Not removed from hash table here.
- */
-static void
-_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
-{
-   free(q);
-}
-
-
-void
-_mesa_init_query_object_functions(struct dd_function_table *driver)
-{
-   driver->NewQueryObject = _mesa_new_query_object;
-   driver->DeleteQuery = _mesa_delete_query;
-   driver->BeginQuery = _mesa_begin_query;
-   driver->EndQuery = _mesa_end_query;
-   driver->WaitQuery = _mesa_wait_query;
-   driver->CheckQuery = _mesa_check_query;
-}
-
-
-/**
- * Return pointer to the query object binding point for the given target.
- * \return NULL if invalid target, else the address of binding point
- */
-static struct gl_query_object **
-get_query_binding_point(GLcontext *ctx, GLenum target)
-{
-   switch (target) {
-   case GL_SAMPLES_PASSED_ARB:
-      if (ctx->Extensions.ARB_occlusion_query)
-         return &ctx->Query.CurrentOcclusionObject;
-      else
-         return NULL;
-   case GL_TIME_ELAPSED_EXT:
-      if (ctx->Extensions.EXT_timer_query)
-         return &ctx->Query.CurrentTimerObject;
-      else
-         return NULL;
-#if FEATURE_EXT_transform_feedback
-   case GL_PRIMITIVES_GENERATED:
-      if (ctx->Extensions.EXT_transform_feedback)
-         return &ctx->Query.PrimitivesGenerated;
-      else
-         return NULL;
-   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
-      if (ctx->Extensions.EXT_transform_feedback)
-         return &ctx->Query.PrimitivesWritten;
-      else
-         return NULL;
-#endif
-   default:
-      return NULL;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
-{
-   GLuint first;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenQueriesARB(n < 0)");
-      return;
-   }
-
-   /* No query objects can be active at this time! */
-   if (ctx->Query.CurrentOcclusionObject ||
-       ctx->Query.CurrentTimerObject) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenQueriesARB");
-      return;
-   }
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Query.QueryObjects, n);
-   if (first) {
-      GLsizei i;
-      for (i = 0; i < n; i++) {
-         struct gl_query_object *q
-            = ctx->Driver.NewQueryObject(ctx, first + i);
-         if (!q) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenQueriesARB");
-            return;
-         }
-         ids[i] = first + i;
-         _mesa_HashInsert(ctx->Query.QueryObjects, first + i, q);
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
-{
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteQueriesARB(n < 0)");
-      return;
-   }
-
-   /* No query objects can be active at this time! */
-   if (ctx->Query.CurrentOcclusionObject ||
-       ctx->Query.CurrentTimerObject) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteQueriesARB");
-      return;
-   }
-
-   for (i = 0; i < n; i++) {
-      if (ids[i] > 0) {
-         struct gl_query_object *q = _mesa_lookup_query_object(ctx, ids[i]);
-         if (q) {
-            ASSERT(!q->Active); /* should be caught earlier */
-            _mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);
-            ctx->Driver.DeleteQuery(ctx, q);
-         }
-      }
-   }
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (id && _mesa_lookup_query_object(ctx, id))
-      return GL_TRUE;
-   else
-      return GL_FALSE;
-}
-
-
-static void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id)
-{
-   struct gl_query_object *q, **bindpt;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-
-   bindpt = get_query_binding_point(ctx, target);
-   if (!bindpt) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");
-      return;
-   }
-
-   if (id == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB(id==0)");
-      return;
-   }
-
-   q = _mesa_lookup_query_object(ctx, id);
-   if (!q) {
-      /* create new object */
-      q = ctx->Driver.NewQueryObject(ctx, id);
-      if (!q) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQueryARB");
-         return;
-      }
-      _mesa_HashInsert(ctx->Query.QueryObjects, id, q);
-   }
-   else {
-      /* pre-existing object */
-      if (q->Active) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glBeginQueryARB(query already active)");
-         return;
-      }
-   }
-
-   q->Target = target;
-   q->Active = GL_TRUE;
-   q->Result = 0;
-   q->Ready = GL_FALSE;
-
-   /* XXX should probably refcount query objects */
-   *bindpt = q;
-
-   ctx->Driver.BeginQuery(ctx, q);
-}
-
-
-static void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target)
-{
-   struct gl_query_object *q, **bindpt;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-
-   bindpt = get_query_binding_point(ctx, target);
-   if (!bindpt) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");
-      return;
-   }
-
-   /* XXX should probably refcount query objects */
-   q = *bindpt;
-   *bindpt = NULL;
-
-   if (!q || !q->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glEndQueryARB(no matching glBeginQueryARB)");
-      return;
-   }
-
-   q->Active = GL_FALSE;
-   ctx->Driver.EndQuery(ctx, q);
-}
-
-
-void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
-{
-   struct gl_query_object *q, **bindpt;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   bindpt = get_query_binding_point(ctx, target);
-   if (!bindpt) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");
-      return;
-   }
-
-   q = *bindpt;
-
-   switch (pname) {
-      case GL_QUERY_COUNTER_BITS_ARB:
-         *params = 8 * sizeof(q->Result);
-         break;
-      case GL_CURRENT_QUERY_ARB:
-         *params = q ? q->Id : 0;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(pname)");
-         return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
-{
-   struct gl_query_object *q = NULL;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (id)
-      q = _mesa_lookup_query_object(ctx, id);
-
-   if (!q || q->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetQueryObjectivARB(id=%d is invalid or active)", id);
-      return;
-   }
-
-   switch (pname) {
-      case GL_QUERY_RESULT_ARB:
-         if (!q->Ready)
-            ctx->Driver.WaitQuery(ctx, q);
-         /* if result is too large for returned type, clamp to max value */
-         if (q->Result > 0x7fffffff) {
-            *params = 0x7fffffff;
-         }
-         else {
-            *params = (GLint)q->Result;
-         }
-         break;
-      case GL_QUERY_RESULT_AVAILABLE_ARB:
-	 if (!q->Ready)
-	    ctx->Driver.CheckQuery( ctx, q );
-         *params = q->Ready;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectivARB(pname)");
-         return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
-{
-   struct gl_query_object *q = NULL;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (id)
-      q = _mesa_lookup_query_object(ctx, id);
-
-   if (!q || q->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetQueryObjectuivARB(id=%d is invalid or active)", id);
-      return;
-   }
-
-   switch (pname) {
-      case GL_QUERY_RESULT_ARB:
-         if (!q->Ready)
-            ctx->Driver.WaitQuery(ctx, q);
-         /* if result is too large for returned type, clamp to max value */
-         if (q->Result > 0xffffffff) {
-            *params = 0xffffffff;
-         }
-         else {
-            *params = (GLuint)q->Result;
-         }
-         break;
-      case GL_QUERY_RESULT_AVAILABLE_ARB:
-	 if (!q->Ready)
-	    ctx->Driver.CheckQuery( ctx, q );
-         *params = q->Ready;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectuivARB(pname)");
-         return;
-   }
-}
-
-
-/**
- * New with GL_EXT_timer_query
- */
-static void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
-{
-   struct gl_query_object *q = NULL;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (id)
-      q = _mesa_lookup_query_object(ctx, id);
-
-   if (!q || q->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetQueryObjectui64vARB(id=%d is invalid or active)", id);
-      return;
-   }
-
-   switch (pname) {
-      case GL_QUERY_RESULT_ARB:
-         if (!q->Ready)
-            ctx->Driver.WaitQuery(ctx, q);
-         *params = q->Result;
-         break;
-      case GL_QUERY_RESULT_AVAILABLE_ARB:
-	 if (!q->Ready)
-	    ctx->Driver.CheckQuery( ctx, q );
-         *params = q->Ready;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjecti64vARB(pname)");
-         return;
-   }
-}
-
-
-/**
- * New with GL_EXT_timer_query
- */
-static void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
-{
-   struct gl_query_object *q = NULL;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (id)
-      q = _mesa_lookup_query_object(ctx, id);
-
-   if (!q || q->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetQueryObjectuui64vARB(id=%d is invalid or active)", id);
-      return;
-   }
-
-   switch (pname) {
-      case GL_QUERY_RESULT_ARB:
-         if (!q->Ready)
-            ctx->Driver.WaitQuery(ctx, q);
-         *params = q->Result;
-         break;
-      case GL_QUERY_RESULT_AVAILABLE_ARB:
-	 if (!q->Ready)
-	    ctx->Driver.CheckQuery( ctx, q );
-         *params = q->Ready;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectui64vARB(pname)");
-         return;
-   }
-}
-
-
-void
-_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
-{
-   SET_GenQueriesARB(disp, _mesa_GenQueriesARB);
-   SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);
-   SET_IsQueryARB(disp, _mesa_IsQueryARB);
-   SET_BeginQueryARB(disp, _mesa_BeginQueryARB);
-   SET_EndQueryARB(disp, _mesa_EndQueryARB);
-   SET_GetQueryivARB(disp, _mesa_GetQueryivARB);
-   SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
-   SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
-
-   SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
-   SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
-}
-
-
-#endif /* FEATURE_queryobj */
-
-
-/**
- * Allocate/init the context state related to query objects.
- */
-void
-_mesa_init_queryobj(GLcontext *ctx)
-{
-   ctx->Query.QueryObjects = _mesa_NewHashTable();
-   ctx->Query.CurrentOcclusionObject = NULL;
-}
-
-
-/**
- * Callback for deleting a query object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_queryobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_query_object *q= (struct gl_query_object *) data;
-   GLcontext *ctx = (GLcontext *)userData;
-   ctx->Driver.DeleteQuery(ctx, q);
-}
-
-
-/**
- * Free the context state related to query objects.
- */
-void
-_mesa_free_queryobj_data(GLcontext *ctx)
-{
-   _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);
-   _mesa_DeleteHashTable(ctx->Query.QueryObjects);
-}
+/*

+ * 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 "context.h"

+#include "hash.h"

+#include "imports.h"

+#include "queryobj.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_queryobj

+

+

+/**

+ * Allocate a new query object.  This is a fallback routine called via

+ * ctx->Driver.NewQueryObject().

+ * \param ctx - rendering context

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

+_mesa_new_query_object(struct gl_context *ctx, GLuint id)

+{

+   struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);

+   (void) ctx;

+   if (q) {

+      q->Id = id;

+      q->Result = 0;

+      q->Active = GL_FALSE;

+      q->Ready = GL_TRUE;   /* correct, see spec */

+   }

+   return q;

+}

+

+

+/**

+ * Begin a query.  Software driver fallback.

+ * Called via ctx->Driver.BeginQuery().

+ */

+static void

+_mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)

+{

+   /* no-op */

+}

+

+

+/**

+ * End a query.  Software driver fallback.

+ * Called via ctx->Driver.EndQuery().

+ */

+static void

+_mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)

+{

+   q->Ready = GL_TRUE;

+}

+

+

+/**

+ * Wait for query to complete.  Software driver fallback.

+ * Called via ctx->Driver.WaitQuery().

+ */

+static void

+_mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)

+{

+   /* For software drivers, _mesa_end_query() should have completed the query.

+    * For real hardware, implement a proper WaitQuery() driver function,

+    * which may require issuing a flush.

+    */

+   assert(q->Ready);

+}

+

+

+/**

+ * Check if a query results are ready.  Software driver fallback.

+ * Called via ctx->Driver.CheckQuery().

+ */

+static void

+_mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)

+{

+   /* No-op for sw rendering.

+    * HW drivers may need to flush at this time.

+    */

+}

+

+

+/**

+ * Delete a query object.  Called via ctx->Driver.DeleteQuery().

+ * Not removed from hash table here.

+ */

+static void

+_mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)

+{

+   free(q);

+}

+

+

+void

+_mesa_init_query_object_functions(struct dd_function_table *driver)

+{

+   driver->NewQueryObject = _mesa_new_query_object;

+   driver->DeleteQuery = _mesa_delete_query;

+   driver->BeginQuery = _mesa_begin_query;

+   driver->EndQuery = _mesa_end_query;

+   driver->WaitQuery = _mesa_wait_query;

+   driver->CheckQuery = _mesa_check_query;

+}

+

+

+/**

+ * Return pointer to the query object binding point for the given target.

+ * \return NULL if invalid target, else the address of binding point

+ */

+static struct gl_query_object **

+get_query_binding_point(struct gl_context *ctx, GLenum target)

+{

+   switch (target) {

+   case GL_SAMPLES_PASSED_ARB:

+      if (ctx->Extensions.ARB_occlusion_query)

+         return &ctx->Query.CurrentOcclusionObject;

+      else

+         return NULL;

+   case GL_ANY_SAMPLES_PASSED:

+      if (ctx->Extensions.ARB_occlusion_query2)

+         return &ctx->Query.CurrentOcclusionObject;

+      else

+         return NULL;

+   case GL_TIME_ELAPSED_EXT:

+      if (ctx->Extensions.EXT_timer_query)

+         return &ctx->Query.CurrentTimerObject;

+      else

+         return NULL;

+#if FEATURE_EXT_transform_feedback

+   case GL_PRIMITIVES_GENERATED:

+      if (ctx->Extensions.EXT_transform_feedback)

+         return &ctx->Query.PrimitivesGenerated;

+      else

+         return NULL;

+   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

+      if (ctx->Extensions.EXT_transform_feedback)

+         return &ctx->Query.PrimitivesWritten;

+      else

+         return NULL;

+#endif

+   default:

+      return NULL;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GenQueriesARB(GLsizei n, GLuint *ids)

+{

+   GLuint first;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenQueriesARB(n < 0)");

+      return;

+   }

+

+   /* No query objects can be active at this time! */

+   if (ctx->Query.CurrentOcclusionObject ||

+       ctx->Query.CurrentTimerObject) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGenQueriesARB");

+      return;

+   }

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Query.QueryObjects, n);

+   if (first) {

+      GLsizei i;

+      for (i = 0; i < n; i++) {

+         struct gl_query_object *q

+            = ctx->Driver.NewQueryObject(ctx, first + i);

+         if (!q) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenQueriesARB");

+            return;

+         }

+         ids[i] = first + i;

+         _mesa_HashInsert(ctx->Query.QueryObjects, first + i, q);

+      }

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)

+{

+   GLint i;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteQueriesARB(n < 0)");

+      return;

+   }

+

+   /* No query objects can be active at this time! */

+   if (ctx->Query.CurrentOcclusionObject ||

+       ctx->Query.CurrentTimerObject) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteQueriesARB");

+      return;

+   }

+

+   for (i = 0; i < n; i++) {

+      if (ids[i] > 0) {

+         struct gl_query_object *q = _mesa_lookup_query_object(ctx, ids[i]);

+         if (q) {

+            ASSERT(!q->Active); /* should be caught earlier */

+            _mesa_HashRemove(ctx->Query.QueryObjects, ids[i]);

+            ctx->Driver.DeleteQuery(ctx, q);

+         }

+      }

+   }

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsQueryARB(GLuint id)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (id && _mesa_lookup_query_object(ctx, id))

+      return GL_TRUE;

+   else

+      return GL_FALSE;

+}

+

+

+static void GLAPIENTRY

+_mesa_BeginQueryARB(GLenum target, GLuint id)

+{

+   struct gl_query_object *q, **bindpt;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   FLUSH_VERTICES(ctx, _NEW_DEPTH);

+

+   bindpt = get_query_binding_point(ctx, target);

+   if (!bindpt) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginQueryARB(target)");

+      return;

+   }

+

+   if (id == 0) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQueryARB(id==0)");

+      return;

+   }

+

+   q = _mesa_lookup_query_object(ctx, id);

+   if (!q) {

+      /* create new object */

+      q = ctx->Driver.NewQueryObject(ctx, id);

+      if (!q) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQueryARB");

+         return;

+      }

+      _mesa_HashInsert(ctx->Query.QueryObjects, id, q);

+   }

+   else {

+      /* pre-existing object */

+      if (q->Active) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glBeginQueryARB(query already active)");

+         return;

+      }

+   }

+

+   q->Target = target;

+   q->Active = GL_TRUE;

+   q->Result = 0;

+   q->Ready = GL_FALSE;

+

+   /* XXX should probably refcount query objects */

+   *bindpt = q;

+

+   ctx->Driver.BeginQuery(ctx, q);

+}

+

+

+static void GLAPIENTRY

+_mesa_EndQueryARB(GLenum target)

+{

+   struct gl_query_object *q, **bindpt;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   FLUSH_VERTICES(ctx, _NEW_DEPTH);

+

+   bindpt = get_query_binding_point(ctx, target);

+   if (!bindpt) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glEndQueryARB(target)");

+      return;

+   }

+

+   /* XXX should probably refcount query objects */

+   q = *bindpt;

+   *bindpt = NULL;

+

+   if (!q || !q->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glEndQueryARB(no matching glBeginQueryARB)");

+      return;

+   }

+

+   q->Active = GL_FALSE;

+   ctx->Driver.EndQuery(ctx, q);

+}

+

+

+void GLAPIENTRY

+_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)

+{

+   struct gl_query_object *q, **bindpt;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   bindpt = get_query_binding_point(ctx, target);

+   if (!bindpt) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");

+      return;

+   }

+

+   q = *bindpt;

+

+   switch (pname) {

+      case GL_QUERY_COUNTER_BITS_ARB:

+         *params = 8 * sizeof(q->Result);

+         break;

+      case GL_CURRENT_QUERY_ARB:

+         *params = q ? q->Id : 0;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivARB(pname)");

+         return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)

+{

+   struct gl_query_object *q = NULL;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (id)

+      q = _mesa_lookup_query_object(ctx, id);

+

+   if (!q || q->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetQueryObjectivARB(id=%d is invalid or active)", id);

+      return;

+   }

+

+   switch (pname) {

+      case GL_QUERY_RESULT_ARB:

+         if (!q->Ready)

+            ctx->Driver.WaitQuery(ctx, q);

+         /* if result is too large for returned type, clamp to max value */

+         if (q->Target == GL_ANY_SAMPLES_PASSED) {

+            if (q->Result)

+               *params = GL_TRUE;

+            else

+               *params = GL_FALSE;

+         } else {

+            if (q->Result > 0x7fffffff) {

+               *params = 0x7fffffff;

+            }

+            else {

+               *params = (GLint)q->Result;

+            }

+         }

+         break;

+      case GL_QUERY_RESULT_AVAILABLE_ARB:

+	 if (!q->Ready)

+	    ctx->Driver.CheckQuery( ctx, q );

+         *params = q->Ready;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectivARB(pname)");

+         return;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)

+{

+   struct gl_query_object *q = NULL;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (id)

+      q = _mesa_lookup_query_object(ctx, id);

+

+   if (!q || q->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetQueryObjectuivARB(id=%d is invalid or active)", id);

+      return;

+   }

+

+   switch (pname) {

+      case GL_QUERY_RESULT_ARB:

+         if (!q->Ready)

+            ctx->Driver.WaitQuery(ctx, q);

+         /* if result is too large for returned type, clamp to max value */

+         if (q->Target == GL_ANY_SAMPLES_PASSED) {

+            if (q->Result)

+               *params = GL_TRUE;

+            else

+               *params = GL_FALSE;

+         } else {

+            if (q->Result > 0xffffffff) {

+               *params = 0xffffffff;

+            }

+            else {

+               *params = (GLuint)q->Result;

+            }

+         }

+         break;

+      case GL_QUERY_RESULT_AVAILABLE_ARB:

+	 if (!q->Ready)

+	    ctx->Driver.CheckQuery( ctx, q );

+         *params = q->Ready;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectuivARB(pname)");

+         return;

+   }

+}

+

+

+/**

+ * New with GL_EXT_timer_query

+ */

+static void GLAPIENTRY

+_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)

+{

+   struct gl_query_object *q = NULL;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (id)

+      q = _mesa_lookup_query_object(ctx, id);

+

+   if (!q || q->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetQueryObjectui64vARB(id=%d is invalid or active)", id);

+      return;

+   }

+

+   switch (pname) {

+      case GL_QUERY_RESULT_ARB:

+         if (!q->Ready)

+            ctx->Driver.WaitQuery(ctx, q);

+         *params = q->Result;

+         break;

+      case GL_QUERY_RESULT_AVAILABLE_ARB:

+	 if (!q->Ready)

+	    ctx->Driver.CheckQuery( ctx, q );

+         *params = q->Ready;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjecti64vARB(pname)");

+         return;

+   }

+}

+

+

+/**

+ * New with GL_EXT_timer_query

+ */

+static void GLAPIENTRY

+_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)

+{

+   struct gl_query_object *q = NULL;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (id)

+      q = _mesa_lookup_query_object(ctx, id);

+

+   if (!q || q->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetQueryObjectuui64vARB(id=%d is invalid or active)", id);

+      return;

+   }

+

+   switch (pname) {

+      case GL_QUERY_RESULT_ARB:

+         if (!q->Ready)

+            ctx->Driver.WaitQuery(ctx, q);

+         *params = q->Result;

+         break;

+      case GL_QUERY_RESULT_AVAILABLE_ARB:

+	 if (!q->Ready)

+	    ctx->Driver.CheckQuery( ctx, q );

+         *params = q->Ready;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryObjectui64vARB(pname)");

+         return;

+   }

+}

+

+

+void

+_mesa_init_queryobj_dispatch(struct _glapi_table *disp)

+{

+   SET_GenQueriesARB(disp, _mesa_GenQueriesARB);

+   SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);

+   SET_IsQueryARB(disp, _mesa_IsQueryARB);

+   SET_BeginQueryARB(disp, _mesa_BeginQueryARB);

+   SET_EndQueryARB(disp, _mesa_EndQueryARB);

+   SET_GetQueryivARB(disp, _mesa_GetQueryivARB);

+   SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);

+   SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);

+

+   SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);

+   SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);

+}

+

+

+#endif /* FEATURE_queryobj */

+

+

+/**

+ * Allocate/init the context state related to query objects.

+ */

+void

+_mesa_init_queryobj(struct gl_context *ctx)

+{

+   ctx->Query.QueryObjects = _mesa_NewHashTable();

+   ctx->Query.CurrentOcclusionObject = NULL;

+}

+

+

+/**

+ * Callback for deleting a query object.  Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_queryobj_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_query_object *q= (struct gl_query_object *) data;

+   struct gl_context *ctx = (struct gl_context *)userData;

+   ctx->Driver.DeleteQuery(ctx, q);

+}

+

+

+/**

+ * Free the context state related to query objects.

+ */

+void

+_mesa_free_queryobj_data(struct gl_context *ctx)

+{

+   _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);

+   _mesa_DeleteHashTable(ctx->Query.QueryObjects);

+}

diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h
index 8746ed15e..71a93de85 100644
--- a/mesalib/src/mesa/main/queryobj.h
+++ b/mesalib/src/mesa/main/queryobj.h
@@ -1,95 +1,95 @@
-/*
- * 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 QUERYOBJ_H
-#define QUERYOBJ_H
-
-
-#include "main/mtypes.h"
-#include "main/hash.h"
-
-
-#if FEATURE_queryobj
-
-static INLINE struct gl_query_object *
-_mesa_lookup_query_object(GLcontext *ctx, GLuint id)
-{
-   return (struct gl_query_object *)
-      _mesa_HashLookup(ctx->Query.QueryObjects, id);
-}
-
-
-extern void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
-
-extern void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id);
-
-extern void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
-
-extern void
-_mesa_init_query_object_functions(struct dd_function_table *driver);
-
-extern void
-_mesa_init_queryobj_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_queryobj */
-
-static INLINE struct gl_query_object *
-_mesa_lookup_query_object(GLcontext *ctx, GLuint id)
-{
-   return NULL;
-}
-
-static INLINE void
-_mesa_init_query_object_functions(struct dd_function_table *driver)
-{
-}
-
-static INLINE void
-_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_queryobj */
-
-extern void
-_mesa_init_queryobj(GLcontext *ctx);
-
-extern void
-_mesa_free_queryobj_data(GLcontext *ctx);
-
-
-#endif /* QUERYOBJ_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 QUERYOBJ_H

+#define QUERYOBJ_H

+

+

+#include "main/mtypes.h"

+#include "main/hash.h"

+

+

+#if FEATURE_queryobj

+

+static INLINE struct gl_query_object *

+_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)

+{

+   return (struct gl_query_object *)

+      _mesa_HashLookup(ctx->Query.QueryObjects, id);

+}

+

+

+extern void GLAPIENTRY

+_mesa_GenQueriesARB(GLsizei n, GLuint *ids);

+

+extern void GLAPIENTRY

+_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsQueryARB(GLuint id);

+

+extern void GLAPIENTRY

+_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);

+

+extern void

+_mesa_init_query_object_functions(struct dd_function_table *driver);

+

+extern void

+_mesa_init_queryobj_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_queryobj */

+

+static INLINE struct gl_query_object *

+_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)

+{

+   return NULL;

+}

+

+static INLINE void

+_mesa_init_query_object_functions(struct dd_function_table *driver)

+{

+}

+

+static INLINE void

+_mesa_init_queryobj_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_queryobj */

+

+extern void

+_mesa_init_queryobj(struct gl_context *ctx);

+

+extern void

+_mesa_free_queryobj_data(struct gl_context *ctx);

+

+

+#endif /* QUERYOBJ_H */

diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c
index 75c67f269..372b177c4 100644
--- a/mesalib/src/mesa/main/rastpos.c
+++ b/mesalib/src/mesa/main/rastpos.c
@@ -1,564 +1,564 @@
-/*
- * 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 rastpos.c
- * Raster position operations.
- */
-
-#include "glheader.h"
-#include "context.h"
-#include "feedback.h"
-#include "macros.h"
-#include "rastpos.h"
-#include "state.h"
-#include "main/dispatch.h"
-
-
-#if FEATURE_rastpos
-
-
-/**
- * Helper function for all the RasterPos functions.
- */
-static void
-rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat p[4];
-
-   p[0] = x;
-   p[1] = y;
-   p[2] = z;
-   p[3] = w;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   FLUSH_CURRENT(ctx, 0);
-
-   if (ctx->NewState)
-      _mesa_update_state( ctx );
-
-   ctx->Driver.RasterPos(ctx, p);
-}
-
-
-static void GLAPIENTRY
-_mesa_RasterPos2d(GLdouble x, GLdouble y)
-{
-   rasterpos((GLfloat)x, (GLfloat)y, (GLfloat)0.0, (GLfloat)1.0);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2f(GLfloat x, GLfloat y)
-{
-   rasterpos(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2i(GLint x, GLint y)
-{
-   rasterpos((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2s(GLshort x, GLshort y)
-{
-   rasterpos(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)
-{
-   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   rasterpos(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3i(GLint x, GLint y, GLint z)
-{
-   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z)
-{
-   rasterpos(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   rasterpos(x, y, z, w);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w)
-{
-   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-   rasterpos(x, y, z, w);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2dv(const GLdouble *v)
-{
-   rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2fv(const GLfloat *v)
-{
-   rasterpos(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2iv(const GLint *v)
-{
-   rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos2sv(const GLshort *v)
-{
-   rasterpos(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3dv(const GLdouble *v)
-{
-   rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3fv(const GLfloat *v)
-{
-   rasterpos(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3iv(const GLint *v)
-{
-   rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos3sv(const GLshort *v)
-{
-   rasterpos(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4dv(const GLdouble *v)
-{
-   rasterpos((GLfloat) v[0], (GLfloat) v[1], 
-		     (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4fv(const GLfloat *v)
-{
-   rasterpos(v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4iv(const GLint *v)
-{
-   rasterpos((GLfloat) v[0], (GLfloat) v[1], 
-		     (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-_mesa_RasterPos4sv(const GLshort *v)
-{
-   rasterpos(v[0], v[1], v[2], v[3]);
-}
-
-
-/**********************************************************************/
-/***           GL_ARB_window_pos / GL_MESA_window_pos               ***/
-/**********************************************************************/
-
-
-/**
- * All glWindowPosMESA and glWindowPosARB commands call this function to
- * update the current raster position.
- */
-static void
-window_pos3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLfloat z2;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   FLUSH_CURRENT(ctx, 0);
-
-   z2 = CLAMP(z, 0.0F, 1.0F) * (ctx->Viewport.Far - ctx->Viewport.Near)
-      + ctx->Viewport.Near;
-
-   /* set raster position */
-   ctx->Current.RasterPos[0] = x;
-   ctx->Current.RasterPos[1] = y;
-   ctx->Current.RasterPos[2] = z2;
-   ctx->Current.RasterPos[3] = 1.0F;
-
-   ctx->Current.RasterPosValid = GL_TRUE;
-
-   if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
-      ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
-   else
-      ctx->Current.RasterDistance = 0.0;
-
-   /* raster color = current color or index */
-   ctx->Current.RasterColor[0]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F);
-   ctx->Current.RasterColor[1]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F);
-   ctx->Current.RasterColor[2]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F);
-   ctx->Current.RasterColor[3]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F);
-   ctx->Current.RasterSecondaryColor[0]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F);
-   ctx->Current.RasterSecondaryColor[1]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F);
-   ctx->Current.RasterSecondaryColor[2]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F);
-   ctx->Current.RasterSecondaryColor[3]
-      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);
-
-   /* raster texcoord = current texcoord */
-   {
-      GLuint texSet;
-      for (texSet = 0; texSet < ctx->Const.MaxTextureCoordUnits; texSet++) {
-         assert(texSet < Elements(ctx->Current.RasterTexCoords));
-         COPY_4FV( ctx->Current.RasterTexCoords[texSet],
-                  ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );
-      }
-   }
-
-   if (ctx->RenderMode==GL_SELECT) {
-      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
-   }
-}
-
-
-/* This is just to support the GL_MESA_window_pos version */
-static void
-window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   window_pos3f(x, y, z);
-   ctx->Current.RasterPos[3] = w;
-}
-
-
-static void GLAPIENTRY
-_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)
-{
-   window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)
-{
-   window_pos4f(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2iMESA(GLint x, GLint y)
-{
-   window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2sMESA(GLshort x, GLshort y)
-{
-   window_pos4f(x, y, 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
-{
-   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
-{
-   window_pos4f(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)
-{
-   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
-{
-   window_pos4f(x, y, z, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   window_pos4f(x, y, z, w);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)
-{
-   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-   window_pos4f(x, y, z, w);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2dvMESA(const GLdouble *v)
-{
-   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2fvMESA(const GLfloat *v)
-{
-   window_pos4f(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2ivMESA(const GLint *v)
-{
-   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos2svMESA(const GLshort *v)
-{
-   window_pos4f(v[0], v[1], 0.0F, 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3dvMESA(const GLdouble *v)
-{
-   window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3fvMESA(const GLfloat *v)
-{
-   window_pos4f(v[0], v[1], v[2], 1.0);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3ivMESA(const GLint *v)
-{
-   window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos3svMESA(const GLshort *v)
-{
-   window_pos4f(v[0], v[1], v[2], 1.0F);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4dvMESA(const GLdouble *v)
-{
-   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 
-			 (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4fvMESA(const GLfloat *v)
-{
-   window_pos4f(v[0], v[1], v[2], v[3]);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4ivMESA(const GLint *v)
-{
-   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 
-			 (GLfloat) v[2], (GLfloat) v[3]);
-}
-
-static void GLAPIENTRY
-_mesa_WindowPos4svMESA(const GLshort *v)
-{
-   window_pos4f(v[0], v[1], v[2], v[3]);
-}
-
-
-#if 0
-
-/*
- * OpenGL implementation of glWindowPos*MESA()
- */
-void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
-{
-   GLfloat fx, fy;
-
-   /* Push current matrix mode and viewport attributes */
-   glPushAttrib( GL_TRANSFORM_BIT | GL_VIEWPORT_BIT );
-
-   /* Setup projection parameters */
-   glMatrixMode( GL_PROJECTION );
-   glPushMatrix();
-   glLoadIdentity();
-   glMatrixMode( GL_MODELVIEW );
-   glPushMatrix();
-   glLoadIdentity();
-
-   glDepthRange( z, z );
-   glViewport( (int) x - 1, (int) y - 1, 2, 2 );
-
-   /* set the raster (window) position */
-   fx = x - (int) x;
-   fy = y - (int) y;
-   glRasterPos4f( fx, fy, 0.0, w );
-
-   /* restore matrices, viewport and matrix mode */
-   glPopMatrix();
-   glMatrixMode( GL_PROJECTION );
-   glPopMatrix();
-
-   glPopAttrib();
-}
-
-#endif
-
-
-void
-_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
-{
-   SET_RasterPos2f(disp, _mesa_RasterPos2f);
-   SET_RasterPos2fv(disp, _mesa_RasterPos2fv);
-   SET_RasterPos2i(disp, _mesa_RasterPos2i);
-   SET_RasterPos2iv(disp, _mesa_RasterPos2iv);
-   SET_RasterPos2d(disp, _mesa_RasterPos2d);
-   SET_RasterPos2dv(disp, _mesa_RasterPos2dv);
-   SET_RasterPos2s(disp, _mesa_RasterPos2s);
-   SET_RasterPos2sv(disp, _mesa_RasterPos2sv);
-   SET_RasterPos3d(disp, _mesa_RasterPos3d);
-   SET_RasterPos3dv(disp, _mesa_RasterPos3dv);
-   SET_RasterPos3f(disp, _mesa_RasterPos3f);
-   SET_RasterPos3fv(disp, _mesa_RasterPos3fv);
-   SET_RasterPos3i(disp, _mesa_RasterPos3i);
-   SET_RasterPos3iv(disp, _mesa_RasterPos3iv);
-   SET_RasterPos3s(disp, _mesa_RasterPos3s);
-   SET_RasterPos3sv(disp, _mesa_RasterPos3sv);
-   SET_RasterPos4d(disp, _mesa_RasterPos4d);
-   SET_RasterPos4dv(disp, _mesa_RasterPos4dv);
-   SET_RasterPos4f(disp, _mesa_RasterPos4f);
-   SET_RasterPos4fv(disp, _mesa_RasterPos4fv);
-   SET_RasterPos4i(disp, _mesa_RasterPos4i);
-   SET_RasterPos4iv(disp, _mesa_RasterPos4iv);
-   SET_RasterPos4s(disp, _mesa_RasterPos4s);
-   SET_RasterPos4sv(disp, _mesa_RasterPos4sv);
-
-   /* 197. GL_MESA_window_pos */
-   SET_WindowPos2dMESA(disp, _mesa_WindowPos2dMESA);
-   SET_WindowPos2dvMESA(disp, _mesa_WindowPos2dvMESA);
-   SET_WindowPos2fMESA(disp, _mesa_WindowPos2fMESA);
-   SET_WindowPos2fvMESA(disp, _mesa_WindowPos2fvMESA);
-   SET_WindowPos2iMESA(disp, _mesa_WindowPos2iMESA);
-   SET_WindowPos2ivMESA(disp, _mesa_WindowPos2ivMESA);
-   SET_WindowPos2sMESA(disp, _mesa_WindowPos2sMESA);
-   SET_WindowPos2svMESA(disp, _mesa_WindowPos2svMESA);
-   SET_WindowPos3dMESA(disp, _mesa_WindowPos3dMESA);
-   SET_WindowPos3dvMESA(disp, _mesa_WindowPos3dvMESA);
-   SET_WindowPos3fMESA(disp, _mesa_WindowPos3fMESA);
-   SET_WindowPos3fvMESA(disp, _mesa_WindowPos3fvMESA);
-   SET_WindowPos3iMESA(disp, _mesa_WindowPos3iMESA);
-   SET_WindowPos3ivMESA(disp, _mesa_WindowPos3ivMESA);
-   SET_WindowPos3sMESA(disp, _mesa_WindowPos3sMESA);
-   SET_WindowPos3svMESA(disp, _mesa_WindowPos3svMESA);
-   SET_WindowPos4dMESA(disp, _mesa_WindowPos4dMESA);
-   SET_WindowPos4dvMESA(disp, _mesa_WindowPos4dvMESA);
-   SET_WindowPos4fMESA(disp, _mesa_WindowPos4fMESA);
-   SET_WindowPos4fvMESA(disp, _mesa_WindowPos4fvMESA);
-   SET_WindowPos4iMESA(disp, _mesa_WindowPos4iMESA);
-   SET_WindowPos4ivMESA(disp, _mesa_WindowPos4ivMESA);
-   SET_WindowPos4sMESA(disp, _mesa_WindowPos4sMESA);
-   SET_WindowPos4svMESA(disp, _mesa_WindowPos4svMESA);
-}
-
-
-#endif /* FEATURE_rastpos */
-
-
-/**********************************************************************/
-/** \name Initialization                                              */
-/**********************************************************************/
-/*@{*/
-
-/**
- * Initialize the context current raster position information.
- *
- * \param ctx GL context.
- *
- * Initialize the current raster position information in
- * __GLcontextRec::Current, and adds the extension entry points to the
- * dispatcher.
- */
-void _mesa_init_rastpos( GLcontext * ctx )
-{
-   int i;
-
-   ASSIGN_4V( ctx->Current.RasterPos, 0.0, 0.0, 0.0, 1.0 );
-   ctx->Current.RasterDistance = 0.0;
-   ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );
-   ASSIGN_4V( ctx->Current.RasterSecondaryColor, 0.0, 0.0, 0.0, 1.0 );
-   for (i = 0; i < Elements(ctx->Current.RasterTexCoords); i++)
-      ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );
-   ctx->Current.RasterPosValid = GL_TRUE;
-}
-
-/*@}*/
+/*

+ * 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 rastpos.c

+ * Raster position operations.

+ */

+

+#include "glheader.h"

+#include "context.h"

+#include "feedback.h"

+#include "macros.h"

+#include "rastpos.h"

+#include "state.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_rastpos

+

+

+/**

+ * Helper function for all the RasterPos functions.

+ */

+static void

+rasterpos(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat p[4];

+

+   p[0] = x;

+   p[1] = y;

+   p[2] = z;

+   p[3] = w;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   FLUSH_CURRENT(ctx, 0);

+

+   if (ctx->NewState)

+      _mesa_update_state( ctx );

+

+   ctx->Driver.RasterPos(ctx, p);

+}

+

+

+static void GLAPIENTRY

+_mesa_RasterPos2d(GLdouble x, GLdouble y)

+{

+   rasterpos((GLfloat)x, (GLfloat)y, (GLfloat)0.0, (GLfloat)1.0);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2f(GLfloat x, GLfloat y)

+{

+   rasterpos(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2i(GLint x, GLint y)

+{

+   rasterpos((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2s(GLshort x, GLshort y)

+{

+   rasterpos(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3d(GLdouble x, GLdouble y, GLdouble z)

+{

+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   rasterpos(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3i(GLint x, GLint y, GLint z)

+{

+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3s(GLshort x, GLshort y, GLshort z)

+{

+   rasterpos(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   rasterpos(x, y, z, w);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4i(GLint x, GLint y, GLint z, GLint w)

+{

+   rasterpos((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)

+{

+   rasterpos(x, y, z, w);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2dv(const GLdouble *v)

+{

+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2fv(const GLfloat *v)

+{

+   rasterpos(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2iv(const GLint *v)

+{

+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos2sv(const GLshort *v)

+{

+   rasterpos(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3dv(const GLdouble *v)

+{

+   rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3fv(const GLfloat *v)

+{

+   rasterpos(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3iv(const GLint *v)

+{

+   rasterpos((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos3sv(const GLshort *v)

+{

+   rasterpos(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4dv(const GLdouble *v)

+{

+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 

+		     (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4fv(const GLfloat *v)

+{

+   rasterpos(v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4iv(const GLint *v)

+{

+   rasterpos((GLfloat) v[0], (GLfloat) v[1], 

+		     (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+_mesa_RasterPos4sv(const GLshort *v)

+{

+   rasterpos(v[0], v[1], v[2], v[3]);

+}

+

+

+/**********************************************************************/

+/***           GL_ARB_window_pos / GL_MESA_window_pos               ***/

+/**********************************************************************/

+

+

+/**

+ * All glWindowPosMESA and glWindowPosARB commands call this function to

+ * update the current raster position.

+ */

+static void

+window_pos3f(GLfloat x, GLfloat y, GLfloat z)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLfloat z2;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   FLUSH_CURRENT(ctx, 0);

+

+   z2 = CLAMP(z, 0.0F, 1.0F) * (ctx->Viewport.Far - ctx->Viewport.Near)

+      + ctx->Viewport.Near;

+

+   /* set raster position */

+   ctx->Current.RasterPos[0] = x;

+   ctx->Current.RasterPos[1] = y;

+   ctx->Current.RasterPos[2] = z2;

+   ctx->Current.RasterPos[3] = 1.0F;

+

+   ctx->Current.RasterPosValid = GL_TRUE;

+

+   if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)

+      ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];

+   else

+      ctx->Current.RasterDistance = 0.0;

+

+   /* raster color = current color or index */

+   ctx->Current.RasterColor[0]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F);

+   ctx->Current.RasterColor[1]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F);

+   ctx->Current.RasterColor[2]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F);

+   ctx->Current.RasterColor[3]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F);

+   ctx->Current.RasterSecondaryColor[0]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F);

+   ctx->Current.RasterSecondaryColor[1]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F);

+   ctx->Current.RasterSecondaryColor[2]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F);

+   ctx->Current.RasterSecondaryColor[3]

+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);

+

+   /* raster texcoord = current texcoord */

+   {

+      GLuint texSet;

+      for (texSet = 0; texSet < ctx->Const.MaxTextureCoordUnits; texSet++) {

+         assert(texSet < Elements(ctx->Current.RasterTexCoords));

+         COPY_4FV( ctx->Current.RasterTexCoords[texSet],

+                  ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texSet] );

+      }

+   }

+

+   if (ctx->RenderMode==GL_SELECT) {

+      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );

+   }

+}

+

+

+/* This is just to support the GL_MESA_window_pos version */

+static void

+window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   window_pos3f(x, y, z);

+   ctx->Current.RasterPos[3] = w;

+}

+

+

+static void GLAPIENTRY

+_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)

+{

+   window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)

+{

+   window_pos4f(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2iMESA(GLint x, GLint y)

+{

+   window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2sMESA(GLshort x, GLshort y)

+{

+   window_pos4f(x, y, 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)

+{

+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)

+{

+   window_pos4f(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)

+{

+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)

+{

+   window_pos4f(x, y, z, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w)

+{

+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

+{

+   window_pos4f(x, y, z, w);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w)

+{

+   window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)

+{

+   window_pos4f(x, y, z, w);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2dvMESA(const GLdouble *v)

+{

+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2fvMESA(const GLfloat *v)

+{

+   window_pos4f(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2ivMESA(const GLint *v)

+{

+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos2svMESA(const GLshort *v)

+{

+   window_pos4f(v[0], v[1], 0.0F, 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3dvMESA(const GLdouble *v)

+{

+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3fvMESA(const GLfloat *v)

+{

+   window_pos4f(v[0], v[1], v[2], 1.0);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3ivMESA(const GLint *v)

+{

+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos3svMESA(const GLshort *v)

+{

+   window_pos4f(v[0], v[1], v[2], 1.0F);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4dvMESA(const GLdouble *v)

+{

+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 

+			 (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4fvMESA(const GLfloat *v)

+{

+   window_pos4f(v[0], v[1], v[2], v[3]);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4ivMESA(const GLint *v)

+{

+   window_pos4f((GLfloat) v[0], (GLfloat) v[1], 

+			 (GLfloat) v[2], (GLfloat) v[3]);

+}

+

+static void GLAPIENTRY

+_mesa_WindowPos4svMESA(const GLshort *v)

+{

+   window_pos4f(v[0], v[1], v[2], v[3]);

+}

+

+

+#if 0

+

+/*

+ * OpenGL implementation of glWindowPos*MESA()

+ */

+void glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w )

+{

+   GLfloat fx, fy;

+

+   /* Push current matrix mode and viewport attributes */

+   glPushAttrib( GL_TRANSFORM_BIT | GL_VIEWPORT_BIT );

+

+   /* Setup projection parameters */

+   glMatrixMode( GL_PROJECTION );

+   glPushMatrix();

+   glLoadIdentity();

+   glMatrixMode( GL_MODELVIEW );

+   glPushMatrix();

+   glLoadIdentity();

+

+   glDepthRange( z, z );

+   glViewport( (int) x - 1, (int) y - 1, 2, 2 );

+

+   /* set the raster (window) position */

+   fx = x - (int) x;

+   fy = y - (int) y;

+   glRasterPos4f( fx, fy, 0.0, w );

+

+   /* restore matrices, viewport and matrix mode */

+   glPopMatrix();

+   glMatrixMode( GL_PROJECTION );

+   glPopMatrix();

+

+   glPopAttrib();

+}

+

+#endif

+

+

+void

+_mesa_init_rastpos_dispatch(struct _glapi_table *disp)

+{

+   SET_RasterPos2f(disp, _mesa_RasterPos2f);

+   SET_RasterPos2fv(disp, _mesa_RasterPos2fv);

+   SET_RasterPos2i(disp, _mesa_RasterPos2i);

+   SET_RasterPos2iv(disp, _mesa_RasterPos2iv);

+   SET_RasterPos2d(disp, _mesa_RasterPos2d);

+   SET_RasterPos2dv(disp, _mesa_RasterPos2dv);

+   SET_RasterPos2s(disp, _mesa_RasterPos2s);

+   SET_RasterPos2sv(disp, _mesa_RasterPos2sv);

+   SET_RasterPos3d(disp, _mesa_RasterPos3d);

+   SET_RasterPos3dv(disp, _mesa_RasterPos3dv);

+   SET_RasterPos3f(disp, _mesa_RasterPos3f);

+   SET_RasterPos3fv(disp, _mesa_RasterPos3fv);

+   SET_RasterPos3i(disp, _mesa_RasterPos3i);

+   SET_RasterPos3iv(disp, _mesa_RasterPos3iv);

+   SET_RasterPos3s(disp, _mesa_RasterPos3s);

+   SET_RasterPos3sv(disp, _mesa_RasterPos3sv);

+   SET_RasterPos4d(disp, _mesa_RasterPos4d);

+   SET_RasterPos4dv(disp, _mesa_RasterPos4dv);

+   SET_RasterPos4f(disp, _mesa_RasterPos4f);

+   SET_RasterPos4fv(disp, _mesa_RasterPos4fv);

+   SET_RasterPos4i(disp, _mesa_RasterPos4i);

+   SET_RasterPos4iv(disp, _mesa_RasterPos4iv);

+   SET_RasterPos4s(disp, _mesa_RasterPos4s);

+   SET_RasterPos4sv(disp, _mesa_RasterPos4sv);

+

+   /* 197. GL_MESA_window_pos */

+   SET_WindowPos2dMESA(disp, _mesa_WindowPos2dMESA);

+   SET_WindowPos2dvMESA(disp, _mesa_WindowPos2dvMESA);

+   SET_WindowPos2fMESA(disp, _mesa_WindowPos2fMESA);

+   SET_WindowPos2fvMESA(disp, _mesa_WindowPos2fvMESA);

+   SET_WindowPos2iMESA(disp, _mesa_WindowPos2iMESA);

+   SET_WindowPos2ivMESA(disp, _mesa_WindowPos2ivMESA);

+   SET_WindowPos2sMESA(disp, _mesa_WindowPos2sMESA);

+   SET_WindowPos2svMESA(disp, _mesa_WindowPos2svMESA);

+   SET_WindowPos3dMESA(disp, _mesa_WindowPos3dMESA);

+   SET_WindowPos3dvMESA(disp, _mesa_WindowPos3dvMESA);

+   SET_WindowPos3fMESA(disp, _mesa_WindowPos3fMESA);

+   SET_WindowPos3fvMESA(disp, _mesa_WindowPos3fvMESA);

+   SET_WindowPos3iMESA(disp, _mesa_WindowPos3iMESA);

+   SET_WindowPos3ivMESA(disp, _mesa_WindowPos3ivMESA);

+   SET_WindowPos3sMESA(disp, _mesa_WindowPos3sMESA);

+   SET_WindowPos3svMESA(disp, _mesa_WindowPos3svMESA);

+   SET_WindowPos4dMESA(disp, _mesa_WindowPos4dMESA);

+   SET_WindowPos4dvMESA(disp, _mesa_WindowPos4dvMESA);

+   SET_WindowPos4fMESA(disp, _mesa_WindowPos4fMESA);

+   SET_WindowPos4fvMESA(disp, _mesa_WindowPos4fvMESA);

+   SET_WindowPos4iMESA(disp, _mesa_WindowPos4iMESA);

+   SET_WindowPos4ivMESA(disp, _mesa_WindowPos4ivMESA);

+   SET_WindowPos4sMESA(disp, _mesa_WindowPos4sMESA);

+   SET_WindowPos4svMESA(disp, _mesa_WindowPos4svMESA);

+}

+

+

+#endif /* FEATURE_rastpos */

+

+

+/**********************************************************************/

+/** \name Initialization                                              */

+/**********************************************************************/

+/*@{*/

+

+/**

+ * Initialize the context current raster position information.

+ *

+ * \param ctx GL context.

+ *

+ * Initialize the current raster position information in

+ * __struct gl_contextRec::Current, and adds the extension entry points to the

+ * dispatcher.

+ */

+void _mesa_init_rastpos( struct gl_context * ctx )

+{

+   int i;

+

+   ASSIGN_4V( ctx->Current.RasterPos, 0.0, 0.0, 0.0, 1.0 );

+   ctx->Current.RasterDistance = 0.0;

+   ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );

+   ASSIGN_4V( ctx->Current.RasterSecondaryColor, 0.0, 0.0, 0.0, 1.0 );

+   for (i = 0; i < Elements(ctx->Current.RasterTexCoords); i++)

+      ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );

+   ctx->Current.RasterPosValid = GL_TRUE;

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h
index 4994616d4..a530ddd76 100644
--- a/mesalib/src/mesa/main/rastpos.h
+++ b/mesalib/src/mesa/main/rastpos.h
@@ -1,57 +1,60 @@
-/**
- * \file rastpos.h
- * Raster position operations.
- */
-
-/*
- * 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.
- */
-
-
-#ifndef RASTPOS_H
-#define RASTPOS_H
-
-
-#include "main/mtypes.h"
-
-
-#if FEATURE_rastpos
-
-extern void
-_mesa_init_rastpos_dispatch(struct _glapi_table *disp);
-
-#else /* FEATURE_rastpos */
-
-static INLINE void
-_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_rastpos */
-
-extern void 
-_mesa_init_rastpos(GLcontext *ctx);
-
-/*@}*/
-
-#endif /* RASTPOS_H */
+/**

+ * \file rastpos.h

+ * Raster position operations.

+ */

+

+/*

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

+ */

+

+

+#ifndef RASTPOS_H

+#define RASTPOS_H

+

+

+#include "compiler.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct gl_context;

+

+#if FEATURE_rastpos

+

+extern void

+_mesa_init_rastpos_dispatch(struct _glapi_table *disp);

+

+#else /* FEATURE_rastpos */

+

+static INLINE void

+_mesa_init_rastpos_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_rastpos */

+

+extern void 

+_mesa_init_rastpos(struct gl_context *ctx);

+

+/*@}*/

+

+#endif /* RASTPOS_H */

diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c
index 93f2bd31c..986dbb60a 100644
--- a/mesalib/src/mesa/main/readpix.c
+++ b/mesalib/src/mesa/main/readpix.c
@@ -1,208 +1,234 @@
-/*
- * 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 "readpix.h"
-#include "framebuffer.h"
-#include "image.h"
-#include "state.h"
-
-
-/**
- * Do error checking of the format/type parameters to glReadPixels and
- * glDrawPixels.
- * \param drawing if GL_TRUE do checking for DrawPixels, else do checking
- *                for ReadPixels.
- * \return GL_TRUE if error detected, GL_FALSE if no errors
- */
-GLboolean
-_mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
-                              GLboolean drawing)
-{
-   const char *readDraw = drawing ? "Draw" : "Read";
-   const GLboolean reading = !drawing;
-
-   /* state validation should have already been done */
-   ASSERT(ctx->NewState == 0x0);
-
-   if (ctx->Extensions.EXT_packed_depth_stencil
-       && type == GL_UNSIGNED_INT_24_8_EXT
-       && format != GL_DEPTH_STENCIL_EXT) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "gl%sPixels(format is not GL_DEPTH_STENCIL_EXT)", readDraw);
-      return GL_TRUE;
-   }
-
-   /* basic combinations test */
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "gl%sPixels(format or type)", readDraw);
-      return GL_TRUE;
-   }
-
-   /* additional checks */
-   switch (format) {
-   case GL_RED:
-   case GL_GREEN:
-   case GL_BLUE:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_ALPHA:
-   case GL_RGB:
-   case GL_BGR:
-   case GL_RGBA:
-   case GL_BGRA:
-   case GL_ABGR_EXT:
-      if (!drawing) {
-         /* reading */
-         if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glReadPixels(no color buffer)");
-            return GL_TRUE;
-         }
-      }
-      break;
-   case GL_COLOR_INDEX:
-      if (drawing) {
-         if (ctx->PixelMaps.ItoR.Size == 0 ||
-	     ctx->PixelMaps.ItoG.Size == 0 ||
-	     ctx->PixelMaps.ItoB.Size == 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                   "glDrawPixels(drawing color index pixels into RGB buffer)");
-            return GL_TRUE;
-         }
-      }
-      else {
-         /* reading */
-         if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glReadPixels(no color buffer)");
-            return GL_TRUE;
-         }
-         /* We no longer support CI-mode color buffers so trying to read
-          * GL_COLOR_INDEX pixels is always an error.
-          */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(color buffer is RGB)");
-         return GL_TRUE;
-      }
-      break;
-   case GL_STENCIL_INDEX:
-      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (reading && !_mesa_source_buffer_exists(ctx, format))) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "gl%sPixels(no stencil buffer)", readDraw);
-         return GL_TRUE;
-      }
-      break;
-   case GL_DEPTH_COMPONENT:
-      if ((drawing && !_mesa_dest_buffer_exists(ctx, format))) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "gl%sPixels(no depth buffer)", readDraw);
-         return GL_TRUE;
-      }
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-      if (!ctx->Extensions.EXT_packed_depth_stencil ||
-          type != GL_UNSIGNED_INT_24_8_EXT) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "gl%sPixels(type)", readDraw);
-         return GL_TRUE;
-      }
-      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||
-          (reading && !_mesa_source_buffer_exists(ctx, format))) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "gl%sPixels(no depth or stencil buffer)", readDraw);
-         return GL_TRUE;
-      }
-      break;
-   default:
-      /* this should have been caught in _mesa_is_legal_format_type() */
-      _mesa_problem(ctx, "unexpected format in _mesa_%sPixels", readDraw);
-      return GL_TRUE;
-   }
-
-   /* no errors */
-   return GL_FALSE;
-}
-      
-
-
-void GLAPIENTRY
-_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-		  GLenum format, GLenum type, GLvoid *pixels )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_CURRENT(ctx, 0);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE,
-                   "glReadPixels(width=%d height=%d)", width, height );
-      return;
-   }
-
-   if (ctx->NewState)
-      _mesa_update_state(ctx);
-
-   if (_mesa_error_check_format_type(ctx, format, type, GL_FALSE)) {
-      /* found an error */
-      return;
-   }
-
-   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                  "glReadPixels(incomplete framebuffer)" );
-      return;
-   }
-
-   if (!_mesa_source_buffer_exists(ctx, format)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");
-      return;
-   }
-
-   if (width == 0 || height == 0)
-      return; /* nothing to do */
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glReadPixels(invalid PBO access)");
-         return;
-      }
-
-      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
-         /* buffer is mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
-         return;
-      }
-   }
-
-   ctx->Driver.ReadPixels(ctx, x, y, width, height,
-			  format, type, &ctx->Pack, pixels);
-}
+/*

+ * 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 "readpix.h"

+#include "framebuffer.h"

+#include "formats.h"

+#include "image.h"

+#include "state.h"

+

+

+/**

+ * Do error checking of the format/type parameters to glReadPixels and

+ * glDrawPixels.

+ * \param drawing if GL_TRUE do checking for DrawPixels, else do checking

+ *                for ReadPixels.

+ * \return GL_TRUE if error detected, GL_FALSE if no errors

+ */

+GLboolean

+_mesa_error_check_format_type(struct gl_context *ctx, GLenum format, GLenum type,

+                              GLboolean drawing)

+{

+   const char *readDraw = drawing ? "Draw" : "Read";

+   const GLboolean reading = !drawing;

+

+   /* state validation should have already been done */

+   ASSERT(ctx->NewState == 0x0);

+

+   if (ctx->Extensions.EXT_packed_depth_stencil

+       && type == GL_UNSIGNED_INT_24_8_EXT

+       && format != GL_DEPTH_STENCIL_EXT) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "gl%sPixels(format is not GL_DEPTH_STENCIL_EXT)", readDraw);

+      return GL_TRUE;

+   }

+

+   /* basic combinations test */

+   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "gl%sPixels(format or type)", readDraw);

+      return GL_TRUE;

+   }

+

+   /* additional checks */

+   switch (format) {

+   case GL_RG:

+   case GL_RED:

+   case GL_GREEN:

+   case GL_BLUE:

+   case GL_ALPHA:

+   case GL_LUMINANCE:

+   case GL_LUMINANCE_ALPHA:

+   case GL_RGB:

+   case GL_BGR:

+   case GL_RGBA:

+   case GL_BGRA:

+   case GL_ABGR_EXT:

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

+      if (!drawing) {

+         /* reading */

+         if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glReadPixels(no color buffer)");

+            return GL_TRUE;

+         }

+      }

+      break;

+   case GL_COLOR_INDEX:

+      if (drawing) {

+         if (ctx->PixelMaps.ItoR.Size == 0 ||

+	     ctx->PixelMaps.ItoG.Size == 0 ||

+	     ctx->PixelMaps.ItoB.Size == 0) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                   "glDrawPixels(drawing color index pixels into RGB buffer)");

+            return GL_TRUE;

+         }

+      }

+      else {

+         /* reading */

+         if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glReadPixels(no color buffer)");

+            return GL_TRUE;

+         }

+         /* We no longer support CI-mode color buffers so trying to read

+          * GL_COLOR_INDEX pixels is always an error.

+          */

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glReadPixels(color buffer is RGB)");

+         return GL_TRUE;

+      }

+      break;

+   case GL_STENCIL_INDEX:

+      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||

+          (reading && !_mesa_source_buffer_exists(ctx, format))) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "gl%sPixels(no stencil buffer)", readDraw);

+         return GL_TRUE;

+      }

+      break;

+   case GL_DEPTH_COMPONENT:

+      if ((drawing && !_mesa_dest_buffer_exists(ctx, format))) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "gl%sPixels(no depth buffer)", readDraw);

+         return GL_TRUE;

+      }

+      break;

+   case GL_DEPTH_STENCIL_EXT:

+      if (!ctx->Extensions.EXT_packed_depth_stencil ||

+          type != GL_UNSIGNED_INT_24_8_EXT) {

+         _mesa_error(ctx, GL_INVALID_ENUM, "gl%sPixels(type)", readDraw);

+         return GL_TRUE;

+      }

+      if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) ||

+          (reading && !_mesa_source_buffer_exists(ctx, format))) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "gl%sPixels(no depth or stencil buffer)", readDraw);

+         return GL_TRUE;

+      }

+      break;

+   default:

+      /* this should have been caught in _mesa_is_legal_format_type() */

+      _mesa_problem(ctx, "unexpected format in _mesa_%sPixels", readDraw);

+      return GL_TRUE;

+   }

+

+   /* no errors */

+   return GL_FALSE;

+}

+      

+

+

+void GLAPIENTRY

+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,

+		  GLenum format, GLenum type, GLvoid *pixels )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_CURRENT(ctx, 0);

+

+   if (width < 0 || height < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE,

+                   "glReadPixels(width=%d height=%d)", width, height );

+      return;

+   }

+

+   if (ctx->NewState)

+      _mesa_update_state(ctx);

+

+   if (_mesa_error_check_format_type(ctx, format, type, GL_FALSE)) {

+      /* found an error */

+      return;

+   }

+

+   /* Check that the destination format and source buffer are both

+    * integer-valued or both non-integer-valued.

+    */

+   if (ctx->Extensions.EXT_texture_integer && _mesa_is_color_format(format)) {

+      const struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;

+      const GLboolean srcInteger = _mesa_is_format_integer_color(rb->Format);

+      const GLboolean dstInteger = _mesa_is_integer_format(format);

+      if (dstInteger != srcInteger) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glReadPixels(integer / non-integer format mismatch");

+         return;

+      }

+   }

+

+   if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+      _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                  "glReadPixels(incomplete framebuffer)" );

+      return;

+   }

+

+   if (!_mesa_source_buffer_exists(ctx, format)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");

+      return;

+   }

+

+   if (width == 0 || height == 0)

+      return; /* nothing to do */

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      if (!_mesa_validate_pbo_access(2, &ctx->Pack, width, height, 1,

+                                     format, type, pixels)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glReadPixels(invalid PBO access)");

+         return;

+      }

+

+      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {

+         /* buffer is mapped - that's an error */

+         _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");

+         return;

+      }

+   }

+

+   ctx->Driver.ReadPixels(ctx, x, y, width, height,

+			  format, type, &ctx->Pack, pixels);

+}

diff --git a/mesalib/src/mesa/main/readpix.h b/mesalib/src/mesa/main/readpix.h
index 1bf02fb8e..4ed5eb5a4 100644
--- a/mesalib/src/mesa/main/readpix.h
+++ b/mesalib/src/mesa/main/readpix.h
@@ -1,42 +1,43 @@
-/*
- * 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.
- */
-
-
-#ifndef READPIXELS_H
-#define READPIXELS_H
-
-
-#include "main/mtypes.h"
-
-
-extern GLboolean
-_mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
-                              GLboolean drawing);
-
-extern void GLAPIENTRY
-_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
-                  GLenum format, GLenum type, GLvoid *pixels );
-
-
-#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.

+ */

+

+

+#ifndef READPIXELS_H

+#define READPIXELS_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern GLboolean

+_mesa_error_check_format_type(struct gl_context *ctx, GLenum format, GLenum type,

+                              GLboolean drawing);

+

+extern void GLAPIENTRY

+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,

+                  GLenum format, GLenum type, GLvoid *pixels );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/remap.c b/mesalib/src/mesa/main/remap.c
index 2341f8488..6da31deb3 100644
--- a/mesalib/src/mesa/main/remap.c
+++ b/mesalib/src/mesa/main/remap.c
@@ -1,190 +1,226 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-
-/**
- * \file remap.c
- * Remap table management.
- *
- * Entries in the dispatch table are either static or dynamic.  The
- * dispatch table is shared by mesa core and glapi.  When they are
- * built separately, it is possible that a static entry in mesa core
- * is dynamic, or assigned a different static offset, in glapi.  The
- * remap table is in charge of mapping a static entry in mesa core to
- * a dynamic entry, or the corresponding static entry, in glapi.
- */
-
-#include "mfeatures.h"
-
-#if FEATURE_remap_table
-
-#include "remap.h"
-#include "imports.h"
-#include "glapi/glapi.h"
-
-#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
-#define MAX_ENTRY_POINTS 16
-
-static const char *_mesa_function_pool;
-
-/**
- * Return the spec string associated with the given function index.
- * The index is available from including remap_helper.h.
- *
- * \param func_index an opaque function index.
- *
- * \return the spec string associated with the function index, or NULL.
- */
-const char *
-_mesa_get_function_spec(GLint func_index)
-{
-   return _mesa_function_pool + func_index;
-}
-
-
-/**
- * Map a function by its spec.  The function will be added to glapi,
- * and the dispatch offset will be returned.
- *
- * \param spec a '\0'-separated string array specifying a function.
- *        It begins with the parameter signature of the function,
- *        followed by the names of the entry points.  An empty entry
- *        point name terminates the array.
- *
- * \return the offset of the (re-)mapped function in the dispatch
- *         table, or -1.
- */
-GLint
-_mesa_map_function_spec(const char *spec)
-{
-   const char *signature;
-   const char *names[MAX_ENTRY_POINTS + 1];
-   GLint num_names = 0;
-
-   if (!spec)
-      return -1;
-
-   signature = spec;
-   spec += strlen(spec) + 1;
-
-   /* spec is terminated by an empty string */
-   while (*spec) {
-      names[num_names] = spec;
-      num_names++;
-      if (num_names >= MAX_ENTRY_POINTS)
-         break;
-      spec += strlen(spec) + 1;
-   }
-   if (!num_names)
-      return -1;
-
-   names[num_names] = NULL;
-
-   /* add the entry points to the dispatch table */
-   return _glapi_add_dispatch(names, signature);
-}
-
-
-/**
- * Map an array of functions.  This is a convenient function for
- * use with arrays available from including remap_helper.h.
- *
- * Note that the dispatch offsets of the functions are not returned.
- * If they are needed, _mesa_map_function_spec() should be used.
- *
- * \param func_array an array of function remaps.
- */
-void
-_mesa_map_function_array(const struct gl_function_remap *func_array)
-{
-   GLint i;
-
-   if (!func_array)
-      return;
-
-   for (i = 0; func_array[i].func_index != -1; i++) {
-      const char *spec;
-      GLint offset;
-
-      spec = _mesa_get_function_spec(func_array[i].func_index);
-      if (!spec) {
-         _mesa_problem(NULL, "invalid function index %d",
-                       func_array[i].func_index);
-         continue;
-      }
-
-      offset = _mesa_map_function_spec(spec);
-      /* error checks */
-      if (offset < 0) {
-         const char *name = spec + strlen(spec) + 1;
-         _mesa_warning(NULL, "failed to remap %s", name);
-      }
-      else if (func_array[i].dispatch_offset >= 0 &&
-               offset != func_array[i].dispatch_offset) {
-         const char *name = spec + strlen(spec) + 1;
-         _mesa_problem(NULL, "%s should be mapped to %d, not %d",
-                       name, func_array[i].dispatch_offset, offset);
-      }
-   }
-}
-
-
-/**
- * Initialize the remap table.  This is called in one_time_init().
- * The remap table needs to be initialized before calling the
- * CALL/GET/SET macros defined in main/dispatch.h.
- */
-void
-_mesa_do_init_remap_table(const char *pool,
-			  int size,
-			  const struct gl_function_pool_remap *remap)
-{
-   static GLboolean initialized = GL_FALSE;
-   GLint i;
-
-   if (initialized)
-      return;
-   initialized = GL_TRUE;
-   _mesa_function_pool = pool;
-
-   /* initialize the remap table */
-   for (i = 0; i < size; i++) {
-      GLint offset;
-      const char *spec;
-
-      /* sanity check */
-      ASSERT(i == remap[i].remap_index);
-      spec = _mesa_function_pool + remap[i].pool_index;
-
-      offset = _mesa_map_function_spec(spec);
-      /* store the dispatch offset in the remap table */
-      driDispatchRemapTable[i] = offset;
-      if (offset < 0)
-         _mesa_warning(NULL, "failed to remap index %d", i);
-   }
-}
-
-
-#endif /* FEATURE_remap_table */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+

+/**

+ * \file remap.c

+ * Remap table management.

+ *

+ * Entries in the dispatch table are either static or dynamic.  The

+ * dispatch table is shared by mesa core and glapi.  When they are

+ * built separately, it is possible that a static entry in mesa core

+ * is dynamic, or assigned a different static offset, in glapi.  The

+ * remap table is in charge of mapping a static entry in mesa core to

+ * a dynamic entry, or the corresponding static entry, in glapi.

+ */

+

+#include "mfeatures.h"

+

+#if FEATURE_remap_table

+

+#include "remap.h"

+#include "imports.h"

+#include "glapi/glapi.h"

+

+#define MAX_ENTRY_POINTS 16

+

+#define need_MESA_remap_table

+#include "main/remap_helper.h"

+

+

+/* this is global for quick access */

+int driDispatchRemapTable[driDispatchRemapTable_size];

+

+

+/**

+ * Return the spec string associated with the given function index.

+ * The index is available from including remap_helper.h.

+ *

+ * \param func_index an opaque function index.

+ *

+ * \return the spec string associated with the function index, or NULL.

+ */

+const char *

+_mesa_get_function_spec(GLint func_index)

+{

+   if (func_index < Elements(_mesa_function_pool))

+      return _mesa_function_pool + func_index;

+   else

+      return NULL;

+}

+

+

+/**

+ * Map a function by its spec.  The function will be added to glapi,

+ * and the dispatch offset will be returned.

+ *

+ * \param spec a '\0'-separated string array specifying a function.

+ *        It begins with the parameter signature of the function,

+ *        followed by the names of the entry points.  An empty entry

+ *        point name terminates the array.

+ *

+ * \return the offset of the (re-)mapped function in the dispatch

+ *         table, or -1.

+ */

+GLint

+_mesa_map_function_spec(const char *spec)

+{

+   const char *signature;

+   const char *names[MAX_ENTRY_POINTS + 1];

+   GLint num_names = 0;

+

+   if (!spec)

+      return -1;

+

+   signature = spec;

+   spec += strlen(spec) + 1;

+

+   /* spec is terminated by an empty string */

+   while (*spec) {

+      names[num_names] = spec;

+      num_names++;

+      if (num_names >= MAX_ENTRY_POINTS)

+         break;

+      spec += strlen(spec) + 1;

+   }

+   if (!num_names)

+      return -1;

+

+   names[num_names] = NULL;

+

+   /* add the entry points to the dispatch table */

+   return _glapi_add_dispatch(names, signature);

+}

+

+

+/**

+ * Map an array of functions.  This is a convenient function for

+ * use with arrays available from including remap_helper.h.

+ *

+ * Note that the dispatch offsets of the functions are not returned.

+ * If they are needed, _mesa_map_function_spec() should be used.

+ *

+ * \param func_array an array of function remaps.

+ */

+void

+_mesa_map_function_array(const struct gl_function_remap *func_array)

+{

+   GLint i;

+

+   if (!func_array)

+      return;

+

+   for (i = 0; func_array[i].func_index != -1; i++) {

+      const char *spec;

+      GLint offset;

+

+      spec = _mesa_get_function_spec(func_array[i].func_index);

+      if (!spec) {

+         _mesa_problem(NULL, "invalid function index %d",

+                       func_array[i].func_index);

+         continue;

+      }

+

+      offset = _mesa_map_function_spec(spec);

+      /* error checks */

+      if (offset < 0) {

+         const char *name = spec + strlen(spec) + 1;

+         _mesa_warning(NULL, "failed to remap %s", name);

+      }

+      else if (func_array[i].dispatch_offset >= 0 &&

+               offset != func_array[i].dispatch_offset) {

+         const char *name = spec + strlen(spec) + 1;

+         _mesa_problem(NULL, "%s should be mapped to %d, not %d",

+                       name, func_array[i].dispatch_offset, offset);

+      }

+   }

+}

+

+

+/**

+ * Map the functions which are already static.

+ *

+ * When a extension function are incorporated into the ABI, the

+ * extension suffix is usually stripped.  Mapping such functions

+ * makes sure the alternative names are available.

+ *

+ * Note that functions mapped by _mesa_init_remap_table() are

+ * excluded.

+ */

+void

+_mesa_map_static_functions(void)

+{

+   /* Remap static functions which have alternative names and are in the ABI.

+    * This is to be on the safe side.  glapi should have defined those names.

+    */

+   _mesa_map_function_array(MESA_alt_functions);

+}

+

+

+/**

+ * Initialize the remap table.  This is called in one_time_init().

+ * The remap table needs to be initialized before calling the

+ * CALL/GET/SET macros defined in main/dispatch.h.

+ */

+static void

+_mesa_do_init_remap_table(const char *pool,

+			  int size,

+			  const struct gl_function_pool_remap *remap)

+{

+   static GLboolean initialized = GL_FALSE;

+   GLint i;

+

+   if (initialized)

+      return;

+   initialized = GL_TRUE;

+

+   /* initialize the remap table */

+   for (i = 0; i < size; i++) {

+      GLint offset;

+      const char *spec;

+

+      /* sanity check */

+      ASSERT(i == remap[i].remap_index);

+      spec = _mesa_function_pool + remap[i].pool_index;

+

+      offset = _mesa_map_function_spec(spec);

+      /* store the dispatch offset in the remap table */

+      driDispatchRemapTable[i] = offset;

+      if (offset < 0)

+         _mesa_warning(NULL, "failed to remap index %d", i);

+   }

+}

+

+

+void

+_mesa_init_remap_table(void)

+{

+   _mesa_do_init_remap_table(_mesa_function_pool,

+			     driDispatchRemapTable_size,

+			     MESA_remap_table_functions);

+}

+

+

+#endif /* FEATURE_remap_table */

diff --git a/mesalib/src/mesa/main/remap.h b/mesalib/src/mesa/main/remap.h
index a2a55f615..ae91a35d9 100644
--- a/mesalib/src/mesa/main/remap.h
+++ b/mesalib/src/mesa/main/remap.h
@@ -1,142 +1,98 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef REMAP_H
-#define REMAP_H
-
-
-#include "main/compiler.h"
-#include "main/mfeatures.h"
-
-struct gl_function_pool_remap {
-   int pool_index;
-   int remap_index;
-};
-
-struct gl_function_remap {
-   int func_index;
-   int dispatch_offset; /* for sanity check */
-};
-
-
-#if FEATURE_remap_table
-
-extern int
-driDispatchRemapTable[];
-
-extern const char *
-_mesa_get_function_spec(int func_index);
-
-extern int
-_mesa_map_function_spec(const char *spec);
-
-extern void
-_mesa_map_function_array(const struct gl_function_remap *func_array);
-
-extern void
-_mesa_map_static_functions(void);
-
-extern void
-_mesa_map_static_functions_es1(void);
-
-extern void
-_mesa_map_static_functions_es2(void);
-
-extern void
-_mesa_do_init_remap_table(const char *pool,
-			  int size,
-			  const struct gl_function_pool_remap *remap);
-
-extern void
-_mesa_init_remap_table(void);
-
-extern void
-_mesa_init_remap_table_es1(void);
-
-extern void
-_mesa_init_remap_table_es2(void);
-
-#else /* FEATURE_remap_table */
-
-static INLINE const char *
-_mesa_get_function_spec(int func_index)
-{
-   return NULL;
-}
-
-static INLINE int
-_mesa_map_function_spec(const char *spec)
-{
-   return -1;
-}
-
-static INLINE void
-_mesa_map_function_array(const struct gl_function_remap *func_array)
-{
-}
-
-static INLINE void
-_mesa_map_static_functions(void)
-{
-}
-
-
-static INLINE void
-_mesa_map_static_functions_es1(void)
-{
-}
-
-static INLINE void
-_mesa_map_static_functions_es2(void)
-{
-}
-
-static INLINE void
-_mesa_do_init_remap_table(const char *pool,
-			  int size,
-			  const struct gl_function_pool_remap *remap)
-{
-}
-
-static INLINE void
-_mesa_init_remap_table(void)
-{
-}
-
-static INLINE void
-_mesa_init_remap_table_es1(void)
-{
-}
-
-static INLINE void
-_mesa_init_remap_table_es2(void)
-{
-}
-
-#endif /* FEATURE_remap_table */
-
-
-#endif /* REMAP_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+

+#ifndef REMAP_H

+#define REMAP_H

+

+

+#include "main/compiler.h"

+#include "main/mfeatures.h"

+

+struct gl_function_pool_remap {

+   int pool_index;

+   int remap_index;

+};

+

+struct gl_function_remap {

+   int func_index;

+   int dispatch_offset; /* for sanity check */

+};

+

+

+#if FEATURE_remap_table

+

+extern int

+driDispatchRemapTable[];

+

+extern const char *

+_mesa_get_function_spec(int func_index);

+

+extern int

+_mesa_map_function_spec(const char *spec);

+

+extern void

+_mesa_map_function_array(const struct gl_function_remap *func_array);

+

+extern void

+_mesa_map_static_functions(void);

+

+extern void

+_mesa_init_remap_table(void);

+

+#else /* FEATURE_remap_table */

+

+static INLINE const char *

+_mesa_get_function_spec(int func_index)

+{

+   return NULL;

+}

+

+static INLINE int

+_mesa_map_function_spec(const char *spec)

+{

+   return -1;

+}

+

+static INLINE void

+_mesa_map_function_array(const struct gl_function_remap *func_array)

+{

+}

+

+static INLINE void

+_mesa_map_static_functions(void)

+{

+}

+

+

+static INLINE void

+_mesa_init_remap_table(void)

+{

+}

+

+#endif /* FEATURE_remap_table */

+

+

+#endif /* REMAP_H */

diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index 631cc9015..962b08217 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -1,6136 +1,6504 @@
-/* DO NOT EDIT - This file generated automatically by remap_helper.py (from Mesa) script */
-
-/*
- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
- * 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
- * Chia-I Wu,
- * 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.
- */
-
-#include "main/dispatch.h"
-#include "main/remap.h"
-
-/* this is internal to remap.c */
-#ifdef need_MESA_remap_table
-
-static const char _mesa_function_pool[] =
-   /* _mesa_function_pool[0]: MapGrid1d (offset 224) */
-   "idd\0"
-   "glMapGrid1d\0"
-   "\0"
-   /* _mesa_function_pool[17]: UniformMatrix3fvARB (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix3fv\0"
-   "glUniformMatrix3fvARB\0"
-   "\0"
-   /* _mesa_function_pool[64]: MapGrid1f (offset 225) */
-   "iff\0"
-   "glMapGrid1f\0"
-   "\0"
-   /* _mesa_function_pool[81]: RasterPos4i (offset 82) */
-   "iiii\0"
-   "glRasterPos4i\0"
-   "\0"
-   /* _mesa_function_pool[101]: RasterPos4d (offset 78) */
-   "dddd\0"
-   "glRasterPos4d\0"
-   "\0"
-   /* _mesa_function_pool[121]: NewList (dynamic) */
-   "ii\0"
-   "glNewList\0"
-   "\0"
-   /* _mesa_function_pool[135]: RasterPos4f (offset 80) */
-   "ffff\0"
-   "glRasterPos4f\0"
-   "\0"
-   /* _mesa_function_pool[155]: LoadIdentity (offset 290) */
-   "\0"
-   "glLoadIdentity\0"
-   "\0"
-   /* _mesa_function_pool[172]: SampleCoverageARB (will be remapped) */
-   "fi\0"
-   "glSampleCoverage\0"
-   "glSampleCoverageARB\0"
-   "\0"
-   /* _mesa_function_pool[213]: ConvolutionFilter1D (offset 348) */
-   "iiiiip\0"
-   "glConvolutionFilter1D\0"
-   "glConvolutionFilter1DEXT\0"
-   "\0"
-   /* _mesa_function_pool[268]: BeginQueryARB (will be remapped) */
-   "ii\0"
-   "glBeginQuery\0"
-   "glBeginQueryARB\0"
-   "\0"
-   /* _mesa_function_pool[301]: RasterPos3dv (offset 71) */
-   "p\0"
-   "glRasterPos3dv\0"
-   "\0"
-   /* _mesa_function_pool[319]: PointParameteriNV (will be remapped) */
-   "ii\0"
-   "glPointParameteri\0"
-   "glPointParameteriNV\0"
-   "\0"
-   /* _mesa_function_pool[361]: GetProgramiv (will be remapped) */
-   "iip\0"
-   "glGetProgramiv\0"
-   "\0"
-   /* _mesa_function_pool[381]: MultiTexCoord3sARB (offset 398) */
-   "iiii\0"
-   "glMultiTexCoord3s\0"
-   "glMultiTexCoord3sARB\0"
-   "\0"
-   /* _mesa_function_pool[426]: SecondaryColor3iEXT (will be remapped) */
-   "iii\0"
-   "glSecondaryColor3i\0"
-   "glSecondaryColor3iEXT\0"
-   "\0"
-   /* _mesa_function_pool[472]: WindowPos3fMESA (will be remapped) */
-   "fff\0"
-   "glWindowPos3f\0"
-   "glWindowPos3fARB\0"
-   "glWindowPos3fMESA\0"
-   "\0"
-   /* _mesa_function_pool[526]: TexCoord1iv (offset 99) */
-   "p\0"
-   "glTexCoord1iv\0"
-   "\0"
-   /* _mesa_function_pool[543]: TexCoord4sv (offset 125) */
-   "p\0"
-   "glTexCoord4sv\0"
-   "\0"
-   /* _mesa_function_pool[560]: RasterPos4s (offset 84) */
-   "iiii\0"
-   "glRasterPos4s\0"
-   "\0"
-   /* _mesa_function_pool[580]: PixelTexGenParameterfvSGIS (will be remapped) */
-   "ip\0"
-   "glPixelTexGenParameterfvSGIS\0"
-   "\0"
-   /* _mesa_function_pool[613]: ActiveTextureARB (offset 374) */
-   "i\0"
-   "glActiveTexture\0"
-   "glActiveTextureARB\0"
-   "\0"
-   /* _mesa_function_pool[651]: BlitFramebufferEXT (will be remapped) */
-   "iiiiiiiiii\0"
-   "glBlitFramebuffer\0"
-   "glBlitFramebufferEXT\0"
-   "\0"
-   /* _mesa_function_pool[702]: TexCoord1f (offset 96) */
-   "f\0"
-   "glTexCoord1f\0"
-   "\0"
-   /* _mesa_function_pool[718]: TexCoord1d (offset 94) */
-   "d\0"
-   "glTexCoord1d\0"
-   "\0"
-   /* _mesa_function_pool[734]: VertexAttrib4ubvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4ubvNV\0"
-   "\0"
-   /* _mesa_function_pool[759]: TexCoord1i (offset 98) */
-   "i\0"
-   "glTexCoord1i\0"
-   "\0"
-   /* _mesa_function_pool[775]: GetProgramNamedParameterdvNV (will be remapped) */
-   "iipp\0"
-   "glGetProgramNamedParameterdvNV\0"
-   "\0"
-   /* _mesa_function_pool[812]: Histogram (offset 367) */
-   "iiii\0"
-   "glHistogram\0"
-   "glHistogramEXT\0"
-   "\0"
-   /* _mesa_function_pool[845]: TexCoord1s (offset 100) */
-   "i\0"
-   "glTexCoord1s\0"
-   "\0"
-   /* _mesa_function_pool[861]: GetMapfv (offset 267) */
-   "iip\0"
-   "glGetMapfv\0"
-   "\0"
-   /* _mesa_function_pool[877]: EvalCoord1f (offset 230) */
-   "f\0"
-   "glEvalCoord1f\0"
-   "\0"
-   /* _mesa_function_pool[894]: TexImage4DSGIS (dynamic) */
-   "iiiiiiiiiip\0"
-   "glTexImage4DSGIS\0"
-   "\0"
-   /* _mesa_function_pool[924]: PolygonStipple (offset 175) */
-   "p\0"
-   "glPolygonStipple\0"
-   "\0"
-   /* _mesa_function_pool[944]: WindowPos2dvMESA (will be remapped) */
-   "p\0"
-   "glWindowPos2dv\0"
-   "glWindowPos2dvARB\0"
-   "glWindowPos2dvMESA\0"
-   "\0"
-   /* _mesa_function_pool[999]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glReplacementCodeuiColor3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[1043]: BlendEquationSeparateEXT (will be remapped) */
-   "ii\0"
-   "glBlendEquationSeparate\0"
-   "glBlendEquationSeparateEXT\0"
-   "glBlendEquationSeparateATI\0"
-   "\0"
-   /* _mesa_function_pool[1125]: ListParameterfSGIX (dynamic) */
-   "iif\0"
-   "glListParameterfSGIX\0"
-   "\0"
-   /* _mesa_function_pool[1151]: SecondaryColor3bEXT (will be remapped) */
-   "iii\0"
-   "glSecondaryColor3b\0"
-   "glSecondaryColor3bEXT\0"
-   "\0"
-   /* _mesa_function_pool[1197]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
-   "pppp\0"
-   "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[1243]: GetPixelMapfv (offset 271) */
-   "ip\0"
-   "glGetPixelMapfv\0"
-   "\0"
-   /* _mesa_function_pool[1263]: Color3uiv (offset 22) */
-   "p\0"
-   "glColor3uiv\0"
-   "\0"
-   /* _mesa_function_pool[1278]: IsEnabled (offset 286) */
-   "i\0"
-   "glIsEnabled\0"
-   "\0"
-   /* _mesa_function_pool[1293]: VertexAttrib4svNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4svNV\0"
-   "\0"
-   /* _mesa_function_pool[1317]: EvalCoord2fv (offset 235) */
-   "p\0"
-   "glEvalCoord2fv\0"
-   "\0"
-   /* _mesa_function_pool[1335]: GetBufferSubDataARB (will be remapped) */
-   "iiip\0"
-   "glGetBufferSubData\0"
-   "glGetBufferSubDataARB\0"
-   "\0"
-   /* _mesa_function_pool[1382]: BufferSubDataARB (will be remapped) */
-   "iiip\0"
-   "glBufferSubData\0"
-   "glBufferSubDataARB\0"
-   "\0"
-   /* _mesa_function_pool[1423]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glTexCoord2fColor4ubVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[1461]: AttachShader (will be remapped) */
-   "ii\0"
-   "glAttachShader\0"
-   "\0"
-   /* _mesa_function_pool[1480]: VertexAttrib2fARB (will be remapped) */
-   "iff\0"
-   "glVertexAttrib2f\0"
-   "glVertexAttrib2fARB\0"
-   "\0"
-   /* _mesa_function_pool[1522]: GetDebugLogLengthMESA (dynamic) */
-   "iii\0"
-   "glGetDebugLogLengthMESA\0"
-   "\0"
-   /* _mesa_function_pool[1551]: GetMapiv (offset 268) */
-   "iip\0"
-   "glGetMapiv\0"
-   "\0"
-   /* _mesa_function_pool[1567]: VertexAttrib3fARB (will be remapped) */
-   "ifff\0"
-   "glVertexAttrib3f\0"
-   "glVertexAttrib3fARB\0"
-   "\0"
-   /* _mesa_function_pool[1610]: Indexubv (offset 316) */
-   "p\0"
-   "glIndexubv\0"
-   "\0"
-   /* _mesa_function_pool[1624]: GetQueryivARB (will be remapped) */
-   "iip\0"
-   "glGetQueryiv\0"
-   "glGetQueryivARB\0"
-   "\0"
-   /* _mesa_function_pool[1658]: TexImage3D (offset 371) */
-   "iiiiiiiiip\0"
-   "glTexImage3D\0"
-   "glTexImage3DEXT\0"
-   "\0"
-   /* _mesa_function_pool[1699]: ReplacementCodeuiVertex3fvSUN (dynamic) */
-   "pp\0"
-   "glReplacementCodeuiVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[1735]: EdgeFlagPointer (offset 312) */
-   "ip\0"
-   "glEdgeFlagPointer\0"
-   "\0"
-   /* _mesa_function_pool[1757]: Color3ubv (offset 20) */
-   "p\0"
-   "glColor3ubv\0"
-   "\0"
-   /* _mesa_function_pool[1772]: GetQueryObjectivARB (will be remapped) */
-   "iip\0"
-   "glGetQueryObjectiv\0"
-   "glGetQueryObjectivARB\0"
-   "\0"
-   /* _mesa_function_pool[1818]: Vertex3dv (offset 135) */
-   "p\0"
-   "glVertex3dv\0"
-   "\0"
-   /* _mesa_function_pool[1833]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[1880]: CompressedTexSubImage2DARB (will be remapped) */
-   "iiiiiiiip\0"
-   "glCompressedTexSubImage2D\0"
-   "glCompressedTexSubImage2DARB\0"
-   "\0"
-   /* _mesa_function_pool[1946]: CombinerOutputNV (will be remapped) */
-   "iiiiiiiiii\0"
-   "glCombinerOutputNV\0"
-   "\0"
-   /* _mesa_function_pool[1977]: VertexAttribs3fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs3fvNV\0"
-   "\0"
-   /* _mesa_function_pool[2003]: Uniform2fARB (will be remapped) */
-   "iff\0"
-   "glUniform2f\0"
-   "glUniform2fARB\0"
-   "\0"
-   /* _mesa_function_pool[2035]: LightModeliv (offset 166) */
-   "ip\0"
-   "glLightModeliv\0"
-   "\0"
-   /* _mesa_function_pool[2054]: VertexAttrib1svARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib1sv\0"
-   "glVertexAttrib1svARB\0"
-   "\0"
-   /* _mesa_function_pool[2097]: VertexAttribs1dvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs1dvNV\0"
-   "\0"
-   /* _mesa_function_pool[2123]: Uniform2ivARB (will be remapped) */
-   "iip\0"
-   "glUniform2iv\0"
-   "glUniform2ivARB\0"
-   "\0"
-   /* _mesa_function_pool[2157]: GetImageTransformParameterfvHP (dynamic) */
-   "iip\0"
-   "glGetImageTransformParameterfvHP\0"
-   "\0"
-   /* _mesa_function_pool[2195]: Normal3bv (offset 53) */
-   "p\0"
-   "glNormal3bv\0"
-   "\0"
-   /* _mesa_function_pool[2210]: TexGeniv (offset 193) */
-   "iip\0"
-   "glTexGeniv\0"
-   "\0"
-   /* _mesa_function_pool[2226]: WeightubvARB (dynamic) */
-   "ip\0"
-   "glWeightubvARB\0"
-   "\0"
-   /* _mesa_function_pool[2245]: VertexAttrib1fvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib1fvNV\0"
-   "\0"
-   /* _mesa_function_pool[2269]: Vertex3iv (offset 139) */
-   "p\0"
-   "glVertex3iv\0"
-   "\0"
-   /* _mesa_function_pool[2284]: CopyConvolutionFilter1D (offset 354) */
-   "iiiii\0"
-   "glCopyConvolutionFilter1D\0"
-   "glCopyConvolutionFilter1DEXT\0"
-   "\0"
-   /* _mesa_function_pool[2346]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
-   "iffffff\0"
-   "glReplacementCodeuiNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[2394]: DeleteSync (will be remapped) */
-   "i\0"
-   "glDeleteSync\0"
-   "\0"
-   /* _mesa_function_pool[2410]: FragmentMaterialfvSGIX (dynamic) */
-   "iip\0"
-   "glFragmentMaterialfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[2440]: BlendColor (offset 336) */
-   "ffff\0"
-   "glBlendColor\0"
-   "glBlendColorEXT\0"
-   "\0"
-   /* _mesa_function_pool[2475]: UniformMatrix4fvARB (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix4fv\0"
-   "glUniformMatrix4fvARB\0"
-   "\0"
-   /* _mesa_function_pool[2522]: DeleteVertexArraysAPPLE (will be remapped) */
-   "ip\0"
-   "glDeleteVertexArrays\0"
-   "glDeleteVertexArraysAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[2573]: ReadInstrumentsSGIX (dynamic) */
-   "i\0"
-   "glReadInstrumentsSGIX\0"
-   "\0"
-   /* _mesa_function_pool[2598]: CallLists (offset 3) */
-   "iip\0"
-   "glCallLists\0"
-   "\0"
-   /* _mesa_function_pool[2615]: UniformMatrix2x4fv (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix2x4fv\0"
-   "\0"
-   /* _mesa_function_pool[2642]: Color4ubVertex3fvSUN (dynamic) */
-   "pp\0"
-   "glColor4ubVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[2669]: Normal3iv (offset 59) */
-   "p\0"
-   "glNormal3iv\0"
-   "\0"
-   /* _mesa_function_pool[2684]: PassThrough (offset 199) */
-   "f\0"
-   "glPassThrough\0"
-   "\0"
-   /* _mesa_function_pool[2701]: FramebufferTextureLayerEXT (will be remapped) */
-   "iiiii\0"
-   "glFramebufferTextureLayer\0"
-   "glFramebufferTextureLayerEXT\0"
-   "\0"
-   /* _mesa_function_pool[2763]: GetListParameterfvSGIX (dynamic) */
-   "iip\0"
-   "glGetListParameterfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[2793]: Viewport (offset 305) */
-   "iiii\0"
-   "glViewport\0"
-   "\0"
-   /* _mesa_function_pool[2810]: VertexAttrib4NusvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4Nusv\0"
-   "glVertexAttrib4NusvARB\0"
-   "\0"
-   /* _mesa_function_pool[2857]: WindowPos4svMESA (will be remapped) */
-   "p\0"
-   "glWindowPos4svMESA\0"
-   "\0"
-   /* _mesa_function_pool[2879]: CreateProgramObjectARB (will be remapped) */
-   "\0"
-   "glCreateProgramObjectARB\0"
-   "\0"
-   /* _mesa_function_pool[2906]: DeleteTransformFeedbacks (will be remapped) */
-   "ip\0"
-   "glDeleteTransformFeedbacks\0"
-   "\0"
-   /* _mesa_function_pool[2937]: UniformMatrix4x3fv (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix4x3fv\0"
-   "\0"
-   /* _mesa_function_pool[2964]: PrioritizeTextures (offset 331) */
-   "ipp\0"
-   "glPrioritizeTextures\0"
-   "glPrioritizeTexturesEXT\0"
-   "\0"
-   /* _mesa_function_pool[3014]: AsyncMarkerSGIX (dynamic) */
-   "i\0"
-   "glAsyncMarkerSGIX\0"
-   "\0"
-   /* _mesa_function_pool[3035]: GlobalAlphaFactorubSUN (dynamic) */
-   "i\0"
-   "glGlobalAlphaFactorubSUN\0"
-   "\0"
-   /* _mesa_function_pool[3063]: ClearDebugLogMESA (dynamic) */
-   "iii\0"
-   "glClearDebugLogMESA\0"
-   "\0"
-   /* _mesa_function_pool[3088]: ResetHistogram (offset 369) */
-   "i\0"
-   "glResetHistogram\0"
-   "glResetHistogramEXT\0"
-   "\0"
-   /* _mesa_function_pool[3128]: GetProgramNamedParameterfvNV (will be remapped) */
-   "iipp\0"
-   "glGetProgramNamedParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[3165]: PointParameterfEXT (will be remapped) */
-   "if\0"
-   "glPointParameterf\0"
-   "glPointParameterfARB\0"
-   "glPointParameterfEXT\0"
-   "glPointParameterfSGIS\0"
-   "\0"
-   /* _mesa_function_pool[3251]: LoadIdentityDeformationMapSGIX (dynamic) */
-   "i\0"
-   "glLoadIdentityDeformationMapSGIX\0"
-   "\0"
-   /* _mesa_function_pool[3287]: GenFencesNV (will be remapped) */
-   "ip\0"
-   "glGenFencesNV\0"
-   "\0"
-   /* _mesa_function_pool[3305]: ImageTransformParameterfHP (dynamic) */
-   "iif\0"
-   "glImageTransformParameterfHP\0"
-   "\0"
-   /* _mesa_function_pool[3339]: MatrixIndexusvARB (dynamic) */
-   "ip\0"
-   "glMatrixIndexusvARB\0"
-   "\0"
-   /* _mesa_function_pool[3363]: DrawElementsBaseVertex (will be remapped) */
-   "iiipi\0"
-   "glDrawElementsBaseVertex\0"
-   "\0"
-   /* _mesa_function_pool[3395]: DisableVertexAttribArrayARB (will be remapped) */
-   "i\0"
-   "glDisableVertexAttribArray\0"
-   "glDisableVertexAttribArrayARB\0"
-   "\0"
-   /* _mesa_function_pool[3455]: TexCoord2sv (offset 109) */
-   "p\0"
-   "glTexCoord2sv\0"
-   "\0"
-   /* _mesa_function_pool[3472]: Vertex4dv (offset 143) */
-   "p\0"
-   "glVertex4dv\0"
-   "\0"
-   /* _mesa_function_pool[3487]: StencilMaskSeparate (will be remapped) */
-   "ii\0"
-   "glStencilMaskSeparate\0"
-   "\0"
-   /* _mesa_function_pool[3513]: ProgramLocalParameter4dARB (will be remapped) */
-   "iidddd\0"
-   "glProgramLocalParameter4dARB\0"
-   "\0"
-   /* _mesa_function_pool[3550]: CompressedTexImage3DARB (will be remapped) */
-   "iiiiiiiip\0"
-   "glCompressedTexImage3D\0"
-   "glCompressedTexImage3DARB\0"
-   "\0"
-   /* _mesa_function_pool[3610]: Color3sv (offset 18) */
-   "p\0"
-   "glColor3sv\0"
-   "\0"
-   /* _mesa_function_pool[3624]: GetConvolutionParameteriv (offset 358) */
-   "iip\0"
-   "glGetConvolutionParameteriv\0"
-   "glGetConvolutionParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[3688]: VertexAttrib1fARB (will be remapped) */
-   "if\0"
-   "glVertexAttrib1f\0"
-   "glVertexAttrib1fARB\0"
-   "\0"
-   /* _mesa_function_pool[3729]: Vertex2dv (offset 127) */
-   "p\0"
-   "glVertex2dv\0"
-   "\0"
-   /* _mesa_function_pool[3744]: TestFenceNV (will be remapped) */
-   "i\0"
-   "glTestFenceNV\0"
-   "\0"
-   /* _mesa_function_pool[3761]: MultiTexCoord1fvARB (offset 379) */
-   "ip\0"
-   "glMultiTexCoord1fv\0"
-   "glMultiTexCoord1fvARB\0"
-   "\0"
-   /* _mesa_function_pool[3806]: TexCoord3iv (offset 115) */
-   "p\0"
-   "glTexCoord3iv\0"
-   "\0"
-   /* _mesa_function_pool[3823]: ColorFragmentOp2ATI (will be remapped) */
-   "iiiiiiiiii\0"
-   "glColorFragmentOp2ATI\0"
-   "\0"
-   /* _mesa_function_pool[3857]: SecondaryColorPointerListIBM (dynamic) */
-   "iiipi\0"
-   "glSecondaryColorPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[3895]: GetPixelTexGenParameterivSGIS (will be remapped) */
-   "ip\0"
-   "glGetPixelTexGenParameterivSGIS\0"
-   "\0"
-   /* _mesa_function_pool[3931]: Color3fv (offset 14) */
-   "p\0"
-   "glColor3fv\0"
-   "\0"
-   /* _mesa_function_pool[3945]: VertexAttrib4fNV (will be remapped) */
-   "iffff\0"
-   "glVertexAttrib4fNV\0"
-   "\0"
-   /* _mesa_function_pool[3971]: ReplacementCodeubSUN (dynamic) */
-   "i\0"
-   "glReplacementCodeubSUN\0"
-   "\0"
-   /* _mesa_function_pool[3997]: FinishAsyncSGIX (dynamic) */
-   "p\0"
-   "glFinishAsyncSGIX\0"
-   "\0"
-   /* _mesa_function_pool[4018]: GetDebugLogMESA (dynamic) */
-   "iiiipp\0"
-   "glGetDebugLogMESA\0"
-   "\0"
-   /* _mesa_function_pool[4044]: FogCoorddEXT (will be remapped) */
-   "d\0"
-   "glFogCoordd\0"
-   "glFogCoorddEXT\0"
-   "\0"
-   /* _mesa_function_pool[4074]: BeginConditionalRenderNV (will be remapped) */
-   "ii\0"
-   "glBeginConditionalRenderNV\0"
-   "\0"
-   /* _mesa_function_pool[4105]: Color4ubVertex3fSUN (dynamic) */
-   "iiiifff\0"
-   "glColor4ubVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[4136]: FogCoordfEXT (will be remapped) */
-   "f\0"
-   "glFogCoordf\0"
-   "glFogCoordfEXT\0"
-   "\0"
-   /* _mesa_function_pool[4166]: PointSize (offset 173) */
-   "f\0"
-   "glPointSize\0"
-   "\0"
-   /* _mesa_function_pool[4181]: TexCoord2fVertex3fSUN (dynamic) */
-   "fffff\0"
-   "glTexCoord2fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[4212]: PopName (offset 200) */
-   "\0"
-   "glPopName\0"
-   "\0"
-   /* _mesa_function_pool[4224]: GlobalAlphaFactoriSUN (dynamic) */
-   "i\0"
-   "glGlobalAlphaFactoriSUN\0"
-   "\0"
-   /* _mesa_function_pool[4251]: VertexAttrib2dNV (will be remapped) */
-   "idd\0"
-   "glVertexAttrib2dNV\0"
-   "\0"
-   /* _mesa_function_pool[4275]: GetProgramInfoLog (will be remapped) */
-   "iipp\0"
-   "glGetProgramInfoLog\0"
-   "\0"
-   /* _mesa_function_pool[4301]: VertexAttrib4NbvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4Nbv\0"
-   "glVertexAttrib4NbvARB\0"
-   "\0"
-   /* _mesa_function_pool[4346]: GetActiveAttribARB (will be remapped) */
-   "iiipppp\0"
-   "glGetActiveAttrib\0"
-   "glGetActiveAttribARB\0"
-   "\0"
-   /* _mesa_function_pool[4394]: Vertex4sv (offset 149) */
-   "p\0"
-   "glVertex4sv\0"
-   "\0"
-   /* _mesa_function_pool[4409]: VertexAttrib4ubNV (will be remapped) */
-   "iiiii\0"
-   "glVertexAttrib4ubNV\0"
-   "\0"
-   /* _mesa_function_pool[4436]: TextureRangeAPPLE (will be remapped) */
-   "iip\0"
-   "glTextureRangeAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[4461]: GetTexEnvfv (offset 276) */
-   "iip\0"
-   "glGetTexEnvfv\0"
-   "\0"
-   /* _mesa_function_pool[4480]: BindTransformFeedback (will be remapped) */
-   "ii\0"
-   "glBindTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[4508]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
-   "ffffffffffff\0"
-   "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[4561]: Indexub (offset 315) */
-   "i\0"
-   "glIndexub\0"
-   "\0"
-   /* _mesa_function_pool[4574]: TexEnvi (offset 186) */
-   "iii\0"
-   "glTexEnvi\0"
-   "\0"
-   /* _mesa_function_pool[4589]: GetClipPlane (offset 259) */
-   "ip\0"
-   "glGetClipPlane\0"
-   "\0"
-   /* _mesa_function_pool[4608]: CombinerParameterfvNV (will be remapped) */
-   "ip\0"
-   "glCombinerParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[4636]: VertexAttribs3dvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs3dvNV\0"
-   "\0"
-   /* _mesa_function_pool[4662]: VertexAttribs4fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs4fvNV\0"
-   "\0"
-   /* _mesa_function_pool[4688]: VertexArrayRangeNV (will be remapped) */
-   "ip\0"
-   "glVertexArrayRangeNV\0"
-   "\0"
-   /* _mesa_function_pool[4713]: FragmentLightiSGIX (dynamic) */
-   "iii\0"
-   "glFragmentLightiSGIX\0"
-   "\0"
-   /* _mesa_function_pool[4739]: PolygonOffsetEXT (will be remapped) */
-   "ff\0"
-   "glPolygonOffsetEXT\0"
-   "\0"
-   /* _mesa_function_pool[4762]: PollAsyncSGIX (dynamic) */
-   "p\0"
-   "glPollAsyncSGIX\0"
-   "\0"
-   /* _mesa_function_pool[4781]: DeleteFragmentShaderATI (will be remapped) */
-   "i\0"
-   "glDeleteFragmentShaderATI\0"
-   "\0"
-   /* _mesa_function_pool[4810]: Scaled (offset 301) */
-   "ddd\0"
-   "glScaled\0"
-   "\0"
-   /* _mesa_function_pool[4824]: ResumeTransformFeedback (will be remapped) */
-   "\0"
-   "glResumeTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[4852]: Scalef (offset 302) */
-   "fff\0"
-   "glScalef\0"
-   "\0"
-   /* _mesa_function_pool[4866]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glTexCoord2fNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[4904]: MultTransposeMatrixdARB (will be remapped) */
-   "p\0"
-   "glMultTransposeMatrixd\0"
-   "glMultTransposeMatrixdARB\0"
-   "\0"
-   /* _mesa_function_pool[4956]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "\0"
-   /* _mesa_function_pool[4985]: ObjectUnpurgeableAPPLE (will be remapped) */
-   "iii\0"
-   "glObjectUnpurgeableAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[5015]: AlphaFunc (offset 240) */
-   "if\0"
-   "glAlphaFunc\0"
-   "\0"
-   /* _mesa_function_pool[5031]: WindowPos2svMESA (will be remapped) */
-   "p\0"
-   "glWindowPos2sv\0"
-   "glWindowPos2svARB\0"
-   "glWindowPos2svMESA\0"
-   "\0"
-   /* _mesa_function_pool[5086]: EdgeFlag (offset 41) */
-   "i\0"
-   "glEdgeFlag\0"
-   "\0"
-   /* _mesa_function_pool[5100]: TexCoord2iv (offset 107) */
-   "p\0"
-   "glTexCoord2iv\0"
-   "\0"
-   /* _mesa_function_pool[5117]: CompressedTexImage1DARB (will be remapped) */
-   "iiiiiip\0"
-   "glCompressedTexImage1D\0"
-   "glCompressedTexImage1DARB\0"
-   "\0"
-   /* _mesa_function_pool[5175]: Rotated (offset 299) */
-   "dddd\0"
-   "glRotated\0"
-   "\0"
-   /* _mesa_function_pool[5191]: VertexAttrib2sNV (will be remapped) */
-   "iii\0"
-   "glVertexAttrib2sNV\0"
-   "\0"
-   /* _mesa_function_pool[5215]: ReadPixels (offset 256) */
-   "iiiiiip\0"
-   "glReadPixels\0"
-   "\0"
-   /* _mesa_function_pool[5237]: EdgeFlagv (offset 42) */
-   "p\0"
-   "glEdgeFlagv\0"
-   "\0"
-   /* _mesa_function_pool[5252]: NormalPointerListIBM (dynamic) */
-   "iipi\0"
-   "glNormalPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[5281]: IndexPointerEXT (will be remapped) */
-   "iiip\0"
-   "glIndexPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[5305]: Color4iv (offset 32) */
-   "p\0"
-   "glColor4iv\0"
-   "\0"
-   /* _mesa_function_pool[5319]: TexParameterf (offset 178) */
-   "iif\0"
-   "glTexParameterf\0"
-   "\0"
-   /* _mesa_function_pool[5340]: TexParameteri (offset 180) */
-   "iii\0"
-   "glTexParameteri\0"
-   "\0"
-   /* _mesa_function_pool[5361]: NormalPointerEXT (will be remapped) */
-   "iiip\0"
-   "glNormalPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[5386]: MultiTexCoord3dARB (offset 392) */
-   "iddd\0"
-   "glMultiTexCoord3d\0"
-   "glMultiTexCoord3dARB\0"
-   "\0"
-   /* _mesa_function_pool[5431]: MultiTexCoord2iARB (offset 388) */
-   "iii\0"
-   "glMultiTexCoord2i\0"
-   "glMultiTexCoord2iARB\0"
-   "\0"
-   /* _mesa_function_pool[5475]: DrawPixels (offset 257) */
-   "iiiip\0"
-   "glDrawPixels\0"
-   "\0"
-   /* _mesa_function_pool[5495]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
-   "iffffffff\0"
-   "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[5555]: MultiTexCoord2svARB (offset 391) */
-   "ip\0"
-   "glMultiTexCoord2sv\0"
-   "glMultiTexCoord2svARB\0"
-   "\0"
-   /* _mesa_function_pool[5600]: ReplacementCodeubvSUN (dynamic) */
-   "p\0"
-   "glReplacementCodeubvSUN\0"
-   "\0"
-   /* _mesa_function_pool[5627]: Uniform3iARB (will be remapped) */
-   "iiii\0"
-   "glUniform3i\0"
-   "glUniform3iARB\0"
-   "\0"
-   /* _mesa_function_pool[5660]: DrawTransformFeedback (will be remapped) */
-   "ii\0"
-   "glDrawTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[5688]: GetFragmentMaterialfvSGIX (dynamic) */
-   "iip\0"
-   "glGetFragmentMaterialfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[5721]: GetShaderInfoLog (will be remapped) */
-   "iipp\0"
-   "glGetShaderInfoLog\0"
-   "\0"
-   /* _mesa_function_pool[5746]: WeightivARB (dynamic) */
-   "ip\0"
-   "glWeightivARB\0"
-   "\0"
-   /* _mesa_function_pool[5764]: PollInstrumentsSGIX (dynamic) */
-   "p\0"
-   "glPollInstrumentsSGIX\0"
-   "\0"
-   /* _mesa_function_pool[5789]: GlobalAlphaFactordSUN (dynamic) */
-   "d\0"
-   "glGlobalAlphaFactordSUN\0"
-   "\0"
-   /* _mesa_function_pool[5816]: GetFinalCombinerInputParameterfvNV (will be remapped) */
-   "iip\0"
-   "glGetFinalCombinerInputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[5858]: GenerateMipmapEXT (will be remapped) */
-   "i\0"
-   "glGenerateMipmap\0"
-   "glGenerateMipmapEXT\0"
-   "\0"
-   /* _mesa_function_pool[5898]: GenLists (offset 5) */
-   "i\0"
-   "glGenLists\0"
-   "\0"
-   /* _mesa_function_pool[5912]: SetFragmentShaderConstantATI (will be remapped) */
-   "ip\0"
-   "glSetFragmentShaderConstantATI\0"
-   "\0"
-   /* _mesa_function_pool[5947]: GetMapAttribParameterivNV (dynamic) */
-   "iiip\0"
-   "glGetMapAttribParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[5981]: CreateShaderObjectARB (will be remapped) */
-   "i\0"
-   "glCreateShaderObjectARB\0"
-   "\0"
-   /* _mesa_function_pool[6008]: GetSharpenTexFuncSGIS (dynamic) */
-   "ip\0"
-   "glGetSharpenTexFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[6036]: BufferDataARB (will be remapped) */
-   "iipi\0"
-   "glBufferData\0"
-   "glBufferDataARB\0"
-   "\0"
-   /* _mesa_function_pool[6071]: FlushVertexArrayRangeNV (will be remapped) */
-   "\0"
-   "glFlushVertexArrayRangeNV\0"
-   "\0"
-   /* _mesa_function_pool[6099]: MapGrid2d (offset 226) */
-   "iddidd\0"
-   "glMapGrid2d\0"
-   "\0"
-   /* _mesa_function_pool[6119]: MapGrid2f (offset 227) */
-   "iffiff\0"
-   "glMapGrid2f\0"
-   "\0"
-   /* _mesa_function_pool[6139]: SampleMapATI (will be remapped) */
-   "iii\0"
-   "glSampleMapATI\0"
-   "\0"
-   /* _mesa_function_pool[6159]: VertexPointerEXT (will be remapped) */
-   "iiiip\0"
-   "glVertexPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[6185]: GetTexFilterFuncSGIS (dynamic) */
-   "iip\0"
-   "glGetTexFilterFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[6213]: Scissor (offset 176) */
-   "iiii\0"
-   "glScissor\0"
-   "\0"
-   /* _mesa_function_pool[6229]: Fogf (offset 153) */
-   "if\0"
-   "glFogf\0"
-   "\0"
-   /* _mesa_function_pool[6240]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glReplacementCodeuiColor4ubVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[6285]: TexSubImage1D (offset 332) */
-   "iiiiiip\0"
-   "glTexSubImage1D\0"
-   "glTexSubImage1DEXT\0"
-   "\0"
-   /* _mesa_function_pool[6329]: VertexAttrib1sARB (will be remapped) */
-   "ii\0"
-   "glVertexAttrib1s\0"
-   "glVertexAttrib1sARB\0"
-   "\0"
-   /* _mesa_function_pool[6370]: FenceSync (will be remapped) */
-   "ii\0"
-   "glFenceSync\0"
-   "\0"
-   /* _mesa_function_pool[6386]: Color4usv (offset 40) */
-   "p\0"
-   "glColor4usv\0"
-   "\0"
-   /* _mesa_function_pool[6401]: Fogi (offset 155) */
-   "ii\0"
-   "glFogi\0"
-   "\0"
-   /* _mesa_function_pool[6412]: DepthRange (offset 288) */
-   "dd\0"
-   "glDepthRange\0"
-   "\0"
-   /* _mesa_function_pool[6429]: RasterPos3iv (offset 75) */
-   "p\0"
-   "glRasterPos3iv\0"
-   "\0"
-   /* _mesa_function_pool[6447]: FinalCombinerInputNV (will be remapped) */
-   "iiii\0"
-   "glFinalCombinerInputNV\0"
-   "\0"
-   /* _mesa_function_pool[6476]: TexCoord2i (offset 106) */
-   "ii\0"
-   "glTexCoord2i\0"
-   "\0"
-   /* _mesa_function_pool[6493]: PixelMapfv (offset 251) */
-   "iip\0"
-   "glPixelMapfv\0"
-   "\0"
-   /* _mesa_function_pool[6511]: Color4ui (offset 37) */
-   "iiii\0"
-   "glColor4ui\0"
-   "\0"
-   /* _mesa_function_pool[6528]: RasterPos3s (offset 76) */
-   "iii\0"
-   "glRasterPos3s\0"
-   "\0"
-   /* _mesa_function_pool[6547]: Color3usv (offset 24) */
-   "p\0"
-   "glColor3usv\0"
-   "\0"
-   /* _mesa_function_pool[6562]: FlushRasterSGIX (dynamic) */
-   "\0"
-   "glFlushRasterSGIX\0"
-   "\0"
-   /* _mesa_function_pool[6582]: TexCoord2f (offset 104) */
-   "ff\0"
-   "glTexCoord2f\0"
-   "\0"
-   /* _mesa_function_pool[6599]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
-   "ifffff\0"
-   "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[6648]: TexCoord2d (offset 102) */
-   "dd\0"
-   "glTexCoord2d\0"
-   "\0"
-   /* _mesa_function_pool[6665]: RasterPos3d (offset 70) */
-   "ddd\0"
-   "glRasterPos3d\0"
-   "\0"
-   /* _mesa_function_pool[6684]: RasterPos3f (offset 72) */
-   "fff\0"
-   "glRasterPos3f\0"
-   "\0"
-   /* _mesa_function_pool[6703]: Uniform1fARB (will be remapped) */
-   "if\0"
-   "glUniform1f\0"
-   "glUniform1fARB\0"
-   "\0"
-   /* _mesa_function_pool[6734]: AreTexturesResident (offset 322) */
-   "ipp\0"
-   "glAreTexturesResident\0"
-   "glAreTexturesResidentEXT\0"
-   "\0"
-   /* _mesa_function_pool[6786]: TexCoord2s (offset 108) */
-   "ii\0"
-   "glTexCoord2s\0"
-   "\0"
-   /* _mesa_function_pool[6803]: StencilOpSeparate (will be remapped) */
-   "iiii\0"
-   "glStencilOpSeparate\0"
-   "glStencilOpSeparateATI\0"
-   "\0"
-   /* _mesa_function_pool[6852]: ColorTableParameteriv (offset 341) */
-   "iip\0"
-   "glColorTableParameteriv\0"
-   "glColorTableParameterivSGI\0"
-   "\0"
-   /* _mesa_function_pool[6908]: FogCoordPointerListIBM (dynamic) */
-   "iipi\0"
-   "glFogCoordPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[6939]: WindowPos3dMESA (will be remapped) */
-   "ddd\0"
-   "glWindowPos3d\0"
-   "glWindowPos3dARB\0"
-   "glWindowPos3dMESA\0"
-   "\0"
-   /* _mesa_function_pool[6993]: Color4us (offset 39) */
-   "iiii\0"
-   "glColor4us\0"
-   "\0"
-   /* _mesa_function_pool[7010]: PointParameterfvEXT (will be remapped) */
-   "ip\0"
-   "glPointParameterfv\0"
-   "glPointParameterfvARB\0"
-   "glPointParameterfvEXT\0"
-   "glPointParameterfvSGIS\0"
-   "\0"
-   /* _mesa_function_pool[7100]: Color3bv (offset 10) */
-   "p\0"
-   "glColor3bv\0"
-   "\0"
-   /* _mesa_function_pool[7114]: WindowPos2fvMESA (will be remapped) */
-   "p\0"
-   "glWindowPos2fv\0"
-   "glWindowPos2fvARB\0"
-   "glWindowPos2fvMESA\0"
-   "\0"
-   /* _mesa_function_pool[7169]: SecondaryColor3bvEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3bv\0"
-   "glSecondaryColor3bvEXT\0"
-   "\0"
-   /* _mesa_function_pool[7215]: VertexPointerListIBM (dynamic) */
-   "iiipi\0"
-   "glVertexPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[7245]: GetProgramLocalParameterfvARB (will be remapped) */
-   "iip\0"
-   "glGetProgramLocalParameterfvARB\0"
-   "\0"
-   /* _mesa_function_pool[7282]: FragmentMaterialfSGIX (dynamic) */
-   "iif\0"
-   "glFragmentMaterialfSGIX\0"
-   "\0"
-   /* _mesa_function_pool[7311]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
-   "ffffffff\0"
-   "glTexCoord2fNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[7353]: RenderbufferStorageEXT (will be remapped) */
-   "iiii\0"
-   "glRenderbufferStorage\0"
-   "glRenderbufferStorageEXT\0"
-   "\0"
-   /* _mesa_function_pool[7406]: IsFenceNV (will be remapped) */
-   "i\0"
-   "glIsFenceNV\0"
-   "\0"
-   /* _mesa_function_pool[7421]: AttachObjectARB (will be remapped) */
-   "ii\0"
-   "glAttachObjectARB\0"
-   "\0"
-   /* _mesa_function_pool[7443]: GetFragmentLightivSGIX (dynamic) */
-   "iip\0"
-   "glGetFragmentLightivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[7473]: UniformMatrix2fvARB (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix2fv\0"
-   "glUniformMatrix2fvARB\0"
-   "\0"
-   /* _mesa_function_pool[7520]: MultiTexCoord2fARB (offset 386) */
-   "iff\0"
-   "glMultiTexCoord2f\0"
-   "glMultiTexCoord2fARB\0"
-   "\0"
-   /* _mesa_function_pool[7564]: ColorTable (offset 339) */
-   "iiiiip\0"
-   "glColorTable\0"
-   "glColorTableSGI\0"
-   "glColorTableEXT\0"
-   "\0"
-   /* _mesa_function_pool[7617]: IndexPointer (offset 314) */
-   "iip\0"
-   "glIndexPointer\0"
-   "\0"
-   /* _mesa_function_pool[7637]: Accum (offset 213) */
-   "if\0"
-   "glAccum\0"
-   "\0"
-   /* _mesa_function_pool[7649]: GetTexImage (offset 281) */
-   "iiiip\0"
-   "glGetTexImage\0"
-   "\0"
-   /* _mesa_function_pool[7670]: MapControlPointsNV (dynamic) */
-   "iiiiiiiip\0"
-   "glMapControlPointsNV\0"
-   "\0"
-   /* _mesa_function_pool[7702]: ConvolutionFilter2D (offset 349) */
-   "iiiiiip\0"
-   "glConvolutionFilter2D\0"
-   "glConvolutionFilter2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[7758]: Finish (offset 216) */
-   "\0"
-   "glFinish\0"
-   "\0"
-   /* _mesa_function_pool[7769]: MapParameterfvNV (dynamic) */
-   "iip\0"
-   "glMapParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[7793]: ClearStencil (offset 207) */
-   "i\0"
-   "glClearStencil\0"
-   "\0"
-   /* _mesa_function_pool[7811]: VertexAttrib3dvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib3dv\0"
-   "glVertexAttrib3dvARB\0"
-   "\0"
-   /* _mesa_function_pool[7854]: HintPGI (dynamic) */
-   "ii\0"
-   "glHintPGI\0"
-   "\0"
-   /* _mesa_function_pool[7868]: ConvolutionParameteriv (offset 353) */
-   "iip\0"
-   "glConvolutionParameteriv\0"
-   "glConvolutionParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[7926]: Color4s (offset 33) */
-   "iiii\0"
-   "glColor4s\0"
-   "\0"
-   /* _mesa_function_pool[7942]: InterleavedArrays (offset 317) */
-   "iip\0"
-   "glInterleavedArrays\0"
-   "\0"
-   /* _mesa_function_pool[7967]: RasterPos2fv (offset 65) */
-   "p\0"
-   "glRasterPos2fv\0"
-   "\0"
-   /* _mesa_function_pool[7985]: TexCoord1fv (offset 97) */
-   "p\0"
-   "glTexCoord1fv\0"
-   "\0"
-   /* _mesa_function_pool[8002]: Vertex2d (offset 126) */
-   "dd\0"
-   "glVertex2d\0"
-   "\0"
-   /* _mesa_function_pool[8017]: CullParameterdvEXT (will be remapped) */
-   "ip\0"
-   "glCullParameterdvEXT\0"
-   "\0"
-   /* _mesa_function_pool[8042]: ProgramNamedParameter4fNV (will be remapped) */
-   "iipffff\0"
-   "glProgramNamedParameter4fNV\0"
-   "\0"
-   /* _mesa_function_pool[8079]: Color3fVertex3fSUN (dynamic) */
-   "ffffff\0"
-   "glColor3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[8108]: ProgramEnvParameter4fvARB (will be remapped) */
-   "iip\0"
-   "glProgramEnvParameter4fvARB\0"
-   "glProgramParameter4fvNV\0"
-   "\0"
-   /* _mesa_function_pool[8165]: Color4i (offset 31) */
-   "iiii\0"
-   "glColor4i\0"
-   "\0"
-   /* _mesa_function_pool[8181]: Color4f (offset 29) */
-   "ffff\0"
-   "glColor4f\0"
-   "\0"
-   /* _mesa_function_pool[8197]: RasterPos4fv (offset 81) */
-   "p\0"
-   "glRasterPos4fv\0"
-   "\0"
-   /* _mesa_function_pool[8215]: Color4d (offset 27) */
-   "dddd\0"
-   "glColor4d\0"
-   "\0"
-   /* _mesa_function_pool[8231]: ClearIndex (offset 205) */
-   "f\0"
-   "glClearIndex\0"
-   "\0"
-   /* _mesa_function_pool[8247]: Color4b (offset 25) */
-   "iiii\0"
-   "glColor4b\0"
-   "\0"
-   /* _mesa_function_pool[8263]: LoadMatrixd (offset 292) */
-   "p\0"
-   "glLoadMatrixd\0"
-   "\0"
-   /* _mesa_function_pool[8280]: FragmentLightModeliSGIX (dynamic) */
-   "ii\0"
-   "glFragmentLightModeliSGIX\0"
-   "\0"
-   /* _mesa_function_pool[8310]: RasterPos2dv (offset 63) */
-   "p\0"
-   "glRasterPos2dv\0"
-   "\0"
-   /* _mesa_function_pool[8328]: ConvolutionParameterfv (offset 351) */
-   "iip\0"
-   "glConvolutionParameterfv\0"
-   "glConvolutionParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[8386]: TbufferMask3DFX (dynamic) */
-   "i\0"
-   "glTbufferMask3DFX\0"
-   "\0"
-   /* _mesa_function_pool[8407]: GetTexGendv (offset 278) */
-   "iip\0"
-   "glGetTexGendv\0"
-   "\0"
-   /* _mesa_function_pool[8426]: GetVertexAttribfvNV (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribfvNV\0"
-   "\0"
-   /* _mesa_function_pool[8453]: BeginTransformFeedbackEXT (will be remapped) */
-   "i\0"
-   "glBeginTransformFeedbackEXT\0"
-   "glBeginTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[8509]: LoadProgramNV (will be remapped) */
-   "iiip\0"
-   "glLoadProgramNV\0"
-   "\0"
-   /* _mesa_function_pool[8531]: WaitSync (will be remapped) */
-   "iii\0"
-   "glWaitSync\0"
-   "\0"
-   /* _mesa_function_pool[8547]: EndList (offset 1) */
-   "\0"
-   "glEndList\0"
-   "\0"
-   /* _mesa_function_pool[8559]: VertexAttrib4fvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4fvNV\0"
-   "\0"
-   /* _mesa_function_pool[8583]: GetAttachedObjectsARB (will be remapped) */
-   "iipp\0"
-   "glGetAttachedObjectsARB\0"
-   "\0"
-   /* _mesa_function_pool[8613]: Uniform3fvARB (will be remapped) */
-   "iip\0"
-   "glUniform3fv\0"
-   "glUniform3fvARB\0"
-   "\0"
-   /* _mesa_function_pool[8647]: EvalCoord1fv (offset 231) */
-   "p\0"
-   "glEvalCoord1fv\0"
-   "\0"
-   /* _mesa_function_pool[8665]: DrawRangeElements (offset 338) */
-   "iiiiip\0"
-   "glDrawRangeElements\0"
-   "glDrawRangeElementsEXT\0"
-   "\0"
-   /* _mesa_function_pool[8716]: EvalMesh2 (offset 238) */
-   "iiiii\0"
-   "glEvalMesh2\0"
-   "\0"
-   /* _mesa_function_pool[8735]: Vertex4fv (offset 145) */
-   "p\0"
-   "glVertex4fv\0"
-   "\0"
-   /* _mesa_function_pool[8750]: GenTransformFeedbacks (will be remapped) */
-   "ip\0"
-   "glGenTransformFeedbacks\0"
-   "\0"
-   /* _mesa_function_pool[8778]: SpriteParameterfvSGIX (dynamic) */
-   "ip\0"
-   "glSpriteParameterfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[8806]: CheckFramebufferStatusEXT (will be remapped) */
-   "i\0"
-   "glCheckFramebufferStatus\0"
-   "glCheckFramebufferStatusEXT\0"
-   "\0"
-   /* _mesa_function_pool[8862]: GlobalAlphaFactoruiSUN (dynamic) */
-   "i\0"
-   "glGlobalAlphaFactoruiSUN\0"
-   "\0"
-   /* _mesa_function_pool[8890]: GetHandleARB (will be remapped) */
-   "i\0"
-   "glGetHandleARB\0"
-   "\0"
-   /* _mesa_function_pool[8908]: GetVertexAttribivARB (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribiv\0"
-   "glGetVertexAttribivARB\0"
-   "\0"
-   /* _mesa_function_pool[8956]: GetCombinerInputParameterfvNV (will be remapped) */
-   "iiiip\0"
-   "glGetCombinerInputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[8995]: CreateProgram (will be remapped) */
-   "\0"
-   "glCreateProgram\0"
-   "\0"
-   /* _mesa_function_pool[9013]: LoadTransposeMatrixdARB (will be remapped) */
-   "p\0"
-   "glLoadTransposeMatrixd\0"
-   "glLoadTransposeMatrixdARB\0"
-   "\0"
-   /* _mesa_function_pool[9065]: GetMinmax (offset 364) */
-   "iiiip\0"
-   "glGetMinmax\0"
-   "glGetMinmaxEXT\0"
-   "\0"
-   /* _mesa_function_pool[9099]: StencilFuncSeparate (will be remapped) */
-   "iiii\0"
-   "glStencilFuncSeparate\0"
-   "\0"
-   /* _mesa_function_pool[9127]: SecondaryColor3sEXT (will be remapped) */
-   "iii\0"
-   "glSecondaryColor3s\0"
-   "glSecondaryColor3sEXT\0"
-   "\0"
-   /* _mesa_function_pool[9173]: Color3fVertex3fvSUN (dynamic) */
-   "pp\0"
-   "glColor3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[9199]: Normal3fv (offset 57) */
-   "p\0"
-   "glNormal3fv\0"
-   "\0"
-   /* _mesa_function_pool[9214]: GlobalAlphaFactorbSUN (dynamic) */
-   "i\0"
-   "glGlobalAlphaFactorbSUN\0"
-   "\0"
-   /* _mesa_function_pool[9241]: Color3us (offset 23) */
-   "iii\0"
-   "glColor3us\0"
-   "\0"
-   /* _mesa_function_pool[9257]: ImageTransformParameterfvHP (dynamic) */
-   "iip\0"
-   "glImageTransformParameterfvHP\0"
-   "\0"
-   /* _mesa_function_pool[9292]: VertexAttrib4ivARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4iv\0"
-   "glVertexAttrib4ivARB\0"
-   "\0"
-   /* _mesa_function_pool[9335]: End (offset 43) */
-   "\0"
-   "glEnd\0"
-   "\0"
-   /* _mesa_function_pool[9343]: VertexAttrib3fNV (will be remapped) */
-   "ifff\0"
-   "glVertexAttrib3fNV\0"
-   "\0"
-   /* _mesa_function_pool[9368]: VertexAttribs2dvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs2dvNV\0"
-   "\0"
-   /* _mesa_function_pool[9394]: GetQueryObjectui64vEXT (will be remapped) */
-   "iip\0"
-   "glGetQueryObjectui64vEXT\0"
-   "\0"
-   /* _mesa_function_pool[9424]: MultiTexCoord3fvARB (offset 395) */
-   "ip\0"
-   "glMultiTexCoord3fv\0"
-   "glMultiTexCoord3fvARB\0"
-   "\0"
-   /* _mesa_function_pool[9469]: SecondaryColor3dEXT (will be remapped) */
-   "ddd\0"
-   "glSecondaryColor3d\0"
-   "glSecondaryColor3dEXT\0"
-   "\0"
-   /* _mesa_function_pool[9515]: Color3ub (offset 19) */
-   "iii\0"
-   "glColor3ub\0"
-   "\0"
-   /* _mesa_function_pool[9531]: GetProgramParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetProgramParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[9563]: TangentPointerEXT (dynamic) */
-   "iip\0"
-   "glTangentPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[9588]: Color4fNormal3fVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glColor4fNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[9623]: GetInstrumentsSGIX (dynamic) */
-   "\0"
-   "glGetInstrumentsSGIX\0"
-   "\0"
-   /* _mesa_function_pool[9646]: Color3ui (offset 21) */
-   "iii\0"
-   "glColor3ui\0"
-   "\0"
-   /* _mesa_function_pool[9662]: EvalMapsNV (dynamic) */
-   "ii\0"
-   "glEvalMapsNV\0"
-   "\0"
-   /* _mesa_function_pool[9679]: TexSubImage2D (offset 333) */
-   "iiiiiiiip\0"
-   "glTexSubImage2D\0"
-   "glTexSubImage2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[9725]: FragmentLightivSGIX (dynamic) */
-   "iip\0"
-   "glFragmentLightivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[9752]: GetTexParameterPointervAPPLE (will be remapped) */
-   "iip\0"
-   "glGetTexParameterPointervAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[9788]: TexGenfv (offset 191) */
-   "iip\0"
-   "glTexGenfv\0"
-   "\0"
-   /* _mesa_function_pool[9804]: GetTransformFeedbackVaryingEXT (will be remapped) */
-   "iiipppp\0"
-   "glGetTransformFeedbackVaryingEXT\0"
-   "glGetTransformFeedbackVarying\0"
-   "\0"
-   /* _mesa_function_pool[9876]: VertexAttrib4bvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4bv\0"
-   "glVertexAttrib4bvARB\0"
-   "\0"
-   /* _mesa_function_pool[9919]: AlphaFragmentOp2ATI (will be remapped) */
-   "iiiiiiiii\0"
-   "glAlphaFragmentOp2ATI\0"
-   "\0"
-   /* _mesa_function_pool[9952]: GetIntegerIndexedvEXT (will be remapped) */
-   "iip\0"
-   "glGetIntegerIndexedvEXT\0"
-   "\0"
-   /* _mesa_function_pool[9981]: MultiTexCoord4sARB (offset 406) */
-   "iiiii\0"
-   "glMultiTexCoord4s\0"
-   "glMultiTexCoord4sARB\0"
-   "\0"
-   /* _mesa_function_pool[10027]: GetFragmentMaterialivSGIX (dynamic) */
-   "iip\0"
-   "glGetFragmentMaterialivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[10060]: WindowPos4dMESA (will be remapped) */
-   "dddd\0"
-   "glWindowPos4dMESA\0"
-   "\0"
-   /* _mesa_function_pool[10084]: WeightPointerARB (dynamic) */
-   "iiip\0"
-   "glWeightPointerARB\0"
-   "\0"
-   /* _mesa_function_pool[10109]: WindowPos2dMESA (will be remapped) */
-   "dd\0"
-   "glWindowPos2d\0"
-   "glWindowPos2dARB\0"
-   "glWindowPos2dMESA\0"
-   "\0"
-   /* _mesa_function_pool[10162]: FramebufferTexture3DEXT (will be remapped) */
-   "iiiiii\0"
-   "glFramebufferTexture3D\0"
-   "glFramebufferTexture3DEXT\0"
-   "\0"
-   /* _mesa_function_pool[10219]: BlendEquation (offset 337) */
-   "i\0"
-   "glBlendEquation\0"
-   "glBlendEquationEXT\0"
-   "\0"
-   /* _mesa_function_pool[10257]: VertexAttrib3dNV (will be remapped) */
-   "iddd\0"
-   "glVertexAttrib3dNV\0"
-   "\0"
-   /* _mesa_function_pool[10282]: VertexAttrib3dARB (will be remapped) */
-   "iddd\0"
-   "glVertexAttrib3d\0"
-   "glVertexAttrib3dARB\0"
-   "\0"
-   /* _mesa_function_pool[10325]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
-   "ppppp\0"
-   "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[10389]: VertexAttrib4fARB (will be remapped) */
-   "iffff\0"
-   "glVertexAttrib4f\0"
-   "glVertexAttrib4fARB\0"
-   "\0"
-   /* _mesa_function_pool[10433]: GetError (offset 261) */
-   "\0"
-   "glGetError\0"
-   "\0"
-   /* _mesa_function_pool[10446]: IndexFuncEXT (dynamic) */
-   "if\0"
-   "glIndexFuncEXT\0"
-   "\0"
-   /* _mesa_function_pool[10465]: TexCoord3dv (offset 111) */
-   "p\0"
-   "glTexCoord3dv\0"
-   "\0"
-   /* _mesa_function_pool[10482]: Indexdv (offset 45) */
-   "p\0"
-   "glIndexdv\0"
-   "\0"
-   /* _mesa_function_pool[10495]: FramebufferTexture2DEXT (will be remapped) */
-   "iiiii\0"
-   "glFramebufferTexture2D\0"
-   "glFramebufferTexture2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[10551]: Normal3s (offset 60) */
-   "iii\0"
-   "glNormal3s\0"
-   "\0"
-   /* _mesa_function_pool[10567]: GetObjectParameterivAPPLE (will be remapped) */
-   "iiip\0"
-   "glGetObjectParameterivAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[10601]: PushName (offset 201) */
-   "i\0"
-   "glPushName\0"
-   "\0"
-   /* _mesa_function_pool[10615]: MultiTexCoord2dvARB (offset 385) */
-   "ip\0"
-   "glMultiTexCoord2dv\0"
-   "glMultiTexCoord2dvARB\0"
-   "\0"
-   /* _mesa_function_pool[10660]: CullParameterfvEXT (will be remapped) */
-   "ip\0"
-   "glCullParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[10685]: Normal3i (offset 58) */
-   "iii\0"
-   "glNormal3i\0"
-   "\0"
-   /* _mesa_function_pool[10701]: ProgramNamedParameter4fvNV (will be remapped) */
-   "iipp\0"
-   "glProgramNamedParameter4fvNV\0"
-   "\0"
-   /* _mesa_function_pool[10736]: SecondaryColorPointerEXT (will be remapped) */
-   "iiip\0"
-   "glSecondaryColorPointer\0"
-   "glSecondaryColorPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[10793]: VertexAttrib4fvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4fv\0"
-   "glVertexAttrib4fvARB\0"
-   "\0"
-   /* _mesa_function_pool[10836]: ColorPointerListIBM (dynamic) */
-   "iiipi\0"
-   "glColorPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[10865]: GetActiveUniformARB (will be remapped) */
-   "iiipppp\0"
-   "glGetActiveUniform\0"
-   "glGetActiveUniformARB\0"
-   "\0"
-   /* _mesa_function_pool[10915]: ImageTransformParameteriHP (dynamic) */
-   "iii\0"
-   "glImageTransformParameteriHP\0"
-   "\0"
-   /* _mesa_function_pool[10949]: Normal3b (offset 52) */
-   "iii\0"
-   "glNormal3b\0"
-   "\0"
-   /* _mesa_function_pool[10965]: Normal3d (offset 54) */
-   "ddd\0"
-   "glNormal3d\0"
-   "\0"
-   /* _mesa_function_pool[10981]: Normal3f (offset 56) */
-   "fff\0"
-   "glNormal3f\0"
-   "\0"
-   /* _mesa_function_pool[10997]: MultiTexCoord1svARB (offset 383) */
-   "ip\0"
-   "glMultiTexCoord1sv\0"
-   "glMultiTexCoord1svARB\0"
-   "\0"
-   /* _mesa_function_pool[11042]: Indexi (offset 48) */
-   "i\0"
-   "glIndexi\0"
-   "\0"
-   /* _mesa_function_pool[11054]: EGLImageTargetTexture2DOES (will be remapped) */
-   "ip\0"
-   "glEGLImageTargetTexture2DOES\0"
-   "\0"
-   /* _mesa_function_pool[11087]: EndQueryARB (will be remapped) */
-   "i\0"
-   "glEndQuery\0"
-   "glEndQueryARB\0"
-   "\0"
-   /* _mesa_function_pool[11115]: DeleteFencesNV (will be remapped) */
-   "ip\0"
-   "glDeleteFencesNV\0"
-   "\0"
-   /* _mesa_function_pool[11136]: BindBufferRangeEXT (will be remapped) */
-   "iiiii\0"
-   "glBindBufferRangeEXT\0"
-   "glBindBufferRange\0"
-   "\0"
-   /* _mesa_function_pool[11182]: DepthMask (offset 211) */
-   "i\0"
-   "glDepthMask\0"
-   "\0"
-   /* _mesa_function_pool[11197]: IsShader (will be remapped) */
-   "i\0"
-   "glIsShader\0"
-   "\0"
-   /* _mesa_function_pool[11211]: Indexf (offset 46) */
-   "f\0"
-   "glIndexf\0"
-   "\0"
-   /* _mesa_function_pool[11223]: GetImageTransformParameterivHP (dynamic) */
-   "iip\0"
-   "glGetImageTransformParameterivHP\0"
-   "\0"
-   /* _mesa_function_pool[11261]: Indexd (offset 44) */
-   "d\0"
-   "glIndexd\0"
-   "\0"
-   /* _mesa_function_pool[11273]: GetMaterialiv (offset 270) */
-   "iip\0"
-   "glGetMaterialiv\0"
-   "\0"
-   /* _mesa_function_pool[11294]: StencilOp (offset 244) */
-   "iii\0"
-   "glStencilOp\0"
-   "\0"
-   /* _mesa_function_pool[11311]: WindowPos4ivMESA (will be remapped) */
-   "p\0"
-   "glWindowPos4ivMESA\0"
-   "\0"
-   /* _mesa_function_pool[11333]: FramebufferTextureLayer (dynamic) */
-   "iiiii\0"
-   "glFramebufferTextureLayerARB\0"
-   "\0"
-   /* _mesa_function_pool[11369]: MultiTexCoord3svARB (offset 399) */
-   "ip\0"
-   "glMultiTexCoord3sv\0"
-   "glMultiTexCoord3svARB\0"
-   "\0"
-   /* _mesa_function_pool[11414]: TexEnvfv (offset 185) */
-   "iip\0"
-   "glTexEnvfv\0"
-   "\0"
-   /* _mesa_function_pool[11430]: MultiTexCoord4iARB (offset 404) */
-   "iiiii\0"
-   "glMultiTexCoord4i\0"
-   "glMultiTexCoord4iARB\0"
-   "\0"
-   /* _mesa_function_pool[11476]: Indexs (offset 50) */
-   "i\0"
-   "glIndexs\0"
-   "\0"
-   /* _mesa_function_pool[11488]: Binormal3ivEXT (dynamic) */
-   "p\0"
-   "glBinormal3ivEXT\0"
-   "\0"
-   /* _mesa_function_pool[11508]: ResizeBuffersMESA (will be remapped) */
-   "\0"
-   "glResizeBuffersMESA\0"
-   "\0"
-   /* _mesa_function_pool[11530]: GetUniformivARB (will be remapped) */
-   "iip\0"
-   "glGetUniformiv\0"
-   "glGetUniformivARB\0"
-   "\0"
-   /* _mesa_function_pool[11568]: PixelTexGenParameteriSGIS (will be remapped) */
-   "ii\0"
-   "glPixelTexGenParameteriSGIS\0"
-   "\0"
-   /* _mesa_function_pool[11600]: VertexPointervINTEL (dynamic) */
-   "iip\0"
-   "glVertexPointervINTEL\0"
-   "\0"
-   /* _mesa_function_pool[11627]: Vertex2i (offset 130) */
-   "ii\0"
-   "glVertex2i\0"
-   "\0"
-   /* _mesa_function_pool[11642]: LoadMatrixf (offset 291) */
-   "p\0"
-   "glLoadMatrixf\0"
-   "\0"
-   /* _mesa_function_pool[11659]: Vertex2f (offset 128) */
-   "ff\0"
-   "glVertex2f\0"
-   "\0"
-   /* _mesa_function_pool[11674]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
-   "pppp\0"
-   "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[11727]: Color4bv (offset 26) */
-   "p\0"
-   "glColor4bv\0"
-   "\0"
-   /* _mesa_function_pool[11741]: VertexPointer (offset 321) */
-   "iiip\0"
-   "glVertexPointer\0"
-   "\0"
-   /* _mesa_function_pool[11763]: SecondaryColor3uiEXT (will be remapped) */
-   "iii\0"
-   "glSecondaryColor3ui\0"
-   "glSecondaryColor3uiEXT\0"
-   "\0"
-   /* _mesa_function_pool[11811]: StartInstrumentsSGIX (dynamic) */
-   "\0"
-   "glStartInstrumentsSGIX\0"
-   "\0"
-   /* _mesa_function_pool[11836]: SecondaryColor3usvEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3usv\0"
-   "glSecondaryColor3usvEXT\0"
-   "\0"
-   /* _mesa_function_pool[11884]: VertexAttrib2fvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib2fvNV\0"
-   "\0"
-   /* _mesa_function_pool[11908]: ProgramLocalParameter4dvARB (will be remapped) */
-   "iip\0"
-   "glProgramLocalParameter4dvARB\0"
-   "\0"
-   /* _mesa_function_pool[11943]: DeleteLists (offset 4) */
-   "ii\0"
-   "glDeleteLists\0"
-   "\0"
-   /* _mesa_function_pool[11961]: LogicOp (offset 242) */
-   "i\0"
-   "glLogicOp\0"
-   "\0"
-   /* _mesa_function_pool[11974]: MatrixIndexuivARB (dynamic) */
-   "ip\0"
-   "glMatrixIndexuivARB\0"
-   "\0"
-   /* _mesa_function_pool[11998]: Vertex2s (offset 132) */
-   "ii\0"
-   "glVertex2s\0"
-   "\0"
-   /* _mesa_function_pool[12013]: RenderbufferStorageMultisample (will be remapped) */
-   "iiiii\0"
-   "glRenderbufferStorageMultisample\0"
-   "glRenderbufferStorageMultisampleEXT\0"
-   "\0"
-   /* _mesa_function_pool[12089]: TexCoord4fv (offset 121) */
-   "p\0"
-   "glTexCoord4fv\0"
-   "\0"
-   /* _mesa_function_pool[12106]: Tangent3sEXT (dynamic) */
-   "iii\0"
-   "glTangent3sEXT\0"
-   "\0"
-   /* _mesa_function_pool[12126]: GlobalAlphaFactorfSUN (dynamic) */
-   "f\0"
-   "glGlobalAlphaFactorfSUN\0"
-   "\0"
-   /* _mesa_function_pool[12153]: MultiTexCoord3iARB (offset 396) */
-   "iiii\0"
-   "glMultiTexCoord3i\0"
-   "glMultiTexCoord3iARB\0"
-   "\0"
-   /* _mesa_function_pool[12198]: IsProgram (will be remapped) */
-   "i\0"
-   "glIsProgram\0"
-   "\0"
-   /* _mesa_function_pool[12213]: TexCoordPointerListIBM (dynamic) */
-   "iiipi\0"
-   "glTexCoordPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[12245]: GlobalAlphaFactorusSUN (dynamic) */
-   "i\0"
-   "glGlobalAlphaFactorusSUN\0"
-   "\0"
-   /* _mesa_function_pool[12273]: VertexAttrib2dvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib2dvNV\0"
-   "\0"
-   /* _mesa_function_pool[12297]: FramebufferRenderbufferEXT (will be remapped) */
-   "iiii\0"
-   "glFramebufferRenderbuffer\0"
-   "glFramebufferRenderbufferEXT\0"
-   "\0"
-   /* _mesa_function_pool[12358]: VertexAttrib1dvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib1dvNV\0"
-   "\0"
-   /* _mesa_function_pool[12382]: GenTextures (offset 328) */
-   "ip\0"
-   "glGenTextures\0"
-   "glGenTexturesEXT\0"
-   "\0"
-   /* _mesa_function_pool[12417]: FramebufferTextureARB (will be remapped) */
-   "iiii\0"
-   "glFramebufferTextureARB\0"
-   "\0"
-   /* _mesa_function_pool[12447]: SetFenceNV (will be remapped) */
-   "ii\0"
-   "glSetFenceNV\0"
-   "\0"
-   /* _mesa_function_pool[12464]: FramebufferTexture1DEXT (will be remapped) */
-   "iiiii\0"
-   "glFramebufferTexture1D\0"
-   "glFramebufferTexture1DEXT\0"
-   "\0"
-   /* _mesa_function_pool[12520]: GetCombinerOutputParameterivNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[12559]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[12591]: PixelTexGenParameterivSGIS (will be remapped) */
-   "ip\0"
-   "glPixelTexGenParameterivSGIS\0"
-   "\0"
-   /* _mesa_function_pool[12624]: TextureNormalEXT (dynamic) */
-   "i\0"
-   "glTextureNormalEXT\0"
-   "\0"
-   /* _mesa_function_pool[12646]: IndexPointerListIBM (dynamic) */
-   "iipi\0"
-   "glIndexPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[12674]: WeightfvARB (dynamic) */
-   "ip\0"
-   "glWeightfvARB\0"
-   "\0"
-   /* _mesa_function_pool[12692]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[12731]: RasterPos2sv (offset 69) */
-   "p\0"
-   "glRasterPos2sv\0"
-   "\0"
-   /* _mesa_function_pool[12749]: Color4ubv (offset 36) */
-   "p\0"
-   "glColor4ubv\0"
-   "\0"
-   /* _mesa_function_pool[12764]: DrawBuffer (offset 202) */
-   "i\0"
-   "glDrawBuffer\0"
-   "\0"
-   /* _mesa_function_pool[12780]: TexCoord2fv (offset 105) */
-   "p\0"
-   "glTexCoord2fv\0"
-   "\0"
-   /* _mesa_function_pool[12797]: WindowPos4fMESA (will be remapped) */
-   "ffff\0"
-   "glWindowPos4fMESA\0"
-   "\0"
-   /* _mesa_function_pool[12821]: TexCoord1sv (offset 101) */
-   "p\0"
-   "glTexCoord1sv\0"
-   "\0"
-   /* _mesa_function_pool[12838]: WindowPos3dvMESA (will be remapped) */
-   "p\0"
-   "glWindowPos3dv\0"
-   "glWindowPos3dvARB\0"
-   "glWindowPos3dvMESA\0"
-   "\0"
-   /* _mesa_function_pool[12893]: DepthFunc (offset 245) */
-   "i\0"
-   "glDepthFunc\0"
-   "\0"
-   /* _mesa_function_pool[12908]: PixelMapusv (offset 253) */
-   "iip\0"
-   "glPixelMapusv\0"
-   "\0"
-   /* _mesa_function_pool[12927]: GetQueryObjecti64vEXT (will be remapped) */
-   "iip\0"
-   "glGetQueryObjecti64vEXT\0"
-   "\0"
-   /* _mesa_function_pool[12956]: MultiTexCoord1dARB (offset 376) */
-   "id\0"
-   "glMultiTexCoord1d\0"
-   "glMultiTexCoord1dARB\0"
-   "\0"
-   /* _mesa_function_pool[12999]: PointParameterivNV (will be remapped) */
-   "ip\0"
-   "glPointParameteriv\0"
-   "glPointParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[13043]: BlendFunc (offset 241) */
-   "ii\0"
-   "glBlendFunc\0"
-   "\0"
-   /* _mesa_function_pool[13059]: EndTransformFeedbackEXT (will be remapped) */
-   "\0"
-   "glEndTransformFeedbackEXT\0"
-   "glEndTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[13110]: Uniform2fvARB (will be remapped) */
-   "iip\0"
-   "glUniform2fv\0"
-   "glUniform2fvARB\0"
-   "\0"
-   /* _mesa_function_pool[13144]: BufferParameteriAPPLE (will be remapped) */
-   "iii\0"
-   "glBufferParameteriAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[13173]: MultiTexCoord3dvARB (offset 393) */
-   "ip\0"
-   "glMultiTexCoord3dv\0"
-   "glMultiTexCoord3dvARB\0"
-   "\0"
-   /* _mesa_function_pool[13218]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
-   "pppp\0"
-   "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[13274]: DeleteObjectARB (will be remapped) */
-   "i\0"
-   "glDeleteObjectARB\0"
-   "\0"
-   /* _mesa_function_pool[13295]: MatrixIndexPointerARB (dynamic) */
-   "iiip\0"
-   "glMatrixIndexPointerARB\0"
-   "\0"
-   /* _mesa_function_pool[13325]: ProgramNamedParameter4dvNV (will be remapped) */
-   "iipp\0"
-   "glProgramNamedParameter4dvNV\0"
-   "\0"
-   /* _mesa_function_pool[13360]: Tangent3fvEXT (dynamic) */
-   "p\0"
-   "glTangent3fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[13379]: Flush (offset 217) */
-   "\0"
-   "glFlush\0"
-   "\0"
-   /* _mesa_function_pool[13389]: Color4uiv (offset 38) */
-   "p\0"
-   "glColor4uiv\0"
-   "\0"
-   /* _mesa_function_pool[13404]: GenVertexArrays (will be remapped) */
-   "ip\0"
-   "glGenVertexArrays\0"
-   "\0"
-   /* _mesa_function_pool[13426]: RasterPos3sv (offset 77) */
-   "p\0"
-   "glRasterPos3sv\0"
-   "\0"
-   /* _mesa_function_pool[13444]: BindFramebufferEXT (will be remapped) */
-   "ii\0"
-   "glBindFramebuffer\0"
-   "glBindFramebufferEXT\0"
-   "\0"
-   /* _mesa_function_pool[13487]: ReferencePlaneSGIX (dynamic) */
-   "p\0"
-   "glReferencePlaneSGIX\0"
-   "\0"
-   /* _mesa_function_pool[13511]: PushAttrib (offset 219) */
-   "i\0"
-   "glPushAttrib\0"
-   "\0"
-   /* _mesa_function_pool[13527]: RasterPos2i (offset 66) */
-   "ii\0"
-   "glRasterPos2i\0"
-   "\0"
-   /* _mesa_function_pool[13545]: ValidateProgramARB (will be remapped) */
-   "i\0"
-   "glValidateProgram\0"
-   "glValidateProgramARB\0"
-   "\0"
-   /* _mesa_function_pool[13587]: TexParameteriv (offset 181) */
-   "iip\0"
-   "glTexParameteriv\0"
-   "\0"
-   /* _mesa_function_pool[13609]: UnlockArraysEXT (will be remapped) */
-   "\0"
-   "glUnlockArraysEXT\0"
-   "\0"
-   /* _mesa_function_pool[13629]: TexCoord2fColor3fVertex3fSUN (dynamic) */
-   "ffffffff\0"
-   "glTexCoord2fColor3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[13670]: WindowPos3fvMESA (will be remapped) */
-   "p\0"
-   "glWindowPos3fv\0"
-   "glWindowPos3fvARB\0"
-   "glWindowPos3fvMESA\0"
-   "\0"
-   /* _mesa_function_pool[13725]: RasterPos2f (offset 64) */
-   "ff\0"
-   "glRasterPos2f\0"
-   "\0"
-   /* _mesa_function_pool[13743]: VertexAttrib1svNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib1svNV\0"
-   "\0"
-   /* _mesa_function_pool[13767]: RasterPos2d (offset 62) */
-   "dd\0"
-   "glRasterPos2d\0"
-   "\0"
-   /* _mesa_function_pool[13785]: RasterPos3fv (offset 73) */
-   "p\0"
-   "glRasterPos3fv\0"
-   "\0"
-   /* _mesa_function_pool[13803]: CopyTexSubImage3D (offset 373) */
-   "iiiiiiiii\0"
-   "glCopyTexSubImage3D\0"
-   "glCopyTexSubImage3DEXT\0"
-   "\0"
-   /* _mesa_function_pool[13857]: VertexAttrib2dARB (will be remapped) */
-   "idd\0"
-   "glVertexAttrib2d\0"
-   "glVertexAttrib2dARB\0"
-   "\0"
-   /* _mesa_function_pool[13899]: Color4ub (offset 35) */
-   "iiii\0"
-   "glColor4ub\0"
-   "\0"
-   /* _mesa_function_pool[13916]: GetInteger64v (will be remapped) */
-   "ip\0"
-   "glGetInteger64v\0"
-   "\0"
-   /* _mesa_function_pool[13936]: TextureColorMaskSGIS (dynamic) */
-   "iiii\0"
-   "glTextureColorMaskSGIS\0"
-   "\0"
-   /* _mesa_function_pool[13965]: RasterPos2s (offset 68) */
-   "ii\0"
-   "glRasterPos2s\0"
-   "\0"
-   /* _mesa_function_pool[13983]: GetColorTable (offset 343) */
-   "iiip\0"
-   "glGetColorTable\0"
-   "glGetColorTableSGI\0"
-   "glGetColorTableEXT\0"
-   "\0"
-   /* _mesa_function_pool[14043]: SelectBuffer (offset 195) */
-   "ip\0"
-   "glSelectBuffer\0"
-   "\0"
-   /* _mesa_function_pool[14062]: Indexiv (offset 49) */
-   "p\0"
-   "glIndexiv\0"
-   "\0"
-   /* _mesa_function_pool[14075]: TexCoord3i (offset 114) */
-   "iii\0"
-   "glTexCoord3i\0"
-   "\0"
-   /* _mesa_function_pool[14093]: CopyColorTable (offset 342) */
-   "iiiii\0"
-   "glCopyColorTable\0"
-   "glCopyColorTableSGI\0"
-   "\0"
-   /* _mesa_function_pool[14137]: GetHistogramParameterfv (offset 362) */
-   "iip\0"
-   "glGetHistogramParameterfv\0"
-   "glGetHistogramParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[14197]: Frustum (offset 289) */
-   "dddddd\0"
-   "glFrustum\0"
-   "\0"
-   /* _mesa_function_pool[14215]: GetString (offset 275) */
-   "i\0"
-   "glGetString\0"
-   "\0"
-   /* _mesa_function_pool[14230]: ColorPointervINTEL (dynamic) */
-   "iip\0"
-   "glColorPointervINTEL\0"
-   "\0"
-   /* _mesa_function_pool[14256]: TexEnvf (offset 184) */
-   "iif\0"
-   "glTexEnvf\0"
-   "\0"
-   /* _mesa_function_pool[14271]: TexCoord3d (offset 110) */
-   "ddd\0"
-   "glTexCoord3d\0"
-   "\0"
-   /* _mesa_function_pool[14289]: AlphaFragmentOp1ATI (will be remapped) */
-   "iiiiii\0"
-   "glAlphaFragmentOp1ATI\0"
-   "\0"
-   /* _mesa_function_pool[14319]: TexCoord3f (offset 112) */
-   "fff\0"
-   "glTexCoord3f\0"
-   "\0"
-   /* _mesa_function_pool[14337]: MultiTexCoord3ivARB (offset 397) */
-   "ip\0"
-   "glMultiTexCoord3iv\0"
-   "glMultiTexCoord3ivARB\0"
-   "\0"
-   /* _mesa_function_pool[14382]: MultiTexCoord2sARB (offset 390) */
-   "iii\0"
-   "glMultiTexCoord2s\0"
-   "glMultiTexCoord2sARB\0"
-   "\0"
-   /* _mesa_function_pool[14426]: VertexAttrib1dvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib1dv\0"
-   "glVertexAttrib1dvARB\0"
-   "\0"
-   /* _mesa_function_pool[14469]: DeleteTextures (offset 327) */
-   "ip\0"
-   "glDeleteTextures\0"
-   "glDeleteTexturesEXT\0"
-   "\0"
-   /* _mesa_function_pool[14510]: TexCoordPointerEXT (will be remapped) */
-   "iiiip\0"
-   "glTexCoordPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[14538]: TexSubImage4DSGIS (dynamic) */
-   "iiiiiiiiiiiip\0"
-   "glTexSubImage4DSGIS\0"
-   "\0"
-   /* _mesa_function_pool[14573]: TexCoord3s (offset 116) */
-   "iii\0"
-   "glTexCoord3s\0"
-   "\0"
-   /* _mesa_function_pool[14591]: GetTexLevelParameteriv (offset 285) */
-   "iiip\0"
-   "glGetTexLevelParameteriv\0"
-   "\0"
-   /* _mesa_function_pool[14622]: DrawArraysInstanced (will be remapped) */
-   "iiii\0"
-   "glDrawArraysInstanced\0"
-   "glDrawArraysInstancedARB\0"
-   "glDrawArraysInstancedEXT\0"
-   "\0"
-   /* _mesa_function_pool[14700]: CombinerStageParameterfvNV (dynamic) */
-   "iip\0"
-   "glCombinerStageParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[14734]: StopInstrumentsSGIX (dynamic) */
-   "i\0"
-   "glStopInstrumentsSGIX\0"
-   "\0"
-   /* _mesa_function_pool[14759]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
-   "fffffffffffffff\0"
-   "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
-   "\0"
-   /* _mesa_function_pool[14815]: ClearAccum (offset 204) */
-   "ffff\0"
-   "glClearAccum\0"
-   "\0"
-   /* _mesa_function_pool[14834]: DeformSGIX (dynamic) */
-   "i\0"
-   "glDeformSGIX\0"
-   "\0"
-   /* _mesa_function_pool[14850]: GetVertexAttribfvARB (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribfv\0"
-   "glGetVertexAttribfvARB\0"
-   "\0"
-   /* _mesa_function_pool[14898]: SecondaryColor3ivEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3iv\0"
-   "glSecondaryColor3ivEXT\0"
-   "\0"
-   /* _mesa_function_pool[14944]: TexCoord4iv (offset 123) */
-   "p\0"
-   "glTexCoord4iv\0"
-   "\0"
-   /* _mesa_function_pool[14961]: UniformMatrix4x2fv (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix4x2fv\0"
-   "\0"
-   /* _mesa_function_pool[14988]: GetDetailTexFuncSGIS (dynamic) */
-   "ip\0"
-   "glGetDetailTexFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[15015]: GetCombinerStageParameterfvNV (dynamic) */
-   "iip\0"
-   "glGetCombinerStageParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[15052]: PolygonOffset (offset 319) */
-   "ff\0"
-   "glPolygonOffset\0"
-   "\0"
-   /* _mesa_function_pool[15072]: BindVertexArray (will be remapped) */
-   "i\0"
-   "glBindVertexArray\0"
-   "\0"
-   /* _mesa_function_pool[15093]: Color4ubVertex2fvSUN (dynamic) */
-   "pp\0"
-   "glColor4ubVertex2fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[15120]: Rectd (offset 86) */
-   "dddd\0"
-   "glRectd\0"
-   "\0"
-   /* _mesa_function_pool[15134]: TexFilterFuncSGIS (dynamic) */
-   "iiip\0"
-   "glTexFilterFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[15160]: SampleMaskSGIS (will be remapped) */
-   "fi\0"
-   "glSampleMaskSGIS\0"
-   "glSampleMaskEXT\0"
-   "\0"
-   /* _mesa_function_pool[15197]: GetAttribLocationARB (will be remapped) */
-   "ip\0"
-   "glGetAttribLocation\0"
-   "glGetAttribLocationARB\0"
-   "\0"
-   /* _mesa_function_pool[15244]: RasterPos3i (offset 74) */
-   "iii\0"
-   "glRasterPos3i\0"
-   "\0"
-   /* _mesa_function_pool[15263]: VertexAttrib4ubvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4ubv\0"
-   "glVertexAttrib4ubvARB\0"
-   "\0"
-   /* _mesa_function_pool[15308]: DetailTexFuncSGIS (dynamic) */
-   "iip\0"
-   "glDetailTexFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[15333]: Normal3fVertex3fSUN (dynamic) */
-   "ffffff\0"
-   "glNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[15363]: CopyTexImage2D (offset 324) */
-   "iiiiiiii\0"
-   "glCopyTexImage2D\0"
-   "glCopyTexImage2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[15410]: GetBufferPointervARB (will be remapped) */
-   "iip\0"
-   "glGetBufferPointerv\0"
-   "glGetBufferPointervARB\0"
-   "\0"
-   /* _mesa_function_pool[15458]: ProgramEnvParameter4fARB (will be remapped) */
-   "iiffff\0"
-   "glProgramEnvParameter4fARB\0"
-   "glProgramParameter4fNV\0"
-   "\0"
-   /* _mesa_function_pool[15516]: Uniform3ivARB (will be remapped) */
-   "iip\0"
-   "glUniform3iv\0"
-   "glUniform3ivARB\0"
-   "\0"
-   /* _mesa_function_pool[15550]: Lightfv (offset 160) */
-   "iip\0"
-   "glLightfv\0"
-   "\0"
-   /* _mesa_function_pool[15565]: ClearDepth (offset 208) */
-   "d\0"
-   "glClearDepth\0"
-   "\0"
-   /* _mesa_function_pool[15581]: GetFenceivNV (will be remapped) */
-   "iip\0"
-   "glGetFenceivNV\0"
-   "\0"
-   /* _mesa_function_pool[15601]: WindowPos4dvMESA (will be remapped) */
-   "p\0"
-   "glWindowPos4dvMESA\0"
-   "\0"
-   /* _mesa_function_pool[15623]: ColorSubTable (offset 346) */
-   "iiiiip\0"
-   "glColorSubTable\0"
-   "glColorSubTableEXT\0"
-   "\0"
-   /* _mesa_function_pool[15666]: Color4fv (offset 30) */
-   "p\0"
-   "glColor4fv\0"
-   "\0"
-   /* _mesa_function_pool[15680]: MultiTexCoord4ivARB (offset 405) */
-   "ip\0"
-   "glMultiTexCoord4iv\0"
-   "glMultiTexCoord4ivARB\0"
-   "\0"
-   /* _mesa_function_pool[15725]: DrawElementsInstanced (will be remapped) */
-   "iiipi\0"
-   "glDrawElementsInstanced\0"
-   "glDrawElementsInstancedARB\0"
-   "glDrawElementsInstancedEXT\0"
-   "\0"
-   /* _mesa_function_pool[15810]: ColorPointer (offset 308) */
-   "iiip\0"
-   "glColorPointer\0"
-   "\0"
-   /* _mesa_function_pool[15831]: Rects (offset 92) */
-   "iiii\0"
-   "glRects\0"
-   "\0"
-   /* _mesa_function_pool[15845]: GetMapAttribParameterfvNV (dynamic) */
-   "iiip\0"
-   "glGetMapAttribParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[15879]: Lightiv (offset 162) */
-   "iip\0"
-   "glLightiv\0"
-   "\0"
-   /* _mesa_function_pool[15894]: VertexAttrib4sARB (will be remapped) */
-   "iiiii\0"
-   "glVertexAttrib4s\0"
-   "glVertexAttrib4sARB\0"
-   "\0"
-   /* _mesa_function_pool[15938]: GetQueryObjectuivARB (will be remapped) */
-   "iip\0"
-   "glGetQueryObjectuiv\0"
-   "glGetQueryObjectuivARB\0"
-   "\0"
-   /* _mesa_function_pool[15986]: GetTexParameteriv (offset 283) */
-   "iip\0"
-   "glGetTexParameteriv\0"
-   "\0"
-   /* _mesa_function_pool[16011]: MapParameterivNV (dynamic) */
-   "iip\0"
-   "glMapParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[16035]: GenRenderbuffersEXT (will be remapped) */
-   "ip\0"
-   "glGenRenderbuffers\0"
-   "glGenRenderbuffersEXT\0"
-   "\0"
-   /* _mesa_function_pool[16080]: VertexAttrib2dvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib2dv\0"
-   "glVertexAttrib2dvARB\0"
-   "\0"
-   /* _mesa_function_pool[16123]: EdgeFlagPointerEXT (will be remapped) */
-   "iip\0"
-   "glEdgeFlagPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[16149]: VertexAttribs2svNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs2svNV\0"
-   "\0"
-   /* _mesa_function_pool[16175]: WeightbvARB (dynamic) */
-   "ip\0"
-   "glWeightbvARB\0"
-   "\0"
-   /* _mesa_function_pool[16193]: VertexAttrib2fvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib2fv\0"
-   "glVertexAttrib2fvARB\0"
-   "\0"
-   /* _mesa_function_pool[16236]: GetBufferParameterivARB (will be remapped) */
-   "iip\0"
-   "glGetBufferParameteriv\0"
-   "glGetBufferParameterivARB\0"
-   "\0"
-   /* _mesa_function_pool[16290]: Rectdv (offset 87) */
-   "pp\0"
-   "glRectdv\0"
-   "\0"
-   /* _mesa_function_pool[16303]: ListParameteriSGIX (dynamic) */
-   "iii\0"
-   "glListParameteriSGIX\0"
-   "\0"
-   /* _mesa_function_pool[16329]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
-   "iffffffffff\0"
-   "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[16388]: InstrumentsBufferSGIX (dynamic) */
-   "ip\0"
-   "glInstrumentsBufferSGIX\0"
-   "\0"
-   /* _mesa_function_pool[16416]: VertexAttrib4NivARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4Niv\0"
-   "glVertexAttrib4NivARB\0"
-   "\0"
-   /* _mesa_function_pool[16461]: GetAttachedShaders (will be remapped) */
-   "iipp\0"
-   "glGetAttachedShaders\0"
-   "\0"
-   /* _mesa_function_pool[16488]: GenVertexArraysAPPLE (will be remapped) */
-   "ip\0"
-   "glGenVertexArraysAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[16515]: Materialiv (offset 172) */
-   "iip\0"
-   "glMaterialiv\0"
-   "\0"
-   /* _mesa_function_pool[16533]: PushClientAttrib (offset 335) */
-   "i\0"
-   "glPushClientAttrib\0"
-   "\0"
-   /* _mesa_function_pool[16555]: ProgramEnvParameters4fvEXT (will be remapped) */
-   "iiip\0"
-   "glProgramEnvParameters4fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[16590]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
-   "pppp\0"
-   "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[16636]: WindowPos2iMESA (will be remapped) */
-   "ii\0"
-   "glWindowPos2i\0"
-   "glWindowPos2iARB\0"
-   "glWindowPos2iMESA\0"
-   "\0"
-   /* _mesa_function_pool[16689]: SecondaryColor3fvEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3fv\0"
-   "glSecondaryColor3fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[16735]: PolygonMode (offset 174) */
-   "ii\0"
-   "glPolygonMode\0"
-   "\0"
-   /* _mesa_function_pool[16753]: CompressedTexSubImage1DARB (will be remapped) */
-   "iiiiiip\0"
-   "glCompressedTexSubImage1D\0"
-   "glCompressedTexSubImage1DARB\0"
-   "\0"
-   /* _mesa_function_pool[16817]: GetVertexAttribivNV (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribivNV\0"
-   "\0"
-   /* _mesa_function_pool[16844]: GetProgramStringARB (will be remapped) */
-   "iip\0"
-   "glGetProgramStringARB\0"
-   "\0"
-   /* _mesa_function_pool[16871]: TexBumpParameterfvATI (will be remapped) */
-   "ip\0"
-   "glTexBumpParameterfvATI\0"
-   "\0"
-   /* _mesa_function_pool[16899]: CompileShaderARB (will be remapped) */
-   "i\0"
-   "glCompileShader\0"
-   "glCompileShaderARB\0"
-   "\0"
-   /* _mesa_function_pool[16937]: DeleteShader (will be remapped) */
-   "i\0"
-   "glDeleteShader\0"
-   "\0"
-   /* _mesa_function_pool[16955]: DisableClientState (offset 309) */
-   "i\0"
-   "glDisableClientState\0"
-   "\0"
-   /* _mesa_function_pool[16979]: TexGeni (offset 192) */
-   "iii\0"
-   "glTexGeni\0"
-   "\0"
-   /* _mesa_function_pool[16994]: TexGenf (offset 190) */
-   "iif\0"
-   "glTexGenf\0"
-   "\0"
-   /* _mesa_function_pool[17009]: Uniform3fARB (will be remapped) */
-   "ifff\0"
-   "glUniform3f\0"
-   "glUniform3fARB\0"
-   "\0"
-   /* _mesa_function_pool[17042]: TexGend (offset 188) */
-   "iid\0"
-   "glTexGend\0"
-   "\0"
-   /* _mesa_function_pool[17057]: ListParameterfvSGIX (dynamic) */
-   "iip\0"
-   "glListParameterfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[17084]: GetPolygonStipple (offset 274) */
-   "p\0"
-   "glGetPolygonStipple\0"
-   "\0"
-   /* _mesa_function_pool[17107]: Tangent3dvEXT (dynamic) */
-   "p\0"
-   "glTangent3dvEXT\0"
-   "\0"
-   /* _mesa_function_pool[17126]: BindBufferOffsetEXT (will be remapped) */
-   "iiii\0"
-   "glBindBufferOffsetEXT\0"
-   "\0"
-   /* _mesa_function_pool[17154]: WindowPos3sMESA (will be remapped) */
-   "iii\0"
-   "glWindowPos3s\0"
-   "glWindowPos3sARB\0"
-   "glWindowPos3sMESA\0"
-   "\0"
-   /* _mesa_function_pool[17208]: VertexAttrib2svNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib2svNV\0"
-   "\0"
-   /* _mesa_function_pool[17232]: DisableIndexedEXT (will be remapped) */
-   "ii\0"
-   "glDisableIndexedEXT\0"
-   "\0"
-   /* _mesa_function_pool[17256]: BindBufferBaseEXT (will be remapped) */
-   "iii\0"
-   "glBindBufferBaseEXT\0"
-   "glBindBufferBase\0"
-   "\0"
-   /* _mesa_function_pool[17298]: TexCoord2fVertex3fvSUN (dynamic) */
-   "pp\0"
-   "glTexCoord2fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[17327]: WindowPos4sMESA (will be remapped) */
-   "iiii\0"
-   "glWindowPos4sMESA\0"
-   "\0"
-   /* _mesa_function_pool[17351]: VertexAttrib4NuivARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4Nuiv\0"
-   "glVertexAttrib4NuivARB\0"
-   "\0"
-   /* _mesa_function_pool[17398]: ClientActiveTextureARB (offset 375) */
-   "i\0"
-   "glClientActiveTexture\0"
-   "glClientActiveTextureARB\0"
-   "\0"
-   /* _mesa_function_pool[17448]: PixelTexGenSGIX (will be remapped) */
-   "i\0"
-   "glPixelTexGenSGIX\0"
-   "\0"
-   /* _mesa_function_pool[17469]: ReplacementCodeusvSUN (dynamic) */
-   "p\0"
-   "glReplacementCodeusvSUN\0"
-   "\0"
-   /* _mesa_function_pool[17496]: Uniform4fARB (will be remapped) */
-   "iffff\0"
-   "glUniform4f\0"
-   "glUniform4fARB\0"
-   "\0"
-   /* _mesa_function_pool[17530]: Color4sv (offset 34) */
-   "p\0"
-   "glColor4sv\0"
-   "\0"
-   /* _mesa_function_pool[17544]: FlushMappedBufferRange (will be remapped) */
-   "iii\0"
-   "glFlushMappedBufferRange\0"
-   "\0"
-   /* _mesa_function_pool[17574]: IsProgramNV (will be remapped) */
-   "i\0"
-   "glIsProgramARB\0"
-   "glIsProgramNV\0"
-   "\0"
-   /* _mesa_function_pool[17606]: FlushMappedBufferRangeAPPLE (will be remapped) */
-   "iii\0"
-   "glFlushMappedBufferRangeAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[17641]: PixelZoom (offset 246) */
-   "ff\0"
-   "glPixelZoom\0"
-   "\0"
-   /* _mesa_function_pool[17657]: ReplacementCodePointerSUN (dynamic) */
-   "iip\0"
-   "glReplacementCodePointerSUN\0"
-   "\0"
-   /* _mesa_function_pool[17690]: ProgramEnvParameter4dARB (will be remapped) */
-   "iidddd\0"
-   "glProgramEnvParameter4dARB\0"
-   "glProgramParameter4dNV\0"
-   "\0"
-   /* _mesa_function_pool[17748]: ColorTableParameterfv (offset 340) */
-   "iip\0"
-   "glColorTableParameterfv\0"
-   "glColorTableParameterfvSGI\0"
-   "\0"
-   /* _mesa_function_pool[17804]: FragmentLightModelfSGIX (dynamic) */
-   "if\0"
-   "glFragmentLightModelfSGIX\0"
-   "\0"
-   /* _mesa_function_pool[17834]: Binormal3bvEXT (dynamic) */
-   "p\0"
-   "glBinormal3bvEXT\0"
-   "\0"
-   /* _mesa_function_pool[17854]: PixelMapuiv (offset 252) */
-   "iip\0"
-   "glPixelMapuiv\0"
-   "\0"
-   /* _mesa_function_pool[17873]: Color3dv (offset 12) */
-   "p\0"
-   "glColor3dv\0"
-   "\0"
-   /* _mesa_function_pool[17887]: IsTexture (offset 330) */
-   "i\0"
-   "glIsTexture\0"
-   "glIsTextureEXT\0"
-   "\0"
-   /* _mesa_function_pool[17917]: VertexWeightfvEXT (dynamic) */
-   "p\0"
-   "glVertexWeightfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[17940]: VertexAttrib1dARB (will be remapped) */
-   "id\0"
-   "glVertexAttrib1d\0"
-   "glVertexAttrib1dARB\0"
-   "\0"
-   /* _mesa_function_pool[17981]: ImageTransformParameterivHP (dynamic) */
-   "iip\0"
-   "glImageTransformParameterivHP\0"
-   "\0"
-   /* _mesa_function_pool[18016]: TexCoord4i (offset 122) */
-   "iiii\0"
-   "glTexCoord4i\0"
-   "\0"
-   /* _mesa_function_pool[18035]: DeleteQueriesARB (will be remapped) */
-   "ip\0"
-   "glDeleteQueries\0"
-   "glDeleteQueriesARB\0"
-   "\0"
-   /* _mesa_function_pool[18074]: Color4ubVertex2fSUN (dynamic) */
-   "iiiiff\0"
-   "glColor4ubVertex2fSUN\0"
-   "\0"
-   /* _mesa_function_pool[18104]: FragmentColorMaterialSGIX (dynamic) */
-   "ii\0"
-   "glFragmentColorMaterialSGIX\0"
-   "\0"
-   /* _mesa_function_pool[18136]: CurrentPaletteMatrixARB (dynamic) */
-   "i\0"
-   "glCurrentPaletteMatrixARB\0"
-   "\0"
-   /* _mesa_function_pool[18165]: GetMapdv (offset 266) */
-   "iip\0"
-   "glGetMapdv\0"
-   "\0"
-   /* _mesa_function_pool[18181]: ObjectPurgeableAPPLE (will be remapped) */
-   "iii\0"
-   "glObjectPurgeableAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[18209]: SamplePatternSGIS (will be remapped) */
-   "i\0"
-   "glSamplePatternSGIS\0"
-   "glSamplePatternEXT\0"
-   "\0"
-   /* _mesa_function_pool[18251]: PixelStoref (offset 249) */
-   "if\0"
-   "glPixelStoref\0"
-   "\0"
-   /* _mesa_function_pool[18269]: IsQueryARB (will be remapped) */
-   "i\0"
-   "glIsQuery\0"
-   "glIsQueryARB\0"
-   "\0"
-   /* _mesa_function_pool[18295]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
-   "iiiiifff\0"
-   "glReplacementCodeuiColor4ubVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[18344]: PixelStorei (offset 250) */
-   "ii\0"
-   "glPixelStorei\0"
-   "\0"
-   /* _mesa_function_pool[18362]: VertexAttrib4usvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4usv\0"
-   "glVertexAttrib4usvARB\0"
-   "\0"
-   /* _mesa_function_pool[18407]: LinkProgramARB (will be remapped) */
-   "i\0"
-   "glLinkProgram\0"
-   "glLinkProgramARB\0"
-   "\0"
-   /* _mesa_function_pool[18441]: VertexAttrib2fNV (will be remapped) */
-   "iff\0"
-   "glVertexAttrib2fNV\0"
-   "\0"
-   /* _mesa_function_pool[18465]: ShaderSourceARB (will be remapped) */
-   "iipp\0"
-   "glShaderSource\0"
-   "glShaderSourceARB\0"
-   "\0"
-   /* _mesa_function_pool[18504]: FragmentMaterialiSGIX (dynamic) */
-   "iii\0"
-   "glFragmentMaterialiSGIX\0"
-   "\0"
-   /* _mesa_function_pool[18533]: EvalCoord2dv (offset 233) */
-   "p\0"
-   "glEvalCoord2dv\0"
-   "\0"
-   /* _mesa_function_pool[18551]: VertexAttrib3svARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib3sv\0"
-   "glVertexAttrib3svARB\0"
-   "\0"
-   /* _mesa_function_pool[18594]: ColorMaterial (offset 151) */
-   "ii\0"
-   "glColorMaterial\0"
-   "\0"
-   /* _mesa_function_pool[18614]: CompressedTexSubImage3DARB (will be remapped) */
-   "iiiiiiiiiip\0"
-   "glCompressedTexSubImage3D\0"
-   "glCompressedTexSubImage3DARB\0"
-   "\0"
-   /* _mesa_function_pool[18682]: WindowPos2ivMESA (will be remapped) */
-   "p\0"
-   "glWindowPos2iv\0"
-   "glWindowPos2ivARB\0"
-   "glWindowPos2ivMESA\0"
-   "\0"
-   /* _mesa_function_pool[18737]: IsFramebufferEXT (will be remapped) */
-   "i\0"
-   "glIsFramebuffer\0"
-   "glIsFramebufferEXT\0"
-   "\0"
-   /* _mesa_function_pool[18775]: Uniform4ivARB (will be remapped) */
-   "iip\0"
-   "glUniform4iv\0"
-   "glUniform4ivARB\0"
-   "\0"
-   /* _mesa_function_pool[18809]: GetVertexAttribdvARB (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribdv\0"
-   "glGetVertexAttribdvARB\0"
-   "\0"
-   /* _mesa_function_pool[18857]: TexBumpParameterivATI (will be remapped) */
-   "ip\0"
-   "glTexBumpParameterivATI\0"
-   "\0"
-   /* _mesa_function_pool[18885]: GetSeparableFilter (offset 359) */
-   "iiippp\0"
-   "glGetSeparableFilter\0"
-   "glGetSeparableFilterEXT\0"
-   "\0"
-   /* _mesa_function_pool[18938]: Binormal3dEXT (dynamic) */
-   "ddd\0"
-   "glBinormal3dEXT\0"
-   "\0"
-   /* _mesa_function_pool[18959]: SpriteParameteriSGIX (dynamic) */
-   "ii\0"
-   "glSpriteParameteriSGIX\0"
-   "\0"
-   /* _mesa_function_pool[18986]: RequestResidentProgramsNV (will be remapped) */
-   "ip\0"
-   "glRequestResidentProgramsNV\0"
-   "\0"
-   /* _mesa_function_pool[19018]: TagSampleBufferSGIX (dynamic) */
-   "\0"
-   "glTagSampleBufferSGIX\0"
-   "\0"
-   /* _mesa_function_pool[19042]: TransformFeedbackVaryingsEXT (will be remapped) */
-   "iipi\0"
-   "glTransformFeedbackVaryingsEXT\0"
-   "glTransformFeedbackVaryings\0"
-   "\0"
-   /* _mesa_function_pool[19107]: FeedbackBuffer (offset 194) */
-   "iip\0"
-   "glFeedbackBuffer\0"
-   "\0"
-   /* _mesa_function_pool[19129]: RasterPos2iv (offset 67) */
-   "p\0"
-   "glRasterPos2iv\0"
-   "\0"
-   /* _mesa_function_pool[19147]: TexImage1D (offset 182) */
-   "iiiiiiip\0"
-   "glTexImage1D\0"
-   "\0"
-   /* _mesa_function_pool[19170]: ListParameterivSGIX (dynamic) */
-   "iip\0"
-   "glListParameterivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[19197]: MultiDrawElementsEXT (will be remapped) */
-   "ipipi\0"
-   "glMultiDrawElements\0"
-   "glMultiDrawElementsEXT\0"
-   "\0"
-   /* _mesa_function_pool[19247]: Color3s (offset 17) */
-   "iii\0"
-   "glColor3s\0"
-   "\0"
-   /* _mesa_function_pool[19262]: Uniform1ivARB (will be remapped) */
-   "iip\0"
-   "glUniform1iv\0"
-   "glUniform1ivARB\0"
-   "\0"
-   /* _mesa_function_pool[19296]: WindowPos2sMESA (will be remapped) */
-   "ii\0"
-   "glWindowPos2s\0"
-   "glWindowPos2sARB\0"
-   "glWindowPos2sMESA\0"
-   "\0"
-   /* _mesa_function_pool[19349]: WeightusvARB (dynamic) */
-   "ip\0"
-   "glWeightusvARB\0"
-   "\0"
-   /* _mesa_function_pool[19368]: TexCoordPointer (offset 320) */
-   "iiip\0"
-   "glTexCoordPointer\0"
-   "\0"
-   /* _mesa_function_pool[19392]: FogCoordPointerEXT (will be remapped) */
-   "iip\0"
-   "glFogCoordPointer\0"
-   "glFogCoordPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[19436]: IndexMaterialEXT (dynamic) */
-   "ii\0"
-   "glIndexMaterialEXT\0"
-   "\0"
-   /* _mesa_function_pool[19459]: Color3i (offset 15) */
-   "iii\0"
-   "glColor3i\0"
-   "\0"
-   /* _mesa_function_pool[19474]: FrontFace (offset 157) */
-   "i\0"
-   "glFrontFace\0"
-   "\0"
-   /* _mesa_function_pool[19489]: EvalCoord2d (offset 232) */
-   "dd\0"
-   "glEvalCoord2d\0"
-   "\0"
-   /* _mesa_function_pool[19507]: SecondaryColor3ubvEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3ubv\0"
-   "glSecondaryColor3ubvEXT\0"
-   "\0"
-   /* _mesa_function_pool[19555]: EvalCoord2f (offset 234) */
-   "ff\0"
-   "glEvalCoord2f\0"
-   "\0"
-   /* _mesa_function_pool[19573]: VertexAttrib4dvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4dv\0"
-   "glVertexAttrib4dvARB\0"
-   "\0"
-   /* _mesa_function_pool[19616]: BindAttribLocationARB (will be remapped) */
-   "iip\0"
-   "glBindAttribLocation\0"
-   "glBindAttribLocationARB\0"
-   "\0"
-   /* _mesa_function_pool[19666]: Color3b (offset 9) */
-   "iii\0"
-   "glColor3b\0"
-   "\0"
-   /* _mesa_function_pool[19681]: MultiTexCoord2dARB (offset 384) */
-   "idd\0"
-   "glMultiTexCoord2d\0"
-   "glMultiTexCoord2dARB\0"
-   "\0"
-   /* _mesa_function_pool[19725]: ExecuteProgramNV (will be remapped) */
-   "iip\0"
-   "glExecuteProgramNV\0"
-   "\0"
-   /* _mesa_function_pool[19749]: Color3f (offset 13) */
-   "fff\0"
-   "glColor3f\0"
-   "\0"
-   /* _mesa_function_pool[19764]: LightEnviSGIX (dynamic) */
-   "ii\0"
-   "glLightEnviSGIX\0"
-   "\0"
-   /* _mesa_function_pool[19784]: Color3d (offset 11) */
-   "ddd\0"
-   "glColor3d\0"
-   "\0"
-   /* _mesa_function_pool[19799]: Normal3dv (offset 55) */
-   "p\0"
-   "glNormal3dv\0"
-   "\0"
-   /* _mesa_function_pool[19814]: Lightf (offset 159) */
-   "iif\0"
-   "glLightf\0"
-   "\0"
-   /* _mesa_function_pool[19828]: ReplacementCodeuiSUN (dynamic) */
-   "i\0"
-   "glReplacementCodeuiSUN\0"
-   "\0"
-   /* _mesa_function_pool[19854]: MatrixMode (offset 293) */
-   "i\0"
-   "glMatrixMode\0"
-   "\0"
-   /* _mesa_function_pool[19870]: GetPixelMapusv (offset 273) */
-   "ip\0"
-   "glGetPixelMapusv\0"
-   "\0"
-   /* _mesa_function_pool[19891]: Lighti (offset 161) */
-   "iii\0"
-   "glLighti\0"
-   "\0"
-   /* _mesa_function_pool[19905]: VertexAttribPointerNV (will be remapped) */
-   "iiiip\0"
-   "glVertexAttribPointerNV\0"
-   "\0"
-   /* _mesa_function_pool[19936]: ProgramLocalParameters4fvEXT (will be remapped) */
-   "iiip\0"
-   "glProgramLocalParameters4fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[19973]: GetBooleanIndexedvEXT (will be remapped) */
-   "iip\0"
-   "glGetBooleanIndexedvEXT\0"
-   "\0"
-   /* _mesa_function_pool[20002]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
-   "iiip\0"
-   "glGetFramebufferAttachmentParameteriv\0"
-   "glGetFramebufferAttachmentParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[20087]: PixelTransformParameterfEXT (dynamic) */
-   "iif\0"
-   "glPixelTransformParameterfEXT\0"
-   "\0"
-   /* _mesa_function_pool[20122]: MultiTexCoord4dvARB (offset 401) */
-   "ip\0"
-   "glMultiTexCoord4dv\0"
-   "glMultiTexCoord4dvARB\0"
-   "\0"
-   /* _mesa_function_pool[20167]: PixelTransformParameteriEXT (dynamic) */
-   "iii\0"
-   "glPixelTransformParameteriEXT\0"
-   "\0"
-   /* _mesa_function_pool[20202]: GetDoublev (offset 260) */
-   "ip\0"
-   "glGetDoublev\0"
-   "\0"
-   /* _mesa_function_pool[20219]: MultMatrixd (offset 295) */
-   "p\0"
-   "glMultMatrixd\0"
-   "\0"
-   /* _mesa_function_pool[20236]: MultMatrixf (offset 294) */
-   "p\0"
-   "glMultMatrixf\0"
-   "\0"
-   /* _mesa_function_pool[20253]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
-   "ffiiiifff\0"
-   "glTexCoord2fColor4ubVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[20296]: Uniform1iARB (will be remapped) */
-   "ii\0"
-   "glUniform1i\0"
-   "glUniform1iARB\0"
-   "\0"
-   /* _mesa_function_pool[20327]: VertexAttribPointerARB (will be remapped) */
-   "iiiiip\0"
-   "glVertexAttribPointer\0"
-   "glVertexAttribPointerARB\0"
-   "\0"
-   /* _mesa_function_pool[20382]: VertexAttrib3sNV (will be remapped) */
-   "iiii\0"
-   "glVertexAttrib3sNV\0"
-   "\0"
-   /* _mesa_function_pool[20407]: SharpenTexFuncSGIS (dynamic) */
-   "iip\0"
-   "glSharpenTexFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[20433]: MultiTexCoord4fvARB (offset 403) */
-   "ip\0"
-   "glMultiTexCoord4fv\0"
-   "glMultiTexCoord4fvARB\0"
-   "\0"
-   /* _mesa_function_pool[20478]: UniformMatrix2x3fv (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix2x3fv\0"
-   "\0"
-   /* _mesa_function_pool[20505]: TrackMatrixNV (will be remapped) */
-   "iiii\0"
-   "glTrackMatrixNV\0"
-   "\0"
-   /* _mesa_function_pool[20527]: CombinerParameteriNV (will be remapped) */
-   "ii\0"
-   "glCombinerParameteriNV\0"
-   "\0"
-   /* _mesa_function_pool[20554]: DeleteAsyncMarkersSGIX (dynamic) */
-   "ii\0"
-   "glDeleteAsyncMarkersSGIX\0"
-   "\0"
-   /* _mesa_function_pool[20583]: ReplacementCodeusSUN (dynamic) */
-   "i\0"
-   "glReplacementCodeusSUN\0"
-   "\0"
-   /* _mesa_function_pool[20609]: IsAsyncMarkerSGIX (dynamic) */
-   "i\0"
-   "glIsAsyncMarkerSGIX\0"
-   "\0"
-   /* _mesa_function_pool[20632]: FrameZoomSGIX (dynamic) */
-   "i\0"
-   "glFrameZoomSGIX\0"
-   "\0"
-   /* _mesa_function_pool[20651]: Normal3fVertex3fvSUN (dynamic) */
-   "pp\0"
-   "glNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[20678]: RasterPos4sv (offset 85) */
-   "p\0"
-   "glRasterPos4sv\0"
-   "\0"
-   /* _mesa_function_pool[20696]: VertexAttrib4NsvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4Nsv\0"
-   "glVertexAttrib4NsvARB\0"
-   "\0"
-   /* _mesa_function_pool[20741]: VertexAttrib3fvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib3fv\0"
-   "glVertexAttrib3fvARB\0"
-   "\0"
-   /* _mesa_function_pool[20784]: ClearColor (offset 206) */
-   "ffff\0"
-   "glClearColor\0"
-   "\0"
-   /* _mesa_function_pool[20803]: GetSynciv (will be remapped) */
-   "iiipp\0"
-   "glGetSynciv\0"
-   "\0"
-   /* _mesa_function_pool[20822]: DeleteFramebuffersEXT (will be remapped) */
-   "ip\0"
-   "glDeleteFramebuffers\0"
-   "glDeleteFramebuffersEXT\0"
-   "\0"
-   /* _mesa_function_pool[20871]: GlobalAlphaFactorsSUN (dynamic) */
-   "i\0"
-   "glGlobalAlphaFactorsSUN\0"
-   "\0"
-   /* _mesa_function_pool[20898]: IsEnabledIndexedEXT (will be remapped) */
-   "ii\0"
-   "glIsEnabledIndexedEXT\0"
-   "\0"
-   /* _mesa_function_pool[20924]: TexEnviv (offset 187) */
-   "iip\0"
-   "glTexEnviv\0"
-   "\0"
-   /* _mesa_function_pool[20940]: TexSubImage3D (offset 372) */
-   "iiiiiiiiiip\0"
-   "glTexSubImage3D\0"
-   "glTexSubImage3DEXT\0"
-   "\0"
-   /* _mesa_function_pool[20988]: Tangent3fEXT (dynamic) */
-   "fff\0"
-   "glTangent3fEXT\0"
-   "\0"
-   /* _mesa_function_pool[21008]: SecondaryColor3uivEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3uiv\0"
-   "glSecondaryColor3uivEXT\0"
-   "\0"
-   /* _mesa_function_pool[21056]: MatrixIndexubvARB (dynamic) */
-   "ip\0"
-   "glMatrixIndexubvARB\0"
-   "\0"
-   /* _mesa_function_pool[21080]: Color4fNormal3fVertex3fSUN (dynamic) */
-   "ffffffffff\0"
-   "glColor4fNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[21121]: PixelTexGenParameterfSGIS (will be remapped) */
-   "if\0"
-   "glPixelTexGenParameterfSGIS\0"
-   "\0"
-   /* _mesa_function_pool[21153]: CreateShader (will be remapped) */
-   "i\0"
-   "glCreateShader\0"
-   "\0"
-   /* _mesa_function_pool[21171]: GetColorTableParameterfv (offset 344) */
-   "iip\0"
-   "glGetColorTableParameterfv\0"
-   "glGetColorTableParameterfvSGI\0"
-   "glGetColorTableParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[21263]: FragmentLightModelfvSGIX (dynamic) */
-   "ip\0"
-   "glFragmentLightModelfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[21294]: Bitmap (offset 8) */
-   "iiffffp\0"
-   "glBitmap\0"
-   "\0"
-   /* _mesa_function_pool[21312]: MultiTexCoord3fARB (offset 394) */
-   "ifff\0"
-   "glMultiTexCoord3f\0"
-   "glMultiTexCoord3fARB\0"
-   "\0"
-   /* _mesa_function_pool[21357]: GetTexLevelParameterfv (offset 284) */
-   "iiip\0"
-   "glGetTexLevelParameterfv\0"
-   "\0"
-   /* _mesa_function_pool[21388]: GetPixelTexGenParameterfvSGIS (will be remapped) */
-   "ip\0"
-   "glGetPixelTexGenParameterfvSGIS\0"
-   "\0"
-   /* _mesa_function_pool[21424]: GenFramebuffersEXT (will be remapped) */
-   "ip\0"
-   "glGenFramebuffers\0"
-   "glGenFramebuffersEXT\0"
-   "\0"
-   /* _mesa_function_pool[21467]: GetProgramParameterdvNV (will be remapped) */
-   "iiip\0"
-   "glGetProgramParameterdvNV\0"
-   "\0"
-   /* _mesa_function_pool[21499]: Vertex2sv (offset 133) */
-   "p\0"
-   "glVertex2sv\0"
-   "\0"
-   /* _mesa_function_pool[21514]: GetIntegerv (offset 263) */
-   "ip\0"
-   "glGetIntegerv\0"
-   "\0"
-   /* _mesa_function_pool[21532]: IsVertexArrayAPPLE (will be remapped) */
-   "i\0"
-   "glIsVertexArray\0"
-   "glIsVertexArrayAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[21572]: FragmentLightfvSGIX (dynamic) */
-   "iip\0"
-   "glFragmentLightfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[21599]: DetachShader (will be remapped) */
-   "ii\0"
-   "glDetachShader\0"
-   "\0"
-   /* _mesa_function_pool[21618]: VertexAttrib4NubARB (will be remapped) */
-   "iiiii\0"
-   "glVertexAttrib4Nub\0"
-   "glVertexAttrib4NubARB\0"
-   "\0"
-   /* _mesa_function_pool[21666]: GetProgramEnvParameterfvARB (will be remapped) */
-   "iip\0"
-   "glGetProgramEnvParameterfvARB\0"
-   "\0"
-   /* _mesa_function_pool[21701]: GetTrackMatrixivNV (will be remapped) */
-   "iiip\0"
-   "glGetTrackMatrixivNV\0"
-   "\0"
-   /* _mesa_function_pool[21728]: VertexAttrib3svNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib3svNV\0"
-   "\0"
-   /* _mesa_function_pool[21752]: Uniform4fvARB (will be remapped) */
-   "iip\0"
-   "glUniform4fv\0"
-   "glUniform4fvARB\0"
-   "\0"
-   /* _mesa_function_pool[21786]: MultTransposeMatrixfARB (will be remapped) */
-   "p\0"
-   "glMultTransposeMatrixf\0"
-   "glMultTransposeMatrixfARB\0"
-   "\0"
-   /* _mesa_function_pool[21838]: GetTexEnviv (offset 277) */
-   "iip\0"
-   "glGetTexEnviv\0"
-   "\0"
-   /* _mesa_function_pool[21857]: ColorFragmentOp1ATI (will be remapped) */
-   "iiiiiii\0"
-   "glColorFragmentOp1ATI\0"
-   "\0"
-   /* _mesa_function_pool[21888]: GetUniformfvARB (will be remapped) */
-   "iip\0"
-   "glGetUniformfv\0"
-   "glGetUniformfvARB\0"
-   "\0"
-   /* _mesa_function_pool[21926]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
-   "ip\0"
-   "glEGLImageTargetRenderbufferStorageOES\0"
-   "\0"
-   /* _mesa_function_pool[21969]: PopClientAttrib (offset 334) */
-   "\0"
-   "glPopClientAttrib\0"
-   "\0"
-   /* _mesa_function_pool[21989]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
-   "iffffffffffff\0"
-   "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[22060]: DetachObjectARB (will be remapped) */
-   "ii\0"
-   "glDetachObjectARB\0"
-   "\0"
-   /* _mesa_function_pool[22082]: VertexBlendARB (dynamic) */
-   "i\0"
-   "glVertexBlendARB\0"
-   "\0"
-   /* _mesa_function_pool[22102]: WindowPos3iMESA (will be remapped) */
-   "iii\0"
-   "glWindowPos3i\0"
-   "glWindowPos3iARB\0"
-   "glWindowPos3iMESA\0"
-   "\0"
-   /* _mesa_function_pool[22156]: SeparableFilter2D (offset 360) */
-   "iiiiiipp\0"
-   "glSeparableFilter2D\0"
-   "glSeparableFilter2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[22209]: ProgramParameteriARB (will be remapped) */
-   "iii\0"
-   "glProgramParameteriARB\0"
-   "\0"
-   /* _mesa_function_pool[22237]: Map1d (offset 220) */
-   "iddiip\0"
-   "glMap1d\0"
-   "\0"
-   /* _mesa_function_pool[22253]: Map1f (offset 221) */
-   "iffiip\0"
-   "glMap1f\0"
-   "\0"
-   /* _mesa_function_pool[22269]: CompressedTexImage2DARB (will be remapped) */
-   "iiiiiiip\0"
-   "glCompressedTexImage2D\0"
-   "glCompressedTexImage2DARB\0"
-   "\0"
-   /* _mesa_function_pool[22328]: ArrayElement (offset 306) */
-   "i\0"
-   "glArrayElement\0"
-   "glArrayElementEXT\0"
-   "\0"
-   /* _mesa_function_pool[22364]: TexImage2D (offset 183) */
-   "iiiiiiiip\0"
-   "glTexImage2D\0"
-   "\0"
-   /* _mesa_function_pool[22388]: DepthBoundsEXT (will be remapped) */
-   "dd\0"
-   "glDepthBoundsEXT\0"
-   "\0"
-   /* _mesa_function_pool[22409]: ProgramParameters4fvNV (will be remapped) */
-   "iiip\0"
-   "glProgramParameters4fvNV\0"
-   "\0"
-   /* _mesa_function_pool[22440]: DeformationMap3fSGIX (dynamic) */
-   "iffiiffiiffiip\0"
-   "glDeformationMap3fSGIX\0"
-   "\0"
-   /* _mesa_function_pool[22479]: GetProgramivNV (will be remapped) */
-   "iip\0"
-   "glGetProgramivNV\0"
-   "\0"
-   /* _mesa_function_pool[22501]: GetMinmaxParameteriv (offset 366) */
-   "iip\0"
-   "glGetMinmaxParameteriv\0"
-   "glGetMinmaxParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[22555]: PixelTransferf (offset 247) */
-   "if\0"
-   "glPixelTransferf\0"
-   "\0"
-   /* _mesa_function_pool[22576]: CopyTexImage1D (offset 323) */
-   "iiiiiii\0"
-   "glCopyTexImage1D\0"
-   "glCopyTexImage1DEXT\0"
-   "\0"
-   /* _mesa_function_pool[22622]: PushMatrix (offset 298) */
-   "\0"
-   "glPushMatrix\0"
-   "\0"
-   /* _mesa_function_pool[22637]: Fogiv (offset 156) */
-   "ip\0"
-   "glFogiv\0"
-   "\0"
-   /* _mesa_function_pool[22649]: TexCoord1dv (offset 95) */
-   "p\0"
-   "glTexCoord1dv\0"
-   "\0"
-   /* _mesa_function_pool[22666]: AlphaFragmentOp3ATI (will be remapped) */
-   "iiiiiiiiiiii\0"
-   "glAlphaFragmentOp3ATI\0"
-   "\0"
-   /* _mesa_function_pool[22702]: PixelTransferi (offset 248) */
-   "ii\0"
-   "glPixelTransferi\0"
-   "\0"
-   /* _mesa_function_pool[22723]: GetVertexAttribdvNV (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribdvNV\0"
-   "\0"
-   /* _mesa_function_pool[22750]: VertexAttrib3fvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib3fvNV\0"
-   "\0"
-   /* _mesa_function_pool[22774]: Rotatef (offset 300) */
-   "ffff\0"
-   "glRotatef\0"
-   "\0"
-   /* _mesa_function_pool[22790]: GetFinalCombinerInputParameterivNV (will be remapped) */
-   "iip\0"
-   "glGetFinalCombinerInputParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[22832]: Vertex3i (offset 138) */
-   "iii\0"
-   "glVertex3i\0"
-   "\0"
-   /* _mesa_function_pool[22848]: Vertex3f (offset 136) */
-   "fff\0"
-   "glVertex3f\0"
-   "\0"
-   /* _mesa_function_pool[22864]: Clear (offset 203) */
-   "i\0"
-   "glClear\0"
-   "\0"
-   /* _mesa_function_pool[22875]: Vertex3d (offset 134) */
-   "ddd\0"
-   "glVertex3d\0"
-   "\0"
-   /* _mesa_function_pool[22891]: GetMapParameterivNV (dynamic) */
-   "iip\0"
-   "glGetMapParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[22918]: Uniform4iARB (will be remapped) */
-   "iiiii\0"
-   "glUniform4i\0"
-   "glUniform4iARB\0"
-   "\0"
-   /* _mesa_function_pool[22952]: ReadBuffer (offset 254) */
-   "i\0"
-   "glReadBuffer\0"
-   "\0"
-   /* _mesa_function_pool[22968]: ConvolutionParameteri (offset 352) */
-   "iii\0"
-   "glConvolutionParameteri\0"
-   "glConvolutionParameteriEXT\0"
-   "\0"
-   /* _mesa_function_pool[23024]: Ortho (offset 296) */
-   "dddddd\0"
-   "glOrtho\0"
-   "\0"
-   /* _mesa_function_pool[23040]: Binormal3sEXT (dynamic) */
-   "iii\0"
-   "glBinormal3sEXT\0"
-   "\0"
-   /* _mesa_function_pool[23061]: ListBase (offset 6) */
-   "i\0"
-   "glListBase\0"
-   "\0"
-   /* _mesa_function_pool[23075]: Vertex3s (offset 140) */
-   "iii\0"
-   "glVertex3s\0"
-   "\0"
-   /* _mesa_function_pool[23091]: ConvolutionParameterf (offset 350) */
-   "iif\0"
-   "glConvolutionParameterf\0"
-   "glConvolutionParameterfEXT\0"
-   "\0"
-   /* _mesa_function_pool[23147]: GetColorTableParameteriv (offset 345) */
-   "iip\0"
-   "glGetColorTableParameteriv\0"
-   "glGetColorTableParameterivSGI\0"
-   "glGetColorTableParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[23239]: ProgramEnvParameter4dvARB (will be remapped) */
-   "iip\0"
-   "glProgramEnvParameter4dvARB\0"
-   "glProgramParameter4dvNV\0"
-   "\0"
-   /* _mesa_function_pool[23296]: ShadeModel (offset 177) */
-   "i\0"
-   "glShadeModel\0"
-   "\0"
-   /* _mesa_function_pool[23312]: VertexAttribs2fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs2fvNV\0"
-   "\0"
-   /* _mesa_function_pool[23338]: Rectiv (offset 91) */
-   "pp\0"
-   "glRectiv\0"
-   "\0"
-   /* _mesa_function_pool[23351]: UseProgramObjectARB (will be remapped) */
-   "i\0"
-   "glUseProgram\0"
-   "glUseProgramObjectARB\0"
-   "\0"
-   /* _mesa_function_pool[23389]: GetMapParameterfvNV (dynamic) */
-   "iip\0"
-   "glGetMapParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[23416]: EndConditionalRenderNV (will be remapped) */
-   "\0"
-   "glEndConditionalRenderNV\0"
-   "\0"
-   /* _mesa_function_pool[23443]: PassTexCoordATI (will be remapped) */
-   "iii\0"
-   "glPassTexCoordATI\0"
-   "\0"
-   /* _mesa_function_pool[23466]: DeleteProgram (will be remapped) */
-   "i\0"
-   "glDeleteProgram\0"
-   "\0"
-   /* _mesa_function_pool[23485]: Tangent3ivEXT (dynamic) */
-   "p\0"
-   "glTangent3ivEXT\0"
-   "\0"
-   /* _mesa_function_pool[23504]: Tangent3dEXT (dynamic) */
-   "ddd\0"
-   "glTangent3dEXT\0"
-   "\0"
-   /* _mesa_function_pool[23524]: SecondaryColor3dvEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3dv\0"
-   "glSecondaryColor3dvEXT\0"
-   "\0"
-   /* _mesa_function_pool[23570]: Vertex2fv (offset 129) */
-   "p\0"
-   "glVertex2fv\0"
-   "\0"
-   /* _mesa_function_pool[23585]: MultiDrawArraysEXT (will be remapped) */
-   "ippi\0"
-   "glMultiDrawArrays\0"
-   "glMultiDrawArraysEXT\0"
-   "\0"
-   /* _mesa_function_pool[23630]: BindRenderbufferEXT (will be remapped) */
-   "ii\0"
-   "glBindRenderbuffer\0"
-   "glBindRenderbufferEXT\0"
-   "\0"
-   /* _mesa_function_pool[23675]: MultiTexCoord4dARB (offset 400) */
-   "idddd\0"
-   "glMultiTexCoord4d\0"
-   "glMultiTexCoord4dARB\0"
-   "\0"
-   /* _mesa_function_pool[23721]: FramebufferTextureFaceARB (will be remapped) */
-   "iiiii\0"
-   "glFramebufferTextureFaceARB\0"
-   "\0"
-   /* _mesa_function_pool[23756]: Vertex3sv (offset 141) */
-   "p\0"
-   "glVertex3sv\0"
-   "\0"
-   /* _mesa_function_pool[23771]: SecondaryColor3usEXT (will be remapped) */
-   "iii\0"
-   "glSecondaryColor3us\0"
-   "glSecondaryColor3usEXT\0"
-   "\0"
-   /* _mesa_function_pool[23819]: ProgramLocalParameter4fvARB (will be remapped) */
-   "iip\0"
-   "glProgramLocalParameter4fvARB\0"
-   "\0"
-   /* _mesa_function_pool[23854]: DeleteProgramsNV (will be remapped) */
-   "ip\0"
-   "glDeleteProgramsARB\0"
-   "glDeleteProgramsNV\0"
-   "\0"
-   /* _mesa_function_pool[23897]: EvalMesh1 (offset 236) */
-   "iii\0"
-   "glEvalMesh1\0"
-   "\0"
-   /* _mesa_function_pool[23914]: PauseTransformFeedback (will be remapped) */
-   "\0"
-   "glPauseTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[23941]: MultiTexCoord1sARB (offset 382) */
-   "ii\0"
-   "glMultiTexCoord1s\0"
-   "glMultiTexCoord1sARB\0"
-   "\0"
-   /* _mesa_function_pool[23984]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
-   "iffffff\0"
-   "glReplacementCodeuiColor3fVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[24031]: GetVertexAttribPointervNV (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribPointerv\0"
-   "glGetVertexAttribPointervARB\0"
-   "glGetVertexAttribPointervNV\0"
-   "\0"
-   /* _mesa_function_pool[24119]: VertexAttribs1fvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs1fvNV\0"
-   "\0"
-   /* _mesa_function_pool[24145]: MultiTexCoord1dvARB (offset 377) */
-   "ip\0"
-   "glMultiTexCoord1dv\0"
-   "glMultiTexCoord1dvARB\0"
-   "\0"
-   /* _mesa_function_pool[24190]: Uniform2iARB (will be remapped) */
-   "iii\0"
-   "glUniform2i\0"
-   "glUniform2iARB\0"
-   "\0"
-   /* _mesa_function_pool[24222]: Vertex2iv (offset 131) */
-   "p\0"
-   "glVertex2iv\0"
-   "\0"
-   /* _mesa_function_pool[24237]: GetProgramStringNV (will be remapped) */
-   "iip\0"
-   "glGetProgramStringNV\0"
-   "\0"
-   /* _mesa_function_pool[24263]: ColorPointerEXT (will be remapped) */
-   "iiiip\0"
-   "glColorPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[24288]: LineWidth (offset 168) */
-   "f\0"
-   "glLineWidth\0"
-   "\0"
-   /* _mesa_function_pool[24303]: MapBufferARB (will be remapped) */
-   "ii\0"
-   "glMapBuffer\0"
-   "glMapBufferARB\0"
-   "\0"
-   /* _mesa_function_pool[24334]: MultiDrawElementsBaseVertex (will be remapped) */
-   "ipipip\0"
-   "glMultiDrawElementsBaseVertex\0"
-   "\0"
-   /* _mesa_function_pool[24372]: Binormal3svEXT (dynamic) */
-   "p\0"
-   "glBinormal3svEXT\0"
-   "\0"
-   /* _mesa_function_pool[24392]: ApplyTextureEXT (dynamic) */
-   "i\0"
-   "glApplyTextureEXT\0"
-   "\0"
-   /* _mesa_function_pool[24413]: TexGendv (offset 189) */
-   "iip\0"
-   "glTexGendv\0"
-   "\0"
-   /* _mesa_function_pool[24429]: EnableIndexedEXT (will be remapped) */
-   "ii\0"
-   "glEnableIndexedEXT\0"
-   "\0"
-   /* _mesa_function_pool[24452]: TextureMaterialEXT (dynamic) */
-   "ii\0"
-   "glTextureMaterialEXT\0"
-   "\0"
-   /* _mesa_function_pool[24477]: TextureLightEXT (dynamic) */
-   "i\0"
-   "glTextureLightEXT\0"
-   "\0"
-   /* _mesa_function_pool[24498]: ResetMinmax (offset 370) */
-   "i\0"
-   "glResetMinmax\0"
-   "glResetMinmaxEXT\0"
-   "\0"
-   /* _mesa_function_pool[24532]: SpriteParameterfSGIX (dynamic) */
-   "if\0"
-   "glSpriteParameterfSGIX\0"
-   "\0"
-   /* _mesa_function_pool[24559]: EnableClientState (offset 313) */
-   "i\0"
-   "glEnableClientState\0"
-   "\0"
-   /* _mesa_function_pool[24582]: VertexAttrib4sNV (will be remapped) */
-   "iiiii\0"
-   "glVertexAttrib4sNV\0"
-   "\0"
-   /* _mesa_function_pool[24608]: GetConvolutionParameterfv (offset 357) */
-   "iip\0"
-   "glGetConvolutionParameterfv\0"
-   "glGetConvolutionParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[24672]: VertexAttribs4dvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs4dvNV\0"
-   "\0"
-   /* _mesa_function_pool[24698]: VertexAttrib4dARB (will be remapped) */
-   "idddd\0"
-   "glVertexAttrib4d\0"
-   "glVertexAttrib4dARB\0"
-   "\0"
-   /* _mesa_function_pool[24742]: GetTexBumpParameterfvATI (will be remapped) */
-   "ip\0"
-   "glGetTexBumpParameterfvATI\0"
-   "\0"
-   /* _mesa_function_pool[24773]: ProgramNamedParameter4dNV (will be remapped) */
-   "iipdddd\0"
-   "glProgramNamedParameter4dNV\0"
-   "\0"
-   /* _mesa_function_pool[24810]: GetMaterialfv (offset 269) */
-   "iip\0"
-   "glGetMaterialfv\0"
-   "\0"
-   /* _mesa_function_pool[24831]: VertexWeightfEXT (dynamic) */
-   "f\0"
-   "glVertexWeightfEXT\0"
-   "\0"
-   /* _mesa_function_pool[24853]: Binormal3fEXT (dynamic) */
-   "fff\0"
-   "glBinormal3fEXT\0"
-   "\0"
-   /* _mesa_function_pool[24874]: CallList (offset 2) */
-   "i\0"
-   "glCallList\0"
-   "\0"
-   /* _mesa_function_pool[24888]: Materialfv (offset 170) */
-   "iip\0"
-   "glMaterialfv\0"
-   "\0"
-   /* _mesa_function_pool[24906]: TexCoord3fv (offset 113) */
-   "p\0"
-   "glTexCoord3fv\0"
-   "\0"
-   /* _mesa_function_pool[24923]: FogCoordfvEXT (will be remapped) */
-   "p\0"
-   "glFogCoordfv\0"
-   "glFogCoordfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[24955]: MultiTexCoord1ivARB (offset 381) */
-   "ip\0"
-   "glMultiTexCoord1iv\0"
-   "glMultiTexCoord1ivARB\0"
-   "\0"
-   /* _mesa_function_pool[25000]: SecondaryColor3ubEXT (will be remapped) */
-   "iii\0"
-   "glSecondaryColor3ub\0"
-   "glSecondaryColor3ubEXT\0"
-   "\0"
-   /* _mesa_function_pool[25048]: MultiTexCoord2ivARB (offset 389) */
-   "ip\0"
-   "glMultiTexCoord2iv\0"
-   "glMultiTexCoord2ivARB\0"
-   "\0"
-   /* _mesa_function_pool[25093]: FogFuncSGIS (dynamic) */
-   "ip\0"
-   "glFogFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[25111]: CopyTexSubImage2D (offset 326) */
-   "iiiiiiii\0"
-   "glCopyTexSubImage2D\0"
-   "glCopyTexSubImage2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[25164]: GetObjectParameterivARB (will be remapped) */
-   "iip\0"
-   "glGetObjectParameterivARB\0"
-   "\0"
-   /* _mesa_function_pool[25195]: Color3iv (offset 16) */
-   "p\0"
-   "glColor3iv\0"
-   "\0"
-   /* _mesa_function_pool[25209]: TexCoord4fVertex4fSUN (dynamic) */
-   "ffffffff\0"
-   "glTexCoord4fVertex4fSUN\0"
-   "\0"
-   /* _mesa_function_pool[25243]: DrawElements (offset 311) */
-   "iiip\0"
-   "glDrawElements\0"
-   "\0"
-   /* _mesa_function_pool[25264]: BindVertexArrayAPPLE (will be remapped) */
-   "i\0"
-   "glBindVertexArrayAPPLE\0"
-   "\0"
-   /* _mesa_function_pool[25290]: GetProgramLocalParameterdvARB (will be remapped) */
-   "iip\0"
-   "glGetProgramLocalParameterdvARB\0"
-   "\0"
-   /* _mesa_function_pool[25327]: GetHistogramParameteriv (offset 363) */
-   "iip\0"
-   "glGetHistogramParameteriv\0"
-   "glGetHistogramParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[25387]: MultiTexCoord1iARB (offset 380) */
-   "ii\0"
-   "glMultiTexCoord1i\0"
-   "glMultiTexCoord1iARB\0"
-   "\0"
-   /* _mesa_function_pool[25430]: GetConvolutionFilter (offset 356) */
-   "iiip\0"
-   "glGetConvolutionFilter\0"
-   "glGetConvolutionFilterEXT\0"
-   "\0"
-   /* _mesa_function_pool[25485]: GetProgramivARB (will be remapped) */
-   "iip\0"
-   "glGetProgramivARB\0"
-   "\0"
-   /* _mesa_function_pool[25508]: BlendFuncSeparateEXT (will be remapped) */
-   "iiii\0"
-   "glBlendFuncSeparate\0"
-   "glBlendFuncSeparateEXT\0"
-   "glBlendFuncSeparateINGR\0"
-   "\0"
-   /* _mesa_function_pool[25581]: MapBufferRange (will be remapped) */
-   "iiii\0"
-   "glMapBufferRange\0"
-   "\0"
-   /* _mesa_function_pool[25604]: ProgramParameters4dvNV (will be remapped) */
-   "iiip\0"
-   "glProgramParameters4dvNV\0"
-   "\0"
-   /* _mesa_function_pool[25635]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glTexCoord2fColor3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[25672]: EvalPoint2 (offset 239) */
-   "ii\0"
-   "glEvalPoint2\0"
-   "\0"
-   /* _mesa_function_pool[25689]: EvalPoint1 (offset 237) */
-   "i\0"
-   "glEvalPoint1\0"
-   "\0"
-   /* _mesa_function_pool[25705]: Binormal3dvEXT (dynamic) */
-   "p\0"
-   "glBinormal3dvEXT\0"
-   "\0"
-   /* _mesa_function_pool[25725]: PopMatrix (offset 297) */
-   "\0"
-   "glPopMatrix\0"
-   "\0"
-   /* _mesa_function_pool[25739]: FinishFenceNV (will be remapped) */
-   "i\0"
-   "glFinishFenceNV\0"
-   "\0"
-   /* _mesa_function_pool[25758]: GetFogFuncSGIS (dynamic) */
-   "p\0"
-   "glGetFogFuncSGIS\0"
-   "\0"
-   /* _mesa_function_pool[25778]: GetUniformLocationARB (will be remapped) */
-   "ip\0"
-   "glGetUniformLocation\0"
-   "glGetUniformLocationARB\0"
-   "\0"
-   /* _mesa_function_pool[25827]: SecondaryColor3fEXT (will be remapped) */
-   "fff\0"
-   "glSecondaryColor3f\0"
-   "glSecondaryColor3fEXT\0"
-   "\0"
-   /* _mesa_function_pool[25873]: GetTexGeniv (offset 280) */
-   "iip\0"
-   "glGetTexGeniv\0"
-   "\0"
-   /* _mesa_function_pool[25892]: CombinerInputNV (will be remapped) */
-   "iiiiii\0"
-   "glCombinerInputNV\0"
-   "\0"
-   /* _mesa_function_pool[25918]: VertexAttrib3sARB (will be remapped) */
-   "iiii\0"
-   "glVertexAttrib3s\0"
-   "glVertexAttrib3sARB\0"
-   "\0"
-   /* _mesa_function_pool[25961]: IsTransformFeedback (will be remapped) */
-   "i\0"
-   "glIsTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[25986]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
-   "ppp\0"
-   "glReplacementCodeuiNormal3fVertex3fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[26031]: Map2d (offset 222) */
-   "iddiiddiip\0"
-   "glMap2d\0"
-   "\0"
-   /* _mesa_function_pool[26051]: Map2f (offset 223) */
-   "iffiiffiip\0"
-   "glMap2f\0"
-   "\0"
-   /* _mesa_function_pool[26071]: ProgramStringARB (will be remapped) */
-   "iiip\0"
-   "glProgramStringARB\0"
-   "\0"
-   /* _mesa_function_pool[26096]: Vertex4s (offset 148) */
-   "iiii\0"
-   "glVertex4s\0"
-   "\0"
-   /* _mesa_function_pool[26113]: TexCoord4fVertex4fvSUN (dynamic) */
-   "pp\0"
-   "glTexCoord4fVertex4fvSUN\0"
-   "\0"
-   /* _mesa_function_pool[26142]: FragmentLightModelivSGIX (dynamic) */
-   "ip\0"
-   "glFragmentLightModelivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[26173]: VertexAttrib1fNV (will be remapped) */
-   "if\0"
-   "glVertexAttrib1fNV\0"
-   "\0"
-   /* _mesa_function_pool[26196]: Vertex4f (offset 144) */
-   "ffff\0"
-   "glVertex4f\0"
-   "\0"
-   /* _mesa_function_pool[26213]: EvalCoord1d (offset 228) */
-   "d\0"
-   "glEvalCoord1d\0"
-   "\0"
-   /* _mesa_function_pool[26230]: Vertex4d (offset 142) */
-   "dddd\0"
-   "glVertex4d\0"
-   "\0"
-   /* _mesa_function_pool[26247]: RasterPos4dv (offset 79) */
-   "p\0"
-   "glRasterPos4dv\0"
-   "\0"
-   /* _mesa_function_pool[26265]: FragmentLightfSGIX (dynamic) */
-   "iif\0"
-   "glFragmentLightfSGIX\0"
-   "\0"
-   /* _mesa_function_pool[26291]: GetCompressedTexImageARB (will be remapped) */
-   "iip\0"
-   "glGetCompressedTexImage\0"
-   "glGetCompressedTexImageARB\0"
-   "\0"
-   /* _mesa_function_pool[26347]: GetTexGenfv (offset 279) */
-   "iip\0"
-   "glGetTexGenfv\0"
-   "\0"
-   /* _mesa_function_pool[26366]: Vertex4i (offset 146) */
-   "iiii\0"
-   "glVertex4i\0"
-   "\0"
-   /* _mesa_function_pool[26383]: VertexWeightPointerEXT (dynamic) */
-   "iiip\0"
-   "glVertexWeightPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[26414]: GetHistogram (offset 361) */
-   "iiiip\0"
-   "glGetHistogram\0"
-   "glGetHistogramEXT\0"
-   "\0"
-   /* _mesa_function_pool[26454]: ActiveStencilFaceEXT (will be remapped) */
-   "i\0"
-   "glActiveStencilFaceEXT\0"
-   "\0"
-   /* _mesa_function_pool[26480]: StencilFuncSeparateATI (will be remapped) */
-   "iiii\0"
-   "glStencilFuncSeparateATI\0"
-   "\0"
-   /* _mesa_function_pool[26511]: Materialf (offset 169) */
-   "iif\0"
-   "glMaterialf\0"
-   "\0"
-   /* _mesa_function_pool[26528]: GetShaderSourceARB (will be remapped) */
-   "iipp\0"
-   "glGetShaderSource\0"
-   "glGetShaderSourceARB\0"
-   "\0"
-   /* _mesa_function_pool[26573]: IglooInterfaceSGIX (dynamic) */
-   "ip\0"
-   "glIglooInterfaceSGIX\0"
-   "\0"
-   /* _mesa_function_pool[26598]: Materiali (offset 171) */
-   "iii\0"
-   "glMateriali\0"
-   "\0"
-   /* _mesa_function_pool[26615]: VertexAttrib4dNV (will be remapped) */
-   "idddd\0"
-   "glVertexAttrib4dNV\0"
-   "\0"
-   /* _mesa_function_pool[26641]: MultiModeDrawElementsIBM (will be remapped) */
-   "ppipii\0"
-   "glMultiModeDrawElementsIBM\0"
-   "\0"
-   /* _mesa_function_pool[26676]: Indexsv (offset 51) */
-   "p\0"
-   "glIndexsv\0"
-   "\0"
-   /* _mesa_function_pool[26689]: MultiTexCoord4svARB (offset 407) */
-   "ip\0"
-   "glMultiTexCoord4sv\0"
-   "glMultiTexCoord4svARB\0"
-   "\0"
-   /* _mesa_function_pool[26734]: LightModelfv (offset 164) */
-   "ip\0"
-   "glLightModelfv\0"
-   "\0"
-   /* _mesa_function_pool[26753]: TexCoord2dv (offset 103) */
-   "p\0"
-   "glTexCoord2dv\0"
-   "\0"
-   /* _mesa_function_pool[26770]: GenQueriesARB (will be remapped) */
-   "ip\0"
-   "glGenQueries\0"
-   "glGenQueriesARB\0"
-   "\0"
-   /* _mesa_function_pool[26803]: EvalCoord1dv (offset 229) */
-   "p\0"
-   "glEvalCoord1dv\0"
-   "\0"
-   /* _mesa_function_pool[26821]: ReplacementCodeuiVertex3fSUN (dynamic) */
-   "ifff\0"
-   "glReplacementCodeuiVertex3fSUN\0"
-   "\0"
-   /* _mesa_function_pool[26858]: Translated (offset 303) */
-   "ddd\0"
-   "glTranslated\0"
-   "\0"
-   /* _mesa_function_pool[26876]: Translatef (offset 304) */
-   "fff\0"
-   "glTranslatef\0"
-   "\0"
-   /* _mesa_function_pool[26894]: StencilMask (offset 209) */
-   "i\0"
-   "glStencilMask\0"
-   "\0"
-   /* _mesa_function_pool[26911]: Tangent3iEXT (dynamic) */
-   "iii\0"
-   "glTangent3iEXT\0"
-   "\0"
-   /* _mesa_function_pool[26931]: GetLightiv (offset 265) */
-   "iip\0"
-   "glGetLightiv\0"
-   "\0"
-   /* _mesa_function_pool[26949]: DrawMeshArraysSUN (dynamic) */
-   "iiii\0"
-   "glDrawMeshArraysSUN\0"
-   "\0"
-   /* _mesa_function_pool[26975]: IsList (offset 287) */
-   "i\0"
-   "glIsList\0"
-   "\0"
-   /* _mesa_function_pool[26987]: IsSync (will be remapped) */
-   "i\0"
-   "glIsSync\0"
-   "\0"
-   /* _mesa_function_pool[26999]: RenderMode (offset 196) */
-   "i\0"
-   "glRenderMode\0"
-   "\0"
-   /* _mesa_function_pool[27015]: GetMapControlPointsNV (dynamic) */
-   "iiiiiip\0"
-   "glGetMapControlPointsNV\0"
-   "\0"
-   /* _mesa_function_pool[27048]: DrawBuffersARB (will be remapped) */
-   "ip\0"
-   "glDrawBuffers\0"
-   "glDrawBuffersARB\0"
-   "glDrawBuffersATI\0"
-   "\0"
-   /* _mesa_function_pool[27100]: ProgramLocalParameter4fARB (will be remapped) */
-   "iiffff\0"
-   "glProgramLocalParameter4fARB\0"
-   "\0"
-   /* _mesa_function_pool[27137]: SpriteParameterivSGIX (dynamic) */
-   "ip\0"
-   "glSpriteParameterivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[27165]: ProvokingVertexEXT (will be remapped) */
-   "i\0"
-   "glProvokingVertexEXT\0"
-   "glProvokingVertex\0"
-   "\0"
-   /* _mesa_function_pool[27207]: MultiTexCoord1fARB (offset 378) */
-   "if\0"
-   "glMultiTexCoord1f\0"
-   "glMultiTexCoord1fARB\0"
-   "\0"
-   /* _mesa_function_pool[27250]: LoadName (offset 198) */
-   "i\0"
-   "glLoadName\0"
-   "\0"
-   /* _mesa_function_pool[27264]: VertexAttribs4ubvNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs4ubvNV\0"
-   "\0"
-   /* _mesa_function_pool[27291]: WeightsvARB (dynamic) */
-   "ip\0"
-   "glWeightsvARB\0"
-   "\0"
-   /* _mesa_function_pool[27309]: Uniform1fvARB (will be remapped) */
-   "iip\0"
-   "glUniform1fv\0"
-   "glUniform1fvARB\0"
-   "\0"
-   /* _mesa_function_pool[27343]: CopyTexSubImage1D (offset 325) */
-   "iiiiii\0"
-   "glCopyTexSubImage1D\0"
-   "glCopyTexSubImage1DEXT\0"
-   "\0"
-   /* _mesa_function_pool[27394]: CullFace (offset 152) */
-   "i\0"
-   "glCullFace\0"
-   "\0"
-   /* _mesa_function_pool[27408]: BindTexture (offset 307) */
-   "ii\0"
-   "glBindTexture\0"
-   "glBindTextureEXT\0"
-   "\0"
-   /* _mesa_function_pool[27443]: BeginFragmentShaderATI (will be remapped) */
-   "\0"
-   "glBeginFragmentShaderATI\0"
-   "\0"
-   /* _mesa_function_pool[27470]: MultiTexCoord4fARB (offset 402) */
-   "iffff\0"
-   "glMultiTexCoord4f\0"
-   "glMultiTexCoord4fARB\0"
-   "\0"
-   /* _mesa_function_pool[27516]: VertexAttribs3svNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs3svNV\0"
-   "\0"
-   /* _mesa_function_pool[27542]: StencilFunc (offset 243) */
-   "iii\0"
-   "glStencilFunc\0"
-   "\0"
-   /* _mesa_function_pool[27561]: CopyPixels (offset 255) */
-   "iiiii\0"
-   "glCopyPixels\0"
-   "\0"
-   /* _mesa_function_pool[27581]: Rectsv (offset 93) */
-   "pp\0"
-   "glRectsv\0"
-   "\0"
-   /* _mesa_function_pool[27594]: ReplacementCodeuivSUN (dynamic) */
-   "p\0"
-   "glReplacementCodeuivSUN\0"
-   "\0"
-   /* _mesa_function_pool[27621]: EnableVertexAttribArrayARB (will be remapped) */
-   "i\0"
-   "glEnableVertexAttribArray\0"
-   "glEnableVertexAttribArrayARB\0"
-   "\0"
-   /* _mesa_function_pool[27679]: NormalPointervINTEL (dynamic) */
-   "ip\0"
-   "glNormalPointervINTEL\0"
-   "\0"
-   /* _mesa_function_pool[27705]: CopyConvolutionFilter2D (offset 355) */
-   "iiiiii\0"
-   "glCopyConvolutionFilter2D\0"
-   "glCopyConvolutionFilter2DEXT\0"
-   "\0"
-   /* _mesa_function_pool[27768]: WindowPos3ivMESA (will be remapped) */
-   "p\0"
-   "glWindowPos3iv\0"
-   "glWindowPos3ivARB\0"
-   "glWindowPos3ivMESA\0"
-   "\0"
-   /* _mesa_function_pool[27823]: CopyBufferSubData (will be remapped) */
-   "iiiii\0"
-   "glCopyBufferSubData\0"
-   "\0"
-   /* _mesa_function_pool[27850]: NormalPointer (offset 318) */
-   "iip\0"
-   "glNormalPointer\0"
-   "\0"
-   /* _mesa_function_pool[27871]: TexParameterfv (offset 179) */
-   "iip\0"
-   "glTexParameterfv\0"
-   "\0"
-   /* _mesa_function_pool[27893]: IsBufferARB (will be remapped) */
-   "i\0"
-   "glIsBuffer\0"
-   "glIsBufferARB\0"
-   "\0"
-   /* _mesa_function_pool[27921]: WindowPos4iMESA (will be remapped) */
-   "iiii\0"
-   "glWindowPos4iMESA\0"
-   "\0"
-   /* _mesa_function_pool[27945]: VertexAttrib4uivARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4uiv\0"
-   "glVertexAttrib4uivARB\0"
-   "\0"
-   /* _mesa_function_pool[27990]: Tangent3bvEXT (dynamic) */
-   "p\0"
-   "glTangent3bvEXT\0"
-   "\0"
-   /* _mesa_function_pool[28009]: UniformMatrix3x4fv (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix3x4fv\0"
-   "\0"
-   /* _mesa_function_pool[28036]: ClipPlane (offset 150) */
-   "ip\0"
-   "glClipPlane\0"
-   "\0"
-   /* _mesa_function_pool[28052]: Recti (offset 90) */
-   "iiii\0"
-   "glRecti\0"
-   "\0"
-   /* _mesa_function_pool[28066]: DrawRangeElementsBaseVertex (will be remapped) */
-   "iiiiipi\0"
-   "glDrawRangeElementsBaseVertex\0"
-   "\0"
-   /* _mesa_function_pool[28105]: TexCoordPointervINTEL (dynamic) */
-   "iip\0"
-   "glTexCoordPointervINTEL\0"
-   "\0"
-   /* _mesa_function_pool[28134]: DeleteBuffersARB (will be remapped) */
-   "ip\0"
-   "glDeleteBuffers\0"
-   "glDeleteBuffersARB\0"
-   "\0"
-   /* _mesa_function_pool[28173]: PixelTransformParameterfvEXT (dynamic) */
-   "iip\0"
-   "glPixelTransformParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[28209]: WindowPos4fvMESA (will be remapped) */
-   "p\0"
-   "glWindowPos4fvMESA\0"
-   "\0"
-   /* _mesa_function_pool[28231]: GetPixelMapuiv (offset 272) */
-   "ip\0"
-   "glGetPixelMapuiv\0"
-   "\0"
-   /* _mesa_function_pool[28252]: Rectf (offset 88) */
-   "ffff\0"
-   "glRectf\0"
-   "\0"
-   /* _mesa_function_pool[28266]: VertexAttrib1sNV (will be remapped) */
-   "ii\0"
-   "glVertexAttrib1sNV\0"
-   "\0"
-   /* _mesa_function_pool[28289]: Indexfv (offset 47) */
-   "p\0"
-   "glIndexfv\0"
-   "\0"
-   /* _mesa_function_pool[28302]: SecondaryColor3svEXT (will be remapped) */
-   "p\0"
-   "glSecondaryColor3sv\0"
-   "glSecondaryColor3svEXT\0"
-   "\0"
-   /* _mesa_function_pool[28348]: LoadTransposeMatrixfARB (will be remapped) */
-   "p\0"
-   "glLoadTransposeMatrixf\0"
-   "glLoadTransposeMatrixfARB\0"
-   "\0"
-   /* _mesa_function_pool[28400]: GetPointerv (offset 329) */
-   "ip\0"
-   "glGetPointerv\0"
-   "glGetPointervEXT\0"
-   "\0"
-   /* _mesa_function_pool[28435]: Tangent3bEXT (dynamic) */
-   "iii\0"
-   "glTangent3bEXT\0"
-   "\0"
-   /* _mesa_function_pool[28455]: CombinerParameterfNV (will be remapped) */
-   "if\0"
-   "glCombinerParameterfNV\0"
-   "\0"
-   /* _mesa_function_pool[28482]: IndexMask (offset 212) */
-   "i\0"
-   "glIndexMask\0"
-   "\0"
-   /* _mesa_function_pool[28497]: BindProgramNV (will be remapped) */
-   "ii\0"
-   "glBindProgramARB\0"
-   "glBindProgramNV\0"
-   "\0"
-   /* _mesa_function_pool[28534]: VertexAttrib4svARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4sv\0"
-   "glVertexAttrib4svARB\0"
-   "\0"
-   /* _mesa_function_pool[28577]: GetFloatv (offset 262) */
-   "ip\0"
-   "glGetFloatv\0"
-   "\0"
-   /* _mesa_function_pool[28593]: CreateDebugObjectMESA (dynamic) */
-   "\0"
-   "glCreateDebugObjectMESA\0"
-   "\0"
-   /* _mesa_function_pool[28619]: GetShaderiv (will be remapped) */
-   "iip\0"
-   "glGetShaderiv\0"
-   "\0"
-   /* _mesa_function_pool[28638]: ClientWaitSync (will be remapped) */
-   "iii\0"
-   "glClientWaitSync\0"
-   "\0"
-   /* _mesa_function_pool[28660]: TexCoord4s (offset 124) */
-   "iiii\0"
-   "glTexCoord4s\0"
-   "\0"
-   /* _mesa_function_pool[28679]: TexCoord3sv (offset 117) */
-   "p\0"
-   "glTexCoord3sv\0"
-   "\0"
-   /* _mesa_function_pool[28696]: BindFragmentShaderATI (will be remapped) */
-   "i\0"
-   "glBindFragmentShaderATI\0"
-   "\0"
-   /* _mesa_function_pool[28723]: PopAttrib (offset 218) */
-   "\0"
-   "glPopAttrib\0"
-   "\0"
-   /* _mesa_function_pool[28737]: Fogfv (offset 154) */
-   "ip\0"
-   "glFogfv\0"
-   "\0"
-   /* _mesa_function_pool[28749]: UnmapBufferARB (will be remapped) */
-   "i\0"
-   "glUnmapBuffer\0"
-   "glUnmapBufferARB\0"
-   "\0"
-   /* _mesa_function_pool[28783]: InitNames (offset 197) */
-   "\0"
-   "glInitNames\0"
-   "\0"
-   /* _mesa_function_pool[28797]: Normal3sv (offset 61) */
-   "p\0"
-   "glNormal3sv\0"
-   "\0"
-   /* _mesa_function_pool[28812]: Minmax (offset 368) */
-   "iii\0"
-   "glMinmax\0"
-   "glMinmaxEXT\0"
-   "\0"
-   /* _mesa_function_pool[28838]: TexCoord4d (offset 118) */
-   "dddd\0"
-   "glTexCoord4d\0"
-   "\0"
-   /* _mesa_function_pool[28857]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[28896]: TexCoord4f (offset 120) */
-   "ffff\0"
-   "glTexCoord4f\0"
-   "\0"
-   /* _mesa_function_pool[28915]: FogCoorddvEXT (will be remapped) */
-   "p\0"
-   "glFogCoorddv\0"
-   "glFogCoorddvEXT\0"
-   "\0"
-   /* _mesa_function_pool[28947]: FinishTextureSUNX (dynamic) */
-   "\0"
-   "glFinishTextureSUNX\0"
-   "\0"
-   /* _mesa_function_pool[28969]: GetFragmentLightfvSGIX (dynamic) */
-   "iip\0"
-   "glGetFragmentLightfvSGIX\0"
-   "\0"
-   /* _mesa_function_pool[28999]: Binormal3fvEXT (dynamic) */
-   "p\0"
-   "glBinormal3fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[29019]: GetBooleanv (offset 258) */
-   "ip\0"
-   "glGetBooleanv\0"
-   "\0"
-   /* _mesa_function_pool[29037]: ColorFragmentOp3ATI (will be remapped) */
-   "iiiiiiiiiiiii\0"
-   "glColorFragmentOp3ATI\0"
-   "\0"
-   /* _mesa_function_pool[29074]: Hint (offset 158) */
-   "ii\0"
-   "glHint\0"
-   "\0"
-   /* _mesa_function_pool[29085]: Color4dv (offset 28) */
-   "p\0"
-   "glColor4dv\0"
-   "\0"
-   /* _mesa_function_pool[29099]: VertexAttrib2svARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib2sv\0"
-   "glVertexAttrib2svARB\0"
-   "\0"
-   /* _mesa_function_pool[29142]: AreProgramsResidentNV (will be remapped) */
-   "ipp\0"
-   "glAreProgramsResidentNV\0"
-   "\0"
-   /* _mesa_function_pool[29171]: WindowPos3svMESA (will be remapped) */
-   "p\0"
-   "glWindowPos3sv\0"
-   "glWindowPos3svARB\0"
-   "glWindowPos3svMESA\0"
-   "\0"
-   /* _mesa_function_pool[29226]: CopyColorSubTable (offset 347) */
-   "iiiii\0"
-   "glCopyColorSubTable\0"
-   "glCopyColorSubTableEXT\0"
-   "\0"
-   /* _mesa_function_pool[29276]: WeightdvARB (dynamic) */
-   "ip\0"
-   "glWeightdvARB\0"
-   "\0"
-   /* _mesa_function_pool[29294]: DeleteRenderbuffersEXT (will be remapped) */
-   "ip\0"
-   "glDeleteRenderbuffers\0"
-   "glDeleteRenderbuffersEXT\0"
-   "\0"
-   /* _mesa_function_pool[29345]: VertexAttrib4NubvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4Nubv\0"
-   "glVertexAttrib4NubvARB\0"
-   "\0"
-   /* _mesa_function_pool[29392]: VertexAttrib3dvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib3dvNV\0"
-   "\0"
-   /* _mesa_function_pool[29416]: GetObjectParameterfvARB (will be remapped) */
-   "iip\0"
-   "glGetObjectParameterfvARB\0"
-   "\0"
-   /* _mesa_function_pool[29447]: Vertex4iv (offset 147) */
-   "p\0"
-   "glVertex4iv\0"
-   "\0"
-   /* _mesa_function_pool[29462]: GetProgramEnvParameterdvARB (will be remapped) */
-   "iip\0"
-   "glGetProgramEnvParameterdvARB\0"
-   "\0"
-   /* _mesa_function_pool[29497]: TexCoord4dv (offset 119) */
-   "p\0"
-   "glTexCoord4dv\0"
-   "\0"
-   /* _mesa_function_pool[29514]: LockArraysEXT (will be remapped) */
-   "ii\0"
-   "glLockArraysEXT\0"
-   "\0"
-   /* _mesa_function_pool[29534]: Begin (offset 7) */
-   "i\0"
-   "glBegin\0"
-   "\0"
-   /* _mesa_function_pool[29545]: LightModeli (offset 165) */
-   "ii\0"
-   "glLightModeli\0"
-   "\0"
-   /* _mesa_function_pool[29563]: Rectfv (offset 89) */
-   "pp\0"
-   "glRectfv\0"
-   "\0"
-   /* _mesa_function_pool[29576]: LightModelf (offset 163) */
-   "if\0"
-   "glLightModelf\0"
-   "\0"
-   /* _mesa_function_pool[29594]: GetTexParameterfv (offset 282) */
-   "iip\0"
-   "glGetTexParameterfv\0"
-   "\0"
-   /* _mesa_function_pool[29619]: GetLightfv (offset 264) */
-   "iip\0"
-   "glGetLightfv\0"
-   "\0"
-   /* _mesa_function_pool[29637]: PixelTransformParameterivEXT (dynamic) */
-   "iip\0"
-   "glPixelTransformParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[29673]: BinormalPointerEXT (dynamic) */
-   "iip\0"
-   "glBinormalPointerEXT\0"
-   "\0"
-   /* _mesa_function_pool[29699]: VertexAttrib1dNV (will be remapped) */
-   "id\0"
-   "glVertexAttrib1dNV\0"
-   "\0"
-   /* _mesa_function_pool[29722]: GetCombinerInputParameterivNV (will be remapped) */
-   "iiiip\0"
-   "glGetCombinerInputParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[29761]: Disable (offset 214) */
-   "i\0"
-   "glDisable\0"
-   "\0"
-   /* _mesa_function_pool[29774]: MultiTexCoord2fvARB (offset 387) */
-   "ip\0"
-   "glMultiTexCoord2fv\0"
-   "glMultiTexCoord2fvARB\0"
-   "\0"
-   /* _mesa_function_pool[29819]: GetRenderbufferParameterivEXT (will be remapped) */
-   "iip\0"
-   "glGetRenderbufferParameteriv\0"
-   "glGetRenderbufferParameterivEXT\0"
-   "\0"
-   /* _mesa_function_pool[29885]: CombinerParameterivNV (will be remapped) */
-   "ip\0"
-   "glCombinerParameterivNV\0"
-   "\0"
-   /* _mesa_function_pool[29913]: GenFragmentShadersATI (will be remapped) */
-   "i\0"
-   "glGenFragmentShadersATI\0"
-   "\0"
-   /* _mesa_function_pool[29940]: DrawArrays (offset 310) */
-   "iii\0"
-   "glDrawArrays\0"
-   "glDrawArraysEXT\0"
-   "\0"
-   /* _mesa_function_pool[29974]: WeightuivARB (dynamic) */
-   "ip\0"
-   "glWeightuivARB\0"
-   "\0"
-   /* _mesa_function_pool[29993]: VertexAttrib2sARB (will be remapped) */
-   "iii\0"
-   "glVertexAttrib2s\0"
-   "glVertexAttrib2sARB\0"
-   "\0"
-   /* _mesa_function_pool[30035]: ColorMask (offset 210) */
-   "iiii\0"
-   "glColorMask\0"
-   "\0"
-   /* _mesa_function_pool[30053]: GenAsyncMarkersSGIX (dynamic) */
-   "i\0"
-   "glGenAsyncMarkersSGIX\0"
-   "\0"
-   /* _mesa_function_pool[30078]: Tangent3svEXT (dynamic) */
-   "p\0"
-   "glTangent3svEXT\0"
-   "\0"
-   /* _mesa_function_pool[30097]: GetListParameterivSGIX (dynamic) */
-   "iip\0"
-   "glGetListParameterivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[30127]: BindBufferARB (will be remapped) */
-   "ii\0"
-   "glBindBuffer\0"
-   "glBindBufferARB\0"
-   "\0"
-   /* _mesa_function_pool[30160]: GetInfoLogARB (will be remapped) */
-   "iipp\0"
-   "glGetInfoLogARB\0"
-   "\0"
-   /* _mesa_function_pool[30182]: RasterPos4iv (offset 83) */
-   "p\0"
-   "glRasterPos4iv\0"
-   "\0"
-   /* _mesa_function_pool[30200]: Enable (offset 215) */
-   "i\0"
-   "glEnable\0"
-   "\0"
-   /* _mesa_function_pool[30212]: LineStipple (offset 167) */
-   "ii\0"
-   "glLineStipple\0"
-   "\0"
-   /* _mesa_function_pool[30230]: VertexAttribs4svNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs4svNV\0"
-   "\0"
-   /* _mesa_function_pool[30256]: EdgeFlagPointerListIBM (dynamic) */
-   "ipi\0"
-   "glEdgeFlagPointerListIBM\0"
-   "\0"
-   /* _mesa_function_pool[30286]: UniformMatrix3x2fv (will be remapped) */
-   "iiip\0"
-   "glUniformMatrix3x2fv\0"
-   "\0"
-   /* _mesa_function_pool[30313]: GetMinmaxParameterfv (offset 365) */
-   "iip\0"
-   "glGetMinmaxParameterfv\0"
-   "glGetMinmaxParameterfvEXT\0"
-   "\0"
-   /* _mesa_function_pool[30367]: VertexAttrib1fvARB (will be remapped) */
-   "ip\0"
-   "glVertexAttrib1fv\0"
-   "glVertexAttrib1fvARB\0"
-   "\0"
-   /* _mesa_function_pool[30410]: GenBuffersARB (will be remapped) */
-   "ip\0"
-   "glGenBuffers\0"
-   "glGenBuffersARB\0"
-   "\0"
-   /* _mesa_function_pool[30443]: VertexAttribs1svNV (will be remapped) */
-   "iip\0"
-   "glVertexAttribs1svNV\0"
-   "\0"
-   /* _mesa_function_pool[30469]: Vertex3fv (offset 137) */
-   "p\0"
-   "glVertex3fv\0"
-   "\0"
-   /* _mesa_function_pool[30484]: GetTexBumpParameterivATI (will be remapped) */
-   "ip\0"
-   "glGetTexBumpParameterivATI\0"
-   "\0"
-   /* _mesa_function_pool[30515]: Binormal3bEXT (dynamic) */
-   "iii\0"
-   "glBinormal3bEXT\0"
-   "\0"
-   /* _mesa_function_pool[30536]: FragmentMaterialivSGIX (dynamic) */
-   "iip\0"
-   "glFragmentMaterialivSGIX\0"
-   "\0"
-   /* _mesa_function_pool[30566]: IsRenderbufferEXT (will be remapped) */
-   "i\0"
-   "glIsRenderbuffer\0"
-   "glIsRenderbufferEXT\0"
-   "\0"
-   /* _mesa_function_pool[30606]: GenProgramsNV (will be remapped) */
-   "ip\0"
-   "glGenProgramsARB\0"
-   "glGenProgramsNV\0"
-   "\0"
-   /* _mesa_function_pool[30643]: VertexAttrib4dvNV (will be remapped) */
-   "ip\0"
-   "glVertexAttrib4dvNV\0"
-   "\0"
-   /* _mesa_function_pool[30667]: EndFragmentShaderATI (will be remapped) */
-   "\0"
-   "glEndFragmentShaderATI\0"
-   "\0"
-   /* _mesa_function_pool[30692]: Binormal3iEXT (dynamic) */
-   "iii\0"
-   "glBinormal3iEXT\0"
-   "\0"
-   /* _mesa_function_pool[30713]: WindowPos2fMESA (will be remapped) */
-   "ff\0"
-   "glWindowPos2f\0"
-   "glWindowPos2fARB\0"
-   "glWindowPos2fMESA\0"
-   "\0"
-   ;
-
-/* these functions need to be remapped */
-static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1461, AttachShader_remap_index },
-   {  8995, CreateProgram_remap_index },
-   { 21153, CreateShader_remap_index },
-   { 23466, DeleteProgram_remap_index },
-   { 16937, DeleteShader_remap_index },
-   { 21599, DetachShader_remap_index },
-   { 16461, GetAttachedShaders_remap_index },
-   {  4275, GetProgramInfoLog_remap_index },
-   {   361, GetProgramiv_remap_index },
-   {  5721, GetShaderInfoLog_remap_index },
-   { 28619, GetShaderiv_remap_index },
-   { 12198, IsProgram_remap_index },
-   { 11197, IsShader_remap_index },
-   {  9099, StencilFuncSeparate_remap_index },
-   {  3487, StencilMaskSeparate_remap_index },
-   {  6803, StencilOpSeparate_remap_index },
-   { 20478, UniformMatrix2x3fv_remap_index },
-   {  2615, UniformMatrix2x4fv_remap_index },
-   { 30286, UniformMatrix3x2fv_remap_index },
-   { 28009, UniformMatrix3x4fv_remap_index },
-   { 14961, UniformMatrix4x2fv_remap_index },
-   {  2937, UniformMatrix4x3fv_remap_index },
-   { 14622, DrawArraysInstanced_remap_index },
-   { 15725, DrawElementsInstanced_remap_index },
-   {  9013, LoadTransposeMatrixdARB_remap_index },
-   { 28348, LoadTransposeMatrixfARB_remap_index },
-   {  4904, MultTransposeMatrixdARB_remap_index },
-   { 21786, MultTransposeMatrixfARB_remap_index },
-   {   172, SampleCoverageARB_remap_index },
-   {  5117, CompressedTexImage1DARB_remap_index },
-   { 22269, CompressedTexImage2DARB_remap_index },
-   {  3550, CompressedTexImage3DARB_remap_index },
-   { 16753, CompressedTexSubImage1DARB_remap_index },
-   {  1880, CompressedTexSubImage2DARB_remap_index },
-   { 18614, CompressedTexSubImage3DARB_remap_index },
-   { 26291, GetCompressedTexImageARB_remap_index },
-   {  3395, DisableVertexAttribArrayARB_remap_index },
-   { 27621, EnableVertexAttribArrayARB_remap_index },
-   { 29462, GetProgramEnvParameterdvARB_remap_index },
-   { 21666, GetProgramEnvParameterfvARB_remap_index },
-   { 25290, GetProgramLocalParameterdvARB_remap_index },
-   {  7245, GetProgramLocalParameterfvARB_remap_index },
-   { 16844, GetProgramStringARB_remap_index },
-   { 25485, GetProgramivARB_remap_index },
-   { 18809, GetVertexAttribdvARB_remap_index },
-   { 14850, GetVertexAttribfvARB_remap_index },
-   {  8908, GetVertexAttribivARB_remap_index },
-   { 17690, ProgramEnvParameter4dARB_remap_index },
-   { 23239, ProgramEnvParameter4dvARB_remap_index },
-   { 15458, ProgramEnvParameter4fARB_remap_index },
-   {  8108, ProgramEnvParameter4fvARB_remap_index },
-   {  3513, ProgramLocalParameter4dARB_remap_index },
-   { 11908, ProgramLocalParameter4dvARB_remap_index },
-   { 27100, ProgramLocalParameter4fARB_remap_index },
-   { 23819, ProgramLocalParameter4fvARB_remap_index },
-   { 26071, ProgramStringARB_remap_index },
-   { 17940, VertexAttrib1dARB_remap_index },
-   { 14426, VertexAttrib1dvARB_remap_index },
-   {  3688, VertexAttrib1fARB_remap_index },
-   { 30367, VertexAttrib1fvARB_remap_index },
-   {  6329, VertexAttrib1sARB_remap_index },
-   {  2054, VertexAttrib1svARB_remap_index },
-   { 13857, VertexAttrib2dARB_remap_index },
-   { 16080, VertexAttrib2dvARB_remap_index },
-   {  1480, VertexAttrib2fARB_remap_index },
-   { 16193, VertexAttrib2fvARB_remap_index },
-   { 29993, VertexAttrib2sARB_remap_index },
-   { 29099, VertexAttrib2svARB_remap_index },
-   { 10282, VertexAttrib3dARB_remap_index },
-   {  7811, VertexAttrib3dvARB_remap_index },
-   {  1567, VertexAttrib3fARB_remap_index },
-   { 20741, VertexAttrib3fvARB_remap_index },
-   { 25918, VertexAttrib3sARB_remap_index },
-   { 18551, VertexAttrib3svARB_remap_index },
-   {  4301, VertexAttrib4NbvARB_remap_index },
-   { 16416, VertexAttrib4NivARB_remap_index },
-   { 20696, VertexAttrib4NsvARB_remap_index },
-   { 21618, VertexAttrib4NubARB_remap_index },
-   { 29345, VertexAttrib4NubvARB_remap_index },
-   { 17351, VertexAttrib4NuivARB_remap_index },
-   {  2810, VertexAttrib4NusvARB_remap_index },
-   {  9876, VertexAttrib4bvARB_remap_index },
-   { 24698, VertexAttrib4dARB_remap_index },
-   { 19573, VertexAttrib4dvARB_remap_index },
-   { 10389, VertexAttrib4fARB_remap_index },
-   { 10793, VertexAttrib4fvARB_remap_index },
-   {  9292, VertexAttrib4ivARB_remap_index },
-   { 15894, VertexAttrib4sARB_remap_index },
-   { 28534, VertexAttrib4svARB_remap_index },
-   { 15263, VertexAttrib4ubvARB_remap_index },
-   { 27945, VertexAttrib4uivARB_remap_index },
-   { 18362, VertexAttrib4usvARB_remap_index },
-   { 20327, VertexAttribPointerARB_remap_index },
-   { 30127, BindBufferARB_remap_index },
-   {  6036, BufferDataARB_remap_index },
-   {  1382, BufferSubDataARB_remap_index },
-   { 28134, DeleteBuffersARB_remap_index },
-   { 30410, GenBuffersARB_remap_index },
-   { 16236, GetBufferParameterivARB_remap_index },
-   { 15410, GetBufferPointervARB_remap_index },
-   {  1335, GetBufferSubDataARB_remap_index },
-   { 27893, IsBufferARB_remap_index },
-   { 24303, MapBufferARB_remap_index },
-   { 28749, UnmapBufferARB_remap_index },
-   {   268, BeginQueryARB_remap_index },
-   { 18035, DeleteQueriesARB_remap_index },
-   { 11087, EndQueryARB_remap_index },
-   { 26770, GenQueriesARB_remap_index },
-   {  1772, GetQueryObjectivARB_remap_index },
-   { 15938, GetQueryObjectuivARB_remap_index },
-   {  1624, GetQueryivARB_remap_index },
-   { 18269, IsQueryARB_remap_index },
-   {  7421, AttachObjectARB_remap_index },
-   { 16899, CompileShaderARB_remap_index },
-   {  2879, CreateProgramObjectARB_remap_index },
-   {  5981, CreateShaderObjectARB_remap_index },
-   { 13274, DeleteObjectARB_remap_index },
-   { 22060, DetachObjectARB_remap_index },
-   { 10865, GetActiveUniformARB_remap_index },
-   {  8583, GetAttachedObjectsARB_remap_index },
-   {  8890, GetHandleARB_remap_index },
-   { 30160, GetInfoLogARB_remap_index },
-   { 29416, GetObjectParameterfvARB_remap_index },
-   { 25164, GetObjectParameterivARB_remap_index },
-   { 26528, GetShaderSourceARB_remap_index },
-   { 25778, GetUniformLocationARB_remap_index },
-   { 21888, GetUniformfvARB_remap_index },
-   { 11530, GetUniformivARB_remap_index },
-   { 18407, LinkProgramARB_remap_index },
-   { 18465, ShaderSourceARB_remap_index },
-   {  6703, Uniform1fARB_remap_index },
-   { 27309, Uniform1fvARB_remap_index },
-   { 20296, Uniform1iARB_remap_index },
-   { 19262, Uniform1ivARB_remap_index },
-   {  2003, Uniform2fARB_remap_index },
-   { 13110, Uniform2fvARB_remap_index },
-   { 24190, Uniform2iARB_remap_index },
-   {  2123, Uniform2ivARB_remap_index },
-   { 17009, Uniform3fARB_remap_index },
-   {  8613, Uniform3fvARB_remap_index },
-   {  5627, Uniform3iARB_remap_index },
-   { 15516, Uniform3ivARB_remap_index },
-   { 17496, Uniform4fARB_remap_index },
-   { 21752, Uniform4fvARB_remap_index },
-   { 22918, Uniform4iARB_remap_index },
-   { 18775, Uniform4ivARB_remap_index },
-   {  7473, UniformMatrix2fvARB_remap_index },
-   {    17, UniformMatrix3fvARB_remap_index },
-   {  2475, UniformMatrix4fvARB_remap_index },
-   { 23351, UseProgramObjectARB_remap_index },
-   { 13545, ValidateProgramARB_remap_index },
-   { 19616, BindAttribLocationARB_remap_index },
-   {  4346, GetActiveAttribARB_remap_index },
-   { 15197, GetAttribLocationARB_remap_index },
-   { 27048, DrawBuffersARB_remap_index },
-   { 12013, RenderbufferStorageMultisample_remap_index },
-   { 12417, FramebufferTextureARB_remap_index },
-   { 23721, FramebufferTextureFaceARB_remap_index },
-   { 22209, ProgramParameteriARB_remap_index },
-   { 17544, FlushMappedBufferRange_remap_index },
-   { 25581, MapBufferRange_remap_index },
-   { 15072, BindVertexArray_remap_index },
-   { 13404, GenVertexArrays_remap_index },
-   { 27823, CopyBufferSubData_remap_index },
-   { 28638, ClientWaitSync_remap_index },
-   {  2394, DeleteSync_remap_index },
-   {  6370, FenceSync_remap_index },
-   { 13916, GetInteger64v_remap_index },
-   { 20803, GetSynciv_remap_index },
-   { 26987, IsSync_remap_index },
-   {  8531, WaitSync_remap_index },
-   {  3363, DrawElementsBaseVertex_remap_index },
-   { 28066, DrawRangeElementsBaseVertex_remap_index },
-   { 24334, MultiDrawElementsBaseVertex_remap_index },
-   {  4480, BindTransformFeedback_remap_index },
-   {  2906, DeleteTransformFeedbacks_remap_index },
-   {  5660, DrawTransformFeedback_remap_index },
-   {  8750, GenTransformFeedbacks_remap_index },
-   { 25961, IsTransformFeedback_remap_index },
-   { 23914, PauseTransformFeedback_remap_index },
-   {  4824, ResumeTransformFeedback_remap_index },
-   {  4739, PolygonOffsetEXT_remap_index },
-   { 21388, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  3895, GetPixelTexGenParameterivSGIS_remap_index },
-   { 21121, PixelTexGenParameterfSGIS_remap_index },
-   {   580, PixelTexGenParameterfvSGIS_remap_index },
-   { 11568, PixelTexGenParameteriSGIS_remap_index },
-   { 12591, PixelTexGenParameterivSGIS_remap_index },
-   { 15160, SampleMaskSGIS_remap_index },
-   { 18209, SamplePatternSGIS_remap_index },
-   { 24263, ColorPointerEXT_remap_index },
-   { 16123, EdgeFlagPointerEXT_remap_index },
-   {  5281, IndexPointerEXT_remap_index },
-   {  5361, NormalPointerEXT_remap_index },
-   { 14510, TexCoordPointerEXT_remap_index },
-   {  6159, VertexPointerEXT_remap_index },
-   {  3165, PointParameterfEXT_remap_index },
-   {  7010, PointParameterfvEXT_remap_index },
-   { 29514, LockArraysEXT_remap_index },
-   { 13609, UnlockArraysEXT_remap_index },
-   {  8017, CullParameterdvEXT_remap_index },
-   { 10660, CullParameterfvEXT_remap_index },
-   {  1151, SecondaryColor3bEXT_remap_index },
-   {  7169, SecondaryColor3bvEXT_remap_index },
-   {  9469, SecondaryColor3dEXT_remap_index },
-   { 23524, SecondaryColor3dvEXT_remap_index },
-   { 25827, SecondaryColor3fEXT_remap_index },
-   { 16689, SecondaryColor3fvEXT_remap_index },
-   {   426, SecondaryColor3iEXT_remap_index },
-   { 14898, SecondaryColor3ivEXT_remap_index },
-   {  9127, SecondaryColor3sEXT_remap_index },
-   { 28302, SecondaryColor3svEXT_remap_index },
-   { 25000, SecondaryColor3ubEXT_remap_index },
-   { 19507, SecondaryColor3ubvEXT_remap_index },
-   { 11763, SecondaryColor3uiEXT_remap_index },
-   { 21008, SecondaryColor3uivEXT_remap_index },
-   { 23771, SecondaryColor3usEXT_remap_index },
-   { 11836, SecondaryColor3usvEXT_remap_index },
-   { 10736, SecondaryColorPointerEXT_remap_index },
-   { 23585, MultiDrawArraysEXT_remap_index },
-   { 19197, MultiDrawElementsEXT_remap_index },
-   { 19392, FogCoordPointerEXT_remap_index },
-   {  4044, FogCoorddEXT_remap_index },
-   { 28915, FogCoorddvEXT_remap_index },
-   {  4136, FogCoordfEXT_remap_index },
-   { 24923, FogCoordfvEXT_remap_index },
-   { 17448, PixelTexGenSGIX_remap_index },
-   { 25508, BlendFuncSeparateEXT_remap_index },
-   {  6071, FlushVertexArrayRangeNV_remap_index },
-   {  4688, VertexArrayRangeNV_remap_index },
-   { 25892, CombinerInputNV_remap_index },
-   {  1946, CombinerOutputNV_remap_index },
-   { 28455, CombinerParameterfNV_remap_index },
-   {  4608, CombinerParameterfvNV_remap_index },
-   { 20527, CombinerParameteriNV_remap_index },
-   { 29885, CombinerParameterivNV_remap_index },
-   {  6447, FinalCombinerInputNV_remap_index },
-   {  8956, GetCombinerInputParameterfvNV_remap_index },
-   { 29722, GetCombinerInputParameterivNV_remap_index },
-   { 12692, GetCombinerOutputParameterfvNV_remap_index },
-   { 12520, GetCombinerOutputParameterivNV_remap_index },
-   {  5816, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 22790, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11508, ResizeBuffersMESA_remap_index },
-   { 10109, WindowPos2dMESA_remap_index },
-   {   944, WindowPos2dvMESA_remap_index },
-   { 30713, WindowPos2fMESA_remap_index },
-   {  7114, WindowPos2fvMESA_remap_index },
-   { 16636, WindowPos2iMESA_remap_index },
-   { 18682, WindowPos2ivMESA_remap_index },
-   { 19296, WindowPos2sMESA_remap_index },
-   {  5031, WindowPos2svMESA_remap_index },
-   {  6939, WindowPos3dMESA_remap_index },
-   { 12838, WindowPos3dvMESA_remap_index },
-   {   472, WindowPos3fMESA_remap_index },
-   { 13670, WindowPos3fvMESA_remap_index },
-   { 22102, WindowPos3iMESA_remap_index },
-   { 27768, WindowPos3ivMESA_remap_index },
-   { 17154, WindowPos3sMESA_remap_index },
-   { 29171, WindowPos3svMESA_remap_index },
-   { 10060, WindowPos4dMESA_remap_index },
-   { 15601, WindowPos4dvMESA_remap_index },
-   { 12797, WindowPos4fMESA_remap_index },
-   { 28209, WindowPos4fvMESA_remap_index },
-   { 27921, WindowPos4iMESA_remap_index },
-   { 11311, WindowPos4ivMESA_remap_index },
-   { 17327, WindowPos4sMESA_remap_index },
-   {  2857, WindowPos4svMESA_remap_index },
-   { 12559, MultiModeDrawArraysIBM_remap_index },
-   { 26641, MultiModeDrawElementsIBM_remap_index },
-   { 11115, DeleteFencesNV_remap_index },
-   { 25739, FinishFenceNV_remap_index },
-   {  3287, GenFencesNV_remap_index },
-   { 15581, GetFenceivNV_remap_index },
-   {  7406, IsFenceNV_remap_index },
-   { 12447, SetFenceNV_remap_index },
-   {  3744, TestFenceNV_remap_index },
-   { 29142, AreProgramsResidentNV_remap_index },
-   { 28497, BindProgramNV_remap_index },
-   { 23854, DeleteProgramsNV_remap_index },
-   { 19725, ExecuteProgramNV_remap_index },
-   { 30606, GenProgramsNV_remap_index },
-   { 21467, GetProgramParameterdvNV_remap_index },
-   {  9531, GetProgramParameterfvNV_remap_index },
-   { 24237, GetProgramStringNV_remap_index },
-   { 22479, GetProgramivNV_remap_index },
-   { 21701, GetTrackMatrixivNV_remap_index },
-   { 24031, GetVertexAttribPointervNV_remap_index },
-   { 22723, GetVertexAttribdvNV_remap_index },
-   {  8426, GetVertexAttribfvNV_remap_index },
-   { 16817, GetVertexAttribivNV_remap_index },
-   { 17574, IsProgramNV_remap_index },
-   {  8509, LoadProgramNV_remap_index },
-   { 25604, ProgramParameters4dvNV_remap_index },
-   { 22409, ProgramParameters4fvNV_remap_index },
-   { 18986, RequestResidentProgramsNV_remap_index },
-   { 20505, TrackMatrixNV_remap_index },
-   { 29699, VertexAttrib1dNV_remap_index },
-   { 12358, VertexAttrib1dvNV_remap_index },
-   { 26173, VertexAttrib1fNV_remap_index },
-   {  2245, VertexAttrib1fvNV_remap_index },
-   { 28266, VertexAttrib1sNV_remap_index },
-   { 13743, VertexAttrib1svNV_remap_index },
-   {  4251, VertexAttrib2dNV_remap_index },
-   { 12273, VertexAttrib2dvNV_remap_index },
-   { 18441, VertexAttrib2fNV_remap_index },
-   { 11884, VertexAttrib2fvNV_remap_index },
-   {  5191, VertexAttrib2sNV_remap_index },
-   { 17208, VertexAttrib2svNV_remap_index },
-   { 10257, VertexAttrib3dNV_remap_index },
-   { 29392, VertexAttrib3dvNV_remap_index },
-   {  9343, VertexAttrib3fNV_remap_index },
-   { 22750, VertexAttrib3fvNV_remap_index },
-   { 20382, VertexAttrib3sNV_remap_index },
-   { 21728, VertexAttrib3svNV_remap_index },
-   { 26615, VertexAttrib4dNV_remap_index },
-   { 30643, VertexAttrib4dvNV_remap_index },
-   {  3945, VertexAttrib4fNV_remap_index },
-   {  8559, VertexAttrib4fvNV_remap_index },
-   { 24582, VertexAttrib4sNV_remap_index },
-   {  1293, VertexAttrib4svNV_remap_index },
-   {  4409, VertexAttrib4ubNV_remap_index },
-   {   734, VertexAttrib4ubvNV_remap_index },
-   { 19905, VertexAttribPointerNV_remap_index },
-   {  2097, VertexAttribs1dvNV_remap_index },
-   { 24119, VertexAttribs1fvNV_remap_index },
-   { 30443, VertexAttribs1svNV_remap_index },
-   {  9368, VertexAttribs2dvNV_remap_index },
-   { 23312, VertexAttribs2fvNV_remap_index },
-   { 16149, VertexAttribs2svNV_remap_index },
-   {  4636, VertexAttribs3dvNV_remap_index },
-   {  1977, VertexAttribs3fvNV_remap_index },
-   { 27516, VertexAttribs3svNV_remap_index },
-   { 24672, VertexAttribs4dvNV_remap_index },
-   {  4662, VertexAttribs4fvNV_remap_index },
-   { 30230, VertexAttribs4svNV_remap_index },
-   { 27264, VertexAttribs4ubvNV_remap_index },
-   { 24742, GetTexBumpParameterfvATI_remap_index },
-   { 30484, GetTexBumpParameterivATI_remap_index },
-   { 16871, TexBumpParameterfvATI_remap_index },
-   { 18857, TexBumpParameterivATI_remap_index },
-   { 14289, AlphaFragmentOp1ATI_remap_index },
-   {  9919, AlphaFragmentOp2ATI_remap_index },
-   { 22666, AlphaFragmentOp3ATI_remap_index },
-   { 27443, BeginFragmentShaderATI_remap_index },
-   { 28696, BindFragmentShaderATI_remap_index },
-   { 21857, ColorFragmentOp1ATI_remap_index },
-   {  3823, ColorFragmentOp2ATI_remap_index },
-   { 29037, ColorFragmentOp3ATI_remap_index },
-   {  4781, DeleteFragmentShaderATI_remap_index },
-   { 30667, EndFragmentShaderATI_remap_index },
-   { 29913, GenFragmentShadersATI_remap_index },
-   { 23443, PassTexCoordATI_remap_index },
-   {  6139, SampleMapATI_remap_index },
-   {  5912, SetFragmentShaderConstantATI_remap_index },
-   {   319, PointParameteriNV_remap_index },
-   { 12999, PointParameterivNV_remap_index },
-   { 26454, ActiveStencilFaceEXT_remap_index },
-   { 25264, BindVertexArrayAPPLE_remap_index },
-   {  2522, DeleteVertexArraysAPPLE_remap_index },
-   { 16488, GenVertexArraysAPPLE_remap_index },
-   { 21532, IsVertexArrayAPPLE_remap_index },
-   {   775, GetProgramNamedParameterdvNV_remap_index },
-   {  3128, GetProgramNamedParameterfvNV_remap_index },
-   { 24773, ProgramNamedParameter4dNV_remap_index },
-   { 13325, ProgramNamedParameter4dvNV_remap_index },
-   {  8042, ProgramNamedParameter4fNV_remap_index },
-   { 10701, ProgramNamedParameter4fvNV_remap_index },
-   { 22388, DepthBoundsEXT_remap_index },
-   {  1043, BlendEquationSeparateEXT_remap_index },
-   { 13444, BindFramebufferEXT_remap_index },
-   { 23630, BindRenderbufferEXT_remap_index },
-   {  8806, CheckFramebufferStatusEXT_remap_index },
-   { 20822, DeleteFramebuffersEXT_remap_index },
-   { 29294, DeleteRenderbuffersEXT_remap_index },
-   { 12297, FramebufferRenderbufferEXT_remap_index },
-   { 12464, FramebufferTexture1DEXT_remap_index },
-   { 10495, FramebufferTexture2DEXT_remap_index },
-   { 10162, FramebufferTexture3DEXT_remap_index },
-   { 21424, GenFramebuffersEXT_remap_index },
-   { 16035, GenRenderbuffersEXT_remap_index },
-   {  5858, GenerateMipmapEXT_remap_index },
-   { 20002, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 29819, GetRenderbufferParameterivEXT_remap_index },
-   { 18737, IsFramebufferEXT_remap_index },
-   { 30566, IsRenderbufferEXT_remap_index },
-   {  7353, RenderbufferStorageEXT_remap_index },
-   {   651, BlitFramebufferEXT_remap_index },
-   { 13144, BufferParameteriAPPLE_remap_index },
-   { 17606, FlushMappedBufferRangeAPPLE_remap_index },
-   {  2701, FramebufferTextureLayerEXT_remap_index },
-   {  4956, ColorMaskIndexedEXT_remap_index },
-   { 17232, DisableIndexedEXT_remap_index },
-   { 24429, EnableIndexedEXT_remap_index },
-   { 19973, GetBooleanIndexedvEXT_remap_index },
-   {  9952, GetIntegerIndexedvEXT_remap_index },
-   { 20898, IsEnabledIndexedEXT_remap_index },
-   {  4074, BeginConditionalRenderNV_remap_index },
-   { 23416, EndConditionalRenderNV_remap_index },
-   {  8453, BeginTransformFeedbackEXT_remap_index },
-   { 17256, BindBufferBaseEXT_remap_index },
-   { 17126, BindBufferOffsetEXT_remap_index },
-   { 11136, BindBufferRangeEXT_remap_index },
-   { 13059, EndTransformFeedbackEXT_remap_index },
-   {  9804, GetTransformFeedbackVaryingEXT_remap_index },
-   { 19042, TransformFeedbackVaryingsEXT_remap_index },
-   { 27165, ProvokingVertexEXT_remap_index },
-   {  9752, GetTexParameterPointervAPPLE_remap_index },
-   {  4436, TextureRangeAPPLE_remap_index },
-   { 10567, GetObjectParameterivAPPLE_remap_index },
-   { 18181, ObjectPurgeableAPPLE_remap_index },
-   {  4985, ObjectUnpurgeableAPPLE_remap_index },
-   { 26480, StencilFuncSeparateATI_remap_index },
-   { 16555, ProgramEnvParameters4fvEXT_remap_index },
-   { 19936, ProgramLocalParameters4fvEXT_remap_index },
-   { 12927, GetQueryObjecti64vEXT_remap_index },
-   {  9394, GetQueryObjectui64vEXT_remap_index },
-   { 21926, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 11054, EGLImageTargetTexture2DOES_remap_index },
-   {    -1, -1 }
-};
-
-/* these functions are in the ABI, but have alternative names */
-static const struct gl_function_remap MESA_alt_functions[] = {
-   /* from GL_EXT_blend_color */
-   {  2440, _gloffset_BlendColor },
-   /* from GL_EXT_blend_minmax */
-   { 10219, _gloffset_BlendEquation },
-   /* from GL_EXT_color_subtable */
-   { 15623, _gloffset_ColorSubTable },
-   { 29226, _gloffset_CopyColorSubTable },
-   /* from GL_EXT_convolution */
-   {   213, _gloffset_ConvolutionFilter1D },
-   {  2284, _gloffset_CopyConvolutionFilter1D },
-   {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7702, _gloffset_ConvolutionFilter2D },
-   {  7868, _gloffset_ConvolutionParameteriv },
-   {  8328, _gloffset_ConvolutionParameterfv },
-   { 18885, _gloffset_GetSeparableFilter },
-   { 22156, _gloffset_SeparableFilter2D },
-   { 22968, _gloffset_ConvolutionParameteri },
-   { 23091, _gloffset_ConvolutionParameterf },
-   { 24608, _gloffset_GetConvolutionParameterfv },
-   { 25430, _gloffset_GetConvolutionFilter },
-   { 27705, _gloffset_CopyConvolutionFilter2D },
-   /* from GL_EXT_copy_texture */
-   { 13803, _gloffset_CopyTexSubImage3D },
-   { 15363, _gloffset_CopyTexImage2D },
-   { 22576, _gloffset_CopyTexImage1D },
-   { 25111, _gloffset_CopyTexSubImage2D },
-   { 27343, _gloffset_CopyTexSubImage1D },
-   /* from GL_EXT_draw_range_elements */
-   {  8665, _gloffset_DrawRangeElements },
-   /* from GL_EXT_histogram */
-   {   812, _gloffset_Histogram },
-   {  3088, _gloffset_ResetHistogram },
-   {  9065, _gloffset_GetMinmax },
-   { 14137, _gloffset_GetHistogramParameterfv },
-   { 22501, _gloffset_GetMinmaxParameteriv },
-   { 24498, _gloffset_ResetMinmax },
-   { 25327, _gloffset_GetHistogramParameteriv },
-   { 26414, _gloffset_GetHistogram },
-   { 28812, _gloffset_Minmax },
-   { 30313, _gloffset_GetMinmaxParameterfv },
-   /* from GL_EXT_paletted_texture */
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
-   /* from GL_EXT_subtexture */
-   {  6285, _gloffset_TexSubImage1D },
-   {  9679, _gloffset_TexSubImage2D },
-   /* from GL_EXT_texture3D */
-   {  1658, _gloffset_TexImage3D },
-   { 20940, _gloffset_TexSubImage3D },
-   /* from GL_EXT_texture_object */
-   {  2964, _gloffset_PrioritizeTextures },
-   {  6734, _gloffset_AreTexturesResident },
-   { 12382, _gloffset_GenTextures },
-   { 14469, _gloffset_DeleteTextures },
-   { 17887, _gloffset_IsTexture },
-   { 27408, _gloffset_BindTexture },
-   /* from GL_EXT_vertex_array */
-   { 22328, _gloffset_ArrayElement },
-   { 28400, _gloffset_GetPointerv },
-   { 29940, _gloffset_DrawArrays },
-   /* from GL_SGI_color_table */
-   {  6852, _gloffset_ColorTableParameteriv },
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 14093, _gloffset_CopyColorTable },
-   { 17748, _gloffset_ColorTableParameterfv },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
-   /* from GL_VERSION_1_3 */
-   {   381, _gloffset_MultiTexCoord3sARB },
-   {   613, _gloffset_ActiveTextureARB },
-   {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5386, _gloffset_MultiTexCoord3dARB },
-   {  5431, _gloffset_MultiTexCoord2iARB },
-   {  5555, _gloffset_MultiTexCoord2svARB },
-   {  7520, _gloffset_MultiTexCoord2fARB },
-   {  9424, _gloffset_MultiTexCoord3fvARB },
-   {  9981, _gloffset_MultiTexCoord4sARB },
-   { 10615, _gloffset_MultiTexCoord2dvARB },
-   { 10997, _gloffset_MultiTexCoord1svARB },
-   { 11369, _gloffset_MultiTexCoord3svARB },
-   { 11430, _gloffset_MultiTexCoord4iARB },
-   { 12153, _gloffset_MultiTexCoord3iARB },
-   { 12956, _gloffset_MultiTexCoord1dARB },
-   { 13173, _gloffset_MultiTexCoord3dvARB },
-   { 14337, _gloffset_MultiTexCoord3ivARB },
-   { 14382, _gloffset_MultiTexCoord2sARB },
-   { 15680, _gloffset_MultiTexCoord4ivARB },
-   { 17398, _gloffset_ClientActiveTextureARB },
-   { 19681, _gloffset_MultiTexCoord2dARB },
-   { 20122, _gloffset_MultiTexCoord4dvARB },
-   { 20433, _gloffset_MultiTexCoord4fvARB },
-   { 21312, _gloffset_MultiTexCoord3fARB },
-   { 23675, _gloffset_MultiTexCoord4dARB },
-   { 23941, _gloffset_MultiTexCoord1sARB },
-   { 24145, _gloffset_MultiTexCoord1dvARB },
-   { 24955, _gloffset_MultiTexCoord1ivARB },
-   { 25048, _gloffset_MultiTexCoord2ivARB },
-   { 25387, _gloffset_MultiTexCoord1iARB },
-   { 26689, _gloffset_MultiTexCoord4svARB },
-   { 27207, _gloffset_MultiTexCoord1fARB },
-   { 27470, _gloffset_MultiTexCoord4fARB },
-   { 29774, _gloffset_MultiTexCoord2fvARB },
-   {    -1, -1 }
-};
-
-#endif /* need_MESA_remap_table */
-
-#if defined(need_GL_3DFX_tbuffer)
-static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  8386, -1 }, /* TbufferMask3DFX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_APPLE_flush_buffer_range)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_APPLE_flush_buffer_range_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_APPLE_object_purgeable)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_APPLE_object_purgeable_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_APPLE_texture_range)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_APPLE_texture_range_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_APPLE_vertex_array_object)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_APPLE_vertex_array_object_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_copy_buffer)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_copy_buffer_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_draw_buffers)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_draw_buffers_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_draw_elements_base_vertex)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_draw_elements_base_vertex_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_draw_instanced)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_draw_instanced_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_framebuffer_object)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_geometry_shader4)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 11333, -1 }, /* FramebufferTextureLayer */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_map_buffer_range)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_matrix_palette)
-static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
-   {  3339, -1 }, /* MatrixIndexusvARB */
-   { 11974, -1 }, /* MatrixIndexuivARB */
-   { 13295, -1 }, /* MatrixIndexPointerARB */
-   { 18136, -1 }, /* CurrentPaletteMatrixARB */
-   { 21056, -1 }, /* MatrixIndexubvARB */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_multisample)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_multisample_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_occlusion_query)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_occlusion_query_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_point_parameters)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_point_parameters_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_provoking_vertex)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_provoking_vertex_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_shader_objects)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_shader_objects_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_sync)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_sync_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_texture_compression)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_texture_compression_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_transform_feedback2)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_transform_feedback2_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_transpose_matrix)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_transpose_matrix_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_vertex_array_object)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_vertex_blend)
-static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
-   {  2226, -1 }, /* WeightubvARB */
-   {  5746, -1 }, /* WeightivARB */
-   { 10084, -1 }, /* WeightPointerARB */
-   { 12674, -1 }, /* WeightfvARB */
-   { 16175, -1 }, /* WeightbvARB */
-   { 19349, -1 }, /* WeightusvARB */
-   { 22082, -1 }, /* VertexBlendARB */
-   { 27291, -1 }, /* WeightsvARB */
-   { 29276, -1 }, /* WeightdvARB */
-   { 29974, -1 }, /* WeightuivARB */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_vertex_buffer_object)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_vertex_buffer_object_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_vertex_program)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_vertex_program_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_vertex_shader)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_vertex_shader_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ARB_window_pos)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ARB_window_pos_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ATI_blend_equation_separate)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ATI_blend_equation_separate_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ATI_draw_buffers)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ATI_draw_buffers_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ATI_envmap_bumpmap)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ATI_envmap_bumpmap_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ATI_fragment_shader)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ATI_fragment_shader_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_ATI_separate_stencil)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_ATI_separate_stencil_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_blend_color)
-static const struct gl_function_remap GL_EXT_blend_color_functions[] = {
-   {  2440, _gloffset_BlendColor },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_blend_equation_separate)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_blend_equation_separate_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_blend_func_separate)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_blend_minmax)
-static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   { 10219, _gloffset_BlendEquation },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_color_subtable)
-static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 15623, _gloffset_ColorSubTable },
-   { 29226, _gloffset_CopyColorSubTable },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_compiled_vertex_array)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_compiled_vertex_array_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_convolution)
-static const struct gl_function_remap GL_EXT_convolution_functions[] = {
-   {   213, _gloffset_ConvolutionFilter1D },
-   {  2284, _gloffset_CopyConvolutionFilter1D },
-   {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7702, _gloffset_ConvolutionFilter2D },
-   {  7868, _gloffset_ConvolutionParameteriv },
-   {  8328, _gloffset_ConvolutionParameterfv },
-   { 18885, _gloffset_GetSeparableFilter },
-   { 22156, _gloffset_SeparableFilter2D },
-   { 22968, _gloffset_ConvolutionParameteri },
-   { 23091, _gloffset_ConvolutionParameterf },
-   { 24608, _gloffset_GetConvolutionParameterfv },
-   { 25430, _gloffset_GetConvolutionFilter },
-   { 27705, _gloffset_CopyConvolutionFilter2D },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_coordinate_frame)
-static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   {  9563, -1 }, /* TangentPointerEXT */
-   { 11488, -1 }, /* Binormal3ivEXT */
-   { 12106, -1 }, /* Tangent3sEXT */
-   { 13360, -1 }, /* Tangent3fvEXT */
-   { 17107, -1 }, /* Tangent3dvEXT */
-   { 17834, -1 }, /* Binormal3bvEXT */
-   { 18938, -1 }, /* Binormal3dEXT */
-   { 20988, -1 }, /* Tangent3fEXT */
-   { 23040, -1 }, /* Binormal3sEXT */
-   { 23485, -1 }, /* Tangent3ivEXT */
-   { 23504, -1 }, /* Tangent3dEXT */
-   { 24372, -1 }, /* Binormal3svEXT */
-   { 24853, -1 }, /* Binormal3fEXT */
-   { 25705, -1 }, /* Binormal3dvEXT */
-   { 26911, -1 }, /* Tangent3iEXT */
-   { 27990, -1 }, /* Tangent3bvEXT */
-   { 28435, -1 }, /* Tangent3bEXT */
-   { 28999, -1 }, /* Binormal3fvEXT */
-   { 29673, -1 }, /* BinormalPointerEXT */
-   { 30078, -1 }, /* Tangent3svEXT */
-   { 30515, -1 }, /* Binormal3bEXT */
-   { 30692, -1 }, /* Binormal3iEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_copy_texture)
-static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13803, _gloffset_CopyTexSubImage3D },
-   { 15363, _gloffset_CopyTexImage2D },
-   { 22576, _gloffset_CopyTexImage1D },
-   { 25111, _gloffset_CopyTexSubImage2D },
-   { 27343, _gloffset_CopyTexSubImage1D },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_cull_vertex)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_depth_bounds_test)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_depth_bounds_test_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_draw_buffers2)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_draw_buffers2_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_draw_instanced)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_draw_range_elements)
-static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  8665, _gloffset_DrawRangeElements },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_fog_coord)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_fog_coord_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_framebuffer_blit)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_framebuffer_blit_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_framebuffer_multisample)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_framebuffer_multisample_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_framebuffer_object)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_framebuffer_object_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_gpu_program_parameters)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_histogram)
-static const struct gl_function_remap GL_EXT_histogram_functions[] = {
-   {   812, _gloffset_Histogram },
-   {  3088, _gloffset_ResetHistogram },
-   {  9065, _gloffset_GetMinmax },
-   { 14137, _gloffset_GetHistogramParameterfv },
-   { 22501, _gloffset_GetMinmaxParameteriv },
-   { 24498, _gloffset_ResetMinmax },
-   { 25327, _gloffset_GetHistogramParameteriv },
-   { 26414, _gloffset_GetHistogram },
-   { 28812, _gloffset_Minmax },
-   { 30313, _gloffset_GetMinmaxParameterfv },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_index_func)
-static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10446, -1 }, /* IndexFuncEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_index_material)
-static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 19436, -1 }, /* IndexMaterialEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_light_texture)
-static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 24392, -1 }, /* ApplyTextureEXT */
-   { 24452, -1 }, /* TextureMaterialEXT */
-   { 24477, -1 }, /* TextureLightEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_multi_draw_arrays)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_multi_draw_arrays_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_multisample)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_multisample_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_paletted_texture)
-static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_pixel_transform)
-static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 20087, -1 }, /* PixelTransformParameterfEXT */
-   { 20167, -1 }, /* PixelTransformParameteriEXT */
-   { 28173, -1 }, /* PixelTransformParameterfvEXT */
-   { 29637, -1 }, /* PixelTransformParameterivEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_point_parameters)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_point_parameters_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_polygon_offset)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_polygon_offset_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_provoking_vertex)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_provoking_vertex_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_secondary_color)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_secondary_color_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_stencil_two_side)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_subtexture)
-static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  6285, _gloffset_TexSubImage1D },
-   {  9679, _gloffset_TexSubImage2D },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_texture3D)
-static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1658, _gloffset_TexImage3D },
-   { 20940, _gloffset_TexSubImage3D },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_texture_array)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_texture_object)
-static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
-   {  2964, _gloffset_PrioritizeTextures },
-   {  6734, _gloffset_AreTexturesResident },
-   { 12382, _gloffset_GenTextures },
-   { 14469, _gloffset_DeleteTextures },
-   { 17887, _gloffset_IsTexture },
-   { 27408, _gloffset_BindTexture },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_texture_perturb_normal)
-static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 12624, -1 }, /* TextureNormalEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_timer_query)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_timer_query_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_transform_feedback)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_vertex_array)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 22328, _gloffset_ArrayElement },
-   { 28400, _gloffset_GetPointerv },
-   { 29940, _gloffset_DrawArrays },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_EXT_vertex_weighting)
-static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17917, -1 }, /* VertexWeightfvEXT */
-   { 24831, -1 }, /* VertexWeightfEXT */
-   { 26383, -1 }, /* VertexWeightPointerEXT */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_HP_image_transform)
-static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2157, -1 }, /* GetImageTransformParameterfvHP */
-   {  3305, -1 }, /* ImageTransformParameterfHP */
-   {  9257, -1 }, /* ImageTransformParameterfvHP */
-   { 10915, -1 }, /* ImageTransformParameteriHP */
-   { 11223, -1 }, /* GetImageTransformParameterivHP */
-   { 17981, -1 }, /* ImageTransformParameterivHP */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_IBM_multimode_draw_arrays)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_IBM_vertex_array_lists)
-static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
-   {  3857, -1 }, /* SecondaryColorPointerListIBM */
-   {  5252, -1 }, /* NormalPointerListIBM */
-   {  6908, -1 }, /* FogCoordPointerListIBM */
-   {  7215, -1 }, /* VertexPointerListIBM */
-   { 10836, -1 }, /* ColorPointerListIBM */
-   { 12213, -1 }, /* TexCoordPointerListIBM */
-   { 12646, -1 }, /* IndexPointerListIBM */
-   { 30256, -1 }, /* EdgeFlagPointerListIBM */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_INGR_blend_func_separate)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_INTEL_parallel_arrays)
-static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 11600, -1 }, /* VertexPointervINTEL */
-   { 14230, -1 }, /* ColorPointervINTEL */
-   { 27679, -1 }, /* NormalPointervINTEL */
-   { 28105, -1 }, /* TexCoordPointervINTEL */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_MESA_resize_buffers)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_MESA_shader_debug)
-static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
-   {  1522, -1 }, /* GetDebugLogLengthMESA */
-   {  3063, -1 }, /* ClearDebugLogMESA */
-   {  4018, -1 }, /* GetDebugLogMESA */
-   { 28593, -1 }, /* CreateDebugObjectMESA */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_MESA_window_pos)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_MESA_window_pos_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_condtitional_render)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_evaluators)
-static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  5947, -1 }, /* GetMapAttribParameterivNV */
-   {  7670, -1 }, /* MapControlPointsNV */
-   {  7769, -1 }, /* MapParameterfvNV */
-   {  9662, -1 }, /* EvalMapsNV */
-   { 15845, -1 }, /* GetMapAttribParameterfvNV */
-   { 16011, -1 }, /* MapParameterivNV */
-   { 22891, -1 }, /* GetMapParameterivNV */
-   { 23389, -1 }, /* GetMapParameterfvNV */
-   { 27015, -1 }, /* GetMapControlPointsNV */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_fence)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_fence_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_fragment_program)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_fragment_program_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_point_sprite)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_point_sprite_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_register_combiners)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_register_combiners2)
-static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 14700, -1 }, /* CombinerStageParameterfvNV */
-   { 15015, -1 }, /* GetCombinerStageParameterfvNV */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_vertex_array_range)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_vertex_array_range_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_NV_vertex_program)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_NV_vertex_program_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_OES_EGL_image)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_PGI_misc_hints)
-static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  7854, -1 }, /* HintPGI */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_detail_texture)
-static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14988, -1 }, /* GetDetailTexFuncSGIS */
-   { 15308, -1 }, /* DetailTexFuncSGIS */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_fog_function)
-static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 25093, -1 }, /* FogFuncSGIS */
-   { 25758, -1 }, /* GetFogFuncSGIS */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_multisample)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_SGIS_multisample_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_pixel_texture)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_SGIS_pixel_texture_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_point_parameters)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_sharpen_texture)
-static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  6008, -1 }, /* GetSharpenTexFuncSGIS */
-   { 20407, -1 }, /* SharpenTexFuncSGIS */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_texture4D)
-static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {   894, -1 }, /* TexImage4DSGIS */
-   { 14538, -1 }, /* TexSubImage4DSGIS */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_texture_color_mask)
-static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 13936, -1 }, /* TextureColorMaskSGIS */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIS_texture_filter4)
-static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6185, -1 }, /* GetTexFilterFuncSGIS */
-   { 15134, -1 }, /* TexFilterFuncSGIS */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_async)
-static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3014, -1 }, /* AsyncMarkerSGIX */
-   {  3997, -1 }, /* FinishAsyncSGIX */
-   {  4762, -1 }, /* PollAsyncSGIX */
-   { 20554, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 20609, -1 }, /* IsAsyncMarkerSGIX */
-   { 30053, -1 }, /* GenAsyncMarkersSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_flush_raster)
-static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  6562, -1 }, /* FlushRasterSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_fragment_lighting)
-static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2410, -1 }, /* FragmentMaterialfvSGIX */
-   {  4713, -1 }, /* FragmentLightiSGIX */
-   {  5688, -1 }, /* GetFragmentMaterialfvSGIX */
-   {  7282, -1 }, /* FragmentMaterialfSGIX */
-   {  7443, -1 }, /* GetFragmentLightivSGIX */
-   {  8280, -1 }, /* FragmentLightModeliSGIX */
-   {  9725, -1 }, /* FragmentLightivSGIX */
-   { 10027, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17804, -1 }, /* FragmentLightModelfSGIX */
-   { 18104, -1 }, /* FragmentColorMaterialSGIX */
-   { 18504, -1 }, /* FragmentMaterialiSGIX */
-   { 19764, -1 }, /* LightEnviSGIX */
-   { 21263, -1 }, /* FragmentLightModelfvSGIX */
-   { 21572, -1 }, /* FragmentLightfvSGIX */
-   { 26142, -1 }, /* FragmentLightModelivSGIX */
-   { 26265, -1 }, /* FragmentLightfSGIX */
-   { 28969, -1 }, /* GetFragmentLightfvSGIX */
-   { 30536, -1 }, /* FragmentMaterialivSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_framezoom)
-static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 20632, -1 }, /* FrameZoomSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_igloo_interface)
-static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 26573, -1 }, /* IglooInterfaceSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_instruments)
-static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2573, -1 }, /* ReadInstrumentsSGIX */
-   {  5764, -1 }, /* PollInstrumentsSGIX */
-   {  9623, -1 }, /* GetInstrumentsSGIX */
-   { 11811, -1 }, /* StartInstrumentsSGIX */
-   { 14734, -1 }, /* StopInstrumentsSGIX */
-   { 16388, -1 }, /* InstrumentsBufferSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_list_priority)
-static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1125, -1 }, /* ListParameterfSGIX */
-   {  2763, -1 }, /* GetListParameterfvSGIX */
-   { 16303, -1 }, /* ListParameteriSGIX */
-   { 17057, -1 }, /* ListParameterfvSGIX */
-   { 19170, -1 }, /* ListParameterivSGIX */
-   { 30097, -1 }, /* GetListParameterivSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_pixel_texture)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_polynomial_ffd)
-static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
-   {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 14834, -1 }, /* DeformSGIX */
-   { 22440, -1 }, /* DeformationMap3fSGIX */
-   { 28857, -1 }, /* DeformationMap3dSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_reference_plane)
-static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 13487, -1 }, /* ReferencePlaneSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_sprite)
-static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  8778, -1 }, /* SpriteParameterfvSGIX */
-   { 18959, -1 }, /* SpriteParameteriSGIX */
-   { 24532, -1 }, /* SpriteParameterfSGIX */
-   { 27137, -1 }, /* SpriteParameterivSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGIX_tag_sample_buffer)
-static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 19018, -1 }, /* TagSampleBufferSGIX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SGI_color_table)
-static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  6852, _gloffset_ColorTableParameteriv },
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 14093, _gloffset_CopyColorTable },
-   { 17748, _gloffset_ColorTableParameterfv },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SUNX_constant_data)
-static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 28947, -1 }, /* FinishTextureSUNX */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SUN_global_alpha)
-static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3035, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4224, -1 }, /* GlobalAlphaFactoriSUN */
-   {  5789, -1 }, /* GlobalAlphaFactordSUN */
-   {  8862, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  9214, -1 }, /* GlobalAlphaFactorbSUN */
-   { 12126, -1 }, /* GlobalAlphaFactorfSUN */
-   { 12245, -1 }, /* GlobalAlphaFactorusSUN */
-   { 20871, -1 }, /* GlobalAlphaFactorsSUN */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SUN_mesh_array)
-static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 26949, -1 }, /* DrawMeshArraysSUN */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SUN_triangle_list)
-static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  3971, -1 }, /* ReplacementCodeubSUN */
-   {  5600, -1 }, /* ReplacementCodeubvSUN */
-   { 17469, -1 }, /* ReplacementCodeusvSUN */
-   { 17657, -1 }, /* ReplacementCodePointerSUN */
-   { 19828, -1 }, /* ReplacementCodeuiSUN */
-   { 20583, -1 }, /* ReplacementCodeusSUN */
-   { 27594, -1 }, /* ReplacementCodeuivSUN */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_SUN_vertex)
-static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {   999, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1197, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1423, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1699, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  1833, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2346, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  2642, -1 }, /* Color4ubVertex3fvSUN */
-   {  4105, -1 }, /* Color4ubVertex3fSUN */
-   {  4181, -1 }, /* TexCoord2fVertex3fSUN */
-   {  4508, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  4866, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  5495, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  6240, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  6599, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  7311, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8079, -1 }, /* Color3fVertex3fSUN */
-   {  9173, -1 }, /* Color3fVertex3fvSUN */
-   {  9588, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 10325, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11674, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 13218, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13629, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14759, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 15093, -1 }, /* Color4ubVertex2fvSUN */
-   { 15333, -1 }, /* Normal3fVertex3fSUN */
-   { 16329, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 16590, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 17298, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 18074, -1 }, /* Color4ubVertex2fSUN */
-   { 18295, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 20253, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 20651, -1 }, /* Normal3fVertex3fvSUN */
-   { 21080, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 21989, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 23984, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 25209, -1 }, /* TexCoord4fVertex4fSUN */
-   { 25635, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 25986, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 26113, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 26821, -1 }, /* ReplacementCodeuiVertex3fSUN */
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_1_3)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
-   {   381, _gloffset_MultiTexCoord3sARB },
-   {   613, _gloffset_ActiveTextureARB },
-   {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5386, _gloffset_MultiTexCoord3dARB },
-   {  5431, _gloffset_MultiTexCoord2iARB },
-   {  5555, _gloffset_MultiTexCoord2svARB },
-   {  7520, _gloffset_MultiTexCoord2fARB },
-   {  9424, _gloffset_MultiTexCoord3fvARB },
-   {  9981, _gloffset_MultiTexCoord4sARB },
-   { 10615, _gloffset_MultiTexCoord2dvARB },
-   { 10997, _gloffset_MultiTexCoord1svARB },
-   { 11369, _gloffset_MultiTexCoord3svARB },
-   { 11430, _gloffset_MultiTexCoord4iARB },
-   { 12153, _gloffset_MultiTexCoord3iARB },
-   { 12956, _gloffset_MultiTexCoord1dARB },
-   { 13173, _gloffset_MultiTexCoord3dvARB },
-   { 14337, _gloffset_MultiTexCoord3ivARB },
-   { 14382, _gloffset_MultiTexCoord2sARB },
-   { 15680, _gloffset_MultiTexCoord4ivARB },
-   { 17398, _gloffset_ClientActiveTextureARB },
-   { 19681, _gloffset_MultiTexCoord2dARB },
-   { 20122, _gloffset_MultiTexCoord4dvARB },
-   { 20433, _gloffset_MultiTexCoord4fvARB },
-   { 21312, _gloffset_MultiTexCoord3fARB },
-   { 23675, _gloffset_MultiTexCoord4dARB },
-   { 23941, _gloffset_MultiTexCoord1sARB },
-   { 24145, _gloffset_MultiTexCoord1dvARB },
-   { 24955, _gloffset_MultiTexCoord1ivARB },
-   { 25048, _gloffset_MultiTexCoord2ivARB },
-   { 25387, _gloffset_MultiTexCoord1iARB },
-   { 26689, _gloffset_MultiTexCoord4svARB },
-   { 27207, _gloffset_MultiTexCoord1fARB },
-   { 27470, _gloffset_MultiTexCoord4fARB },
-   { 29774, _gloffset_MultiTexCoord2fvARB },
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_1_4)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_1_4_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_1_5)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_1_5_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_2_0)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_2_0_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_2_1)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_2_1_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_3_0)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_3_0_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
-#if defined(need_GL_VERSION_3_1)
-/* functions defined in MESA_remap_table_functions are excluded */
-static const struct gl_function_remap GL_VERSION_3_1_functions[] = {
-   {    -1, -1 }
-};
-#endif
-
+/* DO NOT EDIT - This file generated automatically by remap_helper.py (from Mesa) script */

+

+/*

+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>

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

+ * Chia-I Wu,

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

+ */

+

+#include "main/dispatch.h"

+#include "main/remap.h"

+

+/* this is internal to remap.c */

+#ifdef need_MESA_remap_table

+

+static const char _mesa_function_pool[] =

+   /* _mesa_function_pool[0]: MapGrid1d (offset 224) */

+   "idd\0"

+   "glMapGrid1d\0"

+   "\0"

+   /* _mesa_function_pool[17]: UniformMatrix3fvARB (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix3fv\0"

+   "glUniformMatrix3fvARB\0"

+   "\0"

+   /* _mesa_function_pool[64]: MapGrid1f (offset 225) */

+   "iff\0"

+   "glMapGrid1f\0"

+   "\0"

+   /* _mesa_function_pool[81]: VertexAttribI2iEXT (will be remapped) */

+   "iii\0"

+   "glVertexAttribI2iEXT\0"

+   "glVertexAttribI2i\0"

+   "\0"

+   /* _mesa_function_pool[125]: RasterPos4i (offset 82) */

+   "iiii\0"

+   "glRasterPos4i\0"

+   "\0"

+   /* _mesa_function_pool[145]: RasterPos4d (offset 78) */

+   "dddd\0"

+   "glRasterPos4d\0"

+   "\0"

+   /* _mesa_function_pool[165]: NewList (dynamic) */

+   "ii\0"

+   "glNewList\0"

+   "\0"

+   /* _mesa_function_pool[179]: RasterPos4f (offset 80) */

+   "ffff\0"

+   "glRasterPos4f\0"

+   "\0"

+   /* _mesa_function_pool[199]: LoadIdentity (offset 290) */

+   "\0"

+   "glLoadIdentity\0"

+   "\0"

+   /* _mesa_function_pool[216]: SampleCoverageARB (will be remapped) */

+   "fi\0"

+   "glSampleCoverage\0"

+   "glSampleCoverageARB\0"

+   "\0"

+   /* _mesa_function_pool[257]: ConvolutionFilter1D (offset 348) */

+   "iiiiip\0"

+   "glConvolutionFilter1D\0"

+   "glConvolutionFilter1DEXT\0"

+   "\0"

+   /* _mesa_function_pool[312]: BeginQueryARB (will be remapped) */

+   "ii\0"

+   "glBeginQuery\0"

+   "glBeginQueryARB\0"

+   "\0"

+   /* _mesa_function_pool[345]: RasterPos3dv (offset 71) */

+   "p\0"

+   "glRasterPos3dv\0"

+   "\0"

+   /* _mesa_function_pool[363]: PointParameteriNV (will be remapped) */

+   "ii\0"

+   "glPointParameteri\0"

+   "glPointParameteriNV\0"

+   "\0"

+   /* _mesa_function_pool[405]: GetProgramiv (will be remapped) */

+   "iip\0"

+   "glGetProgramiv\0"

+   "\0"

+   /* _mesa_function_pool[425]: MultiTexCoord3sARB (offset 398) */

+   "iiii\0"

+   "glMultiTexCoord3s\0"

+   "glMultiTexCoord3sARB\0"

+   "\0"

+   /* _mesa_function_pool[470]: SecondaryColor3iEXT (will be remapped) */

+   "iii\0"

+   "glSecondaryColor3i\0"

+   "glSecondaryColor3iEXT\0"

+   "\0"

+   /* _mesa_function_pool[516]: WindowPos3fMESA (will be remapped) */

+   "fff\0"

+   "glWindowPos3f\0"

+   "glWindowPos3fARB\0"

+   "glWindowPos3fMESA\0"

+   "\0"

+   /* _mesa_function_pool[570]: TexCoord1iv (offset 99) */

+   "p\0"

+   "glTexCoord1iv\0"

+   "\0"

+   /* _mesa_function_pool[587]: TexCoord4sv (offset 125) */

+   "p\0"

+   "glTexCoord4sv\0"

+   "\0"

+   /* _mesa_function_pool[604]: RasterPos4s (offset 84) */

+   "iiii\0"

+   "glRasterPos4s\0"

+   "\0"

+   /* _mesa_function_pool[624]: PixelTexGenParameterfvSGIS (will be remapped) */

+   "ip\0"

+   "glPixelTexGenParameterfvSGIS\0"

+   "\0"

+   /* _mesa_function_pool[657]: ActiveTextureARB (offset 374) */

+   "i\0"

+   "glActiveTexture\0"

+   "glActiveTextureARB\0"

+   "\0"

+   /* _mesa_function_pool[695]: BlitFramebufferEXT (will be remapped) */

+   "iiiiiiiiii\0"

+   "glBlitFramebuffer\0"

+   "glBlitFramebufferEXT\0"

+   "\0"

+   /* _mesa_function_pool[746]: TexCoord1f (offset 96) */

+   "f\0"

+   "glTexCoord1f\0"

+   "\0"

+   /* _mesa_function_pool[762]: TexCoord1d (offset 94) */

+   "d\0"

+   "glTexCoord1d\0"

+   "\0"

+   /* _mesa_function_pool[778]: VertexAttrib4ubvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4ubvNV\0"

+   "\0"

+   /* _mesa_function_pool[803]: TexCoord1i (offset 98) */

+   "i\0"

+   "glTexCoord1i\0"

+   "\0"

+   /* _mesa_function_pool[819]: GetProgramNamedParameterdvNV (will be remapped) */

+   "iipp\0"

+   "glGetProgramNamedParameterdvNV\0"

+   "\0"

+   /* _mesa_function_pool[856]: Histogram (offset 367) */

+   "iiii\0"

+   "glHistogram\0"

+   "glHistogramEXT\0"

+   "\0"

+   /* _mesa_function_pool[889]: TexCoord1s (offset 100) */

+   "i\0"

+   "glTexCoord1s\0"

+   "\0"

+   /* _mesa_function_pool[905]: GetMapfv (offset 267) */

+   "iip\0"

+   "glGetMapfv\0"

+   "\0"

+   /* _mesa_function_pool[921]: EvalCoord1f (offset 230) */

+   "f\0"

+   "glEvalCoord1f\0"

+   "\0"

+   /* _mesa_function_pool[938]: FramebufferTexture (will be remapped) */

+   "iiii\0"

+   "glFramebufferTexture\0"

+   "\0"

+   /* _mesa_function_pool[965]: VertexAttribI1ivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI1ivEXT\0"

+   "glVertexAttribI1iv\0"

+   "\0"

+   /* _mesa_function_pool[1010]: TexImage4DSGIS (dynamic) */

+   "iiiiiiiiiip\0"

+   "glTexImage4DSGIS\0"

+   "\0"

+   /* _mesa_function_pool[1040]: PolygonStipple (offset 175) */

+   "p\0"

+   "glPolygonStipple\0"

+   "\0"

+   /* _mesa_function_pool[1060]: WindowPos2dvMESA (will be remapped) */

+   "p\0"

+   "glWindowPos2dv\0"

+   "glWindowPos2dvARB\0"

+   "glWindowPos2dvMESA\0"

+   "\0"

+   /* _mesa_function_pool[1115]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glReplacementCodeuiColor3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[1159]: BlendEquationSeparateEXT (will be remapped) */

+   "ii\0"

+   "glBlendEquationSeparate\0"

+   "glBlendEquationSeparateEXT\0"

+   "glBlendEquationSeparateATI\0"

+   "\0"

+   /* _mesa_function_pool[1241]: ListParameterfSGIX (dynamic) */

+   "iif\0"

+   "glListParameterfSGIX\0"

+   "\0"

+   /* _mesa_function_pool[1267]: SecondaryColor3bEXT (will be remapped) */

+   "iii\0"

+   "glSecondaryColor3b\0"

+   "glSecondaryColor3bEXT\0"

+   "\0"

+   /* _mesa_function_pool[1313]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */

+   "pppp\0"

+   "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[1359]: GetPixelMapfv (offset 271) */

+   "ip\0"

+   "glGetPixelMapfv\0"

+   "\0"

+   /* _mesa_function_pool[1379]: Color3uiv (offset 22) */

+   "p\0"

+   "glColor3uiv\0"

+   "\0"

+   /* _mesa_function_pool[1394]: IsEnabled (offset 286) */

+   "i\0"

+   "glIsEnabled\0"

+   "\0"

+   /* _mesa_function_pool[1409]: VertexAttrib4svNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4svNV\0"

+   "\0"

+   /* _mesa_function_pool[1433]: EvalCoord2fv (offset 235) */

+   "p\0"

+   "glEvalCoord2fv\0"

+   "\0"

+   /* _mesa_function_pool[1451]: GetBufferSubDataARB (will be remapped) */

+   "iiip\0"

+   "glGetBufferSubData\0"

+   "glGetBufferSubDataARB\0"

+   "\0"

+   /* _mesa_function_pool[1498]: BufferSubDataARB (will be remapped) */

+   "iiip\0"

+   "glBufferSubData\0"

+   "glBufferSubDataARB\0"

+   "\0"

+   /* _mesa_function_pool[1539]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glTexCoord2fColor4ubVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[1577]: AttachShader (will be remapped) */

+   "ii\0"

+   "glAttachShader\0"

+   "\0"

+   /* _mesa_function_pool[1596]: VertexAttrib2fARB (will be remapped) */

+   "iff\0"

+   "glVertexAttrib2f\0"

+   "glVertexAttrib2fARB\0"

+   "\0"

+   /* _mesa_function_pool[1638]: GetDebugLogLengthMESA (dynamic) */

+   "iii\0"

+   "glGetDebugLogLengthMESA\0"

+   "\0"

+   /* _mesa_function_pool[1667]: GetMapiv (offset 268) */

+   "iip\0"

+   "glGetMapiv\0"

+   "\0"

+   /* _mesa_function_pool[1683]: VertexAttrib3fARB (will be remapped) */

+   "ifff\0"

+   "glVertexAttrib3f\0"

+   "glVertexAttrib3fARB\0"

+   "\0"

+   /* _mesa_function_pool[1726]: Indexubv (offset 316) */

+   "p\0"

+   "glIndexubv\0"

+   "\0"

+   /* _mesa_function_pool[1740]: GetQueryivARB (will be remapped) */

+   "iip\0"

+   "glGetQueryiv\0"

+   "glGetQueryivARB\0"

+   "\0"

+   /* _mesa_function_pool[1774]: TexImage3D (offset 371) */

+   "iiiiiiiiip\0"

+   "glTexImage3D\0"

+   "glTexImage3DEXT\0"

+   "\0"

+   /* _mesa_function_pool[1815]: BindFragDataLocationEXT (will be remapped) */

+   "iip\0"

+   "glBindFragDataLocationEXT\0"

+   "glBindFragDataLocation\0"

+   "\0"

+   /* _mesa_function_pool[1869]: ReplacementCodeuiVertex3fvSUN (dynamic) */

+   "pp\0"

+   "glReplacementCodeuiVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[1905]: EdgeFlagPointer (offset 312) */

+   "ip\0"

+   "glEdgeFlagPointer\0"

+   "\0"

+   /* _mesa_function_pool[1927]: Color3ubv (offset 20) */

+   "p\0"

+   "glColor3ubv\0"

+   "\0"

+   /* _mesa_function_pool[1942]: GetQueryObjectivARB (will be remapped) */

+   "iip\0"

+   "glGetQueryObjectiv\0"

+   "glGetQueryObjectivARB\0"

+   "\0"

+   /* _mesa_function_pool[1988]: Vertex3dv (offset 135) */

+   "p\0"

+   "glVertex3dv\0"

+   "\0"

+   /* _mesa_function_pool[2003]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[2050]: CompressedTexSubImage2DARB (will be remapped) */

+   "iiiiiiiip\0"

+   "glCompressedTexSubImage2D\0"

+   "glCompressedTexSubImage2DARB\0"

+   "\0"

+   /* _mesa_function_pool[2116]: CombinerOutputNV (will be remapped) */

+   "iiiiiiiiii\0"

+   "glCombinerOutputNV\0"

+   "\0"

+   /* _mesa_function_pool[2147]: VertexAttribs3fvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs3fvNV\0"

+   "\0"

+   /* _mesa_function_pool[2173]: Uniform2fARB (will be remapped) */

+   "iff\0"

+   "glUniform2f\0"

+   "glUniform2fARB\0"

+   "\0"

+   /* _mesa_function_pool[2205]: LightModeliv (offset 166) */

+   "ip\0"

+   "glLightModeliv\0"

+   "\0"

+   /* _mesa_function_pool[2224]: VertexAttrib1svARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib1sv\0"

+   "glVertexAttrib1svARB\0"

+   "\0"

+   /* _mesa_function_pool[2267]: VertexAttribs1dvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs1dvNV\0"

+   "\0"

+   /* _mesa_function_pool[2293]: Uniform2ivARB (will be remapped) */

+   "iip\0"

+   "glUniform2iv\0"

+   "glUniform2ivARB\0"

+   "\0"

+   /* _mesa_function_pool[2327]: GetImageTransformParameterfvHP (dynamic) */

+   "iip\0"

+   "glGetImageTransformParameterfvHP\0"

+   "\0"

+   /* _mesa_function_pool[2365]: Normal3bv (offset 53) */

+   "p\0"

+   "glNormal3bv\0"

+   "\0"

+   /* _mesa_function_pool[2380]: TexGeniv (offset 193) */

+   "iip\0"

+   "glTexGeniv\0"

+   "\0"

+   /* _mesa_function_pool[2396]: WeightubvARB (dynamic) */

+   "ip\0"

+   "glWeightubvARB\0"

+   "\0"

+   /* _mesa_function_pool[2415]: VertexAttrib1fvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib1fvNV\0"

+   "\0"

+   /* _mesa_function_pool[2439]: Vertex3iv (offset 139) */

+   "p\0"

+   "glVertex3iv\0"

+   "\0"

+   /* _mesa_function_pool[2454]: CopyConvolutionFilter1D (offset 354) */

+   "iiiii\0"

+   "glCopyConvolutionFilter1D\0"

+   "glCopyConvolutionFilter1DEXT\0"

+   "\0"

+   /* _mesa_function_pool[2516]: VertexAttribI1uiEXT (will be remapped) */

+   "ii\0"

+   "glVertexAttribI1uiEXT\0"

+   "glVertexAttribI1ui\0"

+   "\0"

+   /* _mesa_function_pool[2561]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */

+   "iffffff\0"

+   "glReplacementCodeuiNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[2609]: DeleteSync (will be remapped) */

+   "i\0"

+   "glDeleteSync\0"

+   "\0"

+   /* _mesa_function_pool[2625]: FragmentMaterialfvSGIX (dynamic) */

+   "iip\0"

+   "glFragmentMaterialfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[2655]: BlendColor (offset 336) */

+   "ffff\0"

+   "glBlendColor\0"

+   "glBlendColorEXT\0"

+   "\0"

+   /* _mesa_function_pool[2690]: UniformMatrix4fvARB (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix4fv\0"

+   "glUniformMatrix4fvARB\0"

+   "\0"

+   /* _mesa_function_pool[2737]: DeleteVertexArraysAPPLE (will be remapped) */

+   "ip\0"

+   "glDeleteVertexArrays\0"

+   "glDeleteVertexArraysAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[2788]: TexBuffer (will be remapped) */

+   "iii\0"

+   "glTexBuffer\0"

+   "\0"

+   /* _mesa_function_pool[2805]: ReadInstrumentsSGIX (dynamic) */

+   "i\0"

+   "glReadInstrumentsSGIX\0"

+   "\0"

+   /* _mesa_function_pool[2830]: CallLists (offset 3) */

+   "iip\0"

+   "glCallLists\0"

+   "\0"

+   /* _mesa_function_pool[2847]: UniformMatrix2x4fv (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix2x4fv\0"

+   "\0"

+   /* _mesa_function_pool[2874]: Color4ubVertex3fvSUN (dynamic) */

+   "pp\0"

+   "glColor4ubVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[2901]: Normal3iv (offset 59) */

+   "p\0"

+   "glNormal3iv\0"

+   "\0"

+   /* _mesa_function_pool[2916]: PassThrough (offset 199) */

+   "f\0"

+   "glPassThrough\0"

+   "\0"

+   /* _mesa_function_pool[2933]: GetVertexAttribIivEXT (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribIivEXT\0"

+   "glGetVertexAttribIiv\0"

+   "\0"

+   /* _mesa_function_pool[2983]: TexParameterIivEXT (will be remapped) */

+   "iip\0"

+   "glTexParameterIivEXT\0"

+   "glTexParameterIiv\0"

+   "\0"

+   /* _mesa_function_pool[3027]: FramebufferTextureLayerEXT (will be remapped) */

+   "iiiii\0"

+   "glFramebufferTextureLayer\0"

+   "glFramebufferTextureLayerEXT\0"

+   "\0"

+   /* _mesa_function_pool[3089]: GetListParameterfvSGIX (dynamic) */

+   "iip\0"

+   "glGetListParameterfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[3119]: Viewport (offset 305) */

+   "iiii\0"

+   "glViewport\0"

+   "\0"

+   /* _mesa_function_pool[3136]: VertexAttrib4NusvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4Nusv\0"

+   "glVertexAttrib4NusvARB\0"

+   "\0"

+   /* _mesa_function_pool[3183]: WindowPos4svMESA (will be remapped) */

+   "p\0"

+   "glWindowPos4svMESA\0"

+   "\0"

+   /* _mesa_function_pool[3205]: CreateProgramObjectARB (will be remapped) */

+   "\0"

+   "glCreateProgramObjectARB\0"

+   "\0"

+   /* _mesa_function_pool[3232]: DeleteTransformFeedbacks (will be remapped) */

+   "ip\0"

+   "glDeleteTransformFeedbacks\0"

+   "\0"

+   /* _mesa_function_pool[3263]: UniformMatrix4x3fv (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix4x3fv\0"

+   "\0"

+   /* _mesa_function_pool[3290]: PrioritizeTextures (offset 331) */

+   "ipp\0"

+   "glPrioritizeTextures\0"

+   "glPrioritizeTexturesEXT\0"

+   "\0"

+   /* _mesa_function_pool[3340]: VertexAttribI3uiEXT (will be remapped) */

+   "iiii\0"

+   "glVertexAttribI3uiEXT\0"

+   "glVertexAttribI3ui\0"

+   "\0"

+   /* _mesa_function_pool[3387]: AsyncMarkerSGIX (dynamic) */

+   "i\0"

+   "glAsyncMarkerSGIX\0"

+   "\0"

+   /* _mesa_function_pool[3408]: GlobalAlphaFactorubSUN (dynamic) */

+   "i\0"

+   "glGlobalAlphaFactorubSUN\0"

+   "\0"

+   /* _mesa_function_pool[3436]: ClearColorIuiEXT (will be remapped) */

+   "iiii\0"

+   "glClearColorIuiEXT\0"

+   "\0"

+   /* _mesa_function_pool[3461]: ClearDebugLogMESA (dynamic) */

+   "iii\0"

+   "glClearDebugLogMESA\0"

+   "\0"

+   /* _mesa_function_pool[3486]: Uniform4uiEXT (will be remapped) */

+   "iiiii\0"

+   "glUniform4uiEXT\0"

+   "glUniform4ui\0"

+   "\0"

+   /* _mesa_function_pool[3522]: ResetHistogram (offset 369) */

+   "i\0"

+   "glResetHistogram\0"

+   "glResetHistogramEXT\0"

+   "\0"

+   /* _mesa_function_pool[3562]: GetProgramNamedParameterfvNV (will be remapped) */

+   "iipp\0"

+   "glGetProgramNamedParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[3599]: PointParameterfEXT (will be remapped) */

+   "if\0"

+   "glPointParameterf\0"

+   "glPointParameterfARB\0"

+   "glPointParameterfEXT\0"

+   "glPointParameterfSGIS\0"

+   "\0"

+   /* _mesa_function_pool[3685]: LoadIdentityDeformationMapSGIX (dynamic) */

+   "i\0"

+   "glLoadIdentityDeformationMapSGIX\0"

+   "\0"

+   /* _mesa_function_pool[3721]: GenFencesNV (will be remapped) */

+   "ip\0"

+   "glGenFencesNV\0"

+   "\0"

+   /* _mesa_function_pool[3739]: ImageTransformParameterfHP (dynamic) */

+   "iif\0"

+   "glImageTransformParameterfHP\0"

+   "\0"

+   /* _mesa_function_pool[3773]: MatrixIndexusvARB (dynamic) */

+   "ip\0"

+   "glMatrixIndexusvARB\0"

+   "\0"

+   /* _mesa_function_pool[3797]: DrawElementsBaseVertex (will be remapped) */

+   "iiipi\0"

+   "glDrawElementsBaseVertex\0"

+   "\0"

+   /* _mesa_function_pool[3829]: DisableVertexAttribArrayARB (will be remapped) */

+   "i\0"

+   "glDisableVertexAttribArray\0"

+   "glDisableVertexAttribArrayARB\0"

+   "\0"

+   /* _mesa_function_pool[3889]: TexCoord2sv (offset 109) */

+   "p\0"

+   "glTexCoord2sv\0"

+   "\0"

+   /* _mesa_function_pool[3906]: Vertex4dv (offset 143) */

+   "p\0"

+   "glVertex4dv\0"

+   "\0"

+   /* _mesa_function_pool[3921]: StencilMaskSeparate (will be remapped) */

+   "ii\0"

+   "glStencilMaskSeparate\0"

+   "\0"

+   /* _mesa_function_pool[3947]: ProgramLocalParameter4dARB (will be remapped) */

+   "iidddd\0"

+   "glProgramLocalParameter4dARB\0"

+   "\0"

+   /* _mesa_function_pool[3984]: CompressedTexImage3DARB (will be remapped) */

+   "iiiiiiiip\0"

+   "glCompressedTexImage3D\0"

+   "glCompressedTexImage3DARB\0"

+   "\0"

+   /* _mesa_function_pool[4044]: Color3sv (offset 18) */

+   "p\0"

+   "glColor3sv\0"

+   "\0"

+   /* _mesa_function_pool[4058]: GetConvolutionParameteriv (offset 358) */

+   "iip\0"

+   "glGetConvolutionParameteriv\0"

+   "glGetConvolutionParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[4122]: VertexAttrib1fARB (will be remapped) */

+   "if\0"

+   "glVertexAttrib1f\0"

+   "glVertexAttrib1fARB\0"

+   "\0"

+   /* _mesa_function_pool[4163]: Vertex2dv (offset 127) */

+   "p\0"

+   "glVertex2dv\0"

+   "\0"

+   /* _mesa_function_pool[4178]: TestFenceNV (will be remapped) */

+   "i\0"

+   "glTestFenceNV\0"

+   "\0"

+   /* _mesa_function_pool[4195]: GetVertexAttribIuivEXT (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribIuivEXT\0"

+   "glGetVertexAttribIuiv\0"

+   "\0"

+   /* _mesa_function_pool[4247]: MultiTexCoord1fvARB (offset 379) */

+   "ip\0"

+   "glMultiTexCoord1fv\0"

+   "glMultiTexCoord1fvARB\0"

+   "\0"

+   /* _mesa_function_pool[4292]: TexCoord3iv (offset 115) */

+   "p\0"

+   "glTexCoord3iv\0"

+   "\0"

+   /* _mesa_function_pool[4309]: Uniform2uivEXT (will be remapped) */

+   "iip\0"

+   "glUniform2uivEXT\0"

+   "glUniform2uiv\0"

+   "\0"

+   /* _mesa_function_pool[4345]: ColorFragmentOp2ATI (will be remapped) */

+   "iiiiiiiiii\0"

+   "glColorFragmentOp2ATI\0"

+   "\0"

+   /* _mesa_function_pool[4379]: SecondaryColorPointerListIBM (dynamic) */

+   "iiipi\0"

+   "glSecondaryColorPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[4417]: GetPixelTexGenParameterivSGIS (will be remapped) */

+   "ip\0"

+   "glGetPixelTexGenParameterivSGIS\0"

+   "\0"

+   /* _mesa_function_pool[4453]: Color3fv (offset 14) */

+   "p\0"

+   "glColor3fv\0"

+   "\0"

+   /* _mesa_function_pool[4467]: VertexAttrib4fNV (will be remapped) */

+   "iffff\0"

+   "glVertexAttrib4fNV\0"

+   "\0"

+   /* _mesa_function_pool[4493]: ReplacementCodeubSUN (dynamic) */

+   "i\0"

+   "glReplacementCodeubSUN\0"

+   "\0"

+   /* _mesa_function_pool[4519]: FinishAsyncSGIX (dynamic) */

+   "p\0"

+   "glFinishAsyncSGIX\0"

+   "\0"

+   /* _mesa_function_pool[4540]: GetDebugLogMESA (dynamic) */

+   "iiiipp\0"

+   "glGetDebugLogMESA\0"

+   "\0"

+   /* _mesa_function_pool[4566]: FogCoorddEXT (will be remapped) */

+   "d\0"

+   "glFogCoordd\0"

+   "glFogCoorddEXT\0"

+   "\0"

+   /* _mesa_function_pool[4596]: BeginConditionalRenderNV (will be remapped) */

+   "ii\0"

+   "glBeginConditionalRenderNV\0"

+   "glBeginConditionalRender\0"

+   "\0"

+   /* _mesa_function_pool[4652]: Color4ubVertex3fSUN (dynamic) */

+   "iiiifff\0"

+   "glColor4ubVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[4683]: FogCoordfEXT (will be remapped) */

+   "f\0"

+   "glFogCoordf\0"

+   "glFogCoordfEXT\0"

+   "\0"

+   /* _mesa_function_pool[4713]: PointSize (offset 173) */

+   "f\0"

+   "glPointSize\0"

+   "\0"

+   /* _mesa_function_pool[4728]: VertexAttribI2uivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI2uivEXT\0"

+   "glVertexAttribI2uiv\0"

+   "\0"

+   /* _mesa_function_pool[4775]: TexCoord2fVertex3fSUN (dynamic) */

+   "fffff\0"

+   "glTexCoord2fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[4806]: PopName (offset 200) */

+   "\0"

+   "glPopName\0"

+   "\0"

+   /* _mesa_function_pool[4818]: GlobalAlphaFactoriSUN (dynamic) */

+   "i\0"

+   "glGlobalAlphaFactoriSUN\0"

+   "\0"

+   /* _mesa_function_pool[4845]: VertexAttrib2dNV (will be remapped) */

+   "idd\0"

+   "glVertexAttrib2dNV\0"

+   "\0"

+   /* _mesa_function_pool[4869]: GetProgramInfoLog (will be remapped) */

+   "iipp\0"

+   "glGetProgramInfoLog\0"

+   "\0"

+   /* _mesa_function_pool[4895]: VertexAttrib4NbvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4Nbv\0"

+   "glVertexAttrib4NbvARB\0"

+   "\0"

+   /* _mesa_function_pool[4940]: GetActiveAttribARB (will be remapped) */

+   "iiipppp\0"

+   "glGetActiveAttrib\0"

+   "glGetActiveAttribARB\0"

+   "\0"

+   /* _mesa_function_pool[4988]: Vertex4sv (offset 149) */

+   "p\0"

+   "glVertex4sv\0"

+   "\0"

+   /* _mesa_function_pool[5003]: VertexAttrib4ubNV (will be remapped) */

+   "iiiii\0"

+   "glVertexAttrib4ubNV\0"

+   "\0"

+   /* _mesa_function_pool[5030]: ClampColor (will be remapped) */

+   "ii\0"

+   "glClampColor\0"

+   "\0"

+   /* _mesa_function_pool[5047]: TextureRangeAPPLE (will be remapped) */

+   "iip\0"

+   "glTextureRangeAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[5072]: GetTexEnvfv (offset 276) */

+   "iip\0"

+   "glGetTexEnvfv\0"

+   "\0"

+   /* _mesa_function_pool[5091]: BindTransformFeedback (will be remapped) */

+   "ii\0"

+   "glBindTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[5119]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */

+   "ffffffffffff\0"

+   "glTexCoord2fColor4fNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[5172]: Indexub (offset 315) */

+   "i\0"

+   "glIndexub\0"

+   "\0"

+   /* _mesa_function_pool[5185]: TexEnvi (offset 186) */

+   "iii\0"

+   "glTexEnvi\0"

+   "\0"

+   /* _mesa_function_pool[5200]: GetClipPlane (offset 259) */

+   "ip\0"

+   "glGetClipPlane\0"

+   "\0"

+   /* _mesa_function_pool[5219]: CombinerParameterfvNV (will be remapped) */

+   "ip\0"

+   "glCombinerParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[5247]: VertexAttribs3dvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs3dvNV\0"

+   "\0"

+   /* _mesa_function_pool[5273]: VertexAttribI2uiEXT (will be remapped) */

+   "iii\0"

+   "glVertexAttribI2uiEXT\0"

+   "glVertexAttribI2ui\0"

+   "\0"

+   /* _mesa_function_pool[5319]: VertexAttribs4fvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs4fvNV\0"

+   "\0"

+   /* _mesa_function_pool[5345]: VertexArrayRangeNV (will be remapped) */

+   "ip\0"

+   "glVertexArrayRangeNV\0"

+   "\0"

+   /* _mesa_function_pool[5370]: FragmentLightiSGIX (dynamic) */

+   "iii\0"

+   "glFragmentLightiSGIX\0"

+   "\0"

+   /* _mesa_function_pool[5396]: PolygonOffsetEXT (will be remapped) */

+   "ff\0"

+   "glPolygonOffsetEXT\0"

+   "\0"

+   /* _mesa_function_pool[5419]: VertexAttribI4uivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI4uivEXT\0"

+   "glVertexAttribI4uiv\0"

+   "\0"

+   /* _mesa_function_pool[5466]: PollAsyncSGIX (dynamic) */

+   "p\0"

+   "glPollAsyncSGIX\0"

+   "\0"

+   /* _mesa_function_pool[5485]: DeleteFragmentShaderATI (will be remapped) */

+   "i\0"

+   "glDeleteFragmentShaderATI\0"

+   "\0"

+   /* _mesa_function_pool[5514]: Scaled (offset 301) */

+   "ddd\0"

+   "glScaled\0"

+   "\0"

+   /* _mesa_function_pool[5528]: ResumeTransformFeedback (will be remapped) */

+   "\0"

+   "glResumeTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[5556]: Scalef (offset 302) */

+   "fff\0"

+   "glScalef\0"

+   "\0"

+   /* _mesa_function_pool[5570]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glTexCoord2fNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[5608]: MultTransposeMatrixdARB (will be remapped) */

+   "p\0"

+   "glMultTransposeMatrixd\0"

+   "glMultTransposeMatrixdARB\0"

+   "\0"

+   /* _mesa_function_pool[5660]: ColorMaskIndexedEXT (will be remapped) */

+   "iiiii\0"

+   "glColorMaskIndexedEXT\0"

+   "glColorMaski\0"

+   "\0"

+   /* _mesa_function_pool[5702]: ObjectUnpurgeableAPPLE (will be remapped) */

+   "iii\0"

+   "glObjectUnpurgeableAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[5732]: AlphaFunc (offset 240) */

+   "if\0"

+   "glAlphaFunc\0"

+   "\0"

+   /* _mesa_function_pool[5748]: WindowPos2svMESA (will be remapped) */

+   "p\0"

+   "glWindowPos2sv\0"

+   "glWindowPos2svARB\0"

+   "glWindowPos2svMESA\0"

+   "\0"

+   /* _mesa_function_pool[5803]: EdgeFlag (offset 41) */

+   "i\0"

+   "glEdgeFlag\0"

+   "\0"

+   /* _mesa_function_pool[5817]: TexCoord2iv (offset 107) */

+   "p\0"

+   "glTexCoord2iv\0"

+   "\0"

+   /* _mesa_function_pool[5834]: CompressedTexImage1DARB (will be remapped) */

+   "iiiiiip\0"

+   "glCompressedTexImage1D\0"

+   "glCompressedTexImage1DARB\0"

+   "\0"

+   /* _mesa_function_pool[5892]: Rotated (offset 299) */

+   "dddd\0"

+   "glRotated\0"

+   "\0"

+   /* _mesa_function_pool[5908]: GetTexParameterIuivEXT (will be remapped) */

+   "iip\0"

+   "glGetTexParameterIuivEXT\0"

+   "glGetTexParameterIuiv\0"

+   "\0"

+   /* _mesa_function_pool[5960]: VertexAttrib2sNV (will be remapped) */

+   "iii\0"

+   "glVertexAttrib2sNV\0"

+   "\0"

+   /* _mesa_function_pool[5984]: ReadPixels (offset 256) */

+   "iiiiiip\0"

+   "glReadPixels\0"

+   "\0"

+   /* _mesa_function_pool[6006]: EdgeFlagv (offset 42) */

+   "p\0"

+   "glEdgeFlagv\0"

+   "\0"

+   /* _mesa_function_pool[6021]: NormalPointerListIBM (dynamic) */

+   "iipi\0"

+   "glNormalPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[6050]: IndexPointerEXT (will be remapped) */

+   "iiip\0"

+   "glIndexPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[6074]: Color4iv (offset 32) */

+   "p\0"

+   "glColor4iv\0"

+   "\0"

+   /* _mesa_function_pool[6088]: TexParameterf (offset 178) */

+   "iif\0"

+   "glTexParameterf\0"

+   "\0"

+   /* _mesa_function_pool[6109]: TexParameteri (offset 180) */

+   "iii\0"

+   "glTexParameteri\0"

+   "\0"

+   /* _mesa_function_pool[6130]: NormalPointerEXT (will be remapped) */

+   "iiip\0"

+   "glNormalPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[6155]: MultiTexCoord3dARB (offset 392) */

+   "iddd\0"

+   "glMultiTexCoord3d\0"

+   "glMultiTexCoord3dARB\0"

+   "\0"

+   /* _mesa_function_pool[6200]: MultiTexCoord2iARB (offset 388) */

+   "iii\0"

+   "glMultiTexCoord2i\0"

+   "glMultiTexCoord2iARB\0"

+   "\0"

+   /* _mesa_function_pool[6244]: DrawPixels (offset 257) */

+   "iiiip\0"

+   "glDrawPixels\0"

+   "\0"

+   /* _mesa_function_pool[6264]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */

+   "iffffffff\0"

+   "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[6324]: MultiTexCoord2svARB (offset 391) */

+   "ip\0"

+   "glMultiTexCoord2sv\0"

+   "glMultiTexCoord2svARB\0"

+   "\0"

+   /* _mesa_function_pool[6369]: ReplacementCodeubvSUN (dynamic) */

+   "p\0"

+   "glReplacementCodeubvSUN\0"

+   "\0"

+   /* _mesa_function_pool[6396]: Uniform3iARB (will be remapped) */

+   "iiii\0"

+   "glUniform3i\0"

+   "glUniform3iARB\0"

+   "\0"

+   /* _mesa_function_pool[6429]: DrawTransformFeedback (will be remapped) */

+   "ii\0"

+   "glDrawTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[6457]: DrawElementsInstancedARB (will be remapped) */

+   "iiipi\0"

+   "glDrawElementsInstancedARB\0"

+   "glDrawElementsInstancedEXT\0"

+   "glDrawElementsInstanced\0"

+   "\0"

+   /* _mesa_function_pool[6542]: GetShaderInfoLog (will be remapped) */

+   "iipp\0"

+   "glGetShaderInfoLog\0"

+   "\0"

+   /* _mesa_function_pool[6567]: WeightivARB (dynamic) */

+   "ip\0"

+   "glWeightivARB\0"

+   "\0"

+   /* _mesa_function_pool[6585]: PollInstrumentsSGIX (dynamic) */

+   "p\0"

+   "glPollInstrumentsSGIX\0"

+   "\0"

+   /* _mesa_function_pool[6610]: GlobalAlphaFactordSUN (dynamic) */

+   "d\0"

+   "glGlobalAlphaFactordSUN\0"

+   "\0"

+   /* _mesa_function_pool[6637]: GetFinalCombinerInputParameterfvNV (will be remapped) */

+   "iip\0"

+   "glGetFinalCombinerInputParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[6679]: GenerateMipmapEXT (will be remapped) */

+   "i\0"

+   "glGenerateMipmap\0"

+   "glGenerateMipmapEXT\0"

+   "\0"

+   /* _mesa_function_pool[6719]: GenLists (offset 5) */

+   "i\0"

+   "glGenLists\0"

+   "\0"

+   /* _mesa_function_pool[6733]: SetFragmentShaderConstantATI (will be remapped) */

+   "ip\0"

+   "glSetFragmentShaderConstantATI\0"

+   "\0"

+   /* _mesa_function_pool[6768]: GetMapAttribParameterivNV (dynamic) */

+   "iiip\0"

+   "glGetMapAttribParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[6802]: CreateShaderObjectARB (will be remapped) */

+   "i\0"

+   "glCreateShaderObjectARB\0"

+   "\0"

+   /* _mesa_function_pool[6829]: GetSharpenTexFuncSGIS (dynamic) */

+   "ip\0"

+   "glGetSharpenTexFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[6857]: BufferDataARB (will be remapped) */

+   "iipi\0"

+   "glBufferData\0"

+   "glBufferDataARB\0"

+   "\0"

+   /* _mesa_function_pool[6892]: FlushVertexArrayRangeNV (will be remapped) */

+   "\0"

+   "glFlushVertexArrayRangeNV\0"

+   "\0"

+   /* _mesa_function_pool[6920]: MapGrid2d (offset 226) */

+   "iddidd\0"

+   "glMapGrid2d\0"

+   "\0"

+   /* _mesa_function_pool[6940]: MapGrid2f (offset 227) */

+   "iffiff\0"

+   "glMapGrid2f\0"

+   "\0"

+   /* _mesa_function_pool[6960]: SampleMapATI (will be remapped) */

+   "iii\0"

+   "glSampleMapATI\0"

+   "\0"

+   /* _mesa_function_pool[6980]: VertexPointerEXT (will be remapped) */

+   "iiiip\0"

+   "glVertexPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[7006]: GetTexFilterFuncSGIS (dynamic) */

+   "iip\0"

+   "glGetTexFilterFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[7034]: Scissor (offset 176) */

+   "iiii\0"

+   "glScissor\0"

+   "\0"

+   /* _mesa_function_pool[7050]: Fogf (offset 153) */

+   "if\0"

+   "glFogf\0"

+   "\0"

+   /* _mesa_function_pool[7061]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glReplacementCodeuiColor4ubVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[7106]: TexSubImage1D (offset 332) */

+   "iiiiiip\0"

+   "glTexSubImage1D\0"

+   "glTexSubImage1DEXT\0"

+   "\0"

+   /* _mesa_function_pool[7150]: VertexAttrib1sARB (will be remapped) */

+   "ii\0"

+   "glVertexAttrib1s\0"

+   "glVertexAttrib1sARB\0"

+   "\0"

+   /* _mesa_function_pool[7191]: FenceSync (will be remapped) */

+   "ii\0"

+   "glFenceSync\0"

+   "\0"

+   /* _mesa_function_pool[7207]: Color4usv (offset 40) */

+   "p\0"

+   "glColor4usv\0"

+   "\0"

+   /* _mesa_function_pool[7222]: Fogi (offset 155) */

+   "ii\0"

+   "glFogi\0"

+   "\0"

+   /* _mesa_function_pool[7233]: DepthRange (offset 288) */

+   "dd\0"

+   "glDepthRange\0"

+   "\0"

+   /* _mesa_function_pool[7250]: RasterPos3iv (offset 75) */

+   "p\0"

+   "glRasterPos3iv\0"

+   "\0"

+   /* _mesa_function_pool[7268]: FinalCombinerInputNV (will be remapped) */

+   "iiii\0"

+   "glFinalCombinerInputNV\0"

+   "\0"

+   /* _mesa_function_pool[7297]: TexCoord2i (offset 106) */

+   "ii\0"

+   "glTexCoord2i\0"

+   "\0"

+   /* _mesa_function_pool[7314]: PixelMapfv (offset 251) */

+   "iip\0"

+   "glPixelMapfv\0"

+   "\0"

+   /* _mesa_function_pool[7332]: Color4ui (offset 37) */

+   "iiii\0"

+   "glColor4ui\0"

+   "\0"

+   /* _mesa_function_pool[7349]: RasterPos3s (offset 76) */

+   "iii\0"

+   "glRasterPos3s\0"

+   "\0"

+   /* _mesa_function_pool[7368]: Color3usv (offset 24) */

+   "p\0"

+   "glColor3usv\0"

+   "\0"

+   /* _mesa_function_pool[7383]: FlushRasterSGIX (dynamic) */

+   "\0"

+   "glFlushRasterSGIX\0"

+   "\0"

+   /* _mesa_function_pool[7403]: TexCoord2f (offset 104) */

+   "ff\0"

+   "glTexCoord2f\0"

+   "\0"

+   /* _mesa_function_pool[7420]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */

+   "ifffff\0"

+   "glReplacementCodeuiTexCoord2fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[7469]: TexCoord2d (offset 102) */

+   "dd\0"

+   "glTexCoord2d\0"

+   "\0"

+   /* _mesa_function_pool[7486]: RasterPos3d (offset 70) */

+   "ddd\0"

+   "glRasterPos3d\0"

+   "\0"

+   /* _mesa_function_pool[7505]: RasterPos3f (offset 72) */

+   "fff\0"

+   "glRasterPos3f\0"

+   "\0"

+   /* _mesa_function_pool[7524]: Uniform1fARB (will be remapped) */

+   "if\0"

+   "glUniform1f\0"

+   "glUniform1fARB\0"

+   "\0"

+   /* _mesa_function_pool[7555]: AreTexturesResident (offset 322) */

+   "ipp\0"

+   "glAreTexturesResident\0"

+   "glAreTexturesResidentEXT\0"

+   "\0"

+   /* _mesa_function_pool[7607]: TexCoord2s (offset 108) */

+   "ii\0"

+   "glTexCoord2s\0"

+   "\0"

+   /* _mesa_function_pool[7624]: StencilOpSeparate (will be remapped) */

+   "iiii\0"

+   "glStencilOpSeparate\0"

+   "glStencilOpSeparateATI\0"

+   "\0"

+   /* _mesa_function_pool[7673]: ColorTableParameteriv (offset 341) */

+   "iip\0"

+   "glColorTableParameteriv\0"

+   "glColorTableParameterivSGI\0"

+   "\0"

+   /* _mesa_function_pool[7729]: FogCoordPointerListIBM (dynamic) */

+   "iipi\0"

+   "glFogCoordPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[7760]: WindowPos3dMESA (will be remapped) */

+   "ddd\0"

+   "glWindowPos3d\0"

+   "glWindowPos3dARB\0"

+   "glWindowPos3dMESA\0"

+   "\0"

+   /* _mesa_function_pool[7814]: Color4us (offset 39) */

+   "iiii\0"

+   "glColor4us\0"

+   "\0"

+   /* _mesa_function_pool[7831]: PointParameterfvEXT (will be remapped) */

+   "ip\0"

+   "glPointParameterfv\0"

+   "glPointParameterfvARB\0"

+   "glPointParameterfvEXT\0"

+   "glPointParameterfvSGIS\0"

+   "\0"

+   /* _mesa_function_pool[7921]: Color3bv (offset 10) */

+   "p\0"

+   "glColor3bv\0"

+   "\0"

+   /* _mesa_function_pool[7935]: WindowPos2fvMESA (will be remapped) */

+   "p\0"

+   "glWindowPos2fv\0"

+   "glWindowPos2fvARB\0"

+   "glWindowPos2fvMESA\0"

+   "\0"

+   /* _mesa_function_pool[7990]: SecondaryColor3bvEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3bv\0"

+   "glSecondaryColor3bvEXT\0"

+   "\0"

+   /* _mesa_function_pool[8036]: VertexPointerListIBM (dynamic) */

+   "iiipi\0"

+   "glVertexPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[8066]: GetProgramLocalParameterfvARB (will be remapped) */

+   "iip\0"

+   "glGetProgramLocalParameterfvARB\0"

+   "\0"

+   /* _mesa_function_pool[8103]: FragmentMaterialfSGIX (dynamic) */

+   "iif\0"

+   "glFragmentMaterialfSGIX\0"

+   "\0"

+   /* _mesa_function_pool[8132]: TexCoord2fNormal3fVertex3fSUN (dynamic) */

+   "ffffffff\0"

+   "glTexCoord2fNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[8174]: RenderbufferStorageEXT (will be remapped) */

+   "iiii\0"

+   "glRenderbufferStorage\0"

+   "glRenderbufferStorageEXT\0"

+   "\0"

+   /* _mesa_function_pool[8227]: IsFenceNV (will be remapped) */

+   "i\0"

+   "glIsFenceNV\0"

+   "\0"

+   /* _mesa_function_pool[8242]: AttachObjectARB (will be remapped) */

+   "ii\0"

+   "glAttachObjectARB\0"

+   "\0"

+   /* _mesa_function_pool[8264]: GetFragmentLightivSGIX (dynamic) */

+   "iip\0"

+   "glGetFragmentLightivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[8294]: UniformMatrix2fvARB (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix2fv\0"

+   "glUniformMatrix2fvARB\0"

+   "\0"

+   /* _mesa_function_pool[8341]: MultiTexCoord2fARB (offset 386) */

+   "iff\0"

+   "glMultiTexCoord2f\0"

+   "glMultiTexCoord2fARB\0"

+   "\0"

+   /* _mesa_function_pool[8385]: ColorTable (offset 339) */

+   "iiiiip\0"

+   "glColorTable\0"

+   "glColorTableSGI\0"

+   "glColorTableEXT\0"

+   "\0"

+   /* _mesa_function_pool[8438]: IndexPointer (offset 314) */

+   "iip\0"

+   "glIndexPointer\0"

+   "\0"

+   /* _mesa_function_pool[8458]: Accum (offset 213) */

+   "if\0"

+   "glAccum\0"

+   "\0"

+   /* _mesa_function_pool[8470]: GetTexImage (offset 281) */

+   "iiiip\0"

+   "glGetTexImage\0"

+   "\0"

+   /* _mesa_function_pool[8491]: MapControlPointsNV (dynamic) */

+   "iiiiiiiip\0"

+   "glMapControlPointsNV\0"

+   "\0"

+   /* _mesa_function_pool[8523]: ConvolutionFilter2D (offset 349) */

+   "iiiiiip\0"

+   "glConvolutionFilter2D\0"

+   "glConvolutionFilter2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[8579]: Finish (offset 216) */

+   "\0"

+   "glFinish\0"

+   "\0"

+   /* _mesa_function_pool[8590]: MapParameterfvNV (dynamic) */

+   "iip\0"

+   "glMapParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[8614]: ClearStencil (offset 207) */

+   "i\0"

+   "glClearStencil\0"

+   "\0"

+   /* _mesa_function_pool[8632]: VertexAttrib3dvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib3dv\0"

+   "glVertexAttrib3dvARB\0"

+   "\0"

+   /* _mesa_function_pool[8675]: Uniform4uivEXT (will be remapped) */

+   "iip\0"

+   "glUniform4uivEXT\0"

+   "glUniform4uiv\0"

+   "\0"

+   /* _mesa_function_pool[8711]: HintPGI (dynamic) */

+   "ii\0"

+   "glHintPGI\0"

+   "\0"

+   /* _mesa_function_pool[8725]: ConvolutionParameteriv (offset 353) */

+   "iip\0"

+   "glConvolutionParameteriv\0"

+   "glConvolutionParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[8783]: Color4s (offset 33) */

+   "iiii\0"

+   "glColor4s\0"

+   "\0"

+   /* _mesa_function_pool[8799]: InterleavedArrays (offset 317) */

+   "iip\0"

+   "glInterleavedArrays\0"

+   "\0"

+   /* _mesa_function_pool[8824]: RasterPos2fv (offset 65) */

+   "p\0"

+   "glRasterPos2fv\0"

+   "\0"

+   /* _mesa_function_pool[8842]: TexCoord1fv (offset 97) */

+   "p\0"

+   "glTexCoord1fv\0"

+   "\0"

+   /* _mesa_function_pool[8859]: Vertex2d (offset 126) */

+   "dd\0"

+   "glVertex2d\0"

+   "\0"

+   /* _mesa_function_pool[8874]: CullParameterdvEXT (dynamic) */

+   "ip\0"

+   "glCullParameterdvEXT\0"

+   "\0"

+   /* _mesa_function_pool[8899]: ProgramNamedParameter4fNV (will be remapped) */

+   "iipffff\0"

+   "glProgramNamedParameter4fNV\0"

+   "\0"

+   /* _mesa_function_pool[8936]: Color3fVertex3fSUN (dynamic) */

+   "ffffff\0"

+   "glColor3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[8965]: ProgramEnvParameter4fvARB (will be remapped) */

+   "iip\0"

+   "glProgramEnvParameter4fvARB\0"

+   "glProgramParameter4fvNV\0"

+   "\0"

+   /* _mesa_function_pool[9022]: Color4i (offset 31) */

+   "iiii\0"

+   "glColor4i\0"

+   "\0"

+   /* _mesa_function_pool[9038]: Color4f (offset 29) */

+   "ffff\0"

+   "glColor4f\0"

+   "\0"

+   /* _mesa_function_pool[9054]: RasterPos4fv (offset 81) */

+   "p\0"

+   "glRasterPos4fv\0"

+   "\0"

+   /* _mesa_function_pool[9072]: Color4d (offset 27) */

+   "dddd\0"

+   "glColor4d\0"

+   "\0"

+   /* _mesa_function_pool[9088]: ClearIndex (offset 205) */

+   "f\0"

+   "glClearIndex\0"

+   "\0"

+   /* _mesa_function_pool[9104]: Color4b (offset 25) */

+   "iiii\0"

+   "glColor4b\0"

+   "\0"

+   /* _mesa_function_pool[9120]: LoadMatrixd (offset 292) */

+   "p\0"

+   "glLoadMatrixd\0"

+   "\0"

+   /* _mesa_function_pool[9137]: FragmentLightModeliSGIX (dynamic) */

+   "ii\0"

+   "glFragmentLightModeliSGIX\0"

+   "\0"

+   /* _mesa_function_pool[9167]: RasterPos2dv (offset 63) */

+   "p\0"

+   "glRasterPos2dv\0"

+   "\0"

+   /* _mesa_function_pool[9185]: ConvolutionParameterfv (offset 351) */

+   "iip\0"

+   "glConvolutionParameterfv\0"

+   "glConvolutionParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[9243]: TbufferMask3DFX (dynamic) */

+   "i\0"

+   "glTbufferMask3DFX\0"

+   "\0"

+   /* _mesa_function_pool[9264]: GetTexGendv (offset 278) */

+   "iip\0"

+   "glGetTexGendv\0"

+   "\0"

+   /* _mesa_function_pool[9283]: GetVertexAttribfvNV (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribfvNV\0"

+   "\0"

+   /* _mesa_function_pool[9310]: BeginTransformFeedbackEXT (will be remapped) */

+   "i\0"

+   "glBeginTransformFeedbackEXT\0"

+   "glBeginTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[9366]: LoadProgramNV (will be remapped) */

+   "iiip\0"

+   "glLoadProgramNV\0"

+   "\0"

+   /* _mesa_function_pool[9388]: WaitSync (will be remapped) */

+   "iii\0"

+   "glWaitSync\0"

+   "\0"

+   /* _mesa_function_pool[9404]: EndList (offset 1) */

+   "\0"

+   "glEndList\0"

+   "\0"

+   /* _mesa_function_pool[9416]: VertexAttrib4fvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4fvNV\0"

+   "\0"

+   /* _mesa_function_pool[9440]: GetAttachedObjectsARB (will be remapped) */

+   "iipp\0"

+   "glGetAttachedObjectsARB\0"

+   "\0"

+   /* _mesa_function_pool[9470]: Uniform3fvARB (will be remapped) */

+   "iip\0"

+   "glUniform3fv\0"

+   "glUniform3fvARB\0"

+   "\0"

+   /* _mesa_function_pool[9504]: EvalCoord1fv (offset 231) */

+   "p\0"

+   "glEvalCoord1fv\0"

+   "\0"

+   /* _mesa_function_pool[9522]: DrawRangeElements (offset 338) */

+   "iiiiip\0"

+   "glDrawRangeElements\0"

+   "glDrawRangeElementsEXT\0"

+   "\0"

+   /* _mesa_function_pool[9573]: EvalMesh2 (offset 238) */

+   "iiiii\0"

+   "glEvalMesh2\0"

+   "\0"

+   /* _mesa_function_pool[9592]: Vertex4fv (offset 145) */

+   "p\0"

+   "glVertex4fv\0"

+   "\0"

+   /* _mesa_function_pool[9607]: GenTransformFeedbacks (will be remapped) */

+   "ip\0"

+   "glGenTransformFeedbacks\0"

+   "\0"

+   /* _mesa_function_pool[9635]: SpriteParameterfvSGIX (dynamic) */

+   "ip\0"

+   "glSpriteParameterfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[9663]: CheckFramebufferStatusEXT (will be remapped) */

+   "i\0"

+   "glCheckFramebufferStatus\0"

+   "glCheckFramebufferStatusEXT\0"

+   "\0"

+   /* _mesa_function_pool[9719]: GlobalAlphaFactoruiSUN (dynamic) */

+   "i\0"

+   "glGlobalAlphaFactoruiSUN\0"

+   "\0"

+   /* _mesa_function_pool[9747]: GetHandleARB (will be remapped) */

+   "i\0"

+   "glGetHandleARB\0"

+   "\0"

+   /* _mesa_function_pool[9765]: GetVertexAttribivARB (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribiv\0"

+   "glGetVertexAttribivARB\0"

+   "\0"

+   /* _mesa_function_pool[9813]: GetCombinerInputParameterfvNV (will be remapped) */

+   "iiiip\0"

+   "glGetCombinerInputParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[9852]: GetTexParameterIivEXT (will be remapped) */

+   "iip\0"

+   "glGetTexParameterIivEXT\0"

+   "glGetTexParameterIiv\0"

+   "\0"

+   /* _mesa_function_pool[9902]: CreateProgram (will be remapped) */

+   "\0"

+   "glCreateProgram\0"

+   "\0"

+   /* _mesa_function_pool[9920]: LoadTransposeMatrixdARB (will be remapped) */

+   "p\0"

+   "glLoadTransposeMatrixd\0"

+   "glLoadTransposeMatrixdARB\0"

+   "\0"

+   /* _mesa_function_pool[9972]: GetMinmax (offset 364) */

+   "iiiip\0"

+   "glGetMinmax\0"

+   "glGetMinmaxEXT\0"

+   "\0"

+   /* _mesa_function_pool[10006]: StencilFuncSeparate (will be remapped) */

+   "iiii\0"

+   "glStencilFuncSeparate\0"

+   "\0"

+   /* _mesa_function_pool[10034]: SecondaryColor3sEXT (will be remapped) */

+   "iii\0"

+   "glSecondaryColor3s\0"

+   "glSecondaryColor3sEXT\0"

+   "\0"

+   /* _mesa_function_pool[10080]: Color3fVertex3fvSUN (dynamic) */

+   "pp\0"

+   "glColor3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[10106]: GetInteger64i_v (will be remapped) */

+   "iip\0"

+   "glGetInteger64i_v\0"

+   "\0"

+   /* _mesa_function_pool[10129]: Normal3fv (offset 57) */

+   "p\0"

+   "glNormal3fv\0"

+   "\0"

+   /* _mesa_function_pool[10144]: GlobalAlphaFactorbSUN (dynamic) */

+   "i\0"

+   "glGlobalAlphaFactorbSUN\0"

+   "\0"

+   /* _mesa_function_pool[10171]: Color3us (offset 23) */

+   "iii\0"

+   "glColor3us\0"

+   "\0"

+   /* _mesa_function_pool[10187]: ImageTransformParameterfvHP (dynamic) */

+   "iip\0"

+   "glImageTransformParameterfvHP\0"

+   "\0"

+   /* _mesa_function_pool[10222]: VertexAttrib4ivARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4iv\0"

+   "glVertexAttrib4ivARB\0"

+   "\0"

+   /* _mesa_function_pool[10265]: End (offset 43) */

+   "\0"

+   "glEnd\0"

+   "\0"

+   /* _mesa_function_pool[10273]: VertexAttrib3fNV (will be remapped) */

+   "ifff\0"

+   "glVertexAttrib3fNV\0"

+   "\0"

+   /* _mesa_function_pool[10298]: VertexAttribs2dvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs2dvNV\0"

+   "\0"

+   /* _mesa_function_pool[10324]: GetQueryObjectui64vEXT (will be remapped) */

+   "iip\0"

+   "glGetQueryObjectui64vEXT\0"

+   "\0"

+   /* _mesa_function_pool[10354]: MultiTexCoord3fvARB (offset 395) */

+   "ip\0"

+   "glMultiTexCoord3fv\0"

+   "glMultiTexCoord3fvARB\0"

+   "\0"

+   /* _mesa_function_pool[10399]: SecondaryColor3dEXT (will be remapped) */

+   "ddd\0"

+   "glSecondaryColor3d\0"

+   "glSecondaryColor3dEXT\0"

+   "\0"

+   /* _mesa_function_pool[10445]: Color3ub (offset 19) */

+   "iii\0"

+   "glColor3ub\0"

+   "\0"

+   /* _mesa_function_pool[10461]: GetProgramParameterfvNV (will be remapped) */

+   "iiip\0"

+   "glGetProgramParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[10493]: TangentPointerEXT (dynamic) */

+   "iip\0"

+   "glTangentPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[10518]: Color4fNormal3fVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glColor4fNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[10553]: GetInstrumentsSGIX (dynamic) */

+   "\0"

+   "glGetInstrumentsSGIX\0"

+   "\0"

+   /* _mesa_function_pool[10576]: GetUniformuivEXT (will be remapped) */

+   "iip\0"

+   "glGetUniformuivEXT\0"

+   "glGetUniformuiv\0"

+   "\0"

+   /* _mesa_function_pool[10616]: Color3ui (offset 21) */

+   "iii\0"

+   "glColor3ui\0"

+   "\0"

+   /* _mesa_function_pool[10632]: EvalMapsNV (dynamic) */

+   "ii\0"

+   "glEvalMapsNV\0"

+   "\0"

+   /* _mesa_function_pool[10649]: TexSubImage2D (offset 333) */

+   "iiiiiiiip\0"

+   "glTexSubImage2D\0"

+   "glTexSubImage2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[10695]: FragmentLightivSGIX (dynamic) */

+   "iip\0"

+   "glFragmentLightivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[10722]: GetTexParameterPointervAPPLE (will be remapped) */

+   "iip\0"

+   "glGetTexParameterPointervAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[10758]: TexGenfv (offset 191) */

+   "iip\0"

+   "glTexGenfv\0"

+   "\0"

+   /* _mesa_function_pool[10774]: GetTransformFeedbackVaryingEXT (will be remapped) */

+   "iiipppp\0"

+   "glGetTransformFeedbackVaryingEXT\0"

+   "glGetTransformFeedbackVarying\0"

+   "\0"

+   /* _mesa_function_pool[10846]: VertexAttrib4bvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4bv\0"

+   "glVertexAttrib4bvARB\0"

+   "\0"

+   /* _mesa_function_pool[10889]: AlphaFragmentOp2ATI (will be remapped) */

+   "iiiiiiiii\0"

+   "glAlphaFragmentOp2ATI\0"

+   "\0"

+   /* _mesa_function_pool[10922]: GetIntegerIndexedvEXT (will be remapped) */

+   "iip\0"

+   "glGetIntegerIndexedvEXT\0"

+   "glGetIntegeri_v\0"

+   "\0"

+   /* _mesa_function_pool[10967]: MultiTexCoord4sARB (offset 406) */

+   "iiiii\0"

+   "glMultiTexCoord4s\0"

+   "glMultiTexCoord4sARB\0"

+   "\0"

+   /* _mesa_function_pool[11013]: GetFragmentMaterialivSGIX (dynamic) */

+   "iip\0"

+   "glGetFragmentMaterialivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[11046]: WindowPos4dMESA (will be remapped) */

+   "dddd\0"

+   "glWindowPos4dMESA\0"

+   "\0"

+   /* _mesa_function_pool[11070]: WeightPointerARB (dynamic) */

+   "iiip\0"

+   "glWeightPointerARB\0"

+   "\0"

+   /* _mesa_function_pool[11095]: WindowPos2dMESA (will be remapped) */

+   "dd\0"

+   "glWindowPos2d\0"

+   "glWindowPos2dARB\0"

+   "glWindowPos2dMESA\0"

+   "\0"

+   /* _mesa_function_pool[11148]: FramebufferTexture3DEXT (will be remapped) */

+   "iiiiii\0"

+   "glFramebufferTexture3D\0"

+   "glFramebufferTexture3DEXT\0"

+   "\0"

+   /* _mesa_function_pool[11205]: BlendEquation (offset 337) */

+   "i\0"

+   "glBlendEquation\0"

+   "glBlendEquationEXT\0"

+   "\0"

+   /* _mesa_function_pool[11243]: VertexAttrib3dNV (will be remapped) */

+   "iddd\0"

+   "glVertexAttrib3dNV\0"

+   "\0"

+   /* _mesa_function_pool[11268]: VertexAttrib3dARB (will be remapped) */

+   "iddd\0"

+   "glVertexAttrib3d\0"

+   "glVertexAttrib3dARB\0"

+   "\0"

+   /* _mesa_function_pool[11311]: VertexAttribI4usvEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI4usvEXT\0"

+   "glVertexAttribI4usv\0"

+   "\0"

+   /* _mesa_function_pool[11358]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */

+   "ppppp\0"

+   "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[11422]: VertexAttrib4fARB (will be remapped) */

+   "iffff\0"

+   "glVertexAttrib4f\0"

+   "glVertexAttrib4fARB\0"

+   "\0"

+   /* _mesa_function_pool[11466]: GetError (offset 261) */

+   "\0"

+   "glGetError\0"

+   "\0"

+   /* _mesa_function_pool[11479]: IndexFuncEXT (dynamic) */

+   "if\0"

+   "glIndexFuncEXT\0"

+   "\0"

+   /* _mesa_function_pool[11498]: TexCoord3dv (offset 111) */

+   "p\0"

+   "glTexCoord3dv\0"

+   "\0"

+   /* _mesa_function_pool[11515]: Indexdv (offset 45) */

+   "p\0"

+   "glIndexdv\0"

+   "\0"

+   /* _mesa_function_pool[11528]: FramebufferTexture2DEXT (will be remapped) */

+   "iiiii\0"

+   "glFramebufferTexture2D\0"

+   "glFramebufferTexture2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[11584]: Normal3s (offset 60) */

+   "iii\0"

+   "glNormal3s\0"

+   "\0"

+   /* _mesa_function_pool[11600]: GetObjectParameterivAPPLE (will be remapped) */

+   "iiip\0"

+   "glGetObjectParameterivAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[11634]: PushName (offset 201) */

+   "i\0"

+   "glPushName\0"

+   "\0"

+   /* _mesa_function_pool[11648]: MultiTexCoord2dvARB (offset 385) */

+   "ip\0"

+   "glMultiTexCoord2dv\0"

+   "glMultiTexCoord2dvARB\0"

+   "\0"

+   /* _mesa_function_pool[11693]: CullParameterfvEXT (dynamic) */

+   "ip\0"

+   "glCullParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[11718]: Normal3i (offset 58) */

+   "iii\0"

+   "glNormal3i\0"

+   "\0"

+   /* _mesa_function_pool[11734]: ProgramNamedParameter4fvNV (will be remapped) */

+   "iipp\0"

+   "glProgramNamedParameter4fvNV\0"

+   "\0"

+   /* _mesa_function_pool[11769]: SecondaryColorPointerEXT (will be remapped) */

+   "iiip\0"

+   "glSecondaryColorPointer\0"

+   "glSecondaryColorPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[11826]: VertexAttrib4fvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4fv\0"

+   "glVertexAttrib4fvARB\0"

+   "\0"

+   /* _mesa_function_pool[11869]: ColorPointerListIBM (dynamic) */

+   "iiipi\0"

+   "glColorPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[11898]: GetActiveUniformARB (will be remapped) */

+   "iiipppp\0"

+   "glGetActiveUniform\0"

+   "glGetActiveUniformARB\0"

+   "\0"

+   /* _mesa_function_pool[11948]: ImageTransformParameteriHP (dynamic) */

+   "iii\0"

+   "glImageTransformParameteriHP\0"

+   "\0"

+   /* _mesa_function_pool[11982]: Normal3b (offset 52) */

+   "iii\0"

+   "glNormal3b\0"

+   "\0"

+   /* _mesa_function_pool[11998]: Normal3d (offset 54) */

+   "ddd\0"

+   "glNormal3d\0"

+   "\0"

+   /* _mesa_function_pool[12014]: Uniform1uiEXT (will be remapped) */

+   "ii\0"

+   "glUniform1uiEXT\0"

+   "glUniform1ui\0"

+   "\0"

+   /* _mesa_function_pool[12047]: Normal3f (offset 56) */

+   "fff\0"

+   "glNormal3f\0"

+   "\0"

+   /* _mesa_function_pool[12063]: MultiTexCoord1svARB (offset 383) */

+   "ip\0"

+   "glMultiTexCoord1sv\0"

+   "glMultiTexCoord1svARB\0"

+   "\0"

+   /* _mesa_function_pool[12108]: Indexi (offset 48) */

+   "i\0"

+   "glIndexi\0"

+   "\0"

+   /* _mesa_function_pool[12120]: EGLImageTargetTexture2DOES (will be remapped) */

+   "ip\0"

+   "glEGLImageTargetTexture2DOES\0"

+   "\0"

+   /* _mesa_function_pool[12153]: EndQueryARB (will be remapped) */

+   "i\0"

+   "glEndQuery\0"

+   "glEndQueryARB\0"

+   "\0"

+   /* _mesa_function_pool[12181]: DeleteFencesNV (will be remapped) */

+   "ip\0"

+   "glDeleteFencesNV\0"

+   "\0"

+   /* _mesa_function_pool[12202]: BindBufferRangeEXT (will be remapped) */

+   "iiiii\0"

+   "glBindBufferRangeEXT\0"

+   "glBindBufferRange\0"

+   "\0"

+   /* _mesa_function_pool[12248]: DepthMask (offset 211) */

+   "i\0"

+   "glDepthMask\0"

+   "\0"

+   /* _mesa_function_pool[12263]: IsShader (will be remapped) */

+   "i\0"

+   "glIsShader\0"

+   "\0"

+   /* _mesa_function_pool[12277]: Indexf (offset 46) */

+   "f\0"

+   "glIndexf\0"

+   "\0"

+   /* _mesa_function_pool[12289]: GetImageTransformParameterivHP (dynamic) */

+   "iip\0"

+   "glGetImageTransformParameterivHP\0"

+   "\0"

+   /* _mesa_function_pool[12327]: Indexd (offset 44) */

+   "d\0"

+   "glIndexd\0"

+   "\0"

+   /* _mesa_function_pool[12339]: GetMaterialiv (offset 270) */

+   "iip\0"

+   "glGetMaterialiv\0"

+   "\0"

+   /* _mesa_function_pool[12360]: StencilOp (offset 244) */

+   "iii\0"

+   "glStencilOp\0"

+   "\0"

+   /* _mesa_function_pool[12377]: WindowPos4ivMESA (will be remapped) */

+   "p\0"

+   "glWindowPos4ivMESA\0"

+   "\0"

+   /* _mesa_function_pool[12399]: FramebufferTextureLayer (dynamic) */

+   "iiiii\0"

+   "glFramebufferTextureLayerARB\0"

+   "\0"

+   /* _mesa_function_pool[12435]: MultiTexCoord3svARB (offset 399) */

+   "ip\0"

+   "glMultiTexCoord3sv\0"

+   "glMultiTexCoord3svARB\0"

+   "\0"

+   /* _mesa_function_pool[12480]: TexEnvfv (offset 185) */

+   "iip\0"

+   "glTexEnvfv\0"

+   "\0"

+   /* _mesa_function_pool[12496]: MultiTexCoord4iARB (offset 404) */

+   "iiiii\0"

+   "glMultiTexCoord4i\0"

+   "glMultiTexCoord4iARB\0"

+   "\0"

+   /* _mesa_function_pool[12542]: Indexs (offset 50) */

+   "i\0"

+   "glIndexs\0"

+   "\0"

+   /* _mesa_function_pool[12554]: Binormal3ivEXT (dynamic) */

+   "p\0"

+   "glBinormal3ivEXT\0"

+   "\0"

+   /* _mesa_function_pool[12574]: ResizeBuffersMESA (will be remapped) */

+   "\0"

+   "glResizeBuffersMESA\0"

+   "\0"

+   /* _mesa_function_pool[12596]: GetUniformivARB (will be remapped) */

+   "iip\0"

+   "glGetUniformiv\0"

+   "glGetUniformivARB\0"

+   "\0"

+   /* _mesa_function_pool[12634]: PixelTexGenParameteriSGIS (will be remapped) */

+   "ii\0"

+   "glPixelTexGenParameteriSGIS\0"

+   "\0"

+   /* _mesa_function_pool[12666]: VertexPointervINTEL (dynamic) */

+   "iip\0"

+   "glVertexPointervINTEL\0"

+   "\0"

+   /* _mesa_function_pool[12693]: Vertex2i (offset 130) */

+   "ii\0"

+   "glVertex2i\0"

+   "\0"

+   /* _mesa_function_pool[12708]: LoadMatrixf (offset 291) */

+   "p\0"

+   "glLoadMatrixf\0"

+   "\0"

+   /* _mesa_function_pool[12725]: VertexAttribI1uivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI1uivEXT\0"

+   "glVertexAttribI1uiv\0"

+   "\0"

+   /* _mesa_function_pool[12772]: Vertex2f (offset 128) */

+   "ff\0"

+   "glVertex2f\0"

+   "\0"

+   /* _mesa_function_pool[12787]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */

+   "pppp\0"

+   "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[12840]: Color4bv (offset 26) */

+   "p\0"

+   "glColor4bv\0"

+   "\0"

+   /* _mesa_function_pool[12854]: VertexPointer (offset 321) */

+   "iiip\0"

+   "glVertexPointer\0"

+   "\0"

+   /* _mesa_function_pool[12876]: SecondaryColor3uiEXT (will be remapped) */

+   "iii\0"

+   "glSecondaryColor3ui\0"

+   "glSecondaryColor3uiEXT\0"

+   "\0"

+   /* _mesa_function_pool[12924]: StartInstrumentsSGIX (dynamic) */

+   "\0"

+   "glStartInstrumentsSGIX\0"

+   "\0"

+   /* _mesa_function_pool[12949]: SecondaryColor3usvEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3usv\0"

+   "glSecondaryColor3usvEXT\0"

+   "\0"

+   /* _mesa_function_pool[12997]: VertexAttrib2fvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib2fvNV\0"

+   "\0"

+   /* _mesa_function_pool[13021]: ProgramLocalParameter4dvARB (will be remapped) */

+   "iip\0"

+   "glProgramLocalParameter4dvARB\0"

+   "\0"

+   /* _mesa_function_pool[13056]: DeleteLists (offset 4) */

+   "ii\0"

+   "glDeleteLists\0"

+   "\0"

+   /* _mesa_function_pool[13074]: LogicOp (offset 242) */

+   "i\0"

+   "glLogicOp\0"

+   "\0"

+   /* _mesa_function_pool[13087]: MatrixIndexuivARB (dynamic) */

+   "ip\0"

+   "glMatrixIndexuivARB\0"

+   "\0"

+   /* _mesa_function_pool[13111]: Vertex2s (offset 132) */

+   "ii\0"

+   "glVertex2s\0"

+   "\0"

+   /* _mesa_function_pool[13126]: RenderbufferStorageMultisample (will be remapped) */

+   "iiiii\0"

+   "glRenderbufferStorageMultisample\0"

+   "glRenderbufferStorageMultisampleEXT\0"

+   "\0"

+   /* _mesa_function_pool[13202]: TexCoord4fv (offset 121) */

+   "p\0"

+   "glTexCoord4fv\0"

+   "\0"

+   /* _mesa_function_pool[13219]: Tangent3sEXT (dynamic) */

+   "iii\0"

+   "glTangent3sEXT\0"

+   "\0"

+   /* _mesa_function_pool[13239]: GlobalAlphaFactorfSUN (dynamic) */

+   "f\0"

+   "glGlobalAlphaFactorfSUN\0"

+   "\0"

+   /* _mesa_function_pool[13266]: MultiTexCoord3iARB (offset 396) */

+   "iiii\0"

+   "glMultiTexCoord3i\0"

+   "glMultiTexCoord3iARB\0"

+   "\0"

+   /* _mesa_function_pool[13311]: IsProgram (will be remapped) */

+   "i\0"

+   "glIsProgram\0"

+   "\0"

+   /* _mesa_function_pool[13326]: TexCoordPointerListIBM (dynamic) */

+   "iiipi\0"

+   "glTexCoordPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[13358]: VertexAttribI4svEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI4svEXT\0"

+   "glVertexAttribI4sv\0"

+   "\0"

+   /* _mesa_function_pool[13403]: GlobalAlphaFactorusSUN (dynamic) */

+   "i\0"

+   "glGlobalAlphaFactorusSUN\0"

+   "\0"

+   /* _mesa_function_pool[13431]: VertexAttrib2dvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib2dvNV\0"

+   "\0"

+   /* _mesa_function_pool[13455]: FramebufferRenderbufferEXT (will be remapped) */

+   "iiii\0"

+   "glFramebufferRenderbuffer\0"

+   "glFramebufferRenderbufferEXT\0"

+   "\0"

+   /* _mesa_function_pool[13516]: ClearBufferuiv (will be remapped) */

+   "iip\0"

+   "glClearBufferuiv\0"

+   "\0"

+   /* _mesa_function_pool[13538]: VertexAttrib1dvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib1dvNV\0"

+   "\0"

+   /* _mesa_function_pool[13562]: GenTextures (offset 328) */

+   "ip\0"

+   "glGenTextures\0"

+   "glGenTexturesEXT\0"

+   "\0"

+   /* _mesa_function_pool[13597]: FramebufferTextureARB (will be remapped) */

+   "iiii\0"

+   "glFramebufferTextureARB\0"

+   "\0"

+   /* _mesa_function_pool[13627]: SetFenceNV (will be remapped) */

+   "ii\0"

+   "glSetFenceNV\0"

+   "\0"

+   /* _mesa_function_pool[13644]: FramebufferTexture1DEXT (will be remapped) */

+   "iiiii\0"

+   "glFramebufferTexture1D\0"

+   "glFramebufferTexture1DEXT\0"

+   "\0"

+   /* _mesa_function_pool[13700]: GetCombinerOutputParameterivNV (will be remapped) */

+   "iiip\0"

+   "glGetCombinerOutputParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[13739]: MultiModeDrawArraysIBM (will be remapped) */

+   "pppii\0"

+   "glMultiModeDrawArraysIBM\0"

+   "\0"

+   /* _mesa_function_pool[13771]: PixelTexGenParameterivSGIS (will be remapped) */

+   "ip\0"

+   "glPixelTexGenParameterivSGIS\0"

+   "\0"

+   /* _mesa_function_pool[13804]: TextureNormalEXT (dynamic) */

+   "i\0"

+   "glTextureNormalEXT\0"

+   "\0"

+   /* _mesa_function_pool[13826]: IndexPointerListIBM (dynamic) */

+   "iipi\0"

+   "glIndexPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[13854]: WeightfvARB (dynamic) */

+   "ip\0"

+   "glWeightfvARB\0"

+   "\0"

+   /* _mesa_function_pool[13872]: GetCombinerOutputParameterfvNV (will be remapped) */

+   "iiip\0"

+   "glGetCombinerOutputParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[13911]: RasterPos2sv (offset 69) */

+   "p\0"

+   "glRasterPos2sv\0"

+   "\0"

+   /* _mesa_function_pool[13929]: Color4ubv (offset 36) */

+   "p\0"

+   "glColor4ubv\0"

+   "\0"

+   /* _mesa_function_pool[13944]: DrawBuffer (offset 202) */

+   "i\0"

+   "glDrawBuffer\0"

+   "\0"

+   /* _mesa_function_pool[13960]: TexCoord2fv (offset 105) */

+   "p\0"

+   "glTexCoord2fv\0"

+   "\0"

+   /* _mesa_function_pool[13977]: WindowPos4fMESA (will be remapped) */

+   "ffff\0"

+   "glWindowPos4fMESA\0"

+   "\0"

+   /* _mesa_function_pool[14001]: TexCoord1sv (offset 101) */

+   "p\0"

+   "glTexCoord1sv\0"

+   "\0"

+   /* _mesa_function_pool[14018]: WindowPos3dvMESA (will be remapped) */

+   "p\0"

+   "glWindowPos3dv\0"

+   "glWindowPos3dvARB\0"

+   "glWindowPos3dvMESA\0"

+   "\0"

+   /* _mesa_function_pool[14073]: DepthFunc (offset 245) */

+   "i\0"

+   "glDepthFunc\0"

+   "\0"

+   /* _mesa_function_pool[14088]: PixelMapusv (offset 253) */

+   "iip\0"

+   "glPixelMapusv\0"

+   "\0"

+   /* _mesa_function_pool[14107]: GetQueryObjecti64vEXT (will be remapped) */

+   "iip\0"

+   "glGetQueryObjecti64vEXT\0"

+   "\0"

+   /* _mesa_function_pool[14136]: MultiTexCoord1dARB (offset 376) */

+   "id\0"

+   "glMultiTexCoord1d\0"

+   "glMultiTexCoord1dARB\0"

+   "\0"

+   /* _mesa_function_pool[14179]: PointParameterivNV (will be remapped) */

+   "ip\0"

+   "glPointParameteriv\0"

+   "glPointParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[14223]: BlendFunc (offset 241) */

+   "ii\0"

+   "glBlendFunc\0"

+   "\0"

+   /* _mesa_function_pool[14239]: EndTransformFeedbackEXT (will be remapped) */

+   "\0"

+   "glEndTransformFeedbackEXT\0"

+   "glEndTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[14290]: Uniform2fvARB (will be remapped) */

+   "iip\0"

+   "glUniform2fv\0"

+   "glUniform2fvARB\0"

+   "\0"

+   /* _mesa_function_pool[14324]: BufferParameteriAPPLE (will be remapped) */

+   "iii\0"

+   "glBufferParameteriAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[14353]: MultiTexCoord3dvARB (offset 393) */

+   "ip\0"

+   "glMultiTexCoord3dv\0"

+   "glMultiTexCoord3dvARB\0"

+   "\0"

+   /* _mesa_function_pool[14398]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */

+   "pppp\0"

+   "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[14454]: DeleteObjectARB (will be remapped) */

+   "i\0"

+   "glDeleteObjectARB\0"

+   "\0"

+   /* _mesa_function_pool[14475]: MatrixIndexPointerARB (dynamic) */

+   "iiip\0"

+   "glMatrixIndexPointerARB\0"

+   "\0"

+   /* _mesa_function_pool[14505]: ProgramNamedParameter4dvNV (will be remapped) */

+   "iipp\0"

+   "glProgramNamedParameter4dvNV\0"

+   "\0"

+   /* _mesa_function_pool[14540]: Tangent3fvEXT (dynamic) */

+   "p\0"

+   "glTangent3fvEXT\0"

+   "\0"

+   /* _mesa_function_pool[14559]: Flush (offset 217) */

+   "\0"

+   "glFlush\0"

+   "\0"

+   /* _mesa_function_pool[14569]: Color4uiv (offset 38) */

+   "p\0"

+   "glColor4uiv\0"

+   "\0"

+   /* _mesa_function_pool[14584]: VertexAttribI4iEXT (will be remapped) */

+   "iiiii\0"

+   "glVertexAttribI4iEXT\0"

+   "glVertexAttribI4i\0"

+   "\0"

+   /* _mesa_function_pool[14630]: GenVertexArrays (will be remapped) */

+   "ip\0"

+   "glGenVertexArrays\0"

+   "\0"

+   /* _mesa_function_pool[14652]: Uniform3uivEXT (will be remapped) */

+   "iip\0"

+   "glUniform3uivEXT\0"

+   "glUniform3uiv\0"

+   "\0"

+   /* _mesa_function_pool[14688]: RasterPos3sv (offset 77) */

+   "p\0"

+   "glRasterPos3sv\0"

+   "\0"

+   /* _mesa_function_pool[14706]: BindFramebufferEXT (will be remapped) */

+   "ii\0"

+   "glBindFramebuffer\0"

+   "glBindFramebufferEXT\0"

+   "\0"

+   /* _mesa_function_pool[14749]: ReferencePlaneSGIX (dynamic) */

+   "p\0"

+   "glReferencePlaneSGIX\0"

+   "\0"

+   /* _mesa_function_pool[14773]: PushAttrib (offset 219) */

+   "i\0"

+   "glPushAttrib\0"

+   "\0"

+   /* _mesa_function_pool[14789]: RasterPos2i (offset 66) */

+   "ii\0"

+   "glRasterPos2i\0"

+   "\0"

+   /* _mesa_function_pool[14807]: ValidateProgramARB (will be remapped) */

+   "i\0"

+   "glValidateProgram\0"

+   "glValidateProgramARB\0"

+   "\0"

+   /* _mesa_function_pool[14849]: TexParameteriv (offset 181) */

+   "iip\0"

+   "glTexParameteriv\0"

+   "\0"

+   /* _mesa_function_pool[14871]: UnlockArraysEXT (will be remapped) */

+   "\0"

+   "glUnlockArraysEXT\0"

+   "\0"

+   /* _mesa_function_pool[14891]: TexCoord2fColor3fVertex3fSUN (dynamic) */

+   "ffffffff\0"

+   "glTexCoord2fColor3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[14932]: WindowPos3fvMESA (will be remapped) */

+   "p\0"

+   "glWindowPos3fv\0"

+   "glWindowPos3fvARB\0"

+   "glWindowPos3fvMESA\0"

+   "\0"

+   /* _mesa_function_pool[14987]: RasterPos2f (offset 64) */

+   "ff\0"

+   "glRasterPos2f\0"

+   "\0"

+   /* _mesa_function_pool[15005]: VertexAttrib1svNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib1svNV\0"

+   "\0"

+   /* _mesa_function_pool[15029]: RasterPos2d (offset 62) */

+   "dd\0"

+   "glRasterPos2d\0"

+   "\0"

+   /* _mesa_function_pool[15047]: RasterPos3fv (offset 73) */

+   "p\0"

+   "glRasterPos3fv\0"

+   "\0"

+   /* _mesa_function_pool[15065]: CopyTexSubImage3D (offset 373) */

+   "iiiiiiiii\0"

+   "glCopyTexSubImage3D\0"

+   "glCopyTexSubImage3DEXT\0"

+   "\0"

+   /* _mesa_function_pool[15119]: VertexAttrib2dARB (will be remapped) */

+   "idd\0"

+   "glVertexAttrib2d\0"

+   "glVertexAttrib2dARB\0"

+   "\0"

+   /* _mesa_function_pool[15161]: Color4ub (offset 35) */

+   "iiii\0"

+   "glColor4ub\0"

+   "\0"

+   /* _mesa_function_pool[15178]: GetInteger64v (will be remapped) */

+   "ip\0"

+   "glGetInteger64v\0"

+   "\0"

+   /* _mesa_function_pool[15198]: TextureColorMaskSGIS (dynamic) */

+   "iiii\0"

+   "glTextureColorMaskSGIS\0"

+   "\0"

+   /* _mesa_function_pool[15227]: RasterPos2s (offset 68) */

+   "ii\0"

+   "glRasterPos2s\0"

+   "\0"

+   /* _mesa_function_pool[15245]: GetColorTable (offset 343) */

+   "iiip\0"

+   "glGetColorTable\0"

+   "glGetColorTableSGI\0"

+   "glGetColorTableEXT\0"

+   "\0"

+   /* _mesa_function_pool[15305]: SelectBuffer (offset 195) */

+   "ip\0"

+   "glSelectBuffer\0"

+   "\0"

+   /* _mesa_function_pool[15324]: Indexiv (offset 49) */

+   "p\0"

+   "glIndexiv\0"

+   "\0"

+   /* _mesa_function_pool[15337]: TexCoord3i (offset 114) */

+   "iii\0"

+   "glTexCoord3i\0"

+   "\0"

+   /* _mesa_function_pool[15355]: CopyColorTable (offset 342) */

+   "iiiii\0"

+   "glCopyColorTable\0"

+   "glCopyColorTableSGI\0"

+   "\0"

+   /* _mesa_function_pool[15399]: GetHistogramParameterfv (offset 362) */

+   "iip\0"

+   "glGetHistogramParameterfv\0"

+   "glGetHistogramParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[15459]: Frustum (offset 289) */

+   "dddddd\0"

+   "glFrustum\0"

+   "\0"

+   /* _mesa_function_pool[15477]: GetString (offset 275) */

+   "i\0"

+   "glGetString\0"

+   "\0"

+   /* _mesa_function_pool[15492]: ColorPointervINTEL (dynamic) */

+   "iip\0"

+   "glColorPointervINTEL\0"

+   "\0"

+   /* _mesa_function_pool[15518]: TexEnvf (offset 184) */

+   "iif\0"

+   "glTexEnvf\0"

+   "\0"

+   /* _mesa_function_pool[15533]: TexCoord3d (offset 110) */

+   "ddd\0"

+   "glTexCoord3d\0"

+   "\0"

+   /* _mesa_function_pool[15551]: AlphaFragmentOp1ATI (will be remapped) */

+   "iiiiii\0"

+   "glAlphaFragmentOp1ATI\0"

+   "\0"

+   /* _mesa_function_pool[15581]: TexCoord3f (offset 112) */

+   "fff\0"

+   "glTexCoord3f\0"

+   "\0"

+   /* _mesa_function_pool[15599]: MultiTexCoord3ivARB (offset 397) */

+   "ip\0"

+   "glMultiTexCoord3iv\0"

+   "glMultiTexCoord3ivARB\0"

+   "\0"

+   /* _mesa_function_pool[15644]: MultiTexCoord2sARB (offset 390) */

+   "iii\0"

+   "glMultiTexCoord2s\0"

+   "glMultiTexCoord2sARB\0"

+   "\0"

+   /* _mesa_function_pool[15688]: VertexAttrib1dvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib1dv\0"

+   "glVertexAttrib1dvARB\0"

+   "\0"

+   /* _mesa_function_pool[15731]: DeleteTextures (offset 327) */

+   "ip\0"

+   "glDeleteTextures\0"

+   "glDeleteTexturesEXT\0"

+   "\0"

+   /* _mesa_function_pool[15772]: TexCoordPointerEXT (will be remapped) */

+   "iiiip\0"

+   "glTexCoordPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[15800]: TexSubImage4DSGIS (dynamic) */

+   "iiiiiiiiiiiip\0"

+   "glTexSubImage4DSGIS\0"

+   "\0"

+   /* _mesa_function_pool[15835]: TexCoord3s (offset 116) */

+   "iii\0"

+   "glTexCoord3s\0"

+   "\0"

+   /* _mesa_function_pool[15853]: GetTexLevelParameteriv (offset 285) */

+   "iiip\0"

+   "glGetTexLevelParameteriv\0"

+   "\0"

+   /* _mesa_function_pool[15884]: CombinerStageParameterfvNV (dynamic) */

+   "iip\0"

+   "glCombinerStageParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[15918]: StopInstrumentsSGIX (dynamic) */

+   "i\0"

+   "glStopInstrumentsSGIX\0"

+   "\0"

+   /* _mesa_function_pool[15943]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */

+   "fffffffffffffff\0"

+   "glTexCoord4fColor4fNormal3fVertex4fSUN\0"

+   "\0"

+   /* _mesa_function_pool[15999]: ClearAccum (offset 204) */

+   "ffff\0"

+   "glClearAccum\0"

+   "\0"

+   /* _mesa_function_pool[16018]: DeformSGIX (dynamic) */

+   "i\0"

+   "glDeformSGIX\0"

+   "\0"

+   /* _mesa_function_pool[16034]: GetVertexAttribfvARB (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribfv\0"

+   "glGetVertexAttribfvARB\0"

+   "\0"

+   /* _mesa_function_pool[16082]: SecondaryColor3ivEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3iv\0"

+   "glSecondaryColor3ivEXT\0"

+   "\0"

+   /* _mesa_function_pool[16128]: TexCoord4iv (offset 123) */

+   "p\0"

+   "glTexCoord4iv\0"

+   "\0"

+   /* _mesa_function_pool[16145]: VertexAttribI4uiEXT (will be remapped) */

+   "iiiii\0"

+   "glVertexAttribI4uiEXT\0"

+   "glVertexAttribI4ui\0"

+   "\0"

+   /* _mesa_function_pool[16193]: GetFragmentMaterialfvSGIX (dynamic) */

+   "iip\0"

+   "glGetFragmentMaterialfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[16226]: UniformMatrix4x2fv (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix4x2fv\0"

+   "\0"

+   /* _mesa_function_pool[16253]: GetDetailTexFuncSGIS (dynamic) */

+   "ip\0"

+   "glGetDetailTexFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[16280]: GetCombinerStageParameterfvNV (dynamic) */

+   "iip\0"

+   "glGetCombinerStageParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[16317]: PolygonOffset (offset 319) */

+   "ff\0"

+   "glPolygonOffset\0"

+   "\0"

+   /* _mesa_function_pool[16337]: BindVertexArray (will be remapped) */

+   "i\0"

+   "glBindVertexArray\0"

+   "\0"

+   /* _mesa_function_pool[16358]: Color4ubVertex2fvSUN (dynamic) */

+   "pp\0"

+   "glColor4ubVertex2fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[16385]: Rectd (offset 86) */

+   "dddd\0"

+   "glRectd\0"

+   "\0"

+   /* _mesa_function_pool[16399]: TexFilterFuncSGIS (dynamic) */

+   "iiip\0"

+   "glTexFilterFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[16425]: SampleMaskSGIS (will be remapped) */

+   "fi\0"

+   "glSampleMaskSGIS\0"

+   "glSampleMaskEXT\0"

+   "\0"

+   /* _mesa_function_pool[16462]: VertexAttribI4ubvEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI4ubvEXT\0"

+   "glVertexAttribI4ubv\0"

+   "\0"

+   /* _mesa_function_pool[16509]: GetAttribLocationARB (will be remapped) */

+   "ip\0"

+   "glGetAttribLocation\0"

+   "glGetAttribLocationARB\0"

+   "\0"

+   /* _mesa_function_pool[16556]: RasterPos3i (offset 74) */

+   "iii\0"

+   "glRasterPos3i\0"

+   "\0"

+   /* _mesa_function_pool[16575]: VertexAttrib4ubvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4ubv\0"

+   "glVertexAttrib4ubvARB\0"

+   "\0"

+   /* _mesa_function_pool[16620]: DetailTexFuncSGIS (dynamic) */

+   "iip\0"

+   "glDetailTexFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[16645]: Normal3fVertex3fSUN (dynamic) */

+   "ffffff\0"

+   "glNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[16675]: CopyTexImage2D (offset 324) */

+   "iiiiiiii\0"

+   "glCopyTexImage2D\0"

+   "glCopyTexImage2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[16722]: GetBufferPointervARB (will be remapped) */

+   "iip\0"

+   "glGetBufferPointerv\0"

+   "glGetBufferPointervARB\0"

+   "\0"

+   /* _mesa_function_pool[16770]: ProgramEnvParameter4fARB (will be remapped) */

+   "iiffff\0"

+   "glProgramEnvParameter4fARB\0"

+   "glProgramParameter4fNV\0"

+   "\0"

+   /* _mesa_function_pool[16828]: Uniform3ivARB (will be remapped) */

+   "iip\0"

+   "glUniform3iv\0"

+   "glUniform3ivARB\0"

+   "\0"

+   /* _mesa_function_pool[16862]: Lightfv (offset 160) */

+   "iip\0"

+   "glLightfv\0"

+   "\0"

+   /* _mesa_function_pool[16877]: PrimitiveRestartIndexNV (will be remapped) */

+   "i\0"

+   "glPrimitiveRestartIndexNV\0"

+   "glPrimitiveRestartIndex\0"

+   "\0"

+   /* _mesa_function_pool[16930]: ClearDepth (offset 208) */

+   "d\0"

+   "glClearDepth\0"

+   "\0"

+   /* _mesa_function_pool[16946]: GetFenceivNV (will be remapped) */

+   "iip\0"

+   "glGetFenceivNV\0"

+   "\0"

+   /* _mesa_function_pool[16966]: WindowPos4dvMESA (will be remapped) */

+   "p\0"

+   "glWindowPos4dvMESA\0"

+   "\0"

+   /* _mesa_function_pool[16988]: ColorSubTable (offset 346) */

+   "iiiiip\0"

+   "glColorSubTable\0"

+   "glColorSubTableEXT\0"

+   "\0"

+   /* _mesa_function_pool[17031]: Color4fv (offset 30) */

+   "p\0"

+   "glColor4fv\0"

+   "\0"

+   /* _mesa_function_pool[17045]: MultiTexCoord4ivARB (offset 405) */

+   "ip\0"

+   "glMultiTexCoord4iv\0"

+   "glMultiTexCoord4ivARB\0"

+   "\0"

+   /* _mesa_function_pool[17090]: ProgramLocalParameters4fvEXT (will be remapped) */

+   "iiip\0"

+   "glProgramLocalParameters4fvEXT\0"

+   "\0"

+   /* _mesa_function_pool[17127]: ColorPointer (offset 308) */

+   "iiip\0"

+   "glColorPointer\0"

+   "\0"

+   /* _mesa_function_pool[17148]: Rects (offset 92) */

+   "iiii\0"

+   "glRects\0"

+   "\0"

+   /* _mesa_function_pool[17162]: GetMapAttribParameterfvNV (dynamic) */

+   "iiip\0"

+   "glGetMapAttribParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[17196]: CreateShaderProgramEXT (will be remapped) */

+   "ip\0"

+   "glCreateShaderProgramEXT\0"

+   "\0"

+   /* _mesa_function_pool[17225]: ActiveProgramEXT (will be remapped) */

+   "i\0"

+   "glActiveProgramEXT\0"

+   "\0"

+   /* _mesa_function_pool[17247]: Lightiv (offset 162) */

+   "iip\0"

+   "glLightiv\0"

+   "\0"

+   /* _mesa_function_pool[17262]: VertexAttrib4sARB (will be remapped) */

+   "iiiii\0"

+   "glVertexAttrib4s\0"

+   "glVertexAttrib4sARB\0"

+   "\0"

+   /* _mesa_function_pool[17306]: GetQueryObjectuivARB (will be remapped) */

+   "iip\0"

+   "glGetQueryObjectuiv\0"

+   "glGetQueryObjectuivARB\0"

+   "\0"

+   /* _mesa_function_pool[17354]: GetTexParameteriv (offset 283) */

+   "iip\0"

+   "glGetTexParameteriv\0"

+   "\0"

+   /* _mesa_function_pool[17379]: MapParameterivNV (dynamic) */

+   "iip\0"

+   "glMapParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[17403]: GenRenderbuffersEXT (will be remapped) */

+   "ip\0"

+   "glGenRenderbuffers\0"

+   "glGenRenderbuffersEXT\0"

+   "\0"

+   /* _mesa_function_pool[17448]: ClearBufferfv (will be remapped) */

+   "iip\0"

+   "glClearBufferfv\0"

+   "\0"

+   /* _mesa_function_pool[17469]: VertexAttrib2dvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib2dv\0"

+   "glVertexAttrib2dvARB\0"

+   "\0"

+   /* _mesa_function_pool[17512]: EdgeFlagPointerEXT (will be remapped) */

+   "iip\0"

+   "glEdgeFlagPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[17538]: VertexAttribs2svNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs2svNV\0"

+   "\0"

+   /* _mesa_function_pool[17564]: WeightbvARB (dynamic) */

+   "ip\0"

+   "glWeightbvARB\0"

+   "\0"

+   /* _mesa_function_pool[17582]: VertexAttrib2fvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib2fv\0"

+   "glVertexAttrib2fvARB\0"

+   "\0"

+   /* _mesa_function_pool[17625]: GetBufferParameterivARB (will be remapped) */

+   "iip\0"

+   "glGetBufferParameteriv\0"

+   "glGetBufferParameterivARB\0"

+   "\0"

+   /* _mesa_function_pool[17679]: Rectdv (offset 87) */

+   "pp\0"

+   "glRectdv\0"

+   "\0"

+   /* _mesa_function_pool[17692]: ListParameteriSGIX (dynamic) */

+   "iii\0"

+   "glListParameteriSGIX\0"

+   "\0"

+   /* _mesa_function_pool[17718]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */

+   "iffffffffff\0"

+   "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[17777]: InstrumentsBufferSGIX (dynamic) */

+   "ip\0"

+   "glInstrumentsBufferSGIX\0"

+   "\0"

+   /* _mesa_function_pool[17805]: VertexAttrib4NivARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4Niv\0"

+   "glVertexAttrib4NivARB\0"

+   "\0"

+   /* _mesa_function_pool[17850]: DrawArraysInstancedARB (will be remapped) */

+   "iiii\0"

+   "glDrawArraysInstancedARB\0"

+   "glDrawArraysInstancedEXT\0"

+   "glDrawArraysInstanced\0"

+   "\0"

+   /* _mesa_function_pool[17928]: GetAttachedShaders (will be remapped) */

+   "iipp\0"

+   "glGetAttachedShaders\0"

+   "\0"

+   /* _mesa_function_pool[17955]: GenVertexArraysAPPLE (will be remapped) */

+   "ip\0"

+   "glGenVertexArraysAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[17982]: ClearBufferfi (will be remapped) */

+   "iifi\0"

+   "glClearBufferfi\0"

+   "\0"

+   /* _mesa_function_pool[18004]: Materialiv (offset 172) */

+   "iip\0"

+   "glMaterialiv\0"

+   "\0"

+   /* _mesa_function_pool[18022]: PushClientAttrib (offset 335) */

+   "i\0"

+   "glPushClientAttrib\0"

+   "\0"

+   /* _mesa_function_pool[18044]: ProgramEnvParameters4fvEXT (will be remapped) */

+   "iiip\0"

+   "glProgramEnvParameters4fvEXT\0"

+   "\0"

+   /* _mesa_function_pool[18079]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */

+   "pppp\0"

+   "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[18125]: WindowPos2iMESA (will be remapped) */

+   "ii\0"

+   "glWindowPos2i\0"

+   "glWindowPos2iARB\0"

+   "glWindowPos2iMESA\0"

+   "\0"

+   /* _mesa_function_pool[18178]: SecondaryColor3fvEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3fv\0"

+   "glSecondaryColor3fvEXT\0"

+   "\0"

+   /* _mesa_function_pool[18224]: PolygonMode (offset 174) */

+   "ii\0"

+   "glPolygonMode\0"

+   "\0"

+   /* _mesa_function_pool[18242]: CompressedTexSubImage1DARB (will be remapped) */

+   "iiiiiip\0"

+   "glCompressedTexSubImage1D\0"

+   "glCompressedTexSubImage1DARB\0"

+   "\0"

+   /* _mesa_function_pool[18306]: VertexAttribI1iEXT (will be remapped) */

+   "ii\0"

+   "glVertexAttribI1iEXT\0"

+   "glVertexAttribI1i\0"

+   "\0"

+   /* _mesa_function_pool[18349]: GetVertexAttribivNV (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribivNV\0"

+   "\0"

+   /* _mesa_function_pool[18376]: GetProgramStringARB (will be remapped) */

+   "iip\0"

+   "glGetProgramStringARB\0"

+   "\0"

+   /* _mesa_function_pool[18403]: VertexAttribIPointerEXT (will be remapped) */

+   "iiiip\0"

+   "glVertexAttribIPointerEXT\0"

+   "glVertexAttribIPointer\0"

+   "\0"

+   /* _mesa_function_pool[18459]: TexBumpParameterfvATI (will be remapped) */

+   "ip\0"

+   "glTexBumpParameterfvATI\0"

+   "\0"

+   /* _mesa_function_pool[18487]: CompileShaderARB (will be remapped) */

+   "i\0"

+   "glCompileShader\0"

+   "glCompileShaderARB\0"

+   "\0"

+   /* _mesa_function_pool[18525]: DeleteShader (will be remapped) */

+   "i\0"

+   "glDeleteShader\0"

+   "\0"

+   /* _mesa_function_pool[18543]: DisableClientState (offset 309) */

+   "i\0"

+   "glDisableClientState\0"

+   "\0"

+   /* _mesa_function_pool[18567]: TexGeni (offset 192) */

+   "iii\0"

+   "glTexGeni\0"

+   "\0"

+   /* _mesa_function_pool[18582]: TexGenf (offset 190) */

+   "iif\0"

+   "glTexGenf\0"

+   "\0"

+   /* _mesa_function_pool[18597]: Uniform3fARB (will be remapped) */

+   "ifff\0"

+   "glUniform3f\0"

+   "glUniform3fARB\0"

+   "\0"

+   /* _mesa_function_pool[18630]: TexGend (offset 188) */

+   "iid\0"

+   "glTexGend\0"

+   "\0"

+   /* _mesa_function_pool[18645]: ListParameterfvSGIX (dynamic) */

+   "iip\0"

+   "glListParameterfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[18672]: GetPolygonStipple (offset 274) */

+   "p\0"

+   "glGetPolygonStipple\0"

+   "\0"

+   /* _mesa_function_pool[18695]: Tangent3dvEXT (dynamic) */

+   "p\0"

+   "glTangent3dvEXT\0"

+   "\0"

+   /* _mesa_function_pool[18714]: BindBufferOffsetEXT (will be remapped) */

+   "iiii\0"

+   "glBindBufferOffsetEXT\0"

+   "\0"

+   /* _mesa_function_pool[18742]: WindowPos3sMESA (will be remapped) */

+   "iii\0"

+   "glWindowPos3s\0"

+   "glWindowPos3sARB\0"

+   "glWindowPos3sMESA\0"

+   "\0"

+   /* _mesa_function_pool[18796]: VertexAttrib2svNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib2svNV\0"

+   "\0"

+   /* _mesa_function_pool[18820]: DisableIndexedEXT (will be remapped) */

+   "ii\0"

+   "glDisableIndexedEXT\0"

+   "glDisablei\0"

+   "\0"

+   /* _mesa_function_pool[18855]: BindBufferBaseEXT (will be remapped) */

+   "iii\0"

+   "glBindBufferBaseEXT\0"

+   "glBindBufferBase\0"

+   "\0"

+   /* _mesa_function_pool[18897]: TexCoord2fVertex3fvSUN (dynamic) */

+   "pp\0"

+   "glTexCoord2fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[18926]: WindowPos4sMESA (will be remapped) */

+   "iiii\0"

+   "glWindowPos4sMESA\0"

+   "\0"

+   /* _mesa_function_pool[18950]: VertexAttrib4NuivARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4Nuiv\0"

+   "glVertexAttrib4NuivARB\0"

+   "\0"

+   /* _mesa_function_pool[18997]: ClientActiveTextureARB (offset 375) */

+   "i\0"

+   "glClientActiveTexture\0"

+   "glClientActiveTextureARB\0"

+   "\0"

+   /* _mesa_function_pool[19047]: PixelTexGenSGIX (will be remapped) */

+   "i\0"

+   "glPixelTexGenSGIX\0"

+   "\0"

+   /* _mesa_function_pool[19068]: ReplacementCodeusvSUN (dynamic) */

+   "p\0"

+   "glReplacementCodeusvSUN\0"

+   "\0"

+   /* _mesa_function_pool[19095]: Uniform4fARB (will be remapped) */

+   "iffff\0"

+   "glUniform4f\0"

+   "glUniform4fARB\0"

+   "\0"

+   /* _mesa_function_pool[19129]: Color4sv (offset 34) */

+   "p\0"

+   "glColor4sv\0"

+   "\0"

+   /* _mesa_function_pool[19143]: FlushMappedBufferRange (will be remapped) */

+   "iii\0"

+   "glFlushMappedBufferRange\0"

+   "\0"

+   /* _mesa_function_pool[19173]: IsProgramNV (will be remapped) */

+   "i\0"

+   "glIsProgramARB\0"

+   "glIsProgramNV\0"

+   "\0"

+   /* _mesa_function_pool[19205]: FlushMappedBufferRangeAPPLE (will be remapped) */

+   "iii\0"

+   "glFlushMappedBufferRangeAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[19240]: PixelZoom (offset 246) */

+   "ff\0"

+   "glPixelZoom\0"

+   "\0"

+   /* _mesa_function_pool[19256]: ReplacementCodePointerSUN (dynamic) */

+   "iip\0"

+   "glReplacementCodePointerSUN\0"

+   "\0"

+   /* _mesa_function_pool[19289]: ProgramEnvParameter4dARB (will be remapped) */

+   "iidddd\0"

+   "glProgramEnvParameter4dARB\0"

+   "glProgramParameter4dNV\0"

+   "\0"

+   /* _mesa_function_pool[19347]: ColorTableParameterfv (offset 340) */

+   "iip\0"

+   "glColorTableParameterfv\0"

+   "glColorTableParameterfvSGI\0"

+   "\0"

+   /* _mesa_function_pool[19403]: FragmentLightModelfSGIX (dynamic) */

+   "if\0"

+   "glFragmentLightModelfSGIX\0"

+   "\0"

+   /* _mesa_function_pool[19433]: Binormal3bvEXT (dynamic) */

+   "p\0"

+   "glBinormal3bvEXT\0"

+   "\0"

+   /* _mesa_function_pool[19453]: PixelMapuiv (offset 252) */

+   "iip\0"

+   "glPixelMapuiv\0"

+   "\0"

+   /* _mesa_function_pool[19472]: Color3dv (offset 12) */

+   "p\0"

+   "glColor3dv\0"

+   "\0"

+   /* _mesa_function_pool[19486]: IsTexture (offset 330) */

+   "i\0"

+   "glIsTexture\0"

+   "glIsTextureEXT\0"

+   "\0"

+   /* _mesa_function_pool[19516]: VertexWeightfvEXT (dynamic) */

+   "p\0"

+   "glVertexWeightfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[19539]: VertexAttrib1dARB (will be remapped) */

+   "id\0"

+   "glVertexAttrib1d\0"

+   "glVertexAttrib1dARB\0"

+   "\0"

+   /* _mesa_function_pool[19580]: ImageTransformParameterivHP (dynamic) */

+   "iip\0"

+   "glImageTransformParameterivHP\0"

+   "\0"

+   /* _mesa_function_pool[19615]: TexCoord4i (offset 122) */

+   "iiii\0"

+   "glTexCoord4i\0"

+   "\0"

+   /* _mesa_function_pool[19634]: DeleteQueriesARB (will be remapped) */

+   "ip\0"

+   "glDeleteQueries\0"

+   "glDeleteQueriesARB\0"

+   "\0"

+   /* _mesa_function_pool[19673]: Color4ubVertex2fSUN (dynamic) */

+   "iiiiff\0"

+   "glColor4ubVertex2fSUN\0"

+   "\0"

+   /* _mesa_function_pool[19703]: FragmentColorMaterialSGIX (dynamic) */

+   "ii\0"

+   "glFragmentColorMaterialSGIX\0"

+   "\0"

+   /* _mesa_function_pool[19735]: CurrentPaletteMatrixARB (dynamic) */

+   "i\0"

+   "glCurrentPaletteMatrixARB\0"

+   "\0"

+   /* _mesa_function_pool[19764]: GetMapdv (offset 266) */

+   "iip\0"

+   "glGetMapdv\0"

+   "\0"

+   /* _mesa_function_pool[19780]: ObjectPurgeableAPPLE (will be remapped) */

+   "iii\0"

+   "glObjectPurgeableAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[19808]: GetStringi (will be remapped) */

+   "ii\0"

+   "glGetStringi\0"

+   "\0"

+   /* _mesa_function_pool[19825]: SamplePatternSGIS (will be remapped) */

+   "i\0"

+   "glSamplePatternSGIS\0"

+   "glSamplePatternEXT\0"

+   "\0"

+   /* _mesa_function_pool[19867]: PixelStoref (offset 249) */

+   "if\0"

+   "glPixelStoref\0"

+   "\0"

+   /* _mesa_function_pool[19885]: IsQueryARB (will be remapped) */

+   "i\0"

+   "glIsQuery\0"

+   "glIsQueryARB\0"

+   "\0"

+   /* _mesa_function_pool[19911]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */

+   "iiiiifff\0"

+   "glReplacementCodeuiColor4ubVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[19960]: PixelStorei (offset 250) */

+   "ii\0"

+   "glPixelStorei\0"

+   "\0"

+   /* _mesa_function_pool[19978]: VertexAttrib4usvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4usv\0"

+   "glVertexAttrib4usvARB\0"

+   "\0"

+   /* _mesa_function_pool[20023]: LinkProgramARB (will be remapped) */

+   "i\0"

+   "glLinkProgram\0"

+   "glLinkProgramARB\0"

+   "\0"

+   /* _mesa_function_pool[20057]: VertexAttrib2fNV (will be remapped) */

+   "iff\0"

+   "glVertexAttrib2fNV\0"

+   "\0"

+   /* _mesa_function_pool[20081]: ShaderSourceARB (will be remapped) */

+   "iipp\0"

+   "glShaderSource\0"

+   "glShaderSourceARB\0"

+   "\0"

+   /* _mesa_function_pool[20120]: FragmentMaterialiSGIX (dynamic) */

+   "iii\0"

+   "glFragmentMaterialiSGIX\0"

+   "\0"

+   /* _mesa_function_pool[20149]: EvalCoord2dv (offset 233) */

+   "p\0"

+   "glEvalCoord2dv\0"

+   "\0"

+   /* _mesa_function_pool[20167]: VertexAttrib3svARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib3sv\0"

+   "glVertexAttrib3svARB\0"

+   "\0"

+   /* _mesa_function_pool[20210]: ColorMaterial (offset 151) */

+   "ii\0"

+   "glColorMaterial\0"

+   "\0"

+   /* _mesa_function_pool[20230]: CompressedTexSubImage3DARB (will be remapped) */

+   "iiiiiiiiiip\0"

+   "glCompressedTexSubImage3D\0"

+   "glCompressedTexSubImage3DARB\0"

+   "\0"

+   /* _mesa_function_pool[20298]: WindowPos2ivMESA (will be remapped) */

+   "p\0"

+   "glWindowPos2iv\0"

+   "glWindowPos2ivARB\0"

+   "glWindowPos2ivMESA\0"

+   "\0"

+   /* _mesa_function_pool[20353]: IsFramebufferEXT (will be remapped) */

+   "i\0"

+   "glIsFramebuffer\0"

+   "glIsFramebufferEXT\0"

+   "\0"

+   /* _mesa_function_pool[20391]: Uniform4ivARB (will be remapped) */

+   "iip\0"

+   "glUniform4iv\0"

+   "glUniform4ivARB\0"

+   "\0"

+   /* _mesa_function_pool[20425]: GetVertexAttribdvARB (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribdv\0"

+   "glGetVertexAttribdvARB\0"

+   "\0"

+   /* _mesa_function_pool[20473]: TexBumpParameterivATI (will be remapped) */

+   "ip\0"

+   "glTexBumpParameterivATI\0"

+   "\0"

+   /* _mesa_function_pool[20501]: GetSeparableFilter (offset 359) */

+   "iiippp\0"

+   "glGetSeparableFilter\0"

+   "glGetSeparableFilterEXT\0"

+   "\0"

+   /* _mesa_function_pool[20554]: Binormal3dEXT (dynamic) */

+   "ddd\0"

+   "glBinormal3dEXT\0"

+   "\0"

+   /* _mesa_function_pool[20575]: SpriteParameteriSGIX (dynamic) */

+   "ii\0"

+   "glSpriteParameteriSGIX\0"

+   "\0"

+   /* _mesa_function_pool[20602]: RequestResidentProgramsNV (will be remapped) */

+   "ip\0"

+   "glRequestResidentProgramsNV\0"

+   "\0"

+   /* _mesa_function_pool[20634]: TagSampleBufferSGIX (dynamic) */

+   "\0"

+   "glTagSampleBufferSGIX\0"

+   "\0"

+   /* _mesa_function_pool[20658]: TransformFeedbackVaryingsEXT (will be remapped) */

+   "iipi\0"

+   "glTransformFeedbackVaryingsEXT\0"

+   "glTransformFeedbackVaryings\0"

+   "\0"

+   /* _mesa_function_pool[20723]: FeedbackBuffer (offset 194) */

+   "iip\0"

+   "glFeedbackBuffer\0"

+   "\0"

+   /* _mesa_function_pool[20745]: RasterPos2iv (offset 67) */

+   "p\0"

+   "glRasterPos2iv\0"

+   "\0"

+   /* _mesa_function_pool[20763]: TexImage1D (offset 182) */

+   "iiiiiiip\0"

+   "glTexImage1D\0"

+   "\0"

+   /* _mesa_function_pool[20786]: ListParameterivSGIX (dynamic) */

+   "iip\0"

+   "glListParameterivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[20813]: MultiDrawElementsEXT (will be remapped) */

+   "ipipi\0"

+   "glMultiDrawElements\0"

+   "glMultiDrawElementsEXT\0"

+   "\0"

+   /* _mesa_function_pool[20863]: Color3s (offset 17) */

+   "iii\0"

+   "glColor3s\0"

+   "\0"

+   /* _mesa_function_pool[20878]: Uniform1ivARB (will be remapped) */

+   "iip\0"

+   "glUniform1iv\0"

+   "glUniform1ivARB\0"

+   "\0"

+   /* _mesa_function_pool[20912]: WindowPos2sMESA (will be remapped) */

+   "ii\0"

+   "glWindowPos2s\0"

+   "glWindowPos2sARB\0"

+   "glWindowPos2sMESA\0"

+   "\0"

+   /* _mesa_function_pool[20965]: WeightusvARB (dynamic) */

+   "ip\0"

+   "glWeightusvARB\0"

+   "\0"

+   /* _mesa_function_pool[20984]: TexCoordPointer (offset 320) */

+   "iiip\0"

+   "glTexCoordPointer\0"

+   "\0"

+   /* _mesa_function_pool[21008]: FogCoordPointerEXT (will be remapped) */

+   "iip\0"

+   "glFogCoordPointer\0"

+   "glFogCoordPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[21052]: IndexMaterialEXT (dynamic) */

+   "ii\0"

+   "glIndexMaterialEXT\0"

+   "\0"

+   /* _mesa_function_pool[21075]: Color3i (offset 15) */

+   "iii\0"

+   "glColor3i\0"

+   "\0"

+   /* _mesa_function_pool[21090]: FrontFace (offset 157) */

+   "i\0"

+   "glFrontFace\0"

+   "\0"

+   /* _mesa_function_pool[21105]: EvalCoord2d (offset 232) */

+   "dd\0"

+   "glEvalCoord2d\0"

+   "\0"

+   /* _mesa_function_pool[21123]: SecondaryColor3ubvEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3ubv\0"

+   "glSecondaryColor3ubvEXT\0"

+   "\0"

+   /* _mesa_function_pool[21171]: EvalCoord2f (offset 234) */

+   "ff\0"

+   "glEvalCoord2f\0"

+   "\0"

+   /* _mesa_function_pool[21189]: VertexAttrib4dvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4dv\0"

+   "glVertexAttrib4dvARB\0"

+   "\0"

+   /* _mesa_function_pool[21232]: BindAttribLocationARB (will be remapped) */

+   "iip\0"

+   "glBindAttribLocation\0"

+   "glBindAttribLocationARB\0"

+   "\0"

+   /* _mesa_function_pool[21282]: Color3b (offset 9) */

+   "iii\0"

+   "glColor3b\0"

+   "\0"

+   /* _mesa_function_pool[21297]: MultiTexCoord2dARB (offset 384) */

+   "idd\0"

+   "glMultiTexCoord2d\0"

+   "glMultiTexCoord2dARB\0"

+   "\0"

+   /* _mesa_function_pool[21341]: ExecuteProgramNV (will be remapped) */

+   "iip\0"

+   "glExecuteProgramNV\0"

+   "\0"

+   /* _mesa_function_pool[21365]: Color3f (offset 13) */

+   "fff\0"

+   "glColor3f\0"

+   "\0"

+   /* _mesa_function_pool[21380]: LightEnviSGIX (dynamic) */

+   "ii\0"

+   "glLightEnviSGIX\0"

+   "\0"

+   /* _mesa_function_pool[21400]: Color3d (offset 11) */

+   "ddd\0"

+   "glColor3d\0"

+   "\0"

+   /* _mesa_function_pool[21415]: Normal3dv (offset 55) */

+   "p\0"

+   "glNormal3dv\0"

+   "\0"

+   /* _mesa_function_pool[21430]: Lightf (offset 159) */

+   "iif\0"

+   "glLightf\0"

+   "\0"

+   /* _mesa_function_pool[21444]: ReplacementCodeuiSUN (dynamic) */

+   "i\0"

+   "glReplacementCodeuiSUN\0"

+   "\0"

+   /* _mesa_function_pool[21470]: MatrixMode (offset 293) */

+   "i\0"

+   "glMatrixMode\0"

+   "\0"

+   /* _mesa_function_pool[21486]: GetPixelMapusv (offset 273) */

+   "ip\0"

+   "glGetPixelMapusv\0"

+   "\0"

+   /* _mesa_function_pool[21507]: Lighti (offset 161) */

+   "iii\0"

+   "glLighti\0"

+   "\0"

+   /* _mesa_function_pool[21521]: VertexAttribPointerNV (will be remapped) */

+   "iiiip\0"

+   "glVertexAttribPointerNV\0"

+   "\0"

+   /* _mesa_function_pool[21552]: GetBooleanIndexedvEXT (will be remapped) */

+   "iip\0"

+   "glGetBooleanIndexedvEXT\0"

+   "glGetBooleani_v\0"

+   "\0"

+   /* _mesa_function_pool[21597]: GetFramebufferAttachmentParameterivEXT (will be remapped) */

+   "iiip\0"

+   "glGetFramebufferAttachmentParameteriv\0"

+   "glGetFramebufferAttachmentParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[21682]: PixelTransformParameterfEXT (dynamic) */

+   "iif\0"

+   "glPixelTransformParameterfEXT\0"

+   "\0"

+   /* _mesa_function_pool[21717]: MultiTexCoord4dvARB (offset 401) */

+   "ip\0"

+   "glMultiTexCoord4dv\0"

+   "glMultiTexCoord4dvARB\0"

+   "\0"

+   /* _mesa_function_pool[21762]: PixelTransformParameteriEXT (dynamic) */

+   "iii\0"

+   "glPixelTransformParameteriEXT\0"

+   "\0"

+   /* _mesa_function_pool[21797]: GetDoublev (offset 260) */

+   "ip\0"

+   "glGetDoublev\0"

+   "\0"

+   /* _mesa_function_pool[21814]: MultMatrixd (offset 295) */

+   "p\0"

+   "glMultMatrixd\0"

+   "\0"

+   /* _mesa_function_pool[21831]: MultMatrixf (offset 294) */

+   "p\0"

+   "glMultMatrixf\0"

+   "\0"

+   /* _mesa_function_pool[21848]: VertexAttribI4bvEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI4bvEXT\0"

+   "glVertexAttribI4bv\0"

+   "\0"

+   /* _mesa_function_pool[21893]: TexCoord2fColor4ubVertex3fSUN (dynamic) */

+   "ffiiiifff\0"

+   "glTexCoord2fColor4ubVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[21936]: Uniform1iARB (will be remapped) */

+   "ii\0"

+   "glUniform1i\0"

+   "glUniform1iARB\0"

+   "\0"

+   /* _mesa_function_pool[21967]: VertexAttribPointerARB (will be remapped) */

+   "iiiiip\0"

+   "glVertexAttribPointer\0"

+   "glVertexAttribPointerARB\0"

+   "\0"

+   /* _mesa_function_pool[22022]: VertexAttrib3sNV (will be remapped) */

+   "iiii\0"

+   "glVertexAttrib3sNV\0"

+   "\0"

+   /* _mesa_function_pool[22047]: SharpenTexFuncSGIS (dynamic) */

+   "iip\0"

+   "glSharpenTexFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[22073]: MultiTexCoord4fvARB (offset 403) */

+   "ip\0"

+   "glMultiTexCoord4fv\0"

+   "glMultiTexCoord4fvARB\0"

+   "\0"

+   /* _mesa_function_pool[22118]: Uniform2uiEXT (will be remapped) */

+   "iii\0"

+   "glUniform2uiEXT\0"

+   "glUniform2ui\0"

+   "\0"

+   /* _mesa_function_pool[22152]: UniformMatrix2x3fv (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix2x3fv\0"

+   "\0"

+   /* _mesa_function_pool[22179]: TrackMatrixNV (will be remapped) */

+   "iiii\0"

+   "glTrackMatrixNV\0"

+   "\0"

+   /* _mesa_function_pool[22201]: CombinerParameteriNV (will be remapped) */

+   "ii\0"

+   "glCombinerParameteriNV\0"

+   "\0"

+   /* _mesa_function_pool[22228]: DeleteAsyncMarkersSGIX (dynamic) */

+   "ii\0"

+   "glDeleteAsyncMarkersSGIX\0"

+   "\0"

+   /* _mesa_function_pool[22257]: ReplacementCodeusSUN (dynamic) */

+   "i\0"

+   "glReplacementCodeusSUN\0"

+   "\0"

+   /* _mesa_function_pool[22283]: IsAsyncMarkerSGIX (dynamic) */

+   "i\0"

+   "glIsAsyncMarkerSGIX\0"

+   "\0"

+   /* _mesa_function_pool[22306]: FrameZoomSGIX (dynamic) */

+   "i\0"

+   "glFrameZoomSGIX\0"

+   "\0"

+   /* _mesa_function_pool[22325]: Normal3fVertex3fvSUN (dynamic) */

+   "pp\0"

+   "glNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[22352]: RasterPos4sv (offset 85) */

+   "p\0"

+   "glRasterPos4sv\0"

+   "\0"

+   /* _mesa_function_pool[22370]: VertexAttrib4NsvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4Nsv\0"

+   "glVertexAttrib4NsvARB\0"

+   "\0"

+   /* _mesa_function_pool[22415]: VertexAttrib3fvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib3fv\0"

+   "glVertexAttrib3fvARB\0"

+   "\0"

+   /* _mesa_function_pool[22458]: ClearColor (offset 206) */

+   "ffff\0"

+   "glClearColor\0"

+   "\0"

+   /* _mesa_function_pool[22477]: GetSynciv (will be remapped) */

+   "iiipp\0"

+   "glGetSynciv\0"

+   "\0"

+   /* _mesa_function_pool[22496]: ClearColorIiEXT (will be remapped) */

+   "iiii\0"

+   "glClearColorIiEXT\0"

+   "\0"

+   /* _mesa_function_pool[22520]: DeleteFramebuffersEXT (will be remapped) */

+   "ip\0"

+   "glDeleteFramebuffers\0"

+   "glDeleteFramebuffersEXT\0"

+   "\0"

+   /* _mesa_function_pool[22569]: GlobalAlphaFactorsSUN (dynamic) */

+   "i\0"

+   "glGlobalAlphaFactorsSUN\0"

+   "\0"

+   /* _mesa_function_pool[22596]: IsEnabledIndexedEXT (will be remapped) */

+   "ii\0"

+   "glIsEnabledIndexedEXT\0"

+   "glIsEnabledi\0"

+   "\0"

+   /* _mesa_function_pool[22635]: TexEnviv (offset 187) */

+   "iip\0"

+   "glTexEnviv\0"

+   "\0"

+   /* _mesa_function_pool[22651]: TexSubImage3D (offset 372) */

+   "iiiiiiiiiip\0"

+   "glTexSubImage3D\0"

+   "glTexSubImage3DEXT\0"

+   "\0"

+   /* _mesa_function_pool[22699]: Tangent3fEXT (dynamic) */

+   "fff\0"

+   "glTangent3fEXT\0"

+   "\0"

+   /* _mesa_function_pool[22719]: SecondaryColor3uivEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3uiv\0"

+   "glSecondaryColor3uivEXT\0"

+   "\0"

+   /* _mesa_function_pool[22767]: MatrixIndexubvARB (dynamic) */

+   "ip\0"

+   "glMatrixIndexubvARB\0"

+   "\0"

+   /* _mesa_function_pool[22791]: Color4fNormal3fVertex3fSUN (dynamic) */

+   "ffffffffff\0"

+   "glColor4fNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[22832]: PixelTexGenParameterfSGIS (will be remapped) */

+   "if\0"

+   "glPixelTexGenParameterfSGIS\0"

+   "\0"

+   /* _mesa_function_pool[22864]: CreateShader (will be remapped) */

+   "i\0"

+   "glCreateShader\0"

+   "\0"

+   /* _mesa_function_pool[22882]: GetColorTableParameterfv (offset 344) */

+   "iip\0"

+   "glGetColorTableParameterfv\0"

+   "glGetColorTableParameterfvSGI\0"

+   "glGetColorTableParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[22974]: FragmentLightModelfvSGIX (dynamic) */

+   "ip\0"

+   "glFragmentLightModelfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[23005]: Bitmap (offset 8) */

+   "iiffffp\0"

+   "glBitmap\0"

+   "\0"

+   /* _mesa_function_pool[23023]: MultiTexCoord3fARB (offset 394) */

+   "ifff\0"

+   "glMultiTexCoord3f\0"

+   "glMultiTexCoord3fARB\0"

+   "\0"

+   /* _mesa_function_pool[23068]: GetTexLevelParameterfv (offset 284) */

+   "iiip\0"

+   "glGetTexLevelParameterfv\0"

+   "\0"

+   /* _mesa_function_pool[23099]: GetPixelTexGenParameterfvSGIS (will be remapped) */

+   "ip\0"

+   "glGetPixelTexGenParameterfvSGIS\0"

+   "\0"

+   /* _mesa_function_pool[23135]: GenFramebuffersEXT (will be remapped) */

+   "ip\0"

+   "glGenFramebuffers\0"

+   "glGenFramebuffersEXT\0"

+   "\0"

+   /* _mesa_function_pool[23178]: VertexAttribDivisor (will be remapped) */

+   "ii\0"

+   "glVertexAttribDivisor\0"

+   "\0"

+   /* _mesa_function_pool[23204]: GetProgramParameterdvNV (will be remapped) */

+   "iiip\0"

+   "glGetProgramParameterdvNV\0"

+   "\0"

+   /* _mesa_function_pool[23236]: Vertex2sv (offset 133) */

+   "p\0"

+   "glVertex2sv\0"

+   "\0"

+   /* _mesa_function_pool[23251]: GetIntegerv (offset 263) */

+   "ip\0"

+   "glGetIntegerv\0"

+   "\0"

+   /* _mesa_function_pool[23269]: IsVertexArrayAPPLE (will be remapped) */

+   "i\0"

+   "glIsVertexArray\0"

+   "glIsVertexArrayAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[23309]: FragmentLightfvSGIX (dynamic) */

+   "iip\0"

+   "glFragmentLightfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[23336]: DetachShader (will be remapped) */

+   "ii\0"

+   "glDetachShader\0"

+   "\0"

+   /* _mesa_function_pool[23355]: VertexAttrib4NubARB (will be remapped) */

+   "iiiii\0"

+   "glVertexAttrib4Nub\0"

+   "glVertexAttrib4NubARB\0"

+   "\0"

+   /* _mesa_function_pool[23403]: GetProgramEnvParameterfvARB (will be remapped) */

+   "iip\0"

+   "glGetProgramEnvParameterfvARB\0"

+   "\0"

+   /* _mesa_function_pool[23438]: GetTrackMatrixivNV (will be remapped) */

+   "iiip\0"

+   "glGetTrackMatrixivNV\0"

+   "\0"

+   /* _mesa_function_pool[23465]: VertexAttrib3svNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib3svNV\0"

+   "\0"

+   /* _mesa_function_pool[23489]: Uniform4fvARB (will be remapped) */

+   "iip\0"

+   "glUniform4fv\0"

+   "glUniform4fvARB\0"

+   "\0"

+   /* _mesa_function_pool[23523]: MultTransposeMatrixfARB (will be remapped) */

+   "p\0"

+   "glMultTransposeMatrixf\0"

+   "glMultTransposeMatrixfARB\0"

+   "\0"

+   /* _mesa_function_pool[23575]: GetTexEnviv (offset 277) */

+   "iip\0"

+   "glGetTexEnviv\0"

+   "\0"

+   /* _mesa_function_pool[23594]: ColorFragmentOp1ATI (will be remapped) */

+   "iiiiiii\0"

+   "glColorFragmentOp1ATI\0"

+   "\0"

+   /* _mesa_function_pool[23625]: GetUniformfvARB (will be remapped) */

+   "iip\0"

+   "glGetUniformfv\0"

+   "glGetUniformfvARB\0"

+   "\0"

+   /* _mesa_function_pool[23663]: EGLImageTargetRenderbufferStorageOES (will be remapped) */

+   "ip\0"

+   "glEGLImageTargetRenderbufferStorageOES\0"

+   "\0"

+   /* _mesa_function_pool[23706]: VertexAttribI2ivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI2ivEXT\0"

+   "glVertexAttribI2iv\0"

+   "\0"

+   /* _mesa_function_pool[23751]: PopClientAttrib (offset 334) */

+   "\0"

+   "glPopClientAttrib\0"

+   "\0"

+   /* _mesa_function_pool[23771]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */

+   "iffffffffffff\0"

+   "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[23842]: DetachObjectARB (will be remapped) */

+   "ii\0"

+   "glDetachObjectARB\0"

+   "\0"

+   /* _mesa_function_pool[23864]: VertexBlendARB (dynamic) */

+   "i\0"

+   "glVertexBlendARB\0"

+   "\0"

+   /* _mesa_function_pool[23884]: WindowPos3iMESA (will be remapped) */

+   "iii\0"

+   "glWindowPos3i\0"

+   "glWindowPos3iARB\0"

+   "glWindowPos3iMESA\0"

+   "\0"

+   /* _mesa_function_pool[23938]: SeparableFilter2D (offset 360) */

+   "iiiiiipp\0"

+   "glSeparableFilter2D\0"

+   "glSeparableFilter2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[23991]: ProgramParameteriARB (will be remapped) */

+   "iii\0"

+   "glProgramParameteriARB\0"

+   "\0"

+   /* _mesa_function_pool[24019]: Map1d (offset 220) */

+   "iddiip\0"

+   "glMap1d\0"

+   "\0"

+   /* _mesa_function_pool[24035]: Map1f (offset 221) */

+   "iffiip\0"

+   "glMap1f\0"

+   "\0"

+   /* _mesa_function_pool[24051]: CompressedTexImage2DARB (will be remapped) */

+   "iiiiiiip\0"

+   "glCompressedTexImage2D\0"

+   "glCompressedTexImage2DARB\0"

+   "\0"

+   /* _mesa_function_pool[24110]: ArrayElement (offset 306) */

+   "i\0"

+   "glArrayElement\0"

+   "glArrayElementEXT\0"

+   "\0"

+   /* _mesa_function_pool[24146]: TexImage2D (offset 183) */

+   "iiiiiiiip\0"

+   "glTexImage2D\0"

+   "\0"

+   /* _mesa_function_pool[24170]: DepthBoundsEXT (will be remapped) */

+   "dd\0"

+   "glDepthBoundsEXT\0"

+   "\0"

+   /* _mesa_function_pool[24191]: ProgramParameters4fvNV (will be remapped) */

+   "iiip\0"

+   "glProgramParameters4fvNV\0"

+   "\0"

+   /* _mesa_function_pool[24222]: DeformationMap3fSGIX (dynamic) */

+   "iffiiffiiffiip\0"

+   "glDeformationMap3fSGIX\0"

+   "\0"

+   /* _mesa_function_pool[24261]: GetProgramivNV (will be remapped) */

+   "iip\0"

+   "glGetProgramivNV\0"

+   "\0"

+   /* _mesa_function_pool[24283]: GetFragDataLocationEXT (will be remapped) */

+   "ip\0"

+   "glGetFragDataLocationEXT\0"

+   "glGetFragDataLocation\0"

+   "\0"

+   /* _mesa_function_pool[24334]: GetMinmaxParameteriv (offset 366) */

+   "iip\0"

+   "glGetMinmaxParameteriv\0"

+   "glGetMinmaxParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[24388]: PixelTransferf (offset 247) */

+   "if\0"

+   "glPixelTransferf\0"

+   "\0"

+   /* _mesa_function_pool[24409]: CopyTexImage1D (offset 323) */

+   "iiiiiii\0"

+   "glCopyTexImage1D\0"

+   "glCopyTexImage1DEXT\0"

+   "\0"

+   /* _mesa_function_pool[24455]: PushMatrix (offset 298) */

+   "\0"

+   "glPushMatrix\0"

+   "\0"

+   /* _mesa_function_pool[24470]: Fogiv (offset 156) */

+   "ip\0"

+   "glFogiv\0"

+   "\0"

+   /* _mesa_function_pool[24482]: TexCoord1dv (offset 95) */

+   "p\0"

+   "glTexCoord1dv\0"

+   "\0"

+   /* _mesa_function_pool[24499]: AlphaFragmentOp3ATI (will be remapped) */

+   "iiiiiiiiiiii\0"

+   "glAlphaFragmentOp3ATI\0"

+   "\0"

+   /* _mesa_function_pool[24535]: PixelTransferi (offset 248) */

+   "ii\0"

+   "glPixelTransferi\0"

+   "\0"

+   /* _mesa_function_pool[24556]: GetVertexAttribdvNV (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribdvNV\0"

+   "\0"

+   /* _mesa_function_pool[24583]: VertexAttrib3fvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib3fvNV\0"

+   "\0"

+   /* _mesa_function_pool[24607]: Rotatef (offset 300) */

+   "ffff\0"

+   "glRotatef\0"

+   "\0"

+   /* _mesa_function_pool[24623]: GetFinalCombinerInputParameterivNV (will be remapped) */

+   "iip\0"

+   "glGetFinalCombinerInputParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[24665]: Vertex3i (offset 138) */

+   "iii\0"

+   "glVertex3i\0"

+   "\0"

+   /* _mesa_function_pool[24681]: Vertex3f (offset 136) */

+   "fff\0"

+   "glVertex3f\0"

+   "\0"

+   /* _mesa_function_pool[24697]: Clear (offset 203) */

+   "i\0"

+   "glClear\0"

+   "\0"

+   /* _mesa_function_pool[24708]: Vertex3d (offset 134) */

+   "ddd\0"

+   "glVertex3d\0"

+   "\0"

+   /* _mesa_function_pool[24724]: GetMapParameterivNV (dynamic) */

+   "iip\0"

+   "glGetMapParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[24751]: Uniform4iARB (will be remapped) */

+   "iiiii\0"

+   "glUniform4i\0"

+   "glUniform4iARB\0"

+   "\0"

+   /* _mesa_function_pool[24785]: ReadBuffer (offset 254) */

+   "i\0"

+   "glReadBuffer\0"

+   "\0"

+   /* _mesa_function_pool[24801]: ConvolutionParameteri (offset 352) */

+   "iii\0"

+   "glConvolutionParameteri\0"

+   "glConvolutionParameteriEXT\0"

+   "\0"

+   /* _mesa_function_pool[24857]: Ortho (offset 296) */

+   "dddddd\0"

+   "glOrtho\0"

+   "\0"

+   /* _mesa_function_pool[24873]: Binormal3sEXT (dynamic) */

+   "iii\0"

+   "glBinormal3sEXT\0"

+   "\0"

+   /* _mesa_function_pool[24894]: ListBase (offset 6) */

+   "i\0"

+   "glListBase\0"

+   "\0"

+   /* _mesa_function_pool[24908]: Vertex3s (offset 140) */

+   "iii\0"

+   "glVertex3s\0"

+   "\0"

+   /* _mesa_function_pool[24924]: ConvolutionParameterf (offset 350) */

+   "iif\0"

+   "glConvolutionParameterf\0"

+   "glConvolutionParameterfEXT\0"

+   "\0"

+   /* _mesa_function_pool[24980]: GetColorTableParameteriv (offset 345) */

+   "iip\0"

+   "glGetColorTableParameteriv\0"

+   "glGetColorTableParameterivSGI\0"

+   "glGetColorTableParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[25072]: ProgramEnvParameter4dvARB (will be remapped) */

+   "iip\0"

+   "glProgramEnvParameter4dvARB\0"

+   "glProgramParameter4dvNV\0"

+   "\0"

+   /* _mesa_function_pool[25129]: ShadeModel (offset 177) */

+   "i\0"

+   "glShadeModel\0"

+   "\0"

+   /* _mesa_function_pool[25145]: VertexAttribs2fvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs2fvNV\0"

+   "\0"

+   /* _mesa_function_pool[25171]: Rectiv (offset 91) */

+   "pp\0"

+   "glRectiv\0"

+   "\0"

+   /* _mesa_function_pool[25184]: UseProgramObjectARB (will be remapped) */

+   "i\0"

+   "glUseProgram\0"

+   "glUseProgramObjectARB\0"

+   "\0"

+   /* _mesa_function_pool[25222]: GetMapParameterfvNV (dynamic) */

+   "iip\0"

+   "glGetMapParameterfvNV\0"

+   "\0"

+   /* _mesa_function_pool[25249]: EndConditionalRenderNV (will be remapped) */

+   "\0"

+   "glEndConditionalRenderNV\0"

+   "glEndConditionalRender\0"

+   "\0"

+   /* _mesa_function_pool[25299]: PassTexCoordATI (will be remapped) */

+   "iii\0"

+   "glPassTexCoordATI\0"

+   "\0"

+   /* _mesa_function_pool[25322]: DeleteProgram (will be remapped) */

+   "i\0"

+   "glDeleteProgram\0"

+   "\0"

+   /* _mesa_function_pool[25341]: Tangent3ivEXT (dynamic) */

+   "p\0"

+   "glTangent3ivEXT\0"

+   "\0"

+   /* _mesa_function_pool[25360]: Tangent3dEXT (dynamic) */

+   "ddd\0"

+   "glTangent3dEXT\0"

+   "\0"

+   /* _mesa_function_pool[25380]: SecondaryColor3dvEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3dv\0"

+   "glSecondaryColor3dvEXT\0"

+   "\0"

+   /* _mesa_function_pool[25426]: Vertex2fv (offset 129) */

+   "p\0"

+   "glVertex2fv\0"

+   "\0"

+   /* _mesa_function_pool[25441]: MultiDrawArraysEXT (will be remapped) */

+   "ippi\0"

+   "glMultiDrawArrays\0"

+   "glMultiDrawArraysEXT\0"

+   "\0"

+   /* _mesa_function_pool[25486]: BindRenderbufferEXT (will be remapped) */

+   "ii\0"

+   "glBindRenderbuffer\0"

+   "glBindRenderbufferEXT\0"

+   "\0"

+   /* _mesa_function_pool[25531]: MultiTexCoord4dARB (offset 400) */

+   "idddd\0"

+   "glMultiTexCoord4d\0"

+   "glMultiTexCoord4dARB\0"

+   "\0"

+   /* _mesa_function_pool[25577]: FramebufferTextureFaceARB (will be remapped) */

+   "iiiii\0"

+   "glFramebufferTextureFaceARB\0"

+   "\0"

+   /* _mesa_function_pool[25612]: Vertex3sv (offset 141) */

+   "p\0"

+   "glVertex3sv\0"

+   "\0"

+   /* _mesa_function_pool[25627]: SecondaryColor3usEXT (will be remapped) */

+   "iii\0"

+   "glSecondaryColor3us\0"

+   "glSecondaryColor3usEXT\0"

+   "\0"

+   /* _mesa_function_pool[25675]: ProgramLocalParameter4fvARB (will be remapped) */

+   "iip\0"

+   "glProgramLocalParameter4fvARB\0"

+   "\0"

+   /* _mesa_function_pool[25710]: DeleteProgramsNV (will be remapped) */

+   "ip\0"

+   "glDeleteProgramsARB\0"

+   "glDeleteProgramsNV\0"

+   "\0"

+   /* _mesa_function_pool[25753]: EvalMesh1 (offset 236) */

+   "iii\0"

+   "glEvalMesh1\0"

+   "\0"

+   /* _mesa_function_pool[25770]: PauseTransformFeedback (will be remapped) */

+   "\0"

+   "glPauseTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[25797]: MultiTexCoord1sARB (offset 382) */

+   "ii\0"

+   "glMultiTexCoord1s\0"

+   "glMultiTexCoord1sARB\0"

+   "\0"

+   /* _mesa_function_pool[25840]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */

+   "iffffff\0"

+   "glReplacementCodeuiColor3fVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[25887]: GetVertexAttribPointervNV (will be remapped) */

+   "iip\0"

+   "glGetVertexAttribPointerv\0"

+   "glGetVertexAttribPointervARB\0"

+   "glGetVertexAttribPointervNV\0"

+   "\0"

+   /* _mesa_function_pool[25975]: VertexAttribs1fvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs1fvNV\0"

+   "\0"

+   /* _mesa_function_pool[26001]: MultiTexCoord1dvARB (offset 377) */

+   "ip\0"

+   "glMultiTexCoord1dv\0"

+   "glMultiTexCoord1dvARB\0"

+   "\0"

+   /* _mesa_function_pool[26046]: Uniform2iARB (will be remapped) */

+   "iii\0"

+   "glUniform2i\0"

+   "glUniform2iARB\0"

+   "\0"

+   /* _mesa_function_pool[26078]: Vertex2iv (offset 131) */

+   "p\0"

+   "glVertex2iv\0"

+   "\0"

+   /* _mesa_function_pool[26093]: GetProgramStringNV (will be remapped) */

+   "iip\0"

+   "glGetProgramStringNV\0"

+   "\0"

+   /* _mesa_function_pool[26119]: ColorPointerEXT (will be remapped) */

+   "iiiip\0"

+   "glColorPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[26144]: LineWidth (offset 168) */

+   "f\0"

+   "glLineWidth\0"

+   "\0"

+   /* _mesa_function_pool[26159]: MapBufferARB (will be remapped) */

+   "ii\0"

+   "glMapBuffer\0"

+   "glMapBufferARB\0"

+   "\0"

+   /* _mesa_function_pool[26190]: MultiDrawElementsBaseVertex (will be remapped) */

+   "ipipip\0"

+   "glMultiDrawElementsBaseVertex\0"

+   "\0"

+   /* _mesa_function_pool[26228]: TexParameterIuivEXT (will be remapped) */

+   "iip\0"

+   "glTexParameterIuivEXT\0"

+   "glTexParameterIuiv\0"

+   "\0"

+   /* _mesa_function_pool[26274]: Binormal3svEXT (dynamic) */

+   "p\0"

+   "glBinormal3svEXT\0"

+   "\0"

+   /* _mesa_function_pool[26294]: ApplyTextureEXT (dynamic) */

+   "i\0"

+   "glApplyTextureEXT\0"

+   "\0"

+   /* _mesa_function_pool[26315]: GetBufferParameteri64v (will be remapped) */

+   "iip\0"

+   "glGetBufferParameteri64v\0"

+   "\0"

+   /* _mesa_function_pool[26345]: TexGendv (offset 189) */

+   "iip\0"

+   "glTexGendv\0"

+   "\0"

+   /* _mesa_function_pool[26361]: VertexAttribI3iEXT (will be remapped) */

+   "iiii\0"

+   "glVertexAttribI3iEXT\0"

+   "glVertexAttribI3i\0"

+   "\0"

+   /* _mesa_function_pool[26406]: EnableIndexedEXT (will be remapped) */

+   "ii\0"

+   "glEnableIndexedEXT\0"

+   "glEnablei\0"

+   "\0"

+   /* _mesa_function_pool[26439]: TextureMaterialEXT (dynamic) */

+   "ii\0"

+   "glTextureMaterialEXT\0"

+   "\0"

+   /* _mesa_function_pool[26464]: TextureLightEXT (dynamic) */

+   "i\0"

+   "glTextureLightEXT\0"

+   "\0"

+   /* _mesa_function_pool[26485]: ResetMinmax (offset 370) */

+   "i\0"

+   "glResetMinmax\0"

+   "glResetMinmaxEXT\0"

+   "\0"

+   /* _mesa_function_pool[26519]: SpriteParameterfSGIX (dynamic) */

+   "if\0"

+   "glSpriteParameterfSGIX\0"

+   "\0"

+   /* _mesa_function_pool[26546]: EnableClientState (offset 313) */

+   "i\0"

+   "glEnableClientState\0"

+   "\0"

+   /* _mesa_function_pool[26569]: VertexAttrib4sNV (will be remapped) */

+   "iiiii\0"

+   "glVertexAttrib4sNV\0"

+   "\0"

+   /* _mesa_function_pool[26595]: GetConvolutionParameterfv (offset 357) */

+   "iip\0"

+   "glGetConvolutionParameterfv\0"

+   "glGetConvolutionParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[26659]: VertexAttribs4dvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs4dvNV\0"

+   "\0"

+   /* _mesa_function_pool[26685]: VertexAttrib4dARB (will be remapped) */

+   "idddd\0"

+   "glVertexAttrib4d\0"

+   "glVertexAttrib4dARB\0"

+   "\0"

+   /* _mesa_function_pool[26729]: GetTexBumpParameterfvATI (will be remapped) */

+   "ip\0"

+   "glGetTexBumpParameterfvATI\0"

+   "\0"

+   /* _mesa_function_pool[26760]: ProgramNamedParameter4dNV (will be remapped) */

+   "iipdddd\0"

+   "glProgramNamedParameter4dNV\0"

+   "\0"

+   /* _mesa_function_pool[26797]: GetMaterialfv (offset 269) */

+   "iip\0"

+   "glGetMaterialfv\0"

+   "\0"

+   /* _mesa_function_pool[26818]: VertexWeightfEXT (dynamic) */

+   "f\0"

+   "glVertexWeightfEXT\0"

+   "\0"

+   /* _mesa_function_pool[26840]: Binormal3fEXT (dynamic) */

+   "fff\0"

+   "glBinormal3fEXT\0"

+   "\0"

+   /* _mesa_function_pool[26861]: CallList (offset 2) */

+   "i\0"

+   "glCallList\0"

+   "\0"

+   /* _mesa_function_pool[26875]: Materialfv (offset 170) */

+   "iip\0"

+   "glMaterialfv\0"

+   "\0"

+   /* _mesa_function_pool[26893]: TexCoord3fv (offset 113) */

+   "p\0"

+   "glTexCoord3fv\0"

+   "\0"

+   /* _mesa_function_pool[26910]: FogCoordfvEXT (will be remapped) */

+   "p\0"

+   "glFogCoordfv\0"

+   "glFogCoordfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[26942]: MultiTexCoord1ivARB (offset 381) */

+   "ip\0"

+   "glMultiTexCoord1iv\0"

+   "glMultiTexCoord1ivARB\0"

+   "\0"

+   /* _mesa_function_pool[26987]: SecondaryColor3ubEXT (will be remapped) */

+   "iii\0"

+   "glSecondaryColor3ub\0"

+   "glSecondaryColor3ubEXT\0"

+   "\0"

+   /* _mesa_function_pool[27035]: MultiTexCoord2ivARB (offset 389) */

+   "ip\0"

+   "glMultiTexCoord2iv\0"

+   "glMultiTexCoord2ivARB\0"

+   "\0"

+   /* _mesa_function_pool[27080]: FogFuncSGIS (dynamic) */

+   "ip\0"

+   "glFogFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[27098]: CopyTexSubImage2D (offset 326) */

+   "iiiiiiii\0"

+   "glCopyTexSubImage2D\0"

+   "glCopyTexSubImage2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[27151]: GetObjectParameterivARB (will be remapped) */

+   "iip\0"

+   "glGetObjectParameterivARB\0"

+   "\0"

+   /* _mesa_function_pool[27182]: Color3iv (offset 16) */

+   "p\0"

+   "glColor3iv\0"

+   "\0"

+   /* _mesa_function_pool[27196]: TexCoord4fVertex4fSUN (dynamic) */

+   "ffffffff\0"

+   "glTexCoord4fVertex4fSUN\0"

+   "\0"

+   /* _mesa_function_pool[27230]: DrawElements (offset 311) */

+   "iiip\0"

+   "glDrawElements\0"

+   "\0"

+   /* _mesa_function_pool[27251]: BindVertexArrayAPPLE (will be remapped) */

+   "i\0"

+   "glBindVertexArrayAPPLE\0"

+   "\0"

+   /* _mesa_function_pool[27277]: GetProgramLocalParameterdvARB (will be remapped) */

+   "iip\0"

+   "glGetProgramLocalParameterdvARB\0"

+   "\0"

+   /* _mesa_function_pool[27314]: GetHistogramParameteriv (offset 363) */

+   "iip\0"

+   "glGetHistogramParameteriv\0"

+   "glGetHistogramParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[27374]: MultiTexCoord1iARB (offset 380) */

+   "ii\0"

+   "glMultiTexCoord1i\0"

+   "glMultiTexCoord1iARB\0"

+   "\0"

+   /* _mesa_function_pool[27417]: GetConvolutionFilter (offset 356) */

+   "iiip\0"

+   "glGetConvolutionFilter\0"

+   "glGetConvolutionFilterEXT\0"

+   "\0"

+   /* _mesa_function_pool[27472]: GetProgramivARB (will be remapped) */

+   "iip\0"

+   "glGetProgramivARB\0"

+   "\0"

+   /* _mesa_function_pool[27495]: BlendFuncSeparateEXT (will be remapped) */

+   "iiii\0"

+   "glBlendFuncSeparate\0"

+   "glBlendFuncSeparateEXT\0"

+   "glBlendFuncSeparateINGR\0"

+   "\0"

+   /* _mesa_function_pool[27568]: MapBufferRange (will be remapped) */

+   "iiii\0"

+   "glMapBufferRange\0"

+   "\0"

+   /* _mesa_function_pool[27591]: ProgramParameters4dvNV (will be remapped) */

+   "iiip\0"

+   "glProgramParameters4dvNV\0"

+   "\0"

+   /* _mesa_function_pool[27622]: TexCoord2fColor3fVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glTexCoord2fColor3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[27659]: EvalPoint2 (offset 239) */

+   "ii\0"

+   "glEvalPoint2\0"

+   "\0"

+   /* _mesa_function_pool[27676]: Uniform1uivEXT (will be remapped) */

+   "iip\0"

+   "glUniform1uivEXT\0"

+   "glUniform1uiv\0"

+   "\0"

+   /* _mesa_function_pool[27712]: EvalPoint1 (offset 237) */

+   "i\0"

+   "glEvalPoint1\0"

+   "\0"

+   /* _mesa_function_pool[27728]: Binormal3dvEXT (dynamic) */

+   "p\0"

+   "glBinormal3dvEXT\0"

+   "\0"

+   /* _mesa_function_pool[27748]: PopMatrix (offset 297) */

+   "\0"

+   "glPopMatrix\0"

+   "\0"

+   /* _mesa_function_pool[27762]: FinishFenceNV (will be remapped) */

+   "i\0"

+   "glFinishFenceNV\0"

+   "\0"

+   /* _mesa_function_pool[27781]: GetFogFuncSGIS (dynamic) */

+   "p\0"

+   "glGetFogFuncSGIS\0"

+   "\0"

+   /* _mesa_function_pool[27801]: GetUniformLocationARB (will be remapped) */

+   "ip\0"

+   "glGetUniformLocation\0"

+   "glGetUniformLocationARB\0"

+   "\0"

+   /* _mesa_function_pool[27850]: SecondaryColor3fEXT (will be remapped) */

+   "fff\0"

+   "glSecondaryColor3f\0"

+   "glSecondaryColor3fEXT\0"

+   "\0"

+   /* _mesa_function_pool[27896]: GetTexGeniv (offset 280) */

+   "iip\0"

+   "glGetTexGeniv\0"

+   "\0"

+   /* _mesa_function_pool[27915]: CombinerInputNV (will be remapped) */

+   "iiiiii\0"

+   "glCombinerInputNV\0"

+   "\0"

+   /* _mesa_function_pool[27941]: VertexAttrib3sARB (will be remapped) */

+   "iiii\0"

+   "glVertexAttrib3s\0"

+   "glVertexAttrib3sARB\0"

+   "\0"

+   /* _mesa_function_pool[27984]: IsTransformFeedback (will be remapped) */

+   "i\0"

+   "glIsTransformFeedback\0"

+   "\0"

+   /* _mesa_function_pool[28009]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */

+   "ppp\0"

+   "glReplacementCodeuiNormal3fVertex3fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[28054]: Map2d (offset 222) */

+   "iddiiddiip\0"

+   "glMap2d\0"

+   "\0"

+   /* _mesa_function_pool[28074]: Map2f (offset 223) */

+   "iffiiffiip\0"

+   "glMap2f\0"

+   "\0"

+   /* _mesa_function_pool[28094]: ProgramStringARB (will be remapped) */

+   "iiip\0"

+   "glProgramStringARB\0"

+   "\0"

+   /* _mesa_function_pool[28119]: Vertex4s (offset 148) */

+   "iiii\0"

+   "glVertex4s\0"

+   "\0"

+   /* _mesa_function_pool[28136]: TexCoord4fVertex4fvSUN (dynamic) */

+   "pp\0"

+   "glTexCoord4fVertex4fvSUN\0"

+   "\0"

+   /* _mesa_function_pool[28165]: FragmentLightModelivSGIX (dynamic) */

+   "ip\0"

+   "glFragmentLightModelivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[28196]: VertexAttrib1fNV (will be remapped) */

+   "if\0"

+   "glVertexAttrib1fNV\0"

+   "\0"

+   /* _mesa_function_pool[28219]: Vertex4f (offset 144) */

+   "ffff\0"

+   "glVertex4f\0"

+   "\0"

+   /* _mesa_function_pool[28236]: EvalCoord1d (offset 228) */

+   "d\0"

+   "glEvalCoord1d\0"

+   "\0"

+   /* _mesa_function_pool[28253]: Vertex4d (offset 142) */

+   "dddd\0"

+   "glVertex4d\0"

+   "\0"

+   /* _mesa_function_pool[28270]: RasterPos4dv (offset 79) */

+   "p\0"

+   "glRasterPos4dv\0"

+   "\0"

+   /* _mesa_function_pool[28288]: UseShaderProgramEXT (will be remapped) */

+   "ii\0"

+   "glUseShaderProgramEXT\0"

+   "\0"

+   /* _mesa_function_pool[28314]: FragmentLightfSGIX (dynamic) */

+   "iif\0"

+   "glFragmentLightfSGIX\0"

+   "\0"

+   /* _mesa_function_pool[28340]: GetCompressedTexImageARB (will be remapped) */

+   "iip\0"

+   "glGetCompressedTexImage\0"

+   "glGetCompressedTexImageARB\0"

+   "\0"

+   /* _mesa_function_pool[28396]: GetTexGenfv (offset 279) */

+   "iip\0"

+   "glGetTexGenfv\0"

+   "\0"

+   /* _mesa_function_pool[28415]: Vertex4i (offset 146) */

+   "iiii\0"

+   "glVertex4i\0"

+   "\0"

+   /* _mesa_function_pool[28432]: VertexWeightPointerEXT (dynamic) */

+   "iiip\0"

+   "glVertexWeightPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[28463]: GetHistogram (offset 361) */

+   "iiiip\0"

+   "glGetHistogram\0"

+   "glGetHistogramEXT\0"

+   "\0"

+   /* _mesa_function_pool[28503]: ActiveStencilFaceEXT (will be remapped) */

+   "i\0"

+   "glActiveStencilFaceEXT\0"

+   "\0"

+   /* _mesa_function_pool[28529]: StencilFuncSeparateATI (will be remapped) */

+   "iiii\0"

+   "glStencilFuncSeparateATI\0"

+   "\0"

+   /* _mesa_function_pool[28560]: Materialf (offset 169) */

+   "iif\0"

+   "glMaterialf\0"

+   "\0"

+   /* _mesa_function_pool[28577]: GetShaderSourceARB (will be remapped) */

+   "iipp\0"

+   "glGetShaderSource\0"

+   "glGetShaderSourceARB\0"

+   "\0"

+   /* _mesa_function_pool[28622]: IglooInterfaceSGIX (dynamic) */

+   "ip\0"

+   "glIglooInterfaceSGIX\0"

+   "\0"

+   /* _mesa_function_pool[28647]: Materiali (offset 171) */

+   "iii\0"

+   "glMateriali\0"

+   "\0"

+   /* _mesa_function_pool[28664]: VertexAttrib4dNV (will be remapped) */

+   "idddd\0"

+   "glVertexAttrib4dNV\0"

+   "\0"

+   /* _mesa_function_pool[28690]: MultiModeDrawElementsIBM (will be remapped) */

+   "ppipii\0"

+   "glMultiModeDrawElementsIBM\0"

+   "\0"

+   /* _mesa_function_pool[28725]: Indexsv (offset 51) */

+   "p\0"

+   "glIndexsv\0"

+   "\0"

+   /* _mesa_function_pool[28738]: MultiTexCoord4svARB (offset 407) */

+   "ip\0"

+   "glMultiTexCoord4sv\0"

+   "glMultiTexCoord4svARB\0"

+   "\0"

+   /* _mesa_function_pool[28783]: LightModelfv (offset 164) */

+   "ip\0"

+   "glLightModelfv\0"

+   "\0"

+   /* _mesa_function_pool[28802]: TexCoord2dv (offset 103) */

+   "p\0"

+   "glTexCoord2dv\0"

+   "\0"

+   /* _mesa_function_pool[28819]: GenQueriesARB (will be remapped) */

+   "ip\0"

+   "glGenQueries\0"

+   "glGenQueriesARB\0"

+   "\0"

+   /* _mesa_function_pool[28852]: EvalCoord1dv (offset 229) */

+   "p\0"

+   "glEvalCoord1dv\0"

+   "\0"

+   /* _mesa_function_pool[28870]: ReplacementCodeuiVertex3fSUN (dynamic) */

+   "ifff\0"

+   "glReplacementCodeuiVertex3fSUN\0"

+   "\0"

+   /* _mesa_function_pool[28907]: Translated (offset 303) */

+   "ddd\0"

+   "glTranslated\0"

+   "\0"

+   /* _mesa_function_pool[28925]: Translatef (offset 304) */

+   "fff\0"

+   "glTranslatef\0"

+   "\0"

+   /* _mesa_function_pool[28943]: Uniform3uiEXT (will be remapped) */

+   "iiii\0"

+   "glUniform3uiEXT\0"

+   "glUniform3ui\0"

+   "\0"

+   /* _mesa_function_pool[28978]: StencilMask (offset 209) */

+   "i\0"

+   "glStencilMask\0"

+   "\0"

+   /* _mesa_function_pool[28995]: Tangent3iEXT (dynamic) */

+   "iii\0"

+   "glTangent3iEXT\0"

+   "\0"

+   /* _mesa_function_pool[29015]: GetLightiv (offset 265) */

+   "iip\0"

+   "glGetLightiv\0"

+   "\0"

+   /* _mesa_function_pool[29033]: DrawMeshArraysSUN (dynamic) */

+   "iiii\0"

+   "glDrawMeshArraysSUN\0"

+   "\0"

+   /* _mesa_function_pool[29059]: IsList (offset 287) */

+   "i\0"

+   "glIsList\0"

+   "\0"

+   /* _mesa_function_pool[29071]: IsSync (will be remapped) */

+   "i\0"

+   "glIsSync\0"

+   "\0"

+   /* _mesa_function_pool[29083]: RenderMode (offset 196) */

+   "i\0"

+   "glRenderMode\0"

+   "\0"

+   /* _mesa_function_pool[29099]: GetMapControlPointsNV (dynamic) */

+   "iiiiiip\0"

+   "glGetMapControlPointsNV\0"

+   "\0"

+   /* _mesa_function_pool[29132]: DrawBuffersARB (will be remapped) */

+   "ip\0"

+   "glDrawBuffers\0"

+   "glDrawBuffersARB\0"

+   "glDrawBuffersATI\0"

+   "\0"

+   /* _mesa_function_pool[29184]: ClearBufferiv (will be remapped) */

+   "iip\0"

+   "glClearBufferiv\0"

+   "\0"

+   /* _mesa_function_pool[29205]: ProgramLocalParameter4fARB (will be remapped) */

+   "iiffff\0"

+   "glProgramLocalParameter4fARB\0"

+   "\0"

+   /* _mesa_function_pool[29242]: SpriteParameterivSGIX (dynamic) */

+   "ip\0"

+   "glSpriteParameterivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[29270]: ProvokingVertexEXT (will be remapped) */

+   "i\0"

+   "glProvokingVertexEXT\0"

+   "glProvokingVertex\0"

+   "\0"

+   /* _mesa_function_pool[29312]: MultiTexCoord1fARB (offset 378) */

+   "if\0"

+   "glMultiTexCoord1f\0"

+   "glMultiTexCoord1fARB\0"

+   "\0"

+   /* _mesa_function_pool[29355]: LoadName (offset 198) */

+   "i\0"

+   "glLoadName\0"

+   "\0"

+   /* _mesa_function_pool[29369]: VertexAttribs4ubvNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs4ubvNV\0"

+   "\0"

+   /* _mesa_function_pool[29396]: WeightsvARB (dynamic) */

+   "ip\0"

+   "glWeightsvARB\0"

+   "\0"

+   /* _mesa_function_pool[29414]: Uniform1fvARB (will be remapped) */

+   "iip\0"

+   "glUniform1fv\0"

+   "glUniform1fvARB\0"

+   "\0"

+   /* _mesa_function_pool[29448]: CopyTexSubImage1D (offset 325) */

+   "iiiiii\0"

+   "glCopyTexSubImage1D\0"

+   "glCopyTexSubImage1DEXT\0"

+   "\0"

+   /* _mesa_function_pool[29499]: CullFace (offset 152) */

+   "i\0"

+   "glCullFace\0"

+   "\0"

+   /* _mesa_function_pool[29513]: BindTexture (offset 307) */

+   "ii\0"

+   "glBindTexture\0"

+   "glBindTextureEXT\0"

+   "\0"

+   /* _mesa_function_pool[29548]: BeginFragmentShaderATI (will be remapped) */

+   "\0"

+   "glBeginFragmentShaderATI\0"

+   "\0"

+   /* _mesa_function_pool[29575]: MultiTexCoord4fARB (offset 402) */

+   "iffff\0"

+   "glMultiTexCoord4f\0"

+   "glMultiTexCoord4fARB\0"

+   "\0"

+   /* _mesa_function_pool[29621]: VertexAttribs3svNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs3svNV\0"

+   "\0"

+   /* _mesa_function_pool[29647]: StencilFunc (offset 243) */

+   "iii\0"

+   "glStencilFunc\0"

+   "\0"

+   /* _mesa_function_pool[29666]: CopyPixels (offset 255) */

+   "iiiii\0"

+   "glCopyPixels\0"

+   "\0"

+   /* _mesa_function_pool[29686]: Rectsv (offset 93) */

+   "pp\0"

+   "glRectsv\0"

+   "\0"

+   /* _mesa_function_pool[29699]: ReplacementCodeuivSUN (dynamic) */

+   "p\0"

+   "glReplacementCodeuivSUN\0"

+   "\0"

+   /* _mesa_function_pool[29726]: EnableVertexAttribArrayARB (will be remapped) */

+   "i\0"

+   "glEnableVertexAttribArray\0"

+   "glEnableVertexAttribArrayARB\0"

+   "\0"

+   /* _mesa_function_pool[29784]: NormalPointervINTEL (dynamic) */

+   "ip\0"

+   "glNormalPointervINTEL\0"

+   "\0"

+   /* _mesa_function_pool[29810]: CopyConvolutionFilter2D (offset 355) */

+   "iiiiii\0"

+   "glCopyConvolutionFilter2D\0"

+   "glCopyConvolutionFilter2DEXT\0"

+   "\0"

+   /* _mesa_function_pool[29873]: WindowPos3ivMESA (will be remapped) */

+   "p\0"

+   "glWindowPos3iv\0"

+   "glWindowPos3ivARB\0"

+   "glWindowPos3ivMESA\0"

+   "\0"

+   /* _mesa_function_pool[29928]: CopyBufferSubData (will be remapped) */

+   "iiiii\0"

+   "glCopyBufferSubData\0"

+   "\0"

+   /* _mesa_function_pool[29955]: NormalPointer (offset 318) */

+   "iip\0"

+   "glNormalPointer\0"

+   "\0"

+   /* _mesa_function_pool[29976]: TexParameterfv (offset 179) */

+   "iip\0"

+   "glTexParameterfv\0"

+   "\0"

+   /* _mesa_function_pool[29998]: IsBufferARB (will be remapped) */

+   "i\0"

+   "glIsBuffer\0"

+   "glIsBufferARB\0"

+   "\0"

+   /* _mesa_function_pool[30026]: WindowPos4iMESA (will be remapped) */

+   "iiii\0"

+   "glWindowPos4iMESA\0"

+   "\0"

+   /* _mesa_function_pool[30050]: VertexAttrib4uivARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4uiv\0"

+   "glVertexAttrib4uivARB\0"

+   "\0"

+   /* _mesa_function_pool[30095]: Tangent3bvEXT (dynamic) */

+   "p\0"

+   "glTangent3bvEXT\0"

+   "\0"

+   /* _mesa_function_pool[30114]: VertexAttribI3uivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI3uivEXT\0"

+   "glVertexAttribI3uiv\0"

+   "\0"

+   /* _mesa_function_pool[30161]: UniformMatrix3x4fv (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix3x4fv\0"

+   "\0"

+   /* _mesa_function_pool[30188]: ClipPlane (offset 150) */

+   "ip\0"

+   "glClipPlane\0"

+   "\0"

+   /* _mesa_function_pool[30204]: Recti (offset 90) */

+   "iiii\0"

+   "glRecti\0"

+   "\0"

+   /* _mesa_function_pool[30218]: VertexAttribI3ivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI3ivEXT\0"

+   "glVertexAttribI3iv\0"

+   "\0"

+   /* _mesa_function_pool[30263]: DrawRangeElementsBaseVertex (will be remapped) */

+   "iiiiipi\0"

+   "glDrawRangeElementsBaseVertex\0"

+   "\0"

+   /* _mesa_function_pool[30302]: TexCoordPointervINTEL (dynamic) */

+   "iip\0"

+   "glTexCoordPointervINTEL\0"

+   "\0"

+   /* _mesa_function_pool[30331]: DeleteBuffersARB (will be remapped) */

+   "ip\0"

+   "glDeleteBuffers\0"

+   "glDeleteBuffersARB\0"

+   "\0"

+   /* _mesa_function_pool[30370]: PixelTransformParameterfvEXT (dynamic) */

+   "iip\0"

+   "glPixelTransformParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[30406]: PrimitiveRestartNV (will be remapped) */

+   "\0"

+   "glPrimitiveRestartNV\0"

+   "\0"

+   /* _mesa_function_pool[30429]: WindowPos4fvMESA (will be remapped) */

+   "p\0"

+   "glWindowPos4fvMESA\0"

+   "\0"

+   /* _mesa_function_pool[30451]: GetPixelMapuiv (offset 272) */

+   "ip\0"

+   "glGetPixelMapuiv\0"

+   "\0"

+   /* _mesa_function_pool[30472]: Rectf (offset 88) */

+   "ffff\0"

+   "glRectf\0"

+   "\0"

+   /* _mesa_function_pool[30486]: VertexAttrib1sNV (will be remapped) */

+   "ii\0"

+   "glVertexAttrib1sNV\0"

+   "\0"

+   /* _mesa_function_pool[30509]: Indexfv (offset 47) */

+   "p\0"

+   "glIndexfv\0"

+   "\0"

+   /* _mesa_function_pool[30522]: SecondaryColor3svEXT (will be remapped) */

+   "p\0"

+   "glSecondaryColor3sv\0"

+   "glSecondaryColor3svEXT\0"

+   "\0"

+   /* _mesa_function_pool[30568]: LoadTransposeMatrixfARB (will be remapped) */

+   "p\0"

+   "glLoadTransposeMatrixf\0"

+   "glLoadTransposeMatrixfARB\0"

+   "\0"

+   /* _mesa_function_pool[30620]: GetPointerv (offset 329) */

+   "ip\0"

+   "glGetPointerv\0"

+   "glGetPointervEXT\0"

+   "\0"

+   /* _mesa_function_pool[30655]: Tangent3bEXT (dynamic) */

+   "iii\0"

+   "glTangent3bEXT\0"

+   "\0"

+   /* _mesa_function_pool[30675]: CombinerParameterfNV (will be remapped) */

+   "if\0"

+   "glCombinerParameterfNV\0"

+   "\0"

+   /* _mesa_function_pool[30702]: IndexMask (offset 212) */

+   "i\0"

+   "glIndexMask\0"

+   "\0"

+   /* _mesa_function_pool[30717]: BindProgramNV (will be remapped) */

+   "ii\0"

+   "glBindProgramARB\0"

+   "glBindProgramNV\0"

+   "\0"

+   /* _mesa_function_pool[30754]: VertexAttrib4svARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4sv\0"

+   "glVertexAttrib4svARB\0"

+   "\0"

+   /* _mesa_function_pool[30797]: GetFloatv (offset 262) */

+   "ip\0"

+   "glGetFloatv\0"

+   "\0"

+   /* _mesa_function_pool[30813]: CreateDebugObjectMESA (dynamic) */

+   "\0"

+   "glCreateDebugObjectMESA\0"

+   "\0"

+   /* _mesa_function_pool[30839]: GetShaderiv (will be remapped) */

+   "iip\0"

+   "glGetShaderiv\0"

+   "\0"

+   /* _mesa_function_pool[30858]: ClientWaitSync (will be remapped) */

+   "iii\0"

+   "glClientWaitSync\0"

+   "\0"

+   /* _mesa_function_pool[30880]: TexCoord4s (offset 124) */

+   "iiii\0"

+   "glTexCoord4s\0"

+   "\0"

+   /* _mesa_function_pool[30899]: TexCoord3sv (offset 117) */

+   "p\0"

+   "glTexCoord3sv\0"

+   "\0"

+   /* _mesa_function_pool[30916]: BindFragmentShaderATI (will be remapped) */

+   "i\0"

+   "glBindFragmentShaderATI\0"

+   "\0"

+   /* _mesa_function_pool[30943]: PopAttrib (offset 218) */

+   "\0"

+   "glPopAttrib\0"

+   "\0"

+   /* _mesa_function_pool[30957]: Fogfv (offset 154) */

+   "ip\0"

+   "glFogfv\0"

+   "\0"

+   /* _mesa_function_pool[30969]: UnmapBufferARB (will be remapped) */

+   "i\0"

+   "glUnmapBuffer\0"

+   "glUnmapBufferARB\0"

+   "\0"

+   /* _mesa_function_pool[31003]: InitNames (offset 197) */

+   "\0"

+   "glInitNames\0"

+   "\0"

+   /* _mesa_function_pool[31017]: Normal3sv (offset 61) */

+   "p\0"

+   "glNormal3sv\0"

+   "\0"

+   /* _mesa_function_pool[31032]: Minmax (offset 368) */

+   "iii\0"

+   "glMinmax\0"

+   "glMinmaxEXT\0"

+   "\0"

+   /* _mesa_function_pool[31058]: TexCoord4d (offset 118) */

+   "dddd\0"

+   "glTexCoord4d\0"

+   "\0"

+   /* _mesa_function_pool[31077]: DeformationMap3dSGIX (dynamic) */

+   "iddiiddiiddiip\0"

+   "glDeformationMap3dSGIX\0"

+   "\0"

+   /* _mesa_function_pool[31116]: TexCoord4f (offset 120) */

+   "ffff\0"

+   "glTexCoord4f\0"

+   "\0"

+   /* _mesa_function_pool[31135]: FogCoorddvEXT (will be remapped) */

+   "p\0"

+   "glFogCoorddv\0"

+   "glFogCoorddvEXT\0"

+   "\0"

+   /* _mesa_function_pool[31167]: FinishTextureSUNX (dynamic) */

+   "\0"

+   "glFinishTextureSUNX\0"

+   "\0"

+   /* _mesa_function_pool[31189]: GetFragmentLightfvSGIX (dynamic) */

+   "iip\0"

+   "glGetFragmentLightfvSGIX\0"

+   "\0"

+   /* _mesa_function_pool[31219]: Binormal3fvEXT (dynamic) */

+   "p\0"

+   "glBinormal3fvEXT\0"

+   "\0"

+   /* _mesa_function_pool[31239]: GetBooleanv (offset 258) */

+   "ip\0"

+   "glGetBooleanv\0"

+   "\0"

+   /* _mesa_function_pool[31257]: ColorFragmentOp3ATI (will be remapped) */

+   "iiiiiiiiiiiii\0"

+   "glColorFragmentOp3ATI\0"

+   "\0"

+   /* _mesa_function_pool[31294]: Hint (offset 158) */

+   "ii\0"

+   "glHint\0"

+   "\0"

+   /* _mesa_function_pool[31305]: Color4dv (offset 28) */

+   "p\0"

+   "glColor4dv\0"

+   "\0"

+   /* _mesa_function_pool[31319]: VertexAttrib2svARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib2sv\0"

+   "glVertexAttrib2svARB\0"

+   "\0"

+   /* _mesa_function_pool[31362]: AreProgramsResidentNV (will be remapped) */

+   "ipp\0"

+   "glAreProgramsResidentNV\0"

+   "\0"

+   /* _mesa_function_pool[31391]: WindowPos3svMESA (will be remapped) */

+   "p\0"

+   "glWindowPos3sv\0"

+   "glWindowPos3svARB\0"

+   "glWindowPos3svMESA\0"

+   "\0"

+   /* _mesa_function_pool[31446]: CopyColorSubTable (offset 347) */

+   "iiiii\0"

+   "glCopyColorSubTable\0"

+   "glCopyColorSubTableEXT\0"

+   "\0"

+   /* _mesa_function_pool[31496]: WeightdvARB (dynamic) */

+   "ip\0"

+   "glWeightdvARB\0"

+   "\0"

+   /* _mesa_function_pool[31514]: DeleteRenderbuffersEXT (will be remapped) */

+   "ip\0"

+   "glDeleteRenderbuffers\0"

+   "glDeleteRenderbuffersEXT\0"

+   "\0"

+   /* _mesa_function_pool[31565]: VertexAttrib4NubvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4Nubv\0"

+   "glVertexAttrib4NubvARB\0"

+   "\0"

+   /* _mesa_function_pool[31612]: VertexAttrib3dvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib3dvNV\0"

+   "\0"

+   /* _mesa_function_pool[31636]: GetObjectParameterfvARB (will be remapped) */

+   "iip\0"

+   "glGetObjectParameterfvARB\0"

+   "\0"

+   /* _mesa_function_pool[31667]: Vertex4iv (offset 147) */

+   "p\0"

+   "glVertex4iv\0"

+   "\0"

+   /* _mesa_function_pool[31682]: GetProgramEnvParameterdvARB (will be remapped) */

+   "iip\0"

+   "glGetProgramEnvParameterdvARB\0"

+   "\0"

+   /* _mesa_function_pool[31717]: TexCoord4dv (offset 119) */

+   "p\0"

+   "glTexCoord4dv\0"

+   "\0"

+   /* _mesa_function_pool[31734]: LockArraysEXT (will be remapped) */

+   "ii\0"

+   "glLockArraysEXT\0"

+   "\0"

+   /* _mesa_function_pool[31754]: Begin (offset 7) */

+   "i\0"

+   "glBegin\0"

+   "\0"

+   /* _mesa_function_pool[31765]: LightModeli (offset 165) */

+   "ii\0"

+   "glLightModeli\0"

+   "\0"

+   /* _mesa_function_pool[31783]: VertexAttribI4ivEXT (will be remapped) */

+   "ip\0"

+   "glVertexAttribI4ivEXT\0"

+   "glVertexAttribI4iv\0"

+   "\0"

+   /* _mesa_function_pool[31828]: Rectfv (offset 89) */

+   "pp\0"

+   "glRectfv\0"

+   "\0"

+   /* _mesa_function_pool[31841]: LightModelf (offset 163) */

+   "if\0"

+   "glLightModelf\0"

+   "\0"

+   /* _mesa_function_pool[31859]: GetTexParameterfv (offset 282) */

+   "iip\0"

+   "glGetTexParameterfv\0"

+   "\0"

+   /* _mesa_function_pool[31884]: GetLightfv (offset 264) */

+   "iip\0"

+   "glGetLightfv\0"

+   "\0"

+   /* _mesa_function_pool[31902]: PixelTransformParameterivEXT (dynamic) */

+   "iip\0"

+   "glPixelTransformParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[31938]: BinormalPointerEXT (dynamic) */

+   "iip\0"

+   "glBinormalPointerEXT\0"

+   "\0"

+   /* _mesa_function_pool[31964]: VertexAttrib1dNV (will be remapped) */

+   "id\0"

+   "glVertexAttrib1dNV\0"

+   "\0"

+   /* _mesa_function_pool[31987]: GetCombinerInputParameterivNV (will be remapped) */

+   "iiiip\0"

+   "glGetCombinerInputParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[32026]: Disable (offset 214) */

+   "i\0"

+   "glDisable\0"

+   "\0"

+   /* _mesa_function_pool[32039]: MultiTexCoord2fvARB (offset 387) */

+   "ip\0"

+   "glMultiTexCoord2fv\0"

+   "glMultiTexCoord2fvARB\0"

+   "\0"

+   /* _mesa_function_pool[32084]: GetRenderbufferParameterivEXT (will be remapped) */

+   "iip\0"

+   "glGetRenderbufferParameteriv\0"

+   "glGetRenderbufferParameterivEXT\0"

+   "\0"

+   /* _mesa_function_pool[32150]: CombinerParameterivNV (will be remapped) */

+   "ip\0"

+   "glCombinerParameterivNV\0"

+   "\0"

+   /* _mesa_function_pool[32178]: GenFragmentShadersATI (will be remapped) */

+   "i\0"

+   "glGenFragmentShadersATI\0"

+   "\0"

+   /* _mesa_function_pool[32205]: DrawArrays (offset 310) */

+   "iii\0"

+   "glDrawArrays\0"

+   "glDrawArraysEXT\0"

+   "\0"

+   /* _mesa_function_pool[32239]: WeightuivARB (dynamic) */

+   "ip\0"

+   "glWeightuivARB\0"

+   "\0"

+   /* _mesa_function_pool[32258]: VertexAttrib2sARB (will be remapped) */

+   "iii\0"

+   "glVertexAttrib2s\0"

+   "glVertexAttrib2sARB\0"

+   "\0"

+   /* _mesa_function_pool[32300]: ColorMask (offset 210) */

+   "iiii\0"

+   "glColorMask\0"

+   "\0"

+   /* _mesa_function_pool[32318]: GenAsyncMarkersSGIX (dynamic) */

+   "i\0"

+   "glGenAsyncMarkersSGIX\0"

+   "\0"

+   /* _mesa_function_pool[32343]: Tangent3svEXT (dynamic) */

+   "p\0"

+   "glTangent3svEXT\0"

+   "\0"

+   /* _mesa_function_pool[32362]: GetListParameterivSGIX (dynamic) */

+   "iip\0"

+   "glGetListParameterivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[32392]: BindBufferARB (will be remapped) */

+   "ii\0"

+   "glBindBuffer\0"

+   "glBindBufferARB\0"

+   "\0"

+   /* _mesa_function_pool[32425]: GetInfoLogARB (will be remapped) */

+   "iipp\0"

+   "glGetInfoLogARB\0"

+   "\0"

+   /* _mesa_function_pool[32447]: RasterPos4iv (offset 83) */

+   "p\0"

+   "glRasterPos4iv\0"

+   "\0"

+   /* _mesa_function_pool[32465]: Enable (offset 215) */

+   "i\0"

+   "glEnable\0"

+   "\0"

+   /* _mesa_function_pool[32477]: LineStipple (offset 167) */

+   "ii\0"

+   "glLineStipple\0"

+   "\0"

+   /* _mesa_function_pool[32495]: VertexAttribs4svNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs4svNV\0"

+   "\0"

+   /* _mesa_function_pool[32521]: EdgeFlagPointerListIBM (dynamic) */

+   "ipi\0"

+   "glEdgeFlagPointerListIBM\0"

+   "\0"

+   /* _mesa_function_pool[32551]: UniformMatrix3x2fv (will be remapped) */

+   "iiip\0"

+   "glUniformMatrix3x2fv\0"

+   "\0"

+   /* _mesa_function_pool[32578]: GetMinmaxParameterfv (offset 365) */

+   "iip\0"

+   "glGetMinmaxParameterfv\0"

+   "glGetMinmaxParameterfvEXT\0"

+   "\0"

+   /* _mesa_function_pool[32632]: VertexAttrib1fvARB (will be remapped) */

+   "ip\0"

+   "glVertexAttrib1fv\0"

+   "glVertexAttrib1fvARB\0"

+   "\0"

+   /* _mesa_function_pool[32675]: GenBuffersARB (will be remapped) */

+   "ip\0"

+   "glGenBuffers\0"

+   "glGenBuffersARB\0"

+   "\0"

+   /* _mesa_function_pool[32708]: VertexAttribs1svNV (will be remapped) */

+   "iip\0"

+   "glVertexAttribs1svNV\0"

+   "\0"

+   /* _mesa_function_pool[32734]: Vertex3fv (offset 137) */

+   "p\0"

+   "glVertex3fv\0"

+   "\0"

+   /* _mesa_function_pool[32749]: GetTexBumpParameterivATI (will be remapped) */

+   "ip\0"

+   "glGetTexBumpParameterivATI\0"

+   "\0"

+   /* _mesa_function_pool[32780]: Binormal3bEXT (dynamic) */

+   "iii\0"

+   "glBinormal3bEXT\0"

+   "\0"

+   /* _mesa_function_pool[32801]: FragmentMaterialivSGIX (dynamic) */

+   "iip\0"

+   "glFragmentMaterialivSGIX\0"

+   "\0"

+   /* _mesa_function_pool[32831]: IsRenderbufferEXT (will be remapped) */

+   "i\0"

+   "glIsRenderbuffer\0"

+   "glIsRenderbufferEXT\0"

+   "\0"

+   /* _mesa_function_pool[32871]: GenProgramsNV (will be remapped) */

+   "ip\0"

+   "glGenProgramsARB\0"

+   "glGenProgramsNV\0"

+   "\0"

+   /* _mesa_function_pool[32908]: VertexAttrib4dvNV (will be remapped) */

+   "ip\0"

+   "glVertexAttrib4dvNV\0"

+   "\0"

+   /* _mesa_function_pool[32932]: EndFragmentShaderATI (will be remapped) */

+   "\0"

+   "glEndFragmentShaderATI\0"

+   "\0"

+   /* _mesa_function_pool[32957]: Binormal3iEXT (dynamic) */

+   "iii\0"

+   "glBinormal3iEXT\0"

+   "\0"

+   /* _mesa_function_pool[32978]: WindowPos2fMESA (will be remapped) */

+   "ff\0"

+   "glWindowPos2f\0"

+   "glWindowPos2fARB\0"

+   "glWindowPos2fMESA\0"

+   "\0"

+   ;

+

+/* these functions need to be remapped */

+static const struct gl_function_pool_remap MESA_remap_table_functions[] = {

+   {  1577, AttachShader_remap_index },

+   {  9902, CreateProgram_remap_index },

+   { 22864, CreateShader_remap_index },

+   { 25322, DeleteProgram_remap_index },

+   { 18525, DeleteShader_remap_index },

+   { 23336, DetachShader_remap_index },

+   { 17928, GetAttachedShaders_remap_index },

+   {  4869, GetProgramInfoLog_remap_index },

+   {   405, GetProgramiv_remap_index },

+   {  6542, GetShaderInfoLog_remap_index },

+   { 30839, GetShaderiv_remap_index },

+   { 13311, IsProgram_remap_index },

+   { 12263, IsShader_remap_index },

+   { 10006, StencilFuncSeparate_remap_index },

+   {  3921, StencilMaskSeparate_remap_index },

+   {  7624, StencilOpSeparate_remap_index },

+   { 22152, UniformMatrix2x3fv_remap_index },

+   {  2847, UniformMatrix2x4fv_remap_index },

+   { 32551, UniformMatrix3x2fv_remap_index },

+   { 30161, UniformMatrix3x4fv_remap_index },

+   { 16226, UniformMatrix4x2fv_remap_index },

+   {  3263, UniformMatrix4x3fv_remap_index },

+   {  5030, ClampColor_remap_index },

+   { 17982, ClearBufferfi_remap_index },

+   { 17448, ClearBufferfv_remap_index },

+   { 29184, ClearBufferiv_remap_index },

+   { 13516, ClearBufferuiv_remap_index },

+   { 19808, GetStringi_remap_index },

+   {  2788, TexBuffer_remap_index },

+   {   938, FramebufferTexture_remap_index },

+   { 26315, GetBufferParameteri64v_remap_index },

+   { 10106, GetInteger64i_v_remap_index },

+   { 23178, VertexAttribDivisor_remap_index },

+   {  9920, LoadTransposeMatrixdARB_remap_index },

+   { 30568, LoadTransposeMatrixfARB_remap_index },

+   {  5608, MultTransposeMatrixdARB_remap_index },

+   { 23523, MultTransposeMatrixfARB_remap_index },

+   {   216, SampleCoverageARB_remap_index },

+   {  5834, CompressedTexImage1DARB_remap_index },

+   { 24051, CompressedTexImage2DARB_remap_index },

+   {  3984, CompressedTexImage3DARB_remap_index },

+   { 18242, CompressedTexSubImage1DARB_remap_index },

+   {  2050, CompressedTexSubImage2DARB_remap_index },

+   { 20230, CompressedTexSubImage3DARB_remap_index },

+   { 28340, GetCompressedTexImageARB_remap_index },

+   {  3829, DisableVertexAttribArrayARB_remap_index },

+   { 29726, EnableVertexAttribArrayARB_remap_index },

+   { 31682, GetProgramEnvParameterdvARB_remap_index },

+   { 23403, GetProgramEnvParameterfvARB_remap_index },

+   { 27277, GetProgramLocalParameterdvARB_remap_index },

+   {  8066, GetProgramLocalParameterfvARB_remap_index },

+   { 18376, GetProgramStringARB_remap_index },

+   { 27472, GetProgramivARB_remap_index },

+   { 20425, GetVertexAttribdvARB_remap_index },

+   { 16034, GetVertexAttribfvARB_remap_index },

+   {  9765, GetVertexAttribivARB_remap_index },

+   { 19289, ProgramEnvParameter4dARB_remap_index },

+   { 25072, ProgramEnvParameter4dvARB_remap_index },

+   { 16770, ProgramEnvParameter4fARB_remap_index },

+   {  8965, ProgramEnvParameter4fvARB_remap_index },

+   {  3947, ProgramLocalParameter4dARB_remap_index },

+   { 13021, ProgramLocalParameter4dvARB_remap_index },

+   { 29205, ProgramLocalParameter4fARB_remap_index },

+   { 25675, ProgramLocalParameter4fvARB_remap_index },

+   { 28094, ProgramStringARB_remap_index },

+   { 19539, VertexAttrib1dARB_remap_index },

+   { 15688, VertexAttrib1dvARB_remap_index },

+   {  4122, VertexAttrib1fARB_remap_index },

+   { 32632, VertexAttrib1fvARB_remap_index },

+   {  7150, VertexAttrib1sARB_remap_index },

+   {  2224, VertexAttrib1svARB_remap_index },

+   { 15119, VertexAttrib2dARB_remap_index },

+   { 17469, VertexAttrib2dvARB_remap_index },

+   {  1596, VertexAttrib2fARB_remap_index },

+   { 17582, VertexAttrib2fvARB_remap_index },

+   { 32258, VertexAttrib2sARB_remap_index },

+   { 31319, VertexAttrib2svARB_remap_index },

+   { 11268, VertexAttrib3dARB_remap_index },

+   {  8632, VertexAttrib3dvARB_remap_index },

+   {  1683, VertexAttrib3fARB_remap_index },

+   { 22415, VertexAttrib3fvARB_remap_index },

+   { 27941, VertexAttrib3sARB_remap_index },

+   { 20167, VertexAttrib3svARB_remap_index },

+   {  4895, VertexAttrib4NbvARB_remap_index },

+   { 17805, VertexAttrib4NivARB_remap_index },

+   { 22370, VertexAttrib4NsvARB_remap_index },

+   { 23355, VertexAttrib4NubARB_remap_index },

+   { 31565, VertexAttrib4NubvARB_remap_index },

+   { 18950, VertexAttrib4NuivARB_remap_index },

+   {  3136, VertexAttrib4NusvARB_remap_index },

+   { 10846, VertexAttrib4bvARB_remap_index },

+   { 26685, VertexAttrib4dARB_remap_index },

+   { 21189, VertexAttrib4dvARB_remap_index },

+   { 11422, VertexAttrib4fARB_remap_index },

+   { 11826, VertexAttrib4fvARB_remap_index },

+   { 10222, VertexAttrib4ivARB_remap_index },

+   { 17262, VertexAttrib4sARB_remap_index },

+   { 30754, VertexAttrib4svARB_remap_index },

+   { 16575, VertexAttrib4ubvARB_remap_index },

+   { 30050, VertexAttrib4uivARB_remap_index },

+   { 19978, VertexAttrib4usvARB_remap_index },

+   { 21967, VertexAttribPointerARB_remap_index },

+   { 32392, BindBufferARB_remap_index },

+   {  6857, BufferDataARB_remap_index },

+   {  1498, BufferSubDataARB_remap_index },

+   { 30331, DeleteBuffersARB_remap_index },

+   { 32675, GenBuffersARB_remap_index },

+   { 17625, GetBufferParameterivARB_remap_index },

+   { 16722, GetBufferPointervARB_remap_index },

+   {  1451, GetBufferSubDataARB_remap_index },

+   { 29998, IsBufferARB_remap_index },

+   { 26159, MapBufferARB_remap_index },

+   { 30969, UnmapBufferARB_remap_index },

+   {   312, BeginQueryARB_remap_index },

+   { 19634, DeleteQueriesARB_remap_index },

+   { 12153, EndQueryARB_remap_index },

+   { 28819, GenQueriesARB_remap_index },

+   {  1942, GetQueryObjectivARB_remap_index },

+   { 17306, GetQueryObjectuivARB_remap_index },

+   {  1740, GetQueryivARB_remap_index },

+   { 19885, IsQueryARB_remap_index },

+   {  8242, AttachObjectARB_remap_index },

+   { 18487, CompileShaderARB_remap_index },

+   {  3205, CreateProgramObjectARB_remap_index },

+   {  6802, CreateShaderObjectARB_remap_index },

+   { 14454, DeleteObjectARB_remap_index },

+   { 23842, DetachObjectARB_remap_index },

+   { 11898, GetActiveUniformARB_remap_index },

+   {  9440, GetAttachedObjectsARB_remap_index },

+   {  9747, GetHandleARB_remap_index },

+   { 32425, GetInfoLogARB_remap_index },

+   { 31636, GetObjectParameterfvARB_remap_index },

+   { 27151, GetObjectParameterivARB_remap_index },

+   { 28577, GetShaderSourceARB_remap_index },

+   { 27801, GetUniformLocationARB_remap_index },

+   { 23625, GetUniformfvARB_remap_index },

+   { 12596, GetUniformivARB_remap_index },

+   { 20023, LinkProgramARB_remap_index },

+   { 20081, ShaderSourceARB_remap_index },

+   {  7524, Uniform1fARB_remap_index },

+   { 29414, Uniform1fvARB_remap_index },

+   { 21936, Uniform1iARB_remap_index },

+   { 20878, Uniform1ivARB_remap_index },

+   {  2173, Uniform2fARB_remap_index },

+   { 14290, Uniform2fvARB_remap_index },

+   { 26046, Uniform2iARB_remap_index },

+   {  2293, Uniform2ivARB_remap_index },

+   { 18597, Uniform3fARB_remap_index },

+   {  9470, Uniform3fvARB_remap_index },

+   {  6396, Uniform3iARB_remap_index },

+   { 16828, Uniform3ivARB_remap_index },

+   { 19095, Uniform4fARB_remap_index },

+   { 23489, Uniform4fvARB_remap_index },

+   { 24751, Uniform4iARB_remap_index },

+   { 20391, Uniform4ivARB_remap_index },

+   {  8294, UniformMatrix2fvARB_remap_index },

+   {    17, UniformMatrix3fvARB_remap_index },

+   {  2690, UniformMatrix4fvARB_remap_index },

+   { 25184, UseProgramObjectARB_remap_index },

+   { 14807, ValidateProgramARB_remap_index },

+   { 21232, BindAttribLocationARB_remap_index },

+   {  4940, GetActiveAttribARB_remap_index },

+   { 16509, GetAttribLocationARB_remap_index },

+   { 29132, DrawBuffersARB_remap_index },

+   { 17850, DrawArraysInstancedARB_remap_index },

+   {  6457, DrawElementsInstancedARB_remap_index },

+   { 13126, RenderbufferStorageMultisample_remap_index },

+   { 13597, FramebufferTextureARB_remap_index },

+   { 25577, FramebufferTextureFaceARB_remap_index },

+   { 23991, ProgramParameteriARB_remap_index },

+   { 19143, FlushMappedBufferRange_remap_index },

+   { 27568, MapBufferRange_remap_index },

+   { 16337, BindVertexArray_remap_index },

+   { 14630, GenVertexArrays_remap_index },

+   { 29928, CopyBufferSubData_remap_index },

+   { 30858, ClientWaitSync_remap_index },

+   {  2609, DeleteSync_remap_index },

+   {  7191, FenceSync_remap_index },

+   { 15178, GetInteger64v_remap_index },

+   { 22477, GetSynciv_remap_index },

+   { 29071, IsSync_remap_index },

+   {  9388, WaitSync_remap_index },

+   {  3797, DrawElementsBaseVertex_remap_index },

+   { 30263, DrawRangeElementsBaseVertex_remap_index },

+   { 26190, MultiDrawElementsBaseVertex_remap_index },

+   {  5091, BindTransformFeedback_remap_index },

+   {  3232, DeleteTransformFeedbacks_remap_index },

+   {  6429, DrawTransformFeedback_remap_index },

+   {  9607, GenTransformFeedbacks_remap_index },

+   { 27984, IsTransformFeedback_remap_index },

+   { 25770, PauseTransformFeedback_remap_index },

+   {  5528, ResumeTransformFeedback_remap_index },

+   {  5396, PolygonOffsetEXT_remap_index },

+   { 23099, GetPixelTexGenParameterfvSGIS_remap_index },

+   {  4417, GetPixelTexGenParameterivSGIS_remap_index },

+   { 22832, PixelTexGenParameterfSGIS_remap_index },

+   {   624, PixelTexGenParameterfvSGIS_remap_index },

+   { 12634, PixelTexGenParameteriSGIS_remap_index },

+   { 13771, PixelTexGenParameterivSGIS_remap_index },

+   { 16425, SampleMaskSGIS_remap_index },

+   { 19825, SamplePatternSGIS_remap_index },

+   { 26119, ColorPointerEXT_remap_index },

+   { 17512, EdgeFlagPointerEXT_remap_index },

+   {  6050, IndexPointerEXT_remap_index },

+   {  6130, NormalPointerEXT_remap_index },

+   { 15772, TexCoordPointerEXT_remap_index },

+   {  6980, VertexPointerEXT_remap_index },

+   {  3599, PointParameterfEXT_remap_index },

+   {  7831, PointParameterfvEXT_remap_index },

+   { 31734, LockArraysEXT_remap_index },

+   { 14871, UnlockArraysEXT_remap_index },

+   {  1267, SecondaryColor3bEXT_remap_index },

+   {  7990, SecondaryColor3bvEXT_remap_index },

+   { 10399, SecondaryColor3dEXT_remap_index },

+   { 25380, SecondaryColor3dvEXT_remap_index },

+   { 27850, SecondaryColor3fEXT_remap_index },

+   { 18178, SecondaryColor3fvEXT_remap_index },

+   {   470, SecondaryColor3iEXT_remap_index },

+   { 16082, SecondaryColor3ivEXT_remap_index },

+   { 10034, SecondaryColor3sEXT_remap_index },

+   { 30522, SecondaryColor3svEXT_remap_index },

+   { 26987, SecondaryColor3ubEXT_remap_index },

+   { 21123, SecondaryColor3ubvEXT_remap_index },

+   { 12876, SecondaryColor3uiEXT_remap_index },

+   { 22719, SecondaryColor3uivEXT_remap_index },

+   { 25627, SecondaryColor3usEXT_remap_index },

+   { 12949, SecondaryColor3usvEXT_remap_index },

+   { 11769, SecondaryColorPointerEXT_remap_index },

+   { 25441, MultiDrawArraysEXT_remap_index },

+   { 20813, MultiDrawElementsEXT_remap_index },

+   { 21008, FogCoordPointerEXT_remap_index },

+   {  4566, FogCoorddEXT_remap_index },

+   { 31135, FogCoorddvEXT_remap_index },

+   {  4683, FogCoordfEXT_remap_index },

+   { 26910, FogCoordfvEXT_remap_index },

+   { 19047, PixelTexGenSGIX_remap_index },

+   { 27495, BlendFuncSeparateEXT_remap_index },

+   {  6892, FlushVertexArrayRangeNV_remap_index },

+   {  5345, VertexArrayRangeNV_remap_index },

+   { 27915, CombinerInputNV_remap_index },

+   {  2116, CombinerOutputNV_remap_index },

+   { 30675, CombinerParameterfNV_remap_index },

+   {  5219, CombinerParameterfvNV_remap_index },

+   { 22201, CombinerParameteriNV_remap_index },

+   { 32150, CombinerParameterivNV_remap_index },

+   {  7268, FinalCombinerInputNV_remap_index },

+   {  9813, GetCombinerInputParameterfvNV_remap_index },

+   { 31987, GetCombinerInputParameterivNV_remap_index },

+   { 13872, GetCombinerOutputParameterfvNV_remap_index },

+   { 13700, GetCombinerOutputParameterivNV_remap_index },

+   {  6637, GetFinalCombinerInputParameterfvNV_remap_index },

+   { 24623, GetFinalCombinerInputParameterivNV_remap_index },

+   { 12574, ResizeBuffersMESA_remap_index },

+   { 11095, WindowPos2dMESA_remap_index },

+   {  1060, WindowPos2dvMESA_remap_index },

+   { 32978, WindowPos2fMESA_remap_index },

+   {  7935, WindowPos2fvMESA_remap_index },

+   { 18125, WindowPos2iMESA_remap_index },

+   { 20298, WindowPos2ivMESA_remap_index },

+   { 20912, WindowPos2sMESA_remap_index },

+   {  5748, WindowPos2svMESA_remap_index },

+   {  7760, WindowPos3dMESA_remap_index },

+   { 14018, WindowPos3dvMESA_remap_index },

+   {   516, WindowPos3fMESA_remap_index },

+   { 14932, WindowPos3fvMESA_remap_index },

+   { 23884, WindowPos3iMESA_remap_index },

+   { 29873, WindowPos3ivMESA_remap_index },

+   { 18742, WindowPos3sMESA_remap_index },

+   { 31391, WindowPos3svMESA_remap_index },

+   { 11046, WindowPos4dMESA_remap_index },

+   { 16966, WindowPos4dvMESA_remap_index },

+   { 13977, WindowPos4fMESA_remap_index },

+   { 30429, WindowPos4fvMESA_remap_index },

+   { 30026, WindowPos4iMESA_remap_index },

+   { 12377, WindowPos4ivMESA_remap_index },

+   { 18926, WindowPos4sMESA_remap_index },

+   {  3183, WindowPos4svMESA_remap_index },

+   { 13739, MultiModeDrawArraysIBM_remap_index },

+   { 28690, MultiModeDrawElementsIBM_remap_index },

+   { 12181, DeleteFencesNV_remap_index },

+   { 27762, FinishFenceNV_remap_index },

+   {  3721, GenFencesNV_remap_index },

+   { 16946, GetFenceivNV_remap_index },

+   {  8227, IsFenceNV_remap_index },

+   { 13627, SetFenceNV_remap_index },

+   {  4178, TestFenceNV_remap_index },

+   { 31362, AreProgramsResidentNV_remap_index },

+   { 30717, BindProgramNV_remap_index },

+   { 25710, DeleteProgramsNV_remap_index },

+   { 21341, ExecuteProgramNV_remap_index },

+   { 32871, GenProgramsNV_remap_index },

+   { 23204, GetProgramParameterdvNV_remap_index },

+   { 10461, GetProgramParameterfvNV_remap_index },

+   { 26093, GetProgramStringNV_remap_index },

+   { 24261, GetProgramivNV_remap_index },

+   { 23438, GetTrackMatrixivNV_remap_index },

+   { 25887, GetVertexAttribPointervNV_remap_index },

+   { 24556, GetVertexAttribdvNV_remap_index },

+   {  9283, GetVertexAttribfvNV_remap_index },

+   { 18349, GetVertexAttribivNV_remap_index },

+   { 19173, IsProgramNV_remap_index },

+   {  9366, LoadProgramNV_remap_index },

+   { 27591, ProgramParameters4dvNV_remap_index },

+   { 24191, ProgramParameters4fvNV_remap_index },

+   { 20602, RequestResidentProgramsNV_remap_index },

+   { 22179, TrackMatrixNV_remap_index },

+   { 31964, VertexAttrib1dNV_remap_index },

+   { 13538, VertexAttrib1dvNV_remap_index },

+   { 28196, VertexAttrib1fNV_remap_index },

+   {  2415, VertexAttrib1fvNV_remap_index },

+   { 30486, VertexAttrib1sNV_remap_index },

+   { 15005, VertexAttrib1svNV_remap_index },

+   {  4845, VertexAttrib2dNV_remap_index },

+   { 13431, VertexAttrib2dvNV_remap_index },

+   { 20057, VertexAttrib2fNV_remap_index },

+   { 12997, VertexAttrib2fvNV_remap_index },

+   {  5960, VertexAttrib2sNV_remap_index },

+   { 18796, VertexAttrib2svNV_remap_index },

+   { 11243, VertexAttrib3dNV_remap_index },

+   { 31612, VertexAttrib3dvNV_remap_index },

+   { 10273, VertexAttrib3fNV_remap_index },

+   { 24583, VertexAttrib3fvNV_remap_index },

+   { 22022, VertexAttrib3sNV_remap_index },

+   { 23465, VertexAttrib3svNV_remap_index },

+   { 28664, VertexAttrib4dNV_remap_index },

+   { 32908, VertexAttrib4dvNV_remap_index },

+   {  4467, VertexAttrib4fNV_remap_index },

+   {  9416, VertexAttrib4fvNV_remap_index },

+   { 26569, VertexAttrib4sNV_remap_index },

+   {  1409, VertexAttrib4svNV_remap_index },

+   {  5003, VertexAttrib4ubNV_remap_index },

+   {   778, VertexAttrib4ubvNV_remap_index },

+   { 21521, VertexAttribPointerNV_remap_index },

+   {  2267, VertexAttribs1dvNV_remap_index },

+   { 25975, VertexAttribs1fvNV_remap_index },

+   { 32708, VertexAttribs1svNV_remap_index },

+   { 10298, VertexAttribs2dvNV_remap_index },

+   { 25145, VertexAttribs2fvNV_remap_index },

+   { 17538, VertexAttribs2svNV_remap_index },

+   {  5247, VertexAttribs3dvNV_remap_index },

+   {  2147, VertexAttribs3fvNV_remap_index },

+   { 29621, VertexAttribs3svNV_remap_index },

+   { 26659, VertexAttribs4dvNV_remap_index },

+   {  5319, VertexAttribs4fvNV_remap_index },

+   { 32495, VertexAttribs4svNV_remap_index },

+   { 29369, VertexAttribs4ubvNV_remap_index },

+   { 26729, GetTexBumpParameterfvATI_remap_index },

+   { 32749, GetTexBumpParameterivATI_remap_index },

+   { 18459, TexBumpParameterfvATI_remap_index },

+   { 20473, TexBumpParameterivATI_remap_index },

+   { 15551, AlphaFragmentOp1ATI_remap_index },

+   { 10889, AlphaFragmentOp2ATI_remap_index },

+   { 24499, AlphaFragmentOp3ATI_remap_index },

+   { 29548, BeginFragmentShaderATI_remap_index },

+   { 30916, BindFragmentShaderATI_remap_index },

+   { 23594, ColorFragmentOp1ATI_remap_index },

+   {  4345, ColorFragmentOp2ATI_remap_index },

+   { 31257, ColorFragmentOp3ATI_remap_index },

+   {  5485, DeleteFragmentShaderATI_remap_index },

+   { 32932, EndFragmentShaderATI_remap_index },

+   { 32178, GenFragmentShadersATI_remap_index },

+   { 25299, PassTexCoordATI_remap_index },

+   {  6960, SampleMapATI_remap_index },

+   {  6733, SetFragmentShaderConstantATI_remap_index },

+   {   363, PointParameteriNV_remap_index },

+   { 14179, PointParameterivNV_remap_index },

+   { 28503, ActiveStencilFaceEXT_remap_index },

+   { 27251, BindVertexArrayAPPLE_remap_index },

+   {  2737, DeleteVertexArraysAPPLE_remap_index },

+   { 17955, GenVertexArraysAPPLE_remap_index },

+   { 23269, IsVertexArrayAPPLE_remap_index },

+   {   819, GetProgramNamedParameterdvNV_remap_index },

+   {  3562, GetProgramNamedParameterfvNV_remap_index },

+   { 26760, ProgramNamedParameter4dNV_remap_index },

+   { 14505, ProgramNamedParameter4dvNV_remap_index },

+   {  8899, ProgramNamedParameter4fNV_remap_index },

+   { 11734, ProgramNamedParameter4fvNV_remap_index },

+   { 16877, PrimitiveRestartIndexNV_remap_index },

+   { 30406, PrimitiveRestartNV_remap_index },

+   { 24170, DepthBoundsEXT_remap_index },

+   {  1159, BlendEquationSeparateEXT_remap_index },

+   { 14706, BindFramebufferEXT_remap_index },

+   { 25486, BindRenderbufferEXT_remap_index },

+   {  9663, CheckFramebufferStatusEXT_remap_index },

+   { 22520, DeleteFramebuffersEXT_remap_index },

+   { 31514, DeleteRenderbuffersEXT_remap_index },

+   { 13455, FramebufferRenderbufferEXT_remap_index },

+   { 13644, FramebufferTexture1DEXT_remap_index },

+   { 11528, FramebufferTexture2DEXT_remap_index },

+   { 11148, FramebufferTexture3DEXT_remap_index },

+   { 23135, GenFramebuffersEXT_remap_index },

+   { 17403, GenRenderbuffersEXT_remap_index },

+   {  6679, GenerateMipmapEXT_remap_index },

+   { 21597, GetFramebufferAttachmentParameterivEXT_remap_index },

+   { 32084, GetRenderbufferParameterivEXT_remap_index },

+   { 20353, IsFramebufferEXT_remap_index },

+   { 32831, IsRenderbufferEXT_remap_index },

+   {  8174, RenderbufferStorageEXT_remap_index },

+   {   695, BlitFramebufferEXT_remap_index },

+   { 14324, BufferParameteriAPPLE_remap_index },

+   { 19205, FlushMappedBufferRangeAPPLE_remap_index },

+   {  1815, BindFragDataLocationEXT_remap_index },

+   { 24283, GetFragDataLocationEXT_remap_index },

+   { 10576, GetUniformuivEXT_remap_index },

+   {  2933, GetVertexAttribIivEXT_remap_index },

+   {  4195, GetVertexAttribIuivEXT_remap_index },

+   { 12014, Uniform1uiEXT_remap_index },

+   { 27676, Uniform1uivEXT_remap_index },

+   { 22118, Uniform2uiEXT_remap_index },

+   {  4309, Uniform2uivEXT_remap_index },

+   { 28943, Uniform3uiEXT_remap_index },

+   { 14652, Uniform3uivEXT_remap_index },

+   {  3486, Uniform4uiEXT_remap_index },

+   {  8675, Uniform4uivEXT_remap_index },

+   { 18306, VertexAttribI1iEXT_remap_index },

+   {   965, VertexAttribI1ivEXT_remap_index },

+   {  2516, VertexAttribI1uiEXT_remap_index },

+   { 12725, VertexAttribI1uivEXT_remap_index },

+   {    81, VertexAttribI2iEXT_remap_index },

+   { 23706, VertexAttribI2ivEXT_remap_index },

+   {  5273, VertexAttribI2uiEXT_remap_index },

+   {  4728, VertexAttribI2uivEXT_remap_index },

+   { 26361, VertexAttribI3iEXT_remap_index },

+   { 30218, VertexAttribI3ivEXT_remap_index },

+   {  3340, VertexAttribI3uiEXT_remap_index },

+   { 30114, VertexAttribI3uivEXT_remap_index },

+   { 21848, VertexAttribI4bvEXT_remap_index },

+   { 14584, VertexAttribI4iEXT_remap_index },

+   { 31783, VertexAttribI4ivEXT_remap_index },

+   { 13358, VertexAttribI4svEXT_remap_index },

+   { 16462, VertexAttribI4ubvEXT_remap_index },

+   { 16145, VertexAttribI4uiEXT_remap_index },

+   {  5419, VertexAttribI4uivEXT_remap_index },

+   { 11311, VertexAttribI4usvEXT_remap_index },

+   { 18403, VertexAttribIPointerEXT_remap_index },

+   {  3027, FramebufferTextureLayerEXT_remap_index },

+   {  5660, ColorMaskIndexedEXT_remap_index },

+   { 18820, DisableIndexedEXT_remap_index },

+   { 26406, EnableIndexedEXT_remap_index },

+   { 21552, GetBooleanIndexedvEXT_remap_index },

+   { 10922, GetIntegerIndexedvEXT_remap_index },

+   { 22596, IsEnabledIndexedEXT_remap_index },

+   { 22496, ClearColorIiEXT_remap_index },

+   {  3436, ClearColorIuiEXT_remap_index },

+   {  9852, GetTexParameterIivEXT_remap_index },

+   {  5908, GetTexParameterIuivEXT_remap_index },

+   {  2983, TexParameterIivEXT_remap_index },

+   { 26228, TexParameterIuivEXT_remap_index },

+   {  4596, BeginConditionalRenderNV_remap_index },

+   { 25249, EndConditionalRenderNV_remap_index },

+   {  9310, BeginTransformFeedbackEXT_remap_index },

+   { 18855, BindBufferBaseEXT_remap_index },

+   { 18714, BindBufferOffsetEXT_remap_index },

+   { 12202, BindBufferRangeEXT_remap_index },

+   { 14239, EndTransformFeedbackEXT_remap_index },

+   { 10774, GetTransformFeedbackVaryingEXT_remap_index },

+   { 20658, TransformFeedbackVaryingsEXT_remap_index },

+   { 29270, ProvokingVertexEXT_remap_index },

+   { 10722, GetTexParameterPointervAPPLE_remap_index },

+   {  5047, TextureRangeAPPLE_remap_index },

+   { 11600, GetObjectParameterivAPPLE_remap_index },

+   { 19780, ObjectPurgeableAPPLE_remap_index },

+   {  5702, ObjectUnpurgeableAPPLE_remap_index },

+   { 17225, ActiveProgramEXT_remap_index },

+   { 17196, CreateShaderProgramEXT_remap_index },

+   { 28288, UseShaderProgramEXT_remap_index },

+   { 28529, StencilFuncSeparateATI_remap_index },

+   { 18044, ProgramEnvParameters4fvEXT_remap_index },

+   { 17090, ProgramLocalParameters4fvEXT_remap_index },

+   { 14107, GetQueryObjecti64vEXT_remap_index },

+   { 10324, GetQueryObjectui64vEXT_remap_index },

+   { 23663, EGLImageTargetRenderbufferStorageOES_remap_index },

+   { 12120, EGLImageTargetTexture2DOES_remap_index },

+   {    -1, -1 }

+};

+

+/* these functions are in the ABI, but have alternative names */

+static const struct gl_function_remap MESA_alt_functions[] = {

+   /* from GL_EXT_blend_color */

+   {  2655, _gloffset_BlendColor },

+   /* from GL_EXT_blend_minmax */

+   { 11205, _gloffset_BlendEquation },

+   /* from GL_EXT_color_subtable */

+   { 16988, _gloffset_ColorSubTable },

+   { 31446, _gloffset_CopyColorSubTable },

+   /* from GL_EXT_convolution */

+   {   257, _gloffset_ConvolutionFilter1D },

+   {  2454, _gloffset_CopyConvolutionFilter1D },

+   {  4058, _gloffset_GetConvolutionParameteriv },

+   {  8523, _gloffset_ConvolutionFilter2D },

+   {  8725, _gloffset_ConvolutionParameteriv },

+   {  9185, _gloffset_ConvolutionParameterfv },

+   { 20501, _gloffset_GetSeparableFilter },

+   { 23938, _gloffset_SeparableFilter2D },

+   { 24801, _gloffset_ConvolutionParameteri },

+   { 24924, _gloffset_ConvolutionParameterf },

+   { 26595, _gloffset_GetConvolutionParameterfv },

+   { 27417, _gloffset_GetConvolutionFilter },

+   { 29810, _gloffset_CopyConvolutionFilter2D },

+   /* from GL_EXT_copy_texture */

+   { 15065, _gloffset_CopyTexSubImage3D },

+   { 16675, _gloffset_CopyTexImage2D },

+   { 24409, _gloffset_CopyTexImage1D },

+   { 27098, _gloffset_CopyTexSubImage2D },

+   { 29448, _gloffset_CopyTexSubImage1D },

+   /* from GL_EXT_draw_range_elements */

+   {  9522, _gloffset_DrawRangeElements },

+   /* from GL_EXT_histogram */

+   {   856, _gloffset_Histogram },

+   {  3522, _gloffset_ResetHistogram },

+   {  9972, _gloffset_GetMinmax },

+   { 15399, _gloffset_GetHistogramParameterfv },

+   { 24334, _gloffset_GetMinmaxParameteriv },

+   { 26485, _gloffset_ResetMinmax },

+   { 27314, _gloffset_GetHistogramParameteriv },

+   { 28463, _gloffset_GetHistogram },

+   { 31032, _gloffset_Minmax },

+   { 32578, _gloffset_GetMinmaxParameterfv },

+   /* from GL_EXT_paletted_texture */

+   {  8385, _gloffset_ColorTable },

+   { 15245, _gloffset_GetColorTable },

+   { 22882, _gloffset_GetColorTableParameterfv },

+   { 24980, _gloffset_GetColorTableParameteriv },

+   /* from GL_EXT_subtexture */

+   {  7106, _gloffset_TexSubImage1D },

+   { 10649, _gloffset_TexSubImage2D },

+   /* from GL_EXT_texture3D */

+   {  1774, _gloffset_TexImage3D },

+   { 22651, _gloffset_TexSubImage3D },

+   /* from GL_EXT_texture_object */

+   {  3290, _gloffset_PrioritizeTextures },

+   {  7555, _gloffset_AreTexturesResident },

+   { 13562, _gloffset_GenTextures },

+   { 15731, _gloffset_DeleteTextures },

+   { 19486, _gloffset_IsTexture },

+   { 29513, _gloffset_BindTexture },

+   /* from GL_EXT_vertex_array */

+   { 24110, _gloffset_ArrayElement },

+   { 30620, _gloffset_GetPointerv },

+   { 32205, _gloffset_DrawArrays },

+   /* from GL_SGI_color_table */

+   {  7673, _gloffset_ColorTableParameteriv },

+   {  8385, _gloffset_ColorTable },

+   { 15245, _gloffset_GetColorTable },

+   { 15355, _gloffset_CopyColorTable },

+   { 19347, _gloffset_ColorTableParameterfv },

+   { 22882, _gloffset_GetColorTableParameterfv },

+   { 24980, _gloffset_GetColorTableParameteriv },

+   /* from GL_VERSION_1_3 */

+   {   425, _gloffset_MultiTexCoord3sARB },

+   {   657, _gloffset_ActiveTextureARB },

+   {  4247, _gloffset_MultiTexCoord1fvARB },

+   {  6155, _gloffset_MultiTexCoord3dARB },

+   {  6200, _gloffset_MultiTexCoord2iARB },

+   {  6324, _gloffset_MultiTexCoord2svARB },

+   {  8341, _gloffset_MultiTexCoord2fARB },

+   { 10354, _gloffset_MultiTexCoord3fvARB },

+   { 10967, _gloffset_MultiTexCoord4sARB },

+   { 11648, _gloffset_MultiTexCoord2dvARB },

+   { 12063, _gloffset_MultiTexCoord1svARB },

+   { 12435, _gloffset_MultiTexCoord3svARB },

+   { 12496, _gloffset_MultiTexCoord4iARB },

+   { 13266, _gloffset_MultiTexCoord3iARB },

+   { 14136, _gloffset_MultiTexCoord1dARB },

+   { 14353, _gloffset_MultiTexCoord3dvARB },

+   { 15599, _gloffset_MultiTexCoord3ivARB },

+   { 15644, _gloffset_MultiTexCoord2sARB },

+   { 17045, _gloffset_MultiTexCoord4ivARB },

+   { 18997, _gloffset_ClientActiveTextureARB },

+   { 21297, _gloffset_MultiTexCoord2dARB },

+   { 21717, _gloffset_MultiTexCoord4dvARB },

+   { 22073, _gloffset_MultiTexCoord4fvARB },

+   { 23023, _gloffset_MultiTexCoord3fARB },

+   { 25531, _gloffset_MultiTexCoord4dARB },

+   { 25797, _gloffset_MultiTexCoord1sARB },

+   { 26001, _gloffset_MultiTexCoord1dvARB },

+   { 26942, _gloffset_MultiTexCoord1ivARB },

+   { 27035, _gloffset_MultiTexCoord2ivARB },

+   { 27374, _gloffset_MultiTexCoord1iARB },

+   { 28738, _gloffset_MultiTexCoord4svARB },

+   { 29312, _gloffset_MultiTexCoord1fARB },

+   { 29575, _gloffset_MultiTexCoord4fARB },

+   { 32039, _gloffset_MultiTexCoord2fvARB },

+   {    -1, -1 }

+};

+

+#endif /* need_MESA_remap_table */

+

+#if defined(need_GL_3DFX_tbuffer)

+static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {

+   {  9243, -1 }, /* TbufferMask3DFX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_APPLE_flush_buffer_range)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_APPLE_flush_buffer_range_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_APPLE_object_purgeable)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_APPLE_object_purgeable_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_APPLE_texture_range)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_APPLE_texture_range_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_APPLE_vertex_array_object)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_APPLE_vertex_array_object_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_copy_buffer)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_copy_buffer_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_draw_buffers)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_draw_buffers_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_draw_elements_base_vertex)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_draw_elements_base_vertex_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_draw_instanced)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_draw_instanced_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_framebuffer_object)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_geometry_shader4)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {

+   { 12399, -1 }, /* FramebufferTextureLayer */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_map_buffer_range)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_matrix_palette)

+static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {

+   {  3773, -1 }, /* MatrixIndexusvARB */

+   { 13087, -1 }, /* MatrixIndexuivARB */

+   { 14475, -1 }, /* MatrixIndexPointerARB */

+   { 19735, -1 }, /* CurrentPaletteMatrixARB */

+   { 22767, -1 }, /* MatrixIndexubvARB */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_multisample)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_multisample_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_occlusion_query)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_occlusion_query_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_point_parameters)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_point_parameters_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_provoking_vertex)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_provoking_vertex_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_shader_objects)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_shader_objects_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_sync)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_sync_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_texture_compression)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_texture_compression_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_transform_feedback2)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_transform_feedback2_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_transpose_matrix)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_transpose_matrix_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_vertex_array_object)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_vertex_blend)

+static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {

+   {  2396, -1 }, /* WeightubvARB */

+   {  6567, -1 }, /* WeightivARB */

+   { 11070, -1 }, /* WeightPointerARB */

+   { 13854, -1 }, /* WeightfvARB */

+   { 17564, -1 }, /* WeightbvARB */

+   { 20965, -1 }, /* WeightusvARB */

+   { 23864, -1 }, /* VertexBlendARB */

+   { 29396, -1 }, /* WeightsvARB */

+   { 31496, -1 }, /* WeightdvARB */

+   { 32239, -1 }, /* WeightuivARB */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_vertex_buffer_object)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_vertex_buffer_object_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_vertex_program)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_vertex_program_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_vertex_shader)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_vertex_shader_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ARB_window_pos)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ARB_window_pos_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ATI_blend_equation_separate)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ATI_blend_equation_separate_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ATI_draw_buffers)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ATI_draw_buffers_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ATI_envmap_bumpmap)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ATI_envmap_bumpmap_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ATI_fragment_shader)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ATI_fragment_shader_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_ATI_separate_stencil)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_ATI_separate_stencil_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_blend_color)

+static const struct gl_function_remap GL_EXT_blend_color_functions[] = {

+   {  2655, _gloffset_BlendColor },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_blend_equation_separate)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_blend_equation_separate_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_blend_func_separate)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_blend_minmax)

+static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {

+   { 11205, _gloffset_BlendEquation },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_color_subtable)

+static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {

+   { 16988, _gloffset_ColorSubTable },

+   { 31446, _gloffset_CopyColorSubTable },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_compiled_vertex_array)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_compiled_vertex_array_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_convolution)

+static const struct gl_function_remap GL_EXT_convolution_functions[] = {

+   {   257, _gloffset_ConvolutionFilter1D },

+   {  2454, _gloffset_CopyConvolutionFilter1D },

+   {  4058, _gloffset_GetConvolutionParameteriv },

+   {  8523, _gloffset_ConvolutionFilter2D },

+   {  8725, _gloffset_ConvolutionParameteriv },

+   {  9185, _gloffset_ConvolutionParameterfv },

+   { 20501, _gloffset_GetSeparableFilter },

+   { 23938, _gloffset_SeparableFilter2D },

+   { 24801, _gloffset_ConvolutionParameteri },

+   { 24924, _gloffset_ConvolutionParameterf },

+   { 26595, _gloffset_GetConvolutionParameterfv },

+   { 27417, _gloffset_GetConvolutionFilter },

+   { 29810, _gloffset_CopyConvolutionFilter2D },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_coordinate_frame)

+static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {

+   { 10493, -1 }, /* TangentPointerEXT */

+   { 12554, -1 }, /* Binormal3ivEXT */

+   { 13219, -1 }, /* Tangent3sEXT */

+   { 14540, -1 }, /* Tangent3fvEXT */

+   { 18695, -1 }, /* Tangent3dvEXT */

+   { 19433, -1 }, /* Binormal3bvEXT */

+   { 20554, -1 }, /* Binormal3dEXT */

+   { 22699, -1 }, /* Tangent3fEXT */

+   { 24873, -1 }, /* Binormal3sEXT */

+   { 25341, -1 }, /* Tangent3ivEXT */

+   { 25360, -1 }, /* Tangent3dEXT */

+   { 26274, -1 }, /* Binormal3svEXT */

+   { 26840, -1 }, /* Binormal3fEXT */

+   { 27728, -1 }, /* Binormal3dvEXT */

+   { 28995, -1 }, /* Tangent3iEXT */

+   { 30095, -1 }, /* Tangent3bvEXT */

+   { 30655, -1 }, /* Tangent3bEXT */

+   { 31219, -1 }, /* Binormal3fvEXT */

+   { 31938, -1 }, /* BinormalPointerEXT */

+   { 32343, -1 }, /* Tangent3svEXT */

+   { 32780, -1 }, /* Binormal3bEXT */

+   { 32957, -1 }, /* Binormal3iEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_copy_texture)

+static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {

+   { 15065, _gloffset_CopyTexSubImage3D },

+   { 16675, _gloffset_CopyTexImage2D },

+   { 24409, _gloffset_CopyTexImage1D },

+   { 27098, _gloffset_CopyTexSubImage2D },

+   { 29448, _gloffset_CopyTexSubImage1D },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_cull_vertex)

+static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {

+   {  8874, -1 }, /* CullParameterdvEXT */

+   { 11693, -1 }, /* CullParameterfvEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_depth_bounds_test)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_depth_bounds_test_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_draw_buffers2)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_draw_buffers2_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_draw_instanced)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_draw_range_elements)

+static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {

+   {  9522, _gloffset_DrawRangeElements },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_fog_coord)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_fog_coord_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_framebuffer_blit)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_framebuffer_blit_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_framebuffer_multisample)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_framebuffer_multisample_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_framebuffer_object)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_framebuffer_object_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_gpu_program_parameters)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_gpu_shader4)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_gpu_shader4_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_histogram)

+static const struct gl_function_remap GL_EXT_histogram_functions[] = {

+   {   856, _gloffset_Histogram },

+   {  3522, _gloffset_ResetHistogram },

+   {  9972, _gloffset_GetMinmax },

+   { 15399, _gloffset_GetHistogramParameterfv },

+   { 24334, _gloffset_GetMinmaxParameteriv },

+   { 26485, _gloffset_ResetMinmax },

+   { 27314, _gloffset_GetHistogramParameteriv },

+   { 28463, _gloffset_GetHistogram },

+   { 31032, _gloffset_Minmax },

+   { 32578, _gloffset_GetMinmaxParameterfv },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_index_func)

+static const struct gl_function_remap GL_EXT_index_func_functions[] = {

+   { 11479, -1 }, /* IndexFuncEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_index_material)

+static const struct gl_function_remap GL_EXT_index_material_functions[] = {

+   { 21052, -1 }, /* IndexMaterialEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_light_texture)

+static const struct gl_function_remap GL_EXT_light_texture_functions[] = {

+   { 26294, -1 }, /* ApplyTextureEXT */

+   { 26439, -1 }, /* TextureMaterialEXT */

+   { 26464, -1 }, /* TextureLightEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_multi_draw_arrays)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_multi_draw_arrays_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_multisample)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_multisample_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_paletted_texture)

+static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {

+   {  8385, _gloffset_ColorTable },

+   { 15245, _gloffset_GetColorTable },

+   { 22882, _gloffset_GetColorTableParameterfv },

+   { 24980, _gloffset_GetColorTableParameteriv },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_pixel_transform)

+static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {

+   { 21682, -1 }, /* PixelTransformParameterfEXT */

+   { 21762, -1 }, /* PixelTransformParameteriEXT */

+   { 30370, -1 }, /* PixelTransformParameterfvEXT */

+   { 31902, -1 }, /* PixelTransformParameterivEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_point_parameters)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_point_parameters_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_polygon_offset)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_polygon_offset_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_provoking_vertex)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_provoking_vertex_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_secondary_color)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_secondary_color_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_separate_shader_objects)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_separate_shader_objects_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_stencil_two_side)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_subtexture)

+static const struct gl_function_remap GL_EXT_subtexture_functions[] = {

+   {  7106, _gloffset_TexSubImage1D },

+   { 10649, _gloffset_TexSubImage2D },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_texture3D)

+static const struct gl_function_remap GL_EXT_texture3D_functions[] = {

+   {  1774, _gloffset_TexImage3D },

+   { 22651, _gloffset_TexSubImage3D },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_texture_array)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_texture_array_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_texture_integer)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_texture_integer_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_texture_object)

+static const struct gl_function_remap GL_EXT_texture_object_functions[] = {

+   {  3290, _gloffset_PrioritizeTextures },

+   {  7555, _gloffset_AreTexturesResident },

+   { 13562, _gloffset_GenTextures },

+   { 15731, _gloffset_DeleteTextures },

+   { 19486, _gloffset_IsTexture },

+   { 29513, _gloffset_BindTexture },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_texture_perturb_normal)

+static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {

+   { 13804, -1 }, /* TextureNormalEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_timer_query)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_timer_query_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_transform_feedback)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_vertex_array)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {

+   { 24110, _gloffset_ArrayElement },

+   { 30620, _gloffset_GetPointerv },

+   { 32205, _gloffset_DrawArrays },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_EXT_vertex_weighting)

+static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {

+   { 19516, -1 }, /* VertexWeightfvEXT */

+   { 26818, -1 }, /* VertexWeightfEXT */

+   { 28432, -1 }, /* VertexWeightPointerEXT */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_HP_image_transform)

+static const struct gl_function_remap GL_HP_image_transform_functions[] = {

+   {  2327, -1 }, /* GetImageTransformParameterfvHP */

+   {  3739, -1 }, /* ImageTransformParameterfHP */

+   { 10187, -1 }, /* ImageTransformParameterfvHP */

+   { 11948, -1 }, /* ImageTransformParameteriHP */

+   { 12289, -1 }, /* GetImageTransformParameterivHP */

+   { 19580, -1 }, /* ImageTransformParameterivHP */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_IBM_multimode_draw_arrays)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_IBM_vertex_array_lists)

+static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {

+   {  4379, -1 }, /* SecondaryColorPointerListIBM */

+   {  6021, -1 }, /* NormalPointerListIBM */

+   {  7729, -1 }, /* FogCoordPointerListIBM */

+   {  8036, -1 }, /* VertexPointerListIBM */

+   { 11869, -1 }, /* ColorPointerListIBM */

+   { 13326, -1 }, /* TexCoordPointerListIBM */

+   { 13826, -1 }, /* IndexPointerListIBM */

+   { 32521, -1 }, /* EdgeFlagPointerListIBM */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_INGR_blend_func_separate)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_INTEL_parallel_arrays)

+static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {

+   { 12666, -1 }, /* VertexPointervINTEL */

+   { 15492, -1 }, /* ColorPointervINTEL */

+   { 29784, -1 }, /* NormalPointervINTEL */

+   { 30302, -1 }, /* TexCoordPointervINTEL */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_MESA_resize_buffers)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_MESA_shader_debug)

+static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {

+   {  1638, -1 }, /* GetDebugLogLengthMESA */

+   {  3461, -1 }, /* ClearDebugLogMESA */

+   {  4540, -1 }, /* GetDebugLogMESA */

+   { 30813, -1 }, /* CreateDebugObjectMESA */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_MESA_window_pos)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_MESA_window_pos_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_condtitional_render)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_evaluators)

+static const struct gl_function_remap GL_NV_evaluators_functions[] = {

+   {  6768, -1 }, /* GetMapAttribParameterivNV */

+   {  8491, -1 }, /* MapControlPointsNV */

+   {  8590, -1 }, /* MapParameterfvNV */

+   { 10632, -1 }, /* EvalMapsNV */

+   { 17162, -1 }, /* GetMapAttribParameterfvNV */

+   { 17379, -1 }, /* MapParameterivNV */

+   { 24724, -1 }, /* GetMapParameterivNV */

+   { 25222, -1 }, /* GetMapParameterfvNV */

+   { 29099, -1 }, /* GetMapControlPointsNV */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_fence)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_fence_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_fragment_program)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_fragment_program_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_point_sprite)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_point_sprite_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_primitive_restart)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_primitive_restart_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_register_combiners)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_register_combiners_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_register_combiners2)

+static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {

+   { 15884, -1 }, /* CombinerStageParameterfvNV */

+   { 16280, -1 }, /* GetCombinerStageParameterfvNV */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_vertex_array_range)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_vertex_array_range_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_NV_vertex_program)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_NV_vertex_program_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_OES_EGL_image)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_OES_EGL_image_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_PGI_misc_hints)

+static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {

+   {  8711, -1 }, /* HintPGI */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_detail_texture)

+static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {

+   { 16253, -1 }, /* GetDetailTexFuncSGIS */

+   { 16620, -1 }, /* DetailTexFuncSGIS */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_fog_function)

+static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {

+   { 27080, -1 }, /* FogFuncSGIS */

+   { 27781, -1 }, /* GetFogFuncSGIS */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_multisample)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_SGIS_multisample_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_pixel_texture)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_SGIS_pixel_texture_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_point_parameters)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_sharpen_texture)

+static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {

+   {  6829, -1 }, /* GetSharpenTexFuncSGIS */

+   { 22047, -1 }, /* SharpenTexFuncSGIS */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_texture4D)

+static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {

+   {  1010, -1 }, /* TexImage4DSGIS */

+   { 15800, -1 }, /* TexSubImage4DSGIS */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_texture_color_mask)

+static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {

+   { 15198, -1 }, /* TextureColorMaskSGIS */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIS_texture_filter4)

+static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {

+   {  7006, -1 }, /* GetTexFilterFuncSGIS */

+   { 16399, -1 }, /* TexFilterFuncSGIS */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_async)

+static const struct gl_function_remap GL_SGIX_async_functions[] = {

+   {  3387, -1 }, /* AsyncMarkerSGIX */

+   {  4519, -1 }, /* FinishAsyncSGIX */

+   {  5466, -1 }, /* PollAsyncSGIX */

+   { 22228, -1 }, /* DeleteAsyncMarkersSGIX */

+   { 22283, -1 }, /* IsAsyncMarkerSGIX */

+   { 32318, -1 }, /* GenAsyncMarkersSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_flush_raster)

+static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {

+   {  7383, -1 }, /* FlushRasterSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_fragment_lighting)

+static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {

+   {  2625, -1 }, /* FragmentMaterialfvSGIX */

+   {  5370, -1 }, /* FragmentLightiSGIX */

+   {  8103, -1 }, /* FragmentMaterialfSGIX */

+   {  8264, -1 }, /* GetFragmentLightivSGIX */

+   {  9137, -1 }, /* FragmentLightModeliSGIX */

+   { 10695, -1 }, /* FragmentLightivSGIX */

+   { 11013, -1 }, /* GetFragmentMaterialivSGIX */

+   { 16193, -1 }, /* GetFragmentMaterialfvSGIX */

+   { 19403, -1 }, /* FragmentLightModelfSGIX */

+   { 19703, -1 }, /* FragmentColorMaterialSGIX */

+   { 20120, -1 }, /* FragmentMaterialiSGIX */

+   { 21380, -1 }, /* LightEnviSGIX */

+   { 22974, -1 }, /* FragmentLightModelfvSGIX */

+   { 23309, -1 }, /* FragmentLightfvSGIX */

+   { 28165, -1 }, /* FragmentLightModelivSGIX */

+   { 28314, -1 }, /* FragmentLightfSGIX */

+   { 31189, -1 }, /* GetFragmentLightfvSGIX */

+   { 32801, -1 }, /* FragmentMaterialivSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_framezoom)

+static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {

+   { 22306, -1 }, /* FrameZoomSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_igloo_interface)

+static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {

+   { 28622, -1 }, /* IglooInterfaceSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_instruments)

+static const struct gl_function_remap GL_SGIX_instruments_functions[] = {

+   {  2805, -1 }, /* ReadInstrumentsSGIX */

+   {  6585, -1 }, /* PollInstrumentsSGIX */

+   { 10553, -1 }, /* GetInstrumentsSGIX */

+   { 12924, -1 }, /* StartInstrumentsSGIX */

+   { 15918, -1 }, /* StopInstrumentsSGIX */

+   { 17777, -1 }, /* InstrumentsBufferSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_list_priority)

+static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {

+   {  1241, -1 }, /* ListParameterfSGIX */

+   {  3089, -1 }, /* GetListParameterfvSGIX */

+   { 17692, -1 }, /* ListParameteriSGIX */

+   { 18645, -1 }, /* ListParameterfvSGIX */

+   { 20786, -1 }, /* ListParameterivSGIX */

+   { 32362, -1 }, /* GetListParameterivSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_pixel_texture)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_polynomial_ffd)

+static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {

+   {  3685, -1 }, /* LoadIdentityDeformationMapSGIX */

+   { 16018, -1 }, /* DeformSGIX */

+   { 24222, -1 }, /* DeformationMap3fSGIX */

+   { 31077, -1 }, /* DeformationMap3dSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_reference_plane)

+static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {

+   { 14749, -1 }, /* ReferencePlaneSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_sprite)

+static const struct gl_function_remap GL_SGIX_sprite_functions[] = {

+   {  9635, -1 }, /* SpriteParameterfvSGIX */

+   { 20575, -1 }, /* SpriteParameteriSGIX */

+   { 26519, -1 }, /* SpriteParameterfSGIX */

+   { 29242, -1 }, /* SpriteParameterivSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGIX_tag_sample_buffer)

+static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {

+   { 20634, -1 }, /* TagSampleBufferSGIX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SGI_color_table)

+static const struct gl_function_remap GL_SGI_color_table_functions[] = {

+   {  7673, _gloffset_ColorTableParameteriv },

+   {  8385, _gloffset_ColorTable },

+   { 15245, _gloffset_GetColorTable },

+   { 15355, _gloffset_CopyColorTable },

+   { 19347, _gloffset_ColorTableParameterfv },

+   { 22882, _gloffset_GetColorTableParameterfv },

+   { 24980, _gloffset_GetColorTableParameteriv },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SUNX_constant_data)

+static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {

+   { 31167, -1 }, /* FinishTextureSUNX */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SUN_global_alpha)

+static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {

+   {  3408, -1 }, /* GlobalAlphaFactorubSUN */

+   {  4818, -1 }, /* GlobalAlphaFactoriSUN */

+   {  6610, -1 }, /* GlobalAlphaFactordSUN */

+   {  9719, -1 }, /* GlobalAlphaFactoruiSUN */

+   { 10144, -1 }, /* GlobalAlphaFactorbSUN */

+   { 13239, -1 }, /* GlobalAlphaFactorfSUN */

+   { 13403, -1 }, /* GlobalAlphaFactorusSUN */

+   { 22569, -1 }, /* GlobalAlphaFactorsSUN */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SUN_mesh_array)

+static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {

+   { 29033, -1 }, /* DrawMeshArraysSUN */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SUN_triangle_list)

+static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {

+   {  4493, -1 }, /* ReplacementCodeubSUN */

+   {  6369, -1 }, /* ReplacementCodeubvSUN */

+   { 19068, -1 }, /* ReplacementCodeusvSUN */

+   { 19256, -1 }, /* ReplacementCodePointerSUN */

+   { 21444, -1 }, /* ReplacementCodeuiSUN */

+   { 22257, -1 }, /* ReplacementCodeusSUN */

+   { 29699, -1 }, /* ReplacementCodeuivSUN */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_SUN_vertex)

+static const struct gl_function_remap GL_SUN_vertex_functions[] = {

+   {  1115, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */

+   {  1313, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */

+   {  1539, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */

+   {  1869, -1 }, /* ReplacementCodeuiVertex3fvSUN */

+   {  2003, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */

+   {  2561, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */

+   {  2874, -1 }, /* Color4ubVertex3fvSUN */

+   {  4652, -1 }, /* Color4ubVertex3fSUN */

+   {  4775, -1 }, /* TexCoord2fVertex3fSUN */

+   {  5119, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */

+   {  5570, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */

+   {  6264, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */

+   {  7061, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */

+   {  7420, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */

+   {  8132, -1 }, /* TexCoord2fNormal3fVertex3fSUN */

+   {  8936, -1 }, /* Color3fVertex3fSUN */

+   { 10080, -1 }, /* Color3fVertex3fvSUN */

+   { 10518, -1 }, /* Color4fNormal3fVertex3fvSUN */

+   { 11358, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */

+   { 12787, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */

+   { 14398, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */

+   { 14891, -1 }, /* TexCoord2fColor3fVertex3fSUN */

+   { 15943, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */

+   { 16358, -1 }, /* Color4ubVertex2fvSUN */

+   { 16645, -1 }, /* Normal3fVertex3fSUN */

+   { 17718, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */

+   { 18079, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */

+   { 18897, -1 }, /* TexCoord2fVertex3fvSUN */

+   { 19673, -1 }, /* Color4ubVertex2fSUN */

+   { 19911, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */

+   { 21893, -1 }, /* TexCoord2fColor4ubVertex3fSUN */

+   { 22325, -1 }, /* Normal3fVertex3fvSUN */

+   { 22791, -1 }, /* Color4fNormal3fVertex3fSUN */

+   { 23771, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */

+   { 25840, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */

+   { 27196, -1 }, /* TexCoord4fVertex4fSUN */

+   { 27622, -1 }, /* TexCoord2fColor3fVertex3fvSUN */

+   { 28009, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */

+   { 28136, -1 }, /* TexCoord4fVertex4fvSUN */

+   { 28870, -1 }, /* ReplacementCodeuiVertex3fSUN */

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_1_3)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_1_3_functions[] = {

+   {   425, _gloffset_MultiTexCoord3sARB },

+   {   657, _gloffset_ActiveTextureARB },

+   {  4247, _gloffset_MultiTexCoord1fvARB },

+   {  6155, _gloffset_MultiTexCoord3dARB },

+   {  6200, _gloffset_MultiTexCoord2iARB },

+   {  6324, _gloffset_MultiTexCoord2svARB },

+   {  8341, _gloffset_MultiTexCoord2fARB },

+   { 10354, _gloffset_MultiTexCoord3fvARB },

+   { 10967, _gloffset_MultiTexCoord4sARB },

+   { 11648, _gloffset_MultiTexCoord2dvARB },

+   { 12063, _gloffset_MultiTexCoord1svARB },

+   { 12435, _gloffset_MultiTexCoord3svARB },

+   { 12496, _gloffset_MultiTexCoord4iARB },

+   { 13266, _gloffset_MultiTexCoord3iARB },

+   { 14136, _gloffset_MultiTexCoord1dARB },

+   { 14353, _gloffset_MultiTexCoord3dvARB },

+   { 15599, _gloffset_MultiTexCoord3ivARB },

+   { 15644, _gloffset_MultiTexCoord2sARB },

+   { 17045, _gloffset_MultiTexCoord4ivARB },

+   { 18997, _gloffset_ClientActiveTextureARB },

+   { 21297, _gloffset_MultiTexCoord2dARB },

+   { 21717, _gloffset_MultiTexCoord4dvARB },

+   { 22073, _gloffset_MultiTexCoord4fvARB },

+   { 23023, _gloffset_MultiTexCoord3fARB },

+   { 25531, _gloffset_MultiTexCoord4dARB },

+   { 25797, _gloffset_MultiTexCoord1sARB },

+   { 26001, _gloffset_MultiTexCoord1dvARB },

+   { 26942, _gloffset_MultiTexCoord1ivARB },

+   { 27035, _gloffset_MultiTexCoord2ivARB },

+   { 27374, _gloffset_MultiTexCoord1iARB },

+   { 28738, _gloffset_MultiTexCoord4svARB },

+   { 29312, _gloffset_MultiTexCoord1fARB },

+   { 29575, _gloffset_MultiTexCoord4fARB },

+   { 32039, _gloffset_MultiTexCoord2fvARB },

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_1_4)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_1_4_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_1_5)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_1_5_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_2_0)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_2_0_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_2_1)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_2_1_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_3_0)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_3_0_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_3_1)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_3_1_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_3_2)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_3_2_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

+#if defined(need_GL_VERSION_3_3)

+/* functions defined in MESA_remap_table_functions are excluded */

+static const struct gl_function_remap GL_VERSION_3_3_functions[] = {

+   {    -1, -1 }

+};

+#endif

+

diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index adc1199d8..ddc2fe30d 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -1,2008 +1,2007 @@
-/*
- * 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 "fbobject.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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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:
-      _mesa_problem(ctx, "Bad internalFormat in _mesa_soft_renderbuffer_storage");
-      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);
-   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(GLcontext *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(GLcontext *ctx, struct gl_renderbuffer *arb,
-                   GLint x, GLint y)
-{
-   return NULL;   /* don't allow direct access! */
-}
-
-
-static void
-get_row_alpha8(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *ctx, struct gl_framebuffer *fb,
-                              GLuint rgbBits, GLuint alphaBits,
-                              GLboolean frontLeft, GLboolean backLeft,
-                              GLboolean frontRight, GLboolean backRight)
-{
-   GLuint 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(GLcontext *ctx, struct gl_framebuffer *fb,
-                              GLuint alphaBits,
-                              GLboolean frontLeft, GLboolean backLeft,
-                              GLboolean frontRight, GLboolean backRight)
-{
-   GLuint 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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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 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!
- *
- * NOTE: color-index aux buffers not supported.
- */
-GLboolean
-_mesa_add_aux_renderbuffers(GLcontext *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 accum 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.
- */
-void
-_mesa_add_renderbuffer(struct gl_framebuffer *fb,
-                       GLuint 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.
- */
-void
-_mesa_remove_renderbuffer(struct gl_framebuffer *fb, GLuint 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(GLcontext *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:

+      _mesa_problem(ctx, "Bad internalFormat in _mesa_soft_renderbuffer_storage");

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

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

+{

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

+{

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

+ */

+void

+_mesa_add_renderbuffer(struct gl_framebuffer *fb,

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

+ */

+void

+_mesa_remove_renderbuffer(struct gl_framebuffer *fb, GLuint 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/renderbuffer.h b/mesalib/src/mesa/main/renderbuffer.h
index bc92b2698..c93eef4b8 100644
--- a/mesalib/src/mesa/main/renderbuffer.h
+++ b/mesalib/src/mesa/main/renderbuffer.h
@@ -1,111 +1,111 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 RENDERBUFFER_H
-#define RENDERBUFFER_H
-
-#include "glheader.h"
-#include "mtypes.h"
-
-struct gl_framebuffer;
-struct gl_renderbuffer;
-
-extern void
-_mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name);
-
-extern struct gl_renderbuffer *
-_mesa_new_renderbuffer(GLcontext *ctx, GLuint name);
-
-extern void
-_mesa_delete_renderbuffer(struct gl_renderbuffer *rb);
-
-
-extern struct gl_renderbuffer *
-_mesa_new_soft_renderbuffer(GLcontext *ctx, GLuint name);
-
-
-extern GLboolean
-_mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
-                                GLenum internalFormat,
-                                GLuint width, GLuint height);
-
-extern GLboolean
-_mesa_add_color_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
-                              GLuint rgbBits, GLuint alphaBits,
-                              GLboolean frontLeft, GLboolean backLeft,
-                              GLboolean frontRight, GLboolean backRight);
-
-extern GLboolean
-_mesa_add_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
-                              GLuint alphaBits,
-                              GLboolean frontLeft, GLboolean backLeft,
-                              GLboolean frontRight, GLboolean backRight);
-
-extern void
-_mesa_copy_soft_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb);
-
-extern GLboolean
-_mesa_add_depth_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                             GLuint depthBits);
-
-extern GLboolean
-_mesa_add_stencil_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                               GLuint stencilBits);
-
-
-extern GLboolean
-_mesa_add_accum_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
-                             GLuint redBits, GLuint greenBits,
-                             GLuint blueBits, GLuint alphaBits);
-
-extern GLboolean
-_mesa_add_aux_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
-                            GLuint bits, GLuint numBuffers);
-
-extern void
-_mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
-                             GLboolean color,
-                             GLboolean depth,
-                             GLboolean stencil,
-                             GLboolean accum,
-                             GLboolean alpha,
-                             GLboolean aux);
-
-extern void
-_mesa_add_renderbuffer(struct gl_framebuffer *fb,
-                       GLuint bufferName, struct gl_renderbuffer *rb);
-
-extern void
-_mesa_remove_renderbuffer(struct gl_framebuffer *fb, GLuint bufferName);
-
-extern void
-_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
-                             struct gl_renderbuffer *rb);
-
-extern struct gl_renderbuffer *
-_mesa_new_depthstencil_renderbuffer(GLcontext *ctx, GLuint name);
-
-
-#endif /* RENDERBUFFER_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 RENDERBUFFER_H

+#define RENDERBUFFER_H

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_framebuffer;

+struct gl_renderbuffer;

+

+extern void

+_mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name);

+

+extern struct gl_renderbuffer *

+_mesa_new_renderbuffer(struct gl_context *ctx, GLuint name);

+

+extern void

+_mesa_delete_renderbuffer(struct gl_renderbuffer *rb);

+

+

+extern struct gl_renderbuffer *

+_mesa_new_soft_renderbuffer(struct gl_context *ctx, GLuint name);

+

+

+extern GLboolean

+_mesa_soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                                GLenum internalFormat,

+                                GLuint width, GLuint height);

+

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

+

+extern GLboolean

+_mesa_add_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,

+                              GLuint alphaBits,

+                              GLboolean frontLeft, GLboolean backLeft,

+                              GLboolean frontRight, GLboolean backRight);

+

+extern void

+_mesa_copy_soft_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb);

+

+extern GLboolean

+_mesa_add_depth_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                             GLuint depthBits);

+

+extern GLboolean

+_mesa_add_stencil_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                               GLuint stencilBits);

+

+

+extern GLboolean

+_mesa_add_accum_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

+                             GLuint redBits, GLuint greenBits,

+                             GLuint blueBits, GLuint alphaBits);

+

+extern GLboolean

+_mesa_add_aux_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,

+                            GLuint bits, GLuint numBuffers);

+

+extern void

+_mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,

+                             GLboolean color,

+                             GLboolean depth,

+                             GLboolean stencil,

+                             GLboolean accum,

+                             GLboolean alpha,

+                             GLboolean aux);

+

+extern void

+_mesa_add_renderbuffer(struct gl_framebuffer *fb,

+                       GLuint bufferName, struct gl_renderbuffer *rb);

+

+extern void

+_mesa_remove_renderbuffer(struct gl_framebuffer *fb, GLuint bufferName);

+

+extern void

+_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,

+                             struct gl_renderbuffer *rb);

+

+extern struct gl_renderbuffer *

+_mesa_new_depthstencil_renderbuffer(struct gl_context *ctx, GLuint name);

+

+

+#endif /* RENDERBUFFER_H */

diff --git a/mesalib/src/mesa/main/scissor.c b/mesalib/src/mesa/main/scissor.c
index 523f3c3ab..716b16b80 100644
--- a/mesalib/src/mesa/main/scissor.c
+++ b/mesalib/src/mesa/main/scissor.c
@@ -1,99 +1,99 @@
-/*
- * 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/context.h"
-#include "main/scissor.h"
-
-
-/**
- * Called via glScissor
- */
-void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
-      return;
-   }
-
-   _mesa_set_scissor(ctx, x, y, width, height);
-}
-
-
-/**
- * Define the scissor box.
- *
- * \param x, y coordinates of the scissor box lower-left corner.
- * \param width width of the scissor box.
- * \param height height of the scissor box.
- *
- * \sa glScissor().
- *
- * Verifies the parameters and updates __GLcontextRec::Scissor. On a
- * change flushes the vertices and notifies the driver via
- * the dd_function_table::Scissor callback.
- */
-void
-_mesa_set_scissor(GLcontext *ctx, 
-                  GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   if (x == ctx->Scissor.X &&
-       y == ctx->Scissor.Y &&
-       width == ctx->Scissor.Width &&
-       height == ctx->Scissor.Height)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_SCISSOR);
-   ctx->Scissor.X = x;
-   ctx->Scissor.Y = y;
-   ctx->Scissor.Width = width;
-   ctx->Scissor.Height = height;
-
-   if (ctx->Driver.Scissor)
-      ctx->Driver.Scissor( ctx, x, y, width, height );
-}
-
-
-/**
- * Initialize the context's scissor state.
- * \param ctx  the GL context.
- */
-void
-_mesa_init_scissor(GLcontext *ctx)
-{
-   /* Scissor group */
-   ctx->Scissor.Enabled = GL_FALSE;
-   ctx->Scissor.X = 0;
-   ctx->Scissor.Y = 0;
-   ctx->Scissor.Width = 0;
-   ctx->Scissor.Height = 0;
-}
+/*

+ * 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/context.h"

+#include "main/scissor.h"

+

+

+/**

+ * Called via glScissor

+ */

+void GLAPIENTRY

+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);

+

+   if (width < 0 || height < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );

+      return;

+   }

+

+   _mesa_set_scissor(ctx, x, y, width, height);

+}

+

+

+/**

+ * Define the scissor box.

+ *

+ * \param x, y coordinates of the scissor box lower-left corner.

+ * \param width width of the scissor box.

+ * \param height height of the scissor box.

+ *

+ * \sa glScissor().

+ *

+ * Verifies the parameters and updates __struct gl_contextRec::Scissor. On a

+ * change flushes the vertices and notifies the driver via

+ * the dd_function_table::Scissor callback.

+ */

+void

+_mesa_set_scissor(struct gl_context *ctx, 

+                  GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   if (x == ctx->Scissor.X &&

+       y == ctx->Scissor.Y &&

+       width == ctx->Scissor.Width &&

+       height == ctx->Scissor.Height)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_SCISSOR);

+   ctx->Scissor.X = x;

+   ctx->Scissor.Y = y;

+   ctx->Scissor.Width = width;

+   ctx->Scissor.Height = height;

+

+   if (ctx->Driver.Scissor)

+      ctx->Driver.Scissor( ctx, x, y, width, height );

+}

+

+

+/**

+ * Initialize the context's scissor state.

+ * \param ctx  the GL context.

+ */

+void

+_mesa_init_scissor(struct gl_context *ctx)

+{

+   /* Scissor group */

+   ctx->Scissor.Enabled = GL_FALSE;

+   ctx->Scissor.X = 0;

+   ctx->Scissor.Y = 0;

+   ctx->Scissor.Width = 0;

+   ctx->Scissor.Height = 0;

+}

diff --git a/mesalib/src/mesa/main/scissor.h b/mesalib/src/mesa/main/scissor.h
index b852a2122..8735ec0cd 100644
--- a/mesalib/src/mesa/main/scissor.h
+++ b/mesalib/src/mesa/main/scissor.h
@@ -1,46 +1,47 @@
-/*
- * 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 SCISSOR_H
-#define SCISSOR_H
-
-
-#include "main/mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
-
-
-extern void
-_mesa_set_scissor(GLcontext *ctx, 
-                  GLint x, GLint y, GLsizei width, GLsizei height);
-
-
-extern void 
-_mesa_init_scissor(GLcontext *ctx);
-
-
-#endif
+/*

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

+#define SCISSOR_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );

+

+

+extern void

+_mesa_set_scissor(struct gl_context *ctx, 

+                  GLint x, GLint y, GLsizei width, GLsizei height);

+

+

+extern void 

+_mesa_init_scissor(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index c25d2a197..d84273263 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1,1642 +1,1886 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2004-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
- * 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 shaderapi.c
- * \author Brian Paul
- *
- * Implementation of GLSL-related API functions.
- * The glUniform* functions are in uniforms.c
- *
- *
- * 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/enums.h"
-#include "main/hash.h"
-#include "main/shaderapi.h"
-#include "main/shaderobj.h"
-#include "program/program.h"
-#include "program/prog_parameter.h"
-#include "program/prog_uniform.h"
-#include "talloc.h"
-
-
-/** Define this to enable shader substitution (see below) */
-#define SHADER_SUBST 0
-
-
-/**
- * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
- */
-static GLbitfield
-get_shader_flags(void)
-{
-   GLbitfield flags = 0x0;
-   const char *env = _mesa_getenv("MESA_GLSL");
-
-   if (env) {
-      if (strstr(env, "dump"))
-         flags |= GLSL_DUMP;
-      if (strstr(env, "log"))
-         flags |= GLSL_LOG;
-      if (strstr(env, "nopvert"))
-         flags |= GLSL_NOP_VERT;
-      if (strstr(env, "nopfrag"))
-         flags |= GLSL_NOP_FRAG;
-      if (strstr(env, "nopt"))
-         flags |= GLSL_NO_OPT;
-      else if (strstr(env, "opt"))
-         flags |= GLSL_OPT;
-      if (strstr(env, "uniform"))
-         flags |= GLSL_UNIFORMS;
-      if (strstr(env, "useprog"))
-         flags |= GLSL_USE_PROG;
-   }
-
-   return flags;
-}
-
-
-/**
- * Initialize context's shader state.
- */
-void
-_mesa_init_shader_state(GLcontext *ctx)
-{
-   /* Device drivers may override these to control what kind of instructions
-    * are generated by the GLSL compiler.
-    */
-   struct gl_shader_compiler_options options;
-   GLuint i;
-
-   memset(&options, 0, sizeof(options));
-   options.MaxUnrollIterations = 32;
-
-   /* Default pragma settings */
-   options.DefaultPragmas.Optimize = GL_TRUE;
-
-   for(i = 0; i < MESA_SHADER_TYPES; ++i)
-      memcpy(&ctx->ShaderCompilerOptions[i], &options, sizeof(options));
-
-   ctx->Shader.Flags = get_shader_flags();
-}
-
-
-/**
- * Free the per-context shader-related state.
- */
-void
-_mesa_free_shader_state(GLcontext *ctx)
-{
-   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, NULL);
-}
-
-
-/**
- * Return the size of the given GLSL datatype, in floats (components).
- */
-GLint
-_mesa_sizeof_glsl_type(GLenum type)
-{
-   switch (type) {
-   case GL_FLOAT:
-   case GL_INT:
-   case GL_BOOL:
-   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:
-   case GL_SAMPLER_CUBE_SHADOW_EXT:
-      return 1;
-   case GL_FLOAT_VEC2:
-   case GL_INT_VEC2:
-   case GL_UNSIGNED_INT_VEC2:
-   case GL_BOOL_VEC2:
-      return 2;
-   case GL_FLOAT_VEC3:
-   case GL_INT_VEC3:
-   case GL_UNSIGNED_INT_VEC3:
-   case GL_BOOL_VEC3:
-      return 3;
-   case GL_FLOAT_VEC4:
-   case GL_INT_VEC4:
-   case GL_UNSIGNED_INT_VEC4:
-   case GL_BOOL_VEC4:
-      return 4;
-   case GL_FLOAT_MAT2:
-   case GL_FLOAT_MAT2x3:
-   case GL_FLOAT_MAT2x4:
-      return 8; /* two float[4] vectors */
-   case GL_FLOAT_MAT3:
-   case GL_FLOAT_MAT3x2:
-   case GL_FLOAT_MAT3x4:
-      return 12; /* three float[4] vectors */
-   case GL_FLOAT_MAT4:
-   case GL_FLOAT_MAT4x2:
-   case GL_FLOAT_MAT4x3:
-      return 16;  /* four float[4] vectors */
-   default:
-      _mesa_problem(NULL, "Invalid type in _mesa_sizeof_glsl_type()");
-      return 1;
-   }
-}
-
-
-/**
- * Copy string from <src> to <dst>, up to maxLength characters, returning
- * length of <dst> in <length>.
- * \param src  the strings source
- * \param maxLength  max chars to copy
- * \param length  returns number of chars copied
- * \param dst  the string destination
- */
-void
-_mesa_copy_string(GLchar *dst, GLsizei maxLength,
-                  GLsizei *length, const GLchar *src)
-{
-   GLsizei len;
-   for (len = 0; len < maxLength - 1 && src && src[len]; len++)
-      dst[len] = src[len];
-   if (maxLength > 0)
-      dst[len] = 0;
-   if (length)
-      *length = len;
-}
-
-
-
-/**
- * Find the length of the longest transform feedback varying name
- * which was specified with glTransformFeedbackVaryings().
- */
-static GLint
-longest_feedback_varying_name(const struct gl_shader_program *shProg)
-{
-   GLuint i;
-   GLint max = 0;
-   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {
-      GLint len = strlen(shProg->TransformFeedback.VaryingNames[i]);
-      if (len > max)
-         max = len;
-   }
-   return max;
-}
-
-
-
-static GLboolean
-is_program(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, name);
-   return shProg ? GL_TRUE : GL_FALSE;
-}
-
-
-static GLboolean
-is_shader(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader *shader = _mesa_lookup_shader(ctx, name);
-   return shader ? GL_TRUE : GL_FALSE;
-}
-
-
-/**
- * Attach shader to a shader program.
- */
-static void
-attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
-{
-   struct gl_shader_program *shProg;
-   struct gl_shader *sh;
-   GLuint i, n;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glAttachShader");
-   if (!shProg)
-      return;
-
-   sh = _mesa_lookup_shader_err(ctx, shader, "glAttachShader");
-   if (!sh) {
-      return;
-   }
-
-   n = shProg->NumShaders;
-   for (i = 0; i < n; i++) {
-      if (shProg->Shaders[i] == sh) {
-         /* The shader is already attched to this program.  The
-          * GL_ARB_shader_objects spec says:
-          *
-          *     "The error INVALID_OPERATION is generated by AttachObjectARB
-          *     if <obj> is already attached to <containerObj>."
-          */
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glAttachShader");
-         return;
-      }
-   }
-
-   /* grow list */
-   shProg->Shaders = (struct gl_shader **)
-      _mesa_realloc(shProg->Shaders,
-                    n * sizeof(struct gl_shader *),
-                    (n + 1) * sizeof(struct gl_shader *));
-   if (!shProg->Shaders) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glAttachShader");
-      return;
-   }
-
-   /* append */
-   shProg->Shaders[n] = NULL; /* since realloc() didn't zero the new space */
-   _mesa_reference_shader(ctx, &shProg->Shaders[n], sh);
-   shProg->NumShaders++;
-}
-
-
-static GLint
-get_attrib_location(GLcontext *ctx, GLuint program, const GLchar *name)
-{
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
-
-   if (!shProg) {
-      return -1;
-   }
-
-   if (!shProg->LinkStatus) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetAttribLocation(program not linked)");
-      return -1;
-   }
-
-   if (!name)
-      return -1;
-
-   if (shProg->VertexProgram) {
-      const struct gl_program_parameter_list *attribs =
-         shProg->VertexProgram->Base.Attributes;
-      if (attribs) {
-         GLint i = _mesa_lookup_parameter_index(attribs, -1, name);
-         if (i >= 0) {
-            return attribs->Parameters[i].StateIndexes[0];
-         }
-      }
-   }
-   return -1;
-}
-
-
-static void
-bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
-                     const GLchar *name)
-{
-   struct gl_shader_program *shProg;
-   const GLint size = -1; /* unknown size */
-   GLint i, oldIndex;
-   GLenum datatype = GL_FLOAT_VEC4;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program,
-                                            "glBindAttribLocation");
-   if (!shProg) {
-      return;
-   }
-
-   if (!name)
-      return;
-
-   if (strncmp(name, "gl_", 3) == 0) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindAttribLocation(illegal name)");
-      return;
-   }
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBindAttribLocation(index)");
-      return;
-   }
-
-   if (shProg->LinkStatus) {
-      /* get current index/location for the attribute */
-      oldIndex = get_attrib_location(ctx, program, name);
-   }
-   else {
-      oldIndex = -1;
-   }
-
-   /* this will replace the current value if it's already in the list */
-   i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
-   if (i < 0) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");
-      return;
-   }
-
-   /*
-    * Note that this attribute binding won't go into effect until
-    * glLinkProgram is called again.
-    */
-}
-
-
-static GLuint
-create_shader(GLcontext *ctx, GLenum type)
-{
-   struct gl_shader *sh;
-   GLuint name;
-
-   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-
-   switch (type) {
-   case GL_FRAGMENT_SHADER:
-   case GL_VERTEX_SHADER:
-   case GL_GEOMETRY_SHADER_ARB:
-      sh = ctx->Driver.NewShader(ctx, name, type);
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "CreateShader(type)");
-      return 0;
-   }
-
-   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, sh);
-
-   return name;
-}
-
-
-static GLuint 
-create_shader_program(GLcontext *ctx)
-{
-   GLuint name;
-   struct gl_shader_program *shProg;
-
-   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-
-   shProg = ctx->Driver.NewShaderProgram(ctx, name);
-
-   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg);
-
-   assert(shProg->RefCount == 1);
-
-   return name;
-}
-
-
-/**
- * Named w/ "2" to indicate OpenGL 2.x vs GL_ARB_fragment_programs's
- * DeleteProgramARB.
- */
-static void
-delete_shader_program(GLcontext *ctx, GLuint name)
-{
-   /*
-    * NOTE: deleting shaders/programs works a bit differently than
-    * texture objects (and buffer objects, etc).  Shader/program
-    * handles/IDs exist in the hash table until the object is really
-    * deleted (refcount==0).  With texture objects, the handle/ID is
-    * removed from the hash table in glDeleteTextures() while the tex
-    * object itself might linger until its refcount goes to zero.
-    */
-   struct gl_shader_program *shProg;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, name, "glDeleteProgram");
-   if (!shProg)
-      return;
-
-   shProg->DeletePending = GL_TRUE;
-
-   /* effectively, decr shProg's refcount */
-   _mesa_reference_shader_program(ctx, &shProg, NULL);
-}
-
-
-static void
-delete_shader(GLcontext *ctx, GLuint shader)
-{
-   struct gl_shader *sh;
-
-   sh = _mesa_lookup_shader_err(ctx, shader, "glDeleteShader");
-   if (!sh)
-      return;
-
-   sh->DeletePending = GL_TRUE;
-
-   /* effectively, decr sh's refcount */
-   _mesa_reference_shader(ctx, &sh, NULL);
-}
-
-
-static void
-detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
-{
-   struct gl_shader_program *shProg;
-   GLuint n;
-   GLuint i, j;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glDetachShader");
-   if (!shProg)
-      return;
-
-   n = shProg->NumShaders;
-
-   for (i = 0; i < n; i++) {
-      if (shProg->Shaders[i]->Name == shader) {
-         /* found it */
-         struct gl_shader **newList;
-
-         /* release */
-         _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
-
-         /* alloc new, smaller array */
-         newList = (struct gl_shader **)
-            malloc((n - 1) * sizeof(struct gl_shader *));
-         if (!newList) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDetachShader");
-            return;
-         }
-         for (j = 0; j < i; j++) {
-            newList[j] = shProg->Shaders[j];
-         }
-         while (++i < n)
-            newList[j++] = shProg->Shaders[i];
-         free(shProg->Shaders);
-
-         shProg->Shaders = newList;
-         shProg->NumShaders = n - 1;
-
-#ifdef DEBUG
-         /* sanity check */
-         {
-            for (j = 0; j < shProg->NumShaders; j++) {
-               assert(shProg->Shaders[j]->Type == GL_VERTEX_SHADER ||
-                      shProg->Shaders[j]->Type == GL_FRAGMENT_SHADER);
-               assert(shProg->Shaders[j]->RefCount > 0);
-            }
-         }
-#endif
-
-         return;
-      }
-   }
-
-   /* not found */
-   {
-      GLenum err;
-      if (is_shader(ctx, shader))
-         err = GL_INVALID_OPERATION;
-      else if (is_program(ctx, shader))
-         err = GL_INVALID_OPERATION;
-      else
-         err = GL_INVALID_VALUE;
-      _mesa_error(ctx, err, "glDetachProgram(shader)");
-      return;
-   }
-}
-
-
-static void
-get_active_attrib(GLcontext *ctx, GLuint program, GLuint index,
-                  GLsizei maxLength, GLsizei *length, GLint *size,
-                  GLenum *type, GLchar *nameOut)
-{
-   const struct gl_program_parameter_list *attribs = NULL;
-   struct gl_shader_program *shProg;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
-   if (!shProg)
-      return;
-
-   if (shProg->VertexProgram)
-      attribs = shProg->VertexProgram->Base.Attributes;
-
-   if (!attribs || index >= attribs->NumParameters) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
-      return;
-   }
-
-   _mesa_copy_string(nameOut, maxLength, length,
-                     attribs->Parameters[index].Name);
-
-   if (size)
-      *size = attribs->Parameters[index].Size
-         / _mesa_sizeof_glsl_type(attribs->Parameters[index].DataType);
-
-   if (type)
-      *type = attribs->Parameters[index].DataType;
-}
-
-
-/**
- * Return list of shaders attached to shader program.
- */
-static void
-get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
-                     GLsizei *count, GLuint *obj)
-{
-   struct gl_shader_program *shProg =
-      _mesa_lookup_shader_program_err(ctx, program, "glGetAttachedShaders");
-   if (shProg) {
-      GLuint i;
-      for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {
-         obj[i] = shProg->Shaders[i]->Name;
-      }
-      if (count)
-         *count = i;
-   }
-}
-
-
-/**
- * glGetHandleARB() - return ID/name of currently bound shader program.
- */
-static GLuint
-get_handle(GLcontext *ctx, GLenum pname)
-{
-   if (pname == GL_PROGRAM_OBJECT_ARB) {
-      if (ctx->Shader.CurrentProgram)
-         return ctx->Shader.CurrentProgram->Name;
-      else
-         return 0;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHandleARB");
-      return 0;
-   }
-}
-
-
-/**
- * glGetProgramiv() - get shader program state.
- * Note that this is for GLSL shader programs, not ARB vertex/fragment
- * programs (see glGetProgramivARB).
- */
-static void
-get_programiv(GLcontext *ctx, GLuint program, GLenum pname, GLint *params)
-{
-   const struct gl_program_parameter_list *attribs;
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program(ctx, program);
-
-   if (!shProg) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramiv(program)");
-      return;
-   }
-
-   if (shProg->VertexProgram)
-      attribs = shProg->VertexProgram->Base.Attributes;
-   else
-      attribs = NULL;
-
-   switch (pname) {
-   case GL_DELETE_STATUS:
-      *params = shProg->DeletePending;
-      break; 
-   case GL_LINK_STATUS:
-      *params = shProg->LinkStatus;
-      break;
-   case GL_VALIDATE_STATUS:
-      *params = shProg->Validated;
-      break;
-   case GL_INFO_LOG_LENGTH:
-      *params = shProg->InfoLog ? strlen(shProg->InfoLog) + 1 : 0;
-      break;
-   case GL_ATTACHED_SHADERS:
-      *params = shProg->NumShaders;
-      break;
-   case GL_ACTIVE_ATTRIBUTES:
-      *params = attribs ? attribs->NumParameters : 0;
-      break;
-   case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
-      *params = _mesa_longest_parameter_name(attribs, PROGRAM_INPUT) + 1;
-      break;
-   case GL_ACTIVE_UNIFORMS:
-      *params = shProg->Uniforms ? shProg->Uniforms->NumUniforms : 0;
-      break;
-   case GL_ACTIVE_UNIFORM_MAX_LENGTH:
-      *params = _mesa_longest_uniform_name(shProg->Uniforms);
-      if (*params > 0)
-         (*params)++;  /* add one for terminating zero */
-      break;
-   case GL_PROGRAM_BINARY_LENGTH_OES:
-      *params = 0;
-      break;
-#if FEATURE_EXT_transform_feedback
-   case GL_TRANSFORM_FEEDBACK_VARYINGS:
-      *params = shProg->TransformFeedback.NumVarying;
-      break;
-   case GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH:
-      *params = longest_feedback_varying_name(shProg) + 1;
-      break;
-   case GL_TRANSFORM_FEEDBACK_BUFFER_MODE:
-      *params = shProg->TransformFeedback.BufferMode;
-      break;
-#endif
-#if FEATURE_ARB_geometry_shader4
-   case GL_GEOMETRY_VERTICES_OUT_ARB:
-      *params = shProg->Geom.VerticesOut;
-      break;
-   case GL_GEOMETRY_INPUT_TYPE_ARB:
-      *params = shProg->Geom.InputType;
-      break;
-   case GL_GEOMETRY_OUTPUT_TYPE_ARB:
-      *params = shProg->Geom.OutputType;
-      break;
-#endif
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
-      return;
-   }
-}
-
-
-/**
- * glGetShaderiv() - get GLSL shader state
- */
-static void
-get_shaderiv(GLcontext *ctx, GLuint name, GLenum pname, GLint *params)
-{
-   struct gl_shader *shader =
-      _mesa_lookup_shader_err(ctx, name, "glGetShaderiv");
-
-   if (!shader) {
-      return;
-   }
-
-   switch (pname) {
-   case GL_SHADER_TYPE:
-      *params = shader->Type;
-      break;
-   case GL_DELETE_STATUS:
-      *params = shader->DeletePending;
-      break;
-   case GL_COMPILE_STATUS:
-      *params = shader->CompileStatus;
-      break;
-   case GL_INFO_LOG_LENGTH:
-      *params = shader->InfoLog ? strlen(shader->InfoLog) + 1 : 0;
-      break;
-   case GL_SHADER_SOURCE_LENGTH:
-      *params = shader->Source ? strlen((char *) shader->Source) + 1 : 0;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetShaderiv(pname)");
-      return;
-   }
-}
-
-
-static void
-get_program_info_log(GLcontext *ctx, GLuint program, GLsizei bufSize,
-                     GLsizei *length, GLchar *infoLog)
-{
-   struct gl_shader_program *shProg
-      = _mesa_lookup_shader_program(ctx, program);
-   if (!shProg) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramInfoLog(program)");
-      return;
-   }
-   _mesa_copy_string(infoLog, bufSize, length, shProg->InfoLog);
-}
-
-
-static void
-get_shader_info_log(GLcontext *ctx, GLuint shader, GLsizei bufSize,
-                    GLsizei *length, GLchar *infoLog)
-{
-   struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
-   if (!sh) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetShaderInfoLog(shader)");
-      return;
-   }
-   _mesa_copy_string(infoLog, bufSize, length, sh->InfoLog);
-}
-
-
-/**
- * Return shader source code.
- */
-static void
-get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
-                  GLsizei *length, GLchar *sourceOut)
-{
-   struct gl_shader *sh;
-   sh = _mesa_lookup_shader_err(ctx, shader, "glGetShaderSource");
-   if (!sh) {
-      return;
-   }
-   _mesa_copy_string(sourceOut, maxLength, length, sh->Source);
-}
-
-
-/**
- * Set/replace shader source code.
- */
-static void
-shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
-{
-   struct gl_shader *sh;
-
-   sh = _mesa_lookup_shader_err(ctx, shader, "glShaderSource");
-   if (!sh)
-      return;
-
-   /* free old shader source string and install new one */
-   if (sh->Source) {
-      free((void *) sh->Source);
-   }
-   sh->Source = source;
-   sh->CompileStatus = GL_FALSE;
-#ifdef DEBUG
-   sh->SourceChecksum = _mesa_str_checksum(sh->Source);
-#endif
-}
-
-
-/**
- * Compile a shader.
- */
-static void
-compile_shader(GLcontext *ctx, GLuint shaderObj)
-{
-   struct gl_shader *sh;
-   struct gl_shader_compiler_options *options;
-
-   sh = _mesa_lookup_shader_err(ctx, shaderObj, "glCompileShader");
-   if (!sh)
-      return;
-
-   options = &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(sh->Type)];
-
-   /* set default pragma state for shader */
-   sh->Pragmas = options->DefaultPragmas;
-
-   /* this call will set the sh->CompileStatus field to indicate if
-    * compilation was successful.
-    */
-   _mesa_glsl_compile_shader(ctx, sh);
-}
-
-
-/**
- * Link a program's shaders.
- */
-static void
-link_program(GLcontext *ctx, GLuint program)
-{
-   struct gl_shader_program *shProg;
-   struct gl_transform_feedback_object *obj =
-      ctx->TransformFeedback.CurrentObject;
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glLinkProgram");
-   if (!shProg)
-      return;
-
-   if (obj->Active && shProg == ctx->Shader.CurrentProgram) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glLinkProgram(transform feedback active");
-      return;
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-
-   _mesa_glsl_link_shader(ctx, shProg);
-
-   /* debug code */
-   if (0) {
-      GLuint i;
-
-      printf("Link %u shaders in program %u: %s\n",
-                   shProg->NumShaders, shProg->Name,
-                   shProg->LinkStatus ? "Success" : "Failed");
-
-      for (i = 0; i < shProg->NumShaders; i++) {
-         printf(" shader %u, type 0x%x\n",
-                      shProg->Shaders[i]->Name,
-                      shProg->Shaders[i]->Type);
-      }
-   }
-}
-
-
-/**
- * Print basic shader info (for debug).
- */
-static void
-print_shader_info(const struct gl_shader_program *shProg)
-{
-   GLuint i;
-
-   printf("Mesa: glUseProgram(%u)\n", shProg->Name);
-   for (i = 0; i < shProg->NumShaders; i++) {
-      const char *s;
-      switch (shProg->Shaders[i]->Type) {
-      case GL_VERTEX_SHADER:
-         s = "vertex";
-         break;
-      case GL_FRAGMENT_SHADER:
-         s = "fragment";
-         break;
-      case GL_GEOMETRY_SHADER:
-         s = "geometry";
-         break;
-      default:
-         s = "";
-      }
-      printf("  %s shader %u, checksum %u\n", s, 
-	     shProg->Shaders[i]->Name,
-	     shProg->Shaders[i]->SourceChecksum);
-   }
-   if (shProg->VertexProgram)
-      printf("  vert prog %u\n", shProg->VertexProgram->Base.Id);
-   if (shProg->FragmentProgram)
-      printf("  frag prog %u\n", shProg->FragmentProgram->Base.Id);
-}
-
-
-/**
- * Use the named shader program for subsequent rendering.
- */
-void
-_mesa_use_program(GLcontext *ctx, GLuint program)
-{
-   struct gl_shader_program *shProg;
-   struct gl_transform_feedback_object *obj =
-      ctx->TransformFeedback.CurrentObject;
-
-   if (obj->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glUseProgram(transform feedback active)");
-      return;
-   }
-
-   if (ctx->Shader.CurrentProgram &&
-       ctx->Shader.CurrentProgram->Name == program) {
-      /* no-op */
-      return;
-   }
-
-   if (program) {
-      shProg = _mesa_lookup_shader_program_err(ctx, program, "glUseProgram");
-      if (!shProg) {
-         return;
-      }
-      if (!shProg->LinkStatus) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glUseProgram(program %u not linked)", program);
-         return;
-      }
-
-      /* debug code */
-      if (ctx->Shader.Flags & GLSL_USE_PROG) {
-         print_shader_info(shProg);
-      }
-   }
-   else {
-      shProg = NULL;
-   }
-
-   if (ctx->Shader.CurrentProgram != shProg) {
-      FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
-      _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, shProg);
-   }
-
-   if (ctx->Driver.UseProgram)
-      ctx->Driver.UseProgram(ctx, shProg);
-}
-
-
-/**
- * Validate a program's samplers.
- * Specifically, check that there aren't two samplers of different types
- * pointing to the same texture unit.
- * \return GL_TRUE if valid, GL_FALSE if invalid
- */
-static GLboolean
-validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
-{
-   static const char *targetName[] = {
-      "TEXTURE_2D_ARRAY",
-      "TEXTURE_1D_ARRAY",
-      "TEXTURE_CUBE",
-      "TEXTURE_3D",
-      "TEXTURE_RECT",
-      "TEXTURE_2D",
-      "TEXTURE_1D",
-   };
-   GLint targetUsed[MAX_TEXTURE_IMAGE_UNITS];
-   GLbitfield samplersUsed = prog->SamplersUsed;
-   GLuint i;
-
-   assert(Elements(targetName) == NUM_TEXTURE_TARGETS);
-
-   if (samplersUsed == 0x0)
-      return GL_TRUE;
-
-   for (i = 0; i < Elements(targetUsed); i++)
-      targetUsed[i] = -1;
-
-   /* walk over bits which are set in 'samplers' */
-   while (samplersUsed) {
-      GLuint unit;
-      gl_texture_index target;
-      GLint sampler = _mesa_ffs(samplersUsed) - 1;
-      assert(sampler >= 0);
-      assert(sampler < MAX_TEXTURE_IMAGE_UNITS);
-      unit = prog->SamplerUnits[sampler];
-      target = prog->SamplerTargets[sampler];
-      if (targetUsed[unit] != -1 && targetUsed[unit] != target) {
-         _mesa_snprintf(errMsg, 100,
-		  "Texture unit %d is accessed both as %s and %s",
-		  unit, targetName[targetUsed[unit]], targetName[target]);
-         return GL_FALSE;
-      }
-      targetUsed[unit] = target;
-      samplersUsed ^= (1 << sampler);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do validation of the given shader program.
- * \param errMsg  returns error message if validation fails.
- * \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg)
- */
-static GLboolean
-validate_shader_program(GLcontext *ctx,
-                        const struct gl_shader_program *shProg,
-                        char *errMsg)
-{
-   const struct gl_vertex_program *vp = shProg->VertexProgram;
-   const struct gl_fragment_program *fp = shProg->FragmentProgram;
-
-   if (!shProg->LinkStatus) {
-      return GL_FALSE;
-   }
-
-   /* From the GL spec, a program is invalid if any of these are true:
-
-     any two active samplers in the current program object are of
-     different types, but refer to the same texture image unit,
-
-     any active sampler in the current program object refers to a texture
-     image unit where fixed-function fragment processing accesses a
-     texture target that does not match the sampler type, or 
-
-     the sum of the number of active samplers in the program and the
-     number of texture image units enabled for fixed-function fragment
-     processing exceeds the combined limit on the total number of texture
-     image units allowed.
-   */
-
-
-   /*
-    * Check: any two active samplers in the current program object are of
-    * different types, but refer to the same texture image unit,
-    */
-   if (vp && !validate_samplers(ctx, &vp->Base, errMsg)) {
-      return GL_FALSE;
-   }
-   if (fp && !validate_samplers(ctx, &fp->Base, errMsg)) {
-      return GL_FALSE;
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Called via glValidateProgram()
- */
-static void
-validate_program(GLcontext *ctx, GLuint program)
-{
-   struct gl_shader_program *shProg;
-   char errMsg[100];
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program, "glValidateProgram");
-   if (!shProg) {
-      return;
-   }
-
-   shProg->Validated = validate_shader_program(ctx, shProg, errMsg);
-   if (!shProg->Validated) {
-      /* update info log */
-      if (shProg->InfoLog) {
-         talloc_free(shProg->InfoLog);
-      }
-      shProg->InfoLog = talloc_strdup(shProg, errMsg);
-   }
-}
-
-
-
-void GLAPIENTRY
-_mesa_AttachObjectARB(GLhandleARB program, GLhandleARB shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   attach_shader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_AttachShader(GLuint program, GLuint shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   attach_shader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
-                            const GLcharARB *name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   bind_attrib_location(ctx, program, index, name);
-}
-
-
-void GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB shaderObj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   compile_shader(ctx, shaderObj);
-}
-
-
-GLuint GLAPIENTRY
-_mesa_CreateShader(GLenum type)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return create_shader(ctx, type);
-}
-
-
-GLhandleARB GLAPIENTRY
-_mesa_CreateShaderObjectARB(GLenum type)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return create_shader(ctx, type);
-}
-
-
-GLuint GLAPIENTRY
-_mesa_CreateProgram(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return create_shader_program(ctx);
-}
-
-
-GLhandleARB GLAPIENTRY
-_mesa_CreateProgramObjectARB(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return create_shader_program(ctx);
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteObjectARB(GLhandleARB obj)
-{
-   if (obj) {
-      GET_CURRENT_CONTEXT(ctx);
-      if (is_program(ctx, obj)) {
-         delete_shader_program(ctx, obj);
-      }
-      else if (is_shader(ctx, obj)) {
-         delete_shader(ctx, obj);
-      }
-      else {
-         /* error? */
-      }
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteProgram(GLuint name)
-{
-   if (name) {
-      GET_CURRENT_CONTEXT(ctx);
-      delete_shader_program(ctx, name);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteShader(GLuint name)
-{
-   if (name) {
-      GET_CURRENT_CONTEXT(ctx);
-      delete_shader(ctx, name);
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_DetachObjectARB(GLhandleARB program, GLhandleARB shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   detach_shader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_DetachShader(GLuint program, GLuint shader)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   detach_shader(ctx, program, shader);
-}
-
-
-void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB program, GLuint index,
-                         GLsizei maxLength, GLsizei * length, GLint * size,
-                         GLenum * type, GLcharARB * name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_active_attrib(ctx, program, index, maxLength, length, size, type, name);
-}
-
-
-void GLAPIENTRY
-_mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,
-                            GLsizei * count, GLhandleARB * obj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_attached_shaders(ctx, container, maxCount, count, obj);
-}
-
-
-void GLAPIENTRY
-_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
-                         GLsizei *count, GLuint *obj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_attached_shaders(ctx, program, maxCount, count, obj);
-}
-
-
-GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return get_attrib_location(ctx, program, name);
-}
-
-
-void GLAPIENTRY
-_mesa_GetInfoLogARB(GLhandleARB object, GLsizei maxLength, GLsizei * length,
-                    GLcharARB * infoLog)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   if (is_program(ctx, object)) {
-      get_program_info_log(ctx, object, maxLength, length, infoLog);
-   }
-   else if (is_shader(ctx, object)) {
-      get_shader_info_log(ctx, object, maxLength, length, infoLog);
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetInfoLogARB");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetObjectParameterivARB(GLhandleARB object, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   /* Implement in terms of GetProgramiv, GetShaderiv */
-   if (is_program(ctx, object)) {
-      if (pname == GL_OBJECT_TYPE_ARB) {
-	 *params = GL_PROGRAM_OBJECT_ARB;
-      }
-      else {
-	 get_programiv(ctx, object, pname, params);
-      }
-   }
-   else if (is_shader(ctx, object)) {
-      if (pname == GL_OBJECT_TYPE_ARB) {
-	 *params = GL_SHADER_OBJECT_ARB;
-      }
-      else {
-	 get_shaderiv(ctx, object, pname, params);
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectParameterivARB");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetObjectParameterfvARB(GLhandleARB object, GLenum pname,
-                              GLfloat *params)
-{
-   GLint iparams[1];  /* XXX is one element enough? */
-   _mesa_GetObjectParameterivARB(object, pname, iparams);
-   params[0] = (GLfloat) iparams[0];
-}
-
-
-void GLAPIENTRY
-_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_programiv(ctx, program, pname, params);
-}
-
-
-void GLAPIENTRY
-_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_shaderiv(ctx, shader, pname, params);
-}
-
-
-void GLAPIENTRY
-_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
-                        GLsizei *length, GLchar *infoLog)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_program_info_log(ctx, program, bufSize, length, infoLog);
-}
-
-
-void GLAPIENTRY
-_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
-                       GLsizei *length, GLchar *infoLog)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_shader_info_log(ctx, shader, bufSize, length, infoLog);
-}
-
-
-void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,
-                         GLsizei *length, GLcharARB *sourceOut)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   get_shader_source(ctx, shader, maxLength, length, sourceOut);
-}
-
-
-GLhandleARB GLAPIENTRY
-_mesa_GetHandleARB(GLenum pname)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return get_handle(ctx, pname);
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsProgram(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return is_program(ctx, name);
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsShader(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   return is_shader(ctx, name);
-}
-
-
-void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   link_program(ctx, programObj);
-}
-
-
-
-/**
- * Read shader source code from a file.
- * Useful for debugging to override an app's shader.
- */
-static GLcharARB *
-read_shader(const char *fname)
-{
-   const int max = 50*1000;
-   FILE *f = fopen(fname, "r");
-   GLcharARB *buffer, *shader;
-   int len;
-
-   if (!f) {
-      return NULL;
-   }
-
-   buffer = (char *) malloc(max);
-   len = fread(buffer, 1, max, f);
-   buffer[len] = 0;
-
-   fclose(f);
-
-   shader = _mesa_strdup(buffer);
-   free(buffer);
-
-   return shader;
-}
-
-
-/**
- * Called via glShaderSource() and glShaderSourceARB() API functions.
- * Basically, concatenate the source code strings into one long string
- * and pass it to _mesa_shader_source().
- */
-void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
-                      const GLcharARB ** string, const GLint * length)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint *offsets;
-   GLsizei i, totalLength;
-   GLcharARB *source;
-   GLuint checksum;
-
-   if (!shaderObj || string == NULL) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");
-      return;
-   }
-
-   /*
-    * This array holds offsets of where the appropriate string ends, thus the
-    * last element will be set to the total length of the source code.
-    */
-   offsets = (GLint *) malloc(count * sizeof(GLint));
-   if (offsets == NULL) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
-      return;
-   }
-
-   for (i = 0; i < count; i++) {
-      if (string[i] == NULL) {
-         free((GLvoid *) offsets);
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");
-         return;
-      }
-      if (length == NULL || length[i] < 0)
-         offsets[i] = strlen(string[i]);
-      else
-         offsets[i] = length[i];
-      /* accumulate string lengths */
-      if (i > 0)
-         offsets[i] += offsets[i - 1];
-   }
-
-   /* Total length of source string is sum off all strings plus two.
-    * One extra byte for terminating zero, another extra byte to silence
-    * valgrind warnings in the parser/grammer code.
-    */
-   totalLength = offsets[count - 1] + 2;
-   source = (GLcharARB *) malloc(totalLength * sizeof(GLcharARB));
-   if (source == NULL) {
-      free((GLvoid *) offsets);
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
-      return;
-   }
-
-   for (i = 0; i < count; i++) {
-      GLint start = (i > 0) ? offsets[i - 1] : 0;
-      memcpy(source + start, string[i],
-             (offsets[i] - start) * sizeof(GLcharARB));
-   }
-   source[totalLength - 1] = '\0';
-   source[totalLength - 2] = '\0';
-
-   if (SHADER_SUBST) {
-      /* Compute the shader's source code checksum then try to open a file
-       * named newshader_<CHECKSUM>.  If it exists, use it in place of the
-       * original shader source code.  For debugging.
-       */
-      char filename[100];
-      GLcharARB *newSource;
-
-      checksum = _mesa_str_checksum(source);
-
-      _mesa_snprintf(filename, sizeof(filename), "newshader_%d", checksum);
-
-      newSource = read_shader(filename);
-      if (newSource) {
-         fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",
-                       shaderObj, checksum, filename);
-         free(source);
-         source = newSource;
-      }
-   }      
-
-   shader_source(ctx, shaderObj, source);
-
-   if (SHADER_SUBST) {
-      struct gl_shader *sh = _mesa_lookup_shader(ctx, shaderObj);
-      if (sh)
-         sh->SourceChecksum = checksum; /* save original checksum */
-   }
-
-   free(offsets);
-}
-
-
-void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_use_program(ctx, program);
-}
-
-
-void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB program)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   validate_program(ctx, program);
-}
-
-#ifdef FEATURE_ES2
-
-void GLAPIENTRY
-_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
-                               GLint* range, GLint* precision)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
-}
-
-
-void GLAPIENTRY
-_mesa_ReleaseShaderCompiler(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
-}
-
-
-void GLAPIENTRY
-_mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
-                   const void* binary, GLint length)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
-}
-
-#endif /* FEATURE_ES2 */
-
-
-#if FEATURE_ARB_geometry_shader4
-
-void GLAPIENTRY
-_mesa_ProgramParameteriARB(GLuint program, GLenum pname,
-                           GLint value)
-{
-   struct gl_shader_program *shProg;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   shProg = _mesa_lookup_shader_program_err(ctx, program,
-                                            "glProgramParameteri");
-   if (!shProg)
-      return;
-
-   switch (pname) {
-   case GL_GEOMETRY_VERTICES_OUT_ARB:
-      if (value < 1 ||
-          value > ctx->Const.GeometryProgram.MaxGeometryOutputVertices) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glProgramParameteri(GL_GEOMETRY_VERTICES_OUT_ARB=%d",
-                     value);
-         return;
-      }
-      shProg->Geom.VerticesOut = value;
-      break;
-   case GL_GEOMETRY_INPUT_TYPE_ARB:
-      switch (value) {
-      case GL_POINTS:
-      case GL_LINES:
-      case GL_LINES_ADJACENCY_ARB:
-      case GL_TRIANGLES:
-      case GL_TRIANGLES_ADJACENCY_ARB:
-         shProg->Geom.InputType = value;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glProgramParameteri(geometry input type = %s",
-                     _mesa_lookup_enum_by_nr(value));
-         return;
-      }
-      break;
-   case GL_GEOMETRY_OUTPUT_TYPE_ARB:
-      switch (value) {
-      case GL_POINTS:
-      case GL_LINE_STRIP:
-      case GL_TRIANGLE_STRIP:
-         shProg->Geom.OutputType = value;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glProgramParameteri(geometry output type = %s",
-                     _mesa_lookup_enum_by_nr(value));
-         return;
-      }
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameteriARB(pname=%s)",
-                  _mesa_lookup_enum_by_nr(pname));
-      break;
-   }
-}
-
-#endif
-
-
-/**
- * Plug in shader-related functions into API dispatch table.
- */
-void
-_mesa_init_shader_dispatch(struct _glapi_table *exec)
-{
-#if FEATURE_GL
-   /* GL_ARB_vertex/fragment_shader */
-   SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
-   SET_GetHandleARB(exec, _mesa_GetHandleARB);
-   SET_DetachObjectARB(exec, _mesa_DetachObjectARB);
-   SET_CreateShaderObjectARB(exec, _mesa_CreateShaderObjectARB);
-   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
-   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
-   SET_CreateProgramObjectARB(exec, _mesa_CreateProgramObjectARB);
-   SET_AttachObjectARB(exec, _mesa_AttachObjectARB);
-   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
-   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
-   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
-   SET_GetObjectParameterfvARB(exec, _mesa_GetObjectParameterfvARB);
-   SET_GetObjectParameterivARB(exec, _mesa_GetObjectParameterivARB);
-   SET_GetInfoLogARB(exec, _mesa_GetInfoLogARB);
-   SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);
-   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
-
-   /* OpenGL 2.0 */
-   SET_AttachShader(exec, _mesa_AttachShader);
-   SET_CreateProgram(exec, _mesa_CreateProgram);
-   SET_CreateShader(exec, _mesa_CreateShader);
-   SET_DeleteProgram(exec, _mesa_DeleteProgram);
-   SET_DeleteShader(exec, _mesa_DeleteShader);
-   SET_DetachShader(exec, _mesa_DetachShader);
-   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
-   SET_GetProgramiv(exec, _mesa_GetProgramiv);
-   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
-   SET_GetShaderiv(exec, _mesa_GetShaderiv);
-   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
-   SET_IsProgram(exec, _mesa_IsProgram);
-   SET_IsShader(exec, _mesa_IsShader);
-
-#if FEATURE_ARB_vertex_shader
-   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
-   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
-   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
-#endif
-
-#if FEATURE_ARB_geometry_shader4
-   SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);
-#endif
-#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.

+ *

+ * 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 shaderapi.c

+ * \author Brian Paul

+ *

+ * Implementation of GLSL-related API functions.

+ * The glUniform* functions are in uniforms.c

+ *

+ *

+ * 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/enums.h"

+#include "main/hash.h"

+#include "main/shaderapi.h"

+#include "main/shaderobj.h"

+#include "program/program.h"

+#include "program/prog_parameter.h"

+#include "program/prog_uniform.h"

+#include "talloc.h"

+#include <stdbool.h>

+

+/** Define this to enable shader substitution (see below) */

+#define SHADER_SUBST 0

+

+

+/**

+ * Return mask of GLSL_x flags by examining the MESA_GLSL env var.

+ */

+static GLbitfield

+get_shader_flags(void)

+{

+   GLbitfield flags = 0x0;

+   const char *env = _mesa_getenv("MESA_GLSL");

+

+   if (env) {

+      if (strstr(env, "dump"))

+         flags |= GLSL_DUMP;

+      if (strstr(env, "log"))

+         flags |= GLSL_LOG;

+      if (strstr(env, "nopvert"))

+         flags |= GLSL_NOP_VERT;

+      if (strstr(env, "nopfrag"))

+         flags |= GLSL_NOP_FRAG;

+      if (strstr(env, "nopt"))

+         flags |= GLSL_NO_OPT;

+      else if (strstr(env, "opt"))

+         flags |= GLSL_OPT;

+      if (strstr(env, "uniform"))

+         flags |= GLSL_UNIFORMS;

+      if (strstr(env, "useprog"))

+         flags |= GLSL_USE_PROG;

+   }

+

+   return flags;

+}

+

+

+/**

+ * Initialize context's shader state.

+ */

+void

+_mesa_init_shader_state(struct gl_context *ctx)

+{

+   /* Device drivers may override these to control what kind of instructions

+    * are generated by the GLSL compiler.

+    */

+   struct gl_shader_compiler_options options;

+   gl_shader_type sh;

+

+   memset(&options, 0, sizeof(options));

+   options.MaxUnrollIterations = 32;

+

+   /* Default pragma settings */

+   options.DefaultPragmas.Optimize = GL_TRUE;

+

+   for (sh = 0; sh < MESA_SHADER_TYPES; ++sh)

+      memcpy(&ctx->ShaderCompilerOptions[sh], &options, sizeof(options));

+

+   ctx->Shader.Flags = get_shader_flags();

+}

+

+

+/**

+ * Free the per-context shader-related state.

+ */

+void

+_mesa_free_shader_state(struct gl_context *ctx)

+{

+   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentVertexProgram, NULL);

+   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentGeometryProgram,

+				  NULL);

+   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentFragmentProgram,

+				  NULL);

+   _mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram, NULL);

+}

+

+

+/**

+ * Return the size of the given GLSL datatype, in floats (components).

+ */

+GLint

+_mesa_sizeof_glsl_type(GLenum type)

+{

+   switch (type) {

+   case GL_FLOAT:

+   case GL_INT:

+   case GL_BOOL:

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

+   case GL_SAMPLER_CUBE_SHADOW_EXT:

+      return 1;

+   case GL_FLOAT_VEC2:

+   case GL_INT_VEC2:

+   case GL_UNSIGNED_INT_VEC2:

+   case GL_BOOL_VEC2:

+      return 2;

+   case GL_FLOAT_VEC3:

+   case GL_INT_VEC3:

+   case GL_UNSIGNED_INT_VEC3:

+   case GL_BOOL_VEC3:

+      return 3;

+   case GL_FLOAT_VEC4:

+   case GL_INT_VEC4:

+   case GL_UNSIGNED_INT_VEC4:

+   case GL_BOOL_VEC4:

+      return 4;

+   case GL_FLOAT_MAT2:

+   case GL_FLOAT_MAT2x3:

+   case GL_FLOAT_MAT2x4:

+      return 8; /* two float[4] vectors */

+   case GL_FLOAT_MAT3:

+   case GL_FLOAT_MAT3x2:

+   case GL_FLOAT_MAT3x4:

+      return 12; /* three float[4] vectors */

+   case GL_FLOAT_MAT4:

+   case GL_FLOAT_MAT4x2:

+   case GL_FLOAT_MAT4x3:

+      return 16;  /* four float[4] vectors */

+   default:

+      _mesa_problem(NULL, "Invalid type in _mesa_sizeof_glsl_type()");

+      return 1;

+   }

+}

+

+

+/**

+ * Copy string from <src> to <dst>, up to maxLength characters, returning

+ * length of <dst> in <length>.

+ * \param src  the strings source

+ * \param maxLength  max chars to copy

+ * \param length  returns number of chars copied

+ * \param dst  the string destination

+ */

+void

+_mesa_copy_string(GLchar *dst, GLsizei maxLength,

+                  GLsizei *length, const GLchar *src)

+{

+   GLsizei len;

+   for (len = 0; len < maxLength - 1 && src && src[len]; len++)

+      dst[len] = src[len];

+   if (maxLength > 0)

+      dst[len] = 0;

+   if (length)

+      *length = len;

+}

+

+

+

+/**

+ * Confirm that the a shader type is valid and supported by the implementation

+ *

+ * \param ctx   Current GL context

+ * \param type  Shader target

+ *

+ */

+static bool

+validate_shader_target(const struct gl_context *ctx, GLenum type)

+{

+   switch (type) {

+#if FEATURE_ARB_fragment_shader

+   case GL_FRAGMENT_SHADER:

+      return ctx->Extensions.ARB_fragment_shader;

+#endif

+#if FEATURE_ARB_vertex_shader

+   case GL_VERTEX_SHADER:

+      return ctx->Extensions.ARB_vertex_shader;

+#endif

+#if FEATURE_ARB_geometry_shader4

+   case GL_GEOMETRY_SHADER_ARB:

+      return ctx->Extensions.ARB_geometry_shader4;

+#endif

+   default:

+      return false;

+   }

+}

+

+

+/**

+ * Find the length of the longest transform feedback varying name

+ * which was specified with glTransformFeedbackVaryings().

+ */

+static GLint

+longest_feedback_varying_name(const struct gl_shader_program *shProg)

+{

+   GLuint i;

+   GLint max = 0;

+   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {

+      GLint len = strlen(shProg->TransformFeedback.VaryingNames[i]);

+      if (len > max)

+         max = len;

+   }

+   return max;

+}

+

+

+

+static GLboolean

+is_program(struct gl_context *ctx, GLuint name)

+{

+   struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, name);

+   return shProg ? GL_TRUE : GL_FALSE;

+}

+

+

+static GLboolean

+is_shader(struct gl_context *ctx, GLuint name)

+{

+   struct gl_shader *shader = _mesa_lookup_shader(ctx, name);

+   return shader ? GL_TRUE : GL_FALSE;

+}

+

+

+/**

+ * Attach shader to a shader program.

+ */

+static void

+attach_shader(struct gl_context *ctx, GLuint program, GLuint shader)

+{

+   struct gl_shader_program *shProg;

+   struct gl_shader *sh;

+   GLuint i, n;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glAttachShader");

+   if (!shProg)

+      return;

+

+   sh = _mesa_lookup_shader_err(ctx, shader, "glAttachShader");

+   if (!sh) {

+      return;

+   }

+

+   n = shProg->NumShaders;

+   for (i = 0; i < n; i++) {

+      if (shProg->Shaders[i] == sh) {

+         /* The shader is already attched to this program.  The

+          * GL_ARB_shader_objects spec says:

+          *

+          *     "The error INVALID_OPERATION is generated by AttachObjectARB

+          *     if <obj> is already attached to <containerObj>."

+          */

+         _mesa_error(ctx, GL_INVALID_OPERATION, "glAttachShader");

+         return;

+      }

+   }

+

+   /* grow list */

+   shProg->Shaders = (struct gl_shader **)

+      _mesa_realloc(shProg->Shaders,

+                    n * sizeof(struct gl_shader *),

+                    (n + 1) * sizeof(struct gl_shader *));

+   if (!shProg->Shaders) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glAttachShader");

+      return;

+   }

+

+   /* append */

+   shProg->Shaders[n] = NULL; /* since realloc() didn't zero the new space */

+   _mesa_reference_shader(ctx, &shProg->Shaders[n], sh);

+   shProg->NumShaders++;

+}

+

+

+static GLint

+get_attrib_location(struct gl_context *ctx, GLuint program, const GLchar *name)

+{

+   struct gl_shader_program *shProg

+      = _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");

+

+   if (!shProg) {

+      return -1;

+   }

+

+   if (!shProg->LinkStatus) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetAttribLocation(program not linked)");

+      return -1;

+   }

+

+   if (!name)

+      return -1;

+

+   if (shProg->VertexProgram) {

+      const struct gl_program_parameter_list *attribs =

+         shProg->VertexProgram->Base.Attributes;

+      if (attribs) {

+         GLint i = _mesa_lookup_parameter_index(attribs, -1, name);

+         if (i >= 0) {

+            return attribs->Parameters[i].StateIndexes[0];

+         }

+      }

+   }

+   return -1;

+}

+

+

+static void

+bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index,

+                     const GLchar *name)

+{

+   struct gl_shader_program *shProg;

+   const GLint size = -1; /* unknown size */

+   GLint i, oldIndex;

+   GLenum datatype = GL_FLOAT_VEC4;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program,

+                                            "glBindAttribLocation");

+   if (!shProg) {

+      return;

+   }

+

+   if (!name)

+      return;

+

+   if (strncmp(name, "gl_", 3) == 0) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindAttribLocation(illegal name)");

+      return;

+   }

+

+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindAttribLocation(index)");

+      return;

+   }

+

+   if (shProg->LinkStatus) {

+      /* get current index/location for the attribute */

+      oldIndex = get_attrib_location(ctx, program, name);

+   }

+   else {

+      oldIndex = -1;

+   }

+

+   /* this will replace the current value if it's already in the list */

+   i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);

+   if (i < 0) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation");

+      return;

+   }

+

+   /*

+    * Note that this attribute binding won't go into effect until

+    * glLinkProgram is called again.

+    */

+}

+

+

+static void

+bind_frag_data_location(struct gl_context *ctx, GLuint program,

+                        GLuint colorNumber, const GLchar *name)

+{

+   _mesa_problem(ctx, "bind_frag_data_location() not implemented yet");

+}

+

+

+static GLuint

+create_shader(struct gl_context *ctx, GLenum type)

+{

+   struct gl_shader *sh;

+   GLuint name;

+

+   if (!validate_shader_target(ctx, type)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "CreateShader(type)");

+      return 0;

+   }

+

+   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);

+   sh = ctx->Driver.NewShader(ctx, name, type);

+   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, sh);

+

+   return name;

+}

+

+

+static GLuint 

+create_shader_program(struct gl_context *ctx)

+{

+   GLuint name;

+   struct gl_shader_program *shProg;

+

+   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);

+

+   shProg = ctx->Driver.NewShaderProgram(ctx, name);

+

+   _mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg);

+

+   assert(shProg->RefCount == 1);

+

+   return name;

+}

+

+

+/**

+ * Named w/ "2" to indicate OpenGL 2.x vs GL_ARB_fragment_programs's

+ * DeleteProgramARB.

+ */

+static void

+delete_shader_program(struct gl_context *ctx, GLuint name)

+{

+   /*

+    * NOTE: deleting shaders/programs works a bit differently than

+    * texture objects (and buffer objects, etc).  Shader/program

+    * handles/IDs exist in the hash table until the object is really

+    * deleted (refcount==0).  With texture objects, the handle/ID is

+    * removed from the hash table in glDeleteTextures() while the tex

+    * object itself might linger until its refcount goes to zero.

+    */

+   struct gl_shader_program *shProg;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, name, "glDeleteProgram");

+   if (!shProg)

+      return;

+

+   shProg->DeletePending = GL_TRUE;

+

+   /* effectively, decr shProg's refcount */

+   _mesa_reference_shader_program(ctx, &shProg, NULL);

+}

+

+

+static void

+delete_shader(struct gl_context *ctx, GLuint shader)

+{

+   struct gl_shader *sh;

+

+   sh = _mesa_lookup_shader_err(ctx, shader, "glDeleteShader");

+   if (!sh)

+      return;

+

+   sh->DeletePending = GL_TRUE;

+

+   /* effectively, decr sh's refcount */

+   _mesa_reference_shader(ctx, &sh, NULL);

+}

+

+

+static void

+detach_shader(struct gl_context *ctx, GLuint program, GLuint shader)

+{

+   struct gl_shader_program *shProg;

+   GLuint n;

+   GLuint i, j;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glDetachShader");

+   if (!shProg)

+      return;

+

+   n = shProg->NumShaders;

+

+   for (i = 0; i < n; i++) {

+      if (shProg->Shaders[i]->Name == shader) {

+         /* found it */

+         struct gl_shader **newList;

+

+         /* release */

+         _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);

+

+         /* alloc new, smaller array */

+         newList = (struct gl_shader **)

+            malloc((n - 1) * sizeof(struct gl_shader *));

+         if (!newList) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDetachShader");

+            return;

+         }

+         for (j = 0; j < i; j++) {

+            newList[j] = shProg->Shaders[j];

+         }

+         while (++i < n)

+            newList[j++] = shProg->Shaders[i];

+         free(shProg->Shaders);

+

+         shProg->Shaders = newList;

+         shProg->NumShaders = n - 1;

+

+#ifdef DEBUG

+         /* sanity check */

+         {

+            for (j = 0; j < shProg->NumShaders; j++) {

+               assert(shProg->Shaders[j]->Type == GL_VERTEX_SHADER ||

+                      shProg->Shaders[j]->Type == GL_FRAGMENT_SHADER);

+               assert(shProg->Shaders[j]->RefCount > 0);

+            }

+         }

+#endif

+

+         return;

+      }

+   }

+

+   /* not found */

+   {

+      GLenum err;

+      if (is_shader(ctx, shader))

+         err = GL_INVALID_OPERATION;

+      else if (is_program(ctx, shader))

+         err = GL_INVALID_OPERATION;

+      else

+         err = GL_INVALID_VALUE;

+      _mesa_error(ctx, err, "glDetachProgram(shader)");

+      return;

+   }

+}

+

+

+static void

+get_active_attrib(struct gl_context *ctx, GLuint program, GLuint index,

+                  GLsizei maxLength, GLsizei *length, GLint *size,

+                  GLenum *type, GLchar *nameOut)

+{

+   const struct gl_program_parameter_list *attribs = NULL;

+   struct gl_shader_program *shProg;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");

+   if (!shProg)

+      return;

+

+   if (shProg->VertexProgram)

+      attribs = shProg->VertexProgram->Base.Attributes;

+

+   if (!attribs || index >= attribs->NumParameters) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");

+      return;

+   }

+

+   _mesa_copy_string(nameOut, maxLength, length,

+                     attribs->Parameters[index].Name);

+

+   if (size)

+      *size = attribs->Parameters[index].Size

+         / _mesa_sizeof_glsl_type(attribs->Parameters[index].DataType);

+

+   if (type)

+      *type = attribs->Parameters[index].DataType;

+}

+

+

+/**

+ * Return list of shaders attached to shader program.

+ */

+static void

+get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,

+                     GLsizei *count, GLuint *obj)

+{

+   struct gl_shader_program *shProg =

+      _mesa_lookup_shader_program_err(ctx, program, "glGetAttachedShaders");

+   if (shProg) {

+      GLuint i;

+      for (i = 0; i < (GLuint) maxCount && i < shProg->NumShaders; i++) {

+         obj[i] = shProg->Shaders[i]->Name;

+      }

+      if (count)

+         *count = i;

+   }

+}

+

+

+static GLint

+get_frag_data_location(struct gl_context *ctx, GLuint program,

+                       const GLchar *name)

+{

+   _mesa_problem(ctx, "get_frag_data_location() not implemented yet");

+   return -1;

+}

+

+

+

+/**

+ * glGetHandleARB() - return ID/name of currently bound shader program.

+ */

+static GLuint

+get_handle(struct gl_context *ctx, GLenum pname)

+{

+   if (pname == GL_PROGRAM_OBJECT_ARB) {

+      if (ctx->Shader.ActiveProgram)

+         return ctx->Shader.ActiveProgram->Name;

+      else

+         return 0;

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHandleARB");

+      return 0;

+   }

+}

+

+

+/**

+ * glGetProgramiv() - get shader program state.

+ * Note that this is for GLSL shader programs, not ARB vertex/fragment

+ * programs (see glGetProgramivARB).

+ */

+static void

+get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *params)

+{

+   const struct gl_program_parameter_list *attribs;

+   struct gl_shader_program *shProg

+      = _mesa_lookup_shader_program(ctx, program);

+

+   if (!shProg) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramiv(program)");

+      return;

+   }

+

+   if (shProg->VertexProgram)

+      attribs = shProg->VertexProgram->Base.Attributes;

+   else

+      attribs = NULL;

+

+   switch (pname) {

+   case GL_DELETE_STATUS:

+      *params = shProg->DeletePending;

+      break; 

+   case GL_LINK_STATUS:

+      *params = shProg->LinkStatus;

+      break;

+   case GL_VALIDATE_STATUS:

+      *params = shProg->Validated;

+      break;

+   case GL_INFO_LOG_LENGTH:

+      *params = shProg->InfoLog ? strlen(shProg->InfoLog) + 1 : 0;

+      break;

+   case GL_ATTACHED_SHADERS:

+      *params = shProg->NumShaders;

+      break;

+   case GL_ACTIVE_ATTRIBUTES:

+      *params = attribs ? attribs->NumParameters : 0;

+      break;

+   case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:

+      *params = _mesa_longest_parameter_name(attribs, PROGRAM_INPUT) + 1;

+      break;

+   case GL_ACTIVE_UNIFORMS:

+      *params = shProg->Uniforms ? shProg->Uniforms->NumUniforms : 0;

+      break;

+   case GL_ACTIVE_UNIFORM_MAX_LENGTH:

+      *params = _mesa_longest_uniform_name(shProg->Uniforms);

+      if (*params > 0)

+         (*params)++;  /* add one for terminating zero */

+      break;

+   case GL_PROGRAM_BINARY_LENGTH_OES:

+      *params = 0;

+      break;

+#if FEATURE_EXT_transform_feedback

+   case GL_TRANSFORM_FEEDBACK_VARYINGS:

+      *params = shProg->TransformFeedback.NumVarying;

+      break;

+   case GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH:

+      *params = longest_feedback_varying_name(shProg) + 1;

+      break;

+   case GL_TRANSFORM_FEEDBACK_BUFFER_MODE:

+      *params = shProg->TransformFeedback.BufferMode;

+      break;

+#endif

+#if FEATURE_ARB_geometry_shader4

+   case GL_GEOMETRY_VERTICES_OUT_ARB:

+      *params = shProg->Geom.VerticesOut;

+      break;

+   case GL_GEOMETRY_INPUT_TYPE_ARB:

+      *params = shProg->Geom.InputType;

+      break;

+   case GL_GEOMETRY_OUTPUT_TYPE_ARB:

+      *params = shProg->Geom.OutputType;

+      break;

+#endif

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");

+      return;

+   }

+}

+

+

+/**

+ * glGetShaderiv() - get GLSL shader state

+ */

+static void

+get_shaderiv(struct gl_context *ctx, GLuint name, GLenum pname, GLint *params)

+{

+   struct gl_shader *shader =

+      _mesa_lookup_shader_err(ctx, name, "glGetShaderiv");

+

+   if (!shader) {

+      return;

+   }

+

+   switch (pname) {

+   case GL_SHADER_TYPE:

+      *params = shader->Type;

+      break;

+   case GL_DELETE_STATUS:

+      *params = shader->DeletePending;

+      break;

+   case GL_COMPILE_STATUS:

+      *params = shader->CompileStatus;

+      break;

+   case GL_INFO_LOG_LENGTH:

+      *params = shader->InfoLog ? strlen(shader->InfoLog) + 1 : 0;

+      break;

+   case GL_SHADER_SOURCE_LENGTH:

+      *params = shader->Source ? strlen((char *) shader->Source) + 1 : 0;

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetShaderiv(pname)");

+      return;

+   }

+}

+

+

+static void

+get_program_info_log(struct gl_context *ctx, GLuint program, GLsizei bufSize,

+                     GLsizei *length, GLchar *infoLog)

+{

+   struct gl_shader_program *shProg

+      = _mesa_lookup_shader_program(ctx, program);

+   if (!shProg) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramInfoLog(program)");

+      return;

+   }

+   _mesa_copy_string(infoLog, bufSize, length, shProg->InfoLog);

+}

+

+

+static void

+get_shader_info_log(struct gl_context *ctx, GLuint shader, GLsizei bufSize,

+                    GLsizei *length, GLchar *infoLog)

+{

+   struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);

+   if (!sh) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetShaderInfoLog(shader)");

+      return;

+   }

+   _mesa_copy_string(infoLog, bufSize, length, sh->InfoLog);

+}

+

+

+/**

+ * Return shader source code.

+ */

+static void

+get_shader_source(struct gl_context *ctx, GLuint shader, GLsizei maxLength,

+                  GLsizei *length, GLchar *sourceOut)

+{

+   struct gl_shader *sh;

+   sh = _mesa_lookup_shader_err(ctx, shader, "glGetShaderSource");

+   if (!sh) {

+      return;

+   }

+   _mesa_copy_string(sourceOut, maxLength, length, sh->Source);

+}

+

+

+/**

+ * Set/replace shader source code.

+ */

+static void

+shader_source(struct gl_context *ctx, GLuint shader, const GLchar *source)

+{

+   struct gl_shader *sh;

+

+   sh = _mesa_lookup_shader_err(ctx, shader, "glShaderSource");

+   if (!sh)

+      return;

+

+   /* free old shader source string and install new one */

+   if (sh->Source) {

+      free((void *) sh->Source);

+   }

+   sh->Source = source;

+   sh->CompileStatus = GL_FALSE;

+#ifdef DEBUG

+   sh->SourceChecksum = _mesa_str_checksum(sh->Source);

+#endif

+}

+

+

+/**

+ * Compile a shader.

+ */

+static void

+compile_shader(struct gl_context *ctx, GLuint shaderObj)

+{

+   struct gl_shader *sh;

+   struct gl_shader_compiler_options *options;

+

+   sh = _mesa_lookup_shader_err(ctx, shaderObj, "glCompileShader");

+   if (!sh)

+      return;

+

+   options = &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(sh->Type)];

+

+   /* set default pragma state for shader */

+   sh->Pragmas = options->DefaultPragmas;

+

+   /* this call will set the sh->CompileStatus field to indicate if

+    * compilation was successful.

+    */

+   _mesa_glsl_compile_shader(ctx, sh);

+}

+

+

+/**

+ * Link a program's shaders.

+ */

+static void

+link_program(struct gl_context *ctx, GLuint program)

+{

+   struct gl_shader_program *shProg;

+   struct gl_transform_feedback_object *obj =

+      ctx->TransformFeedback.CurrentObject;

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glLinkProgram");

+   if (!shProg)

+      return;

+

+   if (obj->Active

+       && (shProg == ctx->Shader.CurrentVertexProgram

+	   || shProg == ctx->Shader.CurrentGeometryProgram

+	   || shProg == ctx->Shader.CurrentFragmentProgram)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glLinkProgram(transform feedback active");

+      return;

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+

+   _mesa_glsl_link_shader(ctx, shProg);

+

+   /* debug code */

+   if (0) {

+      GLuint i;

+

+      printf("Link %u shaders in program %u: %s\n",

+                   shProg->NumShaders, shProg->Name,

+                   shProg->LinkStatus ? "Success" : "Failed");

+

+      for (i = 0; i < shProg->NumShaders; i++) {

+         printf(" shader %u, type 0x%x\n",

+                      shProg->Shaders[i]->Name,

+                      shProg->Shaders[i]->Type);

+      }

+   }

+}

+

+

+/**

+ * Print basic shader info (for debug).

+ */

+static void

+print_shader_info(const struct gl_shader_program *shProg)

+{

+   GLuint i;

+

+   printf("Mesa: glUseProgram(%u)\n", shProg->Name);

+   for (i = 0; i < shProg->NumShaders; i++) {

+      const char *s;

+      switch (shProg->Shaders[i]->Type) {

+      case GL_VERTEX_SHADER:

+         s = "vertex";

+         break;

+      case GL_FRAGMENT_SHADER:

+         s = "fragment";

+         break;

+      case GL_GEOMETRY_SHADER:

+         s = "geometry";

+         break;

+      default:

+         s = "";

+      }

+      printf("  %s shader %u, checksum %u\n", s, 

+	     shProg->Shaders[i]->Name,

+	     shProg->Shaders[i]->SourceChecksum);

+   }

+   if (shProg->VertexProgram)

+      printf("  vert prog %u\n", shProg->VertexProgram->Base.Id);

+   if (shProg->FragmentProgram)

+      printf("  frag prog %u\n", shProg->FragmentProgram->Base.Id);

+}

+

+

+/**

+ * Use the named shader program for subsequent glUniform calls

+ */

+void

+_mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg,

+		     const char *caller)

+{

+   if ((shProg != NULL) && !shProg->LinkStatus) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+		  "%s(program %u not linked)", caller, shProg->Name);

+      return;

+   }

+

+   if (ctx->Shader.ActiveProgram != shProg) {

+      _mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram, shProg);

+   }

+}

+

+/**

+ */

+static bool

+use_shader_program(struct gl_context *ctx, GLenum type,

+		   struct gl_shader_program *shProg)

+{

+   struct gl_shader_program **target;

+

+   switch (type) {

+#if FEATURE_ARB_vertex_shader

+   case GL_VERTEX_SHADER:

+      target = &ctx->Shader.CurrentVertexProgram;

+      if ((shProg == NULL)

+	  || (shProg->_LinkedShaders[MESA_SHADER_VERTEX] == NULL)) {

+	 shProg = NULL;

+      }

+      break;

+#endif

+#if FEATURE_ARB_geometry_shader4

+   case GL_GEOMETRY_SHADER_ARB:

+      target = &ctx->Shader.CurrentGeometryProgram;

+      if ((shProg == NULL)

+	  || (shProg->_LinkedShaders[MESA_SHADER_GEOMETRY] == NULL)) {

+	 shProg = NULL;

+      }

+      break;

+#endif

+#if FEATURE_ARB_fragment_shader

+   case GL_FRAGMENT_SHADER:

+      target = &ctx->Shader.CurrentFragmentProgram;

+      if ((shProg == NULL)

+	  || (shProg->_LinkedShaders[MESA_SHADER_FRAGMENT] == NULL)) {

+	 shProg = NULL;

+      }

+      break;

+#endif

+   default:

+      return false;

+   }

+

+   if (*target != shProg) {

+      FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);

+      _mesa_reference_shader_program(ctx, target, shProg);

+      return true;

+   }

+

+   return false;

+}

+

+/**

+ * Use the named shader program for subsequent rendering.

+ */

+void

+_mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)

+{

+   use_shader_program(ctx, GL_VERTEX_SHADER, shProg);

+   use_shader_program(ctx, GL_GEOMETRY_SHADER_ARB, shProg);

+   use_shader_program(ctx, GL_FRAGMENT_SHADER, shProg);

+   _mesa_active_program(ctx, shProg, "glUseProgram");

+

+   if (ctx->Driver.UseProgram)

+      ctx->Driver.UseProgram(ctx, shProg);

+}

+

+

+/**

+ * Validate a program's samplers.

+ * Specifically, check that there aren't two samplers of different types

+ * pointing to the same texture unit.

+ * \return GL_TRUE if valid, GL_FALSE if invalid

+ */

+static GLboolean

+validate_samplers(const struct gl_program *prog, char *errMsg)

+{

+   static const char *targetName[] = {

+      "TEXTURE_2D_ARRAY",

+      "TEXTURE_1D_ARRAY",

+      "TEXTURE_CUBE",

+      "TEXTURE_3D",

+      "TEXTURE_RECT",

+      "TEXTURE_2D",

+      "TEXTURE_1D",

+   };

+   GLint targetUsed[MAX_TEXTURE_IMAGE_UNITS];

+   GLbitfield samplersUsed = prog->SamplersUsed;

+   GLuint i;

+

+   assert(Elements(targetName) == NUM_TEXTURE_TARGETS);

+

+   if (samplersUsed == 0x0)

+      return GL_TRUE;

+

+   for (i = 0; i < Elements(targetUsed); i++)

+      targetUsed[i] = -1;

+

+   /* walk over bits which are set in 'samplers' */

+   while (samplersUsed) {

+      GLuint unit;

+      gl_texture_index target;

+      GLint sampler = _mesa_ffs(samplersUsed) - 1;

+      assert(sampler >= 0);

+      assert(sampler < MAX_TEXTURE_IMAGE_UNITS);

+      unit = prog->SamplerUnits[sampler];

+      target = prog->SamplerTargets[sampler];

+      if (targetUsed[unit] != -1 && targetUsed[unit] != (int) target) {

+         _mesa_snprintf(errMsg, 100,

+		  "Texture unit %d is accessed both as %s and %s",

+		  unit, targetName[targetUsed[unit]], targetName[target]);

+         return GL_FALSE;

+      }

+      targetUsed[unit] = target;

+      samplersUsed ^= (1 << sampler);

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do validation of the given shader program.

+ * \param errMsg  returns error message if validation fails.

+ * \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg)

+ */

+static GLboolean

+validate_shader_program(const struct gl_shader_program *shProg,

+                        char *errMsg)

+{

+   const struct gl_vertex_program *vp = shProg->VertexProgram;

+   const struct gl_fragment_program *fp = shProg->FragmentProgram;

+

+   if (!shProg->LinkStatus) {

+      return GL_FALSE;

+   }

+

+   /* From the GL spec, a program is invalid if any of these are true:

+

+     any two active samplers in the current program object are of

+     different types, but refer to the same texture image unit,

+

+     any active sampler in the current program object refers to a texture

+     image unit where fixed-function fragment processing accesses a

+     texture target that does not match the sampler type, or 

+

+     the sum of the number of active samplers in the program and the

+     number of texture image units enabled for fixed-function fragment

+     processing exceeds the combined limit on the total number of texture

+     image units allowed.

+   */

+

+

+   /*

+    * Check: any two active samplers in the current program object are of

+    * different types, but refer to the same texture image unit,

+    */

+   if (vp && !validate_samplers(&vp->Base, errMsg)) {

+      return GL_FALSE;

+   }

+   if (fp && !validate_samplers(&fp->Base, errMsg)) {

+      return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Called via glValidateProgram()

+ */

+static void

+validate_program(struct gl_context *ctx, GLuint program)

+{

+   struct gl_shader_program *shProg;

+   char errMsg[100];

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program, "glValidateProgram");

+   if (!shProg) {

+      return;

+   }

+

+   shProg->Validated = validate_shader_program(shProg, errMsg);

+   if (!shProg->Validated) {

+      /* update info log */

+      if (shProg->InfoLog) {

+         talloc_free(shProg->InfoLog);

+      }

+      shProg->InfoLog = talloc_strdup(shProg, errMsg);

+   }

+}

+

+

+

+void GLAPIENTRY

+_mesa_AttachObjectARB(GLhandleARB program, GLhandleARB shader)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   attach_shader(ctx, program, shader);

+}

+

+

+void GLAPIENTRY

+_mesa_AttachShader(GLuint program, GLuint shader)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   attach_shader(ctx, program, shader);

+}

+

+

+void GLAPIENTRY

+_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,

+                            const GLcharARB *name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   bind_attrib_location(ctx, program, index, name);

+}

+

+

+/* GL_EXT_gpu_shader4, GL3 */

+void GLAPIENTRY

+_mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,

+                           const GLchar *name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   bind_frag_data_location(ctx, program, colorNumber, name);

+}

+

+

+void GLAPIENTRY

+_mesa_CompileShaderARB(GLhandleARB shaderObj)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   compile_shader(ctx, shaderObj);

+}

+

+

+GLuint GLAPIENTRY

+_mesa_CreateShader(GLenum type)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return create_shader(ctx, type);

+}

+

+

+GLhandleARB GLAPIENTRY

+_mesa_CreateShaderObjectARB(GLenum type)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return create_shader(ctx, type);

+}

+

+

+GLuint GLAPIENTRY

+_mesa_CreateProgram(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return create_shader_program(ctx);

+}

+

+

+GLhandleARB GLAPIENTRY

+_mesa_CreateProgramObjectARB(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return create_shader_program(ctx);

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteObjectARB(GLhandleARB obj)

+{

+   if (obj) {

+      GET_CURRENT_CONTEXT(ctx);

+      if (is_program(ctx, obj)) {

+         delete_shader_program(ctx, obj);

+      }

+      else if (is_shader(ctx, obj)) {

+         delete_shader(ctx, obj);

+      }

+      else {

+         /* error? */

+      }

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteProgram(GLuint name)

+{

+   if (name) {

+      GET_CURRENT_CONTEXT(ctx);

+      delete_shader_program(ctx, name);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteShader(GLuint name)

+{

+   if (name) {

+      GET_CURRENT_CONTEXT(ctx);

+      delete_shader(ctx, name);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_DetachObjectARB(GLhandleARB program, GLhandleARB shader)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   detach_shader(ctx, program, shader);

+}

+

+

+void GLAPIENTRY

+_mesa_DetachShader(GLuint program, GLuint shader)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   detach_shader(ctx, program, shader);

+}

+

+

+void GLAPIENTRY

+_mesa_GetActiveAttribARB(GLhandleARB program, GLuint index,

+                         GLsizei maxLength, GLsizei * length, GLint * size,

+                         GLenum * type, GLcharARB * name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_active_attrib(ctx, program, index, maxLength, length, size, type, name);

+}

+

+

+void GLAPIENTRY

+_mesa_GetAttachedObjectsARB(GLhandleARB container, GLsizei maxCount,

+                            GLsizei * count, GLhandleARB * obj)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_attached_shaders(ctx, container, maxCount, count, obj);

+}

+

+

+void GLAPIENTRY

+_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,

+                         GLsizei *count, GLuint *obj)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_attached_shaders(ctx, program, maxCount, count, obj);

+}

+

+

+GLint GLAPIENTRY

+_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return get_attrib_location(ctx, program, name);

+}

+

+

+/* GL_EXT_gpu_shader4, GL3 */

+GLint GLAPIENTRY

+_mesa_GetFragDataLocation(GLuint program, const GLchar *name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return get_frag_data_location(ctx, program, name);

+}

+

+

+

+void GLAPIENTRY

+_mesa_GetInfoLogARB(GLhandleARB object, GLsizei maxLength, GLsizei * length,

+                    GLcharARB * infoLog)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   if (is_program(ctx, object)) {

+      get_program_info_log(ctx, object, maxLength, length, infoLog);

+   }

+   else if (is_shader(ctx, object)) {

+      get_shader_info_log(ctx, object, maxLength, length, infoLog);

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetInfoLogARB");

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetObjectParameterivARB(GLhandleARB object, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   /* Implement in terms of GetProgramiv, GetShaderiv */

+   if (is_program(ctx, object)) {

+      if (pname == GL_OBJECT_TYPE_ARB) {

+	 *params = GL_PROGRAM_OBJECT_ARB;

+      }

+      else {

+	 get_programiv(ctx, object, pname, params);

+      }

+   }

+   else if (is_shader(ctx, object)) {

+      if (pname == GL_OBJECT_TYPE_ARB) {

+	 *params = GL_SHADER_OBJECT_ARB;

+      }

+      else {

+	 get_shaderiv(ctx, object, pname, params);

+      }

+   }

+   else {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetObjectParameterivARB");

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetObjectParameterfvARB(GLhandleARB object, GLenum pname,

+                              GLfloat *params)

+{

+   GLint iparams[1];  /* XXX is one element enough? */

+   _mesa_GetObjectParameterivARB(object, pname, iparams);

+   params[0] = (GLfloat) iparams[0];

+}

+

+

+void GLAPIENTRY

+_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_programiv(ctx, program, pname, params);

+}

+

+

+void GLAPIENTRY

+_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_shaderiv(ctx, shader, pname, params);

+}

+

+

+void GLAPIENTRY

+_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,

+                        GLsizei *length, GLchar *infoLog)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_program_info_log(ctx, program, bufSize, length, infoLog);

+}

+

+

+void GLAPIENTRY

+_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,

+                       GLsizei *length, GLchar *infoLog)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_shader_info_log(ctx, shader, bufSize, length, infoLog);

+}

+

+

+void GLAPIENTRY

+_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,

+                         GLsizei *length, GLcharARB *sourceOut)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   get_shader_source(ctx, shader, maxLength, length, sourceOut);

+}

+

+

+GLhandleARB GLAPIENTRY

+_mesa_GetHandleARB(GLenum pname)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return get_handle(ctx, pname);

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsProgram(GLuint name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return is_program(ctx, name);

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsShader(GLuint name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   return is_shader(ctx, name);

+}

+

+

+void GLAPIENTRY

+_mesa_LinkProgramARB(GLhandleARB programObj)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   link_program(ctx, programObj);

+}

+

+

+

+/**

+ * Read shader source code from a file.

+ * Useful for debugging to override an app's shader.

+ */

+static GLcharARB *

+read_shader(const char *fname)

+{

+   const int max = 50*1000;

+   FILE *f = fopen(fname, "r");

+   GLcharARB *buffer, *shader;

+   int len;

+

+   if (!f) {

+      return NULL;

+   }

+

+   buffer = (char *) malloc(max);

+   len = fread(buffer, 1, max, f);

+   buffer[len] = 0;

+

+   fclose(f);

+

+   shader = _mesa_strdup(buffer);

+   free(buffer);

+

+   return shader;

+}

+

+

+/**

+ * Called via glShaderSource() and glShaderSourceARB() API functions.

+ * Basically, concatenate the source code strings into one long string

+ * and pass it to _mesa_shader_source().

+ */

+void GLAPIENTRY

+_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,

+                      const GLcharARB ** string, const GLint * length)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint *offsets;

+   GLsizei i, totalLength;

+   GLcharARB *source;

+   GLuint checksum;

+

+   if (!shaderObj || string == NULL) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB");

+      return;

+   }

+

+   /*

+    * This array holds offsets of where the appropriate string ends, thus the

+    * last element will be set to the total length of the source code.

+    */

+   offsets = (GLint *) malloc(count * sizeof(GLint));

+   if (offsets == NULL) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");

+      return;

+   }

+

+   for (i = 0; i < count; i++) {

+      if (string[i] == NULL) {

+         free((GLvoid *) offsets);

+         _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");

+         return;

+      }

+      if (length == NULL || length[i] < 0)

+         offsets[i] = strlen(string[i]);

+      else

+         offsets[i] = length[i];

+      /* accumulate string lengths */

+      if (i > 0)

+         offsets[i] += offsets[i - 1];

+   }

+

+   /* Total length of source string is sum off all strings plus two.

+    * One extra byte for terminating zero, another extra byte to silence

+    * valgrind warnings in the parser/grammer code.

+    */

+   totalLength = offsets[count - 1] + 2;

+   source = (GLcharARB *) malloc(totalLength * sizeof(GLcharARB));

+   if (source == NULL) {

+      free((GLvoid *) offsets);

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");

+      return;

+   }

+

+   for (i = 0; i < count; i++) {

+      GLint start = (i > 0) ? offsets[i - 1] : 0;

+      memcpy(source + start, string[i],

+             (offsets[i] - start) * sizeof(GLcharARB));

+   }

+   source[totalLength - 1] = '\0';

+   source[totalLength - 2] = '\0';

+

+   if (SHADER_SUBST) {

+      /* Compute the shader's source code checksum then try to open a file

+       * named newshader_<CHECKSUM>.  If it exists, use it in place of the

+       * original shader source code.  For debugging.

+       */

+      char filename[100];

+      GLcharARB *newSource;

+

+      checksum = _mesa_str_checksum(source);

+

+      _mesa_snprintf(filename, sizeof(filename), "newshader_%d", checksum);

+

+      newSource = read_shader(filename);

+      if (newSource) {

+         fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",

+                       shaderObj, checksum, filename);

+         free(source);

+         source = newSource;

+      }

+   }      

+

+   shader_source(ctx, shaderObj, source);

+

+   if (SHADER_SUBST) {

+      struct gl_shader *sh = _mesa_lookup_shader(ctx, shaderObj);

+      if (sh)

+         sh->SourceChecksum = checksum; /* save original checksum */

+   }

+

+   free(offsets);

+}

+

+

+void GLAPIENTRY

+_mesa_UseProgramObjectARB(GLhandleARB program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_shader_program *shProg;

+   struct gl_transform_feedback_object *obj =

+      ctx->TransformFeedback.CurrentObject;

+

+   if (obj->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glUseProgram(transform feedback active)");

+      return;

+   }

+

+   if (program) {

+      shProg = _mesa_lookup_shader_program_err(ctx, program, "glUseProgram");

+      if (!shProg) {

+         return;

+      }

+      if (!shProg->LinkStatus) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glUseProgram(program %u not linked)", program);

+         return;

+      }

+

+      /* debug code */

+      if (ctx->Shader.Flags & GLSL_USE_PROG) {

+         print_shader_info(shProg);

+      }

+   }

+   else {

+      shProg = NULL;

+   }

+

+   _mesa_use_program(ctx, shProg);

+}

+

+

+void GLAPIENTRY

+_mesa_ValidateProgramARB(GLhandleARB program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   validate_program(ctx, program);

+}

+

+#ifdef FEATURE_ES2

+

+void GLAPIENTRY

+_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,

+                               GLint* range, GLint* precision)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) shadertype;

+   (void) precisiontype;

+   (void) range;

+   (void) precision;

+   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);

+}

+

+

+void GLAPIENTRY

+_mesa_ReleaseShaderCompiler(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);

+}

+

+

+void GLAPIENTRY

+_mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,

+                   const void* binary, GLint length)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   (void) n;

+   (void) shaders;

+   (void) binaryformat;

+   (void) binary;

+   (void) length;

+   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);

+}

+

+#endif /* FEATURE_ES2 */

+

+

+#if FEATURE_ARB_geometry_shader4

+

+void GLAPIENTRY

+_mesa_ProgramParameteriARB(GLuint program, GLenum pname,

+                           GLint value)

+{

+   struct gl_shader_program *shProg;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   shProg = _mesa_lookup_shader_program_err(ctx, program,

+                                            "glProgramParameteri");

+   if (!shProg)

+      return;

+

+   switch (pname) {

+   case GL_GEOMETRY_VERTICES_OUT_ARB:

+      if (value < 1 ||

+          (unsigned) value > ctx->Const.GeometryProgram.MaxGeometryOutputVertices) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glProgramParameteri(GL_GEOMETRY_VERTICES_OUT_ARB=%d",

+                     value);

+         return;

+      }

+      shProg->Geom.VerticesOut = value;

+      break;

+   case GL_GEOMETRY_INPUT_TYPE_ARB:

+      switch (value) {

+      case GL_POINTS:

+      case GL_LINES:

+      case GL_LINES_ADJACENCY_ARB:

+      case GL_TRIANGLES:

+      case GL_TRIANGLES_ADJACENCY_ARB:

+         shProg->Geom.InputType = value;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glProgramParameteri(geometry input type = %s",

+                     _mesa_lookup_enum_by_nr(value));

+         return;

+      }

+      break;

+   case GL_GEOMETRY_OUTPUT_TYPE_ARB:

+      switch (value) {

+      case GL_POINTS:

+      case GL_LINE_STRIP:

+      case GL_TRIANGLE_STRIP:

+         shProg->Geom.OutputType = value;

+         break;

+      default:

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glProgramParameteri(geometry output type = %s",

+                     _mesa_lookup_enum_by_nr(value));

+         return;

+      }

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameteriARB(pname=%s)",

+                  _mesa_lookup_enum_by_nr(pname));

+      break;

+   }

+}

+

+#endif

+

+void

+_mesa_use_shader_program(struct gl_context *ctx, GLenum type,

+			 struct gl_shader_program *shProg)

+{

+   use_shader_program(ctx, type, shProg);

+

+   if (ctx->Driver.UseProgram)

+      ctx->Driver.UseProgram(ctx, shProg);

+}

+

+void GLAPIENTRY

+_mesa_UseShaderProgramEXT(GLenum type, GLuint program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_shader_program *shProg = NULL;

+

+   if (!validate_shader_target(ctx, type)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glUseShaderProgramEXT(type)");

+      return;

+   }

+

+   if (ctx->TransformFeedback.CurrentObject->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glUseShaderProgramEXT(transform feedback is active)");

+      return;

+   }

+

+   if (program) {

+      shProg = _mesa_lookup_shader_program_err(ctx, program,

+					       "glUseShaderProgramEXT");

+      if (shProg == NULL)

+	 return;

+

+      if (!shProg->LinkStatus) {

+	 _mesa_error(ctx, GL_INVALID_OPERATION,

+		     "glUseShaderProgramEXT(program not linked)");

+	 return;

+      }

+   }

+

+   _mesa_use_shader_program(ctx, type, shProg);

+}

+

+void GLAPIENTRY

+_mesa_ActiveProgramEXT(GLuint program)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_shader_program *shProg = (program != 0)

+      ? _mesa_lookup_shader_program_err(ctx, program, "glActiveProgramEXT")

+      : NULL;

+

+   _mesa_active_program(ctx, shProg, "glActiveProgramEXT");

+   return;

+}

+

+GLuint GLAPIENTRY

+_mesa_CreateShaderProgramEXT(GLenum type, const GLchar *string)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint shader = create_shader(ctx, type);

+   GLuint program = 0;

+

+   if (shader) {

+      shader_source(ctx, shader, _mesa_strdup(string));

+      compile_shader(ctx, shader);

+

+      program = create_shader_program(ctx);

+      if (program) {

+	 struct gl_shader_program *shProg;

+	 struct gl_shader *sh;

+	 GLint compiled = GL_FALSE;

+

+	 shProg = _mesa_lookup_shader_program(ctx, program);

+	 sh = _mesa_lookup_shader(ctx, shader);

+

+	 get_shaderiv(ctx, shader, GL_COMPILE_STATUS, &compiled);

+	 if (compiled) {

+	    attach_shader(ctx, program, shader);

+	    link_program(ctx, program);

+	    detach_shader(ctx, program, shader);

+

+#if 0

+	    /* Possibly... */

+	    if (active-user-defined-varyings-in-linked-program) {

+	       append-error-to-info-log;

+	       shProg->LinkStatus = GL_FALSE;

+	    }

+#endif

+	 }

+

+	 shProg->InfoLog = talloc_strdup_append(shProg->InfoLog, sh->InfoLog);

+      }

+

+      delete_shader(ctx, shader);

+   }

+

+   return program;

+}

+

+/**

+ * Plug in shader-related functions into API dispatch table.

+ */

+void

+_mesa_init_shader_dispatch(struct _glapi_table *exec)

+{

+#if FEATURE_GL

+   /* GL_ARB_vertex/fragment_shader */

+   SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);

+   SET_GetHandleARB(exec, _mesa_GetHandleARB);

+   SET_DetachObjectARB(exec, _mesa_DetachObjectARB);

+   SET_CreateShaderObjectARB(exec, _mesa_CreateShaderObjectARB);

+   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);

+   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);

+   SET_CreateProgramObjectARB(exec, _mesa_CreateProgramObjectARB);

+   SET_AttachObjectARB(exec, _mesa_AttachObjectARB);

+   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);

+   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);

+   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);

+   SET_GetObjectParameterfvARB(exec, _mesa_GetObjectParameterfvARB);

+   SET_GetObjectParameterivARB(exec, _mesa_GetObjectParameterivARB);

+   SET_GetInfoLogARB(exec, _mesa_GetInfoLogARB);

+   SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);

+   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);

+

+   /* OpenGL 2.0 */

+   SET_AttachShader(exec, _mesa_AttachShader);

+   SET_CreateProgram(exec, _mesa_CreateProgram);

+   SET_CreateShader(exec, _mesa_CreateShader);

+   SET_DeleteProgram(exec, _mesa_DeleteProgram);

+   SET_DeleteShader(exec, _mesa_DeleteShader);

+   SET_DetachShader(exec, _mesa_DetachShader);

+   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);

+   SET_GetProgramiv(exec, _mesa_GetProgramiv);

+   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);

+   SET_GetShaderiv(exec, _mesa_GetShaderiv);

+   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);

+   SET_IsProgram(exec, _mesa_IsProgram);

+   SET_IsShader(exec, _mesa_IsShader);

+

+#if FEATURE_ARB_vertex_shader

+   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);

+   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);

+   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);

+#endif

+

+#if FEATURE_ARB_geometry_shader4

+   SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);

+#endif

+

+   SET_UseShaderProgramEXT(exec, _mesa_UseShaderProgramEXT);

+   SET_ActiveProgramEXT(exec, _mesa_ActiveProgramEXT);

+   SET_CreateShaderProgramEXT(exec, _mesa_CreateShaderProgramEXT);

+

+   /* GL_EXT_gpu_shader4 / GL 3.0 */

+   SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation);

+   SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation);

+

+#endif /* FEATURE_GL */

+}

+

diff --git a/mesalib/src/mesa/main/shaderapi.h b/mesalib/src/mesa/main/shaderapi.h
index 16e22530d..15c7c7ae6 100644
--- a/mesalib/src/mesa/main/shaderapi.h
+++ b/mesalib/src/mesa/main/shaderapi.h
@@ -1,169 +1,193 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2004-2007  Brian Paul   All Rights Reserved.
- * 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, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS 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 SHADERAPI_H
-#define SHADERAPI_H
-
-
-#include "glheader.h"
-#include "mtypes.h"
-
-
-extern GLint
-_mesa_sizeof_glsl_type(GLenum type);
-
-extern void
-_mesa_copy_string(GLchar *dst, GLsizei maxLength,
-                  GLsizei *length, const GLchar *src);
-
-extern void
-_mesa_use_program(GLcontext *ctx, GLuint program);
-
-
-extern void
-_mesa_init_shader_dispatch(struct _glapi_table *exec);
-
-
-
-extern void GLAPIENTRY
-_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
-
-extern void  GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_CreateProgramObjectARB(void);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_CreateShaderObjectARB(GLenum type);
-
-extern void GLAPIENTRY
-_mesa_DeleteObjectARB(GLhandleARB obj);
-
-extern void GLAPIENTRY
-_mesa_DetachObjectARB(GLhandleARB, GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_GetAttachedObjectsARB(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-
-extern GLhandleARB GLAPIENTRY
-_mesa_GetHandleARB(GLenum pname);
-
-extern void GLAPIENTRY
-_mesa_GetInfoLogARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterfvARB(GLhandleARB, GLenum, GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);
-
-extern void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsProgram(GLuint name);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsShader(GLuint name);
-
-extern void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj);
-
-extern void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB);
-
-extern void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB);
-
-
-extern void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
-                         GLenum *, GLcharARB *);
-
-extern GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *);
-
-
-
-extern void GLAPIENTRY
-_mesa_AttachShader(GLuint program, GLuint shader);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateShader(GLenum);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateProgram(void);
-
-extern void GLAPIENTRY
-_mesa_DeleteProgram(GLuint program);
-
-extern void GLAPIENTRY
-_mesa_DeleteShader(GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_DetachShader(GLuint program, GLuint shader);
-
-extern void GLAPIENTRY
-_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,
-                         GLsizei *count, GLuint *obj);
-
-extern void GLAPIENTRY
-_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,
-                        GLsizei *length, GLchar *infoLog);
-
-extern void GLAPIENTRY
-_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
-                       GLsizei *length, GLchar *infoLog);
-
-
-extern void GLAPIENTRY
-_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
-                               GLint *range, GLint *precision);
-
-extern void GLAPIENTRY
-_mesa_ReleaseShaderCompiler(void);
-
-extern void GLAPIENTRY
-_mesa_ShaderBinary(GLint n, const GLuint *shaders, GLenum binaryformat,
-                   const void* binary, GLint length);
-
-extern void GLAPIENTRY
-_mesa_ProgramParameteriARB(GLuint program, GLenum pname,
-                           GLint value);
-
-#endif /* SHADERAPI_H */
+/*

+ * Mesa 3-D graphics library

+ *

+ * Copyright (C) 2004-2007  Brian Paul   All Rights Reserved.

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS 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 SHADERAPI_H

+#define SHADERAPI_H

+

+

+#include "glheader.h"

+

+struct _glapi_table;

+struct gl_context;

+struct gl_shader_program;

+

+extern GLint

+_mesa_sizeof_glsl_type(GLenum type);

+

+extern void

+_mesa_copy_string(GLchar *dst, GLsizei maxLength,

+                  GLsizei *length, const GLchar *src);

+

+extern void

+_mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg);

+

+extern void

+_mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg,

+		     const char *caller);

+

+extern void

+_mesa_init_shader_dispatch(struct _glapi_table *exec);

+

+

+

+extern void GLAPIENTRY

+_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);

+

+extern void  GLAPIENTRY

+_mesa_CompileShaderARB(GLhandleARB);

+

+extern GLhandleARB GLAPIENTRY

+_mesa_CreateProgramObjectARB(void);

+

+extern GLhandleARB GLAPIENTRY

+_mesa_CreateShaderObjectARB(GLenum type);

+

+extern void GLAPIENTRY

+_mesa_DeleteObjectARB(GLhandleARB obj);

+

+extern void GLAPIENTRY

+_mesa_DetachObjectARB(GLhandleARB, GLhandleARB);

+

+extern void GLAPIENTRY

+_mesa_GetAttachedObjectsARB(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);

+

+extern GLint GLAPIENTRY

+_mesa_GetFragDataLocation(GLuint program, const GLchar *name);

+

+extern GLhandleARB GLAPIENTRY

+_mesa_GetHandleARB(GLenum pname);

+

+extern void GLAPIENTRY

+_mesa_GetInfoLogARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);

+

+extern void GLAPIENTRY

+_mesa_GetObjectParameterfvARB(GLhandleARB, GLenum, GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);

+

+extern void GLAPIENTRY

+_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsProgram(GLuint name);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsShader(GLuint name);

+

+extern void GLAPIENTRY

+_mesa_LinkProgramARB(GLhandleARB programObj);

+

+extern void GLAPIENTRY

+_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);

+

+extern void GLAPIENTRY

+_mesa_UseProgramObjectARB(GLhandleARB);

+

+extern void GLAPIENTRY

+_mesa_ValidateProgramARB(GLhandleARB);

+

+

+extern void GLAPIENTRY

+_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *);

+

+extern void GLAPIENTRY

+_mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,

+                           const GLchar *name);

+

+extern void GLAPIENTRY

+_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,

+                         GLenum *, GLcharARB *);

+

+extern GLint GLAPIENTRY

+_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *);

+

+

+

+extern void GLAPIENTRY

+_mesa_AttachShader(GLuint program, GLuint shader);

+

+extern GLuint GLAPIENTRY

+_mesa_CreateShader(GLenum);

+

+extern GLuint GLAPIENTRY

+_mesa_CreateProgram(void);

+

+extern void GLAPIENTRY

+_mesa_DeleteProgram(GLuint program);

+

+extern void GLAPIENTRY

+_mesa_DeleteShader(GLuint shader);

+

+extern void GLAPIENTRY

+_mesa_DetachShader(GLuint program, GLuint shader);

+

+extern void GLAPIENTRY

+_mesa_GetAttachedShaders(GLuint program, GLsizei maxCount,

+                         GLsizei *count, GLuint *obj);

+

+extern void GLAPIENTRY

+_mesa_GetProgramiv(GLuint program, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetProgramInfoLog(GLuint program, GLsizei bufSize,

+                        GLsizei *length, GLchar *infoLog);

+

+extern void GLAPIENTRY

+_mesa_GetShaderiv(GLuint shader, GLenum pname, GLint *params);

+

+extern void GLAPIENTRY

+_mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,

+                       GLsizei *length, GLchar *infoLog);

+

+

+extern void GLAPIENTRY

+_mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,

+                               GLint *range, GLint *precision);

+

+extern void GLAPIENTRY

+_mesa_ReleaseShaderCompiler(void);

+

+extern void GLAPIENTRY

+_mesa_ShaderBinary(GLint n, const GLuint *shaders, GLenum binaryformat,

+                   const void* binary, GLint length);

+

+extern void GLAPIENTRY

+_mesa_ProgramParameteriARB(GLuint program, GLenum pname,

+                           GLint value);

+void

+_mesa_use_shader_program(struct gl_context *ctx, GLenum type,

+			 struct gl_shader_program *shProg);

+

+extern void GLAPIENTRY

+_mesa_UseShaderProgramEXT(GLenum type, GLuint program);

+

+extern void GLAPIENTRY

+_mesa_ActiveProgramEXT(GLuint program);

+

+extern GLuint GLAPIENTRY

+_mesa_CreateShaderProgramEXT(GLenum type, const GLchar *string);

+

+#endif /* SHADERAPI_H */

diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c
index 2de8f2798..60f133691 100644
--- a/mesalib/src/mesa/main/shaderobj.c
+++ b/mesalib/src/mesa/main/shaderobj.c
@@ -1,408 +1,411 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2004-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
- * 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 shaderobj.c
- * \author Brian Paul
- *
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/hash.h"
-#include "main/shaderobj.h"
-#include "program/program.h"
-#include "program/prog_parameter.h"
-#include "program/prog_uniform.h"
-#include "talloc.h"
-
-/**********************************************************************/
-/*** Shader object functions                                        ***/
-/**********************************************************************/
-
-
-/**
- * Set ptr to point to sh.
- * If ptr is pointing to another shader, decrement its refcount (and delete
- * if refcount hits zero).
- * Then set ptr to point to sh, incrementing its refcount.
- */
-void
-_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh)
-{
-   assert(ptr);
-   if (*ptr == sh) {
-      /* no-op */
-      return;
-   }
-   if (*ptr) {
-      /* Unreference the old shader */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_shader *old = *ptr;
-
-      ASSERT(old->RefCount > 0);
-      old->RefCount--;
-      /*printf("SHADER DECR %p (%d) to %d\n",
-        (void*) old, old->Name, old->RefCount);*/
-      deleteFlag = (old->RefCount == 0);
-
-      if (deleteFlag) {
-         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
-         ctx->Driver.DeleteShader(ctx, old);
-      }
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (sh) {
-      /* reference new */
-      sh->RefCount++;
-      /*printf("SHADER INCR %p (%d) to %d\n",
-        (void*) sh, sh->Name, sh->RefCount);*/
-      *ptr = sh;
-   }
-}
-
-void
-_mesa_init_shader(GLcontext *ctx, struct gl_shader *shader)
-{
-   shader->RefCount = 1;
-}
-
-/**
- * Allocate a new gl_shader object, initialize it.
- * Called via ctx->Driver.NewShader()
- */
-struct gl_shader *
-_mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
-{
-   struct gl_shader *shader;
-   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER ||
-          type == GL_GEOMETRY_SHADER_ARB);
-   shader = talloc_zero(NULL, struct gl_shader);
-   if (shader) {
-      shader->Type = type;
-      shader->Name = name;
-      _mesa_init_shader(ctx, shader);
-   }
-   return shader;
-}
-
-
-/**
- * Delete a shader object.
- * Called via ctx->Driver.DeleteShader().
- */
-static void
-_mesa_delete_shader(GLcontext *ctx, struct gl_shader *sh)
-{
-   if (sh->Source)
-      free((void *) sh->Source);
-   _mesa_reference_program(ctx, &sh->Program, NULL);
-   talloc_free(sh);
-}
-
-
-/**
- * Lookup a GLSL shader object.
- */
-struct gl_shader *
-_mesa_lookup_shader(GLcontext *ctx, GLuint name)
-{
-   if (name) {
-      struct gl_shader *sh = (struct gl_shader *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      /* Note that both gl_shader and gl_shader_program objects are kept
-       * in the same hash table.  Check the object's type to be sure it's
-       * what we're expecting.
-       */
-      if (sh && sh->Type == GL_SHADER_PROGRAM_MESA) {
-         return NULL;
-      }
-      return sh;
-   }
-   return NULL;
-}
-
-
-/**
- * As above, but record an error if shader is not found.
- */
-struct gl_shader *
-_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
-{
-   if (!name) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
-      return NULL;
-   }
-   else {
-      struct gl_shader *sh = (struct gl_shader *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      if (!sh) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
-         return NULL;
-      }
-      if (sh->Type == GL_SHADER_PROGRAM_MESA) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
-         return NULL;
-      }
-      return sh;
-   }
-}
-
-
-
-/**********************************************************************/
-/*** Shader Program object functions                                ***/
-/**********************************************************************/
-
-
-/**
- * Set ptr to point to shProg.
- * If ptr is pointing to another object, decrement its refcount (and delete
- * if refcount hits zero).
- * Then set ptr to point to shProg, incrementing its refcount.
- */
-void
-_mesa_reference_shader_program(GLcontext *ctx,
-                               struct gl_shader_program **ptr,
-                               struct gl_shader_program *shProg)
-{
-   assert(ptr);
-   if (*ptr == shProg) {
-      /* no-op */
-      return;
-   }
-   if (*ptr) {
-      /* Unreference the old shader program */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_shader_program *old = *ptr;
-
-      ASSERT(old->RefCount > 0);
-      old->RefCount--;
-#if 0
-      printf("ShaderProgram %p ID=%u  RefCount-- to %d\n",
-             (void *) old, old->Name, old->RefCount);
-#endif
-      deleteFlag = (old->RefCount == 0);
-
-      if (deleteFlag) {
-         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);
-         ctx->Driver.DeleteShaderProgram(ctx, old);
-      }
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (shProg) {
-      shProg->RefCount++;
-#if 0
-      printf("ShaderProgram %p ID=%u  RefCount++ to %d\n",
-             (void *) shProg, shProg->Name, shProg->RefCount);
-#endif
-      *ptr = shProg;
-   }
-}
-
-void
-_mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog)
-{
-   prog->Type = GL_SHADER_PROGRAM_MESA;
-   prog->RefCount = 1;
-   prog->Attributes = _mesa_new_parameter_list();
-#if FEATURE_ARB_geometry_shader4
-   prog->Geom.VerticesOut = 0;
-   prog->Geom.InputType = GL_TRIANGLES;
-   prog->Geom.OutputType = GL_TRIANGLE_STRIP;
-#endif
-}
-
-/**
- * Allocate a new gl_shader_program object, initialize it.
- * Called via ctx->Driver.NewShaderProgram()
- */
-static struct gl_shader_program *
-_mesa_new_shader_program(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader_program *shProg;
-   shProg = talloc_zero(NULL, struct gl_shader_program);
-   if (shProg) {
-      shProg->Name = name;
-      _mesa_init_shader_program(ctx, shProg);
-   }
-   return shProg;
-}
-
-
-/**
- * Clear (free) the shader program state that gets produced by linking.
- */
-void
-_mesa_clear_shader_program_data(GLcontext *ctx,
-                                struct gl_shader_program *shProg)
-{
-   _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
-   _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
-   _mesa_reference_geomprog(ctx, &shProg->GeometryProgram, NULL);
-
-   if (shProg->Uniforms) {
-      _mesa_free_uniform_list(shProg->Uniforms);
-      shProg->Uniforms = NULL;
-   }
-
-   if (shProg->Varying) {
-      _mesa_free_parameter_list(shProg->Varying);
-      shProg->Varying = NULL;
-   }
-}
-
-
-/**
- * Free all the data that hangs off a shader program object, but not the
- * object itself.
- */
-void
-_mesa_free_shader_program_data(GLcontext *ctx,
-                               struct gl_shader_program *shProg)
-{
-   GLuint i;
-
-   assert(shProg->Type == GL_SHADER_PROGRAM_MESA);
-
-   _mesa_clear_shader_program_data(ctx, shProg);
-
-   if (shProg->Attributes) {
-      _mesa_free_parameter_list(shProg->Attributes);
-      shProg->Attributes = NULL;
-   }
-
-   /* detach shaders */
-   for (i = 0; i < shProg->NumShaders; i++) {
-      _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
-   }
-   shProg->NumShaders = 0;
-
-   if (shProg->Shaders) {
-      free(shProg->Shaders);
-      shProg->Shaders = NULL;
-   }
-
-   if (shProg->InfoLog) {
-      talloc_free(shProg->InfoLog);
-      shProg->InfoLog = NULL;
-   }
-
-   /* Transform feedback varying vars */
-   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {
-      free(shProg->TransformFeedback.VaryingNames[i]);
-   }
-   free(shProg->TransformFeedback.VaryingNames);
-   shProg->TransformFeedback.VaryingNames = NULL;
-   shProg->TransformFeedback.NumVarying = 0;
-
-
-   for (i = 0; i < shProg->_NumLinkedShaders; i++) {
-      ctx->Driver.DeleteShader(ctx, shProg->_LinkedShaders[i]);
-   }
-   shProg->_NumLinkedShaders = 0;
-}
-
-
-/**
- * Free/delete a shader program object.
- * Called via ctx->Driver.DeleteShaderProgram().
- */
-static void
-_mesa_delete_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
-{
-   _mesa_free_shader_program_data(ctx, shProg);
-
-   talloc_free(shProg);
-}
-
-
-/**
- * Lookup a GLSL program object.
- */
-struct gl_shader_program *
-_mesa_lookup_shader_program(GLcontext *ctx, GLuint name)
-{
-   struct gl_shader_program *shProg;
-   if (name) {
-      shProg = (struct gl_shader_program *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      /* Note that both gl_shader and gl_shader_program objects are kept
-       * in the same hash table.  Check the object's type to be sure it's
-       * what we're expecting.
-       */
-      if (shProg && shProg->Type != GL_SHADER_PROGRAM_MESA) {
-         return NULL;
-      }
-      return shProg;
-   }
-   return NULL;
-}
-
-
-/**
- * As above, but record an error if program is not found.
- */
-struct gl_shader_program *
-_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
-                                const char *caller)
-{
-   if (!name) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
-      return NULL;
-   }
-   else {
-      struct gl_shader_program *shProg = (struct gl_shader_program *)
-         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);
-      if (!shProg) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
-         return NULL;
-      }
-      if (shProg->Type != GL_SHADER_PROGRAM_MESA) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
-         return NULL;
-      }
-      return shProg;
-   }
-}
-
-
-void
-_mesa_init_shader_object_functions(struct dd_function_table *driver)
-{
-   driver->NewShader = _mesa_new_shader;
-   driver->DeleteShader = _mesa_delete_shader;
-   driver->NewShaderProgram = _mesa_new_shader_program;
-   driver->DeleteShaderProgram = _mesa_delete_shader_program;
-   driver->CompileShader = _mesa_ir_compile_shader;
-   driver->LinkShader = _mesa_ir_link_shader;
-}
+/*

+ * Mesa 3-D graphics library

+ *

+ * Copyright (C) 2004-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

+ * 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 shaderobj.c

+ * \author Brian Paul

+ *

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/hash.h"

+#include "main/shaderobj.h"

+#include "program/program.h"

+#include "program/prog_parameter.h"

+#include "program/prog_uniform.h"

+#include "talloc.h"

+

+/**********************************************************************/

+/*** Shader object functions                                        ***/

+/**********************************************************************/

+

+

+/**

+ * Set ptr to point to sh.

+ * If ptr is pointing to another shader, decrement its refcount (and delete

+ * if refcount hits zero).

+ * Then set ptr to point to sh, incrementing its refcount.

+ */

+void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh)

+{

+   assert(ptr);

+   if (*ptr == sh) {

+      /* no-op */

+      return;

+   }

+   if (*ptr) {

+      /* Unreference the old shader */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_shader *old = *ptr;

+

+      ASSERT(old->RefCount > 0);

+      old->RefCount--;

+      /*printf("SHADER DECR %p (%d) to %d\n",

+        (void*) old, old->Name, old->RefCount);*/

+      deleteFlag = (old->RefCount == 0);

+

+      if (deleteFlag) {

+         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);

+         ctx->Driver.DeleteShader(ctx, old);

+      }

+

+      *ptr = NULL;

+   }

+   assert(!*ptr);

+

+   if (sh) {

+      /* reference new */

+      sh->RefCount++;

+      /*printf("SHADER INCR %p (%d) to %d\n",

+        (void*) sh, sh->Name, sh->RefCount);*/

+      *ptr = sh;

+   }

+}

+

+void

+_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader)

+{

+   shader->RefCount = 1;

+}

+

+/**

+ * Allocate a new gl_shader object, initialize it.

+ * Called via ctx->Driver.NewShader()

+ */

+struct gl_shader *

+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)

+{

+   struct gl_shader *shader;

+   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER ||

+          type == GL_GEOMETRY_SHADER_ARB);

+   shader = talloc_zero(NULL, struct gl_shader);

+   if (shader) {

+      shader->Type = type;

+      shader->Name = name;

+      _mesa_init_shader(ctx, shader);

+   }

+   return shader;

+}

+

+

+/**

+ * Delete a shader object.

+ * Called via ctx->Driver.DeleteShader().

+ */

+static void

+_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)

+{

+   if (sh->Source)

+      free((void *) sh->Source);

+   _mesa_reference_program(ctx, &sh->Program, NULL);

+   talloc_free(sh);

+}

+

+

+/**

+ * Lookup a GLSL shader object.

+ */

+struct gl_shader *

+_mesa_lookup_shader(struct gl_context *ctx, GLuint name)

+{

+   if (name) {

+      struct gl_shader *sh = (struct gl_shader *)

+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);

+      /* Note that both gl_shader and gl_shader_program objects are kept

+       * in the same hash table.  Check the object's type to be sure it's

+       * what we're expecting.

+       */

+      if (sh && sh->Type == GL_SHADER_PROGRAM_MESA) {

+         return NULL;

+      }

+      return sh;

+   }

+   return NULL;

+}

+

+

+/**

+ * As above, but record an error if shader is not found.

+ */

+struct gl_shader *

+_mesa_lookup_shader_err(struct gl_context *ctx, GLuint name, const char *caller)

+{

+   if (!name) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);

+      return NULL;

+   }

+   else {

+      struct gl_shader *sh = (struct gl_shader *)

+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);

+      if (!sh) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);

+         return NULL;

+      }

+      if (sh->Type == GL_SHADER_PROGRAM_MESA) {

+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);

+         return NULL;

+      }

+      return sh;

+   }

+}

+

+

+

+/**********************************************************************/

+/*** Shader Program object functions                                ***/

+/**********************************************************************/

+

+

+/**

+ * Set ptr to point to shProg.

+ * If ptr is pointing to another object, decrement its refcount (and delete

+ * if refcount hits zero).

+ * Then set ptr to point to shProg, incrementing its refcount.

+ */

+void

+_mesa_reference_shader_program(struct gl_context *ctx,

+                               struct gl_shader_program **ptr,

+                               struct gl_shader_program *shProg)

+{

+   assert(ptr);

+   if (*ptr == shProg) {

+      /* no-op */

+      return;

+   }

+   if (*ptr) {

+      /* Unreference the old shader program */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_shader_program *old = *ptr;

+

+      ASSERT(old->RefCount > 0);

+      old->RefCount--;

+#if 0

+      printf("ShaderProgram %p ID=%u  RefCount-- to %d\n",

+             (void *) old, old->Name, old->RefCount);

+#endif

+      deleteFlag = (old->RefCount == 0);

+

+      if (deleteFlag) {

+         _mesa_HashRemove(ctx->Shared->ShaderObjects, old->Name);

+         ctx->Driver.DeleteShaderProgram(ctx, old);

+      }

+

+      *ptr = NULL;

+   }

+   assert(!*ptr);

+

+   if (shProg) {

+      shProg->RefCount++;

+#if 0

+      printf("ShaderProgram %p ID=%u  RefCount++ to %d\n",

+             (void *) shProg, shProg->Name, shProg->RefCount);

+#endif

+      *ptr = shProg;

+   }

+}

+

+void

+_mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog)

+{

+   prog->Type = GL_SHADER_PROGRAM_MESA;

+   prog->RefCount = 1;

+   prog->Attributes = _mesa_new_parameter_list();

+#if FEATURE_ARB_geometry_shader4

+   prog->Geom.VerticesOut = 0;

+   prog->Geom.InputType = GL_TRIANGLES;

+   prog->Geom.OutputType = GL_TRIANGLE_STRIP;

+#endif

+}

+

+/**

+ * Allocate a new gl_shader_program object, initialize it.

+ * Called via ctx->Driver.NewShaderProgram()

+ */

+static struct gl_shader_program *

+_mesa_new_shader_program(struct gl_context *ctx, GLuint name)

+{

+   struct gl_shader_program *shProg;

+   shProg = talloc_zero(NULL, struct gl_shader_program);

+   if (shProg) {

+      shProg->Name = name;

+      _mesa_init_shader_program(ctx, shProg);

+   }

+   return shProg;

+}

+

+

+/**

+ * Clear (free) the shader program state that gets produced by linking.

+ */

+void

+_mesa_clear_shader_program_data(struct gl_context *ctx,

+                                struct gl_shader_program *shProg)

+{

+   _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);

+   _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);

+   _mesa_reference_geomprog(ctx, &shProg->GeometryProgram, NULL);

+

+   if (shProg->Uniforms) {

+      _mesa_free_uniform_list(shProg->Uniforms);

+      shProg->Uniforms = NULL;

+   }

+

+   if (shProg->Varying) {

+      _mesa_free_parameter_list(shProg->Varying);

+      shProg->Varying = NULL;

+   }

+}

+

+

+/**

+ * Free all the data that hangs off a shader program object, but not the

+ * object itself.

+ */

+void

+_mesa_free_shader_program_data(struct gl_context *ctx,

+                               struct gl_shader_program *shProg)

+{

+   GLuint i;

+   gl_shader_type sh;

+

+   assert(shProg->Type == GL_SHADER_PROGRAM_MESA);

+

+   _mesa_clear_shader_program_data(ctx, shProg);

+

+   if (shProg->Attributes) {

+      _mesa_free_parameter_list(shProg->Attributes);

+      shProg->Attributes = NULL;

+   }

+

+   /* detach shaders */

+   for (i = 0; i < shProg->NumShaders; i++) {

+      _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);

+   }

+   shProg->NumShaders = 0;

+

+   if (shProg->Shaders) {

+      free(shProg->Shaders);

+      shProg->Shaders = NULL;

+   }

+

+   if (shProg->InfoLog) {

+      talloc_free(shProg->InfoLog);

+      shProg->InfoLog = NULL;

+   }

+

+   /* Transform feedback varying vars */

+   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {

+      free(shProg->TransformFeedback.VaryingNames[i]);

+   }

+   free(shProg->TransformFeedback.VaryingNames);

+   shProg->TransformFeedback.VaryingNames = NULL;

+   shProg->TransformFeedback.NumVarying = 0;

+

+

+   for (sh = 0; sh < MESA_SHADER_TYPES; sh++) {

+      if (shProg->_LinkedShaders[sh] != NULL) {

+	 ctx->Driver.DeleteShader(ctx, shProg->_LinkedShaders[sh]);

+	 shProg->_LinkedShaders[sh] = NULL;

+      }

+   }

+}

+

+

+/**

+ * Free/delete a shader program object.

+ * Called via ctx->Driver.DeleteShaderProgram().

+ */

+static void

+_mesa_delete_shader_program(struct gl_context *ctx, struct gl_shader_program *shProg)

+{

+   _mesa_free_shader_program_data(ctx, shProg);

+

+   talloc_free(shProg);

+}

+

+

+/**

+ * Lookup a GLSL program object.

+ */

+struct gl_shader_program *

+_mesa_lookup_shader_program(struct gl_context *ctx, GLuint name)

+{

+   struct gl_shader_program *shProg;

+   if (name) {

+      shProg = (struct gl_shader_program *)

+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);

+      /* Note that both gl_shader and gl_shader_program objects are kept

+       * in the same hash table.  Check the object's type to be sure it's

+       * what we're expecting.

+       */

+      if (shProg && shProg->Type != GL_SHADER_PROGRAM_MESA) {

+         return NULL;

+      }

+      return shProg;

+   }

+   return NULL;

+}

+

+

+/**

+ * As above, but record an error if program is not found.

+ */

+struct gl_shader_program *

+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,

+                                const char *caller)

+{

+   if (!name) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);

+      return NULL;

+   }

+   else {

+      struct gl_shader_program *shProg = (struct gl_shader_program *)

+         _mesa_HashLookup(ctx->Shared->ShaderObjects, name);

+      if (!shProg) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);

+         return NULL;

+      }

+      if (shProg->Type != GL_SHADER_PROGRAM_MESA) {

+         _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);

+         return NULL;

+      }

+      return shProg;

+   }

+}

+

+

+void

+_mesa_init_shader_object_functions(struct dd_function_table *driver)

+{

+   driver->NewShader = _mesa_new_shader;

+   driver->DeleteShader = _mesa_delete_shader;

+   driver->NewShaderProgram = _mesa_new_shader_program;

+   driver->DeleteShaderProgram = _mesa_delete_shader_program;

+   driver->CompileShader = _mesa_ir_compile_shader;

+   driver->LinkShader = _mesa_ir_link_shader;

+}

diff --git a/mesalib/src/mesa/main/shaderobj.h b/mesalib/src/mesa/main/shaderobj.h
index cbe7ae7b0..881856a02 100644
--- a/mesalib/src/mesa/main/shaderobj.h
+++ b/mesalib/src/mesa/main/shaderobj.h
@@ -1,134 +1,137 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 2004-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 SHADEROBJ_H
-#define SHADEROBJ_H
-
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "program/ir_to_mesa.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/**
- * Internal functions
- */
-
-extern void
-_mesa_init_shader_state(GLcontext * ctx);
-
-extern void
-_mesa_free_shader_state(GLcontext *ctx);
-
-
-extern void
-_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh);
-
-extern struct gl_shader *
-_mesa_lookup_shader(GLcontext *ctx, GLuint name);
-
-extern struct gl_shader *
-_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller);
-
-
-
-extern void
-_mesa_reference_shader_program(GLcontext *ctx,
-                               struct gl_shader_program **ptr,
-                               struct gl_shader_program *shProg);
-extern void
-_mesa_init_shader(GLcontext *ctx, struct gl_shader *shader);
-
-extern struct gl_shader *
-_mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type);
-
-extern void
-_mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog);
-
-extern struct gl_shader_program *
-_mesa_lookup_shader_program(GLcontext *ctx, GLuint name);
-
-extern struct gl_shader_program *
-_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
-                                const char *caller);
-
-extern void
-_mesa_clear_shader_program_data(GLcontext *ctx,
-                                struct gl_shader_program *shProg);
-
-extern void
-_mesa_free_shader_program_data(GLcontext *ctx,
-                               struct gl_shader_program *shProg);
-
-
-
-extern void
-_mesa_init_shader_object_functions(struct dd_function_table *driver);
-
-extern void
-_mesa_init_shader_state(GLcontext *ctx);
-
-extern void
-_mesa_free_shader_state(GLcontext *ctx);
-
-static INLINE GLuint
-_mesa_shader_type_to_index(GLenum v)
-{
-   switch(v)
-   {
-   case GL_VERTEX_SHADER:
-      return MESA_SHADER_VERTEX;
-   case GL_FRAGMENT_SHADER:
-      return MESA_SHADER_FRAGMENT;
-   case GL_GEOMETRY_SHADER:
-      return MESA_SHADER_GEOMETRY;
-   default:
-      ASSERT(0);
-      return ~0;
-   }
-}
-
-static INLINE GLenum
-_mesa_shader_index_to_type(GLuint i)
-{
-   GLenum enums[MESA_SHADER_TYPES] = {
-         GL_VERTEX_SHADER,
-         GL_FRAGMENT_SHADER,
-         GL_GEOMETRY_SHADER ,
-   };
-   if(i >= MESA_SHADER_TYPES)
-      return 0;
-   else
-      return enums[i];
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SHADEROBJ_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.3

+ *

+ * Copyright (C) 2004-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 SHADEROBJ_H

+#define SHADEROBJ_H

+

+

+#include "main/compiler.h"

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "program/ir_to_mesa.h"

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+/**

+ * Internal functions

+ */

+

+extern void

+_mesa_init_shader_state(struct gl_context * ctx);

+

+extern void

+_mesa_free_shader_state(struct gl_context *ctx);

+

+

+extern void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh);

+

+extern struct gl_shader *

+_mesa_lookup_shader(struct gl_context *ctx, GLuint name);

+

+extern struct gl_shader *

+_mesa_lookup_shader_err(struct gl_context *ctx, GLuint name, const char *caller);

+

+

+

+extern void

+_mesa_reference_shader_program(struct gl_context *ctx,

+                               struct gl_shader_program **ptr,

+                               struct gl_shader_program *shProg);

+extern void

+_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader);

+

+extern struct gl_shader *

+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);

+

+extern void

+_mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog);

+

+extern struct gl_shader_program *

+_mesa_lookup_shader_program(struct gl_context *ctx, GLuint name);

+

+extern struct gl_shader_program *

+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,

+                                const char *caller);

+

+extern void

+_mesa_clear_shader_program_data(struct gl_context *ctx,

+                                struct gl_shader_program *shProg);

+

+extern void

+_mesa_free_shader_program_data(struct gl_context *ctx,

+                               struct gl_shader_program *shProg);

+

+

+

+extern void

+_mesa_init_shader_object_functions(struct dd_function_table *driver);

+

+extern void

+_mesa_init_shader_state(struct gl_context *ctx);

+

+extern void

+_mesa_free_shader_state(struct gl_context *ctx);

+

+

+static INLINE gl_shader_type

+_mesa_shader_type_to_index(GLenum v)

+{

+   switch (v) {

+   case GL_VERTEX_SHADER:

+      return MESA_SHADER_VERTEX;

+   case GL_FRAGMENT_SHADER:

+      return MESA_SHADER_FRAGMENT;

+   case GL_GEOMETRY_SHADER:

+      return MESA_SHADER_GEOMETRY;

+   default:

+      ASSERT(0 && "bad value in _mesa_shader_type_to_index()");

+      return MESA_SHADER_TYPES;

+   }

+}

+

+

+static INLINE GLenum

+_mesa_shader_index_to_type(GLuint i)

+{

+   static const GLenum enums[MESA_SHADER_TYPES] = {

+      GL_VERTEX_SHADER,

+      GL_FRAGMENT_SHADER,

+      GL_GEOMETRY_SHADER ,

+   };

+   if (i >= MESA_SHADER_TYPES)

+      return 0;

+   else

+      return enums[i];

+}

+

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* SHADEROBJ_H */

diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c
index a56c70fa7..bfbddaaa0 100644
--- a/mesalib/src/mesa/main/shared.c
+++ b/mesalib/src/mesa/main/shared.c
@@ -1,390 +1,390 @@
-/*
- * 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
- * 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 shared.c
- * Shared-context state
- */
-
-
-
-#include "imports.h"
-#include "mtypes.h"
-#include "hash.h"
-#if FEATURE_ATI_fragment_shader
-#include "atifragshader.h"
-#endif
-#include "bufferobj.h"
-#include "shared.h"
-#include "program/program.h"
-#include "dlist.h"
-#include "shaderobj.h"
-#include "syncobj.h"
-
-/**
- * Allocate and initialize a shared context state structure.
- * Initializes the display list, texture objects and vertex programs hash
- * tables, allocates the texture objects. If it runs out of memory, frees
- * everything already allocated before returning NULL.
- *
- * \return pointer to a gl_shared_state structure on success, or NULL on
- * failure.
- */
-struct gl_shared_state *
-_mesa_alloc_shared_state(GLcontext *ctx)
-{
-   struct gl_shared_state *shared;
-   GLuint i;
-
-   shared = CALLOC_STRUCT(gl_shared_state);
-   if (!shared)
-      return NULL;
-
-   _glthread_INIT_MUTEX(shared->Mutex);
-
-   shared->DisplayList = _mesa_NewHashTable();
-   shared->TexObjects = _mesa_NewHashTable();
-   shared->Programs = _mesa_NewHashTable();
-
-#if FEATURE_ARB_vertex_program
-   shared->DefaultVertexProgram = (struct gl_vertex_program *)
-      ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
-#endif
-
-#if FEATURE_ARB_fragment_program
-   shared->DefaultFragmentProgram = (struct gl_fragment_program *)
-      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
-#endif
-
-#if FEATURE_ATI_fragment_shader
-   shared->ATIShaders = _mesa_NewHashTable();
-   shared->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0);
-#endif
-
-#if FEATURE_ARB_shader_objects
-   shared->ShaderObjects = _mesa_NewHashTable();
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
-   shared->BufferObjects = _mesa_NewHashTable();
-#endif
-
-   /* Allocate the default buffer object */
-   shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0);
-
-   /* Create default texture objects */
-   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
-      /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
-      static const GLenum targets[NUM_TEXTURE_TARGETS] = {
-         GL_TEXTURE_2D_ARRAY_EXT,
-         GL_TEXTURE_1D_ARRAY_EXT,
-         GL_TEXTURE_CUBE_MAP,
-         GL_TEXTURE_3D,
-         GL_TEXTURE_RECTANGLE_NV,
-         GL_TEXTURE_2D,
-         GL_TEXTURE_1D
-      };
-      shared->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
-   }
-
-   /* sanity check */
-   assert(shared->DefaultTex[TEXTURE_1D_INDEX]->RefCount == 1);
-
-   /* Mutex and timestamp for texobj state validation */
-   _glthread_INIT_MUTEX(shared->TexMutex);
-   shared->TextureStateStamp = 0;
-
-#if FEATURE_EXT_framebuffer_object
-   shared->FrameBuffers = _mesa_NewHashTable();
-   shared->RenderBuffers = _mesa_NewHashTable();
-#endif
-
-   make_empty_list(& shared->SyncObjects);
-
-   return shared;
-}
-
-
-/**
- * Callback for deleting a display list.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_displaylist_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_display_list *list = (struct gl_display_list *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_list(ctx, list);
-}
-
-
-/**
- * Callback for deleting a texture object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_texture_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_texture_object *texObj = (struct gl_texture_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   ctx->Driver.DeleteTexture(ctx, texObj);
-}
-
-
-/**
- * Callback for deleting a program object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_program_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_program *prog = (struct gl_program *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   if(prog != &_mesa_DummyProgram) {
-      ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
-      prog->RefCount = 0;  /* now going away */
-      ctx->Driver.DeleteProgram(ctx, prog);
-   }
-}
-
-
-#if FEATURE_ATI_fragment_shader
-/**
- * Callback for deleting an ATI fragment shader object.
- * Called by _mesa_HashDeleteAll().
- */
-static void
-delete_fragshader_cb(GLuint id, void *data, void *userData)
-{
-   struct ati_fragment_shader *shader = (struct ati_fragment_shader *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_ati_fragment_shader(ctx, shader);
-}
-#endif
-
-
-/**
- * Callback for deleting a buffer object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_bufferobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
-      bufObj->Pointer = NULL;
-   }
-   _mesa_reference_buffer_object(ctx, &bufObj, NULL);
-}
-
-
-/**
- * Callback for freeing shader program data. Call it before delete_shader_cb
- * to avoid memory access error.
- */
-static void
-free_shader_program_data_cb(GLuint id, void *data, void *userData)
-{
-   GLcontext *ctx = (GLcontext *) userData;
-   struct gl_shader_program *shProg = (struct gl_shader_program *) data;
-
-   if (shProg->Type == GL_SHADER_PROGRAM_MESA) {
-       _mesa_free_shader_program_data(ctx, shProg);
-   }
-}
-
-
-/**
- * Callback for deleting shader and shader programs objects.
- * Called by _mesa_HashDeleteAll().
- */
-static void
-delete_shader_cb(GLuint id, void *data, void *userData)
-{
-   GLcontext *ctx = (GLcontext *) userData;
-   struct gl_shader *sh = (struct gl_shader *) data;
-   if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) {
-      ctx->Driver.DeleteShader(ctx, sh);
-   }
-   else {
-      struct gl_shader_program *shProg = (struct gl_shader_program *) data;
-      ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA);
-      ctx->Driver.DeleteShaderProgram(ctx, shProg);
-   }
-}
-
-
-/**
- * Callback for deleting a framebuffer object.  Called by _mesa_HashDeleteAll()
- */
-static void
-delete_framebuffer_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
-   /* The fact that the framebuffer is in the hashtable means its refcount
-    * is one, but we're removing from the hashtable now.  So clear refcount.
-    */
-   /*assert(fb->RefCount == 1);*/
-   fb->RefCount = 0;
-
-   /* NOTE: Delete should always be defined but there are two reports
-    * of it being NULL (bugs 13507, 14293).  Work-around for now.
-    */
-   if (fb->Delete)
-      fb->Delete(fb);
-}
-
-
-/**
- * Callback for deleting a renderbuffer object. Called by _mesa_HashDeleteAll()
- */
-static void
-delete_renderbuffer_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
-   rb->RefCount = 0;  /* see comment for FBOs above */
-   if (rb->Delete)
-      rb->Delete(rb);
-}
-
-
-/**
- * Deallocate a shared state object and all children structures.
- *
- * \param ctx GL context.
- * \param shared shared state pointer.
- * 
- * Frees the display lists, the texture objects (calling the driver texture
- * deletion callback to free its private data) and the vertex programs, as well
- * as their hash tables.
- *
- * \sa alloc_shared_state().
- */
-static void
-free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
-{
-   GLuint i;
-
-   /* Free the dummy/fallback texture object */
-   if (shared->FallbackTex)
-      ctx->Driver.DeleteTexture(ctx, shared->FallbackTex);
-
-   /*
-    * Free display lists
-    */
-   _mesa_HashDeleteAll(shared->DisplayList, delete_displaylist_cb, ctx);
-   _mesa_DeleteHashTable(shared->DisplayList);
-
-#if FEATURE_ARB_shader_objects
-   _mesa_HashWalk(shared->ShaderObjects, free_shader_program_data_cb, ctx);
-   _mesa_HashDeleteAll(shared->ShaderObjects, delete_shader_cb, ctx);
-   _mesa_DeleteHashTable(shared->ShaderObjects);
-#endif
-
-   _mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);
-   _mesa_DeleteHashTable(shared->Programs);
-
-#if FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
-#endif
-
-#if FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL);
-#endif
-
-#if FEATURE_ATI_fragment_shader
-   _mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx);
-   _mesa_DeleteHashTable(shared->ATIShaders);
-   _mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader);
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
-   _mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx);
-   _mesa_DeleteHashTable(shared->BufferObjects);
-#endif
-
-#if FEATURE_EXT_framebuffer_object
-   _mesa_HashDeleteAll(shared->FrameBuffers, delete_framebuffer_cb, ctx);
-   _mesa_DeleteHashTable(shared->FrameBuffers);
-   _mesa_HashDeleteAll(shared->RenderBuffers, delete_renderbuffer_cb, ctx);
-   _mesa_DeleteHashTable(shared->RenderBuffers);
-#endif
-
-#if FEATURE_ARB_vertex_buffer_object
-   _mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL);
-#endif
-
-   {
-      struct simple_node *node;
-      struct simple_node *temp;
-
-      foreach_s(node, temp, & shared->SyncObjects) {
-	 _mesa_unref_sync_object(ctx, (struct gl_sync_object *) node);
-      }
-   }
-
-   /*
-    * Free texture objects (after FBOs since some textures might have
-    * been bound to FBOs).
-    */
-   ASSERT(ctx->Driver.DeleteTexture);
-   /* the default textures */
-   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
-      ctx->Driver.DeleteTexture(ctx, shared->DefaultTex[i]);
-   }
-
-   /* all other textures */
-   _mesa_HashDeleteAll(shared->TexObjects, delete_texture_cb, ctx);
-   _mesa_DeleteHashTable(shared->TexObjects);
-
-   _glthread_DESTROY_MUTEX(shared->Mutex);
-   _glthread_DESTROY_MUTEX(shared->TexMutex);
-
-   free(shared);
-}
-
-
-/**
- * Decrement shared state object reference count and potentially free it
- * and all children structures.
- *
- * \param ctx GL context.
- * \param shared shared state pointer.
- *
- * \sa free_shared_state().
- */
-void
-_mesa_release_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
-{
-   GLint RefCount;
-
-   _glthread_LOCK_MUTEX(shared->Mutex);
-   RefCount = --shared->RefCount;
-   _glthread_UNLOCK_MUTEX(shared->Mutex);
-
-   assert(RefCount >= 0);
-
-   if (RefCount == 0) {
-      /* free shared state */
-      free_shared_state( ctx, shared );
-   }
-}
+/*

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

+ * 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 shared.c

+ * Shared-context state

+ */

+

+

+

+#include "imports.h"

+#include "mtypes.h"

+#include "hash.h"

+#if FEATURE_ATI_fragment_shader

+#include "atifragshader.h"

+#endif

+#include "bufferobj.h"

+#include "shared.h"

+#include "program/program.h"

+#include "dlist.h"

+#include "shaderobj.h"

+#include "syncobj.h"

+

+/**

+ * Allocate and initialize a shared context state structure.

+ * Initializes the display list, texture objects and vertex programs hash

+ * tables, allocates the texture objects. If it runs out of memory, frees

+ * everything already allocated before returning NULL.

+ *

+ * \return pointer to a gl_shared_state structure on success, or NULL on

+ * failure.

+ */

+struct gl_shared_state *

+_mesa_alloc_shared_state(struct gl_context *ctx)

+{

+   struct gl_shared_state *shared;

+   GLuint i;

+

+   shared = CALLOC_STRUCT(gl_shared_state);

+   if (!shared)

+      return NULL;

+

+   _glthread_INIT_MUTEX(shared->Mutex);

+

+   shared->DisplayList = _mesa_NewHashTable();

+   shared->TexObjects = _mesa_NewHashTable();

+   shared->Programs = _mesa_NewHashTable();

+

+#if FEATURE_ARB_vertex_program

+   shared->DefaultVertexProgram = (struct gl_vertex_program *)

+      ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);

+#endif

+

+#if FEATURE_ARB_fragment_program

+   shared->DefaultFragmentProgram = (struct gl_fragment_program *)

+      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);

+#endif

+

+#if FEATURE_ATI_fragment_shader

+   shared->ATIShaders = _mesa_NewHashTable();

+   shared->DefaultFragmentShader = _mesa_new_ati_fragment_shader(ctx, 0);

+#endif

+

+#if FEATURE_ARB_shader_objects

+   shared->ShaderObjects = _mesa_NewHashTable();

+#endif

+

+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object

+   shared->BufferObjects = _mesa_NewHashTable();

+#endif

+

+   /* Allocate the default buffer object */

+   shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0);

+

+   /* Create default texture objects */

+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {

+      /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */

+      static const GLenum targets[NUM_TEXTURE_TARGETS] = {

+         GL_TEXTURE_2D_ARRAY_EXT,

+         GL_TEXTURE_1D_ARRAY_EXT,

+         GL_TEXTURE_CUBE_MAP,

+         GL_TEXTURE_3D,

+         GL_TEXTURE_RECTANGLE_NV,

+         GL_TEXTURE_2D,

+         GL_TEXTURE_1D

+      };

+      shared->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);

+   }

+

+   /* sanity check */

+   assert(shared->DefaultTex[TEXTURE_1D_INDEX]->RefCount == 1);

+

+   /* Mutex and timestamp for texobj state validation */

+   _glthread_INIT_MUTEX(shared->TexMutex);

+   shared->TextureStateStamp = 0;

+

+#if FEATURE_EXT_framebuffer_object

+   shared->FrameBuffers = _mesa_NewHashTable();

+   shared->RenderBuffers = _mesa_NewHashTable();

+#endif

+

+   make_empty_list(& shared->SyncObjects);

+

+   return shared;

+}

+

+

+/**

+ * Callback for deleting a display list.  Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_displaylist_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_display_list *list = (struct gl_display_list *) data;

+   struct gl_context *ctx = (struct gl_context *) userData;

+   _mesa_delete_list(ctx, list);

+}

+

+

+/**

+ * Callback for deleting a texture object.  Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_texture_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_texture_object *texObj = (struct gl_texture_object *) data;

+   struct gl_context *ctx = (struct gl_context *) userData;

+   ctx->Driver.DeleteTexture(ctx, texObj);

+}

+

+

+/**

+ * Callback for deleting a program object.  Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_program_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_program *prog = (struct gl_program *) data;

+   struct gl_context *ctx = (struct gl_context *) userData;

+   if(prog != &_mesa_DummyProgram) {

+      ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */

+      prog->RefCount = 0;  /* now going away */

+      ctx->Driver.DeleteProgram(ctx, prog);

+   }

+}

+

+

+#if FEATURE_ATI_fragment_shader

+/**

+ * Callback for deleting an ATI fragment shader object.

+ * Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_fragshader_cb(GLuint id, void *data, void *userData)

+{

+   struct ati_fragment_shader *shader = (struct ati_fragment_shader *) data;

+   struct gl_context *ctx = (struct gl_context *) userData;

+   _mesa_delete_ati_fragment_shader(ctx, shader);

+}

+#endif

+

+

+/**

+ * Callback for deleting a buffer object.  Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_bufferobj_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;

+   struct gl_context *ctx = (struct gl_context *) userData;

+   if (_mesa_bufferobj_mapped(bufObj)) {

+      ctx->Driver.UnmapBuffer(ctx, 0, bufObj);

+      bufObj->Pointer = NULL;

+   }

+   _mesa_reference_buffer_object(ctx, &bufObj, NULL);

+}

+

+

+/**

+ * Callback for freeing shader program data. Call it before delete_shader_cb

+ * to avoid memory access error.

+ */

+static void

+free_shader_program_data_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_context *ctx = (struct gl_context *) userData;

+   struct gl_shader_program *shProg = (struct gl_shader_program *) data;

+

+   if (shProg->Type == GL_SHADER_PROGRAM_MESA) {

+       _mesa_free_shader_program_data(ctx, shProg);

+   }

+}

+

+

+/**

+ * Callback for deleting shader and shader programs objects.

+ * Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_shader_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_context *ctx = (struct gl_context *) userData;

+   struct gl_shader *sh = (struct gl_shader *) data;

+   if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) {

+      ctx->Driver.DeleteShader(ctx, sh);

+   }

+   else {

+      struct gl_shader_program *shProg = (struct gl_shader_program *) data;

+      ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA);

+      ctx->Driver.DeleteShaderProgram(ctx, shProg);

+   }

+}

+

+

+/**

+ * Callback for deleting a framebuffer object.  Called by _mesa_HashDeleteAll()

+ */

+static void

+delete_framebuffer_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;

+   /* The fact that the framebuffer is in the hashtable means its refcount

+    * is one, but we're removing from the hashtable now.  So clear refcount.

+    */

+   /*assert(fb->RefCount == 1);*/

+   fb->RefCount = 0;

+

+   /* NOTE: Delete should always be defined but there are two reports

+    * of it being NULL (bugs 13507, 14293).  Work-around for now.

+    */

+   if (fb->Delete)

+      fb->Delete(fb);

+}

+

+

+/**

+ * Callback for deleting a renderbuffer object. Called by _mesa_HashDeleteAll()

+ */

+static void

+delete_renderbuffer_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;

+   rb->RefCount = 0;  /* see comment for FBOs above */

+   if (rb->Delete)

+      rb->Delete(rb);

+}

+

+

+/**

+ * Deallocate a shared state object and all children structures.

+ *

+ * \param ctx GL context.

+ * \param shared shared state pointer.

+ * 

+ * Frees the display lists, the texture objects (calling the driver texture

+ * deletion callback to free its private data) and the vertex programs, as well

+ * as their hash tables.

+ *

+ * \sa alloc_shared_state().

+ */

+static void

+free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)

+{

+   GLuint i;

+

+   /* Free the dummy/fallback texture object */

+   if (shared->FallbackTex)

+      ctx->Driver.DeleteTexture(ctx, shared->FallbackTex);

+

+   /*

+    * Free display lists

+    */

+   _mesa_HashDeleteAll(shared->DisplayList, delete_displaylist_cb, ctx);

+   _mesa_DeleteHashTable(shared->DisplayList);

+

+#if FEATURE_ARB_shader_objects

+   _mesa_HashWalk(shared->ShaderObjects, free_shader_program_data_cb, ctx);

+   _mesa_HashDeleteAll(shared->ShaderObjects, delete_shader_cb, ctx);

+   _mesa_DeleteHashTable(shared->ShaderObjects);

+#endif

+

+   _mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx);

+   _mesa_DeleteHashTable(shared->Programs);

+

+#if FEATURE_ARB_vertex_program

+   _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);

+#endif

+

+#if FEATURE_ARB_fragment_program

+   _mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL);

+#endif

+

+#if FEATURE_ATI_fragment_shader

+   _mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx);

+   _mesa_DeleteHashTable(shared->ATIShaders);

+   _mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader);

+#endif

+

+#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object

+   _mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx);

+   _mesa_DeleteHashTable(shared->BufferObjects);

+#endif

+

+#if FEATURE_EXT_framebuffer_object

+   _mesa_HashDeleteAll(shared->FrameBuffers, delete_framebuffer_cb, ctx);

+   _mesa_DeleteHashTable(shared->FrameBuffers);

+   _mesa_HashDeleteAll(shared->RenderBuffers, delete_renderbuffer_cb, ctx);

+   _mesa_DeleteHashTable(shared->RenderBuffers);

+#endif

+

+#if FEATURE_ARB_vertex_buffer_object

+   _mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL);

+#endif

+

+   {

+      struct simple_node *node;

+      struct simple_node *temp;

+

+      foreach_s(node, temp, & shared->SyncObjects) {

+	 _mesa_unref_sync_object(ctx, (struct gl_sync_object *) node);

+      }

+   }

+

+   /*

+    * Free texture objects (after FBOs since some textures might have

+    * been bound to FBOs).

+    */

+   ASSERT(ctx->Driver.DeleteTexture);

+   /* the default textures */

+   for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {

+      ctx->Driver.DeleteTexture(ctx, shared->DefaultTex[i]);

+   }

+

+   /* all other textures */

+   _mesa_HashDeleteAll(shared->TexObjects, delete_texture_cb, ctx);

+   _mesa_DeleteHashTable(shared->TexObjects);

+

+   _glthread_DESTROY_MUTEX(shared->Mutex);

+   _glthread_DESTROY_MUTEX(shared->TexMutex);

+

+   free(shared);

+}

+

+

+/**

+ * Decrement shared state object reference count and potentially free it

+ * and all children structures.

+ *

+ * \param ctx GL context.

+ * \param shared shared state pointer.

+ *

+ * \sa free_shared_state().

+ */

+void

+_mesa_release_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)

+{

+   GLint RefCount;

+

+   _glthread_LOCK_MUTEX(shared->Mutex);

+   RefCount = --shared->RefCount;

+   _glthread_UNLOCK_MUTEX(shared->Mutex);

+

+   assert(RefCount >= 0);

+

+   if (RefCount == 0) {

+      /* free shared state */

+      free_shared_state( ctx, shared );

+   }

+}

diff --git a/mesalib/src/mesa/main/shared.h b/mesalib/src/mesa/main/shared.h
index 5166a0ce5..870aadeb2 100644
--- a/mesalib/src/mesa/main/shared.h
+++ b/mesalib/src/mesa/main/shared.h
@@ -1,38 +1,38 @@
-/*
- * 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
- * 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 SHARED_H
-#define SHARED_H
-
-#include "mtypes.h"
-
-struct gl_shared_state *
-_mesa_alloc_shared_state(GLcontext *ctx);
-
-
-void
-_mesa_release_shared_state(GLcontext *ctx, struct gl_shared_state *shared);
-
-
-#endif
+/*

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

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

+#define SHARED_H

+

+struct gl_context;

+

+struct gl_shared_state *

+_mesa_alloc_shared_state(struct gl_context *ctx);

+

+

+void

+_mesa_release_shared_state(struct gl_context *ctx, struct gl_shared_state *shared);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index 4a3dffe4c..c07e2c380 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/src/mesa/main/state.c
@@ -1,734 +1,732 @@
-/*
- * 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 GLcontext.
- */
-
-
-#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(GLcontext *ctx)
-{
-   if (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( GLcontext *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(GLcontext *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(GLcontext *ctx)
-{
-   const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
-   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 (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
-      /* Use shader programs */
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
-                               shProg->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 (shProg && shProg->LinkStatus && shProg->GeometryProgram) {
-      /* Use shader programs */
-      _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current,
-                               shProg->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 (shProg && shProg->LinkStatus && shProg->VertexProgram) {
-      /* Use shader programs */
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
-                            shProg->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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *ctx)
-{
-   /* This is needed to support 1.1's RGB logic ops AND
-    * 1.0's blending logicops.
-    */
-   ctx->Color._LogicOpEnabled = RGBA_LOGICOP_ENABLED(ctx);
-}
-
-
-/*
- * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET
- * in ctx->_TriangleCaps if needed.
- */
-static void
-update_polygon(GLcontext *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(GLcontext *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.Size != 1.0F)
-         ctx->_TriangleCaps |= DD_POINT_SIZE;
-      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;
-      if (ctx->Line.Width != 1.0)
-         ctx->_TriangleCaps |= DD_LINE_WIDTH;
-   }
-
-   /*
-    * 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 (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 __GLcontextRec::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( GLcontext *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);
-   }
-   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_STENCIL | _NEW_BUFFERS))
-      _mesa_update_stencil( ctx );
-
-   if (new_state & _MESA_NEW_TRANSFER_STATE)
-      _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 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;
-}
-
-
-/* This is the usual entrypoint for state updates:
- */
-void
-_mesa_update_state( GLcontext *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( GLcontext *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(GLcontext *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 (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 = RGBA_LOGICOP_ENABLED(ctx);

+}

+

+

+/*

+ * 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 (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);

+   }

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

+      _mesa_update_stencil( ctx );

+

+   if (new_state & _MESA_NEW_TRANSFER_STATE)

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

+}

+

+

+/* 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/state.h b/mesalib/src/mesa/main/state.h
index 29db08a0b..6714196dc 100644
--- a/mesalib/src/mesa/main/state.h
+++ b/mesalib/src/mesa/main/state.h
@@ -1,49 +1,49 @@
-/*
- * 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.
- */
-
-
-#ifndef STATE_H
-#define STATE_H
-
-#include "mtypes.h"
-
-extern void
-_mesa_update_state(GLcontext *ctx);
-
-/* As above but can only be called between _mesa_lock_context_textures() and 
- * _mesa_unlock_context_textures().
- */
-extern void
-_mesa_update_state_locked(GLcontext *ctx);
-
-
-extern void
-_mesa_set_varying_vp_inputs(GLcontext *ctx, GLbitfield varying_inputs);
-
-
-extern void
-_mesa_set_vp_override(GLcontext *ctx, GLboolean flag);
-
-
-#endif
+/*

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

+ */

+

+

+#ifndef STATE_H

+#define STATE_H

+

+#include "mtypes.h"

+

+extern void

+_mesa_update_state(struct gl_context *ctx);

+

+/* As above but can only be called between _mesa_lock_context_textures() and 

+ * _mesa_unlock_context_textures().

+ */

+extern void

+_mesa_update_state_locked(struct gl_context *ctx);

+

+

+extern void

+_mesa_set_varying_vp_inputs(struct gl_context *ctx, GLbitfield varying_inputs);

+

+

+extern void

+_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/stencil.c b/mesalib/src/mesa/main/stencil.c
index 15c98e201..c63b14d27 100644
--- a/mesalib/src/mesa/main/stencil.c
+++ b/mesalib/src/mesa/main/stencil.c
@@ -1,590 +1,590 @@
-/*
- * 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(GLcontext *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(GLcontext *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
- * __GLcontextRec::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 (!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
- * __GLcontextRec::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 (!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;
-
-   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
- * __GLcontextRec::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;
-
-   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 (!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 (!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 (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 (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(GLcontext *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 __GLcontextRec::Stencil attribute group.
- */
-void
-_mesa_init_stencil(GLcontext *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 (!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 (!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;

+

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

+

+   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 (!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 (!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 (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 (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/stencil.h b/mesalib/src/mesa/main/stencil.h
index 252ac932a..f3a33db70 100644
--- a/mesalib/src/mesa/main/stencil.h
+++ b/mesalib/src/mesa/main/stencil.h
@@ -1,80 +1,81 @@
-/**
- * \file stencil.h
- * Stencil operations.
- */
-
-/*
- * 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 STENCIL_H
-#define STENCIL_H
-
-
-#include "mtypes.h"
-
-
-extern void GLAPIENTRY
-_mesa_ClearStencil( GLint s );
-
-
-extern void GLAPIENTRY
-_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask );
-
-
-extern void GLAPIENTRY
-_mesa_StencilMask( GLuint mask );
-
-
-extern void GLAPIENTRY
-_mesa_StencilOp( GLenum fail, GLenum zfail, GLenum zpass );
-
-
-extern void GLAPIENTRY
-_mesa_ActiveStencilFaceEXT(GLenum face);
-
-
-extern void GLAPIENTRY
-_mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-
-
-extern void GLAPIENTRY
-_mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
-
-
-extern void GLAPIENTRY
-_mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-
-extern void GLAPIENTRY
-_mesa_StencilMaskSeparate(GLenum face, GLuint mask);
-
-
-extern void
-_mesa_update_stencil(GLcontext *ctx);
-
-
-extern void 
-_mesa_init_stencil( GLcontext * ctx );
-
-#endif
+/**

+ * \file stencil.h

+ * Stencil operations.

+ */

+

+/*

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

+#define STENCIL_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_ClearStencil( GLint s );

+

+

+extern void GLAPIENTRY

+_mesa_StencilFunc( GLenum func, GLint ref, GLuint mask );

+

+

+extern void GLAPIENTRY

+_mesa_StencilMask( GLuint mask );

+

+

+extern void GLAPIENTRY

+_mesa_StencilOp( GLenum fail, GLenum zfail, GLenum zpass );

+

+

+extern void GLAPIENTRY

+_mesa_ActiveStencilFaceEXT(GLenum face);

+

+

+extern void GLAPIENTRY

+_mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);

+

+

+extern void GLAPIENTRY

+_mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);

+

+

+extern void GLAPIENTRY

+_mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);

+

+extern void GLAPIENTRY

+_mesa_StencilMaskSeparate(GLenum face, GLuint mask);

+

+

+extern void

+_mesa_update_stencil(struct gl_context *ctx);

+

+

+extern void 

+_mesa_init_stencil( struct gl_context * ctx );

+

+#endif

diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index ac948cc1e..eaffbfb9d 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -1,424 +1,424 @@
-/*
- * 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.
- */
-
-/**
- * \file syncobj.c
- * Sync object management.
- *
- * Unlike textures and other objects that are shared between contexts, sync
- * objects are not bound to the context.  As a result, the reference counting
- * and delete behavior of sync objects is slightly different.  References to
- * sync objects are added:
- *
- *    - By \c glFencSynce.  This sets the initial reference count to 1.
- *    - At the start of \c glClientWaitSync.  The reference is held for the
- *      duration of the wait call.
- *
- * References are removed:
- *
- *    - By \c glDeleteSync.
- *    - At the end of \c glClientWaitSync.
- *
- * Additionally, drivers may call \c _mesa_ref_sync_object and
- * \c _mesa_unref_sync_object as needed to implement \c ServerWaitSync.
- *
- * As with shader objects, sync object names become invalid as soon as
- * \c glDeleteSync is called.  For this reason \c glDeleteSync sets the
- * \c DeletePending flag.  All functions validate object handles by testing
- * this flag.
- *
- * \note
- * Only \c GL_ARB_sync objects are shared between contexts.  If support is ever
- * added for either \c GL_NV_fence or \c GL_APPLE_fence different semantics
- * will need to be implemented.
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "macros.h"
-#include "get.h"
-#include "dispatch.h"
-
-#if FEATURE_ARB_sync
-#include "syncobj.h"
-
-static struct gl_sync_object *
-_mesa_new_sync_object(GLcontext *ctx, GLenum type)
-{
-   struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object);
-   (void) ctx;
-   (void) type;
-
-   return s;
-}
-
-
-static void
-_mesa_delete_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
-{
-   (void) ctx;
-   free(syncObj);
-}
-
-
-static void
-_mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
-		 GLenum condition, GLbitfield flags)
-{
-   (void) ctx;
-   (void) condition;
-   (void) flags;
-
-   syncObj->StatusFlag = 1;
-}
-
-
-static void
-_mesa_check_sync(GLcontext *ctx, struct gl_sync_object *syncObj)
-{
-   (void) ctx;
-   (void) syncObj;
-
-   /* No-op for software rendering.  Hardware drivers will need to determine
-    * whether the state of the sync object has changed.
-    */
-}
-
-
-static void
-_mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
-		GLbitfield flags, GLuint64 timeout)
-{
-   (void) ctx;
-   (void) syncObj;
-   (void) flags;
-   (void) timeout;
-
-   /* No-op for software rendering.  Hardware drivers will need to wait until
-    * the state of the sync object changes or the timeout expires.
-    */
-}
-
-
-void
-_mesa_init_sync_object_functions(struct dd_function_table *driver)
-{
-   driver->NewSyncObject = _mesa_new_sync_object;
-   driver->FenceSync = _mesa_fence_sync;
-   driver->DeleteSyncObject = _mesa_delete_sync_object;
-   driver->CheckSync = _mesa_check_sync;
-
-   /* Use the same no-op wait function for both.
-    */
-   driver->ClientWaitSync = _mesa_wait_sync;
-   driver->ServerWaitSync = _mesa_wait_sync;
-}
-
-
-void
-_mesa_init_sync_dispatch(struct _glapi_table *disp)
-{
-   SET_IsSync(disp, _mesa_IsSync);
-   SET_DeleteSync(disp, _mesa_DeleteSync);
-   SET_FenceSync(disp, _mesa_FenceSync);
-   SET_ClientWaitSync(disp, _mesa_ClientWaitSync);
-   SET_WaitSync(disp, _mesa_WaitSync);
-   SET_GetInteger64v(disp, _mesa_GetInteger64v);
-   SET_GetSynciv(disp, _mesa_GetSynciv);
-}
-
-
-/**
- * Allocate/init the context state related to sync objects.
- */
-void
-_mesa_init_sync(GLcontext *ctx)
-{
-   (void) ctx;
-}
-
-
-/**
- * Free the context state related to sync objects.
- */
-void
-_mesa_free_sync_data(GLcontext *ctx)
-{
-   (void) ctx;
-}
-
-
-static int
-_mesa_validate_sync(struct gl_sync_object *syncObj)
-{
-   return (syncObj != NULL)
-      && (syncObj->Type == GL_SYNC_FENCE)
-      && !syncObj->DeletePending;
-}
-
-
-void
-_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
-{
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-   syncObj->RefCount++;
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-}
-
-
-void
-_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
-{
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-   syncObj->RefCount--;
-   if (syncObj->RefCount == 0) {
-      remove_from_list(& syncObj->link);
-      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-      ctx->Driver.DeleteSyncObject(ctx, syncObj);
-   } else {
-      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-   }
-}
-
-
-GLboolean GLAPIENTRY
-_mesa_IsSync(GLsync sync)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;
-}
-
-
-void GLAPIENTRY
-_mesa_DeleteSync(GLsync sync)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   /* From the GL_ARB_sync spec:
-    *
-    *    DeleteSync will silently ignore a <sync> value of zero. An
-    *    INVALID_VALUE error is generated if <sync> is neither zero nor the
-    *    name of a sync object.
-    */
-   if (sync == 0) {
-      return;
-   }
-
-   if (!_mesa_validate_sync(syncObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteSync");
-      return;
-   }
-
-   /* If there are no client-waits or server-waits pending on this sync, delete
-    * the underlying object.
-    */
-   syncObj->DeletePending = GL_TRUE;
-   _mesa_unref_sync_object(ctx, syncObj);
-}
-
-
-GLsync GLAPIENTRY
-_mesa_FenceSync(GLenum condition, GLbitfield flags)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *syncObj;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
-
-   if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",
-		  condition);
-      return 0;
-   }
-
-   if (flags != 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glFenceSync(flags=0x%x)",
-		  condition);
-      return 0;
-   }
-
-   syncObj = ctx->Driver.NewSyncObject(ctx, GL_SYNC_FENCE);
-   if (syncObj != NULL) {
-      syncObj->Type = GL_SYNC_FENCE;
-      /* The name is not currently used, and it is never visible to
-       * applications.  If sync support is extended to provide support for
-       * NV_fence, this field will be used.  We'll also need to add an object
-       * ID hashtable.
-       */
-      syncObj->Name = 1;
-      syncObj->RefCount = 1;
-      syncObj->DeletePending = GL_FALSE;
-      syncObj->SyncCondition = condition;
-      syncObj->Flags = flags;
-      syncObj->StatusFlag = 0;
-
-      ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
-
-      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-      insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);
-      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-      return (GLsync) syncObj;
-   }
-
-   return NULL;
-}
-
-
-GLenum GLAPIENTRY
-_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   GLenum ret;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
-
-   if (!_mesa_validate_sync(syncObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
-      return GL_WAIT_FAILED;
-   }
-
-   if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags);
-      return GL_WAIT_FAILED;
-   }
-
-   _mesa_ref_sync_object(ctx, syncObj);
-
-   /* From the GL_ARB_sync spec:
-    *
-    *    ClientWaitSync returns one of four status values. A return value of
-    *    ALREADY_SIGNALED indicates that <sync> was signaled at the time
-    *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned
-    *    if <sync> was signaled, even if the value of <timeout> is zero.
-    */
-   ctx->Driver.CheckSync(ctx, syncObj);
-   if (syncObj->StatusFlag) {
-      ret = GL_ALREADY_SIGNALED;
-   } else {
-      ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);
-
-      ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
-   }
-
-   _mesa_unref_sync_object(ctx, syncObj);
-   return ret;
-}
-
-
-void GLAPIENTRY
-_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!_mesa_validate_sync(syncObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
-      return;
-   }
-
-   if (flags != 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags);
-      return;
-   }
-
-   /* From the GL_ARB_sync spec:
-    *
-    *     If the value of <timeout> is zero, then WaitSync does nothing.
-    */
-   if (timeout == 0) {
-      return;
-   }
-
-   ctx->Driver.ServerWaitSync(ctx, syncObj, flags, timeout);
-}
-
-
-void GLAPIENTRY
-_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
-		GLint *values)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   GLsizei size = 0;
-   GLint v[1];
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!_mesa_validate_sync(syncObj)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
-      return;
-   }
-
-   switch (pname) {
-   case GL_OBJECT_TYPE:
-      v[0] = syncObj->Type;
-      size = 1;
-      break;
-
-   case GL_SYNC_CONDITION:
-      v[0] = syncObj->SyncCondition;
-      size = 1;
-      break;
-
-   case GL_SYNC_STATUS:
-      /* Update the state of the sync by dipping into the driver.  Note that
-       * this call won't block.  It just updates state in the common object
-       * data from the current driver state.
-       */
-      ctx->Driver.CheckSync(ctx, syncObj);
-
-      v[0] = (syncObj->StatusFlag) ? GL_SIGNALED : GL_UNSIGNALED;
-      size = 1;
-      break;
-
-   case GL_SYNC_FLAGS:
-      v[0] = syncObj->Flags;
-      size = 1;
-      break;
-
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSynciv(pname=0x%x)\n", pname);
-      return;
-   }
-
-   if (size > 0) {
-      const GLsizei copy_count = MIN2(size, bufSize);
-
-      memcpy(values, v, sizeof(GLint) * copy_count);
-   }
-
-   if (length != NULL) {
-      *length = size;
-   }
-}
-
-#endif /* FEATURE_ARB_sync */
+/*

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

+ */

+

+/**

+ * \file syncobj.c

+ * Sync object management.

+ *

+ * Unlike textures and other objects that are shared between contexts, sync

+ * objects are not bound to the context.  As a result, the reference counting

+ * and delete behavior of sync objects is slightly different.  References to

+ * sync objects are added:

+ *

+ *    - By \c glFencSynce.  This sets the initial reference count to 1.

+ *    - At the start of \c glClientWaitSync.  The reference is held for the

+ *      duration of the wait call.

+ *

+ * References are removed:

+ *

+ *    - By \c glDeleteSync.

+ *    - At the end of \c glClientWaitSync.

+ *

+ * Additionally, drivers may call \c _mesa_ref_sync_object and

+ * \c _mesa_unref_sync_object as needed to implement \c ServerWaitSync.

+ *

+ * As with shader objects, sync object names become invalid as soon as

+ * \c glDeleteSync is called.  For this reason \c glDeleteSync sets the

+ * \c DeletePending flag.  All functions validate object handles by testing

+ * this flag.

+ *

+ * \note

+ * Only \c GL_ARB_sync objects are shared between contexts.  If support is ever

+ * added for either \c GL_NV_fence or \c GL_APPLE_fence different semantics

+ * will need to be implemented.

+ *

+ * \author Ian Romanick <ian.d.romanick@intel.com>

+ */

+

+#include "glheader.h"

+#include "imports.h"

+#include "context.h"

+#include "macros.h"

+#include "get.h"

+#include "dispatch.h"

+

+#if FEATURE_ARB_sync

+#include "syncobj.h"

+

+static struct gl_sync_object *

+_mesa_new_sync_object(struct gl_context *ctx, GLenum type)

+{

+   struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object);

+   (void) ctx;

+   (void) type;

+

+   return s;

+}

+

+

+static void

+_mesa_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

+{

+   (void) ctx;

+   free(syncObj);

+}

+

+

+static void

+_mesa_fence_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,

+		 GLenum condition, GLbitfield flags)

+{

+   (void) ctx;

+   (void) condition;

+   (void) flags;

+

+   syncObj->StatusFlag = 1;

+}

+

+

+static void

+_mesa_check_sync(struct gl_context *ctx, struct gl_sync_object *syncObj)

+{

+   (void) ctx;

+   (void) syncObj;

+

+   /* No-op for software rendering.  Hardware drivers will need to determine

+    * whether the state of the sync object has changed.

+    */

+}

+

+

+static void

+_mesa_wait_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,

+		GLbitfield flags, GLuint64 timeout)

+{

+   (void) ctx;

+   (void) syncObj;

+   (void) flags;

+   (void) timeout;

+

+   /* No-op for software rendering.  Hardware drivers will need to wait until

+    * the state of the sync object changes or the timeout expires.

+    */

+}

+

+

+void

+_mesa_init_sync_object_functions(struct dd_function_table *driver)

+{

+   driver->NewSyncObject = _mesa_new_sync_object;

+   driver->FenceSync = _mesa_fence_sync;

+   driver->DeleteSyncObject = _mesa_delete_sync_object;

+   driver->CheckSync = _mesa_check_sync;

+

+   /* Use the same no-op wait function for both.

+    */

+   driver->ClientWaitSync = _mesa_wait_sync;

+   driver->ServerWaitSync = _mesa_wait_sync;

+}

+

+

+void

+_mesa_init_sync_dispatch(struct _glapi_table *disp)

+{

+   SET_IsSync(disp, _mesa_IsSync);

+   SET_DeleteSync(disp, _mesa_DeleteSync);

+   SET_FenceSync(disp, _mesa_FenceSync);

+   SET_ClientWaitSync(disp, _mesa_ClientWaitSync);

+   SET_WaitSync(disp, _mesa_WaitSync);

+   SET_GetInteger64v(disp, _mesa_GetInteger64v);

+   SET_GetSynciv(disp, _mesa_GetSynciv);

+}

+

+

+/**

+ * Allocate/init the context state related to sync objects.

+ */

+void

+_mesa_init_sync(struct gl_context *ctx)

+{

+   (void) ctx;

+}

+

+

+/**

+ * Free the context state related to sync objects.

+ */

+void

+_mesa_free_sync_data(struct gl_context *ctx)

+{

+   (void) ctx;

+}

+

+

+static int

+_mesa_validate_sync(struct gl_sync_object *syncObj)

+{

+   return (syncObj != NULL)

+      && (syncObj->Type == GL_SYNC_FENCE)

+      && !syncObj->DeletePending;

+}

+

+

+void

+_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

+{

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+   syncObj->RefCount++;

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+}

+

+

+void

+_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

+{

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+   syncObj->RefCount--;

+   if (syncObj->RefCount == 0) {

+      remove_from_list(& syncObj->link);

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+      ctx->Driver.DeleteSyncObject(ctx, syncObj);

+   } else {

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+   }

+}

+

+

+GLboolean GLAPIENTRY

+_mesa_IsSync(GLsync sync)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;

+}

+

+

+void GLAPIENTRY

+_mesa_DeleteSync(GLsync sync)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   /* From the GL_ARB_sync spec:

+    *

+    *    DeleteSync will silently ignore a <sync> value of zero. An

+    *    INVALID_VALUE error is generated if <sync> is neither zero nor the

+    *    name of a sync object.

+    */

+   if (sync == 0) {

+      return;

+   }

+

+   if (!_mesa_validate_sync(syncObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteSync");

+      return;

+   }

+

+   /* If there are no client-waits or server-waits pending on this sync, delete

+    * the underlying object.

+    */

+   syncObj->DeletePending = GL_TRUE;

+   _mesa_unref_sync_object(ctx, syncObj);

+}

+

+

+GLsync GLAPIENTRY

+_mesa_FenceSync(GLenum condition, GLbitfield flags)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_sync_object *syncObj;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

+

+   if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",

+		  condition);

+      return 0;

+   }

+

+   if (flags != 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glFenceSync(flags=0x%x)",

+		  condition);

+      return 0;

+   }

+

+   syncObj = ctx->Driver.NewSyncObject(ctx, GL_SYNC_FENCE);

+   if (syncObj != NULL) {

+      syncObj->Type = GL_SYNC_FENCE;

+      /* The name is not currently used, and it is never visible to

+       * applications.  If sync support is extended to provide support for

+       * NV_fence, this field will be used.  We'll also need to add an object

+       * ID hashtable.

+       */

+      syncObj->Name = 1;

+      syncObj->RefCount = 1;

+      syncObj->DeletePending = GL_FALSE;

+      syncObj->SyncCondition = condition;

+      syncObj->Flags = flags;

+      syncObj->StatusFlag = 0;

+

+      ctx->Driver.FenceSync(ctx, syncObj, condition, flags);

+

+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+      insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+      return (GLsync) syncObj;

+   }

+

+   return NULL;

+}

+

+

+GLenum GLAPIENTRY

+_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;

+   GLenum ret;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);

+

+   if (!_mesa_validate_sync(syncObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");

+      return GL_WAIT_FAILED;

+   }

+

+   if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags);

+      return GL_WAIT_FAILED;

+   }

+

+   _mesa_ref_sync_object(ctx, syncObj);

+

+   /* From the GL_ARB_sync spec:

+    *

+    *    ClientWaitSync returns one of four status values. A return value of

+    *    ALREADY_SIGNALED indicates that <sync> was signaled at the time

+    *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned

+    *    if <sync> was signaled, even if the value of <timeout> is zero.

+    */

+   ctx->Driver.CheckSync(ctx, syncObj);

+   if (syncObj->StatusFlag) {

+      ret = GL_ALREADY_SIGNALED;

+   } else {

+      ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);

+

+      ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;

+   }

+

+   _mesa_unref_sync_object(ctx, syncObj);

+   return ret;

+}

+

+

+void GLAPIENTRY

+_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!_mesa_validate_sync(syncObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");

+      return;

+   }

+

+   if (flags != 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags);

+      return;

+   }

+

+   /* From the GL_ARB_sync spec:

+    *

+    *     If the value of <timeout> is zero, then WaitSync does nothing.

+    */

+   if (timeout == 0) {

+      return;

+   }

+

+   ctx->Driver.ServerWaitSync(ctx, syncObj, flags, timeout);

+}

+

+

+void GLAPIENTRY

+_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,

+		GLint *values)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;

+   GLsizei size = 0;

+   GLint v[1];

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (!_mesa_validate_sync(syncObj)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");

+      return;

+   }

+

+   switch (pname) {

+   case GL_OBJECT_TYPE:

+      v[0] = syncObj->Type;

+      size = 1;

+      break;

+

+   case GL_SYNC_CONDITION:

+      v[0] = syncObj->SyncCondition;

+      size = 1;

+      break;

+

+   case GL_SYNC_STATUS:

+      /* Update the state of the sync by dipping into the driver.  Note that

+       * this call won't block.  It just updates state in the common object

+       * data from the current driver state.

+       */

+      ctx->Driver.CheckSync(ctx, syncObj);

+

+      v[0] = (syncObj->StatusFlag) ? GL_SIGNALED : GL_UNSIGNALED;

+      size = 1;

+      break;

+

+   case GL_SYNC_FLAGS:

+      v[0] = syncObj->Flags;

+      size = 1;

+      break;

+

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSynciv(pname=0x%x)\n", pname);

+      return;

+   }

+

+   if (size > 0) {

+      const GLsizei copy_count = MIN2(size, bufSize);

+

+      memcpy(values, v, sizeof(GLint) * copy_count);

+   }

+

+   if (length != NULL) {

+      *length = size;

+   }

+}

+

+#endif /* FEATURE_ARB_sync */

diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h
index 82e141d40..ac1384f61 100644
--- a/mesalib/src/mesa/main/syncobj.h
+++ b/mesalib/src/mesa/main/syncobj.h
@@ -1,115 +1,119 @@
-/*
- * 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.
- */
-
-/**
- * \file syncobj.h
- * Sync object management.
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-#ifndef SYNCOBJ_H
-#define SYNCOBJ_H
-
-#include "main/mtypes.h"
-
-struct dd_function_table;
-
-#if FEATURE_ARB_sync
-
-extern void
-_mesa_init_sync_object_functions(struct dd_function_table *driver);
-
-extern void
-_mesa_init_sync_dispatch(struct _glapi_table *disp);
-
-extern void
-_mesa_init_sync(GLcontext *);
-
-extern void
-_mesa_free_sync_data(GLcontext *);
-
-extern void
-_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
-
-extern void
-_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsSync(GLsync sync);
-
-extern void GLAPIENTRY
-_mesa_DeleteSync(GLsync sync);
-
-extern GLsync GLAPIENTRY
-_mesa_FenceSync(GLenum condition, GLbitfield flags);
-
-extern GLenum GLAPIENTRY
-_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-
-extern void GLAPIENTRY
-_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
-
-extern void GLAPIENTRY
-_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
-		GLint *values);
-
-#else /* FEATURE_ARB_sync */
-
-#include "main/compiler.h"
-
-static INLINE void
-_mesa_init_sync_object_functions(struct dd_function_table *driver)
-{
-}
-
-static INLINE void
-_mesa_init_sync_dispatch(struct _glapi_table *disp)
-{
-}
-
-static INLINE void
-_mesa_init_sync(GLcontext *ctx)
-{
-}
-
-static INLINE void
-_mesa_free_sync_data(GLcontext *ctx)
-{
-}
-
-static INLINE void
-_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
-{
-   ASSERT_NO_FEATURE();
-}
-
-#endif /* FEATURE_ARB_sync */
-
-#endif /* SYNCOBJ_H */
+/*

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

+ */

+

+/**

+ * \file syncobj.h

+ * Sync object management.

+ *

+ * \author Ian Romanick <ian.d.romanick@intel.com>

+ */

+

+#ifndef SYNCOBJ_H

+#define SYNCOBJ_H

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct dd_function_table;

+struct gl_context;

+struct gl_sync_object;

+

+#if FEATURE_ARB_sync

+

+extern void

+_mesa_init_sync_object_functions(struct dd_function_table *driver);

+

+extern void

+_mesa_init_sync_dispatch(struct _glapi_table *disp);

+

+extern void

+_mesa_init_sync(struct gl_context *);

+

+extern void

+_mesa_free_sync_data(struct gl_context *);

+

+extern void

+_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);

+

+extern void

+_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsSync(GLsync sync);

+

+extern void GLAPIENTRY

+_mesa_DeleteSync(GLsync sync);

+

+extern GLsync GLAPIENTRY

+_mesa_FenceSync(GLenum condition, GLbitfield flags);

+

+extern GLenum GLAPIENTRY

+_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);

+

+extern void GLAPIENTRY

+_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);

+

+extern void GLAPIENTRY

+_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,

+		GLint *values);

+

+#else /* FEATURE_ARB_sync */

+

+#include "main/compiler.h"

+

+static INLINE void

+_mesa_init_sync_object_functions(struct dd_function_table *driver)

+{

+}

+

+static INLINE void

+_mesa_init_sync_dispatch(struct _glapi_table *disp)

+{

+}

+

+static INLINE void

+_mesa_init_sync(struct gl_context *ctx)

+{

+}

+

+static INLINE void

+_mesa_free_sync_data(struct gl_context *ctx)

+{

+}

+

+static INLINE void

+_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

+{

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)

+{

+   ASSERT_NO_FEATURE();

+}

+

+#endif /* FEATURE_ARB_sync */

+

+#endif /* SYNCOBJ_H */

diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index e911524cb..52954ece4 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -1,247 +1,247 @@
-/*
- * 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 "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(GLcontext *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;
-      }
-   }
-   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;
-
-   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(GLcontext *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
-   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 "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;

+      }

+   }

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

+

+   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

+   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.h b/mesalib/src/mesa/main/texcompress.h
index 5e73a3149..fd42f6402 100644
--- a/mesalib/src/mesa/main/texcompress.h
+++ b/mesalib/src/mesa/main/texcompress.h
@@ -1,56 +1,59 @@
-/*
- * 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.
- */
-
-#ifndef TEXCOMPRESS_H
-#define TEXCOMPRESS_H
-
-#include "mtypes.h"
-#include "formats.h"
-
-#if _HAVE_FULL_GL
-
-extern GLuint
-_mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all);
-
-extern gl_format
-_mesa_glenum_to_compressed_format(GLenum format);
-
-extern GLenum
-_mesa_compressed_format_to_glenum(GLcontext *ctx, GLuint mesaFormat);
-
-extern GLubyte *
-_mesa_compressed_image_address(GLint col, GLint row, GLint img,
-                               gl_format mesaFormat,
-                               GLsizei width, const GLubyte *image);
-
-#else /* _HAVE_FULL_GL */
-
-/* no-op macros */
-#define _mesa_get_compressed_formats( c, f ) 0
-#define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0
-#define _mesa_compress_teximage( c, w, h, sF, s, sRS, dF, d, drs ) ((void)0)
-
-#endif /* _HAVE_FULL_GL */
-
-#endif /* TEXCOMPRESS_H */
+/*

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

+ */

+

+#ifndef TEXCOMPRESS_H

+#define TEXCOMPRESS_H

+

+#include "formats.h"

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_context;

+

+#if _HAVE_FULL_GL

+

+extern GLuint

+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all);

+

+extern gl_format

+_mesa_glenum_to_compressed_format(GLenum format);

+

+extern GLenum

+_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat);

+

+extern GLubyte *

+_mesa_compressed_image_address(GLint col, GLint row, GLint img,

+                               gl_format mesaFormat,

+                               GLsizei width, const GLubyte *image);

+

+#else /* _HAVE_FULL_GL */

+

+/* no-op macros */

+#define _mesa_get_compressed_formats( c, f ) 0

+#define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0

+#define _mesa_compress_teximage( c, w, h, sF, s, sRS, dF, d, drs ) ((void)0)

+

+#endif /* _HAVE_FULL_GL */

+

+#endif /* TEXCOMPRESS_H */

diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c
index c8b45bd3a..e6dd7f364 100644
--- a/mesalib/src/mesa/main/texcompress_fxt1.c
+++ b/mesalib/src/mesa/main/texcompress_fxt1.c
@@ -1,1653 +1,1650 @@
-/*
- * 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 texcompress_fxt1.c
- * GL_EXT_texture_compression_fxt1 support.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "convolve.h"
-#include "image.h"
-#include "macros.h"
-#include "mipmap.h"
-#include "texcompress.h"
-#include "texcompress_fxt1.h"
-#include "texstore.h"
-
-
-#if FEATURE_texture_fxt1
-
-
-static void
-fxt1_encode (GLuint width, GLuint height, GLint comps,
-             const void *source, GLint srcRowStride,
-             void *dest, GLint destRowStride);
-
-void
-fxt1_decode_1 (const void *texture, GLint stride,
-               GLint i, GLint j, GLchan *rgba);
-
-
-/**
- * Store user's image in rgb_fxt1 format.
- */
-GLboolean
-_mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS)
-{
-   const GLchan *pixels;
-   GLint srcRowStride;
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 8 / 16; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-
-   ASSERT(dstFormat == MESA_FORMAT_RGB_FXT1);
-   ASSERT(dstXoffset % 8 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset     == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   if (srcFormat != GL_RGB ||
-       srcType != CHAN_TYPE ||
-       ctx->_ImageTransferState ||
-       srcPacking->SwapBytes) {
-      /* convert image to RGB/GLchan */
-      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 */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      pixels = tempImage;
-      srcRowStride = 3 * srcWidth;
-      srcFormat = GL_RGB;
-   }
-   else {
-      pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
-   }
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-
-   fxt1_encode(srcWidth, srcHeight, 3, pixels, srcRowStride,
-               dst, dstRowStride);
-
-   if (tempImage)
-      free((void*) tempImage);
-
-   return GL_TRUE;
-}
-
-
-/**
- * Store user's image in rgba_fxt1 format.
- */
-GLboolean
-_mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
-{
-   const GLchan *pixels;
-   GLint srcRowStride;
-   GLubyte *dst;
-   GLint texWidth = dstRowStride * 8 / 16; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_FXT1);
-   ASSERT(dstXoffset % 8 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset     == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   if (srcFormat != GL_RGBA ||
-       srcType != CHAN_TYPE ||
-       ctx->_ImageTransferState ||
-       srcPacking->SwapBytes) {
-      /* convert image to RGBA/GLchan */
-      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 */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
-      srcFormat = GL_RGBA;
-   }
-   else {
-      pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
-   }
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-
-   fxt1_encode(srcWidth, srcHeight, 4, pixels, srcRowStride,
-               dst, dstRowStride);
-
-   if (tempImage)
-      free((void*) tempImage);
-
-   return GL_TRUE;
-}
-
-
-void
-_mesa_fetch_texel_2d_f_rgba_fxt1( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   (void) k;
-   fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, rgba);
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-
-void
-_mesa_fetch_texel_2d_f_rgb_fxt1( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   (void) k;
-   fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, rgba);
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = 1.0F;
-}
-
-
-
-/***************************************************************************\
- * FXT1 encoder
- *
- * The encoder was built by reversing the decoder,
- * and is vaguely based on Texus2 by 3dfx. Note that this code
- * is merely a proof of concept, since it is highly UNoptimized;
- * moreover, it is sub-optimal due to initial conditions passed
- * to Lloyd's algorithm (the interpolation modes are even worse).
-\***************************************************************************/
-
-
-#define MAX_COMP 4 /* ever needed maximum number of components in texel */
-#define MAX_VECT 4 /* ever needed maximum number of base vectors to find */
-#define N_TEXELS 32 /* number of texels in a block (always 32) */
-#define LL_N_REP 50 /* number of iterations in lloyd's vq */
-#define LL_RMS_D 10 /* fault tolerance (maximum delta) */
-#define LL_RMS_E 255 /* fault tolerance (maximum error) */
-#define ALPHA_TS 2 /* alpha threshold: (255 - ALPHA_TS) deemed opaque */
-#define ISTBLACK(v) (*((GLuint *)(v)) == 0)
-
-
-/*
- * Define a 64-bit unsigned integer type and macros
- */
-#if 1
-
-#define FX64_NATIVE 1
-
-typedef uint64_t Fx64;
-
-#define FX64_MOV32(a, b) a = b
-#define FX64_OR32(a, b)  a |= b
-#define FX64_SHL(a, c)   a <<= c
-
-#else
-
-#define FX64_NATIVE 0
-
-typedef struct {
-   GLuint lo, hi;
-} Fx64;
-
-#define FX64_MOV32(a, b) a.lo = b
-#define FX64_OR32(a, b)  a.lo |= b
-
-#define FX64_SHL(a, c)                                 \
-   do {                                                \
-       if ((c) >= 32) {                                \
-          a.hi = a.lo << ((c) - 32);                   \
-          a.lo = 0;                                    \
-       } else {                                        \
-          a.hi = (a.hi << (c)) | (a.lo >> (32 - (c))); \
-          a.lo <<= (c);                                \
-       }                                               \
-   } while (0)
-
-#endif
-
-
-#define F(i) (GLfloat)1 /* can be used to obtain an oblong metric: 0.30 / 0.59 / 0.11 */
-#define SAFECDOT 1 /* for paranoids */
-
-#define MAKEIVEC(NV, NC, IV, B, V0, V1)  \
-   do {                                  \
-      /* compute interpolation vector */ \
-      GLfloat d2 = 0.0F;                 \
-      GLfloat rd2;                       \
-                                         \
-      for (i = 0; i < NC; i++) {         \
-         IV[i] = (V1[i] - V0[i]) * F(i); \
-         d2 += IV[i] * IV[i];            \
-      }                                  \
-      rd2 = (GLfloat)NV / d2;            \
-      B = 0;                             \
-      for (i = 0; i < NC; i++) {         \
-         IV[i] *= F(i);                  \
-         B -= IV[i] * V0[i];             \
-         IV[i] *= rd2;                   \
-      }                                  \
-      B = B * rd2 + 0.5f;                \
-   } while (0)
-
-#define CALCCDOT(TEXEL, NV, NC, IV, B, V)\
-   do {                                  \
-      GLfloat dot = 0.0F;                \
-      for (i = 0; i < NC; i++) {         \
-         dot += V[i] * IV[i];            \
-      }                                  \
-      TEXEL = (GLint)(dot + B);          \
-      if (SAFECDOT) {                    \
-         if (TEXEL < 0) {                \
-            TEXEL = 0;                   \
-         } else if (TEXEL > NV) {        \
-            TEXEL = NV;                  \
-         }                               \
-      }                                  \
-   } while (0)
-
-
-static GLint
-fxt1_bestcol (GLfloat vec[][MAX_COMP], GLint nv,
-              GLubyte input[MAX_COMP], GLint nc)
-{
-   GLint i, j, best = -1;
-   GLfloat err = 1e9; /* big enough */
-
-   for (j = 0; j < nv; j++) {
-      GLfloat e = 0.0F;
-      for (i = 0; i < nc; i++) {
-         e += (vec[j][i] - input[i]) * (vec[j][i] - input[i]);
-      }
-      if (e < err) {
-         err = e;
-         best = j;
-      }
-   }
-
-   return best;
-}
-
-
-static GLint
-fxt1_worst (GLfloat vec[MAX_COMP],
-            GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)
-{
-   GLint i, k, worst = -1;
-   GLfloat err = -1.0F; /* small enough */
-
-   for (k = 0; k < n; k++) {
-      GLfloat e = 0.0F;
-      for (i = 0; i < nc; i++) {
-         e += (vec[i] - input[k][i]) * (vec[i] - input[k][i]);
-      }
-      if (e > err) {
-         err = e;
-         worst = k;
-      }
-   }
-
-   return worst;
-}
-
-
-static GLint
-fxt1_variance (GLdouble variance[MAX_COMP],
-               GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)
-{
-   GLint i, k, best = 0;
-   GLint sx, sx2;
-   GLdouble var, maxvar = -1; /* small enough */
-   GLdouble teenth = 1.0 / n;
-
-   for (i = 0; i < nc; i++) {
-      sx = sx2 = 0;
-      for (k = 0; k < n; k++) {
-         GLint t = input[k][i];
-         sx += t;
-         sx2 += t * t;
-      }
-      var = sx2 * teenth - sx * sx * teenth * teenth;
-      if (maxvar < var) {
-         maxvar = var;
-         best = i;
-      }
-      if (variance) {
-         variance[i] = var;
-      }
-   }
-
-   return best;
-}
-
-
-static GLint
-fxt1_choose (GLfloat vec[][MAX_COMP], GLint nv,
-             GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)
-{
-#if 0
-   /* Choose colors from a grid.
-    */
-   GLint i, j;
-
-   for (j = 0; j < nv; j++) {
-      GLint m = j * (n - 1) / (nv - 1);
-      for (i = 0; i < nc; i++) {
-         vec[j][i] = input[m][i];
-      }
-   }
-#else
-   /* Our solution here is to find the darkest and brightest colors in
-    * the 8x4 tile and use those as the two representative colors.
-    * There are probably better algorithms to use (histogram-based).
-    */
-   GLint i, j, k;
-   GLint minSum = 2000; /* big enough */
-   GLint maxSum = -1; /* small enough */
-   GLint minCol = 0; /* phoudoin: silent compiler! */
-   GLint maxCol = 0; /* phoudoin: silent compiler! */
-
-   struct {
-      GLint flag;
-      GLint key;
-      GLint freq;
-      GLint idx;
-   } hist[N_TEXELS];
-   GLint lenh = 0;
-
-   memset(hist, 0, sizeof(hist));
-
-   for (k = 0; k < n; k++) {
-      GLint l;
-      GLint key = 0;
-      GLint sum = 0;
-      for (i = 0; i < nc; i++) {
-         key <<= 8;
-         key |= input[k][i];
-         sum += input[k][i];
-      }
-      for (l = 0; l < n; l++) {
-         if (!hist[l].flag) {
-            /* alloc new slot */
-            hist[l].flag = !0;
-            hist[l].key = key;
-            hist[l].freq = 1;
-            hist[l].idx = k;
-            lenh = l + 1;
-            break;
-         } else if (hist[l].key == key) {
-            hist[l].freq++;
-            break;
-         }
-      }
-      if (minSum > sum) {
-         minSum = sum;
-         minCol = k;
-      }
-      if (maxSum < sum) {
-         maxSum = sum;
-         maxCol = k;
-      }
-   }
-
-   if (lenh <= nv) {
-      for (j = 0; j < lenh; j++) {
-         for (i = 0; i < nc; i++) {
-            vec[j][i] = (GLfloat)input[hist[j].idx][i];
-         }
-      }
-      for (; j < nv; j++) {
-         for (i = 0; i < nc; i++) {
-            vec[j][i] = vec[0][i];
-         }
-      }
-      return 0;
-   }
-
-   for (j = 0; j < nv; j++) {
-      for (i = 0; i < nc; i++) {
-         vec[j][i] = ((nv - 1 - j) * input[minCol][i] + j * input[maxCol][i] + (nv - 1) / 2) / (GLfloat)(nv - 1);
-      }
-   }
-#endif
-
-   return !0;
-}
-
-
-static GLint
-fxt1_lloyd (GLfloat vec[][MAX_COMP], GLint nv,
-            GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)
-{
-   /* Use the generalized lloyd's algorithm for VQ:
-    *     find 4 color vectors.
-    *
-    *     for each sample color
-    *         sort to nearest vector.
-    *
-    *     replace each vector with the centroid of its matching colors.
-    *
-    *     repeat until RMS doesn't improve.
-    *
-    *     if a color vector has no samples, or becomes the same as another
-    *     vector, replace it with the color which is farthest from a sample.
-    *
-    * vec[][MAX_COMP]           initial vectors and resulting colors
-    * nv                        number of resulting colors required
-    * input[N_TEXELS][MAX_COMP] input texels
-    * nc                        number of components in input / vec
-    * n                         number of input samples
-    */
-
-   GLint sum[MAX_VECT][MAX_COMP]; /* used to accumulate closest texels */
-   GLint cnt[MAX_VECT]; /* how many times a certain vector was chosen */
-   GLfloat error, lasterror = 1e9;
-
-   GLint i, j, k, rep;
-
-   /* the quantizer */
-   for (rep = 0; rep < LL_N_REP; rep++) {
-      /* reset sums & counters */
-      for (j = 0; j < nv; j++) {
-         for (i = 0; i < nc; i++) {
-            sum[j][i] = 0;
-         }
-         cnt[j] = 0;
-      }
-      error = 0;
-
-      /* scan whole block */
-      for (k = 0; k < n; k++) {
-#if 1
-         GLint best = -1;
-         GLfloat err = 1e9; /* big enough */
-         /* determine best vector */
-         for (j = 0; j < nv; j++) {
-            GLfloat e = (vec[j][0] - input[k][0]) * (vec[j][0] - input[k][0]) +
-                      (vec[j][1] - input[k][1]) * (vec[j][1] - input[k][1]) +
-                      (vec[j][2] - input[k][2]) * (vec[j][2] - input[k][2]);
-            if (nc == 4) {
-               e += (vec[j][3] - input[k][3]) * (vec[j][3] - input[k][3]);
-            }
-            if (e < err) {
-               err = e;
-               best = j;
-            }
-         }
-#else
-         GLint best = fxt1_bestcol(vec, nv, input[k], nc, &err);
-#endif
-         assert(best >= 0);
-         /* add in closest color */
-         for (i = 0; i < nc; i++) {
-            sum[best][i] += input[k][i];
-         }
-         /* mark this vector as used */
-         cnt[best]++;
-         /* accumulate error */
-         error += err;
-      }
-
-      /* check RMS */
-      if ((error < LL_RMS_E) ||
-          ((error < lasterror) && ((lasterror - error) < LL_RMS_D))) {
-         return !0; /* good match */
-      }
-      lasterror = error;
-
-      /* move each vector to the barycenter of its closest colors */
-      for (j = 0; j < nv; j++) {
-         if (cnt[j]) {
-            GLfloat div = 1.0F / cnt[j];
-            for (i = 0; i < nc; i++) {
-               vec[j][i] = div * sum[j][i];
-            }
-         } else {
-            /* this vec has no samples or is identical with a previous vec */
-            GLint worst = fxt1_worst(vec[j], input, nc, n);
-            for (i = 0; i < nc; i++) {
-               vec[j][i] = input[worst][i];
-            }
-         }
-      }
-   }
-
-   return 0; /* could not converge fast enough */
-}
-
-
-static void
-fxt1_quantize_CHROMA (GLuint *cc,
-                      GLubyte input[N_TEXELS][MAX_COMP])
-{
-   const GLint n_vect = 4; /* 4 base vectors to find */
-   const GLint n_comp = 3; /* 3 components: R, G, B */
-   GLfloat vec[MAX_VECT][MAX_COMP];
-   GLint i, j, k;
-   Fx64 hi; /* high quadword */
-   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */
-
-   if (fxt1_choose(vec, n_vect, input, n_comp, N_TEXELS) != 0) {
-      fxt1_lloyd(vec, n_vect, input, n_comp, N_TEXELS);
-   }
-
-   FX64_MOV32(hi, 4); /* cc-chroma = "010" + unused bit */
-   for (j = n_vect - 1; j >= 0; j--) {
-      for (i = 0; i < n_comp; i++) {
-         /* add in colors */
-         FX64_SHL(hi, 5);
-         FX64_OR32(hi, (GLuint)(vec[j][i] / 8.0F));
-      }
-   }
-   ((Fx64 *)cc)[1] = hi;
-
-   lohi = lolo = 0;
-   /* right microtile */
-   for (k = N_TEXELS - 1; k >= N_TEXELS/2; k--) {
-      lohi <<= 2;
-      lohi |= fxt1_bestcol(vec, n_vect, input[k], n_comp);
-   }
-   /* left microtile */
-   for (; k >= 0; k--) {
-      lolo <<= 2;
-      lolo |= fxt1_bestcol(vec, n_vect, input[k], n_comp);
-   }
-   cc[1] = lohi;
-   cc[0] = lolo;
-}
-
-
-static void
-fxt1_quantize_ALPHA0 (GLuint *cc,
-                      GLubyte input[N_TEXELS][MAX_COMP],
-                      GLubyte reord[N_TEXELS][MAX_COMP], GLint n)
-{
-   const GLint n_vect = 3; /* 3 base vectors to find */
-   const GLint n_comp = 4; /* 4 components: R, G, B, A */
-   GLfloat vec[MAX_VECT][MAX_COMP];
-   GLint i, j, k;
-   Fx64 hi; /* high quadword */
-   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */
-
-   /* the last vector indicates zero */
-   for (i = 0; i < n_comp; i++) {
-      vec[n_vect][i] = 0;
-   }
-
-   /* the first n texels in reord are guaranteed to be non-zero */
-   if (fxt1_choose(vec, n_vect, reord, n_comp, n) != 0) {
-      fxt1_lloyd(vec, n_vect, reord, n_comp, n);
-   }
-
-   FX64_MOV32(hi, 6); /* alpha = "011" + lerp = 0 */
-   for (j = n_vect - 1; j >= 0; j--) {
-      /* add in alphas */
-      FX64_SHL(hi, 5);
-      FX64_OR32(hi, (GLuint)(vec[j][ACOMP] / 8.0F));
-   }
-   for (j = n_vect - 1; j >= 0; j--) {
-      for (i = 0; i < n_comp - 1; i++) {
-         /* add in colors */
-         FX64_SHL(hi, 5);
-         FX64_OR32(hi, (GLuint)(vec[j][i] / 8.0F));
-      }
-   }
-   ((Fx64 *)cc)[1] = hi;
-
-   lohi = lolo = 0;
-   /* right microtile */
-   for (k = N_TEXELS - 1; k >= N_TEXELS/2; k--) {
-      lohi <<= 2;
-      lohi |= fxt1_bestcol(vec, n_vect + 1, input[k], n_comp);
-   }
-   /* left microtile */
-   for (; k >= 0; k--) {
-      lolo <<= 2;
-      lolo |= fxt1_bestcol(vec, n_vect + 1, input[k], n_comp);
-   }
-   cc[1] = lohi;
-   cc[0] = lolo;
-}
-
-
-static void
-fxt1_quantize_ALPHA1 (GLuint *cc,
-                      GLubyte input[N_TEXELS][MAX_COMP])
-{
-   const GLint n_vect = 3; /* highest vector number in each microtile */
-   const GLint n_comp = 4; /* 4 components: R, G, B, A */
-   GLfloat vec[1 + 1 + 1][MAX_COMP]; /* 1.5 extrema for each sub-block */
-   GLfloat b, iv[MAX_COMP]; /* interpolation vector */
-   GLint i, j, k;
-   Fx64 hi; /* high quadword */
-   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */
-
-   GLint minSum;
-   GLint maxSum;
-   GLint minColL = 0, maxColL = 0;
-   GLint minColR = 0, maxColR = 0;
-   GLint sumL = 0, sumR = 0;
-   GLint nn_comp;
-   /* Our solution here is to find the darkest and brightest colors in
-    * the 4x4 tile and use those as the two representative colors.
-    * There are probably better algorithms to use (histogram-based).
-    */
-   nn_comp = n_comp;
-   while ((minColL == maxColL) && nn_comp) {
-       minSum = 2000; /* big enough */
-       maxSum = -1; /* small enough */
-       for (k = 0; k < N_TEXELS / 2; k++) {
-           GLint sum = 0;
-           for (i = 0; i < nn_comp; i++) {
-               sum += input[k][i];
-           }
-           if (minSum > sum) {
-               minSum = sum;
-               minColL = k;
-           }
-           if (maxSum < sum) {
-               maxSum = sum;
-               maxColL = k;
-           }
-           sumL += sum;
-       }
-       
-       nn_comp--;
-   }
-
-   nn_comp = n_comp;
-   while ((minColR == maxColR) && nn_comp) {
-       minSum = 2000; /* big enough */
-       maxSum = -1; /* small enough */
-       for (k = N_TEXELS / 2; k < N_TEXELS; k++) {
-           GLint sum = 0;
-           for (i = 0; i < nn_comp; i++) {
-               sum += input[k][i];
-           }
-           if (minSum > sum) {
-               minSum = sum;
-               minColR = k;
-           }
-           if (maxSum < sum) {
-               maxSum = sum;
-               maxColR = k;
-           }
-           sumR += sum;
-       }
-
-       nn_comp--;
-   }
-
-   /* choose the common vector (yuck!) */
-   {
-      GLint j1, j2;
-      GLint v1 = 0, v2 = 0;
-      GLfloat err = 1e9; /* big enough */
-      GLfloat tv[2 * 2][MAX_COMP]; /* 2 extrema for each sub-block */
-      for (i = 0; i < n_comp; i++) {
-         tv[0][i] = input[minColL][i];
-         tv[1][i] = input[maxColL][i];
-         tv[2][i] = input[minColR][i];
-         tv[3][i] = input[maxColR][i];
-      }
-      for (j1 = 0; j1 < 2; j1++) {
-         for (j2 = 2; j2 < 4; j2++) {
-            GLfloat e = 0.0F;
-            for (i = 0; i < n_comp; i++) {
-               e += (tv[j1][i] - tv[j2][i]) * (tv[j1][i] - tv[j2][i]);
-            }
-            if (e < err) {
-               err = e;
-               v1 = j1;
-               v2 = j2;
-            }
-         }
-      }
-      for (i = 0; i < n_comp; i++) {
-         vec[0][i] = tv[1 - v1][i];
-         vec[1][i] = (tv[v1][i] * sumL + tv[v2][i] * sumR) / (sumL + sumR);
-         vec[2][i] = tv[5 - v2][i];
-      }
-   }
-
-   /* left microtile */
-   cc[0] = 0;
-   if (minColL != maxColL) {
-      /* compute interpolation vector */
-      MAKEIVEC(n_vect, n_comp, iv, b, vec[0], vec[1]);
-
-      /* add in texels */
-      lolo = 0;
-      for (k = N_TEXELS / 2 - 1; k >= 0; k--) {
-         GLint texel;
-         /* interpolate color */
-         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-         /* add in texel */
-         lolo <<= 2;
-         lolo |= texel;
-      }
-      
-      cc[0] = lolo;
-   }
-
-   /* right microtile */
-   cc[1] = 0;
-   if (minColR != maxColR) {
-      /* compute interpolation vector */
-      MAKEIVEC(n_vect, n_comp, iv, b, vec[2], vec[1]);
-
-      /* add in texels */
-      lohi = 0;
-      for (k = N_TEXELS - 1; k >= N_TEXELS / 2; k--) {
-         GLint texel;
-         /* interpolate color */
-         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-         /* add in texel */
-         lohi <<= 2;
-         lohi |= texel;
-      }
-
-      cc[1] = lohi;
-   }
-
-   FX64_MOV32(hi, 7); /* alpha = "011" + lerp = 1 */
-   for (j = n_vect - 1; j >= 0; j--) {
-      /* add in alphas */
-      FX64_SHL(hi, 5);
-      FX64_OR32(hi, (GLuint)(vec[j][ACOMP] / 8.0F));
-   }
-   for (j = n_vect - 1; j >= 0; j--) {
-      for (i = 0; i < n_comp - 1; i++) {
-         /* add in colors */
-         FX64_SHL(hi, 5);
-         FX64_OR32(hi, (GLuint)(vec[j][i] / 8.0F));
-      }
-   }
-   ((Fx64 *)cc)[1] = hi;
-}
-
-
-static void
-fxt1_quantize_HI (GLuint *cc,
-                  GLubyte input[N_TEXELS][MAX_COMP],
-                  GLubyte reord[N_TEXELS][MAX_COMP], GLint n)
-{
-   const GLint n_vect = 6; /* highest vector number */
-   const GLint n_comp = 3; /* 3 components: R, G, B */
-   GLfloat b = 0.0F;       /* phoudoin: silent compiler! */
-   GLfloat iv[MAX_COMP];   /* interpolation vector */
-   GLint i, k;
-   GLuint hihi; /* high quadword: hi dword */
-
-   GLint minSum = 2000; /* big enough */
-   GLint maxSum = -1; /* small enough */
-   GLint minCol = 0; /* phoudoin: silent compiler! */
-   GLint maxCol = 0; /* phoudoin: silent compiler! */
-
-   /* Our solution here is to find the darkest and brightest colors in
-    * the 8x4 tile and use those as the two representative colors.
-    * There are probably better algorithms to use (histogram-based).
-    */
-   for (k = 0; k < n; k++) {
-      GLint sum = 0;
-      for (i = 0; i < n_comp; i++) {
-         sum += reord[k][i];
-      }
-      if (minSum > sum) {
-         minSum = sum;
-         minCol = k;
-      }
-      if (maxSum < sum) {
-         maxSum = sum;
-         maxCol = k;
-      }
-   }
-
-   hihi = 0; /* cc-hi = "00" */
-   for (i = 0; i < n_comp; i++) {
-      /* add in colors */
-      hihi <<= 5;
-      hihi |= reord[maxCol][i] >> 3;
-   }
-   for (i = 0; i < n_comp; i++) {
-      /* add in colors */
-      hihi <<= 5;
-      hihi |= reord[minCol][i] >> 3;
-   }
-   cc[3] = hihi;
-   cc[0] = cc[1] = cc[2] = 0;
-
-   /* compute interpolation vector */
-   if (minCol != maxCol) {
-      MAKEIVEC(n_vect, n_comp, iv, b, reord[minCol], reord[maxCol]);
-   }
-
-   /* add in texels */
-   for (k = N_TEXELS - 1; k >= 0; k--) {
-      GLint t = k * 3;
-      GLuint *kk = (GLuint *)((char *)cc + t / 8);
-      GLint texel = n_vect + 1; /* transparent black */
-
-      if (!ISTBLACK(input[k])) {
-         if (minCol != maxCol) {
-            /* interpolate color */
-            CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-            /* add in texel */
-            kk[0] |= texel << (t & 7);
-         }
-      } else {
-         /* add in texel */
-         kk[0] |= texel << (t & 7);
-      }
-   }
-}
-
-
-static void
-fxt1_quantize_MIXED1 (GLuint *cc,
-                      GLubyte input[N_TEXELS][MAX_COMP])
-{
-   const GLint n_vect = 2; /* highest vector number in each microtile */
-   const GLint n_comp = 3; /* 3 components: R, G, B */
-   GLubyte vec[2 * 2][MAX_COMP]; /* 2 extrema for each sub-block */
-   GLfloat b, iv[MAX_COMP]; /* interpolation vector */
-   GLint i, j, k;
-   Fx64 hi; /* high quadword */
-   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */
-
-   GLint minSum;
-   GLint maxSum;
-   GLint minColL = 0, maxColL = -1;
-   GLint minColR = 0, maxColR = -1;
-
-   /* Our solution here is to find the darkest and brightest colors in
-    * the 4x4 tile and use those as the two representative colors.
-    * There are probably better algorithms to use (histogram-based).
-    */
-   minSum = 2000; /* big enough */
-   maxSum = -1; /* small enough */
-   for (k = 0; k < N_TEXELS / 2; k++) {
-      if (!ISTBLACK(input[k])) {
-         GLint sum = 0;
-         for (i = 0; i < n_comp; i++) {
-            sum += input[k][i];
-         }
-         if (minSum > sum) {
-            minSum = sum;
-            minColL = k;
-         }
-         if (maxSum < sum) {
-            maxSum = sum;
-            maxColL = k;
-         }
-      }
-   }
-   minSum = 2000; /* big enough */
-   maxSum = -1; /* small enough */
-   for (; k < N_TEXELS; k++) {
-      if (!ISTBLACK(input[k])) {
-         GLint sum = 0;
-         for (i = 0; i < n_comp; i++) {
-            sum += input[k][i];
-         }
-         if (minSum > sum) {
-            minSum = sum;
-            minColR = k;
-         }
-         if (maxSum < sum) {
-            maxSum = sum;
-            maxColR = k;
-         }
-      }
-   }
-
-   /* left microtile */
-   if (maxColL == -1) {
-      /* all transparent black */
-      cc[0] = ~0u;
-      for (i = 0; i < n_comp; i++) {
-         vec[0][i] = 0;
-         vec[1][i] = 0;
-      }
-   } else {
-      cc[0] = 0;
-      for (i = 0; i < n_comp; i++) {
-         vec[0][i] = input[minColL][i];
-         vec[1][i] = input[maxColL][i];
-      }
-      if (minColL != maxColL) {
-         /* compute interpolation vector */
-         MAKEIVEC(n_vect, n_comp, iv, b, vec[0], vec[1]);
-
-         /* add in texels */
-         lolo = 0;
-         for (k = N_TEXELS / 2 - 1; k >= 0; k--) {
-            GLint texel = n_vect + 1; /* transparent black */
-            if (!ISTBLACK(input[k])) {
-               /* interpolate color */
-               CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-            }
-            /* add in texel */
-            lolo <<= 2;
-            lolo |= texel;
-         }
-         cc[0] = lolo;
-      }
-   }
-
-   /* right microtile */
-   if (maxColR == -1) {
-      /* all transparent black */
-      cc[1] = ~0u;
-      for (i = 0; i < n_comp; i++) {
-         vec[2][i] = 0;
-         vec[3][i] = 0;
-      }
-   } else {
-      cc[1] = 0;
-      for (i = 0; i < n_comp; i++) {
-         vec[2][i] = input[minColR][i];
-         vec[3][i] = input[maxColR][i];
-      }
-      if (minColR != maxColR) {
-         /* compute interpolation vector */
-         MAKEIVEC(n_vect, n_comp, iv, b, vec[2], vec[3]);
-
-         /* add in texels */
-         lohi = 0;
-         for (k = N_TEXELS - 1; k >= N_TEXELS / 2; k--) {
-            GLint texel = n_vect + 1; /* transparent black */
-            if (!ISTBLACK(input[k])) {
-               /* interpolate color */
-               CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-            }
-            /* add in texel */
-            lohi <<= 2;
-            lohi |= texel;
-         }
-         cc[1] = lohi;
-      }
-   }
-
-   FX64_MOV32(hi, 9 | (vec[3][GCOMP] & 4) | ((vec[1][GCOMP] >> 1) & 2)); /* chroma = "1" */
-   for (j = 2 * 2 - 1; j >= 0; j--) {
-      for (i = 0; i < n_comp; i++) {
-         /* add in colors */
-         FX64_SHL(hi, 5);
-         FX64_OR32(hi, vec[j][i] >> 3);
-      }
-   }
-   ((Fx64 *)cc)[1] = hi;
-}
-
-
-static void
-fxt1_quantize_MIXED0 (GLuint *cc,
-                      GLubyte input[N_TEXELS][MAX_COMP])
-{
-   const GLint n_vect = 3; /* highest vector number in each microtile */
-   const GLint n_comp = 3; /* 3 components: R, G, B */
-   GLubyte vec[2 * 2][MAX_COMP]; /* 2 extrema for each sub-block */
-   GLfloat b, iv[MAX_COMP]; /* interpolation vector */
-   GLint i, j, k;
-   Fx64 hi; /* high quadword */
-   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */
-
-   GLint minColL = 0, maxColL = 0;
-   GLint minColR = 0, maxColR = 0;
-#if 0
-   GLint minSum;
-   GLint maxSum;
-
-   /* Our solution here is to find the darkest and brightest colors in
-    * the 4x4 tile and use those as the two representative colors.
-    * There are probably better algorithms to use (histogram-based).
-    */
-   minSum = 2000; /* big enough */
-   maxSum = -1; /* small enough */
-   for (k = 0; k < N_TEXELS / 2; k++) {
-      GLint sum = 0;
-      for (i = 0; i < n_comp; i++) {
-         sum += input[k][i];
-      }
-      if (minSum > sum) {
-         minSum = sum;
-         minColL = k;
-      }
-      if (maxSum < sum) {
-         maxSum = sum;
-         maxColL = k;
-      }
-   }
-   minSum = 2000; /* big enough */
-   maxSum = -1; /* small enough */
-   for (; k < N_TEXELS; k++) {
-      GLint sum = 0;
-      for (i = 0; i < n_comp; i++) {
-         sum += input[k][i];
-      }
-      if (minSum > sum) {
-         minSum = sum;
-         minColR = k;
-      }
-      if (maxSum < sum) {
-         maxSum = sum;
-         maxColR = k;
-      }
-   }
-#else
-   GLint minVal;
-   GLint maxVal;
-   GLint maxVarL = fxt1_variance(NULL, input, n_comp, N_TEXELS / 2);
-   GLint maxVarR = fxt1_variance(NULL, &input[N_TEXELS / 2], n_comp, N_TEXELS / 2);
-
-   /* Scan the channel with max variance for lo & hi
-    * and use those as the two representative colors.
-    */
-   minVal = 2000; /* big enough */
-   maxVal = -1; /* small enough */
-   for (k = 0; k < N_TEXELS / 2; k++) {
-      GLint t = input[k][maxVarL];
-      if (minVal > t) {
-         minVal = t;
-         minColL = k;
-      }
-      if (maxVal < t) {
-         maxVal = t;
-         maxColL = k;
-      }
-   }
-   minVal = 2000; /* big enough */
-   maxVal = -1; /* small enough */
-   for (; k < N_TEXELS; k++) {
-      GLint t = input[k][maxVarR];
-      if (minVal > t) {
-         minVal = t;
-         minColR = k;
-      }
-      if (maxVal < t) {
-         maxVal = t;
-         maxColR = k;
-      }
-   }
-#endif
-
-   /* left microtile */
-   cc[0] = 0;
-   for (i = 0; i < n_comp; i++) {
-      vec[0][i] = input[minColL][i];
-      vec[1][i] = input[maxColL][i];
-   }
-   if (minColL != maxColL) {
-      /* compute interpolation vector */
-      MAKEIVEC(n_vect, n_comp, iv, b, vec[0], vec[1]);
-
-      /* add in texels */
-      lolo = 0;
-      for (k = N_TEXELS / 2 - 1; k >= 0; k--) {
-         GLint texel;
-         /* interpolate color */
-         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-         /* add in texel */
-         lolo <<= 2;
-         lolo |= texel;
-      }
-
-      /* funky encoding for LSB of green */
-      if ((GLint)((lolo >> 1) & 1) != (((vec[1][GCOMP] ^ vec[0][GCOMP]) >> 2) & 1)) {
-         for (i = 0; i < n_comp; i++) {
-            vec[1][i] = input[minColL][i];
-            vec[0][i] = input[maxColL][i];
-         }
-         lolo = ~lolo;
-      }
-      
-      cc[0] = lolo;
-   }
-
-   /* right microtile */
-   cc[1] = 0;
-   for (i = 0; i < n_comp; i++) {
-      vec[2][i] = input[minColR][i];
-      vec[3][i] = input[maxColR][i];
-   }
-   if (minColR != maxColR) {
-      /* compute interpolation vector */
-      MAKEIVEC(n_vect, n_comp, iv, b, vec[2], vec[3]);
-
-      /* add in texels */
-      lohi = 0;
-      for (k = N_TEXELS - 1; k >= N_TEXELS / 2; k--) {
-         GLint texel;
-         /* interpolate color */
-         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);
-         /* add in texel */
-         lohi <<= 2;
-         lohi |= texel;
-      }
-
-      /* funky encoding for LSB of green */
-      if ((GLint)((lohi >> 1) & 1) != (((vec[3][GCOMP] ^ vec[2][GCOMP]) >> 2) & 1)) {
-         for (i = 0; i < n_comp; i++) {
-            vec[3][i] = input[minColR][i];
-            vec[2][i] = input[maxColR][i];
-         }
-         lohi = ~lohi;
-      }
-
-      cc[1] = lohi;
-   }
-
-   FX64_MOV32(hi, 8 | (vec[3][GCOMP] & 4) | ((vec[1][GCOMP] >> 1) & 2)); /* chroma = "1" */
-   for (j = 2 * 2 - 1; j >= 0; j--) {
-      for (i = 0; i < n_comp; i++) {
-         /* add in colors */
-         FX64_SHL(hi, 5);
-         FX64_OR32(hi, vec[j][i] >> 3);
-      }
-   }
-   ((Fx64 *)cc)[1] = hi;
-}
-
-
-static void
-fxt1_quantize (GLuint *cc, const GLubyte *lines[], GLint comps)
-{
-   GLint trualpha;
-   GLubyte reord[N_TEXELS][MAX_COMP];
-
-   GLubyte input[N_TEXELS][MAX_COMP];
-   GLint i, k, l;
-
-   if (comps == 3) {
-      /* make the whole block opaque */
-      memset(input, -1, sizeof(input));
-   }
-
-   /* 8 texels each line */
-   for (l = 0; l < 4; l++) {
-      for (k = 0; k < 4; k++) {
-         for (i = 0; i < comps; i++) {
-            input[k + l * 4][i] = *lines[l]++;
-         }
-      }
-      for (; k < 8; k++) {
-         for (i = 0; i < comps; i++) {
-            input[k + l * 4 + 12][i] = *lines[l]++;
-         }
-      }
-   }
-
-   /* block layout:
-    * 00, 01, 02, 03, 08, 09, 0a, 0b
-    * 10, 11, 12, 13, 18, 19, 1a, 1b
-    * 04, 05, 06, 07, 0c, 0d, 0e, 0f
-    * 14, 15, 16, 17, 1c, 1d, 1e, 1f
-    */
-
-   /* [dBorca]
-    * stupidity flows forth from this
-    */
-   l = N_TEXELS;
-   trualpha = 0;
-   if (comps == 4) {
-      /* skip all transparent black texels */
-      l = 0;
-      for (k = 0; k < N_TEXELS; k++) {
-         /* test all components against 0 */
-         if (!ISTBLACK(input[k])) {
-            /* texel is not transparent black */
-            COPY_4UBV(reord[l], input[k]);
-            if (reord[l][ACOMP] < (255 - ALPHA_TS)) {
-               /* non-opaque texel */
-               trualpha = !0;
-            }
-            l++;
-         }
-      }
-   }
-
-#if 0
-   if (trualpha) {
-      fxt1_quantize_ALPHA0(cc, input, reord, l);
-   } else if (l == 0) {
-      cc[0] = cc[1] = cc[2] = -1;
-      cc[3] = 0;
-   } else if (l < N_TEXELS) {
-      fxt1_quantize_HI(cc, input, reord, l);
-   } else {
-      fxt1_quantize_CHROMA(cc, input);
-   }
-   (void)fxt1_quantize_ALPHA1;
-   (void)fxt1_quantize_MIXED1;
-   (void)fxt1_quantize_MIXED0;
-#else
-   if (trualpha) {
-      fxt1_quantize_ALPHA1(cc, input);
-   } else if (l == 0) {
-      cc[0] = cc[1] = cc[2] = ~0u;
-      cc[3] = 0;
-   } else if (l < N_TEXELS) {
-      fxt1_quantize_MIXED1(cc, input);
-   } else {
-      fxt1_quantize_MIXED0(cc, input);
-   }
-   (void)fxt1_quantize_ALPHA0;
-   (void)fxt1_quantize_HI;
-   (void)fxt1_quantize_CHROMA;
-#endif
-}
-
-
-static void
-fxt1_encode (GLuint width, GLuint height, GLint comps,
-             const void *source, GLint srcRowStride,
-             void *dest, GLint destRowStride)
-{
-   GLuint x, y;
-   const GLubyte *data;
-   GLuint *encoded = (GLuint *)dest;
-   void *newSource = NULL;
-
-   assert(comps == 3 || comps == 4);
-
-   /* Replicate image if width is not M8 or height is not M4 */
-   if ((width & 7) | (height & 3)) {
-      GLint newWidth = (width + 7) & ~7;
-      GLint newHeight = (height + 3) & ~3;
-      newSource = malloc(comps * newWidth * newHeight * sizeof(GLchan));
-      if (!newSource) {
-         GET_CURRENT_CONTEXT(ctx);
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture compression");
-         goto cleanUp;
-      }
-      _mesa_upscale_teximage2d(width, height, newWidth, newHeight,
-                               comps, (const GLchan *) source,
-                               srcRowStride, (GLchan *) newSource);
-      source = newSource;
-      width = newWidth;
-      height = newHeight;
-      srcRowStride = comps * newWidth;
-   }
-
-   /* convert from 16/32-bit channels to GLubyte if needed */
-   if (CHAN_TYPE != GL_UNSIGNED_BYTE) {
-      const GLuint n = width * height * comps;
-      const GLchan *src = (const GLchan *) source;
-      GLubyte *dest = (GLubyte *) malloc(n * sizeof(GLubyte));
-      GLuint i;
-      if (!dest) {
-         GET_CURRENT_CONTEXT(ctx);
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture compression");
-         goto cleanUp;
-      }
-      for (i = 0; i < n; i++) {
-         dest[i] = CHAN_TO_UBYTE(src[i]);
-      }
-      if (newSource != NULL) {
-         free(newSource);
-      }
-      newSource = dest;  /* we'll free this buffer before returning */
-      source = dest;  /* the new, GLubyte incoming image */
-   }
-
-   data = (const GLubyte *) source;
-   destRowStride = (destRowStride - width * 2) / 4;
-   for (y = 0; y < height; y += 4) {
-      GLuint offs = 0 + (y + 0) * srcRowStride;
-      for (x = 0; x < width; x += 8) {
-         const GLubyte *lines[4];
-         lines[0] = &data[offs];
-         lines[1] = lines[0] + srcRowStride;
-         lines[2] = lines[1] + srcRowStride;
-         lines[3] = lines[2] + srcRowStride;
-         offs += 8 * comps;
-         fxt1_quantize(encoded, lines, comps);
-         /* 128 bits per 8x4 block */
-         encoded += 4;
-      }
-      encoded += destRowStride;
-   }
-
- cleanUp:
-   if (newSource != NULL) {
-      free(newSource);
-   }
-}
-
-
-/***************************************************************************\
- * FXT1 decoder
- *
- * The decoder is based on GL_3DFX_texture_compression_FXT1
- * specification and serves as a concept for the encoder.
-\***************************************************************************/
-
-
-/* lookup table for scaling 5 bit colors up to 8 bits */
-static const GLubyte _rgb_scale_5[] = {
-   0,   8,   16,  25,  33,  41,  49,  58,
-   66,  74,  82,  90,  99,  107, 115, 123,
-   132, 140, 148, 156, 165, 173, 181, 189,
-   197, 206, 214, 222, 230, 239, 247, 255
-};
-
-/* lookup table for scaling 6 bit colors up to 8 bits */
-static const GLubyte _rgb_scale_6[] = {
-   0,   4,   8,   12,  16,  20,  24,  28,
-   32,  36,  40,  45,  49,  53,  57,  61,
-   65,  69,  73,  77,  81,  85,  89,  93,
-   97,  101, 105, 109, 113, 117, 121, 125,
-   130, 134, 138, 142, 146, 150, 154, 158,
-   162, 166, 170, 174, 178, 182, 186, 190,
-   194, 198, 202, 206, 210, 215, 219, 223,
-   227, 231, 235, 239, 243, 247, 251, 255
-};
-
-
-#define CC_SEL(cc, which) (((GLuint *)(cc))[(which) / 32] >> ((which) & 31))
-#define UP5(c) _rgb_scale_5[(c) & 31]
-#define UP6(c, b) _rgb_scale_6[(((c) & 31) << 1) | ((b) & 1)]
-#define LERP(n, t, c0, c1) (((n) - (t)) * (c0) + (t) * (c1) + (n) / 2) / (n)
-
-
-static void
-fxt1_decode_1HI (const GLubyte *code, GLint t, GLchan *rgba)
-{
-   const GLuint *cc;
-
-   t *= 3;
-   cc = (const GLuint *)(code + t / 8);
-   t = (cc[0] >> (t & 7)) & 7;
-
-   if (t == 7) {
-      rgba[RCOMP] = rgba[GCOMP] = rgba[BCOMP] = rgba[ACOMP] = 0;
-   } else {
-      GLubyte r, g, b;
-      cc = (const GLuint *)(code + 12);
-      if (t == 0) {
-         b = UP5(CC_SEL(cc, 0));
-         g = UP5(CC_SEL(cc, 5));
-         r = UP5(CC_SEL(cc, 10));
-      } else if (t == 6) {
-         b = UP5(CC_SEL(cc, 15));
-         g = UP5(CC_SEL(cc, 20));
-         r = UP5(CC_SEL(cc, 25));
-      } else {
-         b = LERP(6, t, UP5(CC_SEL(cc, 0)), UP5(CC_SEL(cc, 15)));
-         g = LERP(6, t, UP5(CC_SEL(cc, 5)), UP5(CC_SEL(cc, 20)));
-         r = LERP(6, t, UP5(CC_SEL(cc, 10)), UP5(CC_SEL(cc, 25)));
-      }
-      rgba[RCOMP] = UBYTE_TO_CHAN(r);
-      rgba[GCOMP] = UBYTE_TO_CHAN(g);
-      rgba[BCOMP] = UBYTE_TO_CHAN(b);
-      rgba[ACOMP] = CHAN_MAX;
-   }
-}
-
-
-static void
-fxt1_decode_1CHROMA (const GLubyte *code, GLint t, GLchan *rgba)
-{
-   const GLuint *cc;
-   GLuint kk;
-
-   cc = (const GLuint *)code;
-   if (t & 16) {
-      cc++;
-      t &= 15;
-   }
-   t = (cc[0] >> (t * 2)) & 3;
-
-   t *= 15;
-   cc = (const GLuint *)(code + 8 + t / 8);
-   kk = cc[0] >> (t & 7);
-   rgba[BCOMP] = UBYTE_TO_CHAN( UP5(kk) );
-   rgba[GCOMP] = UBYTE_TO_CHAN( UP5(kk >> 5) );
-   rgba[RCOMP] = UBYTE_TO_CHAN( UP5(kk >> 10) );
-   rgba[ACOMP] = CHAN_MAX;
-}
-
-
-static void
-fxt1_decode_1MIXED (const GLubyte *code, GLint t, GLchan *rgba)
-{
-   const GLuint *cc;
-   GLuint col[2][3];
-   GLint glsb, selb;
-
-   cc = (const GLuint *)code;
-   if (t & 16) {
-      t &= 15;
-      t = (cc[1] >> (t * 2)) & 3;
-      /* col 2 */
-      col[0][BCOMP] = (*(const GLuint *)(code + 11)) >> 6;
-      col[0][GCOMP] = CC_SEL(cc, 99);
-      col[0][RCOMP] = CC_SEL(cc, 104);
-      /* col 3 */
-      col[1][BCOMP] = CC_SEL(cc, 109);
-      col[1][GCOMP] = CC_SEL(cc, 114);
-      col[1][RCOMP] = CC_SEL(cc, 119);
-      glsb = CC_SEL(cc, 126);
-      selb = CC_SEL(cc, 33);
-   } else {
-      t = (cc[0] >> (t * 2)) & 3;
-      /* col 0 */
-      col[0][BCOMP] = CC_SEL(cc, 64);
-      col[0][GCOMP] = CC_SEL(cc, 69);
-      col[0][RCOMP] = CC_SEL(cc, 74);
-      /* col 1 */
-      col[1][BCOMP] = CC_SEL(cc, 79);
-      col[1][GCOMP] = CC_SEL(cc, 84);
-      col[1][RCOMP] = CC_SEL(cc, 89);
-      glsb = CC_SEL(cc, 125);
-      selb = CC_SEL(cc, 1);
-   }
-
-   if (CC_SEL(cc, 124) & 1) {
-      /* alpha[0] == 1 */
-
-      if (t == 3) {
-         /* zero */
-         rgba[RCOMP] = rgba[BCOMP] = rgba[GCOMP] = rgba[ACOMP] = 0;
-      } else {
-         GLubyte r, g, b;
-         if (t == 0) {
-            b = UP5(col[0][BCOMP]);
-            g = UP5(col[0][GCOMP]);
-            r = UP5(col[0][RCOMP]);
-         } else if (t == 2) {
-            b = UP5(col[1][BCOMP]);
-            g = UP6(col[1][GCOMP], glsb);
-            r = UP5(col[1][RCOMP]);
-         } else {
-            b = (UP5(col[0][BCOMP]) + UP5(col[1][BCOMP])) / 2;
-            g = (UP5(col[0][GCOMP]) + UP6(col[1][GCOMP], glsb)) / 2;
-            r = (UP5(col[0][RCOMP]) + UP5(col[1][RCOMP])) / 2;
-         }
-         rgba[RCOMP] = UBYTE_TO_CHAN(r);
-         rgba[GCOMP] = UBYTE_TO_CHAN(g);
-         rgba[BCOMP] = UBYTE_TO_CHAN(b);
-         rgba[ACOMP] = CHAN_MAX;
-      }
-   } else {
-      /* alpha[0] == 0 */
-      GLubyte r, g, b;
-      if (t == 0) {
-         b = UP5(col[0][BCOMP]);
-         g = UP6(col[0][GCOMP], glsb ^ selb);
-         r = UP5(col[0][RCOMP]);
-      } else if (t == 3) {
-         b = UP5(col[1][BCOMP]);
-         g = UP6(col[1][GCOMP], glsb);
-         r = UP5(col[1][RCOMP]);
-      } else {
-         b = LERP(3, t, UP5(col[0][BCOMP]), UP5(col[1][BCOMP]));
-         g = LERP(3, t, UP6(col[0][GCOMP], glsb ^ selb),
-                        UP6(col[1][GCOMP], glsb));
-         r = LERP(3, t, UP5(col[0][RCOMP]), UP5(col[1][RCOMP]));
-      }
-      rgba[RCOMP] = UBYTE_TO_CHAN(r);
-      rgba[GCOMP] = UBYTE_TO_CHAN(g);
-      rgba[BCOMP] = UBYTE_TO_CHAN(b);
-      rgba[ACOMP] = CHAN_MAX;
-   }
-}
-
-
-static void
-fxt1_decode_1ALPHA (const GLubyte *code, GLint t, GLchan *rgba)
-{
-   const GLuint *cc;
-   GLubyte r, g, b, a;
-
-   cc = (const GLuint *)code;
-   if (CC_SEL(cc, 124) & 1) {
-      /* lerp == 1 */
-      GLuint col0[4];
-
-      if (t & 16) {
-         t &= 15;
-         t = (cc[1] >> (t * 2)) & 3;
-         /* col 2 */
-         col0[BCOMP] = (*(const GLuint *)(code + 11)) >> 6;
-         col0[GCOMP] = CC_SEL(cc, 99);
-         col0[RCOMP] = CC_SEL(cc, 104);
-         col0[ACOMP] = CC_SEL(cc, 119);
-      } else {
-         t = (cc[0] >> (t * 2)) & 3;
-         /* col 0 */
-         col0[BCOMP] = CC_SEL(cc, 64);
-         col0[GCOMP] = CC_SEL(cc, 69);
-         col0[RCOMP] = CC_SEL(cc, 74);
-         col0[ACOMP] = CC_SEL(cc, 109);
-      }
-
-      if (t == 0) {
-         b = UP5(col0[BCOMP]);
-         g = UP5(col0[GCOMP]);
-         r = UP5(col0[RCOMP]);
-         a = UP5(col0[ACOMP]);
-      } else if (t == 3) {
-         b = UP5(CC_SEL(cc, 79));
-         g = UP5(CC_SEL(cc, 84));
-         r = UP5(CC_SEL(cc, 89));
-         a = UP5(CC_SEL(cc, 114));
-      } else {
-         b = LERP(3, t, UP5(col0[BCOMP]), UP5(CC_SEL(cc, 79)));
-         g = LERP(3, t, UP5(col0[GCOMP]), UP5(CC_SEL(cc, 84)));
-         r = LERP(3, t, UP5(col0[RCOMP]), UP5(CC_SEL(cc, 89)));
-         a = LERP(3, t, UP5(col0[ACOMP]), UP5(CC_SEL(cc, 114)));
-      }
-   } else {
-      /* lerp == 0 */
-
-      if (t & 16) {
-         cc++;
-         t &= 15;
-      }
-      t = (cc[0] >> (t * 2)) & 3;
-
-      if (t == 3) {
-         /* zero */
-         r = g = b = a = 0;
-      } else {
-         GLuint kk;
-         cc = (const GLuint *)code;
-         a = UP5(cc[3] >> (t * 5 + 13));
-         t *= 15;
-         cc = (const GLuint *)(code + 8 + t / 8);
-         kk = cc[0] >> (t & 7);
-         b = UP5(kk);
-         g = UP5(kk >> 5);
-         r = UP5(kk >> 10);
-      }
-   }
-   rgba[RCOMP] = UBYTE_TO_CHAN(r);
-   rgba[GCOMP] = UBYTE_TO_CHAN(g);
-   rgba[BCOMP] = UBYTE_TO_CHAN(b);
-   rgba[ACOMP] = UBYTE_TO_CHAN(a);
-}
-
-
-void
-fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */
-               GLint i, GLint j, GLchan *rgba)
-{
-   static void (*decode_1[]) (const GLubyte *, GLint, GLchan *) = {
-      fxt1_decode_1HI,     /* cc-high   = "00?" */
-      fxt1_decode_1HI,     /* cc-high   = "00?" */
-      fxt1_decode_1CHROMA, /* cc-chroma = "010" */
-      fxt1_decode_1ALPHA,  /* alpha     = "011" */
-      fxt1_decode_1MIXED,  /* mixed     = "1??" */
-      fxt1_decode_1MIXED,  /* mixed     = "1??" */
-      fxt1_decode_1MIXED,  /* mixed     = "1??" */
-      fxt1_decode_1MIXED   /* mixed     = "1??" */
-   };
-
-   const GLubyte *code = (const GLubyte *)texture +
-                         ((j / 4) * (stride / 8) + (i / 8)) * 16;
-   GLint mode = CC_SEL(code, 125);
-   GLint t = i & 7;
-
-   if (t & 4) {
-      t += 12;
-   }
-   t += (j & 3) * 4;
-
-   decode_1[mode](code, t, rgba);
-}
-
-
-#endif /* FEATURE_texture_fxt1 */
+/*

+ * 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 texcompress_fxt1.c

+ * GL_3DFX_texture_compression_FXT1 support.

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "colormac.h"

+#include "image.h"

+#include "macros.h"

+#include "mipmap.h"

+#include "texcompress.h"

+#include "texcompress_fxt1.h"

+#include "texstore.h"

+

+

+#if FEATURE_texture_fxt1

+

+

+static void

+fxt1_encode (GLuint width, GLuint height, GLint comps,

+             const void *source, GLint srcRowStride,

+             void *dest, GLint destRowStride);

+

+void

+fxt1_decode_1 (const void *texture, GLint stride,

+               GLint i, GLint j, GLchan *rgba);

+

+

+/**

+ * Store user's image in rgb_fxt1 format.

+ */

+GLboolean

+_mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS)

+{

+   const GLchan *pixels;

+   GLint srcRowStride;

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 8 / 16; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+

+   ASSERT(dstFormat == MESA_FORMAT_RGB_FXT1);

+   ASSERT(dstXoffset % 8 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset     == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   if (srcFormat != GL_RGB ||

+       srcType != CHAN_TYPE ||

+       ctx->_ImageTransferState ||

+       srcPacking->SwapBytes) {

+      /* convert image to RGB/GLchan */

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

+      pixels = tempImage;

+      srcRowStride = 3 * srcWidth;

+      srcFormat = GL_RGB;

+   }

+   else {

+      pixels = (const GLchan *) srcAddr;

+      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

+                                            srcType) / sizeof(GLchan);

+   }

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+

+   fxt1_encode(srcWidth, srcHeight, 3, pixels, srcRowStride,

+               dst, dstRowStride);

+

+   if (tempImage)

+      free((void*) tempImage);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Store user's image in rgba_fxt1 format.

+ */

+GLboolean

+_mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)

+{

+   const GLchan *pixels;

+   GLint srcRowStride;

+   GLubyte *dst;

+   GLint texWidth = dstRowStride * 8 / 16; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_FXT1);

+   ASSERT(dstXoffset % 8 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset     == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   if (srcFormat != GL_RGBA ||

+       srcType != CHAN_TYPE ||

+       ctx->_ImageTransferState ||

+       srcPacking->SwapBytes) {

+      /* convert image to RGBA/GLchan */

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

+      pixels = tempImage;

+      srcRowStride = 4 * srcWidth;

+      srcFormat = GL_RGBA;

+   }

+   else {

+      pixels = (const GLchan *) srcAddr;

+      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

+                                            srcType) / sizeof(GLchan);

+   }

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+

+   fxt1_encode(srcWidth, srcHeight, 4, pixels, srcRowStride,

+               dst, dstRowStride);

+

+   if (tempImage)

+      free((void*) tempImage);

+

+   return GL_TRUE;

+}

+

+

+void

+_mesa_fetch_texel_2d_f_rgba_fxt1( const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   (void) k;

+   fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, rgba);

+   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);

+   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);

+   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+

+void

+_mesa_fetch_texel_2d_f_rgb_fxt1( const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   (void) k;

+   fxt1_decode_1(texImage->Data, texImage->RowStride, i, j, rgba);

+   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);

+   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);

+   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);

+   texel[ACOMP] = 1.0F;

+}

+

+

+

+/***************************************************************************\

+ * FXT1 encoder

+ *

+ * The encoder was built by reversing the decoder,

+ * and is vaguely based on Texus2 by 3dfx. Note that this code

+ * is merely a proof of concept, since it is highly UNoptimized;

+ * moreover, it is sub-optimal due to initial conditions passed

+ * to Lloyd's algorithm (the interpolation modes are even worse).

+\***************************************************************************/

+

+

+#define MAX_COMP 4 /* ever needed maximum number of components in texel */

+#define MAX_VECT 4 /* ever needed maximum number of base vectors to find */

+#define N_TEXELS 32 /* number of texels in a block (always 32) */

+#define LL_N_REP 50 /* number of iterations in lloyd's vq */

+#define LL_RMS_D 10 /* fault tolerance (maximum delta) */

+#define LL_RMS_E 255 /* fault tolerance (maximum error) */

+#define ALPHA_TS 2 /* alpha threshold: (255 - ALPHA_TS) deemed opaque */

+#define ISTBLACK(v) (*((GLuint *)(v)) == 0)

+

+

+/*

+ * Define a 64-bit unsigned integer type and macros

+ */

+#if 1

+

+#define FX64_NATIVE 1

+

+typedef uint64_t Fx64;

+

+#define FX64_MOV32(a, b) a = b

+#define FX64_OR32(a, b)  a |= b

+#define FX64_SHL(a, c)   a <<= c

+

+#else

+

+#define FX64_NATIVE 0

+

+typedef struct {

+   GLuint lo, hi;

+} Fx64;

+

+#define FX64_MOV32(a, b) a.lo = b

+#define FX64_OR32(a, b)  a.lo |= b

+

+#define FX64_SHL(a, c)                                 \

+   do {                                                \

+       if ((c) >= 32) {                                \

+          a.hi = a.lo << ((c) - 32);                   \

+          a.lo = 0;                                    \

+       } else {                                        \

+          a.hi = (a.hi << (c)) | (a.lo >> (32 - (c))); \

+          a.lo <<= (c);                                \

+       }                                               \

+   } while (0)

+

+#endif

+

+

+#define F(i) (GLfloat)1 /* can be used to obtain an oblong metric: 0.30 / 0.59 / 0.11 */

+#define SAFECDOT 1 /* for paranoids */

+

+#define MAKEIVEC(NV, NC, IV, B, V0, V1)  \

+   do {                                  \

+      /* compute interpolation vector */ \

+      GLfloat d2 = 0.0F;                 \

+      GLfloat rd2;                       \

+                                         \

+      for (i = 0; i < NC; i++) {         \

+         IV[i] = (V1[i] - V0[i]) * F(i); \

+         d2 += IV[i] * IV[i];            \

+      }                                  \

+      rd2 = (GLfloat)NV / d2;            \

+      B = 0;                             \

+      for (i = 0; i < NC; i++) {         \

+         IV[i] *= F(i);                  \

+         B -= IV[i] * V0[i];             \

+         IV[i] *= rd2;                   \

+      }                                  \

+      B = B * rd2 + 0.5f;                \

+   } while (0)

+

+#define CALCCDOT(TEXEL, NV, NC, IV, B, V)\

+   do {                                  \

+      GLfloat dot = 0.0F;                \

+      for (i = 0; i < NC; i++) {         \

+         dot += V[i] * IV[i];            \

+      }                                  \

+      TEXEL = (GLint)(dot + B);          \

+      if (SAFECDOT) {                    \

+         if (TEXEL < 0) {                \

+            TEXEL = 0;                   \

+         } else if (TEXEL > NV) {        \

+            TEXEL = NV;                  \

+         }                               \

+      }                                  \

+   } while (0)

+

+

+static GLint

+fxt1_bestcol (GLfloat vec[][MAX_COMP], GLint nv,

+              GLubyte input[MAX_COMP], GLint nc)

+{

+   GLint i, j, best = -1;

+   GLfloat err = 1e9; /* big enough */

+

+   for (j = 0; j < nv; j++) {

+      GLfloat e = 0.0F;

+      for (i = 0; i < nc; i++) {

+         e += (vec[j][i] - input[i]) * (vec[j][i] - input[i]);

+      }

+      if (e < err) {

+         err = e;

+         best = j;

+      }

+   }

+

+   return best;

+}

+

+

+static GLint

+fxt1_worst (GLfloat vec[MAX_COMP],

+            GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)

+{

+   GLint i, k, worst = -1;

+   GLfloat err = -1.0F; /* small enough */

+

+   for (k = 0; k < n; k++) {

+      GLfloat e = 0.0F;

+      for (i = 0; i < nc; i++) {

+         e += (vec[i] - input[k][i]) * (vec[i] - input[k][i]);

+      }

+      if (e > err) {

+         err = e;

+         worst = k;

+      }

+   }

+

+   return worst;

+}

+

+

+static GLint

+fxt1_variance (GLdouble variance[MAX_COMP],

+               GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)

+{

+   GLint i, k, best = 0;

+   GLint sx, sx2;

+   GLdouble var, maxvar = -1; /* small enough */

+   GLdouble teenth = 1.0 / n;

+

+   for (i = 0; i < nc; i++) {

+      sx = sx2 = 0;

+      for (k = 0; k < n; k++) {

+         GLint t = input[k][i];

+         sx += t;

+         sx2 += t * t;

+      }

+      var = sx2 * teenth - sx * sx * teenth * teenth;

+      if (maxvar < var) {

+         maxvar = var;

+         best = i;

+      }

+      if (variance) {

+         variance[i] = var;

+      }

+   }

+

+   return best;

+}

+

+

+static GLint

+fxt1_choose (GLfloat vec[][MAX_COMP], GLint nv,

+             GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)

+{

+#if 0

+   /* Choose colors from a grid.

+    */

+   GLint i, j;

+

+   for (j = 0; j < nv; j++) {

+      GLint m = j * (n - 1) / (nv - 1);

+      for (i = 0; i < nc; i++) {

+         vec[j][i] = input[m][i];

+      }

+   }

+#else

+   /* Our solution here is to find the darkest and brightest colors in

+    * the 8x4 tile and use those as the two representative colors.

+    * There are probably better algorithms to use (histogram-based).

+    */

+   GLint i, j, k;

+   GLint minSum = 2000; /* big enough */

+   GLint maxSum = -1; /* small enough */

+   GLint minCol = 0; /* phoudoin: silent compiler! */

+   GLint maxCol = 0; /* phoudoin: silent compiler! */

+

+   struct {

+      GLint flag;

+      GLint key;

+      GLint freq;

+      GLint idx;

+   } hist[N_TEXELS];

+   GLint lenh = 0;

+

+   memset(hist, 0, sizeof(hist));

+

+   for (k = 0; k < n; k++) {

+      GLint l;

+      GLint key = 0;

+      GLint sum = 0;

+      for (i = 0; i < nc; i++) {

+         key <<= 8;

+         key |= input[k][i];

+         sum += input[k][i];

+      }

+      for (l = 0; l < n; l++) {

+         if (!hist[l].flag) {

+            /* alloc new slot */

+            hist[l].flag = !0;

+            hist[l].key = key;

+            hist[l].freq = 1;

+            hist[l].idx = k;

+            lenh = l + 1;

+            break;

+         } else if (hist[l].key == key) {

+            hist[l].freq++;

+            break;

+         }

+      }

+      if (minSum > sum) {

+         minSum = sum;

+         minCol = k;

+      }

+      if (maxSum < sum) {

+         maxSum = sum;

+         maxCol = k;

+      }

+   }

+

+   if (lenh <= nv) {

+      for (j = 0; j < lenh; j++) {

+         for (i = 0; i < nc; i++) {

+            vec[j][i] = (GLfloat)input[hist[j].idx][i];

+         }

+      }

+      for (; j < nv; j++) {

+         for (i = 0; i < nc; i++) {

+            vec[j][i] = vec[0][i];

+         }

+      }

+      return 0;

+   }

+

+   for (j = 0; j < nv; j++) {

+      for (i = 0; i < nc; i++) {

+         vec[j][i] = ((nv - 1 - j) * input[minCol][i] + j * input[maxCol][i] + (nv - 1) / 2) / (GLfloat)(nv - 1);

+      }

+   }

+#endif

+

+   return !0;

+}

+

+

+static GLint

+fxt1_lloyd (GLfloat vec[][MAX_COMP], GLint nv,

+            GLubyte input[N_TEXELS][MAX_COMP], GLint nc, GLint n)

+{

+   /* Use the generalized lloyd's algorithm for VQ:

+    *     find 4 color vectors.

+    *

+    *     for each sample color

+    *         sort to nearest vector.

+    *

+    *     replace each vector with the centroid of its matching colors.

+    *

+    *     repeat until RMS doesn't improve.

+    *

+    *     if a color vector has no samples, or becomes the same as another

+    *     vector, replace it with the color which is farthest from a sample.

+    *

+    * vec[][MAX_COMP]           initial vectors and resulting colors

+    * nv                        number of resulting colors required

+    * input[N_TEXELS][MAX_COMP] input texels

+    * nc                        number of components in input / vec

+    * n                         number of input samples

+    */

+

+   GLint sum[MAX_VECT][MAX_COMP]; /* used to accumulate closest texels */

+   GLint cnt[MAX_VECT]; /* how many times a certain vector was chosen */

+   GLfloat error, lasterror = 1e9;

+

+   GLint i, j, k, rep;

+

+   /* the quantizer */

+   for (rep = 0; rep < LL_N_REP; rep++) {

+      /* reset sums & counters */

+      for (j = 0; j < nv; j++) {

+         for (i = 0; i < nc; i++) {

+            sum[j][i] = 0;

+         }

+         cnt[j] = 0;

+      }

+      error = 0;

+

+      /* scan whole block */

+      for (k = 0; k < n; k++) {

+#if 1

+         GLint best = -1;

+         GLfloat err = 1e9; /* big enough */

+         /* determine best vector */

+         for (j = 0; j < nv; j++) {

+            GLfloat e = (vec[j][0] - input[k][0]) * (vec[j][0] - input[k][0]) +

+                      (vec[j][1] - input[k][1]) * (vec[j][1] - input[k][1]) +

+                      (vec[j][2] - input[k][2]) * (vec[j][2] - input[k][2]);

+            if (nc == 4) {

+               e += (vec[j][3] - input[k][3]) * (vec[j][3] - input[k][3]);

+            }

+            if (e < err) {

+               err = e;

+               best = j;

+            }

+         }

+#else

+         GLint best = fxt1_bestcol(vec, nv, input[k], nc, &err);

+#endif

+         assert(best >= 0);

+         /* add in closest color */

+         for (i = 0; i < nc; i++) {

+            sum[best][i] += input[k][i];

+         }

+         /* mark this vector as used */

+         cnt[best]++;

+         /* accumulate error */

+         error += err;

+      }

+

+      /* check RMS */

+      if ((error < LL_RMS_E) ||

+          ((error < lasterror) && ((lasterror - error) < LL_RMS_D))) {

+         return !0; /* good match */

+      }

+      lasterror = error;

+

+      /* move each vector to the barycenter of its closest colors */

+      for (j = 0; j < nv; j++) {

+         if (cnt[j]) {

+            GLfloat div = 1.0F / cnt[j];

+            for (i = 0; i < nc; i++) {

+               vec[j][i] = div * sum[j][i];

+            }

+         } else {

+            /* this vec has no samples or is identical with a previous vec */

+            GLint worst = fxt1_worst(vec[j], input, nc, n);

+            for (i = 0; i < nc; i++) {

+               vec[j][i] = input[worst][i];

+            }

+         }

+      }

+   }

+

+   return 0; /* could not converge fast enough */

+}

+

+

+static void

+fxt1_quantize_CHROMA (GLuint *cc,

+                      GLubyte input[N_TEXELS][MAX_COMP])

+{

+   const GLint n_vect = 4; /* 4 base vectors to find */

+   const GLint n_comp = 3; /* 3 components: R, G, B */

+   GLfloat vec[MAX_VECT][MAX_COMP];

+   GLint i, j, k;

+   Fx64 hi; /* high quadword */

+   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */

+

+   if (fxt1_choose(vec, n_vect, input, n_comp, N_TEXELS) != 0) {

+      fxt1_lloyd(vec, n_vect, input, n_comp, N_TEXELS);

+   }

+

+   FX64_MOV32(hi, 4); /* cc-chroma = "010" + unused bit */

+   for (j = n_vect - 1; j >= 0; j--) {

+      for (i = 0; i < n_comp; i++) {

+         /* add in colors */

+         FX64_SHL(hi, 5);

+         FX64_OR32(hi, (GLuint)(vec[j][i] / 8.0F));

+      }

+   }

+   ((Fx64 *)cc)[1] = hi;

+

+   lohi = lolo = 0;

+   /* right microtile */

+   for (k = N_TEXELS - 1; k >= N_TEXELS/2; k--) {

+      lohi <<= 2;

+      lohi |= fxt1_bestcol(vec, n_vect, input[k], n_comp);

+   }

+   /* left microtile */

+   for (; k >= 0; k--) {

+      lolo <<= 2;

+      lolo |= fxt1_bestcol(vec, n_vect, input[k], n_comp);

+   }

+   cc[1] = lohi;

+   cc[0] = lolo;

+}

+

+

+static void

+fxt1_quantize_ALPHA0 (GLuint *cc,

+                      GLubyte input[N_TEXELS][MAX_COMP],

+                      GLubyte reord[N_TEXELS][MAX_COMP], GLint n)

+{

+   const GLint n_vect = 3; /* 3 base vectors to find */

+   const GLint n_comp = 4; /* 4 components: R, G, B, A */

+   GLfloat vec[MAX_VECT][MAX_COMP];

+   GLint i, j, k;

+   Fx64 hi; /* high quadword */

+   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */

+

+   /* the last vector indicates zero */

+   for (i = 0; i < n_comp; i++) {

+      vec[n_vect][i] = 0;

+   }

+

+   /* the first n texels in reord are guaranteed to be non-zero */

+   if (fxt1_choose(vec, n_vect, reord, n_comp, n) != 0) {

+      fxt1_lloyd(vec, n_vect, reord, n_comp, n);

+   }

+

+   FX64_MOV32(hi, 6); /* alpha = "011" + lerp = 0 */

+   for (j = n_vect - 1; j >= 0; j--) {

+      /* add in alphas */

+      FX64_SHL(hi, 5);

+      FX64_OR32(hi, (GLuint)(vec[j][ACOMP] / 8.0F));

+   }

+   for (j = n_vect - 1; j >= 0; j--) {

+      for (i = 0; i < n_comp - 1; i++) {

+         /* add in colors */

+         FX64_SHL(hi, 5);

+         FX64_OR32(hi, (GLuint)(vec[j][i] / 8.0F));

+      }

+   }

+   ((Fx64 *)cc)[1] = hi;

+

+   lohi = lolo = 0;

+   /* right microtile */

+   for (k = N_TEXELS - 1; k >= N_TEXELS/2; k--) {

+      lohi <<= 2;

+      lohi |= fxt1_bestcol(vec, n_vect + 1, input[k], n_comp);

+   }

+   /* left microtile */

+   for (; k >= 0; k--) {

+      lolo <<= 2;

+      lolo |= fxt1_bestcol(vec, n_vect + 1, input[k], n_comp);

+   }

+   cc[1] = lohi;

+   cc[0] = lolo;

+}

+

+

+static void

+fxt1_quantize_ALPHA1 (GLuint *cc,

+                      GLubyte input[N_TEXELS][MAX_COMP])

+{

+   const GLint n_vect = 3; /* highest vector number in each microtile */

+   const GLint n_comp = 4; /* 4 components: R, G, B, A */

+   GLfloat vec[1 + 1 + 1][MAX_COMP]; /* 1.5 extrema for each sub-block */

+   GLfloat b, iv[MAX_COMP]; /* interpolation vector */

+   GLint i, j, k;

+   Fx64 hi; /* high quadword */

+   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */

+

+   GLint minSum;

+   GLint maxSum;

+   GLint minColL = 0, maxColL = 0;

+   GLint minColR = 0, maxColR = 0;

+   GLint sumL = 0, sumR = 0;

+   GLint nn_comp;

+   /* Our solution here is to find the darkest and brightest colors in

+    * the 4x4 tile and use those as the two representative colors.

+    * There are probably better algorithms to use (histogram-based).

+    */

+   nn_comp = n_comp;

+   while ((minColL == maxColL) && nn_comp) {

+       minSum = 2000; /* big enough */

+       maxSum = -1; /* small enough */

+       for (k = 0; k < N_TEXELS / 2; k++) {

+           GLint sum = 0;

+           for (i = 0; i < nn_comp; i++) {

+               sum += input[k][i];

+           }

+           if (minSum > sum) {

+               minSum = sum;

+               minColL = k;

+           }

+           if (maxSum < sum) {

+               maxSum = sum;

+               maxColL = k;

+           }

+           sumL += sum;

+       }

+       

+       nn_comp--;

+   }

+

+   nn_comp = n_comp;

+   while ((minColR == maxColR) && nn_comp) {

+       minSum = 2000; /* big enough */

+       maxSum = -1; /* small enough */

+       for (k = N_TEXELS / 2; k < N_TEXELS; k++) {

+           GLint sum = 0;

+           for (i = 0; i < nn_comp; i++) {

+               sum += input[k][i];

+           }

+           if (minSum > sum) {

+               minSum = sum;

+               minColR = k;

+           }

+           if (maxSum < sum) {

+               maxSum = sum;

+               maxColR = k;

+           }

+           sumR += sum;

+       }

+

+       nn_comp--;

+   }

+

+   /* choose the common vector (yuck!) */

+   {

+      GLint j1, j2;

+      GLint v1 = 0, v2 = 0;

+      GLfloat err = 1e9; /* big enough */

+      GLfloat tv[2 * 2][MAX_COMP]; /* 2 extrema for each sub-block */

+      for (i = 0; i < n_comp; i++) {

+         tv[0][i] = input[minColL][i];

+         tv[1][i] = input[maxColL][i];

+         tv[2][i] = input[minColR][i];

+         tv[3][i] = input[maxColR][i];

+      }

+      for (j1 = 0; j1 < 2; j1++) {

+         for (j2 = 2; j2 < 4; j2++) {

+            GLfloat e = 0.0F;

+            for (i = 0; i < n_comp; i++) {

+               e += (tv[j1][i] - tv[j2][i]) * (tv[j1][i] - tv[j2][i]);

+            }

+            if (e < err) {

+               err = e;

+               v1 = j1;

+               v2 = j2;

+            }

+         }

+      }

+      for (i = 0; i < n_comp; i++) {

+         vec[0][i] = tv[1 - v1][i];

+         vec[1][i] = (tv[v1][i] * sumL + tv[v2][i] * sumR) / (sumL + sumR);

+         vec[2][i] = tv[5 - v2][i];

+      }

+   }

+

+   /* left microtile */

+   cc[0] = 0;

+   if (minColL != maxColL) {

+      /* compute interpolation vector */

+      MAKEIVEC(n_vect, n_comp, iv, b, vec[0], vec[1]);

+

+      /* add in texels */

+      lolo = 0;

+      for (k = N_TEXELS / 2 - 1; k >= 0; k--) {

+         GLint texel;

+         /* interpolate color */

+         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+         /* add in texel */

+         lolo <<= 2;

+         lolo |= texel;

+      }

+      

+      cc[0] = lolo;

+   }

+

+   /* right microtile */

+   cc[1] = 0;

+   if (minColR != maxColR) {

+      /* compute interpolation vector */

+      MAKEIVEC(n_vect, n_comp, iv, b, vec[2], vec[1]);

+

+      /* add in texels */

+      lohi = 0;

+      for (k = N_TEXELS - 1; k >= N_TEXELS / 2; k--) {

+         GLint texel;

+         /* interpolate color */

+         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+         /* add in texel */

+         lohi <<= 2;

+         lohi |= texel;

+      }

+

+      cc[1] = lohi;

+   }

+

+   FX64_MOV32(hi, 7); /* alpha = "011" + lerp = 1 */

+   for (j = n_vect - 1; j >= 0; j--) {

+      /* add in alphas */

+      FX64_SHL(hi, 5);

+      FX64_OR32(hi, (GLuint)(vec[j][ACOMP] / 8.0F));

+   }

+   for (j = n_vect - 1; j >= 0; j--) {

+      for (i = 0; i < n_comp - 1; i++) {

+         /* add in colors */

+         FX64_SHL(hi, 5);

+         FX64_OR32(hi, (GLuint)(vec[j][i] / 8.0F));

+      }

+   }

+   ((Fx64 *)cc)[1] = hi;

+}

+

+

+static void

+fxt1_quantize_HI (GLuint *cc,

+                  GLubyte input[N_TEXELS][MAX_COMP],

+                  GLubyte reord[N_TEXELS][MAX_COMP], GLint n)

+{

+   const GLint n_vect = 6; /* highest vector number */

+   const GLint n_comp = 3; /* 3 components: R, G, B */

+   GLfloat b = 0.0F;       /* phoudoin: silent compiler! */

+   GLfloat iv[MAX_COMP];   /* interpolation vector */

+   GLint i, k;

+   GLuint hihi; /* high quadword: hi dword */

+

+   GLint minSum = 2000; /* big enough */

+   GLint maxSum = -1; /* small enough */

+   GLint minCol = 0; /* phoudoin: silent compiler! */

+   GLint maxCol = 0; /* phoudoin: silent compiler! */

+

+   /* Our solution here is to find the darkest and brightest colors in

+    * the 8x4 tile and use those as the two representative colors.

+    * There are probably better algorithms to use (histogram-based).

+    */

+   for (k = 0; k < n; k++) {

+      GLint sum = 0;

+      for (i = 0; i < n_comp; i++) {

+         sum += reord[k][i];

+      }

+      if (minSum > sum) {

+         minSum = sum;

+         minCol = k;

+      }

+      if (maxSum < sum) {

+         maxSum = sum;

+         maxCol = k;

+      }

+   }

+

+   hihi = 0; /* cc-hi = "00" */

+   for (i = 0; i < n_comp; i++) {

+      /* add in colors */

+      hihi <<= 5;

+      hihi |= reord[maxCol][i] >> 3;

+   }

+   for (i = 0; i < n_comp; i++) {

+      /* add in colors */

+      hihi <<= 5;

+      hihi |= reord[minCol][i] >> 3;

+   }

+   cc[3] = hihi;

+   cc[0] = cc[1] = cc[2] = 0;

+

+   /* compute interpolation vector */

+   if (minCol != maxCol) {

+      MAKEIVEC(n_vect, n_comp, iv, b, reord[minCol], reord[maxCol]);

+   }

+

+   /* add in texels */

+   for (k = N_TEXELS - 1; k >= 0; k--) {

+      GLint t = k * 3;

+      GLuint *kk = (GLuint *)((char *)cc + t / 8);

+      GLint texel = n_vect + 1; /* transparent black */

+

+      if (!ISTBLACK(input[k])) {

+         if (minCol != maxCol) {

+            /* interpolate color */

+            CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+            /* add in texel */

+            kk[0] |= texel << (t & 7);

+         }

+      } else {

+         /* add in texel */

+         kk[0] |= texel << (t & 7);

+      }

+   }

+}

+

+

+static void

+fxt1_quantize_MIXED1 (GLuint *cc,

+                      GLubyte input[N_TEXELS][MAX_COMP])

+{

+   const GLint n_vect = 2; /* highest vector number in each microtile */

+   const GLint n_comp = 3; /* 3 components: R, G, B */

+   GLubyte vec[2 * 2][MAX_COMP]; /* 2 extrema for each sub-block */

+   GLfloat b, iv[MAX_COMP]; /* interpolation vector */

+   GLint i, j, k;

+   Fx64 hi; /* high quadword */

+   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */

+

+   GLint minSum;

+   GLint maxSum;

+   GLint minColL = 0, maxColL = -1;

+   GLint minColR = 0, maxColR = -1;

+

+   /* Our solution here is to find the darkest and brightest colors in

+    * the 4x4 tile and use those as the two representative colors.

+    * There are probably better algorithms to use (histogram-based).

+    */

+   minSum = 2000; /* big enough */

+   maxSum = -1; /* small enough */

+   for (k = 0; k < N_TEXELS / 2; k++) {

+      if (!ISTBLACK(input[k])) {

+         GLint sum = 0;

+         for (i = 0; i < n_comp; i++) {

+            sum += input[k][i];

+         }

+         if (minSum > sum) {

+            minSum = sum;

+            minColL = k;

+         }

+         if (maxSum < sum) {

+            maxSum = sum;

+            maxColL = k;

+         }

+      }

+   }

+   minSum = 2000; /* big enough */

+   maxSum = -1; /* small enough */

+   for (; k < N_TEXELS; k++) {

+      if (!ISTBLACK(input[k])) {

+         GLint sum = 0;

+         for (i = 0; i < n_comp; i++) {

+            sum += input[k][i];

+         }

+         if (minSum > sum) {

+            minSum = sum;

+            minColR = k;

+         }

+         if (maxSum < sum) {

+            maxSum = sum;

+            maxColR = k;

+         }

+      }

+   }

+

+   /* left microtile */

+   if (maxColL == -1) {

+      /* all transparent black */

+      cc[0] = ~0u;

+      for (i = 0; i < n_comp; i++) {

+         vec[0][i] = 0;

+         vec[1][i] = 0;

+      }

+   } else {

+      cc[0] = 0;

+      for (i = 0; i < n_comp; i++) {

+         vec[0][i] = input[minColL][i];

+         vec[1][i] = input[maxColL][i];

+      }

+      if (minColL != maxColL) {

+         /* compute interpolation vector */

+         MAKEIVEC(n_vect, n_comp, iv, b, vec[0], vec[1]);

+

+         /* add in texels */

+         lolo = 0;

+         for (k = N_TEXELS / 2 - 1; k >= 0; k--) {

+            GLint texel = n_vect + 1; /* transparent black */

+            if (!ISTBLACK(input[k])) {

+               /* interpolate color */

+               CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+            }

+            /* add in texel */

+            lolo <<= 2;

+            lolo |= texel;

+         }

+         cc[0] = lolo;

+      }

+   }

+

+   /* right microtile */

+   if (maxColR == -1) {

+      /* all transparent black */

+      cc[1] = ~0u;

+      for (i = 0; i < n_comp; i++) {

+         vec[2][i] = 0;

+         vec[3][i] = 0;

+      }

+   } else {

+      cc[1] = 0;

+      for (i = 0; i < n_comp; i++) {

+         vec[2][i] = input[minColR][i];

+         vec[3][i] = input[maxColR][i];

+      }

+      if (minColR != maxColR) {

+         /* compute interpolation vector */

+         MAKEIVEC(n_vect, n_comp, iv, b, vec[2], vec[3]);

+

+         /* add in texels */

+         lohi = 0;

+         for (k = N_TEXELS - 1; k >= N_TEXELS / 2; k--) {

+            GLint texel = n_vect + 1; /* transparent black */

+            if (!ISTBLACK(input[k])) {

+               /* interpolate color */

+               CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+            }

+            /* add in texel */

+            lohi <<= 2;

+            lohi |= texel;

+         }

+         cc[1] = lohi;

+      }

+   }

+

+   FX64_MOV32(hi, 9 | (vec[3][GCOMP] & 4) | ((vec[1][GCOMP] >> 1) & 2)); /* chroma = "1" */

+   for (j = 2 * 2 - 1; j >= 0; j--) {

+      for (i = 0; i < n_comp; i++) {

+         /* add in colors */

+         FX64_SHL(hi, 5);

+         FX64_OR32(hi, vec[j][i] >> 3);

+      }

+   }

+   ((Fx64 *)cc)[1] = hi;

+}

+

+

+static void

+fxt1_quantize_MIXED0 (GLuint *cc,

+                      GLubyte input[N_TEXELS][MAX_COMP])

+{

+   const GLint n_vect = 3; /* highest vector number in each microtile */

+   const GLint n_comp = 3; /* 3 components: R, G, B */

+   GLubyte vec[2 * 2][MAX_COMP]; /* 2 extrema for each sub-block */

+   GLfloat b, iv[MAX_COMP]; /* interpolation vector */

+   GLint i, j, k;

+   Fx64 hi; /* high quadword */

+   GLuint lohi, lolo; /* low quadword: hi dword, lo dword */

+

+   GLint minColL = 0, maxColL = 0;

+   GLint minColR = 0, maxColR = 0;

+#if 0

+   GLint minSum;

+   GLint maxSum;

+

+   /* Our solution here is to find the darkest and brightest colors in

+    * the 4x4 tile and use those as the two representative colors.

+    * There are probably better algorithms to use (histogram-based).

+    */

+   minSum = 2000; /* big enough */

+   maxSum = -1; /* small enough */

+   for (k = 0; k < N_TEXELS / 2; k++) {

+      GLint sum = 0;

+      for (i = 0; i < n_comp; i++) {

+         sum += input[k][i];

+      }

+      if (minSum > sum) {

+         minSum = sum;

+         minColL = k;

+      }

+      if (maxSum < sum) {

+         maxSum = sum;

+         maxColL = k;

+      }

+   }

+   minSum = 2000; /* big enough */

+   maxSum = -1; /* small enough */

+   for (; k < N_TEXELS; k++) {

+      GLint sum = 0;

+      for (i = 0; i < n_comp; i++) {

+         sum += input[k][i];

+      }

+      if (minSum > sum) {

+         minSum = sum;

+         minColR = k;

+      }

+      if (maxSum < sum) {

+         maxSum = sum;

+         maxColR = k;

+      }

+   }

+#else

+   GLint minVal;

+   GLint maxVal;

+   GLint maxVarL = fxt1_variance(NULL, input, n_comp, N_TEXELS / 2);

+   GLint maxVarR = fxt1_variance(NULL, &input[N_TEXELS / 2], n_comp, N_TEXELS / 2);

+

+   /* Scan the channel with max variance for lo & hi

+    * and use those as the two representative colors.

+    */

+   minVal = 2000; /* big enough */

+   maxVal = -1; /* small enough */

+   for (k = 0; k < N_TEXELS / 2; k++) {

+      GLint t = input[k][maxVarL];

+      if (minVal > t) {

+         minVal = t;

+         minColL = k;

+      }

+      if (maxVal < t) {

+         maxVal = t;

+         maxColL = k;

+      }

+   }

+   minVal = 2000; /* big enough */

+   maxVal = -1; /* small enough */

+   for (; k < N_TEXELS; k++) {

+      GLint t = input[k][maxVarR];

+      if (minVal > t) {

+         minVal = t;

+         minColR = k;

+      }

+      if (maxVal < t) {

+         maxVal = t;

+         maxColR = k;

+      }

+   }

+#endif

+

+   /* left microtile */

+   cc[0] = 0;

+   for (i = 0; i < n_comp; i++) {

+      vec[0][i] = input[minColL][i];

+      vec[1][i] = input[maxColL][i];

+   }

+   if (minColL != maxColL) {

+      /* compute interpolation vector */

+      MAKEIVEC(n_vect, n_comp, iv, b, vec[0], vec[1]);

+

+      /* add in texels */

+      lolo = 0;

+      for (k = N_TEXELS / 2 - 1; k >= 0; k--) {

+         GLint texel;

+         /* interpolate color */

+         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+         /* add in texel */

+         lolo <<= 2;

+         lolo |= texel;

+      }

+

+      /* funky encoding for LSB of green */

+      if ((GLint)((lolo >> 1) & 1) != (((vec[1][GCOMP] ^ vec[0][GCOMP]) >> 2) & 1)) {

+         for (i = 0; i < n_comp; i++) {

+            vec[1][i] = input[minColL][i];

+            vec[0][i] = input[maxColL][i];

+         }

+         lolo = ~lolo;

+      }

+      

+      cc[0] = lolo;

+   }

+

+   /* right microtile */

+   cc[1] = 0;

+   for (i = 0; i < n_comp; i++) {

+      vec[2][i] = input[minColR][i];

+      vec[3][i] = input[maxColR][i];

+   }

+   if (minColR != maxColR) {

+      /* compute interpolation vector */

+      MAKEIVEC(n_vect, n_comp, iv, b, vec[2], vec[3]);

+

+      /* add in texels */

+      lohi = 0;

+      for (k = N_TEXELS - 1; k >= N_TEXELS / 2; k--) {

+         GLint texel;

+         /* interpolate color */

+         CALCCDOT(texel, n_vect, n_comp, iv, b, input[k]);

+         /* add in texel */

+         lohi <<= 2;

+         lohi |= texel;

+      }

+

+      /* funky encoding for LSB of green */

+      if ((GLint)((lohi >> 1) & 1) != (((vec[3][GCOMP] ^ vec[2][GCOMP]) >> 2) & 1)) {

+         for (i = 0; i < n_comp; i++) {

+            vec[3][i] = input[minColR][i];

+            vec[2][i] = input[maxColR][i];

+         }

+         lohi = ~lohi;

+      }

+

+      cc[1] = lohi;

+   }

+

+   FX64_MOV32(hi, 8 | (vec[3][GCOMP] & 4) | ((vec[1][GCOMP] >> 1) & 2)); /* chroma = "1" */

+   for (j = 2 * 2 - 1; j >= 0; j--) {

+      for (i = 0; i < n_comp; i++) {

+         /* add in colors */

+         FX64_SHL(hi, 5);

+         FX64_OR32(hi, vec[j][i] >> 3);

+      }

+   }

+   ((Fx64 *)cc)[1] = hi;

+}

+

+

+static void

+fxt1_quantize (GLuint *cc, const GLubyte *lines[], GLint comps)

+{

+   GLint trualpha;

+   GLubyte reord[N_TEXELS][MAX_COMP];

+

+   GLubyte input[N_TEXELS][MAX_COMP];

+   GLint i, k, l;

+

+   if (comps == 3) {

+      /* make the whole block opaque */

+      memset(input, -1, sizeof(input));

+   }

+

+   /* 8 texels each line */

+   for (l = 0; l < 4; l++) {

+      for (k = 0; k < 4; k++) {

+         for (i = 0; i < comps; i++) {

+            input[k + l * 4][i] = *lines[l]++;

+         }

+      }

+      for (; k < 8; k++) {

+         for (i = 0; i < comps; i++) {

+            input[k + l * 4 + 12][i] = *lines[l]++;

+         }

+      }

+   }

+

+   /* block layout:

+    * 00, 01, 02, 03, 08, 09, 0a, 0b

+    * 10, 11, 12, 13, 18, 19, 1a, 1b

+    * 04, 05, 06, 07, 0c, 0d, 0e, 0f

+    * 14, 15, 16, 17, 1c, 1d, 1e, 1f

+    */

+

+   /* [dBorca]

+    * stupidity flows forth from this

+    */

+   l = N_TEXELS;

+   trualpha = 0;

+   if (comps == 4) {

+      /* skip all transparent black texels */

+      l = 0;

+      for (k = 0; k < N_TEXELS; k++) {

+         /* test all components against 0 */

+         if (!ISTBLACK(input[k])) {

+            /* texel is not transparent black */

+            COPY_4UBV(reord[l], input[k]);

+            if (reord[l][ACOMP] < (255 - ALPHA_TS)) {

+               /* non-opaque texel */

+               trualpha = !0;

+            }

+            l++;

+         }

+      }

+   }

+

+#if 0

+   if (trualpha) {

+      fxt1_quantize_ALPHA0(cc, input, reord, l);

+   } else if (l == 0) {

+      cc[0] = cc[1] = cc[2] = -1;

+      cc[3] = 0;

+   } else if (l < N_TEXELS) {

+      fxt1_quantize_HI(cc, input, reord, l);

+   } else {

+      fxt1_quantize_CHROMA(cc, input);

+   }

+   (void)fxt1_quantize_ALPHA1;

+   (void)fxt1_quantize_MIXED1;

+   (void)fxt1_quantize_MIXED0;

+#else

+   if (trualpha) {

+      fxt1_quantize_ALPHA1(cc, input);

+   } else if (l == 0) {

+      cc[0] = cc[1] = cc[2] = ~0u;

+      cc[3] = 0;

+   } else if (l < N_TEXELS) {

+      fxt1_quantize_MIXED1(cc, input);

+   } else {

+      fxt1_quantize_MIXED0(cc, input);

+   }

+   (void)fxt1_quantize_ALPHA0;

+   (void)fxt1_quantize_HI;

+   (void)fxt1_quantize_CHROMA;

+#endif

+}

+

+

+static void

+fxt1_encode (GLuint width, GLuint height, GLint comps,

+             const void *source, GLint srcRowStride,

+             void *dest, GLint destRowStride)

+{

+   GLuint x, y;

+   const GLubyte *data;

+   GLuint *encoded = (GLuint *)dest;

+   void *newSource = NULL;

+

+   assert(comps == 3 || comps == 4);

+

+   /* Replicate image if width is not M8 or height is not M4 */

+   if ((width & 7) | (height & 3)) {

+      GLint newWidth = (width + 7) & ~7;

+      GLint newHeight = (height + 3) & ~3;

+      newSource = malloc(comps * newWidth * newHeight * sizeof(GLchan));

+      if (!newSource) {

+         GET_CURRENT_CONTEXT(ctx);

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture compression");

+         goto cleanUp;

+      }

+      _mesa_upscale_teximage2d(width, height, newWidth, newHeight,

+                               comps, (const GLchan *) source,

+                               srcRowStride, (GLchan *) newSource);

+      source = newSource;

+      width = newWidth;

+      height = newHeight;

+      srcRowStride = comps * newWidth;

+   }

+

+   /* convert from 16/32-bit channels to GLubyte if needed */

+   if (CHAN_TYPE != GL_UNSIGNED_BYTE) {

+      const GLuint n = width * height * comps;

+      const GLchan *src = (const GLchan *) source;

+      GLubyte *dest = (GLubyte *) malloc(n * sizeof(GLubyte));

+      GLuint i;

+      if (!dest) {

+         GET_CURRENT_CONTEXT(ctx);

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture compression");

+         goto cleanUp;

+      }

+      for (i = 0; i < n; i++) {

+         dest[i] = CHAN_TO_UBYTE(src[i]);

+      }

+      if (newSource != NULL) {

+         free(newSource);

+      }

+      newSource = dest;  /* we'll free this buffer before returning */

+      source = dest;  /* the new, GLubyte incoming image */

+   }

+

+   data = (const GLubyte *) source;

+   destRowStride = (destRowStride - width * 2) / 4;

+   for (y = 0; y < height; y += 4) {

+      GLuint offs = 0 + (y + 0) * srcRowStride;

+      for (x = 0; x < width; x += 8) {

+         const GLubyte *lines[4];

+         lines[0] = &data[offs];

+         lines[1] = lines[0] + srcRowStride;

+         lines[2] = lines[1] + srcRowStride;

+         lines[3] = lines[2] + srcRowStride;

+         offs += 8 * comps;

+         fxt1_quantize(encoded, lines, comps);

+         /* 128 bits per 8x4 block */

+         encoded += 4;

+      }

+      encoded += destRowStride;

+   }

+

+ cleanUp:

+   if (newSource != NULL) {

+      free(newSource);

+   }

+}

+

+

+/***************************************************************************\

+ * FXT1 decoder

+ *

+ * The decoder is based on GL_3DFX_texture_compression_FXT1

+ * specification and serves as a concept for the encoder.

+\***************************************************************************/

+

+

+/* lookup table for scaling 5 bit colors up to 8 bits */

+static const GLubyte _rgb_scale_5[] = {

+   0,   8,   16,  25,  33,  41,  49,  58,

+   66,  74,  82,  90,  99,  107, 115, 123,

+   132, 140, 148, 156, 165, 173, 181, 189,

+   197, 206, 214, 222, 230, 239, 247, 255

+};

+

+/* lookup table for scaling 6 bit colors up to 8 bits */

+static const GLubyte _rgb_scale_6[] = {

+   0,   4,   8,   12,  16,  20,  24,  28,

+   32,  36,  40,  45,  49,  53,  57,  61,

+   65,  69,  73,  77,  81,  85,  89,  93,

+   97,  101, 105, 109, 113, 117, 121, 125,

+   130, 134, 138, 142, 146, 150, 154, 158,

+   162, 166, 170, 174, 178, 182, 186, 190,

+   194, 198, 202, 206, 210, 215, 219, 223,

+   227, 231, 235, 239, 243, 247, 251, 255

+};

+

+

+#define CC_SEL(cc, which) (((GLuint *)(cc))[(which) / 32] >> ((which) & 31))

+#define UP5(c) _rgb_scale_5[(c) & 31]

+#define UP6(c, b) _rgb_scale_6[(((c) & 31) << 1) | ((b) & 1)]

+#define LERP(n, t, c0, c1) (((n) - (t)) * (c0) + (t) * (c1) + (n) / 2) / (n)

+

+

+static void

+fxt1_decode_1HI (const GLubyte *code, GLint t, GLchan *rgba)

+{

+   const GLuint *cc;

+

+   t *= 3;

+   cc = (const GLuint *)(code + t / 8);

+   t = (cc[0] >> (t & 7)) & 7;

+

+   if (t == 7) {

+      rgba[RCOMP] = rgba[GCOMP] = rgba[BCOMP] = rgba[ACOMP] = 0;

+   } else {

+      GLubyte r, g, b;

+      cc = (const GLuint *)(code + 12);

+      if (t == 0) {

+         b = UP5(CC_SEL(cc, 0));

+         g = UP5(CC_SEL(cc, 5));

+         r = UP5(CC_SEL(cc, 10));

+      } else if (t == 6) {

+         b = UP5(CC_SEL(cc, 15));

+         g = UP5(CC_SEL(cc, 20));

+         r = UP5(CC_SEL(cc, 25));

+      } else {

+         b = LERP(6, t, UP5(CC_SEL(cc, 0)), UP5(CC_SEL(cc, 15)));

+         g = LERP(6, t, UP5(CC_SEL(cc, 5)), UP5(CC_SEL(cc, 20)));

+         r = LERP(6, t, UP5(CC_SEL(cc, 10)), UP5(CC_SEL(cc, 25)));

+      }

+      rgba[RCOMP] = UBYTE_TO_CHAN(r);

+      rgba[GCOMP] = UBYTE_TO_CHAN(g);

+      rgba[BCOMP] = UBYTE_TO_CHAN(b);

+      rgba[ACOMP] = CHAN_MAX;

+   }

+}

+

+

+static void

+fxt1_decode_1CHROMA (const GLubyte *code, GLint t, GLchan *rgba)

+{

+   const GLuint *cc;

+   GLuint kk;

+

+   cc = (const GLuint *)code;

+   if (t & 16) {

+      cc++;

+      t &= 15;

+   }

+   t = (cc[0] >> (t * 2)) & 3;

+

+   t *= 15;

+   cc = (const GLuint *)(code + 8 + t / 8);

+   kk = cc[0] >> (t & 7);

+   rgba[BCOMP] = UBYTE_TO_CHAN( UP5(kk) );

+   rgba[GCOMP] = UBYTE_TO_CHAN( UP5(kk >> 5) );

+   rgba[RCOMP] = UBYTE_TO_CHAN( UP5(kk >> 10) );

+   rgba[ACOMP] = CHAN_MAX;

+}

+

+

+static void

+fxt1_decode_1MIXED (const GLubyte *code, GLint t, GLchan *rgba)

+{

+   const GLuint *cc;

+   GLuint col[2][3];

+   GLint glsb, selb;

+

+   cc = (const GLuint *)code;

+   if (t & 16) {

+      t &= 15;

+      t = (cc[1] >> (t * 2)) & 3;

+      /* col 2 */

+      col[0][BCOMP] = (*(const GLuint *)(code + 11)) >> 6;

+      col[0][GCOMP] = CC_SEL(cc, 99);

+      col[0][RCOMP] = CC_SEL(cc, 104);

+      /* col 3 */

+      col[1][BCOMP] = CC_SEL(cc, 109);

+      col[1][GCOMP] = CC_SEL(cc, 114);

+      col[1][RCOMP] = CC_SEL(cc, 119);

+      glsb = CC_SEL(cc, 126);

+      selb = CC_SEL(cc, 33);

+   } else {

+      t = (cc[0] >> (t * 2)) & 3;

+      /* col 0 */

+      col[0][BCOMP] = CC_SEL(cc, 64);

+      col[0][GCOMP] = CC_SEL(cc, 69);

+      col[0][RCOMP] = CC_SEL(cc, 74);

+      /* col 1 */

+      col[1][BCOMP] = CC_SEL(cc, 79);

+      col[1][GCOMP] = CC_SEL(cc, 84);

+      col[1][RCOMP] = CC_SEL(cc, 89);

+      glsb = CC_SEL(cc, 125);

+      selb = CC_SEL(cc, 1);

+   }

+

+   if (CC_SEL(cc, 124) & 1) {

+      /* alpha[0] == 1 */

+

+      if (t == 3) {

+         /* zero */

+         rgba[RCOMP] = rgba[BCOMP] = rgba[GCOMP] = rgba[ACOMP] = 0;

+      } else {

+         GLubyte r, g, b;

+         if (t == 0) {

+            b = UP5(col[0][BCOMP]);

+            g = UP5(col[0][GCOMP]);

+            r = UP5(col[0][RCOMP]);

+         } else if (t == 2) {

+            b = UP5(col[1][BCOMP]);

+            g = UP6(col[1][GCOMP], glsb);

+            r = UP5(col[1][RCOMP]);

+         } else {

+            b = (UP5(col[0][BCOMP]) + UP5(col[1][BCOMP])) / 2;

+            g = (UP5(col[0][GCOMP]) + UP6(col[1][GCOMP], glsb)) / 2;

+            r = (UP5(col[0][RCOMP]) + UP5(col[1][RCOMP])) / 2;

+         }

+         rgba[RCOMP] = UBYTE_TO_CHAN(r);

+         rgba[GCOMP] = UBYTE_TO_CHAN(g);

+         rgba[BCOMP] = UBYTE_TO_CHAN(b);

+         rgba[ACOMP] = CHAN_MAX;

+      }

+   } else {

+      /* alpha[0] == 0 */

+      GLubyte r, g, b;

+      if (t == 0) {

+         b = UP5(col[0][BCOMP]);

+         g = UP6(col[0][GCOMP], glsb ^ selb);

+         r = UP5(col[0][RCOMP]);

+      } else if (t == 3) {

+         b = UP5(col[1][BCOMP]);

+         g = UP6(col[1][GCOMP], glsb);

+         r = UP5(col[1][RCOMP]);

+      } else {

+         b = LERP(3, t, UP5(col[0][BCOMP]), UP5(col[1][BCOMP]));

+         g = LERP(3, t, UP6(col[0][GCOMP], glsb ^ selb),

+                        UP6(col[1][GCOMP], glsb));

+         r = LERP(3, t, UP5(col[0][RCOMP]), UP5(col[1][RCOMP]));

+      }

+      rgba[RCOMP] = UBYTE_TO_CHAN(r);

+      rgba[GCOMP] = UBYTE_TO_CHAN(g);

+      rgba[BCOMP] = UBYTE_TO_CHAN(b);

+      rgba[ACOMP] = CHAN_MAX;

+   }

+}

+

+

+static void

+fxt1_decode_1ALPHA (const GLubyte *code, GLint t, GLchan *rgba)

+{

+   const GLuint *cc;

+   GLubyte r, g, b, a;

+

+   cc = (const GLuint *)code;

+   if (CC_SEL(cc, 124) & 1) {

+      /* lerp == 1 */

+      GLuint col0[4];

+

+      if (t & 16) {

+         t &= 15;

+         t = (cc[1] >> (t * 2)) & 3;

+         /* col 2 */

+         col0[BCOMP] = (*(const GLuint *)(code + 11)) >> 6;

+         col0[GCOMP] = CC_SEL(cc, 99);

+         col0[RCOMP] = CC_SEL(cc, 104);

+         col0[ACOMP] = CC_SEL(cc, 119);

+      } else {

+         t = (cc[0] >> (t * 2)) & 3;

+         /* col 0 */

+         col0[BCOMP] = CC_SEL(cc, 64);

+         col0[GCOMP] = CC_SEL(cc, 69);

+         col0[RCOMP] = CC_SEL(cc, 74);

+         col0[ACOMP] = CC_SEL(cc, 109);

+      }

+

+      if (t == 0) {

+         b = UP5(col0[BCOMP]);

+         g = UP5(col0[GCOMP]);

+         r = UP5(col0[RCOMP]);

+         a = UP5(col0[ACOMP]);

+      } else if (t == 3) {

+         b = UP5(CC_SEL(cc, 79));

+         g = UP5(CC_SEL(cc, 84));

+         r = UP5(CC_SEL(cc, 89));

+         a = UP5(CC_SEL(cc, 114));

+      } else {

+         b = LERP(3, t, UP5(col0[BCOMP]), UP5(CC_SEL(cc, 79)));

+         g = LERP(3, t, UP5(col0[GCOMP]), UP5(CC_SEL(cc, 84)));

+         r = LERP(3, t, UP5(col0[RCOMP]), UP5(CC_SEL(cc, 89)));

+         a = LERP(3, t, UP5(col0[ACOMP]), UP5(CC_SEL(cc, 114)));

+      }

+   } else {

+      /* lerp == 0 */

+

+      if (t & 16) {

+         cc++;

+         t &= 15;

+      }

+      t = (cc[0] >> (t * 2)) & 3;

+

+      if (t == 3) {

+         /* zero */

+         r = g = b = a = 0;

+      } else {

+         GLuint kk;

+         cc = (const GLuint *)code;

+         a = UP5(cc[3] >> (t * 5 + 13));

+         t *= 15;

+         cc = (const GLuint *)(code + 8 + t / 8);

+         kk = cc[0] >> (t & 7);

+         b = UP5(kk);

+         g = UP5(kk >> 5);

+         r = UP5(kk >> 10);

+      }

+   }

+   rgba[RCOMP] = UBYTE_TO_CHAN(r);

+   rgba[GCOMP] = UBYTE_TO_CHAN(g);

+   rgba[BCOMP] = UBYTE_TO_CHAN(b);

+   rgba[ACOMP] = UBYTE_TO_CHAN(a);

+}

+

+

+void

+fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */

+               GLint i, GLint j, GLchan *rgba)

+{

+   static void (*decode_1[]) (const GLubyte *, GLint, GLchan *) = {

+      fxt1_decode_1HI,     /* cc-high   = "00?" */

+      fxt1_decode_1HI,     /* cc-high   = "00?" */

+      fxt1_decode_1CHROMA, /* cc-chroma = "010" */

+      fxt1_decode_1ALPHA,  /* alpha     = "011" */

+      fxt1_decode_1MIXED,  /* mixed     = "1??" */

+      fxt1_decode_1MIXED,  /* mixed     = "1??" */

+      fxt1_decode_1MIXED,  /* mixed     = "1??" */

+      fxt1_decode_1MIXED   /* mixed     = "1??" */

+   };

+

+   const GLubyte *code = (const GLubyte *)texture +

+                         ((j / 4) * (stride / 8) + (i / 8)) * 16;

+   GLint mode = CC_SEL(code, 125);

+   GLint t = i & 7;

+

+   if (t & 4) {

+      t += 12;

+   }

+   t += (j & 3) * 4;

+

+   decode_1[mode](code, t, rgba);

+}

+

+

+#endif /* FEATURE_texture_fxt1 */

diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index 45a2f9c17..307ca9436 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -1,577 +1,572 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2007  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_s3tc.c
- * GL_EXT_texture_compression_s3tc support.
- */
-
-#ifndef USE_EXTERNAL_DXTN_LIB
-#define USE_EXTERNAL_DXTN_LIB 1
-#endif
-
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "convolve.h"
-#include "dlopen.h"
-#include "image.h"
-#include "macros.h"
-#include "texcompress.h"
-#include "texcompress_s3tc.h"
-#include "texstore.h"
-
-
-#if FEATURE_texture_s3tc
-
-
-#if defined(_WIN32) || defined(WIN32)
-#define DXTN_LIBNAME "dxtn.dll"
-#define RTLD_LAZY 0
-#define RTLD_GLOBAL 0
-#elif defined(__DJGPP__)
-#define DXTN_LIBNAME "dxtn.dxe"
-#else
-#define DXTN_LIBNAME "libtxc_dxtn.so"
-#endif
-
-#if FEATURE_EXT_texture_sRGB
-/**
- * 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];
-}
-#endif /* FEATURE_EXT_texture_sRGB */
-
-typedef void (*dxtFetchTexelFuncExt)( GLint srcRowstride, GLubyte *pixdata, GLint col, GLint row, GLvoid *texelOut );
-
-dxtFetchTexelFuncExt fetch_ext_rgb_dxt1 = NULL;
-dxtFetchTexelFuncExt fetch_ext_rgba_dxt1 = NULL;
-dxtFetchTexelFuncExt fetch_ext_rgba_dxt3 = NULL;
-dxtFetchTexelFuncExt fetch_ext_rgba_dxt5 = NULL;
-
-typedef void (*dxtCompressTexFuncExt)(GLint srccomps, GLint width,
-                                      GLint height, const GLchan *srcPixData,
-                                      GLenum destformat, GLubyte *dest,
-                                      GLint dstRowStride);
-
-static dxtCompressTexFuncExt ext_tx_compress_dxtn = NULL;
-
-static void *dxtlibhandle = NULL;
-
-
-void
-_mesa_init_texture_s3tc( GLcontext *ctx )
-{
-   /* called during context initialization */
-   ctx->Mesa_DXTn = GL_FALSE;
-#if USE_EXTERNAL_DXTN_LIB
-   if (!dxtlibhandle) {
-      dxtlibhandle = _mesa_dlopen(DXTN_LIBNAME, 0);
-      if (!dxtlibhandle) {
-	 _mesa_warning(ctx, "couldn't open " DXTN_LIBNAME ", software DXTn "
-	    "compression/decompression unavailable");
-      }
-      else {
-         /* the fetch functions are not per context! Might be problematic... */
-         fetch_ext_rgb_dxt1 = (dxtFetchTexelFuncExt)
-            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgb_dxt1");
-         fetch_ext_rgba_dxt1 = (dxtFetchTexelFuncExt)
-            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt1");
-         fetch_ext_rgba_dxt3 = (dxtFetchTexelFuncExt)
-            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt3");
-         fetch_ext_rgba_dxt5 = (dxtFetchTexelFuncExt)
-            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt5");
-         ext_tx_compress_dxtn = (dxtCompressTexFuncExt)
-            _mesa_dlsym(dxtlibhandle, "tx_compress_dxtn");
-
-         if (!fetch_ext_rgb_dxt1 ||
-             !fetch_ext_rgba_dxt1 ||
-             !fetch_ext_rgba_dxt3 ||
-             !fetch_ext_rgba_dxt5 ||
-             !ext_tx_compress_dxtn) {
-	    _mesa_warning(ctx, "couldn't reference all symbols in "
-	       DXTN_LIBNAME ", software DXTn compression/decompression "
-	       "unavailable");
-            fetch_ext_rgb_dxt1 = NULL;
-            fetch_ext_rgba_dxt1 = NULL;
-            fetch_ext_rgba_dxt3 = NULL;
-            fetch_ext_rgba_dxt5 = NULL;
-            ext_tx_compress_dxtn = NULL;
-            _mesa_dlclose(dxtlibhandle);
-            dxtlibhandle = NULL;
-         }
-      }
-   }
-   if (dxtlibhandle) {
-      ctx->Mesa_DXTn = GL_TRUE;
-   }
-#else
-   (void) ctx;
-#endif
-}
-
-/**
- * Store user's image in rgb_dxt1 format.
- */
-GLboolean
-_mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
-{
-   const GLchan *pixels;
-   GLint srcRowStride;
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-
-   ASSERT(dstFormat == MESA_FORMAT_RGB_DXT1 ||
-          dstFormat == MESA_FORMAT_SRGB_DXT1);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   if (srcFormat != GL_RGB ||
-       srcType != CHAN_TYPE ||
-       ctx->_ImageTransferState ||
-       srcPacking->SwapBytes) {
-      /* convert image to RGB/GLchan */
-      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 */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      pixels = tempImage;
-      srcRowStride = 3 * srcWidth;
-      srcFormat = GL_RGB;
-   }
-   else {
-      pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
-   }
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-
-   if (ext_tx_compress_dxtn) {
-      (*ext_tx_compress_dxtn)(3, srcWidth, srcHeight, pixels,
-                              GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
-                              dst, dstRowStride);
-   }
-   else {
-      _mesa_warning(ctx, "external dxt library not available: texstore_rgb_dxt1");
-   }
-
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-
-/**
- * Store user's image in rgba_dxt1 format.
- */
-GLboolean
-_mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
-{
-   const GLchan *pixels;
-   GLint srcRowStride;
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT1 ||
-          dstFormat == MESA_FORMAT_SRGBA_DXT1);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   if (srcFormat != GL_RGBA ||
-       srcType != CHAN_TYPE ||
-       ctx->_ImageTransferState ||
-       srcPacking->SwapBytes) {
-      /* convert image to RGBA/GLchan */
-      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 */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
-      srcFormat = GL_RGBA;
-   }
-   else {
-      pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
-   }
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-   if (ext_tx_compress_dxtn) {
-      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,
-                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
-                              dst, dstRowStride);
-   }
-   else {
-      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt1");
-   }
-
-   if (tempImage)
-      free((void*) tempImage);
-
-   return GL_TRUE;
-}
-
-
-/**
- * Store user's image in rgba_dxt3 format.
- */
-GLboolean
-_mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
-{
-   const GLchan *pixels;
-   GLint srcRowStride;
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT3 ||
-          dstFormat == MESA_FORMAT_SRGBA_DXT3);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   if (srcFormat != GL_RGBA ||
-       srcType != CHAN_TYPE ||
-       ctx->_ImageTransferState ||
-       srcPacking->SwapBytes) {
-      /* convert image to RGBA/GLchan */
-      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 */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
-   }
-   else {
-      pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
-   }
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-   if (ext_tx_compress_dxtn) {
-      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,
-                              GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
-                              dst, dstRowStride);
-   }
-   else {
-      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt3");
-   }
-
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-
-/**
- * Store user's image in rgba_dxt5 format.
- */
-GLboolean
-_mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
-{
-   const GLchan *pixels;
-   GLint srcRowStride;
-   GLubyte *dst;
-   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
-   const GLchan *tempImage = NULL;
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT5 ||
-          dstFormat == MESA_FORMAT_SRGBA_DXT5);
-   ASSERT(dstXoffset % 4 == 0);
-   ASSERT(dstYoffset % 4 == 0);
-   ASSERT(dstZoffset % 4 == 0);
-   (void) dstZoffset;
-   (void) dstImageOffsets;
-
-   if (srcFormat != GL_RGBA ||
-       srcType != CHAN_TYPE ||
-       ctx->_ImageTransferState ||
-       srcPacking->SwapBytes) {
-      /* convert image to RGBA/GLchan */
-      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 */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      pixels = tempImage;
-      srcRowStride = 4 * srcWidth;
-   }
-   else {
-      pixels = (const GLchan *) srcAddr;
-      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,
-                                            srcType) / sizeof(GLchan);
-   }
-
-   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
-                                        dstFormat,
-                                        texWidth, (GLubyte *) dstAddr);
-   if (ext_tx_compress_dxtn) {
-      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,
-                              GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,
-                              dst, dstRowStride);
-   }
-   else {
-      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt5");
-   }
-
-   if (tempImage)
-      free((void *) tempImage);
-
-   return GL_TRUE;
-}
-
-
-static void
-fetch_texel_2d_rgb_dxt1( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLchan *texel )
-{
-   (void) k;
-   if (fetch_ext_rgb_dxt1) {
-      ASSERT (sizeof(GLchan) == sizeof(GLubyte));
-      fetch_ext_rgb_dxt1(texImage->RowStride,
-                         (GLubyte *)(texImage)->Data, i, j, texel);
-   }
-   else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgb_dxt1");
-}
-
-
-void
-_mesa_fetch_texel_2d_f_rgb_dxt1(const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba);
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-
-static void
-fetch_texel_2d_rgba_dxt1( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLchan *texel )
-{
-   (void) k;
-   if (fetch_ext_rgba_dxt1) {
-      fetch_ext_rgba_dxt1(texImage->RowStride,
-                          (GLubyte *)(texImage)->Data, i, j, texel);
-   }
-   else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt1\n");
-}
-
-
-void
-_mesa_fetch_texel_2d_f_rgba_dxt1(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba);
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-
-static void
-fetch_texel_2d_rgba_dxt3( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLchan *texel )
-{
-   (void) k;
-   if (fetch_ext_rgba_dxt3) {
-      ASSERT (sizeof(GLchan) == sizeof(GLubyte));
-      fetch_ext_rgba_dxt3(texImage->RowStride, (GLubyte *)(texImage)->Data,
-                          i, j, texel);
-   }
-   else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt3\n");
-}
-
-
-void
-_mesa_fetch_texel_2d_f_rgba_dxt3(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba);
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-
-static void
-fetch_texel_2d_rgba_dxt5( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLchan *texel )
-{
-   (void) k;
-   if (fetch_ext_rgba_dxt5) {
-      fetch_ext_rgba_dxt5(texImage->RowStride, (GLubyte *)(texImage)->Data,
-                          i, j, texel);
-   }
-   else
-      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt5\n");
-}
-
-
-void
-_mesa_fetch_texel_2d_f_rgba_dxt5(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba);
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-#if FEATURE_EXT_texture_sRGB
-void
-_mesa_fetch_texel_2d_f_srgb_dxt1( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba);
-   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
-   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
-   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-void
-_mesa_fetch_texel_2d_f_srgba_dxt1(const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba);
-   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
-   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
-   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-void
-_mesa_fetch_texel_2d_f_srgba_dxt3(const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba);
-   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
-   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
-   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
-void
-_mesa_fetch_texel_2d_f_srgba_dxt5(const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel)
-{
-   /* just sample as GLchan and convert to float here */
-   GLchan rgba[4];
-   fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba);
-   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);
-   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);
-   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-#endif /* FEATURE_EXT_texture_sRGB */
-
-
-#endif /* FEATURE_texture_s3tc */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.3

+ *

+ * Copyright (C) 1999-2007  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_s3tc.c

+ * GL_EXT_texture_compression_s3tc support.

+ */

+

+#ifndef USE_EXTERNAL_DXTN_LIB

+#define USE_EXTERNAL_DXTN_LIB 1

+#endif

+

+#include "glheader.h"

+#include "imports.h"

+#include "colormac.h"

+#include "dlopen.h"

+#include "image.h"

+#include "macros.h"

+#include "texcompress.h"

+#include "texcompress_s3tc.h"

+#include "texstore.h"

+

+

+#if FEATURE_texture_s3tc

+

+

+#if defined(_WIN32) || defined(WIN32)

+#define DXTN_LIBNAME "dxtn.dll"

+#define RTLD_LAZY 0

+#define RTLD_GLOBAL 0

+#elif defined(__DJGPP__)

+#define DXTN_LIBNAME "dxtn.dxe"

+#else

+#define DXTN_LIBNAME "libtxc_dxtn.so"

+#endif

+

+#if FEATURE_EXT_texture_sRGB

+/**

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

+}

+#endif /* FEATURE_EXT_texture_sRGB */

+

+typedef void (*dxtFetchTexelFuncExt)( GLint srcRowstride, GLubyte *pixdata, GLint col, GLint row, GLvoid *texelOut );

+

+dxtFetchTexelFuncExt fetch_ext_rgb_dxt1 = NULL;

+dxtFetchTexelFuncExt fetch_ext_rgba_dxt1 = NULL;

+dxtFetchTexelFuncExt fetch_ext_rgba_dxt3 = NULL;

+dxtFetchTexelFuncExt fetch_ext_rgba_dxt5 = NULL;

+

+typedef void (*dxtCompressTexFuncExt)(GLint srccomps, GLint width,

+                                      GLint height, const GLchan *srcPixData,

+                                      GLenum destformat, GLubyte *dest,

+                                      GLint dstRowStride);

+

+static dxtCompressTexFuncExt ext_tx_compress_dxtn = NULL;

+

+static void *dxtlibhandle = NULL;

+

+

+void

+_mesa_init_texture_s3tc( struct gl_context *ctx )

+{

+   /* called during context initialization */

+   ctx->Mesa_DXTn = GL_FALSE;

+#if USE_EXTERNAL_DXTN_LIB

+   if (!dxtlibhandle) {

+      dxtlibhandle = _mesa_dlopen(DXTN_LIBNAME, 0);

+      if (!dxtlibhandle) {

+	 _mesa_warning(ctx, "couldn't open " DXTN_LIBNAME ", software DXTn "

+	    "compression/decompression unavailable");

+      }

+      else {

+         /* the fetch functions are not per context! Might be problematic... */

+         fetch_ext_rgb_dxt1 = (dxtFetchTexelFuncExt)

+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgb_dxt1");

+         fetch_ext_rgba_dxt1 = (dxtFetchTexelFuncExt)

+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt1");

+         fetch_ext_rgba_dxt3 = (dxtFetchTexelFuncExt)

+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt3");

+         fetch_ext_rgba_dxt5 = (dxtFetchTexelFuncExt)

+            _mesa_dlsym(dxtlibhandle, "fetch_2d_texel_rgba_dxt5");

+         ext_tx_compress_dxtn = (dxtCompressTexFuncExt)

+            _mesa_dlsym(dxtlibhandle, "tx_compress_dxtn");

+

+         if (!fetch_ext_rgb_dxt1 ||

+             !fetch_ext_rgba_dxt1 ||

+             !fetch_ext_rgba_dxt3 ||

+             !fetch_ext_rgba_dxt5 ||

+             !ext_tx_compress_dxtn) {

+	    _mesa_warning(ctx, "couldn't reference all symbols in "

+	       DXTN_LIBNAME ", software DXTn compression/decompression "

+	       "unavailable");

+            fetch_ext_rgb_dxt1 = NULL;

+            fetch_ext_rgba_dxt1 = NULL;

+            fetch_ext_rgba_dxt3 = NULL;

+            fetch_ext_rgba_dxt5 = NULL;

+            ext_tx_compress_dxtn = NULL;

+            _mesa_dlclose(dxtlibhandle);

+            dxtlibhandle = NULL;

+         }

+      }

+   }

+   if (dxtlibhandle) {

+      ctx->Mesa_DXTn = GL_TRUE;

+   }

+#else

+   (void) ctx;

+#endif

+}

+

+/**

+ * Store user's image in rgb_dxt1 format.

+ */

+GLboolean

+_mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)

+{

+   const GLchan *pixels;

+   GLint srcRowStride;

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+

+   ASSERT(dstFormat == MESA_FORMAT_RGB_DXT1 ||

+          dstFormat == MESA_FORMAT_SRGB_DXT1);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   if (srcFormat != GL_RGB ||

+       srcType != CHAN_TYPE ||

+       ctx->_ImageTransferState ||

+       srcPacking->SwapBytes) {

+      /* convert image to RGB/GLchan */

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

+      pixels = tempImage;

+      srcRowStride = 3 * srcWidth;

+      srcFormat = GL_RGB;

+   }

+   else {

+      pixels = (const GLchan *) srcAddr;

+      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

+                                            srcType) / sizeof(GLchan);

+   }

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+

+   if (ext_tx_compress_dxtn) {

+      (*ext_tx_compress_dxtn)(3, srcWidth, srcHeight, pixels,

+                              GL_COMPRESSED_RGB_S3TC_DXT1_EXT,

+                              dst, dstRowStride);

+   }

+   else {

+      _mesa_warning(ctx, "external dxt library not available: texstore_rgb_dxt1");

+   }

+

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Store user's image in rgba_dxt1 format.

+ */

+GLboolean

+_mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)

+{

+   const GLchan *pixels;

+   GLint srcRowStride;

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT1 ||

+          dstFormat == MESA_FORMAT_SRGBA_DXT1);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   if (srcFormat != GL_RGBA ||

+       srcType != CHAN_TYPE ||

+       ctx->_ImageTransferState ||

+       srcPacking->SwapBytes) {

+      /* convert image to RGBA/GLchan */

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

+      pixels = tempImage;

+      srcRowStride = 4 * srcWidth;

+      srcFormat = GL_RGBA;

+   }

+   else {

+      pixels = (const GLchan *) srcAddr;

+      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

+                                            srcType) / sizeof(GLchan);

+   }

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+   if (ext_tx_compress_dxtn) {

+      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,

+                              GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,

+                              dst, dstRowStride);

+   }

+   else {

+      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt1");

+   }

+

+   if (tempImage)

+      free((void*) tempImage);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Store user's image in rgba_dxt3 format.

+ */

+GLboolean

+_mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)

+{

+   const GLchan *pixels;

+   GLint srcRowStride;

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT3 ||

+          dstFormat == MESA_FORMAT_SRGBA_DXT3);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   if (srcFormat != GL_RGBA ||

+       srcType != CHAN_TYPE ||

+       ctx->_ImageTransferState ||

+       srcPacking->SwapBytes) {

+      /* convert image to RGBA/GLchan */

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

+      pixels = tempImage;

+      srcRowStride = 4 * srcWidth;

+   }

+   else {

+      pixels = (const GLchan *) srcAddr;

+      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

+                                            srcType) / sizeof(GLchan);

+   }

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+   if (ext_tx_compress_dxtn) {

+      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,

+                              GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,

+                              dst, dstRowStride);

+   }

+   else {

+      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt3");

+   }

+

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Store user's image in rgba_dxt5 format.

+ */

+GLboolean

+_mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)

+{

+   const GLchan *pixels;

+   GLint srcRowStride;

+   GLubyte *dst;

+   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */

+   const GLchan *tempImage = NULL;

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT5 ||

+          dstFormat == MESA_FORMAT_SRGBA_DXT5);

+   ASSERT(dstXoffset % 4 == 0);

+   ASSERT(dstYoffset % 4 == 0);

+   ASSERT(dstZoffset % 4 == 0);

+   (void) dstZoffset;

+   (void) dstImageOffsets;

+

+   if (srcFormat != GL_RGBA ||

+       srcType != CHAN_TYPE ||

+       ctx->_ImageTransferState ||

+       srcPacking->SwapBytes) {

+      /* convert image to RGBA/GLchan */

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

+      pixels = tempImage;

+      srcRowStride = 4 * srcWidth;

+   }

+   else {

+      pixels = (const GLchan *) srcAddr;

+      srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat,

+                                            srcType) / sizeof(GLchan);

+   }

+

+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,

+                                        dstFormat,

+                                        texWidth, (GLubyte *) dstAddr);

+   if (ext_tx_compress_dxtn) {

+      (*ext_tx_compress_dxtn)(4, srcWidth, srcHeight, pixels,

+                              GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,

+                              dst, dstRowStride);

+   }

+   else {

+      _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt5");

+   }

+

+   if (tempImage)

+      free((void *) tempImage);

+

+   return GL_TRUE;

+}

+

+

+static void

+fetch_texel_2d_rgb_dxt1( const struct gl_texture_image *texImage,

+                         GLint i, GLint j, GLint k, GLchan *texel )

+{

+   (void) k;

+   if (fetch_ext_rgb_dxt1) {

+      ASSERT (sizeof(GLchan) == sizeof(GLubyte));

+      fetch_ext_rgb_dxt1(texImage->RowStride,

+                         (GLubyte *)(texImage)->Data, i, j, texel);

+   }

+   else

+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgb_dxt1");

+}

+

+

+void

+_mesa_fetch_texel_2d_f_rgb_dxt1(const struct gl_texture_image *texImage,

+                                GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba);

+   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);

+   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);

+   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+

+static void

+fetch_texel_2d_rgba_dxt1( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLchan *texel )

+{

+   (void) k;

+   if (fetch_ext_rgba_dxt1) {

+      fetch_ext_rgba_dxt1(texImage->RowStride,

+                          (GLubyte *)(texImage)->Data, i, j, texel);

+   }

+   else

+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt1\n");

+}

+

+

+void

+_mesa_fetch_texel_2d_f_rgba_dxt1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba);

+   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);

+   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);

+   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+

+static void

+fetch_texel_2d_rgba_dxt3( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLchan *texel )

+{

+   (void) k;

+   if (fetch_ext_rgba_dxt3) {

+      ASSERT (sizeof(GLchan) == sizeof(GLubyte));

+      fetch_ext_rgba_dxt3(texImage->RowStride, (GLubyte *)(texImage)->Data,

+                          i, j, texel);

+   }

+   else

+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt3\n");

+}

+

+

+void

+_mesa_fetch_texel_2d_f_rgba_dxt3(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba);

+   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);

+   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);

+   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+

+static void

+fetch_texel_2d_rgba_dxt5( const struct gl_texture_image *texImage,

+                          GLint i, GLint j, GLint k, GLchan *texel )

+{

+   (void) k;

+   if (fetch_ext_rgba_dxt5) {

+      fetch_ext_rgba_dxt5(texImage->RowStride, (GLubyte *)(texImage)->Data,

+                          i, j, texel);

+   }

+   else

+      _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt5\n");

+}

+

+

+void

+_mesa_fetch_texel_2d_f_rgba_dxt5(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba);

+   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);

+   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);

+   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+#if FEATURE_EXT_texture_sRGB

+void

+_mesa_fetch_texel_2d_f_srgb_dxt1( const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel )

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgb_dxt1(texImage, i, j, k, rgba);

+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);

+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);

+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+void

+_mesa_fetch_texel_2d_f_srgba_dxt1(const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgba_dxt1(texImage, i, j, k, rgba);

+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);

+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);

+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+void

+_mesa_fetch_texel_2d_f_srgba_dxt3(const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgba_dxt3(texImage, i, j, k, rgba);

+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);

+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);

+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+

+void

+_mesa_fetch_texel_2d_f_srgba_dxt5(const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel)

+{

+   /* just sample as GLchan and convert to float here */

+   GLchan rgba[4];

+   fetch_texel_2d_rgba_dxt5(texImage, i, j, k, rgba);

+   texel[RCOMP] = nonlinear_to_linear(rgba[RCOMP]);

+   texel[GCOMP] = nonlinear_to_linear(rgba[GCOMP]);

+   texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]);

+   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);

+}

+#endif /* FEATURE_EXT_texture_sRGB */

+

+

+#endif /* FEATURE_texture_s3tc */

diff --git a/mesalib/src/mesa/main/texcompress_s3tc.h b/mesalib/src/mesa/main/texcompress_s3tc.h
index 2e7688d36..555cff9c2 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.h
+++ b/mesalib/src/mesa/main/texcompress_s3tc.h
@@ -1,106 +1,110 @@
-/*
- * 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.
- */
-
-#ifndef TEXCOMPRESS_S3TC_H
-#define TEXCOMPRESS_S3TC_H
-
-#include "main/mtypes.h"
-#include "texstore.h"
-
-
-#if FEATURE_texture_s3tc
-
-extern GLboolean
-_mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS);
-
-extern GLboolean
-_mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS);
-
-extern void
-_mesa_fetch_texel_2d_f_rgb_dxt1(const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rgba_dxt1(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rgba_dxt3(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rgba_dxt5(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_srgb_dxt1(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_srgba_dxt1(const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_srgba_dxt3(const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_srgba_dxt5(const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_init_texture_s3tc(GLcontext *ctx);
-
-#else /* FEATURE_texture_s3tc */
-
-/* these are used only in texstore_funcs[] */
-#define _mesa_texstore_rgb_dxt1 NULL
-#define _mesa_texstore_rgba_dxt1 NULL
-#define _mesa_texstore_rgba_dxt3 NULL
-#define _mesa_texstore_rgba_dxt5 NULL
-
-/* these are used only in texfetch_funcs[] */
-#define _mesa_fetch_texel_2d_f_rgb_dxt1 NULL
-#define _mesa_fetch_texel_2d_f_rgba_dxt1 NULL
-#define _mesa_fetch_texel_2d_f_rgba_dxt3 NULL
-#define _mesa_fetch_texel_2d_f_rgba_dxt5 NULL
-#define _mesa_fetch_texel_2d_f_srgb_dxt1 NULL
-#define _mesa_fetch_texel_2d_f_srgba_dxt1 NULL
-#define _mesa_fetch_texel_2d_f_srgba_dxt3 NULL
-#define _mesa_fetch_texel_2d_f_srgba_dxt5 NULL
-
-static INLINE void
-_mesa_init_texture_s3tc(GLcontext *ctx)
-{
-}
-
-#endif /* FEATURE_texture_s3tc */
-
-#endif /* TEXCOMPRESS_S3TC_H */
+/*

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

+ */

+

+#ifndef TEXCOMPRESS_S3TC_H

+#define TEXCOMPRESS_S3TC_H

+

+#include "compiler.h"

+#include "glheader.h"

+#include "mfeatures.h"

+#include "texstore.h"

+

+struct gl_context;

+struct gl_texture_image;

+

+#if FEATURE_texture_s3tc

+

+extern GLboolean

+_mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS);

+

+extern GLboolean

+_mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS);

+

+extern void

+_mesa_fetch_texel_2d_f_rgb_dxt1(const struct gl_texture_image *texImage,

+                                GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_rgba_dxt1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_rgba_dxt3(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_rgba_dxt5(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_srgb_dxt1(const struct gl_texture_image *texImage,

+                                 GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_srgba_dxt1(const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_srgba_dxt3(const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_fetch_texel_2d_f_srgba_dxt5(const struct gl_texture_image *texImage,

+                                  GLint i, GLint j, GLint k, GLfloat *texel);

+

+extern void

+_mesa_init_texture_s3tc(struct gl_context *ctx);

+

+#else /* FEATURE_texture_s3tc */

+

+/* these are used only in texstore_funcs[] */

+#define _mesa_texstore_rgb_dxt1 NULL

+#define _mesa_texstore_rgba_dxt1 NULL

+#define _mesa_texstore_rgba_dxt3 NULL

+#define _mesa_texstore_rgba_dxt5 NULL

+

+/* these are used only in texfetch_funcs[] */

+#define _mesa_fetch_texel_2d_f_rgb_dxt1 NULL

+#define _mesa_fetch_texel_2d_f_rgba_dxt1 NULL

+#define _mesa_fetch_texel_2d_f_rgba_dxt3 NULL

+#define _mesa_fetch_texel_2d_f_rgba_dxt5 NULL

+#define _mesa_fetch_texel_2d_f_srgb_dxt1 NULL

+#define _mesa_fetch_texel_2d_f_srgba_dxt1 NULL

+#define _mesa_fetch_texel_2d_f_srgba_dxt3 NULL

+#define _mesa_fetch_texel_2d_f_srgba_dxt5 NULL

+

+static INLINE void

+_mesa_init_texture_s3tc(struct gl_context *ctx)

+{

+}

+

+#endif /* FEATURE_texture_s3tc */

+

+#endif /* TEXCOMPRESS_S3TC_H */

diff --git a/mesalib/src/mesa/main/texenv.c b/mesalib/src/mesa/main/texenv.c
index 3a55128c7..5669cc4bc 100644
--- a/mesalib/src/mesa/main/texenv.c
+++ b/mesalib/src/mesa/main/texenv.c
@@ -1,1036 +1,1036 @@
-/*
- * 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/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(GLcontext *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(GLcontext *ctx,
-              struct gl_texture_unit *texUnit,
-              const GLfloat *color)
-{
-   GLfloat tmp[4];
-   tmp[0] = CLAMP(color[0], 0.0F, 1.0F);
-   tmp[1] = CLAMP(color[1], 0.0F, 1.0F);
-   tmp[2] = CLAMP(color[2], 0.0F, 1.0F);
-   tmp[3] = CLAMP(color[3], 0.0F, 1.0F);
-   if (TEST_EQ_4V(tmp, texUnit->EnvColor))
-      return;
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-   COPY_4FV(texUnit->EnvColor, tmp);
-}
-
-
-/** Set an RGB or A combiner mode/function */
-static void
-set_combiner_mode(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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 )
-{
-   GLuint maxUnit;
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_texture_unit *texUnit;
-   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) (GLint) param[0]);
-         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) (GLint) param[0]);
-	 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) (GLint) param[0]);
-	 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) (GLint) param[0]);
-	 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 (((GLenum) (GLint) param[0] < GL_TEXTURE0) ||
-	 ((GLenum) (GLint) param[0] > GL_TEXTURE31)) {
-	    /* spec doesn't say this but it seems logical */
-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);
-	    return;
-	 }
-	 if (!((1 << ((GLenum) (GLint) param[0] - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {
-	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);
-	    return;
-	 }
-	 else {
-	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-	    texUnit->BumpTarget = (GLenum) (GLint) param[0];
-	 }
-	 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) {
-         const GLenum value = (GLenum) param[0];
-         if (value == GL_TRUE || value == 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) value;
-            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)", value);
-            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) (GLint) *param));
-
-   /* 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(GLcontext *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) {
-         COPY_4FV( params, texUnit->EnvColor );
-      }
-      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/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)

+{

+   GLfloat tmp[4];

+   tmp[0] = CLAMP(color[0], 0.0F, 1.0F);

+   tmp[1] = CLAMP(color[1], 0.0F, 1.0F);

+   tmp[2] = CLAMP(color[2], 0.0F, 1.0F);

+   tmp[3] = CLAMP(color[3], 0.0F, 1.0F);

+   if (TEST_EQ_4V(tmp, texUnit->EnvColor))

+      return;

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+   COPY_4FV(texUnit->EnvColor, tmp);

+}

+

+

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

+{

+   GLuint maxUnit;

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_texture_unit *texUnit;

+   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) (GLint) param[0]);

+         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) (GLint) param[0]);

+	 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) (GLint) param[0]);

+	 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) (GLint) param[0]);

+	 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 (((GLenum) (GLint) param[0] < GL_TEXTURE0) ||

+	 ((GLenum) (GLint) param[0] > GL_TEXTURE31)) {

+	    /* spec doesn't say this but it seems logical */

+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);

+	    return;

+	 }

+	 if (!((1 << ((GLenum) (GLint) param[0] - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);

+	    return;

+	 }

+	 else {

+	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+	    texUnit->BumpTarget = (GLenum) (GLint) param[0];

+	 }

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

+         const GLenum value = (GLenum) param[0];

+         if (value == GL_TRUE || value == 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) value;

+            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)", value);

+            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) (GLint) *param));

+

+   /* 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) {

+         COPY_4FV( params, texUnit->EnvColor );

+      }

+      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/texenvprogram.c b/mesalib/src/mesa/main/texenvprogram.c
index 20f02cefe..aa318f7de 100644
--- a/mesalib/src/mesa/main/texenvprogram.c
+++ b/mesalib/src/mesa/main/texenvprogram.c
@@ -1,1616 +1,1617 @@
-/**************************************************************************
- * 
- * 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.
- * 
- **************************************************************************/
-
-#include "glheader.h"
-#include "imports.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(GLcontext *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( GLcontext *ctx )
-{
-   /* _NEW_PROGRAM */
-   const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
-				   ctx->Shader.CurrentProgram->LinkStatus &&
-                                   ctx->Shader.CurrentProgram->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.CurrentProgram->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( GLcontext *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,
-   ~0,
-   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(GLcontext *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)
-{
-   gl_state_index 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, 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, 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(GLcontext *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) {
-      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 GLcontext, 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 (p.program->FogOption) {
-      _mesa_append_fog_code(ctx, p.program);
-      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");
-   }
-}
-
-
-/**
- * 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(GLcontext *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.

+ * 

+ **************************************************************************/

+

+#include "glheader.h"

+#include "imports.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,

+   ~0,

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

+{

+   gl_state_index 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, 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, 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) {

+      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 (p.program->FogOption) {

+      _mesa_append_fog_code(ctx, p.program);

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

+   }

+}

+

+

+/**

+ * 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/texenvprogram.h b/mesalib/src/mesa/main/texenvprogram.h
index 0a162d2e7..0895ebacb 100644
--- a/mesalib/src/mesa/main/texenvprogram.h
+++ b/mesalib/src/mesa/main/texenvprogram.h
@@ -1,35 +1,35 @@
-/*
- * 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 TEXENVPROGRAM_H
-#define TEXENVPROGRAM_H
-
-
-#include "mtypes.h"
-
-extern struct gl_fragment_program *
-_mesa_get_fixed_func_fragment_program(GLcontext *ctx);
-
-#endif
+/*

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

+#define TEXENVPROGRAM_H

+

+

+struct gl_context;

+

+extern struct gl_fragment_program *

+_mesa_get_fixed_func_fragment_program(struct gl_context *ctx);

+

+#endif

diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c
index c03bc71cd..812243a7b 100644
--- a/mesalib/src/mesa/main/texfetch.c
+++ b/mesalib/src/mesa/main/texfetch.c
@@ -1,798 +1,869 @@
-/*
- * 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 "texfetch.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_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_L8,
-      fetch_texel_1d_f_l8,
-      fetch_texel_2d_f_l8,
-      fetch_texel_3d_f_l8,
-      store_texel_l8
-   },
-   {
-      MESA_FORMAT_I8,
-      fetch_texel_1d_f_i8,
-      fetch_texel_2d_f_i8,
-      fetch_texel_3d_f_i8,
-      store_texel_i8
-   },
-   {
-      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_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,
-      fetch_texel_1d_signed_rg88,
-      fetch_texel_2d_signed_rg88,
-      fetch_texel_3d_signed_rg88,
-      store_texel_signed_rg88
-   },
-   {
-      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_R_16,
-      fetch_texel_1d_signed_r_16,
-      fetch_texel_2d_signed_r_16,
-      fetch_texel_3d_signed_r_16,
-      store_texel_signed_r_16
-   },
-   {
-      MESA_FORMAT_SIGNED_RG_16,
-      fetch_texel_1d_signed_rg_16,
-      fetch_texel_2d_signed_rg_16,
-      fetch_texel_3d_signed_rg_16,
-      store_texel_signed_rg_16
-   },
-   {
-      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
-   }
-};
-
-
-static 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)
-{
-   ASSERT(dims == 1 || dims == 2 || dims == 3);
-   ASSERT(texImage->TexFormat);
-
-   if (!texImage->FetchTexelf) {
-      texImage->FetchTexelf =
-         _mesa_get_texel_fetch_func(texImage->TexFormat, dims);
-   }
-
-   /* now check if we need to use a float/chan adaptor */
-   if (!texImage->FetchTexelc) {
-      texImage->FetchTexelc = fetch_texel_float_to_chan;
-   }
-
-   ASSERT(texImage->FetchTexelc);
-   ASSERT(texImage->FetchTexelf);
-}
+/*

+ * 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 "texfetch.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,

+      fetch_texel_1d_signed_rg88,

+      fetch_texel_2d_signed_rg88,

+      fetch_texel_3d_signed_rg88,

+      store_texel_signed_rg88

+   },

+   {

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

+      fetch_texel_1d_signed_r_16,

+      fetch_texel_2d_signed_r_16,

+      fetch_texel_3d_signed_r_16,

+      store_texel_signed_r_16

+   },

+   {

+      MESA_FORMAT_SIGNED_RG_16,

+      fetch_texel_1d_signed_rg_16,

+      fetch_texel_2d_signed_rg_16,

+      fetch_texel_3d_signed_rg_16,

+      store_texel_signed_rg_16

+   },

+   {

+      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

+   }

+};

+

+

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

+{

+   ASSERT(dims == 1 || dims == 2 || dims == 3);

+

+   texImage->FetchTexelf =

+      _mesa_get_texel_fetch_func(texImage->TexFormat, dims);

+

+   texImage->FetchTexelc = fetch_texel_float_to_chan;

+

+   ASSERT(texImage->FetchTexelc);

+   ASSERT(texImage->FetchTexelf);

+}

diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h
index f94355437..40f56209f 100644
--- a/mesalib/src/mesa/main/texfetch_tmp.h
+++ b/mesalib/src/mesa/main/texfetch_tmp.h
@@ -1,1768 +1,2040 @@
-/*
- * 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, 1);
-   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 *depth = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   dst[0] = _mesa_float_to_half(*depth);
-}
-#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 *depth = (const GLfloat *) texel;
-   GLfloat *dst = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   dst[0] = *depth;
-}
-#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 *depth = (const GLfloat *) texel;
-   GLhalfARB *dst = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   dst[0] = _mesa_float_to_half(*depth);
-}
-#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_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_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_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_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_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_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_RG88 ***********************************************/
-
-static void FETCH(signed_rg88)( 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 >> 8) );
-   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );
-   texel[BCOMP] = 0.0F;
-   texel[ACOMP] = 1.0F;
-}
-
-#if DIM == 3
-static void store_texel_signed_rg88(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, 2);
-   *dst = PACK_COLOR_88(rg[RCOMP], rg[GCOMP]);
-}
-#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_R_16 ***********************************************/
-
-static void
-FETCH(signed_r_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, 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_r_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, 1);
-   *dst = rgba[0];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RG_16 ***********************************************/
-
-static void
-FETCH(signed_rg_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, 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_rg_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, 2);
-   dst[0] = rgba[RCOMP];
-   dst[1] = rgba[GCOMP];
-}
-#endif
-
-
-/* MESA_FORMAT_SIGNED_RGBA_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(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] = UBYTE_TO_FLOAT( (s & 0x0f) << 4 );

+   texel[ACOMP] = UBYTE_TO_FLOAT(  s & 0xf0 );

+}

+

+#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_RG88 ***********************************************/

+

+static void FETCH(signed_rg88)( 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 >> 8) );

+   texel[GCOMP] = BYTE_TO_FLOAT_TEX( (GLbyte) (s & 0xff) );

+   texel[BCOMP] = 0.0F;

+   texel[ACOMP] = 1.0F;

+}

+

+#if DIM == 3

+static void store_texel_signed_rg88(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, 2);

+   *dst = PACK_COLOR_88(rg[RCOMP], rg[GCOMP]);

+}

+#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_R_16 ***********************************************/

+

+static void

+FETCH(signed_r_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, 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_r_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, 1);

+   *dst = rgba[0];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RG_16 ***********************************************/

+

+static void

+FETCH(signed_rg_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, 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_rg_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, 2);

+   dst[0] = rgba[RCOMP];

+   dst[1] = rgba[GCOMP];

+}

+#endif

+

+

+/* MESA_FORMAT_SIGNED_RGBA_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 b9271ef58..7b0b17b25 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -1,435 +1,468 @@
-/*
- * 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 "texcompress.h"
-#include "texformat.h"
-
-
-/**
- * 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( GLcontext *ctx, GLint internalFormat,
-                         GLenum format, GLenum type )
-{
-   (void) format;
-   (void) type;
-
-   switch (internalFormat) {
-      /* shallow RGBA formats */
-      case 4:
-      case GL_RGBA:
-      case GL_RGBA8:
-         return MESA_FORMAT_RGBA8888;
-      case GL_RGB5_A1:
-         return MESA_FORMAT_ARGB1555;
-      case GL_RGBA2:
-         return MESA_FORMAT_ARGB4444_REV; /* just to test another format*/
-      case GL_RGBA4:
-         return MESA_FORMAT_ARGB4444;
-
-      /* deep RGBA formats */
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-         return MESA_FORMAT_RGBA_16;
-
-      /* shallow RGB formats */
-      case 3:
-      case GL_RGB:
-      case GL_RGB8:
-         return MESA_FORMAT_RGB888;
-      case GL_R3_G3_B2:
-         return MESA_FORMAT_RGB332;
-      case GL_RGB4:
-         return MESA_FORMAT_RGB565_REV; /* just to test another format */
-      case GL_RGB5:
-         return MESA_FORMAT_RGB565;
-
-      /* deep RGB formats */
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-         return MESA_FORMAT_RGBA_16;
-
-      /* Alpha formats */
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-      case GL_ALPHA8:
-         return MESA_FORMAT_A8;
-
-      /* Luminance formats */
-      case 1:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-      case GL_LUMINANCE8:
-         return MESA_FORMAT_L8;
-
-      /* Luminance/Alpha formats */
-      case 2:
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-         return MESA_FORMAT_AL88;
-
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-         return MESA_FORMAT_AL1616;
-
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-      case GL_INTENSITY8:
-         return MESA_FORMAT_I8;
-
-      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 MESA_FORMAT_CI8;
-
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.ARB_depth_texture) {
-      switch (internalFormat) {
-         case GL_DEPTH_COMPONENT:
-         case GL_DEPTH_COMPONENT24:
-         case GL_DEPTH_COMPONENT32:
-            return MESA_FORMAT_Z32;
-         case GL_DEPTH_COMPONENT16:
-            return MESA_FORMAT_Z16;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   switch (internalFormat) {
-      case GL_COMPRESSED_ALPHA_ARB:
-         return MESA_FORMAT_A8;
-      case GL_COMPRESSED_LUMINANCE_ARB:
-         return MESA_FORMAT_L8;
-      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
-         return MESA_FORMAT_AL88;
-      case GL_COMPRESSED_INTENSITY_ARB:
-         return MESA_FORMAT_I8;
-      case GL_COMPRESSED_RGB_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-            return MESA_FORMAT_RGB_DXT1;
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-            return MESA_FORMAT_RGB_FXT1;
-         return MESA_FORMAT_RGB888;
-      case GL_COMPRESSED_RGBA_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-            return MESA_FORMAT_RGBA_DXT3; /* Not rgba_dxt1, see spec */
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-            return MESA_FORMAT_RGBA_FXT1;
-         return MESA_FORMAT_RGBA8888;
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.MESA_ycbcr_texture) {
-      if (internalFormat == GL_YCBCR_MESA) {
-         if (type == GL_UNSIGNED_SHORT_8_8_MESA)
-            return MESA_FORMAT_YCBCR;
-         else
-            return MESA_FORMAT_YCBCR_REV;
-      }
-   }
-
-#if FEATURE_texture_fxt1
-   if (ctx->Extensions.TDFX_texture_compression_FXT1) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_FXT1_3DFX:
-            return MESA_FORMAT_RGB_FXT1;
-         case GL_COMPRESSED_RGBA_FXT1_3DFX:
-            return MESA_FORMAT_RGBA_FXT1;
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif
-
-#if FEATURE_texture_s3tc
-   if (ctx->Extensions.EXT_texture_compression_s3tc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-            return MESA_FORMAT_RGB_DXT1;
-         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-            return MESA_FORMAT_RGBA_DXT1;
-         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-            return MESA_FORMAT_RGBA_DXT3;
-         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-            return MESA_FORMAT_RGBA_DXT5;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.S3_s3tc) {
-      switch (internalFormat) {
-         case GL_RGB_S3TC:
-         case GL_RGB4_S3TC:
-            return MESA_FORMAT_RGB_DXT1;
-         case GL_RGBA_S3TC:
-         case GL_RGBA4_S3TC:
-            return MESA_FORMAT_RGBA_DXT3;
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif
-
-   if (ctx->Extensions.ARB_texture_float) {
-      switch (internalFormat) {
-         case GL_ALPHA16F_ARB:
-            return MESA_FORMAT_ALPHA_FLOAT16;
-         case GL_ALPHA32F_ARB:
-            return MESA_FORMAT_ALPHA_FLOAT32;
-         case GL_LUMINANCE16F_ARB:
-            return MESA_FORMAT_LUMINANCE_FLOAT16;
-         case GL_LUMINANCE32F_ARB:
-            return MESA_FORMAT_LUMINANCE_FLOAT32;
-         case GL_LUMINANCE_ALPHA16F_ARB:
-            return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;
-         case GL_LUMINANCE_ALPHA32F_ARB:
-            return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;
-         case GL_INTENSITY16F_ARB:
-            return MESA_FORMAT_INTENSITY_FLOAT16;
-         case GL_INTENSITY32F_ARB:
-            return MESA_FORMAT_INTENSITY_FLOAT32;
-         case GL_RGB16F_ARB:
-            return MESA_FORMAT_RGB_FLOAT16;
-         case GL_RGB32F_ARB:
-            return MESA_FORMAT_RGB_FLOAT32;
-         case GL_RGBA16F_ARB:
-            return MESA_FORMAT_RGBA_FLOAT16;
-         case GL_RGBA32F_ARB:
-            return MESA_FORMAT_RGBA_FLOAT32;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_depth_stencil) {
-      switch (internalFormat) {
-         case GL_DEPTH_STENCIL_EXT:
-         case GL_DEPTH24_STENCIL8_EXT:
-            return MESA_FORMAT_Z24_S8;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ATI_envmap_bumpmap) {
-      switch (internalFormat) {
-         case GL_DUDV_ATI:
-         case GL_DU8DV8_ATI:
-            return MESA_FORMAT_DUDV8;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.MESA_texture_signed_rgba) {
-      switch (internalFormat) {
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-            return MESA_FORMAT_SIGNED_RGBA8888;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->VersionMajor * 10 + ctx->VersionMinor >= 31) {
-      switch (internalFormat) {
-         case GL_RED_SNORM:
-         case GL_R8_SNORM:
-            return MESA_FORMAT_SIGNED_R8;
-         case GL_RG_SNORM:
-         case GL_RG8_SNORM:
-            return MESA_FORMAT_SIGNED_RG88;
-         case GL_RGB_SNORM:
-         case GL_RGB8_SNORM:
-            return MESA_FORMAT_SIGNED_RGBX8888;
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-            return MESA_FORMAT_SIGNED_RGBA8888;
-         case GL_R16_SNORM:
-            return MESA_FORMAT_SIGNED_R_16;
-         case GL_RG16_SNORM:
-            return MESA_FORMAT_SIGNED_RG_16;
-         case GL_RGB16_SNORM:
-            return MESA_FORMAT_SIGNED_RGB_16;
-         case GL_RGBA16_SNORM:
-            return MESA_FORMAT_SIGNED_RGBA_16;
-         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 MESA_FORMAT_SRGB8;
-         case GL_SRGB_ALPHA_EXT:
-         case GL_SRGB8_ALPHA8_EXT:
-            return MESA_FORMAT_SRGBA8;
-         case GL_SLUMINANCE_EXT:
-         case GL_SLUMINANCE8_EXT:
-            return MESA_FORMAT_SL8;
-         case GL_SLUMINANCE_ALPHA_EXT:
-         case GL_SLUMINANCE8_ALPHA8_EXT:
-            return MESA_FORMAT_SLA8;
-         case GL_COMPRESSED_SLUMINANCE_EXT:
-            return MESA_FORMAT_SL8;
-         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-            return MESA_FORMAT_SLA8;
-         case GL_COMPRESSED_SRGB_EXT:
-#if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-               return MESA_FORMAT_SRGB_DXT1;
-#endif
-            return MESA_FORMAT_SRGB8;
-         case GL_COMPRESSED_SRGB_ALPHA_EXT:
-#if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-               return MESA_FORMAT_SRGBA_DXT3; /* Not srgba_dxt1, see spec */
-#endif
-            return MESA_FORMAT_SRGBA8;
-#if FEATURE_texture_s3tc
-         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-               return MESA_FORMAT_SRGB_DXT1;
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-               return MESA_FORMAT_SRGBA_DXT1;
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-               return MESA_FORMAT_SRGBA_DXT3;
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-               return MESA_FORMAT_SRGBA_DXT5;
-            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 MESA_FORMAT_RGBA_UINT32;
-      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 MESA_FORMAT_RGBA_UINT16;
-      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 MESA_FORMAT_RGBA_UINT8;
-      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 MESA_FORMAT_RGBA_INT32;
-      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 MESA_FORMAT_RGBA_INT16;
-      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 MESA_FORMAT_RGBA_INT8;
-      }
-   }
-
-   _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 "texcompress.h"

+#include "texformat.h"

+

+

+/**

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

+      case GL_RGBA8:

+         return MESA_FORMAT_RGBA8888;

+      case GL_RGB5_A1:

+         return MESA_FORMAT_ARGB1555;

+      case GL_RGBA2:

+         return MESA_FORMAT_ARGB4444_REV; /* just to test another format*/

+      case GL_RGBA4:

+         return MESA_FORMAT_ARGB4444;

+

+      /* deep RGBA formats */

+      case GL_RGB10_A2:

+         return MESA_FORMAT_ARGB2101010;

+

+      case GL_RGBA12:

+      case GL_RGBA16:

+         return MESA_FORMAT_RGBA_16;

+

+      /* shallow RGB formats */

+      case 3:

+      case GL_RGB:

+      case GL_RGB8:

+         return MESA_FORMAT_RGB888;

+      case GL_R3_G3_B2:

+         return MESA_FORMAT_RGB332;

+      case GL_RGB4:

+         return MESA_FORMAT_RGB565_REV; /* just to test another format */

+      case GL_RGB5:

+         return MESA_FORMAT_RGB565;

+

+      /* deep RGB formats */

+      case GL_RGB10:

+      case GL_RGB12:

+      case GL_RGB16:

+         return MESA_FORMAT_RGBA_16;

+

+      /* Alpha formats */

+      case GL_ALPHA:

+      case GL_ALPHA4:

+      case GL_ALPHA8:

+         return MESA_FORMAT_A8;

+

+      case GL_ALPHA12:

+      case GL_ALPHA16:

+         return MESA_FORMAT_A16;

+

+      /* Luminance formats */

+      case 1:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE4:

+      case GL_LUMINANCE8:

+         return MESA_FORMAT_L8;

+

+      case GL_LUMINANCE12:

+      case GL_LUMINANCE16:

+         return MESA_FORMAT_L16;

+

+      /* Luminance/Alpha formats */

+      case GL_LUMINANCE4_ALPHA4:

+         return MESA_FORMAT_AL44;

+

+      case 2:

+      case GL_LUMINANCE_ALPHA:

+      case GL_LUMINANCE6_ALPHA2:

+      case GL_LUMINANCE8_ALPHA8:

+         return MESA_FORMAT_AL88;

+

+      case GL_LUMINANCE12_ALPHA4:

+      case GL_LUMINANCE12_ALPHA12:

+      case GL_LUMINANCE16_ALPHA16:

+         return MESA_FORMAT_AL1616;

+

+      case GL_INTENSITY:

+      case GL_INTENSITY4:

+      case GL_INTENSITY8:

+         return MESA_FORMAT_I8;

+

+      case GL_INTENSITY12:

+      case GL_INTENSITY16:

+         return MESA_FORMAT_I16;

+

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

+

+      default:

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.ARB_depth_texture) {

+      switch (internalFormat) {

+         case GL_DEPTH_COMPONENT:

+         case GL_DEPTH_COMPONENT24:

+         case GL_DEPTH_COMPONENT32:

+            return MESA_FORMAT_Z32;

+         case GL_DEPTH_COMPONENT16:

+            return MESA_FORMAT_Z16;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   switch (internalFormat) {

+      case GL_COMPRESSED_ALPHA_ARB:

+         return MESA_FORMAT_A8;

+      case GL_COMPRESSED_LUMINANCE_ARB:

+         return MESA_FORMAT_L8;

+      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:

+         return MESA_FORMAT_AL88;

+      case GL_COMPRESSED_INTENSITY_ARB:

+         return MESA_FORMAT_I8;

+      case GL_COMPRESSED_RGB_ARB:

+         if (ctx->Extensions.EXT_texture_compression_s3tc ||

+             ctx->Extensions.S3_s3tc)

+            return MESA_FORMAT_RGB_DXT1;

+         if (ctx->Extensions.TDFX_texture_compression_FXT1)

+            return MESA_FORMAT_RGB_FXT1;

+         return MESA_FORMAT_RGB888;

+      case GL_COMPRESSED_RGBA_ARB:

+         if (ctx->Extensions.EXT_texture_compression_s3tc ||

+             ctx->Extensions.S3_s3tc)

+            return MESA_FORMAT_RGBA_DXT3; /* Not rgba_dxt1, see spec */

+         if (ctx->Extensions.TDFX_texture_compression_FXT1)

+            return MESA_FORMAT_RGBA_FXT1;

+         return MESA_FORMAT_RGBA8888;

+      default:

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.MESA_ycbcr_texture) {

+      if (internalFormat == GL_YCBCR_MESA) {

+         if (type == GL_UNSIGNED_SHORT_8_8_MESA)

+            return MESA_FORMAT_YCBCR;

+         else

+            return MESA_FORMAT_YCBCR_REV;

+      }

+   }

+

+#if FEATURE_texture_fxt1

+   if (ctx->Extensions.TDFX_texture_compression_FXT1) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_FXT1_3DFX:

+            return MESA_FORMAT_RGB_FXT1;

+         case GL_COMPRESSED_RGBA_FXT1_3DFX:

+            return MESA_FORMAT_RGBA_FXT1;

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif

+

+#if FEATURE_texture_s3tc

+   if (ctx->Extensions.EXT_texture_compression_s3tc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+            return MESA_FORMAT_RGB_DXT1;

+         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+            return MESA_FORMAT_RGBA_DXT1;

+         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+            return MESA_FORMAT_RGBA_DXT3;

+         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+            return MESA_FORMAT_RGBA_DXT5;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.S3_s3tc) {

+      switch (internalFormat) {

+         case GL_RGB_S3TC:

+         case GL_RGB4_S3TC:

+            return MESA_FORMAT_RGB_DXT1;

+         case GL_RGBA_S3TC:

+         case GL_RGBA4_S3TC:

+            return MESA_FORMAT_RGBA_DXT3;

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif

+

+   if (ctx->Extensions.ARB_texture_float) {

+      switch (internalFormat) {

+         case GL_ALPHA16F_ARB:

+            return MESA_FORMAT_ALPHA_FLOAT16;

+         case GL_ALPHA32F_ARB:

+            return MESA_FORMAT_ALPHA_FLOAT32;

+         case GL_LUMINANCE16F_ARB:

+            return MESA_FORMAT_LUMINANCE_FLOAT16;

+         case GL_LUMINANCE32F_ARB:

+            return MESA_FORMAT_LUMINANCE_FLOAT32;

+         case GL_LUMINANCE_ALPHA16F_ARB:

+            return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;

+         case GL_LUMINANCE_ALPHA32F_ARB:

+            return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;

+         case GL_INTENSITY16F_ARB:

+            return MESA_FORMAT_INTENSITY_FLOAT16;

+         case GL_INTENSITY32F_ARB:

+            return MESA_FORMAT_INTENSITY_FLOAT32;

+         case GL_RGB16F_ARB:

+            return MESA_FORMAT_RGB_FLOAT16;

+         case GL_RGB32F_ARB:

+            return MESA_FORMAT_RGB_FLOAT32;

+         case GL_RGBA16F_ARB:

+            return MESA_FORMAT_RGBA_FLOAT16;

+         case GL_RGBA32F_ARB:

+            return MESA_FORMAT_RGBA_FLOAT32;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_packed_depth_stencil) {

+      switch (internalFormat) {

+         case GL_DEPTH_STENCIL_EXT:

+         case GL_DEPTH24_STENCIL8_EXT:

+            return MESA_FORMAT_Z24_S8;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_envmap_bumpmap) {

+      switch (internalFormat) {

+         case GL_DUDV_ATI:

+         case GL_DU8DV8_ATI:

+            return MESA_FORMAT_DUDV8;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.MESA_texture_signed_rgba) {

+      switch (internalFormat) {

+         case GL_RGBA_SNORM:

+         case GL_RGBA8_SNORM:

+            return MESA_FORMAT_SIGNED_RGBA8888;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->VersionMajor * 10 + ctx->VersionMinor >= 31) {

+      switch (internalFormat) {

+         case GL_RED_SNORM:

+         case GL_R8_SNORM:

+            return MESA_FORMAT_SIGNED_R8;

+         case GL_RG_SNORM:

+         case GL_RG8_SNORM:

+            return MESA_FORMAT_SIGNED_RG88;

+         case GL_RGB_SNORM:

+         case GL_RGB8_SNORM:

+            return MESA_FORMAT_SIGNED_RGBX8888;

+         case GL_RGBA_SNORM:

+         case GL_RGBA8_SNORM:

+            return MESA_FORMAT_SIGNED_RGBA8888;

+         case GL_R16_SNORM:

+            return MESA_FORMAT_SIGNED_R_16;

+         case GL_RG16_SNORM:

+            return MESA_FORMAT_SIGNED_RG_16;

+         case GL_RGB16_SNORM:

+            return MESA_FORMAT_SIGNED_RGB_16;

+         case GL_RGBA16_SNORM:

+            return MESA_FORMAT_SIGNED_RGBA_16;

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

+         case GL_SRGB_ALPHA_EXT:

+         case GL_SRGB8_ALPHA8_EXT:

+            return MESA_FORMAT_SRGBA8;

+         case GL_SLUMINANCE_EXT:

+         case GL_SLUMINANCE8_EXT:

+            return MESA_FORMAT_SL8;

+         case GL_SLUMINANCE_ALPHA_EXT:

+         case GL_SLUMINANCE8_ALPHA8_EXT:

+            return MESA_FORMAT_SLA8;

+         case GL_COMPRESSED_SLUMINANCE_EXT:

+            return MESA_FORMAT_SL8;

+         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

+            return MESA_FORMAT_SLA8;

+         case GL_COMPRESSED_SRGB_EXT:

+#if FEATURE_texture_s3tc

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+               return MESA_FORMAT_SRGB_DXT1;

+#endif

+            return MESA_FORMAT_SRGB8;

+         case GL_COMPRESSED_SRGB_ALPHA_EXT:

+#if FEATURE_texture_s3tc

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+               return MESA_FORMAT_SRGBA_DXT3; /* Not srgba_dxt1, see spec */

+#endif

+            return MESA_FORMAT_SRGBA8;

+#if FEATURE_texture_s3tc

+         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+               return MESA_FORMAT_SRGB_DXT1;

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+               return MESA_FORMAT_SRGBA_DXT1;

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+               return MESA_FORMAT_SRGBA_DXT3;

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+               return MESA_FORMAT_SRGBA_DXT5;

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

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

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

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

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

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

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_rg) {

+      switch (internalFormat) {

+      case GL_R8:

+      case GL_RED:

+      case GL_COMPRESSED_RED:

+	 return MESA_FORMAT_R8;

+

+      case GL_R16:

+         return MESA_FORMAT_R16;

+

+      case GL_RG:

+      case GL_RG8:

+      case GL_COMPRESSED_RG:

+	 return MESA_FORMAT_RG88;

+

+      case GL_RG16:

+	 return MESA_FORMAT_RG1616;

+

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");

+   return MESA_FORMAT_NONE;

+}

+

diff --git a/mesalib/src/mesa/main/texformat.h b/mesalib/src/mesa/main/texformat.h
index bda5fd6d8..b84117995 100644
--- a/mesalib/src/mesa/main/texformat.h
+++ b/mesalib/src/mesa/main/texformat.h
@@ -1,39 +1,39 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.75
- *
- * 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.
- */
-
-#ifndef TEXFORMAT_H
-#define TEXFORMAT_H
-
-
-#include "mtypes.h"
-#include "formats.h"
-
-
-extern gl_format
-_mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
-                         GLenum format, GLenum type );
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.75

+ *

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

+ */

+

+#ifndef TEXFORMAT_H

+#define TEXFORMAT_H

+

+

+#include "formats.h"

+

+struct gl_context;

+

+extern gl_format

+_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,

+                         GLenum format, GLenum type );

+

+

+#endif

diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 00134ea9f..227a670da 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -1,883 +1,915 @@
-/*
- * 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.
- */
-
-
-/**
- * Code for glGetTexImage() and glGetCompressedTexImage().
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "enums.h"
-#include "context.h"
-#include "formats.h"
-#include "image.h"
-#include "texgetimage.h"
-#include "teximage.h"
-
-
-
-/**
- * Can the given type represent negative values?
- */
-static INLINE GLboolean
-type_with_negative_values(GLenum type)
-{
-   switch (type) {
-   case GL_BYTE:
-   case GL_SHORT:
-   case GL_INT:
-   case GL_FLOAT:
-   case GL_HALF_FLOAT_ARB:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * glGetTexImage for color index pixels.
- */
-static void
-get_tex_color_index(GLcontext *ctx, GLuint dimensions,
-                    GLenum format, GLenum type, GLvoid *pixels,
-                    const struct gl_texture_image *texImage)
-{
-   const GLint width = texImage->Width;
-   const GLint height = texImage->Height;
-   const GLint depth = texImage->Depth;
-   const GLuint indexBits =
-      _mesa_get_format_bits(texImage->TexFormat, GL_TEXTURE_INDEX_SIZE_EXT);
-   const GLbitfield transferOps = 0x0;
-   GLint img, row, col;
-
-   for (img = 0; img < depth; img++) {
-      for (row = 0; row < height; row++) {
-         GLuint indexRow[MAX_WIDTH] = { 0 };
-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
-                                          width, height, format, type,
-                                          img, row, 0);
-         assert(dest);
-
-         if (indexBits == 8) {
-            const GLubyte *src = (const GLubyte *) texImage->Data;
-            src += width * (img * texImage->Height + row);
-            for (col = 0; col < width; col++) {
-               indexRow[col] = src[col];
-            }
-         }
-         else if (indexBits == 16) {
-            const GLushort *src = (const GLushort *) texImage->Data;
-            src += width * (img * texImage->Height + row);
-            for (col = 0; col < width; col++) {
-               indexRow[col] = src[col];
-            }
-         }
-         else {
-            _mesa_problem(ctx, "Color index problem in _mesa_GetTexImage");
-         }
-         _mesa_pack_index_span(ctx, width, type, dest,
-                               indexRow, &ctx->Pack, transferOps);
-      }
-   }
-}
-
-
-/**
- * glGetTexImage for depth/Z pixels.
- */
-static void
-get_tex_depth(GLcontext *ctx, GLuint dimensions,
-              GLenum format, GLenum type, GLvoid *pixels,
-              const struct gl_texture_image *texImage)
-{
-   const GLint width = texImage->Width;
-   const GLint height = texImage->Height;
-   const GLint depth = texImage->Depth;
-   GLint img, row, col;
-
-   for (img = 0; img < depth; img++) {
-      for (row = 0; row < height; row++) {
-         GLfloat depthRow[MAX_WIDTH];
-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
-                                          width, height, format, type,
-                                          img, row, 0);
-         assert(dest);
-
-         for (col = 0; col < width; col++) {
-            texImage->FetchTexelf(texImage, col, row, img, depthRow + col);
-         }
-         _mesa_pack_depth_span(ctx, width, dest, type, depthRow, &ctx->Pack);
-      }
-   }
-}
-
-
-/**
- * glGetTexImage for depth/stencil pixels.
- */
-static void
-get_tex_depth_stencil(GLcontext *ctx, GLuint dimensions,
-                      GLenum format, GLenum type, GLvoid *pixels,
-                      const struct gl_texture_image *texImage)
-{
-   const GLint width = texImage->Width;
-   const GLint height = texImage->Height;
-   const GLint depth = texImage->Depth;
-   const GLuint *src = (const GLuint *) texImage->Data;
-   GLint img, row;
-
-   for (img = 0; img < depth; img++) {
-      for (row = 0; row < height; row++) {
-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
-                                          width, height, format, type,
-                                          img, row, 0);
-         memcpy(dest, src, width * sizeof(GLuint));
-         if (ctx->Pack.SwapBytes) {
-            _mesa_swap4((GLuint *) dest, width);
-         }
-
-         src += width * row + width * height * img;
-      }
-   }
-}
-
-
-/**
- * glGetTexImage for YCbCr pixels.
- */
-static void
-get_tex_ycbcr(GLcontext *ctx, GLuint dimensions,
-              GLenum format, GLenum type, GLvoid *pixels,
-              const struct gl_texture_image *texImage)
-{
-   const GLint width = texImage->Width;
-   const GLint height = texImage->Height;
-   const GLint depth = texImage->Depth;
-   const GLint rowstride = texImage->RowStride;
-   const GLushort *src = (const GLushort *) texImage->Data;
-   GLint img, row;
-
-   for (img = 0; img < depth; img++) {
-      for (row = 0; row < height; row++) {
-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
-                                          width, height, format, type,
-                                          img, row, 0);
-         memcpy(dest, src, width * sizeof(GLushort));
-
-         /* check for byte swapping */
-         if ((texImage->TexFormat == MESA_FORMAT_YCBCR
-              && type == GL_UNSIGNED_SHORT_8_8_REV_MESA) ||
-             (texImage->TexFormat == MESA_FORMAT_YCBCR_REV
-              && type == GL_UNSIGNED_SHORT_8_8_MESA)) {
-            if (!ctx->Pack.SwapBytes)
-               _mesa_swap2((GLushort *) dest, width);
-         }
-         else if (ctx->Pack.SwapBytes) {
-            _mesa_swap2((GLushort *) dest, width);
-         }
-
-         src += rowstride;
-      }
-   }
-}
-
-
-#if FEATURE_EXT_texture_sRGB
-
-
-/**
- * Convert a float value from linear space to a
- * non-linear sRGB value in [0, 255].
- * Not terribly efficient.
- */
-static INLINE GLfloat
-linear_to_nonlinear(GLfloat cl)
-{
-   /* can't have values outside [0, 1] */
-   GLfloat cs;
-   if (cl < 0.0031308f) {
-      cs = 12.92f * cl;
-   }
-   else {
-      cs = (GLfloat)(1.055 * pow(cl, 0.41666) - 0.055);
-   }
-   return cs;
-}
-
-
-/**
- * glGetTexImagefor sRGB pixels;
- */
-static void
-get_tex_srgb(GLcontext *ctx, GLuint dimensions,
-             GLenum format, GLenum type, GLvoid *pixels,
-             const struct gl_texture_image *texImage)
-{
-   const GLint width = texImage->Width;
-   const GLint height = texImage->Height;
-   const GLint depth = texImage->Depth;
-   const GLbitfield transferOps = 0x0;
-   GLint img, row;
-
-   for (img = 0; img < depth; img++) {
-      for (row = 0; row < height; row++) {
-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
-                                          width, height, format, type,
-                                          img, row, 0);
-
-         GLfloat rgba[MAX_WIDTH][4];
-         GLint col;
-
-         /* convert row to RGBA format */
-         for (col = 0; col < width; col++) {
-            texImage->FetchTexelf(texImage, col, row, img, rgba[col]);
-            if (texImage->_BaseFormat == GL_LUMINANCE) {
-               rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
-               rgba[col][GCOMP] = 0.0;
-               rgba[col][BCOMP] = 0.0;
-            }
-            else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-               rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
-               rgba[col][GCOMP] = 0.0;
-               rgba[col][BCOMP] = 0.0;
-            }
-            else if (texImage->_BaseFormat == GL_RGB ||
-                     texImage->_BaseFormat == GL_RGBA) {
-               rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);
-               rgba[col][GCOMP] = linear_to_nonlinear(rgba[col][GCOMP]);
-               rgba[col][BCOMP] = linear_to_nonlinear(rgba[col][BCOMP]);
-            }
-         }
-         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
-                                    format, type, dest,
-                                    &ctx->Pack, transferOps);
-      }
-   }
-}
-
-
-#else /* FEATURE_EXT_texture_sRGB */
-
-
-static INLINE void
-get_tex_srgb(GLcontext *ctx, GLuint dimensions,
-             GLenum format, GLenum type, GLvoid *pixels,
-             const struct gl_texture_image *texImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-
-#endif /* FEATURE_EXT_texture_sRGB */
-
-
-/**
- * glGetTexImagefor RGBA, Luminance, etc. pixels.
- * This is the slow way since we use texture sampling.
- */
-static void
-get_tex_rgba(GLcontext *ctx, GLuint dimensions,
-             GLenum format, GLenum type, GLvoid *pixels,
-             const struct gl_texture_image *texImage)
-{
-   const GLint width = texImage->Width;
-   const GLint height = texImage->Height;
-   const GLint depth = texImage->Depth;
-   /* Normally, no pixel transfer ops are performed during glGetTexImage.
-    * The only possible exception is component clamping to [0,1].
-    */
-   GLbitfield transferOps = 0x0;
-   GLint img, row;
-
-   for (img = 0; img < depth; img++) {
-      for (row = 0; row < height; row++) {
-         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
-                                          width, height, format, type,
-                                          img, row, 0);
-         GLfloat rgba[MAX_WIDTH][4];
-         GLint col;
-         GLenum dataType = _mesa_get_format_datatype(texImage->TexFormat);
-
-         /* clamp does not apply to GetTexImage (final conversion)?
-          * Looks like we need clamp though when going from format
-          * containing negative values to unsigned format.
-          */
-         if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
-            transferOps |= IMAGE_CLAMP_BIT;
-         }
-         else if (!type_with_negative_values(type) &&
-                  (dataType == GL_FLOAT ||
-                   dataType == GL_SIGNED_NORMALIZED)) {
-            transferOps |= IMAGE_CLAMP_BIT;
-         }
-
-         for (col = 0; col < width; col++) {
-            texImage->FetchTexelf(texImage, col, row, img, rgba[col]);
-            if (texImage->_BaseFormat == GL_ALPHA) {
-               rgba[col][RCOMP] = 0.0F;
-               rgba[col][GCOMP] = 0.0F;
-               rgba[col][BCOMP] = 0.0F;
-            }
-            else if (texImage->_BaseFormat == GL_LUMINANCE) {
-               rgba[col][GCOMP] = 0.0F;
-               rgba[col][BCOMP] = 0.0F;
-               rgba[col][ACOMP] = 1.0F;
-            }
-            else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
-               rgba[col][GCOMP] = 0.0F;
-               rgba[col][BCOMP] = 0.0F;
-            }
-            else if (texImage->_BaseFormat == GL_INTENSITY) {
-               rgba[col][GCOMP] = 0.0F;
-               rgba[col][BCOMP] = 0.0F;
-               rgba[col][ACOMP] = 1.0F;
-            }
-         }
-         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
-                                    format, type, dest,
-                                    &ctx->Pack, transferOps);
-      }
-   }
-}
-
-
-/**
- * Try to do glGetTexImage() with simple memcpy().
- * \return GL_TRUE if done, GL_FALSE otherwise
- */
-static GLboolean
-get_tex_memcpy(GLcontext *ctx, GLenum format, GLenum type, GLvoid *pixels,
-               const struct gl_texture_object *texObj,
-               const struct gl_texture_image *texImage)
-{
-   GLboolean memCopy = GL_FALSE;
-
-   /* Texture image should have been mapped already */
-   assert(texImage->Data);
-
-   /*
-    * Check if the src/dst formats are compatible.
-    * Also note that GL's pixel transfer ops don't apply to glGetTexImage()
-    * so we don't have to worry about those.
-    * XXX more format combinations could be supported here.
-    */
-   if ((texObj->Target == GL_TEXTURE_1D ||
-        texObj->Target == GL_TEXTURE_2D ||
-        texObj->Target == GL_TEXTURE_RECTANGLE ||
-        (texObj->Target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
-         texObj->Target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z))) {
-      if (texImage->TexFormat == MESA_FORMAT_ARGB8888 &&
-          format == GL_BGRA &&
-          type == GL_UNSIGNED_BYTE &&
-          !ctx->Pack.SwapBytes &&
-          _mesa_little_endian()) {
-         memCopy = GL_TRUE;
-      }
-      else if (texImage->TexFormat == MESA_FORMAT_AL88 &&
-               format == GL_LUMINANCE_ALPHA &&
-               type == GL_UNSIGNED_BYTE &&
-               !ctx->Pack.SwapBytes &&
-               _mesa_little_endian()) {
-         memCopy = GL_TRUE;
-      }
-      else if (texImage->TexFormat == MESA_FORMAT_L8 &&
-               format == GL_LUMINANCE &&
-               type == GL_UNSIGNED_BYTE) {
-         memCopy = GL_TRUE;
-      }
-      else if (texImage->TexFormat == MESA_FORMAT_A8 &&
-               format == GL_ALPHA &&
-               type == GL_UNSIGNED_BYTE) {
-         memCopy = GL_TRUE;
-      }
-   }
-
-   if (memCopy) {
-      const GLuint bpp = _mesa_get_format_bytes(texImage->TexFormat);
-      const GLuint bytesPerRow = texImage->Width * bpp;
-      GLubyte *dst =
-         _mesa_image_address2d(&ctx->Pack, pixels, texImage->Width,
-                               texImage->Height, format, type, 0, 0);
-      const GLint dstRowStride =
-         _mesa_image_row_stride(&ctx->Pack, texImage->Width, format, type);
-      const GLubyte *src = texImage->Data;
-      const GLint srcRowStride = texImage->RowStride * bpp;
-      GLuint row;
-
-      if (bytesPerRow == dstRowStride && bytesPerRow == srcRowStride) {
-         memcpy(dst, src, bytesPerRow * texImage->Height);
-      }
-      else {
-         for (row = 0; row < texImage->Height; row++) {
-            memcpy(dst, src, bytesPerRow);
-            dst += dstRowStride;
-            src += srcRowStride;
-         }
-      }
-   }
-
-   return memCopy;
-}
-
-
-/**
- * This is the software fallback for Driver.GetTexImage().
- * All error checking will have been done before this routine is called.
- * The texture image must be mapped.
- */
-void
-_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels,
-                   struct gl_texture_object *texObj,
-                   struct gl_texture_image *texImage)
-{
-   GLuint dimensions;
-
-   /* If we get here, the texture image should be mapped */
-   assert(texImage->Data);
-
-   switch (target) {
-   case GL_TEXTURE_1D:
-      dimensions = 1;
-      break;
-   case GL_TEXTURE_3D:
-      dimensions = 3;
-      break;
-   default:
-      dimensions = 2;
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Packing texture image into a PBO.
-       * Map the (potentially) VRAM-based buffer into our process space so
-       * we can write into it with the code below.
-       * A hardware driver might use a sophisticated blit to move the
-       * texture data to the PBO if the PBO is in VRAM along with the texture.
-       */
-      GLubyte *buf = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);
-      if (!buf) {
-         /* out of memory or other unexpected error */
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage(map PBO failed)");
-         return;
-      }
-      /* <pixels> was an offset into the PBO.
-       * Now make it a real, client-side pointer inside the mapped region.
-       */
-      pixels = ADD_POINTERS(buf, pixels);
-   }
-
-   if (get_tex_memcpy(ctx, format, type, pixels, texObj, texImage)) {
-      /* all done */
-   }
-   else if (format == GL_COLOR_INDEX) {
-      get_tex_color_index(ctx, dimensions, format, type, pixels, texImage);
-   }
-   else if (format == GL_DEPTH_COMPONENT) {
-      get_tex_depth(ctx, dimensions, format, type, pixels, texImage);
-   }
-   else if (format == GL_DEPTH_STENCIL_EXT) {
-      get_tex_depth_stencil(ctx, dimensions, format, type, pixels, texImage);
-   }
-   else if (format == GL_YCBCR_MESA) {
-      get_tex_ycbcr(ctx, dimensions, format, type, pixels, texImage);
-   }
-   else if (_mesa_get_format_color_encoding(texImage->TexFormat) == GL_SRGB) {
-      get_tex_srgb(ctx, dimensions, format, type, pixels, texImage);
-   }
-   else {
-      get_tex_rgba(ctx, dimensions, format, type, pixels, texImage);
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
-}
-
-
-
-/**
- * This is the software fallback for Driver.GetCompressedTexImage().
- * All error checking will have been done before this routine is called.
- */
-void
-_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
-                              GLvoid *img,
-                              struct gl_texture_object *texObj,
-                              struct gl_texture_image *texImage)
-{
-   const GLuint row_stride = _mesa_format_row_stride(texImage->TexFormat,
-                                                     texImage->Width);
-   const GLuint row_stride_stored = _mesa_format_row_stride(texImage->TexFormat,
-                                                            texImage->RowStride);
-   GLuint i;
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack texture image into a PBO */
-      GLubyte *buf = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);
-      if (!buf) {
-         /* out of memory or other unexpected error */
-         _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                     "glGetCompresssedTexImage(map PBO failed)");
-         return;
-      }
-      img = ADD_POINTERS(buf, img);
-   }
-
-   /* no pixelstore or pixel transfer, but respect stride */
-
-   if (row_stride == row_stride_stored) {
-      const GLuint size = _mesa_format_image_size(texImage->TexFormat,
-                                                  texImage->Width,
-                                                  texImage->Height,
-                                                  texImage->Depth);
-      memcpy(img, texImage->Data, size);
-   }
-   else {
-      GLuint bw, bh;
-      _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);
-      for (i = 0; i < (texImage->Height + bh - 1) / bh; i++) {
-         memcpy((GLubyte *)img + i * row_stride,
-                (GLubyte *)texImage->Data + i * row_stride_stored,
-                row_stride);
-      }
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
-}
-
-
-
-/**
- * Do error checking for a glGetTexImage() call.
- * \return GL_TRUE if any error, GL_FALSE if no errors.
- */
-static GLboolean
-getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
-                        GLenum format, GLenum type, GLvoid *pixels )
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
-   GLenum baseFormat;
-
-   if (maxLevels == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target=0x%x)", target);
-      return GL_TRUE;
-   }
-
-   if (level < 0 || level >= maxLevels) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );
-      return GL_TRUE;
-   }
-
-   if (_mesa_sizeof_packed_type(type) <= 0) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );
-      return GL_TRUE;
-   }
-
-   if (_mesa_components_in_format(format) <= 0 ||
-       format == GL_STENCIL_INDEX) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.EXT_paletted_texture && _mesa_is_index_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.ARB_depth_texture && _mesa_is_depth_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.MESA_ycbcr_texture && _mesa_is_ycbcr_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.EXT_packed_depth_stencil
-       && _mesa_is_depthstencil_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   if (!ctx->Extensions.ATI_envmap_bumpmap
-       && _mesa_is_dudv_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   if (!texObj || _mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");
-      return GL_TRUE;
-   }
-
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-   if (!texImage) {
-      /* out of memory */
-      return GL_TRUE;
-   }
-
-   baseFormat = _mesa_get_format_base_format(texImage->TexFormat);
-      
-   /* Make sure the requested image format is compatible with the
-    * texture's format.  Note that a color index texture can be converted
-    * to RGBA so that combo is allowed.
-    */
-   if (_mesa_is_color_format(format)
-       && !_mesa_is_color_format(baseFormat)
-       && !_mesa_is_index_format(baseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (_mesa_is_index_format(format)
-            && !_mesa_is_index_format(baseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (_mesa_is_depth_format(format)
-            && !_mesa_is_depth_format(baseFormat)
-            && !_mesa_is_depthstencil_format(baseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (_mesa_is_ycbcr_format(format)
-            && !_mesa_is_ycbcr_format(baseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (_mesa_is_depthstencil_format(format)
-            && !_mesa_is_depthstencil_format(baseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-   else if (_mesa_is_dudv_format(format)
-            && !_mesa_is_dudv_format(baseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
-      return GL_TRUE;
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* packing texture image into a PBO */
-      const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;
-      if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,
-                                     texImage->Height, texImage->Depth,
-                                     format, type, pixels)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetTexImage(out of bounds PBO write)");
-         return GL_TRUE;
-      }
-
-      /* PBO should not be mapped */
-      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetTexImage(PBO is mapped)");
-         return GL_TRUE;
-      }
-   }
-
-   return GL_FALSE;
-}
-
-
-
-/**
- * Get texture image.  Called by glGetTexImage.
- *
- * \param target texture target.
- * \param level image level.
- * \param format pixel data format for returned image.
- * \param type pixel data type for returned image.
- * \param pixels returned pixel data.
- */
-void GLAPIENTRY
-_mesa_GetTexImage( GLenum target, GLint level, GLenum format,
-                   GLenum type, GLvoid *pixels )
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (getteximage_error_check(ctx, target, level, format, type, pixels)) {
-      return;
-   }
-
-   if (!_mesa_is_bufferobj(ctx->Pack.BufferObj) && !pixels) {
-      /* not an error, do nothing */
-      return;
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) {
-      _mesa_debug(ctx, "glGetTexImage(tex %u) format = %s, w=%d, h=%d,"
-                  " dstFmt=0x%x, dstType=0x%x\n",
-                  texObj->Name,
-                  _mesa_get_format_name(texImage->TexFormat),
-                  texImage->Width, texImage->Height,
-                  format, type);
-   }
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      ctx->Driver.GetTexImage(ctx, target, level, format, type, pixels,
-                              texObj, texImage);
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-/**
- * Do error checking for a glGetCompressedTexImage() call.
- * \return GL_TRUE if any error, GL_FALSE if no errors.
- */
-static GLboolean
-getcompressedteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
-                                  GLvoid *img)
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
-
-   if (maxLevels == 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImage(target=0x%x)",
-                  target);
-      return GL_TRUE;
-   }
-
-   if (level < 0 || level >= maxLevels) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetCompressedTexImageARB(bad level = %d)", level);
-      return GL_TRUE;
-   }
-
-   if (_mesa_is_proxy_texture(target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetCompressedTexImageARB(bad target = %s)",
-                  _mesa_lookup_enum_by_nr(target));
-      return GL_TRUE;
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   if (!texObj) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)");
-      return GL_TRUE;
-   }
-
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-   if (!texImage) {
-      /* probably invalid mipmap level */
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetCompressedTexImageARB(level)");
-      return GL_TRUE;
-   }
-
-   if (!_mesa_is_format_compressed(texImage->TexFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetCompressedTexImageARB(texture is not compressed)");
-      return GL_TRUE;
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      GLuint compressedSize;
-
-      /* make sure PBO is not mapped */
-      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetCompressedTexImage(PBO is mapped)");
-         return GL_TRUE;
-      }
-
-      compressedSize = _mesa_format_image_size(texImage->TexFormat,
-                                               texImage->Width,
-                                               texImage->Height,
-                                               texImage->Depth);
-
-      /* do bounds checking on PBO write */
-      if ((const GLubyte *) img + compressedSize >
-          (const GLubyte *) ctx->Pack.BufferObj->Size) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetCompressedTexImage(out of bounds PBO write)");
-         return GL_TRUE;
-      }
-   }
-
-   return GL_FALSE;
-}
-
-
-void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (getcompressedteximage_error_check(ctx, target, level, img)) {
-      return;
-   }
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj) && !img) {
-      /* not an error, do nothing */
-      return;
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) {
-      _mesa_debug(ctx,
-                  "glGetCompressedTexImage(tex %u) format = %s, w=%d, h=%d\n",
-                  texObj->Name,
-                  _mesa_get_format_name(texImage->TexFormat),
-                  texImage->Width, texImage->Height);
-   }
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      ctx->Driver.GetCompressedTexImage(ctx, target, level, img,
-                                        texObj, texImage);
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
+/*

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

+ */

+

+

+/**

+ * Code for glGetTexImage() and glGetCompressedTexImage().

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "enums.h"

+#include "context.h"

+#include "formats.h"

+#include "image.h"

+#include "pack.h"

+#include "texgetimage.h"

+#include "teximage.h"

+

+

+

+/**

+ * Can the given type represent negative values?

+ */

+static INLINE GLboolean

+type_with_negative_values(GLenum type)

+{

+   switch (type) {

+   case GL_BYTE:

+   case GL_SHORT:

+   case GL_INT:

+   case GL_FLOAT:

+   case GL_HALF_FLOAT_ARB:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * glGetTexImage for color index pixels.

+ */

+static void

+get_tex_color_index(struct gl_context *ctx, GLuint dimensions,

+                    GLenum format, GLenum type, GLvoid *pixels,

+                    const struct gl_texture_image *texImage)

+{

+   const GLint width = texImage->Width;

+   const GLint height = texImage->Height;

+   const GLint depth = texImage->Depth;

+   const GLuint indexBits =

+      _mesa_get_format_bits(texImage->TexFormat, GL_TEXTURE_INDEX_SIZE_EXT);

+   const GLbitfield transferOps = 0x0;

+   GLint img, row, col;

+

+   for (img = 0; img < depth; img++) {

+      for (row = 0; row < height; row++) {

+         GLuint indexRow[MAX_WIDTH] = { 0 };

+         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

+                                          width, height, format, type,

+                                          img, row, 0);

+         assert(dest);

+

+         if (indexBits == 8) {

+            const GLubyte *src = (const GLubyte *) texImage->Data;

+            src += width * (img * texImage->Height + row);

+            for (col = 0; col < width; col++) {

+               indexRow[col] = src[col];

+            }

+         }

+         else if (indexBits == 16) {

+            const GLushort *src = (const GLushort *) texImage->Data;

+            src += width * (img * texImage->Height + row);

+            for (col = 0; col < width; col++) {

+               indexRow[col] = src[col];

+            }

+         }

+         else {

+            _mesa_problem(ctx, "Color index problem in _mesa_GetTexImage");

+         }

+         _mesa_pack_index_span(ctx, width, type, dest,

+                               indexRow, &ctx->Pack, transferOps);

+      }

+   }

+}

+

+

+/**

+ * glGetTexImage for depth/Z pixels.

+ */

+static void

+get_tex_depth(struct gl_context *ctx, GLuint dimensions,

+              GLenum format, GLenum type, GLvoid *pixels,

+              const struct gl_texture_image *texImage)

+{

+   const GLint width = texImage->Width;

+   const GLint height = texImage->Height;

+   const GLint depth = texImage->Depth;

+   GLint img, row, col;

+   GLfloat *depthRow = (GLfloat *) malloc(width * sizeof(GLfloat));

+

+   if (!depthRow) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage");

+      return;

+   }

+

+   for (img = 0; img < depth; img++) {

+      for (row = 0; row < height; row++) {

+         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

+                                          width, height, format, type,

+                                          img, row, 0);

+         assert(dest);

+

+         for (col = 0; col < width; col++) {

+            texImage->FetchTexelf(texImage, col, row, img, depthRow + col);

+         }

+         _mesa_pack_depth_span(ctx, width, dest, type, depthRow, &ctx->Pack);

+      }

+   }

+

+   free(depthRow);

+}

+

+

+/**

+ * glGetTexImage for depth/stencil pixels.

+ */

+static void

+get_tex_depth_stencil(struct gl_context *ctx, GLuint dimensions,

+                      GLenum format, GLenum type, GLvoid *pixels,

+                      const struct gl_texture_image *texImage)

+{

+   const GLint width = texImage->Width;

+   const GLint height = texImage->Height;

+   const GLint depth = texImage->Depth;

+   const GLuint *src = (const GLuint *) texImage->Data;

+   GLint img, row;

+

+   for (img = 0; img < depth; img++) {

+      for (row = 0; row < height; row++) {

+         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

+                                          width, height, format, type,

+                                          img, row, 0);

+         memcpy(dest, src, width * sizeof(GLuint));

+         if (ctx->Pack.SwapBytes) {

+            _mesa_swap4((GLuint *) dest, width);

+         }

+

+         src += width * row + width * height * img;

+      }

+   }

+}

+

+

+/**

+ * glGetTexImage for YCbCr pixels.

+ */

+static void

+get_tex_ycbcr(struct gl_context *ctx, GLuint dimensions,

+              GLenum format, GLenum type, GLvoid *pixels,

+              const struct gl_texture_image *texImage)

+{

+   const GLint width = texImage->Width;

+   const GLint height = texImage->Height;

+   const GLint depth = texImage->Depth;

+   const GLint rowstride = texImage->RowStride;

+   const GLushort *src = (const GLushort *) texImage->Data;

+   GLint img, row;

+

+   for (img = 0; img < depth; img++) {

+      for (row = 0; row < height; row++) {

+         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

+                                          width, height, format, type,

+                                          img, row, 0);

+         memcpy(dest, src, width * sizeof(GLushort));

+

+         /* check for byte swapping */

+         if ((texImage->TexFormat == MESA_FORMAT_YCBCR

+              && type == GL_UNSIGNED_SHORT_8_8_REV_MESA) ||

+             (texImage->TexFormat == MESA_FORMAT_YCBCR_REV

+              && type == GL_UNSIGNED_SHORT_8_8_MESA)) {

+            if (!ctx->Pack.SwapBytes)

+               _mesa_swap2((GLushort *) dest, width);

+         }

+         else if (ctx->Pack.SwapBytes) {

+            _mesa_swap2((GLushort *) dest, width);

+         }

+

+         src += rowstride;

+      }

+   }

+}

+

+

+#if FEATURE_EXT_texture_sRGB

+

+

+/**

+ * Convert a float value from linear space to a

+ * non-linear sRGB value in [0, 255].

+ * Not terribly efficient.

+ */

+static INLINE GLfloat

+linear_to_nonlinear(GLfloat cl)

+{

+   /* can't have values outside [0, 1] */

+   GLfloat cs;

+   if (cl < 0.0031308f) {

+      cs = 12.92f * cl;

+   }

+   else {

+      cs = (GLfloat)(1.055 * pow(cl, 0.41666) - 0.055);

+   }

+   return cs;

+}

+

+

+/**

+ * glGetTexImagefor sRGB pixels;

+ */

+static void

+get_tex_srgb(struct gl_context *ctx, GLuint dimensions,

+             GLenum format, GLenum type, GLvoid *pixels,

+             const struct gl_texture_image *texImage)

+{

+   const GLint width = texImage->Width;

+   const GLint height = texImage->Height;

+   const GLint depth = texImage->Depth;

+   const GLbitfield transferOps = 0x0;

+   GLint img, row;

+   GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * width * sizeof(GLfloat));

+

+   if (!rgba) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage");

+      return;

+   }

+

+   for (img = 0; img < depth; img++) {

+      for (row = 0; row < height; row++) {

+         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

+                                          width, height, format, type,

+                                          img, row, 0);

+

+         GLint col;

+

+         /* convert row to RGBA format */

+         for (col = 0; col < width; col++) {

+            texImage->FetchTexelf(texImage, col, row, img, rgba[col]);

+            if (texImage->_BaseFormat == GL_LUMINANCE) {

+               rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);

+               rgba[col][GCOMP] = 0.0;

+               rgba[col][BCOMP] = 0.0;

+            }

+            else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {

+               rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);

+               rgba[col][GCOMP] = 0.0;

+               rgba[col][BCOMP] = 0.0;

+            }

+            else if (texImage->_BaseFormat == GL_RGB ||

+                     texImage->_BaseFormat == GL_RGBA) {

+               rgba[col][RCOMP] = linear_to_nonlinear(rgba[col][RCOMP]);

+               rgba[col][GCOMP] = linear_to_nonlinear(rgba[col][GCOMP]);

+               rgba[col][BCOMP] = linear_to_nonlinear(rgba[col][BCOMP]);

+            }

+         }

+         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,

+                                    format, type, dest,

+                                    &ctx->Pack, transferOps);

+      }

+   }

+

+   free(rgba);

+}

+

+

+#else /* FEATURE_EXT_texture_sRGB */

+

+

+static INLINE void

+get_tex_srgb(struct gl_context *ctx, GLuint dimensions,

+             GLenum format, GLenum type, GLvoid *pixels,

+             const struct gl_texture_image *texImage)

+{

+   ASSERT_NO_FEATURE();

+}

+

+

+#endif /* FEATURE_EXT_texture_sRGB */

+

+

+/**

+ * glGetTexImagefor RGBA, Luminance, etc. pixels.

+ * This is the slow way since we use texture sampling.

+ */

+static void

+get_tex_rgba(struct gl_context *ctx, GLuint dimensions,

+             GLenum format, GLenum type, GLvoid *pixels,

+             const struct gl_texture_image *texImage)

+{

+   const GLint width = texImage->Width;

+   const GLint height = texImage->Height;

+   const GLint depth = texImage->Depth;

+   /* Normally, no pixel transfer ops are performed during glGetTexImage.

+    * The only possible exception is component clamping to [0,1].

+    */

+   GLbitfield transferOps = 0x0;

+   GLint img, row;

+   GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * width * sizeof(GLfloat));

+

+   if (!rgba) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage");

+      return;

+   }

+

+   for (img = 0; img < depth; img++) {

+      for (row = 0; row < height; row++) {

+         void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,

+                                          width, height, format, type,

+                                          img, row, 0);

+         GLint col;

+         GLenum dataType = _mesa_get_format_datatype(texImage->TexFormat);

+

+         /* clamp does not apply to GetTexImage (final conversion)?

+          * Looks like we need clamp though when going from format

+          * containing negative values to unsigned format.

+          */

+         if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {

+            transferOps |= IMAGE_CLAMP_BIT;

+         }

+         else if (!type_with_negative_values(type) &&

+                  (dataType == GL_FLOAT ||

+                   dataType == GL_SIGNED_NORMALIZED)) {

+            transferOps |= IMAGE_CLAMP_BIT;

+         }

+

+         for (col = 0; col < width; col++) {

+            texImage->FetchTexelf(texImage, col, row, img, rgba[col]);

+            if (texImage->_BaseFormat == GL_ALPHA) {

+               rgba[col][RCOMP] = 0.0F;

+               rgba[col][GCOMP] = 0.0F;

+               rgba[col][BCOMP] = 0.0F;

+            }

+            else if (texImage->_BaseFormat == GL_LUMINANCE) {

+               rgba[col][GCOMP] = 0.0F;

+               rgba[col][BCOMP] = 0.0F;

+               rgba[col][ACOMP] = 1.0F;

+            }

+            else if (texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {

+               rgba[col][GCOMP] = 0.0F;

+               rgba[col][BCOMP] = 0.0F;

+            }

+            else if (texImage->_BaseFormat == GL_INTENSITY) {

+               rgba[col][GCOMP] = 0.0F;

+               rgba[col][BCOMP] = 0.0F;

+               rgba[col][ACOMP] = 1.0F;

+            }

+         }

+         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,

+                                    format, type, dest,

+                                    &ctx->Pack, transferOps);

+      }

+   }

+

+   free(rgba);

+}

+

+

+/**

+ * Try to do glGetTexImage() with simple memcpy().

+ * \return GL_TRUE if done, GL_FALSE otherwise

+ */

+static GLboolean

+get_tex_memcpy(struct gl_context *ctx, GLenum format, GLenum type, GLvoid *pixels,

+               const struct gl_texture_object *texObj,

+               const struct gl_texture_image *texImage)

+{

+   GLboolean memCopy = GL_FALSE;

+

+   /* Texture image should have been mapped already */

+   assert(texImage->Data);

+

+   /*

+    * Check if the src/dst formats are compatible.

+    * Also note that GL's pixel transfer ops don't apply to glGetTexImage()

+    * so we don't have to worry about those.

+    * XXX more format combinations could be supported here.

+    */

+   if ((texObj->Target == GL_TEXTURE_1D ||

+        texObj->Target == GL_TEXTURE_2D ||

+        texObj->Target == GL_TEXTURE_RECTANGLE ||

+        (texObj->Target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&

+         texObj->Target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z))) {

+      if (texImage->TexFormat == MESA_FORMAT_ARGB8888 &&

+          format == GL_BGRA &&

+          type == GL_UNSIGNED_BYTE &&

+          !ctx->Pack.SwapBytes &&

+          _mesa_little_endian()) {

+         memCopy = GL_TRUE;

+      }

+      else if (texImage->TexFormat == MESA_FORMAT_AL88 &&

+               format == GL_LUMINANCE_ALPHA &&

+               type == GL_UNSIGNED_BYTE &&

+               !ctx->Pack.SwapBytes &&

+               _mesa_little_endian()) {

+         memCopy = GL_TRUE;

+      }

+      else if (texImage->TexFormat == MESA_FORMAT_L8 &&

+               format == GL_LUMINANCE &&

+               type == GL_UNSIGNED_BYTE) {

+         memCopy = GL_TRUE;

+      }

+      else if (texImage->TexFormat == MESA_FORMAT_L16 &&

+               format == GL_LUMINANCE &&

+               type == GL_UNSIGNED_SHORT) {

+         memCopy = GL_TRUE;

+      }

+      else if (texImage->TexFormat == MESA_FORMAT_A8 &&

+               format == GL_ALPHA &&

+               type == GL_UNSIGNED_BYTE) {

+         memCopy = GL_TRUE;

+      }

+      else if (texImage->TexFormat == MESA_FORMAT_A16 &&

+               format == GL_ALPHA &&

+               type == GL_UNSIGNED_SHORT) {

+         memCopy = GL_TRUE;

+      }

+   }

+

+   if (memCopy) {

+      const GLuint bpp = _mesa_get_format_bytes(texImage->TexFormat);

+      const GLuint bytesPerRow = texImage->Width * bpp;

+      GLubyte *dst =

+         _mesa_image_address2d(&ctx->Pack, pixels, texImage->Width,

+                               texImage->Height, format, type, 0, 0);

+      const GLint dstRowStride =

+         _mesa_image_row_stride(&ctx->Pack, texImage->Width, format, type);

+      const GLubyte *src = texImage->Data;

+      const GLint srcRowStride = texImage->RowStride * bpp;

+      GLuint row;

+

+      if (bytesPerRow == dstRowStride && bytesPerRow == srcRowStride) {

+         memcpy(dst, src, bytesPerRow * texImage->Height);

+      }

+      else {

+         for (row = 0; row < texImage->Height; row++) {

+            memcpy(dst, src, bytesPerRow);

+            dst += dstRowStride;

+            src += srcRowStride;

+         }

+      }

+   }

+

+   return memCopy;

+}

+

+

+/**

+ * This is the software fallback for Driver.GetTexImage().

+ * All error checking will have been done before this routine is called.

+ * The texture image must be mapped.

+ */

+void

+_mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,

+                   GLenum format, GLenum type, GLvoid *pixels,

+                   struct gl_texture_object *texObj,

+                   struct gl_texture_image *texImage)

+{

+   GLuint dimensions;

+

+   /* If we get here, the texture image should be mapped */

+   assert(texImage->Data);

+

+   switch (target) {

+   case GL_TEXTURE_1D:

+      dimensions = 1;

+      break;

+   case GL_TEXTURE_3D:

+      dimensions = 3;

+      break;

+   default:

+      dimensions = 2;

+   }

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      /* Packing texture image into a PBO.

+       * Map the (potentially) VRAM-based buffer into our process space so

+       * we can write into it with the code below.

+       * A hardware driver might use a sophisticated blit to move the

+       * texture data to the PBO if the PBO is in VRAM along with the texture.

+       */

+      GLubyte *buf = (GLubyte *)

+         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,

+                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);

+      if (!buf) {

+         /* out of memory or other unexpected error */

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage(map PBO failed)");

+         return;

+      }

+      /* <pixels> was an offset into the PBO.

+       * Now make it a real, client-side pointer inside the mapped region.

+       */

+      pixels = ADD_POINTERS(buf, pixels);

+   }

+

+   if (get_tex_memcpy(ctx, format, type, pixels, texObj, texImage)) {

+      /* all done */

+   }

+   else if (format == GL_COLOR_INDEX) {

+      get_tex_color_index(ctx, dimensions, format, type, pixels, texImage);

+   }

+   else if (format == GL_DEPTH_COMPONENT) {

+      get_tex_depth(ctx, dimensions, format, type, pixels, texImage);

+   }

+   else if (format == GL_DEPTH_STENCIL_EXT) {

+      get_tex_depth_stencil(ctx, dimensions, format, type, pixels, texImage);

+   }

+   else if (format == GL_YCBCR_MESA) {

+      get_tex_ycbcr(ctx, dimensions, format, type, pixels, texImage);

+   }

+   else if (_mesa_get_format_color_encoding(texImage->TexFormat) == GL_SRGB) {

+      get_tex_srgb(ctx, dimensions, format, type, pixels, texImage);

+   }

+   else {

+      get_tex_rgba(ctx, dimensions, format, type, pixels, texImage);

+   }

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,

+                              ctx->Pack.BufferObj);

+   }

+}

+

+

+

+/**

+ * This is the software fallback for Driver.GetCompressedTexImage().

+ * All error checking will have been done before this routine is called.

+ */

+void

+_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level,

+                              GLvoid *img,

+                              struct gl_texture_object *texObj,

+                              struct gl_texture_image *texImage)

+{

+   const GLuint row_stride = _mesa_format_row_stride(texImage->TexFormat,

+                                                     texImage->Width);

+   const GLuint row_stride_stored = _mesa_format_row_stride(texImage->TexFormat,

+                                                            texImage->RowStride);

+   GLuint i;

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      /* pack texture image into a PBO */

+      GLubyte *buf = (GLubyte *)

+         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,

+                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);

+      if (!buf) {

+         /* out of memory or other unexpected error */

+         _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                     "glGetCompresssedTexImage(map PBO failed)");

+         return;

+      }

+      img = ADD_POINTERS(buf, img);

+   }

+

+   /* no pixelstore or pixel transfer, but respect stride */

+

+   if (row_stride == row_stride_stored) {

+      const GLuint size = _mesa_format_image_size(texImage->TexFormat,

+                                                  texImage->Width,

+                                                  texImage->Height,

+                                                  texImage->Depth);

+      memcpy(img, texImage->Data, size);

+   }

+   else {

+      GLuint bw, bh;

+      _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);

+      for (i = 0; i < (texImage->Height + bh - 1) / bh; i++) {

+         memcpy((GLubyte *)img + i * row_stride,

+                (GLubyte *)texImage->Data + i * row_stride_stored,

+                row_stride);

+      }

+   }

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,

+                              ctx->Pack.BufferObj);

+   }

+}

+

+

+

+/**

+ * Do error checking for a glGetTexImage() call.

+ * \return GL_TRUE if any error, GL_FALSE if no errors.

+ */

+static GLboolean

+getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,

+                        GLenum format, GLenum type, GLvoid *pixels )

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);

+   GLenum baseFormat;

+

+   if (maxLevels == 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target=0x%x)", target);

+      return GL_TRUE;

+   }

+

+   if (level < 0 || level >= maxLevels) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" );

+      return GL_TRUE;

+   }

+

+   if (_mesa_sizeof_packed_type(type) <= 0) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" );

+      return GL_TRUE;

+   }

+

+   if (_mesa_components_in_format(format) <= 0 ||

+       format == GL_STENCIL_INDEX) {

+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );

+      return GL_TRUE;

+   }

+

+   if (!ctx->Extensions.EXT_paletted_texture && _mesa_is_index_format(format)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

+      return GL_TRUE;

+   }

+

+   if (!ctx->Extensions.ARB_depth_texture && _mesa_is_depth_format(format)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

+      return GL_TRUE;

+   }

+

+   if (!ctx->Extensions.MESA_ycbcr_texture && _mesa_is_ycbcr_format(format)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

+      return GL_TRUE;

+   }

+

+   if (!ctx->Extensions.EXT_packed_depth_stencil

+       && _mesa_is_depthstencil_format(format)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

+      return GL_TRUE;

+   }

+

+   if (!ctx->Extensions.ATI_envmap_bumpmap

+       && _mesa_is_dudv_format(format)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");

+      return GL_TRUE;

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+

+   if (!texObj || _mesa_is_proxy_texture(target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(target)");

+      return GL_TRUE;

+   }

+

+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+   if (!texImage) {

+      /* out of memory */

+      return GL_TRUE;

+   }

+

+   baseFormat = _mesa_get_format_base_format(texImage->TexFormat);

+      

+   /* Make sure the requested image format is compatible with the

+    * texture's format.  Note that a color index texture can be converted

+    * to RGBA so that combo is allowed.

+    */

+   if (_mesa_is_color_format(format)

+       && !_mesa_is_color_format(baseFormat)

+       && !_mesa_is_index_format(baseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

+      return GL_TRUE;

+   }

+   else if (_mesa_is_index_format(format)

+            && !_mesa_is_index_format(baseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

+      return GL_TRUE;

+   }

+   else if (_mesa_is_depth_format(format)

+            && !_mesa_is_depth_format(baseFormat)

+            && !_mesa_is_depthstencil_format(baseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

+      return GL_TRUE;

+   }

+   else if (_mesa_is_ycbcr_format(format)

+            && !_mesa_is_ycbcr_format(baseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

+      return GL_TRUE;

+   }

+   else if (_mesa_is_depthstencil_format(format)

+            && !_mesa_is_depthstencil_format(baseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

+      return GL_TRUE;

+   }

+   else if (_mesa_is_dudv_format(format)

+            && !_mesa_is_dudv_format(baseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");

+      return GL_TRUE;

+   }

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      /* packing texture image into a PBO */

+      const GLuint dimensions = (target == GL_TEXTURE_3D) ? 3 : 2;

+      if (!_mesa_validate_pbo_access(dimensions, &ctx->Pack, texImage->Width,

+                                     texImage->Height, texImage->Depth,

+                                     format, type, pixels)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetTexImage(out of bounds PBO write)");

+         return GL_TRUE;

+      }

+

+      /* PBO should not be mapped */

+      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetTexImage(PBO is mapped)");

+         return GL_TRUE;

+      }

+   }

+

+   return GL_FALSE;

+}

+

+

+

+/**

+ * Get texture image.  Called by glGetTexImage.

+ *

+ * \param target texture target.

+ * \param level image level.

+ * \param format pixel data format for returned image.

+ * \param type pixel data type for returned image.

+ * \param pixels returned pixel data.

+ */

+void GLAPIENTRY

+_mesa_GetTexImage( GLenum target, GLint level, GLenum format,

+                   GLenum type, GLvoid *pixels )

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (getteximage_error_check(ctx, target, level, format, type, pixels)) {

+      return;

+   }

+

+   if (!_mesa_is_bufferobj(ctx->Pack.BufferObj) && !pixels) {

+      /* not an error, do nothing */

+      return;

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+

+   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) {

+      _mesa_debug(ctx, "glGetTexImage(tex %u) format = %s, w=%d, h=%d,"

+                  " dstFmt=0x%x, dstType=0x%x\n",

+                  texObj->Name,

+                  _mesa_get_format_name(texImage->TexFormat),

+                  texImage->Width, texImage->Height,

+                  format, type);

+   }

+

+   _mesa_lock_texture(ctx, texObj);

+   {

+      ctx->Driver.GetTexImage(ctx, target, level, format, type, pixels,

+                              texObj, texImage);

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+

+/**

+ * Do error checking for a glGetCompressedTexImage() call.

+ * \return GL_TRUE if any error, GL_FALSE if no errors.

+ */

+static GLboolean

+getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,

+                                  GLvoid *img)

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);

+

+   if (maxLevels == 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImage(target=0x%x)",

+                  target);

+      return GL_TRUE;

+   }

+

+   if (level < 0 || level >= maxLevels) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glGetCompressedTexImageARB(bad level = %d)", level);

+      return GL_TRUE;

+   }

+

+   if (_mesa_is_proxy_texture(target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glGetCompressedTexImageARB(bad target = %s)",

+                  _mesa_lookup_enum_by_nr(target));

+      return GL_TRUE;

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+   if (!texObj) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetCompressedTexImageARB(target)");

+      return GL_TRUE;

+   }

+

+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+

+   if (!texImage) {

+      /* probably invalid mipmap level */

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glGetCompressedTexImageARB(level)");

+      return GL_TRUE;

+   }

+

+   if (!_mesa_is_format_compressed(texImage->TexFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glGetCompressedTexImageARB(texture is not compressed)");

+      return GL_TRUE;

+   }

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {

+      GLuint compressedSize;

+

+      /* make sure PBO is not mapped */

+      if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetCompressedTexImage(PBO is mapped)");

+         return GL_TRUE;

+      }

+

+      compressedSize = _mesa_format_image_size(texImage->TexFormat,

+                                               texImage->Width,

+                                               texImage->Height,

+                                               texImage->Depth);

+

+      /* do bounds checking on PBO write */

+      if ((const GLubyte *) img + compressedSize >

+          (const GLubyte *) ctx->Pack.BufferObj->Size) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetCompressedTexImage(out of bounds PBO write)");

+         return GL_TRUE;

+      }

+   }

+

+   return GL_FALSE;

+}

+

+

+void GLAPIENTRY

+_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (getcompressedteximage_error_check(ctx, target, level, img)) {

+      return;

+   }

+

+   if (_mesa_is_bufferobj(ctx->Pack.BufferObj) && !img) {

+      /* not an error, do nothing */

+      return;

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+

+   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE)) {

+      _mesa_debug(ctx,

+                  "glGetCompressedTexImage(tex %u) format = %s, w=%d, h=%d\n",

+                  texObj->Name,

+                  _mesa_get_format_name(texImage->TexFormat),

+                  texImage->Width, texImage->Height);

+   }

+

+   _mesa_lock_texture(ctx, texObj);

+   {

+      ctx->Driver.GetCompressedTexImage(ctx, target, level, img,

+                                        texObj, texImage);

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

diff --git a/mesalib/src/mesa/main/texgetimage.h b/mesalib/src/mesa/main/texgetimage.h
index 866ab7049..d5a1ffcf5 100644
--- a/mesalib/src/mesa/main/texgetimage.h
+++ b/mesalib/src/mesa/main/texgetimage.h
@@ -1,56 +1,60 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * 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.
- */
-
-
-#ifndef TEXGETIMAGE_H
-#define TEXGETIMAGE_H
-
-#include "mtypes.h"
-
-extern void
-_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels,
-                   struct gl_texture_object *texObj,
-                   struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
-                              GLvoid *img,
-                              struct gl_texture_object *texObj,
-                              struct gl_texture_image *texImage);
-
-
-
-extern void GLAPIENTRY
-_mesa_GetTexImage( GLenum target, GLint level,
-                   GLenum format, GLenum type, GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
-
-
-#endif /* TEXGETIMAGE_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

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

+ */

+

+

+#ifndef TEXGETIMAGE_H

+#define TEXGETIMAGE_H

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_texture_image;

+struct gl_texture_object;

+

+extern void

+_mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,

+                   GLenum format, GLenum type, GLvoid *pixels,

+                   struct gl_texture_object *texObj,

+                   struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level,

+                              GLvoid *img,

+                              struct gl_texture_object *texObj,

+                              struct gl_texture_image *texImage);

+

+

+

+extern void GLAPIENTRY

+_mesa_GetTexImage( GLenum target, GLint level,

+                   GLenum format, GLenum type, GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);

+

+

+#endif /* TEXGETIMAGE_H */

diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index ca1bd6096..f62074a1b 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1,3884 +1,3485 @@
-/*
- * 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 teximage.c
- * Texture image-related functions.
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "convolve.h"
-#include "enums.h"
-#include "fbobject.h"
-#include "framebuffer.h"
-#include "hash.h"
-#include "image.h"
-#include "imports.h"
-#include "macros.h"
-#include "state.h"
-#include "texcompress.h"
-#include "texfetch.h"
-#include "teximage.h"
-#include "texstate.h"
-#include "texpal.h"
-#include "mtypes.h"
-
-
-/**
- * State changes which we care about for glCopyTex[Sub]Image() calls.
- * In particular, we care about pixel transfer state and buffer state
- * (such as glReadBuffer to make sure we read from the right renderbuffer).
- */
-#define NEW_COPY_TEX_STATE (_MESA_NEW_TRANSFER_STATE | \
-                            _NEW_BUFFERS | \
-                            _NEW_PIXEL)
-
-
-
-/**
- * We allocate texture memory on 512-byte boundaries so we can use MMX/SSE
- * elsewhere.
- */
-void *
-_mesa_alloc_texmemory(GLsizei bytes)
-{
-   return _mesa_align_malloc(bytes, 512);
-}
-
-
-/**
- * Free texture memory allocated with _mesa_alloc_texmemory()
- */
-void
-_mesa_free_texmemory(void *m)
-{
-   _mesa_align_free(m);
-}
-
-
-/*
- * Compute floor(log_base_2(n)).
- * If n < 0 return -1.
- */
-static int
-logbase2( int n )
-{
-   GLint i = 1;
-   GLint log2 = 0;
-
-   if (n < 0)
-      return -1;
-
-   if (n == 0)
-      return 0;
-
-   while ( n > i ) {
-      i *= 2;
-      log2++;
-   }
-   if (i != n) {
-      return log2 - 1;
-   }
-   else {
-      return log2;
-   }
-}
-
-
-
-/**
- * Return the simple base format for a given internal texture format.
- * For example, given GL_LUMINANCE12_ALPHA4, return GL_LUMINANCE_ALPHA.
- *
- * \param ctx GL context.
- * \param internalFormat the internal texture format token or 1, 2, 3, or 4.
- *
- * \return the corresponding \u base internal format (GL_ALPHA, GL_LUMINANCE,
- * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA), or -1 if invalid enum.
- *
- * This is the format which is used during texture application (i.e. the
- * texture format and env mode determine the arithmetic used.
- *
- * XXX this could be static
- */
-GLint
-_mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
-{
-   switch (internalFormat) {
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-         return GL_ALPHA;
-      case 1:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-         return GL_LUMINANCE;
-      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:
-         return GL_LUMINANCE_ALPHA;
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-         return GL_INTENSITY;
-      case 3:
-      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 4:
-      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:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.EXT_paletted_texture) {
-      switch (internalFormat) {
-         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_COLOR_INDEX;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ARB_depth_texture) {
-      switch (internalFormat) {
-         case GL_DEPTH_COMPONENT:
-         case GL_DEPTH_COMPONENT16:
-         case GL_DEPTH_COMPONENT24:
-         case GL_DEPTH_COMPONENT32:
-            return GL_DEPTH_COMPONENT;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   switch (internalFormat) {
-   case GL_COMPRESSED_ALPHA:
-      return GL_ALPHA;
-   case GL_COMPRESSED_LUMINANCE:
-      return GL_LUMINANCE;
-   case GL_COMPRESSED_LUMINANCE_ALPHA:
-      return GL_LUMINANCE_ALPHA;
-   case GL_COMPRESSED_INTENSITY:
-      return GL_INTENSITY;
-   case GL_COMPRESSED_RGB:
-      return GL_RGB;
-   case GL_COMPRESSED_RGBA:
-      return GL_RGBA;
-   default:
-      ; /* fallthrough */
-   }
-         
-   if (ctx->Extensions.TDFX_texture_compression_FXT1) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_FXT1_3DFX:
-            return GL_RGB;
-         case GL_COMPRESSED_RGBA_FXT1_3DFX:
-            return GL_RGBA;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_compression_s3tc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-            return GL_RGB;
-         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-            return GL_RGBA;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.S3_s3tc) {
-      switch (internalFormat) {
-         case GL_RGB_S3TC:
-         case GL_RGB4_S3TC:
-            return GL_RGB;
-         case GL_RGBA_S3TC:
-         case GL_RGBA4_S3TC:
-            return GL_RGBA;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.MESA_ycbcr_texture) {
-      if (internalFormat == GL_YCBCR_MESA)
-         return GL_YCBCR_MESA;
-   }
-
-   if (ctx->Extensions.ARB_texture_float) {
-      switch (internalFormat) {
-         case GL_ALPHA16F_ARB:
-         case GL_ALPHA32F_ARB:
-            return GL_ALPHA;
-         case GL_RGBA16F_ARB:
-         case GL_RGBA32F_ARB:
-            return GL_RGBA;
-         case GL_RGB16F_ARB:
-         case GL_RGB32F_ARB:
-            return GL_RGB;
-         case GL_INTENSITY16F_ARB:
-         case GL_INTENSITY32F_ARB:
-            return GL_INTENSITY;
-         case GL_LUMINANCE16F_ARB:
-         case GL_LUMINANCE32F_ARB:
-            return GL_LUMINANCE;
-         case GL_LUMINANCE_ALPHA16F_ARB:
-         case GL_LUMINANCE_ALPHA32F_ARB:
-            return GL_LUMINANCE_ALPHA;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ATI_envmap_bumpmap) {
-      switch (internalFormat) {
-         case GL_DUDV_ATI:
-         case GL_DU8DV8_ATI:
-            return GL_DUDV_ATI;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.MESA_texture_signed_rgba) {
-      switch (internalFormat) {
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-            return GL_RGBA;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_depth_stencil) {
-      switch (internalFormat) {
-         case GL_DEPTH_STENCIL_EXT:
-         case GL_DEPTH24_STENCIL8_EXT:
-            return GL_DEPTH_STENCIL_EXT;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-#if FEATURE_EXT_texture_sRGB
-   if (ctx->Extensions.EXT_texture_sRGB) {
-      switch (internalFormat) {
-      case GL_SRGB_EXT:
-      case GL_SRGB8_EXT:
-      case GL_COMPRESSED_SRGB_EXT:
-      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-         return GL_RGB;
-      case GL_SRGB_ALPHA_EXT:
-      case GL_SRGB8_ALPHA8_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:
-         return GL_RGBA;
-      case GL_SLUMINANCE_ALPHA_EXT:
-      case GL_SLUMINANCE8_ALPHA8_EXT:
-      case GL_COMPRESSED_SLUMINANCE_EXT:
-      case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-         return GL_LUMINANCE_ALPHA;
-      case GL_SLUMINANCE_EXT:
-      case GL_SLUMINANCE8_EXT:
-         return GL_LUMINANCE;
-      default:
-         ; /* fallthrough */
-      }
-   }
-#endif /* FEATURE_EXT_texture_sRGB */
-
-   if (ctx->Extensions.EXT_texture_integer) {
-      switch (internalFormat) {
-      case GL_RGBA8UI_EXT:
-      case GL_RGBA16UI_EXT:
-      case GL_RGBA32UI_EXT:
-      case GL_RGBA8I_EXT:
-      case GL_RGBA16I_EXT:
-      case GL_RGBA32I_EXT:
-         return GL_RGBA;
-      case GL_RGB8UI_EXT:
-      case GL_RGB16UI_EXT:
-      case GL_RGB32UI_EXT:
-      case GL_RGB8I_EXT:
-      case GL_RGB16I_EXT:
-      case GL_RGB32I_EXT:
-         return GL_RGB;
-      case GL_ALPHA8UI_EXT:
-      case GL_ALPHA16UI_EXT:
-      case GL_ALPHA32UI_EXT:
-      case GL_ALPHA8I_EXT:
-      case GL_ALPHA16I_EXT:
-      case GL_ALPHA32I_EXT:
-         return GL_ALPHA;
-      case GL_INTENSITY8UI_EXT:
-      case GL_INTENSITY16UI_EXT:
-      case GL_INTENSITY32UI_EXT:
-      case GL_INTENSITY8I_EXT:
-      case GL_INTENSITY16I_EXT:
-      case GL_INTENSITY32I_EXT:
-         return GL_INTENSITY;
-      case GL_LUMINANCE8UI_EXT:
-      case GL_LUMINANCE16UI_EXT:
-      case GL_LUMINANCE32UI_EXT:
-      case GL_LUMINANCE8I_EXT:
-      case GL_LUMINANCE16I_EXT:
-      case GL_LUMINANCE32I_EXT:
-         return GL_LUMINANCE;
-      case GL_LUMINANCE_ALPHA8UI_EXT:
-      case GL_LUMINANCE_ALPHA16UI_EXT:
-      case GL_LUMINANCE_ALPHA32UI_EXT:
-      case GL_LUMINANCE_ALPHA8I_EXT:
-      case GL_LUMINANCE_ALPHA16I_EXT:
-      case GL_LUMINANCE_ALPHA32I_EXT:
-         return GL_LUMINANCE_ALPHA;
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_rg) {
-      switch (internalFormat) {
-      case GL_R8:
-      case GL_R16:
-      case GL_R16F:
-      case GL_R32F:
-      case GL_R8I:
-      case GL_R8UI:
-      case GL_R16I:
-      case GL_R16UI:
-      case GL_R32I:
-      case GL_R32UI:
-         return GL_R;
-      case GL_RG:
-      case GL_RG_INTEGER:
-      case GL_RG8:
-      case GL_RG16:
-      case GL_RG16F:
-      case GL_RG32F:
-      case GL_RG8I:
-      case GL_RG8UI:
-      case GL_RG16I:
-      case GL_RG16UI:
-      case GL_RG32I:
-      case GL_RG32UI:
-         return GL_RG;
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_shared_exponent) {
-      switch (internalFormat) {
-      case GL_RGB9_E5_EXT:
-         return GL_RGB;
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_float) {
-      switch (internalFormat) {
-      case GL_R11F_G11F_B10F_EXT:
-         return GL_RGB;
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ARB_depth_buffer_float) {
-      switch (internalFormat) {
-      case GL_DEPTH_COMPONENT32F:
-         return GL_DEPTH_COMPONENT;
-      case GL_DEPTH32F_STENCIL8:
-         return GL_DEPTH_STENCIL;
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_compression_rgtc) {
-      switch (internalFormat) {
-      case GL_COMPRESSED_RED:
-      case GL_COMPRESSED_RED_RGTC1_EXT:
-      case GL_COMPRESSED_SIGNED_RED_RGTC1_EXT:
-         return GL_RED;
-      case GL_COMPRESSED_RG:
-      case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
-      case GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT:
-         return GL_RG;
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   return -1; /* error */
-}
-
-
-/**
- * For cube map faces, return a face index in [0,5].
- * For other targets return 0;
- */
-GLuint
-_mesa_tex_target_to_face(GLenum target)
-{
-   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)
-      return (GLuint) target - (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X;
-   else
-      return 0;
-}
-
-
-
-/**
- * Store a gl_texture_image pointer in a gl_texture_object structure
- * according to the target and level parameters.
- * 
- * \param tObj texture object.
- * \param target texture target.
- * \param level image level.
- * \param texImage texture image.
- * 
- * This was basically prompted by the introduction of cube maps.
- */
-void
-_mesa_set_tex_image(struct gl_texture_object *tObj,
-                    GLenum target, GLint level,
-                    struct gl_texture_image *texImage)
-{
-   const GLuint face = _mesa_tex_target_to_face(target);
-
-   ASSERT(tObj);
-   ASSERT(texImage);
-   ASSERT(target != GL_TEXTURE_RECTANGLE_NV || level == 0);
-
-   tObj->Image[face][level] = texImage;
-
-   /* Set the 'back' pointer */
-   texImage->TexObject = tObj;
-}
-
-
-/**
- * Allocate a texture image structure.
- * 
- * Called via ctx->Driver.NewTextureImage() unless overriden by a device
- * driver.
- *
- * \return a pointer to gl_texture_image struct with all fields initialized to
- * zero.
- */
-struct gl_texture_image *
-_mesa_new_texture_image( GLcontext *ctx )
-{
-   (void) ctx;
-   return CALLOC_STRUCT(gl_texture_image);
-}
-
-
-/**
- * Free texture image data.
- * This function is a fallback called via ctx->Driver.FreeTexImageData().
- *
- * \param texImage texture image.
- *
- * Free the texture image data if it's not marked as client data.
- */
-void
-_mesa_free_texture_image_data(GLcontext *ctx,
-                              struct gl_texture_image *texImage)
-{
-   (void) ctx;
-
-   if (texImage->Data && !texImage->IsClientData) {
-      /* free the old texture data */
-      _mesa_free_texmemory(texImage->Data);
-   }
-
-   texImage->Data = NULL;
-}
-
-
-/**
- * Free texture image.
- *
- * \param texImage texture image.
- *
- * Free the texture image structure and the associated image data.
- */
-void
-_mesa_delete_texture_image( GLcontext *ctx, struct gl_texture_image *texImage )
-{
-   /* Free texImage->Data and/or any other driver-specific texture
-    * image storage.
-    */
-   ASSERT(ctx->Driver.FreeTexImageData);
-   ctx->Driver.FreeTexImageData( ctx, texImage );
-
-   ASSERT(texImage->Data == NULL);
-   if (texImage->ImageOffsets)
-      free(texImage->ImageOffsets);
-   free(texImage);
-}
-
-
-/**
- * Test if a target is a proxy target.
- *
- * \param target texture target.
- *
- * \return GL_TRUE if the target is a proxy target, GL_FALSE otherwise.
- */
-GLboolean
-_mesa_is_proxy_texture(GLenum target)
-{
-   /* NUM_TEXTURE_TARGETS should match number of terms below */
-   assert(NUM_TEXTURE_TARGETS == 7);
-
-   return (target == GL_PROXY_TEXTURE_1D ||
-           target == GL_PROXY_TEXTURE_2D ||
-           target == GL_PROXY_TEXTURE_3D ||
-           target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
-           target == GL_PROXY_TEXTURE_RECTANGLE_NV ||
-           target == GL_PROXY_TEXTURE_1D_ARRAY_EXT ||
-           target == GL_PROXY_TEXTURE_2D_ARRAY_EXT);
-}
-
-
-/**
- * Get the texture object that corresponds to the target of the given texture unit.
- *
- * \param ctx GL context.
- * \param texUnit texture unit.
- * \param target texture target.
- *
- * \return pointer to the texture object on success, or NULL on failure.
- * 
- * \sa gl_texture_unit.
- */
-struct gl_texture_object *
-_mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
-                        GLenum target)
-{
-   switch (target) {
-      case GL_TEXTURE_1D:
-         return texUnit->CurrentTex[TEXTURE_1D_INDEX];
-      case GL_PROXY_TEXTURE_1D:
-         return ctx->Texture.ProxyTex[TEXTURE_1D_INDEX];
-      case GL_TEXTURE_2D:
-         return texUnit->CurrentTex[TEXTURE_2D_INDEX];
-      case GL_PROXY_TEXTURE_2D:
-         return ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];
-      case GL_TEXTURE_3D:
-         return texUnit->CurrentTex[TEXTURE_3D_INDEX];
-      case GL_PROXY_TEXTURE_3D:
-         return ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];
-      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:
-      case GL_TEXTURE_CUBE_MAP_ARB:
-         return ctx->Extensions.ARB_texture_cube_map
-                ? texUnit->CurrentTex[TEXTURE_CUBE_INDEX] : NULL;
-      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-         return ctx->Extensions.ARB_texture_cube_map
-                ? ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX] : NULL;
-      case GL_TEXTURE_RECTANGLE_NV:
-         return ctx->Extensions.NV_texture_rectangle
-                ? texUnit->CurrentTex[TEXTURE_RECT_INDEX] : NULL;
-      case GL_PROXY_TEXTURE_RECTANGLE_NV:
-         return ctx->Extensions.NV_texture_rectangle
-                ? ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX] : NULL;
-      case GL_TEXTURE_1D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array
-                ? texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
-      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array
-                ? ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX] : NULL;
-      case GL_TEXTURE_2D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array
-                ? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
-      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-         return ctx->Extensions.MESA_texture_array
-                ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
-      default:
-         _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
-         return NULL;
-   }
-}
-
-
-/**
- * Return pointer to texture object for given target on current texture unit.
- */
-struct gl_texture_object *
-_mesa_get_current_tex_object(GLcontext *ctx, GLenum target)
-{
-   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
-   return _mesa_select_tex_object(ctx, texUnit, target);
-}
-
-
-/**
- * Get a texture image pointer from a texture object, given a texture
- * target and mipmap level.  The target and level parameters should
- * have already been error-checked.
- *
- * \param ctx GL context.
- * \param texObj texture unit.
- * \param target texture target.
- * \param level image level.
- *
- * \return pointer to the texture image structure, or NULL on failure.
- */
-struct gl_texture_image *
-_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
-		       GLenum target, GLint level)
-{
-   const GLuint face = _mesa_tex_target_to_face(target);
-
-   ASSERT(texObj);
-   ASSERT(level >= 0);
-   ASSERT(level < MAX_TEXTURE_LEVELS);
-
-   return texObj->Image[face][level];
-}
-
-
-/**
- * Like _mesa_select_tex_image() but if the image doesn't exist, allocate
- * it and install it.  Only return NULL if passed a bad parameter or run
- * out of memory.
- */
-struct gl_texture_image *
-_mesa_get_tex_image(GLcontext *ctx, struct gl_texture_object *texObj,
-                    GLenum target, GLint level)
-{
-   struct gl_texture_image *texImage;
-
-   if (!texObj)
-      return NULL;
-   
-   texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-   if (!texImage) {
-      texImage = ctx->Driver.NewTextureImage(ctx);
-      if (!texImage) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture image allocation");
-         return NULL;
-      }
-
-      _mesa_set_tex_image(texObj, target, level, texImage);
-   }
-
-   return texImage;
-}
-
-
-/**
- * Return pointer to the specified proxy texture image.
- * Note that proxy textures are per-context, not per-texture unit.
- * \return pointer to texture image or NULL if invalid target, invalid
- *         level, or out of memory.
- */
-struct gl_texture_image *
-_mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
-{
-   struct gl_texture_image *texImage;
-   GLuint texIndex;
-
-   if (level < 0 )
-      return NULL;
-
-   switch (target) {
-   case GL_PROXY_TEXTURE_1D:
-      if (level >= ctx->Const.MaxTextureLevels)
-         return NULL;
-      texIndex = TEXTURE_1D_INDEX;
-      break;
-   case GL_PROXY_TEXTURE_2D:
-      if (level >= ctx->Const.MaxTextureLevels)
-         return NULL;
-      texIndex = TEXTURE_2D_INDEX;
-      break;
-   case GL_PROXY_TEXTURE_3D:
-      if (level >= ctx->Const.Max3DTextureLevels)
-         return NULL;
-      texIndex = TEXTURE_3D_INDEX;
-      break;
-   case GL_PROXY_TEXTURE_CUBE_MAP:
-      if (level >= ctx->Const.MaxCubeTextureLevels)
-         return NULL;
-      texIndex = TEXTURE_CUBE_INDEX;
-      break;
-   case GL_PROXY_TEXTURE_RECTANGLE_NV:
-      if (level > 0)
-         return NULL;
-      texIndex = TEXTURE_RECT_INDEX;
-      break;
-   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-      if (level >= ctx->Const.MaxTextureLevels)
-         return NULL;
-      texIndex = TEXTURE_1D_ARRAY_INDEX;
-      break;
-   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-      if (level >= ctx->Const.MaxTextureLevels)
-         return NULL;
-      texIndex = TEXTURE_2D_ARRAY_INDEX;
-      break;
-   default:
-      return NULL;
-   }
-
-   texImage = ctx->Texture.ProxyTex[texIndex]->Image[0][level];
-   if (!texImage) {
-      texImage = ctx->Driver.NewTextureImage(ctx);
-      if (!texImage) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");
-         return NULL;
-      }
-      ctx->Texture.ProxyTex[texIndex]->Image[0][level] = texImage;
-      /* Set the 'back' pointer */
-      texImage->TexObject = ctx->Texture.ProxyTex[texIndex];
-   }
-   return texImage;
-}
-
-
-/**
- * Get the maximum number of allowed mipmap levels.
- *
- * \param ctx GL context.
- * \param target texture target.
- * 
- * \return the maximum number of allowed mipmap levels for the given
- * texture target, or zero if passed a bad target.
- *
- * \sa gl_constants.
- */
-GLint
-_mesa_max_texture_levels(GLcontext *ctx, GLenum target)
-{
-   switch (target) {
-   case GL_TEXTURE_1D:
-   case GL_PROXY_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-   case GL_PROXY_TEXTURE_2D:
-      return ctx->Const.MaxTextureLevels;
-   case GL_TEXTURE_3D:
-   case GL_PROXY_TEXTURE_3D:
-      return ctx->Const.Max3DTextureLevels;
-   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:
-   case GL_TEXTURE_CUBE_MAP_ARB:
-   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-      return ctx->Extensions.ARB_texture_cube_map
-         ? ctx->Const.MaxCubeTextureLevels : 0;
-   case GL_TEXTURE_RECTANGLE_NV:
-   case GL_PROXY_TEXTURE_RECTANGLE_NV:
-      return ctx->Extensions.NV_texture_rectangle ? 1 : 0;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-   case GL_TEXTURE_2D_ARRAY_EXT:
-   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-      return ctx->Extensions.MESA_texture_array
-         ? ctx->Const.MaxTextureLevels : 0;
-   default:
-      return 0; /* bad target */
-   }
-}
-
-
-
-#if 000 /* not used anymore */
-/*
- * glTexImage[123]D can accept a NULL image pointer.  In this case we
- * create a texture image with unspecified image contents per the OpenGL
- * spec.
- */
-static GLubyte *
-make_null_texture(GLint width, GLint height, GLint depth, GLenum format)
-{
-   const GLint components = _mesa_components_in_format(format);
-   const GLint numPixels = width * height * depth;
-   GLubyte *data = (GLubyte *) MALLOC(numPixels * components * sizeof(GLubyte));
-
-#ifdef DEBUG
-   /*
-    * Let's see if anyone finds this.  If glTexImage2D() is called with
-    * a NULL image pointer then load the texture image with something
-    * interesting instead of leaving it indeterminate.
-    */
-   if (data) {
-      static const char message[8][32] = {
-         "   X   X  XXXXX   XXX     X    ",
-         "   XX XX  X      X   X   X X   ",
-         "   X X X  X      X      X   X  ",
-         "   X   X  XXXX    XXX   XXXXX  ",
-         "   X   X  X          X  X   X  ",
-         "   X   X  X      X   X  X   X  ",
-         "   X   X  XXXXX   XXX   X   X  ",
-         "                               "
-      };
-
-      GLubyte *imgPtr = data;
-      GLint h, i, j, k;
-      for (h = 0; h < depth; h++) {
-         for (i = 0; i < height; i++) {
-            GLint srcRow = 7 - (i % 8);
-            for (j = 0; j < width; j++) {
-               GLint srcCol = j % 32;
-               GLubyte texel = (message[srcRow][srcCol]=='X') ? 255 : 70;
-               for (k = 0; k < components; k++) {
-                  *imgPtr++ = texel;
-               }
-            }
-         }
-      }
-   }
-#endif
-
-   return data;
-}
-#endif
-
-
-
-/**
- * Reset the fields of a gl_texture_image struct to zero.
- * 
- * \param img texture image structure.
- *
- * This is called when a proxy texture test fails, we set all the
- * image members (except DriverData) to zero.
- * It's also used in glTexImage[123]D as a safeguard to be sure all
- * required fields get initialized properly by the Driver.TexImage[123]D
- * functions.
- */
-static void
-clear_teximage_fields(struct gl_texture_image *img)
-{
-   ASSERT(img);
-   img->_BaseFormat = 0;
-   img->InternalFormat = 0;
-   img->Border = 0;
-   img->Width = 0;
-   img->Height = 0;
-   img->Depth = 0;
-   img->RowStride = 0;
-   if (img->ImageOffsets) {
-      free(img->ImageOffsets);
-      img->ImageOffsets = NULL;
-   }
-   img->Width2 = 0;
-   img->Height2 = 0;
-   img->Depth2 = 0;
-   img->WidthLog2 = 0;
-   img->HeightLog2 = 0;
-   img->DepthLog2 = 0;
-   img->Data = NULL;
-   img->TexFormat = MESA_FORMAT_NONE;
-   img->FetchTexelc = NULL;
-   img->FetchTexelf = NULL;
-}
-
-
-/**
- * Initialize basic fields of the gl_texture_image struct.
- *
- * \param ctx GL context.
- * \param target texture target (GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, etc).
- * \param img texture image structure to be initialized.
- * \param width image width.
- * \param height image height.
- * \param depth image depth.
- * \param border image border.
- * \param internalFormat internal format.
- *
- * Fills in the fields of \p img with the given information.
- * Note: width, height and depth include the border.
- */
-void
-_mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
-                           struct gl_texture_image *img,
-                           GLsizei width, GLsizei height, GLsizei depth,
-                           GLint border, GLenum internalFormat)
-{
-   GLint i;
-
-   ASSERT(img);
-   ASSERT(width >= 0);
-   ASSERT(height >= 0);
-   ASSERT(depth >= 0);
-
-   img->_BaseFormat = _mesa_base_tex_format( ctx, internalFormat );
-   ASSERT(img->_BaseFormat > 0);
-   img->InternalFormat = internalFormat;
-   img->Border = border;
-   img->Width = width;
-   img->Height = height;
-   img->Depth = depth;
-
-   img->Width2 = width - 2 * border;   /* == 1 << img->WidthLog2; */
-   img->WidthLog2 = logbase2(img->Width2);
-
-   if (height == 1) { /* 1-D texture */
-      img->Height2 = 1;
-      img->HeightLog2 = 0;
-   }
-   else {
-      img->Height2 = height - 2 * border; /* == 1 << img->HeightLog2; */
-      img->HeightLog2 = logbase2(img->Height2);
-   }
-
-   if (depth == 1) {  /* 2-D texture */
-      img->Depth2 = 1;
-      img->DepthLog2 = 0;
-   }
-   else {
-      img->Depth2 = depth - 2 * border;   /* == 1 << img->DepthLog2; */
-      img->DepthLog2 = logbase2(img->Depth2);
-   }
-
-   img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);
-
-   if ((width == 1 || _mesa_is_pow_two(img->Width2)) &&
-       (height == 1 || _mesa_is_pow_two(img->Height2)) &&
-       (depth == 1 || _mesa_is_pow_two(img->Depth2)))
-      img->_IsPowerOfTwo = GL_TRUE;
-   else
-      img->_IsPowerOfTwo = GL_FALSE;
-
-   /* RowStride and ImageOffsets[] describe how to address texels in 'Data' */
-   img->RowStride = width;
-   /* Allocate the ImageOffsets array and initialize to typical values.
-    * We allocate the array for 1D/2D textures too in order to avoid special-
-    * case code in the texstore routines.
-    */
-   if (img->ImageOffsets)
-      free(img->ImageOffsets);
-   img->ImageOffsets = (GLuint *) malloc(depth * sizeof(GLuint));
-   for (i = 0; i < depth; i++) {
-      img->ImageOffsets[i] = i * width * height;
-   }
-
-   /* Compute Width/Height/DepthScale for mipmap lod computation */
-   if (target == GL_TEXTURE_RECTANGLE_NV) {
-      /* scale = 1.0 since texture coords directly map to texels */
-      img->WidthScale = 1.0;
-      img->HeightScale = 1.0;
-      img->DepthScale = 1.0;
-   }
-   else {
-      img->WidthScale = (GLfloat) img->Width;
-      img->HeightScale = (GLfloat) img->Height;
-      img->DepthScale = (GLfloat) img->Depth;
-   }
-
-   img->FetchTexelc = NULL;
-   img->FetchTexelf = NULL;
-}
-
-
-/**
- * Free and clear fields of the gl_texture_image struct.
- *
- * \param ctx GL context.
- * \param texImage texture image structure to be cleared.
- *
- * After the call, \p texImage will have no data associated with it.  Its
- * fields are cleared so that its parent object will test incomplete.
- */
-void
-_mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage)
-{
-   ctx->Driver.FreeTexImageData(ctx, texImage);
-   clear_teximage_fields(texImage);
-}
-
-
-/**
- * This is the fallback for Driver.TestProxyTexImage().  Test the texture
- * level, width, height and depth against the ctx->Const limits for textures.
- *
- * A hardware driver might override this function if, for example, the
- * max 3D texture size is 512x512x64 (i.e. not a cube).
- *
- * Note that width, height, depth == 0 is not an error.  However, a
- * texture with zero width/height/depth will be considered "incomplete"
- * and texturing will effectively be disabled.
- *
- * \param target  one of GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D,
- *                GL_PROXY_TEXTURE_3D, GL_PROXY_TEXTURE_RECTANGLE_NV,
- *                GL_PROXY_TEXTURE_CUBE_MAP_ARB.
- * \param level  as passed to glTexImage
- * \param internalFormat  as passed to glTexImage
- * \param format  as passed to glTexImage
- * \param type  as passed to glTexImage
- * \param width  as passed to glTexImage
- * \param height  as passed to glTexImage
- * \param depth  as passed to glTexImage
- * \param border  as passed to glTexImage
- * \return GL_TRUE if the image is acceptable, GL_FALSE if not acceptable.
- */
-GLboolean
-_mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
-                          GLint internalFormat, GLenum format, GLenum type,
-                          GLint width, GLint height, GLint depth, GLint border)
-{
-   GLint maxSize;
-
-   (void) internalFormat;
-   (void) format;
-   (void) type;
-
-   switch (target) {
-   case GL_PROXY_TEXTURE_1D:
-      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-      if (width < 2 * border || width > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           width >0 && !_mesa_is_pow_two(width - 2 * border)) ||
-          level >= ctx->Const.MaxTextureLevels) {
-         /* bad width or level */
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   case GL_PROXY_TEXTURE_2D:
-      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-      if (width < 2 * border || width > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           width > 0 && !_mesa_is_pow_two(width - 2 * border)) ||
-          height < 2 * border || height > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           height > 0 && !_mesa_is_pow_two(height - 2 * border)) ||
-          level >= ctx->Const.MaxTextureLevels) {
-         /* bad width or height or level */
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   case GL_PROXY_TEXTURE_3D:
-      maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
-      if (width < 2 * border || width > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           width > 0 && !_mesa_is_pow_two(width - 2 * border)) ||
-          height < 2 * border || height > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           height > 0 && !_mesa_is_pow_two(height - 2 * border)) ||
-          depth < 2 * border || depth > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           depth > 0 && !_mesa_is_pow_two(depth - 2 * border)) ||
-          level >= ctx->Const.Max3DTextureLevels) {
-         /* bad width or height or depth or level */
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   case GL_PROXY_TEXTURE_RECTANGLE_NV:
-      if (width < 0 || width > ctx->Const.MaxTextureRectSize ||
-          height < 0 || height > ctx->Const.MaxTextureRectSize ||
-          level != 0) {
-         /* bad width or height or level */
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-      maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
-      if (width < 2 * border || width > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           width > 0 && !_mesa_is_pow_two(width - 2 * border)) ||
-          height < 2 * border || height > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           height > 0 && !_mesa_is_pow_two(height - 2 * border)) ||
-          level >= ctx->Const.MaxCubeTextureLevels) {
-         /* bad width or height */
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-      if (width < 2 * border || width > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           width > 0 && !_mesa_is_pow_two(width - 2 * border)) ||
-          level >= ctx->Const.MaxTextureLevels) {
-         /* bad width or level */
-         return GL_FALSE;
-      }
-
-      if (height < 1 || height > ctx->Const.MaxArrayTextureLayers) {
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-      if (width < 2 * border || width > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           width > 0 && !_mesa_is_pow_two(width - 2 * border)) ||
-          height < 2 * border || height > 2 + maxSize ||
-          (!ctx->Extensions.ARB_texture_non_power_of_two &&
-           height > 0 && !_mesa_is_pow_two(height - 2 * border)) ||
-          level >= ctx->Const.MaxTextureLevels) {
-         /* bad width or height or level */
-         return GL_FALSE;
-      }
-      if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers) {
-         return GL_FALSE;
-      }
-      return GL_TRUE;
-   default:
-      _mesa_problem(ctx, "Invalid target in _mesa_test_proxy_teximage");
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Helper function to determine whether a target supports compressed textures
- */
-static GLboolean
-target_can_be_compressed(GLcontext *ctx, GLenum target)
-{
-   return (((target == GL_TEXTURE_2D || target == GL_PROXY_TEXTURE_2D))
-           || ((ctx->Extensions.ARB_texture_cube_map &&
-                (target == GL_PROXY_TEXTURE_CUBE_MAP ||
-                 (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
-                  target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z))))
-           || ((ctx->Extensions.MESA_texture_array &&
-                ((target == GL_PROXY_TEXTURE_2D_ARRAY_EXT) ||
-                 (target == GL_TEXTURE_2D_ARRAY_EXT)))));
-}
-
-
-/**
- * Test the glTexImage[123]D() parameters for errors.
- * 
- * \param ctx GL context.
- * \param target texture target given by the user.
- * \param level image level given by the user.
- * \param internalFormat internal format given by the user.
- * \param format pixel data format given by the user.
- * \param type pixel data type given by the user.
- * \param dimensions texture image dimensions (must be 1, 2 or 3).
- * \param width image width given by the user.
- * \param height image height given by the user.
- * \param depth image depth given by the user.
- * \param border image border given by the user.
- * 
- * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
- *
- * Verifies each of the parameters against the constants specified in
- * __GLcontextRec::Const and the supported extensions, and according to the
- * OpenGL specification.
- */
-static GLboolean
-texture_error_check( GLcontext *ctx, GLenum target,
-                     GLint level, GLint internalFormat,
-                     GLenum format, GLenum type,
-                     GLuint dimensions,
-                     GLint width, GLint height,
-                     GLint depth, GLint border )
-{
-   const GLboolean isProxy = _mesa_is_proxy_texture(target);
-   GLboolean sizeOK = GL_TRUE;
-   GLboolean colorFormat, indexFormat;
-   GLenum proxy_target;
-
-   /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */
-   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(level=%d)", dimensions, level);
-      }
-      return GL_TRUE;
-   }
-
-   /* Check border */
-   if (border < 0 || border > 1 ||
-       ((target == GL_TEXTURE_RECTANGLE_NV ||
-         target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(border=%d)", dimensions, border);
-      }
-      return GL_TRUE;
-   }
-
-   if (width < 0 || height < 0 || depth < 0) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(width, height or depth < 0)", dimensions);
-      }
-      return GL_TRUE;
-   }
-
-   /* Check target and call ctx->Driver.TestProxyTexImage() to check the
-    * level, width, height and depth.
-    */
-   if (dimensions == 1) {
-      if (target == GL_PROXY_TEXTURE_1D || target == GL_TEXTURE_1D) {
-         proxy_target = GL_PROXY_TEXTURE_1D;
-         height = 1;
-         depth = 1;
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage1D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 2) {
-      depth = 1;
-      if (target == GL_PROXY_TEXTURE_2D || target == GL_TEXTURE_2D) {
-         proxy_target = GL_PROXY_TEXTURE_2D;
-      }
-      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||
-               (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-                target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage2D(target)");
-            return GL_TRUE;
-         }
-         proxy_target = GL_PROXY_TEXTURE_CUBE_MAP_ARB;
-         sizeOK = (width == height);
-      }
-      else if (target == GL_PROXY_TEXTURE_RECTANGLE_NV ||
-               target == GL_TEXTURE_RECTANGLE_NV) {
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage2D(target)");
-            return GL_TRUE;
-         }
-         proxy_target = GL_PROXY_TEXTURE_RECTANGLE_NV;
-      }
-      else if (target == GL_PROXY_TEXTURE_1D_ARRAY_EXT ||
-               target == GL_TEXTURE_1D_ARRAY_EXT) {
-         proxy_target = GL_PROXY_TEXTURE_1D_ARRAY_EXT;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage2D(target)");
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 3) {
-      if (target == GL_PROXY_TEXTURE_3D || target == GL_TEXTURE_3D) {
-         proxy_target = GL_PROXY_TEXTURE_3D;
-      }
-      else if (target == GL_PROXY_TEXTURE_2D_ARRAY_EXT ||
-               target == GL_TEXTURE_2D_ARRAY_EXT) {
-         proxy_target = GL_PROXY_TEXTURE_2D_ARRAY_EXT;
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage3D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else {
-      _mesa_problem( ctx, "bad dims in texture_error_check" );
-      return GL_TRUE;
-   }
-
-   sizeOK = sizeOK && ctx->Driver.TestProxyTexImage(ctx, proxy_target, level,
-                                                    internalFormat, format,
-                                                    type, width, height,
-                                                    depth, border);
-   if (!sizeOK) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(level=%d, width=%d, height=%d, depth=%d)",
-                     dimensions, level, width, height, depth);
-      }
-      return GL_TRUE;
-   }
-
-   /* Check internalFormat */
-   if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(internalFormat=%s)",
-                     dimensions, _mesa_lookup_enum_by_nr(internalFormat));
-      }
-      return GL_TRUE;
-   }
-
-   /* Check incoming image format and type */
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      /* Yes, generate GL_INVALID_OPERATION, not GL_INVALID_ENUM, if there
-       * is a type/format mismatch.  See 1.2 spec page 94, sec 3.6.4.
-       */
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexImage%dD(incompatible format 0x%x, type 0x%x)",
-                     dimensions, format, type);
-      }
-      return GL_TRUE;
-   }
-
-   /* make sure internal format and format basically agree */
-   colorFormat = _mesa_is_color_format(format);
-   indexFormat = _mesa_is_index_format(format);
-   if ((_mesa_is_color_format(internalFormat) && !colorFormat && !indexFormat) ||
-       (_mesa_is_index_format(internalFormat) && !indexFormat) ||
-       (_mesa_is_depth_format(internalFormat) != _mesa_is_depth_format(format)) ||
-       (_mesa_is_ycbcr_format(internalFormat) != _mesa_is_ycbcr_format(format)) ||
-       (_mesa_is_depthstencil_format(internalFormat) != _mesa_is_depthstencil_format(format)) ||
-       (_mesa_is_dudv_format(internalFormat) != _mesa_is_dudv_format(format))) {
-      if (!isProxy)
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexImage%dD(incompatible internalFormat 0x%x, format 0x%x)",
-                     dimensions, internalFormat, format);
-      return GL_TRUE;
-   }
-
-   /* additional checks for ycbcr textures */
-   if (internalFormat == GL_YCBCR_MESA) {
-      ASSERT(ctx->Extensions.MESA_ycbcr_texture);
-      if (type != GL_UNSIGNED_SHORT_8_8_MESA &&
-          type != GL_UNSIGNED_SHORT_8_8_REV_MESA) {
-         char message[100];
-         _mesa_snprintf(message, sizeof(message),
-                        "glTexImage%dD(format/type YCBCR mismatch", dimensions);
-         _mesa_error(ctx, GL_INVALID_ENUM, "%s", message);
-         return GL_TRUE; /* error */
-      }
-      if (target != GL_TEXTURE_2D &&
-          target != GL_PROXY_TEXTURE_2D &&
-          target != GL_TEXTURE_RECTANGLE_NV &&
-          target != GL_PROXY_TEXTURE_RECTANGLE_NV) {
-         if (!isProxy)
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage(target)");
-         return GL_TRUE;
-      }
-      if (border != 0) {
-         if (!isProxy) {
-            char message[100];
-            _mesa_snprintf(message, sizeof(message),
-                           "glTexImage%dD(format=GL_YCBCR_MESA and border=%d)",
-                           dimensions, border);
-            _mesa_error(ctx, GL_INVALID_VALUE, "%s", message);
-         }
-         return GL_TRUE;
-      }
-   }
-
-   /* additional checks for depth textures */
-   if (_mesa_base_tex_format(ctx, internalFormat) == GL_DEPTH_COMPONENT) {
-      /* Only 1D, 2D and rectangular textures supported, not 3D or cubes */
-      if (target != GL_TEXTURE_1D &&
-          target != GL_PROXY_TEXTURE_1D &&
-          target != GL_TEXTURE_2D &&
-          target != GL_PROXY_TEXTURE_2D &&
-          target != GL_TEXTURE_RECTANGLE_ARB &&
-          target != GL_PROXY_TEXTURE_RECTANGLE_ARB) {
-         if (!isProxy)
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexImage(target/internalFormat)");
-         return GL_TRUE;
-      }
-   }
-
-   /* additional checks for compressed textures */
-   if (_mesa_is_compressed_format(ctx, internalFormat)) {
-      if (!target_can_be_compressed(ctx, target) && !isProxy) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexImage%dD(target)", dimensions);
-         return GL_TRUE;
-      }
-      if (border != 0) {
-         if (!isProxy) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glTexImage%dD(border!=0)", dimensions);
-         }
-         return GL_TRUE;
-      }
-   }
-
-   /* if we get here, the parameters are OK */
-   return GL_FALSE;
-}
-
-
-/**
- * Test glTexSubImage[123]D() parameters for errors.
- * 
- * \param ctx GL context.
- * \param dimensions texture image dimensions (must be 1, 2 or 3).
- * \param target texture target given by the user.
- * \param level image level given by the user.
- * \param xoffset sub-image x offset given by the user.
- * \param yoffset sub-image y offset given by the user.
- * \param zoffset sub-image z offset given by the user.
- * \param format pixel data format given by the user.
- * \param type pixel data type given by the user.
- * \param width image width given by the user.
- * \param height image height given by the user.
- * \param depth image depth given by the user.
- * 
- * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
- *
- * Verifies each of the parameters against the constants specified in
- * __GLcontextRec::Const and the supported extensions, and according to the
- * OpenGL specification.
- */
-static GLboolean
-subtexture_error_check( GLcontext *ctx, GLuint dimensions,
-                        GLenum target, GLint level,
-                        GLint xoffset, GLint yoffset, GLint zoffset,
-                        GLint width, GLint height, GLint depth,
-                        GLenum format, GLenum type )
-{
-   /* Check target */
-   if (dimensions == 1) {
-      if (target != GL_TEXTURE_1D) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 2) {
-      if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-          target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
-            return GL_TRUE;
-         }
-      }
-      else if (target == GL_TEXTURE_RECTANGLE_NV) {
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
-            return GL_TRUE;
-         }
-      }
-      else if (target == GL_TEXTURE_1D_ARRAY_EXT) {
-        if (!ctx->Extensions.MESA_texture_array) {
-           _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
-           return GL_TRUE;
-        }
-      }
-      else if (target != GL_TEXTURE_2D) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 3) {
-      if (target == GL_TEXTURE_2D_ARRAY_EXT) {
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage3D(target)" );
-            return GL_TRUE;
-         }
-      }
-      else if (target != GL_TEXTURE_3D) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexSubImage3D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else {
-      _mesa_problem( ctx, "invalid dims in texture_error_check" );
-      return GL_TRUE;
-   }
-
-   /* Basic level check */
-   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage2D(level=%d)", level);
-      return GL_TRUE;
-   }
-
-   if (width < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glTexSubImage%dD(width=%d)", dimensions, width);
-      return GL_TRUE;
-   }
-   if (height < 0 && dimensions > 1) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glTexSubImage%dD(height=%d)", dimensions, height);
-      return GL_TRUE;
-   }
-   if (depth < 0 && dimensions > 2) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glTexSubImage%dD(depth=%d)", dimensions, depth);
-      return GL_TRUE;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glTexSubImage%dD(incompatible format 0x%x, type 0x%x)",
-                  dimensions, format, type);
-      return GL_TRUE;
-   }
-
-   return GL_FALSE;
-}
-
-
-/**
- * Do second part of glTexSubImage which depends on the destination texture.
- * \return GL_TRUE if error recorded, GL_FALSE otherwise
- */
-static GLboolean
-subtexture_error_check2( GLcontext *ctx, GLuint dimensions,
-			 GLenum target, GLint level,
-			 GLint xoffset, GLint yoffset, GLint zoffset,
-			 GLint width, GLint height, GLint depth,
-			 GLenum format, GLenum type,
-			 const struct gl_texture_image *destTex )
-{
-   if (!destTex) {
-      /* undefined image level */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexSubImage%dD", dimensions);
-      return GL_TRUE;
-   }
-
-   if (xoffset < -((GLint)destTex->Border)) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(xoffset)",
-                  dimensions);
-      return GL_TRUE;
-   }
-   if (xoffset + width > (GLint) (destTex->Width + destTex->Border)) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(xoffset+width)",
-                  dimensions);
-      return GL_TRUE;
-   }
-   if (dimensions > 1) {
-      if (yoffset < -((GLint)destTex->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(yoffset)",
-                     dimensions);
-         return GL_TRUE;
-      }
-      if (yoffset + height > (GLint) (destTex->Height + destTex->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(yoffset+height)",
-                     dimensions);
-         return GL_TRUE;
-      }
-   }
-   if (dimensions > 2) {
-      if (zoffset < -((GLint)destTex->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage3D(zoffset)");
-         return GL_TRUE;
-      }
-      if (zoffset + depth  > (GLint) (destTex->Depth + destTex->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage3D(zoffset+depth)");
-         return GL_TRUE;
-      }
-   }
-
-   if (_mesa_is_format_compressed(destTex->TexFormat)) {
-      GLuint bw, bh;
-
-      if (!target_can_be_compressed(ctx, target)) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexSubImage%dD(target=%s)", dimensions,
-                     _mesa_lookup_enum_by_nr(target));
-         return GL_TRUE;
-      }
-
-      /* do tests which depend on compression block size */
-      _mesa_get_format_block_size(destTex->TexFormat, &bw, &bh);
-
-      /* offset must be multiple of block size */
-      if ((xoffset % bw != 0) || (yoffset % bh != 0)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexSubImage%dD(xoffset = %d, yoffset = %d)",
-                     dimensions, xoffset, yoffset);
-         return GL_TRUE;
-      }
-      /* size must be multiple of bw by bh or equal to whole texture size */
-      if ((width % bw != 0) && (GLuint) width != destTex->Width) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexSubImage%dD(width = %d)", dimensions, width);
-         return GL_TRUE;
-      }         
-      if ((height % bh != 0) && (GLuint) height != destTex->Height) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexSubImage%dD(height = %d)", dimensions, height);
-         return GL_TRUE;
-      }         
-   }
-
-   return GL_FALSE;
-}
-
-
-/**
- * Test glCopyTexImage[12]D() parameters for errors.
- * 
- * \param ctx GL context.
- * \param dimensions texture image dimensions (must be 1, 2 or 3).
- * \param target texture target given by the user.
- * \param level image level given by the user.
- * \param internalFormat internal format given by the user.
- * \param width image width given by the user.
- * \param height image height given by the user.
- * \param border texture border.
- * 
- * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
- * 
- * Verifies each of the parameters against the constants specified in
- * __GLcontextRec::Const and the supported extensions, and according to the
- * OpenGL specification.
- */
-static GLboolean
-copytexture_error_check( GLcontext *ctx, GLuint dimensions,
-                         GLenum target, GLint level, GLint internalFormat,
-                         GLint width, GLint height, GLint border )
-{
-   GLenum type;
-   GLboolean sizeOK;
-   GLint format;
-
-   /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */
-   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexImage%dD(level=%d)", dimensions, level);
-      return GL_TRUE;
-   }
-
-   /* Check that the source buffer is complete */
-   if (ctx->ReadBuffer->Name) {
-      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);
-      if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-         _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                     "glCopyTexImage%dD(invalid readbuffer)", dimensions);
-         return GL_TRUE;
-      }
-   }
-
-   /* Check border */
-   if (border < 0 || border > 1 ||
-       ((target == GL_TEXTURE_RECTANGLE_NV ||
-         target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
-      return GL_TRUE;
-   }
-
-   format = _mesa_base_tex_format(ctx, internalFormat);
-   if (format < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexImage%dD(internalFormat)", dimensions);
-      return GL_TRUE;
-   }
-
-   if (!_mesa_source_buffer_exists(ctx, format)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyTexImage%dD(missing readbuffer)", dimensions);
-      return GL_TRUE;
-   }
-
-   /* NOTE: the format and type aren't really significant for
-    * TestProxyTexImage().  Only the internalformat really matters.
-    */
-   type = GL_FLOAT;
-
-   /* Check target and call ctx->Driver.TestProxyTexImage() to check the
-    * level, width, height and depth.
-    */
-   if (dimensions == 1) {
-      if (target == GL_TEXTURE_1D) {
-         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_1D,
-                                                level, internalFormat,
-                                                format, type,
-                                                width, 1, 1, border);
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage1D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 2) {
-      if (target == GL_TEXTURE_2D) {
-         sizeOK = ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_2D,
-                                                level, internalFormat,
-                                                format, type,
-                                                width, height, 1, border);
-      }
-      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
-            return GL_TRUE;
-         }
-         sizeOK = (width == height) &&
-            ctx->Driver.TestProxyTexImage(ctx, GL_PROXY_TEXTURE_CUBE_MAP_ARB,
-                                          level, internalFormat, format, type,
-                                          width, height, 1, border);
-      }
-      else if (target == GL_TEXTURE_RECTANGLE_NV) {
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
-            return GL_TRUE;
-         }
-         sizeOK = ctx->Driver.TestProxyTexImage(ctx,
-                                                GL_PROXY_TEXTURE_RECTANGLE_NV,
-                                                level, internalFormat,
-                                                format, type,
-                                                width, height, 1, border);
-      }
-      else if (target == GL_TEXTURE_1D_ARRAY_EXT) {
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)");
-            return GL_TRUE;
-         }
-         sizeOK = ctx->Driver.TestProxyTexImage(ctx,
-                                                GL_PROXY_TEXTURE_1D_ARRAY_EXT,
-                                                level, internalFormat,
-                                                format, type,
-                                                width, height, 1, border);
-      }
-      else {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid dimensions in copytexture_error_check");
-      return GL_TRUE;
-   }
-
-   if (!sizeOK) {
-      if (dimensions == 1) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexImage1D(width=%d)", width);
-      }
-      else {
-         ASSERT(dimensions == 2);
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexImage2D(width=%d, height=%d)", width, height);
-      }
-      return GL_TRUE;
-   }
-
-   if (_mesa_is_compressed_format(ctx, internalFormat)) {
-      if (!target_can_be_compressed(ctx, target)) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glCopyTexImage%dD(target)", dimensions);
-         return GL_TRUE;
-      }
-      if (border != 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%dD(border!=0)", dimensions);
-         return GL_TRUE;
-      }
-   }
-   else if (_mesa_is_depth_format(internalFormat)) {
-      /* make sure we have depth/stencil buffers */
-      if (!ctx->ReadBuffer->_DepthBuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%dD(no depth)", dimensions);
-         return GL_TRUE;
-      }
-   }
-   else if (_mesa_is_depthstencil_format(internalFormat)) {
-      /* make sure we have depth/stencil buffers */
-      if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%dD(no depth/stencil buffer)", dimensions);
-         return GL_TRUE;
-      }
-   }
-
-   /* if we get here, the parameters are OK */
-   return GL_FALSE;
-}
-
-
-/**
- * Test glCopyTexSubImage[12]D() parameters for errors.
- * Note that this is the first part of error checking.
- * See also copytexsubimage_error_check2() below for the second part.
- * 
- * \param ctx GL context.
- * \param dimensions texture image dimensions (must be 1, 2 or 3).
- * \param target texture target given by the user.
- * \param level image level given by the user.
- * 
- * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
- */
-static GLboolean
-copytexsubimage_error_check1( GLcontext *ctx, GLuint dimensions,
-                              GLenum target, GLint level)
-{
-   /* Check that the source buffer is complete */
-   if (ctx->ReadBuffer->Name) {
-      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);
-      if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-         _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
-                     "glCopyTexImage%dD(invalid readbuffer)", dimensions);
-         return GL_TRUE;
-      }
-   }
-
-   /* Check target */
-   if (dimensions == 1) {
-      if (target != GL_TEXTURE_1D) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage1D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 2) {
-      if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-          target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
-            return GL_TRUE;
-         }
-      }
-      else if (target == GL_TEXTURE_RECTANGLE_NV) {
-         if (!ctx->Extensions.NV_texture_rectangle) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
-            return GL_TRUE;
-         }
-      }
-      else if (target == GL_TEXTURE_1D_ARRAY_EXT) {
-         if (!ctx->Extensions.MESA_texture_array) {
-            _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
-            return GL_TRUE;
-         }
-      }
-      else if (target != GL_TEXTURE_2D) {
-         _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" );
-         return GL_TRUE;
-      }
-   }
-   else if (dimensions == 3) {
-      if (((target != GL_TEXTURE_2D_ARRAY_EXT) ||
-	   (!ctx->Extensions.MESA_texture_array))
-	  && (target != GL_TEXTURE_3D)) {
-	 _mesa_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage3D(target)" );
-	 return GL_TRUE;
-      }
-   }
-
-   /* Check level */
-   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexSubImage%dD(level=%d)", dimensions, level);
-      return GL_TRUE;
-   }
-
-   return GL_FALSE;
-}
-
-
-/**
- * Second part of error checking for glCopyTexSubImage[12]D().
- * \param xoffset sub-image x offset given by the user.
- * \param yoffset sub-image y offset given by the user.
- * \param zoffset sub-image z offset given by the user.
- * \param width image width given by the user.
- * \param height image height given by the user.
- */
-static GLboolean
-copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
-			      GLenum target, GLint level,
-			      GLint xoffset, GLint yoffset, GLint zoffset,
-			      GLsizei width, GLsizei height,
-			      const struct gl_texture_image *teximage )
-{
-   /* check that dest tex image exists */
-   if (!teximage) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyTexSubImage%dD(undefined texture level: %d)",
-                  dimensions, level);
-      return GL_TRUE;
-   }
-
-   /* Check size */
-   if (width < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexSubImage%dD(width=%d)", dimensions, width);
-      return GL_TRUE;
-   }
-   if (dimensions > 1 && height < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexSubImage%dD(height=%d)", dimensions, height);
-      return GL_TRUE;
-   }
-
-   /* check x/y offsets */
-   if (xoffset < -((GLint)teximage->Border)) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexSubImage%dD(xoffset=%d)", dimensions, xoffset);
-      return GL_TRUE;
-   }
-   if (xoffset + width > (GLint) (teximage->Width + teximage->Border)) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCopyTexSubImage%dD(xoffset+width)", dimensions);
-      return GL_TRUE;
-   }
-   if (dimensions > 1) {
-      if (yoffset < -((GLint)teximage->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(yoffset=%d)", dimensions, yoffset);
-         return GL_TRUE;
-      }
-      /* NOTE: we're adding the border here, not subtracting! */
-      if (yoffset + height > (GLint) (teximage->Height + teximage->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(yoffset+height)", dimensions);
-         return GL_TRUE;
-      }
-   }
-
-   /* check z offset */
-   if (dimensions > 2) {
-      if (zoffset < -((GLint)teximage->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(zoffset)", dimensions);
-         return GL_TRUE;
-      }
-      if (zoffset > (GLint) (teximage->Depth + teximage->Border)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(zoffset+depth)", dimensions);
-         return GL_TRUE;
-      }
-   }
-
-   if (_mesa_is_format_compressed(teximage->TexFormat)) {
-      if (!target_can_be_compressed(ctx, target)) {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glCopyTexSubImage%dD(target)", dimensions);
-         return GL_TRUE;
-      }
-      /* offset must be multiple of 4 */
-      if ((xoffset & 3) || (yoffset & 3)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(xoffset or yoffset)", dimensions);
-         return GL_TRUE;
-      }
-      /* size must be multiple of 4 */
-      if ((width & 3) != 0 && (GLuint) width != teximage->Width) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(width)", dimensions);
-         return GL_TRUE;
-      }         
-      if ((height & 3) != 0 && (GLuint) height != teximage->Height) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCopyTexSubImage%dD(height)", dimensions);
-         return GL_TRUE;
-      }         
-   }
-
-   if (teximage->InternalFormat == GL_YCBCR_MESA) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyTexSubImage2D");
-      return GL_TRUE;
-   }
-
-   if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCopyTexSubImage%dD(missing readbuffer, format=0x%x)",
-                  dimensions, teximage->_BaseFormat);
-      return GL_TRUE;
-   }
-
-   if (teximage->_BaseFormat == GL_DEPTH_COMPONENT) {
-      if (!ctx->ReadBuffer->_DepthBuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexSubImage%dD(no depth buffer)",
-                     dimensions);
-         return GL_TRUE;
-      }
-   }
-   else if (teximage->_BaseFormat == GL_DEPTH_STENCIL_EXT) {
-      if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexSubImage%dD(no depth/stencil buffer)",
-                     dimensions);
-         return GL_TRUE;
-      }
-   }
-
-   /* if we get here, the parameters are OK */
-   return GL_FALSE;
-}
-
-
-/** Callback info for walking over FBO hash table */
-struct cb_info
-{
-   GLcontext *ctx;
-   struct gl_texture_object *texObj;
-   GLuint level, face;
-};
-
-
-/**
- * Check render to texture callback.  Called from _mesa_HashWalk().
- */
-static void
-check_rtt_cb(GLuint key, void *data, void *userData)
-{
-   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
-   const struct cb_info *info = (struct cb_info *) userData;
-   GLcontext *ctx = info->ctx;
-   const struct gl_texture_object *texObj = info->texObj;
-   const GLuint level = info->level, face = info->face;
-
-   /* If this is a user-created FBO */
-   if (fb->Name) {
-      GLuint i;
-      /* check if any of the FBO's attachments point to 'texObj' */
-      for (i = 0; i < BUFFER_COUNT; i++) {
-         struct gl_renderbuffer_attachment *att = fb->Attachment + i;
-         if (att->Type == GL_TEXTURE &&
-             att->Texture == texObj &&
-             att->TextureLevel == level &&
-             att->CubeMapFace == face) {
-            ASSERT(att->Texture->Image[att->CubeMapFace][att->TextureLevel]);
-            /* Tell driver about the new renderbuffer texture */
-            ctx->Driver.RenderTexture(ctx, ctx->DrawBuffer, att);
-            /* Mark fb status as indeterminate to force re-validation */
-            fb->_Status = 0;
-         }
-      }
-   }
-}
-
-
-/**
- * When a texture image is specified we have to check if it's bound to
- * any framebuffer objects (render to texture) in order to detect changes
- * in size or format since that effects FBO completeness.
- * Any FBOs rendering into the texture must be re-validated.
- */
-static void
-update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
-                   GLuint face, GLuint level)
-{
-   /* Only check this texture if it's been marked as RenderToTexture */
-   if (texObj->_RenderToTexture) {
-      struct cb_info info;
-      info.ctx = ctx;
-      info.texObj = texObj;
-      info.level = level;
-      info.face = face;
-      _mesa_HashWalk(ctx->Shared->FrameBuffers, check_rtt_cb, &info);
-   }
-}
-
-
-/**
- * If the texture object's GenerateMipmap flag is set and we've
- * changed the texture base level image, regenerate the rest of the
- * mipmap levels now.
- */
-static INLINE void
-check_gen_mipmap(GLcontext *ctx, GLenum target,
-                 struct gl_texture_object *texObj, GLint level)
-{
-   ASSERT(target != GL_TEXTURE_CUBE_MAP);
-   if (texObj->GenerateMipmap &&
-       level == texObj->BaseLevel &&
-       level < texObj->MaxLevel) {
-      ASSERT(ctx->Driver.GenerateMipmap);
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
-}
-
-
-/** Debug helper: override the user-requested internal format */
-static GLenum
-override_internal_format(GLenum internalFormat, GLint width, GLint height)
-{
-#if 0
-   if (internalFormat == GL_RGBA16F_ARB ||
-       internalFormat == GL_RGBA32F_ARB) {
-      printf("Convert rgba float tex to int %d x %d\n", width, height);
-      return GL_RGBA;
-   }
-   else if (internalFormat == GL_RGB16F_ARB ||
-            internalFormat == GL_RGB32F_ARB) {
-      printf("Convert rgb float tex to int %d x %d\n", width, height);
-      return GL_RGB;
-   }
-   else if (internalFormat == GL_LUMINANCE_ALPHA16F_ARB ||
-            internalFormat == GL_LUMINANCE_ALPHA32F_ARB) {
-      printf("Convert luminance float tex to int %d x %d\n", width, height);
-      return GL_LUMINANCE_ALPHA;
-   }
-   else if (internalFormat == GL_LUMINANCE16F_ARB ||
-            internalFormat == GL_LUMINANCE32F_ARB) {
-      printf("Convert luminance float tex to int %d x %d\n", width, height);
-      return GL_LUMINANCE;
-   }
-   else if (internalFormat == GL_ALPHA16F_ARB ||
-            internalFormat == GL_ALPHA32F_ARB) {
-      printf("Convert luminance float tex to int %d x %d\n", width, height);
-      return GL_ALPHA;
-   }
-   /*
-   else if (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
-      internalFormat = GL_RGBA;
-   }
-   */
-   else {
-      return internalFormat;
-   }
-#else
-   return internalFormat;
-#endif
-}
-
-
-/**
- * Choose the actual hardware format for a texture image.
- * Try to use the same format as the previous image level when possible.
- * Otherwise, ask the driver for the best format.
- * It's important to try to choose a consistant format for all levels
- * for efficient texture memory layout/allocation.  In particular, this
- * comes up during automatic mipmap generation.
- */
-void
-_mesa_choose_texture_format(GLcontext *ctx,
-                            struct gl_texture_object *texObj,
-                            struct gl_texture_image *texImage,
-                            GLenum target, GLint level,
-                            GLenum internalFormat, GLenum format, GLenum type)
-{
-   /* see if we've already chosen a format for the previous level */
-   if (level > 0) {
-      struct gl_texture_image *prevImage =
-	 _mesa_select_tex_image(ctx, texObj, target, level - 1);
-      /* See if the prev level is defined and has an internal format which
-       * matches the new internal format.
-       */
-      if (prevImage &&
-          prevImage->Width > 0 &&
-          prevImage->InternalFormat == internalFormat) {
-         /* use the same format */
-         texImage->TexFormat = prevImage->TexFormat;
-         return;
-      }
-   }
-
-   /* choose format from scratch */
-   texImage->TexFormat = ctx->Driver.ChooseTextureFormat(ctx, internalFormat,
-                                                         format, type);
-   ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
-}
-
-
-
-/*
- * Called from the API.  Note that width includes the border.
- */
-void GLAPIENTRY
-_mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
-                  GLsizei width, GLint border, GLenum format,
-                  GLenum type, const GLvoid *pixels )
-{
-   GLsizei postConvWidth = width;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexImage1D %s %d %s %d %d %s %s %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat), width, border,
-                  _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
-
-   internalFormat = override_internal_format(internalFormat, width, 1);
-
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-   }
-#endif
-
-   if (target == GL_TEXTURE_1D) {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-      const GLuint face = _mesa_tex_target_to_face(target);
-
-      if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 1, postConvWidth, 1, 1, border)) {
-         return;   /* error was recorded */
-      }
-
-      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-	 _mesa_update_state(ctx);
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");
-	 }
-         else {
-            if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
-            }
-
-            ASSERT(texImage->Data == NULL);
-
-            clear_teximage_fields(texImage); /* not really needed, but helpful */
-            _mesa_init_teximage_fields(ctx, target, texImage,
-                                       postConvWidth, 1, 1,
-                                       border, internalFormat);
-
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, format, type);
-
-            /* Give the texture to the driver.  <pixels> may be null. */
-            ASSERT(ctx->Driver.TexImage1D);
-            ctx->Driver.TexImage1D(ctx, target, level, internalFormat,
-                                   width, border, format, type, pixels,
-                                   &ctx->Unpack, texObj, texImage);
-
-            ASSERT(texImage->TexFormat);
-
-            _mesa_set_fetch_functions(texImage, 1);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            update_fbo_texture(ctx, texObj, face, level);
-
-            /* state update */
-            texObj->_Complete = GL_FALSE;
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-   else if (target == GL_PROXY_TEXTURE_1D) {
-      /* Proxy texture: check for errors and update proxy state */
-      struct gl_texture_image *texImage;
-      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-      if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 1, postConvWidth, 1, 1, border)) {
-         /* when error, clear all proxy texture image parameters */
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* no error, set the tex image parameters */
-         struct gl_texture_object *texObj =
-            _mesa_get_current_tex_object(ctx, target);
-         ASSERT(texImage);
-         _mesa_init_teximage_fields(ctx, target, texImage,
-                                    postConvWidth, 1, 1,
-                                    border, internalFormat);
-         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                     internalFormat, format, type);
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage1D(target)" );
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
-                  GLsizei width, GLsizei height, GLint border,
-                  GLenum format, GLenum type,
-                  const GLvoid *pixels )
-{
-   GLsizei postConvWidth = width, postConvHeight = height;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexImage2D %s %d %s %d %d %d %s %s %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat), width, height,
-                  border, _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
-
-   internalFormat = override_internal_format(internalFormat, width, height);
-
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
-					 &postConvHeight);
-   }
-#endif
-
-   if (target == GL_TEXTURE_2D ||
-       (ctx->Extensions.ARB_texture_cube_map &&
-        target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) ||
-       (ctx->Extensions.NV_texture_rectangle &&
-        target == GL_TEXTURE_RECTANGLE_NV) ||
-       (ctx->Extensions.MESA_texture_array &&
-        target == GL_TEXTURE_1D_ARRAY_EXT)) {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-      const GLuint face = _mesa_tex_target_to_face(target);
-
-      if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 2, postConvWidth, postConvHeight,
-                              1, border)) {
-         return;   /* error was recorded */
-      }
-
-      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-	 _mesa_update_state(ctx);
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
-	 }
-         else {
-            if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
-            }
-
-            ASSERT(texImage->Data == NULL);
-            clear_teximage_fields(texImage); /* not really needed, but helpful */
-            _mesa_init_teximage_fields(ctx, target, texImage,
-                                       postConvWidth, postConvHeight, 1,
-                                       border, internalFormat);
-
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, format, type);
-
-            /* Give the texture to the driver.  <pixels> may be null. */
-            ASSERT(ctx->Driver.TexImage2D);
-            ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
-                                   width, height, border, format, type,
-                                   pixels, &ctx->Unpack, texObj, texImage);
-
-            ASSERT(texImage->TexFormat);
-
-            _mesa_set_fetch_functions(texImage, 2);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            update_fbo_texture(ctx, texObj, face, level);
-
-            /* state update */
-            texObj->_Complete = GL_FALSE;
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-   else if (target == GL_PROXY_TEXTURE_2D ||
-            (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB &&
-             ctx->Extensions.ARB_texture_cube_map) ||
-            (target == GL_PROXY_TEXTURE_RECTANGLE_NV &&
-             ctx->Extensions.NV_texture_rectangle) ||
-            (ctx->Extensions.MESA_texture_array &&
-             target == GL_PROXY_TEXTURE_1D_ARRAY_EXT)) {
-      /* Proxy texture: check for errors and update proxy state */
-      struct gl_texture_image *texImage;
-      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-      if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 2, postConvWidth, postConvHeight,
-                              1, border)) {
-         /* when error, clear all proxy texture image parameters */
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* no error, set the tex image parameters */
-         struct gl_texture_object *texObj =
-            _mesa_get_current_tex_object(ctx, target);
-         _mesa_init_teximage_fields(ctx, target, texImage,
-                                    postConvWidth, postConvHeight, 1,
-                                    border, internalFormat);
-         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                     internalFormat, format, type);
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" );
-      return;
-   }
-}
-
-
-/*
- * Called by the API or display list executor.
- * Note that width and height include the border.
- */
-void GLAPIENTRY
-_mesa_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);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexImage3D %s %d %s %d %d %d %d %s %s %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat), width, height,
-                  depth, border, _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
-
-   internalFormat = override_internal_format(internalFormat, width, height);
-
-   if (target == GL_TEXTURE_3D ||
-       (ctx->Extensions.MESA_texture_array &&
-        target == GL_TEXTURE_2D_ARRAY_EXT)) {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-      const GLuint face = _mesa_tex_target_to_face(target);
-
-      if (texture_error_check(ctx, target, level, (GLint) internalFormat,
-                              format, type, 3, width, height, depth, border)) {
-         return;   /* error was recorded */
-      }
-
-      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-	 _mesa_update_state(ctx);
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");
-	 }
-         else {
-            if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
-            }
-
-            ASSERT(texImage->Data == NULL);
-            clear_teximage_fields(texImage); /* not really needed, but helpful */
-            _mesa_init_teximage_fields(ctx, target, texImage,
-                                       width, height, depth,
-                                       border, internalFormat);
-
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, format, type);
-
-            /* Give the texture to the driver.  <pixels> may be null. */
-            ASSERT(ctx->Driver.TexImage3D);
-            ctx->Driver.TexImage3D(ctx, target, level, internalFormat,
-                                   width, height, depth, border, format, type,
-                                   pixels, &ctx->Unpack, texObj, texImage);
-
-            ASSERT(texImage->TexFormat);
-
-            _mesa_set_fetch_functions(texImage, 3);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            update_fbo_texture(ctx, texObj, face, level);
-
-            /* state update */
-            texObj->_Complete = GL_FALSE;
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-   else if (target == GL_PROXY_TEXTURE_3D ||
-       (ctx->Extensions.MESA_texture_array &&
-        target == GL_PROXY_TEXTURE_2D_ARRAY_EXT)) {
-      /* Proxy texture: check for errors and update proxy state */
-      struct gl_texture_image *texImage;
-      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-      if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 3, width, height, depth, border)) {
-         /* when error, clear all proxy texture image parameters */
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* no error, set the tex image parameters */
-         struct gl_texture_object *texObj =
-            _mesa_get_current_tex_object(ctx, target);
-         _mesa_init_teximage_fields(ctx, target, texImage, width, height,
-                                    depth, border, internalFormat);
-         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                     internalFormat, format, type);
-      }
-   }
-   else {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glTexImage3D(target)" );
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLint border, GLenum format, GLenum type,
-                     const GLvoid *pixels )
-{
-   _mesa_TexImage3D(target, level, (GLint) internalFormat, width, height,
-                    depth, border, format, type, pixels);
-}
-
-
-#if FEATURE_OES_EGL_image
-void GLAPIENTRY
-_mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.OES_EGL_image) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glEGLImageTargetTexture2DOES(unsupported)");
-      return;
-   }
-
-   if (target != GL_TEXTURE_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-		  "glEGLImageTargetTexture2D(target=%d)", target);
-      return;
-   }
-
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-      _mesa_update_state(ctx);
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   _mesa_lock_texture(ctx, texObj);
-
-   texImage = _mesa_get_tex_image(ctx, texObj, target, 0);
-   if (!texImage) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glEGLImageTargetTexture2D");
-   } else {
-      if (texImage->Data)
-	 ctx->Driver.FreeTexImageData( ctx, texImage );
-
-      ASSERT(texImage->Data == NULL);
-      ctx->Driver.EGLImageTargetTexture2D(ctx, target,
-					  texObj, texImage, image);
-
-      /* state update */
-      texObj->_Complete = GL_FALSE;
-      ctx->NewState |= _NEW_TEXTURE;
-   }
-   _mesa_unlock_texture(ctx, texObj);
-
-}
-#endif
-
-
-void GLAPIENTRY
-_mesa_TexSubImage1D( GLenum target, GLint level,
-                     GLint xoffset, GLsizei width,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels )
-{
-   GLsizei postConvWidth = width;
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexSubImage1D %s %d %d %d %s %s %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  xoffset, width, _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
-
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-      _mesa_update_state(ctx);
-
-#if FEATURE_convolve
-   /* XXX should test internal format */
-   if (_mesa_is_color_format(format)) {
-      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-   }
-#endif
-
-   if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
-			       postConvWidth, 1, 1, format, type)) {
-      return;   /* error was detected */
-   }
-
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-   assert(texObj);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-      if (subtexture_error_check2(ctx, 1, target, level, xoffset, 0, 0,
-				  postConvWidth, 1, 1,
-                                  format, type, texImage)) {
-         /* error was recorded */
-      }
-      else if (width > 0) {
-         /* If we have a border, xoffset=-1 is legal.  Bias by border width */
-         xoffset += texImage->Border;
-
-         ASSERT(ctx->Driver.TexSubImage1D);
-         ctx->Driver.TexSubImage1D(ctx, target, level, xoffset, width,
-                                   format, type, pixels, &ctx->Unpack,
-                                   texObj, texImage);
-
-         check_gen_mipmap(ctx, target, texObj, level);
-
-         ctx->NewState |= _NEW_TEXTURE;
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-void GLAPIENTRY
-_mesa_TexSubImage2D( GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset,
-                     GLsizei width, GLsizei height,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels )
-{
-   GLsizei postConvWidth = width, postConvHeight = height;
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexSubImage2D %s %d %d %d %d %d %s %s %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  xoffset, yoffset, width, height,
-                  _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
-
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-      _mesa_update_state(ctx);
-
-#if FEATURE_convolve
-   /* XXX should test internal format */
-   if (_mesa_is_color_format(format)) {
-      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
-                                         &postConvHeight);
-   }
-#endif
-
-   if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
-			      postConvWidth, postConvHeight, 1, format, type)) {
-      return;   /* error was detected */
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-      if (subtexture_error_check2(ctx, 2, target, level, xoffset, yoffset, 0,
-				  postConvWidth, postConvHeight, 1,
-                                  format, type, texImage)) {
-	 /* error was recorded */
-      }
-      else if (width > 0 && height >= 0) {
-         /* If we have a border, xoffset=-1 is legal.  Bias by border width */
-         xoffset += texImage->Border;
-         yoffset += texImage->Border;
-
-         ASSERT(ctx->Driver.TexSubImage2D);
-         ctx->Driver.TexSubImage2D(ctx, target, level, xoffset, yoffset,
-                                   width, height, format, type, pixels,
-                                   &ctx->Unpack, texObj, texImage);
-
-         check_gen_mipmap(ctx, target, texObj, level);
-
-         ctx->NewState |= _NEW_TEXTURE;
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-void GLAPIENTRY
-_mesa_TexSubImage3D( GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset, GLint zoffset,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels )
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexSubImage3D %s %d %d %d %d %d %d %d %s %s %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  xoffset, yoffset, zoffset, width, height, depth,
-                  _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
-
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
-      _mesa_update_state(ctx);
-
-   if (subtexture_error_check(ctx, 3, target, level, xoffset, yoffset, zoffset,
-                              width, height, depth, format, type)) {
-      return;   /* error was detected */
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-      if (subtexture_error_check2(ctx, 3, target, level,
-                                  xoffset, yoffset, zoffset,
-				  width, height, depth,
-                                  format, type, texImage)) {
-         /* error was recorded */
-      }
-      else if (width > 0 && height > 0 && height > 0) {
-         /* If we have a border, xoffset=-1 is legal.  Bias by border width */
-         xoffset += texImage->Border;
-         yoffset += texImage->Border;
-         zoffset += texImage->Border;
-
-         ASSERT(ctx->Driver.TexSubImage3D);
-         ctx->Driver.TexSubImage3D(ctx, target, level,
-                                   xoffset, yoffset, zoffset,
-                                   width, height, depth,
-                                   format, type, pixels,
-                                   &ctx->Unpack, texObj, texImage );
-
-         check_gen_mipmap(ctx, target, texObj, level);
-
-         ctx->NewState |= _NEW_TEXTURE;
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-void GLAPIENTRY
-_mesa_CopyTexImage1D( GLenum target, GLint level,
-                      GLenum internalFormat,
-                      GLint x, GLint y,
-                      GLsizei width, GLint border )
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width;
-   const GLuint face = _mesa_tex_target_to_face(target);
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCopyTexImage1D %s %d %s %d %d %d %d\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  x, y, width, border);
-
-   if (ctx->NewState & NEW_COPY_TEX_STATE)
-      _mesa_update_state(ctx);
-
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-   }
-#endif
-
-   if (copytexture_error_check(ctx, 1, target, level, internalFormat,
-                               postConvWidth, 1, border))
-      return;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-      if (!texImage) {
-	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage1D");
-      }
-      else {
-         if (texImage->Data) {
-            ctx->Driver.FreeTexImageData( ctx, texImage );
-         }
-
-         ASSERT(texImage->Data == NULL);
-
-         clear_teximage_fields(texImage); /* not really needed, but helpful */
-         _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1,
-                                    border, internalFormat);
-
-         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                     internalFormat, GL_NONE, GL_NONE);
-
-         ASSERT(ctx->Driver.CopyTexImage1D);
-         ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,
-                                    x, y, width, border);
-
-         ASSERT(texImage->TexFormat);
-
-         _mesa_set_fetch_functions(texImage, 1);
-
-         check_gen_mipmap(ctx, target, texObj, level);
-
-         update_fbo_texture(ctx, texObj, face, level);
-
-         /* state update */
-         texObj->_Complete = GL_FALSE;
-         ctx->NewState |= _NEW_TEXTURE;
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-void GLAPIENTRY
-_mesa_CopyTexImage2D( 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;
-   GLsizei postConvWidth = width, postConvHeight = height;
-   const GLuint face = _mesa_tex_target_to_face(target);
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCopyTexImage2D %s %d %s %d %d %d %d %d\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  x, y, width, height, border);
-
-   if (ctx->NewState & NEW_COPY_TEX_STATE)
-      _mesa_update_state(ctx);
-
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
-                                         &postConvHeight);
-   }
-#endif
-
-   if (copytexture_error_check(ctx, 2, target, level, internalFormat,
-                               postConvWidth, postConvHeight, border))
-      return;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-
-      if (!texImage) {
-	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage2D");
-      }
-      else {
-         if (texImage->Data) {
-            ctx->Driver.FreeTexImageData( ctx, texImage );
-         }
-
-         ASSERT(texImage->Data == NULL);
-
-         clear_teximage_fields(texImage); /* not really needed, but helpful */
-         _mesa_init_teximage_fields(ctx, target, texImage,
-                                    postConvWidth, postConvHeight, 1,
-                                    border, internalFormat);
-
-         _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                     internalFormat, GL_NONE, GL_NONE);
-
-         ASSERT(ctx->Driver.CopyTexImage2D);
-         ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,
-                                    x, y, width, height, border);
-
-         ASSERT(texImage->TexFormat);
-
-         _mesa_set_fetch_functions(texImage, 2);
-
-         check_gen_mipmap(ctx, target, texObj, level);
-
-         update_fbo_texture(ctx, texObj, face, level);
-
-         /* state update */
-         texObj->_Complete = GL_FALSE;
-         ctx->NewState |= _NEW_TEXTURE;
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-void GLAPIENTRY
-_mesa_CopyTexSubImage1D( GLenum target, GLint level,
-                         GLint xoffset, GLint x, GLint y, GLsizei width )
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width;
-   GLint yoffset = 0;
-   GLsizei height = 1;
-
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCopyTexSubImage1D %s %d %d %d %d %d\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  level, xoffset, x, y, width);
-
-   if (ctx->NewState & NEW_COPY_TEX_STATE)
-      _mesa_update_state(ctx);
-
-   if (copytexsubimage_error_check1(ctx, 1, target, level))
-      return;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-#if FEATURE_convolve
-      if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
-         _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-      }
-#endif
-
-      if (copytexsubimage_error_check2(ctx, 1, target, level,
-				       xoffset, 0, 0, postConvWidth, 1,
-				       texImage)) {
-         /* error was recorded */
-      }
-      else {
-         /* If we have a border, xoffset=-1 is legal.  Bias by border width */
-         xoffset += texImage->Border;
-
-         if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
-                                        &width, &height)) {
-            ASSERT(ctx->Driver.CopyTexSubImage1D);
-            ctx->Driver.CopyTexSubImage1D(ctx, target, level,
-                                          xoffset, x, y, width);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-void GLAPIENTRY
-_mesa_CopyTexSubImage2D( GLenum target, GLint level,
-                         GLint xoffset, GLint yoffset,
-                         GLint x, GLint y, GLsizei width, GLsizei height )
-{
-   struct gl_texture_object *texObj;
-   struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width, postConvHeight = height;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCopyTexSubImage2D %s %d %d %d %d %d %d %d\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  level, xoffset, yoffset, x, y, width, height);
-
-   if (ctx->NewState & NEW_COPY_TEX_STATE)
-      _mesa_update_state(ctx);
-
-   if (copytexsubimage_error_check1(ctx, 2, target, level))
-      return;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-#if FEATURE_convolve
-      if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
-         _mesa_adjust_image_for_convolution(ctx, 2,
-                                            &postConvWidth, &postConvHeight);
-      }
-#endif
-
-      if (copytexsubimage_error_check2(ctx, 2, target, level,
-                                       xoffset, yoffset, 0,
-				       postConvWidth, postConvHeight,
-                                       texImage)) {
-         /* error was recorded */
-      }
-      else {
-         /* If we have a border, xoffset=-1 is legal.  Bias by border width */
-         xoffset += texImage->Border;
-         yoffset += texImage->Border;
-
-         if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
-                                        &width, &height)) {
-            ASSERT(ctx->Driver.CopyTexSubImage2D);
-            ctx->Driver.CopyTexSubImage2D(ctx, target, level, xoffset, yoffset,
-                                          x, y, width, height);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-void GLAPIENTRY
-_mesa_CopyTexSubImage3D( 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;
-   GLsizei postConvWidth = width, postConvHeight = height;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCopyTexSubImage3D %s %d %d %d %d %d %d %d %d\n",
-                  _mesa_lookup_enum_by_nr(target),
-                  level, xoffset, yoffset, zoffset, x, y, width, height);
-
-   if (ctx->NewState & NEW_COPY_TEX_STATE)
-      _mesa_update_state(ctx);
-
-   if (copytexsubimage_error_check1(ctx, 3, target, level))
-      return;
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-
-#if FEATURE_convolve
-      if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
-         _mesa_adjust_image_for_convolution(ctx, 2,
-                                            &postConvWidth, &postConvHeight);
-      }
-#endif
-
-      if (copytexsubimage_error_check2(ctx, 3, target, level, xoffset, yoffset,
-				       zoffset, postConvWidth, postConvHeight,
-				       texImage)) {
-         /* error was recored */
-      }
-      else {
-         /* If we have a border, xoffset=-1 is legal.  Bias by border width */
-         xoffset += texImage->Border;
-         yoffset += texImage->Border;
-         zoffset += texImage->Border;
-
-         if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,
-                                        &width, &height)) {
-            ASSERT(ctx->Driver.CopyTexSubImage3D);
-            ctx->Driver.CopyTexSubImage3D(ctx, target, level,
-                                          xoffset, yoffset, zoffset,
-                                          x, y, width, height);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-
-/**********************************************************************/
-/******                   Compressed Textures                    ******/
-/**********************************************************************/
-
-
-/**
- * Return expected size of a compressed texture.
- */
-static GLuint
-compressed_tex_size(GLsizei width, GLsizei height, GLsizei depth,
-                    GLenum glformat)
-{
-   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);
-   return _mesa_format_image_size(mesaFormat, width, height, depth);
-}
-
-
-/*
- * Return compressed texture block size, in pixels.
- */
-static void
-get_compressed_block_size(GLenum glformat, GLuint *bw, GLuint *bh)
-{
-   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);
-   _mesa_get_format_block_size(mesaFormat, bw, bh);
-}
-
-
-/**
- * Error checking for glCompressedTexImage[123]D().
- * \return error code or GL_NO_ERROR.
- */
-static GLenum
-compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
-                               GLenum target, GLint level,
-                               GLenum internalFormat, GLsizei width,
-                               GLsizei height, GLsizei depth, GLint border,
-                               GLsizei imageSize)
-{
-   GLint expectedSize, maxLevels = 0, maxTextureSize;
-
-   if (dimensions == 1) {
-      /* 1D compressed textures not allowed */
-      return GL_INVALID_ENUM;
-   }
-   else if (dimensions == 2) {
-      if (target == GL_PROXY_TEXTURE_2D) {
-         maxLevels = ctx->Const.MaxTextureLevels;
-      }
-      else if (target == GL_TEXTURE_2D) {
-         maxLevels = ctx->Const.MaxTextureLevels;
-      }
-      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map)
-            return GL_INVALID_ENUM; /*target*/
-         maxLevels = ctx->Const.MaxCubeTextureLevels;
-      }
-      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map)
-            return GL_INVALID_ENUM; /*target*/
-         maxLevels = ctx->Const.MaxCubeTextureLevels;
-      }
-      else {
-         return GL_INVALID_ENUM; /*target*/
-      }
-   }
-   else if (dimensions == 3) {
-      /* 3D compressed textures not allowed */
-      return GL_INVALID_ENUM;
-   }
-   else {
-      assert(0);
-      return GL_INVALID_ENUM;
-   }
-
-   maxTextureSize = 1 << (maxLevels - 1);
-
-   /* This will detect any invalid internalFormat value */
-   if (!_mesa_is_compressed_format(ctx, internalFormat))
-      return GL_INVALID_ENUM;
-
-   /* This should really never fail */
-   if (_mesa_base_tex_format(ctx, internalFormat) < 0)
-      return GL_INVALID_ENUM;
-
-   if (border != 0)
-      return GL_INVALID_VALUE;
-
-   /*
-    * XXX We should probably use the proxy texture error check function here.
-    */
-   if (width < 1 || width > maxTextureSize ||
-       (!ctx->Extensions.ARB_texture_non_power_of_two && !_mesa_is_pow_two(width)))
-      return GL_INVALID_VALUE;
-
-   if ((height < 1 || height > maxTextureSize ||
-       (!ctx->Extensions.ARB_texture_non_power_of_two && !_mesa_is_pow_two(height)))
-       && dimensions > 1)
-      return GL_INVALID_VALUE;
-
-   if ((depth < 1 || depth > maxTextureSize ||
-       (!ctx->Extensions.ARB_texture_non_power_of_two && !_mesa_is_pow_two(depth)))
-       && dimensions > 2)
-      return GL_INVALID_VALUE;
-
-   /* For cube map, width must equal height */
-   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB && width != height)
-      return GL_INVALID_VALUE;
-
-   if (level < 0 || level >= maxLevels)
-      return GL_INVALID_VALUE;
-
-   expectedSize = compressed_tex_size(width, height, depth, internalFormat);
-   if (expectedSize != imageSize)
-      return GL_INVALID_VALUE;
-
-#if FEATURE_EXT_texture_sRGB
-   if ((internalFormat == GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ||
-        internalFormat == GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ||
-        internalFormat == GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ||
-        internalFormat == GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT)
-       && border != 0) {
-      return GL_INVALID_OPERATION;
-   }
-#endif
-
-   return GL_NO_ERROR;
-}
-
-
-/**
- * Error checking for glCompressedTexSubImage[123]D().
- * \warning  There are some bad assumptions here about the size of compressed
- *           texture tiles (multiple of 4) used to test the validity of the
- *           offset and size parameters.
- * \return error code or GL_NO_ERROR.
- */
-static GLenum
-compressed_subtexture_error_check(GLcontext *ctx, GLint dimensions,
-                                  GLenum target, GLint level,
-                                  GLint xoffset, GLint yoffset, GLint zoffset,
-                                  GLsizei width, GLsizei height, GLsizei depth,
-                                  GLenum format, GLsizei imageSize)
-{
-   GLint expectedSize, maxLevels = 0, maxTextureSize;
-   GLuint bw, bh;
-   (void) zoffset;
-
-   if (dimensions == 1) {
-      /* 1D compressed textures not allowed */
-      return GL_INVALID_ENUM;
-   }
-   else if (dimensions == 2) {
-      if (target == GL_PROXY_TEXTURE_2D) {
-         maxLevels = ctx->Const.MaxTextureLevels;
-      }
-      else if (target == GL_TEXTURE_2D) {
-         maxLevels = ctx->Const.MaxTextureLevels;
-      }
-      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map)
-            return GL_INVALID_ENUM; /*target*/
-         maxLevels = ctx->Const.MaxCubeTextureLevels;
-      }
-      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {
-         if (!ctx->Extensions.ARB_texture_cube_map)
-            return GL_INVALID_ENUM; /*target*/
-         maxLevels = ctx->Const.MaxCubeTextureLevels;
-      }
-      else {
-         return GL_INVALID_ENUM; /*target*/
-      }
-   }
-   else if (dimensions == 3) {
-      /* 3D compressed textures not allowed */
-      return GL_INVALID_ENUM;
-   }
-
-   maxTextureSize = 1 << (maxLevels - 1);
-
-   /* this will catch any invalid compressed format token */
-   if (!_mesa_is_compressed_format(ctx, format))
-      return GL_INVALID_ENUM;
-
-   if (width < 1 || width > maxTextureSize)
-      return GL_INVALID_VALUE;
-
-   if ((height < 1 || height > maxTextureSize)
-       && dimensions > 1)
-      return GL_INVALID_VALUE;
-
-   if (level < 0 || level >= maxLevels)
-      return GL_INVALID_VALUE;
-
-   /*
-    * do checks which depend on compression block size
-    */
-   get_compressed_block_size(format, &bw, &bh);
-
-   if ((xoffset % bw != 0) || (yoffset % bh != 0))
-      return GL_INVALID_VALUE;
-
-   if ((width % bw != 0) && width != 2 && width != 1)
-      return GL_INVALID_VALUE;
-
-   if ((height % bh != 0) && height != 2 && height != 1)
-      return GL_INVALID_VALUE;
-
-   expectedSize = compressed_tex_size(width, height, depth, format);
-   if (expectedSize != imageSize)
-      return GL_INVALID_VALUE;
-
-   return GL_NO_ERROR;
-}
-
-
-/**
- * Do second part of glCompressedTexSubImage error checking.
- * \return GL_TRUE if error found, GL_FALSE otherwise.
- */
-static GLboolean
-compressed_subtexture_error_check2(GLcontext *ctx, GLuint dims,
-                                   GLsizei width, GLsizei height,
-                                   GLsizei depth, GLenum format,
-                                   struct gl_texture_image *texImage)
-{
-
-   if ((GLint) format != texImage->InternalFormat) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCompressedTexSubImage%uD(format=0x%x)", dims, format);
-      return GL_TRUE;
-   }
-
-   if (((width == 1 || width == 2) &&
-        width != (GLsizei) texImage->Width) ||
-       (width > (GLsizei) texImage->Width)) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glCompressedTexSubImage%uD(width=%d)", dims, width);
-      return GL_TRUE;
-   }
-
-   if (dims >= 2) {
-      if (((height == 1 || height == 2) &&
-           height != (GLsizei) texImage->Height) ||
-          (height > (GLsizei) texImage->Height)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCompressedTexSubImage%uD(height=%d)", dims, height);
-         return GL_TRUE;
-      }
-   }
-
-   if (dims >= 3) {
-      if (((depth == 1 || depth == 2) &&
-           depth != (GLsizei) texImage->Depth) ||
-          (depth > (GLsizei) texImage->Depth)) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glCompressedTexSubImage%uD(depth=%d)", dims, depth);
-         return GL_TRUE;
-      }
-   }
-
-   return GL_FALSE;
-}
-
-
-
-void GLAPIENTRY
-_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
-                              GLenum internalFormat, GLsizei width,
-                              GLint border, GLsizei imageSize,
-                              const GLvoid *data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCompressedTexImage1DARB %s %d %s %d %d %d %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  width, border, imageSize, data);
-
-   if (target == GL_TEXTURE_1D) {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-      GLenum error = compressed_texture_error_check(ctx, 1, target, level,
-                               internalFormat, width, 1, 1, border, imageSize);
-      if (error) {
-         _mesa_error(ctx, error, "glCompressedTexImage1D");
-         return;
-      }
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1D");
-	 }
-         else {
-            if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
-            }
-            ASSERT(texImage->Data == NULL);
-
-            _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
-                                       border, internalFormat);
-
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-
-            ASSERT(ctx->Driver.CompressedTexImage1D);
-            ctx->Driver.CompressedTexImage1D(ctx, target, level,
-                                             internalFormat, width, border,
-                                             imageSize, data,
-                                             texObj, texImage);
-
-            _mesa_set_fetch_functions(texImage, 1);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            /* state update */
-            texObj->_Complete = GL_FALSE;
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-   else if (target == GL_PROXY_TEXTURE_1D) {
-      /* Proxy texture: check for errors and update proxy state */
-      GLenum error = compressed_texture_error_check(ctx, 1, target, level,
-                               internalFormat, width, 1, 1, border, imageSize);
-      if (!error) {
-         ASSERT(ctx->Driver.TestProxyTexImage);
-         error = !(*ctx->Driver.TestProxyTexImage)(ctx, target, level,
-                                             internalFormat, GL_NONE, GL_NONE,
-                                             width, 1, 1, border);
-      }
-      if (error) {
-         /* if error, clear all proxy texture image parameters */
-         struct gl_texture_image *texImage;
-         texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* store the teximage parameters */
-         struct gl_texture_object *texObj;
-         struct gl_texture_image *texImage;
-
-         texObj = _mesa_get_current_tex_object(ctx, target);
-
-	 _mesa_lock_texture(ctx, texObj);
-	 {
-	    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-	    _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
-				       border, internalFormat);
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-	 }
-	 _mesa_unlock_texture(ctx, texObj);
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage1D(target)");
-      return;
-   }
-}
-
-void GLAPIENTRY
-_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
-                              GLenum internalFormat, GLsizei width,
-                              GLsizei height, GLint border, GLsizei imageSize,
-                              const GLvoid *data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCompressedTexImage2DARB %s %d %s %d %d %d %d %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  width, height, border, imageSize, data);
-
-#if FEATURE_ES
-   switch (internalFormat) {
-   case GL_PALETTE4_RGB8_OES:
-   case GL_PALETTE4_RGBA8_OES:
-   case GL_PALETTE4_R5_G6_B5_OES:
-   case GL_PALETTE4_RGBA4_OES:
-   case GL_PALETTE4_RGB5_A1_OES:
-   case GL_PALETTE8_RGB8_OES:
-   case GL_PALETTE8_RGBA8_OES:
-   case GL_PALETTE8_R5_G6_B5_OES:
-   case GL_PALETTE8_RGBA4_OES:
-   case GL_PALETTE8_RGB5_A1_OES:
-      _mesa_cpal_compressed_teximage2d(target, level, internalFormat,
-				       width, height, imageSize, data);
-      return;
-   }
-#endif
-
-   if (target == GL_TEXTURE_2D ||
-       (ctx->Extensions.ARB_texture_cube_map &&
-        target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
-        target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)) {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-
-      GLenum error = compressed_texture_error_check(ctx, 2, target, level,
-                          internalFormat, width, height, 1, border, imageSize);
-      if (error) {
-         _mesa_error(ctx, error, "glCompressedTexImage2D");
-         return;
-      }
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");
-	 }
-         else {
-            if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
-            }
-            ASSERT(texImage->Data == NULL);
-
-            _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
-                                       border, internalFormat);
-
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-
-            ASSERT(ctx->Driver.CompressedTexImage2D);
-            ctx->Driver.CompressedTexImage2D(ctx, target, level,
-                                             internalFormat, width, height,
-                                             border, imageSize, data,
-                                             texObj, texImage);
-
-            _mesa_set_fetch_functions(texImage, 2);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            /* state update */
-            texObj->_Complete = GL_FALSE;
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-   else if (target == GL_PROXY_TEXTURE_2D ||
-            (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB &&
-             ctx->Extensions.ARB_texture_cube_map)) {
-      /* Proxy texture: check for errors and update proxy state */
-      GLenum error = compressed_texture_error_check(ctx, 2, target, level,
-                          internalFormat, width, height, 1, border, imageSize);
-      if (!error) {
-         ASSERT(ctx->Driver.TestProxyTexImage);
-         error = !(*ctx->Driver.TestProxyTexImage)(ctx, target, level,
-                                              internalFormat, GL_NONE, GL_NONE,
-                                              width, height, 1, border);
-      }
-      if (error) {
-         /* if error, clear all proxy texture image parameters */
-         struct gl_texture_image *texImage;
-         texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* store the teximage parameters */
-         struct gl_texture_object *texObj;
-         struct gl_texture_image *texImage;
-
-         texObj = _mesa_get_current_tex_object(ctx, target);
-
-	 _mesa_lock_texture(ctx, texObj);
-	 {
-	    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-	    _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,
-				       border, internalFormat);
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-	 }
-	 _mesa_unlock_texture(ctx, texObj);
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage2D(target)");
-      return;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
-                              GLenum internalFormat, GLsizei width,
-                              GLsizei height, GLsizei depth, GLint border,
-                              GLsizei imageSize, const GLvoid *data)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glCompressedTexImage3DARB %s %d %s %d %d %d %d %d %p\n",
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  width, height, depth, border, imageSize, data);
-
-   if (target == GL_TEXTURE_3D) {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-      GLenum error = compressed_texture_error_check(ctx, 3, target, level,
-                      internalFormat, width, height, depth, border, imageSize);
-      if (error) {
-         _mesa_error(ctx, error, "glCompressedTexImage3D");
-         return;
-      }
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3D");
-	 }
-         else {
-            if (texImage->Data) {
-               ctx->Driver.FreeTexImageData( ctx, texImage );
-            }
-            ASSERT(texImage->Data == NULL);
-
-            _mesa_init_teximage_fields(ctx, target, texImage,
-                                       width, height, depth,
-                                       border, internalFormat);
-
-            /* Choose actual texture format */
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-
-            ASSERT(ctx->Driver.CompressedTexImage3D);
-            ctx->Driver.CompressedTexImage3D(ctx, target, level,
-                                             internalFormat,
-                                             width, height, depth,
-                                             border, imageSize, data,
-                                             texObj, texImage);
-
-            _mesa_set_fetch_functions(texImage, 3);
-
-            check_gen_mipmap(ctx, target, texObj, level);
-
-            /* state update */
-            texObj->_Complete = GL_FALSE;
-            ctx->NewState |= _NEW_TEXTURE;
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-   else if (target == GL_PROXY_TEXTURE_3D) {
-      /* Proxy texture: check for errors and update proxy state */
-      GLenum error = compressed_texture_error_check(ctx, 3, target, level,
-                      internalFormat, width, height, depth, border, imageSize);
-      if (!error) {
-         ASSERT(ctx->Driver.TestProxyTexImage);
-         error = !(*ctx->Driver.TestProxyTexImage)(ctx, target, level,
-                                             internalFormat, GL_NONE, GL_NONE,
-                                             width, height, depth, border);
-      }
-      if (error) {
-         /* if error, clear all proxy texture image parameters */
-         struct gl_texture_image *texImage;
-         texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* store the teximage parameters */
-         struct gl_texture_object *texObj;
-         struct gl_texture_image *texImage;
-
-         texObj = _mesa_get_current_tex_object(ctx, target);
-
-	 _mesa_lock_texture(ctx, texObj);
-	 {
-	    texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-	    _mesa_init_teximage_fields(ctx, target, texImage, width, height,
-				       depth, border, internalFormat);
-            _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-	 }
-	 _mesa_unlock_texture(ctx, texObj);
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage3D(target)");
-      return;
-   }
-}
-
-
-/**
- * Common helper for glCompressedTexSubImage1/2/3D().
- */
-static void
-compressed_tex_sub_image(GLuint dims, 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;
-   GLenum error;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   error = compressed_subtexture_error_check(ctx, dims, target, level,
-                                             xoffset, 0, 0, /* pos */
-                                             width, height, depth,   /* size */
-                                             format, imageSize);
-   if (error) {
-      _mesa_error(ctx, error, "glCompressedTexSubImage%uD", dims);
-      return;
-   }
-
-   texObj = _mesa_get_current_tex_object(ctx, target);
-
-   _mesa_lock_texture(ctx, texObj);
-   {
-      texImage = _mesa_select_tex_image(ctx, texObj, target, level);
-      assert(texImage);
-
-      if (compressed_subtexture_error_check2(ctx, dims, width, height, depth,
-                                             format, texImage)) {
-         /* error was recorded */
-      }
-      else if (width > 0 && height > 0 && depth > 0) {
-         switch (dims) {
-         case 1:
-            if (ctx->Driver.CompressedTexSubImage1D) {
-               ctx->Driver.CompressedTexSubImage1D(ctx, target, level,
-                                                   xoffset, width,
-                                                   format, imageSize, data,
-                                                   texObj, texImage);
-            }
-            break;
-         case 2:
-            if (ctx->Driver.CompressedTexSubImage2D) {
-               ctx->Driver.CompressedTexSubImage2D(ctx, target, level,
-                                                   xoffset, yoffset,
-                                                   width, height,
-                                                   format, imageSize, data,
-                                                   texObj, texImage);
-            }
-            break;
-         case 3:
-            if (ctx->Driver.CompressedTexSubImage3D) {
-               ctx->Driver.CompressedTexSubImage3D(ctx, target, level,
-                                                   xoffset, yoffset, zoffset,
-                                                   width, height, depth,
-                                                   format, imageSize, data,
-                                                   texObj, texImage);
-            }
-            break;
-         default:
-            ;
-         }
-
-         check_gen_mipmap(ctx, target, texObj, level);
-
-         ctx->NewState |= _NEW_TEXTURE;
-      }
-   }
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-void GLAPIENTRY
-_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
-                                 GLsizei width, GLenum format,
-                                 GLsizei imageSize, const GLvoid *data)
-{
-   compressed_tex_sub_image(1, target, level, xoffset, 0, 0, width, 1, 1,
-                            format, imageSize, data);
-}
-
-
-void GLAPIENTRY
-_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLsizei width, GLsizei height,
-                                 GLenum format, GLsizei imageSize,
-                                 const GLvoid *data)
-{
-   compressed_tex_sub_image(2, target, level, xoffset, yoffset, 0,
-                            width, height, 1, format, imageSize, data);
-}
-
-
-void GLAPIENTRY
-_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLint zoffset, GLsizei width,
-                                 GLsizei height, GLsizei depth, GLenum format,
-                                 GLsizei imageSize, const GLvoid *data)
-{
-   compressed_tex_sub_image(3, target, level, xoffset, yoffset, zoffset,
-                            width, height, depth, format, imageSize, data);
-}
-
-
+/*

+ * 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 teximage.c

+ * Texture image-related functions.

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "enums.h"

+#include "fbobject.h"

+#include "framebuffer.h"

+#include "hash.h"

+#include "image.h"

+#include "imports.h"

+#include "macros.h"

+#include "state.h"

+#include "texcompress.h"

+#include "texfetch.h"

+#include "teximage.h"

+#include "texstate.h"

+#include "texpal.h"

+#include "mtypes.h"

+

+

+/**

+ * State changes which we care about for glCopyTex[Sub]Image() calls.

+ * In particular, we care about pixel transfer state and buffer state

+ * (such as glReadBuffer to make sure we read from the right renderbuffer).

+ */

+#define NEW_COPY_TEX_STATE (_MESA_NEW_TRANSFER_STATE | \

+                            _NEW_BUFFERS | \

+                            _NEW_PIXEL)

+

+

+

+/**

+ * We allocate texture memory on 512-byte boundaries so we can use MMX/SSE

+ * elsewhere.

+ */

+void *

+_mesa_alloc_texmemory(GLsizei bytes)

+{

+   return _mesa_align_malloc(bytes, 512);

+}

+

+

+/**

+ * Free texture memory allocated with _mesa_alloc_texmemory()

+ */

+void

+_mesa_free_texmemory(void *m)

+{

+   _mesa_align_free(m);

+}

+

+

+/*

+ * Compute floor(log_base_2(n)).

+ * If n < 0 return -1.

+ */

+static int

+logbase2( int n )

+{

+   GLint i = 1;

+   GLint log2 = 0;

+

+   if (n < 0)

+      return -1;

+

+   if (n == 0)

+      return 0;

+

+   while ( n > i ) {

+      i *= 2;

+      log2++;

+   }

+   if (i != n) {

+      return log2 - 1;

+   }

+   else {

+      return log2;

+   }

+}

+

+

+

+/**

+ * Return the simple base format for a given internal texture format.

+ * For example, given GL_LUMINANCE12_ALPHA4, return GL_LUMINANCE_ALPHA.

+ *

+ * \param ctx GL context.

+ * \param internalFormat the internal texture format token or 1, 2, 3, or 4.

+ *

+ * \return the corresponding \u base internal format (GL_ALPHA, GL_LUMINANCE,

+ * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA), or -1 if invalid enum.

+ *

+ * This is the format which is used during texture application (i.e. the

+ * texture format and env mode determine the arithmetic used.

+ *

+ * XXX this could be static

+ */

+GLint

+_mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )

+{

+   switch (internalFormat) {

+      case GL_ALPHA:

+      case GL_ALPHA4:

+      case GL_ALPHA8:

+      case GL_ALPHA12:

+      case GL_ALPHA16:

+         return GL_ALPHA;

+      case 1:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE4:

+      case GL_LUMINANCE8:

+      case GL_LUMINANCE12:

+      case GL_LUMINANCE16:

+         return GL_LUMINANCE;

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

+         return GL_LUMINANCE_ALPHA;

+      case GL_INTENSITY:

+      case GL_INTENSITY4:

+      case GL_INTENSITY8:

+      case GL_INTENSITY12:

+      case GL_INTENSITY16:

+         return GL_INTENSITY;

+      case 3:

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

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

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.EXT_paletted_texture) {

+      switch (internalFormat) {

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

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ARB_depth_texture) {

+      switch (internalFormat) {

+         case GL_DEPTH_COMPONENT:

+         case GL_DEPTH_COMPONENT16:

+         case GL_DEPTH_COMPONENT24:

+         case GL_DEPTH_COMPONENT32:

+            return GL_DEPTH_COMPONENT;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   switch (internalFormat) {

+   case GL_COMPRESSED_ALPHA:

+      return GL_ALPHA;

+   case GL_COMPRESSED_LUMINANCE:

+      return GL_LUMINANCE;

+   case GL_COMPRESSED_LUMINANCE_ALPHA:

+      return GL_LUMINANCE_ALPHA;

+   case GL_COMPRESSED_INTENSITY:

+      return GL_INTENSITY;

+   case GL_COMPRESSED_RGB:

+      return GL_RGB;

+   case GL_COMPRESSED_RGBA:

+      return GL_RGBA;

+   default:

+      ; /* fallthrough */

+   }

+         

+   if (ctx->Extensions.TDFX_texture_compression_FXT1) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_FXT1_3DFX:

+            return GL_RGB;

+         case GL_COMPRESSED_RGBA_FXT1_3DFX:

+            return GL_RGBA;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_texture_compression_s3tc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+            return GL_RGB;

+         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+            return GL_RGBA;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.S3_s3tc) {

+      switch (internalFormat) {

+         case GL_RGB_S3TC:

+         case GL_RGB4_S3TC:

+            return GL_RGB;

+         case GL_RGBA_S3TC:

+         case GL_RGBA4_S3TC:

+            return GL_RGBA;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.MESA_ycbcr_texture) {

+      if (internalFormat == GL_YCBCR_MESA)

+         return GL_YCBCR_MESA;

+   }

+

+   if (ctx->Extensions.ARB_texture_float) {

+      switch (internalFormat) {

+         case GL_ALPHA16F_ARB:

+         case GL_ALPHA32F_ARB:

+            return GL_ALPHA;

+         case GL_RGBA16F_ARB:

+         case GL_RGBA32F_ARB:

+            return GL_RGBA;

+         case GL_RGB16F_ARB:

+         case GL_RGB32F_ARB:

+            return GL_RGB;

+         case GL_INTENSITY16F_ARB:

+         case GL_INTENSITY32F_ARB:

+            return GL_INTENSITY;

+         case GL_LUMINANCE16F_ARB:

+         case GL_LUMINANCE32F_ARB:

+            return GL_LUMINANCE;

+         case GL_LUMINANCE_ALPHA16F_ARB:

+         case GL_LUMINANCE_ALPHA32F_ARB:

+            return GL_LUMINANCE_ALPHA;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_envmap_bumpmap) {

+      switch (internalFormat) {

+         case GL_DUDV_ATI:

+         case GL_DU8DV8_ATI:

+            return GL_DUDV_ATI;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.MESA_texture_signed_rgba) {

+      switch (internalFormat) {

+         case GL_RGBA_SNORM:

+         case GL_RGBA8_SNORM:

+            return GL_RGBA;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_packed_depth_stencil) {

+      switch (internalFormat) {

+         case GL_DEPTH_STENCIL_EXT:

+         case GL_DEPTH24_STENCIL8_EXT:

+            return GL_DEPTH_STENCIL_EXT;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+#if FEATURE_EXT_texture_sRGB

+   if (ctx->Extensions.EXT_texture_sRGB) {

+      switch (internalFormat) {

+      case GL_SRGB_EXT:

+      case GL_SRGB8_EXT:

+      case GL_COMPRESSED_SRGB_EXT:

+      case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+         return GL_RGB;

+      case GL_SRGB_ALPHA_EXT:

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

+         return GL_RGBA;

+      case GL_SLUMINANCE_ALPHA_EXT:

+      case GL_SLUMINANCE8_ALPHA8_EXT:

+      case GL_COMPRESSED_SLUMINANCE_EXT:

+      case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

+         return GL_LUMINANCE_ALPHA;

+      case GL_SLUMINANCE_EXT:

+      case GL_SLUMINANCE8_EXT:

+         return GL_LUMINANCE;

+      default:

+         ; /* fallthrough */

+      }

+   }

+#endif /* FEATURE_EXT_texture_sRGB */

+

+   if (ctx->Extensions.EXT_texture_integer) {

+      switch (internalFormat) {

+      case GL_RGBA8UI_EXT:

+      case GL_RGBA16UI_EXT:

+      case GL_RGBA32UI_EXT:

+      case GL_RGBA8I_EXT:

+      case GL_RGBA16I_EXT:

+      case GL_RGBA32I_EXT:

+         return GL_RGBA;

+      case GL_RGB8UI_EXT:

+      case GL_RGB16UI_EXT:

+      case GL_RGB32UI_EXT:

+      case GL_RGB8I_EXT:

+      case GL_RGB16I_EXT:

+      case GL_RGB32I_EXT:

+         return GL_RGB;

+      case GL_ALPHA8UI_EXT:

+      case GL_ALPHA16UI_EXT:

+      case GL_ALPHA32UI_EXT:

+      case GL_ALPHA8I_EXT:

+      case GL_ALPHA16I_EXT:

+      case GL_ALPHA32I_EXT:

+         return GL_ALPHA;

+      case GL_INTENSITY8UI_EXT:

+      case GL_INTENSITY16UI_EXT:

+      case GL_INTENSITY32UI_EXT:

+      case GL_INTENSITY8I_EXT:

+      case GL_INTENSITY16I_EXT:

+      case GL_INTENSITY32I_EXT:

+         return GL_INTENSITY;

+      case GL_LUMINANCE8UI_EXT:

+      case GL_LUMINANCE16UI_EXT:

+      case GL_LUMINANCE32UI_EXT:

+      case GL_LUMINANCE8I_EXT:

+      case GL_LUMINANCE16I_EXT:

+      case GL_LUMINANCE32I_EXT:

+         return GL_LUMINANCE;

+      case GL_LUMINANCE_ALPHA8UI_EXT:

+      case GL_LUMINANCE_ALPHA16UI_EXT:

+      case GL_LUMINANCE_ALPHA32UI_EXT:

+      case GL_LUMINANCE_ALPHA8I_EXT:

+      case GL_LUMINANCE_ALPHA16I_EXT:

+      case GL_LUMINANCE_ALPHA32I_EXT:

+         return GL_LUMINANCE_ALPHA;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_rg) {

+      switch (internalFormat) {

+      case GL_R16F:

+	 /* R16F depends on both ARB_half_float_pixel and ARB_texture_float.

+	  */

+	 if (!ctx->Extensions.ARB_half_float_pixel)

+	    break;

+	 /* FALLTHROUGH */

+      case GL_R32F:

+	 if (!ctx->Extensions.ARB_texture_float)

+	    break;

+         return GL_RED;

+      case GL_R8I:

+      case GL_R8UI:

+      case GL_R16I:

+      case GL_R16UI:

+      case GL_R32I:

+      case GL_R32UI:

+	 if (!ctx->Extensions.EXT_texture_integer)

+	    break;

+	 /* FALLTHROUGH */

+      case GL_R8:

+      case GL_R16:

+      case GL_RED:

+      case GL_COMPRESSED_RED:

+         return GL_RED;

+

+      case GL_RG16F:

+	 /* RG16F depends on both ARB_half_float_pixel and ARB_texture_float.

+	  */

+	 if (!ctx->Extensions.ARB_half_float_pixel)

+	    break;

+	 /* FALLTHROUGH */

+      case GL_RG32F:

+	 if (!ctx->Extensions.ARB_texture_float)

+	    break;

+         return GL_RG;

+      case GL_RG8I:

+      case GL_RG8UI:

+      case GL_RG16I:

+      case GL_RG16UI:

+      case GL_RG32I:

+      case GL_RG32UI:

+	 if (!ctx->Extensions.EXT_texture_integer)

+	    break;

+	 /* FALLTHROUGH */

+      case GL_RG:

+      case GL_RG8:

+      case GL_RG16:

+      case GL_COMPRESSED_RG:

+         return GL_RG;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_texture_shared_exponent) {

+      switch (internalFormat) {

+      case GL_RGB9_E5_EXT:

+         return GL_RGB;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_packed_float) {

+      switch (internalFormat) {

+      case GL_R11F_G11F_B10F_EXT:

+         return GL_RGB;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ARB_depth_buffer_float) {

+      switch (internalFormat) {

+      case GL_DEPTH_COMPONENT32F:

+         return GL_DEPTH_COMPONENT;

+      case GL_DEPTH32F_STENCIL8:

+         return GL_DEPTH_STENCIL;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_compression_rgtc) {

+      switch (internalFormat) {

+      case GL_COMPRESSED_RED_RGTC1:

+      case GL_COMPRESSED_SIGNED_RED_RGTC1:

+         return GL_RED;

+      case GL_COMPRESSED_RG_RGTC2:

+      case GL_COMPRESSED_SIGNED_RG_RGTC2:

+         return GL_RG;

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   return -1; /* error */

+}

+

+

+/**

+ * For cube map faces, return a face index in [0,5].

+ * For other targets return 0;

+ */

+GLuint

+_mesa_tex_target_to_face(GLenum target)

+{

+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&

+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB)

+      return (GLuint) target - (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X;

+   else

+      return 0;

+}

+

+

+

+/**

+ * Store a gl_texture_image pointer in a gl_texture_object structure

+ * according to the target and level parameters.

+ * 

+ * \param tObj texture object.

+ * \param target texture target.

+ * \param level image level.

+ * \param texImage texture image.

+ * 

+ * This was basically prompted by the introduction of cube maps.

+ */

+void

+_mesa_set_tex_image(struct gl_texture_object *tObj,

+                    GLenum target, GLint level,

+                    struct gl_texture_image *texImage)

+{

+   const GLuint face = _mesa_tex_target_to_face(target);

+

+   ASSERT(tObj);

+   ASSERT(texImage);

+   ASSERT(target != GL_TEXTURE_RECTANGLE_NV || level == 0);

+

+   tObj->Image[face][level] = texImage;

+

+   /* Set the 'back' pointer */

+   texImage->TexObject = tObj;

+}

+

+

+/**

+ * Allocate a texture image structure.

+ * 

+ * Called via ctx->Driver.NewTextureImage() unless overriden by a device

+ * driver.

+ *

+ * \return a pointer to gl_texture_image struct with all fields initialized to

+ * zero.

+ */

+struct gl_texture_image *

+_mesa_new_texture_image( struct gl_context *ctx )

+{

+   (void) ctx;

+   return CALLOC_STRUCT(gl_texture_image);

+}

+

+

+/**

+ * Free texture image data.

+ * This function is a fallback called via ctx->Driver.FreeTexImageData().

+ *

+ * \param texImage texture image.

+ *

+ * Free the texture image data if it's not marked as client data.

+ */

+void

+_mesa_free_texture_image_data(struct gl_context *ctx,

+                              struct gl_texture_image *texImage)

+{

+   (void) ctx;

+

+   if (texImage->Data && !texImage->IsClientData) {

+      /* free the old texture data */

+      _mesa_free_texmemory(texImage->Data);

+   }

+

+   texImage->Data = NULL;

+}

+

+

+/**

+ * Free texture image.

+ *

+ * \param texImage texture image.

+ *

+ * Free the texture image structure and the associated image data.

+ */

+void

+_mesa_delete_texture_image(struct gl_context *ctx,

+                           struct gl_texture_image *texImage)

+{

+   /* Free texImage->Data and/or any other driver-specific texture

+    * image storage.

+    */

+   ASSERT(ctx->Driver.FreeTexImageData);

+   ctx->Driver.FreeTexImageData( ctx, texImage );

+

+   ASSERT(texImage->Data == NULL);

+   if (texImage->ImageOffsets)

+      free(texImage->ImageOffsets);

+   free(texImage);

+}

+

+

+/**

+ * Test if a target is a proxy target.

+ *

+ * \param target texture target.

+ *

+ * \return GL_TRUE if the target is a proxy target, GL_FALSE otherwise.

+ */

+GLboolean

+_mesa_is_proxy_texture(GLenum target)

+{

+   /* NUM_TEXTURE_TARGETS should match number of terms below */

+   assert(NUM_TEXTURE_TARGETS == 7);

+

+   return (target == GL_PROXY_TEXTURE_1D ||

+           target == GL_PROXY_TEXTURE_2D ||

+           target == GL_PROXY_TEXTURE_3D ||

+           target == GL_PROXY_TEXTURE_CUBE_MAP_ARB ||

+           target == GL_PROXY_TEXTURE_RECTANGLE_NV ||

+           target == GL_PROXY_TEXTURE_1D_ARRAY_EXT ||

+           target == GL_PROXY_TEXTURE_2D_ARRAY_EXT);

+}

+

+

+/**

+ * Return the proxy target which corresponds to the given texture target

+ */

+static GLenum

+get_proxy_target(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+   case GL_PROXY_TEXTURE_1D:

+      return GL_PROXY_TEXTURE_1D;

+   case GL_TEXTURE_2D:

+   case GL_PROXY_TEXTURE_2D:

+      return GL_PROXY_TEXTURE_2D;

+   case GL_TEXTURE_3D:

+   case GL_PROXY_TEXTURE_3D:

+      return GL_PROXY_TEXTURE_3D;

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

+   case GL_TEXTURE_CUBE_MAP_ARB:

+   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:

+      return GL_PROXY_TEXTURE_CUBE_MAP_ARB;

+   case GL_TEXTURE_RECTANGLE_NV:

+   case GL_PROXY_TEXTURE_RECTANGLE_NV:

+      return GL_PROXY_TEXTURE_RECTANGLE_NV;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:

+      return GL_PROXY_TEXTURE_1D_ARRAY_EXT;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+      return GL_PROXY_TEXTURE_2D_ARRAY_EXT;

+   default:

+      _mesa_problem(NULL, "unexpected target in get_proxy_target()");

+      return 0;

+   }

+}

+

+

+/**

+ * Get the texture object that corresponds to the target of the given

+ * texture unit.

+ *

+ * \param ctx GL context.

+ * \param texUnit texture unit.

+ * \param target texture target.

+ *

+ * \return pointer to the texture object on success, or NULL on failure.

+ * 

+ * \sa gl_texture_unit.

+ */

+struct gl_texture_object *

+_mesa_select_tex_object(struct gl_context *ctx,

+                        const struct gl_texture_unit *texUnit,

+                        GLenum target)

+{

+   switch (target) {

+      case GL_TEXTURE_1D:

+         return texUnit->CurrentTex[TEXTURE_1D_INDEX];

+      case GL_PROXY_TEXTURE_1D:

+         return ctx->Texture.ProxyTex[TEXTURE_1D_INDEX];

+      case GL_TEXTURE_2D:

+         return texUnit->CurrentTex[TEXTURE_2D_INDEX];

+      case GL_PROXY_TEXTURE_2D:

+         return ctx->Texture.ProxyTex[TEXTURE_2D_INDEX];

+      case GL_TEXTURE_3D:

+         return texUnit->CurrentTex[TEXTURE_3D_INDEX];

+      case GL_PROXY_TEXTURE_3D:

+         return ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];

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

+      case GL_TEXTURE_CUBE_MAP_ARB:

+         return ctx->Extensions.ARB_texture_cube_map

+                ? texUnit->CurrentTex[TEXTURE_CUBE_INDEX] : NULL;

+      case GL_PROXY_TEXTURE_CUBE_MAP_ARB:

+         return ctx->Extensions.ARB_texture_cube_map

+                ? ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX] : NULL;

+      case GL_TEXTURE_RECTANGLE_NV:

+         return ctx->Extensions.NV_texture_rectangle

+                ? texUnit->CurrentTex[TEXTURE_RECT_INDEX] : NULL;

+      case GL_PROXY_TEXTURE_RECTANGLE_NV:

+         return ctx->Extensions.NV_texture_rectangle

+                ? ctx->Texture.ProxyTex[TEXTURE_RECT_INDEX] : NULL;

+      case GL_TEXTURE_1D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array

+                ? texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX] : NULL;

+      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array

+                ? ctx->Texture.ProxyTex[TEXTURE_1D_ARRAY_INDEX] : NULL;

+      case GL_TEXTURE_2D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array

+                ? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;

+      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array

+                ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;

+      default:

+         _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");

+         return NULL;

+   }

+}

+

+

+/**

+ * Return pointer to texture object for given target on current texture unit.

+ */

+struct gl_texture_object *

+_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)

+{

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   return _mesa_select_tex_object(ctx, texUnit, target);

+}

+

+

+/**

+ * Get a texture image pointer from a texture object, given a texture

+ * target and mipmap level.  The target and level parameters should

+ * have already been error-checked.

+ *

+ * \param ctx GL context.

+ * \param texObj texture unit.

+ * \param target texture target.

+ * \param level image level.

+ *

+ * \return pointer to the texture image structure, or NULL on failure.

+ */

+struct gl_texture_image *

+_mesa_select_tex_image(struct gl_context *ctx,

+                       const struct gl_texture_object *texObj,

+		       GLenum target, GLint level)

+{

+   const GLuint face = _mesa_tex_target_to_face(target);

+

+   ASSERT(texObj);

+   ASSERT(level >= 0);

+   ASSERT(level < MAX_TEXTURE_LEVELS);

+

+   return texObj->Image[face][level];

+}

+

+

+/**

+ * Like _mesa_select_tex_image() but if the image doesn't exist, allocate

+ * it and install it.  Only return NULL if passed a bad parameter or run

+ * out of memory.

+ */

+struct gl_texture_image *

+_mesa_get_tex_image(struct gl_context *ctx, struct gl_texture_object *texObj,

+                    GLenum target, GLint level)

+{

+   struct gl_texture_image *texImage;

+

+   if (!texObj)

+      return NULL;

+   

+   texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+   if (!texImage) {

+      texImage = ctx->Driver.NewTextureImage(ctx);

+      if (!texImage) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture image allocation");

+         return NULL;

+      }

+

+      _mesa_set_tex_image(texObj, target, level, texImage);

+   }

+

+   return texImage;

+}

+

+

+/**

+ * Return pointer to the specified proxy texture image.

+ * Note that proxy textures are per-context, not per-texture unit.

+ * \return pointer to texture image or NULL if invalid target, invalid

+ *         level, or out of memory.

+ */

+struct gl_texture_image *

+_mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level)

+{

+   struct gl_texture_image *texImage;

+   GLuint texIndex;

+

+   if (level < 0 )

+      return NULL;

+

+   switch (target) {

+   case GL_PROXY_TEXTURE_1D:

+      if (level >= ctx->Const.MaxTextureLevels)

+         return NULL;

+      texIndex = TEXTURE_1D_INDEX;

+      break;

+   case GL_PROXY_TEXTURE_2D:

+      if (level >= ctx->Const.MaxTextureLevels)

+         return NULL;

+      texIndex = TEXTURE_2D_INDEX;

+      break;

+   case GL_PROXY_TEXTURE_3D:

+      if (level >= ctx->Const.Max3DTextureLevels)

+         return NULL;

+      texIndex = TEXTURE_3D_INDEX;

+      break;

+   case GL_PROXY_TEXTURE_CUBE_MAP:

+      if (level >= ctx->Const.MaxCubeTextureLevels)

+         return NULL;

+      texIndex = TEXTURE_CUBE_INDEX;

+      break;

+   case GL_PROXY_TEXTURE_RECTANGLE_NV:

+      if (level > 0)

+         return NULL;

+      texIndex = TEXTURE_RECT_INDEX;

+      break;

+   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:

+      if (level >= ctx->Const.MaxTextureLevels)

+         return NULL;

+      texIndex = TEXTURE_1D_ARRAY_INDEX;

+      break;

+   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+      if (level >= ctx->Const.MaxTextureLevels)

+         return NULL;

+      texIndex = TEXTURE_2D_ARRAY_INDEX;

+      break;

+   default:

+      return NULL;

+   }

+

+   texImage = ctx->Texture.ProxyTex[texIndex]->Image[0][level];

+   if (!texImage) {

+      texImage = ctx->Driver.NewTextureImage(ctx);

+      if (!texImage) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "proxy texture allocation");

+         return NULL;

+      }

+      ctx->Texture.ProxyTex[texIndex]->Image[0][level] = texImage;

+      /* Set the 'back' pointer */

+      texImage->TexObject = ctx->Texture.ProxyTex[texIndex];

+   }

+   return texImage;

+}

+

+

+/**

+ * Get the maximum number of allowed mipmap levels.

+ *

+ * \param ctx GL context.

+ * \param target texture target.

+ * 

+ * \return the maximum number of allowed mipmap levels for the given

+ * texture target, or zero if passed a bad target.

+ *

+ * \sa gl_constants.

+ */

+GLint

+_mesa_max_texture_levels(struct gl_context *ctx, GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+   case GL_PROXY_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+   case GL_PROXY_TEXTURE_2D:

+      return ctx->Const.MaxTextureLevels;

+   case GL_TEXTURE_3D:

+   case GL_PROXY_TEXTURE_3D:

+      return ctx->Const.Max3DTextureLevels;

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

+   case GL_TEXTURE_CUBE_MAP_ARB:

+   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:

+      return ctx->Extensions.ARB_texture_cube_map

+         ? ctx->Const.MaxCubeTextureLevels : 0;

+   case GL_TEXTURE_RECTANGLE_NV:

+   case GL_PROXY_TEXTURE_RECTANGLE_NV:

+      return ctx->Extensions.NV_texture_rectangle ? 1 : 0;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:

+   case GL_TEXTURE_2D_ARRAY_EXT:

+   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+      return ctx->Extensions.MESA_texture_array

+         ? ctx->Const.MaxTextureLevels : 0;

+   default:

+      return 0; /* bad target */

+   }

+}

+

+

+/**

+ * Return number of dimensions per mipmap level for the given texture target.

+ */

+static GLint

+get_texture_dimensions(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+   case GL_PROXY_TEXTURE_1D:

+      return 1;

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_RECTANGLE:

+   case GL_TEXTURE_CUBE_MAP:

+   case GL_PROXY_TEXTURE_2D:

+   case GL_PROXY_TEXTURE_RECTANGLE:

+   case GL_PROXY_TEXTURE_CUBE_MAP:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:

+   case GL_TEXTURE_1D_ARRAY:

+   case GL_PROXY_TEXTURE_1D_ARRAY:

+      return 2;

+   case GL_TEXTURE_3D:

+   case GL_PROXY_TEXTURE_3D:

+   case GL_TEXTURE_2D_ARRAY:

+   case GL_PROXY_TEXTURE_2D_ARRAY:

+      return 3;

+   default:

+      _mesa_problem(NULL, "invalid target 0x%x in get_texture_dimensions()",

+                    target);

+      return 2;

+   }

+}

+

+

+

+

+#if 000 /* not used anymore */

+/*

+ * glTexImage[123]D can accept a NULL image pointer.  In this case we

+ * create a texture image with unspecified image contents per the OpenGL

+ * spec.

+ */

+static GLubyte *

+make_null_texture(GLint width, GLint height, GLint depth, GLenum format)

+{

+   const GLint components = _mesa_components_in_format(format);

+   const GLint numPixels = width * height * depth;

+   GLubyte *data = (GLubyte *) MALLOC(numPixels * components * sizeof(GLubyte));

+

+#ifdef DEBUG

+   /*

+    * Let's see if anyone finds this.  If glTexImage2D() is called with

+    * a NULL image pointer then load the texture image with something

+    * interesting instead of leaving it indeterminate.

+    */

+   if (data) {

+      static const char message[8][32] = {

+         "   X   X  XXXXX   XXX     X    ",

+         "   XX XX  X      X   X   X X   ",

+         "   X X X  X      X      X   X  ",

+         "   X   X  XXXX    XXX   XXXXX  ",

+         "   X   X  X          X  X   X  ",

+         "   X   X  X      X   X  X   X  ",

+         "   X   X  XXXXX   XXX   X   X  ",

+         "                               "

+      };

+

+      GLubyte *imgPtr = data;

+      GLint h, i, j, k;

+      for (h = 0; h < depth; h++) {

+         for (i = 0; i < height; i++) {

+            GLint srcRow = 7 - (i % 8);

+            for (j = 0; j < width; j++) {

+               GLint srcCol = j % 32;

+               GLubyte texel = (message[srcRow][srcCol]=='X') ? 255 : 70;

+               for (k = 0; k < components; k++) {

+                  *imgPtr++ = texel;

+               }

+            }

+         }

+      }

+   }

+#endif

+

+   return data;

+}

+#endif

+

+

+

+/**

+ * Reset the fields of a gl_texture_image struct to zero.

+ * 

+ * \param img texture image structure.

+ *

+ * This is called when a proxy texture test fails, we set all the

+ * image members (except DriverData) to zero.

+ * It's also used in glTexImage[123]D as a safeguard to be sure all

+ * required fields get initialized properly by the Driver.TexImage[123]D

+ * functions.

+ */

+static void

+clear_teximage_fields(struct gl_texture_image *img)

+{

+   ASSERT(img);

+   img->_BaseFormat = 0;

+   img->InternalFormat = 0;

+   img->Border = 0;

+   img->Width = 0;

+   img->Height = 0;

+   img->Depth = 0;

+   img->RowStride = 0;

+   if (img->ImageOffsets) {

+      free(img->ImageOffsets);

+      img->ImageOffsets = NULL;

+   }

+   img->Width2 = 0;

+   img->Height2 = 0;

+   img->Depth2 = 0;

+   img->WidthLog2 = 0;

+   img->HeightLog2 = 0;

+   img->DepthLog2 = 0;

+   img->Data = NULL;

+   img->TexFormat = MESA_FORMAT_NONE;

+   img->FetchTexelc = NULL;

+   img->FetchTexelf = NULL;

+}

+

+

+/**

+ * Initialize basic fields of the gl_texture_image struct.

+ *

+ * \param ctx GL context.

+ * \param target texture target (GL_TEXTURE_1D, GL_TEXTURE_RECTANGLE, etc).

+ * \param img texture image structure to be initialized.

+ * \param width image width.

+ * \param height image height.

+ * \param depth image depth.

+ * \param border image border.

+ * \param internalFormat internal format.

+ * \param format  the actual hardware format (one of MESA_FORMAT_*)

+ *

+ * Fills in the fields of \p img with the given information.

+ * Note: width, height and depth include the border.

+ */

+void

+_mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,

+                           struct gl_texture_image *img,

+                           GLsizei width, GLsizei height, GLsizei depth,

+                           GLint border, GLenum internalFormat,

+                           gl_format format)

+{

+   GLint i, dims;

+

+   ASSERT(img);

+   ASSERT(width >= 0);

+   ASSERT(height >= 0);

+   ASSERT(depth >= 0);

+

+   img->_BaseFormat = _mesa_base_tex_format( ctx, internalFormat );

+   ASSERT(img->_BaseFormat > 0);

+   img->InternalFormat = internalFormat;

+   img->Border = border;

+   img->Width = width;

+   img->Height = height;

+   img->Depth = depth;

+

+   img->Width2 = width - 2 * border;   /* == 1 << img->WidthLog2; */

+   img->WidthLog2 = logbase2(img->Width2);

+

+   if (height == 1) { /* 1-D texture */

+      img->Height2 = 1;

+      img->HeightLog2 = 0;

+   }

+   else {

+      img->Height2 = height - 2 * border; /* == 1 << img->HeightLog2; */

+      img->HeightLog2 = logbase2(img->Height2);

+   }

+

+   if (depth == 1) {  /* 2-D texture */

+      img->Depth2 = 1;

+      img->DepthLog2 = 0;

+   }

+   else {

+      img->Depth2 = depth - 2 * border;   /* == 1 << img->DepthLog2; */

+      img->DepthLog2 = logbase2(img->Depth2);

+   }

+

+   img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);

+

+   if ((width == 1 || _mesa_is_pow_two(img->Width2)) &&

+       (height == 1 || _mesa_is_pow_two(img->Height2)) &&

+       (depth == 1 || _mesa_is_pow_two(img->Depth2)))

+      img->_IsPowerOfTwo = GL_TRUE;

+   else

+      img->_IsPowerOfTwo = GL_FALSE;

+

+   /* RowStride and ImageOffsets[] describe how to address texels in 'Data' */

+   img->RowStride = width;

+   /* Allocate the ImageOffsets array and initialize to typical values.

+    * We allocate the array for 1D/2D textures too in order to avoid special-

+    * case code in the texstore routines.

+    */

+   if (img->ImageOffsets)

+      free(img->ImageOffsets);

+   img->ImageOffsets = (GLuint *) malloc(depth * sizeof(GLuint));

+   for (i = 0; i < depth; i++) {

+      img->ImageOffsets[i] = i * width * height;

+   }

+

+   /* Compute Width/Height/DepthScale for mipmap lod computation */

+   if (target == GL_TEXTURE_RECTANGLE_NV) {

+      /* scale = 1.0 since texture coords directly map to texels */

+      img->WidthScale = 1.0;

+      img->HeightScale = 1.0;

+      img->DepthScale = 1.0;

+   }

+   else {

+      img->WidthScale = (GLfloat) img->Width;

+      img->HeightScale = (GLfloat) img->Height;

+      img->DepthScale = (GLfloat) img->Depth;

+   }

+

+   img->TexFormat = format;

+

+   dims = get_texture_dimensions(target);

+

+   _mesa_set_fetch_functions(img, dims);

+}

+

+

+/**

+ * Free and clear fields of the gl_texture_image struct.

+ *

+ * \param ctx GL context.

+ * \param texImage texture image structure to be cleared.

+ *

+ * After the call, \p texImage will have no data associated with it.  Its

+ * fields are cleared so that its parent object will test incomplete.

+ */

+void

+_mesa_clear_texture_image(struct gl_context *ctx,

+                          struct gl_texture_image *texImage)

+{

+   ctx->Driver.FreeTexImageData(ctx, texImage);

+   clear_teximage_fields(texImage);

+}

+

+

+/**

+ * This is the fallback for Driver.TestProxyTexImage().  Test the texture

+ * level, width, height and depth against the ctx->Const limits for textures.

+ *

+ * A hardware driver might override this function if, for example, the

+ * max 3D texture size is 512x512x64 (i.e. not a cube).

+ *

+ * Note that width, height, depth == 0 is not an error.  However, a

+ * texture with zero width/height/depth will be considered "incomplete"

+ * and texturing will effectively be disabled.

+ *

+ * \param target  one of GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D,

+ *                GL_PROXY_TEXTURE_3D, GL_PROXY_TEXTURE_RECTANGLE_NV,

+ *                GL_PROXY_TEXTURE_CUBE_MAP_ARB.

+ * \param level  as passed to glTexImage

+ * \param internalFormat  as passed to glTexImage

+ * \param format  as passed to glTexImage

+ * \param type  as passed to glTexImage

+ * \param width  as passed to glTexImage

+ * \param height  as passed to glTexImage

+ * \param depth  as passed to glTexImage

+ * \param border  as passed to glTexImage

+ * \return GL_TRUE if the image is acceptable, GL_FALSE if not acceptable.

+ */

+GLboolean

+_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,

+                          GLint internalFormat, GLenum format, GLenum type,

+                          GLint width, GLint height, GLint depth, GLint border)

+{

+   GLint maxSize;

+

+   (void) internalFormat;

+   (void) format;

+   (void) type;

+

+   switch (target) {

+   case GL_PROXY_TEXTURE_1D:

+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);

+      if (width < 2 * border || width > 2 + maxSize)

+         return GL_FALSE;

+      if (level >= ctx->Const.MaxTextureLevels)

+         return GL_FALSE;

+      if (!ctx->Extensions.ARB_texture_non_power_of_two) {

+         if (width > 0 && !_mesa_is_pow_two(width - 2 * border))

+            return GL_FALSE;

+      }

+      return GL_TRUE;

+

+   case GL_PROXY_TEXTURE_2D:

+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);

+      if (width < 2 * border || width > 2 + maxSize)

+         return GL_FALSE;

+      if (height < 2 * border || height > 2 + maxSize)

+         return GL_FALSE;

+      if (level >= ctx->Const.MaxTextureLevels)

+         return GL_FALSE;

+      if (!ctx->Extensions.ARB_texture_non_power_of_two) {

+         if (width > 0 && !_mesa_is_pow_two(width - 2 * border))

+            return GL_FALSE;

+         if (height > 0 && !_mesa_is_pow_two(height - 2 * border))

+            return GL_FALSE;

+      }

+      return GL_TRUE;

+

+   case GL_PROXY_TEXTURE_3D:

+      maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);

+      if (width < 2 * border || width > 2 + maxSize)

+         return GL_FALSE;

+      if (height < 2 * border || height > 2 + maxSize)

+         return GL_FALSE;

+      if (depth < 2 * border || depth > 2 + maxSize)

+         return GL_FALSE;

+      if (level >= ctx->Const.Max3DTextureLevels)

+         return GL_FALSE;

+      if (!ctx->Extensions.ARB_texture_non_power_of_two) {

+         if (width > 0 && !_mesa_is_pow_two(width - 2 * border))

+            return GL_FALSE;

+         if (height > 0 && !_mesa_is_pow_two(height - 2 * border))

+            return GL_FALSE;

+         if (depth > 0 && !_mesa_is_pow_two(depth - 2 * border))

+            return GL_FALSE;

+      }

+      return GL_TRUE;

+

+   case GL_PROXY_TEXTURE_RECTANGLE_NV:

+      maxSize = ctx->Const.MaxTextureRectSize;

+      if (width < 0 || width > maxSize)

+         return GL_FALSE;

+      if (height < 0 || height > maxSize)

+         return GL_FALSE;

+      if (level != 0)

+         return GL_FALSE;

+      return GL_TRUE;

+

+   case GL_PROXY_TEXTURE_CUBE_MAP_ARB:

+      maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);

+      if (width < 2 * border || width > 2 + maxSize)

+         return GL_FALSE;

+      if (height < 2 * border || height > 2 + maxSize)

+         return GL_FALSE;

+      if (level >= ctx->Const.MaxCubeTextureLevels)

+         return GL_FALSE;

+      if (!ctx->Extensions.ARB_texture_non_power_of_two) {

+         if (width > 0 && !_mesa_is_pow_two(width - 2 * border))

+            return GL_FALSE;

+         if (height > 0 && !_mesa_is_pow_two(height - 2 * border))

+            return GL_FALSE;

+      }

+      return GL_TRUE;

+

+   case GL_PROXY_TEXTURE_1D_ARRAY_EXT:

+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);

+      if (width < 2 * border || width > 2 + maxSize)

+         return GL_FALSE;

+      if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)

+         return GL_FALSE;

+      if (level >= ctx->Const.MaxTextureLevels)

+         return GL_FALSE;

+      if (!ctx->Extensions.ARB_texture_non_power_of_two) {

+         if (width > 0 && !_mesa_is_pow_two(width - 2 * border))

+            return GL_FALSE;

+      }

+      return GL_TRUE;

+

+   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);

+      if (width < 2 * border || width > 2 + maxSize)

+         return GL_FALSE;

+      if (height < 2 * border || height > 2 + maxSize)

+         return GL_FALSE;

+      if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)

+         return GL_FALSE;

+      if (level >= ctx->Const.MaxTextureLevels)

+         return GL_FALSE;

+      if (!ctx->Extensions.ARB_texture_non_power_of_two) {

+         if (width > 0 && !_mesa_is_pow_two(width - 2 * border))

+            return GL_FALSE;

+         if (height > 0 && !_mesa_is_pow_two(height - 2 * border))

+            return GL_FALSE;

+      }

+      return GL_TRUE;

+

+   default:

+      _mesa_problem(ctx, "Invalid target in _mesa_test_proxy_teximage");

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Check if the memory used by the texture would exceed the driver's limit.

+ * This lets us support a max 3D texture size of 8K (for example) but

+ * prevents allocating a full 8K x 8K x 8K texture.

+ * XXX this could be rolled into the proxy texture size test (above) but

+ * we don't have the actual texture internal format at that point.

+ */

+static GLboolean

+legal_texture_size(struct gl_context *ctx, gl_format format,

+                   GLint width, GLint height, GLint depth)

+{

+   uint64_t bytes = _mesa_format_image_size64(format, width, height, depth);

+   uint64_t mbytes = bytes / (1024 * 1024); /* convert to MB */

+   return mbytes <= (uint64_t) ctx->Const.MaxTextureMbytes;

+}

+

+

+

+/**

+ * Helper function to determine whether a target and specific compression

+ * format are supported.

+ */

+static GLboolean

+target_can_be_compressed(const struct gl_context *ctx, GLenum target,

+                         GLenum intFormat)

+{

+   (void) intFormat;  /* not used yet */

+

+   switch (target) {

+   case GL_TEXTURE_2D:

+   case GL_PROXY_TEXTURE_2D:

+      return GL_TRUE; /* true for any compressed format so far */

+   case GL_PROXY_TEXTURE_CUBE_MAP:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:

+      return ctx->Extensions.ARB_texture_cube_map;

+   case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      return ctx->Extensions.MESA_texture_array;

+   default:

+      return GL_FALSE;

+   }      

+}

+

+

+/**

+ * Check if the given texture target value is legal for a

+ * glTexImage1/2/3D call.

+ */

+static GLboolean

+legal_teximage_target(struct gl_context *ctx, GLuint dims, GLenum target)

+{

+   switch (dims) {

+   case 1:

+      switch (target) {

+      case GL_TEXTURE_1D:

+      case GL_PROXY_TEXTURE_1D:

+         return GL_TRUE;

+      default:

+         return GL_FALSE;

+      }

+   case 2:

+      switch (target) {

+      case GL_TEXTURE_2D:

+      case GL_PROXY_TEXTURE_2D:

+         return GL_TRUE;

+      case GL_PROXY_TEXTURE_CUBE_MAP:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:

+         return ctx->Extensions.ARB_texture_cube_map;

+      case GL_TEXTURE_RECTANGLE_NV:

+      case GL_PROXY_TEXTURE_RECTANGLE_NV:

+         return ctx->Extensions.NV_texture_rectangle;

+      case GL_TEXTURE_1D_ARRAY_EXT:

+      case GL_PROXY_TEXTURE_1D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array;

+      default:

+         return GL_FALSE;

+      }

+   case 3:

+      switch (target) {

+      case GL_TEXTURE_3D:

+      case GL_PROXY_TEXTURE_3D:

+         return GL_TRUE;

+      case GL_TEXTURE_2D_ARRAY_EXT:

+      case GL_PROXY_TEXTURE_2D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array;

+      default:

+         return GL_FALSE;

+      }

+   default:

+      _mesa_problem(ctx, "invalid dims=%u in legal_teximage_target()", dims);

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Check if the given texture target value is legal for a

+ * glTexSubImage, glCopyTexSubImage or glCopyTexImage call.

+ * The difference compared to legal_teximage_target() above is that

+ * proxy targets are not supported.

+ */

+static GLboolean

+legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)

+{

+   switch (dims) {

+   case 1:

+      return target == GL_TEXTURE_1D;

+   case 2:

+      switch (target) {

+      case GL_TEXTURE_2D:

+         return GL_TRUE;

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:

+         return ctx->Extensions.ARB_texture_cube_map;

+      case GL_TEXTURE_RECTANGLE_NV:

+         return ctx->Extensions.NV_texture_rectangle;

+      case GL_TEXTURE_1D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array;

+      default:

+         return GL_FALSE;

+      }

+   case 3:

+      switch (target) {

+      case GL_TEXTURE_3D:

+         return GL_TRUE;

+      case GL_TEXTURE_2D_ARRAY_EXT:

+         return ctx->Extensions.MESA_texture_array;

+      default:

+         return GL_FALSE;

+      }

+   default:

+      _mesa_problem(ctx, "invalid dims=%u in legal_texsubimage_target()",

+                    dims);

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Test the glTexImage[123]D() parameters for errors.

+ * 

+ * \param ctx GL context.

+ * \param dimensions texture image dimensions (must be 1, 2 or 3).

+ * \param target texture target given by the user.

+ * \param level image level given by the user.

+ * \param internalFormat internal format given by the user.

+ * \param format pixel data format given by the user.

+ * \param type pixel data type given by the user.

+ * \param width image width given by the user.

+ * \param height image height given by the user.

+ * \param depth image depth given by the user.

+ * \param border image border given by the user.

+ * 

+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.

+ *

+ * Verifies each of the parameters against the constants specified in

+ * __struct gl_contextRec::Const and the supported extensions, and according

+ * to the OpenGL specification.

+ */

+static GLboolean

+texture_error_check( struct gl_context *ctx,

+                     GLuint dimensions, GLenum target,

+                     GLint level, GLint internalFormat,

+                     GLenum format, GLenum type,

+                     GLint width, GLint height,

+                     GLint depth, GLint border )

+{

+   const GLenum proxyTarget = get_proxy_target(target);

+   const GLboolean isProxy = target == proxyTarget;

+   GLboolean sizeOK = GL_TRUE;

+   GLboolean colorFormat, indexFormat;

+

+   /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */

+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {

+      if (!isProxy) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glTexImage%dD(level=%d)", dimensions, level);

+      }

+      return GL_TRUE;

+   }

+

+   /* Check border */

+   if (border < 0 || border > 1 ||

+       ((target == GL_TEXTURE_RECTANGLE_NV ||

+         target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {

+      if (!isProxy) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glTexImage%dD(border=%d)", dimensions, border);

+      }

+      return GL_TRUE;

+   }

+

+   if (width < 0 || height < 0 || depth < 0) {

+      if (!isProxy) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glTexImage%dD(width, height or depth < 0)", dimensions);

+      }

+      return GL_TRUE;

+   }

+

+   /* Do this simple check before calling the TestProxyTexImage() function */

+   if (proxyTarget == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {

+      sizeOK = (width == height);

+   }

+

+   /*

+    * Use the proxy texture driver hook to see if the size/level/etc are

+    * legal.

+    */

+   sizeOK = sizeOK && ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level,

+                                                    internalFormat, format,

+                                                    type, width, height,

+                                                    depth, border);

+   if (!sizeOK) {

+      if (!isProxy) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glTexImage%dD(level=%d, width=%d, height=%d, depth=%d)",

+                     dimensions, level, width, height, depth);

+      }

+      return GL_TRUE;

+   }

+

+   /* Check internalFormat */

+   if (_mesa_base_tex_format(ctx, internalFormat) < 0) {

+      if (!isProxy) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glTexImage%dD(internalFormat=%s)",

+                     dimensions, _mesa_lookup_enum_by_nr(internalFormat));

+      }

+      return GL_TRUE;

+   }

+

+   /* Check incoming image format and type */

+   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {

+      /* Normally, GL_INVALID_OPERATION is generated by a format/type

+       * mismatch (see the 1.2 spec page 94, sec 3.6.4.).  But with the

+       * GL_EXT_texture_integer extension, some combinations should generate

+       * GL_INVALID_ENUM instead (grr!).

+       */

+      if (!isProxy) {

+         GLenum error = _mesa_is_integer_format(format)

+            ? GL_INVALID_ENUM : GL_INVALID_OPERATION;

+         _mesa_error(ctx, error,

+                     "glTexImage%dD(incompatible format 0x%x, type 0x%x)",

+                     dimensions, format, type);

+      }

+      return GL_TRUE;

+   }

+

+   /* make sure internal format and format basically agree */

+   colorFormat = _mesa_is_color_format(format);

+   indexFormat = _mesa_is_index_format(format);

+   if ((_mesa_is_color_format(internalFormat) && !colorFormat && !indexFormat) ||

+       (_mesa_is_index_format(internalFormat) && !indexFormat) ||

+       (_mesa_is_depth_format(internalFormat) != _mesa_is_depth_format(format)) ||

+       (_mesa_is_ycbcr_format(internalFormat) != _mesa_is_ycbcr_format(format)) ||

+       (_mesa_is_depthstencil_format(internalFormat) != _mesa_is_depthstencil_format(format)) ||

+       (_mesa_is_dudv_format(internalFormat) != _mesa_is_dudv_format(format))) {

+      if (!isProxy)

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glTexImage%dD(incompatible internalFormat 0x%x, format 0x%x)",

+                     dimensions, internalFormat, format);

+      return GL_TRUE;

+   }

+

+   /* additional checks for ycbcr textures */

+   if (internalFormat == GL_YCBCR_MESA) {

+      ASSERT(ctx->Extensions.MESA_ycbcr_texture);

+      if (type != GL_UNSIGNED_SHORT_8_8_MESA &&

+          type != GL_UNSIGNED_SHORT_8_8_REV_MESA) {

+         char message[100];

+         _mesa_snprintf(message, sizeof(message),

+                        "glTexImage%dD(format/type YCBCR mismatch", dimensions);

+         _mesa_error(ctx, GL_INVALID_ENUM, "%s", message);

+         return GL_TRUE; /* error */

+      }

+      if (target != GL_TEXTURE_2D &&

+          target != GL_PROXY_TEXTURE_2D &&

+          target != GL_TEXTURE_RECTANGLE_NV &&

+          target != GL_PROXY_TEXTURE_RECTANGLE_NV) {

+         if (!isProxy)

+            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage(target)");

+         return GL_TRUE;

+      }

+      if (border != 0) {

+         if (!isProxy) {

+            char message[100];

+            _mesa_snprintf(message, sizeof(message),

+                           "glTexImage%dD(format=GL_YCBCR_MESA and border=%d)",

+                           dimensions, border);

+            _mesa_error(ctx, GL_INVALID_VALUE, "%s", message);

+         }

+         return GL_TRUE;

+      }

+   }

+

+   /* additional checks for depth textures */

+   if (_mesa_base_tex_format(ctx, internalFormat) == GL_DEPTH_COMPONENT) {

+      /* Only 1D, 2D and rectangular textures supported, not 3D or cubes */

+      if (target != GL_TEXTURE_1D &&

+          target != GL_PROXY_TEXTURE_1D &&

+          target != GL_TEXTURE_2D &&

+          target != GL_PROXY_TEXTURE_2D &&

+          target != GL_TEXTURE_RECTANGLE_ARB &&

+          target != GL_PROXY_TEXTURE_RECTANGLE_ARB) {

+         if (!isProxy)

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glTexImage(target/internalFormat)");

+         return GL_TRUE;

+      }

+   }

+

+   /* additional checks for compressed textures */

+   if (_mesa_is_compressed_format(ctx, internalFormat)) {

+      if (!target_can_be_compressed(ctx, target, internalFormat)) {

+         if (!isProxy)

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glTexImage%dD(target)", dimensions);

+         return GL_TRUE;

+      }

+      if (border != 0) {

+         if (!isProxy) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glTexImage%dD(border!=0)", dimensions);

+         }

+         return GL_TRUE;

+      }

+   }

+

+   /* additional checks for integer textures */

+   if (ctx->Extensions.EXT_texture_integer &&

+       (_mesa_is_integer_format(format) !=

+        _mesa_is_integer_format(internalFormat))) {

+      if (!isProxy) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glTexImage%dD(integer/non-integer format mismatch)",

+                     dimensions);

+      }

+      return GL_TRUE;

+   }

+

+   /* if we get here, the parameters are OK */

+   return GL_FALSE;

+}

+

+

+/**

+ * Test glTexSubImage[123]D() parameters for errors.

+ * 

+ * \param ctx GL context.

+ * \param dimensions texture image dimensions (must be 1, 2 or 3).

+ * \param target texture target given by the user.

+ * \param level image level given by the user.

+ * \param xoffset sub-image x offset given by the user.

+ * \param yoffset sub-image y offset given by the user.

+ * \param zoffset sub-image z offset given by the user.

+ * \param format pixel data format given by the user.

+ * \param type pixel data type given by the user.

+ * \param width image width given by the user.

+ * \param height image height given by the user.

+ * \param depth image depth given by the user.

+ * 

+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.

+ *

+ * Verifies each of the parameters against the constants specified in

+ * __struct gl_contextRec::Const and the supported extensions, and according

+ * to the OpenGL specification.

+ */

+static GLboolean

+subtexture_error_check( struct gl_context *ctx, GLuint dimensions,

+                        GLenum target, GLint level,

+                        GLint xoffset, GLint yoffset, GLint zoffset,

+                        GLint width, GLint height, GLint depth,

+                        GLenum format, GLenum type )

+{

+   /* Basic level check */

+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage2D(level=%d)", level);

+      return GL_TRUE;

+   }

+

+   /* Check for negative sizes */

+   if (width < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glTexSubImage%dD(width=%d)", dimensions, width);

+      return GL_TRUE;

+   }

+   if (height < 0 && dimensions > 1) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glTexSubImage%dD(height=%d)", dimensions, height);

+      return GL_TRUE;

+   }

+   if (depth < 0 && dimensions > 2) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glTexSubImage%dD(depth=%d)", dimensions, depth);

+      return GL_TRUE;

+   }

+

+   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {

+      /* As with the glTexImage2D check above, the error code here

+       * depends on texture integer.

+       */

+      GLenum error = _mesa_is_integer_format(format)

+         ? GL_INVALID_OPERATION : GL_INVALID_ENUM;

+      _mesa_error(ctx, error,

+                  "glTexSubImage%dD(incompatible format 0x%x, type 0x%x)",

+                  dimensions, format, type);

+      return GL_TRUE;

+   }

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Do second part of glTexSubImage which depends on the destination texture.

+ * \return GL_TRUE if error recorded, GL_FALSE otherwise

+ */

+static GLboolean

+subtexture_error_check2( struct gl_context *ctx, GLuint dimensions,

+			 GLenum target, GLint level,

+			 GLint xoffset, GLint yoffset, GLint zoffset,

+			 GLint width, GLint height, GLint depth,

+			 GLenum format, GLenum type,

+			 const struct gl_texture_image *destTex )

+{

+   if (!destTex) {

+      /* undefined image level */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexSubImage%dD", dimensions);

+      return GL_TRUE;

+   }

+

+   if (xoffset < -((GLint)destTex->Border)) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(xoffset)",

+                  dimensions);

+      return GL_TRUE;

+   }

+   if (xoffset + width > (GLint) (destTex->Width + destTex->Border)) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(xoffset+width)",

+                  dimensions);

+      return GL_TRUE;

+   }

+   if (dimensions > 1) {

+      if (yoffset < -((GLint)destTex->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(yoffset)",

+                     dimensions);

+         return GL_TRUE;

+      }

+      if (yoffset + height > (GLint) (destTex->Height + destTex->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage%dD(yoffset+height)",

+                     dimensions);

+         return GL_TRUE;

+      }

+   }

+   if (dimensions > 2) {

+      if (zoffset < -((GLint)destTex->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage3D(zoffset)");

+         return GL_TRUE;

+      }

+      if (zoffset + depth  > (GLint) (destTex->Depth + destTex->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glTexSubImage3D(zoffset+depth)");

+         return GL_TRUE;

+      }

+   }

+

+   if (_mesa_is_format_compressed(destTex->TexFormat)) {

+      GLuint bw, bh;

+

+      /* do tests which depend on compression block size */

+      _mesa_get_format_block_size(destTex->TexFormat, &bw, &bh);

+

+      /* offset must be multiple of block size */

+      if ((xoffset % bw != 0) || (yoffset % bh != 0)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glTexSubImage%dD(xoffset = %d, yoffset = %d)",

+                     dimensions, xoffset, yoffset);

+         return GL_TRUE;

+      }

+      /* size must be multiple of bw by bh or equal to whole texture size */

+      if ((width % bw != 0) && (GLuint) width != destTex->Width) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glTexSubImage%dD(width = %d)", dimensions, width);

+         return GL_TRUE;

+      }         

+      if ((height % bh != 0) && (GLuint) height != destTex->Height) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glTexSubImage%dD(height = %d)", dimensions, height);

+         return GL_TRUE;

+      }         

+   }

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Test glCopyTexImage[12]D() parameters for errors.

+ * 

+ * \param ctx GL context.

+ * \param dimensions texture image dimensions (must be 1, 2 or 3).

+ * \param target texture target given by the user.

+ * \param level image level given by the user.

+ * \param internalFormat internal format given by the user.

+ * \param width image width given by the user.

+ * \param height image height given by the user.

+ * \param border texture border.

+ * 

+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.

+ * 

+ * Verifies each of the parameters against the constants specified in

+ * __struct gl_contextRec::Const and the supported extensions, and according

+ * to the OpenGL specification.

+ */

+static GLboolean

+copytexture_error_check( struct gl_context *ctx, GLuint dimensions,

+                         GLenum target, GLint level, GLint internalFormat,

+                         GLint width, GLint height, GLint border )

+{

+   const GLenum proxyTarget = get_proxy_target(target);

+   const GLenum type = GL_FLOAT;

+   GLboolean sizeOK;

+   GLint format;

+

+   /* check target */

+   if (!legal_texsubimage_target(ctx, dimensions, target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexImage%uD(target=%s)",

+                  dimensions, _mesa_lookup_enum_by_nr(target));

+      return GL_TRUE;

+   }       

+

+   /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */

+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexImage%dD(level=%d)", dimensions, level);

+      return GL_TRUE;

+   }

+

+   /* Check that the source buffer is complete */

+   if (ctx->ReadBuffer->Name) {

+      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);

+      if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+         _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                     "glCopyTexImage%dD(invalid readbuffer)", dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   /* Check border */

+   if (border < 0 || border > 1 ||

+       ((target == GL_TEXTURE_RECTANGLE_NV ||

+         target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {

+      return GL_TRUE;

+   }

+

+   format = _mesa_base_tex_format(ctx, internalFormat);

+   if (format < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexImage%dD(internalFormat)", dimensions);

+      return GL_TRUE;

+   }

+

+   if (!_mesa_source_buffer_exists(ctx, format)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyTexImage%dD(missing readbuffer)", dimensions);

+      return GL_TRUE;

+   }

+

+   /* Do size, level checking */

+   sizeOK = (proxyTarget == GL_PROXY_TEXTURE_CUBE_MAP_ARB)

+      ? (width == height) : 1;

+

+   sizeOK = sizeOK && ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level,

+                                                    internalFormat, format,

+                                                    type, width, height,

+                                                    1, border);

+

+   if (!sizeOK) {

+      if (dimensions == 1) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexImage1D(width=%d)", width);

+      }

+      else {

+         ASSERT(dimensions == 2);

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexImage2D(width=%d, height=%d)", width, height);

+      }

+      return GL_TRUE;

+   }

+

+   if (_mesa_is_compressed_format(ctx, internalFormat)) {

+      if (!target_can_be_compressed(ctx, target, internalFormat)) {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glCopyTexImage%dD(target)", dimensions);

+         return GL_TRUE;

+      }

+      if (border != 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glCopyTexImage%dD(border!=0)", dimensions);

+         return GL_TRUE;

+      }

+   }

+   else if (_mesa_is_depth_format(internalFormat)) {

+      /* make sure we have depth/stencil buffers */

+      if (!ctx->ReadBuffer->_DepthBuffer) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glCopyTexImage%dD(no depth)", dimensions);

+         return GL_TRUE;

+      }

+   }

+   else if (_mesa_is_depthstencil_format(internalFormat)) {

+      /* make sure we have depth/stencil buffers */

+      if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glCopyTexImage%dD(no depth/stencil buffer)", dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   /* if we get here, the parameters are OK */

+   return GL_FALSE;

+}

+

+

+/**

+ * Test glCopyTexSubImage[12]D() parameters for errors.

+ * Note that this is the first part of error checking.

+ * See also copytexsubimage_error_check2() below for the second part.

+ * 

+ * \param ctx GL context.

+ * \param dimensions texture image dimensions (must be 1, 2 or 3).

+ * \param target texture target given by the user.

+ * \param level image level given by the user.

+ * 

+ * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.

+ */

+static GLboolean

+copytexsubimage_error_check1( struct gl_context *ctx, GLuint dimensions,

+                              GLenum target, GLint level)

+{

+   /* Check that the source buffer is complete */

+   if (ctx->ReadBuffer->Name) {

+      _mesa_test_framebuffer_completeness(ctx, ctx->ReadBuffer);

+      if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {

+         _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,

+                     "glCopyTexImage%dD(invalid readbuffer)", dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   /* check target (proxies not allowed) */

+   if (!legal_texsubimage_target(ctx, dimensions, target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexSubImage%uD(target=%s)",

+                  dimensions, _mesa_lookup_enum_by_nr(target));

+      return GL_TRUE;

+   }

+

+   /* Check level */

+   if (level < 0 || level >= MAX_TEXTURE_LEVELS) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexSubImage%dD(level=%d)", dimensions, level);

+      return GL_TRUE;

+   }

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Second part of error checking for glCopyTexSubImage[12]D().

+ * \param xoffset sub-image x offset given by the user.

+ * \param yoffset sub-image y offset given by the user.

+ * \param zoffset sub-image z offset given by the user.

+ * \param width image width given by the user.

+ * \param height image height given by the user.

+ */

+static GLboolean

+copytexsubimage_error_check2( struct gl_context *ctx, GLuint dimensions,

+			      GLenum target, GLint level,

+			      GLint xoffset, GLint yoffset, GLint zoffset,

+			      GLsizei width, GLsizei height,

+			      const struct gl_texture_image *teximage )

+{

+   /* check that dest tex image exists */

+   if (!teximage) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyTexSubImage%dD(undefined texture level: %d)",

+                  dimensions, level);

+      return GL_TRUE;

+   }

+

+   /* Check size */

+   if (width < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexSubImage%dD(width=%d)", dimensions, width);

+      return GL_TRUE;

+   }

+   if (dimensions > 1 && height < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexSubImage%dD(height=%d)", dimensions, height);

+      return GL_TRUE;

+   }

+

+   /* check x/y offsets */

+   if (xoffset < -((GLint)teximage->Border)) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexSubImage%dD(xoffset=%d)", dimensions, xoffset);

+      return GL_TRUE;

+   }

+   if (xoffset + width > (GLint) (teximage->Width + teximage->Border)) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCopyTexSubImage%dD(xoffset+width)", dimensions);

+      return GL_TRUE;

+   }

+   if (dimensions > 1) {

+      if (yoffset < -((GLint)teximage->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(yoffset=%d)", dimensions, yoffset);

+         return GL_TRUE;

+      }

+      /* NOTE: we're adding the border here, not subtracting! */

+      if (yoffset + height > (GLint) (teximage->Height + teximage->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(yoffset+height)", dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   /* check z offset */

+   if (dimensions > 2) {

+      if (zoffset < -((GLint)teximage->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(zoffset)", dimensions);

+         return GL_TRUE;

+      }

+      if (zoffset > (GLint) (teximage->Depth + teximage->Border)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(zoffset+depth)", dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   if (_mesa_is_format_compressed(teximage->TexFormat)) {

+      /* offset must be multiple of 4 */

+      if ((xoffset & 3) || (yoffset & 3)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(xoffset or yoffset)", dimensions);

+         return GL_TRUE;

+      }

+      /* size must be multiple of 4 */

+      if ((width & 3) != 0 && (GLuint) width != teximage->Width) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(width)", dimensions);

+         return GL_TRUE;

+      }         

+      if ((height & 3) != 0 && (GLuint) height != teximage->Height) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCopyTexSubImage%dD(height)", dimensions);

+         return GL_TRUE;

+      }         

+   }

+

+   if (teximage->InternalFormat == GL_YCBCR_MESA) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glCopyTexSubImage2D");

+      return GL_TRUE;

+   }

+

+   if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyTexSubImage%dD(missing readbuffer, format=0x%x)",

+                  dimensions, teximage->_BaseFormat);

+      return GL_TRUE;

+   }

+

+   if (teximage->_BaseFormat == GL_DEPTH_COMPONENT) {

+      if (!ctx->ReadBuffer->_DepthBuffer) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glCopyTexSubImage%dD(no depth buffer)",

+                     dimensions);

+         return GL_TRUE;

+      }

+   }

+   else if (teximage->_BaseFormat == GL_DEPTH_STENCIL_EXT) {

+      if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glCopyTexSubImage%dD(no depth/stencil buffer)",

+                     dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   /* If copying into an integer texture, the source buffer must also be

+    * integer-valued.

+    */

+   if (_mesa_is_format_integer_color(teximage->TexFormat)) {

+      struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer;

+      if (!_mesa_is_format_integer_color(rb->Format)) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCopyTexSubImage%dD(source buffer is not integer format)",

+                  dimensions);

+         return GL_TRUE;

+      }

+   }

+

+   /* if we get here, the parameters are OK */

+   return GL_FALSE;

+}

+

+

+/** Callback info for walking over FBO hash table */

+struct cb_info

+{

+   struct gl_context *ctx;

+   struct gl_texture_object *texObj;

+   GLuint level, face;

+};

+

+

+/**

+ * Check render to texture callback.  Called from _mesa_HashWalk().

+ */

+static void

+check_rtt_cb(GLuint key, void *data, void *userData)

+{

+   struct gl_framebuffer *fb = (struct gl_framebuffer *) data;

+   const struct cb_info *info = (struct cb_info *) userData;

+   struct gl_context *ctx = info->ctx;

+   const struct gl_texture_object *texObj = info->texObj;

+   const GLuint level = info->level, face = info->face;

+

+   /* If this is a user-created FBO */

+   if (fb->Name) {

+      GLuint i;

+      /* check if any of the FBO's attachments point to 'texObj' */

+      for (i = 0; i < BUFFER_COUNT; i++) {

+         struct gl_renderbuffer_attachment *att = fb->Attachment + i;

+         if (att->Type == GL_TEXTURE &&

+             att->Texture == texObj &&

+             att->TextureLevel == level &&

+             att->CubeMapFace == face) {

+            ASSERT(att->Texture->Image[att->CubeMapFace][att->TextureLevel]);

+            /* Tell driver about the new renderbuffer texture */

+            ctx->Driver.RenderTexture(ctx, ctx->DrawBuffer, att);

+            /* Mark fb status as indeterminate to force re-validation */

+            fb->_Status = 0;

+         }

+      }

+   }

+}

+

+

+/**

+ * When a texture image is specified we have to check if it's bound to

+ * any framebuffer objects (render to texture) in order to detect changes

+ * in size or format since that effects FBO completeness.

+ * Any FBOs rendering into the texture must be re-validated.

+ */

+static void

+update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj,

+                   GLuint face, GLuint level)

+{

+   /* Only check this texture if it's been marked as RenderToTexture */

+   if (texObj->_RenderToTexture) {

+      struct cb_info info;

+      info.ctx = ctx;

+      info.texObj = texObj;

+      info.level = level;

+      info.face = face;

+      _mesa_HashWalk(ctx->Shared->FrameBuffers, check_rtt_cb, &info);

+   }

+}

+

+

+/**

+ * If the texture object's GenerateMipmap flag is set and we've

+ * changed the texture base level image, regenerate the rest of the

+ * mipmap levels now.

+ */

+static INLINE void

+check_gen_mipmap(struct gl_context *ctx, GLenum target,

+                 struct gl_texture_object *texObj, GLint level)

+{

+   ASSERT(target != GL_TEXTURE_CUBE_MAP);

+   if (texObj->GenerateMipmap &&

+       level == texObj->BaseLevel &&

+       level < texObj->MaxLevel) {

+      ASSERT(ctx->Driver.GenerateMipmap);

+      ctx->Driver.GenerateMipmap(ctx, target, texObj);

+   }

+}

+

+

+/** Debug helper: override the user-requested internal format */

+static GLenum

+override_internal_format(GLenum internalFormat, GLint width, GLint height)

+{

+#if 0

+   if (internalFormat == GL_RGBA16F_ARB ||

+       internalFormat == GL_RGBA32F_ARB) {

+      printf("Convert rgba float tex to int %d x %d\n", width, height);

+      return GL_RGBA;

+   }

+   else if (internalFormat == GL_RGB16F_ARB ||

+            internalFormat == GL_RGB32F_ARB) {

+      printf("Convert rgb float tex to int %d x %d\n", width, height);

+      return GL_RGB;

+   }

+   else if (internalFormat == GL_LUMINANCE_ALPHA16F_ARB ||

+            internalFormat == GL_LUMINANCE_ALPHA32F_ARB) {

+      printf("Convert luminance float tex to int %d x %d\n", width, height);

+      return GL_LUMINANCE_ALPHA;

+   }

+   else if (internalFormat == GL_LUMINANCE16F_ARB ||

+            internalFormat == GL_LUMINANCE32F_ARB) {

+      printf("Convert luminance float tex to int %d x %d\n", width, height);

+      return GL_LUMINANCE;

+   }

+   else if (internalFormat == GL_ALPHA16F_ARB ||

+            internalFormat == GL_ALPHA32F_ARB) {

+      printf("Convert luminance float tex to int %d x %d\n", width, height);

+      return GL_ALPHA;

+   }

+   /*

+   else if (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {

+      internalFormat = GL_RGBA;

+   }

+   */

+   else {

+      return internalFormat;

+   }

+#else

+   return internalFormat;

+#endif

+}

+

+

+/**

+ * Choose the actual hardware format for a texture image.

+ * Try to use the same format as the previous image level when possible.

+ * Otherwise, ask the driver for the best format.

+ * It's important to try to choose a consistant format for all levels

+ * for efficient texture memory layout/allocation.  In particular, this

+ * comes up during automatic mipmap generation.

+ */

+gl_format

+_mesa_choose_texture_format(struct gl_context *ctx,

+                            struct gl_texture_object *texObj,

+                            GLenum target, GLint level,

+                            GLenum internalFormat, GLenum format, GLenum type)

+{

+   gl_format f;

+

+   /* see if we've already chosen a format for the previous level */

+   if (level > 0) {

+      struct gl_texture_image *prevImage =

+	 _mesa_select_tex_image(ctx, texObj, target, level - 1);

+      /* See if the prev level is defined and has an internal format which

+       * matches the new internal format.

+       */

+      if (prevImage &&

+          prevImage->Width > 0 &&

+          prevImage->InternalFormat == internalFormat) {

+         /* use the same format */

+         ASSERT(prevImage->TexFormat != MESA_FORMAT_NONE);

+         return prevImage->TexFormat;

+      }

+   }

+

+   /* choose format from scratch */

+   f = ctx->Driver.ChooseTextureFormat(ctx, internalFormat, format, type);

+   ASSERT(f != MESA_FORMAT_NONE);

+   return f;

+}

+

+

+/**

+ * Common code to implement all the glTexImage1D/2D/3D functions.

+ */

+static void

+teximage(struct gl_context *ctx, GLuint dims,

+         GLenum target, GLint level, GLint internalFormat,

+         GLsizei width, GLsizei height, GLsizei depth,

+         GLint border, GLenum format, GLenum type,

+         const GLvoid *pixels)

+{

+   GLboolean error;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glTexImage%uD %s %d %s %d %d %d %d %s %s %p\n",

+                  dims,

+                  _mesa_lookup_enum_by_nr(target), level,

+                  _mesa_lookup_enum_by_nr(internalFormat),

+                  width, height, depth, border,

+                  _mesa_lookup_enum_by_nr(format),

+                  _mesa_lookup_enum_by_nr(type), pixels);

+

+   internalFormat = override_internal_format(internalFormat, width, height);

+

+   /* target error checking */

+   if (!legal_teximage_target(ctx, dims, target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage%uD(target=%s)",

+                  dims, _mesa_lookup_enum_by_nr(target));

+      return;

+   }

+

+   /* general error checking */

+   error = texture_error_check(ctx, dims, target, level, internalFormat,

+                               format, type, width, height, depth, border);

+

+   if (_mesa_is_proxy_texture(target)) {

+      /* Proxy texture: just clear or set state depending on error checking */

+      struct gl_texture_image *texImage =

+         _mesa_get_proxy_tex_image(ctx, target, level);

+

+      if (error) {

+         /* when error, clear all proxy texture image parameters */

+         if (texImage)

+            clear_teximage_fields(texImage);

+      }

+      else {

+         /* no error, set the tex image parameters */

+         struct gl_texture_object *texObj =

+            _mesa_get_current_tex_object(ctx, target);

+         gl_format texFormat = _mesa_choose_texture_format(ctx, texObj,

+                                                           target, level,

+                                                           internalFormat,

+                                                           format, type);

+

+         if (legal_texture_size(ctx, texFormat, width, height, depth)) {

+            _mesa_init_teximage_fields(ctx, target, texImage, width, height,

+                                       depth, border, internalFormat,

+                                       texFormat);

+         }

+         else if (texImage) {

+            clear_teximage_fields(texImage);

+         }

+      }

+   }

+   else {

+      /* non-proxy target */

+      const GLuint face = _mesa_tex_target_to_face(target);

+      struct gl_texture_object *texObj;

+      struct gl_texture_image *texImage;

+

+      if (error) {

+         return;   /* error was recorded */

+      }

+

+      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)

+	 _mesa_update_state(ctx);

+

+      texObj = _mesa_get_current_tex_object(ctx, target);

+

+      _mesa_lock_texture(ctx, texObj);

+      {

+	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);

+

+	 if (!texImage) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims);

+	 }

+         else {

+            gl_format texFormat;

+

+            if (texImage->Data) {

+               ctx->Driver.FreeTexImageData( ctx, texImage );

+            }

+

+            ASSERT(texImage->Data == NULL);

+            texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,

+                                                    internalFormat, format,

+                                                    type);

+

+            if (legal_texture_size(ctx, texFormat, width, height, depth)) {

+               _mesa_init_teximage_fields(ctx, target, texImage,

+                                          width, height, depth,

+                                          border, internalFormat, texFormat);

+

+               /* Give the texture to the driver.  <pixels> may be null. */

+               ASSERT(ctx->Driver.TexImage3D);

+               switch (dims) {

+               case 1:

+                  ctx->Driver.TexImage1D(ctx, target, level, internalFormat,

+                                         width, border, format,

+                                         type, pixels, &ctx->Unpack, texObj,

+                                         texImage);

+                  break;

+               case 2:

+                  ctx->Driver.TexImage2D(ctx, target, level, internalFormat,

+                                         width, height, border, format,

+                                         type, pixels, &ctx->Unpack, texObj,

+                                         texImage);

+                  break;

+               case 3:

+                  ctx->Driver.TexImage3D(ctx, target, level, internalFormat,

+                                         width, height, depth, border, format,

+                                         type, pixels, &ctx->Unpack, texObj,

+                                         texImage);

+                  break;

+               default:

+                  _mesa_problem(ctx, "invalid dims=%u in teximage()", dims);

+               }

+

+               check_gen_mipmap(ctx, target, texObj, level);

+

+               update_fbo_texture(ctx, texObj, face, level);

+

+               /* state update */

+               texObj->_Complete = GL_FALSE;

+               ctx->NewState |= _NEW_TEXTURE;

+            }

+            else {

+               _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims);

+            }

+         }

+      }

+      _mesa_unlock_texture(ctx, texObj);

+   }

+}

+

+

+/*

+ * Called from the API.  Note that width includes the border.

+ */

+void GLAPIENTRY

+_mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,

+                  GLsizei width, GLint border, GLenum format,

+                  GLenum type, const GLvoid *pixels )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   teximage(ctx, 1, target, level, internalFormat, width, 1, 1,

+            border, format, type, pixels);

+}

+

+

+void GLAPIENTRY

+_mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,

+                  GLsizei width, GLsizei height, GLint border,

+                  GLenum format, GLenum type,

+                  const GLvoid *pixels )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   teximage(ctx, 2, target, level, internalFormat, width, height, 1,

+            border, format, type, pixels);

+}

+

+

+/*

+ * Called by the API or display list executor.

+ * Note that width and height include the border.

+ */

+void GLAPIENTRY

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

+   teximage(ctx, 3, target, level, internalFormat, width, height, depth,

+            border, format, type, pixels);

+}

+

+

+void GLAPIENTRY

+_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,

+                     GLsizei width, GLsizei height, GLsizei depth,

+                     GLint border, GLenum format, GLenum type,

+                     const GLvoid *pixels )

+{

+   _mesa_TexImage3D(target, level, (GLint) internalFormat, width, height,

+                    depth, border, format, type, pixels);

+}

+

+

+#if FEATURE_OES_EGL_image

+void GLAPIENTRY

+_mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (!ctx->Extensions.OES_EGL_image) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glEGLImageTargetTexture2DOES(unsupported)");

+      return;

+   }

+

+   if (target != GL_TEXTURE_2D) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+		  "glEGLImageTargetTexture2D(target=%d)", target);

+      return;

+   }

+

+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)

+      _mesa_update_state(ctx);

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+   _mesa_lock_texture(ctx, texObj);

+

+   texImage = _mesa_get_tex_image(ctx, texObj, target, 0);

+   if (!texImage) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glEGLImageTargetTexture2D");

+   } else {

+      if (texImage->Data)

+	 ctx->Driver.FreeTexImageData( ctx, texImage );

+

+      ASSERT(texImage->Data == NULL);

+      ctx->Driver.EGLImageTargetTexture2D(ctx, target,

+					  texObj, texImage, image);

+

+      /* state update */

+      texObj->_Complete = GL_FALSE;

+      ctx->NewState |= _NEW_TEXTURE;

+   }

+   _mesa_unlock_texture(ctx, texObj);

+

+}

+#endif

+

+

+

+/**

+ * Implement all the glTexSubImage1/2/3D() functions.

+ */

+static void

+texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,

+            GLint xoffset, GLint yoffset, GLint zoffset,

+            GLsizei width, GLsizei height, GLsizei depth,

+            GLenum format, GLenum type, const GLvoid *pixels )

+{

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glTexSubImage%uD %s %d %d %d %d %d %d %d %s %s %p\n",

+                  dims,

+                  _mesa_lookup_enum_by_nr(target), level,

+                  xoffset, yoffset, zoffset, width, height, depth,

+                  _mesa_lookup_enum_by_nr(format),

+                  _mesa_lookup_enum_by_nr(type), pixels);

+

+   /* check target (proxies not allowed) */

+   if (!legal_texsubimage_target(ctx, dims, target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexSubImage%uD(target=%s)",

+                  dims, _mesa_lookup_enum_by_nr(target));

+      return;

+   }       

+

+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)

+      _mesa_update_state(ctx);

+

+   if (subtexture_error_check(ctx, dims, target, level, xoffset, yoffset, zoffset,

+                              width, height, depth, format, type)) {

+      return;   /* error was detected */

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+

+   _mesa_lock_texture(ctx, texObj);

+   {

+      texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+

+      if (subtexture_error_check2(ctx, dims, target, level,

+                                  xoffset, yoffset, zoffset,

+				  width, height, depth,

+                                  format, type, texImage)) {

+         /* error was recorded */

+      }

+      else if (width > 0 && height > 0 && height > 0) {

+         /* If we have a border, offset=-1 is legal.  Bias by border width. */

+         switch (dims) {

+         case 3:

+            zoffset += texImage->Border;

+            /* fall-through */

+         case 2:

+            yoffset += texImage->Border;

+            /* fall-through */

+         case 1:

+            xoffset += texImage->Border;

+         }

+

+         switch (dims) {

+         case 1:

+            ctx->Driver.TexSubImage1D(ctx, target, level,

+                                      xoffset, width,

+                                      format, type, pixels,

+                                      &ctx->Unpack, texObj, texImage );

+            break;

+         case 2:

+            ctx->Driver.TexSubImage2D(ctx, target, level,

+                                      xoffset, yoffset, width, height,

+                                      format, type, pixels,

+                                      &ctx->Unpack, texObj, texImage );

+            break;

+         case 3:

+            ctx->Driver.TexSubImage3D(ctx, target, level,

+                                      xoffset, yoffset, zoffset,

+                                      width, height, depth,

+                                      format, type, pixels,

+                                      &ctx->Unpack, texObj, texImage );

+            break;

+         default:

+            _mesa_problem(ctx, "unexpected dims in subteximage()");

+         }

+

+         check_gen_mipmap(ctx, target, texObj, level);

+

+         ctx->NewState |= _NEW_TEXTURE;

+      }

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+void GLAPIENTRY

+_mesa_TexSubImage1D( GLenum target, GLint level,

+                     GLint xoffset, GLsizei width,

+                     GLenum format, GLenum type,

+                     const GLvoid *pixels )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   texsubimage(ctx, 1, target, level,

+               xoffset, 0, 0,

+               width, 1, 1,

+               format, type, pixels);

+}

+

+

+void GLAPIENTRY

+_mesa_TexSubImage2D( GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset,

+                     GLsizei width, GLsizei height,

+                     GLenum format, GLenum type,

+                     const GLvoid *pixels )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   texsubimage(ctx, 2, target, level,

+               xoffset, yoffset, 0,

+               width, height, 1,

+               format, type, pixels);

+}

+

+

+

+void GLAPIENTRY

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

+   texsubimage(ctx, 3, target, level,

+               xoffset, yoffset, zoffset,

+               width, height, depth,

+               format, type, pixels);

+}

+

+

+

+/**

+ * Implement the glCopyTexImage1/2D() functions.

+ */

+static void

+copyteximage(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;

+   const GLuint face = _mesa_tex_target_to_face(target);

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glCopyTexImage%uD %s %d %s %d %d %d %d %d\n",

+                  dims,

+                  _mesa_lookup_enum_by_nr(target), level,

+                  _mesa_lookup_enum_by_nr(internalFormat),

+                  x, y, width, height, border);

+

+   if (ctx->NewState & NEW_COPY_TEX_STATE)

+      _mesa_update_state(ctx);

+

+   if (copytexture_error_check(ctx, dims, target, level, internalFormat,

+                               width, height, border))

+      return;

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+

+   _mesa_lock_texture(ctx, texObj);

+   {

+      texImage = _mesa_get_tex_image(ctx, texObj, target, level);

+

+      if (!texImage) {

+	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);

+      }

+      else {

+         gl_format texFormat;

+

+         if (texImage->Data) {

+            ctx->Driver.FreeTexImageData( ctx, texImage );

+         }

+

+         ASSERT(texImage->Data == NULL);

+

+         texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,

+                                                 internalFormat, GL_NONE,

+                                                 GL_NONE);

+

+         if (legal_texture_size(ctx, texFormat, width, height, 1)) {

+            _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1,

+                                       border, internalFormat, texFormat);

+

+            ASSERT(ctx->Driver.CopyTexImage2D);

+            if (dims == 1)

+               ctx->Driver.CopyTexImage1D(ctx, target, level, internalFormat,

+                                          x, y, width, border);

+            else

+               ctx->Driver.CopyTexImage2D(ctx, target, level, internalFormat,

+                                          x, y, width, height, border);

+

+            check_gen_mipmap(ctx, target, texObj, level);

+

+            update_fbo_texture(ctx, texObj, face, level);

+

+            /* state update */

+            texObj->_Complete = GL_FALSE;

+            ctx->NewState |= _NEW_TEXTURE;

+         }

+         else {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);

+         }

+      }

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+

+void GLAPIENTRY

+_mesa_CopyTexImage1D( GLenum target, GLint level,

+                      GLenum internalFormat,

+                      GLint x, GLint y,

+                      GLsizei width, GLint border )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   copyteximage(ctx, 1, target, level, internalFormat, x, y, width, 1, border);

+}

+

+

+

+void GLAPIENTRY

+_mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,

+                      GLint x, GLint y, GLsizei width, GLsizei height,

+                      GLint border )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   copyteximage(ctx, 2, target, level, internalFormat,

+                x, y, width, height, border);

+}

+

+

+

+/**

+ * Implementation for glCopyTexSubImage1/2/3D() functions.

+ */

+static void

+copytexsubimage(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;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glCopyTexSubImage%uD %s %d %d %d %d %d %d %d %d\n",

+                  dims,

+                  _mesa_lookup_enum_by_nr(target),

+                  level, xoffset, yoffset, zoffset, x, y, width, height);

+

+   if (ctx->NewState & NEW_COPY_TEX_STATE)

+      _mesa_update_state(ctx);

+

+   if (copytexsubimage_error_check1(ctx, dims, target, level))

+      return;

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+

+   _mesa_lock_texture(ctx, texObj);

+   {

+      texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+

+      if (copytexsubimage_error_check2(ctx, dims, target, level, xoffset, yoffset,

+				       zoffset, width, height, texImage)) {

+         /* error was recored */

+      }

+      else {

+         /* If we have a border, offset=-1 is legal.  Bias by border width. */

+         switch (dims) {

+         case 3:

+            zoffset += texImage->Border;

+            /* fall-through */

+         case 2:

+            yoffset += texImage->Border;

+            /* fall-through */

+         case 1:

+            xoffset += texImage->Border;

+         }

+

+         if (_mesa_clip_copytexsubimage(ctx, &xoffset, &yoffset, &x, &y,

+                                        &width, &height)) {

+            switch (dims) {

+            case 1:

+               ctx->Driver.CopyTexSubImage1D(ctx, target, level,

+                                             xoffset, x, y, width);

+               break;

+            case 2:

+               ctx->Driver.CopyTexSubImage2D(ctx, target, level,

+                                             xoffset, yoffset,

+                                             x, y, width, height);

+               break;

+            case 3:

+               ctx->Driver.CopyTexSubImage3D(ctx, target, level,

+                                             xoffset, yoffset, zoffset,

+                                             x, y, width, height);

+               break;

+            default:

+               _mesa_problem(ctx, "bad dims in copytexsubimage()");

+            }

+

+            check_gen_mipmap(ctx, target, texObj, level);

+

+            ctx->NewState |= _NEW_TEXTURE;

+         }

+      }

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+void GLAPIENTRY

+_mesa_CopyTexSubImage1D( GLenum target, GLint level,

+                         GLint xoffset, GLint x, GLint y, GLsizei width )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   copytexsubimage(ctx, 1, target, level, xoffset, 0, 0, x, y, width, 1);

+}

+

+

+

+void GLAPIENTRY

+_mesa_CopyTexSubImage2D( GLenum target, GLint level,

+                         GLint xoffset, GLint yoffset,

+                         GLint x, GLint y, GLsizei width, GLsizei height )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   copytexsubimage(ctx, 2, target, level, xoffset, yoffset, 0, x, y,

+                   width, height);

+}

+

+

+

+void GLAPIENTRY

+_mesa_CopyTexSubImage3D( GLenum target, GLint level,

+                         GLint xoffset, GLint yoffset, GLint zoffset,

+                         GLint x, GLint y, GLsizei width, GLsizei height )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   copytexsubimage(ctx, 3, target, level, xoffset, yoffset, zoffset,

+                   x, y, width, height);

+}

+

+

+

+

+/**********************************************************************/

+/******                   Compressed Textures                    ******/

+/**********************************************************************/

+

+

+/**

+ * Return expected size of a compressed texture.

+ */

+static GLuint

+compressed_tex_size(GLsizei width, GLsizei height, GLsizei depth,

+                    GLenum glformat)

+{

+   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);

+   return _mesa_format_image_size(mesaFormat, width, height, depth);

+}

+

+

+/*

+ * Return compressed texture block size, in pixels.

+ */

+static void

+get_compressed_block_size(GLenum glformat, GLuint *bw, GLuint *bh)

+{

+   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);

+   _mesa_get_format_block_size(mesaFormat, bw, bh);

+}

+

+

+/**

+ * Error checking for glCompressedTexImage[123]D().

+ * \return error code or GL_NO_ERROR.

+ */

+static GLenum

+compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,

+                               GLenum target, GLint level,

+                               GLenum internalFormat, GLsizei width,

+                               GLsizei height, GLsizei depth, GLint border,

+                               GLsizei imageSize)

+{

+   const GLenum proxyTarget = get_proxy_target(target);

+   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);

+   GLint expectedSize;

+

+   /* check level */

+   if (level < 0 || level >= maxLevels)

+      return GL_INVALID_VALUE;

+

+   if (!target_can_be_compressed(ctx, target, internalFormat)) {

+      return GL_INVALID_ENUM;

+   }

+

+   /* This will detect any invalid internalFormat value */

+   if (!_mesa_is_compressed_format(ctx, internalFormat))

+      return GL_INVALID_ENUM;

+

+   /* This should really never fail */

+   if (_mesa_base_tex_format(ctx, internalFormat) < 0)

+      return GL_INVALID_ENUM;

+

+   /* No compressed formats support borders at this time */

+   if (border != 0)

+      return GL_INVALID_VALUE;

+

+   /* For cube map, width must equal height */

+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&

+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB && width != height)

+      return GL_INVALID_VALUE;

+

+   /* check image size against compression block size */

+   {

+      gl_format texFormat =

+         ctx->Driver.ChooseTextureFormat(ctx, internalFormat,

+                                         GL_NONE, GL_NONE);

+      GLuint bw, bh;

+

+      _mesa_get_format_block_size(texFormat, &bw, &bh);

+      if ((width > bw && width % bw > 0) ||

+          (height > bh && height % bh > 0)) {

+         /*

+          * Per GL_ARB_texture_compression:  GL_INVALID_OPERATION is

+          * generated [...] if any parameter combinations are not

+          * supported by the specific compressed internal format. 

+          */

+         return GL_INVALID_OPERATION;

+      }

+   }

+

+   /* check image sizes */

+   if (!ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level,

+                                      internalFormat, GL_NONE, GL_NONE,

+                                      width, height, depth, border)) {

+      /* See error comment above */

+      return GL_INVALID_OPERATION;

+   }

+

+   /* check image size in bytes */

+   expectedSize = compressed_tex_size(width, height, depth, internalFormat);

+   if (expectedSize != imageSize) {

+      /* Per GL_ARB_texture_compression:  GL_INVALID_VALUE is generated [...]

+       * if <imageSize> is not consistent with the format, dimensions, and

+       * contents of the specified image.

+       */

+      return GL_INVALID_VALUE;

+   }

+

+   return GL_NO_ERROR;

+}

+

+

+/**

+ * Error checking for glCompressedTexSubImage[123]D().

+ * \warning  There are some bad assumptions here about the size of compressed

+ *           texture tiles (multiple of 4) used to test the validity of the

+ *           offset and size parameters.

+ * \return error code or GL_NO_ERROR.

+ */

+static GLenum

+compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,

+                                  GLenum target, GLint level,

+                                  GLint xoffset, GLint yoffset, GLint zoffset,

+                                  GLsizei width, GLsizei height, GLsizei depth,

+                                  GLenum format, GLsizei imageSize)

+{

+   GLint expectedSize, maxLevels = 0, maxTextureSize;

+   GLuint bw, bh;

+   (void) zoffset;

+

+   if (dimensions == 1) {

+      /* 1D compressed textures not allowed */

+      return GL_INVALID_ENUM;

+   }

+   else if (dimensions == 2) {

+      if (target == GL_PROXY_TEXTURE_2D) {

+         maxLevels = ctx->Const.MaxTextureLevels;

+      }

+      else if (target == GL_TEXTURE_2D) {

+         maxLevels = ctx->Const.MaxTextureLevels;

+      }

+      else if (target == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {

+         if (!ctx->Extensions.ARB_texture_cube_map)

+            return GL_INVALID_ENUM; /*target*/

+         maxLevels = ctx->Const.MaxCubeTextureLevels;

+      }

+      else if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&

+               target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB) {

+         if (!ctx->Extensions.ARB_texture_cube_map)

+            return GL_INVALID_ENUM; /*target*/

+         maxLevels = ctx->Const.MaxCubeTextureLevels;

+      }

+      else {

+         return GL_INVALID_ENUM; /*target*/

+      }

+   }

+   else if (dimensions == 3) {

+      /* 3D compressed textures not allowed */

+      return GL_INVALID_ENUM;

+   }

+

+   maxTextureSize = 1 << (maxLevels - 1);

+

+   /* this will catch any invalid compressed format token */

+   if (!_mesa_is_compressed_format(ctx, format))

+      return GL_INVALID_ENUM;

+

+   if (width < 1 || width > maxTextureSize)

+      return GL_INVALID_VALUE;

+

+   if ((height < 1 || height > maxTextureSize)

+       && dimensions > 1)

+      return GL_INVALID_VALUE;

+

+   if (level < 0 || level >= maxLevels)

+      return GL_INVALID_VALUE;

+

+   /*

+    * do checks which depend on compression block size

+    */

+   get_compressed_block_size(format, &bw, &bh);

+

+   if ((xoffset % bw != 0) || (yoffset % bh != 0))

+      return GL_INVALID_VALUE;

+

+   if ((width % bw != 0) && width != 2 && width != 1)

+      return GL_INVALID_VALUE;

+

+   if ((height % bh != 0) && height != 2 && height != 1)

+      return GL_INVALID_VALUE;

+

+   expectedSize = compressed_tex_size(width, height, depth, format);

+   if (expectedSize != imageSize)

+      return GL_INVALID_VALUE;

+

+   return GL_NO_ERROR;

+}

+

+

+/**

+ * Do second part of glCompressedTexSubImage error checking.

+ * \return GL_TRUE if error found, GL_FALSE otherwise.

+ */

+static GLboolean

+compressed_subtexture_error_check2(struct gl_context *ctx, GLuint dims,

+                                   GLsizei width, GLsizei height,

+                                   GLsizei depth, GLenum format,

+                                   struct gl_texture_image *texImage)

+{

+

+   if ((GLint) format != texImage->InternalFormat) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glCompressedTexSubImage%uD(format=0x%x)", dims, format);

+      return GL_TRUE;

+   }

+

+   if (((width == 1 || width == 2) &&

+        width != (GLsizei) texImage->Width) ||

+       (width > (GLsizei) texImage->Width)) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glCompressedTexSubImage%uD(width=%d)", dims, width);

+      return GL_TRUE;

+   }

+

+   if (dims >= 2) {

+      if (((height == 1 || height == 2) &&

+           height != (GLsizei) texImage->Height) ||

+          (height > (GLsizei) texImage->Height)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCompressedTexSubImage%uD(height=%d)", dims, height);

+         return GL_TRUE;

+      }

+   }

+

+   if (dims >= 3) {

+      if (((depth == 1 || depth == 2) &&

+           depth != (GLsizei) texImage->Depth) ||

+          (depth > (GLsizei) texImage->Depth)) {

+         _mesa_error(ctx, GL_INVALID_VALUE,

+                     "glCompressedTexSubImage%uD(depth=%d)", dims, depth);

+         return GL_TRUE;

+      }

+   }

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Implementation of the glCompressedTexImage1/2/3D() functions.

+ */

+static void

+compressedteximage(struct gl_context *ctx, GLuint dims,

+                   GLenum target, GLint level,

+                   GLenum internalFormat, GLsizei width,

+                   GLsizei height, GLsizei depth, GLint border,

+                   GLsizei imageSize, const GLvoid *data)

+{

+   GLenum error;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx,

+                  "glCompressedTexImage%uDARB %s %d %s %d %d %d %d %d %p\n",

+                  dims,

+                  _mesa_lookup_enum_by_nr(target), level,

+                  _mesa_lookup_enum_by_nr(internalFormat),

+                  width, height, depth, border, imageSize, data);

+

+   /* check target */

+   if (!legal_teximage_target(ctx, dims, target)) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage%uD(target=%s)",

+                  dims, _mesa_lookup_enum_by_nr(target));

+      return;

+   }

+

+   error = compressed_texture_error_check(ctx, dims, target, level,

+                                          internalFormat, width, height, depth,

+                                          border, imageSize);

+

+#if FEATURE_ES

+   /* XXX this is kind of a hack */

+   if (error) {

+      _mesa_error(ctx, error, "glTexImage2D");

+      return;

+   }

+

+   if (dims == 2) {

+      switch (internalFormat) {

+      case GL_PALETTE4_RGB8_OES:

+      case GL_PALETTE4_RGBA8_OES:

+      case GL_PALETTE4_R5_G6_B5_OES:

+      case GL_PALETTE4_RGBA4_OES:

+      case GL_PALETTE4_RGB5_A1_OES:

+      case GL_PALETTE8_RGB8_OES:

+      case GL_PALETTE8_RGBA8_OES:

+      case GL_PALETTE8_R5_G6_B5_OES:

+      case GL_PALETTE8_RGBA4_OES:

+      case GL_PALETTE8_RGB5_A1_OES:

+         _mesa_cpal_compressed_teximage2d(target, level, internalFormat,

+                                          width, height, imageSize, data);

+         return;

+      }

+   }

+#endif

+

+   if (_mesa_is_proxy_texture(target)) {

+      /* Proxy texture: just check for errors and update proxy state */

+      struct gl_texture_image *texImage;

+

+      if (!error) {

+         struct gl_texture_object *texObj =

+            _mesa_get_current_tex_object(ctx, target);

+         gl_format texFormat =

+            _mesa_choose_texture_format(ctx, texObj, target, level,

+                                        internalFormat, GL_NONE, GL_NONE);

+         if (!legal_texture_size(ctx, texFormat, width, height, depth)) {

+            error = GL_OUT_OF_MEMORY;

+         }

+      }

+

+      texImage = _mesa_get_proxy_tex_image(ctx, target, level);

+      if (texImage) {

+         if (error) {

+            /* if error, clear all proxy texture image parameters */

+            clear_teximage_fields(texImage);

+         }

+         else {

+            /* no error: store the teximage parameters */

+            _mesa_init_teximage_fields(ctx, target, texImage, width, height,

+                                       depth, border, internalFormat,

+                                       MESA_FORMAT_NONE);

+         }

+      }

+   }

+   else {

+      /* non-proxy target */

+      struct gl_texture_object *texObj;

+      struct gl_texture_image *texImage;

+

+      if (error) {

+         _mesa_error(ctx, error, "glCompressedTexImage%uD", dims);

+         return;

+      }

+

+      texObj = _mesa_get_current_tex_object(ctx, target);

+

+      _mesa_lock_texture(ctx, texObj);

+      {

+	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);

+	 if (!texImage) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                        "glCompressedTexImage%uD", dims);

+	 }

+         else {

+            gl_format texFormat;

+

+            if (texImage->Data) {

+               ctx->Driver.FreeTexImageData( ctx, texImage );

+            }

+            ASSERT(texImage->Data == NULL);

+

+            texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,

+                                                    internalFormat, GL_NONE,

+                                                    GL_NONE);

+

+            if (legal_texture_size(ctx, texFormat, width, height, depth)) {

+               _mesa_init_teximage_fields(ctx, target, texImage,

+                                          width, height, depth,

+                                          border, internalFormat, texFormat);

+

+               switch (dims) {

+               case 1:

+                  ASSERT(ctx->Driver.CompressedTexImage1D);

+                  ctx->Driver.CompressedTexImage1D(ctx, target, level,

+                                                   internalFormat,

+                                                   width,

+                                                   border, imageSize, data,

+                                                   texObj, texImage);

+                  break;

+               case 2:

+                  ASSERT(ctx->Driver.CompressedTexImage2D);

+                  ctx->Driver.CompressedTexImage2D(ctx, target, level,

+                                                   internalFormat,

+                                                   width, height,

+                                                   border, imageSize, data,

+                                                   texObj, texImage);

+                  break;

+               case 3:

+                  ASSERT(ctx->Driver.CompressedTexImage3D);

+                  ctx->Driver.CompressedTexImage3D(ctx, target, level,

+                                                   internalFormat,

+                                                   width, height, depth,

+                                                   border, imageSize, data,

+                                                   texObj, texImage);

+                  break;

+               default:

+                  _mesa_problem(ctx, "bad dims in compressedteximage");

+               }

+

+               check_gen_mipmap(ctx, target, texObj, level);

+

+               /* state update */

+               texObj->_Complete = GL_FALSE;

+               ctx->NewState |= _NEW_TEXTURE;

+            }

+            else {

+               _mesa_error(ctx, GL_OUT_OF_MEMORY,

+                           "glCompressedTexImage%uD", dims);

+            }

+         }

+      }

+      _mesa_unlock_texture(ctx, texObj);

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_CompressedTexImage1DARB(GLenum target, GLint level,

+                              GLenum internalFormat, GLsizei width,

+                              GLint border, GLsizei imageSize,

+                              const GLvoid *data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   compressedteximage(ctx, 1, target, level, internalFormat,

+                      width, 1, 1, border, imageSize, data);

+}

+

+

+void GLAPIENTRY

+_mesa_CompressedTexImage2DARB(GLenum target, GLint level,

+                              GLenum internalFormat, GLsizei width,

+                              GLsizei height, GLint border, GLsizei imageSize,

+                              const GLvoid *data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   compressedteximage(ctx, 2, target, level, internalFormat,

+                      width, height, 1, border, imageSize, data);

+}

+

+

+void GLAPIENTRY

+_mesa_CompressedTexImage3DARB(GLenum target, GLint level,

+                              GLenum internalFormat, GLsizei width,

+                              GLsizei height, GLsizei depth, GLint border,

+                              GLsizei imageSize, const GLvoid *data)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   compressedteximage(ctx, 3, target, level, internalFormat,

+                      width, height, depth, border, imageSize, data);

+}

+

+

+/**

+ * Common helper for glCompressedTexSubImage1/2/3D().

+ */

+static void

+compressed_tex_sub_image(GLuint dims, 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;

+   GLenum error;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   error = compressed_subtexture_error_check(ctx, dims, target, level,

+                                             xoffset, 0, 0, /* pos */

+                                             width, height, depth,   /* size */

+                                             format, imageSize);

+   if (error) {

+      _mesa_error(ctx, error, "glCompressedTexSubImage%uD", dims);

+      return;

+   }

+

+   texObj = _mesa_get_current_tex_object(ctx, target);

+

+   _mesa_lock_texture(ctx, texObj);

+   {

+      texImage = _mesa_select_tex_image(ctx, texObj, target, level);

+      assert(texImage);

+

+      if (compressed_subtexture_error_check2(ctx, dims, width, height, depth,

+                                             format, texImage)) {

+         /* error was recorded */

+      }

+      else if (width > 0 && height > 0 && depth > 0) {

+         switch (dims) {

+         case 1:

+            if (ctx->Driver.CompressedTexSubImage1D) {

+               ctx->Driver.CompressedTexSubImage1D(ctx, target, level,

+                                                   xoffset, width,

+                                                   format, imageSize, data,

+                                                   texObj, texImage);

+            }

+            break;

+         case 2:

+            if (ctx->Driver.CompressedTexSubImage2D) {

+               ctx->Driver.CompressedTexSubImage2D(ctx, target, level,

+                                                   xoffset, yoffset,

+                                                   width, height,

+                                                   format, imageSize, data,

+                                                   texObj, texImage);

+            }

+            break;

+         case 3:

+            if (ctx->Driver.CompressedTexSubImage3D) {

+               ctx->Driver.CompressedTexSubImage3D(ctx, target, level,

+                                                   xoffset, yoffset, zoffset,

+                                                   width, height, depth,

+                                                   format, imageSize, data,

+                                                   texObj, texImage);

+            }

+            break;

+         default:

+            ;

+         }

+

+         check_gen_mipmap(ctx, target, texObj, level);

+

+         ctx->NewState |= _NEW_TEXTURE;

+      }

+   }

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+void GLAPIENTRY

+_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,

+                                 GLsizei width, GLenum format,

+                                 GLsizei imageSize, const GLvoid *data)

+{

+   compressed_tex_sub_image(1, target, level, xoffset, 0, 0, width, 1, 1,

+                            format, imageSize, data);

+}

+

+

+void GLAPIENTRY

+_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,

+                                 GLint yoffset, GLsizei width, GLsizei height,

+                                 GLenum format, GLsizei imageSize,

+                                 const GLvoid *data)

+{

+   compressed_tex_sub_image(2, target, level, xoffset, yoffset, 0,

+                            width, height, 1, format, imageSize, data);

+}

+

+

+void GLAPIENTRY

+_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,

+                                 GLint yoffset, GLint zoffset, GLsizei width,

+                                 GLsizei height, GLsizei depth, GLenum format,

+                                 GLsizei imageSize, const GLvoid *data)

+{

+   compressed_tex_sub_image(3, target, level, xoffset, yoffset, zoffset,

+                            width, height, depth, format, imageSize, data);

+}

diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index 0dcacab3c..e65f3cea4 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -1,273 +1,274 @@
-/**
- * \file teximage.h
- * Texture images manipulation functions.
- */
-
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 TEXIMAGE_H
-#define TEXIMAGE_H
-
-
-#include "mtypes.h"
-
-
-extern void *
-_mesa_alloc_texmemory(GLsizei bytes);
-
-extern void
-_mesa_free_texmemory(void *m);
-
-
-/** \name Internal functions */
-/*@{*/
-
-extern GLint
-_mesa_base_tex_format( GLcontext *ctx, GLint internalFormat );
-
-
-extern GLboolean
-_mesa_is_proxy_texture(GLenum target);
-
-
-extern struct gl_texture_image *
-_mesa_new_texture_image( GLcontext *ctx );
-
-
-extern void
-_mesa_delete_texture_image( GLcontext *ctx, struct gl_texture_image *teximage );
-
-extern void
-_mesa_free_texture_image_data( GLcontext *ctx, 
-			       struct gl_texture_image *texImage );
-
-
-extern void
-_mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
-                           struct gl_texture_image *img,
-                           GLsizei width, GLsizei height, GLsizei depth,
-                           GLint border, GLenum internalFormat);
-
-
-extern void
-_mesa_choose_texture_format(GLcontext *ctx,
-                            struct gl_texture_object *texObj,
-                            struct gl_texture_image *texImage,
-                            GLenum target, GLint level,
-                            GLenum internalFormat, GLenum format, GLenum type);
-
-
-extern void
-_mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage);
-
-
-extern void
-_mesa_set_tex_image(struct gl_texture_object *tObj,
-                    GLenum target, GLint level,
-                    struct gl_texture_image *texImage);
-
-
-extern struct gl_texture_object *
-_mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
-                        GLenum target);
-
-extern struct gl_texture_object *
-_mesa_get_current_tex_object(GLcontext *ctx, GLenum target);
-
-
-extern struct gl_texture_image *
-_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
-                       GLenum target, GLint level);
-
-
-extern struct gl_texture_image *
-_mesa_get_tex_image(GLcontext *ctx, struct gl_texture_object *texObj,
-                    GLenum target, GLint level);
-
-
-extern struct gl_texture_image *
-_mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level);
-
-
-extern GLint
-_mesa_max_texture_levels(GLcontext *ctx, GLenum target);
-
-
-extern GLboolean
-_mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
-                         GLint internalFormat, GLenum format, GLenum type,
-                         GLint width, GLint height, GLint depth, GLint border);
-
-
-extern GLuint
-_mesa_tex_target_to_face(GLenum target);
-
-
-/**
- * Lock a texture for updating.  See also _mesa_lock_context_textures().
- */
-static INLINE void
-_mesa_lock_texture(GLcontext *ctx, struct gl_texture_object *texObj)
-{
-   _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);
-   ctx->Shared->TextureStateStamp++;
-   (void) texObj;
-}
-
-static INLINE void
-_mesa_unlock_texture(GLcontext *ctx, struct gl_texture_object *texObj)
-{
-   _glthread_UNLOCK_MUTEX(ctx->Shared->TexMutex);
-}
-
-/*@}*/
-
-
-/** \name API entry point functions */
-/*@{*/
-
-extern void GLAPIENTRY
-_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,
-                  GLsizei width, GLint border,
-                  GLenum format, GLenum type, const GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,
-                  GLsizei width, GLsizei height, GLint border,
-                  GLenum format, GLenum type, const GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,
-                  GLsizei width, GLsizei height, GLsizei depth, GLint border,
-                  GLenum format, GLenum type, const GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLint border, GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-extern void GLAPIENTRY
-_mesa_EGLImageTargetTexture2DOES( GLenum target, GLeglImageOES image );
-
-extern void GLAPIENTRY
-_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
-                     GLsizei width,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_TexSubImage2D( GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset,
-                     GLsizei width, GLsizei height,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_TexSubImage3D( GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset, GLint zoffset,
-                     GLsizei width, GLsizei height, GLsizei depth,
-                     GLenum format, GLenum type,
-                     const GLvoid *pixels );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat,
-                      GLint x, GLint y, GLsizei width, GLint border );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexImage2D( GLenum target, GLint level,
-                      GLenum internalformat, GLint x, GLint y,
-                      GLsizei width, GLsizei height, GLint border );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
-                         GLint x, GLint y, GLsizei width );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage2D( GLenum target, GLint level,
-                         GLint xoffset, GLint yoffset,
-                         GLint x, GLint y, GLsizei width, GLsizei height );
-
-
-extern void GLAPIENTRY
-_mesa_CopyTexSubImage3D( GLenum target, GLint level,
-                         GLint xoffset, GLint yoffset, GLint zoffset,
-                         GLint x, GLint y, GLsizei width, GLsizei height );
-
-
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
-                              GLenum internalformat, GLsizei width,
-                              GLint border, GLsizei imageSize,
-                              const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
-                              GLenum internalformat, GLsizei width,
-                              GLsizei height, GLint border, GLsizei imageSize,
-                              const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
-                              GLenum internalformat, GLsizei width,
-                              GLsizei height, GLsizei depth, GLint border,
-                              GLsizei imageSize, const GLvoid *data);
-
-#ifdef VMS
-#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR
-#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
-#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
-#endif
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
-                                 GLsizei width, GLenum format,
-                                 GLsizei imageSize, const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLsizei width, GLsizei height,
-                                 GLenum format, GLsizei imageSize,
-                                 const GLvoid *data);
-
-extern void GLAPIENTRY
-_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
-                                 GLint yoffset, GLint zoffset, GLsizei width,
-                                 GLsizei height, GLsizei depth, GLenum format,
-                                 GLsizei imageSize, const GLvoid *data);
-
-/*@}*/
-
-#endif
+/**

+ * \file teximage.h

+ * Texture images manipulation functions.

+ */

+

+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 TEXIMAGE_H

+#define TEXIMAGE_H

+

+

+#include "mtypes.h"

+#include "formats.h"

+

+

+extern void *

+_mesa_alloc_texmemory(GLsizei bytes);

+

+extern void

+_mesa_free_texmemory(void *m);

+

+

+/** \name Internal functions */

+/*@{*/

+

+extern GLint

+_mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat );

+

+

+extern GLboolean

+_mesa_is_proxy_texture(GLenum target);

+

+

+extern struct gl_texture_image *

+_mesa_new_texture_image( struct gl_context *ctx );

+

+

+extern void

+_mesa_delete_texture_image( struct gl_context *ctx, struct gl_texture_image *teximage );

+

+extern void

+_mesa_free_texture_image_data( struct gl_context *ctx, 

+			       struct gl_texture_image *texImage );

+

+

+extern void

+_mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,

+                           struct gl_texture_image *img,

+                           GLsizei width, GLsizei height, GLsizei depth,

+                           GLint border, GLenum internalFormat,

+                           gl_format format);

+

+

+extern gl_format

+_mesa_choose_texture_format(struct gl_context *ctx,

+                            struct gl_texture_object *texObj,

+                            GLenum target, GLint level,

+                            GLenum internalFormat, GLenum format, GLenum type);

+

+

+extern void

+_mesa_clear_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage);

+

+

+extern void

+_mesa_set_tex_image(struct gl_texture_object *tObj,

+                    GLenum target, GLint level,

+                    struct gl_texture_image *texImage);

+

+

+extern struct gl_texture_object *

+_mesa_select_tex_object(struct gl_context *ctx, const struct gl_texture_unit *texUnit,

+                        GLenum target);

+

+extern struct gl_texture_object *

+_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target);

+

+

+extern struct gl_texture_image *

+_mesa_select_tex_image(struct gl_context *ctx, const struct gl_texture_object *texObj,

+                       GLenum target, GLint level);

+

+

+extern struct gl_texture_image *

+_mesa_get_tex_image(struct gl_context *ctx, struct gl_texture_object *texObj,

+                    GLenum target, GLint level);

+

+

+extern struct gl_texture_image *

+_mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level);

+

+

+extern GLint

+_mesa_max_texture_levels(struct gl_context *ctx, GLenum target);

+

+

+extern GLboolean

+_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,

+                         GLint internalFormat, GLenum format, GLenum type,

+                         GLint width, GLint height, GLint depth, GLint border);

+

+

+extern GLuint

+_mesa_tex_target_to_face(GLenum target);

+

+

+/**

+ * Lock a texture for updating.  See also _mesa_lock_context_textures().

+ */

+static INLINE void

+_mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)

+{

+   _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);

+   ctx->Shared->TextureStateStamp++;

+   (void) texObj;

+}

+

+static INLINE void

+_mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)

+{

+   _glthread_UNLOCK_MUTEX(ctx->Shared->TexMutex);

+}

+

+/*@}*/

+

+

+/** \name API entry point functions */

+/*@{*/

+

+extern void GLAPIENTRY

+_mesa_TexImage1D( GLenum target, GLint level, GLint internalformat,

+                  GLsizei width, GLint border,

+                  GLenum format, GLenum type, const GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,

+                  GLsizei width, GLsizei height, GLint border,

+                  GLenum format, GLenum type, const GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,

+                  GLsizei width, GLsizei height, GLsizei depth, GLint border,

+                  GLenum format, GLenum type, const GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,

+                     GLsizei width, GLsizei height, GLsizei depth,

+                     GLint border, GLenum format, GLenum type,

+                     const GLvoid *pixels );

+

+extern void GLAPIENTRY

+_mesa_EGLImageTargetTexture2DOES( GLenum target, GLeglImageOES image );

+

+extern void GLAPIENTRY

+_mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,

+                     GLsizei width,

+                     GLenum format, GLenum type,

+                     const GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_TexSubImage2D( GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset,

+                     GLsizei width, GLsizei height,

+                     GLenum format, GLenum type,

+                     const GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_TexSubImage3D( GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset, GLint zoffset,

+                     GLsizei width, GLsizei height, GLsizei depth,

+                     GLenum format, GLenum type,

+                     const GLvoid *pixels );

+

+

+extern void GLAPIENTRY

+_mesa_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat,

+                      GLint x, GLint y, GLsizei width, GLint border );

+

+

+extern void GLAPIENTRY

+_mesa_CopyTexImage2D( GLenum target, GLint level,

+                      GLenum internalformat, GLint x, GLint y,

+                      GLsizei width, GLsizei height, GLint border );

+

+

+extern void GLAPIENTRY

+_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,

+                         GLint x, GLint y, GLsizei width );

+

+

+extern void GLAPIENTRY

+_mesa_CopyTexSubImage2D( GLenum target, GLint level,

+                         GLint xoffset, GLint yoffset,

+                         GLint x, GLint y, GLsizei width, GLsizei height );

+

+

+extern void GLAPIENTRY

+_mesa_CopyTexSubImage3D( GLenum target, GLint level,

+                         GLint xoffset, GLint yoffset, GLint zoffset,

+                         GLint x, GLint y, GLsizei width, GLsizei height );

+

+

+

+extern void GLAPIENTRY

+_mesa_CompressedTexImage1DARB(GLenum target, GLint level,

+                              GLenum internalformat, GLsizei width,

+                              GLint border, GLsizei imageSize,

+                              const GLvoid *data);

+

+extern void GLAPIENTRY

+_mesa_CompressedTexImage2DARB(GLenum target, GLint level,

+                              GLenum internalformat, GLsizei width,

+                              GLsizei height, GLint border, GLsizei imageSize,

+                              const GLvoid *data);

+

+extern void GLAPIENTRY

+_mesa_CompressedTexImage3DARB(GLenum target, GLint level,

+                              GLenum internalformat, GLsizei width,

+                              GLsizei height, GLsizei depth, GLint border,

+                              GLsizei imageSize, const GLvoid *data);

+

+#ifdef VMS

+#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR

+#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR

+#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR

+#endif

+extern void GLAPIENTRY

+_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,

+                                 GLsizei width, GLenum format,

+                                 GLsizei imageSize, const GLvoid *data);

+

+extern void GLAPIENTRY

+_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,

+                                 GLint yoffset, GLsizei width, GLsizei height,

+                                 GLenum format, GLsizei imageSize,

+                                 const GLvoid *data);

+

+extern void GLAPIENTRY

+_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,

+                                 GLint yoffset, GLint zoffset, GLsizei width,

+                                 GLsizei height, GLsizei depth, GLenum format,

+                                 GLsizei imageSize, const GLvoid *data);

+

+/*@}*/

+

+#endif

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 1df165cf6..6a038514b 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -1,1236 +1,1258 @@
-/**
- * \file texobj.c
- * Texture object management.
- */
-
-/*
- * 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 "mfeatures.h"
-#include "colortab.h"
-#include "context.h"
-#include "enums.h"
-#include "fbobject.h"
-#include "formats.h"
-#include "hash.h"
-#include "imports.h"
-#include "macros.h"
-#include "teximage.h"
-#include "texobj.h"
-#include "mtypes.h"
-#include "program/prog_instruction.h"
-
-
-
-/**********************************************************************/
-/** \name Internal functions */
-/*@{*/
-
-
-/**
- * Return the gl_texture_object for a given ID.
- */
-struct gl_texture_object *
-_mesa_lookup_texture(GLcontext *ctx, GLuint id)
-{
-   return (struct gl_texture_object *)
-      _mesa_HashLookup(ctx->Shared->TexObjects, id);
-}
-
-
-
-/**
- * Allocate and initialize a new texture object.  But don't put it into the
- * texture object hash table.
- *
- * Called via ctx->Driver.NewTextureObject, unless overridden by a device
- * driver.
- * 
- * \param shared the shared GL state structure to contain the texture object
- * \param name integer name for the texture object
- * \param target either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D,
- * GL_TEXTURE_CUBE_MAP_ARB or GL_TEXTURE_RECTANGLE_NV.  zero is ok for the sake
- * of GenTextures()
- *
- * \return pointer to new texture object.
- */
-struct gl_texture_object *
-_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target )
-{
-   struct gl_texture_object *obj;
-   (void) ctx;
-   obj = MALLOC_STRUCT(gl_texture_object);
-   _mesa_initialize_texture_object(obj, name, target);
-   return obj;
-}
-
-
-/**
- * Initialize a new texture object to default values.
- * \param obj  the texture object
- * \param name  the texture name
- * \param target  the texture target
- */
-void
-_mesa_initialize_texture_object( struct gl_texture_object *obj,
-                                 GLuint name, GLenum target )
-{
-   ASSERT(target == 0 ||
-          target == GL_TEXTURE_1D ||
-          target == GL_TEXTURE_2D ||
-          target == GL_TEXTURE_3D ||
-          target == GL_TEXTURE_CUBE_MAP_ARB ||
-          target == GL_TEXTURE_RECTANGLE_NV ||
-          target == GL_TEXTURE_1D_ARRAY_EXT ||
-          target == GL_TEXTURE_2D_ARRAY_EXT);
-
-   memset(obj, 0, sizeof(*obj));
-   /* init the non-zero fields */
-   _glthread_INIT_MUTEX(obj->Mutex);
-   obj->RefCount = 1;
-   obj->Name = name;
-   obj->Target = target;
-   obj->Priority = 1.0F;
-   if (target == GL_TEXTURE_RECTANGLE_NV) {
-      obj->WrapS = GL_CLAMP_TO_EDGE;
-      obj->WrapT = GL_CLAMP_TO_EDGE;
-      obj->WrapR = GL_CLAMP_TO_EDGE;
-      obj->MinFilter = GL_LINEAR;
-   }
-   else {
-      obj->WrapS = GL_REPEAT;
-      obj->WrapT = GL_REPEAT;
-      obj->WrapR = GL_REPEAT;
-      obj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;
-   }
-   obj->MagFilter = GL_LINEAR;
-   obj->MinLod = -1000.0;
-   obj->MaxLod = 1000.0;
-   obj->LodBias = 0.0;
-   obj->BaseLevel = 0;
-   obj->MaxLevel = 1000;
-   obj->MaxAnisotropy = 1.0;
-   obj->CompareMode = GL_NONE;         /* ARB_shadow */
-   obj->CompareFunc = GL_LEQUAL;       /* ARB_shadow */
-   obj->CompareFailValue = 0.0F;       /* ARB_shadow_ambient */
-   obj->DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */
-   obj->Swizzle[0] = GL_RED;
-   obj->Swizzle[1] = GL_GREEN;
-   obj->Swizzle[2] = GL_BLUE;
-   obj->Swizzle[3] = GL_ALPHA;
-   obj->_Swizzle = SWIZZLE_NOOP;
-}
-
-
-/**
- * Some texture initialization can't be finished until we know which
- * target it's getting bound to (GL_TEXTURE_1D/2D/etc).
- */
-static void
-finish_texture_init(GLcontext *ctx, GLenum target,
-                    struct gl_texture_object *obj)
-{
-   assert(obj->Target == 0);
-
-   if (target == GL_TEXTURE_RECTANGLE_NV) {
-      /* have to init wrap and filter state here - kind of klunky */
-      obj->WrapS = GL_CLAMP_TO_EDGE;
-      obj->WrapT = GL_CLAMP_TO_EDGE;
-      obj->WrapR = GL_CLAMP_TO_EDGE;
-      obj->MinFilter = GL_LINEAR;
-      if (ctx->Driver.TexParameter) {
-         static const GLfloat fparam_wrap[1] = {(GLfloat) GL_CLAMP_TO_EDGE};
-         static const GLfloat fparam_filter[1] = {(GLfloat) GL_LINEAR};
-         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_S, fparam_wrap);
-         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_T, fparam_wrap);
-         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_R, fparam_wrap);
-         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_MIN_FILTER, fparam_filter);
-      }
-   }
-}
-
-
-/**
- * Deallocate a texture object struct.  It should have already been
- * removed from the texture object pool.
- * Called via ctx->Driver.DeleteTexture() if not overriden by a driver.
- *
- * \param shared the shared GL state to which the object belongs.
- * \param texObj the texture object to delete.
- */
-void
-_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
-{
-   GLuint i, face;
-
-   (void) ctx;
-
-   /* Set Target to an invalid value.  With some assertions elsewhere
-    * we can try to detect possible use of deleted textures.
-    */
-   texObj->Target = 0x99;
-
-   _mesa_free_colortable_data(&texObj->Palette);
-
-   /* free the texture images */
-   for (face = 0; face < 6; face++) {
-      for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
-	 if (texObj->Image[face][i]) {
-	    _mesa_delete_texture_image( ctx, texObj->Image[face][i] );
-	 }
-      }
-   }
-
-   /* destroy the mutex -- it may have allocated memory (eg on bsd) */
-   _glthread_DESTROY_MUTEX(texObj->Mutex);
-
-   /* free this object */
-   free(texObj);
-}
-
-
-
-
-/**
- * Copy texture object state from one texture object to another.
- * Use for glPush/PopAttrib.
- *
- * \param dest destination texture object.
- * \param src source texture object.
- */
-void
-_mesa_copy_texture_object( struct gl_texture_object *dest,
-                           const struct gl_texture_object *src )
-{
-   dest->Target = src->Target;
-   dest->Name = src->Name;
-   dest->Priority = src->Priority;
-   dest->BorderColor.f[0] = src->BorderColor.f[0];
-   dest->BorderColor.f[1] = src->BorderColor.f[1];
-   dest->BorderColor.f[2] = src->BorderColor.f[2];
-   dest->BorderColor.f[3] = src->BorderColor.f[3];
-   dest->WrapS = src->WrapS;
-   dest->WrapT = src->WrapT;
-   dest->WrapR = src->WrapR;
-   dest->MinFilter = src->MinFilter;
-   dest->MagFilter = src->MagFilter;
-   dest->MinLod = src->MinLod;
-   dest->MaxLod = src->MaxLod;
-   dest->LodBias = src->LodBias;
-   dest->BaseLevel = src->BaseLevel;
-   dest->MaxLevel = src->MaxLevel;
-   dest->MaxAnisotropy = src->MaxAnisotropy;
-   dest->CompareMode = src->CompareMode;
-   dest->CompareFunc = src->CompareFunc;
-   dest->CompareFailValue = src->CompareFailValue;
-   dest->DepthMode = src->DepthMode;
-   dest->_MaxLevel = src->_MaxLevel;
-   dest->_MaxLambda = src->_MaxLambda;
-   dest->GenerateMipmap = src->GenerateMipmap;
-   dest->Palette = src->Palette;
-   dest->_Complete = src->_Complete;
-   COPY_4V(dest->Swizzle, src->Swizzle);
-   dest->_Swizzle = src->_Swizzle;
-}
-
-
-/**
- * Clear all texture images of the given texture object.
- *
- * \param ctx GL context.
- * \param t texture object.
- *
- * \sa _mesa_clear_texture_image().
- */
-void
-_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *texObj)
-{
-   GLuint i, j;
-
-   if (texObj->Target == 0)
-      return;
-
-   for (i = 0; i < MAX_FACES; i++) {
-      for (j = 0; j < MAX_TEXTURE_LEVELS; j++) {
-         struct gl_texture_image *texImage = texObj->Image[i][j];
-         if (texImage)
-            _mesa_clear_texture_image(ctx, texImage);
-      }
-   }
-}
-
-
-/**
- * Check if the given texture object is valid by examining its Target field.
- * For debugging only.
- */
-static GLboolean
-valid_texture_object(const struct gl_texture_object *tex)
-{
-   switch (tex->Target) {
-   case 0:
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_3D:
-   case GL_TEXTURE_CUBE_MAP_ARB:
-   case GL_TEXTURE_RECTANGLE_NV:
-   case GL_TEXTURE_1D_ARRAY_EXT:
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      return GL_TRUE;
-   case 0x99:
-      _mesa_problem(NULL, "invalid reference to a deleted texture object");
-      return GL_FALSE;
-   default:
-      _mesa_problem(NULL, "invalid texture object Target 0x%x, Id = %u",
-                    tex->Target, tex->Name);
-      return GL_FALSE;
-   }
-}
-
-
-/**
- * Reference (or unreference) a texture object.
- * If '*ptr', decrement *ptr's refcount (and delete if it becomes zero).
- * If 'tex' is non-null, increment its refcount.
- */
-void
-_mesa_reference_texobj(struct gl_texture_object **ptr,
-                       struct gl_texture_object *tex)
-{
-   assert(ptr);
-   if (*ptr == tex) {
-      /* no change */
-      return;
-   }
-
-   if (*ptr) {
-      /* Unreference the old texture */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_texture_object *oldTex = *ptr;
-
-      ASSERT(valid_texture_object(oldTex));
-
-      _glthread_LOCK_MUTEX(oldTex->Mutex);
-      ASSERT(oldTex->RefCount > 0);
-      oldTex->RefCount--;
-
-      deleteFlag = (oldTex->RefCount == 0);
-      _glthread_UNLOCK_MUTEX(oldTex->Mutex);
-
-      if (deleteFlag) {
-         GET_CURRENT_CONTEXT(ctx);
-         if (ctx)
-            ctx->Driver.DeleteTexture(ctx, oldTex);
-         else
-            _mesa_problem(NULL, "Unable to delete texture, no context");
-      }
-
-      *ptr = NULL;
-   }
-   assert(!*ptr);
-
-   if (tex) {
-      /* reference new texture */
-      ASSERT(valid_texture_object(tex));
-      _glthread_LOCK_MUTEX(tex->Mutex);
-      if (tex->RefCount == 0) {
-         /* this texture's being deleted (look just above) */
-         /* Not sure this can every really happen.  Warn if it does. */
-         _mesa_problem(NULL, "referencing deleted texture object");
-         *ptr = NULL;
-      }
-      else {
-         tex->RefCount++;
-         *ptr = tex;
-      }
-      _glthread_UNLOCK_MUTEX(tex->Mutex);
-   }
-}
-
-
-
-/**
- * Report why a texture object is incomplete.  
- *
- * \param t texture object.
- * \param why string describing why it's incomplete.
- *
- * \note For debug purposes only.
- */
-#if 0
-static void
-incomplete(const struct gl_texture_object *t, const char *why)
-{
-   printf("Texture Obj %d incomplete because: %s\n", t->Name, why);
-}
-#else
-#define incomplete(t, why)
-#endif
-
-
-/**
- * Examine a texture object to determine if it is complete.
- *
- * The gl_texture_object::Complete flag will be set to GL_TRUE or GL_FALSE
- * accordingly.
- *
- * \param ctx GL context.
- * \param t texture object.
- *
- * According to the texture target, verifies that each of the mipmaps is
- * present and has the expected size.
- */
-void
-_mesa_test_texobj_completeness( const GLcontext *ctx,
-                                struct gl_texture_object *t )
-{
-   const GLint baseLevel = t->BaseLevel;
-   GLint maxLog2 = 0, maxLevels = 0;
-
-   t->_Complete = GL_TRUE;  /* be optimistic */
-
-   /* Detect cases where the application set the base level to an invalid
-    * value.
-    */
-   if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) {
-      char s[100];
-      _mesa_snprintf(s, sizeof(s), "base level = %d is invalid", baseLevel);
-      incomplete(t, s);
-      t->_Complete = GL_FALSE;
-      return;
-   }
-
-   /* Always need the base level image */
-   if (!t->Image[0][baseLevel]) {
-      char s[100];
-      _mesa_snprintf(s, sizeof(s), "Image[baseLevel=%d] == NULL", baseLevel);
-      incomplete(t, s);
-      t->_Complete = GL_FALSE;
-      return;
-   }
-
-   /* Check width/height/depth for zero */
-   if (t->Image[0][baseLevel]->Width == 0 ||
-       t->Image[0][baseLevel]->Height == 0 ||
-       t->Image[0][baseLevel]->Depth == 0) {
-      incomplete(t, "texture width = 0");
-      t->_Complete = GL_FALSE;
-      return;
-   }
-
-   /* Compute _MaxLevel */
-   if ((t->Target == GL_TEXTURE_1D) ||
-       (t->Target == GL_TEXTURE_1D_ARRAY_EXT)) {
-      maxLog2 = t->Image[0][baseLevel]->WidthLog2;
-      maxLevels = ctx->Const.MaxTextureLevels;
-   }
-   else if ((t->Target == GL_TEXTURE_2D) ||
-	    (t->Target == GL_TEXTURE_2D_ARRAY_EXT)) {
-      maxLog2 = MAX2(t->Image[0][baseLevel]->WidthLog2,
-                     t->Image[0][baseLevel]->HeightLog2);
-      maxLevels = ctx->Const.MaxTextureLevels;
-   }
-   else if (t->Target == GL_TEXTURE_3D) {
-      GLint max = MAX2(t->Image[0][baseLevel]->WidthLog2,
-                       t->Image[0][baseLevel]->HeightLog2);
-      maxLog2 = MAX2(max, (GLint)(t->Image[0][baseLevel]->DepthLog2));
-      maxLevels = ctx->Const.Max3DTextureLevels;
-   }
-   else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
-      maxLog2 = MAX2(t->Image[0][baseLevel]->WidthLog2,
-                     t->Image[0][baseLevel]->HeightLog2);
-      maxLevels = ctx->Const.MaxCubeTextureLevels;
-   }
-   else if (t->Target == GL_TEXTURE_RECTANGLE_NV) {
-      maxLog2 = 0;  /* not applicable */
-      maxLevels = 1;  /* no mipmapping */
-   }
-   else {
-      _mesa_problem(ctx, "Bad t->Target in _mesa_test_texobj_completeness");
-      return;
-   }
-
-   ASSERT(maxLevels > 0);
-
-   t->_MaxLevel = baseLevel + maxLog2;
-   t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel);
-   t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1);
-
-   /* Compute _MaxLambda = q - b (see the 1.2 spec) used during mipmapping */
-   t->_MaxLambda = (GLfloat) (t->_MaxLevel - t->BaseLevel);
-
-   if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
-      /* make sure that all six cube map level 0 images are the same size */
-      const GLuint w = t->Image[0][baseLevel]->Width2;
-      const GLuint h = t->Image[0][baseLevel]->Height2;
-      GLuint face;
-      for (face = 1; face < 6; face++) {
-	 if (t->Image[face][baseLevel] == NULL ||
-	     t->Image[face][baseLevel]->Width2 != w ||
-	     t->Image[face][baseLevel]->Height2 != h) {
-	    t->_Complete = GL_FALSE;
-	    incomplete(t, "Cube face missing or mismatched size");
-	    return;
-	 }
-      }
-   }
-
-   /* extra checking for mipmaps */
-   if (t->MinFilter != GL_NEAREST && t->MinFilter != GL_LINEAR) {
-      /*
-       * Mipmapping: determine if we have a complete set of mipmaps
-       */
-      GLint i;
-      GLint minLevel = baseLevel;
-      GLint maxLevel = t->_MaxLevel;
-
-      if (minLevel > maxLevel) {
-         t->_Complete = GL_FALSE;
-         incomplete(t, "minLevel > maxLevel");
-         return;
-      }
-
-      /* Test dimension-independent attributes */
-      for (i = minLevel; i <= maxLevel; i++) {
-         if (t->Image[0][i]) {
-            if (t->Image[0][i]->TexFormat != t->Image[0][baseLevel]->TexFormat) {
-               t->_Complete = GL_FALSE;
-               incomplete(t, "Format[i] != Format[baseLevel]");
-               return;
-            }
-            if (t->Image[0][i]->Border != t->Image[0][baseLevel]->Border) {
-               t->_Complete = GL_FALSE;
-               incomplete(t, "Border[i] != Border[baseLevel]");
-               return;
-            }
-         }
-      }
-
-      /* Test things which depend on number of texture image dimensions */
-      if ((t->Target == GL_TEXTURE_1D) ||
-          (t->Target == GL_TEXTURE_1D_ARRAY_EXT)) {
-         /* Test 1-D mipmaps */
-         GLuint width = t->Image[0][baseLevel]->Width2;
-         for (i = baseLevel + 1; i < maxLevels; i++) {
-            if (width > 1) {
-               width /= 2;
-            }
-            if (i >= minLevel && i <= maxLevel) {
-               if (!t->Image[0][i]) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "1D Image[0][i] == NULL");
-                  return;
-               }
-               if (t->Image[0][i]->Width2 != width ) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "1D Image[0][i] bad width");
-                  return;
-               }
-            }
-            if (width == 1) {
-               return;  /* found smallest needed mipmap, all done! */
-            }
-         }
-      }
-      else if ((t->Target == GL_TEXTURE_2D) ||
-               (t->Target == GL_TEXTURE_2D_ARRAY_EXT)) {
-         /* Test 2-D mipmaps */
-         GLuint width = t->Image[0][baseLevel]->Width2;
-         GLuint height = t->Image[0][baseLevel]->Height2;
-         for (i = baseLevel + 1; i < maxLevels; i++) {
-            if (width > 1) {
-               width /= 2;
-            }
-            if (height > 1) {
-               height /= 2;
-            }
-            if (i >= minLevel && i <= maxLevel) {
-               if (!t->Image[0][i]) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "2D Image[0][i] == NULL");
-                  return;
-               }
-               if (t->Image[0][i]->Width2 != width) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "2D Image[0][i] bad width");
-                  return;
-               }
-               if (t->Image[0][i]->Height2 != height) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "2D Image[0][i] bad height");
-                  return;
-               }
-               if (width==1 && height==1) {
-                  return;  /* found smallest needed mipmap, all done! */
-               }
-            }
-         }
-      }
-      else if (t->Target == GL_TEXTURE_3D) {
-         /* Test 3-D mipmaps */
-         GLuint width = t->Image[0][baseLevel]->Width2;
-         GLuint height = t->Image[0][baseLevel]->Height2;
-         GLuint depth = t->Image[0][baseLevel]->Depth2;
-	 for (i = baseLevel + 1; i < maxLevels; i++) {
-            if (width > 1) {
-               width /= 2;
-            }
-            if (height > 1) {
-               height /= 2;
-            }
-            if (depth > 1) {
-               depth /= 2;
-            }
-            if (i >= minLevel && i <= maxLevel) {
-               if (!t->Image[0][i]) {
-                  incomplete(t, "3D Image[0][i] == NULL");
-                  t->_Complete = GL_FALSE;
-                  return;
-               }
-               if (t->Image[0][i]->_BaseFormat == GL_DEPTH_COMPONENT) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
-                  return;
-               }
-               if (t->Image[0][i]->Width2 != width) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "3D Image[0][i] bad width");
-                  return;
-               }
-               if (t->Image[0][i]->Height2 != height) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "3D Image[0][i] bad height");
-                  return;
-               }
-               if (t->Image[0][i]->Depth2 != depth) {
-                  t->_Complete = GL_FALSE;
-                  incomplete(t, "3D Image[0][i] bad depth");
-                  return;
-               }
-            }
-            if (width == 1 && height == 1 && depth == 1) {
-               return;  /* found smallest needed mipmap, all done! */
-            }
-         }
-      }
-      else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
-         /* make sure 6 cube faces are consistant */
-         GLuint width = t->Image[0][baseLevel]->Width2;
-         GLuint height = t->Image[0][baseLevel]->Height2;
-	 for (i = baseLevel + 1; i < maxLevels; i++) {
-            if (width > 1) {
-               width /= 2;
-            }
-            if (height > 1) {
-               height /= 2;
-            }
-            if (i >= minLevel && i <= maxLevel) {
-	       GLuint face;
-	       for (face = 0; face < 6; face++) {
-		  /* check that we have images defined */
-		  if (!t->Image[face][i]) {
-		     t->_Complete = GL_FALSE;
-		     incomplete(t, "CubeMap Image[n][i] == NULL");
-		     return;
-		  }
-		  /* Don't support GL_DEPTH_COMPONENT for cube maps */
-		  if (t->Image[face][i]->_BaseFormat == GL_DEPTH_COMPONENT) {
-		     t->_Complete = GL_FALSE;
-		     incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
-		     return;
-		  }
-		  /* check that all six images have same size */
-		  if (t->Image[face][i]->Width2!=width || 
-		      t->Image[face][i]->Height2!=height) {
-		     t->_Complete = GL_FALSE;
-		     incomplete(t, "CubeMap Image[n][i] bad size");
-		     return;
-		  }
-	       }
-	    }
-	    if (width == 1 && height == 1) {
-	       return;  /* found smallest needed mipmap, all done! */
-            }
-         }
-      }
-      else if (t->Target == GL_TEXTURE_RECTANGLE_NV) {
-         /* XXX special checking? */
-      }
-      else {
-         /* Target = ??? */
-         _mesa_problem(ctx, "Bug in gl_test_texture_object_completeness\n");
-      }
-   }
-}
-
-
-/**
- * Mark a texture object dirty.  It forces the object to be incomplete
- * and optionally forces the context to re-validate its state.
- *
- * \param ctx GL context.
- * \param texObj texture object.
- * \param invalidate_state also invalidate context state.
- */
-void
-_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
-                   GLboolean invalidate_state)
-{
-   texObj->_Complete = GL_FALSE;
-   if (invalidate_state)
-      ctx->NewState |= _NEW_TEXTURE;
-}
-
-
-/**
- * Return pointer to a default/fallback texture.
- * The texture is a 2D 8x8 RGBA texture with all texels = (0,0,0,1).
- * That's the value a sampler should get when sampling from an
- * incomplete texture.
- */
-struct gl_texture_object *
-_mesa_get_fallback_texture(GLcontext *ctx)
-{
-   if (!ctx->Shared->FallbackTex) {
-      /* create fallback texture now */
-      static GLubyte texels[8 * 8][4];
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-      GLuint i;
-
-      for (i = 0; i < 8 * 8; i++) {
-         texels[i][0] =
-         texels[i][1] =
-         texels[i][2] = 0x0;
-         texels[i][3] = 0xff;
-      }
-
-      /* create texture object */
-      texObj = ctx->Driver.NewTextureObject(ctx, 0, GL_TEXTURE_2D);
-      assert(texObj->RefCount == 1);
-      texObj->MinFilter = GL_NEAREST;
-      texObj->MagFilter = GL_NEAREST;
-
-      /* create level[0] texture image */
-      texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, 0);
-
-      /* init the image fields */
-      _mesa_init_teximage_fields(ctx, GL_TEXTURE_2D, texImage,
-                                    8, 8, 1, 0, GL_RGBA); 
-
-      texImage->TexFormat =
-         ctx->Driver.ChooseTextureFormat(ctx, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
-      ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);
-
-      /* set image data */
-      ctx->Driver.TexImage2D(ctx, GL_TEXTURE_2D, 0, GL_RGBA,
-                             8, 8, 0,
-                             GL_RGBA, GL_UNSIGNED_BYTE, texels,
-                             &ctx->DefaultPacking, texObj, texImage);
-
-      _mesa_test_texobj_completeness(ctx, texObj);
-      assert(texObj->_Complete);
-
-      ctx->Shared->FallbackTex = texObj;
-   }
-   return ctx->Shared->FallbackTex;
-}
-
-
-/*@}*/
-
-
-/***********************************************************************/
-/** \name API functions */
-/*@{*/
-
-
-/**
- * Generate texture names.
- *
- * \param n number of texture names to be generated.
- * \param textures an array in which will hold the generated texture names.
- *
- * \sa glGenTextures().
- *
- * Calls _mesa_HashFindFreeKeyBlock() to find a block of free texture
- * IDs which are stored in \p textures.  Corresponding empty texture
- * objects are also generated.
- */ 
-void GLAPIENTRY
-_mesa_GenTextures( GLsizei n, GLuint *textures )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint first;
-   GLint i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glGenTextures" );
-      return;
-   }
-
-   if (!textures)
-      return;
-
-   /*
-    * This must be atomic (generation and allocation of texture IDs)
-    */
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->TexObjects, n);
-
-   /* Allocate new, empty texture objects */
-   for (i = 0; i < n; i++) {
-      struct gl_texture_object *texObj;
-      GLuint name = first + i;
-      GLenum target = 0;
-      texObj = (*ctx->Driver.NewTextureObject)( ctx, name, target);
-      if (!texObj) {
-         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTextures");
-         return;
-      }
-
-      /* insert into hash table */
-      _mesa_HashInsert(ctx->Shared->TexObjects, texObj->Name, texObj);
-
-      textures[i] = name;
-   }
-
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-}
-
-
-/**
- * Check if the given texture object is bound to the current draw or
- * read framebuffer.  If so, Unbind it.
- */
-static void
-unbind_texobj_from_fbo(GLcontext *ctx, struct gl_texture_object *texObj)
-{
-   const GLuint n = (ctx->DrawBuffer == ctx->ReadBuffer) ? 1 : 2;
-   GLuint i;
-
-   for (i = 0; i < n; i++) {
-      struct gl_framebuffer *fb = (i == 0) ? ctx->DrawBuffer : ctx->ReadBuffer;
-      if (fb->Name) {
-         GLuint j;
-         for (j = 0; j < BUFFER_COUNT; j++) {
-            if (fb->Attachment[j].Type == GL_TEXTURE &&
-                fb->Attachment[j].Texture == texObj) {
-               _mesa_remove_attachment(ctx, fb->Attachment + j);         
-            }
-         }
-      }
-   }
-}
-
-
-/**
- * Check if the given texture object is bound to any texture image units and
- * unbind it if so (revert to default textures).
- */
-static void
-unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
-{
-   GLuint u, tex;
-
-   for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
-      struct gl_texture_unit *unit = &ctx->Texture.Unit[u];
-      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-         if (texObj == unit->CurrentTex[tex]) {
-            _mesa_reference_texobj(&unit->CurrentTex[tex],
-                                   ctx->Shared->DefaultTex[tex]);
-            ASSERT(unit->CurrentTex[tex]);
-            break;
-         }
-      }
-   }
-}
-
-
-/**
- * Delete named textures.
- *
- * \param n number of textures to be deleted.
- * \param textures array of texture IDs to be deleted.
- *
- * \sa glDeleteTextures().
- *
- * If we're about to delete a texture that's currently bound to any
- * texture unit, unbind the texture first.  Decrement the reference
- * count on the texture object and delete it if it's zero.
- * Recall that texture objects can be shared among several rendering
- * contexts.
- */
-void GLAPIENTRY
-_mesa_DeleteTextures( GLsizei n, const GLuint *textures)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */
-
-   if (!textures)
-      return;
-
-   for (i = 0; i < n; i++) {
-      if (textures[i] > 0) {
-         struct gl_texture_object *delObj
-            = _mesa_lookup_texture(ctx, textures[i]);
-
-         if (delObj) {
-	    _mesa_lock_texture(ctx, delObj);
-
-            /* Check if texture is bound to any framebuffer objects.
-             * If so, unbind.
-             * See section 4.4.2.3 of GL_EXT_framebuffer_object.
-             */
-            unbind_texobj_from_fbo(ctx, delObj);
-
-            /* Check if this texture is currently bound to any texture units.
-             * If so, unbind it.
-             */
-            unbind_texobj_from_texunits(ctx, delObj);
-
-	    _mesa_unlock_texture(ctx, delObj);
-
-            ctx->NewState |= _NEW_TEXTURE;
-
-            /* The texture _name_ is now free for re-use.
-             * Remove it from the hash table now.
-             */
-            _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-            _mesa_HashRemove(ctx->Shared->TexObjects, delObj->Name);
-            _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-            /* Unreference the texobj.  If refcount hits zero, the texture
-             * will be deleted.
-             */
-            _mesa_reference_texobj(&delObj, NULL);
-         }
-      }
-   }
-}
-
-
-/**
- * Convert a GL texture target enum such as GL_TEXTURE_2D or GL_TEXTURE_3D
- * into the corresponding Mesa texture target index.
- * Note that proxy targets are not valid here.
- * \return TEXTURE_x_INDEX or -1 if target is invalid
- */
-static GLint
-target_enum_to_index(GLenum target)
-{
-   switch (target) {
-   case GL_TEXTURE_1D:
-      return TEXTURE_1D_INDEX;
-   case GL_TEXTURE_2D:
-      return TEXTURE_2D_INDEX;
-   case GL_TEXTURE_3D:
-      return TEXTURE_3D_INDEX;
-   case GL_TEXTURE_CUBE_MAP_ARB:
-      return TEXTURE_CUBE_INDEX;
-   case GL_TEXTURE_RECTANGLE_NV:
-      return TEXTURE_RECT_INDEX;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      return TEXTURE_1D_ARRAY_INDEX;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      return TEXTURE_2D_ARRAY_INDEX;
-   default:
-      return -1;
-   }
-}
-
-
-/**
- * Bind a named texture to a texturing target.
- * 
- * \param target texture target.
- * \param texName texture name.
- * 
- * \sa glBindTexture().
- *
- * Determines the old texture object bound and returns immediately if rebinding
- * the same texture.  Get the current texture which is either a default texture
- * if name is null, a named texture from the hash, or a new texture if the
- * given texture name is new. Increments its reference count, binds it, and
- * calls dd_function_table::BindTexture. Decrements the old texture reference
- * count and deletes it if it reaches zero.
- */
-void GLAPIENTRY
-_mesa_BindTexture( GLenum target, GLuint texName )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint unit = ctx->Texture.CurrentUnit;
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;
-   GLint targetIndex;
-   GLboolean early_out = GL_FALSE;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glBindTexture %s %d\n",
-                  _mesa_lookup_enum_by_nr(target), (GLint) texName);
-
-   targetIndex = target_enum_to_index(target);
-   if (targetIndex < 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
-      return;
-   }
-   assert(targetIndex < NUM_TEXTURE_TARGETS);
-   defaultTexObj = ctx->Shared->DefaultTex[targetIndex];
-
-   /*
-    * Get pointer to new texture object (newTexObj)
-    */
-   if (texName == 0) {
-      newTexObj = defaultTexObj;
-   }
-   else {
-      /* non-default texture object */
-      newTexObj = _mesa_lookup_texture(ctx, texName);
-      if (newTexObj) {
-         /* error checking */
-         if (newTexObj->Target != 0 && newTexObj->Target != target) {
-            /* the named texture object's target doesn't match the given target */
-            _mesa_error( ctx, GL_INVALID_OPERATION,
-                         "glBindTexture(target mismatch)" );
-            return;
-         }
-         if (newTexObj->Target == 0) {
-            finish_texture_init(ctx, target, newTexObj);
-         }
-      }
-      else {
-         /* if this is a new texture id, allocate a texture object now */
-	 newTexObj = (*ctx->Driver.NewTextureObject)(ctx, texName, target);
-         if (!newTexObj) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindTexture");
-            return;
-         }
-
-         /* and insert it into hash table */
-         _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-         _mesa_HashInsert(ctx->Shared->TexObjects, texName, newTexObj);
-         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-      }
-      newTexObj->Target = target;
-   }
-
-   assert(valid_texture_object(newTexObj));
-
-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
-   if ((ctx->Shared->RefCount == 1)
-       && (newTexObj == texUnit->CurrentTex[targetIndex])) {
-      early_out = GL_TRUE;
-   }
-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
-
-   if (early_out) {
-      return;
-   }
-
-   /* flush before changing binding */
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-
-   /* Do the actual binding.  The refcount on the previously bound
-    * texture object will be decremented.  It'll be deleted if the
-    * count hits zero.
-    */
-   _mesa_reference_texobj(&texUnit->CurrentTex[targetIndex], newTexObj);
-   ASSERT(texUnit->CurrentTex[targetIndex]);
-
-   /* Pass BindTexture call to device driver */
-   if (ctx->Driver.BindTexture)
-      (*ctx->Driver.BindTexture)( ctx, target, newTexObj );
-}
-
-
-/**
- * Set texture priorities.
- * 
- * \param n number of textures.
- * \param texName texture names.
- * \param priorities corresponding texture priorities.
- * 
- * \sa glPrioritizeTextures().
- * 
- * Looks up each texture in the hash, clamps the corresponding priority between
- * 0.0 and 1.0, and calls dd_function_table::PrioritizeTexture.
- */
-void GLAPIENTRY
-_mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
-                          const GLclampf *priorities )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (n < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glPrioritizeTextures" );
-      return;
-   }
-
-   if (!priorities)
-      return;
-
-   for (i = 0; i < n; i++) {
-      if (texName[i] > 0) {
-         struct gl_texture_object *t = _mesa_lookup_texture(ctx, texName[i]);
-         if (t) {
-            t->Priority = CLAMP( priorities[i], 0.0F, 1.0F );
-         }
-      }
-   }
-
-   ctx->NewState |= _NEW_TEXTURE;
-}
-
-/**
- * See if textures are loaded in texture memory.
- * 
- * \param n number of textures to query.
- * \param texName array with the texture names.
- * \param residences array which will hold the residence status.
- *
- * \return GL_TRUE if all textures are resident and \p residences is left unchanged, 
- * 
- * \sa glAreTexturesResident().
- *
- * Looks up each texture in the hash and calls
- * dd_function_table::IsTextureResident.
- */
-GLboolean GLAPIENTRY
-_mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
-                          GLboolean *residences)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLboolean allResident = GL_TRUE;
-   GLint i, j;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident(n)");
-      return GL_FALSE;
-   }
-
-   if (!texName || !residences)
-      return GL_FALSE;
-
-   for (i = 0; i < n; i++) {
-      struct gl_texture_object *t;
-      if (texName[i] == 0) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident");
-         return GL_FALSE;
-      }
-      t = _mesa_lookup_texture(ctx, texName[i]);
-      if (!t) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident");
-         return GL_FALSE;
-      }
-      if (!ctx->Driver.IsTextureResident ||
-          ctx->Driver.IsTextureResident(ctx, t)) {
-         /* The texture is resident */
-	 if (!allResident)
-	    residences[i] = GL_TRUE;
-      }
-      else {
-         /* The texture is not resident */
-         if (allResident) {
-	    allResident = GL_FALSE;
-	    for (j = 0; j < i; j++)
-	       residences[j] = GL_TRUE;
-	 }
-	 residences[i] = GL_FALSE;
-      }
-   }
-   
-   return allResident;
-}
-
-/**
- * See if a name corresponds to a texture.
- *
- * \param texture texture name.
- *
- * \return GL_TRUE if texture name corresponds to a texture, or GL_FALSE
- * otherwise.
- * 
- * \sa glIsTexture().
- *
- * Calls _mesa_HashLookup().
- */
-GLboolean GLAPIENTRY
-_mesa_IsTexture( GLuint texture )
-{
-   struct gl_texture_object *t;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (!texture)
-      return GL_FALSE;
-
-   t = _mesa_lookup_texture(ctx, texture);
-
-   /* IsTexture is true only after object has been bound once. */
-   return t && t->Target;
-}
-
-
-/**
- * Simplest implementation of texture locking: grab the shared tex
- * mutex.  Examine the shared context state timestamp and if there has
- * been a change, set the appropriate bits in ctx->NewState.
- *
- * This is used to deal with synchronizing things when a texture object
- * is used/modified by different contexts (or threads) which are sharing
- * the texture.
- *
- * See also _mesa_lock/unlock_texture() in teximage.h
- */
-void
-_mesa_lock_context_textures( GLcontext *ctx )
-{
-   _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);
-
-   if (ctx->Shared->TextureStateStamp != ctx->TextureStateTimestamp) {
-      ctx->NewState |= _NEW_TEXTURE;
-      ctx->TextureStateTimestamp = ctx->Shared->TextureStateStamp;
-   }
-}
-
-
-void
-_mesa_unlock_context_textures( GLcontext *ctx )
-{
-   assert(ctx->Shared->TextureStateStamp == ctx->TextureStateTimestamp);
-   _glthread_UNLOCK_MUTEX(ctx->Shared->TexMutex);
-}
-
-/*@}*/
-
-
+/**

+ * \file texobj.c

+ * Texture object management.

+ */

+

+/*

+ * 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 "mfeatures.h"

+#include "colortab.h"

+#include "context.h"

+#include "enums.h"

+#include "fbobject.h"

+#include "formats.h"

+#include "hash.h"

+#include "imports.h"

+#include "macros.h"

+#include "teximage.h"

+#include "texobj.h"

+#include "mtypes.h"

+#include "program/prog_instruction.h"

+

+

+

+/**********************************************************************/

+/** \name Internal functions */

+/*@{*/

+

+

+/**

+ * Return the gl_texture_object for a given ID.

+ */

+struct gl_texture_object *

+_mesa_lookup_texture(struct gl_context *ctx, GLuint id)

+{

+   return (struct gl_texture_object *)

+      _mesa_HashLookup(ctx->Shared->TexObjects, id);

+}

+

+

+

+/**

+ * Allocate and initialize a new texture object.  But don't put it into the

+ * texture object hash table.

+ *

+ * Called via ctx->Driver.NewTextureObject, unless overridden by a device

+ * driver.

+ * 

+ * \param shared the shared GL state structure to contain the texture object

+ * \param name integer name for the texture object

+ * \param target either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D,

+ * GL_TEXTURE_CUBE_MAP_ARB or GL_TEXTURE_RECTANGLE_NV.  zero is ok for the sake

+ * of GenTextures()

+ *

+ * \return pointer to new texture object.

+ */

+struct gl_texture_object *

+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target )

+{

+   struct gl_texture_object *obj;

+   (void) ctx;

+   obj = MALLOC_STRUCT(gl_texture_object);

+   _mesa_initialize_texture_object(obj, name, target);

+   return obj;

+}

+

+

+/**

+ * Initialize a new texture object to default values.

+ * \param obj  the texture object

+ * \param name  the texture name

+ * \param target  the texture target

+ */

+void

+_mesa_initialize_texture_object( struct gl_texture_object *obj,

+                                 GLuint name, GLenum target )

+{

+   ASSERT(target == 0 ||

+          target == GL_TEXTURE_1D ||

+          target == GL_TEXTURE_2D ||

+          target == GL_TEXTURE_3D ||

+          target == GL_TEXTURE_CUBE_MAP_ARB ||

+          target == GL_TEXTURE_RECTANGLE_NV ||

+          target == GL_TEXTURE_1D_ARRAY_EXT ||

+          target == GL_TEXTURE_2D_ARRAY_EXT);

+

+   memset(obj, 0, sizeof(*obj));

+   /* init the non-zero fields */

+   _glthread_INIT_MUTEX(obj->Mutex);

+   obj->RefCount = 1;

+   obj->Name = name;

+   obj->Target = target;

+   obj->Priority = 1.0F;

+   if (target == GL_TEXTURE_RECTANGLE_NV) {

+      obj->WrapS = GL_CLAMP_TO_EDGE;

+      obj->WrapT = GL_CLAMP_TO_EDGE;

+      obj->WrapR = GL_CLAMP_TO_EDGE;

+      obj->MinFilter = GL_LINEAR;

+   }

+   else {

+      obj->WrapS = GL_REPEAT;

+      obj->WrapT = GL_REPEAT;

+      obj->WrapR = GL_REPEAT;

+      obj->MinFilter = GL_NEAREST_MIPMAP_LINEAR;

+   }

+   obj->MagFilter = GL_LINEAR;

+   obj->MinLod = -1000.0;

+   obj->MaxLod = 1000.0;

+   obj->LodBias = 0.0;

+   obj->BaseLevel = 0;

+   obj->MaxLevel = 1000;

+   obj->MaxAnisotropy = 1.0;

+   obj->CompareMode = GL_NONE;         /* ARB_shadow */

+   obj->CompareFunc = GL_LEQUAL;       /* ARB_shadow */

+   obj->CompareFailValue = 0.0F;       /* ARB_shadow_ambient */

+   obj->DepthMode = GL_LUMINANCE;      /* ARB_depth_texture */

+   obj->Swizzle[0] = GL_RED;

+   obj->Swizzle[1] = GL_GREEN;

+   obj->Swizzle[2] = GL_BLUE;

+   obj->Swizzle[3] = GL_ALPHA;

+   obj->_Swizzle = SWIZZLE_NOOP;

+}

+

+

+/**

+ * Some texture initialization can't be finished until we know which

+ * target it's getting bound to (GL_TEXTURE_1D/2D/etc).

+ */

+static void

+finish_texture_init(struct gl_context *ctx, GLenum target,

+                    struct gl_texture_object *obj)

+{

+   assert(obj->Target == 0);

+

+   if (target == GL_TEXTURE_RECTANGLE_NV) {

+      /* have to init wrap and filter state here - kind of klunky */

+      obj->WrapS = GL_CLAMP_TO_EDGE;

+      obj->WrapT = GL_CLAMP_TO_EDGE;

+      obj->WrapR = GL_CLAMP_TO_EDGE;

+      obj->MinFilter = GL_LINEAR;

+      if (ctx->Driver.TexParameter) {

+         static const GLfloat fparam_wrap[1] = {(GLfloat) GL_CLAMP_TO_EDGE};

+         static const GLfloat fparam_filter[1] = {(GLfloat) GL_LINEAR};

+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_S, fparam_wrap);

+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_T, fparam_wrap);

+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_WRAP_R, fparam_wrap);

+         ctx->Driver.TexParameter(ctx, target, obj, GL_TEXTURE_MIN_FILTER, fparam_filter);

+      }

+   }

+}

+

+

+/**

+ * Deallocate a texture object struct.  It should have already been

+ * removed from the texture object pool.

+ * Called via ctx->Driver.DeleteTexture() if not overriden by a driver.

+ *

+ * \param shared the shared GL state to which the object belongs.

+ * \param texObj the texture object to delete.

+ */

+void

+_mesa_delete_texture_object(struct gl_context *ctx,

+                            struct gl_texture_object *texObj)

+{

+   GLuint i, face;

+

+   /* Set Target to an invalid value.  With some assertions elsewhere

+    * we can try to detect possible use of deleted textures.

+    */

+   texObj->Target = 0x99;

+

+   _mesa_free_colortable_data(&texObj->Palette);

+

+   /* free the texture images */

+   for (face = 0; face < 6; face++) {

+      for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {

+         if (texObj->Image[face][i]) {

+            _mesa_delete_texture_image( ctx, texObj->Image[face][i] );

+         }

+      }

+   }

+

+   /* destroy the mutex -- it may have allocated memory (eg on bsd) */

+   _glthread_DESTROY_MUTEX(texObj->Mutex);

+

+   /* free this object */

+   free(texObj);

+}

+

+

+

+/**

+ * Copy texture object state from one texture object to another.

+ * Use for glPush/PopAttrib.

+ *

+ * \param dest destination texture object.

+ * \param src source texture object.

+ */

+void

+_mesa_copy_texture_object( struct gl_texture_object *dest,

+                           const struct gl_texture_object *src )

+{

+   dest->Target = src->Target;

+   dest->Name = src->Name;

+   dest->Priority = src->Priority;

+   dest->BorderColor.f[0] = src->BorderColor.f[0];

+   dest->BorderColor.f[1] = src->BorderColor.f[1];

+   dest->BorderColor.f[2] = src->BorderColor.f[2];

+   dest->BorderColor.f[3] = src->BorderColor.f[3];

+   dest->WrapS = src->WrapS;

+   dest->WrapT = src->WrapT;

+   dest->WrapR = src->WrapR;

+   dest->MinFilter = src->MinFilter;

+   dest->MagFilter = src->MagFilter;

+   dest->MinLod = src->MinLod;

+   dest->MaxLod = src->MaxLod;

+   dest->LodBias = src->LodBias;

+   dest->BaseLevel = src->BaseLevel;

+   dest->MaxLevel = src->MaxLevel;

+   dest->MaxAnisotropy = src->MaxAnisotropy;

+   dest->CompareMode = src->CompareMode;

+   dest->CompareFunc = src->CompareFunc;

+   dest->CompareFailValue = src->CompareFailValue;

+   dest->DepthMode = src->DepthMode;

+   dest->_MaxLevel = src->_MaxLevel;

+   dest->_MaxLambda = src->_MaxLambda;

+   dest->GenerateMipmap = src->GenerateMipmap;

+   dest->Palette = src->Palette;

+   dest->_Complete = src->_Complete;

+   COPY_4V(dest->Swizzle, src->Swizzle);

+   dest->_Swizzle = src->_Swizzle;

+}

+

+

+/**

+ * Free all texture images of the given texture object.

+ *

+ * \param ctx GL context.

+ * \param t texture object.

+ *

+ * \sa _mesa_clear_texture_image().

+ */

+void

+_mesa_clear_texture_object(struct gl_context *ctx,

+                           struct gl_texture_object *texObj)

+{

+   GLuint i, j;

+

+   if (texObj->Target == 0)

+      return;

+

+   for (i = 0; i < MAX_FACES; i++) {

+      for (j = 0; j < MAX_TEXTURE_LEVELS; j++) {

+         struct gl_texture_image *texImage = texObj->Image[i][j];

+         if (texImage)

+            _mesa_clear_texture_image(ctx, texImage);

+      }

+   }

+}

+

+

+/**

+ * Check if the given texture object is valid by examining its Target field.

+ * For debugging only.

+ */

+static GLboolean

+valid_texture_object(const struct gl_texture_object *tex)

+{

+   switch (tex->Target) {

+   case 0:

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_3D:

+   case GL_TEXTURE_CUBE_MAP_ARB:

+   case GL_TEXTURE_RECTANGLE_NV:

+   case GL_TEXTURE_1D_ARRAY_EXT:

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      return GL_TRUE;

+   case 0x99:

+      _mesa_problem(NULL, "invalid reference to a deleted texture object");

+      return GL_FALSE;

+   default:

+      _mesa_problem(NULL, "invalid texture object Target 0x%x, Id = %u",

+                    tex->Target, tex->Name);

+      return GL_FALSE;

+   }

+}

+

+

+/**

+ * Reference (or unreference) a texture object.

+ * If '*ptr', decrement *ptr's refcount (and delete if it becomes zero).

+ * If 'tex' is non-null, increment its refcount.

+ */

+void

+_mesa_reference_texobj(struct gl_texture_object **ptr,

+                       struct gl_texture_object *tex)

+{

+   assert(ptr);

+   if (*ptr == tex) {

+      /* no change */

+      return;

+   }

+

+   if (*ptr) {

+      /* Unreference the old texture */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_texture_object *oldTex = *ptr;

+

+      ASSERT(valid_texture_object(oldTex));

+      (void) valid_texture_object; /* silence warning in release builds */

+

+      _glthread_LOCK_MUTEX(oldTex->Mutex);

+      ASSERT(oldTex->RefCount > 0);

+      oldTex->RefCount--;

+

+      deleteFlag = (oldTex->RefCount == 0);

+      _glthread_UNLOCK_MUTEX(oldTex->Mutex);

+

+      if (deleteFlag) {

+         GET_CURRENT_CONTEXT(ctx);

+         if (ctx)

+            ctx->Driver.DeleteTexture(ctx, oldTex);

+         else

+            _mesa_problem(NULL, "Unable to delete texture, no context");

+      }

+

+      *ptr = NULL;

+   }

+   assert(!*ptr);

+

+   if (tex) {

+      /* reference new texture */

+      ASSERT(valid_texture_object(tex));

+      _glthread_LOCK_MUTEX(tex->Mutex);

+      if (tex->RefCount == 0) {

+         /* this texture's being deleted (look just above) */

+         /* Not sure this can every really happen.  Warn if it does. */

+         _mesa_problem(NULL, "referencing deleted texture object");

+         *ptr = NULL;

+      }

+      else {

+         tex->RefCount++;

+         *ptr = tex;

+      }

+      _glthread_UNLOCK_MUTEX(tex->Mutex);

+   }

+}

+

+

+

+/**

+ * Mark a texture object as incomplete.

+ * \param t  texture object

+ * \param fmt...  string describing why it's incomplete (for debugging).

+ */

+static void

+incomplete(struct gl_texture_object *t, const char *fmt, ...)

+{

+#if 0

+   va_list args;

+   char s[100];

+

+   va_start(args, fmt);

+   vsnprintf(s, sizeof(s), fmt, args);

+   va_end(args);

+

+   printf("Texture Obj %d incomplete because: %s\n", t->Name, s);

+#endif

+   t->_Complete = GL_FALSE;

+}

+

+

+/**

+ * Examine a texture object to determine if it is complete.

+ *

+ * The gl_texture_object::Complete flag will be set to GL_TRUE or GL_FALSE

+ * accordingly.

+ *

+ * \param ctx GL context.

+ * \param t texture object.

+ *

+ * According to the texture target, verifies that each of the mipmaps is

+ * present and has the expected size.

+ */

+void

+_mesa_test_texobj_completeness( const struct gl_context *ctx,

+                                struct gl_texture_object *t )

+{

+   const GLint baseLevel = t->BaseLevel;

+   GLint maxLog2 = 0, maxLevels = 0;

+

+   t->_Complete = GL_TRUE;  /* be optimistic */

+

+   /* Detect cases where the application set the base level to an invalid

+    * value.

+    */

+   if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) {

+      incomplete(t, "base level = %d is invalid", baseLevel);

+      return;

+   }

+

+   /* Always need the base level image */

+   if (!t->Image[0][baseLevel]) {

+      incomplete(t, "Image[baseLevel=%d] == NULL", baseLevel);

+      return;

+   }

+

+   /* Check width/height/depth for zero */

+   if (t->Image[0][baseLevel]->Width == 0 ||

+       t->Image[0][baseLevel]->Height == 0 ||

+       t->Image[0][baseLevel]->Depth == 0) {

+      incomplete(t, "texture width = 0");

+      return;

+   }

+

+   /* Compute _MaxLevel */

+   if ((t->Target == GL_TEXTURE_1D) ||

+       (t->Target == GL_TEXTURE_1D_ARRAY_EXT)) {

+      maxLog2 = t->Image[0][baseLevel]->WidthLog2;

+      maxLevels = ctx->Const.MaxTextureLevels;

+   }

+   else if ((t->Target == GL_TEXTURE_2D) ||

+            (t->Target == GL_TEXTURE_2D_ARRAY_EXT)) {

+      maxLog2 = MAX2(t->Image[0][baseLevel]->WidthLog2,

+                     t->Image[0][baseLevel]->HeightLog2);

+      maxLevels = ctx->Const.MaxTextureLevels;

+   }

+   else if (t->Target == GL_TEXTURE_3D) {

+      GLint max = MAX2(t->Image[0][baseLevel]->WidthLog2,

+                       t->Image[0][baseLevel]->HeightLog2);

+      maxLog2 = MAX2(max, (GLint)(t->Image[0][baseLevel]->DepthLog2));

+      maxLevels = ctx->Const.Max3DTextureLevels;

+   }

+   else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {

+      maxLog2 = MAX2(t->Image[0][baseLevel]->WidthLog2,

+                     t->Image[0][baseLevel]->HeightLog2);

+      maxLevels = ctx->Const.MaxCubeTextureLevels;

+   }

+   else if (t->Target == GL_TEXTURE_RECTANGLE_NV) {

+      maxLog2 = 0;  /* not applicable */

+      maxLevels = 1;  /* no mipmapping */

+   }

+   else {

+      _mesa_problem(ctx, "Bad t->Target in _mesa_test_texobj_completeness");

+      return;

+   }

+

+   ASSERT(maxLevels > 0);

+

+   t->_MaxLevel = baseLevel + maxLog2;

+   t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel);

+   t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1);

+

+   /* Compute _MaxLambda = q - b (see the 1.2 spec) used during mipmapping */

+   t->_MaxLambda = (GLfloat) (t->_MaxLevel - t->BaseLevel);

+

+   if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {

+      /* make sure that all six cube map level 0 images are the same size */

+      const GLuint w = t->Image[0][baseLevel]->Width2;

+      const GLuint h = t->Image[0][baseLevel]->Height2;

+      GLuint face;

+      for (face = 1; face < 6; face++) {

+         if (t->Image[face][baseLevel] == NULL ||

+             t->Image[face][baseLevel]->Width2 != w ||

+             t->Image[face][baseLevel]->Height2 != h) {

+            incomplete(t, "Cube face missing or mismatched size");

+            return;

+         }

+      }

+   }

+

+   /* extra checking for mipmaps */

+   if (t->MinFilter != GL_NEAREST && t->MinFilter != GL_LINEAR) {

+      /*

+       * Mipmapping: determine if we have a complete set of mipmaps

+       */

+      GLint i;

+      GLint minLevel = baseLevel;

+      GLint maxLevel = t->_MaxLevel;

+

+      if (minLevel > maxLevel) {

+         incomplete(t, "minLevel > maxLevel");

+         return;

+      }

+

+      /* Test dimension-independent attributes */

+      for (i = minLevel; i <= maxLevel; i++) {

+         if (t->Image[0][i]) {

+            if (t->Image[0][i]->TexFormat != t->Image[0][baseLevel]->TexFormat) {

+               incomplete(t, "Format[i] != Format[baseLevel]");

+               return;

+            }

+            if (t->Image[0][i]->Border != t->Image[0][baseLevel]->Border) {

+               incomplete(t, "Border[i] != Border[baseLevel]");

+               return;

+            }

+         }

+      }

+

+      /* Test things which depend on number of texture image dimensions */

+      if ((t->Target == GL_TEXTURE_1D) ||

+          (t->Target == GL_TEXTURE_1D_ARRAY_EXT)) {

+         /* Test 1-D mipmaps */

+         GLuint width = t->Image[0][baseLevel]->Width2;

+         for (i = baseLevel + 1; i < maxLevels; i++) {

+            if (width > 1) {

+               width /= 2;

+            }

+            if (i >= minLevel && i <= maxLevel) {

+               if (!t->Image[0][i]) {

+                  incomplete(t, "1D Image[0][i] == NULL");

+                  return;

+               }

+               if (t->Image[0][i]->Width2 != width ) {

+                  incomplete(t, "1D Image[0][i] bad width");

+                  return;

+               }

+            }

+            if (width == 1) {

+               return;  /* found smallest needed mipmap, all done! */

+            }

+         }

+      }

+      else if ((t->Target == GL_TEXTURE_2D) ||

+               (t->Target == GL_TEXTURE_2D_ARRAY_EXT)) {

+         /* Test 2-D mipmaps */

+         GLuint width = t->Image[0][baseLevel]->Width2;

+         GLuint height = t->Image[0][baseLevel]->Height2;

+         for (i = baseLevel + 1; i < maxLevels; i++) {

+            if (width > 1) {

+               width /= 2;

+            }

+            if (height > 1) {

+               height /= 2;

+            }

+            if (i >= minLevel && i <= maxLevel) {

+               if (!t->Image[0][i]) {

+                  incomplete(t, "2D Image[0][i] == NULL");

+                  return;

+               }

+               if (t->Image[0][i]->Width2 != width) {

+                  incomplete(t, "2D Image[0][i] bad width");

+                  return;

+               }

+               if (t->Image[0][i]->Height2 != height) {

+                  incomplete(t, "2D Image[0][i] bad height");

+                  return;

+               }

+               if (width==1 && height==1) {

+                  return;  /* found smallest needed mipmap, all done! */

+               }

+            }

+         }

+      }

+      else if (t->Target == GL_TEXTURE_3D) {

+         /* Test 3-D mipmaps */

+         GLuint width = t->Image[0][baseLevel]->Width2;

+         GLuint height = t->Image[0][baseLevel]->Height2;

+         GLuint depth = t->Image[0][baseLevel]->Depth2;

+         for (i = baseLevel + 1; i < maxLevels; i++) {

+            if (width > 1) {

+               width /= 2;

+            }

+            if (height > 1) {

+               height /= 2;

+            }

+            if (depth > 1) {

+               depth /= 2;

+            }

+            if (i >= minLevel && i <= maxLevel) {

+               if (!t->Image[0][i]) {

+                  incomplete(t, "3D Image[0][i] == NULL");

+                  return;

+               }

+               if (t->Image[0][i]->_BaseFormat == GL_DEPTH_COMPONENT) {

+                  incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");

+                  return;

+               }

+               if (t->Image[0][i]->Width2 != width) {

+                  incomplete(t, "3D Image[0][i] bad width");

+                  return;

+               }

+               if (t->Image[0][i]->Height2 != height) {

+                  incomplete(t, "3D Image[0][i] bad height");

+                  return;

+               }

+               if (t->Image[0][i]->Depth2 != depth) {

+                  incomplete(t, "3D Image[0][i] bad depth");

+                  return;

+               }

+            }

+            if (width == 1 && height == 1 && depth == 1) {

+               return;  /* found smallest needed mipmap, all done! */

+            }

+         }

+      }

+      else if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {

+         /* make sure 6 cube faces are consistant */

+         GLuint width = t->Image[0][baseLevel]->Width2;

+         GLuint height = t->Image[0][baseLevel]->Height2;

+         for (i = baseLevel + 1; i < maxLevels; i++) {

+            if (width > 1) {

+               width /= 2;

+            }

+            if (height > 1) {

+               height /= 2;

+            }

+            if (i >= minLevel && i <= maxLevel) {

+	       GLuint face;

+	       for (face = 0; face < 6; face++) {

+		  /* check that we have images defined */

+		  if (!t->Image[face][i]) {

+		     incomplete(t, "CubeMap Image[n][i] == NULL");

+		     return;

+		  }

+		  /* Don't support GL_DEPTH_COMPONENT for cube maps */

+		  if (t->Image[face][i]->_BaseFormat == GL_DEPTH_COMPONENT) {

+		     incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");

+		     return;

+		  }

+		  /* check that all six images have same size */

+                  if (t->Image[face][i]->Width2 != width || 

+                      t->Image[face][i]->Height2 != height) {

+		     incomplete(t, "CubeMap Image[n][i] bad size");

+		     return;

+		  }

+	       }

+	    }

+	    if (width == 1 && height == 1) {

+	       return;  /* found smallest needed mipmap, all done! */

+            }

+         }

+      }

+      else if (t->Target == GL_TEXTURE_RECTANGLE_NV) {

+         /* XXX special checking? */

+      }

+      else {

+         /* Target = ??? */

+         _mesa_problem(ctx, "Bug in gl_test_texture_object_completeness\n");

+      }

+   }

+}

+

+

+/**

+ * Check if the given cube map texture is "cube complete" as defined in

+ * the OpenGL specification.

+ */

+GLboolean

+_mesa_cube_complete(const struct gl_texture_object *texObj)

+{

+   const GLint baseLevel = texObj->BaseLevel;

+   const struct gl_texture_image *img0, *img;

+   GLuint face;

+

+   if (texObj->Target != GL_TEXTURE_CUBE_MAP)

+      return GL_FALSE;

+

+   if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS))

+      return GL_FALSE;

+

+   /* check first face */

+   img0 = texObj->Image[0][baseLevel];

+   if (!img0 ||

+       img0->Width < 1 ||

+       img0->Width != img0->Height)

+      return GL_FALSE;

+

+   /* check remaining faces vs. first face */

+   for (face = 1; face < 6; face++) {

+      img = texObj->Image[face][baseLevel];

+      if (!img ||

+          img->Width != img0->Width ||

+          img->Height != img0->Height ||

+          img->TexFormat != img0->TexFormat)

+         return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Mark a texture object dirty.  It forces the object to be incomplete

+ * and optionally forces the context to re-validate its state.

+ *

+ * \param ctx GL context.

+ * \param texObj texture object.

+ * \param invalidate_state also invalidate context state.

+ */

+void

+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,

+                   GLboolean invalidate_state)

+{

+   texObj->_Complete = GL_FALSE;

+   if (invalidate_state)

+      ctx->NewState |= _NEW_TEXTURE;

+}

+

+

+/**

+ * Return pointer to a default/fallback texture.

+ * The texture is a 2D 8x8 RGBA texture with all texels = (0,0,0,1).

+ * That's the value a sampler should get when sampling from an

+ * incomplete texture.

+ */

+struct gl_texture_object *

+_mesa_get_fallback_texture(struct gl_context *ctx)

+{

+   if (!ctx->Shared->FallbackTex) {

+      /* create fallback texture now */

+      static GLubyte texels[8 * 8][4];

+      struct gl_texture_object *texObj;

+      struct gl_texture_image *texImage;

+      gl_format texFormat;

+      GLuint i;

+

+      for (i = 0; i < 8 * 8; i++) {

+         texels[i][0] =

+         texels[i][1] =

+         texels[i][2] = 0x0;

+         texels[i][3] = 0xff;

+      }

+

+      /* create texture object */

+      texObj = ctx->Driver.NewTextureObject(ctx, 0, GL_TEXTURE_2D);

+      assert(texObj->RefCount == 1);

+      texObj->MinFilter = GL_NEAREST;

+      texObj->MagFilter = GL_NEAREST;

+

+      /* create level[0] texture image */

+      texImage = _mesa_get_tex_image(ctx, texObj, GL_TEXTURE_2D, 0);

+

+      texFormat = ctx->Driver.ChooseTextureFormat(ctx, GL_RGBA, GL_RGBA,

+                                                  GL_UNSIGNED_BYTE);

+

+      /* init the image fields */

+      _mesa_init_teximage_fields(ctx, GL_TEXTURE_2D, texImage,

+                                 8, 8, 1, 0, GL_RGBA, texFormat); 

+

+      ASSERT(texImage->TexFormat != MESA_FORMAT_NONE);

+

+      /* set image data */

+      ctx->Driver.TexImage2D(ctx, GL_TEXTURE_2D, 0, GL_RGBA,

+                             8, 8, 0,

+                             GL_RGBA, GL_UNSIGNED_BYTE, texels,

+                             &ctx->DefaultPacking, texObj, texImage);

+

+      _mesa_test_texobj_completeness(ctx, texObj);

+      assert(texObj->_Complete);

+

+      ctx->Shared->FallbackTex = texObj;

+   }

+   return ctx->Shared->FallbackTex;

+}

+

+

+/*@}*/

+

+

+/***********************************************************************/

+/** \name API functions */

+/*@{*/

+

+

+/**

+ * Generate texture names.

+ *

+ * \param n number of texture names to be generated.

+ * \param textures an array in which will hold the generated texture names.

+ *

+ * \sa glGenTextures().

+ *

+ * Calls _mesa_HashFindFreeKeyBlock() to find a block of free texture

+ * IDs which are stored in \p textures.  Corresponding empty texture

+ * objects are also generated.

+ */ 

+void GLAPIENTRY

+_mesa_GenTextures( GLsizei n, GLuint *textures )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint first;

+   GLint i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glGenTextures" );

+      return;

+   }

+

+   if (!textures)

+      return;

+

+   /*

+    * This must be atomic (generation and allocation of texture IDs)

+    */

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->TexObjects, n);

+

+   /* Allocate new, empty texture objects */

+   for (i = 0; i < n; i++) {

+      struct gl_texture_object *texObj;

+      GLuint name = first + i;

+      GLenum target = 0;

+      texObj = (*ctx->Driver.NewTextureObject)( ctx, name, target);

+      if (!texObj) {

+         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTextures");

+         return;

+      }

+

+      /* insert into hash table */

+      _mesa_HashInsert(ctx->Shared->TexObjects, texObj->Name, texObj);

+

+      textures[i] = name;

+   }

+

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+}

+

+

+/**

+ * Check if the given texture object is bound to the current draw or

+ * read framebuffer.  If so, Unbind it.

+ */

+static void

+unbind_texobj_from_fbo(struct gl_context *ctx,

+                       struct gl_texture_object *texObj)

+{

+   const GLuint n = (ctx->DrawBuffer == ctx->ReadBuffer) ? 1 : 2;

+   GLuint i;

+

+   for (i = 0; i < n; i++) {

+      struct gl_framebuffer *fb = (i == 0) ? ctx->DrawBuffer : ctx->ReadBuffer;

+      if (fb->Name) {

+         GLuint j;

+         for (j = 0; j < BUFFER_COUNT; j++) {

+            if (fb->Attachment[j].Type == GL_TEXTURE &&

+                fb->Attachment[j].Texture == texObj) {

+               _mesa_remove_attachment(ctx, fb->Attachment + j);         

+            }

+         }

+      }

+   }

+}

+

+

+/**

+ * Check if the given texture object is bound to any texture image units and

+ * unbind it if so (revert to default textures).

+ */

+static void

+unbind_texobj_from_texunits(struct gl_context *ctx,

+                            struct gl_texture_object *texObj)

+{

+   GLuint u, tex;

+

+   for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {

+      struct gl_texture_unit *unit = &ctx->Texture.Unit[u];

+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {

+         if (texObj == unit->CurrentTex[tex]) {

+            _mesa_reference_texobj(&unit->CurrentTex[tex],

+                                   ctx->Shared->DefaultTex[tex]);

+            ASSERT(unit->CurrentTex[tex]);

+            break;

+         }

+      }

+   }

+}

+

+

+/**

+ * Delete named textures.

+ *

+ * \param n number of textures to be deleted.

+ * \param textures array of texture IDs to be deleted.

+ *

+ * \sa glDeleteTextures().

+ *

+ * If we're about to delete a texture that's currently bound to any

+ * texture unit, unbind the texture first.  Decrement the reference

+ * count on the texture object and delete it if it's zero.

+ * Recall that texture objects can be shared among several rendering

+ * contexts.

+ */

+void GLAPIENTRY

+_mesa_DeleteTextures( GLsizei n, const GLuint *textures)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* too complex */

+

+   if (!textures)

+      return;

+

+   for (i = 0; i < n; i++) {

+      if (textures[i] > 0) {

+         struct gl_texture_object *delObj

+            = _mesa_lookup_texture(ctx, textures[i]);

+

+         if (delObj) {

+            _mesa_lock_texture(ctx, delObj);

+

+            /* Check if texture is bound to any framebuffer objects.

+             * If so, unbind.

+             * See section 4.4.2.3 of GL_EXT_framebuffer_object.

+             */

+            unbind_texobj_from_fbo(ctx, delObj);

+

+            /* Check if this texture is currently bound to any texture units.

+             * If so, unbind it.

+             */

+            unbind_texobj_from_texunits(ctx, delObj);

+

+            _mesa_unlock_texture(ctx, delObj);

+

+            ctx->NewState |= _NEW_TEXTURE;

+

+            /* The texture _name_ is now free for re-use.

+             * Remove it from the hash table now.

+             */

+            _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+            _mesa_HashRemove(ctx->Shared->TexObjects, delObj->Name);

+            _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+            /* Unreference the texobj.  If refcount hits zero, the texture

+             * will be deleted.

+             */

+            _mesa_reference_texobj(&delObj, NULL);

+         }

+      }

+   }

+}

+

+

+/**

+ * Convert a GL texture target enum such as GL_TEXTURE_2D or GL_TEXTURE_3D

+ * into the corresponding Mesa texture target index.

+ * Note that proxy targets are not valid here.

+ * \return TEXTURE_x_INDEX or -1 if target is invalid

+ */

+static GLint

+target_enum_to_index(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+      return TEXTURE_1D_INDEX;

+   case GL_TEXTURE_2D:

+      return TEXTURE_2D_INDEX;

+   case GL_TEXTURE_3D:

+      return TEXTURE_3D_INDEX;

+   case GL_TEXTURE_CUBE_MAP_ARB:

+      return TEXTURE_CUBE_INDEX;

+   case GL_TEXTURE_RECTANGLE_NV:

+      return TEXTURE_RECT_INDEX;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      return TEXTURE_1D_ARRAY_INDEX;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      return TEXTURE_2D_ARRAY_INDEX;

+   default:

+      return -1;

+   }

+}

+

+

+/**

+ * Bind a named texture to a texturing target.

+ * 

+ * \param target texture target.

+ * \param texName texture name.

+ * 

+ * \sa glBindTexture().

+ *

+ * Determines the old texture object bound and returns immediately if rebinding

+ * the same texture.  Get the current texture which is either a default texture

+ * if name is null, a named texture from the hash, or a new texture if the

+ * given texture name is new. Increments its reference count, binds it, and

+ * calls dd_function_table::BindTexture. Decrements the old texture reference

+ * count and deletes it if it reaches zero.

+ */

+void GLAPIENTRY

+_mesa_BindTexture( GLenum target, GLuint texName )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint unit = ctx->Texture.CurrentUnit;

+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+   struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;

+   GLint targetIndex;

+   GLboolean early_out = GL_FALSE;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glBindTexture %s %d\n",

+                  _mesa_lookup_enum_by_nr(target), (GLint) texName);

+

+   targetIndex = target_enum_to_index(target);

+   if (targetIndex < 0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");

+      return;

+   }

+   assert(targetIndex < NUM_TEXTURE_TARGETS);

+   defaultTexObj = ctx->Shared->DefaultTex[targetIndex];

+

+   /*

+    * Get pointer to new texture object (newTexObj)

+    */

+   if (texName == 0) {

+      newTexObj = defaultTexObj;

+   }

+   else {

+      /* non-default texture object */

+      newTexObj = _mesa_lookup_texture(ctx, texName);

+      if (newTexObj) {

+         /* error checking */

+         if (newTexObj->Target != 0 && newTexObj->Target != target) {

+            /* the named texture object's target doesn't match the given target */

+            _mesa_error( ctx, GL_INVALID_OPERATION,

+                         "glBindTexture(target mismatch)" );

+            return;

+         }

+         if (newTexObj->Target == 0) {

+            finish_texture_init(ctx, target, newTexObj);

+         }

+      }

+      else {

+         /* if this is a new texture id, allocate a texture object now */

+         newTexObj = (*ctx->Driver.NewTextureObject)(ctx, texName, target);

+         if (!newTexObj) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindTexture");

+            return;

+         }

+

+         /* and insert it into hash table */

+         _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+         _mesa_HashInsert(ctx->Shared->TexObjects, texName, newTexObj);

+         _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+      }

+      newTexObj->Target = target;

+   }

+

+   assert(valid_texture_object(newTexObj));

+

+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+   if ((ctx->Shared->RefCount == 1)

+       && (newTexObj == texUnit->CurrentTex[targetIndex])) {

+      early_out = GL_TRUE;

+   }

+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+

+   if (early_out) {

+      return;

+   }

+

+   /* flush before changing binding */

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+

+   /* Do the actual binding.  The refcount on the previously bound

+    * texture object will be decremented.  It'll be deleted if the

+    * count hits zero.

+    */

+   _mesa_reference_texobj(&texUnit->CurrentTex[targetIndex], newTexObj);

+   ASSERT(texUnit->CurrentTex[targetIndex]);

+

+   /* Pass BindTexture call to device driver */

+   if (ctx->Driver.BindTexture)

+      (*ctx->Driver.BindTexture)( ctx, target, newTexObj );

+}

+

+

+/**

+ * Set texture priorities.

+ * 

+ * \param n number of textures.

+ * \param texName texture names.

+ * \param priorities corresponding texture priorities.

+ * 

+ * \sa glPrioritizeTextures().

+ * 

+ * Looks up each texture in the hash, clamps the corresponding priority between

+ * 0.0 and 1.0, and calls dd_function_table::PrioritizeTexture.

+ */

+void GLAPIENTRY

+_mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,

+                          const GLclampf *priorities )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (n < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glPrioritizeTextures" );

+      return;

+   }

+

+   if (!priorities)

+      return;

+

+   for (i = 0; i < n; i++) {

+      if (texName[i] > 0) {

+         struct gl_texture_object *t = _mesa_lookup_texture(ctx, texName[i]);

+         if (t) {

+            t->Priority = CLAMP( priorities[i], 0.0F, 1.0F );

+         }

+      }

+   }

+

+   ctx->NewState |= _NEW_TEXTURE;

+}

+

+

+

+/**

+ * See if textures are loaded in texture memory.

+ * 

+ * \param n number of textures to query.

+ * \param texName array with the texture names.

+ * \param residences array which will hold the residence status.

+ *

+ * \return GL_TRUE if all textures are resident and \p residences is left unchanged, 

+ * 

+ * \sa glAreTexturesResident().

+ *

+ * Looks up each texture in the hash and calls

+ * dd_function_table::IsTextureResident.

+ */

+GLboolean GLAPIENTRY

+_mesa_AreTexturesResident(GLsizei n, const GLuint *texName,

+                          GLboolean *residences)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLboolean allResident = GL_TRUE;

+   GLint i, j;

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident(n)");

+      return GL_FALSE;

+   }

+

+   if (!texName || !residences)

+      return GL_FALSE;

+

+   for (i = 0; i < n; i++) {

+      struct gl_texture_object *t;

+      if (texName[i] == 0) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident");

+         return GL_FALSE;

+      }

+      t = _mesa_lookup_texture(ctx, texName[i]);

+      if (!t) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident");

+         return GL_FALSE;

+      }

+      if (!ctx->Driver.IsTextureResident ||

+          ctx->Driver.IsTextureResident(ctx, t)) {

+         /* The texture is resident */

+         if (!allResident)

+            residences[i] = GL_TRUE;

+      }

+      else {

+         /* The texture is not resident */

+         if (allResident) {

+            allResident = GL_FALSE;

+            for (j = 0; j < i; j++)

+               residences[j] = GL_TRUE;

+         }

+         residences[i] = GL_FALSE;

+      }

+   }

+   

+   return allResident;

+}

+

+

+/**

+ * See if a name corresponds to a texture.

+ *

+ * \param texture texture name.

+ *

+ * \return GL_TRUE if texture name corresponds to a texture, or GL_FALSE

+ * otherwise.

+ * 

+ * \sa glIsTexture().

+ *

+ * Calls _mesa_HashLookup().

+ */

+GLboolean GLAPIENTRY

+_mesa_IsTexture( GLuint texture )

+{

+   struct gl_texture_object *t;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (!texture)

+      return GL_FALSE;

+

+   t = _mesa_lookup_texture(ctx, texture);

+

+   /* IsTexture is true only after object has been bound once. */

+   return t && t->Target;

+}

+

+

+/**

+ * Simplest implementation of texture locking: grab the shared tex

+ * mutex.  Examine the shared context state timestamp and if there has

+ * been a change, set the appropriate bits in ctx->NewState.

+ *

+ * This is used to deal with synchronizing things when a texture object

+ * is used/modified by different contexts (or threads) which are sharing

+ * the texture.

+ *

+ * See also _mesa_lock/unlock_texture() in teximage.h

+ */

+void

+_mesa_lock_context_textures( struct gl_context *ctx )

+{

+   _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);

+

+   if (ctx->Shared->TextureStateStamp != ctx->TextureStateTimestamp) {

+      ctx->NewState |= _NEW_TEXTURE;

+      ctx->TextureStateTimestamp = ctx->Shared->TextureStateStamp;

+   }

+}

+

+

+void

+_mesa_unlock_context_textures( struct gl_context *ctx )

+{

+   assert(ctx->Shared->TextureStateStamp == ctx->TextureStateTimestamp);

+   _glthread_UNLOCK_MUTEX(ctx->Shared->TexMutex);

+}

+

+/*@}*/

diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index 9bfebd45c..09c738fda 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -1,118 +1,122 @@
-/**
- * \file texobj.h
- * Texture object management.
- */
-
-/*
- * 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.
- */
-
-
-#ifndef TEXTOBJ_H
-#define TEXTOBJ_H
-
-
-#include "mtypes.h"
-
-
-/**
- * \name Internal functions
- */
-/*@{*/
-
-extern struct gl_texture_object *
-_mesa_lookup_texture(GLcontext *ctx, GLuint id);
-
-extern struct gl_texture_object *
-_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
-
-extern void
-_mesa_initialize_texture_object( struct gl_texture_object *obj,
-                                 GLuint name, GLenum target );
-
-extern void
-_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
-
-extern void
-_mesa_copy_texture_object( struct gl_texture_object *dest,
-                           const struct gl_texture_object *src );
-
-extern void
-_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *obj);
-
-extern void
-_mesa_reference_texobj(struct gl_texture_object **ptr,
-                       struct gl_texture_object *tex);
-
-extern void
-_mesa_test_texobj_completeness( const GLcontext *ctx,
-                                struct gl_texture_object *obj );
-
-extern void
-_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
-                   GLboolean invalidate_state);
-
-extern struct gl_texture_object *
-_mesa_get_fallback_texture(GLcontext *ctx);
-
-extern void
-_mesa_unlock_context_textures( GLcontext *ctx );
-
-extern void
-_mesa_lock_context_textures( GLcontext *ctx );
-
-/*@}*/
-
-/**
- * \name API functions
- */
-/*@{*/
-
-extern void GLAPIENTRY
-_mesa_GenTextures( GLsizei n, GLuint *textures );
-
-
-extern void GLAPIENTRY
-_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
-
-
-extern void GLAPIENTRY
-_mesa_BindTexture( GLenum target, GLuint texture );
-
-
-extern void GLAPIENTRY
-_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
-                          const GLclampf *priorities );
-
-
-extern GLboolean GLAPIENTRY
-_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
-                           GLboolean *residences );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsTexture( GLuint texture );
-
-/*@}*/
-
-
-#endif
+/**

+ * \file texobj.h

+ * Texture object management.

+ */

+

+/*

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

+ */

+

+

+#ifndef TEXTOBJ_H

+#define TEXTOBJ_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+/**

+ * \name Internal functions

+ */

+/*@{*/

+

+extern struct gl_texture_object *

+_mesa_lookup_texture(struct gl_context *ctx, GLuint id);

+

+extern struct gl_texture_object *

+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );

+

+extern void

+_mesa_initialize_texture_object( struct gl_texture_object *obj,

+                                 GLuint name, GLenum target );

+

+extern void

+_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *obj );

+

+extern void

+_mesa_copy_texture_object( struct gl_texture_object *dest,

+                           const struct gl_texture_object *src );

+

+extern void

+_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *obj);

+

+extern void

+_mesa_reference_texobj(struct gl_texture_object **ptr,

+                       struct gl_texture_object *tex);

+

+extern void

+_mesa_test_texobj_completeness( const struct gl_context *ctx,

+                                struct gl_texture_object *obj );

+

+extern GLboolean

+_mesa_cube_complete(const struct gl_texture_object *texObj);

+

+extern void

+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,

+                   GLboolean invalidate_state);

+

+extern struct gl_texture_object *

+_mesa_get_fallback_texture(struct gl_context *ctx);

+

+extern void

+_mesa_unlock_context_textures( struct gl_context *ctx );

+

+extern void

+_mesa_lock_context_textures( struct gl_context *ctx );

+

+/*@}*/

+

+/**

+ * \name API functions

+ */

+/*@{*/

+

+extern void GLAPIENTRY

+_mesa_GenTextures( GLsizei n, GLuint *textures );

+

+

+extern void GLAPIENTRY

+_mesa_DeleteTextures( GLsizei n, const GLuint *textures );

+

+

+extern void GLAPIENTRY

+_mesa_BindTexture( GLenum target, GLuint texture );

+

+

+extern void GLAPIENTRY

+_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,

+                          const GLclampf *priorities );

+

+

+extern GLboolean GLAPIENTRY

+_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,

+                           GLboolean *residences );

+

+extern GLboolean GLAPIENTRY

+_mesa_IsTexture( GLuint texture );

+

+/*@}*/

+

+

+#endif

diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 745a0aeec..996218b16 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -1,1422 +1,1417 @@
-/*
- * 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/formats.h"
-#include "main/macros.h"
-#include "main/texcompress.h"
-#include "main/texparam.h"
-#include "main/teximage.h"
-#include "main/texstate.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(GLcontext * 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(GLcontext *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) {
-         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
-      }
-      break;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      if (ctx->Extensions.MESA_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.
- * 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
-flush(GLcontext *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(GLcontext *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:
-         flush(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) {
-            flush(ctx, texObj);
-            texObj->MinFilter = params[0];
-            return GL_TRUE;
-         }
-         /* fall-through */
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",
-                      params[0] );
-      }
-      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, texObj);
-         texObj->MagFilter = params[0];
-         return GL_TRUE;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",
-                      params[0]);
-      }
-      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);
-         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);
-         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);
-         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;
-      }
-      flush(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;
-      }
-      flush(ctx, texObj);
-      texObj->MaxLevel = params[0];
-      return GL_TRUE;
-
-   case GL_GENERATE_MIPMAP_SGIS:
-      if (ctx->Extensions.SGIS_generate_mipmap) {
-         if (texObj->GenerateMipmap != params[0]) {
-            flush(ctx, texObj);
-            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
-            return GL_TRUE;
-         }
-         return GL_FALSE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
-      }
-      return GL_FALSE;
-
-   case GL_TEXTURE_COMPARE_MODE_ARB:
-      if (ctx->Extensions.ARB_shadow &&
-          (params[0] == GL_NONE ||
-           params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) {
-         if (texObj->CompareMode != params[0]) {
-            flush(ctx, texObj);
-            texObj->CompareMode = params[0];
-            return GL_TRUE;
-         }
-         return GL_FALSE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(GL_TEXTURE_COMPARE_MODE_ARB)");
-      }
-      return GL_FALSE;
-
-   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);
-            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);
-               texObj->CompareFunc = params[0];
-               return GL_TRUE;
-            }
-            /* fall-through */
-         default:
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(GL_TEXTURE_COMPARE_FUNC_ARB)");
-         }
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-      }
-      return GL_FALSE;
-
-   case GL_DEPTH_TEXTURE_MODE_ARB:
-      if (ctx->Extensions.ARB_depth_texture &&
-          (params[0] == GL_LUMINANCE ||
-           params[0] == GL_INTENSITY ||
-           params[0] == GL_ALPHA)) {
-         if (texObj->DepthMode != params[0]) {
-            flush(ctx, texObj);
-            texObj->DepthMode = params[0];
-            return GL_TRUE;
-         }
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(GL_DEPTH_TEXTURE_MODE_ARB)");
-      }
-      return GL_FALSE;
-
-#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);
-            texObj->Swizzle[comp] = params[0];
-            set_swizzle_component(&texObj->_Swizzle, comp, swz);
-            return GL_TRUE;
-         }
-      }
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-      return GL_FALSE;
-
-   case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-      if (ctx->Extensions.EXT_texture_swizzle) {
-         GLuint comp;
-         flush(ctx, texObj);
-         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;
-      }
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-      return GL_FALSE;
-
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
-   }
-   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(GLcontext *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);
-      texObj->MinLod = params[0];
-      return GL_TRUE;
-
-   case GL_TEXTURE_MAX_LOD:
-      if (texObj->MaxLod == params[0])
-         return GL_FALSE;
-      flush(ctx, texObj);
-      texObj->MaxLod = params[0];
-      return GL_TRUE;
-
-   case GL_TEXTURE_PRIORITY:
-      flush(ctx, texObj);
-      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, texObj);
-         /* 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);
-            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);
-            texObj->LodBias = params[0];
-            return GL_TRUE;
-         }
-         return GL_FALSE;
-      }
-      break;
-
-   case GL_TEXTURE_BORDER_COLOR:
-      flush(ctx, texObj);
-      texObj->BorderColor.f[RCOMP] = params[0];
-      texObj->BorderColor.f[GCOMP] = params[1];
-      texObj->BorderColor.f[BCOMP] = params[2];
-      texObj->BorderColor.f[ACOMP] = params[3];
-      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:
-      {
-         /* 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:
-      {
-         /* 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;
-   GLboolean isProxy;
-   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);
-   _mesa_lock_texture(ctx, texObj);
-
-   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;
-      goto out;
-   }
-
-   texFormat = img->TexFormat;
-
-   isProxy = _mesa_is_proxy_texture(target);
-
-   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(img->TexFormat)) {
-            /* need to return the actual compressed format */
-            *params = _mesa_compressed_format_to_glenum(ctx, img->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:
-      case GL_TEXTURE_GREEN_SIZE:
-      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
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-
-      /* GL_ARB_texture_compression */
-      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
-	 if (_mesa_is_format_compressed(img->TexFormat) && !isProxy) {
-            *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(img->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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(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 {
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glGetTexLevelParameter[if]v(pname)");
-         }
-         break;
-
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glGetTexLevelParameter[if]v(pname)");
-   }
-
- out:
-   _mesa_unlock_texture(ctx, texObj);
-}
-
-
-
-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:
-         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);
-         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:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            *params = (GLfloat) obj->GenerateMipmap;
-         }
-	 else 
-	    error = GL_TRUE;
-         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:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            *params = (GLint) obj->GenerateMipmap;
-         }
-         else {
-            error = GL_TRUE;
-         }
-         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/formats.h"

+#include "main/macros.h"

+#include "main/texcompress.h"

+#include "main/texparam.h"

+#include "main/teximage.h"

+#include "main/texstate.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) {

+         return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];

+      }

+      break;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      if (ctx->Extensions.MESA_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.

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

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

+         flush(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) {

+            flush(ctx, texObj);

+            texObj->MinFilter = params[0];

+            return GL_TRUE;

+         }

+         /* fall-through */

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",

+                      params[0] );

+      }

+      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, texObj);

+         texObj->MagFilter = params[0];

+         return GL_TRUE;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)",

+                      params[0]);

+      }

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

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

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

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

+      }

+      flush(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;

+      }

+      flush(ctx, texObj);

+      texObj->MaxLevel = params[0];

+      return GL_TRUE;

+

+   case GL_GENERATE_MIPMAP_SGIS:

+      if (texObj->GenerateMipmap != params[0]) {

+	 flush(ctx, texObj);

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

+          (params[0] == GL_NONE ||

+           params[0] == GL_COMPARE_R_TO_TEXTURE_ARB)) {

+         if (texObj->CompareMode != params[0]) {

+            flush(ctx, texObj);

+            texObj->CompareMode = params[0];

+            return GL_TRUE;

+         }

+         return GL_FALSE;

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glTexParameter(GL_TEXTURE_COMPARE_MODE_ARB)");

+      }

+      return GL_FALSE;

+

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

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

+               texObj->CompareFunc = params[0];

+               return GL_TRUE;

+            }

+            /* fall-through */

+         default:

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glTexParameter(GL_TEXTURE_COMPARE_FUNC_ARB)");

+         }

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);

+      }

+      return GL_FALSE;

+

+   case GL_DEPTH_TEXTURE_MODE_ARB:

+      if (ctx->Extensions.ARB_depth_texture &&

+          (params[0] == GL_LUMINANCE ||

+           params[0] == GL_INTENSITY ||

+           params[0] == GL_ALPHA ||

+	   (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED))) {

+         if (texObj->DepthMode != params[0]) {

+            flush(ctx, texObj);

+            texObj->DepthMode = params[0];

+            return GL_TRUE;

+         }

+      }

+      else {

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glTexParameter(GL_DEPTH_TEXTURE_MODE_ARB)");

+      }

+      return GL_FALSE;

+

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

+            texObj->Swizzle[comp] = params[0];

+            set_swizzle_component(&texObj->_Swizzle, comp, swz);

+            return GL_TRUE;

+         }

+      }

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);

+      return GL_FALSE;

+

+   case GL_TEXTURE_SWIZZLE_RGBA_EXT:

+      if (ctx->Extensions.EXT_texture_swizzle) {

+         GLuint comp;

+         flush(ctx, texObj);

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

+      }

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);

+      return GL_FALSE;

+

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);

+   }

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

+      texObj->MinLod = params[0];

+      return GL_TRUE;

+

+   case GL_TEXTURE_MAX_LOD:

+      if (texObj->MaxLod == params[0])

+         return GL_FALSE;

+      flush(ctx, texObj);

+      texObj->MaxLod = params[0];

+      return GL_TRUE;

+

+   case GL_TEXTURE_PRIORITY:

+      flush(ctx, texObj);

+      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, texObj);

+         /* 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);

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

+            texObj->LodBias = params[0];

+            return GL_TRUE;

+         }

+         return GL_FALSE;

+      }

+      break;

+

+   case GL_TEXTURE_BORDER_COLOR:

+      flush(ctx, texObj);

+      texObj->BorderColor.f[RCOMP] = params[0];

+      texObj->BorderColor.f[GCOMP] = params[1];

+      texObj->BorderColor.f[BCOMP] = params[2];

+      texObj->BorderColor.f[ACOMP] = params[3];

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

+      {

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

+      {

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

+   GLboolean isProxy;

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

+   _mesa_lock_texture(ctx, texObj);

+

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

+      goto out;

+   }

+

+   texFormat = img->TexFormat;

+

+   isProxy = _mesa_is_proxy_texture(target);

+

+   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(img->TexFormat)) {

+            /* need to return the actual compressed format */

+            *params = _mesa_compressed_format_to_glenum(ctx, img->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

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(pname)");

+         }

+         break;

+

+      /* GL_ARB_texture_compression */

+      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:

+	 if (_mesa_is_format_compressed(img->TexFormat) && !isProxy) {

+            *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(img->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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(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 {

+            _mesa_error(ctx, GL_INVALID_ENUM,

+                        "glGetTexLevelParameter[if]v(pname)");

+         }

+         break;

+

+      default:

+         _mesa_error(ctx, GL_INVALID_ENUM,

+                     "glGetTexLevelParameter[if]v(pname)");

+   }

+

+ out:

+   _mesa_unlock_texture(ctx, texObj);

+}

+

+

+

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

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

+         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/texrender.c b/mesalib/src/mesa/main/texrender.c
index c68105b39..6d5531f18 100644
--- a/mesalib/src/mesa/main/texrender.c
+++ b/mesalib/src/mesa/main/texrender.c
@@ -1,635 +1,635 @@
-
-#include "context.h"
-#include "colormac.h"
-#include "macros.h"
-#include "texfetch.h"
-#include "texrender.h"
-#include "renderbuffer.h"
-
-
-/*
- * Render-to-texture code for GL_EXT_framebuffer_object
- */
-
-
-/**
- * Derived from gl_renderbuffer class
- */
-struct texture_renderbuffer
-{
-   struct gl_renderbuffer Base;   /**< Base class object */
-   struct gl_texture_image *TexImage;
-   StoreTexelFunc Store;
-   GLint Yoffset;                 /**< Layer for 1D array textures. */
-   GLint Zoffset;                 /**< Layer for 2D array textures, or slice
-				   * for 3D textures
-				   */
-};
-
-
-/**
- * Get row of values from the renderbuffer that wraps a texture image.
- */
-static void
-texture_get_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, void *values)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   ASSERT(trb->TexImage->Width == rb->Width);
-   ASSERT(trb->TexImage->Height == rb->Height);
-
-   y += trb->Yoffset;
-
-   if (rb->DataType == CHAN_TYPE) {
-      GLchan *rgbaOut = (GLchan *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat rgba[4];
-         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, rgba);
-         UNCLAMPED_FLOAT_TO_RGBA_CHAN(rgbaOut + 4 * i, rgba);
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      GLushort *zValues = (GLushort *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);
-         zValues[i] = (GLushort) (flt * 0xffff);
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      GLuint *zValues = (GLuint *) values;
-      /*
-      const GLdouble scale = (GLdouble) 0xffffffff;
-      */
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);
-#if 0
-         /* this should work, but doesn't (overflow due to low precision) */
-         zValues[i] = (GLuint) (flt * scale);
-#else
-         /* temporary hack */
-         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;
-#endif
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      GLuint *zValues = (GLuint *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);
-         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      GLuint *zValues = (GLuint *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);
-         zValues[i] = (GLuint) (flt * 0xffffff);
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_get_row");
-   }
-}
-
-
-static void
-texture_get_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   const GLint x[], const GLint y[], void *values)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   if (rb->DataType == CHAN_TYPE) {
-      GLchan *rgbaOut = (GLchan *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat rgba[4];
-         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,
-				    z, rgba);
-         UNCLAMPED_FLOAT_TO_RGBA_CHAN(rgbaOut + 4 * i, rgba);
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      GLushort *zValues = (GLushort *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,
-				    z, &flt);
-         zValues[i] = (GLushort) (flt * 0xffff);
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      GLuint *zValues = (GLuint *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,
-				    z, &flt);
-#if 0
-         zValues[i] = (GLuint) (flt * 0xffffffff);
-#else
-         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;
-#endif
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      GLuint *zValues = (GLuint *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,
-				    z, &flt);
-         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      GLuint *zValues = (GLuint *) values;
-      for (i = 0; i < count; i++) {
-         GLfloat flt;
-         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,
-				    z, &flt);
-         zValues[i] = (GLuint) (flt * 0xffffff);
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_get_values");
-   }
-}
-
-
-/**
- * Put row of values into a renderbuffer that wraps a texture image.
- */
-static void
-texture_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   y += trb->Yoffset;
-
-   if (rb->DataType == CHAN_TYPE) {
-      const GLchan *rgba = (const GLchan *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, rgba);
-         }
-         rgba += 4;
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLushort *zValues = (const GLushort *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, zValues + i);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, zValues + i);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));
-            trb->Store(trb->TexImage, x + i, y, z, &flt);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));
-            trb->Store(trb->TexImage, x + i, y, z, &flt);
-         }
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");
-   }
-}
-
-/**
- * Put row of RGB values into a renderbuffer that wraps a texture image.
- */
-static void
-texture_put_row_rgb(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                GLint x, GLint y, const void *values, const GLubyte *mask)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   y += trb->Yoffset;
-
-   if (rb->DataType == CHAN_TYPE) {
-      const GLchan *rgb = (const GLchan *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, rgb);
-         }
-         rgb += 3;
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLushort *zValues = (const GLushort *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, zValues + i);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, zValues + i);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));
-            trb->Store(trb->TexImage, x + i, y, z, &flt);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));
-            trb->Store(trb->TexImage, x + i, y, z, &flt);
-         }
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");
-   }
-}
-
-
-static void
-texture_put_mono_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                     GLint x, GLint y, const void *value, const GLubyte *mask)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   y += trb->Yoffset;
-
-   if (rb->DataType == CHAN_TYPE) {
-      const GLchan *rgba = (const GLchan *) value;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, rgba);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLushort zValue = *((const GLushort *) value);
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, &zValue);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      const GLuint zValue = *((const GLuint *) value);
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, &zValue);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      const GLuint zValue = *((const GLuint *) value);
-      const GLfloat flt = (GLfloat) ((zValue >> 8) * (1.0 / 0xffffff));
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, &flt);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      const GLuint zValue = *((const GLuint *) value);
-      const GLfloat flt = (GLfloat) ((zValue & 0xffffff) * (1.0 / 0xffffff));
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x + i, y, z, &flt);
-         }
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_put_mono_row");
-   }
-}
-
-
-static void
-texture_put_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
-                   const GLint x[], const GLint y[], const void *values,
-                   const GLubyte *mask)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   if (rb->DataType == CHAN_TYPE) {
-      const GLchan *rgba = (const GLchan *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, rgba);
-         }
-         rgba += 4;
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLushort *zValues = (const GLushort *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, zValues + i);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, zValues + i);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      const GLuint *zValues = (const GLuint *) values;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
-         }
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_put_values");
-   }
-}
-
-
-static void
-texture_put_mono_values(GLcontext *ctx, struct gl_renderbuffer *rb,
-                        GLuint count, const GLint x[], const GLint y[],
-                        const void *value, const GLubyte *mask)
-{
-   const struct texture_renderbuffer *trb
-      = (const struct texture_renderbuffer *) rb;
-   const GLint z = trb->Zoffset;
-   GLuint i;
-
-   if (rb->DataType == CHAN_TYPE) {
-      const GLchan *rgba = (const GLchan *) value;
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, rgba);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT) {
-      const GLuint zValue = *((const GLuint *) value);
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &zValue);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLushort zValue = *((const GLushort *) value);
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &zValue);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {
-      const GLuint zValue = *((const GLuint *) value);
-      const GLfloat flt = (GLfloat) ((zValue >> 8) * (1.0 / 0xffffff));
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
-      const GLuint zValue = *((const GLuint *) value);
-      const GLfloat flt = (GLfloat) ((zValue & 0xffffff) * (1.0 / 0xffffff));
-      for (i = 0; i < count; i++) {
-         if (!mask || mask[i]) {
-            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
-         }
-      }
-   }
-   else {
-      _mesa_problem(ctx, "invalid rb->DataType in texture_put_mono_values");
-   }
-}
-
-
-static void
-store_nop(struct gl_texture_image *texImage,
-          GLint col, GLint row, GLint img,
-          const void *texel)
-{
-}
-
-
-static void
-delete_texture_wrapper(struct gl_renderbuffer *rb)
-{
-   ASSERT(rb->RefCount == 0);
-   free(rb);
-}
-
-
-/**
- * This function creates a renderbuffer object which wraps a texture image.
- * The new renderbuffer is plugged into the given attachment point.
- * This allows rendering into the texture as if it were a renderbuffer.
- */
-static void
-wrap_texture(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
-{
-   struct texture_renderbuffer *trb;
-   const GLuint name = 0;
-
-   ASSERT(att->Type == GL_TEXTURE);
-   ASSERT(att->Renderbuffer == NULL);
-
-   trb = CALLOC_STRUCT(texture_renderbuffer);
-   if (!trb) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "wrap_texture");
-      return;
-   }
-
-   /* init base gl_renderbuffer fields */
-   _mesa_init_renderbuffer(&trb->Base, name);
-   /* plug in our texture_renderbuffer-specific functions */
-   trb->Base.Delete = delete_texture_wrapper;
-   trb->Base.AllocStorage = NULL; /* illegal! */
-   trb->Base.GetRow = texture_get_row;
-   trb->Base.GetValues = texture_get_values;
-   trb->Base.PutRow = texture_put_row;
-   trb->Base.PutRowRGB = texture_put_row_rgb;
-   trb->Base.PutMonoRow = texture_put_mono_row;
-   trb->Base.PutValues = texture_put_values;
-   trb->Base.PutMonoValues = texture_put_mono_values;
-
-   /* update attachment point */
-   _mesa_reference_renderbuffer(&att->Renderbuffer, &(trb->Base));
-}
-
-
-
-/**
- * Update the renderbuffer wrapper for rendering to a texture.
- * For example, update the width, height of the RB based on the texture size,
- * update the internal format info, etc.
- */
-static void
-update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
-{
-   struct texture_renderbuffer *trb
-      = (struct texture_renderbuffer *) att->Renderbuffer;
-
-   (void) ctx;
-   ASSERT(trb);
-
-   trb->TexImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
-   ASSERT(trb->TexImage);
-
-   trb->Store = _mesa_get_texel_store_func(trb->TexImage->TexFormat);
-   if (!trb->Store) {
-      /* we'll never draw into some textures (compressed formats) */
-      trb->Store = store_nop;
-   }
-
-   if (att->Texture->Target == GL_TEXTURE_1D_ARRAY_EXT) {
-      trb->Yoffset = att->Zoffset;
-      trb->Zoffset = 0;
-   }
-   else {
-      trb->Yoffset = 0;
-      trb->Zoffset = att->Zoffset;
-   }
-
-   trb->Base.Width = trb->TexImage->Width;
-   trb->Base.Height = trb->TexImage->Height;
-   trb->Base.InternalFormat = trb->TexImage->InternalFormat;
-   trb->Base.Format = trb->TexImage->TexFormat;
-
-   /* XXX may need more special cases here */
-   switch (trb->TexImage->TexFormat) {
-   case MESA_FORMAT_Z24_S8:
-      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
-      trb->Base._BaseFormat = GL_DEPTH_STENCIL;
-      break;
-   case MESA_FORMAT_S8_Z24:
-      trb->Base.DataType = GL_UNSIGNED_INT_8_24_REV_MESA;
-      trb->Base._BaseFormat = GL_DEPTH_STENCIL;
-      break;
-   case MESA_FORMAT_Z24_X8:
-      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
-      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
-      break;
-   case MESA_FORMAT_X8_Z24:
-      trb->Base.DataType = GL_UNSIGNED_INT_8_24_REV_MESA;
-      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
-      break;
-   case MESA_FORMAT_Z16:
-      trb->Base.DataType = GL_UNSIGNED_SHORT;
-      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
-      break;
-   case MESA_FORMAT_Z32:
-      trb->Base.DataType = GL_UNSIGNED_INT;
-      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
-      break;
-   default:
-      trb->Base.DataType = CHAN_TYPE;
-      trb->Base._BaseFormat = GL_RGBA;
-   }
-   trb->Base.Data = trb->TexImage->Data;
-}
-
-
-
-/**
- * Called when rendering to a texture image begins, or when changing
- * the dest mipmap level, cube face, etc.
- * This is a fallback routine for software render-to-texture.
- *
- * Called via the glRenderbufferTexture1D/2D/3D() functions
- * and elsewhere (such as glTexImage2D).
- *
- * The image we're rendering into is
- * att->Texture->Image[att->CubeMapFace][att->TextureLevel];
- * It'll never be NULL.
- *
- * \param fb  the framebuffer object the texture is being bound to
- * \param att  the fb attachment point of the texture
- *
- * \sa _mesa_framebuffer_renderbuffer
- */
-void
-_mesa_render_texture(GLcontext *ctx,
-                     struct gl_framebuffer *fb,
-                     struct gl_renderbuffer_attachment *att)
-{
-   (void) fb;
-
-   if (!att->Renderbuffer) {
-      wrap_texture(ctx, att);
-   }
-   update_wrapper(ctx, att);
-}
-
-
-void
-_mesa_finish_render_texture(GLcontext *ctx,
-                            struct gl_renderbuffer_attachment *att)
-{
-   /* do nothing */
-   /* The renderbuffer texture wrapper will get deleted by the
-    * normal mechanism for deleting renderbuffers.
-    */
-   (void) ctx;
-   (void) att;
-}
+

+#include "context.h"

+#include "colormac.h"

+#include "macros.h"

+#include "texfetch.h"

+#include "texrender.h"

+#include "renderbuffer.h"

+

+

+/*

+ * Render-to-texture code for GL_EXT_framebuffer_object

+ */

+

+

+/**

+ * Derived from gl_renderbuffer class

+ */

+struct texture_renderbuffer

+{

+   struct gl_renderbuffer Base;   /**< Base class object */

+   struct gl_texture_image *TexImage;

+   StoreTexelFunc Store;

+   GLint Yoffset;                 /**< Layer for 1D array textures. */

+   GLint Zoffset;                 /**< Layer for 2D array textures, or slice

+				   * for 3D textures

+				   */

+};

+

+

+/**

+ * Get row of values from the renderbuffer that wraps a texture image.

+ */

+static void

+texture_get_row(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                GLint x, GLint y, void *values)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   ASSERT(trb->TexImage->Width == rb->Width);

+   ASSERT(trb->TexImage->Height == rb->Height);

+

+   y += trb->Yoffset;

+

+   if (rb->DataType == CHAN_TYPE) {

+      GLchan *rgbaOut = (GLchan *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat rgba[4];

+         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, rgba);

+         UNCLAMPED_FLOAT_TO_RGBA_CHAN(rgbaOut + 4 * i, rgba);

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      GLushort *zValues = (GLushort *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);

+         zValues[i] = (GLushort) (flt * 0xffff);

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      GLuint *zValues = (GLuint *) values;

+      /*

+      const GLdouble scale = (GLdouble) 0xffffffff;

+      */

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);

+#if 0

+         /* this should work, but doesn't (overflow due to low precision) */

+         zValues[i] = (GLuint) (flt * scale);

+#else

+         /* temporary hack */

+         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;

+#endif

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      GLuint *zValues = (GLuint *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);

+         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      GLuint *zValues = (GLuint *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);

+         zValues[i] = (GLuint) (flt * 0xffffff);

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_get_row");

+   }

+}

+

+

+static void

+texture_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   const GLint x[], const GLint y[], void *values)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   if (rb->DataType == CHAN_TYPE) {

+      GLchan *rgbaOut = (GLchan *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat rgba[4];

+         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,

+				    z, rgba);

+         UNCLAMPED_FLOAT_TO_RGBA_CHAN(rgbaOut + 4 * i, rgba);

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      GLushort *zValues = (GLushort *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,

+				    z, &flt);

+         zValues[i] = (GLushort) (flt * 0xffff);

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      GLuint *zValues = (GLuint *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,

+				    z, &flt);

+#if 0

+         zValues[i] = (GLuint) (flt * 0xffffffff);

+#else

+         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;

+#endif

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      GLuint *zValues = (GLuint *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,

+				    z, &flt);

+         zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      GLuint *zValues = (GLuint *) values;

+      for (i = 0; i < count; i++) {

+         GLfloat flt;

+         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,

+				    z, &flt);

+         zValues[i] = (GLuint) (flt * 0xffffff);

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_get_values");

+   }

+}

+

+

+/**

+ * Put row of values into a renderbuffer that wraps a texture image.

+ */

+static void

+texture_put_row(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   y += trb->Yoffset;

+

+   if (rb->DataType == CHAN_TYPE) {

+      const GLchan *rgba = (const GLchan *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, rgba);

+         }

+         rgba += 4;

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLushort *zValues = (const GLushort *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, zValues + i);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, zValues + i);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));

+            trb->Store(trb->TexImage, x + i, y, z, &flt);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));

+            trb->Store(trb->TexImage, x + i, y, z, &flt);

+         }

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");

+   }

+}

+

+/**

+ * Put row of RGB values into a renderbuffer that wraps a texture image.

+ */

+static void

+texture_put_row_rgb(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                GLint x, GLint y, const void *values, const GLubyte *mask)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   y += trb->Yoffset;

+

+   if (rb->DataType == CHAN_TYPE) {

+      const GLchan *rgb = (const GLchan *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, rgb);

+         }

+         rgb += 3;

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLushort *zValues = (const GLushort *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, zValues + i);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, zValues + i);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));

+            trb->Store(trb->TexImage, x + i, y, z, &flt);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));

+            trb->Store(trb->TexImage, x + i, y, z, &flt);

+         }

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");

+   }

+}

+

+

+static void

+texture_put_mono_row(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                     GLint x, GLint y, const void *value, const GLubyte *mask)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   y += trb->Yoffset;

+

+   if (rb->DataType == CHAN_TYPE) {

+      const GLchan *rgba = (const GLchan *) value;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, rgba);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLushort zValue = *((const GLushort *) value);

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, &zValue);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      const GLuint zValue = *((const GLuint *) value);

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, &zValue);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      const GLuint zValue = *((const GLuint *) value);

+      const GLfloat flt = (GLfloat) ((zValue >> 8) * (1.0 / 0xffffff));

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, &flt);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      const GLuint zValue = *((const GLuint *) value);

+      const GLfloat flt = (GLfloat) ((zValue & 0xffffff) * (1.0 / 0xffffff));

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x + i, y, z, &flt);

+         }

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_put_mono_row");

+   }

+}

+

+

+static void

+texture_put_values(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,

+                   const GLint x[], const GLint y[], const void *values,

+                   const GLubyte *mask)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   if (rb->DataType == CHAN_TYPE) {

+      const GLchan *rgba = (const GLchan *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, rgba);

+         }

+         rgba += 4;

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLushort *zValues = (const GLushort *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, zValues + i);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, zValues + i);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            GLfloat flt = (GLfloat) ((zValues[i] >> 8) * (1.0 / 0xffffff));

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      const GLuint *zValues = (const GLuint *) values;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);

+         }

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_put_values");

+   }

+}

+

+

+static void

+texture_put_mono_values(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                        GLuint count, const GLint x[], const GLint y[],

+                        const void *value, const GLubyte *mask)

+{

+   const struct texture_renderbuffer *trb

+      = (const struct texture_renderbuffer *) rb;

+   const GLint z = trb->Zoffset;

+   GLuint i;

+

+   if (rb->DataType == CHAN_TYPE) {

+      const GLchan *rgba = (const GLchan *) value;

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, rgba);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT) {

+      const GLuint zValue = *((const GLuint *) value);

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &zValue);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLushort zValue = *((const GLushort *) value);

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &zValue);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_24_8_EXT) {

+      const GLuint zValue = *((const GLuint *) value);

+      const GLfloat flt = (GLfloat) ((zValue >> 8) * (1.0 / 0xffffff));

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {

+      const GLuint zValue = *((const GLuint *) value);

+      const GLfloat flt = (GLfloat) ((zValue & 0xffffff) * (1.0 / 0xffffff));

+      for (i = 0; i < count; i++) {

+         if (!mask || mask[i]) {

+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);

+         }

+      }

+   }

+   else {

+      _mesa_problem(ctx, "invalid rb->DataType in texture_put_mono_values");

+   }

+}

+

+

+static void

+store_nop(struct gl_texture_image *texImage,

+          GLint col, GLint row, GLint img,

+          const void *texel)

+{

+}

+

+

+static void

+delete_texture_wrapper(struct gl_renderbuffer *rb)

+{

+   ASSERT(rb->RefCount == 0);

+   free(rb);

+}

+

+

+/**

+ * This function creates a renderbuffer object which wraps a texture image.

+ * The new renderbuffer is plugged into the given attachment point.

+ * This allows rendering into the texture as if it were a renderbuffer.

+ */

+static void

+wrap_texture(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)

+{

+   struct texture_renderbuffer *trb;

+   const GLuint name = 0;

+

+   ASSERT(att->Type == GL_TEXTURE);

+   ASSERT(att->Renderbuffer == NULL);

+

+   trb = CALLOC_STRUCT(texture_renderbuffer);

+   if (!trb) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "wrap_texture");

+      return;

+   }

+

+   /* init base gl_renderbuffer fields */

+   _mesa_init_renderbuffer(&trb->Base, name);

+   /* plug in our texture_renderbuffer-specific functions */

+   trb->Base.Delete = delete_texture_wrapper;

+   trb->Base.AllocStorage = NULL; /* illegal! */

+   trb->Base.GetRow = texture_get_row;

+   trb->Base.GetValues = texture_get_values;

+   trb->Base.PutRow = texture_put_row;

+   trb->Base.PutRowRGB = texture_put_row_rgb;

+   trb->Base.PutMonoRow = texture_put_mono_row;

+   trb->Base.PutValues = texture_put_values;

+   trb->Base.PutMonoValues = texture_put_mono_values;

+

+   /* update attachment point */

+   _mesa_reference_renderbuffer(&att->Renderbuffer, &(trb->Base));

+}

+

+

+

+/**

+ * Update the renderbuffer wrapper for rendering to a texture.

+ * For example, update the width, height of the RB based on the texture size,

+ * update the internal format info, etc.

+ */

+static void

+update_wrapper(struct gl_context *ctx, const struct gl_renderbuffer_attachment *att)

+{

+   struct texture_renderbuffer *trb

+      = (struct texture_renderbuffer *) att->Renderbuffer;

+

+   (void) ctx;

+   ASSERT(trb);

+

+   trb->TexImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];

+   ASSERT(trb->TexImage);

+

+   trb->Store = _mesa_get_texel_store_func(trb->TexImage->TexFormat);

+   if (!trb->Store) {

+      /* we'll never draw into some textures (compressed formats) */

+      trb->Store = store_nop;

+   }

+

+   if (att->Texture->Target == GL_TEXTURE_1D_ARRAY_EXT) {

+      trb->Yoffset = att->Zoffset;

+      trb->Zoffset = 0;

+   }

+   else {

+      trb->Yoffset = 0;

+      trb->Zoffset = att->Zoffset;

+   }

+

+   trb->Base.Width = trb->TexImage->Width;

+   trb->Base.Height = trb->TexImage->Height;

+   trb->Base.InternalFormat = trb->TexImage->InternalFormat;

+   trb->Base.Format = trb->TexImage->TexFormat;

+

+   /* XXX may need more special cases here */

+   switch (trb->TexImage->TexFormat) {

+   case MESA_FORMAT_Z24_S8:

+      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;

+      trb->Base._BaseFormat = GL_DEPTH_STENCIL;

+      break;

+   case MESA_FORMAT_S8_Z24:

+      trb->Base.DataType = GL_UNSIGNED_INT_8_24_REV_MESA;

+      trb->Base._BaseFormat = GL_DEPTH_STENCIL;

+      break;

+   case MESA_FORMAT_Z24_X8:

+      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;

+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;

+      break;

+   case MESA_FORMAT_X8_Z24:

+      trb->Base.DataType = GL_UNSIGNED_INT_8_24_REV_MESA;

+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;

+      break;

+   case MESA_FORMAT_Z16:

+      trb->Base.DataType = GL_UNSIGNED_SHORT;

+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;

+      break;

+   case MESA_FORMAT_Z32:

+      trb->Base.DataType = GL_UNSIGNED_INT;

+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;

+      break;

+   default:

+      trb->Base.DataType = CHAN_TYPE;

+      trb->Base._BaseFormat = GL_RGBA;

+   }

+   trb->Base.Data = trb->TexImage->Data;

+}

+

+

+

+/**

+ * Called when rendering to a texture image begins, or when changing

+ * the dest mipmap level, cube face, etc.

+ * This is a fallback routine for software render-to-texture.

+ *

+ * Called via the glRenderbufferTexture1D/2D/3D() functions

+ * and elsewhere (such as glTexImage2D).

+ *

+ * The image we're rendering into is

+ * att->Texture->Image[att->CubeMapFace][att->TextureLevel];

+ * It'll never be NULL.

+ *

+ * \param fb  the framebuffer object the texture is being bound to

+ * \param att  the fb attachment point of the texture

+ *

+ * \sa _mesa_framebuffer_renderbuffer

+ */

+void

+_mesa_render_texture(struct gl_context *ctx,

+                     struct gl_framebuffer *fb,

+                     struct gl_renderbuffer_attachment *att)

+{

+   (void) fb;

+

+   if (!att->Renderbuffer) {

+      wrap_texture(ctx, att);

+   }

+   update_wrapper(ctx, att);

+}

+

+

+void

+_mesa_finish_render_texture(struct gl_context *ctx,

+                            struct gl_renderbuffer_attachment *att)

+{

+   /* do nothing */

+   /* The renderbuffer texture wrapper will get deleted by the

+    * normal mechanism for deleting renderbuffers.

+    */

+   (void) ctx;

+   (void) att;

+}

diff --git a/mesalib/src/mesa/main/texrender.h b/mesalib/src/mesa/main/texrender.h
index 1e87d594a..d6e4784ca 100644
--- a/mesalib/src/mesa/main/texrender.h
+++ b/mesalib/src/mesa/main/texrender.h
@@ -1,16 +1,18 @@
-#ifndef TEXRENDER_H
-#define TEXRENDER_H
-
-#include "mtypes.h"
-
-extern void
-_mesa_render_texture(GLcontext *ctx,
-                     struct gl_framebuffer *fb,
-                     struct gl_renderbuffer_attachment *att);
-
-extern void
-_mesa_finish_render_texture(GLcontext *ctx,
-                            struct gl_renderbuffer_attachment *att);
-
-
-#endif /* TEXRENDER_H */
+#ifndef TEXRENDER_H

+#define TEXRENDER_H

+

+struct gl_context;

+struct gl_framebuffer;

+struct gl_renderbuffer_attachment;

+

+extern void

+_mesa_render_texture(struct gl_context *ctx,

+                     struct gl_framebuffer *fb,

+                     struct gl_renderbuffer_attachment *att);

+

+extern void

+_mesa_finish_render_texture(struct gl_context *ctx,

+                            struct gl_renderbuffer_attachment *att);

+

+

+#endif /* TEXRENDER_H */

diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index dae173d1b..d86a5a5ec 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -1,833 +1,844 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * 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 texstate.c
- *
- * Texture state handling.
- */
-
-#include "glheader.h"
-#include "mfeatures.h"
-#include "colormac.h"
-#include "colortab.h"
-#include "context.h"
-#include "enums.h"
-#include "macros.h"
-#include "texobj.h"
-#include "teximage.h"
-#include "texstate.h"
-#include "mtypes.h"
-
-
-
-/**
- * Default texture combine environment state.  This is used to initialize
- * a context's texture units and as the basis for converting "classic"
- * texture environmnets to ARB_texture_env_combine style values.
- */
-static const struct gl_tex_env_combine_state default_combine_state = {
-   GL_MODULATE, GL_MODULATE,
-   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT, GL_CONSTANT },
-   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT, GL_CONSTANT },
-   { GL_SRC_COLOR, GL_SRC_COLOR, GL_SRC_ALPHA, GL_SRC_ALPHA },
-   { GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA },
-   0, 0,
-   2, 2
-};
-
-
-
-/**
- * Used by glXCopyContext to copy texture state from one context to another.
- */
-void
-_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
-{
-   GLuint u, tex;
-
-   ASSERT(src);
-   ASSERT(dst);
-
-   dst->Texture.CurrentUnit = src->Texture.CurrentUnit;
-   dst->Texture._GenFlags = src->Texture._GenFlags;
-   dst->Texture._TexGenEnabled = src->Texture._TexGenEnabled;
-   dst->Texture._TexMatEnabled = src->Texture._TexMatEnabled;
-   dst->Texture.SharedPalette = src->Texture.SharedPalette;
-
-   /* per-unit state */
-   for (u = 0; u < src->Const.MaxCombinedTextureImageUnits; u++) {
-      dst->Texture.Unit[u].Enabled = src->Texture.Unit[u].Enabled;
-      dst->Texture.Unit[u].EnvMode = src->Texture.Unit[u].EnvMode;
-      COPY_4V(dst->Texture.Unit[u].EnvColor, src->Texture.Unit[u].EnvColor);
-      dst->Texture.Unit[u].TexGenEnabled = src->Texture.Unit[u].TexGenEnabled;
-      dst->Texture.Unit[u].GenS = src->Texture.Unit[u].GenS;
-      dst->Texture.Unit[u].GenT = src->Texture.Unit[u].GenT;
-      dst->Texture.Unit[u].GenR = src->Texture.Unit[u].GenR;
-      dst->Texture.Unit[u].GenQ = src->Texture.Unit[u].GenQ;
-      dst->Texture.Unit[u].LodBias = src->Texture.Unit[u].LodBias;
-
-      /* GL_EXT_texture_env_combine */
-      dst->Texture.Unit[u].Combine = src->Texture.Unit[u].Combine;
-
-      /* GL_ATI_envmap_bumpmap - need this? */
-      dst->Texture.Unit[u].BumpTarget = src->Texture.Unit[u].BumpTarget;
-      COPY_4V(dst->Texture.Unit[u].RotMatrix, src->Texture.Unit[u].RotMatrix);
-
-      /*
-       * XXX strictly speaking, we should compare texture names/ids and
-       * bind textures in the dest context according to id.  For now, only
-       * copy bindings if the contexts share the same pool of textures to
-       * avoid refcounting bugs.
-       */
-      if (dst->Shared == src->Shared) {
-         /* copy texture object bindings, not contents of texture objects */
-         _mesa_lock_context_textures(dst);
-
-         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-            _mesa_reference_texobj(&dst->Texture.Unit[u].CurrentTex[tex],
-                                   src->Texture.Unit[u].CurrentTex[tex]);
-         }
-         _mesa_unlock_context_textures(dst);
-      }
-   }
-}
-
-
-/*
- * For debugging
- */
-void
-_mesa_print_texunit_state( GLcontext *ctx, GLuint unit )
-{
-   const struct gl_texture_unit *texUnit = ctx->Texture.Unit + unit;
-   printf("Texture Unit %d\n", unit);
-   printf("  GL_TEXTURE_ENV_MODE = %s\n", _mesa_lookup_enum_by_nr(texUnit->EnvMode));
-   printf("  GL_COMBINE_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeRGB));
-   printf("  GL_COMBINE_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeA));
-   printf("  GL_SOURCE0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[0]));
-   printf("  GL_SOURCE1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[1]));
-   printf("  GL_SOURCE2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[2]));
-   printf("  GL_SOURCE0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[0]));
-   printf("  GL_SOURCE1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[1]));
-   printf("  GL_SOURCE2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[2]));
-   printf("  GL_OPERAND0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[0]));
-   printf("  GL_OPERAND1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[1]));
-   printf("  GL_OPERAND2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[2]));
-   printf("  GL_OPERAND0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[0]));
-   printf("  GL_OPERAND1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[1]));
-   printf("  GL_OPERAND2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[2]));
-   printf("  GL_RGB_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftRGB);
-   printf("  GL_ALPHA_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftA);
-   printf("  GL_TEXTURE_ENV_COLOR = (%f, %f, %f, %f)\n", texUnit->EnvColor[0], texUnit->EnvColor[1], texUnit->EnvColor[2], texUnit->EnvColor[3]);
-}
-
-
-
-/**********************************************************************/
-/*                       Texture Environment                          */
-/**********************************************************************/
-
-/**
- * Convert "classic" texture environment to ARB_texture_env_combine style
- * environments.
- * 
- * \param state  texture_env_combine state vector to be filled-in.
- * \param mode   Classic texture environment mode (i.e., \c GL_REPLACE,
- *               \c GL_BLEND, \c GL_DECAL, etc.).
- * \param texBaseFormat  Base format of the texture associated with the
- *               texture unit.
- */
-static void
-calculate_derived_texenv( struct gl_tex_env_combine_state *state,
-			  GLenum mode, GLenum texBaseFormat )
-{
-   GLenum mode_rgb;
-   GLenum mode_a;
-
-   *state = default_combine_state;
-
-   switch (texBaseFormat) {
-   case GL_ALPHA:
-      state->SourceRGB[0] = GL_PREVIOUS;
-      break;
-
-   case GL_LUMINANCE_ALPHA:
-   case GL_INTENSITY:
-   case GL_RGBA:
-      break;
-
-   case GL_LUMINANCE:
-   case GL_RGB:
-   case GL_YCBCR_MESA:
-   case GL_DUDV_ATI:
-      state->SourceA[0] = GL_PREVIOUS;
-      break;
-      
-   default:
-      _mesa_problem(NULL,
-                    "Invalid texBaseFormat 0x%x in calculate_derived_texenv",
-                    texBaseFormat);
-      return;
-   }
-
-   if (mode == GL_REPLACE_EXT)
-      mode = GL_REPLACE;
-
-   switch (mode) {
-   case GL_REPLACE:
-   case GL_MODULATE:
-      mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : mode;
-      mode_a   = mode;
-      break;
-   
-   case GL_DECAL:
-      mode_rgb = GL_INTERPOLATE;
-      mode_a   = GL_REPLACE;
-
-      state->SourceA[0] = GL_PREVIOUS;
-
-      /* Having alpha / luminance / intensity textures replace using the
-       * incoming fragment color matches the definition in NV_texture_shader.
-       * The 1.5 spec simply marks these as "undefined".
-       */
-      switch (texBaseFormat) {
-      case GL_ALPHA:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE_ALPHA:
-      case GL_INTENSITY:
-	 state->SourceRGB[0] = GL_PREVIOUS;
-	 break;
-      case GL_RGB:
-      case GL_YCBCR_MESA:
-      case GL_DUDV_ATI:
-	 mode_rgb = GL_REPLACE;
-	 break;
-      case GL_RGBA:
-	 state->SourceRGB[2] = GL_TEXTURE;
-	 break;
-      }
-      break;
-
-   case GL_BLEND:
-      mode_rgb = GL_INTERPOLATE;
-      mode_a   = GL_MODULATE;
-
-      switch (texBaseFormat) {
-      case GL_ALPHA:
-	 mode_rgb = GL_REPLACE;
-	 break;
-      case GL_INTENSITY:
-	 mode_a = GL_INTERPOLATE;
-	 state->SourceA[0] = GL_CONSTANT;
-	 state->OperandA[2] = GL_SRC_ALPHA;
-	 /* FALLTHROUGH */
-      case GL_LUMINANCE:
-      case GL_RGB:
-      case GL_LUMINANCE_ALPHA:
-      case GL_RGBA:
-      case GL_YCBCR_MESA:
-      case GL_DUDV_ATI:
-	 state->SourceRGB[2] = GL_TEXTURE;
-	 state->SourceA[2]   = GL_TEXTURE;
-	 state->SourceRGB[0] = GL_CONSTANT;
-	 state->OperandRGB[2] = GL_SRC_COLOR;
-	 break;
-      }
-      break;
-
-   case GL_ADD:
-      mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : GL_ADD;
-      mode_a   = (texBaseFormat == GL_INTENSITY) ? GL_ADD : GL_MODULATE;
-      break;
-
-   default:
-      _mesa_problem(NULL,
-                    "Invalid texture env mode 0x%x in calculate_derived_texenv",
-                    mode);
-      return;
-   }
-   
-   state->ModeRGB = (state->SourceRGB[0] != GL_PREVIOUS)
-       ? mode_rgb : GL_REPLACE;
-   state->ModeA   = (state->SourceA[0]   != GL_PREVIOUS)
-       ? mode_a   : GL_REPLACE;
-}
-
-
-
-
-/* GL_ARB_multitexture */
-void GLAPIENTRY
-_mesa_ActiveTextureARB(GLenum texture)
-{
-   const GLuint texUnit = texture - GL_TEXTURE0;
-   GLuint k;
-   GET_CURRENT_CONTEXT(ctx);
-
-   /* See OpenGL spec for glActiveTexture: */
-   k = MAX2(ctx->Const.MaxCombinedTextureImageUnits,
-            ctx->Const.MaxTextureCoordUnits);
-
-   ASSERT(k <= Elements(ctx->Texture.Unit));
-   
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glActiveTexture %s\n",
-                  _mesa_lookup_enum_by_nr(texture));
-
-   if (texUnit >= k) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glActiveTexture(texture=%s)",
-                  _mesa_lookup_enum_by_nr(texture));
-      return;
-   }
-
-   if (ctx->Texture.CurrentUnit == texUnit)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_TEXTURE);
-
-   ctx->Texture.CurrentUnit = texUnit;
-   if (ctx->Transform.MatrixMode == GL_TEXTURE) {
-      /* update current stack pointer */
-      ctx->CurrentStack = &ctx->TextureMatrixStack[texUnit];
-   }
-}
-
-
-/* GL_ARB_multitexture */
-void GLAPIENTRY
-_mesa_ClientActiveTextureARB(GLenum texture)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint texUnit = texture - GL_TEXTURE0;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glClientActiveTexture %s\n",
-                  _mesa_lookup_enum_by_nr(texture));
-
-   if (texUnit >= ctx->Const.MaxTextureCoordUnits) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glClientActiveTexture(texture)");
-      return;
-   }
-
-   if (ctx->Array.ActiveTexture == texUnit)
-      return;
-
-   FLUSH_VERTICES(ctx, _NEW_ARRAY);
-   ctx->Array.ActiveTexture = texUnit;
-}
-
-
-
-/**********************************************************************/
-/*****                    State management                        *****/
-/**********************************************************************/
-
-
-/**
- * \note This routine refers to derived texture attribute values to
- * compute the ENABLE_TEXMAT flags, but is only called on
- * _NEW_TEXTURE_MATRIX.  On changes to _NEW_TEXTURE, the ENABLE_TEXMAT
- * flags are updated by _mesa_update_textures(), below.
- *
- * \param ctx GL context.
- */
-static void
-update_texture_matrices( GLcontext *ctx )
-{
-   GLuint u;
-
-   ctx->Texture._TexMatEnabled = 0x0;
-
-   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
-      ASSERT(u < Elements(ctx->TextureMatrixStack));
-      if (_math_matrix_is_dirty(ctx->TextureMatrixStack[u].Top)) {
-	 _math_matrix_analyse( ctx->TextureMatrixStack[u].Top );
-
-	 if (ctx->Texture.Unit[u]._ReallyEnabled &&
-	     ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY)
-	    ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u);
-      }
-   }
-}
-
-
-/**
- * Examine texture unit's combine/env state to update derived state.
- */
-static void
-update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
-{
-   struct gl_tex_env_combine_state *combine;
-
-   /* Set the texUnit->_CurrentCombine field to point to the user's combiner
-    * state, or the combiner state which is derived from traditional texenv
-    * mode.
-    */
-   if (texUnit->EnvMode == GL_COMBINE ||
-       texUnit->EnvMode == GL_COMBINE4_NV) {
-      texUnit->_CurrentCombine = & texUnit->Combine;
-   }
-   else {
-      const struct gl_texture_object *texObj = texUnit->_Current;
-      GLenum format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;
-      if (format == GL_COLOR_INDEX) {
-         format = GL_RGBA;  /* a bit of a hack */
-      }
-      else if (format == GL_DEPTH_COMPONENT ||
-               format == GL_DEPTH_STENCIL_EXT) {
-         format = texObj->DepthMode;
-      }
-      calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);
-      texUnit->_CurrentCombine = & texUnit->_EnvMode;
-   }
-
-   combine = texUnit->_CurrentCombine;
-
-   /* Determine number of source RGB terms in the combiner function */
-   switch (combine->ModeRGB) {
-   case GL_REPLACE:
-      combine->_NumArgsRGB = 1;
-      break;
-   case GL_ADD:
-   case GL_ADD_SIGNED:
-      if (texUnit->EnvMode == GL_COMBINE4_NV)
-         combine->_NumArgsRGB = 4;
-      else
-         combine->_NumArgsRGB = 2;
-      break;
-   case GL_MODULATE:
-   case GL_SUBTRACT:
-   case GL_DOT3_RGB:
-   case GL_DOT3_RGBA:
-   case GL_DOT3_RGB_EXT:
-   case GL_DOT3_RGBA_EXT:
-      combine->_NumArgsRGB = 2;
-      break;
-   case GL_INTERPOLATE:
-   case GL_MODULATE_ADD_ATI:
-   case GL_MODULATE_SIGNED_ADD_ATI:
-   case GL_MODULATE_SUBTRACT_ATI:
-      combine->_NumArgsRGB = 3;
-      break;
-   case GL_BUMP_ENVMAP_ATI:
-      /* no real arguments for this case */
-      combine->_NumArgsRGB = 0;
-      break;
-   default:
-      combine->_NumArgsRGB = 0;
-      _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");
-      return;
-   }
-
-   /* Determine number of source Alpha terms in the combiner function */
-   switch (combine->ModeA) {
-   case GL_REPLACE:
-      combine->_NumArgsA = 1;
-      break;
-   case GL_ADD:
-   case GL_ADD_SIGNED:
-      if (texUnit->EnvMode == GL_COMBINE4_NV)
-         combine->_NumArgsA = 4;
-      else
-         combine->_NumArgsA = 2;
-      break;
-   case GL_MODULATE:
-   case GL_SUBTRACT:
-      combine->_NumArgsA = 2;
-      break;
-   case GL_INTERPOLATE:
-   case GL_MODULATE_ADD_ATI:
-   case GL_MODULATE_SIGNED_ADD_ATI:
-   case GL_MODULATE_SUBTRACT_ATI:
-      combine->_NumArgsA = 3;
-      break;
-   default:
-      combine->_NumArgsA = 0;
-      _mesa_problem(ctx, "invalid Alpha combine mode in update_texture_state");
-      break;
-   }
-}
-
-
-/**
- * \note This routine refers to derived texture matrix values to
- * compute the ENABLE_TEXMAT flags, but is only called on
- * _NEW_TEXTURE.  On changes to _NEW_TEXTURE_MATRIX, the ENABLE_TEXMAT
- * flags are updated by _mesa_update_texture_matrices, above.
- *
- * \param ctx GL context.
- */
-static void
-update_texture_state( GLcontext *ctx )
-{
-   GLuint unit;
-   struct gl_fragment_program *fprog = NULL;
-   struct gl_vertex_program *vprog = NULL;
-   GLbitfield enabledFragUnits = 0x0;
-
-   if (ctx->Shader.CurrentProgram &&
-       ctx->Shader.CurrentProgram->LinkStatus) {
-      fprog = ctx->Shader.CurrentProgram->FragmentProgram;
-      vprog = ctx->Shader.CurrentProgram->VertexProgram;
-   }
-   else {
-      if (ctx->FragmentProgram._Enabled) {
-         fprog = ctx->FragmentProgram.Current;
-      }
-      if (ctx->VertexProgram._Enabled) {
-         /* XXX enable this if/when non-shader vertex programs get
-          * texture fetches:
-         vprog = ctx->VertexProgram.Current;
-         */
-      }
-   }
-
-   /* TODO: only set this if there are actual changes */
-   ctx->NewState |= _NEW_TEXTURE;
-
-   ctx->Texture._EnabledUnits = 0x0;
-   ctx->Texture._GenFlags = 0x0;
-   ctx->Texture._TexMatEnabled = 0x0;
-   ctx->Texture._TexGenEnabled = 0x0;
-
-   /*
-    * Update texture unit state.
-    */
-   for (unit = 0; unit < ctx->Const.MaxCombinedTextureImageUnits; unit++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-      GLbitfield enabledVertTargets = 0x0;
-      GLbitfield enabledFragTargets = 0x0;
-      GLbitfield enabledTargets = 0x0;
-      GLuint texIndex;
-
-      /* Get the bitmask of texture target enables.
-       * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
-       * which texture targets are enabled (fixed function) or referenced
-       * by a fragment program/program.  When multiple flags are set, we'll
-       * settle on the one with highest priority (see below).
-       */
-      if (vprog) {
-         enabledVertTargets |= vprog->Base.TexturesUsed[unit];
-      }
-
-      if (fprog) {
-         enabledFragTargets |= fprog->Base.TexturesUsed[unit];
-      }
-      else {
-         /* fixed-function fragment program */
-         enabledFragTargets |= texUnit->Enabled;
-      }
-
-      enabledTargets = enabledVertTargets | enabledFragTargets;
-
-      texUnit->_ReallyEnabled = 0x0;
-
-      if (enabledTargets == 0x0) {
-         /* neither vertex nor fragment processing uses this unit */
-         continue;
-      }
-
-      /* Look for the highest priority texture target that's enabled (or used
-       * by the vert/frag shaders) and "complete".  That's the one we'll use
-       * for texturing.  If we're using vert/frag program we're guaranteed
-       * that bitcount(enabledBits) <= 1.
-       * Note that the TEXTURE_x_INDEX values are in high to low priority.
-       */
-      for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) {
-         if (enabledTargets & (1 << texIndex)) {
-            struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex];
-            if (!texObj->_Complete) {
-               _mesa_test_texobj_completeness(ctx, texObj);
-            }
-            if (texObj->_Complete) {
-               texUnit->_ReallyEnabled = 1 << texIndex;
-               _mesa_reference_texobj(&texUnit->_Current, texObj);
-               break;
-            }
-         }
-      }
-
-      if (!texUnit->_ReallyEnabled) {
-         if (fprog) {
-            /* If we get here it means the shader is expecting a texture
-             * object, but there isn't one (or it's incomplete).  Use the
-             * fallback texture.
-             */
-            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
-            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-            _mesa_reference_texobj(&texUnit->_Current, texObj);
-         }
-         else {
-            /* fixed-function: texture unit is really disabled */
-            continue;
-         }
-      }
-
-      /* if we get here, we know this texture unit is enabled */
-
-      ctx->Texture._EnabledUnits |= (1 << unit);
-
-      if (enabledFragTargets)
-         enabledFragUnits |= (1 << unit);
-
-      update_tex_combine(ctx, texUnit);
-   }
-
-
-   /* Determine which texture coordinate sets are actually needed */
-   if (fprog) {
-      const GLuint coordMask = (1 << MAX_TEXTURE_COORD_UNITS) - 1;
-      ctx->Texture._EnabledCoordUnits
-         = (fprog->Base.InputsRead >> FRAG_ATTRIB_TEX0) & coordMask;
-   }
-   else {
-      ctx->Texture._EnabledCoordUnits = enabledFragUnits;
-   }
-
-   /* Setup texgen for those texture coordinate sets that are in use */
-   for (unit = 0; unit < ctx->Const.MaxTextureCoordUnits; unit++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-
-      texUnit->_GenFlags = 0x0;
-
-      if (!(ctx->Texture._EnabledCoordUnits & (1 << unit)))
-	 continue;
-
-      if (texUnit->TexGenEnabled) {
-	 if (texUnit->TexGenEnabled & S_BIT) {
-	    texUnit->_GenFlags |= texUnit->GenS._ModeBit;
-	 }
-	 if (texUnit->TexGenEnabled & T_BIT) {
-	    texUnit->_GenFlags |= texUnit->GenT._ModeBit;
-	 }
-	 if (texUnit->TexGenEnabled & R_BIT) {
-	    texUnit->_GenFlags |= texUnit->GenR._ModeBit;
-	 }
-	 if (texUnit->TexGenEnabled & Q_BIT) {
-	    texUnit->_GenFlags |= texUnit->GenQ._ModeBit;
-	 }
-
-	 ctx->Texture._TexGenEnabled |= ENABLE_TEXGEN(unit);
-	 ctx->Texture._GenFlags |= texUnit->_GenFlags;
-      }
-
-      ASSERT(unit < Elements(ctx->TextureMatrixStack));
-      if (ctx->TextureMatrixStack[unit].Top->type != MATRIX_IDENTITY)
-	 ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(unit);
-   }
-}
-
-
-/**
- * Update texture-related derived state.
- */
-void
-_mesa_update_texture( GLcontext *ctx, GLuint new_state )
-{
-   if (new_state & _NEW_TEXTURE_MATRIX)
-      update_texture_matrices( ctx );
-
-   if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM))
-      update_texture_state( ctx );
-}
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-/**
- * Allocate the proxy textures for the given context.
- * 
- * \param ctx the context to allocate proxies for.
- * 
- * \return GL_TRUE on success, or GL_FALSE on failure
- * 
- * If run out of memory part way through the allocations, clean up and return
- * GL_FALSE.
- */
-static GLboolean
-alloc_proxy_textures( GLcontext *ctx )
-{
-   static const GLenum targets[] = {
-      GL_TEXTURE_1D,
-      GL_TEXTURE_2D,
-      GL_TEXTURE_3D,
-      GL_TEXTURE_CUBE_MAP_ARB,
-      GL_TEXTURE_RECTANGLE_NV,
-      GL_TEXTURE_1D_ARRAY_EXT,
-      GL_TEXTURE_2D_ARRAY_EXT
-   };
-   GLint tgt;
-
-   ASSERT(Elements(targets) == NUM_TEXTURE_TARGETS);
-
-   for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-      if (!(ctx->Texture.ProxyTex[tgt]
-            = ctx->Driver.NewTextureObject(ctx, 0, targets[tgt]))) {
-         /* out of memory, free what we did allocate */
-         while (--tgt >= 0) {
-            ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
-         }
-         return GL_FALSE;
-      }
-   }
-
-   assert(ctx->Texture.ProxyTex[0]->RefCount == 1); /* sanity check */
-   return GL_TRUE;
-}
-
-
-/**
- * Initialize a texture unit.
- *
- * \param ctx GL context.
- * \param unit texture unit number to be initialized.
- */
-static void
-init_texture_unit( GLcontext *ctx, GLuint unit )
-{
-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   GLuint tex;
-
-   texUnit->EnvMode = GL_MODULATE;
-   ASSIGN_4V( texUnit->EnvColor, 0.0, 0.0, 0.0, 0.0 );
-
-   texUnit->Combine = default_combine_state;
-   texUnit->_EnvMode = default_combine_state;
-   texUnit->_CurrentCombine = & texUnit->_EnvMode;
-   texUnit->BumpTarget = GL_TEXTURE0;
-
-   texUnit->TexGenEnabled = 0x0;
-   texUnit->GenS.Mode = GL_EYE_LINEAR;
-   texUnit->GenT.Mode = GL_EYE_LINEAR;
-   texUnit->GenR.Mode = GL_EYE_LINEAR;
-   texUnit->GenQ.Mode = GL_EYE_LINEAR;
-   texUnit->GenS._ModeBit = TEXGEN_EYE_LINEAR;
-   texUnit->GenT._ModeBit = TEXGEN_EYE_LINEAR;
-   texUnit->GenR._ModeBit = TEXGEN_EYE_LINEAR;
-   texUnit->GenQ._ModeBit = TEXGEN_EYE_LINEAR;
-
-   /* Yes, these plane coefficients are correct! */
-   ASSIGN_4V( texUnit->GenS.ObjectPlane, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenT.ObjectPlane, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenR.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenQ.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenS.EyePlane, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
-
-   /* no mention of this in spec, but maybe id matrix expected? */
-   ASSIGN_4V( texUnit->RotMatrix, 1.0, 0.0, 0.0, 1.0 );
-
-   /* initialize current texture object ptrs to the shared default objects */
-   for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-      _mesa_reference_texobj(&texUnit->CurrentTex[tex],
-                             ctx->Shared->DefaultTex[tex]);
-   }
-}
-
-
-/**
- * Initialize texture state for the given context.
- */
-GLboolean
-_mesa_init_texture(GLcontext *ctx)
-{
-   GLuint u;
-
-   /* Texture group */
-   ctx->Texture.CurrentUnit = 0;      /* multitexture */
-   ctx->Texture._EnabledUnits = 0x0;
-   ctx->Texture.SharedPalette = GL_FALSE;
-   _mesa_init_colortable(&ctx->Texture.Palette);
-
-   for (u = 0; u < Elements(ctx->Texture.Unit); u++)
-      init_texture_unit(ctx, u);
-
-   /* After we're done initializing the context's texture state the default
-    * texture objects' refcounts should be at least
-    * MAX_COMBINED_TEXTURE_IMAGE_UNITS + 1.
-    */
-   assert(ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]->RefCount
-          >= MAX_COMBINED_TEXTURE_IMAGE_UNITS + 1);
-
-   /* Allocate proxy textures */
-   if (!alloc_proxy_textures( ctx ))
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Free dynamically-allocted texture data attached to the given context.
- */
-void
-_mesa_free_texture_data(GLcontext *ctx)
-{
-   GLuint u, tgt;
-
-   /* unreference current textures */
-   for (u = 0; u < Elements(ctx->Texture.Unit); u++) {
-      /* The _Current texture could account for another reference */
-      _mesa_reference_texobj(&ctx->Texture.Unit[u]._Current, NULL);
-
-      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
-         _mesa_reference_texobj(&ctx->Texture.Unit[u].CurrentTex[tgt], NULL);
-      }
-   }
-
-   /* Free proxy texture objects */
-   for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++)
-      ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
-
-   for (u = 0; u < Elements(ctx->Texture.Unit); u++)
-      _mesa_free_colortable_data(&ctx->Texture.Unit[u].ColorTable);
-}
-
-
-/**
- * Update the default texture objects in the given context to reference those
- * specified in the shared state and release those referencing the old 
- * shared state.
- */
-void
-_mesa_update_default_objects_texture(GLcontext *ctx)
-{
-   GLuint u, tex;
-
-   for (u = 0; u < Elements(ctx->Texture.Unit); u++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[u];
-      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
-         _mesa_reference_texobj(&texUnit->CurrentTex[tex],
-                                ctx->Shared->DefaultTex[tex]);
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

+ * 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 texstate.c

+ *

+ * Texture state handling.

+ */

+

+#include "glheader.h"

+#include "mfeatures.h"

+#include "colormac.h"

+#include "colortab.h"

+#include "context.h"

+#include "enums.h"

+#include "macros.h"

+#include "texobj.h"

+#include "teximage.h"

+#include "texstate.h"

+#include "mtypes.h"

+

+

+

+/**

+ * Default texture combine environment state.  This is used to initialize

+ * a context's texture units and as the basis for converting "classic"

+ * texture environmnets to ARB_texture_env_combine style values.

+ */

+static const struct gl_tex_env_combine_state default_combine_state = {

+   GL_MODULATE, GL_MODULATE,

+   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT, GL_CONSTANT },

+   { GL_TEXTURE, GL_PREVIOUS, GL_CONSTANT, GL_CONSTANT },

+   { GL_SRC_COLOR, GL_SRC_COLOR, GL_SRC_ALPHA, GL_SRC_ALPHA },

+   { GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA, GL_SRC_ALPHA },

+   0, 0,

+   2, 2

+};

+

+

+

+/**

+ * Used by glXCopyContext to copy texture state from one context to another.

+ */

+void

+_mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst )

+{

+   GLuint u, tex;

+

+   ASSERT(src);

+   ASSERT(dst);

+

+   dst->Texture.CurrentUnit = src->Texture.CurrentUnit;

+   dst->Texture._GenFlags = src->Texture._GenFlags;

+   dst->Texture._TexGenEnabled = src->Texture._TexGenEnabled;

+   dst->Texture._TexMatEnabled = src->Texture._TexMatEnabled;

+   dst->Texture.SharedPalette = src->Texture.SharedPalette;

+

+   /* per-unit state */

+   for (u = 0; u < src->Const.MaxCombinedTextureImageUnits; u++) {

+      dst->Texture.Unit[u].Enabled = src->Texture.Unit[u].Enabled;

+      dst->Texture.Unit[u].EnvMode = src->Texture.Unit[u].EnvMode;

+      COPY_4V(dst->Texture.Unit[u].EnvColor, src->Texture.Unit[u].EnvColor);

+      dst->Texture.Unit[u].TexGenEnabled = src->Texture.Unit[u].TexGenEnabled;

+      dst->Texture.Unit[u].GenS = src->Texture.Unit[u].GenS;

+      dst->Texture.Unit[u].GenT = src->Texture.Unit[u].GenT;

+      dst->Texture.Unit[u].GenR = src->Texture.Unit[u].GenR;

+      dst->Texture.Unit[u].GenQ = src->Texture.Unit[u].GenQ;

+      dst->Texture.Unit[u].LodBias = src->Texture.Unit[u].LodBias;

+

+      /* GL_EXT_texture_env_combine */

+      dst->Texture.Unit[u].Combine = src->Texture.Unit[u].Combine;

+

+      /* GL_ATI_envmap_bumpmap - need this? */

+      dst->Texture.Unit[u].BumpTarget = src->Texture.Unit[u].BumpTarget;

+      COPY_4V(dst->Texture.Unit[u].RotMatrix, src->Texture.Unit[u].RotMatrix);

+

+      /*

+       * XXX strictly speaking, we should compare texture names/ids and

+       * bind textures in the dest context according to id.  For now, only

+       * copy bindings if the contexts share the same pool of textures to

+       * avoid refcounting bugs.

+       */

+      if (dst->Shared == src->Shared) {

+         /* copy texture object bindings, not contents of texture objects */

+         _mesa_lock_context_textures(dst);

+

+         for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {

+            _mesa_reference_texobj(&dst->Texture.Unit[u].CurrentTex[tex],

+                                   src->Texture.Unit[u].CurrentTex[tex]);

+         }

+         _mesa_unlock_context_textures(dst);

+      }

+   }

+}

+

+

+/*

+ * For debugging

+ */

+void

+_mesa_print_texunit_state( struct gl_context *ctx, GLuint unit )

+{

+   const struct gl_texture_unit *texUnit = ctx->Texture.Unit + unit;

+   printf("Texture Unit %d\n", unit);

+   printf("  GL_TEXTURE_ENV_MODE = %s\n", _mesa_lookup_enum_by_nr(texUnit->EnvMode));

+   printf("  GL_COMBINE_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeRGB));

+   printf("  GL_COMBINE_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeA));

+   printf("  GL_SOURCE0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[0]));

+   printf("  GL_SOURCE1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[1]));

+   printf("  GL_SOURCE2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[2]));

+   printf("  GL_SOURCE0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[0]));

+   printf("  GL_SOURCE1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[1]));

+   printf("  GL_SOURCE2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[2]));

+   printf("  GL_OPERAND0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[0]));

+   printf("  GL_OPERAND1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[1]));

+   printf("  GL_OPERAND2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[2]));

+   printf("  GL_OPERAND0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[0]));

+   printf("  GL_OPERAND1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[1]));

+   printf("  GL_OPERAND2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[2]));

+   printf("  GL_RGB_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftRGB);

+   printf("  GL_ALPHA_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftA);

+   printf("  GL_TEXTURE_ENV_COLOR = (%f, %f, %f, %f)\n", texUnit->EnvColor[0], texUnit->EnvColor[1], texUnit->EnvColor[2], texUnit->EnvColor[3]);

+}

+

+

+

+/**********************************************************************/

+/*                       Texture Environment                          */

+/**********************************************************************/

+

+/**

+ * Convert "classic" texture environment to ARB_texture_env_combine style

+ * environments.

+ * 

+ * \param state  texture_env_combine state vector to be filled-in.

+ * \param mode   Classic texture environment mode (i.e., \c GL_REPLACE,

+ *               \c GL_BLEND, \c GL_DECAL, etc.).

+ * \param texBaseFormat  Base format of the texture associated with the

+ *               texture unit.

+ */

+static void

+calculate_derived_texenv( struct gl_tex_env_combine_state *state,

+			  GLenum mode, GLenum texBaseFormat )

+{

+   GLenum mode_rgb;

+   GLenum mode_a;

+

+   *state = default_combine_state;

+

+   switch (texBaseFormat) {

+   case GL_ALPHA:

+      state->SourceRGB[0] = GL_PREVIOUS;

+      break;

+

+   case GL_LUMINANCE_ALPHA:

+   case GL_INTENSITY:

+   case GL_RGBA:

+      break;

+

+   case GL_LUMINANCE:

+   case GL_RED:

+   case GL_RG:

+   case GL_RGB:

+   case GL_YCBCR_MESA:

+   case GL_DUDV_ATI:

+      state->SourceA[0] = GL_PREVIOUS;

+      break;

+      

+   default:

+      _mesa_problem(NULL,

+                    "Invalid texBaseFormat 0x%x in calculate_derived_texenv",

+                    texBaseFormat);

+      return;

+   }

+

+   if (mode == GL_REPLACE_EXT)

+      mode = GL_REPLACE;

+

+   switch (mode) {

+   case GL_REPLACE:

+   case GL_MODULATE:

+      mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : mode;

+      mode_a   = mode;

+      break;

+   

+   case GL_DECAL:

+      mode_rgb = GL_INTERPOLATE;

+      mode_a   = GL_REPLACE;

+

+      state->SourceA[0] = GL_PREVIOUS;

+

+      /* Having alpha / luminance / intensity textures replace using the

+       * incoming fragment color matches the definition in NV_texture_shader.

+       * The 1.5 spec simply marks these as "undefined".

+       */

+      switch (texBaseFormat) {

+      case GL_ALPHA:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE_ALPHA:

+      case GL_INTENSITY:

+	 state->SourceRGB[0] = GL_PREVIOUS;

+	 break;

+      case GL_RED:

+      case GL_RG:

+      case GL_RGB:

+      case GL_YCBCR_MESA:

+      case GL_DUDV_ATI:

+	 mode_rgb = GL_REPLACE;

+	 break;

+      case GL_RGBA:

+	 state->SourceRGB[2] = GL_TEXTURE;

+	 break;

+      }

+      break;

+

+   case GL_BLEND:

+      mode_rgb = GL_INTERPOLATE;

+      mode_a   = GL_MODULATE;

+

+      switch (texBaseFormat) {

+      case GL_ALPHA:

+	 mode_rgb = GL_REPLACE;

+	 break;

+      case GL_INTENSITY:

+	 mode_a = GL_INTERPOLATE;

+	 state->SourceA[0] = GL_CONSTANT;

+	 state->OperandA[2] = GL_SRC_ALPHA;

+	 /* FALLTHROUGH */

+      case GL_LUMINANCE:

+      case GL_RED:

+      case GL_RG:

+      case GL_RGB:

+      case GL_LUMINANCE_ALPHA:

+      case GL_RGBA:

+      case GL_YCBCR_MESA:

+      case GL_DUDV_ATI:

+	 state->SourceRGB[2] = GL_TEXTURE;

+	 state->SourceA[2]   = GL_TEXTURE;

+	 state->SourceRGB[0] = GL_CONSTANT;

+	 state->OperandRGB[2] = GL_SRC_COLOR;

+	 break;

+      }

+      break;

+

+   case GL_ADD:

+      mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : GL_ADD;

+      mode_a   = (texBaseFormat == GL_INTENSITY) ? GL_ADD : GL_MODULATE;

+      break;

+

+   default:

+      _mesa_problem(NULL,

+                    "Invalid texture env mode 0x%x in calculate_derived_texenv",

+                    mode);

+      return;

+   }

+   

+   state->ModeRGB = (state->SourceRGB[0] != GL_PREVIOUS)

+       ? mode_rgb : GL_REPLACE;

+   state->ModeA   = (state->SourceA[0]   != GL_PREVIOUS)

+       ? mode_a   : GL_REPLACE;

+}

+

+

+

+

+/* GL_ARB_multitexture */

+void GLAPIENTRY

+_mesa_ActiveTextureARB(GLenum texture)

+{

+   const GLuint texUnit = texture - GL_TEXTURE0;

+   GLuint k;

+   GET_CURRENT_CONTEXT(ctx);

+

+   /* See OpenGL spec for glActiveTexture: */

+   k = MAX2(ctx->Const.MaxCombinedTextureImageUnits,

+            ctx->Const.MaxTextureCoordUnits);

+

+   ASSERT(k <= Elements(ctx->Texture.Unit));

+   

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glActiveTexture %s\n",

+                  _mesa_lookup_enum_by_nr(texture));

+

+   if (texUnit >= k) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glActiveTexture(texture=%s)",

+                  _mesa_lookup_enum_by_nr(texture));

+      return;

+   }

+

+   if (ctx->Texture.CurrentUnit == texUnit)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_TEXTURE);

+

+   ctx->Texture.CurrentUnit = texUnit;

+   if (ctx->Transform.MatrixMode == GL_TEXTURE) {

+      /* update current stack pointer */

+      ctx->CurrentStack = &ctx->TextureMatrixStack[texUnit];

+   }

+}

+

+

+/* GL_ARB_multitexture */

+void GLAPIENTRY

+_mesa_ClientActiveTextureARB(GLenum texture)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLuint texUnit = texture - GL_TEXTURE0;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (MESA_VERBOSE & (VERBOSE_API | VERBOSE_TEXTURE))

+      _mesa_debug(ctx, "glClientActiveTexture %s\n",

+                  _mesa_lookup_enum_by_nr(texture));

+

+   if (texUnit >= ctx->Const.MaxTextureCoordUnits) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glClientActiveTexture(texture)");

+      return;

+   }

+

+   if (ctx->Array.ActiveTexture == texUnit)

+      return;

+

+   FLUSH_VERTICES(ctx, _NEW_ARRAY);

+   ctx->Array.ActiveTexture = texUnit;

+}

+

+

+

+/**********************************************************************/

+/*****                    State management                        *****/

+/**********************************************************************/

+

+

+/**

+ * \note This routine refers to derived texture attribute values to

+ * compute the ENABLE_TEXMAT flags, but is only called on

+ * _NEW_TEXTURE_MATRIX.  On changes to _NEW_TEXTURE, the ENABLE_TEXMAT

+ * flags are updated by _mesa_update_textures(), below.

+ *

+ * \param ctx GL context.

+ */

+static void

+update_texture_matrices( struct gl_context *ctx )

+{

+   GLuint u;

+

+   ctx->Texture._TexMatEnabled = 0x0;

+

+   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {

+      ASSERT(u < Elements(ctx->TextureMatrixStack));

+      if (_math_matrix_is_dirty(ctx->TextureMatrixStack[u].Top)) {

+	 _math_matrix_analyse( ctx->TextureMatrixStack[u].Top );

+

+	 if (ctx->Texture.Unit[u]._ReallyEnabled &&

+	     ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY)

+	    ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u);

+      }

+   }

+}

+

+

+/**

+ * Examine texture unit's combine/env state to update derived state.

+ */

+static void

+update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit)

+{

+   struct gl_tex_env_combine_state *combine;

+

+   /* Set the texUnit->_CurrentCombine field to point to the user's combiner

+    * state, or the combiner state which is derived from traditional texenv

+    * mode.

+    */

+   if (texUnit->EnvMode == GL_COMBINE ||

+       texUnit->EnvMode == GL_COMBINE4_NV) {

+      texUnit->_CurrentCombine = & texUnit->Combine;

+   }

+   else {

+      const struct gl_texture_object *texObj = texUnit->_Current;

+      GLenum format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;

+      if (format == GL_COLOR_INDEX) {

+         format = GL_RGBA;  /* a bit of a hack */

+      }

+      else if (format == GL_DEPTH_COMPONENT ||

+               format == GL_DEPTH_STENCIL_EXT) {

+         format = texObj->DepthMode;

+      }

+      calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);

+      texUnit->_CurrentCombine = & texUnit->_EnvMode;

+   }

+

+   combine = texUnit->_CurrentCombine;

+

+   /* Determine number of source RGB terms in the combiner function */

+   switch (combine->ModeRGB) {

+   case GL_REPLACE:

+      combine->_NumArgsRGB = 1;

+      break;

+   case GL_ADD:

+   case GL_ADD_SIGNED:

+      if (texUnit->EnvMode == GL_COMBINE4_NV)

+         combine->_NumArgsRGB = 4;

+      else

+         combine->_NumArgsRGB = 2;

+      break;

+   case GL_MODULATE:

+   case GL_SUBTRACT:

+   case GL_DOT3_RGB:

+   case GL_DOT3_RGBA:

+   case GL_DOT3_RGB_EXT:

+   case GL_DOT3_RGBA_EXT:

+      combine->_NumArgsRGB = 2;

+      break;

+   case GL_INTERPOLATE:

+   case GL_MODULATE_ADD_ATI:

+   case GL_MODULATE_SIGNED_ADD_ATI:

+   case GL_MODULATE_SUBTRACT_ATI:

+      combine->_NumArgsRGB = 3;

+      break;

+   case GL_BUMP_ENVMAP_ATI:

+      /* no real arguments for this case */

+      combine->_NumArgsRGB = 0;

+      break;

+   default:

+      combine->_NumArgsRGB = 0;

+      _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");

+      return;

+   }

+

+   /* Determine number of source Alpha terms in the combiner function */

+   switch (combine->ModeA) {

+   case GL_REPLACE:

+      combine->_NumArgsA = 1;

+      break;

+   case GL_ADD:

+   case GL_ADD_SIGNED:

+      if (texUnit->EnvMode == GL_COMBINE4_NV)

+         combine->_NumArgsA = 4;

+      else

+         combine->_NumArgsA = 2;

+      break;

+   case GL_MODULATE:

+   case GL_SUBTRACT:

+      combine->_NumArgsA = 2;

+      break;

+   case GL_INTERPOLATE:

+   case GL_MODULATE_ADD_ATI:

+   case GL_MODULATE_SIGNED_ADD_ATI:

+   case GL_MODULATE_SUBTRACT_ATI:

+      combine->_NumArgsA = 3;

+      break;

+   default:

+      combine->_NumArgsA = 0;

+      _mesa_problem(ctx, "invalid Alpha combine mode in update_texture_state");

+      break;

+   }

+}

+

+

+/**

+ * \note This routine refers to derived texture matrix values to

+ * compute the ENABLE_TEXMAT flags, but is only called on

+ * _NEW_TEXTURE.  On changes to _NEW_TEXTURE_MATRIX, the ENABLE_TEXMAT

+ * flags are updated by _mesa_update_texture_matrices, above.

+ *

+ * \param ctx GL context.

+ */

+static void

+update_texture_state( struct gl_context *ctx )

+{

+   GLuint unit;

+   struct gl_fragment_program *fprog = NULL;

+   struct gl_vertex_program *vprog = NULL;

+   GLbitfield enabledFragUnits = 0x0;

+

+   if (ctx->Shader.CurrentVertexProgram &&

+       ctx->Shader.CurrentVertexProgram->LinkStatus) {

+      vprog = ctx->Shader.CurrentVertexProgram->VertexProgram;

+   } else if (ctx->VertexProgram._Enabled) {

+      /* XXX enable this if/when non-shader vertex programs get

+       * texture fetches:

+       vprog = ctx->VertexProgram.Current;

+       */

+   }

+

+   if (ctx->Shader.CurrentFragmentProgram &&

+       ctx->Shader.CurrentFragmentProgram->LinkStatus) {

+      fprog = ctx->Shader.CurrentFragmentProgram->FragmentProgram;

+   }

+   else if (ctx->FragmentProgram._Enabled) {

+      fprog = ctx->FragmentProgram.Current;

+   }

+

+   /* FINISHME: Geometry shader texture accesses should also be considered

+    * FINISHME: here.

+    */

+

+   /* TODO: only set this if there are actual changes */

+   ctx->NewState |= _NEW_TEXTURE;

+

+   ctx->Texture._EnabledUnits = 0x0;

+   ctx->Texture._GenFlags = 0x0;

+   ctx->Texture._TexMatEnabled = 0x0;

+   ctx->Texture._TexGenEnabled = 0x0;

+

+   /*

+    * Update texture unit state.

+    */

+   for (unit = 0; unit < ctx->Const.MaxCombinedTextureImageUnits; unit++) {

+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+      GLbitfield enabledVertTargets = 0x0;

+      GLbitfield enabledFragTargets = 0x0;

+      GLbitfield enabledTargets = 0x0;

+      GLuint texIndex;

+

+      /* Get the bitmask of texture target enables.

+       * enableBits will be a mask of the TEXTURE_*_BIT flags indicating

+       * which texture targets are enabled (fixed function) or referenced

+       * by a fragment program/program.  When multiple flags are set, we'll

+       * settle on the one with highest priority (see below).

+       */

+      if (vprog) {

+         enabledVertTargets |= vprog->Base.TexturesUsed[unit];

+      }

+

+      if (fprog) {

+         enabledFragTargets |= fprog->Base.TexturesUsed[unit];

+      }

+      else {

+         /* fixed-function fragment program */

+         enabledFragTargets |= texUnit->Enabled;

+      }

+

+      enabledTargets = enabledVertTargets | enabledFragTargets;

+

+      texUnit->_ReallyEnabled = 0x0;

+

+      if (enabledTargets == 0x0) {

+         /* neither vertex nor fragment processing uses this unit */

+         continue;

+      }

+

+      /* Look for the highest priority texture target that's enabled (or used

+       * by the vert/frag shaders) and "complete".  That's the one we'll use

+       * for texturing.  If we're using vert/frag program we're guaranteed

+       * that bitcount(enabledBits) <= 1.

+       * Note that the TEXTURE_x_INDEX values are in high to low priority.

+       */

+      for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) {

+         if (enabledTargets & (1 << texIndex)) {

+            struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex];

+            if (!texObj->_Complete) {

+               _mesa_test_texobj_completeness(ctx, texObj);

+            }

+            if (texObj->_Complete) {

+               texUnit->_ReallyEnabled = 1 << texIndex;

+               _mesa_reference_texobj(&texUnit->_Current, texObj);

+               break;

+            }

+         }

+      }

+

+      if (!texUnit->_ReallyEnabled) {

+         if (fprog) {

+            /* If we get here it means the shader is expecting a texture

+             * object, but there isn't one (or it's incomplete).  Use the

+             * fallback texture.

+             */

+            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);

+            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;

+            _mesa_reference_texobj(&texUnit->_Current, texObj);

+         }

+         else {

+            /* fixed-function: texture unit is really disabled */

+            continue;

+         }

+      }

+

+      /* if we get here, we know this texture unit is enabled */

+

+      ctx->Texture._EnabledUnits |= (1 << unit);

+

+      if (enabledFragTargets)

+         enabledFragUnits |= (1 << unit);

+

+      update_tex_combine(ctx, texUnit);

+   }

+

+

+   /* Determine which texture coordinate sets are actually needed */

+   if (fprog) {

+      const GLuint coordMask = (1 << MAX_TEXTURE_COORD_UNITS) - 1;

+      ctx->Texture._EnabledCoordUnits

+         = (fprog->Base.InputsRead >> FRAG_ATTRIB_TEX0) & coordMask;

+   }

+   else {

+      ctx->Texture._EnabledCoordUnits = enabledFragUnits;

+   }

+

+   /* Setup texgen for those texture coordinate sets that are in use */

+   for (unit = 0; unit < ctx->Const.MaxTextureCoordUnits; unit++) {

+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+

+      texUnit->_GenFlags = 0x0;

+

+      if (!(ctx->Texture._EnabledCoordUnits & (1 << unit)))

+	 continue;

+

+      if (texUnit->TexGenEnabled) {

+	 if (texUnit->TexGenEnabled & S_BIT) {

+	    texUnit->_GenFlags |= texUnit->GenS._ModeBit;

+	 }

+	 if (texUnit->TexGenEnabled & T_BIT) {

+	    texUnit->_GenFlags |= texUnit->GenT._ModeBit;

+	 }

+	 if (texUnit->TexGenEnabled & R_BIT) {

+	    texUnit->_GenFlags |= texUnit->GenR._ModeBit;

+	 }

+	 if (texUnit->TexGenEnabled & Q_BIT) {

+	    texUnit->_GenFlags |= texUnit->GenQ._ModeBit;

+	 }

+

+	 ctx->Texture._TexGenEnabled |= ENABLE_TEXGEN(unit);

+	 ctx->Texture._GenFlags |= texUnit->_GenFlags;

+      }

+

+      ASSERT(unit < Elements(ctx->TextureMatrixStack));

+      if (ctx->TextureMatrixStack[unit].Top->type != MATRIX_IDENTITY)

+	 ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(unit);

+   }

+}

+

+

+/**

+ * Update texture-related derived state.

+ */

+void

+_mesa_update_texture( struct gl_context *ctx, GLuint new_state )

+{

+   if (new_state & _NEW_TEXTURE_MATRIX)

+      update_texture_matrices( ctx );

+

+   if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM))

+      update_texture_state( ctx );

+}

+

+

+/**********************************************************************/

+/*****                      Initialization                        *****/

+/**********************************************************************/

+

+/**

+ * Allocate the proxy textures for the given context.

+ * 

+ * \param ctx the context to allocate proxies for.

+ * 

+ * \return GL_TRUE on success, or GL_FALSE on failure

+ * 

+ * If run out of memory part way through the allocations, clean up and return

+ * GL_FALSE.

+ */

+static GLboolean

+alloc_proxy_textures( struct gl_context *ctx )

+{

+   static const GLenum targets[] = {

+      GL_TEXTURE_1D,

+      GL_TEXTURE_2D,

+      GL_TEXTURE_3D,

+      GL_TEXTURE_CUBE_MAP_ARB,

+      GL_TEXTURE_RECTANGLE_NV,

+      GL_TEXTURE_1D_ARRAY_EXT,

+      GL_TEXTURE_2D_ARRAY_EXT

+   };

+   GLint tgt;

+

+   ASSERT(Elements(targets) == NUM_TEXTURE_TARGETS);

+

+   for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+      if (!(ctx->Texture.ProxyTex[tgt]

+            = ctx->Driver.NewTextureObject(ctx, 0, targets[tgt]))) {

+         /* out of memory, free what we did allocate */

+         while (--tgt >= 0) {

+            ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);

+         }

+         return GL_FALSE;

+      }

+   }

+

+   assert(ctx->Texture.ProxyTex[0]->RefCount == 1); /* sanity check */

+   return GL_TRUE;

+}

+

+

+/**

+ * Initialize a texture unit.

+ *

+ * \param ctx GL context.

+ * \param unit texture unit number to be initialized.

+ */

+static void

+init_texture_unit( struct gl_context *ctx, GLuint unit )

+{

+   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+   GLuint tex;

+

+   texUnit->EnvMode = GL_MODULATE;

+   ASSIGN_4V( texUnit->EnvColor, 0.0, 0.0, 0.0, 0.0 );

+

+   texUnit->Combine = default_combine_state;

+   texUnit->_EnvMode = default_combine_state;

+   texUnit->_CurrentCombine = & texUnit->_EnvMode;

+   texUnit->BumpTarget = GL_TEXTURE0;

+

+   texUnit->TexGenEnabled = 0x0;

+   texUnit->GenS.Mode = GL_EYE_LINEAR;

+   texUnit->GenT.Mode = GL_EYE_LINEAR;

+   texUnit->GenR.Mode = GL_EYE_LINEAR;

+   texUnit->GenQ.Mode = GL_EYE_LINEAR;

+   texUnit->GenS._ModeBit = TEXGEN_EYE_LINEAR;

+   texUnit->GenT._ModeBit = TEXGEN_EYE_LINEAR;

+   texUnit->GenR._ModeBit = TEXGEN_EYE_LINEAR;

+   texUnit->GenQ._ModeBit = TEXGEN_EYE_LINEAR;

+

+   /* Yes, these plane coefficients are correct! */

+   ASSIGN_4V( texUnit->GenS.ObjectPlane, 1.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenT.ObjectPlane, 0.0, 1.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenR.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenQ.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenS.EyePlane, 1.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );

+   ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );

+

+   /* no mention of this in spec, but maybe id matrix expected? */

+   ASSIGN_4V( texUnit->RotMatrix, 1.0, 0.0, 0.0, 1.0 );

+

+   /* initialize current texture object ptrs to the shared default objects */

+   for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {

+      _mesa_reference_texobj(&texUnit->CurrentTex[tex],

+                             ctx->Shared->DefaultTex[tex]);

+   }

+}

+

+

+/**

+ * Initialize texture state for the given context.

+ */

+GLboolean

+_mesa_init_texture(struct gl_context *ctx)

+{

+   GLuint u;

+

+   /* Texture group */

+   ctx->Texture.CurrentUnit = 0;      /* multitexture */

+   ctx->Texture._EnabledUnits = 0x0;

+   ctx->Texture.SharedPalette = GL_FALSE;

+   _mesa_init_colortable(&ctx->Texture.Palette);

+

+   for (u = 0; u < Elements(ctx->Texture.Unit); u++)

+      init_texture_unit(ctx, u);

+

+   /* After we're done initializing the context's texture state the default

+    * texture objects' refcounts should be at least

+    * MAX_COMBINED_TEXTURE_IMAGE_UNITS + 1.

+    */

+   assert(ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]->RefCount

+          >= MAX_COMBINED_TEXTURE_IMAGE_UNITS + 1);

+

+   /* Allocate proxy textures */

+   if (!alloc_proxy_textures( ctx ))

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Free dynamically-allocted texture data attached to the given context.

+ */

+void

+_mesa_free_texture_data(struct gl_context *ctx)

+{

+   GLuint u, tgt;

+

+   /* unreference current textures */

+   for (u = 0; u < Elements(ctx->Texture.Unit); u++) {

+      /* The _Current texture could account for another reference */

+      _mesa_reference_texobj(&ctx->Texture.Unit[u]._Current, NULL);

+

+      for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {

+         _mesa_reference_texobj(&ctx->Texture.Unit[u].CurrentTex[tgt], NULL);

+      }

+   }

+

+   /* Free proxy texture objects */

+   for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++)

+      ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);

+

+   for (u = 0; u < Elements(ctx->Texture.Unit); u++)

+      _mesa_free_colortable_data(&ctx->Texture.Unit[u].ColorTable);

+}

+

+

+/**

+ * Update the default texture objects in the given context to reference those

+ * specified in the shared state and release those referencing the old 

+ * shared state.

+ */

+void

+_mesa_update_default_objects_texture(struct gl_context *ctx)

+{

+   GLuint u, tex;

+

+   for (u = 0; u < Elements(ctx->Texture.Unit); u++) {

+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[u];

+      for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {

+         _mesa_reference_texobj(&texUnit->CurrentTex[tex],

+                                ctx->Shared->DefaultTex[tex]);

+      }

+   }

+}

diff --git a/mesalib/src/mesa/main/texstate.h b/mesalib/src/mesa/main/texstate.h
index 912cb6779..1258a0705 100644
--- a/mesalib/src/mesa/main/texstate.h
+++ b/mesalib/src/mesa/main/texstate.h
@@ -1,92 +1,92 @@
-/**
- * \file texstate.h
- * Texture state management.
- */
-
-/*
- * 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 TEXSTATE_H
-#define TEXSTATE_H
-
-
-#include "compiler.h"
-#include "mtypes.h"
-
-
-/**
- * Return pointer to current texture unit.
- * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
- */
-static INLINE struct gl_texture_unit *
-_mesa_get_current_tex_unit(GLcontext *ctx)
-{
-   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
-   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
-}
-
-
-extern void
-_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst );
-
-extern void
-_mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
-
-
-
-/**
- * \name Called from API
- */
-/*@{*/
-
-extern void GLAPIENTRY
-_mesa_ActiveTextureARB( GLenum target );
-
-extern void GLAPIENTRY
-_mesa_ClientActiveTextureARB( GLenum target );
-
-/*@}*/
-
-
-/**
- * \name Initialization, state maintenance
- */
-/*@{*/
-
-extern void 
-_mesa_update_texture( GLcontext *ctx, GLuint new_state );
-
-extern GLboolean
-_mesa_init_texture( GLcontext *ctx );
-
-extern void 
-_mesa_free_texture_data( GLcontext *ctx );
-
-extern void
-_mesa_update_default_objects_texture(GLcontext *ctx);
-
-/*@}*/
-
-#endif
+/**

+ * \file texstate.h

+ * Texture state management.

+ */

+

+/*

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

+#define TEXSTATE_H

+

+

+#include "compiler.h"

+#include "mtypes.h"

+

+

+/**

+ * Return pointer to current texture unit.

+ * This the texture unit set by glActiveTexture(), not glClientActiveTexture().

+ */

+static INLINE struct gl_texture_unit *

+_mesa_get_current_tex_unit(struct gl_context *ctx)

+{

+   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));

+   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);

+}

+

+

+extern void

+_mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst );

+

+extern void

+_mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );

+

+

+

+/**

+ * \name Called from API

+ */

+/*@{*/

+

+extern void GLAPIENTRY

+_mesa_ActiveTextureARB( GLenum target );

+

+extern void GLAPIENTRY

+_mesa_ClientActiveTextureARB( GLenum target );

+

+/*@}*/

+

+

+/**

+ * \name Initialization, state maintenance

+ */

+/*@{*/

+

+extern void 

+_mesa_update_texture( struct gl_context *ctx, GLuint new_state );

+

+extern GLboolean

+_mesa_init_texture( struct gl_context *ctx );

+

+extern void 

+_mesa_free_texture_data( struct gl_context *ctx );

+

+extern void

+_mesa_update_default_objects_texture(struct gl_context *ctx);

+

+/*@}*/

+

+#endif

diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 2989fdb72..8759c33ae 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -1,4536 +1,4775 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.5
- *
- * 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
- */
-
-/**
- * The GL texture image functions in teximage.c basically just do
- * error checking and data structure allocation.  They in turn call
- * device driver functions which actually copy/convert/store the user's
- * texture image data.
- *
- * However, most device drivers will be able to use the fallback functions
- * in this file.  That is, most drivers will have the following bit of
- * code:
- *   ctx->Driver.TexImage1D = _mesa_store_teximage1d;
- *   ctx->Driver.TexImage2D = _mesa_store_teximage2d;
- *   ctx->Driver.TexImage3D = _mesa_store_teximage3d;
- *   etc...
- *
- * Texture image processing is actually kind of complicated.  We have to do:
- *    Format/type conversions
- *    pixel unpacking
- *    pixel transfer (scale, bais, lookup, convolution!, etc)
- *
- * These functions can handle most everything, including processing full
- * images and sub-images.
- */
-
-
-#include "glheader.h"
-#include "bufferobj.h"
-#include "colormac.h"
-#include "convolve.h"
-#include "image.h"
-#include "macros.h"
-#include "mipmap.h"
-#include "imports.h"
-#include "texcompress.h"
-#include "texcompress_fxt1.h"
-#include "texcompress_s3tc.h"
-#include "teximage.h"
-#include "texstore.h"
-#include "enums.h"
-
-
-enum {
-   ZERO = 4, 
-   ONE = 5
-};
-
-
-/**
- * Texture image storage function.
- */
-typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);
-
-
-/**
- * Return GL_TRUE if the given image format is one that be converted
- * to another format by swizzling.
- */
-static GLboolean
-can_swizzle(GLenum logicalBaseFormat)
-{
-   switch (logicalBaseFormat) {
-   case GL_RGBA:
-   case GL_RGB:
-   case GL_LUMINANCE_ALPHA:
-   case GL_INTENSITY:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_RED:
-   case GL_GREEN:
-   case GL_BLUE:
-   case GL_BGR:
-   case GL_BGRA:
-   case GL_ABGR_EXT:
-      return GL_TRUE;
-   default:
-      return GL_FALSE;
-   }
-}
-
-
-
-enum {
-   IDX_LUMINANCE = 0,
-   IDX_ALPHA,
-   IDX_INTENSITY,
-   IDX_LUMINANCE_ALPHA,
-   IDX_RGB,
-   IDX_RGBA,
-   IDX_RED,
-   IDX_GREEN,
-   IDX_BLUE,
-   IDX_BGR,
-   IDX_BGRA,
-   IDX_ABGR,
-   MAX_IDX
-};
-
-#define MAP1(x)       MAP4(x, ZERO, ZERO, ZERO)
-#define MAP2(x,y)     MAP4(x, y, ZERO, ZERO)
-#define MAP3(x,y,z)   MAP4(x, y, z, ZERO)
-#define MAP4(x,y,z,w) { x, y, z, w, ZERO, ONE }
-
-
-static const struct {
-   GLubyte format_idx;
-   GLubyte to_rgba[6];
-   GLubyte from_rgba[6];
-} mappings[MAX_IDX] = 
-{
-   {
-      IDX_LUMINANCE,
-      MAP4(0,0,0,ONE),
-      MAP1(0)
-   },
-
-   {
-      IDX_ALPHA,
-      MAP4(ZERO, ZERO, ZERO, 0),
-      MAP1(3)
-   },
-
-   {
-      IDX_INTENSITY,
-      MAP4(0, 0, 0, 0),
-      MAP1(0),
-   },
-
-   {
-      IDX_LUMINANCE_ALPHA,
-      MAP4(0,0,0,1),
-      MAP2(0,3)
-   },
-
-   {
-      IDX_RGB,
-      MAP4(0,1,2,ONE),
-      MAP3(0,1,2)
-   },
-
-   {
-      IDX_RGBA,
-      MAP4(0,1,2,3),
-      MAP4(0,1,2,3),
-   },
-
-
-   {
-      IDX_RED,
-      MAP4(0, ZERO, ZERO, ONE),
-      MAP1(0),
-   },
-
-   {
-      IDX_GREEN,
-      MAP4(ZERO, 0, ZERO, ONE),
-      MAP1(1),
-   },
-
-   {
-      IDX_BLUE,
-      MAP4(ZERO, ZERO, 0, ONE),
-      MAP1(2),
-   },
-
-   {
-      IDX_BGR,
-      MAP4(2,1,0,ONE),
-      MAP3(2,1,0)
-   },
-
-   {
-      IDX_BGRA,
-      MAP4(2,1,0,3),
-      MAP4(2,1,0,3)
-   },
-
-   {
-      IDX_ABGR,
-      MAP4(3,2,1,0),
-      MAP4(3,2,1,0)
-   },
-};
-
-
-
-/**
- * Convert a GL image format enum to an IDX_* value (see above).
- */
-static int
-get_map_idx(GLenum value)
-{
-   switch (value) {
-   case GL_LUMINANCE: return IDX_LUMINANCE;
-   case GL_ALPHA: return IDX_ALPHA;
-   case GL_INTENSITY: return IDX_INTENSITY;
-   case GL_LUMINANCE_ALPHA: return IDX_LUMINANCE_ALPHA;
-   case GL_RGB: return IDX_RGB;
-   case GL_RGBA: return IDX_RGBA;
-   case GL_RED: return IDX_RED;
-   case GL_GREEN: return IDX_GREEN;
-   case GL_BLUE: return IDX_BLUE;
-   case GL_BGR: return IDX_BGR;
-   case GL_BGRA: return IDX_BGRA;
-   case GL_ABGR_EXT: return IDX_ABGR;
-   default:
-      _mesa_problem(NULL, "Unexpected inFormat");
-      return 0;
-   }
-}   
-
-
-/**
- * When promoting texture formats (see below) we need to compute the
- * mapping of dest components back to source components.
- * This function does that.
- * \param inFormat  the incoming format of the texture
- * \param outFormat  the final texture format
- * \return map[6]  a full 6-component map
- */
-static void
-compute_component_mapping(GLenum inFormat, GLenum outFormat, 
-			  GLubyte *map)
-{
-   const int inFmt = get_map_idx(inFormat);
-   const int outFmt = get_map_idx(outFormat);
-   const GLubyte *in2rgba = mappings[inFmt].to_rgba;
-   const GLubyte *rgba2out = mappings[outFmt].from_rgba;
-   int i;
-   
-   for (i = 0; i < 4; i++)
-      map[i] = in2rgba[rgba2out[i]];
-
-   map[ZERO] = ZERO;
-   map[ONE] = ONE;   
-
-#if 0
-   printf("from %x/%s to %x/%s map %d %d %d %d %d %d\n",
-	  inFormat, _mesa_lookup_enum_by_nr(inFormat),
-	  outFormat, _mesa_lookup_enum_by_nr(outFormat),
-	  map[0], 
-	  map[1], 
-	  map[2], 
-	  map[3], 
-	  map[4], 
-	  map[5]); 
-#endif
-}
-
-
-/**
- * Make a temporary (color) texture image with GLfloat components.
- * Apply all needed pixel unpacking and pixel transfer operations.
- * Note that there are both logicalBaseFormat and textureBaseFormat parameters.
- * Suppose the user specifies GL_LUMINANCE as the internal texture format
- * but the graphics hardware doesn't support luminance textures.  So, might
- * use an RGB hardware format instead.
- * If logicalBaseFormat != textureBaseFormat we have some extra work to do.
- *
- * \param ctx  the rendering context
- * \param dims  image dimensions: 1, 2 or 3
- * \param logicalBaseFormat  basic texture derived from the user's
- *    internal texture format value
- * \param textureBaseFormat  the actual basic format of the texture
- * \param srcWidth  source image width
- * \param srcHeight  source image height
- * \param srcDepth  source image depth
- * \param srcFormat  source image format
- * \param srcType  source image type
- * \param srcAddr  source image address
- * \param srcPacking  source image pixel packing
- * \return resulting image with format = textureBaseFormat and type = GLfloat.
- */
-static GLfloat *
-make_temp_float_image(GLcontext *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)
-{
-   GLuint transferOps = ctx->_ImageTransferState;
-   GLfloat *tempImage;
-
-   ASSERT(dims >= 1 && dims <= 3);
-
-   ASSERT(logicalBaseFormat == GL_RGBA ||
-          logicalBaseFormat == GL_RGB ||
-          logicalBaseFormat == GL_LUMINANCE_ALPHA ||
-          logicalBaseFormat == GL_LUMINANCE ||
-          logicalBaseFormat == GL_ALPHA ||
-          logicalBaseFormat == GL_INTENSITY ||
-          logicalBaseFormat == GL_COLOR_INDEX ||
-          logicalBaseFormat == GL_DEPTH_COMPONENT);
-
-   ASSERT(textureBaseFormat == GL_RGBA ||
-          textureBaseFormat == GL_RGB ||
-          textureBaseFormat == GL_LUMINANCE_ALPHA ||
-          textureBaseFormat == GL_LUMINANCE ||
-          textureBaseFormat == GL_ALPHA ||
-          textureBaseFormat == GL_INTENSITY ||
-          textureBaseFormat == GL_COLOR_INDEX ||
-          textureBaseFormat == GL_DEPTH_COMPONENT);
-
-   /* conventional color image */
-
-   if ((dims == 1 && ctx->Pixel.Convolution1DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Convolution2DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Separable2DEnabled)) {
-      /* need image convolution */
-      const GLuint preConvTransferOps
-         = (transferOps & IMAGE_PRE_CONVOLUTION_BITS) | IMAGE_CLAMP_BIT;
-      const GLuint postConvTransferOps
-         = (transferOps & IMAGE_POST_CONVOLUTION_BITS) | IMAGE_CLAMP_BIT;
-      GLint img, row;
-      GLint convWidth = srcWidth, convHeight = srcHeight;
-      GLfloat *convImage;
-
-      /* pre-convolution image buffer (3D) */
-      tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
-                                           * 4 * sizeof(GLfloat));
-      if (!tempImage)
-         return NULL;
-
-      /* post-convolution image buffer (2D) */
-      convImage = (GLfloat *) malloc(srcWidth * srcHeight
-                                           * 4 * sizeof(GLfloat));
-      if (!convImage) {
-         free(tempImage);
-         return NULL;
-      }
-
-      /* loop over 3D image slices */
-      for (img = 0; img < srcDepth; img++) {
-         GLfloat *dst = tempImage + img * (srcWidth * srcHeight * 4);
-
-         /* unpack and do transfer ops up to convolution */
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                                              srcAddr, srcWidth, srcHeight,
-                                              srcFormat, srcType, img, row, 0);
-            _mesa_unpack_color_span_float(ctx, srcWidth, GL_RGBA, dst,
-                                          srcFormat, srcType, src,
-                                          srcPacking,
-                                          preConvTransferOps);
-            dst += srcWidth * 4;
-         }
-
-         /* size after optional convolution */
-         convWidth = srcWidth;
-         convHeight = srcHeight;
-
-#if FEATURE_convolve
-         /* do convolution */
-         {
-            GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4);
-            if (dims == 1) {
-               ASSERT(ctx->Pixel.Convolution1DEnabled);
-               _mesa_convolve_1d_image(ctx, &convWidth, src, convImage);
-            }
-            else {
-               if (ctx->Pixel.Convolution2DEnabled) {
-                  _mesa_convolve_2d_image(ctx, &convWidth, &convHeight,
-                                          src, convImage);
-               }
-               else {
-                  ASSERT(ctx->Pixel.Separable2DEnabled);
-                  _mesa_convolve_sep_image(ctx, &convWidth, &convHeight,
-                                           src, convImage);
-               }
-            }
-         }
-#endif
-         /* do post-convolution transfer and pack into tempImage */
-         {
-            const GLint logComponents
-               = _mesa_components_in_format(logicalBaseFormat);
-            const GLfloat *src = convImage;
-            GLfloat *dst = tempImage + img * (convWidth * convHeight * 4);
-            for (row = 0; row < convHeight; row++) {
-               _mesa_pack_rgba_span_float(ctx, convWidth,
-                                          (GLfloat (*)[4]) src,
-                                          logicalBaseFormat, GL_FLOAT,
-                                          dst, &ctx->DefaultPacking,
-                                          postConvTransferOps);
-               src += convWidth * 4;
-               dst += convWidth * logComponents;
-            }
-         }
-      } /* loop over 3D image slices */
-
-      free(convImage);
-
-      /* might need these below */
-      srcWidth = convWidth;
-      srcHeight = convHeight;
-   }
-   else {
-      /* no convolution */
-      const GLint components = _mesa_components_in_format(logicalBaseFormat);
-      const GLint srcStride =
-         _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-      GLfloat *dst;
-      GLint img, row;
-
-      tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
-                                           * components * sizeof(GLfloat));
-      if (!tempImage)
-         return NULL;
-
-      dst = tempImage;
-      for (img = 0; img < srcDepth; img++) {
-         const GLubyte *src
-            = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                                    srcWidth, srcHeight,
-                                                    srcFormat, srcType,
-                                                    img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            _mesa_unpack_color_span_float(ctx, srcWidth, logicalBaseFormat,
-                                          dst, srcFormat, srcType, src,
-                                          srcPacking, transferOps);
-            dst += srcWidth * components;
-            src += srcStride;
-         }
-      }
-   }
-
-   if (logicalBaseFormat != textureBaseFormat) {
-      /* more work */
-      GLint texComponents = _mesa_components_in_format(textureBaseFormat);
-      GLint logComponents = _mesa_components_in_format(logicalBaseFormat);
-      GLfloat *newImage;
-      GLint i, n;
-      GLubyte map[6];
-
-      /* we only promote up to RGB, RGBA and LUMINANCE_ALPHA formats for now */
-      ASSERT(textureBaseFormat == GL_RGB || textureBaseFormat == GL_RGBA ||
-             textureBaseFormat == GL_LUMINANCE_ALPHA);
-
-      /* The actual texture format should have at least as many components
-       * as the logical texture format.
-       */
-      ASSERT(texComponents >= logComponents);
-
-      newImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
-                                          * texComponents * sizeof(GLfloat));
-      if (!newImage) {
-         free(tempImage);
-         return NULL;
-      }
-
-      compute_component_mapping(logicalBaseFormat, textureBaseFormat, map);
-
-      n = srcWidth * srcHeight * srcDepth;
-      for (i = 0; i < n; i++) {
-         GLint k;
-         for (k = 0; k < texComponents; k++) {
-            GLint j = map[k];
-            if (j == ZERO)
-               newImage[i * texComponents + k] = 0.0F;
-            else if (j == ONE)
-               newImage[i * texComponents + k] = 1.0F;
-            else
-               newImage[i * texComponents + k] = tempImage[i * logComponents + j];
-         }
-      }
-
-      free(tempImage);
-      tempImage = newImage;
-   }
-
-   return tempImage;
-}
-
-
-/**
- * Make a temporary (color) texture image with GLchan components.
- * Apply all needed pixel unpacking and pixel transfer operations.
- * Note that there are both logicalBaseFormat and textureBaseFormat parameters.
- * Suppose the user specifies GL_LUMINANCE as the internal texture format
- * but the graphics hardware doesn't support luminance textures.  So, might
- * use an RGB hardware format instead.
- * If logicalBaseFormat != textureBaseFormat we have some extra work to do.
- *
- * \param ctx  the rendering context
- * \param dims  image dimensions: 1, 2 or 3
- * \param logicalBaseFormat  basic texture derived from the user's
- *    internal texture format value
- * \param textureBaseFormat  the actual basic format of the texture
- * \param srcWidth  source image width
- * \param srcHeight  source image height
- * \param srcDepth  source image depth
- * \param srcFormat  source image format
- * \param srcType  source image type
- * \param srcAddr  source image address
- * \param srcPacking  source image pixel packing
- * \return resulting image with format = textureBaseFormat and type = GLchan.
- */
-GLchan *
-_mesa_make_temp_chan_image(GLcontext *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)
-{
-   GLuint transferOps = ctx->_ImageTransferState;
-   const GLint components = _mesa_components_in_format(logicalBaseFormat);
-   GLboolean freeSrcImage = GL_FALSE;
-   GLint img, row;
-   GLchan *tempImage, *dst;
-
-   ASSERT(dims >= 1 && dims <= 3);
-
-   ASSERT(logicalBaseFormat == GL_RGBA ||
-          logicalBaseFormat == GL_RGB ||
-          logicalBaseFormat == GL_LUMINANCE_ALPHA ||
-          logicalBaseFormat == GL_LUMINANCE ||
-          logicalBaseFormat == GL_ALPHA ||
-          logicalBaseFormat == GL_INTENSITY);
-
-   ASSERT(textureBaseFormat == GL_RGBA ||
-          textureBaseFormat == GL_RGB ||
-          textureBaseFormat == GL_LUMINANCE_ALPHA ||
-          textureBaseFormat == GL_LUMINANCE ||
-          textureBaseFormat == GL_ALPHA ||
-          textureBaseFormat == GL_INTENSITY);
-
-#if FEATURE_convolve
-   if ((dims == 1 && ctx->Pixel.Convolution1DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Convolution2DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Separable2DEnabled)) {
-      /* get convolved image */
-      GLfloat *convImage = make_temp_float_image(ctx, dims,
-                                                 logicalBaseFormat,
-                                                 logicalBaseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType,
-                                                 srcAddr, srcPacking);
-      if (!convImage)
-         return NULL;
-      /* the convolved image is our new source image */
-      srcAddr = convImage;
-      srcFormat = logicalBaseFormat;
-      srcType = GL_FLOAT;
-      srcPacking = &ctx->DefaultPacking;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      transferOps = 0;
-      freeSrcImage = GL_TRUE;
-   }
-#endif
-
-   /* unpack and transfer the source image */
-   tempImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth
-                                       * components * sizeof(GLchan));
-   if (!tempImage) {
-      if (freeSrcImage) {
-         free((void *) srcAddr);
-      }
-      return NULL;
-   }
-
-   dst = tempImage;
-   for (img = 0; img < srcDepth; img++) {
-      const GLint srcStride =
-         _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-      const GLubyte *src =
-         (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                               srcWidth, srcHeight,
-                                               srcFormat, srcType,
-                                               img, 0, 0);
-      for (row = 0; row < srcHeight; row++) {
-         _mesa_unpack_color_span_chan(ctx, srcWidth, logicalBaseFormat, dst,
-                                      srcFormat, srcType, src, srcPacking,
-                                      transferOps);
-         dst += srcWidth * components;
-         src += srcStride;
-      }
-   }
-
-   /* If we made a temporary image for convolution, free it here */
-   if (freeSrcImage) {
-      free((void *) srcAddr);
-   }
-
-   if (logicalBaseFormat != textureBaseFormat) {
-      /* one more conversion step */
-      GLint texComponents = _mesa_components_in_format(textureBaseFormat);
-      GLint logComponents = _mesa_components_in_format(logicalBaseFormat);
-      GLchan *newImage;
-      GLint i, n;
-      GLubyte map[6];
-
-      /* we only promote up to RGB, RGBA and LUMINANCE_ALPHA formats for now */
-      ASSERT(textureBaseFormat == GL_RGB || textureBaseFormat == GL_RGBA ||
-             textureBaseFormat == GL_LUMINANCE_ALPHA);
-
-      /* The actual texture format should have at least as many components
-       * as the logical texture format.
-       */
-      ASSERT(texComponents >= logComponents);
-
-      newImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth
-                                         * texComponents * sizeof(GLchan));
-      if (!newImage) {
-         free(tempImage);
-         return NULL;
-      }
-
-      compute_component_mapping(logicalBaseFormat, textureBaseFormat, map);
-
-      n = srcWidth * srcHeight * srcDepth;
-      for (i = 0; i < n; i++) {
-         GLint k;
-         for (k = 0; k < texComponents; k++) {
-            GLint j = map[k];
-            if (j == ZERO)
-               newImage[i * texComponents + k] = 0;
-            else if (j == ONE)
-               newImage[i * texComponents + k] = CHAN_MAX;
-            else
-               newImage[i * texComponents + k] = tempImage[i * logComponents + j];
-         }
-      }
-
-      free(tempImage);
-      tempImage = newImage;
-   }
-
-   return tempImage;
-}
-
-
-/**
- * Copy GLubyte pixels from <src> to <dst> with swizzling.
- * \param dst  destination pixels
- * \param dstComponents  number of color components in destination pixels
- * \param src  source pixels
- * \param srcComponents  number of color components in source pixels
- * \param map  the swizzle mapping.  map[X] says where to find the X component
- *             in the source image's pixels.  For example, if the source image
- *             is GL_BGRA and X = red, map[0] yields 2.
- * \param count  number of pixels to copy/swizzle.
- */
-static void
-swizzle_copy(GLubyte *dst, GLuint dstComponents, const GLubyte *src, 
-             GLuint srcComponents, const GLubyte *map, GLuint count)
-{
-#define SWZ_CPY(dst, src, count, dstComps, srcComps) \
-   do {                                              \
-      GLuint i;                                      \
-      for (i = 0; i < count; i++) {                  \
-         GLuint j;                                   \
-         if (srcComps == 4) {                        \
-            COPY_4UBV(tmp, src);                     \
-         }                                           \
-         else {                                      \
-            for (j = 0; j < srcComps; j++) {         \
-               tmp[j] = src[j];                      \
-            }                                        \
-         }                                           \
-         src += srcComps;                            \
-         for (j = 0; j < dstComps; j++) {            \
-            dst[j] = tmp[map[j]];                    \
-         }                                           \
-         dst += dstComps;                            \
-      }                                              \
-   } while (0)
-
-   GLubyte tmp[6];
-
-   tmp[ZERO] = 0x0;
-   tmp[ONE] = 0xff;
-
-   ASSERT(srcComponents <= 4);
-   ASSERT(dstComponents <= 4);
-
-   switch (dstComponents) {
-   case 4:
-      switch (srcComponents) {
-      case 4:
-         SWZ_CPY(dst, src, count, 4, 4);
-         break;
-      case 3:
-         SWZ_CPY(dst, src, count, 4, 3);
-         break;
-      case 2:
-         SWZ_CPY(dst, src, count, 4, 2);
-         break;
-      case 1:
-         SWZ_CPY(dst, src, count, 4, 1);
-         break;
-      default:
-         ;
-      }
-      break;
-   case 3:
-      switch (srcComponents) {
-      case 4:
-         SWZ_CPY(dst, src, count, 3, 4);
-         break;
-      case 3:
-         SWZ_CPY(dst, src, count, 3, 3);
-         break;
-      case 2:
-         SWZ_CPY(dst, src, count, 3, 2);
-         break;
-      case 1:
-         SWZ_CPY(dst, src, count, 3, 1);
-         break;
-      default:
-         ;
-      }
-      break;
-   case 2:
-      switch (srcComponents) {
-      case 4:
-         SWZ_CPY(dst, src, count, 2, 4);
-         break;
-      case 3:
-         SWZ_CPY(dst, src, count, 2, 3);
-         break;
-      case 2:
-         SWZ_CPY(dst, src, count, 2, 2);
-         break;
-      case 1:
-         SWZ_CPY(dst, src, count, 2, 1);
-         break;
-      default:
-         ;
-      }
-      break;
-   case 1:
-      switch (srcComponents) {
-      case 4:
-         SWZ_CPY(dst, src, count, 1, 4);
-         break;
-      case 3:
-         SWZ_CPY(dst, src, count, 1, 3);
-         break;
-      case 2:
-         SWZ_CPY(dst, src, count, 1, 2);
-         break;
-      case 1:
-         SWZ_CPY(dst, src, count, 1, 1);
-         break;
-      default:
-         ;
-      }
-      break;
-   default:
-      ;
-   }
-#undef SWZ_CPY
-}
-
-
-
-static const GLubyte map_identity[6] = { 0, 1, 2, 3, ZERO, ONE };
-static const GLubyte map_3210[6] = { 3, 2, 1, 0, ZERO, ONE };
-
-/* Deal with the _REV input types:
- */
-static const GLubyte *
-type_mapping( GLenum srcType )
-{
-   switch (srcType) {
-   case GL_BYTE:
-   case GL_UNSIGNED_BYTE:
-      return map_identity;
-   case GL_UNSIGNED_INT_8_8_8_8:
-      return _mesa_little_endian() ? map_3210 : map_identity;
-   case GL_UNSIGNED_INT_8_8_8_8_REV:
-      return _mesa_little_endian() ? map_identity : map_3210;
-   default:
-      return NULL;
-   }
-}
-
-/* Mapping required if input type is 
- */
-static const GLubyte *
-byteswap_mapping( GLboolean swapBytes,
-		  GLenum srcType )
-{
-   if (!swapBytes) 
-      return map_identity;
-
-   switch (srcType) {
-   case GL_BYTE:
-   case GL_UNSIGNED_BYTE:
-      return map_identity;
-   case GL_UNSIGNED_INT_8_8_8_8:
-   case GL_UNSIGNED_INT_8_8_8_8_REV:
-      return map_3210;
-   default:
-      return NULL;
-   }
-}
-
-
-
-/**
- * Transfer a GLubyte texture image with component swizzling.
- */
-static void
-_mesa_swizzle_ubyte_image(GLcontext *ctx, 
-			  GLuint dimensions,
-			  GLenum srcFormat,
-			  GLenum srcType,
-
-			  GLenum baseInternalFormat,
-
-			  const GLubyte *rgba2dst,
-			  GLuint dstComponents,
-
-			  GLvoid *dstAddr,
-			  GLint dstXoffset, GLint dstYoffset, GLint dstZoffset,
-			  GLint dstRowStride,
-                          const GLuint *dstImageOffsets,
-
-			  GLint srcWidth, GLint srcHeight, GLint srcDepth,
-			  const GLvoid *srcAddr,
-			  const struct gl_pixelstore_attrib *srcPacking )
-{
-   GLint srcComponents = _mesa_components_in_format(srcFormat);
-   const GLubyte *srctype2ubyte, *swap;
-   GLubyte map[4], src2base[6], base2rgba[6];
-   GLint i;
-   const GLint srcRowStride =
-      _mesa_image_row_stride(srcPacking, srcWidth,
-                             srcFormat, GL_UNSIGNED_BYTE);
-   const GLint srcImageStride
-      = _mesa_image_image_stride(srcPacking, srcWidth, srcHeight, srcFormat,
-                                 GL_UNSIGNED_BYTE);
-   const GLubyte *srcImage
-      = (const GLubyte *) _mesa_image_address(dimensions, srcPacking, srcAddr,
-                                              srcWidth, srcHeight, srcFormat,
-                                              GL_UNSIGNED_BYTE, 0, 0, 0);
-
-   (void) ctx;
-
-   /* Translate from src->baseInternal->GL_RGBA->dst.  This will
-    * correctly deal with RGBA->RGB->RGBA conversions where the final
-    * A value must be 0xff regardless of the incoming alpha values.
-    */
-   compute_component_mapping(srcFormat, baseInternalFormat, src2base);
-   compute_component_mapping(baseInternalFormat, GL_RGBA, base2rgba);
-   swap = byteswap_mapping(srcPacking->SwapBytes, srcType);
-   srctype2ubyte = type_mapping(srcType);
-
-
-   for (i = 0; i < 4; i++)
-      map[i] = srctype2ubyte[swap[src2base[base2rgba[rgba2dst[i]]]]];
-
-/*    printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
-
-   if (srcComponents == dstComponents &&
-       srcRowStride == dstRowStride &&
-       srcRowStride == srcWidth * srcComponents &&
-       dimensions < 3) {
-      /* 1 and 2D images only */
-      GLubyte *dstImage = (GLubyte *) dstAddr
-         + dstYoffset * dstRowStride
-         + dstXoffset * dstComponents;
-      swizzle_copy(dstImage, dstComponents, srcImage, srcComponents, map, 
-		   srcWidth * srcHeight);
-   }
-   else {
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         const GLubyte *srcRow = srcImage;
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * dstComponents
-            + dstYoffset * dstRowStride
-            + dstXoffset * dstComponents;
-         for (row = 0; row < srcHeight; row++) {
-	    swizzle_copy(dstRow, dstComponents, srcRow, srcComponents, map, srcWidth);
-            dstRow += dstRowStride;
-            srcRow += srcRowStride;
-         }
-         srcImage += srcImageStride;
-      }
-   }
-}
-
-
-/**
- * Teximage storage routine for when a simple memcpy will do.
- * No pixel transfer operations or special texel encodings allowed.
- * 1D, 2D and 3D images supported.
- */
-static void
-memcpy_texture(GLcontext *ctx,
-	       GLuint dimensions,
-               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)
-{
-   const GLint srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth,
-                                                     srcFormat, srcType);
-   const GLint srcImageStride = _mesa_image_image_stride(srcPacking,
-                                      srcWidth, srcHeight, srcFormat, srcType);
-   const GLubyte *srcImage = (const GLubyte *) _mesa_image_address(dimensions,
-        srcPacking, srcAddr, srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLint bytesPerRow = srcWidth * texelBytes;
-
-#if 0
-   /* XXX update/re-enable for dstImageOffsets array */
-   const GLint bytesPerImage = srcHeight * bytesPerRow;
-   const GLint bytesPerTexture = srcDepth * bytesPerImage;
-   GLubyte *dstImage = (GLubyte *) dstAddr
-                     + dstZoffset * dstImageStride
-                     + dstYoffset * dstRowStride
-                     + dstXoffset * texelBytes;
-
-   if (dstRowStride == srcRowStride &&
-       dstRowStride == bytesPerRow &&
-       ((dstImageStride == srcImageStride &&
-         dstImageStride == bytesPerImage) ||
-        (srcDepth == 1))) {
-      /* one big memcpy */
-      ctx->Driver.TextureMemCpy(dstImage, srcImage, bytesPerTexture);
-   }
-   else
-   {
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         const GLubyte *srcRow = srcImage;
-         GLubyte *dstRow = dstImage;
-         for (row = 0; row < srcHeight; row++) {
-            ctx->Driver.TextureMemCpy(dstRow, srcRow, bytesPerRow);
-            dstRow += dstRowStride;
-            srcRow += srcRowStride;
-         }
-         srcImage += srcImageStride;
-         dstImage += dstImageStride;
-      }
-   }
-#endif
-
-   GLint img, row;
-   for (img = 0; img < srcDepth; img++) {
-      const GLubyte *srcRow = srcImage;
-      GLubyte *dstRow = (GLubyte *) dstAddr
-         + dstImageOffsets[dstZoffset + img] * texelBytes
-         + dstYoffset * dstRowStride
-         + dstXoffset * texelBytes;
-      for (row = 0; row < srcHeight; row++) {
-         ctx->Driver.TextureMemCpy(dstRow, srcRow, bytesPerRow);
-         dstRow += dstRowStride;
-         srcRow += srcRowStride;
-      }
-      srcImage += srcImageStride;
-   }
-}
-
-
-
-/**
- * Store a 32-bit integer depth component texture image.
- */
-static GLboolean
-_mesa_texstore_z32(TEXSTORE_PARAMS)
-{
-   const GLuint depthScale = 0xffffffff;
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   (void) dims;
-   ASSERT(dstFormat == MESA_FORMAT_Z32);
-   ASSERT(texelBytes == sizeof(GLuint));
-
-   if (ctx->Pixel.DepthScale == 1.0f &&
-       ctx->Pixel.DepthBias == 0.0f &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_DEPTH_COMPONENT &&
-       srcFormat == GL_DEPTH_COMPONENT &&
-       srcType == GL_UNSIGNED_INT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, (GLuint *) dstRow,
-                                    depthScale, srcType, src, srcPacking);
-            dstRow += dstRowStride;
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a 24-bit integer depth component texture image.
- */
-static GLboolean
-_mesa_texstore_x8_z24(TEXSTORE_PARAMS)
-{
-   const GLuint depthScale = 0xffffff;
-   const GLuint texelBytes = 4;
-
-   (void) dims;
-   ASSERT(dstFormat == MESA_FORMAT_X8_Z24);
-
-   {
-      /* general path */
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, (GLuint *) dstRow,
-                                    depthScale, srcType, src, srcPacking);
-            dstRow += dstRowStride;
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a 24-bit integer depth component texture image.
- */
-static GLboolean
-_mesa_texstore_z24_x8(TEXSTORE_PARAMS)
-{
-   const GLuint depthScale = 0xffffff;
-   const GLuint texelBytes = 4;
-
-   (void) dims;
-   ASSERT(dstFormat == MESA_FORMAT_Z24_X8);
-
-   {
-      /* general path */
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
-            GLuint *dst = (GLuint *) dstRow;
-            GLint i;
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, dst,
-                                    depthScale, srcType, src, srcPacking);
-            for (i = 0; i < srcWidth; i++)
-               dst[i] <<= 8;
-            dstRow += dstRowStride;
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a 16-bit integer depth component texture image.
- */
-static GLboolean
-_mesa_texstore_z16(TEXSTORE_PARAMS)
-{
-   const GLuint depthScale = 0xffff;
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   (void) dims;
-   ASSERT(dstFormat == MESA_FORMAT_Z16);
-   ASSERT(texelBytes == sizeof(GLushort));
-
-   if (ctx->Pixel.DepthScale == 1.0f &&
-       ctx->Pixel.DepthBias == 0.0f &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_DEPTH_COMPONENT &&
-       srcFormat == GL_DEPTH_COMPONENT &&
-       srcType == GL_UNSIGNED_SHORT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
-            GLushort *dst16 = (GLushort *) dstRow;
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_SHORT, dst16, depthScale,
-                                    srcType, src, srcPacking);
-            dstRow += dstRowStride;
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store an rgb565 or rgb565_rev texture image.
- */
-static GLboolean
-_mesa_texstore_rgb565(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGB565 ||
-          dstFormat == MESA_FORMAT_RGB565_REV);
-   ASSERT(texelBytes == 2);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_RGB565 &&
-       baseInternalFormat == GL_RGB &&
-       srcFormat == GL_RGB &&
-       srcType == GL_UNSIGNED_SHORT_5_6_5) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-            !srcPacking->SwapBytes &&
-            baseInternalFormat == GL_RGB &&
-            srcFormat == GL_RGB &&
-            srcType == GL_UNSIGNED_BYTE &&
-            dims == 2) {
-      /* do optimized tex store */
-      const GLint srcRowStride =
-         _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-      const GLubyte *src = (const GLubyte *)
-         _mesa_image_address(dims, srcPacking, srcAddr, srcWidth, srcHeight,
-                             srcFormat, srcType, 0, 0, 0);
-      GLubyte *dst = (GLubyte *) dstAddr
-                   + dstYoffset * dstRowStride
-                   + dstXoffset * texelBytes;
-      GLint row, col;
-      for (row = 0; row < srcHeight; row++) {
-         const GLubyte *srcUB = (const GLubyte *) src;
-         GLushort *dstUS = (GLushort *) dst;
-         /* check for byteswapped format */
-         if (dstFormat == MESA_FORMAT_RGB565) {
-            for (col = 0; col < srcWidth; col++) {
-               dstUS[col] = PACK_COLOR_565( srcUB[0], srcUB[1], srcUB[2] );
-               srcUB += 3;
-            }
-         }
-         else {
-            for (col = 0; col < srcWidth; col++) {
-               dstUS[col] = PACK_COLOR_565_REV( srcUB[0], srcUB[1], srcUB[2] );
-               srcUB += 3;
-            }
-         }
-         dst += dstRowStride;
-         src += srcRowStride;
-      }
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-            /* check for byteswapped format */
-            if (dstFormat == MESA_FORMAT_RGB565) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUS[col] = PACK_COLOR_565( CHAN_TO_UBYTE(src[RCOMP]),
-                                               CHAN_TO_UBYTE(src[GCOMP]),
-                                               CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 3;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUS[col] = PACK_COLOR_565_REV( CHAN_TO_UBYTE(src[RCOMP]),
-                                                   CHAN_TO_UBYTE(src[GCOMP]),
-                                                   CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 3;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a texture in MESA_FORMAT_RGBA8888 or MESA_FORMAT_RGBA8888_REV.
- */
-static GLboolean
-_mesa_texstore_rgba8888(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA8888 ||
-          dstFormat == MESA_FORMAT_RGBA8888_REV);
-   ASSERT(texelBytes == 4);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_RGBA8888 &&
-       baseInternalFormat == GL_RGBA &&
-      ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8) ||
-       (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE && !littleEndian) ||
-       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) ||
-       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_BYTE && littleEndian))) {
-       /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_RGBA8888_REV &&
-       baseInternalFormat == GL_RGBA &&
-      ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) ||
-       (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE && littleEndian) ||
-       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8) ||
-       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_BYTE && !littleEndian))) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-	    (srcType == GL_UNSIGNED_BYTE ||
-	     srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-	     srcType == GL_UNSIGNED_INT_8_8_8_8_REV) &&
-	    can_swizzle(baseInternalFormat) &&
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      if ((littleEndian && dstFormat == MESA_FORMAT_RGBA8888) ||
-	  (!littleEndian && dstFormat == MESA_FORMAT_RGBA8888_REV)) {
-	 dstmap[3] = 0;
-	 dstmap[2] = 1;
-	 dstmap[1] = 2;
-	 dstmap[0] = 3;
-      }
-      else {
-	 dstmap[3] = 3;
-	 dstmap[2] = 2;
-	 dstmap[1] = 1;
-	 dstmap[0] = 0;
-      }
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-				baseInternalFormat,
-				dstmap, 4,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *dstUI = (GLuint *) dstRow;
-            if (dstFormat == MESA_FORMAT_RGBA8888) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888( CHAN_TO_UBYTE(src[RCOMP]),
-                                                CHAN_TO_UBYTE(src[GCOMP]),
-                                                CHAN_TO_UBYTE(src[BCOMP]),
-                                                CHAN_TO_UBYTE(src[ACOMP]) );
-                  src += 4;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888_REV( CHAN_TO_UBYTE(src[RCOMP]),
-                                                    CHAN_TO_UBYTE(src[GCOMP]),
-                                                    CHAN_TO_UBYTE(src[BCOMP]),
-                                                    CHAN_TO_UBYTE(src[ACOMP]) );
-                  src += 4;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_argb8888(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = GL_RGBA;
-
-   ASSERT(dstFormat == MESA_FORMAT_ARGB8888 ||
-          dstFormat == MESA_FORMAT_ARGB8888_REV ||
-          dstFormat == MESA_FORMAT_XRGB8888 ||
-          dstFormat == MESA_FORMAT_XRGB8888_REV );
-   ASSERT(texelBytes == 4);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       (dstFormat == MESA_FORMAT_ARGB8888 ||
-        dstFormat == MESA_FORMAT_XRGB8888) &&
-       baseInternalFormat == GL_RGBA &&
-       srcFormat == GL_BGRA &&
-       ((srcType == GL_UNSIGNED_BYTE && littleEndian) ||
-        srcType == GL_UNSIGNED_INT_8_8_8_8_REV)) {
-      /* simple memcpy path (little endian) */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       (dstFormat == MESA_FORMAT_ARGB8888_REV ||
-        dstFormat == MESA_FORMAT_XRGB8888_REV) &&
-       baseInternalFormat == GL_RGBA &&
-       srcFormat == GL_BGRA &&
-       ((srcType == GL_UNSIGNED_BYTE && !littleEndian) ||
-        srcType == GL_UNSIGNED_INT_8_8_8_8)) {
-      /* simple memcpy path (big endian) */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-            !srcPacking->SwapBytes &&
-	    (dstFormat == MESA_FORMAT_ARGB8888 ||
-             dstFormat == MESA_FORMAT_XRGB8888) &&
-            srcFormat == GL_RGB &&
-	    (baseInternalFormat == GL_RGBA ||
-	     baseInternalFormat == GL_RGB) &&
-            srcType == GL_UNSIGNED_BYTE) {
-      int img, row, col;
-      for (img = 0; img < srcDepth; img++) {
-         const GLint srcRowStride =
-            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,
-                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *d4 = (GLuint *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               d4[col] = PACK_COLOR_8888(0xff,
-                                         srcRow[col * 3 + RCOMP],
-                                         srcRow[col * 3 + GCOMP],
-                                         srcRow[col * 3 + BCOMP]);
-            }
-            dstRow += dstRowStride;
-            srcRow += srcRowStride;
-         }
-      }
-   }
-   else if (!ctx->_ImageTransferState &&
-            !srcPacking->SwapBytes &&
-	    dstFormat == MESA_FORMAT_ARGB8888 &&
-            srcFormat == GL_RGBA &&
-	    baseInternalFormat == GL_RGBA &&
-            srcType == GL_UNSIGNED_BYTE) {
-      /* same as above case, but src data has alpha too */
-      GLint img, row, col;
-      /* For some reason, streaming copies to write-combined regions
-       * are extremely sensitive to the characteristics of how the
-       * source data is retrieved.  By reordering the source reads to
-       * be in-order, the speed of this operation increases by half.
-       * Strangely the same isn't required for the RGB path, above.
-       */
-      for (img = 0; img < srcDepth; img++) {
-         const GLint srcRowStride =
-            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,
-                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *d4 = (GLuint *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               d4[col] = PACK_COLOR_8888(srcRow[col * 4 + ACOMP],
-                                         srcRow[col * 4 + RCOMP],
-                                         srcRow[col * 4 + GCOMP],
-                                         srcRow[col * 4 + BCOMP]);
-            }
-            dstRow += dstRowStride;
-            srcRow += srcRowStride;
-         }
-      }
-   }
-   else if (!ctx->_ImageTransferState &&
-	    (srcType == GL_UNSIGNED_BYTE ||
-	     srcType == GL_UNSIGNED_INT_8_8_8_8 ||
-	     srcType == GL_UNSIGNED_INT_8_8_8_8_REV) &&
-	    can_swizzle(baseInternalFormat) &&	   
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      if ((littleEndian && dstFormat == MESA_FORMAT_ARGB8888) ||
-          (littleEndian && dstFormat == MESA_FORMAT_XRGB8888) ||
-	  (!littleEndian && dstFormat == MESA_FORMAT_ARGB8888_REV) ||
-	  (!littleEndian && dstFormat == MESA_FORMAT_XRGB8888_REV)) {
-	 dstmap[3] = 3;		/* alpha */
-	 dstmap[2] = 0;		/* red */
-	 dstmap[1] = 1;		/* green */
-	 dstmap[0] = 2;		/* blue */
-      }
-      else {
-	 assert((littleEndian && dstFormat == MESA_FORMAT_ARGB8888_REV) ||
-		(!littleEndian && dstFormat == MESA_FORMAT_ARGB8888) ||
-		(littleEndian && dstFormat == MESA_FORMAT_XRGB8888_REV) ||
-		(!littleEndian && dstFormat == MESA_FORMAT_XRGB8888));
-	 dstmap[3] = 2;
-	 dstmap[2] = 1;
-	 dstmap[1] = 0;
-	 dstmap[0] = 3;
-      }
- 
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-
-				baseInternalFormat,
-				dstmap, 4,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride,
-                                dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *dstUI = (GLuint *) dstRow;
-            if (dstFormat == MESA_FORMAT_ARGB8888) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888( CHAN_TO_UBYTE(src[ACOMP]),
-                                                CHAN_TO_UBYTE(src[RCOMP]),
-                                                CHAN_TO_UBYTE(src[GCOMP]),
-                                                CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            else if (dstFormat == MESA_FORMAT_XRGB8888) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888( 0xff,
-                                                CHAN_TO_UBYTE(src[RCOMP]),
-                                                CHAN_TO_UBYTE(src[GCOMP]),
-                                                CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888_REV( CHAN_TO_UBYTE(src[ACOMP]),
-                                                    CHAN_TO_UBYTE(src[RCOMP]),
-                                                    CHAN_TO_UBYTE(src[GCOMP]),
-                                                    CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_rgb888(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGB888);
-   ASSERT(texelBytes == 3);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_RGB &&
-       srcFormat == GL_BGR &&
-       srcType == GL_UNSIGNED_BYTE &&
-       littleEndian) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-            !srcPacking->SwapBytes &&
-            srcFormat == GL_RGBA &&
-            srcType == GL_UNSIGNED_BYTE) {
-      /* extract RGB from RGBA */
-      GLint img, row, col;
-      for (img = 0; img < srcDepth; img++) {
-         const GLint srcRowStride =
-            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,
-                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            for (col = 0; col < srcWidth; col++) {
-               dstRow[col * 3 + 0] = srcRow[col * 4 + BCOMP];
-               dstRow[col * 3 + 1] = srcRow[col * 4 + GCOMP];
-               dstRow[col * 3 + 2] = srcRow[col * 4 + RCOMP];
-            }
-            dstRow += dstRowStride;
-            srcRow += srcRowStride;
-         }
-      }
-   }
-   else if (!ctx->_ImageTransferState &&
-	    srcType == GL_UNSIGNED_BYTE &&
-	    can_swizzle(baseInternalFormat) &&
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      dstmap[0] = 2;
-      dstmap[1] = 1;
-      dstmap[2] = 0;
-      dstmap[3] = ONE;		/* ? */
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-				baseInternalFormat,
-				dstmap, 3,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = (const GLchan *) tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-#if 0
-            if (littleEndian) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstRow[col * 3 + 0] = CHAN_TO_UBYTE(src[RCOMP]);
-                  dstRow[col * 3 + 1] = CHAN_TO_UBYTE(src[GCOMP]);
-                  dstRow[col * 3 + 2] = CHAN_TO_UBYTE(src[BCOMP]);
-                  srcUB += 3;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstRow[col * 3 + 0] = srcUB[BCOMP];
-                  dstRow[col * 3 + 1] = srcUB[GCOMP];
-                  dstRow[col * 3 + 2] = srcUB[RCOMP];
-                  srcUB += 3;
-               }
-            }
-#else
-            for (col = 0; col < srcWidth; col++) {
-               dstRow[col * 3 + 0] = CHAN_TO_UBYTE(src[BCOMP]);
-               dstRow[col * 3 + 1] = CHAN_TO_UBYTE(src[GCOMP]);
-               dstRow[col * 3 + 2] = CHAN_TO_UBYTE(src[RCOMP]);
-               src += 3;
-            }
-#endif
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_bgr888(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_BGR888);
-   ASSERT(texelBytes == 3);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_RGB &&
-       srcFormat == GL_RGB &&
-       srcType == GL_UNSIGNED_BYTE &&
-       littleEndian) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-            !srcPacking->SwapBytes &&
-            srcFormat == GL_RGBA &&
-            srcType == GL_UNSIGNED_BYTE) {
-      /* extract BGR from RGBA */
-      int img, row, col;
-      for (img = 0; img < srcDepth; img++) {
-         const GLint srcRowStride =
-            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,
-                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            for (col = 0; col < srcWidth; col++) {
-               dstRow[col * 3 + 0] = srcRow[col * 4 + RCOMP];
-               dstRow[col * 3 + 1] = srcRow[col * 4 + GCOMP];
-               dstRow[col * 3 + 2] = srcRow[col * 4 + BCOMP];
-            }
-            dstRow += dstRowStride;
-            srcRow += srcRowStride;
-         }
-      }
-   }
-   else if (!ctx->_ImageTransferState &&
-	    srcType == GL_UNSIGNED_BYTE &&
-	    can_swizzle(baseInternalFormat) &&
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      dstmap[0] = 0;
-      dstmap[1] = 1;
-      dstmap[2] = 2;
-      dstmap[3] = ONE;		/* ? */
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-				baseInternalFormat,
-				dstmap, 3,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }   
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = (const GLchan *) tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            for (col = 0; col < srcWidth; col++) {
-               dstRow[col * 3 + 0] = CHAN_TO_UBYTE(src[RCOMP]);
-               dstRow[col * 3 + 1] = CHAN_TO_UBYTE(src[GCOMP]);
-               dstRow[col * 3 + 2] = CHAN_TO_UBYTE(src[BCOMP]);
-               src += 3;
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_argb4444(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_ARGB4444 ||
-          dstFormat == MESA_FORMAT_ARGB4444_REV);
-   ASSERT(texelBytes == 2);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_ARGB4444 &&
-       baseInternalFormat == GL_RGBA &&
-       srcFormat == GL_BGRA &&
-       srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-            if (dstFormat == MESA_FORMAT_ARGB4444) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUS[col] = PACK_COLOR_4444( CHAN_TO_UBYTE(src[ACOMP]),
-                                                CHAN_TO_UBYTE(src[RCOMP]),
-                                                CHAN_TO_UBYTE(src[GCOMP]),
-                                                CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUS[col] = PACK_COLOR_4444_REV( CHAN_TO_UBYTE(src[ACOMP]),
-                                                    CHAN_TO_UBYTE(src[RCOMP]),
-                                                    CHAN_TO_UBYTE(src[GCOMP]),
-                                                    CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-static GLboolean
-_mesa_texstore_rgba5551(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA5551);
-   ASSERT(texelBytes == 2);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_RGBA5551 &&
-       baseInternalFormat == GL_RGBA &&
-       srcFormat == GL_RGBA &&
-       srcType == GL_UNSIGNED_SHORT_5_5_5_1) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src =tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-	    for (col = 0; col < srcWidth; col++) {
-	       dstUS[col] = PACK_COLOR_5551( CHAN_TO_UBYTE(src[RCOMP]),
-					     CHAN_TO_UBYTE(src[GCOMP]),
-					     CHAN_TO_UBYTE(src[BCOMP]),
-					     CHAN_TO_UBYTE(src[ACOMP]) );
-	      src += 4;
-	    }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-static GLboolean
-_mesa_texstore_argb1555(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_ARGB1555 ||
-          dstFormat == MESA_FORMAT_ARGB1555_REV);
-   ASSERT(texelBytes == 2);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_ARGB1555 &&
-       baseInternalFormat == GL_RGBA &&
-       srcFormat == GL_BGRA &&
-       srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src =tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-            if (dstFormat == MESA_FORMAT_ARGB1555) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUS[col] = PACK_COLOR_1555( CHAN_TO_UBYTE(src[ACOMP]),
-                                                CHAN_TO_UBYTE(src[RCOMP]),
-                                                CHAN_TO_UBYTE(src[GCOMP]),
-                                                CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUS[col] = PACK_COLOR_1555_REV( CHAN_TO_UBYTE(src[ACOMP]),
-                                                    CHAN_TO_UBYTE(src[RCOMP]),
-                                                    CHAN_TO_UBYTE(src[GCOMP]),
-                                                    CHAN_TO_UBYTE(src[BCOMP]) );
-                  src += 4;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_al88(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_AL88 ||
-          dstFormat == MESA_FORMAT_AL88_REV);
-   ASSERT(texelBytes == 2);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_AL88 &&
-       baseInternalFormat == GL_LUMINANCE_ALPHA &&
-       srcFormat == GL_LUMINANCE_ALPHA &&
-       srcType == GL_UNSIGNED_BYTE &&
-       littleEndian) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-	    littleEndian &&
-	    srcType == GL_UNSIGNED_BYTE &&
-	    can_swizzle(baseInternalFormat) &&
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      if ((littleEndian && dstFormat == MESA_FORMAT_AL88) ||
-	  (!littleEndian && dstFormat == MESA_FORMAT_AL88_REV)) {
-	 dstmap[0] = 0;
-	 dstmap[1] = 3;
-      }
-      else {
-	 dstmap[0] = 3;
-	 dstmap[1] = 0;
-      }
-      dstmap[2] = ZERO;		/* ? */
-      dstmap[3] = ONE;		/* ? */
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-				baseInternalFormat,
-				dstmap, 2,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }   
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-            if (dstFormat == MESA_FORMAT_AL88) {
-               for (col = 0; col < srcWidth; col++) {
-                  /* src[0] is luminance, src[1] is alpha */
-                 dstUS[col] = PACK_COLOR_88( CHAN_TO_UBYTE(src[1]),
-                                             CHAN_TO_UBYTE(src[0]) );
-                 src += 2;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  /* src[0] is luminance, src[1] is alpha */
-                 dstUS[col] = PACK_COLOR_88_REV( CHAN_TO_UBYTE(src[1]),
-                                                 CHAN_TO_UBYTE(src[0]) );
-                 src += 2;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_al1616(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_AL1616 ||
-          dstFormat == MESA_FORMAT_AL1616_REV);
-   ASSERT(texelBytes == 4);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_AL1616 &&
-       baseInternalFormat == GL_LUMINANCE_ALPHA &&
-       srcFormat == GL_LUMINANCE_ALPHA &&
-       srcType == GL_UNSIGNED_SHORT &&
-       littleEndian) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *dstUI = (GLuint *) dstRow;
-            if (dstFormat == MESA_FORMAT_AL1616) {
-               for (col = 0; col < srcWidth; col++) {
-		  GLushort l, a;
-
-		  UNCLAMPED_FLOAT_TO_USHORT(l, src[0]);
-		  UNCLAMPED_FLOAT_TO_USHORT(a, src[1]);
-		  dstUI[col] = PACK_COLOR_1616(a, l);
-		  src += 2;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-		  GLushort l, a;
-
-		  UNCLAMPED_FLOAT_TO_USHORT(l, src[0]);
-		  UNCLAMPED_FLOAT_TO_USHORT(a, src[1]);
-		  dstUI[col] = PACK_COLOR_1616_REV(a, l);
-		  src += 2;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_rgba_16(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_16);
-   ASSERT(texelBytes == 8);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_RGBA &&
-       srcFormat == GL_RGBA &&
-       srcType == GL_UNSIGNED_SHORT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               GLushort r, g, b, a;
-
-               UNCLAMPED_FLOAT_TO_USHORT(r, src[0]);
-               UNCLAMPED_FLOAT_TO_USHORT(g, src[1]);
-               UNCLAMPED_FLOAT_TO_USHORT(b, src[2]);
-               UNCLAMPED_FLOAT_TO_USHORT(a, src[3]);
-               dstUS[col*4+0] = r;
-               dstUS[col*4+1] = g;
-               dstUS[col*4+2] = b;
-               dstUS[col*4+3] = a;
-               src += 4;
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_R_16 ||
-          dstFormat == MESA_FORMAT_SIGNED_RG_16 ||
-          dstFormat == MESA_FORMAT_SIGNED_RGB_16 ||
-          dstFormat == MESA_FORMAT_SIGNED_RGBA_16);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_RGBA &&
-       dstFormat == MESA_FORMAT_SIGNED_RGBA_16 &&
-       srcFormat == GL_RGBA &&
-       srcType == GL_SHORT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      const GLuint comps = _mesa_get_format_bytes(dstFormat) / 2;
-      GLint img, row, col;
-
-      if (!tempImage)
-         return GL_FALSE;
-
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-
-      /* Note: tempImage is always float[4] / RGBA.  We convert to 1, 2,
-       * 3 or 4 components/pixel here.
-       */
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLshort *dstRowS = (GLshort *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               GLuint c;
-               for (c = 0; c < comps; c++) {
-                  GLshort p;
-                  UNCLAMPED_FLOAT_TO_SHORT(p, src[col * 4 + c]);
-                  dstRowS[col * comps + c] = p;
-               }
-            }
-            dstRow += dstRowStride;
-            src += 4 * srcWidth;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-_mesa_texstore_rgb332(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGB332);
-   ASSERT(texelBytes == 1);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == GL_RGB &&
-       srcFormat == GL_RGB && srcType == GL_UNSIGNED_BYTE_3_3_2) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            for (col = 0; col < srcWidth; col++) {
-               dstRow[col] = PACK_COLOR_332( CHAN_TO_UBYTE(src[RCOMP]),
-                                             CHAN_TO_UBYTE(src[GCOMP]),
-                                             CHAN_TO_UBYTE(src[BCOMP]) );
-               src += 3;
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Texstore for _mesa_texformat_a8, _mesa_texformat_l8, _mesa_texformat_i8.
- */
-static GLboolean
-_mesa_texstore_a8(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_A8 ||
-          dstFormat == MESA_FORMAT_L8 ||
-          dstFormat == MESA_FORMAT_I8);
-   ASSERT(texelBytes == 1);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_UNSIGNED_BYTE) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-	    srcType == GL_UNSIGNED_BYTE &&
-	    can_swizzle(baseInternalFormat) &&
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      if (dstFormat == MESA_FORMAT_A8) {
-	 dstmap[0] = 3;
-      }
-      else {
-	 dstmap[0] = 0;
-      }
-      dstmap[1] = ZERO;		/* ? */
-      dstmap[2] = ZERO;		/* ? */
-      dstmap[3] = ONE;		/* ? */
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-				baseInternalFormat,
-				dstmap, 1,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }   
-   else {
-      /* general path */
-      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLchan *src = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            for (col = 0; col < srcWidth; col++) {
-               dstRow[col] = CHAN_TO_UBYTE(src[col]);
-            }
-            dstRow += dstRowStride;
-            src += srcWidth;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-
-static GLboolean
-_mesa_texstore_ci8(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-
-   (void) dims; (void) baseInternalFormat;
-   ASSERT(dstFormat == MESA_FORMAT_CI8);
-   ASSERT(texelBytes == 1);
-   ASSERT(baseInternalFormat == GL_COLOR_INDEX);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       srcFormat == GL_COLOR_INDEX &&
-       srcType == GL_UNSIGNED_BYTE) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);
-            _mesa_unpack_index_span(ctx, srcWidth, GL_UNSIGNED_BYTE, dstRow,
-                                    srcType, src, srcPacking,
-                                    ctx->_ImageTransferState);
-            dstRow += dstRowStride;
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Texstore for _mesa_texformat_ycbcr or _mesa_texformat_ycbcr_REV.
- */
-static GLboolean
-_mesa_texstore_ycbcr(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-
-   (void) ctx; (void) dims; (void) baseInternalFormat;
-
-   ASSERT((dstFormat == MESA_FORMAT_YCBCR) ||
-          (dstFormat == MESA_FORMAT_YCBCR_REV));
-   ASSERT(texelBytes == 2);
-   ASSERT(ctx->Extensions.MESA_ycbcr_texture);
-   ASSERT(srcFormat == GL_YCBCR_MESA);
-   ASSERT((srcType == GL_UNSIGNED_SHORT_8_8_MESA) ||
-          (srcType == GL_UNSIGNED_SHORT_8_8_REV_MESA));
-   ASSERT(baseInternalFormat == GL_YCBCR_MESA);
-
-   /* always just memcpy since no pixel transfer ops apply */
-   memcpy_texture(ctx, dims,
-                  dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                  dstRowStride,
-                  dstImageOffsets,
-                  srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                  srcAddr, srcPacking);
-
-   /* Check if we need byte swapping */
-   /* XXX the logic here _might_ be wrong */
-   if (srcPacking->SwapBytes ^
-       (srcType == GL_UNSIGNED_SHORT_8_8_REV_MESA) ^
-       (dstFormat == MESA_FORMAT_YCBCR_REV) ^
-       !littleEndian) {
-      GLint img, row;
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            _mesa_swap2((GLushort *) dstRow, srcWidth);
-            dstRow += dstRowStride;
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-static GLboolean
-_mesa_texstore_dudv8(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_DUDV8);
-   ASSERT(texelBytes == 2);
-   ASSERT(ctx->Extensions.ATI_envmap_bumpmap);
-   ASSERT((srcFormat == GL_DU8DV8_ATI) ||
-	  (srcFormat == GL_DUDV_ATI));
-   ASSERT(baseInternalFormat == GL_DUDV_ATI);
-
-   if (!srcPacking->SwapBytes && srcType == GL_BYTE &&
-       littleEndian) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (srcType == GL_BYTE) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      if (littleEndian) {
-	 dstmap[0] = 0;
-	 dstmap[1] = 3;
-      }
-      else {
-	 dstmap[0] = 3;
-	 dstmap[1] = 0;
-      }
-      dstmap[2] = ZERO;		/* ? */
-      dstmap[3] = ONE;		/* ? */
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				GL_LUMINANCE_ALPHA, /* hack */
-				GL_UNSIGNED_BYTE, /* hack */
-				GL_LUMINANCE_ALPHA, /* hack */
-				dstmap, 2,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }   
-   else {
-      /* general path - note this is defined for 2d textures only */
-      const GLint components = _mesa_components_in_format(baseInternalFormat);
-      const GLint srcStride = _mesa_image_row_stride(srcPacking, srcWidth,
-                                                     srcFormat, srcType);
-      GLbyte *tempImage, *dst, *src;
-      GLint row;
-
-      tempImage = (GLbyte *) malloc(srcWidth * srcHeight * srcDepth
-                                          * components * sizeof(GLbyte));
-      if (!tempImage)
-         return GL_FALSE;
-
-      src = (GLbyte *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                           srcWidth, srcHeight,
-                                           srcFormat, srcType,
-                                           0, 0, 0);
-
-      dst = tempImage;
-      for (row = 0; row < srcHeight; row++) {
-         _mesa_unpack_dudv_span_byte(ctx, srcWidth, baseInternalFormat,
-                                     dst, srcFormat, srcType, src,
-                                     srcPacking, 0);
-         dst += srcWidth * components;
-         src += srcStride;
-      }
- 
-      src = tempImage;
-      dst = (GLbyte *) dstAddr
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-      for (row = 0; row < srcHeight; row++) {
-         memcpy(dst, src, srcWidth * texelBytes);
-         dst += dstRowStride;
-         src += srcWidth * texelBytes;
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a texture in MESA_FORMAT_SIGNED_R8 format.
- */
-static GLboolean
-_mesa_texstore_signed_r8(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_R8);
-   ASSERT(texelBytes == 1);
-
-   /* XXX look at adding optimized paths */
-   {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *srcRow = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLubyte *dstB = (GLubyte *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               dstB[col] = FLOAT_TO_BYTE_TEX(srcRow[RCOMP]);
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a texture in MESA_FORMAT_SIGNED_RG88 format.
- */
-static GLboolean
-_mesa_texstore_signed_rg88(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG88);
-   ASSERT(texelBytes == 1);
-
-   /* XXX look at adding optimized paths */
-   {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *srcRow = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstUS = (GLushort *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               dstUS[col] = PACK_COLOR_88(FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
-                                          FLOAT_TO_BYTE_TEX(srcRow[GCOMP]));
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a texture in MESA_FORMAT_SIGNED_RGBX8888.
- */
-static GLboolean
-_mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RGBX8888);
-   ASSERT(texelBytes == 4);
-
-   {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *srcRow = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *dstUI = (GLuint *) dstRow;
-            for (col = 0; col < srcWidth; col++) {
-               dstUI[col] = PACK_COLOR_8888( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
-                                             FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),
-                                             FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),
-                                             0xff );
-               srcRow += 4;
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-
-/**
- * Store a texture in MESA_FORMAT_SIGNED_RGBA8888 or MESA_FORMAT_SIGNED_RGBA8888_REV
- */
-static GLboolean
-_mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
-{
-   const GLboolean littleEndian = _mesa_little_endian();
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RGBA8888 ||
-          dstFormat == MESA_FORMAT_SIGNED_RGBA8888_REV);
-   ASSERT(texelBytes == 4);
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_SIGNED_RGBA8888 &&
-       baseInternalFormat == GL_RGBA &&
-      ((srcFormat == GL_RGBA && srcType == GL_BYTE && !littleEndian) ||
-       (srcFormat == GL_ABGR_EXT && srcType == GL_BYTE && littleEndian))) {
-       /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_SIGNED_RGBA8888_REV &&
-       baseInternalFormat == GL_RGBA &&
-      ((srcFormat == GL_RGBA && srcType == GL_BYTE && littleEndian) ||
-       (srcFormat == GL_ABGR_EXT && srcType == GL_BYTE && !littleEndian))) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else if (!ctx->_ImageTransferState &&
-	    (srcType == GL_BYTE) &&
-	    can_swizzle(baseInternalFormat) &&
-	    can_swizzle(srcFormat)) {
-
-      GLubyte dstmap[4];
-
-      /* dstmap - how to swizzle from RGBA to dst format:
-       */
-      if ((littleEndian && dstFormat == MESA_FORMAT_SIGNED_RGBA8888) ||
-	  (!littleEndian && dstFormat == MESA_FORMAT_SIGNED_RGBA8888_REV)) {
-	 dstmap[3] = 0;
-	 dstmap[2] = 1;
-	 dstmap[1] = 2;
-	 dstmap[0] = 3;
-      }
-      else {
-	 dstmap[3] = 3;
-	 dstmap[2] = 2;
-	 dstmap[1] = 1;
-	 dstmap[0] = 0;
-      }
-      
-      _mesa_swizzle_ubyte_image(ctx, dims,
-				srcFormat,
-				srcType,
-				baseInternalFormat,
-				dstmap, 4,
-				dstAddr, dstXoffset, dstYoffset, dstZoffset,
-				dstRowStride, dstImageOffsets,
-				srcWidth, srcHeight, srcDepth, srcAddr,
-				srcPacking);      
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *srcRow = tempImage;
-      GLint img, row, col;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *dstUI = (GLuint *) dstRow;
-            if (dstFormat == MESA_FORMAT_SIGNED_RGBA8888) {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
-                                                FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),
-                                                FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),
-                                                FLOAT_TO_BYTE_TEX(srcRow[ACOMP]) );
-                  srcRow += 4;
-               }
-            }
-            else {
-               for (col = 0; col < srcWidth; col++) {
-                  dstUI[col] = PACK_COLOR_8888_REV( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),
-                                                    FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),
-                                                    FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),
-                                                    FLOAT_TO_BYTE_TEX(srcRow[ACOMP]) );
-                  srcRow += 4;
-               }
-            }
-            dstRow += dstRowStride;
-         }
-      }
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a combined depth/stencil texture image.
- */
-static GLboolean
-_mesa_texstore_z24_s8(TEXSTORE_PARAMS)
-{
-   const GLuint depthScale = 0xffffff;
-   const GLint srcRowStride
-      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-      / sizeof(GLuint);
-   GLint img, row;
-
-   ASSERT(dstFormat == MESA_FORMAT_Z24_S8);
-   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
-   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
-
-   /* In case we only upload depth we need to preserve the stencil */
-   if (srcFormat == GL_DEPTH_COMPONENT) {
-      for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
-            + dstImageOffsets[dstZoffset + img]
-            + dstYoffset * dstRowStride / sizeof(GLuint)
-            + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                  srcWidth, srcHeight,
-                  srcFormat, srcType,
-                  img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            GLuint depth[MAX_WIDTH];
-            GLint i;
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
-                                    depth, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
-
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] = depth[i] << 8 | (dstRow[i] & 0x000000FF);
-
-            src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
-         }
-      }
-   }
-   else if (ctx->Pixel.DepthScale == 1.0f &&
-       ctx->Pixel.DepthBias == 0.0f &&
-       !srcPacking->SwapBytes) {
-      /* simple path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLint srcRowStride
-         = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-         / sizeof(GLuint);
-      GLint img, row;
-
-      for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
-            + dstImageOffsets[dstZoffset + img]
-            + dstYoffset * dstRowStride / sizeof(GLuint)
-            + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                                   srcWidth, srcHeight,
-                                                   srcFormat, srcType,
-                                                   img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            GLubyte stencil[MAX_WIDTH];
-            GLint i;
-            /* the 24 depth bits will be in the high position: */
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT_24_8_EXT, /* dst type */
-                                    dstRow, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
-            /* get the 8-bit stencil values */
-            _mesa_unpack_stencil_span(ctx, srcWidth,
-                                      GL_UNSIGNED_BYTE, /* dst type */
-                                      stencil, /* dst addr */
-                                      srcType, src, srcPacking,
-                                      ctx->_ImageTransferState);
-            /* merge stencil values into depth values */
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] |= stencil[i];
-
-            src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Store a combined depth/stencil texture image.
- */
-static GLboolean
-_mesa_texstore_s8_z24(TEXSTORE_PARAMS)
-{
-   const GLuint depthScale = 0xffffff;
-   const GLint srcRowStride
-      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-      / sizeof(GLuint);
-   GLint img, row;
-
-   ASSERT(dstFormat == MESA_FORMAT_S8_Z24);
-   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
-   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
-
-   /* In case we only upload depth we need to preserve the stencil */
-   if (srcFormat == GL_DEPTH_COMPONENT) {
-      for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
-            + dstImageOffsets[dstZoffset + img]
-            + dstYoffset * dstRowStride / sizeof(GLuint)
-            + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                  srcWidth, srcHeight,
-                  srcFormat, srcType,
-                  img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            GLuint depth[MAX_WIDTH];
-            GLint i;
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
-                                    depth, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
-
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] = depth[i] | (dstRow[i] & 0xFF000000);
-
-            src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
-         }
-      }
-   }
-   else {
-      for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
-            + dstImageOffsets[dstZoffset + img]
-            + dstYoffset * dstRowStride / sizeof(GLuint)
-            + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                  srcWidth, srcHeight,
-                  srcFormat, srcType,
-                  img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            GLubyte stencil[MAX_WIDTH];
-            GLint i;
-            /* the 24 depth bits will be in the low position: */
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
-                                    dstRow, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
-            /* get the 8-bit stencil values */
-            _mesa_unpack_stencil_span(ctx, srcWidth,
-                                      GL_UNSIGNED_BYTE, /* dst type */
-                                      stencil, /* dst addr */
-                                      srcType, src, srcPacking,
-                                      ctx->_ImageTransferState);
-            /* merge stencil values into depth values */
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] |= stencil[i] << 24;
-
-            src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
-         }
-      }
-   }
-   return GL_TRUE;
-}
-
-/**
- * Store an image in any of the formats:
- *   _mesa_texformat_rgba_float32
- *   _mesa_texformat_rgb_float32
- *   _mesa_texformat_alpha_float32
- *   _mesa_texformat_luminance_float32
- *   _mesa_texformat_luminance_alpha_float32
- *   _mesa_texformat_intensity_float32
- */
-static GLboolean
-_mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT32 ||
-          dstFormat == MESA_FORMAT_RGB_FLOAT32 ||
-          dstFormat == MESA_FORMAT_ALPHA_FLOAT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_FLOAT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 ||
-          dstFormat == MESA_FORMAT_INTENSITY_FLOAT32);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLfloat));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_FLOAT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *srcRow = tempImage;
-      GLint bytesPerRow;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      bytesPerRow = srcWidth * components * sizeof(GLfloat);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            memcpy(dstRow, srcRow, bytesPerRow);
-            dstRow += dstRowStride;
-            srcRow += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * As above, but store 16-bit floats.
- */
-static GLboolean
-_mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT16 ||
-          dstFormat == MESA_FORMAT_RGB_FLOAT16 ||
-          dstFormat == MESA_FORMAT_ALPHA_FLOAT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_FLOAT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 ||
-          dstFormat == MESA_FORMAT_INTENSITY_FLOAT16);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLhalfARB));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_HALF_FLOAT_ARB) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLhalfARB *dstTexel = (GLhalfARB *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = _mesa_float_to_half(src[i]);
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/* non-normalized, signed int8 */
-static GLboolean
-_mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT8);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLbyte));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_BYTE) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLbyte *dstTexel = (GLbyte *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = (GLbyte) src[i];
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/* non-normalized, signed int16 */
-static GLboolean
-_mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT16);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLshort));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_INT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLshort *dstTexel = (GLshort *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = (GLint) src[i];
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/* non-normalized, signed int32 */
-static GLboolean
-_mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT32);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLint));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_INT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLint *dstTexel = (GLint *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = (GLint) src[i];
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/* non-normalized, unsigned int8 */
-static GLboolean
-_mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT8);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLubyte));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_UNSIGNED_BYTE) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLubyte *dstTexel = (GLubyte *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = (GLubyte) src[i];
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/* non-normalized, unsigned int16 */
-static GLboolean
-_mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT16);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLushort));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_UNSIGNED_SHORT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLushort *dstTexel = (GLushort *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = (GLushort) src[i];
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-/* non-normalized, unsigned int32 */
-static GLboolean
-_mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
-{
-   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
-   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
-   const GLint components = _mesa_components_in_format(baseFormat);
-
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT32);
-   ASSERT(baseInternalFormat == GL_RGBA ||
-          baseInternalFormat == GL_RGB ||
-          baseInternalFormat == GL_ALPHA ||
-          baseInternalFormat == GL_LUMINANCE ||
-          baseInternalFormat == GL_LUMINANCE_ALPHA ||
-          baseInternalFormat == GL_INTENSITY);
-   ASSERT(texelBytes == components * sizeof(GLuint));
-
-   if (!ctx->_ImageTransferState &&
-       !srcPacking->SwapBytes &&
-       baseInternalFormat == srcFormat &&
-       srcType == GL_UNSIGNED_INT) {
-      /* simple memcpy path */
-      memcpy_texture(ctx, dims,
-                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                     dstRowStride,
-                     dstImageOffsets,
-                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
-                     srcAddr, srcPacking);
-   }
-   else {
-      /* general path */
-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
-                                                 baseInternalFormat,
-                                                 baseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType, srcAddr,
-                                                 srcPacking);
-      const GLfloat *src = tempImage;
-      GLint img, row;
-      if (!tempImage)
-         return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      for (img = 0; img < srcDepth; img++) {
-         GLubyte *dstRow = (GLubyte *) dstAddr
-            + dstImageOffsets[dstZoffset + img] * texelBytes
-            + dstYoffset * dstRowStride
-            + dstXoffset * texelBytes;
-         for (row = 0; row < srcHeight; row++) {
-            GLuint *dstTexel = (GLuint *) dstRow;
-            GLint i;
-            for (i = 0; i < srcWidth * components; i++) {
-               dstTexel[i] = (GLuint) src[i];
-            }
-            dstRow += dstRowStride;
-            src += srcWidth * components;
-         }
-      }
-
-      free((void *) tempImage);
-   }
-   return GL_TRUE;
-}
-
-
-
-
-#if FEATURE_EXT_texture_sRGB
-static GLboolean
-_mesa_texstore_srgb8(TEXSTORE_PARAMS)
-{
-   gl_format newDstFormat;
-   GLboolean k;
-
-   ASSERT(dstFormat == MESA_FORMAT_SRGB8);
-
-   /* reuse normal rgb texstore code */
-   newDstFormat = MESA_FORMAT_RGB888;
-
-   k = _mesa_texstore_rgb888(ctx, dims, baseInternalFormat,
-             newDstFormat, dstAddr,
-             dstXoffset, dstYoffset, dstZoffset,
-             dstRowStride, dstImageOffsets,
-             srcWidth, srcHeight, srcDepth,
-             srcFormat, srcType,
-             srcAddr, srcPacking);
-   return k;
-}
-
-
-static GLboolean
-_mesa_texstore_srgba8(TEXSTORE_PARAMS)
-{
-   gl_format newDstFormat;
-   GLboolean k;
-
-   ASSERT(dstFormat == MESA_FORMAT_SRGBA8);
-
-   /* reuse normal rgba texstore code */
-   newDstFormat = MESA_FORMAT_RGBA8888;
-   k = _mesa_texstore_rgba8888(ctx, dims, baseInternalFormat,
-                               newDstFormat, dstAddr,
-                               dstXoffset, dstYoffset, dstZoffset,
-                               dstRowStride, dstImageOffsets,
-                               srcWidth, srcHeight, srcDepth,
-                               srcFormat, srcType,
-                               srcAddr, srcPacking);
-   return k;
-}
-
-
-static GLboolean
-_mesa_texstore_sargb8(TEXSTORE_PARAMS)
-{
-   gl_format newDstFormat;
-   GLboolean k;
-
-   ASSERT(dstFormat == MESA_FORMAT_SARGB8);
-
-   /* reuse normal rgba texstore code */
-   newDstFormat = MESA_FORMAT_ARGB8888;
-
-   k = _mesa_texstore_argb8888(ctx, dims, baseInternalFormat,
-                               newDstFormat, dstAddr,
-                               dstXoffset, dstYoffset, dstZoffset,
-                               dstRowStride, dstImageOffsets,
-                               srcWidth, srcHeight, srcDepth,
-                               srcFormat, srcType,
-                               srcAddr, srcPacking);
-   return k;
-}
-
-
-static GLboolean
-_mesa_texstore_sl8(TEXSTORE_PARAMS)
-{
-   gl_format newDstFormat;
-   GLboolean k;
-
-   ASSERT(dstFormat == MESA_FORMAT_SL8);
-
-   newDstFormat = MESA_FORMAT_L8;
-
-   /* _mesa_textore_a8 handles luminance8 too */
-   k = _mesa_texstore_a8(ctx, dims, baseInternalFormat,
-                         newDstFormat, dstAddr,
-                         dstXoffset, dstYoffset, dstZoffset,
-                         dstRowStride, dstImageOffsets,
-                         srcWidth, srcHeight, srcDepth,
-                         srcFormat, srcType,
-                         srcAddr, srcPacking);
-   return k;
-}
-
-
-static GLboolean
-_mesa_texstore_sla8(TEXSTORE_PARAMS)
-{
-   gl_format newDstFormat;
-   GLboolean k;
-
-   ASSERT(dstFormat == MESA_FORMAT_SLA8);
-
-   /* reuse normal luminance/alpha texstore code */
-   newDstFormat = MESA_FORMAT_AL88;
-
-   k = _mesa_texstore_al88(ctx, dims, baseInternalFormat,
-                           newDstFormat, dstAddr,
-                           dstXoffset, dstYoffset, dstZoffset,
-                           dstRowStride, dstImageOffsets,
-                           srcWidth, srcHeight, srcDepth,
-                           srcFormat, srcType,
-                           srcAddr, srcPacking);
-   return k;
-}
-
-#else
-
-/* these are used only in texstore_funcs[] below */
-#define _mesa_texstore_srgb8 NULL
-#define _mesa_texstore_srgba8 NULL
-#define _mesa_texstore_sargb8 NULL
-#define _mesa_texstore_sl8 NULL
-#define _mesa_texstore_sla8 NULL
-
-#endif /* FEATURE_EXT_texture_sRGB */
-
-
-
-
-/**
- * Table mapping MESA_FORMAT_8 to _mesa_texstore_*()
- * XXX this is somewhat temporary.
- */
-static const struct {
-   gl_format Name;
-   StoreTexImageFunc Store;
-}
-texstore_funcs[MESA_FORMAT_COUNT] =
-{
-   { MESA_FORMAT_NONE, NULL },
-   { MESA_FORMAT_RGBA8888, _mesa_texstore_rgba8888 },
-   { MESA_FORMAT_RGBA8888_REV, _mesa_texstore_rgba8888 },
-   { MESA_FORMAT_ARGB8888, _mesa_texstore_argb8888 },
-   { MESA_FORMAT_ARGB8888_REV, _mesa_texstore_argb8888 },
-   { MESA_FORMAT_XRGB8888, _mesa_texstore_argb8888 },
-   { MESA_FORMAT_XRGB8888_REV, _mesa_texstore_argb8888 },
-   { MESA_FORMAT_RGB888, _mesa_texstore_rgb888 },
-   { MESA_FORMAT_BGR888, _mesa_texstore_bgr888 },
-   { MESA_FORMAT_RGB565, _mesa_texstore_rgb565 },
-   { MESA_FORMAT_RGB565_REV, _mesa_texstore_rgb565 },
-   { MESA_FORMAT_ARGB4444, _mesa_texstore_argb4444 },
-   { MESA_FORMAT_ARGB4444_REV, _mesa_texstore_argb4444 },
-   { MESA_FORMAT_RGBA5551, _mesa_texstore_rgba5551 },
-   { MESA_FORMAT_ARGB1555, _mesa_texstore_argb1555 },
-   { MESA_FORMAT_ARGB1555_REV, _mesa_texstore_argb1555 },
-   { MESA_FORMAT_AL88, _mesa_texstore_al88 },
-   { MESA_FORMAT_AL88_REV, _mesa_texstore_al88 },
-   { MESA_FORMAT_AL1616, _mesa_texstore_al1616 },
-   { MESA_FORMAT_AL1616_REV, _mesa_texstore_al1616 },
-   { MESA_FORMAT_RGB332, _mesa_texstore_rgb332 },
-   { MESA_FORMAT_A8, _mesa_texstore_a8 },
-   { MESA_FORMAT_L8, _mesa_texstore_a8 },
-   { MESA_FORMAT_I8, _mesa_texstore_a8 },
-   { MESA_FORMAT_CI8, _mesa_texstore_ci8 },
-   { MESA_FORMAT_YCBCR, _mesa_texstore_ycbcr },
-   { MESA_FORMAT_YCBCR_REV, _mesa_texstore_ycbcr },
-   { MESA_FORMAT_Z24_S8, _mesa_texstore_z24_s8 },
-   { MESA_FORMAT_S8_Z24, _mesa_texstore_s8_z24 },
-   { MESA_FORMAT_Z16, _mesa_texstore_z16 },
-   { MESA_FORMAT_X8_Z24, _mesa_texstore_x8_z24 },
-   { MESA_FORMAT_Z24_X8, _mesa_texstore_z24_x8 },
-   { MESA_FORMAT_Z32, _mesa_texstore_z32 },
-   { MESA_FORMAT_S8, NULL/*_mesa_texstore_s8*/ },
-   { MESA_FORMAT_SRGB8, _mesa_texstore_srgb8 },
-   { MESA_FORMAT_SRGBA8, _mesa_texstore_srgba8 },
-   { MESA_FORMAT_SARGB8, _mesa_texstore_sargb8 },
-   { MESA_FORMAT_SL8, _mesa_texstore_sl8 },
-   { MESA_FORMAT_SLA8, _mesa_texstore_sla8 },
-   { MESA_FORMAT_SRGB_DXT1, _mesa_texstore_rgb_dxt1 },
-   { MESA_FORMAT_SRGBA_DXT1, _mesa_texstore_rgba_dxt1 },
-   { MESA_FORMAT_SRGBA_DXT3, _mesa_texstore_rgba_dxt3 },
-   { MESA_FORMAT_SRGBA_DXT5, _mesa_texstore_rgba_dxt5 },
-   { MESA_FORMAT_RGB_FXT1, _mesa_texstore_rgb_fxt1 },
-   { MESA_FORMAT_RGBA_FXT1, _mesa_texstore_rgba_fxt1 },
-   { MESA_FORMAT_RGB_DXT1, _mesa_texstore_rgb_dxt1 },
-   { MESA_FORMAT_RGBA_DXT1, _mesa_texstore_rgba_dxt1 },
-   { MESA_FORMAT_RGBA_DXT3, _mesa_texstore_rgba_dxt3 },
-   { MESA_FORMAT_RGBA_DXT5, _mesa_texstore_rgba_dxt5 },
-   { MESA_FORMAT_RGBA_FLOAT32, _mesa_texstore_rgba_float32 },
-   { MESA_FORMAT_RGBA_FLOAT16, _mesa_texstore_rgba_float16 },
-   { MESA_FORMAT_RGB_FLOAT32, _mesa_texstore_rgba_float32 },
-   { MESA_FORMAT_RGB_FLOAT16, _mesa_texstore_rgba_float16 },
-   { MESA_FORMAT_ALPHA_FLOAT32, _mesa_texstore_rgba_float32 },
-   { MESA_FORMAT_ALPHA_FLOAT16, _mesa_texstore_rgba_float16 },
-   { MESA_FORMAT_LUMINANCE_FLOAT32, _mesa_texstore_rgba_float32 },
-   { MESA_FORMAT_LUMINANCE_FLOAT16, _mesa_texstore_rgba_float16 },
-   { MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32, _mesa_texstore_rgba_float32 },
-   { MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, _mesa_texstore_rgba_float16 },
-   { MESA_FORMAT_INTENSITY_FLOAT32, _mesa_texstore_rgba_float32 },
-   { MESA_FORMAT_INTENSITY_FLOAT16, _mesa_texstore_rgba_float16 },
-
-   { MESA_FORMAT_RGBA_INT8, _mesa_texstore_rgba_int8 },
-   { MESA_FORMAT_RGBA_INT16, _mesa_texstore_rgba_int16 },
-   { MESA_FORMAT_RGBA_INT32, _mesa_texstore_rgba_int32 },
-   { MESA_FORMAT_RGBA_UINT8, _mesa_texstore_rgba_uint8 },
-   { MESA_FORMAT_RGBA_UINT16, _mesa_texstore_rgba_uint16 },
-   { MESA_FORMAT_RGBA_UINT32, _mesa_texstore_rgba_uint32 },
-
-   { MESA_FORMAT_DUDV8, _mesa_texstore_dudv8 },
-
-   { MESA_FORMAT_SIGNED_R8, _mesa_texstore_signed_r8 },
-   { MESA_FORMAT_SIGNED_RG88, _mesa_texstore_signed_rg88 },
-   { MESA_FORMAT_SIGNED_RGBX8888, _mesa_texstore_signed_rgbx8888 },
-
-   { MESA_FORMAT_SIGNED_RGBA8888, _mesa_texstore_signed_rgba8888 },
-   { MESA_FORMAT_SIGNED_RGBA8888_REV, _mesa_texstore_signed_rgba8888 },
-
-   { MESA_FORMAT_SIGNED_R_16, _mesa_texstore_signed_rgba_16 },
-   { MESA_FORMAT_SIGNED_RG_16, _mesa_texstore_signed_rgba_16 },
-   { MESA_FORMAT_SIGNED_RGB_16, _mesa_texstore_signed_rgba_16 },
-   { MESA_FORMAT_SIGNED_RGBA_16, _mesa_texstore_signed_rgba_16 },
-   { MESA_FORMAT_RGBA_16, _mesa_texstore_rgba_16 }
-};
-
-
-static GLboolean
-_mesa_texstore_null(TEXSTORE_PARAMS)
-{
-   (void) ctx; (void) dims;
-   (void) baseInternalFormat;
-   (void) dstFormat;
-   (void) dstAddr;
-   (void) dstXoffset; (void) dstYoffset; (void) dstZoffset;
-   (void) dstRowStride; (void) dstImageOffsets;
-   (void) srcWidth; (void) srcHeight; (void) srcDepth;
-   (void) srcFormat; (void) srcType;
-   (void) srcAddr;
-   (void) srcPacking;
-
-   /* should never happen */
-   _mesa_problem(NULL, "_mesa_texstore_null() is called");
-   return GL_FALSE;
-}
-
-
-/**
- * Return the StoreTexImageFunc pointer to store an image in the given format.
- */
-static StoreTexImageFunc
-_mesa_get_texstore_func(gl_format format)
-{
-#ifdef DEBUG
-   GLuint i;
-   for (i = 0; i < MESA_FORMAT_COUNT; i++) {
-      ASSERT(texstore_funcs[i].Name == i);
-   }
-#endif
-   ASSERT(texstore_funcs[format].Name == format);
-
-   if (texstore_funcs[format].Store)
-      return texstore_funcs[format].Store;
-   else
-      return _mesa_texstore_null;
-}
-
-
-/**
- * Store user data into texture memory.
- * Called via glTex[Sub]Image1/2/3D()
- */
-GLboolean
-_mesa_texstore(TEXSTORE_PARAMS)
-{
-   StoreTexImageFunc storeImage;
-   GLboolean success;
-
-   storeImage = _mesa_get_texstore_func(dstFormat);
-
-   success = storeImage(ctx, dims, baseInternalFormat,
-                        dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
-                        dstRowStride, dstImageOffsets,
-                        srcWidth, srcHeight, srcDepth,
-                        srcFormat, srcType, srcAddr, srcPacking);
-   return success;
-}
-
-
-/**
- * Check if an unpack PBO is active prior to fetching a texture image.
- * If so, do bounds checking and map the buffer into main memory.
- * Any errors detected will be recorded.
- * The caller _must_ call _mesa_unmap_teximage_pbo() too!
- */
-const GLvoid *
-_mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
-			    GLsizei width, GLsizei height, GLsizei depth,
-			    GLenum format, GLenum type, const GLvoid *pixels,
-			    const struct gl_pixelstore_attrib *unpack,
-			    const char *funcName)
-{
-   GLubyte *buf;
-
-   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* no PBO */
-      return pixels;
-   }
-   if (!_mesa_validate_pbo_access(dimensions, unpack, width, height, depth,
-                                  format, type, pixels)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(invalid PBO access");
-      return NULL;
-   }
-
-   buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                          GL_READ_ONLY_ARB, unpack->BufferObj);
-   if (!buf) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(PBO is mapped");
-      return NULL;
-   }
-
-   return ADD_POINTERS(buf, pixels);
-}
-
-
-/**
- * Check if an unpack PBO is active prior to fetching a compressed texture
- * image.
- * If so, do bounds checking and map the buffer into main memory.
- * Any errors detected will be recorded.
- * The caller _must_ call _mesa_unmap_teximage_pbo() too!
- */
-const GLvoid *
-_mesa_validate_pbo_compressed_teximage(GLcontext *ctx,
-                                 GLsizei imageSize, const GLvoid *pixels,
-                                 const struct gl_pixelstore_attrib *packing,
-                                 const char *funcName)
-{
-   GLubyte *buf;
-
-   if (!_mesa_is_bufferobj(packing->BufferObj)) {
-      /* not using a PBO - return pointer unchanged */
-      return pixels;
-   }
-   if ((const GLubyte *) pixels + imageSize >
-       ((const GLubyte *) 0) + packing->BufferObj->Size) {
-      /* out of bounds read! */
-      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(invalid PBO access");
-      return NULL;
-   }
-
-   buf = (GLubyte*) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                         GL_READ_ONLY_ARB, packing->BufferObj);
-   if (!buf) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(PBO is mapped");
-      return NULL;
-   }
-
-   return ADD_POINTERS(buf, pixels);
-}
-
-
-/**
- * This function must be called after either of the validate_pbo_*_teximage()
- * functions.  It unmaps the PBO buffer if it was mapped earlier.
- */
-void
-_mesa_unmap_teximage_pbo(GLcontext *ctx,
-                         const struct gl_pixelstore_attrib *unpack)
-{
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
-}
-
-
-/** Return texture size in bytes */
-static GLuint
-texture_size(const struct gl_texture_image *texImage)
-{
-   GLuint sz = _mesa_format_image_size(texImage->TexFormat, texImage->Width,
-                                       texImage->Height, texImage->Depth);
-   return sz;
-}
-
-
-/** Return row stride in bytes */
-static GLuint
-texture_row_stride(const struct gl_texture_image *texImage)
-{
-   GLuint stride = _mesa_format_row_stride(texImage->TexFormat,
-                                           texImage->Width);
-   return stride;
-}
-
-
-
-/**
- * This is the software fallback for Driver.TexImage1D()
- * and Driver.CopyTexImage1D().
- * \sa _mesa_store_teximage2d()
- * Note that the width may not be the actual texture width since it may
- * be changed by convolution w/ GL_REDUCE.  The texImage->Width field will
- * have the actual texture size.
- */
-void
-_mesa_store_teximage1d(GLcontext *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)
-{
-   GLuint sizeInBytes;
-   (void) border;
-
-   /* allocate memory */
-   sizeInBytes = texture_size(texImage);
-   texImage->Data = _mesa_alloc_texmemory(sizeInBytes);
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");
-      return;
-   }
-
-   pixels = _mesa_validate_pbo_teximage(ctx, 1, width, 1, 1, format, type,
-                                        pixels, packing, "glTexImage1D");
-   if (!pixels) {
-      /* Note: we check for a NULL image pointer here, _after_ we allocated
-       * memory for the texture.  That's what the GL spec calls for.
-       */
-      return;
-   }
-   else {
-      const GLint dstRowStride = 0;
-      GLboolean success = _mesa_texstore(ctx, 1, texImage->_BaseFormat,
-                                         texImage->TexFormat,
-                                         texImage->Data,
-                                         0, 0, 0,  /* dstX/Y/Zoffset */
-                                         dstRowStride,
-                                         texImage->ImageOffsets,
-                                         width, 1, 1,
-                                         format, type, pixels, packing);
-      if (!success) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");
-      }
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, packing);
-}
-
-
-/**
- * This is the software fallback for Driver.TexImage2D()
- * and Driver.CopyTexImage2D().
- *
- * This function is oriented toward storing images in main memory, rather
- * than VRAM.  Device driver's can easily plug in their own replacement.
- *
- * Note: width and height may be pre-convolved dimensions, but
- * texImage->Width and texImage->Height will be post-convolved dimensions.
- */
-void
-_mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
-                       GLint internalFormat,
-                       GLint width, GLint height, GLint border,
-                       GLenum format, GLenum type, const void *pixels,
-                       const struct gl_pixelstore_attrib *packing,
-                       struct gl_texture_object *texObj,
-                       struct gl_texture_image *texImage)
-{
-   GLuint sizeInBytes;
-   (void) border;
-
-   /* allocate memory */
-   sizeInBytes = texture_size(texImage);
-   texImage->Data = _mesa_alloc_texmemory(sizeInBytes);
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
-      return;
-   }
-
-   pixels = _mesa_validate_pbo_teximage(ctx, 2, width, height, 1, format, type,
-                                        pixels, packing, "glTexImage2D");
-   if (!pixels) {
-      /* Note: we check for a NULL image pointer here, _after_ we allocated
-       * memory for the texture.  That's what the GL spec calls for.
-       */
-      return;
-   }
-   else {
-      GLint dstRowStride = texture_row_stride(texImage);
-      GLboolean success = _mesa_texstore(ctx, 2, texImage->_BaseFormat,
-                                         texImage->TexFormat,
-                                         texImage->Data,
-                                         0, 0, 0,  /* dstX/Y/Zoffset */
-                                         dstRowStride,
-                                         texImage->ImageOffsets,
-                                         width, height, 1,
-                                         format, type, pixels, packing);
-      if (!success) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
-      }
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, packing);
-}
-
-
-
-/**
- * This is the software fallback for Driver.TexImage3D()
- * and Driver.CopyTexImage3D().
- * \sa _mesa_store_teximage2d()
- */
-void
-_mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
-                       GLint internalFormat,
-                       GLint width, GLint height, GLint depth, GLint border,
-                       GLenum format, GLenum type, const void *pixels,
-                       const struct gl_pixelstore_attrib *packing,
-                       struct gl_texture_object *texObj,
-                       struct gl_texture_image *texImage)
-{
-   GLuint sizeInBytes;
-   (void) border;
-
-   /* allocate memory */
-   sizeInBytes = texture_size(texImage);
-   texImage->Data = _mesa_alloc_texmemory(sizeInBytes);
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");
-      return;
-   }
-
-   pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, format,
-                                        type, pixels, packing, "glTexImage3D");
-   if (!pixels) {
-      /* Note: we check for a NULL image pointer here, _after_ we allocated
-       * memory for the texture.  That's what the GL spec calls for.
-       */
-      return;
-   }
-   else {
-      GLint dstRowStride = texture_row_stride(texImage);
-      GLboolean success = _mesa_texstore(ctx, 3, texImage->_BaseFormat,
-                                         texImage->TexFormat,
-                                         texImage->Data,
-                                         0, 0, 0,  /* dstX/Y/Zoffset */
-                                         dstRowStride,
-                                         texImage->ImageOffsets,
-                                         width, height, depth,
-                                         format, type, pixels, packing);
-      if (!success) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");
-      }
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, packing);
-}
-
-
-
-
-/*
- * This is the software fallback for Driver.TexSubImage1D()
- * and Driver.CopyTexSubImage1D().
- */
-void
-_mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint width,
-                          GLenum format, GLenum type, const void *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage)
-{
-   /* get pointer to src pixels (may be in a pbo which we'll map here) */
-   pixels = _mesa_validate_pbo_teximage(ctx, 1, width, 1, 1, format, type,
-                                        pixels, packing, "glTexSubImage1D");
-   if (!pixels)
-      return;
-
-   {
-      const GLint dstRowStride = 0;
-      GLboolean success = _mesa_texstore(ctx, 1, texImage->_BaseFormat,
-                                         texImage->TexFormat,
-                                         texImage->Data,
-                                         xoffset, 0, 0,  /* offsets */
-                                         dstRowStride,
-                                         texImage->ImageOffsets,
-                                         width, 1, 1,
-                                         format, type, pixels, packing);
-      if (!success) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage1D");
-      }
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, packing);
-}
-
-
-
-/**
- * This is the software fallback for Driver.TexSubImage2D()
- * and Driver.CopyTexSubImage2D().
- */
-void
-_mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint yoffset,
-                          GLint width, GLint height,
-                          GLenum format, GLenum type, const void *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage)
-{
-   /* get pointer to src pixels (may be in a pbo which we'll map here) */
-   pixels = _mesa_validate_pbo_teximage(ctx, 2, width, height, 1, format, type,
-                                        pixels, packing, "glTexSubImage2D");
-   if (!pixels)
-      return;
-
-   {
-      GLint dstRowStride = texture_row_stride(texImage);
-      GLboolean success = _mesa_texstore(ctx, 2, texImage->_BaseFormat,
-                                         texImage->TexFormat,
-                                         texImage->Data,
-                                         xoffset, yoffset, 0,
-                                         dstRowStride,
-                                         texImage->ImageOffsets,
-                                         width, height, 1,
-                                         format, type, pixels, packing);
-      if (!success) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage2D");
-      }
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, packing);
-}
-
-
-/*
- * This is the software fallback for Driver.TexSubImage3D().
- * and Driver.CopyTexSubImage3D().
- */
-void
-_mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
-                          GLint xoffset, GLint yoffset, GLint zoffset,
-                          GLint width, GLint height, GLint depth,
-                          GLenum format, GLenum type, const void *pixels,
-                          const struct gl_pixelstore_attrib *packing,
-                          struct gl_texture_object *texObj,
-                          struct gl_texture_image *texImage)
-{
-   /* get pointer to src pixels (may be in a pbo which we'll map here) */
-   pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, format,
-                                        type, pixels, packing,
-                                        "glTexSubImage3D");
-   if (!pixels)
-      return;
-
-   {
-      GLint dstRowStride = texture_row_stride(texImage);
-      GLboolean success = _mesa_texstore(ctx, 3, texImage->_BaseFormat,
-                                         texImage->TexFormat,
-                                         texImage->Data,
-                                         xoffset, yoffset, zoffset,
-                                         dstRowStride,
-                                         texImage->ImageOffsets,
-                                         width, height, depth,
-                                         format, type, pixels, packing);
-      if (!success) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage3D");
-      }
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, packing);
-}
-
-
-/*
- * Fallback for Driver.CompressedTexImage1D()
- */
-void
-_mesa_store_compressed_teximage1d(GLcontext *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)
-{
-   /* this space intentionally left blank */
-   (void) ctx;
-   (void) target; (void) level;
-   (void) internalFormat;
-   (void) width; (void) border;
-   (void) imageSize; (void) data;
-   (void) texObj;
-   (void) texImage;
-}
-
-
-
-/**
- * Fallback for Driver.CompressedTexImage2D()
- */
-void
-_mesa_store_compressed_teximage2d(GLcontext *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)
-{
-   (void) width; (void) height; (void) border;
-
-   /* This is pretty simple, basically just do a memcpy without worrying
-    * about the usual image unpacking or image transfer operations.
-    */
-   ASSERT(texObj);
-   ASSERT(texImage);
-   ASSERT(texImage->Width > 0);
-   ASSERT(texImage->Height > 0);
-   ASSERT(texImage->Depth == 1);
-   ASSERT(texImage->Data == NULL); /* was freed in glCompressedTexImage2DARB */
-
-   /* allocate storage */
-   texImage->Data = _mesa_alloc_texmemory(imageSize);
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
-      return;
-   }
-
-   data = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, data,
-                                                 &ctx->Unpack,
-                                                 "glCompressedTexImage2D");
-   if (!data)
-      return;
-
-   /* copy the data */
-   memcpy(texImage->Data, data, imageSize);
-
-   _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
-}
-
-
-
-/*
- * Fallback for Driver.CompressedTexImage3D()
- */
-void
-_mesa_store_compressed_teximage3d(GLcontext *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)
-{
-   /* this space intentionally left blank */
-   (void) ctx;
-   (void) target; (void) level;
-   (void) internalFormat;
-   (void) width; (void) height; (void) depth;
-   (void) border;
-   (void) imageSize; (void) data;
-   (void) texObj;
-   (void) texImage;
-}
-
-
-
-/**
- * Fallback for Driver.CompressedTexSubImage1D()
- */
-void
-_mesa_store_compressed_texsubimage1d(GLcontext *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)
-{
-   /* there are no compressed 1D texture formats yet */
-   (void) ctx;
-   (void) target; (void) level;
-   (void) xoffset; (void) width;
-   (void) format;
-   (void) imageSize; (void) data;
-   (void) texObj;
-   (void) texImage;
-}
-
-
-/**
- * Fallback for Driver.CompressedTexSubImage2D()
- */
-void
-_mesa_store_compressed_texsubimage2d(GLcontext *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)
-{
-   GLint bytesPerRow, destRowStride, srcRowStride;
-   GLint i, rows;
-   GLubyte *dest;
-   const GLubyte *src;
-   const gl_format texFormat = texImage->TexFormat;
-   const GLint destWidth = texImage->Width;
-   GLuint bw, bh;
-
-   _mesa_get_format_block_size(texFormat, &bw, &bh);
-
-   (void) level;
-   (void) format;
-
-   /* these should have been caught sooner */
-   ASSERT((width % bw) == 0 || width == 2 || width == 1);
-   ASSERT((height % bh) == 0 || height == 2 || height == 1);
-   ASSERT((xoffset % bw) == 0);
-   ASSERT((yoffset % bh) == 0);
-
-   /* get pointer to src pixels (may be in a pbo which we'll map here) */
-   data = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, data,
-                                                 &ctx->Unpack,
-                                                 "glCompressedTexSubImage2D");
-   if (!data)
-      return;
-
-   srcRowStride = _mesa_format_row_stride(texFormat, width);
-   src = (const GLubyte *) data;
-
-   destRowStride = _mesa_format_row_stride(texFormat, destWidth);
-   dest = _mesa_compressed_image_address(xoffset, yoffset, 0,
-                                         texFormat, destWidth,
-                                         (GLubyte *) texImage->Data);
-
-   bytesPerRow = srcRowStride;  /* bytes per row of blocks */
-   rows = height / bh;  /* rows in blocks */
-
-   /* copy rows of blocks */
-   for (i = 0; i < rows; i++) {
-      memcpy(dest, src, bytesPerRow);
-      dest += destRowStride;
-      src += srcRowStride;
-   }
-
-   _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
-}
-
-
-/**
- * Fallback for Driver.CompressedTexSubImage3D()
- */
-void
-_mesa_store_compressed_texsubimage3d(GLcontext *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)
-{
-   /* there are no compressed 3D texture formats yet */
-   (void) ctx;
-   (void) target; (void) level;
-   (void) xoffset; (void) yoffset; (void) zoffset;
-   (void) width; (void) height; (void) depth;
-   (void) format;
-   (void) imageSize; (void) data;
-   (void) texObj;
-   (void) texImage;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.5

+ *

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

+ */

+

+/**

+ * The GL texture image functions in teximage.c basically just do

+ * error checking and data structure allocation.  They in turn call

+ * device driver functions which actually copy/convert/store the user's

+ * texture image data.

+ *

+ * However, most device drivers will be able to use the fallback functions

+ * in this file.  That is, most drivers will have the following bit of

+ * code:

+ *   ctx->Driver.TexImage1D = _mesa_store_teximage1d;

+ *   ctx->Driver.TexImage2D = _mesa_store_teximage2d;

+ *   ctx->Driver.TexImage3D = _mesa_store_teximage3d;

+ *   etc...

+ *

+ * Texture image processing is actually kind of complicated.  We have to do:

+ *    Format/type conversions

+ *    pixel unpacking

+ *    pixel transfer (scale, bais, lookup, etc)

+ *

+ * These functions can handle most everything, including processing full

+ * images and sub-images.

+ */

+

+

+#include "glheader.h"

+#include "bufferobj.h"

+#include "colormac.h"

+#include "image.h"

+#include "macros.h"

+#include "mipmap.h"

+#include "pack.h"

+#include "imports.h"

+#include "pack.h"

+#include "texcompress.h"

+#include "texcompress_fxt1.h"

+#include "texcompress_s3tc.h"

+#include "teximage.h"

+#include "texstore.h"

+#include "enums.h"

+

+

+enum {

+   ZERO = 4, 

+   ONE = 5

+};

+

+

+/**

+ * Texture image storage function.

+ */

+typedef GLboolean (*StoreTexImageFunc)(TEXSTORE_PARAMS);

+

+

+/**

+ * Return GL_TRUE if the given image format is one that be converted

+ * to another format by swizzling.

+ */

+static GLboolean

+can_swizzle(GLenum logicalBaseFormat)

+{

+   switch (logicalBaseFormat) {

+   case GL_RGBA:

+   case GL_RGB:

+   case GL_LUMINANCE_ALPHA:

+   case GL_INTENSITY:

+   case GL_ALPHA:

+   case GL_LUMINANCE:

+   case GL_RED:

+   case GL_GREEN:

+   case GL_BLUE:

+   case GL_BGR:

+   case GL_BGRA:

+   case GL_ABGR_EXT:

+   case GL_RG:

+      return GL_TRUE;

+   default:

+      return GL_FALSE;

+   }

+}

+

+

+

+enum {

+   IDX_LUMINANCE = 0,

+   IDX_ALPHA,

+   IDX_INTENSITY,

+   IDX_LUMINANCE_ALPHA,

+   IDX_RGB,

+   IDX_RGBA,

+   IDX_RED,

+   IDX_GREEN,

+   IDX_BLUE,

+   IDX_BGR,

+   IDX_BGRA,

+   IDX_ABGR,

+   IDX_RG,

+   MAX_IDX

+};

+

+#define MAP1(x)       MAP4(x, ZERO, ZERO, ZERO)

+#define MAP2(x,y)     MAP4(x, y, ZERO, ZERO)

+#define MAP3(x,y,z)   MAP4(x, y, z, ZERO)

+#define MAP4(x,y,z,w) { x, y, z, w, ZERO, ONE }

+

+

+static const struct {

+   GLubyte format_idx;

+   GLubyte to_rgba[6];

+   GLubyte from_rgba[6];

+} mappings[MAX_IDX] = 

+{

+   {

+      IDX_LUMINANCE,

+      MAP4(0,0,0,ONE),

+      MAP1(0)

+   },

+

+   {

+      IDX_ALPHA,

+      MAP4(ZERO, ZERO, ZERO, 0),

+      MAP1(3)

+   },

+

+   {

+      IDX_INTENSITY,

+      MAP4(0, 0, 0, 0),

+      MAP1(0),

+   },

+

+   {

+      IDX_LUMINANCE_ALPHA,

+      MAP4(0,0,0,1),

+      MAP2(0,3)

+   },

+

+   {

+      IDX_RGB,

+      MAP4(0,1,2,ONE),

+      MAP3(0,1,2)

+   },

+

+   {

+      IDX_RGBA,

+      MAP4(0,1,2,3),

+      MAP4(0,1,2,3),

+   },

+

+   {

+      IDX_RED,

+      MAP4(0, ZERO, ZERO, ONE),

+      MAP1(0),

+   },

+

+   {

+      IDX_GREEN,

+      MAP4(ZERO, 0, ZERO, ONE),

+      MAP1(1),

+   },

+

+   {

+      IDX_BLUE,

+      MAP4(ZERO, ZERO, 0, ONE),

+      MAP1(2),

+   },

+

+   {

+      IDX_BGR,

+      MAP4(2,1,0,ONE),

+      MAP3(2,1,0)

+   },

+

+   {

+      IDX_BGRA,

+      MAP4(2,1,0,3),

+      MAP4(2,1,0,3)

+   },

+

+   {

+      IDX_ABGR,

+      MAP4(3,2,1,0),

+      MAP4(3,2,1,0)

+   },

+

+   {

+      IDX_RG,

+      MAP4(0, 1, ZERO, ONE),

+      MAP2(0, 1)

+   },

+};

+

+

+

+/**

+ * Convert a GL image format enum to an IDX_* value (see above).

+ */

+static int

+get_map_idx(GLenum value)

+{

+   switch (value) {

+   case GL_LUMINANCE: return IDX_LUMINANCE;

+   case GL_ALPHA: return IDX_ALPHA;

+   case GL_INTENSITY: return IDX_INTENSITY;

+   case GL_LUMINANCE_ALPHA: return IDX_LUMINANCE_ALPHA;

+   case GL_RGB: return IDX_RGB;

+   case GL_RGBA: return IDX_RGBA;

+   case GL_RED: return IDX_RED;

+   case GL_GREEN: return IDX_GREEN;

+   case GL_BLUE: return IDX_BLUE;

+   case GL_BGR: return IDX_BGR;

+   case GL_BGRA: return IDX_BGRA;

+   case GL_ABGR_EXT: return IDX_ABGR;

+   case GL_RG: return IDX_RG;

+   default:

+      _mesa_problem(NULL, "Unexpected inFormat");

+      return 0;

+   }

+}   

+

+

+/**

+ * When promoting texture formats (see below) we need to compute the

+ * mapping of dest components back to source components.

+ * This function does that.

+ * \param inFormat  the incoming format of the texture

+ * \param outFormat  the final texture format

+ * \return map[6]  a full 6-component map

+ */

+static void

+compute_component_mapping(GLenum inFormat, GLenum outFormat, 

+			  GLubyte *map)

+{

+   const int inFmt = get_map_idx(inFormat);

+   const int outFmt = get_map_idx(outFormat);

+   const GLubyte *in2rgba = mappings[inFmt].to_rgba;

+   const GLubyte *rgba2out = mappings[outFmt].from_rgba;

+   int i;

+   

+   for (i = 0; i < 4; i++)

+      map[i] = in2rgba[rgba2out[i]];

+

+   map[ZERO] = ZERO;

+   map[ONE] = ONE;   

+

+#if 0

+   printf("from %x/%s to %x/%s map %d %d %d %d %d %d\n",

+	  inFormat, _mesa_lookup_enum_by_nr(inFormat),

+	  outFormat, _mesa_lookup_enum_by_nr(outFormat),

+	  map[0], 

+	  map[1], 

+	  map[2], 

+	  map[3], 

+	  map[4], 

+	  map[5]); 

+#endif

+}

+

+

+/**

+ * Make a temporary (color) texture image with GLfloat components.

+ * Apply all needed pixel unpacking and pixel transfer operations.

+ * Note that there are both logicalBaseFormat and textureBaseFormat parameters.

+ * Suppose the user specifies GL_LUMINANCE as the internal texture format

+ * but the graphics hardware doesn't support luminance textures.  So, we might

+ * use an RGB hardware format instead.

+ * If logicalBaseFormat != textureBaseFormat we have some extra work to do.

+ *

+ * \param ctx  the rendering context

+ * \param dims  image dimensions: 1, 2 or 3

+ * \param logicalBaseFormat  basic texture derived from the user's

+ *    internal texture format value

+ * \param textureBaseFormat  the actual basic format of the texture

+ * \param srcWidth  source image width

+ * \param srcHeight  source image height

+ * \param srcDepth  source image depth

+ * \param srcFormat  source image format

+ * \param srcType  source image type

+ * \param srcAddr  source image address

+ * \param srcPacking  source image pixel packing

+ * \return resulting image with format = textureBaseFormat and type = GLfloat.

+ */

+static GLfloat *

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

+{

+   GLfloat *tempImage;

+   const GLint components = _mesa_components_in_format(logicalBaseFormat);

+   const GLint srcStride =

+      _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+   GLfloat *dst;

+   GLint img, row;

+

+   ASSERT(dims >= 1 && dims <= 3);

+

+   ASSERT(logicalBaseFormat == GL_RGBA ||

+          logicalBaseFormat == GL_RGB ||

+          logicalBaseFormat == GL_RG ||

+          logicalBaseFormat == GL_RED ||

+          logicalBaseFormat == GL_LUMINANCE_ALPHA ||

+          logicalBaseFormat == GL_LUMINANCE ||

+          logicalBaseFormat == GL_ALPHA ||

+          logicalBaseFormat == GL_INTENSITY ||

+          logicalBaseFormat == GL_COLOR_INDEX ||

+          logicalBaseFormat == GL_DEPTH_COMPONENT);

+

+   ASSERT(textureBaseFormat == GL_RGBA ||

+          textureBaseFormat == GL_RGB ||

+          textureBaseFormat == GL_RG ||

+          textureBaseFormat == GL_RED ||

+          textureBaseFormat == GL_LUMINANCE_ALPHA ||

+          textureBaseFormat == GL_LUMINANCE ||

+          textureBaseFormat == GL_ALPHA ||

+          textureBaseFormat == GL_INTENSITY ||

+          textureBaseFormat == GL_COLOR_INDEX ||

+          textureBaseFormat == GL_DEPTH_COMPONENT);

+

+   tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth

+				  * components * sizeof(GLfloat));

+   if (!tempImage)

+      return NULL;

+

+   dst = tempImage;

+   for (img = 0; img < srcDepth; img++) {

+      const GLubyte *src

+	 = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,

+						 srcWidth, srcHeight,

+						 srcFormat, srcType,

+						 img, 0, 0);

+      for (row = 0; row < srcHeight; row++) {

+	 _mesa_unpack_color_span_float(ctx, srcWidth, logicalBaseFormat,

+				       dst, srcFormat, srcType, src,

+				       srcPacking, transferOps);

+	 dst += srcWidth * components;

+	 src += srcStride;

+      }

+   }

+

+   if (logicalBaseFormat != textureBaseFormat) {

+      /* more work */

+      GLint texComponents = _mesa_components_in_format(textureBaseFormat);

+      GLint logComponents = _mesa_components_in_format(logicalBaseFormat);

+      GLfloat *newImage;

+      GLint i, n;

+      GLubyte map[6];

+

+      /* we only promote up to RGB, RGBA and LUMINANCE_ALPHA formats for now */

+      ASSERT(textureBaseFormat == GL_RGB || textureBaseFormat == GL_RGBA ||

+             textureBaseFormat == GL_LUMINANCE_ALPHA);

+

+      /* The actual texture format should have at least as many components

+       * as the logical texture format.

+       */

+      ASSERT(texComponents >= logComponents);

+

+      newImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth

+                                          * texComponents * sizeof(GLfloat));

+      if (!newImage) {

+         free(tempImage);

+         return NULL;

+      }

+

+      compute_component_mapping(logicalBaseFormat, textureBaseFormat, map);

+

+      n = srcWidth * srcHeight * srcDepth;

+      for (i = 0; i < n; i++) {

+         GLint k;

+         for (k = 0; k < texComponents; k++) {

+            GLint j = map[k];

+            if (j == ZERO)

+               newImage[i * texComponents + k] = 0.0F;

+            else if (j == ONE)

+               newImage[i * texComponents + k] = 1.0F;

+            else

+               newImage[i * texComponents + k] = tempImage[i * logComponents + j];

+         }

+      }

+

+      free(tempImage);

+      tempImage = newImage;

+   }

+

+   return tempImage;

+}

+

+

+/**

+ * Make temporary image with uint pixel values.  Used for unsigned

+ * integer-valued textures.

+ */

+static GLuint *

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

+{

+   GLuint *tempImage;

+   const GLint components = _mesa_components_in_format(logicalBaseFormat);

+   const GLint srcStride =

+      _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+   GLuint *dst;

+   GLint img, row;

+

+   ASSERT(dims >= 1 && dims <= 3);

+

+   ASSERT(logicalBaseFormat == GL_RGBA ||

+          logicalBaseFormat == GL_RGB ||

+          logicalBaseFormat == GL_RG ||

+          logicalBaseFormat == GL_RED ||

+          logicalBaseFormat == GL_LUMINANCE_ALPHA ||

+          logicalBaseFormat == GL_LUMINANCE ||

+          logicalBaseFormat == GL_INTENSITY ||

+          logicalBaseFormat == GL_ALPHA);

+

+   ASSERT(textureBaseFormat == GL_RGBA ||

+          textureBaseFormat == GL_RGB ||

+          textureBaseFormat == GL_RG ||

+          textureBaseFormat == GL_RED ||

+          textureBaseFormat == GL_LUMINANCE_ALPHA ||

+          textureBaseFormat == GL_LUMINANCE ||

+          textureBaseFormat == GL_ALPHA);

+

+   tempImage = (GLuint *) malloc(srcWidth * srcHeight * srcDepth

+                                 * components * sizeof(GLuint));

+   if (!tempImage)

+      return NULL;

+

+   dst = tempImage;

+   for (img = 0; img < srcDepth; img++) {

+      const GLubyte *src

+	 = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,

+						 srcWidth, srcHeight,

+						 srcFormat, srcType,

+						 img, 0, 0);

+      for (row = 0; row < srcHeight; row++) {

+	 _mesa_unpack_color_span_uint(ctx, srcWidth, logicalBaseFormat,

+                                      dst, srcFormat, srcType, src,

+                                      srcPacking);

+	 dst += srcWidth * components;

+	 src += srcStride;

+      }

+   }

+

+   if (logicalBaseFormat != textureBaseFormat) {

+      /* more work */

+      GLint texComponents = _mesa_components_in_format(textureBaseFormat);

+      GLint logComponents = _mesa_components_in_format(logicalBaseFormat);

+      GLuint *newImage;

+      GLint i, n;

+      GLubyte map[6];

+

+      /* we only promote up to RGB, RGBA and LUMINANCE_ALPHA formats for now */

+      ASSERT(textureBaseFormat == GL_RGB || textureBaseFormat == GL_RGBA ||

+             textureBaseFormat == GL_LUMINANCE_ALPHA);

+

+      /* The actual texture format should have at least as many components

+       * as the logical texture format.

+       */

+      ASSERT(texComponents >= logComponents);

+

+      newImage = (GLuint *) malloc(srcWidth * srcHeight * srcDepth

+                                   * texComponents * sizeof(GLuint));

+      if (!newImage) {

+         free(tempImage);

+         return NULL;

+      }

+

+      compute_component_mapping(logicalBaseFormat, textureBaseFormat, map);

+

+      n = srcWidth * srcHeight * srcDepth;

+      for (i = 0; i < n; i++) {

+         GLint k;

+         for (k = 0; k < texComponents; k++) {

+            GLint j = map[k];

+            if (j == ZERO)

+               newImage[i * texComponents + k] = 0.0F;

+            else if (j == ONE)

+               newImage[i * texComponents + k] = 1.0F;

+            else

+               newImage[i * texComponents + k] = tempImage[i * logComponents + j];

+         }

+      }

+

+      free(tempImage);

+      tempImage = newImage;

+   }

+

+   return tempImage;

+}

+

+

+

+/**

+ * Make a temporary (color) texture image with GLchan components.

+ * Apply all needed pixel unpacking and pixel transfer operations.

+ * Note that there are both logicalBaseFormat and textureBaseFormat parameters.

+ * Suppose the user specifies GL_LUMINANCE as the internal texture format

+ * but the graphics hardware doesn't support luminance textures.  So, we might

+ * use an RGB hardware format instead.

+ * If logicalBaseFormat != textureBaseFormat we have some extra work to do.

+ *

+ * \param ctx  the rendering context

+ * \param dims  image dimensions: 1, 2 or 3

+ * \param logicalBaseFormat  basic texture derived from the user's

+ *    internal texture format value

+ * \param textureBaseFormat  the actual basic format of the texture

+ * \param srcWidth  source image width

+ * \param srcHeight  source image height

+ * \param srcDepth  source image depth

+ * \param srcFormat  source image format

+ * \param srcType  source image type

+ * \param srcAddr  source image address

+ * \param srcPacking  source image pixel packing

+ * \return resulting image with format = textureBaseFormat and type = GLchan.

+ */

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

+{

+   GLuint transferOps = ctx->_ImageTransferState;

+   const GLint components = _mesa_components_in_format(logicalBaseFormat);

+   GLint img, row;

+   GLchan *tempImage, *dst;

+

+   ASSERT(dims >= 1 && dims <= 3);

+

+   ASSERT(logicalBaseFormat == GL_RGBA ||

+          logicalBaseFormat == GL_RGB ||

+          logicalBaseFormat == GL_RG ||

+          logicalBaseFormat == GL_RED ||

+          logicalBaseFormat == GL_LUMINANCE_ALPHA ||

+          logicalBaseFormat == GL_LUMINANCE ||

+          logicalBaseFormat == GL_ALPHA ||

+          logicalBaseFormat == GL_INTENSITY);

+

+   ASSERT(textureBaseFormat == GL_RGBA ||

+          textureBaseFormat == GL_RGB ||

+          textureBaseFormat == GL_RG ||

+          textureBaseFormat == GL_RED ||

+          textureBaseFormat == GL_LUMINANCE_ALPHA ||

+          textureBaseFormat == GL_LUMINANCE ||

+          textureBaseFormat == GL_ALPHA ||

+          textureBaseFormat == GL_INTENSITY);

+

+   /* unpack and transfer the source image */

+   tempImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth

+                                       * components * sizeof(GLchan));

+   if (!tempImage) {

+      return NULL;

+   }

+

+   dst = tempImage;

+   for (img = 0; img < srcDepth; img++) {

+      const GLint srcStride =

+         _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+      const GLubyte *src =

+         (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,

+                                               srcWidth, srcHeight,

+                                               srcFormat, srcType,

+                                               img, 0, 0);

+      for (row = 0; row < srcHeight; row++) {

+         _mesa_unpack_color_span_chan(ctx, srcWidth, logicalBaseFormat, dst,

+                                      srcFormat, srcType, src, srcPacking,

+                                      transferOps);

+         dst += srcWidth * components;

+         src += srcStride;

+      }

+   }

+

+   if (logicalBaseFormat != textureBaseFormat) {

+      /* one more conversion step */

+      GLint texComponents = _mesa_components_in_format(textureBaseFormat);

+      GLint logComponents = _mesa_components_in_format(logicalBaseFormat);

+      GLchan *newImage;

+      GLint i, n;

+      GLubyte map[6];

+

+      /* we only promote up to RGB, RGBA and LUMINANCE_ALPHA formats for now */

+      ASSERT(textureBaseFormat == GL_RGB || textureBaseFormat == GL_RGBA ||

+             textureBaseFormat == GL_LUMINANCE_ALPHA);

+

+      /* The actual texture format should have at least as many components

+       * as the logical texture format.

+       */

+      ASSERT(texComponents >= logComponents);

+

+      newImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth

+                                         * texComponents * sizeof(GLchan));

+      if (!newImage) {

+         free(tempImage);

+         return NULL;

+      }

+

+      compute_component_mapping(logicalBaseFormat, textureBaseFormat, map);

+

+      n = srcWidth * srcHeight * srcDepth;

+      for (i = 0; i < n; i++) {

+         GLint k;

+         for (k = 0; k < texComponents; k++) {

+            GLint j = map[k];

+            if (j == ZERO)

+               newImage[i * texComponents + k] = 0;

+            else if (j == ONE)

+               newImage[i * texComponents + k] = CHAN_MAX;

+            else

+               newImage[i * texComponents + k] = tempImage[i * logComponents + j];

+         }

+      }

+

+      free(tempImage);

+      tempImage = newImage;

+   }

+

+   return tempImage;

+}

+

+

+/**

+ * Copy GLubyte pixels from <src> to <dst> with swizzling.

+ * \param dst  destination pixels

+ * \param dstComponents  number of color components in destination pixels

+ * \param src  source pixels

+ * \param srcComponents  number of color components in source pixels

+ * \param map  the swizzle mapping.  map[X] says where to find the X component

+ *             in the source image's pixels.  For example, if the source image

+ *             is GL_BGRA and X = red, map[0] yields 2.

+ * \param count  number of pixels to copy/swizzle.

+ */

+static void

+swizzle_copy(GLubyte *dst, GLuint dstComponents, const GLubyte *src, 

+             GLuint srcComponents, const GLubyte *map, GLuint count)

+{

+#define SWZ_CPY(dst, src, count, dstComps, srcComps) \

+   do {                                              \

+      GLuint i;                                      \

+      for (i = 0; i < count; i++) {                  \

+         GLuint j;                                   \

+         if (srcComps == 4) {                        \

+            COPY_4UBV(tmp, src);                     \

+         }                                           \

+         else {                                      \

+            for (j = 0; j < srcComps; j++) {         \

+               tmp[j] = src[j];                      \

+            }                                        \

+         }                                           \

+         src += srcComps;                            \

+         for (j = 0; j < dstComps; j++) {            \

+            dst[j] = tmp[map[j]];                    \

+         }                                           \

+         dst += dstComps;                            \

+      }                                              \

+   } while (0)

+

+   GLubyte tmp[6];

+

+   tmp[ZERO] = 0x0;

+   tmp[ONE] = 0xff;

+

+   ASSERT(srcComponents <= 4);

+   ASSERT(dstComponents <= 4);

+

+   switch (dstComponents) {

+   case 4:

+      switch (srcComponents) {

+      case 4:

+         SWZ_CPY(dst, src, count, 4, 4);

+         break;

+      case 3:

+         SWZ_CPY(dst, src, count, 4, 3);

+         break;

+      case 2:

+         SWZ_CPY(dst, src, count, 4, 2);

+         break;

+      case 1:

+         SWZ_CPY(dst, src, count, 4, 1);

+         break;

+      default:

+         ;

+      }

+      break;

+   case 3:

+      switch (srcComponents) {

+      case 4:

+         SWZ_CPY(dst, src, count, 3, 4);

+         break;

+      case 3:

+         SWZ_CPY(dst, src, count, 3, 3);

+         break;

+      case 2:

+         SWZ_CPY(dst, src, count, 3, 2);

+         break;

+      case 1:

+         SWZ_CPY(dst, src, count, 3, 1);

+         break;

+      default:

+         ;

+      }

+      break;

+   case 2:

+      switch (srcComponents) {

+      case 4:

+         SWZ_CPY(dst, src, count, 2, 4);

+         break;

+      case 3:

+         SWZ_CPY(dst, src, count, 2, 3);

+         break;

+      case 2:

+         SWZ_CPY(dst, src, count, 2, 2);

+         break;

+      case 1:

+         SWZ_CPY(dst, src, count, 2, 1);

+         break;

+      default:

+         ;

+      }

+      break;

+   case 1:

+      switch (srcComponents) {

+      case 4:

+         SWZ_CPY(dst, src, count, 1, 4);

+         break;

+      case 3:

+         SWZ_CPY(dst, src, count, 1, 3);

+         break;

+      case 2:

+         SWZ_CPY(dst, src, count, 1, 2);

+         break;

+      case 1:

+         SWZ_CPY(dst, src, count, 1, 1);

+         break;

+      default:

+         ;

+      }

+      break;

+   default:

+      ;

+   }

+#undef SWZ_CPY

+}

+

+

+

+static const GLubyte map_identity[6] = { 0, 1, 2, 3, ZERO, ONE };

+static const GLubyte map_3210[6] = { 3, 2, 1, 0, ZERO, ONE };

+

+

+/**

+ * For 1-byte/pixel formats (or 8_8_8_8 packed formats), return a

+ * mapping array depending on endianness.

+ */

+static const GLubyte *

+type_mapping( GLenum srcType )

+{

+   switch (srcType) {

+   case GL_BYTE:

+   case GL_UNSIGNED_BYTE:

+      return map_identity;

+   case GL_UNSIGNED_INT_8_8_8_8:

+      return _mesa_little_endian() ? map_3210 : map_identity;

+   case GL_UNSIGNED_INT_8_8_8_8_REV:

+      return _mesa_little_endian() ? map_identity : map_3210;

+   default:

+      return NULL;

+   }

+}

+

+

+/**

+ * For 1-byte/pixel formats (or 8_8_8_8 packed formats), return a

+ * mapping array depending on pixelstore byte swapping state.

+ */

+static const GLubyte *

+byteswap_mapping( GLboolean swapBytes,

+		  GLenum srcType )

+{

+   if (!swapBytes) 

+      return map_identity;

+

+   switch (srcType) {

+   case GL_BYTE:

+   case GL_UNSIGNED_BYTE:

+      return map_identity;

+   case GL_UNSIGNED_INT_8_8_8_8:

+   case GL_UNSIGNED_INT_8_8_8_8_REV:

+      return map_3210;

+   default:

+      return NULL;

+   }

+}

+

+

+

+/**

+ * Transfer a GLubyte texture image with component swizzling.

+ */

+static void

+_mesa_swizzle_ubyte_image(struct gl_context *ctx, 

+			  GLuint dimensions,

+			  GLenum srcFormat,

+			  GLenum srcType,

+

+			  GLenum baseInternalFormat,

+

+			  const GLubyte *rgba2dst,

+			  GLuint dstComponents,

+

+			  GLvoid *dstAddr,

+			  GLint dstXoffset, GLint dstYoffset, GLint dstZoffset,

+			  GLint dstRowStride,

+                          const GLuint *dstImageOffsets,

+

+			  GLint srcWidth, GLint srcHeight, GLint srcDepth,

+			  const GLvoid *srcAddr,

+			  const struct gl_pixelstore_attrib *srcPacking )

+{

+   GLint srcComponents = _mesa_components_in_format(srcFormat);

+   const GLubyte *srctype2ubyte, *swap;

+   GLubyte map[4], src2base[6], base2rgba[6];

+   GLint i;

+   const GLint srcRowStride =

+      _mesa_image_row_stride(srcPacking, srcWidth,

+                             srcFormat, GL_UNSIGNED_BYTE);

+   const GLint srcImageStride

+      = _mesa_image_image_stride(srcPacking, srcWidth, srcHeight, srcFormat,

+                                 GL_UNSIGNED_BYTE);

+   const GLubyte *srcImage

+      = (const GLubyte *) _mesa_image_address(dimensions, srcPacking, srcAddr,

+                                              srcWidth, srcHeight, srcFormat,

+                                              GL_UNSIGNED_BYTE, 0, 0, 0);

+

+   (void) ctx;

+

+   /* Translate from src->baseInternal->GL_RGBA->dst.  This will

+    * correctly deal with RGBA->RGB->RGBA conversions where the final

+    * A value must be 0xff regardless of the incoming alpha values.

+    */

+   compute_component_mapping(srcFormat, baseInternalFormat, src2base);

+   compute_component_mapping(baseInternalFormat, GL_RGBA, base2rgba);

+   swap = byteswap_mapping(srcPacking->SwapBytes, srcType);

+   srctype2ubyte = type_mapping(srcType);

+

+

+   for (i = 0; i < 4; i++)

+      map[i] = srctype2ubyte[swap[src2base[base2rgba[rgba2dst[i]]]]];

+

+/*    printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */

+

+   if (srcComponents == dstComponents &&

+       srcRowStride == dstRowStride &&

+       srcRowStride == srcWidth * srcComponents &&

+       dimensions < 3) {

+      /* 1 and 2D images only */

+      GLubyte *dstImage = (GLubyte *) dstAddr

+         + dstYoffset * dstRowStride

+         + dstXoffset * dstComponents;

+      swizzle_copy(dstImage, dstComponents, srcImage, srcComponents, map, 

+		   srcWidth * srcHeight);

+   }

+   else {

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         const GLubyte *srcRow = srcImage;

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * dstComponents

+            + dstYoffset * dstRowStride

+            + dstXoffset * dstComponents;

+         for (row = 0; row < srcHeight; row++) {

+	    swizzle_copy(dstRow, dstComponents, srcRow, srcComponents, map, srcWidth);

+            dstRow += dstRowStride;

+            srcRow += srcRowStride;

+         }

+         srcImage += srcImageStride;

+      }

+   }

+}

+

+

+/**

+ * Teximage storage routine for when a simple memcpy will do.

+ * No pixel transfer operations or special texel encodings allowed.

+ * 1D, 2D and 3D images supported.

+ */

+static void

+memcpy_texture(struct gl_context *ctx,

+	       GLuint dimensions,

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

+{

+   const GLint srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth,

+                                                     srcFormat, srcType);

+   const GLint srcImageStride = _mesa_image_image_stride(srcPacking,

+                                      srcWidth, srcHeight, srcFormat, srcType);

+   const GLubyte *srcImage = (const GLubyte *) _mesa_image_address(dimensions,

+        srcPacking, srcAddr, srcWidth, srcHeight, srcFormat, srcType, 0, 0, 0);

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLint bytesPerRow = srcWidth * texelBytes;

+

+#if 0

+   /* XXX update/re-enable for dstImageOffsets array */

+   const GLint bytesPerImage = srcHeight * bytesPerRow;

+   const GLint bytesPerTexture = srcDepth * bytesPerImage;

+   GLubyte *dstImage = (GLubyte *) dstAddr

+                     + dstZoffset * dstImageStride

+                     + dstYoffset * dstRowStride

+                     + dstXoffset * texelBytes;

+

+   if (dstRowStride == srcRowStride &&

+       dstRowStride == bytesPerRow &&

+       ((dstImageStride == srcImageStride &&

+         dstImageStride == bytesPerImage) ||

+        (srcDepth == 1))) {

+      /* one big memcpy */

+      ctx->Driver.TextureMemCpy(dstImage, srcImage, bytesPerTexture);

+   }

+   else

+   {

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         const GLubyte *srcRow = srcImage;

+         GLubyte *dstRow = dstImage;

+         for (row = 0; row < srcHeight; row++) {

+            ctx->Driver.TextureMemCpy(dstRow, srcRow, bytesPerRow);

+            dstRow += dstRowStride;

+            srcRow += srcRowStride;

+         }

+         srcImage += srcImageStride;

+         dstImage += dstImageStride;

+      }

+   }

+#endif

+

+   GLint img, row;

+   for (img = 0; img < srcDepth; img++) {

+      const GLubyte *srcRow = srcImage;

+      GLubyte *dstRow = (GLubyte *) dstAddr

+         + dstImageOffsets[dstZoffset + img] * texelBytes

+         + dstYoffset * dstRowStride

+         + dstXoffset * texelBytes;

+      for (row = 0; row < srcHeight; row++) {

+         ctx->Driver.TextureMemCpy(dstRow, srcRow, bytesPerRow);

+         dstRow += dstRowStride;

+         srcRow += srcRowStride;

+      }

+      srcImage += srcImageStride;

+   }

+}

+

+

+

+/**

+ * Store a 32-bit integer depth component texture image.

+ */

+static GLboolean

+_mesa_texstore_z32(TEXSTORE_PARAMS)

+{

+   const GLuint depthScale = 0xffffffff;

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   (void) dims;

+   ASSERT(dstFormat == MESA_FORMAT_Z32);

+   ASSERT(texelBytes == sizeof(GLuint));

+

+   if (ctx->Pixel.DepthScale == 1.0f &&

+       ctx->Pixel.DepthBias == 0.0f &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_DEPTH_COMPONENT &&

+       srcFormat == GL_DEPTH_COMPONENT &&

+       srcType == GL_UNSIGNED_INT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            const GLvoid *src = _mesa_image_address(dims, srcPacking,

+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);

+            _mesa_unpack_depth_span(ctx, srcWidth,

+                                    GL_UNSIGNED_INT, (GLuint *) dstRow,

+                                    depthScale, srcType, src, srcPacking);

+            dstRow += dstRowStride;

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a 24-bit integer depth component texture image.

+ */

+static GLboolean

+_mesa_texstore_x8_z24(TEXSTORE_PARAMS)

+{

+   const GLuint depthScale = 0xffffff;

+   const GLuint texelBytes = 4;

+

+   (void) dims;

+   ASSERT(dstFormat == MESA_FORMAT_X8_Z24);

+

+   {

+      /* general path */

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            const GLvoid *src = _mesa_image_address(dims, srcPacking,

+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);

+            _mesa_unpack_depth_span(ctx, srcWidth,

+                                    GL_UNSIGNED_INT, (GLuint *) dstRow,

+                                    depthScale, srcType, src, srcPacking);

+            dstRow += dstRowStride;

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a 24-bit integer depth component texture image.

+ */

+static GLboolean

+_mesa_texstore_z24_x8(TEXSTORE_PARAMS)

+{

+   const GLuint depthScale = 0xffffff;

+   const GLuint texelBytes = 4;

+

+   (void) dims;

+   ASSERT(dstFormat == MESA_FORMAT_Z24_X8);

+

+   {

+      /* general path */

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            const GLvoid *src = _mesa_image_address(dims, srcPacking,

+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);

+            GLuint *dst = (GLuint *) dstRow;

+            GLint i;

+            _mesa_unpack_depth_span(ctx, srcWidth,

+                                    GL_UNSIGNED_INT, dst,

+                                    depthScale, srcType, src, srcPacking);

+            for (i = 0; i < srcWidth; i++)

+               dst[i] <<= 8;

+            dstRow += dstRowStride;

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a 16-bit integer depth component texture image.

+ */

+static GLboolean

+_mesa_texstore_z16(TEXSTORE_PARAMS)

+{

+   const GLuint depthScale = 0xffff;

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   (void) dims;

+   ASSERT(dstFormat == MESA_FORMAT_Z16);

+   ASSERT(texelBytes == sizeof(GLushort));

+

+   if (ctx->Pixel.DepthScale == 1.0f &&

+       ctx->Pixel.DepthBias == 0.0f &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_DEPTH_COMPONENT &&

+       srcFormat == GL_DEPTH_COMPONENT &&

+       srcType == GL_UNSIGNED_SHORT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            const GLvoid *src = _mesa_image_address(dims, srcPacking,

+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);

+            GLushort *dst16 = (GLushort *) dstRow;

+            _mesa_unpack_depth_span(ctx, srcWidth,

+                                    GL_UNSIGNED_SHORT, dst16, depthScale,

+                                    srcType, src, srcPacking);

+            dstRow += dstRowStride;

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store an rgb565 or rgb565_rev texture image.

+ */

+static GLboolean

+_mesa_texstore_rgb565(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGB565 ||

+          dstFormat == MESA_FORMAT_RGB565_REV);

+   ASSERT(texelBytes == 2);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_RGB565 &&

+       baseInternalFormat == GL_RGB &&

+       srcFormat == GL_RGB &&

+       srcType == GL_UNSIGNED_SHORT_5_6_5) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+            !srcPacking->SwapBytes &&

+            baseInternalFormat == GL_RGB &&

+            srcFormat == GL_RGB &&

+            srcType == GL_UNSIGNED_BYTE &&

+            dims == 2) {

+      /* do optimized tex store */

+      const GLint srcRowStride =

+         _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+      const GLubyte *src = (const GLubyte *)

+         _mesa_image_address(dims, srcPacking, srcAddr, srcWidth, srcHeight,

+                             srcFormat, srcType, 0, 0, 0);

+      GLubyte *dst = (GLubyte *) dstAddr

+                   + dstYoffset * dstRowStride

+                   + dstXoffset * texelBytes;

+      GLint row, col;

+      for (row = 0; row < srcHeight; row++) {

+         const GLubyte *srcUB = (const GLubyte *) src;

+         GLushort *dstUS = (GLushort *) dst;

+         /* check for byteswapped format */

+         if (dstFormat == MESA_FORMAT_RGB565) {

+            for (col = 0; col < srcWidth; col++) {

+               dstUS[col] = PACK_COLOR_565( srcUB[0], srcUB[1], srcUB[2] );

+               srcUB += 3;

+            }

+         }

+         else {

+            for (col = 0; col < srcWidth; col++) {

+               dstUS[col] = PACK_COLOR_565_REV( srcUB[0], srcUB[1], srcUB[2] );

+               srcUB += 3;

+            }

+         }

+         dst += dstRowStride;

+         src += srcRowStride;

+      }

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+            /* check for byteswapped format */

+            if (dstFormat == MESA_FORMAT_RGB565) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_565( CHAN_TO_UBYTE(src[RCOMP]),

+                                               CHAN_TO_UBYTE(src[GCOMP]),

+                                               CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 3;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_565_REV( CHAN_TO_UBYTE(src[RCOMP]),

+                                                   CHAN_TO_UBYTE(src[GCOMP]),

+                                                   CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 3;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a texture in MESA_FORMAT_RGBA8888 or MESA_FORMAT_RGBA8888_REV.

+ */

+static GLboolean

+_mesa_texstore_rgba8888(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA8888 ||

+          dstFormat == MESA_FORMAT_RGBA8888_REV);

+   ASSERT(texelBytes == 4);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_RGBA8888 &&

+       baseInternalFormat == GL_RGBA &&

+      ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8) ||

+       (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE && !littleEndian) ||

+       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) ||

+       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_BYTE && littleEndian))) {

+       /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_RGBA8888_REV &&

+       baseInternalFormat == GL_RGBA &&

+      ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) ||

+       (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE && littleEndian) ||

+       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8) ||

+       (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_BYTE && !littleEndian))) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+	    (srcType == GL_UNSIGNED_BYTE ||

+	     srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+	     srcType == GL_UNSIGNED_INT_8_8_8_8_REV) &&

+	    can_swizzle(baseInternalFormat) &&

+	    can_swizzle(srcFormat)) {

+

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      if ((littleEndian && dstFormat == MESA_FORMAT_RGBA8888) ||

+	  (!littleEndian && dstFormat == MESA_FORMAT_RGBA8888_REV)) {

+	 dstmap[3] = 0;

+	 dstmap[2] = 1;

+	 dstmap[1] = 2;

+	 dstmap[0] = 3;

+      }

+      else {

+	 dstmap[3] = 3;

+	 dstmap[2] = 2;

+	 dstmap[1] = 1;

+	 dstmap[0] = 0;

+      }

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 4,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *dstUI = (GLuint *) dstRow;

+            if (dstFormat == MESA_FORMAT_RGBA8888) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888( CHAN_TO_UBYTE(src[RCOMP]),

+                                                CHAN_TO_UBYTE(src[GCOMP]),

+                                                CHAN_TO_UBYTE(src[BCOMP]),

+                                                CHAN_TO_UBYTE(src[ACOMP]) );

+                  src += 4;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888_REV( CHAN_TO_UBYTE(src[RCOMP]),

+                                                    CHAN_TO_UBYTE(src[GCOMP]),

+                                                    CHAN_TO_UBYTE(src[BCOMP]),

+                                                    CHAN_TO_UBYTE(src[ACOMP]) );

+                  src += 4;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_argb8888(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = GL_RGBA;

+

+   ASSERT(dstFormat == MESA_FORMAT_ARGB8888 ||

+          dstFormat == MESA_FORMAT_ARGB8888_REV ||

+          dstFormat == MESA_FORMAT_XRGB8888 ||

+          dstFormat == MESA_FORMAT_XRGB8888_REV );

+   ASSERT(texelBytes == 4);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       (dstFormat == MESA_FORMAT_ARGB8888 ||

+        dstFormat == MESA_FORMAT_XRGB8888) &&

+       baseInternalFormat == GL_RGBA &&

+       srcFormat == GL_BGRA &&

+       ((srcType == GL_UNSIGNED_BYTE && littleEndian) ||

+        srcType == GL_UNSIGNED_INT_8_8_8_8_REV)) {

+      /* simple memcpy path (little endian) */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       (dstFormat == MESA_FORMAT_ARGB8888_REV ||

+        dstFormat == MESA_FORMAT_XRGB8888_REV) &&

+       baseInternalFormat == GL_RGBA &&

+       srcFormat == GL_BGRA &&

+       ((srcType == GL_UNSIGNED_BYTE && !littleEndian) ||

+        srcType == GL_UNSIGNED_INT_8_8_8_8)) {

+      /* simple memcpy path (big endian) */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+            !srcPacking->SwapBytes &&

+	    (dstFormat == MESA_FORMAT_ARGB8888 ||

+             dstFormat == MESA_FORMAT_XRGB8888) &&

+            srcFormat == GL_RGB &&

+	    (baseInternalFormat == GL_RGBA ||

+	     baseInternalFormat == GL_RGB) &&

+            srcType == GL_UNSIGNED_BYTE) {

+      int img, row, col;

+      for (img = 0; img < srcDepth; img++) {

+         const GLint srcRowStride =

+            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,

+                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *d4 = (GLuint *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               d4[col] = PACK_COLOR_8888(0xff,

+                                         srcRow[col * 3 + RCOMP],

+                                         srcRow[col * 3 + GCOMP],

+                                         srcRow[col * 3 + BCOMP]);

+            }

+            dstRow += dstRowStride;

+            srcRow += srcRowStride;

+         }

+      }

+   }

+   else if (!ctx->_ImageTransferState &&

+            !srcPacking->SwapBytes &&

+	    dstFormat == MESA_FORMAT_ARGB8888 &&

+            srcFormat == GL_RGBA &&

+	    baseInternalFormat == GL_RGBA &&

+            srcType == GL_UNSIGNED_BYTE) {

+      /* same as above case, but src data has alpha too */

+      GLint img, row, col;

+      /* For some reason, streaming copies to write-combined regions

+       * are extremely sensitive to the characteristics of how the

+       * source data is retrieved.  By reordering the source reads to

+       * be in-order, the speed of this operation increases by half.

+       * Strangely the same isn't required for the RGB path, above.

+       */

+      for (img = 0; img < srcDepth; img++) {

+         const GLint srcRowStride =

+            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,

+                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *d4 = (GLuint *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               d4[col] = PACK_COLOR_8888(srcRow[col * 4 + ACOMP],

+                                         srcRow[col * 4 + RCOMP],

+                                         srcRow[col * 4 + GCOMP],

+                                         srcRow[col * 4 + BCOMP]);

+            }

+            dstRow += dstRowStride;

+            srcRow += srcRowStride;

+         }

+      }

+   }

+   else if (!ctx->_ImageTransferState &&

+	    (srcType == GL_UNSIGNED_BYTE ||

+	     srcType == GL_UNSIGNED_INT_8_8_8_8 ||

+	     srcType == GL_UNSIGNED_INT_8_8_8_8_REV) &&

+	    can_swizzle(baseInternalFormat) &&	   

+	    can_swizzle(srcFormat)) {

+

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      if ((littleEndian && dstFormat == MESA_FORMAT_ARGB8888) ||

+          (littleEndian && dstFormat == MESA_FORMAT_XRGB8888) ||

+	  (!littleEndian && dstFormat == MESA_FORMAT_ARGB8888_REV) ||

+	  (!littleEndian && dstFormat == MESA_FORMAT_XRGB8888_REV)) {

+	 dstmap[3] = 3;		/* alpha */

+	 dstmap[2] = 0;		/* red */

+	 dstmap[1] = 1;		/* green */

+	 dstmap[0] = 2;		/* blue */

+      }

+      else {

+	 assert((littleEndian && dstFormat == MESA_FORMAT_ARGB8888_REV) ||

+		(!littleEndian && dstFormat == MESA_FORMAT_ARGB8888) ||

+		(littleEndian && dstFormat == MESA_FORMAT_XRGB8888_REV) ||

+		(!littleEndian && dstFormat == MESA_FORMAT_XRGB8888));

+	 dstmap[3] = 2;

+	 dstmap[2] = 1;

+	 dstmap[1] = 0;

+	 dstmap[0] = 3;

+      }

+ 

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 4,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride,

+                                dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *dstUI = (GLuint *) dstRow;

+            if (dstFormat == MESA_FORMAT_ARGB8888) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888( CHAN_TO_UBYTE(src[ACOMP]),

+                                                CHAN_TO_UBYTE(src[RCOMP]),

+                                                CHAN_TO_UBYTE(src[GCOMP]),

+                                                CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            else if (dstFormat == MESA_FORMAT_XRGB8888) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888( 0xff,

+                                                CHAN_TO_UBYTE(src[RCOMP]),

+                                                CHAN_TO_UBYTE(src[GCOMP]),

+                                                CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888_REV( CHAN_TO_UBYTE(src[ACOMP]),

+                                                    CHAN_TO_UBYTE(src[RCOMP]),

+                                                    CHAN_TO_UBYTE(src[GCOMP]),

+                                                    CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_rgb888(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGB888);

+   ASSERT(texelBytes == 3);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_RGB &&

+       srcFormat == GL_BGR &&

+       srcType == GL_UNSIGNED_BYTE &&

+       littleEndian) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+            !srcPacking->SwapBytes &&

+            srcFormat == GL_RGBA &&

+            srcType == GL_UNSIGNED_BYTE) {

+      /* extract RGB from RGBA */

+      GLint img, row, col;

+      for (img = 0; img < srcDepth; img++) {

+         const GLint srcRowStride =

+            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,

+                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            for (col = 0; col < srcWidth; col++) {

+               dstRow[col * 3 + 0] = srcRow[col * 4 + BCOMP];

+               dstRow[col * 3 + 1] = srcRow[col * 4 + GCOMP];

+               dstRow[col * 3 + 2] = srcRow[col * 4 + RCOMP];

+            }

+            dstRow += dstRowStride;

+            srcRow += srcRowStride;

+         }

+      }

+   }

+   else if (!ctx->_ImageTransferState &&

+	    srcType == GL_UNSIGNED_BYTE &&

+	    can_swizzle(baseInternalFormat) &&

+	    can_swizzle(srcFormat)) {

+

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      dstmap[0] = 2;

+      dstmap[1] = 1;

+      dstmap[2] = 0;

+      dstmap[3] = ONE;		/* ? */

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 3,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = (const GLchan *) tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+#if 0

+            if (littleEndian) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstRow[col * 3 + 0] = CHAN_TO_UBYTE(src[RCOMP]);

+                  dstRow[col * 3 + 1] = CHAN_TO_UBYTE(src[GCOMP]);

+                  dstRow[col * 3 + 2] = CHAN_TO_UBYTE(src[BCOMP]);

+                  srcUB += 3;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstRow[col * 3 + 0] = srcUB[BCOMP];

+                  dstRow[col * 3 + 1] = srcUB[GCOMP];

+                  dstRow[col * 3 + 2] = srcUB[RCOMP];

+                  srcUB += 3;

+               }

+            }

+#else

+            for (col = 0; col < srcWidth; col++) {

+               dstRow[col * 3 + 0] = CHAN_TO_UBYTE(src[BCOMP]);

+               dstRow[col * 3 + 1] = CHAN_TO_UBYTE(src[GCOMP]);

+               dstRow[col * 3 + 2] = CHAN_TO_UBYTE(src[RCOMP]);

+               src += 3;

+            }

+#endif

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_bgr888(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_BGR888);

+   ASSERT(texelBytes == 3);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_RGB &&

+       srcFormat == GL_RGB &&

+       srcType == GL_UNSIGNED_BYTE &&

+       littleEndian) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+            !srcPacking->SwapBytes &&

+            srcFormat == GL_RGBA &&

+            srcType == GL_UNSIGNED_BYTE) {

+      /* extract BGR from RGBA */

+      int img, row, col;

+      for (img = 0; img < srcDepth; img++) {

+         const GLint srcRowStride =

+            _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);

+         GLubyte *srcRow = (GLubyte *) _mesa_image_address(dims, srcPacking,

+                  srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, 0, 0);

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            for (col = 0; col < srcWidth; col++) {

+               dstRow[col * 3 + 0] = srcRow[col * 4 + RCOMP];

+               dstRow[col * 3 + 1] = srcRow[col * 4 + GCOMP];

+               dstRow[col * 3 + 2] = srcRow[col * 4 + BCOMP];

+            }

+            dstRow += dstRowStride;

+            srcRow += srcRowStride;

+         }

+      }

+   }

+   else if (!ctx->_ImageTransferState &&

+	    srcType == GL_UNSIGNED_BYTE &&

+	    can_swizzle(baseInternalFormat) &&

+	    can_swizzle(srcFormat)) {

+

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      dstmap[0] = 0;

+      dstmap[1] = 1;

+      dstmap[2] = 2;

+      dstmap[3] = ONE;		/* ? */

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 3,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }   

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = (const GLchan *) tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            for (col = 0; col < srcWidth; col++) {

+               dstRow[col * 3 + 0] = CHAN_TO_UBYTE(src[RCOMP]);

+               dstRow[col * 3 + 1] = CHAN_TO_UBYTE(src[GCOMP]);

+               dstRow[col * 3 + 2] = CHAN_TO_UBYTE(src[BCOMP]);

+               src += 3;

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_argb4444(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_ARGB4444 ||

+          dstFormat == MESA_FORMAT_ARGB4444_REV);

+   ASSERT(texelBytes == 2);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_ARGB4444 &&

+       baseInternalFormat == GL_RGBA &&

+       srcFormat == GL_BGRA &&

+       srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+            if (dstFormat == MESA_FORMAT_ARGB4444) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_4444( CHAN_TO_UBYTE(src[ACOMP]),

+                                                CHAN_TO_UBYTE(src[RCOMP]),

+                                                CHAN_TO_UBYTE(src[GCOMP]),

+                                                CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_4444_REV( CHAN_TO_UBYTE(src[ACOMP]),

+                                                    CHAN_TO_UBYTE(src[RCOMP]),

+                                                    CHAN_TO_UBYTE(src[GCOMP]),

+                                                    CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+static GLboolean

+_mesa_texstore_rgba5551(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA5551);

+   ASSERT(texelBytes == 2);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_RGBA5551 &&

+       baseInternalFormat == GL_RGBA &&

+       srcFormat == GL_RGBA &&

+       srcType == GL_UNSIGNED_SHORT_5_5_5_1) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src =tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+	    for (col = 0; col < srcWidth; col++) {

+	       dstUS[col] = PACK_COLOR_5551( CHAN_TO_UBYTE(src[RCOMP]),

+					     CHAN_TO_UBYTE(src[GCOMP]),

+					     CHAN_TO_UBYTE(src[BCOMP]),

+					     CHAN_TO_UBYTE(src[ACOMP]) );

+	      src += 4;

+	    }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+static GLboolean

+_mesa_texstore_argb1555(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_ARGB1555 ||

+          dstFormat == MESA_FORMAT_ARGB1555_REV);

+   ASSERT(texelBytes == 2);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_ARGB1555 &&

+       baseInternalFormat == GL_RGBA &&

+       srcFormat == GL_BGRA &&

+       srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src =tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+            if (dstFormat == MESA_FORMAT_ARGB1555) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_1555( CHAN_TO_UBYTE(src[ACOMP]),

+                                                CHAN_TO_UBYTE(src[RCOMP]),

+                                                CHAN_TO_UBYTE(src[GCOMP]),

+                                                CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_1555_REV( CHAN_TO_UBYTE(src[ACOMP]),

+                                                    CHAN_TO_UBYTE(src[RCOMP]),

+                                                    CHAN_TO_UBYTE(src[GCOMP]),

+                                                    CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_argb2101010(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_ARGB2101010);

+   ASSERT(texelBytes == 4);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_ARGB2101010 &&

+       srcFormat == GL_BGRA &&

+       srcType == GL_UNSIGNED_INT_2_10_10_10_REV &&

+       baseInternalFormat == GL_RGBA) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         if (baseInternalFormat == GL_RGBA) {

+            for (row = 0; row < srcHeight; row++) {

+               GLuint *dstUS = (GLuint *) dstRow;

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_2101010( CHAN_TO_UBYTE(src[ACOMP]),

+                                                   CHAN_TO_UBYTE(src[RCOMP]),

+                                                   CHAN_TO_UBYTE(src[GCOMP]),

+                                                   CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+               dstRow += dstRowStride;

+            }

+         } else if (baseInternalFormat == GL_RGB) {

+            for (row = 0; row < srcHeight; row++) {

+               GLuint *dstUS = (GLuint *) dstRow;

+               for (col = 0; col < srcWidth; col++) {

+                  dstUS[col] = PACK_COLOR_2101010( 0xff,

+                                                   CHAN_TO_UBYTE(src[RCOMP]),

+                                                   CHAN_TO_UBYTE(src[GCOMP]),

+                                                   CHAN_TO_UBYTE(src[BCOMP]) );

+                  src += 4;

+               }

+               dstRow += dstRowStride;

+            }

+         } else {

+            ASSERT(0);

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Do texstore for 2-channel, 4-bit/channel, unsigned normalized formats.

+ */

+static GLboolean

+_mesa_texstore_unorm44(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_AL44);

+   ASSERT(texelBytes == 1);

+

+   {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLubyte *dstUS = (GLubyte *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               /* src[0] is luminance, src[1] is alpha */

+               dstUS[col] = PACK_COLOR_44( CHAN_TO_UBYTE(src[1]),

+                                           CHAN_TO_UBYTE(src[0]) );

+               src += 2;

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Do texstore for 2-channel, 8-bit/channel, unsigned normalized formats.

+ */

+static GLboolean

+_mesa_texstore_unorm88(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_AL88 ||

+          dstFormat == MESA_FORMAT_AL88_REV ||

+          dstFormat == MESA_FORMAT_RG88 ||

+          dstFormat == MESA_FORMAT_RG88_REV);

+   ASSERT(texelBytes == 2);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       (dstFormat == MESA_FORMAT_AL88 || dstFormat == MESA_FORMAT_RG88) &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_BYTE &&

+       littleEndian) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+	    littleEndian &&

+	    srcType == GL_UNSIGNED_BYTE &&

+	    can_swizzle(baseInternalFormat) &&

+	    can_swizzle(srcFormat)) {

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      if (dstFormat == MESA_FORMAT_AL88 || dstFormat == MESA_FORMAT_AL88_REV) {

+	 if ((littleEndian && dstFormat == MESA_FORMAT_AL88) ||

+	     (!littleEndian && dstFormat == MESA_FORMAT_AL88_REV)) {

+	    dstmap[0] = 0;

+	    dstmap[1] = 3;

+	 }

+	 else {

+	    dstmap[0] = 3;

+	    dstmap[1] = 0;

+	 }

+      }

+      else {

+	 if ((littleEndian && dstFormat == MESA_FORMAT_RG88) ||

+	     (!littleEndian && dstFormat == MESA_FORMAT_RG88_REV)) {

+	    dstmap[0] = 0;

+	    dstmap[1] = 1;

+	 }

+	 else {

+	    dstmap[0] = 1;

+	    dstmap[1] = 0;

+	 }

+      }

+      dstmap[2] = ZERO;		/* ? */

+      dstmap[3] = ONE;		/* ? */

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 2,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }   

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+            if (dstFormat == MESA_FORMAT_AL88 ||

+		dstFormat == MESA_FORMAT_RG88) {

+               for (col = 0; col < srcWidth; col++) {

+                  /* src[0] is luminance, src[1] is alpha */

+                 dstUS[col] = PACK_COLOR_88( CHAN_TO_UBYTE(src[1]),

+                                             CHAN_TO_UBYTE(src[0]) );

+                 src += 2;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  /* src[0] is luminance, src[1] is alpha */

+                 dstUS[col] = PACK_COLOR_88_REV( CHAN_TO_UBYTE(src[1]),

+                                                 CHAN_TO_UBYTE(src[0]) );

+                 src += 2;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Do texstore for 2-channel, 16-bit/channel, unsigned normalized formats.

+ */

+static GLboolean

+_mesa_texstore_unorm1616(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_AL1616 ||

+          dstFormat == MESA_FORMAT_AL1616_REV ||

+	  dstFormat == MESA_FORMAT_RG1616 ||

+          dstFormat == MESA_FORMAT_RG1616_REV);

+   ASSERT(texelBytes == 4);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       (dstFormat == MESA_FORMAT_AL1616 || dstFormat == MESA_FORMAT_RG1616) &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_SHORT &&

+       littleEndian) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *dstUI = (GLuint *) dstRow;

+            if (dstFormat == MESA_FORMAT_AL1616 ||

+		dstFormat == MESA_FORMAT_RG1616) {

+               for (col = 0; col < srcWidth; col++) {

+		  GLushort l, a;

+

+		  UNCLAMPED_FLOAT_TO_USHORT(l, src[0]);

+		  UNCLAMPED_FLOAT_TO_USHORT(a, src[1]);

+		  dstUI[col] = PACK_COLOR_1616(a, l);

+		  src += 2;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+		  GLushort l, a;

+

+		  UNCLAMPED_FLOAT_TO_USHORT(l, src[0]);

+		  UNCLAMPED_FLOAT_TO_USHORT(a, src[1]);

+		  dstUI[col] = PACK_COLOR_1616_REV(a, l);

+		  src += 2;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* Texstore for R16, A16, L16, I16. */

+static GLboolean

+_mesa_texstore_unorm16(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_R16 ||

+          dstFormat == MESA_FORMAT_A16 ||

+          dstFormat == MESA_FORMAT_L16 ||

+          dstFormat == MESA_FORMAT_I16);

+   ASSERT(texelBytes == 2);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_SHORT &&

+       littleEndian) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+	    for (col = 0; col < srcWidth; col++) {

+	       GLushort r;

+

+	       UNCLAMPED_FLOAT_TO_USHORT(r, src[0]);

+	       dstUS[col] = r;

+	       src += 1;

+	    }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_rgba_16(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_16);

+   ASSERT(texelBytes == 8);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_RGBA &&

+       srcFormat == GL_RGBA &&

+       srcType == GL_UNSIGNED_SHORT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               GLushort r, g, b, a;

+

+               UNCLAMPED_FLOAT_TO_USHORT(r, src[0]);

+               UNCLAMPED_FLOAT_TO_USHORT(g, src[1]);

+               UNCLAMPED_FLOAT_TO_USHORT(b, src[2]);

+               UNCLAMPED_FLOAT_TO_USHORT(a, src[3]);

+               dstUS[col*4+0] = r;

+               dstUS[col*4+1] = g;

+               dstUS[col*4+2] = b;

+               dstUS[col*4+3] = a;

+               src += 4;

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_R_16 ||

+          dstFormat == MESA_FORMAT_SIGNED_RG_16 ||

+          dstFormat == MESA_FORMAT_SIGNED_RGB_16 ||

+          dstFormat == MESA_FORMAT_SIGNED_RGBA_16);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_RGBA &&

+       dstFormat == MESA_FORMAT_SIGNED_RGBA_16 &&

+       srcFormat == GL_RGBA &&

+       srcType == GL_SHORT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *src = tempImage;

+      const GLuint comps = _mesa_get_format_bytes(dstFormat) / 2;

+      GLint img, row, col;

+

+      if (!tempImage)

+         return GL_FALSE;

+

+      /* Note: tempImage is always float[4] / RGBA.  We convert to 1, 2,

+       * 3 or 4 components/pixel here.

+       */

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLshort *dstRowS = (GLshort *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               GLuint c;

+               for (c = 0; c < comps; c++) {

+                  GLshort p;

+                  UNCLAMPED_FLOAT_TO_SHORT(p, src[col * 4 + c]);

+                  dstRowS[col * comps + c] = p;

+               }

+            }

+            dstRow += dstRowStride;

+            src += 4 * srcWidth;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+_mesa_texstore_rgb332(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGB332);

+   ASSERT(texelBytes == 1);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == GL_RGB &&

+       srcFormat == GL_RGB && srcType == GL_UNSIGNED_BYTE_3_3_2) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            for (col = 0; col < srcWidth; col++) {

+               dstRow[col] = PACK_COLOR_332( CHAN_TO_UBYTE(src[RCOMP]),

+                                             CHAN_TO_UBYTE(src[GCOMP]),

+                                             CHAN_TO_UBYTE(src[BCOMP]) );

+               src += 3;

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Texstore for _mesa_texformat_a8, _mesa_texformat_l8, _mesa_texformat_i8.

+ */

+static GLboolean

+_mesa_texstore_a8(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_A8 ||

+          dstFormat == MESA_FORMAT_L8 ||

+          dstFormat == MESA_FORMAT_I8 ||

+          dstFormat == MESA_FORMAT_R8);

+   ASSERT(texelBytes == 1);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_BYTE) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+	    srcType == GL_UNSIGNED_BYTE &&

+	    can_swizzle(baseInternalFormat) &&

+	    can_swizzle(srcFormat)) {

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      if (dstFormat == MESA_FORMAT_A8) {

+	 dstmap[0] = 3;

+      }

+      else {

+	 dstmap[0] = 0;

+      }

+      dstmap[1] = ZERO;		/* ? */

+      dstmap[2] = ZERO;		/* ? */

+      dstmap[3] = ONE;		/* ? */

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 1,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }   

+   else {

+      /* general path */

+      const GLchan *tempImage = _mesa_make_temp_chan_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking);

+      const GLchan *src = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            for (col = 0; col < srcWidth; col++) {

+               dstRow[col] = CHAN_TO_UBYTE(src[col]);

+            }

+            dstRow += dstRowStride;

+            src += srcWidth;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+

+static GLboolean

+_mesa_texstore_ci8(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+

+   (void) dims; (void) baseInternalFormat;

+   ASSERT(dstFormat == MESA_FORMAT_CI8);

+   ASSERT(texelBytes == 1);

+   ASSERT(baseInternalFormat == GL_COLOR_INDEX);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       srcFormat == GL_COLOR_INDEX &&

+       srcType == GL_UNSIGNED_BYTE) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            const GLvoid *src = _mesa_image_address(dims, srcPacking,

+                srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0);

+            _mesa_unpack_index_span(ctx, srcWidth, GL_UNSIGNED_BYTE, dstRow,

+                                    srcType, src, srcPacking,

+                                    ctx->_ImageTransferState);

+            dstRow += dstRowStride;

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Texstore for _mesa_texformat_ycbcr or _mesa_texformat_ycbcr_REV.

+ */

+static GLboolean

+_mesa_texstore_ycbcr(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+

+   (void) ctx; (void) dims; (void) baseInternalFormat;

+

+   ASSERT((dstFormat == MESA_FORMAT_YCBCR) ||

+          (dstFormat == MESA_FORMAT_YCBCR_REV));

+   ASSERT(texelBytes == 2);

+   ASSERT(ctx->Extensions.MESA_ycbcr_texture);

+   ASSERT(srcFormat == GL_YCBCR_MESA);

+   ASSERT((srcType == GL_UNSIGNED_SHORT_8_8_MESA) ||

+          (srcType == GL_UNSIGNED_SHORT_8_8_REV_MESA));

+   ASSERT(baseInternalFormat == GL_YCBCR_MESA);

+

+   /* always just memcpy since no pixel transfer ops apply */

+   memcpy_texture(ctx, dims,

+                  dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                  dstRowStride,

+                  dstImageOffsets,

+                  srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                  srcAddr, srcPacking);

+

+   /* Check if we need byte swapping */

+   /* XXX the logic here _might_ be wrong */

+   if (srcPacking->SwapBytes ^

+       (srcType == GL_UNSIGNED_SHORT_8_8_REV_MESA) ^

+       (dstFormat == MESA_FORMAT_YCBCR_REV) ^

+       !littleEndian) {

+      GLint img, row;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            _mesa_swap2((GLushort *) dstRow, srcWidth);

+            dstRow += dstRowStride;

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+static GLboolean

+_mesa_texstore_dudv8(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_DUDV8);

+   ASSERT(texelBytes == 2);

+   ASSERT(ctx->Extensions.ATI_envmap_bumpmap);

+   ASSERT((srcFormat == GL_DU8DV8_ATI) ||

+	  (srcFormat == GL_DUDV_ATI));

+   ASSERT(baseInternalFormat == GL_DUDV_ATI);

+

+   if (!srcPacking->SwapBytes && srcType == GL_BYTE &&

+       littleEndian) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (srcType == GL_BYTE) {

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      if (littleEndian) {

+	 dstmap[0] = 0;

+	 dstmap[1] = 3;

+      }

+      else {

+	 dstmap[0] = 3;

+	 dstmap[1] = 0;

+      }

+      dstmap[2] = ZERO;		/* ? */

+      dstmap[3] = ONE;		/* ? */

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				GL_LUMINANCE_ALPHA, /* hack */

+				GL_UNSIGNED_BYTE, /* hack */

+				GL_LUMINANCE_ALPHA, /* hack */

+				dstmap, 2,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }   

+   else {

+      /* general path - note this is defined for 2d textures only */

+      const GLint components = _mesa_components_in_format(baseInternalFormat);

+      const GLint srcStride = _mesa_image_row_stride(srcPacking, srcWidth,

+                                                     srcFormat, srcType);

+      GLbyte *tempImage, *dst, *src;

+      GLint row;

+

+      tempImage = (GLbyte *) malloc(srcWidth * srcHeight * srcDepth

+                                          * components * sizeof(GLbyte));

+      if (!tempImage)

+         return GL_FALSE;

+

+      src = (GLbyte *) _mesa_image_address(dims, srcPacking, srcAddr,

+                                           srcWidth, srcHeight,

+                                           srcFormat, srcType,

+                                           0, 0, 0);

+

+      dst = tempImage;

+      for (row = 0; row < srcHeight; row++) {

+         _mesa_unpack_dudv_span_byte(ctx, srcWidth, baseInternalFormat,

+                                     dst, srcFormat, srcType, src,

+                                     srcPacking, 0);

+         dst += srcWidth * components;

+         src += srcStride;

+      }

+ 

+      src = tempImage;

+      dst = (GLbyte *) dstAddr

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+      for (row = 0; row < srcHeight; row++) {

+         memcpy(dst, src, srcWidth * texelBytes);

+         dst += dstRowStride;

+         src += srcWidth * texelBytes;

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a texture in MESA_FORMAT_SIGNED_R8 format.

+ */

+static GLboolean

+_mesa_texstore_signed_r8(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_R8);

+   ASSERT(texelBytes == 1);

+

+   /* XXX look at adding optimized paths */

+   {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *srcRow = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLubyte *dstB = (GLubyte *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               dstB[col] = FLOAT_TO_BYTE_TEX(srcRow[RCOMP]);

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a texture in MESA_FORMAT_SIGNED_RG88 format.

+ */

+static GLboolean

+_mesa_texstore_signed_rg88(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG88);

+   ASSERT(texelBytes == 1);

+

+   /* XXX look at adding optimized paths */

+   {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *srcRow = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstUS = (GLushort *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               dstUS[col] = PACK_COLOR_88(FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),

+                                          FLOAT_TO_BYTE_TEX(srcRow[GCOMP]));

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a texture in MESA_FORMAT_SIGNED_RGBX8888.

+ */

+static GLboolean

+_mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RGBX8888);

+   ASSERT(texelBytes == 4);

+

+   {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *srcRow = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *dstUI = (GLuint *) dstRow;

+            for (col = 0; col < srcWidth; col++) {

+               dstUI[col] = PACK_COLOR_8888( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),

+                                             FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),

+                                             FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),

+                                             0xff );

+               srcRow += 4;

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+

+/**

+ * Store a texture in MESA_FORMAT_SIGNED_RGBA8888 or

+ * MESA_FORMAT_SIGNED_RGBA8888_REV

+ */

+static GLboolean

+_mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)

+{

+   const GLboolean littleEndian = _mesa_little_endian();

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RGBA8888 ||

+          dstFormat == MESA_FORMAT_SIGNED_RGBA8888_REV);

+   ASSERT(texelBytes == 4);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_SIGNED_RGBA8888 &&

+       baseInternalFormat == GL_RGBA &&

+      ((srcFormat == GL_RGBA && srcType == GL_BYTE && !littleEndian) ||

+       (srcFormat == GL_ABGR_EXT && srcType == GL_BYTE && littleEndian))) {

+       /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       dstFormat == MESA_FORMAT_SIGNED_RGBA8888_REV &&

+       baseInternalFormat == GL_RGBA &&

+      ((srcFormat == GL_RGBA && srcType == GL_BYTE && littleEndian) ||

+       (srcFormat == GL_ABGR_EXT && srcType == GL_BYTE && !littleEndian))) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (!ctx->_ImageTransferState &&

+	    (srcType == GL_BYTE) &&

+	    can_swizzle(baseInternalFormat) &&

+	    can_swizzle(srcFormat)) {

+

+      GLubyte dstmap[4];

+

+      /* dstmap - how to swizzle from RGBA to dst format:

+       */

+      if ((littleEndian && dstFormat == MESA_FORMAT_SIGNED_RGBA8888) ||

+	  (!littleEndian && dstFormat == MESA_FORMAT_SIGNED_RGBA8888_REV)) {

+	 dstmap[3] = 0;

+	 dstmap[2] = 1;

+	 dstmap[1] = 2;

+	 dstmap[0] = 3;

+      }

+      else {

+	 dstmap[3] = 3;

+	 dstmap[2] = 2;

+	 dstmap[1] = 1;

+	 dstmap[0] = 0;

+      }

+      

+      _mesa_swizzle_ubyte_image(ctx, dims,

+				srcFormat,

+				srcType,

+				baseInternalFormat,

+				dstmap, 4,

+				dstAddr, dstXoffset, dstYoffset, dstZoffset,

+				dstRowStride, dstImageOffsets,

+				srcWidth, srcHeight, srcDepth, srcAddr,

+				srcPacking);      

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *srcRow = tempImage;

+      GLint img, row, col;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *dstUI = (GLuint *) dstRow;

+            if (dstFormat == MESA_FORMAT_SIGNED_RGBA8888) {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),

+                                                FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),

+                                                FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),

+                                                FLOAT_TO_BYTE_TEX(srcRow[ACOMP]) );

+                  srcRow += 4;

+               }

+            }

+            else {

+               for (col = 0; col < srcWidth; col++) {

+                  dstUI[col] = PACK_COLOR_8888_REV( FLOAT_TO_BYTE_TEX(srcRow[RCOMP]),

+                                                    FLOAT_TO_BYTE_TEX(srcRow[GCOMP]),

+                                                    FLOAT_TO_BYTE_TEX(srcRow[BCOMP]),

+                                                    FLOAT_TO_BYTE_TEX(srcRow[ACOMP]) );

+                  srcRow += 4;

+               }

+            }

+            dstRow += dstRowStride;

+         }

+      }

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a combined depth/stencil texture image.

+ */

+static GLboolean

+_mesa_texstore_z24_s8(TEXSTORE_PARAMS)

+{

+   const GLuint depthScale = 0xffffff;

+   const GLint srcRowStride

+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)

+      / sizeof(GLuint);

+   GLint img, row;

+

+   ASSERT(dstFormat == MESA_FORMAT_Z24_S8);

+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);

+   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);

+

+   if (srcFormat != GL_DEPTH_COMPONENT && ctx->Pixel.DepthScale == 1.0f &&

+       ctx->Pixel.DepthBias == 0.0f &&

+       !srcPacking->SwapBytes) {

+      /* simple path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else if (srcFormat == GL_DEPTH_COMPONENT) {

+      /* In case we only upload depth we need to preserve the stencil */

+      for (img = 0; img < srcDepth; img++) {

+	 GLuint *dstRow = (GLuint *) dstAddr

+            + dstImageOffsets[dstZoffset + img]

+            + dstYoffset * dstRowStride / sizeof(GLuint)

+            + dstXoffset;

+         const GLuint *src

+            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,

+                  srcWidth, srcHeight,

+                  srcFormat, srcType,

+                  img, 0, 0);

+         for (row = 0; row < srcHeight; row++) {

+            GLuint depth[MAX_WIDTH];

+	    GLubyte stencil[MAX_WIDTH];

+            GLint i;

+	    GLboolean keepdepth = GL_FALSE, keepstencil = GL_FALSE;

+

+	    if (srcFormat == GL_DEPTH_COMPONENT) { /* preserve stencil */

+	       keepstencil = GL_TRUE;

+	    }

+            else if (srcFormat == GL_STENCIL_INDEX) { /* preserve depth */

+	       keepdepth = GL_TRUE;

+	    }

+

+	    if (keepdepth == GL_FALSE)

+	       /* the 24 depth bits will be in the low position: */

+	       _mesa_unpack_depth_span(ctx, srcWidth,

+				       GL_UNSIGNED_INT, /* dst type */

+				       keepstencil ? depth : dstRow, /* dst addr */

+				       depthScale,

+				       srcType, src, srcPacking);

+

+	    if (keepstencil == GL_FALSE)

+	       /* get the 8-bit stencil values */

+	       _mesa_unpack_stencil_span(ctx, srcWidth,

+					 GL_UNSIGNED_BYTE, /* dst type */

+					 stencil, /* dst addr */

+					 srcType, src, srcPacking,

+					 ctx->_ImageTransferState);

+

+	    for (i = 0; i < srcWidth; i++) {

+	       if (keepstencil)

+		  dstRow[i] = depth[i] << 8 | (dstRow[i] & 0x000000FF);

+	       else

+		  dstRow[i] = (dstRow[i] & 0xFFFFFF00) | (stencil[i] & 0xFF);

+	    }

+

+            src += srcRowStride;

+            dstRow += dstRowStride / sizeof(GLuint);

+         }

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store a combined depth/stencil texture image.

+ */

+static GLboolean

+_mesa_texstore_s8_z24(TEXSTORE_PARAMS)

+{

+   const GLuint depthScale = 0xffffff;

+   const GLint srcRowStride

+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)

+      / sizeof(GLuint);

+   GLint img, row;

+

+   ASSERT(dstFormat == MESA_FORMAT_S8_Z24);

+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT ||

+          srcFormat == GL_DEPTH_COMPONENT ||

+          srcFormat == GL_STENCIL_INDEX);

+   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT ||

+          srcType == GL_UNSIGNED_INT_24_8_EXT);

+

+   for (img = 0; img < srcDepth; img++) {

+      GLuint *dstRow = (GLuint *) dstAddr

+	 + dstImageOffsets[dstZoffset + img]

+	 + dstYoffset * dstRowStride / sizeof(GLuint)

+	 + dstXoffset;

+      const GLuint *src

+	 = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,

+						srcWidth, srcHeight,

+						srcFormat, srcType,

+						img, 0, 0);

+      for (row = 0; row < srcHeight; row++) {

+	 GLuint depth[MAX_WIDTH];

+	 GLubyte stencil[MAX_WIDTH];

+	 GLint i;

+	 GLboolean keepdepth = GL_FALSE, keepstencil = GL_FALSE;

+	 

+	 if (srcFormat == GL_DEPTH_COMPONENT) { /* preserve stencil */

+	    keepstencil = GL_TRUE;

+	 }

+         else if (srcFormat == GL_STENCIL_INDEX) { /* preserve depth */

+	    keepdepth = GL_TRUE;

+	 }

+

+	 if (keepdepth == GL_FALSE)

+	    /* the 24 depth bits will be in the low position: */

+	    _mesa_unpack_depth_span(ctx, srcWidth,

+				    GL_UNSIGNED_INT, /* dst type */

+				    keepstencil ? depth : dstRow, /* dst addr */

+				    depthScale,

+				    srcType, src, srcPacking);	 

+

+	 if (keepstencil == GL_FALSE)

+	    /* get the 8-bit stencil values */

+	    _mesa_unpack_stencil_span(ctx, srcWidth,

+				      GL_UNSIGNED_BYTE, /* dst type */

+				      stencil, /* dst addr */

+				      srcType, src, srcPacking,

+				      ctx->_ImageTransferState);

+

+	 /* merge stencil values into depth values */

+	 for (i = 0; i < srcWidth; i++) {

+	    if (keepstencil)

+	       dstRow[i] = depth[i] | (dstRow[i] & 0xFF000000);

+	    else

+	       dstRow[i] = (dstRow[i] & 0xFFFFFF) | (stencil[i] << 24);

+

+	 }

+	 src += srcRowStride;

+	 dstRow += dstRowStride / sizeof(GLuint);

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Store simple 8-bit/value stencil texture data.

+ */

+static GLboolean

+_mesa_texstore_s8(TEXSTORE_PARAMS)

+{

+   ASSERT(dstFormat == MESA_FORMAT_S8);

+   ASSERT(srcFormat == GL_STENCIL_INDEX);

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_BYTE) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      const GLint srcRowStride

+	 = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)

+	 / sizeof(GLuint);

+      GLint img, row;

+      

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img]

+            + dstYoffset * dstRowStride / sizeof(GLuint)

+            + dstXoffset;

+         const GLuint *src

+            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,

+                                                   srcWidth, srcHeight,

+                                                   srcFormat, srcType,

+                                                   img, 0, 0);

+         for (row = 0; row < srcHeight; row++) {

+            GLubyte stencil[MAX_WIDTH];

+            GLint i;

+

+            /* get the 8-bit stencil values */

+            _mesa_unpack_stencil_span(ctx, srcWidth,

+                                      GL_UNSIGNED_BYTE, /* dst type */

+                                      stencil, /* dst addr */

+                                      srcType, src, srcPacking,

+                                      ctx->_ImageTransferState);

+            /* merge stencil values into depth values */

+            for (i = 0; i < srcWidth; i++)

+               dstRow[i] = stencil[i];

+

+            src += srcRowStride;

+            dstRow += dstRowStride / sizeof(GLubyte);

+         }

+      }

+

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Store an image in any of the formats:

+ *   _mesa_texformat_rgba_float32

+ *   _mesa_texformat_rgb_float32

+ *   _mesa_texformat_alpha_float32

+ *   _mesa_texformat_luminance_float32

+ *   _mesa_texformat_luminance_alpha_float32

+ *   _mesa_texformat_intensity_float32

+ */

+static GLboolean

+_mesa_texstore_rgba_float32(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT32 ||

+          dstFormat == MESA_FORMAT_RGB_FLOAT32 ||

+          dstFormat == MESA_FORMAT_ALPHA_FLOAT32 ||

+          dstFormat == MESA_FORMAT_LUMINANCE_FLOAT32 ||

+          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 ||

+          dstFormat == MESA_FORMAT_INTENSITY_FLOAT32);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLfloat));

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_FLOAT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *srcRow = tempImage;

+      GLint bytesPerRow;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      bytesPerRow = srcWidth * components * sizeof(GLfloat);

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            memcpy(dstRow, srcRow, bytesPerRow);

+            dstRow += dstRowStride;

+            srcRow += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+

+/**

+ * As above, but store 16-bit floats.

+ */

+static GLboolean

+_mesa_texstore_rgba_float16(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT16 ||

+          dstFormat == MESA_FORMAT_RGB_FLOAT16 ||

+          dstFormat == MESA_FORMAT_ALPHA_FLOAT16 ||

+          dstFormat == MESA_FORMAT_LUMINANCE_FLOAT16 ||

+          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 ||

+          dstFormat == MESA_FORMAT_INTENSITY_FLOAT16);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLhalfARB));

+

+   if (!ctx->_ImageTransferState &&

+       !srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_HALF_FLOAT_ARB) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking,

+                                                 ctx->_ImageTransferState);

+      const GLfloat *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLhalfARB *dstTexel = (GLhalfARB *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = _mesa_float_to_half(src[i]);

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* non-normalized, signed int8 */

+static GLboolean

+_mesa_texstore_rgba_int8(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT8);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLbyte));

+

+   /* Note: Pixel transfer ops (scale, bias, table lookup) do not apply

+    * to integer formats.

+    */

+   if (!srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_BYTE) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking, 0x0);

+      const GLfloat *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLbyte *dstTexel = (GLbyte *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = (GLbyte) src[i];

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* non-normalized, signed int16 */

+static GLboolean

+_mesa_texstore_rgba_int16(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT16);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLshort));

+

+   /* Note: Pixel transfer ops (scale, bias, table lookup) do not apply

+    * to integer formats.

+    */

+   if (!srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_SHORT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking, 0x0);

+      const GLfloat *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLshort *dstTexel = (GLshort *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = (GLint) src[i];

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* non-normalized, signed int32 */

+static GLboolean

+_mesa_texstore_rgba_int32(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_INT32);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLint));

+

+   /* Note: Pixel transfer ops (scale, bias, table lookup) do not apply

+    * to integer formats.

+    */

+   if (!srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_INT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+                                                 baseInternalFormat,

+                                                 baseFormat,

+                                                 srcWidth, srcHeight, srcDepth,

+                                                 srcFormat, srcType, srcAddr,

+                                                 srcPacking, 0x0);

+      const GLfloat *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLint *dstTexel = (GLint *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = (GLint) src[i];

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* non-normalized, unsigned int8 */

+static GLboolean

+_mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT8);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLubyte));

+

+   /* Note: Pixel transfer ops (scale, bias, table lookup) do not apply

+    * to integer formats.

+    */

+   if (!srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_BYTE) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLuint *tempImage =

+         make_temp_uint_image(ctx, dims, baseInternalFormat, baseFormat,

+                              srcWidth, srcHeight, srcDepth,

+                              srcFormat, srcType, srcAddr, srcPacking);

+      const GLuint *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLubyte *dstTexel = (GLubyte *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = (GLubyte) CLAMP(src[i], 0, 0xff);

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* non-normalized, unsigned int16 */

+static GLboolean

+_mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT16);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLushort));

+

+   /* Note: Pixel transfer ops (scale, bias, table lookup) do not apply

+    * to integer formats.

+    */

+   if (!srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_SHORT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLuint *tempImage =

+         make_temp_uint_image(ctx, dims, baseInternalFormat, baseFormat,

+                              srcWidth, srcHeight, srcDepth,

+                              srcFormat, srcType, srcAddr, srcPacking);

+      const GLuint *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLushort *dstTexel = (GLushort *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = (GLushort) CLAMP(src[i], 0, 0xffff);

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+/* non-normalized, unsigned int32 */

+static GLboolean

+_mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)

+{

+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);

+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);

+   const GLint components = _mesa_components_in_format(baseFormat);

+

+   ASSERT(dstFormat == MESA_FORMAT_RGBA_UINT32);

+   ASSERT(baseInternalFormat == GL_RGBA ||

+          baseInternalFormat == GL_RGB ||

+          baseInternalFormat == GL_ALPHA ||

+          baseInternalFormat == GL_LUMINANCE ||

+          baseInternalFormat == GL_LUMINANCE_ALPHA ||

+          baseInternalFormat == GL_INTENSITY);

+   ASSERT(texelBytes == components * sizeof(GLuint));

+

+   /* Note: Pixel transfer ops (scale, bias, table lookup) do not apply

+    * to integer formats.

+    */

+   if (!srcPacking->SwapBytes &&

+       baseInternalFormat == srcFormat &&

+       srcType == GL_UNSIGNED_INT) {

+      /* simple memcpy path */

+      memcpy_texture(ctx, dims,

+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                     dstRowStride,

+                     dstImageOffsets,

+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,

+                     srcAddr, srcPacking);

+   }

+   else {

+      /* general path */

+      const GLuint *tempImage =

+         make_temp_uint_image(ctx, dims, baseInternalFormat, baseFormat,

+                              srcWidth, srcHeight, srcDepth,

+                              srcFormat, srcType, srcAddr, srcPacking);

+      const GLuint *src = tempImage;

+      GLint img, row;

+      if (!tempImage)

+         return GL_FALSE;

+      for (img = 0; img < srcDepth; img++) {

+         GLubyte *dstRow = (GLubyte *) dstAddr

+            + dstImageOffsets[dstZoffset + img] * texelBytes

+            + dstYoffset * dstRowStride

+            + dstXoffset * texelBytes;

+         for (row = 0; row < srcHeight; row++) {

+            GLuint *dstTexel = (GLuint *) dstRow;

+            GLint i;

+            for (i = 0; i < srcWidth * components; i++) {

+               dstTexel[i] = src[i];

+            }

+            dstRow += dstRowStride;

+            src += srcWidth * components;

+         }

+      }

+

+      free((void *) tempImage);

+   }

+   return GL_TRUE;

+}

+

+

+

+

+#if FEATURE_EXT_texture_sRGB

+static GLboolean

+_mesa_texstore_srgb8(TEXSTORE_PARAMS)

+{

+   gl_format newDstFormat;

+   GLboolean k;

+

+   ASSERT(dstFormat == MESA_FORMAT_SRGB8);

+

+   /* reuse normal rgb texstore code */

+   newDstFormat = MESA_FORMAT_RGB888;

+

+   k = _mesa_texstore_rgb888(ctx, dims, baseInternalFormat,

+                             newDstFormat, dstAddr,

+                             dstXoffset, dstYoffset, dstZoffset,

+                             dstRowStride, dstImageOffsets,

+                             srcWidth, srcHeight, srcDepth,

+                             srcFormat, srcType,

+                             srcAddr, srcPacking);

+   return k;

+}

+

+

+static GLboolean

+_mesa_texstore_srgba8(TEXSTORE_PARAMS)

+{

+   gl_format newDstFormat;

+   GLboolean k;

+

+   ASSERT(dstFormat == MESA_FORMAT_SRGBA8);

+

+   /* reuse normal rgba texstore code */

+   newDstFormat = MESA_FORMAT_RGBA8888;

+   k = _mesa_texstore_rgba8888(ctx, dims, baseInternalFormat,

+                               newDstFormat, dstAddr,

+                               dstXoffset, dstYoffset, dstZoffset,

+                               dstRowStride, dstImageOffsets,

+                               srcWidth, srcHeight, srcDepth,

+                               srcFormat, srcType,

+                               srcAddr, srcPacking);

+   return k;

+}

+

+

+static GLboolean

+_mesa_texstore_sargb8(TEXSTORE_PARAMS)

+{

+   gl_format newDstFormat;

+   GLboolean k;

+

+   ASSERT(dstFormat == MESA_FORMAT_SARGB8);

+

+   /* reuse normal rgba texstore code */

+   newDstFormat = MESA_FORMAT_ARGB8888;

+

+   k = _mesa_texstore_argb8888(ctx, dims, baseInternalFormat,

+                               newDstFormat, dstAddr,

+                               dstXoffset, dstYoffset, dstZoffset,

+                               dstRowStride, dstImageOffsets,

+                               srcWidth, srcHeight, srcDepth,

+                               srcFormat, srcType,

+                               srcAddr, srcPacking);

+   return k;

+}

+

+

+static GLboolean

+_mesa_texstore_sl8(TEXSTORE_PARAMS)

+{

+   gl_format newDstFormat;

+   GLboolean k;

+

+   ASSERT(dstFormat == MESA_FORMAT_SL8);

+

+   newDstFormat = MESA_FORMAT_L8;

+

+   /* _mesa_textore_a8 handles luminance8 too */

+   k = _mesa_texstore_a8(ctx, dims, baseInternalFormat,

+                         newDstFormat, dstAddr,

+                         dstXoffset, dstYoffset, dstZoffset,

+                         dstRowStride, dstImageOffsets,

+                         srcWidth, srcHeight, srcDepth,

+                         srcFormat, srcType,

+                         srcAddr, srcPacking);

+   return k;

+}

+

+

+static GLboolean

+_mesa_texstore_sla8(TEXSTORE_PARAMS)

+{

+   gl_format newDstFormat;

+   GLboolean k;

+

+   ASSERT(dstFormat == MESA_FORMAT_SLA8);

+

+   /* reuse normal luminance/alpha texstore code */

+   newDstFormat = MESA_FORMAT_AL88;

+

+   k = _mesa_texstore_unorm88(ctx, dims, baseInternalFormat,

+			      newDstFormat, dstAddr,

+			      dstXoffset, dstYoffset, dstZoffset,

+			      dstRowStride, dstImageOffsets,

+			      srcWidth, srcHeight, srcDepth,

+			      srcFormat, srcType,

+			      srcAddr, srcPacking);

+   return k;

+}

+

+#else

+

+/* these are used only in texstore_funcs[] below */

+#define _mesa_texstore_srgb8 NULL

+#define _mesa_texstore_srgba8 NULL

+#define _mesa_texstore_sargb8 NULL

+#define _mesa_texstore_sl8 NULL

+#define _mesa_texstore_sla8 NULL

+

+#endif /* FEATURE_EXT_texture_sRGB */

+

+

+

+

+/**

+ * Table mapping MESA_FORMAT_* to _mesa_texstore_*()

+ * XXX this is somewhat temporary.

+ */

+static const struct {

+   gl_format Name;

+   StoreTexImageFunc Store;

+}

+texstore_funcs[MESA_FORMAT_COUNT] =

+{

+   { MESA_FORMAT_NONE, NULL },

+   { MESA_FORMAT_RGBA8888, _mesa_texstore_rgba8888 },

+   { MESA_FORMAT_RGBA8888_REV, _mesa_texstore_rgba8888 },

+   { MESA_FORMAT_ARGB8888, _mesa_texstore_argb8888 },

+   { MESA_FORMAT_ARGB8888_REV, _mesa_texstore_argb8888 },

+   { MESA_FORMAT_XRGB8888, _mesa_texstore_argb8888 },

+   { MESA_FORMAT_XRGB8888_REV, _mesa_texstore_argb8888 },

+   { MESA_FORMAT_RGB888, _mesa_texstore_rgb888 },

+   { MESA_FORMAT_BGR888, _mesa_texstore_bgr888 },

+   { MESA_FORMAT_RGB565, _mesa_texstore_rgb565 },

+   { MESA_FORMAT_RGB565_REV, _mesa_texstore_rgb565 },

+   { MESA_FORMAT_ARGB4444, _mesa_texstore_argb4444 },

+   { MESA_FORMAT_ARGB4444_REV, _mesa_texstore_argb4444 },

+   { MESA_FORMAT_RGBA5551, _mesa_texstore_rgba5551 },

+   { MESA_FORMAT_ARGB1555, _mesa_texstore_argb1555 },

+   { MESA_FORMAT_ARGB1555_REV, _mesa_texstore_argb1555 },

+   { MESA_FORMAT_AL44, _mesa_texstore_unorm44 },

+   { MESA_FORMAT_AL88, _mesa_texstore_unorm88 },

+   { MESA_FORMAT_AL88_REV, _mesa_texstore_unorm88 },

+   { MESA_FORMAT_AL1616, _mesa_texstore_unorm1616 },

+   { MESA_FORMAT_AL1616_REV, _mesa_texstore_unorm1616 },

+   { MESA_FORMAT_RGB332, _mesa_texstore_rgb332 },

+   { MESA_FORMAT_A8, _mesa_texstore_a8 },

+   { MESA_FORMAT_A16, _mesa_texstore_unorm16 },

+   { MESA_FORMAT_L8, _mesa_texstore_a8 },

+   { MESA_FORMAT_L16, _mesa_texstore_unorm16 },

+   { MESA_FORMAT_I8, _mesa_texstore_a8 },

+   { MESA_FORMAT_I16, _mesa_texstore_unorm16 },

+   { MESA_FORMAT_CI8, _mesa_texstore_ci8 },

+   { MESA_FORMAT_YCBCR, _mesa_texstore_ycbcr },

+   { MESA_FORMAT_YCBCR_REV, _mesa_texstore_ycbcr },

+   { MESA_FORMAT_R8, _mesa_texstore_a8 },

+   { MESA_FORMAT_RG88, _mesa_texstore_unorm88 },

+   { MESA_FORMAT_RG88_REV, _mesa_texstore_unorm88 },

+   { MESA_FORMAT_R16, _mesa_texstore_unorm16 },

+   { MESA_FORMAT_RG1616, _mesa_texstore_unorm1616 },

+   { MESA_FORMAT_RG1616_REV, _mesa_texstore_unorm1616 },

+   { MESA_FORMAT_ARGB2101010, _mesa_texstore_argb2101010 },

+   { MESA_FORMAT_Z24_S8, _mesa_texstore_z24_s8 },

+   { MESA_FORMAT_S8_Z24, _mesa_texstore_s8_z24 },

+   { MESA_FORMAT_Z16, _mesa_texstore_z16 },

+   { MESA_FORMAT_X8_Z24, _mesa_texstore_x8_z24 },

+   { MESA_FORMAT_Z24_X8, _mesa_texstore_z24_x8 },

+   { MESA_FORMAT_Z32, _mesa_texstore_z32 },

+   { MESA_FORMAT_S8, _mesa_texstore_s8 },

+   { MESA_FORMAT_SRGB8, _mesa_texstore_srgb8 },

+   { MESA_FORMAT_SRGBA8, _mesa_texstore_srgba8 },

+   { MESA_FORMAT_SARGB8, _mesa_texstore_sargb8 },

+   { MESA_FORMAT_SL8, _mesa_texstore_sl8 },

+   { MESA_FORMAT_SLA8, _mesa_texstore_sla8 },

+   { MESA_FORMAT_SRGB_DXT1, _mesa_texstore_rgb_dxt1 },

+   { MESA_FORMAT_SRGBA_DXT1, _mesa_texstore_rgba_dxt1 },

+   { MESA_FORMAT_SRGBA_DXT3, _mesa_texstore_rgba_dxt3 },

+   { MESA_FORMAT_SRGBA_DXT5, _mesa_texstore_rgba_dxt5 },

+   { MESA_FORMAT_RGB_FXT1, _mesa_texstore_rgb_fxt1 },

+   { MESA_FORMAT_RGBA_FXT1, _mesa_texstore_rgba_fxt1 },

+   { MESA_FORMAT_RGB_DXT1, _mesa_texstore_rgb_dxt1 },

+   { MESA_FORMAT_RGBA_DXT1, _mesa_texstore_rgba_dxt1 },

+   { MESA_FORMAT_RGBA_DXT3, _mesa_texstore_rgba_dxt3 },

+   { MESA_FORMAT_RGBA_DXT5, _mesa_texstore_rgba_dxt5 },

+   { MESA_FORMAT_RGBA_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_RGBA_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_RGB_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_RGB_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_ALPHA_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_ALPHA_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_LUMINANCE_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_LUMINANCE_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16, _mesa_texstore_rgba_float16 },

+   { MESA_FORMAT_INTENSITY_FLOAT32, _mesa_texstore_rgba_float32 },

+   { MESA_FORMAT_INTENSITY_FLOAT16, _mesa_texstore_rgba_float16 },

+

+   { MESA_FORMAT_RGBA_INT8, _mesa_texstore_rgba_int8 },

+   { MESA_FORMAT_RGBA_INT16, _mesa_texstore_rgba_int16 },

+   { MESA_FORMAT_RGBA_INT32, _mesa_texstore_rgba_int32 },

+   { MESA_FORMAT_RGBA_UINT8, _mesa_texstore_rgba_uint8 },

+   { MESA_FORMAT_RGBA_UINT16, _mesa_texstore_rgba_uint16 },

+   { MESA_FORMAT_RGBA_UINT32, _mesa_texstore_rgba_uint32 },

+

+   { MESA_FORMAT_DUDV8, _mesa_texstore_dudv8 },

+

+   { MESA_FORMAT_SIGNED_R8, _mesa_texstore_signed_r8 },

+   { MESA_FORMAT_SIGNED_RG88, _mesa_texstore_signed_rg88 },

+   { MESA_FORMAT_SIGNED_RGBX8888, _mesa_texstore_signed_rgbx8888 },

+

+   { MESA_FORMAT_SIGNED_RGBA8888, _mesa_texstore_signed_rgba8888 },

+   { MESA_FORMAT_SIGNED_RGBA8888_REV, _mesa_texstore_signed_rgba8888 },

+

+   { MESA_FORMAT_SIGNED_R_16, _mesa_texstore_signed_rgba_16 },

+   { MESA_FORMAT_SIGNED_RG_16, _mesa_texstore_signed_rgba_16 },

+   { MESA_FORMAT_SIGNED_RGB_16, _mesa_texstore_signed_rgba_16 },

+   { MESA_FORMAT_SIGNED_RGBA_16, _mesa_texstore_signed_rgba_16 },

+   { MESA_FORMAT_RGBA_16, _mesa_texstore_rgba_16 }

+};

+

+

+static GLboolean

+_mesa_texstore_null(TEXSTORE_PARAMS)

+{

+   (void) ctx; (void) dims;

+   (void) baseInternalFormat;

+   (void) dstFormat;

+   (void) dstAddr;

+   (void) dstXoffset; (void) dstYoffset; (void) dstZoffset;

+   (void) dstRowStride; (void) dstImageOffsets;

+   (void) srcWidth; (void) srcHeight; (void) srcDepth;

+   (void) srcFormat; (void) srcType;

+   (void) srcAddr;

+   (void) srcPacking;

+

+   /* should never happen */

+   _mesa_problem(NULL, "_mesa_texstore_null() is called");

+   return GL_FALSE;

+}

+

+

+/**

+ * Return the StoreTexImageFunc pointer to store an image in the given format.

+ */

+static StoreTexImageFunc

+_mesa_get_texstore_func(gl_format format)

+{

+#ifdef DEBUG

+   GLuint i;

+   for (i = 0; i < MESA_FORMAT_COUNT; i++) {

+      ASSERT(texstore_funcs[i].Name == i);

+   }

+#endif

+   ASSERT(texstore_funcs[format].Name == format);

+

+   if (texstore_funcs[format].Store)

+      return texstore_funcs[format].Store;

+   else

+      return _mesa_texstore_null;

+}

+

+

+/**

+ * Store user data into texture memory.

+ * Called via glTex[Sub]Image1/2/3D()

+ */

+GLboolean

+_mesa_texstore(TEXSTORE_PARAMS)

+{

+   StoreTexImageFunc storeImage;

+   GLboolean success;

+

+   storeImage = _mesa_get_texstore_func(dstFormat);

+

+   success = storeImage(ctx, dims, baseInternalFormat,

+                        dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,

+                        dstRowStride, dstImageOffsets,

+                        srcWidth, srcHeight, srcDepth,

+                        srcFormat, srcType, srcAddr, srcPacking);

+   return success;

+}

+

+

+/**

+ * Check if an unpack PBO is active prior to fetching a texture image.

+ * If so, do bounds checking and map the buffer into main memory.

+ * Any errors detected will be recorded.

+ * The caller _must_ call _mesa_unmap_teximage_pbo() too!

+ */

+const GLvoid *

+_mesa_validate_pbo_teximage(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,

+			    const char *funcName)

+{

+   GLubyte *buf;

+

+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {

+      /* no PBO */

+      return pixels;

+   }

+   if (!_mesa_validate_pbo_access(dimensions, unpack, width, height, depth,

+                                  format, type, pixels)) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(invalid PBO access)");

+      return NULL;

+   }

+

+   buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                                          GL_READ_ONLY_ARB, unpack->BufferObj);

+   if (!buf) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(PBO is mapped)");

+      return NULL;

+   }

+

+   return ADD_POINTERS(buf, pixels);

+}

+

+

+/**

+ * Check if an unpack PBO is active prior to fetching a compressed texture

+ * image.

+ * If so, do bounds checking and map the buffer into main memory.

+ * Any errors detected will be recorded.

+ * The caller _must_ call _mesa_unmap_teximage_pbo() too!

+ */

+const GLvoid *

+_mesa_validate_pbo_compressed_teximage(struct gl_context *ctx,

+                                 GLsizei imageSize, const GLvoid *pixels,

+                                 const struct gl_pixelstore_attrib *packing,

+                                 const char *funcName)

+{

+   GLubyte *buf;

+

+   if (!_mesa_is_bufferobj(packing->BufferObj)) {

+      /* not using a PBO - return pointer unchanged */

+      return pixels;

+   }

+   if ((const GLubyte *) pixels + imageSize >

+       ((const GLubyte *) 0) + packing->BufferObj->Size) {

+      /* out of bounds read! */

+      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(invalid PBO access)");

+      return NULL;

+   }

+

+   buf = (GLubyte*) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                                         GL_READ_ONLY_ARB, packing->BufferObj);

+   if (!buf) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(PBO is mapped");

+      return NULL;

+   }

+

+   return ADD_POINTERS(buf, pixels);

+}

+

+

+/**

+ * This function must be called after either of the validate_pbo_*_teximage()

+ * functions.  It unmaps the PBO buffer if it was mapped earlier.

+ */

+void

+_mesa_unmap_teximage_pbo(struct gl_context *ctx,

+                         const struct gl_pixelstore_attrib *unpack)

+{

+   if (_mesa_is_bufferobj(unpack->BufferObj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,

+                              unpack->BufferObj);

+   }

+}

+

+

+/** Return texture size in bytes */

+static GLuint

+texture_size(const struct gl_texture_image *texImage)

+{

+   GLuint sz = _mesa_format_image_size(texImage->TexFormat, texImage->Width,

+                                       texImage->Height, texImage->Depth);

+   return sz;

+}

+

+

+/** Return row stride in bytes */

+static GLuint

+texture_row_stride(const struct gl_texture_image *texImage)

+{

+   GLuint stride = _mesa_format_row_stride(texImage->TexFormat,

+                                           texImage->Width);

+   return stride;

+}

+

+

+

+/**

+ * This is the software fallback for Driver.TexImage1D()

+ * and Driver.CopyTexImage1D().

+ * \sa _mesa_store_teximage2d()

+ */

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

+{

+   GLuint sizeInBytes;

+   (void) border;

+

+   /* allocate memory */

+   sizeInBytes = texture_size(texImage);

+   texImage->Data = _mesa_alloc_texmemory(sizeInBytes);

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");

+      return;

+   }

+

+   pixels = _mesa_validate_pbo_teximage(ctx, 1, width, 1, 1, format, type,

+                                        pixels, packing, "glTexImage1D");

+   if (!pixels) {

+      /* Note: we check for a NULL image pointer here, _after_ we allocated

+       * memory for the texture.  That's what the GL spec calls for.

+       */

+      return;

+   }

+   else {

+      const GLint dstRowStride = 0;

+      GLboolean success = _mesa_texstore(ctx, 1, texImage->_BaseFormat,

+                                         texImage->TexFormat,

+                                         texImage->Data,

+                                         0, 0, 0,  /* dstX/Y/Zoffset */

+                                         dstRowStride,

+                                         texImage->ImageOffsets,

+                                         width, 1, 1,

+                                         format, type, pixels, packing);

+      if (!success) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D");

+      }

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, packing);

+}

+

+

+/**

+ * This is the software fallback for Driver.TexImage2D()

+ * and Driver.CopyTexImage2D().

+ *

+ * This function is oriented toward storing images in main memory, rather

+ * than VRAM.  Device driver's can easily plug in their own replacement.

+ */

+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 void *pixels,

+                       const struct gl_pixelstore_attrib *packing,

+                       struct gl_texture_object *texObj,

+                       struct gl_texture_image *texImage)

+{

+   GLuint sizeInBytes;

+   (void) border;

+

+   /* allocate memory */

+   sizeInBytes = texture_size(texImage);

+   texImage->Data = _mesa_alloc_texmemory(sizeInBytes);

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");

+      return;

+   }

+

+   pixels = _mesa_validate_pbo_teximage(ctx, 2, width, height, 1, format, type,

+                                        pixels, packing, "glTexImage2D");

+   if (!pixels) {

+      /* Note: we check for a NULL image pointer here, _after_ we allocated

+       * memory for the texture.  That's what the GL spec calls for.

+       */

+      return;

+   }

+   else {

+      GLint dstRowStride = texture_row_stride(texImage);

+      GLboolean success = _mesa_texstore(ctx, 2, texImage->_BaseFormat,

+                                         texImage->TexFormat,

+                                         texImage->Data,

+                                         0, 0, 0,  /* dstX/Y/Zoffset */

+                                         dstRowStride,

+                                         texImage->ImageOffsets,

+                                         width, height, 1,

+                                         format, type, pixels, packing);

+      if (!success) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");

+      }

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, packing);

+}

+

+

+

+/**

+ * This is the software fallback for Driver.TexImage3D()

+ * and Driver.CopyTexImage3D().

+ * \sa _mesa_store_teximage2d()

+ */

+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 void *pixels,

+                       const struct gl_pixelstore_attrib *packing,

+                       struct gl_texture_object *texObj,

+                       struct gl_texture_image *texImage)

+{

+   GLuint sizeInBytes;

+   (void) border;

+

+   /* allocate memory */

+   sizeInBytes = texture_size(texImage);

+   texImage->Data = _mesa_alloc_texmemory(sizeInBytes);

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");

+      return;

+   }

+

+   pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, format,

+                                        type, pixels, packing, "glTexImage3D");

+   if (!pixels) {

+      /* Note: we check for a NULL image pointer here, _after_ we allocated

+       * memory for the texture.  That's what the GL spec calls for.

+       */

+      return;

+   }

+   else {

+      GLint dstRowStride = texture_row_stride(texImage);

+      GLboolean success = _mesa_texstore(ctx, 3, texImage->_BaseFormat,

+                                         texImage->TexFormat,

+                                         texImage->Data,

+                                         0, 0, 0,  /* dstX/Y/Zoffset */

+                                         dstRowStride,

+                                         texImage->ImageOffsets,

+                                         width, height, depth,

+                                         format, type, pixels, packing);

+      if (!success) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D");

+      }

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, packing);

+}

+

+

+

+

+/*

+ * This is the software fallback for Driver.TexSubImage1D()

+ * and Driver.CopyTexSubImage1D().

+ */

+void

+_mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level,

+                          GLint xoffset, GLint width,

+                          GLenum format, GLenum type, const void *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage)

+{

+   /* get pointer to src pixels (may be in a pbo which we'll map here) */

+   pixels = _mesa_validate_pbo_teximage(ctx, 1, width, 1, 1, format, type,

+                                        pixels, packing, "glTexSubImage1D");

+   if (!pixels)

+      return;

+

+   {

+      const GLint dstRowStride = 0;

+      GLboolean success = _mesa_texstore(ctx, 1, texImage->_BaseFormat,

+                                         texImage->TexFormat,

+                                         texImage->Data,

+                                         xoffset, 0, 0,  /* offsets */

+                                         dstRowStride,

+                                         texImage->ImageOffsets,

+                                         width, 1, 1,

+                                         format, type, pixels, packing);

+      if (!success) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage1D");

+      }

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, packing);

+}

+

+

+

+/**

+ * This is the software fallback for Driver.TexSubImage2D()

+ * and Driver.CopyTexSubImage2D().

+ */

+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 void *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage)

+{

+   /* get pointer to src pixels (may be in a pbo which we'll map here) */

+   pixels = _mesa_validate_pbo_teximage(ctx, 2, width, height, 1, format, type,

+                                        pixels, packing, "glTexSubImage2D");

+   if (!pixels)

+      return;

+

+   {

+      GLint dstRowStride = texture_row_stride(texImage);

+      GLboolean success = _mesa_texstore(ctx, 2, texImage->_BaseFormat,

+                                         texImage->TexFormat,

+                                         texImage->Data,

+                                         xoffset, yoffset, 0,

+                                         dstRowStride,

+                                         texImage->ImageOffsets,

+                                         width, height, 1,

+                                         format, type, pixels, packing);

+      if (!success) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage2D");

+      }

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, packing);

+}

+

+

+/*

+ * This is the software fallback for Driver.TexSubImage3D().

+ * and Driver.CopyTexSubImage3D().

+ */

+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 void *pixels,

+                          const struct gl_pixelstore_attrib *packing,

+                          struct gl_texture_object *texObj,

+                          struct gl_texture_image *texImage)

+{

+   /* get pointer to src pixels (may be in a pbo which we'll map here) */

+   pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, format,

+                                        type, pixels, packing,

+                                        "glTexSubImage3D");

+   if (!pixels)

+      return;

+

+   {

+      GLint dstRowStride = texture_row_stride(texImage);

+      GLboolean success = _mesa_texstore(ctx, 3, texImage->_BaseFormat,

+                                         texImage->TexFormat,

+                                         texImage->Data,

+                                         xoffset, yoffset, zoffset,

+                                         dstRowStride,

+                                         texImage->ImageOffsets,

+                                         width, height, depth,

+                                         format, type, pixels, packing);

+      if (!success) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage3D");

+      }

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, packing);

+}

+

+

+/*

+ * Fallback for Driver.CompressedTexImage1D()

+ */

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

+{

+   /* this space intentionally left blank */

+   (void) ctx;

+   (void) target; (void) level;

+   (void) internalFormat;

+   (void) width; (void) border;

+   (void) imageSize; (void) data;

+   (void) texObj;

+   (void) texImage;

+}

+

+

+

+/**

+ * Fallback for Driver.CompressedTexImage2D()

+ */

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

+{

+   (void) width; (void) height; (void) border;

+

+   /* This is pretty simple, basically just do a memcpy without worrying

+    * about the usual image unpacking or image transfer operations.

+    */

+   ASSERT(texObj);

+   ASSERT(texImage);

+   ASSERT(texImage->Width > 0);

+   ASSERT(texImage->Height > 0);

+   ASSERT(texImage->Depth == 1);

+   ASSERT(texImage->Data == NULL); /* was freed in glCompressedTexImage2DARB */

+

+   /* allocate storage */

+   texImage->Data = _mesa_alloc_texmemory(imageSize);

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");

+      return;

+   }

+

+   data = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, data,

+                                                 &ctx->Unpack,

+                                                 "glCompressedTexImage2D");

+   if (!data)

+      return;

+

+   /* copy the data */

+   memcpy(texImage->Data, data, imageSize);

+

+   _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);

+}

+

+

+

+/*

+ * Fallback for Driver.CompressedTexImage3D()

+ */

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

+{

+   /* this space intentionally left blank */

+   (void) ctx;

+   (void) target; (void) level;

+   (void) internalFormat;

+   (void) width; (void) height; (void) depth;

+   (void) border;

+   (void) imageSize; (void) data;

+   (void) texObj;

+   (void) texImage;

+}

+

+

+

+/**

+ * Fallback for Driver.CompressedTexSubImage1D()

+ */

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

+{

+   /* there are no compressed 1D texture formats yet */

+   (void) ctx;

+   (void) target; (void) level;

+   (void) xoffset; (void) width;

+   (void) format;

+   (void) imageSize; (void) data;

+   (void) texObj;

+   (void) texImage;

+}

+

+

+/**

+ * Fallback for Driver.CompressedTexSubImage2D()

+ */

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

+{

+   GLint bytesPerRow, destRowStride, srcRowStride;

+   GLint i, rows;

+   GLubyte *dest;

+   const GLubyte *src;

+   const gl_format texFormat = texImage->TexFormat;

+   const GLint destWidth = texImage->Width;

+   GLuint bw, bh;

+

+   _mesa_get_format_block_size(texFormat, &bw, &bh);

+

+   (void) level;

+   (void) format;

+

+   /* these should have been caught sooner */

+   ASSERT((width % bw) == 0 || width == 2 || width == 1);

+   ASSERT((height % bh) == 0 || height == 2 || height == 1);

+   ASSERT((xoffset % bw) == 0);

+   ASSERT((yoffset % bh) == 0);

+

+   /* get pointer to src pixels (may be in a pbo which we'll map here) */

+   data = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, data,

+                                                 &ctx->Unpack,

+                                                 "glCompressedTexSubImage2D");

+   if (!data)

+      return;

+

+   srcRowStride = _mesa_format_row_stride(texFormat, width);

+   src = (const GLubyte *) data;

+

+   destRowStride = _mesa_format_row_stride(texFormat, destWidth);

+   dest = _mesa_compressed_image_address(xoffset, yoffset, 0,

+                                         texFormat, destWidth,

+                                         (GLubyte *) texImage->Data);

+

+   bytesPerRow = srcRowStride;  /* bytes per row of blocks */

+   rows = height / bh;  /* rows in blocks */

+

+   /* copy rows of blocks */

+   for (i = 0; i < rows; i++) {

+      memcpy(dest, src, bytesPerRow);

+      dest += destRowStride;

+      src += srcRowStride;

+   }

+

+   _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);

+}

+

+

+/**

+ * Fallback for Driver.CompressedTexSubImage3D()

+ */

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

+{

+   /* there are no compressed 3D texture formats yet */

+   (void) ctx;

+   (void) target; (void) level;

+   (void) xoffset; (void) yoffset; (void) zoffset;

+   (void) width; (void) height; (void) depth;

+   (void) format;

+   (void) imageSize; (void) data;

+   (void) texObj;

+   (void) texImage;

+}

diff --git a/mesalib/src/mesa/main/texstore.h b/mesalib/src/mesa/main/texstore.h
index 3211086dd..8640a23a7 100644
--- a/mesalib/src/mesa/main/texstore.h
+++ b/mesalib/src/mesa/main/texstore.h
@@ -1,218 +1,218 @@
-/*
- * 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 \
-	GLcontext *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(GLcontext *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);
-
-
-extern void
-_mesa_store_teximage1d(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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);
-
-
-extern const GLvoid *
-_mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
-			    GLsizei width, GLsizei height, GLsizei depth,
-			    GLenum format, GLenum type, const GLvoid *pixels,
-			    const struct gl_pixelstore_attrib *unpack,
-			    const char *funcName);
-
-extern const GLvoid *
-_mesa_validate_pbo_compressed_teximage(GLcontext *ctx,
-                                    GLsizei imageSize, const GLvoid *pixels,
-                                    const struct gl_pixelstore_attrib *packing,
-                                    const char *funcName);
-
-extern void
-_mesa_unmap_teximage_pbo(GLcontext *ctx,
-                         const struct gl_pixelstore_attrib *unpack);
-
-
-#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);

+

+

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

+

+

+extern const GLvoid *

+_mesa_validate_pbo_teximage(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,

+			    const char *funcName);

+

+extern const GLvoid *

+_mesa_validate_pbo_compressed_teximage(struct gl_context *ctx,

+                                    GLsizei imageSize, const GLvoid *pixels,

+                                    const struct gl_pixelstore_attrib *packing,

+                                    const char *funcName);

+

+extern void

+_mesa_unmap_teximage_pbo(struct gl_context *ctx,

+                         const struct gl_pixelstore_attrib *unpack);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c
index 5c8c1fd22..6368f9325 100644
--- a/mesalib/src/mesa/main/transformfeedback.c
+++ b/mesalib/src/mesa/main/transformfeedback.c
@@ -1,944 +1,944 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS 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.
- */
-
-
-/*
- * Vertex transform feedback support.
- *
- * Authors:
- *   Brian Paul
- */
-
-
-#include "buffers.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "hash.h"
-#include "transformfeedback.h"
-#include "shaderapi.h"
-#include "shaderobj.h"
-#include "main/dispatch.h"
-
-#include "program/prog_parameter.h"
-//#include "program/shader_api.h"
-
-
-#if FEATURE_EXT_transform_feedback
-
-
-/**
- * Do reference counting of transform feedback buffers.
- */
-static void
-reference_transform_feedback_object(struct gl_transform_feedback_object **ptr,
-                                    struct gl_transform_feedback_object *obj)
-{
-   if (*ptr == obj)
-      return;
-
-   if (*ptr) {
-      /* Unreference the old object */
-      struct gl_transform_feedback_object *oldObj = *ptr;
-
-      ASSERT(oldObj->RefCount > 0);
-      oldObj->RefCount--;
-
-      if (oldObj->RefCount == 0) {
-         GET_CURRENT_CONTEXT(ctx);
-         if (ctx)
-            ctx->Driver.DeleteTransformFeedback(ctx, oldObj);
-      }
-
-      *ptr = NULL;
-   }
-   ASSERT(!*ptr);
-
-   if (obj) {
-      /* reference new object */
-      if (obj->RefCount == 0) {
-         _mesa_problem(NULL, "referencing deleted transform feedback object");
-         *ptr = NULL;
-      }
-      else {
-         obj->RefCount++;
-         *ptr = obj;
-      }
-   }
-}
-
-
-/**
- * Check if the given primitive mode (as in glBegin(mode)) is compatible
- * with the current transform feedback mode (if it's enabled).
- * This is to be called from glBegin(), glDrawArrays(), glDrawElements(), etc.
- *
- * \return GL_TRUE if the mode is OK, GL_FALSE otherwise.
- */
-GLboolean
-_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
-{
-   if (ctx->TransformFeedback.CurrentObject->Active) {
-      switch (mode) {
-      case GL_POINTS:
-         return ctx->TransformFeedback.Mode == GL_POINTS;
-      case GL_LINES:
-      case GL_LINE_STRIP:
-      case GL_LINE_LOOP:
-         return ctx->TransformFeedback.Mode == GL_LINES;
-      default:
-         return ctx->TransformFeedback.Mode == GL_TRIANGLES;
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Check that all the buffer objects currently bound for transform
- * feedback actually exist.  Raise a GL_INVALID_OPERATION error if
- * any buffers are missing.
- * \return GL_TRUE for success, GL_FALSE if error
- */
-GLboolean
-_mesa_validate_transform_feedback_buffers(GLcontext *ctx)
-{
-   /* XXX to do */
-   return GL_TRUE;
-}
-
-
-
-/**
- * Per-context init for transform feedback.
- */
-void
-_mesa_init_transform_feedback(GLcontext *ctx)
-{
-   /* core mesa expects this, even a dummy one, to be available */
-   ASSERT(ctx->Driver.NewTransformFeedback);
-
-   ctx->TransformFeedback.DefaultObject =
-      ctx->Driver.NewTransformFeedback(ctx, 0);
-
-   assert(ctx->TransformFeedback.DefaultObject->RefCount == 1);
-
-   reference_transform_feedback_object(&ctx->TransformFeedback.CurrentObject,
-                                       ctx->TransformFeedback.DefaultObject);
-
-   assert(ctx->TransformFeedback.DefaultObject->RefCount == 2);
-
-   ctx->TransformFeedback.Objects = _mesa_NewHashTable();
-
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->TransformFeedback.CurrentBuffer,
-                                 ctx->Shared->NullBufferObj);
-}
-
-
-
-/**
- * Callback for _mesa_HashDeleteAll().
- */
-static void
-delete_cb(GLuint key, void *data, void *userData)
-{
-   GLcontext *ctx = (GLcontext *) userData;
-   struct gl_transform_feedback_object *obj =
-      (struct gl_transform_feedback_object *) data;
-
-   ctx->Driver.DeleteTransformFeedback(ctx, obj);
-}
-
-
-/**
- * Per-context free/clean-up for transform feedback.
- */
-void
-_mesa_free_transform_feedback(GLcontext *ctx)
-{
-   /* core mesa expects this, even a dummy one, to be available */
-   ASSERT(ctx->Driver.NewTransformFeedback);
-
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->TransformFeedback.CurrentBuffer,
-                                 NULL);
-
-   /* Delete all feedback objects */
-   _mesa_HashDeleteAll(ctx->TransformFeedback.Objects, delete_cb, ctx);
-   _mesa_DeleteHashTable(ctx->TransformFeedback.Objects);
-
-   /* Delete the default feedback object */
-   assert(ctx->Driver.DeleteTransformFeedback);
-   ctx->Driver.DeleteTransformFeedback(ctx,
-                                       ctx->TransformFeedback.DefaultObject);
-
-   ctx->TransformFeedback.CurrentObject = NULL;
-}
-
-
-#else /* FEATURE_EXT_transform_feedback */
-
-/* forward declarations */
-static struct gl_transform_feedback_object *
-new_transform_feedback(GLcontext *ctx, GLuint name);
-
-static void
-delete_transform_feedback(GLcontext *ctx,
-                          struct gl_transform_feedback_object *obj);
-
-/* dummy per-context init/clean-up for transform feedback */
-void
-_mesa_init_transform_feedback(GLcontext *ctx)
-{
-   ctx->TransformFeedback.DefaultObject = new_transform_feedback(ctx, 0);
-   ctx->TransformFeedback.CurrentObject = ctx->TransformFeedback.DefaultObject;
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->TransformFeedback.CurrentBuffer,
-                                 ctx->Shared->NullBufferObj);
-}
-
-void
-_mesa_free_transform_feedback(GLcontext *ctx)
-{
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->TransformFeedback.CurrentBuffer,
-                                 NULL);
-   ctx->TransformFeedback.CurrentObject = NULL;
-   delete_transform_feedback(ctx, ctx->TransformFeedback.DefaultObject);
-}
-
-#endif /* FEATURE_EXT_transform_feedback */
-
-
-/** Default fallback for ctx->Driver.NewTransformFeedback() */
-static struct gl_transform_feedback_object *
-new_transform_feedback(GLcontext *ctx, GLuint name)
-{
-   struct gl_transform_feedback_object *obj;
-   obj = CALLOC_STRUCT(gl_transform_feedback_object);
-   if (obj) {
-      obj->Name = name;
-      obj->RefCount = 1;
-   }
-   return obj;
-}
-
-/** Default fallback for ctx->Driver.DeleteTransformFeedback() */
-static void
-delete_transform_feedback(GLcontext *ctx,
-                          struct gl_transform_feedback_object *obj)
-{
-   GLuint i;
-
-   for (i = 0; i < Elements(obj->Buffers); i++) {
-      _mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);
-   }
-
-   free(obj);
-}
-
-
-#if FEATURE_EXT_transform_feedback
-
-
-/** Default fallback for ctx->Driver.BeginTransformFeedback() */
-static void
-begin_transform_feedback(GLcontext *ctx, GLenum mode,
-                         struct gl_transform_feedback_object *obj)
-{
-   /* nop */
-}
-
-/** Default fallback for ctx->Driver.EndTransformFeedback() */
-static void
-end_transform_feedback(GLcontext *ctx,
-                       struct gl_transform_feedback_object *obj)
-{
-   /* nop */
-}
-
-/** Default fallback for ctx->Driver.PauseTransformFeedback() */
-static void
-pause_transform_feedback(GLcontext *ctx,
-                         struct gl_transform_feedback_object *obj)
-{
-   /* nop */
-}
-
-/** Default fallback for ctx->Driver.ResumeTransformFeedback() */
-static void
-resume_transform_feedback(GLcontext *ctx,
-                          struct gl_transform_feedback_object *obj)
-{
-   /* nop */
-}
-
-/** Default fallback for ctx->Driver.DrawTransformFeedback() */
-static void
-draw_transform_feedback(GLcontext *ctx, GLenum mode,
-                        struct gl_transform_feedback_object *obj)
-{
-   /* XXX to do */
-   /*
-    * Get number of vertices in obj's feedback buffer.
-    * Call ctx->Exec.DrawArrays(mode, 0, count);
-    */
-}
-
-
-/**
- * Plug in default device driver functions for transform feedback.
- * Most drivers will override some/all of these.
- */
-void
-_mesa_init_transform_feedback_functions(struct dd_function_table *driver)
-{
-   driver->NewTransformFeedback = new_transform_feedback;
-   driver->DeleteTransformFeedback = delete_transform_feedback;
-   driver->BeginTransformFeedback = begin_transform_feedback;
-   driver->EndTransformFeedback = end_transform_feedback;
-   driver->PauseTransformFeedback = pause_transform_feedback;
-   driver->ResumeTransformFeedback = resume_transform_feedback;
-   driver->DrawTransformFeedback = draw_transform_feedback;
-}
-
-
-void
-_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
-{
-   SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback);
-   SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback);
-   SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange);
-   SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase);
-   SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT);
-   SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings);
-   SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying);
-}
-
-
-/**
- ** Begin API functions
- **/
-
-
-void GLAPIENTRY
-_mesa_BeginTransformFeedback(GLenum mode)
-{
-   struct gl_transform_feedback_object *obj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   switch (mode) {
-   case GL_POINTS:
-   case GL_LINES:
-   case GL_TRIANGLES:
-      /* legal */
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginTransformFeedback(mode)");
-      return;
-   }
-
-   if (obj->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBeginTransformFeedback(already active)");
-      return;
-   }
-
-   obj->Active = GL_TRUE;
-   ctx->TransformFeedback.Mode = mode;
-
-   assert(ctx->Driver.BeginTransformFeedback);
-   ctx->Driver.BeginTransformFeedback(ctx, mode, obj);
-}
-
-
-void GLAPIENTRY
-_mesa_EndTransformFeedback(void)
-{
-   struct gl_transform_feedback_object *obj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   if (!obj->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glEndTransformFeedback(not active)");
-      return;
-   }
-
-   ctx->TransformFeedback.CurrentObject->Active = GL_FALSE;
-
-   assert(ctx->Driver.EndTransformFeedback);
-   ctx->Driver.EndTransformFeedback(ctx, obj);
-}
-
-
-/**
- * Helper used by BindBufferRange() and BindBufferBase().
- */
-static void
-bind_buffer_range(GLcontext *ctx, GLuint index,
-                  struct gl_buffer_object *bufObj,
-                  GLintptr offset, GLsizeiptr size)
-{
-   struct gl_transform_feedback_object *obj =
-      ctx->TransformFeedback.CurrentObject;
-
-   /* The general binding point */
-   _mesa_reference_buffer_object(ctx,
-                                 &ctx->TransformFeedback.CurrentBuffer,
-                                 bufObj);
-
-   /* The per-attribute binding point */
-   _mesa_reference_buffer_object(ctx,
-                                 &obj->Buffers[index],
-                                 bufObj);
-
-   obj->BufferNames[index] = bufObj->Name;
-
-   obj->Offset[index] = offset;
-   obj->Size[index] = size;
-}
-
-
-/**
- * Specify a buffer object to receive vertex shader results.  Plus,
- * specify the starting offset to place the results, and max size.
- */
-void GLAPIENTRY
-_mesa_BindBufferRange(GLenum target, GLuint index,
-                      GLuint buffer, GLintptr offset, GLsizeiptr size)
-{
-   struct gl_transform_feedback_object *obj;
-   struct gl_buffer_object *bufObj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");
-      return;
-   }
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   if (obj->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferRange(transform feedback active)");
-      return;
-   }
-
-   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)", index);
-      return;
-   }
-
-   if ((size <= 0) || (size & 0x3)) {
-      /* must be positive and multiple of four */
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size%d)", (int) size);
-      return;
-   }  
-
-   if (offset & 0x3) {
-      /* must be multiple of four */
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glBindBufferRange(offset=%d)", (int) offset);
-      return;
-   }  
-
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferRange(invalid buffer=%u)", buffer);
-      return;
-   }
-
-   if (offset + size >= bufObj->Size) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glBindBufferRange(offset + size %d > buffer size %d)",
-		  (int) (offset + size), (int) (bufObj->Size));
-      return;
-   }  
-
-   bind_buffer_range(ctx, index, bufObj, offset, size);
-}
-
-
-/**
- * Specify a buffer object to receive vertex shader results.
- * As above, but start at offset = 0.
- */
-void GLAPIENTRY
-_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
-{
-   struct gl_transform_feedback_object *obj;
-   struct gl_buffer_object *bufObj;
-   GLsizeiptr size;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");
-      return;
-   }
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   if (obj->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferRange(transform feedback active)");
-      return;
-   }
-
-   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferBase(index=%d)", index);
-      return;
-   }
-
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferBase(invalid buffer=%u)", buffer);
-      return;
-   }
-
-   /* default size is the buffer size rounded down to nearest
-    * multiple of four.
-    */
-   size = bufObj->Size & ~0x3;
-
-   bind_buffer_range(ctx, index, bufObj, 0, size);
-}
-
-
-/**
- * Specify a buffer object to receive vertex shader results, plus the
- * offset in the buffer to start placing results.
- * This function is part of GL_EXT_transform_feedback, but not GL3.
- */
-void GLAPIENTRY
-_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
-                          GLintptr offset)
-{
-   struct gl_transform_feedback_object *obj;
-   struct gl_buffer_object *bufObj;
-   GET_CURRENT_CONTEXT(ctx);
-   GLsizeiptr size;
-
-   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferOffsetEXT(target)");
-      return;
-   }
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   if (obj->Active) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferRange(transform feedback active)");
-      return;
-   }
-
-   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glBindBufferOffsetEXT(index=%d)", index);
-      return;
-   }
-
-   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
-   if (!bufObj) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindBufferOffsetEXT(invalid buffer=%u)", buffer);
-      return;
-   }
-
-   /* default size is the buffer size rounded down to nearest
-    * multiple of four.
-    */
-   size = (bufObj->Size - offset) & ~0x3;
-
-   bind_buffer_range(ctx, index, bufObj, offset, size);
-}
-
-
-/**
- * This function specifies the vertex shader outputs to be written
- * to the feedback buffer(s), and in what order.
- */
-void GLAPIENTRY
-_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
-                                const GLchar **varyings, GLenum bufferMode)
-{
-   struct gl_shader_program *shProg;
-   GLuint i;
-   GET_CURRENT_CONTEXT(ctx);
-
-   switch (bufferMode) {
-   case GL_INTERLEAVED_ATTRIBS:
-      break;
-   case GL_SEPARATE_ATTRIBS:
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glTransformFeedbackVaryings(bufferMode)");
-      return;
-   }
-
-   if (count < 0 || count > ctx->Const.MaxTransformFeedbackSeparateAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glTransformFeedbackVaryings(count=%d)", count);
-      return;
-   }
-
-   shProg = _mesa_lookup_shader_program(ctx, program);
-   if (!shProg) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glTransformFeedbackVaryings(program=%u)", program);
-      return;
-   }
-
-   /* free existing varyings, if any */
-   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {
-      free(shProg->TransformFeedback.VaryingNames[i]);
-   }
-   free(shProg->TransformFeedback.VaryingNames);
-
-   /* allocate new memory for varying names */
-   shProg->TransformFeedback.VaryingNames =
-      (GLchar **) malloc(count * sizeof(GLchar *));
-
-   if (!shProg->TransformFeedback.VaryingNames) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTransformFeedbackVaryings()");
-      return;
-   }
-
-   /* Save the new names and the count */
-   for (i = 0; i < (GLuint) count; i++) {
-      shProg->TransformFeedback.VaryingNames[i] = _mesa_strdup(varyings[i]);
-   }
-   shProg->TransformFeedback.NumVarying = count;
-
-   shProg->TransformFeedback.BufferMode = bufferMode;
-
-   /* The varyings won't be used until shader link time */
-}
-
-
-/**
- * Get info about the vertex shader's outputs which are to be written
- * to the feedback buffer(s).
- */
-void GLAPIENTRY
-_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
-                                  GLsizei bufSize, GLsizei *length,
-                                  GLsizei *size, GLenum *type, GLchar *name)
-{
-   const struct gl_shader_program *shProg;
-   const GLchar *varyingName;
-   GLint v;
-   GET_CURRENT_CONTEXT(ctx);
-
-   shProg = _mesa_lookup_shader_program(ctx, program);
-   if (!shProg) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetTransformFeedbackVaryings(program=%u)", program);
-      return;
-   }
-
-   if (index >= shProg->TransformFeedback.NumVarying) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetTransformFeedbackVaryings(index=%u)", index);
-      return;
-   }
-
-   varyingName = shProg->TransformFeedback.VaryingNames[index];
-
-   v = _mesa_lookup_parameter_index(shProg->Varying, -1, varyingName);
-   if (v >= 0) {
-      struct gl_program_parameter *param = &shProg->Varying->Parameters[v];
-
-      /* return the varying's name and length */
-      _mesa_copy_string(name, bufSize, length, varyingName);
-
-      /* return the datatype and value's size (in datatype units) */
-      if (type)
-         *type = param->DataType;
-      if (size)
-         *size = param->Size;
-   }
-   else {
-      name[0] = 0;
-      if (length)
-         *length = 0;
-      if (type)
-         *type = 0;
-      if (size)
-         *size = 0;
-   }
-}
-
-
-
-static struct gl_transform_feedback_object *
-lookup_transform_feedback_object(GLcontext *ctx, GLuint name)
-{
-   if (name == 0) {
-      return ctx->TransformFeedback.DefaultObject;
-   }
-   else
-      return (struct gl_transform_feedback_object *)
-         _mesa_HashLookup(ctx->TransformFeedback.Objects, name);
-}
-
-
-/**
- * Create new transform feedback objects.   Transform feedback objects
- * encapsulate the state related to transform feedback to allow quickly
- * switching state (and drawing the results, below).
- * Part of GL_ARB_transform_feedback2.
- */
-void GLAPIENTRY
-_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names)
-{
-   GLuint first;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenTransformFeedbacks(n < 0)");
-      return;
-   }
-
-   if (!names)
-      return;
-
-   /* we don't need contiguous IDs, but this might be faster */
-   first = _mesa_HashFindFreeKeyBlock(ctx->TransformFeedback.Objects, n);
-   if (first) {
-      GLsizei i;
-      for (i = 0; i < n; i++) {
-         struct gl_transform_feedback_object *obj
-            = ctx->Driver.NewTransformFeedback(ctx, first + i);
-         if (!obj) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTransformFeedbacks");
-            return;
-         }
-         names[i] = first + i;
-         _mesa_HashInsert(ctx->TransformFeedback.Objects, first + i, obj);
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTransformFeedbacks");
-   }
-}
-
-
-/**
- * Is the given ID a transform feedback object?
- * Part of GL_ARB_transform_feedback2.
- */
-GLboolean GLAPIENTRY
-_mesa_IsTransformFeedback(GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (name && lookup_transform_feedback_object(ctx, name))
-      return GL_TRUE;
-   else
-      return GL_FALSE;
-}
-
-
-/**
- * Bind the given transform feedback object.
- * Part of GL_ARB_transform_feedback2.
- */
-void GLAPIENTRY
-_mesa_BindTransformFeedback(GLenum target, GLuint name)
-{
-   struct gl_transform_feedback_object *obj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (target != GL_TRANSFORM_FEEDBACK) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindTransformFeedback(target)");
-      return;
-   }
-
-   if (ctx->TransformFeedback.CurrentObject->Active &&
-       !ctx->TransformFeedback.CurrentObject->Paused) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-              "glBindTransformFeedback(transform is active, or not paused)");
-      return;
-   }
-
-   obj = lookup_transform_feedback_object(ctx, name);
-   if (!obj) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindTransformFeedback(name=%u)", name);
-      return;
-   }
-
-   reference_transform_feedback_object(&ctx->TransformFeedback.CurrentObject,
-                                       obj);
-}
-
-
-/**
- * Delete the given transform feedback objects.
- * Part of GL_ARB_transform_feedback2.
- */
-void GLAPIENTRY
-_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names)
-{
-   GLint i;
-   GET_CURRENT_CONTEXT(ctx);
-
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteTransformFeedbacks(n < 0)");
-      return;
-   }
-
-   if (!names)
-      return;
-
-   for (i = 0; i < n; i++) {
-      if (names[i] > 0) {
-         struct gl_transform_feedback_object *obj
-            = lookup_transform_feedback_object(ctx, names[i]);
-         if (obj) {
-            if (obj->Active) {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
-                           "glDeleteTransformFeedbacks(object %u is active)",
-                           names[i]);
-               return;
-            }
-            _mesa_HashRemove(ctx->TransformFeedback.Objects, names[i]);
-            /* unref, but object may not be deleted until later */
-            reference_transform_feedback_object(&obj, NULL);
-         }
-      }
-   }
-}
-
-
-/**
- * Pause transform feedback.
- * Part of GL_ARB_transform_feedback2.
- */
-void GLAPIENTRY
-_mesa_PauseTransformFeedback(void)
-{
-   struct gl_transform_feedback_object *obj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   if (!obj->Active || obj->Paused) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-           "glPauseTransformFeedback(feedback not active or already paused)");
-      return;
-   }
-
-   obj->Paused = GL_TRUE;
-
-   assert(ctx->Driver.PauseTransformFeedback);
-   ctx->Driver.PauseTransformFeedback(ctx, obj);
-}
-
-
-/**
- * Resume transform feedback.
- * Part of GL_ARB_transform_feedback2.
- */
-void GLAPIENTRY
-_mesa_ResumeTransformFeedback(void)
-{
-   struct gl_transform_feedback_object *obj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   obj = ctx->TransformFeedback.CurrentObject;
-
-   if (!obj->Active || !obj->Paused) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glPauseTransformFeedback(feedback not active or not paused)");
-      return;
-   }
-
-   obj->Paused = GL_FALSE;
-
-   assert(ctx->Driver.ResumeTransformFeedback);
-   ctx->Driver.ResumeTransformFeedback(ctx, obj);
-}
-
-
-/**
- * Draw the vertex data in a transform feedback object.
- * \param mode  GL_POINTS, GL_LINES, GL_TRIANGLE_STRIP, etc.
- * \param name  the transform feedback object
- * The number of vertices comes from the transform feedback object.
- * User still has to setup of the vertex attribute info with
- * glVertexPointer, glColorPointer, etc.
- * Part of GL_ARB_transform_feedback2.
- */
-void GLAPIENTRY
-_mesa_DrawTransformFeedback(GLenum mode, GLuint name)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_transform_feedback_object *obj =
-      lookup_transform_feedback_object(ctx, name);
-
-   if (mode > GL_POLYGON) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glDrawTransformFeedback(mode=0x%x)", mode);
-      return;
-   }
-   if (!obj) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glDrawTransformFeedback(name = %u)", name);
-      return;
-   }
-
-   /* XXX check if EndTransformFeedback has never been called while
-    * the object was bound
-    */
-
-   assert(ctx->Driver.DrawTransformFeedback);
-   ctx->Driver.DrawTransformFeedback(ctx, mode, obj);
-}
-
-
-/*
-XXX misc to do:
-
-glGet*() for
-
-GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED
-GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE
-GL_TRANSFORM_FEEDBACK_BINDING
-*/
-
-
-#endif /* FEATURE_EXT_transform_feedback */
+/*

+ * Mesa 3-D graphics library

+ *

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS 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.

+ */

+

+

+/*

+ * Vertex transform feedback support.

+ *

+ * Authors:

+ *   Brian Paul

+ */

+

+

+#include "buffers.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "hash.h"

+#include "transformfeedback.h"

+#include "shaderapi.h"

+#include "shaderobj.h"

+#include "main/dispatch.h"

+

+#include "program/prog_parameter.h"

+//#include "program/shader_api.h"

+

+

+#if FEATURE_EXT_transform_feedback

+

+

+/**

+ * Do reference counting of transform feedback buffers.

+ */

+static void

+reference_transform_feedback_object(struct gl_transform_feedback_object **ptr,

+                                    struct gl_transform_feedback_object *obj)

+{

+   if (*ptr == obj)

+      return;

+

+   if (*ptr) {

+      /* Unreference the old object */

+      struct gl_transform_feedback_object *oldObj = *ptr;

+

+      ASSERT(oldObj->RefCount > 0);

+      oldObj->RefCount--;

+

+      if (oldObj->RefCount == 0) {

+         GET_CURRENT_CONTEXT(ctx);

+         if (ctx)

+            ctx->Driver.DeleteTransformFeedback(ctx, oldObj);

+      }

+

+      *ptr = NULL;

+   }

+   ASSERT(!*ptr);

+

+   if (obj) {

+      /* reference new object */

+      if (obj->RefCount == 0) {

+         _mesa_problem(NULL, "referencing deleted transform feedback object");

+         *ptr = NULL;

+      }

+      else {

+         obj->RefCount++;

+         *ptr = obj;

+      }

+   }

+}

+

+

+/**

+ * Check if the given primitive mode (as in glBegin(mode)) is compatible

+ * with the current transform feedback mode (if it's enabled).

+ * This is to be called from glBegin(), glDrawArrays(), glDrawElements(), etc.

+ *

+ * \return GL_TRUE if the mode is OK, GL_FALSE otherwise.

+ */

+GLboolean

+_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode)

+{

+   if (ctx->TransformFeedback.CurrentObject->Active) {

+      switch (mode) {

+      case GL_POINTS:

+         return ctx->TransformFeedback.Mode == GL_POINTS;

+      case GL_LINES:

+      case GL_LINE_STRIP:

+      case GL_LINE_LOOP:

+         return ctx->TransformFeedback.Mode == GL_LINES;

+      default:

+         return ctx->TransformFeedback.Mode == GL_TRIANGLES;

+      }

+   }

+   return GL_TRUE;

+}

+

+

+/**

+ * Check that all the buffer objects currently bound for transform

+ * feedback actually exist.  Raise a GL_INVALID_OPERATION error if

+ * any buffers are missing.

+ * \return GL_TRUE for success, GL_FALSE if error

+ */

+GLboolean

+_mesa_validate_transform_feedback_buffers(struct gl_context *ctx)

+{

+   /* XXX to do */

+   return GL_TRUE;

+}

+

+

+

+/**

+ * Per-context init for transform feedback.

+ */

+void

+_mesa_init_transform_feedback(struct gl_context *ctx)

+{

+   /* core mesa expects this, even a dummy one, to be available */

+   ASSERT(ctx->Driver.NewTransformFeedback);

+

+   ctx->TransformFeedback.DefaultObject =

+      ctx->Driver.NewTransformFeedback(ctx, 0);

+

+   assert(ctx->TransformFeedback.DefaultObject->RefCount == 1);

+

+   reference_transform_feedback_object(&ctx->TransformFeedback.CurrentObject,

+                                       ctx->TransformFeedback.DefaultObject);

+

+   assert(ctx->TransformFeedback.DefaultObject->RefCount == 2);

+

+   ctx->TransformFeedback.Objects = _mesa_NewHashTable();

+

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->TransformFeedback.CurrentBuffer,

+                                 ctx->Shared->NullBufferObj);

+}

+

+

+

+/**

+ * Callback for _mesa_HashDeleteAll().

+ */

+static void

+delete_cb(GLuint key, void *data, void *userData)

+{

+   struct gl_context *ctx = (struct gl_context *) userData;

+   struct gl_transform_feedback_object *obj =

+      (struct gl_transform_feedback_object *) data;

+

+   ctx->Driver.DeleteTransformFeedback(ctx, obj);

+}

+

+

+/**

+ * Per-context free/clean-up for transform feedback.

+ */

+void

+_mesa_free_transform_feedback(struct gl_context *ctx)

+{

+   /* core mesa expects this, even a dummy one, to be available */

+   ASSERT(ctx->Driver.NewTransformFeedback);

+

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->TransformFeedback.CurrentBuffer,

+                                 NULL);

+

+   /* Delete all feedback objects */

+   _mesa_HashDeleteAll(ctx->TransformFeedback.Objects, delete_cb, ctx);

+   _mesa_DeleteHashTable(ctx->TransformFeedback.Objects);

+

+   /* Delete the default feedback object */

+   assert(ctx->Driver.DeleteTransformFeedback);

+   ctx->Driver.DeleteTransformFeedback(ctx,

+                                       ctx->TransformFeedback.DefaultObject);

+

+   ctx->TransformFeedback.CurrentObject = NULL;

+}

+

+

+#else /* FEATURE_EXT_transform_feedback */

+

+/* forward declarations */

+static struct gl_transform_feedback_object *

+new_transform_feedback(struct gl_context *ctx, GLuint name);

+

+static void

+delete_transform_feedback(struct gl_context *ctx,

+                          struct gl_transform_feedback_object *obj);

+

+/* dummy per-context init/clean-up for transform feedback */

+void

+_mesa_init_transform_feedback(struct gl_context *ctx)

+{

+   ctx->TransformFeedback.DefaultObject = new_transform_feedback(ctx, 0);

+   ctx->TransformFeedback.CurrentObject = ctx->TransformFeedback.DefaultObject;

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->TransformFeedback.CurrentBuffer,

+                                 ctx->Shared->NullBufferObj);

+}

+

+void

+_mesa_free_transform_feedback(struct gl_context *ctx)

+{

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->TransformFeedback.CurrentBuffer,

+                                 NULL);

+   ctx->TransformFeedback.CurrentObject = NULL;

+   delete_transform_feedback(ctx, ctx->TransformFeedback.DefaultObject);

+}

+

+#endif /* FEATURE_EXT_transform_feedback */

+

+

+/** Default fallback for ctx->Driver.NewTransformFeedback() */

+static struct gl_transform_feedback_object *

+new_transform_feedback(struct gl_context *ctx, GLuint name)

+{

+   struct gl_transform_feedback_object *obj;

+   obj = CALLOC_STRUCT(gl_transform_feedback_object);

+   if (obj) {

+      obj->Name = name;

+      obj->RefCount = 1;

+   }

+   return obj;

+}

+

+/** Default fallback for ctx->Driver.DeleteTransformFeedback() */

+static void

+delete_transform_feedback(struct gl_context *ctx,

+                          struct gl_transform_feedback_object *obj)

+{

+   GLuint i;

+

+   for (i = 0; i < Elements(obj->Buffers); i++) {

+      _mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);

+   }

+

+   free(obj);

+}

+

+

+#if FEATURE_EXT_transform_feedback

+

+

+/** Default fallback for ctx->Driver.BeginTransformFeedback() */

+static void

+begin_transform_feedback(struct gl_context *ctx, GLenum mode,

+                         struct gl_transform_feedback_object *obj)

+{

+   /* nop */

+}

+

+/** Default fallback for ctx->Driver.EndTransformFeedback() */

+static void

+end_transform_feedback(struct gl_context *ctx,

+                       struct gl_transform_feedback_object *obj)

+{

+   /* nop */

+}

+

+/** Default fallback for ctx->Driver.PauseTransformFeedback() */

+static void

+pause_transform_feedback(struct gl_context *ctx,

+                         struct gl_transform_feedback_object *obj)

+{

+   /* nop */

+}

+

+/** Default fallback for ctx->Driver.ResumeTransformFeedback() */

+static void

+resume_transform_feedback(struct gl_context *ctx,

+                          struct gl_transform_feedback_object *obj)

+{

+   /* nop */

+}

+

+/** Default fallback for ctx->Driver.DrawTransformFeedback() */

+static void

+draw_transform_feedback(struct gl_context *ctx, GLenum mode,

+                        struct gl_transform_feedback_object *obj)

+{

+   /* XXX to do */

+   /*

+    * Get number of vertices in obj's feedback buffer.

+    * Call ctx->Exec.DrawArrays(mode, 0, count);

+    */

+}

+

+

+/**

+ * Plug in default device driver functions for transform feedback.

+ * Most drivers will override some/all of these.

+ */

+void

+_mesa_init_transform_feedback_functions(struct dd_function_table *driver)

+{

+   driver->NewTransformFeedback = new_transform_feedback;

+   driver->DeleteTransformFeedback = delete_transform_feedback;

+   driver->BeginTransformFeedback = begin_transform_feedback;

+   driver->EndTransformFeedback = end_transform_feedback;

+   driver->PauseTransformFeedback = pause_transform_feedback;

+   driver->ResumeTransformFeedback = resume_transform_feedback;

+   driver->DrawTransformFeedback = draw_transform_feedback;

+}

+

+

+void

+_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)

+{

+   SET_BeginTransformFeedbackEXT(disp, _mesa_BeginTransformFeedback);

+   SET_EndTransformFeedbackEXT(disp, _mesa_EndTransformFeedback);

+   SET_BindBufferRangeEXT(disp, _mesa_BindBufferRange);

+   SET_BindBufferBaseEXT(disp, _mesa_BindBufferBase);

+   SET_BindBufferOffsetEXT(disp, _mesa_BindBufferOffsetEXT);

+   SET_TransformFeedbackVaryingsEXT(disp, _mesa_TransformFeedbackVaryings);

+   SET_GetTransformFeedbackVaryingEXT(disp, _mesa_GetTransformFeedbackVarying);

+}

+

+

+/**

+ ** Begin API functions

+ **/

+

+

+void GLAPIENTRY

+_mesa_BeginTransformFeedback(GLenum mode)

+{

+   struct gl_transform_feedback_object *obj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   switch (mode) {

+   case GL_POINTS:

+   case GL_LINES:

+   case GL_TRIANGLES:

+      /* legal */

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBeginTransformFeedback(mode)");

+      return;

+   }

+

+   if (obj->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBeginTransformFeedback(already active)");

+      return;

+   }

+

+   obj->Active = GL_TRUE;

+   ctx->TransformFeedback.Mode = mode;

+

+   assert(ctx->Driver.BeginTransformFeedback);

+   ctx->Driver.BeginTransformFeedback(ctx, mode, obj);

+}

+

+

+void GLAPIENTRY

+_mesa_EndTransformFeedback(void)

+{

+   struct gl_transform_feedback_object *obj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   if (!obj->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glEndTransformFeedback(not active)");

+      return;

+   }

+

+   ctx->TransformFeedback.CurrentObject->Active = GL_FALSE;

+

+   assert(ctx->Driver.EndTransformFeedback);

+   ctx->Driver.EndTransformFeedback(ctx, obj);

+}

+

+

+/**

+ * Helper used by BindBufferRange() and BindBufferBase().

+ */

+static void

+bind_buffer_range(struct gl_context *ctx, GLuint index,

+                  struct gl_buffer_object *bufObj,

+                  GLintptr offset, GLsizeiptr size)

+{

+   struct gl_transform_feedback_object *obj =

+      ctx->TransformFeedback.CurrentObject;

+

+   /* The general binding point */

+   _mesa_reference_buffer_object(ctx,

+                                 &ctx->TransformFeedback.CurrentBuffer,

+                                 bufObj);

+

+   /* The per-attribute binding point */

+   _mesa_reference_buffer_object(ctx,

+                                 &obj->Buffers[index],

+                                 bufObj);

+

+   obj->BufferNames[index] = bufObj->Name;

+

+   obj->Offset[index] = offset;

+   obj->Size[index] = size;

+}

+

+

+/**

+ * Specify a buffer object to receive vertex shader results.  Plus,

+ * specify the starting offset to place the results, and max size.

+ */

+void GLAPIENTRY

+_mesa_BindBufferRange(GLenum target, GLuint index,

+                      GLuint buffer, GLintptr offset, GLsizeiptr size)

+{

+   struct gl_transform_feedback_object *obj;

+   struct gl_buffer_object *bufObj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");

+      return;

+   }

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   if (obj->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindBufferRange(transform feedback active)");

+      return;

+   }

+

+   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)", index);

+      return;

+   }

+

+   if ((size <= 0) || (size & 0x3)) {

+      /* must be positive and multiple of four */

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size%d)", (int) size);

+      return;

+   }  

+

+   if (offset & 0x3) {

+      /* must be multiple of four */

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glBindBufferRange(offset=%d)", (int) offset);

+      return;

+   }  

+

+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindBufferRange(invalid buffer=%u)", buffer);

+      return;

+   }

+

+   if (offset + size >= bufObj->Size) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glBindBufferRange(offset + size %d > buffer size %d)",

+		  (int) (offset + size), (int) (bufObj->Size));

+      return;

+   }  

+

+   bind_buffer_range(ctx, index, bufObj, offset, size);

+}

+

+

+/**

+ * Specify a buffer object to receive vertex shader results.

+ * As above, but start at offset = 0.

+ */

+void GLAPIENTRY

+_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)

+{

+   struct gl_transform_feedback_object *obj;

+   struct gl_buffer_object *bufObj;

+   GLsizeiptr size;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");

+      return;

+   }

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   if (obj->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindBufferRange(transform feedback active)");

+      return;

+   }

+

+   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferBase(index=%d)", index);

+      return;

+   }

+

+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindBufferBase(invalid buffer=%u)", buffer);

+      return;

+   }

+

+   /* default size is the buffer size rounded down to nearest

+    * multiple of four.

+    */

+   size = bufObj->Size & ~0x3;

+

+   bind_buffer_range(ctx, index, bufObj, 0, size);

+}

+

+

+/**

+ * Specify a buffer object to receive vertex shader results, plus the

+ * offset in the buffer to start placing results.

+ * This function is part of GL_EXT_transform_feedback, but not GL3.

+ */

+void GLAPIENTRY

+_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,

+                          GLintptr offset)

+{

+   struct gl_transform_feedback_object *obj;

+   struct gl_buffer_object *bufObj;

+   GET_CURRENT_CONTEXT(ctx);

+   GLsizeiptr size;

+

+   if (target != GL_TRANSFORM_FEEDBACK_BUFFER) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferOffsetEXT(target)");

+      return;

+   }

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   if (obj->Active) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindBufferRange(transform feedback active)");

+      return;

+   }

+

+   if (index >= ctx->Const.MaxTransformFeedbackSeparateAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glBindBufferOffsetEXT(index=%d)", index);

+      return;

+   }

+

+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);

+   if (!bufObj) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindBufferOffsetEXT(invalid buffer=%u)", buffer);

+      return;

+   }

+

+   /* default size is the buffer size rounded down to nearest

+    * multiple of four.

+    */

+   size = (bufObj->Size - offset) & ~0x3;

+

+   bind_buffer_range(ctx, index, bufObj, offset, size);

+}

+

+

+/**

+ * This function specifies the vertex shader outputs to be written

+ * to the feedback buffer(s), and in what order.

+ */

+void GLAPIENTRY

+_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,

+                                const GLchar **varyings, GLenum bufferMode)

+{

+   struct gl_shader_program *shProg;

+   GLuint i;

+   GET_CURRENT_CONTEXT(ctx);

+

+   switch (bufferMode) {

+   case GL_INTERLEAVED_ATTRIBS:

+      break;

+   case GL_SEPARATE_ATTRIBS:

+      break;

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glTransformFeedbackVaryings(bufferMode)");

+      return;

+   }

+

+   if (count < 0 || count > ctx->Const.MaxTransformFeedbackSeparateAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glTransformFeedbackVaryings(count=%d)", count);

+      return;

+   }

+

+   shProg = _mesa_lookup_shader_program(ctx, program);

+   if (!shProg) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glTransformFeedbackVaryings(program=%u)", program);

+      return;

+   }

+

+   /* free existing varyings, if any */

+   for (i = 0; i < shProg->TransformFeedback.NumVarying; i++) {

+      free(shProg->TransformFeedback.VaryingNames[i]);

+   }

+   free(shProg->TransformFeedback.VaryingNames);

+

+   /* allocate new memory for varying names */

+   shProg->TransformFeedback.VaryingNames =

+      (GLchar **) malloc(count * sizeof(GLchar *));

+

+   if (!shProg->TransformFeedback.VaryingNames) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTransformFeedbackVaryings()");

+      return;

+   }

+

+   /* Save the new names and the count */

+   for (i = 0; i < (GLuint) count; i++) {

+      shProg->TransformFeedback.VaryingNames[i] = _mesa_strdup(varyings[i]);

+   }

+   shProg->TransformFeedback.NumVarying = count;

+

+   shProg->TransformFeedback.BufferMode = bufferMode;

+

+   /* The varyings won't be used until shader link time */

+}

+

+

+/**

+ * Get info about the vertex shader's outputs which are to be written

+ * to the feedback buffer(s).

+ */

+void GLAPIENTRY

+_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,

+                                  GLsizei bufSize, GLsizei *length,

+                                  GLsizei *size, GLenum *type, GLchar *name)

+{

+   const struct gl_shader_program *shProg;

+   const GLchar *varyingName;

+   GLint v;

+   GET_CURRENT_CONTEXT(ctx);

+

+   shProg = _mesa_lookup_shader_program(ctx, program);

+   if (!shProg) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glGetTransformFeedbackVaryings(program=%u)", program);

+      return;

+   }

+

+   if (index >= shProg->TransformFeedback.NumVarying) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glGetTransformFeedbackVaryings(index=%u)", index);

+      return;

+   }

+

+   varyingName = shProg->TransformFeedback.VaryingNames[index];

+

+   v = _mesa_lookup_parameter_index(shProg->Varying, -1, varyingName);

+   if (v >= 0) {

+      struct gl_program_parameter *param = &shProg->Varying->Parameters[v];

+

+      /* return the varying's name and length */

+      _mesa_copy_string(name, bufSize, length, varyingName);

+

+      /* return the datatype and value's size (in datatype units) */

+      if (type)

+         *type = param->DataType;

+      if (size)

+         *size = param->Size;

+   }

+   else {

+      name[0] = 0;

+      if (length)

+         *length = 0;

+      if (type)

+         *type = 0;

+      if (size)

+         *size = 0;

+   }

+}

+

+

+

+static struct gl_transform_feedback_object *

+lookup_transform_feedback_object(struct gl_context *ctx, GLuint name)

+{

+   if (name == 0) {

+      return ctx->TransformFeedback.DefaultObject;

+   }

+   else

+      return (struct gl_transform_feedback_object *)

+         _mesa_HashLookup(ctx->TransformFeedback.Objects, name);

+}

+

+

+/**

+ * Create new transform feedback objects.   Transform feedback objects

+ * encapsulate the state related to transform feedback to allow quickly

+ * switching state (and drawing the results, below).

+ * Part of GL_ARB_transform_feedback2.

+ */

+void GLAPIENTRY

+_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names)

+{

+   GLuint first;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenTransformFeedbacks(n < 0)");

+      return;

+   }

+

+   if (!names)

+      return;

+

+   /* we don't need contiguous IDs, but this might be faster */

+   first = _mesa_HashFindFreeKeyBlock(ctx->TransformFeedback.Objects, n);

+   if (first) {

+      GLsizei i;

+      for (i = 0; i < n; i++) {

+         struct gl_transform_feedback_object *obj

+            = ctx->Driver.NewTransformFeedback(ctx, first + i);

+         if (!obj) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTransformFeedbacks");

+            return;

+         }

+         names[i] = first + i;

+         _mesa_HashInsert(ctx->TransformFeedback.Objects, first + i, obj);

+      }

+   }

+   else {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTransformFeedbacks");

+   }

+}

+

+

+/**

+ * Is the given ID a transform feedback object?

+ * Part of GL_ARB_transform_feedback2.

+ */

+GLboolean GLAPIENTRY

+_mesa_IsTransformFeedback(GLuint name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (name && lookup_transform_feedback_object(ctx, name))

+      return GL_TRUE;

+   else

+      return GL_FALSE;

+}

+

+

+/**

+ * Bind the given transform feedback object.

+ * Part of GL_ARB_transform_feedback2.

+ */

+void GLAPIENTRY

+_mesa_BindTransformFeedback(GLenum target, GLuint name)

+{

+   struct gl_transform_feedback_object *obj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (target != GL_TRANSFORM_FEEDBACK) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindTransformFeedback(target)");

+      return;

+   }

+

+   if (ctx->TransformFeedback.CurrentObject->Active &&

+       !ctx->TransformFeedback.CurrentObject->Paused) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+              "glBindTransformFeedback(transform is active, or not paused)");

+      return;

+   }

+

+   obj = lookup_transform_feedback_object(ctx, name);

+   if (!obj) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glBindTransformFeedback(name=%u)", name);

+      return;

+   }

+

+   reference_transform_feedback_object(&ctx->TransformFeedback.CurrentObject,

+                                       obj);

+}

+

+

+/**

+ * Delete the given transform feedback objects.

+ * Part of GL_ARB_transform_feedback2.

+ */

+void GLAPIENTRY

+_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names)

+{

+   GLint i;

+   GET_CURRENT_CONTEXT(ctx);

+

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteTransformFeedbacks(n < 0)");

+      return;

+   }

+

+   if (!names)

+      return;

+

+   for (i = 0; i < n; i++) {

+      if (names[i] > 0) {

+         struct gl_transform_feedback_object *obj

+            = lookup_transform_feedback_object(ctx, names[i]);

+         if (obj) {

+            if (obj->Active) {

+               _mesa_error(ctx, GL_INVALID_OPERATION,

+                           "glDeleteTransformFeedbacks(object %u is active)",

+                           names[i]);

+               return;

+            }

+            _mesa_HashRemove(ctx->TransformFeedback.Objects, names[i]);

+            /* unref, but object may not be deleted until later */

+            reference_transform_feedback_object(&obj, NULL);

+         }

+      }

+   }

+}

+

+

+/**

+ * Pause transform feedback.

+ * Part of GL_ARB_transform_feedback2.

+ */

+void GLAPIENTRY

+_mesa_PauseTransformFeedback(void)

+{

+   struct gl_transform_feedback_object *obj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   if (!obj->Active || obj->Paused) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+           "glPauseTransformFeedback(feedback not active or already paused)");

+      return;

+   }

+

+   obj->Paused = GL_TRUE;

+

+   assert(ctx->Driver.PauseTransformFeedback);

+   ctx->Driver.PauseTransformFeedback(ctx, obj);

+}

+

+

+/**

+ * Resume transform feedback.

+ * Part of GL_ARB_transform_feedback2.

+ */

+void GLAPIENTRY

+_mesa_ResumeTransformFeedback(void)

+{

+   struct gl_transform_feedback_object *obj;

+   GET_CURRENT_CONTEXT(ctx);

+

+   obj = ctx->TransformFeedback.CurrentObject;

+

+   if (!obj->Active || !obj->Paused) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+               "glPauseTransformFeedback(feedback not active or not paused)");

+      return;

+   }

+

+   obj->Paused = GL_FALSE;

+

+   assert(ctx->Driver.ResumeTransformFeedback);

+   ctx->Driver.ResumeTransformFeedback(ctx, obj);

+}

+

+

+/**

+ * Draw the vertex data in a transform feedback object.

+ * \param mode  GL_POINTS, GL_LINES, GL_TRIANGLE_STRIP, etc.

+ * \param name  the transform feedback object

+ * The number of vertices comes from the transform feedback object.

+ * User still has to setup of the vertex attribute info with

+ * glVertexPointer, glColorPointer, etc.

+ * Part of GL_ARB_transform_feedback2.

+ */

+void GLAPIENTRY

+_mesa_DrawTransformFeedback(GLenum mode, GLuint name)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct gl_transform_feedback_object *obj =

+      lookup_transform_feedback_object(ctx, name);

+

+   if (mode > GL_POLYGON) {

+      _mesa_error(ctx, GL_INVALID_ENUM,

+                  "glDrawTransformFeedback(mode=0x%x)", mode);

+      return;

+   }

+   if (!obj) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glDrawTransformFeedback(name = %u)", name);

+      return;

+   }

+

+   /* XXX check if EndTransformFeedback has never been called while

+    * the object was bound

+    */

+

+   assert(ctx->Driver.DrawTransformFeedback);

+   ctx->Driver.DrawTransformFeedback(ctx, mode, obj);

+}

+

+

+/*

+XXX misc to do:

+

+glGet*() for

+

+GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED

+GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE

+GL_TRANSFORM_FEEDBACK_BINDING

+*/

+

+

+#endif /* FEATURE_EXT_transform_feedback */

diff --git a/mesalib/src/mesa/main/transformfeedback.h b/mesalib/src/mesa/main/transformfeedback.h
index 4d38522d6..add8d22d6 100644
--- a/mesalib/src/mesa/main/transformfeedback.h
+++ b/mesalib/src/mesa/main/transformfeedback.h
@@ -1,132 +1,137 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS 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 TRANSFORM_FEEDBACK_H
-#define TRANSFORM_FEEDBACK_H
-
-#include "main/mtypes.h"
-
-
-extern void
-_mesa_init_transform_feedback(GLcontext *ctx);
-
-extern void
-_mesa_free_transform_feedback(GLcontext *ctx);
-
-#if FEATURE_EXT_transform_feedback
-
-extern GLboolean
-_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode);
-
-extern GLboolean
-_mesa_validate_transform_feedback_buffers(GLcontext *ctx);
-
-
-extern void
-_mesa_init_transform_feedback_functions(struct dd_function_table *driver);
-
-extern void
-_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp);
-
-
-/*** GL_EXT_transform_feedback ***/
-
-extern void GLAPIENTRY
-_mesa_BeginTransformFeedback(GLenum mode);
-
-extern void GLAPIENTRY
-_mesa_EndTransformFeedback(void);
-
-extern void GLAPIENTRY
-_mesa_BindBufferRange(GLenum target, GLuint index,
-                      GLuint buffer, GLintptr offset, GLsizeiptr size);
-
-extern void GLAPIENTRY
-_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer);
-
-extern void GLAPIENTRY
-_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
-                          GLintptr offset);
-
-extern void GLAPIENTRY
-_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
-                                const GLchar **varyings, GLenum bufferMode);
-
-extern void GLAPIENTRY
-_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
-                                  GLsizei bufSize, GLsizei *length,
-                                  GLsizei *size, GLenum *type, GLchar *name);
-
-
-
-/*** GL_ARB_transform_feedback2 ***/
-
-extern void GLAPIENTRY
-_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsTransformFeedback(GLuint name);
-
-extern void GLAPIENTRY
-_mesa_BindTransformFeedback(GLenum target, GLuint name);
-
-extern void GLAPIENTRY
-_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names);
-
-extern void GLAPIENTRY
-_mesa_PauseTransformFeedback(void);
-
-extern void GLAPIENTRY
-_mesa_ResumeTransformFeedback(void);
-
-extern void GLAPIENTRY
-_mesa_DrawTransformFeedback(GLenum mode, GLuint name);
-
-#else /* FEATURE_EXT_transform_feedback */
-
-static INLINE GLboolean
-_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
-{
-   return GL_TRUE;
-}
-
-static INLINE GLboolean
-_mesa_validate_transform_feedback_buffers(GLcontext *ctx)
-{
-   return GL_TRUE;
-}
-
-static INLINE void
-_mesa_init_transform_feedback_functions(struct dd_function_table *driver)
-{
-}
-
-static INLINE void
-_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_EXT_transform_feedback */
-
-#endif /* TRANSFORM_FEEDBACK_H */
+/*

+ * Mesa 3-D graphics library

+ *

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS 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 TRANSFORM_FEEDBACK_H

+#define TRANSFORM_FEEDBACK_H

+

+#include "compiler.h"

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct _glapi_table;

+struct dd_function_table;

+struct gl_context;

+

+extern void

+_mesa_init_transform_feedback(struct gl_context *ctx);

+

+extern void

+_mesa_free_transform_feedback(struct gl_context *ctx);

+

+#if FEATURE_EXT_transform_feedback

+

+extern GLboolean

+_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode);

+

+extern GLboolean

+_mesa_validate_transform_feedback_buffers(struct gl_context *ctx);

+

+

+extern void

+_mesa_init_transform_feedback_functions(struct dd_function_table *driver);

+

+extern void

+_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp);

+

+

+/*** GL_EXT_transform_feedback ***/

+

+extern void GLAPIENTRY

+_mesa_BeginTransformFeedback(GLenum mode);

+

+extern void GLAPIENTRY

+_mesa_EndTransformFeedback(void);

+

+extern void GLAPIENTRY

+_mesa_BindBufferRange(GLenum target, GLuint index,

+                      GLuint buffer, GLintptr offset, GLsizeiptr size);

+

+extern void GLAPIENTRY

+_mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer);

+

+extern void GLAPIENTRY

+_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,

+                          GLintptr offset);

+

+extern void GLAPIENTRY

+_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,

+                                const GLchar **varyings, GLenum bufferMode);

+

+extern void GLAPIENTRY

+_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,

+                                  GLsizei bufSize, GLsizei *length,

+                                  GLsizei *size, GLenum *type, GLchar *name);

+

+

+

+/*** GL_ARB_transform_feedback2 ***/

+

+extern void GLAPIENTRY

+_mesa_GenTransformFeedbacks(GLsizei n, GLuint *names);

+

+extern GLboolean GLAPIENTRY

+_mesa_IsTransformFeedback(GLuint name);

+

+extern void GLAPIENTRY

+_mesa_BindTransformFeedback(GLenum target, GLuint name);

+

+extern void GLAPIENTRY

+_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names);

+

+extern void GLAPIENTRY

+_mesa_PauseTransformFeedback(void);

+

+extern void GLAPIENTRY

+_mesa_ResumeTransformFeedback(void);

+

+extern void GLAPIENTRY

+_mesa_DrawTransformFeedback(GLenum mode, GLuint name);

+

+#else /* FEATURE_EXT_transform_feedback */

+

+static INLINE GLboolean

+_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode)

+{

+   return GL_TRUE;

+}

+

+static INLINE GLboolean

+_mesa_validate_transform_feedback_buffers(struct gl_context *ctx)

+{

+   return GL_TRUE;

+}

+

+static INLINE void

+_mesa_init_transform_feedback_functions(struct dd_function_table *driver)

+{

+}

+

+static INLINE void

+_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)

+{

+}

+

+#endif /* FEATURE_EXT_transform_feedback */

+

+#endif /* TRANSFORM_FEEDBACK_H */

diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index a5d7da51f..a6fdabea7 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -1,1382 +1,1662 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2004-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
- * 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/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"
-
-
-
-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(GLcontext *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 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 */
-      if (p->Size <= 4) {
-         *rows = 1;
-         *cols = p->Size;
-      }
-      else {
-         *rows = p->Size / 4 + 1;
-         if (p->Size % 4 == 0)
-            *cols = 4;
-         else
-            *cols = p->Size % 4;
-      }
-   }
-}
-
-
-/**
- * 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(GLcontext *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(GLcontext *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++) {
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = prog->Parameters->ParameterValues[paramPos+i][j];
-         }
-      }
-   }
-}
-
-
-/**
- * Called via glGetUniformiv().
- * \sa _mesa_get_uniformfv, only difference is a cast.
- */
-static void
-_mesa_get_uniformiv(GLcontext *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++) {
-         for (j = 0; j < cols; j++ ) {
-            params[k++] = (GLint) prog->Parameters->ParameterValues[paramPos+i][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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, location, 1, v, GL_FLOAT_VEC4);
-}
-
-void GLAPIENTRY
-_mesa_Uniform1iARB(GLint location, GLint v0)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_uniform(ctx, ctx->Shader.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram, 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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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.CurrentProgram,
-			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);
-}
-
-
-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 */
-   (void) _mesa_Uniform1ui;
-   (void) _mesa_Uniform2ui;
-   (void) _mesa_Uniform3ui;
-   (void) _mesa_Uniform4ui;
-   (void) _mesa_Uniform1uiv;
-   (void) _mesa_Uniform2uiv;
-   (void) _mesa_Uniform3uiv;
-   (void) _mesa_Uniform4uiv;
-#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/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 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},

+};

+

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

+

+   {NULL, NULL, 0}

+};

+

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

+      if (p->Size <= 4) {

+         *rows = 1;

+         *cols = p->Size;

+      }

+      else {

+         *rows = p->Size / 4 + 1;

+         if (p->Size % 4 == 0)

+            *cols = 4;

+         else

+            *cols = p->Size % 4;

+      }

+   }

+}

+

+

+/**

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

+         for (j = 0; j < cols; j++ ) {

+            params[k++] = prog->Parameters->ParameterValues[paramPos+i][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++) {

+         for (j = 0; j < cols; j++ ) {

+            params[k++] = (GLint) prog->Parameters->ParameterValues[paramPos+i][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++) {

+         for (j = 0; j < cols; j++ ) {

+            params[k++] = (GLuint) prog->Parameters->ParameterValues[paramPos+i][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/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h
index f823c6144..3a85144fa 100644
--- a/mesalib/src/mesa/main/uniforms.h
+++ b/mesalib/src/mesa/main/uniforms.h
@@ -1,175 +1,193 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS 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 UNIFORMS_H
-#define UNIFORMS_H
-
-#include "glheader.h"
-
-struct gl_program;
-struct _glapi_table;
-
-extern void GLAPIENTRY
-_mesa_Uniform1fARB(GLint, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-
-extern void GLAPIENTRY
-_mesa_Uniform1iARB(GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform2iARB(GLint, GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);
-
-extern void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);
-
-extern void GLAPIENTRY
-_mesa_Uniform1ui(GLint location, GLuint v0);
-
-extern void GLAPIENTRY
-_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1);
-
-extern void GLAPIENTRY
-_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
-
-extern void GLAPIENTRY
-_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-
-extern void GLAPIENTRY
-_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value);
-
-extern void GLAPIENTRY
-_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value);
-
-extern void GLAPIENTRY
-_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
-
-extern void GLAPIENTRY
-_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
-
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-extern void GLAPIENTRY
-_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
-                         const GLfloat *value);
-
-
-extern void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,
-                          GLint *, GLenum *, GLcharARB *);
-
-extern void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);
-
-extern void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);
-
-extern GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
-
-GLint
-_mesa_get_uniform_location(GLcontext *ctx, struct gl_shader_program *shProg,
-			   const GLchar *name);
-
-void
-_mesa_uniform(GLcontext *ctx, struct gl_shader_program *shader_program,
-	      GLint location, GLsizei count,
-              const GLvoid *values, GLenum type);
-
-void
-_mesa_uniform_matrix(GLcontext *ctx, struct gl_shader_program *shProg,
-		     GLint cols, GLint rows,
-                     GLint location, GLsizei count,
-                     GLboolean transpose, const GLfloat *values);
-
-extern void
-_mesa_update_shader_textures_used(struct gl_program *prog);
-
-
-extern void
-_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);
-
-#endif /* UNIFORMS_H */
+/*

+ * Mesa 3-D graphics library

+ *

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS 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 UNIFORMS_H

+#define UNIFORMS_H

+

+#include "glheader.h"

+#include "program/prog_parameter.h"

+

+struct gl_program;

+struct _glapi_table;

+

+extern void GLAPIENTRY

+_mesa_Uniform1fARB(GLint, GLfloat);

+

+extern void GLAPIENTRY

+_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);

+

+extern void GLAPIENTRY

+_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);

+

+extern void GLAPIENTRY

+_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);

+

+extern void GLAPIENTRY

+_mesa_Uniform1iARB(GLint, GLint);

+

+extern void GLAPIENTRY

+_mesa_Uniform2iARB(GLint, GLint, GLint);

+

+extern void GLAPIENTRY

+_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);

+

+extern void GLAPIENTRY

+_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);

+

+extern void GLAPIENTRY

+_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);

+

+extern void GLAPIENTRY

+_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);

+

+extern void GLAPIENTRY

+_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);

+

+extern void GLAPIENTRY

+_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);

+

+extern void GLAPIENTRY

+_mesa_Uniform1ui(GLint location, GLuint v0);

+

+extern void GLAPIENTRY

+_mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1);

+

+extern void GLAPIENTRY

+_mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);

+

+extern void GLAPIENTRY

+_mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);

+

+extern void GLAPIENTRY

+_mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value);

+

+extern void GLAPIENTRY

+_mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value);

+

+extern void GLAPIENTRY

+_mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);

+

+extern void GLAPIENTRY

+_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);

+

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value);

+

+extern void GLAPIENTRY

+_mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,

+                         const GLfloat *value);

+

+

+extern void GLAPIENTRY

+_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,

+                          GLint *, GLenum *, GLcharARB *);

+

+extern void GLAPIENTRY

+_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);

+

+extern void GLAPIENTRY

+_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);

+

+extern void GLAPIENTRY

+_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params);

+

+extern GLint GLAPIENTRY

+_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);

+

+GLint

+_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,

+			   const GLchar *name);

+

+void

+_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program,

+	      GLint location, GLsizei count,

+              const GLvoid *values, GLenum type);

+

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

+

+extern void

+_mesa_update_shader_textures_used(struct gl_program *prog);

+

+

+extern void

+_mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);

+

+struct gl_builtin_uniform_element {

+   const char *field;

+   int tokens[STATE_LENGTH];

+   int swizzle;

+};

+

+struct gl_builtin_uniform_desc {

+   const char *name;

+   struct gl_builtin_uniform_element *elements;

+   unsigned int num_elements;

+};

+

+extern const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[];

+

+#endif /* UNIFORMS_H */

diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index d19de7ff6..92367a842 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -1,1442 +1,1172 @@
-/*
- * 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.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "bufferobj.h"
-#include "context.h"
-#include "enable.h"
-#include "enums.h"
-#include "hash.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "varray.h"
-#include "arrayobj.h"
-#include "main/dispatch.h"
-
-
-/**
- * Set the fields of a vertex array.
- * Also do an error check for GL_ARB_vertex_array_object: check that
- * all arrays reside in VBOs when using a vertex array object.
- *
- * \param array  the array to update
- * \param dirtyBit  which bit to set in ctx->Array.NewState for this array
- * \param elementSize  size of each array element, in bytes
- * \param size  components per element (1, 2, 3 or 4)
- * \param type  datatype of each component (GL_FLOAT, GL_INT, etc)
- * \param format  either GL_RGBA or GL_BGRA
- * \param stride  stride between elements, in elements
- * \param normalized  are integer types converted to floats in [-1, 1]?
- * \param ptr  the address (or offset inside VBO) of the array data
- */
-static void
-update_array(GLcontext *ctx, struct gl_client_array *array,
-             GLbitfield dirtyBit, GLsizei elementSize,
-             GLint size, GLenum type, GLenum format,
-             GLsizei stride, GLboolean normalized, const GLvoid *ptr)
-{
-   ASSERT(format == GL_RGBA || format == GL_BGRA);
-
-   if (ctx->Array.ArrayObj->VBOonly &&
-       ctx->Array.ArrayBufferObj->Name == 0) {
-      /* GL_ARB_vertex_array_object requires that all arrays reside in VBOs.
-       * Generate GL_INVALID_OPERATION if that's not true.
-       */
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glVertex/Normal/EtcPointer(non-VBO array)");
-      return;
-   }
-
-   array->Size = size;
-   array->Type = type;
-   array->Format = format;
-   array->Stride = stride;
-   array->StrideB = stride ? stride : elementSize;
-   array->Normalized = normalized;
-   array->Ptr = (const GLubyte *) ptr;
-   array->_ElementSize = elementSize;
-
-   _mesa_reference_buffer_object(ctx, &array->BufferObj,
-                                 ctx->Array.ArrayBufferObj);
-
-   ctx->NewState |= _NEW_ARRAY;
-   ctx->Array.NewState |= dirtyBit;
-}
-
-
-void GLAPIENTRY
-_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GLsizei elementSize;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (size < 2 || size > 4) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexPointer(size)" );
-      return;
-   }
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glVertexPointer(stride)" );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      _mesa_debug(ctx, "glVertexPointer( sz %d type %s stride %d )\n", size,
-                  _mesa_lookup_enum_by_nr( type ), stride);
-
-   /* always need to check that <type> is legal */
-   switch (type) {
-      case GL_SHORT:
-         elementSize = size * sizeof(GLshort);
-         break;
-      case GL_INT:
-         elementSize = size * sizeof(GLint);
-         break;
-      case GL_FLOAT:
-         elementSize = size * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = size * sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = size * sizeof(GLhalfARB);
-         break;
-#if FEATURE_fixedpt
-      case GL_FIXED:
-         elementSize = size * sizeof(GLfixed);
-         break;
-#endif
-#if FEATURE_vertex_array_byte
-      case GL_BYTE:
-         elementSize = size * sizeof(GLbyte);
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexPointer(type=%s)",
-                      _mesa_lookup_enum_by_nr(type));
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,
-                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
-{
-   GLsizei elementSize;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glNormalPointer(stride)" );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      _mesa_debug(ctx, "glNormalPointer( type %s stride %d )\n",
-                  _mesa_lookup_enum_by_nr( type ), stride);
-
-   switch (type) {
-      case GL_BYTE:
-         elementSize = 3 * sizeof(GLbyte);
-         break;
-      case GL_SHORT:
-         elementSize = 3 * sizeof(GLshort);
-         break;
-      case GL_INT:
-         elementSize = 3 * sizeof(GLint);
-         break;
-      case GL_FLOAT:
-         elementSize = 3 * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = 3 * sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = 3 * sizeof(GLhalfARB);
-         break;
-#if FEATURE_fixedpt
-      case GL_FIXED:
-         elementSize = 3 * sizeof(GLfixed);
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glNormalPointer(type=%s)",
-                      _mesa_lookup_enum_by_nr(type));
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,
-                elementSize, 3, type, GL_RGBA, stride, GL_TRUE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GLsizei elementSize;
-   GLenum format;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (size < 3 || size > 4) {
-      if (!ctx->Extensions.EXT_vertex_array_bgra || size != GL_BGRA) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glColorPointer(size)");
-         return;
-      }
-   }
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glColorPointer(stride)" );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      _mesa_debug(ctx, "glColorPointer( sz %d type %s stride %d )\n", size,
-                  _mesa_lookup_enum_by_nr( type ), stride);
-
-   if (size == GL_BGRA) {
-      if (type != GL_UNSIGNED_BYTE) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glColorPointer(GL_BGRA/GLubyte)");
-         return;
-      }
-      format = GL_BGRA;
-      size = 4;
-   }
-   else {
-      format = GL_RGBA;
-   }
-
-   switch (type) {
-      case GL_BYTE:
-         elementSize = size * sizeof(GLbyte);
-         break;
-      case GL_UNSIGNED_BYTE:
-         elementSize = size * sizeof(GLubyte);
-         break;
-      case GL_SHORT:
-         elementSize = size * sizeof(GLshort);
-         break;
-      case GL_UNSIGNED_SHORT:
-         elementSize = size * sizeof(GLushort);
-         break;
-      case GL_INT:
-         elementSize = size * sizeof(GLint);
-         break;
-      case GL_UNSIGNED_INT:
-         elementSize = size * sizeof(GLuint);
-         break;
-      case GL_FLOAT:
-         elementSize = size * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = size * sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = size * sizeof(GLhalfARB);
-         break;
-#if FEATURE_fixedpt
-      case GL_FIXED:
-         elementSize = size * sizeof(GLfixed);
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glColorPointer(type=%s)",
-                      _mesa_lookup_enum_by_nr(type));
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,
-                elementSize, size, type, format, stride, GL_TRUE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GLint elementSize;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glFogCoordPointer(stride)" );
-      return;
-   }
-
-   switch (type) {
-      case GL_FLOAT:
-         elementSize = sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = sizeof(GLhalfARB);
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glFogCoordPointer(type)" );
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GLsizei elementSize;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glIndexPointer(stride)" );
-      return;
-   }
-
-   switch (type) {
-      case GL_UNSIGNED_BYTE:
-         elementSize = sizeof(GLubyte);
-         break;
-      case GL_SHORT:
-         elementSize = sizeof(GLshort);
-         break;
-      case GL_INT:
-         elementSize = sizeof(GLint);
-         break;
-      case GL_FLOAT:
-         elementSize = sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = sizeof(GLdouble);
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glIndexPointer(type)" );
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
-			       GLsizei stride, const GLvoid *ptr)
-{
-   GLsizei elementSize;
-   GLenum format;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (size != 3 && size != 4) {
-      if (!ctx->Extensions.EXT_vertex_array_bgra || size != GL_BGRA) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(size)");
-         return;
-      }
-   }
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glSecondaryColorPointer(stride)" );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      _mesa_debug(ctx, "glSecondaryColorPointer( sz %d type %s stride %d )\n",
-                  size, _mesa_lookup_enum_by_nr( type ), stride);
-
-   if (size == GL_BGRA) {
-      if (type != GL_UNSIGNED_BYTE) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glColorPointer(GL_BGRA/GLubyte)");
-         return;
-      }
-      format = GL_BGRA;
-      size = 4;
-   }
-   else {
-      format = GL_RGBA;
-   }
-
-   switch (type) {
-      case GL_BYTE:
-         elementSize = size * sizeof(GLbyte);
-         break;
-      case GL_UNSIGNED_BYTE:
-         elementSize = size * sizeof(GLubyte);
-         break;
-      case GL_SHORT:
-         elementSize = size * sizeof(GLshort);
-         break;
-      case GL_UNSIGNED_SHORT:
-         elementSize = size * sizeof(GLushort);
-         break;
-      case GL_INT:
-         elementSize = size * sizeof(GLint);
-         break;
-      case GL_UNSIGNED_INT:
-         elementSize = size * sizeof(GLuint);
-         break;
-      case GL_FLOAT:
-         elementSize = size * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = size * sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = size * sizeof(GLhalfARB);
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glSecondaryColorPointer(type=%s)",
-                      _mesa_lookup_enum_by_nr(type));
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->SecondaryColor, _NEW_ARRAY_COLOR1,
-                elementSize, size, type, format, stride, GL_TRUE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
-                      const GLvoid *ptr)
-{
-   GLint elementSize;
-   GET_CURRENT_CONTEXT(ctx);
-   const GLuint unit = ctx->Array.ActiveTexture;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (size < 1 || size > 4) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glTexCoordPointer(size)" );
-      return;
-   }
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glTexCoordPointer(stride)" );
-      return;
-   }
-
-   if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
-      _mesa_debug(ctx, "glTexCoordPointer(unit %u sz %d type %s stride %d)\n",
-                  unit, size, _mesa_lookup_enum_by_nr( type ), stride);
-
-   /* always need to check that <type> is legal */
-   switch (type) {
-      case GL_SHORT:
-         elementSize = size * sizeof(GLshort);
-         break;
-      case GL_INT:
-         elementSize = size * sizeof(GLint);
-         break;
-      case GL_FLOAT:
-         elementSize = size * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = size * sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = size * sizeof(GLhalfARB);
-         break;
-#if FEATURE_fixedpt
-      case GL_FIXED:
-         elementSize = size * sizeof(GLfixed);
-         break;
-#endif
-#if FEATURE_vertex_array_byte
-      case GL_BYTE:
-         elementSize = size * sizeof(GLbyte);
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glTexCoordPointer(type=%s)",
-                      _mesa_lookup_enum_by_nr(type));
-         return;
-   }
-
-   ASSERT(unit < Elements(ctx->Array.ArrayObj->TexCoord));
-
-   update_array(ctx, &ctx->Array.ArrayObj->TexCoord[unit],
-                _NEW_ARRAY_TEXCOORD(unit),
-                elementSize, size, type, GL_RGBA, stride, GL_FALSE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glEdgeFlagPointer(stride)" );
-      return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,
-                sizeof(GLboolean), 1, GL_UNSIGNED_BYTE, GL_RGBA,
-                stride, GL_FALSE, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
-{
-   GLsizei elementSize;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glPointSizePointer(stride)" );
-      return;
-   }
-
-   switch (type) {
-      case GL_FLOAT:
-         elementSize = sizeof(GLfloat);
-         break;
-#if FEATURE_fixedpt
-      case GL_FIXED:
-         elementSize = sizeof(GLfixed);
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glPointSizePointer(type)" );
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->PointSize, _NEW_ARRAY_POINT_SIZE,
-                elementSize, 1, type, GL_RGBA, stride, GL_FALSE, ptr);
-}
-
-
-#if FEATURE_NV_vertex_program
-/**
- * Set a vertex attribute array.
- * Note that these arrays DO alias the conventional GL vertex arrays
- * (position, normal, color, fog, texcoord, etc).
- * The generic attribute slots at #16 and above are not touched.
- */
-void GLAPIENTRY
-_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
-                            GLsizei stride, const GLvoid *ptr)
-{
-   GLboolean normalized = GL_FALSE;
-   GLsizei elementSize;
-   GLenum format;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)");
-      return;
-   }
-
-   if (size < 1 || size > 4) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size)");
-      return;
-   }
-
-   if (stride < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(stride)");
-      return;
-   }
-
-   if (type == GL_UNSIGNED_BYTE && size != 4) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size!=4)");
-      return;
-   }
-
-   if (size == GL_BGRA) {
-      if (type != GL_UNSIGNED_BYTE) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glVertexAttribPointerNV(GL_BGRA/type)");
-         return;
-      }
-
-      format = GL_BGRA;
-      size = 4;
-      normalized = GL_TRUE;
-   }
-   else {
-      format = GL_RGBA;
-   }
-
-   /* check for valid 'type' and compute StrideB right away */
-   switch (type) {
-      case GL_UNSIGNED_BYTE:
-         normalized = GL_TRUE;
-         elementSize = size * sizeof(GLubyte);
-         break;
-      case GL_SHORT:
-         elementSize = size * sizeof(GLshort);
-         break;
-      case GL_FLOAT:
-         elementSize = size * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = size * sizeof(GLdouble);
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerNV(type=%s)",
-                      _mesa_lookup_enum_by_nr(type));
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
-                _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, format, stride, normalized, ptr);
-}
-#endif
-
-
-#if FEATURE_ARB_vertex_program
-/**
- * Set a generic vertex attribute array.
- * Note that these arrays DO NOT alias the conventional GL vertex arrays
- * (position, normal, color, fog, texcoord, etc).
- */
-void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
-                             GLboolean normalized,
-                             GLsizei stride, const GLvoid *ptr)
-{
-   GLsizei elementSize;
-   GLenum format;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(index)");
-      return;
-   }
-
-   if (size < 1 || size > 4) {
-      if (!ctx->Extensions.EXT_vertex_array_bgra || size != GL_BGRA) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(size)");
-         return;
-      }
-   }
-
-   if (stride < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(stride)");
-      return;
-   }
-
-   if (size == GL_BGRA) {
-      if (type != GL_UNSIGNED_BYTE) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glVertexAttribPointerARB(GL_BGRA/type)");
-         return;
-      }
-      if (normalized != GL_TRUE) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glVertexAttribPointerARB(GL_BGRA/normalized)");
-         return;
-      }
-
-      format = GL_BGRA;
-      size = 4;
-   }
-   else {
-      format = GL_RGBA;
-   }
-
-   /* check for valid 'type' and compute StrideB right away */
-   /* NOTE: more types are supported here than in the NV extension */
-   switch (type) {
-      case GL_BYTE:
-         elementSize = size * sizeof(GLbyte);
-         break;
-      case GL_UNSIGNED_BYTE:
-         elementSize = size * sizeof(GLubyte);
-         break;
-      case GL_SHORT:
-         elementSize = size * sizeof(GLshort);
-         break;
-      case GL_UNSIGNED_SHORT:
-         elementSize = size * sizeof(GLushort);
-         break;
-      case GL_INT:
-         elementSize = size * sizeof(GLint);
-         break;
-      case GL_UNSIGNED_INT:
-         elementSize = size * sizeof(GLuint);
-         break;
-      case GL_FLOAT:
-         elementSize = size * sizeof(GLfloat);
-         break;
-      case GL_DOUBLE:
-         elementSize = size * sizeof(GLdouble);
-         break;
-      case GL_HALF_FLOAT:
-         elementSize = size * sizeof(GLhalfARB);
-         break;
-#if FEATURE_fixedpt
-      case GL_FIXED:
-         elementSize = size * sizeof(GLfixed);
-         break;
-#endif
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glVertexAttribPointerARB(type)" );
-         return;
-   }
-
-   update_array(ctx, &ctx->Array.ArrayObj->VertexAttrib[index],
-                _NEW_ARRAY_ATTRIB(index),
-                elementSize, size, type, format, stride, normalized, ptr);
-}
-#endif
-
-
-/**
- * New in GL3:
- * Set an integer-valued vertex attribute array.
- * Note that these arrays DO NOT alias the conventional GL vertex arrays
- * (position, normal, color, fog, texcoord, etc).
- */
-void GLAPIENTRY
-_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
-                           GLboolean normalized,
-                           GLsizei stride, const GLvoid *ptr)
-{
-   /* NOTE: until we have integer-valued vertex attributes, just
-    * route this through the regular glVertexAttribPointer() function.
-    */
-   _mesa_VertexAttribPointerARB(index, size, type, normalized, stride, ptr);
-}
-
-
-
-void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glEnableVertexAttribArrayARB(index)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   FLUSH_VERTICES(ctx, _NEW_ARRAY);
-   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_TRUE;
-   ctx->Array.ArrayObj->_Enabled |= _NEW_ARRAY_ATTRIB(index);
-   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
-}
-
-
-void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glEnableVertexAttribArrayARB(index)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   FLUSH_VERTICES(ctx, _NEW_ARRAY);
-   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_FALSE;
-   ctx->Array.ArrayObj->_Enabled &= ~_NEW_ARRAY_ATTRIB(index);
-   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
-}
-
-
-/**
- * Return info for a vertex attribute array (no alias with legacy
- * vertex attributes (pos, normal, color, etc)).  This function does
- * not handle the 4-element GL_CURRENT_VERTEX_ATTRIB_ARB query.
- */
-static GLuint
-get_vertex_array_attrib(GLcontext *ctx, GLuint index, GLenum pname,
-                  const char *caller)
-{
-   const struct gl_client_array *array;
-
-   if (index >= MAX_VERTEX_GENERIC_ATTRIBS) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)", caller, index);
-      return 0;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   array = &ctx->Array.ArrayObj->VertexAttrib[index];
-
-   switch (pname) {
-   case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
-      return array->Enabled;
-   case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
-      return array->Size;
-   case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
-      return array->Stride;
-   case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
-      return array->Type;
-   case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:
-      return array->Normalized;
-   case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-      return array->BufferObj->Name;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=0x%x)", caller, pname);
-      return 0;
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-      if (index == 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetVertexAttribfv(index==0)");
-      }
-      else {
-         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
-         FLUSH_CURRENT(ctx, 0);
-         COPY_4V(params, v);
-      }
-   }
-   else {
-      params[0] = (GLfloat) get_vertex_array_attrib(ctx, index, pname,
-                                                    "glGetVertexAttribfv");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-      if (index == 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetVertexAttribdv(index==0)");
-      }
-      else {
-         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
-         FLUSH_CURRENT(ctx, 0);
-         params[0] = (GLdouble) v[0];
-         params[1] = (GLdouble) v[1];
-         params[2] = (GLdouble) v[2];
-         params[3] = (GLdouble) v[3];
-      }
-   }
-   else {
-      params[0] = (GLdouble) get_vertex_array_attrib(ctx, index, pname,
-                                                     "glGetVertexAttribdv");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-      if (index == 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetVertexAttribiv(index==0)");
-      }
-      else {
-         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
-         FLUSH_CURRENT(ctx, 0);
-         /* XXX should floats in[0,1] be scaled to full int range? */
-         params[0] = (GLint) v[0];
-         params[1] = (GLint) v[1];
-         params[2] = (GLint) v[2];
-         params[3] = (GLint) v[3];
-      }
-   }
-   else {
-      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,
-                                                  "glGetVertexAttribiv");
-   }
-}
-
-
-/** GL 3.0 */
-void GLAPIENTRY
-_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-      if (index == 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetVertexAttribIiv(index==0)");
-      }
-      else {
-         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
-         FLUSH_CURRENT(ctx, 0);
-         /* XXX we don't have true integer-valued vertex attribs yet */
-         params[0] = (GLint) v[0];
-         params[1] = (GLint) v[1];
-         params[2] = (GLint) v[2];
-         params[3] = (GLint) v[3];
-      }
-   }
-   else {
-      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,
-                                                  "glGetVertexAttribIiv");
-   }
-}
-
-
-/** GL 3.0 */
-void GLAPIENTRY
-_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {
-      if (index == 0) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetVertexAttribIuiv(index==0)");
-      }
-      else {
-         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];
-         FLUSH_CURRENT(ctx, 0);
-         /* XXX we don't have true integer-valued vertex attribs yet */
-         params[0] = (GLuint) v[0];
-         params[1] = (GLuint) v[1];
-         params[2] = (GLuint) v[2];
-         params[3] = (GLuint) v[3];
-      }
-   }
-   else {
-      params[0] = get_vertex_array_attrib(ctx, index, pname,
-                                          "glGetVertexAttribIuiv");
-   }
-}
-
-
-void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (index >= ctx->Const.VertexProgram.MaxAttribs) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerARB(index)");
-      return;
-   }
-
-   if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerARB(pname)");
-      return;
-   }
-
-   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));
-
-   *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;
-}
-
-
-void GLAPIENTRY
-_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
-                       GLsizei count, const GLvoid *ptr)
-{
-   (void) count;
-   _mesa_VertexPointer(size, type, stride, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                       const GLvoid *ptr)
-{
-   (void) count;
-   _mesa_NormalPointer(type, stride, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr)
-{
-   (void) count;
-   _mesa_ColorPointer(size, type, stride, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr)
-{
-   (void) count;
-   _mesa_IndexPointer(type, stride, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
-                         GLsizei count, const GLvoid *ptr)
-{
-   (void) count;
-   _mesa_TexCoordPointer(size, type, stride, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
-{
-   (void) count;
-   _mesa_EdgeFlagPointer(stride, ptr);
-}
-
-
-void GLAPIENTRY
-_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLboolean tflag, cflag, nflag;  /* enable/disable flags */
-   GLint tcomps, ccomps, vcomps;   /* components per texcoord, color, vertex */
-   GLenum ctype = 0;               /* color type */
-   GLint coffset = 0, noffset = 0, voffset;/* color, normal, vertex offsets */
-   const GLint toffset = 0;        /* always zero */
-   GLint defstride;                /* default stride */
-   GLint c, f;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   f = sizeof(GLfloat);
-   c = f * ((4 * sizeof(GLubyte) + (f - 1)) / f);
-
-   if (stride < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glInterleavedArrays(stride)" );
-      return;
-   }
-
-   switch (format) {
-      case GL_V2F:
-         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_FALSE;
-         tcomps = 0;  ccomps = 0;  vcomps = 2;
-         voffset = 0;
-         defstride = 2*f;
-         break;
-      case GL_V3F:
-         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_FALSE;
-         tcomps = 0;  ccomps = 0;  vcomps = 3;
-         voffset = 0;
-         defstride = 3*f;
-         break;
-      case GL_C4UB_V2F:
-         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;
-         tcomps = 0;  ccomps = 4;  vcomps = 2;
-         ctype = GL_UNSIGNED_BYTE;
-         coffset = 0;
-         voffset = c;
-         defstride = c + 2*f;
-         break;
-      case GL_C4UB_V3F:
-         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;
-         tcomps = 0;  ccomps = 4;  vcomps = 3;
-         ctype = GL_UNSIGNED_BYTE;
-         coffset = 0;
-         voffset = c;
-         defstride = c + 3*f;
-         break;
-      case GL_C3F_V3F:
-         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;
-         tcomps = 0;  ccomps = 3;  vcomps = 3;
-         ctype = GL_FLOAT;
-         coffset = 0;
-         voffset = 3*f;
-         defstride = 6*f;
-         break;
-      case GL_N3F_V3F:
-         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_TRUE;
-         tcomps = 0;  ccomps = 0;  vcomps = 3;
-         noffset = 0;
-         voffset = 3*f;
-         defstride = 6*f;
-         break;
-      case GL_C4F_N3F_V3F:
-         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_TRUE;
-         tcomps = 0;  ccomps = 4;  vcomps = 3;
-         ctype = GL_FLOAT;
-         coffset = 0;
-         noffset = 4*f;
-         voffset = 7*f;
-         defstride = 10*f;
-         break;
-      case GL_T2F_V3F:
-         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_FALSE;
-         tcomps = 2;  ccomps = 0;  vcomps = 3;
-         voffset = 2*f;
-         defstride = 5*f;
-         break;
-      case GL_T4F_V4F:
-         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_FALSE;
-         tcomps = 4;  ccomps = 0;  vcomps = 4;
-         voffset = 4*f;
-         defstride = 8*f;
-         break;
-      case GL_T2F_C4UB_V3F:
-         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_FALSE;
-         tcomps = 2;  ccomps = 4;  vcomps = 3;
-         ctype = GL_UNSIGNED_BYTE;
-         coffset = 2*f;
-         voffset = c+2*f;
-         defstride = c+5*f;
-         break;
-      case GL_T2F_C3F_V3F:
-         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_FALSE;
-         tcomps = 2;  ccomps = 3;  vcomps = 3;
-         ctype = GL_FLOAT;
-         coffset = 2*f;
-         voffset = 5*f;
-         defstride = 8*f;
-         break;
-      case GL_T2F_N3F_V3F:
-         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_TRUE;
-         tcomps = 2;  ccomps = 0;  vcomps = 3;
-         noffset = 2*f;
-         voffset = 5*f;
-         defstride = 8*f;
-         break;
-      case GL_T2F_C4F_N3F_V3F:
-         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_TRUE;
-         tcomps = 2;  ccomps = 4;  vcomps = 3;
-         ctype = GL_FLOAT;
-         coffset = 2*f;
-         noffset = 6*f;
-         voffset = 9*f;
-         defstride = 12*f;
-         break;
-      case GL_T4F_C4F_N3F_V4F:
-         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_TRUE;
-         tcomps = 4;  ccomps = 4;  vcomps = 4;
-         ctype = GL_FLOAT;
-         coffset = 4*f;
-         noffset = 8*f;
-         voffset = 11*f;
-         defstride = 15*f;
-         break;
-      default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glInterleavedArrays(format)" );
-         return;
-   }
-
-   if (stride==0) {
-      stride = defstride;
-   }
-
-   _mesa_DisableClientState( GL_EDGE_FLAG_ARRAY );
-   _mesa_DisableClientState( GL_INDEX_ARRAY );
-   /* XXX also disable secondary color and generic arrays? */
-
-   /* Texcoords */
-   if (tflag) {
-      _mesa_EnableClientState( GL_TEXTURE_COORD_ARRAY );
-      _mesa_TexCoordPointer( tcomps, GL_FLOAT, stride,
-                             (GLubyte *) pointer + toffset );
-   }
-   else {
-      _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY );
-   }
-
-   /* Color */
-   if (cflag) {
-      _mesa_EnableClientState( GL_COLOR_ARRAY );
-      _mesa_ColorPointer( ccomps, ctype, stride,
-			  (GLubyte *) pointer + coffset );
-   }
-   else {
-      _mesa_DisableClientState( GL_COLOR_ARRAY );
-   }
-
-
-   /* Normals */
-   if (nflag) {
-      _mesa_EnableClientState( GL_NORMAL_ARRAY );
-      _mesa_NormalPointer( GL_FLOAT, stride, (GLubyte *) pointer + noffset );
-   }
-   else {
-      _mesa_DisableClientState( GL_NORMAL_ARRAY );
-   }
-
-   /* Vertices */
-   _mesa_EnableClientState( GL_VERTEX_ARRAY );
-   _mesa_VertexPointer( vcomps, GL_FLOAT, stride,
-			(GLubyte *) pointer + voffset );
-}
-
-
-void GLAPIENTRY
-_mesa_LockArraysEXT(GLint first, GLsizei count)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glLockArrays %d %d\n", first, count);
-
-   if (first < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glLockArraysEXT(first)" );
-      return;
-   }
-   if (count <= 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glLockArraysEXT(count)" );
-      return;
-   }
-   if (ctx->Array.LockCount != 0) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glLockArraysEXT(reentry)" );
-      return;
-   }
-
-   ctx->Array.LockFirst = first;
-   ctx->Array.LockCount = count;
-
-   ctx->NewState |= _NEW_ARRAY;
-   ctx->Array.NewState |= _NEW_ARRAY_ALL;
-}
-
-
-void GLAPIENTRY
-_mesa_UnlockArraysEXT( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glUnlockArrays\n");
-
-   if (ctx->Array.LockCount == 0) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glUnlockArraysEXT(reexit)" );
-      return;
-   }
-
-   ctx->Array.LockFirst = 0;
-   ctx->Array.LockCount = 0;
-   ctx->NewState |= _NEW_ARRAY;
-   ctx->Array.NewState |= _NEW_ARRAY_ALL;
-}
-
-
-/* GL_EXT_multi_draw_arrays */
-/* Somebody forgot to spec the first and count parameters as const! <sigh> */
-void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
-                          const GLsizei *count, GLsizei primcount )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   for (i = 0; i < primcount; i++) {
-      if (count[i] > 0) {
-         CALL_DrawArrays(ctx->Exec, (mode, first[i], count[i]));
-      }
-   }
-}
-
-
-/* GL_IBM_multimode_draw_arrays */
-void GLAPIENTRY
-_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
-			      const GLsizei * count,
-			      GLsizei primcount, GLint modestride )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   for ( i = 0 ; i < primcount ; i++ ) {
-      if ( count[i] > 0 ) {
-         GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));
-	 CALL_DrawArrays(ctx->Exec, ( m, first[i], count[i] ));
-      }
-   }
-}
-
-
-/* GL_IBM_multimode_draw_arrays */
-void GLAPIENTRY
-_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
-				GLenum type, const GLvoid * const * indices,
-				GLsizei primcount, GLint modestride )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   /* XXX not sure about ARB_vertex_buffer_object handling here */
-
-   for ( i = 0 ; i < primcount ; i++ ) {
-      if ( count[i] > 0 ) {
-         GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));
-	 CALL_DrawElements(ctx->Exec, ( m, count[i], type, indices[i] ));
-      }
-   }
-}
-
-
-/**
- * GL 3.1 glPrimitiveRestartIndex().
- */
-void GLAPIENTRY
-_mesa_PrimitiveRestartIndex(GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndex()");
-      return;
-   }
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-
-   ctx->Array.RestartIndex = index;
-}
-
-
-/**
- * Copy one client vertex array to another.
- */
-void
-_mesa_copy_client_array(GLcontext *ctx,
-                        struct gl_client_array *dst,
-                        struct gl_client_array *src)
-{
-   dst->Size = src->Size;
-   dst->Type = src->Type;
-   dst->Format = src->Format;
-   dst->Stride = src->Stride;
-   dst->StrideB = src->StrideB;
-   dst->Ptr = src->Ptr;
-   dst->Enabled = src->Enabled;
-   dst->Normalized = src->Normalized;
-   dst->_ElementSize = src->_ElementSize;
-   _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);
-   dst->_MaxElement = src->_MaxElement;
-}
-
-
-
-/**
- * Print vertex array's fields.
- */
-static void
-print_array(const char *name, GLint index, const struct gl_client_array *array)
-{
-   if (index >= 0)
-      printf("  %s[%d]: ", name, index);
-   else
-      printf("  %s: ", name);
-   printf("Ptr=%p, Type=0x%x, Size=%d, ElemSize=%u, Stride=%d, Buffer=%u(Size %lu), MaxElem=%u\n",
-	  array->Ptr, array->Type, array->Size,
-	  array->_ElementSize, array->StrideB,
-	  array->BufferObj->Name, (unsigned long) array->BufferObj->Size,
-	  array->_MaxElement);
-}
-
-
-/**
- * Print current vertex object/array info.  For debug.
- */
-void
-_mesa_print_arrays(GLcontext *ctx)
-{
-   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
-   GLuint i;
-
-   _mesa_update_array_object_max_element(ctx, arrayObj);
-
-   printf("Array Object %u\n", arrayObj->Name);
-   if (arrayObj->Vertex.Enabled)
-      print_array("Vertex", -1, &arrayObj->Vertex);
-   if (arrayObj->Normal.Enabled)
-      print_array("Normal", -1, &arrayObj->Normal);
-   if (arrayObj->Color.Enabled)
-      print_array("Color", -1, &arrayObj->Color);
-   for (i = 0; i < Elements(arrayObj->TexCoord); i++)
-      if (arrayObj->TexCoord[i].Enabled)
-         print_array("TexCoord", i, &arrayObj->TexCoord[i]);
-   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
-      if (arrayObj->VertexAttrib[i].Enabled)
-         print_array("Attrib", i, &arrayObj->VertexAttrib[i]);
-   printf("  _MaxElement = %u\n", arrayObj->_MaxElement);
-}
-
-
-/**
- * Initialize vertex array state for given context.
- */
-void 
-_mesa_init_varray(GLcontext *ctx)
-{
-   ctx->Array.DefaultArrayObj = _mesa_new_array_object(ctx, 0);
-   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,
-                                ctx->Array.DefaultArrayObj);
-   ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */
-
-   ctx->Array.Objects = _mesa_NewHashTable();
-}
-
-
-/**
- * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().
- */
-static void
-delete_arrayobj_cb(GLuint id, void *data, void *userData)
-{
-   struct gl_array_object *arrayObj = (struct gl_array_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
-   _mesa_delete_array_object(ctx, arrayObj);
-}
-
-
-/**
- * Free vertex array state for given context.
- */
-void 
-_mesa_free_varray_data(GLcontext *ctx)
-{
-   _mesa_HashDeleteAll(ctx->Array.Objects, delete_arrayobj_cb, ctx);
-   _mesa_DeleteHashTable(ctx->Array.Objects);
-}
+/*

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

+ */

+

+

+#include "glheader.h"

+#include "imports.h"

+#include "bufferobj.h"

+#include "context.h"

+#include "enable.h"

+#include "enums.h"

+#include "hash.h"

+#include "image.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "varray.h"

+#include "arrayobj.h"

+#include "main/dispatch.h"

+

+

+/** Used to do error checking for GL_EXT_vertex_array_bgra */

+#define BGRA_OR_4  5

+

+

+/** Used to indicate which GL datatypes are accepted by each of the

+ * glVertex/Color/Attrib/EtcPointer() functions.

+ */

+#define BOOL_BIT             0x1

+#define BYTE_BIT             0x2

+#define UNSIGNED_BYTE_BIT    0x4

+#define SHORT_BIT            0x8

+#define UNSIGNED_SHORT_BIT   0x10

+#define INT_BIT              0x20

+#define UNSIGNED_INT_BIT     0x40

+#define HALF_BIT             0x80

+#define FLOAT_BIT            0x100

+#define DOUBLE_BIT           0x200

+#define FIXED_BIT            0x400

+

+

+

+/** Convert GL datatype enum into a <type>_BIT value seen above */

+static GLbitfield

+type_to_bit(const struct gl_context *ctx, GLenum type)

+{

+   switch (type) {

+   case GL_BOOL:

+      return BOOL_BIT;

+   case GL_BYTE:

+      return BYTE_BIT;

+   case GL_UNSIGNED_BYTE:

+      return UNSIGNED_BYTE_BIT;

+   case GL_SHORT:

+      return SHORT_BIT;

+   case GL_UNSIGNED_SHORT:

+      return UNSIGNED_SHORT_BIT;

+   case GL_INT:

+      return INT_BIT;

+   case GL_UNSIGNED_INT:

+      return UNSIGNED_INT_BIT;

+   case GL_HALF_FLOAT:

+      if (ctx->Extensions.ARB_half_float_vertex)

+         return HALF_BIT;

+      else

+         return 0x0;

+   case GL_FLOAT:

+      return FLOAT_BIT;

+   case GL_DOUBLE:

+      return DOUBLE_BIT;

+   case GL_FIXED:

+      return FIXED_BIT;

+   default:

+      return 0;

+   }

+}

+

+

+/**

+ * Do error checking and update state for glVertex/Color/TexCoord/...Pointer

+ * functions.

+ *

+ * \param func  name of calling function used for error reporting

+ * \param array  the array to update

+ * \param dirtyBit  which bit to set in ctx->Array.NewState for this array

+ * \param legalTypes  bitmask of *_BIT above indicating legal datatypes

+ * \param sizeMin  min allowable size value

+ * \param sizeMax  max allowable size value (may also be BGRA_OR_4)

+ * \param size  components per element (1, 2, 3 or 4)

+ * \param type  datatype of each component (GL_FLOAT, GL_INT, etc)

+ * \param stride  stride between elements, in elements

+ * \param normalized  are integer types converted to floats in [-1, 1]?

+ * \param integer  integer-valued values (will not be normalized to [-1,1])

+ * \param ptr  the address (or offset inside VBO) of the array data

+ */

+static void

+update_array(struct gl_context *ctx,

+             const char *func,

+             struct gl_client_array *array,

+             GLbitfield dirtyBit, GLbitfield legalTypesMask,

+             GLint sizeMin, GLint sizeMax,

+             GLint size, GLenum type, GLsizei stride,

+             GLboolean normalized, GLboolean integer,

+             const GLvoid *ptr)

+{

+   GLbitfield typeBit;

+   GLsizei elementSize;

+   GLenum format = GL_RGBA;

+

+   if (ctx->API != API_OPENGLES && ctx->API != API_OPENGLES2) {

+      /* fixed point arrays / data is only allowed with OpenGL ES 1.x/2.0 */

+      legalTypesMask &= ~FIXED_BIT;

+   }

+

+   typeBit = type_to_bit(ctx, type);

+   if (typeBit == 0x0 || (typeBit & legalTypesMask) == 0x0) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(type = %s)",

+                  func, _mesa_lookup_enum_by_nr(type));

+      return;

+   }

+

+   /* Do size parameter checking.

+    * If sizeMax = BGRA_OR_4 it means that size = GL_BGRA is legal and

+    * must be handled specially.

+    */

+   if (ctx->Extensions.EXT_vertex_array_bgra &&

+       sizeMax == BGRA_OR_4 &&

+       size == GL_BGRA) {

+      if (type != GL_UNSIGNED_BYTE) {

+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(GL_BGRA/GLubyte)", func);

+         return;

+      }

+      format = GL_BGRA;

+      size = 4;

+   }

+   else if (size < sizeMin || size > sizeMax || size > 4) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size=%d)", func, size);

+      return;

+   }

+

+   ASSERT(size <= 4);

+

+   if (stride < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "%s(stride=%d)", func, stride );

+      return;

+   }

+

+   if (ctx->Array.ArrayObj->VBOonly &&

+       ctx->Array.ArrayBufferObj->Name == 0) {

+      /* GL_ARB_vertex_array_object requires that all arrays reside in VBOs.

+       * Generate GL_INVALID_OPERATION if that's not true.

+       */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-VBO array)", func);

+      return;

+   }

+

+   elementSize = _mesa_sizeof_type(type) * size;

+

+   array->Size = size;

+   array->Type = type;

+   array->Format = format;

+   array->Stride = stride;

+   array->StrideB = stride ? stride : elementSize;

+   array->Normalized = normalized;

+   array->Ptr = (const GLubyte *) ptr;

+   array->_ElementSize = elementSize;

+

+   _mesa_reference_buffer_object(ctx, &array->BufferObj,

+                                 ctx->Array.ArrayBufferObj);

+

+   ctx->NewState |= _NEW_ARRAY;

+   ctx->Array.NewState |= dirtyBit;

+}

+

+

+void GLAPIENTRY

+_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   GLbitfield legalTypes = (SHORT_BIT | INT_BIT | FLOAT_BIT |

+                            DOUBLE_BIT | HALF_BIT | FIXED_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (ctx->API == API_OPENGLES)

+      legalTypes |= BYTE_BIT;

+

+   update_array(ctx, "glVertexPointer",

+                &ctx->Array.ArrayObj->Vertex, _NEW_ARRAY_VERTEX,

+                legalTypes, 2, 4,

+                size, type, stride, GL_FALSE, GL_FALSE, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )

+{

+   const GLbitfield legalTypes = (BYTE_BIT | SHORT_BIT | INT_BIT |

+                                  HALF_BIT | FLOAT_BIT | DOUBLE_BIT |

+                                  FIXED_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   update_array(ctx, "glNormalPointer",

+                &ctx->Array.ArrayObj->Normal, _NEW_ARRAY_NORMAL,

+                legalTypes, 3, 3,

+                3, type, stride, GL_TRUE, GL_FALSE, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |

+                                  SHORT_BIT | UNSIGNED_SHORT_BIT |

+                                  INT_BIT | UNSIGNED_INT_BIT |

+                                  HALF_BIT | FLOAT_BIT | DOUBLE_BIT |

+                                  FIXED_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   update_array(ctx, "glColorPointer",

+                &ctx->Array.ArrayObj->Color, _NEW_ARRAY_COLOR0,

+                legalTypes, 3, BGRA_OR_4,

+                size, type, stride, GL_TRUE, GL_FALSE, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (HALF_BIT | FLOAT_BIT | DOUBLE_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   update_array(ctx, "glFogCoordPointer",

+                &ctx->Array.ArrayObj->FogCoord, _NEW_ARRAY_FOGCOORD,

+                legalTypes, 1, 1,

+                1, type, stride, GL_FALSE, GL_FALSE, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (UNSIGNED_BYTE_BIT | SHORT_BIT | INT_BIT |

+                                  FLOAT_BIT | DOUBLE_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   update_array(ctx, "glIndexPointer",

+                &ctx->Array.ArrayObj->Index, _NEW_ARRAY_INDEX,

+                legalTypes, 1, 1,

+                1, type, stride, GL_FALSE, GL_FALSE, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,

+			       GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |

+                                  SHORT_BIT | UNSIGNED_SHORT_BIT |

+                                  INT_BIT | UNSIGNED_INT_BIT |

+                                  HALF_BIT | FLOAT_BIT | DOUBLE_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   update_array(ctx, "glSecondaryColorPointer",

+                &ctx->Array.ArrayObj->SecondaryColor, _NEW_ARRAY_COLOR1,

+                legalTypes, 3, BGRA_OR_4,

+                size, type, stride, GL_TRUE, GL_FALSE, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,

+                      const GLvoid *ptr)

+{

+   GLbitfield legalTypes = (SHORT_BIT | INT_BIT |

+                            HALF_BIT | FLOAT_BIT | DOUBLE_BIT |

+                            FIXED_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   const GLuint unit = ctx->Array.ActiveTexture;

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (ctx->API == API_OPENGLES)

+      legalTypes |= BYTE_BIT;

+

+   ASSERT(unit < Elements(ctx->Array.ArrayObj->TexCoord));

+

+   update_array(ctx, "glTexCoordPointer",

+                &ctx->Array.ArrayObj->TexCoord[unit],

+                _NEW_ARRAY_TEXCOORD(unit),

+                legalTypes, 1, 4,

+                size, type, stride, GL_FALSE, GL_FALSE,

+                ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = UNSIGNED_BYTE_BIT;

+   /* see table 2.4 edits in GL_EXT_gpu_shader4 spec: */

+   const GLboolean integer = GL_TRUE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   update_array(ctx, "glEdgeFlagPointer",

+                &ctx->Array.ArrayObj->EdgeFlag, _NEW_ARRAY_EDGEFLAG,

+                legalTypes, 1, 1,

+                1, GL_UNSIGNED_BYTE, stride, GL_FALSE, integer, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (FLOAT_BIT | FIXED_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (ctx->API != API_OPENGLES) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glPointSizePointer(ES 1.x only)");

+      return;

+   }

+      

+   update_array(ctx, "glPointSizePointer",

+                &ctx->Array.ArrayObj->PointSize, _NEW_ARRAY_POINT_SIZE,

+                legalTypes, 1, 1,

+                1, type, stride, GL_FALSE, GL_FALSE, ptr);

+}

+

+

+#if FEATURE_NV_vertex_program

+/**

+ * Set a vertex attribute array.

+ * Note that these arrays DO alias the conventional GL vertex arrays

+ * (position, normal, color, fog, texcoord, etc).

+ * The generic attribute slots at #16 and above are not touched.

+ */

+void GLAPIENTRY

+_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,

+                            GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (UNSIGNED_BYTE_BIT | SHORT_BIT |

+                                  FLOAT_BIT | DOUBLE_BIT);

+   GLboolean normalized = GL_FALSE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= MAX_NV_VERTEX_PROGRAM_INPUTS) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(index)");

+      return;

+   }

+

+   if (type == GL_UNSIGNED_BYTE && size != 4) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerNV(size!=4)");

+      return;

+   }

+

+   update_array(ctx, "glVertexAttribPointerNV",

+                &ctx->Array.ArrayObj->VertexAttrib[index],

+                _NEW_ARRAY_ATTRIB(index),

+                legalTypes, 1, BGRA_OR_4,

+                size, type, stride, normalized, GL_FALSE, ptr);

+}

+#endif

+

+

+#if FEATURE_ARB_vertex_program

+/**

+ * Set a generic vertex attribute array.

+ * Note that these arrays DO NOT alias the conventional GL vertex arrays

+ * (position, normal, color, fog, texcoord, etc).

+ */

+void GLAPIENTRY

+_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,

+                             GLboolean normalized,

+                             GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |

+                                  SHORT_BIT | UNSIGNED_SHORT_BIT |

+                                  INT_BIT | UNSIGNED_INT_BIT |

+                                  HALF_BIT | FLOAT_BIT | DOUBLE_BIT |

+                                  FIXED_BIT);

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribPointerARB(index)");

+      return;

+   }

+

+   update_array(ctx, "glVertexAttribPointer",

+                &ctx->Array.ArrayObj->VertexAttrib[index],

+                _NEW_ARRAY_ATTRIB(index),

+                legalTypes, 1, BGRA_OR_4,

+                size, type, stride, normalized, GL_FALSE, ptr);

+}

+#endif

+

+

+/**

+ * GL_EXT_gpu_shader4 / GL 3.0.

+ * Set an integer-valued vertex attribute array.

+ * Note that these arrays DO NOT alias the conventional GL vertex arrays

+ * (position, normal, color, fog, texcoord, etc).

+ */

+void GLAPIENTRY

+_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,

+                           GLsizei stride, const GLvoid *ptr)

+{

+   const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |

+                                  SHORT_BIT | UNSIGNED_SHORT_BIT |

+                                  INT_BIT | UNSIGNED_INT_BIT);

+   const GLboolean normalized = GL_FALSE;

+   const GLboolean integer = GL_TRUE;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribIPointer(index)");

+      return;

+   }

+

+   update_array(ctx, "glVertexAttribIPointer",

+                &ctx->Array.ArrayObj->VertexAttrib[index],

+                _NEW_ARRAY_ATTRIB(index),

+                legalTypes, 1, 4,

+                size, type, stride, normalized, integer, ptr);

+}

+

+

+

+void GLAPIENTRY

+_mesa_EnableVertexAttribArrayARB(GLuint index)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glEnableVertexAttribArrayARB(index)");

+      return;

+   }

+

+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));

+

+   FLUSH_VERTICES(ctx, _NEW_ARRAY);

+   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_TRUE;

+   ctx->Array.ArrayObj->_Enabled |= _NEW_ARRAY_ATTRIB(index);

+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);

+}

+

+

+void GLAPIENTRY

+_mesa_DisableVertexAttribArrayARB(GLuint index)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE,

+                  "glEnableVertexAttribArrayARB(index)");

+      return;

+   }

+

+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));

+

+   FLUSH_VERTICES(ctx, _NEW_ARRAY);

+   ctx->Array.ArrayObj->VertexAttrib[index].Enabled = GL_FALSE;

+   ctx->Array.ArrayObj->_Enabled &= ~_NEW_ARRAY_ATTRIB(index);

+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);

+}

+

+

+/**

+ * Return info for a vertex attribute array (no alias with legacy

+ * vertex attributes (pos, normal, color, etc)).  This function does

+ * not handle the 4-element GL_CURRENT_VERTEX_ATTRIB_ARB query.

+ */

+static GLuint

+get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum pname,

+                  const char *caller)

+{

+   const struct gl_client_array *array;

+

+   if (index >= MAX_VERTEX_GENERIC_ATTRIBS) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)", caller, index);

+      return 0;

+   }

+

+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));

+

+   array = &ctx->Array.ArrayObj->VertexAttrib[index];

+

+   switch (pname) {

+   case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:

+      return array->Enabled;

+   case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:

+      return array->Size;

+   case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:

+      return array->Stride;

+   case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:

+      return array->Type;

+   case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:

+      return array->Normalized;

+   case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:

+      return array->BufferObj->Name;

+   case GL_VERTEX_ATTRIB_ARRAY_INTEGER:

+      if (ctx->Extensions.EXT_gpu_shader4) {

+         return array->Integer;

+      }

+      /* fall-through */

+   default:

+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=0x%x)", caller, pname);

+      return 0;

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {

+      if (index == 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetVertexAttribfv(index==0)");

+      }

+      else {

+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];

+         FLUSH_CURRENT(ctx, 0);

+         COPY_4V(params, v);

+      }

+   }

+   else {

+      params[0] = (GLfloat) get_vertex_array_attrib(ctx, index, pname,

+                                                    "glGetVertexAttribfv");

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {

+      if (index == 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetVertexAttribdv(index==0)");

+      }

+      else {

+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];

+         FLUSH_CURRENT(ctx, 0);

+         params[0] = (GLdouble) v[0];

+         params[1] = (GLdouble) v[1];

+         params[2] = (GLdouble) v[2];

+         params[3] = (GLdouble) v[3];

+      }

+   }

+   else {

+      params[0] = (GLdouble) get_vertex_array_attrib(ctx, index, pname,

+                                                     "glGetVertexAttribdv");

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {

+      if (index == 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetVertexAttribiv(index==0)");

+      }

+      else {

+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];

+         FLUSH_CURRENT(ctx, 0);

+         /* XXX should floats in[0,1] be scaled to full int range? */

+         params[0] = (GLint) v[0];

+         params[1] = (GLint) v[1];

+         params[2] = (GLint) v[2];

+         params[3] = (GLint) v[3];

+      }

+   }

+   else {

+      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,

+                                                  "glGetVertexAttribiv");

+   }

+}

+

+

+/** GL 3.0 */

+void GLAPIENTRY

+_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {

+      if (index == 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetVertexAttribIiv(index==0)");

+      }

+      else {

+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];

+         FLUSH_CURRENT(ctx, 0);

+         /* XXX we don't have true integer-valued vertex attribs yet */

+         params[0] = (GLint) v[0];

+         params[1] = (GLint) v[1];

+         params[2] = (GLint) v[2];

+         params[3] = (GLint) v[3];

+      }

+   }

+   else {

+      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,

+                                                  "glGetVertexAttribIiv");

+   }

+}

+

+

+/** GL 3.0 */

+void GLAPIENTRY

+_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) {

+      if (index == 0) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glGetVertexAttribIuiv(index==0)");

+      }

+      else {

+         const GLfloat *v = ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + index];

+         FLUSH_CURRENT(ctx, 0);

+         /* XXX we don't have true integer-valued vertex attribs yet */

+         params[0] = (GLuint) v[0];

+         params[1] = (GLuint) v[1];

+         params[2] = (GLuint) v[2];

+         params[3] = (GLuint) v[3];

+      }

+   }

+   else {

+      params[0] = get_vertex_array_attrib(ctx, index, pname,

+                                          "glGetVertexAttribIuiv");

+   }

+}

+

+

+void GLAPIENTRY

+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (index >= ctx->Const.VertexProgram.MaxAttribs) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetVertexAttribPointerARB(index)");

+      return;

+   }

+

+   if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribPointerARB(pname)");

+      return;

+   }

+

+   ASSERT(index < Elements(ctx->Array.ArrayObj->VertexAttrib));

+

+   *pointer = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[index].Ptr;

+}

+

+

+void GLAPIENTRY

+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,

+                       GLsizei count, const GLvoid *ptr)

+{

+   (void) count;

+   _mesa_VertexPointer(size, type, stride, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                       const GLvoid *ptr)

+{

+   (void) count;

+   _mesa_NormalPointer(type, stride, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr)

+{

+   (void) count;

+   _mesa_ColorPointer(size, type, stride, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr)

+{

+   (void) count;

+   _mesa_IndexPointer(type, stride, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,

+                         GLsizei count, const GLvoid *ptr)

+{

+   (void) count;

+   _mesa_TexCoordPointer(size, type, stride, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)

+{

+   (void) count;

+   _mesa_EdgeFlagPointer(stride, ptr);

+}

+

+

+void GLAPIENTRY

+_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLboolean tflag, cflag, nflag;  /* enable/disable flags */

+   GLint tcomps, ccomps, vcomps;   /* components per texcoord, color, vertex */

+   GLenum ctype = 0;               /* color type */

+   GLint coffset = 0, noffset = 0, voffset;/* color, normal, vertex offsets */

+   const GLint toffset = 0;        /* always zero */

+   GLint defstride;                /* default stride */

+   GLint c, f;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   f = sizeof(GLfloat);

+   c = f * ((4 * sizeof(GLubyte) + (f - 1)) / f);

+

+   if (stride < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glInterleavedArrays(stride)" );

+      return;

+   }

+

+   switch (format) {

+      case GL_V2F:

+         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_FALSE;

+         tcomps = 0;  ccomps = 0;  vcomps = 2;

+         voffset = 0;

+         defstride = 2*f;

+         break;

+      case GL_V3F:

+         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_FALSE;

+         tcomps = 0;  ccomps = 0;  vcomps = 3;

+         voffset = 0;

+         defstride = 3*f;

+         break;

+      case GL_C4UB_V2F:

+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;

+         tcomps = 0;  ccomps = 4;  vcomps = 2;

+         ctype = GL_UNSIGNED_BYTE;

+         coffset = 0;

+         voffset = c;

+         defstride = c + 2*f;

+         break;

+      case GL_C4UB_V3F:

+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;

+         tcomps = 0;  ccomps = 4;  vcomps = 3;

+         ctype = GL_UNSIGNED_BYTE;

+         coffset = 0;

+         voffset = c;

+         defstride = c + 3*f;

+         break;

+      case GL_C3F_V3F:

+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_FALSE;

+         tcomps = 0;  ccomps = 3;  vcomps = 3;

+         ctype = GL_FLOAT;

+         coffset = 0;

+         voffset = 3*f;

+         defstride = 6*f;

+         break;

+      case GL_N3F_V3F:

+         tflag = GL_FALSE;  cflag = GL_FALSE;  nflag = GL_TRUE;

+         tcomps = 0;  ccomps = 0;  vcomps = 3;

+         noffset = 0;

+         voffset = 3*f;

+         defstride = 6*f;

+         break;

+      case GL_C4F_N3F_V3F:

+         tflag = GL_FALSE;  cflag = GL_TRUE;  nflag = GL_TRUE;

+         tcomps = 0;  ccomps = 4;  vcomps = 3;

+         ctype = GL_FLOAT;

+         coffset = 0;

+         noffset = 4*f;

+         voffset = 7*f;

+         defstride = 10*f;

+         break;

+      case GL_T2F_V3F:

+         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_FALSE;

+         tcomps = 2;  ccomps = 0;  vcomps = 3;

+         voffset = 2*f;

+         defstride = 5*f;

+         break;

+      case GL_T4F_V4F:

+         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_FALSE;

+         tcomps = 4;  ccomps = 0;  vcomps = 4;

+         voffset = 4*f;

+         defstride = 8*f;

+         break;

+      case GL_T2F_C4UB_V3F:

+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_FALSE;

+         tcomps = 2;  ccomps = 4;  vcomps = 3;

+         ctype = GL_UNSIGNED_BYTE;

+         coffset = 2*f;

+         voffset = c+2*f;

+         defstride = c+5*f;

+         break;

+      case GL_T2F_C3F_V3F:

+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_FALSE;

+         tcomps = 2;  ccomps = 3;  vcomps = 3;

+         ctype = GL_FLOAT;

+         coffset = 2*f;

+         voffset = 5*f;

+         defstride = 8*f;

+         break;

+      case GL_T2F_N3F_V3F:

+         tflag = GL_TRUE;  cflag = GL_FALSE;  nflag = GL_TRUE;

+         tcomps = 2;  ccomps = 0;  vcomps = 3;

+         noffset = 2*f;

+         voffset = 5*f;

+         defstride = 8*f;

+         break;

+      case GL_T2F_C4F_N3F_V3F:

+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_TRUE;

+         tcomps = 2;  ccomps = 4;  vcomps = 3;

+         ctype = GL_FLOAT;

+         coffset = 2*f;

+         noffset = 6*f;

+         voffset = 9*f;

+         defstride = 12*f;

+         break;

+      case GL_T4F_C4F_N3F_V4F:

+         tflag = GL_TRUE;  cflag = GL_TRUE;  nflag = GL_TRUE;

+         tcomps = 4;  ccomps = 4;  vcomps = 4;

+         ctype = GL_FLOAT;

+         coffset = 4*f;

+         noffset = 8*f;

+         voffset = 11*f;

+         defstride = 15*f;

+         break;

+      default:

+         _mesa_error( ctx, GL_INVALID_ENUM, "glInterleavedArrays(format)" );

+         return;

+   }

+

+   if (stride==0) {

+      stride = defstride;

+   }

+

+   _mesa_DisableClientState( GL_EDGE_FLAG_ARRAY );

+   _mesa_DisableClientState( GL_INDEX_ARRAY );

+   /* XXX also disable secondary color and generic arrays? */

+

+   /* Texcoords */

+   if (tflag) {

+      _mesa_EnableClientState( GL_TEXTURE_COORD_ARRAY );

+      _mesa_TexCoordPointer( tcomps, GL_FLOAT, stride,

+                             (GLubyte *) pointer + toffset );

+   }

+   else {

+      _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY );

+   }

+

+   /* Color */

+   if (cflag) {

+      _mesa_EnableClientState( GL_COLOR_ARRAY );

+      _mesa_ColorPointer( ccomps, ctype, stride,

+			  (GLubyte *) pointer + coffset );

+   }

+   else {

+      _mesa_DisableClientState( GL_COLOR_ARRAY );

+   }

+

+

+   /* Normals */

+   if (nflag) {

+      _mesa_EnableClientState( GL_NORMAL_ARRAY );

+      _mesa_NormalPointer( GL_FLOAT, stride, (GLubyte *) pointer + noffset );

+   }

+   else {

+      _mesa_DisableClientState( GL_NORMAL_ARRAY );

+   }

+

+   /* Vertices */

+   _mesa_EnableClientState( GL_VERTEX_ARRAY );

+   _mesa_VertexPointer( vcomps, GL_FLOAT, stride,

+			(GLubyte *) pointer + voffset );

+}

+

+

+void GLAPIENTRY

+_mesa_LockArraysEXT(GLint first, GLsizei count)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glLockArrays %d %d\n", first, count);

+

+   if (first < 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glLockArraysEXT(first)" );

+      return;

+   }

+   if (count <= 0) {

+      _mesa_error( ctx, GL_INVALID_VALUE, "glLockArraysEXT(count)" );

+      return;

+   }

+   if (ctx->Array.LockCount != 0) {

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glLockArraysEXT(reentry)" );

+      return;

+   }

+

+   ctx->Array.LockFirst = first;

+   ctx->Array.LockCount = count;

+

+   ctx->NewState |= _NEW_ARRAY;

+   ctx->Array.NewState |= _NEW_ARRAY_ALL;

+}

+

+

+void GLAPIENTRY

+_mesa_UnlockArraysEXT( void )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glUnlockArrays\n");

+

+   if (ctx->Array.LockCount == 0) {

+      _mesa_error( ctx, GL_INVALID_OPERATION, "glUnlockArraysEXT(reexit)" );

+      return;

+   }

+

+   ctx->Array.LockFirst = 0;

+   ctx->Array.LockCount = 0;

+   ctx->NewState |= _NEW_ARRAY;

+   ctx->Array.NewState |= _NEW_ARRAY_ALL;

+}

+

+

+/* GL_EXT_multi_draw_arrays */

+void GLAPIENTRY

+_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,

+                          const GLsizei *count, GLsizei primcount )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   for (i = 0; i < primcount; i++) {

+      if (count[i] > 0) {

+         CALL_DrawArrays(ctx->Exec, (mode, first[i], count[i]));

+      }

+   }

+}

+

+

+/* GL_IBM_multimode_draw_arrays */

+void GLAPIENTRY

+_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,

+			      const GLsizei * count,

+			      GLsizei primcount, GLint modestride )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   for ( i = 0 ; i < primcount ; i++ ) {

+      if ( count[i] > 0 ) {

+         GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));

+	 CALL_DrawArrays(ctx->Exec, ( m, first[i], count[i] ));

+      }

+   }

+}

+

+

+/* GL_IBM_multimode_draw_arrays */

+void GLAPIENTRY

+_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,

+				GLenum type, const GLvoid * const * indices,

+				GLsizei primcount, GLint modestride )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLint i;

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   /* XXX not sure about ARB_vertex_buffer_object handling here */

+

+   for ( i = 0 ; i < primcount ; i++ ) {

+      if ( count[i] > 0 ) {

+         GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride));

+	 CALL_DrawElements(ctx->Exec, ( m, count[i], type, indices[i] ));

+      }

+   }

+}

+

+

+/**

+ * GL_NV_primitive_restart and GL 3.1

+ */

+void GLAPIENTRY

+_mesa_PrimitiveRestartIndex(GLuint index)

+{

+   GET_CURRENT_CONTEXT(ctx);

+

+   if (!ctx->Extensions.NV_primitive_restart &&

+       ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndexNV()");

+      return;

+   }

+

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

+

+   ctx->Array.RestartIndex = index;

+}

+

+

+/**

+ * Copy one client vertex array to another.

+ */

+void

+_mesa_copy_client_array(struct gl_context *ctx,

+                        struct gl_client_array *dst,

+                        struct gl_client_array *src)

+{

+   dst->Size = src->Size;

+   dst->Type = src->Type;

+   dst->Format = src->Format;

+   dst->Stride = src->Stride;

+   dst->StrideB = src->StrideB;

+   dst->Ptr = src->Ptr;

+   dst->Enabled = src->Enabled;

+   dst->Normalized = src->Normalized;

+   dst->Integer = src->Integer;

+   dst->_ElementSize = src->_ElementSize;

+   _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj);

+   dst->_MaxElement = src->_MaxElement;

+}

+

+

+

+/**

+ * Print vertex array's fields.

+ */

+static void

+print_array(const char *name, GLint index, const struct gl_client_array *array)

+{

+   if (index >= 0)

+      printf("  %s[%d]: ", name, index);

+   else

+      printf("  %s: ", name);

+   printf("Ptr=%p, Type=0x%x, Size=%d, ElemSize=%u, Stride=%d, Buffer=%u(Size %lu), MaxElem=%u\n",

+	  array->Ptr, array->Type, array->Size,

+	  array->_ElementSize, array->StrideB,

+	  array->BufferObj->Name, (unsigned long) array->BufferObj->Size,

+	  array->_MaxElement);

+}

+

+

+/**

+ * Print current vertex object/array info.  For debug.

+ */

+void

+_mesa_print_arrays(struct gl_context *ctx)

+{

+   struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

+   GLuint i;

+

+   _mesa_update_array_object_max_element(ctx, arrayObj);

+

+   printf("Array Object %u\n", arrayObj->Name);

+   if (arrayObj->Vertex.Enabled)

+      print_array("Vertex", -1, &arrayObj->Vertex);

+   if (arrayObj->Normal.Enabled)

+      print_array("Normal", -1, &arrayObj->Normal);

+   if (arrayObj->Color.Enabled)

+      print_array("Color", -1, &arrayObj->Color);

+   for (i = 0; i < Elements(arrayObj->TexCoord); i++)

+      if (arrayObj->TexCoord[i].Enabled)

+         print_array("TexCoord", i, &arrayObj->TexCoord[i]);

+   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)

+      if (arrayObj->VertexAttrib[i].Enabled)

+         print_array("Attrib", i, &arrayObj->VertexAttrib[i]);

+   printf("  _MaxElement = %u\n", arrayObj->_MaxElement);

+}

+

+

+/**

+ * Initialize vertex array state for given context.

+ */

+void 

+_mesa_init_varray(struct gl_context *ctx)

+{

+   ctx->Array.DefaultArrayObj = _mesa_new_array_object(ctx, 0);

+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,

+                                ctx->Array.DefaultArrayObj);

+   ctx->Array.ActiveTexture = 0;   /* GL_ARB_multitexture */

+

+   ctx->Array.Objects = _mesa_NewHashTable();

+}

+

+

+/**

+ * Callback for deleting an array object.  Called by _mesa_HashDeleteAll().

+ */

+static void

+delete_arrayobj_cb(GLuint id, void *data, void *userData)

+{

+   struct gl_array_object *arrayObj = (struct gl_array_object *) data;

+   struct gl_context *ctx = (struct gl_context *) userData;

+   _mesa_delete_array_object(ctx, arrayObj);

+}

+

+

+/**

+ * Free vertex array state for given context.

+ */

+void 

+_mesa_free_varray_data(struct gl_context *ctx)

+{

+   _mesa_HashDeleteAll(ctx->Array.Objects, delete_arrayobj_cb, ctx);

+   _mesa_DeleteHashTable(ctx->Array.Objects);

+}

diff --git a/mesalib/src/mesa/main/varray.h b/mesalib/src/mesa/main/varray.h
index c7c3e3ec7..5e25c4e2f 100644
--- a/mesalib/src/mesa/main/varray.h
+++ b/mesalib/src/mesa/main/varray.h
@@ -1,241 +1,244 @@
-/*
- * 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 VARRAY_H
-#define VARRAY_H
-
-
-#include "mtypes.h"
-
-#if _HAVE_FULL_GL
-
-extern void GLAPIENTRY
-_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,
-                    const GLvoid *ptr);
-
-extern void GLAPIENTRY
-_mesa_UnlockArraysEXT( void );
-
-extern void GLAPIENTRY
-_mesa_LockArraysEXT(GLint first, GLsizei count);
-
-
-extern void GLAPIENTRY
-_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
-                       GLsizei count, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                       const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
-                      const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
-                         GLsizei count, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
-			       GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,
-                            GLsizei stride, const GLvoid *pointer);
-
-
-extern void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
-                             GLboolean normalized, GLsizei stride,
-                             const GLvoid *pointer);
-
-void GLAPIENTRY
-_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
-                           GLboolean normalized,
-                           GLsizei stride, const GLvoid *ptr);
-
-
-extern void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
-
-
-extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
-
-
-extern void GLAPIENTRY
-_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
-
-
-extern void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
-                          const GLsizei *count, GLsizei primcount );
-
-extern void GLAPIENTRY
-_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
-                            const GLvoid **indices, GLsizei primcount );
-
-extern void GLAPIENTRY
-_mesa_MultiDrawElementsBaseVertex( GLenum mode,
-				   const GLsizei *count, GLenum type,
-				   const GLvoid **indices, GLsizei primcount,
-				   const GLint *basevertex);
-
-extern void GLAPIENTRY
-_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
-			      const GLsizei * count,
-			      GLsizei primcount, GLint modestride );
-
-
-extern void GLAPIENTRY
-_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
-				GLenum type, const GLvoid * const * indices,
-				GLsizei primcount, GLint modestride );
-
-extern void GLAPIENTRY
-_mesa_LockArraysEXT(GLint first, GLsizei count);
-
-extern void GLAPIENTRY
-_mesa_UnlockArraysEXT( void );
-
-
-extern void GLAPIENTRY
-_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count);
-
-extern void GLAPIENTRY
-_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,
-                   const GLvoid *indices);
-
-extern void GLAPIENTRY
-_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
-                        GLenum type, const GLvoid *indices);
-
-extern void GLAPIENTRY
-_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-			     const GLvoid *indices, GLint basevertex);
-
-extern void GLAPIENTRY
-_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
-				  GLsizei count, GLenum type,
-				  const GLvoid *indices,
-				  GLint basevertex);
-
-extern void GLAPIENTRY
-_mesa_PrimitiveRestartIndex(GLuint index);
-
-
-extern void
-_mesa_copy_client_array(GLcontext *ctx,
-                        struct gl_client_array *dst,
-                        struct gl_client_array *src);
-
-
-extern void
-_mesa_print_arrays(GLcontext *ctx);
-
-extern void
-_mesa_init_varray( GLcontext * ctx );
-
-extern void 
-_mesa_free_varray_data(GLcontext *ctx);
-
-#else
-
-/** No-op */
-#define _mesa_init_varray( c )  ((void)0)
-#define _mesa_free_varray_data( c )  ((void)0)
-
-#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 VARRAY_H

+#define VARRAY_H

+

+

+#include "glheader.h"

+#include "mfeatures.h"

+

+struct gl_client_array;

+struct gl_context;

+

+#if _HAVE_FULL_GL

+

+extern void GLAPIENTRY

+_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride,

+                    const GLvoid *ptr);

+

+extern void GLAPIENTRY

+_mesa_UnlockArraysEXT( void );

+

+extern void GLAPIENTRY

+_mesa_LockArraysEXT(GLint first, GLsizei count);

+

+

+extern void GLAPIENTRY

+_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,

+                      const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,

+                       GLsizei count, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                       const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,

+                      const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,

+                         GLsizei count, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,

+			       GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_VertexAttribPointerNV(GLuint index, GLint size, GLenum type,

+                            GLsizei stride, const GLvoid *pointer);

+

+

+extern void GLAPIENTRY

+_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,

+                             GLboolean normalized, GLsizei stride,

+                             const GLvoid *pointer);

+

+void GLAPIENTRY

+_mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,

+                           GLsizei stride, const GLvoid *ptr);

+

+

+extern void GLAPIENTRY

+_mesa_EnableVertexAttribArrayARB(GLuint index);

+

+

+extern void GLAPIENTRY

+_mesa_DisableVertexAttribArrayARB(GLuint index);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);

+

+

+extern void GLAPIENTRY

+_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);

+

+

+extern void GLAPIENTRY

+_mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);

+

+

+extern void GLAPIENTRY

+_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,

+                          const GLsizei *count, GLsizei primcount );

+

+extern void GLAPIENTRY

+_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,

+                            const GLvoid **indices, GLsizei primcount );

+

+extern void GLAPIENTRY

+_mesa_MultiDrawElementsBaseVertex( GLenum mode,

+				   const GLsizei *count, GLenum type,

+				   const GLvoid **indices, GLsizei primcount,

+				   const GLint *basevertex);

+

+extern void GLAPIENTRY

+_mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,

+			      const GLsizei * count,

+			      GLsizei primcount, GLint modestride );

+

+

+extern void GLAPIENTRY

+_mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,

+				GLenum type, const GLvoid * const * indices,

+				GLsizei primcount, GLint modestride );

+

+extern void GLAPIENTRY

+_mesa_LockArraysEXT(GLint first, GLsizei count);

+

+extern void GLAPIENTRY

+_mesa_UnlockArraysEXT( void );

+

+

+extern void GLAPIENTRY

+_mesa_DrawArrays(GLenum mode, GLint first, GLsizei count);

+

+extern void GLAPIENTRY

+_mesa_DrawElements(GLenum mode, GLsizei count, GLenum type,

+                   const GLvoid *indices);

+

+extern void GLAPIENTRY

+_mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,

+                        GLenum type, const GLvoid *indices);

+

+extern void GLAPIENTRY

+_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,

+			     const GLvoid *indices, GLint basevertex);

+

+extern void GLAPIENTRY

+_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,

+				  GLsizei count, GLenum type,

+				  const GLvoid *indices,

+				  GLint basevertex);

+

+extern void GLAPIENTRY

+_mesa_PrimitiveRestartIndex(GLuint index);

+

+

+extern void

+_mesa_copy_client_array(struct gl_context *ctx,

+                        struct gl_client_array *dst,

+                        struct gl_client_array *src);

+

+

+extern void

+_mesa_print_arrays(struct gl_context *ctx);

+

+extern void

+_mesa_init_varray( struct gl_context * ctx );

+

+extern void 

+_mesa_free_varray_data(struct gl_context *ctx);

+

+#else

+

+/** No-op */

+#define _mesa_init_varray( c )  ((void)0)

+#define _mesa_free_varray_data( c )  ((void)0)

+

+#endif

+

+#endif

diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c
index 5997ca00f..99dc8b350 100644
--- a/mesalib/src/mesa/main/version.c
+++ b/mesalib/src/mesa/main/version.c
@@ -1,284 +1,284 @@
-/*
- * Mesa 3-D graphics library
- *
- * 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, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS 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 "context.h"
-#include "version.h"
-
-
-
-/**
- * Examine enabled GL extensions to determine GL version.
- * Return major and minor version numbers.
- */
-static void
-compute_version(GLcontext *ctx)
-{
-   GLuint major, minor;
-   static const int max = 100;
-
-   const GLboolean ver_1_3 = (ctx->Extensions.ARB_multisample &&
-                              ctx->Extensions.ARB_multitexture &&
-                              ctx->Extensions.ARB_texture_border_clamp &&
-                              ctx->Extensions.ARB_texture_compression &&
-                              ctx->Extensions.ARB_texture_cube_map &&
-                              ctx->Extensions.EXT_texture_env_add &&
-                              ctx->Extensions.ARB_texture_env_combine &&
-                              ctx->Extensions.ARB_texture_env_dot3);
-   const GLboolean ver_1_4 = (ver_1_3 &&
-                              ctx->Extensions.ARB_depth_texture &&
-                              ctx->Extensions.ARB_shadow &&
-                              ctx->Extensions.ARB_texture_env_crossbar &&
-                              ctx->Extensions.ARB_texture_mirrored_repeat &&
-                              ctx->Extensions.ARB_window_pos &&
-                              ctx->Extensions.EXT_blend_color &&
-                              ctx->Extensions.EXT_blend_func_separate &&
-                              ctx->Extensions.EXT_blend_minmax &&
-                              ctx->Extensions.EXT_blend_subtract &&
-                              ctx->Extensions.EXT_fog_coord &&
-                              ctx->Extensions.EXT_multi_draw_arrays &&
-                              ctx->Extensions.EXT_point_parameters &&
-                              ctx->Extensions.EXT_secondary_color &&
-                              ctx->Extensions.EXT_stencil_wrap &&
-                              ctx->Extensions.EXT_texture_lod_bias &&
-                              ctx->Extensions.SGIS_generate_mipmap);
-   const GLboolean ver_1_5 = (ver_1_4 &&
-                              ctx->Extensions.ARB_occlusion_query &&
-                              ctx->Extensions.ARB_vertex_buffer_object &&
-                              ctx->Extensions.EXT_shadow_funcs);
-   const GLboolean ver_2_0 = (ver_1_5 &&
-                              ctx->Extensions.ARB_draw_buffers &&
-                              ctx->Extensions.ARB_point_sprite &&
-                              ctx->Extensions.ARB_shader_objects &&
-                              ctx->Extensions.ARB_vertex_shader &&
-                              ctx->Extensions.ARB_fragment_shader &&
-                              ctx->Extensions.ARB_texture_non_power_of_two &&
-                              ctx->Extensions.EXT_blend_equation_separate &&
-
-			      /* Technically, 2.0 requires the functionality
-			       * of the EXT version.  Enable 2.0 if either
-			       * extension is available, and assume that a
-			       * driver that only exposes the ATI extension
-			       * will fallback to software when necessary.
-			       */
-			      (ctx->Extensions.EXT_stencil_two_side
-			       || ctx->Extensions.ATI_separate_stencil));
-   const GLboolean ver_2_1 = (ver_2_0 &&
-                              ctx->Const.GLSLVersion >= 120 &&
-                              ctx->Extensions.EXT_pixel_buffer_object &&
-                              ctx->Extensions.EXT_texture_sRGB);
-   const GLboolean ver_3_0 = (ver_2_1 &&
-                              ctx->Extensions.ARB_half_float_pixel &&
-                              ctx->Extensions.ARB_map_buffer_range &&
-                              ctx->Extensions.ARB_texture_float &&
-                              ctx->Extensions.ARB_texture_rg &&
-                              ctx->Extensions.APPLE_vertex_array_object &&
-                              ctx->Extensions.EXT_draw_buffers2 &&
-                              ctx->Extensions.EXT_framebuffer_blit &&
-                              ctx->Extensions.EXT_framebuffer_multisample &&
-                              ctx->Extensions.EXT_framebuffer_object &&
-                              ctx->Extensions.EXT_framebuffer_sRGB &&
-                              ctx->Extensions.EXT_packed_depth_stencil &&
-                              ctx->Extensions.EXT_packed_float &&
-                              ctx->Extensions.EXT_texture_array &&
-                              ctx->Extensions.EXT_texture_compression_rgtc &&
-                              ctx->Extensions.EXT_texture_integer &&
-                              ctx->Extensions.EXT_texture_shared_exponent &&
-                              ctx->Extensions.EXT_transform_feedback &&
-                              ctx->Extensions.NV_conditional_render);
-   const GLboolean ver_3_1 = (ver_3_0 &&
-                              ctx->Extensions.ARB_copy_buffer &&
-                              ctx->Extensions.ARB_draw_instanced &&
-                              ctx->Extensions.ARB_texture_buffer_object &&
-                              ctx->Extensions.ARB_uniform_buffer_object &&
-                              ctx->Extensions.NV_primitive_restart &&
-                              ctx->Extensions.NV_texture_rectangle &&
-                              ctx->Const.MaxVertexTextureImageUnits >= 16);
-   const GLboolean ver_3_2 = (ver_3_1 &&
-                              ctx->Extensions.ARB_depth_clamp &&
-                              ctx->Extensions.ARB_draw_elements_base_vertex &&
-                              ctx->Extensions.ARB_fragment_coord_conventions &&
-                              ctx->Extensions.ARB_geometry_shader4 &&
-                              ctx->Extensions.EXT_provoking_vertex &&
-                              ctx->Extensions.ARB_seamless_cube_map &&
-                              ctx->Extensions.ARB_sync &&
-                              ctx->Extensions.ARB_texture_multisample &&
-                              ctx->Extensions.EXT_vertex_array_bgra);
-   const GLboolean ver_3_3 = (ver_3_2 &&
-                              ctx->Extensions.ARB_blend_func_extended &&
-                              ctx->Extensions.ARB_explicit_attrib_location &&
-                              ctx->Extensions.ARB_instanced_arrays &&
-                              ctx->Extensions.ARB_occlusion_query2 &&
-                              ctx->Extensions.ARB_sampler_objects &&
-                              ctx->Extensions.ARB_texture_rgb10_a2ui &&
-                              ctx->Extensions.ARB_timer_query &&
-                              ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&
-                              ctx->Extensions.EXT_texture_swizzle);
-
-   if (ver_3_3) {
-      major = 3;
-      minor = 3;
-   }
-   else if (ver_3_2) {
-      major = 3;
-      minor = 2;
-   }
-   else if (ver_3_1) {
-      major = 3;
-      minor = 1;
-   }
-   else if (ver_3_0) {
-      major = 3;
-      minor = 0;
-   }
-   else if (ver_2_1) {
-      major = 2;
-      minor = 1;
-   }
-   else if (ver_2_0) {
-      major = 2;
-      minor = 0;
-   }
-   else if (ver_1_5) {
-      major = 1;
-      minor = 5;
-   }
-   else if (ver_1_4) {
-      major = 1;
-      minor = 4;
-   }
-   else if (ver_1_3) {
-      major = 1;
-      minor = 3;
-   }
-   else {
-      major = 1;
-      minor = 2;
-   }
-
-   ctx->VersionMajor = major;
-   ctx->VersionMinor = minor;
-   ctx->VersionString = (char *) malloc(max);
-   if (ctx->VersionString) {
-      _mesa_snprintf(ctx->VersionString, max,
-		     "%u.%u Mesa " MESA_VERSION_STRING,
-		     ctx->VersionMajor, ctx->VersionMinor);
-   }
-}
-
-static void
-compute_version_es1(GLcontext *ctx)
-{
-   static const int max = 100;
-
-   /* OpenGL ES 1.0 is derived from OpenGL 1.3 */
-   const GLboolean ver_1_0 = (ctx->Extensions.ARB_multisample &&
-                              ctx->Extensions.ARB_multitexture &&
-                              ctx->Extensions.ARB_texture_compression &&
-                              ctx->Extensions.EXT_texture_env_add &&
-                              ctx->Extensions.ARB_texture_env_combine &&
-                              ctx->Extensions.ARB_texture_env_dot3);
-   /* OpenGL ES 1.1 is derived from OpenGL 1.5 */
-   const GLboolean ver_1_1 = (ver_1_0 &&
-                              ctx->Extensions.EXT_point_parameters &&
-                              ctx->Extensions.SGIS_generate_mipmap &&
-                              ctx->Extensions.ARB_vertex_buffer_object);
-
-   if (ver_1_1) {
-      ctx->VersionMajor = 1;
-      ctx->VersionMinor = 1;
-   } else if (ver_1_0) {
-      ctx->VersionMajor = 1;
-      ctx->VersionMinor = 0;
-   } else {
-      _mesa_problem(ctx, "Incomplete OpenGL ES 1.0 support.");
-   }
-
-   ctx->VersionString = (char *) malloc(max);
-   if (ctx->VersionString) {
-      _mesa_snprintf(ctx->VersionString, max,
-		     "OpenGL ES-CM 1.%d Mesa " MESA_VERSION_STRING,
-		     ctx->VersionMinor);
-   }
-}
-
-static void
-compute_version_es2(GLcontext *ctx)
-{
-   static const int max = 100;
-
-   /* OpenGL ES 2.0 is derived from OpenGL 2.0 */
-   const GLboolean ver_2_0 = (ctx->Extensions.ARB_multisample &&
-                              ctx->Extensions.ARB_multitexture &&
-                              ctx->Extensions.ARB_texture_compression &&
-                              ctx->Extensions.ARB_texture_cube_map &&
-                              ctx->Extensions.ARB_texture_mirrored_repeat &&
-                              ctx->Extensions.EXT_blend_color &&
-                              ctx->Extensions.EXT_blend_func_separate &&
-                              ctx->Extensions.EXT_blend_minmax &&
-                              ctx->Extensions.EXT_blend_subtract &&
-                              ctx->Extensions.EXT_stencil_wrap &&
-                              ctx->Extensions.ARB_vertex_buffer_object &&
-                              ctx->Extensions.ARB_shader_objects &&
-                              ctx->Extensions.ARB_vertex_shader &&
-                              ctx->Extensions.ARB_fragment_shader &&
-                              ctx->Extensions.ARB_texture_non_power_of_two &&
-                              ctx->Extensions.EXT_blend_equation_separate);
-   if (ver_2_0) {
-      ctx->VersionMajor = 2;
-      ctx->VersionMinor = 0;
-   } else {
-      _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support.");
-   }
-
-   ctx->VersionString = (char *) malloc(max);
-   if (ctx->VersionString) {
-      _mesa_snprintf(ctx->VersionString, max,
-		     "OpenGL ES 2.0 Mesa " MESA_VERSION_STRING);
-   }
-}
-
-/**
- * Set the context's VersionMajor, VersionMinor, VersionString fields.
- * This should only be called once as part of context initialization
- * or to perform version check for GLX_ARB_create_context_profile.
- */
-void
-_mesa_compute_version(GLcontext *ctx)
-{
-   if (ctx->VersionMajor)
-      return;
-
-   switch (ctx->API) {
-   case API_OPENGL:
-      compute_version(ctx);
-      break;
-   case API_OPENGLES:
-      compute_version_es1(ctx);
-      break;
-   case API_OPENGLES2:
-      compute_version_es2(ctx);
-      break;
-   }
-
-}
+/*

+ * Mesa 3-D graphics library

+ *

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS 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 "context.h"

+#include "version.h"

+

+

+

+/**

+ * Examine enabled GL extensions to determine GL version.

+ * Return major and minor version numbers.

+ */

+static void

+compute_version(struct gl_context *ctx)

+{

+   GLuint major, minor;

+   static const int max = 100;

+

+   const GLboolean ver_1_3 = (ctx->Extensions.ARB_multisample &&

+                              ctx->Extensions.ARB_multitexture &&

+                              ctx->Extensions.ARB_texture_border_clamp &&

+                              ctx->Extensions.ARB_texture_compression &&

+                              ctx->Extensions.ARB_texture_cube_map &&

+                              ctx->Extensions.EXT_texture_env_add &&

+                              ctx->Extensions.ARB_texture_env_combine &&

+                              ctx->Extensions.ARB_texture_env_dot3);

+   const GLboolean ver_1_4 = (ver_1_3 &&

+                              ctx->Extensions.ARB_depth_texture &&

+                              ctx->Extensions.ARB_shadow &&

+                              ctx->Extensions.ARB_texture_env_crossbar &&

+                              ctx->Extensions.ARB_texture_mirrored_repeat &&

+                              ctx->Extensions.ARB_window_pos &&

+                              ctx->Extensions.EXT_blend_color &&

+                              ctx->Extensions.EXT_blend_func_separate &&

+                              ctx->Extensions.EXT_blend_minmax &&

+                              ctx->Extensions.EXT_blend_subtract &&

+                              ctx->Extensions.EXT_fog_coord &&

+                              ctx->Extensions.EXT_multi_draw_arrays &&

+                              ctx->Extensions.EXT_point_parameters &&

+                              ctx->Extensions.EXT_secondary_color &&

+                              ctx->Extensions.EXT_stencil_wrap &&

+                              ctx->Extensions.EXT_texture_lod_bias &&

+                              ctx->Extensions.SGIS_generate_mipmap);

+   const GLboolean ver_1_5 = (ver_1_4 &&

+                              ctx->Extensions.ARB_occlusion_query &&

+                              ctx->Extensions.ARB_vertex_buffer_object &&

+                              ctx->Extensions.EXT_shadow_funcs);

+   const GLboolean ver_2_0 = (ver_1_5 &&

+                              ctx->Extensions.ARB_draw_buffers &&

+                              ctx->Extensions.ARB_point_sprite &&

+                              ctx->Extensions.ARB_shader_objects &&

+                              ctx->Extensions.ARB_vertex_shader &&

+                              ctx->Extensions.ARB_fragment_shader &&

+                              ctx->Extensions.ARB_texture_non_power_of_two &&

+                              ctx->Extensions.EXT_blend_equation_separate &&

+

+			      /* Technically, 2.0 requires the functionality

+			       * of the EXT version.  Enable 2.0 if either

+			       * extension is available, and assume that a

+			       * driver that only exposes the ATI extension

+			       * will fallback to software when necessary.

+			       */

+			      (ctx->Extensions.EXT_stencil_two_side

+			       || ctx->Extensions.ATI_separate_stencil));

+   const GLboolean ver_2_1 = (ver_2_0 &&

+                              ctx->Const.GLSLVersion >= 120 &&

+                              ctx->Extensions.EXT_pixel_buffer_object &&

+                              ctx->Extensions.EXT_texture_sRGB);

+   const GLboolean ver_3_0 = (ver_2_1 &&

+                              ctx->Extensions.ARB_half_float_pixel &&

+                              ctx->Extensions.ARB_map_buffer_range &&

+                              ctx->Extensions.ARB_texture_float &&

+                              ctx->Extensions.ARB_texture_rg &&

+                              ctx->Extensions.ARB_texture_compression_rgtc &&

+                              ctx->Extensions.APPLE_vertex_array_object &&

+                              ctx->Extensions.EXT_draw_buffers2 &&

+                              ctx->Extensions.EXT_framebuffer_blit &&

+                              ctx->Extensions.EXT_framebuffer_multisample &&

+                              ctx->Extensions.EXT_framebuffer_object &&

+                              ctx->Extensions.EXT_framebuffer_sRGB &&

+                              ctx->Extensions.EXT_packed_depth_stencil &&

+                              ctx->Extensions.EXT_packed_float &&

+                              ctx->Extensions.EXT_texture_array &&

+                              ctx->Extensions.EXT_texture_integer &&

+                              ctx->Extensions.EXT_texture_shared_exponent &&

+                              ctx->Extensions.EXT_transform_feedback &&

+                              ctx->Extensions.NV_conditional_render);

+   const GLboolean ver_3_1 = (ver_3_0 &&

+                              ctx->Extensions.ARB_copy_buffer &&

+                              ctx->Extensions.ARB_draw_instanced &&

+                              ctx->Extensions.ARB_texture_buffer_object &&

+                              ctx->Extensions.ARB_uniform_buffer_object &&

+                              ctx->Extensions.NV_primitive_restart &&

+                              ctx->Extensions.NV_texture_rectangle &&

+                              ctx->Const.MaxVertexTextureImageUnits >= 16);

+   const GLboolean ver_3_2 = (ver_3_1 &&

+                              ctx->Extensions.ARB_depth_clamp &&

+                              ctx->Extensions.ARB_draw_elements_base_vertex &&

+                              ctx->Extensions.ARB_fragment_coord_conventions &&

+                              ctx->Extensions.ARB_geometry_shader4 &&

+                              ctx->Extensions.EXT_provoking_vertex &&

+                              ctx->Extensions.ARB_seamless_cube_map &&

+                              ctx->Extensions.ARB_sync &&

+                              ctx->Extensions.ARB_texture_multisample &&

+                              ctx->Extensions.EXT_vertex_array_bgra);

+   const GLboolean ver_3_3 = (ver_3_2 &&

+                              ctx->Extensions.ARB_blend_func_extended &&

+                              ctx->Extensions.ARB_explicit_attrib_location &&

+                              ctx->Extensions.ARB_instanced_arrays &&

+                              ctx->Extensions.ARB_occlusion_query2 &&

+                              ctx->Extensions.ARB_sampler_objects &&

+                              ctx->Extensions.ARB_texture_rgb10_a2ui &&

+                              ctx->Extensions.ARB_timer_query &&

+                              ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&

+                              ctx->Extensions.EXT_texture_swizzle);

+

+   if (ver_3_3) {

+      major = 3;

+      minor = 3;

+   }

+   else if (ver_3_2) {

+      major = 3;

+      minor = 2;

+   }

+   else if (ver_3_1) {

+      major = 3;

+      minor = 1;

+   }

+   else if (ver_3_0) {

+      major = 3;

+      minor = 0;

+   }

+   else if (ver_2_1) {

+      major = 2;

+      minor = 1;

+   }

+   else if (ver_2_0) {

+      major = 2;

+      minor = 0;

+   }

+   else if (ver_1_5) {

+      major = 1;

+      minor = 5;

+   }

+   else if (ver_1_4) {

+      major = 1;

+      minor = 4;

+   }

+   else if (ver_1_3) {

+      major = 1;

+      minor = 3;

+   }

+   else {

+      major = 1;

+      minor = 2;

+   }

+

+   ctx->VersionMajor = major;

+   ctx->VersionMinor = minor;

+   ctx->VersionString = (char *) malloc(max);

+   if (ctx->VersionString) {

+      _mesa_snprintf(ctx->VersionString, max,

+		     "%u.%u Mesa " MESA_VERSION_STRING,

+		     ctx->VersionMajor, ctx->VersionMinor);

+   }

+}

+

+static void

+compute_version_es1(struct gl_context *ctx)

+{

+   static const int max = 100;

+

+   /* OpenGL ES 1.0 is derived from OpenGL 1.3 */

+   const GLboolean ver_1_0 = (ctx->Extensions.ARB_multisample &&

+                              ctx->Extensions.ARB_multitexture &&

+                              ctx->Extensions.ARB_texture_compression &&

+                              ctx->Extensions.EXT_texture_env_add &&

+                              ctx->Extensions.ARB_texture_env_combine &&

+                              ctx->Extensions.ARB_texture_env_dot3);

+   /* OpenGL ES 1.1 is derived from OpenGL 1.5 */

+   const GLboolean ver_1_1 = (ver_1_0 &&

+                              ctx->Extensions.EXT_point_parameters &&

+                              ctx->Extensions.SGIS_generate_mipmap &&

+                              ctx->Extensions.ARB_vertex_buffer_object);

+

+   if (ver_1_1) {

+      ctx->VersionMajor = 1;

+      ctx->VersionMinor = 1;

+   } else if (ver_1_0) {

+      ctx->VersionMajor = 1;

+      ctx->VersionMinor = 0;

+   } else {

+      _mesa_problem(ctx, "Incomplete OpenGL ES 1.0 support.");

+   }

+

+   ctx->VersionString = (char *) malloc(max);

+   if (ctx->VersionString) {

+      _mesa_snprintf(ctx->VersionString, max,

+		     "OpenGL ES-CM 1.%d Mesa " MESA_VERSION_STRING,

+		     ctx->VersionMinor);

+   }

+}

+

+static void

+compute_version_es2(struct gl_context *ctx)

+{

+   static const int max = 100;

+

+   /* OpenGL ES 2.0 is derived from OpenGL 2.0 */

+   const GLboolean ver_2_0 = (ctx->Extensions.ARB_multisample &&

+                              ctx->Extensions.ARB_multitexture &&

+                              ctx->Extensions.ARB_texture_compression &&

+                              ctx->Extensions.ARB_texture_cube_map &&

+                              ctx->Extensions.ARB_texture_mirrored_repeat &&

+                              ctx->Extensions.EXT_blend_color &&

+                              ctx->Extensions.EXT_blend_func_separate &&

+                              ctx->Extensions.EXT_blend_minmax &&

+                              ctx->Extensions.EXT_blend_subtract &&

+                              ctx->Extensions.EXT_stencil_wrap &&

+                              ctx->Extensions.ARB_vertex_buffer_object &&

+                              ctx->Extensions.ARB_shader_objects &&

+                              ctx->Extensions.ARB_vertex_shader &&

+                              ctx->Extensions.ARB_fragment_shader &&

+                              ctx->Extensions.ARB_texture_non_power_of_two &&

+                              ctx->Extensions.EXT_blend_equation_separate);

+   if (ver_2_0) {

+      ctx->VersionMajor = 2;

+      ctx->VersionMinor = 0;

+   } else {

+      _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support.");

+   }

+

+   ctx->VersionString = (char *) malloc(max);

+   if (ctx->VersionString) {

+      _mesa_snprintf(ctx->VersionString, max,

+		     "OpenGL ES 2.0 Mesa " MESA_VERSION_STRING);

+   }

+}

+

+/**

+ * Set the context's VersionMajor, VersionMinor, VersionString fields.

+ * This should only be called once as part of context initialization

+ * or to perform version check for GLX_ARB_create_context_profile.

+ */

+void

+_mesa_compute_version(struct gl_context *ctx)

+{

+   if (ctx->VersionMajor)

+      return;

+

+   switch (ctx->API) {

+   case API_OPENGL:

+      compute_version(ctx);

+      break;

+   case API_OPENGLES:

+      compute_version_es1(ctx);

+      break;

+   case API_OPENGLES2:

+      compute_version_es2(ctx);

+      break;

+   }

+

+}

diff --git a/mesalib/src/mesa/main/version.h b/mesalib/src/mesa/main/version.h
index 1289ca985..0dff499ef 100644
--- a/mesalib/src/mesa/main/version.h
+++ b/mesalib/src/mesa/main/version.h
@@ -1,60 +1,60 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.9
- *
- * 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 VERSION_H
-#define VERSION_H
-
-
-#include "mtypes.h"
-
-
-/* Mesa version */
-#define MESA_MAJOR 7
-#define MESA_MINOR 9
-#define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.9"
-
-/* To make version comparison easy */
-#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define MESA_VERSION_CODE MESA_VERSION(MESA_MAJOR, MESA_MINOR, MESA_PATCH)
-
-
-/* OpenGL API version */
-#define OPENGL_MAJOR 2
-#define OPENGL_MINOR 1
-#define OPENGL_PATCH 0
-#define OPENGL_VERSION_STRING "2.1"
-
-/* To make version comparison easy */
-#define OPENGL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR, OPENGL_PATCH)
-
-
-extern void
-_mesa_compute_version(GLcontext *ctx);
-
-
-#endif /* VERSION_H */
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.10

+ *

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

+#define VERSION_H

+

+

+struct gl_context;

+

+

+/* Mesa version */

+#define MESA_MAJOR 7

+#define MESA_MINOR 10

+#define MESA_PATCH 0

+#define MESA_VERSION_STRING "7.10-devel"

+

+/* To make version comparison easy */

+#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

+#define MESA_VERSION_CODE MESA_VERSION(MESA_MAJOR, MESA_MINOR, MESA_PATCH)

+

+

+/* OpenGL API version */

+#define OPENGL_MAJOR 2

+#define OPENGL_MINOR 1

+#define OPENGL_PATCH 0

+#define OPENGL_VERSION_STRING "2.1"

+

+/* To make version comparison easy */

+#define OPENGL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

+#define OPENGL_VERSION_CODE OPENGL_VERSION(OPENGL_MAJOR, OPENGL_MINOR, OPENGL_PATCH)

+

+

+extern void

+_mesa_compute_version(struct gl_context *ctx);

+

+

+#endif /* VERSION_H */

diff --git a/mesalib/src/mesa/main/viewport.c b/mesalib/src/mesa/main/viewport.c
index 309308c98..1b4e6c339 100644
--- a/mesalib/src/mesa/main/viewport.c
+++ b/mesalib/src/mesa/main/viewport.c
@@ -1,180 +1,180 @@
-/*
- * 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
- * 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 viewport.c
- * glViewport and glDepthRange functions.
- */
-
-
-#include "context.h"
-#include "macros.h"
-#include "viewport.h"
-
-
-/**
- * Set the viewport.
- * \sa Called via glViewport() or display list execution.
- *
- * Flushes the vertices and calls _mesa_set_viewport() with the given
- * parameters.
- */
-void GLAPIENTRY
-_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-   _mesa_set_viewport(ctx, x, y, width, height);
-}
-
-
-/**
- * Set new viewport parameters and update derived state (the _WindowMap
- * matrix).  Usually called from _mesa_Viewport().
- * 
- * \param ctx GL context.
- * \param x, y coordinates of the lower left corner of the viewport rectangle.
- * \param width width of the viewport rectangle.
- * \param height height of the viewport rectangle.
- */
-void
-_mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
-                    GLsizei width, GLsizei height)
-{
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);
-
-   if (width < 0 || height < 0) {
-      _mesa_error(ctx,  GL_INVALID_VALUE,
-                   "glViewport(%d, %d, %d, %d)", x, y, width, height);
-      return;
-   }
-
-   /* clamp width and height to the implementation dependent range */
-   width  = MIN2(width, (GLsizei) ctx->Const.MaxViewportWidth);
-   height = MIN2(height, (GLsizei) ctx->Const.MaxViewportHeight);
-
-   ctx->Viewport.X = x;
-   ctx->Viewport.Width = width;
-   ctx->Viewport.Y = y;
-   ctx->Viewport.Height = height;
-   ctx->NewState |= _NEW_VIEWPORT;
-
-#if 1
-   /* XXX remove this someday.  Currently the DRI drivers rely on
-    * the WindowMap matrix being up to date in the driver's Viewport
-    * and DepthRange functions.
-    */
-   _math_matrix_viewport(&ctx->Viewport._WindowMap,
-                         ctx->Viewport.X, ctx->Viewport.Y,
-                         ctx->Viewport.Width, ctx->Viewport.Height,
-                         ctx->Viewport.Near, ctx->Viewport.Far,
-                         ctx->DrawBuffer->_DepthMaxF);
-#endif
-
-   if (ctx->Driver.Viewport) {
-      /* Many drivers will use this call to check for window size changes
-       * and reallocate the z/stencil/accum/etc buffers if needed.
-       */
-      ctx->Driver.Viewport(ctx, x, y, width, height);
-   }
-}
-
-
-/**
- * Called by glDepthRange
- *
- * \param nearval  specifies the Z buffer value which should correspond to
- *                 the near clip plane
- * \param farval  specifies the Z buffer value which should correspond to
- *                the far clip plane
- */
-void GLAPIENTRY
-_mesa_DepthRange(GLclampd nearval, GLclampd farval)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE&VERBOSE_API)
-      _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval);
-
-   if (ctx->Viewport.Near == nearval &&
-       ctx->Viewport.Far == farval)
-      return;
-
-   ctx->Viewport.Near = (GLfloat) CLAMP(nearval, 0.0, 1.0);
-   ctx->Viewport.Far = (GLfloat) CLAMP(farval, 0.0, 1.0);
-   ctx->NewState |= _NEW_VIEWPORT;
-
-#if 1
-   /* XXX remove this someday.  Currently the DRI drivers rely on
-    * the WindowMap matrix being up to date in the driver's Viewport
-    * and DepthRange functions.
-    */
-   _math_matrix_viewport(&ctx->Viewport._WindowMap,
-                         ctx->Viewport.X, ctx->Viewport.Y,
-                         ctx->Viewport.Width, ctx->Viewport.Height,
-                         ctx->Viewport.Near, ctx->Viewport.Far,
-                         ctx->DrawBuffer->_DepthMaxF);
-#endif
-
-   if (ctx->Driver.DepthRange) {
-      ctx->Driver.DepthRange(ctx, nearval, farval);
-   }
-}
-
-
-
-/** 
- * Initialize the context viewport attribute group.
- * \param ctx  the GL context.
- */
-void _mesa_init_viewport(GLcontext *ctx)
-{
-   GLfloat depthMax = 65535.0F; /* sorf of arbitrary */
-
-   /* Viewport group */
-   ctx->Viewport.X = 0;
-   ctx->Viewport.Y = 0;
-   ctx->Viewport.Width = 0;
-   ctx->Viewport.Height = 0;
-   ctx->Viewport.Near = 0.0;
-   ctx->Viewport.Far = 1.0;
-   _math_matrix_ctr(&ctx->Viewport._WindowMap);
-
-   _math_matrix_viewport(&ctx->Viewport._WindowMap, 0, 0, 0, 0,
-                         0.0F, 1.0F, depthMax);
-}
-
-
-/** 
- * Free the context viewport attribute group data.
- * \param ctx  the GL context.
- */
-void _mesa_free_viewport_data(GLcontext *ctx)
-{
-   _math_matrix_dtr(&ctx->Viewport._WindowMap);
-}
-
+/*

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

+ * 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 viewport.c

+ * glViewport and glDepthRange functions.

+ */

+

+

+#include "context.h"

+#include "macros.h"

+#include "viewport.h"

+

+

+/**

+ * Set the viewport.

+ * \sa Called via glViewport() or display list execution.

+ *

+ * Flushes the vertices and calls _mesa_set_viewport() with the given

+ * parameters.

+ */

+void GLAPIENTRY

+_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+   _mesa_set_viewport(ctx, x, y, width, height);

+}

+

+

+/**

+ * Set new viewport parameters and update derived state (the _WindowMap

+ * matrix).  Usually called from _mesa_Viewport().

+ * 

+ * \param ctx GL context.

+ * \param x, y coordinates of the lower left corner of the viewport rectangle.

+ * \param width width of the viewport rectangle.

+ * \param height height of the viewport rectangle.

+ */

+void

+_mesa_set_viewport(struct gl_context *ctx, GLint x, GLint y,

+                    GLsizei width, GLsizei height)

+{

+   if (MESA_VERBOSE & VERBOSE_API)

+      _mesa_debug(ctx, "glViewport %d %d %d %d\n", x, y, width, height);

+

+   if (width < 0 || height < 0) {

+      _mesa_error(ctx,  GL_INVALID_VALUE,

+                   "glViewport(%d, %d, %d, %d)", x, y, width, height);

+      return;

+   }

+

+   /* clamp width and height to the implementation dependent range */

+   width  = MIN2(width, (GLsizei) ctx->Const.MaxViewportWidth);

+   height = MIN2(height, (GLsizei) ctx->Const.MaxViewportHeight);

+

+   ctx->Viewport.X = x;

+   ctx->Viewport.Width = width;

+   ctx->Viewport.Y = y;

+   ctx->Viewport.Height = height;

+   ctx->NewState |= _NEW_VIEWPORT;

+

+#if 1

+   /* XXX remove this someday.  Currently the DRI drivers rely on

+    * the WindowMap matrix being up to date in the driver's Viewport

+    * and DepthRange functions.

+    */

+   _math_matrix_viewport(&ctx->Viewport._WindowMap,

+                         ctx->Viewport.X, ctx->Viewport.Y,

+                         ctx->Viewport.Width, ctx->Viewport.Height,

+                         ctx->Viewport.Near, ctx->Viewport.Far,

+                         ctx->DrawBuffer->_DepthMaxF);

+#endif

+

+   if (ctx->Driver.Viewport) {

+      /* Many drivers will use this call to check for window size changes

+       * and reallocate the z/stencil/accum/etc buffers if needed.

+       */

+      ctx->Driver.Viewport(ctx, x, y, width, height);

+   }

+}

+

+

+/**

+ * Called by glDepthRange

+ *

+ * \param nearval  specifies the Z buffer value which should correspond to

+ *                 the near clip plane

+ * \param farval  specifies the Z buffer value which should correspond to

+ *                the far clip plane

+ */

+void GLAPIENTRY

+_mesa_DepthRange(GLclampd nearval, GLclampd farval)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

+

+   if (MESA_VERBOSE&VERBOSE_API)

+      _mesa_debug(ctx, "glDepthRange %f %f\n", nearval, farval);

+

+   if (ctx->Viewport.Near == nearval &&

+       ctx->Viewport.Far == farval)

+      return;

+

+   ctx->Viewport.Near = (GLfloat) CLAMP(nearval, 0.0, 1.0);

+   ctx->Viewport.Far = (GLfloat) CLAMP(farval, 0.0, 1.0);

+   ctx->NewState |= _NEW_VIEWPORT;

+

+#if 1

+   /* XXX remove this someday.  Currently the DRI drivers rely on

+    * the WindowMap matrix being up to date in the driver's Viewport

+    * and DepthRange functions.

+    */

+   _math_matrix_viewport(&ctx->Viewport._WindowMap,

+                         ctx->Viewport.X, ctx->Viewport.Y,

+                         ctx->Viewport.Width, ctx->Viewport.Height,

+                         ctx->Viewport.Near, ctx->Viewport.Far,

+                         ctx->DrawBuffer->_DepthMaxF);

+#endif

+

+   if (ctx->Driver.DepthRange) {

+      ctx->Driver.DepthRange(ctx, nearval, farval);

+   }

+}

+

+

+

+/** 

+ * Initialize the context viewport attribute group.

+ * \param ctx  the GL context.

+ */

+void _mesa_init_viewport(struct gl_context *ctx)

+{

+   GLfloat depthMax = 65535.0F; /* sorf of arbitrary */

+

+   /* Viewport group */

+   ctx->Viewport.X = 0;

+   ctx->Viewport.Y = 0;

+   ctx->Viewport.Width = 0;

+   ctx->Viewport.Height = 0;

+   ctx->Viewport.Near = 0.0;

+   ctx->Viewport.Far = 1.0;

+   _math_matrix_ctr(&ctx->Viewport._WindowMap);

+

+   _math_matrix_viewport(&ctx->Viewport._WindowMap, 0, 0, 0, 0,

+                         0.0F, 1.0F, depthMax);

+}

+

+

+/** 

+ * Free the context viewport attribute group data.

+ * \param ctx  the GL context.

+ */

+void _mesa_free_viewport_data(struct gl_context *ctx)

+{

+   _math_matrix_dtr(&ctx->Viewport._WindowMap);

+}

+

diff --git a/mesalib/src/mesa/main/viewport.h b/mesalib/src/mesa/main/viewport.h
index ec054a7c5..757c28116 100644
--- a/mesalib/src/mesa/main/viewport.h
+++ b/mesalib/src/mesa/main/viewport.h
@@ -1,54 +1,55 @@
-/*
- * 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.
- */
-
-
-#ifndef VIEWPORT_H
-#define VIEWPORT_H
-
-#include "glheader.h"
-#include "mtypes.h"
-
-extern void GLAPIENTRY
-_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
-
-
-extern void 
-_mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
-                   GLsizei width, GLsizei height);
-
-
-extern void GLAPIENTRY
-_mesa_DepthRange(GLclampd nearval, GLclampd farval);
-
-
-extern void 
-_mesa_init_viewport(GLcontext *ctx);
-
-
-extern void 
-_mesa_free_viewport_data(GLcontext *ctx);
-
-
-#endif
+/*

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

+ */

+

+

+#ifndef VIEWPORT_H

+#define VIEWPORT_H

+

+#include "glheader.h"

+

+struct gl_context;

+

+extern void GLAPIENTRY

+_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);

+

+

+extern void 

+_mesa_set_viewport(struct gl_context *ctx, GLint x, GLint y,

+                   GLsizei width, GLsizei height);

+

+

+extern void GLAPIENTRY

+_mesa_DepthRange(GLclampd nearval, GLclampd farval);

+

+

+extern void 

+_mesa_init_viewport(struct gl_context *ctx);

+

+

+extern void 

+_mesa_free_viewport_data(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/main/vtxfmt.c b/mesalib/src/mesa/main/vtxfmt.c
index ca352e88e..6fec7f09b 100644
--- a/mesalib/src/mesa/main/vtxfmt.c
+++ b/mesalib/src/mesa/main/vtxfmt.c
@@ -1,203 +1,171 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- *    Gareth Hughes
- */
-
-#include "glheader.h"
-#include "api_arrayelt.h"
-#include "context.h"
-#include "imports.h"
-#include "mtypes.h"
-#include "vtxfmt.h"
-#include "eval.h"
-#include "dlist.h"
-
-
-#if FEATURE_beginend
-
-
-/* The neutral vertex format.  This wraps all tnl module functions,
- * verifying that the currently-installed module is valid and then
- * installing the function pointers in a lazy fashion.  It records the
- * function pointers that have been swapped out, which allows a fast
- * restoration of the neutral module in almost all cases -- a typical
- * app might only require 4-6 functions to be modified from the neutral
- * baseline, and only restoring these is certainly preferable to doing
- * the entire module's 60 or so function pointers.
- */
-
-#define PRE_LOOPBACK( FUNC )						\
-{									\
-   GET_CURRENT_CONTEXT(ctx);						\
-   struct gl_tnl_module * const tnl = &(ctx->TnlModule);		\
-   const int tmp_offset = _gloffset_ ## FUNC ;				\
-									\
-   ASSERT( tnl->Current );						\
-   ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES );		\
-   ASSERT( tmp_offset >= 0 );						\
-                                                                        \
-   if (tnl->SwapCount == 0)                                             \
-      ctx->Driver.BeginVertices( ctx );                                 \
-                                                                        \
-   /* Save the swapped function's dispatch entry so it can be */        \
-   /* restored later. */                                                \
-   tnl->Swapped[tnl->SwapCount].location = & (((_glapi_proc *)ctx->Exec)[tmp_offset]); \
-   tnl->Swapped[tnl->SwapCount].function = (_glapi_proc)TAG(FUNC);	\
-   tnl->SwapCount++;							\
-									\
-   if ( 0 )								\
-      _mesa_debug(ctx, "   swapping gl" #FUNC"...\n" );			\
-									\
-   /* Install the tnl function pointer.	*/				\
-   SET_ ## FUNC(ctx->Exec, tnl->Current->FUNC);				\
-}
-
-#define TAG(x) neutral_##x
-#include "vtxfmt_tmp.h"
-
-
-/**
- * Use the per-vertex functions found in <vfmt> to initialze the given
- * API dispatch table.
- */
-static void
-install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
-{
-   _mesa_install_arrayelt_vtxfmt(tab, vfmt);
-
-   SET_Color3f(tab, vfmt->Color3f);
-   SET_Color3fv(tab, vfmt->Color3fv);
-   SET_Color4f(tab, vfmt->Color4f);
-   SET_Color4fv(tab, vfmt->Color4fv);
-   SET_EdgeFlag(tab, vfmt->EdgeFlag);
-
-   _mesa_install_eval_vtxfmt(tab, vfmt);
-
-   SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);
-   SET_FogCoordfvEXT(tab, vfmt->FogCoordfvEXT);
-   SET_Indexf(tab, vfmt->Indexf);
-   SET_Indexfv(tab, vfmt->Indexfv);
-   SET_Materialfv(tab, vfmt->Materialfv);
-   SET_MultiTexCoord1fARB(tab, vfmt->MultiTexCoord1fARB);
-   SET_MultiTexCoord1fvARB(tab, vfmt->MultiTexCoord1fvARB);
-   SET_MultiTexCoord2fARB(tab, vfmt->MultiTexCoord2fARB);
-   SET_MultiTexCoord2fvARB(tab, vfmt->MultiTexCoord2fvARB);
-   SET_MultiTexCoord3fARB(tab, vfmt->MultiTexCoord3fARB);
-   SET_MultiTexCoord3fvARB(tab, vfmt->MultiTexCoord3fvARB);
-   SET_MultiTexCoord4fARB(tab, vfmt->MultiTexCoord4fARB);
-   SET_MultiTexCoord4fvARB(tab, vfmt->MultiTexCoord4fvARB);
-   SET_Normal3f(tab, vfmt->Normal3f);
-   SET_Normal3fv(tab, vfmt->Normal3fv);
-   SET_SecondaryColor3fEXT(tab, vfmt->SecondaryColor3fEXT);
-   SET_SecondaryColor3fvEXT(tab, vfmt->SecondaryColor3fvEXT);
-   SET_TexCoord1f(tab, vfmt->TexCoord1f);
-   SET_TexCoord1fv(tab, vfmt->TexCoord1fv);
-   SET_TexCoord2f(tab, vfmt->TexCoord2f);
-   SET_TexCoord2fv(tab, vfmt->TexCoord2fv);
-   SET_TexCoord3f(tab, vfmt->TexCoord3f);
-   SET_TexCoord3fv(tab, vfmt->TexCoord3fv);
-   SET_TexCoord4f(tab, vfmt->TexCoord4f);
-   SET_TexCoord4fv(tab, vfmt->TexCoord4fv);
-   SET_Vertex2f(tab, vfmt->Vertex2f);
-   SET_Vertex2fv(tab, vfmt->Vertex2fv);
-   SET_Vertex3f(tab, vfmt->Vertex3f);
-   SET_Vertex3fv(tab, vfmt->Vertex3fv);
-   SET_Vertex4f(tab, vfmt->Vertex4f);
-   SET_Vertex4fv(tab, vfmt->Vertex4fv);
-
-   _mesa_install_dlist_vtxfmt(tab, vfmt);
-
-   SET_Begin(tab, vfmt->Begin);
-   SET_End(tab, vfmt->End);
-   SET_Rectf(tab, vfmt->Rectf);
-   SET_DrawArrays(tab, vfmt->DrawArrays);
-   SET_DrawElements(tab, vfmt->DrawElements);
-   SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
-   SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
-   SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
-   SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);
-   SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);
-   SET_DrawArraysInstanced(tab, vfmt->DrawArraysInstanced);
-   SET_DrawElementsInstanced(tab, vfmt->DrawElementsInstanced);
-
-   /* GL_NV_vertex_program */
-   SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV);
-   SET_VertexAttrib1fvNV(tab, vfmt->VertexAttrib1fvNV);
-   SET_VertexAttrib2fNV(tab, vfmt->VertexAttrib2fNV);
-   SET_VertexAttrib2fvNV(tab, vfmt->VertexAttrib2fvNV);
-   SET_VertexAttrib3fNV(tab, vfmt->VertexAttrib3fNV);
-   SET_VertexAttrib3fvNV(tab, vfmt->VertexAttrib3fvNV);
-   SET_VertexAttrib4fNV(tab, vfmt->VertexAttrib4fNV);
-   SET_VertexAttrib4fvNV(tab, vfmt->VertexAttrib4fvNV);
-#if FEATURE_ARB_vertex_program
-   SET_VertexAttrib1fARB(tab, vfmt->VertexAttrib1fARB);
-   SET_VertexAttrib1fvARB(tab, vfmt->VertexAttrib1fvARB);
-   SET_VertexAttrib2fARB(tab, vfmt->VertexAttrib2fARB);
-   SET_VertexAttrib2fvARB(tab, vfmt->VertexAttrib2fvARB);
-   SET_VertexAttrib3fARB(tab, vfmt->VertexAttrib3fARB);
-   SET_VertexAttrib3fvARB(tab, vfmt->VertexAttrib3fvARB);
-   SET_VertexAttrib4fARB(tab, vfmt->VertexAttrib4fARB);
-   SET_VertexAttrib4fvARB(tab, vfmt->VertexAttrib4fvARB);
-#endif
-}
-
-
-void _mesa_init_exec_vtxfmt( GLcontext *ctx )
-{
-   install_vtxfmt( ctx->Exec, &neutral_vtxfmt );
-   ctx->TnlModule.SwapCount = 0;
-}
-
-
-void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-   ctx->TnlModule.Current = vfmt;
-   _mesa_restore_exec_vtxfmt( ctx );
-}
-
-
-void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-   install_vtxfmt( ctx->Save, vfmt );
-}
-
-
-void _mesa_restore_exec_vtxfmt( GLcontext *ctx )
-{
-   struct gl_tnl_module *tnl = &(ctx->TnlModule);
-   GLuint i;
-
-   /* Restore the neutral tnl module wrapper.
-    */
-   for ( i = 0 ; i < tnl->SwapCount ; i++ ) {
-      *(tnl->Swapped[i].location) = tnl->Swapped[i].function;
-   }
-
-   tnl->SwapCount = 0;
-}
-
-
-#endif /* FEATURE_beginend */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ *    Gareth Hughes

+ */

+

+#include "glheader.h"

+#include "api_arrayelt.h"

+#include "context.h"

+#include "imports.h"

+#include "mtypes.h"

+#include "vtxfmt.h"

+#include "eval.h"

+#include "dlist.h"

+#include "main/dispatch.h"

+

+

+#if FEATURE_beginend

+

+/**

+ * Use the per-vertex functions found in <vfmt> to initialoze the given

+ * API dispatch table.

+ */

+static void

+install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )

+{

+   _mesa_install_arrayelt_vtxfmt(tab, vfmt);

+

+   SET_Color3f(tab, vfmt->Color3f);

+   SET_Color3fv(tab, vfmt->Color3fv);

+   SET_Color4f(tab, vfmt->Color4f);

+   SET_Color4fv(tab, vfmt->Color4fv);

+   SET_EdgeFlag(tab, vfmt->EdgeFlag);

+

+   _mesa_install_eval_vtxfmt(tab, vfmt);

+

+   SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);

+   SET_FogCoordfvEXT(tab, vfmt->FogCoordfvEXT);

+   SET_Indexf(tab, vfmt->Indexf);

+   SET_Indexfv(tab, vfmt->Indexfv);

+   SET_Materialfv(tab, vfmt->Materialfv);

+   SET_MultiTexCoord1fARB(tab, vfmt->MultiTexCoord1fARB);

+   SET_MultiTexCoord1fvARB(tab, vfmt->MultiTexCoord1fvARB);

+   SET_MultiTexCoord2fARB(tab, vfmt->MultiTexCoord2fARB);

+   SET_MultiTexCoord2fvARB(tab, vfmt->MultiTexCoord2fvARB);

+   SET_MultiTexCoord3fARB(tab, vfmt->MultiTexCoord3fARB);

+   SET_MultiTexCoord3fvARB(tab, vfmt->MultiTexCoord3fvARB);

+   SET_MultiTexCoord4fARB(tab, vfmt->MultiTexCoord4fARB);

+   SET_MultiTexCoord4fvARB(tab, vfmt->MultiTexCoord4fvARB);

+   SET_Normal3f(tab, vfmt->Normal3f);

+   SET_Normal3fv(tab, vfmt->Normal3fv);

+   SET_SecondaryColor3fEXT(tab, vfmt->SecondaryColor3fEXT);

+   SET_SecondaryColor3fvEXT(tab, vfmt->SecondaryColor3fvEXT);

+   SET_TexCoord1f(tab, vfmt->TexCoord1f);

+   SET_TexCoord1fv(tab, vfmt->TexCoord1fv);

+   SET_TexCoord2f(tab, vfmt->TexCoord2f);

+   SET_TexCoord2fv(tab, vfmt->TexCoord2fv);

+   SET_TexCoord3f(tab, vfmt->TexCoord3f);

+   SET_TexCoord3fv(tab, vfmt->TexCoord3fv);

+   SET_TexCoord4f(tab, vfmt->TexCoord4f);

+   SET_TexCoord4fv(tab, vfmt->TexCoord4fv);

+   SET_Vertex2f(tab, vfmt->Vertex2f);

+   SET_Vertex2fv(tab, vfmt->Vertex2fv);

+   SET_Vertex3f(tab, vfmt->Vertex3f);

+   SET_Vertex3fv(tab, vfmt->Vertex3fv);

+   SET_Vertex4f(tab, vfmt->Vertex4f);

+   SET_Vertex4fv(tab, vfmt->Vertex4fv);

+

+   _mesa_install_dlist_vtxfmt(tab, vfmt);   /* glCallList / glCallLists */

+

+   SET_Begin(tab, vfmt->Begin);

+   SET_End(tab, vfmt->End);

+   SET_PrimitiveRestartNV(tab, vfmt->PrimitiveRestartNV);

+

+   SET_Rectf(tab, vfmt->Rectf);

+

+   SET_DrawArrays(tab, vfmt->DrawArrays);

+   SET_DrawElements(tab, vfmt->DrawElements);

+   SET_DrawRangeElements(tab, vfmt->DrawRangeElements);

+   SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);

+   SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);

+   SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);

+   SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);

+   SET_DrawArraysInstancedARB(tab, vfmt->DrawArraysInstanced);

+   SET_DrawElementsInstancedARB(tab, vfmt->DrawElementsInstanced);

+

+   /* GL_NV_vertex_program */

+   SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV);

+   SET_VertexAttrib1fvNV(tab, vfmt->VertexAttrib1fvNV);

+   SET_VertexAttrib2fNV(tab, vfmt->VertexAttrib2fNV);

+   SET_VertexAttrib2fvNV(tab, vfmt->VertexAttrib2fvNV);

+   SET_VertexAttrib3fNV(tab, vfmt->VertexAttrib3fNV);

+   SET_VertexAttrib3fvNV(tab, vfmt->VertexAttrib3fvNV);

+   SET_VertexAttrib4fNV(tab, vfmt->VertexAttrib4fNV);

+   SET_VertexAttrib4fvNV(tab, vfmt->VertexAttrib4fvNV);

+#if FEATURE_ARB_vertex_program

+   SET_VertexAttrib1fARB(tab, vfmt->VertexAttrib1fARB);

+   SET_VertexAttrib1fvARB(tab, vfmt->VertexAttrib1fvARB);

+   SET_VertexAttrib2fARB(tab, vfmt->VertexAttrib2fARB);

+   SET_VertexAttrib2fvARB(tab, vfmt->VertexAttrib2fvARB);

+   SET_VertexAttrib3fARB(tab, vfmt->VertexAttrib3fARB);

+   SET_VertexAttrib3fvARB(tab, vfmt->VertexAttrib3fvARB);

+   SET_VertexAttrib4fARB(tab, vfmt->VertexAttrib4fARB);

+   SET_VertexAttrib4fvARB(tab, vfmt->VertexAttrib4fvARB);

+#endif

+

+   /* GL_EXT_gpu_shader4 / OpenGL 3.0 */

+   SET_VertexAttribI1iEXT(tab, vfmt->VertexAttribI1i);

+   SET_VertexAttribI2iEXT(tab, vfmt->VertexAttribI2i);

+   SET_VertexAttribI3iEXT(tab, vfmt->VertexAttribI3i);

+   SET_VertexAttribI4iEXT(tab, vfmt->VertexAttribI4i);

+   SET_VertexAttribI2ivEXT(tab, vfmt->VertexAttribI2iv);

+   SET_VertexAttribI3ivEXT(tab, vfmt->VertexAttribI3iv);

+   SET_VertexAttribI4ivEXT(tab, vfmt->VertexAttribI4iv);

+

+   SET_VertexAttribI1uiEXT(tab, vfmt->VertexAttribI1ui);

+   SET_VertexAttribI2uiEXT(tab, vfmt->VertexAttribI2ui);

+   SET_VertexAttribI3uiEXT(tab, vfmt->VertexAttribI3ui);

+   SET_VertexAttribI4uiEXT(tab, vfmt->VertexAttribI4ui);

+   SET_VertexAttribI2uivEXT(tab, vfmt->VertexAttribI2uiv);

+   SET_VertexAttribI3uivEXT(tab, vfmt->VertexAttribI3uiv);

+   SET_VertexAttribI4uivEXT(tab, vfmt->VertexAttribI4uiv);

+}

+

+

+/**

+ * Install per-vertex functions into the API dispatch table for execution.

+ */

+void

+_mesa_install_exec_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt)

+{

+   if (ctx->API == API_OPENGL)

+      install_vtxfmt( ctx->Exec, vfmt );

+}

+

+

+/**

+ * Install per-vertex functions into the API dispatch table for display

+ * list compilation.

+ */

+void

+_mesa_install_save_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt)

+{

+   if (ctx->API == API_OPENGL)

+      install_vtxfmt( ctx->Save, vfmt );

+}

+

+

+#endif /* FEATURE_beginend */

diff --git a/mesalib/src/mesa/main/vtxfmt.h b/mesalib/src/mesa/main/vtxfmt.h
index aad38b87c..235198747 100644
--- a/mesalib/src/mesa/main/vtxfmt.h
+++ b/mesalib/src/mesa/main/vtxfmt.h
@@ -1,72 +1,58 @@
-/**
- * \file vtxfmt.h
- * 
- * \author Keith Whitwell <keith@tungstengraphics.com>
- * \author Gareth Hughes
- */
-
-/*
- * 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.
- */
-
-
-#ifndef _VTXFMT_H_
-#define _VTXFMT_H_
-
-#include "compiler.h"
-#include "mtypes.h"
-
-#if FEATURE_beginend
-
-extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
-
-extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
-extern void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
-
-extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
-
-#else /* FEATURE_beginend */
-
-static INLINE void
-_mesa_init_exec_vtxfmt( GLcontext *ctx )
-{
-}
-
-static INLINE void
-_mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-}
-
-static INLINE void
-_mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-}
-
-static INLINE void
-_mesa_restore_exec_vtxfmt( GLcontext *ctx )
-{
-}
-
-#endif /* FEATURE_beginend */
-
-#endif /* _VTXFMT_H_ */
+/**

+ * \file vtxfmt.h

+ * 

+ * \author Keith Whitwell <keith@tungstengraphics.com>

+ * \author Gareth Hughes

+ */

+

+/*

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

+ */

+

+

+#ifndef _VTXFMT_H_

+#define _VTXFMT_H_

+

+#include "compiler.h"

+#include "mtypes.h"

+

+#if FEATURE_beginend

+

+extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );

+extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );

+

+#else /* FEATURE_beginend */

+

+static INLINE void

+_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )

+{

+}

+

+static INLINE void

+_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )

+{

+}

+

+#endif /* FEATURE_beginend */

+

+#endif /* _VTXFMT_H_ */

diff --git a/mesalib/src/mesa/main/vtxfmt_tmp.h b/mesalib/src/mesa/main/vtxfmt_tmp.h
deleted file mode 100644
index 9ec6ea49a..000000000
--- a/mesalib/src/mesa/main/vtxfmt_tmp.h
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * 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.
- *
- * Authors:
- *    Gareth Hughes
- */
-
-#ifndef PRE_LOOPBACK
-#define PRE_LOOPBACK( FUNC )
-#endif
-
-#include "main/dispatch.h"
-
-static void GLAPIENTRY TAG(ArrayElement)( GLint i )
-{
-   PRE_LOOPBACK( ArrayElement );
-   CALL_ArrayElement(GET_DISPATCH(), ( i ));
-}
-
-static void GLAPIENTRY TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b )
-{
-   PRE_LOOPBACK( Color3f );
-   CALL_Color3f(GET_DISPATCH(), ( r, g, b ));
-}
-
-static void GLAPIENTRY TAG(Color3fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Color3fv );
-   CALL_Color3fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
-{
-   PRE_LOOPBACK( Color4f );
-   CALL_Color4f(GET_DISPATCH(), ( r, g, b, a ));
-}
-
-static void GLAPIENTRY TAG(Color4fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Color4fv );
-   CALL_Color4fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(EdgeFlag)( GLboolean e )
-{
-   PRE_LOOPBACK( EdgeFlag );
-   CALL_EdgeFlag(GET_DISPATCH(), ( e ));
-}
-
-static void GLAPIENTRY TAG(EvalCoord1f)( GLfloat s )
-{
-   PRE_LOOPBACK( EvalCoord1f );
-   CALL_EvalCoord1f(GET_DISPATCH(), ( s ));
-}
-
-static void GLAPIENTRY TAG(EvalCoord1fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( EvalCoord1fv );
-   CALL_EvalCoord1fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(EvalCoord2f)( GLfloat s, GLfloat t )
-{
-   PRE_LOOPBACK( EvalCoord2f );
-   CALL_EvalCoord2f(GET_DISPATCH(), ( s, t ));
-}
-
-static void GLAPIENTRY TAG(EvalCoord2fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( EvalCoord2fv );
-   CALL_EvalCoord2fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(EvalPoint1)( GLint i )
-{
-   PRE_LOOPBACK( EvalPoint1 );
-   CALL_EvalPoint1(GET_DISPATCH(), ( i ));
-}
-
-static void GLAPIENTRY TAG(EvalPoint2)( GLint i, GLint j )
-{
-   PRE_LOOPBACK( EvalPoint2 );
-   CALL_EvalPoint2(GET_DISPATCH(), ( i, j ));
-}
-
-static void GLAPIENTRY TAG(FogCoordfEXT)( GLfloat f )
-{
-   PRE_LOOPBACK( FogCoordfEXT );
-   CALL_FogCoordfEXT(GET_DISPATCH(), ( f ));
-}
-
-static void GLAPIENTRY TAG(FogCoordfvEXT)( const GLfloat *v )
-{
-   PRE_LOOPBACK( FogCoordfvEXT );
-   CALL_FogCoordfvEXT(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(Indexf)( GLfloat f )
-{
-   PRE_LOOPBACK( Indexf );
-   CALL_Indexf(GET_DISPATCH(), ( f ));
-}
-
-static void GLAPIENTRY TAG(Indexfv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Indexfv );
-   CALL_Indexfv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
-{
-   PRE_LOOPBACK( Materialfv );
-   CALL_Materialfv(GET_DISPATCH(), ( face, pname, v ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
-{
-   PRE_LOOPBACK( MultiTexCoord1fARB );
-   CALL_MultiTexCoord1fARB(GET_DISPATCH(), ( target, a ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
-{
-   PRE_LOOPBACK( MultiTexCoord1fvARB );
-   CALL_MultiTexCoord1fvARB(GET_DISPATCH(), ( target, tc ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord2fARB)( GLenum target, GLfloat s, GLfloat t )
-{
-   PRE_LOOPBACK( MultiTexCoord2fARB );
-   CALL_MultiTexCoord2fARB(GET_DISPATCH(), ( target, s, t ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
-{
-   PRE_LOOPBACK( MultiTexCoord2fvARB );
-   CALL_MultiTexCoord2fvARB(GET_DISPATCH(), ( target, tc ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord3fARB)( GLenum target, GLfloat s,
-				     GLfloat t, GLfloat r )
-{
-   PRE_LOOPBACK( MultiTexCoord3fARB );
-   CALL_MultiTexCoord3fARB(GET_DISPATCH(), ( target, s, t, r ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
-{
-   PRE_LOOPBACK( MultiTexCoord3fvARB );
-   CALL_MultiTexCoord3fvARB(GET_DISPATCH(), ( target, tc ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s,
-				     GLfloat t, GLfloat r, GLfloat q )
-{
-   PRE_LOOPBACK( MultiTexCoord4fARB );
-   CALL_MultiTexCoord4fARB(GET_DISPATCH(), ( target, s, t, r, q ));
-}
-
-static void GLAPIENTRY TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
-{
-   PRE_LOOPBACK( MultiTexCoord4fvARB );
-   CALL_MultiTexCoord4fvARB(GET_DISPATCH(), ( target, tc ));
-}
-
-static void GLAPIENTRY TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z )
-{
-   PRE_LOOPBACK( Normal3f );
-   CALL_Normal3f(GET_DISPATCH(), ( x, y, z ));
-}
-
-static void GLAPIENTRY TAG(Normal3fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Normal3fv );
-   CALL_Normal3fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(SecondaryColor3fEXT)( GLfloat r, GLfloat g, GLfloat b )
-{
-   PRE_LOOPBACK( SecondaryColor3fEXT );
-   CALL_SecondaryColor3fEXT(GET_DISPATCH(), ( r, g, b ));
-}
-
-static void GLAPIENTRY TAG(SecondaryColor3fvEXT)( const GLfloat *v )
-{
-   PRE_LOOPBACK( SecondaryColor3fvEXT );
-   CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(TexCoord1f)( GLfloat s )
-{
-   PRE_LOOPBACK( TexCoord1f );
-   CALL_TexCoord1f(GET_DISPATCH(), ( s ));
-}
-
-static void GLAPIENTRY TAG(TexCoord1fv)( const GLfloat *tc )
-{
-   PRE_LOOPBACK( TexCoord1fv );
-   CALL_TexCoord1fv(GET_DISPATCH(), ( tc ));
-}
-
-static void GLAPIENTRY TAG(TexCoord2f)( GLfloat s, GLfloat t )
-{
-   PRE_LOOPBACK( TexCoord2f );
-   CALL_TexCoord2f(GET_DISPATCH(), ( s, t ));
-}
-
-static void GLAPIENTRY TAG(TexCoord2fv)( const GLfloat *tc )
-{
-   PRE_LOOPBACK( TexCoord2fv );
-   CALL_TexCoord2fv(GET_DISPATCH(), ( tc ));
-}
-
-static void GLAPIENTRY TAG(TexCoord3f)( GLfloat s, GLfloat t, GLfloat r )
-{
-   PRE_LOOPBACK( TexCoord3f );
-   CALL_TexCoord3f(GET_DISPATCH(), ( s, t, r ));
-}
-
-static void GLAPIENTRY TAG(TexCoord3fv)( const GLfloat *tc )
-{
-   PRE_LOOPBACK( TexCoord3fv );
-   CALL_TexCoord3fv(GET_DISPATCH(), ( tc ));
-}
-
-static void GLAPIENTRY TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
-{
-   PRE_LOOPBACK( TexCoord4f );
-   CALL_TexCoord4f(GET_DISPATCH(), ( s, t, r, q ));
-}
-
-static void GLAPIENTRY TAG(TexCoord4fv)( const GLfloat *tc )
-{
-   PRE_LOOPBACK( TexCoord4fv );
-   CALL_TexCoord4fv(GET_DISPATCH(), ( tc ));
-}
-
-static void GLAPIENTRY TAG(Vertex2f)( GLfloat x, GLfloat y )
-{
-   PRE_LOOPBACK( Vertex2f );
-   CALL_Vertex2f(GET_DISPATCH(), ( x, y ));
-}
-
-static void GLAPIENTRY TAG(Vertex2fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Vertex2fv );
-   CALL_Vertex2fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z )
-{
-   PRE_LOOPBACK( Vertex3f );
-   CALL_Vertex3f(GET_DISPATCH(), ( x, y, z ));
-}
-
-static void GLAPIENTRY TAG(Vertex3fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Vertex3fv );
-   CALL_Vertex3fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
-{
-   PRE_LOOPBACK( Vertex4f );
-   CALL_Vertex4f(GET_DISPATCH(), ( x, y, z, w ));
-}
-
-static void GLAPIENTRY TAG(Vertex4fv)( const GLfloat *v )
-{
-   PRE_LOOPBACK( Vertex4fv );
-   CALL_Vertex4fv(GET_DISPATCH(), ( v ));
-}
-
-static void GLAPIENTRY TAG(CallList)( GLuint i )
-{
-   PRE_LOOPBACK( CallList );
-   CALL_CallList(GET_DISPATCH(), ( i ));
-}
-
-static void GLAPIENTRY TAG(CallLists)( GLsizei sz, GLenum type, const GLvoid *v )
-{
-   PRE_LOOPBACK( CallLists );
-   CALL_CallLists(GET_DISPATCH(), ( sz, type, v ));
-}
-
-static void GLAPIENTRY TAG(Begin)( GLenum mode )
-{
-   PRE_LOOPBACK( Begin );
-   CALL_Begin(GET_DISPATCH(), ( mode ));
-}
-
-static void GLAPIENTRY TAG(End)( void )
-{
-   PRE_LOOPBACK( End );
-   CALL_End(GET_DISPATCH(), ());
-}
-
-static void GLAPIENTRY TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
-{
-   PRE_LOOPBACK( Rectf );
-   CALL_Rectf(GET_DISPATCH(), ( x1, y1, x2, y2 ));
-}
-
-static void GLAPIENTRY TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count )
-{
-   PRE_LOOPBACK( DrawArrays );
-   CALL_DrawArrays(GET_DISPATCH(), ( mode, start, count ));
-}
-
-static void GLAPIENTRY TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type,
-			       const GLvoid *indices )
-{
-   PRE_LOOPBACK( DrawElements );
-   CALL_DrawElements(GET_DISPATCH(), ( mode, count, type, indices ));
-}
-
-static void GLAPIENTRY TAG(MultiDrawElementsEXT)( GLenum mode,
-						  const GLsizei *count,
-						  GLenum type,
-						  const GLvoid **indices,
-						  GLsizei primcount)
-{
-   PRE_LOOPBACK( MultiDrawElementsEXT );
-   CALL_MultiDrawElementsEXT(GET_DISPATCH(), ( mode, count, type, indices,
-					       primcount ));
-}
-
-static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
-				    GLuint end, GLsizei count,
-				    GLenum type, const GLvoid *indices )
-{
-   PRE_LOOPBACK( DrawRangeElements );
-   CALL_DrawRangeElements(GET_DISPATCH(), ( mode, start, end, count, type, indices ));
-}
-
-static void GLAPIENTRY TAG(DrawElementsBaseVertex)( GLenum mode,
-						    GLsizei count,
-						    GLenum type,
-						    const GLvoid *indices,
-						    GLint basevertex)
-{
-   PRE_LOOPBACK( DrawElementsBaseVertex );
-   CALL_DrawElementsBaseVertex(GET_DISPATCH(), ( mode, count, type,
-						 indices, basevertex ));
-}
-
-static void GLAPIENTRY TAG(DrawRangeElementsBaseVertex)( GLenum mode,
-							 GLuint start,
-							 GLuint end,
-							 GLsizei count,
-							 GLenum type,
-							 const GLvoid *indices,
-							 GLint basevertex)
-{
-   PRE_LOOPBACK( DrawRangeElementsBaseVertex );
-   CALL_DrawRangeElementsBaseVertex(GET_DISPATCH(), ( mode, start, end,
-						      count, type, indices,
-						      basevertex ));
-}
-
-static void GLAPIENTRY TAG(MultiDrawElementsBaseVertex)( GLenum mode,
-							 const GLsizei *count,
-							 GLenum type,
-							 const GLvoid **indices,
-							 GLsizei primcount,
-							 const GLint *basevertex)
-{
-   PRE_LOOPBACK( MultiDrawElementsBaseVertex );
-   CALL_MultiDrawElementsBaseVertex(GET_DISPATCH(), ( mode, count, type,
-						      indices,
-						      primcount, basevertex ));
-}
-
-static void GLAPIENTRY
-TAG(DrawArraysInstanced)(GLenum mode, GLint first,
-                         GLsizei count, GLsizei primcount)
-{
-   PRE_LOOPBACK( DrawArraysInstanced );
-   CALL_DrawArraysInstanced(GET_DISPATCH(), (mode, first, count, primcount));
-}
-
-static void GLAPIENTRY
-TAG(DrawElementsInstanced)(GLenum mode, GLsizei count,
-                           GLenum type, const GLvoid *indices,
-                           GLsizei primcount)
-{
-   PRE_LOOPBACK( DrawElementsInstanced );
-   CALL_DrawElementsInstanced(GET_DISPATCH(),
-                              (mode, count, type, indices, primcount));
-}
-
-
-static void GLAPIENTRY TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
-{
-   PRE_LOOPBACK( EvalMesh1 );
-   CALL_EvalMesh1(GET_DISPATCH(), ( mode, i1, i2 ));
-}
-
-static void GLAPIENTRY TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2,
-			    GLint j1, GLint j2 )
-{
-   PRE_LOOPBACK( EvalMesh2 );
-   CALL_EvalMesh2(GET_DISPATCH(), ( mode, i1, i2, j1, j2 ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib1fNV)( GLuint index, GLfloat x )
-{
-   PRE_LOOPBACK( VertexAttrib1fNV );
-   CALL_VertexAttrib1fNV(GET_DISPATCH(), ( index, x ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib1fvNV)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib1fvNV );
-   CALL_VertexAttrib1fvNV(GET_DISPATCH(), ( index, v ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib2fNV)( GLuint index, GLfloat x, GLfloat y )
-{
-   PRE_LOOPBACK( VertexAttrib2fNV );
-   CALL_VertexAttrib2fNV(GET_DISPATCH(), ( index, x, y ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib2fvNV)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib2fvNV );
-   CALL_VertexAttrib2fvNV(GET_DISPATCH(), ( index, v ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib3fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z )
-{
-   PRE_LOOPBACK( VertexAttrib3fNV );
-   CALL_VertexAttrib3fNV(GET_DISPATCH(), ( index, x, y, z ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib3fvNV)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib3fvNV );
-   CALL_VertexAttrib3fvNV(GET_DISPATCH(), ( index, v ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
-{
-   PRE_LOOPBACK( VertexAttrib4fNV );
-   CALL_VertexAttrib4fNV(GET_DISPATCH(), ( index, x, y, z, w ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib4fvNV)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib4fvNV );
-   CALL_VertexAttrib4fvNV(GET_DISPATCH(), ( index, v ));
-}
-
-
-static void GLAPIENTRY TAG(VertexAttrib1fARB)( GLuint index, GLfloat x )
-{
-   PRE_LOOPBACK( VertexAttrib1fARB );
-   CALL_VertexAttrib1fARB(GET_DISPATCH(), ( index, x ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib1fvARB)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib1fvARB );
-   CALL_VertexAttrib1fvARB(GET_DISPATCH(), ( index, v ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib2fARB)( GLuint index, GLfloat x, GLfloat y )
-{
-   PRE_LOOPBACK( VertexAttrib2fARB );
-   CALL_VertexAttrib2fARB(GET_DISPATCH(), ( index, x, y ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib2fvARB)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib2fvARB );
-   CALL_VertexAttrib2fvARB(GET_DISPATCH(), ( index, v ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib3fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z )
-{
-   PRE_LOOPBACK( VertexAttrib3fARB );
-   CALL_VertexAttrib3fARB(GET_DISPATCH(), ( index, x, y, z ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib3fvARB)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib3fvARB );
-   CALL_VertexAttrib3fvARB(GET_DISPATCH(), ( index, v ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib4fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
-{
-   PRE_LOOPBACK( VertexAttrib4fARB );
-   CALL_VertexAttrib4fARB(GET_DISPATCH(), ( index, x, y, z, w ));
-}
-
-static void GLAPIENTRY TAG(VertexAttrib4fvARB)( GLuint index, const GLfloat *v )
-{
-   PRE_LOOPBACK( VertexAttrib4fvARB );
-   CALL_VertexAttrib4fvARB(GET_DISPATCH(), ( index, v ));
-}
-
-
-static GLvertexformat TAG(vtxfmt) = {
-   TAG(ArrayElement),
-   TAG(Color3f),
-   TAG(Color3fv),
-   TAG(Color4f),
-   TAG(Color4fv),
-   TAG(EdgeFlag),
-   TAG(EvalCoord1f),
-   TAG(EvalCoord1fv),
-   TAG(EvalCoord2f),
-   TAG(EvalCoord2fv),
-   TAG(EvalPoint1),
-   TAG(EvalPoint2),
-   TAG(FogCoordfEXT),
-   TAG(FogCoordfvEXT),
-   TAG(Indexf),
-   TAG(Indexfv),
-   TAG(Materialfv),
-   TAG(MultiTexCoord1fARB),
-   TAG(MultiTexCoord1fvARB),
-   TAG(MultiTexCoord2fARB),
-   TAG(MultiTexCoord2fvARB),
-   TAG(MultiTexCoord3fARB),
-   TAG(MultiTexCoord3fvARB),
-   TAG(MultiTexCoord4fARB),
-   TAG(MultiTexCoord4fvARB),
-   TAG(Normal3f),
-   TAG(Normal3fv),
-   TAG(SecondaryColor3fEXT),
-   TAG(SecondaryColor3fvEXT),
-   TAG(TexCoord1f),
-   TAG(TexCoord1fv),
-   TAG(TexCoord2f),
-   TAG(TexCoord2fv),
-   TAG(TexCoord3f),
-   TAG(TexCoord3fv),
-   TAG(TexCoord4f),
-   TAG(TexCoord4fv),
-   TAG(Vertex2f),
-   TAG(Vertex2fv),
-   TAG(Vertex3f),
-   TAG(Vertex3fv),
-   TAG(Vertex4f),
-   TAG(Vertex4fv),
-   TAG(CallList),
-   TAG(CallLists),
-   TAG(Begin),
-   TAG(End),
-   TAG(VertexAttrib1fNV),
-   TAG(VertexAttrib1fvNV),
-   TAG(VertexAttrib2fNV),
-   TAG(VertexAttrib2fvNV),
-   TAG(VertexAttrib3fNV),
-   TAG(VertexAttrib3fvNV),
-   TAG(VertexAttrib4fNV),
-   TAG(VertexAttrib4fvNV),
-   TAG(VertexAttrib1fARB),
-   TAG(VertexAttrib1fvARB),
-   TAG(VertexAttrib2fARB),
-   TAG(VertexAttrib2fvARB),
-   TAG(VertexAttrib3fARB),
-   TAG(VertexAttrib3fvARB),
-   TAG(VertexAttrib4fARB),
-   TAG(VertexAttrib4fvARB),
-   TAG(Rectf),
-   TAG(DrawArrays),
-   TAG(DrawElements),
-   TAG(DrawRangeElements),
-   TAG(MultiDrawElementsEXT),
-   TAG(DrawElementsBaseVertex),
-   TAG(DrawRangeElementsBaseVertex),
-   TAG(MultiDrawElementsBaseVertex),
-   TAG(DrawArraysInstanced),
-   TAG(DrawElementsInstanced),
-   TAG(EvalMesh1),
-   TAG(EvalMesh2)
-};
-
-#undef TAG
-#undef PRE_LOOPBACK
diff --git a/mesalib/src/mesa/math/m_debug_clip.c b/mesalib/src/mesa/math/m_debug_clip.c
index 7ea5428aa..36d2a9e64 100644
--- a/mesalib/src/mesa/math/m_debug_clip.c
+++ b/mesalib/src/mesa/math/m_debug_clip.c
@@ -1,382 +1,409 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- *
- * Copyright (C) 1999-2005  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:
- *    Gareth Hughes
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-#include "m_xform.h"
-
-#include "m_debug.h"
-#include "m_debug_util.h"
-
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
-#ifdef DEBUG_MATH  /* This code only used for debugging */
-
-static clip_func *clip_tab[2] = {
-   _mesa_clip_tab,
-   _mesa_clip_np_tab
-};
-static char *cnames[2] = {
-   "_mesa_clip_tab",
-   "_mesa_clip_np_tab"
-};
-#ifdef RUN_DEBUG_BENCHMARK
-static char *cstrings[2] = {
-   "clip, perspective divide",
-   "clip, no divide"
-};
-#endif
-
-
-/* =============================================================
- * Reference cliptests
- */
-
-static GLvector4f *ref_cliptest_points4( GLvector4f *clip_vec,
-					 GLvector4f *proj_vec,
-					 GLubyte clipMask[],
-					 GLubyte *orMask,
-					 GLubyte *andMask,
-					 GLboolean viewport_z_clip )
-{
-   const GLuint stride = clip_vec->stride;
-   const GLuint count = clip_vec->count;
-   const GLfloat *from = (GLfloat *)clip_vec->start;
-   GLuint c = 0;
-   GLfloat (*vProj)[4] = (GLfloat (*)[4])proj_vec->start;
-   GLubyte tmpAndMask = *andMask;
-   GLubyte tmpOrMask = *orMask;
-   GLuint i;
-   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {
-      const GLfloat cx = from[0];
-      const GLfloat cy = from[1];
-      const GLfloat cz = from[2];
-      const GLfloat cw = from[3];
-      GLubyte mask = 0;
-      if ( -cx + cw < 0 ) mask |= CLIP_RIGHT_BIT;
-      if (  cx + cw < 0 ) mask |= CLIP_LEFT_BIT;
-      if ( -cy + cw < 0 ) mask |= CLIP_TOP_BIT;
-      if (  cy + cw < 0 ) mask |= CLIP_BOTTOM_BIT;
-      if (viewport_z_clip) {
-	 if ( -cz + cw < 0 ) mask |= CLIP_FAR_BIT;
-	 if (  cz + cw < 0 ) mask |= CLIP_NEAR_BIT;
-      }
-      clipMask[i] = mask;
-      if ( mask ) {
-	 c++;
-	 tmpAndMask &= mask;
-	 tmpOrMask |= mask;
-	 vProj[i][0] = 0;
-	 vProj[i][1] = 0;
-	 vProj[i][2] = 0;
-	 vProj[i][3] = 1;
-      } else {
-	 GLfloat oow = 1.0F / cw;
-	 vProj[i][0] = cx * oow;
-	 vProj[i][1] = cy * oow;
-	 vProj[i][2] = cz * oow;
-	 vProj[i][3] = oow;
-      }
-   }
-
-   *orMask = tmpOrMask;
-   *andMask = (GLubyte) (c < count ? 0 : tmpAndMask);
-
-   proj_vec->flags |= VEC_SIZE_4;
-   proj_vec->size = 4;
-   proj_vec->count = clip_vec->count;
-   return proj_vec;
-}
-
-/* Keep these here for now, even though we don't use them...
- */
-static GLvector4f *ref_cliptest_points3( GLvector4f *clip_vec,
-					 GLvector4f *proj_vec,
-					 GLubyte clipMask[],
-					 GLubyte *orMask,
-					 GLubyte *andMask,
-                                         GLboolean viewport_z_clip )
-{
-   const GLuint stride = clip_vec->stride;
-   const GLuint count = clip_vec->count;
-   const GLfloat *from = (GLfloat *)clip_vec->start;
-
-   GLubyte tmpOrMask = *orMask;
-   GLubyte tmpAndMask = *andMask;
-   GLuint i;
-   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {
-      const GLfloat cx = from[0], cy = from[1], cz = from[2];
-      GLubyte mask = 0;
-      if ( cx >  1.0 )		mask |= CLIP_RIGHT_BIT;
-      else if ( cx < -1.0 )	mask |= CLIP_LEFT_BIT;
-      if ( cy >  1.0 )		mask |= CLIP_TOP_BIT;
-      else if ( cy < -1.0 )	mask |= CLIP_BOTTOM_BIT;
-      if (viewport_z_clip) {
-         if ( cz >  1.0 )		mask |= CLIP_FAR_BIT;
-         else if ( cz < -1.0 )	mask |= CLIP_NEAR_BIT;
-      }
-      clipMask[i] = mask;
-      tmpOrMask |= mask;
-      tmpAndMask &= mask;
-   }
-
-   *orMask = tmpOrMask;
-   *andMask = tmpAndMask;
-   return clip_vec;
-}
-
-static GLvector4f * ref_cliptest_points2( GLvector4f *clip_vec,
-					  GLvector4f *proj_vec,
-					  GLubyte clipMask[],
-					  GLubyte *orMask,
-					  GLubyte *andMask,
-                                          GLboolean viewport_z_clip )
-{
-   const GLuint stride = clip_vec->stride;
-   const GLuint count = clip_vec->count;
-   const GLfloat *from = (GLfloat *)clip_vec->start;
-
-   GLubyte tmpOrMask = *orMask;
-   GLubyte tmpAndMask = *andMask;
-   GLuint i;
-
-   (void) viewport_z_clip;
-
-   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {
-      const GLfloat cx = from[0], cy = from[1];
-      GLubyte mask = 0;
-      if ( cx >  1.0 )		mask |= CLIP_RIGHT_BIT;
-      else if ( cx < -1.0 )	mask |= CLIP_LEFT_BIT;
-      if ( cy >  1.0 )		mask |= CLIP_TOP_BIT;
-      else if ( cy < -1.0 )	mask |= CLIP_BOTTOM_BIT;
-      clipMask[i] = mask;
-      tmpOrMask |= mask;
-      tmpAndMask &= mask;
-   }
-
-   *orMask = tmpOrMask;
-   *andMask = tmpAndMask;
-   return clip_vec;
-}
-
-static clip_func ref_cliptest[5] = {
-   0,
-   0,
-   ref_cliptest_points2,
-   ref_cliptest_points3,
-   ref_cliptest_points4
-};
-
-
-/* =============================================================
- * Cliptest tests
- */
-
-ALIGN16(static GLfloat, s[TEST_COUNT][4]);
-ALIGN16(static GLfloat, d[TEST_COUNT][4]);
-ALIGN16(static GLfloat, r[TEST_COUNT][4]);
-
-
-static int test_cliptest_function( clip_func func, int np,
-				   int psize, long *cycles )
-{
-   GLvector4f source[1], dest[1], ref[1];
-   GLubyte dm[TEST_COUNT], dco, dca;
-   GLubyte rm[TEST_COUNT], rco, rca;
-   int i, j;
-#ifdef  RUN_DEBUG_BENCHMARK
-   int cycle_i;                /* the counter for the benchmarks we run */
-#endif
-   GLboolean viewport_z_clip = GL_TRUE;
-
-   (void) cycles;
-
-   if ( psize > 4 ) {
-      _mesa_problem( NULL, "test_cliptest_function called with psize > 4\n" );
-      return 0;
-   }
-
-   for ( i = 0 ; i < TEST_COUNT ; i++) {
-      ASSIGN_4V( d[i], 0.0, 0.0, 0.0, 1.0 );
-      ASSIGN_4V( s[i], 0.0, 0.0, 0.0, 1.0 );
-      for ( j = 0 ; j < psize ; j++ )
-         s[i][j] = rnd();
-   }
-
-   source->data = (GLfloat(*)[4])s;
-   source->start = (GLfloat *)s;
-   source->count = TEST_COUNT;
-   source->stride = sizeof(s[0]);
-   source->size = 4;
-   source->flags = 0;
-
-   dest->data = (GLfloat(*)[4])d;
-   dest->start = (GLfloat *)d;
-   dest->count = TEST_COUNT;
-   dest->stride = sizeof(float[4]);
-   dest->size = 0;
-   dest->flags = 0;
-
-   ref->data = (GLfloat(*)[4])r;
-   ref->start = (GLfloat *)r;
-   ref->count = TEST_COUNT;
-   ref->stride = sizeof(float[4]);
-   ref->size = 0;
-   ref->flags = 0;
-
-   dco = rco = 0;
-   dca = rca = CLIP_FRUSTUM_BITS;
-
-   ref_cliptest[psize]( source, ref, rm, &rco, &rca, viewport_z_clip );
-
-   if ( mesa_profile ) {
-      BEGIN_RACE( *cycles );
-      func( source, dest, dm, &dco, &dca, viewport_z_clip );
-      END_RACE( *cycles );
-   }
-   else {
-      func( source, dest, dm, &dco, &dca, viewport_z_clip );
-   }
-
-   if ( dco != rco ) {
-      printf( "\n-----------------------------\n" );
-      printf( "dco = 0x%02x   rco = 0x%02x\n", dco, rco );
-      return 0;
-   }
-   if ( dca != rca ) {
-      printf( "\n-----------------------------\n" );
-      printf( "dca = 0x%02x   rca = 0x%02x\n", dca, rca );
-      return 0;
-   }
-   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
-      if ( dm[i] != rm[i] ) {
-	 printf( "\n-----------------------------\n" );
-	 printf( "(i = %i)\n", i );
-	 printf( "dm = 0x%02x   rm = 0x%02x\n", dm[i], rm[i] );
-	 return 0;
-      }
-   }
-
-   /* Only verify output on projected points4 case.  FIXME: Do we need
-    * to test other cases?
-    */
-   if ( np || psize < 4 )
-      return 1;
-
-   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
-      for ( j = 0 ; j < 4 ; j++ ) {
-         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            printf( "\n-----------------------------\n" );
-            printf( "(i = %i, j = %i)  dm = 0x%02x   rm = 0x%02x\n",
-		    i, j, dm[i], rm[i] );
-            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][0], r[i][0], r[i][0]-d[i][0],
-		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][1], r[i][1], r[i][1]-d[i][1],
-		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][2], r[i][2], r[i][2]-d[i][2],
-		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
-            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][3], r[i][3], r[i][3]-d[i][3],
-		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
-            return 0;
-         }
-      }
-   }
-
-   return 1;
-}
-
-void _math_test_all_cliptest_functions( char *description )
-{
-   int np, psize;
-   long benchmark_tab[2][4];
-   static int first_time = 1;
-
-   if ( first_time ) {
-      first_time = 0;
-      mesa_profile = _mesa_getenv( "MESA_PROFILE" );
-   }
-
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile ) {
-      if ( !counter_overhead ) {
-	 INIT_COUNTER();
-	 printf( "counter overhead: %ld cycles\n\n", counter_overhead );
-      }
-      printf( "cliptest results after hooking in %s functions:\n", description );
-   }
-#endif
-
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile ) {
-      printf( "\n\t" );
-      for ( psize = 2 ; psize <= 4 ; psize++ ) {
-	 printf( " p%d\t", psize );
-      }
-      printf( "\n--------------------------------------------------------\n\t" );
-   }
-#endif
-
-   for ( np = 0 ; np < 2 ; np++ ) {
-      for ( psize = 2 ; psize <= 4 ; psize++ ) {
-	 clip_func func = clip_tab[np][psize];
-	 long *cycles = &(benchmark_tab[np][psize-1]);
-
-	 if ( test_cliptest_function( func, np, psize, cycles ) == 0 ) {
-	    char buf[100];
-	    sprintf( buf, "%s[%d] failed test (%s)",
-		     cnames[np], psize, description );
-	    _mesa_problem( NULL, buf );
-	 }
-#ifdef RUN_DEBUG_BENCHMARK
-	 if ( mesa_profile )
-	    printf( " %li\t", benchmark_tab[np][psize-1] );
-#endif
-      }
-#ifdef RUN_DEBUG_BENCHMARK
-      if ( mesa_profile )
-	 printf( " | [%s]\n\t", cstrings[np] );
-#endif
-   }
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile )
-      printf( "\n" );
-#endif
-}
-
-
-#endif /* DEBUG_MATH */
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.1

+ *

+ * Copyright (C) 1999-2005  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:

+ *    Gareth Hughes

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/imports.h"

+

+#include "m_matrix.h"

+#include "m_xform.h"

+

+#include "m_debug.h"

+#include "m_debug_util.h"

+

+#ifdef __UNIXOS2__

+/* The linker doesn't like empty files */

+static char dummy;

+#endif

+

+#ifdef DEBUG_MATH  /* This code only used for debugging */

+

+static clip_func *clip_tab[2] = {

+   _mesa_clip_tab,

+   _mesa_clip_np_tab

+};

+static char *cnames[2] = {

+   "_mesa_clip_tab",

+   "_mesa_clip_np_tab"

+};

+#ifdef RUN_DEBUG_BENCHMARK

+static char *cstrings[2] = {

+   "clip, perspective divide",

+   "clip, no divide"

+};

+#endif

+

+

+/* =============================================================

+ * Reference cliptests

+ */

+

+static GLvector4f *ref_cliptest_points4( GLvector4f *clip_vec,

+					 GLvector4f *proj_vec,

+					 GLubyte clipMask[],

+					 GLubyte *orMask,

+					 GLubyte *andMask,

+					 GLboolean viewport_z_clip )

+{

+   const GLuint stride = clip_vec->stride;

+   const GLuint count = clip_vec->count;

+   const GLfloat *from = (GLfloat *)clip_vec->start;

+   GLuint c = 0;

+   GLfloat (*vProj)[4] = (GLfloat (*)[4])proj_vec->start;

+   GLubyte tmpAndMask = *andMask;

+   GLubyte tmpOrMask = *orMask;

+   GLuint i;

+   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {

+      const GLfloat cx = from[0];

+      const GLfloat cy = from[1];

+      const GLfloat cz = from[2];

+      const GLfloat cw = from[3];

+      GLubyte mask = 0;

+      if ( -cx + cw < 0 ) mask |= CLIP_RIGHT_BIT;

+      if (  cx + cw < 0 ) mask |= CLIP_LEFT_BIT;

+      if ( -cy + cw < 0 ) mask |= CLIP_TOP_BIT;

+      if (  cy + cw < 0 ) mask |= CLIP_BOTTOM_BIT;

+      if (viewport_z_clip) {

+	 if ( -cz + cw < 0 ) mask |= CLIP_FAR_BIT;

+	 if (  cz + cw < 0 ) mask |= CLIP_NEAR_BIT;

+      }

+      clipMask[i] = mask;

+      if ( mask ) {

+	 c++;

+	 tmpAndMask &= mask;

+	 tmpOrMask |= mask;

+	 vProj[i][0] = 0;

+	 vProj[i][1] = 0;

+	 vProj[i][2] = 0;

+	 vProj[i][3] = 1;

+      } else {

+	 GLfloat oow = 1.0F / cw;

+	 vProj[i][0] = cx * oow;

+	 vProj[i][1] = cy * oow;

+	 vProj[i][2] = cz * oow;

+	 vProj[i][3] = oow;

+      }

+   }

+

+   *orMask = tmpOrMask;

+   *andMask = (GLubyte) (c < count ? 0 : tmpAndMask);

+

+   proj_vec->flags |= VEC_SIZE_4;

+   proj_vec->size = 4;

+   proj_vec->count = clip_vec->count;

+   return proj_vec;

+}

+

+/* Keep these here for now, even though we don't use them...

+ */

+static GLvector4f *ref_cliptest_points3( GLvector4f *clip_vec,

+					 GLvector4f *proj_vec,

+					 GLubyte clipMask[],

+					 GLubyte *orMask,

+					 GLubyte *andMask,

+                                         GLboolean viewport_z_clip )

+{

+   const GLuint stride = clip_vec->stride;

+   const GLuint count = clip_vec->count;

+   const GLfloat *from = (GLfloat *)clip_vec->start;

+

+   GLubyte tmpOrMask = *orMask;

+   GLubyte tmpAndMask = *andMask;

+   GLuint i;

+   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {

+      const GLfloat cx = from[0], cy = from[1], cz = from[2];

+      GLubyte mask = 0;

+      if ( cx >  1.0 )		mask |= CLIP_RIGHT_BIT;

+      else if ( cx < -1.0 )	mask |= CLIP_LEFT_BIT;

+      if ( cy >  1.0 )		mask |= CLIP_TOP_BIT;

+      else if ( cy < -1.0 )	mask |= CLIP_BOTTOM_BIT;

+      if (viewport_z_clip) {

+         if ( cz >  1.0 )		mask |= CLIP_FAR_BIT;

+         else if ( cz < -1.0 )	mask |= CLIP_NEAR_BIT;

+      }

+      clipMask[i] = mask;

+      tmpOrMask |= mask;

+      tmpAndMask &= mask;

+   }

+

+   *orMask = tmpOrMask;

+   *andMask = tmpAndMask;

+   return clip_vec;

+}

+

+static GLvector4f * ref_cliptest_points2( GLvector4f *clip_vec,

+					  GLvector4f *proj_vec,

+					  GLubyte clipMask[],

+					  GLubyte *orMask,

+					  GLubyte *andMask,

+                                          GLboolean viewport_z_clip )

+{

+   const GLuint stride = clip_vec->stride;

+   const GLuint count = clip_vec->count;

+   const GLfloat *from = (GLfloat *)clip_vec->start;

+

+   GLubyte tmpOrMask = *orMask;

+   GLubyte tmpAndMask = *andMask;

+   GLuint i;

+

+   (void) viewport_z_clip;

+

+   for ( i = 0 ; i < count ; i++, STRIDE_F(from, stride) ) {

+      const GLfloat cx = from[0], cy = from[1];

+      GLubyte mask = 0;

+      if ( cx >  1.0 )		mask |= CLIP_RIGHT_BIT;

+      else if ( cx < -1.0 )	mask |= CLIP_LEFT_BIT;

+      if ( cy >  1.0 )		mask |= CLIP_TOP_BIT;

+      else if ( cy < -1.0 )	mask |= CLIP_BOTTOM_BIT;

+      clipMask[i] = mask;

+      tmpOrMask |= mask;

+      tmpAndMask &= mask;

+   }

+

+   *orMask = tmpOrMask;

+   *andMask = tmpAndMask;

+   return clip_vec;

+}

+

+static clip_func ref_cliptest[5] = {

+   0,

+   0,

+   ref_cliptest_points2,

+   ref_cliptest_points3,

+   ref_cliptest_points4

+};

+

+

+/* =============================================================

+ * Cliptest tests

+ */

+

+ALIGN16(static GLfloat, s[TEST_COUNT][4]);

+ALIGN16(static GLfloat, d[TEST_COUNT][4]);

+ALIGN16(static GLfloat, r[TEST_COUNT][4]);

+

+

+/**

+ * Check if X, Y or Z component of the coordinate is close to W, in terms

+ * of the clip test.

+ */

+static GLboolean

+xyz_close_to_w(const GLfloat c[4])

+{

+   float k = 0.0001;

+   return (fabs(c[0] - c[3]) < k ||

+           fabs(c[1] - c[3]) < k ||

+           fabs(c[2] - c[3]) < k ||

+           fabs(-c[0] - c[3]) < k ||

+           fabs(-c[1] - c[3]) < k ||

+           fabs(-c[2] - c[3]) < k);

+}

+

+

+

+static int test_cliptest_function( clip_func func, int np,

+				   int psize, long *cycles )

+{

+   GLvector4f source[1], dest[1], ref[1];

+   GLubyte dm[TEST_COUNT], dco, dca;

+   GLubyte rm[TEST_COUNT], rco, rca;

+   int i, j;

+#ifdef  RUN_DEBUG_BENCHMARK

+   int cycle_i;                /* the counter for the benchmarks we run */

+#endif

+   GLboolean viewport_z_clip = GL_TRUE;

+

+   (void) cycles;

+

+   if ( psize > 4 ) {

+      _mesa_problem( NULL, "test_cliptest_function called with psize > 4\n" );

+      return 0;

+   }

+

+   for ( i = 0 ; i < TEST_COUNT ; i++) {

+      ASSIGN_4V( d[i], 0.0, 0.0, 0.0, 1.0 );

+      ASSIGN_4V( s[i], 0.0, 0.0, 0.0, 1.0 );

+      for ( j = 0 ; j < psize ; j++ )

+         s[i][j] = rnd();

+   }

+

+   source->data = (GLfloat(*)[4])s;

+   source->start = (GLfloat *)s;

+   source->count = TEST_COUNT;

+   source->stride = sizeof(s[0]);

+   source->size = 4;

+   source->flags = 0;

+

+   dest->data = (GLfloat(*)[4])d;

+   dest->start = (GLfloat *)d;

+   dest->count = TEST_COUNT;

+   dest->stride = sizeof(float[4]);

+   dest->size = 0;

+   dest->flags = 0;

+

+   ref->data = (GLfloat(*)[4])r;

+   ref->start = (GLfloat *)r;

+   ref->count = TEST_COUNT;

+   ref->stride = sizeof(float[4]);

+   ref->size = 0;

+   ref->flags = 0;

+

+   dco = rco = 0;

+   dca = rca = CLIP_FRUSTUM_BITS;

+

+   ref_cliptest[psize]( source, ref, rm, &rco, &rca, viewport_z_clip );

+

+   if ( mesa_profile ) {

+      BEGIN_RACE( *cycles );

+      func( source, dest, dm, &dco, &dca, viewport_z_clip );

+      END_RACE( *cycles );

+   }

+   else {

+      func( source, dest, dm, &dco, &dca, viewport_z_clip );

+   }

+

+   if ( dco != rco ) {

+      printf( "\n-----------------------------\n" );

+      printf( "dco = 0x%02x   rco = 0x%02x\n", dco, rco );

+      return 0;

+   }

+   if ( dca != rca ) {

+      printf( "\n-----------------------------\n" );

+      printf( "dca = 0x%02x   rca = 0x%02x\n", dca, rca );

+      return 0;

+   }

+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {

+      if ( dm[i] != rm[i] ) {

+         GLfloat *c = source->start;

+         STRIDE_F(c, source->stride * i);

+         if (psize == 4 && xyz_close_to_w(c)) {

+            /* The coordinate is very close to the clip plane.  The clipmask

+             * may vary depending on code path, but that's OK.

+             */

+            continue;

+         }

+	 printf( "\n-----------------------------\n" );

+	 printf( "mask[%d] = 0x%02x   ref mask[%d] = 0x%02x\n", i, dm[i], i,rm[i] );

+         printf(" coord = %f, %f, %f, %f\n",

+                c[0], c[1], c[2], c[3]);

+	 return 0;

+      }

+   }

+

+   /* Only verify output on projected points4 case.  FIXME: Do we need

+    * to test other cases?

+    */

+   if ( np || psize < 4 )

+      return 1;

+

+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {

+      for ( j = 0 ; j < 4 ; j++ ) {

+         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {

+            printf( "\n-----------------------------\n" );

+            printf( "(i = %i, j = %i)  dm = 0x%02x   rm = 0x%02x\n",

+		    i, j, dm[i], rm[i] );

+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][0], r[i][0], r[i][0]-d[i][0],

+		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );

+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][1], r[i][1], r[i][1]-d[i][1],

+		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );

+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][2], r[i][2], r[i][2]-d[i][2],

+		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );

+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][3], r[i][3], r[i][3]-d[i][3],

+		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );

+            return 0;

+         }

+      }

+   }

+

+   return 1;

+}

+

+void _math_test_all_cliptest_functions( char *description )

+{

+   int np, psize;

+   long benchmark_tab[2][4];

+   static int first_time = 1;

+

+   if ( first_time ) {

+      first_time = 0;

+      mesa_profile = _mesa_getenv( "MESA_PROFILE" );

+   }

+

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile ) {

+      if ( !counter_overhead ) {

+	 INIT_COUNTER();

+	 printf( "counter overhead: %ld cycles\n\n", counter_overhead );

+      }

+      printf( "cliptest results after hooking in %s functions:\n", description );

+   }

+#endif

+

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile ) {

+      printf( "\n\t" );

+      for ( psize = 2 ; psize <= 4 ; psize++ ) {

+	 printf( " p%d\t", psize );

+      }

+      printf( "\n--------------------------------------------------------\n\t" );

+   }

+#endif

+

+   for ( np = 0 ; np < 2 ; np++ ) {

+      for ( psize = 2 ; psize <= 4 ; psize++ ) {

+	 clip_func func = clip_tab[np][psize];

+	 long *cycles = &(benchmark_tab[np][psize-1]);

+

+	 if ( test_cliptest_function( func, np, psize, cycles ) == 0 ) {

+	    char buf[100];

+	    sprintf( buf, "%s[%d] failed test (%s)",

+		     cnames[np], psize, description );

+	    _mesa_problem( NULL, "%s", buf );

+	 }

+#ifdef RUN_DEBUG_BENCHMARK

+	 if ( mesa_profile )

+	    printf( " %li\t", benchmark_tab[np][psize-1] );

+#endif

+      }

+#ifdef RUN_DEBUG_BENCHMARK

+      if ( mesa_profile )

+	 printf( " | [%s]\n\t", cstrings[np] );

+#endif

+   }

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile )

+      printf( "\n" );

+#endif

+}

+

+

+#endif /* DEBUG_MATH */

diff --git a/mesalib/src/mesa/math/m_debug_norm.c b/mesalib/src/mesa/math/m_debug_norm.c
index 710bad14d..eae37c225 100644
--- a/mesalib/src/mesa/math/m_debug_norm.c
+++ b/mesalib/src/mesa/math/m_debug_norm.c
@@ -1,383 +1,383 @@
-
-/*
- * 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.
- *
- * Authors:
- *    Gareth Hughes
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-#include "m_xform.h"
-
-#include "m_debug.h"
-#include "m_debug_util.h"
-
-
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
-#ifdef DEBUG_MATH  /* This code only used for debugging */
-
-
-static int m_norm_identity[16] = {
-   ONE, NIL, NIL, NIL,
-   NIL, ONE, NIL, NIL,
-   NIL, NIL, ONE, NIL,
-   NIL, NIL, NIL, NIL
-};
-static int m_norm_general[16] = {
-   VAR, VAR, VAR, NIL,
-   VAR, VAR, VAR, NIL,
-   VAR, VAR, VAR, NIL,
-   NIL, NIL, NIL, NIL
-};
-static int m_norm_no_rot[16] = {
-   VAR, NIL, NIL, NIL,
-   NIL, VAR, NIL, NIL,
-   NIL, NIL, VAR, NIL,
-   NIL, NIL, NIL, NIL
-};
-static int *norm_templates[8] = {
-   m_norm_no_rot,
-   m_norm_no_rot,
-   m_norm_no_rot,
-   m_norm_general,
-   m_norm_general,
-   m_norm_general,
-   m_norm_identity,
-   m_norm_identity
-};
-static int norm_types[8] = {
-   NORM_TRANSFORM_NO_ROT,
-   NORM_TRANSFORM_NO_ROT | NORM_RESCALE,
-   NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE,
-   NORM_TRANSFORM,
-   NORM_TRANSFORM | NORM_RESCALE,
-   NORM_TRANSFORM | NORM_NORMALIZE,
-   NORM_RESCALE,
-   NORM_NORMALIZE
-};
-static int norm_scale_types[8] = {               /*  rescale factor          */
-   NIL,                                          /*  NIL disables rescaling  */
-   VAR,
-   NIL,
-   NIL,
-   VAR,
-   NIL,
-   VAR,
-   NIL
-};
-static int norm_normalize_types[8] = {           /*  normalizing ?? (no = 0) */
-   0,
-   0,
-   1,
-   0,
-   0,
-   1,
-   0,
-   1
-};
-static char *norm_strings[8] = {
-   "NORM_TRANSFORM_NO_ROT",
-   "NORM_TRANSFORM_NO_ROT | NORM_RESCALE",
-   "NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE",
-   "NORM_TRANSFORM",
-   "NORM_TRANSFORM | NORM_RESCALE",
-   "NORM_TRANSFORM | NORM_NORMALIZE",
-   "NORM_RESCALE",
-   "NORM_NORMALIZE"
-};
-
-
-/* =============================================================
- * Reference transformations
- */
-
-static void ref_norm_transform_rescale( const GLmatrix *mat,
-					GLfloat scale,
-					const GLvector4f *in,
-					const GLfloat *lengths,
-					GLvector4f *dest )
-{
-   GLuint i;
-   const GLfloat *s = in->start;
-   const GLfloat *m = mat->inv;
-   GLfloat (*out)[4] = (GLfloat (*)[4]) dest->start;
-
-   (void) lengths;
-
-   for ( i = 0 ; i < in->count ; i++ ) {
-      GLfloat t[3];
-
-      TRANSFORM_NORMAL( t, s, m );
-      SCALE_SCALAR_3V( out[i], scale, t );
-
-      s = (GLfloat *)((char *)s + in->stride);
-   }
-}
-
-static void ref_norm_transform_normalize( const GLmatrix *mat,
-					  GLfloat scale,
-					  const GLvector4f *in,
-					  const GLfloat *lengths,
-					  GLvector4f *dest )
-{
-   GLuint i;
-   const GLfloat *s = in->start;
-   const GLfloat *m = mat->inv;
-   GLfloat (*out)[4] = (GLfloat (*)[4]) dest->start;
-
-   for ( i = 0 ; i < in->count ; i++ ) {
-      GLfloat t[3];
-
-      TRANSFORM_NORMAL( t, s, m );
-
-      if ( !lengths ) {
-         GLfloat len = LEN_SQUARED_3FV( t );
-         if ( len > 1e-20 ) {
-	    /* Hmmm, don't know how we could test the precalculated
-	     * length case...
-	     */
-            scale = 1.0 / SQRTF( len );
-	    SCALE_SCALAR_3V( out[i], scale, t );
-         } else {
-            out[i][0] = out[i][1] = out[i][2] = 0;
-         }
-      } else {
-         scale = lengths[i];;
-	 SCALE_SCALAR_3V( out[i], scale, t );
-      }
-
-      s = (GLfloat *)((char *)s + in->stride);
-   }
-}
-
-
-/* =============================================================
- * Normal transformation tests
- */
-
-static void init_matrix( GLfloat *m )
-{
-   m[0] = 63.0; m[4] = 43.0; m[ 8] = 29.0; m[12] = 43.0;
-   m[1] = 55.0; m[5] = 17.0; m[ 9] = 31.0; m[13] =  7.0;
-   m[2] = 44.0; m[6] =  9.0; m[10] =  7.0; m[14] =  3.0;
-   m[3] = 11.0; m[7] = 23.0; m[11] = 91.0; m[15] =  9.0;
-}
-
-
-static int test_norm_function( normal_func func, int mtype, long *cycles )
-{
-   GLvector4f source[1], dest[1], dest2[1], ref[1], ref2[1];
-   GLmatrix mat[1];
-   GLfloat s[TEST_COUNT][5], d[TEST_COUNT][4], r[TEST_COUNT][4];
-   GLfloat d2[TEST_COUNT][4], r2[TEST_COUNT][4], length[TEST_COUNT];
-   GLfloat scale;
-   GLfloat *m;
-   int i, j;
-#ifdef  RUN_DEBUG_BENCHMARK
-   int cycle_i;		/* the counter for the benchmarks we run */
-#endif
-
-   (void) cycles;
-
-   mat->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
-   mat->inv = m = mat->m;
-
-   init_matrix( m );
-
-   scale = 1.0F + rnd () * norm_scale_types[mtype];
-
-   for ( i = 0 ; i < 4 ; i++ ) {
-      for ( j = 0 ; j < 4 ; j++ ) {
-         switch ( norm_templates[mtype][i * 4 + j] ) {
-         case NIL:
-            m[j * 4 + i] = 0.0;
-            break;
-         case ONE:
-            m[j * 4 + i] = 1.0;
-            break;
-         case NEG:
-            m[j * 4 + i] = -1.0;
-            break;
-         case VAR:
-            break;
-         default:
-            exit(1);
-         }
-      }
-   }
-
-   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
-      ASSIGN_3V( d[i],  0.0, 0.0, 0.0 );
-      ASSIGN_3V( s[i],  0.0, 0.0, 0.0 );
-      ASSIGN_3V( d2[i], 0.0, 0.0, 0.0 );
-      for ( j = 0 ; j < 3 ; j++ )
-         s[i][j] = rnd();
-      length[i] = 1 / SQRTF( LEN_SQUARED_3FV( s[i] ) );
-   }
-
-   source->data = (GLfloat(*)[4]) s;
-   source->start = (GLfloat *) s;
-   source->count = TEST_COUNT;
-   source->stride = sizeof(s[0]);
-   source->flags = 0;
-
-   dest->data = d;
-   dest->start = (GLfloat *) d;
-   dest->count = TEST_COUNT;
-   dest->stride = sizeof(float[4]);
-   dest->flags = 0;
-
-   dest2->data = d2;
-   dest2->start = (GLfloat *) d2;
-   dest2->count = TEST_COUNT;
-   dest2->stride = sizeof(float[4]);
-   dest2->flags = 0;
-
-   ref->data = r;
-   ref->start = (GLfloat *) r;
-   ref->count = TEST_COUNT;
-   ref->stride = sizeof(float[4]);
-   ref->flags = 0;
-
-   ref2->data = r2;
-   ref2->start = (GLfloat *) r2;
-   ref2->count = TEST_COUNT;
-   ref2->stride = sizeof(float[4]);
-   ref2->flags = 0;
-
-   if ( norm_normalize_types[mtype] == 0 ) {
-      ref_norm_transform_rescale( mat, scale, source, NULL, ref );
-   } else {
-      ref_norm_transform_normalize( mat, scale, source, NULL, ref );
-      ref_norm_transform_normalize( mat, scale, source, length, ref2 );
-   }
-
-   if ( mesa_profile ) {
-      BEGIN_RACE( *cycles );
-      func( mat, scale, source, NULL, dest );
-      END_RACE( *cycles );
-      func( mat, scale, source, length, dest2 );
-   } else {
-      func( mat, scale, source, NULL, dest );
-      func( mat, scale, source, length, dest2 );
-   }
-
-   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
-      for ( j = 0 ; j < 3 ; j++ ) {
-         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            printf( "-----------------------------\n" );
-            printf( "(i = %i, j = %i)\n", i, j );
-            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
-		    d[i][0], r[i][0], r[i][0]/d[i][0],
-		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
-		    d[i][1], r[i][1], r[i][1]/d[i][1],
-		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
-		    d[i][2], r[i][2], r[i][2]/d[i][2],
-		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
-            return 0;
-         }
-
-         if ( norm_normalize_types[mtype] != 0 ) {
-            if ( significand_match( d2[i][j], r2[i][j] ) < REQUIRED_PRECISION ) {
-               printf( "------------------- precalculated length case ------\n" );
-               printf( "(i = %i, j = %i)\n", i, j );
-               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
-		       d2[i][0], r2[i][0], r2[i][0]/d2[i][0],
-		       MAX_PRECISION - significand_match( d2[i][0], r2[i][0] ) );
-               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
-		       d2[i][1], r2[i][1], r2[i][1]/d2[i][1],
-		       MAX_PRECISION - significand_match( d2[i][1], r2[i][1] ) );
-               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
-		       d2[i][2], r2[i][2], r2[i][2]/d2[i][2],
-		       MAX_PRECISION - significand_match( d2[i][2], r2[i][2] ) );
-               return 0;
-            }
-         }
-      }
-   }
-
-   _mesa_align_free( mat->m );
-   return 1;
-}
-
-void _math_test_all_normal_transform_functions( char *description )
-{
-   int mtype;
-   long benchmark_tab[0xf];
-   static int first_time = 1;
-
-   if ( first_time ) {
-      first_time = 0;
-      mesa_profile = _mesa_getenv( "MESA_PROFILE" );
-   }
-
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile ) {
-      if ( !counter_overhead ) {
-	 INIT_COUNTER();
-	 printf( "counter overhead: %ld cycles\n\n", counter_overhead );
-      }
-      printf( "normal transform results after hooking in %s functions:\n",
-	      description );
-      printf( "\n-------------------------------------------------------\n" );
-   }
-#endif
-
-   for ( mtype = 0 ; mtype < 8 ; mtype++ ) {
-      normal_func func = _mesa_normal_tab[norm_types[mtype]];
-      long *cycles = &benchmark_tab[mtype];
-
-      if ( test_norm_function( func, mtype, cycles ) == 0 ) {
-	 char buf[100];
-	 sprintf( buf, "_mesa_normal_tab[0][%s] failed test (%s)",
-		  norm_strings[mtype], description );
-	 _mesa_problem( NULL, buf );
-      }
-
-#ifdef RUN_DEBUG_BENCHMARK
-      if ( mesa_profile ) {
-	 printf( " %li\t", benchmark_tab[mtype] );
-	 printf( " | [%s]\n", norm_strings[mtype] );
-      }
-#endif
-   }
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile ) {
-      printf( "\n" );
-   }
-#endif
-}
-
-
-#endif /* DEBUG_MATH */
+

+/*

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

+ *

+ * Authors:

+ *    Gareth Hughes

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/imports.h"

+

+#include "m_matrix.h"

+#include "m_xform.h"

+

+#include "m_debug.h"

+#include "m_debug_util.h"

+

+

+#ifdef __UNIXOS2__

+/* The linker doesn't like empty files */

+static char dummy;

+#endif

+

+#ifdef DEBUG_MATH  /* This code only used for debugging */

+

+

+static int m_norm_identity[16] = {

+   ONE, NIL, NIL, NIL,

+   NIL, ONE, NIL, NIL,

+   NIL, NIL, ONE, NIL,

+   NIL, NIL, NIL, NIL

+};

+static int m_norm_general[16] = {

+   VAR, VAR, VAR, NIL,

+   VAR, VAR, VAR, NIL,

+   VAR, VAR, VAR, NIL,

+   NIL, NIL, NIL, NIL

+};

+static int m_norm_no_rot[16] = {

+   VAR, NIL, NIL, NIL,

+   NIL, VAR, NIL, NIL,

+   NIL, NIL, VAR, NIL,

+   NIL, NIL, NIL, NIL

+};

+static int *norm_templates[8] = {

+   m_norm_no_rot,

+   m_norm_no_rot,

+   m_norm_no_rot,

+   m_norm_general,

+   m_norm_general,

+   m_norm_general,

+   m_norm_identity,

+   m_norm_identity

+};

+static int norm_types[8] = {

+   NORM_TRANSFORM_NO_ROT,

+   NORM_TRANSFORM_NO_ROT | NORM_RESCALE,

+   NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE,

+   NORM_TRANSFORM,

+   NORM_TRANSFORM | NORM_RESCALE,

+   NORM_TRANSFORM | NORM_NORMALIZE,

+   NORM_RESCALE,

+   NORM_NORMALIZE

+};

+static int norm_scale_types[8] = {               /*  rescale factor          */

+   NIL,                                          /*  NIL disables rescaling  */

+   VAR,

+   NIL,

+   NIL,

+   VAR,

+   NIL,

+   VAR,

+   NIL

+};

+static int norm_normalize_types[8] = {           /*  normalizing ?? (no = 0) */

+   0,

+   0,

+   1,

+   0,

+   0,

+   1,

+   0,

+   1

+};

+static char *norm_strings[8] = {

+   "NORM_TRANSFORM_NO_ROT",

+   "NORM_TRANSFORM_NO_ROT | NORM_RESCALE",

+   "NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE",

+   "NORM_TRANSFORM",

+   "NORM_TRANSFORM | NORM_RESCALE",

+   "NORM_TRANSFORM | NORM_NORMALIZE",

+   "NORM_RESCALE",

+   "NORM_NORMALIZE"

+};

+

+

+/* =============================================================

+ * Reference transformations

+ */

+

+static void ref_norm_transform_rescale( const GLmatrix *mat,

+					GLfloat scale,

+					const GLvector4f *in,

+					const GLfloat *lengths,

+					GLvector4f *dest )

+{

+   GLuint i;

+   const GLfloat *s = in->start;

+   const GLfloat *m = mat->inv;

+   GLfloat (*out)[4] = (GLfloat (*)[4]) dest->start;

+

+   (void) lengths;

+

+   for ( i = 0 ; i < in->count ; i++ ) {

+      GLfloat t[3];

+

+      TRANSFORM_NORMAL( t, s, m );

+      SCALE_SCALAR_3V( out[i], scale, t );

+

+      s = (GLfloat *)((char *)s + in->stride);

+   }

+}

+

+static void ref_norm_transform_normalize( const GLmatrix *mat,

+					  GLfloat scale,

+					  const GLvector4f *in,

+					  const GLfloat *lengths,

+					  GLvector4f *dest )

+{

+   GLuint i;

+   const GLfloat *s = in->start;

+   const GLfloat *m = mat->inv;

+   GLfloat (*out)[4] = (GLfloat (*)[4]) dest->start;

+

+   for ( i = 0 ; i < in->count ; i++ ) {

+      GLfloat t[3];

+

+      TRANSFORM_NORMAL( t, s, m );

+

+      if ( !lengths ) {

+         GLfloat len = LEN_SQUARED_3FV( t );

+         if ( len > 1e-20 ) {

+	    /* Hmmm, don't know how we could test the precalculated

+	     * length case...

+	     */

+            scale = 1.0 / SQRTF( len );

+	    SCALE_SCALAR_3V( out[i], scale, t );

+         } else {

+            out[i][0] = out[i][1] = out[i][2] = 0;

+         }

+      } else {

+         scale = lengths[i];;

+	 SCALE_SCALAR_3V( out[i], scale, t );

+      }

+

+      s = (GLfloat *)((char *)s + in->stride);

+   }

+}

+

+

+/* =============================================================

+ * Normal transformation tests

+ */

+

+static void init_matrix( GLfloat *m )

+{

+   m[0] = 63.0; m[4] = 43.0; m[ 8] = 29.0; m[12] = 43.0;

+   m[1] = 55.0; m[5] = 17.0; m[ 9] = 31.0; m[13] =  7.0;

+   m[2] = 44.0; m[6] =  9.0; m[10] =  7.0; m[14] =  3.0;

+   m[3] = 11.0; m[7] = 23.0; m[11] = 91.0; m[15] =  9.0;

+}

+

+

+static int test_norm_function( normal_func func, int mtype, long *cycles )

+{

+   GLvector4f source[1], dest[1], dest2[1], ref[1], ref2[1];

+   GLmatrix mat[1];

+   GLfloat s[TEST_COUNT][5], d[TEST_COUNT][4], r[TEST_COUNT][4];

+   GLfloat d2[TEST_COUNT][4], r2[TEST_COUNT][4], length[TEST_COUNT];

+   GLfloat scale;

+   GLfloat *m;

+   int i, j;

+#ifdef  RUN_DEBUG_BENCHMARK

+   int cycle_i;		/* the counter for the benchmarks we run */

+#endif

+

+   (void) cycles;

+

+   mat->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );

+   mat->inv = m = mat->m;

+

+   init_matrix( m );

+

+   scale = 1.0F + rnd () * norm_scale_types[mtype];

+

+   for ( i = 0 ; i < 4 ; i++ ) {

+      for ( j = 0 ; j < 4 ; j++ ) {

+         switch ( norm_templates[mtype][i * 4 + j] ) {

+         case NIL:

+            m[j * 4 + i] = 0.0;

+            break;

+         case ONE:

+            m[j * 4 + i] = 1.0;

+            break;

+         case NEG:

+            m[j * 4 + i] = -1.0;

+            break;

+         case VAR:

+            break;

+         default:

+            exit(1);

+         }

+      }

+   }

+

+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {

+      ASSIGN_3V( d[i],  0.0, 0.0, 0.0 );

+      ASSIGN_3V( s[i],  0.0, 0.0, 0.0 );

+      ASSIGN_3V( d2[i], 0.0, 0.0, 0.0 );

+      for ( j = 0 ; j < 3 ; j++ )

+         s[i][j] = rnd();

+      length[i] = 1 / SQRTF( LEN_SQUARED_3FV( s[i] ) );

+   }

+

+   source->data = (GLfloat(*)[4]) s;

+   source->start = (GLfloat *) s;

+   source->count = TEST_COUNT;

+   source->stride = sizeof(s[0]);

+   source->flags = 0;

+

+   dest->data = d;

+   dest->start = (GLfloat *) d;

+   dest->count = TEST_COUNT;

+   dest->stride = sizeof(float[4]);

+   dest->flags = 0;

+

+   dest2->data = d2;

+   dest2->start = (GLfloat *) d2;

+   dest2->count = TEST_COUNT;

+   dest2->stride = sizeof(float[4]);

+   dest2->flags = 0;

+

+   ref->data = r;

+   ref->start = (GLfloat *) r;

+   ref->count = TEST_COUNT;

+   ref->stride = sizeof(float[4]);

+   ref->flags = 0;

+

+   ref2->data = r2;

+   ref2->start = (GLfloat *) r2;

+   ref2->count = TEST_COUNT;

+   ref2->stride = sizeof(float[4]);

+   ref2->flags = 0;

+

+   if ( norm_normalize_types[mtype] == 0 ) {

+      ref_norm_transform_rescale( mat, scale, source, NULL, ref );

+   } else {

+      ref_norm_transform_normalize( mat, scale, source, NULL, ref );

+      ref_norm_transform_normalize( mat, scale, source, length, ref2 );

+   }

+

+   if ( mesa_profile ) {

+      BEGIN_RACE( *cycles );

+      func( mat, scale, source, NULL, dest );

+      END_RACE( *cycles );

+      func( mat, scale, source, length, dest2 );

+   } else {

+      func( mat, scale, source, NULL, dest );

+      func( mat, scale, source, length, dest2 );

+   }

+

+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {

+      for ( j = 0 ; j < 3 ; j++ ) {

+         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {

+            printf( "-----------------------------\n" );

+            printf( "(i = %i, j = %i)\n", i, j );

+            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",

+		    d[i][0], r[i][0], r[i][0]/d[i][0],

+		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );

+            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",

+		    d[i][1], r[i][1], r[i][1]/d[i][1],

+		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );

+            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",

+		    d[i][2], r[i][2], r[i][2]/d[i][2],

+		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );

+            return 0;

+         }

+

+         if ( norm_normalize_types[mtype] != 0 ) {

+            if ( significand_match( d2[i][j], r2[i][j] ) < REQUIRED_PRECISION ) {

+               printf( "------------------- precalculated length case ------\n" );

+               printf( "(i = %i, j = %i)\n", i, j );

+               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",

+		       d2[i][0], r2[i][0], r2[i][0]/d2[i][0],

+		       MAX_PRECISION - significand_match( d2[i][0], r2[i][0] ) );

+               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",

+		       d2[i][1], r2[i][1], r2[i][1]/d2[i][1],

+		       MAX_PRECISION - significand_match( d2[i][1], r2[i][1] ) );

+               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",

+		       d2[i][2], r2[i][2], r2[i][2]/d2[i][2],

+		       MAX_PRECISION - significand_match( d2[i][2], r2[i][2] ) );

+               return 0;

+            }

+         }

+      }

+   }

+

+   _mesa_align_free( mat->m );

+   return 1;

+}

+

+void _math_test_all_normal_transform_functions( char *description )

+{

+   int mtype;

+   long benchmark_tab[0xf];

+   static int first_time = 1;

+

+   if ( first_time ) {

+      first_time = 0;

+      mesa_profile = _mesa_getenv( "MESA_PROFILE" );

+   }

+

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile ) {

+      if ( !counter_overhead ) {

+	 INIT_COUNTER();

+	 printf( "counter overhead: %ld cycles\n\n", counter_overhead );

+      }

+      printf( "normal transform results after hooking in %s functions:\n",

+	      description );

+      printf( "\n-------------------------------------------------------\n" );

+   }

+#endif

+

+   for ( mtype = 0 ; mtype < 8 ; mtype++ ) {

+      normal_func func = _mesa_normal_tab[norm_types[mtype]];

+      long *cycles = &benchmark_tab[mtype];

+

+      if ( test_norm_function( func, mtype, cycles ) == 0 ) {

+	 char buf[100];

+	 sprintf( buf, "_mesa_normal_tab[0][%s] failed test (%s)",

+		  norm_strings[mtype], description );

+	 _mesa_problem( NULL, "%s", buf );

+      }

+

+#ifdef RUN_DEBUG_BENCHMARK

+      if ( mesa_profile ) {

+	 printf( " %li\t", benchmark_tab[mtype] );

+	 printf( " | [%s]\n", norm_strings[mtype] );

+      }

+#endif

+   }

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile ) {

+      printf( "\n" );

+   }

+#endif

+}

+

+

+#endif /* DEBUG_MATH */

diff --git a/mesalib/src/mesa/math/m_debug_xform.c b/mesalib/src/mesa/math/m_debug_xform.c
index 46bd45451..0de43195c 100644
--- a/mesalib/src/mesa/math/m_debug_xform.c
+++ b/mesalib/src/mesa/math/m_debug_xform.c
@@ -1,339 +1,339 @@
-/*
- * 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.
- */
-
-/*
- * Updated for P6 architecture by Gareth Hughes.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-#include "m_xform.h"
-
-#include "m_debug.h"
-#include "m_debug_util.h"
-
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
-#ifdef DEBUG_MATH  /* This code only used for debugging */
-
-
-/* Overhead of profiling counter in cycles.  Automatically adjusted to
- * your machine at run time - counter initialization should give very
- * consistent results.
- */
-long counter_overhead = 0;
-
-/* This is the value of the environment variable MESA_PROFILE, and is
- * used to determine if we should benchmark the functions as well as
- * verify their correctness.
- */
-char *mesa_profile = NULL;
-
-
-static int m_general[16] = {
-   VAR, VAR, VAR, VAR,
-   VAR, VAR, VAR, VAR,
-   VAR, VAR, VAR, VAR,
-   VAR, VAR, VAR, VAR
-};
-static int m_identity[16] = {
-   ONE, NIL, NIL, NIL,
-   NIL, ONE, NIL, NIL,
-   NIL, NIL, ONE, NIL,
-   NIL, NIL, NIL, ONE
-};
-static int  m_2d[16]  = {
-   VAR, VAR, NIL, VAR,
-   VAR, VAR, NIL, VAR,
-   NIL, NIL, ONE, NIL,
-   NIL, NIL, NIL, ONE
-};
-static int m_2d_no_rot[16] = {
-   VAR, NIL, NIL, VAR,
-   NIL, VAR, NIL, VAR,
-   NIL, NIL, ONE, NIL,
-   NIL, NIL, NIL, ONE
-};
-static int m_3d[16] = {
-   VAR, VAR, VAR, VAR,
-   VAR, VAR, VAR, VAR,
-   VAR, VAR, VAR, VAR,
-   NIL, NIL, NIL, ONE
-};
-static int m_3d_no_rot[16] = {
-   VAR, NIL, NIL, VAR,
-   NIL, VAR, NIL, VAR,
-   NIL, NIL, VAR, VAR,
-   NIL, NIL, NIL, ONE
-};
-static int m_perspective[16] = {
-   VAR, NIL, VAR, NIL,
-   NIL, VAR, VAR, NIL,
-   NIL, NIL, VAR, VAR,
-   NIL, NIL, NEG, NIL
-};
-static int *templates[7] = {
-   m_general,
-   m_identity,
-   m_3d_no_rot,
-   m_perspective,
-   m_2d,
-   m_2d_no_rot,
-   m_3d
-};
-static enum GLmatrixtype mtypes[7] = {
-   MATRIX_GENERAL,
-   MATRIX_IDENTITY,
-   MATRIX_3D_NO_ROT,
-   MATRIX_PERSPECTIVE,
-   MATRIX_2D,
-   MATRIX_2D_NO_ROT,
-   MATRIX_3D
-};
-static char *mstrings[7] = {
-   "MATRIX_GENERAL",
-   "MATRIX_IDENTITY",
-   "MATRIX_3D_NO_ROT",
-   "MATRIX_PERSPECTIVE",
-   "MATRIX_2D",
-   "MATRIX_2D_NO_ROT",
-   "MATRIX_3D"
-};
-
-
-/* =============================================================
- * Reference transformations
- */
-
-static void ref_transform( GLvector4f *dst,
-                           const GLmatrix *mat,
-                           const GLvector4f *src )
-{
-   GLuint i;
-   GLfloat *s = (GLfloat *)src->start;
-   GLfloat (*d)[4] = (GLfloat (*)[4])dst->start;
-   const GLfloat *m = mat->m;
-
-   for ( i = 0 ; i < src->count ; i++ ) {
-      TRANSFORM_POINT( d[i], m, s );
-      s = (GLfloat *)((char *)s + src->stride);
-   }
-}
-
-
-/* =============================================================
- * Vertex transformation tests
- */
-
-static void init_matrix( GLfloat *m )
-{
-   m[0] = 63.0; m[4] = 43.0; m[ 8] = 29.0; m[12] = 43.0;
-   m[1] = 55.0; m[5] = 17.0; m[ 9] = 31.0; m[13] =  7.0;
-   m[2] = 44.0; m[6] =  9.0; m[10] =  7.0; m[14] =  3.0;
-   m[3] = 11.0; m[7] = 23.0; m[11] = 91.0; m[15] =  9.0;
-}
-
-ALIGN16(static GLfloat, s[TEST_COUNT][4]);
-ALIGN16(static GLfloat, d[TEST_COUNT][4]);
-ALIGN16(static GLfloat, r[TEST_COUNT][4]);
-
-static int test_transform_function( transform_func func, int psize,
-				    int mtype, unsigned long *cycles )
-{
-   GLvector4f source[1], dest[1], ref[1];
-   GLmatrix mat[1];
-   GLfloat *m;
-   int i, j;
-#ifdef  RUN_DEBUG_BENCHMARK
-   int cycle_i;                /* the counter for the benchmarks we run */
-#endif
-
-   (void) cycles;
-
-   if ( psize > 4 ) {
-      _mesa_problem( NULL, "test_transform_function called with psize > 4\n" );
-      return 0;
-   }
-
-   mat->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
-   mat->type = mtypes[mtype];
-
-   m = mat->m;
-   ASSERT( ((long)m & 15) == 0 );
-
-   init_matrix( m );
-
-   for ( i = 0 ; i < 4 ; i++ ) {
-      for ( j = 0 ; j < 4 ; j++ ) {
-         switch ( templates[mtype][i * 4 + j] ) {
-         case NIL:
-            m[j * 4 + i] = 0.0;
-            break;
-         case ONE:
-            m[j * 4 + i] = 1.0;
-            break;
-         case NEG:
-            m[j * 4 + i] = -1.0;
-            break;
-         case VAR:
-            break;
-         default:
-            ASSERT(0);
-            return 0;
-         }
-      }
-   }
-
-   for ( i = 0 ; i < TEST_COUNT ; i++) {
-      ASSIGN_4V( d[i], 0.0, 0.0, 0.0, 1.0 );
-      ASSIGN_4V( s[i], 0.0, 0.0, 0.0, 1.0 );
-      for ( j = 0 ; j < psize ; j++ )
-         s[i][j] = rnd();
-   }
-
-   source->data = (GLfloat(*)[4])s;
-   source->start = (GLfloat *)s;
-   source->count = TEST_COUNT;
-   source->stride = sizeof(s[0]);
-   source->size = 4;
-   source->flags = 0;
-
-   dest->data = (GLfloat(*)[4])d;
-   dest->start = (GLfloat *)d;
-   dest->count = TEST_COUNT;
-   dest->stride = sizeof(float[4]);
-   dest->size = 0;
-   dest->flags = 0;
-
-   ref->data = (GLfloat(*)[4])r;
-   ref->start = (GLfloat *)r;
-   ref->count = TEST_COUNT;
-   ref->stride = sizeof(float[4]);
-   ref->size = 0;
-   ref->flags = 0;
-
-   ref_transform( ref, mat, source );
-
-   if ( mesa_profile ) {
-      BEGIN_RACE( *cycles );
-      func( dest, mat->m, source );
-      END_RACE( *cycles );
-   }
-   else {
-      func( dest, mat->m, source );
-   }
-
-   for ( i = 0 ; i < TEST_COUNT ; i++ ) {
-      for ( j = 0 ; j < 4 ; j++ ) {
-         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            printf("-----------------------------\n" );
-            printf("(i = %i, j = %i)\n", i, j );
-            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][0], r[i][0], r[i][0]-d[i][0],
-		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][1], r[i][1], r[i][1]-d[i][1],
-		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][2], r[i][2], r[i][2]-d[i][2],
-		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
-            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
-		    d[i][3], r[i][3], r[i][3]-d[i][3],
-		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
-            return 0;
-         }
-      }
-   }
-
-   _mesa_align_free( mat->m );
-   return 1;
-}
-
-void _math_test_all_transform_functions( char *description )
-{
-   int psize, mtype;
-   unsigned long benchmark_tab[4][7];
-   static int first_time = 1;
-
-   if ( first_time ) {
-      first_time = 0;
-      mesa_profile = _mesa_getenv( "MESA_PROFILE" );
-   }
-
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile ) {
-      if ( !counter_overhead ) {
-	 INIT_COUNTER();
-	 printf("counter overhead: %lu cycles\n\n", counter_overhead );
-      }
-      printf("transform results after hooking in %s functions:\n", description );
-   }
-#endif
-
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile ) {
-      printf("\n" );
-      for ( psize = 1 ; psize <= 4 ; psize++ ) {
-	 printf(" p%d\t", psize );
-      }
-      printf("\n--------------------------------------------------------\n" );
-   }
-#endif
-
-   for ( mtype = 0 ; mtype < 7 ; mtype++ ) {
-      for ( psize = 1 ; psize <= 4 ; psize++ ) {
-	 transform_func func = _mesa_transform_tab[psize][mtypes[mtype]];
-	 unsigned long *cycles = &(benchmark_tab[psize-1][mtype]);
-
-	 if ( test_transform_function( func, psize, mtype, cycles ) == 0 ) {
-	    char buf[100];
-	    sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
-		    psize, mstrings[mtype], description );
-	    _mesa_problem( NULL, buf );
-	 }
-#ifdef RUN_DEBUG_BENCHMARK
-	 if ( mesa_profile )
-	    printf(" %li\t", benchmark_tab[psize-1][mtype] );
-#endif
-      }
-#ifdef RUN_DEBUG_BENCHMARK
-      if ( mesa_profile )
-	 printf(" | [%s]\n", mstrings[mtype] );
-#endif
-   }
-#ifdef RUN_DEBUG_BENCHMARK
-   if ( mesa_profile )
-      printf( "\n" );
-#endif
-}
-
-
-#endif /* DEBUG_MATH */
+/*

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

+ */

+

+/*

+ * Updated for P6 architecture by Gareth Hughes.

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/imports.h"

+

+#include "m_matrix.h"

+#include "m_xform.h"

+

+#include "m_debug.h"

+#include "m_debug_util.h"

+

+#ifdef __UNIXOS2__

+/* The linker doesn't like empty files */

+static char dummy;

+#endif

+

+#ifdef DEBUG_MATH  /* This code only used for debugging */

+

+

+/* Overhead of profiling counter in cycles.  Automatically adjusted to

+ * your machine at run time - counter initialization should give very

+ * consistent results.

+ */

+long counter_overhead = 0;

+

+/* This is the value of the environment variable MESA_PROFILE, and is

+ * used to determine if we should benchmark the functions as well as

+ * verify their correctness.

+ */

+char *mesa_profile = NULL;

+

+

+static int m_general[16] = {

+   VAR, VAR, VAR, VAR,

+   VAR, VAR, VAR, VAR,

+   VAR, VAR, VAR, VAR,

+   VAR, VAR, VAR, VAR

+};

+static int m_identity[16] = {

+   ONE, NIL, NIL, NIL,

+   NIL, ONE, NIL, NIL,

+   NIL, NIL, ONE, NIL,

+   NIL, NIL, NIL, ONE

+};

+static int  m_2d[16]  = {

+   VAR, VAR, NIL, VAR,

+   VAR, VAR, NIL, VAR,

+   NIL, NIL, ONE, NIL,

+   NIL, NIL, NIL, ONE

+};

+static int m_2d_no_rot[16] = {

+   VAR, NIL, NIL, VAR,

+   NIL, VAR, NIL, VAR,

+   NIL, NIL, ONE, NIL,

+   NIL, NIL, NIL, ONE

+};

+static int m_3d[16] = {

+   VAR, VAR, VAR, VAR,

+   VAR, VAR, VAR, VAR,

+   VAR, VAR, VAR, VAR,

+   NIL, NIL, NIL, ONE

+};

+static int m_3d_no_rot[16] = {

+   VAR, NIL, NIL, VAR,

+   NIL, VAR, NIL, VAR,

+   NIL, NIL, VAR, VAR,

+   NIL, NIL, NIL, ONE

+};

+static int m_perspective[16] = {

+   VAR, NIL, VAR, NIL,

+   NIL, VAR, VAR, NIL,

+   NIL, NIL, VAR, VAR,

+   NIL, NIL, NEG, NIL

+};

+static int *templates[7] = {

+   m_general,

+   m_identity,

+   m_3d_no_rot,

+   m_perspective,

+   m_2d,

+   m_2d_no_rot,

+   m_3d

+};

+static enum GLmatrixtype mtypes[7] = {

+   MATRIX_GENERAL,

+   MATRIX_IDENTITY,

+   MATRIX_3D_NO_ROT,

+   MATRIX_PERSPECTIVE,

+   MATRIX_2D,

+   MATRIX_2D_NO_ROT,

+   MATRIX_3D

+};

+static char *mstrings[7] = {

+   "MATRIX_GENERAL",

+   "MATRIX_IDENTITY",

+   "MATRIX_3D_NO_ROT",

+   "MATRIX_PERSPECTIVE",

+   "MATRIX_2D",

+   "MATRIX_2D_NO_ROT",

+   "MATRIX_3D"

+};

+

+

+/* =============================================================

+ * Reference transformations

+ */

+

+static void ref_transform( GLvector4f *dst,

+                           const GLmatrix *mat,

+                           const GLvector4f *src )

+{

+   GLuint i;

+   GLfloat *s = (GLfloat *)src->start;

+   GLfloat (*d)[4] = (GLfloat (*)[4])dst->start;

+   const GLfloat *m = mat->m;

+

+   for ( i = 0 ; i < src->count ; i++ ) {

+      TRANSFORM_POINT( d[i], m, s );

+      s = (GLfloat *)((char *)s + src->stride);

+   }

+}

+

+

+/* =============================================================

+ * Vertex transformation tests

+ */

+

+static void init_matrix( GLfloat *m )

+{

+   m[0] = 63.0; m[4] = 43.0; m[ 8] = 29.0; m[12] = 43.0;

+   m[1] = 55.0; m[5] = 17.0; m[ 9] = 31.0; m[13] =  7.0;

+   m[2] = 44.0; m[6] =  9.0; m[10] =  7.0; m[14] =  3.0;

+   m[3] = 11.0; m[7] = 23.0; m[11] = 91.0; m[15] =  9.0;

+}

+

+ALIGN16(static GLfloat, s[TEST_COUNT][4]);

+ALIGN16(static GLfloat, d[TEST_COUNT][4]);

+ALIGN16(static GLfloat, r[TEST_COUNT][4]);

+

+static int test_transform_function( transform_func func, int psize,

+				    int mtype, unsigned long *cycles )

+{

+   GLvector4f source[1], dest[1], ref[1];

+   GLmatrix mat[1];

+   GLfloat *m;

+   int i, j;

+#ifdef  RUN_DEBUG_BENCHMARK

+   int cycle_i;                /* the counter for the benchmarks we run */

+#endif

+

+   (void) cycles;

+

+   if ( psize > 4 ) {

+      _mesa_problem( NULL, "test_transform_function called with psize > 4\n" );

+      return 0;

+   }

+

+   mat->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );

+   mat->type = mtypes[mtype];

+

+   m = mat->m;

+   ASSERT( ((long)m & 15) == 0 );

+

+   init_matrix( m );

+

+   for ( i = 0 ; i < 4 ; i++ ) {

+      for ( j = 0 ; j < 4 ; j++ ) {

+         switch ( templates[mtype][i * 4 + j] ) {

+         case NIL:

+            m[j * 4 + i] = 0.0;

+            break;

+         case ONE:

+            m[j * 4 + i] = 1.0;

+            break;

+         case NEG:

+            m[j * 4 + i] = -1.0;

+            break;

+         case VAR:

+            break;

+         default:

+            ASSERT(0);

+            return 0;

+         }

+      }

+   }

+

+   for ( i = 0 ; i < TEST_COUNT ; i++) {

+      ASSIGN_4V( d[i], 0.0, 0.0, 0.0, 1.0 );

+      ASSIGN_4V( s[i], 0.0, 0.0, 0.0, 1.0 );

+      for ( j = 0 ; j < psize ; j++ )

+         s[i][j] = rnd();

+   }

+

+   source->data = (GLfloat(*)[4])s;

+   source->start = (GLfloat *)s;

+   source->count = TEST_COUNT;

+   source->stride = sizeof(s[0]);

+   source->size = 4;

+   source->flags = 0;

+

+   dest->data = (GLfloat(*)[4])d;

+   dest->start = (GLfloat *)d;

+   dest->count = TEST_COUNT;

+   dest->stride = sizeof(float[4]);

+   dest->size = 0;

+   dest->flags = 0;

+

+   ref->data = (GLfloat(*)[4])r;

+   ref->start = (GLfloat *)r;

+   ref->count = TEST_COUNT;

+   ref->stride = sizeof(float[4]);

+   ref->size = 0;

+   ref->flags = 0;

+

+   ref_transform( ref, mat, source );

+

+   if ( mesa_profile ) {

+      BEGIN_RACE( *cycles );

+      func( dest, mat->m, source );

+      END_RACE( *cycles );

+   }

+   else {

+      func( dest, mat->m, source );

+   }

+

+   for ( i = 0 ; i < TEST_COUNT ; i++ ) {

+      for ( j = 0 ; j < 4 ; j++ ) {

+         if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {

+            printf("-----------------------------\n" );

+            printf("(i = %i, j = %i)\n", i, j );

+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][0], r[i][0], r[i][0]-d[i][0],

+		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );

+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][1], r[i][1], r[i][1]-d[i][1],

+		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );

+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][2], r[i][2], r[i][2]-d[i][2],

+		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );

+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",

+		    d[i][3], r[i][3], r[i][3]-d[i][3],

+		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );

+            return 0;

+         }

+      }

+   }

+

+   _mesa_align_free( mat->m );

+   return 1;

+}

+

+void _math_test_all_transform_functions( char *description )

+{

+   int psize, mtype;

+   unsigned long benchmark_tab[4][7];

+   static int first_time = 1;

+

+   if ( first_time ) {

+      first_time = 0;

+      mesa_profile = _mesa_getenv( "MESA_PROFILE" );

+   }

+

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile ) {

+      if ( !counter_overhead ) {

+	 INIT_COUNTER();

+	 printf("counter overhead: %lu cycles\n\n", counter_overhead );

+      }

+      printf("transform results after hooking in %s functions:\n", description );

+   }

+#endif

+

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile ) {

+      printf("\n" );

+      for ( psize = 1 ; psize <= 4 ; psize++ ) {

+	 printf(" p%d\t", psize );

+      }

+      printf("\n--------------------------------------------------------\n" );

+   }

+#endif

+

+   for ( mtype = 0 ; mtype < 7 ; mtype++ ) {

+      for ( psize = 1 ; psize <= 4 ; psize++ ) {

+	 transform_func func = _mesa_transform_tab[psize][mtypes[mtype]];

+	 unsigned long *cycles = &(benchmark_tab[psize-1][mtype]);

+

+	 if ( test_transform_function( func, psize, mtype, cycles ) == 0 ) {

+	    char buf[100];

+	    sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",

+		    psize, mstrings[mtype], description );

+	    _mesa_problem( NULL, "%s", buf );

+	 }

+#ifdef RUN_DEBUG_BENCHMARK

+	 if ( mesa_profile )

+	    printf(" %li\t", benchmark_tab[psize-1][mtype] );

+#endif

+      }

+#ifdef RUN_DEBUG_BENCHMARK

+      if ( mesa_profile )

+	 printf(" | [%s]\n", mstrings[mtype] );

+#endif

+   }

+#ifdef RUN_DEBUG_BENCHMARK

+   if ( mesa_profile )

+      printf( "\n" );

+#endif

+}

+

+

+#endif /* DEBUG_MATH */

diff --git a/mesalib/src/mesa/math/m_matrix.c b/mesalib/src/mesa/math/m_matrix.c
index 048b231c4..83eb787c7 100644
--- a/mesalib/src/mesa/math/m_matrix.c
+++ b/mesalib/src/mesa/math/m_matrix.c
@@ -1,1642 +1,1641 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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 m_matrix.c
- * Matrix operations.
- *
- * \note
- * -# 4x4 transformation matrices are stored in memory in column major order.
- * -# Points/vertices are to be thought of as column vectors.
- * -# Transformation of a point p by a matrix M is: p' = M * p
- */
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_matrix.h"
-
-
-/**
- * \defgroup MatFlags MAT_FLAG_XXX-flags
- *
- * Bitmasks to indicate different kinds of 4x4 matrices in GLmatrix::flags
- * It would be nice to make all these flags private to m_matrix.c
- */
-/*@{*/
-#define MAT_FLAG_IDENTITY       0     /**< is an identity matrix flag.
-                                       *   (Not actually used - the identity
-                                       *   matrix is identified by the absense
-                                       *   of all other flags.)
-                                       */
-#define MAT_FLAG_GENERAL        0x1   /**< is a general matrix flag */
-#define MAT_FLAG_ROTATION       0x2   /**< is a rotation matrix flag */
-#define MAT_FLAG_TRANSLATION    0x4   /**< is a translation matrix flag */
-#define MAT_FLAG_UNIFORM_SCALE  0x8   /**< is an uniform scaling matrix flag */
-#define MAT_FLAG_GENERAL_SCALE  0x10  /**< is a general scaling matrix flag */
-#define MAT_FLAG_GENERAL_3D     0x20  /**< general 3D matrix flag */
-#define MAT_FLAG_PERSPECTIVE    0x40  /**< is a perspective proj matrix flag */
-#define MAT_FLAG_SINGULAR       0x80  /**< is a singular matrix flag */
-#define MAT_DIRTY_TYPE          0x100  /**< matrix type is dirty */
-#define MAT_DIRTY_FLAGS         0x200  /**< matrix flags are dirty */
-#define MAT_DIRTY_INVERSE       0x400  /**< matrix inverse is dirty */
-
-/** angle preserving matrix flags mask */
-#define MAT_FLAGS_ANGLE_PRESERVING (MAT_FLAG_ROTATION | \
-				    MAT_FLAG_TRANSLATION | \
-				    MAT_FLAG_UNIFORM_SCALE)
-
-/** geometry related matrix flags mask */
-#define MAT_FLAGS_GEOMETRY (MAT_FLAG_GENERAL | \
-			    MAT_FLAG_ROTATION | \
-			    MAT_FLAG_TRANSLATION | \
-			    MAT_FLAG_UNIFORM_SCALE | \
-			    MAT_FLAG_GENERAL_SCALE | \
-			    MAT_FLAG_GENERAL_3D | \
-			    MAT_FLAG_PERSPECTIVE | \
-	                    MAT_FLAG_SINGULAR)
-
-/** length preserving matrix flags mask */
-#define MAT_FLAGS_LENGTH_PRESERVING (MAT_FLAG_ROTATION | \
-				     MAT_FLAG_TRANSLATION)
-
-
-/** 3D (non-perspective) matrix flags mask */
-#define MAT_FLAGS_3D (MAT_FLAG_ROTATION | \
-		      MAT_FLAG_TRANSLATION | \
-		      MAT_FLAG_UNIFORM_SCALE | \
-		      MAT_FLAG_GENERAL_SCALE | \
-		      MAT_FLAG_GENERAL_3D)
-
-/** dirty matrix flags mask */
-#define MAT_DIRTY          (MAT_DIRTY_TYPE | \
-			    MAT_DIRTY_FLAGS | \
-			    MAT_DIRTY_INVERSE)
-
-/*@}*/
-
-
-/** 
- * Test geometry related matrix flags.
- * 
- * \param mat a pointer to a GLmatrix structure.
- * \param a flags mask.
- *
- * \returns non-zero if all geometry related matrix flags are contained within
- * the mask, or zero otherwise.
- */ 
-#define TEST_MAT_FLAGS(mat, a)  \
-    ((MAT_FLAGS_GEOMETRY & (~(a)) & ((mat)->flags) ) == 0)
-
-
-
-/**
- * Names of the corresponding GLmatrixtype values.
- */
-static const char *types[] = {
-   "MATRIX_GENERAL",
-   "MATRIX_IDENTITY",
-   "MATRIX_3D_NO_ROT",
-   "MATRIX_PERSPECTIVE",
-   "MATRIX_2D",
-   "MATRIX_2D_NO_ROT",
-   "MATRIX_3D"
-};
-
-
-/**
- * Identity matrix.
- */
-static GLfloat Identity[16] = {
-   1.0, 0.0, 0.0, 0.0,
-   0.0, 1.0, 0.0, 0.0,
-   0.0, 0.0, 1.0, 0.0,
-   0.0, 0.0, 0.0, 1.0
-};
-
-
-
-/**********************************************************************/
-/** \name Matrix multiplication */
-/*@{*/
-
-#define A(row,col)  a[(col<<2)+row]
-#define B(row,col)  b[(col<<2)+row]
-#define P(row,col)  product[(col<<2)+row]
-
-/**
- * Perform a full 4x4 matrix multiplication.
- *
- * \param a matrix.
- * \param b matrix.
- * \param product will receive the product of \p a and \p b.
- *
- * \warning Is assumed that \p product != \p b. \p product == \p a is allowed.
- *
- * \note KW: 4*16 = 64 multiplications
- * 
- * \author This \c matmul was contributed by Thomas Malik
- */
-static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b )
-{
-   GLint i;
-   for (i = 0; i < 4; i++) {
-      const GLfloat ai0=A(i,0),  ai1=A(i,1),  ai2=A(i,2),  ai3=A(i,3);
-      P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0) + ai3 * B(3,0);
-      P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1) + ai3 * B(3,1);
-      P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2) + ai3 * B(3,2);
-      P(i,3) = ai0 * B(0,3) + ai1 * B(1,3) + ai2 * B(2,3) + ai3 * B(3,3);
-   }
-}
-
-/**
- * Multiply two matrices known to occupy only the top three rows, such
- * as typical model matrices, and orthogonal matrices.
- *
- * \param a matrix.
- * \param b matrix.
- * \param product will receive the product of \p a and \p b.
- */
-static void matmul34( GLfloat *product, const GLfloat *a, const GLfloat *b )
-{
-   GLint i;
-   for (i = 0; i < 3; i++) {
-      const GLfloat ai0=A(i,0),  ai1=A(i,1),  ai2=A(i,2),  ai3=A(i,3);
-      P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0);
-      P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1);
-      P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2);
-      P(i,3) = ai0 * B(0,3) + ai1 * B(1,3) + ai2 * B(2,3) + ai3;
-   }
-   P(3,0) = 0;
-   P(3,1) = 0;
-   P(3,2) = 0;
-   P(3,3) = 1;
-}
-
-#undef A
-#undef B
-#undef P
-
-/**
- * Multiply a matrix by an array of floats with known properties.
- *
- * \param mat pointer to a GLmatrix structure containing the left multiplication
- * matrix, and that will receive the product result.
- * \param m right multiplication matrix array.
- * \param flags flags of the matrix \p m.
- * 
- * Joins both flags and marks the type and inverse as dirty.  Calls matmul34()
- * if both matrices are 3D, or matmul4() otherwise.
- */
-static void matrix_multf( GLmatrix *mat, const GLfloat *m, GLuint flags )
-{
-   mat->flags |= (flags | MAT_DIRTY_TYPE | MAT_DIRTY_INVERSE);
-
-   if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D))
-      matmul34( mat->m, mat->m, m );
-   else
-      matmul4( mat->m, mat->m, m );
-}
-
-/**
- * Matrix multiplication.
- *
- * \param dest destination matrix.
- * \param a left matrix.
- * \param b right matrix.
- * 
- * Joins both flags and marks the type and inverse as dirty.  Calls matmul34()
- * if both matrices are 3D, or matmul4() otherwise.
- */
-void
-_math_matrix_mul_matrix( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b )
-{
-   dest->flags = (a->flags |
-		  b->flags |
-		  MAT_DIRTY_TYPE |
-		  MAT_DIRTY_INVERSE);
-
-   if (TEST_MAT_FLAGS(dest, MAT_FLAGS_3D))
-      matmul34( dest->m, a->m, b->m );
-   else
-      matmul4( dest->m, a->m, b->m );
-}
-
-/**
- * Matrix multiplication.
- *
- * \param dest left and destination matrix.
- * \param m right matrix array.
- * 
- * Marks the matrix flags with general flag, and type and inverse dirty flags.
- * Calls matmul4() for the multiplication.
- */
-void
-_math_matrix_mul_floats( GLmatrix *dest, const GLfloat *m )
-{
-   dest->flags |= (MAT_FLAG_GENERAL |
-		   MAT_DIRTY_TYPE |
-		   MAT_DIRTY_INVERSE |
-                   MAT_DIRTY_FLAGS);
-
-   matmul4( dest->m, dest->m, m );
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Matrix output */
-/*@{*/
-
-/**
- * Print a matrix array.
- *
- * \param m matrix array.
- *
- * Called by _math_matrix_print() to print a matrix or its inverse.
- */
-static void print_matrix_floats( const GLfloat m[16] )
-{
-   int i;
-   for (i=0;i<4;i++) {
-      _mesa_debug(NULL,"\t%f %f %f %f\n", m[i], m[4+i], m[8+i], m[12+i] );
-   }
-}
-
-/**
- * Dumps the contents of a GLmatrix structure.
- * 
- * \param m pointer to the GLmatrix structure.
- */
-void
-_math_matrix_print( const GLmatrix *m )
-{
-   _mesa_debug(NULL, "Matrix type: %s, flags: %x\n", types[m->type], m->flags);
-   print_matrix_floats(m->m);
-   _mesa_debug(NULL, "Inverse: \n");
-   if (m->inv) {
-      GLfloat prod[16];
-      print_matrix_floats(m->inv);
-      matmul4(prod, m->m, m->inv);
-      _mesa_debug(NULL, "Mat * Inverse:\n");
-      print_matrix_floats(prod);
-   }
-   else {
-      _mesa_debug(NULL, "  - not available\n");
-   }
-}
-
-/*@}*/
-
-
-/**
- * References an element of 4x4 matrix.
- *
- * \param m matrix array.
- * \param c column of the desired element.
- * \param r row of the desired element.
- * 
- * \return value of the desired element.
- *
- * Calculate the linear storage index of the element and references it. 
- */
-#define MAT(m,r,c) (m)[(c)*4+(r)]
-
-
-/**********************************************************************/
-/** \name Matrix inversion */
-/*@{*/
-
-/**
- * Swaps the values of two floating pointer variables.
- *
- * Used by invert_matrix_general() to swap the row pointers.
- */
-#define SWAP_ROWS(a, b) { GLfloat *_tmp = a; (a)=(b); (b)=_tmp; }
-
-/**
- * Compute inverse of 4x4 transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
- * 
- * \author
- * Code contributed by Jacques Leroy jle@star.be
- *
- * Calculates the inverse matrix by performing the gaussian matrix reduction
- * with partial pivoting followed by back/substitution with the loops manually
- * unrolled.
- */
-static GLboolean invert_matrix_general( GLmatrix *mat )
-{
-   const GLfloat *m = mat->m;
-   GLfloat *out = mat->inv;
-   GLfloat wtmp[4][8];
-   GLfloat m0, m1, m2, m3, s;
-   GLfloat *r0, *r1, *r2, *r3;
-
-   r0 = wtmp[0], r1 = wtmp[1], r2 = wtmp[2], r3 = wtmp[3];
-
-   r0[0] = MAT(m,0,0), r0[1] = MAT(m,0,1),
-   r0[2] = MAT(m,0,2), r0[3] = MAT(m,0,3),
-   r0[4] = 1.0, r0[5] = r0[6] = r0[7] = 0.0,
-
-   r1[0] = MAT(m,1,0), r1[1] = MAT(m,1,1),
-   r1[2] = MAT(m,1,2), r1[3] = MAT(m,1,3),
-   r1[5] = 1.0, r1[4] = r1[6] = r1[7] = 0.0,
-
-   r2[0] = MAT(m,2,0), r2[1] = MAT(m,2,1),
-   r2[2] = MAT(m,2,2), r2[3] = MAT(m,2,3),
-   r2[6] = 1.0, r2[4] = r2[5] = r2[7] = 0.0,
-
-   r3[0] = MAT(m,3,0), r3[1] = MAT(m,3,1),
-   r3[2] = MAT(m,3,2), r3[3] = MAT(m,3,3),
-   r3[7] = 1.0, r3[4] = r3[5] = r3[6] = 0.0;
-
-   /* choose pivot - or die */
-   if (FABSF(r3[0])>FABSF(r2[0])) SWAP_ROWS(r3, r2);
-   if (FABSF(r2[0])>FABSF(r1[0])) SWAP_ROWS(r2, r1);
-   if (FABSF(r1[0])>FABSF(r0[0])) SWAP_ROWS(r1, r0);
-   if (0.0 == r0[0])  return GL_FALSE;
-
-   /* eliminate first variable     */
-   m1 = r1[0]/r0[0]; m2 = r2[0]/r0[0]; m3 = r3[0]/r0[0];
-   s = r0[1]; r1[1] -= m1 * s; r2[1] -= m2 * s; r3[1] -= m3 * s;
-   s = r0[2]; r1[2] -= m1 * s; r2[2] -= m2 * s; r3[2] -= m3 * s;
-   s = r0[3]; r1[3] -= m1 * s; r2[3] -= m2 * s; r3[3] -= m3 * s;
-   s = r0[4];
-   if (s != 0.0) { r1[4] -= m1 * s; r2[4] -= m2 * s; r3[4] -= m3 * s; }
-   s = r0[5];
-   if (s != 0.0) { r1[5] -= m1 * s; r2[5] -= m2 * s; r3[5] -= m3 * s; }
-   s = r0[6];
-   if (s != 0.0) { r1[6] -= m1 * s; r2[6] -= m2 * s; r3[6] -= m3 * s; }
-   s = r0[7];
-   if (s != 0.0) { r1[7] -= m1 * s; r2[7] -= m2 * s; r3[7] -= m3 * s; }
-
-   /* choose pivot - or die */
-   if (FABSF(r3[1])>FABSF(r2[1])) SWAP_ROWS(r3, r2);
-   if (FABSF(r2[1])>FABSF(r1[1])) SWAP_ROWS(r2, r1);
-   if (0.0 == r1[1])  return GL_FALSE;
-
-   /* eliminate second variable */
-   m2 = r2[1]/r1[1]; m3 = r3[1]/r1[1];
-   r2[2] -= m2 * r1[2]; r3[2] -= m3 * r1[2];
-   r2[3] -= m2 * r1[3]; r3[3] -= m3 * r1[3];
-   s = r1[4]; if (0.0 != s) { r2[4] -= m2 * s; r3[4] -= m3 * s; }
-   s = r1[5]; if (0.0 != s) { r2[5] -= m2 * s; r3[5] -= m3 * s; }
-   s = r1[6]; if (0.0 != s) { r2[6] -= m2 * s; r3[6] -= m3 * s; }
-   s = r1[7]; if (0.0 != s) { r2[7] -= m2 * s; r3[7] -= m3 * s; }
-
-   /* choose pivot - or die */
-   if (FABSF(r3[2])>FABSF(r2[2])) SWAP_ROWS(r3, r2);
-   if (0.0 == r2[2])  return GL_FALSE;
-
-   /* eliminate third variable */
-   m3 = r3[2]/r2[2];
-   r3[3] -= m3 * r2[3], r3[4] -= m3 * r2[4],
-   r3[5] -= m3 * r2[5], r3[6] -= m3 * r2[6],
-   r3[7] -= m3 * r2[7];
-
-   /* last check */
-   if (0.0 == r3[3]) return GL_FALSE;
-
-   s = 1.0F/r3[3];             /* now back substitute row 3 */
-   r3[4] *= s; r3[5] *= s; r3[6] *= s; r3[7] *= s;
-
-   m2 = r2[3];                 /* now back substitute row 2 */
-   s  = 1.0F/r2[2];
-   r2[4] = s * (r2[4] - r3[4] * m2), r2[5] = s * (r2[5] - r3[5] * m2),
-   r2[6] = s * (r2[6] - r3[6] * m2), r2[7] = s * (r2[7] - r3[7] * m2);
-   m1 = r1[3];
-   r1[4] -= r3[4] * m1, r1[5] -= r3[5] * m1,
-   r1[6] -= r3[6] * m1, r1[7] -= r3[7] * m1;
-   m0 = r0[3];
-   r0[4] -= r3[4] * m0, r0[5] -= r3[5] * m0,
-   r0[6] -= r3[6] * m0, r0[7] -= r3[7] * m0;
-
-   m1 = r1[2];                 /* now back substitute row 1 */
-   s  = 1.0F/r1[1];
-   r1[4] = s * (r1[4] - r2[4] * m1), r1[5] = s * (r1[5] - r2[5] * m1),
-   r1[6] = s * (r1[6] - r2[6] * m1), r1[7] = s * (r1[7] - r2[7] * m1);
-   m0 = r0[2];
-   r0[4] -= r2[4] * m0, r0[5] -= r2[5] * m0,
-   r0[6] -= r2[6] * m0, r0[7] -= r2[7] * m0;
-
-   m0 = r0[1];                 /* now back substitute row 0 */
-   s  = 1.0F/r0[0];
-   r0[4] = s * (r0[4] - r1[4] * m0), r0[5] = s * (r0[5] - r1[5] * m0),
-   r0[6] = s * (r0[6] - r1[6] * m0), r0[7] = s * (r0[7] - r1[7] * m0);
-
-   MAT(out,0,0) = r0[4]; MAT(out,0,1) = r0[5],
-   MAT(out,0,2) = r0[6]; MAT(out,0,3) = r0[7],
-   MAT(out,1,0) = r1[4]; MAT(out,1,1) = r1[5],
-   MAT(out,1,2) = r1[6]; MAT(out,1,3) = r1[7],
-   MAT(out,2,0) = r2[4]; MAT(out,2,1) = r2[5],
-   MAT(out,2,2) = r2[6]; MAT(out,2,3) = r2[7],
-   MAT(out,3,0) = r3[4]; MAT(out,3,1) = r3[5],
-   MAT(out,3,2) = r3[6]; MAT(out,3,3) = r3[7];
-
-   return GL_TRUE;
-}
-#undef SWAP_ROWS
-
-/**
- * Compute inverse of a general 3d transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
- *
- * \author Adapted from graphics gems II.
- *
- * Calculates the inverse of the upper left by first calculating its
- * determinant and multiplying it to the symmetric adjust matrix of each
- * element. Finally deals with the translation part by transforming the
- * original translation vector using by the calculated submatrix inverse.
- */
-static GLboolean invert_matrix_3d_general( GLmatrix *mat )
-{
-   const GLfloat *in = mat->m;
-   GLfloat *out = mat->inv;
-   GLfloat pos, neg, t;
-   GLfloat det;
-
-   /* Calculate the determinant of upper left 3x3 submatrix and
-    * determine if the matrix is singular.
-    */
-   pos = neg = 0.0;
-   t =  MAT(in,0,0) * MAT(in,1,1) * MAT(in,2,2);
-   if (t >= 0.0) pos += t; else neg += t;
-
-   t =  MAT(in,1,0) * MAT(in,2,1) * MAT(in,0,2);
-   if (t >= 0.0) pos += t; else neg += t;
-
-   t =  MAT(in,2,0) * MAT(in,0,1) * MAT(in,1,2);
-   if (t >= 0.0) pos += t; else neg += t;
-
-   t = -MAT(in,2,0) * MAT(in,1,1) * MAT(in,0,2);
-   if (t >= 0.0) pos += t; else neg += t;
-
-   t = -MAT(in,1,0) * MAT(in,0,1) * MAT(in,2,2);
-   if (t >= 0.0) pos += t; else neg += t;
-
-   t = -MAT(in,0,0) * MAT(in,2,1) * MAT(in,1,2);
-   if (t >= 0.0) pos += t; else neg += t;
-
-   det = pos + neg;
-
-   if (det*det < 1e-25)
-      return GL_FALSE;
-
-   det = 1.0F / det;
-   MAT(out,0,0) = (  (MAT(in,1,1)*MAT(in,2,2) - MAT(in,2,1)*MAT(in,1,2) )*det);
-   MAT(out,0,1) = (- (MAT(in,0,1)*MAT(in,2,2) - MAT(in,2,1)*MAT(in,0,2) )*det);
-   MAT(out,0,2) = (  (MAT(in,0,1)*MAT(in,1,2) - MAT(in,1,1)*MAT(in,0,2) )*det);
-   MAT(out,1,0) = (- (MAT(in,1,0)*MAT(in,2,2) - MAT(in,2,0)*MAT(in,1,2) )*det);
-   MAT(out,1,1) = (  (MAT(in,0,0)*MAT(in,2,2) - MAT(in,2,0)*MAT(in,0,2) )*det);
-   MAT(out,1,2) = (- (MAT(in,0,0)*MAT(in,1,2) - MAT(in,1,0)*MAT(in,0,2) )*det);
-   MAT(out,2,0) = (  (MAT(in,1,0)*MAT(in,2,1) - MAT(in,2,0)*MAT(in,1,1) )*det);
-   MAT(out,2,1) = (- (MAT(in,0,0)*MAT(in,2,1) - MAT(in,2,0)*MAT(in,0,1) )*det);
-   MAT(out,2,2) = (  (MAT(in,0,0)*MAT(in,1,1) - MAT(in,1,0)*MAT(in,0,1) )*det);
-
-   /* Do the translation part */
-   MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) +
-		     MAT(in,1,3) * MAT(out,0,1) +
-		     MAT(in,2,3) * MAT(out,0,2) );
-   MAT(out,1,3) = - (MAT(in,0,3) * MAT(out,1,0) +
-		     MAT(in,1,3) * MAT(out,1,1) +
-		     MAT(in,2,3) * MAT(out,1,2) );
-   MAT(out,2,3) = - (MAT(in,0,3) * MAT(out,2,0) +
-		     MAT(in,1,3) * MAT(out,2,1) +
-		     MAT(in,2,3) * MAT(out,2,2) );
-
-   return GL_TRUE;
-}
-
-/**
- * Compute inverse of a 3d transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
- *
- * If the matrix is not an angle preserving matrix then calls
- * invert_matrix_3d_general for the actual calculation. Otherwise calculates
- * the inverse matrix analyzing and inverting each of the scaling, rotation and
- * translation parts.
- */
-static GLboolean invert_matrix_3d( GLmatrix *mat )
-{
-   const GLfloat *in = mat->m;
-   GLfloat *out = mat->inv;
-
-   if (!TEST_MAT_FLAGS(mat, MAT_FLAGS_ANGLE_PRESERVING)) {
-      return invert_matrix_3d_general( mat );
-   }
-
-   if (mat->flags & MAT_FLAG_UNIFORM_SCALE) {
-      GLfloat scale = (MAT(in,0,0) * MAT(in,0,0) +
-                       MAT(in,0,1) * MAT(in,0,1) +
-                       MAT(in,0,2) * MAT(in,0,2));
-
-      if (scale == 0.0)
-         return GL_FALSE;
-
-      scale = 1.0F / scale;
-
-      /* Transpose and scale the 3 by 3 upper-left submatrix. */
-      MAT(out,0,0) = scale * MAT(in,0,0);
-      MAT(out,1,0) = scale * MAT(in,0,1);
-      MAT(out,2,0) = scale * MAT(in,0,2);
-      MAT(out,0,1) = scale * MAT(in,1,0);
-      MAT(out,1,1) = scale * MAT(in,1,1);
-      MAT(out,2,1) = scale * MAT(in,1,2);
-      MAT(out,0,2) = scale * MAT(in,2,0);
-      MAT(out,1,2) = scale * MAT(in,2,1);
-      MAT(out,2,2) = scale * MAT(in,2,2);
-   }
-   else if (mat->flags & MAT_FLAG_ROTATION) {
-      /* Transpose the 3 by 3 upper-left submatrix. */
-      MAT(out,0,0) = MAT(in,0,0);
-      MAT(out,1,0) = MAT(in,0,1);
-      MAT(out,2,0) = MAT(in,0,2);
-      MAT(out,0,1) = MAT(in,1,0);
-      MAT(out,1,1) = MAT(in,1,1);
-      MAT(out,2,1) = MAT(in,1,2);
-      MAT(out,0,2) = MAT(in,2,0);
-      MAT(out,1,2) = MAT(in,2,1);
-      MAT(out,2,2) = MAT(in,2,2);
-   }
-   else {
-      /* pure translation */
-      memcpy( out, Identity, sizeof(Identity) );
-      MAT(out,0,3) = - MAT(in,0,3);
-      MAT(out,1,3) = - MAT(in,1,3);
-      MAT(out,2,3) = - MAT(in,2,3);
-      return GL_TRUE;
-   }
-
-   if (mat->flags & MAT_FLAG_TRANSLATION) {
-      /* Do the translation part */
-      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) +
-			MAT(in,1,3) * MAT(out,0,1) +
-			MAT(in,2,3) * MAT(out,0,2) );
-      MAT(out,1,3) = - (MAT(in,0,3) * MAT(out,1,0) +
-			MAT(in,1,3) * MAT(out,1,1) +
-			MAT(in,2,3) * MAT(out,1,2) );
-      MAT(out,2,3) = - (MAT(in,0,3) * MAT(out,2,0) +
-			MAT(in,1,3) * MAT(out,2,1) +
-			MAT(in,2,3) * MAT(out,2,2) );
-   }
-   else {
-      MAT(out,0,3) = MAT(out,1,3) = MAT(out,2,3) = 0.0;
-   }
-
-   return GL_TRUE;
-}
-
-/**
- * Compute inverse of an identity transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return always GL_TRUE.
- *
- * Simply copies Identity into GLmatrix::inv.
- */
-static GLboolean invert_matrix_identity( GLmatrix *mat )
-{
-   memcpy( mat->inv, Identity, sizeof(Identity) );
-   return GL_TRUE;
-}
-
-/**
- * Compute inverse of a no-rotation 3d transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
- *
- * Calculates the 
- */
-static GLboolean invert_matrix_3d_no_rot( GLmatrix *mat )
-{
-   const GLfloat *in = mat->m;
-   GLfloat *out = mat->inv;
-
-   if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0 || MAT(in,2,2) == 0 )
-      return GL_FALSE;
-
-   memcpy( out, Identity, 16 * sizeof(GLfloat) );
-   MAT(out,0,0) = 1.0F / MAT(in,0,0);
-   MAT(out,1,1) = 1.0F / MAT(in,1,1);
-   MAT(out,2,2) = 1.0F / MAT(in,2,2);
-
-   if (mat->flags & MAT_FLAG_TRANSLATION) {
-      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0));
-      MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1));
-      MAT(out,2,3) = - (MAT(in,2,3) * MAT(out,2,2));
-   }
-
-   return GL_TRUE;
-}
-
-/**
- * Compute inverse of a no-rotation 2d transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
- *
- * Calculates the inverse matrix by applying the inverse scaling and
- * translation to the identity matrix.
- */
-static GLboolean invert_matrix_2d_no_rot( GLmatrix *mat )
-{
-   const GLfloat *in = mat->m;
-   GLfloat *out = mat->inv;
-
-   if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0)
-      return GL_FALSE;
-
-   memcpy( out, Identity, 16 * sizeof(GLfloat) );
-   MAT(out,0,0) = 1.0F / MAT(in,0,0);
-   MAT(out,1,1) = 1.0F / MAT(in,1,1);
-
-   if (mat->flags & MAT_FLAG_TRANSLATION) {
-      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0));
-      MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1));
-   }
-
-   return GL_TRUE;
-}
-
-#if 0
-/* broken */
-static GLboolean invert_matrix_perspective( GLmatrix *mat )
-{
-   const GLfloat *in = mat->m;
-   GLfloat *out = mat->inv;
-
-   if (MAT(in,2,3) == 0)
-      return GL_FALSE;
-
-   memcpy( out, Identity, 16 * sizeof(GLfloat) );
-
-   MAT(out,0,0) = 1.0F / MAT(in,0,0);
-   MAT(out,1,1) = 1.0F / MAT(in,1,1);
-
-   MAT(out,0,3) = MAT(in,0,2);
-   MAT(out,1,3) = MAT(in,1,2);
-
-   MAT(out,2,2) = 0;
-   MAT(out,2,3) = -1;
-
-   MAT(out,3,2) = 1.0F / MAT(in,2,3);
-   MAT(out,3,3) = MAT(in,2,2) * MAT(out,3,2);
-
-   return GL_TRUE;
-}
-#endif
-
-/**
- * Matrix inversion function pointer type.
- */
-typedef GLboolean (*inv_mat_func)( GLmatrix *mat );
-
-/**
- * Table of the matrix inversion functions according to the matrix type.
- */
-static inv_mat_func inv_mat_tab[7] = {
-   invert_matrix_general,
-   invert_matrix_identity,
-   invert_matrix_3d_no_rot,
-#if 0
-   /* Don't use this function for now - it fails when the projection matrix
-    * is premultiplied by a translation (ala Chromium's tilesort SPU).
-    */
-   invert_matrix_perspective,
-#else
-   invert_matrix_general,
-#endif
-   invert_matrix_3d,		/* lazy! */
-   invert_matrix_2d_no_rot,
-   invert_matrix_3d
-};
-
-/**
- * Compute inverse of a transformation matrix.
- * 
- * \param mat pointer to a GLmatrix structure. The matrix inverse will be
- * stored in the GLmatrix::inv attribute.
- * 
- * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).
- *
- * Calls the matrix inversion function in inv_mat_tab corresponding to the
- * given matrix type.  In case of failure, updates the MAT_FLAG_SINGULAR flag,
- * and copies the identity matrix into GLmatrix::inv.
- */
-static GLboolean matrix_invert( GLmatrix *mat )
-{
-   if (inv_mat_tab[mat->type](mat)) {
-      mat->flags &= ~MAT_FLAG_SINGULAR;
-      return GL_TRUE;
-   } else {
-      mat->flags |= MAT_FLAG_SINGULAR;
-      memcpy( mat->inv, Identity, sizeof(Identity) );
-      return GL_FALSE;
-   }
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Matrix generation */
-/*@{*/
-
-/**
- * Generate a 4x4 transformation matrix from glRotate parameters, and
- * post-multiply the input matrix by it.
- *
- * \author
- * This function was contributed by Erich Boleyn (erich@uruk.org).
- * Optimizations contributed by Rudolf Opalla (rudi@khm.de).
- */
-void
-_math_matrix_rotate( GLmatrix *mat,
-		     GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
-{
-   GLfloat xx, yy, zz, xy, yz, zx, xs, ys, zs, one_c, s, c;
-   GLfloat m[16];
-   GLboolean optimized;
-
-   s = (GLfloat) sin( angle * DEG2RAD );
-   c = (GLfloat) cos( angle * DEG2RAD );
-
-   memcpy(m, Identity, sizeof(GLfloat)*16);
-   optimized = GL_FALSE;
-
-#define M(row,col)  m[col*4+row]
-
-   if (x == 0.0F) {
-      if (y == 0.0F) {
-         if (z != 0.0F) {
-            optimized = GL_TRUE;
-            /* rotate only around z-axis */
-            M(0,0) = c;
-            M(1,1) = c;
-            if (z < 0.0F) {
-               M(0,1) = s;
-               M(1,0) = -s;
-            }
-            else {
-               M(0,1) = -s;
-               M(1,0) = s;
-            }
-         }
-      }
-      else if (z == 0.0F) {
-         optimized = GL_TRUE;
-         /* rotate only around y-axis */
-         M(0,0) = c;
-         M(2,2) = c;
-         if (y < 0.0F) {
-            M(0,2) = -s;
-            M(2,0) = s;
-         }
-         else {
-            M(0,2) = s;
-            M(2,0) = -s;
-         }
-      }
-   }
-   else if (y == 0.0F) {
-      if (z == 0.0F) {
-         optimized = GL_TRUE;
-         /* rotate only around x-axis */
-         M(1,1) = c;
-         M(2,2) = c;
-         if (x < 0.0F) {
-            M(1,2) = s;
-            M(2,1) = -s;
-         }
-         else {
-            M(1,2) = -s;
-            M(2,1) = s;
-         }
-      }
-   }
-
-   if (!optimized) {
-      const GLfloat mag = SQRTF(x * x + y * y + z * z);
-
-      if (mag <= 1.0e-4) {
-         /* no rotation, leave mat as-is */
-         return;
-      }
-
-      x /= mag;
-      y /= mag;
-      z /= mag;
-
-
-      /*
-       *     Arbitrary axis rotation matrix.
-       *
-       *  This is composed of 5 matrices, Rz, Ry, T, Ry', Rz', multiplied
-       *  like so:  Rz * Ry * T * Ry' * Rz'.  T is the final rotation
-       *  (which is about the X-axis), and the two composite transforms
-       *  Ry' * Rz' and Rz * Ry are (respectively) the rotations necessary
-       *  from the arbitrary axis to the X-axis then back.  They are
-       *  all elementary rotations.
-       *
-       *  Rz' is a rotation about the Z-axis, to bring the axis vector
-       *  into the x-z plane.  Then Ry' is applied, rotating about the
-       *  Y-axis to bring the axis vector parallel with the X-axis.  The
-       *  rotation about the X-axis is then performed.  Ry and Rz are
-       *  simply the respective inverse transforms to bring the arbitrary
-       *  axis back to its original orientation.  The first transforms
-       *  Rz' and Ry' are considered inverses, since the data from the
-       *  arbitrary axis gives you info on how to get to it, not how
-       *  to get away from it, and an inverse must be applied.
-       *
-       *  The basic calculation used is to recognize that the arbitrary
-       *  axis vector (x, y, z), since it is of unit length, actually
-       *  represents the sines and cosines of the angles to rotate the
-       *  X-axis to the same orientation, with theta being the angle about
-       *  Z and phi the angle about Y (in the order described above)
-       *  as follows:
-       *
-       *  cos ( theta ) = x / sqrt ( 1 - z^2 )
-       *  sin ( theta ) = y / sqrt ( 1 - z^2 )
-       *
-       *  cos ( phi ) = sqrt ( 1 - z^2 )
-       *  sin ( phi ) = z
-       *
-       *  Note that cos ( phi ) can further be inserted to the above
-       *  formulas:
-       *
-       *  cos ( theta ) = x / cos ( phi )
-       *  sin ( theta ) = y / sin ( phi )
-       *
-       *  ...etc.  Because of those relations and the standard trigonometric
-       *  relations, it is pssible to reduce the transforms down to what
-       *  is used below.  It may be that any primary axis chosen will give the
-       *  same results (modulo a sign convention) using thie method.
-       *
-       *  Particularly nice is to notice that all divisions that might
-       *  have caused trouble when parallel to certain planes or
-       *  axis go away with care paid to reducing the expressions.
-       *  After checking, it does perform correctly under all cases, since
-       *  in all the cases of division where the denominator would have
-       *  been zero, the numerator would have been zero as well, giving
-       *  the expected result.
-       */
-
-      xx = x * x;
-      yy = y * y;
-      zz = z * z;
-      xy = x * y;
-      yz = y * z;
-      zx = z * x;
-      xs = x * s;
-      ys = y * s;
-      zs = z * s;
-      one_c = 1.0F - c;
-
-      /* We already hold the identity-matrix so we can skip some statements */
-      M(0,0) = (one_c * xx) + c;
-      M(0,1) = (one_c * xy) - zs;
-      M(0,2) = (one_c * zx) + ys;
-/*    M(0,3) = 0.0F; */
-
-      M(1,0) = (one_c * xy) + zs;
-      M(1,1) = (one_c * yy) + c;
-      M(1,2) = (one_c * yz) - xs;
-/*    M(1,3) = 0.0F; */
-
-      M(2,0) = (one_c * zx) - ys;
-      M(2,1) = (one_c * yz) + xs;
-      M(2,2) = (one_c * zz) + c;
-/*    M(2,3) = 0.0F; */
-
-/*
-      M(3,0) = 0.0F;
-      M(3,1) = 0.0F;
-      M(3,2) = 0.0F;
-      M(3,3) = 1.0F;
-*/
-   }
-#undef M
-
-   matrix_multf( mat, m, MAT_FLAG_ROTATION );
-}
-
-/**
- * Apply a perspective projection matrix.
- *
- * \param mat matrix to apply the projection.
- * \param left left clipping plane coordinate.
- * \param right right clipping plane coordinate.
- * \param bottom bottom clipping plane coordinate.
- * \param top top clipping plane coordinate.
- * \param nearval distance to the near clipping plane.
- * \param farval distance to the far clipping plane.
- *
- * Creates the projection matrix and multiplies it with \p mat, marking the
- * MAT_FLAG_PERSPECTIVE flag.
- */
-void
-_math_matrix_frustum( GLmatrix *mat,
-		      GLfloat left, GLfloat right,
-		      GLfloat bottom, GLfloat top,
-		      GLfloat nearval, GLfloat farval )
-{
-   GLfloat x, y, a, b, c, d;
-   GLfloat m[16];
-
-   x = (2.0F*nearval) / (right-left);
-   y = (2.0F*nearval) / (top-bottom);
-   a = (right+left) / (right-left);
-   b = (top+bottom) / (top-bottom);
-   c = -(farval+nearval) / ( farval-nearval);
-   d = -(2.0F*farval*nearval) / (farval-nearval);  /* error? */
-
-#define M(row,col)  m[col*4+row]
-   M(0,0) = x;     M(0,1) = 0.0F;  M(0,2) = a;      M(0,3) = 0.0F;
-   M(1,0) = 0.0F;  M(1,1) = y;     M(1,2) = b;      M(1,3) = 0.0F;
-   M(2,0) = 0.0F;  M(2,1) = 0.0F;  M(2,2) = c;      M(2,3) = d;
-   M(3,0) = 0.0F;  M(3,1) = 0.0F;  M(3,2) = -1.0F;  M(3,3) = 0.0F;
-#undef M
-
-   matrix_multf( mat, m, MAT_FLAG_PERSPECTIVE );
-}
-
-/**
- * Apply an orthographic projection matrix.
- *
- * \param mat matrix to apply the projection.
- * \param left left clipping plane coordinate.
- * \param right right clipping plane coordinate.
- * \param bottom bottom clipping plane coordinate.
- * \param top top clipping plane coordinate.
- * \param nearval distance to the near clipping plane.
- * \param farval distance to the far clipping plane.
- *
- * Creates the projection matrix and multiplies it with \p mat, marking the
- * MAT_FLAG_GENERAL_SCALE and MAT_FLAG_TRANSLATION flags.
- */
-void
-_math_matrix_ortho( GLmatrix *mat,
-		    GLfloat left, GLfloat right,
-		    GLfloat bottom, GLfloat top,
-		    GLfloat nearval, GLfloat farval )
-{
-   GLfloat m[16];
-
-#define M(row,col)  m[col*4+row]
-   M(0,0) = 2.0F / (right-left);
-   M(0,1) = 0.0F;
-   M(0,2) = 0.0F;
-   M(0,3) = -(right+left) / (right-left);
-
-   M(1,0) = 0.0F;
-   M(1,1) = 2.0F / (top-bottom);
-   M(1,2) = 0.0F;
-   M(1,3) = -(top+bottom) / (top-bottom);
-
-   M(2,0) = 0.0F;
-   M(2,1) = 0.0F;
-   M(2,2) = -2.0F / (farval-nearval);
-   M(2,3) = -(farval+nearval) / (farval-nearval);
-
-   M(3,0) = 0.0F;
-   M(3,1) = 0.0F;
-   M(3,2) = 0.0F;
-   M(3,3) = 1.0F;
-#undef M
-
-   matrix_multf( mat, m, (MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION));
-}
-
-/**
- * Multiply a matrix with a general scaling matrix.
- *
- * \param mat matrix.
- * \param x x axis scale factor.
- * \param y y axis scale factor.
- * \param z z axis scale factor.
- *
- * Multiplies in-place the elements of \p mat by the scale factors. Checks if
- * the scales factors are roughly the same, marking the MAT_FLAG_UNIFORM_SCALE
- * flag, or MAT_FLAG_GENERAL_SCALE. Marks the MAT_DIRTY_TYPE and
- * MAT_DIRTY_INVERSE dirty flags.
- */
-void
-_math_matrix_scale( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )
-{
-   GLfloat *m = mat->m;
-   m[0] *= x;   m[4] *= y;   m[8]  *= z;
-   m[1] *= x;   m[5] *= y;   m[9]  *= z;
-   m[2] *= x;   m[6] *= y;   m[10] *= z;
-   m[3] *= x;   m[7] *= y;   m[11] *= z;
-
-   if (FABSF(x - y) < 1e-8 && FABSF(x - z) < 1e-8)
-      mat->flags |= MAT_FLAG_UNIFORM_SCALE;
-   else
-      mat->flags |= MAT_FLAG_GENERAL_SCALE;
-
-   mat->flags |= (MAT_DIRTY_TYPE |
-		  MAT_DIRTY_INVERSE);
-}
-
-/**
- * Multiply a matrix with a translation matrix.
- *
- * \param mat matrix.
- * \param x translation vector x coordinate.
- * \param y translation vector y coordinate.
- * \param z translation vector z coordinate.
- *
- * Adds the translation coordinates to the elements of \p mat in-place.  Marks
- * the MAT_FLAG_TRANSLATION flag, and the MAT_DIRTY_TYPE and MAT_DIRTY_INVERSE
- * dirty flags.
- */
-void
-_math_matrix_translate( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )
-{
-   GLfloat *m = mat->m;
-   m[12] = m[0] * x + m[4] * y + m[8]  * z + m[12];
-   m[13] = m[1] * x + m[5] * y + m[9]  * z + m[13];
-   m[14] = m[2] * x + m[6] * y + m[10] * z + m[14];
-   m[15] = m[3] * x + m[7] * y + m[11] * z + m[15];
-
-   mat->flags |= (MAT_FLAG_TRANSLATION |
-		  MAT_DIRTY_TYPE |
-		  MAT_DIRTY_INVERSE);
-}
-
-
-/**
- * Set matrix to do viewport and depthrange mapping.
- * Transforms Normalized Device Coords to window/Z values.
- */
-void
-_math_matrix_viewport(GLmatrix *m, GLint x, GLint y, GLint width, GLint height,
-                      GLfloat zNear, GLfloat zFar, GLfloat depthMax)
-{
-   m->m[MAT_SX] = (GLfloat) width / 2.0F;
-   m->m[MAT_TX] = m->m[MAT_SX] + x;
-   m->m[MAT_SY] = (GLfloat) height / 2.0F;
-   m->m[MAT_TY] = m->m[MAT_SY] + y;
-   m->m[MAT_SZ] = depthMax * ((zFar - zNear) / 2.0F);
-   m->m[MAT_TZ] = depthMax * ((zFar - zNear) / 2.0F + zNear);
-   m->flags = MAT_FLAG_GENERAL_SCALE | MAT_FLAG_TRANSLATION;
-   m->type = MATRIX_3D_NO_ROT;
-}
-
-
-/**
- * Set a matrix to the identity matrix.
- *
- * \param mat matrix.
- *
- * Copies ::Identity into \p GLmatrix::m, and into GLmatrix::inv if not NULL.
- * Sets the matrix type to identity, and clear the dirty flags.
- */
-void
-_math_matrix_set_identity( GLmatrix *mat )
-{
-   memcpy( mat->m, Identity, 16*sizeof(GLfloat) );
-
-   if (mat->inv)
-      memcpy( mat->inv, Identity, 16*sizeof(GLfloat) );
-
-   mat->type = MATRIX_IDENTITY;
-   mat->flags &= ~(MAT_DIRTY_FLAGS|
-		   MAT_DIRTY_TYPE|
-		   MAT_DIRTY_INVERSE);
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Matrix analysis */
-/*@{*/
-
-#define ZERO(x) (1<<x)
-#define ONE(x)  (1<<(x+16))
-
-#define MASK_NO_TRX      (ZERO(12) | ZERO(13) | ZERO(14))
-#define MASK_NO_2D_SCALE ( ONE(0)  | ONE(5))
-
-#define MASK_IDENTITY    ( ONE(0)  | ZERO(4)  | ZERO(8)  | ZERO(12) |\
-			  ZERO(1)  |  ONE(5)  | ZERO(9)  | ZERO(13) |\
-			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\
-			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
-
-#define MASK_2D_NO_ROT   (           ZERO(4)  | ZERO(8)  |           \
-			  ZERO(1)  |            ZERO(9)  |           \
-			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\
-			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
-
-#define MASK_2D          (                      ZERO(8)  |           \
-			                        ZERO(9)  |           \
-			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\
-			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
-
-
-#define MASK_3D_NO_ROT   (           ZERO(4)  | ZERO(8)  |           \
-			  ZERO(1)  |            ZERO(9)  |           \
-			  ZERO(2)  | ZERO(6)  |                      \
-			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
-
-#define MASK_3D          (                                           \
-			                                             \
-			                                             \
-			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )
-
-
-#define MASK_PERSPECTIVE (           ZERO(4)  |            ZERO(12) |\
-			  ZERO(1)  |                       ZERO(13) |\
-			  ZERO(2)  | ZERO(6)  |                      \
-			  ZERO(3)  | ZERO(7)  |            ZERO(15) )
-
-#define SQ(x) ((x)*(x))
-
-/**
- * Determine type and flags from scratch.  
- *
- * \param mat matrix.
- * 
- * This is expensive enough to only want to do it once.
- */
-static void analyse_from_scratch( GLmatrix *mat )
-{
-   const GLfloat *m = mat->m;
-   GLuint mask = 0;
-   GLuint i;
-
-   for (i = 0 ; i < 16 ; i++) {
-      if (m[i] == 0.0) mask |= (1<<i);
-   }
-
-   if (m[0] == 1.0F) mask |= (1<<16);
-   if (m[5] == 1.0F) mask |= (1<<21);
-   if (m[10] == 1.0F) mask |= (1<<26);
-   if (m[15] == 1.0F) mask |= (1<<31);
-
-   mat->flags &= ~MAT_FLAGS_GEOMETRY;
-
-   /* Check for translation - no-one really cares
-    */
-   if ((mask & MASK_NO_TRX) != MASK_NO_TRX)
-      mat->flags |= MAT_FLAG_TRANSLATION;
-
-   /* Do the real work
-    */
-   if (mask == (GLuint) MASK_IDENTITY) {
-      mat->type = MATRIX_IDENTITY;
-   }
-   else if ((mask & MASK_2D_NO_ROT) == (GLuint) MASK_2D_NO_ROT) {
-      mat->type = MATRIX_2D_NO_ROT;
-
-      if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE)
-	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
-   }
-   else if ((mask & MASK_2D) == (GLuint) MASK_2D) {
-      GLfloat mm = DOT2(m, m);
-      GLfloat m4m4 = DOT2(m+4,m+4);
-      GLfloat mm4 = DOT2(m,m+4);
-
-      mat->type = MATRIX_2D;
-
-      /* Check for scale */
-      if (SQ(mm-1) > SQ(1e-6) ||
-	  SQ(m4m4-1) > SQ(1e-6))
-	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
-
-      /* Check for rotation */
-      if (SQ(mm4) > SQ(1e-6))
-	 mat->flags |= MAT_FLAG_GENERAL_3D;
-      else
-	 mat->flags |= MAT_FLAG_ROTATION;
-
-   }
-   else if ((mask & MASK_3D_NO_ROT) == (GLuint) MASK_3D_NO_ROT) {
-      mat->type = MATRIX_3D_NO_ROT;
-
-      /* Check for scale */
-      if (SQ(m[0]-m[5]) < SQ(1e-6) &&
-	  SQ(m[0]-m[10]) < SQ(1e-6)) {
-	 if (SQ(m[0]-1.0) > SQ(1e-6)) {
-	    mat->flags |= MAT_FLAG_UNIFORM_SCALE;
-         }
-      }
-      else {
-	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
-      }
-   }
-   else if ((mask & MASK_3D) == (GLuint) MASK_3D) {
-      GLfloat c1 = DOT3(m,m);
-      GLfloat c2 = DOT3(m+4,m+4);
-      GLfloat c3 = DOT3(m+8,m+8);
-      GLfloat d1 = DOT3(m, m+4);
-      GLfloat cp[3];
-
-      mat->type = MATRIX_3D;
-
-      /* Check for scale */
-      if (SQ(c1-c2) < SQ(1e-6) && SQ(c1-c3) < SQ(1e-6)) {
-	 if (SQ(c1-1.0) > SQ(1e-6))
-	    mat->flags |= MAT_FLAG_UNIFORM_SCALE;
-	 /* else no scale at all */
-      }
-      else {
-	 mat->flags |= MAT_FLAG_GENERAL_SCALE;
-      }
-
-      /* Check for rotation */
-      if (SQ(d1) < SQ(1e-6)) {
-	 CROSS3( cp, m, m+4 );
-	 SUB_3V( cp, cp, (m+8) );
-	 if (LEN_SQUARED_3FV(cp) < SQ(1e-6))
-	    mat->flags |= MAT_FLAG_ROTATION;
-	 else
-	    mat->flags |= MAT_FLAG_GENERAL_3D;
-      }
-      else {
-	 mat->flags |= MAT_FLAG_GENERAL_3D; /* shear, etc */
-      }
-   }
-   else if ((mask & MASK_PERSPECTIVE) == MASK_PERSPECTIVE && m[11]==-1.0F) {
-      mat->type = MATRIX_PERSPECTIVE;
-      mat->flags |= MAT_FLAG_GENERAL;
-   }
-   else {
-      mat->type = MATRIX_GENERAL;
-      mat->flags |= MAT_FLAG_GENERAL;
-   }
-}
-
-/**
- * Analyze a matrix given that its flags are accurate.
- * 
- * This is the more common operation, hopefully.
- */
-static void analyse_from_flags( GLmatrix *mat )
-{
-   const GLfloat *m = mat->m;
-
-   if (TEST_MAT_FLAGS(mat, 0)) {
-      mat->type = MATRIX_IDENTITY;
-   }
-   else if (TEST_MAT_FLAGS(mat, (MAT_FLAG_TRANSLATION |
-				 MAT_FLAG_UNIFORM_SCALE |
-				 MAT_FLAG_GENERAL_SCALE))) {
-      if ( m[10]==1.0F && m[14]==0.0F ) {
-	 mat->type = MATRIX_2D_NO_ROT;
-      }
-      else {
-	 mat->type = MATRIX_3D_NO_ROT;
-      }
-   }
-   else if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) {
-      if (                                 m[ 8]==0.0F
-            &&                             m[ 9]==0.0F
-            && m[2]==0.0F && m[6]==0.0F && m[10]==1.0F && m[14]==0.0F) {
-	 mat->type = MATRIX_2D;
-      }
-      else {
-	 mat->type = MATRIX_3D;
-      }
-   }
-   else if (                 m[4]==0.0F                 && m[12]==0.0F
-            && m[1]==0.0F                               && m[13]==0.0F
-            && m[2]==0.0F && m[6]==0.0F
-            && m[3]==0.0F && m[7]==0.0F && m[11]==-1.0F && m[15]==0.0F) {
-      mat->type = MATRIX_PERSPECTIVE;
-   }
-   else {
-      mat->type = MATRIX_GENERAL;
-   }
-}
-
-/**
- * Analyze and update a matrix.
- *
- * \param mat matrix.
- *
- * If the matrix type is dirty then calls either analyse_from_scratch() or
- * analyse_from_flags() to determine its type, according to whether the flags
- * are dirty or not, respectively. If the matrix has an inverse and it's dirty
- * then calls matrix_invert(). Finally clears the dirty flags.
- */
-void
-_math_matrix_analyse( GLmatrix *mat )
-{
-   if (mat->flags & MAT_DIRTY_TYPE) {
-      if (mat->flags & MAT_DIRTY_FLAGS)
-	 analyse_from_scratch( mat );
-      else
-	 analyse_from_flags( mat );
-   }
-
-   if (mat->inv && (mat->flags & MAT_DIRTY_INVERSE)) {
-      matrix_invert( mat );
-      mat->flags &= ~MAT_DIRTY_INVERSE;
-   }
-
-   mat->flags &= ~(MAT_DIRTY_FLAGS | MAT_DIRTY_TYPE);
-}
-
-/*@}*/
-
-
-/**
- * Test if the given matrix preserves vector lengths.
- */
-GLboolean
-_math_matrix_is_length_preserving( const GLmatrix *m )
-{
-   return TEST_MAT_FLAGS( m, MAT_FLAGS_LENGTH_PRESERVING);
-}
-
-
-/**
- * Test if the given matrix does any rotation.
- * (or perhaps if the upper-left 3x3 is non-identity)
- */
-GLboolean
-_math_matrix_has_rotation( const GLmatrix *m )
-{
-   if (m->flags & (MAT_FLAG_GENERAL |
-                   MAT_FLAG_ROTATION |
-                   MAT_FLAG_GENERAL_3D |
-                   MAT_FLAG_PERSPECTIVE))
-      return GL_TRUE;
-   else
-      return GL_FALSE;
-}
-
-
-GLboolean
-_math_matrix_is_general_scale( const GLmatrix *m )
-{
-   return (m->flags & MAT_FLAG_GENERAL_SCALE) ? GL_TRUE : GL_FALSE;
-}
-
-
-GLboolean
-_math_matrix_is_dirty( const GLmatrix *m )
-{
-   return (m->flags & MAT_DIRTY) ? GL_TRUE : GL_FALSE;
-}
-
-
-/**********************************************************************/
-/** \name Matrix setup */
-/*@{*/
-
-/**
- * Copy a matrix.
- *
- * \param to destination matrix.
- * \param from source matrix.
- *
- * Copies all fields in GLmatrix, creating an inverse array if necessary.
- */
-void
-_math_matrix_copy( GLmatrix *to, const GLmatrix *from )
-{
-   memcpy( to->m, from->m, sizeof(Identity) );
-   to->flags = from->flags;
-   to->type = from->type;
-
-   if (to->inv != 0) {
-      if (from->inv == 0) {
-	 matrix_invert( to );
-      }
-      else {
-	 memcpy(to->inv, from->inv, sizeof(GLfloat)*16);
-      }
-   }
-}
-
-/**
- * Loads a matrix array into GLmatrix.
- * 
- * \param m matrix array.
- * \param mat matrix.
- *
- * Copies \p m into GLmatrix::m and marks the MAT_FLAG_GENERAL and MAT_DIRTY
- * flags.
- */
-void
-_math_matrix_loadf( GLmatrix *mat, const GLfloat *m )
-{
-   memcpy( mat->m, m, 16*sizeof(GLfloat) );
-   mat->flags = (MAT_FLAG_GENERAL | MAT_DIRTY);
-}
-
-/**
- * Matrix constructor.
- *
- * \param m matrix.
- *
- * Initialize the GLmatrix fields.
- */
-void
-_math_matrix_ctr( GLmatrix *m )
-{
-   m->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
-   if (m->m)
-      memcpy( m->m, Identity, sizeof(Identity) );
-   m->inv = NULL;
-   m->type = MATRIX_IDENTITY;
-   m->flags = 0;
-}
-
-/**
- * Matrix destructor.
- *
- * \param m matrix.
- *
- * Frees the data in a GLmatrix.
- */
-void
-_math_matrix_dtr( GLmatrix *m )
-{
-   if (m->m) {
-      _mesa_align_free( m->m );
-      m->m = NULL;
-   }
-   if (m->inv) {
-      _mesa_align_free( m->inv );
-      m->inv = NULL;
-   }
-}
-
-/**
- * Allocate a matrix inverse.
- *
- * \param m matrix.
- *
- * Allocates the matrix inverse, GLmatrix::inv, and sets it to Identity.
- */
-void
-_math_matrix_alloc_inv( GLmatrix *m )
-{
-   if (!m->inv) {
-      m->inv = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
-      if (m->inv)
-         memcpy( m->inv, Identity, 16 * sizeof(GLfloat) );
-   }
-}
-
-/*@}*/
-
-
-/**********************************************************************/
-/** \name Matrix transpose */
-/*@{*/
-
-/**
- * Transpose a GLfloat matrix.
- *
- * \param to destination array.
- * \param from source array.
- */
-void
-_math_transposef( GLfloat to[16], const GLfloat from[16] )
-{
-   to[0] = from[0];
-   to[1] = from[4];
-   to[2] = from[8];
-   to[3] = from[12];
-   to[4] = from[1];
-   to[5] = from[5];
-   to[6] = from[9];
-   to[7] = from[13];
-   to[8] = from[2];
-   to[9] = from[6];
-   to[10] = from[10];
-   to[11] = from[14];
-   to[12] = from[3];
-   to[13] = from[7];
-   to[14] = from[11];
-   to[15] = from[15];
-}
-
-/**
- * Transpose a GLdouble matrix.
- *
- * \param to destination array.
- * \param from source array.
- */
-void
-_math_transposed( GLdouble to[16], const GLdouble from[16] )
-{
-   to[0] = from[0];
-   to[1] = from[4];
-   to[2] = from[8];
-   to[3] = from[12];
-   to[4] = from[1];
-   to[5] = from[5];
-   to[6] = from[9];
-   to[7] = from[13];
-   to[8] = from[2];
-   to[9] = from[6];
-   to[10] = from[10];
-   to[11] = from[14];
-   to[12] = from[3];
-   to[13] = from[7];
-   to[14] = from[11];
-   to[15] = from[15];
-}
-
-/**
- * Transpose a GLdouble matrix and convert to GLfloat.
- *
- * \param to destination array.
- * \param from source array.
- */
-void
-_math_transposefd( GLfloat to[16], const GLdouble from[16] )
-{
-   to[0] = (GLfloat) from[0];
-   to[1] = (GLfloat) from[4];
-   to[2] = (GLfloat) from[8];
-   to[3] = (GLfloat) from[12];
-   to[4] = (GLfloat) from[1];
-   to[5] = (GLfloat) from[5];
-   to[6] = (GLfloat) from[9];
-   to[7] = (GLfloat) from[13];
-   to[8] = (GLfloat) from[2];
-   to[9] = (GLfloat) from[6];
-   to[10] = (GLfloat) from[10];
-   to[11] = (GLfloat) from[14];
-   to[12] = (GLfloat) from[3];
-   to[13] = (GLfloat) from[7];
-   to[14] = (GLfloat) from[11];
-   to[15] = (GLfloat) from[15];
-}
-
-/*@}*/
-
-
-/**
- * Transform a 4-element row vector (1x4 matrix) by a 4x4 matrix.  This
- * function is used for transforming clipping plane equations and spotlight
- * directions.
- * Mathematically,  u = v * m.
- * Input:  v - input vector
- *         m - transformation matrix
- * Output:  u - transformed vector
- */
-void
-_mesa_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )
-{
-   const GLfloat v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
-#define M(row,col)  m[row + col*4]
-   u[0] = v0 * M(0,0) + v1 * M(1,0) + v2 * M(2,0) + v3 * M(3,0);
-   u[1] = v0 * M(0,1) + v1 * M(1,1) + v2 * M(2,1) + v3 * M(3,1);
-   u[2] = v0 * M(0,2) + v1 * M(1,2) + v2 * M(2,2) + v3 * M(3,2);
-   u[3] = v0 * M(0,3) + v1 * M(1,3) + v2 * M(2,3) + v3 * M(3,3);
-#undef M
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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 m_matrix.c

+ * Matrix operations.

+ *

+ * \note

+ * -# 4x4 transformation matrices are stored in memory in column major order.

+ * -# Points/vertices are to be thought of as column vectors.

+ * -# Transformation of a point p by a matrix M is: p' = M * p

+ */

+

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/macros.h"

+

+#include "m_matrix.h"

+

+

+/**

+ * \defgroup MatFlags MAT_FLAG_XXX-flags

+ *

+ * Bitmasks to indicate different kinds of 4x4 matrices in GLmatrix::flags

+ * It would be nice to make all these flags private to m_matrix.c

+ */

+/*@{*/

+#define MAT_FLAG_IDENTITY       0     /**< is an identity matrix flag.

+                                       *   (Not actually used - the identity

+                                       *   matrix is identified by the absense

+                                       *   of all other flags.)

+                                       */

+#define MAT_FLAG_GENERAL        0x1   /**< is a general matrix flag */

+#define MAT_FLAG_ROTATION       0x2   /**< is a rotation matrix flag */

+#define MAT_FLAG_TRANSLATION    0x4   /**< is a translation matrix flag */

+#define MAT_FLAG_UNIFORM_SCALE  0x8   /**< is an uniform scaling matrix flag */

+#define MAT_FLAG_GENERAL_SCALE  0x10  /**< is a general scaling matrix flag */

+#define MAT_FLAG_GENERAL_3D     0x20  /**< general 3D matrix flag */

+#define MAT_FLAG_PERSPECTIVE    0x40  /**< is a perspective proj matrix flag */

+#define MAT_FLAG_SINGULAR       0x80  /**< is a singular matrix flag */

+#define MAT_DIRTY_TYPE          0x100  /**< matrix type is dirty */

+#define MAT_DIRTY_FLAGS         0x200  /**< matrix flags are dirty */

+#define MAT_DIRTY_INVERSE       0x400  /**< matrix inverse is dirty */

+

+/** angle preserving matrix flags mask */

+#define MAT_FLAGS_ANGLE_PRESERVING (MAT_FLAG_ROTATION | \

+				    MAT_FLAG_TRANSLATION | \

+				    MAT_FLAG_UNIFORM_SCALE)

+

+/** geometry related matrix flags mask */

+#define MAT_FLAGS_GEOMETRY (MAT_FLAG_GENERAL | \

+			    MAT_FLAG_ROTATION | \

+			    MAT_FLAG_TRANSLATION | \

+			    MAT_FLAG_UNIFORM_SCALE | \

+			    MAT_FLAG_GENERAL_SCALE | \

+			    MAT_FLAG_GENERAL_3D | \

+			    MAT_FLAG_PERSPECTIVE | \

+	                    MAT_FLAG_SINGULAR)

+

+/** length preserving matrix flags mask */

+#define MAT_FLAGS_LENGTH_PRESERVING (MAT_FLAG_ROTATION | \

+				     MAT_FLAG_TRANSLATION)

+

+

+/** 3D (non-perspective) matrix flags mask */

+#define MAT_FLAGS_3D (MAT_FLAG_ROTATION | \

+		      MAT_FLAG_TRANSLATION | \

+		      MAT_FLAG_UNIFORM_SCALE | \

+		      MAT_FLAG_GENERAL_SCALE | \

+		      MAT_FLAG_GENERAL_3D)

+

+/** dirty matrix flags mask */

+#define MAT_DIRTY          (MAT_DIRTY_TYPE | \

+			    MAT_DIRTY_FLAGS | \

+			    MAT_DIRTY_INVERSE)

+

+/*@}*/

+

+

+/** 

+ * Test geometry related matrix flags.

+ * 

+ * \param mat a pointer to a GLmatrix structure.

+ * \param a flags mask.

+ *

+ * \returns non-zero if all geometry related matrix flags are contained within

+ * the mask, or zero otherwise.

+ */ 

+#define TEST_MAT_FLAGS(mat, a)  \

+    ((MAT_FLAGS_GEOMETRY & (~(a)) & ((mat)->flags) ) == 0)

+

+

+

+/**

+ * Names of the corresponding GLmatrixtype values.

+ */

+static const char *types[] = {

+   "MATRIX_GENERAL",

+   "MATRIX_IDENTITY",

+   "MATRIX_3D_NO_ROT",

+   "MATRIX_PERSPECTIVE",

+   "MATRIX_2D",

+   "MATRIX_2D_NO_ROT",

+   "MATRIX_3D"

+};

+

+

+/**

+ * Identity matrix.

+ */

+static GLfloat Identity[16] = {

+   1.0, 0.0, 0.0, 0.0,

+   0.0, 1.0, 0.0, 0.0,

+   0.0, 0.0, 1.0, 0.0,

+   0.0, 0.0, 0.0, 1.0

+};

+

+

+

+/**********************************************************************/

+/** \name Matrix multiplication */

+/*@{*/

+

+#define A(row,col)  a[(col<<2)+row]

+#define B(row,col)  b[(col<<2)+row]

+#define P(row,col)  product[(col<<2)+row]

+

+/**

+ * Perform a full 4x4 matrix multiplication.

+ *

+ * \param a matrix.

+ * \param b matrix.

+ * \param product will receive the product of \p a and \p b.

+ *

+ * \warning Is assumed that \p product != \p b. \p product == \p a is allowed.

+ *

+ * \note KW: 4*16 = 64 multiplications

+ * 

+ * \author This \c matmul was contributed by Thomas Malik

+ */

+static void matmul4( GLfloat *product, const GLfloat *a, const GLfloat *b )

+{

+   GLint i;

+   for (i = 0; i < 4; i++) {

+      const GLfloat ai0=A(i,0),  ai1=A(i,1),  ai2=A(i,2),  ai3=A(i,3);

+      P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0) + ai3 * B(3,0);

+      P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1) + ai3 * B(3,1);

+      P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2) + ai3 * B(3,2);

+      P(i,3) = ai0 * B(0,3) + ai1 * B(1,3) + ai2 * B(2,3) + ai3 * B(3,3);

+   }

+}

+

+/**

+ * Multiply two matrices known to occupy only the top three rows, such

+ * as typical model matrices, and orthogonal matrices.

+ *

+ * \param a matrix.

+ * \param b matrix.

+ * \param product will receive the product of \p a and \p b.

+ */

+static void matmul34( GLfloat *product, const GLfloat *a, const GLfloat *b )

+{

+   GLint i;

+   for (i = 0; i < 3; i++) {

+      const GLfloat ai0=A(i,0),  ai1=A(i,1),  ai2=A(i,2),  ai3=A(i,3);

+      P(i,0) = ai0 * B(0,0) + ai1 * B(1,0) + ai2 * B(2,0);

+      P(i,1) = ai0 * B(0,1) + ai1 * B(1,1) + ai2 * B(2,1);

+      P(i,2) = ai0 * B(0,2) + ai1 * B(1,2) + ai2 * B(2,2);

+      P(i,3) = ai0 * B(0,3) + ai1 * B(1,3) + ai2 * B(2,3) + ai3;

+   }

+   P(3,0) = 0;

+   P(3,1) = 0;

+   P(3,2) = 0;

+   P(3,3) = 1;

+}

+

+#undef A

+#undef B

+#undef P

+

+/**

+ * Multiply a matrix by an array of floats with known properties.

+ *

+ * \param mat pointer to a GLmatrix structure containing the left multiplication

+ * matrix, and that will receive the product result.

+ * \param m right multiplication matrix array.

+ * \param flags flags of the matrix \p m.

+ * 

+ * Joins both flags and marks the type and inverse as dirty.  Calls matmul34()

+ * if both matrices are 3D, or matmul4() otherwise.

+ */

+static void matrix_multf( GLmatrix *mat, const GLfloat *m, GLuint flags )

+{

+   mat->flags |= (flags | MAT_DIRTY_TYPE | MAT_DIRTY_INVERSE);

+

+   if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D))

+      matmul34( mat->m, mat->m, m );

+   else

+      matmul4( mat->m, mat->m, m );

+}

+

+/**

+ * Matrix multiplication.

+ *

+ * \param dest destination matrix.

+ * \param a left matrix.

+ * \param b right matrix.

+ * 

+ * Joins both flags and marks the type and inverse as dirty.  Calls matmul34()

+ * if both matrices are 3D, or matmul4() otherwise.

+ */

+void

+_math_matrix_mul_matrix( GLmatrix *dest, const GLmatrix *a, const GLmatrix *b )

+{

+   dest->flags = (a->flags |

+		  b->flags |

+		  MAT_DIRTY_TYPE |

+		  MAT_DIRTY_INVERSE);

+

+   if (TEST_MAT_FLAGS(dest, MAT_FLAGS_3D))

+      matmul34( dest->m, a->m, b->m );

+   else

+      matmul4( dest->m, a->m, b->m );

+}

+

+/**

+ * Matrix multiplication.

+ *

+ * \param dest left and destination matrix.

+ * \param m right matrix array.

+ * 

+ * Marks the matrix flags with general flag, and type and inverse dirty flags.

+ * Calls matmul4() for the multiplication.

+ */

+void

+_math_matrix_mul_floats( GLmatrix *dest, const GLfloat *m )

+{

+   dest->flags |= (MAT_FLAG_GENERAL |

+		   MAT_DIRTY_TYPE |

+		   MAT_DIRTY_INVERSE |

+                   MAT_DIRTY_FLAGS);

+

+   matmul4( dest->m, dest->m, m );

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Matrix output */

+/*@{*/

+

+/**

+ * Print a matrix array.

+ *

+ * \param m matrix array.

+ *

+ * Called by _math_matrix_print() to print a matrix or its inverse.

+ */

+static void print_matrix_floats( const GLfloat m[16] )

+{

+   int i;

+   for (i=0;i<4;i++) {

+      _mesa_debug(NULL,"\t%f %f %f %f\n", m[i], m[4+i], m[8+i], m[12+i] );

+   }

+}

+

+/**

+ * Dumps the contents of a GLmatrix structure.

+ * 

+ * \param m pointer to the GLmatrix structure.

+ */

+void

+_math_matrix_print( const GLmatrix *m )

+{

+   _mesa_debug(NULL, "Matrix type: %s, flags: %x\n", types[m->type], m->flags);

+   print_matrix_floats(m->m);

+   _mesa_debug(NULL, "Inverse: \n");

+   if (m->inv) {

+      GLfloat prod[16];

+      print_matrix_floats(m->inv);

+      matmul4(prod, m->m, m->inv);

+      _mesa_debug(NULL, "Mat * Inverse:\n");

+      print_matrix_floats(prod);

+   }

+   else {

+      _mesa_debug(NULL, "  - not available\n");

+   }

+}

+

+/*@}*/

+

+

+/**

+ * References an element of 4x4 matrix.

+ *

+ * \param m matrix array.

+ * \param c column of the desired element.

+ * \param r row of the desired element.

+ * 

+ * \return value of the desired element.

+ *

+ * Calculate the linear storage index of the element and references it. 

+ */

+#define MAT(m,r,c) (m)[(c)*4+(r)]

+

+

+/**********************************************************************/

+/** \name Matrix inversion */

+/*@{*/

+

+/**

+ * Swaps the values of two floating pointer variables.

+ *

+ * Used by invert_matrix_general() to swap the row pointers.

+ */

+#define SWAP_ROWS(a, b) { GLfloat *_tmp = a; (a)=(b); (b)=_tmp; }

+

+/**

+ * Compute inverse of 4x4 transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).

+ * 

+ * \author

+ * Code contributed by Jacques Leroy jle@star.be

+ *

+ * Calculates the inverse matrix by performing the gaussian matrix reduction

+ * with partial pivoting followed by back/substitution with the loops manually

+ * unrolled.

+ */

+static GLboolean invert_matrix_general( GLmatrix *mat )

+{

+   const GLfloat *m = mat->m;

+   GLfloat *out = mat->inv;

+   GLfloat wtmp[4][8];

+   GLfloat m0, m1, m2, m3, s;

+   GLfloat *r0, *r1, *r2, *r3;

+

+   r0 = wtmp[0], r1 = wtmp[1], r2 = wtmp[2], r3 = wtmp[3];

+

+   r0[0] = MAT(m,0,0), r0[1] = MAT(m,0,1),

+   r0[2] = MAT(m,0,2), r0[3] = MAT(m,0,3),

+   r0[4] = 1.0, r0[5] = r0[6] = r0[7] = 0.0,

+

+   r1[0] = MAT(m,1,0), r1[1] = MAT(m,1,1),

+   r1[2] = MAT(m,1,2), r1[3] = MAT(m,1,3),

+   r1[5] = 1.0, r1[4] = r1[6] = r1[7] = 0.0,

+

+   r2[0] = MAT(m,2,0), r2[1] = MAT(m,2,1),

+   r2[2] = MAT(m,2,2), r2[3] = MAT(m,2,3),

+   r2[6] = 1.0, r2[4] = r2[5] = r2[7] = 0.0,

+

+   r3[0] = MAT(m,3,0), r3[1] = MAT(m,3,1),

+   r3[2] = MAT(m,3,2), r3[3] = MAT(m,3,3),

+   r3[7] = 1.0, r3[4] = r3[5] = r3[6] = 0.0;

+

+   /* choose pivot - or die */

+   if (FABSF(r3[0])>FABSF(r2[0])) SWAP_ROWS(r3, r2);

+   if (FABSF(r2[0])>FABSF(r1[0])) SWAP_ROWS(r2, r1);

+   if (FABSF(r1[0])>FABSF(r0[0])) SWAP_ROWS(r1, r0);

+   if (0.0 == r0[0])  return GL_FALSE;

+

+   /* eliminate first variable     */

+   m1 = r1[0]/r0[0]; m2 = r2[0]/r0[0]; m3 = r3[0]/r0[0];

+   s = r0[1]; r1[1] -= m1 * s; r2[1] -= m2 * s; r3[1] -= m3 * s;

+   s = r0[2]; r1[2] -= m1 * s; r2[2] -= m2 * s; r3[2] -= m3 * s;

+   s = r0[3]; r1[3] -= m1 * s; r2[3] -= m2 * s; r3[3] -= m3 * s;

+   s = r0[4];

+   if (s != 0.0) { r1[4] -= m1 * s; r2[4] -= m2 * s; r3[4] -= m3 * s; }

+   s = r0[5];

+   if (s != 0.0) { r1[5] -= m1 * s; r2[5] -= m2 * s; r3[5] -= m3 * s; }

+   s = r0[6];

+   if (s != 0.0) { r1[6] -= m1 * s; r2[6] -= m2 * s; r3[6] -= m3 * s; }

+   s = r0[7];

+   if (s != 0.0) { r1[7] -= m1 * s; r2[7] -= m2 * s; r3[7] -= m3 * s; }

+

+   /* choose pivot - or die */

+   if (FABSF(r3[1])>FABSF(r2[1])) SWAP_ROWS(r3, r2);

+   if (FABSF(r2[1])>FABSF(r1[1])) SWAP_ROWS(r2, r1);

+   if (0.0 == r1[1])  return GL_FALSE;

+

+   /* eliminate second variable */

+   m2 = r2[1]/r1[1]; m3 = r3[1]/r1[1];

+   r2[2] -= m2 * r1[2]; r3[2] -= m3 * r1[2];

+   r2[3] -= m2 * r1[3]; r3[3] -= m3 * r1[3];

+   s = r1[4]; if (0.0 != s) { r2[4] -= m2 * s; r3[4] -= m3 * s; }

+   s = r1[5]; if (0.0 != s) { r2[5] -= m2 * s; r3[5] -= m3 * s; }

+   s = r1[6]; if (0.0 != s) { r2[6] -= m2 * s; r3[6] -= m3 * s; }

+   s = r1[7]; if (0.0 != s) { r2[7] -= m2 * s; r3[7] -= m3 * s; }

+

+   /* choose pivot - or die */

+   if (FABSF(r3[2])>FABSF(r2[2])) SWAP_ROWS(r3, r2);

+   if (0.0 == r2[2])  return GL_FALSE;

+

+   /* eliminate third variable */

+   m3 = r3[2]/r2[2];

+   r3[3] -= m3 * r2[3], r3[4] -= m3 * r2[4],

+   r3[5] -= m3 * r2[5], r3[6] -= m3 * r2[6],

+   r3[7] -= m3 * r2[7];

+

+   /* last check */

+   if (0.0 == r3[3]) return GL_FALSE;

+

+   s = 1.0F/r3[3];             /* now back substitute row 3 */

+   r3[4] *= s; r3[5] *= s; r3[6] *= s; r3[7] *= s;

+

+   m2 = r2[3];                 /* now back substitute row 2 */

+   s  = 1.0F/r2[2];

+   r2[4] = s * (r2[4] - r3[4] * m2), r2[5] = s * (r2[5] - r3[5] * m2),

+   r2[6] = s * (r2[6] - r3[6] * m2), r2[7] = s * (r2[7] - r3[7] * m2);

+   m1 = r1[3];

+   r1[4] -= r3[4] * m1, r1[5] -= r3[5] * m1,

+   r1[6] -= r3[6] * m1, r1[7] -= r3[7] * m1;

+   m0 = r0[3];

+   r0[4] -= r3[4] * m0, r0[5] -= r3[5] * m0,

+   r0[6] -= r3[6] * m0, r0[7] -= r3[7] * m0;

+

+   m1 = r1[2];                 /* now back substitute row 1 */

+   s  = 1.0F/r1[1];

+   r1[4] = s * (r1[4] - r2[4] * m1), r1[5] = s * (r1[5] - r2[5] * m1),

+   r1[6] = s * (r1[6] - r2[6] * m1), r1[7] = s * (r1[7] - r2[7] * m1);

+   m0 = r0[2];

+   r0[4] -= r2[4] * m0, r0[5] -= r2[5] * m0,

+   r0[6] -= r2[6] * m0, r0[7] -= r2[7] * m0;

+

+   m0 = r0[1];                 /* now back substitute row 0 */

+   s  = 1.0F/r0[0];

+   r0[4] = s * (r0[4] - r1[4] * m0), r0[5] = s * (r0[5] - r1[5] * m0),

+   r0[6] = s * (r0[6] - r1[6] * m0), r0[7] = s * (r0[7] - r1[7] * m0);

+

+   MAT(out,0,0) = r0[4]; MAT(out,0,1) = r0[5],

+   MAT(out,0,2) = r0[6]; MAT(out,0,3) = r0[7],

+   MAT(out,1,0) = r1[4]; MAT(out,1,1) = r1[5],

+   MAT(out,1,2) = r1[6]; MAT(out,1,3) = r1[7],

+   MAT(out,2,0) = r2[4]; MAT(out,2,1) = r2[5],

+   MAT(out,2,2) = r2[6]; MAT(out,2,3) = r2[7],

+   MAT(out,3,0) = r3[4]; MAT(out,3,1) = r3[5],

+   MAT(out,3,2) = r3[6]; MAT(out,3,3) = r3[7];

+

+   return GL_TRUE;

+}

+#undef SWAP_ROWS

+

+/**

+ * Compute inverse of a general 3d transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).

+ *

+ * \author Adapted from graphics gems II.

+ *

+ * Calculates the inverse of the upper left by first calculating its

+ * determinant and multiplying it to the symmetric adjust matrix of each

+ * element. Finally deals with the translation part by transforming the

+ * original translation vector using by the calculated submatrix inverse.

+ */

+static GLboolean invert_matrix_3d_general( GLmatrix *mat )

+{

+   const GLfloat *in = mat->m;

+   GLfloat *out = mat->inv;

+   GLfloat pos, neg, t;

+   GLfloat det;

+

+   /* Calculate the determinant of upper left 3x3 submatrix and

+    * determine if the matrix is singular.

+    */

+   pos = neg = 0.0;

+   t =  MAT(in,0,0) * MAT(in,1,1) * MAT(in,2,2);

+   if (t >= 0.0) pos += t; else neg += t;

+

+   t =  MAT(in,1,0) * MAT(in,2,1) * MAT(in,0,2);

+   if (t >= 0.0) pos += t; else neg += t;

+

+   t =  MAT(in,2,0) * MAT(in,0,1) * MAT(in,1,2);

+   if (t >= 0.0) pos += t; else neg += t;

+

+   t = -MAT(in,2,0) * MAT(in,1,1) * MAT(in,0,2);

+   if (t >= 0.0) pos += t; else neg += t;

+

+   t = -MAT(in,1,0) * MAT(in,0,1) * MAT(in,2,2);

+   if (t >= 0.0) pos += t; else neg += t;

+

+   t = -MAT(in,0,0) * MAT(in,2,1) * MAT(in,1,2);

+   if (t >= 0.0) pos += t; else neg += t;

+

+   det = pos + neg;

+

+   if (det*det < 1e-25)

+      return GL_FALSE;

+

+   det = 1.0F / det;

+   MAT(out,0,0) = (  (MAT(in,1,1)*MAT(in,2,2) - MAT(in,2,1)*MAT(in,1,2) )*det);

+   MAT(out,0,1) = (- (MAT(in,0,1)*MAT(in,2,2) - MAT(in,2,1)*MAT(in,0,2) )*det);

+   MAT(out,0,2) = (  (MAT(in,0,1)*MAT(in,1,2) - MAT(in,1,1)*MAT(in,0,2) )*det);

+   MAT(out,1,0) = (- (MAT(in,1,0)*MAT(in,2,2) - MAT(in,2,0)*MAT(in,1,2) )*det);

+   MAT(out,1,1) = (  (MAT(in,0,0)*MAT(in,2,2) - MAT(in,2,0)*MAT(in,0,2) )*det);

+   MAT(out,1,2) = (- (MAT(in,0,0)*MAT(in,1,2) - MAT(in,1,0)*MAT(in,0,2) )*det);

+   MAT(out,2,0) = (  (MAT(in,1,0)*MAT(in,2,1) - MAT(in,2,0)*MAT(in,1,1) )*det);

+   MAT(out,2,1) = (- (MAT(in,0,0)*MAT(in,2,1) - MAT(in,2,0)*MAT(in,0,1) )*det);

+   MAT(out,2,2) = (  (MAT(in,0,0)*MAT(in,1,1) - MAT(in,1,0)*MAT(in,0,1) )*det);

+

+   /* Do the translation part */

+   MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) +

+		     MAT(in,1,3) * MAT(out,0,1) +

+		     MAT(in,2,3) * MAT(out,0,2) );

+   MAT(out,1,3) = - (MAT(in,0,3) * MAT(out,1,0) +

+		     MAT(in,1,3) * MAT(out,1,1) +

+		     MAT(in,2,3) * MAT(out,1,2) );

+   MAT(out,2,3) = - (MAT(in,0,3) * MAT(out,2,0) +

+		     MAT(in,1,3) * MAT(out,2,1) +

+		     MAT(in,2,3) * MAT(out,2,2) );

+

+   return GL_TRUE;

+}

+

+/**

+ * Compute inverse of a 3d transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).

+ *

+ * If the matrix is not an angle preserving matrix then calls

+ * invert_matrix_3d_general for the actual calculation. Otherwise calculates

+ * the inverse matrix analyzing and inverting each of the scaling, rotation and

+ * translation parts.

+ */

+static GLboolean invert_matrix_3d( GLmatrix *mat )

+{

+   const GLfloat *in = mat->m;

+   GLfloat *out = mat->inv;

+

+   if (!TEST_MAT_FLAGS(mat, MAT_FLAGS_ANGLE_PRESERVING)) {

+      return invert_matrix_3d_general( mat );

+   }

+

+   if (mat->flags & MAT_FLAG_UNIFORM_SCALE) {

+      GLfloat scale = (MAT(in,0,0) * MAT(in,0,0) +

+                       MAT(in,0,1) * MAT(in,0,1) +

+                       MAT(in,0,2) * MAT(in,0,2));

+

+      if (scale == 0.0)

+         return GL_FALSE;

+

+      scale = 1.0F / scale;

+

+      /* Transpose and scale the 3 by 3 upper-left submatrix. */

+      MAT(out,0,0) = scale * MAT(in,0,0);

+      MAT(out,1,0) = scale * MAT(in,0,1);

+      MAT(out,2,0) = scale * MAT(in,0,2);

+      MAT(out,0,1) = scale * MAT(in,1,0);

+      MAT(out,1,1) = scale * MAT(in,1,1);

+      MAT(out,2,1) = scale * MAT(in,1,2);

+      MAT(out,0,2) = scale * MAT(in,2,0);

+      MAT(out,1,2) = scale * MAT(in,2,1);

+      MAT(out,2,2) = scale * MAT(in,2,2);

+   }

+   else if (mat->flags & MAT_FLAG_ROTATION) {

+      /* Transpose the 3 by 3 upper-left submatrix. */

+      MAT(out,0,0) = MAT(in,0,0);

+      MAT(out,1,0) = MAT(in,0,1);

+      MAT(out,2,0) = MAT(in,0,2);

+      MAT(out,0,1) = MAT(in,1,0);

+      MAT(out,1,1) = MAT(in,1,1);

+      MAT(out,2,1) = MAT(in,1,2);

+      MAT(out,0,2) = MAT(in,2,0);

+      MAT(out,1,2) = MAT(in,2,1);

+      MAT(out,2,2) = MAT(in,2,2);

+   }

+   else {

+      /* pure translation */

+      memcpy( out, Identity, sizeof(Identity) );

+      MAT(out,0,3) = - MAT(in,0,3);

+      MAT(out,1,3) = - MAT(in,1,3);

+      MAT(out,2,3) = - MAT(in,2,3);

+      return GL_TRUE;

+   }

+

+   if (mat->flags & MAT_FLAG_TRANSLATION) {

+      /* Do the translation part */

+      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0) +

+			MAT(in,1,3) * MAT(out,0,1) +

+			MAT(in,2,3) * MAT(out,0,2) );

+      MAT(out,1,3) = - (MAT(in,0,3) * MAT(out,1,0) +

+			MAT(in,1,3) * MAT(out,1,1) +

+			MAT(in,2,3) * MAT(out,1,2) );

+      MAT(out,2,3) = - (MAT(in,0,3) * MAT(out,2,0) +

+			MAT(in,1,3) * MAT(out,2,1) +

+			MAT(in,2,3) * MAT(out,2,2) );

+   }

+   else {

+      MAT(out,0,3) = MAT(out,1,3) = MAT(out,2,3) = 0.0;

+   }

+

+   return GL_TRUE;

+}

+

+/**

+ * Compute inverse of an identity transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return always GL_TRUE.

+ *

+ * Simply copies Identity into GLmatrix::inv.

+ */

+static GLboolean invert_matrix_identity( GLmatrix *mat )

+{

+   memcpy( mat->inv, Identity, sizeof(Identity) );

+   return GL_TRUE;

+}

+

+/**

+ * Compute inverse of a no-rotation 3d transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).

+ *

+ * Calculates the 

+ */

+static GLboolean invert_matrix_3d_no_rot( GLmatrix *mat )

+{

+   const GLfloat *in = mat->m;

+   GLfloat *out = mat->inv;

+

+   if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0 || MAT(in,2,2) == 0 )

+      return GL_FALSE;

+

+   memcpy( out, Identity, 16 * sizeof(GLfloat) );

+   MAT(out,0,0) = 1.0F / MAT(in,0,0);

+   MAT(out,1,1) = 1.0F / MAT(in,1,1);

+   MAT(out,2,2) = 1.0F / MAT(in,2,2);

+

+   if (mat->flags & MAT_FLAG_TRANSLATION) {

+      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0));

+      MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1));

+      MAT(out,2,3) = - (MAT(in,2,3) * MAT(out,2,2));

+   }

+

+   return GL_TRUE;

+}

+

+/**

+ * Compute inverse of a no-rotation 2d transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).

+ *

+ * Calculates the inverse matrix by applying the inverse scaling and

+ * translation to the identity matrix.

+ */

+static GLboolean invert_matrix_2d_no_rot( GLmatrix *mat )

+{

+   const GLfloat *in = mat->m;

+   GLfloat *out = mat->inv;

+

+   if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0)

+      return GL_FALSE;

+

+   memcpy( out, Identity, 16 * sizeof(GLfloat) );

+   MAT(out,0,0) = 1.0F / MAT(in,0,0);

+   MAT(out,1,1) = 1.0F / MAT(in,1,1);

+

+   if (mat->flags & MAT_FLAG_TRANSLATION) {

+      MAT(out,0,3) = - (MAT(in,0,3) * MAT(out,0,0));

+      MAT(out,1,3) = - (MAT(in,1,3) * MAT(out,1,1));

+   }

+

+   return GL_TRUE;

+}

+

+#if 0

+/* broken */

+static GLboolean invert_matrix_perspective( GLmatrix *mat )

+{

+   const GLfloat *in = mat->m;

+   GLfloat *out = mat->inv;

+

+   if (MAT(in,2,3) == 0)

+      return GL_FALSE;

+

+   memcpy( out, Identity, 16 * sizeof(GLfloat) );

+

+   MAT(out,0,0) = 1.0F / MAT(in,0,0);

+   MAT(out,1,1) = 1.0F / MAT(in,1,1);

+

+   MAT(out,0,3) = MAT(in,0,2);

+   MAT(out,1,3) = MAT(in,1,2);

+

+   MAT(out,2,2) = 0;

+   MAT(out,2,3) = -1;

+

+   MAT(out,3,2) = 1.0F / MAT(in,2,3);

+   MAT(out,3,3) = MAT(in,2,2) * MAT(out,3,2);

+

+   return GL_TRUE;

+}

+#endif

+

+/**

+ * Matrix inversion function pointer type.

+ */

+typedef GLboolean (*inv_mat_func)( GLmatrix *mat );

+

+/**

+ * Table of the matrix inversion functions according to the matrix type.

+ */

+static inv_mat_func inv_mat_tab[7] = {

+   invert_matrix_general,

+   invert_matrix_identity,

+   invert_matrix_3d_no_rot,

+#if 0

+   /* Don't use this function for now - it fails when the projection matrix

+    * is premultiplied by a translation (ala Chromium's tilesort SPU).

+    */

+   invert_matrix_perspective,

+#else

+   invert_matrix_general,

+#endif

+   invert_matrix_3d,		/* lazy! */

+   invert_matrix_2d_no_rot,

+   invert_matrix_3d

+};

+

+/**

+ * Compute inverse of a transformation matrix.

+ * 

+ * \param mat pointer to a GLmatrix structure. The matrix inverse will be

+ * stored in the GLmatrix::inv attribute.

+ * 

+ * \return GL_TRUE for success, GL_FALSE for failure (\p singular matrix).

+ *

+ * Calls the matrix inversion function in inv_mat_tab corresponding to the

+ * given matrix type.  In case of failure, updates the MAT_FLAG_SINGULAR flag,

+ * and copies the identity matrix into GLmatrix::inv.

+ */

+static GLboolean matrix_invert( GLmatrix *mat )

+{

+   if (inv_mat_tab[mat->type](mat)) {

+      mat->flags &= ~MAT_FLAG_SINGULAR;

+      return GL_TRUE;

+   } else {

+      mat->flags |= MAT_FLAG_SINGULAR;

+      memcpy( mat->inv, Identity, sizeof(Identity) );

+      return GL_FALSE;

+   }

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Matrix generation */

+/*@{*/

+

+/**

+ * Generate a 4x4 transformation matrix from glRotate parameters, and

+ * post-multiply the input matrix by it.

+ *

+ * \author

+ * This function was contributed by Erich Boleyn (erich@uruk.org).

+ * Optimizations contributed by Rudolf Opalla (rudi@khm.de).

+ */

+void

+_math_matrix_rotate( GLmatrix *mat,

+		     GLfloat angle, GLfloat x, GLfloat y, GLfloat z )

+{

+   GLfloat xx, yy, zz, xy, yz, zx, xs, ys, zs, one_c, s, c;

+   GLfloat m[16];

+   GLboolean optimized;

+

+   s = (GLfloat) sin( angle * DEG2RAD );

+   c = (GLfloat) cos( angle * DEG2RAD );

+

+   memcpy(m, Identity, sizeof(GLfloat)*16);

+   optimized = GL_FALSE;

+

+#define M(row,col)  m[col*4+row]

+

+   if (x == 0.0F) {

+      if (y == 0.0F) {

+         if (z != 0.0F) {

+            optimized = GL_TRUE;

+            /* rotate only around z-axis */

+            M(0,0) = c;

+            M(1,1) = c;

+            if (z < 0.0F) {

+               M(0,1) = s;

+               M(1,0) = -s;

+            }

+            else {

+               M(0,1) = -s;

+               M(1,0) = s;

+            }

+         }

+      }

+      else if (z == 0.0F) {

+         optimized = GL_TRUE;

+         /* rotate only around y-axis */

+         M(0,0) = c;

+         M(2,2) = c;

+         if (y < 0.0F) {

+            M(0,2) = -s;

+            M(2,0) = s;

+         }

+         else {

+            M(0,2) = s;

+            M(2,0) = -s;

+         }

+      }

+   }

+   else if (y == 0.0F) {

+      if (z == 0.0F) {

+         optimized = GL_TRUE;

+         /* rotate only around x-axis */

+         M(1,1) = c;

+         M(2,2) = c;

+         if (x < 0.0F) {

+            M(1,2) = s;

+            M(2,1) = -s;

+         }

+         else {

+            M(1,2) = -s;

+            M(2,1) = s;

+         }

+      }

+   }

+

+   if (!optimized) {

+      const GLfloat mag = SQRTF(x * x + y * y + z * z);

+

+      if (mag <= 1.0e-4) {

+         /* no rotation, leave mat as-is */

+         return;

+      }

+

+      x /= mag;

+      y /= mag;

+      z /= mag;

+

+

+      /*

+       *     Arbitrary axis rotation matrix.

+       *

+       *  This is composed of 5 matrices, Rz, Ry, T, Ry', Rz', multiplied

+       *  like so:  Rz * Ry * T * Ry' * Rz'.  T is the final rotation

+       *  (which is about the X-axis), and the two composite transforms

+       *  Ry' * Rz' and Rz * Ry are (respectively) the rotations necessary

+       *  from the arbitrary axis to the X-axis then back.  They are

+       *  all elementary rotations.

+       *

+       *  Rz' is a rotation about the Z-axis, to bring the axis vector

+       *  into the x-z plane.  Then Ry' is applied, rotating about the

+       *  Y-axis to bring the axis vector parallel with the X-axis.  The

+       *  rotation about the X-axis is then performed.  Ry and Rz are

+       *  simply the respective inverse transforms to bring the arbitrary

+       *  axis back to its original orientation.  The first transforms

+       *  Rz' and Ry' are considered inverses, since the data from the

+       *  arbitrary axis gives you info on how to get to it, not how

+       *  to get away from it, and an inverse must be applied.

+       *

+       *  The basic calculation used is to recognize that the arbitrary

+       *  axis vector (x, y, z), since it is of unit length, actually

+       *  represents the sines and cosines of the angles to rotate the

+       *  X-axis to the same orientation, with theta being the angle about

+       *  Z and phi the angle about Y (in the order described above)

+       *  as follows:

+       *

+       *  cos ( theta ) = x / sqrt ( 1 - z^2 )

+       *  sin ( theta ) = y / sqrt ( 1 - z^2 )

+       *

+       *  cos ( phi ) = sqrt ( 1 - z^2 )

+       *  sin ( phi ) = z

+       *

+       *  Note that cos ( phi ) can further be inserted to the above

+       *  formulas:

+       *

+       *  cos ( theta ) = x / cos ( phi )

+       *  sin ( theta ) = y / sin ( phi )

+       *

+       *  ...etc.  Because of those relations and the standard trigonometric

+       *  relations, it is pssible to reduce the transforms down to what

+       *  is used below.  It may be that any primary axis chosen will give the

+       *  same results (modulo a sign convention) using thie method.

+       *

+       *  Particularly nice is to notice that all divisions that might

+       *  have caused trouble when parallel to certain planes or

+       *  axis go away with care paid to reducing the expressions.

+       *  After checking, it does perform correctly under all cases, since

+       *  in all the cases of division where the denominator would have

+       *  been zero, the numerator would have been zero as well, giving

+       *  the expected result.

+       */

+

+      xx = x * x;

+      yy = y * y;

+      zz = z * z;

+      xy = x * y;

+      yz = y * z;

+      zx = z * x;

+      xs = x * s;

+      ys = y * s;

+      zs = z * s;

+      one_c = 1.0F - c;

+

+      /* We already hold the identity-matrix so we can skip some statements */

+      M(0,0) = (one_c * xx) + c;

+      M(0,1) = (one_c * xy) - zs;

+      M(0,2) = (one_c * zx) + ys;

+/*    M(0,3) = 0.0F; */

+

+      M(1,0) = (one_c * xy) + zs;

+      M(1,1) = (one_c * yy) + c;

+      M(1,2) = (one_c * yz) - xs;

+/*    M(1,3) = 0.0F; */

+

+      M(2,0) = (one_c * zx) - ys;

+      M(2,1) = (one_c * yz) + xs;

+      M(2,2) = (one_c * zz) + c;

+/*    M(2,3) = 0.0F; */

+

+/*

+      M(3,0) = 0.0F;

+      M(3,1) = 0.0F;

+      M(3,2) = 0.0F;

+      M(3,3) = 1.0F;

+*/

+   }

+#undef M

+

+   matrix_multf( mat, m, MAT_FLAG_ROTATION );

+}

+

+/**

+ * Apply a perspective projection matrix.

+ *

+ * \param mat matrix to apply the projection.

+ * \param left left clipping plane coordinate.

+ * \param right right clipping plane coordinate.

+ * \param bottom bottom clipping plane coordinate.

+ * \param top top clipping plane coordinate.

+ * \param nearval distance to the near clipping plane.

+ * \param farval distance to the far clipping plane.

+ *

+ * Creates the projection matrix and multiplies it with \p mat, marking the

+ * MAT_FLAG_PERSPECTIVE flag.

+ */

+void

+_math_matrix_frustum( GLmatrix *mat,

+		      GLfloat left, GLfloat right,

+		      GLfloat bottom, GLfloat top,

+		      GLfloat nearval, GLfloat farval )

+{

+   GLfloat x, y, a, b, c, d;

+   GLfloat m[16];

+

+   x = (2.0F*nearval) / (right-left);

+   y = (2.0F*nearval) / (top-bottom);

+   a = (right+left) / (right-left);

+   b = (top+bottom) / (top-bottom);

+   c = -(farval+nearval) / ( farval-nearval);

+   d = -(2.0F*farval*nearval) / (farval-nearval);  /* error? */

+

+#define M(row,col)  m[col*4+row]

+   M(0,0) = x;     M(0,1) = 0.0F;  M(0,2) = a;      M(0,3) = 0.0F;

+   M(1,0) = 0.0F;  M(1,1) = y;     M(1,2) = b;      M(1,3) = 0.0F;

+   M(2,0) = 0.0F;  M(2,1) = 0.0F;  M(2,2) = c;      M(2,3) = d;

+   M(3,0) = 0.0F;  M(3,1) = 0.0F;  M(3,2) = -1.0F;  M(3,3) = 0.0F;

+#undef M

+

+   matrix_multf( mat, m, MAT_FLAG_PERSPECTIVE );

+}

+

+/**

+ * Apply an orthographic projection matrix.

+ *

+ * \param mat matrix to apply the projection.

+ * \param left left clipping plane coordinate.

+ * \param right right clipping plane coordinate.

+ * \param bottom bottom clipping plane coordinate.

+ * \param top top clipping plane coordinate.

+ * \param nearval distance to the near clipping plane.

+ * \param farval distance to the far clipping plane.

+ *

+ * Creates the projection matrix and multiplies it with \p mat, marking the

+ * MAT_FLAG_GENERAL_SCALE and MAT_FLAG_TRANSLATION flags.

+ */

+void

+_math_matrix_ortho( GLmatrix *mat,

+		    GLfloat left, GLfloat right,

+		    GLfloat bottom, GLfloat top,

+		    GLfloat nearval, GLfloat farval )

+{

+   GLfloat m[16];

+

+#define M(row,col)  m[col*4+row]

+   M(0,0) = 2.0F / (right-left);

+   M(0,1) = 0.0F;

+   M(0,2) = 0.0F;

+   M(0,3) = -(right+left) / (right-left);

+

+   M(1,0) = 0.0F;

+   M(1,1) = 2.0F / (top-bottom);

+   M(1,2) = 0.0F;

+   M(1,3) = -(top+bottom) / (top-bottom);

+

+   M(2,0) = 0.0F;

+   M(2,1) = 0.0F;

+   M(2,2) = -2.0F / (farval-nearval);

+   M(2,3) = -(farval+nearval) / (farval-nearval);

+

+   M(3,0) = 0.0F;

+   M(3,1) = 0.0F;

+   M(3,2) = 0.0F;

+   M(3,3) = 1.0F;

+#undef M

+

+   matrix_multf( mat, m, (MAT_FLAG_GENERAL_SCALE|MAT_FLAG_TRANSLATION));

+}

+

+/**

+ * Multiply a matrix with a general scaling matrix.

+ *

+ * \param mat matrix.

+ * \param x x axis scale factor.

+ * \param y y axis scale factor.

+ * \param z z axis scale factor.

+ *

+ * Multiplies in-place the elements of \p mat by the scale factors. Checks if

+ * the scales factors are roughly the same, marking the MAT_FLAG_UNIFORM_SCALE

+ * flag, or MAT_FLAG_GENERAL_SCALE. Marks the MAT_DIRTY_TYPE and

+ * MAT_DIRTY_INVERSE dirty flags.

+ */

+void

+_math_matrix_scale( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )

+{

+   GLfloat *m = mat->m;

+   m[0] *= x;   m[4] *= y;   m[8]  *= z;

+   m[1] *= x;   m[5] *= y;   m[9]  *= z;

+   m[2] *= x;   m[6] *= y;   m[10] *= z;

+   m[3] *= x;   m[7] *= y;   m[11] *= z;

+

+   if (FABSF(x - y) < 1e-8 && FABSF(x - z) < 1e-8)

+      mat->flags |= MAT_FLAG_UNIFORM_SCALE;

+   else

+      mat->flags |= MAT_FLAG_GENERAL_SCALE;

+

+   mat->flags |= (MAT_DIRTY_TYPE |

+		  MAT_DIRTY_INVERSE);

+}

+

+/**

+ * Multiply a matrix with a translation matrix.

+ *

+ * \param mat matrix.

+ * \param x translation vector x coordinate.

+ * \param y translation vector y coordinate.

+ * \param z translation vector z coordinate.

+ *

+ * Adds the translation coordinates to the elements of \p mat in-place.  Marks

+ * the MAT_FLAG_TRANSLATION flag, and the MAT_DIRTY_TYPE and MAT_DIRTY_INVERSE

+ * dirty flags.

+ */

+void

+_math_matrix_translate( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )

+{

+   GLfloat *m = mat->m;

+   m[12] = m[0] * x + m[4] * y + m[8]  * z + m[12];

+   m[13] = m[1] * x + m[5] * y + m[9]  * z + m[13];

+   m[14] = m[2] * x + m[6] * y + m[10] * z + m[14];

+   m[15] = m[3] * x + m[7] * y + m[11] * z + m[15];

+

+   mat->flags |= (MAT_FLAG_TRANSLATION |

+		  MAT_DIRTY_TYPE |

+		  MAT_DIRTY_INVERSE);

+}

+

+

+/**

+ * Set matrix to do viewport and depthrange mapping.

+ * Transforms Normalized Device Coords to window/Z values.

+ */

+void

+_math_matrix_viewport(GLmatrix *m, GLint x, GLint y, GLint width, GLint height,

+                      GLfloat zNear, GLfloat zFar, GLfloat depthMax)

+{

+   m->m[MAT_SX] = (GLfloat) width / 2.0F;

+   m->m[MAT_TX] = m->m[MAT_SX] + x;

+   m->m[MAT_SY] = (GLfloat) height / 2.0F;

+   m->m[MAT_TY] = m->m[MAT_SY] + y;

+   m->m[MAT_SZ] = depthMax * ((zFar - zNear) / 2.0F);

+   m->m[MAT_TZ] = depthMax * ((zFar - zNear) / 2.0F + zNear);

+   m->flags = MAT_FLAG_GENERAL_SCALE | MAT_FLAG_TRANSLATION;

+   m->type = MATRIX_3D_NO_ROT;

+}

+

+

+/**

+ * Set a matrix to the identity matrix.

+ *

+ * \param mat matrix.

+ *

+ * Copies ::Identity into \p GLmatrix::m, and into GLmatrix::inv if not NULL.

+ * Sets the matrix type to identity, and clear the dirty flags.

+ */

+void

+_math_matrix_set_identity( GLmatrix *mat )

+{

+   memcpy( mat->m, Identity, 16*sizeof(GLfloat) );

+

+   if (mat->inv)

+      memcpy( mat->inv, Identity, 16*sizeof(GLfloat) );

+

+   mat->type = MATRIX_IDENTITY;

+   mat->flags &= ~(MAT_DIRTY_FLAGS|

+		   MAT_DIRTY_TYPE|

+		   MAT_DIRTY_INVERSE);

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Matrix analysis */

+/*@{*/

+

+#define ZERO(x) (1<<x)

+#define ONE(x)  (1<<(x+16))

+

+#define MASK_NO_TRX      (ZERO(12) | ZERO(13) | ZERO(14))

+#define MASK_NO_2D_SCALE ( ONE(0)  | ONE(5))

+

+#define MASK_IDENTITY    ( ONE(0)  | ZERO(4)  | ZERO(8)  | ZERO(12) |\

+			  ZERO(1)  |  ONE(5)  | ZERO(9)  | ZERO(13) |\

+			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\

+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )

+

+#define MASK_2D_NO_ROT   (           ZERO(4)  | ZERO(8)  |           \

+			  ZERO(1)  |            ZERO(9)  |           \

+			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\

+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )

+

+#define MASK_2D          (                      ZERO(8)  |           \

+			                        ZERO(9)  |           \

+			  ZERO(2)  | ZERO(6)  |  ONE(10) | ZERO(14) |\

+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )

+

+

+#define MASK_3D_NO_ROT   (           ZERO(4)  | ZERO(8)  |           \

+			  ZERO(1)  |            ZERO(9)  |           \

+			  ZERO(2)  | ZERO(6)  |                      \

+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )

+

+#define MASK_3D          (                                           \

+			                                             \

+			                                             \

+			  ZERO(3)  | ZERO(7)  | ZERO(11) |  ONE(15) )

+

+

+#define MASK_PERSPECTIVE (           ZERO(4)  |            ZERO(12) |\

+			  ZERO(1)  |                       ZERO(13) |\

+			  ZERO(2)  | ZERO(6)  |                      \

+			  ZERO(3)  | ZERO(7)  |            ZERO(15) )

+

+#define SQ(x) ((x)*(x))

+

+/**

+ * Determine type and flags from scratch.  

+ *

+ * \param mat matrix.

+ * 

+ * This is expensive enough to only want to do it once.

+ */

+static void analyse_from_scratch( GLmatrix *mat )

+{

+   const GLfloat *m = mat->m;

+   GLuint mask = 0;

+   GLuint i;

+

+   for (i = 0 ; i < 16 ; i++) {

+      if (m[i] == 0.0) mask |= (1<<i);

+   }

+

+   if (m[0] == 1.0F) mask |= (1<<16);

+   if (m[5] == 1.0F) mask |= (1<<21);

+   if (m[10] == 1.0F) mask |= (1<<26);

+   if (m[15] == 1.0F) mask |= (1<<31);

+

+   mat->flags &= ~MAT_FLAGS_GEOMETRY;

+

+   /* Check for translation - no-one really cares

+    */

+   if ((mask & MASK_NO_TRX) != MASK_NO_TRX)

+      mat->flags |= MAT_FLAG_TRANSLATION;

+

+   /* Do the real work

+    */

+   if (mask == (GLuint) MASK_IDENTITY) {

+      mat->type = MATRIX_IDENTITY;

+   }

+   else if ((mask & MASK_2D_NO_ROT) == (GLuint) MASK_2D_NO_ROT) {

+      mat->type = MATRIX_2D_NO_ROT;

+

+      if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE)

+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;

+   }

+   else if ((mask & MASK_2D) == (GLuint) MASK_2D) {

+      GLfloat mm = DOT2(m, m);

+      GLfloat m4m4 = DOT2(m+4,m+4);

+      GLfloat mm4 = DOT2(m,m+4);

+

+      mat->type = MATRIX_2D;

+

+      /* Check for scale */

+      if (SQ(mm-1) > SQ(1e-6) ||

+	  SQ(m4m4-1) > SQ(1e-6))

+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;

+

+      /* Check for rotation */

+      if (SQ(mm4) > SQ(1e-6))

+	 mat->flags |= MAT_FLAG_GENERAL_3D;

+      else

+	 mat->flags |= MAT_FLAG_ROTATION;

+

+   }

+   else if ((mask & MASK_3D_NO_ROT) == (GLuint) MASK_3D_NO_ROT) {

+      mat->type = MATRIX_3D_NO_ROT;

+

+      /* Check for scale */

+      if (SQ(m[0]-m[5]) < SQ(1e-6) &&

+	  SQ(m[0]-m[10]) < SQ(1e-6)) {

+	 if (SQ(m[0]-1.0) > SQ(1e-6)) {

+	    mat->flags |= MAT_FLAG_UNIFORM_SCALE;

+         }

+      }

+      else {

+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;

+      }

+   }

+   else if ((mask & MASK_3D) == (GLuint) MASK_3D) {

+      GLfloat c1 = DOT3(m,m);

+      GLfloat c2 = DOT3(m+4,m+4);

+      GLfloat c3 = DOT3(m+8,m+8);

+      GLfloat d1 = DOT3(m, m+4);

+      GLfloat cp[3];

+

+      mat->type = MATRIX_3D;

+

+      /* Check for scale */

+      if (SQ(c1-c2) < SQ(1e-6) && SQ(c1-c3) < SQ(1e-6)) {

+	 if (SQ(c1-1.0) > SQ(1e-6))

+	    mat->flags |= MAT_FLAG_UNIFORM_SCALE;

+	 /* else no scale at all */

+      }

+      else {

+	 mat->flags |= MAT_FLAG_GENERAL_SCALE;

+      }

+

+      /* Check for rotation */

+      if (SQ(d1) < SQ(1e-6)) {

+	 CROSS3( cp, m, m+4 );

+	 SUB_3V( cp, cp, (m+8) );

+	 if (LEN_SQUARED_3FV(cp) < SQ(1e-6))

+	    mat->flags |= MAT_FLAG_ROTATION;

+	 else

+	    mat->flags |= MAT_FLAG_GENERAL_3D;

+      }

+      else {

+	 mat->flags |= MAT_FLAG_GENERAL_3D; /* shear, etc */

+      }

+   }

+   else if ((mask & MASK_PERSPECTIVE) == MASK_PERSPECTIVE && m[11]==-1.0F) {

+      mat->type = MATRIX_PERSPECTIVE;

+      mat->flags |= MAT_FLAG_GENERAL;

+   }

+   else {

+      mat->type = MATRIX_GENERAL;

+      mat->flags |= MAT_FLAG_GENERAL;

+   }

+}

+

+/**

+ * Analyze a matrix given that its flags are accurate.

+ * 

+ * This is the more common operation, hopefully.

+ */

+static void analyse_from_flags( GLmatrix *mat )

+{

+   const GLfloat *m = mat->m;

+

+   if (TEST_MAT_FLAGS(mat, 0)) {

+      mat->type = MATRIX_IDENTITY;

+   }

+   else if (TEST_MAT_FLAGS(mat, (MAT_FLAG_TRANSLATION |

+				 MAT_FLAG_UNIFORM_SCALE |

+				 MAT_FLAG_GENERAL_SCALE))) {

+      if ( m[10]==1.0F && m[14]==0.0F ) {

+	 mat->type = MATRIX_2D_NO_ROT;

+      }

+      else {

+	 mat->type = MATRIX_3D_NO_ROT;

+      }

+   }

+   else if (TEST_MAT_FLAGS(mat, MAT_FLAGS_3D)) {

+      if (                                 m[ 8]==0.0F

+            &&                             m[ 9]==0.0F

+            && m[2]==0.0F && m[6]==0.0F && m[10]==1.0F && m[14]==0.0F) {

+	 mat->type = MATRIX_2D;

+      }

+      else {

+	 mat->type = MATRIX_3D;

+      }

+   }

+   else if (                 m[4]==0.0F                 && m[12]==0.0F

+            && m[1]==0.0F                               && m[13]==0.0F

+            && m[2]==0.0F && m[6]==0.0F

+            && m[3]==0.0F && m[7]==0.0F && m[11]==-1.0F && m[15]==0.0F) {

+      mat->type = MATRIX_PERSPECTIVE;

+   }

+   else {

+      mat->type = MATRIX_GENERAL;

+   }

+}

+

+/**

+ * Analyze and update a matrix.

+ *

+ * \param mat matrix.

+ *

+ * If the matrix type is dirty then calls either analyse_from_scratch() or

+ * analyse_from_flags() to determine its type, according to whether the flags

+ * are dirty or not, respectively. If the matrix has an inverse and it's dirty

+ * then calls matrix_invert(). Finally clears the dirty flags.

+ */

+void

+_math_matrix_analyse( GLmatrix *mat )

+{

+   if (mat->flags & MAT_DIRTY_TYPE) {

+      if (mat->flags & MAT_DIRTY_FLAGS)

+	 analyse_from_scratch( mat );

+      else

+	 analyse_from_flags( mat );

+   }

+

+   if (mat->inv && (mat->flags & MAT_DIRTY_INVERSE)) {

+      matrix_invert( mat );

+      mat->flags &= ~MAT_DIRTY_INVERSE;

+   }

+

+   mat->flags &= ~(MAT_DIRTY_FLAGS | MAT_DIRTY_TYPE);

+}

+

+/*@}*/

+

+

+/**

+ * Test if the given matrix preserves vector lengths.

+ */

+GLboolean

+_math_matrix_is_length_preserving( const GLmatrix *m )

+{

+   return TEST_MAT_FLAGS( m, MAT_FLAGS_LENGTH_PRESERVING);

+}

+

+

+/**

+ * Test if the given matrix does any rotation.

+ * (or perhaps if the upper-left 3x3 is non-identity)

+ */

+GLboolean

+_math_matrix_has_rotation( const GLmatrix *m )

+{

+   if (m->flags & (MAT_FLAG_GENERAL |

+                   MAT_FLAG_ROTATION |

+                   MAT_FLAG_GENERAL_3D |

+                   MAT_FLAG_PERSPECTIVE))

+      return GL_TRUE;

+   else

+      return GL_FALSE;

+}

+

+

+GLboolean

+_math_matrix_is_general_scale( const GLmatrix *m )

+{

+   return (m->flags & MAT_FLAG_GENERAL_SCALE) ? GL_TRUE : GL_FALSE;

+}

+

+

+GLboolean

+_math_matrix_is_dirty( const GLmatrix *m )

+{

+   return (m->flags & MAT_DIRTY) ? GL_TRUE : GL_FALSE;

+}

+

+

+/**********************************************************************/

+/** \name Matrix setup */

+/*@{*/

+

+/**

+ * Copy a matrix.

+ *

+ * \param to destination matrix.

+ * \param from source matrix.

+ *

+ * Copies all fields in GLmatrix, creating an inverse array if necessary.

+ */

+void

+_math_matrix_copy( GLmatrix *to, const GLmatrix *from )

+{

+   memcpy( to->m, from->m, sizeof(Identity) );

+   to->flags = from->flags;

+   to->type = from->type;

+

+   if (to->inv != 0) {

+      if (from->inv == 0) {

+	 matrix_invert( to );

+      }

+      else {

+	 memcpy(to->inv, from->inv, sizeof(GLfloat)*16);

+      }

+   }

+}

+

+/**

+ * Loads a matrix array into GLmatrix.

+ * 

+ * \param m matrix array.

+ * \param mat matrix.

+ *

+ * Copies \p m into GLmatrix::m and marks the MAT_FLAG_GENERAL and MAT_DIRTY

+ * flags.

+ */

+void

+_math_matrix_loadf( GLmatrix *mat, const GLfloat *m )

+{

+   memcpy( mat->m, m, 16*sizeof(GLfloat) );

+   mat->flags = (MAT_FLAG_GENERAL | MAT_DIRTY);

+}

+

+/**

+ * Matrix constructor.

+ *

+ * \param m matrix.

+ *

+ * Initialize the GLmatrix fields.

+ */

+void

+_math_matrix_ctr( GLmatrix *m )

+{

+   m->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );

+   if (m->m)

+      memcpy( m->m, Identity, sizeof(Identity) );

+   m->inv = NULL;

+   m->type = MATRIX_IDENTITY;

+   m->flags = 0;

+}

+

+/**

+ * Matrix destructor.

+ *

+ * \param m matrix.

+ *

+ * Frees the data in a GLmatrix.

+ */

+void

+_math_matrix_dtr( GLmatrix *m )

+{

+   if (m->m) {

+      _mesa_align_free( m->m );

+      m->m = NULL;

+   }

+   if (m->inv) {

+      _mesa_align_free( m->inv );

+      m->inv = NULL;

+   }

+}

+

+/**

+ * Allocate a matrix inverse.

+ *

+ * \param m matrix.

+ *

+ * Allocates the matrix inverse, GLmatrix::inv, and sets it to Identity.

+ */

+void

+_math_matrix_alloc_inv( GLmatrix *m )

+{

+   if (!m->inv) {

+      m->inv = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );

+      if (m->inv)

+         memcpy( m->inv, Identity, 16 * sizeof(GLfloat) );

+   }

+}

+

+/*@}*/

+

+

+/**********************************************************************/

+/** \name Matrix transpose */

+/*@{*/

+

+/**

+ * Transpose a GLfloat matrix.

+ *

+ * \param to destination array.

+ * \param from source array.

+ */

+void

+_math_transposef( GLfloat to[16], const GLfloat from[16] )

+{

+   to[0] = from[0];

+   to[1] = from[4];

+   to[2] = from[8];

+   to[3] = from[12];

+   to[4] = from[1];

+   to[5] = from[5];

+   to[6] = from[9];

+   to[7] = from[13];

+   to[8] = from[2];

+   to[9] = from[6];

+   to[10] = from[10];

+   to[11] = from[14];

+   to[12] = from[3];

+   to[13] = from[7];

+   to[14] = from[11];

+   to[15] = from[15];

+}

+

+/**

+ * Transpose a GLdouble matrix.

+ *

+ * \param to destination array.

+ * \param from source array.

+ */

+void

+_math_transposed( GLdouble to[16], const GLdouble from[16] )

+{

+   to[0] = from[0];

+   to[1] = from[4];

+   to[2] = from[8];

+   to[3] = from[12];

+   to[4] = from[1];

+   to[5] = from[5];

+   to[6] = from[9];

+   to[7] = from[13];

+   to[8] = from[2];

+   to[9] = from[6];

+   to[10] = from[10];

+   to[11] = from[14];

+   to[12] = from[3];

+   to[13] = from[7];

+   to[14] = from[11];

+   to[15] = from[15];

+}

+

+/**

+ * Transpose a GLdouble matrix and convert to GLfloat.

+ *

+ * \param to destination array.

+ * \param from source array.

+ */

+void

+_math_transposefd( GLfloat to[16], const GLdouble from[16] )

+{

+   to[0] = (GLfloat) from[0];

+   to[1] = (GLfloat) from[4];

+   to[2] = (GLfloat) from[8];

+   to[3] = (GLfloat) from[12];

+   to[4] = (GLfloat) from[1];

+   to[5] = (GLfloat) from[5];

+   to[6] = (GLfloat) from[9];

+   to[7] = (GLfloat) from[13];

+   to[8] = (GLfloat) from[2];

+   to[9] = (GLfloat) from[6];

+   to[10] = (GLfloat) from[10];

+   to[11] = (GLfloat) from[14];

+   to[12] = (GLfloat) from[3];

+   to[13] = (GLfloat) from[7];

+   to[14] = (GLfloat) from[11];

+   to[15] = (GLfloat) from[15];

+}

+

+/*@}*/

+

+

+/**

+ * Transform a 4-element row vector (1x4 matrix) by a 4x4 matrix.  This

+ * function is used for transforming clipping plane equations and spotlight

+ * directions.

+ * Mathematically,  u = v * m.

+ * Input:  v - input vector

+ *         m - transformation matrix

+ * Output:  u - transformed vector

+ */

+void

+_mesa_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )

+{

+   const GLfloat v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];

+#define M(row,col)  m[row + col*4]

+   u[0] = v0 * M(0,0) + v1 * M(1,0) + v2 * M(2,0) + v3 * M(3,0);

+   u[1] = v0 * M(0,1) + v1 * M(1,1) + v2 * M(2,1) + v3 * M(3,1);

+   u[2] = v0 * M(0,2) + v1 * M(1,2) + v2 * M(2,2) + v3 * M(3,2);

+   u[3] = v0 * M(0,3) + v1 * M(1,3) + v2 * M(2,3) + v3 * M(3,3);

+#undef M

+}

diff --git a/mesalib/src/mesa/math/m_vector.c b/mesalib/src/mesa/math/m_vector.c
index fbd63fd92..7ca08f4c0 100644
--- a/mesalib/src/mesa/math/m_vector.c
+++ b/mesalib/src/mesa/math/m_vector.c
@@ -1,185 +1,184 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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.
- */
-
-/*
- * New (3.1) transformation code written by Keith Whitwell.
- */
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "m_vector.h"
-
-
-
-/**
- * Given a vector [count][4] of floats, set all the [][elt] values
- * to 0 (if elt = 0, 1, 2) or 1.0 (if elt = 3).
- */
-void
-_mesa_vector4f_clean_elem( GLvector4f *vec, GLuint count, GLuint elt )
-{
-   static const GLubyte elem_bits[4] = {
-      VEC_DIRTY_0,
-      VEC_DIRTY_1,
-      VEC_DIRTY_2,
-      VEC_DIRTY_3
-   };
-   static const GLfloat clean[4] = { 0, 0, 0, 1 };
-   const GLfloat v = clean[elt];
-   GLfloat (*data)[4] = (GLfloat (*)[4])vec->start;
-   GLuint i;
-
-   for (i = 0; i < count; i++)
-      data[i][elt] = v;
-
-   vec->flags &= ~elem_bits[elt];
-}
-
-
-static const GLubyte size_bits[5] = {
-   0,
-   VEC_SIZE_1,
-   VEC_SIZE_2,
-   VEC_SIZE_3,
-   VEC_SIZE_4,
-};
-
-
-/**
- * Initialize GLvector objects.
- * \param v  the vector object to initialize.
- * \param flags  bitwise-OR of VEC_* flags
- * \param storage  pointer to storage for the vector's data
- */
-void
-_mesa_vector4f_init( GLvector4f *v, GLbitfield flags, GLfloat (*storage)[4] )
-{
-   v->stride = 4 * sizeof(GLfloat);
-   v->size = 2;   /* may change: 2-4 for vertices and 1-4 for texcoords */
-   v->data = storage;
-   v->start = (GLfloat *) storage;
-   v->count = 0;
-   v->flags = size_bits[4] | flags;
-}
-
-
-/**
- * Initialize GLvector objects and allocate storage.
- * \param v  the vector object
- * \param flags  bitwise-OR of VEC_* flags
- * \param count  number of elements to allocate in vector
- * \param alignment  desired memory alignment for the data (in bytes)
- */
-void
-_mesa_vector4f_alloc( GLvector4f *v, GLbitfield flags, GLuint count,
-                      GLuint alignment )
-{
-   v->stride = 4 * sizeof(GLfloat);
-   v->size = 2;
-   v->storage = _mesa_align_malloc( count * 4 * sizeof(GLfloat), alignment );
-   v->storage_count = count;
-   v->start = (GLfloat *) v->storage;
-   v->data = (GLfloat (*)[4]) v->storage;
-   v->count = 0;
-   v->flags = size_bits[4] | flags | VEC_MALLOC;
-}
-
-
-/**
- * Vector deallocation.  Free whatever memory is pointed to by the
- * vector's storage field if the VEC_MALLOC flag is set.
- * DO NOT free the GLvector object itself, though.
- */
-void
-_mesa_vector4f_free( GLvector4f *v )
-{
-   if (v->flags & VEC_MALLOC) {
-      _mesa_align_free( v->storage );
-      v->data = NULL;
-      v->start = NULL;
-      v->storage = NULL;
-      v->flags &= ~VEC_MALLOC;
-   }
-}
-
-
-/**
- * For debugging
- */
-void
-_mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
-                      GLboolean culling )
-{
-   static const GLfloat c[4] = { 0, 0, 0, 1 };
-   static const char *templates[5] = {
-      "%d:\t0, 0, 0, 1\n",
-      "%d:\t%f, 0, 0, 1\n",
-      "%d:\t%f, %f, 0, 1\n",
-      "%d:\t%f, %f, %f, 1\n",
-      "%d:\t%f, %f, %f, %f\n"
-   };
-
-   const char *t = templates[v->size];
-   GLfloat *d = (GLfloat *)v->data;
-   GLuint j, i = 0, count;
-
-   printf("data-start\n");
-   for (; d != v->start; STRIDE_F(d, v->stride), i++)
-      printf(t, i, d[0], d[1], d[2], d[3]);
-
-   printf("start-count(%u)\n", v->count);
-   count = i + v->count;
-
-   if (culling) {
-      for (; i < count; STRIDE_F(d, v->stride), i++)
-	 if (cullmask[i])
-	    printf(t, i, d[0], d[1], d[2], d[3]);
-   }
-   else {
-      for (; i < count; STRIDE_F(d, v->stride), i++)
-	 printf(t, i, d[0], d[1], d[2], d[3]);
-   }
-
-   for (j = v->size; j < 4; j++) {
-      if ((v->flags & (1<<j)) == 0) {
-
-	 printf("checking col %u is clean as advertised ", j);
-
-	 for (i = 0, d = (GLfloat *) v->data;
-	      i < count && d[j] == c[j];
-	      i++, STRIDE_F(d, v->stride)) {
-            /* no-op */
-         }
-
-	 if (i == count)
-	    printf(" --> ok\n");
-	 else
-	    printf(" --> Failed at %u ******\n", i);
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * New (3.1) transformation code written by Keith Whitwell.

+ */

+

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/macros.h"

+

+#include "m_vector.h"

+

+

+

+/**

+ * Given a vector [count][4] of floats, set all the [][elt] values

+ * to 0 (if elt = 0, 1, 2) or 1.0 (if elt = 3).

+ */

+void

+_mesa_vector4f_clean_elem( GLvector4f *vec, GLuint count, GLuint elt )

+{

+   static const GLubyte elem_bits[4] = {

+      VEC_DIRTY_0,

+      VEC_DIRTY_1,

+      VEC_DIRTY_2,

+      VEC_DIRTY_3

+   };

+   static const GLfloat clean[4] = { 0, 0, 0, 1 };

+   const GLfloat v = clean[elt];

+   GLfloat (*data)[4] = (GLfloat (*)[4])vec->start;

+   GLuint i;

+

+   for (i = 0; i < count; i++)

+      data[i][elt] = v;

+

+   vec->flags &= ~elem_bits[elt];

+}

+

+

+static const GLubyte size_bits[5] = {

+   0,

+   VEC_SIZE_1,

+   VEC_SIZE_2,

+   VEC_SIZE_3,

+   VEC_SIZE_4,

+};

+

+

+/**

+ * Initialize GLvector objects.

+ * \param v  the vector object to initialize.

+ * \param flags  bitwise-OR of VEC_* flags

+ * \param storage  pointer to storage for the vector's data

+ */

+void

+_mesa_vector4f_init( GLvector4f *v, GLbitfield flags, GLfloat (*storage)[4] )

+{

+   v->stride = 4 * sizeof(GLfloat);

+   v->size = 2;   /* may change: 2-4 for vertices and 1-4 for texcoords */

+   v->data = storage;

+   v->start = (GLfloat *) storage;

+   v->count = 0;

+   v->flags = size_bits[4] | flags;

+}

+

+

+/**

+ * Initialize GLvector objects and allocate storage.

+ * \param v  the vector object

+ * \param flags  bitwise-OR of VEC_* flags

+ * \param count  number of elements to allocate in vector

+ * \param alignment  desired memory alignment for the data (in bytes)

+ */

+void

+_mesa_vector4f_alloc( GLvector4f *v, GLbitfield flags, GLuint count,

+                      GLuint alignment )

+{

+   v->stride = 4 * sizeof(GLfloat);

+   v->size = 2;

+   v->storage = _mesa_align_malloc( count * 4 * sizeof(GLfloat), alignment );

+   v->storage_count = count;

+   v->start = (GLfloat *) v->storage;

+   v->data = (GLfloat (*)[4]) v->storage;

+   v->count = 0;

+   v->flags = size_bits[4] | flags | VEC_MALLOC;

+}

+

+

+/**

+ * Vector deallocation.  Free whatever memory is pointed to by the

+ * vector's storage field if the VEC_MALLOC flag is set.

+ * DO NOT free the GLvector object itself, though.

+ */

+void

+_mesa_vector4f_free( GLvector4f *v )

+{

+   if (v->flags & VEC_MALLOC) {

+      _mesa_align_free( v->storage );

+      v->data = NULL;

+      v->start = NULL;

+      v->storage = NULL;

+      v->flags &= ~VEC_MALLOC;

+   }

+}

+

+

+/**

+ * For debugging

+ */

+void

+_mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,

+                      GLboolean culling )

+{

+   static const GLfloat c[4] = { 0, 0, 0, 1 };

+   static const char *templates[5] = {

+      "%d:\t0, 0, 0, 1\n",

+      "%d:\t%f, 0, 0, 1\n",

+      "%d:\t%f, %f, 0, 1\n",

+      "%d:\t%f, %f, %f, 1\n",

+      "%d:\t%f, %f, %f, %f\n"

+   };

+

+   const char *t = templates[v->size];

+   GLfloat *d = (GLfloat *)v->data;

+   GLuint j, i = 0, count;

+

+   printf("data-start\n");

+   for (; d != v->start; STRIDE_F(d, v->stride), i++)

+      printf(t, i, d[0], d[1], d[2], d[3]);

+

+   printf("start-count(%u)\n", v->count);

+   count = i + v->count;

+

+   if (culling) {

+      for (; i < count; STRIDE_F(d, v->stride), i++)

+	 if (cullmask[i])

+	    printf(t, i, d[0], d[1], d[2], d[3]);

+   }

+   else {

+      for (; i < count; STRIDE_F(d, v->stride), i++)

+	 printf(t, i, d[0], d[1], d[2], d[3]);

+   }

+

+   for (j = v->size; j < 4; j++) {

+      if ((v->flags & (1<<j)) == 0) {

+

+	 printf("checking col %u is clean as advertised ", j);

+

+	 for (i = 0, d = (GLfloat *) v->data;

+	      i < count && d[j] == c[j];

+	      i++, STRIDE_F(d, v->stride)) {

+            /* no-op */

+         }

+

+	 if (i == count)

+	    printf(" --> ok\n");

+	 else

+	    printf(" --> Failed at %u ******\n", i);

+      }

+   }

+}

diff --git a/mesalib/src/mesa/program/arbprogparse.c b/mesalib/src/mesa/program/arbprogparse.c
index f834aaf56..ebbc195bc 100644
--- a/mesalib/src/mesa/program/arbprogparse.c
+++ b/mesalib/src/mesa/program/arbprogparse.c
@@ -1,219 +1,219 @@
-/*
- * 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(GLcontext* 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) {
-      _mesa_append_fog_code(ctx, program);
-      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(GLcontext *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) {

+      _mesa_append_fog_code(ctx, program);

+      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/arbprogparse.h b/mesalib/src/mesa/program/arbprogparse.h
index 980d39fb9..a9fe1e941 100644
--- a/mesalib/src/mesa/program/arbprogparse.h
+++ b/mesalib/src/mesa/program/arbprogparse.h
@@ -1,41 +1,45 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 ARBPROGPARSE_H
-#define ARBPROGPARSE_H
-
-#include "main/mtypes.h"
-
-extern void
-_mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
-			       const GLvoid *str, GLsizei len,
-			       struct gl_vertex_program *program);
-
-extern void
-_mesa_parse_arb_fragment_program(GLcontext *ctx, GLenum target,
-                                 const GLvoid *str, GLsizei len,
-                                 struct gl_fragment_program *program);
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 ARBPROGPARSE_H

+#define ARBPROGPARSE_H

+

+#include "main/glheader.h"

+

+struct gl_context;

+struct gl_fragment_program;

+struct gl_vertex_program;

+

+extern void

+_mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target,

+			       const GLvoid *str, GLsizei len,

+			       struct gl_vertex_program *program);

+

+extern void

+_mesa_parse_arb_fragment_program(struct gl_context *ctx, GLenum target,

+                                 const GLvoid *str, GLsizei len,

+                                 struct gl_fragment_program *program);

+

+#endif

diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index 93b6c305f..02ca83d47 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -1,2965 +1,3074 @@
-/*
- * 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.
- */
-
-/**
- * \file ir_to_mesa.cpp
- *
- * Translates the IR to ARB_fragment_program text if possible,
- * printing the result
- */
-
-#include <stdio.h>
-#include "main/compiler.h"
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_print_visitor.h"
-#include "ir_expression_flattening.h"
-#include "glsl_types.h"
-#include "glsl_parser_extras.h"
-#include "../glsl/program.h"
-#include "ir_optimization.h"
-#include "ast.h"
-
-extern "C" {
-#include "main/mtypes.h"
-#include "main/shaderapi.h"
-#include "main/shaderobj.h"
-#include "main/uniforms.h"
-#include "program/hash_table.h"
-#include "program/prog_instruction.h"
-#include "program/prog_optimize.h"
-#include "program/prog_print.h"
-#include "program/program.h"
-#include "program/prog_uniform.h"
-#include "program/prog_parameter.h"
-}
-
-static int swizzle_for_size(int size);
-
-/**
- * This struct is a corresponding struct to Mesa prog_src_register, with
- * wider fields.
- */
-typedef struct ir_to_mesa_src_reg {
-   ir_to_mesa_src_reg(int file, int index, const glsl_type *type)
-   {
-      this->file = file;
-      this->index = index;
-      if (type && (type->is_scalar() || type->is_vector() || type->is_matrix()))
-	 this->swizzle = swizzle_for_size(type->vector_elements);
-      else
-	 this->swizzle = SWIZZLE_XYZW;
-      this->negate = 0;
-      this->reladdr = NULL;
-   }
-
-   ir_to_mesa_src_reg()
-   {
-      this->file = PROGRAM_UNDEFINED;
-      this->index = 0;
-      this->swizzle = 0;
-      this->negate = 0;
-      this->reladdr = NULL;
-   }
-
-   int file; /**< PROGRAM_* from Mesa */
-   int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */
-   GLuint swizzle; /**< SWIZZLE_XYZWONEZERO swizzles from Mesa. */
-   int negate; /**< NEGATE_XYZW mask from mesa */
-   /** Register index should be offset by the integer in this reg. */
-   ir_to_mesa_src_reg *reladdr;
-} ir_to_mesa_src_reg;
-
-typedef struct ir_to_mesa_dst_reg {
-   int file; /**< PROGRAM_* from Mesa */
-   int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */
-   int writemask; /**< Bitfield of WRITEMASK_[XYZW] */
-   GLuint cond_mask:4;
-   /** Register index should be offset by the integer in this reg. */
-   ir_to_mesa_src_reg *reladdr;
-} ir_to_mesa_dst_reg;
-
-extern ir_to_mesa_src_reg ir_to_mesa_undef;
-
-class ir_to_mesa_instruction : public exec_node {
-public:
-   /* Callers of this talloc-based new need not call delete. It's
-    * easier to just talloc_free 'ctx' (or any of its ancestors). */
-   static void* operator new(size_t size, void *ctx)
-   {
-      void *node;
-
-      node = talloc_zero_size(ctx, size);
-      assert(node != NULL);
-
-      return node;
-   }
-
-   enum prog_opcode op;
-   ir_to_mesa_dst_reg dst_reg;
-   ir_to_mesa_src_reg src_reg[3];
-   /** Pointer to the ir source this tree came from for debugging */
-   ir_instruction *ir;
-   GLboolean cond_update;
-   int sampler; /**< sampler index */
-   int tex_target; /**< One of TEXTURE_*_INDEX */
-   GLboolean tex_shadow;
-
-   class function_entry *function; /* Set on OPCODE_CAL or OPCODE_BGNSUB */
-};
-
-class variable_storage : public exec_node {
-public:
-   variable_storage(ir_variable *var, int file, int index)
-      : file(file), index(index), var(var)
-   {
-      /* empty */
-   }
-
-   int file;
-   int index;
-   ir_variable *var; /* variable that maps to this, if any */
-};
-
-class function_entry : public exec_node {
-public:
-   ir_function_signature *sig;
-
-   /**
-    * identifier of this function signature used by the program.
-    *
-    * At the point that Mesa instructions for function calls are
-    * generated, we don't know the address of the first instruction of
-    * the function body.  So we make the BranchTarget that is called a
-    * small integer and rewrite them during set_branchtargets().
-    */
-   int sig_id;
-
-   /**
-    * Pointer to first instruction of the function body.
-    *
-    * Set during function body emits after main() is processed.
-    */
-   ir_to_mesa_instruction *bgn_inst;
-
-   /**
-    * Index of the first instruction of the function body in actual
-    * Mesa IR.
-    *
-    * Set after convertion from ir_to_mesa_instruction to prog_instruction.
-    */
-   int inst;
-
-   /** Storage for the return value. */
-   ir_to_mesa_src_reg return_reg;
-};
-
-class ir_to_mesa_visitor : public ir_visitor {
-public:
-   ir_to_mesa_visitor();
-   ~ir_to_mesa_visitor();
-
-   function_entry *current_function;
-
-   GLcontext *ctx;
-   struct gl_program *prog;
-   struct gl_shader_program *shader_program;
-   struct gl_shader_compiler_options *options;
-
-   int next_temp;
-
-   variable_storage *find_variable_storage(ir_variable *var);
-
-   function_entry *get_function_signature(ir_function_signature *sig);
-
-   ir_to_mesa_src_reg get_temp(const glsl_type *type);
-   void reladdr_to_temp(ir_instruction *ir,
-			ir_to_mesa_src_reg *reg, int *num_reladdr);
-
-   struct ir_to_mesa_src_reg src_reg_for_float(float val);
-
-   /**
-    * \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_loop *);
-   virtual void visit(ir_loop_jump *);
-   virtual void visit(ir_function_signature *);
-   virtual void visit(ir_function *);
-   virtual void visit(ir_expression *);
-   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_texture *);
-   virtual void visit(ir_if *);
-   /*@}*/
-
-   struct ir_to_mesa_src_reg result;
-
-   /** List of variable_storage */
-   exec_list variables;
-
-   /** List of function_entry */
-   exec_list function_signatures;
-   int next_signature_id;
-
-   /** List of ir_to_mesa_instruction */
-   exec_list instructions;
-
-   ir_to_mesa_instruction *ir_to_mesa_emit_op0(ir_instruction *ir,
-					       enum prog_opcode op);
-
-   ir_to_mesa_instruction *ir_to_mesa_emit_op1(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0);
-
-   ir_to_mesa_instruction *ir_to_mesa_emit_op2(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0,
-					       ir_to_mesa_src_reg src1);
-
-   ir_to_mesa_instruction *ir_to_mesa_emit_op3(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0,
-					       ir_to_mesa_src_reg src1,
-					       ir_to_mesa_src_reg src2);
-
-   void ir_to_mesa_emit_scalar_op1(ir_instruction *ir,
-				   enum prog_opcode op,
-				   ir_to_mesa_dst_reg dst,
-				   ir_to_mesa_src_reg src0);
-
-   void ir_to_mesa_emit_scalar_op2(ir_instruction *ir,
-				   enum prog_opcode op,
-				   ir_to_mesa_dst_reg dst,
-				   ir_to_mesa_src_reg src0,
-				   ir_to_mesa_src_reg src1);
-
-   GLboolean try_emit_mad(ir_expression *ir,
-			  int mul_operand);
-
-   int get_sampler_uniform_value(ir_dereference *deref);
-
-   void *mem_ctx;
-};
-
-ir_to_mesa_src_reg ir_to_mesa_undef = ir_to_mesa_src_reg(PROGRAM_UNDEFINED, 0, NULL);
-
-ir_to_mesa_dst_reg ir_to_mesa_undef_dst = {
-   PROGRAM_UNDEFINED, 0, SWIZZLE_NOOP, COND_TR, NULL,
-};
-
-ir_to_mesa_dst_reg ir_to_mesa_address_reg = {
-   PROGRAM_ADDRESS, 0, WRITEMASK_X, COND_TR, NULL
-};
-
-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);
-      prog->InfoLog = talloc_vasprintf_append(prog->InfoLog, fmt, args);
-      va_end(args);
-
-      prog->LinkStatus = GL_FALSE;
-   }
-
-static int swizzle_for_size(int size)
-{
-   int size_swizzles[4] = {
-      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X),
-      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y),
-      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_Z),
-      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W),
-   };
-
-   return size_swizzles[size - 1];
-}
-
-ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op3(ir_instruction *ir,
-					enum prog_opcode op,
-					ir_to_mesa_dst_reg dst,
-					ir_to_mesa_src_reg src0,
-					ir_to_mesa_src_reg src1,
-					ir_to_mesa_src_reg src2)
-{
-   ir_to_mesa_instruction *inst = new(mem_ctx) ir_to_mesa_instruction();
-   int num_reladdr = 0;
-
-   /* If we have to do relative addressing, we want to load the ARL
-    * reg directly for one of the regs, and preload the other reladdr
-    * sources into temps.
-    */
-   num_reladdr += dst.reladdr != NULL;
-   num_reladdr += src0.reladdr != NULL;
-   num_reladdr += src1.reladdr != NULL;
-   num_reladdr += src2.reladdr != NULL;
-
-   reladdr_to_temp(ir, &src2, &num_reladdr);
-   reladdr_to_temp(ir, &src1, &num_reladdr);
-   reladdr_to_temp(ir, &src0, &num_reladdr);
-
-   if (dst.reladdr) {
-      ir_to_mesa_emit_op1(ir, OPCODE_ARL, ir_to_mesa_address_reg,
-                          *dst.reladdr);
-
-      num_reladdr--;
-   }
-   assert(num_reladdr == 0);
-
-   inst->op = op;
-   inst->dst_reg = dst;
-   inst->src_reg[0] = src0;
-   inst->src_reg[1] = src1;
-   inst->src_reg[2] = src2;
-   inst->ir = ir;
-
-   inst->function = NULL;
-
-   this->instructions.push_tail(inst);
-
-   return inst;
-}
-
-
-ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op2(ir_instruction *ir,
-					enum prog_opcode op,
-					ir_to_mesa_dst_reg dst,
-					ir_to_mesa_src_reg src0,
-					ir_to_mesa_src_reg src1)
-{
-   return ir_to_mesa_emit_op3(ir, op, dst, src0, src1, ir_to_mesa_undef);
-}
-
-ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op1(ir_instruction *ir,
-					enum prog_opcode op,
-					ir_to_mesa_dst_reg dst,
-					ir_to_mesa_src_reg src0)
-{
-   assert(dst.writemask != 0);
-   return ir_to_mesa_emit_op3(ir, op, dst,
-			      src0, ir_to_mesa_undef, ir_to_mesa_undef);
-}
-
-ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op0(ir_instruction *ir,
-					enum prog_opcode op)
-{
-   return ir_to_mesa_emit_op3(ir, op, ir_to_mesa_undef_dst,
-			      ir_to_mesa_undef,
-			      ir_to_mesa_undef,
-			      ir_to_mesa_undef);
-}
-
-inline ir_to_mesa_dst_reg
-ir_to_mesa_dst_reg_from_src(ir_to_mesa_src_reg reg)
-{
-   ir_to_mesa_dst_reg dst_reg;
-
-   dst_reg.file = reg.file;
-   dst_reg.index = reg.index;
-   dst_reg.writemask = WRITEMASK_XYZW;
-   dst_reg.cond_mask = COND_TR;
-   dst_reg.reladdr = reg.reladdr;
-
-   return dst_reg;
-}
-
-inline ir_to_mesa_src_reg
-ir_to_mesa_src_reg_from_dst(ir_to_mesa_dst_reg reg)
-{
-   return ir_to_mesa_src_reg(reg.file, reg.index, NULL);
-}
-
-/**
- * Emits Mesa scalar opcodes to produce unique answers across channels.
- *
- * Some Mesa opcodes are scalar-only, like ARB_fp/vp.  The src X
- * channel determines the result across all channels.  So to do a vec4
- * of this operation, we want to emit a scalar per source channel used
- * to produce dest channels.
- */
-void
-ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op2(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg orig_src0,
-					       ir_to_mesa_src_reg orig_src1)
-{
-   int i, j;
-   int done_mask = ~dst.writemask;
-
-   /* Mesa RCP is a scalar operation splatting results to all channels,
-    * like ARB_fp/vp.  So emit as many RCPs as necessary to cover our
-    * dst channels.
-    */
-   for (i = 0; i < 4; i++) {
-      GLuint this_mask = (1 << i);
-      ir_to_mesa_instruction *inst;
-      ir_to_mesa_src_reg src0 = orig_src0;
-      ir_to_mesa_src_reg src1 = orig_src1;
-
-      if (done_mask & this_mask)
-	 continue;
-
-      GLuint src0_swiz = GET_SWZ(src0.swizzle, i);
-      GLuint src1_swiz = GET_SWZ(src1.swizzle, i);
-      for (j = i + 1; j < 4; j++) {
-	 if (!(done_mask & (1 << j)) &&
-	     GET_SWZ(src0.swizzle, j) == src0_swiz &&
-	     GET_SWZ(src1.swizzle, j) == src1_swiz) {
-	    this_mask |= (1 << j);
-	 }
-      }
-      src0.swizzle = MAKE_SWIZZLE4(src0_swiz, src0_swiz,
-				   src0_swiz, src0_swiz);
-      src1.swizzle = MAKE_SWIZZLE4(src1_swiz, src1_swiz,
-				  src1_swiz, src1_swiz);
-
-      inst = ir_to_mesa_emit_op2(ir, op,
-				 dst,
-				 src0,
-				 src1);
-      inst->dst_reg.writemask = this_mask;
-      done_mask |= this_mask;
-   }
-}
-
-void
-ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op1(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0)
-{
-   ir_to_mesa_src_reg undef = ir_to_mesa_undef;
-
-   undef.swizzle = SWIZZLE_XXXX;
-
-   ir_to_mesa_emit_scalar_op2(ir, op, dst, src0, undef);
-}
-
-struct ir_to_mesa_src_reg
-ir_to_mesa_visitor::src_reg_for_float(float val)
-{
-   ir_to_mesa_src_reg src_reg(PROGRAM_CONSTANT, -1, NULL);
-
-   src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,
-					      &val, 1, &src_reg.swizzle);
-
-   return src_reg;
-}
-
-static int
-type_size(const struct glsl_type *type)
-{
-   unsigned int i;
-   int size;
-
-   switch (type->base_type) {
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_BOOL:
-      if (type->is_matrix()) {
-	 return type->matrix_columns;
-      } else {
-	 /* Regardless of size of vector, it gets a vec4. This is bad
-	  * packing for things like floats, but otherwise arrays become a
-	  * mess.  Hopefully a later pass over the code can pack scalars
-	  * down if appropriate.
-	  */
-	 return 1;
-      }
-   case GLSL_TYPE_ARRAY:
-      return type_size(type->fields.array) * type->length;
-   case GLSL_TYPE_STRUCT:
-      size = 0;
-      for (i = 0; i < type->length; i++) {
-	 size += type_size(type->fields.structure[i].type);
-      }
-      return size;
-   case GLSL_TYPE_SAMPLER:
-      /* Samplers take up one slot in UNIFORMS[], but they're baked in
-       * at link time.
-       */
-      return 1;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
-/**
- * In the initial pass of codegen, we assign temporary numbers to
- * intermediate results.  (not SSA -- variable assignments will reuse
- * storage).  Actual register allocation for the Mesa VM occurs in a
- * pass over the Mesa IR later.
- */
-ir_to_mesa_src_reg
-ir_to_mesa_visitor::get_temp(const glsl_type *type)
-{
-   ir_to_mesa_src_reg src_reg;
-   int swizzle[4];
-   int i;
-
-   src_reg.file = PROGRAM_TEMPORARY;
-   src_reg.index = next_temp;
-   src_reg.reladdr = NULL;
-   next_temp += type_size(type);
-
-   if (type->is_array() || type->is_record()) {
-      src_reg.swizzle = SWIZZLE_NOOP;
-   } else {
-      for (i = 0; i < type->vector_elements; i++)
-	 swizzle[i] = i;
-      for (; i < 4; i++)
-	 swizzle[i] = type->vector_elements - 1;
-      src_reg.swizzle = MAKE_SWIZZLE4(swizzle[0], swizzle[1],
-				      swizzle[2], swizzle[3]);
-   }
-   src_reg.negate = 0;
-
-   return src_reg;
-}
-
-variable_storage *
-ir_to_mesa_visitor::find_variable_storage(ir_variable *var)
-{
-   
-   variable_storage *entry;
-
-   foreach_iter(exec_list_iterator, iter, this->variables) {
-      entry = (variable_storage *)iter.get();
-
-      if (entry->var == var)
-	 return entry;
-   }
-
-   return NULL;
-}
-
-struct statevar_element {
-   const char *field;
-   int tokens[STATE_LENGTH];
-   int swizzle;
-};
-
-static struct statevar_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 statevar_element gl_ClipPlane_elements[] = {
-   {NULL, {STATE_CLIPPLANE, 0, 0}, SWIZZLE_XYZW}
-};
-
-static struct statevar_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 statevar_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 statevar_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 statevar_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}, SWIZZLE_XYZW},
-   {"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 statevar_element gl_LightModel_elements[] = {
-   {"ambient", {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_FrontLightModelProduct_elements[] = {
-   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_BackLightModelProduct_elements[] = {
-   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW},
-};
-
-static struct statevar_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 statevar_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 statevar_element gl_TextureEnvColor_elements[] = {
-   {NULL, {STATE_TEXENV_COLOR, 0}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_EyePlaneS_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_S}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_EyePlaneT_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_T}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_EyePlaneR_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_R}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_EyePlaneQ_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_Q}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_ObjectPlaneS_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_S}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_ObjectPlaneT_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_T}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_ObjectPlaneR_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_R}, SWIZZLE_XYZW},
-};
-
-static struct statevar_element gl_ObjectPlaneQ_elements[] = {
-   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_Q}, SWIZZLE_XYZW},
-};
-
-static struct statevar_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 statevar_element gl_NormalScale_elements[] = {
-   {NULL, {STATE_NORMAL_SCALE}, SWIZZLE_XXXX},
-};
-
-#define MATRIX(name, statevar, modifier)			\
-   static struct statevar_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 statevar_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)}
-
-static const struct statevar {
-   const char *name;
-   struct statevar_element *elements;
-   unsigned int num_elements;
-} statevars[] = {
-   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),
-};
-
-void
-ir_to_mesa_visitor::visit(ir_variable *ir)
-{
-   if (strcmp(ir->name, "gl_FragCoord") == 0) {
-      struct gl_fragment_program *fp = (struct gl_fragment_program *)this->prog;
-
-      fp->OriginUpperLeft = ir->origin_upper_left;
-      fp->PixelCenterInteger = ir->pixel_center_integer;
-   }
-
-   if (ir->mode == ir_var_uniform && strncmp(ir->name, "gl_", 3) == 0) {
-      unsigned int i;
-
-      for (i = 0; i < Elements(statevars); i++) {
-	 if (strcmp(ir->name, statevars[i].name) == 0)
-	    break;
-      }
-
-      if (i == Elements(statevars)) {
-	 fail_link(this->shader_program,
-		   "Failed to find builtin uniform `%s'\n", ir->name);
-	 return;
-      }
-
-      const struct statevar *statevar = &statevars[i];
-
-      int array_count;
-      if (ir->type->is_array()) {
-	 array_count = ir->type->length;
-      } else {
-	 array_count = 1;
-      }
-
-      /* Check if this statevar's setup in the STATE file exactly
-       * matches how we'll want to reference it as a
-       * struct/array/whatever.  If not, then we need to move it into
-       * temporary storage and hope that it'll get copy-propagated
-       * out.
-       */
-      for (i = 0; i < statevar->num_elements; i++) {
-	 if (statevar->elements[i].swizzle != SWIZZLE_XYZW) {
-	    break;
-	 }
-      }
-
-      struct variable_storage *storage;
-      ir_to_mesa_dst_reg dst;
-      if (i == statevar->num_elements) {
-	 /* We'll set the index later. */
-	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_STATE_VAR, -1);
-	 this->variables.push_tail(storage);
-
-	 dst = ir_to_mesa_undef_dst;
-      } else {
-	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_TEMPORARY,
-						 this->next_temp);
-	 this->variables.push_tail(storage);
-	 this->next_temp += type_size(ir->type);
-
-	 dst = ir_to_mesa_dst_reg_from_src(ir_to_mesa_src_reg(PROGRAM_TEMPORARY,
-							      storage->index,
-							      NULL));
-      }
-
-
-      for (int a = 0; a < array_count; a++) {
-	 for (unsigned int i = 0; i < statevar->num_elements; i++) {
-	    struct statevar_element *element = &statevar->elements[i];
-	    int tokens[STATE_LENGTH];
-
-	    memcpy(tokens, element->tokens, sizeof(element->tokens));
-	    if (ir->type->is_array()) {
-	       tokens[1] = a;
-	    }
-
-	    int index = _mesa_add_state_reference(this->prog->Parameters,
-						  (gl_state_index *)tokens);
-
-	    if (storage->file == PROGRAM_STATE_VAR) {
-	       if (storage->index == -1) {
-		  storage->index = index;
-	       } else {
-		  assert(index ==
-                         (int)(storage->index + a * statevar->num_elements + i));
-	       }
-	    } else {
-	       ir_to_mesa_src_reg src(PROGRAM_STATE_VAR, index, NULL);
-	       src.swizzle = element->swizzle;
-	       ir_to_mesa_emit_op1(ir, OPCODE_MOV, dst, src);
-	       /* even a float takes up a whole vec4 reg in a struct/array. */
-	       dst.index++;
-	    }
-	 }
-      }
-      if (storage->file == PROGRAM_TEMPORARY &&
-	  dst.index != storage->index + type_size(ir->type)) {
-	 fail_link(this->shader_program,
-		   "failed to load builtin uniform `%s'  (%d/%d regs loaded)\n",
-		   ir->name, dst.index - storage->index,
-		   type_size(ir->type));
-      }
-   }
-}
-
-void
-ir_to_mesa_visitor::visit(ir_loop *ir)
-{
-   ir_dereference_variable *counter = NULL;
-
-   if (ir->counter != NULL)
-      counter = new(ir) ir_dereference_variable(ir->counter);
-
-   if (ir->from != NULL) {
-      assert(ir->counter != NULL);
-
-      ir_assignment *a = new(ir) ir_assignment(counter, ir->from, NULL);
-
-      a->accept(this);
-      delete a;
-   }
-
-   ir_to_mesa_emit_op0(NULL, OPCODE_BGNLOOP);
-
-   if (ir->to) {
-      ir_expression *e =
-	 new(ir) ir_expression(ir->cmp, glsl_type::bool_type,
-			       counter, ir->to);
-      ir_if *if_stmt =  new(ir) ir_if(e);
-
-      ir_loop_jump *brk = new(ir) ir_loop_jump(ir_loop_jump::jump_break);
-
-      if_stmt->then_instructions.push_tail(brk);
-
-      if_stmt->accept(this);
-
-      delete if_stmt;
-      delete e;
-      delete brk;
-   }
-
-   visit_exec_list(&ir->body_instructions, this);
-
-   if (ir->increment) {
-      ir_expression *e =
-	 new(ir) ir_expression(ir_binop_add, counter->type,
-			       counter, ir->increment);
-
-      ir_assignment *a = new(ir) ir_assignment(counter, e, NULL);
-
-      a->accept(this);
-      delete a;
-      delete e;
-   }
-
-   ir_to_mesa_emit_op0(NULL, OPCODE_ENDLOOP);
-}
-
-void
-ir_to_mesa_visitor::visit(ir_loop_jump *ir)
-{
-   switch (ir->mode) {
-   case ir_loop_jump::jump_break:
-      ir_to_mesa_emit_op0(NULL, OPCODE_BRK);
-      break;
-   case ir_loop_jump::jump_continue:
-      ir_to_mesa_emit_op0(NULL, OPCODE_CONT);
-      break;
-   }
-}
-
-
-void
-ir_to_mesa_visitor::visit(ir_function_signature *ir)
-{
-   assert(0);
-   (void)ir;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_function *ir)
-{
-   /* Ignore function bodies other than main() -- we shouldn't see calls to
-    * them since they should all be inlined before we get to ir_to_mesa.
-    */
-   if (strcmp(ir->name, "main") == 0) {
-      const ir_function_signature *sig;
-      exec_list empty;
-
-      sig = ir->matching_signature(&empty);
-
-      assert(sig);
-
-      foreach_iter(exec_list_iterator, iter, sig->body) {
-	 ir_instruction *ir = (ir_instruction *)iter.get();
-
-	 ir->accept(this);
-      }
-   }
-}
-
-GLboolean
-ir_to_mesa_visitor::try_emit_mad(ir_expression *ir, int mul_operand)
-{
-   int nonmul_operand = 1 - mul_operand;
-   ir_to_mesa_src_reg a, b, c;
-
-   ir_expression *expr = ir->operands[mul_operand]->as_expression();
-   if (!expr || expr->operation != ir_binop_mul)
-      return false;
-
-   expr->operands[0]->accept(this);
-   a = this->result;
-   expr->operands[1]->accept(this);
-   b = this->result;
-   ir->operands[nonmul_operand]->accept(this);
-   c = this->result;
-
-   this->result = get_temp(ir->type);
-   ir_to_mesa_emit_op3(ir, OPCODE_MAD,
-		       ir_to_mesa_dst_reg_from_src(this->result), a, b, c);
-
-   return true;
-}
-
-void
-ir_to_mesa_visitor::reladdr_to_temp(ir_instruction *ir,
-				    ir_to_mesa_src_reg *reg, int *num_reladdr)
-{
-   if (!reg->reladdr)
-      return;
-
-   ir_to_mesa_emit_op1(ir, OPCODE_ARL, ir_to_mesa_address_reg, *reg->reladdr);
-
-   if (*num_reladdr != 1) {
-      ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
-
-      ir_to_mesa_emit_op1(ir, OPCODE_MOV,
-			  ir_to_mesa_dst_reg_from_src(temp), *reg);
-      *reg = temp;
-   }
-
-   (*num_reladdr)--;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_expression *ir)
-{
-   unsigned int operand;
-   struct ir_to_mesa_src_reg op[2];
-   struct ir_to_mesa_src_reg result_src;
-   struct ir_to_mesa_dst_reg result_dst;
-   const glsl_type *vec4_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
-   const glsl_type *vec3_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 3, 1);
-   const glsl_type *vec2_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 2, 1);
-
-   /* Quick peephole: Emit OPCODE_MAD(a, b, c) instead of ADD(MUL(a, b), c)
-    */
-   if (ir->operation == ir_binop_add) {
-      if (try_emit_mad(ir, 1))
-	 return;
-      if (try_emit_mad(ir, 0))
-	 return;
-   }
-
-   for (operand = 0; operand < ir->get_num_operands(); operand++) {
-      this->result.file = PROGRAM_UNDEFINED;
-      ir->operands[operand]->accept(this);
-      if (this->result.file == PROGRAM_UNDEFINED) {
-	 ir_print_visitor v;
-	 printf("Failed to get tree for expression operand:\n");
-	 ir->operands[operand]->accept(&v);
-	 exit(1);
-      }
-      op[operand] = this->result;
-
-      /* Matrix expression operands should have been broken down to vector
-       * operations already.
-       */
-      assert(!ir->operands[operand]->type->is_matrix());
-   }
-
-   int vector_elements = ir->operands[0]->type->vector_elements;
-   if (ir->operands[1]) {
-      vector_elements = MAX2(vector_elements,
-			     ir->operands[1]->type->vector_elements);
-   }
-
-   this->result.file = PROGRAM_UNDEFINED;
-
-   /* Storage for our result.  Ideally for an assignment we'd be using
-    * the actual storage for the result here, instead.
-    */
-   result_src = get_temp(ir->type);
-   /* convenience for the emit functions below. */
-   result_dst = ir_to_mesa_dst_reg_from_src(result_src);
-   /* Limit writes to the channels that will be used by result_src later.
-    * This does limit this temp's use as a temporary for multi-instruction
-    * sequences.
-    */
-   result_dst.writemask = (1 << ir->type->vector_elements) - 1;
-
-   switch (ir->operation) {
-   case ir_unop_logic_not:
-      ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst,
-			  op[0], src_reg_for_float(0.0));
-      break;
-   case ir_unop_neg:
-      op[0].negate = ~op[0].negate;
-      result_src = op[0];
-      break;
-   case ir_unop_abs:
-      ir_to_mesa_emit_op1(ir, OPCODE_ABS, result_dst, op[0]);
-      break;
-   case ir_unop_sign:
-      ir_to_mesa_emit_op1(ir, OPCODE_SSG, result_dst, op[0]);
-      break;
-   case ir_unop_rcp:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RCP, result_dst, op[0]);
-      break;
-
-   case ir_unop_exp2:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_EX2, result_dst, op[0]);
-      break;
-   case ir_unop_exp:
-   case ir_unop_log:
-      assert(!"not reached: should be handled by ir_explog_to_explog2");
-      break;
-   case ir_unop_log2:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_LG2, result_dst, op[0]);
-      break;
-   case ir_unop_sin:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_SIN, result_dst, op[0]);
-      break;
-   case ir_unop_cos:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_COS, result_dst, op[0]);
-      break;
-
-   case ir_unop_dFdx:
-      ir_to_mesa_emit_op1(ir, OPCODE_DDX, result_dst, op[0]);
-      break;
-   case ir_unop_dFdy:
-      ir_to_mesa_emit_op1(ir, OPCODE_DDY, result_dst, op[0]);
-      break;
-
-   case ir_unop_noise: {
-      const enum prog_opcode opcode =
-	 prog_opcode(OPCODE_NOISE1
-		     + (ir->operands[0]->type->vector_elements) - 1);
-      assert((opcode >= OPCODE_NOISE1) && (opcode <= OPCODE_NOISE4));
-
-      ir_to_mesa_emit_op1(ir, opcode, result_dst, op[0]);
-      break;
-   }
-
-   case ir_binop_add:
-      ir_to_mesa_emit_op2(ir, OPCODE_ADD, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_sub:
-      ir_to_mesa_emit_op2(ir, OPCODE_SUB, result_dst, op[0], op[1]);
-      break;
-
-   case ir_binop_mul:
-      ir_to_mesa_emit_op2(ir, OPCODE_MUL, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_div:
-      assert(!"not reached: should be handled by ir_div_to_mul_rcp");
-   case ir_binop_mod:
-      assert(!"ir_binop_mod should have been converted to b * fract(a/b)");
-      break;
-
-   case ir_binop_less:
-      ir_to_mesa_emit_op2(ir, OPCODE_SLT, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_greater:
-      ir_to_mesa_emit_op2(ir, OPCODE_SGT, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_lequal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SLE, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_gequal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SGE, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_equal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_nequal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_all_equal:
-      /* "==" operator producing a scalar boolean. */
-      if (ir->operands[0]->type->is_vector() ||
-	  ir->operands[1]->type->is_vector()) {
-	 ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			     ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);
-	 if (vector_elements == 4)
-	    ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, temp, temp);
-	 else if (vector_elements == 3)
-	    ir_to_mesa_emit_op2(ir, OPCODE_DP3, result_dst, temp, temp);
-	 else
-	    ir_to_mesa_emit_op2(ir, OPCODE_DP2, result_dst, temp, temp);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SEQ,
-			     result_dst, result_src, src_reg_for_float(0.0));
-      } else {
-	 ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst, op[0], op[1]);
-      }
-      break;
-   case ir_binop_any_nequal:
-      /* "!=" operator producing a scalar boolean. */
-      if (ir->operands[0]->type->is_vector() ||
-	  ir->operands[1]->type->is_vector()) {
-	 ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			     ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);
-	 if (vector_elements == 4)
-	    ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, temp, temp);
-	 else if (vector_elements == 3)
-	    ir_to_mesa_emit_op2(ir, OPCODE_DP3, result_dst, temp, temp);
-	 else
-	    ir_to_mesa_emit_op2(ir, OPCODE_DP2, result_dst, temp, temp);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			     result_dst, result_src, src_reg_for_float(0.0));
-      } else {
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);
-      }
-      break;
-
-   case ir_unop_any:
-      switch (ir->operands[0]->type->vector_elements) {
-      case 4:
-	 ir_to_mesa_emit_op2(ir, OPCODE_DP4, result_dst, op[0], op[0]);
-	 break;
-      case 3:
-	 ir_to_mesa_emit_op2(ir, OPCODE_DP3, result_dst, op[0], op[0]);
-	 break;
-      case 2:
-	 ir_to_mesa_emit_op2(ir, OPCODE_DP2, result_dst, op[0], op[0]);
-	 break;
-      default:
-	 assert(!"unreached: ir_unop_any of non-bvec");
-	 break;
-      }
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			  result_dst, result_src, src_reg_for_float(0.0));
-      break;
-
-   case ir_binop_logic_xor:
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);
-      break;
-
-   case ir_binop_logic_or:
-      /* This could be a saturated add and skip the SNE. */
-      ir_to_mesa_emit_op2(ir, OPCODE_ADD,
-			  result_dst,
-			  op[0], op[1]);
-
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			  result_dst,
-			  result_src, src_reg_for_float(0.0));
-      break;
-
-   case ir_binop_logic_and:
-      /* the bool args are stored as float 0.0 or 1.0, so "mul" gives us "and". */
-      ir_to_mesa_emit_op2(ir, OPCODE_MUL,
-			  result_dst,
-			  op[0], op[1]);
-      break;
-
-   case ir_binop_dot:
-      if (ir->operands[0]->type == vec4_type) {
-	 assert(ir->operands[1]->type == vec4_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_DP4,
-			     result_dst,
-			     op[0], op[1]);
-      } else if (ir->operands[0]->type == vec3_type) {
-	 assert(ir->operands[1]->type == vec3_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_DP3,
-			     result_dst,
-			     op[0], op[1]);
-      } else if (ir->operands[0]->type == vec2_type) {
-	 assert(ir->operands[1]->type == vec2_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_DP2,
-			     result_dst,
-			     op[0], op[1]);
-      }
-      break;
-
-   case ir_binop_cross:
-      ir_to_mesa_emit_op2(ir, OPCODE_XPD, result_dst, op[0], op[1]);
-      break;
-
-   case ir_unop_sqrt:
-      /* sqrt(x) = x * rsq(x). */
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);
-      ir_to_mesa_emit_op2(ir, OPCODE_MUL, result_dst, result_src, op[0]);
-      /* For incoming channels <= 0, set the result to 0. */
-      op[0].negate = ~op[0].negate;
-      ir_to_mesa_emit_op3(ir, OPCODE_CMP, result_dst,
-			  op[0], result_src, src_reg_for_float(0.0));
-      break;
-   case ir_unop_rsq:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);
-      break;
-   case ir_unop_i2f:
-   case ir_unop_b2f:
-   case ir_unop_b2i:
-      /* Mesa IR lacks types, ints are stored as truncated floats. */
-      result_src = op[0];
-      break;
-   case ir_unop_f2i:
-      ir_to_mesa_emit_op1(ir, OPCODE_TRUNC, result_dst, op[0]);
-      break;
-   case ir_unop_f2b:
-   case ir_unop_i2b:
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst,
-			  op[0], src_reg_for_float(0.0));
-      break;
-   case ir_unop_trunc:
-      ir_to_mesa_emit_op1(ir, OPCODE_TRUNC, result_dst, op[0]);
-      break;
-   case ir_unop_ceil:
-      op[0].negate = ~op[0].negate;
-      ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);
-      result_src.negate = ~result_src.negate;
-      break;
-   case ir_unop_floor:
-      ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);
-      break;
-   case ir_unop_fract:
-      ir_to_mesa_emit_op1(ir, OPCODE_FRC, result_dst, op[0]);
-      break;
-
-   case ir_binop_min:
-      ir_to_mesa_emit_op2(ir, OPCODE_MIN, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_max:
-      ir_to_mesa_emit_op2(ir, OPCODE_MAX, result_dst, op[0], op[1]);
-      break;
-   case ir_binop_pow:
-      ir_to_mesa_emit_scalar_op2(ir, OPCODE_POW, result_dst, op[0], op[1]);
-      break;
-
-   case ir_unop_bit_not:
-   case ir_unop_u2f:
-   case ir_binop_lshift:
-   case ir_binop_rshift:
-   case ir_binop_bit_and:
-   case ir_binop_bit_xor:
-   case ir_binop_bit_or:
-      assert(!"GLSL 1.30 features unsupported");
-      break;
-   }
-
-   this->result = result_src;
-}
-
-
-void
-ir_to_mesa_visitor::visit(ir_swizzle *ir)
-{
-   ir_to_mesa_src_reg src_reg;
-   int i;
-   int swizzle[4];
-
-   /* Note that this is only swizzles in expressions, not those on the left
-    * hand side of an assignment, which do write masking.  See ir_assignment
-    * for that.
-    */
-
-   ir->val->accept(this);
-   src_reg = this->result;
-   assert(src_reg.file != PROGRAM_UNDEFINED);
-
-   for (i = 0; i < 4; i++) {
-      if (i < ir->type->vector_elements) {
-	 switch (i) {
-	 case 0:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.x);
-	    break;
-	 case 1:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.y);
-	    break;
-	 case 2:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.z);
-	    break;
-	 case 3:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.w);
-	    break;
-	 }
-      } else {
-	 /* If the type is smaller than a vec4, replicate the last
-	  * channel out.
-	  */
-	 swizzle[i] = swizzle[ir->type->vector_elements - 1];
-      }
-   }
-
-   src_reg.swizzle = MAKE_SWIZZLE4(swizzle[0],
-				   swizzle[1],
-				   swizzle[2],
-				   swizzle[3]);
-
-   this->result = src_reg;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
-{
-   variable_storage *entry = find_variable_storage(ir->var);
-
-   if (!entry) {
-      switch (ir->var->mode) {
-      case ir_var_uniform:
-	 entry = new(mem_ctx) variable_storage(ir->var, PROGRAM_UNIFORM,
-					       ir->var->location);
-	 this->variables.push_tail(entry);
-	 break;
-      case ir_var_in:
-      case ir_var_out:
-      case ir_var_inout:
-	 /* The linker assigns locations for varyings and attributes,
-	  * including deprecated builtins (like gl_Color), user-assign
-	  * generic attributes (glBindVertexLocation), and
-	  * user-defined varyings.
-	  *
-	  * FINISHME: We would hit this path for function arguments.  Fix!
-	  */
-	 assert(ir->var->location != -1);
-	 if (ir->var->mode == ir_var_in ||
-	     ir->var->mode == ir_var_inout) {
-	    entry = new(mem_ctx) variable_storage(ir->var,
-						  PROGRAM_INPUT,
-						  ir->var->location);
-
-	    if (this->prog->Target == GL_VERTEX_PROGRAM_ARB &&
-		ir->var->location >= VERT_ATTRIB_GENERIC0) {
-	       _mesa_add_attribute(prog->Attributes,
-				   ir->var->name,
-				   _mesa_sizeof_glsl_type(ir->var->type->gl_type),
-				   ir->var->type->gl_type,
-				   ir->var->location - VERT_ATTRIB_GENERIC0);
-	    }
-	 } else {
-	    entry = new(mem_ctx) variable_storage(ir->var,
-						  PROGRAM_OUTPUT,
-						  ir->var->location);
-	 }
-
-	 break;
-      case ir_var_auto:
-      case ir_var_temporary:
-	 entry = new(mem_ctx) variable_storage(ir->var, PROGRAM_TEMPORARY,
-					       this->next_temp);
-	 this->variables.push_tail(entry);
-
-	 next_temp += type_size(ir->var->type);
-	 break;
-      }
-
-      if (!entry) {
-	 printf("Failed to make storage for %s\n", ir->var->name);
-	 exit(1);
-      }
-   }
-
-   this->result = ir_to_mesa_src_reg(entry->file, entry->index, ir->var->type);
-}
-
-void
-ir_to_mesa_visitor::visit(ir_dereference_array *ir)
-{
-   ir_constant *index;
-   ir_to_mesa_src_reg src_reg;
-   int element_size = type_size(ir->type);
-
-   index = ir->array_index->constant_expression_value();
-
-   ir->array->accept(this);
-   src_reg = this->result;
-
-   if (index) {
-      src_reg.index += index->value.i[0] * element_size;
-   } else {
-      ir_to_mesa_src_reg array_base = this->result;
-      /* Variable index array dereference.  It eats the "vec4" of the
-       * base of the array and an index that offsets the Mesa register
-       * index.
-       */
-      ir->array_index->accept(this);
-
-      ir_to_mesa_src_reg index_reg;
-
-      if (element_size == 1) {
-	 index_reg = this->result;
-      } else {
-	 index_reg = get_temp(glsl_type::float_type);
-
-	 ir_to_mesa_emit_op2(ir, OPCODE_MUL,
-			     ir_to_mesa_dst_reg_from_src(index_reg),
-			     this->result, src_reg_for_float(element_size));
-      }
-
-      src_reg.reladdr = talloc(mem_ctx, ir_to_mesa_src_reg);
-      memcpy(src_reg.reladdr, &index_reg, sizeof(index_reg));
-   }
-
-   /* If the type is smaller than a vec4, replicate the last channel out. */
-   if (ir->type->is_scalar() || ir->type->is_vector())
-      src_reg.swizzle = swizzle_for_size(ir->type->vector_elements);
-   else
-      src_reg.swizzle = SWIZZLE_NOOP;
-
-   this->result = src_reg;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_dereference_record *ir)
-{
-   unsigned int i;
-   const glsl_type *struct_type = ir->record->type;
-   int offset = 0;
-
-   ir->record->accept(this);
-
-   for (i = 0; i < struct_type->length; i++) {
-      if (strcmp(struct_type->fields.structure[i].name, ir->field) == 0)
-	 break;
-      offset += type_size(struct_type->fields.structure[i].type);
-   }
-   this->result.swizzle = swizzle_for_size(ir->type->vector_elements);
-   this->result.index += offset;
-}
-
-/**
- * We want to be careful in assignment setup to hit the actual storage
- * instead of potentially using a temporary like we might with the
- * ir_dereference handler.
- */
-static struct ir_to_mesa_dst_reg
-get_assignment_lhs(ir_dereference *ir, ir_to_mesa_visitor *v)
-{
-   /* The LHS must be a dereference.  If the LHS is a variable indexed array
-    * access of a vector, it must be separated into a series conditional moves
-    * before reaching this point (see ir_vec_index_to_cond_assign).
-    */
-   assert(ir->as_dereference());
-   ir_dereference_array *deref_array = ir->as_dereference_array();
-   if (deref_array) {
-      assert(!deref_array->array->type->is_vector());
-   }
-
-   /* Use the rvalue deref handler for the most part.  We'll ignore
-    * swizzles in it and write swizzles using writemask, though.
-    */
-   ir->accept(v);
-   return ir_to_mesa_dst_reg_from_src(v->result);
-}
-
-void
-ir_to_mesa_visitor::visit(ir_assignment *ir)
-{
-   struct ir_to_mesa_dst_reg l;
-   struct ir_to_mesa_src_reg r;
-   int i;
-
-   ir->rhs->accept(this);
-   r = this->result;
-
-   l = get_assignment_lhs(ir->lhs, this);
-
-   /* FINISHME: This should really set to the correct maximal writemask for each
-    * FINISHME: component written (in the loops below).  This case can only
-    * FINISHME: occur for matrices, arrays, and structures.
-    */
-   if (ir->write_mask == 0) {
-      assert(!ir->lhs->type->is_scalar() && !ir->lhs->type->is_vector());
-      l.writemask = WRITEMASK_XYZW;
-   } else if (ir->lhs->type->is_scalar()) {
-      /* FINISHME: This hack makes writing to gl_FragDepth, which lives in the
-       * FINISHME: W component of fragment shader output zero, work correctly.
-       */
-      l.writemask = WRITEMASK_XYZW;
-   } else {
-      int swizzles[4];
-      int first_enabled_chan = 0;
-      int rhs_chan = 0;
-
-      assert(ir->lhs->type->is_vector());
-      l.writemask = ir->write_mask;
-
-      for (int i = 0; i < 4; i++) {
-	 if (l.writemask & (1 << i)) {
-	    first_enabled_chan = GET_SWZ(r.swizzle, i);
-	    break;
-	 }
-      }
-
-      /* Swizzle a small RHS vector into the channels being written.
-       *
-       * glsl ir treats write_mask as dictating how many channels are
-       * present on the RHS while Mesa IR treats write_mask as just
-       * showing which channels of the vec4 RHS get written.
-       */
-      for (int i = 0; i < 4; i++) {
-	 if (l.writemask & (1 << i))
-	    swizzles[i] = GET_SWZ(r.swizzle, rhs_chan++);
-	 else
-	    swizzles[i] = first_enabled_chan;
-      }
-      r.swizzle = MAKE_SWIZZLE4(swizzles[0], swizzles[1],
-				swizzles[2], swizzles[3]);
-   }
-
-   assert(l.file != PROGRAM_UNDEFINED);
-   assert(r.file != PROGRAM_UNDEFINED);
-
-   if (ir->condition) {
-      ir_to_mesa_src_reg condition;
-
-      ir->condition->accept(this);
-      condition = this->result;
-
-      /* We use the OPCODE_CMP (a < 0 ? b : c) for conditional moves,
-       * and the condition we produced is 0.0 or 1.0.  By flipping the
-       * sign, we can choose which value OPCODE_CMP produces without
-       * an extra computing the condition.
-       */
-      condition.negate = ~condition.negate;
-      for (i = 0; i < type_size(ir->lhs->type); i++) {
-	 ir_to_mesa_emit_op3(ir, OPCODE_CMP, l,
-			     condition, r, ir_to_mesa_src_reg_from_dst(l));
-	 l.index++;
-	 r.index++;
-      }
-   } else {
-      for (i = 0; i < type_size(ir->lhs->type); i++) {
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
-	 l.index++;
-	 r.index++;
-      }
-   }
-}
-
-
-void
-ir_to_mesa_visitor::visit(ir_constant *ir)
-{
-   ir_to_mesa_src_reg src_reg;
-   GLfloat stack_vals[4] = { 0 };
-   GLfloat *values = stack_vals;
-   unsigned int i;
-
-   /* Unfortunately, 4 floats is all we can get into
-    * _mesa_add_unnamed_constant.  So, make a temp to store an
-    * aggregate constant and move each constant value into it.  If we
-    * get lucky, copy propagation will eliminate the extra moves.
-    */
-
-   if (ir->type->base_type == GLSL_TYPE_STRUCT) {
-      ir_to_mesa_src_reg temp_base = get_temp(ir->type);
-      ir_to_mesa_dst_reg temp = ir_to_mesa_dst_reg_from_src(temp_base);
-
-      foreach_iter(exec_list_iterator, iter, ir->components) {
-	 ir_constant *field_value = (ir_constant *)iter.get();
-	 int size = type_size(field_value->type);
-
-	 assert(size > 0);
-
-	 field_value->accept(this);
-	 src_reg = this->result;
-
-	 for (i = 0; i < (unsigned int)size; i++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, temp, src_reg);
-
-	    src_reg.index++;
-	    temp.index++;
-	 }
-      }
-      this->result = temp_base;
-      return;
-   }
-
-   if (ir->type->is_array()) {
-      ir_to_mesa_src_reg temp_base = get_temp(ir->type);
-      ir_to_mesa_dst_reg temp = ir_to_mesa_dst_reg_from_src(temp_base);
-      int size = type_size(ir->type->fields.array);
-
-      assert(size > 0);
-
-      for (i = 0; i < ir->type->length; i++) {
-	 ir->array_elements[i]->accept(this);
-	 src_reg = this->result;
-	 for (int j = 0; j < size; j++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, temp, src_reg);
-
-	    src_reg.index++;
-	    temp.index++;
-	 }
-      }
-      this->result = temp_base;
-      return;
-   }
-
-   if (ir->type->is_matrix()) {
-      ir_to_mesa_src_reg mat = get_temp(ir->type);
-      ir_to_mesa_dst_reg mat_column = ir_to_mesa_dst_reg_from_src(mat);
-
-      for (i = 0; i < ir->type->matrix_columns; i++) {
-	 assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-	 values = &ir->value.f[i * ir->type->vector_elements];
-
-	 src_reg = ir_to_mesa_src_reg(PROGRAM_CONSTANT, -1, NULL);
-	 src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,
-						values,
-						ir->type->vector_elements,
-						&src_reg.swizzle);
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, mat_column, src_reg);
-
-	 mat_column.index++;
-      }
-
-      this->result = mat;
-      return;
-   }
-
-   src_reg.file = PROGRAM_CONSTANT;
-   switch (ir->type->base_type) {
-   case GLSL_TYPE_FLOAT:
-      values = &ir->value.f[0];
-      break;
-   case GLSL_TYPE_UINT:
-      for (i = 0; i < ir->type->vector_elements; i++) {
-	 values[i] = ir->value.u[i];
-      }
-      break;
-   case GLSL_TYPE_INT:
-      for (i = 0; i < ir->type->vector_elements; i++) {
-	 values[i] = ir->value.i[i];
-      }
-      break;
-   case GLSL_TYPE_BOOL:
-      for (i = 0; i < ir->type->vector_elements; i++) {
-	 values[i] = ir->value.b[i];
-      }
-      break;
-   default:
-      assert(!"Non-float/uint/int/bool constant");
-   }
-
-   this->result = ir_to_mesa_src_reg(PROGRAM_CONSTANT, -1, ir->type);
-   this->result.index = _mesa_add_unnamed_constant(this->prog->Parameters,
-						   values,
-						   ir->type->vector_elements,
-						   &this->result.swizzle);
-}
-
-function_entry *
-ir_to_mesa_visitor::get_function_signature(ir_function_signature *sig)
-{
-   function_entry *entry;
-
-   foreach_iter(exec_list_iterator, iter, this->function_signatures) {
-      entry = (function_entry *)iter.get();
-
-      if (entry->sig == sig)
-	 return entry;
-   }
-
-   entry = talloc(mem_ctx, function_entry);
-   entry->sig = sig;
-   entry->sig_id = this->next_signature_id++;
-   entry->bgn_inst = NULL;
-
-   /* Allocate storage for all the parameters. */
-   foreach_iter(exec_list_iterator, iter, sig->parameters) {
-      ir_variable *param = (ir_variable *)iter.get();
-      variable_storage *storage;
-
-      storage = find_variable_storage(param);
-      assert(!storage);
-
-      storage = new(mem_ctx) variable_storage(param, PROGRAM_TEMPORARY,
-					      this->next_temp);
-      this->variables.push_tail(storage);
-
-      this->next_temp += type_size(param->type);
-   }
-
-   if (!sig->return_type->is_void()) {
-      entry->return_reg = get_temp(sig->return_type);
-   } else {
-      entry->return_reg = ir_to_mesa_undef;
-   }
-
-   this->function_signatures.push_tail(entry);
-   return entry;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_call *ir)
-{
-   ir_to_mesa_instruction *call_inst;
-   ir_function_signature *sig = ir->get_callee();
-   function_entry *entry = get_function_signature(sig);
-   int i;
-
-   /* Process in parameters. */
-   exec_list_iterator sig_iter = sig->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_in ||
-	  param->mode == ir_var_inout) {
-	 variable_storage *storage = find_variable_storage(param);
-	 assert(storage);
-
-	 param_rval->accept(this);
-	 ir_to_mesa_src_reg r = this->result;
-
-	 ir_to_mesa_dst_reg l;
-	 l.file = storage->file;
-	 l.index = storage->index;
-	 l.reladdr = NULL;
-	 l.writemask = WRITEMASK_XYZW;
-	 l.cond_mask = COND_TR;
-
-	 for (i = 0; i < type_size(param->type); i++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
-	    l.index++;
-	    r.index++;
-	 }
-      }
-
-      sig_iter.next();
-   }
-   assert(!sig_iter.has_next());
-
-   /* Emit call instruction */
-   call_inst = ir_to_mesa_emit_op1(ir, OPCODE_CAL,
-				   ir_to_mesa_undef_dst, ir_to_mesa_undef);
-   call_inst->function = entry;
-
-   /* Process out parameters. */
-   sig_iter = sig->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) {
-	 variable_storage *storage = find_variable_storage(param);
-	 assert(storage);
-
-	 ir_to_mesa_src_reg r;
-	 r.file = storage->file;
-	 r.index = storage->index;
-	 r.reladdr = NULL;
-	 r.swizzle = SWIZZLE_NOOP;
-	 r.negate = 0;
-
-	 param_rval->accept(this);
-	 ir_to_mesa_dst_reg l = ir_to_mesa_dst_reg_from_src(this->result);
-
-	 for (i = 0; i < type_size(param->type); i++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
-	    l.index++;
-	    r.index++;
-	 }
-      }
-
-      sig_iter.next();
-   }
-   assert(!sig_iter.has_next());
-
-   /* Process return value. */
-   this->result = entry->return_reg;
-}
-
-class get_sampler_name : public ir_hierarchical_visitor
-{
-public:
-   get_sampler_name(ir_to_mesa_visitor *mesa, ir_dereference *last)
-   {
-      this->mem_ctx = mesa->mem_ctx;
-      this->mesa = mesa;
-      this->name = NULL;
-      this->offset = 0;
-      this->last = last;
-   }
-
-   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 = talloc_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.
-	  */
-	 mesa->shader_program->InfoLog =
-	    talloc_asprintf_append(mesa->shader_program->InfoLog,
-				   "warning: Variable sampler array index "
-				   "unsupported.\nThis 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 = talloc_asprintf(mem_ctx, "%s[%d]", name, i);
-      } else {
-	 offset = i;
-      }
-      return visit_continue;
-   }
-
-   ir_to_mesa_visitor *mesa;
-   const char *name;
-   void *mem_ctx;
-   int offset;
-   ir_dereference *last;
-};
-
-int
-ir_to_mesa_visitor::get_sampler_uniform_value(ir_dereference *sampler)
-{
-   get_sampler_name getname(this, sampler);
-
-   sampler->accept(&getname);
-
-   GLint index = _mesa_lookup_parameter_index(prog->Parameters, -1,
-					      getname.name);
-
-   if (index < 0) {
-      fail_link(this->shader_program,
-		"failed to find sampler named %s.\n", getname.name);
-      return 0;
-   }
-
-   index += getname.offset;
-
-   return this->prog->Parameters->ParameterValues[index][0];
-}
-
-void
-ir_to_mesa_visitor::visit(ir_texture *ir)
-{
-   ir_to_mesa_src_reg result_src, coord, lod_info, projector;
-   ir_to_mesa_dst_reg result_dst, coord_dst;
-   ir_to_mesa_instruction *inst = NULL;
-   prog_opcode opcode = OPCODE_NOP;
-
-   ir->coordinate->accept(this);
-
-   /* Put our coords in a temp.  We'll need to modify them for shadow,
-    * projection, or LOD, so the only case we'd use it as is is if
-    * we're doing plain old texturing.  Mesa IR optimization should
-    * handle cleaning up our mess in that case.
-    */
-   coord = get_temp(glsl_type::vec4_type);
-   coord_dst = ir_to_mesa_dst_reg_from_src(coord);
-   ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst,
-		       this->result);
-
-   if (ir->projector) {
-      ir->projector->accept(this);
-      projector = this->result;
-   }
-
-   /* Storage for our result.  Ideally for an assignment we'd be using
-    * the actual storage for the result here, instead.
-    */
-   result_src = get_temp(glsl_type::vec4_type);
-   result_dst = ir_to_mesa_dst_reg_from_src(result_src);
-
-   switch (ir->op) {
-   case ir_tex:
-      opcode = OPCODE_TEX;
-      break;
-   case ir_txb:
-      opcode = OPCODE_TXB;
-      ir->lod_info.bias->accept(this);
-      lod_info = this->result;
-      break;
-   case ir_txl:
-      opcode = OPCODE_TXL;
-      ir->lod_info.lod->accept(this);
-      lod_info = this->result;
-      break;
-   case ir_txd:
-   case ir_txf:
-      assert(!"GLSL 1.30 features unsupported");
-      break;
-   }
-
-   if (ir->projector) {
-      if (opcode == OPCODE_TEX) {
-	 /* Slot the projector in as the last component of the coord. */
-	 coord_dst.writemask = WRITEMASK_W;
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, projector);
-	 coord_dst.writemask = WRITEMASK_XYZW;
-	 opcode = OPCODE_TXP;
-      } else {
-	 ir_to_mesa_src_reg coord_w = coord;
-	 coord_w.swizzle = SWIZZLE_WWWW;
-
-	 /* For the other TEX opcodes there's no projective version
-	  * since the last slot is taken up by lod info.  Do the
-	  * projective divide now.
-	  */
-	 coord_dst.writemask = WRITEMASK_W;
-	 ir_to_mesa_emit_op1(ir, OPCODE_RCP, coord_dst, projector);
-
-	 coord_dst.writemask = WRITEMASK_XYZ;
-	 ir_to_mesa_emit_op2(ir, OPCODE_MUL, coord_dst, coord, coord_w);
-
-	 coord_dst.writemask = WRITEMASK_XYZW;
-	 coord.swizzle = SWIZZLE_XYZW;
-      }
-   }
-
-   if (ir->shadow_comparitor) {
-      /* Slot the shadow value in as the second to last component of the
-       * coord.
-       */
-      ir->shadow_comparitor->accept(this);
-      coord_dst.writemask = WRITEMASK_Z;
-      ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, this->result);
-      coord_dst.writemask = WRITEMASK_XYZW;
-   }
-
-   if (opcode == OPCODE_TXL || opcode == OPCODE_TXB) {
-      /* Mesa IR stores lod or lod bias in the last channel of the coords. */
-      coord_dst.writemask = WRITEMASK_W;
-      ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, lod_info);
-      coord_dst.writemask = WRITEMASK_XYZW;
-   }
-
-   inst = ir_to_mesa_emit_op1(ir, opcode, result_dst, coord);
-
-   if (ir->shadow_comparitor)
-      inst->tex_shadow = GL_TRUE;
-
-   inst->sampler = get_sampler_uniform_value(ir->sampler);
-
-   const glsl_type *sampler_type = ir->sampler->type;
-
-   switch (sampler_type->sampler_dimensionality) {
-   case GLSL_SAMPLER_DIM_1D:
-      inst->tex_target = (sampler_type->sampler_array)
-	 ? TEXTURE_1D_ARRAY_INDEX : TEXTURE_1D_INDEX;
-      break;
-   case GLSL_SAMPLER_DIM_2D:
-      inst->tex_target = (sampler_type->sampler_array)
-	 ? TEXTURE_2D_ARRAY_INDEX : TEXTURE_2D_INDEX;
-      break;
-   case GLSL_SAMPLER_DIM_3D:
-      inst->tex_target = TEXTURE_3D_INDEX;
-      break;
-   case GLSL_SAMPLER_DIM_CUBE:
-      inst->tex_target = TEXTURE_CUBE_INDEX;
-      break;
-   case GLSL_SAMPLER_DIM_RECT:
-      inst->tex_target = TEXTURE_RECT_INDEX;
-      break;
-   case GLSL_SAMPLER_DIM_BUF:
-      assert(!"FINISHME: Implement ARB_texture_buffer_object");
-      break;
-   default:
-      assert(!"Should not get here.");
-   }
-
-   this->result = result_src;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_return *ir)
-{
-   if (ir->get_value()) {
-      ir_to_mesa_dst_reg l;
-      int i;
-
-      assert(current_function);
-
-      ir->get_value()->accept(this);
-      ir_to_mesa_src_reg r = this->result;
-
-      l = ir_to_mesa_dst_reg_from_src(current_function->return_reg);
-
-      for (i = 0; i < type_size(current_function->sig->return_type); i++) {
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
-	 l.index++;
-	 r.index++;
-      }
-   }
-
-   ir_to_mesa_emit_op0(ir, OPCODE_RET);
-}
-
-void
-ir_to_mesa_visitor::visit(ir_discard *ir)
-{
-   struct gl_fragment_program *fp = (struct gl_fragment_program *)this->prog;
-
-   assert(ir->condition == NULL); /* FINISHME */
-
-   ir_to_mesa_emit_op0(ir, OPCODE_KIL_NV);
-   fp->UsesKill = GL_TRUE;
-}
-
-void
-ir_to_mesa_visitor::visit(ir_if *ir)
-{
-   ir_to_mesa_instruction *cond_inst, *if_inst, *else_inst = NULL;
-   ir_to_mesa_instruction *prev_inst;
-
-   prev_inst = (ir_to_mesa_instruction *)this->instructions.get_tail();
-
-   ir->condition->accept(this);
-   assert(this->result.file != PROGRAM_UNDEFINED);
-
-   if (this->options->EmitCondCodes) {
-      cond_inst = (ir_to_mesa_instruction *)this->instructions.get_tail();
-
-      /* See if we actually generated any instruction for generating
-       * the condition.  If not, then cook up a move to a temp so we
-       * have something to set cond_update on.
-       */
-      if (cond_inst == prev_inst) {
-	 ir_to_mesa_src_reg temp = get_temp(glsl_type::bool_type);
-	 cond_inst = ir_to_mesa_emit_op1(ir->condition, OPCODE_MOV,
-					 ir_to_mesa_dst_reg_from_src(temp),
-					 result);
-      }
-      cond_inst->cond_update = GL_TRUE;
-
-      if_inst = ir_to_mesa_emit_op0(ir->condition, OPCODE_IF);
-      if_inst->dst_reg.cond_mask = COND_NE;
-   } else {
-      if_inst = ir_to_mesa_emit_op1(ir->condition,
-				    OPCODE_IF, ir_to_mesa_undef_dst,
-				    this->result);
-   }
-
-   this->instructions.push_tail(if_inst);
-
-   visit_exec_list(&ir->then_instructions, this);
-
-   if (!ir->else_instructions.is_empty()) {
-      else_inst = ir_to_mesa_emit_op0(ir->condition, OPCODE_ELSE);
-      visit_exec_list(&ir->else_instructions, this);
-   }
-
-   if_inst = ir_to_mesa_emit_op1(ir->condition, OPCODE_ENDIF,
-				 ir_to_mesa_undef_dst, ir_to_mesa_undef);
-}
-
-ir_to_mesa_visitor::ir_to_mesa_visitor()
-{
-   result.file = PROGRAM_UNDEFINED;
-   next_temp = 1;
-   next_signature_id = 1;
-   current_function = NULL;
-   mem_ctx = talloc_new(NULL);
-}
-
-ir_to_mesa_visitor::~ir_to_mesa_visitor()
-{
-   talloc_free(mem_ctx);
-}
-
-static struct prog_src_register
-mesa_src_reg_from_ir_src_reg(ir_to_mesa_src_reg reg)
-{
-   struct prog_src_register mesa_reg;
-
-   mesa_reg.File = reg.file;
-   assert(reg.index < (1 << INST_INDEX_BITS) - 1);
-   mesa_reg.Index = reg.index;
-   mesa_reg.Swizzle = reg.swizzle;
-   mesa_reg.RelAddr = reg.reladdr != NULL;
-   mesa_reg.Negate = reg.negate;
-   mesa_reg.Abs = 0;
-   mesa_reg.HasIndex2 = GL_FALSE;
-   mesa_reg.RelAddr2 = 0;
-   mesa_reg.Index2 = 0;
-
-   return mesa_reg;
-}
-
-static void
-set_branchtargets(ir_to_mesa_visitor *v,
-		  struct prog_instruction *mesa_instructions,
-		  int num_instructions)
-{
-   int if_count = 0, loop_count = 0;
-   int *if_stack, *loop_stack;
-   int if_stack_pos = 0, loop_stack_pos = 0;
-   int i, j;
-
-   for (i = 0; i < num_instructions; i++) {
-      switch (mesa_instructions[i].Opcode) {
-      case OPCODE_IF:
-	 if_count++;
-	 break;
-      case OPCODE_BGNLOOP:
-	 loop_count++;
-	 break;
-      case OPCODE_BRK:
-      case OPCODE_CONT:
-	 mesa_instructions[i].BranchTarget = -1;
-	 break;
-      default:
-	 break;
-      }
-   }
-
-   if_stack = talloc_zero_array(v->mem_ctx, int, if_count);
-   loop_stack = talloc_zero_array(v->mem_ctx, int, loop_count);
-
-   for (i = 0; i < num_instructions; i++) {
-      switch (mesa_instructions[i].Opcode) {
-      case OPCODE_IF:
-	 if_stack[if_stack_pos] = i;
-	 if_stack_pos++;
-	 break;
-      case OPCODE_ELSE:
-	 mesa_instructions[if_stack[if_stack_pos - 1]].BranchTarget = i;
-	 if_stack[if_stack_pos - 1] = i;
-	 break;
-      case OPCODE_ENDIF:
-	 mesa_instructions[if_stack[if_stack_pos - 1]].BranchTarget = i;
-	 if_stack_pos--;
-	 break;
-      case OPCODE_BGNLOOP:
-	 loop_stack[loop_stack_pos] = i;
-	 loop_stack_pos++;
-	 break;
-      case OPCODE_ENDLOOP:
-	 loop_stack_pos--;
-	 /* Rewrite any breaks/conts at this nesting level (haven't
-	  * already had a BranchTarget assigned) to point to the end
-	  * of the loop.
-	  */
-	 for (j = loop_stack[loop_stack_pos]; j < i; j++) {
-	    if (mesa_instructions[j].Opcode == OPCODE_BRK ||
-		mesa_instructions[j].Opcode == OPCODE_CONT) {
-	       if (mesa_instructions[j].BranchTarget == -1) {
-		  mesa_instructions[j].BranchTarget = i;
-	       }
-	    }
-	 }
-	 /* The loop ends point at each other. */
-	 mesa_instructions[i].BranchTarget = loop_stack[loop_stack_pos];
-	 mesa_instructions[loop_stack[loop_stack_pos]].BranchTarget = i;
-	 break;
-      case OPCODE_CAL:
-	 foreach_iter(exec_list_iterator, iter, v->function_signatures) {
-	    function_entry *entry = (function_entry *)iter.get();
-
-	    if (entry->sig_id == mesa_instructions[i].BranchTarget) {
-	       mesa_instructions[i].BranchTarget = entry->inst;
-	       break;
-	    }
-	 }
-	 break;
-      default:
-	 break;
-      }
-   }
-}
-
-static void
-print_program(struct prog_instruction *mesa_instructions,
-	      ir_instruction **mesa_instruction_annotation,
-	      int num_instructions)
-{
-   ir_instruction *last_ir = NULL;
-   int i;
-   int indent = 0;
-
-   for (i = 0; i < num_instructions; i++) {
-      struct prog_instruction *mesa_inst = mesa_instructions + i;
-      ir_instruction *ir = mesa_instruction_annotation[i];
-
-      fprintf(stdout, "%3d: ", i);
-
-      if (last_ir != ir && ir) {
-	 int j;
-
-	 for (j = 0; j < indent; j++) {
-	    fprintf(stdout, " ");
-	 }
-	 ir->print();
-	 printf("\n");
-	 last_ir = ir;
-
-	 fprintf(stdout, "     "); /* line number spacing. */
-      }
-
-      indent = _mesa_fprint_instruction_opt(stdout, mesa_inst, indent,
-					    PROG_PRINT_DEBUG, NULL);
-   }
-}
-
-static void
-count_resources(struct gl_program *prog)
-{
-   unsigned int i;
-
-   prog->SamplersUsed = 0;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = &prog->Instructions[i];
-
-      if (_mesa_is_tex_instruction(inst->Opcode)) {
-	 prog->SamplerTargets[inst->TexSrcUnit] =
-	    (gl_texture_index)inst->TexSrcTarget;
-	 prog->SamplersUsed |= 1 << inst->TexSrcUnit;
-	 if (inst->TexShadow) {
-	    prog->ShadowSamplers |= 1 << inst->TexSrcUnit;
-	 }
-      }
-   }
-
-   _mesa_update_shader_textures_used(prog);
-}
-
-struct uniform_sort {
-   struct gl_uniform *u;
-   int pos;
-};
-
-/* The shader_program->Uniforms list is almost sorted in increasing
- * uniform->{Frag,Vert}Pos locations, but not quite when there are
- * uniforms shared between targets.  We need to add parameters in
- * increasing order for the targets.
- */
-static int
-sort_uniforms(const void *a, const void *b)
-{
-   struct uniform_sort *u1 = (struct uniform_sort *)a;
-   struct uniform_sort *u2 = (struct uniform_sort *)b;
-
-   return u1->pos - u2->pos;
-}
-
-/* Add the uniforms to the parameters.  The linker chose locations
- * in our parameters lists (which weren't created yet), which the
- * uniforms code will use to poke values into our parameters list
- * when uniforms are updated.
- */
-static void
-add_uniforms_to_parameters_list(struct gl_shader_program *shader_program,
-				struct gl_shader *shader,
-				struct gl_program *prog)
-{
-   unsigned int i;
-   unsigned int next_sampler = 0, num_uniforms = 0;
-   struct uniform_sort *sorted_uniforms;
-
-   sorted_uniforms = talloc_array(NULL, struct uniform_sort,
-				  shader_program->Uniforms->NumUniforms);
-
-   for (i = 0; i < shader_program->Uniforms->NumUniforms; i++) {
-      struct gl_uniform *uniform = shader_program->Uniforms->Uniforms + i;
-      int parameter_index = -1;
-
-      switch (shader->Type) {
-      case GL_VERTEX_SHADER:
-	 parameter_index = uniform->VertPos;
-	 break;
-      case GL_FRAGMENT_SHADER:
-	 parameter_index = uniform->FragPos;
-	 break;
-      case GL_GEOMETRY_SHADER:
-	 parameter_index = uniform->GeomPos;
-	 break;
-      }
-
-      /* Only add uniforms used in our target. */
-      if (parameter_index != -1) {
-	 sorted_uniforms[num_uniforms].pos = parameter_index;
-	 sorted_uniforms[num_uniforms].u = uniform;
-	 num_uniforms++;
-      }
-   }
-
-   qsort(sorted_uniforms, num_uniforms, sizeof(struct uniform_sort),
-	 sort_uniforms);
-
-   for (i = 0; i < num_uniforms; i++) {
-      struct gl_uniform *uniform = sorted_uniforms[i].u;
-      int parameter_index = sorted_uniforms[i].pos;
-      const glsl_type *type = uniform->Type;
-      unsigned int size;
-
-      if (type->is_vector() ||
-	  type->is_scalar()) {
-	 size = type->vector_elements;
-      } else {
-	 size = type_size(type) * 4;
-      }
-
-      gl_register_file file;
-      if (type->is_sampler() ||
-	  (type->is_array() && type->fields.array->is_sampler())) {
-	 file = PROGRAM_SAMPLER;
-      } else {
-	 file = PROGRAM_UNIFORM;
-      }
-
-      GLint index = _mesa_lookup_parameter_index(prog->Parameters, -1,
-						 uniform->Name);
-
-      if (index < 0) {
-	 index = _mesa_add_parameter(prog->Parameters, file,
-				     uniform->Name, size, type->gl_type,
-				     NULL, NULL, 0x0);
-
-	 /* Sampler uniform values are stored in prog->SamplerUnits,
-	  * and the entry in that array is selected by this index we
-	  * store in ParameterValues[].
-	  */
-	 if (file == PROGRAM_SAMPLER) {
-	    for (unsigned int j = 0; j < size / 4; j++)
-	       prog->Parameters->ParameterValues[index + j][0] = next_sampler++;
-	 }
-
-	 /* The location chosen in the Parameters list here (returned
-	  * from _mesa_add_uniform) has to match what the linker chose.
-	  */
-	 if (index != parameter_index) {
-	    fail_link(shader_program, "Allocation of uniform `%s' to target "
-		      "failed (%d vs %d)\n",
-		      uniform->Name, index, parameter_index);
-	 }
-      }
-   }
-
-   talloc_free(sorted_uniforms);
-}
-
-static void
-set_uniform_initializer(GLcontext *ctx, void *mem_ctx,
-			struct gl_shader_program *shader_program,
-			const char *name, const glsl_type *type,
-			ir_constant *val)
-{
-   if (type->is_record()) {
-      ir_constant *field_constant;
-
-      field_constant = (ir_constant *)val->components.get_head();
-
-      for (unsigned int i = 0; i < type->length; i++) {
-	 const glsl_type *field_type = type->fields.structure[i].type;
-	 const char *field_name = talloc_asprintf(mem_ctx, "%s.%s", name,
-					    type->fields.structure[i].name);
-	 set_uniform_initializer(ctx, mem_ctx, shader_program, field_name,
-				 field_type, field_constant);
-	 field_constant = (ir_constant *)field_constant->next;
-      }
-      return;
-   }
-
-   int loc = _mesa_get_uniform_location(ctx, shader_program, name);
-
-   if (loc == -1) {
-      fail_link(shader_program,
-		"Couldn't find uniform for initializer %s\n", name);
-      return;
-   }
-
-   for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) {
-      ir_constant *element;
-      const glsl_type *element_type;
-      if (type->is_array()) {
-	 element = val->array_elements[i];
-	 element_type = type->fields.array;
-      } else {
-	 element = val;
-	 element_type = type;
-      }
-
-      void *values;
-
-      if (element_type->base_type == GLSL_TYPE_BOOL) {
-	 int *conv = talloc_array(mem_ctx, int, element_type->components());
-	 for (unsigned int j = 0; j < element_type->components(); j++) {
-	    conv[j] = element->value.b[j];
-	 }
-	 values = (void *)conv;
-	 element_type = glsl_type::get_instance(GLSL_TYPE_INT,
-						element_type->vector_elements,
-						1);
-      } else {
-	 values = &element->value;
-      }
-
-      if (element_type->is_matrix()) {
-	 _mesa_uniform_matrix(ctx, shader_program,
-			      element_type->matrix_columns,
-			      element_type->vector_elements,
-			      loc, 1, GL_FALSE, (GLfloat *)values);
-	 loc += element_type->matrix_columns;
-      } else {
-	 _mesa_uniform(ctx, shader_program, loc, element_type->matrix_columns,
-		       values, element_type->gl_type);
-	 loc += type_size(element_type);
-      }
-   }
-}
-
-static void
-set_uniform_initializers(GLcontext *ctx,
-			 struct gl_shader_program *shader_program)
-{
-   void *mem_ctx = NULL;
-
-   for (unsigned int i = 0; i < shader_program->_NumLinkedShaders; i++) {
-      struct gl_shader *shader = shader_program->_LinkedShaders[i];
-      foreach_iter(exec_list_iterator, iter, *shader->ir) {
-	 ir_instruction *ir = (ir_instruction *)iter.get();
-	 ir_variable *var = ir->as_variable();
-
-	 if (!var || var->mode != ir_var_uniform || !var->constant_value)
-	    continue;
-
-	 if (!mem_ctx)
-	    mem_ctx = talloc_new(NULL);
-
-	 set_uniform_initializer(ctx, mem_ctx, shader_program, var->name,
-				 var->type, var->constant_value);
-      }
-   }
-
-   talloc_free(mem_ctx);
-}
-
-struct gl_program *
-get_mesa_program(GLcontext *ctx, struct gl_shader_program *shader_program,
-		 struct gl_shader *shader)
-{
-   ir_to_mesa_visitor v;
-   struct prog_instruction *mesa_instructions, *mesa_inst;
-   ir_instruction **mesa_instruction_annotation;
-   int i;
-   struct gl_program *prog;
-   GLenum target;
-   const char *target_string;
-   GLboolean progress;
-   struct gl_shader_compiler_options *options =
-         &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(shader->Type)];
-
-   switch (shader->Type) {
-   case GL_VERTEX_SHADER:
-      target = GL_VERTEX_PROGRAM_ARB;
-      target_string = "vertex";
-      break;
-   case GL_FRAGMENT_SHADER:
-      target = GL_FRAGMENT_PROGRAM_ARB;
-      target_string = "fragment";
-      break;
-   default:
-      assert(!"should not be reached");
-      return NULL;
-   }
-
-   validate_ir_tree(shader->ir);
-
-   prog = ctx->Driver.NewProgram(ctx, target, shader_program->Name);
-   if (!prog)
-      return NULL;
-   prog->Parameters = _mesa_new_parameter_list();
-   prog->Varying = _mesa_new_parameter_list();
-   prog->Attributes = _mesa_new_parameter_list();
-   v.ctx = ctx;
-   v.prog = prog;
-   v.shader_program = shader_program;
-   v.options = options;
-
-   add_uniforms_to_parameters_list(shader_program, shader, prog);
-
-   /* Emit Mesa IR for main(). */
-   visit_exec_list(shader->ir, &v);
-   v.ir_to_mesa_emit_op0(NULL, OPCODE_END);
-
-   /* Now emit bodies for any functions that were used. */
-   do {
-      progress = GL_FALSE;
-
-      foreach_iter(exec_list_iterator, iter, v.function_signatures) {
-	 function_entry *entry = (function_entry *)iter.get();
-
-	 if (!entry->bgn_inst) {
-	    v.current_function = entry;
-
-	    entry->bgn_inst = v.ir_to_mesa_emit_op0(NULL, OPCODE_BGNSUB);
-	    entry->bgn_inst->function = entry;
-
-	    visit_exec_list(&entry->sig->body, &v);
-
-	    ir_to_mesa_instruction *last;
-	    last = (ir_to_mesa_instruction *)v.instructions.get_tail();
-	    if (last->op != OPCODE_RET)
-	       v.ir_to_mesa_emit_op0(NULL, OPCODE_RET);
-
-	    ir_to_mesa_instruction *end;
-	    end = v.ir_to_mesa_emit_op0(NULL, OPCODE_ENDSUB);
-	    end->function = entry;
-
-	    progress = GL_TRUE;
-	 }
-      }
-   } while (progress);
-
-   prog->NumTemporaries = v.next_temp;
-
-   int num_instructions = 0;
-   foreach_iter(exec_list_iterator, iter, v.instructions) {
-      num_instructions++;
-   }
-
-   mesa_instructions =
-      (struct prog_instruction *)calloc(num_instructions,
-					sizeof(*mesa_instructions));
-   mesa_instruction_annotation = talloc_array(v.mem_ctx, ir_instruction *,
-					      num_instructions);
-
-   mesa_inst = mesa_instructions;
-   i = 0;
-   foreach_iter(exec_list_iterator, iter, v.instructions) {
-      ir_to_mesa_instruction *inst = (ir_to_mesa_instruction *)iter.get();
-
-      mesa_inst->Opcode = inst->op;
-      mesa_inst->CondUpdate = inst->cond_update;
-      mesa_inst->DstReg.File = inst->dst_reg.file;
-      mesa_inst->DstReg.Index = inst->dst_reg.index;
-      mesa_inst->DstReg.CondMask = inst->dst_reg.cond_mask;
-      mesa_inst->DstReg.WriteMask = inst->dst_reg.writemask;
-      mesa_inst->DstReg.RelAddr = inst->dst_reg.reladdr != NULL;
-      mesa_inst->SrcReg[0] = mesa_src_reg_from_ir_src_reg(inst->src_reg[0]);
-      mesa_inst->SrcReg[1] = mesa_src_reg_from_ir_src_reg(inst->src_reg[1]);
-      mesa_inst->SrcReg[2] = mesa_src_reg_from_ir_src_reg(inst->src_reg[2]);
-      mesa_inst->TexSrcUnit = inst->sampler;
-      mesa_inst->TexSrcTarget = inst->tex_target;
-      mesa_inst->TexShadow = inst->tex_shadow;
-      mesa_instruction_annotation[i] = inst->ir;
-
-      /* Set IndirectRegisterFiles. */
-      if (mesa_inst->DstReg.RelAddr)
-         prog->IndirectRegisterFiles |= 1 << mesa_inst->DstReg.File;
-
-      for (unsigned src = 0; src < 3; src++)
-         if (mesa_inst->SrcReg[src].RelAddr)
-            prog->IndirectRegisterFiles |= 1 << mesa_inst->SrcReg[src].File;
-
-      if (options->EmitNoIfs && mesa_inst->Opcode == OPCODE_IF) {
-	 fail_link(shader_program, "Couldn't flatten if statement\n");
-      }
-
-      switch (mesa_inst->Opcode) {
-      case OPCODE_BGNSUB:
-	 inst->function->inst = i;
-	 mesa_inst->Comment = strdup(inst->function->sig->function_name());
-	 break;
-      case OPCODE_ENDSUB:
-	 mesa_inst->Comment = strdup(inst->function->sig->function_name());
-	 break;
-      case OPCODE_CAL:
-	 mesa_inst->BranchTarget = inst->function->sig_id; /* rewritten later */
-	 break;
-      case OPCODE_ARL:
-	 prog->NumAddressRegs = 1;
-	 break;
-      default:
-	 break;
-      }
-
-      mesa_inst++;
-      i++;
-   }
-
-   set_branchtargets(&v, mesa_instructions, num_instructions);
-
-   if (ctx->Shader.Flags & GLSL_DUMP) {
-      printf("\n");
-      printf("GLSL IR for linked %s program %d:\n", target_string,
-	     shader_program->Name);
-      _mesa_print_ir(shader->ir, NULL);
-      printf("\n");
-      printf("\n");
-      printf("Mesa IR for linked %s program %d:\n", target_string,
-	     shader_program->Name);
-      print_program(mesa_instructions, mesa_instruction_annotation,
-		    num_instructions);
-   }
-
-   prog->Instructions = mesa_instructions;
-   prog->NumInstructions = num_instructions;
-
-   do_set_program_inouts(shader->ir, prog);
-   count_resources(prog);
-
-   _mesa_reference_program(ctx, &shader->Program, prog);
-
-   if ((ctx->Shader.Flags & GLSL_NO_OPT) == 0) {
-      _mesa_optimize_program(ctx, prog);
-   }
-
-   return prog;
-}
-
-extern "C" {
-GLboolean
-_mesa_ir_compile_shader(GLcontext *ctx, struct gl_shader *shader)
-{
-   assert(shader->CompileStatus);
-   (void) ctx;
-
-   return GL_TRUE;
-}
-
-GLboolean
-_mesa_ir_link_shader(GLcontext *ctx, struct gl_shader_program *prog)
-{
-   assert(prog->LinkStatus);
-
-   for (unsigned i = 0; i < prog->_NumLinkedShaders; i++) {
-      bool progress;
-      exec_list *ir = prog->_LinkedShaders[i]->ir;
-      struct gl_shader_compiler_options *options =
-            &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(prog->_LinkedShaders[i]->Type)];
-
-      do {
-	 progress = false;
-
-	 /* Lowering */
-	 do_mat_op_to_vec(ir);
-	 do_mod_to_fract(ir);
-	 do_div_to_mul_rcp(ir);
-	 do_explog_to_explog2(ir);
-
-	 progress = do_lower_jumps(ir, true, true, options->EmitNoMainReturn, options->EmitNoCont, options->EmitNoLoops) || progress;
-
-	 progress = do_common_optimization(ir, true, options->MaxUnrollIterations) || progress;
-
-	 if (options->EmitNoIfs)
-	    progress = do_if_to_cond_assign(ir) || progress;
-
-	 if (options->EmitNoNoise)
-	    progress = lower_noise(ir) || progress;
-
-	 /* If there are forms of indirect addressing that the driver
-	  * cannot handle, perform the lowering pass.
-	  */
-	 if (options->EmitNoIndirectInput || options->EmitNoIndirectOutput
-	     || options->EmitNoIndirectTemp || options->EmitNoIndirectUniform)
-	   progress =
-	     lower_variable_index_to_cond_assign(ir,
-						 options->EmitNoIndirectInput,
-						 options->EmitNoIndirectOutput,
-						 options->EmitNoIndirectTemp,
-						 options->EmitNoIndirectUniform)
-	     || progress;
-
-	 progress = do_vec_index_to_cond_assign(ir) || progress;
-      } while (progress);
-
-      validate_ir_tree(ir);
-   }
-
-   for (unsigned i = 0; i < prog->_NumLinkedShaders; i++) {
-      struct gl_program *linked_prog;
-      bool ok = true;
-
-      linked_prog = get_mesa_program(ctx, prog, prog->_LinkedShaders[i]);
-
-      switch (prog->_LinkedShaders[i]->Type) {
-      case GL_VERTEX_SHADER:
-	 _mesa_reference_vertprog(ctx, &prog->VertexProgram,
-				  (struct gl_vertex_program *)linked_prog);
-	 ok = ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
-					      linked_prog);
-	 break;
-      case GL_FRAGMENT_SHADER:
-	 _mesa_reference_fragprog(ctx, &prog->FragmentProgram,
-				  (struct gl_fragment_program *)linked_prog);
-	 ok = ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
-					      linked_prog);
-	 break;
-      }
-      if (!ok) {
-	 return GL_FALSE;
-      }
-      _mesa_reference_program(ctx, &linked_prog, NULL);
-   }
-
-   return GL_TRUE;
-}
-
-void
-_mesa_glsl_compile_shader(GLcontext *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;
-   /* Check if the user called glCompileShader without first calling
-    * glShaderSource.  This should fail to compile, but not raise a GL_ERROR.
-    */
-   if (source == NULL) {
-      shader->CompileStatus = GL_FALSE;
-      return;
-   }
-
-   state->error = preprocess(state, &source, &state->info_log,
-			     &ctx->Extensions, ctx->API);
-
-   if (ctx->Shader.Flags & GLSL_DUMP) {
-      printf("GLSL source for shader %d:\n", shader->Name);
-      printf("%s\n", shader->Source);
-   }
-
-   if (!state->error) {
-     _mesa_glsl_lexer_ctor(state, source);
-     _mesa_glsl_parse(state);
-     _mesa_glsl_lexer_dtor(state);
-   }
-
-   talloc_free(shader->ir);
-   shader->ir = new(shader) exec_list;
-   if (!state->error && !state->translation_unit.is_empty())
-      _mesa_ast_to_hir(shader->ir, state);
-
-   if (!state->error && !shader->ir->is_empty()) {
-      validate_ir_tree(shader->ir);
-
-      /* Do some optimization at compile time to reduce shader IR size
-       * and reduce later work if the same shader is linked multiple times
-       */
-      while (do_common_optimization(shader->ir, false, 32))
-	 ;
-
-      validate_ir_tree(shader->ir);
-   }
-
-   shader->symbols = state->symbols;
-
-   shader->CompileStatus = !state->error;
-   shader->InfoLog = state->info_log;
-   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 (ctx->Shader.Flags & GLSL_LOG) {
-      _mesa_write_shader_to_file(shader);
-   }
-
-   if (ctx->Shader.Flags & GLSL_DUMP) {
-      if (shader->CompileStatus) {
-	 printf("GLSL IR for shader %d:\n", shader->Name);
-	 _mesa_print_ir(shader->ir, NULL);
-	 printf("\n\n");
-      } else {
-	 printf("GLSL shader %d failed to compile.\n", shader->Name);
-      }
-      if (shader->InfoLog && shader->InfoLog[0] != 0) {
-	 printf("GLSL shader %d info log:\n", shader->Name);
-	 printf("%s\n", shader->InfoLog);
-      }
-   }
-
-   /* Retain any live IR, but trash the rest. */
-   reparent_ir(shader->ir, shader->ir);
-
-   talloc_free(state);
-
-   if (shader->CompileStatus) {
-      if (!ctx->Driver.CompileShader(ctx, shader))
-	 shader->CompileStatus = GL_FALSE;
-   }
-}
-
-void
-_mesa_glsl_link_shader(GLcontext *ctx, struct gl_shader_program *prog)
-{
-   unsigned int i;
-
-   _mesa_clear_shader_program_data(ctx, prog);
-
-   prog->LinkStatus = GL_TRUE;
-
-   for (i = 0; i < prog->NumShaders; i++) {
-      if (!prog->Shaders[i]->CompileStatus) {
-	 fail_link(prog, "linking with uncompiled shader");
-	 prog->LinkStatus = GL_FALSE;
-      }
-   }
-
-   prog->Varying = _mesa_new_parameter_list();
-   _mesa_reference_vertprog(ctx, &prog->VertexProgram, NULL);
-   _mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL);
-
-   if (prog->LinkStatus) {
-      link_shaders(ctx, prog);
-   }
-
-   if (prog->LinkStatus) {
-      if (!ctx->Driver.LinkShader(ctx, prog)) {
-	 prog->LinkStatus = GL_FALSE;
-      }
-   }
-
-   set_uniform_initializers(ctx, prog);
-
-   if (ctx->Shader.Flags & GLSL_DUMP) {
-      if (!prog->LinkStatus) {
-	 printf("GLSL shader program %d failed to link\n", prog->Name);
-      }
-
-      if (prog->InfoLog && prog->InfoLog[0] != 0) {
-	 printf("GLSL shader program %d info log:\n", prog->Name);
-	 printf("%s\n", prog->InfoLog);
-      }
-   }
-}
-
-} /* extern "C" */
+/*

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

+ */

+

+/**

+ * \file ir_to_mesa.cpp

+ *

+ * Translate GLSL IR to Mesa's gl_program representation.

+ */

+

+#include <stdio.h>

+#include "main/compiler.h"

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_print_visitor.h"

+#include "ir_expression_flattening.h"

+#include "glsl_types.h"

+#include "glsl_parser_extras.h"

+#include "../glsl/program.h"

+#include "ir_optimization.h"

+#include "ast.h"

+

+extern "C" {

+#include "main/mtypes.h"

+#include "main/shaderapi.h"

+#include "main/shaderobj.h"

+#include "main/uniforms.h"

+#include "program/hash_table.h"

+#include "program/prog_instruction.h"

+#include "program/prog_optimize.h"

+#include "program/prog_print.h"

+#include "program/program.h"

+#include "program/prog_uniform.h"

+#include "program/prog_parameter.h"

+#include "program/sampler.h"

+}

+

+static int swizzle_for_size(int size);

+

+/**

+ * This struct is a corresponding struct to Mesa prog_src_register, with

+ * wider fields.

+ */

+typedef struct ir_to_mesa_src_reg {

+   ir_to_mesa_src_reg(int file, int index, const glsl_type *type)

+   {

+      this->file = (gl_register_file) file;

+      this->index = index;

+      if (type && (type->is_scalar() || type->is_vector() || type->is_matrix()))

+	 this->swizzle = swizzle_for_size(type->vector_elements);

+      else

+	 this->swizzle = SWIZZLE_XYZW;

+      this->negate = 0;

+      this->reladdr = NULL;

+   }

+

+   ir_to_mesa_src_reg()

+   {

+      this->file = PROGRAM_UNDEFINED;

+      this->index = 0;

+      this->swizzle = 0;

+      this->negate = 0;

+      this->reladdr = NULL;

+   }

+

+   gl_register_file file; /**< PROGRAM_* from Mesa */

+   int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */

+   GLuint swizzle; /**< SWIZZLE_XYZWONEZERO swizzles from Mesa. */

+   int negate; /**< NEGATE_XYZW mask from mesa */

+   /** Register index should be offset by the integer in this reg. */

+   ir_to_mesa_src_reg *reladdr;

+} ir_to_mesa_src_reg;

+

+typedef struct ir_to_mesa_dst_reg {

+   int file; /**< PROGRAM_* from Mesa */

+   int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */

+   int writemask; /**< Bitfield of WRITEMASK_[XYZW] */

+   GLuint cond_mask:4;

+   /** Register index should be offset by the integer in this reg. */

+   ir_to_mesa_src_reg *reladdr;

+} ir_to_mesa_dst_reg;

+

+extern ir_to_mesa_src_reg ir_to_mesa_undef;

+

+class ir_to_mesa_instruction : public exec_node {

+public:

+   /* Callers of this talloc-based new need not call delete. It's

+    * easier to just talloc_free 'ctx' (or any of its ancestors). */

+   static void* operator new(size_t size, void *ctx)

+   {

+      void *node;

+

+      node = talloc_zero_size(ctx, size);

+      assert(node != NULL);

+

+      return node;

+   }

+

+   enum prog_opcode op;

+   ir_to_mesa_dst_reg dst_reg;

+   ir_to_mesa_src_reg src_reg[3];

+   /** Pointer to the ir source this tree came from for debugging */

+   ir_instruction *ir;

+   GLboolean cond_update;

+   bool saturate;

+   int sampler; /**< sampler index */

+   int tex_target; /**< One of TEXTURE_*_INDEX */

+   GLboolean tex_shadow;

+

+   class function_entry *function; /* Set on OPCODE_CAL or OPCODE_BGNSUB */

+};

+

+class variable_storage : public exec_node {

+public:

+   variable_storage(ir_variable *var, gl_register_file file, int index)

+      : file(file), index(index), var(var)

+   {

+      /* empty */

+   }

+

+   gl_register_file file;

+   int index;

+   ir_variable *var; /* variable that maps to this, if any */

+};

+

+class function_entry : public exec_node {

+public:

+   ir_function_signature *sig;

+

+   /**

+    * identifier of this function signature used by the program.

+    *

+    * At the point that Mesa instructions for function calls are

+    * generated, we don't know the address of the first instruction of

+    * the function body.  So we make the BranchTarget that is called a

+    * small integer and rewrite them during set_branchtargets().

+    */

+   int sig_id;

+

+   /**

+    * Pointer to first instruction of the function body.

+    *

+    * Set during function body emits after main() is processed.

+    */

+   ir_to_mesa_instruction *bgn_inst;

+

+   /**

+    * Index of the first instruction of the function body in actual

+    * Mesa IR.

+    *

+    * Set after convertion from ir_to_mesa_instruction to prog_instruction.

+    */

+   int inst;

+

+   /** Storage for the return value. */

+   ir_to_mesa_src_reg return_reg;

+};

+

+class ir_to_mesa_visitor : public ir_visitor {

+public:

+   ir_to_mesa_visitor();

+   ~ir_to_mesa_visitor();

+

+   function_entry *current_function;

+

+   struct gl_context *ctx;

+   struct gl_program *prog;

+   struct gl_shader_program *shader_program;

+   struct gl_shader_compiler_options *options;

+

+   int next_temp;

+

+   variable_storage *find_variable_storage(ir_variable *var);

+

+   function_entry *get_function_signature(ir_function_signature *sig);

+

+   ir_to_mesa_src_reg get_temp(const glsl_type *type);

+   void reladdr_to_temp(ir_instruction *ir,

+			ir_to_mesa_src_reg *reg, int *num_reladdr);

+

+   struct ir_to_mesa_src_reg src_reg_for_float(float val);

+

+   /**

+    * \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_loop *);

+   virtual void visit(ir_loop_jump *);

+   virtual void visit(ir_function_signature *);

+   virtual void visit(ir_function *);

+   virtual void visit(ir_expression *);

+   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_texture *);

+   virtual void visit(ir_if *);

+   /*@}*/

+

+   struct ir_to_mesa_src_reg result;

+

+   /** List of variable_storage */

+   exec_list variables;

+

+   /** List of function_entry */

+   exec_list function_signatures;

+   int next_signature_id;

+

+   /** List of ir_to_mesa_instruction */

+   exec_list instructions;

+

+   ir_to_mesa_instruction *ir_to_mesa_emit_op0(ir_instruction *ir,

+					       enum prog_opcode op);

+

+   ir_to_mesa_instruction *ir_to_mesa_emit_op1(ir_instruction *ir,

+					       enum prog_opcode op,

+					       ir_to_mesa_dst_reg dst,

+					       ir_to_mesa_src_reg src0);

+

+   ir_to_mesa_instruction *ir_to_mesa_emit_op2(ir_instruction *ir,

+					       enum prog_opcode op,

+					       ir_to_mesa_dst_reg dst,

+					       ir_to_mesa_src_reg src0,

+					       ir_to_mesa_src_reg src1);

+

+   ir_to_mesa_instruction *ir_to_mesa_emit_op3(ir_instruction *ir,

+					       enum prog_opcode op,

+					       ir_to_mesa_dst_reg dst,

+					       ir_to_mesa_src_reg src0,

+					       ir_to_mesa_src_reg src1,

+					       ir_to_mesa_src_reg src2);

+

+   /**

+    * Emit the correct dot-product instruction for the type of arguments

+    *

+    * \sa ir_to_mesa_emit_op2

+    */

+   void ir_to_mesa_emit_dp(ir_instruction *ir,

+			   ir_to_mesa_dst_reg dst,

+			   ir_to_mesa_src_reg src0,

+			   ir_to_mesa_src_reg src1,

+			   unsigned elements);

+

+   void ir_to_mesa_emit_scalar_op1(ir_instruction *ir,

+				   enum prog_opcode op,

+				   ir_to_mesa_dst_reg dst,

+				   ir_to_mesa_src_reg src0);

+

+   void ir_to_mesa_emit_scalar_op2(ir_instruction *ir,

+				   enum prog_opcode op,

+				   ir_to_mesa_dst_reg dst,

+				   ir_to_mesa_src_reg src0,

+				   ir_to_mesa_src_reg src1);

+

+   void emit_scs(ir_instruction *ir, enum prog_opcode op,

+		 ir_to_mesa_dst_reg dst,

+		 const ir_to_mesa_src_reg &src);

+

+   GLboolean try_emit_mad(ir_expression *ir,

+			  int mul_operand);

+   GLboolean try_emit_sat(ir_expression *ir);

+

+   void emit_swz(ir_expression *ir);

+

+   bool process_move_condition(ir_rvalue *ir);

+

+   void *mem_ctx;

+};

+

+ir_to_mesa_src_reg ir_to_mesa_undef = ir_to_mesa_src_reg(PROGRAM_UNDEFINED, 0, NULL);

+

+ir_to_mesa_dst_reg ir_to_mesa_undef_dst = {

+   PROGRAM_UNDEFINED, 0, SWIZZLE_NOOP, COND_TR, NULL,

+};

+

+ir_to_mesa_dst_reg ir_to_mesa_address_reg = {

+   PROGRAM_ADDRESS, 0, WRITEMASK_X, COND_TR, NULL

+};

+

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

+   prog->InfoLog = talloc_vasprintf_append(prog->InfoLog, fmt, args);

+   va_end(args);

+

+   prog->LinkStatus = GL_FALSE;

+}

+

+static int

+swizzle_for_size(int size)

+{

+   int size_swizzles[4] = {

+      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X),

+      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y),

+      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_Z),

+      MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W),

+   };

+

+   assert((size >= 1) && (size <= 4));

+   return size_swizzles[size - 1];

+}

+

+ir_to_mesa_instruction *

+ir_to_mesa_visitor::ir_to_mesa_emit_op3(ir_instruction *ir,

+					enum prog_opcode op,

+					ir_to_mesa_dst_reg dst,

+					ir_to_mesa_src_reg src0,

+					ir_to_mesa_src_reg src1,

+					ir_to_mesa_src_reg src2)

+{

+   ir_to_mesa_instruction *inst = new(mem_ctx) ir_to_mesa_instruction();

+   int num_reladdr = 0;

+

+   /* If we have to do relative addressing, we want to load the ARL

+    * reg directly for one of the regs, and preload the other reladdr

+    * sources into temps.

+    */

+   num_reladdr += dst.reladdr != NULL;

+   num_reladdr += src0.reladdr != NULL;

+   num_reladdr += src1.reladdr != NULL;

+   num_reladdr += src2.reladdr != NULL;

+

+   reladdr_to_temp(ir, &src2, &num_reladdr);

+   reladdr_to_temp(ir, &src1, &num_reladdr);

+   reladdr_to_temp(ir, &src0, &num_reladdr);

+

+   if (dst.reladdr) {

+      ir_to_mesa_emit_op1(ir, OPCODE_ARL, ir_to_mesa_address_reg,

+                          *dst.reladdr);

+

+      num_reladdr--;

+   }

+   assert(num_reladdr == 0);

+

+   inst->op = op;

+   inst->dst_reg = dst;

+   inst->src_reg[0] = src0;

+   inst->src_reg[1] = src1;

+   inst->src_reg[2] = src2;

+   inst->ir = ir;

+

+   inst->function = NULL;

+

+   this->instructions.push_tail(inst);

+

+   return inst;

+}

+

+

+ir_to_mesa_instruction *

+ir_to_mesa_visitor::ir_to_mesa_emit_op2(ir_instruction *ir,

+					enum prog_opcode op,

+					ir_to_mesa_dst_reg dst,

+					ir_to_mesa_src_reg src0,

+					ir_to_mesa_src_reg src1)

+{

+   return ir_to_mesa_emit_op3(ir, op, dst, src0, src1, ir_to_mesa_undef);

+}

+

+ir_to_mesa_instruction *

+ir_to_mesa_visitor::ir_to_mesa_emit_op1(ir_instruction *ir,

+					enum prog_opcode op,

+					ir_to_mesa_dst_reg dst,

+					ir_to_mesa_src_reg src0)

+{

+   assert(dst.writemask != 0);

+   return ir_to_mesa_emit_op3(ir, op, dst,

+			      src0, ir_to_mesa_undef, ir_to_mesa_undef);

+}

+

+ir_to_mesa_instruction *

+ir_to_mesa_visitor::ir_to_mesa_emit_op0(ir_instruction *ir,

+					enum prog_opcode op)

+{

+   return ir_to_mesa_emit_op3(ir, op, ir_to_mesa_undef_dst,

+			      ir_to_mesa_undef,

+			      ir_to_mesa_undef,

+			      ir_to_mesa_undef);

+}

+

+void

+ir_to_mesa_visitor::ir_to_mesa_emit_dp(ir_instruction *ir,

+				       ir_to_mesa_dst_reg dst,

+				       ir_to_mesa_src_reg src0,

+				       ir_to_mesa_src_reg src1,

+				       unsigned elements)

+{

+   static const gl_inst_opcode dot_opcodes[] = {

+      OPCODE_DP2, OPCODE_DP3, OPCODE_DP4

+   };

+

+   ir_to_mesa_emit_op3(ir, dot_opcodes[elements - 2],

+		       dst, src0, src1, ir_to_mesa_undef);

+}

+

+inline ir_to_mesa_dst_reg

+ir_to_mesa_dst_reg_from_src(ir_to_mesa_src_reg reg)

+{

+   ir_to_mesa_dst_reg dst_reg;

+

+   dst_reg.file = reg.file;

+   dst_reg.index = reg.index;

+   dst_reg.writemask = WRITEMASK_XYZW;

+   dst_reg.cond_mask = COND_TR;

+   dst_reg.reladdr = reg.reladdr;

+

+   return dst_reg;

+}

+

+inline ir_to_mesa_src_reg

+ir_to_mesa_src_reg_from_dst(ir_to_mesa_dst_reg reg)

+{

+   return ir_to_mesa_src_reg(reg.file, reg.index, NULL);

+}

+

+/**

+ * Emits Mesa scalar opcodes to produce unique answers across channels.

+ *

+ * Some Mesa opcodes are scalar-only, like ARB_fp/vp.  The src X

+ * channel determines the result across all channels.  So to do a vec4

+ * of this operation, we want to emit a scalar per source channel used

+ * to produce dest channels.

+ */

+void

+ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op2(ir_instruction *ir,

+					       enum prog_opcode op,

+					       ir_to_mesa_dst_reg dst,

+					       ir_to_mesa_src_reg orig_src0,

+					       ir_to_mesa_src_reg orig_src1)

+{

+   int i, j;

+   int done_mask = ~dst.writemask;

+

+   /* Mesa RCP is a scalar operation splatting results to all channels,

+    * like ARB_fp/vp.  So emit as many RCPs as necessary to cover our

+    * dst channels.

+    */

+   for (i = 0; i < 4; i++) {

+      GLuint this_mask = (1 << i);

+      ir_to_mesa_instruction *inst;

+      ir_to_mesa_src_reg src0 = orig_src0;

+      ir_to_mesa_src_reg src1 = orig_src1;

+

+      if (done_mask & this_mask)

+	 continue;

+

+      GLuint src0_swiz = GET_SWZ(src0.swizzle, i);

+      GLuint src1_swiz = GET_SWZ(src1.swizzle, i);

+      for (j = i + 1; j < 4; j++) {

+	 /* If there is another enabled component in the destination that is

+	  * derived from the same inputs, generate its value on this pass as

+	  * well.

+	  */

+	 if (!(done_mask & (1 << j)) &&

+	     GET_SWZ(src0.swizzle, j) == src0_swiz &&

+	     GET_SWZ(src1.swizzle, j) == src1_swiz) {

+	    this_mask |= (1 << j);

+	 }

+      }

+      src0.swizzle = MAKE_SWIZZLE4(src0_swiz, src0_swiz,

+				   src0_swiz, src0_swiz);

+      src1.swizzle = MAKE_SWIZZLE4(src1_swiz, src1_swiz,

+				  src1_swiz, src1_swiz);

+

+      inst = ir_to_mesa_emit_op2(ir, op,

+				 dst,

+				 src0,

+				 src1);

+      inst->dst_reg.writemask = this_mask;

+      done_mask |= this_mask;

+   }

+}

+

+void

+ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op1(ir_instruction *ir,

+					       enum prog_opcode op,

+					       ir_to_mesa_dst_reg dst,

+					       ir_to_mesa_src_reg src0)

+{

+   ir_to_mesa_src_reg undef = ir_to_mesa_undef;

+

+   undef.swizzle = SWIZZLE_XXXX;

+

+   ir_to_mesa_emit_scalar_op2(ir, op, dst, src0, undef);

+}

+

+/**

+ * Emit an OPCODE_SCS instruction

+ *

+ * The \c SCS opcode functions a bit differently than the other Mesa (or

+ * ARB_fragment_program) opcodes.  Instead of splatting its result across all

+ * four components of the destination, it writes one value to the \c x

+ * component and another value to the \c y component.

+ *

+ * \param ir        IR instruction being processed

+ * \param op        Either \c OPCODE_SIN or \c OPCODE_COS depending on which

+ *                  value is desired.

+ * \param dst       Destination register

+ * \param src       Source register

+ */

+void

+ir_to_mesa_visitor::emit_scs(ir_instruction *ir, enum prog_opcode op,

+			     ir_to_mesa_dst_reg dst,

+			     const ir_to_mesa_src_reg &src)

+{

+   /* Vertex programs cannot use the SCS opcode.

+    */

+   if (this->prog->Target == GL_VERTEX_PROGRAM_ARB) {

+      ir_to_mesa_emit_scalar_op1(ir, op, dst, src);

+      return;

+   }

+

+   const unsigned component = (op == OPCODE_SIN) ? 0 : 1;

+   const unsigned scs_mask = (1U << component);

+   int done_mask = ~dst.writemask;

+   ir_to_mesa_src_reg tmp;

+

+   assert(op == OPCODE_SIN || op == OPCODE_COS);

+

+   /* If there are compnents in the destination that differ from the component

+    * that will be written by the SCS instrution, we'll need a temporary.

+    */

+   if (scs_mask != unsigned(dst.writemask)) {

+      tmp = get_temp(glsl_type::vec4_type);

+   }

+

+   for (unsigned i = 0; i < 4; i++) {

+      unsigned this_mask = (1U << i);

+      ir_to_mesa_src_reg src0 = src;

+

+      if ((done_mask & this_mask) != 0)

+	 continue;

+

+      /* The source swizzle specified which component of the source generates

+       * sine / cosine for the current component in the destination.  The SCS

+       * instruction requires that this value be swizzle to the X component.

+       * Replace the current swizzle with a swizzle that puts the source in

+       * the X component.

+       */

+      unsigned src0_swiz = GET_SWZ(src.swizzle, i);

+

+      src0.swizzle = MAKE_SWIZZLE4(src0_swiz, src0_swiz,

+				   src0_swiz, src0_swiz);

+      for (unsigned j = i + 1; j < 4; j++) {

+	 /* If there is another enabled component in the destination that is

+	  * derived from the same inputs, generate its value on this pass as

+	  * well.

+	  */

+	 if (!(done_mask & (1 << j)) &&

+	     GET_SWZ(src0.swizzle, j) == src0_swiz) {

+	    this_mask |= (1 << j);

+	 }

+      }

+

+      if (this_mask != scs_mask) {

+	 ir_to_mesa_instruction *inst;

+	 ir_to_mesa_dst_reg tmp_dst = ir_to_mesa_dst_reg_from_src(tmp);

+

+	 /* Emit the SCS instruction.

+	  */

+	 inst = ir_to_mesa_emit_op1(ir, OPCODE_SCS, tmp_dst, src0);

+	 inst->dst_reg.writemask = scs_mask;

+

+	 /* Move the result of the SCS instruction to the desired location in

+	  * the destination.

+	  */

+	 tmp.swizzle = MAKE_SWIZZLE4(component, component,

+				     component, component);

+	 inst = ir_to_mesa_emit_op1(ir, OPCODE_SCS, dst, tmp);

+	 inst->dst_reg.writemask = this_mask;

+      } else {

+	 /* Emit the SCS instruction to write directly to the destination.

+	  */

+	 ir_to_mesa_instruction *inst =

+	    ir_to_mesa_emit_op1(ir, OPCODE_SCS, dst, src0);

+	 inst->dst_reg.writemask = scs_mask;

+      }

+

+      done_mask |= this_mask;

+   }

+}

+

+struct ir_to_mesa_src_reg

+ir_to_mesa_visitor::src_reg_for_float(float val)

+{

+   ir_to_mesa_src_reg src_reg(PROGRAM_CONSTANT, -1, NULL);

+

+   src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,

+					      &val, 1, &src_reg.swizzle);

+

+   return src_reg;

+}

+

+static int

+type_size(const struct glsl_type *type)

+{

+   unsigned int i;

+   int size;

+

+   switch (type->base_type) {

+   case GLSL_TYPE_UINT:

+   case GLSL_TYPE_INT:

+   case GLSL_TYPE_FLOAT:

+   case GLSL_TYPE_BOOL:

+      if (type->is_matrix()) {

+	 return type->matrix_columns;

+      } else {

+	 /* Regardless of size of vector, it gets a vec4. This is bad

+	  * packing for things like floats, but otherwise arrays become a

+	  * mess.  Hopefully a later pass over the code can pack scalars

+	  * down if appropriate.

+	  */

+	 return 1;

+      }

+   case GLSL_TYPE_ARRAY:

+      return type_size(type->fields.array) * type->length;

+   case GLSL_TYPE_STRUCT:

+      size = 0;

+      for (i = 0; i < type->length; i++) {

+	 size += type_size(type->fields.structure[i].type);

+      }

+      return size;

+   case GLSL_TYPE_SAMPLER:

+      /* Samplers take up one slot in UNIFORMS[], but they're baked in

+       * at link time.

+       */

+      return 1;

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+/**

+ * In the initial pass of codegen, we assign temporary numbers to

+ * intermediate results.  (not SSA -- variable assignments will reuse

+ * storage).  Actual register allocation for the Mesa VM occurs in a

+ * pass over the Mesa IR later.

+ */

+ir_to_mesa_src_reg

+ir_to_mesa_visitor::get_temp(const glsl_type *type)

+{

+   ir_to_mesa_src_reg src_reg;

+   int swizzle[4];

+   int i;

+

+   src_reg.file = PROGRAM_TEMPORARY;

+   src_reg.index = next_temp;

+   src_reg.reladdr = NULL;

+   next_temp += type_size(type);

+

+   if (type->is_array() || type->is_record()) {

+      src_reg.swizzle = SWIZZLE_NOOP;

+   } else {

+      for (i = 0; i < type->vector_elements; i++)

+	 swizzle[i] = i;

+      for (; i < 4; i++)

+	 swizzle[i] = type->vector_elements - 1;

+      src_reg.swizzle = MAKE_SWIZZLE4(swizzle[0], swizzle[1],

+				      swizzle[2], swizzle[3]);

+   }

+   src_reg.negate = 0;

+

+   return src_reg;

+}

+

+variable_storage *

+ir_to_mesa_visitor::find_variable_storage(ir_variable *var)

+{

+   

+   variable_storage *entry;

+

+   foreach_iter(exec_list_iterator, iter, this->variables) {

+      entry = (variable_storage *)iter.get();

+

+      if (entry->var == var)

+	 return entry;

+   }

+

+   return NULL;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_variable *ir)

+{

+   if (strcmp(ir->name, "gl_FragCoord") == 0) {

+      struct gl_fragment_program *fp = (struct gl_fragment_program *)this->prog;

+

+      fp->OriginUpperLeft = ir->origin_upper_left;

+      fp->PixelCenterInteger = ir->pixel_center_integer;

+   }

+

+   if (ir->mode == ir_var_uniform && strncmp(ir->name, "gl_", 3) == 0) {

+      unsigned int i;

+      const struct gl_builtin_uniform_desc *statevar;

+

+      for (i = 0; _mesa_builtin_uniform_desc[i].name; i++) {

+	 if (strcmp(ir->name, _mesa_builtin_uniform_desc[i].name) == 0)

+	    break;

+      }

+

+      if (!_mesa_builtin_uniform_desc[i].name) {

+	 fail_link(this->shader_program,

+		   "Failed to find builtin uniform `%s'\n", ir->name);

+	 return;

+      }

+

+      statevar = &_mesa_builtin_uniform_desc[i];

+

+      int array_count;

+      if (ir->type->is_array()) {

+	 array_count = ir->type->length;

+      } else {

+	 array_count = 1;

+      }

+

+      /* Check if this statevar's setup in the STATE file exactly

+       * matches how we'll want to reference it as a

+       * struct/array/whatever.  If not, then we need to move it into

+       * temporary storage and hope that it'll get copy-propagated

+       * out.

+       */

+      for (i = 0; i < statevar->num_elements; i++) {

+	 if (statevar->elements[i].swizzle != SWIZZLE_XYZW) {

+	    break;

+	 }

+      }

+

+      struct variable_storage *storage;

+      ir_to_mesa_dst_reg dst;

+      if (i == statevar->num_elements) {

+	 /* We'll set the index later. */

+	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_STATE_VAR, -1);

+	 this->variables.push_tail(storage);

+

+	 dst = ir_to_mesa_undef_dst;

+      } else {

+	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_TEMPORARY,

+						 this->next_temp);

+	 this->variables.push_tail(storage);

+	 this->next_temp += type_size(ir->type);

+

+	 dst = ir_to_mesa_dst_reg_from_src(ir_to_mesa_src_reg(PROGRAM_TEMPORARY,

+							      storage->index,

+							      NULL));

+      }

+

+

+      for (int a = 0; a < array_count; a++) {

+	 for (unsigned int i = 0; i < statevar->num_elements; i++) {

+	    struct gl_builtin_uniform_element *element = &statevar->elements[i];

+	    int tokens[STATE_LENGTH];

+

+	    memcpy(tokens, element->tokens, sizeof(element->tokens));

+	    if (ir->type->is_array()) {

+	       tokens[1] = a;

+	    }

+

+	    int index = _mesa_add_state_reference(this->prog->Parameters,

+						  (gl_state_index *)tokens);

+

+	    if (storage->file == PROGRAM_STATE_VAR) {

+	       if (storage->index == -1) {

+		  storage->index = index;

+	       } else {

+		  assert(index ==

+                         (int)(storage->index + a * statevar->num_elements + i));

+	       }

+	    } else {

+	       ir_to_mesa_src_reg src(PROGRAM_STATE_VAR, index, NULL);

+	       src.swizzle = element->swizzle;

+	       ir_to_mesa_emit_op1(ir, OPCODE_MOV, dst, src);

+	       /* even a float takes up a whole vec4 reg in a struct/array. */

+	       dst.index++;

+	    }

+	 }

+      }

+      if (storage->file == PROGRAM_TEMPORARY &&

+	  dst.index != storage->index + type_size(ir->type)) {

+	 fail_link(this->shader_program,

+		   "failed to load builtin uniform `%s'  (%d/%d regs loaded)\n",

+		   ir->name, dst.index - storage->index,

+		   type_size(ir->type));

+      }

+   }

+}

+

+void

+ir_to_mesa_visitor::visit(ir_loop *ir)

+{

+   ir_dereference_variable *counter = NULL;

+

+   if (ir->counter != NULL)

+      counter = new(ir) ir_dereference_variable(ir->counter);

+

+   if (ir->from != NULL) {

+      assert(ir->counter != NULL);

+

+      ir_assignment *a = new(ir) ir_assignment(counter, ir->from, NULL);

+

+      a->accept(this);

+      delete a;

+   }

+

+   ir_to_mesa_emit_op0(NULL, OPCODE_BGNLOOP);

+

+   if (ir->to) {

+      ir_expression *e =

+	 new(ir) ir_expression(ir->cmp, glsl_type::bool_type,

+			       counter, ir->to);

+      ir_if *if_stmt =  new(ir) ir_if(e);

+

+      ir_loop_jump *brk = new(ir) ir_loop_jump(ir_loop_jump::jump_break);

+

+      if_stmt->then_instructions.push_tail(brk);

+

+      if_stmt->accept(this);

+

+      delete if_stmt;

+      delete e;

+      delete brk;

+   }

+

+   visit_exec_list(&ir->body_instructions, this);

+

+   if (ir->increment) {

+      ir_expression *e =

+	 new(ir) ir_expression(ir_binop_add, counter->type,

+			       counter, ir->increment);

+

+      ir_assignment *a = new(ir) ir_assignment(counter, e, NULL);

+

+      a->accept(this);

+      delete a;

+      delete e;

+   }

+

+   ir_to_mesa_emit_op0(NULL, OPCODE_ENDLOOP);

+}

+

+void

+ir_to_mesa_visitor::visit(ir_loop_jump *ir)

+{

+   switch (ir->mode) {

+   case ir_loop_jump::jump_break:

+      ir_to_mesa_emit_op0(NULL, OPCODE_BRK);

+      break;

+   case ir_loop_jump::jump_continue:

+      ir_to_mesa_emit_op0(NULL, OPCODE_CONT);

+      break;

+   }

+}

+

+

+void

+ir_to_mesa_visitor::visit(ir_function_signature *ir)

+{

+   assert(0);

+   (void)ir;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_function *ir)

+{

+   /* Ignore function bodies other than main() -- we shouldn't see calls to

+    * them since they should all be inlined before we get to ir_to_mesa.

+    */

+   if (strcmp(ir->name, "main") == 0) {

+      const ir_function_signature *sig;

+      exec_list empty;

+

+      sig = ir->matching_signature(&empty);

+

+      assert(sig);

+

+      foreach_iter(exec_list_iterator, iter, sig->body) {

+	 ir_instruction *ir = (ir_instruction *)iter.get();

+

+	 ir->accept(this);

+      }

+   }

+}

+

+GLboolean

+ir_to_mesa_visitor::try_emit_mad(ir_expression *ir, int mul_operand)

+{

+   int nonmul_operand = 1 - mul_operand;

+   ir_to_mesa_src_reg a, b, c;

+

+   ir_expression *expr = ir->operands[mul_operand]->as_expression();

+   if (!expr || expr->operation != ir_binop_mul)

+      return false;

+

+   expr->operands[0]->accept(this);

+   a = this->result;

+   expr->operands[1]->accept(this);

+   b = this->result;

+   ir->operands[nonmul_operand]->accept(this);

+   c = this->result;

+

+   this->result = get_temp(ir->type);

+   ir_to_mesa_emit_op3(ir, OPCODE_MAD,

+		       ir_to_mesa_dst_reg_from_src(this->result), a, b, c);

+

+   return true;

+}

+

+GLboolean

+ir_to_mesa_visitor::try_emit_sat(ir_expression *ir)

+{

+   /* Saturates were only introduced to vertex programs in

+    * NV_vertex_program3, so don't give them to drivers in the VP.

+    */

+   if (this->prog->Target == GL_VERTEX_PROGRAM_ARB)

+      return false;

+

+   ir_rvalue *sat_src = ir->as_rvalue_to_saturate();

+   if (!sat_src)

+      return false;

+

+   sat_src->accept(this);

+   ir_to_mesa_src_reg src = this->result;

+

+   this->result = get_temp(ir->type);

+   ir_to_mesa_instruction *inst;

+   inst = ir_to_mesa_emit_op1(ir, OPCODE_MOV,

+			      ir_to_mesa_dst_reg_from_src(this->result),

+			      src);

+   inst->saturate = true;

+

+   return true;

+}

+

+void

+ir_to_mesa_visitor::reladdr_to_temp(ir_instruction *ir,

+				    ir_to_mesa_src_reg *reg, int *num_reladdr)

+{

+   if (!reg->reladdr)

+      return;

+

+   ir_to_mesa_emit_op1(ir, OPCODE_ARL, ir_to_mesa_address_reg, *reg->reladdr);

+

+   if (*num_reladdr != 1) {

+      ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);

+

+      ir_to_mesa_emit_op1(ir, OPCODE_MOV,

+			  ir_to_mesa_dst_reg_from_src(temp), *reg);

+      *reg = temp;

+   }

+

+   (*num_reladdr)--;

+}

+

+void

+ir_to_mesa_visitor::emit_swz(ir_expression *ir)

+{

+   /* Assume that the vector operator is in a form compatible with OPCODE_SWZ.

+    * This means that each of the operands is either an immediate value of -1,

+    * 0, or 1, or is a component from one source register (possibly with

+    * negation).

+    */

+   uint8_t components[4] = { 0 };

+   bool negate[4] = { false };

+   ir_variable *var = NULL;

+

+   for (unsigned i = 0; i < ir->type->vector_elements; i++) {

+      ir_rvalue *op = ir->operands[i];

+

+      assert(op->type->is_scalar());

+

+      while (op != NULL) {

+	 switch (op->ir_type) {

+	 case ir_type_constant: {

+

+	    assert(op->type->is_scalar());

+

+	    const ir_constant *const c = op->as_constant();

+	    if (c->is_one()) {

+	       components[i] = SWIZZLE_ONE;

+	    } else if (c->is_zero()) {

+	       components[i] = SWIZZLE_ZERO;

+	    } else if (c->is_negative_one()) {

+	       components[i] = SWIZZLE_ONE;

+	       negate[i] = true;

+	    } else {

+	       assert(!"SWZ constant must be 0.0 or 1.0.");

+	    }

+

+	    op = NULL;

+	    break;

+	 }

+

+	 case ir_type_dereference_variable: {

+	    ir_dereference_variable *const deref =

+	       (ir_dereference_variable *) op;

+

+	    assert((var == NULL) || (deref->var == var));

+	    components[i] = SWIZZLE_X;

+	    var = deref->var;

+	    op = NULL;

+	    break;

+	 }

+

+	 case ir_type_expression: {

+	    ir_expression *const expr = (ir_expression *) op;

+

+	    assert(expr->operation == ir_unop_neg);

+	    negate[i] = true;

+

+	    op = expr->operands[0];

+	    break;

+	 }

+

+	 case ir_type_swizzle: {

+	    ir_swizzle *const swiz = (ir_swizzle *) op;

+

+	    components[i] = swiz->mask.x;

+	    op = swiz->val;

+	    break;

+	 }

+

+	 default:

+	    assert(!"Should not get here.");

+	    return;

+	 }

+      }

+   }

+

+   assert(var != NULL);

+

+   ir_dereference_variable *const deref =

+      new(mem_ctx) ir_dereference_variable(var);

+

+   this->result.file = PROGRAM_UNDEFINED;

+   deref->accept(this);

+   if (this->result.file == PROGRAM_UNDEFINED) {

+      ir_print_visitor v;

+      printf("Failed to get tree for expression operand:\n");

+      deref->accept(&v);

+      exit(1);

+   }

+

+   ir_to_mesa_src_reg src;

+

+   src = this->result;

+   src.swizzle = MAKE_SWIZZLE4(components[0],

+			       components[1],

+			       components[2],

+			       components[3]);

+   src.negate = ((unsigned(negate[0]) << 0)

+		 | (unsigned(negate[1]) << 1)

+		 | (unsigned(negate[2]) << 2)

+		 | (unsigned(negate[3]) << 3));

+

+   /* Storage for our result.  Ideally for an assignment we'd be using the

+    * actual storage for the result here, instead.

+    */

+   const ir_to_mesa_src_reg result_src = get_temp(ir->type);

+   ir_to_mesa_dst_reg result_dst = ir_to_mesa_dst_reg_from_src(result_src);

+

+   /* Limit writes to the channels that will be used by result_src later.

+    * This does limit this temp's use as a temporary for multi-instruction

+    * sequences.

+    */

+   result_dst.writemask = (1 << ir->type->vector_elements) - 1;

+

+   ir_to_mesa_emit_op1(ir, OPCODE_SWZ, result_dst, src);

+   this->result = result_src;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_expression *ir)

+{

+   unsigned int operand;

+   struct ir_to_mesa_src_reg op[Elements(ir->operands)];

+   struct ir_to_mesa_src_reg result_src;

+   struct ir_to_mesa_dst_reg result_dst;

+

+   /* Quick peephole: Emit OPCODE_MAD(a, b, c) instead of ADD(MUL(a, b), c)

+    */

+   if (ir->operation == ir_binop_add) {

+      if (try_emit_mad(ir, 1))

+	 return;

+      if (try_emit_mad(ir, 0))

+	 return;

+   }

+   if (try_emit_sat(ir))

+      return;

+

+   if (ir->operation == ir_quadop_vector) {

+      this->emit_swz(ir);

+      return;

+   }

+

+   for (operand = 0; operand < ir->get_num_operands(); operand++) {

+      this->result.file = PROGRAM_UNDEFINED;

+      ir->operands[operand]->accept(this);

+      if (this->result.file == PROGRAM_UNDEFINED) {

+	 ir_print_visitor v;

+	 printf("Failed to get tree for expression operand:\n");

+	 ir->operands[operand]->accept(&v);

+	 exit(1);

+      }

+      op[operand] = this->result;

+

+      /* Matrix expression operands should have been broken down to vector

+       * operations already.

+       */

+      assert(!ir->operands[operand]->type->is_matrix());

+   }

+

+   int vector_elements = ir->operands[0]->type->vector_elements;

+   if (ir->operands[1]) {

+      vector_elements = MAX2(vector_elements,

+			     ir->operands[1]->type->vector_elements);

+   }

+

+   this->result.file = PROGRAM_UNDEFINED;

+

+   /* Storage for our result.  Ideally for an assignment we'd be using

+    * the actual storage for the result here, instead.

+    */

+   result_src = get_temp(ir->type);

+   /* convenience for the emit functions below. */

+   result_dst = ir_to_mesa_dst_reg_from_src(result_src);

+   /* Limit writes to the channels that will be used by result_src later.

+    * This does limit this temp's use as a temporary for multi-instruction

+    * sequences.

+    */

+   result_dst.writemask = (1 << ir->type->vector_elements) - 1;

+

+   switch (ir->operation) {

+   case ir_unop_logic_not:

+      ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst,

+			  op[0], src_reg_for_float(0.0));

+      break;

+   case ir_unop_neg:

+      op[0].negate = ~op[0].negate;

+      result_src = op[0];

+      break;

+   case ir_unop_abs:

+      ir_to_mesa_emit_op1(ir, OPCODE_ABS, result_dst, op[0]);

+      break;

+   case ir_unop_sign:

+      ir_to_mesa_emit_op1(ir, OPCODE_SSG, result_dst, op[0]);

+      break;

+   case ir_unop_rcp:

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RCP, result_dst, op[0]);

+      break;

+

+   case ir_unop_exp2:

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_EX2, result_dst, op[0]);

+      break;

+   case ir_unop_exp:

+   case ir_unop_log:

+      assert(!"not reached: should be handled by ir_explog_to_explog2");

+      break;

+   case ir_unop_log2:

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_LG2, result_dst, op[0]);

+      break;

+   case ir_unop_sin:

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_SIN, result_dst, op[0]);

+      break;

+   case ir_unop_cos:

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_COS, result_dst, op[0]);

+      break;

+   case ir_unop_sin_reduced:

+      emit_scs(ir, OPCODE_SIN, result_dst, op[0]);

+      break;

+   case ir_unop_cos_reduced:

+      emit_scs(ir, OPCODE_COS, result_dst, op[0]);

+      break;

+

+   case ir_unop_dFdx:

+      ir_to_mesa_emit_op1(ir, OPCODE_DDX, result_dst, op[0]);

+      break;

+   case ir_unop_dFdy:

+      ir_to_mesa_emit_op1(ir, OPCODE_DDY, result_dst, op[0]);

+      break;

+

+   case ir_unop_noise: {

+      const enum prog_opcode opcode =

+	 prog_opcode(OPCODE_NOISE1

+		     + (ir->operands[0]->type->vector_elements) - 1);

+      assert((opcode >= OPCODE_NOISE1) && (opcode <= OPCODE_NOISE4));

+

+      ir_to_mesa_emit_op1(ir, opcode, result_dst, op[0]);

+      break;

+   }

+

+   case ir_binop_add:

+      ir_to_mesa_emit_op2(ir, OPCODE_ADD, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_sub:

+      ir_to_mesa_emit_op2(ir, OPCODE_SUB, result_dst, op[0], op[1]);

+      break;

+

+   case ir_binop_mul:

+      ir_to_mesa_emit_op2(ir, OPCODE_MUL, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_div:

+      assert(!"not reached: should be handled by ir_div_to_mul_rcp");

+   case ir_binop_mod:

+      assert(!"ir_binop_mod should have been converted to b * fract(a/b)");

+      break;

+

+   case ir_binop_less:

+      ir_to_mesa_emit_op2(ir, OPCODE_SLT, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_greater:

+      ir_to_mesa_emit_op2(ir, OPCODE_SGT, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_lequal:

+      ir_to_mesa_emit_op2(ir, OPCODE_SLE, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_gequal:

+      ir_to_mesa_emit_op2(ir, OPCODE_SGE, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_equal:

+      ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_nequal:

+      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_all_equal:

+      /* "==" operator producing a scalar boolean. */

+      if (ir->operands[0]->type->is_vector() ||

+	  ir->operands[1]->type->is_vector()) {

+	 ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);

+	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,

+			     ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);

+	 ir_to_mesa_emit_dp(ir, result_dst, temp, temp, vector_elements);

+	 ir_to_mesa_emit_op2(ir, OPCODE_SEQ,

+			     result_dst, result_src, src_reg_for_float(0.0));

+      } else {

+	 ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst, op[0], op[1]);

+      }

+      break;

+   case ir_binop_any_nequal:

+      /* "!=" operator producing a scalar boolean. */

+      if (ir->operands[0]->type->is_vector() ||

+	  ir->operands[1]->type->is_vector()) {

+	 ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);

+	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,

+			     ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);

+	 ir_to_mesa_emit_dp(ir, result_dst, temp, temp, vector_elements);

+	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,

+			     result_dst, result_src, src_reg_for_float(0.0));

+      } else {

+	 ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);

+      }

+      break;

+

+   case ir_unop_any:

+      assert(ir->operands[0]->type->is_vector());

+      ir_to_mesa_emit_dp(ir, result_dst, op[0], op[0],

+			 ir->operands[0]->type->vector_elements);

+      ir_to_mesa_emit_op2(ir, OPCODE_SNE,

+			  result_dst, result_src, src_reg_for_float(0.0));

+      break;

+

+   case ir_binop_logic_xor:

+      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);

+      break;

+

+   case ir_binop_logic_or:

+      /* This could be a saturated add and skip the SNE. */

+      ir_to_mesa_emit_op2(ir, OPCODE_ADD,

+			  result_dst,

+			  op[0], op[1]);

+

+      ir_to_mesa_emit_op2(ir, OPCODE_SNE,

+			  result_dst,

+			  result_src, src_reg_for_float(0.0));

+      break;

+

+   case ir_binop_logic_and:

+      /* the bool args are stored as float 0.0 or 1.0, so "mul" gives us "and". */

+      ir_to_mesa_emit_op2(ir, OPCODE_MUL,

+			  result_dst,

+			  op[0], op[1]);

+      break;

+

+   case ir_binop_dot:

+      assert(ir->operands[0]->type->is_vector());

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      ir_to_mesa_emit_dp(ir, result_dst, op[0], op[1],

+			 ir->operands[0]->type->vector_elements);

+      break;

+

+   case ir_unop_sqrt:

+      /* sqrt(x) = x * rsq(x). */

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);

+      ir_to_mesa_emit_op2(ir, OPCODE_MUL, result_dst, result_src, op[0]);

+      /* For incoming channels <= 0, set the result to 0. */

+      op[0].negate = ~op[0].negate;

+      ir_to_mesa_emit_op3(ir, OPCODE_CMP, result_dst,

+			  op[0], result_src, src_reg_for_float(0.0));

+      break;

+   case ir_unop_rsq:

+      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);

+      break;

+   case ir_unop_i2f:

+   case ir_unop_b2f:

+   case ir_unop_b2i:

+      /* Mesa IR lacks types, ints are stored as truncated floats. */

+      result_src = op[0];

+      break;

+   case ir_unop_f2i:

+      ir_to_mesa_emit_op1(ir, OPCODE_TRUNC, result_dst, op[0]);

+      break;

+   case ir_unop_f2b:

+   case ir_unop_i2b:

+      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst,

+			  op[0], src_reg_for_float(0.0));

+      break;

+   case ir_unop_trunc:

+      ir_to_mesa_emit_op1(ir, OPCODE_TRUNC, result_dst, op[0]);

+      break;

+   case ir_unop_ceil:

+      op[0].negate = ~op[0].negate;

+      ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);

+      result_src.negate = ~result_src.negate;

+      break;

+   case ir_unop_floor:

+      ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);

+      break;

+   case ir_unop_fract:

+      ir_to_mesa_emit_op1(ir, OPCODE_FRC, result_dst, op[0]);

+      break;

+

+   case ir_binop_min:

+      ir_to_mesa_emit_op2(ir, OPCODE_MIN, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_max:

+      ir_to_mesa_emit_op2(ir, OPCODE_MAX, result_dst, op[0], op[1]);

+      break;

+   case ir_binop_pow:

+      ir_to_mesa_emit_scalar_op2(ir, OPCODE_POW, result_dst, op[0], op[1]);

+      break;

+

+   case ir_unop_bit_not:

+   case ir_unop_u2f:

+   case ir_binop_lshift:

+   case ir_binop_rshift:

+   case ir_binop_bit_and:

+   case ir_binop_bit_xor:

+   case ir_binop_bit_or:

+   case ir_unop_round_even:

+      assert(!"GLSL 1.30 features unsupported");

+      break;

+

+   case ir_quadop_vector:

+      /* This operation should have already been handled.

+       */

+      assert(!"Should not get here.");

+      break;

+   }

+

+   this->result = result_src;

+}

+

+

+void

+ir_to_mesa_visitor::visit(ir_swizzle *ir)

+{

+   ir_to_mesa_src_reg src_reg;

+   int i;

+   int swizzle[4];

+

+   /* Note that this is only swizzles in expressions, not those on the left

+    * hand side of an assignment, which do write masking.  See ir_assignment

+    * for that.

+    */

+

+   ir->val->accept(this);

+   src_reg = this->result;

+   assert(src_reg.file != PROGRAM_UNDEFINED);

+

+   for (i = 0; i < 4; i++) {

+      if (i < ir->type->vector_elements) {

+	 switch (i) {

+	 case 0:

+	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.x);

+	    break;

+	 case 1:

+	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.y);

+	    break;

+	 case 2:

+	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.z);

+	    break;

+	 case 3:

+	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.w);

+	    break;

+	 }

+      } else {

+	 /* If the type is smaller than a vec4, replicate the last

+	  * channel out.

+	  */

+	 swizzle[i] = swizzle[ir->type->vector_elements - 1];

+      }

+   }

+

+   src_reg.swizzle = MAKE_SWIZZLE4(swizzle[0],

+				   swizzle[1],

+				   swizzle[2],

+				   swizzle[3]);

+

+   this->result = src_reg;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_dereference_variable *ir)

+{

+   variable_storage *entry = find_variable_storage(ir->var);

+

+   if (!entry) {

+      switch (ir->var->mode) {

+      case ir_var_uniform:

+	 entry = new(mem_ctx) variable_storage(ir->var, PROGRAM_UNIFORM,

+					       ir->var->location);

+	 this->variables.push_tail(entry);

+	 break;

+      case ir_var_in:

+      case ir_var_out:

+      case ir_var_inout:

+	 /* The linker assigns locations for varyings and attributes,

+	  * including deprecated builtins (like gl_Color), user-assign

+	  * generic attributes (glBindVertexLocation), and

+	  * user-defined varyings.

+	  *

+	  * FINISHME: We would hit this path for function arguments.  Fix!

+	  */

+	 assert(ir->var->location != -1);

+	 if (ir->var->mode == ir_var_in ||

+	     ir->var->mode == ir_var_inout) {

+	    entry = new(mem_ctx) variable_storage(ir->var,

+						  PROGRAM_INPUT,

+						  ir->var->location);

+

+	    if (this->prog->Target == GL_VERTEX_PROGRAM_ARB &&

+		ir->var->location >= VERT_ATTRIB_GENERIC0) {

+	       _mesa_add_attribute(prog->Attributes,

+				   ir->var->name,

+				   _mesa_sizeof_glsl_type(ir->var->type->gl_type),

+				   ir->var->type->gl_type,

+				   ir->var->location - VERT_ATTRIB_GENERIC0);

+	    }

+	 } else {

+	    entry = new(mem_ctx) variable_storage(ir->var,

+						  PROGRAM_OUTPUT,

+						  ir->var->location);

+	 }

+

+	 break;

+      case ir_var_auto:

+      case ir_var_temporary:

+	 entry = new(mem_ctx) variable_storage(ir->var, PROGRAM_TEMPORARY,

+					       this->next_temp);

+	 this->variables.push_tail(entry);

+

+	 next_temp += type_size(ir->var->type);

+	 break;

+      }

+

+      if (!entry) {

+	 printf("Failed to make storage for %s\n", ir->var->name);

+	 exit(1);

+      }

+   }

+

+   this->result = ir_to_mesa_src_reg(entry->file, entry->index, ir->var->type);

+}

+

+void

+ir_to_mesa_visitor::visit(ir_dereference_array *ir)

+{

+   ir_constant *index;

+   ir_to_mesa_src_reg src_reg;

+   int element_size = type_size(ir->type);

+

+   index = ir->array_index->constant_expression_value();

+

+   ir->array->accept(this);

+   src_reg = this->result;

+

+   if (index) {

+      src_reg.index += index->value.i[0] * element_size;

+   } else {

+      ir_to_mesa_src_reg array_base = this->result;

+      /* Variable index array dereference.  It eats the "vec4" of the

+       * base of the array and an index that offsets the Mesa register

+       * index.

+       */

+      ir->array_index->accept(this);

+

+      ir_to_mesa_src_reg index_reg;

+

+      if (element_size == 1) {

+	 index_reg = this->result;

+      } else {

+	 index_reg = get_temp(glsl_type::float_type);

+

+	 ir_to_mesa_emit_op2(ir, OPCODE_MUL,

+			     ir_to_mesa_dst_reg_from_src(index_reg),

+			     this->result, src_reg_for_float(element_size));

+      }

+

+      src_reg.reladdr = talloc(mem_ctx, ir_to_mesa_src_reg);

+      memcpy(src_reg.reladdr, &index_reg, sizeof(index_reg));

+   }

+

+   /* If the type is smaller than a vec4, replicate the last channel out. */

+   if (ir->type->is_scalar() || ir->type->is_vector())

+      src_reg.swizzle = swizzle_for_size(ir->type->vector_elements);

+   else

+      src_reg.swizzle = SWIZZLE_NOOP;

+

+   this->result = src_reg;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_dereference_record *ir)

+{

+   unsigned int i;

+   const glsl_type *struct_type = ir->record->type;

+   int offset = 0;

+

+   ir->record->accept(this);

+

+   for (i = 0; i < struct_type->length; i++) {

+      if (strcmp(struct_type->fields.structure[i].name, ir->field) == 0)

+	 break;

+      offset += type_size(struct_type->fields.structure[i].type);

+   }

+

+   /* If the type is smaller than a vec4, replicate the last channel out. */

+   if (ir->type->is_scalar() || ir->type->is_vector())

+      this->result.swizzle = swizzle_for_size(ir->type->vector_elements);

+   else

+      this->result.swizzle = SWIZZLE_NOOP;

+

+   this->result.index += offset;

+}

+

+/**

+ * We want to be careful in assignment setup to hit the actual storage

+ * instead of potentially using a temporary like we might with the

+ * ir_dereference handler.

+ */

+static struct ir_to_mesa_dst_reg

+get_assignment_lhs(ir_dereference *ir, ir_to_mesa_visitor *v)

+{

+   /* The LHS must be a dereference.  If the LHS is a variable indexed array

+    * access of a vector, it must be separated into a series conditional moves

+    * before reaching this point (see ir_vec_index_to_cond_assign).

+    */

+   assert(ir->as_dereference());

+   ir_dereference_array *deref_array = ir->as_dereference_array();

+   if (deref_array) {

+      assert(!deref_array->array->type->is_vector());

+   }

+

+   /* Use the rvalue deref handler for the most part.  We'll ignore

+    * swizzles in it and write swizzles using writemask, though.

+    */

+   ir->accept(v);

+   return ir_to_mesa_dst_reg_from_src(v->result);

+}

+

+/**

+ * Process the condition of a conditional assignment

+ *

+ * Examines the condition of a conditional assignment to generate the optimal

+ * first operand of a \c CMP instruction.  If the condition is a relational

+ * operator with 0 (e.g., \c ir_binop_less), the value being compared will be

+ * used as the source for the \c CMP instruction.  Otherwise the comparison

+ * is processed to a boolean result, and the boolean result is used as the

+ * operand to the CMP instruction.

+ */

+bool

+ir_to_mesa_visitor::process_move_condition(ir_rvalue *ir)

+{

+   ir_rvalue *src_ir = ir;

+   bool negate = true;

+   bool switch_order = false;

+

+   ir_expression *const expr = ir->as_expression();

+   if ((expr != NULL) && (expr->get_num_operands() == 2)) {

+      bool zero_on_left = false;

+

+      if (expr->operands[0]->is_zero()) {

+	 src_ir = expr->operands[1];

+	 zero_on_left = true;

+      } else if (expr->operands[1]->is_zero()) {

+	 src_ir = expr->operands[0];

+	 zero_on_left = false;

+      }

+

+      /*      a is -  0  +            -  0  +

+       * (a <  0)  T  F  F  ( a < 0)  T  F  F

+       * (0 <  a)  F  F  T  (-a < 0)  F  F  T

+       * (a <= 0)  T  T  F  (-a < 0)  F  F  T  (swap order of other operands)

+       * (0 <= a)  F  T  T  ( a < 0)  T  F  F  (swap order of other operands)

+       * (a >  0)  F  F  T  (-a < 0)  F  F  T

+       * (0 >  a)  T  F  F  ( a < 0)  T  F  F

+       * (a >= 0)  F  T  T  ( a < 0)  T  F  F  (swap order of other operands)

+       * (0 >= a)  T  T  F  (-a < 0)  F  F  T  (swap order of other operands)

+       *

+       * Note that exchanging the order of 0 and 'a' in the comparison simply

+       * means that the value of 'a' should be negated.

+       */

+      if (src_ir != ir) {

+	 switch (expr->operation) {

+	 case ir_binop_less:

+	    switch_order = false;

+	    negate = zero_on_left;

+	    break;

+

+	 case ir_binop_greater:

+	    switch_order = false;

+	    negate = !zero_on_left;

+	    break;

+

+	 case ir_binop_lequal:

+	    switch_order = true;

+	    negate = !zero_on_left;

+	    break;

+

+	 case ir_binop_gequal:

+	    switch_order = true;

+	    negate = zero_on_left;

+	    break;

+

+	 default:

+	    /* This isn't the right kind of comparison afterall, so make sure

+	     * the whole condition is visited.

+	     */

+	    src_ir = ir;

+	    break;

+	 }

+      }

+   }

+

+   src_ir->accept(this);

+

+   /* We use the OPCODE_CMP (a < 0 ? b : c) for conditional moves, and the

+    * condition we produced is 0.0 or 1.0.  By flipping the sign, we can

+    * choose which value OPCODE_CMP produces without an extra instruction

+    * computing the condition.

+    */

+   if (negate)

+      this->result.negate = ~this->result.negate;

+

+   return switch_order;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_assignment *ir)

+{

+   struct ir_to_mesa_dst_reg l;

+   struct ir_to_mesa_src_reg r;

+   int i;

+

+   ir->rhs->accept(this);

+   r = this->result;

+

+   l = get_assignment_lhs(ir->lhs, this);

+

+   /* FINISHME: This should really set to the correct maximal writemask for each

+    * FINISHME: component written (in the loops below).  This case can only

+    * FINISHME: occur for matrices, arrays, and structures.

+    */

+   if (ir->write_mask == 0) {

+      assert(!ir->lhs->type->is_scalar() && !ir->lhs->type->is_vector());

+      l.writemask = WRITEMASK_XYZW;

+   } else if (ir->lhs->type->is_scalar()) {

+      /* FINISHME: This hack makes writing to gl_FragDepth, which lives in the

+       * FINISHME: W component of fragment shader output zero, work correctly.

+       */

+      l.writemask = WRITEMASK_XYZW;

+   } else {

+      int swizzles[4];

+      int first_enabled_chan = 0;

+      int rhs_chan = 0;

+

+      assert(ir->lhs->type->is_vector());

+      l.writemask = ir->write_mask;

+

+      for (int i = 0; i < 4; i++) {

+	 if (l.writemask & (1 << i)) {

+	    first_enabled_chan = GET_SWZ(r.swizzle, i);

+	    break;

+	 }

+      }

+

+      /* Swizzle a small RHS vector into the channels being written.

+       *

+       * glsl ir treats write_mask as dictating how many channels are

+       * present on the RHS while Mesa IR treats write_mask as just

+       * showing which channels of the vec4 RHS get written.

+       */

+      for (int i = 0; i < 4; i++) {

+	 if (l.writemask & (1 << i))

+	    swizzles[i] = GET_SWZ(r.swizzle, rhs_chan++);

+	 else

+	    swizzles[i] = first_enabled_chan;

+      }

+      r.swizzle = MAKE_SWIZZLE4(swizzles[0], swizzles[1],

+				swizzles[2], swizzles[3]);

+   }

+

+   assert(l.file != PROGRAM_UNDEFINED);

+   assert(r.file != PROGRAM_UNDEFINED);

+

+   if (ir->condition) {

+      const bool switch_order = this->process_move_condition(ir->condition);

+      ir_to_mesa_src_reg condition = this->result;

+

+      for (i = 0; i < type_size(ir->lhs->type); i++) {

+	 if (switch_order) {

+	    ir_to_mesa_emit_op3(ir, OPCODE_CMP, l,

+				condition, ir_to_mesa_src_reg_from_dst(l), r);

+	 } else {

+	    ir_to_mesa_emit_op3(ir, OPCODE_CMP, l,

+				condition, r, ir_to_mesa_src_reg_from_dst(l));

+	 }

+

+	 l.index++;

+	 r.index++;

+      }

+   } else {

+      for (i = 0; i < type_size(ir->lhs->type); i++) {

+	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);

+	 l.index++;

+	 r.index++;

+      }

+   }

+}

+

+

+void

+ir_to_mesa_visitor::visit(ir_constant *ir)

+{

+   ir_to_mesa_src_reg src_reg;

+   GLfloat stack_vals[4] = { 0 };

+   GLfloat *values = stack_vals;

+   unsigned int i;

+

+   /* Unfortunately, 4 floats is all we can get into

+    * _mesa_add_unnamed_constant.  So, make a temp to store an

+    * aggregate constant and move each constant value into it.  If we

+    * get lucky, copy propagation will eliminate the extra moves.

+    */

+

+   if (ir->type->base_type == GLSL_TYPE_STRUCT) {

+      ir_to_mesa_src_reg temp_base = get_temp(ir->type);

+      ir_to_mesa_dst_reg temp = ir_to_mesa_dst_reg_from_src(temp_base);

+

+      foreach_iter(exec_list_iterator, iter, ir->components) {

+	 ir_constant *field_value = (ir_constant *)iter.get();

+	 int size = type_size(field_value->type);

+

+	 assert(size > 0);

+

+	 field_value->accept(this);

+	 src_reg = this->result;

+

+	 for (i = 0; i < (unsigned int)size; i++) {

+	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, temp, src_reg);

+

+	    src_reg.index++;

+	    temp.index++;

+	 }

+      }

+      this->result = temp_base;

+      return;

+   }

+

+   if (ir->type->is_array()) {

+      ir_to_mesa_src_reg temp_base = get_temp(ir->type);

+      ir_to_mesa_dst_reg temp = ir_to_mesa_dst_reg_from_src(temp_base);

+      int size = type_size(ir->type->fields.array);

+

+      assert(size > 0);

+

+      for (i = 0; i < ir->type->length; i++) {

+	 ir->array_elements[i]->accept(this);

+	 src_reg = this->result;

+	 for (int j = 0; j < size; j++) {

+	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, temp, src_reg);

+

+	    src_reg.index++;

+	    temp.index++;

+	 }

+      }

+      this->result = temp_base;

+      return;

+   }

+

+   if (ir->type->is_matrix()) {

+      ir_to_mesa_src_reg mat = get_temp(ir->type);

+      ir_to_mesa_dst_reg mat_column = ir_to_mesa_dst_reg_from_src(mat);

+

+      for (i = 0; i < ir->type->matrix_columns; i++) {

+	 assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+	 values = &ir->value.f[i * ir->type->vector_elements];

+

+	 src_reg = ir_to_mesa_src_reg(PROGRAM_CONSTANT, -1, NULL);

+	 src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,

+						values,

+						ir->type->vector_elements,

+						&src_reg.swizzle);

+	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, mat_column, src_reg);

+

+	 mat_column.index++;

+      }

+

+      this->result = mat;

+      return;

+   }

+

+   src_reg.file = PROGRAM_CONSTANT;

+   switch (ir->type->base_type) {

+   case GLSL_TYPE_FLOAT:

+      values = &ir->value.f[0];

+      break;

+   case GLSL_TYPE_UINT:

+      for (i = 0; i < ir->type->vector_elements; i++) {

+	 values[i] = ir->value.u[i];

+      }

+      break;

+   case GLSL_TYPE_INT:

+      for (i = 0; i < ir->type->vector_elements; i++) {

+	 values[i] = ir->value.i[i];

+      }

+      break;

+   case GLSL_TYPE_BOOL:

+      for (i = 0; i < ir->type->vector_elements; i++) {

+	 values[i] = ir->value.b[i];

+      }

+      break;

+   default:

+      assert(!"Non-float/uint/int/bool constant");

+   }

+

+   this->result = ir_to_mesa_src_reg(PROGRAM_CONSTANT, -1, ir->type);

+   this->result.index = _mesa_add_unnamed_constant(this->prog->Parameters,

+						   values,

+						   ir->type->vector_elements,

+						   &this->result.swizzle);

+}

+

+function_entry *

+ir_to_mesa_visitor::get_function_signature(ir_function_signature *sig)

+{

+   function_entry *entry;

+

+   foreach_iter(exec_list_iterator, iter, this->function_signatures) {

+      entry = (function_entry *)iter.get();

+

+      if (entry->sig == sig)

+	 return entry;

+   }

+

+   entry = talloc(mem_ctx, function_entry);

+   entry->sig = sig;

+   entry->sig_id = this->next_signature_id++;

+   entry->bgn_inst = NULL;

+

+   /* Allocate storage for all the parameters. */

+   foreach_iter(exec_list_iterator, iter, sig->parameters) {

+      ir_variable *param = (ir_variable *)iter.get();

+      variable_storage *storage;

+

+      storage = find_variable_storage(param);

+      assert(!storage);

+

+      storage = new(mem_ctx) variable_storage(param, PROGRAM_TEMPORARY,

+					      this->next_temp);

+      this->variables.push_tail(storage);

+

+      this->next_temp += type_size(param->type);

+   }

+

+   if (!sig->return_type->is_void()) {

+      entry->return_reg = get_temp(sig->return_type);

+   } else {

+      entry->return_reg = ir_to_mesa_undef;

+   }

+

+   this->function_signatures.push_tail(entry);

+   return entry;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_call *ir)

+{

+   ir_to_mesa_instruction *call_inst;

+   ir_function_signature *sig = ir->get_callee();

+   function_entry *entry = get_function_signature(sig);

+   int i;

+

+   /* Process in parameters. */

+   exec_list_iterator sig_iter = sig->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_in ||

+	  param->mode == ir_var_inout) {

+	 variable_storage *storage = find_variable_storage(param);

+	 assert(storage);

+

+	 param_rval->accept(this);

+	 ir_to_mesa_src_reg r = this->result;

+

+	 ir_to_mesa_dst_reg l;

+	 l.file = storage->file;

+	 l.index = storage->index;

+	 l.reladdr = NULL;

+	 l.writemask = WRITEMASK_XYZW;

+	 l.cond_mask = COND_TR;

+

+	 for (i = 0; i < type_size(param->type); i++) {

+	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);

+	    l.index++;

+	    r.index++;

+	 }

+      }

+

+      sig_iter.next();

+   }

+   assert(!sig_iter.has_next());

+

+   /* Emit call instruction */

+   call_inst = ir_to_mesa_emit_op1(ir, OPCODE_CAL,

+				   ir_to_mesa_undef_dst, ir_to_mesa_undef);

+   call_inst->function = entry;

+

+   /* Process out parameters. */

+   sig_iter = sig->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) {

+	 variable_storage *storage = find_variable_storage(param);

+	 assert(storage);

+

+	 ir_to_mesa_src_reg r;

+	 r.file = storage->file;

+	 r.index = storage->index;

+	 r.reladdr = NULL;

+	 r.swizzle = SWIZZLE_NOOP;

+	 r.negate = 0;

+

+	 param_rval->accept(this);

+	 ir_to_mesa_dst_reg l = ir_to_mesa_dst_reg_from_src(this->result);

+

+	 for (i = 0; i < type_size(param->type); i++) {

+	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);

+	    l.index++;

+	    r.index++;

+	 }

+      }

+

+      sig_iter.next();

+   }

+   assert(!sig_iter.has_next());

+

+   /* Process return value. */

+   this->result = entry->return_reg;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_texture *ir)

+{

+   ir_to_mesa_src_reg result_src, coord, lod_info, projector;

+   ir_to_mesa_dst_reg result_dst, coord_dst;

+   ir_to_mesa_instruction *inst = NULL;

+   prog_opcode opcode = OPCODE_NOP;

+

+   ir->coordinate->accept(this);

+

+   /* Put our coords in a temp.  We'll need to modify them for shadow,

+    * projection, or LOD, so the only case we'd use it as is is if

+    * we're doing plain old texturing.  Mesa IR optimization should

+    * handle cleaning up our mess in that case.

+    */

+   coord = get_temp(glsl_type::vec4_type);

+   coord_dst = ir_to_mesa_dst_reg_from_src(coord);

+   ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst,

+		       this->result);

+

+   if (ir->projector) {

+      ir->projector->accept(this);

+      projector = this->result;

+   }

+

+   /* Storage for our result.  Ideally for an assignment we'd be using

+    * the actual storage for the result here, instead.

+    */

+   result_src = get_temp(glsl_type::vec4_type);

+   result_dst = ir_to_mesa_dst_reg_from_src(result_src);

+

+   switch (ir->op) {

+   case ir_tex:

+      opcode = OPCODE_TEX;

+      break;

+   case ir_txb:

+      opcode = OPCODE_TXB;

+      ir->lod_info.bias->accept(this);

+      lod_info = this->result;

+      break;

+   case ir_txl:

+      opcode = OPCODE_TXL;

+      ir->lod_info.lod->accept(this);

+      lod_info = this->result;

+      break;

+   case ir_txd:

+   case ir_txf:

+      assert(!"GLSL 1.30 features unsupported");

+      break;

+   }

+

+   if (ir->projector) {

+      if (opcode == OPCODE_TEX) {

+	 /* Slot the projector in as the last component of the coord. */

+	 coord_dst.writemask = WRITEMASK_W;

+	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, projector);

+	 coord_dst.writemask = WRITEMASK_XYZW;

+	 opcode = OPCODE_TXP;

+      } else {

+	 ir_to_mesa_src_reg coord_w = coord;

+	 coord_w.swizzle = SWIZZLE_WWWW;

+

+	 /* For the other TEX opcodes there's no projective version

+	  * since the last slot is taken up by lod info.  Do the

+	  * projective divide now.

+	  */

+	 coord_dst.writemask = WRITEMASK_W;

+	 ir_to_mesa_emit_op1(ir, OPCODE_RCP, coord_dst, projector);

+

+	 coord_dst.writemask = WRITEMASK_XYZ;

+	 ir_to_mesa_emit_op2(ir, OPCODE_MUL, coord_dst, coord, coord_w);

+

+	 coord_dst.writemask = WRITEMASK_XYZW;

+	 coord.swizzle = SWIZZLE_XYZW;

+      }

+   }

+

+   if (ir->shadow_comparitor) {

+      /* Slot the shadow value in as the second to last component of the

+       * coord.

+       */

+      ir->shadow_comparitor->accept(this);

+      coord_dst.writemask = WRITEMASK_Z;

+      ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, this->result);

+      coord_dst.writemask = WRITEMASK_XYZW;

+   }

+

+   if (opcode == OPCODE_TXL || opcode == OPCODE_TXB) {

+      /* Mesa IR stores lod or lod bias in the last channel of the coords. */

+      coord_dst.writemask = WRITEMASK_W;

+      ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, lod_info);

+      coord_dst.writemask = WRITEMASK_XYZW;

+   }

+

+   inst = ir_to_mesa_emit_op1(ir, opcode, result_dst, coord);

+

+   if (ir->shadow_comparitor)

+      inst->tex_shadow = GL_TRUE;

+

+   inst->sampler = _mesa_get_sampler_uniform_value(ir->sampler,

+						   this->shader_program,

+						   this->prog);

+

+   const glsl_type *sampler_type = ir->sampler->type;

+

+   switch (sampler_type->sampler_dimensionality) {

+   case GLSL_SAMPLER_DIM_1D:

+      inst->tex_target = (sampler_type->sampler_array)

+	 ? TEXTURE_1D_ARRAY_INDEX : TEXTURE_1D_INDEX;

+      break;

+   case GLSL_SAMPLER_DIM_2D:

+      inst->tex_target = (sampler_type->sampler_array)

+	 ? TEXTURE_2D_ARRAY_INDEX : TEXTURE_2D_INDEX;

+      break;

+   case GLSL_SAMPLER_DIM_3D:

+      inst->tex_target = TEXTURE_3D_INDEX;

+      break;

+   case GLSL_SAMPLER_DIM_CUBE:

+      inst->tex_target = TEXTURE_CUBE_INDEX;

+      break;

+   case GLSL_SAMPLER_DIM_RECT:

+      inst->tex_target = TEXTURE_RECT_INDEX;

+      break;

+   case GLSL_SAMPLER_DIM_BUF:

+      assert(!"FINISHME: Implement ARB_texture_buffer_object");

+      break;

+   default:

+      assert(!"Should not get here.");

+   }

+

+   this->result = result_src;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_return *ir)

+{

+   if (ir->get_value()) {

+      ir_to_mesa_dst_reg l;

+      int i;

+

+      assert(current_function);

+

+      ir->get_value()->accept(this);

+      ir_to_mesa_src_reg r = this->result;

+

+      l = ir_to_mesa_dst_reg_from_src(current_function->return_reg);

+

+      for (i = 0; i < type_size(current_function->sig->return_type); i++) {

+	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);

+	 l.index++;

+	 r.index++;

+      }

+   }

+

+   ir_to_mesa_emit_op0(ir, OPCODE_RET);

+}

+

+void

+ir_to_mesa_visitor::visit(ir_discard *ir)

+{

+   struct gl_fragment_program *fp = (struct gl_fragment_program *)this->prog;

+

+   if (ir->condition) {

+      ir->condition->accept(this);

+      this->result.negate = ~this->result.negate;

+      ir_to_mesa_emit_op1(ir, OPCODE_KIL, ir_to_mesa_undef_dst, this->result);

+   } else {

+      ir_to_mesa_emit_op0(ir, OPCODE_KIL_NV);

+   }

+

+   fp->UsesKill = GL_TRUE;

+}

+

+void

+ir_to_mesa_visitor::visit(ir_if *ir)

+{

+   ir_to_mesa_instruction *cond_inst, *if_inst, *else_inst = NULL;

+   ir_to_mesa_instruction *prev_inst;

+

+   prev_inst = (ir_to_mesa_instruction *)this->instructions.get_tail();

+

+   ir->condition->accept(this);

+   assert(this->result.file != PROGRAM_UNDEFINED);

+

+   if (this->options->EmitCondCodes) {

+      cond_inst = (ir_to_mesa_instruction *)this->instructions.get_tail();

+

+      /* See if we actually generated any instruction for generating

+       * the condition.  If not, then cook up a move to a temp so we

+       * have something to set cond_update on.

+       */

+      if (cond_inst == prev_inst) {

+	 ir_to_mesa_src_reg temp = get_temp(glsl_type::bool_type);

+	 cond_inst = ir_to_mesa_emit_op1(ir->condition, OPCODE_MOV,

+					 ir_to_mesa_dst_reg_from_src(temp),

+					 result);

+      }

+      cond_inst->cond_update = GL_TRUE;

+

+      if_inst = ir_to_mesa_emit_op0(ir->condition, OPCODE_IF);

+      if_inst->dst_reg.cond_mask = COND_NE;

+   } else {

+      if_inst = ir_to_mesa_emit_op1(ir->condition,

+				    OPCODE_IF, ir_to_mesa_undef_dst,

+				    this->result);

+   }

+

+   this->instructions.push_tail(if_inst);

+

+   visit_exec_list(&ir->then_instructions, this);

+

+   if (!ir->else_instructions.is_empty()) {

+      else_inst = ir_to_mesa_emit_op0(ir->condition, OPCODE_ELSE);

+      visit_exec_list(&ir->else_instructions, this);

+   }

+

+   if_inst = ir_to_mesa_emit_op1(ir->condition, OPCODE_ENDIF,

+				 ir_to_mesa_undef_dst, ir_to_mesa_undef);

+}

+

+ir_to_mesa_visitor::ir_to_mesa_visitor()

+{

+   result.file = PROGRAM_UNDEFINED;

+   next_temp = 1;

+   next_signature_id = 1;

+   current_function = NULL;

+   mem_ctx = talloc_new(NULL);

+}

+

+ir_to_mesa_visitor::~ir_to_mesa_visitor()

+{

+   talloc_free(mem_ctx);

+}

+

+static struct prog_src_register

+mesa_src_reg_from_ir_src_reg(ir_to_mesa_src_reg reg)

+{

+   struct prog_src_register mesa_reg;

+

+   mesa_reg.File = reg.file;

+   assert(reg.index < (1 << INST_INDEX_BITS));

+   mesa_reg.Index = reg.index;

+   mesa_reg.Swizzle = reg.swizzle;

+   mesa_reg.RelAddr = reg.reladdr != NULL;

+   mesa_reg.Negate = reg.negate;

+   mesa_reg.Abs = 0;

+   mesa_reg.HasIndex2 = GL_FALSE;

+   mesa_reg.RelAddr2 = 0;

+   mesa_reg.Index2 = 0;

+

+   return mesa_reg;

+}

+

+static void

+set_branchtargets(ir_to_mesa_visitor *v,

+		  struct prog_instruction *mesa_instructions,

+		  int num_instructions)

+{

+   int if_count = 0, loop_count = 0;

+   int *if_stack, *loop_stack;

+   int if_stack_pos = 0, loop_stack_pos = 0;

+   int i, j;

+

+   for (i = 0; i < num_instructions; i++) {

+      switch (mesa_instructions[i].Opcode) {

+      case OPCODE_IF:

+	 if_count++;

+	 break;

+      case OPCODE_BGNLOOP:

+	 loop_count++;

+	 break;

+      case OPCODE_BRK:

+      case OPCODE_CONT:

+	 mesa_instructions[i].BranchTarget = -1;

+	 break;

+      default:

+	 break;

+      }

+   }

+

+   if_stack = talloc_zero_array(v->mem_ctx, int, if_count);

+   loop_stack = talloc_zero_array(v->mem_ctx, int, loop_count);

+

+   for (i = 0; i < num_instructions; i++) {

+      switch (mesa_instructions[i].Opcode) {

+      case OPCODE_IF:

+	 if_stack[if_stack_pos] = i;

+	 if_stack_pos++;

+	 break;

+      case OPCODE_ELSE:

+	 mesa_instructions[if_stack[if_stack_pos - 1]].BranchTarget = i;

+	 if_stack[if_stack_pos - 1] = i;

+	 break;

+      case OPCODE_ENDIF:

+	 mesa_instructions[if_stack[if_stack_pos - 1]].BranchTarget = i;

+	 if_stack_pos--;

+	 break;

+      case OPCODE_BGNLOOP:

+	 loop_stack[loop_stack_pos] = i;

+	 loop_stack_pos++;

+	 break;

+      case OPCODE_ENDLOOP:

+	 loop_stack_pos--;

+	 /* Rewrite any breaks/conts at this nesting level (haven't

+	  * already had a BranchTarget assigned) to point to the end

+	  * of the loop.

+	  */

+	 for (j = loop_stack[loop_stack_pos]; j < i; j++) {

+	    if (mesa_instructions[j].Opcode == OPCODE_BRK ||

+		mesa_instructions[j].Opcode == OPCODE_CONT) {

+	       if (mesa_instructions[j].BranchTarget == -1) {

+		  mesa_instructions[j].BranchTarget = i;

+	       }

+	    }

+	 }

+	 /* The loop ends point at each other. */

+	 mesa_instructions[i].BranchTarget = loop_stack[loop_stack_pos];

+	 mesa_instructions[loop_stack[loop_stack_pos]].BranchTarget = i;

+	 break;

+      case OPCODE_CAL:

+	 foreach_iter(exec_list_iterator, iter, v->function_signatures) {

+	    function_entry *entry = (function_entry *)iter.get();

+

+	    if (entry->sig_id == mesa_instructions[i].BranchTarget) {

+	       mesa_instructions[i].BranchTarget = entry->inst;

+	       break;

+	    }

+	 }

+	 break;

+      default:

+	 break;

+      }

+   }

+}

+

+static void

+print_program(struct prog_instruction *mesa_instructions,

+	      ir_instruction **mesa_instruction_annotation,

+	      int num_instructions)

+{

+   ir_instruction *last_ir = NULL;

+   int i;

+   int indent = 0;

+

+   for (i = 0; i < num_instructions; i++) {

+      struct prog_instruction *mesa_inst = mesa_instructions + i;

+      ir_instruction *ir = mesa_instruction_annotation[i];

+

+      fprintf(stdout, "%3d: ", i);

+

+      if (last_ir != ir && ir) {

+	 int j;

+

+	 for (j = 0; j < indent; j++) {

+	    fprintf(stdout, " ");

+	 }

+	 ir->print();

+	 printf("\n");

+	 last_ir = ir;

+

+	 fprintf(stdout, "     "); /* line number spacing. */

+      }

+

+      indent = _mesa_fprint_instruction_opt(stdout, mesa_inst, indent,

+					    PROG_PRINT_DEBUG, NULL);

+   }

+}

+

+static void

+count_resources(struct gl_program *prog)

+{

+   unsigned int i;

+

+   prog->SamplersUsed = 0;

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = &prog->Instructions[i];

+

+      if (_mesa_is_tex_instruction(inst->Opcode)) {

+	 prog->SamplerTargets[inst->TexSrcUnit] =

+	    (gl_texture_index)inst->TexSrcTarget;

+	 prog->SamplersUsed |= 1 << inst->TexSrcUnit;

+	 if (inst->TexShadow) {

+	    prog->ShadowSamplers |= 1 << inst->TexSrcUnit;

+	 }

+      }

+   }

+

+   _mesa_update_shader_textures_used(prog);

+}

+

+struct uniform_sort {

+   struct gl_uniform *u;

+   int pos;

+};

+

+/* The shader_program->Uniforms list is almost sorted in increasing

+ * uniform->{Frag,Vert}Pos locations, but not quite when there are

+ * uniforms shared between targets.  We need to add parameters in

+ * increasing order for the targets.

+ */

+static int

+sort_uniforms(const void *a, const void *b)

+{

+   struct uniform_sort *u1 = (struct uniform_sort *)a;

+   struct uniform_sort *u2 = (struct uniform_sort *)b;

+

+   return u1->pos - u2->pos;

+}

+

+/* Add the uniforms to the parameters.  The linker chose locations

+ * in our parameters lists (which weren't created yet), which the

+ * uniforms code will use to poke values into our parameters list

+ * when uniforms are updated.

+ */

+static void

+add_uniforms_to_parameters_list(struct gl_shader_program *shader_program,

+				struct gl_shader *shader,

+				struct gl_program *prog)

+{

+   unsigned int i;

+   unsigned int next_sampler = 0, num_uniforms = 0;

+   struct uniform_sort *sorted_uniforms;

+

+   sorted_uniforms = talloc_array(NULL, struct uniform_sort,

+				  shader_program->Uniforms->NumUniforms);

+

+   for (i = 0; i < shader_program->Uniforms->NumUniforms; i++) {

+      struct gl_uniform *uniform = shader_program->Uniforms->Uniforms + i;

+      int parameter_index = -1;

+

+      switch (shader->Type) {

+      case GL_VERTEX_SHADER:

+	 parameter_index = uniform->VertPos;

+	 break;

+      case GL_FRAGMENT_SHADER:

+	 parameter_index = uniform->FragPos;

+	 break;

+      case GL_GEOMETRY_SHADER:

+	 parameter_index = uniform->GeomPos;

+	 break;

+      }

+

+      /* Only add uniforms used in our target. */

+      if (parameter_index != -1) {

+	 sorted_uniforms[num_uniforms].pos = parameter_index;

+	 sorted_uniforms[num_uniforms].u = uniform;

+	 num_uniforms++;

+      }

+   }

+

+   qsort(sorted_uniforms, num_uniforms, sizeof(struct uniform_sort),

+	 sort_uniforms);

+

+   for (i = 0; i < num_uniforms; i++) {

+      struct gl_uniform *uniform = sorted_uniforms[i].u;

+      int parameter_index = sorted_uniforms[i].pos;

+      const glsl_type *type = uniform->Type;

+      unsigned int size;

+

+      if (type->is_vector() ||

+	  type->is_scalar()) {

+	 size = type->vector_elements;

+      } else {

+	 size = type_size(type) * 4;

+      }

+

+      gl_register_file file;

+      if (type->is_sampler() ||

+	  (type->is_array() && type->fields.array->is_sampler())) {

+	 file = PROGRAM_SAMPLER;

+      } else {

+	 file = PROGRAM_UNIFORM;

+      }

+

+      GLint index = _mesa_lookup_parameter_index(prog->Parameters, -1,

+						 uniform->Name);

+

+      if (index < 0) {

+	 index = _mesa_add_parameter(prog->Parameters, file,

+				     uniform->Name, size, type->gl_type,

+				     NULL, NULL, 0x0);

+

+	 /* Sampler uniform values are stored in prog->SamplerUnits,

+	  * and the entry in that array is selected by this index we

+	  * store in ParameterValues[].

+	  */

+	 if (file == PROGRAM_SAMPLER) {

+	    for (unsigned int j = 0; j < size / 4; j++)

+	       prog->Parameters->ParameterValues[index + j][0] = next_sampler++;

+	 }

+

+	 /* The location chosen in the Parameters list here (returned

+	  * from _mesa_add_uniform) has to match what the linker chose.

+	  */

+	 if (index != parameter_index) {

+	    fail_link(shader_program, "Allocation of uniform `%s' to target "

+		      "failed (%d vs %d)\n",

+		      uniform->Name, index, parameter_index);

+	 }

+      }

+   }

+

+   talloc_free(sorted_uniforms);

+}

+

+static void

+set_uniform_initializer(struct gl_context *ctx, void *mem_ctx,

+			struct gl_shader_program *shader_program,

+			const char *name, const glsl_type *type,

+			ir_constant *val)

+{

+   if (type->is_record()) {

+      ir_constant *field_constant;

+

+      field_constant = (ir_constant *)val->components.get_head();

+

+      for (unsigned int i = 0; i < type->length; i++) {

+	 const glsl_type *field_type = type->fields.structure[i].type;

+	 const char *field_name = talloc_asprintf(mem_ctx, "%s.%s", name,

+					    type->fields.structure[i].name);

+	 set_uniform_initializer(ctx, mem_ctx, shader_program, field_name,

+				 field_type, field_constant);

+	 field_constant = (ir_constant *)field_constant->next;

+      }

+      return;

+   }

+

+   int loc = _mesa_get_uniform_location(ctx, shader_program, name);

+

+   if (loc == -1) {

+      fail_link(shader_program,

+		"Couldn't find uniform for initializer %s\n", name);

+      return;

+   }

+

+   for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) {

+      ir_constant *element;

+      const glsl_type *element_type;

+      if (type->is_array()) {

+	 element = val->array_elements[i];

+	 element_type = type->fields.array;

+      } else {

+	 element = val;

+	 element_type = type;

+      }

+

+      void *values;

+

+      if (element_type->base_type == GLSL_TYPE_BOOL) {

+	 int *conv = talloc_array(mem_ctx, int, element_type->components());

+	 for (unsigned int j = 0; j < element_type->components(); j++) {

+	    conv[j] = element->value.b[j];

+	 }

+	 values = (void *)conv;

+	 element_type = glsl_type::get_instance(GLSL_TYPE_INT,

+						element_type->vector_elements,

+						1);

+      } else {

+	 values = &element->value;

+      }

+

+      if (element_type->is_matrix()) {

+	 _mesa_uniform_matrix(ctx, shader_program,

+			      element_type->matrix_columns,

+			      element_type->vector_elements,

+			      loc, 1, GL_FALSE, (GLfloat *)values);

+	 loc += element_type->matrix_columns;

+      } else {

+	 _mesa_uniform(ctx, shader_program, loc, element_type->matrix_columns,

+		       values, element_type->gl_type);

+	 loc += type_size(element_type);

+      }

+   }

+}

+

+static void

+set_uniform_initializers(struct gl_context *ctx,

+			 struct gl_shader_program *shader_program)

+{

+   void *mem_ctx = NULL;

+

+   for (unsigned int i = 0; i < MESA_SHADER_TYPES; i++) {

+      struct gl_shader *shader = shader_program->_LinkedShaders[i];

+

+      if (shader == NULL)

+	 continue;

+

+      foreach_iter(exec_list_iterator, iter, *shader->ir) {

+	 ir_instruction *ir = (ir_instruction *)iter.get();

+	 ir_variable *var = ir->as_variable();

+

+	 if (!var || var->mode != ir_var_uniform || !var->constant_value)

+	    continue;

+

+	 if (!mem_ctx)

+	    mem_ctx = talloc_new(NULL);

+

+	 set_uniform_initializer(ctx, mem_ctx, shader_program, var->name,

+				 var->type, var->constant_value);

+      }

+   }

+

+   talloc_free(mem_ctx);

+}

+

+

+/**

+ * Convert a shader's GLSL IR into a Mesa gl_program.

+ */

+static struct gl_program *

+get_mesa_program(struct gl_context *ctx,

+                 struct gl_shader_program *shader_program,

+		 struct gl_shader *shader)

+{

+   ir_to_mesa_visitor v;

+   struct prog_instruction *mesa_instructions, *mesa_inst;

+   ir_instruction **mesa_instruction_annotation;

+   int i;

+   struct gl_program *prog;

+   GLenum target;

+   const char *target_string;

+   GLboolean progress;

+   struct gl_shader_compiler_options *options =

+         &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(shader->Type)];

+

+   switch (shader->Type) {

+   case GL_VERTEX_SHADER:

+      target = GL_VERTEX_PROGRAM_ARB;

+      target_string = "vertex";

+      break;

+   case GL_FRAGMENT_SHADER:

+      target = GL_FRAGMENT_PROGRAM_ARB;

+      target_string = "fragment";

+      break;

+   case GL_GEOMETRY_SHADER:

+      target = GL_GEOMETRY_PROGRAM_NV;

+      target_string = "geometry";

+      break;

+   default:

+      assert(!"should not be reached");

+      return NULL;

+   }

+

+   validate_ir_tree(shader->ir);

+

+   prog = ctx->Driver.NewProgram(ctx, target, shader_program->Name);

+   if (!prog)

+      return NULL;

+   prog->Parameters = _mesa_new_parameter_list();

+   prog->Varying = _mesa_new_parameter_list();

+   prog->Attributes = _mesa_new_parameter_list();

+   v.ctx = ctx;

+   v.prog = prog;

+   v.shader_program = shader_program;

+   v.options = options;

+

+   add_uniforms_to_parameters_list(shader_program, shader, prog);

+

+   /* Emit Mesa IR for main(). */

+   visit_exec_list(shader->ir, &v);

+   v.ir_to_mesa_emit_op0(NULL, OPCODE_END);

+

+   /* Now emit bodies for any functions that were used. */

+   do {

+      progress = GL_FALSE;

+

+      foreach_iter(exec_list_iterator, iter, v.function_signatures) {

+	 function_entry *entry = (function_entry *)iter.get();

+

+	 if (!entry->bgn_inst) {

+	    v.current_function = entry;

+

+	    entry->bgn_inst = v.ir_to_mesa_emit_op0(NULL, OPCODE_BGNSUB);

+	    entry->bgn_inst->function = entry;

+

+	    visit_exec_list(&entry->sig->body, &v);

+

+	    ir_to_mesa_instruction *last;

+	    last = (ir_to_mesa_instruction *)v.instructions.get_tail();

+	    if (last->op != OPCODE_RET)

+	       v.ir_to_mesa_emit_op0(NULL, OPCODE_RET);

+

+	    ir_to_mesa_instruction *end;

+	    end = v.ir_to_mesa_emit_op0(NULL, OPCODE_ENDSUB);

+	    end->function = entry;

+

+	    progress = GL_TRUE;

+	 }

+      }

+   } while (progress);

+

+   prog->NumTemporaries = v.next_temp;

+

+   int num_instructions = 0;

+   foreach_iter(exec_list_iterator, iter, v.instructions) {

+      num_instructions++;

+   }

+

+   mesa_instructions =

+      (struct prog_instruction *)calloc(num_instructions,

+					sizeof(*mesa_instructions));

+   mesa_instruction_annotation = talloc_array(v.mem_ctx, ir_instruction *,

+					      num_instructions);

+

+   /* Convert ir_mesa_instructions into prog_instructions.

+    */

+   mesa_inst = mesa_instructions;

+   i = 0;

+   foreach_iter(exec_list_iterator, iter, v.instructions) {

+      const ir_to_mesa_instruction *inst = (ir_to_mesa_instruction *)iter.get();

+

+      mesa_inst->Opcode = inst->op;

+      mesa_inst->CondUpdate = inst->cond_update;

+      if (inst->saturate)

+	 mesa_inst->SaturateMode = SATURATE_ZERO_ONE;

+      mesa_inst->DstReg.File = inst->dst_reg.file;

+      mesa_inst->DstReg.Index = inst->dst_reg.index;

+      mesa_inst->DstReg.CondMask = inst->dst_reg.cond_mask;

+      mesa_inst->DstReg.WriteMask = inst->dst_reg.writemask;

+      mesa_inst->DstReg.RelAddr = inst->dst_reg.reladdr != NULL;

+      mesa_inst->SrcReg[0] = mesa_src_reg_from_ir_src_reg(inst->src_reg[0]);

+      mesa_inst->SrcReg[1] = mesa_src_reg_from_ir_src_reg(inst->src_reg[1]);

+      mesa_inst->SrcReg[2] = mesa_src_reg_from_ir_src_reg(inst->src_reg[2]);

+      mesa_inst->TexSrcUnit = inst->sampler;

+      mesa_inst->TexSrcTarget = inst->tex_target;

+      mesa_inst->TexShadow = inst->tex_shadow;

+      mesa_instruction_annotation[i] = inst->ir;

+

+      /* Set IndirectRegisterFiles. */

+      if (mesa_inst->DstReg.RelAddr)

+         prog->IndirectRegisterFiles |= 1 << mesa_inst->DstReg.File;

+

+      /* Update program's bitmask of indirectly accessed register files */

+      for (unsigned src = 0; src < 3; src++)

+         if (mesa_inst->SrcReg[src].RelAddr)

+            prog->IndirectRegisterFiles |= 1 << mesa_inst->SrcReg[src].File;

+

+      if (options->EmitNoIfs && mesa_inst->Opcode == OPCODE_IF) {

+	 fail_link(shader_program, "Couldn't flatten if statement\n");

+      }

+

+      switch (mesa_inst->Opcode) {

+      case OPCODE_BGNSUB:

+	 inst->function->inst = i;

+	 mesa_inst->Comment = strdup(inst->function->sig->function_name());

+	 break;

+      case OPCODE_ENDSUB:

+	 mesa_inst->Comment = strdup(inst->function->sig->function_name());

+	 break;

+      case OPCODE_CAL:

+	 mesa_inst->BranchTarget = inst->function->sig_id; /* rewritten later */

+	 break;

+      case OPCODE_ARL:

+	 prog->NumAddressRegs = 1;

+	 break;

+      default:

+	 break;

+      }

+

+      mesa_inst++;

+      i++;

+

+      if (!shader_program->LinkStatus)

+         break;

+   }

+

+   if (!shader_program->LinkStatus) {

+      free(mesa_instructions);

+      _mesa_reference_program(ctx, &shader->Program, NULL);

+      return NULL;

+   }

+

+   set_branchtargets(&v, mesa_instructions, num_instructions);

+

+   if (ctx->Shader.Flags & GLSL_DUMP) {

+      printf("\n");

+      printf("GLSL IR for linked %s program %d:\n", target_string,

+	     shader_program->Name);

+      _mesa_print_ir(shader->ir, NULL);

+      printf("\n");

+      printf("\n");

+      printf("Mesa IR for linked %s program %d:\n", target_string,

+	     shader_program->Name);

+      print_program(mesa_instructions, mesa_instruction_annotation,

+		    num_instructions);

+   }

+

+   prog->Instructions = mesa_instructions;

+   prog->NumInstructions = num_instructions;

+

+   do_set_program_inouts(shader->ir, prog);

+   count_resources(prog);

+

+   _mesa_reference_program(ctx, &shader->Program, prog);

+

+   if ((ctx->Shader.Flags & GLSL_NO_OPT) == 0) {

+      _mesa_optimize_program(ctx, prog);

+   }

+

+   return prog;

+}

+

+extern "C" {

+

+/**

+ * Called via ctx->Driver.CompilerShader().

+ * This is a no-op.

+ * XXX can we remove the ctx->Driver.CompileShader() hook?

+ */

+GLboolean

+_mesa_ir_compile_shader(struct gl_context *ctx, struct gl_shader *shader)

+{

+   assert(shader->CompileStatus);

+   (void) ctx;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Link a shader.

+ * Called via ctx->Driver.LinkShader()

+ * This actually involves converting GLSL IR into Mesa gl_programs with

+ * code lowering and other optimizations.

+ */

+GLboolean

+_mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)

+{

+   assert(prog->LinkStatus);

+

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {

+      if (prog->_LinkedShaders[i] == NULL)

+	 continue;

+

+      bool progress;

+      exec_list *ir = prog->_LinkedShaders[i]->ir;

+      const struct gl_shader_compiler_options *options =

+            &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(prog->_LinkedShaders[i]->Type)];

+

+      do {

+	 progress = false;

+

+	 /* Lowering */

+	 do_mat_op_to_vec(ir);

+	 lower_instructions(ir, (MOD_TO_FRACT | DIV_TO_MUL_RCP | EXP_TO_EXP2

+				 | LOG_TO_LOG2

+				 | ((options->EmitNoPow) ? POW_TO_EXP2 : 0)));

+

+	 progress = do_lower_jumps(ir, true, true, options->EmitNoMainReturn, options->EmitNoCont, options->EmitNoLoops) || progress;

+

+	 progress = do_common_optimization(ir, true, options->MaxUnrollIterations) || progress;

+

+	 progress = lower_quadop_vector(ir, true) || progress;

+

+	 if (options->EmitNoIfs) {

+	    progress = lower_discard(ir) || progress;

+	    progress = lower_if_to_cond_assign(ir) || progress;

+	 }

+

+	 if (options->EmitNoNoise)

+	    progress = lower_noise(ir) || progress;

+

+	 /* If there are forms of indirect addressing that the driver

+	  * cannot handle, perform the lowering pass.

+	  */

+	 if (options->EmitNoIndirectInput || options->EmitNoIndirectOutput

+	     || options->EmitNoIndirectTemp || options->EmitNoIndirectUniform)

+	   progress =

+	     lower_variable_index_to_cond_assign(ir,

+						 options->EmitNoIndirectInput,

+						 options->EmitNoIndirectOutput,

+						 options->EmitNoIndirectTemp,

+						 options->EmitNoIndirectUniform)

+	     || progress;

+

+	 progress = do_vec_index_to_cond_assign(ir) || progress;

+      } while (progress);

+

+      validate_ir_tree(ir);

+   }

+

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) {

+      struct gl_program *linked_prog;

+

+      if (prog->_LinkedShaders[i] == NULL)

+	 continue;

+

+      linked_prog = get_mesa_program(ctx, prog, prog->_LinkedShaders[i]);

+

+      if (linked_prog) {

+         bool ok = true;

+

+         switch (prog->_LinkedShaders[i]->Type) {

+         case GL_VERTEX_SHADER:

+            _mesa_reference_vertprog(ctx, &prog->VertexProgram,

+                                     (struct gl_vertex_program *)linked_prog);

+            ok = ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,

+                                                 linked_prog);

+            break;

+         case GL_FRAGMENT_SHADER:

+            _mesa_reference_fragprog(ctx, &prog->FragmentProgram,

+                                     (struct gl_fragment_program *)linked_prog);

+            ok = ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,

+                                                 linked_prog);

+            break;

+         case GL_GEOMETRY_SHADER:

+            _mesa_reference_geomprog(ctx, &prog->GeometryProgram,

+                                     (struct gl_geometry_program *)linked_prog);

+            ok = ctx->Driver.ProgramStringNotify(ctx, GL_GEOMETRY_PROGRAM_NV,

+                                                 linked_prog);

+            break;

+         }

+         if (!ok) {

+            return GL_FALSE;

+         }

+      }

+

+      _mesa_reference_program(ctx, &linked_prog, NULL);

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Compile a GLSL shader.  Called via glCompileShader().

+ */

+void

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

+   /* Check if the user called glCompileShader without first calling

+    * glShaderSource.  This should fail to compile, but not raise a GL_ERROR.

+    */

+   if (source == NULL) {

+      shader->CompileStatus = GL_FALSE;

+      return;

+   }

+

+   state->error = preprocess(state, &source, &state->info_log,

+			     &ctx->Extensions, ctx->API);

+

+   if (ctx->Shader.Flags & GLSL_DUMP) {

+      printf("GLSL source for shader %d:\n", shader->Name);

+      printf("%s\n", shader->Source);

+   }

+

+   if (!state->error) {

+     _mesa_glsl_lexer_ctor(state, source);

+     _mesa_glsl_parse(state);

+     _mesa_glsl_lexer_dtor(state);

+   }

+

+   talloc_free(shader->ir);

+   shader->ir = new(shader) exec_list;

+   if (!state->error && !state->translation_unit.is_empty())

+      _mesa_ast_to_hir(shader->ir, state);

+

+   if (!state->error && !shader->ir->is_empty()) {

+      validate_ir_tree(shader->ir);

+

+      /* Do some optimization at compile time to reduce shader IR size

+       * and reduce later work if the same shader is linked multiple times

+       */

+      while (do_common_optimization(shader->ir, false, 32))

+	 ;

+

+      validate_ir_tree(shader->ir);

+   }

+

+   shader->symbols = state->symbols;

+

+   shader->CompileStatus = !state->error;

+   shader->InfoLog = state->info_log;

+   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 (ctx->Shader.Flags & GLSL_LOG) {

+      _mesa_write_shader_to_file(shader);

+   }

+

+   if (ctx->Shader.Flags & GLSL_DUMP) {

+      if (shader->CompileStatus) {

+	 printf("GLSL IR for shader %d:\n", shader->Name);

+	 _mesa_print_ir(shader->ir, NULL);

+	 printf("\n\n");

+      } else {

+	 printf("GLSL shader %d failed to compile.\n", shader->Name);

+      }

+      if (shader->InfoLog && shader->InfoLog[0] != 0) {

+	 printf("GLSL shader %d info log:\n", shader->Name);

+	 printf("%s\n", shader->InfoLog);

+      }

+   }

+

+   /* Retain any live IR, but trash the rest. */

+   reparent_ir(shader->ir, shader->ir);

+

+   talloc_free(state);

+

+   if (shader->CompileStatus) {

+      if (!ctx->Driver.CompileShader(ctx, shader))

+	 shader->CompileStatus = GL_FALSE;

+   }

+}

+

+

+/**

+ * Link a GLSL shader program.  Called via glLinkProgram().

+ */

+void

+_mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)

+{

+   unsigned int i;

+

+   _mesa_clear_shader_program_data(ctx, prog);

+

+   prog->LinkStatus = GL_TRUE;

+

+   for (i = 0; i < prog->NumShaders; i++) {

+      if (!prog->Shaders[i]->CompileStatus) {

+	 fail_link(prog, "linking with uncompiled shader");

+	 prog->LinkStatus = GL_FALSE;

+      }

+   }

+

+   prog->Varying = _mesa_new_parameter_list();

+   _mesa_reference_vertprog(ctx, &prog->VertexProgram, NULL);

+   _mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL);

+   _mesa_reference_geomprog(ctx, &prog->GeometryProgram, NULL);

+

+   if (prog->LinkStatus) {

+      link_shaders(ctx, prog);

+   }

+

+   if (prog->LinkStatus) {

+      if (!ctx->Driver.LinkShader(ctx, prog)) {

+	 prog->LinkStatus = GL_FALSE;

+      }

+   }

+

+   set_uniform_initializers(ctx, prog);

+

+   if (ctx->Shader.Flags & GLSL_DUMP) {

+      if (!prog->LinkStatus) {

+	 printf("GLSL shader program %d failed to link\n", prog->Name);

+      }

+

+      if (prog->InfoLog && prog->InfoLog[0] != 0) {

+	 printf("GLSL shader program %d info log:\n", prog->Name);

+	 printf("%s\n", prog->InfoLog);

+      }

+   }

+}

+

+} /* extern "C" */

diff --git a/mesalib/src/mesa/program/ir_to_mesa.h b/mesalib/src/mesa/program/ir_to_mesa.h
index ecaacde4b..e708bb769 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.h
+++ b/mesalib/src/mesa/program/ir_to_mesa.h
@@ -1,38 +1,41 @@
-/*
- * 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.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "main/config.h"
-#include "main/mtypes.h"
-
-void _mesa_glsl_compile_shader(GLcontext *ctx, struct gl_shader *sh);
-void _mesa_glsl_link_shader(GLcontext *ctx, struct gl_shader_program *prog);
-GLboolean _mesa_ir_compile_shader(GLcontext *ctx, struct gl_shader *shader);
-GLboolean _mesa_ir_link_shader(GLcontext *ctx, struct gl_shader_program *prog);
-
-#ifdef __cplusplus
-}
-#endif
+/*

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

+ */

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#include "main/glheader.h"

+

+struct gl_context;

+struct gl_shader;

+struct gl_shader_program;

+

+void _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *sh);

+void _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);

+GLboolean _mesa_ir_compile_shader(struct gl_context *ctx, struct gl_shader *shader);

+GLboolean _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);

+

+#ifdef __cplusplus

+}

+#endif

diff --git a/mesalib/src/mesa/program/nvfragparse.c b/mesalib/src/mesa/program/nvfragparse.c
index 0de3c5804..04538e071 100644
--- a/mesalib/src/mesa/program/nvfragparse.c
+++ b/mesalib/src/mesa/program/nvfragparse.c
@@ -1,1588 +1,1588 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 nvfragparse.c
- * NVIDIA fragment program parser.
- * \author Brian Paul
- */
-
-/*
- * Regarding GL_NV_fragment_program:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "program.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "prog_instruction.h"
-#include "nvfragparse.h"
-
-
-#define INPUT_1V     1
-#define INPUT_2V     2
-#define INPUT_3V     3
-#define INPUT_1S     4
-#define INPUT_2S     5
-#define INPUT_CC     6
-#define INPUT_1V_T   7  /* one source vector, plus textureId */
-#define INPUT_3V_T   8  /* one source vector, plus textureId */
-#define INPUT_NONE   9
-#define INPUT_1V_S  10  /* a string and a vector register */
-#define OUTPUT_V    20
-#define OUTPUT_S    21
-#define OUTPUT_NONE 22
-
-/* IRIX defines some of these */
-#undef _R
-#undef _H
-#undef _X
-#undef _C
-#undef _S
-
-/* Optional suffixes */
-#define _R  FLOAT32  /* float */
-#define _H  FLOAT16  /* half-float */
-#define _X  FIXED12  /* fixed */
-#define _C  0x08     /* set cond codes */
-#define _S  0x10     /* saturate, clamp result to [0,1] */
-
-struct instruction_pattern {
-   const char *name;
-   enum prog_opcode opcode;
-   GLuint inputs;
-   GLuint outputs;
-   GLuint suffixes;
-};
-
-static const struct instruction_pattern Instructions[] = {
-   { "ADD", OPCODE_ADD, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "COS", OPCODE_COS, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "DDX", OPCODE_DDX, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
-   { "DDY", OPCODE_DDY, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
-   { "DP3", OPCODE_DP3, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },
-   { "DP4", OPCODE_DP4, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },
-   { "DST", OPCODE_DP4, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },
-   { "EX2", OPCODE_DP4, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "FLR", OPCODE_FLR, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "FRC", OPCODE_FRC, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "KIL", OPCODE_KIL_NV, INPUT_CC, OUTPUT_NONE, 0                },
-   { "LG2", OPCODE_LG2, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "LIT", OPCODE_LIT, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },
-   { "LRP", OPCODE_LRP, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MAD", OPCODE_MAD, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MAX", OPCODE_MAX, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MIN", OPCODE_MIN, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MOV", OPCODE_MOV, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "MUL", OPCODE_MUL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "PK2H",  OPCODE_PK2H,  INPUT_1V, OUTPUT_S, 0                  },
-   { "PK2US", OPCODE_PK2US, INPUT_1V, OUTPUT_S, 0                  },
-   { "PK4B",  OPCODE_PK4B,  INPUT_1V, OUTPUT_S, 0                  },
-   { "PK4UB", OPCODE_PK4UB, INPUT_1V, OUTPUT_S, 0                  },
-   { "POW", OPCODE_POW, INPUT_2S, OUTPUT_S, _R | _H |      _C | _S },
-   { "RCP", OPCODE_RCP, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "RFL", OPCODE_RFL, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },
-   { "RSQ", OPCODE_RSQ, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "SEQ", OPCODE_SEQ, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SFL", OPCODE_SFL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SGE", OPCODE_SGE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SGT", OPCODE_SGT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SIN", OPCODE_SIN, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },
-   { "SLE", OPCODE_SLE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SLT", OPCODE_SLT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SNE", OPCODE_SNE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "STR", OPCODE_STR, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "SUB", OPCODE_SUB, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },
-   { "TEX", OPCODE_TEX, INPUT_1V_T, OUTPUT_V,              _C | _S },
-   { "TXD", OPCODE_TXD, INPUT_3V_T, OUTPUT_V,              _C | _S },
-   { "TXP", OPCODE_TXP_NV, INPUT_1V_T, OUTPUT_V,           _C | _S },
-   { "UP2H",  OPCODE_UP2H,  INPUT_1S, OUTPUT_V,            _C | _S },
-   { "UP2US", OPCODE_UP2US, INPUT_1S, OUTPUT_V,            _C | _S },
-   { "UP4B",  OPCODE_UP4B,  INPUT_1S, OUTPUT_V,            _C | _S },
-   { "UP4UB", OPCODE_UP4UB, INPUT_1S, OUTPUT_V,            _C | _S },
-   { "X2D", OPCODE_X2D, INPUT_3V, OUTPUT_V, _R | _H |      _C | _S },
-   { "PRINT", OPCODE_PRINT, INPUT_1V_S, OUTPUT_NONE, 0               },
-   { NULL, (enum prog_opcode) -1, 0, 0, 0 }
-};
-
-
-/*
- * Information needed or computed during parsing.
- * Remember, we can't modify the target program object until we've
- * _successfully_ parsed the program text.
- */
-struct parse_state {
-   GLcontext *ctx;
-   const GLubyte *start;              /* start of program string */
-   const GLubyte *pos;                /* current position */
-   const GLubyte *curLine;
-   struct gl_fragment_program *program;  /* current program */
-
-   struct gl_program_parameter_list *parameters;
-
-   GLuint numInst;                    /* number of instructions parsed */
-   GLuint inputsRead;                 /* bitmask of input registers used */
-   GLuint outputsWritten;             /* bitmask of 1 << FRAG_OUTPUT_* bits */
-   GLuint texturesUsed[MAX_TEXTURE_IMAGE_UNITS];
-};
-
-
-
-/*
- * Called whenever we find an error during parsing.
- */
-static void
-record_error(struct parse_state *parseState, const char *msg, int lineNo)
-{
-#ifdef DEBUG
-   GLint line, column;
-   const GLubyte *lineStr;
-   lineStr = _mesa_find_line_column(parseState->start,
-                                    parseState->pos, &line, &column);
-   _mesa_debug(parseState->ctx,
-               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
-               lineNo, line, column, (char *) lineStr, msg);
-   free((void *) lineStr);
-#else
-   (void) lineNo;
-#endif
-
-   /* Check that no error was already recorded.  Only record the first one. */
-   if (parseState->ctx->Program.ErrorString[0] == 0) {
-      _mesa_set_program_error(parseState->ctx,
-                              parseState->pos - parseState->start,
-                              msg);
-   }
-}
-
-
-#define RETURN_ERROR							\
-do {									\
-   record_error(parseState, "Unexpected end of input.", __LINE__);	\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR1(msg)						\
-do {									\
-   record_error(parseState, msg, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR2(msg1, msg2)					\
-do {									\
-   char err[1000];							\
-   sprintf(err, "%s %s", msg1, msg2);				\
-   record_error(parseState, err, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-
-
-
-/*
- * Search a list of instruction structures for a match.
- */
-static struct instruction_pattern
-MatchInstruction(const GLubyte *token)
-{
-   const struct instruction_pattern *inst;
-   struct instruction_pattern result;
-
-   result.name = NULL;
-   result.opcode = MAX_OPCODE; /* i.e. invalid instruction */
-   result.inputs = 0;
-   result.outputs = 0;
-   result.suffixes = 0;
-
-   for (inst = Instructions; inst->name; inst++) {
-      if (strncmp((const char *) token, inst->name, 3) == 0) {
-         /* matched! */
-         int i = 3;
-         result = *inst;
-         result.suffixes = 0;
-         /* look at suffix */
-         if (token[i] == 'R') {
-            result.suffixes |= _R;
-            i++;
-         }
-         else if (token[i] == 'H') {
-            result.suffixes |= _H;
-            i++;
-         }
-         else if (token[i] == 'X') {
-            result.suffixes |= _X;
-            i++;
-         }
-         if (token[i] == 'C') {
-            result.suffixes |= _C;
-            i++;
-         }
-         if (token[i] == '_' && token[i+1] == 'S' &&
-             token[i+2] == 'A' && token[i+3] == 'T') {
-            result.suffixes |= _S;
-         }
-         return result;
-      }
-   }
-
-   return result;
-}
-
-
-
-
-/**********************************************************************/
-
-
-static GLboolean IsLetter(GLubyte b)
-{
-   return (b >= 'a' && b <= 'z') ||
-          (b >= 'A' && b <= 'Z') ||
-          (b == '_') ||
-          (b == '$');
-}
-
-
-static GLboolean IsDigit(GLubyte b)
-{
-   return b >= '0' && b <= '9';
-}
-
-
-static GLboolean IsWhitespace(GLubyte b)
-{
-   return b == ' ' || b == '\t' || b == '\n' || b == '\r';
-}
-
-
-/**
- * Starting at 'str' find the next token.  A token can be an integer,
- * an identifier or punctuation symbol.
- * \return <= 0 we found an error, else, return number of characters parsed.
- */
-static GLint
-GetToken(struct parse_state *parseState, GLubyte *token)
-{
-   const GLubyte *str = parseState->pos;
-   GLint i = 0, j = 0;
-
-   token[0] = 0;
-
-   /* skip whitespace and comments */
-   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {
-      if (str[i] == '#') {
-         /* skip comment */
-         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
-            i++;
-         }
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-         i++;
-      }
-   }
-
-   if (str[i] == 0)
-      return -i;
-
-   /* try matching an integer */
-   while (str[i] && IsDigit(str[i])) {
-      token[j++] = str[i++];
-   }
-   if (j > 0 || !str[i]) {
-      token[j] = 0;
-      return i;
-   }
-
-   /* try matching an identifier */
-   if (IsLetter(str[i])) {
-      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {
-         token[j++] = str[i++];
-      }
-      token[j] = 0;
-      return i;
-   }
-
-   /* punctuation character */
-   if (str[i]) {
-      token[0] = str[i++];
-      token[1] = 0;
-      return i;
-   }
-
-   /* end of input */
-   token[0] = 0;
-   return i;
-}
-
-
-/**
- * Get next token from input stream and increment stream pointer past token.
- */
-static GLboolean
-Parse_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   parseState->pos += i;
-   return GL_TRUE;
-}
-
-
-/**
- * Get next token from input stream but don't increment stream pointer.
- */
-static GLboolean
-Peek_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i, len;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   len = (GLint) strlen((const char *) token);
-   parseState->pos += (i - len);
-   return GL_TRUE;
-}
-
-
-/**********************************************************************/
-
-static const char *InputRegisters[MAX_NV_FRAGMENT_PROGRAM_INPUTS + 1] = {
-   "WPOS", "COL0", "COL1", "FOGC",
-   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
-};
-
-
-
-/**********************************************************************/
-
-/**
- * Try to match 'pattern' as the next token after any whitespace/comments.
- */
-static GLboolean
-Parse_String(struct parse_state *parseState, const char *pattern)
-{
-   const GLubyte *m;
-   GLint i;
-
-   /* skip whitespace and comments */
-   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
-      if (*parseState->pos == '#') {
-         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
-            parseState->pos += 1;
-         }
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-         parseState->pos += 1;
-      }
-   }
-
-   /* Try to match the pattern */
-   m = parseState->pos;
-   for (i = 0; pattern[i]; i++) {
-      if (*m != (GLubyte) pattern[i])
-         return GL_FALSE;
-      m += 1;
-   }
-   parseState->pos = m;
-
-   return GL_TRUE; /* success */
-}
-
-
-static GLboolean
-Parse_Identifier(struct parse_state *parseState, GLubyte *ident)
-{
-   if (!Parse_Token(parseState, ident))
-      RETURN_ERROR;
-   if (IsLetter(ident[0]))
-      return GL_TRUE;
-   else
-      RETURN_ERROR1("Expected an identfier");
-}
-
-
-/**
- * Parse a floating point constant, or a defined symbol name.
- * [+/-]N[.N[eN]]
- * Output:  number[0 .. 3] will get the value.
- */
-static GLboolean
-Parse_ScalarConstant(struct parse_state *parseState, GLfloat *number)
-{
-   char *end = NULL;
-
-   *number = (GLfloat) _mesa_strtof((const char *) parseState->pos, &end);
-
-   if (end && end > (char *) parseState->pos) {
-      /* got a number */
-      parseState->pos = (GLubyte *) end;
-      number[1] = *number;
-      number[2] = *number;
-      number[3] = *number;
-      return GL_TRUE;
-   }
-   else {
-      /* should be an identifier */
-      GLubyte ident[100];
-      const GLfloat *constant;
-      if (!Parse_Identifier(parseState, ident))
-         RETURN_ERROR1("Expected an identifier");
-      constant = _mesa_lookup_parameter_value(parseState->parameters,
-                                              -1, (const char *) ident);
-      /* XXX Check that it's a constant and not a parameter */
-      if (!constant) {
-         RETURN_ERROR1("Undefined symbol");
-      }
-      else {
-         COPY_4V(number, constant);
-         return GL_TRUE;
-      }
-   }
-}
-
-
-
-/**
- * Parse a vector constant, one of:
- *   { float }
- *   { float, float }
- *   { float, float, float }
- *   { float, float, float, float }
- */
-static GLboolean
-Parse_VectorConstant(struct parse_state *parseState, GLfloat *vec)
-{
-   /* "{" was already consumed */
-
-   ASSIGN_4V(vec, 0.0, 0.0, 0.0, 1.0);
-
-   if (!Parse_ScalarConstant(parseState, vec+0))  /* X */
-      return GL_FALSE;
-
-   if (Parse_String(parseState, "}")) {
-      return GL_TRUE;
-   }
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected comma in vector constant");
-
-   if (!Parse_ScalarConstant(parseState, vec+1))  /* Y */
-      return GL_FALSE;
-
-   if (Parse_String(parseState, "}")) {
-      return GL_TRUE;
-   }
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected comma in vector constant");
-
-   if (!Parse_ScalarConstant(parseState, vec+2))  /* Z */
-      return GL_FALSE;
-
-   if (Parse_String(parseState, "}")) {
-      return GL_TRUE;
-   }
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected comma in vector constant");
-
-   if (!Parse_ScalarConstant(parseState, vec+3))  /* W */
-      return GL_FALSE;
-
-   if (!Parse_String(parseState, "}"))
-      RETURN_ERROR1("Expected closing brace in vector constant");
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse <number>, <varname> or {a, b, c, d}.
- * Return number of values in the vector or scalar, or zero if parse error.
- */
-static GLuint
-Parse_VectorOrScalarConstant(struct parse_state *parseState, GLfloat *vec)
-{
-   if (Parse_String(parseState, "{")) {
-      return Parse_VectorConstant(parseState, vec);
-   }
-   else {
-      GLboolean b = Parse_ScalarConstant(parseState, vec);
-      if (b) {
-         vec[1] = vec[2] = vec[3] = vec[0];
-      }
-      return b;
-   }
-}
-
-
-/**
- * Parse a texture image source:
- *    [TEX0 | TEX1 | .. | TEX15] , [1D | 2D | 3D | CUBE | RECT]
- */
-static GLboolean
-Parse_TextureImageId(struct parse_state *parseState,
-                     GLubyte *texUnit, GLubyte *texTargetBit)
-{
-   GLubyte imageSrc[100];
-   GLint unit;
-
-   if (!Parse_Token(parseState, imageSrc))
-      RETURN_ERROR;
-   
-   if (imageSrc[0] != 'T' ||
-       imageSrc[1] != 'E' ||
-       imageSrc[2] != 'X') {
-      RETURN_ERROR1("Expected TEX# source");
-   }
-   unit = atoi((const char *) imageSrc + 3);
-   if ((unit < 0 || unit > MAX_TEXTURE_IMAGE_UNITS) ||
-       (unit == 0 && (imageSrc[3] != '0' || imageSrc[4] != 0))) {
-      RETURN_ERROR1("Invalied TEX# source index");
-   }
-   *texUnit = unit;
-
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR1("Expected ,");
-
-   if (Parse_String(parseState, "1D")) {
-      *texTargetBit = TEXTURE_1D_BIT;
-   }
-   else if (Parse_String(parseState, "2D")) {
-      *texTargetBit = TEXTURE_2D_BIT;
-   }
-   else if (Parse_String(parseState, "3D")) {
-      *texTargetBit = TEXTURE_3D_BIT;
-   }
-   else if (Parse_String(parseState, "CUBE")) {
-      *texTargetBit = TEXTURE_CUBE_BIT;
-   }
-   else if (Parse_String(parseState, "RECT")) {
-      *texTargetBit = TEXTURE_RECT_BIT;
-   }
-   else {
-      RETURN_ERROR1("Invalid texture target token");
-   }
-
-   /* update record of referenced texture units */
-   parseState->texturesUsed[*texUnit] |= *texTargetBit;
-   if (_mesa_bitcount(parseState->texturesUsed[*texUnit]) > 1) {
-      RETURN_ERROR1("Only one texture target can be used per texture unit.");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a scalar suffix like .x, .y, .z or .w or parse a swizzle suffix
- * like .wxyz, .xxyy, etc and return the swizzle indexes.
- */
-static GLboolean
-Parse_SwizzleSuffix(const GLubyte *token, GLuint swizzle[4])
-{
-   if (token[1] == 0) {
-      /* single letter swizzle (scalar) */
-      if (token[0] == 'x')
-         ASSIGN_4V(swizzle, 0, 0, 0, 0);
-      else if (token[0] == 'y')
-         ASSIGN_4V(swizzle, 1, 1, 1, 1);
-      else if (token[0] == 'z')
-         ASSIGN_4V(swizzle, 2, 2, 2, 2);
-      else if (token[0] == 'w')
-         ASSIGN_4V(swizzle, 3, 3, 3, 3);
-      else
-         return GL_FALSE;
-   }
-   else {
-      /* 4-component swizzle (vector) */
-      GLint k;
-      for (k = 0; k < 4 && token[k]; k++) {
-         if (token[k] == 'x')
-            swizzle[k] = 0;
-         else if (token[k] == 'y')
-            swizzle[k] = 1;
-         else if (token[k] == 'z')
-            swizzle[k] = 2;
-         else if (token[k] == 'w')
-            swizzle[k] = 3;
-         else
-            return GL_FALSE;
-      }
-      if (k != 4)
-         return GL_FALSE;
-   }
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_CondCodeMask(struct parse_state *parseState,
-                   struct prog_dst_register *dstReg)
-{
-   if (Parse_String(parseState, "EQ"))
-      dstReg->CondMask = COND_EQ;
-   else if (Parse_String(parseState, "GE"))
-      dstReg->CondMask = COND_GE;
-   else if (Parse_String(parseState, "GT"))
-      dstReg->CondMask = COND_GT;
-   else if (Parse_String(parseState, "LE"))
-      dstReg->CondMask = COND_LE;
-   else if (Parse_String(parseState, "LT"))
-      dstReg->CondMask = COND_LT;
-   else if (Parse_String(parseState, "NE"))
-      dstReg->CondMask = COND_NE;
-   else if (Parse_String(parseState, "TR"))
-      dstReg->CondMask = COND_TR;
-   else if (Parse_String(parseState, "FL"))
-      dstReg->CondMask = COND_FL;
-   else
-      RETURN_ERROR1("Invalid condition code mask");
-
-   /* look for optional .xyzw swizzle */
-   if (Parse_String(parseState, ".")) {
-      GLubyte token[100];
-      GLuint swz[4];
-
-      if (!Parse_Token(parseState, token))  /* get xyzw suffix */
-         RETURN_ERROR;
-
-      if (!Parse_SwizzleSuffix(token, swz))
-         RETURN_ERROR1("Invalid swizzle suffix");
-
-      dstReg->CondSwizzle = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a temporary register: Rnn or Hnn
- */
-static GLboolean
-Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-
-   /* Should be 'R##' or 'H##' */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] != 'R' && token[0] != 'H')
-      RETURN_ERROR1("Expected R## or H##");
-
-   if (IsDigit(token[1])) {
-      GLint reg = atoi((const char *) (token + 1));
-      if (token[0] == 'H')
-         reg += 32;
-      if (reg >= MAX_NV_FRAGMENT_PROGRAM_TEMPS)
-         RETURN_ERROR1("Invalid temporary register name");
-      *tempRegNum = reg;
-   }
-   else {
-      RETURN_ERROR1("Invalid temporary register name");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a write-only dummy register: RC or HC.
- */
-static GLboolean
-Parse_DummyReg(struct parse_state *parseState, GLint *regNum)
-{
-   if (Parse_String(parseState, "RC")) {
-       *regNum = 0;
-   }
-   else if (Parse_String(parseState, "HC")) {
-       *regNum = 1;
-   }
-   else {
-      RETURN_ERROR1("Invalid write-only register name");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse a program local parameter register "p[##]"
- */
-static GLboolean
-Parse_ProgramParamReg(struct parse_state *parseState, GLint *regNum)
-{
-   GLubyte token[100];
-
-   if (!Parse_String(parseState, "p["))
-      RETURN_ERROR1("Expected p[");
-
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (IsDigit(token[0])) {
-      /* a numbered program parameter register */
-      GLint reg = atoi((const char *) token);
-      if (reg >= MAX_NV_FRAGMENT_PROGRAM_PARAMS)
-         RETURN_ERROR1("Invalid constant program number");
-      *regNum = reg;
-   }
-   else {
-      RETURN_ERROR;
-   }
-
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse f[name]  - fragment input register
- */
-static GLboolean
-Parse_FragReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-   GLint j;
-
-   /* Match 'f[' */
-   if (!Parse_String(parseState, "f["))
-      RETURN_ERROR1("Expected f[");
-
-   /* get <name> and look for match */
-   if (!Parse_Token(parseState, token)) {
-      RETURN_ERROR;
-   }
-   for (j = 0; InputRegisters[j]; j++) {
-      if (strcmp((const char *) token, InputRegisters[j]) == 0) {
-         *tempRegNum = j;
-         parseState->inputsRead |= (1 << j);
-         break;
-      }
-   }
-   if (!InputRegisters[j]) {
-      /* unknown input register label */
-      RETURN_ERROR2("Invalid register name", token);
-   }
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
-{
-   GLubyte token[100];
-
-   /* Match "o[" */
-   if (!Parse_String(parseState, "o["))
-      RETURN_ERROR1("Expected o[");
-
-   /* Get output reg name */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   /* try to match an output register name */
-   if (strcmp((char *) token, "COLR") == 0 ||
-       strcmp((char *) token, "COLH") == 0) {
-      /* note that we don't distinguish between COLR and COLH */
-      *outputRegNum = FRAG_RESULT_COLOR;
-      parseState->outputsWritten |= (1 << FRAG_RESULT_COLOR);
-   }
-   else if (strcmp((char *) token, "DEPR") == 0) {
-      *outputRegNum = FRAG_RESULT_DEPTH;
-      parseState->outputsWritten |= (1 << FRAG_RESULT_DEPTH);
-   }
-   else {
-      RETURN_ERROR1("Invalid output register name");
-   }
-
-   /* Match ']' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_MaskedDstReg(struct parse_state *parseState,
-                   struct prog_dst_register *dstReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   /* Dst reg can be R<n>, H<n>, o[n], RC or HC */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (strcmp((const char *) token, "RC") == 0 ||
-       strcmp((const char *) token, "HC") == 0) {
-      /* a write-only register */
-      dstReg->File = PROGRAM_WRITE_ONLY;
-      if (!Parse_DummyReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (token[0] == 'R' || token[0] == 'H') {
-      /* a temporary register */
-      dstReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (token[0] == 'o') {
-      /* an output register */
-      dstReg->File = PROGRAM_OUTPUT;
-      if (!Parse_OutputReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR1("Invalid destination register name");
-   }
-
-   /* Parse optional write mask */
-   if (Parse_String(parseState, ".")) {
-      /* got a mask */
-      GLint k = 0;
-
-      if (!Parse_Token(parseState, token))  /* get xyzw writemask */
-         RETURN_ERROR;
-
-      dstReg->WriteMask = 0;
-
-      if (token[k] == 'x') {
-         dstReg->WriteMask |= WRITEMASK_X;
-         k++;
-      }
-      if (token[k] == 'y') {
-         dstReg->WriteMask |= WRITEMASK_Y;
-         k++;
-      }
-      if (token[k] == 'z') {
-         dstReg->WriteMask |= WRITEMASK_Z;
-         k++;
-      }
-      if (token[k] == 'w') {
-         dstReg->WriteMask |= WRITEMASK_W;
-         k++;
-      }
-      if (k == 0) {
-         RETURN_ERROR1("Invalid writemask character");
-      }
-
-   }
-   else {
-      dstReg->WriteMask = WRITEMASK_XYZW;
-   }
-
-   /* optional condition code mask */
-   if (Parse_String(parseState, "(")) {
-      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".x|y|z|w) */
-      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".[xyzw]) */
-      if (!Parse_CondCodeMask(parseState, dstReg))
-         RETURN_ERROR;
-
-      if (!Parse_String(parseState, ")"))  /* consume ")" */
-         RETURN_ERROR1("Expected )");
-
-      return GL_TRUE;
-   }
-   else {
-      /* no cond code mask */
-      dstReg->CondMask = COND_TR;
-      dstReg->CondSwizzle = SWIZZLE_NOOP;
-      return GL_TRUE;
-   }
-}
-
-
-/**
- * Parse a vector source (register, constant, etc):
- *   <vectorSrc>    ::= <absVectorSrc>
- *                    | <baseVectorSrc>
- *   <absVectorSrc> ::= <negate> "|" <baseVectorSrc> "|"
- */
-static GLboolean
-Parse_VectorSrc(struct parse_state *parseState,
-                struct prog_src_register *srcReg)
-{
-   GLfloat sign = 1.0F;
-   GLubyte token[100];
-   GLint idx;
-   GLuint negateBase, negateAbs;
-
-   /*
-    * First, take care of +/- and absolute value stuff.
-    */
-   if (Parse_String(parseState, "-"))
-      sign = -1.0F;
-   else if (Parse_String(parseState, "+"))
-      sign = +1.0F;
-
-   if (Parse_String(parseState, "|")) {
-      srcReg->Abs = GL_TRUE;
-      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-
-      if (Parse_String(parseState, "-"))
-         negateBase = NEGATE_XYZW;
-      else if (Parse_String(parseState, "+"))
-         negateBase = NEGATE_NONE;
-      else
-         negateBase = NEGATE_NONE;
-   }
-   else {
-      srcReg->Abs = GL_FALSE;
-      negateAbs = NEGATE_NONE;
-      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-   }
-
-   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;
-
-   /* This should be the real src vector/register name */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   /* Src reg can be Rn, Hn, f[n], p[n], a named parameter, a scalar
-    * literal or vector literal.
-    */
-   if (token[0] == 'R' || token[0] == 'H') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'f') {
-      /* XXX this might be an identifier! */
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_FragReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'p') {
-      /* XXX this might be an identifier! */
-      srcReg->File = PROGRAM_LOCAL_PARAM;
-      if (!Parse_ProgramParamReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (IsLetter(token[0])){
-      GLubyte ident[100];
-      GLint paramIndex;
-      if (!Parse_Identifier(parseState, ident))
-         RETURN_ERROR;
-      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,
-                                                -1, (const char *) ident);
-      if (paramIndex < 0) {
-         RETURN_ERROR2("Undefined constant or parameter: ", ident);
-      }
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else if (IsDigit(token[0]) || token[0] == '-' || token[0] == '+' || token[0] == '.'){
-      /* literal scalar constant */
-      GLfloat values[4];
-      GLuint paramIndex;
-      if (!Parse_ScalarConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;
-   }
-   else if (token[0] == '{'){
-      /* literal vector constant */
-      GLfloat values[4];
-      GLuint paramIndex;
-      (void) Parse_String(parseState, "{");
-      if (!Parse_VectorConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else {
-      RETURN_ERROR2("Invalid source register name", token);
-   }
-
-   /* init swizzle fields */
-   srcReg->Swizzle = SWIZZLE_NOOP;
-
-   /* Look for optional swizzle suffix */
-   if (Parse_String(parseState, ".")) {
-      GLuint swz[4];
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (!Parse_SwizzleSuffix(token, swz))
-         RETURN_ERROR1("Invalid swizzle suffix");
-
-      srcReg->Swizzle = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);
-   }
-
-   /* Finish absolute value */
-   if (srcReg->Abs && !Parse_String(parseState, "|")) {
-      RETURN_ERROR1("Expected |");
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ScalarSrcReg(struct parse_state *parseState,
-                   struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-   GLfloat sign = 1.0F;
-   GLboolean needSuffix = GL_TRUE;
-   GLint idx;
-   GLuint negateBase, negateAbs;
-
-   /*
-    * First, take care of +/- and absolute value stuff.
-    */
-   if (Parse_String(parseState, "-"))
-      sign = -1.0F;
-   else if (Parse_String(parseState, "+"))
-      sign = +1.0F;
-
-   if (Parse_String(parseState, "|")) {
-      srcReg->Abs = GL_TRUE;
-      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-
-      if (Parse_String(parseState, "-"))
-         negateBase = NEGATE_XYZW;
-      else if (Parse_String(parseState, "+"))
-         negateBase = NEGATE_NONE;
-      else
-         negateBase = NEGATE_NONE;
-   }
-   else {
-      srcReg->Abs = GL_FALSE;
-      negateAbs = NEGATE_NONE;
-      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
-   }
-
-   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;
-
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   /* Src reg can be R<n>, H<n> or a named fragment attrib */
-   if (token[0] == 'R' || token[0] == 'H') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'f') {
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_FragReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == '{') {
-      /* vector literal */
-      GLfloat values[4];
-      GLuint paramIndex;
-      (void) Parse_String(parseState, "{");
-      if (!Parse_VectorConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else if (IsLetter(token[0])){
-      /* named param/constant */
-      GLubyte ident[100];
-      GLint paramIndex;
-      if (!Parse_Identifier(parseState, ident))
-         RETURN_ERROR;
-      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,
-                                                -1, (const char *) ident);
-      if (paramIndex < 0) {
-         RETURN_ERROR2("Undefined constant or parameter: ", ident);
-      }
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      srcReg->Index = paramIndex;      
-   }
-   else if (IsDigit(token[0])) {
-      /* scalar literal */
-      GLfloat values[4];
-      GLuint paramIndex;
-      if (!Parse_ScalarConstant(parseState, values))
-         RETURN_ERROR;
-      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,
-                                              values, 4, NULL);
-      srcReg->Index = paramIndex;      
-      srcReg->File = PROGRAM_NAMED_PARAM;
-      needSuffix = GL_FALSE;
-   }
-   else {
-      RETURN_ERROR2("Invalid scalar source argument", token);
-   }
-
-   srcReg->Swizzle = 0;
-   if (needSuffix) {
-      /* parse .[xyzw] suffix */
-      if (!Parse_String(parseState, "."))
-         RETURN_ERROR1("Expected .");
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (token[0] == 'x' && token[1] == 0) {
-         srcReg->Swizzle = 0;
-      }
-      else if (token[0] == 'y' && token[1] == 0) {
-         srcReg->Swizzle = 1;
-      }
-      else if (token[0] == 'z' && token[1] == 0) {
-         srcReg->Swizzle = 2;
-      }
-      else if (token[0] == 'w' && token[1] == 0) {
-         srcReg->Swizzle = 3;
-      }
-      else {
-         RETURN_ERROR1("Invalid scalar source suffix");
-      }
-   }
-
-   /* Finish absolute value */
-   if (srcReg->Abs && !Parse_String(parseState, "|")) {
-      RETURN_ERROR1("Expected |");
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_PrintInstruction(struct parse_state *parseState,
-                       struct prog_instruction *inst)
-{
-   const GLubyte *str;
-   GLubyte *msg;
-   GLuint len;
-   GLint idx;
-
-   /* The first argument is a literal string 'just like this' */
-   if (!Parse_String(parseState, "'"))
-      RETURN_ERROR1("Expected '");
-
-   str = parseState->pos;
-   for (len = 0; str[len] != '\''; len++) /* find closing quote */
-      ;
-   parseState->pos += len + 1;
-   msg = (GLubyte*) malloc(len + 1);
-
-   memcpy(msg, str, len);
-   msg[len] = 0;
-   inst->Data = msg;
-
-   if (Parse_String(parseState, ",")) {
-      /* got an optional register to print */
-      GLubyte token[100];
-      GetToken(parseState, token);
-      if (token[0] == 'o') {
-         /* dst reg */
-         if (!Parse_OutputReg(parseState, &idx))
-            RETURN_ERROR;
-	 inst->SrcReg[0].Index = idx;
-         inst->SrcReg[0].File = PROGRAM_OUTPUT;
-      }
-      else {
-         /* src reg */
-         if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-            RETURN_ERROR;
-      }
-   }
-   else {
-      inst->SrcReg[0].File = PROGRAM_UNDEFINED;
-   }
-
-   inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;
-   inst->SrcReg[0].Abs = GL_FALSE;
-   inst->SrcReg[0].Negate = NEGATE_NONE;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_InstructionSequence(struct parse_state *parseState,
-                          struct prog_instruction program[])
-{
-   while (1) {
-      struct prog_instruction *inst = program + parseState->numInst;
-      struct instruction_pattern instMatch;
-      GLubyte token[100];
-
-      /* Initialize the instruction */
-      _mesa_init_instructions(inst, 1);
-
-      /* special instructions */
-      if (Parse_String(parseState, "DEFINE")) {
-         GLubyte id[100];
-         GLfloat value[7];  /* yes, 7 to be safe */
-         if (!Parse_Identifier(parseState, id))
-            RETURN_ERROR;
-         /* XXX make sure id is not a reserved identifer, like R9 */
-         if (!Parse_String(parseState, "="))
-            RETURN_ERROR1("Expected =");
-         if (!Parse_VectorOrScalarConstant(parseState, value))
-            RETURN_ERROR;
-         if (!Parse_String(parseState, ";"))
-            RETURN_ERROR1("Expected ;");
-         if (_mesa_lookup_parameter_index(parseState->parameters,
-                                          -1, (const char *) id) >= 0) {
-            RETURN_ERROR2(id, "already defined");
-         }
-         _mesa_add_named_parameter(parseState->parameters,
-                                   (const char *) id, value);
-      }
-      else if (Parse_String(parseState, "DECLARE")) {
-         GLubyte id[100];
-         GLfloat value[7] = {0, 0, 0, 0, 0, 0, 0};  /* yes, to be safe */
-         if (!Parse_Identifier(parseState, id))
-            RETURN_ERROR;
-         /* XXX make sure id is not a reserved identifer, like R9 */
-         if (Parse_String(parseState, "=")) {
-            if (!Parse_VectorOrScalarConstant(parseState, value))
-               RETURN_ERROR;
-         }
-         if (!Parse_String(parseState, ";"))
-            RETURN_ERROR1("Expected ;");
-         if (_mesa_lookup_parameter_index(parseState->parameters,
-                                          -1, (const char *) id) >= 0) {
-            RETURN_ERROR2(id, "already declared");
-         }
-         _mesa_add_named_parameter(parseState->parameters,
-                                   (const char *) id, value);
-      }
-      else if (Parse_String(parseState, "END")) {
-         inst->Opcode = OPCODE_END;
-         parseState->numInst++;
-         if (Parse_Token(parseState, token)) {
-            RETURN_ERROR1("Code after END opcode.");
-         }
-         break;
-      }
-      else {
-         /* general/arithmetic instruction */
-
-         /* get token */
-         if (!Parse_Token(parseState, token)) {
-            RETURN_ERROR1("Missing END instruction.");
-         }
-
-         /* try to find matching instuction */
-         instMatch = MatchInstruction(token);
-         if (instMatch.opcode >= MAX_OPCODE) {
-            /* bad instruction name */
-            RETURN_ERROR2("Unexpected token: ", token);
-         }
-
-         inst->Opcode = instMatch.opcode;
-         inst->Precision = instMatch.suffixes & (_R | _H | _X);
-         inst->SaturateMode = (instMatch.suffixes & (_S))
-            ? SATURATE_ZERO_ONE : SATURATE_OFF;
-         inst->CondUpdate = (instMatch.suffixes & (_C)) ? GL_TRUE : GL_FALSE;
-
-         /*
-          * parse the input and output operands
-          */
-         if (instMatch.outputs == OUTPUT_S || instMatch.outputs == OUTPUT_V) {
-            if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-         }
-         else if (instMatch.outputs == OUTPUT_NONE) {
-            if (instMatch.opcode == OPCODE_KIL_NV) {
-               /* This is a little weird, the cond code info is in
-                * the dest register.
-                */
-               if (!Parse_CondCodeMask(parseState, &inst->DstReg))
-                  RETURN_ERROR;
-            }
-            else {
-               ASSERT(instMatch.opcode == OPCODE_PRINT);
-            }
-         }
-
-         if (instMatch.inputs == INPUT_1V) {
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_2V) {
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_3V) {
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_1S) {
-            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_2S) {
-            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-         }
-         else if (instMatch.inputs == INPUT_CC) {
-            /* XXX to-do */
-         }
-         else if (instMatch.inputs == INPUT_1V_T) {
-	    GLubyte unit, idx;
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_TextureImageId(parseState, &unit, &idx))
-               RETURN_ERROR;
-	    inst->TexSrcUnit = unit;
-	    inst->TexSrcTarget = idx;
-         }
-         else if (instMatch.inputs == INPUT_3V_T) {
-	    GLubyte unit, idx;
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))
-               RETURN_ERROR;
-            if (!Parse_String(parseState, ","))
-               RETURN_ERROR1("Expected ,");
-            if (!Parse_TextureImageId(parseState, &unit, &idx))
-               RETURN_ERROR;
-	    inst->TexSrcUnit = unit;
-	    inst->TexSrcTarget = idx;
-         }
-         else if (instMatch.inputs == INPUT_1V_S) {
-            if (!Parse_PrintInstruction(parseState, inst))
-               RETURN_ERROR;
-         }
-
-         /* end of statement semicolon */
-         if (!Parse_String(parseState, ";"))
-            RETURN_ERROR1("Expected ;");
-
-         parseState->numInst++;
-
-         if (parseState->numInst >= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS)
-            RETURN_ERROR1("Program too long");
-      }
-   }
-   return GL_TRUE;
-}
-
-
-
-/**
- * Parse/compile the 'str' returning the compiled 'program'.
- * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos
- * indicates the position of the error in 'str'.
- */
-void
-_mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
-                                const GLubyte *str, GLsizei len,
-                                struct gl_fragment_program *program)
-{
-   struct parse_state parseState;
-   struct prog_instruction instBuffer[MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS];
-   struct prog_instruction *newInst;
-   GLenum target;
-   GLubyte *programString;
-
-   /* Make a null-terminated copy of the program string */
-   programString = (GLubyte *) MALLOC(len + 1);
-   if (!programString) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-      return;
-   }
-   memcpy(programString, str, len);
-   programString[len] = 0;
-
-   /* Get ready to parse */
-   memset(&parseState, 0, sizeof(struct parse_state));
-   parseState.ctx = ctx;
-   parseState.start = programString;
-   parseState.program = program;
-   parseState.numInst = 0;
-   parseState.curLine = programString;
-   parseState.parameters = _mesa_new_parameter_list();
-
-   /* Reset error state */
-   _mesa_set_program_error(ctx, -1, NULL);
-
-   /* check the program header */
-   if (strncmp((const char *) programString, "!!FP1.0", 7) == 0) {
-      target = GL_FRAGMENT_PROGRAM_NV;
-      parseState.pos = programString + 7;
-   }
-   else if (strncmp((const char *) programString, "!!FCP1.0", 8) == 0) {
-      /* fragment / register combiner program - not supported */
-      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
-      return;
-   }
-   else {
-      /* invalid header */
-      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
-      return;
-   }
-
-   /* make sure target and header match */
-   if (target != dstTarget) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glLoadProgramNV(target mismatch 0x%x != 0x%x)",
-                  target, dstTarget);
-      return;
-   }
-
-   if (Parse_InstructionSequence(&parseState, instBuffer)) {
-      GLuint u;
-      /* successful parse! */
-
-      if (parseState.outputsWritten == 0) {
-         /* must write at least one output! */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "Invalid fragment program - no outputs written.");
-         return;
-      }
-
-      /* copy the compiled instructions */
-      assert(parseState.numInst <= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS);
-      newInst = _mesa_alloc_instructions(parseState.numInst);
-      if (!newInst) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-         return;  /* out of memory */
-      }
-      _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);
-
-      /* install the program */
-      program->Base.Target = target;
-      if (program->Base.String) {
-         FREE(program->Base.String);
-      }
-      program->Base.String = programString;
-      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-      if (program->Base.Instructions) {
-         free(program->Base.Instructions);
-      }
-      program->Base.Instructions = newInst;
-      program->Base.NumInstructions = parseState.numInst;
-      program->Base.InputsRead = parseState.inputsRead;
-      program->Base.OutputsWritten = parseState.outputsWritten;
-      for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++)
-         program->Base.TexturesUsed[u] = parseState.texturesUsed[u];
-
-      /* save program parameters */
-      program->Base.Parameters = parseState.parameters;
-
-      /* allocate registers for declared program parameters */
-#if 00
-      _mesa_assign_program_registers(&(program->SymbolTable));
-#endif
-
-#ifdef DEBUG_foo
-      printf("--- glLoadProgramNV(%d) result ---\n", program->Base.Id);
-      _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);
-      printf("----------------------------------\n");
-#endif
-   }
-   else {
-      /* Error! */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
-      /* NOTE: _mesa_set_program_error would have been called already */
-   }
-}
-
-
-const char *
-_mesa_nv_fragment_input_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_FRAGMENT_PROGRAM_INPUTS);
-   return InputRegisters[i];
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 nvfragparse.c

+ * NVIDIA fragment program parser.

+ * \author Brian Paul

+ */

+

+/*

+ * Regarding GL_NV_fragment_program:

+ *

+ * Portions of this software may use or implement intellectual

+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims

+ * any and all warranties with respect to such intellectual property,

+ * including any use thereof or modifications thereto.

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "program.h"

+#include "prog_parameter.h"

+#include "prog_print.h"

+#include "prog_instruction.h"

+#include "nvfragparse.h"

+

+

+#define INPUT_1V     1

+#define INPUT_2V     2

+#define INPUT_3V     3

+#define INPUT_1S     4

+#define INPUT_2S     5

+#define INPUT_CC     6

+#define INPUT_1V_T   7  /* one source vector, plus textureId */

+#define INPUT_3V_T   8  /* one source vector, plus textureId */

+#define INPUT_NONE   9

+#define INPUT_1V_S  10  /* a string and a vector register */

+#define OUTPUT_V    20

+#define OUTPUT_S    21

+#define OUTPUT_NONE 22

+

+/* IRIX defines some of these */

+#undef _R

+#undef _H

+#undef _X

+#undef _C

+#undef _S

+

+/* Optional suffixes */

+#define _R  FLOAT32  /* float */

+#define _H  FLOAT16  /* half-float */

+#define _X  FIXED12  /* fixed */

+#define _C  0x08     /* set cond codes */

+#define _S  0x10     /* saturate, clamp result to [0,1] */

+

+struct instruction_pattern {

+   const char *name;

+   enum prog_opcode opcode;

+   GLuint inputs;

+   GLuint outputs;

+   GLuint suffixes;

+};

+

+static const struct instruction_pattern Instructions[] = {

+   { "ADD", OPCODE_ADD, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "COS", OPCODE_COS, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },

+   { "DDX", OPCODE_DDX, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },

+   { "DDY", OPCODE_DDY, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },

+   { "DP3", OPCODE_DP3, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },

+   { "DP4", OPCODE_DP4, INPUT_2V, OUTPUT_S, _R | _H | _X | _C | _S },

+   { "DST", OPCODE_DP4, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },

+   { "EX2", OPCODE_DP4, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },

+   { "FLR", OPCODE_FLR, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "FRC", OPCODE_FRC, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "KIL", OPCODE_KIL_NV, INPUT_CC, OUTPUT_NONE, 0                },

+   { "LG2", OPCODE_LG2, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },

+   { "LIT", OPCODE_LIT, INPUT_1V, OUTPUT_V, _R | _H |      _C | _S },

+   { "LRP", OPCODE_LRP, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "MAD", OPCODE_MAD, INPUT_3V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "MAX", OPCODE_MAX, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "MIN", OPCODE_MIN, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "MOV", OPCODE_MOV, INPUT_1V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "MUL", OPCODE_MUL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "PK2H",  OPCODE_PK2H,  INPUT_1V, OUTPUT_S, 0                  },

+   { "PK2US", OPCODE_PK2US, INPUT_1V, OUTPUT_S, 0                  },

+   { "PK4B",  OPCODE_PK4B,  INPUT_1V, OUTPUT_S, 0                  },

+   { "PK4UB", OPCODE_PK4UB, INPUT_1V, OUTPUT_S, 0                  },

+   { "POW", OPCODE_POW, INPUT_2S, OUTPUT_S, _R | _H |      _C | _S },

+   { "RCP", OPCODE_RCP, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },

+   { "RFL", OPCODE_RFL, INPUT_2V, OUTPUT_V, _R | _H |      _C | _S },

+   { "RSQ", OPCODE_RSQ, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },

+   { "SEQ", OPCODE_SEQ, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SFL", OPCODE_SFL, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SGE", OPCODE_SGE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SGT", OPCODE_SGT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SIN", OPCODE_SIN, INPUT_1S, OUTPUT_S, _R | _H |      _C | _S },

+   { "SLE", OPCODE_SLE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SLT", OPCODE_SLT, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SNE", OPCODE_SNE, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "STR", OPCODE_STR, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "SUB", OPCODE_SUB, INPUT_2V, OUTPUT_V, _R | _H | _X | _C | _S },

+   { "TEX", OPCODE_TEX, INPUT_1V_T, OUTPUT_V,              _C | _S },

+   { "TXD", OPCODE_TXD, INPUT_3V_T, OUTPUT_V,              _C | _S },

+   { "TXP", OPCODE_TXP_NV, INPUT_1V_T, OUTPUT_V,           _C | _S },

+   { "UP2H",  OPCODE_UP2H,  INPUT_1S, OUTPUT_V,            _C | _S },

+   { "UP2US", OPCODE_UP2US, INPUT_1S, OUTPUT_V,            _C | _S },

+   { "UP4B",  OPCODE_UP4B,  INPUT_1S, OUTPUT_V,            _C | _S },

+   { "UP4UB", OPCODE_UP4UB, INPUT_1S, OUTPUT_V,            _C | _S },

+   { "X2D", OPCODE_X2D, INPUT_3V, OUTPUT_V, _R | _H |      _C | _S },

+   { "PRINT", OPCODE_PRINT, INPUT_1V_S, OUTPUT_NONE, 0               },

+   { NULL, (enum prog_opcode) -1, 0, 0, 0 }

+};

+

+

+/*

+ * Information needed or computed during parsing.

+ * Remember, we can't modify the target program object until we've

+ * _successfully_ parsed the program text.

+ */

+struct parse_state {

+   struct gl_context *ctx;

+   const GLubyte *start;              /* start of program string */

+   const GLubyte *pos;                /* current position */

+   const GLubyte *curLine;

+   struct gl_fragment_program *program;  /* current program */

+

+   struct gl_program_parameter_list *parameters;

+

+   GLuint numInst;                    /* number of instructions parsed */

+   GLuint inputsRead;                 /* bitmask of input registers used */

+   GLuint outputsWritten;             /* bitmask of 1 << FRAG_OUTPUT_* bits */

+   GLuint texturesUsed[MAX_TEXTURE_IMAGE_UNITS];

+};

+

+

+

+/*

+ * Called whenever we find an error during parsing.

+ */

+static void

+record_error(struct parse_state *parseState, const char *msg, int lineNo)

+{

+#ifdef DEBUG

+   GLint line, column;

+   const GLubyte *lineStr;

+   lineStr = _mesa_find_line_column(parseState->start,

+                                    parseState->pos, &line, &column);

+   _mesa_debug(parseState->ctx,

+               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",

+               lineNo, line, column, (char *) lineStr, msg);

+   free((void *) lineStr);

+#else

+   (void) lineNo;

+#endif

+

+   /* Check that no error was already recorded.  Only record the first one. */

+   if (parseState->ctx->Program.ErrorString[0] == 0) {

+      _mesa_set_program_error(parseState->ctx,

+                              parseState->pos - parseState->start,

+                              msg);

+   }

+}

+

+

+#define RETURN_ERROR							\

+do {									\

+   record_error(parseState, "Unexpected end of input.", __LINE__);	\

+   return GL_FALSE;							\

+} while(0)

+

+#define RETURN_ERROR1(msg)						\

+do {									\

+   record_error(parseState, msg, __LINE__);				\

+   return GL_FALSE;							\

+} while(0)

+

+#define RETURN_ERROR2(msg1, msg2)					\

+do {									\

+   char err[1000];							\

+   sprintf(err, "%s %s", msg1, msg2);				\

+   record_error(parseState, err, __LINE__);				\

+   return GL_FALSE;							\

+} while(0)

+

+

+

+

+/*

+ * Search a list of instruction structures for a match.

+ */

+static struct instruction_pattern

+MatchInstruction(const GLubyte *token)

+{

+   const struct instruction_pattern *inst;

+   struct instruction_pattern result;

+

+   result.name = NULL;

+   result.opcode = MAX_OPCODE; /* i.e. invalid instruction */

+   result.inputs = 0;

+   result.outputs = 0;

+   result.suffixes = 0;

+

+   for (inst = Instructions; inst->name; inst++) {

+      if (strncmp((const char *) token, inst->name, 3) == 0) {

+         /* matched! */

+         int i = 3;

+         result = *inst;

+         result.suffixes = 0;

+         /* look at suffix */

+         if (token[i] == 'R') {

+            result.suffixes |= _R;

+            i++;

+         }

+         else if (token[i] == 'H') {

+            result.suffixes |= _H;

+            i++;

+         }

+         else if (token[i] == 'X') {

+            result.suffixes |= _X;

+            i++;

+         }

+         if (token[i] == 'C') {

+            result.suffixes |= _C;

+            i++;

+         }

+         if (token[i] == '_' && token[i+1] == 'S' &&

+             token[i+2] == 'A' && token[i+3] == 'T') {

+            result.suffixes |= _S;

+         }

+         return result;

+      }

+   }

+

+   return result;

+}

+

+

+

+

+/**********************************************************************/

+

+

+static GLboolean IsLetter(GLubyte b)

+{

+   return (b >= 'a' && b <= 'z') ||

+          (b >= 'A' && b <= 'Z') ||

+          (b == '_') ||

+          (b == '$');

+}

+

+

+static GLboolean IsDigit(GLubyte b)

+{

+   return b >= '0' && b <= '9';

+}

+

+

+static GLboolean IsWhitespace(GLubyte b)

+{

+   return b == ' ' || b == '\t' || b == '\n' || b == '\r';

+}

+

+

+/**

+ * Starting at 'str' find the next token.  A token can be an integer,

+ * an identifier or punctuation symbol.

+ * \return <= 0 we found an error, else, return number of characters parsed.

+ */

+static GLint

+GetToken(struct parse_state *parseState, GLubyte *token)

+{

+   const GLubyte *str = parseState->pos;

+   GLint i = 0, j = 0;

+

+   token[0] = 0;

+

+   /* skip whitespace and comments */

+   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {

+      if (str[i] == '#') {

+         /* skip comment */

+         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {

+            i++;

+         }

+         if (str[i] == '\n' || str[i] == '\r')

+            parseState->curLine = str + i + 1;

+      }

+      else {

+         /* skip whitespace */

+         if (str[i] == '\n' || str[i] == '\r')

+            parseState->curLine = str + i + 1;

+         i++;

+      }

+   }

+

+   if (str[i] == 0)

+      return -i;

+

+   /* try matching an integer */

+   while (str[i] && IsDigit(str[i])) {

+      token[j++] = str[i++];

+   }

+   if (j > 0 || !str[i]) {

+      token[j] = 0;

+      return i;

+   }

+

+   /* try matching an identifier */

+   if (IsLetter(str[i])) {

+      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {

+         token[j++] = str[i++];

+      }

+      token[j] = 0;

+      return i;

+   }

+

+   /* punctuation character */

+   if (str[i]) {

+      token[0] = str[i++];

+      token[1] = 0;

+      return i;

+   }

+

+   /* end of input */

+   token[0] = 0;

+   return i;

+}

+

+

+/**

+ * Get next token from input stream and increment stream pointer past token.

+ */

+static GLboolean

+Parse_Token(struct parse_state *parseState, GLubyte *token)

+{

+   GLint i;

+   i = GetToken(parseState, token);

+   if (i <= 0) {

+      parseState->pos += (-i);

+      return GL_FALSE;

+   }

+   parseState->pos += i;

+   return GL_TRUE;

+}

+

+

+/**

+ * Get next token from input stream but don't increment stream pointer.

+ */

+static GLboolean

+Peek_Token(struct parse_state *parseState, GLubyte *token)

+{

+   GLint i, len;

+   i = GetToken(parseState, token);

+   if (i <= 0) {

+      parseState->pos += (-i);

+      return GL_FALSE;

+   }

+   len = (GLint) strlen((const char *) token);

+   parseState->pos += (i - len);

+   return GL_TRUE;

+}

+

+

+/**********************************************************************/

+

+static const char *InputRegisters[MAX_NV_FRAGMENT_PROGRAM_INPUTS + 1] = {

+   "WPOS", "COL0", "COL1", "FOGC",

+   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL

+};

+

+

+

+/**********************************************************************/

+

+/**

+ * Try to match 'pattern' as the next token after any whitespace/comments.

+ */

+static GLboolean

+Parse_String(struct parse_state *parseState, const char *pattern)

+{

+   const GLubyte *m;

+   GLint i;

+

+   /* skip whitespace and comments */

+   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {

+      if (*parseState->pos == '#') {

+         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {

+            parseState->pos += 1;

+         }

+         if (*parseState->pos == '\n' || *parseState->pos == '\r')

+            parseState->curLine = parseState->pos + 1;

+      }

+      else {

+         /* skip whitespace */

+         if (*parseState->pos == '\n' || *parseState->pos == '\r')

+            parseState->curLine = parseState->pos + 1;

+         parseState->pos += 1;

+      }

+   }

+

+   /* Try to match the pattern */

+   m = parseState->pos;

+   for (i = 0; pattern[i]; i++) {

+      if (*m != (GLubyte) pattern[i])

+         return GL_FALSE;

+      m += 1;

+   }

+   parseState->pos = m;

+

+   return GL_TRUE; /* success */

+}

+

+

+static GLboolean

+Parse_Identifier(struct parse_state *parseState, GLubyte *ident)

+{

+   if (!Parse_Token(parseState, ident))

+      RETURN_ERROR;

+   if (IsLetter(ident[0]))

+      return GL_TRUE;

+   else

+      RETURN_ERROR1("Expected an identfier");

+}

+

+

+/**

+ * Parse a floating point constant, or a defined symbol name.

+ * [+/-]N[.N[eN]]

+ * Output:  number[0 .. 3] will get the value.

+ */

+static GLboolean

+Parse_ScalarConstant(struct parse_state *parseState, GLfloat *number)

+{

+   char *end = NULL;

+

+   *number = (GLfloat) _mesa_strtof((const char *) parseState->pos, &end);

+

+   if (end && end > (char *) parseState->pos) {

+      /* got a number */

+      parseState->pos = (GLubyte *) end;

+      number[1] = *number;

+      number[2] = *number;

+      number[3] = *number;

+      return GL_TRUE;

+   }

+   else {

+      /* should be an identifier */

+      GLubyte ident[100];

+      const GLfloat *constant;

+      if (!Parse_Identifier(parseState, ident))

+         RETURN_ERROR1("Expected an identifier");

+      constant = _mesa_lookup_parameter_value(parseState->parameters,

+                                              -1, (const char *) ident);

+      /* XXX Check that it's a constant and not a parameter */

+      if (!constant) {

+         RETURN_ERROR1("Undefined symbol");

+      }

+      else {

+         COPY_4V(number, constant);

+         return GL_TRUE;

+      }

+   }

+}

+

+

+

+/**

+ * Parse a vector constant, one of:

+ *   { float }

+ *   { float, float }

+ *   { float, float, float }

+ *   { float, float, float, float }

+ */

+static GLboolean

+Parse_VectorConstant(struct parse_state *parseState, GLfloat *vec)

+{

+   /* "{" was already consumed */

+

+   ASSIGN_4V(vec, 0.0, 0.0, 0.0, 1.0);

+

+   if (!Parse_ScalarConstant(parseState, vec+0))  /* X */

+      return GL_FALSE;

+

+   if (Parse_String(parseState, "}")) {

+      return GL_TRUE;

+   }

+

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR1("Expected comma in vector constant");

+

+   if (!Parse_ScalarConstant(parseState, vec+1))  /* Y */

+      return GL_FALSE;

+

+   if (Parse_String(parseState, "}")) {

+      return GL_TRUE;

+   }

+

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR1("Expected comma in vector constant");

+

+   if (!Parse_ScalarConstant(parseState, vec+2))  /* Z */

+      return GL_FALSE;

+

+   if (Parse_String(parseState, "}")) {

+      return GL_TRUE;

+   }

+

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR1("Expected comma in vector constant");

+

+   if (!Parse_ScalarConstant(parseState, vec+3))  /* W */

+      return GL_FALSE;

+

+   if (!Parse_String(parseState, "}"))

+      RETURN_ERROR1("Expected closing brace in vector constant");

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse <number>, <varname> or {a, b, c, d}.

+ * Return number of values in the vector or scalar, or zero if parse error.

+ */

+static GLuint

+Parse_VectorOrScalarConstant(struct parse_state *parseState, GLfloat *vec)

+{

+   if (Parse_String(parseState, "{")) {

+      return Parse_VectorConstant(parseState, vec);

+   }

+   else {

+      GLboolean b = Parse_ScalarConstant(parseState, vec);

+      if (b) {

+         vec[1] = vec[2] = vec[3] = vec[0];

+      }

+      return b;

+   }

+}

+

+

+/**

+ * Parse a texture image source:

+ *    [TEX0 | TEX1 | .. | TEX15] , [1D | 2D | 3D | CUBE | RECT]

+ */

+static GLboolean

+Parse_TextureImageId(struct parse_state *parseState,

+                     GLubyte *texUnit, GLubyte *texTargetBit)

+{

+   GLubyte imageSrc[100];

+   GLint unit;

+

+   if (!Parse_Token(parseState, imageSrc))

+      RETURN_ERROR;

+   

+   if (imageSrc[0] != 'T' ||

+       imageSrc[1] != 'E' ||

+       imageSrc[2] != 'X') {

+      RETURN_ERROR1("Expected TEX# source");

+   }

+   unit = atoi((const char *) imageSrc + 3);

+   if ((unit < 0 || unit > MAX_TEXTURE_IMAGE_UNITS) ||

+       (unit == 0 && (imageSrc[3] != '0' || imageSrc[4] != 0))) {

+      RETURN_ERROR1("Invalied TEX# source index");

+   }

+   *texUnit = unit;

+

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR1("Expected ,");

+

+   if (Parse_String(parseState, "1D")) {

+      *texTargetBit = TEXTURE_1D_BIT;

+   }

+   else if (Parse_String(parseState, "2D")) {

+      *texTargetBit = TEXTURE_2D_BIT;

+   }

+   else if (Parse_String(parseState, "3D")) {

+      *texTargetBit = TEXTURE_3D_BIT;

+   }

+   else if (Parse_String(parseState, "CUBE")) {

+      *texTargetBit = TEXTURE_CUBE_BIT;

+   }

+   else if (Parse_String(parseState, "RECT")) {

+      *texTargetBit = TEXTURE_RECT_BIT;

+   }

+   else {

+      RETURN_ERROR1("Invalid texture target token");

+   }

+

+   /* update record of referenced texture units */

+   parseState->texturesUsed[*texUnit] |= *texTargetBit;

+   if (_mesa_bitcount(parseState->texturesUsed[*texUnit]) > 1) {

+      RETURN_ERROR1("Only one texture target can be used per texture unit.");

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse a scalar suffix like .x, .y, .z or .w or parse a swizzle suffix

+ * like .wxyz, .xxyy, etc and return the swizzle indexes.

+ */

+static GLboolean

+Parse_SwizzleSuffix(const GLubyte *token, GLuint swizzle[4])

+{

+   if (token[1] == 0) {

+      /* single letter swizzle (scalar) */

+      if (token[0] == 'x')

+         ASSIGN_4V(swizzle, 0, 0, 0, 0);

+      else if (token[0] == 'y')

+         ASSIGN_4V(swizzle, 1, 1, 1, 1);

+      else if (token[0] == 'z')

+         ASSIGN_4V(swizzle, 2, 2, 2, 2);

+      else if (token[0] == 'w')

+         ASSIGN_4V(swizzle, 3, 3, 3, 3);

+      else

+         return GL_FALSE;

+   }

+   else {

+      /* 4-component swizzle (vector) */

+      GLint k;

+      for (k = 0; k < 4 && token[k]; k++) {

+         if (token[k] == 'x')

+            swizzle[k] = 0;

+         else if (token[k] == 'y')

+            swizzle[k] = 1;

+         else if (token[k] == 'z')

+            swizzle[k] = 2;

+         else if (token[k] == 'w')

+            swizzle[k] = 3;

+         else

+            return GL_FALSE;

+      }

+      if (k != 4)

+         return GL_FALSE;

+   }

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_CondCodeMask(struct parse_state *parseState,

+                   struct prog_dst_register *dstReg)

+{

+   if (Parse_String(parseState, "EQ"))

+      dstReg->CondMask = COND_EQ;

+   else if (Parse_String(parseState, "GE"))

+      dstReg->CondMask = COND_GE;

+   else if (Parse_String(parseState, "GT"))

+      dstReg->CondMask = COND_GT;

+   else if (Parse_String(parseState, "LE"))

+      dstReg->CondMask = COND_LE;

+   else if (Parse_String(parseState, "LT"))

+      dstReg->CondMask = COND_LT;

+   else if (Parse_String(parseState, "NE"))

+      dstReg->CondMask = COND_NE;

+   else if (Parse_String(parseState, "TR"))

+      dstReg->CondMask = COND_TR;

+   else if (Parse_String(parseState, "FL"))

+      dstReg->CondMask = COND_FL;

+   else

+      RETURN_ERROR1("Invalid condition code mask");

+

+   /* look for optional .xyzw swizzle */

+   if (Parse_String(parseState, ".")) {

+      GLubyte token[100];

+      GLuint swz[4];

+

+      if (!Parse_Token(parseState, token))  /* get xyzw suffix */

+         RETURN_ERROR;

+

+      if (!Parse_SwizzleSuffix(token, swz))

+         RETURN_ERROR1("Invalid swizzle suffix");

+

+      dstReg->CondSwizzle = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse a temporary register: Rnn or Hnn

+ */

+static GLboolean

+Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)

+{

+   GLubyte token[100];

+

+   /* Should be 'R##' or 'H##' */

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+   if (token[0] != 'R' && token[0] != 'H')

+      RETURN_ERROR1("Expected R## or H##");

+

+   if (IsDigit(token[1])) {

+      GLint reg = atoi((const char *) (token + 1));

+      if (token[0] == 'H')

+         reg += 32;

+      if (reg >= MAX_NV_FRAGMENT_PROGRAM_TEMPS)

+         RETURN_ERROR1("Invalid temporary register name");

+      *tempRegNum = reg;

+   }

+   else {

+      RETURN_ERROR1("Invalid temporary register name");

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse a write-only dummy register: RC or HC.

+ */

+static GLboolean

+Parse_DummyReg(struct parse_state *parseState, GLint *regNum)

+{

+   if (Parse_String(parseState, "RC")) {

+       *regNum = 0;

+   }

+   else if (Parse_String(parseState, "HC")) {

+       *regNum = 1;

+   }

+   else {

+      RETURN_ERROR1("Invalid write-only register name");

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse a program local parameter register "p[##]"

+ */

+static GLboolean

+Parse_ProgramParamReg(struct parse_state *parseState, GLint *regNum)

+{

+   GLubyte token[100];

+

+   if (!Parse_String(parseState, "p["))

+      RETURN_ERROR1("Expected p[");

+

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (IsDigit(token[0])) {

+      /* a numbered program parameter register */

+      GLint reg = atoi((const char *) token);

+      if (reg >= MAX_NV_FRAGMENT_PROGRAM_PARAMS)

+         RETURN_ERROR1("Invalid constant program number");

+      *regNum = reg;

+   }

+   else {

+      RETURN_ERROR;

+   }

+

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR1("Expected ]");

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse f[name]  - fragment input register

+ */

+static GLboolean

+Parse_FragReg(struct parse_state *parseState, GLint *tempRegNum)

+{

+   GLubyte token[100];

+   GLint j;

+

+   /* Match 'f[' */

+   if (!Parse_String(parseState, "f["))

+      RETURN_ERROR1("Expected f[");

+

+   /* get <name> and look for match */

+   if (!Parse_Token(parseState, token)) {

+      RETURN_ERROR;

+   }

+   for (j = 0; InputRegisters[j]; j++) {

+      if (strcmp((const char *) token, InputRegisters[j]) == 0) {

+         *tempRegNum = j;

+         parseState->inputsRead |= (1 << j);

+         break;

+      }

+   }

+   if (!InputRegisters[j]) {

+      /* unknown input register label */

+      RETURN_ERROR2("Invalid register name", token);

+   }

+

+   /* Match '[' */

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR1("Expected ]");

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)

+{

+   GLubyte token[100];

+

+   /* Match "o[" */

+   if (!Parse_String(parseState, "o["))

+      RETURN_ERROR1("Expected o[");

+

+   /* Get output reg name */

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+

+   /* try to match an output register name */

+   if (strcmp((char *) token, "COLR") == 0 ||

+       strcmp((char *) token, "COLH") == 0) {

+      /* note that we don't distinguish between COLR and COLH */

+      *outputRegNum = FRAG_RESULT_COLOR;

+      parseState->outputsWritten |= (1 << FRAG_RESULT_COLOR);

+   }

+   else if (strcmp((char *) token, "DEPR") == 0) {

+      *outputRegNum = FRAG_RESULT_DEPTH;

+      parseState->outputsWritten |= (1 << FRAG_RESULT_DEPTH);

+   }

+   else {

+      RETURN_ERROR1("Invalid output register name");

+   }

+

+   /* Match ']' */

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR1("Expected ]");

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_MaskedDstReg(struct parse_state *parseState,

+                   struct prog_dst_register *dstReg)

+{

+   GLubyte token[100];

+   GLint idx;

+

+   /* Dst reg can be R<n>, H<n>, o[n], RC or HC */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (strcmp((const char *) token, "RC") == 0 ||

+       strcmp((const char *) token, "HC") == 0) {

+      /* a write-only register */

+      dstReg->File = PROGRAM_WRITE_ONLY;

+      if (!Parse_DummyReg(parseState, &idx))

+         RETURN_ERROR;

+      dstReg->Index = idx;

+   }

+   else if (token[0] == 'R' || token[0] == 'H') {

+      /* a temporary register */

+      dstReg->File = PROGRAM_TEMPORARY;

+      if (!Parse_TempReg(parseState, &idx))

+         RETURN_ERROR;

+      dstReg->Index = idx;

+   }

+   else if (token[0] == 'o') {

+      /* an output register */

+      dstReg->File = PROGRAM_OUTPUT;

+      if (!Parse_OutputReg(parseState, &idx))

+         RETURN_ERROR;

+      dstReg->Index = idx;

+   }

+   else {

+      RETURN_ERROR1("Invalid destination register name");

+   }

+

+   /* Parse optional write mask */

+   if (Parse_String(parseState, ".")) {

+      /* got a mask */

+      GLint k = 0;

+

+      if (!Parse_Token(parseState, token))  /* get xyzw writemask */

+         RETURN_ERROR;

+

+      dstReg->WriteMask = 0;

+

+      if (token[k] == 'x') {

+         dstReg->WriteMask |= WRITEMASK_X;

+         k++;

+      }

+      if (token[k] == 'y') {

+         dstReg->WriteMask |= WRITEMASK_Y;

+         k++;

+      }

+      if (token[k] == 'z') {

+         dstReg->WriteMask |= WRITEMASK_Z;

+         k++;

+      }

+      if (token[k] == 'w') {

+         dstReg->WriteMask |= WRITEMASK_W;

+         k++;

+      }

+      if (k == 0) {

+         RETURN_ERROR1("Invalid writemask character");

+      }

+

+   }

+   else {

+      dstReg->WriteMask = WRITEMASK_XYZW;

+   }

+

+   /* optional condition code mask */

+   if (Parse_String(parseState, "(")) {

+      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".x|y|z|w) */

+      /* ("EQ" | "GE" | "GT" | "LE" | "LT" | "NE" | "TR" | "FL".[xyzw]) */

+      if (!Parse_CondCodeMask(parseState, dstReg))

+         RETURN_ERROR;

+

+      if (!Parse_String(parseState, ")"))  /* consume ")" */

+         RETURN_ERROR1("Expected )");

+

+      return GL_TRUE;

+   }

+   else {

+      /* no cond code mask */

+      dstReg->CondMask = COND_TR;

+      dstReg->CondSwizzle = SWIZZLE_NOOP;

+      return GL_TRUE;

+   }

+}

+

+

+/**

+ * Parse a vector source (register, constant, etc):

+ *   <vectorSrc>    ::= <absVectorSrc>

+ *                    | <baseVectorSrc>

+ *   <absVectorSrc> ::= <negate> "|" <baseVectorSrc> "|"

+ */

+static GLboolean

+Parse_VectorSrc(struct parse_state *parseState,

+                struct prog_src_register *srcReg)

+{

+   GLfloat sign = 1.0F;

+   GLubyte token[100];

+   GLint idx;

+   GLuint negateBase, negateAbs;

+

+   /*

+    * First, take care of +/- and absolute value stuff.

+    */

+   if (Parse_String(parseState, "-"))

+      sign = -1.0F;

+   else if (Parse_String(parseState, "+"))

+      sign = +1.0F;

+

+   if (Parse_String(parseState, "|")) {

+      srcReg->Abs = GL_TRUE;

+      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;

+

+      if (Parse_String(parseState, "-"))

+         negateBase = NEGATE_XYZW;

+      else if (Parse_String(parseState, "+"))

+         negateBase = NEGATE_NONE;

+      else

+         negateBase = NEGATE_NONE;

+   }

+   else {

+      srcReg->Abs = GL_FALSE;

+      negateAbs = NEGATE_NONE;

+      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;

+   }

+

+   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;

+

+   /* This should be the real src vector/register name */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+

+   /* Src reg can be Rn, Hn, f[n], p[n], a named parameter, a scalar

+    * literal or vector literal.

+    */

+   if (token[0] == 'R' || token[0] == 'H') {

+      srcReg->File = PROGRAM_TEMPORARY;

+      if (!Parse_TempReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (token[0] == 'f') {

+      /* XXX this might be an identifier! */

+      srcReg->File = PROGRAM_INPUT;

+      if (!Parse_FragReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (token[0] == 'p') {

+      /* XXX this might be an identifier! */

+      srcReg->File = PROGRAM_LOCAL_PARAM;

+      if (!Parse_ProgramParamReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (IsLetter(token[0])){

+      GLubyte ident[100];

+      GLint paramIndex;

+      if (!Parse_Identifier(parseState, ident))

+         RETURN_ERROR;

+      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,

+                                                -1, (const char *) ident);

+      if (paramIndex < 0) {

+         RETURN_ERROR2("Undefined constant or parameter: ", ident);

+      }

+      srcReg->File = PROGRAM_NAMED_PARAM;

+      srcReg->Index = paramIndex;      

+   }

+   else if (IsDigit(token[0]) || token[0] == '-' || token[0] == '+' || token[0] == '.'){

+      /* literal scalar constant */

+      GLfloat values[4];

+      GLuint paramIndex;

+      if (!Parse_ScalarConstant(parseState, values))

+         RETURN_ERROR;

+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,

+                                              values, 4, NULL);

+      srcReg->File = PROGRAM_NAMED_PARAM;

+      srcReg->Index = paramIndex;

+   }

+   else if (token[0] == '{'){

+      /* literal vector constant */

+      GLfloat values[4];

+      GLuint paramIndex;

+      (void) Parse_String(parseState, "{");

+      if (!Parse_VectorConstant(parseState, values))

+         RETURN_ERROR;

+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,

+                                              values, 4, NULL);

+      srcReg->File = PROGRAM_NAMED_PARAM;

+      srcReg->Index = paramIndex;      

+   }

+   else {

+      RETURN_ERROR2("Invalid source register name", token);

+   }

+

+   /* init swizzle fields */

+   srcReg->Swizzle = SWIZZLE_NOOP;

+

+   /* Look for optional swizzle suffix */

+   if (Parse_String(parseState, ".")) {

+      GLuint swz[4];

+

+      if (!Parse_Token(parseState, token))

+         RETURN_ERROR;

+

+      if (!Parse_SwizzleSuffix(token, swz))

+         RETURN_ERROR1("Invalid swizzle suffix");

+

+      srcReg->Swizzle = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);

+   }

+

+   /* Finish absolute value */

+   if (srcReg->Abs && !Parse_String(parseState, "|")) {

+      RETURN_ERROR1("Expected |");

+   }

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_ScalarSrcReg(struct parse_state *parseState,

+                   struct prog_src_register *srcReg)

+{

+   GLubyte token[100];

+   GLfloat sign = 1.0F;

+   GLboolean needSuffix = GL_TRUE;

+   GLint idx;

+   GLuint negateBase, negateAbs;

+

+   /*

+    * First, take care of +/- and absolute value stuff.

+    */

+   if (Parse_String(parseState, "-"))

+      sign = -1.0F;

+   else if (Parse_String(parseState, "+"))

+      sign = +1.0F;

+

+   if (Parse_String(parseState, "|")) {

+      srcReg->Abs = GL_TRUE;

+      negateAbs = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;

+

+      if (Parse_String(parseState, "-"))

+         negateBase = NEGATE_XYZW;

+      else if (Parse_String(parseState, "+"))

+         negateBase = NEGATE_NONE;

+      else

+         negateBase = NEGATE_NONE;

+   }

+   else {

+      srcReg->Abs = GL_FALSE;

+      negateAbs = NEGATE_NONE;

+      negateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;

+   }

+

+   srcReg->Negate = srcReg->Abs ? negateAbs : negateBase;

+

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+

+   /* Src reg can be R<n>, H<n> or a named fragment attrib */

+   if (token[0] == 'R' || token[0] == 'H') {

+      srcReg->File = PROGRAM_TEMPORARY;

+      if (!Parse_TempReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (token[0] == 'f') {

+      srcReg->File = PROGRAM_INPUT;

+      if (!Parse_FragReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (token[0] == '{') {

+      /* vector literal */

+      GLfloat values[4];

+      GLuint paramIndex;

+      (void) Parse_String(parseState, "{");

+      if (!Parse_VectorConstant(parseState, values))

+         RETURN_ERROR;

+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,

+                                              values, 4, NULL);

+      srcReg->File = PROGRAM_NAMED_PARAM;

+      srcReg->Index = paramIndex;      

+   }

+   else if (IsLetter(token[0])){

+      /* named param/constant */

+      GLubyte ident[100];

+      GLint paramIndex;

+      if (!Parse_Identifier(parseState, ident))

+         RETURN_ERROR;

+      paramIndex = _mesa_lookup_parameter_index(parseState->parameters,

+                                                -1, (const char *) ident);

+      if (paramIndex < 0) {

+         RETURN_ERROR2("Undefined constant or parameter: ", ident);

+      }

+      srcReg->File = PROGRAM_NAMED_PARAM;

+      srcReg->Index = paramIndex;      

+   }

+   else if (IsDigit(token[0])) {

+      /* scalar literal */

+      GLfloat values[4];

+      GLuint paramIndex;

+      if (!Parse_ScalarConstant(parseState, values))

+         RETURN_ERROR;

+      paramIndex = _mesa_add_unnamed_constant(parseState->parameters,

+                                              values, 4, NULL);

+      srcReg->Index = paramIndex;      

+      srcReg->File = PROGRAM_NAMED_PARAM;

+      needSuffix = GL_FALSE;

+   }

+   else {

+      RETURN_ERROR2("Invalid scalar source argument", token);

+   }

+

+   srcReg->Swizzle = 0;

+   if (needSuffix) {

+      /* parse .[xyzw] suffix */

+      if (!Parse_String(parseState, "."))

+         RETURN_ERROR1("Expected .");

+

+      if (!Parse_Token(parseState, token))

+         RETURN_ERROR;

+

+      if (token[0] == 'x' && token[1] == 0) {

+         srcReg->Swizzle = 0;

+      }

+      else if (token[0] == 'y' && token[1] == 0) {

+         srcReg->Swizzle = 1;

+      }

+      else if (token[0] == 'z' && token[1] == 0) {

+         srcReg->Swizzle = 2;

+      }

+      else if (token[0] == 'w' && token[1] == 0) {

+         srcReg->Swizzle = 3;

+      }

+      else {

+         RETURN_ERROR1("Invalid scalar source suffix");

+      }

+   }

+

+   /* Finish absolute value */

+   if (srcReg->Abs && !Parse_String(parseState, "|")) {

+      RETURN_ERROR1("Expected |");

+   }

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_PrintInstruction(struct parse_state *parseState,

+                       struct prog_instruction *inst)

+{

+   const GLubyte *str;

+   GLubyte *msg;

+   GLuint len;

+   GLint idx;

+

+   /* The first argument is a literal string 'just like this' */

+   if (!Parse_String(parseState, "'"))

+      RETURN_ERROR1("Expected '");

+

+   str = parseState->pos;

+   for (len = 0; str[len] != '\''; len++) /* find closing quote */

+      ;

+   parseState->pos += len + 1;

+   msg = (GLubyte*) malloc(len + 1);

+

+   memcpy(msg, str, len);

+   msg[len] = 0;

+   inst->Data = msg;

+

+   if (Parse_String(parseState, ",")) {

+      /* got an optional register to print */

+      GLubyte token[100];

+      GetToken(parseState, token);

+      if (token[0] == 'o') {

+         /* dst reg */

+         if (!Parse_OutputReg(parseState, &idx))

+            RETURN_ERROR;

+	 inst->SrcReg[0].Index = idx;

+         inst->SrcReg[0].File = PROGRAM_OUTPUT;

+      }

+      else {

+         /* src reg */

+         if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))

+            RETURN_ERROR;

+      }

+   }

+   else {

+      inst->SrcReg[0].File = PROGRAM_UNDEFINED;

+   }

+

+   inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;

+   inst->SrcReg[0].Abs = GL_FALSE;

+   inst->SrcReg[0].Negate = NEGATE_NONE;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_InstructionSequence(struct parse_state *parseState,

+                          struct prog_instruction program[])

+{

+   while (1) {

+      struct prog_instruction *inst = program + parseState->numInst;

+      struct instruction_pattern instMatch;

+      GLubyte token[100];

+

+      /* Initialize the instruction */

+      _mesa_init_instructions(inst, 1);

+

+      /* special instructions */

+      if (Parse_String(parseState, "DEFINE")) {

+         GLubyte id[100];

+         GLfloat value[7];  /* yes, 7 to be safe */

+         if (!Parse_Identifier(parseState, id))

+            RETURN_ERROR;

+         /* XXX make sure id is not a reserved identifer, like R9 */

+         if (!Parse_String(parseState, "="))

+            RETURN_ERROR1("Expected =");

+         if (!Parse_VectorOrScalarConstant(parseState, value))

+            RETURN_ERROR;

+         if (!Parse_String(parseState, ";"))

+            RETURN_ERROR1("Expected ;");

+         if (_mesa_lookup_parameter_index(parseState->parameters,

+                                          -1, (const char *) id) >= 0) {

+            RETURN_ERROR2(id, "already defined");

+         }

+         _mesa_add_named_parameter(parseState->parameters,

+                                   (const char *) id, value);

+      }

+      else if (Parse_String(parseState, "DECLARE")) {

+         GLubyte id[100];

+         GLfloat value[7] = {0, 0, 0, 0, 0, 0, 0};  /* yes, to be safe */

+         if (!Parse_Identifier(parseState, id))

+            RETURN_ERROR;

+         /* XXX make sure id is not a reserved identifer, like R9 */

+         if (Parse_String(parseState, "=")) {

+            if (!Parse_VectorOrScalarConstant(parseState, value))

+               RETURN_ERROR;

+         }

+         if (!Parse_String(parseState, ";"))

+            RETURN_ERROR1("Expected ;");

+         if (_mesa_lookup_parameter_index(parseState->parameters,

+                                          -1, (const char *) id) >= 0) {

+            RETURN_ERROR2(id, "already declared");

+         }

+         _mesa_add_named_parameter(parseState->parameters,

+                                   (const char *) id, value);

+      }

+      else if (Parse_String(parseState, "END")) {

+         inst->Opcode = OPCODE_END;

+         parseState->numInst++;

+         if (Parse_Token(parseState, token)) {

+            RETURN_ERROR1("Code after END opcode.");

+         }

+         break;

+      }

+      else {

+         /* general/arithmetic instruction */

+

+         /* get token */

+         if (!Parse_Token(parseState, token)) {

+            RETURN_ERROR1("Missing END instruction.");

+         }

+

+         /* try to find matching instuction */

+         instMatch = MatchInstruction(token);

+         if (instMatch.opcode >= MAX_OPCODE) {

+            /* bad instruction name */

+            RETURN_ERROR2("Unexpected token: ", token);

+         }

+

+         inst->Opcode = instMatch.opcode;

+         inst->Precision = instMatch.suffixes & (_R | _H | _X);

+         inst->SaturateMode = (instMatch.suffixes & (_S))

+            ? SATURATE_ZERO_ONE : SATURATE_OFF;

+         inst->CondUpdate = (instMatch.suffixes & (_C)) ? GL_TRUE : GL_FALSE;

+

+         /*

+          * parse the input and output operands

+          */

+         if (instMatch.outputs == OUTPUT_S || instMatch.outputs == OUTPUT_V) {

+            if (!Parse_MaskedDstReg(parseState, &inst->DstReg))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+         }

+         else if (instMatch.outputs == OUTPUT_NONE) {

+            if (instMatch.opcode == OPCODE_KIL_NV) {

+               /* This is a little weird, the cond code info is in

+                * the dest register.

+                */

+               if (!Parse_CondCodeMask(parseState, &inst->DstReg))

+                  RETURN_ERROR;

+            }

+            else {

+               ASSERT(instMatch.opcode == OPCODE_PRINT);

+            }

+         }

+

+         if (instMatch.inputs == INPUT_1V) {

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+         }

+         else if (instMatch.inputs == INPUT_2V) {

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))

+               RETURN_ERROR;

+         }

+         else if (instMatch.inputs == INPUT_3V) {

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))

+               RETURN_ERROR;

+         }

+         else if (instMatch.inputs == INPUT_1S) {

+            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+         }

+         else if (instMatch.inputs == INPUT_2S) {

+            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[1]))

+               RETURN_ERROR;

+         }

+         else if (instMatch.inputs == INPUT_CC) {

+            /* XXX to-do */

+         }

+         else if (instMatch.inputs == INPUT_1V_T) {

+	    GLubyte unit, idx;

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_TextureImageId(parseState, &unit, &idx))

+               RETURN_ERROR;

+	    inst->TexSrcUnit = unit;

+	    inst->TexSrcTarget = idx;

+         }

+         else if (instMatch.inputs == INPUT_3V_T) {

+	    GLubyte unit, idx;

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[0]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[1]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_VectorSrc(parseState, &inst->SrcReg[2]))

+               RETURN_ERROR;

+            if (!Parse_String(parseState, ","))

+               RETURN_ERROR1("Expected ,");

+            if (!Parse_TextureImageId(parseState, &unit, &idx))

+               RETURN_ERROR;

+	    inst->TexSrcUnit = unit;

+	    inst->TexSrcTarget = idx;

+         }

+         else if (instMatch.inputs == INPUT_1V_S) {

+            if (!Parse_PrintInstruction(parseState, inst))

+               RETURN_ERROR;

+         }

+

+         /* end of statement semicolon */

+         if (!Parse_String(parseState, ";"))

+            RETURN_ERROR1("Expected ;");

+

+         parseState->numInst++;

+

+         if (parseState->numInst >= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS)

+            RETURN_ERROR1("Program too long");

+      }

+   }

+   return GL_TRUE;

+}

+

+

+

+/**

+ * Parse/compile the 'str' returning the compiled 'program'.

+ * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos

+ * indicates the position of the error in 'str'.

+ */

+void

+_mesa_parse_nv_fragment_program(struct gl_context *ctx, GLenum dstTarget,

+                                const GLubyte *str, GLsizei len,

+                                struct gl_fragment_program *program)

+{

+   struct parse_state parseState;

+   struct prog_instruction instBuffer[MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS];

+   struct prog_instruction *newInst;

+   GLenum target;

+   GLubyte *programString;

+

+   /* Make a null-terminated copy of the program string */

+   programString = (GLubyte *) MALLOC(len + 1);

+   if (!programString) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+      return;

+   }

+   memcpy(programString, str, len);

+   programString[len] = 0;

+

+   /* Get ready to parse */

+   memset(&parseState, 0, sizeof(struct parse_state));

+   parseState.ctx = ctx;

+   parseState.start = programString;

+   parseState.program = program;

+   parseState.numInst = 0;

+   parseState.curLine = programString;

+   parseState.parameters = _mesa_new_parameter_list();

+

+   /* Reset error state */

+   _mesa_set_program_error(ctx, -1, NULL);

+

+   /* check the program header */

+   if (strncmp((const char *) programString, "!!FP1.0", 7) == 0) {

+      target = GL_FRAGMENT_PROGRAM_NV;

+      parseState.pos = programString + 7;

+   }

+   else if (strncmp((const char *) programString, "!!FCP1.0", 8) == 0) {

+      /* fragment / register combiner program - not supported */

+      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");

+      return;

+   }

+   else {

+      /* invalid header */

+      _mesa_set_program_error(ctx, 0, "Invalid fragment program header");

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");

+      return;

+   }

+

+   /* make sure target and header match */

+   if (target != dstTarget) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glLoadProgramNV(target mismatch 0x%x != 0x%x)",

+                  target, dstTarget);

+      return;

+   }

+

+   if (Parse_InstructionSequence(&parseState, instBuffer)) {

+      GLuint u;

+      /* successful parse! */

+

+      if (parseState.outputsWritten == 0) {

+         /* must write at least one output! */

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "Invalid fragment program - no outputs written.");

+         return;

+      }

+

+      /* copy the compiled instructions */

+      assert(parseState.numInst <= MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS);

+      newInst = _mesa_alloc_instructions(parseState.numInst);

+      if (!newInst) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+         return;  /* out of memory */

+      }

+      _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);

+

+      /* install the program */

+      program->Base.Target = target;

+      if (program->Base.String) {

+         FREE(program->Base.String);

+      }

+      program->Base.String = programString;

+      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;

+      if (program->Base.Instructions) {

+         free(program->Base.Instructions);

+      }

+      program->Base.Instructions = newInst;

+      program->Base.NumInstructions = parseState.numInst;

+      program->Base.InputsRead = parseState.inputsRead;

+      program->Base.OutputsWritten = parseState.outputsWritten;

+      for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++)

+         program->Base.TexturesUsed[u] = parseState.texturesUsed[u];

+

+      /* save program parameters */

+      program->Base.Parameters = parseState.parameters;

+

+      /* allocate registers for declared program parameters */

+#if 00

+      _mesa_assign_program_registers(&(program->SymbolTable));

+#endif

+

+#ifdef DEBUG_foo

+      printf("--- glLoadProgramNV(%d) result ---\n", program->Base.Id);

+      _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);

+      printf("----------------------------------\n");

+#endif

+   }

+   else {

+      /* Error! */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");

+      /* NOTE: _mesa_set_program_error would have been called already */

+   }

+}

+

+

+const char *

+_mesa_nv_fragment_input_register_name(GLuint i)

+{

+   ASSERT(i < MAX_NV_FRAGMENT_PROGRAM_INPUTS);

+   return InputRegisters[i];

+}

+

diff --git a/mesalib/src/mesa/program/nvfragparse.h b/mesalib/src/mesa/program/nvfragparse.h
index e28a6c493..a8ab8d6fe 100644
--- a/mesalib/src/mesa/program/nvfragparse.h
+++ b/mesalib/src/mesa/program/nvfragparse.h
@@ -1,44 +1,47 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  5.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.
- *
- * Authors:
- *    Brian Paul
- */
-
-
-#ifndef NVFRAGPARSE_H
-#define NVFRAGPARSE_H
-
-#include "main/mtypes.h"
-
-extern void
-_mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum target,
-                                const GLubyte *str, GLsizei len,
-                                struct gl_fragment_program *program);
-
-
-extern const char *
-_mesa_nv_fragment_input_register_name(GLuint i);
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  5.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.

+ *

+ * Authors:

+ *    Brian Paul

+ */

+

+

+#ifndef NVFRAGPARSE_H

+#define NVFRAGPARSE_H

+

+#include "main/glheader.h"

+

+struct gl_context;

+struct gl_fragment_program;

+

+extern void

+_mesa_parse_nv_fragment_program(struct gl_context *ctx, GLenum target,

+                                const GLubyte *str, GLsizei len,

+                                struct gl_fragment_program *program);

+

+

+extern const char *

+_mesa_nv_fragment_input_register_name(GLuint i);

+

+#endif

diff --git a/mesalib/src/mesa/program/nvvertparse.c b/mesalib/src/mesa/program/nvvertparse.c
index 1ac83d0e5..8f7199a99 100644
--- a/mesalib/src/mesa/program/nvvertparse.c
+++ b/mesalib/src/mesa/program/nvvertparse.c
@@ -1,1459 +1,1459 @@
-/*
- * 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.
- */
-
-/**
- * \file nvvertparse.c
- * NVIDIA vertex program parser.
- * \author Brian Paul
- */
-
-/*
- * Regarding GL_NV_vertex_program, GL_NV_vertex_program1_1:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/nvprogram.h"
-#include "nvvertparse.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "program.h"
-
-
-/**
- * Current parsing state.  This structure is passed among the parsing
- * functions and keeps track of the current parser position and various
- * program attributes.
- */
-struct parse_state {
-   GLcontext *ctx;
-   const GLubyte *start;
-   const GLubyte *pos;
-   const GLubyte *curLine;
-   GLboolean isStateProgram;
-   GLboolean isPositionInvariant;
-   GLboolean isVersion1_1;
-   GLbitfield inputsRead;
-   GLbitfield outputsWritten;
-   GLboolean anyProgRegsWritten;
-   GLboolean indirectRegisterFiles;
-   GLuint numInst;                 /* number of instructions parsed */
-};
-
-
-/*
- * Called whenever we find an error during parsing.
- */
-static void
-record_error(struct parse_state *parseState, const char *msg, int lineNo)
-{
-#ifdef DEBUG
-   GLint line, column;
-   const GLubyte *lineStr;
-   lineStr = _mesa_find_line_column(parseState->start,
-                                    parseState->pos, &line, &column);
-   _mesa_debug(parseState->ctx,
-               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
-               lineNo, line, column, (char *) lineStr, msg);
-   free((void *) lineStr);
-#else
-   (void) lineNo;
-#endif
-
-   /* Check that no error was already recorded.  Only record the first one. */
-   if (parseState->ctx->Program.ErrorString[0] == 0) {
-      _mesa_set_program_error(parseState->ctx,
-                              parseState->pos - parseState->start,
-                              msg);
-   }
-}
-
-
-#define RETURN_ERROR							\
-do {									\
-   record_error(parseState, "Unexpected end of input.", __LINE__);	\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR1(msg)						\
-do {									\
-   record_error(parseState, msg, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-#define RETURN_ERROR2(msg1, msg2)					\
-do {									\
-   char err[1000];							\
-   sprintf(err, "%s %s", msg1, msg2);				\
-   record_error(parseState, err, __LINE__);				\
-   return GL_FALSE;							\
-} while(0)
-
-
-
-
-
-static GLboolean IsLetter(GLubyte b)
-{
-   return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z');
-}
-
-
-static GLboolean IsDigit(GLubyte b)
-{
-   return b >= '0' && b <= '9';
-}
-
-
-static GLboolean IsWhitespace(GLubyte b)
-{
-   return b == ' ' || b == '\t' || b == '\n' || b == '\r';
-}
-
-
-/**
- * Starting at 'str' find the next token.  A token can be an integer,
- * an identifier or punctuation symbol.
- * \return <= 0 we found an error, else, return number of characters parsed.
- */
-static GLint
-GetToken(struct parse_state *parseState, GLubyte *token)
-{
-   const GLubyte *str = parseState->pos;
-   GLint i = 0, j = 0;
-
-   token[0] = 0;
-
-   /* skip whitespace and comments */
-   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {
-      if (str[i] == '#') {
-         /* skip comment */
-         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
-            i++;
-         }
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (str[i] == '\n' || str[i] == '\r')
-            parseState->curLine = str + i + 1;
-         i++;
-      }
-   }
-
-   if (str[i] == 0)
-      return -i;
-
-   /* try matching an integer */
-   while (str[i] && IsDigit(str[i])) {
-      token[j++] = str[i++];
-   }
-   if (j > 0 || !str[i]) {
-      token[j] = 0;
-      return i;
-   }
-
-   /* try matching an identifier */
-   if (IsLetter(str[i])) {
-      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {
-         token[j++] = str[i++];
-      }
-      token[j] = 0;
-      return i;
-   }
-
-   /* punctuation character */
-   if (str[i]) {
-      token[0] = str[i++];
-      token[1] = 0;
-      return i;
-   }
-
-   /* end of input */
-   token[0] = 0;
-   return i;
-}
-
-
-/**
- * Get next token from input stream and increment stream pointer past token.
- */
-static GLboolean
-Parse_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   parseState->pos += i;
-   return GL_TRUE;
-}
-
-
-/**
- * Get next token from input stream but don't increment stream pointer.
- */
-static GLboolean
-Peek_Token(struct parse_state *parseState, GLubyte *token)
-{
-   GLint i, len;
-   i = GetToken(parseState, token);
-   if (i <= 0) {
-      parseState->pos += (-i);
-      return GL_FALSE;
-   }
-   len = (GLint) strlen((const char *) token);
-   parseState->pos += (i - len);
-   return GL_TRUE;
-}
-
-
-/**
- * Try to match 'pattern' as the next token after any whitespace/comments.
- * Advance the current parsing position only if we match the pattern.
- * \return GL_TRUE if pattern is matched, GL_FALSE otherwise.
- */
-static GLboolean
-Parse_String(struct parse_state *parseState, const char *pattern)
-{
-   const GLubyte *m;
-   GLint i;
-
-   /* skip whitespace and comments */
-   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
-      if (*parseState->pos == '#') {
-         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
-            parseState->pos += 1;
-         }
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-      }
-      else {
-         /* skip whitespace */
-         if (*parseState->pos == '\n' || *parseState->pos == '\r')
-            parseState->curLine = parseState->pos + 1;
-         parseState->pos += 1;
-      }
-   }
-
-   /* Try to match the pattern */
-   m = parseState->pos;
-   for (i = 0; pattern[i]; i++) {
-      if (*m != (GLubyte) pattern[i])
-         return GL_FALSE;
-      m += 1;
-   }
-   parseState->pos = m;
-
-   return GL_TRUE; /* success */
-}
-
-
-/**********************************************************************/
-
-static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = {
-   "OPOS", "WGHT", "NRML", "COL0", "COL1", "FOGC", "6", "7",
-   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
-};
-
-static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = {
-   "HPOS", "COL0", "COL1", "FOGC", 
-   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", 
-   "PSIZ", "BFC0", "BFC1", NULL
-};
-
-
-
-/**
- * Parse a temporary register: Rnn
- */
-static GLboolean
-Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-
-   /* Should be 'R##' */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] != 'R')
-      RETURN_ERROR1("Expected R##");
-
-   if (IsDigit(token[1])) {
-      GLint reg = atoi((char *) (token + 1));
-      if (reg >= MAX_NV_VERTEX_PROGRAM_TEMPS)
-         RETURN_ERROR1("Bad temporary register name");
-      *tempRegNum = reg;
-   }
-   else {
-      RETURN_ERROR1("Bad temporary register name");
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse address register "A0.x"
- */
-static GLboolean
-Parse_AddrReg(struct parse_state *parseState)
-{
-   /* match 'A0' */
-   if (!Parse_String(parseState, "A0"))
-      RETURN_ERROR;
-
-   /* match '.' */
-   if (!Parse_String(parseState, "."))
-      RETURN_ERROR;
-
-   /* match 'x' */
-   if (!Parse_String(parseState, "x"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse absolute program parameter register "c[##]"
- */
-static GLboolean
-Parse_AbsParamReg(struct parse_state *parseState, GLint *regNum)
-{
-   GLubyte token[100];
-
-   if (!Parse_String(parseState, "c"))
-      RETURN_ERROR;
-
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (IsDigit(token[0])) {
-      /* a numbered program parameter register */
-      GLint reg = atoi((char *) token);
-      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
-         RETURN_ERROR1("Bad program parameter number");
-      *regNum = reg;
-   }
-   else {
-      RETURN_ERROR;
-   }
-
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-
-   if (!Parse_String(parseState, "c"))
-      RETURN_ERROR;
-
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (IsDigit(token[0])) {
-      /* a numbered program parameter register */
-      GLint reg;
-      (void) Parse_Token(parseState, token);
-      reg = atoi((char *) token);
-      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
-         RETURN_ERROR1("Bad program parameter number");
-      srcReg->File = PROGRAM_ENV_PARAM;
-      srcReg->Index = reg;
-   }
-   else if (strcmp((const char *) token, "A0") == 0) {
-      /* address register "A0.x" */
-      if (!Parse_AddrReg(parseState))
-         RETURN_ERROR;
-
-      srcReg->RelAddr = GL_TRUE;
-      srcReg->File = PROGRAM_ENV_PARAM;
-      parseState->indirectRegisterFiles |= (1 << srcReg->File);
-      /* Look for +/-N offset */
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (token[0] == '-' || token[0] == '+') {
-         const GLubyte sign = token[0];
-         (void) Parse_Token(parseState, token); /* consume +/- */
-
-         /* an integer should be next */
-         if (!Parse_Token(parseState, token))
-            RETURN_ERROR;
-
-         if (IsDigit(token[0])) {
-            const GLint k = atoi((char *) token);
-            if (sign == '-') {
-               if (k > 64)
-                  RETURN_ERROR1("Bad address offset");
-               srcReg->Index = -k;
-            }
-            else {
-               if (k > 63)
-                  RETURN_ERROR1("Bad address offset");
-               srcReg->Index = k;
-            }
-         }
-         else {
-            RETURN_ERROR;
-         }
-      }
-      else {
-         /* probably got a ']', catch it below */
-      }
-   }
-   else {
-      RETURN_ERROR;
-   }
-
-   /* Match closing ']' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Parse v[#] or v[<name>]
- */
-static GLboolean
-Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
-{
-   GLubyte token[100];
-   GLint j;
-
-   /* Match 'v' */
-   if (!Parse_String(parseState, "v"))
-      RETURN_ERROR;
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   /* match number or named register */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (parseState->isStateProgram && token[0] != '0')
-      RETURN_ERROR1("Only v[0] accessible in vertex state programs");
-
-   if (IsDigit(token[0])) {
-      GLint reg = atoi((char *) token);
-      if (reg >= MAX_NV_VERTEX_PROGRAM_INPUTS)
-         RETURN_ERROR1("Bad vertex attribute register name");
-      *tempRegNum = reg;
-   }
-   else {
-      for (j = 0; InputRegisters[j]; j++) {
-         if (strcmp((const char *) token, InputRegisters[j]) == 0) {
-            *tempRegNum = j;
-            break;
-         }
-      }
-      if (!InputRegisters[j]) {
-         /* unknown input register label */
-         RETURN_ERROR2("Bad register name", token);
-      }
-   }
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
-{
-   GLubyte token[100];
-   GLint start, j;
-
-   /* Match 'o' */
-   if (!Parse_String(parseState, "o"))
-      RETURN_ERROR;
-
-   /* Match '[' */
-   if (!Parse_String(parseState, "["))
-      RETURN_ERROR;
-
-   /* Get output reg name */
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (parseState->isPositionInvariant)
-      start = 1; /* skip HPOS register name */
-   else
-      start = 0;
-
-   /* try to match an output register name */
-   for (j = start; OutputRegisters[j]; j++) {
-      if (strcmp((const char *) token, OutputRegisters[j]) == 0) {
-         *outputRegNum = j;
-         break;
-      }
-   }
-   if (!OutputRegisters[j])
-      RETURN_ERROR1("Unrecognized output register name");
-
-   /* Match ']' */
-   if (!Parse_String(parseState, "]"))
-      RETURN_ERROR1("Expected ]");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_MaskedDstReg(struct parse_state *parseState, struct prog_dst_register *dstReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   /* Dst reg can be R<n> or o[n] */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (token[0] == 'R') {
-      /* a temporary register */
-      dstReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (!parseState->isStateProgram && token[0] == 'o') {
-      /* an output register */
-      dstReg->File = PROGRAM_OUTPUT;
-      if (!Parse_OutputReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else if (parseState->isStateProgram && token[0] == 'c' &&
-            parseState->isStateProgram) {
-      /* absolute program parameter register */
-      /* Only valid for vertex state programs */
-      dstReg->File = PROGRAM_ENV_PARAM;
-      if (!Parse_AbsParamReg(parseState, &idx))
-         RETURN_ERROR;
-      dstReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR1("Bad destination register name");
-   }
-
-   /* Parse optional write mask */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (token[0] == '.') {
-      /* got a mask */
-      GLint k = 0;
-
-      if (!Parse_String(parseState, "."))
-         RETURN_ERROR;
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      dstReg->WriteMask = 0;
-
-      if (token[k] == 'x') {
-         dstReg->WriteMask |= WRITEMASK_X;
-         k++;
-      }
-      if (token[k] == 'y') {
-         dstReg->WriteMask |= WRITEMASK_Y;
-         k++;
-      }
-      if (token[k] == 'z') {
-         dstReg->WriteMask |= WRITEMASK_Z;
-         k++;
-      }
-      if (token[k] == 'w') {
-         dstReg->WriteMask |= WRITEMASK_W;
-         k++;
-      }
-      if (k == 0) {
-         RETURN_ERROR1("Bad writemask character");
-      }
-      return GL_TRUE;
-   }
-   else {
-      dstReg->WriteMask = WRITEMASK_XYZW;
-      return GL_TRUE;
-   }
-}
-
-
-static GLboolean
-Parse_SwizzleSrcReg(struct parse_state *parseState, struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   srcReg->RelAddr = GL_FALSE;
-
-   /* check for '-' */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] == '-') {
-      (void) Parse_String(parseState, "-");
-      srcReg->Negate = NEGATE_XYZW;
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-   }
-   else {
-      srcReg->Negate = NEGATE_NONE;
-   }
-
-   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
-   if (token[0] == 'R') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'c') {
-      if (!Parse_ParamReg(parseState, srcReg))
-         RETURN_ERROR;
-   }
-   else if (token[0] == 'v') {
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_AttribReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR2("Bad source register name", token);
-   }
-
-   /* init swizzle fields */
-   srcReg->Swizzle = SWIZZLE_NOOP;
-
-   /* Look for optional swizzle suffix */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] == '.') {
-      (void) Parse_String(parseState, ".");  /* consume . */
-
-      if (!Parse_Token(parseState, token))
-         RETURN_ERROR;
-
-      if (token[1] == 0) {
-         /* single letter swizzle */
-         if (token[0] == 'x')
-            srcReg->Swizzle = SWIZZLE_XXXX;
-         else if (token[0] == 'y')
-            srcReg->Swizzle = SWIZZLE_YYYY;
-         else if (token[0] == 'z')
-            srcReg->Swizzle = SWIZZLE_ZZZZ;
-         else if (token[0] == 'w')
-            srcReg->Swizzle = SWIZZLE_WWWW;
-         else
-            RETURN_ERROR1("Expected x, y, z, or w");
-      }
-      else {
-         /* 2, 3 or 4-component swizzle */
-         GLint k;
-
-         srcReg->Swizzle = 0;
-
-         for (k = 0; token[k] && k < 5; k++) {
-            if (token[k] == 'x')
-               srcReg->Swizzle |= 0 << (k*3);
-            else if (token[k] == 'y')
-               srcReg->Swizzle |= 1 << (k*3);
-            else if (token[k] == 'z')
-               srcReg->Swizzle |= 2 << (k*3);
-            else if (token[k] == 'w')
-               srcReg->Swizzle |= 3 << (k*3);
-            else
-               RETURN_ERROR;
-         }
-         if (k >= 5)
-            RETURN_ERROR;
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ScalarSrcReg(struct parse_state *parseState, struct prog_src_register *srcReg)
-{
-   GLubyte token[100];
-   GLint idx;
-
-   srcReg->RelAddr = GL_FALSE;
-
-   /* check for '-' */
-   if (!Peek_Token(parseState, token))
-      RETURN_ERROR;
-   if (token[0] == '-') {
-      srcReg->Negate = NEGATE_XYZW;
-      (void) Parse_String(parseState, "-"); /* consume '-' */
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-   }
-   else {
-      srcReg->Negate = NEGATE_NONE;
-   }
-
-   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
-   if (token[0] == 'R') {
-      srcReg->File = PROGRAM_TEMPORARY;
-      if (!Parse_TempReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else if (token[0] == 'c') {
-      if (!Parse_ParamReg(parseState, srcReg))
-         RETURN_ERROR;
-   }
-   else if (token[0] == 'v') {
-      srcReg->File = PROGRAM_INPUT;
-      if (!Parse_AttribReg(parseState, &idx))
-         RETURN_ERROR;
-      srcReg->Index = idx;
-   }
-   else {
-      RETURN_ERROR2("Bad source register name", token);
-   }
-
-   /* Look for .[xyzw] suffix */
-   if (!Parse_String(parseState, "."))
-      RETURN_ERROR;
-
-   if (!Parse_Token(parseState, token))
-      RETURN_ERROR;
-
-   if (token[0] == 'x' && token[1] == 0) {
-      srcReg->Swizzle = 0;
-   }
-   else if (token[0] == 'y' && token[1] == 0) {
-      srcReg->Swizzle = 1;
-   }
-   else if (token[0] == 'z' && token[1] == 0) {
-      srcReg->Swizzle = 2;
-   }
-   else if (token[0] == 'w' && token[1] == 0) {
-      srcReg->Swizzle = 3;
-   }
-   else {
-      RETURN_ERROR1("Bad scalar source suffix");
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLint
-Parse_UnaryOpInstruction(struct parse_state *parseState,
-                         struct prog_instruction *inst,
-                         enum prog_opcode opcode)
-{
-   if (opcode == OPCODE_ABS && !parseState->isVersion1_1)
-      RETURN_ERROR1("ABS illegal for vertex program 1.0");
-
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_BiOpInstruction(struct parse_state *parseState,
-                      struct prog_instruction *inst,
-                      enum prog_opcode opcode)
-{
-   if (opcode == OPCODE_DPH && !parseState->isVersion1_1)
-      RETURN_ERROR1("DPH illegal for vertex program 1.0");
-   if (opcode == OPCODE_SUB && !parseState->isVersion1_1)
-      RETURN_ERROR1("SUB illegal for vertex program 1.0");
-
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* first src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* second src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   /* make sure we don't reference more than one program parameter register */
-   if (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
-       inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
-       inst->SrcReg[0].Index != inst->SrcReg[1].Index)
-      RETURN_ERROR1("Can't reference two program parameter registers");
-
-   /* make sure we don't reference more than one vertex attribute register */
-   if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-       inst->SrcReg[1].File == PROGRAM_INPUT &&
-       inst->SrcReg[0].Index != inst->SrcReg[1].Index)
-      RETURN_ERROR1("Can't reference two vertex attribute registers");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_TriOpInstruction(struct parse_state *parseState,
-                       struct prog_instruction *inst,
-                       enum prog_opcode opcode)
-{
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* first src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* second src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* third src arg */
-   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[2]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   /* make sure we don't reference more than one program parameter register */
-   if ((inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
-       (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
-       (inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
-        inst->SrcReg[1].Index != inst->SrcReg[2].Index))
-      RETURN_ERROR1("Can only reference one program register");
-
-   /* make sure we don't reference more than one vertex attribute register */
-   if ((inst->SrcReg[0].File == PROGRAM_INPUT &&
-        inst->SrcReg[1].File == PROGRAM_INPUT &&
-        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
-       (inst->SrcReg[0].File == PROGRAM_INPUT &&
-        inst->SrcReg[2].File == PROGRAM_INPUT &&
-        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
-       (inst->SrcReg[1].File == PROGRAM_INPUT &&
-        inst->SrcReg[2].File == PROGRAM_INPUT &&
-        inst->SrcReg[1].Index != inst->SrcReg[2].Index))
-      RETURN_ERROR1("Can only reference one input register");
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_ScalarInstruction(struct parse_state *parseState,
-                        struct prog_instruction *inst,
-                        enum prog_opcode opcode)
-{
-   if (opcode == OPCODE_RCC && !parseState->isVersion1_1)
-      RETURN_ERROR1("RCC illegal for vertex program 1.0");
-
-   inst->Opcode = opcode;
-
-   /* dest reg */
-   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* first src arg */
-   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_AddressInstruction(struct parse_state *parseState, struct prog_instruction *inst)
-{
-   inst->Opcode = OPCODE_ARL;
-
-   /* Make ARB_vp backends happy */
-   inst->DstReg.File = PROGRAM_ADDRESS;
-   inst->DstReg.WriteMask = WRITEMASK_X;
-   inst->DstReg.Index = 0;
-
-   /* dest A0 reg */
-   if (!Parse_AddrReg(parseState))
-      RETURN_ERROR;
-
-   /* comma */
-   if (!Parse_String(parseState, ","))
-      RETURN_ERROR;
-
-   /* parse src reg */
-   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
-      RETURN_ERROR;
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_EndInstruction(struct parse_state *parseState, struct prog_instruction *inst)
-{
-   GLubyte token[100];
-
-   inst->Opcode = OPCODE_END;
-
-   /* this should fail! */
-   if (Parse_Token(parseState, token))
-      RETURN_ERROR2("Unexpected token after END:", token);
-   else
-      return GL_TRUE;
-}
-
-
-/**
- * The PRINT instruction is Mesa-specific and is meant as a debugging aid for
- * the vertex program developer.
- * The NV_vertex_program extension grammar is modified as follows:
- *
- *  <instruction>        ::= <ARL-instruction>
- *                         | ...
- *                         | <PRINT-instruction>
- *
- *  <PRINT-instruction>  ::= "PRINT" <string literal>
- *                         | "PRINT" <string literal> "," <srcReg>
- *                         | "PRINT" <string literal> "," <dstReg>
- */
-static GLboolean
-Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *inst)
-{
-   const GLubyte *str;
-   GLubyte *msg;
-   GLuint len;
-   GLubyte token[100];
-   struct prog_src_register *srcReg = &inst->SrcReg[0];
-   GLint idx;
-
-   inst->Opcode = OPCODE_PRINT;
-
-   /* The first argument is a literal string 'just like this' */
-   if (!Parse_String(parseState, "'"))
-      RETURN_ERROR;
-
-   str = parseState->pos;
-   for (len = 0; str[len] != '\''; len++) /* find closing quote */
-      ;
-   parseState->pos += len + 1;
-   msg = (GLubyte*) malloc(len + 1);
-
-   memcpy(msg, str, len);
-   msg[len] = 0;
-   inst->Data = msg;
-
-   /* comma */
-   if (Parse_String(parseState, ",")) {
-
-      /* The second argument is a register name */
-      if (!Peek_Token(parseState, token))
-         RETURN_ERROR;
-
-      srcReg->RelAddr = GL_FALSE;
-      srcReg->Negate = NEGATE_NONE;
-      srcReg->Swizzle = SWIZZLE_NOOP;
-
-      /* Register can be R<n>, c[n], c[n +/- offset], a named vertex attrib,
-       * or an o[n] output register.
-       */
-      if (token[0] == 'R') {
-         srcReg->File = PROGRAM_TEMPORARY;
-         if (!Parse_TempReg(parseState, &idx))
-            RETURN_ERROR;
-	 srcReg->Index = idx;
-      }
-      else if (token[0] == 'c') {
-         srcReg->File = PROGRAM_ENV_PARAM;
-         if (!Parse_ParamReg(parseState, srcReg))
-            RETURN_ERROR;
-      }
-      else if (token[0] == 'v') {
-         srcReg->File = PROGRAM_INPUT;
-         if (!Parse_AttribReg(parseState, &idx))
-            RETURN_ERROR;
-	 srcReg->Index = idx;
-      }
-      else if (token[0] == 'o') {
-         srcReg->File = PROGRAM_OUTPUT;
-         if (!Parse_OutputReg(parseState, &idx))
-            RETURN_ERROR;
-	 srcReg->Index = idx;
-      }
-      else {
-         RETURN_ERROR2("Bad source register name", token);
-      }
-   }
-   else {
-      srcReg->File = PROGRAM_UNDEFINED;
-   }
-
-   /* semicolon */
-   if (!Parse_String(parseState, ";"))
-      RETURN_ERROR;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-Parse_OptionSequence(struct parse_state *parseState,
-                     struct prog_instruction program[])
-{
-   (void) program;
-   while (1) {
-      if (!Parse_String(parseState, "OPTION"))
-         return GL_TRUE;  /* ok, not an OPTION statement */
-      if (Parse_String(parseState, "NV_position_invariant")) {
-         parseState->isPositionInvariant = GL_TRUE;
-      }
-      else {
-         RETURN_ERROR1("unexpected OPTION statement");
-      }
-      if (!Parse_String(parseState, ";"))
-         return GL_FALSE;
-   }
-}
-
-
-static GLboolean
-Parse_InstructionSequence(struct parse_state *parseState,
-                          struct prog_instruction program[])
-{
-   while (1) {
-      struct prog_instruction *inst = program + parseState->numInst;
-
-      /* Initialize the instruction */
-      _mesa_init_instructions(inst, 1);
-
-      if (Parse_String(parseState, "MOV")) {
-         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_MOV))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "LIT")) {
-         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_LIT))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "ABS")) {
-         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_ABS))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MUL")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MUL))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "ADD")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_ADD))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DP3")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DP3))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DP4")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DP4))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DST")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DST))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MIN")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MIN))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MAX")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MAX))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "SLT")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SLT))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "SGE")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SGE))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "DPH")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DPH))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "SUB")) {
-         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SUB))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "MAD")) {
-         if (!Parse_TriOpInstruction(parseState, inst, OPCODE_MAD))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "RCP")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RCP))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "RSQ")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RSQ))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "EXP")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_EXP))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "LOG")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_LOG))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "RCC")) {
-         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RCC))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "ARL")) {
-         if (!Parse_AddressInstruction(parseState, inst))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "PRINT")) {
-         if (!Parse_PrintInstruction(parseState, inst))
-            RETURN_ERROR;
-      }
-      else if (Parse_String(parseState, "END")) {
-         if (!Parse_EndInstruction(parseState, inst))
-            RETURN_ERROR;
-         else {
-            parseState->numInst++;
-            return GL_TRUE;  /* all done */
-         }
-      }
-      else {
-         /* bad instruction name */
-         RETURN_ERROR1("Unexpected token");
-      }
-
-      /* examine input/output registers */
-      if (inst->DstReg.File == PROGRAM_OUTPUT)
-         parseState->outputsWritten |= (1 << inst->DstReg.Index);
-      else if (inst->DstReg.File == PROGRAM_ENV_PARAM)
-         parseState->anyProgRegsWritten = GL_TRUE;
-
-      if (inst->SrcReg[0].File == PROGRAM_INPUT)
-         parseState->inputsRead |= (1 << inst->SrcReg[0].Index);
-      if (inst->SrcReg[1].File == PROGRAM_INPUT)
-         parseState->inputsRead |= (1 << inst->SrcReg[1].Index);
-      if (inst->SrcReg[2].File == PROGRAM_INPUT)
-         parseState->inputsRead |= (1 << inst->SrcReg[2].Index);
-
-      parseState->numInst++;
-
-      if (parseState->numInst >= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS)
-         RETURN_ERROR1("Program too long");
-   }
-
-   RETURN_ERROR;
-}
-
-
-static GLboolean
-Parse_Program(struct parse_state *parseState,
-              struct prog_instruction instBuffer[])
-{
-   if (parseState->isVersion1_1) {
-      if (!Parse_OptionSequence(parseState, instBuffer)) {
-         return GL_FALSE;
-      }
-   }
-   return Parse_InstructionSequence(parseState, instBuffer);
-}
-
-
-/**
- * Parse/compile the 'str' returning the compiled 'program'.
- * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos
- * indicates the position of the error in 'str'.
- */
-void
-_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
-                              const GLubyte *str, GLsizei len,
-                              struct gl_vertex_program *program)
-{
-   struct parse_state parseState;
-   struct prog_instruction instBuffer[MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS];
-   struct prog_instruction *newInst;
-   GLenum target;
-   GLubyte *programString;
-
-   /* Make a null-terminated copy of the program string */
-   programString = (GLubyte *) MALLOC(len + 1);
-   if (!programString) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-      return;
-   }
-   memcpy(programString, str, len);
-   programString[len] = 0;
-
-   /* Get ready to parse */
-   parseState.ctx = ctx;
-   parseState.start = programString;
-   parseState.isPositionInvariant = GL_FALSE;
-   parseState.isVersion1_1 = GL_FALSE;
-   parseState.numInst = 0;
-   parseState.inputsRead = 0;
-   parseState.outputsWritten = 0;
-   parseState.anyProgRegsWritten = GL_FALSE;
-   parseState.indirectRegisterFiles = 0x0;
-
-   /* Reset error state */
-   _mesa_set_program_error(ctx, -1, NULL);
-
-   /* check the program header */
-   if (strncmp((const char *) programString, "!!VP1.0", 7) == 0) {
-      target = GL_VERTEX_PROGRAM_NV;
-      parseState.pos = programString + 7;
-      parseState.isStateProgram = GL_FALSE;
-   }
-   else if (strncmp((const char *) programString, "!!VP1.1", 7) == 0) {
-      target = GL_VERTEX_PROGRAM_NV;
-      parseState.pos = programString + 7;
-      parseState.isStateProgram = GL_FALSE;
-      parseState.isVersion1_1 = GL_TRUE;
-   }
-   else if (strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {
-      target = GL_VERTEX_STATE_PROGRAM_NV;
-      parseState.pos = programString + 8;
-      parseState.isStateProgram = GL_TRUE;
-   }
-   else {
-      /* invalid header */
-      ctx->Program.ErrorPos = 0;
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
-      return;
-   }
-
-   /* make sure target and header match */
-   if (target != dstTarget) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glLoadProgramNV(target mismatch)");
-      return;
-   }
-
-
-   if (Parse_Program(&parseState, instBuffer)) {
-      gl_state_index state_tokens[STATE_LENGTH] = {0, 0, 0, 0, 0};
-      int i;
-
-      /* successful parse! */
-
-      if (parseState.isStateProgram) {
-         if (!parseState.anyProgRegsWritten) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glLoadProgramNV(c[#] not written)");
-            return;
-         }
-      }
-      else {
-         if (!parseState.isPositionInvariant &&
-             !(parseState.outputsWritten & (1 << VERT_RESULT_HPOS))) {
-            /* bit 1 = HPOS register */
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glLoadProgramNV(HPOS not written)");
-            return;
-         }
-      }
-
-      /* copy the compiled instructions */
-      assert(parseState.numInst <= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS);
-      newInst = _mesa_alloc_instructions(parseState.numInst);
-      if (!newInst) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-         free(programString);
-         return;  /* out of memory */
-      }
-      _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);
-
-      /* install the program */
-      program->Base.Target = target;
-      if (program->Base.String) {
-         free(program->Base.String);
-      }
-      program->Base.String = programString;
-      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-      if (program->Base.Instructions) {
-         free(program->Base.Instructions);
-      }
-      program->Base.Instructions = newInst;
-      program->Base.InputsRead = parseState.inputsRead;
-      if (parseState.isPositionInvariant)
-         program->Base.InputsRead |= VERT_BIT_POS;
-      program->Base.NumInstructions = parseState.numInst;
-      program->Base.OutputsWritten = parseState.outputsWritten;
-      program->IsPositionInvariant = parseState.isPositionInvariant;
-      program->IsNVProgram = GL_TRUE;
-
-#ifdef DEBUG_foo
-      printf("--- glLoadProgramNV result ---\n");
-      _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);
-      printf("------------------------------\n");
-#endif
-
-      if (program->Base.Parameters)
-	 _mesa_free_parameter_list(program->Base.Parameters);
-
-      program->Base.Parameters = _mesa_new_parameter_list ();
-      program->Base.NumParameters = 0;
-
-      program->Base.IndirectRegisterFiles = parseState.indirectRegisterFiles;
-
-      state_tokens[0] = STATE_VERTEX_PROGRAM;
-      state_tokens[1] = STATE_ENV;
-      /* Add refs to all of the potential params, in order.  If we want to not
-       * upload everything, _mesa_layout_parameters is the answer.
-       */
-      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS; i++) {
-	 GLint index;
-	 state_tokens[2] = i;
-	 index = _mesa_add_state_reference(program->Base.Parameters,
-					   state_tokens);
-	 assert(index == i);
-      }
-      program->Base.NumParameters = program->Base.Parameters->NumParameters;
-
-      _mesa_setup_nv_temporary_count(ctx, &program->Base);
-      _mesa_emit_nv_temp_initialization(ctx, &program->Base);
-   }
-   else {
-      /* Error! */
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
-      /* NOTE: _mesa_set_program_error would have been called already */
-      /* GL_NV_vertex_program isn't supposed to set the error string
-       * so we reset it here.
-       */
-      _mesa_set_program_error(ctx, ctx->Program.ErrorPos, NULL);
-   }
-}
-
-
-const char *
-_mesa_nv_vertex_input_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_VERTEX_PROGRAM_INPUTS);
-   return InputRegisters[i];
-}
-
-
-const char *
-_mesa_nv_vertex_output_register_name(GLuint i)
-{
-   ASSERT(i < MAX_NV_VERTEX_PROGRAM_OUTPUTS);
-   return OutputRegisters[i];
-}
-
+/*

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

+ */

+

+/**

+ * \file nvvertparse.c

+ * NVIDIA vertex program parser.

+ * \author Brian Paul

+ */

+

+/*

+ * Regarding GL_NV_vertex_program, GL_NV_vertex_program1_1:

+ *

+ * Portions of this software may use or implement intellectual

+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims

+ * any and all warranties with respect to such intellectual property,

+ * including any use thereof or modifications thereto.

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/nvprogram.h"

+#include "nvvertparse.h"

+#include "prog_instruction.h"

+#include "prog_parameter.h"

+#include "prog_print.h"

+#include "program.h"

+

+

+/**

+ * Current parsing state.  This structure is passed among the parsing

+ * functions and keeps track of the current parser position and various

+ * program attributes.

+ */

+struct parse_state {

+   struct gl_context *ctx;

+   const GLubyte *start;

+   const GLubyte *pos;

+   const GLubyte *curLine;

+   GLboolean isStateProgram;

+   GLboolean isPositionInvariant;

+   GLboolean isVersion1_1;

+   GLbitfield inputsRead;

+   GLbitfield outputsWritten;

+   GLboolean anyProgRegsWritten;

+   GLboolean indirectRegisterFiles;

+   GLuint numInst;                 /* number of instructions parsed */

+};

+

+

+/*

+ * Called whenever we find an error during parsing.

+ */

+static void

+record_error(struct parse_state *parseState, const char *msg, int lineNo)

+{

+#ifdef DEBUG

+   GLint line, column;

+   const GLubyte *lineStr;

+   lineStr = _mesa_find_line_column(parseState->start,

+                                    parseState->pos, &line, &column);

+   _mesa_debug(parseState->ctx,

+               "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",

+               lineNo, line, column, (char *) lineStr, msg);

+   free((void *) lineStr);

+#else

+   (void) lineNo;

+#endif

+

+   /* Check that no error was already recorded.  Only record the first one. */

+   if (parseState->ctx->Program.ErrorString[0] == 0) {

+      _mesa_set_program_error(parseState->ctx,

+                              parseState->pos - parseState->start,

+                              msg);

+   }

+}

+

+

+#define RETURN_ERROR							\

+do {									\

+   record_error(parseState, "Unexpected end of input.", __LINE__);	\

+   return GL_FALSE;							\

+} while(0)

+

+#define RETURN_ERROR1(msg)						\

+do {									\

+   record_error(parseState, msg, __LINE__);				\

+   return GL_FALSE;							\

+} while(0)

+

+#define RETURN_ERROR2(msg1, msg2)					\

+do {									\

+   char err[1000];							\

+   sprintf(err, "%s %s", msg1, msg2);				\

+   record_error(parseState, err, __LINE__);				\

+   return GL_FALSE;							\

+} while(0)

+

+

+

+

+

+static GLboolean IsLetter(GLubyte b)

+{

+   return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z');

+}

+

+

+static GLboolean IsDigit(GLubyte b)

+{

+   return b >= '0' && b <= '9';

+}

+

+

+static GLboolean IsWhitespace(GLubyte b)

+{

+   return b == ' ' || b == '\t' || b == '\n' || b == '\r';

+}

+

+

+/**

+ * Starting at 'str' find the next token.  A token can be an integer,

+ * an identifier or punctuation symbol.

+ * \return <= 0 we found an error, else, return number of characters parsed.

+ */

+static GLint

+GetToken(struct parse_state *parseState, GLubyte *token)

+{

+   const GLubyte *str = parseState->pos;

+   GLint i = 0, j = 0;

+

+   token[0] = 0;

+

+   /* skip whitespace and comments */

+   while (str[i] && (IsWhitespace(str[i]) || str[i] == '#')) {

+      if (str[i] == '#') {

+         /* skip comment */

+         while (str[i] && (str[i] != '\n' && str[i] != '\r')) {

+            i++;

+         }

+         if (str[i] == '\n' || str[i] == '\r')

+            parseState->curLine = str + i + 1;

+      }

+      else {

+         /* skip whitespace */

+         if (str[i] == '\n' || str[i] == '\r')

+            parseState->curLine = str + i + 1;

+         i++;

+      }

+   }

+

+   if (str[i] == 0)

+      return -i;

+

+   /* try matching an integer */

+   while (str[i] && IsDigit(str[i])) {

+      token[j++] = str[i++];

+   }

+   if (j > 0 || !str[i]) {

+      token[j] = 0;

+      return i;

+   }

+

+   /* try matching an identifier */

+   if (IsLetter(str[i])) {

+      while (str[i] && (IsLetter(str[i]) || IsDigit(str[i]))) {

+         token[j++] = str[i++];

+      }

+      token[j] = 0;

+      return i;

+   }

+

+   /* punctuation character */

+   if (str[i]) {

+      token[0] = str[i++];

+      token[1] = 0;

+      return i;

+   }

+

+   /* end of input */

+   token[0] = 0;

+   return i;

+}

+

+

+/**

+ * Get next token from input stream and increment stream pointer past token.

+ */

+static GLboolean

+Parse_Token(struct parse_state *parseState, GLubyte *token)

+{

+   GLint i;

+   i = GetToken(parseState, token);

+   if (i <= 0) {

+      parseState->pos += (-i);

+      return GL_FALSE;

+   }

+   parseState->pos += i;

+   return GL_TRUE;

+}

+

+

+/**

+ * Get next token from input stream but don't increment stream pointer.

+ */

+static GLboolean

+Peek_Token(struct parse_state *parseState, GLubyte *token)

+{

+   GLint i, len;

+   i = GetToken(parseState, token);

+   if (i <= 0) {

+      parseState->pos += (-i);

+      return GL_FALSE;

+   }

+   len = (GLint) strlen((const char *) token);

+   parseState->pos += (i - len);

+   return GL_TRUE;

+}

+

+

+/**

+ * Try to match 'pattern' as the next token after any whitespace/comments.

+ * Advance the current parsing position only if we match the pattern.

+ * \return GL_TRUE if pattern is matched, GL_FALSE otherwise.

+ */

+static GLboolean

+Parse_String(struct parse_state *parseState, const char *pattern)

+{

+   const GLubyte *m;

+   GLint i;

+

+   /* skip whitespace and comments */

+   while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {

+      if (*parseState->pos == '#') {

+         while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {

+            parseState->pos += 1;

+         }

+         if (*parseState->pos == '\n' || *parseState->pos == '\r')

+            parseState->curLine = parseState->pos + 1;

+      }

+      else {

+         /* skip whitespace */

+         if (*parseState->pos == '\n' || *parseState->pos == '\r')

+            parseState->curLine = parseState->pos + 1;

+         parseState->pos += 1;

+      }

+   }

+

+   /* Try to match the pattern */

+   m = parseState->pos;

+   for (i = 0; pattern[i]; i++) {

+      if (*m != (GLubyte) pattern[i])

+         return GL_FALSE;

+      m += 1;

+   }

+   parseState->pos = m;

+

+   return GL_TRUE; /* success */

+}

+

+

+/**********************************************************************/

+

+static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = {

+   "OPOS", "WGHT", "NRML", "COL0", "COL1", "FOGC", "6", "7",

+   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL

+};

+

+static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = {

+   "HPOS", "COL0", "COL1", "FOGC", 

+   "TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", 

+   "PSIZ", "BFC0", "BFC1", NULL

+};

+

+

+

+/**

+ * Parse a temporary register: Rnn

+ */

+static GLboolean

+Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)

+{

+   GLubyte token[100];

+

+   /* Should be 'R##' */

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+   if (token[0] != 'R')

+      RETURN_ERROR1("Expected R##");

+

+   if (IsDigit(token[1])) {

+      GLint reg = atoi((char *) (token + 1));

+      if (reg >= MAX_NV_VERTEX_PROGRAM_TEMPS)

+         RETURN_ERROR1("Bad temporary register name");

+      *tempRegNum = reg;

+   }

+   else {

+      RETURN_ERROR1("Bad temporary register name");

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse address register "A0.x"

+ */

+static GLboolean

+Parse_AddrReg(struct parse_state *parseState)

+{

+   /* match 'A0' */

+   if (!Parse_String(parseState, "A0"))

+      RETURN_ERROR;

+

+   /* match '.' */

+   if (!Parse_String(parseState, "."))

+      RETURN_ERROR;

+

+   /* match 'x' */

+   if (!Parse_String(parseState, "x"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse absolute program parameter register "c[##]"

+ */

+static GLboolean

+Parse_AbsParamReg(struct parse_state *parseState, GLint *regNum)

+{

+   GLubyte token[100];

+

+   if (!Parse_String(parseState, "c"))

+      RETURN_ERROR;

+

+   if (!Parse_String(parseState, "["))

+      RETURN_ERROR;

+

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (IsDigit(token[0])) {

+      /* a numbered program parameter register */

+      GLint reg = atoi((char *) token);

+      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)

+         RETURN_ERROR1("Bad program parameter number");

+      *regNum = reg;

+   }

+   else {

+      RETURN_ERROR;

+   }

+

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)

+{

+   GLubyte token[100];

+

+   if (!Parse_String(parseState, "c"))

+      RETURN_ERROR;

+

+   if (!Parse_String(parseState, "["))

+      RETURN_ERROR;

+

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (IsDigit(token[0])) {

+      /* a numbered program parameter register */

+      GLint reg;

+      (void) Parse_Token(parseState, token);

+      reg = atoi((char *) token);

+      if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)

+         RETURN_ERROR1("Bad program parameter number");

+      srcReg->File = PROGRAM_ENV_PARAM;

+      srcReg->Index = reg;

+   }

+   else if (strcmp((const char *) token, "A0") == 0) {

+      /* address register "A0.x" */

+      if (!Parse_AddrReg(parseState))

+         RETURN_ERROR;

+

+      srcReg->RelAddr = GL_TRUE;

+      srcReg->File = PROGRAM_ENV_PARAM;

+      parseState->indirectRegisterFiles |= (1 << srcReg->File);

+      /* Look for +/-N offset */

+      if (!Peek_Token(parseState, token))

+         RETURN_ERROR;

+

+      if (token[0] == '-' || token[0] == '+') {

+         const GLubyte sign = token[0];

+         (void) Parse_Token(parseState, token); /* consume +/- */

+

+         /* an integer should be next */

+         if (!Parse_Token(parseState, token))

+            RETURN_ERROR;

+

+         if (IsDigit(token[0])) {

+            const GLint k = atoi((char *) token);

+            if (sign == '-') {

+               if (k > 64)

+                  RETURN_ERROR1("Bad address offset");

+               srcReg->Index = -k;

+            }

+            else {

+               if (k > 63)

+                  RETURN_ERROR1("Bad address offset");

+               srcReg->Index = k;

+            }

+         }

+         else {

+            RETURN_ERROR;

+         }

+      }

+      else {

+         /* probably got a ']', catch it below */

+      }

+   }

+   else {

+      RETURN_ERROR;

+   }

+

+   /* Match closing ']' */

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Parse v[#] or v[<name>]

+ */

+static GLboolean

+Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)

+{

+   GLubyte token[100];

+   GLint j;

+

+   /* Match 'v' */

+   if (!Parse_String(parseState, "v"))

+      RETURN_ERROR;

+

+   /* Match '[' */

+   if (!Parse_String(parseState, "["))

+      RETURN_ERROR;

+

+   /* match number or named register */

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (parseState->isStateProgram && token[0] != '0')

+      RETURN_ERROR1("Only v[0] accessible in vertex state programs");

+

+   if (IsDigit(token[0])) {

+      GLint reg = atoi((char *) token);

+      if (reg >= MAX_NV_VERTEX_PROGRAM_INPUTS)

+         RETURN_ERROR1("Bad vertex attribute register name");

+      *tempRegNum = reg;

+   }

+   else {

+      for (j = 0; InputRegisters[j]; j++) {

+         if (strcmp((const char *) token, InputRegisters[j]) == 0) {

+            *tempRegNum = j;

+            break;

+         }

+      }

+      if (!InputRegisters[j]) {

+         /* unknown input register label */

+         RETURN_ERROR2("Bad register name", token);

+      }

+   }

+

+   /* Match '[' */

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)

+{

+   GLubyte token[100];

+   GLint start, j;

+

+   /* Match 'o' */

+   if (!Parse_String(parseState, "o"))

+      RETURN_ERROR;

+

+   /* Match '[' */

+   if (!Parse_String(parseState, "["))

+      RETURN_ERROR;

+

+   /* Get output reg name */

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (parseState->isPositionInvariant)

+      start = 1; /* skip HPOS register name */

+   else

+      start = 0;

+

+   /* try to match an output register name */

+   for (j = start; OutputRegisters[j]; j++) {

+      if (strcmp((const char *) token, OutputRegisters[j]) == 0) {

+         *outputRegNum = j;

+         break;

+      }

+   }

+   if (!OutputRegisters[j])

+      RETURN_ERROR1("Unrecognized output register name");

+

+   /* Match ']' */

+   if (!Parse_String(parseState, "]"))

+      RETURN_ERROR1("Expected ]");

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_MaskedDstReg(struct parse_state *parseState, struct prog_dst_register *dstReg)

+{

+   GLubyte token[100];

+   GLint idx;

+

+   /* Dst reg can be R<n> or o[n] */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (token[0] == 'R') {

+      /* a temporary register */

+      dstReg->File = PROGRAM_TEMPORARY;

+      if (!Parse_TempReg(parseState, &idx))

+         RETURN_ERROR;

+      dstReg->Index = idx;

+   }

+   else if (!parseState->isStateProgram && token[0] == 'o') {

+      /* an output register */

+      dstReg->File = PROGRAM_OUTPUT;

+      if (!Parse_OutputReg(parseState, &idx))

+         RETURN_ERROR;

+      dstReg->Index = idx;

+   }

+   else if (parseState->isStateProgram && token[0] == 'c' &&

+            parseState->isStateProgram) {

+      /* absolute program parameter register */

+      /* Only valid for vertex state programs */

+      dstReg->File = PROGRAM_ENV_PARAM;

+      if (!Parse_AbsParamReg(parseState, &idx))

+         RETURN_ERROR;

+      dstReg->Index = idx;

+   }

+   else {

+      RETURN_ERROR1("Bad destination register name");

+   }

+

+   /* Parse optional write mask */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (token[0] == '.') {

+      /* got a mask */

+      GLint k = 0;

+

+      if (!Parse_String(parseState, "."))

+         RETURN_ERROR;

+

+      if (!Parse_Token(parseState, token))

+         RETURN_ERROR;

+

+      dstReg->WriteMask = 0;

+

+      if (token[k] == 'x') {

+         dstReg->WriteMask |= WRITEMASK_X;

+         k++;

+      }

+      if (token[k] == 'y') {

+         dstReg->WriteMask |= WRITEMASK_Y;

+         k++;

+      }

+      if (token[k] == 'z') {

+         dstReg->WriteMask |= WRITEMASK_Z;

+         k++;

+      }

+      if (token[k] == 'w') {

+         dstReg->WriteMask |= WRITEMASK_W;

+         k++;

+      }

+      if (k == 0) {

+         RETURN_ERROR1("Bad writemask character");

+      }

+      return GL_TRUE;

+   }

+   else {

+      dstReg->WriteMask = WRITEMASK_XYZW;

+      return GL_TRUE;

+   }

+}

+

+

+static GLboolean

+Parse_SwizzleSrcReg(struct parse_state *parseState, struct prog_src_register *srcReg)

+{

+   GLubyte token[100];

+   GLint idx;

+

+   srcReg->RelAddr = GL_FALSE;

+

+   /* check for '-' */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+   if (token[0] == '-') {

+      (void) Parse_String(parseState, "-");

+      srcReg->Negate = NEGATE_XYZW;

+      if (!Peek_Token(parseState, token))

+         RETURN_ERROR;

+   }

+   else {

+      srcReg->Negate = NEGATE_NONE;

+   }

+

+   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */

+   if (token[0] == 'R') {

+      srcReg->File = PROGRAM_TEMPORARY;

+      if (!Parse_TempReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (token[0] == 'c') {

+      if (!Parse_ParamReg(parseState, srcReg))

+         RETURN_ERROR;

+   }

+   else if (token[0] == 'v') {

+      srcReg->File = PROGRAM_INPUT;

+      if (!Parse_AttribReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else {

+      RETURN_ERROR2("Bad source register name", token);

+   }

+

+   /* init swizzle fields */

+   srcReg->Swizzle = SWIZZLE_NOOP;

+

+   /* Look for optional swizzle suffix */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+   if (token[0] == '.') {

+      (void) Parse_String(parseState, ".");  /* consume . */

+

+      if (!Parse_Token(parseState, token))

+         RETURN_ERROR;

+

+      if (token[1] == 0) {

+         /* single letter swizzle */

+         if (token[0] == 'x')

+            srcReg->Swizzle = SWIZZLE_XXXX;

+         else if (token[0] == 'y')

+            srcReg->Swizzle = SWIZZLE_YYYY;

+         else if (token[0] == 'z')

+            srcReg->Swizzle = SWIZZLE_ZZZZ;

+         else if (token[0] == 'w')

+            srcReg->Swizzle = SWIZZLE_WWWW;

+         else

+            RETURN_ERROR1("Expected x, y, z, or w");

+      }

+      else {

+         /* 2, 3 or 4-component swizzle */

+         GLint k;

+

+         srcReg->Swizzle = 0;

+

+         for (k = 0; token[k] && k < 5; k++) {

+            if (token[k] == 'x')

+               srcReg->Swizzle |= 0 << (k*3);

+            else if (token[k] == 'y')

+               srcReg->Swizzle |= 1 << (k*3);

+            else if (token[k] == 'z')

+               srcReg->Swizzle |= 2 << (k*3);

+            else if (token[k] == 'w')

+               srcReg->Swizzle |= 3 << (k*3);

+            else

+               RETURN_ERROR;

+         }

+         if (k >= 5)

+            RETURN_ERROR;

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_ScalarSrcReg(struct parse_state *parseState, struct prog_src_register *srcReg)

+{

+   GLubyte token[100];

+   GLint idx;

+

+   srcReg->RelAddr = GL_FALSE;

+

+   /* check for '-' */

+   if (!Peek_Token(parseState, token))

+      RETURN_ERROR;

+   if (token[0] == '-') {

+      srcReg->Negate = NEGATE_XYZW;

+      (void) Parse_String(parseState, "-"); /* consume '-' */

+      if (!Peek_Token(parseState, token))

+         RETURN_ERROR;

+   }

+   else {

+      srcReg->Negate = NEGATE_NONE;

+   }

+

+   /* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */

+   if (token[0] == 'R') {

+      srcReg->File = PROGRAM_TEMPORARY;

+      if (!Parse_TempReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else if (token[0] == 'c') {

+      if (!Parse_ParamReg(parseState, srcReg))

+         RETURN_ERROR;

+   }

+   else if (token[0] == 'v') {

+      srcReg->File = PROGRAM_INPUT;

+      if (!Parse_AttribReg(parseState, &idx))

+         RETURN_ERROR;

+      srcReg->Index = idx;

+   }

+   else {

+      RETURN_ERROR2("Bad source register name", token);

+   }

+

+   /* Look for .[xyzw] suffix */

+   if (!Parse_String(parseState, "."))

+      RETURN_ERROR;

+

+   if (!Parse_Token(parseState, token))

+      RETURN_ERROR;

+

+   if (token[0] == 'x' && token[1] == 0) {

+      srcReg->Swizzle = 0;

+   }

+   else if (token[0] == 'y' && token[1] == 0) {

+      srcReg->Swizzle = 1;

+   }

+   else if (token[0] == 'z' && token[1] == 0) {

+      srcReg->Swizzle = 2;

+   }

+   else if (token[0] == 'w' && token[1] == 0) {

+      srcReg->Swizzle = 3;

+   }

+   else {

+      RETURN_ERROR1("Bad scalar source suffix");

+   }

+

+   return GL_TRUE;

+}

+

+

+static GLint

+Parse_UnaryOpInstruction(struct parse_state *parseState,

+                         struct prog_instruction *inst,

+                         enum prog_opcode opcode)

+{

+   if (opcode == OPCODE_ABS && !parseState->isVersion1_1)

+      RETURN_ERROR1("ABS illegal for vertex program 1.0");

+

+   inst->Opcode = opcode;

+

+   /* dest reg */

+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* src arg */

+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))

+      RETURN_ERROR;

+

+   /* semicolon */

+   if (!Parse_String(parseState, ";"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_BiOpInstruction(struct parse_state *parseState,

+                      struct prog_instruction *inst,

+                      enum prog_opcode opcode)

+{

+   if (opcode == OPCODE_DPH && !parseState->isVersion1_1)

+      RETURN_ERROR1("DPH illegal for vertex program 1.0");

+   if (opcode == OPCODE_SUB && !parseState->isVersion1_1)

+      RETURN_ERROR1("SUB illegal for vertex program 1.0");

+

+   inst->Opcode = opcode;

+

+   /* dest reg */

+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* first src arg */

+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* second src arg */

+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))

+      RETURN_ERROR;

+

+   /* semicolon */

+   if (!Parse_String(parseState, ";"))

+      RETURN_ERROR;

+

+   /* make sure we don't reference more than one program parameter register */

+   if (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&

+       inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&

+       inst->SrcReg[0].Index != inst->SrcReg[1].Index)

+      RETURN_ERROR1("Can't reference two program parameter registers");

+

+   /* make sure we don't reference more than one vertex attribute register */

+   if (inst->SrcReg[0].File == PROGRAM_INPUT &&

+       inst->SrcReg[1].File == PROGRAM_INPUT &&

+       inst->SrcReg[0].Index != inst->SrcReg[1].Index)

+      RETURN_ERROR1("Can't reference two vertex attribute registers");

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_TriOpInstruction(struct parse_state *parseState,

+                       struct prog_instruction *inst,

+                       enum prog_opcode opcode)

+{

+   inst->Opcode = opcode;

+

+   /* dest reg */

+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* first src arg */

+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* second src arg */

+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* third src arg */

+   if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[2]))

+      RETURN_ERROR;

+

+   /* semicolon */

+   if (!Parse_String(parseState, ";"))

+      RETURN_ERROR;

+

+   /* make sure we don't reference more than one program parameter register */

+   if ((inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&

+        inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&

+        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||

+       (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&

+        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&

+        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||

+       (inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&

+        inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&

+        inst->SrcReg[1].Index != inst->SrcReg[2].Index))

+      RETURN_ERROR1("Can only reference one program register");

+

+   /* make sure we don't reference more than one vertex attribute register */

+   if ((inst->SrcReg[0].File == PROGRAM_INPUT &&

+        inst->SrcReg[1].File == PROGRAM_INPUT &&

+        inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||

+       (inst->SrcReg[0].File == PROGRAM_INPUT &&

+        inst->SrcReg[2].File == PROGRAM_INPUT &&

+        inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||

+       (inst->SrcReg[1].File == PROGRAM_INPUT &&

+        inst->SrcReg[2].File == PROGRAM_INPUT &&

+        inst->SrcReg[1].Index != inst->SrcReg[2].Index))

+      RETURN_ERROR1("Can only reference one input register");

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_ScalarInstruction(struct parse_state *parseState,

+                        struct prog_instruction *inst,

+                        enum prog_opcode opcode)

+{

+   if (opcode == OPCODE_RCC && !parseState->isVersion1_1)

+      RETURN_ERROR1("RCC illegal for vertex program 1.0");

+

+   inst->Opcode = opcode;

+

+   /* dest reg */

+   if (!Parse_MaskedDstReg(parseState, &inst->DstReg))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* first src arg */

+   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))

+      RETURN_ERROR;

+

+   /* semicolon */

+   if (!Parse_String(parseState, ";"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_AddressInstruction(struct parse_state *parseState, struct prog_instruction *inst)

+{

+   inst->Opcode = OPCODE_ARL;

+

+   /* Make ARB_vp backends happy */

+   inst->DstReg.File = PROGRAM_ADDRESS;

+   inst->DstReg.WriteMask = WRITEMASK_X;

+   inst->DstReg.Index = 0;

+

+   /* dest A0 reg */

+   if (!Parse_AddrReg(parseState))

+      RETURN_ERROR;

+

+   /* comma */

+   if (!Parse_String(parseState, ","))

+      RETURN_ERROR;

+

+   /* parse src reg */

+   if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))

+      RETURN_ERROR;

+

+   /* semicolon */

+   if (!Parse_String(parseState, ";"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_EndInstruction(struct parse_state *parseState, struct prog_instruction *inst)

+{

+   GLubyte token[100];

+

+   inst->Opcode = OPCODE_END;

+

+   /* this should fail! */

+   if (Parse_Token(parseState, token))

+      RETURN_ERROR2("Unexpected token after END:", token);

+   else

+      return GL_TRUE;

+}

+

+

+/**

+ * The PRINT instruction is Mesa-specific and is meant as a debugging aid for

+ * the vertex program developer.

+ * The NV_vertex_program extension grammar is modified as follows:

+ *

+ *  <instruction>        ::= <ARL-instruction>

+ *                         | ...

+ *                         | <PRINT-instruction>

+ *

+ *  <PRINT-instruction>  ::= "PRINT" <string literal>

+ *                         | "PRINT" <string literal> "," <srcReg>

+ *                         | "PRINT" <string literal> "," <dstReg>

+ */

+static GLboolean

+Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *inst)

+{

+   const GLubyte *str;

+   GLubyte *msg;

+   GLuint len;

+   GLubyte token[100];

+   struct prog_src_register *srcReg = &inst->SrcReg[0];

+   GLint idx;

+

+   inst->Opcode = OPCODE_PRINT;

+

+   /* The first argument is a literal string 'just like this' */

+   if (!Parse_String(parseState, "'"))

+      RETURN_ERROR;

+

+   str = parseState->pos;

+   for (len = 0; str[len] != '\''; len++) /* find closing quote */

+      ;

+   parseState->pos += len + 1;

+   msg = (GLubyte*) malloc(len + 1);

+

+   memcpy(msg, str, len);

+   msg[len] = 0;

+   inst->Data = msg;

+

+   /* comma */

+   if (Parse_String(parseState, ",")) {

+

+      /* The second argument is a register name */

+      if (!Peek_Token(parseState, token))

+         RETURN_ERROR;

+

+      srcReg->RelAddr = GL_FALSE;

+      srcReg->Negate = NEGATE_NONE;

+      srcReg->Swizzle = SWIZZLE_NOOP;

+

+      /* Register can be R<n>, c[n], c[n +/- offset], a named vertex attrib,

+       * or an o[n] output register.

+       */

+      if (token[0] == 'R') {

+         srcReg->File = PROGRAM_TEMPORARY;

+         if (!Parse_TempReg(parseState, &idx))

+            RETURN_ERROR;

+	 srcReg->Index = idx;

+      }

+      else if (token[0] == 'c') {

+         srcReg->File = PROGRAM_ENV_PARAM;

+         if (!Parse_ParamReg(parseState, srcReg))

+            RETURN_ERROR;

+      }

+      else if (token[0] == 'v') {

+         srcReg->File = PROGRAM_INPUT;

+         if (!Parse_AttribReg(parseState, &idx))

+            RETURN_ERROR;

+	 srcReg->Index = idx;

+      }

+      else if (token[0] == 'o') {

+         srcReg->File = PROGRAM_OUTPUT;

+         if (!Parse_OutputReg(parseState, &idx))

+            RETURN_ERROR;

+	 srcReg->Index = idx;

+      }

+      else {

+         RETURN_ERROR2("Bad source register name", token);

+      }

+   }

+   else {

+      srcReg->File = PROGRAM_UNDEFINED;

+   }

+

+   /* semicolon */

+   if (!Parse_String(parseState, ";"))

+      RETURN_ERROR;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+Parse_OptionSequence(struct parse_state *parseState,

+                     struct prog_instruction program[])

+{

+   (void) program;

+   while (1) {

+      if (!Parse_String(parseState, "OPTION"))

+         return GL_TRUE;  /* ok, not an OPTION statement */

+      if (Parse_String(parseState, "NV_position_invariant")) {

+         parseState->isPositionInvariant = GL_TRUE;

+      }

+      else {

+         RETURN_ERROR1("unexpected OPTION statement");

+      }

+      if (!Parse_String(parseState, ";"))

+         return GL_FALSE;

+   }

+}

+

+

+static GLboolean

+Parse_InstructionSequence(struct parse_state *parseState,

+                          struct prog_instruction program[])

+{

+   while (1) {

+      struct prog_instruction *inst = program + parseState->numInst;

+

+      /* Initialize the instruction */

+      _mesa_init_instructions(inst, 1);

+

+      if (Parse_String(parseState, "MOV")) {

+         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_MOV))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "LIT")) {

+         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_LIT))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "ABS")) {

+         if (!Parse_UnaryOpInstruction(parseState, inst, OPCODE_ABS))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "MUL")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MUL))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "ADD")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_ADD))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "DP3")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DP3))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "DP4")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DP4))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "DST")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DST))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "MIN")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MIN))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "MAX")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_MAX))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "SLT")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SLT))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "SGE")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SGE))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "DPH")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_DPH))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "SUB")) {

+         if (!Parse_BiOpInstruction(parseState, inst, OPCODE_SUB))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "MAD")) {

+         if (!Parse_TriOpInstruction(parseState, inst, OPCODE_MAD))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "RCP")) {

+         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RCP))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "RSQ")) {

+         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RSQ))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "EXP")) {

+         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_EXP))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "LOG")) {

+         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_LOG))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "RCC")) {

+         if (!Parse_ScalarInstruction(parseState, inst, OPCODE_RCC))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "ARL")) {

+         if (!Parse_AddressInstruction(parseState, inst))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "PRINT")) {

+         if (!Parse_PrintInstruction(parseState, inst))

+            RETURN_ERROR;

+      }

+      else if (Parse_String(parseState, "END")) {

+         if (!Parse_EndInstruction(parseState, inst))

+            RETURN_ERROR;

+         else {

+            parseState->numInst++;

+            return GL_TRUE;  /* all done */

+         }

+      }

+      else {

+         /* bad instruction name */

+         RETURN_ERROR1("Unexpected token");

+      }

+

+      /* examine input/output registers */

+      if (inst->DstReg.File == PROGRAM_OUTPUT)

+         parseState->outputsWritten |= (1 << inst->DstReg.Index);

+      else if (inst->DstReg.File == PROGRAM_ENV_PARAM)

+         parseState->anyProgRegsWritten = GL_TRUE;

+

+      if (inst->SrcReg[0].File == PROGRAM_INPUT)

+         parseState->inputsRead |= (1 << inst->SrcReg[0].Index);

+      if (inst->SrcReg[1].File == PROGRAM_INPUT)

+         parseState->inputsRead |= (1 << inst->SrcReg[1].Index);

+      if (inst->SrcReg[2].File == PROGRAM_INPUT)

+         parseState->inputsRead |= (1 << inst->SrcReg[2].Index);

+

+      parseState->numInst++;

+

+      if (parseState->numInst >= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS)

+         RETURN_ERROR1("Program too long");

+   }

+

+   RETURN_ERROR;

+}

+

+

+static GLboolean

+Parse_Program(struct parse_state *parseState,

+              struct prog_instruction instBuffer[])

+{

+   if (parseState->isVersion1_1) {

+      if (!Parse_OptionSequence(parseState, instBuffer)) {

+         return GL_FALSE;

+      }

+   }

+   return Parse_InstructionSequence(parseState, instBuffer);

+}

+

+

+/**

+ * Parse/compile the 'str' returning the compiled 'program'.

+ * ctx->Program.ErrorPos will be -1 if successful.  Otherwise, ErrorPos

+ * indicates the position of the error in 'str'.

+ */

+void

+_mesa_parse_nv_vertex_program(struct gl_context *ctx, GLenum dstTarget,

+                              const GLubyte *str, GLsizei len,

+                              struct gl_vertex_program *program)

+{

+   struct parse_state parseState;

+   struct prog_instruction instBuffer[MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS];

+   struct prog_instruction *newInst;

+   GLenum target;

+   GLubyte *programString;

+

+   /* Make a null-terminated copy of the program string */

+   programString = (GLubyte *) MALLOC(len + 1);

+   if (!programString) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+      return;

+   }

+   memcpy(programString, str, len);

+   programString[len] = 0;

+

+   /* Get ready to parse */

+   parseState.ctx = ctx;

+   parseState.start = programString;

+   parseState.isPositionInvariant = GL_FALSE;

+   parseState.isVersion1_1 = GL_FALSE;

+   parseState.numInst = 0;

+   parseState.inputsRead = 0;

+   parseState.outputsWritten = 0;

+   parseState.anyProgRegsWritten = GL_FALSE;

+   parseState.indirectRegisterFiles = 0x0;

+

+   /* Reset error state */

+   _mesa_set_program_error(ctx, -1, NULL);

+

+   /* check the program header */

+   if (strncmp((const char *) programString, "!!VP1.0", 7) == 0) {

+      target = GL_VERTEX_PROGRAM_NV;

+      parseState.pos = programString + 7;

+      parseState.isStateProgram = GL_FALSE;

+   }

+   else if (strncmp((const char *) programString, "!!VP1.1", 7) == 0) {

+      target = GL_VERTEX_PROGRAM_NV;

+      parseState.pos = programString + 7;

+      parseState.isStateProgram = GL_FALSE;

+      parseState.isVersion1_1 = GL_TRUE;

+   }

+   else if (strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {

+      target = GL_VERTEX_STATE_PROGRAM_NV;

+      parseState.pos = programString + 8;

+      parseState.isStateProgram = GL_TRUE;

+   }

+   else {

+      /* invalid header */

+      ctx->Program.ErrorPos = 0;

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");

+      return;

+   }

+

+   /* make sure target and header match */

+   if (target != dstTarget) {

+      _mesa_error(ctx, GL_INVALID_OPERATION,

+                  "glLoadProgramNV(target mismatch)");

+      return;

+   }

+

+

+   if (Parse_Program(&parseState, instBuffer)) {

+      gl_state_index state_tokens[STATE_LENGTH] = {0, 0, 0, 0, 0};

+      int i;

+

+      /* successful parse! */

+

+      if (parseState.isStateProgram) {

+         if (!parseState.anyProgRegsWritten) {

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glLoadProgramNV(c[#] not written)");

+            return;

+         }

+      }

+      else {

+         if (!parseState.isPositionInvariant &&

+             !(parseState.outputsWritten & (1 << VERT_RESULT_HPOS))) {

+            /* bit 1 = HPOS register */

+            _mesa_error(ctx, GL_INVALID_OPERATION,

+                        "glLoadProgramNV(HPOS not written)");

+            return;

+         }

+      }

+

+      /* copy the compiled instructions */

+      assert(parseState.numInst <= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS);

+      newInst = _mesa_alloc_instructions(parseState.numInst);

+      if (!newInst) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");

+         free(programString);

+         return;  /* out of memory */

+      }

+      _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);

+

+      /* install the program */

+      program->Base.Target = target;

+      if (program->Base.String) {

+         free(program->Base.String);

+      }

+      program->Base.String = programString;

+      program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;

+      if (program->Base.Instructions) {

+         free(program->Base.Instructions);

+      }

+      program->Base.Instructions = newInst;

+      program->Base.InputsRead = parseState.inputsRead;

+      if (parseState.isPositionInvariant)

+         program->Base.InputsRead |= VERT_BIT_POS;

+      program->Base.NumInstructions = parseState.numInst;

+      program->Base.OutputsWritten = parseState.outputsWritten;

+      program->IsPositionInvariant = parseState.isPositionInvariant;

+      program->IsNVProgram = GL_TRUE;

+

+#ifdef DEBUG_foo

+      printf("--- glLoadProgramNV result ---\n");

+      _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);

+      printf("------------------------------\n");

+#endif

+

+      if (program->Base.Parameters)

+	 _mesa_free_parameter_list(program->Base.Parameters);

+

+      program->Base.Parameters = _mesa_new_parameter_list ();

+      program->Base.NumParameters = 0;

+

+      program->Base.IndirectRegisterFiles = parseState.indirectRegisterFiles;

+

+      state_tokens[0] = STATE_VERTEX_PROGRAM;

+      state_tokens[1] = STATE_ENV;

+      /* Add refs to all of the potential params, in order.  If we want to not

+       * upload everything, _mesa_layout_parameters is the answer.

+       */

+      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS; i++) {

+	 GLint index;

+	 state_tokens[2] = i;

+	 index = _mesa_add_state_reference(program->Base.Parameters,

+					   state_tokens);

+	 assert(index == i);

+      }

+      program->Base.NumParameters = program->Base.Parameters->NumParameters;

+

+      _mesa_setup_nv_temporary_count(ctx, &program->Base);

+      _mesa_emit_nv_temp_initialization(ctx, &program->Base);

+   }

+   else {

+      /* Error! */

+      _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");

+      /* NOTE: _mesa_set_program_error would have been called already */

+      /* GL_NV_vertex_program isn't supposed to set the error string

+       * so we reset it here.

+       */

+      _mesa_set_program_error(ctx, ctx->Program.ErrorPos, NULL);

+   }

+}

+

+

+const char *

+_mesa_nv_vertex_input_register_name(GLuint i)

+{

+   ASSERT(i < MAX_NV_VERTEX_PROGRAM_INPUTS);

+   return InputRegisters[i];

+}

+

+

+const char *

+_mesa_nv_vertex_output_register_name(GLuint i)

+{

+   ASSERT(i < MAX_NV_VERTEX_PROGRAM_OUTPUTS);

+   return OutputRegisters[i];

+}

+

diff --git a/mesalib/src/mesa/program/nvvertparse.h b/mesalib/src/mesa/program/nvvertparse.h
index 91ef79e6c..bee6dea3c 100644
--- a/mesalib/src/mesa/program/nvvertparse.h
+++ b/mesalib/src/mesa/program/nvvertparse.h
@@ -1,46 +1,49 @@
-/*
- * 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.
- *
- * Authors:
- *    Brian Paul
- */
-
-
-#ifndef NVVERTPARSE_H
-#define NVVERTPARSE_H
-
-#include "main/mtypes.h"
-
-extern void
-_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum target,
-                              const GLubyte *str, GLsizei len,
-                              struct gl_vertex_program *program);
-
-
-extern const char *
-_mesa_nv_vertex_input_register_name(GLuint i);
-
-extern const char *
-_mesa_nv_vertex_output_register_name(GLuint i);
-
-#endif
+/*

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

+ *

+ * Authors:

+ *    Brian Paul

+ */

+

+

+#ifndef NVVERTPARSE_H

+#define NVVERTPARSE_H

+

+#include "main/glheader.h"

+

+struct gl_context;

+struct gl_vertex_program;

+

+extern void

+_mesa_parse_nv_vertex_program(struct gl_context *ctx, GLenum target,

+                              const GLubyte *str, GLsizei len,

+                              struct gl_vertex_program *program);

+

+

+extern const char *

+_mesa_nv_vertex_input_register_name(GLuint i);

+

+extern const char *

+_mesa_nv_vertex_output_register_name(GLuint i);

+

+#endif

diff --git a/mesalib/src/mesa/program/prog_cache.c b/mesalib/src/mesa/program/prog_cache.c
index 8af689754..93612b4a0 100644
--- a/mesalib/src/mesa/program/prog_cache.c
+++ b/mesalib/src/mesa/program/prog_cache.c
@@ -1,206 +1,206 @@
-/**************************************************************************
- * 
- * 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.
- * 
- **************************************************************************/
-
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/imports.h"
-#include "program/prog_cache.h"
-#include "program/program.h"
-
-
-struct cache_item
-{
-   GLuint hash;
-   void *key;
-   struct gl_program *program;
-   struct cache_item *next;
-};
-
-struct gl_program_cache
-{
-   struct cache_item **items;
-   struct cache_item *last;
-   GLuint size, n_items;
-};
-
-
-
-/**
- * Compute hash index from state key.
- */
-static GLuint
-hash_key(const void *key, GLuint key_size)
-{
-   const GLuint *ikey = (const GLuint *) key;
-   GLuint hash = 0, i;
-
-   assert(key_size >= 4);
-
-   /* Make a slightly better attempt at a hash function:
-    */
-   for (i = 0; i < key_size / sizeof(*ikey); i++)
-   {
-      hash += ikey[i];
-      hash += (hash << 10);
-      hash ^= (hash >> 6);
-   }
-
-   return hash;
-}
-
-
-/**
- * Rebuild/expand the hash table to accomodate more entries
- */
-static void
-rehash(struct gl_program_cache *cache)
-{
-   struct cache_item **items;
-   struct cache_item *c, *next;
-   GLuint size, i;
-
-   cache->last = NULL;
-
-   size = cache->size * 3;
-   items = (struct cache_item**) malloc(size * sizeof(*items));
-   memset(items, 0, size * sizeof(*items));
-
-   for (i = 0; i < cache->size; i++)
-      for (c = cache->items[i]; c; c = next) {
-	 next = c->next;
-	 c->next = items[c->hash % size];
-	 items[c->hash % size] = c;
-      }
-
-   free(cache->items);
-   cache->items = items;
-   cache->size = size;
-}
-
-
-static void
-clear_cache(GLcontext *ctx, struct gl_program_cache *cache)
-{
-   struct cache_item *c, *next;
-   GLuint i;
-   
-   cache->last = NULL;
-
-   for (i = 0; i < cache->size; i++) {
-      for (c = cache->items[i]; c; c = next) {
-	 next = c->next;
-	 free(c->key);
-         _mesa_reference_program(ctx, &c->program, NULL);
-	 free(c);
-      }
-      cache->items[i] = NULL;
-   }
-
-
-   cache->n_items = 0;
-}
-
-
-
-struct gl_program_cache *
-_mesa_new_program_cache(void)
-{
-   struct gl_program_cache *cache = CALLOC_STRUCT(gl_program_cache);
-   if (cache) {
-      cache->size = 17;
-      cache->items = (struct cache_item **)
-         calloc(1, cache->size * sizeof(struct cache_item));
-      if (!cache->items) {
-         free(cache);
-         return NULL;
-      }
-   }
-   return cache;
-}
-
-
-void
-_mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *cache)
-{
-   clear_cache(ctx, cache);
-   free(cache->items);
-   free(cache);
-}
-
-
-struct gl_program *
-_mesa_search_program_cache(struct gl_program_cache *cache,
-                           const void *key, GLuint keysize)
-{
-   if (cache->last && 
-       memcmp(cache->last->key, key, keysize) == 0) {
-      return cache->last->program;
-   }
-   else {
-      const GLuint hash = hash_key(key, keysize);
-      struct cache_item *c;
-
-      for (c = cache->items[hash % cache->size]; c; c = c->next) {
-         if (c->hash == hash && memcmp(c->key, key, keysize) == 0) {
-            cache->last = c;
-            return c->program;
-         }
-      }
-
-      return NULL;
-   }
-}
-
-
-void
-_mesa_program_cache_insert(GLcontext *ctx,
-                           struct gl_program_cache *cache,
-                           const void *key, GLuint keysize,
-                           struct gl_program *program)
-{
-   const GLuint hash = hash_key(key, keysize);
-   struct cache_item *c = CALLOC_STRUCT(cache_item);
-
-   c->hash = hash;
-
-   c->key = malloc(keysize);
-   memcpy(c->key, key, keysize);
-
-   c->program = program;  /* no refcount change */
-
-   if (cache->n_items > cache->size * 1.5) {
-      if (cache->size < 1000)
-	 rehash(cache);
-      else 
-	 clear_cache(ctx, cache);
-   }
-
-   cache->n_items++;
-   c->next = cache->items[hash % cache->size];
-   cache->items[hash % cache->size] = c;
-}
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "main/imports.h"

+#include "program/prog_cache.h"

+#include "program/program.h"

+

+

+struct cache_item

+{

+   GLuint hash;

+   void *key;

+   struct gl_program *program;

+   struct cache_item *next;

+};

+

+struct gl_program_cache

+{

+   struct cache_item **items;

+   struct cache_item *last;

+   GLuint size, n_items;

+};

+

+

+

+/**

+ * Compute hash index from state key.

+ */

+static GLuint

+hash_key(const void *key, GLuint key_size)

+{

+   const GLuint *ikey = (const GLuint *) key;

+   GLuint hash = 0, i;

+

+   assert(key_size >= 4);

+

+   /* Make a slightly better attempt at a hash function:

+    */

+   for (i = 0; i < key_size / sizeof(*ikey); i++)

+   {

+      hash += ikey[i];

+      hash += (hash << 10);

+      hash ^= (hash >> 6);

+   }

+

+   return hash;

+}

+

+

+/**

+ * Rebuild/expand the hash table to accomodate more entries

+ */

+static void

+rehash(struct gl_program_cache *cache)

+{

+   struct cache_item **items;

+   struct cache_item *c, *next;

+   GLuint size, i;

+

+   cache->last = NULL;

+

+   size = cache->size * 3;

+   items = (struct cache_item**) malloc(size * sizeof(*items));

+   memset(items, 0, size * sizeof(*items));

+

+   for (i = 0; i < cache->size; i++)

+      for (c = cache->items[i]; c; c = next) {

+	 next = c->next;

+	 c->next = items[c->hash % size];

+	 items[c->hash % size] = c;

+      }

+

+   free(cache->items);

+   cache->items = items;

+   cache->size = size;

+}

+

+

+static void

+clear_cache(struct gl_context *ctx, struct gl_program_cache *cache)

+{

+   struct cache_item *c, *next;

+   GLuint i;

+   

+   cache->last = NULL;

+

+   for (i = 0; i < cache->size; i++) {

+      for (c = cache->items[i]; c; c = next) {

+	 next = c->next;

+	 free(c->key);

+         _mesa_reference_program(ctx, &c->program, NULL);

+	 free(c);

+      }

+      cache->items[i] = NULL;

+   }

+

+

+   cache->n_items = 0;

+}

+

+

+

+struct gl_program_cache *

+_mesa_new_program_cache(void)

+{

+   struct gl_program_cache *cache = CALLOC_STRUCT(gl_program_cache);

+   if (cache) {

+      cache->size = 17;

+      cache->items = (struct cache_item **)

+         calloc(1, cache->size * sizeof(struct cache_item));

+      if (!cache->items) {

+         free(cache);

+         return NULL;

+      }

+   }

+   return cache;

+}

+

+

+void

+_mesa_delete_program_cache(struct gl_context *ctx, struct gl_program_cache *cache)

+{

+   clear_cache(ctx, cache);

+   free(cache->items);

+   free(cache);

+}

+

+

+struct gl_program *

+_mesa_search_program_cache(struct gl_program_cache *cache,

+                           const void *key, GLuint keysize)

+{

+   if (cache->last && 

+       memcmp(cache->last->key, key, keysize) == 0) {

+      return cache->last->program;

+   }

+   else {

+      const GLuint hash = hash_key(key, keysize);

+      struct cache_item *c;

+

+      for (c = cache->items[hash % cache->size]; c; c = c->next) {

+         if (c->hash == hash && memcmp(c->key, key, keysize) == 0) {

+            cache->last = c;

+            return c->program;

+         }

+      }

+

+      return NULL;

+   }

+}

+

+

+void

+_mesa_program_cache_insert(struct gl_context *ctx,

+                           struct gl_program_cache *cache,

+                           const void *key, GLuint keysize,

+                           struct gl_program *program)

+{

+   const GLuint hash = hash_key(key, keysize);

+   struct cache_item *c = CALLOC_STRUCT(cache_item);

+

+   c->hash = hash;

+

+   c->key = malloc(keysize);

+   memcpy(c->key, key, keysize);

+

+   c->program = program;  /* no refcount change */

+

+   if (cache->n_items > cache->size * 1.5) {

+      if (cache->size < 1000)

+	 rehash(cache);

+      else 

+	 clear_cache(ctx, cache);

+   }

+

+   cache->n_items++;

+   c->next = cache->items[hash % cache->size];

+   cache->items[hash % cache->size] = c;

+}

diff --git a/mesalib/src/mesa/program/prog_cache.h b/mesalib/src/mesa/program/prog_cache.h
index bfe8f99d4..aae2b7df2 100644
--- a/mesalib/src/mesa/program/prog_cache.h
+++ b/mesalib/src/mesa/program/prog_cache.h
@@ -1,58 +1,59 @@
-/**************************************************************************
- * 
- * 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 PROG_CACHE_H
-#define PROG_CACHE_H
-
-
-#include "main/mtypes.h"
-
-
-/** Opaque type */
-struct gl_program_cache;
-
-
-extern struct gl_program_cache *
-_mesa_new_program_cache(void);
-
-extern void
-_mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *pc);
-
-
-extern struct gl_program *
-_mesa_search_program_cache(struct gl_program_cache *cache,
-                           const void *key, GLuint keysize);
-
-extern void
-_mesa_program_cache_insert(GLcontext *ctx,
-                           struct gl_program_cache *cache,
-                           const void *key, GLuint keysize,
-                           struct gl_program *program);
-
-
-#endif /* PROG_CACHE_H */
+/**************************************************************************

+ * 

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

+#define PROG_CACHE_H

+

+

+#include "main/glheader.h"

+

+struct gl_context;

+

+/** Opaque type */

+struct gl_program_cache;

+

+

+extern struct gl_program_cache *

+_mesa_new_program_cache(void);

+

+extern void

+_mesa_delete_program_cache(struct gl_context *ctx, struct gl_program_cache *pc);

+

+

+extern struct gl_program *

+_mesa_search_program_cache(struct gl_program_cache *cache,

+                           const void *key, GLuint keysize);

+

+extern void

+_mesa_program_cache_insert(struct gl_context *ctx,

+                           struct gl_program_cache *cache,

+                           const void *key, GLuint keysize,

+                           struct gl_program *program);

+

+

+#endif /* PROG_CACHE_H */

diff --git a/mesalib/src/mesa/program/prog_execute.c b/mesalib/src/mesa/program/prog_execute.c
index 2ae5bc572..4faed2663 100644
--- a/mesalib/src/mesa/program/prog_execute.c
+++ b/mesalib/src/mesa/program/prog_execute.c
@@ -1,1879 +1,1891 @@
-/*
- * 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_execute.c
- * Software interpreter for vertex/fragment programs.
- * \author Brian Paul
- */
-
-/*
- * NOTE: we do everything in single-precision floating point; we don't
- * currently observe the single/half/fixed-precision qualifiers.
- *
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "prog_execute.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "prog_noise.h"
-
-
-/* debug predicate */
-#define DEBUG_PROG 0
-
-
-/**
- * Set x to positive or negative infinity.
- */
-#if defined(USE_IEEE) || defined(_WIN32)
-#define SET_POS_INFINITY(x)                  \
-   do {                                      \
-         fi_type fi;                         \
-         fi.i = 0x7F800000;                  \
-         x = fi.f;                           \
-   } while (0)
-#define SET_NEG_INFINITY(x)                  \
-   do {                                      \
-         fi_type fi;                         \
-         fi.i = 0xFF800000;                  \
-         x = fi.f;                           \
-   } while (0)
-#elif defined(VMS)
-#define SET_POS_INFINITY(x)  x = __MAXFLOAT
-#define SET_NEG_INFINITY(x)  x = -__MAXFLOAT
-#else
-#define SET_POS_INFINITY(x)  x = (GLfloat) HUGE_VAL
-#define SET_NEG_INFINITY(x)  x = (GLfloat) -HUGE_VAL
-#endif
-
-#define SET_FLOAT_BITS(x, bits) ((fi_type *) (void *) &(x))->i = bits
-
-
-static const GLfloat ZeroVec[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
-
-
-
-/**
- * Return TRUE for +0 and other positive values, FALSE otherwise.
- * Used for RCC opcode.
- */
-static INLINE GLboolean
-positive(float x)
-{
-   fi_type fi;
-   fi.f = x;
-   if (fi.i & 0x80000000)
-      return GL_FALSE;
-   return GL_TRUE;
-}
-
-
-
-/**
- * Return a pointer to the 4-element float vector specified by the given
- * source register.
- */
-static INLINE const GLfloat *
-get_src_register_pointer(const struct prog_src_register *source,
-                         const struct gl_program_machine *machine)
-{
-   const struct gl_program *prog = machine->CurProgram;
-   GLint reg = source->Index;
-
-   if (source->RelAddr) {
-      /* add address register value to src index/offset */
-      reg += machine->AddressReg[0][0];
-      if (reg < 0) {
-         return ZeroVec;
-      }
-   }
-
-   switch (source->File) {
-   case PROGRAM_TEMPORARY:
-      if (reg >= MAX_PROGRAM_TEMPS)
-         return ZeroVec;
-      return machine->Temporaries[reg];
-
-   case PROGRAM_INPUT:
-      if (prog->Target == GL_VERTEX_PROGRAM_ARB) {
-         if (reg >= VERT_ATTRIB_MAX)
-            return ZeroVec;
-         return machine->VertAttribs[reg];
-      }
-      else {
-         if (reg >= FRAG_ATTRIB_MAX)
-            return ZeroVec;
-         return machine->Attribs[reg][machine->CurElement];
-      }
-
-   case PROGRAM_OUTPUT:
-      if (reg >= MAX_PROGRAM_OUTPUTS)
-         return ZeroVec;
-      return machine->Outputs[reg];
-
-   case PROGRAM_LOCAL_PARAM:
-      if (reg >= MAX_PROGRAM_LOCAL_PARAMS)
-         return ZeroVec;
-      return machine->CurProgram->LocalParams[reg];
-
-   case PROGRAM_ENV_PARAM:
-      if (reg >= MAX_PROGRAM_ENV_PARAMS)
-         return ZeroVec;
-      return machine->EnvParams[reg];
-
-   case PROGRAM_STATE_VAR:
-      /* Fallthrough */
-   case PROGRAM_CONSTANT:
-      /* Fallthrough */
-   case PROGRAM_UNIFORM:
-      /* Fallthrough */
-   case PROGRAM_NAMED_PARAM:
-      if (reg >= (GLint) prog->Parameters->NumParameters)
-         return ZeroVec;
-      return prog->Parameters->ParameterValues[reg];
-
-   default:
-      _mesa_problem(NULL,
-         "Invalid src register file %d in get_src_register_pointer()",
-         source->File);
-      return NULL;
-   }
-}
-
-
-/**
- * Return a pointer to the 4-element float vector specified by the given
- * destination register.
- */
-static INLINE GLfloat *
-get_dst_register_pointer(const struct prog_dst_register *dest,
-                         struct gl_program_machine *machine)
-{
-   static GLfloat dummyReg[4];
-   GLint reg = dest->Index;
-
-   if (dest->RelAddr) {
-      /* add address register value to src index/offset */
-      reg += machine->AddressReg[0][0];
-      if (reg < 0) {
-         return dummyReg;
-      }
-   }
-
-   switch (dest->File) {
-   case PROGRAM_TEMPORARY:
-      if (reg >= MAX_PROGRAM_TEMPS)
-         return dummyReg;
-      return machine->Temporaries[reg];
-
-   case PROGRAM_OUTPUT:
-      if (reg >= MAX_PROGRAM_OUTPUTS)
-         return dummyReg;
-      return machine->Outputs[reg];
-
-   case PROGRAM_WRITE_ONLY:
-      return dummyReg;
-
-   default:
-      _mesa_problem(NULL,
-         "Invalid dest register file %d in get_dst_register_pointer()",
-         dest->File);
-      return NULL;
-   }
-}
-
-
-
-/**
- * Fetch a 4-element float vector from the given source register.
- * Apply swizzling and negating as needed.
- */
-static void
-fetch_vector4(const struct prog_src_register *source,
-              const struct gl_program_machine *machine, GLfloat result[4])
-{
-   const GLfloat *src = get_src_register_pointer(source, machine);
-   ASSERT(src);
-
-   if (source->Swizzle == SWIZZLE_NOOP) {
-      /* no swizzling */
-      COPY_4V(result, src);
-   }
-   else {
-      ASSERT(GET_SWZ(source->Swizzle, 0) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 1) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 2) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 3) <= 3);
-      result[0] = src[GET_SWZ(source->Swizzle, 0)];
-      result[1] = src[GET_SWZ(source->Swizzle, 1)];
-      result[2] = src[GET_SWZ(source->Swizzle, 2)];
-      result[3] = src[GET_SWZ(source->Swizzle, 3)];
-   }
-
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-      result[1] = FABSF(result[1]);
-      result[2] = FABSF(result[2]);
-      result[3] = FABSF(result[3]);
-   }
-   if (source->Negate) {
-      ASSERT(source->Negate == NEGATE_XYZW);
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
-
-#ifdef NAN_CHECK
-   assert(!IS_INF_OR_NAN(result[0]));
-   assert(!IS_INF_OR_NAN(result[0]));
-   assert(!IS_INF_OR_NAN(result[0]));
-   assert(!IS_INF_OR_NAN(result[0]));
-#endif
-}
-
-
-/**
- * Fetch a 4-element uint vector from the given source register.
- * Apply swizzling but not negation/abs.
- */
-static void
-fetch_vector4ui(const struct prog_src_register *source,
-                const struct gl_program_machine *machine, GLuint result[4])
-{
-   const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);
-   ASSERT(src);
-
-   if (source->Swizzle == SWIZZLE_NOOP) {
-      /* no swizzling */
-      COPY_4V(result, src);
-   }
-   else {
-      ASSERT(GET_SWZ(source->Swizzle, 0) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 1) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 2) <= 3);
-      ASSERT(GET_SWZ(source->Swizzle, 3) <= 3);
-      result[0] = src[GET_SWZ(source->Swizzle, 0)];
-      result[1] = src[GET_SWZ(source->Swizzle, 1)];
-      result[2] = src[GET_SWZ(source->Swizzle, 2)];
-      result[3] = src[GET_SWZ(source->Swizzle, 3)];
-   }
-
-   /* Note: no Negate or Abs here */
-}
-
-
-
-/**
- * Fetch the derivative with respect to X or Y for the given register.
- * XXX this currently only works for fragment program input attribs.
- */
-static void
-fetch_vector4_deriv(GLcontext * ctx,
-                    const struct prog_src_register *source,
-                    const struct gl_program_machine *machine,
-                    char xOrY, GLfloat result[4])
-{
-   if (source->File == PROGRAM_INPUT &&
-       source->Index < (GLint) machine->NumDeriv) {
-      const GLint col = machine->CurElement;
-      const GLfloat w = machine->Attribs[FRAG_ATTRIB_WPOS][col][3];
-      const GLfloat invQ = 1.0f / w;
-      GLfloat deriv[4];
-
-      if (xOrY == 'X') {
-         deriv[0] = machine->DerivX[source->Index][0] * invQ;
-         deriv[1] = machine->DerivX[source->Index][1] * invQ;
-         deriv[2] = machine->DerivX[source->Index][2] * invQ;
-         deriv[3] = machine->DerivX[source->Index][3] * invQ;
-      }
-      else {
-         deriv[0] = machine->DerivY[source->Index][0] * invQ;
-         deriv[1] = machine->DerivY[source->Index][1] * invQ;
-         deriv[2] = machine->DerivY[source->Index][2] * invQ;
-         deriv[3] = machine->DerivY[source->Index][3] * invQ;
-      }
-
-      result[0] = deriv[GET_SWZ(source->Swizzle, 0)];
-      result[1] = deriv[GET_SWZ(source->Swizzle, 1)];
-      result[2] = deriv[GET_SWZ(source->Swizzle, 2)];
-      result[3] = deriv[GET_SWZ(source->Swizzle, 3)];
-      
-      if (source->Abs) {
-         result[0] = FABSF(result[0]);
-         result[1] = FABSF(result[1]);
-         result[2] = FABSF(result[2]);
-         result[3] = FABSF(result[3]);
-      }
-      if (source->Negate) {
-         ASSERT(source->Negate == NEGATE_XYZW);
-         result[0] = -result[0];
-         result[1] = -result[1];
-         result[2] = -result[2];
-         result[3] = -result[3];
-      }
-   }
-   else {
-      ASSIGN_4V(result, 0.0, 0.0, 0.0, 0.0);
-   }
-}
-
-
-/**
- * As above, but only return result[0] element.
- */
-static void
-fetch_vector1(const struct prog_src_register *source,
-              const struct gl_program_machine *machine, GLfloat result[4])
-{
-   const GLfloat *src = get_src_register_pointer(source, machine);
-   ASSERT(src);
-
-   result[0] = src[GET_SWZ(source->Swizzle, 0)];
-
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-   }
-   if (source->Negate) {
-      result[0] = -result[0];
-   }
-}
-
-
-static GLuint
-fetch_vector1ui(const struct prog_src_register *source,
-                const struct gl_program_machine *machine)
-{
-   const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);
-   return src[GET_SWZ(source->Swizzle, 0)];
-}
-
-
-/**
- * Fetch texel from texture.  Use partial derivatives when possible.
- */
-static INLINE void
-fetch_texel(GLcontext *ctx,
-            const struct gl_program_machine *machine,
-            const struct prog_instruction *inst,
-            const GLfloat texcoord[4], GLfloat lodBias,
-            GLfloat color[4])
-{
-   const GLuint unit = machine->Samplers[inst->TexSrcUnit];
-
-   /* Note: we only have the right derivatives for fragment input attribs.
-    */
-   if (machine->NumDeriv > 0 &&
-       inst->SrcReg[0].File == PROGRAM_INPUT &&
-       inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0 + inst->TexSrcUnit) {
-      /* simple texture fetch for which we should have derivatives */
-      GLuint attr = inst->SrcReg[0].Index;
-      machine->FetchTexelDeriv(ctx, texcoord,
-                               machine->DerivX[attr],
-                               machine->DerivY[attr],
-                               lodBias, unit, color);
-   }
-   else {
-      machine->FetchTexelLod(ctx, texcoord, lodBias, unit, color);
-   }
-}
-
-
-/**
- * Test value against zero and return GT, LT, EQ or UN if NaN.
- */
-static INLINE GLuint
-generate_cc(float value)
-{
-   if (value != value)
-      return COND_UN;           /* NaN */
-   if (value > 0.0F)
-      return COND_GT;
-   if (value < 0.0F)
-      return COND_LT;
-   return COND_EQ;
-}
-
-
-/**
- * Test if the ccMaskRule is satisfied by the given condition code.
- * Used to mask destination writes according to the current condition code.
- */
-static INLINE GLboolean
-test_cc(GLuint condCode, GLuint ccMaskRule)
-{
-   switch (ccMaskRule) {
-   case COND_EQ: return (condCode == COND_EQ);
-   case COND_NE: return (condCode != COND_EQ);
-   case COND_LT: return (condCode == COND_LT);
-   case COND_GE: return (condCode == COND_GT || condCode == COND_EQ);
-   case COND_LE: return (condCode == COND_LT || condCode == COND_EQ);
-   case COND_GT: return (condCode == COND_GT);
-   case COND_TR: return GL_TRUE;
-   case COND_FL: return GL_FALSE;
-   default:      return GL_TRUE;
-   }
-}
-
-
-/**
- * Evaluate the 4 condition codes against a predicate and return GL_TRUE
- * or GL_FALSE to indicate result.
- */
-static INLINE GLboolean
-eval_condition(const struct gl_program_machine *machine,
-               const struct prog_instruction *inst)
-{
-   const GLuint swizzle = inst->DstReg.CondSwizzle;
-   const GLuint condMask = inst->DstReg.CondMask;
-   if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||
-       test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||
-       test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||
-       test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {
-      return GL_TRUE;
-   }
-   else {
-      return GL_FALSE;
-   }
-}
-
-
-
-/**
- * Store 4 floats into a register.  Observe the instructions saturate and
- * set-condition-code flags.
- */
-static void
-store_vector4(const struct prog_instruction *inst,
-              struct gl_program_machine *machine, const GLfloat value[4])
-{
-   const struct prog_dst_register *dstReg = &(inst->DstReg);
-   const GLboolean clamp = inst->SaturateMode == SATURATE_ZERO_ONE;
-   GLuint writeMask = dstReg->WriteMask;
-   GLfloat clampedValue[4];
-   GLfloat *dst = get_dst_register_pointer(dstReg, machine);
-
-#if 0
-   if (value[0] > 1.0e10 ||
-       IS_INF_OR_NAN(value[0]) ||
-       IS_INF_OR_NAN(value[1]) ||
-       IS_INF_OR_NAN(value[2]) || IS_INF_OR_NAN(value[3]))
-      printf("store %g %g %g %g\n", value[0], value[1], value[2], value[3]);
-#endif
-
-   if (clamp) {
-      clampedValue[0] = CLAMP(value[0], 0.0F, 1.0F);
-      clampedValue[1] = CLAMP(value[1], 0.0F, 1.0F);
-      clampedValue[2] = CLAMP(value[2], 0.0F, 1.0F);
-      clampedValue[3] = CLAMP(value[3], 0.0F, 1.0F);
-      value = clampedValue;
-   }
-
-   if (dstReg->CondMask != COND_TR) {
-      /* condition codes may turn off some writes */
-      if (writeMask & WRITEMASK_X) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 0)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_X;
-      }
-      if (writeMask & WRITEMASK_Y) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 1)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Y;
-      }
-      if (writeMask & WRITEMASK_Z) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 2)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Z;
-      }
-      if (writeMask & WRITEMASK_W) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 3)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_W;
-      }
-   }
-
-#ifdef NAN_CHECK
-   assert(!IS_INF_OR_NAN(value[0]));
-   assert(!IS_INF_OR_NAN(value[0]));
-   assert(!IS_INF_OR_NAN(value[0]));
-   assert(!IS_INF_OR_NAN(value[0]));
-#endif
-
-   if (writeMask & WRITEMASK_X)
-      dst[0] = value[0];
-   if (writeMask & WRITEMASK_Y)
-      dst[1] = value[1];
-   if (writeMask & WRITEMASK_Z)
-      dst[2] = value[2];
-   if (writeMask & WRITEMASK_W)
-      dst[3] = value[3];
-
-   if (inst->CondUpdate) {
-      if (writeMask & WRITEMASK_X)
-         machine->CondCodes[0] = generate_cc(value[0]);
-      if (writeMask & WRITEMASK_Y)
-         machine->CondCodes[1] = generate_cc(value[1]);
-      if (writeMask & WRITEMASK_Z)
-         machine->CondCodes[2] = generate_cc(value[2]);
-      if (writeMask & WRITEMASK_W)
-         machine->CondCodes[3] = generate_cc(value[3]);
-#if DEBUG_PROG
-      printf("CondCodes=(%s,%s,%s,%s) for:\n",
-             _mesa_condcode_string(machine->CondCodes[0]),
-             _mesa_condcode_string(machine->CondCodes[1]),
-             _mesa_condcode_string(machine->CondCodes[2]),
-             _mesa_condcode_string(machine->CondCodes[3]));
-#endif
-   }
-}
-
-
-/**
- * Store 4 uints into a register.  Observe the set-condition-code flags.
- */
-static void
-store_vector4ui(const struct prog_instruction *inst,
-                struct gl_program_machine *machine, const GLuint value[4])
-{
-   const struct prog_dst_register *dstReg = &(inst->DstReg);
-   GLuint writeMask = dstReg->WriteMask;
-   GLuint *dst = (GLuint *) get_dst_register_pointer(dstReg, machine);
-
-   if (dstReg->CondMask != COND_TR) {
-      /* condition codes may turn off some writes */
-      if (writeMask & WRITEMASK_X) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 0)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_X;
-      }
-      if (writeMask & WRITEMASK_Y) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 1)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Y;
-      }
-      if (writeMask & WRITEMASK_Z) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 2)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_Z;
-      }
-      if (writeMask & WRITEMASK_W) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 3)],
-                      dstReg->CondMask))
-            writeMask &= ~WRITEMASK_W;
-      }
-   }
-
-   if (writeMask & WRITEMASK_X)
-      dst[0] = value[0];
-   if (writeMask & WRITEMASK_Y)
-      dst[1] = value[1];
-   if (writeMask & WRITEMASK_Z)
-      dst[2] = value[2];
-   if (writeMask & WRITEMASK_W)
-      dst[3] = value[3];
-
-   if (inst->CondUpdate) {
-      if (writeMask & WRITEMASK_X)
-         machine->CondCodes[0] = generate_cc((float)value[0]);
-      if (writeMask & WRITEMASK_Y)
-         machine->CondCodes[1] = generate_cc((float)value[1]);
-      if (writeMask & WRITEMASK_Z)
-         machine->CondCodes[2] = generate_cc((float)value[2]);
-      if (writeMask & WRITEMASK_W)
-         machine->CondCodes[3] = generate_cc((float)value[3]);
-#if DEBUG_PROG
-      printf("CondCodes=(%s,%s,%s,%s) for:\n",
-             _mesa_condcode_string(machine->CondCodes[0]),
-             _mesa_condcode_string(machine->CondCodes[1]),
-             _mesa_condcode_string(machine->CondCodes[2]),
-             _mesa_condcode_string(machine->CondCodes[3]));
-#endif
-   }
-}
-
-
-
-/**
- * Execute the given vertex/fragment program.
- *
- * \param ctx  rendering context
- * \param program  the program to execute
- * \param machine  machine state (must be initialized)
- * \return GL_TRUE if program completed or GL_FALSE if program executed KIL.
- */
-GLboolean
-_mesa_execute_program(GLcontext * ctx,
-                      const struct gl_program *program,
-                      struct gl_program_machine *machine)
-{
-   const GLuint numInst = program->NumInstructions;
-   const GLuint maxExec = 10000;
-   GLuint pc, numExec = 0;
-
-   machine->CurProgram = program;
-
-   if (DEBUG_PROG) {
-      printf("execute program %u --------------------\n", program->Id);
-   }
-
-   if (program->Target == GL_VERTEX_PROGRAM_ARB) {
-      machine->EnvParams = ctx->VertexProgram.Parameters;
-   }
-   else {
-      machine->EnvParams = ctx->FragmentProgram.Parameters;
-   }
-
-   for (pc = 0; pc < numInst; pc++) {
-      const struct prog_instruction *inst = program->Instructions + pc;
-
-      if (DEBUG_PROG) {
-         _mesa_print_instruction(inst);
-      }
-
-      switch (inst->Opcode) {
-      case OPCODE_ABS:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = FABSF(a[0]);
-            result[1] = FABSF(a[1]);
-            result[2] = FABSF(a[2]);
-            result[3] = FABSF(a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_ADD:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] + b[0];
-            result[1] = a[1] + b[1];
-            result[2] = a[2] + b[2];
-            result[3] = a[3] + b[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("ADD (%g %g %g %g) = (%g %g %g %g) + (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_AND:     /* bitwise AND */
-         {
-            GLuint a[4], b[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            fetch_vector4ui(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] & b[0];
-            result[1] = a[1] & b[1];
-            result[2] = a[2] & b[2];
-            result[3] = a[3] & b[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_ARL:
-         {
-            GLfloat t[4];
-            fetch_vector4(&inst->SrcReg[0], machine, t);
-            machine->AddressReg[0][0] = IFLOOR(t[0]);
-            if (DEBUG_PROG) {
-               printf("ARL %d\n", machine->AddressReg[0][0]);
-            }
-         }
-         break;
-      case OPCODE_BGNLOOP:
-         /* no-op */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDLOOP);
-         break;
-      case OPCODE_ENDLOOP:
-         /* subtract 1 here since pc is incremented by for(pc) loop */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_BGNLOOP);
-         pc = inst->BranchTarget - 1;   /* go to matching BNGLOOP */
-         break;
-      case OPCODE_BGNSUB:      /* begin subroutine */
-         break;
-      case OPCODE_ENDSUB:      /* end subroutine */
-         break;
-      case OPCODE_BRA:         /* branch (conditional) */
-         if (eval_condition(machine, inst)) {
-            /* take branch */
-            /* Subtract 1 here since we'll do pc++ below */
-            pc = inst->BranchTarget - 1;
-         }
-         break;
-      case OPCODE_BRK:         /* break out of loop (conditional) */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDLOOP);
-         if (eval_condition(machine, inst)) {
-            /* break out of loop */
-            /* pc++ at end of for-loop will put us after the ENDLOOP inst */
-            pc = inst->BranchTarget;
-         }
-         break;
-      case OPCODE_CONT:        /* continue loop (conditional) */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDLOOP);
-         if (eval_condition(machine, inst)) {
-            /* continue at ENDLOOP */
-            /* Subtract 1 here since we'll do pc++ at end of for-loop */
-            pc = inst->BranchTarget - 1;
-         }
-         break;
-      case OPCODE_CAL:         /* Call subroutine (conditional) */
-         if (eval_condition(machine, inst)) {
-            /* call the subroutine */
-            if (machine->StackDepth >= MAX_PROGRAM_CALL_DEPTH) {
-               return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */
-            }
-            machine->CallStack[machine->StackDepth++] = pc + 1; /* next inst */
-            /* Subtract 1 here since we'll do pc++ at end of for-loop */
-            pc = inst->BranchTarget - 1;
-         }
-         break;
-      case OPCODE_CMP:
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] < 0.0F ? b[0] : c[0];
-            result[1] = a[1] < 0.0F ? b[1] : c[1];
-            result[2] = a[2] < 0.0F ? b[2] : c[2];
-            result[3] = a[3] < 0.0F ? b[3] : c[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("CMP (%g %g %g %g) = (%g %g %g %g) < 0 ? (%g %g %g %g) : (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3],
-                      c[0], c[1], c[2], c[3]);
-            }
-         }
-         break;
-      case OPCODE_COS:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] = result[1] = result[2] = result[3]
-               = (GLfloat) cos(a[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DDX:         /* Partial derivative with respect to X */
-         {
-            GLfloat result[4];
-            fetch_vector4_deriv(ctx, &inst->SrcReg[0], machine,
-                                'X', result);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DDY:         /* Partial derivative with respect to Y */
-         {
-            GLfloat result[4];
-            fetch_vector4_deriv(ctx, &inst->SrcReg[0], machine,
-                                'Y', result);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DP2:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT2(a, b);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP2 %g = (%g %g) . (%g %g)\n",
-                      result[0], a[0], a[1], b[0], b[1]);
-            }
-         }
-         break;
-      case OPCODE_DP2A:
-         {
-            GLfloat a[4], b[4], c, result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector1(&inst->SrcReg[1], machine, &c);
-            result[0] = result[1] = result[2] = result[3] = DOT2(a, b) + c;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP2A %g = (%g %g) . (%g %g) + %g\n",
-                      result[0], a[0], a[1], b[0], b[1], c);
-            }
-         }
-         break;
-      case OPCODE_DP3:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT3(a, b);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP3 %g = (%g %g %g) . (%g %g %g)\n",
-                      result[0], a[0], a[1], a[2], b[0], b[1], b[2]);
-            }
-         }
-         break;
-      case OPCODE_DP4:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT4(a, b);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("DP4 %g = (%g, %g %g %g) . (%g, %g %g %g)\n",
-                      result[0], a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_DPH:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3] = DOT3(a, b) + b[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_DST:         /* Distance vector */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = 1.0F;
-            result[1] = a[1] * b[1];
-            result[2] = a[2];
-            result[3] = b[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_EXP:
-         {
-            GLfloat t[4], q[4], floor_t0;
-            fetch_vector1(&inst->SrcReg[0], machine, t);
-            floor_t0 = FLOORF(t[0]);
-            if (floor_t0 > FLT_MAX_EXP) {
-               SET_POS_INFINITY(q[0]);
-               SET_POS_INFINITY(q[2]);
-            }
-            else if (floor_t0 < FLT_MIN_EXP) {
-               q[0] = 0.0F;
-               q[2] = 0.0F;
-            }
-            else {
-               q[0] = LDEXPF(1.0, (int) floor_t0);
-               /* Note: GL_NV_vertex_program expects 
-                * result.z = result.x * APPX(result.y)
-                * We do what the ARB extension says.
-                */
-               q[2] = (GLfloat) pow(2.0, t[0]);
-            }
-            q[1] = t[0] - floor_t0;
-            q[3] = 1.0F;
-            store_vector4( inst, machine, q );
-         }
-         break;
-      case OPCODE_EX2:         /* Exponential base 2 */
-         {
-            GLfloat a[4], result[4], val;
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            val = (GLfloat) pow(2.0, a[0]);
-            /*
-            if (IS_INF_OR_NAN(val))
-               val = 1.0e10;
-            */
-            result[0] = result[1] = result[2] = result[3] = val;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_FLR:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = FLOORF(a[0]);
-            result[1] = FLOORF(a[1]);
-            result[2] = FLOORF(a[2]);
-            result[3] = FLOORF(a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_FRC:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = a[0] - FLOORF(a[0]);
-            result[1] = a[1] - FLOORF(a[1]);
-            result[2] = a[2] - FLOORF(a[2]);
-            result[3] = a[3] - FLOORF(a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_IF:
-         {
-            GLboolean cond;
-            ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                   == OPCODE_ELSE ||
-                   program->Instructions[inst->BranchTarget].Opcode
-                   == OPCODE_ENDIF);
-            /* eval condition */
-            if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-               GLfloat a[4];
-               fetch_vector1(&inst->SrcReg[0], machine, a);
-               cond = (a[0] != 0.0);
-            }
-            else {
-               cond = eval_condition(machine, inst);
-            }
-            if (DEBUG_PROG) {
-               printf("IF: %d\n", cond);
-            }
-            /* do if/else */
-            if (cond) {
-               /* do if-clause (just continue execution) */
-            }
-            else {
-               /* go to the instruction after ELSE or ENDIF */
-               assert(inst->BranchTarget >= 0);
-               pc = inst->BranchTarget;
-            }
-         }
-         break;
-      case OPCODE_ELSE:
-         /* goto ENDIF */
-         ASSERT(program->Instructions[inst->BranchTarget].Opcode
-                == OPCODE_ENDIF);
-         assert(inst->BranchTarget >= 0);
-         pc = inst->BranchTarget;
-         break;
-      case OPCODE_ENDIF:
-         /* nothing */
-         break;
-      case OPCODE_KIL_NV:      /* NV_f_p only (conditional) */
-         if (eval_condition(machine, inst)) {
-            return GL_FALSE;
-         }
-         break;
-      case OPCODE_KIL:         /* ARB_f_p only */
-         {
-            GLfloat a[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            if (DEBUG_PROG) {
-               printf("KIL if (%g %g %g %g) <= 0.0\n",
-                      a[0], a[1], a[2], a[3]);
-            }
-
-            if (a[0] < 0.0F || a[1] < 0.0F || a[2] < 0.0F || a[3] < 0.0F) {
-               return GL_FALSE;
-            }
-         }
-         break;
-      case OPCODE_LG2:         /* log base 2 */
-         {
-            GLfloat a[4], result[4], val;
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-	    /* The fast LOG2 macro doesn't meet the precision requirements.
-	     */
-            if (a[0] == 0.0F) {
-               val = -FLT_MAX;
-            }
-            else {
-               val = (float)(log(a[0]) * 1.442695F);
-            }
-            result[0] = result[1] = result[2] = result[3] = val;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_LIT:
-         {
-            const GLfloat epsilon = 1.0F / 256.0F;      /* from NV VP spec */
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = MAX2(a[0], 0.0F);
-            a[1] = MAX2(a[1], 0.0F);
-            /* XXX ARB version clamps a[3], NV version doesn't */
-            a[3] = CLAMP(a[3], -(128.0F - epsilon), (128.0F - epsilon));
-            result[0] = 1.0F;
-            result[1] = a[0];
-            /* XXX we could probably just use pow() here */
-            if (a[0] > 0.0F) {
-               if (a[1] == 0.0 && a[3] == 0.0)
-                  result[2] = 1.0F;
-               else
-                  result[2] = (GLfloat) pow(a[1], a[3]);
-            }
-            else {
-               result[2] = 0.0F;
-            }
-            result[3] = 1.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("LIT (%g %g %g %g) : (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3]);
-            }
-         }
-         break;
-      case OPCODE_LOG:
-         {
-            GLfloat t[4], q[4], abs_t0;
-            fetch_vector1(&inst->SrcReg[0], machine, t);
-            abs_t0 = FABSF(t[0]);
-            if (abs_t0 != 0.0F) {
-               /* Since we really can't handle infinite values on VMS
-                * like other OSes we'll use __MAXFLOAT to represent
-                * infinity.  This may need some tweaking.
-                */
-#ifdef VMS
-               if (abs_t0 == __MAXFLOAT)
-#else
-               if (IS_INF_OR_NAN(abs_t0))
-#endif
-               {
-                  SET_POS_INFINITY(q[0]);
-                  q[1] = 1.0F;
-                  SET_POS_INFINITY(q[2]);
-               }
-               else {
-                  int exponent;
-                  GLfloat mantissa = FREXPF(t[0], &exponent);
-                  q[0] = (GLfloat) (exponent - 1);
-                  q[1] = (GLfloat) (2.0 * mantissa); /* map [.5, 1) -> [1, 2) */
-
-		  /* The fast LOG2 macro doesn't meet the precision
-		   * requirements.
-		   */
-                  q[2] = (float)(log(t[0]) * 1.442695F);
-               }
-            }
-            else {
-               SET_NEG_INFINITY(q[0]);
-               q[1] = 1.0F;
-               SET_NEG_INFINITY(q[2]);
-            }
-            q[3] = 1.0;
-            store_vector4(inst, machine, q);
-         }
-         break;
-      case OPCODE_LRP:
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] * b[0] + (1.0F - a[0]) * c[0];
-            result[1] = a[1] * b[1] + (1.0F - a[1]) * c[1];
-            result[2] = a[2] * b[2] + (1.0F - a[2]) * c[2];
-            result[3] = a[3] * b[3] + (1.0F - a[3]) * c[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("LRP (%g %g %g %g) = (%g %g %g %g), "
-                      "(%g %g %g %g), (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3], c[0], c[1], c[2], c[3]);
-            }
-         }
-         break;
-      case OPCODE_MAD:
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] * b[0] + c[0];
-            result[1] = a[1] * b[1] + c[1];
-            result[2] = a[2] * b[2] + c[2];
-            result[3] = a[3] * b[3] + c[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MAD (%g %g %g %g) = (%g %g %g %g) * "
-                      "(%g %g %g %g) + (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3], c[0], c[1], c[2], c[3]);
-            }
-         }
-         break;
-      case OPCODE_MAX:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = MAX2(a[0], b[0]);
-            result[1] = MAX2(a[1], b[1]);
-            result[2] = MAX2(a[2], b[2]);
-            result[3] = MAX2(a[3], b[3]);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MAX (%g %g %g %g) = (%g %g %g %g), (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_MIN:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = MIN2(a[0], b[0]);
-            result[1] = MIN2(a[1], b[1]);
-            result[2] = MIN2(a[2], b[2]);
-            result[3] = MIN2(a[3], b[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_MOV:
-         {
-            GLfloat result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, result);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MOV (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3]);
-            }
-         }
-         break;
-      case OPCODE_MUL:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] * b[0];
-            result[1] = a[1] * b[1];
-            result[2] = a[2] * b[2];
-            result[3] = a[3] * b[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("MUL (%g %g %g %g) = (%g %g %g %g) * (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_NOISE1:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] =
-               result[3] = _mesa_noise1(a[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOISE2:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] = result[3] = _mesa_noise2(a[0], a[1]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOISE3:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] =
-               result[3] = _mesa_noise3(a[0], a[1], a[2]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOISE4:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] =
-               result[1] =
-               result[2] =
-               result[3] = _mesa_noise4(a[0], a[1], a[2], a[3]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NOP:
-         break;
-      case OPCODE_NOT:         /* bitwise NOT */
-         {
-            GLuint a[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            result[0] = ~a[0];
-            result[1] = ~a[1];
-            result[2] = ~a[2];
-            result[3] = ~a[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_NRM3:        /* 3-component normalization */
-         {
-            GLfloat a[4], result[4];
-            GLfloat tmp;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            tmp = a[0] * a[0] + a[1] * a[1] + a[2] * a[2];
-            if (tmp != 0.0F)
-               tmp = INV_SQRTF(tmp);
-            result[0] = tmp * a[0];
-            result[1] = tmp * a[1];
-            result[2] = tmp * a[2];
-            result[3] = 0.0;  /* undefined, but prevent valgrind warnings */
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_NRM4:        /* 4-component normalization */
-         {
-            GLfloat a[4], result[4];
-            GLfloat tmp;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            tmp = a[0] * a[0] + a[1] * a[1] + a[2] * a[2] + a[3] * a[3];
-            if (tmp != 0.0F)
-               tmp = INV_SQRTF(tmp);
-            result[0] = tmp * a[0];
-            result[1] = tmp * a[1];
-            result[2] = tmp * a[2];
-            result[3] = tmp * a[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_OR:          /* bitwise OR */
-         {
-            GLuint a[4], b[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            fetch_vector4ui(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] | b[0];
-            result[1] = a[1] | b[1];
-            result[2] = a[2] | b[2];
-            result[3] = a[3] | b[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK2H:        /* pack two 16-bit floats in one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4];
-            GLhalfNV hx, hy;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            hx = _mesa_float_to_half(a[0]);
-            hy = _mesa_float_to_half(a[1]);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = hx | (hy << 16);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK2US:       /* pack two GLushorts into one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4], usx, usy;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = CLAMP(a[0], 0.0F, 1.0F);
-            a[1] = CLAMP(a[1], 0.0F, 1.0F);
-            usx = IROUND(a[0] * 65535.0F);
-            usy = IROUND(a[1] * 65535.0F);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = usx | (usy << 16);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK4B:        /* pack four GLbytes into one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4], ubx, uby, ubz, ubw;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = CLAMP(a[0], -128.0F / 127.0F, 1.0F);
-            a[1] = CLAMP(a[1], -128.0F / 127.0F, 1.0F);
-            a[2] = CLAMP(a[2], -128.0F / 127.0F, 1.0F);
-            a[3] = CLAMP(a[3], -128.0F / 127.0F, 1.0F);
-            ubx = IROUND(127.0F * a[0] + 128.0F);
-            uby = IROUND(127.0F * a[1] + 128.0F);
-            ubz = IROUND(127.0F * a[2] + 128.0F);
-            ubw = IROUND(127.0F * a[3] + 128.0F);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_PK4UB:       /* pack four GLubytes into one 32-bit float */
-         {
-            GLfloat a[4];
-            GLuint result[4], ubx, uby, ubz, ubw;
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            a[0] = CLAMP(a[0], 0.0F, 1.0F);
-            a[1] = CLAMP(a[1], 0.0F, 1.0F);
-            a[2] = CLAMP(a[2], 0.0F, 1.0F);
-            a[3] = CLAMP(a[3], 0.0F, 1.0F);
-            ubx = IROUND(255.0F * a[0]);
-            uby = IROUND(255.0F * a[1]);
-            ubz = IROUND(255.0F * a[2]);
-            ubw = IROUND(255.0F * a[3]);
-            result[0] =
-            result[1] =
-            result[2] =
-            result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_POW:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            fetch_vector1(&inst->SrcReg[1], machine, b);
-            result[0] = result[1] = result[2] = result[3]
-               = (GLfloat) pow(a[0], b[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_RCC:  /* clamped riciprocal */
-         {
-            const float largest = 1.884467e+19, smallest = 5.42101e-20;
-            GLfloat a[4], r, result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            if (DEBUG_PROG) {
-               if (a[0] == 0)
-                  printf("RCC(0)\n");
-               else if (IS_INF_OR_NAN(a[0]))
-                  printf("RCC(inf)\n");
-            }
-            if (a[0] == 1.0F) {
-               r = 1.0F;
-            }
-            else {
-               r = 1.0F / a[0];
-            }
-            if (positive(r)) {
-               if (r > largest) {
-                  r = largest;
-               }
-               else if (r < smallest) {
-                  r = smallest;
-               }
-            }
-            else {
-               if (r < -largest) {
-                  r = -largest;
-               }
-               else if (r > -smallest) {
-                  r = -smallest;
-               }
-            }
-            result[0] = result[1] = result[2] = result[3] = r;
-            store_vector4(inst, machine, result);
-         }
-         break;
-
-      case OPCODE_RCP:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            if (DEBUG_PROG) {
-               if (a[0] == 0)
-                  printf("RCP(0)\n");
-               else if (IS_INF_OR_NAN(a[0]))
-                  printf("RCP(inf)\n");
-            }
-            result[0] = result[1] = result[2] = result[3] = 1.0F / a[0];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_RET:         /* return from subroutine (conditional) */
-         if (eval_condition(machine, inst)) {
-            if (machine->StackDepth == 0) {
-               return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */
-            }
-            /* subtract one because of pc++ in the for loop */
-            pc = machine->CallStack[--machine->StackDepth] - 1;
-         }
-         break;
-      case OPCODE_RFL:         /* reflection vector */
-         {
-            GLfloat axis[4], dir[4], result[4], tmpX, tmpW;
-            fetch_vector4(&inst->SrcReg[0], machine, axis);
-            fetch_vector4(&inst->SrcReg[1], machine, dir);
-            tmpW = DOT3(axis, axis);
-            tmpX = (2.0F * DOT3(axis, dir)) / tmpW;
-            result[0] = tmpX * axis[0] - dir[0];
-            result[1] = tmpX * axis[1] - dir[1];
-            result[2] = tmpX * axis[2] - dir[2];
-            /* result[3] is never written! XXX enforce in parser! */
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_RSQ:         /* 1 / sqrt() */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            a[0] = FABSF(a[0]);
-            result[0] = result[1] = result[2] = result[3] = INV_SQRTF(a[0]);
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("RSQ %g = 1/sqrt(|%g|)\n", result[0], a[0]);
-            }
-         }
-         break;
-      case OPCODE_SCS:         /* sine and cos */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] = (GLfloat) cos(a[0]);
-            result[1] = (GLfloat) sin(a[0]);
-            result[2] = 0.0;    /* undefined! */
-            result[3] = 0.0;    /* undefined! */
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SEQ:         /* set on equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] == b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] == b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] == b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] == b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SEQ (%g %g %g %g) = (%g %g %g %g) == (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SFL:         /* set false, operands ignored */
-         {
-            static const GLfloat result[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SGE:         /* set on greater or equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] >= b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] >= b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] >= b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] >= b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SGE (%g %g %g %g) = (%g %g %g %g) >= (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SGT:         /* set on greater */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] > b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] > b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] > b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] > b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SGT (%g %g %g %g) = (%g %g %g %g) > (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SIN:
-         {
-            GLfloat a[4], result[4];
-            fetch_vector1(&inst->SrcReg[0], machine, a);
-            result[0] = result[1] = result[2] = result[3]
-               = (GLfloat) sin(a[0]);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SLE:         /* set on less or equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] <= b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] <= b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] <= b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] <= b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SLE (%g %g %g %g) = (%g %g %g %g) <= (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SLT:         /* set on less */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] < b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] < b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] < b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] < b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SLT (%g %g %g %g) = (%g %g %g %g) < (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SNE:         /* set on not equal */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = (a[0] != b[0]) ? 1.0F : 0.0F;
-            result[1] = (a[1] != b[1]) ? 1.0F : 0.0F;
-            result[2] = (a[2] != b[2]) ? 1.0F : 0.0F;
-            result[3] = (a[3] != b[3]) ? 1.0F : 0.0F;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SNE (%g %g %g %g) = (%g %g %g %g) != (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3],
-                      b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SSG:         /* set sign (-1, 0 or +1) */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = (GLfloat) ((a[0] > 0.0F) - (a[0] < 0.0F));
-            result[1] = (GLfloat) ((a[1] > 0.0F) - (a[1] < 0.0F));
-            result[2] = (GLfloat) ((a[2] > 0.0F) - (a[2] < 0.0F));
-            result[3] = (GLfloat) ((a[3] > 0.0F) - (a[3] < 0.0F));
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_STR:         /* set true, operands ignored */
-         {
-            static const GLfloat result[4] = { 1.0F, 1.0F, 1.0F, 1.0F };
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_SUB:
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] - b[0];
-            result[1] = a[1] - b[1];
-            result[2] = a[2] - b[2];
-            result[3] = a[3] - b[3];
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("SUB (%g %g %g %g) = (%g %g %g %g) - (%g %g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-            }
-         }
-         break;
-      case OPCODE_SWZ:         /* extended swizzle */
-         {
-            const struct prog_src_register *source = &inst->SrcReg[0];
-            const GLfloat *src = get_src_register_pointer(source, machine);
-            GLfloat result[4];
-            GLuint i;
-            for (i = 0; i < 4; i++) {
-               const GLuint swz = GET_SWZ(source->Swizzle, i);
-               if (swz == SWIZZLE_ZERO)
-                  result[i] = 0.0;
-               else if (swz == SWIZZLE_ONE)
-                  result[i] = 1.0;
-               else {
-                  ASSERT(swz >= 0);
-                  ASSERT(swz <= 3);
-                  result[i] = src[swz];
-               }
-               if (source->Negate & (1 << i))
-                  result[i] = -result[i];
-            }
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_TEX:         /* Both ARB and NV frag prog */
-         /* Simple texel lookup */
-         {
-            GLfloat texcoord[4], color[4];
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-
-            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);
-
-            if (DEBUG_PROG) {
-               printf("TEX (%g, %g, %g, %g) = texture[%d][%g, %g, %g, %g]\n",
-                      color[0], color[1], color[2], color[3],
-                      inst->TexSrcUnit,
-                      texcoord[0], texcoord[1], texcoord[2], texcoord[3]);
-            }
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXB:         /* GL_ARB_fragment_program only */
-         /* Texel lookup with LOD bias */
-         {
-            GLfloat texcoord[4], color[4], lodBias;
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-
-            /* texcoord[3] is the bias to add to lambda */
-            lodBias = texcoord[3];
-
-            fetch_texel(ctx, machine, inst, texcoord, lodBias, color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXD:         /* GL_NV_fragment_program only */
-         /* Texture lookup w/ partial derivatives for LOD */
-         {
-            GLfloat texcoord[4], dtdx[4], dtdy[4], color[4];
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-            fetch_vector4(&inst->SrcReg[1], machine, dtdx);
-            fetch_vector4(&inst->SrcReg[2], machine, dtdy);
-            machine->FetchTexelDeriv(ctx, texcoord, dtdx, dtdy,
-                                     0.0, /* lodBias */
-                                     inst->TexSrcUnit, color);
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXL:
-         /* Texel lookup with explicit LOD */
-         {
-            GLfloat texcoord[4], color[4], lod;
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-
-            /* texcoord[3] is the LOD */
-            lod = texcoord[3];
-
-	    machine->FetchTexelLod(ctx, texcoord, lod,
-				   machine->Samplers[inst->TexSrcUnit], color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXP:         /* GL_ARB_fragment_program only */
-         /* Texture lookup w/ projective divide */
-         {
-            GLfloat texcoord[4], color[4];
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-            /* Not so sure about this test - if texcoord[3] is
-             * zero, we'd probably be fine except for an ASSERT in
-             * IROUND_POS() which gets triggered by the inf values created.
-             */
-            if (texcoord[3] != 0.0) {
-               texcoord[0] /= texcoord[3];
-               texcoord[1] /= texcoord[3];
-               texcoord[2] /= texcoord[3];
-            }
-
-            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TXP_NV:      /* GL_NV_fragment_program only */
-         /* Texture lookup w/ projective divide, as above, but do not
-          * do the divide by w if sampling from a cube map.
-          */
-         {
-            GLfloat texcoord[4], color[4];
-
-            fetch_vector4(&inst->SrcReg[0], machine, texcoord);
-            if (inst->TexSrcTarget != TEXTURE_CUBE_INDEX &&
-                texcoord[3] != 0.0) {
-               texcoord[0] /= texcoord[3];
-               texcoord[1] /= texcoord[3];
-               texcoord[2] /= texcoord[3];
-            }
-
-            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);
-
-            store_vector4(inst, machine, color);
-         }
-         break;
-      case OPCODE_TRUNC:       /* truncate toward zero */
-         {
-            GLfloat a[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            result[0] = (GLfloat) (GLint) a[0];
-            result[1] = (GLfloat) (GLint) a[1];
-            result[2] = (GLfloat) (GLint) a[2];
-            result[3] = (GLfloat) (GLint) a[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP2H:        /* unpack two 16-bit floats */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            GLushort hx, hy;
-            hx = raw & 0xffff;
-            hy = raw >> 16;
-            result[0] = result[2] = _mesa_half_to_float(hx);
-            result[1] = result[3] = _mesa_half_to_float(hy);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP2US:       /* unpack two GLushorts */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            GLushort usx, usy;
-            usx = raw & 0xffff;
-            usy = raw >> 16;
-            result[0] = result[2] = usx * (1.0f / 65535.0f);
-            result[1] = result[3] = usy * (1.0f / 65535.0f);
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP4B:        /* unpack four GLbytes */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            result[0] = (((raw >> 0) & 0xff) - 128) / 127.0F;
-            result[1] = (((raw >> 8) & 0xff) - 128) / 127.0F;
-            result[2] = (((raw >> 16) & 0xff) - 128) / 127.0F;
-            result[3] = (((raw >> 24) & 0xff) - 128) / 127.0F;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_UP4UB:       /* unpack four GLubytes */
-         {
-            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
-            GLfloat result[4];
-            result[0] = ((raw >> 0) & 0xff) / 255.0F;
-            result[1] = ((raw >> 8) & 0xff) / 255.0F;
-            result[2] = ((raw >> 16) & 0xff) / 255.0F;
-            result[3] = ((raw >> 24) & 0xff) / 255.0F;
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_XOR:         /* bitwise XOR */
-         {
-            GLuint a[4], b[4], result[4];
-            fetch_vector4ui(&inst->SrcReg[0], machine, a);
-            fetch_vector4ui(&inst->SrcReg[1], machine, b);
-            result[0] = a[0] ^ b[0];
-            result[1] = a[1] ^ b[1];
-            result[2] = a[2] ^ b[2];
-            result[3] = a[3] ^ b[3];
-            store_vector4ui(inst, machine, result);
-         }
-         break;
-      case OPCODE_XPD:         /* cross product */
-         {
-            GLfloat a[4], b[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            result[0] = a[1] * b[2] - a[2] * b[1];
-            result[1] = a[2] * b[0] - a[0] * b[2];
-            result[2] = a[0] * b[1] - a[1] * b[0];
-            result[3] = 1.0;
-            store_vector4(inst, machine, result);
-            if (DEBUG_PROG) {
-               printf("XPD (%g %g %g %g) = (%g %g %g) X (%g %g %g)\n",
-                      result[0], result[1], result[2], result[3],
-                      a[0], a[1], a[2], b[0], b[1], b[2]);
-            }
-         }
-         break;
-      case OPCODE_X2D:         /* 2-D matrix transform */
-         {
-            GLfloat a[4], b[4], c[4], result[4];
-            fetch_vector4(&inst->SrcReg[0], machine, a);
-            fetch_vector4(&inst->SrcReg[1], machine, b);
-            fetch_vector4(&inst->SrcReg[2], machine, c);
-            result[0] = a[0] + b[0] * c[0] + b[1] * c[1];
-            result[1] = a[1] + b[0] * c[2] + b[1] * c[3];
-            result[2] = a[2] + b[0] * c[0] + b[1] * c[1];
-            result[3] = a[3] + b[0] * c[2] + b[1] * c[3];
-            store_vector4(inst, machine, result);
-         }
-         break;
-      case OPCODE_PRINT:
-         {
-            if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-               GLfloat a[4];
-               fetch_vector4(&inst->SrcReg[0], machine, a);
-               printf("%s%g, %g, %g, %g\n", (const char *) inst->Data,
-                            a[0], a[1], a[2], a[3]);
-            }
-            else {
-               printf("%s\n", (const char *) inst->Data);
-            }
-         }
-         break;
-      case OPCODE_END:
-         return GL_TRUE;
-      default:
-         _mesa_problem(ctx, "Bad opcode %d in _mesa_execute_program",
-                       inst->Opcode);
-         return GL_TRUE;        /* return value doesn't matter */
-      }
-
-      numExec++;
-      if (numExec > maxExec) {
-	 static GLboolean reported = GL_FALSE;
-	 if (!reported) {
-	    _mesa_problem(ctx, "Infinite loop detected in fragment program");
-	    reported = GL_TRUE;
-	 }
-         return GL_TRUE;
-      }
-
-   } /* for pc */
-
-   return GL_TRUE;
-}
+/*

+ * 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_execute.c

+ * Software interpreter for vertex/fragment programs.

+ * \author Brian Paul

+ */

+

+/*

+ * NOTE: we do everything in single-precision floating point; we don't

+ * currently observe the single/half/fixed-precision qualifiers.

+ *

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "prog_execute.h"

+#include "prog_instruction.h"

+#include "prog_parameter.h"

+#include "prog_print.h"

+#include "prog_noise.h"

+

+

+/* debug predicate */

+#define DEBUG_PROG 0

+

+

+/**

+ * Set x to positive or negative infinity.

+ */

+#if defined(USE_IEEE) || defined(_WIN32)

+#define SET_POS_INFINITY(x)                  \

+   do {                                      \

+         fi_type fi;                         \

+         fi.i = 0x7F800000;                  \

+         x = fi.f;                           \

+   } while (0)

+#define SET_NEG_INFINITY(x)                  \

+   do {                                      \

+         fi_type fi;                         \

+         fi.i = 0xFF800000;                  \

+         x = fi.f;                           \

+   } while (0)

+#elif defined(VMS)

+#define SET_POS_INFINITY(x)  x = __MAXFLOAT

+#define SET_NEG_INFINITY(x)  x = -__MAXFLOAT

+#else

+#define SET_POS_INFINITY(x)  x = (GLfloat) HUGE_VAL

+#define SET_NEG_INFINITY(x)  x = (GLfloat) -HUGE_VAL

+#endif

+

+#define SET_FLOAT_BITS(x, bits) ((fi_type *) (void *) &(x))->i = bits

+

+

+static const GLfloat ZeroVec[4] = { 0.0F, 0.0F, 0.0F, 0.0F };

+

+

+

+/**

+ * Return TRUE for +0 and other positive values, FALSE otherwise.

+ * Used for RCC opcode.

+ */

+static INLINE GLboolean

+positive(float x)

+{

+   fi_type fi;

+   fi.f = x;

+   if (fi.i & 0x80000000)

+      return GL_FALSE;

+   return GL_TRUE;

+}

+

+

+

+/**

+ * Return a pointer to the 4-element float vector specified by the given

+ * source register.

+ */

+static INLINE const GLfloat *

+get_src_register_pointer(const struct prog_src_register *source,

+                         const struct gl_program_machine *machine)

+{

+   const struct gl_program *prog = machine->CurProgram;

+   GLint reg = source->Index;

+

+   if (source->RelAddr) {

+      /* add address register value to src index/offset */

+      reg += machine->AddressReg[0][0];

+      if (reg < 0) {

+         return ZeroVec;

+      }

+   }

+

+   switch (source->File) {

+   case PROGRAM_TEMPORARY:

+      if (reg >= MAX_PROGRAM_TEMPS)

+         return ZeroVec;

+      return machine->Temporaries[reg];

+

+   case PROGRAM_INPUT:

+      if (prog->Target == GL_VERTEX_PROGRAM_ARB) {

+         if (reg >= VERT_ATTRIB_MAX)

+            return ZeroVec;

+         return machine->VertAttribs[reg];

+      }

+      else {

+         if (reg >= FRAG_ATTRIB_MAX)

+            return ZeroVec;

+         return machine->Attribs[reg][machine->CurElement];

+      }

+

+   case PROGRAM_OUTPUT:

+      if (reg >= MAX_PROGRAM_OUTPUTS)

+         return ZeroVec;

+      return machine->Outputs[reg];

+

+   case PROGRAM_LOCAL_PARAM:

+      if (reg >= MAX_PROGRAM_LOCAL_PARAMS)

+         return ZeroVec;

+      return machine->CurProgram->LocalParams[reg];

+

+   case PROGRAM_ENV_PARAM:

+      if (reg >= MAX_PROGRAM_ENV_PARAMS)

+         return ZeroVec;

+      return machine->EnvParams[reg];

+

+   case PROGRAM_STATE_VAR:

+      /* Fallthrough */

+   case PROGRAM_CONSTANT:

+      /* Fallthrough */

+   case PROGRAM_UNIFORM:

+      /* Fallthrough */

+   case PROGRAM_NAMED_PARAM:

+      if (reg >= (GLint) prog->Parameters->NumParameters)

+         return ZeroVec;

+      return prog->Parameters->ParameterValues[reg];

+

+   default:

+      _mesa_problem(NULL,

+         "Invalid src register file %d in get_src_register_pointer()",

+         source->File);

+      return NULL;

+   }

+}

+

+

+/**

+ * Return a pointer to the 4-element float vector specified by the given

+ * destination register.

+ */

+static INLINE GLfloat *

+get_dst_register_pointer(const struct prog_dst_register *dest,

+                         struct gl_program_machine *machine)

+{

+   static GLfloat dummyReg[4];

+   GLint reg = dest->Index;

+

+   if (dest->RelAddr) {

+      /* add address register value to src index/offset */

+      reg += machine->AddressReg[0][0];

+      if (reg < 0) {

+         return dummyReg;

+      }

+   }

+

+   switch (dest->File) {

+   case PROGRAM_TEMPORARY:

+      if (reg >= MAX_PROGRAM_TEMPS)

+         return dummyReg;

+      return machine->Temporaries[reg];

+

+   case PROGRAM_OUTPUT:

+      if (reg >= MAX_PROGRAM_OUTPUTS)

+         return dummyReg;

+      return machine->Outputs[reg];

+

+   case PROGRAM_WRITE_ONLY:

+      return dummyReg;

+

+   default:

+      _mesa_problem(NULL,

+         "Invalid dest register file %d in get_dst_register_pointer()",

+         dest->File);

+      return NULL;

+   }

+}

+

+

+

+/**

+ * Fetch a 4-element float vector from the given source register.

+ * Apply swizzling and negating as needed.

+ */

+static void

+fetch_vector4(const struct prog_src_register *source,

+              const struct gl_program_machine *machine, GLfloat result[4])

+{

+   const GLfloat *src = get_src_register_pointer(source, machine);

+   ASSERT(src);

+

+   if (source->Swizzle == SWIZZLE_NOOP) {

+      /* no swizzling */

+      COPY_4V(result, src);

+   }

+   else {

+      ASSERT(GET_SWZ(source->Swizzle, 0) <= 3);

+      ASSERT(GET_SWZ(source->Swizzle, 1) <= 3);

+      ASSERT(GET_SWZ(source->Swizzle, 2) <= 3);

+      ASSERT(GET_SWZ(source->Swizzle, 3) <= 3);

+      result[0] = src[GET_SWZ(source->Swizzle, 0)];

+      result[1] = src[GET_SWZ(source->Swizzle, 1)];

+      result[2] = src[GET_SWZ(source->Swizzle, 2)];

+      result[3] = src[GET_SWZ(source->Swizzle, 3)];

+   }

+

+   if (source->Abs) {

+      result[0] = FABSF(result[0]);

+      result[1] = FABSF(result[1]);

+      result[2] = FABSF(result[2]);

+      result[3] = FABSF(result[3]);

+   }

+   if (source->Negate) {

+      ASSERT(source->Negate == NEGATE_XYZW);

+      result[0] = -result[0];

+      result[1] = -result[1];

+      result[2] = -result[2];

+      result[3] = -result[3];

+   }

+

+#ifdef NAN_CHECK

+   assert(!IS_INF_OR_NAN(result[0]));

+   assert(!IS_INF_OR_NAN(result[0]));

+   assert(!IS_INF_OR_NAN(result[0]));

+   assert(!IS_INF_OR_NAN(result[0]));

+#endif

+}

+

+

+/**

+ * Fetch a 4-element uint vector from the given source register.

+ * Apply swizzling but not negation/abs.

+ */

+static void

+fetch_vector4ui(const struct prog_src_register *source,

+                const struct gl_program_machine *machine, GLuint result[4])

+{

+   const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);

+   ASSERT(src);

+

+   if (source->Swizzle == SWIZZLE_NOOP) {

+      /* no swizzling */

+      COPY_4V(result, src);

+   }

+   else {

+      ASSERT(GET_SWZ(source->Swizzle, 0) <= 3);

+      ASSERT(GET_SWZ(source->Swizzle, 1) <= 3);

+      ASSERT(GET_SWZ(source->Swizzle, 2) <= 3);

+      ASSERT(GET_SWZ(source->Swizzle, 3) <= 3);

+      result[0] = src[GET_SWZ(source->Swizzle, 0)];

+      result[1] = src[GET_SWZ(source->Swizzle, 1)];

+      result[2] = src[GET_SWZ(source->Swizzle, 2)];

+      result[3] = src[GET_SWZ(source->Swizzle, 3)];

+   }

+

+   /* Note: no Negate or Abs here */

+}

+

+

+

+/**

+ * Fetch the derivative with respect to X or Y for the given register.

+ * XXX this currently only works for fragment program input attribs.

+ */

+static void

+fetch_vector4_deriv(struct gl_context * ctx,

+                    const struct prog_src_register *source,

+                    const struct gl_program_machine *machine,

+                    char xOrY, GLfloat result[4])

+{

+   if (source->File == PROGRAM_INPUT &&

+       source->Index < (GLint) machine->NumDeriv) {

+      const GLint col = machine->CurElement;

+      const GLfloat w = machine->Attribs[FRAG_ATTRIB_WPOS][col][3];

+      const GLfloat invQ = 1.0f / w;

+      GLfloat deriv[4];

+

+      if (xOrY == 'X') {

+         deriv[0] = machine->DerivX[source->Index][0] * invQ;

+         deriv[1] = machine->DerivX[source->Index][1] * invQ;

+         deriv[2] = machine->DerivX[source->Index][2] * invQ;

+         deriv[3] = machine->DerivX[source->Index][3] * invQ;

+      }

+      else {

+         deriv[0] = machine->DerivY[source->Index][0] * invQ;

+         deriv[1] = machine->DerivY[source->Index][1] * invQ;

+         deriv[2] = machine->DerivY[source->Index][2] * invQ;

+         deriv[3] = machine->DerivY[source->Index][3] * invQ;

+      }

+

+      result[0] = deriv[GET_SWZ(source->Swizzle, 0)];

+      result[1] = deriv[GET_SWZ(source->Swizzle, 1)];

+      result[2] = deriv[GET_SWZ(source->Swizzle, 2)];

+      result[3] = deriv[GET_SWZ(source->Swizzle, 3)];

+      

+      if (source->Abs) {

+         result[0] = FABSF(result[0]);

+         result[1] = FABSF(result[1]);

+         result[2] = FABSF(result[2]);

+         result[3] = FABSF(result[3]);

+      }

+      if (source->Negate) {

+         ASSERT(source->Negate == NEGATE_XYZW);

+         result[0] = -result[0];

+         result[1] = -result[1];

+         result[2] = -result[2];

+         result[3] = -result[3];

+      }

+   }

+   else {

+      ASSIGN_4V(result, 0.0, 0.0, 0.0, 0.0);

+   }

+}

+

+

+/**

+ * As above, but only return result[0] element.

+ */

+static void

+fetch_vector1(const struct prog_src_register *source,

+              const struct gl_program_machine *machine, GLfloat result[4])

+{

+   const GLfloat *src = get_src_register_pointer(source, machine);

+   ASSERT(src);

+

+   result[0] = src[GET_SWZ(source->Swizzle, 0)];

+

+   if (source->Abs) {

+      result[0] = FABSF(result[0]);

+   }

+   if (source->Negate) {

+      result[0] = -result[0];

+   }

+}

+

+

+static GLuint

+fetch_vector1ui(const struct prog_src_register *source,

+                const struct gl_program_machine *machine)

+{

+   const GLuint *src = (GLuint *) get_src_register_pointer(source, machine);

+   return src[GET_SWZ(source->Swizzle, 0)];

+}

+

+

+/**

+ * Fetch texel from texture.  Use partial derivatives when possible.

+ */

+static INLINE void

+fetch_texel(struct gl_context *ctx,

+            const struct gl_program_machine *machine,

+            const struct prog_instruction *inst,

+            const GLfloat texcoord[4], GLfloat lodBias,

+            GLfloat color[4])

+{

+   const GLuint unit = machine->Samplers[inst->TexSrcUnit];

+

+   /* Note: we only have the right derivatives for fragment input attribs.

+    */

+   if (machine->NumDeriv > 0 &&

+       inst->SrcReg[0].File == PROGRAM_INPUT &&

+       inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0 + inst->TexSrcUnit) {

+      /* simple texture fetch for which we should have derivatives */

+      GLuint attr = inst->SrcReg[0].Index;

+      machine->FetchTexelDeriv(ctx, texcoord,

+                               machine->DerivX[attr],

+                               machine->DerivY[attr],

+                               lodBias, unit, color);

+   }

+   else {

+      machine->FetchTexelLod(ctx, texcoord, lodBias, unit, color);

+   }

+}

+

+

+/**

+ * Test value against zero and return GT, LT, EQ or UN if NaN.

+ */

+static INLINE GLuint

+generate_cc(float value)

+{

+   if (value != value)

+      return COND_UN;           /* NaN */

+   if (value > 0.0F)

+      return COND_GT;

+   if (value < 0.0F)

+      return COND_LT;

+   return COND_EQ;

+}

+

+

+/**

+ * Test if the ccMaskRule is satisfied by the given condition code.

+ * Used to mask destination writes according to the current condition code.

+ */

+static INLINE GLboolean

+test_cc(GLuint condCode, GLuint ccMaskRule)

+{

+   switch (ccMaskRule) {

+   case COND_EQ: return (condCode == COND_EQ);

+   case COND_NE: return (condCode != COND_EQ);

+   case COND_LT: return (condCode == COND_LT);

+   case COND_GE: return (condCode == COND_GT || condCode == COND_EQ);

+   case COND_LE: return (condCode == COND_LT || condCode == COND_EQ);

+   case COND_GT: return (condCode == COND_GT);

+   case COND_TR: return GL_TRUE;

+   case COND_FL: return GL_FALSE;

+   default:      return GL_TRUE;

+   }

+}

+

+

+/**

+ * Evaluate the 4 condition codes against a predicate and return GL_TRUE

+ * or GL_FALSE to indicate result.

+ */

+static INLINE GLboolean

+eval_condition(const struct gl_program_machine *machine,

+               const struct prog_instruction *inst)

+{

+   const GLuint swizzle = inst->DstReg.CondSwizzle;

+   const GLuint condMask = inst->DstReg.CondMask;

+   if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||

+       test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||

+       test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||

+       test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {

+      return GL_TRUE;

+   }

+   else {

+      return GL_FALSE;

+   }

+}

+

+

+

+/**

+ * Store 4 floats into a register.  Observe the instructions saturate and

+ * set-condition-code flags.

+ */

+static void

+store_vector4(const struct prog_instruction *inst,

+              struct gl_program_machine *machine, const GLfloat value[4])

+{

+   const struct prog_dst_register *dstReg = &(inst->DstReg);

+   const GLboolean clamp = inst->SaturateMode == SATURATE_ZERO_ONE;

+   GLuint writeMask = dstReg->WriteMask;

+   GLfloat clampedValue[4];

+   GLfloat *dst = get_dst_register_pointer(dstReg, machine);

+

+#if 0

+   if (value[0] > 1.0e10 ||

+       IS_INF_OR_NAN(value[0]) ||

+       IS_INF_OR_NAN(value[1]) ||

+       IS_INF_OR_NAN(value[2]) || IS_INF_OR_NAN(value[3]))

+      printf("store %g %g %g %g\n", value[0], value[1], value[2], value[3]);

+#endif

+

+   if (clamp) {

+      clampedValue[0] = CLAMP(value[0], 0.0F, 1.0F);

+      clampedValue[1] = CLAMP(value[1], 0.0F, 1.0F);

+      clampedValue[2] = CLAMP(value[2], 0.0F, 1.0F);

+      clampedValue[3] = CLAMP(value[3], 0.0F, 1.0F);

+      value = clampedValue;

+   }

+

+   if (dstReg->CondMask != COND_TR) {

+      /* condition codes may turn off some writes */

+      if (writeMask & WRITEMASK_X) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 0)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_X;

+      }

+      if (writeMask & WRITEMASK_Y) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 1)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_Y;

+      }

+      if (writeMask & WRITEMASK_Z) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 2)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_Z;

+      }

+      if (writeMask & WRITEMASK_W) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 3)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_W;

+      }

+   }

+

+#ifdef NAN_CHECK

+   assert(!IS_INF_OR_NAN(value[0]));

+   assert(!IS_INF_OR_NAN(value[0]));

+   assert(!IS_INF_OR_NAN(value[0]));

+   assert(!IS_INF_OR_NAN(value[0]));

+#endif

+

+   if (writeMask & WRITEMASK_X)

+      dst[0] = value[0];

+   if (writeMask & WRITEMASK_Y)

+      dst[1] = value[1];

+   if (writeMask & WRITEMASK_Z)

+      dst[2] = value[2];

+   if (writeMask & WRITEMASK_W)

+      dst[3] = value[3];

+

+   if (inst->CondUpdate) {

+      if (writeMask & WRITEMASK_X)

+         machine->CondCodes[0] = generate_cc(value[0]);

+      if (writeMask & WRITEMASK_Y)

+         machine->CondCodes[1] = generate_cc(value[1]);

+      if (writeMask & WRITEMASK_Z)

+         machine->CondCodes[2] = generate_cc(value[2]);

+      if (writeMask & WRITEMASK_W)

+         machine->CondCodes[3] = generate_cc(value[3]);

+#if DEBUG_PROG

+      printf("CondCodes=(%s,%s,%s,%s) for:\n",

+             _mesa_condcode_string(machine->CondCodes[0]),

+             _mesa_condcode_string(machine->CondCodes[1]),

+             _mesa_condcode_string(machine->CondCodes[2]),

+             _mesa_condcode_string(machine->CondCodes[3]));

+#endif

+   }

+}

+

+

+/**

+ * Store 4 uints into a register.  Observe the set-condition-code flags.

+ */

+static void

+store_vector4ui(const struct prog_instruction *inst,

+                struct gl_program_machine *machine, const GLuint value[4])

+{

+   const struct prog_dst_register *dstReg = &(inst->DstReg);

+   GLuint writeMask = dstReg->WriteMask;

+   GLuint *dst = (GLuint *) get_dst_register_pointer(dstReg, machine);

+

+   if (dstReg->CondMask != COND_TR) {

+      /* condition codes may turn off some writes */

+      if (writeMask & WRITEMASK_X) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 0)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_X;

+      }

+      if (writeMask & WRITEMASK_Y) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 1)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_Y;

+      }

+      if (writeMask & WRITEMASK_Z) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 2)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_Z;

+      }

+      if (writeMask & WRITEMASK_W) {

+         if (!test_cc(machine->CondCodes[GET_SWZ(dstReg->CondSwizzle, 3)],

+                      dstReg->CondMask))

+            writeMask &= ~WRITEMASK_W;

+      }

+   }

+

+   if (writeMask & WRITEMASK_X)

+      dst[0] = value[0];

+   if (writeMask & WRITEMASK_Y)

+      dst[1] = value[1];

+   if (writeMask & WRITEMASK_Z)

+      dst[2] = value[2];

+   if (writeMask & WRITEMASK_W)

+      dst[3] = value[3];

+

+   if (inst->CondUpdate) {

+      if (writeMask & WRITEMASK_X)

+         machine->CondCodes[0] = generate_cc((float)value[0]);

+      if (writeMask & WRITEMASK_Y)

+         machine->CondCodes[1] = generate_cc((float)value[1]);

+      if (writeMask & WRITEMASK_Z)

+         machine->CondCodes[2] = generate_cc((float)value[2]);

+      if (writeMask & WRITEMASK_W)

+         machine->CondCodes[3] = generate_cc((float)value[3]);

+#if DEBUG_PROG

+      printf("CondCodes=(%s,%s,%s,%s) for:\n",

+             _mesa_condcode_string(machine->CondCodes[0]),

+             _mesa_condcode_string(machine->CondCodes[1]),

+             _mesa_condcode_string(machine->CondCodes[2]),

+             _mesa_condcode_string(machine->CondCodes[3]));

+#endif

+   }

+}

+

+

+

+/**

+ * Execute the given vertex/fragment program.

+ *

+ * \param ctx  rendering context

+ * \param program  the program to execute

+ * \param machine  machine state (must be initialized)

+ * \return GL_TRUE if program completed or GL_FALSE if program executed KIL.

+ */

+GLboolean

+_mesa_execute_program(struct gl_context * ctx,

+                      const struct gl_program *program,

+                      struct gl_program_machine *machine)

+{

+   const GLuint numInst = program->NumInstructions;

+   const GLuint maxExec = 10000;

+   GLuint pc, numExec = 0;

+

+   machine->CurProgram = program;

+

+   if (DEBUG_PROG) {

+      printf("execute program %u --------------------\n", program->Id);

+   }

+

+   if (program->Target == GL_VERTEX_PROGRAM_ARB) {

+      machine->EnvParams = ctx->VertexProgram.Parameters;

+   }

+   else {

+      machine->EnvParams = ctx->FragmentProgram.Parameters;

+   }

+

+   for (pc = 0; pc < numInst; pc++) {

+      const struct prog_instruction *inst = program->Instructions + pc;

+

+      if (DEBUG_PROG) {

+         _mesa_print_instruction(inst);

+      }

+

+      switch (inst->Opcode) {

+      case OPCODE_ABS:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] = FABSF(a[0]);

+            result[1] = FABSF(a[1]);

+            result[2] = FABSF(a[2]);

+            result[3] = FABSF(a[3]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_ADD:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = a[0] + b[0];

+            result[1] = a[1] + b[1];

+            result[2] = a[2] + b[2];

+            result[3] = a[3] + b[3];

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("ADD (%g %g %g %g) = (%g %g %g %g) + (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_AND:     /* bitwise AND */

+         {

+            GLuint a[4], b[4], result[4];

+            fetch_vector4ui(&inst->SrcReg[0], machine, a);

+            fetch_vector4ui(&inst->SrcReg[1], machine, b);

+            result[0] = a[0] & b[0];

+            result[1] = a[1] & b[1];

+            result[2] = a[2] & b[2];

+            result[3] = a[3] & b[3];

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_ARL:

+         {

+            GLfloat t[4];

+            fetch_vector4(&inst->SrcReg[0], machine, t);

+            machine->AddressReg[0][0] = IFLOOR(t[0]);

+            if (DEBUG_PROG) {

+               printf("ARL %d\n", machine->AddressReg[0][0]);

+            }

+         }

+         break;

+      case OPCODE_BGNLOOP:

+         /* no-op */

+         ASSERT(program->Instructions[inst->BranchTarget].Opcode

+                == OPCODE_ENDLOOP);

+         break;

+      case OPCODE_ENDLOOP:

+         /* subtract 1 here since pc is incremented by for(pc) loop */

+         ASSERT(program->Instructions[inst->BranchTarget].Opcode

+                == OPCODE_BGNLOOP);

+         pc = inst->BranchTarget - 1;   /* go to matching BNGLOOP */

+         break;

+      case OPCODE_BGNSUB:      /* begin subroutine */

+         break;

+      case OPCODE_ENDSUB:      /* end subroutine */

+         break;

+      case OPCODE_BRA:         /* branch (conditional) */

+         if (eval_condition(machine, inst)) {

+            /* take branch */

+            /* Subtract 1 here since we'll do pc++ below */

+            pc = inst->BranchTarget - 1;

+         }

+         break;

+      case OPCODE_BRK:         /* break out of loop (conditional) */

+         ASSERT(program->Instructions[inst->BranchTarget].Opcode

+                == OPCODE_ENDLOOP);

+         if (eval_condition(machine, inst)) {

+            /* break out of loop */

+            /* pc++ at end of for-loop will put us after the ENDLOOP inst */

+            pc = inst->BranchTarget;

+         }

+         break;

+      case OPCODE_CONT:        /* continue loop (conditional) */

+         ASSERT(program->Instructions[inst->BranchTarget].Opcode

+                == OPCODE_ENDLOOP);

+         if (eval_condition(machine, inst)) {

+            /* continue at ENDLOOP */

+            /* Subtract 1 here since we'll do pc++ at end of for-loop */

+            pc = inst->BranchTarget - 1;

+         }

+         break;

+      case OPCODE_CAL:         /* Call subroutine (conditional) */

+         if (eval_condition(machine, inst)) {

+            /* call the subroutine */

+            if (machine->StackDepth >= MAX_PROGRAM_CALL_DEPTH) {

+               return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */

+            }

+            machine->CallStack[machine->StackDepth++] = pc + 1; /* next inst */

+            /* Subtract 1 here since we'll do pc++ at end of for-loop */

+            pc = inst->BranchTarget - 1;

+         }

+         break;

+      case OPCODE_CMP:

+         {

+            GLfloat a[4], b[4], c[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            fetch_vector4(&inst->SrcReg[2], machine, c);

+            result[0] = a[0] < 0.0F ? b[0] : c[0];

+            result[1] = a[1] < 0.0F ? b[1] : c[1];

+            result[2] = a[2] < 0.0F ? b[2] : c[2];

+            result[3] = a[3] < 0.0F ? b[3] : c[3];

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("CMP (%g %g %g %g) = (%g %g %g %g) < 0 ? (%g %g %g %g) : (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3],

+                      c[0], c[1], c[2], c[3]);

+            }

+         }

+         break;

+      case OPCODE_COS:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            result[0] = result[1] = result[2] = result[3]

+               = (GLfloat) cos(a[0]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_DDX:         /* Partial derivative with respect to X */

+         {

+            GLfloat result[4];

+            fetch_vector4_deriv(ctx, &inst->SrcReg[0], machine,

+                                'X', result);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_DDY:         /* Partial derivative with respect to Y */

+         {

+            GLfloat result[4];

+            fetch_vector4_deriv(ctx, &inst->SrcReg[0], machine,

+                                'Y', result);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_DP2:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = result[1] = result[2] = result[3] = DOT2(a, b);

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("DP2 %g = (%g %g) . (%g %g)\n",

+                      result[0], a[0], a[1], b[0], b[1]);

+            }

+         }

+         break;

+      case OPCODE_DP2A:

+         {

+            GLfloat a[4], b[4], c, result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            fetch_vector1(&inst->SrcReg[1], machine, &c);

+            result[0] = result[1] = result[2] = result[3] = DOT2(a, b) + c;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("DP2A %g = (%g %g) . (%g %g) + %g\n",

+                      result[0], a[0], a[1], b[0], b[1], c);

+            }

+         }

+         break;

+      case OPCODE_DP3:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = result[1] = result[2] = result[3] = DOT3(a, b);

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("DP3 %g = (%g %g %g) . (%g %g %g)\n",

+                      result[0], a[0], a[1], a[2], b[0], b[1], b[2]);

+            }

+         }

+         break;

+      case OPCODE_DP4:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = result[1] = result[2] = result[3] = DOT4(a, b);

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("DP4 %g = (%g, %g %g %g) . (%g, %g %g %g)\n",

+                      result[0], a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_DPH:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = result[1] = result[2] = result[3] = DOT3(a, b) + b[3];

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_DST:         /* Distance vector */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = 1.0F;

+            result[1] = a[1] * b[1];

+            result[2] = a[2];

+            result[3] = b[3];

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_EXP:

+         {

+            GLfloat t[4], q[4], floor_t0;

+            fetch_vector1(&inst->SrcReg[0], machine, t);

+            floor_t0 = FLOORF(t[0]);

+            if (floor_t0 > FLT_MAX_EXP) {

+               SET_POS_INFINITY(q[0]);

+               SET_POS_INFINITY(q[2]);

+            }

+            else if (floor_t0 < FLT_MIN_EXP) {

+               q[0] = 0.0F;

+               q[2] = 0.0F;

+            }

+            else {

+               q[0] = LDEXPF(1.0, (int) floor_t0);

+               /* Note: GL_NV_vertex_program expects 

+                * result.z = result.x * APPX(result.y)

+                * We do what the ARB extension says.

+                */

+               q[2] = (GLfloat) pow(2.0, t[0]);

+            }

+            q[1] = t[0] - floor_t0;

+            q[3] = 1.0F;

+            store_vector4( inst, machine, q );

+         }

+         break;

+      case OPCODE_EX2:         /* Exponential base 2 */

+         {

+            GLfloat a[4], result[4], val;

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            val = (GLfloat) pow(2.0, a[0]);

+            /*

+            if (IS_INF_OR_NAN(val))

+               val = 1.0e10;

+            */

+            result[0] = result[1] = result[2] = result[3] = val;

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_FLR:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] = FLOORF(a[0]);

+            result[1] = FLOORF(a[1]);

+            result[2] = FLOORF(a[2]);

+            result[3] = FLOORF(a[3]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_FRC:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] = a[0] - FLOORF(a[0]);

+            result[1] = a[1] - FLOORF(a[1]);

+            result[2] = a[2] - FLOORF(a[2]);

+            result[3] = a[3] - FLOORF(a[3]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_IF:

+         {

+            GLboolean cond;

+            ASSERT(program->Instructions[inst->BranchTarget].Opcode

+                   == OPCODE_ELSE ||

+                   program->Instructions[inst->BranchTarget].Opcode

+                   == OPCODE_ENDIF);

+            /* eval condition */

+            if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {

+               GLfloat a[4];

+               fetch_vector1(&inst->SrcReg[0], machine, a);

+               cond = (a[0] != 0.0);

+            }

+            else {

+               cond = eval_condition(machine, inst);

+            }

+            if (DEBUG_PROG) {

+               printf("IF: %d\n", cond);

+            }

+            /* do if/else */

+            if (cond) {

+               /* do if-clause (just continue execution) */

+            }

+            else {

+               /* go to the instruction after ELSE or ENDIF */

+               assert(inst->BranchTarget >= 0);

+               pc = inst->BranchTarget;

+            }

+         }

+         break;

+      case OPCODE_ELSE:

+         /* goto ENDIF */

+         ASSERT(program->Instructions[inst->BranchTarget].Opcode

+                == OPCODE_ENDIF);

+         assert(inst->BranchTarget >= 0);

+         pc = inst->BranchTarget;

+         break;

+      case OPCODE_ENDIF:

+         /* nothing */

+         break;

+      case OPCODE_KIL_NV:      /* NV_f_p only (conditional) */

+         if (eval_condition(machine, inst)) {

+            return GL_FALSE;

+         }

+         break;

+      case OPCODE_KIL:         /* ARB_f_p only */

+         {

+            GLfloat a[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            if (DEBUG_PROG) {

+               printf("KIL if (%g %g %g %g) <= 0.0\n",

+                      a[0], a[1], a[2], a[3]);

+            }

+

+            if (a[0] < 0.0F || a[1] < 0.0F || a[2] < 0.0F || a[3] < 0.0F) {

+               return GL_FALSE;

+            }

+         }

+         break;

+      case OPCODE_LG2:         /* log base 2 */

+         {

+            GLfloat a[4], result[4], val;

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+	    /* The fast LOG2 macro doesn't meet the precision requirements.

+	     */

+            if (a[0] == 0.0F) {

+               val = -FLT_MAX;

+            }

+            else {

+               val = (float)(log(a[0]) * 1.442695F);

+            }

+            result[0] = result[1] = result[2] = result[3] = val;

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_LIT:

+         {

+            const GLfloat epsilon = 1.0F / 256.0F;      /* from NV VP spec */

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            a[0] = MAX2(a[0], 0.0F);

+            a[1] = MAX2(a[1], 0.0F);

+            /* XXX ARB version clamps a[3], NV version doesn't */

+            a[3] = CLAMP(a[3], -(128.0F - epsilon), (128.0F - epsilon));

+            result[0] = 1.0F;

+            result[1] = a[0];

+            /* XXX we could probably just use pow() here */

+            if (a[0] > 0.0F) {

+               if (a[1] == 0.0 && a[3] == 0.0)

+                  result[2] = 1.0F;

+               else

+                  result[2] = (GLfloat) pow(a[1], a[3]);

+            }

+            else {

+               result[2] = 0.0F;

+            }

+            result[3] = 1.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("LIT (%g %g %g %g) : (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3]);

+            }

+         }

+         break;

+      case OPCODE_LOG:

+         {

+            GLfloat t[4], q[4], abs_t0;

+            fetch_vector1(&inst->SrcReg[0], machine, t);

+            abs_t0 = FABSF(t[0]);

+            if (abs_t0 != 0.0F) {

+               /* Since we really can't handle infinite values on VMS

+                * like other OSes we'll use __MAXFLOAT to represent

+                * infinity.  This may need some tweaking.

+                */

+#ifdef VMS

+               if (abs_t0 == __MAXFLOAT)

+#else

+               if (IS_INF_OR_NAN(abs_t0))

+#endif

+               {

+                  SET_POS_INFINITY(q[0]);

+                  q[1] = 1.0F;

+                  SET_POS_INFINITY(q[2]);

+               }

+               else {

+                  int exponent;

+                  GLfloat mantissa = FREXPF(t[0], &exponent);

+                  q[0] = (GLfloat) (exponent - 1);

+                  q[1] = (GLfloat) (2.0 * mantissa); /* map [.5, 1) -> [1, 2) */

+

+		  /* The fast LOG2 macro doesn't meet the precision

+		   * requirements.

+		   */

+                  q[2] = (float)(log(t[0]) * 1.442695F);

+               }

+            }

+            else {

+               SET_NEG_INFINITY(q[0]);

+               q[1] = 1.0F;

+               SET_NEG_INFINITY(q[2]);

+            }

+            q[3] = 1.0;

+            store_vector4(inst, machine, q);

+         }

+         break;

+      case OPCODE_LRP:

+         {

+            GLfloat a[4], b[4], c[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            fetch_vector4(&inst->SrcReg[2], machine, c);

+            result[0] = a[0] * b[0] + (1.0F - a[0]) * c[0];

+            result[1] = a[1] * b[1] + (1.0F - a[1]) * c[1];

+            result[2] = a[2] * b[2] + (1.0F - a[2]) * c[2];

+            result[3] = a[3] * b[3] + (1.0F - a[3]) * c[3];

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("LRP (%g %g %g %g) = (%g %g %g %g), "

+                      "(%g %g %g %g), (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3], c[0], c[1], c[2], c[3]);

+            }

+         }

+         break;

+      case OPCODE_MAD:

+         {

+            GLfloat a[4], b[4], c[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            fetch_vector4(&inst->SrcReg[2], machine, c);

+            result[0] = a[0] * b[0] + c[0];

+            result[1] = a[1] * b[1] + c[1];

+            result[2] = a[2] * b[2] + c[2];

+            result[3] = a[3] * b[3] + c[3];

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("MAD (%g %g %g %g) = (%g %g %g %g) * "

+                      "(%g %g %g %g) + (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3], c[0], c[1], c[2], c[3]);

+            }

+         }

+         break;

+      case OPCODE_MAX:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = MAX2(a[0], b[0]);

+            result[1] = MAX2(a[1], b[1]);

+            result[2] = MAX2(a[2], b[2]);

+            result[3] = MAX2(a[3], b[3]);

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("MAX (%g %g %g %g) = (%g %g %g %g), (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_MIN:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = MIN2(a[0], b[0]);

+            result[1] = MIN2(a[1], b[1]);

+            result[2] = MIN2(a[2], b[2]);

+            result[3] = MIN2(a[3], b[3]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_MOV:

+         {

+            GLfloat result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, result);

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("MOV (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3]);

+            }

+         }

+         break;

+      case OPCODE_MUL:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = a[0] * b[0];

+            result[1] = a[1] * b[1];

+            result[2] = a[2] * b[2];

+            result[3] = a[3] * b[3];

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("MUL (%g %g %g %g) = (%g %g %g %g) * (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_NOISE1:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            result[0] =

+               result[1] =

+               result[2] =

+               result[3] = _mesa_noise1(a[0]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_NOISE2:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] =

+               result[1] =

+               result[2] = result[3] = _mesa_noise2(a[0], a[1]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_NOISE3:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] =

+               result[1] =

+               result[2] =

+               result[3] = _mesa_noise3(a[0], a[1], a[2]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_NOISE4:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] =

+               result[1] =

+               result[2] =

+               result[3] = _mesa_noise4(a[0], a[1], a[2], a[3]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_NOP:

+         break;

+      case OPCODE_NOT:         /* bitwise NOT */

+         {

+            GLuint a[4], result[4];

+            fetch_vector4ui(&inst->SrcReg[0], machine, a);

+            result[0] = ~a[0];

+            result[1] = ~a[1];

+            result[2] = ~a[2];

+            result[3] = ~a[3];

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_NRM3:        /* 3-component normalization */

+         {

+            GLfloat a[4], result[4];

+            GLfloat tmp;

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            tmp = a[0] * a[0] + a[1] * a[1] + a[2] * a[2];

+            if (tmp != 0.0F)

+               tmp = INV_SQRTF(tmp);

+            result[0] = tmp * a[0];

+            result[1] = tmp * a[1];

+            result[2] = tmp * a[2];

+            result[3] = 0.0;  /* undefined, but prevent valgrind warnings */

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_NRM4:        /* 4-component normalization */

+         {

+            GLfloat a[4], result[4];

+            GLfloat tmp;

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            tmp = a[0] * a[0] + a[1] * a[1] + a[2] * a[2] + a[3] * a[3];

+            if (tmp != 0.0F)

+               tmp = INV_SQRTF(tmp);

+            result[0] = tmp * a[0];

+            result[1] = tmp * a[1];

+            result[2] = tmp * a[2];

+            result[3] = tmp * a[3];

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_OR:          /* bitwise OR */

+         {

+            GLuint a[4], b[4], result[4];

+            fetch_vector4ui(&inst->SrcReg[0], machine, a);

+            fetch_vector4ui(&inst->SrcReg[1], machine, b);

+            result[0] = a[0] | b[0];

+            result[1] = a[1] | b[1];

+            result[2] = a[2] | b[2];

+            result[3] = a[3] | b[3];

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_PK2H:        /* pack two 16-bit floats in one 32-bit float */

+         {

+            GLfloat a[4];

+            GLuint result[4];

+            GLhalfNV hx, hy;

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            hx = _mesa_float_to_half(a[0]);

+            hy = _mesa_float_to_half(a[1]);

+            result[0] =

+            result[1] =

+            result[2] =

+            result[3] = hx | (hy << 16);

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_PK2US:       /* pack two GLushorts into one 32-bit float */

+         {

+            GLfloat a[4];

+            GLuint result[4], usx, usy;

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            a[0] = CLAMP(a[0], 0.0F, 1.0F);

+            a[1] = CLAMP(a[1], 0.0F, 1.0F);

+            usx = IROUND(a[0] * 65535.0F);

+            usy = IROUND(a[1] * 65535.0F);

+            result[0] =

+            result[1] =

+            result[2] =

+            result[3] = usx | (usy << 16);

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_PK4B:        /* pack four GLbytes into one 32-bit float */

+         {

+            GLfloat a[4];

+            GLuint result[4], ubx, uby, ubz, ubw;

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            a[0] = CLAMP(a[0], -128.0F / 127.0F, 1.0F);

+            a[1] = CLAMP(a[1], -128.0F / 127.0F, 1.0F);

+            a[2] = CLAMP(a[2], -128.0F / 127.0F, 1.0F);

+            a[3] = CLAMP(a[3], -128.0F / 127.0F, 1.0F);

+            ubx = IROUND(127.0F * a[0] + 128.0F);

+            uby = IROUND(127.0F * a[1] + 128.0F);

+            ubz = IROUND(127.0F * a[2] + 128.0F);

+            ubw = IROUND(127.0F * a[3] + 128.0F);

+            result[0] =

+            result[1] =

+            result[2] =

+            result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_PK4UB:       /* pack four GLubytes into one 32-bit float */

+         {

+            GLfloat a[4];

+            GLuint result[4], ubx, uby, ubz, ubw;

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            a[0] = CLAMP(a[0], 0.0F, 1.0F);

+            a[1] = CLAMP(a[1], 0.0F, 1.0F);

+            a[2] = CLAMP(a[2], 0.0F, 1.0F);

+            a[3] = CLAMP(a[3], 0.0F, 1.0F);

+            ubx = IROUND(255.0F * a[0]);

+            uby = IROUND(255.0F * a[1]);

+            ubz = IROUND(255.0F * a[2]);

+            ubw = IROUND(255.0F * a[3]);

+            result[0] =

+            result[1] =

+            result[2] =

+            result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_POW:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            fetch_vector1(&inst->SrcReg[1], machine, b);

+            result[0] = result[1] = result[2] = result[3]

+               = (GLfloat) pow(a[0], b[0]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_RCC:  /* clamped riciprocal */

+         {

+            const float largest = 1.884467e+19, smallest = 5.42101e-20;

+            GLfloat a[4], r, result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            if (DEBUG_PROG) {

+               if (a[0] == 0)

+                  printf("RCC(0)\n");

+               else if (IS_INF_OR_NAN(a[0]))

+                  printf("RCC(inf)\n");

+            }

+            if (a[0] == 1.0F) {

+               r = 1.0F;

+            }

+            else {

+               r = 1.0F / a[0];

+            }

+            if (positive(r)) {

+               if (r > largest) {

+                  r = largest;

+               }

+               else if (r < smallest) {

+                  r = smallest;

+               }

+            }

+            else {

+               if (r < -largest) {

+                  r = -largest;

+               }

+               else if (r > -smallest) {

+                  r = -smallest;

+               }

+            }

+            result[0] = result[1] = result[2] = result[3] = r;

+            store_vector4(inst, machine, result);

+         }

+         break;

+

+      case OPCODE_RCP:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            if (DEBUG_PROG) {

+               if (a[0] == 0)

+                  printf("RCP(0)\n");

+               else if (IS_INF_OR_NAN(a[0]))

+                  printf("RCP(inf)\n");

+            }

+            result[0] = result[1] = result[2] = result[3] = 1.0F / a[0];

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_RET:         /* return from subroutine (conditional) */

+         if (eval_condition(machine, inst)) {

+            if (machine->StackDepth == 0) {

+               return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */

+            }

+            /* subtract one because of pc++ in the for loop */

+            pc = machine->CallStack[--machine->StackDepth] - 1;

+         }

+         break;

+      case OPCODE_RFL:         /* reflection vector */

+         {

+            GLfloat axis[4], dir[4], result[4], tmpX, tmpW;

+            fetch_vector4(&inst->SrcReg[0], machine, axis);

+            fetch_vector4(&inst->SrcReg[1], machine, dir);

+            tmpW = DOT3(axis, axis);

+            tmpX = (2.0F * DOT3(axis, dir)) / tmpW;

+            result[0] = tmpX * axis[0] - dir[0];

+            result[1] = tmpX * axis[1] - dir[1];

+            result[2] = tmpX * axis[2] - dir[2];

+            /* result[3] is never written! XXX enforce in parser! */

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_RSQ:         /* 1 / sqrt() */

+         {

+            GLfloat a[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            a[0] = FABSF(a[0]);

+            result[0] = result[1] = result[2] = result[3] = INV_SQRTF(a[0]);

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("RSQ %g = 1/sqrt(|%g|)\n", result[0], a[0]);

+            }

+         }

+         break;

+      case OPCODE_SCS:         /* sine and cos */

+         {

+            GLfloat a[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            result[0] = (GLfloat) cos(a[0]);

+            result[1] = (GLfloat) sin(a[0]);

+            result[2] = 0.0;    /* undefined! */

+            result[3] = 0.0;    /* undefined! */

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_SEQ:         /* set on equal */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = (a[0] == b[0]) ? 1.0F : 0.0F;

+            result[1] = (a[1] == b[1]) ? 1.0F : 0.0F;

+            result[2] = (a[2] == b[2]) ? 1.0F : 0.0F;

+            result[3] = (a[3] == b[3]) ? 1.0F : 0.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SEQ (%g %g %g %g) = (%g %g %g %g) == (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SFL:         /* set false, operands ignored */

+         {

+            static const GLfloat result[4] = { 0.0F, 0.0F, 0.0F, 0.0F };

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_SGE:         /* set on greater or equal */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = (a[0] >= b[0]) ? 1.0F : 0.0F;

+            result[1] = (a[1] >= b[1]) ? 1.0F : 0.0F;

+            result[2] = (a[2] >= b[2]) ? 1.0F : 0.0F;

+            result[3] = (a[3] >= b[3]) ? 1.0F : 0.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SGE (%g %g %g %g) = (%g %g %g %g) >= (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SGT:         /* set on greater */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = (a[0] > b[0]) ? 1.0F : 0.0F;

+            result[1] = (a[1] > b[1]) ? 1.0F : 0.0F;

+            result[2] = (a[2] > b[2]) ? 1.0F : 0.0F;

+            result[3] = (a[3] > b[3]) ? 1.0F : 0.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SGT (%g %g %g %g) = (%g %g %g %g) > (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SIN:

+         {

+            GLfloat a[4], result[4];

+            fetch_vector1(&inst->SrcReg[0], machine, a);

+            result[0] = result[1] = result[2] = result[3]

+               = (GLfloat) sin(a[0]);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_SLE:         /* set on less or equal */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = (a[0] <= b[0]) ? 1.0F : 0.0F;

+            result[1] = (a[1] <= b[1]) ? 1.0F : 0.0F;

+            result[2] = (a[2] <= b[2]) ? 1.0F : 0.0F;

+            result[3] = (a[3] <= b[3]) ? 1.0F : 0.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SLE (%g %g %g %g) = (%g %g %g %g) <= (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SLT:         /* set on less */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = (a[0] < b[0]) ? 1.0F : 0.0F;

+            result[1] = (a[1] < b[1]) ? 1.0F : 0.0F;

+            result[2] = (a[2] < b[2]) ? 1.0F : 0.0F;

+            result[3] = (a[3] < b[3]) ? 1.0F : 0.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SLT (%g %g %g %g) = (%g %g %g %g) < (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SNE:         /* set on not equal */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = (a[0] != b[0]) ? 1.0F : 0.0F;

+            result[1] = (a[1] != b[1]) ? 1.0F : 0.0F;

+            result[2] = (a[2] != b[2]) ? 1.0F : 0.0F;

+            result[3] = (a[3] != b[3]) ? 1.0F : 0.0F;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SNE (%g %g %g %g) = (%g %g %g %g) != (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3],

+                      b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SSG:         /* set sign (-1, 0 or +1) */

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] = (GLfloat) ((a[0] > 0.0F) - (a[0] < 0.0F));

+            result[1] = (GLfloat) ((a[1] > 0.0F) - (a[1] < 0.0F));

+            result[2] = (GLfloat) ((a[2] > 0.0F) - (a[2] < 0.0F));

+            result[3] = (GLfloat) ((a[3] > 0.0F) - (a[3] < 0.0F));

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_STR:         /* set true, operands ignored */

+         {

+            static const GLfloat result[4] = { 1.0F, 1.0F, 1.0F, 1.0F };

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_SUB:

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = a[0] - b[0];

+            result[1] = a[1] - b[1];

+            result[2] = a[2] - b[2];

+            result[3] = a[3] - b[3];

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("SUB (%g %g %g %g) = (%g %g %g %g) - (%g %g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);

+            }

+         }

+         break;

+      case OPCODE_SWZ:         /* extended swizzle */

+         {

+            const struct prog_src_register *source = &inst->SrcReg[0];

+            const GLfloat *src = get_src_register_pointer(source, machine);

+            GLfloat result[4];

+            GLuint i;

+            for (i = 0; i < 4; i++) {

+               const GLuint swz = GET_SWZ(source->Swizzle, i);

+               if (swz == SWIZZLE_ZERO)

+                  result[i] = 0.0;

+               else if (swz == SWIZZLE_ONE)

+                  result[i] = 1.0;

+               else {

+                  ASSERT(swz >= 0);

+                  ASSERT(swz <= 3);

+                  result[i] = src[swz];

+               }

+               if (source->Negate & (1 << i))

+                  result[i] = -result[i];

+            }

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_TEX:         /* Both ARB and NV frag prog */

+         /* Simple texel lookup */

+         {

+            GLfloat texcoord[4], color[4];

+            fetch_vector4(&inst->SrcReg[0], machine, texcoord);

+

+            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);

+

+            if (DEBUG_PROG) {

+               printf("TEX (%g, %g, %g, %g) = texture[%d][%g, %g, %g, %g]\n",

+                      color[0], color[1], color[2], color[3],

+                      inst->TexSrcUnit,

+                      texcoord[0], texcoord[1], texcoord[2], texcoord[3]);

+            }

+            store_vector4(inst, machine, color);

+         }

+         break;

+      case OPCODE_TXB:         /* GL_ARB_fragment_program only */

+         /* Texel lookup with LOD bias */

+         {

+            GLfloat texcoord[4], color[4], lodBias;

+

+            fetch_vector4(&inst->SrcReg[0], machine, texcoord);

+

+            /* texcoord[3] is the bias to add to lambda */

+            lodBias = texcoord[3];

+

+            fetch_texel(ctx, machine, inst, texcoord, lodBias, color);

+

+            if (DEBUG_PROG) {

+               printf("TXB (%g, %g, %g, %g) = texture[%d][%g %g %g %g]"

+                      "  bias %g\n",

+                      color[0], color[1], color[2], color[3],

+                      inst->TexSrcUnit,

+                      texcoord[0],

+                      texcoord[1],

+                      texcoord[2],

+                      texcoord[3],

+                      lodBias);

+            }

+

+            store_vector4(inst, machine, color);

+         }

+         break;

+      case OPCODE_TXD:         /* GL_NV_fragment_program only */

+         /* Texture lookup w/ partial derivatives for LOD */

+         {

+            GLfloat texcoord[4], dtdx[4], dtdy[4], color[4];

+            fetch_vector4(&inst->SrcReg[0], machine, texcoord);

+            fetch_vector4(&inst->SrcReg[1], machine, dtdx);

+            fetch_vector4(&inst->SrcReg[2], machine, dtdy);

+            machine->FetchTexelDeriv(ctx, texcoord, dtdx, dtdy,

+                                     0.0, /* lodBias */

+                                     inst->TexSrcUnit, color);

+            store_vector4(inst, machine, color);

+         }

+         break;

+      case OPCODE_TXL:

+         /* Texel lookup with explicit LOD */

+         {

+            GLfloat texcoord[4], color[4], lod;

+

+            fetch_vector4(&inst->SrcReg[0], machine, texcoord);

+

+            /* texcoord[3] is the LOD */

+            lod = texcoord[3];

+

+	    machine->FetchTexelLod(ctx, texcoord, lod,

+				   machine->Samplers[inst->TexSrcUnit], color);

+

+            store_vector4(inst, machine, color);

+         }

+         break;

+      case OPCODE_TXP:         /* GL_ARB_fragment_program only */

+         /* Texture lookup w/ projective divide */

+         {

+            GLfloat texcoord[4], color[4];

+

+            fetch_vector4(&inst->SrcReg[0], machine, texcoord);

+            /* Not so sure about this test - if texcoord[3] is

+             * zero, we'd probably be fine except for an ASSERT in

+             * IROUND_POS() which gets triggered by the inf values created.

+             */

+            if (texcoord[3] != 0.0) {

+               texcoord[0] /= texcoord[3];

+               texcoord[1] /= texcoord[3];

+               texcoord[2] /= texcoord[3];

+            }

+

+            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);

+

+            store_vector4(inst, machine, color);

+         }

+         break;

+      case OPCODE_TXP_NV:      /* GL_NV_fragment_program only */

+         /* Texture lookup w/ projective divide, as above, but do not

+          * do the divide by w if sampling from a cube map.

+          */

+         {

+            GLfloat texcoord[4], color[4];

+

+            fetch_vector4(&inst->SrcReg[0], machine, texcoord);

+            if (inst->TexSrcTarget != TEXTURE_CUBE_INDEX &&

+                texcoord[3] != 0.0) {

+               texcoord[0] /= texcoord[3];

+               texcoord[1] /= texcoord[3];

+               texcoord[2] /= texcoord[3];

+            }

+

+            fetch_texel(ctx, machine, inst, texcoord, 0.0, color);

+

+            store_vector4(inst, machine, color);

+         }

+         break;

+      case OPCODE_TRUNC:       /* truncate toward zero */

+         {

+            GLfloat a[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            result[0] = (GLfloat) (GLint) a[0];

+            result[1] = (GLfloat) (GLint) a[1];

+            result[2] = (GLfloat) (GLint) a[2];

+            result[3] = (GLfloat) (GLint) a[3];

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_UP2H:        /* unpack two 16-bit floats */

+         {

+            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);

+            GLfloat result[4];

+            GLushort hx, hy;

+            hx = raw & 0xffff;

+            hy = raw >> 16;

+            result[0] = result[2] = _mesa_half_to_float(hx);

+            result[1] = result[3] = _mesa_half_to_float(hy);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_UP2US:       /* unpack two GLushorts */

+         {

+            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);

+            GLfloat result[4];

+            GLushort usx, usy;

+            usx = raw & 0xffff;

+            usy = raw >> 16;

+            result[0] = result[2] = usx * (1.0f / 65535.0f);

+            result[1] = result[3] = usy * (1.0f / 65535.0f);

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_UP4B:        /* unpack four GLbytes */

+         {

+            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);

+            GLfloat result[4];

+            result[0] = (((raw >> 0) & 0xff) - 128) / 127.0F;

+            result[1] = (((raw >> 8) & 0xff) - 128) / 127.0F;

+            result[2] = (((raw >> 16) & 0xff) - 128) / 127.0F;

+            result[3] = (((raw >> 24) & 0xff) - 128) / 127.0F;

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_UP4UB:       /* unpack four GLubytes */

+         {

+            const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);

+            GLfloat result[4];

+            result[0] = ((raw >> 0) & 0xff) / 255.0F;

+            result[1] = ((raw >> 8) & 0xff) / 255.0F;

+            result[2] = ((raw >> 16) & 0xff) / 255.0F;

+            result[3] = ((raw >> 24) & 0xff) / 255.0F;

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_XOR:         /* bitwise XOR */

+         {

+            GLuint a[4], b[4], result[4];

+            fetch_vector4ui(&inst->SrcReg[0], machine, a);

+            fetch_vector4ui(&inst->SrcReg[1], machine, b);

+            result[0] = a[0] ^ b[0];

+            result[1] = a[1] ^ b[1];

+            result[2] = a[2] ^ b[2];

+            result[3] = a[3] ^ b[3];

+            store_vector4ui(inst, machine, result);

+         }

+         break;

+      case OPCODE_XPD:         /* cross product */

+         {

+            GLfloat a[4], b[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            result[0] = a[1] * b[2] - a[2] * b[1];

+            result[1] = a[2] * b[0] - a[0] * b[2];

+            result[2] = a[0] * b[1] - a[1] * b[0];

+            result[3] = 1.0;

+            store_vector4(inst, machine, result);

+            if (DEBUG_PROG) {

+               printf("XPD (%g %g %g %g) = (%g %g %g) X (%g %g %g)\n",

+                      result[0], result[1], result[2], result[3],

+                      a[0], a[1], a[2], b[0], b[1], b[2]);

+            }

+         }

+         break;

+      case OPCODE_X2D:         /* 2-D matrix transform */

+         {

+            GLfloat a[4], b[4], c[4], result[4];

+            fetch_vector4(&inst->SrcReg[0], machine, a);

+            fetch_vector4(&inst->SrcReg[1], machine, b);

+            fetch_vector4(&inst->SrcReg[2], machine, c);

+            result[0] = a[0] + b[0] * c[0] + b[1] * c[1];

+            result[1] = a[1] + b[0] * c[2] + b[1] * c[3];

+            result[2] = a[2] + b[0] * c[0] + b[1] * c[1];

+            result[3] = a[3] + b[0] * c[2] + b[1] * c[3];

+            store_vector4(inst, machine, result);

+         }

+         break;

+      case OPCODE_PRINT:

+         {

+            if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {

+               GLfloat a[4];

+               fetch_vector4(&inst->SrcReg[0], machine, a);

+               printf("%s%g, %g, %g, %g\n", (const char *) inst->Data,

+                            a[0], a[1], a[2], a[3]);

+            }

+            else {

+               printf("%s\n", (const char *) inst->Data);

+            }

+         }

+         break;

+      case OPCODE_END:

+         return GL_TRUE;

+      default:

+         _mesa_problem(ctx, "Bad opcode %d in _mesa_execute_program",

+                       inst->Opcode);

+         return GL_TRUE;        /* return value doesn't matter */

+      }

+

+      numExec++;

+      if (numExec > maxExec) {

+	 static GLboolean reported = GL_FALSE;

+	 if (!reported) {

+	    _mesa_problem(ctx, "Infinite loop detected in fragment program");

+	    reported = GL_TRUE;

+	 }

+         return GL_TRUE;

+      }

+

+   } /* for pc */

+

+   return GL_TRUE;

+}

diff --git a/mesalib/src/mesa/program/prog_execute.h b/mesalib/src/mesa/program/prog_execute.h
index f59b65176..ac71c0da3 100644
--- a/mesalib/src/mesa/program/prog_execute.h
+++ b/mesalib/src/mesa/program/prog_execute.h
@@ -1,86 +1,86 @@
-/*
- * 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.
- */
-
-#ifndef PROG_EXECUTE_H
-#define PROG_EXECUTE_H
-
-#include "main/config.h"
-#include "main/mtypes.h"
-
-
-typedef void (*FetchTexelLodFunc)(GLcontext *ctx, const GLfloat texcoord[4],
-                                  GLfloat lambda, GLuint unit, GLfloat color[4]);
-
-typedef void (*FetchTexelDerivFunc)(GLcontext *ctx, const GLfloat texcoord[4],
-                                    const GLfloat texdx[4],
-                                    const GLfloat texdy[4],
-                                    GLfloat lodBias,
-                                    GLuint unit, GLfloat color[4]);
-
-
-/**
- * Virtual machine state used during execution of vertex/fragment programs.
- */
-struct gl_program_machine
-{
-   const struct gl_program *CurProgram;
-
-   /** Fragment Input attributes */
-   GLfloat (*Attribs)[MAX_WIDTH][4];
-   GLfloat (*DerivX)[4];
-   GLfloat (*DerivY)[4];
-   GLuint NumDeriv; /**< Max index into DerivX/Y arrays */
-   GLuint CurElement; /**< Index into Attribs arrays */
-
-   /** Vertex Input attribs */
-   GLfloat VertAttribs[VERT_ATTRIB_MAX][4];
-
-   GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
-   GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
-   GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */
-   GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */
-   GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];
-
-   const GLubyte *Samplers;  /** Array mapping sampler var to tex unit */
-
-   GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
-   GLuint StackDepth; /**< Index/ptr to top of CallStack[] */
-
-   /** Texture fetch functions */
-   FetchTexelLodFunc FetchTexelLod;
-   FetchTexelDerivFunc FetchTexelDeriv;
-};
-
-
-extern void
-_mesa_get_program_register(GLcontext *ctx, gl_register_file file,
-                           GLuint index, GLfloat val[4]);
-
-extern GLboolean
-_mesa_execute_program(GLcontext *ctx,
-                      const struct gl_program *program,
-                      struct gl_program_machine *machine);
-
-
-#endif /* PROG_EXECUTE_H */
+/*

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

+ */

+

+#ifndef PROG_EXECUTE_H

+#define PROG_EXECUTE_H

+

+#include "main/config.h"

+#include "main/mtypes.h"

+

+

+typedef void (*FetchTexelLodFunc)(struct gl_context *ctx, const GLfloat texcoord[4],

+                                  GLfloat lambda, GLuint unit, GLfloat color[4]);

+

+typedef void (*FetchTexelDerivFunc)(struct gl_context *ctx, const GLfloat texcoord[4],

+                                    const GLfloat texdx[4],

+                                    const GLfloat texdy[4],

+                                    GLfloat lodBias,

+                                    GLuint unit, GLfloat color[4]);

+

+

+/**

+ * Virtual machine state used during execution of vertex/fragment programs.

+ */

+struct gl_program_machine

+{

+   const struct gl_program *CurProgram;

+

+   /** Fragment Input attributes */

+   GLfloat (*Attribs)[MAX_WIDTH][4];

+   GLfloat (*DerivX)[4];

+   GLfloat (*DerivY)[4];

+   GLuint NumDeriv; /**< Max index into DerivX/Y arrays */

+   GLuint CurElement; /**< Index into Attribs arrays */

+

+   /** Vertex Input attribs */

+   GLfloat VertAttribs[VERT_ATTRIB_MAX][4];

+

+   GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];

+   GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];

+   GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */

+   GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */

+   GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];

+

+   const GLubyte *Samplers;  /** Array mapping sampler var to tex unit */

+

+   GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */

+   GLuint StackDepth; /**< Index/ptr to top of CallStack[] */

+

+   /** Texture fetch functions */

+   FetchTexelLodFunc FetchTexelLod;

+   FetchTexelDerivFunc FetchTexelDeriv;

+};

+

+

+extern void

+_mesa_get_program_register(struct gl_context *ctx, gl_register_file file,

+                           GLuint index, GLfloat val[4]);

+

+extern GLboolean

+_mesa_execute_program(struct gl_context *ctx,

+                      const struct gl_program *program,

+                      struct gl_program_machine *machine);

+

+

+#endif /* PROG_EXECUTE_H */

diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h
index ca90de7ce..0a88e0d70 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 10
-
-
-/**
- * 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 11

+

+

+/**

+ * 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 0dc779073..892f5b6ec 100644
--- a/mesalib/src/mesa/program/prog_optimize.c
+++ b/mesalib/src/mesa/program/prog_optimize.c
@@ -1,1250 +1,1250 @@
-/*
- * 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;
-
-   /* 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) {
-	 ic = loopStack[i].End;
-	 break;
-      }
-   }
-
-   ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);
-   if (intBegin[index] == -1) {
-      ASSERT(intEnd[index] == -1);
-      intBegin[index] = intEnd[index] = ic;
-   }
-   else {
-      intEnd[index] = ic;
-   }
-}
-
-
-/**
- * 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(GLcontext *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(GLcontext *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;

+

+   /* 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) {

+	 ic = loopStack[i].End;

+	 break;

+      }

+   }

+

+   ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);

+   if (intBegin[index] == -1) {

+      ASSERT(intEnd[index] == -1);

+      intBegin[index] = intEnd[index] = ic;

+   }

+   else {

+      intEnd[index] = ic;

+   }

+}

+

+

+/**

+ * 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_optimize.h b/mesalib/src/mesa/program/prog_optimize.h
index 06cd9cb2c..8dc58ee52 100644
--- a/mesalib/src/mesa/program/prog_optimize.h
+++ b/mesalib/src/mesa/program/prog_optimize.h
@@ -1,46 +1,47 @@
-/*
- * 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.
- */
-
-#ifndef PROG_OPT_H
-#define PROG_OPT_H
-
-
-#include "main/config.h"
-#include "main/mtypes.h"
-
-
-struct gl_program;
-struct prog_instruction;
-
-
-extern GLboolean
-_mesa_find_temp_intervals(const struct prog_instruction *instructions,
-                          GLuint numInstructions,
-                          GLint intBegin[MAX_PROGRAM_TEMPS],
-                          GLint intEnd[MAX_PROGRAM_TEMPS]);
-
-extern void
-_mesa_optimize_program(GLcontext *ctx, struct gl_program *program);
-
-#endif
+/*

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

+ */

+

+#ifndef PROG_OPT_H

+#define PROG_OPT_H

+

+

+#include "main/config.h"

+#include "main/glheader.h"

+

+

+struct gl_context;

+struct gl_program;

+struct prog_instruction;

+

+

+extern GLboolean

+_mesa_find_temp_intervals(const struct prog_instruction *instructions,

+                          GLuint numInstructions,

+                          GLint intBegin[MAX_PROGRAM_TEMPS],

+                          GLint intEnd[MAX_PROGRAM_TEMPS]);

+

+extern void

+_mesa_optimize_program(struct gl_context *ctx, struct gl_program *program);

+

+#endif

diff --git a/mesalib/src/mesa/program/prog_parameter.c b/mesalib/src/mesa/program/prog_parameter.c
index 6bf8a081b..157e31b56 100644
--- a/mesalib/src/mesa/program/prog_parameter.c
+++ b/mesalib/src/mesa/program/prog_parameter.c
@@ -1,665 +1,656 @@
-/*
- * 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_parameter.c
- * Program parameter lists and functions.
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_statevars.h"
-
-
-struct gl_program_parameter_list *
-_mesa_new_parameter_list(void)
-{
-   return CALLOC_STRUCT(gl_program_parameter_list);
-}
-
-
-struct gl_program_parameter_list *
-_mesa_new_parameter_list_sized(unsigned size)
-{
-   struct gl_program_parameter_list *p = _mesa_new_parameter_list();
-
-   if ((p != NULL) && (size != 0)) {
-      p->Size = size;
-
-      /* alloc arrays */
-      p->Parameters = (struct gl_program_parameter *)
-	 calloc(1, size * sizeof(struct gl_program_parameter));
-
-      p->ParameterValues = (GLfloat (*)[4])
-         _mesa_align_malloc(size * 4 *sizeof(GLfloat), 16);
-
-
-      if ((p->Parameters == NULL) || (p->ParameterValues == NULL)) {
-	 free(p->Parameters);
-	 _mesa_align_free(p->ParameterValues);
-	 free(p);
-	 p = NULL;
-      }
-   }
-
-   return p;
-}
-
-
-/**
- * Free a parameter list and all its parameters
- */
-void
-_mesa_free_parameter_list(struct gl_program_parameter_list *paramList)
-{
-   GLuint i;
-   for (i = 0; i < paramList->NumParameters; i++) {
-      if (paramList->Parameters[i].Name)
-	 free((void *) paramList->Parameters[i].Name);
-   }
-   free(paramList->Parameters);
-   if (paramList->ParameterValues)
-      _mesa_align_free(paramList->ParameterValues);
-   free(paramList);
-}
-
-
-/**
- * Add a new parameter to a parameter list.
- * Note that parameter values are usually 4-element GLfloat vectors.
- * When size > 4 we'll allocate a sequential block of parameters to
- * store all the values (in blocks of 4).
- *
- * \param paramList  the list to add the parameter to
- * \param type  type of parameter, such as 
- * \param name  the parameter name, will be duplicated/copied!
- * \param size  number of elements in 'values' vector (1..4, or more)
- * \param datatype  GL_FLOAT, GL_FLOAT_VECx, GL_INT, GL_INT_VECx or GL_NONE.
- * \param values  initial parameter value, up to 4 GLfloats, or NULL
- * \param state  state indexes, or NULL
- * \return  index of new parameter in the list, or -1 if error (out of mem)
- */
-GLint
-_mesa_add_parameter(struct gl_program_parameter_list *paramList,
-                    gl_register_file type, const char *name,
-                    GLuint size, GLenum datatype, const GLfloat *values,
-                    const gl_state_index state[STATE_LENGTH],
-                    GLbitfield flags)
-{
-   const GLuint oldNum = paramList->NumParameters;
-   const GLuint sz4 = (size + 3) / 4; /* no. of new param slots needed */
-
-   assert(size > 0);
-
-   if (oldNum + sz4 > paramList->Size) {
-      /* Need to grow the parameter list array (alloc some extra) */
-      paramList->Size = paramList->Size + 4 * sz4;
-
-      /* realloc arrays */
-      paramList->Parameters = (struct gl_program_parameter *)
-	 _mesa_realloc(paramList->Parameters,
-		       oldNum * sizeof(struct gl_program_parameter),
-		       paramList->Size * sizeof(struct gl_program_parameter));
-
-      paramList->ParameterValues = (GLfloat (*)[4])
-         _mesa_align_realloc(paramList->ParameterValues,         /* old buf */
-                             oldNum * 4 * sizeof(GLfloat),      /* old size */
-                             paramList->Size * 4 *sizeof(GLfloat), /* new sz */
-                             16);
-   }
-
-   if (!paramList->Parameters ||
-       !paramList->ParameterValues) {
-      /* out of memory */
-      paramList->NumParameters = 0;
-      paramList->Size = 0;
-      return -1;
-   }
-   else {
-      GLuint i;
-
-      paramList->NumParameters = oldNum + sz4;
-
-      memset(&paramList->Parameters[oldNum], 0,
-             sz4 * sizeof(struct gl_program_parameter));
-
-      for (i = 0; i < sz4; i++) {
-         struct gl_program_parameter *p = paramList->Parameters + oldNum + i;
-         p->Name = name ? _mesa_strdup(name) : NULL;
-         p->Type = type;
-         p->Size = size;
-         p->DataType = datatype;
-         p->Flags = flags;
-         if (values) {
-            COPY_4V(paramList->ParameterValues[oldNum + i], values);
-            values += 4;
-            p->Initialized = GL_TRUE;
-         }
-         else {
-            /* silence valgrind */
-            ASSIGN_4V(paramList->ParameterValues[oldNum + i], 0, 0, 0, 0);
-         }
-         size -= 4;
-      }
-
-      if (state) {
-         for (i = 0; i < STATE_LENGTH; i++)
-            paramList->Parameters[oldNum].StateIndexes[i] = state[i];
-      }
-
-      return (GLint) oldNum;
-   }
-}
-
-
-/**
- * Add a new named program parameter (Ex: NV_fragment_program DEFINE statement)
- * \return index of the new entry in the parameter list
- */
-GLint
-_mesa_add_named_parameter(struct gl_program_parameter_list *paramList,
-                          const char *name, const GLfloat values[4])
-{
-   return _mesa_add_parameter(paramList, PROGRAM_NAMED_PARAM, name,
-                              4, GL_NONE, values, NULL, 0x0);
-                              
-}
-
-
-/**
- * Add a new named constant to the parameter list.
- * This will be used when the program contains something like this:
- *    PARAM myVals = { 0, 1, 2, 3 };
- *
- * \param paramList  the parameter list
- * \param name  the name for the constant
- * \param values  four float values
- * \return index/position of the new parameter in the parameter list
- */
-GLint
-_mesa_add_named_constant(struct gl_program_parameter_list *paramList,
-                         const char *name, const GLfloat values[4],
-                         GLuint size)
-{
-   /* first check if this is a duplicate constant */
-   GLint pos;
-   for (pos = 0; pos < (GLint)paramList->NumParameters; pos++) {
-      const GLfloat *pvals = paramList->ParameterValues[pos];
-      if (pvals[0] == values[0] &&
-          pvals[1] == values[1] &&
-          pvals[2] == values[2] &&
-          pvals[3] == values[3] &&
-          strcmp(paramList->Parameters[pos].Name, name) == 0) {
-         /* Same name and value is already in the param list - reuse it */
-         return pos;
-      }
-   }
-   /* not found, add new parameter */
-   return _mesa_add_parameter(paramList, PROGRAM_CONSTANT, name,
-                              size, GL_NONE, values, NULL, 0x0);
-}
-
-
-/**
- * Add a new unnamed constant to the parameter list.  This will be used
- * when a fragment/vertex program contains something like this:
- *    MOV r, { 0, 1, 2, 3 };
- * If swizzleOut is non-null we'll search the parameter list for an
- * existing instance of the constant which matches with a swizzle.
- *
- * \param paramList  the parameter list
- * \param values  four float values
- * \param swizzleOut  returns swizzle mask for accessing the constant
- * \return index/position of the new parameter in the parameter list.
- */
-GLint
-_mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,
-                           const GLfloat values[4], GLuint size,
-                           GLuint *swizzleOut)
-{
-   GLint pos;
-   ASSERT(size >= 1);
-   ASSERT(size <= 4);
-
-   if (swizzleOut &&
-       _mesa_lookup_parameter_constant(paramList, values,
-                                       size, &pos, swizzleOut)) {
-      return pos;
-   }
-
-   /* Look for empty space in an already unnamed constant parameter
-    * to add this constant.  This will only work for single-element
-    * constants because we rely on smearing (i.e. .yyyy or .zzzz).
-    */
-   if (size == 1 && swizzleOut) {
-      for (pos = 0; pos < (GLint) paramList->NumParameters; pos++) {
-         struct gl_program_parameter *p = paramList->Parameters + pos;
-         if (p->Type == PROGRAM_CONSTANT && p->Size + size <= 4) {
-            /* ok, found room */
-            GLfloat *pVal = paramList->ParameterValues[pos];
-            GLuint swz = p->Size; /* 1, 2 or 3 for Y, Z, W */
-            pVal[p->Size] = values[0];
-            p->Size++;
-            *swizzleOut = MAKE_SWIZZLE4(swz, swz, swz, swz);
-            return pos;
-         }
-      }
-   }
-
-   /* add a new parameter to store this constant */
-   pos = _mesa_add_parameter(paramList, PROGRAM_CONSTANT, NULL,
-                             size, GL_NONE, values, NULL, 0x0);
-   if (pos >= 0 && swizzleOut) {
-      if (size == 1)
-         *swizzleOut = SWIZZLE_XXXX;
-      else
-         *swizzleOut = SWIZZLE_NOOP;
-   }
-   return pos;
-}
-
-/**
- * Add parameter representing a varying variable.
- */
-GLint
-_mesa_add_varying(struct gl_program_parameter_list *paramList,
-                  const char *name, GLuint size, GLenum datatype,
-                  GLbitfield flags)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
-   if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_VARYING) {
-      /* already in list */
-      return i;
-   }
-   else {
-      /*assert(size == 4);*/
-      i = _mesa_add_parameter(paramList, PROGRAM_VARYING, name,
-                              size, datatype, NULL, NULL, flags);
-      return i;
-   }
-}
-
-
-/**
- * Add parameter representing a vertex program attribute.
- * \param size  size of attribute (in floats), may be -1 if unknown
- * \param attrib  the attribute index, or -1 if unknown
- */
-GLint
-_mesa_add_attribute(struct gl_program_parameter_list *paramList,
-                    const char *name, GLint size, GLenum datatype, GLint attrib)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
-   if (i >= 0) {
-      /* replace */
-      if (attrib < 0)
-         attrib = i;
-      paramList->Parameters[i].StateIndexes[0] = attrib;
-   }
-   else {
-      /* add */
-      gl_state_index state[STATE_LENGTH];
-      state[0] = (gl_state_index) attrib;
-      if (size < 0)
-         size = 4;
-      i = _mesa_add_parameter(paramList, PROGRAM_INPUT, name,
-                              size, datatype, NULL, state, 0x0);
-   }
-   return i;
-}
-
-
-
-#if 0 /* not used yet */
-/**
- * Returns the number of 4-component registers needed to store a piece
- * of GL state.  For matrices this may be as many as 4 registers,
- * everything else needs
- * just 1 register.
- */
-static GLuint
-sizeof_state_reference(const GLint *stateTokens)
-{
-   if (stateTokens[0] == STATE_MATRIX) {
-      GLuint rows = stateTokens[4] - stateTokens[3] + 1;
-      assert(rows >= 1);
-      assert(rows <= 4);
-      return rows;
-   }
-   else {
-      return 1;
-   }
-}
-#endif
-
-
-/**
- * Add a new state reference to the parameter list.
- * This will be used when the program contains something like this:
- *    PARAM ambient = state.material.front.ambient;
- *
- * \param paramList  the parameter list
- * \param stateTokens  an array of 5 (STATE_LENGTH) state tokens
- * \return index of the new parameter.
- */
-GLint
-_mesa_add_state_reference(struct gl_program_parameter_list *paramList,
-                          const gl_state_index stateTokens[STATE_LENGTH])
-{
-   const GLuint size = 4; /* XXX fix */
-   char *name;
-   GLint index;
-
-   /* Check if the state reference is already in the list */
-   for (index = 0; index < (GLint) paramList->NumParameters; index++) {
-      GLuint i, match = 0;
-      for (i = 0; i < STATE_LENGTH; i++) {
-         if (paramList->Parameters[index].StateIndexes[i] == stateTokens[i]) {
-            match++;
-         }
-         else {
-            break;
-         }
-      }
-      if (match == STATE_LENGTH) {
-         /* this state reference is already in the parameter list */
-         return index;
-      }
-   }
-
-   name = _mesa_program_state_string(stateTokens);
-   index = _mesa_add_parameter(paramList, PROGRAM_STATE_VAR, name,
-                               size, GL_NONE,
-                               NULL, (gl_state_index *) stateTokens, 0x0);
-   paramList->StateFlags |= _mesa_program_state_flags(stateTokens);
-
-   /* free name string here since we duplicated it in add_parameter() */
-   free(name);
-
-   return index;
-}
-
-
-/**
- * Lookup a parameter value by name in the given parameter list.
- * \return pointer to the float[4] values.
- */
-GLfloat *
-_mesa_lookup_parameter_value(const struct gl_program_parameter_list *paramList,
-                             GLsizei nameLen, const char *name)
-{
-   GLint i = _mesa_lookup_parameter_index(paramList, nameLen, name);
-   if (i < 0)
-      return NULL;
-   else
-      return paramList->ParameterValues[i];
-}
-
-
-/**
- * Given a program parameter name, find its position in the list of parameters.
- * \param paramList  the parameter list to search
- * \param nameLen  length of name (in chars).
- *                 If length is negative, assume that name is null-terminated.
- * \param name  the name to search for
- * \return index of parameter in the list.
- */
-GLint
-_mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
-                             GLsizei nameLen, const char *name)
-{
-   GLint i;
-
-   if (!paramList)
-      return -1;
-
-   if (nameLen == -1) {
-      /* name is null-terminated */
-      for (i = 0; i < (GLint) paramList->NumParameters; i++) {
-         if (paramList->Parameters[i].Name &&
-	     strcmp(paramList->Parameters[i].Name, name) == 0)
-            return i;
-      }
-   }
-   else {
-      /* name is not null-terminated, use nameLen */
-      for (i = 0; i < (GLint) paramList->NumParameters; i++) {
-         if (paramList->Parameters[i].Name &&
-	     strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
-             && strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
-            return i;
-      }
-   }
-   return -1;
-}
-
-
-/**
- * Look for a float vector in the given parameter list.  The float vector
- * may be of length 1, 2, 3 or 4.  If swizzleOut is non-null, we'll try
- * swizzling to find a match.
- * \param list  the parameter list to search
- * \param v  the float vector to search for
- * \param vSize  number of element in v
- * \param posOut  returns the position of the constant, if found
- * \param swizzleOut  returns a swizzle mask describing location of the
- *                    vector elements if found.
- * \return GL_TRUE if found, GL_FALSE if not found
- */
-GLboolean
-_mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,
-                                const GLfloat v[], GLuint vSize,
-                                GLint *posOut, GLuint *swizzleOut)
-{
-   GLuint i;
-
-   assert(vSize >= 1);
-   assert(vSize <= 4);
-
-   if (!list) {
-      *posOut = -1;
-      return GL_FALSE;
-   }
-
-   for (i = 0; i < list->NumParameters; i++) {
-      if (list->Parameters[i].Type == PROGRAM_CONSTANT) {
-         if (!swizzleOut) {
-            /* swizzle not allowed */
-            GLuint j, match = 0;
-            for (j = 0; j < vSize; j++) {
-               if (v[j] == list->ParameterValues[i][j])
-                  match++;
-            }
-            if (match == vSize) {
-               *posOut = i;
-               return GL_TRUE;
-            }
-         }
-         else {
-            /* try matching w/ swizzle */
-             if (vSize == 1) {
-                /* look for v[0] anywhere within float[4] value */
-                GLuint j;
-                for (j = 0; j < list->Parameters[i].Size; j++) {
-                   if (list->ParameterValues[i][j] == v[0]) {
-                      /* found it */
-                      *posOut = i;
-                      *swizzleOut = MAKE_SWIZZLE4(j, j, j, j);
-                      return GL_TRUE;
-                   }
-                }
-             }
-             else if (vSize <= list->Parameters[i].Size) {
-                /* see if we can match this constant (with a swizzle) */
-                GLuint swz[4];
-                GLuint match = 0, j, k;
-                for (j = 0; j < vSize; j++) {
-                   if (v[j] == list->ParameterValues[i][j]) {
-                      swz[j] = j;
-                      match++;
-                   }
-                   else {
-                      for (k = 0; k < list->Parameters[i].Size; k++) {
-                         if (v[j] == list->ParameterValues[i][k]) {
-                            swz[j] = k;
-                            match++;
-                            break;
-                         }
-                      }
-                   }
-                }
-                /* smear last value to remaining positions */
-                for (; j < 4; j++)
-                   swz[j] = swz[j-1];
-
-                if (match == vSize) {
-                   *posOut = i;
-                   *swizzleOut = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);
-                   return GL_TRUE;
-                }
-             }
-         }
-      }
-   }
-
-   *posOut = -1;
-   return GL_FALSE;
-}
-
-
-struct gl_program_parameter_list *
-_mesa_clone_parameter_list(const struct gl_program_parameter_list *list)
-{
-   struct gl_program_parameter_list *clone;
-   GLuint i;
-
-   clone = _mesa_new_parameter_list();
-   if (!clone)
-      return NULL;
-
-   /** Not too efficient, but correct */
-   for (i = 0; i < list->NumParameters; i++) {
-      struct gl_program_parameter *p = list->Parameters + i;
-      struct gl_program_parameter *pCopy;
-      GLuint size = MIN2(p->Size, 4);
-      GLint j = _mesa_add_parameter(clone, p->Type, p->Name, size, p->DataType,
-                                    list->ParameterValues[i], NULL, 0x0);
-      ASSERT(j >= 0);
-      pCopy = clone->Parameters + j;
-      pCopy->Flags = p->Flags;
-      /* copy state indexes */
-      if (p->Type == PROGRAM_STATE_VAR) {
-         GLint k;
-         for (k = 0; k < STATE_LENGTH; k++) {
-            pCopy->StateIndexes[k] = p->StateIndexes[k];
-         }
-      }
-      else {
-         clone->Parameters[j].Size = p->Size;
-      }
-      
-   }
-
-   clone->StateFlags = list->StateFlags;
-
-   return clone;
-}
-
-
-/**
- * Return a new parameter list which is listA + listB.
- */
-struct gl_program_parameter_list *
-_mesa_combine_parameter_lists(const struct gl_program_parameter_list *listA,
-                              const struct gl_program_parameter_list *listB)
-{
-   struct gl_program_parameter_list *list;
-
-   if (listA) {
-      list = _mesa_clone_parameter_list(listA);
-      if (list && listB) {
-         GLuint i;
-         for (i = 0; i < listB->NumParameters; i++) {
-            struct gl_program_parameter *param = listB->Parameters + i;
-            _mesa_add_parameter(list, param->Type, param->Name, param->Size,
-                                param->DataType,
-                                listB->ParameterValues[i],
-                                param->StateIndexes,
-                                param->Flags);
-         }
-      }
-   }
-   else if (listB) {
-      list = _mesa_clone_parameter_list(listB);
-   }
-   else {
-      list = NULL;
-   }
-   return list;
-}
-
-
-
-/**
- * Find longest name of all uniform parameters in list.
- */
-GLuint
-_mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
-                             gl_register_file type)
-{
-   GLuint i, maxLen = 0;
-   if (!list)
-      return 0;
-   for (i = 0; i < list->NumParameters; i++) {
-      if (list->Parameters[i].Type == type) {
-         GLuint len = strlen(list->Parameters[i].Name);
-         if (len > maxLen)
-            maxLen = len;
-      }
-   }
-   return maxLen;
-}
-
-
-/**
- * Count the number of parameters in the last that match the given type.
- */
-GLuint
-_mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,
-                             gl_register_file type)
-{
-   GLuint i, count = 0;
-   if (list) {
-      for (i = 0; i < list->NumParameters; i++) {
-         if (list->Parameters[i].Type == type)
-            count++;
-      }
-   }
-   return count;
-}
+/*

+ * 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_parameter.c

+ * Program parameter lists and functions.

+ * \author Brian Paul

+ */

+

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "prog_instruction.h"

+#include "prog_parameter.h"

+#include "prog_statevars.h"

+

+

+struct gl_program_parameter_list *

+_mesa_new_parameter_list(void)

+{

+   return CALLOC_STRUCT(gl_program_parameter_list);

+}

+

+

+struct gl_program_parameter_list *

+_mesa_new_parameter_list_sized(unsigned size)

+{

+   struct gl_program_parameter_list *p = _mesa_new_parameter_list();

+

+   if ((p != NULL) && (size != 0)) {

+      p->Size = size;

+

+      /* alloc arrays */

+      p->Parameters = (struct gl_program_parameter *)

+	 calloc(1, size * sizeof(struct gl_program_parameter));

+

+      p->ParameterValues = (GLfloat (*)[4])

+         _mesa_align_malloc(size * 4 *sizeof(GLfloat), 16);

+

+

+      if ((p->Parameters == NULL) || (p->ParameterValues == NULL)) {

+	 free(p->Parameters);

+	 _mesa_align_free(p->ParameterValues);

+	 free(p);

+	 p = NULL;

+      }

+   }

+

+   return p;

+}

+

+

+/**

+ * Free a parameter list and all its parameters

+ */

+void

+_mesa_free_parameter_list(struct gl_program_parameter_list *paramList)

+{

+   GLuint i;

+   for (i = 0; i < paramList->NumParameters; i++) {

+      if (paramList->Parameters[i].Name)

+	 free((void *) paramList->Parameters[i].Name);

+   }

+   free(paramList->Parameters);

+   if (paramList->ParameterValues)

+      _mesa_align_free(paramList->ParameterValues);

+   free(paramList);

+}

+

+

+/**

+ * Add a new parameter to a parameter list.

+ * Note that parameter values are usually 4-element GLfloat vectors.

+ * When size > 4 we'll allocate a sequential block of parameters to

+ * store all the values (in blocks of 4).

+ *

+ * \param paramList  the list to add the parameter to

+ * \param type  type of parameter, such as 

+ * \param name  the parameter name, will be duplicated/copied!

+ * \param size  number of elements in 'values' vector (1..4, or more)

+ * \param datatype  GL_FLOAT, GL_FLOAT_VECx, GL_INT, GL_INT_VECx or GL_NONE.

+ * \param values  initial parameter value, up to 4 GLfloats, or NULL

+ * \param state  state indexes, or NULL

+ * \return  index of new parameter in the list, or -1 if error (out of mem)

+ */

+GLint

+_mesa_add_parameter(struct gl_program_parameter_list *paramList,

+                    gl_register_file type, const char *name,

+                    GLuint size, GLenum datatype, const GLfloat *values,

+                    const gl_state_index state[STATE_LENGTH],

+                    GLbitfield flags)

+{

+   const GLuint oldNum = paramList->NumParameters;

+   const GLuint sz4 = (size + 3) / 4; /* no. of new param slots needed */

+

+   assert(size > 0);

+

+   if (oldNum + sz4 > paramList->Size) {

+      /* Need to grow the parameter list array (alloc some extra) */

+      paramList->Size = paramList->Size + 4 * sz4;

+

+      /* realloc arrays */

+      paramList->Parameters = (struct gl_program_parameter *)

+	 _mesa_realloc(paramList->Parameters,

+		       oldNum * sizeof(struct gl_program_parameter),

+		       paramList->Size * sizeof(struct gl_program_parameter));

+

+      paramList->ParameterValues = (GLfloat (*)[4])

+         _mesa_align_realloc(paramList->ParameterValues,         /* old buf */

+                             oldNum * 4 * sizeof(GLfloat),      /* old size */

+                             paramList->Size * 4 *sizeof(GLfloat), /* new sz */

+                             16);

+   }

+

+   if (!paramList->Parameters ||

+       !paramList->ParameterValues) {

+      /* out of memory */

+      paramList->NumParameters = 0;

+      paramList->Size = 0;

+      return -1;

+   }

+   else {

+      GLuint i;

+

+      paramList->NumParameters = oldNum + sz4;

+

+      memset(&paramList->Parameters[oldNum], 0,

+             sz4 * sizeof(struct gl_program_parameter));

+

+      for (i = 0; i < sz4; i++) {

+         struct gl_program_parameter *p = paramList->Parameters + oldNum + i;

+         p->Name = name ? _mesa_strdup(name) : NULL;

+         p->Type = type;

+         p->Size = size;

+         p->DataType = datatype;

+         p->Flags = flags;

+         if (values) {

+            COPY_4V(paramList->ParameterValues[oldNum + i], values);

+            values += 4;

+            p->Initialized = GL_TRUE;

+         }

+         else {

+            /* silence valgrind */

+            ASSIGN_4V(paramList->ParameterValues[oldNum + i], 0, 0, 0, 0);

+         }

+         size -= 4;

+      }

+

+      if (state) {

+         for (i = 0; i < STATE_LENGTH; i++)

+            paramList->Parameters[oldNum].StateIndexes[i] = state[i];

+      }

+

+      return (GLint) oldNum;

+   }

+}

+

+

+/**

+ * Add a new named program parameter (Ex: NV_fragment_program DEFINE statement)

+ * \return index of the new entry in the parameter list

+ */

+GLint

+_mesa_add_named_parameter(struct gl_program_parameter_list *paramList,

+                          const char *name, const GLfloat values[4])

+{

+   return _mesa_add_parameter(paramList, PROGRAM_NAMED_PARAM, name,

+                              4, GL_NONE, values, NULL, 0x0);

+                              

+}

+

+

+/**

+ * Add a new named constant to the parameter list.

+ * This will be used when the program contains something like this:

+ *    PARAM myVals = { 0, 1, 2, 3 };

+ *

+ * \param paramList  the parameter list

+ * \param name  the name for the constant

+ * \param values  four float values

+ * \return index/position of the new parameter in the parameter list

+ */

+GLint

+_mesa_add_named_constant(struct gl_program_parameter_list *paramList,

+                         const char *name, const GLfloat values[4],

+                         GLuint size)

+{

+   /* first check if this is a duplicate constant */

+   GLint pos;

+   for (pos = 0; pos < (GLint)paramList->NumParameters; pos++) {

+      const GLfloat *pvals = paramList->ParameterValues[pos];

+      if (pvals[0] == values[0] &&

+          pvals[1] == values[1] &&

+          pvals[2] == values[2] &&

+          pvals[3] == values[3] &&

+          strcmp(paramList->Parameters[pos].Name, name) == 0) {

+         /* Same name and value is already in the param list - reuse it */

+         return pos;

+      }

+   }

+   /* not found, add new parameter */

+   return _mesa_add_parameter(paramList, PROGRAM_CONSTANT, name,

+                              size, GL_NONE, values, NULL, 0x0);

+}

+

+

+/**

+ * Add a new unnamed constant to the parameter list.  This will be used

+ * when a fragment/vertex program contains something like this:

+ *    MOV r, { 0, 1, 2, 3 };

+ * If swizzleOut is non-null we'll search the parameter list for an

+ * existing instance of the constant which matches with a swizzle.

+ *

+ * \param paramList  the parameter list

+ * \param values  four float values

+ * \param swizzleOut  returns swizzle mask for accessing the constant

+ * \return index/position of the new parameter in the parameter list.

+ */

+GLint

+_mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,

+                           const GLfloat values[4], GLuint size,

+                           GLuint *swizzleOut)

+{

+   GLint pos;

+   ASSERT(size >= 1);

+   ASSERT(size <= 4);

+

+   if (swizzleOut &&

+       _mesa_lookup_parameter_constant(paramList, values,

+                                       size, &pos, swizzleOut)) {

+      return pos;

+   }

+

+   /* Look for empty space in an already unnamed constant parameter

+    * to add this constant.  This will only work for single-element

+    * constants because we rely on smearing (i.e. .yyyy or .zzzz).

+    */

+   if (size == 1 && swizzleOut) {

+      for (pos = 0; pos < (GLint) paramList->NumParameters; pos++) {

+         struct gl_program_parameter *p = paramList->Parameters + pos;

+         if (p->Type == PROGRAM_CONSTANT && p->Size + size <= 4) {

+            /* ok, found room */

+            GLfloat *pVal = paramList->ParameterValues[pos];

+            GLuint swz = p->Size; /* 1, 2 or 3 for Y, Z, W */

+            pVal[p->Size] = values[0];

+            p->Size++;

+            *swizzleOut = MAKE_SWIZZLE4(swz, swz, swz, swz);

+            return pos;

+         }

+      }

+   }

+

+   /* add a new parameter to store this constant */

+   pos = _mesa_add_parameter(paramList, PROGRAM_CONSTANT, NULL,

+                             size, GL_NONE, values, NULL, 0x0);

+   if (pos >= 0 && swizzleOut) {

+      if (size == 1)

+         *swizzleOut = SWIZZLE_XXXX;

+      else

+         *swizzleOut = SWIZZLE_NOOP;

+   }

+   return pos;

+}

+

+/**

+ * Add parameter representing a varying variable.

+ */

+GLint

+_mesa_add_varying(struct gl_program_parameter_list *paramList,

+                  const char *name, GLuint size, GLenum datatype,

+                  GLbitfield flags)

+{

+   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);

+   if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_VARYING) {

+      /* already in list */

+      return i;

+   }

+   else {

+      /*assert(size == 4);*/

+      i = _mesa_add_parameter(paramList, PROGRAM_VARYING, name,

+                              size, datatype, NULL, NULL, flags);

+      return i;

+   }

+}

+

+

+/**

+ * Add parameter representing a vertex program attribute.

+ * \param size  size of attribute (in floats), may be -1 if unknown

+ * \param attrib  the attribute index, or -1 if unknown

+ */

+GLint

+_mesa_add_attribute(struct gl_program_parameter_list *paramList,

+                    const char *name, GLint size, GLenum datatype, GLint attrib)

+{

+   GLint i = _mesa_lookup_parameter_index(paramList, -1, name);

+   if (i >= 0) {

+      /* replace */

+      if (attrib < 0)

+         attrib = i;

+      paramList->Parameters[i].StateIndexes[0] = attrib;

+   }

+   else {

+      /* add */

+      gl_state_index state[STATE_LENGTH];

+      state[0] = (gl_state_index) attrib;

+      if (size < 0)

+         size = 4;

+      i = _mesa_add_parameter(paramList, PROGRAM_INPUT, name,

+                              size, datatype, NULL, state, 0x0);

+   }

+   return i;

+}

+

+

+

+#if 0 /* not used yet */

+/**

+ * Returns the number of 4-component registers needed to store a piece

+ * of GL state.  For matrices this may be as many as 4 registers,

+ * everything else needs

+ * just 1 register.

+ */

+static GLuint

+sizeof_state_reference(const GLint *stateTokens)

+{

+   if (stateTokens[0] == STATE_MATRIX) {

+      GLuint rows = stateTokens[4] - stateTokens[3] + 1;

+      assert(rows >= 1);

+      assert(rows <= 4);

+      return rows;

+   }

+   else {

+      return 1;

+   }

+}

+#endif

+

+

+/**

+ * Add a new state reference to the parameter list.

+ * This will be used when the program contains something like this:

+ *    PARAM ambient = state.material.front.ambient;

+ *

+ * \param paramList  the parameter list

+ * \param stateTokens  an array of 5 (STATE_LENGTH) state tokens

+ * \return index of the new parameter.

+ */

+GLint

+_mesa_add_state_reference(struct gl_program_parameter_list *paramList,

+                          const gl_state_index stateTokens[STATE_LENGTH])

+{

+   const GLuint size = 4; /* XXX fix */

+   char *name;

+   GLint index;

+

+   /* Check if the state reference is already in the list */

+   for (index = 0; index < (GLint) paramList->NumParameters; index++) {

+      if (!memcmp(paramList->Parameters[index].StateIndexes,

+		  stateTokens, STATE_LENGTH * sizeof(gl_state_index))) {

+	 return index;

+      }

+   }

+

+   name = _mesa_program_state_string(stateTokens);

+   index = _mesa_add_parameter(paramList, PROGRAM_STATE_VAR, name,

+                               size, GL_NONE,

+                               NULL, (gl_state_index *) stateTokens, 0x0);

+   paramList->StateFlags |= _mesa_program_state_flags(stateTokens);

+

+   /* free name string here since we duplicated it in add_parameter() */

+   free(name);

+

+   return index;

+}

+

+

+/**

+ * Lookup a parameter value by name in the given parameter list.

+ * \return pointer to the float[4] values.

+ */

+GLfloat *

+_mesa_lookup_parameter_value(const struct gl_program_parameter_list *paramList,

+                             GLsizei nameLen, const char *name)

+{

+   GLint i = _mesa_lookup_parameter_index(paramList, nameLen, name);

+   if (i < 0)

+      return NULL;

+   else

+      return paramList->ParameterValues[i];

+}

+

+

+/**

+ * Given a program parameter name, find its position in the list of parameters.

+ * \param paramList  the parameter list to search

+ * \param nameLen  length of name (in chars).

+ *                 If length is negative, assume that name is null-terminated.

+ * \param name  the name to search for

+ * \return index of parameter in the list.

+ */

+GLint

+_mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,

+                             GLsizei nameLen, const char *name)

+{

+   GLint i;

+

+   if (!paramList)

+      return -1;

+

+   if (nameLen == -1) {

+      /* name is null-terminated */

+      for (i = 0; i < (GLint) paramList->NumParameters; i++) {

+         if (paramList->Parameters[i].Name &&

+	     strcmp(paramList->Parameters[i].Name, name) == 0)

+            return i;

+      }

+   }

+   else {

+      /* name is not null-terminated, use nameLen */

+      for (i = 0; i < (GLint) paramList->NumParameters; i++) {

+         if (paramList->Parameters[i].Name &&

+	     strncmp(paramList->Parameters[i].Name, name, nameLen) == 0

+             && strlen(paramList->Parameters[i].Name) == (size_t)nameLen)

+            return i;

+      }

+   }

+   return -1;

+}

+

+

+/**

+ * Look for a float vector in the given parameter list.  The float vector

+ * may be of length 1, 2, 3 or 4.  If swizzleOut is non-null, we'll try

+ * swizzling to find a match.

+ * \param list  the parameter list to search

+ * \param v  the float vector to search for

+ * \param vSize  number of element in v

+ * \param posOut  returns the position of the constant, if found

+ * \param swizzleOut  returns a swizzle mask describing location of the

+ *                    vector elements if found.

+ * \return GL_TRUE if found, GL_FALSE if not found

+ */

+GLboolean

+_mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,

+                                const GLfloat v[], GLuint vSize,

+                                GLint *posOut, GLuint *swizzleOut)

+{

+   GLuint i;

+

+   assert(vSize >= 1);

+   assert(vSize <= 4);

+

+   if (!list) {

+      *posOut = -1;

+      return GL_FALSE;

+   }

+

+   for (i = 0; i < list->NumParameters; i++) {

+      if (list->Parameters[i].Type == PROGRAM_CONSTANT) {

+         if (!swizzleOut) {

+            /* swizzle not allowed */

+            GLuint j, match = 0;

+            for (j = 0; j < vSize; j++) {

+               if (v[j] == list->ParameterValues[i][j])

+                  match++;

+            }

+            if (match == vSize) {

+               *posOut = i;

+               return GL_TRUE;

+            }

+         }

+         else {

+            /* try matching w/ swizzle */

+             if (vSize == 1) {

+                /* look for v[0] anywhere within float[4] value */

+                GLuint j;

+                for (j = 0; j < list->Parameters[i].Size; j++) {

+                   if (list->ParameterValues[i][j] == v[0]) {

+                      /* found it */

+                      *posOut = i;

+                      *swizzleOut = MAKE_SWIZZLE4(j, j, j, j);

+                      return GL_TRUE;

+                   }

+                }

+             }

+             else if (vSize <= list->Parameters[i].Size) {

+                /* see if we can match this constant (with a swizzle) */

+                GLuint swz[4];

+                GLuint match = 0, j, k;

+                for (j = 0; j < vSize; j++) {

+                   if (v[j] == list->ParameterValues[i][j]) {

+                      swz[j] = j;

+                      match++;

+                   }

+                   else {

+                      for (k = 0; k < list->Parameters[i].Size; k++) {

+                         if (v[j] == list->ParameterValues[i][k]) {

+                            swz[j] = k;

+                            match++;

+                            break;

+                         }

+                      }

+                   }

+                }

+                /* smear last value to remaining positions */

+                for (; j < 4; j++)

+                   swz[j] = swz[j-1];

+

+                if (match == vSize) {

+                   *posOut = i;

+                   *swizzleOut = MAKE_SWIZZLE4(swz[0], swz[1], swz[2], swz[3]);

+                   return GL_TRUE;

+                }

+             }

+         }

+      }

+   }

+

+   *posOut = -1;

+   return GL_FALSE;

+}

+

+

+struct gl_program_parameter_list *

+_mesa_clone_parameter_list(const struct gl_program_parameter_list *list)

+{

+   struct gl_program_parameter_list *clone;

+   GLuint i;

+

+   clone = _mesa_new_parameter_list();

+   if (!clone)

+      return NULL;

+

+   /** Not too efficient, but correct */

+   for (i = 0; i < list->NumParameters; i++) {

+      struct gl_program_parameter *p = list->Parameters + i;

+      struct gl_program_parameter *pCopy;

+      GLuint size = MIN2(p->Size, 4);

+      GLint j = _mesa_add_parameter(clone, p->Type, p->Name, size, p->DataType,

+                                    list->ParameterValues[i], NULL, 0x0);

+      ASSERT(j >= 0);

+      pCopy = clone->Parameters + j;

+      pCopy->Flags = p->Flags;

+      /* copy state indexes */

+      if (p->Type == PROGRAM_STATE_VAR) {

+         GLint k;

+         for (k = 0; k < STATE_LENGTH; k++) {

+            pCopy->StateIndexes[k] = p->StateIndexes[k];

+         }

+      }

+      else {

+         clone->Parameters[j].Size = p->Size;

+      }

+      

+   }

+

+   clone->StateFlags = list->StateFlags;

+

+   return clone;

+}

+

+

+/**

+ * Return a new parameter list which is listA + listB.

+ */

+struct gl_program_parameter_list *

+_mesa_combine_parameter_lists(const struct gl_program_parameter_list *listA,

+                              const struct gl_program_parameter_list *listB)

+{

+   struct gl_program_parameter_list *list;

+

+   if (listA) {

+      list = _mesa_clone_parameter_list(listA);

+      if (list && listB) {

+         GLuint i;

+         for (i = 0; i < listB->NumParameters; i++) {

+            struct gl_program_parameter *param = listB->Parameters + i;

+            _mesa_add_parameter(list, param->Type, param->Name, param->Size,

+                                param->DataType,

+                                listB->ParameterValues[i],

+                                param->StateIndexes,

+                                param->Flags);

+         }

+      }

+   }

+   else if (listB) {

+      list = _mesa_clone_parameter_list(listB);

+   }

+   else {

+      list = NULL;

+   }

+   return list;

+}

+

+

+

+/**

+ * Find longest name of all uniform parameters in list.

+ */

+GLuint

+_mesa_longest_parameter_name(const struct gl_program_parameter_list *list,

+                             gl_register_file type)

+{

+   GLuint i, maxLen = 0;

+   if (!list)

+      return 0;

+   for (i = 0; i < list->NumParameters; i++) {

+      if (list->Parameters[i].Type == type) {

+         GLuint len = strlen(list->Parameters[i].Name);

+         if (len > maxLen)

+            maxLen = len;

+      }

+   }

+   return maxLen;

+}

+

+

+/**

+ * Count the number of parameters in the last that match the given type.

+ */

+GLuint

+_mesa_num_parameters_of_type(const struct gl_program_parameter_list *list,

+                             gl_register_file type)

+{

+   GLuint i, count = 0;

+   if (list) {

+      for (i = 0; i < list->NumParameters; i++) {

+         if (list->Parameters[i].Type == type)

+            count++;

+      }

+   }

+   return count;

+}

diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c
index 00aa6de96..de0ca1c4f 100644
--- a/mesalib/src/mesa/program/prog_print.c
+++ b/mesalib/src/mesa/program/prog_print.c
@@ -1,1086 +1,1084 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.3
- *
- * 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 prog_print.c
- * Print vertex/fragment programs - for debugging.
- * \author Brian Paul
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "prog_statevars.h"
-
-
-
-/**
- * Return string name for given program/register file.
- */
-static const char *
-file_string(gl_register_file f, gl_prog_print_mode mode)
-{
-   switch (f) {
-   case PROGRAM_TEMPORARY:
-      return "TEMP";
-   case PROGRAM_LOCAL_PARAM:
-      return "LOCAL";
-   case PROGRAM_ENV_PARAM:
-      return "ENV";
-   case PROGRAM_STATE_VAR:
-      return "STATE";
-   case PROGRAM_INPUT:
-      return "INPUT";
-   case PROGRAM_OUTPUT:
-      return "OUTPUT";
-   case PROGRAM_NAMED_PARAM:
-      return "NAMED";
-   case PROGRAM_CONSTANT:
-      return "CONST";
-   case PROGRAM_UNIFORM:
-      return "UNIFORM";
-   case PROGRAM_VARYING:
-      return "VARYING";
-   case PROGRAM_WRITE_ONLY:
-      return "WRITE_ONLY";
-   case PROGRAM_ADDRESS:
-      return "ADDR";
-   case PROGRAM_SAMPLER:
-      return "SAMPLER";
-   case PROGRAM_UNDEFINED:
-      return "UNDEFINED";
-   default:
-      {
-         static char s[20];
-         _mesa_snprintf(s, sizeof(s), "FILE%u", f);
-         return s;
-      }
-   }
-}
-
-
-/**
- * Return ARB_v/f_prog-style input attrib string.
- */
-static const char *
-arb_input_attrib_string(GLint index, GLenum progType)
-{
-   /*
-    * These strings should match the VERT_ATTRIB_x and FRAG_ATTRIB_x tokens.
-    */
-   const char *vertAttribs[] = {
-      "vertex.position",
-      "vertex.weight",
-      "vertex.normal",
-      "vertex.color.primary",
-      "vertex.color.secondary",
-      "vertex.fogcoord",
-      "vertex.(six)",
-      "vertex.(seven)",
-      "vertex.texcoord[0]",
-      "vertex.texcoord[1]",
-      "vertex.texcoord[2]",
-      "vertex.texcoord[3]",
-      "vertex.texcoord[4]",
-      "vertex.texcoord[5]",
-      "vertex.texcoord[6]",
-      "vertex.texcoord[7]",
-      "vertex.attrib[0]",
-      "vertex.attrib[1]",
-      "vertex.attrib[2]",
-      "vertex.attrib[3]",
-      "vertex.attrib[4]",
-      "vertex.attrib[5]",
-      "vertex.attrib[6]",
-      "vertex.attrib[7]",
-      "vertex.attrib[8]",
-      "vertex.attrib[9]",
-      "vertex.attrib[10]",
-      "vertex.attrib[11]",
-      "vertex.attrib[12]",
-      "vertex.attrib[13]",
-      "vertex.attrib[14]",
-      "vertex.attrib[15]"
-   };
-   const char *fragAttribs[] = {
-      "fragment.position",
-      "fragment.color.primary",
-      "fragment.color.secondary",
-      "fragment.fogcoord",
-      "fragment.texcoord[0]",
-      "fragment.texcoord[1]",
-      "fragment.texcoord[2]",
-      "fragment.texcoord[3]",
-      "fragment.texcoord[4]",
-      "fragment.texcoord[5]",
-      "fragment.texcoord[6]",
-      "fragment.texcoord[7]",
-      "fragment.varying[0]",
-      "fragment.varying[1]",
-      "fragment.varying[2]",
-      "fragment.varying[3]",
-      "fragment.varying[4]",
-      "fragment.varying[5]",
-      "fragment.varying[6]",
-      "fragment.varying[7]"
-   };
-
-   /* sanity checks */
-   assert(strcmp(vertAttribs[VERT_ATTRIB_TEX0], "vertex.texcoord[0]") == 0);
-   assert(strcmp(vertAttribs[VERT_ATTRIB_GENERIC15], "vertex.attrib[15]") == 0);
-
-   if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertAttribs) / sizeof(vertAttribs[0]));
-      return vertAttribs[index];
-   }
-   else {
-      assert(index < sizeof(fragAttribs) / sizeof(fragAttribs[0]));
-      return fragAttribs[index];
-   }
-}
-
-
-/**
- * Print a vertex program's InputsRead field in human-readable format.
- * For debugging.
- */
-void
-_mesa_print_vp_inputs(GLbitfield inputs)
-{
-   printf("VP Inputs 0x%x: \n", inputs);
-   while (inputs) {
-      GLint attr = _mesa_ffs(inputs) - 1;
-      const char *name = arb_input_attrib_string(attr,
-                                                 GL_VERTEX_PROGRAM_ARB);
-      printf("  %d: %s\n", attr, name);
-      inputs &= ~(1 << attr);
-   }
-}
-
-
-/**
- * Print a fragment program's InputsRead field in human-readable format.
- * For debugging.
- */
-void
-_mesa_print_fp_inputs(GLbitfield inputs)
-{
-   printf("FP Inputs 0x%x: \n", inputs);
-   while (inputs) {
-      GLint attr = _mesa_ffs(inputs) - 1;
-      const char *name = arb_input_attrib_string(attr,
-                                                 GL_FRAGMENT_PROGRAM_ARB);
-      printf("  %d: %s\n", attr, name);
-      inputs &= ~(1 << attr);
-   }
-}
-
-
-
-/**
- * Return ARB_v/f_prog-style output attrib string.
- */
-static const char *
-arb_output_attrib_string(GLint index, GLenum progType)
-{
-   /*
-    * These strings should match the VERT_RESULT_x and FRAG_RESULT_x tokens.
-    */
-   const char *vertResults[] = {
-      "result.position",
-      "result.color.primary",
-      "result.color.secondary",
-      "result.fogcoord",
-      "result.texcoord[0]",
-      "result.texcoord[1]",
-      "result.texcoord[2]",
-      "result.texcoord[3]",
-      "result.texcoord[4]",
-      "result.texcoord[5]",
-      "result.texcoord[6]",
-      "result.texcoord[7]",
-      "result.varying[0]",
-      "result.varying[1]",
-      "result.varying[2]",
-      "result.varying[3]",
-      "result.varying[4]",
-      "result.varying[5]",
-      "result.varying[6]",
-      "result.varying[7]"
-   };
-   const char *fragResults[] = {
-      "result.color",
-      "result.color(half)",
-      "result.depth",
-      "result.color[0]",
-      "result.color[1]",
-      "result.color[2]",
-      "result.color[3]"
-   };
-
-   if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertResults) / sizeof(vertResults[0]));
-      return vertResults[index];
-   }
-   else {
-      assert(index < sizeof(fragResults) / sizeof(fragResults[0]));
-      return fragResults[index];
-   }
-}
-
-
-/**
- * Return string representation of the given register.
- * Note that some types of registers (like PROGRAM_UNIFORM) aren't defined
- * by the ARB/NV program languages so we've taken some liberties here.
- * \param f  the register file (PROGRAM_INPUT, PROGRAM_TEMPORARY, etc)
- * \param index  number of the register in the register file
- * \param mode  the output format/mode/style
- * \param prog  pointer to containing program
- */
-static const char *
-reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
-           GLboolean relAddr, const struct gl_program *prog,
-           GLboolean hasIndex2, GLboolean relAddr2, GLint index2)
-{
-   static char str[100];
-   const char *addr = relAddr ? "ADDR+" : "";
-
-   str[0] = 0;
-
-   switch (mode) {
-   case PROG_PRINT_DEBUG:
-      sprintf(str, "%s[%s%d]", file_string(f, mode), addr, index);
-      if (hasIndex2) {
-         int offset = strlen(str);
-         const char *addr2 = relAddr2 ? "ADDR+" : "";
-         sprintf(str+offset, "[%s%d]", addr2, index2);
-      }
-      break;
-
-   case PROG_PRINT_ARB:
-      switch (f) {
-      case PROGRAM_INPUT:
-         sprintf(str, "%s", arb_input_attrib_string(index, prog->Target));
-         break;
-      case PROGRAM_OUTPUT:
-         sprintf(str, "%s", arb_output_attrib_string(index, prog->Target));
-         break;
-      case PROGRAM_TEMPORARY:
-         sprintf(str, "temp%d", index);
-         break;
-      case PROGRAM_ENV_PARAM:
-         sprintf(str, "program.env[%s%d]", addr, index);
-         break;
-      case PROGRAM_LOCAL_PARAM:
-         sprintf(str, "program.local[%s%d]", addr, index);
-         break;
-      case PROGRAM_VARYING: /* extension */
-         sprintf(str, "varying[%s%d]", addr, index);
-         break;
-      case PROGRAM_CONSTANT: /* extension */
-         sprintf(str, "constant[%s%d]", addr, index);
-         break;
-      case PROGRAM_UNIFORM: /* extension */
-         sprintf(str, "uniform[%s%d]", addr, index);
-         break;
-      case PROGRAM_STATE_VAR:
-         {
-            struct gl_program_parameter *param
-               = prog->Parameters->Parameters + index;
-            char *state = _mesa_program_state_string(param->StateIndexes);
-            sprintf(str, "%s", state);
-            free(state);
-         }
-         break;
-      case PROGRAM_ADDRESS:
-         sprintf(str, "A%d", index);
-         break;
-      default:
-         _mesa_problem(NULL, "bad file in reg_string()");
-      }
-      break;
-
-   case PROG_PRINT_NV:
-      switch (f) {
-      case PROGRAM_INPUT:
-         if (prog->Target == GL_VERTEX_PROGRAM_ARB)
-            sprintf(str, "v[%d]", index);
-         else
-            sprintf(str, "f[%d]", index);
-         break;
-      case PROGRAM_OUTPUT:
-         sprintf(str, "o[%d]", index);
-         break;
-      case PROGRAM_TEMPORARY:
-         sprintf(str, "R%d", index);
-         break;
-      case PROGRAM_ENV_PARAM:
-         sprintf(str, "c[%d]", index);
-         break;
-      case PROGRAM_VARYING: /* extension */
-         sprintf(str, "varying[%s%d]", addr, index);
-         break;
-      case PROGRAM_UNIFORM: /* extension */
-         sprintf(str, "uniform[%s%d]", addr, index);
-         break;
-      case PROGRAM_CONSTANT: /* extension */
-         sprintf(str, "constant[%s%d]", addr, index);
-         break;
-      case PROGRAM_STATE_VAR: /* extension */
-         sprintf(str, "state[%s%d]", addr, index);
-         break;
-      default:
-         _mesa_problem(NULL, "bad file in reg_string()");
-      }
-      break;
-
-   default:
-      _mesa_problem(NULL, "bad mode in reg_string()");
-   }
-
-   return str;
-}
-
-
-/**
- * Return a string representation of the given swizzle word.
- * If extended is true, use extended (comma-separated) format.
- * \param swizzle  the swizzle field
- * \param negateBase  4-bit negation vector
- * \param extended  if true, also allow 0, 1 values
- */
-const char *
-_mesa_swizzle_string(GLuint swizzle, GLuint negateMask, GLboolean extended)
-{
-   static const char swz[] = "xyzw01!?";  /* See SWIZZLE_x definitions */
-   static char s[20];
-   GLuint i = 0;
-
-   if (!extended && swizzle == SWIZZLE_NOOP && negateMask == 0)
-      return ""; /* no swizzle/negation */
-
-   if (!extended)
-      s[i++] = '.';
-
-   if (negateMask & NEGATE_X)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 0)];
-
-   if (extended) {
-      s[i++] = ',';
-   }
-
-   if (negateMask & NEGATE_Y)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 1)];
-
-   if (extended) {
-      s[i++] = ',';
-   }
-
-   if (negateMask & NEGATE_Z)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 2)];
-
-   if (extended) {
-      s[i++] = ',';
-   }
-
-   if (negateMask & NEGATE_W)
-      s[i++] = '-';
-   s[i++] = swz[GET_SWZ(swizzle, 3)];
-
-   s[i] = 0;
-   return s;
-}
-
-
-void
-_mesa_print_swizzle(GLuint swizzle)
-{
-   if (swizzle == SWIZZLE_XYZW) {
-      printf(".xyzw\n");
-   }
-   else {
-      const char *s = _mesa_swizzle_string(swizzle, 0, 0);
-      printf("%s\n", s);
-   }
-}
-
-
-const char *
-_mesa_writemask_string(GLuint writeMask)
-{
-   static char s[10];
-   GLuint i = 0;
-
-   if (writeMask == WRITEMASK_XYZW)
-      return "";
-
-   s[i++] = '.';
-   if (writeMask & WRITEMASK_X)
-      s[i++] = 'x';
-   if (writeMask & WRITEMASK_Y)
-      s[i++] = 'y';
-   if (writeMask & WRITEMASK_Z)
-      s[i++] = 'z';
-   if (writeMask & WRITEMASK_W)
-      s[i++] = 'w';
-
-   s[i] = 0;
-   return s;
-}
-
-
-const char *
-_mesa_condcode_string(GLuint condcode)
-{
-   switch (condcode) {
-   case COND_GT:  return "GT";
-   case COND_EQ:  return "EQ";
-   case COND_LT:  return "LT";
-   case COND_UN:  return "UN";
-   case COND_GE:  return "GE";
-   case COND_LE:  return "LE";
-   case COND_NE:  return "NE";
-   case COND_TR:  return "TR";
-   case COND_FL:  return "FL";
-   default: return "cond???";
-   }
-}
-
-
-static void
-fprint_dst_reg(FILE * f,
-               const struct prog_dst_register *dstReg,
-               gl_prog_print_mode mode,
-               const struct gl_program *prog)
-{
-   fprintf(f, "%s%s",
-	   reg_string((gl_register_file) dstReg->File,
-		      dstReg->Index, mode, dstReg->RelAddr, prog,
-                      GL_FALSE, GL_FALSE, 0),
-	   _mesa_writemask_string(dstReg->WriteMask));
-   
-   if (dstReg->CondMask != COND_TR) {
-      fprintf(f, " (%s.%s)",
-	      _mesa_condcode_string(dstReg->CondMask),
-	      _mesa_swizzle_string(dstReg->CondSwizzle,
-				   GL_FALSE, GL_FALSE));
-   }
-
-#if 0
-   fprintf(f, "%s[%d]%s",
-	   file_string((gl_register_file) dstReg->File, mode),
-	   dstReg->Index,
-	   _mesa_writemask_string(dstReg->WriteMask));
-#endif
-}
-
-
-static void
-fprint_src_reg(FILE *f,
-               const struct prog_src_register *srcReg, 
-               gl_prog_print_mode mode,
-               const struct gl_program *prog)
-{
-   const char *abs = srcReg->Abs ? "|" : "";
-
-   fprintf(f, "%s%s%s%s",
-	   abs,
-	   reg_string((gl_register_file) srcReg->File,
-		      srcReg->Index, mode, srcReg->RelAddr, prog,
-                      srcReg->HasIndex2, srcReg->RelAddr2, srcReg->Index2),
-	   _mesa_swizzle_string(srcReg->Swizzle,
-				srcReg->Negate, GL_FALSE),
-	   abs);
-#if 0
-   fprintf(f, "%s[%d]%s",
-	   file_string((gl_register_file) srcReg->File, mode),
-	   srcReg->Index,
-	   _mesa_swizzle_string(srcReg->Swizzle,
-				srcReg->Negate, GL_FALSE));
-#endif
-}
-
-
-static void
-fprint_comment(FILE *f, const struct prog_instruction *inst)
-{
-   if (inst->Comment)
-      fprintf(f, ";  # %s\n", inst->Comment);
-   else
-      fprintf(f, ";\n");
-}
-
-
-void
-_mesa_fprint_alu_instruction(FILE *f,
-			     const struct prog_instruction *inst,
-			     const char *opcode_string, GLuint numRegs,
-			     gl_prog_print_mode mode,
-			     const struct gl_program *prog)
-{
-   GLuint j;
-
-   fprintf(f, "%s", opcode_string);
-   if (inst->CondUpdate)
-      fprintf(f, ".C");
-
-   /* frag prog only */
-   if (inst->SaturateMode == SATURATE_ZERO_ONE)
-      fprintf(f, "_SAT");
-
-   fprintf(f, " ");
-   if (inst->DstReg.File != PROGRAM_UNDEFINED) {
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-   }
-   else {
-      fprintf(f, " ???");
-   }
-
-   if (numRegs > 0)
-      fprintf(f, ", ");
-
-   for (j = 0; j < numRegs; j++) {
-      fprint_src_reg(f, inst->SrcReg + j, mode, prog);
-      if (j + 1 < numRegs)
-	 fprintf(f, ", ");
-   }
-
-   fprint_comment(f, inst);
-}
-
-
-void
-_mesa_print_alu_instruction(const struct prog_instruction *inst,
-                            const char *opcode_string, GLuint numRegs)
-{
-   _mesa_fprint_alu_instruction(stderr, inst, opcode_string,
-				numRegs, PROG_PRINT_DEBUG, NULL);
-}
-
-
-/**
- * Print a single vertex/fragment program instruction.
- */
-GLint
-_mesa_fprint_instruction_opt(FILE *f,
-                            const struct prog_instruction *inst,
-                            GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog)
-{
-   GLint i;
-
-   if (inst->Opcode == OPCODE_ELSE ||
-       inst->Opcode == OPCODE_ENDIF ||
-       inst->Opcode == OPCODE_ENDLOOP ||
-       inst->Opcode == OPCODE_ENDSUB) {
-      indent -= 3;
-   }
-   for (i = 0; i < indent; i++) {
-      fprintf(f, " ");
-   }
-
-   switch (inst->Opcode) {
-   case OPCODE_PRINT:
-      fprintf(f, "PRINT '%s'", (char *) inst->Data);
-      if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-         fprintf(f, ", ");
-         fprintf(f, "%s[%d]%s",
-		 file_string((gl_register_file) inst->SrcReg[0].File,
-			     mode),
-		 inst->SrcReg[0].Index,
-		 _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-				      inst->SrcReg[0].Negate, GL_FALSE));
-      }
-      if (inst->Comment)
-         fprintf(f, "  # %s", inst->Comment);
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_SWZ:
-      fprintf(f, "SWZ");
-      if (inst->SaturateMode == SATURATE_ZERO_ONE)
-         fprintf(f, "_SAT");
-      fprintf(f, " ");
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      fprintf(f, ", %s[%d], %s",
-	      file_string((gl_register_file) inst->SrcReg[0].File,
-			  mode),
-	      inst->SrcReg[0].Index,
-	      _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-				   inst->SrcReg[0].Negate, GL_TRUE));
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_TEX:
-   case OPCODE_TXP:
-   case OPCODE_TXL:
-   case OPCODE_TXB:
-      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      if (inst->SaturateMode == SATURATE_ZERO_ONE)
-         fprintf(f, "_SAT");
-      fprintf(f, " ");
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      fprintf(f, ", ");
-      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      fprintf(f, ", texture[%d], ", inst->TexSrcUnit);
-      switch (inst->TexSrcTarget) {
-      case TEXTURE_1D_INDEX:   fprintf(f, "1D");    break;
-      case TEXTURE_2D_INDEX:   fprintf(f, "2D");    break;
-      case TEXTURE_3D_INDEX:   fprintf(f, "3D");    break;
-      case TEXTURE_CUBE_INDEX: fprintf(f, "CUBE");  break;
-      case TEXTURE_RECT_INDEX: fprintf(f, "RECT");  break;
-      case TEXTURE_1D_ARRAY_INDEX: fprintf(f, "1D_ARRAY"); break;
-      case TEXTURE_2D_ARRAY_INDEX: fprintf(f, "2D_ARRAY"); break;
-      default:
-         ;
-      }
-      if (inst->TexShadow)
-         fprintf(f, " SHADOW");
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_KIL:
-      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      fprintf(f, " ");
-      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_KIL_NV:
-      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      fprintf(f, " ");
-      fprintf(f, "%s.%s",
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle,
-				   GL_FALSE, GL_FALSE));
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_ARL:
-      fprintf(f, "ARL ");
-      fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      fprintf(f, ", ");
-      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_BRA:
-      fprintf(f, "BRA %d (%s%s)",
-	      inst->BranchTarget,
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
-      fprint_comment(f, inst);
-      break;
-   case OPCODE_IF:
-      if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-         /* Use ordinary register */
-         fprintf(f, "IF ");
-         fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-         fprintf(f, "; ");
-      }
-      else {
-         /* Use cond codes */
-         fprintf(f, "IF (%s%s);",
-		 _mesa_condcode_string(inst->DstReg.CondMask),
-		 _mesa_swizzle_string(inst->DstReg.CondSwizzle,
-				      0, GL_FALSE));
-      }
-      fprintf(f, " # (if false, goto %d)", inst->BranchTarget);
-      fprint_comment(f, inst);
-      return indent + 3;
-   case OPCODE_ELSE:
-      fprintf(f, "ELSE; # (goto %d)\n", inst->BranchTarget);
-      return indent + 3;
-   case OPCODE_ENDIF:
-      fprintf(f, "ENDIF;\n");
-      break;
-   case OPCODE_BGNLOOP:
-      fprintf(f, "BGNLOOP; # (end at %d)\n", inst->BranchTarget);
-      return indent + 3;
-   case OPCODE_ENDLOOP:
-      fprintf(f, "ENDLOOP; # (goto %d)\n", inst->BranchTarget);
-      break;
-   case OPCODE_BRK:
-   case OPCODE_CONT:
-      fprintf(f, "%s (%s%s); # (goto %d)",
-	      _mesa_opcode_string(inst->Opcode),
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE),
-	      inst->BranchTarget);
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_BGNSUB:
-      if (mode == PROG_PRINT_NV) {
-         fprintf(f, "%s:\n", inst->Comment); /* comment is label */
-         return indent;
-      }
-      else {
-         fprintf(f, "BGNSUB");
-         fprint_comment(f, inst);
-         return indent + 3;
-      }
-   case OPCODE_ENDSUB:
-      if (mode == PROG_PRINT_DEBUG) {
-         fprintf(f, "ENDSUB");
-         fprint_comment(f, inst);
-      }
-      break;
-   case OPCODE_CAL:
-      if (mode == PROG_PRINT_NV) {
-         fprintf(f, "CAL %s;  # (goto %d)\n", inst->Comment, inst->BranchTarget);
-      }
-      else {
-         fprintf(f, "CAL %u", inst->BranchTarget);
-         fprint_comment(f, inst);
-      }
-      break;
-   case OPCODE_RET:
-      fprintf(f, "RET (%s%s)",
-	      _mesa_condcode_string(inst->DstReg.CondMask),
-	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
-      fprint_comment(f, inst);
-      break;
-
-   case OPCODE_END:
-      fprintf(f, "END\n");
-      break;
-   case OPCODE_NOP:
-      if (mode == PROG_PRINT_DEBUG) {
-         fprintf(f, "NOP");
-         fprint_comment(f, inst);
-      }
-      else if (inst->Comment) {
-         /* ARB/NV extensions don't have NOP instruction */
-         fprintf(f, "# %s\n", inst->Comment);
-      }
-      break;
-   case OPCODE_EMIT_VERTEX:
-      fprintf(f, "EMIT_VERTEX\n");
-      break;
-   case OPCODE_END_PRIMITIVE:
-      fprintf(f, "END_PRIMITIVE\n");
-      break;
-   /* XXX may need other special-case instructions */
-   default:
-      if (inst->Opcode < MAX_OPCODE) {
-         /* typical alu instruction */
-         _mesa_fprint_alu_instruction(f, inst,
-				      _mesa_opcode_string(inst->Opcode),
-				      _mesa_num_inst_src_regs(inst->Opcode),
-				      mode, prog);
-      }
-      else {
-         _mesa_fprint_alu_instruction(f, inst,
-				      _mesa_opcode_string(inst->Opcode),
-				      3/*_mesa_num_inst_src_regs(inst->Opcode)*/,
-				      mode, prog);
-      }
-      break;
-   }
-   return indent;
-}
-
-
-GLint
-_mesa_print_instruction_opt(const struct prog_instruction *inst,
-                            GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog)
-{
-   return _mesa_fprint_instruction_opt(stderr, inst, indent, mode, prog);
-}
-
-
-void
-_mesa_print_instruction(const struct prog_instruction *inst)
-{
-   /* note: 4th param should be ignored for PROG_PRINT_DEBUG */
-   _mesa_fprint_instruction_opt(stderr, inst, 0, PROG_PRINT_DEBUG, NULL);
-}
-
-
-
-/**
- * Print program, with options.
- */
-void
-_mesa_fprint_program_opt(FILE *f,
-                         const struct gl_program *prog,
-                         gl_prog_print_mode mode,
-                         GLboolean lineNumbers)
-{
-   GLuint i, indent = 0;
-
-   switch (prog->Target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      if (mode == PROG_PRINT_ARB)
-         fprintf(f, "!!ARBvp1.0\n");
-      else if (mode == PROG_PRINT_NV)
-         fprintf(f, "!!VP1.0\n");
-      else
-         fprintf(f, "# Vertex Program/Shader %u\n", prog->Id);
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-   case GL_FRAGMENT_PROGRAM_NV:
-      if (mode == PROG_PRINT_ARB)
-         fprintf(f, "!!ARBfp1.0\n");
-      else if (mode == PROG_PRINT_NV)
-         fprintf(f, "!!FP1.0\n");
-      else
-         fprintf(f, "# Fragment Program/Shader %u\n", prog->Id);
-      break;
-   case MESA_GEOMETRY_PROGRAM:
-      fprintf(f, "# Geometry Shader\n");
-   }
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      if (lineNumbers)
-         fprintf(f, "%3d: ", i);
-      indent = _mesa_fprint_instruction_opt(f, prog->Instructions + i,
-                                           indent, mode, prog);
-   }
-}
-
-
-/**
- * Print program to stderr, default options.
- */
-void
-_mesa_print_program(const struct gl_program *prog)
-{
-   _mesa_fprint_program_opt(stderr, prog, PROG_PRINT_DEBUG, GL_TRUE);
-}
-
-
-/**
- * Return binary representation of 64-bit value (as a string).
- * Insert a comma to separate each group of 8 bits.
- * Note we return a pointer to local static storage so this is not
- * re-entrant, etc.
- * XXX move to imports.[ch] if useful elsewhere.
- */
-static const char *
-binary(GLbitfield64 val)
-{
-   static char buf[80];
-   GLint i, len = 0;
-   for (i = 63; i >= 0; --i) {
-      if (val & (BITFIELD64_BIT(i)))
-         buf[len++] = '1';
-      else if (len > 0 || i == 0)
-         buf[len++] = '0';
-      if (len > 0 && ((i-1) % 8) == 7)
-         buf[len++] = ',';
-   }
-   buf[len] = '\0';
-   return buf;
-}
-
-
-/**
- * Print all of a program's parameters/fields to given file.
- */
-static void
-_mesa_fprint_program_parameters(FILE *f,
-                                GLcontext *ctx,
-                                const struct gl_program *prog)
-{
-   GLuint i;
-
-   fprintf(f, "InputsRead: 0x%x (0b%s)\n",
-                 prog->InputsRead, binary(prog->InputsRead));
-   fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
-                 (unsigned long long)prog->OutputsWritten, 
-		 binary(prog->OutputsWritten));
-   fprintf(f, "NumInstructions=%d\n", prog->NumInstructions);
-   fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries);
-   fprintf(f, "NumParameters=%d\n", prog->NumParameters);
-   fprintf(f, "NumAttributes=%d\n", prog->NumAttributes);
-   fprintf(f, "NumAddressRegs=%d\n", prog->NumAddressRegs);
-   fprintf(f, "IndirectRegisterFiles: 0x%x (0b%s)\n",
-           prog->IndirectRegisterFiles, binary(prog->IndirectRegisterFiles));
-   fprintf(f, "SamplersUsed: 0x%x (0b%s)\n",
-                 prog->SamplersUsed, binary(prog->SamplersUsed));
-   fprintf(f, "Samplers=[ ");
-   for (i = 0; i < MAX_SAMPLERS; i++) {
-      fprintf(f, "%d ", prog->SamplerUnits[i]);
-   }
-   fprintf(f, "]\n");
-
-   _mesa_load_state_parameters(ctx, prog->Parameters);
-
-#if 0
-   fprintf(f, "Local Params:\n");
-   for (i = 0; i < MAX_PROGRAM_LOCAL_PARAMS; i++){
-      const GLfloat *p = prog->LocalParams[i];
-      fprintf(f, "%2d: %f, %f, %f, %f\n", i, p[0], p[1], p[2], p[3]);
-   }
-#endif	
-   _mesa_print_parameter_list(prog->Parameters);
-}
-
-
-/**
- * Print all of a program's parameters/fields to stderr.
- */
-void
-_mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog)
-{
-   _mesa_fprint_program_parameters(stderr, ctx, prog);
-}
-
-
-/**
- * Print a program parameter list to given file.
- */
-static void
-_mesa_fprint_parameter_list(FILE *f,
-                            const struct gl_program_parameter_list *list)
-{
-   const gl_prog_print_mode mode = PROG_PRINT_DEBUG;
-   GLuint i;
-
-   if (!list)
-      return;
-
-   if (0)
-      fprintf(f, "param list %p\n", (void *) list);
-   fprintf(f, "dirty state flags: 0x%x\n", list->StateFlags);
-   for (i = 0; i < list->NumParameters; i++){
-      struct gl_program_parameter *param = list->Parameters + i;
-      const GLfloat *v = list->ParameterValues[i];
-      fprintf(f, "param[%d] sz=%d %s %s = {%.3g, %.3g, %.3g, %.3g}",
-	      i, param->Size,
-	      file_string(list->Parameters[i].Type, mode),
-	      param->Name, v[0], v[1], v[2], v[3]);
-      if (param->Flags & PROG_PARAM_BIT_CENTROID)
-         fprintf(f, " Centroid");
-      if (param->Flags & PROG_PARAM_BIT_INVARIANT)
-         fprintf(f, " Invariant");
-      if (param->Flags & PROG_PARAM_BIT_FLAT)
-         fprintf(f, " Flat");
-      if (param->Flags & PROG_PARAM_BIT_LINEAR)
-         fprintf(f, " Linear");
-      fprintf(f, "\n");
-   }
-}
-
-
-/**
- * Print a program parameter list to stderr.
- */
-void
-_mesa_print_parameter_list(const struct gl_program_parameter_list *list)
-{
-   _mesa_fprint_parameter_list(stderr, list);
-}
-
-
-/**
- * Write shader and associated info to a file.
- */
-void
-_mesa_write_shader_to_file(const struct gl_shader *shader)
-{
-   const char *type;
-   char filename[100];
-   FILE *f;
-
-   if (shader->Type == GL_FRAGMENT_SHADER)
-      type = "frag";
-   else if (shader->Type == GL_VERTEX_SHADER)
-      type = "vert";
-   else
-      type = "geom";
-
-   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
-   f = fopen(filename, "w");
-   if (!f) {
-      fprintf(stderr, "Unable to open %s for writing\n", filename);
-      return;
-   }
-
-   fprintf(f, "/* Shader %u source, checksum %u */\n", shader->Name, shader->SourceChecksum);
-   fputs(shader->Source, f);
-   fprintf(f, "\n");
-
-   fprintf(f, "/* Compile status: %s */\n",
-           shader->CompileStatus ? "ok" : "fail");
-   fprintf(f, "/* Log Info: */\n");
-   if (shader->InfoLog) {
-      fputs(shader->InfoLog, f);
-   }
-   if (shader->CompileStatus && shader->Program) {
-      fprintf(f, "/* GPU code */\n");
-      fprintf(f, "/*\n");
-      _mesa_fprint_program_opt(f, shader->Program, PROG_PRINT_DEBUG, GL_TRUE);
-      fprintf(f, "*/\n");
-      fprintf(f, "/* Parameters / constants */\n");
-      fprintf(f, "/*\n");
-      _mesa_fprint_parameter_list(f, shader->Program->Parameters);
-      fprintf(f, "*/\n");
-   }
-
-   fclose(f);
-}
-
-
-/**
- * Append the shader's uniform info/values to the shader log file.
- * The log file will typically have been created by the
- * _mesa_write_shader_to_file function.
- */
-void
-_mesa_append_uniforms_to_file(const struct gl_shader *shader,
-                              const struct gl_program *prog)
-{
-   const char *type;
-   char filename[100];
-   FILE *f;
-
-   if (shader->Type == GL_FRAGMENT_SHADER)
-      type = "frag";
-   else
-      type = "vert";
-
-   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
-   f = fopen(filename, "a"); /* append */
-   if (!f) {
-      fprintf(stderr, "Unable to open %s for appending\n", filename);
-      return;
-   }
-
-   fprintf(f, "/* First-draw parameters / constants */\n");
-   fprintf(f, "/*\n");
-   _mesa_fprint_parameter_list(f, prog->Parameters);
-   fprintf(f, "*/\n");
-
-   fclose(f);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.3

+ *

+ * 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 prog_print.c

+ * Print vertex/fragment programs - for debugging.

+ * \author Brian Paul

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "prog_instruction.h"

+#include "prog_parameter.h"

+#include "prog_print.h"

+#include "prog_statevars.h"

+

+

+

+/**

+ * Return string name for given program/register file.

+ */

+const char *

+_mesa_register_file_name(gl_register_file f)

+{

+   switch (f) {

+   case PROGRAM_TEMPORARY:

+      return "TEMP";

+   case PROGRAM_LOCAL_PARAM:

+      return "LOCAL";

+   case PROGRAM_ENV_PARAM:

+      return "ENV";

+   case PROGRAM_STATE_VAR:

+      return "STATE";

+   case PROGRAM_INPUT:

+      return "INPUT";

+   case PROGRAM_OUTPUT:

+      return "OUTPUT";

+   case PROGRAM_NAMED_PARAM:

+      return "NAMED";

+   case PROGRAM_CONSTANT:

+      return "CONST";

+   case PROGRAM_UNIFORM:

+      return "UNIFORM";

+   case PROGRAM_VARYING:

+      return "VARYING";

+   case PROGRAM_WRITE_ONLY:

+      return "WRITE_ONLY";

+   case PROGRAM_ADDRESS:

+      return "ADDR";

+   case PROGRAM_SAMPLER:

+      return "SAMPLER";

+   case PROGRAM_UNDEFINED:

+      return "UNDEFINED";

+   default:

+      {

+         static char s[20];

+         _mesa_snprintf(s, sizeof(s), "FILE%u", f);

+         return s;

+      }

+   }

+}

+

+

+/**

+ * Return ARB_v/f_prog-style input attrib string.

+ */

+static const char *

+arb_input_attrib_string(GLint index, GLenum progType)

+{

+   /*

+    * These strings should match the VERT_ATTRIB_x and FRAG_ATTRIB_x tokens.

+    */

+   const char *vertAttribs[] = {

+      "vertex.position",

+      "vertex.weight",

+      "vertex.normal",

+      "vertex.color.primary",

+      "vertex.color.secondary",

+      "vertex.fogcoord",

+      "vertex.(six)",

+      "vertex.(seven)",

+      "vertex.texcoord[0]",

+      "vertex.texcoord[1]",

+      "vertex.texcoord[2]",

+      "vertex.texcoord[3]",

+      "vertex.texcoord[4]",

+      "vertex.texcoord[5]",

+      "vertex.texcoord[6]",

+      "vertex.texcoord[7]",

+      "vertex.attrib[0]",

+      "vertex.attrib[1]",

+      "vertex.attrib[2]",

+      "vertex.attrib[3]",

+      "vertex.attrib[4]",

+      "vertex.attrib[5]",

+      "vertex.attrib[6]",

+      "vertex.attrib[7]",

+      "vertex.attrib[8]",

+      "vertex.attrib[9]",

+      "vertex.attrib[10]",

+      "vertex.attrib[11]",

+      "vertex.attrib[12]",

+      "vertex.attrib[13]",

+      "vertex.attrib[14]",

+      "vertex.attrib[15]"

+   };

+   const char *fragAttribs[] = {

+      "fragment.position",

+      "fragment.color.primary",

+      "fragment.color.secondary",

+      "fragment.fogcoord",

+      "fragment.texcoord[0]",

+      "fragment.texcoord[1]",

+      "fragment.texcoord[2]",

+      "fragment.texcoord[3]",

+      "fragment.texcoord[4]",

+      "fragment.texcoord[5]",

+      "fragment.texcoord[6]",

+      "fragment.texcoord[7]",

+      "fragment.varying[0]",

+      "fragment.varying[1]",

+      "fragment.varying[2]",

+      "fragment.varying[3]",

+      "fragment.varying[4]",

+      "fragment.varying[5]",

+      "fragment.varying[6]",

+      "fragment.varying[7]"

+   };

+

+   /* sanity checks */

+   assert(strcmp(vertAttribs[VERT_ATTRIB_TEX0], "vertex.texcoord[0]") == 0);

+   assert(strcmp(vertAttribs[VERT_ATTRIB_GENERIC15], "vertex.attrib[15]") == 0);

+

+   if (progType == GL_VERTEX_PROGRAM_ARB) {

+      assert(index < sizeof(vertAttribs) / sizeof(vertAttribs[0]));

+      return vertAttribs[index];

+   }

+   else {

+      assert(index < sizeof(fragAttribs) / sizeof(fragAttribs[0]));

+      return fragAttribs[index];

+   }

+}

+

+

+/**

+ * Print a vertex program's InputsRead field in human-readable format.

+ * For debugging.

+ */

+void

+_mesa_print_vp_inputs(GLbitfield inputs)

+{

+   printf("VP Inputs 0x%x: \n", inputs);

+   while (inputs) {

+      GLint attr = _mesa_ffs(inputs) - 1;

+      const char *name = arb_input_attrib_string(attr,

+                                                 GL_VERTEX_PROGRAM_ARB);

+      printf("  %d: %s\n", attr, name);

+      inputs &= ~(1 << attr);

+   }

+}

+

+

+/**

+ * Print a fragment program's InputsRead field in human-readable format.

+ * For debugging.

+ */

+void

+_mesa_print_fp_inputs(GLbitfield inputs)

+{

+   printf("FP Inputs 0x%x: \n", inputs);

+   while (inputs) {

+      GLint attr = _mesa_ffs(inputs) - 1;

+      const char *name = arb_input_attrib_string(attr,

+                                                 GL_FRAGMENT_PROGRAM_ARB);

+      printf("  %d: %s\n", attr, name);

+      inputs &= ~(1 << attr);

+   }

+}

+

+

+

+/**

+ * Return ARB_v/f_prog-style output attrib string.

+ */

+static const char *

+arb_output_attrib_string(GLint index, GLenum progType)

+{

+   /*

+    * These strings should match the VERT_RESULT_x and FRAG_RESULT_x tokens.

+    */

+   const char *vertResults[] = {

+      "result.position",

+      "result.color.primary",

+      "result.color.secondary",

+      "result.fogcoord",

+      "result.texcoord[0]",

+      "result.texcoord[1]",

+      "result.texcoord[2]",

+      "result.texcoord[3]",

+      "result.texcoord[4]",

+      "result.texcoord[5]",

+      "result.texcoord[6]",

+      "result.texcoord[7]",

+      "result.varying[0]",

+      "result.varying[1]",

+      "result.varying[2]",

+      "result.varying[3]",

+      "result.varying[4]",

+      "result.varying[5]",

+      "result.varying[6]",

+      "result.varying[7]"

+   };

+   const char *fragResults[] = {

+      "result.color",

+      "result.color(half)",

+      "result.depth",

+      "result.color[0]",

+      "result.color[1]",

+      "result.color[2]",

+      "result.color[3]"

+   };

+

+   if (progType == GL_VERTEX_PROGRAM_ARB) {

+      assert(index < sizeof(vertResults) / sizeof(vertResults[0]));

+      return vertResults[index];

+   }

+   else {

+      assert(index < sizeof(fragResults) / sizeof(fragResults[0]));

+      return fragResults[index];

+   }

+}

+

+

+/**

+ * Return string representation of the given register.

+ * Note that some types of registers (like PROGRAM_UNIFORM) aren't defined

+ * by the ARB/NV program languages so we've taken some liberties here.

+ * \param f  the register file (PROGRAM_INPUT, PROGRAM_TEMPORARY, etc)

+ * \param index  number of the register in the register file

+ * \param mode  the output format/mode/style

+ * \param prog  pointer to containing program

+ */

+static const char *

+reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,

+           GLboolean relAddr, const struct gl_program *prog,

+           GLboolean hasIndex2, GLboolean relAddr2, GLint index2)

+{

+   static char str[100];

+   const char *addr = relAddr ? "ADDR+" : "";

+

+   str[0] = 0;

+

+   switch (mode) {

+   case PROG_PRINT_DEBUG:

+      sprintf(str, "%s[%s%d]",

+              _mesa_register_file_name(f), addr, index);

+      if (hasIndex2) {

+         int offset = strlen(str);

+         const char *addr2 = relAddr2 ? "ADDR+" : "";

+         sprintf(str+offset, "[%s%d]", addr2, index2);

+      }

+      break;

+

+   case PROG_PRINT_ARB:

+      switch (f) {

+      case PROGRAM_INPUT:

+         sprintf(str, "%s", arb_input_attrib_string(index, prog->Target));

+         break;

+      case PROGRAM_OUTPUT:

+         sprintf(str, "%s", arb_output_attrib_string(index, prog->Target));

+         break;

+      case PROGRAM_TEMPORARY:

+         sprintf(str, "temp%d", index);

+         break;

+      case PROGRAM_ENV_PARAM:

+         sprintf(str, "program.env[%s%d]", addr, index);

+         break;

+      case PROGRAM_LOCAL_PARAM:

+         sprintf(str, "program.local[%s%d]", addr, index);

+         break;

+      case PROGRAM_VARYING: /* extension */

+         sprintf(str, "varying[%s%d]", addr, index);

+         break;

+      case PROGRAM_CONSTANT: /* extension */

+         sprintf(str, "constant[%s%d]", addr, index);

+         break;

+      case PROGRAM_UNIFORM: /* extension */

+         sprintf(str, "uniform[%s%d]", addr, index);

+         break;

+      case PROGRAM_STATE_VAR:

+         {

+            struct gl_program_parameter *param

+               = prog->Parameters->Parameters + index;

+            char *state = _mesa_program_state_string(param->StateIndexes);

+            sprintf(str, "%s", state);

+            free(state);

+         }

+         break;

+      case PROGRAM_ADDRESS:

+         sprintf(str, "A%d", index);

+         break;

+      default:

+         _mesa_problem(NULL, "bad file in reg_string()");

+      }

+      break;

+

+   case PROG_PRINT_NV:

+      switch (f) {

+      case PROGRAM_INPUT:

+         if (prog->Target == GL_VERTEX_PROGRAM_ARB)

+            sprintf(str, "v[%d]", index);

+         else

+            sprintf(str, "f[%d]", index);

+         break;

+      case PROGRAM_OUTPUT:

+         sprintf(str, "o[%d]", index);

+         break;

+      case PROGRAM_TEMPORARY:

+         sprintf(str, "R%d", index);

+         break;

+      case PROGRAM_ENV_PARAM:

+         sprintf(str, "c[%d]", index);

+         break;

+      case PROGRAM_VARYING: /* extension */

+         sprintf(str, "varying[%s%d]", addr, index);

+         break;

+      case PROGRAM_UNIFORM: /* extension */

+         sprintf(str, "uniform[%s%d]", addr, index);

+         break;

+      case PROGRAM_CONSTANT: /* extension */

+         sprintf(str, "constant[%s%d]", addr, index);

+         break;

+      case PROGRAM_STATE_VAR: /* extension */

+         sprintf(str, "state[%s%d]", addr, index);

+         break;

+      default:

+         _mesa_problem(NULL, "bad file in reg_string()");

+      }

+      break;

+

+   default:

+      _mesa_problem(NULL, "bad mode in reg_string()");

+   }

+

+   return str;

+}

+

+

+/**

+ * Return a string representation of the given swizzle word.

+ * If extended is true, use extended (comma-separated) format.

+ * \param swizzle  the swizzle field

+ * \param negateBase  4-bit negation vector

+ * \param extended  if true, also allow 0, 1 values

+ */

+const char *

+_mesa_swizzle_string(GLuint swizzle, GLuint negateMask, GLboolean extended)

+{

+   static const char swz[] = "xyzw01!?";  /* See SWIZZLE_x definitions */

+   static char s[20];

+   GLuint i = 0;

+

+   if (!extended && swizzle == SWIZZLE_NOOP && negateMask == 0)

+      return ""; /* no swizzle/negation */

+

+   if (!extended)

+      s[i++] = '.';

+

+   if (negateMask & NEGATE_X)

+      s[i++] = '-';

+   s[i++] = swz[GET_SWZ(swizzle, 0)];

+

+   if (extended) {

+      s[i++] = ',';

+   }

+

+   if (negateMask & NEGATE_Y)

+      s[i++] = '-';

+   s[i++] = swz[GET_SWZ(swizzle, 1)];

+

+   if (extended) {

+      s[i++] = ',';

+   }

+

+   if (negateMask & NEGATE_Z)

+      s[i++] = '-';

+   s[i++] = swz[GET_SWZ(swizzle, 2)];

+

+   if (extended) {

+      s[i++] = ',';

+   }

+

+   if (negateMask & NEGATE_W)

+      s[i++] = '-';

+   s[i++] = swz[GET_SWZ(swizzle, 3)];

+

+   s[i] = 0;

+   return s;

+}

+

+

+void

+_mesa_print_swizzle(GLuint swizzle)

+{

+   if (swizzle == SWIZZLE_XYZW) {

+      printf(".xyzw\n");

+   }

+   else {

+      const char *s = _mesa_swizzle_string(swizzle, 0, 0);

+      printf("%s\n", s);

+   }

+}

+

+

+const char *

+_mesa_writemask_string(GLuint writeMask)

+{

+   static char s[10];

+   GLuint i = 0;

+

+   if (writeMask == WRITEMASK_XYZW)

+      return "";

+

+   s[i++] = '.';

+   if (writeMask & WRITEMASK_X)

+      s[i++] = 'x';

+   if (writeMask & WRITEMASK_Y)

+      s[i++] = 'y';

+   if (writeMask & WRITEMASK_Z)

+      s[i++] = 'z';

+   if (writeMask & WRITEMASK_W)

+      s[i++] = 'w';

+

+   s[i] = 0;

+   return s;

+}

+

+

+const char *

+_mesa_condcode_string(GLuint condcode)

+{

+   switch (condcode) {

+   case COND_GT:  return "GT";

+   case COND_EQ:  return "EQ";

+   case COND_LT:  return "LT";

+   case COND_UN:  return "UN";

+   case COND_GE:  return "GE";

+   case COND_LE:  return "LE";

+   case COND_NE:  return "NE";

+   case COND_TR:  return "TR";

+   case COND_FL:  return "FL";

+   default: return "cond???";

+   }

+}

+

+

+static void

+fprint_dst_reg(FILE * f,

+               const struct prog_dst_register *dstReg,

+               gl_prog_print_mode mode,

+               const struct gl_program *prog)

+{

+   fprintf(f, "%s%s",

+	   reg_string((gl_register_file) dstReg->File,

+		      dstReg->Index, mode, dstReg->RelAddr, prog,

+                      GL_FALSE, GL_FALSE, 0),

+	   _mesa_writemask_string(dstReg->WriteMask));

+   

+   if (dstReg->CondMask != COND_TR) {

+      fprintf(f, " (%s.%s)",

+	      _mesa_condcode_string(dstReg->CondMask),

+	      _mesa_swizzle_string(dstReg->CondSwizzle,

+				   GL_FALSE, GL_FALSE));

+   }

+

+#if 0

+   fprintf(f, "%s[%d]%s",

+	   _mesa_register_file_name((gl_register_file) dstReg->File),

+	   dstReg->Index,

+	   _mesa_writemask_string(dstReg->WriteMask));

+#endif

+}

+

+

+static void

+fprint_src_reg(FILE *f,

+               const struct prog_src_register *srcReg, 

+               gl_prog_print_mode mode,

+               const struct gl_program *prog)

+{

+   const char *abs = srcReg->Abs ? "|" : "";

+

+   fprintf(f, "%s%s%s%s",

+	   abs,

+	   reg_string((gl_register_file) srcReg->File,

+		      srcReg->Index, mode, srcReg->RelAddr, prog,

+                      srcReg->HasIndex2, srcReg->RelAddr2, srcReg->Index2),

+	   _mesa_swizzle_string(srcReg->Swizzle,

+				srcReg->Negate, GL_FALSE),

+	   abs);

+#if 0

+   fprintf(f, "%s[%d]%s",

+	   _mesa_register_file_name((gl_register_file) srcReg->File),

+	   srcReg->Index,

+	   _mesa_swizzle_string(srcReg->Swizzle,

+				srcReg->Negate, GL_FALSE));

+#endif

+}

+

+

+static void

+fprint_comment(FILE *f, const struct prog_instruction *inst)

+{

+   if (inst->Comment)

+      fprintf(f, ";  # %s\n", inst->Comment);

+   else

+      fprintf(f, ";\n");

+}

+

+

+void

+_mesa_fprint_alu_instruction(FILE *f,

+			     const struct prog_instruction *inst,

+			     const char *opcode_string, GLuint numRegs,

+			     gl_prog_print_mode mode,

+			     const struct gl_program *prog)

+{

+   GLuint j;

+

+   fprintf(f, "%s", opcode_string);

+   if (inst->CondUpdate)

+      fprintf(f, ".C");

+

+   /* frag prog only */

+   if (inst->SaturateMode == SATURATE_ZERO_ONE)

+      fprintf(f, "_SAT");

+

+   fprintf(f, " ");

+   if (inst->DstReg.File != PROGRAM_UNDEFINED) {

+      fprint_dst_reg(f, &inst->DstReg, mode, prog);

+   }

+   else {

+      fprintf(f, " ???");

+   }

+

+   if (numRegs > 0)

+      fprintf(f, ", ");

+

+   for (j = 0; j < numRegs; j++) {

+      fprint_src_reg(f, inst->SrcReg + j, mode, prog);

+      if (j + 1 < numRegs)

+	 fprintf(f, ", ");

+   }

+

+   fprint_comment(f, inst);

+}

+

+

+void

+_mesa_print_alu_instruction(const struct prog_instruction *inst,

+                            const char *opcode_string, GLuint numRegs)

+{

+   _mesa_fprint_alu_instruction(stderr, inst, opcode_string,

+				numRegs, PROG_PRINT_DEBUG, NULL);

+}

+

+

+/**

+ * Print a single vertex/fragment program instruction.

+ */

+GLint

+_mesa_fprint_instruction_opt(FILE *f,

+                            const struct prog_instruction *inst,

+                            GLint indent,

+                            gl_prog_print_mode mode,

+                            const struct gl_program *prog)

+{

+   GLint i;

+

+   if (inst->Opcode == OPCODE_ELSE ||

+       inst->Opcode == OPCODE_ENDIF ||

+       inst->Opcode == OPCODE_ENDLOOP ||

+       inst->Opcode == OPCODE_ENDSUB) {

+      indent -= 3;

+   }

+   for (i = 0; i < indent; i++) {

+      fprintf(f, " ");

+   }

+

+   switch (inst->Opcode) {

+   case OPCODE_PRINT:

+      fprintf(f, "PRINT '%s'", (char *) inst->Data);

+      if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {

+         fprintf(f, ", ");

+         fprintf(f, "%s[%d]%s",

+                 _mesa_register_file_name((gl_register_file) inst->SrcReg[0].File),

+		 inst->SrcReg[0].Index,

+		 _mesa_swizzle_string(inst->SrcReg[0].Swizzle,

+				      inst->SrcReg[0].Negate, GL_FALSE));

+      }

+      if (inst->Comment)

+         fprintf(f, "  # %s", inst->Comment);

+      fprint_comment(f, inst);

+      break;

+   case OPCODE_SWZ:

+      fprintf(f, "SWZ");

+      if (inst->SaturateMode == SATURATE_ZERO_ONE)

+         fprintf(f, "_SAT");

+      fprintf(f, " ");

+      fprint_dst_reg(f, &inst->DstReg, mode, prog);

+      fprintf(f, ", %s[%d], %s",

+	      _mesa_register_file_name((gl_register_file) inst->SrcReg[0].File),

+	      inst->SrcReg[0].Index,

+	      _mesa_swizzle_string(inst->SrcReg[0].Swizzle,

+				   inst->SrcReg[0].Negate, GL_TRUE));

+      fprint_comment(f, inst);

+      break;

+   case OPCODE_TEX:

+   case OPCODE_TXP:

+   case OPCODE_TXL:

+   case OPCODE_TXB:

+      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));

+      if (inst->SaturateMode == SATURATE_ZERO_ONE)

+         fprintf(f, "_SAT");

+      fprintf(f, " ");

+      fprint_dst_reg(f, &inst->DstReg, mode, prog);

+      fprintf(f, ", ");

+      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);

+      fprintf(f, ", texture[%d], ", inst->TexSrcUnit);

+      switch (inst->TexSrcTarget) {

+      case TEXTURE_1D_INDEX:   fprintf(f, "1D");    break;

+      case TEXTURE_2D_INDEX:   fprintf(f, "2D");    break;

+      case TEXTURE_3D_INDEX:   fprintf(f, "3D");    break;

+      case TEXTURE_CUBE_INDEX: fprintf(f, "CUBE");  break;

+      case TEXTURE_RECT_INDEX: fprintf(f, "RECT");  break;

+      case TEXTURE_1D_ARRAY_INDEX: fprintf(f, "1D_ARRAY"); break;

+      case TEXTURE_2D_ARRAY_INDEX: fprintf(f, "2D_ARRAY"); break;

+      default:

+         ;

+      }

+      if (inst->TexShadow)

+         fprintf(f, " SHADOW");

+      fprint_comment(f, inst);

+      break;

+

+   case OPCODE_KIL:

+      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));

+      fprintf(f, " ");

+      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);

+      fprint_comment(f, inst);

+      break;

+   case OPCODE_KIL_NV:

+      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));

+      fprintf(f, " ");

+      fprintf(f, "%s.%s",

+	      _mesa_condcode_string(inst->DstReg.CondMask),

+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle,

+				   GL_FALSE, GL_FALSE));

+      fprint_comment(f, inst);

+      break;

+

+   case OPCODE_ARL:

+      fprintf(f, "ARL ");

+      fprint_dst_reg(f, &inst->DstReg, mode, prog);

+      fprintf(f, ", ");

+      fprint_src_reg(f, &inst->SrcReg[0], mode, prog);

+      fprint_comment(f, inst);

+      break;

+   case OPCODE_BRA:

+      fprintf(f, "BRA %d (%s%s)",

+	      inst->BranchTarget,

+	      _mesa_condcode_string(inst->DstReg.CondMask),

+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));

+      fprint_comment(f, inst);

+      break;

+   case OPCODE_IF:

+      if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {

+         /* Use ordinary register */

+         fprintf(f, "IF ");

+         fprint_src_reg(f, &inst->SrcReg[0], mode, prog);

+         fprintf(f, "; ");

+      }

+      else {

+         /* Use cond codes */

+         fprintf(f, "IF (%s%s);",

+		 _mesa_condcode_string(inst->DstReg.CondMask),

+		 _mesa_swizzle_string(inst->DstReg.CondSwizzle,

+				      0, GL_FALSE));

+      }

+      fprintf(f, " # (if false, goto %d)", inst->BranchTarget);

+      fprint_comment(f, inst);

+      return indent + 3;

+   case OPCODE_ELSE:

+      fprintf(f, "ELSE; # (goto %d)\n", inst->BranchTarget);

+      return indent + 3;

+   case OPCODE_ENDIF:

+      fprintf(f, "ENDIF;\n");

+      break;

+   case OPCODE_BGNLOOP:

+      fprintf(f, "BGNLOOP; # (end at %d)\n", inst->BranchTarget);

+      return indent + 3;

+   case OPCODE_ENDLOOP:

+      fprintf(f, "ENDLOOP; # (goto %d)\n", inst->BranchTarget);

+      break;

+   case OPCODE_BRK:

+   case OPCODE_CONT:

+      fprintf(f, "%s (%s%s); # (goto %d)",

+	      _mesa_opcode_string(inst->Opcode),

+	      _mesa_condcode_string(inst->DstReg.CondMask),

+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE),

+	      inst->BranchTarget);

+      fprint_comment(f, inst);

+      break;

+

+   case OPCODE_BGNSUB:

+      if (mode == PROG_PRINT_NV) {

+         fprintf(f, "%s:\n", inst->Comment); /* comment is label */

+         return indent;

+      }

+      else {

+         fprintf(f, "BGNSUB");

+         fprint_comment(f, inst);

+         return indent + 3;

+      }

+   case OPCODE_ENDSUB:

+      if (mode == PROG_PRINT_DEBUG) {

+         fprintf(f, "ENDSUB");

+         fprint_comment(f, inst);

+      }

+      break;

+   case OPCODE_CAL:

+      if (mode == PROG_PRINT_NV) {

+         fprintf(f, "CAL %s;  # (goto %d)\n", inst->Comment, inst->BranchTarget);

+      }

+      else {

+         fprintf(f, "CAL %u", inst->BranchTarget);

+         fprint_comment(f, inst);

+      }

+      break;

+   case OPCODE_RET:

+      fprintf(f, "RET (%s%s)",

+	      _mesa_condcode_string(inst->DstReg.CondMask),

+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));

+      fprint_comment(f, inst);

+      break;

+

+   case OPCODE_END:

+      fprintf(f, "END\n");

+      break;

+   case OPCODE_NOP:

+      if (mode == PROG_PRINT_DEBUG) {

+         fprintf(f, "NOP");

+         fprint_comment(f, inst);

+      }

+      else if (inst->Comment) {

+         /* ARB/NV extensions don't have NOP instruction */

+         fprintf(f, "# %s\n", inst->Comment);

+      }

+      break;

+   case OPCODE_EMIT_VERTEX:

+      fprintf(f, "EMIT_VERTEX\n");

+      break;

+   case OPCODE_END_PRIMITIVE:

+      fprintf(f, "END_PRIMITIVE\n");

+      break;

+   /* XXX may need other special-case instructions */

+   default:

+      if (inst->Opcode < MAX_OPCODE) {

+         /* typical alu instruction */

+         _mesa_fprint_alu_instruction(f, inst,

+				      _mesa_opcode_string(inst->Opcode),

+				      _mesa_num_inst_src_regs(inst->Opcode),

+				      mode, prog);

+      }

+      else {

+         _mesa_fprint_alu_instruction(f, inst,

+				      _mesa_opcode_string(inst->Opcode),

+				      3/*_mesa_num_inst_src_regs(inst->Opcode)*/,

+				      mode, prog);

+      }

+      break;

+   }

+   return indent;

+}

+

+

+GLint

+_mesa_print_instruction_opt(const struct prog_instruction *inst,

+                            GLint indent,

+                            gl_prog_print_mode mode,

+                            const struct gl_program *prog)

+{

+   return _mesa_fprint_instruction_opt(stderr, inst, indent, mode, prog);

+}

+

+

+void

+_mesa_print_instruction(const struct prog_instruction *inst)

+{

+   /* note: 4th param should be ignored for PROG_PRINT_DEBUG */

+   _mesa_fprint_instruction_opt(stderr, inst, 0, PROG_PRINT_DEBUG, NULL);

+}

+

+

+

+/**

+ * Print program, with options.

+ */

+void

+_mesa_fprint_program_opt(FILE *f,

+                         const struct gl_program *prog,

+                         gl_prog_print_mode mode,

+                         GLboolean lineNumbers)

+{

+   GLuint i, indent = 0;

+

+   switch (prog->Target) {

+   case GL_VERTEX_PROGRAM_ARB:

+      if (mode == PROG_PRINT_ARB)

+         fprintf(f, "!!ARBvp1.0\n");

+      else if (mode == PROG_PRINT_NV)

+         fprintf(f, "!!VP1.0\n");

+      else

+         fprintf(f, "# Vertex Program/Shader %u\n", prog->Id);

+      break;

+   case GL_FRAGMENT_PROGRAM_ARB:

+   case GL_FRAGMENT_PROGRAM_NV:

+      if (mode == PROG_PRINT_ARB)

+         fprintf(f, "!!ARBfp1.0\n");

+      else if (mode == PROG_PRINT_NV)

+         fprintf(f, "!!FP1.0\n");

+      else

+         fprintf(f, "# Fragment Program/Shader %u\n", prog->Id);

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      fprintf(f, "# Geometry Shader\n");

+   }

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      if (lineNumbers)

+         fprintf(f, "%3d: ", i);

+      indent = _mesa_fprint_instruction_opt(f, prog->Instructions + i,

+                                           indent, mode, prog);

+   }

+}

+

+

+/**

+ * Print program to stderr, default options.

+ */

+void

+_mesa_print_program(const struct gl_program *prog)

+{

+   _mesa_fprint_program_opt(stderr, prog, PROG_PRINT_DEBUG, GL_TRUE);

+}

+

+

+/**

+ * Return binary representation of 64-bit value (as a string).

+ * Insert a comma to separate each group of 8 bits.

+ * Note we return a pointer to local static storage so this is not

+ * re-entrant, etc.

+ * XXX move to imports.[ch] if useful elsewhere.

+ */

+static const char *

+binary(GLbitfield64 val)

+{

+   static char buf[80];

+   GLint i, len = 0;

+   for (i = 63; i >= 0; --i) {

+      if (val & (BITFIELD64_BIT(i)))

+         buf[len++] = '1';

+      else if (len > 0 || i == 0)

+         buf[len++] = '0';

+      if (len > 0 && ((i-1) % 8) == 7)

+         buf[len++] = ',';

+   }

+   buf[len] = '\0';

+   return buf;

+}

+

+

+/**

+ * Print all of a program's parameters/fields to given file.

+ */

+static void

+_mesa_fprint_program_parameters(FILE *f,

+                                struct gl_context *ctx,

+                                const struct gl_program *prog)

+{

+   GLuint i;

+

+   fprintf(f, "InputsRead: 0x%x (0b%s)\n",

+                 prog->InputsRead, binary(prog->InputsRead));

+   fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",

+                 (unsigned long long)prog->OutputsWritten, 

+		 binary(prog->OutputsWritten));

+   fprintf(f, "NumInstructions=%d\n", prog->NumInstructions);

+   fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries);

+   fprintf(f, "NumParameters=%d\n", prog->NumParameters);

+   fprintf(f, "NumAttributes=%d\n", prog->NumAttributes);

+   fprintf(f, "NumAddressRegs=%d\n", prog->NumAddressRegs);

+   fprintf(f, "IndirectRegisterFiles: 0x%x (0b%s)\n",

+           prog->IndirectRegisterFiles, binary(prog->IndirectRegisterFiles));

+   fprintf(f, "SamplersUsed: 0x%x (0b%s)\n",

+                 prog->SamplersUsed, binary(prog->SamplersUsed));

+   fprintf(f, "Samplers=[ ");

+   for (i = 0; i < MAX_SAMPLERS; i++) {

+      fprintf(f, "%d ", prog->SamplerUnits[i]);

+   }

+   fprintf(f, "]\n");

+

+   _mesa_load_state_parameters(ctx, prog->Parameters);

+

+#if 0

+   fprintf(f, "Local Params:\n");

+   for (i = 0; i < MAX_PROGRAM_LOCAL_PARAMS; i++){

+      const GLfloat *p = prog->LocalParams[i];

+      fprintf(f, "%2d: %f, %f, %f, %f\n", i, p[0], p[1], p[2], p[3]);

+   }

+#endif	

+   _mesa_print_parameter_list(prog->Parameters);

+}

+

+

+/**

+ * Print all of a program's parameters/fields to stderr.

+ */

+void

+_mesa_print_program_parameters(struct gl_context *ctx, const struct gl_program *prog)

+{

+   _mesa_fprint_program_parameters(stderr, ctx, prog);

+}

+

+

+/**

+ * Print a program parameter list to given file.

+ */

+static void

+_mesa_fprint_parameter_list(FILE *f,

+                            const struct gl_program_parameter_list *list)

+{

+   GLuint i;

+

+   if (!list)

+      return;

+

+   if (0)

+      fprintf(f, "param list %p\n", (void *) list);

+   fprintf(f, "dirty state flags: 0x%x\n", list->StateFlags);

+   for (i = 0; i < list->NumParameters; i++){

+      struct gl_program_parameter *param = list->Parameters + i;

+      const GLfloat *v = list->ParameterValues[i];

+      fprintf(f, "param[%d] sz=%d %s %s = {%.3g, %.3g, %.3g, %.3g}",

+	      i, param->Size,

+	      _mesa_register_file_name(list->Parameters[i].Type),

+	      param->Name, v[0], v[1], v[2], v[3]);

+      if (param->Flags & PROG_PARAM_BIT_CENTROID)

+         fprintf(f, " Centroid");

+      if (param->Flags & PROG_PARAM_BIT_INVARIANT)

+         fprintf(f, " Invariant");

+      if (param->Flags & PROG_PARAM_BIT_FLAT)

+         fprintf(f, " Flat");

+      if (param->Flags & PROG_PARAM_BIT_LINEAR)

+         fprintf(f, " Linear");

+      fprintf(f, "\n");

+   }

+}

+

+

+/**

+ * Print a program parameter list to stderr.

+ */

+void

+_mesa_print_parameter_list(const struct gl_program_parameter_list *list)

+{

+   _mesa_fprint_parameter_list(stderr, list);

+}

+

+

+/**

+ * Write shader and associated info to a file.

+ */

+void

+_mesa_write_shader_to_file(const struct gl_shader *shader)

+{

+   const char *type;

+   char filename[100];

+   FILE *f;

+

+   if (shader->Type == GL_FRAGMENT_SHADER)

+      type = "frag";

+   else if (shader->Type == GL_VERTEX_SHADER)

+      type = "vert";

+   else

+      type = "geom";

+

+   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);

+   f = fopen(filename, "w");

+   if (!f) {

+      fprintf(stderr, "Unable to open %s for writing\n", filename);

+      return;

+   }

+

+   fprintf(f, "/* Shader %u source, checksum %u */\n", shader->Name, shader->SourceChecksum);

+   fputs(shader->Source, f);

+   fprintf(f, "\n");

+

+   fprintf(f, "/* Compile status: %s */\n",

+           shader->CompileStatus ? "ok" : "fail");

+   fprintf(f, "/* Log Info: */\n");

+   if (shader->InfoLog) {

+      fputs(shader->InfoLog, f);

+   }

+   if (shader->CompileStatus && shader->Program) {

+      fprintf(f, "/* GPU code */\n");

+      fprintf(f, "/*\n");

+      _mesa_fprint_program_opt(f, shader->Program, PROG_PRINT_DEBUG, GL_TRUE);

+      fprintf(f, "*/\n");

+      fprintf(f, "/* Parameters / constants */\n");

+      fprintf(f, "/*\n");

+      _mesa_fprint_parameter_list(f, shader->Program->Parameters);

+      fprintf(f, "*/\n");

+   }

+

+   fclose(f);

+}

+

+

+/**

+ * Append the shader's uniform info/values to the shader log file.

+ * The log file will typically have been created by the

+ * _mesa_write_shader_to_file function.

+ */

+void

+_mesa_append_uniforms_to_file(const struct gl_shader *shader,

+                              const struct gl_program *prog)

+{

+   const char *type;

+   char filename[100];

+   FILE *f;

+

+   if (shader->Type == GL_FRAGMENT_SHADER)

+      type = "frag";

+   else

+      type = "vert";

+

+   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);

+   f = fopen(filename, "a"); /* append */

+   if (!f) {

+      fprintf(stderr, "Unable to open %s for appending\n", filename);

+      return;

+   }

+

+   fprintf(f, "/* First-draw parameters / constants */\n");

+   fprintf(f, "/*\n");

+   _mesa_fprint_parameter_list(f, prog->Parameters);

+   fprintf(f, "*/\n");

+

+   fclose(f);

+}

diff --git a/mesalib/src/mesa/program/prog_print.h b/mesalib/src/mesa/program/prog_print.h
index 78b90aeb4..caeedb779 100644
--- a/mesalib/src/mesa/program/prog_print.h
+++ b/mesalib/src/mesa/program/prog_print.h
@@ -1,117 +1,120 @@
-/*
- * 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 PROG_PRINT_H
-#define PROG_PRINT_H
-
-#include <stdio.h>
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-
-struct gl_program;
-struct gl_program_parameter_list;
-struct gl_shader;
-struct prog_instruction;
-
-
-/**
- * The output style to use when printing programs.
- */
-typedef enum {
-   PROG_PRINT_ARB,
-   PROG_PRINT_NV,
-   PROG_PRINT_DEBUG
-} gl_prog_print_mode;
-
-
-extern void
-_mesa_print_vp_inputs(GLbitfield inputs);
-
-extern void
-_mesa_print_fp_inputs(GLbitfield inputs);
-
-extern const char *
-_mesa_condcode_string(GLuint condcode);
-
-extern const char *
-_mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended);
-
-const char *
-_mesa_writemask_string(GLuint writeMask);
-
-extern void
-_mesa_print_swizzle(GLuint swizzle);
-
-extern void
-_mesa_fprint_alu_instruction(FILE *f,
-			     const struct prog_instruction *inst,
-			     const char *opcode_string, GLuint numRegs,
-			     gl_prog_print_mode mode,
-			     const struct gl_program *prog);
-
-extern void
-_mesa_print_alu_instruction(const struct prog_instruction *inst,
-                            const char *opcode_string, GLuint numRegs);
-
-extern void
-_mesa_print_instruction(const struct prog_instruction *inst);
-
-extern GLint
-_mesa_fprint_instruction_opt(FILE *f,
-                            const struct prog_instruction *inst,
-                            GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog);
-
-extern GLint
-_mesa_print_instruction_opt(const struct prog_instruction *inst, GLint indent,
-                            gl_prog_print_mode mode,
-                            const struct gl_program *prog);
-
-extern void
-_mesa_print_program(const struct gl_program *prog);
-
-extern void
-_mesa_fprint_program_opt(FILE *f,
-                         const struct gl_program *prog, gl_prog_print_mode mode,
-                         GLboolean lineNumbers);
-
-extern void
-_mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog);
-
-extern void
-_mesa_print_parameter_list(const struct gl_program_parameter_list *list);
-
-
-extern void
-_mesa_write_shader_to_file(const struct gl_shader *shader);
-
-extern void
-_mesa_append_uniforms_to_file(const struct gl_shader *shader,
-                              const struct gl_program *prog);
-
-
-#endif /* PROG_PRINT_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 PROG_PRINT_H

+#define PROG_PRINT_H

+

+#include <stdio.h>

+

+#include "main/glheader.h"

+#include "main/mtypes.h"

+

+struct gl_program;

+struct gl_program_parameter_list;

+struct gl_shader;

+struct prog_instruction;

+

+

+/**

+ * The output style to use when printing programs.

+ */

+typedef enum {

+   PROG_PRINT_ARB,

+   PROG_PRINT_NV,

+   PROG_PRINT_DEBUG

+} gl_prog_print_mode;

+

+

+extern const char *

+_mesa_register_file_name(gl_register_file f);

+

+extern void

+_mesa_print_vp_inputs(GLbitfield inputs);

+

+extern void

+_mesa_print_fp_inputs(GLbitfield inputs);

+

+extern const char *

+_mesa_condcode_string(GLuint condcode);

+

+extern const char *

+_mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended);

+

+const char *

+_mesa_writemask_string(GLuint writeMask);

+

+extern void

+_mesa_print_swizzle(GLuint swizzle);

+

+extern void

+_mesa_fprint_alu_instruction(FILE *f,

+			     const struct prog_instruction *inst,

+			     const char *opcode_string, GLuint numRegs,

+			     gl_prog_print_mode mode,

+			     const struct gl_program *prog);

+

+extern void

+_mesa_print_alu_instruction(const struct prog_instruction *inst,

+                            const char *opcode_string, GLuint numRegs);

+

+extern void

+_mesa_print_instruction(const struct prog_instruction *inst);

+

+extern GLint

+_mesa_fprint_instruction_opt(FILE *f,

+                            const struct prog_instruction *inst,

+                            GLint indent,

+                            gl_prog_print_mode mode,

+                            const struct gl_program *prog);

+

+extern GLint

+_mesa_print_instruction_opt(const struct prog_instruction *inst, GLint indent,

+                            gl_prog_print_mode mode,

+                            const struct gl_program *prog);

+

+extern void

+_mesa_print_program(const struct gl_program *prog);

+

+extern void

+_mesa_fprint_program_opt(FILE *f,

+                         const struct gl_program *prog, gl_prog_print_mode mode,

+                         GLboolean lineNumbers);

+

+extern void

+_mesa_print_program_parameters(struct gl_context *ctx, const struct gl_program *prog);

+

+extern void

+_mesa_print_parameter_list(const struct gl_program_parameter_list *list);

+

+

+extern void

+_mesa_write_shader_to_file(const struct gl_shader *shader);

+

+extern void

+_mesa_append_uniforms_to_file(const struct gl_shader *shader,

+                              const struct gl_program *prog);

+

+

+#endif /* PROG_PRINT_H */

diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index 2687f8ae2..df3c76d18 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -1,1189 +1,1182 @@
-/*
- * 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(GLcontext *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];
-         COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);
-      }
-      return;
-   case STATE_FOG_COLOR:
-      COPY_4V(value, ctx->Fog.Color);
-      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:
-   case STATE_COLOR_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 if (mat == STATE_COLOR_MATRIX) {
-            matrix = ctx->ColorMatrixStack.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_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_PCM_SCALE:
-         COPY_4V(value, ctx->Pixel.PostColorMatrixScale);
-         return;
-
-      case STATE_PCM_BIAS:
-         COPY_4V(value, ctx->Pixel.PostColorMatrixBias);
-         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_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:
-   case STATE_TEXENV_COLOR:
-      return _NEW_TEXTURE;
-
-   case STATE_FOG_COLOR:
-   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_COLOR_MATRIX:
-      return _NEW_COLOR_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_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:
-      case STATE_PCM_SCALE:
-      case STATE_PCM_BIAS:
-         return _NEW_PIXEL;
-
-      case STATE_FB_SIZE:
-         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_COLOR_MATRIX:
-      append(dst, "matrix.color");
-      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_PCM_SCALE:
-      append(dst, "PCMscale");
-      break;
-   case STATE_PCM_BIAS:
-      append(dst, "PCMbias");
-      break;
-   case STATE_SHADOW_AMBIENT:
-      append(dst, "CompareFailValue");
-      break;
-   case STATE_FB_SIZE:
-      append(dst, "FbSize");
-      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:
-   case STATE_COLOR_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.
- * This would be called at glBegin time when using a fragment program.
- */
-void
-_mesa_load_state_parameters(GLcontext *ctx,
-                            struct gl_program_parameter_list *paramList)
-{
-   GLuint i;
-
-   if (!paramList)
-      return;
-
-   /*assert(ctx->Driver.NeedFlush == 0);*/
-
-   for (i = 0; i < paramList->NumParameters; i++) {
-      if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
-         _mesa_fetch_state(ctx,
-			   (gl_state_index *) 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(GLcontext *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_COLOR) {
-         mat = ctx->ColorMatrixStack.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];

+         COPY_4V(value, ctx->Texture.Unit[unit].EnvColor);

+      }

+      return;

+   case STATE_FOG_COLOR:

+      COPY_4V(value, ctx->Fog.Color);

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

+   case STATE_TEXENV_COLOR:

+      return _NEW_TEXTURE;

+

+   case STATE_FOG_COLOR:

+   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_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 1753471ff..a92b77855 100644
--- a/mesalib/src/mesa/program/prog_statevars.h
+++ b/mesalib/src/mesa/program/prog_statevars.h
@@ -1,147 +1,147 @@
-/*
- * 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/mtypes.h"
-
-
-/**
- * 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_COLOR_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_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_PCM_SCALE,             /**< Post color matrix RGBA scale */
-   STATE_PCM_BIAS,              /**< Post color matrix 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_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(GLcontext *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(GLcontext *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_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.c b/mesalib/src/mesa/program/program.c
index 06b9539bd..eff600685 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -1,976 +1,1073 @@
-/*
- * 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 program.c
- * Vertex and fragment program support functions.
- * \author Brian Paul
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/hash.h"
-#include "program.h"
-#include "prog_cache.h"
-#include "prog_parameter.h"
-#include "prog_instruction.h"
-
-
-/**
- * A pointer to this dummy program is put into the hash table when
- * glGenPrograms is called.
- */
-struct gl_program _mesa_DummyProgram;
-
-
-/**
- * Init context's vertex/fragment program state
- */
-void
-_mesa_init_program(GLcontext *ctx)
-{
-   GLuint i;
-
-   /*
-    * If this assertion fails, we need to increase the field
-    * size for register indexes (see INST_INDEX_BITS).
-    */
-   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents / 4
-          <= (1 << INST_INDEX_BITS));
-   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents / 4
-          <= (1 << INST_INDEX_BITS));
-
-   ASSERT(ctx->Const.VertexProgram.MaxTemps <= (1 << INST_INDEX_BITS));
-   ASSERT(ctx->Const.VertexProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));
-   ASSERT(ctx->Const.FragmentProgram.MaxTemps <= (1 << INST_INDEX_BITS));
-   ASSERT(ctx->Const.FragmentProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));
-
-   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);
-   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);
-
-   /* If this fails, increase prog_instruction::TexSrcUnit size */
-   ASSERT(MAX_TEXTURE_UNITS < (1 << 5));
-
-   /* If this fails, increase prog_instruction::TexSrcTarget size */
-   ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));
-
-   ctx->Program.ErrorPos = -1;
-   ctx->Program.ErrorString = _mesa_strdup("");
-
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   ctx->VertexProgram.Enabled = GL_FALSE;
-#if FEATURE_es2_glsl
-   ctx->VertexProgram.PointSizeEnabled =
-      (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;
-#else
-   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
-#endif
-   ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-                            ctx->Shared->DefaultVertexProgram);
-   assert(ctx->VertexProgram.Current);
-   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
-      ctx->VertexProgram.TrackMatrix[i] = GL_NONE;
-      ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;
-   }
-   ctx->VertexProgram.Cache = _mesa_new_program_cache();
-#endif
-
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   ctx->FragmentProgram.Enabled = GL_FALSE;
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-                            ctx->Shared->DefaultFragmentProgram);
-   assert(ctx->FragmentProgram.Current);
-   ctx->FragmentProgram.Cache = _mesa_new_program_cache();
-#endif
-
-#if FEATURE_ARB_geometry_shader4
-   ctx->GeometryProgram.Enabled = GL_FALSE;
-   /* right now by default we don't have a geometry program */
-   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
-                            NULL);
-   ctx->GeometryProgram.Cache = _mesa_new_program_cache();
-#endif
-
-   /* XXX probably move this stuff */
-#if FEATURE_ATI_fragment_shader
-   ctx->ATIFragmentShader.Enabled = GL_FALSE;
-   ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader;
-   assert(ctx->ATIFragmentShader.Current);
-   ctx->ATIFragmentShader.Current->RefCount++;
-#endif
-}
-
-
-/**
- * Free a context's vertex/fragment program state
- */
-void
-_mesa_free_program_data(GLcontext *ctx)
-{
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
-   _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);
-#endif
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
-   _mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);
-#endif
-#if FEATURE_ARB_geometry_shader4
-   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
-   _mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);
-#endif
-   /* XXX probably move this stuff */
-#if FEATURE_ATI_fragment_shader
-   if (ctx->ATIFragmentShader.Current) {
-      ctx->ATIFragmentShader.Current->RefCount--;
-      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
-         free(ctx->ATIFragmentShader.Current);
-      }
-   }
-#endif
-   free((void *) ctx->Program.ErrorString);
-}
-
-
-/**
- * Update the default program objects in the given context to reference those
- * specified in the shared state and release those referencing the old
- * shared state.
- */
-void
-_mesa_update_default_objects_program(GLcontext *ctx)
-{
-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-                            (struct gl_vertex_program *)
-                            ctx->Shared->DefaultVertexProgram);
-   assert(ctx->VertexProgram.Current);
-#endif
-
-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-                            (struct gl_fragment_program *)
-                            ctx->Shared->DefaultFragmentProgram);
-   assert(ctx->FragmentProgram.Current);
-#endif
-
-#if FEATURE_ARB_geometry_shader4
-   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
-                            (struct gl_geometry_program *)
-                            ctx->Shared->DefaultGeometryProgram);
-#endif
-
-   /* XXX probably move this stuff */
-#if FEATURE_ATI_fragment_shader
-   if (ctx->ATIFragmentShader.Current) {
-      ctx->ATIFragmentShader.Current->RefCount--;
-      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
-         free(ctx->ATIFragmentShader.Current);
-      }
-   }
-   ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;
-   assert(ctx->ATIFragmentShader.Current);
-   ctx->ATIFragmentShader.Current->RefCount++;
-#endif
-}
-
-
-/**
- * Set the vertex/fragment program error state (position and error string).
- * This is generally called from within the parsers.
- */
-void
-_mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string)
-{
-   ctx->Program.ErrorPos = pos;
-   free((void *) ctx->Program.ErrorString);
-   if (!string)
-      string = "";
-   ctx->Program.ErrorString = _mesa_strdup(string);
-}
-
-
-/**
- * Find the line number and column for 'pos' within 'string'.
- * Return a copy of the line which contains 'pos'.  Free the line with
- * free().
- * \param string  the program string
- * \param pos     the position within the string
- * \param line    returns the line number corresponding to 'pos'.
- * \param col     returns the column number corresponding to 'pos'.
- * \return copy of the line containing 'pos'.
- */
-const GLubyte *
-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
-                       GLint *line, GLint *col)
-{
-   const GLubyte *lineStart = string;
-   const GLubyte *p = string;
-   GLubyte *s;
-   int len;
-
-   *line = 1;
-
-   while (p != pos) {
-      if (*p == (GLubyte) '\n') {
-         (*line)++;
-         lineStart = p + 1;
-      }
-      p++;
-   }
-
-   *col = (pos - lineStart) + 1;
-
-   /* return copy of this line */
-   while (*p != 0 && *p != '\n')
-      p++;
-   len = p - lineStart;
-   s = (GLubyte *) malloc(len + 1);
-   memcpy(s, lineStart, len);
-   s[len] = 0;
-
-   return s;
-}
-
-
-/**
- * Initialize a new vertex/fragment program object.
- */
-static struct gl_program *
-_mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
-                           GLenum target, GLuint id)
-{
-   (void) ctx;
-   if (prog) {
-      GLuint i;
-      memset(prog, 0, sizeof(*prog));
-      prog->Id = id;
-      prog->Target = target;
-      prog->Resident = GL_TRUE;
-      prog->RefCount = 1;
-      prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
-
-      /* default mapping from samplers to texture units */
-      for (i = 0; i < MAX_SAMPLERS; i++)
-         prog->SamplerUnits[i] = i;
-   }
-
-   return prog;
-}
-
-
-/**
- * Initialize a new fragment program object.
- */
-struct gl_program *
-_mesa_init_fragment_program( GLcontext *ctx, struct gl_fragment_program *prog,
-                             GLenum target, GLuint id)
-{
-   if (prog)
-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
-   else
-      return NULL;
-}
-
-
-/**
- * Initialize a new vertex program object.
- */
-struct gl_program *
-_mesa_init_vertex_program( GLcontext *ctx, struct gl_vertex_program *prog,
-                           GLenum target, GLuint id)
-{
-   if (prog)
-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
-   else
-      return NULL;
-}
-
-
-/**
- * Initialize a new geometry program object.
- */
-struct gl_program *
-_mesa_init_geometry_program( GLcontext *ctx, struct gl_geometry_program *prog,
-                             GLenum target, GLuint id)
-{
-   if (prog)
-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
-   else
-      return NULL;
-}
-
-
-/**
- * Allocate and initialize a new fragment/vertex program object but
- * don't put it into the program hash table.  Called via
- * ctx->Driver.NewProgram.  May be overridden (ie. replaced) by a
- * device driver function to implement OO deriviation with additional
- * types not understood by this function.
- *
- * \param ctx  context
- * \param id   program id/number
- * \param target  program target/type
- * \return  pointer to new program object
- */
-struct gl_program *
-_mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
-{
-   struct gl_program *prog;
-   switch (target) {
-   case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
-   case GL_VERTEX_STATE_PROGRAM_NV:
-      prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
-                                       target, id );
-      break;
-   case GL_FRAGMENT_PROGRAM_NV:
-   case GL_FRAGMENT_PROGRAM_ARB:
-      prog =_mesa_init_fragment_program(ctx,
-                                         CALLOC_STRUCT(gl_fragment_program),
-                                         target, id );
-      break;
-   case MESA_GEOMETRY_PROGRAM:
-      prog = _mesa_init_geometry_program(ctx,
-                                         CALLOC_STRUCT(gl_geometry_program),
-                                         target, id);
-      break;
-   default:
-      _mesa_problem(ctx, "bad target in _mesa_new_program");
-      prog = NULL;
-   }
-   return prog;
-}
-
-
-/**
- * Delete a program and remove it from the hash table, ignoring the
- * reference count.
- * Called via ctx->Driver.DeleteProgram.  May be wrapped (OO deriviation)
- * by a device driver function.
- */
-void
-_mesa_delete_program(GLcontext *ctx, struct gl_program *prog)
-{
-   (void) ctx;
-   ASSERT(prog);
-   ASSERT(prog->RefCount==0);
-
-   if (prog == &_mesa_DummyProgram)
-      return;
-
-   if (prog->String)
-      free(prog->String);
-
-   _mesa_free_instructions(prog->Instructions, prog->NumInstructions);
-
-   if (prog->Parameters) {
-      _mesa_free_parameter_list(prog->Parameters);
-   }
-   if (prog->Varying) {
-      _mesa_free_parameter_list(prog->Varying);
-   }
-   if (prog->Attributes) {
-      _mesa_free_parameter_list(prog->Attributes);
-   }
-
-   free(prog);
-}
-
-
-/**
- * Return the gl_program object for a given ID.
- * Basically just a wrapper for _mesa_HashLookup() to avoid a lot of
- * casts elsewhere.
- */
-struct gl_program *
-_mesa_lookup_program(GLcontext *ctx, GLuint id)
-{
-   if (id)
-      return (struct gl_program *) _mesa_HashLookup(ctx->Shared->Programs, id);
-   else
-      return NULL;
-}
-
-
-/**
- * Reference counting for vertex/fragment programs
- */
-void
-_mesa_reference_program(GLcontext *ctx,
-                        struct gl_program **ptr,
-                        struct gl_program *prog)
-{
-   assert(ptr);
-   if (*ptr && prog) {
-      /* sanity check */
-      if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)
-         ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);
-      else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)
-         ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||
-                prog->Target == GL_FRAGMENT_PROGRAM_NV);
-      else if ((*ptr)->Target == MESA_GEOMETRY_PROGRAM)
-         ASSERT(prog->Target == MESA_GEOMETRY_PROGRAM);
-   }
-   if (*ptr == prog) {
-      return;  /* no change */
-   }
-   if (*ptr) {
-      GLboolean deleteFlag;
-
-      /*_glthread_LOCK_MUTEX((*ptr)->Mutex);*/
-#if 0
-      printf("Program %p ID=%u Target=%s  Refcount-- to %d\n",
-             *ptr, (*ptr)->Id,
-             ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :
-              ((*ptr)->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),
-             (*ptr)->RefCount - 1);
-#endif
-      ASSERT((*ptr)->RefCount > 0);
-      (*ptr)->RefCount--;
-
-      deleteFlag = ((*ptr)->RefCount == 0);
-      /*_glthread_UNLOCK_MUTEX((*ptr)->Mutex);*/
-
-      if (deleteFlag) {
-         ASSERT(ctx);
-         ctx->Driver.DeleteProgram(ctx, *ptr);
-      }
-
-      *ptr = NULL;
-   }
-
-   assert(!*ptr);
-   if (prog) {
-      /*_glthread_LOCK_MUTEX(prog->Mutex);*/
-      prog->RefCount++;
-#if 0
-      printf("Program %p ID=%u Target=%s  Refcount++ to %d\n",
-             prog, prog->Id,
-             (prog->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :
-              (prog->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),
-             prog->RefCount);
-#endif
-      /*_glthread_UNLOCK_MUTEX(prog->Mutex);*/
-   }
-
-   *ptr = prog;
-}
-
-
-/**
- * Return a copy of a program.
- * XXX Problem here if the program object is actually OO-derivation
- * made by a device driver.
- */
-struct gl_program *
-_mesa_clone_program(GLcontext *ctx, const struct gl_program *prog)
-{
-   struct gl_program *clone;
-
-   clone = ctx->Driver.NewProgram(ctx, prog->Target, prog->Id);
-   if (!clone)
-      return NULL;
-
-   assert(clone->Target == prog->Target);
-   assert(clone->RefCount == 1);
-
-   clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);
-   clone->Format = prog->Format;
-   clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);
-   if (!clone->Instructions) {
-      _mesa_reference_program(ctx, &clone, NULL);
-      return NULL;
-   }
-   _mesa_copy_instructions(clone->Instructions, prog->Instructions,
-                           prog->NumInstructions);
-   clone->InputsRead = prog->InputsRead;
-   clone->OutputsWritten = prog->OutputsWritten;
-   clone->SamplersUsed = prog->SamplersUsed;
-   clone->ShadowSamplers = prog->ShadowSamplers;
-   memcpy(clone->TexturesUsed, prog->TexturesUsed, sizeof(prog->TexturesUsed));
-
-   if (prog->Parameters)
-      clone->Parameters = _mesa_clone_parameter_list(prog->Parameters);
-   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
-   if (prog->Varying)
-      clone->Varying = _mesa_clone_parameter_list(prog->Varying);
-   if (prog->Attributes)
-      clone->Attributes = _mesa_clone_parameter_list(prog->Attributes);
-   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
-   clone->IndirectRegisterFiles = prog->IndirectRegisterFiles;
-   clone->NumInstructions = prog->NumInstructions;
-   clone->NumTemporaries = prog->NumTemporaries;
-   clone->NumParameters = prog->NumParameters;
-   clone->NumAttributes = prog->NumAttributes;
-   clone->NumAddressRegs = prog->NumAddressRegs;
-   clone->NumNativeInstructions = prog->NumNativeInstructions;
-   clone->NumNativeTemporaries = prog->NumNativeTemporaries;
-   clone->NumNativeParameters = prog->NumNativeParameters;
-   clone->NumNativeAttributes = prog->NumNativeAttributes;
-   clone->NumNativeAddressRegs = prog->NumNativeAddressRegs;
-   clone->NumAluInstructions = prog->NumAluInstructions;
-   clone->NumTexInstructions = prog->NumTexInstructions;
-   clone->NumTexIndirections = prog->NumTexIndirections;
-   clone->NumNativeAluInstructions = prog->NumNativeAluInstructions;
-   clone->NumNativeTexInstructions = prog->NumNativeTexInstructions;
-   clone->NumNativeTexIndirections = prog->NumNativeTexIndirections;
-
-   switch (prog->Target) {
-   case GL_VERTEX_PROGRAM_ARB:
-      {
-         const struct gl_vertex_program *vp
-            = (const struct gl_vertex_program *) prog;
-         struct gl_vertex_program *vpc = (struct gl_vertex_program *) clone;
-         vpc->IsPositionInvariant = vp->IsPositionInvariant;
-         vpc->IsNVProgram = vp->IsNVProgram;
-      }
-      break;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      {
-         const struct gl_fragment_program *fp
-            = (const struct gl_fragment_program *) prog;
-         struct gl_fragment_program *fpc = (struct gl_fragment_program *) clone;
-         fpc->FogOption = fp->FogOption;
-         fpc->UsesKill = fp->UsesKill;
-         fpc->OriginUpperLeft = fp->OriginUpperLeft;
-         fpc->PixelCenterInteger = fp->PixelCenterInteger;
-      }
-      break;
-   case MESA_GEOMETRY_PROGRAM:
-      {
-         const struct gl_geometry_program *gp
-            = (const struct gl_geometry_program *) prog;
-         struct gl_geometry_program *gpc = (struct gl_geometry_program *) clone;
-         gpc->VerticesOut = gp->VerticesOut;
-         gpc->InputType = gp->InputType;
-         gpc->OutputType = gp->OutputType;
-      }
-      break;
-   default:
-      _mesa_problem(NULL, "Unexpected target in _mesa_clone_program");
-   }
-
-   return clone;
-}
-
-
-/**
- * Insert 'count' NOP instructions at 'start' in the given program.
- * Adjust branch targets accordingly.
- */
-GLboolean
-_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)
-{
-   const GLuint origLen = prog->NumInstructions;
-   const GLuint newLen = origLen + count;
-   struct prog_instruction *newInst;
-   GLuint i;
-
-   /* adjust branches */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->BranchTarget > 0) {
-         if ((GLuint)inst->BranchTarget >= start) {
-            inst->BranchTarget += count;
-         }
-      }
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      return GL_FALSE;
-   }
-
-   /* Copy 'start' instructions into new instruction buffer */
-   _mesa_copy_instructions(newInst, prog->Instructions, start);
-
-   /* init the new instructions */
-   _mesa_init_instructions(newInst + start, count);
-
-   /* Copy the remaining/tail instructions to new inst buffer */
-   _mesa_copy_instructions(newInst + start + count,
-                           prog->Instructions + start,
-                           origLen - start);
-
-   /* free old instructions */
-   _mesa_free_instructions(prog->Instructions, origLen);
-
-   /* install new instructions */
-   prog->Instructions = newInst;
-   prog->NumInstructions = newLen;
-
-   return GL_TRUE;
-}
-
-/**
- * Delete 'count' instructions at 'start' in the given program.
- * Adjust branch targets accordingly.
- */
-GLboolean
-_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count)
-{
-   const GLuint origLen = prog->NumInstructions;
-   const GLuint newLen = origLen - count;
-   struct prog_instruction *newInst;
-   GLuint i;
-
-   /* adjust branches */
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      if (inst->BranchTarget > 0) {
-         if (inst->BranchTarget > (GLint) start) {
-            inst->BranchTarget -= count;
-         }
-      }
-   }
-
-   /* Alloc storage for new instructions */
-   newInst = _mesa_alloc_instructions(newLen);
-   if (!newInst) {
-      return GL_FALSE;
-   }
-
-   /* Copy 'start' instructions into new instruction buffer */
-   _mesa_copy_instructions(newInst, prog->Instructions, start);
-
-   /* Copy the remaining/tail instructions to new inst buffer */
-   _mesa_copy_instructions(newInst + start,
-                           prog->Instructions + start + count,
-                           newLen - start);
-
-   /* free old instructions */
-   _mesa_free_instructions(prog->Instructions, origLen);
-
-   /* install new instructions */
-   prog->Instructions = newInst;
-   prog->NumInstructions = newLen;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Search instructions for registers that match (oldFile, oldIndex),
- * replacing them with (newFile, newIndex).
- */
-static void
-replace_registers(struct prog_instruction *inst, GLuint numInst,
-                  GLuint oldFile, GLuint oldIndex,
-                  GLuint newFile, GLuint newIndex)
-{
-   GLuint i, j;
-   for (i = 0; i < numInst; i++) {
-      /* src regs */
-      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {
-         if (inst[i].SrcReg[j].File == oldFile &&
-             inst[i].SrcReg[j].Index == oldIndex) {
-            inst[i].SrcReg[j].File = newFile;
-            inst[i].SrcReg[j].Index = newIndex;
-         }
-      }
-      /* dst reg */
-      if (inst[i].DstReg.File == oldFile && inst[i].DstReg.Index == oldIndex) {
-         inst[i].DstReg.File = newFile;
-         inst[i].DstReg.Index = newIndex;
-      }
-   }
-}
-
-
-/**
- * Search instructions for references to program parameters.  When found,
- * increment the parameter index by 'offset'.
- * Used when combining programs.
- */
-static void
-adjust_param_indexes(struct prog_instruction *inst, GLuint numInst,
-                     GLuint offset)
-{
-   GLuint i, j;
-   for (i = 0; i < numInst; i++) {
-      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {
-         GLuint f = inst[i].SrcReg[j].File;
-         if (f == PROGRAM_CONSTANT ||
-             f == PROGRAM_UNIFORM ||
-             f == PROGRAM_STATE_VAR) {
-            inst[i].SrcReg[j].Index += offset;
-         }
-      }
-   }
-}
-
-
-/**
- * Combine two programs into one.  Fix instructions so the outputs of
- * the first program go to the inputs of the second program.
- */
-struct gl_program *
-_mesa_combine_programs(GLcontext *ctx,
-                       const struct gl_program *progA,
-                       const struct gl_program *progB)
-{
-   struct prog_instruction *newInst;
-   struct gl_program *newProg;
-   const GLuint lenA = progA->NumInstructions - 1; /* omit END instr */
-   const GLuint lenB = progB->NumInstructions;
-   const GLuint numParamsA = _mesa_num_parameters(progA->Parameters);
-   const GLuint newLength = lenA + lenB;
-   GLboolean usedTemps[MAX_PROGRAM_TEMPS];
-   GLuint firstTemp = 0;
-   GLbitfield inputsB;
-   GLuint i;
-
-   ASSERT(progA->Target == progB->Target);
-
-   newInst = _mesa_alloc_instructions(newLength);
-   if (!newInst)
-      return GL_FALSE;
-
-   _mesa_copy_instructions(newInst, progA->Instructions, lenA);
-   _mesa_copy_instructions(newInst + lenA, progB->Instructions, lenB);
-
-   /* adjust branch / instruction addresses for B's instructions */
-   for (i = 0; i < lenB; i++) {
-      newInst[lenA + i].BranchTarget += lenA;
-   }
-
-   newProg = ctx->Driver.NewProgram(ctx, progA->Target, 0);
-   newProg->Instructions = newInst;
-   newProg->NumInstructions = newLength;
-
-   /* find used temp regs (we may need new temps below) */
-   _mesa_find_used_registers(newProg, PROGRAM_TEMPORARY,
-                             usedTemps, MAX_PROGRAM_TEMPS);
-
-   if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {
-      struct gl_fragment_program *fprogA, *fprogB, *newFprog;
-      GLbitfield progB_inputsRead = progB->InputsRead;
-      GLint progB_colorFile, progB_colorIndex;
-
-      fprogA = (struct gl_fragment_program *) progA;
-      fprogB = (struct gl_fragment_program *) progB;
-      newFprog = (struct gl_fragment_program *) newProg;
-
-      newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;
-
-      /* We'll do a search and replace for instances
-       * of progB_colorFile/progB_colorIndex below...
-       */
-      progB_colorFile = PROGRAM_INPUT;
-      progB_colorIndex = FRAG_ATTRIB_COL0;
-
-      /*
-       * The fragment program may get color from a state var rather than
-       * a fragment input (vertex output) if it's constant.
-       * See the texenvprogram.c code.
-       * So, search the program's parameter list now to see if the program
-       * gets color from a state var instead of a conventional fragment
-       * input register.
-       */
-      for (i = 0; i < progB->Parameters->NumParameters; i++) {
-         struct gl_program_parameter *p = &progB->Parameters->Parameters[i];
-         if (p->Type == PROGRAM_STATE_VAR &&
-             p->StateIndexes[0] == STATE_INTERNAL &&
-             p->StateIndexes[1] == STATE_CURRENT_ATTRIB &&
-             p->StateIndexes[2] == VERT_ATTRIB_COLOR0) {
-            progB_inputsRead |= FRAG_BIT_COL0;
-            progB_colorFile = PROGRAM_STATE_VAR;
-            progB_colorIndex = i;
-            break;
-         }
-      }
-
-      /* Connect color outputs of fprogA to color inputs of fprogB, via a
-       * new temporary register.
-       */
-      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&
-          (progB_inputsRead & FRAG_BIT_COL0)) {
-         GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,
-                                                  firstTemp);
-         if (tempReg < 0) {
-            _mesa_problem(ctx, "No free temp regs found in "
-                          "_mesa_combine_programs(), using 31");
-            tempReg = 31;
-         }
-         firstTemp = tempReg + 1;
-
-         /* replace writes to result.color[0] with tempReg */
-         replace_registers(newInst, lenA,
-                           PROGRAM_OUTPUT, FRAG_RESULT_COLOR,
-                           PROGRAM_TEMPORARY, tempReg);
-         /* replace reads from the input color with tempReg */
-         replace_registers(newInst + lenA, lenB,
-                           progB_colorFile, progB_colorIndex, /* search for */
-                           PROGRAM_TEMPORARY, tempReg  /* replace with */ );
-      }
-
-      /* compute combined program's InputsRead */
-      inputsB = progB_inputsRead;
-      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
-         inputsB &= ~(1 << FRAG_ATTRIB_COL0);
-      }
-      newProg->InputsRead = progA->InputsRead | inputsB;
-      newProg->OutputsWritten = progB->OutputsWritten;
-      newProg->SamplersUsed = progA->SamplersUsed | progB->SamplersUsed;
-   }
-   else {
-      /* vertex program */
-      assert(0);      /* XXX todo */
-   }
-
-   /*
-    * Merge parameters (uniforms, constants, etc)
-    */
-   newProg->Parameters = _mesa_combine_parameter_lists(progA->Parameters,
-                                                       progB->Parameters);
-
-   adjust_param_indexes(newInst + lenA, lenB, numParamsA);
-
-
-   return newProg;
-}
-
-
-/**
- * Populate the 'used' array with flags indicating which registers (TEMPs,
- * INPUTs, OUTPUTs, etc, are used by the given program.
- * \param file  type of register to scan for
- * \param used  returns true/false flags for in use / free
- * \param usedSize  size of the 'used' array
- */
-void
-_mesa_find_used_registers(const struct gl_program *prog,
-                          gl_register_file file,
-                          GLboolean used[], GLuint usedSize)
-{
-   GLuint i, j;
-
-   memset(used, 0, usedSize);
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      const struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
-
-      if (inst->DstReg.File == file) {
-         ASSERT(inst->DstReg.Index < usedSize);
-         if(inst->DstReg.Index < usedSize)
-            used[inst->DstReg.Index] = GL_TRUE;
-      }
-
-      for (j = 0; j < n; j++) {
-         if (inst->SrcReg[j].File == file) {
-            ASSERT(inst->SrcReg[j].Index < usedSize);
-            if(inst->SrcReg[j].Index < usedSize)
-               used[inst->SrcReg[j].Index] = GL_TRUE;
-         }
-      }
-   }
-}
-
-
-/**
- * Scan the given 'used' register flag array for the first entry
- * that's >= firstReg.
- * \param used  vector of flags indicating registers in use (as returned
- *              by _mesa_find_used_registers())
- * \param usedSize  size of the 'used' array
- * \param firstReg  first register to start searching at
- * \return index of unused register, or -1 if none.
- */
-GLint
-_mesa_find_free_register(const GLboolean used[],
-                         GLuint usedSize, GLuint firstReg)
-{
-   GLuint i;
-
-   assert(firstReg < usedSize);
-
-   for (i = firstReg; i < usedSize; i++)
-      if (!used[i])
-         return i;
-
-   return -1;
-}
-
-
-/**
- * "Post-process" a GPU program.  This is intended to be used for debugging.
- * Example actions include no-op'ing instructions or changing instruction
- * behaviour.
- */
-void
-_mesa_postprocess_program(GLcontext *ctx, struct gl_program *prog)
-{
-   static const GLfloat white[4] = { 0.5, 0.5, 0.5, 0.5 };
-   GLuint i;
-   GLuint whiteSwizzle;
-   GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,
-                                                 white, 4, &whiteSwizzle);
-
-   (void) whiteIndex;
-
-   for (i = 0; i < prog->NumInstructions; i++) {
-      struct prog_instruction *inst = prog->Instructions + i;
-      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
-
-      (void) n;
-
-      if (_mesa_is_tex_instruction(inst->Opcode)) {
-#if 0
-         /* replace TEX/TXP/TXB with MOV */
-         inst->Opcode = OPCODE_MOV;
-         inst->DstReg.WriteMask = WRITEMASK_XYZW;
-         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;
-         inst->SrcReg[0].Negate = NEGATE_NONE;
-#endif
-
-#if 0
-         /* disable shadow texture mode */
-         inst->TexShadow = 0;
-#endif
-      }
-
-      if (inst->Opcode == OPCODE_TXP) {
-#if 0
-         inst->Opcode = OPCODE_MOV;
-         inst->DstReg.WriteMask = WRITEMASK_XYZW;
-         inst->SrcReg[0].File = PROGRAM_CONSTANT;
-         inst->SrcReg[0].Index = whiteIndex;
-         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;
-         inst->SrcReg[0].Negate = NEGATE_NONE;
-#endif
-#if 0
-         inst->TexShadow = 0;
-#endif
-#if 0
-         inst->Opcode = OPCODE_TEX;
-         inst->TexShadow = 0;
-#endif
-      }
-
-   }
-}
+/*

+ * 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 program.c

+ * Vertex and fragment program support functions.

+ * \author Brian Paul

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/hash.h"

+#include "program.h"

+#include "prog_cache.h"

+#include "prog_parameter.h"

+#include "prog_instruction.h"

+

+

+/**

+ * A pointer to this dummy program is put into the hash table when

+ * glGenPrograms is called.

+ */

+struct gl_program _mesa_DummyProgram;

+

+

+/**

+ * Init context's vertex/fragment program state

+ */

+void

+_mesa_init_program(struct gl_context *ctx)

+{

+   GLuint i;

+

+   /*

+    * If this assertion fails, we need to increase the field

+    * size for register indexes (see INST_INDEX_BITS).

+    */

+   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents / 4

+          <= (1 << INST_INDEX_BITS));

+   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents / 4

+          <= (1 << INST_INDEX_BITS));

+

+   ASSERT(ctx->Const.VertexProgram.MaxTemps <= (1 << INST_INDEX_BITS));

+   ASSERT(ctx->Const.VertexProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));

+   ASSERT(ctx->Const.FragmentProgram.MaxTemps <= (1 << INST_INDEX_BITS));

+   ASSERT(ctx->Const.FragmentProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));

+

+   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);

+   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);

+

+   /* If this fails, increase prog_instruction::TexSrcUnit size */

+   ASSERT(MAX_TEXTURE_UNITS < (1 << 5));

+

+   /* If this fails, increase prog_instruction::TexSrcTarget size */

+   ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));

+

+   ctx->Program.ErrorPos = -1;

+   ctx->Program.ErrorString = _mesa_strdup("");

+

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

+   ctx->VertexProgram.Enabled = GL_FALSE;

+#if FEATURE_es2_glsl

+   ctx->VertexProgram.PointSizeEnabled =

+      (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;

+#else

+   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;

+#endif

+   ctx->VertexProgram.TwoSideEnabled = GL_FALSE;

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

+                            ctx->Shared->DefaultVertexProgram);

+   assert(ctx->VertexProgram.Current);

+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {

+      ctx->VertexProgram.TrackMatrix[i] = GL_NONE;

+      ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;

+   }

+   ctx->VertexProgram.Cache = _mesa_new_program_cache();

+#endif

+

+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program

+   ctx->FragmentProgram.Enabled = GL_FALSE;

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

+                            ctx->Shared->DefaultFragmentProgram);

+   assert(ctx->FragmentProgram.Current);

+   ctx->FragmentProgram.Cache = _mesa_new_program_cache();

+#endif

+

+#if FEATURE_ARB_geometry_shader4

+   ctx->GeometryProgram.Enabled = GL_FALSE;

+   /* right now by default we don't have a geometry program */

+   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,

+                            NULL);

+   ctx->GeometryProgram.Cache = _mesa_new_program_cache();

+#endif

+

+   /* XXX probably move this stuff */

+#if FEATURE_ATI_fragment_shader

+   ctx->ATIFragmentShader.Enabled = GL_FALSE;

+   ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader;

+   assert(ctx->ATIFragmentShader.Current);

+   ctx->ATIFragmentShader.Current->RefCount++;

+#endif

+}

+

+

+/**

+ * Free a context's vertex/fragment program state

+ */

+void

+_mesa_free_program_data(struct gl_context *ctx)

+{

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);

+   _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);

+#endif

+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);

+   _mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);

+#endif

+#if FEATURE_ARB_geometry_shader4

+   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);

+   _mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);

+#endif

+   /* XXX probably move this stuff */

+#if FEATURE_ATI_fragment_shader

+   if (ctx->ATIFragmentShader.Current) {

+      ctx->ATIFragmentShader.Current->RefCount--;

+      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {

+         free(ctx->ATIFragmentShader.Current);

+      }

+   }

+#endif

+   free((void *) ctx->Program.ErrorString);

+}

+

+

+/**

+ * Update the default program objects in the given context to reference those

+ * specified in the shared state and release those referencing the old

+ * shared state.

+ */

+void

+_mesa_update_default_objects_program(struct gl_context *ctx)

+{

+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

+                            (struct gl_vertex_program *)

+                            ctx->Shared->DefaultVertexProgram);

+   assert(ctx->VertexProgram.Current);

+#endif

+

+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

+                            (struct gl_fragment_program *)

+                            ctx->Shared->DefaultFragmentProgram);

+   assert(ctx->FragmentProgram.Current);

+#endif

+

+#if FEATURE_ARB_geometry_shader4

+   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,

+                            (struct gl_geometry_program *)

+                            ctx->Shared->DefaultGeometryProgram);

+#endif

+

+   /* XXX probably move this stuff */

+#if FEATURE_ATI_fragment_shader

+   if (ctx->ATIFragmentShader.Current) {

+      ctx->ATIFragmentShader.Current->RefCount--;

+      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {

+         free(ctx->ATIFragmentShader.Current);

+      }

+   }

+   ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;

+   assert(ctx->ATIFragmentShader.Current);

+   ctx->ATIFragmentShader.Current->RefCount++;

+#endif

+}

+

+

+/**

+ * Set the vertex/fragment program error state (position and error string).

+ * This is generally called from within the parsers.

+ */

+void

+_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)

+{

+   ctx->Program.ErrorPos = pos;

+   free((void *) ctx->Program.ErrorString);

+   if (!string)

+      string = "";

+   ctx->Program.ErrorString = _mesa_strdup(string);

+}

+

+

+/**

+ * Find the line number and column for 'pos' within 'string'.

+ * Return a copy of the line which contains 'pos'.  Free the line with

+ * free().

+ * \param string  the program string

+ * \param pos     the position within the string

+ * \param line    returns the line number corresponding to 'pos'.

+ * \param col     returns the column number corresponding to 'pos'.

+ * \return copy of the line containing 'pos'.

+ */

+const GLubyte *

+_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,

+                       GLint *line, GLint *col)

+{

+   const GLubyte *lineStart = string;

+   const GLubyte *p = string;

+   GLubyte *s;

+   int len;

+

+   *line = 1;

+

+   while (p != pos) {

+      if (*p == (GLubyte) '\n') {

+         (*line)++;

+         lineStart = p + 1;

+      }

+      p++;

+   }

+

+   *col = (pos - lineStart) + 1;

+

+   /* return copy of this line */

+   while (*p != 0 && *p != '\n')

+      p++;

+   len = p - lineStart;

+   s = (GLubyte *) malloc(len + 1);

+   memcpy(s, lineStart, len);

+   s[len] = 0;

+

+   return s;

+}

+

+

+/**

+ * Initialize a new vertex/fragment program object.

+ */

+static struct gl_program *

+_mesa_init_program_struct( struct gl_context *ctx, struct gl_program *prog,

+                           GLenum target, GLuint id)

+{

+   (void) ctx;

+   if (prog) {

+      GLuint i;

+      memset(prog, 0, sizeof(*prog));

+      prog->Id = id;

+      prog->Target = target;

+      prog->Resident = GL_TRUE;

+      prog->RefCount = 1;

+      prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;

+

+      /* default mapping from samplers to texture units */

+      for (i = 0; i < MAX_SAMPLERS; i++)

+         prog->SamplerUnits[i] = i;

+   }

+

+   return prog;

+}

+

+

+/**

+ * Initialize a new fragment program object.

+ */

+struct gl_program *

+_mesa_init_fragment_program( struct gl_context *ctx, struct gl_fragment_program *prog,

+                             GLenum target, GLuint id)

+{

+   if (prog)

+      return _mesa_init_program_struct( ctx, &prog->Base, target, id );

+   else

+      return NULL;

+}

+

+

+/**

+ * Initialize a new vertex program object.

+ */

+struct gl_program *

+_mesa_init_vertex_program( struct gl_context *ctx, struct gl_vertex_program *prog,

+                           GLenum target, GLuint id)

+{

+   if (prog)

+      return _mesa_init_program_struct( ctx, &prog->Base, target, id );

+   else

+      return NULL;

+}

+

+

+/**

+ * Initialize a new geometry program object.

+ */

+struct gl_program *

+_mesa_init_geometry_program( struct gl_context *ctx, struct gl_geometry_program *prog,

+                             GLenum target, GLuint id)

+{

+   if (prog)

+      return _mesa_init_program_struct( ctx, &prog->Base, target, id );

+   else

+      return NULL;

+}

+

+

+/**

+ * Allocate and initialize a new fragment/vertex program object but

+ * don't put it into the program hash table.  Called via

+ * ctx->Driver.NewProgram.  May be overridden (ie. replaced) by a

+ * device driver function to implement OO deriviation with additional

+ * types not understood by this function.

+ *

+ * \param ctx  context

+ * \param id   program id/number

+ * \param target  program target/type

+ * \return  pointer to new program object

+ */

+struct gl_program *

+_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id)

+{

+   struct gl_program *prog;

+   switch (target) {

+   case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */

+   case GL_VERTEX_STATE_PROGRAM_NV:

+      prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),

+                                       target, id );

+      break;

+   case GL_FRAGMENT_PROGRAM_NV:

+   case GL_FRAGMENT_PROGRAM_ARB:

+      prog =_mesa_init_fragment_program(ctx,

+                                         CALLOC_STRUCT(gl_fragment_program),

+                                         target, id );

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      prog = _mesa_init_geometry_program(ctx,

+                                         CALLOC_STRUCT(gl_geometry_program),

+                                         target, id);

+      break;

+   default:

+      _mesa_problem(ctx, "bad target in _mesa_new_program");

+      prog = NULL;

+   }

+   return prog;

+}

+

+

+/**

+ * Delete a program and remove it from the hash table, ignoring the

+ * reference count.

+ * Called via ctx->Driver.DeleteProgram.  May be wrapped (OO deriviation)

+ * by a device driver function.

+ */

+void

+_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)

+{

+   (void) ctx;

+   ASSERT(prog);

+   ASSERT(prog->RefCount==0);

+

+   if (prog == &_mesa_DummyProgram)

+      return;

+

+   if (prog->String)

+      free(prog->String);

+

+   _mesa_free_instructions(prog->Instructions, prog->NumInstructions);

+

+   if (prog->Parameters) {

+      _mesa_free_parameter_list(prog->Parameters);

+   }

+   if (prog->Varying) {

+      _mesa_free_parameter_list(prog->Varying);

+   }

+   if (prog->Attributes) {

+      _mesa_free_parameter_list(prog->Attributes);

+   }

+

+   free(prog);

+}

+

+

+/**

+ * Return the gl_program object for a given ID.

+ * Basically just a wrapper for _mesa_HashLookup() to avoid a lot of

+ * casts elsewhere.

+ */

+struct gl_program *

+_mesa_lookup_program(struct gl_context *ctx, GLuint id)

+{

+   if (id)

+      return (struct gl_program *) _mesa_HashLookup(ctx->Shared->Programs, id);

+   else

+      return NULL;

+}

+

+

+/**

+ * Reference counting for vertex/fragment programs

+ */

+void

+_mesa_reference_program(struct gl_context *ctx,

+                        struct gl_program **ptr,

+                        struct gl_program *prog)

+{

+   assert(ptr);

+   if (*ptr && prog) {

+      /* sanity check */

+      if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)

+         ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);

+      else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)

+         ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||

+                prog->Target == GL_FRAGMENT_PROGRAM_NV);

+      else if ((*ptr)->Target == MESA_GEOMETRY_PROGRAM)

+         ASSERT(prog->Target == MESA_GEOMETRY_PROGRAM);

+   }

+   if (*ptr == prog) {

+      return;  /* no change */

+   }

+   if (*ptr) {

+      GLboolean deleteFlag;

+

+      /*_glthread_LOCK_MUTEX((*ptr)->Mutex);*/

+#if 0

+      printf("Program %p ID=%u Target=%s  Refcount-- to %d\n",

+             *ptr, (*ptr)->Id,

+             ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :

+              ((*ptr)->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),

+             (*ptr)->RefCount - 1);

+#endif

+      ASSERT((*ptr)->RefCount > 0);

+      (*ptr)->RefCount--;

+

+      deleteFlag = ((*ptr)->RefCount == 0);

+      /*_glthread_UNLOCK_MUTEX((*ptr)->Mutex);*/

+

+      if (deleteFlag) {

+         ASSERT(ctx);

+         ctx->Driver.DeleteProgram(ctx, *ptr);

+      }

+

+      *ptr = NULL;

+   }

+

+   assert(!*ptr);

+   if (prog) {

+      /*_glthread_LOCK_MUTEX(prog->Mutex);*/

+      prog->RefCount++;

+#if 0

+      printf("Program %p ID=%u Target=%s  Refcount++ to %d\n",

+             prog, prog->Id,

+             (prog->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :

+              (prog->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),

+             prog->RefCount);

+#endif

+      /*_glthread_UNLOCK_MUTEX(prog->Mutex);*/

+   }

+

+   *ptr = prog;

+}

+

+

+/**

+ * Return a copy of a program.

+ * XXX Problem here if the program object is actually OO-derivation

+ * made by a device driver.

+ */

+struct gl_program *

+_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog)

+{

+   struct gl_program *clone;

+

+   clone = ctx->Driver.NewProgram(ctx, prog->Target, prog->Id);

+   if (!clone)

+      return NULL;

+

+   assert(clone->Target == prog->Target);

+   assert(clone->RefCount == 1);

+

+   clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);

+   clone->Format = prog->Format;

+   clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);

+   if (!clone->Instructions) {

+      _mesa_reference_program(ctx, &clone, NULL);

+      return NULL;

+   }

+   _mesa_copy_instructions(clone->Instructions, prog->Instructions,

+                           prog->NumInstructions);

+   clone->InputsRead = prog->InputsRead;

+   clone->OutputsWritten = prog->OutputsWritten;

+   clone->SamplersUsed = prog->SamplersUsed;

+   clone->ShadowSamplers = prog->ShadowSamplers;

+   memcpy(clone->TexturesUsed, prog->TexturesUsed, sizeof(prog->TexturesUsed));

+

+   if (prog->Parameters)

+      clone->Parameters = _mesa_clone_parameter_list(prog->Parameters);

+   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));

+   if (prog->Varying)

+      clone->Varying = _mesa_clone_parameter_list(prog->Varying);

+   if (prog->Attributes)

+      clone->Attributes = _mesa_clone_parameter_list(prog->Attributes);

+   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));

+   clone->IndirectRegisterFiles = prog->IndirectRegisterFiles;

+   clone->NumInstructions = prog->NumInstructions;

+   clone->NumTemporaries = prog->NumTemporaries;

+   clone->NumParameters = prog->NumParameters;

+   clone->NumAttributes = prog->NumAttributes;

+   clone->NumAddressRegs = prog->NumAddressRegs;

+   clone->NumNativeInstructions = prog->NumNativeInstructions;

+   clone->NumNativeTemporaries = prog->NumNativeTemporaries;

+   clone->NumNativeParameters = prog->NumNativeParameters;

+   clone->NumNativeAttributes = prog->NumNativeAttributes;

+   clone->NumNativeAddressRegs = prog->NumNativeAddressRegs;

+   clone->NumAluInstructions = prog->NumAluInstructions;

+   clone->NumTexInstructions = prog->NumTexInstructions;

+   clone->NumTexIndirections = prog->NumTexIndirections;

+   clone->NumNativeAluInstructions = prog->NumNativeAluInstructions;

+   clone->NumNativeTexInstructions = prog->NumNativeTexInstructions;

+   clone->NumNativeTexIndirections = prog->NumNativeTexIndirections;

+

+   switch (prog->Target) {

+   case GL_VERTEX_PROGRAM_ARB:

+      {

+         const struct gl_vertex_program *vp

+            = (const struct gl_vertex_program *) prog;

+         struct gl_vertex_program *vpc = (struct gl_vertex_program *) clone;

+         vpc->IsPositionInvariant = vp->IsPositionInvariant;

+         vpc->IsNVProgram = vp->IsNVProgram;

+      }

+      break;

+   case GL_FRAGMENT_PROGRAM_ARB:

+      {

+         const struct gl_fragment_program *fp

+            = (const struct gl_fragment_program *) prog;

+         struct gl_fragment_program *fpc = (struct gl_fragment_program *) clone;

+         fpc->FogOption = fp->FogOption;

+         fpc->UsesKill = fp->UsesKill;

+         fpc->OriginUpperLeft = fp->OriginUpperLeft;

+         fpc->PixelCenterInteger = fp->PixelCenterInteger;

+      }

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      {

+         const struct gl_geometry_program *gp

+            = (const struct gl_geometry_program *) prog;

+         struct gl_geometry_program *gpc = (struct gl_geometry_program *) clone;

+         gpc->VerticesOut = gp->VerticesOut;

+         gpc->InputType = gp->InputType;

+         gpc->OutputType = gp->OutputType;

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "Unexpected target in _mesa_clone_program");

+   }

+

+   return clone;

+}

+

+

+/**

+ * Insert 'count' NOP instructions at 'start' in the given program.

+ * Adjust branch targets accordingly.

+ */

+GLboolean

+_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)

+{

+   const GLuint origLen = prog->NumInstructions;

+   const GLuint newLen = origLen + count;

+   struct prog_instruction *newInst;

+   GLuint i;

+

+   /* adjust branches */

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      if (inst->BranchTarget > 0) {

+         if ((GLuint)inst->BranchTarget >= start) {

+            inst->BranchTarget += count;

+         }

+      }

+   }

+

+   /* Alloc storage for new instructions */

+   newInst = _mesa_alloc_instructions(newLen);

+   if (!newInst) {

+      return GL_FALSE;

+   }

+

+   /* Copy 'start' instructions into new instruction buffer */

+   _mesa_copy_instructions(newInst, prog->Instructions, start);

+

+   /* init the new instructions */

+   _mesa_init_instructions(newInst + start, count);

+

+   /* Copy the remaining/tail instructions to new inst buffer */

+   _mesa_copy_instructions(newInst + start + count,

+                           prog->Instructions + start,

+                           origLen - start);

+

+   /* free old instructions */

+   _mesa_free_instructions(prog->Instructions, origLen);

+

+   /* install new instructions */

+   prog->Instructions = newInst;

+   prog->NumInstructions = newLen;

+

+   return GL_TRUE;

+}

+

+/**

+ * Delete 'count' instructions at 'start' in the given program.

+ * Adjust branch targets accordingly.

+ */

+GLboolean

+_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count)

+{

+   const GLuint origLen = prog->NumInstructions;

+   const GLuint newLen = origLen - count;

+   struct prog_instruction *newInst;

+   GLuint i;

+

+   /* adjust branches */

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      if (inst->BranchTarget > 0) {

+         if (inst->BranchTarget > (GLint) start) {

+            inst->BranchTarget -= count;

+         }

+      }

+   }

+

+   /* Alloc storage for new instructions */

+   newInst = _mesa_alloc_instructions(newLen);

+   if (!newInst) {

+      return GL_FALSE;

+   }

+

+   /* Copy 'start' instructions into new instruction buffer */

+   _mesa_copy_instructions(newInst, prog->Instructions, start);

+

+   /* Copy the remaining/tail instructions to new inst buffer */

+   _mesa_copy_instructions(newInst + start,

+                           prog->Instructions + start + count,

+                           newLen - start);

+

+   /* free old instructions */

+   _mesa_free_instructions(prog->Instructions, origLen);

+

+   /* install new instructions */

+   prog->Instructions = newInst;

+   prog->NumInstructions = newLen;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Search instructions for registers that match (oldFile, oldIndex),

+ * replacing them with (newFile, newIndex).

+ */

+static void

+replace_registers(struct prog_instruction *inst, GLuint numInst,

+                  GLuint oldFile, GLuint oldIndex,

+                  GLuint newFile, GLuint newIndex)

+{

+   GLuint i, j;

+   for (i = 0; i < numInst; i++) {

+      /* src regs */

+      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {

+         if (inst[i].SrcReg[j].File == oldFile &&

+             inst[i].SrcReg[j].Index == oldIndex) {

+            inst[i].SrcReg[j].File = newFile;

+            inst[i].SrcReg[j].Index = newIndex;

+         }

+      }

+      /* dst reg */

+      if (inst[i].DstReg.File == oldFile && inst[i].DstReg.Index == oldIndex) {

+         inst[i].DstReg.File = newFile;

+         inst[i].DstReg.Index = newIndex;

+      }

+   }

+}

+

+

+/**

+ * Search instructions for references to program parameters.  When found,

+ * increment the parameter index by 'offset'.

+ * Used when combining programs.

+ */

+static void

+adjust_param_indexes(struct prog_instruction *inst, GLuint numInst,

+                     GLuint offset)

+{

+   GLuint i, j;

+   for (i = 0; i < numInst; i++) {

+      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {

+         GLuint f = inst[i].SrcReg[j].File;

+         if (f == PROGRAM_CONSTANT ||

+             f == PROGRAM_UNIFORM ||

+             f == PROGRAM_STATE_VAR) {

+            inst[i].SrcReg[j].Index += offset;

+         }

+      }

+   }

+}

+

+

+/**

+ * Combine two programs into one.  Fix instructions so the outputs of

+ * the first program go to the inputs of the second program.

+ */

+struct gl_program *

+_mesa_combine_programs(struct gl_context *ctx,

+                       const struct gl_program *progA,

+                       const struct gl_program *progB)

+{

+   struct prog_instruction *newInst;

+   struct gl_program *newProg;

+   const GLuint lenA = progA->NumInstructions - 1; /* omit END instr */

+   const GLuint lenB = progB->NumInstructions;

+   const GLuint numParamsA = _mesa_num_parameters(progA->Parameters);

+   const GLuint newLength = lenA + lenB;

+   GLboolean usedTemps[MAX_PROGRAM_TEMPS];

+   GLuint firstTemp = 0;

+   GLbitfield inputsB;

+   GLuint i;

+

+   ASSERT(progA->Target == progB->Target);

+

+   newInst = _mesa_alloc_instructions(newLength);

+   if (!newInst)

+      return GL_FALSE;

+

+   _mesa_copy_instructions(newInst, progA->Instructions, lenA);

+   _mesa_copy_instructions(newInst + lenA, progB->Instructions, lenB);

+

+   /* adjust branch / instruction addresses for B's instructions */

+   for (i = 0; i < lenB; i++) {

+      newInst[lenA + i].BranchTarget += lenA;

+   }

+

+   newProg = ctx->Driver.NewProgram(ctx, progA->Target, 0);

+   newProg->Instructions = newInst;

+   newProg->NumInstructions = newLength;

+

+   /* find used temp regs (we may need new temps below) */

+   _mesa_find_used_registers(newProg, PROGRAM_TEMPORARY,

+                             usedTemps, MAX_PROGRAM_TEMPS);

+

+   if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {

+      struct gl_fragment_program *fprogA, *fprogB, *newFprog;

+      GLbitfield progB_inputsRead = progB->InputsRead;

+      GLint progB_colorFile, progB_colorIndex;

+

+      fprogA = (struct gl_fragment_program *) progA;

+      fprogB = (struct gl_fragment_program *) progB;

+      newFprog = (struct gl_fragment_program *) newProg;

+

+      newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;

+

+      /* We'll do a search and replace for instances

+       * of progB_colorFile/progB_colorIndex below...

+       */

+      progB_colorFile = PROGRAM_INPUT;

+      progB_colorIndex = FRAG_ATTRIB_COL0;

+

+      /*

+       * The fragment program may get color from a state var rather than

+       * a fragment input (vertex output) if it's constant.

+       * See the texenvprogram.c code.

+       * So, search the program's parameter list now to see if the program

+       * gets color from a state var instead of a conventional fragment

+       * input register.

+       */

+      for (i = 0; i < progB->Parameters->NumParameters; i++) {

+         struct gl_program_parameter *p = &progB->Parameters->Parameters[i];

+         if (p->Type == PROGRAM_STATE_VAR &&

+             p->StateIndexes[0] == STATE_INTERNAL &&

+             p->StateIndexes[1] == STATE_CURRENT_ATTRIB &&

+             (int) p->StateIndexes[2] == (int) VERT_ATTRIB_COLOR0) {

+            progB_inputsRead |= FRAG_BIT_COL0;

+            progB_colorFile = PROGRAM_STATE_VAR;

+            progB_colorIndex = i;

+            break;

+         }

+      }

+

+      /* Connect color outputs of fprogA to color inputs of fprogB, via a

+       * new temporary register.

+       */

+      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&

+          (progB_inputsRead & FRAG_BIT_COL0)) {

+         GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,

+                                                  firstTemp);

+         if (tempReg < 0) {

+            _mesa_problem(ctx, "No free temp regs found in "

+                          "_mesa_combine_programs(), using 31");

+            tempReg = 31;

+         }

+         firstTemp = tempReg + 1;

+

+         /* replace writes to result.color[0] with tempReg */

+         replace_registers(newInst, lenA,

+                           PROGRAM_OUTPUT, FRAG_RESULT_COLOR,

+                           PROGRAM_TEMPORARY, tempReg);

+         /* replace reads from the input color with tempReg */

+         replace_registers(newInst + lenA, lenB,

+                           progB_colorFile, progB_colorIndex, /* search for */

+                           PROGRAM_TEMPORARY, tempReg  /* replace with */ );

+      }

+

+      /* compute combined program's InputsRead */

+      inputsB = progB_inputsRead;

+      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {

+         inputsB &= ~(1 << FRAG_ATTRIB_COL0);

+      }

+      newProg->InputsRead = progA->InputsRead | inputsB;

+      newProg->OutputsWritten = progB->OutputsWritten;

+      newProg->SamplersUsed = progA->SamplersUsed | progB->SamplersUsed;

+   }

+   else {

+      /* vertex program */

+      assert(0);      /* XXX todo */

+   }

+

+   /*

+    * Merge parameters (uniforms, constants, etc)

+    */

+   newProg->Parameters = _mesa_combine_parameter_lists(progA->Parameters,

+                                                       progB->Parameters);

+

+   adjust_param_indexes(newInst + lenA, lenB, numParamsA);

+

+

+   return newProg;

+}

+

+

+/**

+ * Populate the 'used' array with flags indicating which registers (TEMPs,

+ * INPUTs, OUTPUTs, etc, are used by the given program.

+ * \param file  type of register to scan for

+ * \param used  returns true/false flags for in use / free

+ * \param usedSize  size of the 'used' array

+ */

+void

+_mesa_find_used_registers(const struct gl_program *prog,

+                          gl_register_file file,

+                          GLboolean used[], GLuint usedSize)

+{

+   GLuint i, j;

+

+   memset(used, 0, usedSize);

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      const struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);

+

+      if (inst->DstReg.File == file) {

+         ASSERT(inst->DstReg.Index < usedSize);

+         if(inst->DstReg.Index < usedSize)

+            used[inst->DstReg.Index] = GL_TRUE;

+      }

+

+      for (j = 0; j < n; j++) {

+         if (inst->SrcReg[j].File == file) {

+            ASSERT(inst->SrcReg[j].Index < usedSize);

+            if(inst->SrcReg[j].Index < usedSize)

+               used[inst->SrcReg[j].Index] = GL_TRUE;

+         }

+      }

+   }

+}

+

+

+/**

+ * Scan the given 'used' register flag array for the first entry

+ * that's >= firstReg.

+ * \param used  vector of flags indicating registers in use (as returned

+ *              by _mesa_find_used_registers())

+ * \param usedSize  size of the 'used' array

+ * \param firstReg  first register to start searching at

+ * \return index of unused register, or -1 if none.

+ */

+GLint

+_mesa_find_free_register(const GLboolean used[],

+                         GLuint usedSize, GLuint firstReg)

+{

+   GLuint i;

+

+   assert(firstReg < usedSize);

+

+   for (i = firstReg; i < usedSize; i++)

+      if (!used[i])

+         return i;

+

+   return -1;

+}

+

+

+

+/**

+ * Check if the given register index is valid (doesn't exceed implementation-

+ * dependent limits).

+ * \return GL_TRUE if OK, GL_FALSE if bad index

+ */

+GLboolean

+_mesa_valid_register_index(const struct gl_context *ctx,

+                           gl_shader_type shaderType,

+                           gl_register_file file, GLint index)

+{

+   const struct gl_program_constants *c;

+

+   switch (shaderType) {

+   case MESA_SHADER_VERTEX:

+      c = &ctx->Const.VertexProgram;

+      break;

+   case MESA_SHADER_FRAGMENT:

+      c = &ctx->Const.FragmentProgram;

+      break;

+   case MESA_SHADER_GEOMETRY:

+      c = &ctx->Const.GeometryProgram;

+      break;

+   default:

+      _mesa_problem(ctx,

+                    "unexpected shader type in _mesa_valid_register_index()");

+      return GL_FALSE;

+   }

+

+   switch (file) {

+   case PROGRAM_UNDEFINED:

+      return GL_TRUE;  /* XXX or maybe false? */

+

+   case PROGRAM_TEMPORARY:

+      return index >= 0 && index < c->MaxTemps;

+

+   case PROGRAM_ENV_PARAM:

+      return index >= 0 && index < c->MaxEnvParams;

+

+   case PROGRAM_LOCAL_PARAM:

+      return index >= 0 && index < c->MaxLocalParams;

+

+   case PROGRAM_NAMED_PARAM:

+      return index >= 0 && index < c->MaxParameters;

+

+   case PROGRAM_UNIFORM:

+   case PROGRAM_STATE_VAR:

+      /* aka constant buffer */

+      return index >= 0 && index < c->MaxUniformComponents / 4;

+

+   case PROGRAM_CONSTANT:

+      /* constant buffer w/ possible relative negative addressing */

+      return (index > (int) c->MaxUniformComponents / -4 &&

+              index < c->MaxUniformComponents / 4);

+

+   case PROGRAM_INPUT:

+      if (index < 0)

+         return GL_FALSE;

+

+      switch (shaderType) {

+      case MESA_SHADER_VERTEX:

+         return index < VERT_ATTRIB_GENERIC0 + c->MaxAttribs;

+      case MESA_SHADER_FRAGMENT:

+         return index < FRAG_ATTRIB_VAR0 + ctx->Const.MaxVarying;

+      case MESA_SHADER_GEOMETRY:

+         return index < GEOM_ATTRIB_VAR0 + ctx->Const.MaxVarying;

+      default:

+         return GL_FALSE;

+      }

+

+   case PROGRAM_OUTPUT:

+      if (index < 0)

+         return GL_FALSE;

+

+      switch (shaderType) {

+      case MESA_SHADER_VERTEX:

+         return index < VERT_RESULT_VAR0 + ctx->Const.MaxVarying;

+      case MESA_SHADER_FRAGMENT:

+         return index < FRAG_RESULT_DATA0 + ctx->Const.MaxDrawBuffers;

+      case MESA_SHADER_GEOMETRY:

+         return index < GEOM_RESULT_VAR0 + ctx->Const.MaxVarying;

+      default:

+         return GL_FALSE;

+      }

+

+   case PROGRAM_ADDRESS:

+      return index >= 0 && index < c->MaxAddressRegs;

+

+   default:

+      _mesa_problem(ctx,

+                    "unexpected register file in _mesa_valid_register_index()");

+      return GL_FALSE;

+   }

+}

+

+

+

+/**

+ * "Post-process" a GPU program.  This is intended to be used for debugging.

+ * Example actions include no-op'ing instructions or changing instruction

+ * behaviour.

+ */

+void

+_mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog)

+{

+   static const GLfloat white[4] = { 0.5, 0.5, 0.5, 0.5 };

+   GLuint i;

+   GLuint whiteSwizzle;

+   GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,

+                                                 white, 4, &whiteSwizzle);

+

+   (void) whiteIndex;

+

+   for (i = 0; i < prog->NumInstructions; i++) {

+      struct prog_instruction *inst = prog->Instructions + i;

+      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);

+

+      (void) n;

+

+      if (_mesa_is_tex_instruction(inst->Opcode)) {

+#if 0

+         /* replace TEX/TXP/TXB with MOV */

+         inst->Opcode = OPCODE_MOV;

+         inst->DstReg.WriteMask = WRITEMASK_XYZW;

+         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;

+         inst->SrcReg[0].Negate = NEGATE_NONE;

+#endif

+

+#if 0

+         /* disable shadow texture mode */

+         inst->TexShadow = 0;

+#endif

+      }

+

+      if (inst->Opcode == OPCODE_TXP) {

+#if 0

+         inst->Opcode = OPCODE_MOV;

+         inst->DstReg.WriteMask = WRITEMASK_XYZW;

+         inst->SrcReg[0].File = PROGRAM_CONSTANT;

+         inst->SrcReg[0].Index = whiteIndex;

+         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;

+         inst->SrcReg[0].Negate = NEGATE_NONE;

+#endif

+#if 0

+         inst->TexShadow = 0;

+#endif

+#if 0

+         inst->Opcode = OPCODE_TEX;

+         inst->TexShadow = 0;

+#endif

+      }

+

+   }

+}

diff --git a/mesalib/src/mesa/program/program.h b/mesalib/src/mesa/program/program.h
index f8f379808..dcf8d1c25 100644
--- a/mesalib/src/mesa/program/program.h
+++ b/mesalib/src/mesa/program/program.h
@@ -1,203 +1,210 @@
-/*
- * 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 program.c
- * Vertex and fragment program support functions.
- * \author Brian Paul
- */
-
-
-/**
- * \mainpage Mesa vertex and fragment program module
- *
- * This module or directory contains most of the code for vertex and
- * fragment programs and shaders, including state management, parsers,
- * and (some) software routines for executing programs
- */
-
-#ifndef PROGRAM_H
-#define PROGRAM_H
-
-#include "main/mtypes.h"
-
-
-extern struct gl_program _mesa_DummyProgram;
-
-
-extern void
-_mesa_init_program(GLcontext *ctx);
-
-extern void
-_mesa_free_program_data(GLcontext *ctx);
-
-extern void
-_mesa_update_default_objects_program(GLcontext *ctx);
-
-extern void
-_mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string);
-
-extern const GLubyte *
-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
-                       GLint *line, GLint *col);
-
-
-extern struct gl_program *
-_mesa_init_vertex_program(GLcontext *ctx,
-                          struct gl_vertex_program *prog,
-                          GLenum target, GLuint id);
-
-extern struct gl_program *
-_mesa_init_fragment_program(GLcontext *ctx,
-                            struct gl_fragment_program *prog,
-                            GLenum target, GLuint id);
-
-extern struct gl_program *
-_mesa_init_geometry_program(GLcontext *ctx,
-                            struct gl_geometry_program *prog,
-                            GLenum target, GLuint id);
-
-extern struct gl_program *
-_mesa_new_program(GLcontext *ctx, GLenum target, GLuint id);
-
-extern void
-_mesa_delete_program(GLcontext *ctx, struct gl_program *prog);
-
-extern struct gl_program *
-_mesa_lookup_program(GLcontext *ctx, GLuint id);
-
-extern void
-_mesa_reference_program(GLcontext *ctx,
-                        struct gl_program **ptr,
-                        struct gl_program *prog);
-
-static INLINE void
-_mesa_reference_vertprog(GLcontext *ctx,
-                         struct gl_vertex_program **ptr,
-                         struct gl_vertex_program *prog)
-{
-   _mesa_reference_program(ctx, (struct gl_program **) ptr,
-                           (struct gl_program *) prog);
-}
-
-static INLINE void
-_mesa_reference_fragprog(GLcontext *ctx,
-                         struct gl_fragment_program **ptr,
-                         struct gl_fragment_program *prog)
-{
-   _mesa_reference_program(ctx, (struct gl_program **) ptr,
-                           (struct gl_program *) prog);
-}
-
-static INLINE void
-_mesa_reference_geomprog(GLcontext *ctx,
-                         struct gl_geometry_program **ptr,
-                         struct gl_geometry_program *prog)
-{
-   _mesa_reference_program(ctx, (struct gl_program **) ptr,
-                           (struct gl_program *) prog);
-}
-
-extern struct gl_program *
-_mesa_clone_program(GLcontext *ctx, const struct gl_program *prog);
-
-static INLINE struct gl_vertex_program *
-_mesa_clone_vertex_program(GLcontext *ctx,
-                           const struct gl_vertex_program *prog)
-{
-   return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base);
-}
-
-static INLINE struct gl_geometry_program *
-_mesa_clone_geometry_program(GLcontext *ctx,
-                             const struct gl_geometry_program *prog)
-{
-   return (struct gl_geometry_program *) _mesa_clone_program(ctx, &prog->Base);
-}
-
-static INLINE struct gl_fragment_program *
-_mesa_clone_fragment_program(GLcontext *ctx,
-                             const struct gl_fragment_program *prog)
-{
-   return (struct gl_fragment_program *) _mesa_clone_program(ctx, &prog->Base);
-}
-
-
-extern  GLboolean
-_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count);
-
-extern  GLboolean
-_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count);
-
-extern struct gl_program *
-_mesa_combine_programs(GLcontext *ctx,
-                       const struct gl_program *progA,
-                       const struct gl_program *progB);
-
-extern void
-_mesa_find_used_registers(const struct gl_program *prog,
-                          gl_register_file file,
-                          GLboolean used[], GLuint usedSize);
-
-extern GLint
-_mesa_find_free_register(const GLboolean used[],
-                         GLuint maxRegs, GLuint firstReg);
-
-extern void
-_mesa_postprocess_program(GLcontext *ctx, struct gl_program *prog);
-
-/* keep these in the same order as TGSI_PROCESSOR_* */
-
-static INLINE GLuint
-_mesa_program_target_to_index(GLenum v)
-{
-   switch(v)
-   {
-   case GL_VERTEX_PROGRAM_ARB:
-      return MESA_SHADER_VERTEX;
-   case GL_FRAGMENT_PROGRAM_ARB:
-      return MESA_SHADER_FRAGMENT;
-   case GL_GEOMETRY_PROGRAM_NV:
-      return MESA_SHADER_GEOMETRY;
-   default:
-      ASSERT(0);
-      return ~0;
-   }
-}
-
-static INLINE GLenum
-_mesa_program_index_to_target(GLuint i)
-{
-   GLenum enums[MESA_SHADER_TYPES] = {
-         GL_VERTEX_PROGRAM_ARB,
-         GL_FRAGMENT_PROGRAM_ARB,
-         GL_GEOMETRY_PROGRAM_NV,
-   };
-   if(i >= MESA_SHADER_TYPES)
-      return 0;
-   else
-      return enums[i];
-}
-
-#endif /* PROGRAM_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.

+ */

+

+/**

+ * \file program.c

+ * Vertex and fragment program support functions.

+ * \author Brian Paul

+ */

+

+

+/**

+ * \mainpage Mesa vertex and fragment program module

+ *

+ * This module or directory contains most of the code for vertex and

+ * fragment programs and shaders, including state management, parsers,

+ * and (some) software routines for executing programs

+ */

+

+#ifndef PROGRAM_H

+#define PROGRAM_H

+

+#include "main/compiler.h"

+#include "main/mtypes.h"

+

+

+extern struct gl_program _mesa_DummyProgram;

+

+

+extern void

+_mesa_init_program(struct gl_context *ctx);

+

+extern void

+_mesa_free_program_data(struct gl_context *ctx);

+

+extern void

+_mesa_update_default_objects_program(struct gl_context *ctx);

+

+extern void

+_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);

+

+extern const GLubyte *

+_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,

+                       GLint *line, GLint *col);

+

+

+extern struct gl_program *

+_mesa_init_vertex_program(struct gl_context *ctx,

+                          struct gl_vertex_program *prog,

+                          GLenum target, GLuint id);

+

+extern struct gl_program *

+_mesa_init_fragment_program(struct gl_context *ctx,

+                            struct gl_fragment_program *prog,

+                            GLenum target, GLuint id);

+

+extern struct gl_program *

+_mesa_init_geometry_program(struct gl_context *ctx,

+                            struct gl_geometry_program *prog,

+                            GLenum target, GLuint id);

+

+extern struct gl_program *

+_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id);

+

+extern void

+_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog);

+

+extern struct gl_program *

+_mesa_lookup_program(struct gl_context *ctx, GLuint id);

+

+extern void

+_mesa_reference_program(struct gl_context *ctx,

+                        struct gl_program **ptr,

+                        struct gl_program *prog);

+

+static INLINE void

+_mesa_reference_vertprog(struct gl_context *ctx,

+                         struct gl_vertex_program **ptr,

+                         struct gl_vertex_program *prog)

+{

+   _mesa_reference_program(ctx, (struct gl_program **) ptr,

+                           (struct gl_program *) prog);

+}

+

+static INLINE void

+_mesa_reference_fragprog(struct gl_context *ctx,

+                         struct gl_fragment_program **ptr,

+                         struct gl_fragment_program *prog)

+{

+   _mesa_reference_program(ctx, (struct gl_program **) ptr,

+                           (struct gl_program *) prog);

+}

+

+static INLINE void

+_mesa_reference_geomprog(struct gl_context *ctx,

+                         struct gl_geometry_program **ptr,

+                         struct gl_geometry_program *prog)

+{

+   _mesa_reference_program(ctx, (struct gl_program **) ptr,

+                           (struct gl_program *) prog);

+}

+

+extern struct gl_program *

+_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog);

+

+static INLINE struct gl_vertex_program *

+_mesa_clone_vertex_program(struct gl_context *ctx,

+                           const struct gl_vertex_program *prog)

+{

+   return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base);

+}

+

+static INLINE struct gl_geometry_program *

+_mesa_clone_geometry_program(struct gl_context *ctx,

+                             const struct gl_geometry_program *prog)

+{

+   return (struct gl_geometry_program *) _mesa_clone_program(ctx, &prog->Base);

+}

+

+static INLINE struct gl_fragment_program *

+_mesa_clone_fragment_program(struct gl_context *ctx,

+                             const struct gl_fragment_program *prog)

+{

+   return (struct gl_fragment_program *) _mesa_clone_program(ctx, &prog->Base);

+}

+

+

+extern  GLboolean

+_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count);

+

+extern  GLboolean

+_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count);

+

+extern struct gl_program *

+_mesa_combine_programs(struct gl_context *ctx,

+                       const struct gl_program *progA,

+                       const struct gl_program *progB);

+

+extern void

+_mesa_find_used_registers(const struct gl_program *prog,

+                          gl_register_file file,

+                          GLboolean used[], GLuint usedSize);

+

+extern GLint

+_mesa_find_free_register(const GLboolean used[],

+                         GLuint maxRegs, GLuint firstReg);

+

+

+extern GLboolean

+_mesa_valid_register_index(const struct gl_context *ctx,

+                           gl_shader_type shaderType,

+                           gl_register_file file, GLint index);

+

+extern void

+_mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog);

+

+/* keep these in the same order as TGSI_PROCESSOR_* */

+

+static INLINE GLuint

+_mesa_program_target_to_index(GLenum v)

+{

+   switch(v)

+   {

+   case GL_VERTEX_PROGRAM_ARB:

+      return MESA_SHADER_VERTEX;

+   case GL_FRAGMENT_PROGRAM_ARB:

+      return MESA_SHADER_FRAGMENT;

+   case GL_GEOMETRY_PROGRAM_NV:

+      return MESA_SHADER_GEOMETRY;

+   default:

+      ASSERT(0);

+      return ~0;

+   }

+}

+

+static INLINE GLenum

+_mesa_program_index_to_target(GLuint i)

+{

+   GLenum enums[MESA_SHADER_TYPES] = {

+         GL_VERTEX_PROGRAM_ARB,

+         GL_FRAGMENT_PROGRAM_ARB,

+         GL_GEOMETRY_PROGRAM_NV,

+   };

+   if(i >= MESA_SHADER_TYPES)

+      return 0;

+   else

+      return enums[i];

+}

+

+#endif /* PROGRAM_H */

diff --git a/mesalib/src/mesa/program/program_parse.tab.c b/mesalib/src/mesa/program/program_parse.tab.c
index 08ead30de..80735af85 100644
--- a/mesalib/src/mesa/program/program_parse.tab.c
+++ b/mesalib/src/mesa/program/program_parse.tab.c
@@ -1,5730 +1,5730 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 1
-
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
-/* Using locations.  */
-#define YYLSP_NEEDED 1
-
-
-
-/* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "program_parse.y"
-
-/*
- * 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
-
-
-/* Line 189 of yacc.c  */
-#line 193 "program_parse.tab.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ARBvp_10 = 258,
-     ARBfp_10 = 259,
-     ADDRESS = 260,
-     ALIAS = 261,
-     ATTRIB = 262,
-     OPTION = 263,
-     OUTPUT = 264,
-     PARAM = 265,
-     TEMP = 266,
-     END = 267,
-     BIN_OP = 268,
-     BINSC_OP = 269,
-     SAMPLE_OP = 270,
-     SCALAR_OP = 271,
-     TRI_OP = 272,
-     VECTOR_OP = 273,
-     ARL = 274,
-     KIL = 275,
-     SWZ = 276,
-     TXD_OP = 277,
-     INTEGER = 278,
-     REAL = 279,
-     AMBIENT = 280,
-     ATTENUATION = 281,
-     BACK = 282,
-     CLIP = 283,
-     COLOR = 284,
-     DEPTH = 285,
-     DIFFUSE = 286,
-     DIRECTION = 287,
-     EMISSION = 288,
-     ENV = 289,
-     EYE = 290,
-     FOG = 291,
-     FOGCOORD = 292,
-     FRAGMENT = 293,
-     FRONT = 294,
-     HALF = 295,
-     INVERSE = 296,
-     INVTRANS = 297,
-     LIGHT = 298,
-     LIGHTMODEL = 299,
-     LIGHTPROD = 300,
-     LOCAL = 301,
-     MATERIAL = 302,
-     MAT_PROGRAM = 303,
-     MATRIX = 304,
-     MATRIXINDEX = 305,
-     MODELVIEW = 306,
-     MVP = 307,
-     NORMAL = 308,
-     OBJECT = 309,
-     PALETTE = 310,
-     PARAMS = 311,
-     PLANE = 312,
-     POINT_TOK = 313,
-     POINTSIZE = 314,
-     POSITION = 315,
-     PRIMARY = 316,
-     PROGRAM = 317,
-     PROJECTION = 318,
-     RANGE = 319,
-     RESULT = 320,
-     ROW = 321,
-     SCENECOLOR = 322,
-     SECONDARY = 323,
-     SHININESS = 324,
-     SIZE_TOK = 325,
-     SPECULAR = 326,
-     SPOT = 327,
-     STATE = 328,
-     TEXCOORD = 329,
-     TEXENV = 330,
-     TEXGEN = 331,
-     TEXGEN_Q = 332,
-     TEXGEN_R = 333,
-     TEXGEN_S = 334,
-     TEXGEN_T = 335,
-     TEXTURE = 336,
-     TRANSPOSE = 337,
-     TEXTURE_UNIT = 338,
-     TEX_1D = 339,
-     TEX_2D = 340,
-     TEX_3D = 341,
-     TEX_CUBE = 342,
-     TEX_RECT = 343,
-     TEX_SHADOW1D = 344,
-     TEX_SHADOW2D = 345,
-     TEX_SHADOWRECT = 346,
-     TEX_ARRAY1D = 347,
-     TEX_ARRAY2D = 348,
-     TEX_ARRAYSHADOW1D = 349,
-     TEX_ARRAYSHADOW2D = 350,
-     VERTEX = 351,
-     VTXATTRIB = 352,
-     WEIGHT = 353,
-     IDENTIFIER = 354,
-     USED_IDENTIFIER = 355,
-     MASK4 = 356,
-     MASK3 = 357,
-     MASK2 = 358,
-     MASK1 = 359,
-     SWIZZLE = 360,
-     DOT_DOT = 361,
-     DOT = 362
-   };
-#endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c  */
-#line 126 "program_parse.y"
-
-   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;
-
-
-
-/* Line 214 of yacc.c  */
-#line 364 "program_parse.tab.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-
-
-/* Copy the second part of user declarations.  */
-
-/* Line 264 of yacc.c  */
-#line 271 "program_parse.y"
-
-extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
-    void *yyscanner);
-
-
-/* Line 264 of yacc.c  */
-#line 395 "program_parse.tab.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
-#endif
-{
-  return yyi;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
-       && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-	 || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
-	     && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-  YYLTYPE yyls_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
-      + 2 * YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
-
-#endif
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  5
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   396
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  120
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  143
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  282
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  475
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   362
-
-#define YYTRANSLATE(YYX)						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     115,   116,     2,   113,   109,   114,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,   108,
-       2,   117,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   111,     2,   112,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   118,   110,   119,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     8,    10,    12,    15,    16,    20,    23,
-      24,    27,    30,    32,    34,    36,    38,    40,    42,    44,
-      46,    48,    50,    52,    54,    59,    64,    69,    76,    83,
-      92,   101,   104,   107,   120,   123,   125,   127,   129,   131,
-     133,   135,   137,   139,   141,   143,   145,   147,   154,   157,
-     162,   165,   167,   171,   177,   181,   184,   192,   195,   197,
-     199,   201,   203,   208,   210,   212,   214,   216,   218,   220,
-     222,   226,   227,   230,   233,   235,   237,   239,   241,   243,
-     245,   247,   249,   251,   252,   254,   256,   258,   260,   261,
-     265,   269,   270,   273,   276,   278,   280,   282,   284,   286,
-     288,   290,   292,   297,   300,   303,   305,   308,   310,   313,
-     315,   318,   323,   328,   330,   331,   335,   337,   339,   342,
-     344,   347,   349,   351,   355,   362,   363,   365,   368,   373,
-     375,   379,   381,   383,   385,   387,   389,   391,   393,   395,
-     397,   399,   402,   405,   408,   411,   414,   417,   420,   423,
-     426,   429,   432,   435,   439,   441,   443,   445,   451,   453,
-     455,   457,   460,   462,   464,   467,   469,   472,   479,   481,
-     485,   487,   489,   491,   493,   495,   500,   502,   504,   506,
-     508,   510,   512,   515,   517,   519,   525,   527,   530,   532,
-     534,   540,   543,   544,   551,   555,   556,   558,   560,   562,
-     564,   566,   569,   571,   573,   576,   581,   586,   587,   591,
-     593,   595,   597,   600,   602,   604,   606,   608,   614,   616,
-     620,   626,   632,   634,   638,   644,   646,   648,   650,   652,
-     654,   656,   658,   660,   662,   666,   672,   680,   690,   693,
-     696,   698,   700,   701,   702,   707,   709,   710,   711,   715,
-     719,   721,   727,   730,   733,   736,   739,   743,   746,   750,
-     751,   753,   755,   756,   758,   760,   761,   763,   765,   766,
-     768,   770,   771,   775,   776,   780,   781,   785,   787,   789,
-     791,   796,   798
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     121,     0,    -1,   122,   123,   125,    12,    -1,     3,    -1,
-       4,    -1,   123,   124,    -1,    -1,     8,   262,   108,    -1,
-     125,   126,    -1,    -1,   127,   108,    -1,   170,   108,    -1,
-     128,    -1,   129,    -1,   130,    -1,   131,    -1,   132,    -1,
-     133,    -1,   134,    -1,   135,    -1,   141,    -1,   136,    -1,
-     137,    -1,   138,    -1,    19,   146,   109,   142,    -1,    18,
-     145,   109,   144,    -1,    16,   145,   109,   142,    -1,    14,
-     145,   109,   142,   109,   142,    -1,    13,   145,   109,   144,
-     109,   144,    -1,    17,   145,   109,   144,   109,   144,   109,
-     144,    -1,    15,   145,   109,   144,   109,   139,   109,   140,
-      -1,    20,   144,    -1,    20,   166,    -1,    22,   145,   109,
-     144,   109,   144,   109,   144,   109,   139,   109,   140,    -1,
-      83,   256,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
-      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
-      -1,    93,    -1,    94,    -1,    95,    -1,    21,   145,   109,
-     150,   109,   147,    -1,   241,   143,    -1,   241,   110,   143,
-     110,    -1,   150,   162,    -1,   238,    -1,   241,   150,   163,
-      -1,   241,   110,   150,   163,   110,    -1,   151,   164,   165,
-      -1,   159,   161,    -1,   148,   109,   148,   109,   148,   109,
-     148,    -1,   241,   149,    -1,    23,    -1,   262,    -1,   100,
-      -1,   172,    -1,   152,   111,   153,   112,    -1,   186,    -1,
-     249,    -1,   100,    -1,   100,    -1,   154,    -1,   155,    -1,
-      23,    -1,   159,   160,   156,    -1,    -1,   113,   157,    -1,
-     114,   158,    -1,    23,    -1,    23,    -1,   100,    -1,   104,
-      -1,   104,    -1,   104,    -1,   104,    -1,   101,    -1,   105,
-      -1,    -1,   101,    -1,   102,    -1,   103,    -1,   104,    -1,
-      -1,   115,   166,   116,    -1,   115,   167,   116,    -1,    -1,
-     168,   163,    -1,   169,   163,    -1,    99,    -1,   100,    -1,
-     171,    -1,   178,    -1,   242,    -1,   245,    -1,   248,    -1,
-     261,    -1,     7,    99,   117,   172,    -1,    96,   173,    -1,
-      38,   177,    -1,    60,    -1,    98,   175,    -1,    53,    -1,
-      29,   254,    -1,    37,    -1,    74,   255,    -1,    50,   111,
-     176,   112,    -1,    97,   111,   174,   112,    -1,    23,    -1,
-      -1,   111,   176,   112,    -1,    23,    -1,    60,    -1,    29,
-     254,    -1,    37,    -1,    74,   255,    -1,   179,    -1,   180,
-      -1,    10,    99,   182,    -1,    10,    99,   111,   181,   112,
-     183,    -1,    -1,    23,    -1,   117,   185,    -1,   117,   118,
-     184,   119,    -1,   187,    -1,   184,   109,   187,    -1,   189,
-      -1,   225,    -1,   235,    -1,   189,    -1,   225,    -1,   236,
-      -1,   188,    -1,   226,    -1,   235,    -1,   189,    -1,    73,
-     213,    -1,    73,   190,    -1,    73,   192,    -1,    73,   195,
-      -1,    73,   197,    -1,    73,   203,    -1,    73,   199,    -1,
-      73,   206,    -1,    73,   208,    -1,    73,   210,    -1,    73,
-     212,    -1,    73,   224,    -1,    47,   253,   191,    -1,   201,
-      -1,    33,    -1,    69,    -1,    43,   111,   202,   112,   193,
-      -1,   201,    -1,    60,    -1,    26,    -1,    72,   194,    -1,
-      40,    -1,    32,    -1,    44,   196,    -1,    25,    -1,   253,
-      67,    -1,    45,   111,   202,   112,   253,   198,    -1,   201,
-      -1,    75,   257,   200,    -1,    29,    -1,    25,    -1,    31,
-      -1,    71,    -1,    23,    -1,    76,   255,   204,   205,    -1,
-      35,    -1,    54,    -1,    79,    -1,    80,    -1,    78,    -1,
-      77,    -1,    36,   207,    -1,    29,    -1,    56,    -1,    28,
-     111,   209,   112,    57,    -1,    23,    -1,    58,   211,    -1,
-      70,    -1,    26,    -1,   215,    66,   111,   218,   112,    -1,
-     215,   214,    -1,    -1,    66,   111,   218,   106,   218,   112,
-      -1,    49,   219,   216,    -1,    -1,   217,    -1,    41,    -1,
-      82,    -1,    42,    -1,    23,    -1,    51,   220,    -1,    63,
-      -1,    52,    -1,    81,   255,    -1,    55,   111,   222,   112,
-      -1,    48,   111,   223,   112,    -1,    -1,   111,   221,   112,
-      -1,    23,    -1,    23,    -1,    23,    -1,    30,    64,    -1,
-     229,    -1,   232,    -1,   227,    -1,   230,    -1,    62,    34,
-     111,   228,   112,    -1,   233,    -1,   233,   106,   233,    -1,
-      62,    34,   111,   233,   112,    -1,    62,    46,   111,   231,
-     112,    -1,   234,    -1,   234,   106,   234,    -1,    62,    46,
-     111,   234,   112,    -1,    23,    -1,    23,    -1,   237,    -1,
-     239,    -1,   238,    -1,   239,    -1,   240,    -1,    24,    -1,
-      23,    -1,   118,   240,   119,    -1,   118,   240,   109,   240,
-     119,    -1,   118,   240,   109,   240,   109,   240,   119,    -1,
-     118,   240,   109,   240,   109,   240,   109,   240,   119,    -1,
-     241,    24,    -1,   241,    23,    -1,   113,    -1,   114,    -1,
-      -1,    -1,   244,    11,   243,   247,    -1,   262,    -1,    -1,
-      -1,     5,   246,   247,    -1,   247,   109,    99,    -1,    99,
-      -1,   244,     9,    99,   117,   249,    -1,    65,    60,    -1,
-      65,    37,    -1,    65,   250,    -1,    65,    59,    -1,    65,
-      74,   255,    -1,    65,    30,    -1,    29,   251,   252,    -1,
-      -1,    39,    -1,    27,    -1,    -1,    61,    -1,    68,    -1,
-      -1,    39,    -1,    27,    -1,    -1,    61,    -1,    68,    -1,
-      -1,   111,   258,   112,    -1,    -1,   111,   259,   112,    -1,
-      -1,   111,   260,   112,    -1,    23,    -1,    23,    -1,    23,
-      -1,     6,    99,   117,   100,    -1,    99,    -1,   100,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,   278,   278,   281,   289,   301,   302,   305,   329,   330,
-     333,   348,   351,   356,   363,   364,   365,   366,   367,   368,
-     369,   372,   373,   374,   377,   383,   389,   395,   402,   408,
-     415,   459,   464,   474,   518,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   538,   550,   558,
-     575,   582,   601,   612,   632,   657,   664,   697,   704,   719,
-     774,   817,   826,   848,   858,   862,   891,   910,   910,   912,
-     919,   931,   932,   933,   936,   950,   964,   984,   995,  1007,
-    1009,  1010,  1011,  1012,  1015,  1015,  1015,  1015,  1016,  1019,
-    1023,  1028,  1035,  1042,  1049,  1072,  1095,  1096,  1097,  1098,
-    1099,  1100,  1103,  1122,  1126,  1132,  1136,  1140,  1144,  1153,
-    1162,  1166,  1171,  1177,  1188,  1188,  1189,  1191,  1195,  1199,
-    1203,  1209,  1209,  1211,  1229,  1255,  1258,  1269,  1275,  1281,
-    1282,  1289,  1295,  1301,  1309,  1315,  1321,  1329,  1335,  1341,
-    1349,  1350,  1353,  1354,  1355,  1356,  1357,  1358,  1359,  1360,
-    1361,  1362,  1363,  1366,  1375,  1379,  1383,  1389,  1398,  1402,
-    1406,  1415,  1419,  1425,  1431,  1438,  1443,  1451,  1461,  1463,
-    1471,  1477,  1481,  1485,  1491,  1502,  1511,  1515,  1520,  1524,
-    1528,  1532,  1538,  1545,  1549,  1555,  1563,  1574,  1581,  1585,
-    1591,  1601,  1612,  1616,  1634,  1643,  1646,  1652,  1656,  1660,
-    1666,  1677,  1682,  1687,  1692,  1697,  1702,  1710,  1713,  1718,
-    1731,  1739,  1750,  1758,  1758,  1760,  1760,  1762,  1772,  1777,
-    1784,  1794,  1803,  1808,  1815,  1825,  1835,  1847,  1847,  1848,
-    1848,  1850,  1860,  1868,  1878,  1886,  1894,  1903,  1914,  1918,
-    1924,  1925,  1926,  1929,  1929,  1932,  1967,  1971,  1971,  1974,
-    1981,  1990,  2004,  2013,  2022,  2026,  2035,  2044,  2055,  2062,
-    2067,  2076,  2088,  2091,  2100,  2111,  2112,  2113,  2116,  2117,
-    2118,  2121,  2122,  2125,  2126,  2129,  2130,  2133,  2144,  2155,
-    2166,  2192,  2193
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "ARBvp_10", "ARBfp_10", "ADDRESS",
-  "ALIAS", "ATTRIB", "OPTION", "OUTPUT", "PARAM", "TEMP", "END", "BIN_OP",
-  "BINSC_OP", "SAMPLE_OP", "SCALAR_OP", "TRI_OP", "VECTOR_OP", "ARL",
-  "KIL", "SWZ", "TXD_OP", "INTEGER", "REAL", "AMBIENT", "ATTENUATION",
-  "BACK", "CLIP", "COLOR", "DEPTH", "DIFFUSE", "DIRECTION", "EMISSION",
-  "ENV", "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE",
-  "INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL",
-  "MAT_PROGRAM", "MATRIX", "MATRIXINDEX", "MODELVIEW", "MVP", "NORMAL",
-  "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT_TOK", "POINTSIZE",
-  "POSITION", "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW",
-  "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE_TOK", "SPECULAR", "SPOT",
-  "STATE", "TEXCOORD", "TEXENV", "TEXGEN", "TEXGEN_Q", "TEXGEN_R",
-  "TEXGEN_S", "TEXGEN_T", "TEXTURE", "TRANSPOSE", "TEXTURE_UNIT", "TEX_1D",
-  "TEX_2D", "TEX_3D", "TEX_CUBE", "TEX_RECT", "TEX_SHADOW1D",
-  "TEX_SHADOW2D", "TEX_SHADOWRECT", "TEX_ARRAY1D", "TEX_ARRAY2D",
-  "TEX_ARRAYSHADOW1D", "TEX_ARRAYSHADOW2D", "VERTEX", "VTXATTRIB",
-  "WEIGHT", "IDENTIFIER", "USED_IDENTIFIER", "MASK4", "MASK3", "MASK2",
-  "MASK1", "SWIZZLE", "DOT_DOT", "DOT", "';'", "','", "'|'", "'['", "']'",
-  "'+'", "'-'", "'('", "')'", "'='", "'{'", "'}'", "$accept", "program",
-  "language", "optionSequence", "option", "statementSequence", "statement",
-  "instruction", "ALU_instruction", "TexInstruction", "ARL_instruction",
-  "VECTORop_instruction", "SCALARop_instruction", "BINSCop_instruction",
-  "BINop_instruction", "TRIop_instruction", "SAMPLE_instruction",
-  "KIL_instruction", "TXD_instruction", "texImageUnit", "texTarget",
-  "SWZ_instruction", "scalarSrcReg", "scalarUse", "swizzleSrcReg",
-  "maskedDstReg", "maskedAddrReg", "extendedSwizzle", "extSwizComp",
-  "extSwizSel", "srcReg", "dstReg", "progParamArray", "progParamArrayMem",
-  "progParamArrayAbs", "progParamArrayRel", "addrRegRelOffset",
-  "addrRegPosOffset", "addrRegNegOffset", "addrReg", "addrComponent",
-  "addrWriteMask", "scalarSuffix", "swizzleSuffix", "optionalMask",
-  "optionalCcMask", "ccTest", "ccTest2", "ccMaskRule", "ccMaskRule2",
-  "namingStatement", "ATTRIB_statement", "attribBinding", "vtxAttribItem",
-  "vtxAttribNum", "vtxOptWeightNum", "vtxWeightNum", "fragAttribItem",
-  "PARAM_statement", "PARAM_singleStmt", "PARAM_multipleStmt",
-  "optArraySize", "paramSingleInit", "paramMultipleInit",
-  "paramMultInitList", "paramSingleItemDecl", "paramSingleItemUse",
-  "paramMultipleItem", "stateMultipleItem", "stateSingleItem",
-  "stateMaterialItem", "stateMatProperty", "stateLightItem",
-  "stateLightProperty", "stateSpotProperty", "stateLightModelItem",
-  "stateLModProperty", "stateLightProdItem", "stateLProdProperty",
-  "stateTexEnvItem", "stateTexEnvProperty", "ambDiffSpecProperty",
-  "stateLightNumber", "stateTexGenItem", "stateTexGenType",
-  "stateTexGenCoord", "stateFogItem", "stateFogProperty",
-  "stateClipPlaneItem", "stateClipPlaneNum", "statePointItem",
-  "statePointProperty", "stateMatrixRow", "stateMatrixRows",
-  "optMatrixRows", "stateMatrixItem", "stateOptMatModifier",
-  "stateMatModifier", "stateMatrixRowNum", "stateMatrixName",
-  "stateOptModMatNum", "stateModMatNum", "statePaletteMatNum",
-  "stateProgramMatNum", "stateDepthItem", "programSingleItem",
-  "programMultipleItem", "progEnvParams", "progEnvParamNums",
-  "progEnvParam", "progLocalParams", "progLocalParamNums",
-  "progLocalParam", "progEnvParamNum", "progLocalParamNum",
-  "paramConstDecl", "paramConstUse", "paramConstScalarDecl",
-  "paramConstScalarUse", "paramConstVector", "signedFloatConstant",
-  "optionalSign", "TEMP_statement", "@1", "optVarSize",
-  "ADDRESS_statement", "@2", "varNameList", "OUTPUT_statement",
-  "resultBinding", "resultColBinding", "optResultFaceType",
-  "optResultColorType", "optFaceType", "optColorType",
-  "optTexCoordUnitNum", "optTexImageUnitNum", "optLegacyTexUnitNum",
-  "texCoordUnitNum", "texImageUnitNum", "legacyTexUnitNum",
-  "ALIAS_statement", "string", 0
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,    59,    44,
-     124,    91,    93,    43,    45,    40,    41,    61,   123,   125
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
-{
-       0,   120,   121,   122,   122,   123,   123,   124,   125,   125,
-     126,   126,   127,   127,   128,   128,   128,   128,   128,   128,
-     128,   129,   129,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   137,   138,   139,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   141,   142,   142,
-     143,   143,   144,   144,   145,   146,   147,   148,   149,   149,
-     150,   150,   150,   150,   151,   151,   152,   153,   153,   154,
-     155,   156,   156,   156,   157,   158,   159,   160,   161,   162,
-     163,   163,   163,   163,   164,   164,   164,   164,   164,   165,
-     165,   165,   166,   167,   168,   169,   170,   170,   170,   170,
-     170,   170,   171,   172,   172,   173,   173,   173,   173,   173,
-     173,   173,   173,   174,   175,   175,   176,   177,   177,   177,
-     177,   178,   178,   179,   180,   181,   181,   182,   183,   184,
-     184,   185,   185,   185,   186,   186,   186,   187,   187,   187,
-     188,   188,   189,   189,   189,   189,   189,   189,   189,   189,
-     189,   189,   189,   190,   191,   191,   191,   192,   193,   193,
-     193,   193,   193,   194,   195,   196,   196,   197,   198,   199,
-     200,   201,   201,   201,   202,   203,   204,   204,   205,   205,
-     205,   205,   206,   207,   207,   208,   209,   210,   211,   211,
-     212,   213,   214,   214,   215,   216,   216,   217,   217,   217,
-     218,   219,   219,   219,   219,   219,   219,   220,   220,   221,
-     222,   223,   224,   225,   225,   226,   226,   227,   228,   228,
-     229,   230,   231,   231,   232,   233,   234,   235,   235,   236,
-     236,   237,   238,   238,   239,   239,   239,   239,   240,   240,
-     241,   241,   241,   243,   242,   244,   244,   246,   245,   247,
-     247,   248,   249,   249,   249,   249,   249,   249,   250,   251,
-     251,   251,   252,   252,   252,   253,   253,   253,   254,   254,
-     254,   255,   255,   256,   256,   257,   257,   258,   259,   260,
-     261,   262,   262
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     4,     1,     1,     2,     0,     3,     2,     0,
-       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     4,     4,     4,     6,     6,     8,
-       8,     2,     2,    12,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     6,     2,     4,
-       2,     1,     3,     5,     3,     2,     7,     2,     1,     1,
-       1,     1,     4,     1,     1,     1,     1,     1,     1,     1,
-       3,     0,     2,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     1,     1,     1,     1,     0,     3,
-       3,     0,     2,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     4,     2,     2,     1,     2,     1,     2,     1,
-       2,     4,     4,     1,     0,     3,     1,     1,     2,     1,
-       2,     1,     1,     3,     6,     0,     1,     2,     4,     1,
-       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     3,     1,     1,     1,     5,     1,     1,
-       1,     2,     1,     1,     2,     1,     2,     6,     1,     3,
-       1,     1,     1,     1,     1,     4,     1,     1,     1,     1,
-       1,     1,     2,     1,     1,     5,     1,     2,     1,     1,
-       5,     2,     0,     6,     3,     0,     1,     1,     1,     1,
-       1,     2,     1,     1,     2,     4,     4,     0,     3,     1,
-       1,     1,     2,     1,     1,     1,     1,     5,     1,     3,
-       5,     5,     1,     3,     5,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     5,     7,     9,     2,     2,
-       1,     1,     0,     0,     4,     1,     0,     0,     3,     3,
-       1,     5,     2,     2,     2,     2,     3,     2,     3,     0,
-       1,     1,     0,     1,     1,     0,     1,     1,     0,     1,
-       1,     0,     3,     0,     3,     0,     3,     1,     1,     1,
-       4,     1,     1
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint16 yydefact[] =
-{
-       0,     3,     4,     0,     6,     1,     9,     0,     5,   246,
-     281,   282,     0,   247,     0,     0,     0,     2,     0,     0,
-       0,     0,     0,     0,     0,   242,     0,     0,     8,     0,
-      12,    13,    14,    15,    16,    17,    18,    19,    21,    22,
-      23,    20,     0,    96,    97,   121,   122,    98,     0,    99,
-     100,   101,   245,     7,     0,     0,     0,     0,     0,    65,
-       0,    88,    64,     0,     0,     0,     0,     0,    76,     0,
-       0,    94,   240,   241,    31,    32,    83,     0,     0,     0,
-      10,    11,     0,   243,   250,   248,     0,     0,   125,   242,
-     123,   259,   257,   253,   255,   252,   271,   254,   242,    84,
-      85,    86,    87,    91,   242,   242,   242,   242,   242,   242,
-      78,    55,    81,    80,    82,    92,   233,   232,     0,     0,
-       0,     0,    60,     0,   242,    83,     0,    61,    63,   134,
-     135,   213,   214,   136,   229,   230,     0,   242,     0,     0,
-       0,   280,   102,   126,     0,   127,   131,   132,   133,   227,
-     228,   231,     0,   261,   260,   262,     0,   256,     0,     0,
-      54,     0,     0,     0,    26,     0,    25,    24,   268,   119,
-     117,   271,   104,     0,     0,     0,     0,     0,     0,   265,
-       0,   265,     0,     0,   275,   271,   142,   143,   144,   145,
-     147,   146,   148,   149,   150,   151,     0,   152,   268,   109,
-       0,   107,   105,   271,     0,   114,   103,    83,     0,    52,
-       0,     0,     0,     0,   244,   249,     0,   239,   238,   263,
-     264,   258,   277,     0,   242,    95,     0,     0,    83,   242,
-       0,    48,     0,    51,     0,   242,   269,   270,   118,   120,
-       0,     0,     0,   212,   183,   184,   182,     0,   165,   267,
-     266,   164,     0,     0,     0,     0,   207,   203,     0,   202,
-     271,   195,   189,   188,   187,     0,     0,     0,     0,   108,
-       0,   110,     0,     0,   106,     0,   242,   234,    69,     0,
-      67,    68,     0,   242,   242,   251,     0,   124,   272,    28,
-      89,    90,    93,    27,     0,    79,    50,   273,     0,     0,
-     225,     0,   226,     0,   186,     0,   174,     0,   166,     0,
-     171,   172,   155,   156,   173,   153,   154,     0,     0,   201,
-       0,   204,   197,   199,   198,   194,   196,   279,     0,   170,
-     169,   176,   177,     0,     0,   116,     0,   113,     0,     0,
-      53,     0,    62,    77,    71,    47,     0,     0,     0,   242,
-      49,     0,    34,     0,   242,   220,   224,     0,     0,   265,
-     211,     0,   209,     0,   210,     0,   276,   181,   180,   178,
-     179,   175,   200,     0,   111,   112,   115,   242,   235,     0,
-       0,    70,   242,    58,    57,    59,   242,     0,     0,     0,
-     129,   137,   140,   138,   215,   216,   139,   278,     0,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    30,    29,   185,   160,   162,   159,     0,   157,   158,
-       0,   206,   208,   205,   190,     0,    74,    72,    75,    73,
-       0,     0,     0,     0,   141,   192,   242,   128,   274,   163,
-     161,   167,   168,   242,   236,   242,     0,     0,     0,     0,
-     191,   130,     0,     0,     0,     0,   218,     0,   222,     0,
-     237,   242,     0,   217,     0,   221,     0,     0,    56,    33,
-     219,   223,     0,     0,   193
-};
-
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     3,     4,     6,     8,     9,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,   298,
-     411,    41,   161,   231,    74,    60,    69,   345,   346,   384,
-     232,    61,   126,   279,   280,   281,   381,   427,   429,    70,
-     344,   111,   296,   115,   103,   160,    75,   227,    76,   228,
-      42,    43,   127,   206,   338,   274,   336,   172,    44,    45,
-      46,   144,    90,   287,   389,   145,   128,   390,   391,   129,
-     186,   315,   187,   418,   440,   188,   251,   189,   441,   190,
-     330,   316,   307,   191,   333,   371,   192,   246,   193,   305,
-     194,   264,   195,   434,   450,   196,   325,   326,   373,   261,
-     319,   363,   365,   361,   197,   130,   393,   394,   455,   131,
-     395,   457,   132,   301,   303,   396,   133,   149,   134,   135,
-     151,    77,    47,   139,    48,    49,    54,    85,    50,    62,
-      97,   155,   221,   252,   238,   157,   352,   266,   223,   398,
-     328,    51,    12
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -401
-static const yytype_int16 yypact[] =
-{
-     193,  -401,  -401,    27,  -401,  -401,    62,   143,  -401,    24,
-    -401,  -401,   -30,  -401,   -18,    12,    83,  -401,    15,    15,
-      15,    15,    15,    15,    67,    61,    15,    15,  -401,   127,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,
-    -401,  -401,   144,  -401,  -401,  -401,  -401,  -401,   204,  -401,
-    -401,  -401,  -401,  -401,   155,   136,   138,    34,   140,  -401,
-     147,   108,  -401,   150,   156,   157,   158,   160,  -401,   162,
-     159,  -401,  -401,  -401,  -401,  -401,   102,   -13,   163,   164,
-    -401,  -401,   165,  -401,  -401,   166,   170,    10,   235,     0,
-    -401,   141,  -401,  -401,  -401,  -401,   167,  -401,   131,  -401,
-    -401,  -401,  -401,   168,   131,   131,   131,   131,   131,   131,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   104,    97,
-     114,    38,   169,    30,   131,   102,   171,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,  -401,  -401,    30,   131,   172,   155,
-     175,  -401,  -401,  -401,   173,  -401,  -401,  -401,  -401,  -401,
-    -401,  -401,   223,  -401,  -401,   123,   253,  -401,   177,   149,
-    -401,   178,   -10,   181,  -401,   182,  -401,  -401,   134,  -401,
-    -401,   167,  -401,   183,   184,   185,   213,    99,   186,   154,
-     187,   146,   153,     7,   188,   167,  -401,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,  -401,  -401,   215,  -401,   134,  -401,
-     190,  -401,  -401,   167,   191,   192,  -401,   102,   -48,  -401,
-       1,   195,   196,   214,   166,  -401,   189,  -401,  -401,  -401,
-    -401,  -401,  -401,   180,   131,  -401,   194,   197,   102,   131,
-      30,  -401,   203,   205,   201,   131,  -401,  -401,  -401,  -401,
-     285,   288,   289,  -401,  -401,  -401,  -401,   291,  -401,  -401,
-    -401,  -401,   248,   291,    33,   206,   207,  -401,   208,  -401,
-     167,    14,  -401,  -401,  -401,   293,   292,    92,   209,  -401,
-     299,  -401,   301,   299,  -401,   216,   131,  -401,  -401,   217,
-    -401,  -401,   221,   131,   131,  -401,   212,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,   218,  -401,  -401,   220,   224,   225,
-    -401,   226,  -401,   227,  -401,   228,  -401,   230,  -401,   231,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,   304,   309,  -401,
-     312,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   232,  -401,
-    -401,  -401,  -401,   161,   313,  -401,   233,  -401,   234,   238,
-    -401,    13,  -401,  -401,   137,  -401,   242,   -15,   243,     3,
-    -401,   314,  -401,   133,   131,  -401,  -401,   296,    94,   146,
-    -401,   245,  -401,   246,  -401,   247,  -401,  -401,  -401,  -401,
-    -401,  -401,  -401,   249,  -401,  -401,  -401,   131,  -401,   332,
-     337,  -401,   131,  -401,  -401,  -401,   131,   142,   114,    28,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   250,  -401,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,   331,  -401,  -401,
-      68,  -401,  -401,  -401,  -401,    43,  -401,  -401,  -401,  -401,
-     255,   256,   257,   258,  -401,   300,     3,  -401,  -401,  -401,
-    -401,  -401,  -401,   131,  -401,   131,   201,   285,   288,   259,
-    -401,  -401,   252,   264,   265,   263,   261,   266,   270,   313,
-    -401,   131,   133,  -401,   285,  -401,   288,    80,  -401,  -401,
-    -401,  -401,   313,   267,  -401
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   -69,
-     -82,  -401,  -100,   151,   -86,   210,  -401,  -401,  -366,  -401,
-     -54,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   174,
-    -401,  -401,  -401,  -118,  -401,  -401,   229,  -401,  -401,  -401,
-    -401,  -401,   295,  -401,  -401,  -401,   110,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,   -51,  -401,   -88,
-    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,
-    -401,  -311,   139,  -401,  -401,  -401,  -401,  -401,  -401,  -401,
-    -401,  -401,  -401,  -401,  -401,    -2,  -401,  -401,  -400,  -401,
-    -401,  -401,  -401,  -401,  -401,   298,  -401,  -401,  -401,  -401,
-    -401,  -401,  -401,  -390,  -295,   302,  -401,  -401,  -136,   -87,
-    -120,   -89,  -401,  -401,  -401,  -401,  -401,   251,  -401,   176,
-    -401,  -401,  -401,  -176,   198,  -153,  -401,  -401,  -401,  -401,
-    -401,  -401,    -6
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -230
-static const yytype_int16 yytable[] =
-{
-     152,   146,   150,    52,   208,   254,   164,   209,   383,   167,
-     116,   117,   158,   116,   117,   162,   430,   162,   239,   163,
-     162,   165,   166,   125,   278,   118,   233,     5,   118,    13,
-      14,    15,   267,   262,    16,   152,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,   419,   118,   119,
-     271,   212,   119,   116,   117,   322,   323,   456,   310,   467,
-     120,   276,   119,   120,   311,   387,   312,   198,   118,   207,
-       7,   277,   473,   120,   470,   199,   388,   263,    53,   453,
-      58,    55,   211,   121,    10,    11,   121,   122,   200,   275,
-     122,   201,   119,   310,   233,   468,   324,   123,   202,   311,
-     230,    68,   313,   120,   314,   124,   121,   321,   124,   442,
-     292,    56,   203,    72,    73,    59,    72,    73,   124,   310,
-     414,   124,   377,    10,    11,   311,   121,   331,   244,   293,
-     122,   173,   378,   168,   415,   204,   205,   436,   289,   314,
-     162,   169,   175,   174,   176,    88,   332,   437,   124,   299,
-     177,    89,   443,   458,   416,   245,   341,   178,   179,   180,
-      71,   181,   444,   182,   170,   314,   417,    68,   153,    91,
-      92,   471,   183,   249,    72,    73,   432,    93,   171,   248,
-     154,   249,    57,   420,   219,   250,   472,   152,   433,   184,
-     185,   220,   424,   250,   347,   236,     1,     2,   348,    94,
-      95,   255,   237,   112,   256,   257,   113,   114,   258,    99,
-     100,   101,   102,    82,    96,    83,   259,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,    63,
-      64,    65,    66,    67,   260,    80,    78,    79,   367,   368,
-     369,   370,    10,    11,    72,    73,   217,   218,    71,   225,
-     379,   380,    81,    86,    84,    87,    98,   425,   143,   104,
-     152,   392,   150,   110,   138,   105,   106,   107,   412,   108,
-     141,   109,   136,   137,   215,   140,   222,   243,   156,    58,
-     -66,   268,   210,   159,   297,   216,   224,   229,   152,   213,
-     234,   235,   288,   347,   240,   241,   242,   247,   253,   265,
-     431,   270,   272,   273,   283,   284,   286,   295,   300,  -229,
-     290,   302,   304,   291,   306,   308,   327,   317,   318,   320,
-     334,   329,   335,   452,   337,   343,   340,   360,   350,   342,
-     349,   351,   362,   353,   354,   364,   372,   397,   355,   356,
-     357,   385,   358,   359,   366,   374,   375,   152,   392,   150,
-     376,   382,   386,   413,   152,   426,   347,   421,   422,   423,
-     428,   424,   438,   439,   445,   446,   449,   464,   447,   448,
-     459,   460,   347,   461,   462,   463,   466,   454,   465,   474,
-     469,   294,   142,   339,   282,   451,   435,   147,   226,   285,
-     214,   148,   309,     0,     0,     0,   269
-};
-
-static const yytype_int16 yycheck[] =
-{
-      89,    89,    89,     9,   124,   181,   106,   125,    23,   109,
-      23,    24,    98,    23,    24,   104,   382,   106,   171,   105,
-     109,   107,   108,    77,    23,    38,   162,     0,    38,     5,
-       6,     7,   185,    26,    10,   124,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,   358,    38,    62,
-     203,   137,    62,    23,    24,    41,    42,   447,    25,   459,
-      73,   109,    62,    73,    31,    62,    33,    29,    38,   123,
-       8,   119,   472,    73,   464,    37,    73,    70,   108,   445,
-      65,    99,   136,    96,    99,   100,    96,   100,    50,   207,
-     100,    53,    62,    25,   230,   461,    82,   110,    60,    31,
-     110,   100,    69,    73,    71,   118,    96,   260,   118,   420,
-     228,    99,    74,   113,   114,   100,   113,   114,   118,    25,
-      26,   118,   109,    99,   100,    31,    96,    35,    29,   229,
-     100,    34,   119,    29,    40,    97,    98,   109,   224,    71,
-     229,    37,    28,    46,    30,   111,    54,   119,   118,   235,
-      36,   117,   109,   448,    60,    56,   276,    43,    44,    45,
-      99,    47,   119,    49,    60,    71,    72,   100,    27,    29,
-      30,   466,    58,    27,   113,   114,    34,    37,    74,    25,
-      39,    27,    99,   359,    61,    39,   106,   276,    46,    75,
-      76,    68,   112,    39,   283,    61,     3,     4,   284,    59,
-      60,    48,    68,   101,    51,    52,   104,   105,    55,   101,
-     102,   103,   104,     9,    74,    11,    63,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    19,
-      20,    21,    22,    23,    81,   108,    26,    27,    77,    78,
-      79,    80,    99,   100,   113,   114,    23,    24,    99,   100,
-     113,   114,   108,   117,    99,   117,   109,   377,    23,   109,
-     349,   349,   349,   104,    99,   109,   109,   109,   354,   109,
-     100,   109,   109,   109,    99,   109,    23,    64,   111,    65,
-     111,    66,   111,   115,    83,   112,   109,   109,   377,   117,
-     109,   109,   112,   382,   111,   111,   111,   111,   111,   111,
-     386,   111,   111,   111,   109,   109,   117,   104,    23,   104,
-     116,    23,    23,   116,    23,    67,    23,   111,   111,   111,
-     111,    29,    23,   443,    23,   104,   110,    23,   110,   112,
-     118,   111,    23,   109,   109,    23,    23,    23,   112,   112,
-     112,   347,   112,   112,   112,   112,   112,   436,   436,   436,
-     112,   109,   109,    57,   443,    23,   445,   112,   112,   112,
-      23,   112,   112,    32,   109,   109,    66,   106,   111,   111,
-     111,   119,   461,   109,   109,   112,   106,   446,   112,   112,
-     462,   230,    87,   273,   210,   436,   388,    89,   159,   213,
-     139,    89,   253,    -1,    -1,    -1,   198
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint16 yystos[] =
-{
-       0,     3,     4,   121,   122,     0,   123,     8,   124,   125,
-      99,   100,   262,     5,     6,     7,    10,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   141,   170,   171,   178,   179,   180,   242,   244,   245,
-     248,   261,   262,   108,   246,    99,    99,    99,    65,   100,
-     145,   151,   249,   145,   145,   145,   145,   145,   100,   146,
-     159,    99,   113,   114,   144,   166,   168,   241,   145,   145,
-     108,   108,     9,    11,    99,   247,   117,   117,   111,   117,
-     182,    29,    30,    37,    59,    60,    74,   250,   109,   101,
-     102,   103,   104,   164,   109,   109,   109,   109,   109,   109,
-     104,   161,   101,   104,   105,   163,    23,    24,    38,    62,
-      73,    96,   100,   110,   118,   150,   152,   172,   186,   189,
-     225,   229,   232,   236,   238,   239,   109,   109,    99,   243,
-     109,   100,   172,    23,   181,   185,   189,   225,   235,   237,
-     239,   240,   241,    27,    39,   251,   111,   255,   144,   115,
-     165,   142,   241,   144,   142,   144,   144,   142,    29,    37,
-      60,    74,   177,    34,    46,    28,    30,    36,    43,    44,
-      45,    47,    49,    58,    75,    76,   190,   192,   195,   197,
-     199,   203,   206,   208,   210,   212,   215,   224,    29,    37,
-      50,    53,    60,    74,    97,    98,   173,   150,   240,   163,
-     111,   150,   144,   117,   247,    99,   112,    23,    24,    61,
-      68,   252,    23,   258,   109,   100,   166,   167,   169,   109,
-     110,   143,   150,   238,   109,   109,    61,    68,   254,   255,
-     111,   111,   111,    64,    29,    56,   207,   111,    25,    27,
-      39,   196,   253,   111,   253,    48,    51,    52,    55,    63,
-      81,   219,    26,    70,   211,   111,   257,   255,    66,   254,
-     111,   255,   111,   111,   175,   163,   109,   119,    23,   153,
-     154,   155,   159,   109,   109,   249,   117,   183,   112,   144,
-     116,   116,   163,   142,   143,   104,   162,    83,   139,   144,
-      23,   233,    23,   234,    23,   209,    23,   202,    67,   202,
-      25,    31,    33,    69,    71,   191,   201,   111,   111,   220,
-     111,   255,    41,    42,    82,   216,   217,    23,   260,    29,
-     200,    35,    54,   204,   111,    23,   176,    23,   174,   176,
-     110,   240,   112,   104,   160,   147,   148,   241,   144,   118,
-     110,   111,   256,   109,   109,   112,   112,   112,   112,   112,
-      23,   223,    23,   221,    23,   222,   112,    77,    78,    79,
-      80,   205,    23,   218,   112,   112,   112,   109,   119,   113,
-     114,   156,   109,    23,   149,   262,   109,    62,    73,   184,
-     187,   188,   189,   226,   227,   230,   235,    23,   259,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,   140,   144,    57,    26,    40,    60,    72,   193,   201,
-     253,   112,   112,   112,   112,   240,    23,   157,    23,   158,
-     148,   144,    34,    46,   213,   215,   109,   119,   112,    32,
-     194,   198,   201,   109,   119,   109,   109,   111,   111,    66,
-     214,   187,   240,   148,   139,   228,   233,   231,   234,   111,
-     119,   109,   109,   112,   106,   112,   106,   218,   148,   140,
-     233,   234,   106,   218,   112
-};
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL		goto yyerrlab
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
-      yyerror (&yylloc, state, YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# 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).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;				\
-	}								\
-    while (YYID (0))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval, &yylloc, scanner)
-#endif
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value, Location, state); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-    YYLTYPE const * const yylocationp;
-    struct asm_parser_state *state;
-#endif
-{
-  if (!yyvaluep)
-    return;
-  YYUSE (yylocationp);
-  YYUSE (state);
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
-# endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, state)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-    YYLTYPE const * const yylocationp;
-    struct asm_parser_state *state;
-#endif
-{
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  YYFPRINTF (yyoutput, ": ");
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state);
-  YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, struct asm_parser_state *state)
-#else
-static void
-yy_reduce_print (yyvsp, yylsp, yyrule, state)
-    YYSTYPE *yyvsp;
-    YYLTYPE *yylsp;
-    int yyrule;
-    struct asm_parser_state *state;
-#endif
-{
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , state);
-      YYFPRINTF (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, yylsp, Rule, state); \
-} while (YYID (0))
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
-
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
-    }
-}
-#endif /* YYERROR_VERBOSE */
-
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, struct asm_parser_state *state)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep, yylocationp, state)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-    YYLTYPE *yylocationp;
-    struct asm_parser_state *state;
-#endif
-{
-  YYUSE (yyvaluep);
-  YYUSE (yylocationp);
-  YYUSE (state);
-
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
-}
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (struct asm_parser_state *state);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (struct asm_parser_state *state)
-#else
-int
-yyparse (state)
-    struct asm_parser_state *state;
-#endif
-#endif
-{
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc;
-
-    /* Number of syntax errors so far.  */
-    int yynerrs;
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-       `yyls': related to locations.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    /* The location stack.  */
-    YYLTYPE yylsa[YYINITDEPTH];
-    YYLTYPE *yyls;
-    YYLTYPE *yylsp;
-
-    /* The locations where the error started and ended.  */
-    YYLTYPE yyerror_range[2];
-
-    YYSIZE_T yystacksize;
-
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-  YYLTYPE yyloc;
-
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yyls = yylsa;
-  yystacksize = YYINITDEPTH;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-  yylsp = yyls;
-
-#if YYLTYPE_IS_TRIVIAL
-  /* Initialize the default location before parsing starts.  */
-  yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 1;
-#endif
-
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-	YYLTYPE *yyls1 = yyls;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-
-	yyls = yyls1;
-	yyss = yyss1;
-	yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
-
-      {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-	YYSTACK_RELOCATE (yyls_alloc, yyls);
-#  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-      yylsp = yyls + yysize - 1;
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-
-  yystate = yyn;
-  *++yyvsp = yylval;
-  *++yylsp = yylloc;
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-  /* Default location.  */
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 3:
-
-/* Line 1455 of yacc.c  */
-#line 282 "program_parse.y"
-    {
-	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid fragment program header");
-
-	   }
-	   state->mode = ARB_vertex;
-	;}
-    break;
-
-  case 4:
-
-/* Line 1455 of yacc.c  */
-#line 290 "program_parse.y"
-    {
-	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex program header");
-	   }
-	   state->mode = ARB_fragment;
-
-	   state->option.TexRect =
-	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);
-	;}
-    break;
-
-  case 7:
-
-/* Line 1455 of yacc.c  */
-#line 306 "program_parse.y"
-    {
-	   int valid = 0;
-
-	   if (state->mode == ARB_vertex) {
-	      valid = _mesa_ARBvp_parse_option(state, (yyvsp[(2) - (3)].string));
-	   } else if (state->mode == ARB_fragment) {
-	      valid = _mesa_ARBfp_parse_option(state, (yyvsp[(2) - (3)].string));
-	   }
-
-
-	   free((yyvsp[(2) - (3)].string));
-
-	   if (!valid) {
-	      const char *const err_str = (state->mode == ARB_vertex)
-		 ? "invalid ARB vertex program option"
-		 : "invalid ARB fragment program option";
-
-	      yyerror(& (yylsp[(2) - (3)]), state, err_str);
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 10:
-
-/* Line 1455 of yacc.c  */
-#line 334 "program_parse.y"
-    {
-	   if ((yyvsp[(1) - (2)].inst) != NULL) {
-	      if (state->inst_tail == NULL) {
-		 state->inst_head = (yyvsp[(1) - (2)].inst);
-	      } else {
-		 state->inst_tail->next = (yyvsp[(1) - (2)].inst);
-	      }
-
-	      state->inst_tail = (yyvsp[(1) - (2)].inst);
-	      (yyvsp[(1) - (2)].inst)->next = NULL;
-
-	      state->prog->NumInstructions++;
-	   }
-	;}
-    break;
-
-  case 12:
-
-/* Line 1455 of yacc.c  */
-#line 352 "program_parse.y"
-    {
-	   (yyval.inst) = (yyvsp[(1) - (1)].inst);
-	   state->prog->NumAluInstructions++;
-	;}
-    break;
-
-  case 13:
-
-/* Line 1455 of yacc.c  */
-#line 357 "program_parse.y"
-    {
-	   (yyval.inst) = (yyvsp[(1) - (1)].inst);
-	   state->prog->NumTexInstructions++;
-	;}
-    break;
-
-  case 24:
-
-/* Line 1455 of yacc.c  */
-#line 378 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_ctor(OPCODE_ARL, & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
-	;}
-    break;
-
-  case 25:
-
-/* Line 1455 of yacc.c  */
-#line 384 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
-	;}
-    break;
-
-  case 26:
-
-/* Line 1455 of yacc.c  */
-#line 390 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
-	;}
-    break;
-
-  case 27:
-
-/* Line 1455 of yacc.c  */
-#line 396 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);
-	;}
-    break;
-
-  case 28:
-
-/* Line 1455 of yacc.c  */
-#line 403 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);
-	;}
-    break;
-
-  case 29:
-
-/* Line 1455 of yacc.c  */
-#line 410 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), & (yyvsp[(6) - (8)].src_reg), & (yyvsp[(8) - (8)].src_reg));
-	;}
-    break;
-
-  case 30:
-
-/* Line 1455 of yacc.c  */
-#line 416 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), NULL, NULL);
-	   if ((yyval.inst) != NULL) {
-	      const GLbitfield tex_mask = (1U << (yyvsp[(6) - (8)].integer));
-	      GLbitfield shadow_tex = 0;
-	      GLbitfield target_mask = 0;
-
-
-	      (yyval.inst)->Base.TexSrcUnit = (yyvsp[(6) - (8)].integer);
-
-	      if ((yyvsp[(8) - (8)].integer) < 0) {
-		 shadow_tex = tex_mask;
-
-		 (yyval.inst)->Base.TexSrcTarget = -(yyvsp[(8) - (8)].integer);
-		 (yyval.inst)->Base.TexShadow = 1;
-	      } else {
-		 (yyval.inst)->Base.TexSrcTarget = (yyvsp[(8) - (8)].integer);
-	      }
-
-	      target_mask = (1U << (yyval.inst)->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[(yyvsp[(6) - (8)].integer)] != 0)
-		  && ((state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] != target_mask)
-		      || ((state->prog->ShadowSamplers & tex_mask)
-			  != shadow_tex))) {
-		 yyerror(& (yylsp[(8) - (8)]), state,
-			 "multiple targets used on one texture image unit");
-		 YYERROR;
-	      }
-
-
-	      state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] |= target_mask;
-	      state->prog->ShadowSamplers |= shadow_tex;
-	   }
-	;}
-    break;
-
-  case 31:
-
-/* Line 1455 of yacc.c  */
-#line 460 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_ctor(OPCODE_KIL, NULL, & (yyvsp[(2) - (2)].src_reg), NULL, NULL);
-	   state->fragment.UsesKill = 1;
-	;}
-    break;
-
-  case 32:
-
-/* Line 1455 of yacc.c  */
-#line 465 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
-	   (yyval.inst)->Base.DstReg.CondMask = (yyvsp[(2) - (2)].dst_reg).CondMask;
-	   (yyval.inst)->Base.DstReg.CondSwizzle = (yyvsp[(2) - (2)].dst_reg).CondSwizzle;
-	   (yyval.inst)->Base.DstReg.CondSrc = (yyvsp[(2) - (2)].dst_reg).CondSrc;
-	   state->fragment.UsesKill = 1;
-	;}
-    break;
-
-  case 33:
-
-/* Line 1455 of yacc.c  */
-#line 475 "program_parse.y"
-    {
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (12)].temp_inst), & (yyvsp[(2) - (12)].dst_reg), & (yyvsp[(4) - (12)].src_reg), & (yyvsp[(6) - (12)].src_reg), & (yyvsp[(8) - (12)].src_reg));
-	   if ((yyval.inst) != NULL) {
-	      const GLbitfield tex_mask = (1U << (yyvsp[(10) - (12)].integer));
-	      GLbitfield shadow_tex = 0;
-	      GLbitfield target_mask = 0;
-
-
-	      (yyval.inst)->Base.TexSrcUnit = (yyvsp[(10) - (12)].integer);
-
-	      if ((yyvsp[(12) - (12)].integer) < 0) {
-		 shadow_tex = tex_mask;
-
-		 (yyval.inst)->Base.TexSrcTarget = -(yyvsp[(12) - (12)].integer);
-		 (yyval.inst)->Base.TexShadow = 1;
-	      } else {
-		 (yyval.inst)->Base.TexSrcTarget = (yyvsp[(12) - (12)].integer);
-	      }
-
-	      target_mask = (1U << (yyval.inst)->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[(yyvsp[(10) - (12)].integer)] != 0)
-		  && ((state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] != target_mask)
-		      || ((state->prog->ShadowSamplers & tex_mask)
-			  != shadow_tex))) {
-		 yyerror(& (yylsp[(12) - (12)]), state,
-			 "multiple targets used on one texture image unit");
-		 YYERROR;
-	      }
-
-
-	      state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] |= target_mask;
-	      state->prog->ShadowSamplers |= shadow_tex;
-	   }
-	;}
-    break;
-
-  case 34:
-
-/* Line 1455 of yacc.c  */
-#line 519 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 35:
-
-/* Line 1455 of yacc.c  */
-#line 524 "program_parse.y"
-    { (yyval.integer) = TEXTURE_1D_INDEX; ;}
-    break;
-
-  case 36:
-
-/* Line 1455 of yacc.c  */
-#line 525 "program_parse.y"
-    { (yyval.integer) = TEXTURE_2D_INDEX; ;}
-    break;
-
-  case 37:
-
-/* Line 1455 of yacc.c  */
-#line 526 "program_parse.y"
-    { (yyval.integer) = TEXTURE_3D_INDEX; ;}
-    break;
-
-  case 38:
-
-/* Line 1455 of yacc.c  */
-#line 527 "program_parse.y"
-    { (yyval.integer) = TEXTURE_CUBE_INDEX; ;}
-    break;
-
-  case 39:
-
-/* Line 1455 of yacc.c  */
-#line 528 "program_parse.y"
-    { (yyval.integer) = TEXTURE_RECT_INDEX; ;}
-    break;
-
-  case 40:
-
-/* Line 1455 of yacc.c  */
-#line 529 "program_parse.y"
-    { (yyval.integer) = -TEXTURE_1D_INDEX; ;}
-    break;
-
-  case 41:
-
-/* Line 1455 of yacc.c  */
-#line 530 "program_parse.y"
-    { (yyval.integer) = -TEXTURE_2D_INDEX; ;}
-    break;
-
-  case 42:
-
-/* Line 1455 of yacc.c  */
-#line 531 "program_parse.y"
-    { (yyval.integer) = -TEXTURE_RECT_INDEX; ;}
-    break;
-
-  case 43:
-
-/* Line 1455 of yacc.c  */
-#line 532 "program_parse.y"
-    { (yyval.integer) = TEXTURE_1D_ARRAY_INDEX; ;}
-    break;
-
-  case 44:
-
-/* Line 1455 of yacc.c  */
-#line 533 "program_parse.y"
-    { (yyval.integer) = TEXTURE_2D_ARRAY_INDEX; ;}
-    break;
-
-  case 45:
-
-/* Line 1455 of yacc.c  */
-#line 534 "program_parse.y"
-    { (yyval.integer) = -TEXTURE_1D_ARRAY_INDEX; ;}
-    break;
-
-  case 46:
-
-/* Line 1455 of yacc.c  */
-#line 535 "program_parse.y"
-    { (yyval.integer) = -TEXTURE_2D_ARRAY_INDEX; ;}
-    break;
-
-  case 47:
-
-/* Line 1455 of yacc.c  */
-#line 539 "program_parse.y"
-    {
-	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied
-	    * FIXME: to the existing swizzle?
-	    */
-	   (yyvsp[(4) - (6)].src_reg).Base.Swizzle = (yyvsp[(6) - (6)].swiz_mask).swizzle;
-	   (yyvsp[(4) - (6)].src_reg).Base.Negate = (yyvsp[(6) - (6)].swiz_mask).mask;
-
-	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), NULL, NULL);
-	;}
-    break;
-
-  case 48:
-
-/* Line 1455 of yacc.c  */
-#line 551 "program_parse.y"
-    {
-	   (yyval.src_reg) = (yyvsp[(2) - (2)].src_reg);
-
-	   if ((yyvsp[(1) - (2)].negate)) {
-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;
-	   }
-	;}
-    break;
-
-  case 49:
-
-/* Line 1455 of yacc.c  */
-#line 559 "program_parse.y"
-    {
-	   (yyval.src_reg) = (yyvsp[(3) - (4)].src_reg);
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& (yylsp[(2) - (4)]), state, "unexpected character '|'");
-	      YYERROR;
-	   }
-
-	   if ((yyvsp[(1) - (4)].negate)) {
-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;
-	   }
-
-	   (yyval.src_reg).Base.Abs = 1;
-	;}
-    break;
-
-  case 50:
-
-/* Line 1455 of yacc.c  */
-#line 576 "program_parse.y"
-    {
-	   (yyval.src_reg) = (yyvsp[(1) - (2)].src_reg);
-
-	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,
-						    (yyvsp[(2) - (2)].swiz_mask).swizzle);
-	;}
-    break;
-
-  case 51:
-
-/* Line 1455 of yacc.c  */
-#line 583 "program_parse.y"
-    {
-	   struct asm_symbol temp_sym;
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& (yylsp[(1) - (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, & (yyvsp[(1) - (1)].vector), GL_TRUE);
-
-	   set_src_reg_swz(& (yyval.src_reg), PROGRAM_CONSTANT,
-                           temp_sym.param_binding_begin,
-                           temp_sym.param_binding_swizzle);
-	;}
-    break;
-
-  case 52:
-
-/* Line 1455 of yacc.c  */
-#line 602 "program_parse.y"
-    {
-	   (yyval.src_reg) = (yyvsp[(2) - (3)].src_reg);
-
-	   if ((yyvsp[(1) - (3)].negate)) {
-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;
-	   }
-
-	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,
-						    (yyvsp[(3) - (3)].swiz_mask).swizzle);
-	;}
-    break;
-
-  case 53:
-
-/* Line 1455 of yacc.c  */
-#line 613 "program_parse.y"
-    {
-	   (yyval.src_reg) = (yyvsp[(3) - (5)].src_reg);
-
-	   if (!state->option.NV_fragment) {
-	      yyerror(& (yylsp[(2) - (5)]), state, "unexpected character '|'");
-	      YYERROR;
-	   }
-
-	   if ((yyvsp[(1) - (5)].negate)) {
-	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;
-	   }
-
-	   (yyval.src_reg).Base.Abs = 1;
-	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,
-						    (yyvsp[(4) - (5)].swiz_mask).swizzle);
-	;}
-    break;
-
-  case 54:
-
-/* Line 1455 of yacc.c  */
-#line 633 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(1) - (3)].dst_reg);
-	   (yyval.dst_reg).WriteMask = (yyvsp[(2) - (3)].swiz_mask).mask;
-	   (yyval.dst_reg).CondMask = (yyvsp[(3) - (3)].dst_reg).CondMask;
-	   (yyval.dst_reg).CondSwizzle = (yyvsp[(3) - (3)].dst_reg).CondSwizzle;
-	   (yyval.dst_reg).CondSrc = (yyvsp[(3) - (3)].dst_reg).CondSrc;
-
-	   if ((yyval.dst_reg).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
-	       && ((yyval.dst_reg).Index == VERT_RESULT_HPOS)) {
-		 yyerror(& (yylsp[(1) - (3)]), state, "position-invariant programs cannot "
-			 "write position");
-		 YYERROR;
-	      }
-
-	      state->prog->OutputsWritten |= BITFIELD64_BIT((yyval.dst_reg).Index);
-	   }
-	;}
-    break;
-
-  case 55:
-
-/* Line 1455 of yacc.c  */
-#line 658 "program_parse.y"
-    {
-	   set_dst_reg(& (yyval.dst_reg), PROGRAM_ADDRESS, 0);
-	   (yyval.dst_reg).WriteMask = (yyvsp[(2) - (2)].swiz_mask).mask;
-	;}
-    break;
-
-  case 56:
-
-/* Line 1455 of yacc.c  */
-#line 665 "program_parse.y"
-    {
-	   const unsigned xyzw_valid =
-	      ((yyvsp[(1) - (7)].ext_swizzle).xyzw_valid << 0)
-	      | ((yyvsp[(3) - (7)].ext_swizzle).xyzw_valid << 1)
-	      | ((yyvsp[(5) - (7)].ext_swizzle).xyzw_valid << 2)
-	      | ((yyvsp[(7) - (7)].ext_swizzle).xyzw_valid << 3);
-	   const unsigned rgba_valid =
-	      ((yyvsp[(1) - (7)].ext_swizzle).rgba_valid << 0)
-	      | ((yyvsp[(3) - (7)].ext_swizzle).rgba_valid << 1)
-	      | ((yyvsp[(5) - (7)].ext_swizzle).rgba_valid << 2)
-	      | ((yyvsp[(7) - (7)].ext_swizzle).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(& (yylsp[(1) - (7)]), state, "cannot combine RGBA and XYZW swizzle "
-		      "components");
-	      YYERROR;
-	   }
-
-	   (yyval.swiz_mask).swizzle = MAKE_SWIZZLE4((yyvsp[(1) - (7)].ext_swizzle).swz, (yyvsp[(3) - (7)].ext_swizzle).swz, (yyvsp[(5) - (7)].ext_swizzle).swz, (yyvsp[(7) - (7)].ext_swizzle).swz);
-	   (yyval.swiz_mask).mask = ((yyvsp[(1) - (7)].ext_swizzle).negate) | ((yyvsp[(3) - (7)].ext_swizzle).negate << 1) | ((yyvsp[(5) - (7)].ext_swizzle).negate << 2)
-	      | ((yyvsp[(7) - (7)].ext_swizzle).negate << 3);
-	;}
-    break;
-
-  case 57:
-
-/* Line 1455 of yacc.c  */
-#line 698 "program_parse.y"
-    {
-	   (yyval.ext_swizzle) = (yyvsp[(2) - (2)].ext_swizzle);
-	   (yyval.ext_swizzle).negate = ((yyvsp[(1) - (2)].negate)) ? 1 : 0;
-	;}
-    break;
-
-  case 58:
-
-/* Line 1455 of yacc.c  */
-#line 705 "program_parse.y"
-    {
-	   if (((yyvsp[(1) - (1)].integer) != 0) && ((yyvsp[(1) - (1)].integer) != 1)) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");
-	      YYERROR;
-	   }
-
-	   (yyval.ext_swizzle).swz = ((yyvsp[(1) - (1)].integer) == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;
-
-	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW
-	    * swizzle names.
-	    */
-	   (yyval.ext_swizzle).xyzw_valid = 1;
-	   (yyval.ext_swizzle).rgba_valid = 1;
-	;}
-    break;
-
-  case 59:
-
-/* Line 1455 of yacc.c  */
-#line 720 "program_parse.y"
-    {
-	   char s;
-
-	   if (strlen((yyvsp[(1) - (1)].string)) > 1) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");
-	      YYERROR;
-	   }
-
-	   s = (yyvsp[(1) - (1)].string)[0];
-	   free((yyvsp[(1) - (1)].string));
-
-	   switch (s) {
-	   case 'x':
-	      (yyval.ext_swizzle).swz = SWIZZLE_X;
-	      (yyval.ext_swizzle).xyzw_valid = 1;
-	      break;
-	   case 'y':
-	      (yyval.ext_swizzle).swz = SWIZZLE_Y;
-	      (yyval.ext_swizzle).xyzw_valid = 1;
-	      break;
-	   case 'z':
-	      (yyval.ext_swizzle).swz = SWIZZLE_Z;
-	      (yyval.ext_swizzle).xyzw_valid = 1;
-	      break;
-	   case 'w':
-	      (yyval.ext_swizzle).swz = SWIZZLE_W;
-	      (yyval.ext_swizzle).xyzw_valid = 1;
-	      break;
-
-	   case 'r':
-	      (yyval.ext_swizzle).swz = SWIZZLE_X;
-	      (yyval.ext_swizzle).rgba_valid = 1;
-	      break;
-	   case 'g':
-	      (yyval.ext_swizzle).swz = SWIZZLE_Y;
-	      (yyval.ext_swizzle).rgba_valid = 1;
-	      break;
-	   case 'b':
-	      (yyval.ext_swizzle).swz = SWIZZLE_Z;
-	      (yyval.ext_swizzle).rgba_valid = 1;
-	      break;
-	   case 'a':
-	      (yyval.ext_swizzle).swz = SWIZZLE_W;
-	      (yyval.ext_swizzle).rgba_valid = 1;
-	      break;
-
-	   default:
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");
-	      YYERROR;
-	      break;
-	   }
-	;}
-    break;
-
-  case 60:
-
-/* Line 1455 of yacc.c  */
-#line 775 "program_parse.y"
-    {
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
-
-	   free((yyvsp[(1) - (1)].string));
-
-	   if (s == NULL) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_param) && (s->type != at_temp)
-		      && (s->type != at_attrib)) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type == at_param) && s->param_is_array) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "non-array access to array PARAM");
-	      YYERROR;
-	   }
-
-	   init_src_reg(& (yyval.src_reg));
-	   switch (s->type) {
-	   case at_temp:
-	      set_src_reg(& (yyval.src_reg), PROGRAM_TEMPORARY, s->temp_binding);
-	      break;
-	   case at_param:
-              set_src_reg_swz(& (yyval.src_reg), s->param_binding_type,
-                              s->param_binding_begin,
-                              s->param_binding_swizzle);
-	      break;
-	   case at_attrib:
-	      set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, s->attrib_binding);
-	      state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);
-
-	      if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {
-		 YYERROR;
-	      }
-	      break;
-
-	   default:
-	      YYERROR;
-	      break;
-	   }
-	;}
-    break;
-
-  case 61:
-
-/* Line 1455 of yacc.c  */
-#line 818 "program_parse.y"
-    {
-	   set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, (yyvsp[(1) - (1)].attrib));
-	   state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);
-
-	   if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 62:
-
-/* Line 1455 of yacc.c  */
-#line 827 "program_parse.y"
-    {
-	   if (! (yyvsp[(3) - (4)].src_reg).Base.RelAddr
-	       && ((unsigned) (yyvsp[(3) - (4)].src_reg).Base.Index >= (yyvsp[(1) - (4)].sym)->param_binding_length)) {
-	      yyerror(& (yylsp[(3) - (4)]), state, "out of bounds array access");
-	      YYERROR;
-	   }
-
-	   init_src_reg(& (yyval.src_reg));
-	   (yyval.src_reg).Base.File = (yyvsp[(1) - (4)].sym)->param_binding_type;
-
-	   if ((yyvsp[(3) - (4)].src_reg).Base.RelAddr) {
-              state->prog->IndirectRegisterFiles |= (1 << (yyval.src_reg).Base.File);
-	      (yyvsp[(1) - (4)].sym)->param_accessed_indirectly = 1;
-
-	      (yyval.src_reg).Base.RelAddr = 1;
-	      (yyval.src_reg).Base.Index = (yyvsp[(3) - (4)].src_reg).Base.Index;
-	      (yyval.src_reg).Symbol = (yyvsp[(1) - (4)].sym);
-	   } else {
-	      (yyval.src_reg).Base.Index = (yyvsp[(1) - (4)].sym)->param_binding_begin + (yyvsp[(3) - (4)].src_reg).Base.Index;
-	   }
-	;}
-    break;
-
-  case 63:
-
-/* Line 1455 of yacc.c  */
-#line 849 "program_parse.y"
-    {
-           gl_register_file file = ((yyvsp[(1) - (1)].temp_sym).name != NULL) 
-	      ? (yyvsp[(1) - (1)].temp_sym).param_binding_type
-	      : PROGRAM_CONSTANT;
-           set_src_reg_swz(& (yyval.src_reg), file, (yyvsp[(1) - (1)].temp_sym).param_binding_begin,
-                           (yyvsp[(1) - (1)].temp_sym).param_binding_swizzle);
-	;}
-    break;
-
-  case 64:
-
-/* Line 1455 of yacc.c  */
-#line 859 "program_parse.y"
-    {
-	   set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, (yyvsp[(1) - (1)].result));
-	;}
-    break;
-
-  case 65:
-
-/* Line 1455 of yacc.c  */
-#line 863 "program_parse.y"
-    {
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
-
-	   free((yyvsp[(1) - (1)].string));
-
-	   if (s == NULL) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_output) && (s->type != at_temp)) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");
-	      YYERROR;
-	   }
-
-	   switch (s->type) {
-	   case at_temp:
-	      set_dst_reg(& (yyval.dst_reg), PROGRAM_TEMPORARY, s->temp_binding);
-	      break;
-	   case at_output:
-	      set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, s->output_binding);
-	      break;
-	   default:
-	      set_dst_reg(& (yyval.dst_reg), s->param_binding_type, s->param_binding_begin);
-	      break;
-	   }
-	;}
-    break;
-
-  case 66:
-
-/* Line 1455 of yacc.c  */
-#line 892 "program_parse.y"
-    {
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
-
-	   free((yyvsp[(1) - (1)].string));
-
-	   if (s == NULL) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");
-	      YYERROR;
-	   } else if ((s->type != at_param) || !s->param_is_array) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "array access to non-PARAM variable");
-	      YYERROR;
-	   } else {
-	      (yyval.sym) = s;
-	   }
-	;}
-    break;
-
-  case 69:
-
-/* Line 1455 of yacc.c  */
-#line 913 "program_parse.y"
-    {
-	   init_src_reg(& (yyval.src_reg));
-	   (yyval.src_reg).Base.Index = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 70:
-
-/* Line 1455 of yacc.c  */
-#line 920 "program_parse.y"
-    {
-	   /* FINISHME: Add support for multiple address registers.
-	    */
-	   /* FINISHME: Add support for 4-component address registers.
-	    */
-	   init_src_reg(& (yyval.src_reg));
-	   (yyval.src_reg).Base.RelAddr = 1;
-	   (yyval.src_reg).Base.Index = (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 71:
-
-/* Line 1455 of yacc.c  */
-#line 931 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 72:
-
-/* Line 1455 of yacc.c  */
-#line 932 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 73:
-
-/* Line 1455 of yacc.c  */
-#line 933 "program_parse.y"
-    { (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 74:
-
-/* Line 1455 of yacc.c  */
-#line 937 "program_parse.y"
-    {
-	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 4095)) {
-              char s[100];
-              _mesa_snprintf(s, sizeof(s),
-                             "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));
-	      yyerror(& (yylsp[(1) - (1)]), state, s);
-	      YYERROR;
-	   } else {
-	      (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	   }
-	;}
-    break;
-
-  case 75:
-
-/* Line 1455 of yacc.c  */
-#line 951 "program_parse.y"
-    {
-	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 4096)) {
-              char s[100];
-              _mesa_snprintf(s, sizeof(s),
-                             "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));
-	      yyerror(& (yylsp[(1) - (1)]), state, s);
-	      YYERROR;
-	   } else {
-	      (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	   }
-	;}
-    break;
-
-  case 76:
-
-/* Line 1455 of yacc.c  */
-#line 965 "program_parse.y"
-    {
-	   struct asm_symbol *const s = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
-
-	   free((yyvsp[(1) - (1)].string));
-
-	   if (s == NULL) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid array member");
-	      YYERROR;
-	   } else if (s->type != at_address) {
-	      yyerror(& (yylsp[(1) - (1)]), state,
-		      "invalid variable for indexed array access");
-	      YYERROR;
-	   } else {
-	      (yyval.sym) = s;
-	   }
-	;}
-    break;
-
-  case 77:
-
-/* Line 1455 of yacc.c  */
-#line 985 "program_parse.y"
-    {
-	   if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid address component selector");
-	      YYERROR;
-	   } else {
-	      (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);
-	   }
-	;}
-    break;
-
-  case 78:
-
-/* Line 1455 of yacc.c  */
-#line 996 "program_parse.y"
-    {
-	   if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {
-	      yyerror(& (yylsp[(1) - (1)]), state,
-		      "address register write mask must be \".x\"");
-	      YYERROR;
-	   } else {
-	      (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);
-	   }
-	;}
-    break;
-
-  case 83:
-
-/* Line 1455 of yacc.c  */
-#line 1012 "program_parse.y"
-    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
-    break;
-
-  case 88:
-
-/* Line 1455 of yacc.c  */
-#line 1016 "program_parse.y"
-    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
-    break;
-
-  case 89:
-
-/* Line 1455 of yacc.c  */
-#line 1020 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
-	;}
-    break;
-
-  case 90:
-
-/* Line 1455 of yacc.c  */
-#line 1024 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
-	;}
-    break;
-
-  case 91:
-
-/* Line 1455 of yacc.c  */
-#line 1028 "program_parse.y"
-    {
-	   (yyval.dst_reg).CondMask = COND_TR;
-	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
-	   (yyval.dst_reg).CondSrc = 0;
-	;}
-    break;
-
-  case 92:
-
-/* Line 1455 of yacc.c  */
-#line 1036 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);
-	   (yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;
-	;}
-    break;
-
-  case 93:
-
-/* Line 1455 of yacc.c  */
-#line 1043 "program_parse.y"
-    {
-	   (yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);
-	   (yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;
-	;}
-    break;
-
-  case 94:
-
-/* Line 1455 of yacc.c  */
-#line 1050 "program_parse.y"
-    {
-	   const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));
-	   if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {
-	      char *const err_str =
-		 make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));
-
-	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)
-		      ? err_str : "invalid condition code");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-
-	   (yyval.dst_reg).CondMask = cond;
-	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
-	   (yyval.dst_reg).CondSrc = 0;
-	;}
-    break;
-
-  case 95:
-
-/* Line 1455 of yacc.c  */
-#line 1073 "program_parse.y"
-    {
-	   const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));
-	   if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {
-	      char *const err_str =
-		 make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));
-
-	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)
-		      ? err_str : "invalid condition code");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-
-	   (yyval.dst_reg).CondMask = cond;
-	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
-	   (yyval.dst_reg).CondSrc = 0;
-	;}
-    break;
-
-  case 102:
-
-/* Line 1455 of yacc.c  */
-#line 1104 "program_parse.y"
-    {
-	   struct asm_symbol *const s =
-	      declare_variable(state, (yyvsp[(2) - (4)].string), at_attrib, & (yylsp[(2) - (4)]));
-
-	   if (s == NULL) {
-	      free((yyvsp[(2) - (4)].string));
-	      YYERROR;
-	   } else {
-	      s->attrib_binding = (yyvsp[(4) - (4)].attrib);
-	      state->InputsBound |= (1U << s->attrib_binding);
-
-	      if (!validate_inputs(& (yylsp[(4) - (4)]), state)) {
-		 YYERROR;
-	      }
-	   }
-	;}
-    break;
-
-  case 103:
-
-/* Line 1455 of yacc.c  */
-#line 1123 "program_parse.y"
-    {
-	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);
-	;}
-    break;
-
-  case 104:
-
-/* Line 1455 of yacc.c  */
-#line 1127 "program_parse.y"
-    {
-	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);
-	;}
-    break;
-
-  case 105:
-
-/* Line 1455 of yacc.c  */
-#line 1133 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_POS;
-	;}
-    break;
-
-  case 106:
-
-/* Line 1455 of yacc.c  */
-#line 1137 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_WEIGHT;
-	;}
-    break;
-
-  case 107:
-
-/* Line 1455 of yacc.c  */
-#line 1141 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_NORMAL;
-	;}
-    break;
-
-  case 108:
-
-/* Line 1455 of yacc.c  */
-#line 1145 "program_parse.y"
-    {
-	   if (!state->ctx->Extensions.EXT_secondary_color) {
-	      yyerror(& (yylsp[(2) - (2)]), state, "GL_EXT_secondary_color not supported");
-	      YYERROR;
-	   }
-
-	   (yyval.attrib) = VERT_ATTRIB_COLOR0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 109:
-
-/* Line 1455 of yacc.c  */
-#line 1154 "program_parse.y"
-    {
-	   if (!state->ctx->Extensions.EXT_fog_coord) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "GL_EXT_fog_coord not supported");
-	      YYERROR;
-	   }
-
-	   (yyval.attrib) = VERT_ATTRIB_FOG;
-	;}
-    break;
-
-  case 110:
-
-/* Line 1455 of yacc.c  */
-#line 1163 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 111:
-
-/* Line 1455 of yacc.c  */
-#line 1167 "program_parse.y"
-    {
-	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	;}
-    break;
-
-  case 112:
-
-/* Line 1455 of yacc.c  */
-#line 1172 "program_parse.y"
-    {
-	   (yyval.attrib) = VERT_ATTRIB_GENERIC0 + (yyvsp[(3) - (4)].integer);
-	;}
-    break;
-
-  case 113:
-
-/* Line 1455 of yacc.c  */
-#line 1178 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxAttribs) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex attribute reference");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 117:
-
-/* Line 1455 of yacc.c  */
-#line 1192 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_WPOS;
-	;}
-    break;
-
-  case 118:
-
-/* Line 1455 of yacc.c  */
-#line 1196 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_COL0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 119:
-
-/* Line 1455 of yacc.c  */
-#line 1200 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_FOGC;
-	;}
-    break;
-
-  case 120:
-
-/* Line 1455 of yacc.c  */
-#line 1204 "program_parse.y"
-    {
-	   (yyval.attrib) = FRAG_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 123:
-
-/* Line 1455 of yacc.c  */
-#line 1212 "program_parse.y"
-    {
-	   struct asm_symbol *const s =
-	      declare_variable(state, (yyvsp[(2) - (3)].string), at_param, & (yylsp[(2) - (3)]));
-
-	   if (s == NULL) {
-	      free((yyvsp[(2) - (3)].string));
-	      YYERROR;
-	   } else {
-	      s->param_binding_type = (yyvsp[(3) - (3)].temp_sym).param_binding_type;
-	      s->param_binding_begin = (yyvsp[(3) - (3)].temp_sym).param_binding_begin;
-	      s->param_binding_length = (yyvsp[(3) - (3)].temp_sym).param_binding_length;
-              s->param_binding_swizzle = (yyvsp[(3) - (3)].temp_sym).param_binding_swizzle;
-	      s->param_is_array = 0;
-	   }
-	;}
-    break;
-
-  case 124:
-
-/* Line 1455 of yacc.c  */
-#line 1230 "program_parse.y"
-    {
-	   if (((yyvsp[(4) - (6)].integer) != 0) && ((unsigned) (yyvsp[(4) - (6)].integer) != (yyvsp[(6) - (6)].temp_sym).param_binding_length)) {
-	      free((yyvsp[(2) - (6)].string));
-	      yyerror(& (yylsp[(4) - (6)]), state, 
-		      "parameter array size and number of bindings must match");
-	      YYERROR;
-	   } else {
-	      struct asm_symbol *const s =
-		 declare_variable(state, (yyvsp[(2) - (6)].string), (yyvsp[(6) - (6)].temp_sym).type, & (yylsp[(2) - (6)]));
-
-	      if (s == NULL) {
-		 free((yyvsp[(2) - (6)].string));
-		 YYERROR;
-	      } else {
-		 s->param_binding_type = (yyvsp[(6) - (6)].temp_sym).param_binding_type;
-		 s->param_binding_begin = (yyvsp[(6) - (6)].temp_sym).param_binding_begin;
-		 s->param_binding_length = (yyvsp[(6) - (6)].temp_sym).param_binding_length;
-                 s->param_binding_swizzle = SWIZZLE_XYZW;
-		 s->param_is_array = 1;
-	      }
-	   }
-	;}
-    break;
-
-  case 125:
-
-/* Line 1455 of yacc.c  */
-#line 1255 "program_parse.y"
-    {
-	   (yyval.integer) = 0;
-	;}
-    break;
-
-  case 126:
-
-/* Line 1455 of yacc.c  */
-#line 1259 "program_parse.y"
-    {
-	   if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) > state->limits->MaxParameters)) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid parameter array size");
-	      YYERROR;
-	   } else {
-	      (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	   }
-	;}
-    break;
-
-  case 127:
-
-/* Line 1455 of yacc.c  */
-#line 1270 "program_parse.y"
-    {
-	   (yyval.temp_sym) = (yyvsp[(2) - (2)].temp_sym);
-	;}
-    break;
-
-  case 128:
-
-/* Line 1455 of yacc.c  */
-#line 1276 "program_parse.y"
-    {
-	   (yyval.temp_sym) = (yyvsp[(3) - (4)].temp_sym);
-	;}
-    break;
-
-  case 130:
-
-/* Line 1455 of yacc.c  */
-#line 1283 "program_parse.y"
-    {
-	   (yyvsp[(1) - (3)].temp_sym).param_binding_length += (yyvsp[(3) - (3)].temp_sym).param_binding_length;
-	   (yyval.temp_sym) = (yyvsp[(1) - (3)].temp_sym);
-	;}
-    break;
-
-  case 131:
-
-/* Line 1455 of yacc.c  */
-#line 1290 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));
-	;}
-    break;
-
-  case 132:
-
-/* Line 1455 of yacc.c  */
-#line 1296 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));
-	;}
-    break;
-
-  case 133:
-
-/* Line 1455 of yacc.c  */
-#line 1302 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_TRUE);
-	;}
-    break;
-
-  case 134:
-
-/* Line 1455 of yacc.c  */
-#line 1310 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));
-	;}
-    break;
-
-  case 135:
-
-/* Line 1455 of yacc.c  */
-#line 1316 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));
-	;}
-    break;
-
-  case 136:
-
-/* Line 1455 of yacc.c  */
-#line 1322 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_TRUE);
-	;}
-    break;
-
-  case 137:
-
-/* Line 1455 of yacc.c  */
-#line 1330 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));
-	;}
-    break;
-
-  case 138:
-
-/* Line 1455 of yacc.c  */
-#line 1336 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));
-	;}
-    break;
-
-  case 139:
-
-/* Line 1455 of yacc.c  */
-#line 1342 "program_parse.y"
-    {
-	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
-	   (yyval.temp_sym).param_binding_begin = ~0;
-	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_FALSE);
-	;}
-    break;
-
-  case 140:
-
-/* Line 1455 of yacc.c  */
-#line 1349 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(1) - (1)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 141:
-
-/* Line 1455 of yacc.c  */
-#line 1350 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 142:
-
-/* Line 1455 of yacc.c  */
-#line 1353 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 143:
-
-/* Line 1455 of yacc.c  */
-#line 1354 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 144:
-
-/* Line 1455 of yacc.c  */
-#line 1355 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 145:
-
-/* Line 1455 of yacc.c  */
-#line 1356 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 146:
-
-/* Line 1455 of yacc.c  */
-#line 1357 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 147:
-
-/* Line 1455 of yacc.c  */
-#line 1358 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 148:
-
-/* Line 1455 of yacc.c  */
-#line 1359 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 149:
-
-/* Line 1455 of yacc.c  */
-#line 1360 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 150:
-
-/* Line 1455 of yacc.c  */
-#line 1361 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 151:
-
-/* Line 1455 of yacc.c  */
-#line 1362 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 152:
-
-/* Line 1455 of yacc.c  */
-#line 1363 "program_parse.y"
-    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
-    break;
-
-  case 153:
-
-/* Line 1455 of yacc.c  */
-#line 1367 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_MATERIAL;
-	   (yyval.state)[1] = (yyvsp[(2) - (3)].integer);
-	   (yyval.state)[2] = (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 154:
-
-/* Line 1455 of yacc.c  */
-#line 1376 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 155:
-
-/* Line 1455 of yacc.c  */
-#line 1380 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_EMISSION;
-	;}
-    break;
-
-  case 156:
-
-/* Line 1455 of yacc.c  */
-#line 1384 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_SHININESS;
-	;}
-    break;
-
-  case 157:
-
-/* Line 1455 of yacc.c  */
-#line 1390 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_LIGHT;
-	   (yyval.state)[1] = (yyvsp[(3) - (5)].integer);
-	   (yyval.state)[2] = (yyvsp[(5) - (5)].integer);
-	;}
-    break;
-
-  case 158:
-
-/* Line 1455 of yacc.c  */
-#line 1399 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 159:
-
-/* Line 1455 of yacc.c  */
-#line 1403 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_POSITION;
-	;}
-    break;
-
-  case 160:
-
-/* Line 1455 of yacc.c  */
-#line 1407 "program_parse.y"
-    {
-	   if (!state->ctx->Extensions.EXT_point_parameters) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "GL_ARB_point_parameters not supported");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = STATE_ATTENUATION;
-	;}
-    break;
-
-  case 161:
-
-/* Line 1455 of yacc.c  */
-#line 1416 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 162:
-
-/* Line 1455 of yacc.c  */
-#line 1420 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_HALF_VECTOR;
-	;}
-    break;
-
-  case 163:
-
-/* Line 1455 of yacc.c  */
-#line 1426 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_SPOT_DIRECTION;
-	;}
-    break;
-
-  case 164:
-
-/* Line 1455 of yacc.c  */
-#line 1432 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(2) - (2)].state)[0];
-	   (yyval.state)[1] = (yyvsp[(2) - (2)].state)[1];
-	;}
-    break;
-
-  case 165:
-
-/* Line 1455 of yacc.c  */
-#line 1439 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_LIGHTMODEL_AMBIENT;
-	;}
-    break;
-
-  case 166:
-
-/* Line 1455 of yacc.c  */
-#line 1444 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_LIGHTMODEL_SCENECOLOR;
-	   (yyval.state)[1] = (yyvsp[(1) - (2)].integer);
-	;}
-    break;
-
-  case 167:
-
-/* Line 1455 of yacc.c  */
-#line 1452 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_LIGHTPROD;
-	   (yyval.state)[1] = (yyvsp[(3) - (6)].integer);
-	   (yyval.state)[2] = (yyvsp[(5) - (6)].integer);
-	   (yyval.state)[3] = (yyvsp[(6) - (6)].integer);
-	;}
-    break;
-
-  case 169:
-
-/* Line 1455 of yacc.c  */
-#line 1464 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = (yyvsp[(3) - (3)].integer);
-	   (yyval.state)[1] = (yyvsp[(2) - (3)].integer);
-	;}
-    break;
-
-  case 170:
-
-/* Line 1455 of yacc.c  */
-#line 1472 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXENV_COLOR;
-	;}
-    break;
-
-  case 171:
-
-/* Line 1455 of yacc.c  */
-#line 1478 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_AMBIENT;
-	;}
-    break;
-
-  case 172:
-
-/* Line 1455 of yacc.c  */
-#line 1482 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_DIFFUSE;
-	;}
-    break;
-
-  case 173:
-
-/* Line 1455 of yacc.c  */
-#line 1486 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_SPECULAR;
-	;}
-    break;
-
-  case 174:
-
-/* Line 1455 of yacc.c  */
-#line 1492 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxLights) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid light selector");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 175:
-
-/* Line 1455 of yacc.c  */
-#line 1503 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_TEXGEN;
-	   (yyval.state)[1] = (yyvsp[(2) - (4)].integer);
-	   (yyval.state)[2] = (yyvsp[(3) - (4)].integer) + (yyvsp[(4) - (4)].integer);
-	;}
-    break;
-
-  case 176:
-
-/* Line 1455 of yacc.c  */
-#line 1512 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 177:
-
-/* Line 1455 of yacc.c  */
-#line 1516 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_OBJECT_S;
-	;}
-    break;
-
-  case 178:
-
-/* Line 1455 of yacc.c  */
-#line 1521 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 179:
-
-/* Line 1455 of yacc.c  */
-#line 1525 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 180:
-
-/* Line 1455 of yacc.c  */
-#line 1529 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 181:
-
-/* Line 1455 of yacc.c  */
-#line 1533 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
-	;}
-    break;
-
-  case 182:
-
-/* Line 1455 of yacc.c  */
-#line 1539 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 183:
-
-/* Line 1455 of yacc.c  */
-#line 1546 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_FOG_COLOR;
-	;}
-    break;
-
-  case 184:
-
-/* Line 1455 of yacc.c  */
-#line 1550 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_FOG_PARAMS;
-	;}
-    break;
-
-  case 185:
-
-/* Line 1455 of yacc.c  */
-#line 1556 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_CLIPPLANE;
-	   (yyval.state)[1] = (yyvsp[(3) - (5)].integer);
-	;}
-    break;
-
-  case 186:
-
-/* Line 1455 of yacc.c  */
-#line 1564 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxClipPlanes) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid clip plane selector");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 187:
-
-/* Line 1455 of yacc.c  */
-#line 1575 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 188:
-
-/* Line 1455 of yacc.c  */
-#line 1582 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_POINT_SIZE;
-	;}
-    break;
-
-  case 189:
-
-/* Line 1455 of yacc.c  */
-#line 1586 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_POINT_ATTENUATION;
-	;}
-    break;
-
-  case 190:
-
-/* Line 1455 of yacc.c  */
-#line 1592 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(1) - (5)].state)[0];
-	   (yyval.state)[1] = (yyvsp[(1) - (5)].state)[1];
-	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);
-	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);
-	   (yyval.state)[4] = (yyvsp[(1) - (5)].state)[2];
-	;}
-    break;
-
-  case 191:
-
-/* Line 1455 of yacc.c  */
-#line 1602 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(1) - (2)].state)[0];
-	   (yyval.state)[1] = (yyvsp[(1) - (2)].state)[1];
-	   (yyval.state)[2] = (yyvsp[(2) - (2)].state)[2];
-	   (yyval.state)[3] = (yyvsp[(2) - (2)].state)[3];
-	   (yyval.state)[4] = (yyvsp[(1) - (2)].state)[2];
-	;}
-    break;
-
-  case 192:
-
-/* Line 1455 of yacc.c  */
-#line 1612 "program_parse.y"
-    {
-	   (yyval.state)[2] = 0;
-	   (yyval.state)[3] = 3;
-	;}
-    break;
-
-  case 193:
-
-/* Line 1455 of yacc.c  */
-#line 1617 "program_parse.y"
-    {
-	   /* 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 ((yyvsp[(3) - (6)].integer) > (yyvsp[(5) - (6)].integer)) {
-	      yyerror(& (yylsp[(3) - (6)]), state, "invalid matrix row range");
-	      YYERROR;
-	   }
-
-	   (yyval.state)[2] = (yyvsp[(3) - (6)].integer);
-	   (yyval.state)[3] = (yyvsp[(5) - (6)].integer);
-	;}
-    break;
-
-  case 194:
-
-/* Line 1455 of yacc.c  */
-#line 1635 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(2) - (3)].state)[0];
-	   (yyval.state)[1] = (yyvsp[(2) - (3)].state)[1];
-	   (yyval.state)[2] = (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 195:
-
-/* Line 1455 of yacc.c  */
-#line 1643 "program_parse.y"
-    {
-	   (yyval.integer) = 0;
-	;}
-    break;
-
-  case 196:
-
-/* Line 1455 of yacc.c  */
-#line 1647 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 197:
-
-/* Line 1455 of yacc.c  */
-#line 1653 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_MATRIX_INVERSE;
-	;}
-    break;
-
-  case 198:
-
-/* Line 1455 of yacc.c  */
-#line 1657 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_MATRIX_TRANSPOSE;
-	;}
-    break;
-
-  case 199:
-
-/* Line 1455 of yacc.c  */
-#line 1661 "program_parse.y"
-    {
-	   (yyval.integer) = STATE_MATRIX_INVTRANS;
-	;}
-    break;
-
-  case 200:
-
-/* Line 1455 of yacc.c  */
-#line 1667 "program_parse.y"
-    {
-	   if ((yyvsp[(1) - (1)].integer) > 3) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid matrix row reference");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 201:
-
-/* Line 1455 of yacc.c  */
-#line 1678 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_MODELVIEW_MATRIX;
-	   (yyval.state)[1] = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 202:
-
-/* Line 1455 of yacc.c  */
-#line 1683 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_PROJECTION_MATRIX;
-	   (yyval.state)[1] = 0;
-	;}
-    break;
-
-  case 203:
-
-/* Line 1455 of yacc.c  */
-#line 1688 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_MVP_MATRIX;
-	   (yyval.state)[1] = 0;
-	;}
-    break;
-
-  case 204:
-
-/* Line 1455 of yacc.c  */
-#line 1693 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_TEXTURE_MATRIX;
-	   (yyval.state)[1] = (yyvsp[(2) - (2)].integer);
-	;}
-    break;
-
-  case 205:
-
-/* Line 1455 of yacc.c  */
-#line 1698 "program_parse.y"
-    {
-	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
-	   YYERROR;
-	;}
-    break;
-
-  case 206:
-
-/* Line 1455 of yacc.c  */
-#line 1703 "program_parse.y"
-    {
-	   (yyval.state)[0] = STATE_PROGRAM_MATRIX;
-	   (yyval.state)[1] = (yyvsp[(3) - (4)].integer);
-	;}
-    break;
-
-  case 207:
-
-/* Line 1455 of yacc.c  */
-#line 1710 "program_parse.y"
-    {
-	   (yyval.integer) = 0;
-	;}
-    break;
-
-  case 208:
-
-/* Line 1455 of yacc.c  */
-#line 1714 "program_parse.y"
-    {
-	   (yyval.integer) = (yyvsp[(2) - (3)].integer);
-	;}
-    break;
-
-  case 209:
-
-/* Line 1455 of yacc.c  */
-#line 1719 "program_parse.y"
-    {
-	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix
-	    * zero is valid.
-	    */
-	   if ((yyvsp[(1) - (1)].integer) != 0) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid modelview matrix index");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 210:
-
-/* Line 1455 of yacc.c  */
-#line 1732 "program_parse.y"
-    {
-	   /* Since GL_ARB_matrix_palette isn't supported, just let any value
-	    * through here.  The error will be generated later.
-	    */
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 211:
-
-/* Line 1455 of yacc.c  */
-#line 1740 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxProgramMatrices) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program matrix selector");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 212:
-
-/* Line 1455 of yacc.c  */
-#line 1751 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = STATE_DEPTH_RANGE;
-	;}
-    break;
-
-  case 217:
-
-/* Line 1455 of yacc.c  */
-#line 1763 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = state->state_param_enum;
-	   (yyval.state)[1] = STATE_ENV;
-	   (yyval.state)[2] = (yyvsp[(4) - (5)].state)[0];
-	   (yyval.state)[3] = (yyvsp[(4) - (5)].state)[1];
-	;}
-    break;
-
-  case 218:
-
-/* Line 1455 of yacc.c  */
-#line 1773 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(1) - (1)].integer);
-	   (yyval.state)[1] = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 219:
-
-/* Line 1455 of yacc.c  */
-#line 1778 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(1) - (3)].integer);
-	   (yyval.state)[1] = (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 220:
-
-/* Line 1455 of yacc.c  */
-#line 1785 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = state->state_param_enum;
-	   (yyval.state)[1] = STATE_ENV;
-	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);
-	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);
-	;}
-    break;
-
-  case 221:
-
-/* Line 1455 of yacc.c  */
-#line 1795 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = state->state_param_enum;
-	   (yyval.state)[1] = STATE_LOCAL;
-	   (yyval.state)[2] = (yyvsp[(4) - (5)].state)[0];
-	   (yyval.state)[3] = (yyvsp[(4) - (5)].state)[1];
-	;}
-    break;
-
-  case 222:
-
-/* Line 1455 of yacc.c  */
-#line 1804 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(1) - (1)].integer);
-	   (yyval.state)[1] = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 223:
-
-/* Line 1455 of yacc.c  */
-#line 1809 "program_parse.y"
-    {
-	   (yyval.state)[0] = (yyvsp[(1) - (3)].integer);
-	   (yyval.state)[1] = (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 224:
-
-/* Line 1455 of yacc.c  */
-#line 1816 "program_parse.y"
-    {
-	   memset((yyval.state), 0, sizeof((yyval.state)));
-	   (yyval.state)[0] = state->state_param_enum;
-	   (yyval.state)[1] = STATE_LOCAL;
-	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);
-	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);
-	;}
-    break;
-
-  case 225:
-
-/* Line 1455 of yacc.c  */
-#line 1826 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxEnvParams) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid environment parameter reference");
-	      YYERROR;
-	   }
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 226:
-
-/* Line 1455 of yacc.c  */
-#line 1836 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxLocalParams) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid local parameter reference");
-	      YYERROR;
-	   }
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 231:
-
-/* Line 1455 of yacc.c  */
-#line 1851 "program_parse.y"
-    {
-	   (yyval.vector).count = 4;
-	   (yyval.vector).data[0] = (yyvsp[(1) - (1)].real);
-	   (yyval.vector).data[1] = (yyvsp[(1) - (1)].real);
-	   (yyval.vector).data[2] = (yyvsp[(1) - (1)].real);
-	   (yyval.vector).data[3] = (yyvsp[(1) - (1)].real);
-	;}
-    break;
-
-  case 232:
-
-/* Line 1455 of yacc.c  */
-#line 1861 "program_parse.y"
-    {
-	   (yyval.vector).count = 1;
-	   (yyval.vector).data[0] = (yyvsp[(1) - (1)].real);
-	   (yyval.vector).data[1] = (yyvsp[(1) - (1)].real);
-	   (yyval.vector).data[2] = (yyvsp[(1) - (1)].real);
-	   (yyval.vector).data[3] = (yyvsp[(1) - (1)].real);
-	;}
-    break;
-
-  case 233:
-
-/* Line 1455 of yacc.c  */
-#line 1869 "program_parse.y"
-    {
-	   (yyval.vector).count = 1;
-	   (yyval.vector).data[0] = (float) (yyvsp[(1) - (1)].integer);
-	   (yyval.vector).data[1] = (float) (yyvsp[(1) - (1)].integer);
-	   (yyval.vector).data[2] = (float) (yyvsp[(1) - (1)].integer);
-	   (yyval.vector).data[3] = (float) (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 234:
-
-/* Line 1455 of yacc.c  */
-#line 1879 "program_parse.y"
-    {
-	   (yyval.vector).count = 4;
-	   (yyval.vector).data[0] = (yyvsp[(2) - (3)].real);
-	   (yyval.vector).data[1] = 0.0f;
-	   (yyval.vector).data[2] = 0.0f;
-	   (yyval.vector).data[3] = 1.0f;
-	;}
-    break;
-
-  case 235:
-
-/* Line 1455 of yacc.c  */
-#line 1887 "program_parse.y"
-    {
-	   (yyval.vector).count = 4;
-	   (yyval.vector).data[0] = (yyvsp[(2) - (5)].real);
-	   (yyval.vector).data[1] = (yyvsp[(4) - (5)].real);
-	   (yyval.vector).data[2] = 0.0f;
-	   (yyval.vector).data[3] = 1.0f;
-	;}
-    break;
-
-  case 236:
-
-/* Line 1455 of yacc.c  */
-#line 1896 "program_parse.y"
-    {
-	   (yyval.vector).count = 4;
-	   (yyval.vector).data[0] = (yyvsp[(2) - (7)].real);
-	   (yyval.vector).data[1] = (yyvsp[(4) - (7)].real);
-	   (yyval.vector).data[2] = (yyvsp[(6) - (7)].real);
-	   (yyval.vector).data[3] = 1.0f;
-	;}
-    break;
-
-  case 237:
-
-/* Line 1455 of yacc.c  */
-#line 1905 "program_parse.y"
-    {
-	   (yyval.vector).count = 4;
-	   (yyval.vector).data[0] = (yyvsp[(2) - (9)].real);
-	   (yyval.vector).data[1] = (yyvsp[(4) - (9)].real);
-	   (yyval.vector).data[2] = (yyvsp[(6) - (9)].real);
-	   (yyval.vector).data[3] = (yyvsp[(8) - (9)].real);
-	;}
-    break;
-
-  case 238:
-
-/* Line 1455 of yacc.c  */
-#line 1915 "program_parse.y"
-    {
-	   (yyval.real) = ((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].real) : (yyvsp[(2) - (2)].real);
-	;}
-    break;
-
-  case 239:
-
-/* Line 1455 of yacc.c  */
-#line 1919 "program_parse.y"
-    {
-	   (yyval.real) = (float)(((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].integer) : (yyvsp[(2) - (2)].integer));
-	;}
-    break;
-
-  case 240:
-
-/* Line 1455 of yacc.c  */
-#line 1924 "program_parse.y"
-    { (yyval.negate) = FALSE; ;}
-    break;
-
-  case 241:
-
-/* Line 1455 of yacc.c  */
-#line 1925 "program_parse.y"
-    { (yyval.negate) = TRUE;  ;}
-    break;
-
-  case 242:
-
-/* Line 1455 of yacc.c  */
-#line 1926 "program_parse.y"
-    { (yyval.negate) = FALSE; ;}
-    break;
-
-  case 243:
-
-/* Line 1455 of yacc.c  */
-#line 1929 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
-    break;
-
-  case 245:
-
-/* Line 1455 of yacc.c  */
-#line 1933 "program_parse.y"
-    {
-	   /* 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(& (yylsp[(1) - (1)]), state, "unexpected IDENTIFIER");
-	      YYERROR;
-	   }
-
-	   if (strcmp("SHORT", (yyvsp[(1) - (1)].string)) == 0) {
-	   } else if (strcmp("LONG", (yyvsp[(1) - (1)].string)) == 0) {
-	   } else {
-	      char *const err_str =
-		 make_error_string("invalid storage size specifier \"%s\"",
-				   (yyvsp[(1) - (1)].string));
-
-	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)
-		      ? err_str : "invalid storage size specifier");
-
-	      if (err_str != NULL) {
-		 free(err_str);
-	      }
-
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 246:
-
-/* Line 1455 of yacc.c  */
-#line 1967 "program_parse.y"
-    {
-	;}
-    break;
-
-  case 247:
-
-/* Line 1455 of yacc.c  */
-#line 1971 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}
-    break;
-
-  case 249:
-
-/* Line 1455 of yacc.c  */
-#line 1975 "program_parse.y"
-    {
-	   if (!declare_variable(state, (yyvsp[(3) - (3)].string), (yyvsp[(0) - (3)].integer), & (yylsp[(3) - (3)]))) {
-	      free((yyvsp[(3) - (3)].string));
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 250:
-
-/* Line 1455 of yacc.c  */
-#line 1982 "program_parse.y"
-    {
-	   if (!declare_variable(state, (yyvsp[(1) - (1)].string), (yyvsp[(0) - (1)].integer), & (yylsp[(1) - (1)]))) {
-	      free((yyvsp[(1) - (1)].string));
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 251:
-
-/* Line 1455 of yacc.c  */
-#line 1991 "program_parse.y"
-    {
-	   struct asm_symbol *const s =
-	      declare_variable(state, (yyvsp[(3) - (5)].string), at_output, & (yylsp[(3) - (5)]));
-
-	   if (s == NULL) {
-	      free((yyvsp[(3) - (5)].string));
-	      YYERROR;
-	   } else {
-	      s->output_binding = (yyvsp[(5) - (5)].result);
-	   }
-	;}
-    break;
-
-  case 252:
-
-/* Line 1455 of yacc.c  */
-#line 2005 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.result) = VERT_RESULT_HPOS;
-	   } else {
-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 253:
-
-/* Line 1455 of yacc.c  */
-#line 2014 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.result) = VERT_RESULT_FOGC;
-	   } else {
-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 254:
-
-/* Line 1455 of yacc.c  */
-#line 2023 "program_parse.y"
-    {
-	   (yyval.result) = (yyvsp[(2) - (2)].result);
-	;}
-    break;
-
-  case 255:
-
-/* Line 1455 of yacc.c  */
-#line 2027 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.result) = VERT_RESULT_PSIZ;
-	   } else {
-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 256:
-
-/* Line 1455 of yacc.c  */
-#line 2036 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.result) = VERT_RESULT_TEX0 + (yyvsp[(3) - (3)].integer);
-	   } else {
-	      yyerror(& (yylsp[(2) - (3)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 257:
-
-/* Line 1455 of yacc.c  */
-#line 2045 "program_parse.y"
-    {
-	   if (state->mode == ARB_fragment) {
-	      (yyval.result) = FRAG_RESULT_DEPTH;
-	   } else {
-	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 258:
-
-/* Line 1455 of yacc.c  */
-#line 2056 "program_parse.y"
-    {
-	   (yyval.result) = (yyvsp[(2) - (3)].integer) + (yyvsp[(3) - (3)].integer);
-	;}
-    break;
-
-  case 259:
-
-/* Line 1455 of yacc.c  */
-#line 2062 "program_parse.y"
-    {
-	   (yyval.integer) = (state->mode == ARB_vertex)
-	      ? VERT_RESULT_COL0
-	      : FRAG_RESULT_COLOR;
-	;}
-    break;
-
-  case 260:
-
-/* Line 1455 of yacc.c  */
-#line 2068 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.integer) = VERT_RESULT_COL0;
-	   } else {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 261:
-
-/* Line 1455 of yacc.c  */
-#line 2077 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.integer) = VERT_RESULT_BFC0;
-	   } else {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 262:
-
-/* Line 1455 of yacc.c  */
-#line 2088 "program_parse.y"
-    {
-	   (yyval.integer) = 0; 
-	;}
-    break;
-
-  case 263:
-
-/* Line 1455 of yacc.c  */
-#line 2092 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.integer) = 0;
-	   } else {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 264:
-
-/* Line 1455 of yacc.c  */
-#line 2101 "program_parse.y"
-    {
-	   if (state->mode == ARB_vertex) {
-	      (yyval.integer) = 1;
-	   } else {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");
-	      YYERROR;
-	   }
-	;}
-    break;
-
-  case 265:
-
-/* Line 1455 of yacc.c  */
-#line 2111 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 266:
-
-/* Line 1455 of yacc.c  */
-#line 2112 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 267:
-
-/* Line 1455 of yacc.c  */
-#line 2113 "program_parse.y"
-    { (yyval.integer) = 1; ;}
-    break;
-
-  case 268:
-
-/* Line 1455 of yacc.c  */
-#line 2116 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 269:
-
-/* Line 1455 of yacc.c  */
-#line 2117 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 270:
-
-/* Line 1455 of yacc.c  */
-#line 2118 "program_parse.y"
-    { (yyval.integer) = 1; ;}
-    break;
-
-  case 271:
-
-/* Line 1455 of yacc.c  */
-#line 2121 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 272:
-
-/* Line 1455 of yacc.c  */
-#line 2122 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
-    break;
-
-  case 273:
-
-/* Line 1455 of yacc.c  */
-#line 2125 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 274:
-
-/* Line 1455 of yacc.c  */
-#line 2126 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
-    break;
-
-  case 275:
-
-/* Line 1455 of yacc.c  */
-#line 2129 "program_parse.y"
-    { (yyval.integer) = 0; ;}
-    break;
-
-  case 276:
-
-/* Line 1455 of yacc.c  */
-#line 2130 "program_parse.y"
-    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
-    break;
-
-  case 277:
-
-/* Line 1455 of yacc.c  */
-#line 2134 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureCoordUnits) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture coordinate unit selector");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 278:
-
-/* Line 1455 of yacc.c  */
-#line 2145 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureImageUnits) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture image unit selector");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 279:
-
-/* Line 1455 of yacc.c  */
-#line 2156 "program_parse.y"
-    {
-	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureUnits) {
-	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture unit selector");
-	      YYERROR;
-	   }
-
-	   (yyval.integer) = (yyvsp[(1) - (1)].integer);
-	;}
-    break;
-
-  case 280:
-
-/* Line 1455 of yacc.c  */
-#line 2167 "program_parse.y"
-    {
-	   struct asm_symbol *exist = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(2) - (4)].string));
-	   struct asm_symbol *target = (struct asm_symbol *)
-	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(4) - (4)].string));
-
-	   free((yyvsp[(4) - (4)].string));
-
-	   if (exist != NULL) {
-	      char m[1000];
-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));
-	      free((yyvsp[(2) - (4)].string));
-	      yyerror(& (yylsp[(2) - (4)]), state, m);
-	      YYERROR;
-	   } else if (target == NULL) {
-	      free((yyvsp[(2) - (4)].string));
-	      yyerror(& (yylsp[(4) - (4)]), state,
-		      "undefined variable binding in ALIAS statement");
-	      YYERROR;
-	   } else {
-	      _mesa_symbol_table_add_symbol(state->st, 0, (yyvsp[(2) - (4)].string), target);
-	   }
-	;}
-    break;
-
-
-
-/* Line 1455 of yacc.c  */
-#line 4938 "program_parse.tab.c"
-      default: break;
-    }
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-  *++yylsp = yyloc;
-
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (&yylloc, state, YY_("syntax error"));
-#else
-      {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (&yylloc, state, yymsg);
-	  }
-	else
-	  {
-	    yyerror (&yylloc, state, YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
-      }
-#endif
-    }
-
-  yyerror_range[0] = yylloc;
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
-
-      if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
-      else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval, &yylloc, state);
-	  yychar = YYEMPTY;
-	}
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  yyerror_range[0] = yylsp[1-yylen];
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
-
-      yyerror_range[0] = *yylsp;
-      yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp, yylsp, state);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  *++yyvsp = yylval;
-
-  yyerror_range[1] = yylloc;
-  /* Using YYLLOC is tempting, but would change the location of
-     the lookahead.  YYLOC is available though.  */
-  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
-  *++yylsp = yyloc;
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#if !defined(yyoverflow) || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (&yylloc, state, YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval, &yylloc, state);
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp, yylsp, state);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
-}
-
-
-
-/* Line 1675 of yacc.c  */
-#line 2196 "program_parse.y"
-
-
-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(GLcontext *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;
-}
-
+

+/* A Bison parser, made by GNU Bison 2.4.1.  */

+

+/* Skeleton implementation for Bison's Yacc-like parsers in C

+   

+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006

+   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */

+

+/* As a special exception, you may create a larger work that contains

+   part or all of the Bison parser skeleton and distribute that work

+   under terms of your choice, so long as that work isn't itself a

+   parser generator using the skeleton or a modified version thereof

+   as a parser skeleton.  Alternatively, if you modify or redistribute

+   the parser skeleton itself, you may (at your option) remove this

+   special exception, which will cause the skeleton and the resulting

+   Bison output files to be licensed under the GNU General Public

+   License without this special exception.

+   

+   This special exception was added by the Free Software Foundation in

+   version 2.2 of Bison.  */

+

+/* C LALR(1) parser skeleton written by Richard Stallman, by

+   simplifying the original so-called "semantic" parser.  */

+

+/* All symbols defined below should begin with yy or YY, to avoid

+   infringing on user name space.  This should be done even for local

+   variables, as they might otherwise be expanded by user macros.

+   There are some unavoidable exceptions within include files to

+   define necessary library symbols; they are noted "INFRINGES ON

+   USER NAME SPACE" below.  */

+

+/* Identify Bison output.  */

+#define YYBISON 1

+

+/* Bison version.  */

+#define YYBISON_VERSION "2.4.1"

+

+/* Skeleton name.  */

+#define YYSKELETON_NAME "yacc.c"

+

+/* Pure parsers.  */

+#define YYPURE 1

+

+/* Push parsers.  */

+#define YYPUSH 0

+

+/* Pull parsers.  */

+#define YYPULL 1

+

+/* Using locations.  */

+#define YYLSP_NEEDED 1

+

+

+

+/* Copy the first part of user declarations.  */

+

+/* Line 189 of yacc.c  */

+#line 1 "program_parse.y"

+

+/*

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

+

+

+/* Line 189 of yacc.c  */

+#line 193 "program_parse.tab.c"

+

+/* Enabling traces.  */

+#ifndef YYDEBUG

+# define YYDEBUG 0

+#endif

+

+/* Enabling verbose error messages.  */

+#ifdef YYERROR_VERBOSE

+# undef YYERROR_VERBOSE

+# define YYERROR_VERBOSE 1

+#else

+# define YYERROR_VERBOSE 1

+#endif

+

+/* Enabling the token table.  */

+#ifndef YYTOKEN_TABLE

+# define YYTOKEN_TABLE 0

+#endif

+

+

+/* Tokens.  */

+#ifndef YYTOKENTYPE

+# define YYTOKENTYPE

+   /* Put the tokens into the symbol table, so that GDB and other debuggers

+      know about them.  */

+   enum yytokentype {

+     ARBvp_10 = 258,

+     ARBfp_10 = 259,

+     ADDRESS = 260,

+     ALIAS = 261,

+     ATTRIB = 262,

+     OPTION = 263,

+     OUTPUT = 264,

+     PARAM = 265,

+     TEMP = 266,

+     END = 267,

+     BIN_OP = 268,

+     BINSC_OP = 269,

+     SAMPLE_OP = 270,

+     SCALAR_OP = 271,

+     TRI_OP = 272,

+     VECTOR_OP = 273,

+     ARL = 274,

+     KIL = 275,

+     SWZ = 276,

+     TXD_OP = 277,

+     INTEGER = 278,

+     REAL = 279,

+     AMBIENT = 280,

+     ATTENUATION = 281,

+     BACK = 282,

+     CLIP = 283,

+     COLOR = 284,

+     DEPTH = 285,

+     DIFFUSE = 286,

+     DIRECTION = 287,

+     EMISSION = 288,

+     ENV = 289,

+     EYE = 290,

+     FOG = 291,

+     FOGCOORD = 292,

+     FRAGMENT = 293,

+     FRONT = 294,

+     HALF = 295,

+     INVERSE = 296,

+     INVTRANS = 297,

+     LIGHT = 298,

+     LIGHTMODEL = 299,

+     LIGHTPROD = 300,

+     LOCAL = 301,

+     MATERIAL = 302,

+     MAT_PROGRAM = 303,

+     MATRIX = 304,

+     MATRIXINDEX = 305,

+     MODELVIEW = 306,

+     MVP = 307,

+     NORMAL = 308,

+     OBJECT = 309,

+     PALETTE = 310,

+     PARAMS = 311,

+     PLANE = 312,

+     POINT_TOK = 313,

+     POINTSIZE = 314,

+     POSITION = 315,

+     PRIMARY = 316,

+     PROGRAM = 317,

+     PROJECTION = 318,

+     RANGE = 319,

+     RESULT = 320,

+     ROW = 321,

+     SCENECOLOR = 322,

+     SECONDARY = 323,

+     SHININESS = 324,

+     SIZE_TOK = 325,

+     SPECULAR = 326,

+     SPOT = 327,

+     STATE = 328,

+     TEXCOORD = 329,

+     TEXENV = 330,

+     TEXGEN = 331,

+     TEXGEN_Q = 332,

+     TEXGEN_R = 333,

+     TEXGEN_S = 334,

+     TEXGEN_T = 335,

+     TEXTURE = 336,

+     TRANSPOSE = 337,

+     TEXTURE_UNIT = 338,

+     TEX_1D = 339,

+     TEX_2D = 340,

+     TEX_3D = 341,

+     TEX_CUBE = 342,

+     TEX_RECT = 343,

+     TEX_SHADOW1D = 344,

+     TEX_SHADOW2D = 345,

+     TEX_SHADOWRECT = 346,

+     TEX_ARRAY1D = 347,

+     TEX_ARRAY2D = 348,

+     TEX_ARRAYSHADOW1D = 349,

+     TEX_ARRAYSHADOW2D = 350,

+     VERTEX = 351,

+     VTXATTRIB = 352,

+     WEIGHT = 353,

+     IDENTIFIER = 354,

+     USED_IDENTIFIER = 355,

+     MASK4 = 356,

+     MASK3 = 357,

+     MASK2 = 358,

+     MASK1 = 359,

+     SWIZZLE = 360,

+     DOT_DOT = 361,

+     DOT = 362

+   };

+#endif

+

+

+

+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

+typedef union YYSTYPE

+{

+

+/* Line 214 of yacc.c  */

+#line 126 "program_parse.y"

+

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

+

+

+

+/* Line 214 of yacc.c  */

+#line 364 "program_parse.tab.c"

+} YYSTYPE;

+# define YYSTYPE_IS_TRIVIAL 1

+# define yystype YYSTYPE /* obsolescent; will be withdrawn */

+# define YYSTYPE_IS_DECLARED 1

+#endif

+

+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED

+typedef struct YYLTYPE

+{

+  int first_line;

+  int first_column;

+  int last_line;

+  int last_column;

+} YYLTYPE;

+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */

+# define YYLTYPE_IS_DECLARED 1

+# define YYLTYPE_IS_TRIVIAL 1

+#endif

+

+

+/* Copy the second part of user declarations.  */

+

+/* Line 264 of yacc.c  */

+#line 271 "program_parse.y"

+

+extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,

+    void *yyscanner);

+

+

+/* Line 264 of yacc.c  */

+#line 395 "program_parse.tab.c"

+

+#ifdef short

+# undef short

+#endif

+

+#ifdef YYTYPE_UINT8

+typedef YYTYPE_UINT8 yytype_uint8;

+#else

+typedef unsigned char yytype_uint8;

+#endif

+

+#ifdef YYTYPE_INT8

+typedef YYTYPE_INT8 yytype_int8;

+#elif (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+typedef signed char yytype_int8;

+#else

+typedef short int yytype_int8;

+#endif

+

+#ifdef YYTYPE_UINT16

+typedef YYTYPE_UINT16 yytype_uint16;

+#else

+typedef unsigned short int yytype_uint16;

+#endif

+

+#ifdef YYTYPE_INT16

+typedef YYTYPE_INT16 yytype_int16;

+#else

+typedef short int yytype_int16;

+#endif

+

+#ifndef YYSIZE_T

+# ifdef __SIZE_TYPE__

+#  define YYSIZE_T __SIZE_TYPE__

+# elif defined size_t

+#  define YYSIZE_T size_t

+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */

+#  define YYSIZE_T size_t

+# else

+#  define YYSIZE_T unsigned int

+# endif

+#endif

+

+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)

+

+#ifndef YY_

+# if YYENABLE_NLS

+#  if ENABLE_NLS

+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */

+#   define YY_(msgid) dgettext ("bison-runtime", msgid)

+#  endif

+# endif

+# ifndef YY_

+#  define YY_(msgid) msgid

+# endif

+#endif

+

+/* Suppress unused-variable warnings by "using" E.  */

+#if ! defined lint || defined __GNUC__

+# define YYUSE(e) ((void) (e))

+#else

+# define YYUSE(e) /* empty */

+#endif

+

+/* Identity function, used to suppress warnings about constant conditions.  */

+#ifndef lint

+# define YYID(n) (n)

+#else

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static int

+YYID (int yyi)

+#else

+static int

+YYID (yyi)

+    int yyi;

+#endif

+{

+  return yyi;

+}

+#endif

+

+#if ! defined yyoverflow || YYERROR_VERBOSE

+

+/* The parser invokes alloca or malloc; define the necessary symbols.  */

+

+# ifdef YYSTACK_USE_ALLOCA

+#  if YYSTACK_USE_ALLOCA

+#   ifdef __GNUC__

+#    define YYSTACK_ALLOC __builtin_alloca

+#   elif defined __BUILTIN_VA_ARG_INCR

+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */

+#   elif defined _AIX

+#    define YYSTACK_ALLOC __alloca

+#   elif defined _MSC_VER

+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */

+#    define alloca _alloca

+#   else

+#    define YYSTACK_ALLOC alloca

+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

+#     ifndef _STDLIB_H

+#      define _STDLIB_H 1

+#     endif

+#    endif

+#   endif

+#  endif

+# endif

+

+# ifdef YYSTACK_ALLOC

+   /* Pacify GCC's `empty if-body' warning.  */

+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))

+#  ifndef YYSTACK_ALLOC_MAXIMUM

+    /* The OS might guarantee only one guard page at the bottom of the stack,

+       and a page size can be as small as 4096 bytes.  So we cannot safely

+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number

+       to allow for a few compiler-allocated temporary stack slots.  */

+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */

+#  endif

+# else

+#  define YYSTACK_ALLOC YYMALLOC

+#  define YYSTACK_FREE YYFREE

+#  ifndef YYSTACK_ALLOC_MAXIMUM

+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM

+#  endif

+#  if (defined __cplusplus && ! defined _STDLIB_H \

+       && ! ((defined YYMALLOC || defined malloc) \

+	     && (defined YYFREE || defined free)))

+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

+#   ifndef _STDLIB_H

+#    define _STDLIB_H 1

+#   endif

+#  endif

+#  ifndef YYMALLOC

+#   define YYMALLOC malloc

+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */

+#   endif

+#  endif

+#  ifndef YYFREE

+#   define YYFREE free

+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+void free (void *); /* INFRINGES ON USER NAME SPACE */

+#   endif

+#  endif

+# endif

+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */

+

+

+#if (! defined yyoverflow \

+     && (! defined __cplusplus \

+	 || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \

+	     && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))

+

+/* A type that is properly aligned for any stack member.  */

+union yyalloc

+{

+  yytype_int16 yyss_alloc;

+  YYSTYPE yyvs_alloc;

+  YYLTYPE yyls_alloc;

+};

+

+/* The size of the maximum gap between one aligned stack and the next.  */

+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)

+

+/* The size of an array large to enough to hold all stacks, each with

+   N elements.  */

+# define YYSTACK_BYTES(N) \

+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \

+      + 2 * YYSTACK_GAP_MAXIMUM)

+

+/* Copy COUNT objects from FROM to TO.  The source and destination do

+   not overlap.  */

+# ifndef YYCOPY

+#  if defined __GNUC__ && 1 < __GNUC__

+#   define YYCOPY(To, From, Count) \

+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))

+#  else

+#   define YYCOPY(To, From, Count)		\

+      do					\

+	{					\

+	  YYSIZE_T yyi;				\

+	  for (yyi = 0; yyi < (Count); yyi++)	\

+	    (To)[yyi] = (From)[yyi];		\

+	}					\

+      while (YYID (0))

+#  endif

+# endif

+

+/* Relocate STACK from its old location to the new one.  The

+   local variables YYSIZE and YYSTACKSIZE give the old and new number of

+   elements in the stack, and YYPTR gives the new location of the

+   stack.  Advance YYPTR to a properly aligned location for the next

+   stack.  */

+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\

+    do									\

+      {									\

+	YYSIZE_T yynewbytes;						\

+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\

+	Stack = &yyptr->Stack_alloc;					\

+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \

+	yyptr += yynewbytes / sizeof (*yyptr);				\

+      }									\

+    while (YYID (0))

+

+#endif

+

+/* YYFINAL -- State number of the termination state.  */

+#define YYFINAL  5

+/* YYLAST -- Last index in YYTABLE.  */

+#define YYLAST   396

+

+/* YYNTOKENS -- Number of terminals.  */

+#define YYNTOKENS  120

+/* YYNNTS -- Number of nonterminals.  */

+#define YYNNTS  143

+/* YYNRULES -- Number of rules.  */

+#define YYNRULES  282

+/* YYNRULES -- Number of states.  */

+#define YYNSTATES  475

+

+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

+#define YYUNDEFTOK  2

+#define YYMAXUTOK   362

+

+#define YYTRANSLATE(YYX)						\

+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

+

+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */

+static const yytype_uint8 yytranslate[] =

+{

+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+     115,   116,     2,   113,   109,   114,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,   108,

+       2,   117,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,   111,     2,   112,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,   118,   110,   119,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,

+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,

+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,

+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,

+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,

+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,

+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,

+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,

+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,

+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,

+     105,   106,   107

+};

+

+#if YYDEBUG

+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

+   YYRHS.  */

+static const yytype_uint16 yyprhs[] =

+{

+       0,     0,     3,     8,    10,    12,    15,    16,    20,    23,

+      24,    27,    30,    32,    34,    36,    38,    40,    42,    44,

+      46,    48,    50,    52,    54,    59,    64,    69,    76,    83,

+      92,   101,   104,   107,   120,   123,   125,   127,   129,   131,

+     133,   135,   137,   139,   141,   143,   145,   147,   154,   157,

+     162,   165,   167,   171,   177,   181,   184,   192,   195,   197,

+     199,   201,   203,   208,   210,   212,   214,   216,   218,   220,

+     222,   226,   227,   230,   233,   235,   237,   239,   241,   243,

+     245,   247,   249,   251,   252,   254,   256,   258,   260,   261,

+     265,   269,   270,   273,   276,   278,   280,   282,   284,   286,

+     288,   290,   292,   297,   300,   303,   305,   308,   310,   313,

+     315,   318,   323,   328,   330,   331,   335,   337,   339,   342,

+     344,   347,   349,   351,   355,   362,   363,   365,   368,   373,

+     375,   379,   381,   383,   385,   387,   389,   391,   393,   395,

+     397,   399,   402,   405,   408,   411,   414,   417,   420,   423,

+     426,   429,   432,   435,   439,   441,   443,   445,   451,   453,

+     455,   457,   460,   462,   464,   467,   469,   472,   479,   481,

+     485,   487,   489,   491,   493,   495,   500,   502,   504,   506,

+     508,   510,   512,   515,   517,   519,   525,   527,   530,   532,

+     534,   540,   543,   544,   551,   555,   556,   558,   560,   562,

+     564,   566,   569,   571,   573,   576,   581,   586,   587,   591,

+     593,   595,   597,   600,   602,   604,   606,   608,   614,   616,

+     620,   626,   632,   634,   638,   644,   646,   648,   650,   652,

+     654,   656,   658,   660,   662,   666,   672,   680,   690,   693,

+     696,   698,   700,   701,   702,   707,   709,   710,   711,   715,

+     719,   721,   727,   730,   733,   736,   739,   743,   746,   750,

+     751,   753,   755,   756,   758,   760,   761,   763,   765,   766,

+     768,   770,   771,   775,   776,   780,   781,   785,   787,   789,

+     791,   796,   798

+};

+

+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */

+static const yytype_int16 yyrhs[] =

+{

+     121,     0,    -1,   122,   123,   125,    12,    -1,     3,    -1,

+       4,    -1,   123,   124,    -1,    -1,     8,   262,   108,    -1,

+     125,   126,    -1,    -1,   127,   108,    -1,   170,   108,    -1,

+     128,    -1,   129,    -1,   130,    -1,   131,    -1,   132,    -1,

+     133,    -1,   134,    -1,   135,    -1,   141,    -1,   136,    -1,

+     137,    -1,   138,    -1,    19,   146,   109,   142,    -1,    18,

+     145,   109,   144,    -1,    16,   145,   109,   142,    -1,    14,

+     145,   109,   142,   109,   142,    -1,    13,   145,   109,   144,

+     109,   144,    -1,    17,   145,   109,   144,   109,   144,   109,

+     144,    -1,    15,   145,   109,   144,   109,   139,   109,   140,

+      -1,    20,   144,    -1,    20,   166,    -1,    22,   145,   109,

+     144,   109,   144,   109,   144,   109,   139,   109,   140,    -1,

+      83,   256,    -1,    84,    -1,    85,    -1,    86,    -1,    87,

+      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,

+      -1,    93,    -1,    94,    -1,    95,    -1,    21,   145,   109,

+     150,   109,   147,    -1,   241,   143,    -1,   241,   110,   143,

+     110,    -1,   150,   162,    -1,   238,    -1,   241,   150,   163,

+      -1,   241,   110,   150,   163,   110,    -1,   151,   164,   165,

+      -1,   159,   161,    -1,   148,   109,   148,   109,   148,   109,

+     148,    -1,   241,   149,    -1,    23,    -1,   262,    -1,   100,

+      -1,   172,    -1,   152,   111,   153,   112,    -1,   186,    -1,

+     249,    -1,   100,    -1,   100,    -1,   154,    -1,   155,    -1,

+      23,    -1,   159,   160,   156,    -1,    -1,   113,   157,    -1,

+     114,   158,    -1,    23,    -1,    23,    -1,   100,    -1,   104,

+      -1,   104,    -1,   104,    -1,   104,    -1,   101,    -1,   105,

+      -1,    -1,   101,    -1,   102,    -1,   103,    -1,   104,    -1,

+      -1,   115,   166,   116,    -1,   115,   167,   116,    -1,    -1,

+     168,   163,    -1,   169,   163,    -1,    99,    -1,   100,    -1,

+     171,    -1,   178,    -1,   242,    -1,   245,    -1,   248,    -1,

+     261,    -1,     7,    99,   117,   172,    -1,    96,   173,    -1,

+      38,   177,    -1,    60,    -1,    98,   175,    -1,    53,    -1,

+      29,   254,    -1,    37,    -1,    74,   255,    -1,    50,   111,

+     176,   112,    -1,    97,   111,   174,   112,    -1,    23,    -1,

+      -1,   111,   176,   112,    -1,    23,    -1,    60,    -1,    29,

+     254,    -1,    37,    -1,    74,   255,    -1,   179,    -1,   180,

+      -1,    10,    99,   182,    -1,    10,    99,   111,   181,   112,

+     183,    -1,    -1,    23,    -1,   117,   185,    -1,   117,   118,

+     184,   119,    -1,   187,    -1,   184,   109,   187,    -1,   189,

+      -1,   225,    -1,   235,    -1,   189,    -1,   225,    -1,   236,

+      -1,   188,    -1,   226,    -1,   235,    -1,   189,    -1,    73,

+     213,    -1,    73,   190,    -1,    73,   192,    -1,    73,   195,

+      -1,    73,   197,    -1,    73,   203,    -1,    73,   199,    -1,

+      73,   206,    -1,    73,   208,    -1,    73,   210,    -1,    73,

+     212,    -1,    73,   224,    -1,    47,   253,   191,    -1,   201,

+      -1,    33,    -1,    69,    -1,    43,   111,   202,   112,   193,

+      -1,   201,    -1,    60,    -1,    26,    -1,    72,   194,    -1,

+      40,    -1,    32,    -1,    44,   196,    -1,    25,    -1,   253,

+      67,    -1,    45,   111,   202,   112,   253,   198,    -1,   201,

+      -1,    75,   257,   200,    -1,    29,    -1,    25,    -1,    31,

+      -1,    71,    -1,    23,    -1,    76,   255,   204,   205,    -1,

+      35,    -1,    54,    -1,    79,    -1,    80,    -1,    78,    -1,

+      77,    -1,    36,   207,    -1,    29,    -1,    56,    -1,    28,

+     111,   209,   112,    57,    -1,    23,    -1,    58,   211,    -1,

+      70,    -1,    26,    -1,   215,    66,   111,   218,   112,    -1,

+     215,   214,    -1,    -1,    66,   111,   218,   106,   218,   112,

+      -1,    49,   219,   216,    -1,    -1,   217,    -1,    41,    -1,

+      82,    -1,    42,    -1,    23,    -1,    51,   220,    -1,    63,

+      -1,    52,    -1,    81,   255,    -1,    55,   111,   222,   112,

+      -1,    48,   111,   223,   112,    -1,    -1,   111,   221,   112,

+      -1,    23,    -1,    23,    -1,    23,    -1,    30,    64,    -1,

+     229,    -1,   232,    -1,   227,    -1,   230,    -1,    62,    34,

+     111,   228,   112,    -1,   233,    -1,   233,   106,   233,    -1,

+      62,    34,   111,   233,   112,    -1,    62,    46,   111,   231,

+     112,    -1,   234,    -1,   234,   106,   234,    -1,    62,    46,

+     111,   234,   112,    -1,    23,    -1,    23,    -1,   237,    -1,

+     239,    -1,   238,    -1,   239,    -1,   240,    -1,    24,    -1,

+      23,    -1,   118,   240,   119,    -1,   118,   240,   109,   240,

+     119,    -1,   118,   240,   109,   240,   109,   240,   119,    -1,

+     118,   240,   109,   240,   109,   240,   109,   240,   119,    -1,

+     241,    24,    -1,   241,    23,    -1,   113,    -1,   114,    -1,

+      -1,    -1,   244,    11,   243,   247,    -1,   262,    -1,    -1,

+      -1,     5,   246,   247,    -1,   247,   109,    99,    -1,    99,

+      -1,   244,     9,    99,   117,   249,    -1,    65,    60,    -1,

+      65,    37,    -1,    65,   250,    -1,    65,    59,    -1,    65,

+      74,   255,    -1,    65,    30,    -1,    29,   251,   252,    -1,

+      -1,    39,    -1,    27,    -1,    -1,    61,    -1,    68,    -1,

+      -1,    39,    -1,    27,    -1,    -1,    61,    -1,    68,    -1,

+      -1,   111,   258,   112,    -1,    -1,   111,   259,   112,    -1,

+      -1,   111,   260,   112,    -1,    23,    -1,    23,    -1,    23,

+      -1,     6,    99,   117,   100,    -1,    99,    -1,   100,    -1

+};

+

+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */

+static const yytype_uint16 yyrline[] =

+{

+       0,   278,   278,   281,   289,   301,   302,   305,   329,   330,

+     333,   348,   351,   356,   363,   364,   365,   366,   367,   368,

+     369,   372,   373,   374,   377,   383,   389,   395,   402,   408,

+     415,   459,   464,   474,   518,   524,   525,   526,   527,   528,

+     529,   530,   531,   532,   533,   534,   535,   538,   550,   558,

+     575,   582,   601,   612,   632,   657,   664,   697,   704,   719,

+     774,   817,   826,   848,   858,   862,   891,   910,   910,   912,

+     919,   931,   932,   933,   936,   950,   964,   984,   995,  1007,

+    1009,  1010,  1011,  1012,  1015,  1015,  1015,  1015,  1016,  1019,

+    1023,  1028,  1035,  1042,  1049,  1072,  1095,  1096,  1097,  1098,

+    1099,  1100,  1103,  1122,  1126,  1132,  1136,  1140,  1144,  1153,

+    1162,  1166,  1171,  1177,  1188,  1188,  1189,  1191,  1195,  1199,

+    1203,  1209,  1209,  1211,  1229,  1255,  1258,  1269,  1275,  1281,

+    1282,  1289,  1295,  1301,  1309,  1315,  1321,  1329,  1335,  1341,

+    1349,  1350,  1353,  1354,  1355,  1356,  1357,  1358,  1359,  1360,

+    1361,  1362,  1363,  1366,  1375,  1379,  1383,  1389,  1398,  1402,

+    1406,  1415,  1419,  1425,  1431,  1438,  1443,  1451,  1461,  1463,

+    1471,  1477,  1481,  1485,  1491,  1502,  1511,  1515,  1520,  1524,

+    1528,  1532,  1538,  1545,  1549,  1555,  1563,  1574,  1581,  1585,

+    1591,  1601,  1612,  1616,  1634,  1643,  1646,  1652,  1656,  1660,

+    1666,  1677,  1682,  1687,  1692,  1697,  1702,  1710,  1713,  1718,

+    1731,  1739,  1750,  1758,  1758,  1760,  1760,  1762,  1772,  1777,

+    1784,  1794,  1803,  1808,  1815,  1825,  1835,  1847,  1847,  1848,

+    1848,  1850,  1860,  1868,  1878,  1886,  1894,  1903,  1914,  1918,

+    1924,  1925,  1926,  1929,  1929,  1932,  1967,  1971,  1971,  1974,

+    1981,  1990,  2004,  2013,  2022,  2026,  2035,  2044,  2055,  2062,

+    2067,  2076,  2088,  2091,  2100,  2111,  2112,  2113,  2116,  2117,

+    2118,  2121,  2122,  2125,  2126,  2129,  2130,  2133,  2144,  2155,

+    2166,  2192,  2193

+};

+#endif

+

+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE

+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */

+static const char *const yytname[] =

+{

+  "$end", "error", "$undefined", "ARBvp_10", "ARBfp_10", "ADDRESS",

+  "ALIAS", "ATTRIB", "OPTION", "OUTPUT", "PARAM", "TEMP", "END", "BIN_OP",

+  "BINSC_OP", "SAMPLE_OP", "SCALAR_OP", "TRI_OP", "VECTOR_OP", "ARL",

+  "KIL", "SWZ", "TXD_OP", "INTEGER", "REAL", "AMBIENT", "ATTENUATION",

+  "BACK", "CLIP", "COLOR", "DEPTH", "DIFFUSE", "DIRECTION", "EMISSION",

+  "ENV", "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE",

+  "INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL",

+  "MAT_PROGRAM", "MATRIX", "MATRIXINDEX", "MODELVIEW", "MVP", "NORMAL",

+  "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT_TOK", "POINTSIZE",

+  "POSITION", "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW",

+  "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE_TOK", "SPECULAR", "SPOT",

+  "STATE", "TEXCOORD", "TEXENV", "TEXGEN", "TEXGEN_Q", "TEXGEN_R",

+  "TEXGEN_S", "TEXGEN_T", "TEXTURE", "TRANSPOSE", "TEXTURE_UNIT", "TEX_1D",

+  "TEX_2D", "TEX_3D", "TEX_CUBE", "TEX_RECT", "TEX_SHADOW1D",

+  "TEX_SHADOW2D", "TEX_SHADOWRECT", "TEX_ARRAY1D", "TEX_ARRAY2D",

+  "TEX_ARRAYSHADOW1D", "TEX_ARRAYSHADOW2D", "VERTEX", "VTXATTRIB",

+  "WEIGHT", "IDENTIFIER", "USED_IDENTIFIER", "MASK4", "MASK3", "MASK2",

+  "MASK1", "SWIZZLE", "DOT_DOT", "DOT", "';'", "','", "'|'", "'['", "']'",

+  "'+'", "'-'", "'('", "')'", "'='", "'{'", "'}'", "$accept", "program",

+  "language", "optionSequence", "option", "statementSequence", "statement",

+  "instruction", "ALU_instruction", "TexInstruction", "ARL_instruction",

+  "VECTORop_instruction", "SCALARop_instruction", "BINSCop_instruction",

+  "BINop_instruction", "TRIop_instruction", "SAMPLE_instruction",

+  "KIL_instruction", "TXD_instruction", "texImageUnit", "texTarget",

+  "SWZ_instruction", "scalarSrcReg", "scalarUse", "swizzleSrcReg",

+  "maskedDstReg", "maskedAddrReg", "extendedSwizzle", "extSwizComp",

+  "extSwizSel", "srcReg", "dstReg", "progParamArray", "progParamArrayMem",

+  "progParamArrayAbs", "progParamArrayRel", "addrRegRelOffset",

+  "addrRegPosOffset", "addrRegNegOffset", "addrReg", "addrComponent",

+  "addrWriteMask", "scalarSuffix", "swizzleSuffix", "optionalMask",

+  "optionalCcMask", "ccTest", "ccTest2", "ccMaskRule", "ccMaskRule2",

+  "namingStatement", "ATTRIB_statement", "attribBinding", "vtxAttribItem",

+  "vtxAttribNum", "vtxOptWeightNum", "vtxWeightNum", "fragAttribItem",

+  "PARAM_statement", "PARAM_singleStmt", "PARAM_multipleStmt",

+  "optArraySize", "paramSingleInit", "paramMultipleInit",

+  "paramMultInitList", "paramSingleItemDecl", "paramSingleItemUse",

+  "paramMultipleItem", "stateMultipleItem", "stateSingleItem",

+  "stateMaterialItem", "stateMatProperty", "stateLightItem",

+  "stateLightProperty", "stateSpotProperty", "stateLightModelItem",

+  "stateLModProperty", "stateLightProdItem", "stateLProdProperty",

+  "stateTexEnvItem", "stateTexEnvProperty", "ambDiffSpecProperty",

+  "stateLightNumber", "stateTexGenItem", "stateTexGenType",

+  "stateTexGenCoord", "stateFogItem", "stateFogProperty",

+  "stateClipPlaneItem", "stateClipPlaneNum", "statePointItem",

+  "statePointProperty", "stateMatrixRow", "stateMatrixRows",

+  "optMatrixRows", "stateMatrixItem", "stateOptMatModifier",

+  "stateMatModifier", "stateMatrixRowNum", "stateMatrixName",

+  "stateOptModMatNum", "stateModMatNum", "statePaletteMatNum",

+  "stateProgramMatNum", "stateDepthItem", "programSingleItem",

+  "programMultipleItem", "progEnvParams", "progEnvParamNums",

+  "progEnvParam", "progLocalParams", "progLocalParamNums",

+  "progLocalParam", "progEnvParamNum", "progLocalParamNum",

+  "paramConstDecl", "paramConstUse", "paramConstScalarDecl",

+  "paramConstScalarUse", "paramConstVector", "signedFloatConstant",

+  "optionalSign", "TEMP_statement", "@1", "optVarSize",

+  "ADDRESS_statement", "@2", "varNameList", "OUTPUT_statement",

+  "resultBinding", "resultColBinding", "optResultFaceType",

+  "optResultColorType", "optFaceType", "optColorType",

+  "optTexCoordUnitNum", "optTexImageUnitNum", "optLegacyTexUnitNum",

+  "texCoordUnitNum", "texImageUnitNum", "legacyTexUnitNum",

+  "ALIAS_statement", "string", 0

+};

+#endif

+

+# ifdef YYPRINT

+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to

+   token YYLEX-NUM.  */

+static const yytype_uint16 yytoknum[] =

+{

+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,

+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,

+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,

+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,

+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,

+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,

+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,

+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,

+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,

+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,

+     355,   356,   357,   358,   359,   360,   361,   362,    59,    44,

+     124,    91,    93,    43,    45,    40,    41,    61,   123,   125

+};

+# endif

+

+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

+static const yytype_uint16 yyr1[] =

+{

+       0,   120,   121,   122,   122,   123,   123,   124,   125,   125,

+     126,   126,   127,   127,   128,   128,   128,   128,   128,   128,

+     128,   129,   129,   129,   130,   131,   132,   133,   134,   135,

+     136,   137,   137,   138,   139,   140,   140,   140,   140,   140,

+     140,   140,   140,   140,   140,   140,   140,   141,   142,   142,

+     143,   143,   144,   144,   145,   146,   147,   148,   149,   149,

+     150,   150,   150,   150,   151,   151,   152,   153,   153,   154,

+     155,   156,   156,   156,   157,   158,   159,   160,   161,   162,

+     163,   163,   163,   163,   164,   164,   164,   164,   164,   165,

+     165,   165,   166,   167,   168,   169,   170,   170,   170,   170,

+     170,   170,   171,   172,   172,   173,   173,   173,   173,   173,

+     173,   173,   173,   174,   175,   175,   176,   177,   177,   177,

+     177,   178,   178,   179,   180,   181,   181,   182,   183,   184,

+     184,   185,   185,   185,   186,   186,   186,   187,   187,   187,

+     188,   188,   189,   189,   189,   189,   189,   189,   189,   189,

+     189,   189,   189,   190,   191,   191,   191,   192,   193,   193,

+     193,   193,   193,   194,   195,   196,   196,   197,   198,   199,

+     200,   201,   201,   201,   202,   203,   204,   204,   205,   205,

+     205,   205,   206,   207,   207,   208,   209,   210,   211,   211,

+     212,   213,   214,   214,   215,   216,   216,   217,   217,   217,

+     218,   219,   219,   219,   219,   219,   219,   220,   220,   221,

+     222,   223,   224,   225,   225,   226,   226,   227,   228,   228,

+     229,   230,   231,   231,   232,   233,   234,   235,   235,   236,

+     236,   237,   238,   238,   239,   239,   239,   239,   240,   240,

+     241,   241,   241,   243,   242,   244,   244,   246,   245,   247,

+     247,   248,   249,   249,   249,   249,   249,   249,   250,   251,

+     251,   251,   252,   252,   252,   253,   253,   253,   254,   254,

+     254,   255,   255,   256,   256,   257,   257,   258,   259,   260,

+     261,   262,   262

+};

+

+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

+static const yytype_uint8 yyr2[] =

+{

+       0,     2,     4,     1,     1,     2,     0,     3,     2,     0,

+       2,     2,     1,     1,     1,     1,     1,     1,     1,     1,

+       1,     1,     1,     1,     4,     4,     4,     6,     6,     8,

+       8,     2,     2,    12,     2,     1,     1,     1,     1,     1,

+       1,     1,     1,     1,     1,     1,     1,     6,     2,     4,

+       2,     1,     3,     5,     3,     2,     7,     2,     1,     1,

+       1,     1,     4,     1,     1,     1,     1,     1,     1,     1,

+       3,     0,     2,     2,     1,     1,     1,     1,     1,     1,

+       1,     1,     1,     0,     1,     1,     1,     1,     0,     3,

+       3,     0,     2,     2,     1,     1,     1,     1,     1,     1,

+       1,     1,     4,     2,     2,     1,     2,     1,     2,     1,

+       2,     4,     4,     1,     0,     3,     1,     1,     2,     1,

+       2,     1,     1,     3,     6,     0,     1,     2,     4,     1,

+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,

+       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,

+       2,     2,     2,     3,     1,     1,     1,     5,     1,     1,

+       1,     2,     1,     1,     2,     1,     2,     6,     1,     3,

+       1,     1,     1,     1,     1,     4,     1,     1,     1,     1,

+       1,     1,     2,     1,     1,     5,     1,     2,     1,     1,

+       5,     2,     0,     6,     3,     0,     1,     1,     1,     1,

+       1,     2,     1,     1,     2,     4,     4,     0,     3,     1,

+       1,     1,     2,     1,     1,     1,     1,     5,     1,     3,

+       5,     5,     1,     3,     5,     1,     1,     1,     1,     1,

+       1,     1,     1,     1,     3,     5,     7,     9,     2,     2,

+       1,     1,     0,     0,     4,     1,     0,     0,     3,     3,

+       1,     5,     2,     2,     2,     2,     3,     2,     3,     0,

+       1,     1,     0,     1,     1,     0,     1,     1,     0,     1,

+       1,     0,     3,     0,     3,     0,     3,     1,     1,     1,

+       4,     1,     1

+};

+

+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state

+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero

+   means the default is an error.  */

+static const yytype_uint16 yydefact[] =

+{

+       0,     3,     4,     0,     6,     1,     9,     0,     5,   246,

+     281,   282,     0,   247,     0,     0,     0,     2,     0,     0,

+       0,     0,     0,     0,     0,   242,     0,     0,     8,     0,

+      12,    13,    14,    15,    16,    17,    18,    19,    21,    22,

+      23,    20,     0,    96,    97,   121,   122,    98,     0,    99,

+     100,   101,   245,     7,     0,     0,     0,     0,     0,    65,

+       0,    88,    64,     0,     0,     0,     0,     0,    76,     0,

+       0,    94,   240,   241,    31,    32,    83,     0,     0,     0,

+      10,    11,     0,   243,   250,   248,     0,     0,   125,   242,

+     123,   259,   257,   253,   255,   252,   271,   254,   242,    84,

+      85,    86,    87,    91,   242,   242,   242,   242,   242,   242,

+      78,    55,    81,    80,    82,    92,   233,   232,     0,     0,

+       0,     0,    60,     0,   242,    83,     0,    61,    63,   134,

+     135,   213,   214,   136,   229,   230,     0,   242,     0,     0,

+       0,   280,   102,   126,     0,   127,   131,   132,   133,   227,

+     228,   231,     0,   261,   260,   262,     0,   256,     0,     0,

+      54,     0,     0,     0,    26,     0,    25,    24,   268,   119,

+     117,   271,   104,     0,     0,     0,     0,     0,     0,   265,

+       0,   265,     0,     0,   275,   271,   142,   143,   144,   145,

+     147,   146,   148,   149,   150,   151,     0,   152,   268,   109,

+       0,   107,   105,   271,     0,   114,   103,    83,     0,    52,

+       0,     0,     0,     0,   244,   249,     0,   239,   238,   263,

+     264,   258,   277,     0,   242,    95,     0,     0,    83,   242,

+       0,    48,     0,    51,     0,   242,   269,   270,   118,   120,

+       0,     0,     0,   212,   183,   184,   182,     0,   165,   267,

+     266,   164,     0,     0,     0,     0,   207,   203,     0,   202,

+     271,   195,   189,   188,   187,     0,     0,     0,     0,   108,

+       0,   110,     0,     0,   106,     0,   242,   234,    69,     0,

+      67,    68,     0,   242,   242,   251,     0,   124,   272,    28,

+      89,    90,    93,    27,     0,    79,    50,   273,     0,     0,

+     225,     0,   226,     0,   186,     0,   174,     0,   166,     0,

+     171,   172,   155,   156,   173,   153,   154,     0,     0,   201,

+       0,   204,   197,   199,   198,   194,   196,   279,     0,   170,

+     169,   176,   177,     0,     0,   116,     0,   113,     0,     0,

+      53,     0,    62,    77,    71,    47,     0,     0,     0,   242,

+      49,     0,    34,     0,   242,   220,   224,     0,     0,   265,

+     211,     0,   209,     0,   210,     0,   276,   181,   180,   178,

+     179,   175,   200,     0,   111,   112,   115,   242,   235,     0,

+       0,    70,   242,    58,    57,    59,   242,     0,     0,     0,

+     129,   137,   140,   138,   215,   216,   139,   278,     0,    35,

+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,

+      46,    30,    29,   185,   160,   162,   159,     0,   157,   158,

+       0,   206,   208,   205,   190,     0,    74,    72,    75,    73,

+       0,     0,     0,     0,   141,   192,   242,   128,   274,   163,

+     161,   167,   168,   242,   236,   242,     0,     0,     0,     0,

+     191,   130,     0,     0,     0,     0,   218,     0,   222,     0,

+     237,   242,     0,   217,     0,   221,     0,     0,    56,    33,

+     219,   223,     0,     0,   193

+};

+

+/* YYDEFGOTO[NTERM-NUM].  */

+static const yytype_int16 yydefgoto[] =

+{

+      -1,     3,     4,     6,     8,     9,    28,    29,    30,    31,

+      32,    33,    34,    35,    36,    37,    38,    39,    40,   298,

+     411,    41,   161,   231,    74,    60,    69,   345,   346,   384,

+     232,    61,   126,   279,   280,   281,   381,   427,   429,    70,

+     344,   111,   296,   115,   103,   160,    75,   227,    76,   228,

+      42,    43,   127,   206,   338,   274,   336,   172,    44,    45,

+      46,   144,    90,   287,   389,   145,   128,   390,   391,   129,

+     186,   315,   187,   418,   440,   188,   251,   189,   441,   190,

+     330,   316,   307,   191,   333,   371,   192,   246,   193,   305,

+     194,   264,   195,   434,   450,   196,   325,   326,   373,   261,

+     319,   363,   365,   361,   197,   130,   393,   394,   455,   131,

+     395,   457,   132,   301,   303,   396,   133,   149,   134,   135,

+     151,    77,    47,   139,    48,    49,    54,    85,    50,    62,

+      97,   155,   221,   252,   238,   157,   352,   266,   223,   398,

+     328,    51,    12

+};

+

+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

+   STATE-NUM.  */

+#define YYPACT_NINF -401

+static const yytype_int16 yypact[] =

+{

+     193,  -401,  -401,    27,  -401,  -401,    62,   143,  -401,    24,

+    -401,  -401,   -30,  -401,   -18,    12,    83,  -401,    15,    15,

+      15,    15,    15,    15,    67,    61,    15,    15,  -401,   127,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

+    -401,  -401,   144,  -401,  -401,  -401,  -401,  -401,   204,  -401,

+    -401,  -401,  -401,  -401,   155,   136,   138,    34,   140,  -401,

+     147,   108,  -401,   150,   156,   157,   158,   160,  -401,   162,

+     159,  -401,  -401,  -401,  -401,  -401,   102,   -13,   163,   164,

+    -401,  -401,   165,  -401,  -401,   166,   170,    10,   235,     0,

+    -401,   141,  -401,  -401,  -401,  -401,   167,  -401,   131,  -401,

+    -401,  -401,  -401,   168,   131,   131,   131,   131,   131,   131,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   104,    97,

+     114,    38,   169,    30,   131,   102,   171,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,  -401,  -401,    30,   131,   172,   155,

+     175,  -401,  -401,  -401,   173,  -401,  -401,  -401,  -401,  -401,

+    -401,  -401,   223,  -401,  -401,   123,   253,  -401,   177,   149,

+    -401,   178,   -10,   181,  -401,   182,  -401,  -401,   134,  -401,

+    -401,   167,  -401,   183,   184,   185,   213,    99,   186,   154,

+     187,   146,   153,     7,   188,   167,  -401,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,  -401,  -401,   215,  -401,   134,  -401,

+     190,  -401,  -401,   167,   191,   192,  -401,   102,   -48,  -401,

+       1,   195,   196,   214,   166,  -401,   189,  -401,  -401,  -401,

+    -401,  -401,  -401,   180,   131,  -401,   194,   197,   102,   131,

+      30,  -401,   203,   205,   201,   131,  -401,  -401,  -401,  -401,

+     285,   288,   289,  -401,  -401,  -401,  -401,   291,  -401,  -401,

+    -401,  -401,   248,   291,    33,   206,   207,  -401,   208,  -401,

+     167,    14,  -401,  -401,  -401,   293,   292,    92,   209,  -401,

+     299,  -401,   301,   299,  -401,   216,   131,  -401,  -401,   217,

+    -401,  -401,   221,   131,   131,  -401,   212,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,   218,  -401,  -401,   220,   224,   225,

+    -401,   226,  -401,   227,  -401,   228,  -401,   230,  -401,   231,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,   304,   309,  -401,

+     312,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   232,  -401,

+    -401,  -401,  -401,   161,   313,  -401,   233,  -401,   234,   238,

+    -401,    13,  -401,  -401,   137,  -401,   242,   -15,   243,     3,

+    -401,   314,  -401,   133,   131,  -401,  -401,   296,    94,   146,

+    -401,   245,  -401,   246,  -401,   247,  -401,  -401,  -401,  -401,

+    -401,  -401,  -401,   249,  -401,  -401,  -401,   131,  -401,   332,

+     337,  -401,   131,  -401,  -401,  -401,   131,   142,   114,    28,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   250,  -401,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,   331,  -401,  -401,

+      68,  -401,  -401,  -401,  -401,    43,  -401,  -401,  -401,  -401,

+     255,   256,   257,   258,  -401,   300,     3,  -401,  -401,  -401,

+    -401,  -401,  -401,   131,  -401,   131,   201,   285,   288,   259,

+    -401,  -401,   252,   264,   265,   263,   261,   266,   270,   313,

+    -401,   131,   133,  -401,   285,  -401,   288,    80,  -401,  -401,

+    -401,  -401,   313,   267,  -401

+};

+

+/* YYPGOTO[NTERM-NUM].  */

+static const yytype_int16 yypgoto[] =

+{

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   -69,

+     -82,  -401,  -100,   151,   -86,   210,  -401,  -401,  -366,  -401,

+     -54,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,   174,

+    -401,  -401,  -401,  -118,  -401,  -401,   229,  -401,  -401,  -401,

+    -401,  -401,   295,  -401,  -401,  -401,   110,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,   -51,  -401,   -88,

+    -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

+    -401,  -311,   139,  -401,  -401,  -401,  -401,  -401,  -401,  -401,

+    -401,  -401,  -401,  -401,  -401,    -2,  -401,  -401,  -400,  -401,

+    -401,  -401,  -401,  -401,  -401,   298,  -401,  -401,  -401,  -401,

+    -401,  -401,  -401,  -390,  -295,   302,  -401,  -401,  -136,   -87,

+    -120,   -89,  -401,  -401,  -401,  -401,  -401,   251,  -401,   176,

+    -401,  -401,  -401,  -176,   198,  -153,  -401,  -401,  -401,  -401,

+    -401,  -401,    -6

+};

+

+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

+   positive, shift that token.  If negative, reduce the rule which

+   number is the opposite.  If zero, do what YYDEFACT says.

+   If YYTABLE_NINF, syntax error.  */

+#define YYTABLE_NINF -230

+static const yytype_int16 yytable[] =

+{

+     152,   146,   150,    52,   208,   254,   164,   209,   383,   167,

+     116,   117,   158,   116,   117,   162,   430,   162,   239,   163,

+     162,   165,   166,   125,   278,   118,   233,     5,   118,    13,

+      14,    15,   267,   262,    16,   152,    17,    18,    19,    20,

+      21,    22,    23,    24,    25,    26,    27,   419,   118,   119,

+     271,   212,   119,   116,   117,   322,   323,   456,   310,   467,

+     120,   276,   119,   120,   311,   387,   312,   198,   118,   207,

+       7,   277,   473,   120,   470,   199,   388,   263,    53,   453,

+      58,    55,   211,   121,    10,    11,   121,   122,   200,   275,

+     122,   201,   119,   310,   233,   468,   324,   123,   202,   311,

+     230,    68,   313,   120,   314,   124,   121,   321,   124,   442,

+     292,    56,   203,    72,    73,    59,    72,    73,   124,   310,

+     414,   124,   377,    10,    11,   311,   121,   331,   244,   293,

+     122,   173,   378,   168,   415,   204,   205,   436,   289,   314,

+     162,   169,   175,   174,   176,    88,   332,   437,   124,   299,

+     177,    89,   443,   458,   416,   245,   341,   178,   179,   180,

+      71,   181,   444,   182,   170,   314,   417,    68,   153,    91,

+      92,   471,   183,   249,    72,    73,   432,    93,   171,   248,

+     154,   249,    57,   420,   219,   250,   472,   152,   433,   184,

+     185,   220,   424,   250,   347,   236,     1,     2,   348,    94,

+      95,   255,   237,   112,   256,   257,   113,   114,   258,    99,

+     100,   101,   102,    82,    96,    83,   259,   399,   400,   401,

+     402,   403,   404,   405,   406,   407,   408,   409,   410,    63,

+      64,    65,    66,    67,   260,    80,    78,    79,   367,   368,

+     369,   370,    10,    11,    72,    73,   217,   218,    71,   225,

+     379,   380,    81,    86,    84,    87,    98,   425,   143,   104,

+     152,   392,   150,   110,   138,   105,   106,   107,   412,   108,

+     141,   109,   136,   137,   215,   140,   222,   243,   156,    58,

+     -66,   268,   210,   159,   297,   216,   224,   229,   152,   213,

+     234,   235,   288,   347,   240,   241,   242,   247,   253,   265,

+     431,   270,   272,   273,   283,   284,   286,   295,   300,  -229,

+     290,   302,   304,   291,   306,   308,   327,   317,   318,   320,

+     334,   329,   335,   452,   337,   343,   340,   360,   350,   342,

+     349,   351,   362,   353,   354,   364,   372,   397,   355,   356,

+     357,   385,   358,   359,   366,   374,   375,   152,   392,   150,

+     376,   382,   386,   413,   152,   426,   347,   421,   422,   423,

+     428,   424,   438,   439,   445,   446,   449,   464,   447,   448,

+     459,   460,   347,   461,   462,   463,   466,   454,   465,   474,

+     469,   294,   142,   339,   282,   451,   435,   147,   226,   285,

+     214,   148,   309,     0,     0,     0,   269

+};

+

+static const yytype_int16 yycheck[] =

+{

+      89,    89,    89,     9,   124,   181,   106,   125,    23,   109,

+      23,    24,    98,    23,    24,   104,   382,   106,   171,   105,

+     109,   107,   108,    77,    23,    38,   162,     0,    38,     5,

+       6,     7,   185,    26,    10,   124,    12,    13,    14,    15,

+      16,    17,    18,    19,    20,    21,    22,   358,    38,    62,

+     203,   137,    62,    23,    24,    41,    42,   447,    25,   459,

+      73,   109,    62,    73,    31,    62,    33,    29,    38,   123,

+       8,   119,   472,    73,   464,    37,    73,    70,   108,   445,

+      65,    99,   136,    96,    99,   100,    96,   100,    50,   207,

+     100,    53,    62,    25,   230,   461,    82,   110,    60,    31,

+     110,   100,    69,    73,    71,   118,    96,   260,   118,   420,

+     228,    99,    74,   113,   114,   100,   113,   114,   118,    25,

+      26,   118,   109,    99,   100,    31,    96,    35,    29,   229,

+     100,    34,   119,    29,    40,    97,    98,   109,   224,    71,

+     229,    37,    28,    46,    30,   111,    54,   119,   118,   235,

+      36,   117,   109,   448,    60,    56,   276,    43,    44,    45,

+      99,    47,   119,    49,    60,    71,    72,   100,    27,    29,

+      30,   466,    58,    27,   113,   114,    34,    37,    74,    25,

+      39,    27,    99,   359,    61,    39,   106,   276,    46,    75,

+      76,    68,   112,    39,   283,    61,     3,     4,   284,    59,

+      60,    48,    68,   101,    51,    52,   104,   105,    55,   101,

+     102,   103,   104,     9,    74,    11,    63,    84,    85,    86,

+      87,    88,    89,    90,    91,    92,    93,    94,    95,    19,

+      20,    21,    22,    23,    81,   108,    26,    27,    77,    78,

+      79,    80,    99,   100,   113,   114,    23,    24,    99,   100,

+     113,   114,   108,   117,    99,   117,   109,   377,    23,   109,

+     349,   349,   349,   104,    99,   109,   109,   109,   354,   109,

+     100,   109,   109,   109,    99,   109,    23,    64,   111,    65,

+     111,    66,   111,   115,    83,   112,   109,   109,   377,   117,

+     109,   109,   112,   382,   111,   111,   111,   111,   111,   111,

+     386,   111,   111,   111,   109,   109,   117,   104,    23,   104,

+     116,    23,    23,   116,    23,    67,    23,   111,   111,   111,

+     111,    29,    23,   443,    23,   104,   110,    23,   110,   112,

+     118,   111,    23,   109,   109,    23,    23,    23,   112,   112,

+     112,   347,   112,   112,   112,   112,   112,   436,   436,   436,

+     112,   109,   109,    57,   443,    23,   445,   112,   112,   112,

+      23,   112,   112,    32,   109,   109,    66,   106,   111,   111,

+     111,   119,   461,   109,   109,   112,   106,   446,   112,   112,

+     462,   230,    87,   273,   210,   436,   388,    89,   159,   213,

+     139,    89,   253,    -1,    -1,    -1,   198

+};

+

+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing

+   symbol of state STATE-NUM.  */

+static const yytype_uint16 yystos[] =

+{

+       0,     3,     4,   121,   122,     0,   123,     8,   124,   125,

+      99,   100,   262,     5,     6,     7,    10,    12,    13,    14,

+      15,    16,    17,    18,    19,    20,    21,    22,   126,   127,

+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,

+     138,   141,   170,   171,   178,   179,   180,   242,   244,   245,

+     248,   261,   262,   108,   246,    99,    99,    99,    65,   100,

+     145,   151,   249,   145,   145,   145,   145,   145,   100,   146,

+     159,    99,   113,   114,   144,   166,   168,   241,   145,   145,

+     108,   108,     9,    11,    99,   247,   117,   117,   111,   117,

+     182,    29,    30,    37,    59,    60,    74,   250,   109,   101,

+     102,   103,   104,   164,   109,   109,   109,   109,   109,   109,

+     104,   161,   101,   104,   105,   163,    23,    24,    38,    62,

+      73,    96,   100,   110,   118,   150,   152,   172,   186,   189,

+     225,   229,   232,   236,   238,   239,   109,   109,    99,   243,

+     109,   100,   172,    23,   181,   185,   189,   225,   235,   237,

+     239,   240,   241,    27,    39,   251,   111,   255,   144,   115,

+     165,   142,   241,   144,   142,   144,   144,   142,    29,    37,

+      60,    74,   177,    34,    46,    28,    30,    36,    43,    44,

+      45,    47,    49,    58,    75,    76,   190,   192,   195,   197,

+     199,   203,   206,   208,   210,   212,   215,   224,    29,    37,

+      50,    53,    60,    74,    97,    98,   173,   150,   240,   163,

+     111,   150,   144,   117,   247,    99,   112,    23,    24,    61,

+      68,   252,    23,   258,   109,   100,   166,   167,   169,   109,

+     110,   143,   150,   238,   109,   109,    61,    68,   254,   255,

+     111,   111,   111,    64,    29,    56,   207,   111,    25,    27,

+      39,   196,   253,   111,   253,    48,    51,    52,    55,    63,

+      81,   219,    26,    70,   211,   111,   257,   255,    66,   254,

+     111,   255,   111,   111,   175,   163,   109,   119,    23,   153,

+     154,   155,   159,   109,   109,   249,   117,   183,   112,   144,

+     116,   116,   163,   142,   143,   104,   162,    83,   139,   144,

+      23,   233,    23,   234,    23,   209,    23,   202,    67,   202,

+      25,    31,    33,    69,    71,   191,   201,   111,   111,   220,

+     111,   255,    41,    42,    82,   216,   217,    23,   260,    29,

+     200,    35,    54,   204,   111,    23,   176,    23,   174,   176,

+     110,   240,   112,   104,   160,   147,   148,   241,   144,   118,

+     110,   111,   256,   109,   109,   112,   112,   112,   112,   112,

+      23,   223,    23,   221,    23,   222,   112,    77,    78,    79,

+      80,   205,    23,   218,   112,   112,   112,   109,   119,   113,

+     114,   156,   109,    23,   149,   262,   109,    62,    73,   184,

+     187,   188,   189,   226,   227,   230,   235,    23,   259,    84,

+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

+      95,   140,   144,    57,    26,    40,    60,    72,   193,   201,

+     253,   112,   112,   112,   112,   240,    23,   157,    23,   158,

+     148,   144,    34,    46,   213,   215,   109,   119,   112,    32,

+     194,   198,   201,   109,   119,   109,   109,   111,   111,    66,

+     214,   187,   240,   148,   139,   228,   233,   231,   234,   111,

+     119,   109,   109,   112,   106,   112,   106,   218,   148,   140,

+     233,   234,   106,   218,   112

+};

+

+#define yyerrok		(yyerrstatus = 0)

+#define yyclearin	(yychar = YYEMPTY)

+#define YYEMPTY		(-2)

+#define YYEOF		0

+

+#define YYACCEPT	goto yyacceptlab

+#define YYABORT		goto yyabortlab

+#define YYERROR		goto yyerrorlab

+

+

+/* Like YYERROR except do call yyerror.  This remains here temporarily

+   to ease the transition to the new meaning of YYERROR, for GCC.

+   Once GCC version 2 has supplanted version 1, this can go.  */

+

+#define YYFAIL		goto yyerrlab

+

+#define YYRECOVERING()  (!!yyerrstatus)

+

+#define YYBACKUP(Token, Value)					\

+do								\

+  if (yychar == YYEMPTY && yylen == 1)				\

+    {								\

+      yychar = (Token);						\

+      yylval = (Value);						\

+      yytoken = YYTRANSLATE (yychar);				\

+      YYPOPSTACK (1);						\

+      goto yybackup;						\

+    }								\

+  else								\

+    {								\

+      yyerror (&yylloc, state, YY_("syntax error: cannot back up")); \

+      YYERROR;							\

+    }								\

+while (YYID (0))

+

+

+#define YYTERROR	1

+#define YYERRCODE	256

+

+

+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

+   If N is 0, then set CURRENT to the empty location which ends

+   the previous symbol: RHS[0] (always defined).  */

+

+#define YYRHSLOC(Rhs, K) ((Rhs)[K])

+#ifndef YYLLOC_DEFAULT

+# 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).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;				\

+	}								\

+    while (YYID (0))

+#endif

+

+

+/* YY_LOCATION_PRINT -- Print the location on the stream.

+   This macro was not mandated originally: define only if we know

+   we won't break user code: when these are the locations we know.  */

+

+#ifndef YY_LOCATION_PRINT

+# if YYLTYPE_IS_TRIVIAL

+#  define YY_LOCATION_PRINT(File, Loc)			\

+     fprintf (File, "%d.%d-%d.%d",			\

+	      (Loc).first_line, (Loc).first_column,	\

+	      (Loc).last_line,  (Loc).last_column)

+# else

+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)

+# endif

+#endif

+

+

+/* YYLEX -- calling `yylex' with the right arguments.  */

+

+#ifdef YYLEX_PARAM

+# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)

+#else

+# define YYLEX yylex (&yylval, &yylloc, scanner)

+#endif

+

+/* Enable debugging if requested.  */

+#if YYDEBUG

+

+# ifndef YYFPRINTF

+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */

+#  define YYFPRINTF fprintf

+# endif

+

+# define YYDPRINTF(Args)			\

+do {						\

+  if (yydebug)					\

+    YYFPRINTF Args;				\

+} while (YYID (0))

+

+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \

+do {									  \

+  if (yydebug)								  \

+    {									  \

+      YYFPRINTF (stderr, "%s ", Title);					  \

+      yy_symbol_print (stderr,						  \

+		  Type, Value, Location, state); \

+      YYFPRINTF (stderr, "\n");						  \

+    }									  \

+} while (YYID (0))

+

+

+/*--------------------------------.

+| Print this symbol on YYOUTPUT.  |

+`--------------------------------*/

+

+/*ARGSUSED*/

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static void

+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)

+#else

+static void

+yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state)

+    FILE *yyoutput;

+    int yytype;

+    YYSTYPE const * const yyvaluep;

+    YYLTYPE const * const yylocationp;

+    struct asm_parser_state *state;

+#endif

+{

+  if (!yyvaluep)

+    return;

+  YYUSE (yylocationp);

+  YYUSE (state);

+# ifdef YYPRINT

+  if (yytype < YYNTOKENS)

+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

+# else

+  YYUSE (yyoutput);

+# endif

+  switch (yytype)

+    {

+      default:

+	break;

+    }

+}

+

+

+/*--------------------------------.

+| Print this symbol on YYOUTPUT.  |

+`--------------------------------*/

+

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static void

+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, struct asm_parser_state *state)

+#else

+static void

+yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, state)

+    FILE *yyoutput;

+    int yytype;

+    YYSTYPE const * const yyvaluep;

+    YYLTYPE const * const yylocationp;

+    struct asm_parser_state *state;

+#endif

+{

+  if (yytype < YYNTOKENS)

+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

+  else

+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

+

+  YY_LOCATION_PRINT (yyoutput, *yylocationp);

+  YYFPRINTF (yyoutput, ": ");

+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, state);

+  YYFPRINTF (yyoutput, ")");

+}

+

+/*------------------------------------------------------------------.

+| yy_stack_print -- Print the state stack from its BOTTOM up to its |

+| TOP (included).                                                   |

+`------------------------------------------------------------------*/

+

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static void

+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

+#else

+static void

+yy_stack_print (yybottom, yytop)

+    yytype_int16 *yybottom;

+    yytype_int16 *yytop;

+#endif

+{

+  YYFPRINTF (stderr, "Stack now");

+  for (; yybottom <= yytop; yybottom++)

+    {

+      int yybot = *yybottom;

+      YYFPRINTF (stderr, " %d", yybot);

+    }

+  YYFPRINTF (stderr, "\n");

+}

+

+# define YY_STACK_PRINT(Bottom, Top)				\

+do {								\

+  if (yydebug)							\

+    yy_stack_print ((Bottom), (Top));				\

+} while (YYID (0))

+

+

+/*------------------------------------------------.

+| Report that the YYRULE is going to be reduced.  |

+`------------------------------------------------*/

+

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static void

+yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, struct asm_parser_state *state)

+#else

+static void

+yy_reduce_print (yyvsp, yylsp, yyrule, state)

+    YYSTYPE *yyvsp;

+    YYLTYPE *yylsp;

+    int yyrule;

+    struct asm_parser_state *state;

+#endif

+{

+  int yynrhs = yyr2[yyrule];

+  int yyi;

+  unsigned long int yylno = yyrline[yyrule];

+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",

+	     yyrule - 1, yylno);

+  /* The symbols being reduced.  */

+  for (yyi = 0; yyi < yynrhs; yyi++)

+    {

+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],

+		       &(yyvsp[(yyi + 1) - (yynrhs)])

+		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , state);

+      YYFPRINTF (stderr, "\n");

+    }

+}

+

+# define YY_REDUCE_PRINT(Rule)		\

+do {					\

+  if (yydebug)				\

+    yy_reduce_print (yyvsp, yylsp, Rule, state); \

+} while (YYID (0))

+

+/* Nonzero means print parse trace.  It is left uninitialized so that

+   multiple parsers can coexist.  */

+int yydebug;

+#else /* !YYDEBUG */

+# define YYDPRINTF(Args)

+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

+# define YY_STACK_PRINT(Bottom, Top)

+# define YY_REDUCE_PRINT(Rule)

+#endif /* !YYDEBUG */

+

+

+/* YYINITDEPTH -- initial size of the parser's stacks.  */

+#ifndef	YYINITDEPTH

+# define YYINITDEPTH 200

+#endif

+

+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only

+   if the built-in stack extension method is used).

+

+   Do not make this value too large; the results are undefined if

+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)

+   evaluated with infinite-precision integer arithmetic.  */

+

+#ifndef YYMAXDEPTH

+# define YYMAXDEPTH 10000

+#endif

+

+

+

+#if YYERROR_VERBOSE

+

+# ifndef yystrlen

+#  if defined __GLIBC__ && defined _STRING_H

+#   define yystrlen strlen

+#  else

+/* Return the length of YYSTR.  */

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static YYSIZE_T

+yystrlen (const char *yystr)

+#else

+static YYSIZE_T

+yystrlen (yystr)

+    const char *yystr;

+#endif

+{

+  YYSIZE_T yylen;

+  for (yylen = 0; yystr[yylen]; yylen++)

+    continue;

+  return yylen;

+}

+#  endif

+# endif

+

+# ifndef yystpcpy

+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE

+#   define yystpcpy stpcpy

+#  else

+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in

+   YYDEST.  */

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static char *

+yystpcpy (char *yydest, const char *yysrc)

+#else

+static char *

+yystpcpy (yydest, yysrc)

+    char *yydest;

+    const char *yysrc;

+#endif

+{

+  char *yyd = yydest;

+  const char *yys = yysrc;

+

+  while ((*yyd++ = *yys++) != '\0')

+    continue;

+

+  return yyd - 1;

+}

+#  endif

+# endif

+

+# ifndef yytnamerr

+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary

+   quotes and backslashes, so that it's suitable for yyerror.  The

+   heuristic is that double-quoting is unnecessary unless the string

+   contains an apostrophe, a comma, or backslash (other than

+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is

+   null, do not copy; instead, return the length of what the result

+   would have been.  */

+static YYSIZE_T

+yytnamerr (char *yyres, const char *yystr)

+{

+  if (*yystr == '"')

+    {

+      YYSIZE_T yyn = 0;

+      char const *yyp = yystr;

+

+      for (;;)

+	switch (*++yyp)

+	  {

+	  case '\'':

+	  case ',':

+	    goto do_not_strip_quotes;

+

+	  case '\\':

+	    if (*++yyp != '\\')

+	      goto do_not_strip_quotes;

+	    /* Fall through.  */

+	  default:

+	    if (yyres)

+	      yyres[yyn] = *yyp;

+	    yyn++;

+	    break;

+

+	  case '"':

+	    if (yyres)

+	      yyres[yyn] = '\0';

+	    return yyn;

+	  }

+    do_not_strip_quotes: ;

+    }

+

+  if (! yyres)

+    return yystrlen (yystr);

+

+  return yystpcpy (yyres, yystr) - yyres;

+}

+# endif

+

+/* Copy into YYRESULT an error message about the unexpected token

+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,

+   including the terminating null byte.  If YYRESULT is null, do not

+   copy anything; just return the number of bytes that would be

+   copied.  As a special case, return 0 if an ordinary "syntax error"

+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during

+   size calculation.  */

+static YYSIZE_T

+yysyntax_error (char *yyresult, int yystate, int yychar)

+{

+  int yyn = yypact[yystate];

+

+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))

+    return 0;

+  else

+    {

+      int yytype = YYTRANSLATE (yychar);

+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);

+      YYSIZE_T yysize = yysize0;

+      YYSIZE_T yysize1;

+      int yysize_overflow = 0;

+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };

+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];

+      int yyx;

+

+# if 0

+      /* This is so xgettext sees the translatable formats that are

+	 constructed on the fly.  */

+      YY_("syntax error, unexpected %s");

+      YY_("syntax error, unexpected %s, expecting %s");

+      YY_("syntax error, unexpected %s, expecting %s or %s");

+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");

+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");

+# endif

+      char *yyfmt;

+      char const *yyf;

+      static char const yyunexpected[] = "syntax error, unexpected %s";

+      static char const yyexpecting[] = ", expecting %s";

+      static char const yyor[] = " or %s";

+      char yyformat[sizeof yyunexpected

+		    + sizeof yyexpecting - 1

+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)

+		       * (sizeof yyor - 1))];

+      char const *yyprefix = yyexpecting;

+

+      /* Start YYX at -YYN if negative to avoid negative indexes in

+	 YYCHECK.  */

+      int yyxbegin = yyn < 0 ? -yyn : 0;

+

+      /* Stay within bounds of both yycheck and yytname.  */

+      int yychecklim = YYLAST - yyn + 1;

+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

+      int yycount = 1;

+

+      yyarg[0] = yytname[yytype];

+      yyfmt = yystpcpy (yyformat, yyunexpected);

+

+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)

+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

+	  {

+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

+	      {

+		yycount = 1;

+		yysize = yysize0;

+		yyformat[sizeof yyunexpected - 1] = '\0';

+		break;

+	      }

+	    yyarg[yycount++] = yytname[yyx];

+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);

+	    yysize_overflow |= (yysize1 < yysize);

+	    yysize = yysize1;

+	    yyfmt = yystpcpy (yyfmt, yyprefix);

+	    yyprefix = yyor;

+	  }

+

+      yyf = YY_(yyformat);

+      yysize1 = yysize + yystrlen (yyf);

+      yysize_overflow |= (yysize1 < yysize);

+      yysize = yysize1;

+

+      if (yysize_overflow)

+	return YYSIZE_MAXIMUM;

+

+      if (yyresult)

+	{

+	  /* Avoid sprintf, as that infringes on the user's name space.

+	     Don't have undefined behavior even if the translation

+	     produced a string with the wrong number of "%s"s.  */

+	  char *yyp = yyresult;

+	  int yyi = 0;

+	  while ((*yyp = *yyf) != '\0')

+	    {

+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)

+		{

+		  yyp += yytnamerr (yyp, yyarg[yyi++]);

+		  yyf += 2;

+		}

+	      else

+		{

+		  yyp++;

+		  yyf++;

+		}

+	    }

+	}

+      return yysize;

+    }

+}

+#endif /* YYERROR_VERBOSE */

+

+

+/*-----------------------------------------------.

+| Release the memory associated to this symbol.  |

+`-----------------------------------------------*/

+

+/*ARGSUSED*/

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+static void

+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, struct asm_parser_state *state)

+#else

+static void

+yydestruct (yymsg, yytype, yyvaluep, yylocationp, state)

+    const char *yymsg;

+    int yytype;

+    YYSTYPE *yyvaluep;

+    YYLTYPE *yylocationp;

+    struct asm_parser_state *state;

+#endif

+{

+  YYUSE (yyvaluep);

+  YYUSE (yylocationp);

+  YYUSE (state);

+

+  if (!yymsg)

+    yymsg = "Deleting";

+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

+

+  switch (yytype)

+    {

+

+      default:

+	break;

+    }

+}

+

+/* Prevent warnings from -Wmissing-prototypes.  */

+#ifdef YYPARSE_PARAM

+#if defined __STDC__ || defined __cplusplus

+int yyparse (void *YYPARSE_PARAM);

+#else

+int yyparse ();

+#endif

+#else /* ! YYPARSE_PARAM */

+#if defined __STDC__ || defined __cplusplus

+int yyparse (struct asm_parser_state *state);

+#else

+int yyparse ();

+#endif

+#endif /* ! YYPARSE_PARAM */

+

+

+

+

+

+/*-------------------------.

+| yyparse or yypush_parse.  |

+`-------------------------*/

+

+#ifdef YYPARSE_PARAM

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+int

+yyparse (void *YYPARSE_PARAM)

+#else

+int

+yyparse (YYPARSE_PARAM)

+    void *YYPARSE_PARAM;

+#endif

+#else /* ! YYPARSE_PARAM */

+#if (defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)

+int

+yyparse (struct asm_parser_state *state)

+#else

+int

+yyparse (state)

+    struct asm_parser_state *state;

+#endif

+#endif

+{

+/* The lookahead symbol.  */

+int yychar;

+

+/* The semantic value of the lookahead symbol.  */

+YYSTYPE yylval;

+

+/* Location data for the lookahead symbol.  */

+YYLTYPE yylloc;

+

+    /* Number of syntax errors so far.  */

+    int yynerrs;

+

+    int yystate;

+    /* Number of tokens to shift before error messages enabled.  */

+    int yyerrstatus;

+

+    /* The stacks and their tools:

+       `yyss': related to states.

+       `yyvs': related to semantic values.

+       `yyls': related to locations.

+

+       Refer to the stacks thru separate pointers, to allow yyoverflow

+       to reallocate them elsewhere.  */

+

+    /* The state stack.  */

+    yytype_int16 yyssa[YYINITDEPTH];

+    yytype_int16 *yyss;

+    yytype_int16 *yyssp;

+

+    /* The semantic value stack.  */

+    YYSTYPE yyvsa[YYINITDEPTH];

+    YYSTYPE *yyvs;

+    YYSTYPE *yyvsp;

+

+    /* The location stack.  */

+    YYLTYPE yylsa[YYINITDEPTH];

+    YYLTYPE *yyls;

+    YYLTYPE *yylsp;

+

+    /* The locations where the error started and ended.  */

+    YYLTYPE yyerror_range[2];

+

+    YYSIZE_T yystacksize;

+

+  int yyn;

+  int yyresult;

+  /* Lookahead token as an internal (translated) token number.  */

+  int yytoken;

+  /* The variables used to return semantic value and location from the

+     action routines.  */

+  YYSTYPE yyval;

+  YYLTYPE yyloc;

+

+#if YYERROR_VERBOSE

+  /* Buffer for error messages, and its allocated size.  */

+  char yymsgbuf[128];

+  char *yymsg = yymsgbuf;

+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;

+#endif

+

+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))

+

+  /* The number of symbols on the RHS of the reduced rule.

+     Keep to zero when no symbol should be popped.  */

+  int yylen = 0;

+

+  yytoken = 0;

+  yyss = yyssa;

+  yyvs = yyvsa;

+  yyls = yylsa;

+  yystacksize = YYINITDEPTH;

+

+  YYDPRINTF ((stderr, "Starting parse\n"));

+

+  yystate = 0;

+  yyerrstatus = 0;

+  yynerrs = 0;

+  yychar = YYEMPTY; /* Cause a token to be read.  */

+

+  /* Initialize stack pointers.

+     Waste one element of value and location stack

+     so that they stay on the same level as the state stack.

+     The wasted elements are never initialized.  */

+  yyssp = yyss;

+  yyvsp = yyvs;

+  yylsp = yyls;

+

+#if YYLTYPE_IS_TRIVIAL

+  /* Initialize the default location before parsing starts.  */

+  yylloc.first_line   = yylloc.last_line   = 1;

+  yylloc.first_column = yylloc.last_column = 1;

+#endif

+

+  goto yysetstate;

+

+/*------------------------------------------------------------.

+| yynewstate -- Push a new state, which is found in yystate.  |

+`------------------------------------------------------------*/

+ yynewstate:

+  /* In all cases, when you get here, the value and location stacks

+     have just been pushed.  So pushing a state here evens the stacks.  */

+  yyssp++;

+

+ yysetstate:

+  *yyssp = yystate;

+

+  if (yyss + yystacksize - 1 <= yyssp)

+    {

+      /* Get the current used size of the three stacks, in elements.  */

+      YYSIZE_T yysize = yyssp - yyss + 1;

+

+#ifdef yyoverflow

+      {

+	/* Give user a chance to reallocate the stack.  Use copies of

+	   these so that the &'s don't force the real ones into

+	   memory.  */

+	YYSTYPE *yyvs1 = yyvs;

+	yytype_int16 *yyss1 = yyss;

+	YYLTYPE *yyls1 = yyls;

+

+	/* Each stack pointer address is followed by the size of the

+	   data in use in that stack, in bytes.  This used to be a

+	   conditional around just the two extra args, but that might

+	   be undefined if yyoverflow is a macro.  */

+	yyoverflow (YY_("memory exhausted"),

+		    &yyss1, yysize * sizeof (*yyssp),

+		    &yyvs1, yysize * sizeof (*yyvsp),

+		    &yyls1, yysize * sizeof (*yylsp),

+		    &yystacksize);

+

+	yyls = yyls1;

+	yyss = yyss1;

+	yyvs = yyvs1;

+      }

+#else /* no yyoverflow */

+# ifndef YYSTACK_RELOCATE

+      goto yyexhaustedlab;

+# else

+      /* Extend the stack our own way.  */

+      if (YYMAXDEPTH <= yystacksize)

+	goto yyexhaustedlab;

+      yystacksize *= 2;

+      if (YYMAXDEPTH < yystacksize)

+	yystacksize = YYMAXDEPTH;

+

+      {

+	yytype_int16 *yyss1 = yyss;

+	union yyalloc *yyptr =

+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));

+	if (! yyptr)

+	  goto yyexhaustedlab;

+	YYSTACK_RELOCATE (yyss_alloc, yyss);

+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);

+	YYSTACK_RELOCATE (yyls_alloc, yyls);

+#  undef YYSTACK_RELOCATE

+	if (yyss1 != yyssa)

+	  YYSTACK_FREE (yyss1);

+      }

+# endif

+#endif /* no yyoverflow */

+

+      yyssp = yyss + yysize - 1;

+      yyvsp = yyvs + yysize - 1;

+      yylsp = yyls + yysize - 1;

+

+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",

+		  (unsigned long int) yystacksize));

+

+      if (yyss + yystacksize - 1 <= yyssp)

+	YYABORT;

+    }

+

+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));

+

+  if (yystate == YYFINAL)

+    YYACCEPT;

+

+  goto yybackup;

+

+/*-----------.

+| yybackup.  |

+`-----------*/

+yybackup:

+

+  /* Do appropriate processing given the current state.  Read a

+     lookahead token if we need one and don't already have one.  */

+

+  /* First try to decide what to do without reference to lookahead token.  */

+  yyn = yypact[yystate];

+  if (yyn == YYPACT_NINF)

+    goto yydefault;

+

+  /* Not known => get a lookahead token if don't already have one.  */

+

+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

+  if (yychar == YYEMPTY)

+    {

+      YYDPRINTF ((stderr, "Reading a token: "));

+      yychar = YYLEX;

+    }

+

+  if (yychar <= YYEOF)

+    {

+      yychar = yytoken = YYEOF;

+      YYDPRINTF ((stderr, "Now at end of input.\n"));

+    }

+  else

+    {

+      yytoken = YYTRANSLATE (yychar);

+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);

+    }

+

+  /* If the proper action on seeing token YYTOKEN is to reduce or to

+     detect an error, take that action.  */

+  yyn += yytoken;

+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)

+    goto yydefault;

+  yyn = yytable[yyn];

+  if (yyn <= 0)

+    {

+      if (yyn == 0 || yyn == YYTABLE_NINF)

+	goto yyerrlab;

+      yyn = -yyn;

+      goto yyreduce;

+    }

+

+  /* Count tokens shifted since error; after three, turn off error

+     status.  */

+  if (yyerrstatus)

+    yyerrstatus--;

+

+  /* Shift the lookahead token.  */

+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);

+

+  /* Discard the shifted token.  */

+  yychar = YYEMPTY;

+

+  yystate = yyn;

+  *++yyvsp = yylval;

+  *++yylsp = yylloc;

+  goto yynewstate;

+

+

+/*-----------------------------------------------------------.

+| yydefault -- do the default action for the current state.  |

+`-----------------------------------------------------------*/

+yydefault:

+  yyn = yydefact[yystate];

+  if (yyn == 0)

+    goto yyerrlab;

+  goto yyreduce;

+

+

+/*-----------------------------.

+| yyreduce -- Do a reduction.  |

+`-----------------------------*/

+yyreduce:

+  /* yyn is the number of a rule to reduce with.  */

+  yylen = yyr2[yyn];

+

+  /* If YYLEN is nonzero, implement the default value of the action:

+     `$$ = $1'.

+

+     Otherwise, the following line sets YYVAL to garbage.

+     This behavior is undocumented and Bison

+     users should not rely upon it.  Assigning to YYVAL

+     unconditionally makes the parser a bit smaller, and it avoids a

+     GCC warning that YYVAL may be used uninitialized.  */

+  yyval = yyvsp[1-yylen];

+

+  /* Default location.  */

+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

+  YY_REDUCE_PRINT (yyn);

+  switch (yyn)

+    {

+        case 3:

+

+/* Line 1455 of yacc.c  */

+#line 282 "program_parse.y"

+    {

+	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid fragment program header");

+

+	   }

+	   state->mode = ARB_vertex;

+	;}

+    break;

+

+  case 4:

+

+/* Line 1455 of yacc.c  */

+#line 290 "program_parse.y"

+    {

+	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex program header");

+	   }

+	   state->mode = ARB_fragment;

+

+	   state->option.TexRect =

+	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);

+	;}

+    break;

+

+  case 7:

+

+/* Line 1455 of yacc.c  */

+#line 306 "program_parse.y"

+    {

+	   int valid = 0;

+

+	   if (state->mode == ARB_vertex) {

+	      valid = _mesa_ARBvp_parse_option(state, (yyvsp[(2) - (3)].string));

+	   } else if (state->mode == ARB_fragment) {

+	      valid = _mesa_ARBfp_parse_option(state, (yyvsp[(2) - (3)].string));

+	   }

+

+

+	   free((yyvsp[(2) - (3)].string));

+

+	   if (!valid) {

+	      const char *const err_str = (state->mode == ARB_vertex)

+		 ? "invalid ARB vertex program option"

+		 : "invalid ARB fragment program option";

+

+	      yyerror(& (yylsp[(2) - (3)]), state, err_str);

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 10:

+

+/* Line 1455 of yacc.c  */

+#line 334 "program_parse.y"

+    {

+	   if ((yyvsp[(1) - (2)].inst) != NULL) {

+	      if (state->inst_tail == NULL) {

+		 state->inst_head = (yyvsp[(1) - (2)].inst);

+	      } else {

+		 state->inst_tail->next = (yyvsp[(1) - (2)].inst);

+	      }

+

+	      state->inst_tail = (yyvsp[(1) - (2)].inst);

+	      (yyvsp[(1) - (2)].inst)->next = NULL;

+

+	      state->prog->NumInstructions++;

+	   }

+	;}

+    break;

+

+  case 12:

+

+/* Line 1455 of yacc.c  */

+#line 352 "program_parse.y"

+    {

+	   (yyval.inst) = (yyvsp[(1) - (1)].inst);

+	   state->prog->NumAluInstructions++;

+	;}

+    break;

+

+  case 13:

+

+/* Line 1455 of yacc.c  */

+#line 357 "program_parse.y"

+    {

+	   (yyval.inst) = (yyvsp[(1) - (1)].inst);

+	   state->prog->NumTexInstructions++;

+	;}

+    break;

+

+  case 24:

+

+/* Line 1455 of yacc.c  */

+#line 378 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_ctor(OPCODE_ARL, & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);

+	;}

+    break;

+

+  case 25:

+

+/* Line 1455 of yacc.c  */

+#line 384 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);

+	;}

+    break;

+

+  case 26:

+

+/* Line 1455 of yacc.c  */

+#line 390 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);

+	;}

+    break;

+

+  case 27:

+

+/* Line 1455 of yacc.c  */

+#line 396 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);

+	;}

+    break;

+

+  case 28:

+

+/* Line 1455 of yacc.c  */

+#line 403 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);

+	;}

+    break;

+

+  case 29:

+

+/* Line 1455 of yacc.c  */

+#line 410 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), & (yyvsp[(6) - (8)].src_reg), & (yyvsp[(8) - (8)].src_reg));

+	;}

+    break;

+

+  case 30:

+

+/* Line 1455 of yacc.c  */

+#line 416 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), NULL, NULL);

+	   if ((yyval.inst) != NULL) {

+	      const GLbitfield tex_mask = (1U << (yyvsp[(6) - (8)].integer));

+	      GLbitfield shadow_tex = 0;

+	      GLbitfield target_mask = 0;

+

+

+	      (yyval.inst)->Base.TexSrcUnit = (yyvsp[(6) - (8)].integer);

+

+	      if ((yyvsp[(8) - (8)].integer) < 0) {

+		 shadow_tex = tex_mask;

+

+		 (yyval.inst)->Base.TexSrcTarget = -(yyvsp[(8) - (8)].integer);

+		 (yyval.inst)->Base.TexShadow = 1;

+	      } else {

+		 (yyval.inst)->Base.TexSrcTarget = (yyvsp[(8) - (8)].integer);

+	      }

+

+	      target_mask = (1U << (yyval.inst)->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[(yyvsp[(6) - (8)].integer)] != 0)

+		  && ((state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] != target_mask)

+		      || ((state->prog->ShadowSamplers & tex_mask)

+			  != shadow_tex))) {

+		 yyerror(& (yylsp[(8) - (8)]), state,

+			 "multiple targets used on one texture image unit");

+		 YYERROR;

+	      }

+

+

+	      state->prog->TexturesUsed[(yyvsp[(6) - (8)].integer)] |= target_mask;

+	      state->prog->ShadowSamplers |= shadow_tex;

+	   }

+	;}

+    break;

+

+  case 31:

+

+/* Line 1455 of yacc.c  */

+#line 460 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_ctor(OPCODE_KIL, NULL, & (yyvsp[(2) - (2)].src_reg), NULL, NULL);

+	   state->fragment.UsesKill = 1;

+	;}

+    break;

+

+  case 32:

+

+/* Line 1455 of yacc.c  */

+#line 465 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);

+	   (yyval.inst)->Base.DstReg.CondMask = (yyvsp[(2) - (2)].dst_reg).CondMask;

+	   (yyval.inst)->Base.DstReg.CondSwizzle = (yyvsp[(2) - (2)].dst_reg).CondSwizzle;

+	   (yyval.inst)->Base.DstReg.CondSrc = (yyvsp[(2) - (2)].dst_reg).CondSrc;

+	   state->fragment.UsesKill = 1;

+	;}

+    break;

+

+  case 33:

+

+/* Line 1455 of yacc.c  */

+#line 475 "program_parse.y"

+    {

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (12)].temp_inst), & (yyvsp[(2) - (12)].dst_reg), & (yyvsp[(4) - (12)].src_reg), & (yyvsp[(6) - (12)].src_reg), & (yyvsp[(8) - (12)].src_reg));

+	   if ((yyval.inst) != NULL) {

+	      const GLbitfield tex_mask = (1U << (yyvsp[(10) - (12)].integer));

+	      GLbitfield shadow_tex = 0;

+	      GLbitfield target_mask = 0;

+

+

+	      (yyval.inst)->Base.TexSrcUnit = (yyvsp[(10) - (12)].integer);

+

+	      if ((yyvsp[(12) - (12)].integer) < 0) {

+		 shadow_tex = tex_mask;

+

+		 (yyval.inst)->Base.TexSrcTarget = -(yyvsp[(12) - (12)].integer);

+		 (yyval.inst)->Base.TexShadow = 1;

+	      } else {

+		 (yyval.inst)->Base.TexSrcTarget = (yyvsp[(12) - (12)].integer);

+	      }

+

+	      target_mask = (1U << (yyval.inst)->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[(yyvsp[(10) - (12)].integer)] != 0)

+		  && ((state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] != target_mask)

+		      || ((state->prog->ShadowSamplers & tex_mask)

+			  != shadow_tex))) {

+		 yyerror(& (yylsp[(12) - (12)]), state,

+			 "multiple targets used on one texture image unit");

+		 YYERROR;

+	      }

+

+

+	      state->prog->TexturesUsed[(yyvsp[(10) - (12)].integer)] |= target_mask;

+	      state->prog->ShadowSamplers |= shadow_tex;

+	   }

+	;}

+    break;

+

+  case 34:

+

+/* Line 1455 of yacc.c  */

+#line 519 "program_parse.y"

+    {

+	   (yyval.integer) = (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 35:

+

+/* Line 1455 of yacc.c  */

+#line 524 "program_parse.y"

+    { (yyval.integer) = TEXTURE_1D_INDEX; ;}

+    break;

+

+  case 36:

+

+/* Line 1455 of yacc.c  */

+#line 525 "program_parse.y"

+    { (yyval.integer) = TEXTURE_2D_INDEX; ;}

+    break;

+

+  case 37:

+

+/* Line 1455 of yacc.c  */

+#line 526 "program_parse.y"

+    { (yyval.integer) = TEXTURE_3D_INDEX; ;}

+    break;

+

+  case 38:

+

+/* Line 1455 of yacc.c  */

+#line 527 "program_parse.y"

+    { (yyval.integer) = TEXTURE_CUBE_INDEX; ;}

+    break;

+

+  case 39:

+

+/* Line 1455 of yacc.c  */

+#line 528 "program_parse.y"

+    { (yyval.integer) = TEXTURE_RECT_INDEX; ;}

+    break;

+

+  case 40:

+

+/* Line 1455 of yacc.c  */

+#line 529 "program_parse.y"

+    { (yyval.integer) = -TEXTURE_1D_INDEX; ;}

+    break;

+

+  case 41:

+

+/* Line 1455 of yacc.c  */

+#line 530 "program_parse.y"

+    { (yyval.integer) = -TEXTURE_2D_INDEX; ;}

+    break;

+

+  case 42:

+

+/* Line 1455 of yacc.c  */

+#line 531 "program_parse.y"

+    { (yyval.integer) = -TEXTURE_RECT_INDEX; ;}

+    break;

+

+  case 43:

+

+/* Line 1455 of yacc.c  */

+#line 532 "program_parse.y"

+    { (yyval.integer) = TEXTURE_1D_ARRAY_INDEX; ;}

+    break;

+

+  case 44:

+

+/* Line 1455 of yacc.c  */

+#line 533 "program_parse.y"

+    { (yyval.integer) = TEXTURE_2D_ARRAY_INDEX; ;}

+    break;

+

+  case 45:

+

+/* Line 1455 of yacc.c  */

+#line 534 "program_parse.y"

+    { (yyval.integer) = -TEXTURE_1D_ARRAY_INDEX; ;}

+    break;

+

+  case 46:

+

+/* Line 1455 of yacc.c  */

+#line 535 "program_parse.y"

+    { (yyval.integer) = -TEXTURE_2D_ARRAY_INDEX; ;}

+    break;

+

+  case 47:

+

+/* Line 1455 of yacc.c  */

+#line 539 "program_parse.y"

+    {

+	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied

+	    * FIXME: to the existing swizzle?

+	    */

+	   (yyvsp[(4) - (6)].src_reg).Base.Swizzle = (yyvsp[(6) - (6)].swiz_mask).swizzle;

+	   (yyvsp[(4) - (6)].src_reg).Base.Negate = (yyvsp[(6) - (6)].swiz_mask).mask;

+

+	   (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), NULL, NULL);

+	;}

+    break;

+

+  case 48:

+

+/* Line 1455 of yacc.c  */

+#line 551 "program_parse.y"

+    {

+	   (yyval.src_reg) = (yyvsp[(2) - (2)].src_reg);

+

+	   if ((yyvsp[(1) - (2)].negate)) {

+	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

+	   }

+	;}

+    break;

+

+  case 49:

+

+/* Line 1455 of yacc.c  */

+#line 559 "program_parse.y"

+    {

+	   (yyval.src_reg) = (yyvsp[(3) - (4)].src_reg);

+

+	   if (!state->option.NV_fragment) {

+	      yyerror(& (yylsp[(2) - (4)]), state, "unexpected character '|'");

+	      YYERROR;

+	   }

+

+	   if ((yyvsp[(1) - (4)].negate)) {

+	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

+	   }

+

+	   (yyval.src_reg).Base.Abs = 1;

+	;}

+    break;

+

+  case 50:

+

+/* Line 1455 of yacc.c  */

+#line 576 "program_parse.y"

+    {

+	   (yyval.src_reg) = (yyvsp[(1) - (2)].src_reg);

+

+	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,

+						    (yyvsp[(2) - (2)].swiz_mask).swizzle);

+	;}

+    break;

+

+  case 51:

+

+/* Line 1455 of yacc.c  */

+#line 583 "program_parse.y"

+    {

+	   struct asm_symbol temp_sym;

+

+	   if (!state->option.NV_fragment) {

+	      yyerror(& (yylsp[(1) - (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, & (yyvsp[(1) - (1)].vector), GL_TRUE);

+

+	   set_src_reg_swz(& (yyval.src_reg), PROGRAM_CONSTANT,

+                           temp_sym.param_binding_begin,

+                           temp_sym.param_binding_swizzle);

+	;}

+    break;

+

+  case 52:

+

+/* Line 1455 of yacc.c  */

+#line 602 "program_parse.y"

+    {

+	   (yyval.src_reg) = (yyvsp[(2) - (3)].src_reg);

+

+	   if ((yyvsp[(1) - (3)].negate)) {

+	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

+	   }

+

+	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,

+						    (yyvsp[(3) - (3)].swiz_mask).swizzle);

+	;}

+    break;

+

+  case 53:

+

+/* Line 1455 of yacc.c  */

+#line 613 "program_parse.y"

+    {

+	   (yyval.src_reg) = (yyvsp[(3) - (5)].src_reg);

+

+	   if (!state->option.NV_fragment) {

+	      yyerror(& (yylsp[(2) - (5)]), state, "unexpected character '|'");

+	      YYERROR;

+	   }

+

+	   if ((yyvsp[(1) - (5)].negate)) {

+	      (yyval.src_reg).Base.Negate = ~(yyval.src_reg).Base.Negate;

+	   }

+

+	   (yyval.src_reg).Base.Abs = 1;

+	   (yyval.src_reg).Base.Swizzle = _mesa_combine_swizzles((yyval.src_reg).Base.Swizzle,

+						    (yyvsp[(4) - (5)].swiz_mask).swizzle);

+	;}

+    break;

+

+  case 54:

+

+/* Line 1455 of yacc.c  */

+#line 633 "program_parse.y"

+    {

+	   (yyval.dst_reg) = (yyvsp[(1) - (3)].dst_reg);

+	   (yyval.dst_reg).WriteMask = (yyvsp[(2) - (3)].swiz_mask).mask;

+	   (yyval.dst_reg).CondMask = (yyvsp[(3) - (3)].dst_reg).CondMask;

+	   (yyval.dst_reg).CondSwizzle = (yyvsp[(3) - (3)].dst_reg).CondSwizzle;

+	   (yyval.dst_reg).CondSrc = (yyvsp[(3) - (3)].dst_reg).CondSrc;

+

+	   if ((yyval.dst_reg).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

+	       && ((yyval.dst_reg).Index == VERT_RESULT_HPOS)) {

+		 yyerror(& (yylsp[(1) - (3)]), state, "position-invariant programs cannot "

+			 "write position");

+		 YYERROR;

+	      }

+

+	      state->prog->OutputsWritten |= BITFIELD64_BIT((yyval.dst_reg).Index);

+	   }

+	;}

+    break;

+

+  case 55:

+

+/* Line 1455 of yacc.c  */

+#line 658 "program_parse.y"

+    {

+	   set_dst_reg(& (yyval.dst_reg), PROGRAM_ADDRESS, 0);

+	   (yyval.dst_reg).WriteMask = (yyvsp[(2) - (2)].swiz_mask).mask;

+	;}

+    break;

+

+  case 56:

+

+/* Line 1455 of yacc.c  */

+#line 665 "program_parse.y"

+    {

+	   const unsigned xyzw_valid =

+	      ((yyvsp[(1) - (7)].ext_swizzle).xyzw_valid << 0)

+	      | ((yyvsp[(3) - (7)].ext_swizzle).xyzw_valid << 1)

+	      | ((yyvsp[(5) - (7)].ext_swizzle).xyzw_valid << 2)

+	      | ((yyvsp[(7) - (7)].ext_swizzle).xyzw_valid << 3);

+	   const unsigned rgba_valid =

+	      ((yyvsp[(1) - (7)].ext_swizzle).rgba_valid << 0)

+	      | ((yyvsp[(3) - (7)].ext_swizzle).rgba_valid << 1)

+	      | ((yyvsp[(5) - (7)].ext_swizzle).rgba_valid << 2)

+	      | ((yyvsp[(7) - (7)].ext_swizzle).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(& (yylsp[(1) - (7)]), state, "cannot combine RGBA and XYZW swizzle "

+		      "components");

+	      YYERROR;

+	   }

+

+	   (yyval.swiz_mask).swizzle = MAKE_SWIZZLE4((yyvsp[(1) - (7)].ext_swizzle).swz, (yyvsp[(3) - (7)].ext_swizzle).swz, (yyvsp[(5) - (7)].ext_swizzle).swz, (yyvsp[(7) - (7)].ext_swizzle).swz);

+	   (yyval.swiz_mask).mask = ((yyvsp[(1) - (7)].ext_swizzle).negate) | ((yyvsp[(3) - (7)].ext_swizzle).negate << 1) | ((yyvsp[(5) - (7)].ext_swizzle).negate << 2)

+	      | ((yyvsp[(7) - (7)].ext_swizzle).negate << 3);

+	;}

+    break;

+

+  case 57:

+

+/* Line 1455 of yacc.c  */

+#line 698 "program_parse.y"

+    {

+	   (yyval.ext_swizzle) = (yyvsp[(2) - (2)].ext_swizzle);

+	   (yyval.ext_swizzle).negate = ((yyvsp[(1) - (2)].negate)) ? 1 : 0;

+	;}

+    break;

+

+  case 58:

+

+/* Line 1455 of yacc.c  */

+#line 705 "program_parse.y"

+    {

+	   if (((yyvsp[(1) - (1)].integer) != 0) && ((yyvsp[(1) - (1)].integer) != 1)) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");

+	      YYERROR;

+	   }

+

+	   (yyval.ext_swizzle).swz = ((yyvsp[(1) - (1)].integer) == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;

+

+	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW

+	    * swizzle names.

+	    */

+	   (yyval.ext_swizzle).xyzw_valid = 1;

+	   (yyval.ext_swizzle).rgba_valid = 1;

+	;}

+    break;

+

+  case 59:

+

+/* Line 1455 of yacc.c  */

+#line 720 "program_parse.y"

+    {

+	   char s;

+

+	   if (strlen((yyvsp[(1) - (1)].string)) > 1) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");

+	      YYERROR;

+	   }

+

+	   s = (yyvsp[(1) - (1)].string)[0];

+	   free((yyvsp[(1) - (1)].string));

+

+	   switch (s) {

+	   case 'x':

+	      (yyval.ext_swizzle).swz = SWIZZLE_X;

+	      (yyval.ext_swizzle).xyzw_valid = 1;

+	      break;

+	   case 'y':

+	      (yyval.ext_swizzle).swz = SWIZZLE_Y;

+	      (yyval.ext_swizzle).xyzw_valid = 1;

+	      break;

+	   case 'z':

+	      (yyval.ext_swizzle).swz = SWIZZLE_Z;

+	      (yyval.ext_swizzle).xyzw_valid = 1;

+	      break;

+	   case 'w':

+	      (yyval.ext_swizzle).swz = SWIZZLE_W;

+	      (yyval.ext_swizzle).xyzw_valid = 1;

+	      break;

+

+	   case 'r':

+	      (yyval.ext_swizzle).swz = SWIZZLE_X;

+	      (yyval.ext_swizzle).rgba_valid = 1;

+	      break;

+	   case 'g':

+	      (yyval.ext_swizzle).swz = SWIZZLE_Y;

+	      (yyval.ext_swizzle).rgba_valid = 1;

+	      break;

+	   case 'b':

+	      (yyval.ext_swizzle).swz = SWIZZLE_Z;

+	      (yyval.ext_swizzle).rgba_valid = 1;

+	      break;

+	   case 'a':

+	      (yyval.ext_swizzle).swz = SWIZZLE_W;

+	      (yyval.ext_swizzle).rgba_valid = 1;

+	      break;

+

+	   default:

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");

+	      YYERROR;

+	      break;

+	   }

+	;}

+    break;

+

+  case 60:

+

+/* Line 1455 of yacc.c  */

+#line 775 "program_parse.y"

+    {

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

+

+	   free((yyvsp[(1) - (1)].string));

+

+	   if (s == NULL) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type != at_param) && (s->type != at_temp)

+		      && (s->type != at_attrib)) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type == at_param) && s->param_is_array) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "non-array access to array PARAM");

+	      YYERROR;

+	   }

+

+	   init_src_reg(& (yyval.src_reg));

+	   switch (s->type) {

+	   case at_temp:

+	      set_src_reg(& (yyval.src_reg), PROGRAM_TEMPORARY, s->temp_binding);

+	      break;

+	   case at_param:

+              set_src_reg_swz(& (yyval.src_reg), s->param_binding_type,

+                              s->param_binding_begin,

+                              s->param_binding_swizzle);

+	      break;

+	   case at_attrib:

+	      set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, s->attrib_binding);

+	      state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);

+

+	      if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {

+		 YYERROR;

+	      }

+	      break;

+

+	   default:

+	      YYERROR;

+	      break;

+	   }

+	;}

+    break;

+

+  case 61:

+

+/* Line 1455 of yacc.c  */

+#line 818 "program_parse.y"

+    {

+	   set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, (yyvsp[(1) - (1)].attrib));

+	   state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);

+

+	   if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 62:

+

+/* Line 1455 of yacc.c  */

+#line 827 "program_parse.y"

+    {

+	   if (! (yyvsp[(3) - (4)].src_reg).Base.RelAddr

+	       && ((unsigned) (yyvsp[(3) - (4)].src_reg).Base.Index >= (yyvsp[(1) - (4)].sym)->param_binding_length)) {

+	      yyerror(& (yylsp[(3) - (4)]), state, "out of bounds array access");

+	      YYERROR;

+	   }

+

+	   init_src_reg(& (yyval.src_reg));

+	   (yyval.src_reg).Base.File = (yyvsp[(1) - (4)].sym)->param_binding_type;

+

+	   if ((yyvsp[(3) - (4)].src_reg).Base.RelAddr) {

+              state->prog->IndirectRegisterFiles |= (1 << (yyval.src_reg).Base.File);

+	      (yyvsp[(1) - (4)].sym)->param_accessed_indirectly = 1;

+

+	      (yyval.src_reg).Base.RelAddr = 1;

+	      (yyval.src_reg).Base.Index = (yyvsp[(3) - (4)].src_reg).Base.Index;

+	      (yyval.src_reg).Symbol = (yyvsp[(1) - (4)].sym);

+	   } else {

+	      (yyval.src_reg).Base.Index = (yyvsp[(1) - (4)].sym)->param_binding_begin + (yyvsp[(3) - (4)].src_reg).Base.Index;

+	   }

+	;}

+    break;

+

+  case 63:

+

+/* Line 1455 of yacc.c  */

+#line 849 "program_parse.y"

+    {

+           gl_register_file file = ((yyvsp[(1) - (1)].temp_sym).name != NULL) 

+	      ? (yyvsp[(1) - (1)].temp_sym).param_binding_type

+	      : PROGRAM_CONSTANT;

+           set_src_reg_swz(& (yyval.src_reg), file, (yyvsp[(1) - (1)].temp_sym).param_binding_begin,

+                           (yyvsp[(1) - (1)].temp_sym).param_binding_swizzle);

+	;}

+    break;

+

+  case 64:

+

+/* Line 1455 of yacc.c  */

+#line 859 "program_parse.y"

+    {

+	   set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, (yyvsp[(1) - (1)].result));

+	;}

+    break;

+

+  case 65:

+

+/* Line 1455 of yacc.c  */

+#line 863 "program_parse.y"

+    {

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

+

+	   free((yyvsp[(1) - (1)].string));

+

+	   if (s == NULL) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type != at_output) && (s->type != at_temp)) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

+	      YYERROR;

+	   }

+

+	   switch (s->type) {

+	   case at_temp:

+	      set_dst_reg(& (yyval.dst_reg), PROGRAM_TEMPORARY, s->temp_binding);

+	      break;

+	   case at_output:

+	      set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, s->output_binding);

+	      break;

+	   default:

+	      set_dst_reg(& (yyval.dst_reg), s->param_binding_type, s->param_binding_begin);

+	      break;

+	   }

+	;}

+    break;

+

+  case 66:

+

+/* Line 1455 of yacc.c  */

+#line 892 "program_parse.y"

+    {

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

+

+	   free((yyvsp[(1) - (1)].string));

+

+	   if (s == NULL) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid operand variable");

+	      YYERROR;

+	   } else if ((s->type != at_param) || !s->param_is_array) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "array access to non-PARAM variable");

+	      YYERROR;

+	   } else {

+	      (yyval.sym) = s;

+	   }

+	;}

+    break;

+

+  case 69:

+

+/* Line 1455 of yacc.c  */

+#line 913 "program_parse.y"

+    {

+	   init_src_reg(& (yyval.src_reg));

+	   (yyval.src_reg).Base.Index = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 70:

+

+/* Line 1455 of yacc.c  */

+#line 920 "program_parse.y"

+    {

+	   /* FINISHME: Add support for multiple address registers.

+	    */

+	   /* FINISHME: Add support for 4-component address registers.

+	    */

+	   init_src_reg(& (yyval.src_reg));

+	   (yyval.src_reg).Base.RelAddr = 1;

+	   (yyval.src_reg).Base.Index = (yyvsp[(3) - (3)].integer);

+	;}

+    break;

+

+  case 71:

+

+/* Line 1455 of yacc.c  */

+#line 931 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 72:

+

+/* Line 1455 of yacc.c  */

+#line 932 "program_parse.y"

+    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}

+    break;

+

+  case 73:

+

+/* Line 1455 of yacc.c  */

+#line 933 "program_parse.y"

+    { (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}

+    break;

+

+  case 74:

+

+/* Line 1455 of yacc.c  */

+#line 937 "program_parse.y"

+    {

+	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 4095)) {

+              char s[100];

+              _mesa_snprintf(s, sizeof(s),

+                             "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));

+	      yyerror(& (yylsp[(1) - (1)]), state, s);

+	      YYERROR;

+	   } else {

+	      (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	   }

+	;}

+    break;

+

+  case 75:

+

+/* Line 1455 of yacc.c  */

+#line 951 "program_parse.y"

+    {

+	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 4096)) {

+              char s[100];

+              _mesa_snprintf(s, sizeof(s),

+                             "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));

+	      yyerror(& (yylsp[(1) - (1)]), state, s);

+	      YYERROR;

+	   } else {

+	      (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	   }

+	;}

+    break;

+

+  case 76:

+

+/* Line 1455 of yacc.c  */

+#line 965 "program_parse.y"

+    {

+	   struct asm_symbol *const s = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));

+

+	   free((yyvsp[(1) - (1)].string));

+

+	   if (s == NULL) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid array member");

+	      YYERROR;

+	   } else if (s->type != at_address) {

+	      yyerror(& (yylsp[(1) - (1)]), state,

+		      "invalid variable for indexed array access");

+	      YYERROR;

+	   } else {

+	      (yyval.sym) = s;

+	   }

+	;}

+    break;

+

+  case 77:

+

+/* Line 1455 of yacc.c  */

+#line 985 "program_parse.y"

+    {

+	   if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid address component selector");

+	      YYERROR;

+	   } else {

+	      (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);

+	   }

+	;}

+    break;

+

+  case 78:

+

+/* Line 1455 of yacc.c  */

+#line 996 "program_parse.y"

+    {

+	   if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {

+	      yyerror(& (yylsp[(1) - (1)]), state,

+		      "address register write mask must be \".x\"");

+	      YYERROR;

+	   } else {

+	      (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);

+	   }

+	;}

+    break;

+

+  case 83:

+

+/* Line 1455 of yacc.c  */

+#line 1012 "program_parse.y"

+    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}

+    break;

+

+  case 88:

+

+/* Line 1455 of yacc.c  */

+#line 1016 "program_parse.y"

+    { (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}

+    break;

+

+  case 89:

+

+/* Line 1455 of yacc.c  */

+#line 1020 "program_parse.y"

+    {

+	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);

+	;}

+    break;

+

+  case 90:

+

+/* Line 1455 of yacc.c  */

+#line 1024 "program_parse.y"

+    {

+	   (yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);

+	;}

+    break;

+

+  case 91:

+

+/* Line 1455 of yacc.c  */

+#line 1028 "program_parse.y"

+    {

+	   (yyval.dst_reg).CondMask = COND_TR;

+	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;

+	   (yyval.dst_reg).CondSrc = 0;

+	;}

+    break;

+

+  case 92:

+

+/* Line 1455 of yacc.c  */

+#line 1036 "program_parse.y"

+    {

+	   (yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);

+	   (yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;

+	;}

+    break;

+

+  case 93:

+

+/* Line 1455 of yacc.c  */

+#line 1043 "program_parse.y"

+    {

+	   (yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);

+	   (yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;

+	;}

+    break;

+

+  case 94:

+

+/* Line 1455 of yacc.c  */

+#line 1050 "program_parse.y"

+    {

+	   const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));

+	   if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {

+	      char *const err_str =

+		 make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));

+

+	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)

+		      ? err_str : "invalid condition code");

+

+	      if (err_str != NULL) {

+		 free(err_str);

+	      }

+

+	      YYERROR;

+	   }

+

+	   (yyval.dst_reg).CondMask = cond;

+	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;

+	   (yyval.dst_reg).CondSrc = 0;

+	;}

+    break;

+

+  case 95:

+

+/* Line 1455 of yacc.c  */

+#line 1073 "program_parse.y"

+    {

+	   const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));

+	   if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {

+	      char *const err_str =

+		 make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));

+

+	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)

+		      ? err_str : "invalid condition code");

+

+	      if (err_str != NULL) {

+		 free(err_str);

+	      }

+

+	      YYERROR;

+	   }

+

+	   (yyval.dst_reg).CondMask = cond;

+	   (yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;

+	   (yyval.dst_reg).CondSrc = 0;

+	;}

+    break;

+

+  case 102:

+

+/* Line 1455 of yacc.c  */

+#line 1104 "program_parse.y"

+    {

+	   struct asm_symbol *const s =

+	      declare_variable(state, (yyvsp[(2) - (4)].string), at_attrib, & (yylsp[(2) - (4)]));

+

+	   if (s == NULL) {

+	      free((yyvsp[(2) - (4)].string));

+	      YYERROR;

+	   } else {

+	      s->attrib_binding = (yyvsp[(4) - (4)].attrib);

+	      state->InputsBound |= (1U << s->attrib_binding);

+

+	      if (!validate_inputs(& (yylsp[(4) - (4)]), state)) {

+		 YYERROR;

+	      }

+	   }

+	;}

+    break;

+

+  case 103:

+

+/* Line 1455 of yacc.c  */

+#line 1123 "program_parse.y"

+    {

+	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);

+	;}

+    break;

+

+  case 104:

+

+/* Line 1455 of yacc.c  */

+#line 1127 "program_parse.y"

+    {

+	   (yyval.attrib) = (yyvsp[(2) - (2)].attrib);

+	;}

+    break;

+

+  case 105:

+

+/* Line 1455 of yacc.c  */

+#line 1133 "program_parse.y"

+    {

+	   (yyval.attrib) = VERT_ATTRIB_POS;

+	;}

+    break;

+

+  case 106:

+

+/* Line 1455 of yacc.c  */

+#line 1137 "program_parse.y"

+    {

+	   (yyval.attrib) = VERT_ATTRIB_WEIGHT;

+	;}

+    break;

+

+  case 107:

+

+/* Line 1455 of yacc.c  */

+#line 1141 "program_parse.y"

+    {

+	   (yyval.attrib) = VERT_ATTRIB_NORMAL;

+	;}

+    break;

+

+  case 108:

+

+/* Line 1455 of yacc.c  */

+#line 1145 "program_parse.y"

+    {

+	   if (!state->ctx->Extensions.EXT_secondary_color) {

+	      yyerror(& (yylsp[(2) - (2)]), state, "GL_EXT_secondary_color not supported");

+	      YYERROR;

+	   }

+

+	   (yyval.attrib) = VERT_ATTRIB_COLOR0 + (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 109:

+

+/* Line 1455 of yacc.c  */

+#line 1154 "program_parse.y"

+    {

+	   if (!state->ctx->Extensions.EXT_fog_coord) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "GL_EXT_fog_coord not supported");

+	      YYERROR;

+	   }

+

+	   (yyval.attrib) = VERT_ATTRIB_FOG;

+	;}

+    break;

+

+  case 110:

+

+/* Line 1455 of yacc.c  */

+#line 1163 "program_parse.y"

+    {

+	   (yyval.attrib) = VERT_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 111:

+

+/* Line 1455 of yacc.c  */

+#line 1167 "program_parse.y"

+    {

+	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");

+	   YYERROR;

+	;}

+    break;

+

+  case 112:

+

+/* Line 1455 of yacc.c  */

+#line 1172 "program_parse.y"

+    {

+	   (yyval.attrib) = VERT_ATTRIB_GENERIC0 + (yyvsp[(3) - (4)].integer);

+	;}

+    break;

+

+  case 113:

+

+/* Line 1455 of yacc.c  */

+#line 1178 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxAttribs) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex attribute reference");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 117:

+

+/* Line 1455 of yacc.c  */

+#line 1192 "program_parse.y"

+    {

+	   (yyval.attrib) = FRAG_ATTRIB_WPOS;

+	;}

+    break;

+

+  case 118:

+

+/* Line 1455 of yacc.c  */

+#line 1196 "program_parse.y"

+    {

+	   (yyval.attrib) = FRAG_ATTRIB_COL0 + (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 119:

+

+/* Line 1455 of yacc.c  */

+#line 1200 "program_parse.y"

+    {

+	   (yyval.attrib) = FRAG_ATTRIB_FOGC;

+	;}

+    break;

+

+  case 120:

+

+/* Line 1455 of yacc.c  */

+#line 1204 "program_parse.y"

+    {

+	   (yyval.attrib) = FRAG_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 123:

+

+/* Line 1455 of yacc.c  */

+#line 1212 "program_parse.y"

+    {

+	   struct asm_symbol *const s =

+	      declare_variable(state, (yyvsp[(2) - (3)].string), at_param, & (yylsp[(2) - (3)]));

+

+	   if (s == NULL) {

+	      free((yyvsp[(2) - (3)].string));

+	      YYERROR;

+	   } else {

+	      s->param_binding_type = (yyvsp[(3) - (3)].temp_sym).param_binding_type;

+	      s->param_binding_begin = (yyvsp[(3) - (3)].temp_sym).param_binding_begin;

+	      s->param_binding_length = (yyvsp[(3) - (3)].temp_sym).param_binding_length;

+              s->param_binding_swizzle = (yyvsp[(3) - (3)].temp_sym).param_binding_swizzle;

+	      s->param_is_array = 0;

+	   }

+	;}

+    break;

+

+  case 124:

+

+/* Line 1455 of yacc.c  */

+#line 1230 "program_parse.y"

+    {

+	   if (((yyvsp[(4) - (6)].integer) != 0) && ((unsigned) (yyvsp[(4) - (6)].integer) != (yyvsp[(6) - (6)].temp_sym).param_binding_length)) {

+	      free((yyvsp[(2) - (6)].string));

+	      yyerror(& (yylsp[(4) - (6)]), state, 

+		      "parameter array size and number of bindings must match");

+	      YYERROR;

+	   } else {

+	      struct asm_symbol *const s =

+		 declare_variable(state, (yyvsp[(2) - (6)].string), (yyvsp[(6) - (6)].temp_sym).type, & (yylsp[(2) - (6)]));

+

+	      if (s == NULL) {

+		 free((yyvsp[(2) - (6)].string));

+		 YYERROR;

+	      } else {

+		 s->param_binding_type = (yyvsp[(6) - (6)].temp_sym).param_binding_type;

+		 s->param_binding_begin = (yyvsp[(6) - (6)].temp_sym).param_binding_begin;

+		 s->param_binding_length = (yyvsp[(6) - (6)].temp_sym).param_binding_length;

+                 s->param_binding_swizzle = SWIZZLE_XYZW;

+		 s->param_is_array = 1;

+	      }

+	   }

+	;}

+    break;

+

+  case 125:

+

+/* Line 1455 of yacc.c  */

+#line 1255 "program_parse.y"

+    {

+	   (yyval.integer) = 0;

+	;}

+    break;

+

+  case 126:

+

+/* Line 1455 of yacc.c  */

+#line 1259 "program_parse.y"

+    {

+	   if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) > state->limits->MaxParameters)) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid parameter array size");

+	      YYERROR;

+	   } else {

+	      (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	   }

+	;}

+    break;

+

+  case 127:

+

+/* Line 1455 of yacc.c  */

+#line 1270 "program_parse.y"

+    {

+	   (yyval.temp_sym) = (yyvsp[(2) - (2)].temp_sym);

+	;}

+    break;

+

+  case 128:

+

+/* Line 1455 of yacc.c  */

+#line 1276 "program_parse.y"

+    {

+	   (yyval.temp_sym) = (yyvsp[(3) - (4)].temp_sym);

+	;}

+    break;

+

+  case 130:

+

+/* Line 1455 of yacc.c  */

+#line 1283 "program_parse.y"

+    {

+	   (yyvsp[(1) - (3)].temp_sym).param_binding_length += (yyvsp[(3) - (3)].temp_sym).param_binding_length;

+	   (yyval.temp_sym) = (yyvsp[(1) - (3)].temp_sym);

+	;}

+    break;

+

+  case 131:

+

+/* Line 1455 of yacc.c  */

+#line 1290 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

+	;}

+    break;

+

+  case 132:

+

+/* Line 1455 of yacc.c  */

+#line 1296 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

+	;}

+    break;

+

+  case 133:

+

+/* Line 1455 of yacc.c  */

+#line 1302 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_TRUE);

+	;}

+    break;

+

+  case 134:

+

+/* Line 1455 of yacc.c  */

+#line 1310 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

+	;}

+    break;

+

+  case 135:

+

+/* Line 1455 of yacc.c  */

+#line 1316 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

+	;}

+    break;

+

+  case 136:

+

+/* Line 1455 of yacc.c  */

+#line 1322 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_TRUE);

+	;}

+    break;

+

+  case 137:

+

+/* Line 1455 of yacc.c  */

+#line 1330 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_state(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

+	;}

+    break;

+

+  case 138:

+

+/* Line 1455 of yacc.c  */

+#line 1336 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_param(state->prog, & (yyval.temp_sym), (yyvsp[(1) - (1)].state));

+	;}

+    break;

+

+  case 139:

+

+/* Line 1455 of yacc.c  */

+#line 1342 "program_parse.y"

+    {

+	   memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));

+	   (yyval.temp_sym).param_binding_begin = ~0;

+	   initialize_symbol_from_const(state->prog, & (yyval.temp_sym), & (yyvsp[(1) - (1)].vector), GL_FALSE);

+	;}

+    break;

+

+  case 140:

+

+/* Line 1455 of yacc.c  */

+#line 1349 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(1) - (1)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 141:

+

+/* Line 1455 of yacc.c  */

+#line 1350 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 142:

+

+/* Line 1455 of yacc.c  */

+#line 1353 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 143:

+

+/* Line 1455 of yacc.c  */

+#line 1354 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 144:

+

+/* Line 1455 of yacc.c  */

+#line 1355 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 145:

+

+/* Line 1455 of yacc.c  */

+#line 1356 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 146:

+

+/* Line 1455 of yacc.c  */

+#line 1357 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 147:

+

+/* Line 1455 of yacc.c  */

+#line 1358 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 148:

+

+/* Line 1455 of yacc.c  */

+#line 1359 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 149:

+

+/* Line 1455 of yacc.c  */

+#line 1360 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 150:

+

+/* Line 1455 of yacc.c  */

+#line 1361 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 151:

+

+/* Line 1455 of yacc.c  */

+#line 1362 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 152:

+

+/* Line 1455 of yacc.c  */

+#line 1363 "program_parse.y"

+    { memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}

+    break;

+

+  case 153:

+

+/* Line 1455 of yacc.c  */

+#line 1367 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_MATERIAL;

+	   (yyval.state)[1] = (yyvsp[(2) - (3)].integer);

+	   (yyval.state)[2] = (yyvsp[(3) - (3)].integer);

+	;}

+    break;

+

+  case 154:

+

+/* Line 1455 of yacc.c  */

+#line 1376 "program_parse.y"

+    {

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 155:

+

+/* Line 1455 of yacc.c  */

+#line 1380 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_EMISSION;

+	;}

+    break;

+

+  case 156:

+

+/* Line 1455 of yacc.c  */

+#line 1384 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_SHININESS;

+	;}

+    break;

+

+  case 157:

+

+/* Line 1455 of yacc.c  */

+#line 1390 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_LIGHT;

+	   (yyval.state)[1] = (yyvsp[(3) - (5)].integer);

+	   (yyval.state)[2] = (yyvsp[(5) - (5)].integer);

+	;}

+    break;

+

+  case 158:

+

+/* Line 1455 of yacc.c  */

+#line 1399 "program_parse.y"

+    {

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 159:

+

+/* Line 1455 of yacc.c  */

+#line 1403 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_POSITION;

+	;}

+    break;

+

+  case 160:

+

+/* Line 1455 of yacc.c  */

+#line 1407 "program_parse.y"

+    {

+	   if (!state->ctx->Extensions.EXT_point_parameters) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "GL_ARB_point_parameters not supported");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = STATE_ATTENUATION;

+	;}

+    break;

+

+  case 161:

+

+/* Line 1455 of yacc.c  */

+#line 1416 "program_parse.y"

+    {

+	   (yyval.integer) = (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 162:

+

+/* Line 1455 of yacc.c  */

+#line 1420 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_HALF_VECTOR;

+	;}

+    break;

+

+  case 163:

+

+/* Line 1455 of yacc.c  */

+#line 1426 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_SPOT_DIRECTION;

+	;}

+    break;

+

+  case 164:

+

+/* Line 1455 of yacc.c  */

+#line 1432 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(2) - (2)].state)[0];

+	   (yyval.state)[1] = (yyvsp[(2) - (2)].state)[1];

+	;}

+    break;

+

+  case 165:

+

+/* Line 1455 of yacc.c  */

+#line 1439 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_LIGHTMODEL_AMBIENT;

+	;}

+    break;

+

+  case 166:

+

+/* Line 1455 of yacc.c  */

+#line 1444 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_LIGHTMODEL_SCENECOLOR;

+	   (yyval.state)[1] = (yyvsp[(1) - (2)].integer);

+	;}

+    break;

+

+  case 167:

+

+/* Line 1455 of yacc.c  */

+#line 1452 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_LIGHTPROD;

+	   (yyval.state)[1] = (yyvsp[(3) - (6)].integer);

+	   (yyval.state)[2] = (yyvsp[(5) - (6)].integer);

+	   (yyval.state)[3] = (yyvsp[(6) - (6)].integer);

+	;}

+    break;

+

+  case 169:

+

+/* Line 1455 of yacc.c  */

+#line 1464 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = (yyvsp[(3) - (3)].integer);

+	   (yyval.state)[1] = (yyvsp[(2) - (3)].integer);

+	;}

+    break;

+

+  case 170:

+

+/* Line 1455 of yacc.c  */

+#line 1472 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXENV_COLOR;

+	;}

+    break;

+

+  case 171:

+

+/* Line 1455 of yacc.c  */

+#line 1478 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_AMBIENT;

+	;}

+    break;

+

+  case 172:

+

+/* Line 1455 of yacc.c  */

+#line 1482 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_DIFFUSE;

+	;}

+    break;

+

+  case 173:

+

+/* Line 1455 of yacc.c  */

+#line 1486 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_SPECULAR;

+	;}

+    break;

+

+  case 174:

+

+/* Line 1455 of yacc.c  */

+#line 1492 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxLights) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid light selector");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 175:

+

+/* Line 1455 of yacc.c  */

+#line 1503 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_TEXGEN;

+	   (yyval.state)[1] = (yyvsp[(2) - (4)].integer);

+	   (yyval.state)[2] = (yyvsp[(3) - (4)].integer) + (yyvsp[(4) - (4)].integer);

+	;}

+    break;

+

+  case 176:

+

+/* Line 1455 of yacc.c  */

+#line 1512 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXGEN_EYE_S;

+	;}

+    break;

+

+  case 177:

+

+/* Line 1455 of yacc.c  */

+#line 1516 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXGEN_OBJECT_S;

+	;}

+    break;

+

+  case 178:

+

+/* Line 1455 of yacc.c  */

+#line 1521 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;

+	;}

+    break;

+

+  case 179:

+

+/* Line 1455 of yacc.c  */

+#line 1525 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;

+	;}

+    break;

+

+  case 180:

+

+/* Line 1455 of yacc.c  */

+#line 1529 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;

+	;}

+    break;

+

+  case 181:

+

+/* Line 1455 of yacc.c  */

+#line 1533 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;

+	;}

+    break;

+

+  case 182:

+

+/* Line 1455 of yacc.c  */

+#line 1539 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 183:

+

+/* Line 1455 of yacc.c  */

+#line 1546 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_FOG_COLOR;

+	;}

+    break;

+

+  case 184:

+

+/* Line 1455 of yacc.c  */

+#line 1550 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_FOG_PARAMS;

+	;}

+    break;

+

+  case 185:

+

+/* Line 1455 of yacc.c  */

+#line 1556 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_CLIPPLANE;

+	   (yyval.state)[1] = (yyvsp[(3) - (5)].integer);

+	;}

+    break;

+

+  case 186:

+

+/* Line 1455 of yacc.c  */

+#line 1564 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxClipPlanes) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid clip plane selector");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 187:

+

+/* Line 1455 of yacc.c  */

+#line 1575 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 188:

+

+/* Line 1455 of yacc.c  */

+#line 1582 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_POINT_SIZE;

+	;}

+    break;

+

+  case 189:

+

+/* Line 1455 of yacc.c  */

+#line 1586 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_POINT_ATTENUATION;

+	;}

+    break;

+

+  case 190:

+

+/* Line 1455 of yacc.c  */

+#line 1592 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(1) - (5)].state)[0];

+	   (yyval.state)[1] = (yyvsp[(1) - (5)].state)[1];

+	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);

+	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);

+	   (yyval.state)[4] = (yyvsp[(1) - (5)].state)[2];

+	;}

+    break;

+

+  case 191:

+

+/* Line 1455 of yacc.c  */

+#line 1602 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(1) - (2)].state)[0];

+	   (yyval.state)[1] = (yyvsp[(1) - (2)].state)[1];

+	   (yyval.state)[2] = (yyvsp[(2) - (2)].state)[2];

+	   (yyval.state)[3] = (yyvsp[(2) - (2)].state)[3];

+	   (yyval.state)[4] = (yyvsp[(1) - (2)].state)[2];

+	;}

+    break;

+

+  case 192:

+

+/* Line 1455 of yacc.c  */

+#line 1612 "program_parse.y"

+    {

+	   (yyval.state)[2] = 0;

+	   (yyval.state)[3] = 3;

+	;}

+    break;

+

+  case 193:

+

+/* Line 1455 of yacc.c  */

+#line 1617 "program_parse.y"

+    {

+	   /* 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 ((yyvsp[(3) - (6)].integer) > (yyvsp[(5) - (6)].integer)) {

+	      yyerror(& (yylsp[(3) - (6)]), state, "invalid matrix row range");

+	      YYERROR;

+	   }

+

+	   (yyval.state)[2] = (yyvsp[(3) - (6)].integer);

+	   (yyval.state)[3] = (yyvsp[(5) - (6)].integer);

+	;}

+    break;

+

+  case 194:

+

+/* Line 1455 of yacc.c  */

+#line 1635 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(2) - (3)].state)[0];

+	   (yyval.state)[1] = (yyvsp[(2) - (3)].state)[1];

+	   (yyval.state)[2] = (yyvsp[(3) - (3)].integer);

+	;}

+    break;

+

+  case 195:

+

+/* Line 1455 of yacc.c  */

+#line 1643 "program_parse.y"

+    {

+	   (yyval.integer) = 0;

+	;}

+    break;

+

+  case 196:

+

+/* Line 1455 of yacc.c  */

+#line 1647 "program_parse.y"

+    {

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 197:

+

+/* Line 1455 of yacc.c  */

+#line 1653 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_MATRIX_INVERSE;

+	;}

+    break;

+

+  case 198:

+

+/* Line 1455 of yacc.c  */

+#line 1657 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_MATRIX_TRANSPOSE;

+	;}

+    break;

+

+  case 199:

+

+/* Line 1455 of yacc.c  */

+#line 1661 "program_parse.y"

+    {

+	   (yyval.integer) = STATE_MATRIX_INVTRANS;

+	;}

+    break;

+

+  case 200:

+

+/* Line 1455 of yacc.c  */

+#line 1667 "program_parse.y"

+    {

+	   if ((yyvsp[(1) - (1)].integer) > 3) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid matrix row reference");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 201:

+

+/* Line 1455 of yacc.c  */

+#line 1678 "program_parse.y"

+    {

+	   (yyval.state)[0] = STATE_MODELVIEW_MATRIX;

+	   (yyval.state)[1] = (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 202:

+

+/* Line 1455 of yacc.c  */

+#line 1683 "program_parse.y"

+    {

+	   (yyval.state)[0] = STATE_PROJECTION_MATRIX;

+	   (yyval.state)[1] = 0;

+	;}

+    break;

+

+  case 203:

+

+/* Line 1455 of yacc.c  */

+#line 1688 "program_parse.y"

+    {

+	   (yyval.state)[0] = STATE_MVP_MATRIX;

+	   (yyval.state)[1] = 0;

+	;}

+    break;

+

+  case 204:

+

+/* Line 1455 of yacc.c  */

+#line 1693 "program_parse.y"

+    {

+	   (yyval.state)[0] = STATE_TEXTURE_MATRIX;

+	   (yyval.state)[1] = (yyvsp[(2) - (2)].integer);

+	;}

+    break;

+

+  case 205:

+

+/* Line 1455 of yacc.c  */

+#line 1698 "program_parse.y"

+    {

+	   yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");

+	   YYERROR;

+	;}

+    break;

+

+  case 206:

+

+/* Line 1455 of yacc.c  */

+#line 1703 "program_parse.y"

+    {

+	   (yyval.state)[0] = STATE_PROGRAM_MATRIX;

+	   (yyval.state)[1] = (yyvsp[(3) - (4)].integer);

+	;}

+    break;

+

+  case 207:

+

+/* Line 1455 of yacc.c  */

+#line 1710 "program_parse.y"

+    {

+	   (yyval.integer) = 0;

+	;}

+    break;

+

+  case 208:

+

+/* Line 1455 of yacc.c  */

+#line 1714 "program_parse.y"

+    {

+	   (yyval.integer) = (yyvsp[(2) - (3)].integer);

+	;}

+    break;

+

+  case 209:

+

+/* Line 1455 of yacc.c  */

+#line 1719 "program_parse.y"

+    {

+	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix

+	    * zero is valid.

+	    */

+	   if ((yyvsp[(1) - (1)].integer) != 0) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid modelview matrix index");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 210:

+

+/* Line 1455 of yacc.c  */

+#line 1732 "program_parse.y"

+    {

+	   /* Since GL_ARB_matrix_palette isn't supported, just let any value

+	    * through here.  The error will be generated later.

+	    */

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 211:

+

+/* Line 1455 of yacc.c  */

+#line 1740 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxProgramMatrices) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program matrix selector");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 212:

+

+/* Line 1455 of yacc.c  */

+#line 1751 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = STATE_DEPTH_RANGE;

+	;}

+    break;

+

+  case 217:

+

+/* Line 1455 of yacc.c  */

+#line 1763 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = state->state_param_enum;

+	   (yyval.state)[1] = STATE_ENV;

+	   (yyval.state)[2] = (yyvsp[(4) - (5)].state)[0];

+	   (yyval.state)[3] = (yyvsp[(4) - (5)].state)[1];

+	;}

+    break;

+

+  case 218:

+

+/* Line 1455 of yacc.c  */

+#line 1773 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(1) - (1)].integer);

+	   (yyval.state)[1] = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 219:

+

+/* Line 1455 of yacc.c  */

+#line 1778 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(1) - (3)].integer);

+	   (yyval.state)[1] = (yyvsp[(3) - (3)].integer);

+	;}

+    break;

+

+  case 220:

+

+/* Line 1455 of yacc.c  */

+#line 1785 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = state->state_param_enum;

+	   (yyval.state)[1] = STATE_ENV;

+	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);

+	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);

+	;}

+    break;

+

+  case 221:

+

+/* Line 1455 of yacc.c  */

+#line 1795 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = state->state_param_enum;

+	   (yyval.state)[1] = STATE_LOCAL;

+	   (yyval.state)[2] = (yyvsp[(4) - (5)].state)[0];

+	   (yyval.state)[3] = (yyvsp[(4) - (5)].state)[1];

+	;}

+    break;

+

+  case 222:

+

+/* Line 1455 of yacc.c  */

+#line 1804 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(1) - (1)].integer);

+	   (yyval.state)[1] = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 223:

+

+/* Line 1455 of yacc.c  */

+#line 1809 "program_parse.y"

+    {

+	   (yyval.state)[0] = (yyvsp[(1) - (3)].integer);

+	   (yyval.state)[1] = (yyvsp[(3) - (3)].integer);

+	;}

+    break;

+

+  case 224:

+

+/* Line 1455 of yacc.c  */

+#line 1816 "program_parse.y"

+    {

+	   memset((yyval.state), 0, sizeof((yyval.state)));

+	   (yyval.state)[0] = state->state_param_enum;

+	   (yyval.state)[1] = STATE_LOCAL;

+	   (yyval.state)[2] = (yyvsp[(4) - (5)].integer);

+	   (yyval.state)[3] = (yyvsp[(4) - (5)].integer);

+	;}

+    break;

+

+  case 225:

+

+/* Line 1455 of yacc.c  */

+#line 1826 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxEnvParams) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid environment parameter reference");

+	      YYERROR;

+	   }

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 226:

+

+/* Line 1455 of yacc.c  */

+#line 1836 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxLocalParams) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid local parameter reference");

+	      YYERROR;

+	   }

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 231:

+

+/* Line 1455 of yacc.c  */

+#line 1851 "program_parse.y"

+    {

+	   (yyval.vector).count = 4;

+	   (yyval.vector).data[0] = (yyvsp[(1) - (1)].real);

+	   (yyval.vector).data[1] = (yyvsp[(1) - (1)].real);

+	   (yyval.vector).data[2] = (yyvsp[(1) - (1)].real);

+	   (yyval.vector).data[3] = (yyvsp[(1) - (1)].real);

+	;}

+    break;

+

+  case 232:

+

+/* Line 1455 of yacc.c  */

+#line 1861 "program_parse.y"

+    {

+	   (yyval.vector).count = 1;

+	   (yyval.vector).data[0] = (yyvsp[(1) - (1)].real);

+	   (yyval.vector).data[1] = (yyvsp[(1) - (1)].real);

+	   (yyval.vector).data[2] = (yyvsp[(1) - (1)].real);

+	   (yyval.vector).data[3] = (yyvsp[(1) - (1)].real);

+	;}

+    break;

+

+  case 233:

+

+/* Line 1455 of yacc.c  */

+#line 1869 "program_parse.y"

+    {

+	   (yyval.vector).count = 1;

+	   (yyval.vector).data[0] = (float) (yyvsp[(1) - (1)].integer);

+	   (yyval.vector).data[1] = (float) (yyvsp[(1) - (1)].integer);

+	   (yyval.vector).data[2] = (float) (yyvsp[(1) - (1)].integer);

+	   (yyval.vector).data[3] = (float) (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 234:

+

+/* Line 1455 of yacc.c  */

+#line 1879 "program_parse.y"

+    {

+	   (yyval.vector).count = 4;

+	   (yyval.vector).data[0] = (yyvsp[(2) - (3)].real);

+	   (yyval.vector).data[1] = 0.0f;

+	   (yyval.vector).data[2] = 0.0f;

+	   (yyval.vector).data[3] = 1.0f;

+	;}

+    break;

+

+  case 235:

+

+/* Line 1455 of yacc.c  */

+#line 1887 "program_parse.y"

+    {

+	   (yyval.vector).count = 4;

+	   (yyval.vector).data[0] = (yyvsp[(2) - (5)].real);

+	   (yyval.vector).data[1] = (yyvsp[(4) - (5)].real);

+	   (yyval.vector).data[2] = 0.0f;

+	   (yyval.vector).data[3] = 1.0f;

+	;}

+    break;

+

+  case 236:

+

+/* Line 1455 of yacc.c  */

+#line 1896 "program_parse.y"

+    {

+	   (yyval.vector).count = 4;

+	   (yyval.vector).data[0] = (yyvsp[(2) - (7)].real);

+	   (yyval.vector).data[1] = (yyvsp[(4) - (7)].real);

+	   (yyval.vector).data[2] = (yyvsp[(6) - (7)].real);

+	   (yyval.vector).data[3] = 1.0f;

+	;}

+    break;

+

+  case 237:

+

+/* Line 1455 of yacc.c  */

+#line 1905 "program_parse.y"

+    {

+	   (yyval.vector).count = 4;

+	   (yyval.vector).data[0] = (yyvsp[(2) - (9)].real);

+	   (yyval.vector).data[1] = (yyvsp[(4) - (9)].real);

+	   (yyval.vector).data[2] = (yyvsp[(6) - (9)].real);

+	   (yyval.vector).data[3] = (yyvsp[(8) - (9)].real);

+	;}

+    break;

+

+  case 238:

+

+/* Line 1455 of yacc.c  */

+#line 1915 "program_parse.y"

+    {

+	   (yyval.real) = ((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].real) : (yyvsp[(2) - (2)].real);

+	;}

+    break;

+

+  case 239:

+

+/* Line 1455 of yacc.c  */

+#line 1919 "program_parse.y"

+    {

+	   (yyval.real) = (float)(((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].integer) : (yyvsp[(2) - (2)].integer));

+	;}

+    break;

+

+  case 240:

+

+/* Line 1455 of yacc.c  */

+#line 1924 "program_parse.y"

+    { (yyval.negate) = FALSE; ;}

+    break;

+

+  case 241:

+

+/* Line 1455 of yacc.c  */

+#line 1925 "program_parse.y"

+    { (yyval.negate) = TRUE;  ;}

+    break;

+

+  case 242:

+

+/* Line 1455 of yacc.c  */

+#line 1926 "program_parse.y"

+    { (yyval.negate) = FALSE; ;}

+    break;

+

+  case 243:

+

+/* Line 1455 of yacc.c  */

+#line 1929 "program_parse.y"

+    { (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}

+    break;

+

+  case 245:

+

+/* Line 1455 of yacc.c  */

+#line 1933 "program_parse.y"

+    {

+	   /* 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(& (yylsp[(1) - (1)]), state, "unexpected IDENTIFIER");

+	      YYERROR;

+	   }

+

+	   if (strcmp("SHORT", (yyvsp[(1) - (1)].string)) == 0) {

+	   } else if (strcmp("LONG", (yyvsp[(1) - (1)].string)) == 0) {

+	   } else {

+	      char *const err_str =

+		 make_error_string("invalid storage size specifier \"%s\"",

+				   (yyvsp[(1) - (1)].string));

+

+	      yyerror(& (yylsp[(1) - (1)]), state, (err_str != NULL)

+		      ? err_str : "invalid storage size specifier");

+

+	      if (err_str != NULL) {

+		 free(err_str);

+	      }

+

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 246:

+

+/* Line 1455 of yacc.c  */

+#line 1967 "program_parse.y"

+    {

+	;}

+    break;

+

+  case 247:

+

+/* Line 1455 of yacc.c  */

+#line 1971 "program_parse.y"

+    { (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}

+    break;

+

+  case 249:

+

+/* Line 1455 of yacc.c  */

+#line 1975 "program_parse.y"

+    {

+	   if (!declare_variable(state, (yyvsp[(3) - (3)].string), (yyvsp[(0) - (3)].integer), & (yylsp[(3) - (3)]))) {

+	      free((yyvsp[(3) - (3)].string));

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 250:

+

+/* Line 1455 of yacc.c  */

+#line 1982 "program_parse.y"

+    {

+	   if (!declare_variable(state, (yyvsp[(1) - (1)].string), (yyvsp[(0) - (1)].integer), & (yylsp[(1) - (1)]))) {

+	      free((yyvsp[(1) - (1)].string));

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 251:

+

+/* Line 1455 of yacc.c  */

+#line 1991 "program_parse.y"

+    {

+	   struct asm_symbol *const s =

+	      declare_variable(state, (yyvsp[(3) - (5)].string), at_output, & (yylsp[(3) - (5)]));

+

+	   if (s == NULL) {

+	      free((yyvsp[(3) - (5)].string));

+	      YYERROR;

+	   } else {

+	      s->output_binding = (yyvsp[(5) - (5)].result);

+	   }

+	;}

+    break;

+

+  case 252:

+

+/* Line 1455 of yacc.c  */

+#line 2005 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.result) = VERT_RESULT_HPOS;

+	   } else {

+	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 253:

+

+/* Line 1455 of yacc.c  */

+#line 2014 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.result) = VERT_RESULT_FOGC;

+	   } else {

+	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 254:

+

+/* Line 1455 of yacc.c  */

+#line 2023 "program_parse.y"

+    {

+	   (yyval.result) = (yyvsp[(2) - (2)].result);

+	;}

+    break;

+

+  case 255:

+

+/* Line 1455 of yacc.c  */

+#line 2027 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.result) = VERT_RESULT_PSIZ;

+	   } else {

+	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 256:

+

+/* Line 1455 of yacc.c  */

+#line 2036 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.result) = VERT_RESULT_TEX0 + (yyvsp[(3) - (3)].integer);

+	   } else {

+	      yyerror(& (yylsp[(2) - (3)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 257:

+

+/* Line 1455 of yacc.c  */

+#line 2045 "program_parse.y"

+    {

+	   if (state->mode == ARB_fragment) {

+	      (yyval.result) = FRAG_RESULT_DEPTH;

+	   } else {

+	      yyerror(& (yylsp[(2) - (2)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 258:

+

+/* Line 1455 of yacc.c  */

+#line 2056 "program_parse.y"

+    {

+	   (yyval.result) = (yyvsp[(2) - (3)].integer) + (yyvsp[(3) - (3)].integer);

+	;}

+    break;

+

+  case 259:

+

+/* Line 1455 of yacc.c  */

+#line 2062 "program_parse.y"

+    {

+	   (yyval.integer) = (state->mode == ARB_vertex)

+	      ? VERT_RESULT_COL0

+	      : FRAG_RESULT_COLOR;

+	;}

+    break;

+

+  case 260:

+

+/* Line 1455 of yacc.c  */

+#line 2068 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.integer) = VERT_RESULT_COL0;

+	   } else {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 261:

+

+/* Line 1455 of yacc.c  */

+#line 2077 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.integer) = VERT_RESULT_BFC0;

+	   } else {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 262:

+

+/* Line 1455 of yacc.c  */

+#line 2088 "program_parse.y"

+    {

+	   (yyval.integer) = 0; 

+	;}

+    break;

+

+  case 263:

+

+/* Line 1455 of yacc.c  */

+#line 2092 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.integer) = 0;

+	   } else {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 264:

+

+/* Line 1455 of yacc.c  */

+#line 2101 "program_parse.y"

+    {

+	   if (state->mode == ARB_vertex) {

+	      (yyval.integer) = 1;

+	   } else {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid program result name");

+	      YYERROR;

+	   }

+	;}

+    break;

+

+  case 265:

+

+/* Line 1455 of yacc.c  */

+#line 2111 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 266:

+

+/* Line 1455 of yacc.c  */

+#line 2112 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 267:

+

+/* Line 1455 of yacc.c  */

+#line 2113 "program_parse.y"

+    { (yyval.integer) = 1; ;}

+    break;

+

+  case 268:

+

+/* Line 1455 of yacc.c  */

+#line 2116 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 269:

+

+/* Line 1455 of yacc.c  */

+#line 2117 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 270:

+

+/* Line 1455 of yacc.c  */

+#line 2118 "program_parse.y"

+    { (yyval.integer) = 1; ;}

+    break;

+

+  case 271:

+

+/* Line 1455 of yacc.c  */

+#line 2121 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 272:

+

+/* Line 1455 of yacc.c  */

+#line 2122 "program_parse.y"

+    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}

+    break;

+

+  case 273:

+

+/* Line 1455 of yacc.c  */

+#line 2125 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 274:

+

+/* Line 1455 of yacc.c  */

+#line 2126 "program_parse.y"

+    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}

+    break;

+

+  case 275:

+

+/* Line 1455 of yacc.c  */

+#line 2129 "program_parse.y"

+    { (yyval.integer) = 0; ;}

+    break;

+

+  case 276:

+

+/* Line 1455 of yacc.c  */

+#line 2130 "program_parse.y"

+    { (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}

+    break;

+

+  case 277:

+

+/* Line 1455 of yacc.c  */

+#line 2134 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureCoordUnits) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture coordinate unit selector");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 278:

+

+/* Line 1455 of yacc.c  */

+#line 2145 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureImageUnits) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture image unit selector");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 279:

+

+/* Line 1455 of yacc.c  */

+#line 2156 "program_parse.y"

+    {

+	   if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureUnits) {

+	      yyerror(& (yylsp[(1) - (1)]), state, "invalid texture unit selector");

+	      YYERROR;

+	   }

+

+	   (yyval.integer) = (yyvsp[(1) - (1)].integer);

+	;}

+    break;

+

+  case 280:

+

+/* Line 1455 of yacc.c  */

+#line 2167 "program_parse.y"

+    {

+	   struct asm_symbol *exist = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(2) - (4)].string));

+	   struct asm_symbol *target = (struct asm_symbol *)

+	      _mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(4) - (4)].string));

+

+	   free((yyvsp[(4) - (4)].string));

+

+	   if (exist != NULL) {

+	      char m[1000];

+	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));

+	      free((yyvsp[(2) - (4)].string));

+	      yyerror(& (yylsp[(2) - (4)]), state, m);

+	      YYERROR;

+	   } else if (target == NULL) {

+	      free((yyvsp[(2) - (4)].string));

+	      yyerror(& (yylsp[(4) - (4)]), state,

+		      "undefined variable binding in ALIAS statement");

+	      YYERROR;

+	   } else {

+	      _mesa_symbol_table_add_symbol(state->st, 0, (yyvsp[(2) - (4)].string), target);

+	   }

+	;}

+    break;

+

+

+

+/* Line 1455 of yacc.c  */

+#line 4938 "program_parse.tab.c"

+      default: break;

+    }

+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);

+

+  YYPOPSTACK (yylen);

+  yylen = 0;

+  YY_STACK_PRINT (yyss, yyssp);

+

+  *++yyvsp = yyval;

+  *++yylsp = yyloc;

+

+  /* Now `shift' the result of the reduction.  Determine what state

+     that goes to, based on the state we popped back to and the rule

+     number reduced by.  */

+

+  yyn = yyr1[yyn];

+

+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;

+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)

+    yystate = yytable[yystate];

+  else

+    yystate = yydefgoto[yyn - YYNTOKENS];

+

+  goto yynewstate;

+

+

+/*------------------------------------.

+| yyerrlab -- here on detecting error |

+`------------------------------------*/

+yyerrlab:

+  /* If not already recovering from an error, report this error.  */

+  if (!yyerrstatus)

+    {

+      ++yynerrs;

+#if ! YYERROR_VERBOSE

+      yyerror (&yylloc, state, YY_("syntax error"));

+#else

+      {

+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);

+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)

+	  {

+	    YYSIZE_T yyalloc = 2 * yysize;

+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))

+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;

+	    if (yymsg != yymsgbuf)

+	      YYSTACK_FREE (yymsg);

+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);

+	    if (yymsg)

+	      yymsg_alloc = yyalloc;

+	    else

+	      {

+		yymsg = yymsgbuf;

+		yymsg_alloc = sizeof yymsgbuf;

+	      }

+	  }

+

+	if (0 < yysize && yysize <= yymsg_alloc)

+	  {

+	    (void) yysyntax_error (yymsg, yystate, yychar);

+	    yyerror (&yylloc, state, yymsg);

+	  }

+	else

+	  {

+	    yyerror (&yylloc, state, YY_("syntax error"));

+	    if (yysize != 0)

+	      goto yyexhaustedlab;

+	  }

+      }

+#endif

+    }

+

+  yyerror_range[0] = yylloc;

+

+  if (yyerrstatus == 3)

+    {

+      /* If just tried and failed to reuse lookahead token after an

+	 error, discard it.  */

+

+      if (yychar <= YYEOF)

+	{

+	  /* Return failure if at end of input.  */

+	  if (yychar == YYEOF)

+	    YYABORT;

+	}

+      else

+	{

+	  yydestruct ("Error: discarding",

+		      yytoken, &yylval, &yylloc, state);

+	  yychar = YYEMPTY;

+	}

+    }

+

+  /* Else will try to reuse lookahead token after shifting the error

+     token.  */

+  goto yyerrlab1;

+

+

+/*---------------------------------------------------.

+| yyerrorlab -- error raised explicitly by YYERROR.  |

+`---------------------------------------------------*/

+yyerrorlab:

+

+  /* Pacify compilers like GCC when the user code never invokes

+     YYERROR and the label yyerrorlab therefore never appears in user

+     code.  */

+  if (/*CONSTCOND*/ 0)

+     goto yyerrorlab;

+

+  yyerror_range[0] = yylsp[1-yylen];

+  /* Do not reclaim the symbols of the rule which action triggered

+     this YYERROR.  */

+  YYPOPSTACK (yylen);

+  yylen = 0;

+  YY_STACK_PRINT (yyss, yyssp);

+  yystate = *yyssp;

+  goto yyerrlab1;

+

+

+/*-------------------------------------------------------------.

+| yyerrlab1 -- common code for both syntax error and YYERROR.  |

+`-------------------------------------------------------------*/

+yyerrlab1:

+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */

+

+  for (;;)

+    {

+      yyn = yypact[yystate];

+      if (yyn != YYPACT_NINF)

+	{

+	  yyn += YYTERROR;

+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)

+	    {

+	      yyn = yytable[yyn];

+	      if (0 < yyn)

+		break;

+	    }

+	}

+

+      /* Pop the current state because it cannot handle the error token.  */

+      if (yyssp == yyss)

+	YYABORT;

+

+      yyerror_range[0] = *yylsp;

+      yydestruct ("Error: popping",

+		  yystos[yystate], yyvsp, yylsp, state);

+      YYPOPSTACK (1);

+      yystate = *yyssp;

+      YY_STACK_PRINT (yyss, yyssp);

+    }

+

+  *++yyvsp = yylval;

+

+  yyerror_range[1] = yylloc;

+  /* Using YYLLOC is tempting, but would change the location of

+     the lookahead.  YYLOC is available though.  */

+  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);

+  *++yylsp = yyloc;

+

+  /* Shift the error token.  */

+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);

+

+  yystate = yyn;

+  goto yynewstate;

+

+

+/*-------------------------------------.

+| yyacceptlab -- YYACCEPT comes here.  |

+`-------------------------------------*/

+yyacceptlab:

+  yyresult = 0;

+  goto yyreturn;

+

+/*-----------------------------------.

+| yyabortlab -- YYABORT comes here.  |

+`-----------------------------------*/

+yyabortlab:

+  yyresult = 1;

+  goto yyreturn;

+

+#if !defined(yyoverflow) || YYERROR_VERBOSE

+/*-------------------------------------------------.

+| yyexhaustedlab -- memory exhaustion comes here.  |

+`-------------------------------------------------*/

+yyexhaustedlab:

+  yyerror (&yylloc, state, YY_("memory exhausted"));

+  yyresult = 2;

+  /* Fall through.  */

+#endif

+

+yyreturn:

+  if (yychar != YYEMPTY)

+     yydestruct ("Cleanup: discarding lookahead",

+		 yytoken, &yylval, &yylloc, state);

+  /* Do not reclaim the symbols of the rule which action triggered

+     this YYABORT or YYACCEPT.  */

+  YYPOPSTACK (yylen);

+  YY_STACK_PRINT (yyss, yyssp);

+  while (yyssp != yyss)

+    {

+      yydestruct ("Cleanup: popping",

+		  yystos[*yyssp], yyvsp, yylsp, state);

+      YYPOPSTACK (1);

+    }

+#ifndef yyoverflow

+  if (yyss != yyssa)

+    YYSTACK_FREE (yyss);

+#endif

+#if YYERROR_VERBOSE

+  if (yymsg != yymsgbuf)

+    YYSTACK_FREE (yymsg);

+#endif

+  /* Make sure YYID is used.  */

+  return YYID (yyresult);

+}

+

+

+

+/* Line 1675 of yacc.c  */

+#line 2196 "program_parse.y"

+

+

+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/program_parse.y b/mesalib/src/mesa/program/program_parse.y
index cf621ae42..a85977e2e 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 > 4095)) {
-              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 > 4096)) {
-              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(GLcontext *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 > 4095)) {

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

+              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/program_parser.h b/mesalib/src/mesa/program/program_parser.h
index be952d4b9..ff2f4f25f 100644
--- a/mesalib/src/mesa/program/program_parser.h
+++ b/mesalib/src/mesa/program/program_parser.h
@@ -1,302 +1,299 @@
-/*
- * 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.
- */
-#pragma once
-
-#include "main/config.h"
-
-#ifndef MTYPES_H
-struct __GLcontextRec;
-typedef struct __GLcontextRec GLcontext;
-#endif
-
-enum asm_type {
-   at_none,
-   at_address,
-   at_attrib,
-   at_param,
-   at_temp,
-   at_output
-};
-
-struct asm_symbol {
-   struct asm_symbol *next;    /**< List linkage for freeing. */
-   const char *name;
-   enum asm_type type;
-   unsigned attrib_binding;
-   unsigned output_binding;   /**< Output / result register number. */
-
-   /**
-    * One of PROGRAM_STATE_VAR, PROGRAM_LOCAL_PARAM, or PROGRAM_ENV_PARAM.
-    */
-   unsigned param_binding_type;
-
-   /** 
-    * Offset into the program_parameter_list where the tokens representing our
-    * bound state (or constants) start.
-    */
-   unsigned param_binding_begin;
-
-   /**
-    * Constants put into the parameter list may be swizzled.  This
-    * field contain's the symbol's swizzle. (SWIZZLE_X/Y/Z/W)
-    */
-   unsigned param_binding_swizzle;
-
-   /* This is how many entries in the program_parameter_list we take up
-    * with our state tokens or constants. Note that this is _not_ the same as
-    * the number of param registers we eventually use.
-    */
-   unsigned param_binding_length;
-
-   /**
-    * Index of the temp register assigned to this variable.
-    */
-   unsigned temp_binding;
-
-   /**
-    * Flag whether or not a PARAM is an array
-    */
-   unsigned param_is_array:1;
-
-
-   /**
-    * Flag whether or not a PARAM array is accessed indirectly
-    */
-   unsigned param_accessed_indirectly:1;
-
-
-   /**
-    * \brief Is first pass of parameter layout done with this variable?
-    *
-    * The parameter layout routine operates in two passes.  This flag tracks
-    * whether or not the first pass has handled this variable.
-    *
-    * \sa _mesa_layout_parameters
-    */
-   unsigned pass1_done:1;
-};
-
-
-struct asm_vector {
-   unsigned count;
-   float    data[4];
-};
-
-
-struct asm_swizzle_mask {
-   unsigned swizzle:12;
-   unsigned mask:4;
-};
-
-
-struct asm_src_register {
-   struct prog_src_register Base;
-
-   /**
-    * Symbol associated with indirect access to parameter arrays.
-    *
-    * If \c Base::RelAddr is 1, this will point to the symbol for the parameter
-    * that is being dereferenced.  Further, \c Base::Index will be the offset
-    * from the address register being used.
-    */
-   struct asm_symbol *Symbol;
-};
-
-
-struct asm_instruction {
-   struct prog_instruction Base;
-   struct asm_instruction *next;
-   struct asm_src_register SrcReg[3];
-};
-
-
-struct asm_parser_state {
-   GLcontext *ctx;
-   struct gl_program *prog;
-
-   /**
-    * Per-program target limits
-    */
-   struct gl_program_constants *limits;
-
-   struct _mesa_symbol_table *st;
-
-   /**
-    * Linked list of symbols
-    *
-    * This list is \b only used when cleaning up compiler state and freeing
-    * memory.
-    */
-   struct asm_symbol *sym;
-
-   /**
-    * State for the lexer.
-    */
-   void *scanner;
-
-   /**
-    * Linked list of instructions generated during parsing.
-    */
-   /*@{*/
-   struct asm_instruction *inst_head;
-   struct asm_instruction *inst_tail;
-   /*@}*/
-
-
-   /**
-    * Selected limits copied from gl_constants
-    *
-    * These are limits from the GL context, but various bits in the program
-    * must be validated against these values.
-    */
-   /*@{*/
-   unsigned MaxTextureCoordUnits;
-   unsigned MaxTextureImageUnits;
-   unsigned MaxTextureUnits;
-   unsigned MaxClipPlanes;
-   unsigned MaxLights;
-   unsigned MaxProgramMatrices;
-   /*@}*/
-
-   /**
-    * Value to use in state vector accessors for environment and local
-    * parameters
-    */
-   unsigned state_param_enum;
-
-
-   /**
-    * Input attributes bound to specific names
-    *
-    * This is only needed so that errors can be properly produced when
-    * multiple ATTRIB statements bind illegal combinations of vertex
-    * attributes.
-    */
-   unsigned InputsBound;
-
-   enum {
-      invalid_mode = 0,
-      ARB_vertex,
-      ARB_fragment
-   } mode;
-
-   struct {
-      unsigned PositionInvariant:1;
-      unsigned Fog:2;
-      unsigned PrecisionHint:2;
-      unsigned DrawBuffers:1;
-      unsigned Shadow:1;
-      unsigned TexRect:1;
-      unsigned TexArray:1;
-      unsigned NV_fragment:1;
-      unsigned OriginUpperLeft:1;
-      unsigned PixelCenterInteger:1;
-   } option;
-
-   struct {
-      unsigned UsesKill:1;
-   } fragment;
-};
-
-#define OPTION_NONE        0
-#define OPTION_FOG_EXP     1
-#define OPTION_FOG_EXP2    2
-#define OPTION_FOG_LINEAR  3
-#define OPTION_NICEST      1
-#define OPTION_FASTEST     2
-
-typedef struct YYLTYPE {
-   int first_line;
-   int first_column;
-   int last_line;
-   int last_column;
-   int position;
-} YYLTYPE;
-
-#define YYLTYPE_IS_DECLARED 1
-#define YYLTYPE_IS_TRIVIAL 1
-
-
-extern GLboolean _mesa_parse_arb_program(GLcontext *ctx, GLenum target,
-    const GLubyte *str, GLsizei len, struct asm_parser_state *state);
-
-
-
-/* From program_lexer.l. */
-extern void _mesa_program_lexer_dtor(void *scanner);
-
-extern void _mesa_program_lexer_ctor(void **scanner,
-    struct asm_parser_state *state, const char *string, size_t len);
-
-
-/**
- *\name From program_parse_extra.c
- */
-/*@{*/
-
-/**
- * Parses and processes an option string to an ARB vertex program
- *
- * \return
- * Non-zero on success, zero on failure.
- */
-extern int _mesa_ARBvp_parse_option(struct asm_parser_state *state,
-    const char *option);
-
-/**
- * Parses and processes an option string to an ARB fragment program
- *
- * \return
- * Non-zero on success, zero on failure.
- */
-extern int _mesa_ARBfp_parse_option(struct asm_parser_state *state,
-    const char *option);
-
-/**
- * Parses and processes instruction suffixes
- *
- * Instruction suffixes, such as \c _SAT, are processed.  The relevant bits
- * are set in \c inst.  If suffixes are encountered that are either not known
- * or not supported by the modes and options set in \c state, zero will be
- * returned.
- *
- * \return
- * Non-zero on success, zero on failure.
- */
-extern int _mesa_parse_instruction_suffix(const struct asm_parser_state *state,
-    const char *suffix, struct prog_instruction *inst);
-
-/**
- * Parses a condition code name
- *
- * The condition code names (e.g., \c LT, \c GT, \c NE) were added to assembly
- * shaders with the \c GL_NV_fragment_program_option extension.  This function
- * converts a string representation into one of the \c COND_ macros.
- *
- * \return
- * One of the \c COND_ macros defined in prog_instruction.h on success or zero
- * on failure.
- */
-extern int _mesa_parse_cc(const char *s);
-
-/*@}*/
+/*

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

+ */

+#pragma once

+

+#include "main/config.h"

+

+struct gl_context;

+

+enum asm_type {

+   at_none,

+   at_address,

+   at_attrib,

+   at_param,

+   at_temp,

+   at_output

+};

+

+struct asm_symbol {

+   struct asm_symbol *next;    /**< List linkage for freeing. */

+   const char *name;

+   enum asm_type type;

+   unsigned attrib_binding;

+   unsigned output_binding;   /**< Output / result register number. */

+

+   /**

+    * One of PROGRAM_STATE_VAR, PROGRAM_LOCAL_PARAM, or PROGRAM_ENV_PARAM.

+    */

+   unsigned param_binding_type;

+

+   /** 

+    * Offset into the program_parameter_list where the tokens representing our

+    * bound state (or constants) start.

+    */

+   unsigned param_binding_begin;

+

+   /**

+    * Constants put into the parameter list may be swizzled.  This

+    * field contain's the symbol's swizzle. (SWIZZLE_X/Y/Z/W)

+    */

+   unsigned param_binding_swizzle;

+

+   /* This is how many entries in the program_parameter_list we take up

+    * with our state tokens or constants. Note that this is _not_ the same as

+    * the number of param registers we eventually use.

+    */

+   unsigned param_binding_length;

+

+   /**

+    * Index of the temp register assigned to this variable.

+    */

+   unsigned temp_binding;

+

+   /**

+    * Flag whether or not a PARAM is an array

+    */

+   unsigned param_is_array:1;

+

+

+   /**

+    * Flag whether or not a PARAM array is accessed indirectly

+    */

+   unsigned param_accessed_indirectly:1;

+

+

+   /**

+    * \brief Is first pass of parameter layout done with this variable?

+    *

+    * The parameter layout routine operates in two passes.  This flag tracks

+    * whether or not the first pass has handled this variable.

+    *

+    * \sa _mesa_layout_parameters

+    */

+   unsigned pass1_done:1;

+};

+

+

+struct asm_vector {

+   unsigned count;

+   float    data[4];

+};

+

+

+struct asm_swizzle_mask {

+   unsigned swizzle:12;

+   unsigned mask:4;

+};

+

+

+struct asm_src_register {

+   struct prog_src_register Base;

+

+   /**

+    * Symbol associated with indirect access to parameter arrays.

+    *

+    * If \c Base::RelAddr is 1, this will point to the symbol for the parameter

+    * that is being dereferenced.  Further, \c Base::Index will be the offset

+    * from the address register being used.

+    */

+   struct asm_symbol *Symbol;

+};

+

+

+struct asm_instruction {

+   struct prog_instruction Base;

+   struct asm_instruction *next;

+   struct asm_src_register SrcReg[3];

+};

+

+

+struct asm_parser_state {

+   struct gl_context *ctx;

+   struct gl_program *prog;

+

+   /**

+    * Per-program target limits

+    */

+   struct gl_program_constants *limits;

+

+   struct _mesa_symbol_table *st;

+

+   /**

+    * Linked list of symbols

+    *

+    * This list is \b only used when cleaning up compiler state and freeing

+    * memory.

+    */

+   struct asm_symbol *sym;

+

+   /**

+    * State for the lexer.

+    */

+   void *scanner;

+

+   /**

+    * Linked list of instructions generated during parsing.

+    */

+   /*@{*/

+   struct asm_instruction *inst_head;

+   struct asm_instruction *inst_tail;

+   /*@}*/

+

+

+   /**

+    * Selected limits copied from gl_constants

+    *

+    * These are limits from the GL context, but various bits in the program

+    * must be validated against these values.

+    */

+   /*@{*/

+   unsigned MaxTextureCoordUnits;

+   unsigned MaxTextureImageUnits;

+   unsigned MaxTextureUnits;

+   unsigned MaxClipPlanes;

+   unsigned MaxLights;

+   unsigned MaxProgramMatrices;

+   /*@}*/

+

+   /**

+    * Value to use in state vector accessors for environment and local

+    * parameters

+    */

+   unsigned state_param_enum;

+

+

+   /**

+    * Input attributes bound to specific names

+    *

+    * This is only needed so that errors can be properly produced when

+    * multiple ATTRIB statements bind illegal combinations of vertex

+    * attributes.

+    */

+   unsigned InputsBound;

+

+   enum {

+      invalid_mode = 0,

+      ARB_vertex,

+      ARB_fragment

+   } mode;

+

+   struct {

+      unsigned PositionInvariant:1;

+      unsigned Fog:2;

+      unsigned PrecisionHint:2;

+      unsigned DrawBuffers:1;

+      unsigned Shadow:1;

+      unsigned TexRect:1;

+      unsigned TexArray:1;

+      unsigned NV_fragment:1;

+      unsigned OriginUpperLeft:1;

+      unsigned PixelCenterInteger:1;

+   } option;

+

+   struct {

+      unsigned UsesKill:1;

+   } fragment;

+};

+

+#define OPTION_NONE        0

+#define OPTION_FOG_EXP     1

+#define OPTION_FOG_EXP2    2

+#define OPTION_FOG_LINEAR  3

+#define OPTION_NICEST      1

+#define OPTION_FASTEST     2

+

+typedef struct YYLTYPE {

+   int first_line;

+   int first_column;

+   int last_line;

+   int last_column;

+   int position;

+} YYLTYPE;

+

+#define YYLTYPE_IS_DECLARED 1

+#define YYLTYPE_IS_TRIVIAL 1

+

+

+extern GLboolean _mesa_parse_arb_program(struct gl_context *ctx, GLenum target,

+    const GLubyte *str, GLsizei len, struct asm_parser_state *state);

+

+

+

+/* From program_lexer.l. */

+extern void _mesa_program_lexer_dtor(void *scanner);

+

+extern void _mesa_program_lexer_ctor(void **scanner,

+    struct asm_parser_state *state, const char *string, size_t len);

+

+

+/**

+ *\name From program_parse_extra.c

+ */

+/*@{*/

+

+/**

+ * Parses and processes an option string to an ARB vertex program

+ *

+ * \return

+ * Non-zero on success, zero on failure.

+ */

+extern int _mesa_ARBvp_parse_option(struct asm_parser_state *state,

+    const char *option);

+

+/**

+ * Parses and processes an option string to an ARB fragment program

+ *

+ * \return

+ * Non-zero on success, zero on failure.

+ */

+extern int _mesa_ARBfp_parse_option(struct asm_parser_state *state,

+    const char *option);

+

+/**

+ * Parses and processes instruction suffixes

+ *

+ * Instruction suffixes, such as \c _SAT, are processed.  The relevant bits

+ * are set in \c inst.  If suffixes are encountered that are either not known

+ * or not supported by the modes and options set in \c state, zero will be

+ * returned.

+ *

+ * \return

+ * Non-zero on success, zero on failure.

+ */

+extern int _mesa_parse_instruction_suffix(const struct asm_parser_state *state,

+    const char *suffix, struct prog_instruction *inst);

+

+/**

+ * Parses a condition code name

+ *

+ * The condition code names (e.g., \c LT, \c GT, \c NE) were added to assembly

+ * shaders with the \c GL_NV_fragment_program_option extension.  This function

+ * converts a string representation into one of the \c COND_ macros.

+ *

+ * \return

+ * One of the \c COND_ macros defined in prog_instruction.h on success or zero

+ * on failure.

+ */

+extern int _mesa_parse_cc(const char *s);

+

+/*@}*/

diff --git a/mesalib/src/mesa/program/programopt.c b/mesalib/src/mesa/program/programopt.c
index fb2ebe633..6601f7416 100644
--- a/mesalib/src/mesa/program/programopt.c
+++ b/mesalib/src/mesa/program/programopt.c
@@ -1,669 +1,669 @@
-/*
- * 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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *ctx, struct gl_fragment_program *fprog)
-{
-   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_ZERO_ONE;
-         /* 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 */
-   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(GLcontext *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(GLcontext *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)

+{

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

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

+   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 4af6357f9..2e07d8989 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(GLcontext *ctx, struct gl_vertex_program *vprog);
-
-extern void
-_mesa_append_fog_code(GLcontext *ctx, struct gl_fragment_program *fprog);
-
-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(GLcontext *ctx, struct gl_fragment_program *prog);
-
-extern void
-_mesa_nop_vertex_program(GLcontext *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);

+

+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/register_allocate.c b/mesalib/src/mesa/program/register_allocate.c
new file mode 100644
index 000000000..93e0cbe78
--- /dev/null
+++ b/mesalib/src/mesa/program/register_allocate.c
@@ -0,0 +1,425 @@
+/*

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

+ *

+ * Authors:

+ *    Eric Anholt <eric@anholt.net>

+ *

+ */

+

+/** @file register_allocate.c

+ *

+ * Graph-coloring register allocator.

+ */

+

+#include <talloc.h>

+

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+#include "register_allocate.h"

+

+struct ra_reg {

+   char *name;

+   GLboolean *conflicts;

+};

+

+struct ra_regs {

+   struct ra_reg *regs;

+   unsigned int count;

+

+   struct ra_class **classes;

+   unsigned int class_count;

+};

+

+struct ra_class {

+   GLboolean *regs;

+

+   /**

+    * p_B in Runeson/Nyström paper.

+    *

+    * This is "how many regs are in the set."

+    */

+   unsigned int p;

+

+   /**

+    * q_B,C in Runeson/Nyström paper.

+    */

+   unsigned int *q;

+};

+

+struct ra_node {

+   GLboolean *adjacency;

+   unsigned int class;

+   unsigned int adjacency_count;

+   unsigned int reg;

+   GLboolean in_stack;

+   float spill_cost;

+};

+

+struct ra_graph {

+   struct ra_regs *regs;

+   /**

+    * the variables that need register allocation.

+    */

+   struct ra_node *nodes;

+   unsigned int count; /**< count of nodes. */

+

+   unsigned int *stack;

+   unsigned int stack_count;

+};

+

+struct ra_regs *

+ra_alloc_reg_set(unsigned int count)

+{

+   unsigned int i;

+   struct ra_regs *regs;

+

+   regs = talloc_zero(NULL, struct ra_regs);

+   regs->count = count;

+   regs->regs = talloc_zero_array(regs, struct ra_reg, count);

+

+   for (i = 0; i < count; i++) {

+      regs->regs[i].conflicts = talloc_zero_array(regs->regs, GLboolean, count);

+      regs->regs[i].conflicts[i] = GL_TRUE;

+   }

+

+   return regs;

+}

+

+void

+ra_add_reg_conflict(struct ra_regs *regs, unsigned int r1, unsigned int r2)

+{

+   regs->regs[r1].conflicts[r2] = GL_TRUE;

+   regs->regs[r2].conflicts[r1] = GL_TRUE;

+}

+

+unsigned int

+ra_alloc_reg_class(struct ra_regs *regs)

+{

+   struct ra_class *class;

+

+   regs->classes = talloc_realloc(regs, regs->classes,

+				  struct ra_class *,

+				  regs->class_count + 1);

+

+   class = talloc_zero(regs, struct ra_class);

+   regs->classes[regs->class_count] = class;

+

+   class->regs = talloc_zero_array(class, GLboolean, regs->count);

+

+   return regs->class_count++;

+}

+

+void

+ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int r)

+{

+   struct ra_class *class = regs->classes[c];

+

+   class->regs[r] = GL_TRUE;

+   class->p++;

+}

+

+/**

+ * Must be called after all conflicts and register classes have been

+ * set up and before the register set is used for allocation.

+ */

+void

+ra_set_finalize(struct ra_regs *regs)

+{

+   unsigned int b, c;

+

+   for (b = 0; b < regs->class_count; b++) {

+      regs->classes[b]->q = talloc_array(regs, unsigned int, regs->class_count);

+   }

+

+   /* Compute, for each class B and C, how many regs of B an

+    * allocation to C could conflict with.

+    */

+   for (b = 0; b < regs->class_count; b++) {

+      for (c = 0; c < regs->class_count; c++) {

+	 unsigned int rc;

+	 int max_conflicts = 0;

+

+	 for (rc = 0; rc < regs->count; rc++) {

+	    unsigned int rb;

+	    int conflicts = 0;

+

+	    if (!regs->classes[c]->regs[rc])

+	       continue;

+

+	    for (rb = 0; rb < regs->count; rb++) {

+	       if (regs->classes[b]->regs[rb] &&

+		   regs->regs[rb].conflicts[rc])

+		  conflicts++;

+	    }

+	    max_conflicts = MAX2(max_conflicts, conflicts);

+	 }

+	 regs->classes[b]->q[c] = max_conflicts;

+      }

+   }

+}

+

+struct ra_graph *

+ra_alloc_interference_graph(struct ra_regs *regs, unsigned int count)

+{

+   struct ra_graph *g;

+   unsigned int i;

+

+   g = talloc_zero(regs, struct ra_graph);

+   g->regs = regs;

+   g->nodes = talloc_zero_array(g, struct ra_node, count);

+   g->count = count;

+

+   g->stack = talloc_zero_array(g, unsigned int, count);

+

+   for (i = 0; i < count; i++) {

+      g->nodes[i].adjacency = talloc_zero_array(g, GLboolean, count);

+      g->nodes[i].adjacency[i] = GL_TRUE;

+      g->nodes[i].reg = ~0;

+   }

+

+   return g;

+}

+

+void

+ra_set_node_class(struct ra_graph *g,

+		  unsigned int n, unsigned int class)

+{

+   g->nodes[n].class = class;

+}

+

+void

+ra_add_node_interference(struct ra_graph *g,

+			 unsigned int n1, unsigned int n2)

+{

+   if (g->nodes[n1].adjacency[n2])

+      return;

+

+   g->nodes[n1].adjacency[n2] = GL_TRUE;

+   g->nodes[n2].adjacency_count++;

+   g->nodes[n2].adjacency[n1] = GL_TRUE;

+   g->nodes[n2].adjacency_count++;

+}

+

+static GLboolean pq_test(struct ra_graph *g, unsigned int n)

+{

+   unsigned int j;

+   unsigned int q = 0;

+   int n_class = g->nodes[n].class;

+

+   for (j = 0; j < g->count; j++) {

+      if (j == n || g->nodes[j].in_stack)

+	 continue;

+

+      if (g->nodes[n].adjacency[j]) {

+	 unsigned int j_class = g->nodes[j].class;

+	 q += g->regs->classes[n_class]->q[j_class];

+      }

+   }

+

+   return q < g->regs->classes[n_class]->p;

+}

+

+/**

+ * Simplifies the interference graph by pushing all

+ * trivially-colorable nodes into a stack of nodes to be colored,

+ * removing them from the graph, and rinsing and repeating.

+ *

+ * Returns GL_TRUE if all nodes were removed from the graph.  GL_FALSE

+ * means that either spilling will be required, or optimistic coloring

+ * should be applied.

+ */

+GLboolean

+ra_simplify(struct ra_graph *g)

+{

+   GLboolean progress = GL_TRUE;

+   int i;

+

+   while (progress) {

+      progress = GL_FALSE;

+

+      for (i = g->count - 1; i >= 0; i--) {

+	 if (g->nodes[i].in_stack)

+	    continue;

+

+	 if (pq_test(g, i)) {

+	    g->stack[g->stack_count] = i;

+	    g->stack_count++;

+	    g->nodes[i].in_stack = GL_TRUE;

+	    progress = GL_TRUE;

+	 }

+      }

+   }

+

+   for (i = 0; i < g->count; i++) {

+      if (!g->nodes[i].in_stack)

+	 return GL_FALSE;

+   }

+

+   return GL_TRUE;

+}

+

+/**

+ * Pops nodes from the stack back into the graph, coloring them with

+ * registers as they go.

+ *

+ * If all nodes were trivially colorable, then this must succeed.  If

+ * not (optimistic coloring), then it may return GL_FALSE;

+ */

+GLboolean

+ra_select(struct ra_graph *g)

+{

+   int i;

+

+   while (g->stack_count != 0) {

+      unsigned int r;

+      int n = g->stack[g->stack_count - 1];

+      struct ra_class *c = g->regs->classes[g->nodes[n].class];

+

+      /* Find the lowest-numbered reg which is not used by a member

+       * of the graph adjacent to us.

+       */

+      for (r = 0; r < g->regs->count; r++) {

+	 if (!c->regs[r])

+	    continue;

+

+	 /* Check if any of our neighbors conflict with this register choice. */

+	 for (i = 0; i < g->count; i++) {

+	    if (g->nodes[n].adjacency[i] &&

+	       !g->nodes[i].in_stack &&

+		g->regs->regs[r].conflicts[g->nodes[i].reg]) {

+	       break;

+	    }

+	 }

+	 if (i == g->count)

+	    break;

+      }

+      if (r == g->regs->count)

+	 return GL_FALSE;

+

+      g->nodes[n].reg = r;

+      g->nodes[n].in_stack = GL_FALSE;

+      g->stack_count--;

+   }

+

+   return GL_TRUE;

+}

+

+/**

+ * Optimistic register coloring: Just push the remaining nodes

+ * on the stack.  They'll be colored first in ra_select(), and

+ * if they succeed then the locally-colorable nodes are still

+ * locally-colorable and the rest of the register allocation

+ * will succeed.

+ */

+void

+ra_optimistic_color(struct ra_graph *g)

+{

+   unsigned int i;

+

+   for (i = 0; i < g->count; i++) {

+      if (g->nodes[i].in_stack)

+	 continue;

+

+      g->stack[g->stack_count] = i;

+      g->stack_count++;

+      g->nodes[i].in_stack = GL_TRUE;

+   }

+}

+

+GLboolean

+ra_allocate_no_spills(struct ra_graph *g)

+{

+   if (!ra_simplify(g)) {

+      ra_optimistic_color(g);

+   }

+   return ra_select(g);

+}

+

+unsigned int

+ra_get_node_reg(struct ra_graph *g, unsigned int n)

+{

+   return g->nodes[n].reg;

+}

+

+static float

+ra_get_spill_benefit(struct ra_graph *g, unsigned int n)

+{

+   int j;

+   float benefit = 0;

+   int n_class = g->nodes[n].class;

+

+   /* Define the benefit of eliminating an interference between n, j

+    * through spilling as q(C, B) / p(C).  This is similar to the

+    * "count number of edges" approach of traditional graph coloring,

+    * but takes classes into account.

+    */

+   for (j = 0; j < g->count; j++) {

+      if (j != n && g->nodes[n].adjacency[j]) {

+	 unsigned int j_class = g->nodes[j].class;

+	 benefit += ((float)g->regs->classes[n_class]->q[j_class] /

+		     g->regs->classes[n_class]->p);

+	 break;

+      }

+   }

+

+   return benefit;

+}

+

+/**

+ * Returns a node number to be spilled according to the cost/benefit using

+ * the pq test, or -1 if there are no spillable nodes.

+ */

+int

+ra_get_best_spill_node(struct ra_graph *g)

+{

+   unsigned int best_node = -1;

+   unsigned int best_benefit = 0.0;

+   unsigned int n;

+

+   for (n = 0; n < g->count; n++) {

+      float cost = g->nodes[n].spill_cost;

+      float benefit;

+

+      if (cost <= 0.0)

+	 continue;

+

+      benefit = ra_get_spill_benefit(g, n);

+

+      if (benefit / cost > best_benefit) {

+	 best_benefit = benefit / cost;

+	 best_node = n;

+      }

+   }

+

+   return best_node;

+}

+

+/**

+ * Only nodes with a spill cost set (cost != 0.0) will be considered

+ * for register spilling.

+ */

+void

+ra_set_node_spill_cost(struct ra_graph *g, unsigned int n, float cost)

+{

+   g->nodes[n].spill_cost = cost;

+}

diff --git a/mesalib/src/mesa/program/register_allocate.h b/mesalib/src/mesa/program/register_allocate.h
new file mode 100644
index 000000000..bb9e2740a
--- /dev/null
+++ b/mesalib/src/mesa/program/register_allocate.h
@@ -0,0 +1,71 @@
+/*

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

+ *

+ * Authors:

+ *    Eric Anholt <eric@anholt.net>

+ *

+ */

+

+struct ra_class;

+struct ra_regs;

+

+/* @{

+ * Register set setup.

+ *

+ * This should be done once at backend initializaion, as

+ * ra_set_finalize is O(r^2*c^2).  The registers may be virtual

+ * registers, such as aligned register pairs that conflict with the

+ * two real registers from which they are composed.

+ */

+struct ra_regs *ra_alloc_reg_set(unsigned int count);

+unsigned int ra_alloc_reg_class(struct ra_regs *regs);

+void ra_add_reg_conflict(struct ra_regs *regs,

+			 unsigned int r1, unsigned int r2);

+void ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int reg);

+void ra_set_finalize(struct ra_regs *regs);

+/** @} */

+

+/** @{ Interference graph setup.

+ *

+ * Each interference graph node is a virtual variable in the IL.  It

+ * is up to the user to ra_set_node_class() for the virtual variable,

+ * and compute live ranges and ra_node_interfere() between conflicting

+ * live ranges.

+ */

+struct ra_graph *ra_alloc_interference_graph(struct ra_regs *regs,

+					     unsigned int count);

+void ra_set_node_class(struct ra_graph *g, unsigned int n, unsigned int c);

+void ra_add_node_interference(struct ra_graph *g,

+			      unsigned int n1, unsigned int n2);

+/** @} */

+

+/** @{ Graph-coloring register allocation */

+GLboolean ra_simplify(struct ra_graph *g);

+void ra_optimistic_color(struct ra_graph *g);

+GLboolean ra_select(struct ra_graph *g);

+GLboolean ra_allocate_no_spills(struct ra_graph *g);

+

+unsigned int ra_get_node_reg(struct ra_graph *g, unsigned int n);

+void ra_set_node_spill_cost(struct ra_graph *g, unsigned int n, float cost);

+int ra_get_best_spill_node(struct ra_graph *g);

+/** @} */

+

diff --git a/mesalib/src/mesa/program/sampler.cpp b/mesalib/src/mesa/program/sampler.cpp
new file mode 100644
index 000000000..cd44467a3
--- /dev/null
+++ b/mesalib/src/mesa/program/sampler.cpp
@@ -0,0 +1,140 @@
+/*

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

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

+   prog->InfoLog = talloc_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 = talloc_new(NULL);

+      this->shader_program = shader_program;

+      this->name = NULL;

+      this->offset = 0;

+      this->last = last;

+   }

+

+   ~get_sampler_name()

+   {

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

+	  */

+	 shader_program->InfoLog =

+	    talloc_asprintf_append(shader_program->InfoLog,

+				   "warning: Variable sampler array index "

+				   "unsupported.\nThis 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 = talloc_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/program/sampler.h b/mesalib/src/mesa/program/sampler.h
new file mode 100644
index 000000000..c76d7077b
--- /dev/null
+++ b/mesalib/src/mesa/program/sampler.h
@@ -0,0 +1,29 @@
+/*

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

+ */

+

+int

+_mesa_get_sampler_uniform_value(class ir_dereference *sampler,

+				struct gl_shader_program *shader_program,

+				const struct gl_program *prog);

diff --git a/mesalib/src/mesa/program/symbol_table.c b/mesalib/src/mesa/program/symbol_table.c
index 09e7cb44e..45aeb97b1 100644
--- a/mesalib/src/mesa/program/symbol_table.c
+++ b/mesalib/src/mesa/program/symbol_table.c
@@ -1,413 +1,488 @@
-/*
- * Copyright © 2008 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/imports.h"
-#include "symbol_table.h"
-#include "hash_table.h"
-
-struct symbol {
-    /**
-     * Link to the next symbol in the table with the same name
-     *
-     * The linked list of symbols with the same name is ordered by scope
-     * from inner-most to outer-most.
-     */
-    struct symbol *next_with_same_name;
-
-
-    /**
-     * Link to the next symbol in the table with the same scope
-     *
-     * The linked list of symbols with the same scope is unordered.  Symbols
-     * in this list my have unique names.
-     */
-    struct symbol *next_with_same_scope;
-
-
-    /**
-     * Header information for the list of symbols with the same name.
-     */
-    struct symbol_header *hdr;
-
-
-    /**
-     * Name space of the symbol
-     *
-     * Name space are arbitrary user assigned integers.  No two symbols can
-     * exist in the same name space at the same scope level.
-     */
-    int name_space;
-
-    /** Scope depth where this symbol was defined. */
-    unsigned depth;
-
-    /**
-     * Arbitrary user supplied data.
-     */
-    void *data;
-};
-
-
-/**
- */
-struct symbol_header {
-    /** Linkage in list of all headers in a given symbol table. */
-    struct symbol_header *next;
-
-    /** Symbol name. */
-    char *name;
-
-    /** Linked list of symbols with the same name. */
-    struct symbol *symbols;
-};
-
-
-/**
- * Element of the scope stack.
- */
-struct scope_level {
-    /** Link to next (inner) scope level. */
-    struct scope_level *next;
-    
-    /** Linked list of symbols with the same scope. */
-    struct symbol *symbols;
-};
-
-
-/**
- *
- */
-struct _mesa_symbol_table {
-    /** Hash table containing all symbols in the symbol table. */
-    struct hash_table *ht;
-
-    /** Top of scope stack. */
-    struct scope_level *current_scope;
-
-    /** List of all symbol headers in the table. */
-    struct symbol_header *hdr;
-
-    /** Current scope depth. */
-    unsigned depth;
-};
-
-
-struct _mesa_symbol_table_iterator {
-    /**
-     * Name space of symbols returned by this iterator.
-     */
-    int name_space;
-
-
-    /**
-     * Currently iterated symbol
-     *
-     * The next call to \c _mesa_symbol_table_iterator_get will return this
-     * value.  It will also update this value to the value that should be
-     * returned by the next call.
-     */
-    struct symbol *curr;
-};
-
-
-static void
-check_symbol_table(struct _mesa_symbol_table *table)
-{
-#if 1
-    struct scope_level *scope;
-
-    for (scope = table->current_scope; scope != NULL; scope = scope->next) {
-        struct symbol *sym;
-
-        for (sym = scope->symbols
-             ; sym != NULL
-             ; sym = sym->next_with_same_name) {
-            const struct symbol_header *const hdr = sym->hdr;
-            struct symbol *sym2;
-
-            for (sym2 = hdr->symbols
-                 ; sym2 != NULL
-                 ; sym2 = sym2->next_with_same_name) {
-                assert(sym2->hdr == hdr);
-            }
-        }
-    }
-#endif
-}
-
-void
-_mesa_symbol_table_pop_scope(struct _mesa_symbol_table *table)
-{
-    struct scope_level *const scope = table->current_scope;
-    struct symbol *sym = scope->symbols;
-
-    table->current_scope = scope->next;
-    table->depth--;
-
-    free(scope);
-
-    while (sym != NULL) {
-        struct symbol *const next = sym->next_with_same_scope;
-        struct symbol_header *const hdr = sym->hdr;
-
-        assert(hdr->symbols == sym);
-
-        hdr->symbols = sym->next_with_same_name;
-
-        free(sym);
-
-        sym = next;
-    }
-
-    check_symbol_table(table);
-}
-
-
-void
-_mesa_symbol_table_push_scope(struct _mesa_symbol_table *table)
-{
-    struct scope_level *const scope = calloc(1, sizeof(*scope));
-    
-    scope->next = table->current_scope;
-    table->current_scope = scope;
-    table->depth++;
-}
-
-
-static struct symbol_header *
-find_symbol(struct _mesa_symbol_table *table, const char *name)
-{
-    return (struct symbol_header *) hash_table_find(table->ht, name);
-}
-
-
-struct _mesa_symbol_table_iterator *
-_mesa_symbol_table_iterator_ctor(struct _mesa_symbol_table *table,
-                                 int name_space, const char *name)
-{
-    struct _mesa_symbol_table_iterator *iter = calloc(1, sizeof(*iter));
-    struct symbol_header *const hdr = find_symbol(table, name);
-    
-    iter->name_space = name_space;
-
-    if (hdr != NULL) {
-        struct symbol *sym;
-
-        for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {
-            assert(sym->hdr == hdr);
-
-            if ((name_space == -1) || (sym->name_space == name_space)) {
-                iter->curr = sym;
-                break;
-            }
-        }
-    }
-
-    return iter;
-}
-
-
-void
-_mesa_symbol_table_iterator_dtor(struct _mesa_symbol_table_iterator *iter)
-{
-    free(iter);
-}
-
-
-void *
-_mesa_symbol_table_iterator_get(struct _mesa_symbol_table_iterator *iter)
-{
-    return (iter->curr == NULL) ? NULL : iter->curr->data;
-}
-
-
-int
-_mesa_symbol_table_iterator_next(struct _mesa_symbol_table_iterator *iter)
-{
-    struct symbol_header *hdr;
-
-    if (iter->curr == NULL) {
-        return 0;
-    }
-
-    hdr = iter->curr->hdr;
-    iter->curr = iter->curr->next_with_same_name;
-
-    while (iter->curr != NULL) {
-        assert(iter->curr->hdr == hdr);
-
-        if ((iter->name_space == -1)
-            || (iter->curr->name_space == iter->name_space)) {
-            return 1;
-        }
-
-        iter->curr = iter->curr->next_with_same_name;
-    }
-
-    return 0;
-}
-
-
-/**
- * Determine the scope "distance" of a symbol from the current scope
- *
- * \return
- * A non-negative number for the number of scopes between the current scope
- * and the scope where a symbol was defined.  A value of zero means the current
- * scope.  A negative number if the symbol does not exist.
- */
-int
-_mesa_symbol_table_symbol_scope(struct _mesa_symbol_table *table,
-				int name_space, const char *name)
-{
-    struct symbol_header *const hdr = find_symbol(table, name);
-    struct symbol *sym;
-
-    if (hdr != NULL) {
-       for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {
-	  assert(sym->hdr == hdr);
-
-	  if ((name_space == -1) || (sym->name_space == name_space)) {
-	     assert(sym->depth <= table->depth);
-	     return sym->depth - table->depth;
-	  }
-       }
-    }
-
-    return -1;
-}
-
-
-void *
-_mesa_symbol_table_find_symbol(struct _mesa_symbol_table *table,
-                               int name_space, const char *name)
-{
-    struct symbol_header *const hdr = find_symbol(table, name);
-
-    if (hdr != NULL) {
-        struct symbol *sym;
-
-
-        for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {
-            assert(sym->hdr == hdr);
-
-            if ((name_space == -1) || (sym->name_space == name_space)) {
-                return sym->data;
-            }
-        }
-    }
-
-    return NULL;
-}
-
-
-int
-_mesa_symbol_table_add_symbol(struct _mesa_symbol_table *table,
-                              int name_space, const char *name,
-                              void *declaration)
-{
-    struct symbol_header *hdr;
-    struct symbol *sym;
-
-    check_symbol_table(table);
-
-    hdr = find_symbol(table, name);
-
-    check_symbol_table(table);
-
-    if (hdr == NULL) {
-        hdr = calloc(1, sizeof(*hdr));
-        hdr->name = strdup(name);
-
-        hash_table_insert(table->ht, hdr, hdr->name);
-	hdr->next = table->hdr;
-	table->hdr = hdr;
-    }
-
-    check_symbol_table(table);
-
-    /* If the symbol already exists in this namespace at this scope, it cannot
-     * be added to the table.
-     */
-    for (sym = hdr->symbols
-	 ; (sym != NULL) && (sym->name_space != name_space)
-	 ; sym = sym->next_with_same_name) {
-       /* empty */
-    }
-
-    if (sym && (sym->depth == table->depth))
-       return -1;
-
-    sym = calloc(1, sizeof(*sym));
-    sym->next_with_same_name = hdr->symbols;
-    sym->next_with_same_scope = table->current_scope->symbols;
-    sym->hdr = hdr;
-    sym->name_space = name_space;
-    sym->data = declaration;
-    sym->depth = table->depth;
-
-    assert(sym->hdr == hdr);
-
-    hdr->symbols = sym;
-    table->current_scope->symbols = sym;
-
-    check_symbol_table(table);
-    return 0;
-}
-
-
-struct _mesa_symbol_table *
-_mesa_symbol_table_ctor(void)
-{
-    struct _mesa_symbol_table *table = calloc(1, sizeof(*table));
-
-    if (table != NULL) {
-       table->ht = hash_table_ctor(32, hash_table_string_hash,
-				   hash_table_string_compare);
-
-       _mesa_symbol_table_push_scope(table);
-    }
-
-    return table;
-}
-
-
-void
-_mesa_symbol_table_dtor(struct _mesa_symbol_table *table)
-{
-   struct symbol_header *hdr;
-   struct symbol_header *next;
-
-   while (table->current_scope != NULL) {
-      _mesa_symbol_table_pop_scope(table);
-   }
-
-   for (hdr = table->hdr; hdr != NULL; hdr = next) {
-       next = hdr->next;
-       free(hdr->name);
-       free(hdr);
-   }
-
-   hash_table_dtor(table->ht);
-   free(table);
-}
+/*

+ * Copyright © 2008 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/imports.h"

+#include "symbol_table.h"

+#include "hash_table.h"

+

+struct symbol {

+    /**

+     * Link to the next symbol in the table with the same name

+     *

+     * The linked list of symbols with the same name is ordered by scope

+     * from inner-most to outer-most.

+     */

+    struct symbol *next_with_same_name;

+

+

+    /**

+     * Link to the next symbol in the table with the same scope

+     *

+     * The linked list of symbols with the same scope is unordered.  Symbols

+     * in this list my have unique names.

+     */

+    struct symbol *next_with_same_scope;

+

+

+    /**

+     * Header information for the list of symbols with the same name.

+     */

+    struct symbol_header *hdr;

+

+

+    /**

+     * Name space of the symbol

+     *

+     * Name space are arbitrary user assigned integers.  No two symbols can

+     * exist in the same name space at the same scope level.

+     */

+    int name_space;

+

+    /** Scope depth where this symbol was defined. */

+    unsigned depth;

+

+    /**

+     * Arbitrary user supplied data.

+     */

+    void *data;

+};

+

+

+/**

+ */

+struct symbol_header {

+    /** Linkage in list of all headers in a given symbol table. */

+    struct symbol_header *next;

+

+    /** Symbol name. */

+    char *name;

+

+    /** Linked list of symbols with the same name. */

+    struct symbol *symbols;

+};

+

+

+/**

+ * Element of the scope stack.

+ */

+struct scope_level {

+    /** Link to next (inner) scope level. */

+    struct scope_level *next;

+    

+    /** Linked list of symbols with the same scope. */

+    struct symbol *symbols;

+};

+

+

+/**

+ *

+ */

+struct _mesa_symbol_table {

+    /** Hash table containing all symbols in the symbol table. */

+    struct hash_table *ht;

+

+    /** Top of scope stack. */

+    struct scope_level *current_scope;

+

+    /** List of all symbol headers in the table. */

+    struct symbol_header *hdr;

+

+    /** Current scope depth. */

+    unsigned depth;

+};

+

+

+struct _mesa_symbol_table_iterator {

+    /**

+     * Name space of symbols returned by this iterator.

+     */

+    int name_space;

+

+

+    /**

+     * Currently iterated symbol

+     *

+     * The next call to \c _mesa_symbol_table_iterator_get will return this

+     * value.  It will also update this value to the value that should be

+     * returned by the next call.

+     */

+    struct symbol *curr;

+};

+

+

+static void

+check_symbol_table(struct _mesa_symbol_table *table)

+{

+#if 1

+    struct scope_level *scope;

+

+    for (scope = table->current_scope; scope != NULL; scope = scope->next) {

+        struct symbol *sym;

+

+        for (sym = scope->symbols

+             ; sym != NULL

+             ; sym = sym->next_with_same_name) {

+            const struct symbol_header *const hdr = sym->hdr;

+            struct symbol *sym2;

+

+            for (sym2 = hdr->symbols

+                 ; sym2 != NULL

+                 ; sym2 = sym2->next_with_same_name) {

+                assert(sym2->hdr == hdr);

+            }

+        }

+    }

+#endif

+}

+

+void

+_mesa_symbol_table_pop_scope(struct _mesa_symbol_table *table)

+{

+    struct scope_level *const scope = table->current_scope;

+    struct symbol *sym = scope->symbols;

+

+    table->current_scope = scope->next;

+    table->depth--;

+

+    free(scope);

+

+    while (sym != NULL) {

+        struct symbol *const next = sym->next_with_same_scope;

+        struct symbol_header *const hdr = sym->hdr;

+

+        assert(hdr->symbols == sym);

+

+        hdr->symbols = sym->next_with_same_name;

+

+        free(sym);

+

+        sym = next;

+    }

+

+    check_symbol_table(table);

+}

+

+

+void

+_mesa_symbol_table_push_scope(struct _mesa_symbol_table *table)

+{

+    struct scope_level *const scope = calloc(1, sizeof(*scope));

+    

+    scope->next = table->current_scope;

+    table->current_scope = scope;

+    table->depth++;

+}

+

+

+static struct symbol_header *

+find_symbol(struct _mesa_symbol_table *table, const char *name)

+{

+    return (struct symbol_header *) hash_table_find(table->ht, name);

+}

+

+

+struct _mesa_symbol_table_iterator *

+_mesa_symbol_table_iterator_ctor(struct _mesa_symbol_table *table,

+                                 int name_space, const char *name)

+{

+    struct _mesa_symbol_table_iterator *iter = calloc(1, sizeof(*iter));

+    struct symbol_header *const hdr = find_symbol(table, name);

+    

+    iter->name_space = name_space;

+

+    if (hdr != NULL) {

+        struct symbol *sym;

+

+        for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {

+            assert(sym->hdr == hdr);

+

+            if ((name_space == -1) || (sym->name_space == name_space)) {

+                iter->curr = sym;

+                break;

+            }

+        }

+    }

+

+    return iter;

+}

+

+

+void

+_mesa_symbol_table_iterator_dtor(struct _mesa_symbol_table_iterator *iter)

+{

+    free(iter);

+}

+

+

+void *

+_mesa_symbol_table_iterator_get(struct _mesa_symbol_table_iterator *iter)

+{

+    return (iter->curr == NULL) ? NULL : iter->curr->data;

+}

+

+

+int

+_mesa_symbol_table_iterator_next(struct _mesa_symbol_table_iterator *iter)

+{

+    struct symbol_header *hdr;

+

+    if (iter->curr == NULL) {

+        return 0;

+    }

+

+    hdr = iter->curr->hdr;

+    iter->curr = iter->curr->next_with_same_name;

+

+    while (iter->curr != NULL) {

+        assert(iter->curr->hdr == hdr);

+

+        if ((iter->name_space == -1)

+            || (iter->curr->name_space == iter->name_space)) {

+            return 1;

+        }

+

+        iter->curr = iter->curr->next_with_same_name;

+    }

+

+    return 0;

+}

+

+

+/**

+ * Determine the scope "distance" of a symbol from the current scope

+ *

+ * \return

+ * A non-negative number for the number of scopes between the current scope

+ * and the scope where a symbol was defined.  A value of zero means the current

+ * scope.  A negative number if the symbol does not exist.

+ */

+int

+_mesa_symbol_table_symbol_scope(struct _mesa_symbol_table *table,

+				int name_space, const char *name)

+{

+    struct symbol_header *const hdr = find_symbol(table, name);

+    struct symbol *sym;

+

+    if (hdr != NULL) {

+       for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {

+	  assert(sym->hdr == hdr);

+

+	  if ((name_space == -1) || (sym->name_space == name_space)) {

+	     assert(sym->depth <= table->depth);

+	     return sym->depth - table->depth;

+	  }

+       }

+    }

+

+    return -1;

+}

+

+

+void *

+_mesa_symbol_table_find_symbol(struct _mesa_symbol_table *table,

+                               int name_space, const char *name)

+{

+    struct symbol_header *const hdr = find_symbol(table, name);

+

+    if (hdr != NULL) {

+        struct symbol *sym;

+

+

+        for (sym = hdr->symbols; sym != NULL; sym = sym->next_with_same_name) {

+            assert(sym->hdr == hdr);

+

+            if ((name_space == -1) || (sym->name_space == name_space)) {

+                return sym->data;

+            }

+        }

+    }

+

+    return NULL;

+}

+

+

+int

+_mesa_symbol_table_add_symbol(struct _mesa_symbol_table *table,

+                              int name_space, const char *name,

+                              void *declaration)

+{

+    struct symbol_header *hdr;

+    struct symbol *sym;

+

+    check_symbol_table(table);

+

+    hdr = find_symbol(table, name);

+

+    check_symbol_table(table);

+

+    if (hdr == NULL) {

+       hdr = calloc(1, sizeof(*hdr));

+       hdr->name = strdup(name);

+

+       hash_table_insert(table->ht, hdr, hdr->name);

+       hdr->next = table->hdr;

+       table->hdr = hdr;

+    }

+

+    check_symbol_table(table);

+

+    /* If the symbol already exists in this namespace at this scope, it cannot

+     * be added to the table.

+     */

+    for (sym = hdr->symbols

+	 ; (sym != NULL) && (sym->name_space != name_space)

+	 ; sym = sym->next_with_same_name) {

+       /* empty */

+    }

+

+    if (sym && (sym->depth == table->depth))

+       return -1;

+

+    sym = calloc(1, sizeof(*sym));

+    sym->next_with_same_name = hdr->symbols;

+    sym->next_with_same_scope = table->current_scope->symbols;

+    sym->hdr = hdr;

+    sym->name_space = name_space;

+    sym->data = declaration;

+    sym->depth = table->depth;

+

+    assert(sym->hdr == hdr);

+

+    hdr->symbols = sym;

+    table->current_scope->symbols = sym;

+

+    check_symbol_table(table);

+    return 0;

+}

+

+

+int

+_mesa_symbol_table_add_global_symbol(struct _mesa_symbol_table *table,

+				     int name_space, const char *name,

+				     void *declaration)

+{

+    struct symbol_header *hdr;

+    struct symbol *sym;

+    struct symbol *curr;

+    struct scope_level *top_scope;

+

+    check_symbol_table(table);

+

+    hdr = find_symbol(table, name);

+

+    check_symbol_table(table);

+

+    if (hdr == NULL) {

+        hdr = calloc(1, sizeof(*hdr));

+        hdr->name = strdup(name);

+

+        hash_table_insert(table->ht, hdr, hdr->name);

+        hdr->next = table->hdr;

+        table->hdr = hdr;

+    }

+

+    check_symbol_table(table);

+

+    /* If the symbol already exists in this namespace at this scope, it cannot

+     * be added to the table.

+     */

+    for (sym = hdr->symbols

+	 ; (sym != NULL) && (sym->name_space != name_space)

+	 ; sym = sym->next_with_same_name) {

+       /* empty */

+    }

+

+    if (sym && sym->depth == 0)

+       return -1;

+

+    /* Find the top-level scope */

+    for (top_scope = table->current_scope

+	 ; top_scope->next != NULL

+	 ; top_scope = top_scope->next) {

+       /* empty */

+    }

+

+    sym = calloc(1, sizeof(*sym));

+    sym->next_with_same_scope = top_scope->symbols;

+    sym->hdr = hdr;

+    sym->name_space = name_space;

+    sym->data = declaration;

+

+    assert(sym->hdr == hdr);

+

+    /* Since next_with_same_name is ordered by scope, we need to append the

+     * new symbol to the _end_ of the list.

+     */

+    if (hdr->symbols == NULL) {

+       hdr->symbols = sym;

+    } else {

+       for (curr = hdr->symbols

+	    ; curr->next_with_same_name != NULL

+	    ; curr = curr->next_with_same_name) {

+	  /* empty */

+       }

+       curr->next_with_same_name = sym;

+    }

+    top_scope->symbols = sym;

+

+    check_symbol_table(table);

+    return 0;

+}

+

+

+

+struct _mesa_symbol_table *

+_mesa_symbol_table_ctor(void)

+{

+    struct _mesa_symbol_table *table = calloc(1, sizeof(*table));

+

+    if (table != NULL) {

+       table->ht = hash_table_ctor(32, hash_table_string_hash,

+				   hash_table_string_compare);

+

+       _mesa_symbol_table_push_scope(table);

+    }

+

+    return table;

+}

+

+

+void

+_mesa_symbol_table_dtor(struct _mesa_symbol_table *table)

+{

+   struct symbol_header *hdr;

+   struct symbol_header *next;

+

+   while (table->current_scope != NULL) {

+      _mesa_symbol_table_pop_scope(table);

+   }

+

+   for (hdr = table->hdr; hdr != NULL; hdr = next) {

+       next = hdr->next;

+       free(hdr->name);

+       free(hdr);

+   }

+

+   hash_table_dtor(table->ht);

+   free(table);

+}

diff --git a/mesalib/src/mesa/program/symbol_table.h b/mesalib/src/mesa/program/symbol_table.h
index 1d570fc1a..1de29a8f0 100644
--- a/mesalib/src/mesa/program/symbol_table.h
+++ b/mesalib/src/mesa/program/symbol_table.h
@@ -1,58 +1,62 @@
-/*
- * Copyright © 2008 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.
- */
-#ifndef MESA_SYMBOL_TABLE_H
-#define MESA_SYMBOL_TABLE_H
-
-struct _mesa_symbol_table;
-struct _mesa_symbol_table_iterator;
-
-extern void _mesa_symbol_table_push_scope(struct _mesa_symbol_table *table);
-
-extern void _mesa_symbol_table_pop_scope(struct _mesa_symbol_table *table);
-
-extern int _mesa_symbol_table_add_symbol(struct _mesa_symbol_table *symtab,
-    int name_space, const char *name, void *declaration);
-
-extern int _mesa_symbol_table_symbol_scope(struct _mesa_symbol_table *table,
-    int name_space, const char *name);
-
-extern void *_mesa_symbol_table_find_symbol(
-    struct _mesa_symbol_table *symtab, int name_space, const char *name);
-
-extern struct _mesa_symbol_table *_mesa_symbol_table_ctor(void);
-
-extern void _mesa_symbol_table_dtor(struct _mesa_symbol_table *);
-
-extern struct _mesa_symbol_table_iterator *_mesa_symbol_table_iterator_ctor(
-    struct _mesa_symbol_table *table, int name_space, const char *name);
-
-extern void _mesa_symbol_table_iterator_dtor(
-    struct _mesa_symbol_table_iterator *);
-
-extern void *_mesa_symbol_table_iterator_get(
-    struct _mesa_symbol_table_iterator *iter);
-
-extern int _mesa_symbol_table_iterator_next(
-    struct _mesa_symbol_table_iterator *iter);
-
-#endif /* MESA_SYMBOL_TABLE_H */
+/*

+ * Copyright © 2008 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.

+ */

+#ifndef MESA_SYMBOL_TABLE_H

+#define MESA_SYMBOL_TABLE_H

+

+struct _mesa_symbol_table;

+struct _mesa_symbol_table_iterator;

+

+extern void _mesa_symbol_table_push_scope(struct _mesa_symbol_table *table);

+

+extern void _mesa_symbol_table_pop_scope(struct _mesa_symbol_table *table);

+

+extern int _mesa_symbol_table_add_symbol(struct _mesa_symbol_table *symtab,

+    int name_space, const char *name, void *declaration);

+

+extern int _mesa_symbol_table_add_global_symbol(

+    struct _mesa_symbol_table *symtab, int name_space, const char *name,

+    void *declaration);

+

+extern int _mesa_symbol_table_symbol_scope(struct _mesa_symbol_table *table,

+    int name_space, const char *name);

+

+extern void *_mesa_symbol_table_find_symbol(

+    struct _mesa_symbol_table *symtab, int name_space, const char *name);

+

+extern struct _mesa_symbol_table *_mesa_symbol_table_ctor(void);

+

+extern void _mesa_symbol_table_dtor(struct _mesa_symbol_table *);

+

+extern struct _mesa_symbol_table_iterator *_mesa_symbol_table_iterator_ctor(

+    struct _mesa_symbol_table *table, int name_space, const char *name);

+

+extern void _mesa_symbol_table_iterator_dtor(

+    struct _mesa_symbol_table_iterator *);

+

+extern void *_mesa_symbol_table_iterator_get(

+    struct _mesa_symbol_table_iterator *iter);

+

+extern int _mesa_symbol_table_iterator_next(

+    struct _mesa_symbol_table_iterator *iter);

+

+#endif /* MESA_SYMBOL_TABLE_H */

diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index b35d09335..b10881c55 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -1,365 +1,368 @@
-### Lists of source files, included by Makefiles
-
-# this is part of MAIN_SOURCES
-MAIN_ES_SOURCES = \
-	main/api_exec_es1.c \
-	main/api_exec_es2.c
-
-MAIN_SOURCES = \
-	main/api_arrayelt.c \
-	main/api_exec.c \
-	main/api_loopback.c \
-	main/api_noop.c \
-	main/api_validate.c \
-	main/accum.c \
-	main/arbprogram.c \
-	main/atifragshader.c \
-	main/attrib.c \
-	main/arrayobj.c \
-	main/blend.c \
-	main/bufferobj.c \
-	main/buffers.c \
-	main/clear.c \
-	main/clip.c \
-	main/colortab.c \
-	main/condrender.c \
-	main/context.c \
-	main/convolve.c \
-	main/cpuinfo.c \
-	main/debug.c \
-	main/depth.c \
-	main/depthstencil.c \
-	main/dlist.c \
-	main/dlopen.c \
-	main/drawpix.c \
-	main/drawtex.c \
-	main/enable.c \
-	main/enums.c \
-	main/eval.c \
-	main/execmem.c \
-	main/extensions.c \
-	main/fbobject.c \
-	main/feedback.c \
-	main/ffvertex_prog.c \
-	main/fog.c \
-	main/formats.c \
-	main/framebuffer.c \
-	main/get.c \
-	main/getstring.c \
-	main/hash.c \
-	main/hint.c \
-	main/histogram.c \
-	main/image.c \
-	main/imports.c \
-	main/light.c \
-	main/lines.c \
-	main/matrix.c \
-	main/mipmap.c \
-	main/mm.c \
-	main/multisample.c \
-	main/nvprogram.c \
-	main/pixel.c \
-	main/pixelstore.c \
-	main/points.c \
-	main/polygon.c \
-	main/queryobj.c \
-	main/querymatrix.c \
-	main/rastpos.c \
-	main/readpix.c \
-	main/remap.c \
-	main/renderbuffer.c \
-	main/scissor.c \
-	main/shaderapi.c \
-	main/shaderobj.c \
-	main/shared.c \
-	main/state.c \
-	main/stencil.c \
-	main/syncobj.c \
-	main/texcompress.c \
-	main/texcompress_s3tc.c \
-	main/texcompress_fxt1.c \
-	main/texenv.c \
-	main/texenvprogram.c \
-	main/texfetch.c \
-	main/texformat.c \
-	main/texgen.c \
-	main/texgetimage.c \
-	main/teximage.c \
-	main/texobj.c \
-	main/texpal.c \
-	main/texparam.c \
-	main/texrender.c \
-	main/texstate.c \
-	main/texstore.c \
-	main/transformfeedback.c \
-	main/uniforms.c \
-	main/varray.c \
-	main/version.c \
-	main/viewport.c \
-	main/vtxfmt.c \
-	$(MAIN_ES_SOURCES)
-
-MATH_SOURCES = \
-	math/m_debug_clip.c \
-	math/m_debug_norm.c \
-	math/m_debug_xform.c \
-	math/m_eval.c \
-	math/m_matrix.c \
-	math/m_translate.c \
-	math/m_vector.c
-
-MATH_XFORM_SOURCES = \
-	math/m_xform.c
-
-SWRAST_SOURCES = \
-	swrast/s_aaline.c \
-	swrast/s_aatriangle.c \
-	swrast/s_accum.c \
-	swrast/s_alpha.c \
-	swrast/s_atifragshader.c \
-	swrast/s_bitmap.c \
-	swrast/s_blend.c \
-	swrast/s_blit.c \
-	swrast/s_clear.c \
-	swrast/s_copypix.c \
-	swrast/s_context.c \
-	swrast/s_depth.c \
-	swrast/s_drawpix.c \
-	swrast/s_feedback.c \
-	swrast/s_fog.c \
-	swrast/s_fragprog.c \
-	swrast/s_lines.c \
-	swrast/s_logic.c \
-	swrast/s_masking.c \
-	swrast/s_points.c \
-	swrast/s_readpix.c \
-	swrast/s_span.c \
-	swrast/s_stencil.c \
-	swrast/s_texcombine.c \
-	swrast/s_texfilter.c \
-	swrast/s_triangle.c \
-	swrast/s_zoom.c
-
-SWRAST_SETUP_SOURCES = \
-	swrast_setup/ss_context.c \
-	swrast_setup/ss_triangle.c 
-
-TNL_SOURCES = \
-	tnl/t_context.c \
-	tnl/t_pipeline.c \
-	tnl/t_draw.c \
-	tnl/t_rasterpos.c \
-	tnl/t_vb_program.c \
-	tnl/t_vb_render.c \
-	tnl/t_vb_texgen.c \
-	tnl/t_vb_texmat.c \
-	tnl/t_vb_vertex.c \
-	tnl/t_vb_cull.c \
-	tnl/t_vb_fog.c \
-	tnl/t_vb_light.c \
-	tnl/t_vb_normals.c \
-	tnl/t_vb_points.c \
-	tnl/t_vp_build.c \
-	tnl/t_vertex.c \
-	tnl/t_vertex_sse.c \
-	tnl/t_vertex_generic.c 
-
-VBO_SOURCES = \
-	vbo/vbo_context.c \
-	vbo/vbo_exec.c \
-	vbo/vbo_exec_api.c \
-	vbo/vbo_exec_array.c \
-	vbo/vbo_exec_draw.c \
-	vbo/vbo_exec_eval.c \
-	vbo/vbo_rebase.c \
-	vbo/vbo_split.c \
-	vbo/vbo_split_copy.c \
-	vbo/vbo_split_inplace.c \
-	vbo/vbo_save.c \
-	vbo/vbo_save_api.c \
-	vbo/vbo_save_draw.c \
-	vbo/vbo_save_loopback.c 
-
-STATETRACKER_SOURCES = \
-	state_tracker/st_atom.c \
-	state_tracker/st_atom_blend.c \
-	state_tracker/st_atom_clip.c \
-	state_tracker/st_atom_constbuf.c \
-	state_tracker/st_atom_depth.c \
-	state_tracker/st_atom_framebuffer.c \
-	state_tracker/st_atom_msaa.c \
-	state_tracker/st_atom_pixeltransfer.c \
-	state_tracker/st_atom_sampler.c \
-	state_tracker/st_atom_scissor.c \
-	state_tracker/st_atom_shader.c \
-	state_tracker/st_atom_rasterizer.c \
-	state_tracker/st_atom_stipple.c \
-	state_tracker/st_atom_texture.c \
-	state_tracker/st_atom_viewport.c \
-	state_tracker/st_cb_accum.c \
-	state_tracker/st_cb_bitmap.c \
-	state_tracker/st_cb_blit.c \
-	state_tracker/st_cb_bufferobjects.c \
-	state_tracker/st_cb_clear.c \
-	state_tracker/st_cb_condrender.c \
-	state_tracker/st_cb_flush.c \
-	state_tracker/st_cb_drawpixels.c \
-	state_tracker/st_cb_drawtex.c \
-	state_tracker/st_cb_eglimage.c \
-	state_tracker/st_cb_fbo.c \
-	state_tracker/st_cb_feedback.c \
-	state_tracker/st_cb_program.c \
-	state_tracker/st_cb_queryobj.c \
-	state_tracker/st_cb_rasterpos.c \
-	state_tracker/st_cb_readpixels.c \
-	state_tracker/st_cb_strings.c \
-	state_tracker/st_cb_texture.c \
-	state_tracker/st_cb_viewport.c \
-	state_tracker/st_cb_xformfb.c \
-	state_tracker/st_context.c \
-	state_tracker/st_debug.c \
-	state_tracker/st_draw.c \
-	state_tracker/st_draw_feedback.c \
-	state_tracker/st_extensions.c \
-	state_tracker/st_format.c \
-	state_tracker/st_gen_mipmap.c \
-	state_tracker/st_manager.c \
-	state_tracker/st_mesa_to_tgsi.c \
-	state_tracker/st_program.c \
-	state_tracker/st_texture.c
-
-PROGRAM_SOURCES = \
-	program/arbprogparse.c \
-	program/hash_table.c \
-	program/lex.yy.c \
-	program/nvfragparse.c \
-	program/nvvertparse.c \
-	program/program.c \
-	program/program_parse.tab.c \
-	program/program_parse_extra.c \
-	program/prog_cache.c \
-	program/prog_execute.c \
-	program/prog_instruction.c \
-	program/prog_noise.c \
-	program/prog_optimize.c \
-	program/prog_parameter.c \
-	program/prog_parameter_layout.c \
-	program/prog_print.c \
-	program/prog_statevars.c \
-	program/prog_uniform.c \
-	program/programopt.c \
-	program/symbol_table.c
-
-SHADER_CXX_SOURCES = \
-	program/ir_to_mesa.cpp
-
-ASM_C_SOURCES =	\
-	x86/common_x86.c \
-	x86/x86_xform.c \
-	x86/3dnow.c \
-	x86/sse.c \
-	x86/rtasm/x86sse.c \
-	sparc/sparc.c \
-	ppc/common_ppc.c \
-	x86-64/x86-64.c
-
-X86_SOURCES =			\
-	x86/common_x86_asm.S	\
-	x86/x86_xform2.S	\
-	x86/x86_xform3.S	\
-	x86/x86_xform4.S	\
-	x86/x86_cliptest.S	\
-	x86/mmx_blend.S		\
-	x86/3dnow_xform1.S	\
-	x86/3dnow_xform2.S	\
-	x86/3dnow_xform3.S	\
-	x86/3dnow_xform4.S	\
-	x86/3dnow_normal.S	\
-	x86/sse_xform1.S	\
-	x86/sse_xform2.S	\
-	x86/sse_xform3.S	\
-	x86/sse_xform4.S	\
-	x86/sse_normal.S	\
-	x86/read_rgba_span_x86.S
-
-X86-64_SOURCES =		\
-	x86-64/xform4.S
-
-SPARC_SOURCES =			\
-	sparc/clip.S		\
-	sparc/norm.S		\
-	sparc/xform.S
-
-COMMON_DRIVER_SOURCES =			\
-	drivers/common/driverfuncs.c	\
-	drivers/common/meta.c
-
-
-# Sources for building non-Gallium drivers
-MESA_SOURCES = \
-	$(MAIN_SOURCES)		\
-	$(MATH_SOURCES)		\
-	$(MATH_XFORM_SOURCES)	\
-	$(VBO_SOURCES)		\
-	$(TNL_SOURCES)		\
-	$(PROGRAM_SOURCES)	\
-	$(SWRAST_SOURCES)	\
-	$(SWRAST_SETUP_SOURCES)	\
-	$(COMMON_DRIVER_SOURCES)\
-	$(ASM_C_SOURCES)
-
-MESA_CXX_SOURCES = \
-	 $(SHADER_CXX_SOURCES)
-
-# Sources for building Gallium drivers
-MESA_GALLIUM_SOURCES = \
-	$(MAIN_SOURCES)		\
-	$(MATH_SOURCES)		\
-	$(VBO_SOURCES)		\
-	$(STATETRACKER_SOURCES)	\
-	$(PROGRAM_SOURCES)	\
-	ppc/common_ppc.c	\
-	x86/common_x86.c
-
-MESA_GALLIUM_CXX_SOURCES = \
-	 $(SHADER_CXX_SOURCES)
-
-# All the core C sources, for dependency checking
-ALL_SOURCES = \
-	$(MESA_SOURCES)		\
-	$(MESA_CXX_SOURCES)	\
-	$(MESA_ASM_SOURCES)	\
-	$(STATETRACKER_SOURCES)
-
-
-### Object files
-
-MESA_OBJECTS = \
-	$(MESA_SOURCES:.c=.o) \
-	$(MESA_CXX_SOURCES:.cpp=.o) \
-	$(MESA_ASM_SOURCES:.S=.o)
-
-MESA_GALLIUM_OBJECTS = \
-	$(MESA_GALLIUM_SOURCES:.c=.o) \
-	$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
-	$(MESA_ASM_SOURCES:.S=.o)
-
-
-COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
-
-
-### Other archives/libraries
-
-GLSL_LIBS = \
-	$(TOP)/src/glsl/libglsl.a
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/glsl \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mapi \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/auxiliary
+### Lists of source files, included by Makefiles

+

+# this is part of MAIN_SOURCES

+MAIN_ES_SOURCES = \

+	main/api_exec_es1.c \

+	main/api_exec_es2.c

+

+MAIN_SOURCES = \

+	main/api_arrayelt.c \

+	main/api_exec.c \

+	main/api_loopback.c \

+	main/api_noop.c \

+	main/api_validate.c \

+	main/accum.c \

+	main/arbprogram.c \

+	main/atifragshader.c \

+	main/attrib.c \

+	main/arrayobj.c \

+	main/blend.c \

+	main/bufferobj.c \

+	main/buffers.c \

+	main/clear.c \

+	main/clip.c \

+	main/colortab.c \

+	main/condrender.c \

+	main/context.c \

+	main/convolve.c \

+	main/cpuinfo.c \

+	main/debug.c \

+	main/depth.c \

+	main/depthstencil.c \

+	main/dlist.c \

+	main/dlopen.c \

+	main/drawpix.c \

+	main/drawtex.c \

+	main/enable.c \

+	main/enums.c \

+	main/eval.c \

+	main/execmem.c \

+	main/extensions.c \

+	main/fbobject.c \

+	main/feedback.c \

+	main/ffvertex_prog.c \

+	main/fog.c \

+	main/formats.c \

+	main/framebuffer.c \

+	main/get.c \

+	main/getstring.c \

+	main/hash.c \

+	main/hint.c \

+	main/histogram.c \

+	main/image.c \

+	main/imports.c \

+	main/light.c \

+	main/lines.c \

+	main/matrix.c \

+	main/mipmap.c \

+	main/mm.c \

+	main/multisample.c \

+	main/nvprogram.c \

+	main/pack.c \

+	main/pixel.c \

+	main/pixelstore.c \

+	main/pixeltransfer.c \

+	main/points.c \

+	main/polygon.c \

+	main/queryobj.c \

+	main/querymatrix.c \

+	main/rastpos.c \

+	main/readpix.c \

+	main/remap.c \

+	main/renderbuffer.c \

+	main/scissor.c \

+	main/shaderapi.c \

+	main/shaderobj.c \

+	main/shared.c \

+	main/state.c \

+	main/stencil.c \

+	main/syncobj.c \

+	main/texcompress.c \

+	main/texcompress_s3tc.c \

+	main/texcompress_fxt1.c \

+	main/texenv.c \

+	main/texenvprogram.c \

+	main/texfetch.c \

+	main/texformat.c \

+	main/texgen.c \

+	main/texgetimage.c \

+	main/teximage.c \

+	main/texobj.c \

+	main/texpal.c \

+	main/texparam.c \

+	main/texrender.c \

+	main/texstate.c \

+	main/texstore.c \

+	main/transformfeedback.c \

+	main/uniforms.c \

+	main/varray.c \

+	main/version.c \

+	main/viewport.c \

+	main/vtxfmt.c \

+	$(MAIN_ES_SOURCES)

+

+MATH_SOURCES = \

+	math/m_debug_clip.c \

+	math/m_debug_norm.c \

+	math/m_debug_xform.c \

+	math/m_eval.c \

+	math/m_matrix.c \

+	math/m_translate.c \

+	math/m_vector.c

+

+MATH_XFORM_SOURCES = \

+	math/m_xform.c

+

+SWRAST_SOURCES = \

+	swrast/s_aaline.c \

+	swrast/s_aatriangle.c \

+	swrast/s_accum.c \

+	swrast/s_alpha.c \

+	swrast/s_atifragshader.c \

+	swrast/s_bitmap.c \

+	swrast/s_blend.c \

+	swrast/s_blit.c \

+	swrast/s_clear.c \

+	swrast/s_copypix.c \

+	swrast/s_context.c \

+	swrast/s_depth.c \

+	swrast/s_drawpix.c \

+	swrast/s_feedback.c \

+	swrast/s_fog.c \

+	swrast/s_fragprog.c \

+	swrast/s_lines.c \

+	swrast/s_logic.c \

+	swrast/s_masking.c \

+	swrast/s_points.c \

+	swrast/s_readpix.c \

+	swrast/s_span.c \

+	swrast/s_stencil.c \

+	swrast/s_texcombine.c \

+	swrast/s_texfilter.c \

+	swrast/s_triangle.c \

+	swrast/s_zoom.c

+

+SWRAST_SETUP_SOURCES = \

+	swrast_setup/ss_context.c \

+	swrast_setup/ss_triangle.c 

+

+TNL_SOURCES = \

+	tnl/t_context.c \

+	tnl/t_pipeline.c \

+	tnl/t_draw.c \

+	tnl/t_rasterpos.c \

+	tnl/t_vb_program.c \

+	tnl/t_vb_render.c \

+	tnl/t_vb_texgen.c \

+	tnl/t_vb_texmat.c \

+	tnl/t_vb_vertex.c \

+	tnl/t_vb_fog.c \

+	tnl/t_vb_light.c \

+	tnl/t_vb_normals.c \

+	tnl/t_vb_points.c \

+	tnl/t_vp_build.c \

+	tnl/t_vertex.c \

+	tnl/t_vertex_sse.c \

+	tnl/t_vertex_generic.c 

+

+VBO_SOURCES = \

+	vbo/vbo_context.c \

+	vbo/vbo_exec.c \

+	vbo/vbo_exec_api.c \

+	vbo/vbo_exec_array.c \

+	vbo/vbo_exec_draw.c \

+	vbo/vbo_exec_eval.c \

+	vbo/vbo_rebase.c \

+	vbo/vbo_split.c \

+	vbo/vbo_split_copy.c \

+	vbo/vbo_split_inplace.c \

+	vbo/vbo_save.c \

+	vbo/vbo_save_api.c \

+	vbo/vbo_save_draw.c \

+	vbo/vbo_save_loopback.c 

+

+STATETRACKER_SOURCES = \

+	state_tracker/st_atom.c \

+	state_tracker/st_atom_blend.c \

+	state_tracker/st_atom_clip.c \

+	state_tracker/st_atom_constbuf.c \

+	state_tracker/st_atom_depth.c \

+	state_tracker/st_atom_framebuffer.c \

+	state_tracker/st_atom_msaa.c \

+	state_tracker/st_atom_pixeltransfer.c \

+	state_tracker/st_atom_sampler.c \

+	state_tracker/st_atom_scissor.c \

+	state_tracker/st_atom_shader.c \

+	state_tracker/st_atom_rasterizer.c \

+	state_tracker/st_atom_stipple.c \

+	state_tracker/st_atom_texture.c \

+	state_tracker/st_atom_viewport.c \

+	state_tracker/st_cb_accum.c \

+	state_tracker/st_cb_bitmap.c \

+	state_tracker/st_cb_blit.c \

+	state_tracker/st_cb_bufferobjects.c \

+	state_tracker/st_cb_clear.c \

+	state_tracker/st_cb_condrender.c \

+	state_tracker/st_cb_flush.c \

+	state_tracker/st_cb_drawpixels.c \

+	state_tracker/st_cb_drawtex.c \

+	state_tracker/st_cb_eglimage.c \

+	state_tracker/st_cb_fbo.c \

+	state_tracker/st_cb_feedback.c \

+	state_tracker/st_cb_program.c \

+	state_tracker/st_cb_queryobj.c \

+	state_tracker/st_cb_rasterpos.c \

+	state_tracker/st_cb_readpixels.c \

+	state_tracker/st_cb_strings.c \

+	state_tracker/st_cb_texture.c \

+	state_tracker/st_cb_viewport.c \

+	state_tracker/st_cb_xformfb.c \

+	state_tracker/st_context.c \

+	state_tracker/st_debug.c \

+	state_tracker/st_draw.c \

+	state_tracker/st_draw_feedback.c \

+	state_tracker/st_extensions.c \

+	state_tracker/st_format.c \

+	state_tracker/st_gen_mipmap.c \

+	state_tracker/st_manager.c \

+	state_tracker/st_mesa_to_tgsi.c \

+	state_tracker/st_program.c \

+	state_tracker/st_texture.c

+

+PROGRAM_SOURCES = \

+	program/arbprogparse.c \

+	program/hash_table.c \

+	program/lex.yy.c \

+	program/nvfragparse.c \

+	program/nvvertparse.c \

+	program/program.c \

+	program/program_parse.tab.c \

+	program/program_parse_extra.c \

+	program/prog_cache.c \

+	program/prog_execute.c \

+	program/prog_instruction.c \

+	program/prog_noise.c \

+	program/prog_optimize.c \

+	program/prog_parameter.c \

+	program/prog_parameter_layout.c \

+	program/prog_print.c \

+	program/prog_statevars.c \

+	program/prog_uniform.c \

+	program/programopt.c \

+	program/register_allocate.c \

+	program/symbol_table.c

+

+SHADER_CXX_SOURCES = \

+	program/ir_to_mesa.cpp \

+	program/sampler.cpp

+

+ASM_C_SOURCES =	\

+	x86/common_x86.c \

+	x86/x86_xform.c \

+	x86/3dnow.c \

+	x86/sse.c \

+	x86/rtasm/x86sse.c \

+	sparc/sparc.c \

+	ppc/common_ppc.c \

+	x86-64/x86-64.c

+

+X86_SOURCES =			\

+	x86/common_x86_asm.S	\

+	x86/x86_xform2.S	\

+	x86/x86_xform3.S	\

+	x86/x86_xform4.S	\

+	x86/x86_cliptest.S	\

+	x86/mmx_blend.S		\

+	x86/3dnow_xform1.S	\

+	x86/3dnow_xform2.S	\

+	x86/3dnow_xform3.S	\

+	x86/3dnow_xform4.S	\

+	x86/3dnow_normal.S	\

+	x86/sse_xform1.S	\

+	x86/sse_xform2.S	\

+	x86/sse_xform3.S	\

+	x86/sse_xform4.S	\

+	x86/sse_normal.S	\

+	x86/read_rgba_span_x86.S

+

+X86-64_SOURCES =		\

+	x86-64/xform4.S

+

+SPARC_SOURCES =			\

+	sparc/clip.S		\

+	sparc/norm.S		\

+	sparc/xform.S

+

+COMMON_DRIVER_SOURCES =			\

+	drivers/common/driverfuncs.c	\

+	drivers/common/meta.c

+

+

+# Sources for building non-Gallium drivers

+MESA_SOURCES = \

+	$(MAIN_SOURCES)		\

+	$(MATH_SOURCES)		\

+	$(MATH_XFORM_SOURCES)	\

+	$(VBO_SOURCES)		\

+	$(TNL_SOURCES)		\

+	$(PROGRAM_SOURCES)	\

+	$(SWRAST_SOURCES)	\

+	$(SWRAST_SETUP_SOURCES)	\

+	$(COMMON_DRIVER_SOURCES)\

+	$(ASM_C_SOURCES)

+

+MESA_CXX_SOURCES = \

+	 $(SHADER_CXX_SOURCES)

+

+# Sources for building Gallium drivers

+MESA_GALLIUM_SOURCES = \

+	$(MAIN_SOURCES)		\

+	$(MATH_SOURCES)		\

+	$(VBO_SOURCES)		\

+	$(STATETRACKER_SOURCES)	\

+	$(PROGRAM_SOURCES)	\

+	ppc/common_ppc.c	\

+	x86/common_x86.c

+

+MESA_GALLIUM_CXX_SOURCES = \

+	 $(SHADER_CXX_SOURCES)

+

+# All the core C sources, for dependency checking

+ALL_SOURCES = \

+	$(MESA_SOURCES)		\

+	$(MESA_CXX_SOURCES)	\

+	$(MESA_ASM_SOURCES)	\

+	$(STATETRACKER_SOURCES)

+

+

+### Object files

+

+MESA_OBJECTS = \

+	$(MESA_SOURCES:.c=.o) \

+	$(MESA_CXX_SOURCES:.cpp=.o) \

+	$(MESA_ASM_SOURCES:.S=.o)

+

+MESA_GALLIUM_OBJECTS = \

+	$(MESA_GALLIUM_SOURCES:.c=.o) \

+	$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \

+	$(MESA_ASM_SOURCES:.S=.o)

+

+

+COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)

+

+

+### Other archives/libraries

+

+GLSL_LIBS = \

+	$(TOP)/src/glsl/libglsl.a

+

+

+### Include directories

+

+INCLUDE_DIRS = \

+	-I$(TOP)/include \

+	-I$(TOP)/src/glsl \

+	-I$(TOP)/src/mesa \

+	-I$(TOP)/src/mapi \

+	-I$(TOP)/src/gallium/include \

+	-I$(TOP)/src/gallium/auxiliary

diff --git a/mesalib/src/mesa/state_tracker/Makefile b/mesalib/src/mesa/state_tracker/Makefile
new file mode 100644
index 000000000..4a38ca8f1
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/Makefile
@@ -0,0 +1,2 @@
+default:

+	cd ../.. ; make
\ No newline at end of file
diff --git a/mesalib/src/mesa/state_tracker/st_atom.c b/mesalib/src/mesa/state_tracker/st_atom.c
new file mode 100644
index 000000000..ff1f61afe
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom.c
@@ -0,0 +1,200 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+

+#include "pipe/p_defines.h"

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_cb_bitmap.h"

+#include "st_program.h"

+#include "st_manager.h"

+

+

+/**

+ * This is used to initialize st->atoms[].

+ */

+static const struct st_tracked_state *atoms[] =

+{

+   &st_update_depth_stencil_alpha,

+   &st_update_clip,

+

+   &st_finalize_textures,

+   &st_update_fp,

+   &st_update_gp,

+   &st_update_vp,

+

+   &st_update_rasterizer,

+   &st_update_polygon_stipple,

+   &st_update_viewport,

+   &st_update_scissor,

+   &st_update_blend,

+   &st_update_sampler,

+   &st_update_texture,

+   &st_update_framebuffer,

+   &st_update_msaa,

+   &st_update_vs_constants,

+   &st_update_gs_constants,

+   &st_update_fs_constants,

+   &st_update_pixel_transfer

+};

+

+

+void st_init_atoms( struct st_context *st )

+{

+   /* no-op */

+}

+

+

+void st_destroy_atoms( struct st_context *st )

+{

+   /* no-op */

+}

+

+

+/***********************************************************************

+ */

+

+static GLboolean check_state( const struct st_state_flags *a,

+			      const struct st_state_flags *b )

+{

+   return ((a->mesa & b->mesa) ||

+	   (a->st & b->st));

+}

+

+static void accumulate_state( struct st_state_flags *a,

+			      const struct st_state_flags *b )

+{

+   a->mesa |= b->mesa;

+   a->st |= b->st;

+}

+

+

+static void xor_states( struct st_state_flags *result,

+			     const struct st_state_flags *a,

+			      const struct st_state_flags *b )

+{

+   result->mesa = a->mesa ^ b->mesa;

+   result->st = a->st ^ b->st;

+}

+

+

+/* Too complex to figure out, just check every time:

+ */

+static void check_program_state( struct st_context *st )

+{

+   struct gl_context *ctx = st->ctx;

+

+   if (ctx->VertexProgram._Current != &st->vp->Base)

+      st->dirty.st |= ST_NEW_VERTEX_PROGRAM;

+

+   if (ctx->FragmentProgram._Current != &st->fp->Base)

+      st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;

+

+   if (ctx->GeometryProgram._Current != &st->gp->Base)

+      st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;

+}

+

+

+/***********************************************************************

+ * Update all derived state:

+ */

+

+void st_validate_state( struct st_context *st )

+{

+   struct st_state_flags *state = &st->dirty;

+   GLuint i;

+

+   /* The bitmap cache is immune to pixel unpack changes.

+    * Note that GLUT makes several calls to glPixelStore for each

+    * bitmap char it draws so this is an important check.

+    */

+   if (state->mesa & ~_NEW_PACKUNPACK)

+      st_flush_bitmap_cache(st);

+

+   check_program_state( st );

+

+   st_manager_validate_framebuffers(st);

+

+   if (state->st == 0)

+      return;

+

+   /*printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);*/

+

+   if (1) {

+      /* Debug version which enforces various sanity checks on the

+       * state flags which are generated and checked to help ensure

+       * state atoms are ordered correctly in the list.

+       */

+      struct st_state_flags examined, prev;      

+      memset(&examined, 0, sizeof(examined));

+      prev = *state;

+

+      for (i = 0; i < Elements(atoms); i++) {	 

+	 const struct st_tracked_state *atom = atoms[i];

+	 struct st_state_flags generated;

+	 

+	 /*printf("atom %s %x/%x\n", atom->name, atom->dirty.mesa, atom->dirty.st);*/

+

+	 if (!(atom->dirty.mesa || atom->dirty.st) ||

+	     !atom->update) {

+	    printf("malformed atom %s\n", atom->name);

+	    assert(0);

+	 }

+

+	 if (check_state(state, &atom->dirty)) {

+	    atoms[i]->update( st );

+	    /*printf("after: %x\n", atom->dirty.mesa);*/

+	 }

+

+	 accumulate_state(&examined, &atom->dirty);

+

+	 /* generated = (prev ^ state)

+	  * if (examined & generated)

+	  *     fail;

+	  */

+	 xor_states(&generated, &prev, state);

+	 assert(!check_state(&examined, &generated));

+	 prev = *state;

+      }

+      /*printf("\n");*/

+

+   }

+   else {

+      for (i = 0; i < Elements(atoms); i++) {	 

+	 if (check_state(state, &atoms[i]->dirty))

+	    atoms[i]->update( st );

+      }

+   }

+

+   memset(state, 0, sizeof(*state));

+}

+

+

+

diff --git a/mesalib/src/mesa/state_tracker/st_atom.h b/mesalib/src/mesa/state_tracker/st_atom.h
new file mode 100644
index 000000000..aec5785e6
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom.h
@@ -0,0 +1,72 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  */

+    

+

+#ifndef ST_ATOM_H

+#define ST_ATOM_H

+

+#include "main/glheader.h"

+

+struct st_context;

+struct st_tracked_state;

+

+void st_init_atoms( struct st_context *st );

+void st_destroy_atoms( struct st_context *st );

+

+

+void st_validate_state( struct st_context *st );

+

+

+extern const struct st_tracked_state st_update_framebuffer;

+extern const struct st_tracked_state st_update_clip;

+extern const struct st_tracked_state st_update_depth_stencil_alpha;

+extern const struct st_tracked_state st_update_fp;

+extern const struct st_tracked_state st_update_gp;

+extern const struct st_tracked_state st_update_vp;

+extern const struct st_tracked_state st_update_rasterizer;

+extern const struct st_tracked_state st_update_polygon_stipple;

+extern const struct st_tracked_state st_update_viewport;

+extern const struct st_tracked_state st_update_scissor;

+extern const struct st_tracked_state st_update_blend;

+extern const struct st_tracked_state st_update_msaa;

+extern const struct st_tracked_state st_update_sampler;

+extern const struct st_tracked_state st_update_texture;

+extern const struct st_tracked_state st_finalize_textures;

+extern const struct st_tracked_state st_update_fs_constants;

+extern const struct st_tracked_state st_update_gs_constants;

+extern const struct st_tracked_state st_update_vs_constants;

+extern const struct st_tracked_state st_update_pixel_transfer;

+

+

+GLuint st_compare_func_to_pipe(GLenum func);

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_atom_blend.c b/mesalib/src/mesa/state_tracker/st_atom_blend.c
new file mode 100644
index 000000000..e60bbd36f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_blend.c
@@ -0,0 +1,286 @@
+/**************************************************************************

+ * 

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

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

+

+   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.BlendEquationRGB == 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; i < num_state; i++) {

+

+         blend->rt[i].blend_enable = (st->ctx->Color.BlendEnabled >> i) & 0x1;

+

+         blend->rt[i].rgb_func = translate_blend(st->ctx->Color.BlendEquationRGB);

+         if (st->ctx->Color.BlendEquationRGB == GL_MIN ||

+             st->ctx->Color.BlendEquationRGB == 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.BlendSrcRGB);

+            blend->rt[i].rgb_dst_factor = translate_blend(st->ctx->Color.BlendDstRGB);

+         }

+

+         blend->rt[i].alpha_func = translate_blend(st->ctx->Color.BlendEquationA);

+         if (st->ctx->Color.BlendEquationA == GL_MIN ||

+             st->ctx->Color.BlendEquationA == 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.BlendSrcA);

+            blend->rt[i].alpha_dst_factor = translate_blend(st->ctx->Color.BlendDstA);

+         }

+      }

+   }

+   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.BlendColor);

+      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_clip.c b/mesalib/src/mesa/state_tracker/st_atom_clip.c
new file mode 100644
index 000000000..24d479a74
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_clip.c
@@ -0,0 +1,75 @@
+/**************************************************************************

+ * 

+ * 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 "st_context.h"

+#include "pipe/p_context.h"

+#include "st_atom.h"

+

+#include "cso_cache/cso_context.h"

+

+

+/* Second state atom for user clip planes:

+ */

+static void update_clip( struct st_context *st )

+{

+   struct pipe_clip_state clip;

+   GLuint i;

+

+   memset(&clip, 0, sizeof(clip));

+

+   for (i = 0; i < PIPE_MAX_CLIP_PLANES; i++) {

+      if (st->ctx->Transform.ClipPlanesEnabled & (1 << i)) {

+	 memcpy(clip.ucp[clip.nr], 

+		st->ctx->Transform._ClipUserPlane[i], 

+		sizeof(clip.ucp[0]));

+	 clip.nr++;

+      }

+   }

+

+   clip.depth_clamp = st->ctx->Transform.DepthClamp != GL_FALSE;

+      

+   if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) {

+      st->state.clip = clip;

+      cso_set_clip(st->cso_context, &clip);

+   }

+}

+

+

+const struct st_tracked_state st_update_clip = {

+   "st_update_clip",					/* name */

+   {							/* dirty */

+      (_NEW_TRANSFORM),					/* mesa */

+      0,						/* st */

+   },

+   update_clip						/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c
new file mode 100644
index 000000000..5672215f7
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c
@@ -0,0 +1,171 @@
+/**************************************************************************

+ * 

+ * 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 "program/prog_parameter.h"

+#include "program/prog_print.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+

+#include "st_debug.h"

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_atom_constbuf.h"

+#include "st_program.h"

+

+

+/**

+ * Pass the given program parameters to the graphics pipe as a

+ * constant buffer.

+ * \param shader_type  either PIPE_SHADER_VERTEX or PIPE_SHADER_FRAGMENT

+ */

+void st_upload_constants( struct st_context *st,

+                          struct gl_program_parameter_list *params,

+                          unsigned shader_type)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_resource **cbuf = &st->state.constants[shader_type];

+

+   assert(shader_type == PIPE_SHADER_VERTEX ||

+          shader_type == PIPE_SHADER_FRAGMENT ||

+          shader_type == PIPE_SHADER_GEOMETRY);

+

+   /* update constants */

+   if (params && params->NumParameters) {

+      const uint paramBytes = params->NumParameters * sizeof(GLfloat) * 4;

+

+      /* Update the constants which come from fixed-function state, such as

+       * transformation matrices, fog factors, etc.  The rest of the values in

+       * the parameters list are explicitly set by the user with glUniform,

+       * glProgramParameter(), etc.

+       */

+      _mesa_load_state_parameters(st->ctx, params);

+

+      /* We always need to get a new buffer, to keep the drivers simple and

+       * avoid gratuitous rendering synchronization.

+       */

+      pipe_resource_reference(cbuf, NULL );

+      *cbuf = pipe_buffer_create(pipe->screen,

+				 PIPE_BIND_CONSTANT_BUFFER,

+				 paramBytes );

+

+      if (ST_DEBUG & DEBUG_CONSTANTS) {

+	 debug_printf("%s(shader=%d, numParams=%d, stateFlags=0x%x)\n", 

+                      __FUNCTION__, shader_type, params->NumParameters,

+                      params->StateFlags);

+         _mesa_print_parameter_list(params);

+      }

+

+      /* load Mesa constants into the constant buffer */

+      pipe_buffer_write(st->pipe, *cbuf,

+				    0, paramBytes,

+				    params->ParameterValues);

+

+      st->pipe->set_constant_buffer(st->pipe, shader_type, 0, *cbuf);

+   }

+   else if (*cbuf) {

+      st->constants.tracked_state[shader_type].dirty.mesa = 0x0;

+

+      pipe_resource_reference(cbuf, NULL);

+      st->pipe->set_constant_buffer(st->pipe, shader_type, 0, NULL);

+   }

+}

+

+

+/**

+ * Vertex shader:

+ */

+static void update_vs_constants(struct st_context *st )

+{

+   struct st_vertex_program *vp = st->vp;

+   struct gl_program_parameter_list *params = vp->Base.Base.Parameters;

+

+   st_upload_constants( st, params, PIPE_SHADER_VERTEX );

+}

+

+

+const struct st_tracked_state st_update_vs_constants = {

+   "st_update_vs_constants",				/* name */

+   {							/* dirty */

+      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */

+      ST_NEW_VERTEX_PROGRAM,				/* st */

+   },

+   update_vs_constants					/* update */

+};

+

+

+

+/**

+ * Fragment shader:

+ */

+static void update_fs_constants(struct st_context *st )

+{

+   struct st_fragment_program *fp = st->fp;

+   struct gl_program_parameter_list *params = fp->Base.Base.Parameters;

+

+   st_upload_constants( st, params, PIPE_SHADER_FRAGMENT );

+}

+

+

+const struct st_tracked_state st_update_fs_constants = {

+   "st_update_fs_constants",				/* name */

+   {							/* dirty */

+      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */

+      ST_NEW_FRAGMENT_PROGRAM,				/* st */

+   },

+   update_fs_constants					/* update */

+};

+

+/* Geometry shader:

+ */

+static void update_gs_constants(struct st_context *st )

+{

+   struct st_geometry_program *gp = st->gp;

+   struct gl_program_parameter_list *params;

+

+   if (gp) {

+      params = gp->Base.Base.Parameters;

+      st_upload_constants( st, params, PIPE_SHADER_GEOMETRY );

+   }

+}

+

+const struct st_tracked_state st_update_gs_constants = {

+   "st_update_gs_constants",				/* name */

+   {							/* dirty */

+      (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS),          /* mesa */

+      ST_NEW_GEOMETRY_PROGRAM,				/* st */

+   },

+   update_gs_constants					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_constbuf.h b/mesalib/src/mesa/state_tracker/st_atom_constbuf.h
new file mode 100644
index 000000000..d53654ee6
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_constbuf.h
@@ -0,0 +1,41 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_ATOM_CONSTBUF_H

+#define ST_ATOM_CONSTBUF_H

+

+struct gl_program_parameter_list;

+struct st_context;

+

+

+void st_upload_constants( struct st_context *st,

+                          struct gl_program_parameter_list *params,

+                          unsigned id);

+

+

+#endif /* ST_ATOM_CONSTBUF_H */

diff --git a/mesalib/src/mesa/state_tracker/st_atom_depth.c b/mesalib/src/mesa/state_tracker/st_atom_depth.c
new file mode 100644
index 000000000..e8e8db41d
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_depth.c
@@ -0,0 +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.AlphaRef;

+   }

+

+   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
new file mode 100644
index 000000000..3ba690200
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -0,0 +1,180 @@
+/**************************************************************************

+ * 

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

+

+

+

+/**

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

+

+   if (!strb->surface ||

+       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 = resource->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_msaa.c b/mesalib/src/mesa/state_tracker/st_atom_msaa.c
new file mode 100644
index 000000000..73f0ff160
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_msaa.c
@@ -0,0 +1,83 @@
+/**************************************************************************

+ * 

+ * Copyright 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 THE AUTHORS 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 "st_context.h"

+#include "pipe/p_context.h"

+#include "st_atom.h"

+

+#include "cso_cache/cso_context.h"

+

+

+/* Second state atom for user clip planes:

+ */

+static void update_sample_mask( struct st_context *st )

+{

+   unsigned sample_mask = 0xffffffff;

+   unsigned sample_count = 1;

+   struct pipe_framebuffer_state *framebuffer = &st->state.framebuffer;

+

+   /* dependency here on bound surface (or rather, sample count) is worrying */

+   if (framebuffer->zsbuf)

+      sample_count = framebuffer->zsbuf->texture->nr_samples;

+   else if (framebuffer->cbufs[0])

+      sample_count = framebuffer->cbufs[0]->texture->nr_samples;

+

+   if (st->ctx->Multisample.Enabled && sample_count > 1) {

+   /* unlike in gallium/d3d10 the mask is only active if msaa is enabled */

+      if (st->ctx->Multisample.SampleCoverage) {

+         unsigned nr_bits;

+         nr_bits = st->ctx->Multisample.SampleCoverageValue * (float)sample_count;

+         /* there's lot of ways how to do this. We just use first few bits,

+            since we have no knowledge of sample positions here. When

+            app-supplied mask though is used too might need to be smarter.

+            Also, there's a interface restriction here in theory it is

+            encouraged this mask not be the same at each pixel. */

+         sample_mask = (1 << nr_bits) - 1;

+         if (st->ctx->Multisample.SampleCoverageInvert)

+            sample_mask = ~sample_mask;

+      }

+      /* TODO merge with app-supplied sample mask */

+   }

+

+   /* mask off unused bits or don't care? */

+

+   if (sample_mask != st->state.sample_mask) {

+      st->state.sample_mask = sample_mask;

+      cso_set_sample_mask(st->cso_context, sample_mask);

+   }

+}

+

+

+const struct st_tracked_state st_update_msaa = {

+   "st_update_msaa",					/* name */

+   {							/* dirty */

+      (_NEW_MULTISAMPLE | _NEW_BUFFERS),		/* mesa */

+      ST_NEW_FRAMEBUFFER,				/* st */

+   },

+   update_sample_mask					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
new file mode 100644
index 000000000..a9e05c9c4
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -0,0 +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, 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 = (1 << 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
new file mode 100644
index 000000000..4936385d2
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -0,0 +1,272 @@
+/**************************************************************************

+ * 

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

+

+      /* XXX

+       * I think the intention here is that user-created framebuffer objects

+       * use Y=0=TOP layout instead of OpenGL's normal Y=0=bottom layout.

+       * Flipping Y changes CW to CCW and vice-versa.

+       * But this is an implementation/driver-specific artifact - remove...

+       */

+      if (ctx->DrawBuffer && ctx->DrawBuffer->Name != 0)

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

+   }

+

+   /* _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;

+

+   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),      /* mesa state dependencies*/

+      ST_NEW_VERTEX_PROGRAM,  /* state tracker dependencies */

+   },

+   update_raster_state     /* update function */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
new file mode 100644
index 000000000..c9dfe248f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -0,0 +1,270 @@
+/**************************************************************************

+ * 

+ * 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/macros.h"

+

+#include "st_context.h"

+#include "st_cb_texture.h"

+#include "st_atom.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+

+#include "cso_cache/cso_context.h"

+

+

+/**

+ * Convert GLenum texcoord wrap tokens to pipe tokens.

+ */

+static GLuint

+gl_wrap_xlate(GLenum wrap)

+{

+   switch (wrap) {

+   case GL_REPEAT:

+      return PIPE_TEX_WRAP_REPEAT;

+   case GL_CLAMP:

+      return PIPE_TEX_WRAP_CLAMP;

+   case GL_CLAMP_TO_EDGE:

+      return PIPE_TEX_WRAP_CLAMP_TO_EDGE;

+   case GL_CLAMP_TO_BORDER:

+      return PIPE_TEX_WRAP_CLAMP_TO_BORDER;

+   case GL_MIRRORED_REPEAT:

+      return PIPE_TEX_WRAP_MIRROR_REPEAT;

+   case GL_MIRROR_CLAMP_EXT:

+      return PIPE_TEX_WRAP_MIRROR_CLAMP;

+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:

+      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE;

+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:

+      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER;

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+

+static GLuint

+gl_filter_to_mip_filter(GLenum filter)

+{

+   switch (filter) {

+   case GL_NEAREST:

+   case GL_LINEAR:

+      return PIPE_TEX_MIPFILTER_NONE;

+

+   case GL_NEAREST_MIPMAP_NEAREST:

+   case GL_LINEAR_MIPMAP_NEAREST:

+      return PIPE_TEX_MIPFILTER_NEAREST;

+

+   case GL_NEAREST_MIPMAP_LINEAR:

+   case GL_LINEAR_MIPMAP_LINEAR:

+      return PIPE_TEX_MIPFILTER_LINEAR;

+

+   default:

+      assert(0);

+      return PIPE_TEX_MIPFILTER_NONE;

+   }

+}

+

+

+static GLuint

+gl_filter_to_img_filter(GLenum filter)

+{

+   switch (filter) {

+   case GL_NEAREST:

+   case GL_NEAREST_MIPMAP_NEAREST:

+   case GL_NEAREST_MIPMAP_LINEAR:

+      return PIPE_TEX_FILTER_NEAREST;

+

+   case GL_LINEAR:

+   case GL_LINEAR_MIPMAP_NEAREST:

+   case GL_LINEAR_MIPMAP_LINEAR:

+      return PIPE_TEX_FILTER_LINEAR;

+

+   default:

+      assert(0);

+      return PIPE_TEX_FILTER_NEAREST;

+   }

+}

+

+

+static void

+xlate_border_color(const GLfloat *colorIn, GLenum baseFormat, GLfloat *colorOut)

+{

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

+   }

+}

+

+

+static void 

+update_samplers(struct st_context *st)

+{

+   struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;

+   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;

+   const GLbitfield samplersUsed = (vprog->Base.SamplersUsed |

+                                    fprog->Base.SamplersUsed);

+   GLuint su;

+

+   st->state.num_samplers = 0;

+

+   /* loop over sampler units (aka tex image units) */

+   for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {

+      struct pipe_sampler_state *sampler = st->state.samplers + su;

+

+      memset(sampler, 0, sizeof(*sampler));

+

+      if (samplersUsed & (1 << su)) {

+         struct gl_texture_object *texobj;

+         struct gl_texture_image *teximg;

+         GLuint texUnit;

+

+         if (fprog->Base.SamplersUsed & (1 << su))

+            texUnit = fprog->Base.SamplerUnits[su];

+         else

+            texUnit = vprog->Base.SamplerUnits[su];

+

+         texobj = st->ctx->Texture.Unit[texUnit]._Current;

+         if (!texobj) {

+            texobj = st_get_default_texture(st);

+         }

+

+         teximg = texobj->Image[0][texobj->BaseLevel];

+

+         sampler->wrap_s = gl_wrap_xlate(texobj->WrapS);

+         sampler->wrap_t = gl_wrap_xlate(texobj->WrapT);

+         sampler->wrap_r = gl_wrap_xlate(texobj->WrapR);

+

+         sampler->min_img_filter = gl_filter_to_img_filter(texobj->MinFilter);

+         sampler->min_mip_filter = gl_filter_to_mip_filter(texobj->MinFilter);

+         sampler->mag_img_filter = gl_filter_to_img_filter(texobj->MagFilter);

+

+         if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)

+            sampler->normalized_coords = 1;

+

+         sampler->lod_bias = st->ctx->Texture.Unit[su].LodBias;

+

+         sampler->min_lod = texobj->BaseLevel + texobj->MinLod;

+         if (sampler->min_lod < texobj->BaseLevel)

+            sampler->min_lod = texobj->BaseLevel;

+

+         sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel,

+                                 (texobj->MaxLod + texobj->BaseLevel));

+         if (sampler->max_lod < sampler->min_lod) {

+            /* The GL spec doesn't seem to specify what to do in this case.

+             * Swap the values.

+             */

+            float tmp = sampler->max_lod;

+            sampler->max_lod = sampler->min_lod;

+            sampler->min_lod = tmp;

+            assert(sampler->min_lod <= sampler->max_lod);

+         }

+

+         xlate_border_color(texobj->BorderColor.f,

+                            teximg ? teximg->_BaseFormat : GL_RGBA,

+                            sampler->border_color);

+

+	 sampler->max_anisotropy = (texobj->MaxAnisotropy == 1.0 ? 0 : (GLuint)texobj->MaxAnisotropy);

+

+         /* only care about ARB_shadow, not SGI shadow */

+         if (texobj->CompareMode == GL_COMPARE_R_TO_TEXTURE) {

+            sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;

+            sampler->compare_func

+               = st_compare_func_to_pipe(texobj->CompareFunc);

+         }

+

+         st->state.num_samplers = su + 1;

+

+         /*printf("%s su=%u non-null\n", __FUNCTION__, su);*/

+         cso_single_sampler(st->cso_context, su, sampler);

+         if (su < st->ctx->Const.MaxVertexTextureImageUnits) {

+            cso_single_vertex_sampler(st->cso_context, su, sampler);

+         }

+      }

+      else {

+         /*printf("%s su=%u null\n", __FUNCTION__, su);*/

+         cso_single_sampler(st->cso_context, su, NULL);

+         if (su < st->ctx->Const.MaxVertexTextureImageUnits) {

+            cso_single_vertex_sampler(st->cso_context, su, NULL);

+         }

+      }

+   }

+

+   cso_single_sampler_done(st->cso_context);

+   if (st->ctx->Const.MaxVertexTextureImageUnits > 0) {

+      cso_single_vertex_sampler_done(st->cso_context);

+   }

+}

+

+

+const struct st_tracked_state st_update_sampler = {

+   "st_update_sampler",					/* name */

+   {							/* dirty */

+      _NEW_TEXTURE,					/* mesa */

+      0,						/* st */

+   },

+   update_samplers					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_scissor.c b/mesalib/src/mesa/state_tracker/st_atom_scissor.c
new file mode 100644
index 000000000..495a3ea25
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_scissor.c
@@ -0,0 +1,100 @@
+/**************************************************************************

+ * 

+ * 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 "pipe/p_context.h"

+#include "st_atom.h"

+

+

+/**

+ * Scissor depends on the scissor box, and the framebuffer dimensions.

+ */

+static void

+update_scissor( struct st_context *st )

+{

+   struct pipe_scissor_state scissor;

+   const struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+   GLint miny, maxy;

+

+   scissor.minx = 0;

+   scissor.miny = 0;

+   scissor.maxx = fb->Width;

+   scissor.maxy = fb->Height;

+

+   if (st->ctx->Scissor.Enabled) {

+      /* need to be careful here with xmax or ymax < 0 */

+      GLint xmax = MAX2(0, st->ctx->Scissor.X + st->ctx->Scissor.Width);

+      GLint ymax = MAX2(0, st->ctx->Scissor.Y + st->ctx->Scissor.Height);

+

+      if (st->ctx->Scissor.X > (GLint)scissor.minx)

+         scissor.minx = st->ctx->Scissor.X;

+      if (st->ctx->Scissor.Y > (GLint)scissor.miny)

+         scissor.miny = st->ctx->Scissor.Y;

+

+      if (xmax < (GLint) scissor.maxx)

+         scissor.maxx = xmax;

+      if (ymax < (GLint) scissor.maxy)

+         scissor.maxy = ymax;

+

+      /* check for null space */

+      if (scissor.minx >= scissor.maxx || scissor.miny >= scissor.maxy)

+         scissor.minx = scissor.miny = scissor.maxx = scissor.maxy = 0;

+   }

+

+   /* Now invert Y if needed.

+    * Gallium drivers use the convention Y=0=top for surfaces.

+    */

+   if (st_fb_orientation(fb) == Y_0_TOP) {

+      miny = fb->Height - scissor.maxy;

+      maxy = fb->Height - scissor.miny;

+      scissor.miny = miny;

+      scissor.maxy = maxy;

+   }

+

+   if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {

+      /* state has changed */

+      st->state.scissor = scissor;  /* struct copy */

+      st->pipe->set_scissor_state(st->pipe, &scissor); /* activate */

+   }

+}

+

+

+const struct st_tracked_state st_update_scissor = {

+   "st_update_scissor",					/* name */

+   {							/* dirty */

+      (_NEW_SCISSOR | _NEW_BUFFERS),			/* mesa */

+      0,						/* st */

+   },

+   update_scissor					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_shader.c b/mesalib/src/mesa/state_tracker/st_atom_shader.c
new file mode 100644
index 000000000..383bb2a1b
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_shader.c
@@ -0,0 +1,198 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+/**

+ * State validation for vertex/fragment shaders.

+ * Note that we have to delay most vertex/fragment shader translation

+ * until rendering time since the linkage between the vertex outputs and

+ * fragment inputs can vary depending on the pairing of shaders.

+ *

+ * Authors:

+ *   Brian Paul

+ */

+

+#include "main/imports.h"

+#include "main/mtypes.h"

+#include "program/program.h"

+

+#include "pipe/p_context.h"

+

+#include "util/u_simple_shaders.h"

+

+#include "cso_cache/cso_context.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_program.h"

+

+

+/**

+ * Return pointer to a pass-through fragment shader.

+ * This shader is used when a texture is missing/incomplete.

+ */

+static void *

+get_passthrough_fs(struct st_context *st)

+{

+   if (!st->passthrough_fs) {

+      st->passthrough_fs =

+         util_make_fragment_passthrough_shader(st->pipe);

+   }

+

+   return st->passthrough_fs;

+}

+

+

+/**

+ * Update fragment program state/atom.  This involves translating the

+ * Mesa fragment program into a gallium fragment program and binding it.

+ */

+static void

+update_fp( struct st_context *st )

+{

+   struct st_fragment_program *stfp;

+   struct st_fp_variant_key key;

+

+   assert(st->ctx->FragmentProgram._Current);

+   stfp = st_fragment_program(st->ctx->FragmentProgram._Current);

+   assert(stfp->Base.Base.Target == GL_FRAGMENT_PROGRAM_ARB);

+

+   memset(&key, 0, sizeof(key));

+   key.st = st;

+

+   st->fp_variant = st_get_fp_variant(st, stfp, &key);

+

+   st_reference_fragprog(st, &st->fp, stfp);

+

+   if (st->missing_textures) {

+      /* use a pass-through frag shader that uses no textures */

+      void *fs = get_passthrough_fs(st);

+      cso_set_fragment_shader_handle(st->cso_context, fs);

+   }

+   else {

+      cso_set_fragment_shader_handle(st->cso_context,

+                                     st->fp_variant->driver_shader);

+   }

+}

+

+

+const struct st_tracked_state st_update_fp = {

+   "st_update_fp",					/* name */

+   {							/* dirty */

+      0,						/* mesa */

+      ST_NEW_FRAGMENT_PROGRAM                           /* st */

+   },

+   update_fp  					/* update */

+};

+

+

+

+/**

+ * Update vertex program state/atom.  This involves translating the

+ * Mesa vertex program into a gallium fragment program and binding it.

+ */

+static void

+update_vp( struct st_context *st )

+{

+   struct st_vertex_program *stvp;

+   struct st_vp_variant_key key;

+

+   /* find active shader and params -- Should be covered by

+    * ST_NEW_VERTEX_PROGRAM

+    */

+   assert(st->ctx->VertexProgram._Current);

+   stvp = st_vertex_program(st->ctx->VertexProgram._Current);

+   assert(stvp->Base.Base.Target == GL_VERTEX_PROGRAM_ARB);

+

+   memset(&key, 0, sizeof key);

+   key.st = st;  /* variants are per-context */

+

+   /* When this is true, we will add an extra input to the vertex

+    * shader translation (for edgeflags), an extra output with

+    * edgeflag semantics, and extend the vertex shader to pass through

+    * the input to the output.  We'll need to use similar logic to set

+    * up the extra vertex_element input for edgeflags.

+    * _NEW_POLYGON, ST_NEW_EDGEFLAGS_DATA

+    */

+   key.passthrough_edgeflags = (st->vertdata_edgeflags && (

+                                st->ctx->Polygon.FrontMode != GL_FILL ||

+                                st->ctx->Polygon.BackMode != GL_FILL));

+

+   st->vp_variant = st_get_vp_variant(st, stvp, &key);

+

+   st_reference_vertprog(st, &st->vp, stvp);

+

+   cso_set_vertex_shader_handle(st->cso_context, 

+                                st->vp_variant->driver_shader);

+

+   st->vertex_result_to_slot = stvp->result_to_output;

+}

+

+

+const struct st_tracked_state st_update_vp = {

+   "st_update_vp",					/* name */

+   {							/* dirty */

+      _NEW_POLYGON,					/* mesa */

+      ST_NEW_VERTEX_PROGRAM | ST_NEW_EDGEFLAGS_DATA	/* st */

+   },

+   update_vp						/* update */

+};

+

+

+

+static void

+update_gp( struct st_context *st )

+{

+   struct st_geometry_program *stgp;

+   struct st_gp_variant_key key;

+

+   if (!st->ctx->GeometryProgram._Current) {

+      cso_set_geometry_shader_handle(st->cso_context, NULL);

+      return;

+   }

+

+   stgp = st_geometry_program(st->ctx->GeometryProgram._Current);

+   assert(stgp->Base.Base.Target == MESA_GEOMETRY_PROGRAM);

+

+   memset(&key, 0, sizeof(key));

+   key.st = st;

+

+   st->gp_variant = st_get_gp_variant(st, stgp, &key);

+

+   st_reference_geomprog(st, &st->gp, stgp);

+

+   cso_set_geometry_shader_handle(st->cso_context,

+                                  st->gp_variant->driver_shader);

+}

+

+const struct st_tracked_state st_update_gp = {

+   "st_update_gp",			/* name */

+   {					/* dirty */

+      0,				/* mesa */

+      ST_NEW_GEOMETRY_PROGRAM           /* st */

+   },

+   update_gp  				/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_shader.h b/mesalib/src/mesa/state_tracker/st_atom_shader.h
new file mode 100644
index 000000000..fbb3a4137
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_shader.h
@@ -0,0 +1,41 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_ATOM_SHADER_H

+#define ST_ATOM_SHADER_H

+

+

+struct st_context;

+struct translated_vertex_program;

+

+extern void

+st_free_translated_vertex_programs(struct st_context *st,

+                                   struct translated_vertex_program *xvp);

+

+

+#endif /* ST_ATOM_SHADER_H */

diff --git a/mesalib/src/mesa/state_tracker/st_atom_stipple.c b/mesalib/src/mesa/state_tracker/st_atom_stipple.c
new file mode 100644
index 000000000..5efea315c
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_stipple.c
@@ -0,0 +1,93 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+ /*

+  * \brief polygon stipple state

+  *

+  * Authors:

+  *   Brian Paul

+  */

+ 

+

+#include <assert.h>

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+

+

+/**

+ * OpenGL's polygon stipple is indexed with window coordinates in which

+ * the origin (0,0) is the lower-left corner of the window.

+ * With Gallium, the origin is the upper-left corner of the window.

+ * To convert GL's polygon stipple to what gallium expects we need to

+ * invert the pattern vertically and rotate the stipple rows according

+ * to the window height.

+ */

+static void

+invert_stipple(GLuint dest[32], const GLuint src[32], GLuint winHeight)

+{

+   GLuint i;

+

+   for (i = 0; i < 32; i++) {

+      dest[i] = src[(winHeight - 1 - i) & 0x1f];

+   }

+}

+

+

+

+static void 

+update_stipple( struct st_context *st )

+{

+   const GLuint sz = sizeof(st->state.poly_stipple);

+   assert(sz == sizeof(st->ctx->PolygonStipple));

+

+   if (memcmp(st->state.poly_stipple, st->ctx->PolygonStipple, sz)) {

+      /* state has changed */

+      struct pipe_poly_stipple newStipple;

+

+      memcpy(st->state.poly_stipple, st->ctx->PolygonStipple, sz);

+

+      invert_stipple(newStipple.stipple, st->ctx->PolygonStipple,

+                     st->ctx->DrawBuffer->Height);

+

+      st->pipe->set_polygon_stipple(st->pipe, &newStipple);

+   }

+}

+

+

+/** Update the stipple when the pattern or window height changes */

+const struct st_tracked_state st_update_polygon_stipple = {

+   "st_update_polygon_stipple",				/* name */

+   {							/* dirty */

+      (_NEW_POLYGONSTIPPLE |

+       _NEW_BUFFERS),					/* mesa */

+      0,						/* st */

+   },

+   update_stipple					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
new file mode 100644
index 000000000..37eae9401
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -0,0 +1,308 @@
+/**************************************************************************

+ * 

+ * 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/macros.h"

+#include "program/prog_instruction.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_texture.h"

+#include "st_format.h"

+#include "st_cb_texture.h"

+#include "pipe/p_context.h"

+#include "util/u_format.h"

+#include "util/u_inlines.h"

+#include "cso_cache/cso_context.h"

+

+/**

+ * Combine depth texture mode with "swizzle" so that depth mode swizzling

+ * takes place before texture swizzling, and return the resulting swizzle.

+ * If the format is not a depth format, return "swizzle" unchanged.

+ *

+ * \param format     PIPE_FORMAT_*.

+ * \param swizzle    Texture swizzle, a bitmask computed using MAKE_SWIZZLE4.

+ * \param depthmode  One of GL_LUMINANCE, GL_INTENSITY, GL_ALPHA, GL_RED.

+ */

+static GLuint apply_depthmode(enum pipe_format format,

+                              GLuint swizzle, GLenum depthmode)

+{

+   const struct util_format_description *desc =

+         util_format_description(format);

+   unsigned char swiz[4];

+   unsigned i;

+

+   if (desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS ||

+       desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_NONE) {

+      /* Not a depth format. */

+      return swizzle;

+   }

+

+   for (i = 0; i < 4; i++)

+      swiz[i] = GET_SWZ(swizzle, i);

+

+   switch (depthmode) {

+      case GL_LUMINANCE:

+         /* Rewrite reads from W to ONE, and reads from XYZ to XXX. */

+         for (i = 0; i < 4; i++)

+            if (swiz[i] == SWIZZLE_W)

+               swiz[i] = SWIZZLE_ONE;

+            else if (swiz[i] < SWIZZLE_W)

+               swiz[i] = SWIZZLE_X;

+         break;

+

+      case GL_INTENSITY:

+         /* Rewrite reads from XYZW to XXXX. */

+         for (i = 0; i < 4; i++)

+            if (swiz[i] <= SWIZZLE_W)

+               swiz[i] = SWIZZLE_X;

+         break;

+

+      case GL_ALPHA:

+         /* Rewrite reads from W to X, and reads from XYZ to 000. */

+         for (i = 0; i < 4; i++)

+            if (swiz[i] == SWIZZLE_W)

+               swiz[i] = SWIZZLE_X;

+            else if (swiz[i] < SWIZZLE_W)

+               swiz[i] = SWIZZLE_ZERO;

+         break;

+      case GL_RED:

+	 /* Rewrite reads W to 1, XYZ to X00 */

+	 for (i = 0; i < 4; i++)

+	    if (swiz[i] == SWIZZLE_W)

+	       swiz[i] = SWIZZLE_ONE;

+	    else if (swiz[i] == SWIZZLE_Y || swiz[i] == SWIZZLE_Z)

+	       swiz[i] = SWIZZLE_ZERO;

+	 break;

+   }

+

+   return MAKE_SWIZZLE4(swiz[0], swiz[1], swiz[2], swiz[3]);

+}

+

+/**

+ * Return TRUE if the swizzling described by "swizzle" and

+ * "depthmode" (for depth textures only) is different from the swizzling

+ * set in the given sampler view.

+ *

+ * \param sv         A sampler view.

+ * \param swizzle    Texture swizzle, a bitmask computed using MAKE_SWIZZLE4.

+ * \param depthmode  One of GL_LUMINANCE, GL_INTENSITY, GL_ALPHA.

+ */

+static boolean check_sampler_swizzle(struct pipe_sampler_view *sv,

+                                     GLuint swizzle, GLenum depthmode)

+{

+   swizzle = apply_depthmode(sv->texture->format, swizzle, depthmode);

+

+   if ((sv->swizzle_r != GET_SWZ(swizzle, 0)) ||

+       (sv->swizzle_g != GET_SWZ(swizzle, 1)) ||

+       (sv->swizzle_b != GET_SWZ(swizzle, 2)) ||

+       (sv->swizzle_a != GET_SWZ(swizzle, 3)))

+      return true;

+   return false;

+}

+

+static INLINE struct pipe_sampler_view *

+st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,

+					  struct st_texture_object *stObj,

+					  enum pipe_format format)

+					  

+{

+   struct pipe_sampler_view templ;

+   GLuint swizzle = apply_depthmode(stObj->pt->format,

+                                    stObj->base._Swizzle,

+                                    stObj->base.DepthMode);

+

+   u_sampler_view_default_template(&templ,

+                                   stObj->pt,

+                                   format);

+

+   if (swizzle != SWIZZLE_NOOP) {

+      templ.swizzle_r = GET_SWZ(swizzle, 0);

+      templ.swizzle_g = GET_SWZ(swizzle, 1);

+      templ.swizzle_b = GET_SWZ(swizzle, 2);

+      templ.swizzle_a = GET_SWZ(swizzle, 3);

+   }

+

+   return pipe->create_sampler_view(pipe, stObj->pt, &templ);

+}

+

+

+static INLINE struct pipe_sampler_view *

+st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,

+				       struct pipe_context *pipe,

+				       enum pipe_format format)

+

+{

+   if (!stObj || !stObj->pt) {

+      return NULL;

+   }

+

+   if (!stObj->sampler_view) {

+      stObj->sampler_view = st_create_texture_sampler_view_from_stobj(pipe, stObj, format);

+   }

+

+   return stObj->sampler_view;

+}

+

+static void 

+update_textures(struct st_context *st)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;

+   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;

+   const GLbitfield samplersUsed = (vprog->Base.SamplersUsed |

+                                    fprog->Base.SamplersUsed);

+   GLuint su;

+

+   st->state.num_textures = 0;

+

+   /* loop over sampler units (aka tex image units) */

+   for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {

+      struct pipe_sampler_view *sampler_view = NULL;

+      enum pipe_format st_view_format;

+      if (samplersUsed & (1 << su)) {

+         struct gl_texture_object *texObj;

+         struct st_texture_object *stObj;

+         GLboolean retval;

+         GLuint texUnit;

+

+         if (fprog->Base.SamplersUsed & (1 << su))

+            texUnit = fprog->Base.SamplerUnits[su];

+         else

+            texUnit = vprog->Base.SamplerUnits[su];

+

+         texObj = st->ctx->Texture.Unit[texUnit]._Current;

+

+         if (!texObj) {

+            texObj = st_get_default_texture(st);

+         }

+         stObj = st_texture_object(texObj);

+

+         retval = st_finalize_texture(st->ctx, st->pipe, texObj);

+         if (!retval) {

+            /* out of mem */

+            continue;

+         }

+

+	 st_view_format = stObj->pt->format;

+	 {

+	    struct st_texture_image *firstImage;

+	    enum pipe_format firstImageFormat;

+	    firstImage = st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);

+

+	    firstImageFormat = st_mesa_format_to_pipe_format(firstImage->base.TexFormat);

+	    if (firstImageFormat != stObj->pt->format)

+	       st_view_format = firstImageFormat;

+

+	 }

+         st->state.num_textures = su + 1;

+

+	 /* if sampler view has changed dereference it */

+	 if (stObj->sampler_view)

+            if (check_sampler_swizzle(stObj->sampler_view,

+                                      stObj->base._Swizzle,

+                                      stObj->base.DepthMode) ||

+                (st_view_format != stObj->sampler_view->format))

+	       pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+

+         sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe, st_view_format);

+      }

+      pipe_sampler_view_reference(&st->state.sampler_views[su], sampler_view);

+   }

+

+   cso_set_fragment_sampler_views(st->cso_context,

+                                  st->state.num_textures,

+                                  st->state.sampler_views);

+   if (st->ctx->Const.MaxVertexTextureImageUnits > 0) {

+      cso_set_vertex_sampler_views(st->cso_context,

+                                   MIN2(st->state.num_textures,

+                                        st->ctx->Const.MaxVertexTextureImageUnits),

+                                   st->state.sampler_views);

+   }

+}

+

+

+const struct st_tracked_state st_update_texture = {

+   "st_update_texture",					/* name */

+   {							/* dirty */

+      _NEW_TEXTURE,					/* mesa */

+      ST_NEW_FRAGMENT_PROGRAM,				/* st */

+   },

+   update_textures					/* update */

+};

+

+

+

+

+static void 

+finalize_textures(struct st_context *st)

+{

+   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;

+   const GLboolean prev_missing_textures = st->missing_textures;

+   GLuint su;

+

+   st->missing_textures = GL_FALSE;

+

+   for (su = 0; su < st->ctx->Const.MaxTextureCoordUnits; su++) {

+      if (fprog->Base.SamplersUsed & (1 << su)) {

+         const GLuint texUnit = fprog->Base.SamplerUnits[su];

+         struct gl_texture_object *texObj

+            = st->ctx->Texture.Unit[texUnit]._Current;

+

+         if (texObj) {

+            GLboolean retval;

+

+            retval = st_finalize_texture(st->ctx, st->pipe, texObj);

+            if (!retval) {

+               /* out of mem */

+               st->missing_textures = GL_TRUE;

+               continue;

+            }

+         }

+      }

+   }

+

+   if (prev_missing_textures != st->missing_textures)

+      st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;

+}

+

+

+

+const struct st_tracked_state st_finalize_textures = {

+   "st_finalize_textures",		/* name */

+   {					/* dirty */

+      _NEW_TEXTURE,			/* mesa */

+      0,				/* st */

+   },

+   finalize_textures			/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_viewport.c b/mesalib/src/mesa/state_tracker/st_atom_viewport.c
new file mode 100644
index 000000000..0cde4d0ec
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_atom_viewport.c
@@ -0,0 +1,90 @@
+/**************************************************************************

+ * 

+ * 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/context.h"

+#include "st_context.h"

+#include "st_atom.h"

+#include "pipe/p_context.h"

+#include "cso_cache/cso_context.h"

+

+/**

+ * Update the viewport transformation matrix.  Depends on:

+ *  - viewport pos/size

+ *  - depthrange

+ *  - window pos/size or FBO size

+ */

+static void

+update_viewport( struct st_context *st )

+{

+   struct gl_context *ctx = st->ctx;

+   GLfloat yScale, yBias;

+

+   /* _NEW_BUFFERS

+    */

+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) {

+      yScale = -1;

+      yBias = (GLfloat)ctx->DrawBuffer->Height;

+   }

+   else {

+      yScale = 1.0;

+      yBias = 0.0;

+   }

+

+   /* _NEW_VIEWPORT 

+    */

+   {

+      GLfloat x = (GLfloat)ctx->Viewport.X;

+      GLfloat y = (GLfloat)ctx->Viewport.Y;

+      GLfloat z = ctx->Viewport.Near;

+      GLfloat half_width = (GLfloat)ctx->Viewport.Width * 0.5f;

+      GLfloat half_height = (GLfloat)ctx->Viewport.Height * 0.5f;

+      GLfloat half_depth = (GLfloat)(ctx->Viewport.Far - ctx->Viewport.Near) * 0.5f;

+      

+      st->state.viewport.scale[0] = half_width;

+      st->state.viewport.scale[1] = half_height * yScale;

+      st->state.viewport.scale[2] = half_depth;

+      st->state.viewport.scale[3] = 1.0;

+

+      st->state.viewport.translate[0] = half_width + x;

+      st->state.viewport.translate[1] = (half_height + y) * yScale + yBias;

+      st->state.viewport.translate[2] = half_depth + z;

+      st->state.viewport.translate[3] = 0.0;

+

+      cso_set_viewport(st->cso_context, &st->state.viewport);

+   }

+}

+

+

+const struct st_tracked_state st_update_viewport = {

+   "st_update_viewport",				/* name */

+   {							/* dirty */

+      _NEW_BUFFERS | _NEW_VIEWPORT,			/* mesa */

+      0,						/* st */

+   },

+   update_viewport					/* update */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_cache.h b/mesalib/src/mesa/state_tracker/st_cache.h
new file mode 100644
index 000000000..52c1b378d
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cache.h
@@ -0,0 +1,69 @@
+/**************************************************************************

+ *

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

+  *   Zack Rusin <zack@tungstengraphics.com>

+  */

+

+#ifndef ST_CACHE_H

+#define ST_CACHE_H

+

+struct pipe_blend_state;

+struct pipe_depth_stencil_alpha_state;

+struct pipe_rasterizer_state;

+struct pipe_sampler_state;

+struct pipe_shader_state;

+struct st_context;

+

+

+const struct cso_blend *

+st_cached_blend_state(struct st_context *st,

+                      const struct pipe_blend_state *blend);

+

+const struct cso_sampler *

+st_cached_sampler_state(struct st_context *st,

+                        const struct pipe_sampler_state *sampler);

+

+const struct cso_depth_stencil_alpha *

+st_cached_depth_stencil_alpha_state(struct st_context *st,

+                              const struct pipe_depth_stencil_alpha_state *depth_stencil);

+

+const struct cso_rasterizer *

+st_cached_rasterizer_state(struct st_context *st,

+                           const struct pipe_rasterizer_state *raster);

+

+const struct cso_fragment_shader *

+st_cached_fs_state(struct st_context *st,

+                   const struct pipe_shader_state *templ);

+

+

+const struct cso_vertex_shader *

+st_cached_vs_state(struct st_context *st,

+                   const struct pipe_shader_state *templ);

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_cb_accum.c b/mesalib/src/mesa/state_tracker/st_cb_accum.c
new file mode 100644
index 000000000..743c9b525
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_accum.c
@@ -0,0 +1,339 @@
+/**************************************************************************

+ * 

+ * 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 "st_debug.h"

+#include "st_context.h"

+#include "st_cb_accum.h"

+#include "st_cb_fbo.h"

+#include "st_texture.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "util/u_tile.h"

+

+

+#if FEATURE_accum

+

+/**

+ * For hardware that supports deep color buffers, we could accelerate

+ * most/all the accum operations with blending/texturing.

+ * For now, just use the get/put_tile() functions and do things in software.

+ */

+

+

+void

+st_clear_accum_buffer(struct gl_context *ctx, struct gl_renderbuffer *rb)

+{

+   struct st_renderbuffer *acc_strb = st_renderbuffer(rb);

+   const GLint xpos = ctx->DrawBuffer->_Xmin;

+   const GLint ypos = ctx->DrawBuffer->_Ymin;

+   const GLint width = ctx->DrawBuffer->_Xmax - xpos;

+   const GLint height = ctx->DrawBuffer->_Ymax - ypos;

+   size_t stride = acc_strb->stride;

+   GLubyte *data = acc_strb->data;

+

+   if(!data)

+      return;

+   

+   switch (acc_strb->format) {

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      {

+         GLshort r = FLOAT_TO_SHORT(ctx->Accum.ClearColor[0]);

+         GLshort g = FLOAT_TO_SHORT(ctx->Accum.ClearColor[1]);

+         GLshort b = FLOAT_TO_SHORT(ctx->Accum.ClearColor[2]);

+         GLshort a = FLOAT_TO_SHORT(ctx->Accum.ClearColor[3]);

+         int i, j;

+         for (i = 0; i < height; i++) {

+            GLshort *dst = (GLshort *) (data + (ypos + i) * stride + xpos * 8);

+            for (j = 0; j < width; j++) {

+               dst[0] = r;

+               dst[1] = g;

+               dst[2] = b;

+               dst[3] = a;

+               dst += 4;

+            }

+         }

+      }

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected format in st_clear_accum_buffer()");

+   }

+}

+

+

+/** For ADD/MULT */

+static void

+accum_mad(struct gl_context *ctx, GLfloat scale, GLfloat bias,

+          GLint xpos, GLint ypos, GLint width, GLint height,

+          struct st_renderbuffer *acc_strb)

+{

+   size_t stride = acc_strb->stride;

+   GLubyte *data = acc_strb->data;

+

+   switch (acc_strb->format) {

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      {

+         int i, j;

+         for (i = 0; i < height; i++) {

+            GLshort *acc = (GLshort *) (data + (ypos + i) * stride + xpos * 8);

+            for (j = 0; j < width * 4; j++) {

+               float val = SHORT_TO_FLOAT(*acc) * scale + bias;

+               *acc++ = FLOAT_TO_SHORT(val);

+            }

+         }

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "unexpected format in st_clear_accum_buffer()");

+   }

+}

+

+

+static void

+accum_accum(struct st_context *st, GLfloat value,

+            GLint xpos, GLint ypos, GLint width, GLint height,

+            struct st_renderbuffer *acc_strb,

+            struct st_renderbuffer *color_strb)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_transfer *color_trans;

+   size_t stride = acc_strb->stride;

+   GLubyte *data = acc_strb->data;

+   GLfloat *buf;

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   color_trans = pipe_get_transfer(st->pipe,

+                                   color_strb->texture,

+                                   0, 0,

+                                   PIPE_TRANSFER_READ, xpos, ypos,

+                                   width, height);

+

+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));

+

+   pipe_get_tile_rgba(pipe, color_trans, 0, 0, width, height, buf);

+

+   switch (acc_strb->format) {

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      {

+         const GLfloat *color = buf;

+         int i, j;

+         for (i = 0; i < height; i++) {

+            GLshort *acc = (GLshort *) (data + (ypos + i) * stride + xpos * 8);

+            for (j = 0; j < width * 4; j++) {

+               float val = *color++ * value;

+               *acc++ += FLOAT_TO_SHORT(val);

+            }

+         }

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "unexpected format in st_clear_accum_buffer()");

+   }

+

+   free(buf);

+   pipe->transfer_destroy(pipe, color_trans);

+}

+

+

+static void

+accum_load(struct st_context *st, GLfloat value,

+           GLint xpos, GLint ypos, GLint width, GLint height,

+           struct st_renderbuffer *acc_strb,

+           struct st_renderbuffer *color_strb)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_transfer *color_trans;

+   size_t stride = acc_strb->stride;

+   GLubyte *data = acc_strb->data;

+   GLfloat *buf;

+

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   color_trans = pipe_get_transfer(st->pipe, color_strb->texture,

+                                   0, 0,

+                                   PIPE_TRANSFER_READ, xpos, ypos,

+                                   width, height);

+

+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));

+

+   pipe_get_tile_rgba(pipe, color_trans, 0, 0, width, height, buf);

+

+   switch (acc_strb->format) {

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      {

+         const GLfloat *color = buf;

+         int i, j;

+         for (i = 0; i < height; i++) {

+            GLshort *acc = (GLshort *) (data + (ypos + i) * stride + xpos * 8);

+            for (j = 0; j < width * 4; j++) {

+               float val = *color++ * value;

+               *acc++ = FLOAT_TO_SHORT(val);

+            }

+         }

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "unexpected format in st_clear_accum_buffer()");

+   }

+

+   free(buf);

+   pipe->transfer_destroy(pipe, color_trans);

+}

+

+

+static void

+accum_return(struct gl_context *ctx, GLfloat value,

+             GLint xpos, GLint ypos, GLint width, GLint height,

+             struct st_renderbuffer *acc_strb,

+             struct st_renderbuffer *color_strb)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   const GLubyte *colormask = ctx->Color.ColorMask[0];

+   enum pipe_transfer_usage usage;

+   struct pipe_transfer *color_trans;

+   size_t stride = acc_strb->stride;

+   const GLubyte *data = acc_strb->data;

+   GLfloat *buf;

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));

+

+   if (!colormask[0] || !colormask[1] || !colormask[2] || !colormask[3])

+      usage = PIPE_TRANSFER_READ_WRITE;

+   else

+      usage = PIPE_TRANSFER_WRITE;

+

+   color_trans = pipe_get_transfer(st_context(ctx)->pipe,

+                                   color_strb->texture, 0, 0,

+                                   usage,

+                                   xpos, ypos,

+                                   width, height);

+

+   if (usage & PIPE_TRANSFER_READ)

+      pipe_get_tile_rgba(pipe, color_trans, 0, 0, width, height, buf);

+

+   switch (acc_strb->format) {

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      {

+         GLfloat *color = buf;

+         int i, j, ch;

+         for (i = 0; i < height; i++) {

+            const GLshort *acc = (const GLshort *) (data + (ypos + i) * stride + xpos * 8);

+            for (j = 0; j < width; j++) {

+               for (ch = 0; ch < 4; ch++) {

+                  if (colormask[ch]) {

+                     GLfloat val = SHORT_TO_FLOAT(*acc * value);

+                     *color = CLAMP(val, 0.0f, 1.0f);

+                  }

+                  else {

+                     /* No change */

+                  }

+                  ++acc;

+                  ++color;

+               }

+            }

+         }

+      }

+      break;

+   default:

+      _mesa_problem(NULL, "unexpected format in st_clear_accum_buffer()");

+   }

+

+   pipe_put_tile_rgba(pipe, color_trans, 0, 0, width, height, buf);

+

+   free(buf);

+   pipe->transfer_destroy(pipe, color_trans);

+}

+

+

+static void

+st_Accum(struct gl_context *ctx, GLenum op, GLfloat value)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_renderbuffer *acc_strb

+     = st_renderbuffer(ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);

+   struct st_renderbuffer *color_strb

+      = st_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer);

+

+   const GLint xpos = ctx->DrawBuffer->_Xmin;

+   const GLint ypos = ctx->DrawBuffer->_Ymin;

+   const GLint width = ctx->DrawBuffer->_Xmax - xpos;

+   const GLint height = ctx->DrawBuffer->_Ymax - ypos;

+

+   if(!acc_strb->data)

+      return;

+   

+   switch (op) {

+   case GL_ADD:

+      if (value != 0.0F) {

+         accum_mad(ctx, 1.0, value, xpos, ypos, width, height, acc_strb);

+      }

+      break;

+   case GL_MULT:

+      if (value != 1.0F) {

+         accum_mad(ctx, value, 0.0, xpos, ypos, width, height, acc_strb);

+      }

+      break;

+   case GL_ACCUM:

+      if (value != 0.0F) {

+         accum_accum(st, value, xpos, ypos, width, height, acc_strb, color_strb);

+      }

+      break;

+   case GL_LOAD:

+      accum_load(st, value, xpos, ypos, width, height, acc_strb, color_strb);

+      break;

+   case GL_RETURN:

+      accum_return(ctx, value, xpos, ypos, width, height, acc_strb, color_strb);

+      break;

+   default:

+      assert(0);

+   }

+}

+

+

+

+void st_init_accum_functions(struct dd_function_table *functions)

+{

+   functions->Accum = st_Accum;

+}

+

+#endif /* FEATURE_accum */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_accum.h b/mesalib/src/mesa/state_tracker/st_cb_accum.h
new file mode 100644
index 000000000..90feddd6f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_accum.h
@@ -0,0 +1,63 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_ACCUM_H

+#define ST_CB_ACCUM_H

+

+

+#include "main/mfeatures.h"

+

+struct dd_function_table;

+struct gl_context;

+struct gl_renderbuffer;

+

+#if FEATURE_accum

+

+extern void

+st_clear_accum_buffer(struct gl_context *ctx, struct gl_renderbuffer *rb);

+

+extern void st_init_accum_functions(struct dd_function_table *functions);

+

+#else

+

+#include "main/compiler.h"

+

+static INLINE void

+st_clear_accum_buffer(struct gl_context *ctx, struct gl_renderbuffer *rb)

+{

+   ASSERT_NO_FEATURE();

+}

+

+static INLINE void

+st_init_accum_functions(struct dd_function_table *functions)

+{

+}

+

+#endif /* FEATURE_accum */

+

+#endif /* ST_CB_ACCUM_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
new file mode 100644
index 000000000..6a3c06d54
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
@@ -0,0 +1,889 @@
+/**************************************************************************

+ * 

+ * 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 "program/program.h"

+#include "program/prog_print.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_atom_constbuf.h"

+#include "st_program.h"

+#include "st_cb_bitmap.h"

+#include "st_texture.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_shader_tokens.h"

+#include "util/u_inlines.h"

+#include "util/u_draw_quad.h"

+#include "util/u_simple_shaders.h"

+#include "program/prog_instruction.h"

+#include "cso_cache/cso_context.h"

+

+

+#if FEATURE_drawpix

+

+/**

+ * glBitmaps are drawn as textured quads.  The user's bitmap pattern

+ * is stored in a texture image.  An alpha8 texture format is used.

+ * The fragment shader samples a bit (texel) from the texture, then

+ * discards the fragment if the bit is off.

+ *

+ * Note that we actually store the inverse image of the bitmap to

+ * simplify the fragment program.  An "on" bit gets stored as texel=0x0

+ * and an "off" bit is stored as texel=0xff.  Then we kill the

+ * fragment if the negated texel value is less than zero.

+ */

+

+

+/**

+ * The bitmap cache attempts to accumulate multiple glBitmap calls in a

+ * buffer which is then rendered en mass upon a flush, state change, etc.

+ * A wide, short buffer is used to target the common case of a series

+ * of glBitmap calls being used to draw text.

+ */

+static GLboolean UseBitmapCache = GL_TRUE;

+

+

+#define BITMAP_CACHE_WIDTH  512

+#define BITMAP_CACHE_HEIGHT 32

+

+struct bitmap_cache

+{

+   /** Window pos to render the cached image */

+   GLint xpos, ypos;

+   /** Bounds of region used in window coords */

+   GLint xmin, ymin, xmax, ymax;

+

+   GLfloat color[4];

+

+   /** Bitmap's Z position */

+   GLfloat zpos;

+

+   struct pipe_resource *texture;

+   struct pipe_transfer *trans;

+

+   GLboolean empty;

+

+   /** An I8 texture image: */

+   ubyte *buffer;

+};

+

+

+/** Epsilon for Z comparisons */

+#define Z_EPSILON 1e-06

+

+

+/**

+ * Make fragment program for glBitmap:

+ *   Sample the texture and kill the fragment if the bit is 0.

+ * This program will be combined with the user's fragment program.

+ */

+static struct st_fragment_program *

+make_bitmap_fragment_program(struct gl_context *ctx, GLuint samplerIndex)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_fragment_program *stfp;

+   struct gl_program *p;

+   GLuint ic = 0;

+

+   p = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);

+   if (!p)

+      return NULL;

+

+   p->NumInstructions = 3;

+

+   p->Instructions = _mesa_alloc_instructions(p->NumInstructions);

+   if (!p->Instructions) {

+      ctx->Driver.DeleteProgram(ctx, p);

+      return NULL;

+   }

+   _mesa_init_instructions(p->Instructions, p->NumInstructions);

+

+   /* TEX tmp0, fragment.texcoord[0], texture[0], 2D; */

+   p->Instructions[ic].Opcode = OPCODE_TEX;

+   p->Instructions[ic].DstReg.File = PROGRAM_TEMPORARY;

+   p->Instructions[ic].DstReg.Index = 0;

+   p->Instructions[ic].SrcReg[0].File = PROGRAM_INPUT;

+   p->Instructions[ic].SrcReg[0].Index = FRAG_ATTRIB_TEX0;

+   p->Instructions[ic].TexSrcUnit = samplerIndex;

+   p->Instructions[ic].TexSrcTarget = TEXTURE_2D_INDEX;

+   ic++;

+

+   /* KIL if -tmp0 < 0 # texel=0 -> keep / texel=0 -> discard */

+   p->Instructions[ic].Opcode = OPCODE_KIL;

+   p->Instructions[ic].SrcReg[0].File = PROGRAM_TEMPORARY;

+

+   if (st->bitmap.tex_format == PIPE_FORMAT_L8_UNORM)

+      p->Instructions[ic].SrcReg[0].Swizzle = SWIZZLE_XXXX;

+

+   p->Instructions[ic].SrcReg[0].Index = 0;

+   p->Instructions[ic].SrcReg[0].Negate = NEGATE_XYZW;

+   ic++;

+

+   /* END; */

+   p->Instructions[ic++].Opcode = OPCODE_END;

+

+   assert(ic == p->NumInstructions);

+

+   p->InputsRead = FRAG_BIT_TEX0;

+   p->OutputsWritten = 0x0;

+   p->SamplersUsed = (1 << samplerIndex);

+

+   stfp = (struct st_fragment_program *) p;

+   stfp->Base.UsesKill = GL_TRUE;

+

+   return stfp;

+}

+

+

+static int

+find_free_bit(uint bitfield)

+{

+   int i;

+   for (i = 0; i < 32; i++) {

+      if ((bitfield & (1 << i)) == 0) {

+         return i;

+      }

+   }

+   return -1;

+}

+

+

+/**

+ * Combine basic bitmap fragment program with the user-defined program.

+ * \param st  current context

+ * \param fpIn  the incoming fragment program

+ * \param fpOut  the new fragment program which does fragment culling

+ * \param bitmap_sampler  sampler number for the bitmap texture

+ */

+void

+st_make_bitmap_fragment_program(struct st_context *st,

+                                struct gl_fragment_program *fpIn,

+                                struct gl_fragment_program **fpOut,

+                                GLuint *bitmap_sampler)

+{

+   struct st_fragment_program *bitmap_prog;

+   struct gl_program *newProg;

+   uint sampler;

+

+   /*

+    * Generate new program which is the user-defined program prefixed

+    * with the bitmap sampler/kill instructions.

+    */

+   sampler = find_free_bit(fpIn->Base.SamplersUsed);

+   bitmap_prog = make_bitmap_fragment_program(st->ctx, sampler);

+

+   newProg = _mesa_combine_programs(st->ctx,

+                                    &bitmap_prog->Base.Base,

+                                    &fpIn->Base);

+   /* done with this after combining */

+   st_reference_fragprog(st, &bitmap_prog, NULL);

+

+#if 0

+   {

+      printf("Combined bitmap 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

+

+   /* return results */

+   *fpOut = (struct gl_fragment_program *) newProg;

+   *bitmap_sampler = sampler;

+}

+

+

+/**

+ * Copy user-provide bitmap bits into texture buffer, expanding

+ * bits into texels.

+ * "On" bits will set texels to 0x0.

+ * "Off" bits will not modify texels.

+ * Note that the image is actually going to be upside down in

+ * the texture.  We deal with that with texcoords.

+ */

+static void

+unpack_bitmap(struct st_context *st,

+              GLint px, GLint py, GLsizei width, GLsizei height,

+              const struct gl_pixelstore_attrib *unpack,

+              const GLubyte *bitmap,

+              ubyte *destBuffer, uint destStride)

+{

+   destBuffer += py * destStride + px;

+

+   _mesa_expand_bitmap(width, height, unpack, bitmap,

+                       destBuffer, destStride, 0x0);

+}

+

+

+/**

+ * Create a texture which represents a bitmap image.

+ */

+static struct pipe_resource *

+make_bitmap_texture(struct gl_context *ctx, GLsizei width, GLsizei height,

+                    const struct gl_pixelstore_attrib *unpack,

+                    const GLubyte *bitmap)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_transfer *transfer;

+   ubyte *dest;

+   struct pipe_resource *pt;

+

+   /* PBO source... */

+   bitmap = _mesa_map_pbo_source(ctx, unpack, bitmap);

+   if (!bitmap) {

+      return NULL;

+   }

+

+   /**

+    * Create texture to hold bitmap pattern.

+    */

+   pt = st_texture_create(st, st->internal_target, st->bitmap.tex_format,

+                          0, width, height, 1,

+                          PIPE_BIND_SAMPLER_VIEW);

+   if (!pt) {

+      _mesa_unmap_pbo_source(ctx, unpack);

+      return NULL;

+   }

+

+   transfer = pipe_get_transfer(st->pipe, pt, 0, 0,

+                                PIPE_TRANSFER_WRITE,

+                                0, 0, width, height);

+

+   dest = pipe_transfer_map(pipe, transfer);

+

+   /* Put image into texture transfer */

+   memset(dest, 0xff, height * transfer->stride);

+   unpack_bitmap(st, 0, 0, width, height, unpack, bitmap,

+                 dest, transfer->stride);

+

+   _mesa_unmap_pbo_source(ctx, unpack);

+

+   /* Release transfer */

+   pipe_transfer_unmap(pipe, transfer);

+   pipe->transfer_destroy(pipe, transfer);

+

+   return pt;

+}

+

+static GLuint

+setup_bitmap_vertex_data(struct st_context *st, bool normalized,

+                         int x, int y, int width, int height,

+                         float z, const float color[4])

+{

+   struct pipe_context *pipe = st->pipe;

+   const struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+   const GLfloat fb_width = (GLfloat)fb->Width;

+   const GLfloat fb_height = (GLfloat)fb->Height;

+   const GLfloat x0 = (GLfloat)x;

+   const GLfloat x1 = (GLfloat)(x + width);

+   const GLfloat y0 = (GLfloat)y;

+   const GLfloat y1 = (GLfloat)(y + height);

+   GLfloat sLeft = (GLfloat)0.0, sRight = (GLfloat)1.0;

+   GLfloat tTop = (GLfloat)0.0, tBot = (GLfloat)1.0 - tTop;

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

+   const GLuint max_slots = 1; /* 4096 / sizeof(st->bitmap.vertices); */

+   GLuint i;

+

+   if(!normalized)

+   {

+      sRight = width;

+      tBot = height;

+   }

+

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

+    */

+   if (st->bitmap.vbuf_slot >= max_slots) {

+      pipe_resource_reference(&st->bitmap.vbuf, NULL);

+      st->bitmap.vbuf_slot = 0;

+   }

+

+   if (!st->bitmap.vbuf) {

+      st->bitmap.vbuf = pipe_buffer_create(pipe->screen, 

+                                           PIPE_BIND_VERTEX_BUFFER,

+                                           max_slots *

+                                           sizeof(st->bitmap.vertices));

+   }

+

+   /* Positions are in clip coords since we need to do clipping in case

+    * the bitmap quad goes beyond the window bounds.

+    */

+   st->bitmap.vertices[0][0][0] = clip_x0;

+   st->bitmap.vertices[0][0][1] = clip_y0;

+   st->bitmap.vertices[0][2][0] = sLeft;

+   st->bitmap.vertices[0][2][1] = tTop;

+

+   st->bitmap.vertices[1][0][0] = clip_x1;

+   st->bitmap.vertices[1][0][1] = clip_y0;

+   st->bitmap.vertices[1][2][0] = sRight;

+   st->bitmap.vertices[1][2][1] = tTop;

+   

+   st->bitmap.vertices[2][0][0] = clip_x1;

+   st->bitmap.vertices[2][0][1] = clip_y1;

+   st->bitmap.vertices[2][2][0] = sRight;

+   st->bitmap.vertices[2][2][1] = tBot;

+   

+   st->bitmap.vertices[3][0][0] = clip_x0;

+   st->bitmap.vertices[3][0][1] = clip_y1;

+   st->bitmap.vertices[3][2][0] = sLeft;

+   st->bitmap.vertices[3][2][1] = tBot;

+   

+   /* same for all verts: */

+   for (i = 0; i < 4; i++) {

+      st->bitmap.vertices[i][0][2] = z;

+      st->bitmap.vertices[i][0][3] = 1.0;

+      st->bitmap.vertices[i][1][0] = color[0];

+      st->bitmap.vertices[i][1][1] = color[1];

+      st->bitmap.vertices[i][1][2] = color[2];

+      st->bitmap.vertices[i][1][3] = color[3];

+      st->bitmap.vertices[i][2][2] = 0.0; /*R*/

+      st->bitmap.vertices[i][2][3] = 1.0; /*Q*/

+   }

+

+   /* put vertex data into vbuf */

+   pipe_buffer_write_nooverlap(st->pipe,

+                               st->bitmap.vbuf,

+                               st->bitmap.vbuf_slot

+                               * sizeof(st->bitmap.vertices),

+                               sizeof st->bitmap.vertices,

+                               st->bitmap.vertices);

+

+   return st->bitmap.vbuf_slot++ * sizeof st->bitmap.vertices;

+}

+

+

+

+/**

+ * Render a glBitmap by drawing a textured quad

+ */

+static void

+draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,

+                 GLsizei width, GLsizei height,

+                 struct pipe_sampler_view *sv,

+                 const GLfloat *color)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct cso_context *cso = st->cso_context;

+   struct st_fp_variant *fpv;

+   struct st_fp_variant_key key;

+   GLuint maxSize;

+   GLuint offset;

+

+   memset(&key, 0, sizeof(key));

+   key.st = st;

+   key.bitmap = GL_TRUE;

+

+   fpv = st_get_fp_variant(st, st->fp, &key);

+

+   /* As an optimization, Mesa's fragment programs will sometimes get the

+    * primary color from a statevar/constant rather than a varying variable.

+    * when that's the case, we need to ensure that we use the 'color'

+    * parameter and not the current attribute color (which may have changed

+    * through glRasterPos and state validation.

+    * So, we force the proper color here.  Not elegant, but it works.

+    */

+   {

+      GLfloat colorSave[4];

+      COPY_4V(colorSave, ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);

+      COPY_4V(ctx->Current.Attrib[VERT_ATTRIB_COLOR0], color);

+      st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT);

+      COPY_4V(ctx->Current.Attrib[VERT_ATTRIB_COLOR0], colorSave);

+   }

+

+

+   /* limit checks */

+   /* XXX if the bitmap is larger than the 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 <= (GLsizei)maxSize);

+   assert(height <= (GLsizei)maxSize);

+

+   cso_save_rasterizer(cso);

+   cso_save_samplers(cso);

+   cso_save_fragment_sampler_views(cso);

+   cso_save_viewport(cso);

+   cso_save_fragment_shader(cso);

+   cso_save_vertex_shader(cso);

+   cso_save_vertex_elements(cso);

+

+   /* rasterizer state: just scissor */

+   st->bitmap.rasterizer.scissor = ctx->Scissor.Enabled;

+   cso_set_rasterizer(cso, &st->bitmap.rasterizer);

+

+   /* fragment shader state: TEX lookup program */

+   cso_set_fragment_shader_handle(cso, fpv->driver_shader);

+

+   /* vertex shader state: position + texcoord pass-through */

+   cso_set_vertex_shader_handle(cso, st->bitmap.vs);

+

+   /* user samplers, plus our bitmap sampler */

+   {

+      struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];

+      uint num = MAX2(fpv->bitmap_sampler + 1, st->state.num_samplers);

+      uint i;

+      for (i = 0; i < st->state.num_samplers; i++) {

+         samplers[i] = &st->state.samplers[i];

+      }

+      samplers[fpv->bitmap_sampler] =

+         &st->bitmap.samplers[sv->texture->target != PIPE_TEXTURE_RECT];

+      cso_set_samplers(cso, num, (const struct pipe_sampler_state **) samplers);

+   }

+

+   /* user textures, plus the bitmap texture */

+   {

+      struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];

+      uint num = MAX2(fpv->bitmap_sampler + 1, st->state.num_textures);

+      memcpy(sampler_views, st->state.sampler_views, sizeof(sampler_views));

+      sampler_views[fpv->bitmap_sampler] = sv;

+      cso_set_fragment_sampler_views(cso, num, sampler_views);

+   }

+

+   /* 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] = 0.5f;

+      vp.scale[3] = 1.0f;

+      vp.translate[0] = 0.5f * width;

+      vp.translate[1] = 0.5f * height;

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

+

+   /* convert Z from [0,1] to [-1,-1] to match viewport Z scale/bias */

+   z = z * 2.0 - 1.0;

+

+   /* draw textured quad */

+   offset = setup_bitmap_vertex_data(st,

+                                     sv->texture->target != PIPE_TEXTURE_RECT,

+                                     x, y, width, height, z, color);

+

+   util_draw_vertex_buffer(pipe, st->bitmap.vbuf, offset,

+                           PIPE_PRIM_TRIANGLE_FAN,

+                           4,  /* verts */

+                           3); /* attribs/vert */

+

+

+   /* restore state */

+   cso_restore_rasterizer(cso);

+   cso_restore_samplers(cso);

+   cso_restore_fragment_sampler_views(cso);

+   cso_restore_viewport(cso);

+   cso_restore_fragment_shader(cso);

+   cso_restore_vertex_shader(cso);

+   cso_restore_vertex_elements(cso);

+}

+

+

+static void

+reset_cache(struct st_context *st)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct bitmap_cache *cache = st->bitmap.cache;

+

+   /*memset(cache->buffer, 0xff, sizeof(cache->buffer));*/

+   cache->empty = GL_TRUE;

+

+   cache->xmin = 1000000;

+   cache->xmax = -1000000;

+   cache->ymin = 1000000;

+   cache->ymax = -1000000;

+

+   if (cache->trans) {

+      pipe->transfer_destroy(pipe, cache->trans);

+      cache->trans = NULL;

+   }

+

+   assert(!cache->texture);

+

+   /* allocate a new texture */

+   cache->texture = st_texture_create(st, PIPE_TEXTURE_2D,

+                                      st->bitmap.tex_format, 0,

+                                      BITMAP_CACHE_WIDTH, BITMAP_CACHE_HEIGHT,

+                                      1,

+				      PIPE_BIND_SAMPLER_VIEW);

+}

+

+

+/** Print bitmap image to stdout (debug) */

+static void

+print_cache(const struct bitmap_cache *cache)

+{

+   int i, j, k;

+

+   for (i = 0; i < BITMAP_CACHE_HEIGHT; i++) {

+      k = BITMAP_CACHE_WIDTH * (BITMAP_CACHE_HEIGHT - i - 1);

+      for (j = 0; j < BITMAP_CACHE_WIDTH; j++) {

+         if (cache->buffer[k])

+            printf("X");

+         else

+            printf(" ");

+         k++;

+      }

+      printf("\n");

+   }

+}

+

+

+/**

+ * Create gallium pipe_transfer object for the bitmap cache.

+ */

+static void

+create_cache_trans(struct st_context *st)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct bitmap_cache *cache = st->bitmap.cache;

+

+   if (cache->trans)

+      return;

+

+   /* Map the texture transfer.

+    * Subsequent glBitmap calls will write into the texture image.

+    */

+   cache->trans = pipe_get_transfer(st->pipe, cache->texture, 0, 0,

+                                    PIPE_TRANSFER_WRITE, 0, 0,

+                                    BITMAP_CACHE_WIDTH,

+                                    BITMAP_CACHE_HEIGHT);

+   cache->buffer = pipe_transfer_map(pipe, cache->trans);

+

+   /* init image to all 0xff */

+   memset(cache->buffer, 0xff, cache->trans->stride * BITMAP_CACHE_HEIGHT);

+}

+

+

+/**

+ * If there's anything in the bitmap cache, draw/flush it now.

+ */

+void

+st_flush_bitmap_cache(struct st_context *st)

+{

+   if (!st->bitmap.cache->empty) {

+      struct bitmap_cache *cache = st->bitmap.cache;

+

+      if (st->ctx->DrawBuffer) {

+         struct pipe_context *pipe = st->pipe;

+         struct pipe_sampler_view *sv;

+

+         assert(cache->xmin <= cache->xmax);

+ 

+/*         printf("flush size %d x %d  at %d, %d\n",

+                cache->xmax - cache->xmin,

+                cache->ymax - cache->ymin,

+                cache->xpos, cache->ypos);

+*/

+

+         /* The texture transfer has been mapped until now.

+          * So unmap and release the texture transfer before drawing.

+          */

+         if (cache->trans) {

+            if (0)

+               print_cache(cache);

+            pipe_transfer_unmap(pipe, cache->trans);

+            cache->buffer = NULL;

+

+            pipe->transfer_destroy(pipe, cache->trans);

+            cache->trans = NULL;

+         }

+

+         sv = st_create_texture_sampler_view(st->pipe, cache->texture);

+         if (sv) {

+            draw_bitmap_quad(st->ctx,

+                             cache->xpos,

+                             cache->ypos,

+                             cache->zpos,

+                             BITMAP_CACHE_WIDTH, BITMAP_CACHE_HEIGHT,

+                             sv,

+                             cache->color);

+

+            pipe_sampler_view_reference(&sv, NULL);

+         }

+      }

+

+      /* release/free the texture */

+      pipe_resource_reference(&cache->texture, NULL);

+

+      reset_cache(st);

+   }

+}

+

+

+/**

+ * Flush bitmap cache and release vertex buffer.

+ */

+void

+st_flush_bitmap( struct st_context *st )

+{

+   st_flush_bitmap_cache(st);

+

+   /* Release vertex buffer to avoid synchronous rendering if we were

+    * to map it in the next frame.

+    */

+   pipe_resource_reference(&st->bitmap.vbuf, NULL);

+   st->bitmap.vbuf_slot = 0;

+}

+

+

+/**

+ * Try to accumulate this glBitmap call in the bitmap cache.

+ * \return  GL_TRUE for success, GL_FALSE if bitmap is too large, etc.

+ */

+static GLboolean

+accum_bitmap(struct st_context *st,

+             GLint x, GLint y, GLsizei width, GLsizei height,

+             const struct gl_pixelstore_attrib *unpack,

+             const GLubyte *bitmap )

+{

+   struct bitmap_cache *cache = st->bitmap.cache;

+   int px = -999, py = -999;

+   const GLfloat z = st->ctx->Current.RasterPos[2];

+

+   if (width > BITMAP_CACHE_WIDTH ||

+       height > BITMAP_CACHE_HEIGHT)

+      return GL_FALSE; /* too big to cache */

+

+   if (!cache->empty) {

+      px = x - cache->xpos;  /* pos in buffer */

+      py = y - cache->ypos;

+      if (px < 0 || px + width > BITMAP_CACHE_WIDTH ||

+          py < 0 || py + height > BITMAP_CACHE_HEIGHT ||

+          !TEST_EQ_4V(st->ctx->Current.RasterColor, cache->color) ||

+          ((fabs(z - cache->zpos) > Z_EPSILON))) {

+         /* This bitmap would extend beyond cache bounds, or the bitmap

+          * color is changing

+          * so flush and continue.

+          */

+         st_flush_bitmap_cache(st);

+      }

+   }

+

+   if (cache->empty) {

+      /* Initialize.  Center bitmap vertically in the buffer. */

+      px = 0;

+      py = (BITMAP_CACHE_HEIGHT - height) / 2;

+      cache->xpos = x;

+      cache->ypos = y - py;

+      cache->zpos = z;

+      cache->empty = GL_FALSE;

+      COPY_4FV(cache->color, st->ctx->Current.RasterColor);

+   }

+

+   assert(px != -999);

+   assert(py != -999);

+

+   if (x < cache->xmin)

+      cache->xmin = x;

+   if (y < cache->ymin)

+      cache->ymin = y;

+   if (x + width > cache->xmax)

+      cache->xmax = x + width;

+   if (y + height > cache->ymax)

+      cache->ymax = y + height;

+

+   /* create the transfer if needed */

+   create_cache_trans(st);

+

+   unpack_bitmap(st, px, py, width, height, unpack, bitmap,

+                 cache->buffer, BITMAP_CACHE_WIDTH);

+

+   return GL_TRUE; /* accumulated */

+}

+

+

+

+/**

+ * Called via ctx->Driver.Bitmap()

+ */

+static void

+st_Bitmap(struct gl_context *ctx, GLint x, GLint y,

+          GLsizei width, GLsizei height,

+          const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap )

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_resource *pt;

+

+   if (width == 0 || height == 0)

+      return;

+

+   st_validate_state(st);

+

+   if (!st->bitmap.vs) {

+      /* create pass-through vertex shader now */

+      const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,

+                                      TGSI_SEMANTIC_COLOR,

+                                      TGSI_SEMANTIC_GENERIC };

+      const uint semantic_indexes[] = { 0, 0, 0 };

+      st->bitmap.vs = util_make_vertex_passthrough_shader(st->pipe, 3,

+                                                          semantic_names,

+                                                          semantic_indexes);

+   }

+

+   if (UseBitmapCache && accum_bitmap(st, x, y, width, height, unpack, bitmap))

+      return;

+

+   pt = make_bitmap_texture(ctx, width, height, unpack, bitmap);

+   if (pt) {

+      struct pipe_sampler_view *sv =

+         st_create_texture_sampler_view(st->pipe, pt);

+

+      assert(pt->target == PIPE_TEXTURE_2D || pt->target == PIPE_TEXTURE_RECT);

+

+      if (sv) {

+         draw_bitmap_quad(ctx, x, y, ctx->Current.RasterPos[2],

+                          width, height, sv,

+                          st->ctx->Current.RasterColor);

+

+         pipe_sampler_view_reference(&sv, NULL);

+      }

+

+      /* release/free the texture */

+      pipe_resource_reference(&pt, NULL);

+   }

+}

+

+

+/** Per-context init */

+void

+st_init_bitmap_functions(struct dd_function_table *functions)

+{

+   functions->Bitmap = st_Bitmap;

+}

+

+

+/** Per-context init */

+void

+st_init_bitmap(struct st_context *st)

+{

+   struct pipe_sampler_state *sampler = &st->bitmap.samplers[0];

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = pipe->screen;

+

+   /* init sampler state once */

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

+   st->bitmap.samplers[1] = *sampler;

+   st->bitmap.samplers[1].normalized_coords = 1;

+

+   /* init baseline rasterizer state once */

+   memset(&st->bitmap.rasterizer, 0, sizeof(st->bitmap.rasterizer));

+   st->bitmap.rasterizer.gl_rasterization_rules = 1;

+

+   /* find a usable texture format */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_I8_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)) {

+      st->bitmap.tex_format = PIPE_FORMAT_I8_UNORM;

+   }

+   else if (screen->is_format_supported(screen, PIPE_FORMAT_A8_UNORM,

+                                        PIPE_TEXTURE_2D, 0,

+                                        PIPE_BIND_SAMPLER_VIEW, 0)) {

+      st->bitmap.tex_format = PIPE_FORMAT_A8_UNORM;

+   }

+   else if (screen->is_format_supported(screen, PIPE_FORMAT_L8_UNORM,

+                                        PIPE_TEXTURE_2D, 0,

+                                        PIPE_BIND_SAMPLER_VIEW, 0)) {

+      st->bitmap.tex_format = PIPE_FORMAT_L8_UNORM;

+   }

+   else {

+      /* XXX support more formats */

+      assert(0);

+   }

+

+   /* alloc bitmap cache object */

+   st->bitmap.cache = ST_CALLOC_STRUCT(bitmap_cache);

+

+   reset_cache(st);

+}

+

+

+/** Per-context tear-down */

+void

+st_destroy_bitmap(struct st_context *st)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct bitmap_cache *cache = st->bitmap.cache;

+

+   if (st->bitmap.vs) {

+      cso_delete_vertex_shader(st->cso_context, st->bitmap.vs);

+      st->bitmap.vs = NULL;

+   }

+

+   if (st->bitmap.vbuf) {

+      pipe_resource_reference(&st->bitmap.vbuf, NULL);

+      st->bitmap.vbuf = NULL;

+   }

+

+   if (cache) {

+      if (cache->trans) {

+         pipe_transfer_unmap(pipe, cache->trans);

+         pipe->transfer_destroy(pipe, cache->trans);

+      }

+      pipe_resource_reference(&st->bitmap.cache->texture, NULL);

+      free(st->bitmap.cache);

+      st->bitmap.cache = NULL;

+   }

+}

+

+#endif /* FEATURE_drawpix */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.h b/mesalib/src/mesa/state_tracker/st_cb_bitmap.h
new file mode 100644
index 000000000..a0d2f9faa
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.h
@@ -0,0 +1,95 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_BITMAP_H

+#define ST_CB_BITMAP_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+struct st_context;

+struct gl_fragment_program;

+struct st_fragment_program;

+

+#if FEATURE_drawpix

+

+extern void

+st_init_bitmap_functions(struct dd_function_table *functions);

+

+extern void

+st_init_bitmap(struct st_context *st);

+

+extern void

+st_destroy_bitmap(struct st_context *st);

+

+extern void

+st_make_bitmap_fragment_program(struct st_context *st,

+                                struct gl_fragment_program *fpIn,

+                                struct gl_fragment_program **fpOut,

+                                GLuint *bitmap_sampler);

+

+extern void

+st_flush_bitmap_cache(struct st_context *st);

+

+/* Flush bitmap cache and release vertex buffer.  Needed at end of

+ * frame to avoid synchronous rendering.

+ */

+extern void

+st_flush_bitmap(struct st_context *st);

+

+#else

+

+static INLINE void

+st_init_bitmap_functions(struct dd_function_table *functions)

+{

+}

+

+static INLINE void

+st_init_bitmap(struct st_context *st)

+{

+}

+

+static INLINE void

+st_destroy_bitmap(struct st_context *st)

+{

+}

+

+static INLINE void

+st_flush_bitmap_cache(struct st_context *st)

+{

+}

+

+static INLINE void

+st_flush_bitmap(struct st_context *st)

+{

+}

+

+#endif /* FEATURE_drawpix */

+

+#endif /* ST_CB_BITMAP_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
new file mode 100644
index 000000000..466e1a85f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -0,0 +1,207 @@
+/**************************************************************************

+ * 

+ * 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 "st_context.h"

+#include "st_texture.h"

+#include "st_cb_blit.h"

+#include "st_cb_fbo.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;

+

+   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_blit.h b/mesalib/src/mesa/state_tracker/st_cb_blit.h
new file mode 100644
index 000000000..fac11f364
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.h
@@ -0,0 +1,58 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+#ifndef ST_CB_BLIT_H

+#define ST_CB_BLIT_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+struct st_context;

+

+

+extern void

+st_init_blit(struct st_context *st);

+

+extern void

+st_destroy_blit(struct st_context *st);

+

+#if FEATURE_EXT_framebuffer_blit

+

+extern void

+st_init_blit_functions(struct dd_function_table *functions);

+

+#else

+

+static INLINE void

+st_init_blit_functions(struct dd_function_table *functions)

+{

+}

+

+#endif /* FEATURE_EXT_framebuffer_blit */

+

+#endif /* ST_CB_BLIT_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
new file mode 100644
index 000000000..ba8a8cf89
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -0,0 +1,447 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+/**

+ * Functions for pixel buffer objects and vertex/element buffer objects.

+ */

+

+

+#include "main/imports.h"

+#include "main/mtypes.h"

+#include "main/arrayobj.h"

+#include "main/bufferobj.h"

+

+#include "st_context.h"

+#include "st_cb_bufferobjects.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+

+

+/**

+ * There is some duplication between mesa's bufferobjects and our

+ * bufmgr buffers.  Both have an integer handle and a hashtable to

+ * lookup an opaque structure.  It would be nice if the handles and

+ * internal structure where somehow shared.

+ */

+static struct gl_buffer_object *

+st_bufferobj_alloc(struct gl_context *ctx, GLuint name, GLenum target)

+{

+   struct st_buffer_object *st_obj = ST_CALLOC_STRUCT(st_buffer_object);

+

+   if (!st_obj)

+      return NULL;

+

+   _mesa_initialize_buffer_object(&st_obj->Base, name, target);

+

+   return &st_obj->Base;

+}

+

+

+

+/**

+ * Deallocate/free a vertex/pixel buffer object.

+ * Called via glDeleteBuffersARB().

+ */

+static void

+st_bufferobj_free(struct gl_context *ctx, struct gl_buffer_object *obj)

+{

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+

+   assert(obj->RefCount == 0);

+   assert(st_obj->transfer == NULL);

+

+   if (st_obj->buffer) 

+      pipe_resource_reference(&st_obj->buffer, NULL);

+

+   free(st_obj);

+}

+

+

+

+/**

+ * Replace data in a subrange of buffer object.  If the data range

+ * specified by size + offset extends beyond the end of the buffer or

+ * if data is NULL, no copy is performed.

+ * Called via glBufferSubDataARB().

+ */

+static void

+st_bufferobj_subdata(struct gl_context *ctx,

+		     GLenum target,

+		     GLintptrARB offset,

+		     GLsizeiptrARB size,

+		     const GLvoid * data, struct gl_buffer_object *obj)

+{

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+

+   /* we may be called from VBO code, so double-check params here */

+   ASSERT(offset >= 0);

+   ASSERT(size >= 0);

+   ASSERT(offset + size <= obj->Size);

+

+   if (!size)

+      return;

+

+   /*

+    * According to ARB_vertex_buffer_object specification, if data is null,

+    * then the contents of the buffer object's data store is undefined. We just

+    * ignore, and leave it unchanged.

+    */

+   if (!data)

+      return;

+

+   /* Now that transfers are per-context, we don't have to figure out

+    * flushing here.  Usually drivers won't need to flush in this case

+    * even if the buffer is currently referenced by hardware - they

+    * just queue the upload as dma rather than mapping the underlying

+    * buffer directly.

+    */

+   pipe_buffer_write(st_context(ctx)->pipe,

+		     st_obj->buffer,

+		     offset, size, data);

+}

+

+

+/**

+ * Called via glGetBufferSubDataARB().

+ */

+static void

+st_bufferobj_get_subdata(struct gl_context *ctx,

+                         GLenum target,

+                         GLintptrARB offset,

+                         GLsizeiptrARB size,

+                         GLvoid * data, struct gl_buffer_object *obj)

+{

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+

+   /* we may be called from VBO code, so double-check params here */

+   ASSERT(offset >= 0);

+   ASSERT(size >= 0);

+   ASSERT(offset + size <= obj->Size);

+

+   if (!size)

+      return;

+

+   pipe_buffer_read(st_context(ctx)->pipe, st_obj->buffer,

+                    offset, size, data);

+}

+

+

+/**

+ * Allocate space for and store data in a buffer object.  Any data that was

+ * previously stored in the buffer object is lost.  If data is NULL,

+ * memory will be allocated, but no copy will occur.

+ * Called via ctx->Driver.BufferData().

+ * \return GL_TRUE for success, GL_FALSE if out of memory

+ */

+static GLboolean

+st_bufferobj_data(struct gl_context *ctx,

+		  GLenum target,

+		  GLsizeiptrARB size,

+		  const GLvoid * data,

+		  GLenum usage, 

+		  struct gl_buffer_object *obj)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+   unsigned buffer_usage;

+

+   st_obj->Base.Size = size;

+   st_obj->Base.Usage = usage;

+   

+   switch(target) {

+   case GL_PIXEL_PACK_BUFFER_ARB:

+   case GL_PIXEL_UNPACK_BUFFER_ARB:

+      buffer_usage = PIPE_BIND_RENDER_TARGET;

+      break;

+   case GL_ARRAY_BUFFER_ARB:

+      buffer_usage = PIPE_BIND_VERTEX_BUFFER;

+      break;

+   case GL_ELEMENT_ARRAY_BUFFER_ARB:

+      buffer_usage = PIPE_BIND_INDEX_BUFFER;

+      break;

+   default:

+      buffer_usage = 0;

+   }

+

+   pipe_resource_reference( &st_obj->buffer, NULL );

+

+   if (size != 0) {

+      st_obj->buffer = pipe_buffer_create(pipe->screen, buffer_usage, size);

+

+      if (!st_obj->buffer) {

+         return GL_FALSE;

+      }

+

+      if (data)

+         pipe_buffer_write(st_context(ctx)->pipe, st_obj->buffer, 0,

+				       size, data);

+      return GL_TRUE;

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Dummy data whose's pointer is used for zero size buffers or ranges.

+ */

+static long st_bufferobj_zero_length = 0;

+

+

+

+/**

+ * Called via glMapBufferARB().

+ */

+static void *

+st_bufferobj_map(struct gl_context *ctx, GLenum target, GLenum access,

+                 struct gl_buffer_object *obj)

+{

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+   uint flags;

+

+   switch (access) {

+   case GL_WRITE_ONLY:

+      flags = PIPE_TRANSFER_WRITE;

+      break;

+   case GL_READ_ONLY:

+      flags = PIPE_TRANSFER_READ;

+      break;

+   case GL_READ_WRITE:

+   default:

+      flags = PIPE_TRANSFER_READ_WRITE;

+      break;      

+   }

+

+   /* Handle zero-size buffers here rather than in drivers */

+   if (obj->Size == 0) {

+      obj->Pointer = &st_bufferobj_zero_length;

+   }

+   else {

+      obj->Pointer = pipe_buffer_map(st_context(ctx)->pipe,

+                                     st_obj->buffer,

+                                     flags,

+                                     &st_obj->transfer);

+   }

+

+   if (obj->Pointer) {

+      obj->Offset = 0;

+      obj->Length = obj->Size;

+   }

+   return obj->Pointer;

+}

+

+

+/**

+ * Called via glMapBufferRange().

+ */

+static void *

+st_bufferobj_map_range(struct gl_context *ctx, GLenum target, 

+                       GLintptr offset, GLsizeiptr length, GLbitfield access,

+                       struct gl_buffer_object *obj)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+   enum pipe_transfer_usage flags = 0x0;

+

+   if (access & GL_MAP_WRITE_BIT)

+      flags |= PIPE_TRANSFER_WRITE;

+

+   if (access & GL_MAP_READ_BIT)

+      flags |= PIPE_TRANSFER_READ;

+

+   if (access & GL_MAP_FLUSH_EXPLICIT_BIT)

+      flags |= PIPE_TRANSFER_FLUSH_EXPLICIT;

+

+   if (access & GL_MAP_INVALIDATE_RANGE_BIT)

+      flags |= PIPE_TRANSFER_DISCARD;

+

+   if (access & GL_MAP_INVALIDATE_BUFFER_BIT)

+      flags |= PIPE_TRANSFER_DISCARD;

+   

+   if (access & GL_MAP_UNSYNCHRONIZED_BIT)

+      flags |= PIPE_TRANSFER_UNSYNCHRONIZED;

+

+   /* ... other flags ...

+    */

+

+   if (access & MESA_MAP_NOWAIT_BIT)

+      flags |= PIPE_TRANSFER_DONTBLOCK;

+

+   assert(offset >= 0);

+   assert(length >= 0);

+   assert(offset < obj->Size);

+   assert(offset + length <= obj->Size);

+

+   /*

+    * We go out of way here to hide the degenerate yet valid case of zero

+    * length range from the pipe driver.

+    */

+   if (!length) {

+      obj->Pointer = &st_bufferobj_zero_length;

+   }

+   else {

+      obj->Pointer = pipe_buffer_map_range(pipe, 

+                                           st_obj->buffer,

+                                           offset, length,

+                                           flags,

+                                           &st_obj->transfer);

+      if (obj->Pointer) {

+         obj->Pointer = (ubyte *) obj->Pointer + offset;

+      }

+   }

+   

+   if (obj->Pointer) {

+      obj->Offset = offset;

+      obj->Length = length;

+      obj->AccessFlags = access;

+   }

+

+   return obj->Pointer;

+}

+

+

+static void

+st_bufferobj_flush_mapped_range(struct gl_context *ctx, GLenum target, 

+                                GLintptr offset, GLsizeiptr length,

+                                struct gl_buffer_object *obj)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+

+   /* Subrange is relative to mapped range */

+   assert(offset >= 0);

+   assert(length >= 0);

+   assert(offset + length <= obj->Length);

+   assert(obj->Pointer);

+   

+   if (!length)

+      return;

+

+   pipe_buffer_flush_mapped_range(pipe, st_obj->transfer, 

+                                  obj->Offset + offset, length);

+}

+

+

+/**

+ * Called via glUnmapBufferARB().

+ */

+static GLboolean

+st_bufferobj_unmap(struct gl_context *ctx, GLenum target, struct gl_buffer_object *obj)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_buffer_object *st_obj = st_buffer_object(obj);

+

+   if (obj->Length)

+      pipe_buffer_unmap(pipe, st_obj->transfer);

+

+   st_obj->transfer = NULL;

+   obj->Pointer = NULL;

+   obj->Offset = 0;

+   obj->Length = 0;

+   return GL_TRUE;

+}

+

+

+/**

+ * Called via glCopyBufferSubData().

+ */

+static void

+st_copy_buffer_subdata(struct gl_context *ctx,

+                       struct gl_buffer_object *src,

+                       struct gl_buffer_object *dst,

+                       GLintptr readOffset, GLintptr writeOffset,

+                       GLsizeiptr size)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_buffer_object *srcObj = st_buffer_object(src);

+   struct st_buffer_object *dstObj = st_buffer_object(dst);

+   struct pipe_transfer *src_transfer;

+   struct pipe_transfer *dst_transfer;

+   ubyte *srcPtr, *dstPtr;

+

+   if(!size)

+      return;

+

+   /* buffer should not already be mapped */

+   assert(!src->Pointer);

+   assert(!dst->Pointer);

+

+   srcPtr = (ubyte *) pipe_buffer_map_range(pipe,

+                                            srcObj->buffer,

+                                            readOffset, size,

+                                            PIPE_TRANSFER_READ,

+					    &src_transfer);

+

+   dstPtr = (ubyte *) pipe_buffer_map_range(pipe,

+                                            dstObj->buffer,

+                                            writeOffset, size,

+                                            PIPE_TRANSFER_WRITE,

+					    &dst_transfer);

+

+   if (srcPtr && dstPtr)

+      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);

+

+   pipe_buffer_unmap(pipe, src_transfer);

+   pipe_buffer_unmap(pipe, dst_transfer);

+}

+

+

+/* TODO: if buffer wasn't created with appropriate usage flags, need

+ * to recreate it now and copy contents -- or possibly create a

+ * gallium entrypoint to extend the usage flags and let the driver

+ * decide if a copy is necessary.

+ */

+void

+st_bufferobj_validate_usage(struct st_context *st,

+			    struct st_buffer_object *obj,

+			    unsigned usage)

+{

+}

+

+

+void

+st_init_bufferobject_functions(struct dd_function_table *functions)

+{

+   functions->NewBufferObject = st_bufferobj_alloc;

+   functions->DeleteBuffer = st_bufferobj_free;

+   functions->BufferData = st_bufferobj_data;

+   functions->BufferSubData = st_bufferobj_subdata;

+   functions->GetBufferSubData = st_bufferobj_get_subdata;

+   functions->MapBuffer = st_bufferobj_map;

+   functions->MapBufferRange = st_bufferobj_map_range;

+   functions->FlushMappedBufferRange = st_bufferobj_flush_mapped_range;

+   functions->UnmapBuffer = st_bufferobj_unmap;

+   functions->CopyBufferSubData = st_copy_buffer_subdata;

+

+   /* For GL_APPLE_vertex_array_object */

+   functions->NewArrayObject = _mesa_new_array_object;

+   functions->DeleteArrayObject = _mesa_delete_array_object;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.h b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.h
new file mode 100644
index 000000000..16abaa856
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.h
@@ -0,0 +1,68 @@
+/**************************************************************************

+ * 

+ * Copyright 2005 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_CB_BUFFEROBJECTS_H

+#define ST_CB_BUFFEROBJECTS_H

+

+#include "main/compiler.h"

+#include "main/mtypes.h"

+

+struct dd_function_table;

+struct pipe_resource;

+struct st_context;

+

+/**

+ * State_tracker vertex/pixel buffer object, derived from Mesa's

+ * gl_buffer_object.

+ */

+struct st_buffer_object

+{

+   struct gl_buffer_object Base;

+   struct pipe_resource *buffer;     /* GPU storage */

+   struct pipe_transfer *transfer; /* In-progress map information */

+};

+

+

+/** cast wrapper */

+static INLINE struct st_buffer_object *

+st_buffer_object(struct gl_buffer_object *obj)

+{

+   return (struct st_buffer_object *) obj;

+}

+

+

+extern void

+st_bufferobj_validate_usage(struct st_context *st,

+			    struct st_buffer_object *obj,

+			    unsigned usage);

+

+

+extern void

+st_init_bufferobject_functions(struct dd_function_table *functions);

+

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c
new file mode 100644
index 000000000..7dd63798d
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c
@@ -0,0 +1,563 @@
+/**************************************************************************

+ * 

+ * 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_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_context *pipe = st->pipe;

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

+

+   /* fragment shader state: color pass-through program */

+   st->clear.fs = util_make_fragment_passthrough_shader(pipe);

+

+   /* vertex shader state: color/position pass-through */

+   {

+      const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,

+                                      TGSI_SEMANTIC_COLOR };

+      const uint semantic_indexes[] = { 0, 0 };

+      st->clear.vs = util_make_vertex_passthrough_shader(pipe, 2,

+                                                         semantic_names,

+                                                         semantic_indexes);

+   }

+}

+

+

+/**

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

+   }

+}

+

+

+/**

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

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

+

+   /*

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

+

+   /* 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);

+   cso_set_fragment_shader_handle(st->cso_context, st->clear.fs);

+   cso_set_vertex_shader_handle(st->cso_context, st->clear.vs);

+

+   /* draw quad matching scissor rect (XXX verify coord round-off) */

+   draw_quad(st, x0, y0, x1, y1,

+             (GLfloat) ctx->Depth.Clear, ctx->Color.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);

+}

+

+

+/**

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

+

+            assert(rb);

+

+            strb = st_renderbuffer(rb);

+

+            if (!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.

+       */

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

+      st->pipe->clear(st->pipe, clear_buffers, ctx->Color.ClearColor,

+                      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_clear.h b/mesalib/src/mesa/state_tracker/st_cb_clear.h
new file mode 100644
index 000000000..8eafae5a4
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_clear.h
@@ -0,0 +1,52 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_CLEAR_H

+#define ST_CB_CLEAR_H

+

+

+struct dd_function_table;

+struct st_context;

+

+extern void

+st_init_clear(struct st_context *st);

+

+

+extern void

+st_destroy_clear(struct st_context *st);

+

+extern void

+st_flush_clear(struct st_context *st);

+

+

+extern void

+st_init_clear_functions(struct dd_function_table *functions);

+

+

+#endif /* ST_CB_CLEAR_H */

+

diff --git a/mesalib/src/mesa/state_tracker/st_cb_condrender.c b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
new file mode 100644
index 000000000..679527569
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
@@ -0,0 +1,96 @@
+/**************************************************************************

+ * 

+ * 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 THE AUTHORS 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.

+ * 

+ **************************************************************************/

+

+

+/**

+ * glBegin/EndCondtionalRender functions

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/imports.h"

+#include "main/context.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "st_context.h"

+#include "st_cb_queryobj.h"

+#include "st_cb_condrender.h"

+

+

+/**

+ * Called via ctx->Driver.BeginConditionalRender()

+ */

+static void

+st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,

+                          GLenum mode)

+{

+   struct st_query_object *stq = st_query_object(q);

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   uint m;

+

+   switch (mode) {

+   case GL_QUERY_WAIT:

+      m = PIPE_RENDER_COND_WAIT;

+      break;

+   case GL_QUERY_NO_WAIT:

+      m = PIPE_RENDER_COND_NO_WAIT;

+      break;

+   case GL_QUERY_BY_REGION_WAIT:

+      m = PIPE_RENDER_COND_BY_REGION_WAIT;

+      break;

+   case GL_QUERY_BY_REGION_NO_WAIT:

+      m = PIPE_RENDER_COND_BY_REGION_NO_WAIT;

+      break;

+   default:

+      assert(0 && "bad mode in st_BeginConditionalRender");

+      m = PIPE_RENDER_COND_WAIT;

+   }

+

+   pipe->render_condition(pipe, stq->pq, m);

+}

+

+

+/**

+ * Called via ctx->Driver.BeginConditionalRender()

+ */

+static void

+st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   (void) q;

+   pipe->render_condition(pipe, NULL, 0);

+}

+

+

+

+void st_init_cond_render_functions(struct dd_function_table *functions)

+{

+   functions->BeginConditionalRender = st_BeginConditionalRender;

+   functions->EndConditionalRender = st_EndConditionalRender;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_condrender.h b/mesalib/src/mesa/state_tracker/st_cb_condrender.h
new file mode 100644
index 000000000..24eb09258
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_condrender.h
@@ -0,0 +1,37 @@
+/**************************************************************************

+ * 

+ * 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 THE AUTHORS 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_CB_CONDRENDER_H

+#define ST_CB_CONDRENDER_H

+

+

+struct dd_function_table;

+

+extern void st_init_cond_render_functions(struct dd_function_table *functions);

+

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
new file mode 100644
index 000000000..8a63192d7
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -0,0 +1,1362 @@
+/**************************************************************************

+ * 

+ * 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/pack.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 |= (1 << FRAG_RESULT_DEPTH);

+   if (write_stencil)

+      p->OutputsWritten |= (1 << 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(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 {

+         return GL_RGBA;

+      }

+   }

+}

+

+

+/**

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

+                               sizeof(verts));

+      pipe_buffer_write(st->pipe, buf, 0, sizeof(verts), verts);

+

+      util_draw_vertex_buffer(pipe, 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);

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

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

+}

+

+

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

+   }

+

+   /*

+    * 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, 0)) {

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

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

+         pipe_get_tile_rgba(pipe, ptRead, readX, readY, readW, readH, buf);

+         pipe_put_tile_rgba(pipe, ptTex, pack.SkipPixels, pack.SkipRows,

+                            readW, readH, buf);

+         free(buf);

+      }

+      else {

+         /* GL_DEPTH */

+         GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));

+         pipe_get_tile_z(pipe, ptRead, readX, readY, 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_drawpixels.h b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.h
new file mode 100644
index 000000000..aa0f491fe
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.h
@@ -0,0 +1,69 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_DRAWPIXELS_H

+#define ST_CB_DRAWPIXELS_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+struct st_context;

+

+#if FEATURE_drawpix

+

+extern void st_init_drawpixels_functions(struct dd_function_table *functions);

+

+extern void

+st_destroy_drawpix(struct st_context *st);

+

+extern void

+st_make_drawpix_fragment_program(struct st_context *st,

+                                 struct gl_fragment_program *fpIn,

+                                 struct gl_fragment_program **fpOut);

+

+extern struct gl_fragment_program *

+st_make_drawpix_z_stencil_program(struct st_context *st,

+                                  GLboolean write_depth,

+                                  GLboolean write_stencil);

+

+#else

+

+static INLINE void

+st_init_drawpixels_functions(struct dd_function_table *functions)

+{

+}

+

+static INLINE void

+st_destroy_drawpix(struct st_context *st)

+{

+}

+

+#endif /* FEATURE_drawpix */

+

+#endif /* ST_CB_DRAWPIXELS_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
new file mode 100644
index 000000000..083742b1c
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c
@@ -0,0 +1,303 @@
+/**************************************************************************

+ * 

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

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

+

+   {

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

+}

+

+

+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_drawtex.h b/mesalib/src/mesa/state_tracker/st_cb_drawtex.h
new file mode 100644
index 000000000..48cf45e1f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawtex.h
@@ -0,0 +1,40 @@
+/**************************************************************************

+ * 

+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ **************************************************************************/

+

+

+#ifndef ST_CB_DRAWTEX_H

+#define ST_CB_DRAWTEX_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+struct st_context;

+

+#if FEATURE_OES_draw_texture

+

+extern void

+st_init_drawtex_functions(struct dd_function_table *functions);

+

+extern void

+st_destroy_drawtex(struct st_context *st);

+

+#else

+

+static INLINE void

+st_init_drawtex_functions(struct dd_function_table *functions)

+{

+}

+

+static INLINE void

+st_destroy_drawtex(struct st_context *st)

+{

+}

+

+#endif /* FEATURE_OES_draw_texture */

+

+#endif /* ST_CB_DRAWTEX_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c
new file mode 100644
index 000000000..0f5175713
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c
@@ -0,0 +1,169 @@
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.9

+ *

+ * Copyright (C) 2010 LunarG 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

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

+ *

+ * Authors:

+ *    Chia-I Wu <olv@lunarg.com>

+ */

+

+#include "main/texobj.h"

+#include "main/texfetch.h"

+#include "main/teximage.h"

+#include "util/u_inlines.h"

+#include "util/u_format.h"

+#include "st_cb_eglimage.h"

+#include "st_cb_fbo.h"

+#include "st_context.h"

+#include "st_texture.h"

+#include "st_format.h"

+#include "st_manager.h"

+

+#if FEATURE_OES_EGL_image

+

+/**

+ * Return the base format just like _mesa_base_fbo_format does.

+ */

+static GLenum

+st_pipe_format_to_base_format(enum pipe_format format)

+{

+   GLenum base_format;

+

+   if (util_format_is_depth_or_stencil(format)) {

+      if (util_format_is_depth_and_stencil(format)) {

+         base_format = GL_DEPTH_STENCIL;

+      }

+      else {

+         if (format == PIPE_FORMAT_S8_USCALED)

+            base_format = GL_STENCIL_INDEX;

+         else

+            base_format = GL_DEPTH_COMPONENT;

+      }

+   }

+   else {

+      /* is this enough? */

+      if (util_format_has_alpha(format))

+         base_format = GL_RGBA;

+      else

+         base_format = GL_RGB;

+   }

+

+   return base_format;

+}

+

+static void

+st_egl_image_target_renderbuffer_storage(struct gl_context *ctx,

+					 struct gl_renderbuffer *rb,

+					 GLeglImageOES image_handle)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_renderbuffer *strb = st_renderbuffer(rb);

+   struct pipe_surface *ps;

+   unsigned usage;

+

+   usage = PIPE_BIND_RENDER_TARGET;

+   ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage);

+   if (ps) {

+      strb->Base.Width = ps->width;

+      strb->Base.Height = ps->height;

+      strb->Base.Format = st_pipe_format_to_mesa_format(ps->format);

+      strb->Base.DataType = st_format_datatype(ps->format);

+      strb->Base._BaseFormat = st_pipe_format_to_base_format(ps->format);

+      strb->Base.InternalFormat = strb->Base._BaseFormat;

+

+      pipe_surface_reference(&strb->surface, ps);

+      pipe_resource_reference(&strb->texture, ps->texture);

+

+      pipe_surface_reference(&ps, NULL);

+   }

+}

+

+static void

+st_bind_surface(struct gl_context *ctx, GLenum target,

+                struct gl_texture_object *texObj,

+                struct gl_texture_image *texImage,

+                struct pipe_surface *ps)

+{

+   struct st_texture_object *stObj;

+   struct st_texture_image *stImage;

+   GLenum internalFormat;

+   gl_format texFormat;

+

+   /* map pipe format to base format */

+   if (util_format_get_component_bits(ps->format, UTIL_FORMAT_COLORSPACE_RGB, 3) > 0)

+      internalFormat = GL_RGBA;

+   else

+      internalFormat = GL_RGB;

+

+   stObj = st_texture_object(texObj);

+   stImage = st_texture_image(texImage);

+

+   /* switch to surface based */

+   if (!stObj->surface_based) {

+      _mesa_clear_texture_object(ctx, texObj);

+      stObj->surface_based = GL_TRUE;

+   }

+

+   texFormat = st_pipe_format_to_mesa_format(ps->format);

+

+   _mesa_init_teximage_fields(ctx, target, texImage,

+                              ps->width, ps->height, 1, 0, internalFormat,

+                              texFormat);

+

+   /* FIXME create a non-default sampler view from the pipe_surface? */

+   pipe_resource_reference(&stObj->pt, ps->texture);

+   pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+   pipe_resource_reference(&stImage->pt, stObj->pt);

+

+   stObj->width0 = ps->width;

+   stObj->height0 = ps->height;

+   stObj->depth0 = 1;

+

+   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);

+}

+

+static void

+st_egl_image_target_texture_2d(struct gl_context *ctx, GLenum target,

+			       struct gl_texture_object *texObj,

+			       struct gl_texture_image *texImage,

+			       GLeglImageOES image_handle)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_surface *ps;

+   unsigned usage;

+

+   usage = PIPE_BIND_SAMPLER_VIEW;

+   ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage);

+   if (ps) {

+      st_bind_surface(ctx, target, texObj, texImage, ps);

+      pipe_surface_reference(&ps, NULL);

+   }

+}

+

+void

+st_init_eglimage_functions(struct dd_function_table *functions)

+{

+   functions->EGLImageTargetTexture2D = st_egl_image_target_texture_2d;

+   functions->EGLImageTargetRenderbufferStorage = st_egl_image_target_renderbuffer_storage;

+}

+

+#endif /* FEATURE_OES_EGL_image */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.h b/mesalib/src/mesa/state_tracker/st_cb_eglimage.h
new file mode 100644
index 000000000..8757d08ff
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.h
@@ -0,0 +1,50 @@
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.9

+ *

+ * Copyright (C) 2010 LunarG 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

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

+ *

+ * Authors:

+ *    Chia-I Wu <olv@lunarg.com>

+ */

+

+#ifndef ST_CB_EGLIMAGE_H

+#define ST_CB_EGLIMAGE_H

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+

+#if FEATURE_OES_EGL_image

+

+extern void

+st_init_eglimage_functions(struct dd_function_table *functions);

+

+#else

+

+static INLINE void

+st_init_eglimage_functions(struct dd_function_table *functions)

+{

+}

+

+#endif

+

+#endif /* ST_CB_EGLIMAGE_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
new file mode 100644
index 000000000..4bc01100a
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -0,0 +1,617 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+/**

+ * Framebuffer/renderbuffer functions.

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/imports.h"

+#include "main/context.h"

+#include "main/fbobject.h"

+#include "main/framebuffer.h"

+#include "main/macros.h"

+#include "main/renderbuffer.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_screen.h"

+#include "st_context.h"

+#include "st_cb_fbo.h"

+#include "st_cb_flush.h"

+#include "st_format.h"

+#include "st_texture.h"

+#include "st_manager.h"

+

+#include "util/u_format.h"

+#include "util/u_inlines.h"

+#include "util/u_surface.h"

+

+

+/**

+ * gl_renderbuffer::AllocStorage()

+ * This is called to allocate the original drawing surface, and

+ * during window resize.

+ */

+static GLboolean

+st_renderbuffer_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,

+                              GLenum internalFormat,

+                              GLuint width, GLuint height)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = st->pipe->screen;

+   struct st_renderbuffer *strb = st_renderbuffer(rb);

+   enum pipe_format format;

+   struct pipe_surface surf_tmpl;

+

+   if (strb->format != PIPE_FORMAT_NONE)

+      format = strb->format;

+   else

+      format = st_choose_renderbuffer_format(screen, internalFormat, rb->NumSamples);

+      

+   /* init renderbuffer fields */

+   strb->Base.Width  = width;

+   strb->Base.Height = height;

+   strb->Base.Format = st_pipe_format_to_mesa_format(format);

+   strb->Base.DataType = st_format_datatype(format);

+

+   strb->defined = GL_FALSE;  /* undefined contents now */

+

+   if (strb->software) {

+      size_t size;

+      

+      free(strb->data);

+

+      assert(strb->format != PIPE_FORMAT_NONE);

+      

+      strb->stride = util_format_get_stride(strb->format, width);

+      size = util_format_get_2d_size(strb->format, strb->stride, height);

+      

+      strb->data = malloc(size);

+      

+      return strb->data != NULL;

+   }

+   else {

+      struct pipe_resource template;

+    

+      /* Free the old surface and texture

+       */

+      pipe_surface_reference( &strb->surface, NULL );

+      pipe_resource_reference( &strb->texture, NULL );

+      pipe_sampler_view_reference(&strb->sampler_view, NULL);

+

+      /* Setup new texture template.

+       */

+      memset(&template, 0, sizeof(template));

+      template.target = st->internal_target;

+      template.format = format;

+      template.width0 = width;

+      template.height0 = height;

+      template.depth0 = 1;

+      template.array_size = 1;

+      template.last_level = 0;

+      template.nr_samples = rb->NumSamples;

+      if (util_format_is_depth_or_stencil(format)) {

+         template.bind = PIPE_BIND_DEPTH_STENCIL;

+      }

+      else {

+         template.bind = (PIPE_BIND_DISPLAY_TARGET |

+                          PIPE_BIND_RENDER_TARGET);

+      }

+

+      strb->texture = screen->resource_create(screen, &template);

+

+      if (!strb->texture) 

+         return FALSE;

+

+      memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+      u_surface_default_template(&surf_tmpl, strb->texture, template.bind);

+      strb->surface = pipe->create_surface(pipe,

+                                           strb->texture,

+                                           &surf_tmpl);

+      if (strb->surface) {

+         assert(strb->surface->texture);

+         assert(strb->surface->format);

+         assert(strb->surface->width == width);

+         assert(strb->surface->height == height);

+      }

+

+      return strb->surface != NULL;

+   }

+}

+

+

+/**

+ * gl_renderbuffer::Delete()

+ */

+static void

+st_renderbuffer_delete(struct gl_renderbuffer *rb)

+{

+   struct st_renderbuffer *strb = st_renderbuffer(rb);

+   ASSERT(strb);

+   pipe_surface_reference(&strb->surface, NULL);

+   pipe_resource_reference(&strb->texture, NULL);

+   pipe_sampler_view_reference(&strb->sampler_view, NULL);

+   free(strb->data);

+   free(strb);

+}

+

+

+/**

+ * gl_renderbuffer::GetPointer()

+ */

+static void *

+null_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb,

+                 GLint x, GLint y)

+{

+   /* By returning NULL we force all software rendering to go through

+    * the span routines.

+    */

+#if 0

+   assert(0);  /* Should never get called with softpipe */

+#endif

+   return NULL;

+}

+

+

+/**

+ * Called via ctx->Driver.NewFramebuffer()

+ */

+static struct gl_framebuffer *

+st_new_framebuffer(struct gl_context *ctx, GLuint name)

+{

+   /* XXX not sure we need to subclass gl_framebuffer for pipe */

+   return _mesa_new_framebuffer(ctx, name);

+}

+

+

+/**

+ * Called via ctx->Driver.NewRenderbuffer()

+ */

+static struct gl_renderbuffer *

+st_new_renderbuffer(struct gl_context *ctx, GLuint name)

+{

+   struct st_renderbuffer *strb = ST_CALLOC_STRUCT(st_renderbuffer);

+   if (strb) {

+      _mesa_init_renderbuffer(&strb->Base, name);

+      strb->Base.Delete = st_renderbuffer_delete;

+      strb->Base.AllocStorage = st_renderbuffer_alloc_storage;

+      strb->Base.GetPointer = null_get_pointer;

+      strb->format = PIPE_FORMAT_NONE;

+      return &strb->Base;

+   }

+   return NULL;

+}

+

+

+/**

+ * Allocate a renderbuffer for a an on-screen window (not a user-created

+ * renderbuffer).  The window system code determines the format.

+ */

+struct gl_renderbuffer *

+st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)

+{

+   struct st_renderbuffer *strb;

+

+   strb = ST_CALLOC_STRUCT(st_renderbuffer);

+   if (!strb) {

+      _mesa_error(NULL, GL_OUT_OF_MEMORY, "creating renderbuffer");

+      return NULL;

+   }

+

+   _mesa_init_renderbuffer(&strb->Base, 0);

+   strb->Base.ClassID = 0x4242; /* just a unique value */

+   strb->Base.NumSamples = samples;

+   strb->Base.Format = st_pipe_format_to_mesa_format(format);

+   strb->Base.DataType = st_format_datatype(format);

+   strb->format = format;

+   strb->software = sw;

+   

+   switch (format) {

+   case PIPE_FORMAT_R8G8B8A8_UNORM:

+   case PIPE_FORMAT_B8G8R8A8_UNORM:

+   case PIPE_FORMAT_A8R8G8B8_UNORM:

+   case PIPE_FORMAT_R8G8B8X8_UNORM:

+   case PIPE_FORMAT_B8G8R8X8_UNORM:

+   case PIPE_FORMAT_X8R8G8B8_UNORM:

+   case PIPE_FORMAT_B5G5R5A1_UNORM:

+   case PIPE_FORMAT_B4G4R4A4_UNORM:

+   case PIPE_FORMAT_B5G6R5_UNORM:

+      strb->Base.InternalFormat = GL_RGBA;

+      break;

+   case PIPE_FORMAT_Z16_UNORM:

+      strb->Base.InternalFormat = GL_DEPTH_COMPONENT16;

+      break;

+   case PIPE_FORMAT_Z32_UNORM:

+      strb->Base.InternalFormat = GL_DEPTH_COMPONENT32;

+      break;

+   case PIPE_FORMAT_Z24_UNORM_S8_USCALED:

+   case PIPE_FORMAT_S8_USCALED_Z24_UNORM:

+   case PIPE_FORMAT_Z24X8_UNORM:

+   case PIPE_FORMAT_X8Z24_UNORM:

+      strb->Base.InternalFormat = GL_DEPTH24_STENCIL8_EXT;

+      break;

+   case PIPE_FORMAT_S8_USCALED:

+      strb->Base.InternalFormat = GL_STENCIL_INDEX8_EXT;

+      break;

+   case PIPE_FORMAT_R16G16B16A16_SNORM:

+      strb->Base.InternalFormat = GL_RGBA16;

+      break;

+   case PIPE_FORMAT_R8_UNORM:

+      strb->Base.InternalFormat = GL_R8;

+      break;

+   case PIPE_FORMAT_R8G8_UNORM:

+      strb->Base.InternalFormat = GL_RG8;

+      break;

+   case PIPE_FORMAT_R16_UNORM:

+      strb->Base.InternalFormat = GL_R16;

+      break;

+   case PIPE_FORMAT_R16G16_UNORM:

+      strb->Base.InternalFormat = GL_RG16;

+      break;

+   default:

+      _mesa_problem(NULL,

+		    "Unexpected format in st_new_renderbuffer_fb");

+      free(strb);

+      return NULL;

+   }

+

+   /* st-specific methods */

+   strb->Base.Delete = st_renderbuffer_delete;

+   strb->Base.AllocStorage = st_renderbuffer_alloc_storage;

+   strb->Base.GetPointer = null_get_pointer;

+

+   /* surface is allocated in st_renderbuffer_alloc_storage() */

+   strb->surface = NULL;

+

+   return &strb->Base;

+}

+

+

+

+

+/**

+ * Called via ctx->Driver.BindFramebufferEXT().

+ */

+static void

+st_bind_framebuffer(struct gl_context *ctx, GLenum target,

+                    struct gl_framebuffer *fb, struct gl_framebuffer *fbread)

+{

+

+}

+

+/**

+ * Called by ctx->Driver.FramebufferRenderbuffer

+ */

+static void

+st_framebuffer_renderbuffer(struct gl_context *ctx, 

+                            struct gl_framebuffer *fb,

+                            GLenum attachment,

+                            struct gl_renderbuffer *rb)

+{

+   /* XXX no need for derivation? */

+   _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);

+}

+

+

+/**

+ * Called by ctx->Driver.RenderTexture

+ */

+static void

+st_render_texture(struct gl_context *ctx,

+                  struct gl_framebuffer *fb,

+                  struct gl_renderbuffer_attachment *att)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct st_renderbuffer *strb;

+   struct gl_renderbuffer *rb;

+   struct pipe_resource *pt = st_get_texobj_resource(att->Texture);

+   struct st_texture_object *stObj;

+   const struct gl_texture_image *texImage;

+   struct pipe_surface surf_tmpl;

+

+   /* When would this fail?  Perhaps assert? */

+   if (!pt) 

+      return;

+

+   /* get pointer to texture image we're rendeing to */

+   texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];

+

+   /* create new renderbuffer which wraps the texture image */

+   rb = st_new_renderbuffer(ctx, 0);

+   if (!rb) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glFramebufferTexture()");

+      return;

+   }

+

+   _mesa_reference_renderbuffer(&att->Renderbuffer, rb);

+   assert(rb->RefCount == 1);

+   rb->AllocStorage = NULL; /* should not get called */

+   strb = st_renderbuffer(rb);

+

+   assert(strb->Base.RefCount > 0);

+

+   /* get the texture for the texture object */

+   stObj = st_texture_object(att->Texture);

+

+   /* point renderbuffer at texobject */

+   strb->rtt = stObj;

+   strb->rtt_level = att->TextureLevel;

+   strb->rtt_face = att->CubeMapFace;

+   strb->rtt_slice = att->Zoffset;

+

+   rb->Width = texImage->Width2;

+   rb->Height = texImage->Height2;

+   rb->_BaseFormat = texImage->_BaseFormat;

+   /*printf("***** render to texture level %d: %d x %d\n", att->TextureLevel, rb->Width, rb->Height);*/

+

+   /*printf("***** pipe texture %d x %d\n", pt->width0, pt->height0);*/

+

+   pipe_resource_reference( &strb->texture, pt );

+

+   pipe_surface_reference(&strb->surface, NULL);

+

+   pipe_sampler_view_reference(&strb->sampler_view,

+                               st_get_texture_sampler_view(stObj, pipe));

+

+   assert(strb->rtt_level <= strb->texture->last_level);

+

+   /* new surface for rendering into the texture */

+   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+   surf_tmpl.format = strb->texture->format;

+   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

+   surf_tmpl.u.tex.level = strb->rtt_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;

+   strb->surface = pipe->create_surface(pipe,

+                                        strb->texture,

+                                        &surf_tmpl);

+

+   strb->format = pt->format;

+

+   strb->Base.Format = st_pipe_format_to_mesa_format(pt->format);

+   strb->Base.DataType = st_format_datatype(pt->format);

+

+   /*

+   printf("RENDER TO TEXTURE obj=%p pt=%p surf=%p  %d x %d\n",

+          att->Texture, pt, strb->surface, rb->Width, rb->Height);

+   */

+

+   /* Invalidate buffer state so that the pipe's framebuffer state

+    * gets updated.

+    * That's where the new renderbuffer (which we just created) gets

+    * passed to the pipe as a (color/depth) render target.

+    */

+   st_invalidate_state(ctx, _NEW_BUFFERS);

+}

+

+

+/**

+ * Called via ctx->Driver.FinishRenderTexture.

+ */

+static void

+st_finish_render_texture(struct gl_context *ctx,

+                         struct gl_renderbuffer_attachment *att)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_renderbuffer *strb = st_renderbuffer(att->Renderbuffer);

+

+   if (!strb)

+      return;

+

+   st_flush(st, PIPE_FLUSH_RENDER_CACHE, NULL);

+

+   strb->rtt = NULL;

+

+   /*

+   printf("FINISH RENDER TO TEXTURE surf=%p\n", strb->surface);

+   */

+

+   /* restore previous framebuffer state */

+   st_invalidate_state(ctx, _NEW_BUFFERS);

+}

+

+

+/**

+ * Validate a renderbuffer attachment for a particular set of bindings.

+ */

+static GLboolean

+st_validate_attachment(struct pipe_screen *screen,

+		       const struct gl_renderbuffer_attachment *att,

+		       unsigned bindings)

+{

+   const struct st_texture_object *stObj = st_texture_object(att->Texture);

+

+   /* Only validate texture attachments for now, since

+    * st_renderbuffer_alloc_storage makes sure that

+    * the format is supported.

+    */

+   if (att->Type != GL_TEXTURE)

+      return GL_TRUE;

+

+   if (!stObj)

+      return GL_FALSE;

+

+   return screen->is_format_supported(screen, stObj->pt->format,

+                                      PIPE_TEXTURE_2D,

+                                      stObj->pt->nr_samples, bindings, 0);

+}

+

+

+/**

+ * Check if two renderbuffer attachments name a combined depth/stencil

+ * renderbuffer.

+ */

+GLboolean

+st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,

+                             const struct gl_renderbuffer_attachment *stencil)

+{

+   assert(depth && stencil);

+

+   if (depth->Type == stencil->Type) {

+      if (depth->Type == GL_RENDERBUFFER_EXT &&

+          depth->Renderbuffer == stencil->Renderbuffer)

+         return GL_TRUE;

+

+      if (depth->Type == GL_TEXTURE &&

+          depth->Texture == stencil->Texture)

+         return GL_TRUE;

+   }

+

+   return GL_FALSE;

+}

+ 

+

+/**

+ * Check that the framebuffer configuration is valid in terms of what

+ * the driver can support.

+ *

+ * For Gallium we only supports combined Z+stencil, not separate buffers.

+ */

+static void

+st_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_screen *screen = st->pipe->screen;

+   const struct gl_renderbuffer_attachment *depth =

+         &fb->Attachment[BUFFER_DEPTH];

+   const struct gl_renderbuffer_attachment *stencil =

+         &fb->Attachment[BUFFER_STENCIL];

+   GLuint i;

+

+   if (depth->Type && stencil->Type && depth->Type != stencil->Type) {

+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

+      return;

+   }

+   if (depth->Type == GL_RENDERBUFFER_EXT &&

+       stencil->Type == GL_RENDERBUFFER_EXT &&

+       depth->Renderbuffer != stencil->Renderbuffer) {

+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

+      return;

+   }

+   if (depth->Type == GL_TEXTURE &&

+       stencil->Type == GL_TEXTURE &&

+       depth->Texture != stencil->Texture) {

+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

+      return;

+   }

+

+   if (!st_validate_attachment(screen,

+                               depth,

+			       PIPE_BIND_DEPTH_STENCIL)) {

+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

+      return;

+   }

+   if (!st_validate_attachment(screen,

+                               stencil,

+			       PIPE_BIND_DEPTH_STENCIL)) {

+      fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

+      return;

+   }

+   for (i = 0; i < ctx->Const.MaxColorAttachments; i++) {

+      if (!st_validate_attachment(screen,

+				  &fb->Attachment[BUFFER_COLOR0 + i],

+				  PIPE_BIND_RENDER_TARGET)) {

+	 fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;

+	 return;

+      }

+   }

+}

+

+

+/**

+ * Called via glDrawBuffer.

+ */

+static void

+st_DrawBuffers(struct gl_context *ctx, GLsizei count, const GLenum *buffers)

+{

+   struct st_context *st = st_context(ctx);

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   GLuint i;

+

+   (void) count;

+   (void) buffers;

+

+   /* add the renderbuffers on demand */

+   for (i = 0; i < fb->_NumColorDrawBuffers; i++) {

+      gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];

+      st_manager_add_color_renderbuffer(st, fb, idx);

+   }

+}

+

+

+/**

+ * Called via glReadBuffer.

+ */

+static void

+st_ReadBuffer(struct gl_context *ctx, GLenum buffer)

+{

+   struct st_context *st = st_context(ctx);

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+

+   (void) buffer;

+

+   /* add the renderbuffer on demand */

+   st_manager_add_color_renderbuffer(st, fb, fb->_ColorReadBufferIndex);

+}

+

+

+void st_init_fbo_functions(struct dd_function_table *functions)

+{

+#if FEATURE_EXT_framebuffer_object

+   functions->NewFramebuffer = st_new_framebuffer;

+   functions->NewRenderbuffer = st_new_renderbuffer;

+   functions->BindFramebuffer = st_bind_framebuffer;

+   functions->FramebufferRenderbuffer = st_framebuffer_renderbuffer;

+   functions->RenderTexture = st_render_texture;

+   functions->FinishRenderTexture = st_finish_render_texture;

+   functions->ValidateFramebuffer = st_validate_framebuffer;

+#endif

+   /* no longer needed by core Mesa, drivers handle resizes...

+   functions->ResizeBuffers = st_resize_buffers;

+   */

+

+   functions->DrawBuffers = st_DrawBuffers;

+   functions->ReadBuffer = st_ReadBuffer;

+}

+

+/* XXX unused ? */

+struct pipe_sampler_view *

+st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,

+                                 struct pipe_context *pipe)

+{

+   if (!rb->sampler_view) {

+      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);

+   }

+

+   return rb->sampler_view;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.h b/mesalib/src/mesa/state_tracker/st_cb_fbo.h
new file mode 100644
index 000000000..228be8fed
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.h
@@ -0,0 +1,96 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_FBO_H

+#define ST_CB_FBO_H

+

+#include "main/compiler.h"

+#include "main/glheader.h"

+#include "main/mtypes.h"

+

+#include "pipe/p_compiler.h"

+#include "pipe/p_format.h"

+

+struct dd_function_table;

+struct pipe_context;

+

+/**

+ * Derived renderbuffer class.  Just need to add a pointer to the

+ * pipe surface.

+ */

+struct st_renderbuffer

+{

+   struct gl_renderbuffer Base;

+   struct pipe_resource *texture;

+   struct pipe_surface *surface; /* temporary view into texture */

+   struct pipe_sampler_view *sampler_view;

+   enum pipe_format format;  /** preferred format, or PIPE_FORMAT_NONE */

+   GLboolean defined;        /**< defined contents? */

+

+   /**

+    * Used only when hardware accumulation buffers are not supported.

+    */

+   boolean software;

+   size_t stride;

+   void *data;

+   

+   struct st_texture_object *rtt;  /**< GL render to texture's texture */

+   int rtt_level, rtt_face, rtt_slice;

+

+   /** Render to texture state */

+   struct pipe_resource *texture_save;

+   struct pipe_surface *surface_save;

+   struct pipe_sampler_view *sampler_view_save;

+};

+

+

+static INLINE struct st_renderbuffer *

+st_renderbuffer(struct gl_renderbuffer *rb)

+{

+   return (struct st_renderbuffer *) rb;

+}

+

+

+extern struct gl_renderbuffer *

+st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);

+

+extern void

+st_init_fbo_functions(struct dd_function_table *functions);

+

+/* XXX unused ? */

+extern struct pipe_sampler_view *

+st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,

+                                 struct pipe_context *pipe);

+

+

+extern GLboolean

+st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,

+                             const struct gl_renderbuffer_attachment *stencil);

+

+

+#endif /* ST_CB_FBO_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_feedback.c b/mesalib/src/mesa/state_tracker/st_cb_feedback.c
new file mode 100644
index 000000000..6717c4c7a
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_feedback.c
@@ -0,0 +1,308 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+/**

+ * GL_SELECT and GL_FEEDBACK render modes.

+ * Basically, we use a private instance of the 'draw' module for doing

+ * selection/feedback.  It would be nice to use the transform_feedback

+ * hardware feature, but it's defined as happening pre-clip and we want

+ * post-clipped primitives.  Also, there's concerns about the efficiency

+ * of using the hardware for this anyway.

+ *

+ * Authors:

+ *   Brian Paul

+ */

+

+#include "main/imports.h"

+#include "main/context.h"

+#include "main/feedback.h"

+

+#include "vbo/vbo.h"

+

+#include "st_context.h"

+#include "st_draw.h"

+#include "st_cb_feedback.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+

+#include "draw/draw_context.h"

+#include "draw/draw_pipe.h"

+

+

+#if FEATURE_feedback

+

+/**

+ * This is actually used for both feedback and selection.

+ */

+struct feedback_stage

+{

+   struct draw_stage stage;   /**< Base class */

+   struct gl_context *ctx;            /**< Rendering context */

+   GLboolean reset_stipple_counter;

+};

+

+

+/**********************************************************************

+ * GL Feedback functions

+ **********************************************************************/

+

+static INLINE struct feedback_stage *

+feedback_stage( struct draw_stage *stage )

+{

+   return (struct feedback_stage *)stage;

+}

+

+

+static void

+feedback_vertex(struct gl_context *ctx, const struct draw_context *draw,

+                const struct vertex_header *v)

+{

+   const struct st_context *st = st_context(ctx);

+   GLfloat win[4];

+   const GLfloat *color, *texcoord;

+   GLuint slot;

+

+   /* Recall that Y=0=Top of window for Gallium wincoords */

+   win[0] = v->data[0][0];

+   win[1] = ctx->DrawBuffer->Height - v->data[0][1];

+   win[2] = v->data[0][2];

+   win[3] = 1.0F / v->data[0][3];

+

+   /* XXX

+    * When we compute vertex layout, save info about position of the

+    * color and texcoord attribs to use here.

+    */

+

+   slot = st->vertex_result_to_slot[VERT_RESULT_COL0];

+   if (slot != ~0U)

+      color = v->data[slot];

+   else

+      color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];

+

+   slot = st->vertex_result_to_slot[VERT_RESULT_TEX0];

+   if (slot != ~0U)

+      texcoord = v->data[slot];

+   else

+      texcoord = ctx->Current.Attrib[VERT_ATTRIB_TEX0];

+

+   _mesa_feedback_vertex(ctx, win, color, texcoord);

+}

+

+

+static void

+feedback_tri( struct draw_stage *stage, struct prim_header *prim )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   struct draw_context *draw = stage->draw;

+   _mesa_feedback_token(fs->ctx, (GLfloat) GL_POLYGON_TOKEN);

+   _mesa_feedback_token(fs->ctx, (GLfloat) 3); /* three vertices */

+   feedback_vertex(fs->ctx, draw, prim->v[0]);

+   feedback_vertex(fs->ctx, draw, prim->v[1]);

+   feedback_vertex(fs->ctx, draw, prim->v[2]);

+}

+

+

+static void

+feedback_line( struct draw_stage *stage, struct prim_header *prim )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   struct draw_context *draw = stage->draw;

+   if (fs->reset_stipple_counter) {

+      _mesa_feedback_token(fs->ctx, (GLfloat) GL_LINE_RESET_TOKEN);

+      fs->reset_stipple_counter = GL_FALSE;

+   }

+   else {

+      _mesa_feedback_token(fs->ctx, (GLfloat) GL_LINE_TOKEN);

+   }

+   feedback_vertex(fs->ctx, draw, prim->v[0]);

+   feedback_vertex(fs->ctx, draw, prim->v[1]);

+}

+

+

+static void

+feedback_point( struct draw_stage *stage, struct prim_header *prim )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   struct draw_context *draw = stage->draw;

+   _mesa_feedback_token(fs->ctx, (GLfloat) GL_POINT_TOKEN);

+   feedback_vertex(fs->ctx, draw, prim->v[0]);

+}

+

+

+static void

+feedback_flush( struct draw_stage *stage, unsigned flags )

+{

+   /* no-op */

+}

+

+

+static void

+feedback_reset_stipple_counter( struct draw_stage *stage )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   fs->reset_stipple_counter = GL_TRUE;

+}

+

+

+static void

+feedback_destroy( struct draw_stage *stage )

+{

+   /* no-op */

+}

+

+/**

+ * Create GL feedback drawing stage.

+ */

+static struct draw_stage *

+draw_glfeedback_stage(struct gl_context *ctx, struct draw_context *draw)

+{

+   struct feedback_stage *fs = ST_CALLOC_STRUCT(feedback_stage);

+

+   fs->stage.draw = draw;

+   fs->stage.next = NULL;

+   fs->stage.point = feedback_point;

+   fs->stage.line = feedback_line;

+   fs->stage.tri = feedback_tri;

+   fs->stage.flush = feedback_flush;

+   fs->stage.reset_stipple_counter = feedback_reset_stipple_counter;

+   fs->stage.destroy = feedback_destroy;

+   fs->ctx = ctx;

+

+   return &fs->stage;

+}

+

+

+

+/**********************************************************************

+ * GL Selection functions

+ **********************************************************************/

+

+static void

+select_tri( struct draw_stage *stage, struct prim_header *prim )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   _mesa_update_hitflag( fs->ctx, prim->v[0]->data[0][2] );

+   _mesa_update_hitflag( fs->ctx, prim->v[1]->data[0][2] );

+   _mesa_update_hitflag( fs->ctx, prim->v[2]->data[0][2] );

+}

+

+static void

+select_line( struct draw_stage *stage, struct prim_header *prim )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   _mesa_update_hitflag( fs->ctx, prim->v[0]->data[0][2] );

+   _mesa_update_hitflag( fs->ctx, prim->v[1]->data[0][2] );

+}

+

+

+static void

+select_point( struct draw_stage *stage, struct prim_header *prim )

+{

+   struct feedback_stage *fs = feedback_stage(stage);

+   _mesa_update_hitflag( fs->ctx, prim->v[0]->data[0][2] );

+}

+

+

+static void

+select_flush( struct draw_stage *stage, unsigned flags )

+{

+   /* no-op */

+}

+

+

+static void

+select_reset_stipple_counter( struct draw_stage *stage )

+{

+   /* no-op */

+}

+

+static void

+select_destroy( struct draw_stage *stage )

+{

+   /* no-op */

+}

+

+

+/**

+ * Create GL selection mode drawing stage.

+ */

+static struct draw_stage *

+draw_glselect_stage(struct gl_context *ctx, struct draw_context *draw)

+{

+   struct feedback_stage *fs = ST_CALLOC_STRUCT(feedback_stage);

+

+   fs->stage.draw = draw;

+   fs->stage.next = NULL;

+   fs->stage.point = select_point;

+   fs->stage.line = select_line;

+   fs->stage.tri = select_tri;

+   fs->stage.flush = select_flush;

+   fs->stage.reset_stipple_counter = select_reset_stipple_counter;

+   fs->stage.destroy = select_destroy;

+   fs->ctx = ctx;

+

+   return &fs->stage;

+}

+

+

+static void

+st_RenderMode(struct gl_context *ctx, GLenum newMode )

+{

+   struct st_context *st = st_context(ctx);

+   struct draw_context *draw = st->draw;

+

+   if (newMode == GL_RENDER) {

+      /* restore normal VBO draw function */

+      vbo_set_draw_func(ctx, st_draw_vbo);

+   }

+   else if (newMode == GL_SELECT) {

+      if (!st->selection_stage)

+         st->selection_stage = draw_glselect_stage(ctx, draw);

+      draw_set_rasterize_stage(draw, st->selection_stage);

+      /* Plug in new vbo draw function */

+      vbo_set_draw_func(ctx, st_feedback_draw_vbo);

+   }

+   else {

+      if (!st->feedback_stage)

+         st->feedback_stage = draw_glfeedback_stage(ctx, draw);

+      draw_set_rasterize_stage(draw, st->feedback_stage);

+      /* Plug in new vbo draw function */

+      vbo_set_draw_func(ctx, st_feedback_draw_vbo);

+      /* need to generate/use a vertex program that emits pos/color/tex */

+      st->dirty.st |= ST_NEW_VERTEX_PROGRAM;

+   }

+}

+

+

+

+void st_init_feedback_functions(struct dd_function_table *functions)

+{

+   functions->RenderMode = st_RenderMode;

+}

+

+#endif /* FEATURE_feedback */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_feedback.h b/mesalib/src/mesa/state_tracker/st_cb_feedback.h
new file mode 100644
index 000000000..761542dcd
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_feedback.h
@@ -0,0 +1,51 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_FEEDBACK_H

+#define ST_CB_FEEDBACK_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+

+#if FEATURE_feedback

+

+extern void

+st_init_feedback_functions(struct dd_function_table *functions);

+

+#else

+

+static INLINE void

+st_init_feedback_functions(struct dd_function_table *functions)

+{

+}

+

+#endif /* FEATURE_feedback */

+

+#endif /* ST_CB_FEEDBACK_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_flush.c b/mesalib/src/mesa/state_tracker/st_cb_flush.c
new file mode 100644
index 000000000..31189f360
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_flush.c
@@ -0,0 +1,164 @@
+/**************************************************************************

+ * 

+ * 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/glheader.h"

+#include "main/macros.h"

+#include "main/context.h"

+#include "st_context.h"

+#include "st_cb_bitmap.h"

+#include "st_cb_flush.h"

+#include "st_cb_clear.h"

+#include "st_cb_fbo.h"

+#include "st_manager.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "pipe/p_screen.h"

+#include "util/u_gen_mipmap.h"

+#include "util/u_blit.h"

+

+

+/** Check if we have a front color buffer and if it's been drawn to. */

+static INLINE GLboolean

+is_front_buffer_dirty(struct st_context *st)

+{

+   struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+   struct st_renderbuffer *strb

+      = st_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);

+   return strb && strb->defined;

+}

+

+

+/**

+ * Tell the screen to display the front color buffer on-screen.

+ */

+static void

+display_front_buffer(struct st_context *st)

+{

+   struct gl_framebuffer *fb = st->ctx->DrawBuffer;

+   struct st_renderbuffer *strb

+      = st_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);

+

+   if (strb) {

+      /* Hook for copying "fake" frontbuffer if necessary:

+       */

+      st_manager_flush_frontbuffer(st);

+   }

+}

+

+

+void st_flush( struct st_context *st, uint pipeFlushFlags,

+               struct pipe_fence_handle **fence )

+{

+   FLUSH_CURRENT(st->ctx, 0);

+

+   /* Release any vertex buffers that might potentially be accessed in

+    * successive frames:

+    */

+   st_flush_bitmap(st);

+   st_flush_clear(st);

+   util_blit_flush(st->blit);

+   util_gen_mipmap_flush(st->gen_mipmap);

+

+   st->pipe->flush( st->pipe, pipeFlushFlags, fence );

+}

+

+

+/**

+ * Flush, and wait for completion.

+ */

+void st_finish( struct st_context *st )

+{

+   struct pipe_fence_handle *fence = NULL;

+

+   st_flush(st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, &fence);

+

+   if(fence) {

+      st->pipe->screen->fence_finish(st->pipe->screen, fence, 0);

+      st->pipe->screen->fence_reference(st->pipe->screen, &fence, NULL);

+   }

+}

+

+

+

+/**

+ * Called via ctx->Driver.Flush()

+ */

+static void st_glFlush(struct gl_context *ctx)

+{

+   struct st_context *st = st_context(ctx);

+

+   /* Don't call st_finish() here.  It is not the state tracker's

+    * responsibilty to inject sleeps in the hope of avoiding buffer

+    * synchronization issues.  Calling finish() here will just hide

+    * problems that need to be fixed elsewhere.

+    */

+   st_flush(st, PIPE_FLUSH_RENDER_CACHE | PIPE_FLUSH_FRAME, NULL);

+

+   if (is_front_buffer_dirty(st)) {

+      display_front_buffer(st);

+   }

+}

+

+

+/**

+ * Called via ctx->Driver.Finish()

+ */

+static void st_glFinish(struct gl_context *ctx)

+{

+   struct st_context *st = st_context(ctx);

+

+   st_finish(st);

+

+   if (is_front_buffer_dirty(st)) {

+      display_front_buffer(st);

+   }

+}

+

+

+void st_init_flush_functions(struct dd_function_table *functions)

+{

+   functions->Flush = st_glFlush;

+   functions->Finish = st_glFinish;

+

+   /* Windows opengl32.dll calls glFinish prior to every swapbuffers.

+    * This is unnecessary and degrades performance.  Luckily we have some

+    * scope to work around this, as the externally-visible behaviour of

+    * Finish() is identical to Flush() in all cases - no differences in

+    * rendering or ReadPixels are visible if we opt not to wait here.

+    *

+    * Only set this up on windows to avoid suprise elsewhere.

+    */

+#ifdef PIPE_OS_WINDOWS

+   functions->Finish = st_glFlush;

+#endif

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_flush.h b/mesalib/src/mesa/state_tracker/st_cb_flush.h
new file mode 100644
index 000000000..234713675
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_flush.h
@@ -0,0 +1,51 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_FLUSH_H

+#define ST_CB_FLUSH_H

+

+

+#include "pipe/p_compiler.h"

+

+struct dd_function_table;

+struct pipe_fence_handle;

+struct st_context;

+

+extern void

+st_init_flush_functions(struct dd_function_table *functions);

+

+extern void

+st_flush(struct st_context *st, uint pipeFlushFlags,

+         struct pipe_fence_handle **fence);

+

+extern void

+st_finish(struct st_context *st);

+

+

+#endif /* ST_CB_FLUSH_H */

+

diff --git a/mesalib/src/mesa/state_tracker/st_cb_program.c b/mesalib/src/mesa/state_tracker/st_cb_program.c
new file mode 100644
index 000000000..5096528a3
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_program.c
@@ -0,0 +1,245 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  */

+

+#include "main/glheader.h"

+#include "main/macros.h"

+#include "main/enums.h"

+#include "main/shaderapi.h"

+#include "program/prog_instruction.h"

+#include "program/program.h"

+

+#include "cso_cache/cso_context.h"

+#include "draw/draw_context.h"

+

+#include "st_context.h"

+#include "st_program.h"

+#include "st_mesa_to_tgsi.h"

+#include "st_cb_program.h"

+

+

+

+/**

+ * Called via ctx->Driver.BindProgram() to bind an ARB vertex or

+ * fragment program.

+ */

+static void

+st_bind_program(struct gl_context *ctx, GLenum target, struct gl_program *prog)

+{

+   struct st_context *st = st_context(ctx);

+

+   switch (target) {

+   case GL_VERTEX_PROGRAM_ARB: 

+      st->dirty.st |= ST_NEW_VERTEX_PROGRAM;

+      break;

+   case GL_FRAGMENT_PROGRAM_ARB:

+      st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;

+      break;

+   }

+}

+

+

+/**

+ * Called via ctx->Driver.UseProgram() to bind a linked GLSL program

+ * (vertex shader + fragment shader).

+ */

+static void

+st_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)

+{

+   struct st_context *st = st_context(ctx);

+

+   st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;

+   st->dirty.st |= ST_NEW_VERTEX_PROGRAM;

+   st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;

+}

+

+

+/**

+ * Called via ctx->Driver.NewProgram() to allocate a new vertex or

+ * fragment program.

+ */

+static struct gl_program *

+st_new_program(struct gl_context *ctx, GLenum target, GLuint id)

+{

+   switch (target) {

+   case GL_VERTEX_PROGRAM_ARB: {

+      struct st_vertex_program *prog = ST_CALLOC_STRUCT(st_vertex_program);

+      return _mesa_init_vertex_program(ctx, &prog->Base, target, id);

+   }

+

+   case GL_FRAGMENT_PROGRAM_ARB:

+   case GL_FRAGMENT_PROGRAM_NV: {

+      struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program);

+      return _mesa_init_fragment_program(ctx, &prog->Base, target, id);

+   }

+

+   case MESA_GEOMETRY_PROGRAM: {

+      struct st_geometry_program *prog = ST_CALLOC_STRUCT(st_geometry_program);

+      return _mesa_init_geometry_program(ctx, &prog->Base, target, id);

+   }

+

+   default:

+      assert(0);

+      return NULL;

+   }

+}

+

+

+/**

+ * Called via ctx->Driver.DeleteProgram()

+ */

+static void

+st_delete_program(struct gl_context *ctx, struct gl_program *prog)

+{

+   struct st_context *st = st_context(ctx);

+

+   switch( prog->Target ) {

+   case GL_VERTEX_PROGRAM_ARB:

+      {

+         struct st_vertex_program *stvp = (struct st_vertex_program *) prog;

+         st_release_vp_variants( st, stvp );

+      }

+      break;

+   case MESA_GEOMETRY_PROGRAM:

+      {

+         struct st_geometry_program *stgp =

+            (struct st_geometry_program *) prog;

+

+         st_release_gp_variants(st, stgp);

+

+         if (stgp->tgsi.tokens) {

+            st_free_tokens((void *) stgp->tgsi.tokens);

+            stgp->tgsi.tokens = NULL;

+         }

+      }

+      break;

+   case GL_FRAGMENT_PROGRAM_ARB:

+      {

+         struct st_fragment_program *stfp =

+            (struct st_fragment_program *) prog;

+

+         st_release_fp_variants(st, stfp);

+         

+         if (stfp->tgsi.tokens) {

+            st_free_tokens(stfp->tgsi.tokens);

+            stfp->tgsi.tokens = NULL;

+         }

+      }

+      break;

+   default:

+      assert(0); /* problem */

+   }

+

+   /* delete base class */

+   _mesa_delete_program( ctx, prog );

+}

+

+

+/**

+ * Called via ctx->Driver.IsProgramNative()

+ */

+static GLboolean

+st_is_program_native(struct gl_context *ctx,

+                     GLenum target, 

+                     struct gl_program *prog)

+{

+   return GL_TRUE;

+}

+

+

+/**

+ * Called via ctx->Driver.ProgramStringNotify()

+ * Called when the program's text/code is changed.  We have to free

+ * all shader variants and corresponding gallium shaders when this happens.

+ */

+static GLboolean

+st_program_string_notify( struct gl_context *ctx,

+                                           GLenum target,

+                                           struct gl_program *prog )

+{

+   struct st_context *st = st_context(ctx);

+

+   if (target == GL_FRAGMENT_PROGRAM_ARB) {

+      struct st_fragment_program *stfp = (struct st_fragment_program *) prog;

+

+      st_release_fp_variants(st, stfp);

+

+      if (stfp->tgsi.tokens) {

+         st_free_tokens(stfp->tgsi.tokens);

+         stfp->tgsi.tokens = NULL;

+      }

+

+      if (st->fp == stfp)

+	 st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;

+   }

+   else if (target == MESA_GEOMETRY_PROGRAM) {

+      struct st_geometry_program *stgp = (struct st_geometry_program *) prog;

+

+      st_release_gp_variants(st, stgp);

+

+      if (stgp->tgsi.tokens) {

+         st_free_tokens((void *) stgp->tgsi.tokens);

+         stgp->tgsi.tokens = NULL;

+      }

+

+      if (st->gp == stgp)

+	 st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;

+   }

+   else if (target == GL_VERTEX_PROGRAM_ARB) {

+      struct st_vertex_program *stvp = (struct st_vertex_program *) prog;

+

+      st_release_vp_variants( st, stvp );

+

+      if (st->vp == stvp)

+	 st->dirty.st |= ST_NEW_VERTEX_PROGRAM;

+   }

+

+   /* XXX check if program is legal, within limits */

+   return GL_TRUE;

+}

+

+

+/**

+ * Plug in the program and shader-related device driver functions.

+ */

+void

+st_init_program_functions(struct dd_function_table *functions)

+{

+   functions->BindProgram = st_bind_program;

+   functions->UseProgram = st_use_program;

+   functions->NewProgram = st_new_program;

+   functions->DeleteProgram = st_delete_program;

+   functions->IsProgramNative = st_is_program_native;

+   functions->ProgramStringNotify = st_program_string_notify;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_program.h b/mesalib/src/mesa/state_tracker/st_cb_program.h
new file mode 100644
index 000000000..05d03e1e6
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_program.h
@@ -0,0 +1,38 @@
+/**************************************************************************

+ *

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

+ *

+ **************************************************************************/

+

+#ifndef ST_CB_PROGRAM_H

+#define ST_CB_PROGRAM_H

+

+

+struct dd_function_table;

+

+extern void

+st_init_program_functions(struct dd_function_table *functions);

+

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
new file mode 100644
index 000000000..c589d7568
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
@@ -0,0 +1,176 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+/**

+ * glBegin/EndQuery interface to pipe

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/imports.h"

+#include "main/context.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "st_context.h"

+#include "st_cb_queryobj.h"

+

+

+#if FEATURE_queryobj

+

+static struct gl_query_object *

+st_NewQueryObject(struct gl_context *ctx, GLuint id)

+{

+   struct st_query_object *stq = ST_CALLOC_STRUCT(st_query_object);

+   if (stq) {

+      stq->base.Id = id;

+      stq->base.Ready = GL_TRUE;

+      stq->pq = NULL;

+      stq->type = PIPE_QUERY_TYPES; /* an invalid value */

+      return &stq->base;

+   }

+   return NULL;

+}

+

+

+

+static void

+st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_query_object *stq = st_query_object(q);

+

+   if (stq->pq) {

+      pipe->destroy_query(pipe, stq->pq);

+      stq->pq = NULL;

+   }

+

+   free(stq);

+}

+

+

+static void

+st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_query_object *stq = st_query_object(q);

+   unsigned type;

+

+   /* convert GL query type to Gallium query type */

+   switch (q->Target) {

+   case GL_SAMPLES_PASSED_ARB:

+      type = PIPE_QUERY_OCCLUSION_COUNTER;

+      break;

+   case GL_PRIMITIVES_GENERATED:

+      type = PIPE_QUERY_PRIMITIVES_GENERATED;

+      break;

+   case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

+      type = PIPE_QUERY_PRIMITIVES_EMITTED;

+      break;

+   case GL_TIME_ELAPSED_EXT:

+      type = PIPE_QUERY_TIME_ELAPSED;

+      break;

+   default:

+      assert(0 && "unexpected query target in st_BeginQuery()");

+      return;

+   }

+

+   if (stq->pq && stq->type != type) {

+      /* free old query of different type */

+      pipe->destroy_query(pipe, stq->pq);

+      stq->pq = NULL;

+      stq->type = PIPE_QUERY_TYPES; /* an invalid value */

+   }

+

+   if (!stq->pq) {

+      stq->pq = pipe->create_query(pipe, type);

+      stq->type = type;

+   }

+

+   assert(stq->type == type);

+

+   pipe->begin_query(pipe, stq->pq);

+}

+

+

+static void

+st_EndQuery(struct gl_context *ctx, struct gl_query_object *q)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_query_object *stq = st_query_object(q);

+

+   pipe->end_query(pipe, stq->pq);

+}

+

+

+static void

+st_WaitQuery(struct gl_context *ctx, struct gl_query_object *q)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_query_object *stq = st_query_object(q);

+

+   /* this function should only be called if we don't have a ready result */

+   assert(!stq->base.Ready);

+

+   while (!stq->base.Ready &&

+	  !pipe->get_query_result(pipe, 

+				  stq->pq,

+				  TRUE,

+				  &q->Result))

+   {

+      /* nothing */

+   }

+			    

+   q->Ready = GL_TRUE;

+}

+

+

+static void

+st_CheckQuery(struct gl_context *ctx, struct gl_query_object *q)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct st_query_object *stq = st_query_object(q);

+   assert(!q->Ready);   /* we should not get called if Ready is TRUE */

+   q->Ready = pipe->get_query_result(pipe, stq->pq, FALSE, &q->Result);

+}

+

+

+

+

+void st_init_query_functions(struct dd_function_table *functions)

+{

+   functions->NewQueryObject = st_NewQueryObject;

+   functions->DeleteQuery = st_DeleteQuery;

+   functions->BeginQuery = st_BeginQuery;

+   functions->EndQuery = st_EndQuery;

+   functions->WaitQuery = st_WaitQuery;

+   functions->CheckQuery = st_CheckQuery;

+}

+

+#endif /* FEATURE_queryobj */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.h b/mesalib/src/mesa/state_tracker/st_cb_queryobj.h
new file mode 100644
index 000000000..c755211b2
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.h
@@ -0,0 +1,69 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+#ifndef ST_CB_QUERYOBJ_H

+#define ST_CB_QUERYOBJ_H

+

+

+#include "main/mtypes.h"

+

+/**

+ * Subclass of gl_query_object

+ */

+struct st_query_object

+{

+   struct gl_query_object base;

+   struct pipe_query *pq;

+   unsigned type;  /**< PIPE_QUERY_x */

+};

+

+

+/**

+ * Cast wrapper

+ */

+static INLINE struct st_query_object *

+st_query_object(struct gl_query_object *q)

+{

+   return (struct st_query_object *) q;

+}

+

+

+#if FEATURE_queryobj

+

+extern void

+st_init_query_functions(struct dd_function_table *functions);

+

+#else

+

+static INLINE void

+st_init_query_functions(struct dd_function_table *functions)

+{

+}

+

+#endif /* FEATURE_queryobj */

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c
new file mode 100644
index 000000000..873560f45
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -0,0 +1,271 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+/**

+ * glRasterPos implementation.  Basically render a GL_POINT with our

+ * private draw module.  Plug in a special "rasterpos" stage at the end

+ * of the 'draw' pipeline to capture the results and update the current

+ * raster pos attributes.

+ *

+ * Authors:

+ *   Brian Paul

+ */

+

+

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/feedback.h"

+

+#include "st_context.h"

+#include "st_atom.h"

+#include "st_draw.h"

+#include "st_cb_rasterpos.h"

+#include "draw/draw_context.h"

+#include "draw/draw_pipe.h"

+#include "vbo/vbo.h"

+

+

+#if FEATURE_rastpos

+

+/**

+ * Our special drawing pipeline stage (replaces rasterization).

+ */

+struct rastpos_stage

+{

+   struct draw_stage stage;   /**< Base class */

+   struct gl_context *ctx;            /**< Rendering context */

+

+   /* vertex attrib info we can setup once and re-use */

+   struct gl_client_array array[VERT_ATTRIB_MAX];

+   const struct gl_client_array *arrays[VERT_ATTRIB_MAX];

+   struct _mesa_prim prim;

+};

+

+

+static INLINE struct rastpos_stage *

+rastpos_stage( struct draw_stage *stage )

+{

+   return (struct rastpos_stage *) stage;

+}

+

+static void

+rastpos_flush( struct draw_stage *stage, unsigned flags )

+{

+   /* no-op */

+}

+

+static void

+rastpos_reset_stipple_counter( struct draw_stage *stage )

+{

+   /* no-op */

+}

+

+static void

+rastpos_tri( struct draw_stage *stage, struct prim_header *prim )

+{

+   /* should never get here */

+   assert(0);

+}

+

+static void

+rastpos_line( struct draw_stage *stage, struct prim_header *prim )

+{

+   /* should never get here */

+   assert(0);

+}

+

+static void

+rastpos_destroy(struct draw_stage *stage)

+{

+   free(stage);

+}

+

+

+/**

+ * Update a raster pos attribute from the vertex result if it's present,

+ * else copy the current attrib.

+ */

+static void

+update_attrib(struct gl_context *ctx, const GLuint *outputMapping,

+              const struct vertex_header *vert,

+              GLfloat *dest,

+              GLuint result, GLuint defaultAttrib)

+{

+   const GLfloat *src;

+   const GLuint k = outputMapping[result];

+   if (k != ~0U)

+      src = vert->data[k];

+   else

+      src = ctx->Current.Attrib[defaultAttrib];

+   COPY_4V(dest, src);

+}

+

+

+/**

+ * Normally, this function would render a GL_POINT.

+ */

+static void

+rastpos_point(struct draw_stage *stage, struct prim_header *prim)

+{

+   struct rastpos_stage *rs = rastpos_stage(stage);

+   struct gl_context *ctx = rs->ctx;

+   struct st_context *st = st_context(ctx);

+   const GLfloat height = (GLfloat) ctx->DrawBuffer->Height;

+   const GLuint *outputMapping = st->vertex_result_to_slot;

+   const GLfloat *pos;

+   GLuint i;

+

+   /* if we get here, we didn't get clipped */

+   ctx->Current.RasterPosValid = GL_TRUE;

+

+   /* update raster pos */

+   pos = prim->v[0]->data[0];

+   ctx->Current.RasterPos[0] = pos[0];

+   if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP)

+      ctx->Current.RasterPos[1] = height - pos[1]; /* invert Y */

+   else

+      ctx->Current.RasterPos[1] = pos[1];

+   ctx->Current.RasterPos[2] = pos[2];

+   ctx->Current.RasterPos[3] = pos[3];

+

+   /* update other raster attribs */

+   update_attrib(ctx, outputMapping, prim->v[0],

+                 ctx->Current.RasterColor,

+                 VERT_RESULT_COL0, VERT_ATTRIB_COLOR0);

+

+   update_attrib(ctx, outputMapping, prim->v[0],

+                 ctx->Current.RasterSecondaryColor,

+                 VERT_RESULT_COL1, VERT_ATTRIB_COLOR1);

+

+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {

+      update_attrib(ctx, outputMapping, prim->v[0],

+                    ctx->Current.RasterTexCoords[i],

+                    VERT_RESULT_TEX0 + i, VERT_ATTRIB_TEX0 + i);

+   }

+

+   if (ctx->RenderMode == GL_SELECT) {

+      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );

+   }

+}

+

+

+/**

+ * Create rasterpos "drawing" stage.

+ */

+static struct rastpos_stage *

+new_draw_rastpos_stage(struct gl_context *ctx, struct draw_context *draw)

+{

+   struct rastpos_stage *rs = ST_CALLOC_STRUCT(rastpos_stage);

+   GLuint i;

+

+   rs->stage.draw = draw;

+   rs->stage.next = NULL;

+   rs->stage.point = rastpos_point;

+   rs->stage.line = rastpos_line;

+   rs->stage.tri = rastpos_tri;

+   rs->stage.flush = rastpos_flush;

+   rs->stage.destroy = rastpos_destroy;

+   rs->stage.reset_stipple_counter = rastpos_reset_stipple_counter;

+   rs->stage.destroy = rastpos_destroy;

+   rs->ctx = ctx;

+

+   for (i = 0; i < Elements(rs->array); i++) {

+      rs->array[i].Size = 4;

+      rs->array[i].Type = GL_FLOAT;

+      rs->array[i].Format = GL_RGBA;

+      rs->array[i].Stride = 0;

+      rs->array[i].StrideB = 0;

+      rs->array[i].Ptr = (GLubyte *) ctx->Current.Attrib[i];

+      rs->array[i].Enabled = GL_TRUE;

+      rs->array[i].Normalized = GL_TRUE;

+      rs->array[i].BufferObj = NULL;

+      rs->arrays[i] = &rs->array[i];

+   }

+

+   rs->prim.mode = GL_POINTS;

+   rs->prim.indexed = 0;

+   rs->prim.begin = 1;

+   rs->prim.end = 1;

+   rs->prim.weak = 0;

+   rs->prim.start = 0;

+   rs->prim.count = 1;

+

+   return rs;

+}

+

+

+static void

+st_RasterPos(struct gl_context *ctx, const GLfloat v[4])

+{

+   struct st_context *st = st_context(ctx);

+   struct draw_context *draw = st->draw;

+   struct rastpos_stage *rs;

+

+   if (st->rastpos_stage) {

+      /* get rastpos stage info */

+      rs = rastpos_stage(st->rastpos_stage);

+   }

+   else {

+      /* create rastpos draw stage */

+      rs = new_draw_rastpos_stage(ctx, draw);

+      st->rastpos_stage = &rs->stage;

+   }

+

+   /* plug our rastpos stage into the draw module */

+   draw_set_rasterize_stage(st->draw, st->rastpos_stage);

+

+   /* make sure everything's up to date */

+   st_validate_state(st);

+

+   /* This will get set only if rastpos_point(), above, gets called */

+   ctx->Current.RasterPosValid = GL_FALSE;

+

+   /* All vertex attribs but position were previously initialized above.

+    * Just plug in position pointer now.

+    */

+   rs->array[0].Ptr = (GLubyte *) v;

+

+   /* draw the point */

+   st_feedback_draw_vbo(ctx, rs->arrays, &rs->prim, 1, NULL, GL_TRUE, 0, 1);

+

+   /* restore draw's rasterization stage depending on rendermode */

+   if (ctx->RenderMode == GL_FEEDBACK) {

+      draw_set_rasterize_stage(draw, st->feedback_stage);

+   }

+   else if (ctx->RenderMode == GL_SELECT) {

+      draw_set_rasterize_stage(draw, st->selection_stage);

+   }

+}

+

+

+

+void st_init_rasterpos_functions(struct dd_function_table *functions)

+{

+   functions->RasterPos = st_RasterPos;

+}

+

+#endif /* FEATURE_rastpos */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h
new file mode 100644
index 000000000..35fe92046
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.h
@@ -0,0 +1,49 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+#ifndef ST_CB_RASTERPOS_H

+#define ST_CB_RASTERPOS_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+

+#if FEATURE_rastpos

+

+extern void st_init_rasterpos_functions(struct dd_function_table *functions);

+

+#else

+

+static INLINE void

+st_init_rasterpos_functions(struct dd_function_table *functions)

+{

+}

+

+#endif /* FEATURE_rastpos */

+

+#endif /* ST_CB_RASTERPOS_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_readpixels.c b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
new file mode 100644
index 000000000..a03e53a50
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_readpixels.c
@@ -0,0 +1,554 @@
+/**************************************************************************

+ * 

+ * 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 "pipe/p_context.h"

+#include "pipe/p_defines.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];

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

+

+   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 (format == GL_RGBA && type == GL_FLOAT) {

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

+   }

+

+   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 (trans->resource->format == PIPE_FORMAT_Z24_UNORM_S8_USCALED ||

+          trans->resource->format == 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 (trans->resource->format == PIPE_FORMAT_S8_USCALED_Z24_UNORM ||

+               trans->resource->format == 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 (trans->resource->format == 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 (trans->resource->format == 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(pipe, trans, 0, y, width, 1, 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_cb_readpixels.h b/mesalib/src/mesa/state_tracker/st_cb_readpixels.h
new file mode 100644
index 000000000..fba1a6540
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_readpixels.h
@@ -0,0 +1,52 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_READPIXELS_H

+#define ST_CB_READPIXELS_H

+

+#include "main/glheader.h"

+

+struct dd_function_table;

+struct gl_context;

+struct gl_pixelstore_attrib;

+

+extern struct st_renderbuffer *

+st_get_color_read_renderbuffer(struct gl_context *ctx);

+

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

+

+extern void

+st_init_readpixels_functions(struct dd_function_table *functions);

+

+

+#endif /* ST_CB_READPIXELS_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_strings.c b/mesalib/src/mesa/state_tracker/st_cb_strings.c
new file mode 100644
index 000000000..b382273ea
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_strings.c
@@ -0,0 +1,73 @@
+/**************************************************************************

+ * 

+ * 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/glheader.h"

+#include "main/macros.h"

+#include "pipe/p_context.h"

+#include "pipe/p_screen.h"

+#include "util/u_string.h"

+#include "st_context.h"

+#include "st_cb_strings.h"

+

+#define ST_VERSION_STRING "0.4"

+

+static const GLubyte *

+st_get_string(struct gl_context * ctx, GLenum name)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_screen *screen = st->pipe->screen;

+

+   switch (name) {

+   case GL_VENDOR: {

+      const char *vendor = screen->get_vendor( screen );

+      util_snprintf(st->vendor, sizeof(st->vendor), "%s", vendor);

+      return (GLubyte *) st->vendor;

+   }

+

+   case GL_RENDERER:

+      util_snprintf(st->renderer, sizeof(st->renderer), "Gallium %s on %s", 

+               ST_VERSION_STRING,

+	       screen->get_name( screen ));

+

+      return (GLubyte *) st->renderer;

+

+   default:

+      return NULL;

+   }

+}

+

+

+void st_init_string_functions(struct dd_function_table *functions)

+{

+   functions->GetString = st_get_string;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_strings.h b/mesalib/src/mesa/state_tracker/st_cb_strings.h
new file mode 100644
index 000000000..5b4fc2a72
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_strings.h
@@ -0,0 +1,40 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_STRINGS_H

+#define ST_CB_STRINGS_H

+

+

+struct dd_function_table;

+

+extern void

+st_init_string_functions(struct dd_function_table *functions);

+

+

+#endif /* ST_CB_CLEAR_H */

+

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
new file mode 100644
index 000000000..0bd312154
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -0,0 +1,2016 @@
+/**************************************************************************

+ * 

+ * 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/mfeatures.h"

+#include "main/bufferobj.h"

+#include "main/enums.h"

+#include "main/fbobject.h"

+#include "main/formats.h"

+#include "main/image.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/mipmap.h"

+#include "main/pack.h"

+#include "main/pixeltransfer.h"

+#include "main/texcompress.h"

+#include "main/texfetch.h"

+#include "main/texgetimage.h"

+#include "main/teximage.h"

+#include "main/texobj.h"

+#include "main/texstore.h"

+

+#include "state_tracker/st_debug.h"

+#include "state_tracker/st_context.h"

+#include "state_tracker/st_cb_fbo.h"

+#include "state_tracker/st_cb_flush.h"

+#include "state_tracker/st_cb_texture.h"

+#include "state_tracker/st_format.h"

+#include "state_tracker/st_texture.h"

+#include "state_tracker/st_gen_mipmap.h"

+#include "state_tracker/st_atom.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_tile.h"

+#include "util/u_blit.h"

+#include "util/u_format.h"

+#include "util/u_surface.h"

+#include "util/u_sampler.h"

+#include "util/u_math.h"

+#include "util/u_box.h"

+

+#define DBG if (0) printf

+

+

+static enum pipe_texture_target

+gl_target_to_pipe(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+      return PIPE_TEXTURE_1D;

+

+   case GL_TEXTURE_2D:

+      return PIPE_TEXTURE_2D;

+

+   case GL_TEXTURE_RECTANGLE_NV:

+      return PIPE_TEXTURE_RECT;

+

+   case GL_TEXTURE_3D:

+      return PIPE_TEXTURE_3D;

+

+   case GL_TEXTURE_CUBE_MAP_ARB:

+      return PIPE_TEXTURE_CUBE;

+

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+

+/** called via ctx->Driver.NewTextureImage() */

+static struct gl_texture_image *

+st_NewTextureImage(struct gl_context * ctx)

+{

+   DBG("%s\n", __FUNCTION__);

+   (void) ctx;

+   return (struct gl_texture_image *) ST_CALLOC_STRUCT(st_texture_image);

+}

+

+

+/** called via ctx->Driver.NewTextureObject() */

+static struct gl_texture_object *

+st_NewTextureObject(struct gl_context * ctx, GLuint name, GLenum target)

+{

+   struct st_texture_object *obj = ST_CALLOC_STRUCT(st_texture_object);

+

+   DBG("%s\n", __FUNCTION__);

+   _mesa_initialize_texture_object(&obj->base, name, target);

+

+   return &obj->base;

+}

+

+/** called via ctx->Driver.DeleteTextureObject() */

+static void 

+st_DeleteTextureObject(struct gl_context *ctx,

+                       struct gl_texture_object *texObj)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   if (stObj->pt)

+      pipe_resource_reference(&stObj->pt, NULL);

+   if (stObj->sampler_view) {

+      if (stObj->sampler_view->context != st->pipe) {

+         /* Take "ownership" of this texture sampler view by setting

+          * its context pointer to this context.  This avoids potential

+          * crashes when the texture object is shared among contexts

+          * and the original/owner context has already been destroyed.

+          */

+         stObj->sampler_view->context = st->pipe;

+      }

+      pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+   }

+   _mesa_delete_texture_object(ctx, texObj);

+}

+

+

+/** called via ctx->Driver.FreeTexImageData() */

+static void

+st_FreeTextureImageData(struct gl_context * ctx, struct gl_texture_image *texImage)

+{

+   struct st_texture_image *stImage = st_texture_image(texImage);

+

+   DBG("%s\n", __FUNCTION__);

+

+   if (stImage->pt) {

+      pipe_resource_reference(&stImage->pt, NULL);

+   }

+

+   if (texImage->Data) {

+      _mesa_align_free(texImage->Data);

+      texImage->Data = NULL;

+   }

+}

+

+

+/**

+ * From linux kernel i386 header files, copes with odd sizes better

+ * than COPY_DWORDS would:

+ * XXX Put this in src/mesa/main/imports.h ???

+ */

+#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)

+static INLINE void *

+__memcpy(void *to, const void *from, size_t n)

+{

+   int d0, d1, d2;

+   __asm__ __volatile__("rep ; movsl\n\t"

+                        "testb $2,%b4\n\t"

+                        "je 1f\n\t"

+                        "movsw\n"

+                        "1:\ttestb $1,%b4\n\t"

+                        "je 2f\n\t"

+                        "movsb\n" "2:":"=&c"(d0), "=&D"(d1), "=&S"(d2)

+                        :"0"(n / 4), "q"(n), "1"((long) to), "2"((long) from)

+                        :"memory");

+   return (to);

+}

+#else

+#define __memcpy(a,b,c) memcpy(a,b,c)

+#endif

+

+

+/**

+ * The system memcpy (at least on ubuntu 5.10) has problems copying

+ * to agp (writecombined) memory from a source which isn't 64-byte

+ * aligned - there is a 4x performance falloff.

+ *

+ * The x86 __memcpy is immune to this but is slightly slower

+ * (10%-ish) than the system memcpy.

+ *

+ * The sse_memcpy seems to have a slight cliff at 64/32 bytes, but

+ * isn't much faster than x86_memcpy for agp copies.

+ * 

+ * TODO: switch dynamically.

+ */

+static void *

+do_memcpy(void *dest, const void *src, size_t n)

+{

+   if ((((unsigned long) src) & 63) || (((unsigned long) dest) & 63)) {

+      return __memcpy(dest, src, n);

+   }

+   else

+      return memcpy(dest, src, n);

+}

+

+

+/**

+ * Return default texture resource binding bitmask for the given format.

+ */

+static GLuint

+default_bindings(struct st_context *st, enum pipe_format format)

+{

+   struct pipe_screen *screen = st->pipe->screen;

+   const unsigned target = PIPE_TEXTURE_2D;

+   const unsigned geom = 0x0;

+   unsigned bindings;

+

+   if (util_format_is_depth_or_stencil(format))

+      bindings = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_DEPTH_STENCIL;

+   else

+      bindings = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;

+

+   if (screen->is_format_supported(screen, format, target, 0, bindings, geom))

+      return bindings;

+   else

+      return PIPE_BIND_SAMPLER_VIEW;

+}

+

+

+/** Return number of image dimensions (1, 2 or 3) for a texture target. */

+static GLuint

+get_texture_dims(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      return 1;

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_CUBE_MAP_ARB:

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

+   case GL_TEXTURE_RECTANGLE_NV:

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      return 2;

+   case GL_TEXTURE_3D:

+      return 3;

+   default:

+      assert(0 && "invalid texture target in get_texture_dims()");

+      return 1;

+   }

+}

+

+

+/**

+ * Try to allocate a pipe_resource object for the given st_texture_object.

+ *

+ * We use the given st_texture_image as a clue to determine the size of the

+ * mipmap image at level=0.

+ *

+ * \return GL_TRUE for success, GL_FALSE if out of memory.

+ */

+static GLboolean

+guess_and_alloc_texture(struct st_context *st,

+			struct st_texture_object *stObj,

+			const struct st_texture_image *stImage)

+{

+   const GLuint dims = get_texture_dims(stObj->base.Target);

+   GLuint level, lastLevel, width, height, depth;

+   GLuint bindings;

+   enum pipe_format fmt;

+

+   DBG("%s\n", __FUNCTION__);

+

+   assert(!stObj->pt);

+

+   level = stImage->level;

+   width = stImage->base.Width2;  /* size w/out border */

+   height = stImage->base.Height2;

+   depth = stImage->base.Depth2;

+

+   assert(width > 0);

+   assert(height > 0);

+   assert(depth > 0);

+

+   /* Depending on the image's size, we can't always make a guess here.

+    */

+   if (level > 0) {

+      if ( (dims >= 1 && width == 1) ||

+           (dims >= 2 && height == 1) ||

+           (dims >= 3 && depth == 1) ) {

+         /* we can't determine the image size at level=0 */

+         stObj->width0 = stObj->height0 = stObj->depth0 = 0;

+         /* this is not an out of memory error */

+         return GL_TRUE;

+      }

+   }

+

+   /* grow the image size until we hit level = 0 */

+   while (level > 0) {

+      if (width != 1)

+         width <<= 1;

+      if (height != 1)

+         height <<= 1;

+      if (depth != 1)

+         depth <<= 1;

+      level--;

+   }      

+

+   assert(level == 0);

+

+   /* At this point, (width x height x depth) is the expected size of

+    * the level=0 mipmap image.

+    */

+

+   /* Guess a reasonable value for lastLevel.  With OpenGL we have no

+    * idea how many mipmap levels will be in a texture until we start

+    * to render with it.  Make an educated guess here but be prepared

+    * to re-allocating a texture buffer with space for more (or fewer)

+    * mipmap levels later.

+    */

+   if ((stObj->base.MinFilter == GL_NEAREST ||

+        stObj->base.MinFilter == GL_LINEAR ||

+        stImage->base._BaseFormat == GL_DEPTH_COMPONENT ||

+        stImage->base._BaseFormat == GL_DEPTH_STENCIL_EXT) &&

+       !stObj->base.GenerateMipmap &&

+       stImage->level == 0) {

+      /* only alloc space for a single mipmap level */

+      lastLevel = 0;

+   }

+   else {

+      /* alloc space for a full mipmap */

+      GLuint l2width = util_logbase2(width);

+      GLuint l2height = util_logbase2(height);

+      GLuint l2depth = util_logbase2(depth);

+      lastLevel = MAX2(MAX2(l2width, l2height), l2depth);

+   }

+

+   /* Save the level=0 dimensions */

+   stObj->width0 = width;

+   stObj->height0 = height;

+   stObj->depth0 = depth;

+

+   fmt = st_mesa_format_to_pipe_format(stImage->base.TexFormat);

+

+   bindings = default_bindings(st, fmt);

+

+   stObj->pt = st_texture_create(st,

+                                 gl_target_to_pipe(stObj->base.Target),

+                                 fmt,

+                                 lastLevel,

+                                 width,

+                                 height,

+                                 depth,

+                                 bindings);

+

+   DBG("%s returning %d\n", __FUNCTION__, (stObj->pt != NULL));

+

+   return stObj->pt != NULL;

+}

+

+

+/**

+ * Adjust pixel unpack params and image dimensions to strip off the

+ * texture border.

+ * Gallium doesn't support texture borders.  They've seldem been used

+ * and seldom been implemented correctly anyway.

+ * \param unpackNew  returns the new pixel unpack parameters

+ */

+static void

+strip_texture_border(GLint border,

+                     GLint *width, GLint *height, GLint *depth,

+                     const struct gl_pixelstore_attrib *unpack,

+                     struct gl_pixelstore_attrib *unpackNew)

+{

+   assert(border > 0);  /* sanity check */

+

+   *unpackNew = *unpack;

+

+   if (unpackNew->RowLength == 0)

+      unpackNew->RowLength = *width;

+

+   if (depth && unpackNew->ImageHeight == 0)

+      unpackNew->ImageHeight = *height;

+

+   unpackNew->SkipPixels += border;

+   if (height)

+      unpackNew->SkipRows += border;

+   if (depth)

+      unpackNew->SkipImages += border;

+

+   assert(*width >= 3);

+   *width = *width - 2 * border;

+   if (height && *height >= 3)

+      *height = *height - 2 * border;

+   if (depth && *depth >= 3)

+      *depth = *depth - 2 * border;

+}

+

+

+/**

+ * Try to do texture compression via rendering.  If the Gallium driver

+ * can render into a compressed surface this will allow us to do texture

+ * compression.

+ * \return GL_TRUE for success, GL_FALSE for failure

+ */

+static GLboolean

+compress_with_blit(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 void *pixels,

+                   const struct gl_pixelstore_attrib *unpack,

+                   struct gl_texture_image *texImage)

+{

+   const GLuint dstImageOffsets[1] = {0};

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = pipe->screen;

+   gl_format mesa_format;

+   struct pipe_resource templ;

+   struct pipe_resource *src_tex;

+   struct pipe_sampler_view view_templ;

+   struct pipe_sampler_view *src_view;

+   struct pipe_surface *dst_surface, surf_tmpl;

+   struct pipe_transfer *tex_xfer;

+   void *map;

+

+   if (!stImage->pt) {

+      /* XXX: Can this happen? Should we assert? */

+      return GL_FALSE;

+   }

+

+   /* get destination surface (in the compressed texture) */

+   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+   surf_tmpl.format = stImage->pt->format;

+   surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

+   surf_tmpl.u.tex.level = stImage->level;

+   surf_tmpl.u.tex.first_layer = stImage->face;

+   surf_tmpl.u.tex.last_layer = stImage->face;

+   dst_surface = pipe->create_surface(pipe, stImage->pt, &surf_tmpl);

+   if (!dst_surface) {

+      /* can't render into this format (or other problem) */

+      return GL_FALSE;

+   }

+

+   /* Choose format for the temporary RGBA texture image.

+    */

+   mesa_format = st_ChooseTextureFormat(ctx, GL_RGBA, format, type);

+   assert(mesa_format);

+   if (!mesa_format)

+      return GL_FALSE;

+

+   /* Create the temporary source texture

+    */

+   memset(&templ, 0, sizeof(templ));

+   templ.target = st->internal_target;

+   templ.format = st_mesa_format_to_pipe_format(mesa_format);

+   templ.width0 = width;

+   templ.height0 = height;

+   templ.depth0 = 1;

+   templ.array_size = 1;

+   templ.last_level = 0;

+   templ.usage = PIPE_USAGE_DEFAULT;

+   templ.bind = PIPE_BIND_SAMPLER_VIEW;

+   src_tex = screen->resource_create(screen, &templ);

+

+   if (!src_tex)

+      return GL_FALSE;

+

+   /* Put user's tex data into the temporary texture

+    */

+   tex_xfer = pipe_get_transfer(st_context(ctx)->pipe, src_tex,

+                                0, 0, /* layer, level are zero */

+                                PIPE_TRANSFER_WRITE,

+                                0, 0, width, height); /* x, y, w, h */

+   map = pipe_transfer_map(pipe, tex_xfer);

+

+   _mesa_texstore(ctx, 2, GL_RGBA, mesa_format,

+                  map,              /* dest ptr */

+                  0, 0, 0,          /* dest x/y/z offset */

+                  tex_xfer->stride, /* dest row stride (bytes) */

+                  dstImageOffsets,  /* image offsets (for 3D only) */

+                  width, height, 1, /* size */

+                  format, type,     /* source format/type */

+                  pixels,           /* source data */

+                  unpack);          /* source data packing */

+

+   pipe_transfer_unmap(pipe, tex_xfer);

+   pipe->transfer_destroy(pipe, tex_xfer);

+

+   /* Create temporary sampler view */

+   u_sampler_view_default_template(&view_templ,

+                                   src_tex,

+                                   src_tex->format);

+   src_view = pipe->create_sampler_view(pipe, src_tex, &view_templ);

+

+

+   /* copy / compress image */

+   util_blit_pixels_tex(st->blit,

+                        src_view,         /* sampler view (src) */

+                        0, 0,             /* src x0, y0 */

+                        width, height,    /* src x1, y1 */

+                        dst_surface,      /* pipe_surface (dst) */

+                        xoffset, yoffset, /* dst x0, y0 */

+                        xoffset + width,  /* dst x1 */

+                        yoffset + height, /* dst y1 */

+                        0.0,              /* z */

+                        PIPE_TEX_MIPFILTER_NEAREST);

+

+   pipe_surface_reference(&dst_surface, NULL);

+   pipe_resource_reference(&src_tex, NULL);

+   pipe_sampler_view_reference(&src_view, NULL);

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do glTexImage1/2/3D().

+ */

+static void

+st_TexImage(struct gl_context * ctx,

+            GLint dims,

+            GLenum target, GLint level,

+            GLint internalFormat,

+            GLint width, GLint height, GLint depth,

+            GLint border,

+            GLenum format, GLenum type, const void *pixels,

+            const struct gl_pixelstore_attrib *unpack,

+            struct gl_texture_object *texObj,

+            struct gl_texture_image *texImage,

+            GLsizei imageSize, GLboolean compressed_src)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_screen *screen = st->pipe->screen;

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   GLuint dstRowStride = 0;

+   struct gl_pixelstore_attrib unpackNB;

+   enum pipe_transfer_usage transfer_usage = 0;

+

+   DBG("%s target %s level %d %dx%dx%d border %d\n", __FUNCTION__,

+       _mesa_lookup_enum_by_nr(target), level, width, height, depth, border);

+

+   /* switch to "normal" */

+   if (stObj->surface_based) {

+      gl_format texFormat;

+

+      _mesa_clear_texture_object(ctx, texObj);

+      pipe_resource_reference(&stObj->pt, NULL);

+

+      /* oops, need to init this image again */

+      texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,

+                                              internalFormat, format, type);

+

+      _mesa_init_teximage_fields(ctx, target, texImage,

+                                 width, height, depth, border,

+                                 internalFormat, texFormat);

+

+      stObj->surface_based = GL_FALSE;

+   }

+

+   /* gallium does not support texture borders, strip it off */

+   if (border) {

+      strip_texture_border(border, &width, &height, &depth, unpack, &unpackNB);

+      unpack = &unpackNB;

+      texImage->Width = width;

+      texImage->Height = height;

+      texImage->Depth = depth;

+      texImage->Border = 0;

+      border = 0;

+   }

+   else {

+      assert(texImage->Width == width);

+      assert(texImage->Height == height);

+      assert(texImage->Depth == depth);

+   }

+

+   stImage->face = _mesa_tex_target_to_face(target);

+   stImage->level = level;

+

+   _mesa_set_fetch_functions(texImage, dims);

+

+   /* Release the reference to a potentially orphaned buffer.   

+    * Release any old malloced memory.

+    */

+   if (stImage->pt) {

+      pipe_resource_reference(&stImage->pt, NULL);

+      assert(!texImage->Data);

+   }

+   else if (texImage->Data) {

+      _mesa_align_free(texImage->Data);

+   }

+

+   /*

+    * See if the new image is somehow incompatible with the existing

+    * mipmap.  If so, free the old mipmap.

+    */

+   if (stObj->pt) {

+      if (level > (GLint) stObj->pt->last_level ||

+          !st_texture_match_image(stObj->pt, &stImage->base,

+                                  stImage->face, stImage->level)) {

+         DBG("release it\n");

+         pipe_resource_reference(&stObj->pt, NULL);

+         assert(!stObj->pt);

+         pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+      }

+   }

+

+   if (width == 0 || height == 0 || depth == 0) {

+      /* stop after freeing old image */

+      return;

+   }

+

+   if (!stObj->pt) {

+      if (!guess_and_alloc_texture(st, stObj, stImage)) {

+         /* Probably out of memory.

+          * Try flushing any pending rendering, then retry.

+          */

+         st_finish(st);

+         if (!guess_and_alloc_texture(st, stObj, stImage)) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+            return;

+         }

+      }

+   }

+

+   assert(!stImage->pt);

+

+   /* Check if this texture image can live inside the texture object's buffer.

+    * If so, store the image there.  Otherwise the image will temporarily live

+    * in its own buffer.

+    */

+   if (stObj->pt &&

+       st_texture_match_image(stObj->pt, &stImage->base,

+                              stImage->face, stImage->level)) {

+

+      pipe_resource_reference(&stImage->pt, stObj->pt);

+      assert(stImage->pt);

+   }

+

+   if (!stImage->pt)

+      DBG("XXX: Image did not fit into texture - storing in local memory!\n");

+

+   /* Pixel data may come from regular user memory or a PBO.  For the later,

+    * do bounds checking and map the PBO to read pixels data from it.

+    *

+    * XXX we should try to use a GPU-accelerated path to copy the image data

+    * from the PBO to the texture.

+    */

+   if (compressed_src) {

+      pixels = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, pixels,

+						      unpack,

+						      "glCompressedTexImage");

+   }

+   else {

+      pixels = _mesa_validate_pbo_teximage(ctx, dims, width, height, 1,

+					   format, type,

+					   pixels, unpack, "glTexImage");

+   }

+

+   /* See if we can do texture compression with a blit/render.

+    */

+   if (!compressed_src &&

+       !ctx->Mesa_DXTn &&

+       _mesa_is_format_compressed(texImage->TexFormat) &&

+       screen->is_format_supported(screen,

+                                   stImage->pt->format,

+                                   stImage->pt->target, 0,

+                                   PIPE_BIND_RENDER_TARGET, 0)) {

+      if (!pixels)

+         goto done;

+

+      if (compress_with_blit(ctx, target, level, 0, 0, 0, width, height, depth,

+                             format, type, pixels, unpack, texImage)) {

+         goto done;

+      }

+   }

+

+   /*

+    * Prepare to store the texture data.  Either map the gallium texture buffer

+    * memory or malloc space for it.

+    */

+   if (stImage->pt) {

+      /* Store the image in the gallium texture memory buffer */

+      if (format == GL_DEPTH_COMPONENT &&

+          util_format_is_depth_and_stencil(stImage->pt->format))

+         transfer_usage = PIPE_TRANSFER_READ_WRITE;

+      else

+         transfer_usage = PIPE_TRANSFER_WRITE;

+

+      texImage->Data = st_texture_image_map(st, stImage, 0,

+                                            transfer_usage, 0, 0, width, height);

+      if(stImage->transfer)

+         dstRowStride = stImage->transfer->stride;

+   }

+   else {

+      /* Allocate regular memory and store the image there temporarily.   */

+      GLuint imageSize = _mesa_format_image_size(texImage->TexFormat,

+                                                 width, height, depth);

+      dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);

+

+      texImage->Data = _mesa_align_malloc(imageSize, 16);

+   }

+

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+      return;

+   }

+

+   if (!pixels) {

+      /* We've allocated texture memory, but have no pixel data - all done. */

+      goto done;

+   }

+

+   DBG("Upload image %dx%dx%d row_len %x pitch %x\n",

+       width, height, depth, width, dstRowStride);

+

+   /* Copy user texture image into the texture buffer.

+    */

+   if (compressed_src) {

+      const GLuint srcRowStride =

+         _mesa_format_row_stride(texImage->TexFormat, width);

+      if (dstRowStride == srcRowStride) {

+         memcpy(texImage->Data, pixels, imageSize);

+      }

+      else {

+         char *dst = texImage->Data;

+         const char *src = pixels;

+         GLuint i, bw, bh, lines;

+         _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);

+         lines = (height + bh - 1) / bh;

+

+         for (i = 0; i < lines; ++i) {

+            memcpy(dst, src, srcRowStride);

+            dst += dstRowStride;

+            src += srcRowStride;

+         }

+      }

+   }

+   else {

+      const GLuint srcImageStride =

+         _mesa_image_image_stride(unpack, width, height, format, type);

+      GLint i;

+      const GLubyte *src = (const GLubyte *) pixels;

+

+      for (i = 0; i < depth; i++) {

+	 if (!_mesa_texstore(ctx, dims, 

+                             texImage->_BaseFormat, 

+                             texImage->TexFormat, 

+                             texImage->Data,

+                             0, 0, 0, /* dstX/Y/Zoffset */

+                             dstRowStride,

+                             texImage->ImageOffsets,

+                             width, height, 1,

+                             format, type, src, unpack)) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+	 }

+

+	 if (stImage->pt && i + 1 < depth) {

+            /* unmap this slice */

+	    st_texture_image_unmap(st, stImage);

+            /* map next slice of 3D texture */

+	    texImage->Data = st_texture_image_map(st, stImage, i + 1,

+                                                  transfer_usage, 0, 0,

+                                                  width, height);

+	    src += srcImageStride;

+	 }

+      }

+   }

+

+done:

+   _mesa_unmap_teximage_pbo(ctx, unpack);

+

+   if (stImage->pt && texImage->Data) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+static void

+st_TexImage3D(struct gl_context * ctx,

+              GLenum target, GLint level,

+              GLint internalFormat,

+              GLint width, GLint height, GLint depth,

+              GLint border,

+              GLenum format, GLenum type, const void *pixels,

+              const struct gl_pixelstore_attrib *unpack,

+              struct gl_texture_object *texObj,

+              struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 3, target, level, internalFormat, width, height, depth,

+               border, format, type, pixels, unpack, texObj, texImage,

+               0, GL_FALSE);

+}

+

+

+static void

+st_TexImage2D(struct gl_context * ctx,

+              GLenum target, GLint level,

+              GLint internalFormat,

+              GLint width, GLint height, GLint border,

+              GLenum format, GLenum type, const void *pixels,

+              const struct gl_pixelstore_attrib *unpack,

+              struct gl_texture_object *texObj,

+              struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 2, target, level, internalFormat, width, height, 1, border,

+               format, type, pixels, unpack, texObj, texImage, 0, GL_FALSE);

+}

+

+

+static void

+st_TexImage1D(struct gl_context * ctx,

+              GLenum target, GLint level,

+              GLint internalFormat,

+              GLint width, GLint border,

+              GLenum format, GLenum type, const void *pixels,

+              const struct gl_pixelstore_attrib *unpack,

+              struct gl_texture_object *texObj,

+              struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 1, target, level, internalFormat, width, 1, 1, border,

+               format, type, pixels, unpack, texObj, texImage, 0, GL_FALSE);

+}

+

+

+static void

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

+{

+   st_TexImage(ctx, 2, target, level, internalFormat, width, height, 1, border,

+               0, 0, data, &ctx->Unpack, texObj, texImage, imageSize, GL_TRUE);

+}

+

+

+

+/**

+ * glGetTexImage() helper: decompress a compressed texture by rendering

+ * a textured quad.  Store the results in the user's buffer.

+ */

+static void

+decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,

+                     GLenum format, GLenum type, GLvoid *pixels,

+                     struct gl_texture_object *texObj,

+                     struct gl_texture_image *texImage)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   struct pipe_sampler_view *src_view =

+      st_get_texture_sampler_view(stObj, pipe);

+   const GLuint width = texImage->Width;

+   const GLuint height = texImage->Height;

+   struct pipe_surface *dst_surface;

+   struct pipe_resource *dst_texture;

+   struct pipe_transfer *tex_xfer;

+   unsigned bind = (PIPE_BIND_RENDER_TARGET | /* util_blit may choose to render */

+		    PIPE_BIND_TRANSFER_READ);

+

+   /* create temp / dest surface */

+   if (!util_create_rgba_surface(pipe, width, height, bind,

+                                 &dst_texture, &dst_surface)) {

+      _mesa_problem(ctx, "util_create_rgba_surface() failed "

+                    "in decompress_with_blit()");

+      return;

+   }

+

+   /* blit/render/decompress */

+   util_blit_pixels_tex(st->blit,

+                        src_view,      /* pipe_resource (src) */

+                        0, 0,             /* src x0, y0 */

+                        width, height,    /* src x1, y1 */

+                        dst_surface,      /* pipe_surface (dst) */

+                        0, 0,             /* dst x0, y0 */

+                        width, height,    /* dst x1, y1 */

+                        0.0,              /* z */

+                        PIPE_TEX_MIPFILTER_NEAREST);

+

+   /* map the dst_surface so we can read from it */

+   tex_xfer = pipe_get_transfer(st_context(ctx)->pipe,

+                                dst_texture, 0, 0,

+                                PIPE_TRANSFER_READ,

+                                0, 0, width, height);

+

+   pixels = _mesa_map_pbo_dest(ctx, &ctx->Pack, pixels);

+

+   /* copy/pack data into user buffer */

+   if (st_equal_formats(stImage->pt->format, format, type)) {

+      /* memcpy */

+      const uint bytesPerRow = width * util_format_get_blocksize(stImage->pt->format);

+      ubyte *map = pipe_transfer_map(pipe, tex_xfer);

+      GLuint row;

+      for (row = 0; row < height; row++) {

+         GLvoid *dest = _mesa_image_address2d(&ctx->Pack, pixels, width,

+                                              height, format, type, row, 0);

+         memcpy(dest, map, bytesPerRow);

+         map += tex_xfer->stride;

+      }

+      pipe_transfer_unmap(pipe, tex_xfer);

+   }

+   else {

+      /* format translation via floats */

+      GLuint row;

+      for (row = 0; row < height; row++) {

+         const GLbitfield transferOps = 0x0; /* bypassed for glGetTexImage() */

+         GLfloat rgba[4 * MAX_WIDTH];

+         GLvoid *dest = _mesa_image_address2d(&ctx->Pack, pixels, width,

+                                              height, format, type, row, 0);

+

+         if (ST_DEBUG & DEBUG_FALLBACK)

+            debug_printf("%s: fallback format translation\n", __FUNCTION__);

+

+         /* get float[4] rgba row from surface */

+         pipe_get_tile_rgba(pipe, tex_xfer, 0, row, width, 1, rgba);

+

+         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba, format,

+                                    type, dest, &ctx->Pack, transferOps);

+      }

+   }

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+

+   pipe->transfer_destroy(pipe, tex_xfer);

+

+   /* destroy the temp / dest surface */

+   util_destroy_rgba_surface(dst_texture, dst_surface);

+}

+

+

+

+/**

+ * Need to map texture image into memory before copying image data,

+ * then unmap it.

+ */

+static void

+st_get_tex_image(struct gl_context * ctx, GLenum target, GLint level,

+                 GLenum format, GLenum type, GLvoid * pixels,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage, GLboolean compressed_dst)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   const GLuint dstImageStride =

+      _mesa_image_image_stride(&ctx->Pack, texImage->Width, texImage->Height,

+                               format, type);

+   GLuint depth, i;

+   GLubyte *dest;

+

+   if (stImage->pt &&

+       util_format_is_s3tc(stImage->pt->format) &&

+       !compressed_dst) {

+      /* Need to decompress the texture.

+       * We'll do this by rendering a textured quad.

+       * Note that we only expect RGBA formats (no Z/depth formats).

+       */

+      decompress_with_blit(ctx, target, level, format, type, pixels,

+                           texObj, texImage);

+      return;

+   }

+

+   /* Map */

+   if (stImage->pt) {

+      /* Image is stored in hardware format in a buffer managed by the

+       * kernel.  Need to explicitly map and unmap it.

+       */

+      texImage->Data = st_texture_image_map(st, stImage, 0,

+                                            PIPE_TRANSFER_READ, 0, 0,

+                                            stImage->base.Width,

+                                            stImage->base.Height);

+      /* compute stride in texels from stride in bytes */

+      texImage->RowStride = stImage->transfer->stride

+         * util_format_get_blockwidth(stImage->pt->format)

+         / util_format_get_blocksize(stImage->pt->format);

+   }

+   else {

+      /* Otherwise, the image should actually be stored in

+       * texImage->Data.  This is pretty confusing for

+       * everybody, I'd much prefer to separate the two functions of

+       * texImage->Data - storage for texture images in main memory

+       * and access (ie mappings) of images.  In other words, we'd

+       * create a new texImage->Map field and leave Data simply for

+       * storage.

+       */

+      assert(texImage->Data);

+   }

+

+   depth = texImage->Depth;

+   texImage->Depth = 1;

+

+   dest = (GLubyte *) pixels;

+

+   _mesa_set_fetch_functions(texImage, get_texture_dims(target));

+

+   for (i = 0; i < depth; i++) {

+      if (compressed_dst) {

+	 _mesa_get_compressed_teximage(ctx, target, level, dest,

+				       texObj, texImage);

+      }

+      else {

+	 _mesa_get_teximage(ctx, target, level, format, type, dest,

+			    texObj, texImage);

+      }

+

+      if (stImage->pt && i + 1 < depth) {

+         /* unmap this slice */

+	 st_texture_image_unmap(st, stImage);

+         /* map next slice of 3D texture */

+	 texImage->Data = st_texture_image_map(st, stImage, i + 1,

+                                               PIPE_TRANSFER_READ, 0, 0,

+                                               stImage->base.Width,

+                                               stImage->base.Height);

+	 dest += dstImageStride;

+      }

+   }

+

+   texImage->Depth = depth;

+

+   /* Unmap */

+   if (stImage->pt) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+static void

+st_GetTexImage(struct gl_context * ctx, GLenum target, GLint level,

+               GLenum format, GLenum type, GLvoid * pixels,

+               struct gl_texture_object *texObj,

+               struct gl_texture_image *texImage)

+{

+   st_get_tex_image(ctx, target, level, format, type, pixels, texObj, texImage,

+                    GL_FALSE);

+}

+

+

+static void

+st_GetCompressedTexImage(struct gl_context *ctx, GLenum target, GLint level,

+                         GLvoid *pixels,

+                         struct gl_texture_object *texObj,

+                         struct gl_texture_image *texImage)

+{

+   st_get_tex_image(ctx, target, level, 0, 0, pixels, texObj, texImage,

+                    GL_TRUE);

+}

+

+

+

+static void

+st_TexSubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint level,

+               GLint xoffset, GLint yoffset, GLint zoffset,

+               GLint width, GLint height, GLint depth,

+               GLenum format, GLenum type, const void *pixels,

+               const struct gl_pixelstore_attrib *packing,

+               struct gl_texture_object *texObj,

+               struct gl_texture_image *texImage)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_screen *screen = st->pipe->screen;

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   GLuint dstRowStride;

+   const GLuint srcImageStride =

+      _mesa_image_image_stride(packing, width, height, format, type);

+   GLint i;

+   const GLubyte *src;

+   /* init to silence warning only: */

+   enum pipe_transfer_usage transfer_usage = PIPE_TRANSFER_WRITE;

+

+   DBG("%s target %s level %d offset %d,%d %dx%d\n", __FUNCTION__,

+       _mesa_lookup_enum_by_nr(target),

+       level, xoffset, yoffset, width, height);

+

+   pixels =

+      _mesa_validate_pbo_teximage(ctx, dims, width, height, depth, format,

+                                  type, pixels, packing, "glTexSubImage2D");

+   if (!pixels)

+      return;

+

+   /* See if we can do texture compression with a blit/render.

+    */

+   if (!ctx->Mesa_DXTn &&

+       _mesa_is_format_compressed(texImage->TexFormat) &&

+       screen->is_format_supported(screen,

+                                   stImage->pt->format,

+                                   stImage->pt->target, 0,

+                                   PIPE_BIND_RENDER_TARGET, 0)) {

+      if (compress_with_blit(ctx, target, level,

+                             xoffset, yoffset, zoffset,

+                             width, height, depth,

+                             format, type, pixels, packing, texImage)) {

+         goto done;

+      }

+   }

+

+   /* Map buffer if necessary.  Need to lock to prevent other contexts

+    * from uploading the buffer under us.

+    */

+   if (stImage->pt) {

+      if (format == GL_DEPTH_COMPONENT &&

+          util_format_is_depth_and_stencil(stImage->pt->format))

+         transfer_usage = PIPE_TRANSFER_READ_WRITE;

+      else

+         transfer_usage = PIPE_TRANSFER_WRITE;

+

+      texImage->Data = st_texture_image_map(st, stImage, zoffset, 

+                                            transfer_usage,

+                                            xoffset, yoffset,

+                                            width, height);

+   }

+

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");

+      goto done;

+   }

+

+   src = (const GLubyte *) pixels;

+   dstRowStride = stImage->transfer->stride;

+

+   for (i = 0; i < depth; i++) {

+      if (!_mesa_texstore(ctx, dims, texImage->_BaseFormat,

+                          texImage->TexFormat,

+                          texImage->Data,

+                          0, 0, 0,

+                          dstRowStride,

+                          texImage->ImageOffsets,

+                          width, height, 1,

+                          format, type, src, packing)) {

+	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");

+      }

+

+      if (stImage->pt && i + 1 < depth) {

+         /* unmap this slice */

+	 st_texture_image_unmap(st, stImage);

+         /* map next slice of 3D texture */

+	 texImage->Data = st_texture_image_map(st, stImage,

+                                               zoffset + i + 1,

+                                               transfer_usage,

+                                               xoffset, yoffset,

+                                               width, height);

+	 src += srcImageStride;

+      }

+   }

+

+done:

+   _mesa_unmap_teximage_pbo(ctx, packing);

+

+   if (stImage->pt && texImage->Data) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+

+static void

+st_TexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,

+                 GLint xoffset, GLint yoffset, GLint zoffset,

+                 GLsizei width, GLsizei height, GLsizei depth,

+                 GLenum format, GLenum type, const GLvoid *pixels,

+                 const struct gl_pixelstore_attrib *packing,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage)

+{

+   st_TexSubimage(ctx, 3, target, level, xoffset, yoffset, zoffset,

+                  width, height, depth, format, type,

+                  pixels, packing, texObj, texImage);

+}

+

+

+static void

+st_TexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                 GLint xoffset, GLint yoffset,

+                 GLsizei width, GLsizei height,

+                 GLenum format, GLenum type, const GLvoid * pixels,

+                 const struct gl_pixelstore_attrib *packing,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage)

+{

+   st_TexSubimage(ctx, 2, target, level, xoffset, yoffset, 0,

+                  width, height, 1, format, type,

+                  pixels, packing, texObj, texImage);

+}

+

+

+static void

+st_TexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                 GLint xoffset, GLsizei width, GLenum format, GLenum type,

+                 const GLvoid * pixels,

+                 const struct gl_pixelstore_attrib *packing,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage)

+{

+   st_TexSubimage(ctx, 1, target, level, xoffset, 0, 0, width, 1, 1,

+                  format, type, pixels, packing, texObj, texImage);

+}

+

+

+static void

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

+{

+   assert(0);

+}

+

+

+static void

+st_CompressedTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                           GLint xoffset, GLint yoffset,

+                           GLsizei width, GLint height,

+                           GLenum format,

+                           GLsizei imageSize, const GLvoid *data,

+                           struct gl_texture_object *texObj,

+                           struct gl_texture_image *texImage)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   int srcBlockStride;

+   int dstBlockStride;

+   int y;

+   enum pipe_format pformat;

+

+   if (stImage->pt) {

+      pformat = stImage->pt->format;

+

+      texImage->Data = st_texture_image_map(st, stImage, 0, 

+                                            PIPE_TRANSFER_WRITE,

+                                            xoffset, yoffset,

+                                            width, height);

+      

+      srcBlockStride = util_format_get_stride(pformat, width);

+      dstBlockStride = stImage->transfer->stride;

+   } else {

+      assert(stImage->pt);

+      /* TODO find good values for block and strides */

+      /* TODO also adjust texImage->data for yoffset/xoffset */

+      return;

+   }

+

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage");

+      return;

+   }

+

+   assert(xoffset % util_format_get_blockwidth(pformat) == 0);

+   assert(yoffset % util_format_get_blockheight(pformat) == 0);

+

+   for (y = 0; y < height; y += util_format_get_blockheight(pformat)) {

+      /* don't need to adjust for xoffset and yoffset as st_texture_image_map does that */

+      const char *src = (const char*)data + srcBlockStride * util_format_get_nblocksy(pformat, y);

+      char *dst = (char*)texImage->Data + dstBlockStride * util_format_get_nblocksy(pformat, y);

+      memcpy(dst, src, util_format_get_stride(pformat, width));

+   }

+

+   if (stImage->pt) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+static void

+st_CompressedTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,

+                           GLint xoffset, GLint yoffset, GLint zoffset,

+                           GLsizei width, GLint height, GLint depth,

+                           GLenum format,

+                           GLsizei imageSize, const GLvoid *data,

+                           struct gl_texture_object *texObj,

+                           struct gl_texture_image *texImage)

+{

+   assert(0);

+}

+

+

+

+/**

+ * Do a CopyTexSubImage operation using a read transfer from the source,

+ * a write transfer to the destination and get_tile()/put_tile() to access

+ * the pixels/texels.

+ *

+ * Note: srcY=0=TOP of renderbuffer

+ */

+static void

+fallback_copy_texsubimage(struct gl_context *ctx, GLenum target, GLint level,

+                          struct st_renderbuffer *strb,

+                          struct st_texture_image *stImage,

+                          GLenum baseFormat,

+                          GLint destX, GLint destY, GLint destZ,

+                          GLint srcX, GLint srcY,

+                          GLsizei width, GLsizei height)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_transfer *src_trans;

+   GLvoid *texDest;

+   enum pipe_transfer_usage transfer_usage;

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   assert(width <= MAX_WIDTH);

+

+   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+      srcY = strb->Base.Height - srcY - height;

+   }

+

+   src_trans = pipe_get_transfer(st_context(ctx)->pipe,

+                                 strb->texture,

+                                 0, 0,

+                                 PIPE_TRANSFER_READ,

+                                 srcX, srcY,

+                                 width, height);

+

+   if ((baseFormat == GL_DEPTH_COMPONENT ||

+        baseFormat == GL_DEPTH_STENCIL) &&

+       util_format_is_depth_and_stencil(stImage->pt->format))

+      transfer_usage = PIPE_TRANSFER_READ_WRITE;

+   else

+      transfer_usage = PIPE_TRANSFER_WRITE;

+

+   /* XXX this used to ignore destZ param */

+   texDest = st_texture_image_map(st, stImage, destZ, transfer_usage,

+                                  destX, destY, width, height);

+

+   if (baseFormat == GL_DEPTH_COMPONENT ||

+       baseFormat == GL_DEPTH_STENCIL) {

+      const GLboolean scaleOrBias = (ctx->Pixel.DepthScale != 1.0F ||

+                                     ctx->Pixel.DepthBias != 0.0F);

+      GLint row, yStep;

+

+      /* determine bottom-to-top vs. top-to-bottom order for src buffer */

+      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+         srcY = height - 1;

+         yStep = -1;

+      }

+      else {

+         srcY = 0;

+         yStep = 1;

+      }

+

+      /* To avoid a large temp memory allocation, do copy row by row */

+      for (row = 0; row < height; row++, srcY += yStep) {

+         uint data[MAX_WIDTH];

+         pipe_get_tile_z(pipe, src_trans, 0, srcY, width, 1, data);

+         if (scaleOrBias) {

+            _mesa_scale_and_bias_depth_uint(ctx, width, data);

+         }

+         pipe_put_tile_z(pipe, stImage->transfer, 0, row, width, 1, data);

+      }

+   }

+   else {

+      /* RGBA format */

+      GLfloat *tempSrc =

+         (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));

+

+      if (tempSrc && texDest) {

+         const GLint dims = 2;

+         const GLint dstRowStride = stImage->transfer->stride;

+         struct gl_texture_image *texImage = &stImage->base;

+         struct gl_pixelstore_attrib unpack = ctx->DefaultPacking;

+

+         if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+            unpack.Invert = GL_TRUE;

+         }

+

+         /* get float/RGBA image from framebuffer */

+         /* XXX this usually involves a lot of int/float conversion.

+          * try to avoid that someday.

+          */

+         pipe_get_tile_rgba(pipe, src_trans, 0, 0, width, height, tempSrc);

+

+         /* Store into texture memory.

+          * Note that this does some special things such as pixel transfer

+          * ops and format conversion.  In particular, if the dest tex format

+          * is actually RGBA but the user created the texture as GL_RGB we

+          * need to fill-in/override the alpha channel with 1.0.

+          */

+         _mesa_texstore(ctx, dims,

+                        texImage->_BaseFormat, 

+                        texImage->TexFormat, 

+                        texDest,

+                        0, 0, 0,

+                        dstRowStride,

+                        texImage->ImageOffsets,

+                        width, height, 1,

+                        GL_RGBA, GL_FLOAT, tempSrc, /* src */

+                        &unpack);

+      }

+      else {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");

+      }

+

+      if (tempSrc)

+         free(tempSrc);

+   }

+

+   st_texture_image_unmap(st, stImage);

+   pipe->transfer_destroy(pipe, src_trans);

+}

+

+

+

+/**

+ * If the format of the src renderbuffer and the format of the dest

+ * texture are compatible (in terms of blitting), return a TGSI writemask

+ * to be used during the blit.

+ * If the src/dest are incompatible, return 0.

+ */

+static unsigned

+compatible_src_dst_formats(struct gl_context *ctx,

+                           const struct gl_renderbuffer *src,

+                           const struct gl_texture_image *dst)

+{

+   /* Get logical base formats for the src and dest.

+    * That is, use the user-requested formats and not the actual, device-

+    * chosen formats.

+    * For example, the user may have requested an A8 texture but the

+    * driver may actually be using an RGBA texture format.  When we

+    * copy/blit to that texture, we only want to copy the Alpha channel

+    * and not the RGB channels.

+    *

+    * Similarly, when the src FBO was created an RGB format may have been

+    * requested but the driver actually chose an RGBA format.  In that case,

+    * we don't want to copy the undefined Alpha channel to the dest texture

+    * (it should be 1.0).

+    */

+   const GLenum srcFormat = _mesa_base_fbo_format(ctx, src->InternalFormat);

+   const GLenum dstFormat = _mesa_base_tex_format(ctx, dst->InternalFormat);

+

+   /**

+    * XXX when we have red-only and red/green renderbuffers we'll need

+    * to add more cases here (or implement a general-purpose routine that

+    * queries the existance of the R,G,B,A channels in the src and dest).

+    */

+   if (srcFormat == dstFormat) {

+      /* This is the same as matching_base_formats, which should

+       * always pass, as it did previously.

+       */

+      return TGSI_WRITEMASK_XYZW;

+   }

+   else if (srcFormat == GL_RGB && dstFormat == GL_RGBA) {

+      /* Make sure that A in the dest is 1.  The actual src format

+       * may be RGBA and have undefined A values.

+       */

+      return TGSI_WRITEMASK_XYZ;

+   }

+   else if (srcFormat == GL_RGBA && dstFormat == GL_RGB) {

+      /* Make sure that A in the dest is 1.  The actual dst format

+       * may be RGBA and will need A=1 to provide proper alpha values

+       * when sampled later.

+       */

+      return TGSI_WRITEMASK_XYZ;

+   }

+   else {

+      if (ST_DEBUG & DEBUG_FALLBACK)

+         debug_printf("%s failed for src %s, dst %s\n",

+                      __FUNCTION__, 

+                      _mesa_lookup_enum_by_nr(srcFormat),

+                      _mesa_lookup_enum_by_nr(dstFormat));

+

+      /* Otherwise fail.

+       */

+      return 0;

+   }

+}

+

+

+

+/**

+ * Do a CopyTex[Sub]Image1/2/3D() using a hardware (blit) path if possible.

+ * Note that the region to copy has already been clipped so we know we

+ * won't read from outside the source renderbuffer's bounds.

+ *

+ * Note: srcY=0=Bottom of renderbuffer (GL convention)

+ */

+static void

+st_copy_texsubimage(struct gl_context *ctx,

+                    GLenum target, GLint level,

+                    GLint destX, GLint destY, GLint destZ,

+                    GLint srcX, GLint srcY,

+                    GLsizei width, GLsizei height)

+{

+   struct gl_texture_unit *texUnit =

+      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   struct gl_texture_object *texObj =

+      _mesa_select_tex_object(ctx, texUnit, target);

+   struct gl_texture_image *texImage =

+      _mesa_select_tex_image(ctx, texObj, target, level);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   const GLenum texBaseFormat = texImage->_BaseFormat;

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct st_renderbuffer *strb;

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = pipe->screen;

+   enum pipe_format dest_format, src_format;

+   GLboolean use_fallback = GL_TRUE;

+   GLboolean matching_base_formats;

+   GLuint format_writemask, sample_count;

+   struct pipe_surface *dest_surface = NULL;

+   GLboolean do_flip = (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP);

+

+   /* make sure finalize_textures has been called? 

+    */

+   if (0) st_validate_state(st);

+

+   /* determine if copying depth or color data */

+   if (texBaseFormat == GL_DEPTH_COMPONENT ||

+       texBaseFormat == GL_DEPTH_STENCIL) {

+      strb = st_renderbuffer(fb->_DepthBuffer);

+   }

+   else {

+      /* texBaseFormat == GL_RGB, GL_RGBA, GL_ALPHA, etc */

+      strb = st_renderbuffer(fb->_ColorReadBuffer);

+   }

+

+   if (!strb || !strb->surface || !stImage->pt) {

+      debug_printf("%s: null strb or stImage\n", __FUNCTION__);

+      return;

+   }

+

+   sample_count = strb->surface->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);

+

+   if (srcX < 0) {

+      width -= -srcX;

+      destX += -srcX;

+      srcX = 0;

+   }

+

+   if (srcY < 0) {

+      height -= -srcY;

+      destY += -srcY;

+      srcY = 0;

+   }

+

+   if (destX < 0) {

+      width -= -destX;

+      srcX += -destX;

+      destX = 0;

+   }

+

+   if (destY < 0) {

+      height -= -destY;

+      srcY += -destY;

+      destY = 0;

+   }

+

+   if (width < 0 || height < 0)

+      return;

+

+

+   assert(strb);

+   assert(strb->surface);

+   assert(stImage->pt);

+

+   src_format = strb->surface->format;

+   dest_format = stImage->pt->format;

+

+   /*

+    * Determine if the src framebuffer and dest texture have the same

+    * base format.  We need this to detect a case such as the framebuffer

+    * being GL_RGBA but the texture being GL_RGB.  If the actual hardware

+    * texture format stores RGBA we need to set A=1 (overriding the

+    * framebuffer's alpha values).  We can't do that with the blit or

+    * textured-quad paths.

+    */

+   matching_base_formats =

+      (_mesa_get_format_base_format(strb->Base.Format) ==

+       _mesa_get_format_base_format(texImage->TexFormat));

+   format_writemask = compatible_src_dst_formats(ctx, &strb->Base, texImage);

+

+   if (ctx->_ImageTransferState == 0x0) {

+

+      if (matching_base_formats &&

+          src_format == dest_format &&

+          !do_flip)

+      {

+         /* use surface_copy() / blit */

+         struct pipe_box src_box;

+         u_box_2d_zslice(srcX, srcY, strb->surface->u.tex.first_layer,

+                         width, height, &src_box);

+

+         /* for resource_copy_region(), y=0=top, always */

+         pipe->resource_copy_region(pipe,

+                                    /* dest */

+                                    stImage->pt,

+                                    stImage->level,

+                                    destX, destY, destZ + stImage->face,

+                                    /* src */

+                                    strb->texture,

+                                    strb->surface->u.tex.level,

+                                    &src_box);

+         use_fallback = GL_FALSE;

+      }

+      else if (format_writemask &&

+               texBaseFormat != GL_DEPTH_COMPONENT &&

+               texBaseFormat != GL_DEPTH_STENCIL &&

+               screen->is_format_supported(screen, src_format,

+                                           PIPE_TEXTURE_2D, sample_count,

+                                           PIPE_BIND_SAMPLER_VIEW,

+                                           0) &&

+               screen->is_format_supported(screen, dest_format,

+                                           PIPE_TEXTURE_2D, 0,

+                                           PIPE_BIND_RENDER_TARGET,

+                                           0)) {

+         /* draw textured quad to do the copy */

+         GLint srcY0, srcY1;

+         struct pipe_surface surf_tmpl;

+         memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+         surf_tmpl.format = stImage->pt->format;

+         surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

+         surf_tmpl.u.tex.level = stImage->level;

+         surf_tmpl.u.tex.first_layer = stImage->face + destZ;

+         surf_tmpl.u.tex.last_layer = stImage->face + destZ;

+

+         dest_surface = pipe->create_surface(pipe, stImage->pt,

+                                             &surf_tmpl);

+

+         if (do_flip) {

+            srcY1 = strb->Base.Height - srcY - height;

+            srcY0 = srcY1 + height;

+         }

+         else {

+            srcY0 = srcY;

+            srcY1 = srcY0 + height;

+         }

+

+         util_blit_pixels_writemask(st->blit,

+                                    strb->texture,

+                                    strb->surface->u.tex.level,

+                                    srcX, srcY0,

+                                    srcX + width, srcY1,

+                                    strb->surface->u.tex.first_layer,

+                                    dest_surface,

+                                    destX, destY,

+                                    destX + width, destY + height,

+                                    0.0, PIPE_TEX_MIPFILTER_NEAREST,

+                                    format_writemask);

+         use_fallback = GL_FALSE;

+      }

+

+      if (dest_surface)

+         pipe_surface_reference(&dest_surface, NULL);

+   }

+

+   if (use_fallback) {

+      /* software fallback */

+      fallback_copy_texsubimage(ctx, target, level,

+                                strb, stImage, texBaseFormat,

+                                destX, destY, destZ,

+                                srcX, srcY, width, height);

+   }

+}

+

+

+

+static void

+st_CopyTexImage1D(struct gl_context * ctx, GLenum target, GLint level,

+                  GLenum internalFormat,

+                  GLint x, GLint y, GLsizei width, GLint border)

+{

+   struct gl_texture_unit *texUnit =

+      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   struct gl_texture_object *texObj =

+      _mesa_select_tex_object(ctx, texUnit, target);

+   struct gl_texture_image *texImage =

+      _mesa_select_tex_image(ctx, texObj, target, level);

+

+   /* Setup or redefine the texture object, texture and texture

+    * image.  Don't populate yet.  

+    */

+   ctx->Driver.TexImage1D(ctx, target, level, internalFormat,

+                          width, border,

+                          GL_RGBA, CHAN_TYPE, NULL,

+                          &ctx->DefaultPacking, texObj, texImage);

+

+   st_copy_texsubimage(ctx, target, level,

+                       0, 0, 0,  /* destX,Y,Z */

+                       x, y, width, 1);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexImage2D(struct gl_context * ctx, GLenum target, GLint level,

+                  GLenum internalFormat,

+                  GLint x, GLint y, GLsizei width, GLsizei height,

+                  GLint border)

+{

+   struct gl_texture_unit *texUnit =

+      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   struct gl_texture_object *texObj =

+      _mesa_select_tex_object(ctx, texUnit, target);

+   struct gl_texture_image *texImage =

+      _mesa_select_tex_image(ctx, texObj, target, level);

+

+   /* Setup or redefine the texture object, texture and texture

+    * image.  Don't populate yet.  

+    */

+   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,

+                          width, height, border,

+                          GL_RGBA, CHAN_TYPE, NULL,

+                          &ctx->DefaultPacking, texObj, texImage);

+

+   st_copy_texsubimage(ctx, target, level,

+                       0, 0, 0,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexSubImage1D(struct gl_context * ctx, GLenum target, GLint level,

+                     GLint xoffset, GLint x, GLint y, GLsizei width)

+{

+   const GLint yoffset = 0, zoffset = 0;

+   const GLsizei height = 1;

+   st_copy_texsubimage(ctx, target, level,

+                       xoffset, yoffset, zoffset,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexSubImage2D(struct gl_context * ctx, GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset,

+                     GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   const GLint zoffset = 0;

+   st_copy_texsubimage(ctx, target, level,

+                       xoffset, yoffset, zoffset,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexSubImage3D(struct gl_context * ctx, GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset, GLint zoffset,

+                     GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   st_copy_texsubimage(ctx, target, level,

+                       xoffset, yoffset, zoffset,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+/**

+ * Copy image data from stImage into the texture object 'stObj' at level

+ * 'dstLevel'.

+ */

+static void

+copy_image_data_to_texture(struct st_context *st,

+			   struct st_texture_object *stObj,

+                           GLuint dstLevel,

+			   struct st_texture_image *stImage)

+{

+   /* debug checks */

+   {

+      const struct gl_texture_image *dstImage =

+         stObj->base.Image[stImage->face][stImage->level];

+      assert(dstImage);

+      assert(dstImage->Width == stImage->base.Width);

+      assert(dstImage->Height == stImage->base.Height);

+      assert(dstImage->Depth == stImage->base.Depth);

+   }

+

+   if (stImage->pt) {

+      /* Copy potentially with the blitter:

+       */

+      st_texture_image_copy(st->pipe,

+                            stObj->pt, dstLevel,  /* dest texture, level */

+                            stImage->pt, stImage->level, /* src texture, level */

+                            stImage->face);

+

+      pipe_resource_reference(&stImage->pt, NULL);

+   }

+   else if (stImage->base.Data) {

+      st_texture_image_data(st,

+                            stObj->pt,

+                            stImage->face,

+                            dstLevel,

+                            stImage->base.Data,

+                            stImage->base.RowStride * 

+                            util_format_get_blocksize(stObj->pt->format),

+                            stImage->base.RowStride *

+                            stImage->base.Height *

+                            util_format_get_blocksize(stObj->pt->format));

+      _mesa_align_free(stImage->base.Data);

+      stImage->base.Data = NULL;

+   }

+

+   pipe_resource_reference(&stImage->pt, stObj->pt);

+}

+

+

+/**

+ * Called during state validation.  When this function is finished,

+ * the texture object should be ready for rendering.

+ * \return GL_TRUE for success, GL_FALSE for failure (out of mem)

+ */

+GLboolean

+st_finalize_texture(struct gl_context *ctx,

+		    struct pipe_context *pipe,

+		    struct gl_texture_object *tObj)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_object *stObj = st_texture_object(tObj);

+   const GLuint nr_faces = (stObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;

+   GLuint face;

+   struct st_texture_image *firstImage;

+   enum pipe_format firstImageFormat;

+

+   if (stObj->base._Complete) {

+      /* The texture is complete and we know exactly how many mipmap levels

+       * are present/needed.  This is conditional because we may be called

+       * from the st_generate_mipmap() function when the texture object is

+       * incomplete.  In that case, we'll have set stObj->lastLevel before

+       * we get here.

+       */

+      if (stObj->base.MinFilter == GL_LINEAR ||

+          stObj->base.MinFilter == GL_NEAREST)

+         stObj->lastLevel = stObj->base.BaseLevel;

+      else

+         stObj->lastLevel = stObj->base._MaxLevel;

+   }

+

+   firstImage = st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);

+   assert(firstImage);

+

+   /* If both firstImage and stObj point to a texture which can contain

+    * all active images, favour firstImage.  Note that because of the

+    * completeness requirement, we know that the image dimensions

+    * will match.

+    */

+   if (firstImage->pt &&

+       stObj->pt &&

+       firstImage->pt != stObj->pt &&

+       firstImage->pt->last_level >= stObj->pt->last_level) {

+      pipe_resource_reference(&stObj->pt, firstImage->pt);

+      pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+   }

+

+   /* Find gallium format for the Mesa texture */

+   firstImageFormat = st_mesa_format_to_pipe_format(firstImage->base.TexFormat);

+

+   /* If we already have a gallium texture, check that it matches the texture

+    * object's format, target, size, num_levels, etc.

+    */

+   if (stObj->pt) {

+      if (stObj->pt->target != gl_target_to_pipe(stObj->base.Target) ||

+          !st_sampler_compat_formats(stObj->pt->format, firstImageFormat) ||

+          stObj->pt->last_level < stObj->lastLevel ||

+          stObj->pt->width0 != stObj->width0 ||

+          stObj->pt->height0 != stObj->height0 ||

+          stObj->pt->depth0 != stObj->depth0)

+      {

+         /* The gallium texture does not match the Mesa texture so delete the

+          * gallium texture now.  We'll make a new one below.

+          */

+         pipe_resource_reference(&stObj->pt, NULL);

+         pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+         st->dirty.st |= ST_NEW_FRAMEBUFFER;

+      }

+   }

+

+   /* May need to create a new gallium texture:

+    */

+   if (!stObj->pt) {

+      GLuint bindings = default_bindings(st, firstImageFormat);

+

+      stObj->pt = st_texture_create(st,

+                                    gl_target_to_pipe(stObj->base.Target),

+                                    firstImageFormat,

+                                    stObj->lastLevel,

+                                    stObj->width0,

+                                    stObj->height0,

+                                    stObj->depth0,

+                                    bindings);

+

+      if (!stObj->pt) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+         return GL_FALSE;

+      }

+   }

+

+   /* Pull in any images not in the object's texture:

+    */

+   for (face = 0; face < nr_faces; face++) {

+      GLuint level;

+      for (level = stObj->base.BaseLevel; level <= stObj->lastLevel; level++) {

+         struct st_texture_image *stImage =

+            st_texture_image(stObj->base.Image[face][level]);

+

+         /* Need to import images in main memory or held in other textures.

+          */

+         if (stImage && stObj->pt != stImage->pt) {

+            copy_image_data_to_texture(st, stObj, level, stImage);

+         }

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Returns pointer to a default/dummy texture.

+ * This is typically used when the current shader has tex/sample instructions

+ * but the user has not provided a (any) texture(s).

+ */

+struct gl_texture_object *

+st_get_default_texture(struct st_context *st)

+{

+   if (!st->default_texture) {

+      static const GLenum target = GL_TEXTURE_2D;

+      GLubyte pixels[16][16][4];

+      struct gl_texture_object *texObj;

+      struct gl_texture_image *texImg;

+      GLuint i, j;

+

+      /* The ARB_fragment_program spec says (0,0,0,1) should be returned

+       * when attempting to sample incomplete textures.

+       */

+      for (i = 0; i < 16; i++) {

+         for (j = 0; j < 16; j++) {

+            pixels[i][j][0] = 0;

+            pixels[i][j][1] = 0;

+            pixels[i][j][2] = 0;

+            pixels[i][j][3] = 255;

+         }

+      }

+

+      texObj = st->ctx->Driver.NewTextureObject(st->ctx, 0, target);

+

+      texImg = _mesa_get_tex_image(st->ctx, texObj, target, 0);

+

+      _mesa_init_teximage_fields(st->ctx, target, texImg,

+                                 16, 16, 1, 0,  /* w, h, d, border */

+                                 GL_RGBA, MESA_FORMAT_RGBA8888);

+

+      st_TexImage(st->ctx, 2, target,

+                  0, GL_RGBA,    /* level, intformat */

+                  16, 16, 1, 0,  /* w, h, d, border */

+                  GL_RGBA, GL_UNSIGNED_BYTE, pixels,

+                  &st->ctx->DefaultPacking,

+                  texObj, texImg,

+                  0, 0);

+

+      texObj->MinFilter = GL_NEAREST;

+      texObj->MagFilter = GL_NEAREST;

+      texObj->_Complete = GL_TRUE;

+

+      st->default_texture = texObj;

+   }

+   return st->default_texture;

+}

+

+

+void

+st_init_texture_functions(struct dd_function_table *functions)

+{

+   functions->ChooseTextureFormat = st_ChooseTextureFormat;

+   functions->TexImage1D = st_TexImage1D;

+   functions->TexImage2D = st_TexImage2D;

+   functions->TexImage3D = st_TexImage3D;

+   functions->TexSubImage1D = st_TexSubImage1D;

+   functions->TexSubImage2D = st_TexSubImage2D;

+   functions->TexSubImage3D = st_TexSubImage3D;

+   functions->CompressedTexSubImage1D = st_CompressedTexSubImage1D;

+   functions->CompressedTexSubImage2D = st_CompressedTexSubImage2D;

+   functions->CompressedTexSubImage3D = st_CompressedTexSubImage3D;

+   functions->CopyTexImage1D = st_CopyTexImage1D;

+   functions->CopyTexImage2D = st_CopyTexImage2D;

+   functions->CopyTexSubImage1D = st_CopyTexSubImage1D;

+   functions->CopyTexSubImage2D = st_CopyTexSubImage2D;

+   functions->CopyTexSubImage3D = st_CopyTexSubImage3D;

+   functions->GenerateMipmap = st_generate_mipmap;

+

+   functions->GetTexImage = st_GetTexImage;

+

+   /* compressed texture functions */

+   functions->CompressedTexImage2D = st_CompressedTexImage2D;

+   functions->GetCompressedTexImage = st_GetCompressedTexImage;

+

+   functions->NewTextureObject = st_NewTextureObject;

+   functions->NewTextureImage = st_NewTextureImage;

+   functions->DeleteTexture = st_DeleteTextureObject;

+   functions->FreeTexImageData = st_FreeTextureImageData;

+

+   functions->TextureMemCpy = do_memcpy;

+

+   /* XXX Temporary until we can query pipe's texture sizes */

+   functions->TestProxyTexImage = _mesa_test_proxy_teximage;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.h b/mesalib/src/mesa/state_tracker/st_cb_texture.h
new file mode 100644
index 000000000..81671b074
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.h
@@ -0,0 +1,55 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_CB_TEXTURE_H

+#define ST_CB_TEXTURE_H

+

+

+#include "main/glheader.h"

+

+struct dd_function_table;

+struct gl_context;

+struct gl_texture_object;

+struct pipe_context;

+struct st_context;

+

+extern GLboolean

+st_finalize_texture(struct gl_context *ctx,

+		    struct pipe_context *pipe, 

+		    struct gl_texture_object *tObj);

+

+

+extern struct gl_texture_object *

+st_get_default_texture(struct st_context *st);

+

+

+extern void

+st_init_texture_functions(struct dd_function_table *functions);

+

+

+#endif /* ST_CB_TEXTURE_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_viewport.c b/mesalib/src/mesa/state_tracker/st_cb_viewport.c
new file mode 100644
index 000000000..a61e3d4d4
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_viewport.c
@@ -0,0 +1,71 @@
+/**************************************************************************

+ *

+ * 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 "st_context.h"

+#include "st_cb_viewport.h"

+

+#include "pipe/p_state.h"

+#include "pipe/p_defines.h"

+#include "util/u_atomic.h"

+

+/**

+ * Cast wrapper to convert a struct gl_framebuffer to an st_framebuffer.

+ * Return NULL if the struct gl_framebuffer is a user-created framebuffer.

+ * We'll only return non-null for window system framebuffers.

+ * Note that this function may fail.

+ */

+static INLINE struct st_framebuffer *

+st_ws_framebuffer(struct gl_framebuffer *fb)

+{

+   /* FBO cannot be casted.  See st_new_framebuffer */

+   return (struct st_framebuffer *) ((fb && !fb->Name) ? fb : NULL);

+}

+

+static void st_viewport(struct gl_context * ctx, GLint x, GLint y,

+                        GLsizei width, GLsizei height)

+{

+   struct st_context *st = ctx->st;

+   struct st_framebuffer *stdraw;

+   struct st_framebuffer *stread;

+

+   if (!st->invalidate_on_gl_viewport)

+      return;

+

+   stdraw = st_ws_framebuffer(st->ctx->DrawBuffer);

+   stread = st_ws_framebuffer(st->ctx->ReadBuffer);

+

+   if (stdraw)

+      p_atomic_set(&stdraw->revalidate, TRUE);

+   if (stread && stread != stdraw)

+      p_atomic_set(&stread->revalidate, TRUE);

+}

+

+void st_init_viewport_functions(struct dd_function_table *functions)

+{

+   functions->Viewport = st_viewport;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_cb_viewport.h b/mesalib/src/mesa/state_tracker/st_cb_viewport.h
new file mode 100644
index 000000000..7307aba1b
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_viewport.h
@@ -0,0 +1,36 @@
+/**************************************************************************

+ *

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

+ *

+ **************************************************************************/

+

+#ifndef ST_CB_VIEWPORT_H

+#define ST_CB_VIEWPORT_H

+

+struct dd_function_table;

+

+extern void

+st_init_viewport_functions(struct dd_function_table *functions);

+

+#endif /* ST_CB_VIEW_PORT_H */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_xformfb.c b/mesalib/src/mesa/state_tracker/st_cb_xformfb.c
new file mode 100644
index 000000000..f4440a5f5
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_xformfb.c
@@ -0,0 +1,133 @@
+/**************************************************************************

+ * 

+ * Copyright 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 THE AUTHORS 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.

+ * 

+ **************************************************************************/

+

+

+/**

+ * Transform feedback functions.

+ *

+ * \author Brian Paul

+ */

+

+

+#include "main/imports.h"

+#include "main/context.h"

+#include "main/transformfeedback.h"

+

+#include "st_cb_xformfb.h"

+

+

+#if FEATURE_EXT_transform_feedback

+

+#if 0

+static struct gl_transform_feedback_object *

+st_new_transform_feedback(struct gl_context *ctx, GLuint name)

+{

+   struct gl_transform_feedback_object *obj;

+   obj = CALLOC_STRUCT(gl_transform_feedback_object);

+   if (obj) {

+      obj->Name = name;

+      obj->RefCount = 1;

+   }

+   return obj;

+}

+#endif

+

+#if 0

+static void

+st_delete_transform_feedback(struct gl_context *ctx,

+                             struct gl_transform_feedback_object *obj)

+{

+   GLuint i;

+

+   for (i = 0; i < Elements(obj->Buffers); i++) {

+      _mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);

+   }

+

+   free(obj);

+}

+#endif

+

+

+static void

+st_begin_transform_feedback(struct gl_context *ctx, GLenum mode,

+                            struct gl_transform_feedback_object *obj)

+{

+   /* to-do */

+}

+

+

+static void

+st_end_transform_feedback(struct gl_context *ctx,

+                          struct gl_transform_feedback_object *obj)

+{

+   /* to-do */

+}

+

+

+static void

+st_pause_transform_feedback(struct gl_context *ctx,

+                            struct gl_transform_feedback_object *obj)

+{

+   /* to-do */

+}

+

+

+static void

+st_resume_transform_feedback(struct gl_context *ctx,

+                             struct gl_transform_feedback_object *obj)

+{

+   /* to-do */

+}

+

+

+static void

+st_draw_transform_feedback(struct gl_context *ctx, GLenum mode,

+                           struct gl_transform_feedback_object *obj)

+{

+   /* XXX to do */

+   /*

+    * Get number of vertices in obj's feedback buffer.

+    * Call ctx->Exec.DrawArrays(mode, 0, count);

+    */

+}

+

+

+void

+st_init_xformfb_functions(struct dd_function_table *functions)

+{

+   /* let core Mesa plug in its functions */

+   _mesa_init_transform_feedback_functions(functions);

+

+   /* then override a few: */

+   functions->BeginTransformFeedback = st_begin_transform_feedback;

+   functions->EndTransformFeedback = st_end_transform_feedback;

+   functions->PauseTransformFeedback = st_pause_transform_feedback;

+   functions->ResumeTransformFeedback = st_resume_transform_feedback;

+   functions->DrawTransformFeedback = st_draw_transform_feedback;

+}

+

+#endif /* FEATURE_EXT_transform_feedback */

diff --git a/mesalib/src/mesa/state_tracker/st_cb_xformfb.h b/mesalib/src/mesa/state_tracker/st_cb_xformfb.h
new file mode 100644
index 000000000..f18b68bdb
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_cb_xformfb.h
@@ -0,0 +1,50 @@
+/**************************************************************************

+ * 

+ * Copyright 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 THE AUTHORS 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_CB_XFORMFB_H

+#define ST_CB_XFORMFB_H

+

+

+#include "main/compiler.h"

+

+struct dd_function_table;

+

+#if FEATURE_EXT_transform_feedback

+

+extern void

+st_init_xformfb_functions(struct dd_function_table *functions);

+

+#else

+

+static INLINE void

+st_init_xformfb_functions(struct dd_function_table *functions)

+{

+}

+

+#endif /* FEATURE_EXT_transform_feedback */

+

+#endif /* ST_CB_XFORMFB_H */

diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
new file mode 100644
index 000000000..4656930ac
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -0,0 +1,299 @@
+/**************************************************************************

+ * 

+ * 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/context.h"

+#include "main/shaderobj.h"

+#include "program/prog_cache.h"

+#include "vbo/vbo.h"

+#include "glapi/glapi.h"

+#include "st_context.h"

+#include "st_debug.h"

+#include "st_cb_accum.h"

+#include "st_cb_bitmap.h"

+#include "st_cb_blit.h"

+#include "st_cb_bufferobjects.h"

+#include "st_cb_clear.h"

+#include "st_cb_condrender.h"

+#include "st_cb_drawpixels.h"

+#include "st_cb_rasterpos.h"

+#include "st_cb_drawtex.h"

+#include "st_cb_eglimage.h"

+#include "st_cb_fbo.h"

+#include "st_cb_feedback.h"

+#include "st_cb_program.h"

+#include "st_cb_queryobj.h"

+#include "st_cb_readpixels.h"

+#include "st_cb_texture.h"

+#include "st_cb_xformfb.h"

+#include "st_cb_flush.h"

+#include "st_cb_strings.h"

+#include "st_cb_viewport.h"

+#include "st_atom.h"

+#include "st_draw.h"

+#include "st_extensions.h"

+#include "st_gen_mipmap.h"

+#include "st_program.h"

+#include "pipe/p_context.h"

+#include "util/u_inlines.h"

+#include "cso_cache/cso_context.h"

+

+

+DEBUG_GET_ONCE_BOOL_OPTION(mesa_mvp_dp4, "MESA_MVP_DP4", FALSE)

+

+

+/**

+ * Called via ctx->Driver.UpdateState()

+ */

+void st_invalidate_state(struct gl_context * ctx, GLuint new_state)

+{

+   struct st_context *st = st_context(ctx);

+

+   st->dirty.mesa |= new_state;

+   st->dirty.st |= ST_NEW_MESA;

+

+   /* This is the only core Mesa module we depend upon.

+    * No longer use swrast, swsetup, tnl.

+    */

+   _vbo_InvalidateState(ctx, new_state);

+}

+

+

+/**

+ * Check for multisample env var override.

+ */

+int

+st_get_msaa(void)

+{

+   const char *msaa = _mesa_getenv("__GL_FSAA_MODE");

+   if (msaa)

+      return atoi(msaa);

+   return 0;

+}

+

+

+static struct st_context *

+st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe )

+{

+   uint i;

+   struct st_context *st = ST_CALLOC_STRUCT( st_context );

+   

+   ctx->st = st;

+

+   st->ctx = ctx;

+   st->pipe = pipe;

+

+   /* XXX: this is one-off, per-screen init: */

+   st_debug_init();

+   

+   /* state tracker needs the VBO module */

+   _vbo_CreateContext(ctx);

+

+   st->dirty.mesa = ~0;

+   st->dirty.st = ~0;

+

+   st->cso_context = cso_create_context(pipe);

+

+   st_init_atoms( st );

+   st_init_bitmap(st);

+   st_init_clear(st);

+   st_init_draw( st );

+   st_init_generate_mipmap(st);

+   st_init_blit(st);

+

+   if(pipe->screen->get_param(pipe->screen, PIPE_CAP_NPOT_TEXTURES))

+      st->internal_target = PIPE_TEXTURE_2D;

+   else

+      st->internal_target = PIPE_TEXTURE_RECT;

+

+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)

+      st->state.sampler_list[i] = &st->state.samplers[i];

+

+   for (i = 0; i < 3; i++) {

+      memset(&st->velems_util_draw[i], 0, sizeof(struct pipe_vertex_element));

+      st->velems_util_draw[i].src_offset = i * 4 * sizeof(float);

+      st->velems_util_draw[i].instance_divisor = 0;

+      st->velems_util_draw[i].vertex_buffer_index = 0;

+      st->velems_util_draw[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;

+   }

+

+   /* we want all vertex data to be placed in buffer objects */

+   vbo_use_buffer_objects(ctx);

+

+   /* Need these flags:

+    */

+   st->ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;

+

+   st->ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;

+

+   st->pixel_xfer.cache = _mesa_new_program_cache();

+

+   st->force_msaa = st_get_msaa();

+

+   /* GL limits and extensions */

+   st_init_limits(st);

+   st_init_extensions(st);

+

+   return st;

+}

+

+

+struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,

+                                     const struct gl_config *visual,

+                                     struct st_context *share)

+{

+   struct gl_context *ctx;

+   struct gl_context *shareCtx = share ? share->ctx : NULL;

+   struct dd_function_table funcs;

+

+   /* Sanity checks */

+   assert(MESA_SHADER_VERTEX == PIPE_SHADER_VERTEX);

+   assert(MESA_SHADER_FRAGMENT == PIPE_SHADER_FRAGMENT);

+   assert(MESA_SHADER_GEOMETRY == PIPE_SHADER_GEOMETRY);

+

+   memset(&funcs, 0, sizeof(funcs));

+   st_init_driver_functions(&funcs);

+

+   ctx = _mesa_create_context_for_api(api, visual, shareCtx, &funcs, NULL);

+

+   /* XXX: need a capability bit in gallium to query if the pipe

+    * driver prefers DP4 or MUL/MAD for vertex transformation.

+    */

+   if (debug_get_option_mesa_mvp_dp4())

+      _mesa_set_mvp_with_dp4( ctx, GL_TRUE );

+

+   return st_create_context_priv(ctx, pipe);

+}

+

+

+static void st_destroy_context_priv( struct st_context *st )

+{

+   uint i;

+

+   st_destroy_atoms( st );

+   st_destroy_draw( st );

+   st_destroy_generate_mipmap(st);

+   st_destroy_blit(st);

+   st_destroy_clear(st);

+   st_destroy_bitmap(st);

+   st_destroy_drawpix(st);

+   st_destroy_drawtex(st);

+

+   for (i = 0; i < Elements(st->state.sampler_views); i++) {

+      pipe_sampler_view_reference(&st->state.sampler_views[i], NULL);

+   }

+

+   for (i = 0; i < Elements(st->state.constants); i++) {

+      if (st->state.constants[i]) {

+         pipe_resource_reference(&st->state.constants[i], NULL);

+      }

+   }

+

+   if (st->default_texture) {

+      st->ctx->Driver.DeleteTexture(st->ctx, st->default_texture);

+      st->default_texture = NULL;

+   }

+

+   free( st );

+}

+

+ 

+void st_destroy_context( struct st_context *st )

+{

+   struct pipe_context *pipe = st->pipe;

+   struct cso_context *cso = st->cso_context;

+   struct gl_context *ctx = st->ctx;

+   GLuint i;

+

+   /* need to unbind and destroy CSO objects before anything else */

+   cso_release_all(st->cso_context);

+

+   st_reference_fragprog(st, &st->fp, NULL);

+   st_reference_vertprog(st, &st->vp, NULL);

+

+   /* release framebuffer surfaces */

+   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {

+      pipe_surface_reference(&st->state.framebuffer.cbufs[i], NULL);

+   }

+   pipe_surface_reference(&st->state.framebuffer.zsbuf, NULL);

+

+   pipe->set_index_buffer(pipe, NULL);

+

+   for (i = 0; i < PIPE_SHADER_TYPES; i++) {

+      pipe->set_constant_buffer(pipe, i, 0, NULL);

+      pipe_resource_reference(&st->state.constants[i], NULL);

+   }

+

+   _mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);

+

+   _vbo_DestroyContext(st->ctx);

+

+   st_destroy_program_variants(st);

+

+   _mesa_free_context_data(ctx);

+

+   st_destroy_context_priv(st);

+

+   cso_destroy_context(cso);

+

+   pipe->destroy( pipe );

+

+   free(ctx);

+}

+

+

+void st_init_driver_functions(struct dd_function_table *functions)

+{

+   _mesa_init_shader_object_functions(functions);

+

+   st_init_accum_functions(functions);

+   st_init_blit_functions(functions);

+   st_init_bufferobject_functions(functions);

+   st_init_clear_functions(functions);

+   st_init_bitmap_functions(functions);

+   st_init_drawpixels_functions(functions);

+   st_init_rasterpos_functions(functions);

+

+   st_init_drawtex_functions(functions);

+

+   st_init_eglimage_functions(functions);

+

+   st_init_fbo_functions(functions);

+   st_init_feedback_functions(functions);

+   st_init_program_functions(functions);

+   st_init_query_functions(functions);

+   st_init_cond_render_functions(functions);

+   st_init_readpixels_functions(functions);

+   st_init_texture_functions(functions);

+   st_init_flush_functions(functions);

+   st_init_string_functions(functions);

+   st_init_viewport_functions(functions);

+

+   st_init_xformfb_functions(functions);

+

+   functions->UpdateState = st_invalidate_state;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
new file mode 100644
index 000000000..348a5827d
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -0,0 +1,271 @@
+/**************************************************************************

+ * 

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

+

+   struct {

+      struct st_tracked_state tracked_state[PIPE_SHADER_TYPES];

+   } constants;

+

+   /* XXX unused: */

+   struct {

+      struct gl_fragment_program *fragment_program;

+   } cb;

+

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

+};

+

+

+/* 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_debug.c b/mesalib/src/mesa/state_tracker/st_debug.c
new file mode 100644
index 000000000..ee7d78a4f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_debug.c
@@ -0,0 +1,102 @@
+/**************************************************************************

+ * 

+ * 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/context.h"

+#include "program/prog_print.h"

+

+#include "pipe/p_state.h"

+#include "pipe/p_shader_tokens.h"

+#include "tgsi/tgsi_dump.h"

+

+#include "cso_cache/cso_cache.h"

+

+#include "st_context.h"

+#include "st_debug.h"

+#include "st_program.h"

+

+

+

+#ifdef DEBUG

+int ST_DEBUG = 0;

+

+static const struct debug_named_value st_debug_flags[] = {

+   { "mesa",     DEBUG_MESA, NULL },

+   { "tgsi",     DEBUG_TGSI, NULL },

+   { "constants",DEBUG_CONSTANTS, NULL },

+   { "pipe",     DEBUG_PIPE, NULL },

+   { "tex",      DEBUG_TEX, NULL },

+   { "fallback", DEBUG_FALLBACK, NULL },

+   { "screen",   DEBUG_SCREEN, NULL },

+   { "query",    DEBUG_QUERY, NULL },

+   DEBUG_NAMED_VALUE_END

+};

+

+DEBUG_GET_ONCE_FLAGS_OPTION(st_debug, "ST_DEBUG", st_debug_flags, 0)

+#endif

+

+

+void

+st_debug_init(void)

+{

+#ifdef DEBUG

+   ST_DEBUG = debug_get_option_st_debug();

+#endif

+}

+

+

+

+/**

+ * Print current state.  May be called from inside gdb to see currently

+ * bound vertex/fragment shaders and associated constants.

+ */

+void

+st_print_current(void)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct st_context *st = st_context(ctx);

+

+#if 0

+   int i;

+

+   printf("Vertex Transform Inputs:\n");

+   for (i = 0; i < st->vp->state.num_inputs; i++) {

+      printf("  Slot %d:  VERT_ATTRIB_%d\n", i, st->vp->index_to_input[i]);

+   }

+#endif

+

+   if (st->vp->variants)

+      tgsi_dump( st->vp->variants[0].tgsi.tokens, 0 );

+   if (st->vp->Base.Base.Parameters)

+      _mesa_print_parameter_list(st->vp->Base.Base.Parameters);

+

+   tgsi_dump( st->fp->tgsi.tokens, 0 );

+   if (st->fp->Base.Base.Parameters)

+      _mesa_print_parameter_list(st->fp->Base.Base.Parameters);

+}

+

+

diff --git a/mesalib/src/mesa/state_tracker/st_debug.h b/mesalib/src/mesa/state_tracker/st_debug.h
new file mode 100644
index 000000000..07864845f
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_debug.h
@@ -0,0 +1,72 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_DEBUG_H

+#define ST_DEBUG_H

+

+#include "pipe/p_compiler.h"

+#include "util/u_debug.h"

+

+extern void

+st_print_current(void);

+

+

+#define DEBUG_MESA      0x1

+#define DEBUG_TGSI      0x2

+#define DEBUG_CONSTANTS 0x4

+#define DEBUG_PIPE      0x8

+#define DEBUG_TEX       0x10

+#define DEBUG_FALLBACK  0x20

+#define DEBUG_QUERY     0x40

+#define DEBUG_SCREEN    0x80

+

+#ifdef DEBUG

+extern int ST_DEBUG;

+#define DBSTR(x) x

+#else

+#define ST_DEBUG 0

+#define DBSTR(x) ""

+#endif

+

+void st_debug_init( void );

+

+static INLINE void

+ST_DBG( unsigned flag, const char *fmt, ... )

+{

+    if (ST_DEBUG & flag)

+    {

+        va_list args;

+

+        va_start( args, fmt );

+        debug_vprintf( fmt, args );

+        va_end( args );

+    }

+}

+

+

+#endif /* ST_DEBUG_H */

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
new file mode 100644
index 000000000..163d2d36e
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -0,0 +1,777 @@
+/**************************************************************************

+ * 

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

+ */

+GLuint

+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 0; /* 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,

+                      GLboolean *userSpace)

+{

+   GLuint attr;

+   const struct gl_buffer_object *firstBufObj = NULL;

+   GLint firstStride = -1;

+   GLuint num_client_arrays = 0;

+   const GLubyte *client_addr = NULL;

+

+   for (attr = 0; attr < vpv->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      const struct gl_buffer_object *bufObj = arrays[mesaAttr]->BufferObj;

+      const GLsizei stride = arrays[mesaAttr]->StrideB; /* in bytes */

+

+      if (firstStride < 0) {

+         firstStride = stride;

+      }

+      else if (firstStride != stride) {

+         return GL_FALSE;

+      }

+         

+      if (!bufObj || !bufObj->Name) {

+         num_client_arrays++;

+         /* Try to detect if the client-space arrays are

+          * "close" to each other.

+          */

+         if (!client_addr) {

+            client_addr = arrays[mesaAttr]->Ptr;

+         }

+         else if (abs(arrays[mesaAttr]->Ptr - client_addr) > firstStride) {

+            /* arrays start too far apart */

+            return GL_FALSE;

+         }

+      }

+      else if (!firstBufObj) {

+         firstBufObj = bufObj;

+      }

+      else if (bufObj != firstBufObj) {

+         return GL_FALSE;

+      }

+   }

+

+   *userSpace = (num_client_arrays == vpv->num_inputs);

+   /* debug_printf("user space: %s (%d arrays, %d inputs)\n",

+      (int)*userSpace ? "Yes" : "No", num_client_arrays, vp->num_inputs); */

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Compute the memory range occupied by the arrays.

+ */

+static void

+get_arrays_bounds(const struct st_vertex_program *vp,

+                  const struct st_vp_variant *vpv,

+                  const struct gl_client_array **arrays,

+                  GLuint max_index,

+                  const GLubyte **low, const GLubyte **high)

+{

+   const GLubyte *low_addr = NULL;

+   const GLubyte *high_addr = NULL;

+   GLuint attr;

+

+   /* debug_printf("get_arrays_bounds: Handling %u attrs\n", vpv->num_inputs); */

+

+   for (attr = 0; attr < vpv->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      const GLint stride = arrays[mesaAttr]->StrideB;

+      const GLubyte *start = arrays[mesaAttr]->Ptr;

+      const unsigned sz = (arrays[mesaAttr]->Size * 

+                           _mesa_sizeof_type(arrays[mesaAttr]->Type));

+      const GLubyte *end = start + (max_index * stride) + sz;

+

+      /* debug_printf("attr %u: stride %d size %u start %p end %p\n",

+         attr, stride, sz, start, end); */

+

+      if (attr == 0) {

+         low_addr = start;

+         high_addr = end;

+      }

+      else {

+         low_addr = MIN2(low_addr, start);

+         high_addr = MAX2(high_addr, end);

+      }

+   }

+

+   *low = low_addr;

+   *high = high_addr;

+}

+

+

+/**

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

+                          GLuint max_index,

+                          GLboolean userSpace,

+                          struct pipe_vertex_buffer *vbuffer,

+                          struct pipe_vertex_element velements[])

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   GLuint attr;

+   const GLubyte *offset0 = NULL;

+

+   for (attr = 0; attr < vpv->num_inputs; attr++) {

+      const GLuint mesaAttr = vp->index_to_input[attr];

+      struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;

+      struct st_buffer_object *stobj = st_buffer_object(bufobj);

+      GLsizei stride = arrays[mesaAttr]->StrideB;

+

+      /*printf("stobj %u = %p\n", attr, (void*)stobj);*/

+

+      if (attr == 0) {

+         const GLubyte *low, *high;

+

+         get_arrays_bounds(vp, vpv, arrays, max_index, &low, &high);

+         /* debug_printf("buffer range: %p %p range %d max index %u\n",

+            low, high, high - low, max_index); */

+

+         offset0 = low;

+         if (userSpace) {

+            vbuffer->buffer =

+               pipe_user_buffer_create(pipe->screen, (void *) low, high - low,

+				       PIPE_BIND_VERTEX_BUFFER);

+            vbuffer->buffer_offset = 0;

+         }

+         else {

+            vbuffer->buffer = NULL;

+            pipe_resource_reference(&vbuffer->buffer, stobj->buffer);

+            vbuffer->buffer_offset = pointer_to_offset(low);

+         }

+         vbuffer->stride = stride; /* in bytes */

+         vbuffer->max_index = max_index;

+      }

+

+      velements[attr].src_offset =

+         (unsigned) (arrays[mesaAttr]->Ptr - offset0);

+      velements[attr].instance_divisor = 0;

+      velements[attr].vertex_buffer_index = 0;

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

+   }

+}

+

+

+/**

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

+                              GLuint max_index,

+                              GLboolean *userSpace,

+                              struct pipe_vertex_buffer vbuffer[],

+                              struct pipe_vertex_element velements[])

+{

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

+      struct gl_buffer_object *bufobj = arrays[mesaAttr]->BufferObj;

+      GLsizei stride = arrays[mesaAttr]->StrideB;

+

+      *userSpace = GL_FALSE;

+

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

+         /*printf("stobj %u = %p\n", attr, (void*) stobj);*/

+

+         vbuffer[attr].buffer = NULL;

+         pipe_resource_reference(&vbuffer[attr].buffer, stobj->buffer);

+         vbuffer[attr].buffer_offset = pointer_to_offset(arrays[mesaAttr]->Ptr);

+         velements[attr].src_offset = 0;

+      }

+      else {

+         /* attribute data is in user-space memory, not a VBO */

+         uint bytes;

+         /*printf("user-space array %d stride %d\n", attr, stride);*/

+	

+         *userSpace = GL_TRUE;

+

+         /* wrap user data */

+         if (arrays[mesaAttr]->Ptr) {

+            /* user's vertex array */

+            if (arrays[mesaAttr]->StrideB) {

+               bytes = arrays[mesaAttr]->StrideB * (max_index + 1);

+            }

+            else {

+               bytes = arrays[mesaAttr]->Size

+                  * _mesa_sizeof_type(arrays[mesaAttr]->Type);

+            }

+            vbuffer[attr].buffer = 

+	       pipe_user_buffer_create(pipe->screen,

+				       (void *) arrays[mesaAttr]->Ptr, bytes,

+				       PIPE_BIND_VERTEX_BUFFER);

+         }

+         else {

+            /* no array, use ctx->Current.Attrib[] value */

+            bytes = sizeof(ctx->Current.Attrib[0]);

+            vbuffer[attr].buffer = 

+	       pipe_user_buffer_create(pipe->screen,

+				       (void *) ctx->Current.Attrib[mesaAttr],

+				       bytes,

+				       PIPE_BIND_VERTEX_BUFFER);

+            stride = 0;

+         }

+

+         vbuffer[attr].buffer_offset = 0;

+         velements[attr].src_offset = 0;

+      }

+

+      assert(velements[attr].src_offset <= 2048); /* 11-bit field */

+

+      /* common-case setup */

+      vbuffer[attr].stride = stride; /* in bytes */

+      vbuffer[attr].max_index = max_index;

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

+   }

+}

+

+

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

+}

+

+

+

+/**

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

+   const struct st_vertex_program *vp;

+   const struct st_vp_variant *vpv;

+   struct pipe_vertex_buffer vbuffer[PIPE_MAX_SHADER_INPUTS];

+   GLuint attr;

+   struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];

+   unsigned num_vbuffers, num_velements;

+   struct pipe_index_buffer ibuffer;

+   GLboolean userSpace = GL_FALSE;

+   GLboolean vertDataEdgeFlags;

+   struct pipe_draw_info info;

+   unsigned i;

+

+   /* Mesa core state should have been validated already */

+   assert(ctx->NewState == 0x0);

+

+   /* 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);

+

+   /* 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);

+

+   /* must get these after state validation! */

+   vp = st->vp;

+   vpv = st->vp_variant;

+

+#if 0

+   if (MESA_VERBOSE & VERBOSE_GLSL) {

+      check_uniforms(ctx);

+   }

+#else

+   (void) check_uniforms;

+#endif

+

+   memset(velements, 0, sizeof(struct pipe_vertex_element) * vpv->num_inputs);

+   /*

+    * Setup the vbuffer[] and velements[] arrays.

+    */

+   if (is_interleaved_arrays(vp, vpv, arrays, &userSpace)) {

+      /*printf("Draw interleaved\n");*/

+      setup_interleaved_attribs(ctx, vp, vpv, arrays, max_index, userSpace,

+                                vbuffer, velements);

+      num_vbuffers = 1;

+      num_velements = vpv->num_inputs;

+      if (num_velements == 0)

+         num_vbuffers = 0;

+   }

+   else {

+      /*printf("Draw non-interleaved\n");*/

+      setup_non_interleaved_attribs(ctx, vp, vpv, arrays, max_index,

+                                    &userSpace, vbuffer, velements);

+      num_vbuffers = vpv->num_inputs;

+      num_velements = vpv->num_inputs;

+   }

+

+#if 0

+   {

+      GLuint i;

+      for (i = 0; i < num_vbuffers; i++) {

+         printf("buffers[%d].stride = %u\n", i, vbuffer[i].stride);

+         printf("buffers[%d].max_index = %u\n", i, vbuffer[i].max_index);

+         printf("buffers[%d].buffer_offset = %u\n", i, vbuffer[i].buffer_offset);

+         printf("buffers[%d].buffer = %p\n", i, (void*) vbuffer[i].buffer);

+      }

+      for (i = 0; i < num_velements; i++) {

+         printf("vlements[%d].vbuffer_index = %u\n", i, velements[i].vertex_buffer_index);

+         printf("vlements[%d].src_offset = %u\n", i, velements[i].src_offset);

+         printf("vlements[%d].format = %s\n", i, util_format_name(velements[i].src_format));

+      }

+   }

+#endif

+

+   pipe->set_vertex_buffers(pipe, num_vbuffers, vbuffer);

+   cso_set_vertex_elements(st->cso_context, num_velements, velements);

+

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

+

+   /* unreference buffers (frees wrapped user-space buffer objects) */

+   for (attr = 0; attr < num_vbuffers; attr++) {

+      pipe_resource_reference(&vbuffer[attr].buffer, NULL);

+      assert(!vbuffer[attr].buffer);

+   }

+

+   if (userSpace) 

+   {

+      pipe->set_vertex_buffers(pipe, 0, 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.h b/mesalib/src/mesa/state_tracker/st_draw.h
new file mode 100644
index 000000000..6c8b78c76
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_draw.h
@@ -0,0 +1,91 @@
+/**************************************************************************

+ * 

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

+  */

+    

+

+#ifndef ST_DRAW_H

+#define ST_DRAW_H

+

+#include "main/compiler.h"

+#include "main/glheader.h"

+

+struct _mesa_index_buffer;

+struct _mesa_prim;

+struct gl_client_array;

+struct gl_context;

+struct st_context;

+

+void st_init_draw( struct st_context *st );

+

+void st_destroy_draw( struct st_context *st );

+

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

+

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

+

+/* Internal function:

+ */

+extern GLuint

+st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,

+                      GLboolean normalized);

+

+

+/**

+ * When drawing with VBOs, the addresses specified with

+ * glVertex/Color/TexCoordPointer() are really offsets into the VBO, not real

+ * addresses.  At some point we need to convert those pointers to offsets.

+ * This function is basically a cast wrapper to avoid warnings when building

+ * in 64-bit mode.

+ */

+static INLINE unsigned

+pointer_to_offset(const void *ptr)

+{

+   return (unsigned) (((unsigned long) ptr) & 0xffffffffUL);

+}

+

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
new file mode 100644
index 000000000..b05e660ae
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
@@ -0,0 +1,286 @@
+/**************************************************************************

+ * 

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

+   struct pipe_transfer *cb_transfer;

+   GLuint attr, i;

+   ubyte *mapped_constants;

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

+      vbuffers[attr].max_index = max_index;

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

+	 return;

+      }

+

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

+   }

+

+   /* map constant buffers */

+   mapped_constants = pipe_buffer_map(pipe,

+                                      st->state.constants[PIPE_SHADER_VERTEX],

+                                      PIPE_TRANSFER_READ,

+				      &cb_transfer);

+   draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0,

+                                   mapped_constants,

+                                   st->state.constants[PIPE_SHADER_VERTEX]->width0);

+

+

+   /* draw here */

+   for (i = 0; i < nr_prims; i++) {

+      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);

+   }

+

+

+   /* unmap constant buffers */

+   pipe_buffer_unmap(pipe, cb_transfer);

+

+   /*

+    * unmap vertex/index buffers

+    */

+   for (i = 0; i < PIPE_MAX_ATTRIBS; i++) {

+      if (draw->pt.vertex_buffer[i].buffer) {

+         pipe_buffer_unmap(pipe, vb_transfer[i]);

+         pipe_resource_reference(&draw->pt.vertex_buffer[i].buffer, NULL);

+         draw_set_mapped_vertex_buffer(draw, i, NULL);

+      }

+   }

+

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

+   }

+}

+

+#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
new file mode 100644
index 000000000..c80811a07
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -0,0 +1,462 @@
+/**************************************************************************

+ * 

+ * 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 "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_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;

+

+   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, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)) {

+      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, 0) &&

+            screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_USCALED,

+                                        PIPE_TEXTURE_2D, 0,

+                                        PIPE_BIND_SAMPLER_VIEW, 0)) {

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

+      screen->is_format_supported(screen, PIPE_FORMAT_B8G8R8A8_SRGB,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)) {

+      ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

+   }

+

+   if (screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)) {

+      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, 0) &&

+       (ctx->Mesa_DXTn ||

+        screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,

+                                    PIPE_TEXTURE_2D, 0,

+                                    PIPE_BIND_RENDER_TARGET, 0))) {

+      ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;

+      ctx->Extensions.S3_s3tc = GL_TRUE;

+   }

+

+   /* ycbcr support */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0) ||

+       screen->is_format_supported(screen, PIPE_FORMAT_YUYV, 

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)) {

+      ctx->Extensions.MESA_ycbcr_texture = 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;

+   }

+

+   /* GL_ARB_half_float_vertex */

+   if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_FLOAT,

+                                   PIPE_BUFFER, 0,

+                                   PIPE_BIND_VERTEX_BUFFER, 0)) {

+      ctx->Extensions.ARB_half_float_vertex = GL_TRUE;

+   }

+

+#if 0 /* not yet */

+   if (screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC)) {

+      ctx->Extensions.ARB_draw_buffers_blend = GL_TRUE;

+   }

+#endif

+

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

+   }

+

+   if (screen->get_param(screen, PIPE_CAP_SHADER_STENCIL_EXPORT)) {

+      ctx->Extensions.ARB_shader_stencil_export = GL_TRUE;

+   }

+}

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.h b/mesalib/src/mesa/state_tracker/st_extensions.h
new file mode 100644
index 000000000..f29f9e1cf
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_extensions.h
@@ -0,0 +1,40 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_EXTENSIONS_H

+#define ST_EXTENSIONS_H

+

+

+struct st_context;

+

+extern void st_init_limits(struct st_context *st);

+

+extern void st_init_extensions(struct st_context *st);

+

+

+#endif /* ST_EXTENSIONS_H */

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
new file mode 100644
index 000000000..11253d11a
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -0,0 +1,1090 @@
+/**************************************************************************

+ * 

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

+      /* compressed format? */

+      assert(0);

+   }

+

+   assert(0);

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

+

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

+      return MESA_FORMAT_SIGNED_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;

+

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

+                      unsigned geom_flags)

+{

+   uint i;

+   for (i = 0; i < num_formats; i++) {

+      if (screen->is_format_supported(screen, formats[i], target,

+                                      sample_count, tex_usage, geom_flags)) {

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

+                    unsigned geom_flags)

+{

+   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, geom_flags);

+}

+

+

+/**

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

+                   unsigned geom_flags)

+{

+   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, geom_flags);

+}

+

+/**

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

+                    unsigned geom_flags)

+{

+   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, geom_flags);

+}

+

+

+/**

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

+{

+   unsigned geom_flags = 0; /* we don't care about POT vs. NPOT here, yet */

+

+   switch (internalFormat) {

+   case GL_RGB10:

+   case GL_RGB10_A2:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B10G10R10A2_UNORM,

+                                       target, sample_count, bindings,

+                                       geom_flags ))

+         return PIPE_FORMAT_B10G10R10A2_UNORM;

+      /* Pass through. */

+   case 4:

+   case GL_RGBA:

+   case GL_RGBA8:

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case 3:

+   case GL_RGB:

+   case GL_RGB8:

+      return default_rgb_format( screen, target, sample_count, bindings,

+                                 geom_flags );

+

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

+                                             geom_flags ))

+         return PIPE_FORMAT_R16G16B16A16_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_RGBA4:

+   case GL_RGBA2:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B4G4R4A4_UNORM,

+                                       target, sample_count, bindings,

+                                       geom_flags ))

+         return PIPE_FORMAT_B4G4R4A4_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_RGB5_A1:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G5R5A1_UNORM,

+                                       target, sample_count, bindings,

+                                       geom_flags ))

+         return PIPE_FORMAT_B5G5R5A1_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_R3_G3_B2:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B2G3R3_UNORM,

+                                       target, sample_count, bindings,

+                                       geom_flags ))

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

+                                       geom_flags ))

+         return PIPE_FORMAT_B5G6R5_UNORM;

+      if (screen->is_format_supported( screen, PIPE_FORMAT_B5G5R5A1_UNORM,

+                                       target, sample_count, bindings,

+                                       geom_flags ))

+         return PIPE_FORMAT_B5G5R5A1_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_ALPHA12:

+   case GL_ALPHA16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_A16_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

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

+         return PIPE_FORMAT_A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_LUMINANCE12:

+   case GL_LUMINANCE16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L16_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

+         return PIPE_FORMAT_L16_UNORM;

+      /* Pass through. */

+   case 1:

+   case GL_LUMINANCE:

+   case GL_LUMINANCE4:

+   case GL_LUMINANCE8:

+   case GL_COMPRESSED_LUMINANCE:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L8_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

+         return PIPE_FORMAT_L8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

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

+         return PIPE_FORMAT_L16A16_UNORM;

+      /* Pass through. */

+   case 2:

+   case GL_LUMINANCE_ALPHA:

+   case GL_LUMINANCE6_ALPHA2:

+   case GL_LUMINANCE8_ALPHA8:

+   case GL_COMPRESSED_LUMINANCE_ALPHA:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

+         return PIPE_FORMAT_L8A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_LUMINANCE4_ALPHA4:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L4A4_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

+         return PIPE_FORMAT_L4A4_UNORM;

+      if (screen->is_format_supported( screen, PIPE_FORMAT_L8A8_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

+         return PIPE_FORMAT_L8A8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_INTENSITY12:

+   case GL_INTENSITY16:

+      if (screen->is_format_supported( screen, PIPE_FORMAT_I16_UNORM, target,

+                                       sample_count, bindings, geom_flags ))

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

+         return PIPE_FORMAT_I8_UNORM;

+      return default_rgba_format( screen, target, sample_count, bindings,

+                                  geom_flags );

+

+   case GL_YCBCR_MESA:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, target,

+                                      sample_count, bindings, geom_flags)) {

+         return PIPE_FORMAT_UYVY;

+      }

+      if (screen->is_format_supported(screen, PIPE_FORMAT_YUYV, target,

+                                      sample_count, bindings, geom_flags)) {

+         return PIPE_FORMAT_YUYV;

+      }

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RED:

+   case GL_COMPRESSED_RG:

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

+                                           geom_flags))

+         return PIPE_FORMAT_DXT1_RGB;

+      else

+         return default_rgb_format(screen, target, sample_count, bindings,

+                                   geom_flags);

+

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

+                                           geom_flags))

+         return PIPE_FORMAT_DXT3_RGBA;

+      else

+         return default_rgba_format(screen, target, sample_count, bindings,

+                                    geom_flags);

+

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

+                                      geom_flags))

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

+                                      geom_flags))

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

+                                      geom_flags))

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

+                                      geom_flags))

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

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

+         return PIPE_FORMAT_Z24_UNORM_S8_USCALED;

+      if (screen->is_format_supported(screen, PIPE_FORMAT_S8_USCALED_Z24_UNORM,

+                                      target, sample_count, bindings, geom_flags))

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

+         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, geom_flags);

+      }

+

+   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, geom_flags);

+      }

+

+   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, geom_flags);

+      }

+

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

+                                   geom_flags );

+

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

+         return PIPE_FORMAT_DXT1_SRGB;

+      return default_srgba_format( screen, target, sample_count, bindings,

+                                   geom_flags );

+

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

+         return PIPE_FORMAT_DXT3_SRGBA;

+      return default_srgba_format( screen, target, sample_count, bindings,

+                                   geom_flags );

+

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

+         return PIPE_FORMAT_L8A8_SRGB;

+      return default_srgba_format( screen, target, sample_count, bindings,

+                                   geom_flags );

+

+   case GL_SLUMINANCE_EXT:

+   case GL_SLUMINANCE8_EXT:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_L8_SRGB, target,

+                                      sample_count, bindings, geom_flags))

+         return PIPE_FORMAT_L8_SRGB;

+      return default_srgba_format( screen, target, sample_count, bindings,

+                                   geom_flags );

+

+   case GL_RED:

+   case GL_R8:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, target,

+				      sample_count, bindings, geom_flags))

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

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

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

+	      return PIPE_FORMAT_R16G16_UNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RED_RGTC1:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM, target,

+				      sample_count, bindings, geom_flags))

+	      return PIPE_FORMAT_RGTC1_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, geom_flags))

+	      return PIPE_FORMAT_RGTC1_SNORM;

+      return PIPE_FORMAT_NONE;

+

+   case GL_COMPRESSED_RG_RGTC2:

+      if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM, target,

+				      sample_count, bindings, geom_flags))

+	      return PIPE_FORMAT_RGTC2_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, geom_flags))

+	      return PIPE_FORMAT_RGTC2_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, geom_flags))

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

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

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

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

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

+         return PIPE_FORMAT_R32G32B32A32_USCALED;

+      return PIPE_FORMAT_NONE;

+

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

+

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

+}

diff --git a/mesalib/src/mesa/state_tracker/st_format.h b/mesalib/src/mesa/state_tracker/st_format.h
new file mode 100644
index 000000000..ffcaf402a
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_format.h
@@ -0,0 +1,80 @@
+/**************************************************************************

+ * 

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

+

+#endif /* ST_FORMAT_H */

diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
new file mode 100644
index 000000000..a7dfbea1a
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -0,0 +1,423 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#include "main/imports.h"

+#include "main/mipmap.h"

+#include "main/teximage.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "util/u_format.h"

+#include "util/u_gen_mipmap.h"

+

+#include "st_debug.h"

+#include "st_context.h"

+#include "st_texture.h"

+#include "st_gen_mipmap.h"

+#include "st_cb_texture.h"

+

+

+/**

+ * one-time init for generate mipmap

+ * XXX Note: there may be other times we need no-op/simple state like this.

+ * In that case, some code refactoring would be good.

+ */

+void

+st_init_generate_mipmap(struct st_context *st)

+{

+   st->gen_mipmap = util_create_gen_mipmap(st->pipe, st->cso_context);

+}

+

+

+void

+st_destroy_generate_mipmap(struct st_context *st)

+{

+   util_destroy_gen_mipmap(st->gen_mipmap);

+   st->gen_mipmap = NULL;

+}

+

+

+/**

+ * Generate mipmap levels using hardware rendering.

+ * \return TRUE if successful, FALSE if not possible

+ */

+static boolean

+st_render_mipmap(struct st_context *st,

+                 GLenum target,

+                 struct st_texture_object *stObj,

+                 uint baseLevel, uint lastLevel)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = pipe->screen;

+   struct pipe_sampler_view *psv = st_get_texture_sampler_view(stObj, pipe);

+   const uint face = _mesa_tex_target_to_face(target);

+

+   assert(psv->texture == stObj->pt);

+#if 0

+   assert(target != GL_TEXTURE_3D); /* implemented but untested */

+#endif

+

+   /* check if we can render in the texture's format */

+   /* XXX should probably kill this and always use util_gen_mipmap

+      since this implements a sw fallback as well */

+   if (!screen->is_format_supported(screen, psv->format, psv->texture->target,

+                                    0, PIPE_BIND_RENDER_TARGET, 0)) {

+      return FALSE;

+   }

+

+   util_gen_mipmap(st->gen_mipmap, psv, face, baseLevel, lastLevel,

+                   PIPE_TEX_FILTER_LINEAR);

+

+   return TRUE;

+}

+

+

+/**

+ * Helper function to decompress an image.  The result is a 32-bpp RGBA

+ * image with stride==width.

+ */

+static void

+decompress_image(enum pipe_format format,

+                 const uint8_t *src, uint8_t *dst,

+                 unsigned width, unsigned height)

+{

+   const struct util_format_description *desc = util_format_description(format);

+   const uint bw = util_format_get_blockwidth(format);

+   const uint bh = util_format_get_blockheight(format);

+   const uint dst_stride = 4 * MAX2(width, bw);

+   const uint src_stride = util_format_get_stride(format, width);

+

+   desc->unpack_rgba_8unorm(dst, dst_stride, src, src_stride, width, height);

+

+   if (width < bw || height < bh) {

+      /* We're decompressing an image smaller than the compression

+       * block size.  We don't want garbage pixel values in the region

+       * outside (width x height) so replicate pixels from the (width

+       * x height) region to fill out the (bw x bh) block size.

+       */

+      uint x, y;

+      for (y = 0; y < bh; y++) {

+         for (x = 0; x < bw; x++) {

+            if (x >= width || y >= height) {

+               uint p = (y * bw + x) * 4;

+               dst[p + 0] = dst[0];

+               dst[p + 1] = dst[1];

+               dst[p + 2] = dst[2];

+               dst[p + 3] = dst[3];

+            }

+         }

+      }

+   }

+}

+

+

+/**

+ * Helper function to compress an image.  The source is a 32-bpp RGBA image

+ * with stride==width.

+ */

+static void

+compress_image(enum pipe_format format,

+               const uint8_t *src, uint8_t *dst,

+               unsigned width, unsigned height)

+{

+   const struct util_format_description *desc = util_format_description(format);

+   const uint dst_stride = util_format_get_stride(format, width);

+   const uint src_stride = 4 * width;

+

+   desc->pack_rgba_8unorm(dst, dst_stride, src, src_stride, width, height);

+}

+

+

+/**

+ * Software fallback for generate mipmap levels.

+ */

+static void

+fallback_generate_mipmap(struct gl_context *ctx, GLenum target,

+                         struct gl_texture_object *texObj)

+{

+   struct pipe_context *pipe = st_context(ctx)->pipe;

+   struct pipe_resource *pt = st_get_texobj_resource(texObj);

+   const uint baseLevel = texObj->BaseLevel;

+   const uint lastLevel = pt->last_level;

+   const uint face = _mesa_tex_target_to_face(target);

+   uint dstLevel;

+   GLenum datatype;

+   GLuint comps;

+   GLboolean compressed;

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   assert(target != GL_TEXTURE_3D); /* not done yet */

+

+   compressed =

+      _mesa_is_format_compressed(texObj->Image[face][baseLevel]->TexFormat);

+

+   if (compressed) {

+      datatype = GL_UNSIGNED_BYTE;

+      comps = 4;

+   }

+   else {

+      _mesa_format_to_type_and_comps(texObj->Image[face][baseLevel]->TexFormat,

+                                     &datatype, &comps);

+      assert(comps > 0 && "bad texture format in fallback_generate_mipmap()");

+   }

+

+   for (dstLevel = baseLevel + 1; dstLevel <= lastLevel; dstLevel++) {

+      const uint srcLevel = dstLevel - 1;

+      const uint srcWidth = u_minify(pt->width0, srcLevel);

+      const uint srcHeight = u_minify(pt->height0, srcLevel);

+      const uint srcDepth = u_minify(pt->depth0, srcLevel);

+      const uint dstWidth = u_minify(pt->width0, dstLevel);

+      const uint dstHeight = u_minify(pt->height0, dstLevel);

+      const uint dstDepth = u_minify(pt->depth0, dstLevel);

+      struct pipe_transfer *srcTrans, *dstTrans;

+      const ubyte *srcData;

+      ubyte *dstData;

+      int srcStride, dstStride;

+

+      srcTrans = pipe_get_transfer(st_context(ctx)->pipe, pt, srcLevel,

+                                   face,

+                                   PIPE_TRANSFER_READ, 0, 0,

+                                   srcWidth, srcHeight);

+

+      dstTrans = pipe_get_transfer(st_context(ctx)->pipe, pt, dstLevel,

+                                   face,

+                                   PIPE_TRANSFER_WRITE, 0, 0,

+                                   dstWidth, dstHeight);

+

+      srcData = (ubyte *) pipe_transfer_map(pipe, srcTrans);

+      dstData = (ubyte *) pipe_transfer_map(pipe, dstTrans);

+

+      srcStride = srcTrans->stride / util_format_get_blocksize(srcTrans->resource->format);

+      dstStride = dstTrans->stride / util_format_get_blocksize(dstTrans->resource->format);

+

+     /* this cannot work correctly for 3d since it does

+        not respect layerStride. */

+      if (compressed) {

+         const enum pipe_format format = pt->format;

+         const uint bw = util_format_get_blockwidth(format);

+         const uint bh = util_format_get_blockheight(format);

+         const uint srcWidth2 = align(srcWidth, bw);

+         const uint srcHeight2 = align(srcHeight, bh);

+         const uint dstWidth2 = align(dstWidth, bw);

+         const uint dstHeight2 = align(dstHeight, bh);

+         uint8_t *srcTemp, *dstTemp;

+

+         assert(comps == 4);

+

+         srcTemp = malloc(srcWidth2 * srcHeight2 * comps + 000);

+         dstTemp = malloc(dstWidth2 * dstHeight2 * comps + 000);

+

+         /* decompress the src image: srcData -> srcTemp */

+         decompress_image(format, srcData, srcTemp, srcWidth, srcHeight);

+

+         _mesa_generate_mipmap_level(target, datatype, comps,

+                                     0 /*border*/,

+                                     srcWidth2, srcHeight2, srcDepth,

+                                     srcTemp,

+                                     srcWidth2, /* stride in texels */

+                                     dstWidth2, dstHeight2, dstDepth,

+                                     dstTemp,

+                                     dstWidth2); /* stride in texels */

+

+         /* compress the new image: dstTemp -> dstData */

+         compress_image(format, dstTemp, dstData, dstWidth, dstHeight);

+

+         free(srcTemp);

+         free(dstTemp);

+      }

+      else {

+         _mesa_generate_mipmap_level(target, datatype, comps,

+                                     0 /*border*/,

+                                     srcWidth, srcHeight, srcDepth,

+                                     srcData,

+                                     srcStride, /* stride in texels */

+                                     dstWidth, dstHeight, dstDepth,

+                                     dstData,

+                                     dstStride); /* stride in texels */

+      }

+

+      pipe_transfer_unmap(pipe, srcTrans);

+      pipe_transfer_unmap(pipe, dstTrans);

+

+      pipe->transfer_destroy(pipe, srcTrans);

+      pipe->transfer_destroy(pipe, dstTrans);

+   }

+}

+

+

+/**

+ * Compute the expected number of mipmap levels in the texture given

+ * the width/height/depth of the base image and the GL_TEXTURE_BASE_LEVEL/

+ * GL_TEXTURE_MAX_LEVEL settings.  This will tell us how many mipmap

+ * levels should be generated.

+ */

+static GLuint

+compute_num_levels(struct gl_context *ctx,

+                   struct gl_texture_object *texObj,

+                   GLenum target)

+{

+   if (target == GL_TEXTURE_RECTANGLE_ARB) {

+      return 1;

+   }

+   else {

+      const struct gl_texture_image *baseImage = 

+         _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel);

+      GLuint size, numLevels;

+

+      size = MAX2(baseImage->Width2, baseImage->Height2);

+      size = MAX2(size, baseImage->Depth2);

+

+      numLevels = texObj->BaseLevel;

+

+      while (size > 0) {

+         numLevels++;

+         size >>= 1;

+      }

+

+      numLevels = MIN2(numLevels, texObj->MaxLevel + 1);

+

+      assert(numLevels >= 1);

+

+      return numLevels;

+   }

+}

+

+

+/**

+ * Called via ctx->Driver.GenerateMipmap().

+ */

+void

+st_generate_mipmap(struct gl_context *ctx, GLenum target,

+                   struct gl_texture_object *texObj)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   struct pipe_resource *pt = st_get_texobj_resource(texObj);

+   const uint baseLevel = texObj->BaseLevel;

+   uint lastLevel;

+   uint dstLevel;

+

+   if (!pt)

+      return;

+

+   /* not sure if this ultimately actually should work,

+      but we're not supporting multisampled textures yet. */

+   assert(pt->nr_samples < 2);

+

+   /* find expected last mipmap level to generate*/

+   lastLevel = compute_num_levels(ctx, texObj, target) - 1;

+

+   if (lastLevel == 0)

+      return;

+

+   if (pt->last_level < lastLevel) {

+      /* The current gallium texture doesn't have space for all the

+       * mipmap levels we need to generate.  So allocate a new texture.

+       */

+      struct pipe_resource *oldTex = stObj->pt;

+

+      /* create new texture with space for more levels */

+      stObj->pt = st_texture_create(st,

+                                    oldTex->target,

+                                    oldTex->format,

+                                    lastLevel,

+                                    oldTex->width0,

+                                    oldTex->height0,

+                                    oldTex->depth0,

+                                    oldTex->bind);

+

+      /* The texture isn't in a "complete" state yet so set the expected

+       * lastLevel here, since it won't get done in st_finalize_texture().

+       */

+      stObj->lastLevel = lastLevel;

+

+      /* This will copy the old texture's base image into the new texture

+       * which we just allocated.

+       */

+      st_finalize_texture(ctx, st->pipe, texObj);

+

+      /* release the old tex (will likely be freed too) */

+      pipe_resource_reference(&oldTex, NULL);

+      pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+

+      pt = stObj->pt;

+   }

+   else {

+      /* Make sure that the base texture image data is present in the

+       * texture buffer.

+       */

+      st_finalize_texture(ctx, st->pipe, texObj);

+   }

+

+   assert(pt->last_level >= lastLevel);

+

+   /* Try to generate the mipmap by rendering/texturing.  If that fails,

+    * use the software fallback.

+    */

+   if (!st_render_mipmap(st, target, stObj, baseLevel, lastLevel)) {

+      /* since the util code actually also has a fallback, should

+         probably make it never fail and kill this */

+      fallback_generate_mipmap(ctx, target, texObj);

+   }

+

+   /* Fill in the Mesa gl_texture_image fields */

+   for (dstLevel = baseLevel + 1; dstLevel <= lastLevel; dstLevel++) {

+      const uint srcLevel = dstLevel - 1;

+      const struct gl_texture_image *srcImage

+         = _mesa_get_tex_image(ctx, texObj, target, srcLevel);

+      struct gl_texture_image *dstImage;

+      struct st_texture_image *stImage;

+      uint dstWidth = u_minify(pt->width0, dstLevel);

+      uint dstHeight = u_minify(pt->height0, dstLevel);

+      uint dstDepth = u_minify(pt->depth0, dstLevel); 

+      uint border = srcImage->Border;

+

+      dstImage = _mesa_get_tex_image(ctx, texObj, target, dstLevel);

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

+

+      stImage = st_texture_image(dstImage);

+      stImage->level = dstLevel;

+

+      pipe_resource_reference(&stImage->pt, pt);

+   }

+}

diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.h b/mesalib/src/mesa/state_tracker/st_gen_mipmap.h
new file mode 100644
index 000000000..8a361a1f6
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.h
@@ -0,0 +1,52 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_GEN_MIPMAP_H

+#define ST_GEN_MIPMAP_H

+

+

+#include "main/glheader.h"

+

+struct gl_context;

+struct gl_texture_object;

+struct st_context;

+

+extern void

+st_init_generate_mipmap(struct st_context *st);

+

+

+extern void

+st_destroy_generate_mipmap(struct st_context *st);

+

+

+extern void

+st_generate_mipmap(struct gl_context *ctx, GLenum target,

+                   struct gl_texture_object *texObj);

+

+

+#endif /* ST_GEN_MIPMAP_H */

diff --git a/mesalib/src/mesa/state_tracker/st_gl_api.h b/mesalib/src/mesa/state_tracker/st_gl_api.h
new file mode 100644
index 000000000..59782d0d5
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_gl_api.h
@@ -0,0 +1,7 @@
+

+#ifndef ST_GL_API_H

+#define ST_GL_API_H

+

+struct st_api *st_gl_api_create(void);

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c
new file mode 100644
index 000000000..74d402daa
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_manager.c
@@ -0,0 +1,924 @@
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.9

+ *

+ * Copyright (C) 2010 LunarG 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

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

+ *

+ * Authors:

+ *    Chia-I Wu <olv@lunarg.com>

+ */

+

+#include "state_tracker/st_gl_api.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_screen.h"

+#include "util/u_format.h"

+#include "util/u_pointer.h"

+#include "util/u_inlines.h"

+#include "util/u_atomic.h"

+#include "util/u_surface.h"

+

+#include "main/mtypes.h"

+#include "main/context.h"

+#include "main/texobj.h"

+#include "main/teximage.h"

+#include "main/texstate.h"

+#include "main/framebuffer.h"

+#include "main/fbobject.h"

+#include "main/renderbuffer.h"

+#include "main/version.h"

+#include "st_texture.h"

+

+#include "st_context.h"

+#include "st_format.h"

+#include "st_cb_fbo.h"

+#include "st_cb_flush.h"

+#include "st_manager.h"

+

+/**

+ * Cast wrapper to convert a struct gl_framebuffer to an st_framebuffer.

+ * Return NULL if the struct gl_framebuffer is a user-created framebuffer.

+ * We'll only return non-null for window system framebuffers.

+ * Note that this function may fail.

+ */

+static INLINE struct st_framebuffer *

+st_ws_framebuffer(struct gl_framebuffer *fb)

+{

+   /* FBO cannot be casted.  See st_new_framebuffer */

+   return (struct st_framebuffer *) ((fb && !fb->Name) ? fb : NULL);

+}

+

+/**

+ * Map an attachment to a buffer index.

+ */

+static INLINE gl_buffer_index

+attachment_to_buffer_index(enum st_attachment_type statt)

+{

+   gl_buffer_index index;

+

+   switch (statt) {

+   case ST_ATTACHMENT_FRONT_LEFT:

+      index = BUFFER_FRONT_LEFT;

+      break;

+   case ST_ATTACHMENT_BACK_LEFT:

+      index = BUFFER_BACK_LEFT;

+      break;

+   case ST_ATTACHMENT_FRONT_RIGHT:

+      index = BUFFER_FRONT_RIGHT;

+      break;

+   case ST_ATTACHMENT_BACK_RIGHT:

+      index = BUFFER_BACK_RIGHT;

+      break;

+   case ST_ATTACHMENT_DEPTH_STENCIL:

+      index = BUFFER_DEPTH;

+      break;

+   case ST_ATTACHMENT_ACCUM:

+      index = BUFFER_ACCUM;

+      break;

+   case ST_ATTACHMENT_SAMPLE:

+   default:

+      index = BUFFER_COUNT;

+      break;

+   }

+

+   return index;

+}

+

+/**

+ * Map a buffer index to an attachment.

+ */

+static INLINE enum st_attachment_type

+buffer_index_to_attachment(gl_buffer_index index)

+{

+   enum st_attachment_type statt;

+

+   switch (index) {

+   case BUFFER_FRONT_LEFT:

+      statt = ST_ATTACHMENT_FRONT_LEFT;

+      break;

+   case BUFFER_BACK_LEFT:

+      statt = ST_ATTACHMENT_BACK_LEFT;

+      break;

+   case BUFFER_FRONT_RIGHT:

+      statt = ST_ATTACHMENT_FRONT_RIGHT;

+      break;

+   case BUFFER_BACK_RIGHT:

+      statt = ST_ATTACHMENT_BACK_RIGHT;

+      break;

+   case BUFFER_DEPTH:

+      statt = ST_ATTACHMENT_DEPTH_STENCIL;

+      break;

+   case BUFFER_ACCUM:

+      statt = ST_ATTACHMENT_ACCUM;

+      break;

+   default:

+      statt = ST_ATTACHMENT_INVALID;

+      break;

+   }

+

+   return statt;

+}

+

+/**

+ * Validate a framebuffer to make sure up-to-date pipe_textures are used.

+ */

+static void

+st_framebuffer_validate(struct st_framebuffer *stfb, struct st_context *st)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_resource *textures[ST_ATTACHMENT_COUNT];

+   uint width, height;

+   unsigned i;

+   boolean changed = FALSE;

+

+   if (!p_atomic_read(&stfb->revalidate))

+      return;

+

+   /* validate the fb */

+   if (!stfb->iface->validate(stfb->iface, stfb->statts, stfb->num_statts, textures))

+      return;

+

+   width = stfb->Base.Width;

+   height = stfb->Base.Height;

+

+   for (i = 0; i < stfb->num_statts; i++) {

+      struct st_renderbuffer *strb;

+      struct pipe_surface *ps, surf_tmpl;

+      gl_buffer_index idx;

+

+      if (!textures[i])

+         continue;

+

+      idx = attachment_to_buffer_index(stfb->statts[i]);

+      if (idx >= BUFFER_COUNT) {

+         pipe_resource_reference(&textures[i], NULL);

+         continue;

+      }

+

+      strb = st_renderbuffer(stfb->Base.Attachment[idx].Renderbuffer);

+      assert(strb);

+      if (strb->texture == textures[i]) {

+         pipe_resource_reference(&textures[i], NULL);

+         continue;

+      }

+

+      memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+      u_surface_default_template(&surf_tmpl, textures[i],

+                                 PIPE_BIND_RENDER_TARGET);

+      ps = pipe->create_surface(pipe, textures[i], &surf_tmpl);

+      if (ps) {

+         pipe_surface_reference(&strb->surface, ps);

+         pipe_resource_reference(&strb->texture, ps->texture);

+         /* ownership transfered */

+         pipe_surface_reference(&ps, NULL);

+

+         changed = TRUE;

+

+         strb->Base.Width = strb->surface->width;

+         strb->Base.Height = strb->surface->height;

+

+         width = strb->Base.Width;

+         height = strb->Base.Height;

+      }

+

+      pipe_resource_reference(&textures[i], NULL);

+   }

+

+   if (changed) {

+      st->dirty.st |= ST_NEW_FRAMEBUFFER;

+      _mesa_resize_framebuffer(st->ctx, &stfb->Base, width, height);

+

+      assert(stfb->Base.Width == width);

+      assert(stfb->Base.Height == height);

+   }

+

+   p_atomic_set(&stfb->revalidate, FALSE);

+}

+

+/**

+ * Update the attachments to validate by looping the existing renderbuffers.

+ */

+static void

+st_framebuffer_update_attachments(struct st_framebuffer *stfb)

+{

+   gl_buffer_index idx;

+

+   stfb->num_statts = 0;

+   for (idx = 0; idx < BUFFER_COUNT; idx++) {

+      struct st_renderbuffer *strb;

+      enum st_attachment_type statt;

+

+      strb = st_renderbuffer(stfb->Base.Attachment[idx].Renderbuffer);

+      if (!strb || strb->software)

+         continue;

+

+      statt = buffer_index_to_attachment(idx);

+      if (statt != ST_ATTACHMENT_INVALID &&

+          st_visual_have_buffers(stfb->iface->visual, 1 << statt))

+         stfb->statts[stfb->num_statts++] = statt;

+   }

+

+   p_atomic_set(&stfb->revalidate, TRUE);

+}

+

+/**

+ * Add a renderbuffer to the framebuffer.

+ */

+static boolean

+st_framebuffer_add_renderbuffer(struct st_framebuffer *stfb,

+                                gl_buffer_index idx)

+{

+   struct gl_renderbuffer *rb;

+   enum pipe_format format;

+   int samples;

+   boolean sw;

+

+   if (!stfb->iface)

+      return FALSE;

+

+   /* do not distinguish depth/stencil buffers */

+   if (idx == BUFFER_STENCIL)

+      idx = BUFFER_DEPTH;

+

+   switch (idx) {

+   case BUFFER_DEPTH:

+      format = stfb->iface->visual->depth_stencil_format;

+      sw = FALSE;

+      break;

+   case BUFFER_ACCUM:

+      format = stfb->iface->visual->accum_format;

+      sw = TRUE;

+      break;

+   default:

+      format = stfb->iface->visual->color_format;

+      sw = FALSE;

+      break;

+   }

+

+   if (format == PIPE_FORMAT_NONE)

+      return FALSE;

+

+   samples = stfb->iface->visual->samples;

+   if (!samples)

+      samples = st_get_msaa();

+

+   rb = st_new_renderbuffer_fb(format, samples, sw);

+   if (!rb)

+      return FALSE;

+

+   if (idx != BUFFER_DEPTH) {

+      _mesa_add_renderbuffer(&stfb->Base, idx, rb);

+   }

+   else {

+      if (util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_ZS, 0))

+         _mesa_add_renderbuffer(&stfb->Base, BUFFER_DEPTH, rb);

+      if (util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_ZS, 1))

+         _mesa_add_renderbuffer(&stfb->Base, BUFFER_STENCIL, rb);

+   }

+

+   return TRUE;

+}

+

+/**

+ * Intialize a struct gl_config from a visual.

+ */

+static void

+st_visual_to_context_mode(const struct st_visual *visual,

+                          struct gl_config *mode)

+{

+   memset(mode, 0, sizeof(*mode));

+

+   if (st_visual_have_buffers(visual, ST_ATTACHMENT_BACK_LEFT_MASK))

+      mode->doubleBufferMode = GL_TRUE;

+   if (st_visual_have_buffers(visual,

+            ST_ATTACHMENT_FRONT_RIGHT_MASK | ST_ATTACHMENT_BACK_RIGHT_MASK))

+      mode->stereoMode = GL_TRUE;

+

+   if (visual->color_format != PIPE_FORMAT_NONE) {

+      mode->rgbMode = GL_TRUE;

+

+      mode->redBits =

+         util_format_get_component_bits(visual->color_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 0);

+      mode->greenBits =

+         util_format_get_component_bits(visual->color_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 1);

+      mode->blueBits =

+         util_format_get_component_bits(visual->color_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 2);

+      mode->alphaBits =

+         util_format_get_component_bits(visual->color_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 3);

+

+      mode->rgbBits = mode->redBits +

+         mode->greenBits + mode->blueBits + mode->alphaBits;

+   }

+

+   if (visual->depth_stencil_format != PIPE_FORMAT_NONE) {

+      mode->depthBits =

+         util_format_get_component_bits(visual->depth_stencil_format,

+               UTIL_FORMAT_COLORSPACE_ZS, 0);

+      mode->stencilBits =

+         util_format_get_component_bits(visual->depth_stencil_format,

+               UTIL_FORMAT_COLORSPACE_ZS, 1);

+

+      mode->haveDepthBuffer = mode->depthBits > 0;

+      mode->haveStencilBuffer = mode->stencilBits > 0;

+   }

+

+   if (visual->accum_format != PIPE_FORMAT_NONE) {

+      mode->haveAccumBuffer = GL_TRUE;

+

+      mode->accumRedBits =

+         util_format_get_component_bits(visual->accum_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 0);

+      mode->accumGreenBits =

+         util_format_get_component_bits(visual->accum_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 1);

+      mode->accumBlueBits =

+         util_format_get_component_bits(visual->accum_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 2);

+      mode->accumAlphaBits =

+         util_format_get_component_bits(visual->accum_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 3);

+   }

+

+   if (visual->samples) {

+      mode->sampleBuffers = 1;

+      mode->samples = visual->samples;

+   }

+}

+

+/**

+ * Determine the default draw or read buffer from a visual.

+ */

+static void

+st_visual_to_default_buffer(const struct st_visual *visual,

+                            GLenum *buffer, GLint *index)

+{

+   enum st_attachment_type statt;

+   GLenum buf;

+   gl_buffer_index idx;

+

+   statt = visual->render_buffer;

+   /* do nothing if an invalid render buffer is specified */

+   if (statt == ST_ATTACHMENT_INVALID ||

+       !st_visual_have_buffers(visual, 1 << statt))

+      return;

+

+   switch (statt) {

+   case ST_ATTACHMENT_FRONT_LEFT:

+      buf = GL_FRONT_LEFT;

+      idx = BUFFER_FRONT_LEFT;

+      break;

+   case ST_ATTACHMENT_BACK_LEFT:

+      buf = GL_BACK_LEFT;

+      idx = BUFFER_BACK_LEFT;

+      break;

+   case ST_ATTACHMENT_FRONT_RIGHT:

+      buf = GL_FRONT_RIGHT;

+      idx = BUFFER_FRONT_RIGHT;

+      break;

+   case ST_ATTACHMENT_BACK_RIGHT:

+      buf = GL_BACK_RIGHT;

+      idx = BUFFER_BACK_RIGHT;

+      break;

+   default:

+      buf = GL_NONE;

+      idx = BUFFER_COUNT;

+      break;

+   }

+

+   if (buf != GL_NONE) {

+      if (buffer)

+         *buffer = buf;

+      if (index)

+         *index = idx;

+   }

+}

+

+/**

+ * Create a framebuffer from a manager interface.

+ */

+static struct st_framebuffer *

+st_framebuffer_create(struct st_framebuffer_iface *stfbi)

+{

+   struct st_framebuffer *stfb;

+   struct gl_config mode;

+   gl_buffer_index idx;

+

+   stfb = CALLOC_STRUCT(st_framebuffer);

+   if (!stfb)

+      return NULL;

+

+   /* for FBO-only context */

+   if (!stfbi) {

+      struct gl_framebuffer *base = _mesa_get_incomplete_framebuffer();

+

+      stfb->Base = *base;

+

+      return stfb;

+   }

+

+   st_visual_to_context_mode(stfbi->visual, &mode);

+   _mesa_initialize_window_framebuffer(&stfb->Base, &mode);

+

+   /* modify the draw/read buffers of the fb */

+   st_visual_to_default_buffer(stfbi->visual, &stfb->Base.ColorDrawBuffer[0],

+         &stfb->Base._ColorDrawBufferIndexes[0]);

+   st_visual_to_default_buffer(stfbi->visual, &stfb->Base.ColorReadBuffer,

+         &stfb->Base._ColorReadBufferIndex);

+

+   stfb->iface = stfbi;

+

+   /* add the color buffer */

+   idx = stfb->Base._ColorDrawBufferIndexes[0];

+   if (!st_framebuffer_add_renderbuffer(stfb, idx)) {

+      FREE(stfb);

+      return NULL;

+   }

+

+   st_framebuffer_add_renderbuffer(stfb, BUFFER_DEPTH);

+   st_framebuffer_add_renderbuffer(stfb, BUFFER_ACCUM);

+

+   st_framebuffer_update_attachments(stfb);

+

+   stfb->Base.Initialized = GL_TRUE;

+

+   return stfb;

+}

+

+/**

+ * Reference a framebuffer.

+ */

+static void

+st_framebuffer_reference(struct st_framebuffer **ptr,

+                         struct st_framebuffer *stfb)

+{

+   struct gl_framebuffer *fb = &stfb->Base;

+   _mesa_reference_framebuffer((struct gl_framebuffer **) ptr, fb);

+}

+

+static void

+st_context_notify_invalid_framebuffer(struct st_context_iface *stctxi,

+                                      struct st_framebuffer_iface *stfbi)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   struct st_framebuffer *stfb;

+

+   /* either draw or read winsys fb */

+   stfb = st_ws_framebuffer(st->ctx->WinSysDrawBuffer);

+   if (!stfb || stfb->iface != stfbi)

+      stfb = st_ws_framebuffer(st->ctx->WinSysReadBuffer);

+

+   if (stfb && stfb->iface == stfbi) {

+      p_atomic_set(&stfb->revalidate, TRUE);

+   }

+   else {

+      /* This function is probably getting called when we've detected a

+       * change in a window's size but the currently bound context is

+       * not bound to that window.

+       * If the st_framebuffer_iface structure had a pointer to the

+       * corresponding st_framebuffer we'd be able to handle this.

+       */

+   }

+}

+

+static void

+st_context_flush(struct st_context_iface *stctxi, unsigned flags,

+                 struct pipe_fence_handle **fence)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   st_flush(st, flags, fence);

+   if (flags & PIPE_FLUSH_RENDER_CACHE)

+      st_manager_flush_frontbuffer(st);

+}

+

+static boolean

+st_context_teximage(struct st_context_iface *stctxi, enum st_texture_type target,

+                    int level, enum pipe_format internal_format,

+                    struct pipe_resource *tex, boolean mipmap)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   struct gl_context *ctx = st->ctx;

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_texture_object *texObj;

+   struct gl_texture_image *texImage;

+   struct st_texture_object *stObj;

+   struct st_texture_image *stImage;

+   GLenum internalFormat;

+   GLuint width, height, depth;

+

+   switch (target) {

+   case ST_TEXTURE_1D:

+      target = GL_TEXTURE_1D;

+      break;

+   case ST_TEXTURE_2D:

+      target = GL_TEXTURE_2D;

+      break;

+   case ST_TEXTURE_3D:

+      target = GL_TEXTURE_3D;

+      break;

+   case ST_TEXTURE_RECT:

+      target = GL_TEXTURE_RECTANGLE_ARB;

+      break;

+   default:

+      return FALSE;

+      break;

+   }

+

+   texObj = _mesa_select_tex_object(ctx, texUnit, target);

+   _mesa_lock_texture(ctx, texObj);

+

+   stObj = st_texture_object(texObj);

+   /* switch to surface based */

+   if (!stObj->surface_based) {

+      _mesa_clear_texture_object(ctx, texObj);

+      stObj->surface_based = GL_TRUE;

+   }

+

+   texImage = _mesa_get_tex_image(ctx, texObj, target, level);

+   stImage = st_texture_image(texImage);

+   if (tex) {

+      gl_format texFormat;

+

+      /*

+       * XXX When internal_format and tex->format differ, st_finalize_texture

+       * needs to allocate a new texture with internal_format and copy the

+       * texture here into the new one.  It will result in surface_copy being

+       * called on surfaces whose formats differ.

+       *

+       * To avoid that, internal_format is (wrongly) ignored here.  A sane fix

+       * is to use a sampler view.

+       */

+      if (!st_sampler_compat_formats(tex->format, internal_format))

+	 internal_format = tex->format;

+     

+      if (util_format_get_component_bits(internal_format,

+               UTIL_FORMAT_COLORSPACE_RGB, 3) > 0)

+         internalFormat = GL_RGBA;

+      else

+         internalFormat = GL_RGB;

+

+      texFormat = st_ChooseTextureFormat(ctx, internalFormat,

+                                         GL_RGBA, GL_UNSIGNED_BYTE);

+

+      _mesa_init_teximage_fields(ctx, target, texImage,

+                                 tex->width0, tex->height0, 1, 0,

+                                 internalFormat, texFormat);

+

+      width = tex->width0;

+      height = tex->height0;

+      depth = tex->depth0;

+

+      /* grow the image size until we hit level = 0 */

+      while (level > 0) {

+         if (width != 1)

+            width <<= 1;

+         if (height != 1)

+            height <<= 1;

+         if (depth != 1)

+            depth <<= 1;

+         level--;

+      }

+   }

+   else {

+      _mesa_clear_texture_image(ctx, texImage);

+      width = height = depth = 0;

+   }

+

+   pipe_resource_reference(&stImage->pt, tex);

+   stObj->width0 = width;

+   stObj->height0 = height;

+   stObj->depth0 = depth;

+

+   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);

+   _mesa_unlock_texture(ctx, texObj);

+   

+   return TRUE;

+}

+

+static void

+st_context_copy(struct st_context_iface *stctxi,

+                struct st_context_iface *stsrci, unsigned mask)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   struct st_context *src = (struct st_context *) stsrci;

+

+   _mesa_copy_context(src->ctx, st->ctx, mask);

+}

+

+static boolean

+st_context_share(struct st_context_iface *stctxi,

+                 struct st_context_iface *stsrci)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   struct st_context *src = (struct st_context *) stsrci;

+

+   return _mesa_share_state(st->ctx, src->ctx);

+}

+

+static void

+st_context_destroy(struct st_context_iface *stctxi)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   st_destroy_context(st);

+}

+

+static struct st_context_iface *

+st_api_create_context(struct st_api *stapi, struct st_manager *smapi,

+                      const struct st_context_attribs *attribs,

+                      struct st_context_iface *shared_stctxi)

+{

+   struct st_context *shared_ctx = (struct st_context *) shared_stctxi;

+   struct st_context *st;

+   struct pipe_context *pipe;

+   struct gl_config mode;

+   gl_api api;

+

+   if (!(stapi->profile_mask & (1 << attribs->profile)))

+      return NULL;

+

+   switch (attribs->profile) {

+   case ST_PROFILE_DEFAULT:

+      api = API_OPENGL;

+      break;

+   case ST_PROFILE_OPENGL_ES1:

+      api = API_OPENGLES;

+      break;

+   case ST_PROFILE_OPENGL_ES2:

+      api = API_OPENGLES2;

+      break;

+   case ST_PROFILE_OPENGL_CORE:

+   default:

+      return NULL;

+      break;

+   }

+

+   pipe = smapi->screen->context_create(smapi->screen, NULL);

+   if (!pipe)

+      return NULL;

+

+   st_visual_to_context_mode(&attribs->visual, &mode);

+   st = st_create_context(api, pipe, &mode, shared_ctx);

+   if (!st) {

+      pipe->destroy(pipe);

+      return NULL;

+   }

+

+   /* need to perform version check */

+   if (attribs->major > 1 || attribs->minor > 0) {

+      _mesa_compute_version(st->ctx);

+

+      if (st->ctx->VersionMajor < attribs->major ||

+          st->ctx->VersionMajor < attribs->minor) {

+         st_destroy_context(st);

+         return NULL;

+      }

+   }

+

+   st->invalidate_on_gl_viewport =

+      smapi->get_param(smapi, ST_MANAGER_BROKEN_INVALIDATE);

+

+   st->iface.destroy = st_context_destroy;

+   st->iface.notify_invalid_framebuffer =

+      st_context_notify_invalid_framebuffer;

+   st->iface.flush = st_context_flush;

+   st->iface.teximage = st_context_teximage;

+   st->iface.copy = st_context_copy;

+   st->iface.share = st_context_share;

+   st->iface.st_context_private = (void *) smapi;

+

+   return &st->iface;

+}

+

+static boolean

+st_api_make_current(struct st_api *stapi, struct st_context_iface *stctxi,

+                    struct st_framebuffer_iface *stdrawi,

+                    struct st_framebuffer_iface *streadi)

+{

+   struct st_context *st = (struct st_context *) stctxi;

+   struct st_framebuffer *stdraw, *stread, *stfb;

+   boolean ret;

+

+   _glapi_check_multithread();

+

+   if (st) {

+      /* reuse/create the draw fb */

+      stfb = st_ws_framebuffer(st->ctx->WinSysDrawBuffer);

+      if (stfb && stfb->iface == stdrawi) {

+         stdraw = NULL;

+         st_framebuffer_reference(&stdraw, stfb);

+      }

+      else {

+         stdraw = st_framebuffer_create(stdrawi);

+      }

+

+      /* reuse/create the read fb */

+      stfb = st_ws_framebuffer(st->ctx->WinSysReadBuffer);

+      if (!stfb || stfb->iface != streadi)

+         stfb = stdraw;

+      if (stfb && stfb->iface == streadi) {

+         stread = NULL;

+         st_framebuffer_reference(&stread, stfb);

+      }

+      else {

+         stread = st_framebuffer_create(streadi);

+      }

+

+      if (stdraw && stread) {

+         st_framebuffer_validate(stdraw, st);

+         if (stread != stdraw)

+            st_framebuffer_validate(stread, st);

+

+         /* modify the draw/read buffers of the context */

+         if (stdraw->iface) {

+            st_visual_to_default_buffer(stdraw->iface->visual,

+                  &st->ctx->Color.DrawBuffer[0], NULL);

+         }

+         if (stread->iface) {

+            st_visual_to_default_buffer(stread->iface->visual,

+                  &st->ctx->Pixel.ReadBuffer, NULL);

+         }

+

+         ret = _mesa_make_current(st->ctx, &stdraw->Base, &stread->Base);

+      }

+      else {

+         ret = FALSE;

+      }

+

+      st_framebuffer_reference(&stdraw, NULL);

+      st_framebuffer_reference(&stread, NULL);

+   }

+   else {

+      ret = _mesa_make_current(NULL, NULL, NULL);

+   }

+

+   return ret;

+}

+

+static struct st_context_iface *

+st_api_get_current(struct st_api *stapi)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   struct st_context *st = (ctx) ? ctx->st : NULL;

+

+   return (st) ? &st->iface : NULL;

+}

+

+static st_proc_t

+st_api_get_proc_address(struct st_api *stapi, const char *procname)

+{

+   return (st_proc_t) _glapi_get_proc_address(procname);

+}

+

+static void

+st_api_destroy(struct st_api *stapi)

+{

+}

+

+/**

+ * Flush the front buffer if the current context renders to the front buffer.

+ */

+void

+st_manager_flush_frontbuffer(struct st_context *st)

+{

+   struct st_framebuffer *stfb = st_ws_framebuffer(st->ctx->DrawBuffer);

+   struct st_renderbuffer *strb = NULL;

+

+   if (stfb)

+      strb = st_renderbuffer(stfb->Base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer);

+   if (!strb)

+      return;

+

+   /* never a dummy fb */

+   assert(stfb->iface);

+   stfb->iface->flush_front(stfb->iface, ST_ATTACHMENT_FRONT_LEFT);

+}

+

+/**

+ * Return the surface of an EGLImage.

+ * FIXME: I think this should operate on resources, not surfaces

+ */

+struct pipe_surface *

+st_manager_get_egl_image_surface(struct st_context *st,

+                                 void *eglimg, unsigned usage)

+{

+   struct st_manager *smapi =

+      (struct st_manager *) st->iface.st_context_private;

+   struct st_egl_image stimg;

+   struct pipe_surface *ps, surf_tmpl;

+

+   if (!smapi || !smapi->get_egl_image)

+      return NULL;

+

+   memset(&stimg, 0, sizeof(stimg));

+   if (!smapi->get_egl_image(smapi, eglimg, &stimg))

+      return NULL;

+

+   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

+   surf_tmpl.format = stimg.texture->format;

+   surf_tmpl.usage = usage;

+   surf_tmpl.u.tex.level = stimg.level;

+   surf_tmpl.u.tex.first_layer = stimg.layer;

+   surf_tmpl.u.tex.last_layer = stimg.layer;

+   ps = st->pipe->create_surface(st->pipe, stimg.texture, &surf_tmpl);

+   pipe_resource_reference(&stimg.texture, NULL);

+

+   return ps;

+}

+

+/**

+ * Re-validate the framebuffers.

+ */

+void

+st_manager_validate_framebuffers(struct st_context *st)

+{

+   struct st_framebuffer *stdraw = st_ws_framebuffer(st->ctx->DrawBuffer);

+   struct st_framebuffer *stread = st_ws_framebuffer(st->ctx->ReadBuffer);

+

+   if (stdraw)

+      st_framebuffer_validate(stdraw, st);

+   if (stread && stread != stdraw)

+      st_framebuffer_validate(stread, st);

+}

+

+/**

+ * Add a color renderbuffer on demand.

+ */

+boolean

+st_manager_add_color_renderbuffer(struct st_context *st, struct gl_framebuffer *fb,

+                                  gl_buffer_index idx)

+{

+   struct st_framebuffer *stfb = st_ws_framebuffer(fb);

+

+   /* FBO */

+   if (!stfb)

+      return FALSE;

+

+   if (stfb->Base.Attachment[idx].Renderbuffer)

+      return TRUE;

+

+   switch (idx) {

+   case BUFFER_FRONT_LEFT:

+   case BUFFER_BACK_LEFT:

+   case BUFFER_FRONT_RIGHT:

+   case BUFFER_BACK_RIGHT:

+      break;

+   default:

+      return FALSE;

+      break;

+   }

+

+   if (!st_framebuffer_add_renderbuffer(stfb, idx))

+      return FALSE;

+

+   st_framebuffer_update_attachments(stfb);

+   st_invalidate_state(st->ctx, _NEW_BUFFERS);

+

+   return TRUE;

+}

+

+static const struct st_api st_gl_api = {

+   "Mesa " MESA_VERSION_STRING,

+   ST_API_OPENGL,

+#if FEATURE_GL

+   ST_PROFILE_DEFAULT_MASK |

+#endif

+#if FEATURE_ES1

+   ST_PROFILE_OPENGL_ES1_MASK |

+#endif

+#if FEATURE_ES2

+   ST_PROFILE_OPENGL_ES2_MASK |

+#endif

+   0,

+   st_api_destroy,

+   st_api_get_proc_address,

+   st_api_create_context,

+   st_api_make_current,

+   st_api_get_current,

+};

+

+struct st_api *

+st_gl_api_create(void)

+{

+   return (struct st_api *) &st_gl_api;

+}

diff --git a/mesalib/src/mesa/state_tracker/st_manager.h b/mesalib/src/mesa/state_tracker/st_manager.h
new file mode 100644
index 000000000..ffe394cc4
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_manager.h
@@ -0,0 +1,52 @@
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.9

+ *

+ * Copyright (C) 2010 LunarG 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

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

+ *

+ * Authors:

+ *    Chia-I Wu <olv@lunarg.com>

+ */

+

+#ifndef ST_MANAGER_H

+#define ST_MANAGER_H

+

+#include "main/mtypes.h"

+

+#include "pipe/p_compiler.h"

+

+struct st_context;

+

+struct pipe_surface *

+st_manager_get_egl_image_surface(struct st_context *st,

+                                 void *eglimg, unsigned usage);

+

+void

+st_manager_flush_frontbuffer(struct st_context *st);

+

+void

+st_manager_validate_framebuffers(struct st_context *st);

+

+boolean

+st_manager_add_color_renderbuffer(struct st_context *st, struct gl_framebuffer *fb,

+                                  gl_buffer_index idx);

+

+#endif /* ST_MANAGER_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
new file mode 100644
index 000000000..1a64c503a
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -0,0 +1,1206 @@
+/**************************************************************************

+ * 

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

+

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

+};

+

+

+/**

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

+      if (ureg_dst_is_undef(t->temps[index]))

+         t->temps[index] = ureg_DECL_temporary( t->ureg );

+      assert(index < Elements(t->temps));

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

+

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

+   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

+ */

+static void

+emit_adjusted_wpos( struct st_translate *t,

+                    const struct gl_program *program, GLfloat value)

+{

+   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, value, value, 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) {

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) {

+      }

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) {

+         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);

+         invert = TRUE;

+      }

+      else

+         assert(0);

+   }

+   else {

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT))

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

+         invert = TRUE;

+      else

+         assert(0);

+   }

+   

+   if (fp->PixelCenterInteger) {

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_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))

+         emit_adjusted_wpos(t, program, invert ? 0.5f : -0.5f);

+      else

+         assert(0);

+   }

+   else {

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) {

+      }

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) {

+         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);

+         emit_adjusted_wpos(t, program, 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 );

+   }

+

+   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_mesa_to_tgsi.h b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.h
new file mode 100644
index 000000000..aa42fc0cc
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -0,0 +1,73 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+

+#ifndef ST_MESA_TO_TGSI_H

+#define ST_MESA_TO_TGSI_H

+

+#if defined __cplusplus

+extern "C" {

+#endif

+

+#include "main/glheader.h"

+

+#include "pipe/p_compiler.h"

+#include "pipe/p_defines.h"

+

+struct gl_context;

+struct gl_program;

+struct tgsi_token;

+struct ureg_program;

+

+

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

+

+void

+st_free_tokens(const struct tgsi_token *tokens);

+

+

+#if defined __cplusplus

+} /* extern "C" */

+#endif

+

+#endif /* ST_MESA_TO_TGSI_H */

+

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
new file mode 100644
index 000000000..59165be04
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -0,0 +1,1151 @@
+/**************************************************************************

+ * 

+ * 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/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);

+      

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

+

+   if (!variant)

+      return NULL;

+

+   assert(!(key->bitmap && key->drawpixels));

+

+   if (key->bitmap) {

+      /* glBitmap drawing */

+      struct gl_fragment_program *fp;

+

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

+   }

+   else if (key->drawpixels) {

+      /* glDrawPixels drawing */

+      struct gl_fragment_program *fp;

+

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

+      }

+      stfp = st_fragment_program(fp);

+   }

+

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

+   }

+

+   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 & (1 << 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/state_tracker/st_program.h b/mesalib/src/mesa/state_tracker/st_program.h
new file mode 100644
index 000000000..a240d4ef4
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_program.h
@@ -0,0 +1,300 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+ /*

+  * Authors:

+  *   Keith Whitwell <keith@tungstengraphics.com>

+  */

+    

+

+#ifndef ST_PROGRAM_H

+#define ST_PROGRAM_H

+

+#include "main/mtypes.h"

+#include "program/program.h"

+#include "pipe/p_state.h"

+#include "st_context.h"

+

+

+/** Fragment program variant key */

+struct st_fp_variant_key

+{

+   struct st_context *st;         /**< variants are per-context */

+

+   /** for glBitmap */

+   GLuint bitmap:1;               /**< glBitmap variant? */

+

+   /** for glDrawPixels */

+   GLuint drawpixels:1;           /**< glDrawPixels variant */

+   GLuint scaleAndBias:1;         /**< glDrawPixels w/ scale and/or bias? */

+   GLuint pixelMaps:1;            /**< glDrawPixels w/ pixel lookup map? */

+   GLuint drawpixels_z:1;         /**< glDrawPixels(GL_DEPTH) */

+   GLuint drawpixels_stencil:1;   /**< glDrawPixels(GL_STENCIL) */

+};

+

+

+/**

+ * Variant of a fragment program.

+ */

+struct st_fp_variant

+{

+   /** Parameters which generated this version of fragment program */

+   struct st_fp_variant_key key;

+

+   /** Driver's compiled shader */

+   void *driver_shader;

+

+   /** For glBitmap variants */

+   struct gl_program_parameter_list *parameters;

+   uint bitmap_sampler;

+

+   /** next in linked list */

+   struct st_fp_variant *next;

+};

+

+

+/**

+ * Derived from Mesa gl_fragment_program:

+ */

+struct st_fragment_program

+{

+   struct gl_fragment_program Base;

+

+   struct pipe_shader_state tgsi;

+

+   struct st_fp_variant *variants;

+};

+

+

+

+/** Vertex program variant key */

+struct st_vp_variant_key

+{

+   struct st_context *st;          /**< variants are per-context */

+   boolean passthrough_edgeflags;

+};

+

+

+/**

+ * This represents a vertex program, especially translated to match

+ * the inputs of a particular fragment shader.

+ */

+struct st_vp_variant

+{

+   /* Parameters which generated this translated version of a vertex

+    * shader:

+    */

+   struct st_vp_variant_key key;

+

+   /**

+    * TGSI tokens (to later generate a 'draw' module shader for

+    * selection/feedback/rasterpos)

+    */

+   struct pipe_shader_state tgsi;

+

+   /** Driver's compiled shader */

+   void *driver_shader;

+

+   /** For using our private draw module (glRasterPos) */

+   struct draw_vertex_shader *draw_shader;

+

+   /** Next in linked list */

+   struct st_vp_variant *next;  

+

+   /** similar to that in st_vertex_program, but with edgeflags info too */

+   GLuint num_inputs;

+};

+

+

+/**

+ * Derived from Mesa gl_fragment_program:

+ */

+struct st_vertex_program

+{

+   struct gl_vertex_program Base;  /**< The Mesa vertex program */

+

+   /** maps a Mesa VERT_ATTRIB_x to a packed TGSI input index */

+   GLuint input_to_index[VERT_ATTRIB_MAX];

+   /** maps a TGSI input index back to a Mesa VERT_ATTRIB_x */

+   GLuint index_to_input[PIPE_MAX_SHADER_INPUTS];

+   GLuint num_inputs;

+

+   /** Maps VERT_RESULT_x to slot */

+   GLuint result_to_output[VERT_RESULT_MAX];

+   ubyte output_semantic_name[VERT_RESULT_MAX];

+   ubyte output_semantic_index[VERT_RESULT_MAX];

+   GLuint num_outputs;

+

+   /** List of translated variants of this vertex program.

+    */

+   struct st_vp_variant *variants;

+};

+

+

+

+/** Geometry program variant key */

+struct st_gp_variant_key

+{

+   struct st_context *st;          /**< variants are per-context */

+   /* no other fields yet */

+};

+

+

+/**

+ * Geometry program variant.

+ */

+struct st_gp_variant

+{

+   /* Parameters which generated this translated version of a vertex */

+   struct st_gp_variant_key key;

+

+   void *driver_shader;

+

+   struct st_gp_variant *next;

+};

+

+

+/**

+ * Derived from Mesa gl_geometry_program:

+ */

+struct st_geometry_program

+{

+   struct gl_geometry_program Base;  /**< The Mesa geometry program */

+

+   /** map GP input back to VP output */

+   GLuint input_map[PIPE_MAX_SHADER_INPUTS];

+

+   /** maps a Mesa GEOM_ATTRIB_x to a packed TGSI input index */

+   GLuint input_to_index[GEOM_ATTRIB_MAX];

+   /** maps a TGSI input index back to a Mesa GEOM_ATTRIB_x */

+   GLuint index_to_input[PIPE_MAX_SHADER_INPUTS];

+

+   GLuint num_inputs;

+

+   GLuint input_to_slot[GEOM_ATTRIB_MAX];  /**< Maps GEOM_ATTRIB_x to slot */

+   GLuint num_input_slots;

+

+   ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];

+   ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];

+

+   struct pipe_shader_state tgsi;

+

+   struct st_gp_variant *variants;

+};

+

+

+

+static INLINE struct st_fragment_program *

+st_fragment_program( struct gl_fragment_program *fp )

+{

+   return (struct st_fragment_program *)fp;

+}

+

+

+static INLINE struct st_vertex_program *

+st_vertex_program( struct gl_vertex_program *vp )

+{

+   return (struct st_vertex_program *)vp;

+}

+

+static INLINE struct st_geometry_program *

+st_geometry_program( struct gl_geometry_program *gp )

+{

+   return (struct st_geometry_program *)gp;

+}

+

+static INLINE void

+st_reference_vertprog(struct st_context *st,

+                      struct st_vertex_program **ptr,

+                      struct st_vertex_program *prog)

+{

+   _mesa_reference_program(st->ctx,

+                           (struct gl_program **) ptr,

+                           (struct gl_program *) prog);

+}

+

+static INLINE void

+st_reference_geomprog(struct st_context *st,

+                      struct st_geometry_program **ptr,

+                      struct st_geometry_program *prog)

+{

+   _mesa_reference_program(st->ctx,

+                           (struct gl_program **) ptr,

+                           (struct gl_program *) prog);

+}

+

+static INLINE void

+st_reference_fragprog(struct st_context *st,

+                      struct st_fragment_program **ptr,

+                      struct st_fragment_program *prog)

+{

+   _mesa_reference_program(st->ctx,

+                           (struct gl_program **) ptr,

+                           (struct gl_program *) prog);

+}

+

+

+extern struct st_vp_variant *

+st_get_vp_variant(struct st_context *st,

+                  struct st_vertex_program *stvp,

+                  const struct st_vp_variant_key *key);

+

+

+extern struct st_fp_variant *

+st_get_fp_variant(struct st_context *st,

+                  struct st_fragment_program *stfp,

+                  const struct st_fp_variant_key *key);

+

+

+extern struct st_gp_variant *

+st_get_gp_variant(struct st_context *st,

+                  struct st_geometry_program *stgp,

+                  const struct st_gp_variant_key *key);

+

+

+

+extern void

+st_release_vp_variants( struct st_context *st,

+                        struct st_vertex_program *stvp );

+

+extern void

+st_release_fp_variants( struct st_context *st,

+                        struct st_fragment_program *stfp );

+

+extern void

+st_release_gp_variants(struct st_context *st,

+                       struct st_geometry_program *stgp);

+

+

+extern void

+st_print_shaders(struct gl_context *ctx);

+

+extern void

+st_destroy_program_variants(struct st_context *st);

+

+

+#endif

diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c
new file mode 100644
index 000000000..4d4b238ef
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_texture.c
@@ -0,0 +1,316 @@
+/**************************************************************************

+ * 

+ * 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 <stdio.h>

+

+#include "st_context.h"

+#include "st_format.h"

+#include "st_texture.h"

+#include "st_cb_fbo.h"

+#include "main/enums.h"

+

+#include "pipe/p_state.h"

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "util/u_format.h"

+#include "util/u_rect.h"

+#include "util/u_math.h"

+

+

+#define DBG if(0) printf

+

+

+/**

+ * Allocate a new pipe_resource object

+ * width0, height0, depth0 are the dimensions of the level 0 image

+ * (the highest resolution).  last_level indicates how many mipmap levels

+ * to allocate storage for.  For non-mipmapped textures, this will be zero.

+ */

+struct pipe_resource *

+st_texture_create(struct st_context *st,

+                  enum pipe_texture_target target,

+		  enum pipe_format format,

+		  GLuint last_level,

+		  GLuint width0,

+		  GLuint height0,

+		  GLuint depth0,

+                  GLuint bind )

+{

+   struct pipe_resource pt, *newtex;

+   struct pipe_screen *screen = st->pipe->screen;

+

+   assert(target < PIPE_MAX_TEXTURE_TYPES);

+   assert(width0 > 0);

+   assert(height0 > 0);

+   assert(depth0 > 0);

+

+   DBG("%s target %s format %s last_level %d\n", __FUNCTION__,

+       _mesa_lookup_enum_by_nr(target),

+       _mesa_lookup_enum_by_nr(format), last_level);

+

+   assert(format);

+   assert(screen->is_format_supported(screen, format, target, 0,

+                                      PIPE_BIND_SAMPLER_VIEW, 0));

+

+   memset(&pt, 0, sizeof(pt));

+   pt.target = target;

+   pt.format = format;

+   pt.last_level = last_level;

+   pt.width0 = width0;

+   pt.height0 = height0;

+   pt.depth0 = depth0;

+   pt.array_size = (target == PIPE_TEXTURE_CUBE ? 6 : 1);

+   pt.usage = PIPE_USAGE_DEFAULT;

+   pt.bind = bind;

+   pt.flags = 0;

+

+   newtex = screen->resource_create(screen, &pt);

+

+   assert(!newtex || pipe_is_referenced(&newtex->reference));

+

+   return newtex;

+}

+

+

+/**

+ * Check if a texture image can be pulled into a unified mipmap texture.

+ */

+GLboolean

+st_texture_match_image(const struct pipe_resource *pt,

+                       const struct gl_texture_image *image,

+                       GLuint face, GLuint level)

+{

+   /* Images with borders are never pulled into mipmap textures. 

+    */

+   if (image->Border) 

+      return GL_FALSE;

+

+   /* Check if this image's format matches the established texture's format.

+    */

+   if (st_mesa_format_to_pipe_format(image->TexFormat) != pt->format)

+      return GL_FALSE;

+

+   /* Test if this image's size matches what's expected in the

+    * established texture.

+    */

+   if (image->Width != u_minify(pt->width0, level) ||

+       image->Height != u_minify(pt->height0, level) ||

+       image->Depth != u_minify(pt->depth0, level))

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Map a texture image and return the address for a particular 2D face/slice/

+ * layer.  The stImage indicates the cube face and mipmap level.  The slice

+ * of the 3D texture is passed in 'zoffset'.

+ * \param usage  one of the PIPE_TRANSFER_x values

+ * \param x, y, w, h  the region of interest of the 2D image.

+ * \return address of mapping or NULL if any error

+ */

+GLubyte *

+st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,

+                     GLuint zoffset, enum pipe_transfer_usage usage,

+                     GLuint x, GLuint y, GLuint w, GLuint h)

+{

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_resource *pt = stImage->pt;

+

+   DBG("%s \n", __FUNCTION__);

+

+   stImage->transfer = pipe_get_transfer(st->pipe, pt, stImage->level,

+                                         stImage->face + zoffset,

+                                         usage, x, y, w, h);

+

+   if (stImage->transfer)

+      return pipe_transfer_map(pipe, stImage->transfer);

+   else

+      return NULL;

+}

+

+

+void

+st_texture_image_unmap(struct st_context *st,

+                       struct st_texture_image *stImage)

+{

+   struct pipe_context *pipe = st->pipe;

+

+   DBG("%s\n", __FUNCTION__);

+

+   pipe_transfer_unmap(pipe, stImage->transfer);

+

+   pipe->transfer_destroy(pipe, stImage->transfer);

+}

+

+

+

+/**

+ * Upload data to a rectangular sub-region.  Lots of choices how to do this:

+ *

+ * - memcpy by span to current destination

+ * - upload data as new buffer and blit

+ *

+ * Currently always memcpy.

+ */

+static void

+st_surface_data(struct pipe_context *pipe,

+		struct pipe_transfer *dst,

+		unsigned dstx, unsigned dsty,

+		const void *src, unsigned src_stride,

+		unsigned srcx, unsigned srcy, unsigned width, unsigned height)

+{

+   void *map = pipe_transfer_map(pipe, dst);

+

+   assert(dst->resource);

+   util_copy_rect(map,

+                  dst->resource->format,

+                  dst->stride,

+                  dstx, dsty, 

+                  width, height, 

+                  src, src_stride, 

+                  srcx, srcy);

+

+   pipe_transfer_unmap(pipe, dst);

+}

+

+

+/* Upload data for a particular image.

+ */

+void

+st_texture_image_data(struct st_context *st,

+                      struct pipe_resource *dst,

+                      GLuint face,

+                      GLuint level,

+                      void *src,

+                      GLuint src_row_stride, GLuint src_image_stride)

+{

+   struct pipe_context *pipe = st->pipe;

+   GLuint depth = u_minify(dst->depth0, level);

+   GLuint i;

+   const GLubyte *srcUB = src;

+   struct pipe_transfer *dst_transfer;

+

+   DBG("%s\n", __FUNCTION__);

+

+   for (i = 0; i < depth; i++) {

+      dst_transfer = pipe_get_transfer(st->pipe, dst, level, face + i,

+                                       PIPE_TRANSFER_WRITE, 0, 0,

+                                       u_minify(dst->width0, level),

+                                       u_minify(dst->height0, level));

+

+      st_surface_data(pipe, dst_transfer,

+		      0, 0,                             /* dstx, dsty */

+		      srcUB,

+		      src_row_stride,

+		      0, 0,                             /* source x, y */

+		      u_minify(dst->width0, level),

+                      u_minify(dst->height0, level));    /* width, height */

+

+      pipe->transfer_destroy(pipe, dst_transfer);

+

+      srcUB += src_image_stride;

+   }

+}

+

+

+/**

+ * For debug only: get/print center pixel in the src resource.

+ */

+static void

+print_center_pixel(struct pipe_context *pipe, struct pipe_resource *src)

+{

+   struct pipe_transfer *xfer;

+   struct pipe_box region;

+   ubyte *map;

+

+   region.x = src->width0 / 2;

+   region.y = src->height0 / 2;

+   region.z = 0;

+   region.width = 1;

+   region.height = 1;

+   region.depth = 1;

+

+   xfer = pipe->get_transfer(pipe, src, 0, PIPE_TRANSFER_READ, &region);

+   map = pipe->transfer_map(pipe, xfer);

+

+   printf("center pixel: %d %d %d %d\n", map[0], map[1], map[2], map[3]);

+

+   pipe->transfer_unmap(pipe, xfer);

+   pipe->transfer_destroy(pipe, xfer);

+}

+

+

+/**

+ * Copy the image at level=0 in 'src' to the 'dst' resource at 'dstLevel'.

+ * This is used to copy mipmap images from one texture buffer to another.

+ * This typically happens when our initial guess at the total texture size

+ * is incorrect (see the guess_and_alloc_texture() function).

+ */

+void

+st_texture_image_copy(struct pipe_context *pipe,

+                      struct pipe_resource *dst, GLuint dstLevel,

+                      struct pipe_resource *src, GLuint srcLevel,

+                      GLuint face)

+{

+   GLuint width = u_minify(dst->width0, dstLevel);

+   GLuint height = u_minify(dst->height0, dstLevel);

+   GLuint depth = u_minify(dst->depth0, dstLevel);

+   struct pipe_box src_box;

+   GLuint i;

+

+   assert(u_minify(src->width0, srcLevel) == width);

+   assert(u_minify(src->height0, srcLevel) == height);

+   assert(u_minify(src->depth0, srcLevel) == depth);

+

+   src_box.x = 0;

+   src_box.y = 0;

+   src_box.width = width;

+   src_box.height = height;

+   src_box.depth = 1;

+   /* Loop over 3D image slices */

+   /* could (and probably should) use "true" 3d box here -

+      but drivers can't quite handle it yet */

+   for (i = face; i < face + depth; i++) {

+      src_box.z = i;

+

+      if (0)  {

+         print_center_pixel(pipe, src);

+      }

+

+      pipe->resource_copy_region(pipe,

+                                 dst,

+                                 dstLevel,

+                                 0, 0, i,/* destX, Y, Z */

+                                 src,

+                                 srcLevel,

+                                 &src_box);

+   }

+}

+

diff --git a/mesalib/src/mesa/state_tracker/st_texture.h b/mesalib/src/mesa/state_tracker/st_texture.h
new file mode 100644
index 000000000..53d97101d
--- /dev/null
+++ b/mesalib/src/mesa/state_tracker/st_texture.h
@@ -0,0 +1,225 @@
+/**************************************************************************

+ * 

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

+ * 

+ **************************************************************************/

+

+#ifndef ST_TEXTURE_H

+#define ST_TEXTURE_H

+

+

+#include "pipe/p_context.h"

+#include "util/u_sampler.h"

+

+#include "main/mtypes.h"

+

+

+struct pipe_resource;

+

+

+/**

+ * Subclass of gl_texure_image.

+ */

+struct st_texture_image

+{

+   struct gl_texture_image base;

+

+   /* These aren't stored in gl_texture_image 

+    */

+   GLuint level;

+   GLuint face;

+

+   /* If stImage->pt != NULL, image data is stored here.

+    * Else if stImage->base.Data != NULL, image is stored there.

+    * Else there is no image data.

+    */

+   struct pipe_resource *pt;

+

+   struct pipe_transfer *transfer;

+};

+

+

+/**

+ * Subclass of gl_texure_object.

+ */

+struct st_texture_object

+{

+   struct gl_texture_object base;       /* The "parent" object */

+

+   /* The texture must include at levels [0..lastLevel] once validated:

+    */

+   GLuint lastLevel;

+

+   /** The size of the level=0 mipmap image */

+   GLuint width0, height0, depth0;

+

+   /* On validation any active images held in main memory or in other

+    * textures will be copied to this texture and the old storage freed.

+    */

+   struct pipe_resource *pt;

+

+   /* Default sampler view attached to this texture object. Created lazily

+    * on first binding.

+    */

+   struct pipe_sampler_view *sampler_view;

+

+   /* True if there is/was a surface bound to this texture object.  It helps

+    * track whether the texture object is surface based or not.

+    */

+   GLboolean surface_based;

+};

+

+

+static INLINE struct st_texture_image *

+st_texture_image(struct gl_texture_image *img)

+{

+   return (struct st_texture_image *) img;

+}

+

+static INLINE struct st_texture_object *

+st_texture_object(struct gl_texture_object *obj)

+{

+   return (struct st_texture_object *) obj;

+}

+

+

+static INLINE struct pipe_resource *

+st_get_texobj_resource(struct gl_texture_object *texObj)

+{

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   return stObj ? stObj->pt : NULL;

+}

+

+

+static INLINE struct pipe_resource *

+st_get_stobj_resource(struct st_texture_object *stObj)

+{

+   return stObj ? stObj->pt : NULL;

+}

+

+

+static INLINE struct pipe_sampler_view *

+st_create_texture_sampler_view(struct pipe_context *pipe,

+                               struct pipe_resource *texture)

+{

+   struct pipe_sampler_view templ;

+

+   u_sampler_view_default_template(&templ,

+                                   texture,

+                                   texture->format);

+

+   return pipe->create_sampler_view(pipe, texture, &templ);

+}

+

+

+static INLINE struct pipe_sampler_view *

+st_create_texture_sampler_view_format(struct pipe_context *pipe,

+                                      struct pipe_resource *texture,

+                                      enum pipe_format format)

+{

+   struct pipe_sampler_view templ;

+

+   u_sampler_view_default_template(&templ,

+                                   texture,

+                                   format);

+

+   return pipe->create_sampler_view(pipe, texture, &templ);

+}

+

+static INLINE struct pipe_sampler_view *

+st_get_texture_sampler_view(struct st_texture_object *stObj,

+                            struct pipe_context *pipe)

+

+{

+   if (!stObj || !stObj->pt) {

+      return NULL;

+   }

+

+   if (!stObj->sampler_view) {

+      stObj->sampler_view = st_create_texture_sampler_view(pipe, stObj->pt);

+   }

+

+   return stObj->sampler_view;

+}

+

+

+extern struct pipe_resource *

+st_texture_create(struct st_context *st,

+                  enum pipe_texture_target target,

+		  enum pipe_format format,

+                  GLuint last_level,

+                  GLuint width0,

+                  GLuint height0,

+                  GLuint depth0,

+                  GLuint tex_usage );

+

+

+/* Check if an image fits into an existing texture object.

+ */

+extern GLboolean

+st_texture_match_image(const struct pipe_resource *pt,

+                       const struct gl_texture_image *image,

+                       GLuint face, GLuint level);

+

+/* Return a pointer to an image within a texture.  Return image stride as

+ * well.

+ */

+extern GLubyte *

+st_texture_image_map(struct st_context *st,

+                     struct st_texture_image *stImage,

+		     GLuint zoffset,

+                     enum pipe_transfer_usage usage,

+                     unsigned x, unsigned y,

+                     unsigned w, unsigned h);

+

+extern void

+st_texture_image_unmap(struct st_context *st,

+                       struct st_texture_image *stImage);

+

+

+/* Return pointers to each 2d slice within an image.  Indexed by depth

+ * value.

+ */

+extern const GLuint *

+st_texture_depth_offsets(struct pipe_resource *pt, GLuint level);

+

+

+/* Upload an image into a texture

+ */

+extern void

+st_texture_image_data(struct st_context *st,

+                      struct pipe_resource *dst,

+                      GLuint face, GLuint level, void *src,

+                      GLuint src_row_pitch, GLuint src_image_pitch);

+

+

+/* Copy an image between two textures

+ */

+extern void

+st_texture_image_copy(struct pipe_context *pipe,

+                      struct pipe_resource *dst, GLuint dstLevel,

+                      struct pipe_resource *src, GLuint srcLevel,

+                      GLuint face);

+

+#endif

diff --git a/mesalib/src/mesa/swrast/NOTES b/mesalib/src/mesa/swrast/NOTES
new file mode 100644
index 000000000..d6f991ee8
--- /dev/null
+++ b/mesalib/src/mesa/swrast/NOTES
@@ -0,0 +1,55 @@
+INTRODUCTION

+

+Mesa's native software rasterizer.  This module provides the fallback

+paths for rasterization operations and states that aren't accelerated

+in hardware drivers, and as the full rasterization engine in software

+drivers.

+

+The swrast module 'stands alone', relying only on interfaces to core

+mesa and it's own driver interface.  It knows nothing about the tnl or

+other modules, allowing it to be used for fallback paths in future tnl

+schemes without modification.

+

+As well as providing triangle/line/point rasterization functionality,

+the module provides implementations of the pixel operations

+(ReadPixels, etc), and texture operations (CopyTexSubImage) which may

+be plugged in to the core Mesa driver interface where accelerated

+versions of these operations are unavailable.

+

+

+STATE

+

+To create and destroy the module:

+

+	GLboolean _swrast_CreateContext( struct gl_context *ctx );

+	void _swrast_DestroyContext( struct gl_context *ctx );

+   

+This module tracks state changes internally and maintains derived

+values based on the current state.  For this to work, the driver

+ensure the following funciton is called whenever the state changes and

+the swsetup module is 'awake':

+

+	void _swrast_InvalidateState( struct gl_context *ctx, GLuint new_state );

+

+There is no explicit call to put the swrast module to sleep.  

+

+

+CUSTOMIZATION

+

+   void (*choose_point)( struct gl_context * );

+   void (*choose_line)( struct gl_context * );

+   void (*choose_triangle)( struct gl_context * );

+

+Drivers may add additional triangle/line/point functions to swrast by

+overriding these functions.  It is necessary for the driver to be very

+careful that it doesn't return an inappropriate function, eg a

+rasterization function in feedback mode.  See the X11 driver for

+examples.

+

+DRIVER INTERFACE

+

+The swrast device driver provides swrast primarily with span- and

+pixel- level interfaces to a framebuffer, with a few additional hooks

+for locking and setting the read buffer.

+

+See the definition of struct swrast_device_driver in swrast.h.
\ No newline at end of file
diff --git a/mesalib/src/mesa/swrast/s_aaline.c b/mesalib/src/mesa/swrast/s_aaline.c
index 6ba4604e6..be817f326 100644
--- a/mesalib/src/mesa/swrast/s_aaline.c
+++ b/mesalib/src/mesa/swrast/s_aaline.c
@@ -1,492 +1,492 @@
-/*
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "swrast/s_aaline.h"
-#include "swrast/s_context.h"
-#include "swrast/s_span.h"
-#include "swrast/swrast.h"
-
-
-#define SUB_PIXEL 4
-
-
-/*
- * Info about the AA line we're rendering
- */
-struct LineInfo
-{
-   GLfloat x0, y0;        /* start */
-   GLfloat x1, y1;        /* end */
-   GLfloat dx, dy;        /* direction vector */
-   GLfloat len;           /* length */
-   GLfloat halfWidth;     /* half of line width */
-   GLfloat xAdj, yAdj;    /* X and Y adjustment for quad corners around line */
-   /* for coverage computation */
-   GLfloat qx0, qy0;      /* quad vertices */
-   GLfloat qx1, qy1;
-   GLfloat qx2, qy2;
-   GLfloat qx3, qy3;
-   GLfloat ex0, ey0;      /* quad edge vectors */
-   GLfloat ex1, ey1;
-   GLfloat ex2, ey2;
-   GLfloat ex3, ey3;
-
-   /* DO_Z */
-   GLfloat zPlane[4];
-   /* DO_RGBA - always enabled */
-   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];
-   /* DO_ATTRIBS */
-   GLfloat wPlane[4];
-   GLfloat attrPlane[FRAG_ATTRIB_MAX][4][4];
-   GLfloat lambda[FRAG_ATTRIB_MAX];
-   GLfloat texWidth[FRAG_ATTRIB_MAX];
-   GLfloat texHeight[FRAG_ATTRIB_MAX];
-
-   SWspan span;
-};
-
-
-
-/*
- * Compute the equation of a plane used to interpolate line fragment data
- * such as color, Z, texture coords, etc.
- * Input: (x0, y0) and (x1,y1) are the endpoints of the line.
- *        z0, and z1 are the end point values to interpolate.
- * Output:  plane - the plane equation.
- *
- * Note: we don't really have enough parameters to specify a plane.
- * We take the endpoints of the line and compute a plane such that
- * the cross product of the line vector and the plane normal is
- * parallel to the projection plane.
- */
-static void
-compute_plane(GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1,
-              GLfloat z0, GLfloat z1, GLfloat plane[4])
-{
-#if 0
-   /* original */
-   const GLfloat px = x1 - x0;
-   const GLfloat py = y1 - y0;
-   const GLfloat pz = z1 - z0;
-   const GLfloat qx = -py;
-   const GLfloat qy = px;
-   const GLfloat qz = 0;
-   const GLfloat a = py * qz - pz * qy;
-   const GLfloat b = pz * qx - px * qz;
-   const GLfloat c = px * qy - py * qx;
-   const GLfloat d = -(a * x0 + b * y0 + c * z0);
-   plane[0] = a;
-   plane[1] = b;
-   plane[2] = c;
-   plane[3] = d;
-#else
-   /* simplified */
-   const GLfloat px = x1 - x0;
-   const GLfloat py = y1 - y0;
-   const GLfloat pz = z0 - z1;
-   const GLfloat a = pz * px;
-   const GLfloat b = pz * py;
-   const GLfloat c = px * px + py * py;
-   const GLfloat d = -(a * x0 + b * y0 + c * z0);
-   if (a == 0.0 && b == 0.0 && c == 0.0 && d == 0.0) {
-      plane[0] = 0.0;
-      plane[1] = 0.0;
-      plane[2] = 1.0;
-      plane[3] = 0.0;
-   }
-   else {
-      plane[0] = a;
-      plane[1] = b;
-      plane[2] = c;
-      plane[3] = d;
-   }
-#endif
-}
-
-
-static INLINE void
-constant_plane(GLfloat value, GLfloat plane[4])
-{
-   plane[0] = 0.0;
-   plane[1] = 0.0;
-   plane[2] = -1.0;
-   plane[3] = value;
-}
-
-
-static INLINE GLfloat
-solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
-   return z;
-}
-
-#define SOLVE_PLANE(X, Y, PLANE) \
-   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])
-
-
-/*
- * Return 1 / solve_plane().
- */
-static INLINE GLfloat
-solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
-   if (denom == 0.0)
-      return 0.0;
-   else
-      return -plane[2] / denom;
-}
-
-
-/*
- * Solve plane and return clamped GLchan value.
- */
-static INLINE GLchan
-solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
-#if CHAN_TYPE == GL_FLOAT
-   return CLAMP(z, 0.0F, CHAN_MAXF);
-#else
-   if (z < 0)
-      return 0;
-   else if (z > CHAN_MAX)
-      return CHAN_MAX;
-   return (GLchan) IROUND_POS(z);
-#endif
-}
-
-
-/*
- * Compute mipmap level of detail.
- */
-static INLINE GLfloat
-compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],
-               GLfloat invQ, GLfloat width, GLfloat height)
-{
-   GLfloat dudx = sPlane[0] / sPlane[2] * invQ * width;
-   GLfloat dudy = sPlane[1] / sPlane[2] * invQ * width;
-   GLfloat dvdx = tPlane[0] / tPlane[2] * invQ * height;
-   GLfloat dvdy = tPlane[1] / tPlane[2] * invQ * height;
-   GLfloat r1 = dudx * dudx + dudy * dudy;
-   GLfloat r2 = dvdx * dvdx + dvdy * dvdy;
-   GLfloat rho2 = r1 + r2;
-   /* return log base 2 of rho */
-   if (rho2 == 0.0F)
-      return 0.0;
-   else
-      return (GLfloat) (LOGF(rho2) * 1.442695 * 0.5);/* 1.442695 = 1/log(2) */
-}
-
-
-
-
-/*
- * Fill in the samples[] array with the (x,y) subpixel positions of
- * xSamples * ySamples sample positions.
- * Note that the four corner samples are put into the first four
- * positions of the array.  This allows us to optimize for the common
- * case of all samples being inside the polygon.
- */
-static void
-make_sample_table(GLint xSamples, GLint ySamples, GLfloat samples[][2])
-{
-   const GLfloat dx = 1.0F / (GLfloat) xSamples;
-   const GLfloat dy = 1.0F / (GLfloat) ySamples;
-   GLint x, y;
-   GLint i;
-
-   i = 4;
-   for (x = 0; x < xSamples; x++) {
-      for (y = 0; y < ySamples; y++) {
-         GLint j;
-         if (x == 0 && y == 0) {
-            /* lower left */
-            j = 0;
-         }
-         else if (x == xSamples - 1 && y == 0) {
-            /* lower right */
-            j = 1;
-         }
-         else if (x == 0 && y == ySamples - 1) {
-            /* upper left */
-            j = 2;
-         }
-         else if (x == xSamples - 1 && y == ySamples - 1) {
-            /* upper right */
-            j = 3;
-         }
-         else {
-            j = i++;
-         }
-         samples[j][0] = x * dx + 0.5F * dx;
-         samples[j][1] = y * dy + 0.5F * dy;
-      }
-   }
-}
-
-
-
-/*
- * Compute how much of the given pixel's area is inside the rectangle
- * defined by vertices v0, v1, v2, v3.
- * Vertices MUST be specified in counter-clockwise order.
- * Return:  coverage in [0, 1].
- */
-static GLfloat
-compute_coveragef(const struct LineInfo *info,
-                  GLint winx, GLint winy)
-{
-   static GLfloat samples[SUB_PIXEL * SUB_PIXEL][2];
-   static GLboolean haveSamples = GL_FALSE;
-   const GLfloat x = (GLfloat) winx;
-   const GLfloat y = (GLfloat) winy;
-   GLint stop = 4, i;
-   GLfloat insideCount = SUB_PIXEL * SUB_PIXEL;
-
-   if (!haveSamples) {
-      make_sample_table(SUB_PIXEL, SUB_PIXEL, samples);
-      haveSamples = GL_TRUE;
-   }
-
-#if 0 /*DEBUG*/
-   {
-      const GLfloat area = dx0 * dy1 - dx1 * dy0;
-      assert(area >= 0.0);
-   }
-#endif
-
-   for (i = 0; i < stop; i++) {
-      const GLfloat sx = x + samples[i][0];
-      const GLfloat sy = y + samples[i][1];
-      const GLfloat fx0 = sx - info->qx0;
-      const GLfloat fy0 = sy - info->qy0;
-      const GLfloat fx1 = sx - info->qx1;
-      const GLfloat fy1 = sy - info->qy1;
-      const GLfloat fx2 = sx - info->qx2;
-      const GLfloat fy2 = sy - info->qy2;
-      const GLfloat fx3 = sx - info->qx3;
-      const GLfloat fy3 = sy - info->qy3;
-      /* cross product determines if sample is inside or outside each edge */
-      GLfloat cross0 = (info->ex0 * fy0 - info->ey0 * fx0);
-      GLfloat cross1 = (info->ex1 * fy1 - info->ey1 * fx1);
-      GLfloat cross2 = (info->ex2 * fy2 - info->ey2 * fx2);
-      GLfloat cross3 = (info->ex3 * fy3 - info->ey3 * fx3);
-      /* Check if the sample is exactly on an edge.  If so, let cross be a
-       * positive or negative value depending on the direction of the edge.
-       */
-      if (cross0 == 0.0F)
-         cross0 = info->ex0 + info->ey0;
-      if (cross1 == 0.0F)
-         cross1 = info->ex1 + info->ey1;
-      if (cross2 == 0.0F)
-         cross2 = info->ex2 + info->ey2;
-      if (cross3 == 0.0F)
-         cross3 = info->ex3 + info->ey3;
-      if (cross0 < 0.0F || cross1 < 0.0F || cross2 < 0.0F || cross3 < 0.0F) {
-         /* point is outside quadrilateral */
-         insideCount -= 1.0F;
-         stop = SUB_PIXEL * SUB_PIXEL;
-      }
-   }
-   if (stop == 4)
-      return 1.0F;
-   else
-      return insideCount * (1.0F / (SUB_PIXEL * SUB_PIXEL));
-}
-
-
-typedef void (*plot_func)(GLcontext *ctx, struct LineInfo *line,
-                          int ix, int iy);
-                         
-
-
-/*
- * Draw an AA line segment (called many times per line when stippling)
- */
-static void
-segment(GLcontext *ctx,
-        struct LineInfo *line,
-        plot_func plot,
-        GLfloat t0, GLfloat t1)
-{
-   const GLfloat absDx = (line->dx < 0.0F) ? -line->dx : line->dx;
-   const GLfloat absDy = (line->dy < 0.0F) ? -line->dy : line->dy;
-   /* compute the actual segment's endpoints */
-   const GLfloat x0 = line->x0 + t0 * line->dx;
-   const GLfloat y0 = line->y0 + t0 * line->dy;
-   const GLfloat x1 = line->x0 + t1 * line->dx;
-   const GLfloat y1 = line->y0 + t1 * line->dy;
-
-   /* compute vertices of the line-aligned quadrilateral */
-   line->qx0 = x0 - line->yAdj;
-   line->qy0 = y0 + line->xAdj;
-   line->qx1 = x0 + line->yAdj;
-   line->qy1 = y0 - line->xAdj;
-   line->qx2 = x1 + line->yAdj;
-   line->qy2 = y1 - line->xAdj;
-   line->qx3 = x1 - line->yAdj;
-   line->qy3 = y1 + line->xAdj;
-   /* compute the quad's edge vectors (for coverage calc) */
-   line->ex0 = line->qx1 - line->qx0;
-   line->ey0 = line->qy1 - line->qy0;
-   line->ex1 = line->qx2 - line->qx1;
-   line->ey1 = line->qy2 - line->qy1;
-   line->ex2 = line->qx3 - line->qx2;
-   line->ey2 = line->qy3 - line->qy2;
-   line->ex3 = line->qx0 - line->qx3;
-   line->ey3 = line->qy0 - line->qy3;
-
-   if (absDx > absDy) {
-      /* X-major line */
-      GLfloat dydx = line->dy / line->dx;
-      GLfloat xLeft, xRight, yBot, yTop;
-      GLint ix, ixRight;
-      if (x0 < x1) {
-         xLeft = x0 - line->halfWidth;
-         xRight = x1 + line->halfWidth;
-         if (line->dy >= 0.0) {
-            yBot = y0 - 3.0F * line->halfWidth;
-            yTop = y0 + line->halfWidth;
-         }
-         else {
-            yBot = y0 - line->halfWidth;
-            yTop = y0 + 3.0F * line->halfWidth;
-         }
-      }
-      else {
-         xLeft = x1 - line->halfWidth;
-         xRight = x0 + line->halfWidth;
-         if (line->dy <= 0.0) {
-            yBot = y1 - 3.0F * line->halfWidth;
-            yTop = y1 + line->halfWidth;
-         }
-         else {
-            yBot = y1 - line->halfWidth;
-            yTop = y1 + 3.0F * line->halfWidth;
-         }
-      }
-
-      /* scan along the line, left-to-right */
-      ixRight = (GLint) (xRight + 1.0F);
-
-      /*printf("avg span height: %g\n", yTop - yBot);*/
-      for (ix = (GLint) xLeft; ix < ixRight; ix++) {
-         const GLint iyBot = (GLint) yBot;
-         const GLint iyTop = (GLint) (yTop + 1.0F);
-         GLint iy;
-         /* scan across the line, bottom-to-top */
-         for (iy = iyBot; iy < iyTop; iy++) {
-            (*plot)(ctx, line, ix, iy);
-         }
-         yBot += dydx;
-         yTop += dydx;
-      }
-   }
-   else {
-      /* Y-major line */
-      GLfloat dxdy = line->dx / line->dy;
-      GLfloat yBot, yTop, xLeft, xRight;
-      GLint iy, iyTop;
-      if (y0 < y1) {
-         yBot = y0 - line->halfWidth;
-         yTop = y1 + line->halfWidth;
-         if (line->dx >= 0.0) {
-            xLeft = x0 - 3.0F * line->halfWidth;
-            xRight = x0 + line->halfWidth;
-         }
-         else {
-            xLeft = x0 - line->halfWidth;
-            xRight = x0 + 3.0F * line->halfWidth;
-         }
-      }
-      else {
-         yBot = y1 - line->halfWidth;
-         yTop = y0 + line->halfWidth;
-         if (line->dx <= 0.0) {
-            xLeft = x1 - 3.0F * line->halfWidth;
-            xRight = x1 + line->halfWidth;
-         }
-         else {
-            xLeft = x1 - line->halfWidth;
-            xRight = x1 + 3.0F * line->halfWidth;
-         }
-      }
-
-      /* scan along the line, bottom-to-top */
-      iyTop = (GLint) (yTop + 1.0F);
-
-      /*printf("avg span width: %g\n", xRight - xLeft);*/
-      for (iy = (GLint) yBot; iy < iyTop; iy++) {
-         const GLint ixLeft = (GLint) xLeft;
-         const GLint ixRight = (GLint) (xRight + 1.0F);
-         GLint ix;
-         /* scan across the line, left-to-right */
-         for (ix = ixLeft; ix < ixRight; ix++) {
-            (*plot)(ctx, line, ix, iy);
-         }
-         xLeft += dxdy;
-         xRight += dxdy;
-      }
-   }
-}
-
-
-#define NAME(x) aa_rgba_##x
-#define DO_Z
-#include "s_aalinetemp.h"
-
-
-#define NAME(x)  aa_general_rgba_##x
-#define DO_Z
-#define DO_ATTRIBS
-#include "s_aalinetemp.h"
-
-
-
-void
-_swrast_choose_aa_line_function(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   ASSERT(ctx->Line.SmoothFlag);
-
-   if (ctx->Texture._EnabledCoordUnits != 0
-       || ctx->FragmentProgram._Current
-       || (ctx->Light.Enabled &&
-           ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
-       || ctx->Fog.ColorSumEnabled
-       || swrast->_FogEnabled) {
-      swrast->Line = aa_general_rgba_line;
-   }
-   else {
-      swrast->Line = aa_rgba_line;
-   }
-}
+/*

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

+ */

+

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+#include "swrast/s_aaline.h"

+#include "swrast/s_context.h"

+#include "swrast/s_span.h"

+#include "swrast/swrast.h"

+

+

+#define SUB_PIXEL 4

+

+

+/*

+ * Info about the AA line we're rendering

+ */

+struct LineInfo

+{

+   GLfloat x0, y0;        /* start */

+   GLfloat x1, y1;        /* end */

+   GLfloat dx, dy;        /* direction vector */

+   GLfloat len;           /* length */

+   GLfloat halfWidth;     /* half of line width */

+   GLfloat xAdj, yAdj;    /* X and Y adjustment for quad corners around line */

+   /* for coverage computation */

+   GLfloat qx0, qy0;      /* quad vertices */

+   GLfloat qx1, qy1;

+   GLfloat qx2, qy2;

+   GLfloat qx3, qy3;

+   GLfloat ex0, ey0;      /* quad edge vectors */

+   GLfloat ex1, ey1;

+   GLfloat ex2, ey2;

+   GLfloat ex3, ey3;

+

+   /* DO_Z */

+   GLfloat zPlane[4];

+   /* DO_RGBA - always enabled */

+   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];

+   /* DO_ATTRIBS */

+   GLfloat wPlane[4];

+   GLfloat attrPlane[FRAG_ATTRIB_MAX][4][4];

+   GLfloat lambda[FRAG_ATTRIB_MAX];

+   GLfloat texWidth[FRAG_ATTRIB_MAX];

+   GLfloat texHeight[FRAG_ATTRIB_MAX];

+

+   SWspan span;

+};

+

+

+

+/*

+ * Compute the equation of a plane used to interpolate line fragment data

+ * such as color, Z, texture coords, etc.

+ * Input: (x0, y0) and (x1,y1) are the endpoints of the line.

+ *        z0, and z1 are the end point values to interpolate.

+ * Output:  plane - the plane equation.

+ *

+ * Note: we don't really have enough parameters to specify a plane.

+ * We take the endpoints of the line and compute a plane such that

+ * the cross product of the line vector and the plane normal is

+ * parallel to the projection plane.

+ */

+static void

+compute_plane(GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1,

+              GLfloat z0, GLfloat z1, GLfloat plane[4])

+{

+#if 0

+   /* original */

+   const GLfloat px = x1 - x0;

+   const GLfloat py = y1 - y0;

+   const GLfloat pz = z1 - z0;

+   const GLfloat qx = -py;

+   const GLfloat qy = px;

+   const GLfloat qz = 0;

+   const GLfloat a = py * qz - pz * qy;

+   const GLfloat b = pz * qx - px * qz;

+   const GLfloat c = px * qy - py * qx;

+   const GLfloat d = -(a * x0 + b * y0 + c * z0);

+   plane[0] = a;

+   plane[1] = b;

+   plane[2] = c;

+   plane[3] = d;

+#else

+   /* simplified */

+   const GLfloat px = x1 - x0;

+   const GLfloat py = y1 - y0;

+   const GLfloat pz = z0 - z1;

+   const GLfloat a = pz * px;

+   const GLfloat b = pz * py;

+   const GLfloat c = px * px + py * py;

+   const GLfloat d = -(a * x0 + b * y0 + c * z0);

+   if (a == 0.0 && b == 0.0 && c == 0.0 && d == 0.0) {

+      plane[0] = 0.0;

+      plane[1] = 0.0;

+      plane[2] = 1.0;

+      plane[3] = 0.0;

+   }

+   else {

+      plane[0] = a;

+      plane[1] = b;

+      plane[2] = c;

+      plane[3] = d;

+   }

+#endif

+}

+

+

+static INLINE void

+constant_plane(GLfloat value, GLfloat plane[4])

+{

+   plane[0] = 0.0;

+   plane[1] = 0.0;

+   plane[2] = -1.0;

+   plane[3] = value;

+}

+

+

+static INLINE GLfloat

+solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])

+{

+   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];

+   return z;

+}

+

+#define SOLVE_PLANE(X, Y, PLANE) \

+   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])

+

+

+/*

+ * Return 1 / solve_plane().

+ */

+static INLINE GLfloat

+solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])

+{

+   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;

+   if (denom == 0.0)

+      return 0.0;

+   else

+      return -plane[2] / denom;

+}

+

+

+/*

+ * Solve plane and return clamped GLchan value.

+ */

+static INLINE GLchan

+solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])

+{

+   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];

+#if CHAN_TYPE == GL_FLOAT

+   return CLAMP(z, 0.0F, CHAN_MAXF);

+#else

+   if (z < 0)

+      return 0;

+   else if (z > CHAN_MAX)

+      return CHAN_MAX;

+   return (GLchan) IROUND_POS(z);

+#endif

+}

+

+

+/*

+ * Compute mipmap level of detail.

+ */

+static INLINE GLfloat

+compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],

+               GLfloat invQ, GLfloat width, GLfloat height)

+{

+   GLfloat dudx = sPlane[0] / sPlane[2] * invQ * width;

+   GLfloat dudy = sPlane[1] / sPlane[2] * invQ * width;

+   GLfloat dvdx = tPlane[0] / tPlane[2] * invQ * height;

+   GLfloat dvdy = tPlane[1] / tPlane[2] * invQ * height;

+   GLfloat r1 = dudx * dudx + dudy * dudy;

+   GLfloat r2 = dvdx * dvdx + dvdy * dvdy;

+   GLfloat rho2 = r1 + r2;

+   /* return log base 2 of rho */

+   if (rho2 == 0.0F)

+      return 0.0;

+   else

+      return (GLfloat) (LOGF(rho2) * 1.442695 * 0.5);/* 1.442695 = 1/log(2) */

+}

+

+

+

+

+/*

+ * Fill in the samples[] array with the (x,y) subpixel positions of

+ * xSamples * ySamples sample positions.

+ * Note that the four corner samples are put into the first four

+ * positions of the array.  This allows us to optimize for the common

+ * case of all samples being inside the polygon.

+ */

+static void

+make_sample_table(GLint xSamples, GLint ySamples, GLfloat samples[][2])

+{

+   const GLfloat dx = 1.0F / (GLfloat) xSamples;

+   const GLfloat dy = 1.0F / (GLfloat) ySamples;

+   GLint x, y;

+   GLint i;

+

+   i = 4;

+   for (x = 0; x < xSamples; x++) {

+      for (y = 0; y < ySamples; y++) {

+         GLint j;

+         if (x == 0 && y == 0) {

+            /* lower left */

+            j = 0;

+         }

+         else if (x == xSamples - 1 && y == 0) {

+            /* lower right */

+            j = 1;

+         }

+         else if (x == 0 && y == ySamples - 1) {

+            /* upper left */

+            j = 2;

+         }

+         else if (x == xSamples - 1 && y == ySamples - 1) {

+            /* upper right */

+            j = 3;

+         }

+         else {

+            j = i++;

+         }

+         samples[j][0] = x * dx + 0.5F * dx;

+         samples[j][1] = y * dy + 0.5F * dy;

+      }

+   }

+}

+

+

+

+/*

+ * Compute how much of the given pixel's area is inside the rectangle

+ * defined by vertices v0, v1, v2, v3.

+ * Vertices MUST be specified in counter-clockwise order.

+ * Return:  coverage in [0, 1].

+ */

+static GLfloat

+compute_coveragef(const struct LineInfo *info,

+                  GLint winx, GLint winy)

+{

+   static GLfloat samples[SUB_PIXEL * SUB_PIXEL][2];

+   static GLboolean haveSamples = GL_FALSE;

+   const GLfloat x = (GLfloat) winx;

+   const GLfloat y = (GLfloat) winy;

+   GLint stop = 4, i;

+   GLfloat insideCount = SUB_PIXEL * SUB_PIXEL;

+

+   if (!haveSamples) {

+      make_sample_table(SUB_PIXEL, SUB_PIXEL, samples);

+      haveSamples = GL_TRUE;

+   }

+

+#if 0 /*DEBUG*/

+   {

+      const GLfloat area = dx0 * dy1 - dx1 * dy0;

+      assert(area >= 0.0);

+   }

+#endif

+

+   for (i = 0; i < stop; i++) {

+      const GLfloat sx = x + samples[i][0];

+      const GLfloat sy = y + samples[i][1];

+      const GLfloat fx0 = sx - info->qx0;

+      const GLfloat fy0 = sy - info->qy0;

+      const GLfloat fx1 = sx - info->qx1;

+      const GLfloat fy1 = sy - info->qy1;

+      const GLfloat fx2 = sx - info->qx2;

+      const GLfloat fy2 = sy - info->qy2;

+      const GLfloat fx3 = sx - info->qx3;

+      const GLfloat fy3 = sy - info->qy3;

+      /* cross product determines if sample is inside or outside each edge */

+      GLfloat cross0 = (info->ex0 * fy0 - info->ey0 * fx0);

+      GLfloat cross1 = (info->ex1 * fy1 - info->ey1 * fx1);

+      GLfloat cross2 = (info->ex2 * fy2 - info->ey2 * fx2);

+      GLfloat cross3 = (info->ex3 * fy3 - info->ey3 * fx3);

+      /* Check if the sample is exactly on an edge.  If so, let cross be a

+       * positive or negative value depending on the direction of the edge.

+       */

+      if (cross0 == 0.0F)

+         cross0 = info->ex0 + info->ey0;

+      if (cross1 == 0.0F)

+         cross1 = info->ex1 + info->ey1;

+      if (cross2 == 0.0F)

+         cross2 = info->ex2 + info->ey2;

+      if (cross3 == 0.0F)

+         cross3 = info->ex3 + info->ey3;

+      if (cross0 < 0.0F || cross1 < 0.0F || cross2 < 0.0F || cross3 < 0.0F) {

+         /* point is outside quadrilateral */

+         insideCount -= 1.0F;

+         stop = SUB_PIXEL * SUB_PIXEL;

+      }

+   }

+   if (stop == 4)

+      return 1.0F;

+   else

+      return insideCount * (1.0F / (SUB_PIXEL * SUB_PIXEL));

+}

+

+

+typedef void (*plot_func)(struct gl_context *ctx, struct LineInfo *line,

+                          int ix, int iy);

+                         

+

+

+/*

+ * Draw an AA line segment (called many times per line when stippling)

+ */

+static void

+segment(struct gl_context *ctx,

+        struct LineInfo *line,

+        plot_func plot,

+        GLfloat t0, GLfloat t1)

+{

+   const GLfloat absDx = (line->dx < 0.0F) ? -line->dx : line->dx;

+   const GLfloat absDy = (line->dy < 0.0F) ? -line->dy : line->dy;

+   /* compute the actual segment's endpoints */

+   const GLfloat x0 = line->x0 + t0 * line->dx;

+   const GLfloat y0 = line->y0 + t0 * line->dy;

+   const GLfloat x1 = line->x0 + t1 * line->dx;

+   const GLfloat y1 = line->y0 + t1 * line->dy;

+

+   /* compute vertices of the line-aligned quadrilateral */

+   line->qx0 = x0 - line->yAdj;

+   line->qy0 = y0 + line->xAdj;

+   line->qx1 = x0 + line->yAdj;

+   line->qy1 = y0 - line->xAdj;

+   line->qx2 = x1 + line->yAdj;

+   line->qy2 = y1 - line->xAdj;

+   line->qx3 = x1 - line->yAdj;

+   line->qy3 = y1 + line->xAdj;

+   /* compute the quad's edge vectors (for coverage calc) */

+   line->ex0 = line->qx1 - line->qx0;

+   line->ey0 = line->qy1 - line->qy0;

+   line->ex1 = line->qx2 - line->qx1;

+   line->ey1 = line->qy2 - line->qy1;

+   line->ex2 = line->qx3 - line->qx2;

+   line->ey2 = line->qy3 - line->qy2;

+   line->ex3 = line->qx0 - line->qx3;

+   line->ey3 = line->qy0 - line->qy3;

+

+   if (absDx > absDy) {

+      /* X-major line */

+      GLfloat dydx = line->dy / line->dx;

+      GLfloat xLeft, xRight, yBot, yTop;

+      GLint ix, ixRight;

+      if (x0 < x1) {

+         xLeft = x0 - line->halfWidth;

+         xRight = x1 + line->halfWidth;

+         if (line->dy >= 0.0) {

+            yBot = y0 - 3.0F * line->halfWidth;

+            yTop = y0 + line->halfWidth;

+         }

+         else {

+            yBot = y0 - line->halfWidth;

+            yTop = y0 + 3.0F * line->halfWidth;

+         }

+      }

+      else {

+         xLeft = x1 - line->halfWidth;

+         xRight = x0 + line->halfWidth;

+         if (line->dy <= 0.0) {

+            yBot = y1 - 3.0F * line->halfWidth;

+            yTop = y1 + line->halfWidth;

+         }

+         else {

+            yBot = y1 - line->halfWidth;

+            yTop = y1 + 3.0F * line->halfWidth;

+         }

+      }

+

+      /* scan along the line, left-to-right */

+      ixRight = (GLint) (xRight + 1.0F);

+

+      /*printf("avg span height: %g\n", yTop - yBot);*/

+      for (ix = (GLint) xLeft; ix < ixRight; ix++) {

+         const GLint iyBot = (GLint) yBot;

+         const GLint iyTop = (GLint) (yTop + 1.0F);

+         GLint iy;

+         /* scan across the line, bottom-to-top */

+         for (iy = iyBot; iy < iyTop; iy++) {

+            (*plot)(ctx, line, ix, iy);

+         }

+         yBot += dydx;

+         yTop += dydx;

+      }

+   }

+   else {

+      /* Y-major line */

+      GLfloat dxdy = line->dx / line->dy;

+      GLfloat yBot, yTop, xLeft, xRight;

+      GLint iy, iyTop;

+      if (y0 < y1) {

+         yBot = y0 - line->halfWidth;

+         yTop = y1 + line->halfWidth;

+         if (line->dx >= 0.0) {

+            xLeft = x0 - 3.0F * line->halfWidth;

+            xRight = x0 + line->halfWidth;

+         }

+         else {

+            xLeft = x0 - line->halfWidth;

+            xRight = x0 + 3.0F * line->halfWidth;

+         }

+      }

+      else {

+         yBot = y1 - line->halfWidth;

+         yTop = y0 + line->halfWidth;

+         if (line->dx <= 0.0) {

+            xLeft = x1 - 3.0F * line->halfWidth;

+            xRight = x1 + line->halfWidth;

+         }

+         else {

+            xLeft = x1 - line->halfWidth;

+            xRight = x1 + 3.0F * line->halfWidth;

+         }

+      }

+

+      /* scan along the line, bottom-to-top */

+      iyTop = (GLint) (yTop + 1.0F);

+

+      /*printf("avg span width: %g\n", xRight - xLeft);*/

+      for (iy = (GLint) yBot; iy < iyTop; iy++) {

+         const GLint ixLeft = (GLint) xLeft;

+         const GLint ixRight = (GLint) (xRight + 1.0F);

+         GLint ix;

+         /* scan across the line, left-to-right */

+         for (ix = ixLeft; ix < ixRight; ix++) {

+            (*plot)(ctx, line, ix, iy);

+         }

+         xLeft += dxdy;

+         xRight += dxdy;

+      }

+   }

+}

+

+

+#define NAME(x) aa_rgba_##x

+#define DO_Z

+#include "s_aalinetemp.h"

+

+

+#define NAME(x)  aa_general_rgba_##x

+#define DO_Z

+#define DO_ATTRIBS

+#include "s_aalinetemp.h"

+

+

+

+void

+_swrast_choose_aa_line_function(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   ASSERT(ctx->Line.SmoothFlag);

+

+   if (ctx->Texture._EnabledCoordUnits != 0

+       || ctx->FragmentProgram._Current

+       || (ctx->Light.Enabled &&

+           ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)

+       || ctx->Fog.ColorSumEnabled

+       || swrast->_FogEnabled) {

+      swrast->Line = aa_general_rgba_line;

+   }

+   else {

+      swrast->Line = aa_rgba_line;

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_aaline.h b/mesalib/src/mesa/swrast/s_aaline.h
index 922eb230e..993c12eab 100644
--- a/mesalib/src/mesa/swrast/s_aaline.h
+++ b/mesalib/src/mesa/swrast/s_aaline.h
@@ -1,38 +1,38 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 S_AALINE_H
-#define S_AALINE_H
-
-
-#include "main/mtypes.h"
-
-
-extern void
-_swrast_choose_aa_line_function(GLcontext *ctx);
-
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 S_AALINE_H

+#define S_AALINE_H

+

+

+struct gl_context;

+

+

+extern void

+_swrast_choose_aa_line_function(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_aalinetemp.h b/mesalib/src/mesa/swrast/s_aalinetemp.h
index c28d47a67..7c535669b 100644
--- a/mesalib/src/mesa/swrast/s_aalinetemp.h
+++ b/mesalib/src/mesa/swrast/s_aalinetemp.h
@@ -1,242 +1,242 @@
-/*
- * 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.
- */
-
-
-/*
- * Antialiased line template.
- */
-
-
-/*
- * Function to render each fragment in the AA line.
- * \param ix  - integer fragment window X coordiante
- * \param iy  - integer fragment window Y coordiante
- */
-static void
-NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy)
-{
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLfloat fx = (GLfloat) ix;
-   const GLfloat fy = (GLfloat) iy;
-   const GLfloat coverage = compute_coveragef(line, ix, iy);
-   const GLuint i = line->span.end;
-
-   (void) swrast;
-
-   if (coverage == 0.0)
-      return;
-
-   line->span.end++;
-   line->span.array->coverage[i] = coverage;
-   line->span.array->x[i] = ix;
-   line->span.array->y[i] = iy;
-
-   /*
-    * Compute Z, color, texture coords, fog for the fragment by
-    * solving the plane equations at (ix,iy).
-    */
-#ifdef DO_Z
-   line->span.array->z[i] = (GLuint) solve_plane(fx, fy, line->zPlane);
-#endif
-   line->span.array->rgba[i][RCOMP] = solve_plane_chan(fx, fy, line->rPlane);
-   line->span.array->rgba[i][GCOMP] = solve_plane_chan(fx, fy, line->gPlane);
-   line->span.array->rgba[i][BCOMP] = solve_plane_chan(fx, fy, line->bPlane);
-   line->span.array->rgba[i][ACOMP] = solve_plane_chan(fx, fy, line->aPlane);
-#if defined(DO_ATTRIBS)
-   ATTRIB_LOOP_BEGIN
-      GLfloat (*attribArray)[4] = line->span.array->attribs[attr];
-      if (attr >= FRAG_ATTRIB_TEX0 && attr < FRAG_ATTRIB_VAR0
-          && !ctx->FragmentProgram._Current) {
-         /* texcoord w/ divide by Q */
-         const GLuint unit = attr - FRAG_ATTRIB_TEX0;
-         const GLfloat invQ = solve_plane_recip(fx, fy, line->attrPlane[attr][3]);
-         GLuint c;
-         for (c = 0; c < 3; c++) {
-            attribArray[i][c] = solve_plane(fx, fy, line->attrPlane[attr][c]) * invQ;
-         }
-         line->span.array->lambda[unit][i]
-            = compute_lambda(line->attrPlane[attr][0],
-                             line->attrPlane[attr][1], invQ,
-                             line->texWidth[attr], line->texHeight[attr]);
-      }
-      else {
-         /* non-texture attrib */
-         const GLfloat invW = solve_plane_recip(fx, fy, line->wPlane);
-         GLuint c;
-         for (c = 0; c < 4; c++) {
-            attribArray[i][c] = solve_plane(fx, fy, line->attrPlane[attr][c]) * invW;
-         }
-      }
-   ATTRIB_LOOP_END
-#endif
-
-   if (line->span.end == MAX_WIDTH) {
-      _swrast_write_rgba_span(ctx, &(line->span));
-      line->span.end = 0; /* reset counter */
-   }
-}
-
-
-
-/*
- * Line setup
- */
-static void
-NAME(line)(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLfloat tStart, tEnd;   /* segment start, end along line length */
-   GLboolean inSegment;
-   GLint iLen, i;
-
-   /* Init the LineInfo struct */
-   struct LineInfo line;
-   line.x0 = v0->attrib[FRAG_ATTRIB_WPOS][0];
-   line.y0 = v0->attrib[FRAG_ATTRIB_WPOS][1];
-   line.x1 = v1->attrib[FRAG_ATTRIB_WPOS][0];
-   line.y1 = v1->attrib[FRAG_ATTRIB_WPOS][1];
-   line.dx = line.x1 - line.x0;
-   line.dy = line.y1 - line.y0;
-   line.len = SQRTF(line.dx * line.dx + line.dy * line.dy);
-   line.halfWidth = 0.5F * CLAMP(ctx->Line.Width,
-                                 ctx->Const.MinLineWidthAA,
-                                 ctx->Const.MaxLineWidthAA);
-
-   if (line.len == 0.0 || IS_INF_OR_NAN(line.len))
-      return;
-
-   INIT_SPAN(line.span, GL_LINE);
-   line.span.arrayMask = SPAN_XY | SPAN_COVERAGE;
-   line.span.facing = swrast->PointLineFacing;
-   line.xAdj = line.dx / line.len * line.halfWidth;
-   line.yAdj = line.dy / line.len * line.halfWidth;
-
-#ifdef DO_Z
-   line.span.arrayMask |= SPAN_Z;
-   compute_plane(line.x0, line.y0, line.x1, line.y1,
-                 v0->attrib[FRAG_ATTRIB_WPOS][2], v1->attrib[FRAG_ATTRIB_WPOS][2], line.zPlane);
-#endif
-   line.span.arrayMask |= SPAN_RGBA;
-   if (ctx->Light.ShadeModel == GL_SMOOTH) {
-      compute_plane(line.x0, line.y0, line.x1, line.y1,
-                    v0->color[RCOMP], v1->color[RCOMP], line.rPlane);
-      compute_plane(line.x0, line.y0, line.x1, line.y1,
-                    v0->color[GCOMP], v1->color[GCOMP], line.gPlane);
-      compute_plane(line.x0, line.y0, line.x1, line.y1,
-                    v0->color[BCOMP], v1->color[BCOMP], line.bPlane);
-      compute_plane(line.x0, line.y0, line.x1, line.y1,
-                    v0->color[ACOMP], v1->color[ACOMP], line.aPlane);
-   }
-   else {
-      constant_plane(v1->color[RCOMP], line.rPlane);
-      constant_plane(v1->color[GCOMP], line.gPlane);
-      constant_plane(v1->color[BCOMP], line.bPlane);
-      constant_plane(v1->color[ACOMP], line.aPlane);
-   }
-#if defined(DO_ATTRIBS)
-   {
-      const GLfloat invW0 = v0->attrib[FRAG_ATTRIB_WPOS][3];
-      const GLfloat invW1 = v1->attrib[FRAG_ATTRIB_WPOS][3];
-      line.span.arrayMask |= SPAN_LAMBDA;
-      compute_plane(line.x0, line.y0, line.x1, line.y1, invW0, invW1, line.wPlane);
-      ATTRIB_LOOP_BEGIN
-         GLuint c;
-         if (swrast->_InterpMode[attr] == GL_FLAT) {
-            for (c = 0; c < 4; c++) {
-               constant_plane(v1->attrib[attr][c], line.attrPlane[attr][c]);
-            }
-         }
-         else {
-            for (c = 0; c < 4; c++) {
-               const GLfloat a0 = v0->attrib[attr][c] * invW0;
-               const GLfloat a1 = v1->attrib[attr][c] * invW1;
-               compute_plane(line.x0, line.y0, line.x1, line.y1, a0, a1,
-                             line.attrPlane[attr][c]);
-            }
-         }
-         line.span.arrayAttribs |= (1 << attr);
-         if (attr >= FRAG_ATTRIB_TEX0 && attr < FRAG_ATTRIB_VAR0) {
-            const GLuint u = attr - FRAG_ATTRIB_TEX0;
-            const struct gl_texture_object *obj = ctx->Texture.Unit[u]._Current;
-            const struct gl_texture_image *texImage = obj->Image[0][obj->BaseLevel];
-            line.texWidth[attr]  = (GLfloat) texImage->Width;
-            line.texHeight[attr] = (GLfloat) texImage->Height;
-         }
-      ATTRIB_LOOP_END
-   }
-#endif
-
-   tStart = tEnd = 0.0;
-   inSegment = GL_FALSE;
-   iLen = (GLint) line.len;
-
-   if (ctx->Line.StippleFlag) {
-      for (i = 0; i < iLen; i++) {
-         const GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;
-         if ((1 << bit) & ctx->Line.StipplePattern) {
-            /* stipple bit is on */
-            const GLfloat t = (GLfloat) i / (GLfloat) line.len;
-            if (!inSegment) {
-               /* start new segment */
-               inSegment = GL_TRUE;
-               tStart = t;
-            }
-            else {
-               /* still in the segment, extend it */
-               tEnd = t;
-            }
-         }
-         else {
-            /* stipple bit is off */
-            if (inSegment && (tEnd > tStart)) {
-               /* draw the segment */
-               segment(ctx, &line, NAME(plot), tStart, tEnd);
-               inSegment = GL_FALSE;
-            }
-            else {
-               /* still between segments, do nothing */
-            }
-         }
-         swrast->StippleCounter++;
-      }
-
-      if (inSegment) {
-         /* draw the final segment of the line */
-         segment(ctx, &line, NAME(plot), tStart, 1.0F);
-      }
-   }
-   else {
-      /* non-stippled */
-      segment(ctx, &line, NAME(plot), 0.0, 1.0);
-   }
-
-   _swrast_write_rgba_span(ctx, &(line.span));
-}
-
-
-
-
-#undef DO_Z
-#undef DO_ATTRIBS
-#undef NAME
+/*

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

+ */

+

+

+/*

+ * Antialiased line template.

+ */

+

+

+/*

+ * Function to render each fragment in the AA line.

+ * \param ix  - integer fragment window X coordiante

+ * \param iy  - integer fragment window Y coordiante

+ */

+static void

+NAME(plot)(struct gl_context *ctx, struct LineInfo *line, int ix, int iy)

+{

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const GLfloat fx = (GLfloat) ix;

+   const GLfloat fy = (GLfloat) iy;

+   const GLfloat coverage = compute_coveragef(line, ix, iy);

+   const GLuint i = line->span.end;

+

+   (void) swrast;

+

+   if (coverage == 0.0)

+      return;

+

+   line->span.end++;

+   line->span.array->coverage[i] = coverage;

+   line->span.array->x[i] = ix;

+   line->span.array->y[i] = iy;

+

+   /*

+    * Compute Z, color, texture coords, fog for the fragment by

+    * solving the plane equations at (ix,iy).

+    */

+#ifdef DO_Z

+   line->span.array->z[i] = (GLuint) solve_plane(fx, fy, line->zPlane);

+#endif

+   line->span.array->rgba[i][RCOMP] = solve_plane_chan(fx, fy, line->rPlane);

+   line->span.array->rgba[i][GCOMP] = solve_plane_chan(fx, fy, line->gPlane);

+   line->span.array->rgba[i][BCOMP] = solve_plane_chan(fx, fy, line->bPlane);

+   line->span.array->rgba[i][ACOMP] = solve_plane_chan(fx, fy, line->aPlane);

+#if defined(DO_ATTRIBS)

+   ATTRIB_LOOP_BEGIN

+      GLfloat (*attribArray)[4] = line->span.array->attribs[attr];

+      if (attr >= FRAG_ATTRIB_TEX0 && attr < FRAG_ATTRIB_VAR0

+          && !ctx->FragmentProgram._Current) {

+         /* texcoord w/ divide by Q */

+         const GLuint unit = attr - FRAG_ATTRIB_TEX0;

+         const GLfloat invQ = solve_plane_recip(fx, fy, line->attrPlane[attr][3]);

+         GLuint c;

+         for (c = 0; c < 3; c++) {

+            attribArray[i][c] = solve_plane(fx, fy, line->attrPlane[attr][c]) * invQ;

+         }

+         line->span.array->lambda[unit][i]

+            = compute_lambda(line->attrPlane[attr][0],

+                             line->attrPlane[attr][1], invQ,

+                             line->texWidth[attr], line->texHeight[attr]);

+      }

+      else {

+         /* non-texture attrib */

+         const GLfloat invW = solve_plane_recip(fx, fy, line->wPlane);

+         GLuint c;

+         for (c = 0; c < 4; c++) {

+            attribArray[i][c] = solve_plane(fx, fy, line->attrPlane[attr][c]) * invW;

+         }

+      }

+   ATTRIB_LOOP_END

+#endif

+

+   if (line->span.end == MAX_WIDTH) {

+      _swrast_write_rgba_span(ctx, &(line->span));

+      line->span.end = 0; /* reset counter */

+   }

+}

+

+

+

+/*

+ * Line setup

+ */

+static void

+NAME(line)(struct gl_context *ctx, const SWvertex *v0, const SWvertex *v1)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLfloat tStart, tEnd;   /* segment start, end along line length */

+   GLboolean inSegment;

+   GLint iLen, i;

+

+   /* Init the LineInfo struct */

+   struct LineInfo line;

+   line.x0 = v0->attrib[FRAG_ATTRIB_WPOS][0];

+   line.y0 = v0->attrib[FRAG_ATTRIB_WPOS][1];

+   line.x1 = v1->attrib[FRAG_ATTRIB_WPOS][0];

+   line.y1 = v1->attrib[FRAG_ATTRIB_WPOS][1];

+   line.dx = line.x1 - line.x0;

+   line.dy = line.y1 - line.y0;

+   line.len = SQRTF(line.dx * line.dx + line.dy * line.dy);

+   line.halfWidth = 0.5F * CLAMP(ctx->Line.Width,

+                                 ctx->Const.MinLineWidthAA,

+                                 ctx->Const.MaxLineWidthAA);

+

+   if (line.len == 0.0 || IS_INF_OR_NAN(line.len))

+      return;

+

+   INIT_SPAN(line.span, GL_LINE);

+   line.span.arrayMask = SPAN_XY | SPAN_COVERAGE;

+   line.span.facing = swrast->PointLineFacing;

+   line.xAdj = line.dx / line.len * line.halfWidth;

+   line.yAdj = line.dy / line.len * line.halfWidth;

+

+#ifdef DO_Z

+   line.span.arrayMask |= SPAN_Z;

+   compute_plane(line.x0, line.y0, line.x1, line.y1,

+                 v0->attrib[FRAG_ATTRIB_WPOS][2], v1->attrib[FRAG_ATTRIB_WPOS][2], line.zPlane);

+#endif

+   line.span.arrayMask |= SPAN_RGBA;

+   if (ctx->Light.ShadeModel == GL_SMOOTH) {

+      compute_plane(line.x0, line.y0, line.x1, line.y1,

+                    v0->color[RCOMP], v1->color[RCOMP], line.rPlane);

+      compute_plane(line.x0, line.y0, line.x1, line.y1,

+                    v0->color[GCOMP], v1->color[GCOMP], line.gPlane);

+      compute_plane(line.x0, line.y0, line.x1, line.y1,

+                    v0->color[BCOMP], v1->color[BCOMP], line.bPlane);

+      compute_plane(line.x0, line.y0, line.x1, line.y1,

+                    v0->color[ACOMP], v1->color[ACOMP], line.aPlane);

+   }

+   else {

+      constant_plane(v1->color[RCOMP], line.rPlane);

+      constant_plane(v1->color[GCOMP], line.gPlane);

+      constant_plane(v1->color[BCOMP], line.bPlane);

+      constant_plane(v1->color[ACOMP], line.aPlane);

+   }

+#if defined(DO_ATTRIBS)

+   {

+      const GLfloat invW0 = v0->attrib[FRAG_ATTRIB_WPOS][3];

+      const GLfloat invW1 = v1->attrib[FRAG_ATTRIB_WPOS][3];

+      line.span.arrayMask |= SPAN_LAMBDA;

+      compute_plane(line.x0, line.y0, line.x1, line.y1, invW0, invW1, line.wPlane);

+      ATTRIB_LOOP_BEGIN

+         GLuint c;

+         if (swrast->_InterpMode[attr] == GL_FLAT) {

+            for (c = 0; c < 4; c++) {

+               constant_plane(v1->attrib[attr][c], line.attrPlane[attr][c]);

+            }

+         }

+         else {

+            for (c = 0; c < 4; c++) {

+               const GLfloat a0 = v0->attrib[attr][c] * invW0;

+               const GLfloat a1 = v1->attrib[attr][c] * invW1;

+               compute_plane(line.x0, line.y0, line.x1, line.y1, a0, a1,

+                             line.attrPlane[attr][c]);

+            }

+         }

+         line.span.arrayAttribs |= (1 << attr);

+         if (attr >= FRAG_ATTRIB_TEX0 && attr < FRAG_ATTRIB_VAR0) {

+            const GLuint u = attr - FRAG_ATTRIB_TEX0;

+            const struct gl_texture_object *obj = ctx->Texture.Unit[u]._Current;

+            const struct gl_texture_image *texImage = obj->Image[0][obj->BaseLevel];

+            line.texWidth[attr]  = (GLfloat) texImage->Width;

+            line.texHeight[attr] = (GLfloat) texImage->Height;

+         }

+      ATTRIB_LOOP_END

+   }

+#endif

+

+   tStart = tEnd = 0.0;

+   inSegment = GL_FALSE;

+   iLen = (GLint) line.len;

+

+   if (ctx->Line.StippleFlag) {

+      for (i = 0; i < iLen; i++) {

+         const GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;

+         if ((1 << bit) & ctx->Line.StipplePattern) {

+            /* stipple bit is on */

+            const GLfloat t = (GLfloat) i / (GLfloat) line.len;

+            if (!inSegment) {

+               /* start new segment */

+               inSegment = GL_TRUE;

+               tStart = t;

+            }

+            else {

+               /* still in the segment, extend it */

+               tEnd = t;

+            }

+         }

+         else {

+            /* stipple bit is off */

+            if (inSegment && (tEnd > tStart)) {

+               /* draw the segment */

+               segment(ctx, &line, NAME(plot), tStart, tEnd);

+               inSegment = GL_FALSE;

+            }

+            else {

+               /* still between segments, do nothing */

+            }

+         }

+         swrast->StippleCounter++;

+      }

+

+      if (inSegment) {

+         /* draw the final segment of the line */

+         segment(ctx, &line, NAME(plot), tStart, 1.0F);

+      }

+   }

+   else {

+      /* non-stippled */

+      segment(ctx, &line, NAME(plot), 0.0, 1.0);

+   }

+

+   _swrast_write_rgba_span(ctx, &(line.span));

+}

+

+

+

+

+#undef DO_Z

+#undef DO_ATTRIBS

+#undef NAME

diff --git a/mesalib/src/mesa/swrast/s_aatriangle.c b/mesalib/src/mesa/swrast/s_aatriangle.c
index 1d90f322a..ba92fc14a 100644
--- a/mesalib/src/mesa/swrast/s_aatriangle.c
+++ b/mesalib/src/mesa/swrast/s_aatriangle.c
@@ -1,317 +1,316 @@
-/*
- * 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.
- */
-
-
-/*
- * Antialiased Triangle rasterizers
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "s_aatriangle.h"
-#include "s_context.h"
-#include "s_span.h"
-
-
-/*
- * Compute coefficients of a plane using the X,Y coords of the v0, v1, v2
- * vertices and the given Z values.
- * A point (x,y,z) lies on plane iff a*x+b*y+c*z+d = 0.
- */
-static INLINE void
-compute_plane(const GLfloat v0[], const GLfloat v1[], const GLfloat v2[],
-              GLfloat z0, GLfloat z1, GLfloat z2, GLfloat plane[4])
-{
-   const GLfloat px = v1[0] - v0[0];
-   const GLfloat py = v1[1] - v0[1];
-   const GLfloat pz = z1 - z0;
-
-   const GLfloat qx = v2[0] - v0[0];
-   const GLfloat qy = v2[1] - v0[1];
-   const GLfloat qz = z2 - z0;
-
-   /* Crossproduct "(a,b,c):= dv1 x dv2" is orthogonal to plane. */
-   const GLfloat a = py * qz - pz * qy;
-   const GLfloat b = pz * qx - px * qz;
-   const GLfloat c = px * qy - py * qx;
-   /* Point on the plane = "r*(a,b,c) + w", with fixed "r" depending
-      on the distance of plane from origin and arbitrary "w" parallel
-      to the plane. */
-   /* The scalar product "(r*(a,b,c)+w)*(a,b,c)" is "r*(a^2+b^2+c^2)",
-      which is equal to "-d" below. */
-   const GLfloat d = -(a * v0[0] + b * v0[1] + c * z0);
-
-   plane[0] = a;
-   plane[1] = b;
-   plane[2] = c;
-   plane[3] = d;
-}
-
-
-/*
- * Compute coefficients of a plane with a constant Z value.
- */
-static INLINE void
-constant_plane(GLfloat value, GLfloat plane[4])
-{
-   plane[0] = 0.0;
-   plane[1] = 0.0;
-   plane[2] = -1.0;
-   plane[3] = value;
-}
-
-#define CONSTANT_PLANE(VALUE, PLANE)	\
-do {					\
-   PLANE[0] = 0.0F;			\
-   PLANE[1] = 0.0F;			\
-   PLANE[2] = -1.0F;			\
-   PLANE[3] = VALUE;			\
-} while (0)
-
-
-
-/*
- * Solve plane equation for Z at (X,Y).
- */
-static INLINE GLfloat
-solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   ASSERT(plane[2] != 0.0F);
-   return (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
-}
-
-
-#define SOLVE_PLANE(X, Y, PLANE) \
-   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])
-
-
-/*
- * Return 1 / solve_plane().
- */
-static INLINE GLfloat
-solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
-   if (denom == 0.0F)
-      return 0.0F;
-   else
-      return -plane[2] / denom;
-}
-
-
-/*
- * Solve plane and return clamped GLchan value.
- */
-static INLINE GLchan
-solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
-{
-   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
-#if CHAN_TYPE == GL_FLOAT
-   return CLAMP(z, 0.0F, CHAN_MAXF);
-#else
-   if (z < 0)
-      return 0;
-   else if (z > CHAN_MAX)
-      return CHAN_MAX;
-   return (GLchan) IROUND_POS(z);
-#endif
-}
-
-
-static INLINE GLfloat
-plane_dx(const GLfloat plane[4])
-{
-   return -plane[0] / plane[2];
-}
-
-static INLINE GLfloat
-plane_dy(const GLfloat plane[4])
-{
-   return -plane[1] / plane[2];
-}
-
-
-
-/*
- * Compute how much (area) of the given pixel is inside the triangle.
- * Vertices MUST be specified in counter-clockwise order.
- * Return:  coverage in [0, 1].
- */
-static GLfloat
-compute_coveragef(const GLfloat v0[3], const GLfloat v1[3],
-                  const GLfloat v2[3], GLint winx, GLint winy)
-{
-   /* Given a position [0,3]x[0,3] return the sub-pixel sample position.
-    * Contributed by Ray Tice.
-    *
-    * Jitter sample positions -
-    * - average should be .5 in x & y for each column
-    * - each of the 16 rows and columns should be used once
-    * - the rectangle formed by the first four points
-    *   should contain the other points
-    * - the distrubition should be fairly even in any given direction
-    *
-    * The pattern drawn below isn't optimal, but it's better than a regular
-    * grid.  In the drawing, the center of each subpixel is surrounded by
-    * four dots.  The "x" marks the jittered position relative to the
-    * subpixel center.
-    */
-#define POS(a, b) (0.5+a*4+b)/16
-   static const GLfloat samples[16][2] = {
-      /* start with the four corners */
-      { POS(0, 2), POS(0, 0) },
-      { POS(3, 3), POS(0, 2) },
-      { POS(0, 0), POS(3, 1) },
-      { POS(3, 1), POS(3, 3) },
-      /* continue with interior samples */
-      { POS(1, 1), POS(0, 1) },
-      { POS(2, 0), POS(0, 3) },
-      { POS(0, 3), POS(1, 3) },
-      { POS(1, 2), POS(1, 0) },
-      { POS(2, 3), POS(1, 2) },
-      { POS(3, 2), POS(1, 1) },
-      { POS(0, 1), POS(2, 2) },
-      { POS(1, 0), POS(2, 1) },
-      { POS(2, 1), POS(2, 3) },
-      { POS(3, 0), POS(2, 0) },
-      { POS(1, 3), POS(3, 0) },
-      { POS(2, 2), POS(3, 2) }
-   };
-
-   const GLfloat x = (GLfloat) winx;
-   const GLfloat y = (GLfloat) winy;
-   const GLfloat dx0 = v1[0] - v0[0];
-   const GLfloat dy0 = v1[1] - v0[1];
-   const GLfloat dx1 = v2[0] - v1[0];
-   const GLfloat dy1 = v2[1] - v1[1];
-   const GLfloat dx2 = v0[0] - v2[0];
-   const GLfloat dy2 = v0[1] - v2[1];
-   GLint stop = 4, i;
-   GLfloat insideCount = 16.0F;
-
-#ifdef DEBUG
-   {
-      const GLfloat area = dx0 * dy1 - dx1 * dy0;
-      ASSERT(area >= 0.0);
-   }
-#endif
-
-   for (i = 0; i < stop; i++) {
-      const GLfloat sx = x + samples[i][0];
-      const GLfloat sy = y + samples[i][1];
-      /* cross product determines if sample is inside or outside each edge */
-      GLfloat cross = (dx0 * (sy - v0[1]) - dy0 * (sx - v0[0]));
-      /* Check if the sample is exactly on an edge.  If so, let cross be a
-       * positive or negative value depending on the direction of the edge.
-       */
-      if (cross == 0.0F)
-         cross = dx0 + dy0;
-      if (cross < 0.0F) {
-         /* sample point is outside first edge */
-         insideCount -= 1.0F;
-         stop = 16;
-      }
-      else {
-         /* sample point is inside first edge */
-         cross = (dx1 * (sy - v1[1]) - dy1 * (sx - v1[0]));
-         if (cross == 0.0F)
-            cross = dx1 + dy1;
-         if (cross < 0.0F) {
-            /* sample point is outside second edge */
-            insideCount -= 1.0F;
-            stop = 16;
-         }
-         else {
-            /* sample point is inside first and second edges */
-            cross = (dx2 * (sy - v2[1]) -  dy2 * (sx - v2[0]));
-            if (cross == 0.0F)
-               cross = dx2 + dy2;
-            if (cross < 0.0F) {
-               /* sample point is outside third edge */
-               insideCount -= 1.0F;
-               stop = 16;
-            }
-         }
-      }
-   }
-   if (stop == 4)
-      return 1.0F;
-   else
-      return insideCount * (1.0F / 16.0F);
-}
-
-
-
-static void
-rgba_aa_tri(GLcontext *ctx,
-	    const SWvertex *v0,
-	    const SWvertex *v1,
-	    const SWvertex *v2)
-{
-#define DO_Z
-#include "s_aatritemp.h"
-}
-
-
-static void
-general_aa_tri(GLcontext *ctx,
-               const SWvertex *v0,
-               const SWvertex *v1,
-               const SWvertex *v2)
-{
-#define DO_Z
-#define DO_ATTRIBS
-#include "s_aatritemp.h"
-}
-
-
-
-/*
- * Examine GL state and set swrast->Triangle to an
- * appropriate antialiased triangle rasterizer function.
- */
-void
-_swrast_set_aa_triangle_function(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   ASSERT(ctx->Polygon.SmoothFlag);
-
-   if (ctx->Texture._EnabledCoordUnits != 0
-       || ctx->FragmentProgram._Current
-       || swrast->_FogEnabled
-       || NEED_SECONDARY_COLOR(ctx)) {
-      SWRAST_CONTEXT(ctx)->Triangle = general_aa_tri;
-   }
-   else {
-      SWRAST_CONTEXT(ctx)->Triangle = rgba_aa_tri;
-   }
-
-   ASSERT(SWRAST_CONTEXT(ctx)->Triangle);
-}
+/*

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

+ */

+

+

+/*

+ * Antialiased Triangle rasterizers

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "s_aatriangle.h"

+#include "s_context.h"

+#include "s_span.h"

+

+

+/*

+ * Compute coefficients of a plane using the X,Y coords of the v0, v1, v2

+ * vertices and the given Z values.

+ * A point (x,y,z) lies on plane iff a*x+b*y+c*z+d = 0.

+ */

+static INLINE void

+compute_plane(const GLfloat v0[], const GLfloat v1[], const GLfloat v2[],

+              GLfloat z0, GLfloat z1, GLfloat z2, GLfloat plane[4])

+{

+   const GLfloat px = v1[0] - v0[0];

+   const GLfloat py = v1[1] - v0[1];

+   const GLfloat pz = z1 - z0;

+

+   const GLfloat qx = v2[0] - v0[0];

+   const GLfloat qy = v2[1] - v0[1];

+   const GLfloat qz = z2 - z0;

+

+   /* Crossproduct "(a,b,c):= dv1 x dv2" is orthogonal to plane. */

+   const GLfloat a = py * qz - pz * qy;

+   const GLfloat b = pz * qx - px * qz;

+   const GLfloat c = px * qy - py * qx;

+   /* Point on the plane = "r*(a,b,c) + w", with fixed "r" depending

+      on the distance of plane from origin and arbitrary "w" parallel

+      to the plane. */

+   /* The scalar product "(r*(a,b,c)+w)*(a,b,c)" is "r*(a^2+b^2+c^2)",

+      which is equal to "-d" below. */

+   const GLfloat d = -(a * v0[0] + b * v0[1] + c * z0);

+

+   plane[0] = a;

+   plane[1] = b;

+   plane[2] = c;

+   plane[3] = d;

+}

+

+

+/*

+ * Compute coefficients of a plane with a constant Z value.

+ */

+static INLINE void

+constant_plane(GLfloat value, GLfloat plane[4])

+{

+   plane[0] = 0.0;

+   plane[1] = 0.0;

+   plane[2] = -1.0;

+   plane[3] = value;

+}

+

+#define CONSTANT_PLANE(VALUE, PLANE)	\

+do {					\

+   PLANE[0] = 0.0F;			\

+   PLANE[1] = 0.0F;			\

+   PLANE[2] = -1.0F;			\

+   PLANE[3] = VALUE;			\

+} while (0)

+

+

+

+/*

+ * Solve plane equation for Z at (X,Y).

+ */

+static INLINE GLfloat

+solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])

+{

+   ASSERT(plane[2] != 0.0F);

+   return (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];

+}

+

+

+#define SOLVE_PLANE(X, Y, PLANE) \

+   ((PLANE[3] + PLANE[0] * (X) + PLANE[1] * (Y)) / -PLANE[2])

+

+

+/*

+ * Return 1 / solve_plane().

+ */

+static INLINE GLfloat

+solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])

+{

+   const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;

+   if (denom == 0.0F)

+      return 0.0F;

+   else

+      return -plane[2] / denom;

+}

+

+

+/*

+ * Solve plane and return clamped GLchan value.

+ */

+static INLINE GLchan

+solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])

+{

+   const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];

+#if CHAN_TYPE == GL_FLOAT

+   return CLAMP(z, 0.0F, CHAN_MAXF);

+#else

+   if (z < 0)

+      return 0;

+   else if (z > CHAN_MAX)

+      return CHAN_MAX;

+   return (GLchan) IROUND_POS(z);

+#endif

+}

+

+

+static INLINE GLfloat

+plane_dx(const GLfloat plane[4])

+{

+   return -plane[0] / plane[2];

+}

+

+static INLINE GLfloat

+plane_dy(const GLfloat plane[4])

+{

+   return -plane[1] / plane[2];

+}

+

+

+

+/*

+ * Compute how much (area) of the given pixel is inside the triangle.

+ * Vertices MUST be specified in counter-clockwise order.

+ * Return:  coverage in [0, 1].

+ */

+static GLfloat

+compute_coveragef(const GLfloat v0[3], const GLfloat v1[3],

+                  const GLfloat v2[3], GLint winx, GLint winy)

+{

+   /* Given a position [0,3]x[0,3] return the sub-pixel sample position.

+    * Contributed by Ray Tice.

+    *

+    * Jitter sample positions -

+    * - average should be .5 in x & y for each column

+    * - each of the 16 rows and columns should be used once

+    * - the rectangle formed by the first four points

+    *   should contain the other points

+    * - the distrubition should be fairly even in any given direction

+    *

+    * The pattern drawn below isn't optimal, but it's better than a regular

+    * grid.  In the drawing, the center of each subpixel is surrounded by

+    * four dots.  The "x" marks the jittered position relative to the

+    * subpixel center.

+    */

+#define POS(a, b) (0.5+a*4+b)/16

+   static const GLfloat samples[16][2] = {

+      /* start with the four corners */

+      { POS(0, 2), POS(0, 0) },

+      { POS(3, 3), POS(0, 2) },

+      { POS(0, 0), POS(3, 1) },

+      { POS(3, 1), POS(3, 3) },

+      /* continue with interior samples */

+      { POS(1, 1), POS(0, 1) },

+      { POS(2, 0), POS(0, 3) },

+      { POS(0, 3), POS(1, 3) },

+      { POS(1, 2), POS(1, 0) },

+      { POS(2, 3), POS(1, 2) },

+      { POS(3, 2), POS(1, 1) },

+      { POS(0, 1), POS(2, 2) },

+      { POS(1, 0), POS(2, 1) },

+      { POS(2, 1), POS(2, 3) },

+      { POS(3, 0), POS(2, 0) },

+      { POS(1, 3), POS(3, 0) },

+      { POS(2, 2), POS(3, 2) }

+   };

+

+   const GLfloat x = (GLfloat) winx;

+   const GLfloat y = (GLfloat) winy;

+   const GLfloat dx0 = v1[0] - v0[0];

+   const GLfloat dy0 = v1[1] - v0[1];

+   const GLfloat dx1 = v2[0] - v1[0];

+   const GLfloat dy1 = v2[1] - v1[1];

+   const GLfloat dx2 = v0[0] - v2[0];

+   const GLfloat dy2 = v0[1] - v2[1];

+   GLint stop = 4, i;

+   GLfloat insideCount = 16.0F;

+

+#ifdef DEBUG

+   {

+      const GLfloat area = dx0 * dy1 - dx1 * dy0;

+      ASSERT(area >= 0.0);

+   }

+#endif

+

+   for (i = 0; i < stop; i++) {

+      const GLfloat sx = x + samples[i][0];

+      const GLfloat sy = y + samples[i][1];

+      /* cross product determines if sample is inside or outside each edge */

+      GLfloat cross = (dx0 * (sy - v0[1]) - dy0 * (sx - v0[0]));

+      /* Check if the sample is exactly on an edge.  If so, let cross be a

+       * positive or negative value depending on the direction of the edge.

+       */

+      if (cross == 0.0F)

+         cross = dx0 + dy0;

+      if (cross < 0.0F) {

+         /* sample point is outside first edge */

+         insideCount -= 1.0F;

+         stop = 16;

+      }

+      else {

+         /* sample point is inside first edge */

+         cross = (dx1 * (sy - v1[1]) - dy1 * (sx - v1[0]));

+         if (cross == 0.0F)

+            cross = dx1 + dy1;

+         if (cross < 0.0F) {

+            /* sample point is outside second edge */

+            insideCount -= 1.0F;

+            stop = 16;

+         }

+         else {

+            /* sample point is inside first and second edges */

+            cross = (dx2 * (sy - v2[1]) -  dy2 * (sx - v2[0]));

+            if (cross == 0.0F)

+               cross = dx2 + dy2;

+            if (cross < 0.0F) {

+               /* sample point is outside third edge */

+               insideCount -= 1.0F;

+               stop = 16;

+            }

+         }

+      }

+   }

+   if (stop == 4)

+      return 1.0F;

+   else

+      return insideCount * (1.0F / 16.0F);

+}

+

+

+

+static void

+rgba_aa_tri(struct gl_context *ctx,

+	    const SWvertex *v0,

+	    const SWvertex *v1,

+	    const SWvertex *v2)

+{

+#define DO_Z

+#include "s_aatritemp.h"

+}

+

+

+static void

+general_aa_tri(struct gl_context *ctx,

+               const SWvertex *v0,

+               const SWvertex *v1,

+               const SWvertex *v2)

+{

+#define DO_Z

+#define DO_ATTRIBS

+#include "s_aatritemp.h"

+}

+

+

+

+/*

+ * Examine GL state and set swrast->Triangle to an

+ * appropriate antialiased triangle rasterizer function.

+ */

+void

+_swrast_set_aa_triangle_function(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   ASSERT(ctx->Polygon.SmoothFlag);

+

+   if (ctx->Texture._EnabledCoordUnits != 0

+       || ctx->FragmentProgram._Current

+       || swrast->_FogEnabled

+       || NEED_SECONDARY_COLOR(ctx)) {

+      SWRAST_CONTEXT(ctx)->Triangle = general_aa_tri;

+   }

+   else {

+      SWRAST_CONTEXT(ctx)->Triangle = rgba_aa_tri;

+   }

+

+   ASSERT(SWRAST_CONTEXT(ctx)->Triangle);

+}

diff --git a/mesalib/src/mesa/swrast/s_aatriangle.h b/mesalib/src/mesa/swrast/s_aatriangle.h
index 9aed41a19..dec637920 100644
--- a/mesalib/src/mesa/swrast/s_aatriangle.h
+++ b/mesalib/src/mesa/swrast/s_aatriangle.h
@@ -1,38 +1,38 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 S_AATRIANGLE_H
-#define S_AATRIANGLE_H
-
-
-#include "main/mtypes.h"
-
-
-extern void
-_swrast_set_aa_triangle_function(GLcontext *ctx);
-
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 S_AATRIANGLE_H

+#define S_AATRIANGLE_H

+

+

+struct gl_context;

+

+

+extern void

+_swrast_set_aa_triangle_function(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_aatritemp.h b/mesalib/src/mesa/swrast/s_aatritemp.h
index 5c1c6d904..4136df3a7 100644
--- a/mesalib/src/mesa/swrast/s_aatritemp.h
+++ b/mesalib/src/mesa/swrast/s_aatritemp.h
@@ -1,331 +1,331 @@
-/*
- * 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.
- */
-
-
-/*
- * Antialiased Triangle Rasterizer Template
- *
- * This file is #include'd to generate custom AA triangle rasterizers.
- * NOTE: this code hasn't been optimized yet.  That'll come after it
- * works correctly.
- *
- * The following macros may be defined to indicate what auxillary information
- * must be copmuted across the triangle:
- *    DO_Z         - if defined, compute Z values
- *    DO_ATTRIBS   - if defined, compute texcoords, varying, etc.
- */
-
-/*void triangle( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv )*/
-{
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLfloat *p0 = v0->attrib[FRAG_ATTRIB_WPOS];
-   const GLfloat *p1 = v1->attrib[FRAG_ATTRIB_WPOS];
-   const GLfloat *p2 = v2->attrib[FRAG_ATTRIB_WPOS];
-   const SWvertex *vMin, *vMid, *vMax;
-   GLint iyMin, iyMax;
-   GLfloat yMin, yMax;
-   GLboolean ltor;
-   GLfloat majDx, majDy;  /* major (i.e. long) edge dx and dy */
-   
-   SWspan span;
-   
-#ifdef DO_Z
-   GLfloat zPlane[4];
-#endif
-   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];
-#if defined(DO_ATTRIBS)
-   GLfloat attrPlane[FRAG_ATTRIB_MAX][4][4];
-   GLfloat wPlane[4];  /* win[3] */
-#endif
-   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceCullSign;
-   
-   (void) swrast;
-
-   INIT_SPAN(span, GL_POLYGON);
-   span.arrayMask = SPAN_COVERAGE;
-
-   /* determine bottom to top order of vertices */
-   {
-      GLfloat y0 = v0->attrib[FRAG_ATTRIB_WPOS][1];
-      GLfloat y1 = v1->attrib[FRAG_ATTRIB_WPOS][1];
-      GLfloat y2 = v2->attrib[FRAG_ATTRIB_WPOS][1];
-      if (y0 <= y1) {
-	 if (y1 <= y2) {
-	    vMin = v0;   vMid = v1;   vMax = v2;   /* y0<=y1<=y2 */
-	 }
-	 else if (y2 <= y0) {
-	    vMin = v2;   vMid = v0;   vMax = v1;   /* y2<=y0<=y1 */
-	 }
-	 else {
-	    vMin = v0;   vMid = v2;   vMax = v1;  bf = -bf; /* y0<=y2<=y1 */
-	 }
-      }
-      else {
-	 if (y0 <= y2) {
-	    vMin = v1;   vMid = v0;   vMax = v2;  bf = -bf; /* y1<=y0<=y2 */
-	 }
-	 else if (y2 <= y1) {
-	    vMin = v2;   vMid = v1;   vMax = v0;  bf = -bf; /* y2<=y1<=y0 */
-	 }
-	 else {
-	    vMin = v1;   vMid = v2;   vMax = v0;   /* y1<=y2<=y0 */
-	 }
-      }
-   }
-
-   majDx = vMax->attrib[FRAG_ATTRIB_WPOS][0] - vMin->attrib[FRAG_ATTRIB_WPOS][0];
-   majDy = vMax->attrib[FRAG_ATTRIB_WPOS][1] - vMin->attrib[FRAG_ATTRIB_WPOS][1];
-
-   /* front/back-face determination and cullling */
-   {
-      const GLfloat botDx = vMid->attrib[FRAG_ATTRIB_WPOS][0] - vMin->attrib[FRAG_ATTRIB_WPOS][0];
-      const GLfloat botDy = vMid->attrib[FRAG_ATTRIB_WPOS][1] - vMin->attrib[FRAG_ATTRIB_WPOS][1];
-      const GLfloat area = majDx * botDy - botDx * majDy;
-      /* Do backface culling */
-      if (area * bf < 0 || area == 0 || IS_INF_OR_NAN(area))
-	 return;
-      ltor = (GLboolean) (area < 0.0F);
-
-      span.facing = area * swrast->_BackfaceSign > 0.0F;
-   }
-
-   /* Plane equation setup:
-    * We evaluate plane equations at window (x,y) coordinates in order
-    * to compute color, Z, fog, texcoords, etc.  This isn't terribly
-    * efficient but it's easy and reliable.
-    */
-#ifdef DO_Z
-   compute_plane(p0, p1, p2, p0[2], p1[2], p2[2], zPlane);
-   span.arrayMask |= SPAN_Z;
-#endif
-   if (ctx->Light.ShadeModel == GL_SMOOTH) {
-      compute_plane(p0, p1, p2, v0->color[RCOMP], v1->color[RCOMP], v2->color[RCOMP], rPlane);
-      compute_plane(p0, p1, p2, v0->color[GCOMP], v1->color[GCOMP], v2->color[GCOMP], gPlane);
-      compute_plane(p0, p1, p2, v0->color[BCOMP], v1->color[BCOMP], v2->color[BCOMP], bPlane);
-      compute_plane(p0, p1, p2, v0->color[ACOMP], v1->color[ACOMP], v2->color[ACOMP], aPlane);
-   }
-   else {
-      constant_plane(v2->color[RCOMP], rPlane);
-      constant_plane(v2->color[GCOMP], gPlane);
-      constant_plane(v2->color[BCOMP], bPlane);
-      constant_plane(v2->color[ACOMP], aPlane);
-   }
-   span.arrayMask |= SPAN_RGBA;
-#if defined(DO_ATTRIBS)
-   {
-      const GLfloat invW0 = v0->attrib[FRAG_ATTRIB_WPOS][3];
-      const GLfloat invW1 = v1->attrib[FRAG_ATTRIB_WPOS][3];
-      const GLfloat invW2 = v2->attrib[FRAG_ATTRIB_WPOS][3];
-      compute_plane(p0, p1, p2, invW0, invW1, invW2, wPlane);
-      span.attrStepX[FRAG_ATTRIB_WPOS][3] = plane_dx(wPlane);
-      span.attrStepY[FRAG_ATTRIB_WPOS][3] = plane_dy(wPlane);
-      ATTRIB_LOOP_BEGIN
-         GLuint c;
-         if (swrast->_InterpMode[attr] == GL_FLAT) {
-            for (c = 0; c < 4; c++) {
-               constant_plane(v2->attrib[attr][c] * invW2, attrPlane[attr][c]);
-            }
-         }
-         else {
-            for (c = 0; c < 4; c++) {
-               const GLfloat a0 = v0->attrib[attr][c] * invW0;
-               const GLfloat a1 = v1->attrib[attr][c] * invW1;
-               const GLfloat a2 = v2->attrib[attr][c] * invW2;
-               compute_plane(p0, p1, p2, a0, a1, a2, attrPlane[attr][c]);
-            }
-         }
-         for (c = 0; c < 4; c++) {
-            span.attrStepX[attr][c] = plane_dx(attrPlane[attr][c]);
-            span.attrStepY[attr][c] = plane_dy(attrPlane[attr][c]);
-         }
-      ATTRIB_LOOP_END
-   }
-#endif
-
-   /* Begin bottom-to-top scan over the triangle.
-    * The long edge will either be on the left or right side of the
-    * triangle.  We always scan from the long edge toward the shorter
-    * edges, stopping when we find that coverage = 0.  If the long edge
-    * is on the left we scan left-to-right.  Else, we scan right-to-left.
-    */
-   yMin = vMin->attrib[FRAG_ATTRIB_WPOS][1];
-   yMax = vMax->attrib[FRAG_ATTRIB_WPOS][1];
-   iyMin = (GLint) yMin;
-   iyMax = (GLint) yMax + 1;
-
-   if (ltor) {
-      /* scan left to right */
-      const GLfloat *pMin = vMin->attrib[FRAG_ATTRIB_WPOS];
-      const GLfloat *pMid = vMid->attrib[FRAG_ATTRIB_WPOS];
-      const GLfloat *pMax = vMax->attrib[FRAG_ATTRIB_WPOS];
-      const GLfloat dxdy = majDx / majDy;
-      const GLfloat xAdj = dxdy < 0.0F ? -dxdy : 0.0F;
-      GLfloat x = pMin[0] - (yMin - iyMin) * dxdy;
-      GLint iy;
-      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {
-         GLint ix, startX = (GLint) (x - xAdj);
-         GLuint count;
-         GLfloat coverage = 0.0F;
-
-         /* skip over fragments with zero coverage */
-         while (startX < MAX_WIDTH) {
-            coverage = compute_coveragef(pMin, pMid, pMax, startX, iy);
-            if (coverage > 0.0F)
-               break;
-            startX++;
-         }
-
-         /* enter interior of triangle */
-         ix = startX;
-
-#if defined(DO_ATTRIBS)
-         /* compute attributes at left-most fragment */
-         span.attrStart[FRAG_ATTRIB_WPOS][3] = solve_plane(ix + 0.5F, iy + 0.5F, wPlane);
-         ATTRIB_LOOP_BEGIN
-            GLuint c;
-            for (c = 0; c < 4; c++) {
-               span.attrStart[attr][c] = solve_plane(ix + 0.5F, iy + 0.5F, attrPlane[attr][c]);
-            }
-         ATTRIB_LOOP_END
-#endif
-
-         count = 0;
-         while (coverage > 0.0F) {
-            /* (cx,cy) = center of fragment */
-            const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;
-            SWspanarrays *array = span.array;
-            array->coverage[count] = coverage;
-#ifdef DO_Z
-            array->z[count] = (GLuint) solve_plane(cx, cy, zPlane);
-#endif
-            array->rgba[count][RCOMP] = solve_plane_chan(cx, cy, rPlane);
-            array->rgba[count][GCOMP] = solve_plane_chan(cx, cy, gPlane);
-            array->rgba[count][BCOMP] = solve_plane_chan(cx, cy, bPlane);
-            array->rgba[count][ACOMP] = solve_plane_chan(cx, cy, aPlane);
-            ix++;
-            count++;
-            coverage = compute_coveragef(pMin, pMid, pMax, ix, iy);
-         }
-         
-         if (ix <= startX)
-            continue;
-         
-         span.x = startX;
-         span.y = iy;
-         span.end = (GLuint) ix - (GLuint) startX;
-         _swrast_write_rgba_span(ctx, &span);
-      }
-   }
-   else {
-      /* scan right to left */
-      const GLfloat *pMin = vMin->attrib[FRAG_ATTRIB_WPOS];
-      const GLfloat *pMid = vMid->attrib[FRAG_ATTRIB_WPOS];
-      const GLfloat *pMax = vMax->attrib[FRAG_ATTRIB_WPOS];
-      const GLfloat dxdy = majDx / majDy;
-      const GLfloat xAdj = dxdy > 0 ? dxdy : 0.0F;
-      GLfloat x = pMin[0] - (yMin - iyMin) * dxdy;
-      GLint iy;
-      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {
-         GLint ix, left, startX = (GLint) (x + xAdj);
-         GLuint count, n;
-         GLfloat coverage = 0.0F;
-         
-         /* make sure we're not past the window edge */
-         if (startX >= ctx->DrawBuffer->_Xmax) {
-            startX = ctx->DrawBuffer->_Xmax - 1;
-         }
-
-         /* skip fragments with zero coverage */
-         while (startX > 0) {
-            coverage = compute_coveragef(pMin, pMax, pMid, startX, iy);
-            if (coverage > 0.0F)
-               break;
-            startX--;
-         }
-         
-         /* enter interior of triangle */
-         ix = startX;
-         count = 0;
-         while (coverage > 0.0F) {
-            /* (cx,cy) = center of fragment */
-            const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;
-            SWspanarrays *array = span.array;
-            ASSERT(ix >= 0);
-            array->coverage[ix] = coverage;
-#ifdef DO_Z
-            array->z[ix] = (GLuint) solve_plane(cx, cy, zPlane);
-#endif
-            array->rgba[ix][RCOMP] = solve_plane_chan(cx, cy, rPlane);
-            array->rgba[ix][GCOMP] = solve_plane_chan(cx, cy, gPlane);
-            array->rgba[ix][BCOMP] = solve_plane_chan(cx, cy, bPlane);
-            array->rgba[ix][ACOMP] = solve_plane_chan(cx, cy, aPlane);
-            ix--;
-            count++;
-            coverage = compute_coveragef(pMin, pMax, pMid, ix, iy);
-         }
-         
-#if defined(DO_ATTRIBS)
-         /* compute attributes at left-most fragment */
-         span.attrStart[FRAG_ATTRIB_WPOS][3] = solve_plane(ix + 1.5F, iy + 0.5F, wPlane);
-         ATTRIB_LOOP_BEGIN
-            GLuint c;
-            for (c = 0; c < 4; c++) {
-               span.attrStart[attr][c] = solve_plane(ix + 1.5F, iy + 0.5F, attrPlane[attr][c]);
-            }
-         ATTRIB_LOOP_END
-#endif
-
-         if (startX <= ix)
-            continue;
-
-         n = (GLuint) startX - (GLuint) ix;
-
-         left = ix + 1;
-
-         /* shift all values to the left */
-         /* XXX this is temporary */
-         {
-            SWspanarrays *array = span.array;
-            GLint j;
-            for (j = 0; j < (GLint) n; j++) {
-               array->coverage[j] = array->coverage[j + left];
-               COPY_CHAN4(array->rgba[j], array->rgba[j + left]);
-#ifdef DO_Z
-               array->z[j] = array->z[j + left];
-#endif
-            }
-         }
-
-         span.x = left;
-         span.y = iy;
-         span.end = n;
-         _swrast_write_rgba_span(ctx, &span);
-      }
-   }
-}
-
-
-#undef DO_Z
-#undef DO_ATTRIBS
-#undef DO_OCCLUSION_TEST
+/*

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

+ */

+

+

+/*

+ * Antialiased Triangle Rasterizer Template

+ *

+ * This file is #include'd to generate custom AA triangle rasterizers.

+ * NOTE: this code hasn't been optimized yet.  That'll come after it

+ * works correctly.

+ *

+ * The following macros may be defined to indicate what auxillary information

+ * must be copmuted across the triangle:

+ *    DO_Z         - if defined, compute Z values

+ *    DO_ATTRIBS   - if defined, compute texcoords, varying, etc.

+ */

+

+/*void triangle( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv )*/

+{

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const GLfloat *p0 = v0->attrib[FRAG_ATTRIB_WPOS];

+   const GLfloat *p1 = v1->attrib[FRAG_ATTRIB_WPOS];

+   const GLfloat *p2 = v2->attrib[FRAG_ATTRIB_WPOS];

+   const SWvertex *vMin, *vMid, *vMax;

+   GLint iyMin, iyMax;

+   GLfloat yMin, yMax;

+   GLboolean ltor;

+   GLfloat majDx, majDy;  /* major (i.e. long) edge dx and dy */

+   

+   SWspan span;

+   

+#ifdef DO_Z

+   GLfloat zPlane[4];

+#endif

+   GLfloat rPlane[4], gPlane[4], bPlane[4], aPlane[4];

+#if defined(DO_ATTRIBS)

+   GLfloat attrPlane[FRAG_ATTRIB_MAX][4][4];

+   GLfloat wPlane[4];  /* win[3] */

+#endif

+   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceCullSign;

+   

+   (void) swrast;

+

+   INIT_SPAN(span, GL_POLYGON);

+   span.arrayMask = SPAN_COVERAGE;

+

+   /* determine bottom to top order of vertices */

+   {

+      GLfloat y0 = v0->attrib[FRAG_ATTRIB_WPOS][1];

+      GLfloat y1 = v1->attrib[FRAG_ATTRIB_WPOS][1];

+      GLfloat y2 = v2->attrib[FRAG_ATTRIB_WPOS][1];

+      if (y0 <= y1) {

+	 if (y1 <= y2) {

+	    vMin = v0;   vMid = v1;   vMax = v2;   /* y0<=y1<=y2 */

+	 }

+	 else if (y2 <= y0) {

+	    vMin = v2;   vMid = v0;   vMax = v1;   /* y2<=y0<=y1 */

+	 }

+	 else {

+	    vMin = v0;   vMid = v2;   vMax = v1;  bf = -bf; /* y0<=y2<=y1 */

+	 }

+      }

+      else {

+	 if (y0 <= y2) {

+	    vMin = v1;   vMid = v0;   vMax = v2;  bf = -bf; /* y1<=y0<=y2 */

+	 }

+	 else if (y2 <= y1) {

+	    vMin = v2;   vMid = v1;   vMax = v0;  bf = -bf; /* y2<=y1<=y0 */

+	 }

+	 else {

+	    vMin = v1;   vMid = v2;   vMax = v0;   /* y1<=y2<=y0 */

+	 }

+      }

+   }

+

+   majDx = vMax->attrib[FRAG_ATTRIB_WPOS][0] - vMin->attrib[FRAG_ATTRIB_WPOS][0];

+   majDy = vMax->attrib[FRAG_ATTRIB_WPOS][1] - vMin->attrib[FRAG_ATTRIB_WPOS][1];

+

+   /* front/back-face determination and cullling */

+   {

+      const GLfloat botDx = vMid->attrib[FRAG_ATTRIB_WPOS][0] - vMin->attrib[FRAG_ATTRIB_WPOS][0];

+      const GLfloat botDy = vMid->attrib[FRAG_ATTRIB_WPOS][1] - vMin->attrib[FRAG_ATTRIB_WPOS][1];

+      const GLfloat area = majDx * botDy - botDx * majDy;

+      /* Do backface culling */

+      if (area * bf < 0 || area == 0 || IS_INF_OR_NAN(area))

+	 return;

+      ltor = (GLboolean) (area < 0.0F);

+

+      span.facing = area * swrast->_BackfaceSign > 0.0F;

+   }

+

+   /* Plane equation setup:

+    * We evaluate plane equations at window (x,y) coordinates in order

+    * to compute color, Z, fog, texcoords, etc.  This isn't terribly

+    * efficient but it's easy and reliable.

+    */

+#ifdef DO_Z

+   compute_plane(p0, p1, p2, p0[2], p1[2], p2[2], zPlane);

+   span.arrayMask |= SPAN_Z;

+#endif

+   if (ctx->Light.ShadeModel == GL_SMOOTH) {

+      compute_plane(p0, p1, p2, v0->color[RCOMP], v1->color[RCOMP], v2->color[RCOMP], rPlane);

+      compute_plane(p0, p1, p2, v0->color[GCOMP], v1->color[GCOMP], v2->color[GCOMP], gPlane);

+      compute_plane(p0, p1, p2, v0->color[BCOMP], v1->color[BCOMP], v2->color[BCOMP], bPlane);

+      compute_plane(p0, p1, p2, v0->color[ACOMP], v1->color[ACOMP], v2->color[ACOMP], aPlane);

+   }

+   else {

+      constant_plane(v2->color[RCOMP], rPlane);

+      constant_plane(v2->color[GCOMP], gPlane);

+      constant_plane(v2->color[BCOMP], bPlane);

+      constant_plane(v2->color[ACOMP], aPlane);

+   }

+   span.arrayMask |= SPAN_RGBA;

+#if defined(DO_ATTRIBS)

+   {

+      const GLfloat invW0 = v0->attrib[FRAG_ATTRIB_WPOS][3];

+      const GLfloat invW1 = v1->attrib[FRAG_ATTRIB_WPOS][3];

+      const GLfloat invW2 = v2->attrib[FRAG_ATTRIB_WPOS][3];

+      compute_plane(p0, p1, p2, invW0, invW1, invW2, wPlane);

+      span.attrStepX[FRAG_ATTRIB_WPOS][3] = plane_dx(wPlane);

+      span.attrStepY[FRAG_ATTRIB_WPOS][3] = plane_dy(wPlane);

+      ATTRIB_LOOP_BEGIN

+         GLuint c;

+         if (swrast->_InterpMode[attr] == GL_FLAT) {

+            for (c = 0; c < 4; c++) {

+               constant_plane(v2->attrib[attr][c] * invW2, attrPlane[attr][c]);

+            }

+         }

+         else {

+            for (c = 0; c < 4; c++) {

+               const GLfloat a0 = v0->attrib[attr][c] * invW0;

+               const GLfloat a1 = v1->attrib[attr][c] * invW1;

+               const GLfloat a2 = v2->attrib[attr][c] * invW2;

+               compute_plane(p0, p1, p2, a0, a1, a2, attrPlane[attr][c]);

+            }

+         }

+         for (c = 0; c < 4; c++) {

+            span.attrStepX[attr][c] = plane_dx(attrPlane[attr][c]);

+            span.attrStepY[attr][c] = plane_dy(attrPlane[attr][c]);

+         }

+      ATTRIB_LOOP_END

+   }

+#endif

+

+   /* Begin bottom-to-top scan over the triangle.

+    * The long edge will either be on the left or right side of the

+    * triangle.  We always scan from the long edge toward the shorter

+    * edges, stopping when we find that coverage = 0.  If the long edge

+    * is on the left we scan left-to-right.  Else, we scan right-to-left.

+    */

+   yMin = vMin->attrib[FRAG_ATTRIB_WPOS][1];

+   yMax = vMax->attrib[FRAG_ATTRIB_WPOS][1];

+   iyMin = (GLint) yMin;

+   iyMax = (GLint) yMax + 1;

+

+   if (ltor) {

+      /* scan left to right */

+      const GLfloat *pMin = vMin->attrib[FRAG_ATTRIB_WPOS];

+      const GLfloat *pMid = vMid->attrib[FRAG_ATTRIB_WPOS];

+      const GLfloat *pMax = vMax->attrib[FRAG_ATTRIB_WPOS];

+      const GLfloat dxdy = majDx / majDy;

+      const GLfloat xAdj = dxdy < 0.0F ? -dxdy : 0.0F;

+      GLfloat x = pMin[0] - (yMin - iyMin) * dxdy;

+      GLint iy;

+      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {

+         GLint ix, startX = (GLint) (x - xAdj);

+         GLuint count;

+         GLfloat coverage = 0.0F;

+

+         /* skip over fragments with zero coverage */

+         while (startX < MAX_WIDTH) {

+            coverage = compute_coveragef(pMin, pMid, pMax, startX, iy);

+            if (coverage > 0.0F)

+               break;

+            startX++;

+         }

+

+         /* enter interior of triangle */

+         ix = startX;

+

+#if defined(DO_ATTRIBS)

+         /* compute attributes at left-most fragment */

+         span.attrStart[FRAG_ATTRIB_WPOS][3] = solve_plane(ix + 0.5F, iy + 0.5F, wPlane);

+         ATTRIB_LOOP_BEGIN

+            GLuint c;

+            for (c = 0; c < 4; c++) {

+               span.attrStart[attr][c] = solve_plane(ix + 0.5F, iy + 0.5F, attrPlane[attr][c]);

+            }

+         ATTRIB_LOOP_END

+#endif

+

+         count = 0;

+         while (coverage > 0.0F) {

+            /* (cx,cy) = center of fragment */

+            const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;

+            SWspanarrays *array = span.array;

+            array->coverage[count] = coverage;

+#ifdef DO_Z

+            array->z[count] = (GLuint) solve_plane(cx, cy, zPlane);

+#endif

+            array->rgba[count][RCOMP] = solve_plane_chan(cx, cy, rPlane);

+            array->rgba[count][GCOMP] = solve_plane_chan(cx, cy, gPlane);

+            array->rgba[count][BCOMP] = solve_plane_chan(cx, cy, bPlane);

+            array->rgba[count][ACOMP] = solve_plane_chan(cx, cy, aPlane);

+            ix++;

+            count++;

+            coverage = compute_coveragef(pMin, pMid, pMax, ix, iy);

+         }

+         

+         if (ix <= startX)

+            continue;

+         

+         span.x = startX;

+         span.y = iy;

+         span.end = (GLuint) ix - (GLuint) startX;

+         _swrast_write_rgba_span(ctx, &span);

+      }

+   }

+   else {

+      /* scan right to left */

+      const GLfloat *pMin = vMin->attrib[FRAG_ATTRIB_WPOS];

+      const GLfloat *pMid = vMid->attrib[FRAG_ATTRIB_WPOS];

+      const GLfloat *pMax = vMax->attrib[FRAG_ATTRIB_WPOS];

+      const GLfloat dxdy = majDx / majDy;

+      const GLfloat xAdj = dxdy > 0 ? dxdy : 0.0F;

+      GLfloat x = pMin[0] - (yMin - iyMin) * dxdy;

+      GLint iy;

+      for (iy = iyMin; iy < iyMax; iy++, x += dxdy) {

+         GLint ix, left, startX = (GLint) (x + xAdj);

+         GLuint count, n;

+         GLfloat coverage = 0.0F;

+         

+         /* make sure we're not past the window edge */

+         if (startX >= ctx->DrawBuffer->_Xmax) {

+            startX = ctx->DrawBuffer->_Xmax - 1;

+         }

+

+         /* skip fragments with zero coverage */

+         while (startX > 0) {

+            coverage = compute_coveragef(pMin, pMax, pMid, startX, iy);

+            if (coverage > 0.0F)

+               break;

+            startX--;

+         }

+         

+         /* enter interior of triangle */

+         ix = startX;

+         count = 0;

+         while (coverage > 0.0F) {

+            /* (cx,cy) = center of fragment */

+            const GLfloat cx = ix + 0.5F, cy = iy + 0.5F;

+            SWspanarrays *array = span.array;

+            ASSERT(ix >= 0);

+            array->coverage[ix] = coverage;

+#ifdef DO_Z

+            array->z[ix] = (GLuint) solve_plane(cx, cy, zPlane);

+#endif

+            array->rgba[ix][RCOMP] = solve_plane_chan(cx, cy, rPlane);

+            array->rgba[ix][GCOMP] = solve_plane_chan(cx, cy, gPlane);

+            array->rgba[ix][BCOMP] = solve_plane_chan(cx, cy, bPlane);

+            array->rgba[ix][ACOMP] = solve_plane_chan(cx, cy, aPlane);

+            ix--;

+            count++;

+            coverage = compute_coveragef(pMin, pMax, pMid, ix, iy);

+         }

+         

+#if defined(DO_ATTRIBS)

+         /* compute attributes at left-most fragment */

+         span.attrStart[FRAG_ATTRIB_WPOS][3] = solve_plane(ix + 1.5F, iy + 0.5F, wPlane);

+         ATTRIB_LOOP_BEGIN

+            GLuint c;

+            for (c = 0; c < 4; c++) {

+               span.attrStart[attr][c] = solve_plane(ix + 1.5F, iy + 0.5F, attrPlane[attr][c]);

+            }

+         ATTRIB_LOOP_END

+#endif

+

+         if (startX <= ix)

+            continue;

+

+         n = (GLuint) startX - (GLuint) ix;

+

+         left = ix + 1;

+

+         /* shift all values to the left */

+         /* XXX this is temporary */

+         {

+            SWspanarrays *array = span.array;

+            GLint j;

+            for (j = 0; j < (GLint) n; j++) {

+               array->coverage[j] = array->coverage[j + left];

+               COPY_CHAN4(array->rgba[j], array->rgba[j + left]);

+#ifdef DO_Z

+               array->z[j] = array->z[j + left];

+#endif

+            }

+         }

+

+         span.x = left;

+         span.y = iy;

+         span.end = n;

+         _swrast_write_rgba_span(ctx, &span);

+      }

+   }

+}

+

+

+#undef DO_Z

+#undef DO_ATTRIBS

+#undef DO_OCCLUSION_TEST

diff --git a/mesalib/src/mesa/swrast/s_accum.c b/mesalib/src/mesa/swrast/s_accum.c
index 854e106b7..560a1d143 100644
--- a/mesalib/src/mesa/swrast/s_accum.c
+++ b/mesalib/src/mesa/swrast/s_accum.c
@@ -1,594 +1,594 @@
-/*
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "s_accum.h"
-#include "s_context.h"
-#include "s_masking.h"
-#include "s_span.h"
-
-
-/* XXX this would have to change for accum buffers with more or less
- * than 16 bits per color channel.
- */
-#define ACCUM_SCALE16 32767.0F
-
-
-/*
- * Accumulation buffer notes
- *
- * Normally, accumulation buffer values are GLshorts with values in
- * [-32767, 32767] which represent floating point colors in [-1, 1],
- * as defined by the OpenGL specification.
- *
- * We optimize for the common case used for full-scene antialiasing:
- *    // start with accum buffer cleared to zero
- *    glAccum(GL_LOAD, w);   // or GL_ACCUM the first image
- *    glAccum(GL_ACCUM, w);
- *    ...
- *    glAccum(GL_ACCUM, w);
- *    glAccum(GL_RETURN, 1.0);
- * That is, we start with an empty accumulation buffer and accumulate
- * n images, each with weight w = 1/n.
- * In this scenario, we can simply store unscaled integer values in
- * the accum buffer instead of scaled integers.  We'll also keep track
- * of the w value so when we do GL_RETURN we simply divide the accumulated
- * values by n (n=1/w).
- * This lets us avoid _many_ int->float->int conversions.
- */
-
-
-#if CHAN_BITS == 8
-/* enable the optimization */
-#define USE_OPTIMIZED_ACCUM  1
-#else
-#define USE_OPTIMIZED_ACCUM  0
-#endif
-
-
-/**
- * This is called when we fall out of optimized/unscaled accum buffer mode.
- * That is, we convert each unscaled accum buffer value into a scaled value
- * representing the range[-1, 1].
- */
-static void
-rescale_accum( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_renderbuffer *rb
-      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;
-   const GLfloat s = swrast->_IntegerAccumScaler * (32767.0F / CHAN_MAXF);
-
-   assert(rb);
-   assert(rb->_BaseFormat == GL_RGBA);
-   /* add other types in future? */
-   assert(rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT);
-   assert(swrast->_IntegerAccumMode);
-
-   if (rb->GetPointer(ctx, rb, 0, 0)) {
-      /* directly-addressable memory */
-      GLuint y;
-      for (y = 0; y < rb->Height; y++) {
-         GLuint i;
-         GLshort *acc = (GLshort *) rb->GetPointer(ctx, rb, 0, y);
-         for (i = 0; i < 4 * rb->Width; i++) {
-            acc[i] = (GLshort) (acc[i] * s);
-         }
-      }
-   }
-   else {
-      /* use get/put row funcs */
-      GLuint y;
-      for (y = 0; y < rb->Height; y++) {
-         GLshort accRow[MAX_WIDTH * 4];
-         GLuint i;
-         rb->GetRow(ctx, rb, rb->Width, 0, y, accRow);
-         for (i = 0; i < 4 * rb->Width; i++) {
-            accRow[i] = (GLshort) (accRow[i] * s);
-         }
-         rb->PutRow(ctx, rb, rb->Width, 0, y, accRow, NULL);
-      }
-   }
-
-   swrast->_IntegerAccumMode = GL_FALSE;
-}
-
-
-
-/**
- * Clear the accumulation Buffer.
- */
-void
-_swrast_clear_accum_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint x, y, width, height;
-
-   /* No accumulation buffer! Not an error. */
-   if (!rb || !rb->Data)
-      return;
-
-   assert(rb->_BaseFormat == GL_RGBA);
-   /* add other types in future? */
-   assert(rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT);
-
-   /* bounds, with scissor */
-   x = ctx->DrawBuffer->_Xmin;
-   y = ctx->DrawBuffer->_Ymin;
-   width = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
-   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
-
-   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLfloat accScale = 32767.0;
-      GLshort clearVal[4];
-      GLuint i;
-
-      clearVal[0] = (GLshort) (ctx->Accum.ClearColor[0] * accScale);
-      clearVal[1] = (GLshort) (ctx->Accum.ClearColor[1] * accScale);
-      clearVal[2] = (GLshort) (ctx->Accum.ClearColor[2] * accScale);
-      clearVal[3] = (GLshort) (ctx->Accum.ClearColor[3] * accScale);
-
-      for (i = 0; i < height; i++) {
-         rb->PutMonoRow(ctx, rb, width, x, y + i, clearVal, NULL);
-      }
-   }
-   else {
-      /* someday support other sizes */
-   }
-
-   /* update optimized accum state vars */
-   if (ctx->Accum.ClearColor[0] == 0.0 && ctx->Accum.ClearColor[1] == 0.0 &&
-       ctx->Accum.ClearColor[2] == 0.0 && ctx->Accum.ClearColor[3] == 0.0) {
-#if USE_OPTIMIZED_ACCUM
-      swrast->_IntegerAccumMode = GL_TRUE;
-#else
-      swrast->_IntegerAccumMode = GL_FALSE;
-#endif
-      swrast->_IntegerAccumScaler = 0.0;  /* denotes empty accum buffer */
-   }
-   else {
-      swrast->_IntegerAccumMode = GL_FALSE;
-   }
-}
-
-
-static void
-accum_add(GLcontext *ctx, GLfloat value,
-          GLint xpos, GLint ypos, GLint width, GLint height )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_renderbuffer *rb
-      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;
-
-   assert(rb);
-
-   /* Leave optimized accum buffer mode */
-   if (swrast->_IntegerAccumMode)
-      rescale_accum(ctx);
-
-   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLshort incr = (GLshort) (value * ACCUM_SCALE16);
-      if (rb->GetPointer(ctx, rb, 0, 0)) {
-         GLint i, j;
-         for (i = 0; i < height; i++) {
-            GLshort *acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);
-            for (j = 0; j < 4 * width; j++) {
-               acc[j] += incr;
-            }
-         }
-      }
-      else {
-         GLint i, j;
-         for (i = 0; i < height; i++) {
-            GLshort accRow[4 * MAX_WIDTH];
-            rb->GetRow(ctx, rb, width, xpos, ypos + i, accRow);
-            for (j = 0; j < 4 * width; j++) {
-               accRow[j] += incr;
-            }
-            rb->PutRow(ctx, rb, width, xpos, ypos + i, accRow, NULL);
-         }
-      }
-   }
-   else {
-      /* other types someday */
-   }
-}
-
-
-static void
-accum_mult(GLcontext *ctx, GLfloat mult,
-           GLint xpos, GLint ypos, GLint width, GLint height )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_renderbuffer *rb
-      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;
-
-   assert(rb);
-
-   /* Leave optimized accum buffer mode */
-   if (swrast->_IntegerAccumMode)
-      rescale_accum(ctx);
-
-   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {
-      if (rb->GetPointer(ctx, rb, 0, 0)) {
-         GLint i, j;
-         for (i = 0; i < height; i++) {
-            GLshort *acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);
-            for (j = 0; j < 4 * width; j++) {
-               acc[j] = (GLshort) (acc[j] * mult);
-            }
-         }
-      }
-      else {
-         GLint i, j;
-         for (i = 0; i < height; i++) {
-            GLshort accRow[4 * MAX_WIDTH];
-            rb->GetRow(ctx, rb, width, xpos, ypos + i, accRow);
-            for (j = 0; j < 4 * width; j++) {
-               accRow[j] = (GLshort) (accRow[j] * mult);
-            }
-            rb->PutRow(ctx, rb, width, xpos, ypos + i, accRow, NULL);
-         }
-      }
-   }
-   else {
-      /* other types someday */
-   }
-}
-
-
-
-static void
-accum_accum(GLcontext *ctx, GLfloat value,
-            GLint xpos, GLint ypos, GLint width, GLint height )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_renderbuffer *rb
-      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;
-   const GLboolean directAccess = (rb->GetPointer(ctx, rb, 0, 0) != NULL);
-
-   assert(rb);
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      /* no read buffer - OK */
-      return;
-   }
-
-   /* May have to leave optimized accum buffer mode */
-   if (swrast->_IntegerAccumScaler == 0.0 && value > 0.0 && value <= 1.0)
-      swrast->_IntegerAccumScaler = value;
-   if (swrast->_IntegerAccumMode && value != swrast->_IntegerAccumScaler)
-      rescale_accum(ctx);
-
-   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLfloat scale = value * ACCUM_SCALE16 / CHAN_MAXF;
-      GLshort accumRow[4 * MAX_WIDTH];
-      GLchan rgba[MAX_WIDTH][4];
-      GLint i;
-
-      for (i = 0; i < height; i++) {
-         GLshort *acc;
-         if (directAccess) {
-            acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);
-         }
-         else {
-            rb->GetRow(ctx, rb, width, xpos, ypos + i, accumRow);
-            acc = accumRow;
-         }
-
-         /* read colors from color buffer */
-         _swrast_read_rgba_span(ctx, ctx->ReadBuffer->_ColorReadBuffer, width,
-                                xpos, ypos + i, CHAN_TYPE, rgba);
-
-         /* do accumulation */
-         if (swrast->_IntegerAccumMode) {
-            /* simply add integer color values into accum buffer */
-            GLint j;
-            for (j = 0; j < width; j++) {
-               acc[j * 4 + 0] += rgba[j][RCOMP];
-               acc[j * 4 + 1] += rgba[j][GCOMP];
-               acc[j * 4 + 2] += rgba[j][BCOMP];
-               acc[j * 4 + 3] += rgba[j][ACOMP];
-            }
-         }
-         else {
-            /* scaled integer (or float) accum buffer */
-            GLint j;
-            for (j = 0; j < width; j++) {
-               acc[j * 4 + 0] += (GLshort) ((GLfloat) rgba[j][RCOMP] * scale);
-               acc[j * 4 + 1] += (GLshort) ((GLfloat) rgba[j][GCOMP] * scale);
-               acc[j * 4 + 2] += (GLshort) ((GLfloat) rgba[j][BCOMP] * scale);
-               acc[j * 4 + 3] += (GLshort) ((GLfloat) rgba[j][ACOMP] * scale);
-            }
-         }
-
-         if (!directAccess) {
-            rb->PutRow(ctx, rb, width, xpos, ypos + i, accumRow, NULL);
-         }
-      }
-   }
-   else {
-      /* other types someday */
-   }
-}
-
-
-
-static void
-accum_load(GLcontext *ctx, GLfloat value,
-           GLint xpos, GLint ypos, GLint width, GLint height )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_renderbuffer *rb
-      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;
-   const GLboolean directAccess = (rb->GetPointer(ctx, rb, 0, 0) != NULL);
-
-   assert(rb);
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      /* no read buffer - OK */
-      return;
-   }
-
-   /* This is a change to go into optimized accum buffer mode */
-   if (value > 0.0 && value <= 1.0) {
-#if USE_OPTIMIZED_ACCUM
-      swrast->_IntegerAccumMode = GL_TRUE;
-#else
-      swrast->_IntegerAccumMode = GL_FALSE;
-#endif
-      swrast->_IntegerAccumScaler = value;
-   }
-   else {
-      swrast->_IntegerAccumMode = GL_FALSE;
-      swrast->_IntegerAccumScaler = 0.0;
-   }
-
-   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {
-      const GLfloat scale = value * ACCUM_SCALE16 / CHAN_MAXF;
-      GLshort accumRow[4 * MAX_WIDTH];
-      GLchan rgba[MAX_WIDTH][4];
-      GLint i;
-
-      for (i = 0; i < height; i++) {
-         GLshort *acc;
-         if (directAccess) {
-            acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);
-         }
-         else {
-            rb->GetRow(ctx, rb, width, xpos, ypos + i, accumRow);
-            acc = accumRow;
-         }
-
-         /* read colors from color buffer */
-         _swrast_read_rgba_span(ctx, ctx->ReadBuffer->_ColorReadBuffer, width,
-                                xpos, ypos + i, CHAN_TYPE, rgba);
-
-         /* do load */
-         if (swrast->_IntegerAccumMode) {
-            /* just copy values in */
-            GLint j;
-            assert(swrast->_IntegerAccumScaler > 0.0);
-            assert(swrast->_IntegerAccumScaler <= 1.0);
-            for (j = 0; j < width; j++) {
-               acc[j * 4 + 0] = rgba[j][RCOMP];
-               acc[j * 4 + 1] = rgba[j][GCOMP];
-               acc[j * 4 + 2] = rgba[j][BCOMP];
-               acc[j * 4 + 3] = rgba[j][ACOMP];
-            }
-         }
-         else {
-            /* scaled integer (or float) accum buffer */
-            GLint j;
-            for (j = 0; j < width; j++) {
-               acc[j * 4 + 0] = (GLshort) ((GLfloat) rgba[j][RCOMP] * scale);
-               acc[j * 4 + 1] = (GLshort) ((GLfloat) rgba[j][GCOMP] * scale);
-               acc[j * 4 + 2] = (GLshort) ((GLfloat) rgba[j][BCOMP] * scale);
-               acc[j * 4 + 3] = (GLshort) ((GLfloat) rgba[j][ACOMP] * scale);
-            }
-         }
-
-         if (!directAccess) {
-            rb->PutRow(ctx, rb, width, xpos, ypos + i, accumRow, NULL);
-         }
-      }
-   }
-}
-
-
-static void
-accum_return(GLcontext *ctx, GLfloat value,
-             GLint xpos, GLint ypos, GLint width, GLint height )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *accumRb = fb->Attachment[BUFFER_ACCUM].Renderbuffer;
-   const GLboolean directAccess
-      = (accumRb->GetPointer(ctx, accumRb, 0, 0) != NULL);
-
-   static GLchan multTable[32768];
-   static GLfloat prevMult = 0.0;
-   const GLfloat mult = swrast->_IntegerAccumScaler;
-   const GLint max = MIN2((GLint) (256 / mult), 32767);
-
-   /* May have to leave optimized accum buffer mode */
-   if (swrast->_IntegerAccumMode && value != 1.0)
-      rescale_accum(ctx);
-
-   if (swrast->_IntegerAccumMode && swrast->_IntegerAccumScaler > 0) {
-      /* build lookup table to avoid many floating point multiplies */
-      GLint j;
-      assert(swrast->_IntegerAccumScaler <= 1.0);
-      if (mult != prevMult) {
-         for (j = 0; j < max; j++)
-            multTable[j] = IROUND((GLfloat) j * mult);
-         prevMult = mult;
-      }
-   }
-
-   if (accumRb->DataType == GL_SHORT ||
-       accumRb->DataType == GL_UNSIGNED_SHORT) {
-      const GLfloat scale = value * CHAN_MAXF / ACCUM_SCALE16;
-      GLuint buffer;
-      GLint i;
-
-      /* XXX maybe transpose the 'i' and 'buffer' loops??? */
-      for (i = 0; i < height; i++) {
-         GLshort accumRow[4 * MAX_WIDTH];
-         GLshort *acc;
-         SWspan span;
-
-         /* init color span */
-         INIT_SPAN(span, GL_BITMAP);
-         span.end = width;
-         span.arrayMask = SPAN_RGBA;
-         span.x = xpos;
-         span.y = ypos + i;
-
-         if (directAccess) {
-            acc = (GLshort *) accumRb->GetPointer(ctx, accumRb, xpos, ypos +i);
-         }
-         else {
-            accumRb->GetRow(ctx, accumRb, width, xpos, ypos + i, accumRow);
-            acc = accumRow;
-         }
-
-         /* get the colors to return */
-         if (swrast->_IntegerAccumMode) {
-            GLint j;
-            for (j = 0; j < width; j++) {
-               ASSERT(acc[j * 4 + 0] < max);
-               ASSERT(acc[j * 4 + 1] < max);
-               ASSERT(acc[j * 4 + 2] < max);
-               ASSERT(acc[j * 4 + 3] < max);
-               span.array->rgba[j][RCOMP] = multTable[acc[j * 4 + 0]];
-               span.array->rgba[j][GCOMP] = multTable[acc[j * 4 + 1]];
-               span.array->rgba[j][BCOMP] = multTable[acc[j * 4 + 2]];
-               span.array->rgba[j][ACOMP] = multTable[acc[j * 4 + 3]];
-            }
-         }
-         else {
-            /* scaled integer (or float) accum buffer */
-            GLint j;
-            for (j = 0; j < width; j++) {
-#if CHAN_BITS==32
-               GLchan r = acc[j * 4 + 0] * scale;
-               GLchan g = acc[j * 4 + 1] * scale;
-               GLchan b = acc[j * 4 + 2] * scale;
-               GLchan a = acc[j * 4 + 3] * scale;
-#else
-               GLint r = IROUND( (GLfloat) (acc[j * 4 + 0]) * scale );
-               GLint g = IROUND( (GLfloat) (acc[j * 4 + 1]) * scale );
-               GLint b = IROUND( (GLfloat) (acc[j * 4 + 2]) * scale );
-               GLint a = IROUND( (GLfloat) (acc[j * 4 + 3]) * scale );
-#endif
-               span.array->rgba[j][RCOMP] = CLAMP( r, 0, CHAN_MAX );
-               span.array->rgba[j][GCOMP] = CLAMP( g, 0, CHAN_MAX );
-               span.array->rgba[j][BCOMP] = CLAMP( b, 0, CHAN_MAX );
-               span.array->rgba[j][ACOMP] = CLAMP( a, 0, CHAN_MAX );
-            }
-         }
-
-         /* store colors */
-         for (buffer = 0; buffer < fb->_NumColorDrawBuffers; buffer++) {
-            struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buffer];
-            const GLboolean masking = (!ctx->Color.ColorMask[buffer][RCOMP] ||
-                                       !ctx->Color.ColorMask[buffer][GCOMP] ||
-                                       !ctx->Color.ColorMask[buffer][BCOMP] ||
-                                       !ctx->Color.ColorMask[buffer][ACOMP]);
-            if (masking) {
-               _swrast_mask_rgba_span(ctx, rb, &span, buffer);
-            }
-            rb->PutRow(ctx, rb, width, xpos, ypos + i, span.array->rgba, NULL);
-         }
-      }
-   }
-   else {
-      /* other types someday */
-   }
-}
-
-
-
-/**
- * Software fallback for glAccum.
- */
-void
-_swrast_Accum(GLcontext *ctx, GLenum op, GLfloat value)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLint xpos, ypos, width, height;
-
-   if (swrast->NewState)
-      _swrast_validate_derived( ctx );
-
-   if (!ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer) {
-      _mesa_warning(ctx, "Calling glAccum() without an accumulation buffer");
-      return;
-   }
-
-   swrast_render_start(ctx);
-
-   /* Compute region after calling swrast_render_start() so that we know the
-    * drawbuffer's size/bounds are up to date.
-    */
-   xpos = ctx->DrawBuffer->_Xmin;
-   ypos = ctx->DrawBuffer->_Ymin;
-   width =  ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
-   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
-
-   switch (op) {
-      case GL_ADD:
-         if (value != 0.0F) {
-            accum_add(ctx, value, xpos, ypos, width, height);
-	 }
-	 break;
-      case GL_MULT:
-         if (value != 1.0F) {
-            accum_mult(ctx, value, xpos, ypos, width, height);
-	 }
-	 break;
-      case GL_ACCUM:
-         if (value != 0.0F) {
-            accum_accum(ctx, value, xpos, ypos, width, height);
-         }
-	 break;
-      case GL_LOAD:
-         accum_load(ctx, value, xpos, ypos, width, height);
-	 break;
-      case GL_RETURN:
-         accum_return(ctx, value, xpos, ypos, width, height);
-	 break;
-      default:
-         _mesa_problem(ctx, "invalid mode in _swrast_Accum()");
-         break;
-   }
-
-   swrast_render_finish(ctx);
-}
+/*

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

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/imports.h"

+

+#include "s_accum.h"

+#include "s_context.h"

+#include "s_masking.h"

+#include "s_span.h"

+

+

+/* XXX this would have to change for accum buffers with more or less

+ * than 16 bits per color channel.

+ */

+#define ACCUM_SCALE16 32767.0F

+

+

+/*

+ * Accumulation buffer notes

+ *

+ * Normally, accumulation buffer values are GLshorts with values in

+ * [-32767, 32767] which represent floating point colors in [-1, 1],

+ * as defined by the OpenGL specification.

+ *

+ * We optimize for the common case used for full-scene antialiasing:

+ *    // start with accum buffer cleared to zero

+ *    glAccum(GL_LOAD, w);   // or GL_ACCUM the first image

+ *    glAccum(GL_ACCUM, w);

+ *    ...

+ *    glAccum(GL_ACCUM, w);

+ *    glAccum(GL_RETURN, 1.0);

+ * That is, we start with an empty accumulation buffer and accumulate

+ * n images, each with weight w = 1/n.

+ * In this scenario, we can simply store unscaled integer values in

+ * the accum buffer instead of scaled integers.  We'll also keep track

+ * of the w value so when we do GL_RETURN we simply divide the accumulated

+ * values by n (n=1/w).

+ * This lets us avoid _many_ int->float->int conversions.

+ */

+

+

+#if CHAN_BITS == 8

+/* enable the optimization */

+#define USE_OPTIMIZED_ACCUM  1

+#else

+#define USE_OPTIMIZED_ACCUM  0

+#endif

+

+

+/**

+ * This is called when we fall out of optimized/unscaled accum buffer mode.

+ * That is, we convert each unscaled accum buffer value into a scaled value

+ * representing the range[-1, 1].

+ */

+static void

+rescale_accum( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_renderbuffer *rb

+      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;

+   const GLfloat s = swrast->_IntegerAccumScaler * (32767.0F / CHAN_MAXF);

+

+   assert(rb);

+   assert(rb->_BaseFormat == GL_RGBA);

+   /* add other types in future? */

+   assert(rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT);

+   assert(swrast->_IntegerAccumMode);

+

+   if (rb->GetPointer(ctx, rb, 0, 0)) {

+      /* directly-addressable memory */

+      GLuint y;

+      for (y = 0; y < rb->Height; y++) {

+         GLuint i;

+         GLshort *acc = (GLshort *) rb->GetPointer(ctx, rb, 0, y);

+         for (i = 0; i < 4 * rb->Width; i++) {

+            acc[i] = (GLshort) (acc[i] * s);

+         }

+      }

+   }

+   else {

+      /* use get/put row funcs */

+      GLuint y;

+      for (y = 0; y < rb->Height; y++) {

+         GLshort accRow[MAX_WIDTH * 4];

+         GLuint i;

+         rb->GetRow(ctx, rb, rb->Width, 0, y, accRow);

+         for (i = 0; i < 4 * rb->Width; i++) {

+            accRow[i] = (GLshort) (accRow[i] * s);

+         }

+         rb->PutRow(ctx, rb, rb->Width, 0, y, accRow, NULL);

+      }

+   }

+

+   swrast->_IntegerAccumMode = GL_FALSE;

+}

+

+

+

+/**

+ * Clear the accumulation Buffer.

+ */

+void

+_swrast_clear_accum_buffer( struct gl_context *ctx, struct gl_renderbuffer *rb )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint x, y, width, height;

+

+   /* No accumulation buffer! Not an error. */

+   if (!rb || !rb->Data)

+      return;

+

+   assert(rb->_BaseFormat == GL_RGBA);

+   /* add other types in future? */

+   assert(rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT);

+

+   /* bounds, with scissor */

+   x = ctx->DrawBuffer->_Xmin;

+   y = ctx->DrawBuffer->_Ymin;

+   width = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;

+   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;

+

+   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLfloat accScale = 32767.0;

+      GLshort clearVal[4];

+      GLuint i;

+

+      clearVal[0] = (GLshort) (ctx->Accum.ClearColor[0] * accScale);

+      clearVal[1] = (GLshort) (ctx->Accum.ClearColor[1] * accScale);

+      clearVal[2] = (GLshort) (ctx->Accum.ClearColor[2] * accScale);

+      clearVal[3] = (GLshort) (ctx->Accum.ClearColor[3] * accScale);

+

+      for (i = 0; i < height; i++) {

+         rb->PutMonoRow(ctx, rb, width, x, y + i, clearVal, NULL);

+      }

+   }

+   else {

+      /* someday support other sizes */

+   }

+

+   /* update optimized accum state vars */

+   if (ctx->Accum.ClearColor[0] == 0.0 && ctx->Accum.ClearColor[1] == 0.0 &&

+       ctx->Accum.ClearColor[2] == 0.0 && ctx->Accum.ClearColor[3] == 0.0) {

+#if USE_OPTIMIZED_ACCUM

+      swrast->_IntegerAccumMode = GL_TRUE;

+#else

+      swrast->_IntegerAccumMode = GL_FALSE;

+#endif

+      swrast->_IntegerAccumScaler = 0.0;  /* denotes empty accum buffer */

+   }

+   else {

+      swrast->_IntegerAccumMode = GL_FALSE;

+   }

+}

+

+

+static void

+accum_add(struct gl_context *ctx, GLfloat value,

+          GLint xpos, GLint ypos, GLint width, GLint height )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_renderbuffer *rb

+      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;

+

+   assert(rb);

+

+   /* Leave optimized accum buffer mode */

+   if (swrast->_IntegerAccumMode)

+      rescale_accum(ctx);

+

+   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLshort incr = (GLshort) (value * ACCUM_SCALE16);

+      if (rb->GetPointer(ctx, rb, 0, 0)) {

+         GLint i, j;

+         for (i = 0; i < height; i++) {

+            GLshort *acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);

+            for (j = 0; j < 4 * width; j++) {

+               acc[j] += incr;

+            }

+         }

+      }

+      else {

+         GLint i, j;

+         for (i = 0; i < height; i++) {

+            GLshort accRow[4 * MAX_WIDTH];

+            rb->GetRow(ctx, rb, width, xpos, ypos + i, accRow);

+            for (j = 0; j < 4 * width; j++) {

+               accRow[j] += incr;

+            }

+            rb->PutRow(ctx, rb, width, xpos, ypos + i, accRow, NULL);

+         }

+      }

+   }

+   else {

+      /* other types someday */

+   }

+}

+

+

+static void

+accum_mult(struct gl_context *ctx, GLfloat mult,

+           GLint xpos, GLint ypos, GLint width, GLint height )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_renderbuffer *rb

+      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;

+

+   assert(rb);

+

+   /* Leave optimized accum buffer mode */

+   if (swrast->_IntegerAccumMode)

+      rescale_accum(ctx);

+

+   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {

+      if (rb->GetPointer(ctx, rb, 0, 0)) {

+         GLint i, j;

+         for (i = 0; i < height; i++) {

+            GLshort *acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);

+            for (j = 0; j < 4 * width; j++) {

+               acc[j] = (GLshort) (acc[j] * mult);

+            }

+         }

+      }

+      else {

+         GLint i, j;

+         for (i = 0; i < height; i++) {

+            GLshort accRow[4 * MAX_WIDTH];

+            rb->GetRow(ctx, rb, width, xpos, ypos + i, accRow);

+            for (j = 0; j < 4 * width; j++) {

+               accRow[j] = (GLshort) (accRow[j] * mult);

+            }

+            rb->PutRow(ctx, rb, width, xpos, ypos + i, accRow, NULL);

+         }

+      }

+   }

+   else {

+      /* other types someday */

+   }

+}

+

+

+

+static void

+accum_accum(struct gl_context *ctx, GLfloat value,

+            GLint xpos, GLint ypos, GLint width, GLint height )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_renderbuffer *rb

+      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;

+   const GLboolean directAccess = (rb->GetPointer(ctx, rb, 0, 0) != NULL);

+

+   assert(rb);

+

+   if (!ctx->ReadBuffer->_ColorReadBuffer) {

+      /* no read buffer - OK */

+      return;

+   }

+

+   /* May have to leave optimized accum buffer mode */

+   if (swrast->_IntegerAccumScaler == 0.0 && value > 0.0 && value <= 1.0)

+      swrast->_IntegerAccumScaler = value;

+   if (swrast->_IntegerAccumMode && value != swrast->_IntegerAccumScaler)

+      rescale_accum(ctx);

+

+   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLfloat scale = value * ACCUM_SCALE16 / CHAN_MAXF;

+      GLshort accumRow[4 * MAX_WIDTH];

+      GLchan rgba[MAX_WIDTH][4];

+      GLint i;

+

+      for (i = 0; i < height; i++) {

+         GLshort *acc;

+         if (directAccess) {

+            acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);

+         }

+         else {

+            rb->GetRow(ctx, rb, width, xpos, ypos + i, accumRow);

+            acc = accumRow;

+         }

+

+         /* read colors from color buffer */

+         _swrast_read_rgba_span(ctx, ctx->ReadBuffer->_ColorReadBuffer, width,

+                                xpos, ypos + i, CHAN_TYPE, rgba);

+

+         /* do accumulation */

+         if (swrast->_IntegerAccumMode) {

+            /* simply add integer color values into accum buffer */

+            GLint j;

+            for (j = 0; j < width; j++) {

+               acc[j * 4 + 0] += rgba[j][RCOMP];

+               acc[j * 4 + 1] += rgba[j][GCOMP];

+               acc[j * 4 + 2] += rgba[j][BCOMP];

+               acc[j * 4 + 3] += rgba[j][ACOMP];

+            }

+         }

+         else {

+            /* scaled integer (or float) accum buffer */

+            GLint j;

+            for (j = 0; j < width; j++) {

+               acc[j * 4 + 0] += (GLshort) ((GLfloat) rgba[j][RCOMP] * scale);

+               acc[j * 4 + 1] += (GLshort) ((GLfloat) rgba[j][GCOMP] * scale);

+               acc[j * 4 + 2] += (GLshort) ((GLfloat) rgba[j][BCOMP] * scale);

+               acc[j * 4 + 3] += (GLshort) ((GLfloat) rgba[j][ACOMP] * scale);

+            }

+         }

+

+         if (!directAccess) {

+            rb->PutRow(ctx, rb, width, xpos, ypos + i, accumRow, NULL);

+         }

+      }

+   }

+   else {

+      /* other types someday */

+   }

+}

+

+

+

+static void

+accum_load(struct gl_context *ctx, GLfloat value,

+           GLint xpos, GLint ypos, GLint width, GLint height )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_renderbuffer *rb

+      = ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer;

+   const GLboolean directAccess = (rb->GetPointer(ctx, rb, 0, 0) != NULL);

+

+   assert(rb);

+

+   if (!ctx->ReadBuffer->_ColorReadBuffer) {

+      /* no read buffer - OK */

+      return;

+   }

+

+   /* This is a change to go into optimized accum buffer mode */

+   if (value > 0.0 && value <= 1.0) {

+#if USE_OPTIMIZED_ACCUM

+      swrast->_IntegerAccumMode = GL_TRUE;

+#else

+      swrast->_IntegerAccumMode = GL_FALSE;

+#endif

+      swrast->_IntegerAccumScaler = value;

+   }

+   else {

+      swrast->_IntegerAccumMode = GL_FALSE;

+      swrast->_IntegerAccumScaler = 0.0;

+   }

+

+   if (rb->DataType == GL_SHORT || rb->DataType == GL_UNSIGNED_SHORT) {

+      const GLfloat scale = value * ACCUM_SCALE16 / CHAN_MAXF;

+      GLshort accumRow[4 * MAX_WIDTH];

+      GLchan rgba[MAX_WIDTH][4];

+      GLint i;

+

+      for (i = 0; i < height; i++) {

+         GLshort *acc;

+         if (directAccess) {

+            acc = (GLshort *) rb->GetPointer(ctx, rb, xpos, ypos + i);

+         }

+         else {

+            rb->GetRow(ctx, rb, width, xpos, ypos + i, accumRow);

+            acc = accumRow;

+         }

+

+         /* read colors from color buffer */

+         _swrast_read_rgba_span(ctx, ctx->ReadBuffer->_ColorReadBuffer, width,

+                                xpos, ypos + i, CHAN_TYPE, rgba);

+

+         /* do load */

+         if (swrast->_IntegerAccumMode) {

+            /* just copy values in */

+            GLint j;

+            assert(swrast->_IntegerAccumScaler > 0.0);

+            assert(swrast->_IntegerAccumScaler <= 1.0);

+            for (j = 0; j < width; j++) {

+               acc[j * 4 + 0] = rgba[j][RCOMP];

+               acc[j * 4 + 1] = rgba[j][GCOMP];

+               acc[j * 4 + 2] = rgba[j][BCOMP];

+               acc[j * 4 + 3] = rgba[j][ACOMP];

+            }

+         }

+         else {

+            /* scaled integer (or float) accum buffer */

+            GLint j;

+            for (j = 0; j < width; j++) {

+               acc[j * 4 + 0] = (GLshort) ((GLfloat) rgba[j][RCOMP] * scale);

+               acc[j * 4 + 1] = (GLshort) ((GLfloat) rgba[j][GCOMP] * scale);

+               acc[j * 4 + 2] = (GLshort) ((GLfloat) rgba[j][BCOMP] * scale);

+               acc[j * 4 + 3] = (GLshort) ((GLfloat) rgba[j][ACOMP] * scale);

+            }

+         }

+

+         if (!directAccess) {

+            rb->PutRow(ctx, rb, width, xpos, ypos + i, accumRow, NULL);

+         }

+      }

+   }

+}

+

+

+static void

+accum_return(struct gl_context *ctx, GLfloat value,

+             GLint xpos, GLint ypos, GLint width, GLint height )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *accumRb = fb->Attachment[BUFFER_ACCUM].Renderbuffer;

+   const GLboolean directAccess

+      = (accumRb->GetPointer(ctx, accumRb, 0, 0) != NULL);

+

+   static GLchan multTable[32768];

+   static GLfloat prevMult = 0.0;

+   const GLfloat mult = swrast->_IntegerAccumScaler;

+   const GLint max = MIN2((GLint) (256 / mult), 32767);

+

+   /* May have to leave optimized accum buffer mode */

+   if (swrast->_IntegerAccumMode && value != 1.0)

+      rescale_accum(ctx);

+

+   if (swrast->_IntegerAccumMode && swrast->_IntegerAccumScaler > 0) {

+      /* build lookup table to avoid many floating point multiplies */

+      GLint j;

+      assert(swrast->_IntegerAccumScaler <= 1.0);

+      if (mult != prevMult) {

+         for (j = 0; j < max; j++)

+            multTable[j] = IROUND((GLfloat) j * mult);

+         prevMult = mult;

+      }

+   }

+

+   if (accumRb->DataType == GL_SHORT ||

+       accumRb->DataType == GL_UNSIGNED_SHORT) {

+      const GLfloat scale = value * CHAN_MAXF / ACCUM_SCALE16;

+      GLuint buffer;

+      GLint i;

+

+      /* XXX maybe transpose the 'i' and 'buffer' loops??? */

+      for (i = 0; i < height; i++) {

+         GLshort accumRow[4 * MAX_WIDTH];

+         GLshort *acc;

+         SWspan span;

+

+         /* init color span */

+         INIT_SPAN(span, GL_BITMAP);

+         span.end = width;

+         span.arrayMask = SPAN_RGBA;

+         span.x = xpos;

+         span.y = ypos + i;

+

+         if (directAccess) {

+            acc = (GLshort *) accumRb->GetPointer(ctx, accumRb, xpos, ypos +i);

+         }

+         else {

+            accumRb->GetRow(ctx, accumRb, width, xpos, ypos + i, accumRow);

+            acc = accumRow;

+         }

+

+         /* get the colors to return */

+         if (swrast->_IntegerAccumMode) {

+            GLint j;

+            for (j = 0; j < width; j++) {

+               ASSERT(acc[j * 4 + 0] < max);

+               ASSERT(acc[j * 4 + 1] < max);

+               ASSERT(acc[j * 4 + 2] < max);

+               ASSERT(acc[j * 4 + 3] < max);

+               span.array->rgba[j][RCOMP] = multTable[acc[j * 4 + 0]];

+               span.array->rgba[j][GCOMP] = multTable[acc[j * 4 + 1]];

+               span.array->rgba[j][BCOMP] = multTable[acc[j * 4 + 2]];

+               span.array->rgba[j][ACOMP] = multTable[acc[j * 4 + 3]];

+            }

+         }

+         else {

+            /* scaled integer (or float) accum buffer */

+            GLint j;

+            for (j = 0; j < width; j++) {

+#if CHAN_BITS==32

+               GLchan r = acc[j * 4 + 0] * scale;

+               GLchan g = acc[j * 4 + 1] * scale;

+               GLchan b = acc[j * 4 + 2] * scale;

+               GLchan a = acc[j * 4 + 3] * scale;

+#else

+               GLint r = IROUND( (GLfloat) (acc[j * 4 + 0]) * scale );

+               GLint g = IROUND( (GLfloat) (acc[j * 4 + 1]) * scale );

+               GLint b = IROUND( (GLfloat) (acc[j * 4 + 2]) * scale );

+               GLint a = IROUND( (GLfloat) (acc[j * 4 + 3]) * scale );

+#endif

+               span.array->rgba[j][RCOMP] = CLAMP( r, 0, CHAN_MAX );

+               span.array->rgba[j][GCOMP] = CLAMP( g, 0, CHAN_MAX );

+               span.array->rgba[j][BCOMP] = CLAMP( b, 0, CHAN_MAX );

+               span.array->rgba[j][ACOMP] = CLAMP( a, 0, CHAN_MAX );

+            }

+         }

+

+         /* store colors */

+         for (buffer = 0; buffer < fb->_NumColorDrawBuffers; buffer++) {

+            struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buffer];

+            const GLboolean masking = (!ctx->Color.ColorMask[buffer][RCOMP] ||

+                                       !ctx->Color.ColorMask[buffer][GCOMP] ||

+                                       !ctx->Color.ColorMask[buffer][BCOMP] ||

+                                       !ctx->Color.ColorMask[buffer][ACOMP]);

+            if (masking) {

+               _swrast_mask_rgba_span(ctx, rb, &span, buffer);

+            }

+            rb->PutRow(ctx, rb, width, xpos, ypos + i, span.array->rgba, NULL);

+         }

+      }

+   }

+   else {

+      /* other types someday */

+   }

+}

+

+

+

+/**

+ * Software fallback for glAccum.

+ */

+void

+_swrast_Accum(struct gl_context *ctx, GLenum op, GLfloat value)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLint xpos, ypos, width, height;

+

+   if (swrast->NewState)

+      _swrast_validate_derived( ctx );

+

+   if (!ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer) {

+      _mesa_warning(ctx, "Calling glAccum() without an accumulation buffer");

+      return;

+   }

+

+   swrast_render_start(ctx);

+

+   /* Compute region after calling swrast_render_start() so that we know the

+    * drawbuffer's size/bounds are up to date.

+    */

+   xpos = ctx->DrawBuffer->_Xmin;

+   ypos = ctx->DrawBuffer->_Ymin;

+   width =  ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;

+   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;

+

+   switch (op) {

+      case GL_ADD:

+         if (value != 0.0F) {

+            accum_add(ctx, value, xpos, ypos, width, height);

+	 }

+	 break;

+      case GL_MULT:

+         if (value != 1.0F) {

+            accum_mult(ctx, value, xpos, ypos, width, height);

+	 }

+	 break;

+      case GL_ACCUM:

+         if (value != 0.0F) {

+            accum_accum(ctx, value, xpos, ypos, width, height);

+         }

+	 break;

+      case GL_LOAD:

+         accum_load(ctx, value, xpos, ypos, width, height);

+	 break;

+      case GL_RETURN:

+         accum_return(ctx, value, xpos, ypos, width, height);

+	 break;

+      default:

+         _mesa_problem(ctx, "invalid mode in _swrast_Accum()");

+         break;

+   }

+

+   swrast_render_finish(ctx);

+}

diff --git a/mesalib/src/mesa/swrast/s_accum.h b/mesalib/src/mesa/swrast/s_accum.h
index 42e38cf02..bdd6ac326 100644
--- a/mesalib/src/mesa/swrast/s_accum.h
+++ b/mesalib/src/mesa/swrast/s_accum.h
@@ -1,37 +1,38 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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 S_ACCUM_H
-#define S_ACCUM_H
-
-
-#include "main/mtypes.h"
-
-
-extern void
-_swrast_clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb);
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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 S_ACCUM_H

+#define S_ACCUM_H

+

+

+struct gl_context;

+struct gl_renderbuffer;

+

+

+extern void

+_swrast_clear_accum_buffer(struct gl_context *ctx, struct gl_renderbuffer *rb);

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_alpha.c b/mesalib/src/mesa/swrast/s_alpha.c
index 509477433..798b506e4 100644
--- a/mesalib/src/mesa/swrast/s_alpha.c
+++ b/mesalib/src/mesa/swrast/s_alpha.c
@@ -1,160 +1,160 @@
-/*
- * 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.
- */
-
-/**
- * \file swrast/s_alpha.c
- * \brief Functions to apply alpha test.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-
-#include "s_alpha.h"
-#include "s_context.h"
-
-
-#define ALPHA_TEST(ALPHA, LOOP_CODE)		\
-do {						\
-   switch (ctx->Color.AlphaFunc) {		\
-      case GL_LESS:				\
-         for (i = 0; i < n; i++) {		\
-            mask[i] &= (ALPHA < ref);		\
-            LOOP_CODE;				\
-         }					\
-         break;					\
-      case GL_LEQUAL:				\
-         for (i = 0; i < n; i++) {		\
-            mask[i] &= (ALPHA <= ref);		\
-            LOOP_CODE;				\
-         }					\
-         break;					\
-      case GL_GEQUAL:				\
-         for (i = 0; i < n; i++) {		\
-            mask[i] &= (ALPHA >= ref);		\
-            LOOP_CODE;				\
-         }					\
-         break;					\
-      case GL_GREATER:				\
-         for (i = 0; i < n; i++) {		\
-            mask[i] &= (ALPHA > ref);		\
-            LOOP_CODE;				\
-         }					\
-         break;					\
-      case GL_NOTEQUAL:				\
-         for (i = 0; i < n; i++) {		\
-            mask[i] &= (ALPHA != ref);		\
-            LOOP_CODE;				\
-         }					\
-         break;					\
-      case GL_EQUAL:				\
-         for (i = 0; i < n; i++) {		\
-            mask[i] &= (ALPHA == ref);		\
-            LOOP_CODE;				\
-         }					\
-         break;					\
-      default:					\
-         _mesa_problem(ctx, "Invalid alpha test in _swrast_alpha_test" ); \
-         return 0;				\
-   }						\
-} while (0)
-
-
-
-/**
- * Perform the alpha test for an array of pixels.
- * For pixels that fail the test, mask[i] will be set to 0.
- * \return  0 if all pixels in the span failed the alpha test,
- *          1 if one or more pixels passed the alpha test.
- */
-GLint
-_swrast_alpha_test(const GLcontext *ctx, SWspan *span)
-{
-   const GLuint n = span->end;
-   GLubyte *mask = span->array->mask;
-   GLuint i;
-
-   if (ctx->Color.AlphaFunc == GL_ALWAYS) {
-      /* do nothing */
-      return 1;
-   }
-   else if (ctx->Color.AlphaFunc == GL_NEVER) {
-      /* All pixels failed - caller should check for this return value and
-       * act accordingly.
-       */
-      span->writeAll = GL_FALSE;
-      return 0;
-   }
-
-   if (span->arrayMask & SPAN_RGBA) {
-      /* Use array's alpha values */
-      if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-         GLubyte (*rgba)[4] = span->array->rgba8;
-         GLubyte ref;
-         CLAMPED_FLOAT_TO_UBYTE(ref, ctx->Color.AlphaRef);
-         ALPHA_TEST(rgba[i][ACOMP], ;);
-      }
-      else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-         GLushort (*rgba)[4] = span->array->rgba16;
-         GLushort ref;
-         CLAMPED_FLOAT_TO_USHORT(ref, ctx->Color.AlphaRef);
-         ALPHA_TEST(rgba[i][ACOMP], ;);
-      }
-      else {
-         GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-         const GLfloat ref = ctx->Color.AlphaRef;
-         ALPHA_TEST(rgba[i][ACOMP], ;);
-      }
-   }
-   else {
-      /* Interpolate alpha values */
-      ASSERT(span->interpMask & SPAN_RGBA);
-      if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-         const GLfixed alphaStep = span->alphaStep;
-         GLfixed alpha = span->alpha;
-         GLubyte ref;
-         CLAMPED_FLOAT_TO_UBYTE(ref, ctx->Color.AlphaRef);
-         ALPHA_TEST(FixedToInt(alpha), alpha += alphaStep);
-      }
-      else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-         const GLfixed alphaStep = span->alphaStep;
-         GLfixed alpha = span->alpha;
-         GLushort ref;
-         CLAMPED_FLOAT_TO_USHORT(ref, ctx->Color.AlphaRef);
-         ALPHA_TEST(FixedToInt(alpha), alpha += alphaStep);
-      }
-      else {
-         const GLfloat alphaStep = FixedToFloat(span->alphaStep);
-         GLfloat alpha = FixedToFloat(span->alpha);
-         const GLfloat ref = ctx->Color.AlphaRef;
-         ALPHA_TEST(alpha, alpha += alphaStep);
-      }
-   }
-
-   span->writeAll = GL_FALSE;
-
-   /* XXX examine mask[] values? */
-   return 1;
-}
+/*

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

+ */

+

+/**

+ * \file swrast/s_alpha.c

+ * \brief Functions to apply alpha test.

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+

+#include "s_alpha.h"

+#include "s_context.h"

+

+

+#define ALPHA_TEST(ALPHA, LOOP_CODE)		\

+do {						\

+   switch (ctx->Color.AlphaFunc) {		\

+      case GL_LESS:				\

+         for (i = 0; i < n; i++) {		\

+            mask[i] &= (ALPHA < ref);		\

+            LOOP_CODE;				\

+         }					\

+         break;					\

+      case GL_LEQUAL:				\

+         for (i = 0; i < n; i++) {		\

+            mask[i] &= (ALPHA <= ref);		\

+            LOOP_CODE;				\

+         }					\

+         break;					\

+      case GL_GEQUAL:				\

+         for (i = 0; i < n; i++) {		\

+            mask[i] &= (ALPHA >= ref);		\

+            LOOP_CODE;				\

+         }					\

+         break;					\

+      case GL_GREATER:				\

+         for (i = 0; i < n; i++) {		\

+            mask[i] &= (ALPHA > ref);		\

+            LOOP_CODE;				\

+         }					\

+         break;					\

+      case GL_NOTEQUAL:				\

+         for (i = 0; i < n; i++) {		\

+            mask[i] &= (ALPHA != ref);		\

+            LOOP_CODE;				\

+         }					\

+         break;					\

+      case GL_EQUAL:				\

+         for (i = 0; i < n; i++) {		\

+            mask[i] &= (ALPHA == ref);		\

+            LOOP_CODE;				\

+         }					\

+         break;					\

+      default:					\

+         _mesa_problem(ctx, "Invalid alpha test in _swrast_alpha_test" ); \

+         return 0;				\

+   }						\

+} while (0)

+

+

+

+/**

+ * Perform the alpha test for an array of pixels.

+ * For pixels that fail the test, mask[i] will be set to 0.

+ * \return  0 if all pixels in the span failed the alpha test,

+ *          1 if one or more pixels passed the alpha test.

+ */

+GLint

+_swrast_alpha_test(const struct gl_context *ctx, SWspan *span)

+{

+   const GLuint n = span->end;

+   GLubyte *mask = span->array->mask;

+   GLuint i;

+

+   if (ctx->Color.AlphaFunc == GL_ALWAYS) {

+      /* do nothing */

+      return 1;

+   }

+   else if (ctx->Color.AlphaFunc == GL_NEVER) {

+      /* All pixels failed - caller should check for this return value and

+       * act accordingly.

+       */

+      span->writeAll = GL_FALSE;

+      return 0;

+   }

+

+   if (span->arrayMask & SPAN_RGBA) {

+      /* Use array's alpha values */

+      if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+         GLubyte (*rgba)[4] = span->array->rgba8;

+         GLubyte ref;

+         CLAMPED_FLOAT_TO_UBYTE(ref, ctx->Color.AlphaRef);

+         ALPHA_TEST(rgba[i][ACOMP], ;);

+      }

+      else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+         GLushort (*rgba)[4] = span->array->rgba16;

+         GLushort ref;

+         CLAMPED_FLOAT_TO_USHORT(ref, ctx->Color.AlphaRef);

+         ALPHA_TEST(rgba[i][ACOMP], ;);

+      }

+      else {

+         GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+         const GLfloat ref = ctx->Color.AlphaRef;

+         ALPHA_TEST(rgba[i][ACOMP], ;);

+      }

+   }

+   else {

+      /* Interpolate alpha values */

+      ASSERT(span->interpMask & SPAN_RGBA);

+      if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+         const GLfixed alphaStep = span->alphaStep;

+         GLfixed alpha = span->alpha;

+         GLubyte ref;

+         CLAMPED_FLOAT_TO_UBYTE(ref, ctx->Color.AlphaRef);

+         ALPHA_TEST(FixedToInt(alpha), alpha += alphaStep);

+      }

+      else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+         const GLfixed alphaStep = span->alphaStep;

+         GLfixed alpha = span->alpha;

+         GLushort ref;

+         CLAMPED_FLOAT_TO_USHORT(ref, ctx->Color.AlphaRef);

+         ALPHA_TEST(FixedToInt(alpha), alpha += alphaStep);

+      }

+      else {

+         const GLfloat alphaStep = FixedToFloat(span->alphaStep);

+         GLfloat alpha = FixedToFloat(span->alpha);

+         const GLfloat ref = ctx->Color.AlphaRef;

+         ALPHA_TEST(alpha, alpha += alphaStep);

+      }

+   }

+

+   span->writeAll = GL_FALSE;

+

+   /* XXX examine mask[] values? */

+   return 1;

+}

diff --git a/mesalib/src/mesa/swrast/s_alpha.h b/mesalib/src/mesa/swrast/s_alpha.h
index 239484a97..ac5cd8dab 100644
--- a/mesalib/src/mesa/swrast/s_alpha.h
+++ b/mesalib/src/mesa/swrast/s_alpha.h
@@ -1,39 +1,39 @@
-
-/*
- * 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.
- */
-
-
-#ifndef S_ALPHA_H
-#define S_ALPHA_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern GLint
-_swrast_alpha_test( const GLcontext *ctx, SWspan *span );
-
-
-#endif
+/*

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

+ */

+

+

+#ifndef S_ALPHA_H

+#define S_ALPHA_H

+

+

+#include "main/glheader.h"

+#include "s_span.h"

+

+struct gl_context;

+

+extern GLint

+_swrast_alpha_test( const struct gl_context *ctx, SWspan *span );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_atifragshader.c b/mesalib/src/mesa/swrast/s_atifragshader.c
index 1338b6802..6019eea5e 100644
--- a/mesalib/src/mesa/swrast/s_atifragshader.c
+++ b/mesalib/src/mesa/swrast/s_atifragshader.c
@@ -1,604 +1,604 @@
-/*
- * Copyright (C) 2004  David Airlie   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
- * DAVID AIRLIE 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/macros.h"
-#include "main/atifragshader.h"
-#include "swrast/s_atifragshader.h"
-#include "swrast/s_context.h"
-
-
-/**
- * State for executing ATI fragment shader.
- */
-struct atifs_machine
-{
-   GLfloat Registers[6][4];         /** six temporary registers */
-   GLfloat PrevPassRegisters[6][4];
-   GLfloat Inputs[2][4];   /** Primary, secondary input colors */
-};
-
-
-
-/**
- * Fetch a texel.
- */
-static void
-fetch_texel(GLcontext * ctx, const GLfloat texcoord[4], GLfloat lambda,
-	    GLuint unit, GLfloat color[4])
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   /* XXX use a float-valued TextureSample routine here!!! */
-   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
-                               1, (const GLfloat(*)[4]) texcoord,
-                               &lambda, (GLfloat (*)[4]) color);
-}
-
-static void
-apply_swizzle(GLfloat values[4], GLuint swizzle)
-{
-   GLfloat s, t, r, q;
-
-   s = values[0];
-   t = values[1];
-   r = values[2];
-   q = values[3];
-
-   switch (swizzle) {
-   case GL_SWIZZLE_STR_ATI:
-      values[0] = s;
-      values[1] = t;
-      values[2] = r;
-      break;
-   case GL_SWIZZLE_STQ_ATI:
-      values[0] = s;
-      values[1] = t;
-      values[2] = q;
-      break;
-   case GL_SWIZZLE_STR_DR_ATI:
-      values[0] = s / r;
-      values[1] = t / r;
-      values[2] = 1 / r;
-      break;
-   case GL_SWIZZLE_STQ_DQ_ATI:
-/* make sure q is not 0 to avoid problems later with infinite values (texture lookup)? */
-      if (q == 0.0F)
-         q = 0.000000001F;
-      values[0] = s / q;
-      values[1] = t / q;
-      values[2] = 1.0F / q;
-      break;
-   }
-   values[3] = 0.0;
-}
-
-static void
-apply_src_rep(GLint optype, GLuint rep, GLfloat * val)
-{
-   GLint i;
-   GLint start, end;
-   if (!rep)
-      return;
-
-   start = optype ? 3 : 0;
-   end = 4;
-
-   for (i = start; i < end; i++) {
-      switch (rep) {
-      case GL_RED:
-	 val[i] = val[0];
-	 break;
-      case GL_GREEN:
-	 val[i] = val[1];
-	 break;
-      case GL_BLUE:
-	 val[i] = val[2];
-	 break;
-      case GL_ALPHA:
-	 val[i] = val[3];
-	 break;
-      }
-   }
-}
-
-static void
-apply_src_mod(GLint optype, GLuint mod, GLfloat * val)
-{
-   GLint i;
-   GLint start, end;
-
-   if (!mod)
-      return;
-
-   start = optype ? 3 : 0;
-   end = 4;
-
-   for (i = start; i < end; i++) {
-      if (mod & GL_COMP_BIT_ATI)
-	 val[i] = 1 - val[i];
-
-      if (mod & GL_BIAS_BIT_ATI)
-	 val[i] = val[i] - 0.5F;
-
-      if (mod & GL_2X_BIT_ATI)
-	 val[i] = 2 * val[i];
-
-      if (mod & GL_NEGATE_BIT_ATI)
-	 val[i] = -val[i];
-   }
-}
-
-static void
-apply_dst_mod(GLuint optype, GLuint mod, GLfloat * val)
-{
-   GLint i;
-   GLint has_sat = mod & GL_SATURATE_BIT_ATI;
-   GLint start, end;
-
-   mod &= ~GL_SATURATE_BIT_ATI;
-
-   start = optype ? 3 : 0;
-   end = optype ? 4 : 3;
-
-   for (i = start; i < end; i++) {
-      switch (mod) {
-      case GL_2X_BIT_ATI:
-	 val[i] = 2 * val[i];
-	 break;
-      case GL_4X_BIT_ATI:
-	 val[i] = 4 * val[i];
-	 break;
-      case GL_8X_BIT_ATI:
-	 val[i] = 8 * val[i];
-	 break;
-      case GL_HALF_BIT_ATI:
-	 val[i] = val[i] * 0.5F;
-	 break;
-      case GL_QUARTER_BIT_ATI:
-	 val[i] = val[i] * 0.25F;
-	 break;
-      case GL_EIGHTH_BIT_ATI:
-	 val[i] = val[i] * 0.125F;
-	 break;
-      }
-
-      if (has_sat) {
-	 if (val[i] < 0.0F)
-	    val[i] = 0.0F;
-	 else if (val[i] > 1.0F)
-	    val[i] = 1.0F;
-      }
-      else {
-	 if (val[i] < -8.0F)
-	    val[i] = -8.0F;
-	 else if (val[i] > 8.0F)
-	    val[i] = 8.0F;
-      }
-   }
-}
-
-
-static void
-write_dst_addr(GLuint optype, GLuint mod, GLuint mask, GLfloat * src,
-	       GLfloat * dst)
-{
-   GLint i;
-   apply_dst_mod(optype, mod, src);
-
-   if (optype == ATI_FRAGMENT_SHADER_COLOR_OP) {
-      if (mask) {
-	 if (mask & GL_RED_BIT_ATI)
-	    dst[0] = src[0];
-
-	 if (mask & GL_GREEN_BIT_ATI)
-	    dst[1] = src[1];
-
-	 if (mask & GL_BLUE_BIT_ATI)
-	    dst[2] = src[2];
-      }
-      else {
-	 for (i = 0; i < 3; i++)
-	    dst[i] = src[i];
-      }
-   }
-   else
-      dst[3] = src[3];
-}
-
-static void
-finish_pass(struct atifs_machine *machine)
-{
-   GLint i;
-
-   for (i = 0; i < 6; i++) {
-      COPY_4V(machine->PrevPassRegisters[i], machine->Registers[i]);
-   }
-}
-
-struct ati_fs_opcode_st ati_fs_opcodes[] = {
-   {GL_ADD_ATI, 2},
-   {GL_SUB_ATI, 2},
-   {GL_MUL_ATI, 2},
-   {GL_MAD_ATI, 3},
-   {GL_LERP_ATI, 3},
-   {GL_MOV_ATI, 1},
-   {GL_CND_ATI, 3},
-   {GL_CND0_ATI, 3},
-   {GL_DOT2_ADD_ATI, 3},
-   {GL_DOT3_ATI, 2},
-   {GL_DOT4_ATI, 2}
-};
-
-
-
-static void
-handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,
-	       const SWspan *span, GLuint column, GLuint idx)
-{
-   GLuint swizzle = texinst->swizzle;
-   GLuint pass_tex = texinst->src;
-
-   if (pass_tex >= GL_TEXTURE0_ARB && pass_tex <= GL_TEXTURE7_ARB) {
-      pass_tex -= GL_TEXTURE0_ARB;
-      COPY_4V(machine->Registers[idx],
-	      span->array->attribs[FRAG_ATTRIB_TEX0 + pass_tex][column]);
-   }
-   else if (pass_tex >= GL_REG_0_ATI && pass_tex <= GL_REG_5_ATI) {
-      pass_tex -= GL_REG_0_ATI;
-      COPY_4V(machine->Registers[idx], machine->PrevPassRegisters[pass_tex]);
-   }
-   apply_swizzle(machine->Registers[idx], swizzle);
-
-}
-
-static void
-handle_sample_op(GLcontext * ctx, struct atifs_machine *machine,
-		 struct atifs_setupinst *texinst, const SWspan *span,
-		 GLuint column, GLuint idx)
-{
-/* sample from unit idx using texinst->src as coords */
-   GLuint swizzle = texinst->swizzle;
-   GLuint coord_source = texinst->src;
-   GLfloat tex_coords[4] = { 0 };
-
-   if (coord_source >= GL_TEXTURE0_ARB && coord_source <= GL_TEXTURE7_ARB) {
-      coord_source -= GL_TEXTURE0_ARB;
-      COPY_4V(tex_coords,
-              span->array->attribs[FRAG_ATTRIB_TEX0 + coord_source][column]);
-   }
-   else if (coord_source >= GL_REG_0_ATI && coord_source <= GL_REG_5_ATI) {
-      coord_source -= GL_REG_0_ATI;
-      COPY_4V(tex_coords, machine->PrevPassRegisters[coord_source]);
-   }
-   apply_swizzle(tex_coords, swizzle);
-   fetch_texel(ctx, tex_coords, 0.0F, idx, machine->Registers[idx]);
-}
-
-#define SETUP_SRC_REG(optype, i, x)		\
-do {						\
-   COPY_4V(src[optype][i], x); 			\
-} while (0)
-
-
-
-/**
- * Execute the given fragment shader.
- * NOTE: we do everything in single-precision floating point
- * \param ctx - rendering context
- * \param shader - the shader to execute
- * \param machine - virtual machine state
- * \param span - the SWspan we're operating on
- * \param column - which pixel [i] we're operating on in the span
- */
-static void
-execute_shader(GLcontext *ctx, const struct ati_fragment_shader *shader,
-	       struct atifs_machine *machine, const SWspan *span,
-               GLuint column)
-{
-   GLuint pc;
-   struct atifs_instruction *inst;
-   struct atifs_setupinst *texinst;
-   GLint optype;
-   GLuint i;
-   GLint j, pass;
-   GLint dstreg;
-   GLfloat src[2][3][4];
-   GLfloat zeros[4] = { 0.0, 0.0, 0.0, 0.0 };
-   GLfloat ones[4] = { 1.0, 1.0, 1.0, 1.0 };
-   GLfloat dst[2][4], *dstp;
-
-   for (pass = 0; pass < shader->NumPasses; pass++) {
-      if (pass > 0)
-	 finish_pass(machine);
-      for (j = 0; j < MAX_NUM_FRAGMENT_REGISTERS_ATI; j++) {
-	 texinst = &shader->SetupInst[pass][j];
-	 if (texinst->Opcode == ATI_FRAGMENT_SHADER_PASS_OP)
-	    handle_pass_op(machine, texinst, span, column, j);
-	 else if (texinst->Opcode == ATI_FRAGMENT_SHADER_SAMPLE_OP)
-	    handle_sample_op(ctx, machine, texinst, span, column, j);
-      }
-
-      for (pc = 0; pc < shader->numArithInstr[pass]; pc++) {
-	 inst = &shader->Instructions[pass][pc];
-
-	 /* setup the source registers for color and alpha ops */
-	 for (optype = 0; optype < 2; optype++) {
- 	    for (i = 0; i < inst->ArgCount[optype]; i++) {
-	       GLint index = inst->SrcReg[optype][i].Index;
-
-	       if (index >= GL_REG_0_ATI && index <= GL_REG_5_ATI)
-		  SETUP_SRC_REG(optype, i,
-				machine->Registers[index - GL_REG_0_ATI]);
-	       else if (index >= GL_CON_0_ATI && index <= GL_CON_7_ATI) {
-		  if (shader->LocalConstDef & (1 << (index - GL_CON_0_ATI))) {
-		     SETUP_SRC_REG(optype, i,
-				shader->Constants[index - GL_CON_0_ATI]);
-		  } else {
-		     SETUP_SRC_REG(optype, i,
-				ctx->ATIFragmentShader.GlobalConstants[index - GL_CON_0_ATI]);
-		  }
-	       }
-	       else if (index == GL_ONE)
-		  SETUP_SRC_REG(optype, i, ones);
-	       else if (index == GL_ZERO)
-		  SETUP_SRC_REG(optype, i, zeros);
-	       else if (index == GL_PRIMARY_COLOR_EXT)
-		  SETUP_SRC_REG(optype, i,
-				machine->Inputs[ATI_FS_INPUT_PRIMARY]);
-	       else if (index == GL_SECONDARY_INTERPOLATOR_ATI)
-		  SETUP_SRC_REG(optype, i,
-				machine->Inputs[ATI_FS_INPUT_SECONDARY]);
-
-	       apply_src_rep(optype, inst->SrcReg[optype][i].argRep,
-			     src[optype][i]);
-	       apply_src_mod(optype, inst->SrcReg[optype][i].argMod,
-			     src[optype][i]);
-	    }
-	 }
-
-	 /* Execute the operations - color then alpha */
-	 for (optype = 0; optype < 2; optype++) {
-	    if (inst->Opcode[optype]) {
-	       switch (inst->Opcode[optype]) {
-	       case GL_ADD_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   src[optype][0][i] + src[optype][1][i];
-		     }
-		  else
-		     dst[optype][3] = src[optype][0][3] + src[optype][1][3];
-		  break;
-	       case GL_SUB_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   src[optype][0][i] - src[optype][1][i];
-		     }
-		  else
-		     dst[optype][3] = src[optype][0][3] - src[optype][1][3];
-		  break;
-	       case GL_MUL_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   src[optype][0][i] * src[optype][1][i];
-		     }
-		  else
-		     dst[optype][3] = src[optype][0][3] * src[optype][1][3];
-		  break;
-	       case GL_MAD_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   src[optype][0][i] * src[optype][1][i] +
-			   src[optype][2][i];
-		     }
-		  else
-		     dst[optype][3] =
-			src[optype][0][3] * src[optype][1][3] +
-			src[optype][2][3];
-		  break;
-	       case GL_LERP_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   src[optype][0][i] * src[optype][1][i] + (1 -
-								    src
-								    [optype]
-								    [0][i]) *
-			   src[optype][2][i];
-		     }
-		  else
-		     dst[optype][3] =
-			src[optype][0][3] * src[optype][1][3] + (1 -
-								 src[optype]
-								 [0][3]) *
-			src[optype][2][3];
-		  break;
-
-	       case GL_MOV_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] = src[optype][0][i];
-		     }
-		  else
-		     dst[optype][3] = src[optype][0][3];
-		  break;
-	       case GL_CND_ATI:
-		  if (!optype) {
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   (src[optype][2][i] >
-			    0.5) ? src[optype][0][i] : src[optype][1][i];
-		     }
-		  }
-		  else {
-		     dst[optype][3] =
-			(src[optype][2][3] >
-			 0.5) ? src[optype][0][3] : src[optype][1][3];
-		  }
-		  break;
-
-	       case GL_CND0_ATI:
-		  if (!optype)
-		     for (i = 0; i < 3; i++) {
-			dst[optype][i] =
-			   (src[optype][2][i] >=
-			    0) ? src[optype][0][i] : src[optype][1][i];
-		     }
-		  else {
-		     dst[optype][3] =
-			(src[optype][2][3] >=
-			 0) ? src[optype][0][3] : src[optype][1][3];
-		  }
-		  break;
-	       case GL_DOT2_ADD_ATI:
-		  {
-		     GLfloat result;
-
-		     /* DOT 2 always uses the source from the color op */
-		     /* could save recalculation of dot products for alpha inst */
-		     result = src[0][0][0] * src[0][1][0] +
-			src[0][0][1] * src[0][1][1] + src[0][2][2];
-		     if (!optype) {
-			for (i = 0; i < 3; i++) {
-			   dst[optype][i] = result;
-			}
-		     }
-		     else
-			dst[optype][3] = result;
-		  }
-		  break;
-	       case GL_DOT3_ATI:
-		  {
-		     GLfloat result;
-
-		     /* DOT 3 always uses the source from the color op */
-		     result = src[0][0][0] * src[0][1][0] +
-			src[0][0][1] * src[0][1][1] +
-			src[0][0][2] * src[0][1][2];
-
-		     if (!optype) {
-			for (i = 0; i < 3; i++) {
-			   dst[optype][i] = result;
-			}
-		     }
-		     else
-			dst[optype][3] = result;
-		  }
-		  break;
-	       case GL_DOT4_ATI:
-		  {
-		     GLfloat result;
-
-		     /* DOT 4 always uses the source from the color op */
-		     result = src[0][0][0] * src[0][1][0] +
-			src[0][0][1] * src[0][1][1] +
-			src[0][0][2] * src[0][1][2] +
-			src[0][0][3] * src[0][1][3];
-		     if (!optype) {
-			for (i = 0; i < 3; i++) {
-			   dst[optype][i] = result;
-			}
-		     }
-		     else
-			dst[optype][3] = result;
-		  }
-		  break;
-
-	       }
-	    }
-	 }
-
-	 /* write out the destination registers */
-	 for (optype = 0; optype < 2; optype++) {
-	    if (inst->Opcode[optype]) {
-	       dstreg = inst->DstReg[optype].Index;
-	       dstp = machine->Registers[dstreg - GL_REG_0_ATI];
-
-	       if ((optype == 0) || ((inst->Opcode[1] != GL_DOT2_ADD_ATI) &&
-		  (inst->Opcode[1] != GL_DOT3_ATI) && (inst->Opcode[1] != GL_DOT4_ATI)))
-	          write_dst_addr(optype, inst->DstReg[optype].dstMod,
-			      inst->DstReg[optype].dstMask, dst[optype],
-			      dstp);
-	       else
-		  write_dst_addr(1, inst->DstReg[0].dstMod, 0, dst[1], dstp);
-	    }
-	 }
-      }
-   }
-}
-
-
-/**
- * Init fragment shader virtual machine state.
- */
-static void
-init_machine(GLcontext * ctx, struct atifs_machine *machine,
-	     const struct ati_fragment_shader *shader,
-	     const SWspan *span, GLuint col)
-{
-   GLfloat (*inputs)[4] = machine->Inputs;
-   GLint i, j;
-
-   for (i = 0; i < 6; i++) {
-      for (j = 0; j < 4; j++)
-	 machine->Registers[i][j] = 0.0;
-   }
-
-   COPY_4V(inputs[ATI_FS_INPUT_PRIMARY], span->array->attribs[FRAG_ATTRIB_COL0][col]);
-   COPY_4V(inputs[ATI_FS_INPUT_SECONDARY], span->array->attribs[FRAG_ATTRIB_COL1][col]);
-}
-
-
-
-/**
- * Execute the current ATI shader program, operating on the given span.
- */
-void
-_swrast_exec_fragment_shader(GLcontext * ctx, SWspan *span)
-{
-   const struct ati_fragment_shader *shader = ctx->ATIFragmentShader.Current;
-   struct atifs_machine machine;
-   GLuint i;
-
-   /* incoming colors should be floats */
-   ASSERT(span->array->ChanType == GL_FLOAT);
-
-   for (i = 0; i < span->end; i++) {
-      if (span->array->mask[i]) {
-	 init_machine(ctx, &machine, shader, span, i);
-
-	 execute_shader(ctx, shader, &machine, span, i);
-
-         /* store result color */
-	 {
-	    const GLfloat *colOut = machine.Registers[0];
-            /*fprintf(stderr,"outputs %f %f %f %f\n",
-              colOut[0], colOut[1], colOut[2], colOut[3]); */
-            COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i], colOut);
-	 }
-      }
-   }
-}
+/*

+ * Copyright (C) 2004  David Airlie   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

+ * DAVID AIRLIE 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/macros.h"

+#include "main/atifragshader.h"

+#include "swrast/s_atifragshader.h"

+#include "swrast/s_context.h"

+

+

+/**

+ * State for executing ATI fragment shader.

+ */

+struct atifs_machine

+{

+   GLfloat Registers[6][4];         /** six temporary registers */

+   GLfloat PrevPassRegisters[6][4];

+   GLfloat Inputs[2][4];   /** Primary, secondary input colors */

+};

+

+

+

+/**

+ * Fetch a texel.

+ */

+static void

+fetch_texel(struct gl_context * ctx, const GLfloat texcoord[4], GLfloat lambda,

+	    GLuint unit, GLfloat color[4])

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   /* XXX use a float-valued TextureSample routine here!!! */

+   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,

+                               1, (const GLfloat(*)[4]) texcoord,

+                               &lambda, (GLfloat (*)[4]) color);

+}

+

+static void

+apply_swizzle(GLfloat values[4], GLuint swizzle)

+{

+   GLfloat s, t, r, q;

+

+   s = values[0];

+   t = values[1];

+   r = values[2];

+   q = values[3];

+

+   switch (swizzle) {

+   case GL_SWIZZLE_STR_ATI:

+      values[0] = s;

+      values[1] = t;

+      values[2] = r;

+      break;

+   case GL_SWIZZLE_STQ_ATI:

+      values[0] = s;

+      values[1] = t;

+      values[2] = q;

+      break;

+   case GL_SWIZZLE_STR_DR_ATI:

+      values[0] = s / r;

+      values[1] = t / r;

+      values[2] = 1 / r;

+      break;

+   case GL_SWIZZLE_STQ_DQ_ATI:

+/* make sure q is not 0 to avoid problems later with infinite values (texture lookup)? */

+      if (q == 0.0F)

+         q = 0.000000001F;

+      values[0] = s / q;

+      values[1] = t / q;

+      values[2] = 1.0F / q;

+      break;

+   }

+   values[3] = 0.0;

+}

+

+static void

+apply_src_rep(GLint optype, GLuint rep, GLfloat * val)

+{

+   GLint i;

+   GLint start, end;

+   if (!rep)

+      return;

+

+   start = optype ? 3 : 0;

+   end = 4;

+

+   for (i = start; i < end; i++) {

+      switch (rep) {

+      case GL_RED:

+	 val[i] = val[0];

+	 break;

+      case GL_GREEN:

+	 val[i] = val[1];

+	 break;

+      case GL_BLUE:

+	 val[i] = val[2];

+	 break;

+      case GL_ALPHA:

+	 val[i] = val[3];

+	 break;

+      }

+   }

+}

+

+static void

+apply_src_mod(GLint optype, GLuint mod, GLfloat * val)

+{

+   GLint i;

+   GLint start, end;

+

+   if (!mod)

+      return;

+

+   start = optype ? 3 : 0;

+   end = 4;

+

+   for (i = start; i < end; i++) {

+      if (mod & GL_COMP_BIT_ATI)

+	 val[i] = 1 - val[i];

+

+      if (mod & GL_BIAS_BIT_ATI)

+	 val[i] = val[i] - 0.5F;

+

+      if (mod & GL_2X_BIT_ATI)

+	 val[i] = 2 * val[i];

+

+      if (mod & GL_NEGATE_BIT_ATI)

+	 val[i] = -val[i];

+   }

+}

+

+static void

+apply_dst_mod(GLuint optype, GLuint mod, GLfloat * val)

+{

+   GLint i;

+   GLint has_sat = mod & GL_SATURATE_BIT_ATI;

+   GLint start, end;

+

+   mod &= ~GL_SATURATE_BIT_ATI;

+

+   start = optype ? 3 : 0;

+   end = optype ? 4 : 3;

+

+   for (i = start; i < end; i++) {

+      switch (mod) {

+      case GL_2X_BIT_ATI:

+	 val[i] = 2 * val[i];

+	 break;

+      case GL_4X_BIT_ATI:

+	 val[i] = 4 * val[i];

+	 break;

+      case GL_8X_BIT_ATI:

+	 val[i] = 8 * val[i];

+	 break;

+      case GL_HALF_BIT_ATI:

+	 val[i] = val[i] * 0.5F;

+	 break;

+      case GL_QUARTER_BIT_ATI:

+	 val[i] = val[i] * 0.25F;

+	 break;

+      case GL_EIGHTH_BIT_ATI:

+	 val[i] = val[i] * 0.125F;

+	 break;

+      }

+

+      if (has_sat) {

+	 if (val[i] < 0.0F)

+	    val[i] = 0.0F;

+	 else if (val[i] > 1.0F)

+	    val[i] = 1.0F;

+      }

+      else {

+	 if (val[i] < -8.0F)

+	    val[i] = -8.0F;

+	 else if (val[i] > 8.0F)

+	    val[i] = 8.0F;

+      }

+   }

+}

+

+

+static void

+write_dst_addr(GLuint optype, GLuint mod, GLuint mask, GLfloat * src,

+	       GLfloat * dst)

+{

+   GLint i;

+   apply_dst_mod(optype, mod, src);

+

+   if (optype == ATI_FRAGMENT_SHADER_COLOR_OP) {

+      if (mask) {

+	 if (mask & GL_RED_BIT_ATI)

+	    dst[0] = src[0];

+

+	 if (mask & GL_GREEN_BIT_ATI)

+	    dst[1] = src[1];

+

+	 if (mask & GL_BLUE_BIT_ATI)

+	    dst[2] = src[2];

+      }

+      else {

+	 for (i = 0; i < 3; i++)

+	    dst[i] = src[i];

+      }

+   }

+   else

+      dst[3] = src[3];

+}

+

+static void

+finish_pass(struct atifs_machine *machine)

+{

+   GLint i;

+

+   for (i = 0; i < 6; i++) {

+      COPY_4V(machine->PrevPassRegisters[i], machine->Registers[i]);

+   }

+}

+

+struct ati_fs_opcode_st ati_fs_opcodes[] = {

+   {GL_ADD_ATI, 2},

+   {GL_SUB_ATI, 2},

+   {GL_MUL_ATI, 2},

+   {GL_MAD_ATI, 3},

+   {GL_LERP_ATI, 3},

+   {GL_MOV_ATI, 1},

+   {GL_CND_ATI, 3},

+   {GL_CND0_ATI, 3},

+   {GL_DOT2_ADD_ATI, 3},

+   {GL_DOT3_ATI, 2},

+   {GL_DOT4_ATI, 2}

+};

+

+

+

+static void

+handle_pass_op(struct atifs_machine *machine, struct atifs_setupinst *texinst,

+	       const SWspan *span, GLuint column, GLuint idx)

+{

+   GLuint swizzle = texinst->swizzle;

+   GLuint pass_tex = texinst->src;

+

+   if (pass_tex >= GL_TEXTURE0_ARB && pass_tex <= GL_TEXTURE7_ARB) {

+      pass_tex -= GL_TEXTURE0_ARB;

+      COPY_4V(machine->Registers[idx],

+	      span->array->attribs[FRAG_ATTRIB_TEX0 + pass_tex][column]);

+   }

+   else if (pass_tex >= GL_REG_0_ATI && pass_tex <= GL_REG_5_ATI) {

+      pass_tex -= GL_REG_0_ATI;

+      COPY_4V(machine->Registers[idx], machine->PrevPassRegisters[pass_tex]);

+   }

+   apply_swizzle(machine->Registers[idx], swizzle);

+

+}

+

+static void

+handle_sample_op(struct gl_context * ctx, struct atifs_machine *machine,

+		 struct atifs_setupinst *texinst, const SWspan *span,

+		 GLuint column, GLuint idx)

+{

+/* sample from unit idx using texinst->src as coords */

+   GLuint swizzle = texinst->swizzle;

+   GLuint coord_source = texinst->src;

+   GLfloat tex_coords[4] = { 0 };

+

+   if (coord_source >= GL_TEXTURE0_ARB && coord_source <= GL_TEXTURE7_ARB) {

+      coord_source -= GL_TEXTURE0_ARB;

+      COPY_4V(tex_coords,

+              span->array->attribs[FRAG_ATTRIB_TEX0 + coord_source][column]);

+   }

+   else if (coord_source >= GL_REG_0_ATI && coord_source <= GL_REG_5_ATI) {

+      coord_source -= GL_REG_0_ATI;

+      COPY_4V(tex_coords, machine->PrevPassRegisters[coord_source]);

+   }

+   apply_swizzle(tex_coords, swizzle);

+   fetch_texel(ctx, tex_coords, 0.0F, idx, machine->Registers[idx]);

+}

+

+#define SETUP_SRC_REG(optype, i, x)		\

+do {						\

+   COPY_4V(src[optype][i], x); 			\

+} while (0)

+

+

+

+/**

+ * Execute the given fragment shader.

+ * NOTE: we do everything in single-precision floating point

+ * \param ctx - rendering context

+ * \param shader - the shader to execute

+ * \param machine - virtual machine state

+ * \param span - the SWspan we're operating on

+ * \param column - which pixel [i] we're operating on in the span

+ */

+static void

+execute_shader(struct gl_context *ctx, const struct ati_fragment_shader *shader,

+	       struct atifs_machine *machine, const SWspan *span,

+               GLuint column)

+{

+   GLuint pc;

+   struct atifs_instruction *inst;

+   struct atifs_setupinst *texinst;

+   GLint optype;

+   GLuint i;

+   GLint j, pass;

+   GLint dstreg;

+   GLfloat src[2][3][4];

+   GLfloat zeros[4] = { 0.0, 0.0, 0.0, 0.0 };

+   GLfloat ones[4] = { 1.0, 1.0, 1.0, 1.0 };

+   GLfloat dst[2][4], *dstp;

+

+   for (pass = 0; pass < shader->NumPasses; pass++) {

+      if (pass > 0)

+	 finish_pass(machine);

+      for (j = 0; j < MAX_NUM_FRAGMENT_REGISTERS_ATI; j++) {

+	 texinst = &shader->SetupInst[pass][j];

+	 if (texinst->Opcode == ATI_FRAGMENT_SHADER_PASS_OP)

+	    handle_pass_op(machine, texinst, span, column, j);

+	 else if (texinst->Opcode == ATI_FRAGMENT_SHADER_SAMPLE_OP)

+	    handle_sample_op(ctx, machine, texinst, span, column, j);

+      }

+

+      for (pc = 0; pc < shader->numArithInstr[pass]; pc++) {

+	 inst = &shader->Instructions[pass][pc];

+

+	 /* setup the source registers for color and alpha ops */

+	 for (optype = 0; optype < 2; optype++) {

+ 	    for (i = 0; i < inst->ArgCount[optype]; i++) {

+	       GLint index = inst->SrcReg[optype][i].Index;

+

+	       if (index >= GL_REG_0_ATI && index <= GL_REG_5_ATI)

+		  SETUP_SRC_REG(optype, i,

+				machine->Registers[index - GL_REG_0_ATI]);

+	       else if (index >= GL_CON_0_ATI && index <= GL_CON_7_ATI) {

+		  if (shader->LocalConstDef & (1 << (index - GL_CON_0_ATI))) {

+		     SETUP_SRC_REG(optype, i,

+				shader->Constants[index - GL_CON_0_ATI]);

+		  } else {

+		     SETUP_SRC_REG(optype, i,

+				ctx->ATIFragmentShader.GlobalConstants[index - GL_CON_0_ATI]);

+		  }

+	       }

+	       else if (index == GL_ONE)

+		  SETUP_SRC_REG(optype, i, ones);

+	       else if (index == GL_ZERO)

+		  SETUP_SRC_REG(optype, i, zeros);

+	       else if (index == GL_PRIMARY_COLOR_EXT)

+		  SETUP_SRC_REG(optype, i,

+				machine->Inputs[ATI_FS_INPUT_PRIMARY]);

+	       else if (index == GL_SECONDARY_INTERPOLATOR_ATI)

+		  SETUP_SRC_REG(optype, i,

+				machine->Inputs[ATI_FS_INPUT_SECONDARY]);

+

+	       apply_src_rep(optype, inst->SrcReg[optype][i].argRep,

+			     src[optype][i]);

+	       apply_src_mod(optype, inst->SrcReg[optype][i].argMod,

+			     src[optype][i]);

+	    }

+	 }

+

+	 /* Execute the operations - color then alpha */

+	 for (optype = 0; optype < 2; optype++) {

+	    if (inst->Opcode[optype]) {

+	       switch (inst->Opcode[optype]) {

+	       case GL_ADD_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   src[optype][0][i] + src[optype][1][i];

+		     }

+		  else

+		     dst[optype][3] = src[optype][0][3] + src[optype][1][3];

+		  break;

+	       case GL_SUB_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   src[optype][0][i] - src[optype][1][i];

+		     }

+		  else

+		     dst[optype][3] = src[optype][0][3] - src[optype][1][3];

+		  break;

+	       case GL_MUL_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   src[optype][0][i] * src[optype][1][i];

+		     }

+		  else

+		     dst[optype][3] = src[optype][0][3] * src[optype][1][3];

+		  break;

+	       case GL_MAD_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   src[optype][0][i] * src[optype][1][i] +

+			   src[optype][2][i];

+		     }

+		  else

+		     dst[optype][3] =

+			src[optype][0][3] * src[optype][1][3] +

+			src[optype][2][3];

+		  break;

+	       case GL_LERP_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   src[optype][0][i] * src[optype][1][i] + (1 -

+								    src

+								    [optype]

+								    [0][i]) *

+			   src[optype][2][i];

+		     }

+		  else

+		     dst[optype][3] =

+			src[optype][0][3] * src[optype][1][3] + (1 -

+								 src[optype]

+								 [0][3]) *

+			src[optype][2][3];

+		  break;

+

+	       case GL_MOV_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] = src[optype][0][i];

+		     }

+		  else

+		     dst[optype][3] = src[optype][0][3];

+		  break;

+	       case GL_CND_ATI:

+		  if (!optype) {

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   (src[optype][2][i] >

+			    0.5) ? src[optype][0][i] : src[optype][1][i];

+		     }

+		  }

+		  else {

+		     dst[optype][3] =

+			(src[optype][2][3] >

+			 0.5) ? src[optype][0][3] : src[optype][1][3];

+		  }

+		  break;

+

+	       case GL_CND0_ATI:

+		  if (!optype)

+		     for (i = 0; i < 3; i++) {

+			dst[optype][i] =

+			   (src[optype][2][i] >=

+			    0) ? src[optype][0][i] : src[optype][1][i];

+		     }

+		  else {

+		     dst[optype][3] =

+			(src[optype][2][3] >=

+			 0) ? src[optype][0][3] : src[optype][1][3];

+		  }

+		  break;

+	       case GL_DOT2_ADD_ATI:

+		  {

+		     GLfloat result;

+

+		     /* DOT 2 always uses the source from the color op */

+		     /* could save recalculation of dot products for alpha inst */

+		     result = src[0][0][0] * src[0][1][0] +

+			src[0][0][1] * src[0][1][1] + src[0][2][2];

+		     if (!optype) {

+			for (i = 0; i < 3; i++) {

+			   dst[optype][i] = result;

+			}

+		     }

+		     else

+			dst[optype][3] = result;

+		  }

+		  break;

+	       case GL_DOT3_ATI:

+		  {

+		     GLfloat result;

+

+		     /* DOT 3 always uses the source from the color op */

+		     result = src[0][0][0] * src[0][1][0] +

+			src[0][0][1] * src[0][1][1] +

+			src[0][0][2] * src[0][1][2];

+

+		     if (!optype) {

+			for (i = 0; i < 3; i++) {

+			   dst[optype][i] = result;

+			}

+		     }

+		     else

+			dst[optype][3] = result;

+		  }

+		  break;

+	       case GL_DOT4_ATI:

+		  {

+		     GLfloat result;

+

+		     /* DOT 4 always uses the source from the color op */

+		     result = src[0][0][0] * src[0][1][0] +

+			src[0][0][1] * src[0][1][1] +

+			src[0][0][2] * src[0][1][2] +

+			src[0][0][3] * src[0][1][3];

+		     if (!optype) {

+			for (i = 0; i < 3; i++) {

+			   dst[optype][i] = result;

+			}

+		     }

+		     else

+			dst[optype][3] = result;

+		  }

+		  break;

+

+	       }

+	    }

+	 }

+

+	 /* write out the destination registers */

+	 for (optype = 0; optype < 2; optype++) {

+	    if (inst->Opcode[optype]) {

+	       dstreg = inst->DstReg[optype].Index;

+	       dstp = machine->Registers[dstreg - GL_REG_0_ATI];

+

+	       if ((optype == 0) || ((inst->Opcode[1] != GL_DOT2_ADD_ATI) &&

+		  (inst->Opcode[1] != GL_DOT3_ATI) && (inst->Opcode[1] != GL_DOT4_ATI)))

+	          write_dst_addr(optype, inst->DstReg[optype].dstMod,

+			      inst->DstReg[optype].dstMask, dst[optype],

+			      dstp);

+	       else

+		  write_dst_addr(1, inst->DstReg[0].dstMod, 0, dst[1], dstp);

+	    }

+	 }

+      }

+   }

+}

+

+

+/**

+ * Init fragment shader virtual machine state.

+ */

+static void

+init_machine(struct gl_context * ctx, struct atifs_machine *machine,

+	     const struct ati_fragment_shader *shader,

+	     const SWspan *span, GLuint col)

+{

+   GLfloat (*inputs)[4] = machine->Inputs;

+   GLint i, j;

+

+   for (i = 0; i < 6; i++) {

+      for (j = 0; j < 4; j++)

+	 machine->Registers[i][j] = 0.0;

+   }

+

+   COPY_4V(inputs[ATI_FS_INPUT_PRIMARY], span->array->attribs[FRAG_ATTRIB_COL0][col]);

+   COPY_4V(inputs[ATI_FS_INPUT_SECONDARY], span->array->attribs[FRAG_ATTRIB_COL1][col]);

+}

+

+

+

+/**

+ * Execute the current ATI shader program, operating on the given span.

+ */

+void

+_swrast_exec_fragment_shader(struct gl_context * ctx, SWspan *span)

+{

+   const struct ati_fragment_shader *shader = ctx->ATIFragmentShader.Current;

+   struct atifs_machine machine;

+   GLuint i;

+

+   /* incoming colors should be floats */

+   ASSERT(span->array->ChanType == GL_FLOAT);

+

+   for (i = 0; i < span->end; i++) {

+      if (span->array->mask[i]) {

+	 init_machine(ctx, &machine, shader, span, i);

+

+	 execute_shader(ctx, shader, &machine, span, i);

+

+         /* store result color */

+	 {

+	    const GLfloat *colOut = machine.Registers[0];

+            /*fprintf(stderr,"outputs %f %f %f %f\n",

+              colOut[0], colOut[1], colOut[2], colOut[3]); */

+            COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i], colOut);

+	 }

+      }

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_atifragshader.h b/mesalib/src/mesa/swrast/s_atifragshader.h
index cce455a04..16ed86fd7 100644
--- a/mesalib/src/mesa/swrast/s_atifragshader.h
+++ b/mesalib/src/mesa/swrast/s_atifragshader.h
@@ -1,38 +1,38 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- *
- * Copyright (C) 1999-2003  David Airlie   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
- * DAVID AIRLIE 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 S_ATIFRAGSHADER_H
-#define S_ATIFRAGSHADER_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern void
-_swrast_exec_fragment_shader( GLcontext *ctx, SWspan *span );
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.1

+ *

+ * Copyright (C) 1999-2003  David Airlie   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

+ * DAVID AIRLIE 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 S_ATIFRAGSHADER_H

+#define S_ATIFRAGSHADER_H

+

+

+#include "s_span.h"

+

+struct gl_context;

+

+extern void

+_swrast_exec_fragment_shader( struct gl_context *ctx, SWspan *span );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_bitmap.c b/mesalib/src/mesa/swrast/s_bitmap.c
index da730213a..9b52e9053 100644
--- a/mesalib/src/mesa/swrast/s_bitmap.c
+++ b/mesalib/src/mesa/swrast/s_bitmap.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.
- */
-
-/**
- * \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 "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( GLcontext *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( GLcontext *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 "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_blend.c b/mesalib/src/mesa/swrast/s_blend.c
index 5b090c72c..d2684b79e 100644
--- a/mesalib/src/mesa/swrast/s_blend.c
+++ b/mesalib/src/mesa/swrast/s_blend.c
@@ -1,1002 +1,1014 @@
-/*
- * 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_blend.c
- * \brief software blending.
- * \author Brian Paul
- *
- * Only a few blend modes have been optimized (min, max, transparency, add)
- * more optimized cases can easily be added if needed.
- * Celestia uses glBlendFunc(GL_SRC_ALPHA, GL_ONE), for example.
- */
-
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-
-#include "s_blend.h"
-#include "s_context.h"
-#include "s_span.h"
-
-
-#if defined(USE_MMX_ASM)
-#include "x86/mmx.h"
-#include "x86/common_x86_asm.h"
-#define _BLENDAPI _ASMAPI
-#else
-#define _BLENDAPI
-#endif
-
-
-/**
- * Integer divide by 255
- * Declare "int divtemp" before using.
- * This satisfies Glean and should be reasonably fast.
- * Contributed by Nathan Hand.
- */
-#define DIV255(X)  (divtemp = (X), ((divtemp << 8) + divtemp + 256) >> 16)
-
-
-
-/**
- * Special case for glBlendFunc(GL_ZERO, GL_ONE).
- * No-op means the framebuffer values remain unchanged.
- * Any chanType ok.
- */
-static void _BLENDAPI
-blend_noop(GLcontext *ctx, GLuint n, const GLubyte mask[],
-           GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLint bytes;
-
-   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendSrcRGB == GL_ZERO);
-   ASSERT(ctx->Color.BlendDstRGB == GL_ONE);
-   (void) ctx;
-
-   /* just memcpy */
-   if (chanType == GL_UNSIGNED_BYTE)
-      bytes = 4 * n * sizeof(GLubyte);
-   else if (chanType == GL_UNSIGNED_SHORT)
-      bytes = 4 * n * sizeof(GLushort);
-   else
-      bytes = 4 * n * sizeof(GLfloat);
-
-   memcpy(src, dst, bytes);
-}
-
-
-/**
- * Special case for glBlendFunc(GL_ONE, GL_ZERO)
- * Any chanType ok.
- */
-static void _BLENDAPI
-blend_replace(GLcontext *ctx, GLuint n, const GLubyte mask[],
-              GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendSrcRGB == GL_ONE);
-   ASSERT(ctx->Color.BlendDstRGB == GL_ZERO);
-   (void) ctx;
-   (void) n;
-   (void) mask;
-   (void) src;
-   (void) dst;
-}
-
-
-/**
- * Common transparency blending mode:
- * glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA).
- */
-static void _BLENDAPI
-blend_transparency_ubyte(GLcontext *ctx, GLuint n, const GLubyte mask[],
-                         GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;
-   const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;
-   GLuint i;
-
-   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendSrcRGB == GL_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendSrcA == GL_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendDstRGB == GL_ONE_MINUS_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendDstA == GL_ONE_MINUS_SRC_ALPHA);
-   ASSERT(chanType == GL_UNSIGNED_BYTE);
-
-   (void) ctx;
-
-   for (i = 0; i < n; i++) {
-      if (mask[i]) {
-         const GLint t = rgba[i][ACOMP];  /* t is in [0, 255] */
-         if (t == 0) {
-            /* 0% alpha */
-            COPY_4UBV(rgba[i], dest[i]);
-         }
-         else if (t != 255) {
-	    GLint divtemp;
-            const GLint r = DIV255((rgba[i][RCOMP] - dest[i][RCOMP]) * t) + dest[i][RCOMP];
-            const GLint g = DIV255((rgba[i][GCOMP] - dest[i][GCOMP]) * t) + dest[i][GCOMP];
-            const GLint b = DIV255((rgba[i][BCOMP] - dest[i][BCOMP]) * t) + dest[i][BCOMP];
-            const GLint a = DIV255((rgba[i][ACOMP] - dest[i][ACOMP]) * t) + dest[i][ACOMP]; 
-            ASSERT(r <= 255);
-            ASSERT(g <= 255);
-            ASSERT(b <= 255);
-            ASSERT(a <= 255);
-            rgba[i][RCOMP] = (GLubyte) r;
-            rgba[i][GCOMP] = (GLubyte) g;
-            rgba[i][BCOMP] = (GLubyte) b;
-            rgba[i][ACOMP] = (GLubyte) a;
-         }
-      }
-   }
-}
-
-
-static void _BLENDAPI
-blend_transparency_ushort(GLcontext *ctx, GLuint n, const GLubyte mask[],
-                          GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLushort (*rgba)[4] = (GLushort (*)[4]) src;
-   const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;
-   GLuint i;
-
-   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendSrcRGB == GL_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendSrcA == GL_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendDstRGB == GL_ONE_MINUS_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendDstA == GL_ONE_MINUS_SRC_ALPHA);
-   ASSERT(chanType == GL_UNSIGNED_SHORT);
-
-   (void) ctx;
-
-   for (i = 0; i < n; i++) {
-      if (mask[i]) {
-         const GLint t = rgba[i][ACOMP];
-         if (t == 0) {
-            /* 0% alpha */
-            COPY_4V(rgba[i], dest[i]);
-         }
-         else if (t != 65535) {
-            const GLfloat tt = (GLfloat) t / 65535.0F;
-            GLushort r = (GLushort) ((rgba[i][RCOMP] - dest[i][RCOMP]) * tt + dest[i][RCOMP]);
-            GLushort g = (GLushort) ((rgba[i][GCOMP] - dest[i][GCOMP]) * tt + dest[i][GCOMP]);
-            GLushort b = (GLushort) ((rgba[i][BCOMP] - dest[i][BCOMP]) * tt + dest[i][BCOMP]);
-            GLushort a = (GLushort) ((rgba[i][ACOMP] - dest[i][ACOMP]) * tt + dest[i][ACOMP]);
-            ASSIGN_4V(rgba[i], r, g, b, a);
-         }
-      }
-   }
-}
-
-
-static void _BLENDAPI
-blend_transparency_float(GLcontext *ctx, GLuint n, const GLubyte mask[],
-                         GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;
-   const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;
-   GLuint i;
-
-   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendSrcRGB == GL_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendSrcA == GL_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendDstRGB == GL_ONE_MINUS_SRC_ALPHA);
-   ASSERT(ctx->Color.BlendDstA == GL_ONE_MINUS_SRC_ALPHA);
-   ASSERT(chanType == GL_FLOAT);
-
-   (void) ctx;
-
-   for (i = 0; i < n; i++) {
-      if (mask[i]) {
-         const GLfloat t = rgba[i][ACOMP];  /* t in [0, 1] */
-         if (t == 0.0F) {
-            /* 0% alpha */
-            COPY_4V(rgba[i], dest[i]);
-         }
-         else if (t != 1.0F) {
-            GLfloat r = (rgba[i][RCOMP] - dest[i][RCOMP]) * t + dest[i][RCOMP];
-            GLfloat g = (rgba[i][GCOMP] - dest[i][GCOMP]) * t + dest[i][GCOMP];
-            GLfloat b = (rgba[i][BCOMP] - dest[i][BCOMP]) * t + dest[i][BCOMP];
-            GLfloat a = (rgba[i][ACOMP] - dest[i][ACOMP]) * t + dest[i][ACOMP];
-            ASSIGN_4V(rgba[i], r, g, b, a);
-         }
-      }
-   }
-}
-
-
-
-/**
- * Add src and dest: glBlendFunc(GL_ONE, GL_ONE).
- * Any chanType ok.
- */
-static void _BLENDAPI
-blend_add(GLcontext *ctx, GLuint n, const GLubyte mask[],
-          GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLuint i;
-
-   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);
-   ASSERT(ctx->Color.BlendSrcRGB == GL_ONE);
-   ASSERT(ctx->Color.BlendDstRGB == GL_ONE);
-   (void) ctx;
-
-   if (chanType == GL_UNSIGNED_BYTE) {
-      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;
-      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            GLint r = rgba[i][RCOMP] + dest[i][RCOMP];
-            GLint g = rgba[i][GCOMP] + dest[i][GCOMP];
-            GLint b = rgba[i][BCOMP] + dest[i][BCOMP];
-            GLint a = rgba[i][ACOMP] + dest[i][ACOMP];
-            rgba[i][RCOMP] = (GLubyte) MIN2( r, 255 );
-            rgba[i][GCOMP] = (GLubyte) MIN2( g, 255 );
-            rgba[i][BCOMP] = (GLubyte) MIN2( b, 255 );
-            rgba[i][ACOMP] = (GLubyte) MIN2( a, 255 );
-         }
-      }
-   }
-   else if (chanType == GL_UNSIGNED_SHORT) {
-      GLushort (*rgba)[4] = (GLushort (*)[4]) src;
-      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            GLint r = rgba[i][RCOMP] + dest[i][RCOMP];
-            GLint g = rgba[i][GCOMP] + dest[i][GCOMP];
-            GLint b = rgba[i][BCOMP] + dest[i][BCOMP];
-            GLint a = rgba[i][ACOMP] + dest[i][ACOMP];
-            rgba[i][RCOMP] = (GLshort) MIN2( r, 255 );
-            rgba[i][GCOMP] = (GLshort) MIN2( g, 255 );
-            rgba[i][BCOMP] = (GLshort) MIN2( b, 255 );
-            rgba[i][ACOMP] = (GLshort) MIN2( a, 255 );
-         }
-      }
-   }
-   else {
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;
-      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;
-      ASSERT(chanType == GL_FLOAT);
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            /* don't RGB clamp to max */
-            rgba[i][RCOMP] += dest[i][RCOMP];
-            rgba[i][GCOMP] += dest[i][GCOMP];
-            rgba[i][BCOMP] += dest[i][BCOMP];
-            rgba[i][ACOMP] += dest[i][ACOMP];
-         }
-      }
-   }
-}
-
-
-
-/**
- * Blend min function.
- * Any chanType ok.
- */
-static void _BLENDAPI
-blend_min(GLcontext *ctx, GLuint n, const GLubyte mask[],
-          GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLuint i;
-   ASSERT(ctx->Color.BlendEquationRGB == GL_MIN);
-   ASSERT(ctx->Color.BlendEquationA == GL_MIN);
-   (void) ctx;
-
-   if (chanType == GL_UNSIGNED_BYTE) {
-      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;
-      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = MIN2( rgba[i][RCOMP], dest[i][RCOMP] );
-            rgba[i][GCOMP] = MIN2( rgba[i][GCOMP], dest[i][GCOMP] );
-            rgba[i][BCOMP] = MIN2( rgba[i][BCOMP], dest[i][BCOMP] );
-            rgba[i][ACOMP] = MIN2( rgba[i][ACOMP], dest[i][ACOMP] );
-         }
-      }
-   }
-   else if (chanType == GL_UNSIGNED_SHORT) {
-      GLushort (*rgba)[4] = (GLushort (*)[4]) src;
-      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = MIN2( rgba[i][RCOMP], dest[i][RCOMP] );
-            rgba[i][GCOMP] = MIN2( rgba[i][GCOMP], dest[i][GCOMP] );
-            rgba[i][BCOMP] = MIN2( rgba[i][BCOMP], dest[i][BCOMP] );
-            rgba[i][ACOMP] = MIN2( rgba[i][ACOMP], dest[i][ACOMP] );
-         }
-      }
-   }
-   else {
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;
-      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;
-      ASSERT(chanType == GL_FLOAT);
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = MIN2( rgba[i][RCOMP], dest[i][RCOMP] );
-            rgba[i][GCOMP] = MIN2( rgba[i][GCOMP], dest[i][GCOMP] );
-            rgba[i][BCOMP] = MIN2( rgba[i][BCOMP], dest[i][BCOMP] );
-            rgba[i][ACOMP] = MIN2( rgba[i][ACOMP], dest[i][ACOMP] );
-         }
-      }
-   }
-}
-
-
-/**
- * Blend max function.
- * Any chanType ok.
- */
-static void _BLENDAPI
-blend_max(GLcontext *ctx, GLuint n, const GLubyte mask[],
-          GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLuint i;
-   ASSERT(ctx->Color.BlendEquationRGB == GL_MAX);
-   ASSERT(ctx->Color.BlendEquationA == GL_MAX);
-   (void) ctx;
-
-   if (chanType == GL_UNSIGNED_BYTE) {
-      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;
-      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = MAX2( rgba[i][RCOMP], dest[i][RCOMP] );
-            rgba[i][GCOMP] = MAX2( rgba[i][GCOMP], dest[i][GCOMP] );
-            rgba[i][BCOMP] = MAX2( rgba[i][BCOMP], dest[i][BCOMP] );
-            rgba[i][ACOMP] = MAX2( rgba[i][ACOMP], dest[i][ACOMP] );
-         }
-      }
-   }
-   else if (chanType == GL_UNSIGNED_SHORT) {
-      GLushort (*rgba)[4] = (GLushort (*)[4]) src;
-      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = MAX2( rgba[i][RCOMP], dest[i][RCOMP] );
-            rgba[i][GCOMP] = MAX2( rgba[i][GCOMP], dest[i][GCOMP] );
-            rgba[i][BCOMP] = MAX2( rgba[i][BCOMP], dest[i][BCOMP] );
-            rgba[i][ACOMP] = MAX2( rgba[i][ACOMP], dest[i][ACOMP] );
-         }
-      }
-   }
-   else {
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;
-      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;
-      ASSERT(chanType == GL_FLOAT);
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = MAX2( rgba[i][RCOMP], dest[i][RCOMP] );
-            rgba[i][GCOMP] = MAX2( rgba[i][GCOMP], dest[i][GCOMP] );
-            rgba[i][BCOMP] = MAX2( rgba[i][BCOMP], dest[i][BCOMP] );
-            rgba[i][ACOMP] = MAX2( rgba[i][ACOMP], dest[i][ACOMP] );
-         }
-      }
-   }
-}
-
-
-
-/**
- * Modulate:  result = src * dest
- * Any chanType ok.
- */
-static void _BLENDAPI
-blend_modulate(GLcontext *ctx, GLuint n, const GLubyte mask[],
-               GLvoid *src, const GLvoid *dst, GLenum chanType)
-{
-   GLuint i;
-   (void) ctx;
-
-   if (chanType == GL_UNSIGNED_BYTE) {
-      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;
-      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-	    GLint divtemp;
-            rgba[i][RCOMP] = DIV255(rgba[i][RCOMP] * dest[i][RCOMP]);
-            rgba[i][GCOMP] = DIV255(rgba[i][GCOMP] * dest[i][GCOMP]);
-            rgba[i][BCOMP] = DIV255(rgba[i][BCOMP] * dest[i][BCOMP]);
-            rgba[i][ACOMP] = DIV255(rgba[i][ACOMP] * dest[i][ACOMP]);
-         }
-      }
-   }
-   else if (chanType == GL_UNSIGNED_SHORT) {
-      GLushort (*rgba)[4] = (GLushort (*)[4]) src;
-      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = (rgba[i][RCOMP] * dest[i][RCOMP] + 65535) >> 16;
-            rgba[i][GCOMP] = (rgba[i][GCOMP] * dest[i][GCOMP] + 65535) >> 16;
-            rgba[i][BCOMP] = (rgba[i][BCOMP] * dest[i][BCOMP] + 65535) >> 16;
-            rgba[i][ACOMP] = (rgba[i][ACOMP] * dest[i][ACOMP] + 65535) >> 16;
-         }
-      }
-   }
-   else {
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;
-      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;
-      ASSERT(chanType == GL_FLOAT);
-      for (i=0;i<n;i++) {
-         if (mask[i]) {
-            rgba[i][RCOMP] = rgba[i][RCOMP] * dest[i][RCOMP];
-            rgba[i][GCOMP] = rgba[i][GCOMP] * dest[i][GCOMP];
-            rgba[i][BCOMP] = rgba[i][BCOMP] * dest[i][BCOMP];
-            rgba[i][ACOMP] = rgba[i][ACOMP] * dest[i][ACOMP];
-         }
-      }
-   }
-}
-
-
-/**
- * Do any blending operation, using floating point.
- * \param n  number of pixels
- * \param mask  fragment writemask array
- * \param rgba  array of incoming (and modified) pixels
- * \param dest  array of pixels from the dest color buffer
- */
-static void
-blend_general_float(GLcontext *ctx, GLuint n, const GLubyte mask[],
-                    GLfloat rgba[][4], GLfloat dest[][4],
-                    GLenum chanType)
-{
-   GLuint i;
-
-   for (i = 0; i < n; i++) {
-      if (mask[i]) {
-         /* Incoming/source Color */
-         const GLfloat Rs = rgba[i][RCOMP];
-         const GLfloat Gs = rgba[i][GCOMP];
-         const GLfloat Bs = rgba[i][BCOMP];
-         const GLfloat As = rgba[i][ACOMP];
-
-         /* Frame buffer/dest color */
-         const GLfloat Rd = dest[i][RCOMP];
-         const GLfloat Gd = dest[i][GCOMP];
-         const GLfloat Bd = dest[i][BCOMP];
-         const GLfloat Ad = dest[i][ACOMP];
-
-         GLfloat sR, sG, sB, sA;  /* Source factor */
-         GLfloat dR, dG, dB, dA;  /* Dest factor */
-         GLfloat r, g, b, a;      /* result color */
-
-         /* XXX for the case of constant blend terms we could init
-          * the sX and dX variables just once before the loop.
-          */
-
-         /* Source RGB factor */
-         switch (ctx->Color.BlendSrcRGB) {
-            case GL_ZERO:
-               sR = sG = sB = 0.0F;
-               break;
-            case GL_ONE:
-               sR = sG = sB = 1.0F;
-               break;
-            case GL_DST_COLOR:
-               sR = Rd;
-               sG = Gd;
-               sB = Bd;
-               break;
-            case GL_ONE_MINUS_DST_COLOR:
-               sR = 1.0F - Rd;
-               sG = 1.0F - Gd;
-               sB = 1.0F - Bd;
-               break;
-            case GL_SRC_ALPHA:
-               sR = sG = sB = As;
-               break;
-            case GL_ONE_MINUS_SRC_ALPHA:
-               sR = sG = sB = 1.0F - As;
-               break;
-            case GL_DST_ALPHA:
-               sR = sG = sB = Ad;
-               break;
-            case GL_ONE_MINUS_DST_ALPHA:
-               sR = sG = sB = 1.0F - Ad;
-               break;
-            case GL_SRC_ALPHA_SATURATE:
-               if (As < 1.0F - Ad) {
-                  sR = sG = sB = As;
-               }
-               else {
-                  sR = sG = sB = 1.0F - Ad;
-               }
-               break;
-            case GL_CONSTANT_COLOR:
-               sR = ctx->Color.BlendColor[0];
-               sG = ctx->Color.BlendColor[1];
-               sB = ctx->Color.BlendColor[2];
-               break;
-            case GL_ONE_MINUS_CONSTANT_COLOR:
-               sR = 1.0F - ctx->Color.BlendColor[0];
-               sG = 1.0F - ctx->Color.BlendColor[1];
-               sB = 1.0F - ctx->Color.BlendColor[2];
-               break;
-            case GL_CONSTANT_ALPHA:
-               sR = sG = sB = ctx->Color.BlendColor[3];
-               break;
-            case GL_ONE_MINUS_CONSTANT_ALPHA:
-               sR = sG = sB = 1.0F - ctx->Color.BlendColor[3];
-               break;
-            case GL_SRC_COLOR:
-               sR = Rs;
-               sG = Gs;
-               sB = Bs;
-               break;
-            case GL_ONE_MINUS_SRC_COLOR:
-               sR = 1.0F - Rs;
-               sG = 1.0F - Gs;
-               sB = 1.0F - Bs;
-               break;
-            default:
-               /* this should never happen */
-               _mesa_problem(ctx, "Bad blend source RGB factor in blend_general_float");
-               return;
-         }
-
-         /* Source Alpha factor */
-         switch (ctx->Color.BlendSrcA) {
-            case GL_ZERO:
-               sA = 0.0F;
-               break;
-            case GL_ONE:
-               sA = 1.0F;
-               break;
-            case GL_DST_COLOR:
-               sA = Ad;
-               break;
-            case GL_ONE_MINUS_DST_COLOR:
-               sA = 1.0F - Ad;
-               break;
-            case GL_SRC_ALPHA:
-               sA = As;
-               break;
-            case GL_ONE_MINUS_SRC_ALPHA:
-               sA = 1.0F - As;
-               break;
-            case GL_DST_ALPHA:
-               sA = Ad;
-               break;
-            case GL_ONE_MINUS_DST_ALPHA:
-               sA = 1.0F - Ad;
-               break;
-            case GL_SRC_ALPHA_SATURATE:
-               sA = 1.0;
-               break;
-            case GL_CONSTANT_COLOR:
-               sA = ctx->Color.BlendColor[3];
-               break;
-            case GL_ONE_MINUS_CONSTANT_COLOR:
-               sA = 1.0F - ctx->Color.BlendColor[3];
-               break;
-            case GL_CONSTANT_ALPHA:
-               sA = ctx->Color.BlendColor[3];
-               break;
-            case GL_ONE_MINUS_CONSTANT_ALPHA:
-               sA = 1.0F - ctx->Color.BlendColor[3];
-               break;
-            case GL_SRC_COLOR:
-               sA = As;
-               break;
-            case GL_ONE_MINUS_SRC_COLOR:
-               sA = 1.0F - As;
-               break;
-            default:
-               /* this should never happen */
-               sA = 0.0F;
-               _mesa_problem(ctx, "Bad blend source A factor in blend_general_float");
-               return;
-         }
-
-         /* Dest RGB factor */
-         switch (ctx->Color.BlendDstRGB) {
-            case GL_ZERO:
-               dR = dG = dB = 0.0F;
-               break;
-            case GL_ONE:
-               dR = dG = dB = 1.0F;
-               break;
-            case GL_SRC_COLOR:
-               dR = Rs;
-               dG = Gs;
-               dB = Bs;
-               break;
-            case GL_ONE_MINUS_SRC_COLOR:
-               dR = 1.0F - Rs;
-               dG = 1.0F - Gs;
-               dB = 1.0F - Bs;
-               break;
-            case GL_SRC_ALPHA:
-               dR = dG = dB = As;
-               break;
-            case GL_ONE_MINUS_SRC_ALPHA:
-               dR = dG = dB = 1.0F - As;
-               break;
-            case GL_DST_ALPHA:
-               dR = dG = dB = Ad;
-               break;
-            case GL_ONE_MINUS_DST_ALPHA:
-               dR = dG = dB = 1.0F - Ad;
-               break;
-            case GL_CONSTANT_COLOR:
-               dR = ctx->Color.BlendColor[0];
-               dG = ctx->Color.BlendColor[1];
-               dB = ctx->Color.BlendColor[2];
-               break;
-            case GL_ONE_MINUS_CONSTANT_COLOR:
-               dR = 1.0F - ctx->Color.BlendColor[0];
-               dG = 1.0F - ctx->Color.BlendColor[1];
-               dB = 1.0F - ctx->Color.BlendColor[2];
-               break;
-            case GL_CONSTANT_ALPHA:
-               dR = dG = dB = ctx->Color.BlendColor[3];
-               break;
-            case GL_ONE_MINUS_CONSTANT_ALPHA:
-               dR = dG = dB = 1.0F - ctx->Color.BlendColor[3];
-               break;
-            case GL_DST_COLOR:
-               dR = Rd;
-               dG = Gd;
-               dB = Bd;
-               break;
-            case GL_ONE_MINUS_DST_COLOR:
-               dR = 1.0F - Rd;
-               dG = 1.0F - Gd;
-               dB = 1.0F - Bd;
-               break;
-            default:
-               /* this should never happen */
-               dR = dG = dB = 0.0F;
-               _mesa_problem(ctx, "Bad blend dest RGB factor in blend_general_float");
-               return;
-         }
-
-         /* Dest Alpha factor */
-         switch (ctx->Color.BlendDstA) {
-            case GL_ZERO:
-               dA = 0.0F;
-               break;
-            case GL_ONE:
-               dA = 1.0F;
-               break;
-            case GL_SRC_COLOR:
-               dA = As;
-               break;
-            case GL_ONE_MINUS_SRC_COLOR:
-               dA = 1.0F - As;
-               break;
-            case GL_SRC_ALPHA:
-               dA = As;
-               break;
-            case GL_ONE_MINUS_SRC_ALPHA:
-               dA = 1.0F - As;
-               break;
-            case GL_DST_ALPHA:
-               dA = Ad;
-               break;
-            case GL_ONE_MINUS_DST_ALPHA:
-               dA = 1.0F - Ad;
-               break;
-            case GL_CONSTANT_COLOR:
-               dA = ctx->Color.BlendColor[3];
-               break;
-            case GL_ONE_MINUS_CONSTANT_COLOR:
-               dA = 1.0F - ctx->Color.BlendColor[3];
-               break;
-            case GL_CONSTANT_ALPHA:
-               dA = ctx->Color.BlendColor[3];
-               break;
-            case GL_ONE_MINUS_CONSTANT_ALPHA:
-               dA = 1.0F - ctx->Color.BlendColor[3];
-               break;
-            case GL_DST_COLOR:
-               dA = Ad;
-               break;
-            case GL_ONE_MINUS_DST_COLOR:
-               dA = 1.0F - Ad;
-               break;
-            default:
-               /* this should never happen */
-               dA = 0.0F;
-               _mesa_problem(ctx, "Bad blend dest A factor in blend_general_float");
-               return;
-         }
-
-         /* compute the blended RGB */
-         switch (ctx->Color.BlendEquationRGB) {
-         case GL_FUNC_ADD:
-            r = Rs * sR + Rd * dR;
-            g = Gs * sG + Gd * dG;
-            b = Bs * sB + Bd * dB;
-            a = As * sA + Ad * dA;
-            break;
-         case GL_FUNC_SUBTRACT:
-            r = Rs * sR - Rd * dR;
-            g = Gs * sG - Gd * dG;
-            b = Bs * sB - Bd * dB;
-            a = As * sA - Ad * dA;
-            break;
-         case GL_FUNC_REVERSE_SUBTRACT:
-            r = Rd * dR - Rs * sR;
-            g = Gd * dG - Gs * sG;
-            b = Bd * dB - Bs * sB;
-            a = Ad * dA - As * sA;
-            break;
-         case GL_MIN:
-	    r = MIN2( Rd, Rs );
-	    g = MIN2( Gd, Gs );
-	    b = MIN2( Bd, Bs );
-            break;
-         case GL_MAX:
-	    r = MAX2( Rd, Rs );
-	    g = MAX2( Gd, Gs );
-	    b = MAX2( Bd, Bs );
-            break;
-	 default:
-            /* should never get here */
-            r = g = b = 0.0F;  /* silence uninitialized var warning */
-            _mesa_problem(ctx, "unexpected BlendEquation in blend_general()");
-            return;
-         }
-
-         /* compute the blended alpha */
-         switch (ctx->Color.BlendEquationA) {
-         case GL_FUNC_ADD:
-            a = As * sA + Ad * dA;
-            break;
-         case GL_FUNC_SUBTRACT:
-            a = As * sA - Ad * dA;
-            break;
-         case GL_FUNC_REVERSE_SUBTRACT:
-            a = Ad * dA - As * sA;
-            break;
-         case GL_MIN:
-	    a = MIN2( Ad, As );
-            break;
-         case GL_MAX:
-	    a = MAX2( Ad, As );
-            break;
-         default:
-            /* should never get here */
-            a = 0.0F;  /* silence uninitialized var warning */
-            _mesa_problem(ctx, "unexpected BlendEquation in blend_general()");
-            return;
-         }
-
-         /* final clamping */
-#if 0
-         rgba[i][RCOMP] = MAX2( r, 0.0F );
-         rgba[i][GCOMP] = MAX2( g, 0.0F );
-         rgba[i][BCOMP] = MAX2( b, 0.0F );
-         rgba[i][ACOMP] = CLAMP( a, 0.0F, 1.0F );
-#else
-         ASSIGN_4V(rgba[i], r, g, b, a);
-#endif
-      }
-   }
-}
-
-
-/**
- * Do any blending operation, any chanType.
- */
-static void
-blend_general(GLcontext *ctx, GLuint n, const GLubyte mask[],
-              void *src, const void *dst, GLenum chanType)
-{
-   GLfloat rgbaF[MAX_WIDTH][4], destF[MAX_WIDTH][4];
-
-   if (chanType == GL_UNSIGNED_BYTE) {
-      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;
-      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;
-      GLuint i;
-      /* convert ubytes to floats */
-      for (i = 0; i < n; i++) {
-         if (mask[i]) {
-            rgbaF[i][RCOMP] = UBYTE_TO_FLOAT(rgba[i][RCOMP]);
-            rgbaF[i][GCOMP] = UBYTE_TO_FLOAT(rgba[i][GCOMP]);
-            rgbaF[i][BCOMP] = UBYTE_TO_FLOAT(rgba[i][BCOMP]);
-            rgbaF[i][ACOMP] = UBYTE_TO_FLOAT(rgba[i][ACOMP]);
-            destF[i][RCOMP] = UBYTE_TO_FLOAT(dest[i][RCOMP]);
-            destF[i][GCOMP] = UBYTE_TO_FLOAT(dest[i][GCOMP]);
-            destF[i][BCOMP] = UBYTE_TO_FLOAT(dest[i][BCOMP]);
-            destF[i][ACOMP] = UBYTE_TO_FLOAT(dest[i][ACOMP]);
-         }
-      }
-      /* do blend */
-      blend_general_float(ctx, n, mask, rgbaF, destF, chanType);
-      /* convert back to ubytes */
-      for (i = 0; i < n; i++) {
-         if (mask[i]) {
-            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][RCOMP], rgbaF[i][RCOMP]);
-            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][GCOMP], rgbaF[i][GCOMP]);
-            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][BCOMP], rgbaF[i][BCOMP]);
-            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][ACOMP], rgbaF[i][ACOMP]);
-         }
-      }
-   }
-   else if (chanType == GL_UNSIGNED_SHORT) {
-      GLushort (*rgba)[4] = (GLushort (*)[4]) src;
-      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;
-      GLuint i;
-      /* convert ushorts to floats */
-      for (i = 0; i < n; i++) {
-         if (mask[i]) {
-            rgbaF[i][RCOMP] = USHORT_TO_FLOAT(rgba[i][RCOMP]);
-            rgbaF[i][GCOMP] = USHORT_TO_FLOAT(rgba[i][GCOMP]);
-            rgbaF[i][BCOMP] = USHORT_TO_FLOAT(rgba[i][BCOMP]);
-            rgbaF[i][ACOMP] = USHORT_TO_FLOAT(rgba[i][ACOMP]);
-            destF[i][RCOMP] = USHORT_TO_FLOAT(dest[i][RCOMP]);
-            destF[i][GCOMP] = USHORT_TO_FLOAT(dest[i][GCOMP]);
-            destF[i][BCOMP] = USHORT_TO_FLOAT(dest[i][BCOMP]);
-            destF[i][ACOMP] = USHORT_TO_FLOAT(dest[i][ACOMP]);
-         }
-      }
-      /* do blend */
-      blend_general_float(ctx, n, mask, rgbaF, destF, chanType);
-      /* convert back to ushorts */
-      for (i = 0; i < n; i++) {
-         if (mask[i]) {
-            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][RCOMP], rgbaF[i][RCOMP]);
-            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][GCOMP], rgbaF[i][GCOMP]);
-            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][BCOMP], rgbaF[i][BCOMP]);
-            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][ACOMP], rgbaF[i][ACOMP]);
-         }
-      }
-   }
-   else {
-      blend_general_float(ctx, n, mask, (GLfloat (*)[4]) src,
-                          (GLfloat (*)[4]) dst, chanType);
-   }
-}
-
-
-
-/**
- * Analyze current blending parameters to pick fastest blending function.
- * Result: the ctx->Color.BlendFunc pointer is updated.
- */
-void
-_swrast_choose_blend_func(GLcontext *ctx, GLenum chanType)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLenum eq = ctx->Color.BlendEquationRGB;
-   const GLenum srcRGB = ctx->Color.BlendSrcRGB;
-   const GLenum dstRGB = ctx->Color.BlendDstRGB;
-   const GLenum srcA = ctx->Color.BlendSrcA;
-   const GLenum dstA = ctx->Color.BlendDstA;
-
-   if (ctx->Color.BlendEquationRGB != ctx->Color.BlendEquationA) {
-      swrast->BlendFunc = blend_general;
-   }
-   else if (eq == GL_MIN) {
-      /* Note: GL_MIN ignores the blending weight factors */
-#if defined(USE_MMX_ASM)
-      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {
-         swrast->BlendFunc = _mesa_mmx_blend_min;
-      }
-      else
-#endif
-         swrast->BlendFunc = blend_min;
-   }
-   else if (eq == GL_MAX) {
-      /* Note: GL_MAX ignores the blending weight factors */
-#if defined(USE_MMX_ASM)
-      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {
-         swrast->BlendFunc = _mesa_mmx_blend_max;
-      }
-      else
-#endif
-         swrast->BlendFunc = blend_max;
-   }
-   else if (srcRGB != srcA || dstRGB != dstA) {
-      swrast->BlendFunc = blend_general;
-   }
-   else if (eq == GL_FUNC_ADD && srcRGB == GL_SRC_ALPHA
-            && dstRGB == GL_ONE_MINUS_SRC_ALPHA) {
-#if defined(USE_MMX_ASM)
-      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {
-         swrast->BlendFunc = _mesa_mmx_blend_transparency;
-      }
-      else
-#endif
-      {
-         if (chanType == GL_UNSIGNED_BYTE)
-            swrast->BlendFunc = blend_transparency_ubyte;
-         else if (chanType == GL_UNSIGNED_SHORT)
-            swrast->BlendFunc = blend_transparency_ushort;
-         else
-            swrast->BlendFunc = blend_transparency_float;
-      }
-   }
-   else if (eq == GL_FUNC_ADD && srcRGB == GL_ONE && dstRGB == GL_ONE) {
-#if defined(USE_MMX_ASM)
-      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {
-         swrast->BlendFunc = _mesa_mmx_blend_add;
-      }
-      else
-#endif
-         swrast->BlendFunc = blend_add;
-   }
-   else if (((eq == GL_FUNC_ADD || eq == GL_FUNC_REVERSE_SUBTRACT)
-	     && (srcRGB == GL_ZERO && dstRGB == GL_SRC_COLOR))
-	    ||
-	    ((eq == GL_FUNC_ADD || eq == GL_FUNC_SUBTRACT)
-	     && (srcRGB == GL_DST_COLOR && dstRGB == GL_ZERO))) {
-#if defined(USE_MMX_ASM)
-      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {
-         swrast->BlendFunc = _mesa_mmx_blend_modulate;
-      }
-      else
-#endif
-         swrast->BlendFunc = blend_modulate;
-   }
-   else if (eq == GL_FUNC_ADD && srcRGB == GL_ZERO && dstRGB == GL_ONE) {
-      swrast->BlendFunc = blend_noop;
-   }
-   else if (eq == GL_FUNC_ADD && srcRGB == GL_ONE && dstRGB == GL_ZERO) {
-      swrast->BlendFunc = blend_replace;
-   }
-   else {
-      swrast->BlendFunc = blend_general;
-   }
-}
-
-
-
-/**
- * Apply the blending operator to a span of pixels.
- * We can handle horizontal runs of pixels (spans) or arrays of x/y
- * pixel coordinates.
- */
-void
-_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb, SWspan *span)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   void *rbPixels;
-
-   ASSERT(span->end <= MAX_WIDTH);
-   ASSERT(span->arrayMask & SPAN_RGBA);
-   ASSERT(rb->DataType == span->array->ChanType);
-   ASSERT(!ctx->Color._LogicOpEnabled);
-
-   rbPixels = _swrast_get_dest_rgba(ctx, rb, span);
-
-   swrast->BlendFunc(ctx, span->end, span->array->mask,
-                     span->array->rgba, rbPixels, span->array->ChanType);
-}
+/*

+ * 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_blend.c

+ * \brief software blending.

+ * \author Brian Paul

+ *

+ * Only a few blend modes have been optimized (min, max, transparency, add)

+ * more optimized cases can easily be added if needed.

+ * Celestia uses glBlendFunc(GL_SRC_ALPHA, GL_ONE), for example.

+ */

+

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+

+#include "s_blend.h"

+#include "s_context.h"

+#include "s_span.h"

+

+

+#if defined(USE_MMX_ASM)

+#include "x86/mmx.h"

+#include "x86/common_x86_asm.h"

+#define _BLENDAPI _ASMAPI

+#else

+#define _BLENDAPI

+#endif

+

+

+/**

+ * Integer divide by 255

+ * Declare "int divtemp" before using.

+ * This satisfies Glean and should be reasonably fast.

+ * Contributed by Nathan Hand.

+ */

+#define DIV255(X)  (divtemp = (X), ((divtemp << 8) + divtemp + 256) >> 16)

+

+

+

+/**

+ * Special case for glBlendFunc(GL_ZERO, GL_ONE).

+ * No-op means the framebuffer values remain unchanged.

+ * Any chanType ok.

+ */

+static void _BLENDAPI

+blend_noop(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+           GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLint bytes;

+

+   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendSrcRGB == GL_ZERO);

+   ASSERT(ctx->Color.BlendDstRGB == GL_ONE);

+   (void) ctx;

+

+   /* just memcpy */

+   if (chanType == GL_UNSIGNED_BYTE)

+      bytes = 4 * n * sizeof(GLubyte);

+   else if (chanType == GL_UNSIGNED_SHORT)

+      bytes = 4 * n * sizeof(GLushort);

+   else

+      bytes = 4 * n * sizeof(GLfloat);

+

+   memcpy(src, dst, bytes);

+}

+

+

+/**

+ * Special case for glBlendFunc(GL_ONE, GL_ZERO)

+ * Any chanType ok.

+ */

+static void _BLENDAPI

+blend_replace(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+              GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendSrcRGB == GL_ONE);

+   ASSERT(ctx->Color.BlendDstRGB == GL_ZERO);

+   (void) ctx;

+   (void) n;

+   (void) mask;

+   (void) src;

+   (void) dst;

+}

+

+

+/**

+ * Common transparency blending mode:

+ * glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA).

+ */

+static void _BLENDAPI

+blend_transparency_ubyte(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                         GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;

+   const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;

+   GLuint i;

+

+   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendSrcRGB == GL_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendSrcA == GL_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendDstRGB == GL_ONE_MINUS_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendDstA == GL_ONE_MINUS_SRC_ALPHA);

+   ASSERT(chanType == GL_UNSIGNED_BYTE);

+

+   (void) ctx;

+

+   for (i = 0; i < n; i++) {

+      if (mask[i]) {

+         const GLint t = rgba[i][ACOMP];  /* t is in [0, 255] */

+         if (t == 0) {

+            /* 0% alpha */

+            COPY_4UBV(rgba[i], dest[i]);

+         }

+         else if (t != 255) {

+	    GLint divtemp;

+            const GLint r = DIV255((rgba[i][RCOMP] - dest[i][RCOMP]) * t) + dest[i][RCOMP];

+            const GLint g = DIV255((rgba[i][GCOMP] - dest[i][GCOMP]) * t) + dest[i][GCOMP];

+            const GLint b = DIV255((rgba[i][BCOMP] - dest[i][BCOMP]) * t) + dest[i][BCOMP];

+            const GLint a = DIV255((rgba[i][ACOMP] - dest[i][ACOMP]) * t) + dest[i][ACOMP]; 

+            ASSERT(r <= 255);

+            ASSERT(g <= 255);

+            ASSERT(b <= 255);

+            ASSERT(a <= 255);

+            rgba[i][RCOMP] = (GLubyte) r;

+            rgba[i][GCOMP] = (GLubyte) g;

+            rgba[i][BCOMP] = (GLubyte) b;

+            rgba[i][ACOMP] = (GLubyte) a;

+         }

+      }

+   }

+}

+

+

+static void _BLENDAPI

+blend_transparency_ushort(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                          GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLushort (*rgba)[4] = (GLushort (*)[4]) src;

+   const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;

+   GLuint i;

+

+   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendSrcRGB == GL_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendSrcA == GL_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendDstRGB == GL_ONE_MINUS_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendDstA == GL_ONE_MINUS_SRC_ALPHA);

+   ASSERT(chanType == GL_UNSIGNED_SHORT);

+

+   (void) ctx;

+

+   for (i = 0; i < n; i++) {

+      if (mask[i]) {

+         const GLint t = rgba[i][ACOMP];

+         if (t == 0) {

+            /* 0% alpha */

+            COPY_4V(rgba[i], dest[i]);

+         }

+         else if (t != 65535) {

+            const GLfloat tt = (GLfloat) t / 65535.0F;

+            GLushort r = (GLushort) ((rgba[i][RCOMP] - dest[i][RCOMP]) * tt + dest[i][RCOMP]);

+            GLushort g = (GLushort) ((rgba[i][GCOMP] - dest[i][GCOMP]) * tt + dest[i][GCOMP]);

+            GLushort b = (GLushort) ((rgba[i][BCOMP] - dest[i][BCOMP]) * tt + dest[i][BCOMP]);

+            GLushort a = (GLushort) ((rgba[i][ACOMP] - dest[i][ACOMP]) * tt + dest[i][ACOMP]);

+            ASSIGN_4V(rgba[i], r, g, b, a);

+         }

+      }

+   }

+}

+

+

+static void _BLENDAPI

+blend_transparency_float(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                         GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;

+   const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;

+   GLuint i;

+

+   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendSrcRGB == GL_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendSrcA == GL_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendDstRGB == GL_ONE_MINUS_SRC_ALPHA);

+   ASSERT(ctx->Color.BlendDstA == GL_ONE_MINUS_SRC_ALPHA);

+   ASSERT(chanType == GL_FLOAT);

+

+   (void) ctx;

+

+   for (i = 0; i < n; i++) {

+      if (mask[i]) {

+         const GLfloat t = rgba[i][ACOMP];  /* t in [0, 1] */

+         if (t == 0.0F) {

+            /* 0% alpha */

+            COPY_4V(rgba[i], dest[i]);

+         }

+         else if (t != 1.0F) {

+            GLfloat r = (rgba[i][RCOMP] - dest[i][RCOMP]) * t + dest[i][RCOMP];

+            GLfloat g = (rgba[i][GCOMP] - dest[i][GCOMP]) * t + dest[i][GCOMP];

+            GLfloat b = (rgba[i][BCOMP] - dest[i][BCOMP]) * t + dest[i][BCOMP];

+            GLfloat a = (rgba[i][ACOMP] - dest[i][ACOMP]) * t + dest[i][ACOMP];

+            ASSIGN_4V(rgba[i], r, g, b, a);

+         }

+      }

+   }

+}

+

+

+

+/**

+ * Add src and dest: glBlendFunc(GL_ONE, GL_ONE).

+ * Any chanType ok.

+ */

+static void _BLENDAPI

+blend_add(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+          GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLuint i;

+

+   ASSERT(ctx->Color.BlendEquationRGB == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendEquationA == GL_FUNC_ADD);

+   ASSERT(ctx->Color.BlendSrcRGB == GL_ONE);

+   ASSERT(ctx->Color.BlendDstRGB == GL_ONE);

+   (void) ctx;

+

+   if (chanType == GL_UNSIGNED_BYTE) {

+      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;

+      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            GLint r = rgba[i][RCOMP] + dest[i][RCOMP];

+            GLint g = rgba[i][GCOMP] + dest[i][GCOMP];

+            GLint b = rgba[i][BCOMP] + dest[i][BCOMP];

+            GLint a = rgba[i][ACOMP] + dest[i][ACOMP];

+            rgba[i][RCOMP] = (GLubyte) MIN2( r, 255 );

+            rgba[i][GCOMP] = (GLubyte) MIN2( g, 255 );

+            rgba[i][BCOMP] = (GLubyte) MIN2( b, 255 );

+            rgba[i][ACOMP] = (GLubyte) MIN2( a, 255 );

+         }

+      }

+   }

+   else if (chanType == GL_UNSIGNED_SHORT) {

+      GLushort (*rgba)[4] = (GLushort (*)[4]) src;

+      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            GLint r = rgba[i][RCOMP] + dest[i][RCOMP];

+            GLint g = rgba[i][GCOMP] + dest[i][GCOMP];

+            GLint b = rgba[i][BCOMP] + dest[i][BCOMP];

+            GLint a = rgba[i][ACOMP] + dest[i][ACOMP];

+            rgba[i][RCOMP] = (GLshort) MIN2( r, 255 );

+            rgba[i][GCOMP] = (GLshort) MIN2( g, 255 );

+            rgba[i][BCOMP] = (GLshort) MIN2( b, 255 );

+            rgba[i][ACOMP] = (GLshort) MIN2( a, 255 );

+         }

+      }

+   }

+   else {

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;

+      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;

+      ASSERT(chanType == GL_FLOAT);

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            /* don't RGB clamp to max */

+            rgba[i][RCOMP] += dest[i][RCOMP];

+            rgba[i][GCOMP] += dest[i][GCOMP];

+            rgba[i][BCOMP] += dest[i][BCOMP];

+            rgba[i][ACOMP] += dest[i][ACOMP];

+         }

+      }

+   }

+}

+

+

+

+/**

+ * Blend min function.

+ * Any chanType ok.

+ */

+static void _BLENDAPI

+blend_min(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+          GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLuint i;

+   ASSERT(ctx->Color.BlendEquationRGB == GL_MIN);

+   ASSERT(ctx->Color.BlendEquationA == GL_MIN);

+   (void) ctx;

+

+   if (chanType == GL_UNSIGNED_BYTE) {

+      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;

+      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = MIN2( rgba[i][RCOMP], dest[i][RCOMP] );

+            rgba[i][GCOMP] = MIN2( rgba[i][GCOMP], dest[i][GCOMP] );

+            rgba[i][BCOMP] = MIN2( rgba[i][BCOMP], dest[i][BCOMP] );

+            rgba[i][ACOMP] = MIN2( rgba[i][ACOMP], dest[i][ACOMP] );

+         }

+      }

+   }

+   else if (chanType == GL_UNSIGNED_SHORT) {

+      GLushort (*rgba)[4] = (GLushort (*)[4]) src;

+      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = MIN2( rgba[i][RCOMP], dest[i][RCOMP] );

+            rgba[i][GCOMP] = MIN2( rgba[i][GCOMP], dest[i][GCOMP] );

+            rgba[i][BCOMP] = MIN2( rgba[i][BCOMP], dest[i][BCOMP] );

+            rgba[i][ACOMP] = MIN2( rgba[i][ACOMP], dest[i][ACOMP] );

+         }

+      }

+   }

+   else {

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;

+      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;

+      ASSERT(chanType == GL_FLOAT);

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = MIN2( rgba[i][RCOMP], dest[i][RCOMP] );

+            rgba[i][GCOMP] = MIN2( rgba[i][GCOMP], dest[i][GCOMP] );

+            rgba[i][BCOMP] = MIN2( rgba[i][BCOMP], dest[i][BCOMP] );

+            rgba[i][ACOMP] = MIN2( rgba[i][ACOMP], dest[i][ACOMP] );

+         }

+      }

+   }

+}

+

+

+/**

+ * Blend max function.

+ * Any chanType ok.

+ */

+static void _BLENDAPI

+blend_max(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+          GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLuint i;

+   ASSERT(ctx->Color.BlendEquationRGB == GL_MAX);

+   ASSERT(ctx->Color.BlendEquationA == GL_MAX);

+   (void) ctx;

+

+   if (chanType == GL_UNSIGNED_BYTE) {

+      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;

+      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = MAX2( rgba[i][RCOMP], dest[i][RCOMP] );

+            rgba[i][GCOMP] = MAX2( rgba[i][GCOMP], dest[i][GCOMP] );

+            rgba[i][BCOMP] = MAX2( rgba[i][BCOMP], dest[i][BCOMP] );

+            rgba[i][ACOMP] = MAX2( rgba[i][ACOMP], dest[i][ACOMP] );

+         }

+      }

+   }

+   else if (chanType == GL_UNSIGNED_SHORT) {

+      GLushort (*rgba)[4] = (GLushort (*)[4]) src;

+      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = MAX2( rgba[i][RCOMP], dest[i][RCOMP] );

+            rgba[i][GCOMP] = MAX2( rgba[i][GCOMP], dest[i][GCOMP] );

+            rgba[i][BCOMP] = MAX2( rgba[i][BCOMP], dest[i][BCOMP] );

+            rgba[i][ACOMP] = MAX2( rgba[i][ACOMP], dest[i][ACOMP] );

+         }

+      }

+   }

+   else {

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;

+      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;

+      ASSERT(chanType == GL_FLOAT);

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = MAX2( rgba[i][RCOMP], dest[i][RCOMP] );

+            rgba[i][GCOMP] = MAX2( rgba[i][GCOMP], dest[i][GCOMP] );

+            rgba[i][BCOMP] = MAX2( rgba[i][BCOMP], dest[i][BCOMP] );

+            rgba[i][ACOMP] = MAX2( rgba[i][ACOMP], dest[i][ACOMP] );

+         }

+      }

+   }

+}

+

+

+

+/**

+ * Modulate:  result = src * dest

+ * Any chanType ok.

+ */

+static void _BLENDAPI

+blend_modulate(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+               GLvoid *src, const GLvoid *dst, GLenum chanType)

+{

+   GLuint i;

+   (void) ctx;

+

+   if (chanType == GL_UNSIGNED_BYTE) {

+      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;

+      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+	    GLint divtemp;

+            rgba[i][RCOMP] = DIV255(rgba[i][RCOMP] * dest[i][RCOMP]);

+            rgba[i][GCOMP] = DIV255(rgba[i][GCOMP] * dest[i][GCOMP]);

+            rgba[i][BCOMP] = DIV255(rgba[i][BCOMP] * dest[i][BCOMP]);

+            rgba[i][ACOMP] = DIV255(rgba[i][ACOMP] * dest[i][ACOMP]);

+         }

+      }

+   }

+   else if (chanType == GL_UNSIGNED_SHORT) {

+      GLushort (*rgba)[4] = (GLushort (*)[4]) src;

+      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = (rgba[i][RCOMP] * dest[i][RCOMP] + 65535) >> 16;

+            rgba[i][GCOMP] = (rgba[i][GCOMP] * dest[i][GCOMP] + 65535) >> 16;

+            rgba[i][BCOMP] = (rgba[i][BCOMP] * dest[i][BCOMP] + 65535) >> 16;

+            rgba[i][ACOMP] = (rgba[i][ACOMP] * dest[i][ACOMP] + 65535) >> 16;

+         }

+      }

+   }

+   else {

+      GLfloat (*rgba)[4] = (GLfloat (*)[4]) src;

+      const GLfloat (*dest)[4] = (const GLfloat (*)[4]) dst;

+      ASSERT(chanType == GL_FLOAT);

+      for (i=0;i<n;i++) {

+         if (mask[i]) {

+            rgba[i][RCOMP] = rgba[i][RCOMP] * dest[i][RCOMP];

+            rgba[i][GCOMP] = rgba[i][GCOMP] * dest[i][GCOMP];

+            rgba[i][BCOMP] = rgba[i][BCOMP] * dest[i][BCOMP];

+            rgba[i][ACOMP] = rgba[i][ACOMP] * dest[i][ACOMP];

+         }

+      }

+   }

+}

+

+

+/**

+ * Do any blending operation, using floating point.

+ * \param n  number of pixels

+ * \param mask  fragment writemask array

+ * \param rgba  array of incoming (and modified) pixels

+ * \param dest  array of pixels from the dest color buffer

+ */

+static void

+blend_general_float(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                    GLfloat rgba[][4], GLfloat dest[][4],

+                    GLenum chanType)

+{

+   GLuint i;

+

+   for (i = 0; i < n; i++) {

+      if (mask[i]) {

+         /* Incoming/source Color */

+         const GLfloat Rs = rgba[i][RCOMP];

+         const GLfloat Gs = rgba[i][GCOMP];

+         const GLfloat Bs = rgba[i][BCOMP];

+         const GLfloat As = rgba[i][ACOMP];

+

+         /* Frame buffer/dest color */

+         const GLfloat Rd = dest[i][RCOMP];

+         const GLfloat Gd = dest[i][GCOMP];

+         const GLfloat Bd = dest[i][BCOMP];

+         const GLfloat Ad = dest[i][ACOMP];

+

+         GLfloat sR, sG, sB, sA;  /* Source factor */

+         GLfloat dR, dG, dB, dA;  /* Dest factor */

+         GLfloat r, g, b, a;      /* result color */

+

+         /* XXX for the case of constant blend terms we could init

+          * the sX and dX variables just once before the loop.

+          */

+

+         /* Source RGB factor */

+         switch (ctx->Color.BlendSrcRGB) {

+            case GL_ZERO:

+               sR = sG = sB = 0.0F;

+               break;

+            case GL_ONE:

+               sR = sG = sB = 1.0F;

+               break;

+            case GL_DST_COLOR:

+               sR = Rd;

+               sG = Gd;

+               sB = Bd;

+               break;

+            case GL_ONE_MINUS_DST_COLOR:

+               sR = 1.0F - Rd;

+               sG = 1.0F - Gd;

+               sB = 1.0F - Bd;

+               break;

+            case GL_SRC_ALPHA:

+               sR = sG = sB = As;

+               break;

+            case GL_ONE_MINUS_SRC_ALPHA:

+               sR = sG = sB = 1.0F - As;

+               break;

+            case GL_DST_ALPHA:

+               sR = sG = sB = Ad;

+               break;

+            case GL_ONE_MINUS_DST_ALPHA:

+               sR = sG = sB = 1.0F - Ad;

+               break;

+            case GL_SRC_ALPHA_SATURATE:

+               if (As < 1.0F - Ad) {

+                  sR = sG = sB = As;

+               }

+               else {

+                  sR = sG = sB = 1.0F - Ad;

+               }

+               break;

+            case GL_CONSTANT_COLOR:

+               sR = ctx->Color.BlendColor[0];

+               sG = ctx->Color.BlendColor[1];

+               sB = ctx->Color.BlendColor[2];

+               break;

+            case GL_ONE_MINUS_CONSTANT_COLOR:

+               sR = 1.0F - ctx->Color.BlendColor[0];

+               sG = 1.0F - ctx->Color.BlendColor[1];

+               sB = 1.0F - ctx->Color.BlendColor[2];

+               break;

+            case GL_CONSTANT_ALPHA:

+               sR = sG = sB = ctx->Color.BlendColor[3];

+               break;

+            case GL_ONE_MINUS_CONSTANT_ALPHA:

+               sR = sG = sB = 1.0F - ctx->Color.BlendColor[3];

+               break;

+            case GL_SRC_COLOR:

+               sR = Rs;

+               sG = Gs;

+               sB = Bs;

+               break;

+            case GL_ONE_MINUS_SRC_COLOR:

+               sR = 1.0F - Rs;

+               sG = 1.0F - Gs;

+               sB = 1.0F - Bs;

+               break;

+            default:

+               /* this should never happen */

+               _mesa_problem(ctx, "Bad blend source RGB factor in blend_general_float");

+               return;

+         }

+

+         /* Source Alpha factor */

+         switch (ctx->Color.BlendSrcA) {

+            case GL_ZERO:

+               sA = 0.0F;

+               break;

+            case GL_ONE:

+               sA = 1.0F;

+               break;

+            case GL_DST_COLOR:

+               sA = Ad;

+               break;

+            case GL_ONE_MINUS_DST_COLOR:

+               sA = 1.0F - Ad;

+               break;

+            case GL_SRC_ALPHA:

+               sA = As;

+               break;

+            case GL_ONE_MINUS_SRC_ALPHA:

+               sA = 1.0F - As;

+               break;

+            case GL_DST_ALPHA:

+               sA = Ad;

+               break;

+            case GL_ONE_MINUS_DST_ALPHA:

+               sA = 1.0F - Ad;

+               break;

+            case GL_SRC_ALPHA_SATURATE:

+               sA = 1.0;

+               break;

+            case GL_CONSTANT_COLOR:

+               sA = ctx->Color.BlendColor[3];

+               break;

+            case GL_ONE_MINUS_CONSTANT_COLOR:

+               sA = 1.0F - ctx->Color.BlendColor[3];

+               break;

+            case GL_CONSTANT_ALPHA:

+               sA = ctx->Color.BlendColor[3];

+               break;

+            case GL_ONE_MINUS_CONSTANT_ALPHA:

+               sA = 1.0F - ctx->Color.BlendColor[3];

+               break;

+            case GL_SRC_COLOR:

+               sA = As;

+               break;

+            case GL_ONE_MINUS_SRC_COLOR:

+               sA = 1.0F - As;

+               break;

+            default:

+               /* this should never happen */

+               sA = 0.0F;

+               _mesa_problem(ctx, "Bad blend source A factor in blend_general_float");

+               return;

+         }

+

+         /* Dest RGB factor */

+         switch (ctx->Color.BlendDstRGB) {

+            case GL_ZERO:

+               dR = dG = dB = 0.0F;

+               break;

+            case GL_ONE:

+               dR = dG = dB = 1.0F;

+               break;

+            case GL_SRC_COLOR:

+               dR = Rs;

+               dG = Gs;

+               dB = Bs;

+               break;

+            case GL_ONE_MINUS_SRC_COLOR:

+               dR = 1.0F - Rs;

+               dG = 1.0F - Gs;

+               dB = 1.0F - Bs;

+               break;

+            case GL_SRC_ALPHA:

+               dR = dG = dB = As;

+               break;

+            case GL_ONE_MINUS_SRC_ALPHA:

+               dR = dG = dB = 1.0F - As;

+               break;

+            case GL_DST_ALPHA:

+               dR = dG = dB = Ad;

+               break;

+            case GL_ONE_MINUS_DST_ALPHA:

+               dR = dG = dB = 1.0F - Ad;

+               break;

+            case GL_CONSTANT_COLOR:

+               dR = ctx->Color.BlendColor[0];

+               dG = ctx->Color.BlendColor[1];

+               dB = ctx->Color.BlendColor[2];

+               break;

+            case GL_ONE_MINUS_CONSTANT_COLOR:

+               dR = 1.0F - ctx->Color.BlendColor[0];

+               dG = 1.0F - ctx->Color.BlendColor[1];

+               dB = 1.0F - ctx->Color.BlendColor[2];

+               break;

+            case GL_CONSTANT_ALPHA:

+               dR = dG = dB = ctx->Color.BlendColor[3];

+               break;

+            case GL_ONE_MINUS_CONSTANT_ALPHA:

+               dR = dG = dB = 1.0F - ctx->Color.BlendColor[3];

+               break;

+            case GL_DST_COLOR:

+               dR = Rd;

+               dG = Gd;

+               dB = Bd;

+               break;

+            case GL_ONE_MINUS_DST_COLOR:

+               dR = 1.0F - Rd;

+               dG = 1.0F - Gd;

+               dB = 1.0F - Bd;

+               break;

+            default:

+               /* this should never happen */

+               dR = dG = dB = 0.0F;

+               _mesa_problem(ctx, "Bad blend dest RGB factor in blend_general_float");

+               return;

+         }

+

+         /* Dest Alpha factor */

+         switch (ctx->Color.BlendDstA) {

+            case GL_ZERO:

+               dA = 0.0F;

+               break;

+            case GL_ONE:

+               dA = 1.0F;

+               break;

+            case GL_SRC_COLOR:

+               dA = As;

+               break;

+            case GL_ONE_MINUS_SRC_COLOR:

+               dA = 1.0F - As;

+               break;

+            case GL_SRC_ALPHA:

+               dA = As;

+               break;

+            case GL_ONE_MINUS_SRC_ALPHA:

+               dA = 1.0F - As;

+               break;

+            case GL_DST_ALPHA:

+               dA = Ad;

+               break;

+            case GL_ONE_MINUS_DST_ALPHA:

+               dA = 1.0F - Ad;

+               break;

+            case GL_CONSTANT_COLOR:

+               dA = ctx->Color.BlendColor[3];

+               break;

+            case GL_ONE_MINUS_CONSTANT_COLOR:

+               dA = 1.0F - ctx->Color.BlendColor[3];

+               break;

+            case GL_CONSTANT_ALPHA:

+               dA = ctx->Color.BlendColor[3];

+               break;

+            case GL_ONE_MINUS_CONSTANT_ALPHA:

+               dA = 1.0F - ctx->Color.BlendColor[3];

+               break;

+            case GL_DST_COLOR:

+               dA = Ad;

+               break;

+            case GL_ONE_MINUS_DST_COLOR:

+               dA = 1.0F - Ad;

+               break;

+            default:

+               /* this should never happen */

+               dA = 0.0F;

+               _mesa_problem(ctx, "Bad blend dest A factor in blend_general_float");

+               return;

+         }

+

+         /* compute the blended RGB */

+         switch (ctx->Color.BlendEquationRGB) {

+         case GL_FUNC_ADD:

+            r = Rs * sR + Rd * dR;

+            g = Gs * sG + Gd * dG;

+            b = Bs * sB + Bd * dB;

+            a = As * sA + Ad * dA;

+            break;

+         case GL_FUNC_SUBTRACT:

+            r = Rs * sR - Rd * dR;

+            g = Gs * sG - Gd * dG;

+            b = Bs * sB - Bd * dB;

+            a = As * sA - Ad * dA;

+            break;

+         case GL_FUNC_REVERSE_SUBTRACT:

+            r = Rd * dR - Rs * sR;

+            g = Gd * dG - Gs * sG;

+            b = Bd * dB - Bs * sB;

+            a = Ad * dA - As * sA;

+            break;

+         case GL_MIN:

+	    r = MIN2( Rd, Rs );

+	    g = MIN2( Gd, Gs );

+	    b = MIN2( Bd, Bs );

+            break;

+         case GL_MAX:

+	    r = MAX2( Rd, Rs );

+	    g = MAX2( Gd, Gs );

+	    b = MAX2( Bd, Bs );

+            break;

+	 default:

+            /* should never get here */

+            r = g = b = 0.0F;  /* silence uninitialized var warning */

+            _mesa_problem(ctx, "unexpected BlendEquation in blend_general()");

+            return;

+         }

+

+         /* compute the blended alpha */

+         switch (ctx->Color.BlendEquationA) {

+         case GL_FUNC_ADD:

+            a = As * sA + Ad * dA;

+            break;

+         case GL_FUNC_SUBTRACT:

+            a = As * sA - Ad * dA;

+            break;

+         case GL_FUNC_REVERSE_SUBTRACT:

+            a = Ad * dA - As * sA;

+            break;

+         case GL_MIN:

+	    a = MIN2( Ad, As );

+            break;

+         case GL_MAX:

+	    a = MAX2( Ad, As );

+            break;

+         default:

+            /* should never get here */

+            a = 0.0F;  /* silence uninitialized var warning */

+            _mesa_problem(ctx, "unexpected BlendEquation in blend_general()");

+            return;

+         }

+

+         /* final clamping */

+#if 0

+         rgba[i][RCOMP] = MAX2( r, 0.0F );

+         rgba[i][GCOMP] = MAX2( g, 0.0F );

+         rgba[i][BCOMP] = MAX2( b, 0.0F );

+         rgba[i][ACOMP] = CLAMP( a, 0.0F, 1.0F );

+#else

+         ASSIGN_4V(rgba[i], r, g, b, a);

+#endif

+      }

+   }

+}

+

+

+/**

+ * Do any blending operation, any chanType.

+ */

+static void

+blend_general(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+              void *src, const void *dst, GLenum chanType)

+{

+   GLfloat (*rgbaF)[4], (*destF)[4];

+

+   rgbaF = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));

+   destF = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));

+   if (!rgbaF || !destF) {

+      free(rgbaF);

+      free(destF);

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "blending");

+      return;

+   }

+

+   if (chanType == GL_UNSIGNED_BYTE) {

+      GLubyte (*rgba)[4] = (GLubyte (*)[4]) src;

+      const GLubyte (*dest)[4] = (const GLubyte (*)[4]) dst;

+      GLuint i;

+      /* convert ubytes to floats */

+      for (i = 0; i < n; i++) {

+         if (mask[i]) {

+            rgbaF[i][RCOMP] = UBYTE_TO_FLOAT(rgba[i][RCOMP]);

+            rgbaF[i][GCOMP] = UBYTE_TO_FLOAT(rgba[i][GCOMP]);

+            rgbaF[i][BCOMP] = UBYTE_TO_FLOAT(rgba[i][BCOMP]);

+            rgbaF[i][ACOMP] = UBYTE_TO_FLOAT(rgba[i][ACOMP]);

+            destF[i][RCOMP] = UBYTE_TO_FLOAT(dest[i][RCOMP]);

+            destF[i][GCOMP] = UBYTE_TO_FLOAT(dest[i][GCOMP]);

+            destF[i][BCOMP] = UBYTE_TO_FLOAT(dest[i][BCOMP]);

+            destF[i][ACOMP] = UBYTE_TO_FLOAT(dest[i][ACOMP]);

+         }

+      }

+      /* do blend */

+      blend_general_float(ctx, n, mask, rgbaF, destF, chanType);

+      /* convert back to ubytes */

+      for (i = 0; i < n; i++) {

+         if (mask[i]) {

+            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][RCOMP], rgbaF[i][RCOMP]);

+            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][GCOMP], rgbaF[i][GCOMP]);

+            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][BCOMP], rgbaF[i][BCOMP]);

+            UNCLAMPED_FLOAT_TO_UBYTE(rgba[i][ACOMP], rgbaF[i][ACOMP]);

+         }

+      }

+   }

+   else if (chanType == GL_UNSIGNED_SHORT) {

+      GLushort (*rgba)[4] = (GLushort (*)[4]) src;

+      const GLushort (*dest)[4] = (const GLushort (*)[4]) dst;

+      GLuint i;

+      /* convert ushorts to floats */

+      for (i = 0; i < n; i++) {

+         if (mask[i]) {

+            rgbaF[i][RCOMP] = USHORT_TO_FLOAT(rgba[i][RCOMP]);

+            rgbaF[i][GCOMP] = USHORT_TO_FLOAT(rgba[i][GCOMP]);

+            rgbaF[i][BCOMP] = USHORT_TO_FLOAT(rgba[i][BCOMP]);

+            rgbaF[i][ACOMP] = USHORT_TO_FLOAT(rgba[i][ACOMP]);

+            destF[i][RCOMP] = USHORT_TO_FLOAT(dest[i][RCOMP]);

+            destF[i][GCOMP] = USHORT_TO_FLOAT(dest[i][GCOMP]);

+            destF[i][BCOMP] = USHORT_TO_FLOAT(dest[i][BCOMP]);

+            destF[i][ACOMP] = USHORT_TO_FLOAT(dest[i][ACOMP]);

+         }

+      }

+      /* do blend */

+      blend_general_float(ctx, n, mask, rgbaF, destF, chanType);

+      /* convert back to ushorts */

+      for (i = 0; i < n; i++) {

+         if (mask[i]) {

+            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][RCOMP], rgbaF[i][RCOMP]);

+            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][GCOMP], rgbaF[i][GCOMP]);

+            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][BCOMP], rgbaF[i][BCOMP]);

+            UNCLAMPED_FLOAT_TO_USHORT(rgba[i][ACOMP], rgbaF[i][ACOMP]);

+         }

+      }

+   }

+   else {

+      blend_general_float(ctx, n, mask, (GLfloat (*)[4]) src,

+                          (GLfloat (*)[4]) dst, chanType);

+   }

+

+   free(rgbaF);

+   free(destF);

+}

+

+

+

+/**

+ * Analyze current blending parameters to pick fastest blending function.

+ * Result: the ctx->Color.BlendFunc pointer is updated.

+ */

+void

+_swrast_choose_blend_func(struct gl_context *ctx, GLenum chanType)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const GLenum eq = ctx->Color.BlendEquationRGB;

+   const GLenum srcRGB = ctx->Color.BlendSrcRGB;

+   const GLenum dstRGB = ctx->Color.BlendDstRGB;

+   const GLenum srcA = ctx->Color.BlendSrcA;

+   const GLenum dstA = ctx->Color.BlendDstA;

+

+   if (ctx->Color.BlendEquationRGB != ctx->Color.BlendEquationA) {

+      swrast->BlendFunc = blend_general;

+   }

+   else if (eq == GL_MIN) {

+      /* Note: GL_MIN ignores the blending weight factors */

+#if defined(USE_MMX_ASM)

+      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {

+         swrast->BlendFunc = _mesa_mmx_blend_min;

+      }

+      else

+#endif

+         swrast->BlendFunc = blend_min;

+   }

+   else if (eq == GL_MAX) {

+      /* Note: GL_MAX ignores the blending weight factors */

+#if defined(USE_MMX_ASM)

+      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {

+         swrast->BlendFunc = _mesa_mmx_blend_max;

+      }

+      else

+#endif

+         swrast->BlendFunc = blend_max;

+   }

+   else if (srcRGB != srcA || dstRGB != dstA) {

+      swrast->BlendFunc = blend_general;

+   }

+   else if (eq == GL_FUNC_ADD && srcRGB == GL_SRC_ALPHA

+            && dstRGB == GL_ONE_MINUS_SRC_ALPHA) {

+#if defined(USE_MMX_ASM)

+      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {

+         swrast->BlendFunc = _mesa_mmx_blend_transparency;

+      }

+      else

+#endif

+      {

+         if (chanType == GL_UNSIGNED_BYTE)

+            swrast->BlendFunc = blend_transparency_ubyte;

+         else if (chanType == GL_UNSIGNED_SHORT)

+            swrast->BlendFunc = blend_transparency_ushort;

+         else

+            swrast->BlendFunc = blend_transparency_float;

+      }

+   }

+   else if (eq == GL_FUNC_ADD && srcRGB == GL_ONE && dstRGB == GL_ONE) {

+#if defined(USE_MMX_ASM)

+      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {

+         swrast->BlendFunc = _mesa_mmx_blend_add;

+      }

+      else

+#endif

+         swrast->BlendFunc = blend_add;

+   }

+   else if (((eq == GL_FUNC_ADD || eq == GL_FUNC_REVERSE_SUBTRACT)

+	     && (srcRGB == GL_ZERO && dstRGB == GL_SRC_COLOR))

+	    ||

+	    ((eq == GL_FUNC_ADD || eq == GL_FUNC_SUBTRACT)

+	     && (srcRGB == GL_DST_COLOR && dstRGB == GL_ZERO))) {

+#if defined(USE_MMX_ASM)

+      if (cpu_has_mmx && chanType == GL_UNSIGNED_BYTE) {

+         swrast->BlendFunc = _mesa_mmx_blend_modulate;

+      }

+      else

+#endif

+         swrast->BlendFunc = blend_modulate;

+   }

+   else if (eq == GL_FUNC_ADD && srcRGB == GL_ZERO && dstRGB == GL_ONE) {

+      swrast->BlendFunc = blend_noop;

+   }

+   else if (eq == GL_FUNC_ADD && srcRGB == GL_ONE && dstRGB == GL_ZERO) {

+      swrast->BlendFunc = blend_replace;

+   }

+   else {

+      swrast->BlendFunc = blend_general;

+   }

+}

+

+

+

+/**

+ * Apply the blending operator to a span of pixels.

+ * We can handle horizontal runs of pixels (spans) or arrays of x/y

+ * pixel coordinates.

+ */

+void

+_swrast_blend_span(struct gl_context *ctx, struct gl_renderbuffer *rb, SWspan *span)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   void *rbPixels;

+

+   ASSERT(span->end <= MAX_WIDTH);

+   ASSERT(span->arrayMask & SPAN_RGBA);

+   ASSERT(rb->DataType == span->array->ChanType);

+   ASSERT(!ctx->Color._LogicOpEnabled);

+

+   rbPixels = _swrast_get_dest_rgba(ctx, rb, span);

+

+   swrast->BlendFunc(ctx, span->end, span->array->mask,

+                     span->array->rgba, rbPixels, span->array->ChanType);

+}

diff --git a/mesalib/src/mesa/swrast/s_blend.h b/mesalib/src/mesa/swrast/s_blend.h
index 9cedde3bf..8ecff52cf 100644
--- a/mesalib/src/mesa/swrast/s_blend.h
+++ b/mesalib/src/mesa/swrast/s_blend.h
@@ -1,42 +1,45 @@
-/*
- * 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 S_BLEND_H
-#define S_BLEND_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern void
-_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb, SWspan *span);
-
-
-extern void
-_swrast_choose_blend_func(GLcontext *ctx, GLenum chanType);
-
-
-#endif
+/*

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

+#define S_BLEND_H

+

+

+#include "main/glheader.h"

+#include "s_span.h"

+

+struct gl_context;

+struct gl_renderbuffer;

+

+

+extern void

+_swrast_blend_span(struct gl_context *ctx, struct gl_renderbuffer *rb, SWspan *span);

+

+

+extern void

+_swrast_choose_blend_func(struct gl_context *ctx, GLenum chanType);

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c
index 753f3136f..2dd11399f 100644
--- a/mesalib/src/mesa/swrast/s_blit.c
+++ b/mesalib/src/mesa/swrast/s_blit.c
@@ -1,619 +1,619 @@
-/*
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/condrender.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "s_context.h"
-
-
-#define ABS(X)   ((X) < 0 ? -(X) : (X))
-
-
-/**
- * Generate a row resampler function for GL_NEAREST mode.
- */
-#define RESAMPLE(NAME, PIXELTYPE, SIZE)			\
-static void						\
-NAME(GLint srcWidth, GLint dstWidth,			\
-     const GLvoid *srcBuffer, GLvoid *dstBuffer,	\
-     GLboolean flip)					\
-{							\
-   const PIXELTYPE *src = (const PIXELTYPE *) srcBuffer;\
-   PIXELTYPE *dst = (PIXELTYPE *) dstBuffer;		\
-   GLint dstCol;					\
-							\
-   if (flip) {						\
-      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\
-         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\
-         ASSERT(srcCol >= 0);				\
-         ASSERT(srcCol < srcWidth);			\
-         srcCol = srcWidth - 1 - srcCol; /* flip */	\
-         if (SIZE == 1) {				\
-            dst[dstCol] = src[srcCol];			\
-         }						\
-         else if (SIZE == 2) {				\
-            dst[dstCol*2+0] = src[srcCol*2+0];		\
-            dst[dstCol*2+1] = src[srcCol*2+1];		\
-         }						\
-         else if (SIZE == 4) {				\
-            dst[dstCol*4+0] = src[srcCol*4+0];		\
-            dst[dstCol*4+1] = src[srcCol*4+1];		\
-            dst[dstCol*4+2] = src[srcCol*4+2];		\
-            dst[dstCol*4+3] = src[srcCol*4+3];		\
-         }						\
-      }							\
-   }							\
-   else {						\
-      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\
-         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\
-         ASSERT(srcCol >= 0);				\
-         ASSERT(srcCol < srcWidth);			\
-         if (SIZE == 1) {				\
-            dst[dstCol] = src[srcCol];			\
-         }						\
-         else if (SIZE == 2) {				\
-            dst[dstCol*2+0] = src[srcCol*2+0];		\
-            dst[dstCol*2+1] = src[srcCol*2+1];		\
-         }						\
-         else if (SIZE == 4) {				\
-            dst[dstCol*4+0] = src[srcCol*4+0];		\
-            dst[dstCol*4+1] = src[srcCol*4+1];		\
-            dst[dstCol*4+2] = src[srcCol*4+2];		\
-            dst[dstCol*4+3] = src[srcCol*4+3];		\
-         }						\
-      }							\
-   }							\
-}
-
-/**
- * Resamplers for 1, 2, 4, 8 and 16-byte pixels.
- */
-RESAMPLE(resample_row_1, GLubyte, 1)
-RESAMPLE(resample_row_2, GLushort, 1)
-RESAMPLE(resample_row_4, GLuint, 1)
-RESAMPLE(resample_row_8, GLuint, 2)
-RESAMPLE(resample_row_16, GLuint, 4)
-
-
-/**
- * Blit color, depth or stencil with GL_NEAREST filtering.
- */
-static void
-blit_nearest(GLcontext *ctx,
-             GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-             GLbitfield buffer)
-{
-   struct gl_renderbuffer *readRb, *drawRb;
-
-   const GLint srcWidth = ABS(srcX1 - srcX0);
-   const GLint dstWidth = ABS(dstX1 - dstX0);
-   const GLint srcHeight = ABS(srcY1 - srcY0);
-   const GLint dstHeight = ABS(dstY1 - dstY0);
-
-   const GLint srcXpos = MIN2(srcX0, srcX1);
-   const GLint srcYpos = MIN2(srcY0, srcY1);
-   const GLint dstXpos = MIN2(dstX0, dstX1);
-   const GLint dstYpos = MIN2(dstY0, dstY1);
-
-   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);
-   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);
-
-   GLint dstRow;
-
-   GLint comps, pixelSize;
-   GLvoid *srcBuffer, *dstBuffer;
-   GLint prevY = -1;
-
-   typedef void (*resample_func)(GLint srcWidth, GLint dstWidth,
-                                 const GLvoid *srcBuffer, GLvoid *dstBuffer,
-                                 GLboolean flip);
-   resample_func resampleRow;
-
-   switch (buffer) {
-   case GL_COLOR_BUFFER_BIT:
-      readRb = ctx->ReadBuffer->_ColorReadBuffer;
-      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
-      comps = 4;
-      break;
-   case GL_DEPTH_BUFFER_BIT:
-      readRb = ctx->ReadBuffer->_DepthBuffer;
-      drawRb = ctx->DrawBuffer->_DepthBuffer;
-      comps = 1;
-      break;
-   case GL_STENCIL_BUFFER_BIT:
-      readRb = ctx->ReadBuffer->_StencilBuffer;
-      drawRb = ctx->DrawBuffer->_StencilBuffer;
-      comps = 1;
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected buffer in blit_nearest()");
-      return;
-   }
-
-   switch (readRb->DataType) {
-   case GL_UNSIGNED_BYTE:
-      pixelSize = comps * sizeof(GLubyte);
-      break;
-   case GL_UNSIGNED_SHORT:
-      pixelSize = comps * sizeof(GLushort);
-      break;
-   case GL_UNSIGNED_INT:
-      pixelSize = comps * sizeof(GLuint);
-      break;
-   case GL_FLOAT:
-      pixelSize = comps * sizeof(GLfloat);
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",
-                    readRb->DataType);
-      return;
-   }
-
-   /* choose row resampler */
-   switch (pixelSize) {
-   case 1:
-      resampleRow = resample_row_1;
-      break;
-   case 2:
-      resampleRow = resample_row_2;
-      break;
-   case 4:
-      resampleRow = resample_row_4;
-      break;
-   case 8:
-      resampleRow = resample_row_8;
-      break;
-   case 16:
-      resampleRow = resample_row_16;
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest",
-                    pixelSize);
-      return;
-   }
-
-   /* allocate the src/dst row buffers */
-   srcBuffer = malloc(pixelSize * srcWidth);
-   if (!srcBuffer) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
-      return;
-   }
-   dstBuffer = malloc(pixelSize * dstWidth);
-   if (!dstBuffer) {
-      free(srcBuffer);
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
-      return;
-   }
-
-   for (dstRow = 0; dstRow < dstHeight; dstRow++) {
-      const GLint dstY = dstYpos + dstRow;
-      GLint srcRow = (dstRow * srcHeight) / dstHeight;
-      GLint srcY;
-
-      ASSERT(srcRow >= 0);
-      ASSERT(srcRow < srcHeight);
-
-      if (invertY) {
-         srcRow = srcHeight - 1 - srcRow;
-      }
-
-      srcY = srcYpos + srcRow;
-
-      /* get pixel row from source and resample to match dest width */
-      if (prevY != srcY) {
-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY, srcBuffer);
-         (*resampleRow)(srcWidth, dstWidth, srcBuffer, dstBuffer, invertX);
-         prevY = srcY;
-      }
-
-      /* store pixel row in destination */
-      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
-   }
-
-   free(srcBuffer);
-   free(dstBuffer);
-}
-
-
-
-#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )
-
-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);
-}
-
-
-/**
- * Bilinear interpolation of two source rows.
- * GLubyte pixels.
- */
-static void
-resample_linear_row_ub(GLint srcWidth, GLint dstWidth,
-                       const GLvoid *srcBuffer0, const GLvoid *srcBuffer1,
-                       GLvoid *dstBuffer, GLboolean flip, GLfloat rowWeight)
-{
-   const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0;
-   const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1;
-   GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer;
-   const GLfloat dstWidthF = (GLfloat) dstWidth;
-   GLint dstCol;
-
-   for (dstCol = 0; dstCol < dstWidth; dstCol++) {
-      const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF;
-      GLint srcCol0 = IFLOOR(srcCol);
-      GLint srcCol1 = srcCol0 + 1;
-      GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */
-      GLfloat red, green, blue, alpha;
-
-      ASSERT(srcCol0 >= 0);
-      ASSERT(srcCol0 < srcWidth);
-      ASSERT(srcCol1 <= srcWidth);
-
-      if (srcCol1 == srcWidth) {
-         /* last column fudge */
-         srcCol1--;
-         colWeight = 0.0;
-      }
-
-      if (flip) {
-         srcCol0 = srcWidth - 1 - srcCol0;
-         srcCol1 = srcWidth - 1 - srcCol1;
-      }
-
-      red = lerp_2d(colWeight, rowWeight,
-                    srcColor0[srcCol0][RCOMP], srcColor0[srcCol1][RCOMP],
-                    srcColor1[srcCol0][RCOMP], srcColor1[srcCol1][RCOMP]);
-      green = lerp_2d(colWeight, rowWeight,
-                    srcColor0[srcCol0][GCOMP], srcColor0[srcCol1][GCOMP],
-                    srcColor1[srcCol0][GCOMP], srcColor1[srcCol1][GCOMP]);
-      blue = lerp_2d(colWeight, rowWeight,
-                    srcColor0[srcCol0][BCOMP], srcColor0[srcCol1][BCOMP],
-                    srcColor1[srcCol0][BCOMP], srcColor1[srcCol1][BCOMP]);
-      alpha = lerp_2d(colWeight, rowWeight,
-                    srcColor0[srcCol0][ACOMP], srcColor0[srcCol1][ACOMP],
-                    srcColor1[srcCol0][ACOMP], srcColor1[srcCol1][ACOMP]);
-      
-      dstColor[dstCol][RCOMP] = IFLOOR(red);
-      dstColor[dstCol][GCOMP] = IFLOOR(green);
-      dstColor[dstCol][BCOMP] = IFLOOR(blue);
-      dstColor[dstCol][ACOMP] = IFLOOR(alpha);
-   }
-}
-
-
-
-/**
- * Bilinear filtered blit (color only).
- */
-static void
-blit_linear(GLcontext *ctx,
-            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1)
-{
-   struct gl_renderbuffer *readRb = ctx->ReadBuffer->_ColorReadBuffer;
-   struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
-
-   const GLint srcWidth = ABS(srcX1 - srcX0);
-   const GLint dstWidth = ABS(dstX1 - dstX0);
-   const GLint srcHeight = ABS(srcY1 - srcY0);
-   const GLint dstHeight = ABS(dstY1 - dstY0);
-   const GLfloat dstHeightF = (GLfloat) dstHeight;
-
-   const GLint srcXpos = MIN2(srcX0, srcX1);
-   const GLint srcYpos = MIN2(srcY0, srcY1);
-   const GLint dstXpos = MIN2(dstX0, dstX1);
-   const GLint dstYpos = MIN2(dstY0, dstY1);
-
-   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);
-   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);
-
-   GLint dstRow;
-
-   GLint pixelSize;
-   GLvoid *srcBuffer0, *srcBuffer1;
-   GLint srcBufferY0 = -1, srcBufferY1 = -1;
-   GLvoid *dstBuffer;
-
-   switch (readRb->DataType) {
-   case GL_UNSIGNED_BYTE:
-      pixelSize = 4 * sizeof(GLubyte);
-      break;
-   case GL_UNSIGNED_SHORT:
-      pixelSize = 4 * sizeof(GLushort);
-      break;
-   case GL_UNSIGNED_INT:
-      pixelSize = 4 * sizeof(GLuint);
-      break;
-   case GL_FLOAT:
-      pixelSize = 4 * sizeof(GLfloat);
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",
-                    readRb->DataType);
-      return;
-   }
-
-   /* Allocate the src/dst row buffers.
-    * Keep two adjacent src rows around for bilinear sampling.
-    */
-   srcBuffer0 = malloc(pixelSize * srcWidth);
-   if (!srcBuffer0) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
-      return;
-   }
-   srcBuffer1 = malloc(pixelSize * srcWidth);
-   if (!srcBuffer1) {
-      free(srcBuffer0);
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
-      return;
-   }
-   dstBuffer = malloc(pixelSize * dstWidth);
-   if (!dstBuffer) {
-      free(srcBuffer0);
-      free(srcBuffer1);
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
-      return;
-   }
-
-   for (dstRow = 0; dstRow < dstHeight; dstRow++) {
-      const GLint dstY = dstYpos + dstRow;
-      const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF;
-      GLint srcRow0 = IFLOOR(srcRow);
-      GLint srcRow1 = srcRow0 + 1;
-      GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */
-
-      ASSERT(srcRow >= 0);
-      ASSERT(srcRow < srcHeight);
-
-      if (srcRow1 == srcHeight) {
-         /* last row fudge */
-         srcRow1 = srcRow0;
-         rowWeight = 0.0;
-      }
-
-      if (invertY) {
-         srcRow0 = srcHeight - 1 - srcRow0;
-         srcRow1 = srcHeight - 1 - srcRow1;
-      }
-
-      srcY0 = srcYpos + srcRow0;
-      srcY1 = srcYpos + srcRow1;
-
-      /* get the two source rows */
-      if (srcY0 == srcBufferY0 && srcY1 == srcBufferY1) {
-         /* use same source row buffers again */
-      }
-      else if (srcY0 == srcBufferY1) {
-         /* move buffer1 into buffer0 by swapping pointers */
-         GLvoid *tmp = srcBuffer0;
-         srcBuffer0 = srcBuffer1;
-         srcBuffer1 = tmp;
-         /* get y1 row */
-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);
-         srcBufferY0 = srcY0;
-         srcBufferY1 = srcY1;
-      }
-      else {
-         /* get both new rows */
-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY0, srcBuffer0);
-         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);
-         srcBufferY0 = srcY0;
-         srcBufferY1 = srcY1;
-      }
-
-      if (readRb->DataType == GL_UNSIGNED_BYTE) {
-         resample_linear_row_ub(srcWidth, dstWidth, srcBuffer0, srcBuffer1,
-                                dstBuffer, invertX, rowWeight);
-      }
-      else {
-         _mesa_problem(ctx, "Unsupported color channel type in sw blit");
-         break;
-      }
-
-      /* store pixel row in destination */
-      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
-   }
-
-   free(srcBuffer0);
-   free(srcBuffer1);
-   free(dstBuffer);
-}
-
-
-/**
- * Simple case:  Blit color, depth or stencil with no scaling or flipping.
- * XXX we could easily support vertical flipping here.
- */
-static void
-simple_blit(GLcontext *ctx,
-            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-            GLbitfield buffer)
-{
-   struct gl_renderbuffer *readRb, *drawRb;
-   const GLint width = srcX1 - srcX0;
-   const GLint height = srcY1 - srcY0;
-   GLint row, srcY, dstY, yStep;
-   GLint comps, bytesPerRow;
-   void *rowBuffer;
-
-   /* only one buffer */
-   ASSERT(_mesa_bitcount(buffer) == 1);
-   /* no flipping checks */
-   ASSERT(srcX0 < srcX1);
-   ASSERT(srcY0 < srcY1);
-   ASSERT(dstX0 < dstX1);
-   ASSERT(dstY0 < dstY1);
-   /* size checks */
-   ASSERT(srcX1 - srcX0 == dstX1 - dstX0);
-   ASSERT(srcY1 - srcY0 == dstY1 - dstY0);
-
-   /* determine if copy should be bottom-to-top or top-to-bottom */
-   if (srcY0 > dstY0) {
-      /* src above dst: copy bottom-to-top */
-      yStep = 1;
-      srcY = srcY0;
-      dstY = dstY0;
-   }
-   else {
-      /* src below dst: copy top-to-bottom */
-      yStep = -1;
-      srcY = srcY1 - 1;
-      dstY = dstY1 - 1;
-   }
-
-   switch (buffer) {
-   case GL_COLOR_BUFFER_BIT:
-      readRb = ctx->ReadBuffer->_ColorReadBuffer;
-      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];
-      comps = 4;
-      break;
-   case GL_DEPTH_BUFFER_BIT:
-      readRb = ctx->ReadBuffer->_DepthBuffer;
-      drawRb = ctx->DrawBuffer->_DepthBuffer;
-      comps = 1;
-      break;
-   case GL_STENCIL_BUFFER_BIT:
-      readRb = ctx->ReadBuffer->_StencilBuffer;
-      drawRb = ctx->DrawBuffer->_StencilBuffer;
-      comps = 1;
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected buffer in simple_blit()");
-      return;
-   }
-
-   ASSERT(readRb->DataType == drawRb->DataType);
-
-   /* compute bytes per row */
-   switch (readRb->DataType) {
-   case GL_UNSIGNED_BYTE:
-      bytesPerRow = comps * width * sizeof(GLubyte);
-      break;
-   case GL_UNSIGNED_SHORT:
-      bytesPerRow = comps * width * sizeof(GLushort);
-      break;
-   case GL_UNSIGNED_INT:
-      bytesPerRow = comps * width * sizeof(GLuint);
-      break;
-   case GL_FLOAT:
-      bytesPerRow = comps * width * sizeof(GLfloat);
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected buffer type in simple_blit");
-      return;
-   }
-
-   /* allocate the row buffer */
-   rowBuffer = malloc(bytesPerRow);
-   if (!rowBuffer) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
-      return;
-   }
-
-   for (row = 0; row < height; row++) {
-      readRb->GetRow(ctx, readRb, width, srcX0, srcY, rowBuffer);
-      drawRb->PutRow(ctx, drawRb, width, dstX0, dstY, rowBuffer, NULL);
-      srcY += yStep;
-      dstY += yStep;
-   }
-
-   free(rowBuffer);
-}
-
-
-/**
- * Software fallback for glBlitFramebufferEXT().
- */
-void
-_swrast_BlitFramebuffer(GLcontext *ctx,
-                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                        GLbitfield mask, GLenum filter)
-{
-   static const GLbitfield buffers[3] = {
-      GL_COLOR_BUFFER_BIT,
-      GL_DEPTH_BUFFER_BIT,
-      GL_STENCIL_BUFFER_BIT
-   };
-   GLint i;
-
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't clear */
-
-   if (!ctx->DrawBuffer->_NumColorDrawBuffers)
-      return;
-
-   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
-                        &dstX0, &dstY0, &dstX1, &dstY1)) {
-      return;
-   }
-
-   swrast_render_start(ctx);
-
-   if (srcX1 - srcX0 == dstX1 - dstX0 &&
-       srcY1 - srcY0 == dstY1 - dstY0 &&
-       srcX0 < srcX1 &&
-       srcY0 < srcY1 &&
-       dstX0 < dstX1 &&
-       dstY0 < dstY1) {
-      /* no stretching or flipping.
-       * filter doesn't matter.
-       */
-      for (i = 0; i < 3; i++) {
-         if (mask & buffers[i]) {
-            simple_blit(ctx, srcX0, srcY0, srcX1, srcY1,
-                        dstX0, dstY0, dstX1, dstY1, buffers[i]);
-         }
-      }
-   }
-   else {
-      if (filter == GL_NEAREST) {
-         for (i = 0; i < 3; i++) {
-            if (mask & buffers[i]) {
-               blit_nearest(ctx,  srcX0, srcY0, srcX1, srcY1,
-                            dstX0, dstY0, dstX1, dstY1, buffers[i]);
-            }
-         }
-      }
-      else {
-         ASSERT(filter == GL_LINEAR);
-         if (mask & GL_COLOR_BUFFER_BIT) {  /* depth/stencil not allowed */
-            blit_linear(ctx,  srcX0, srcY0, srcX1, srcY1,
-                        dstX0, dstY0, dstX1, dstY1);
-         }
-      }
-   }
-
-   swrast_render_finish(ctx);
-}
+/*

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

+ */

+

+

+#include "main/glheader.h"

+#include "main/condrender.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "s_context.h"

+

+

+#define ABS(X)   ((X) < 0 ? -(X) : (X))

+

+

+/**

+ * Generate a row resampler function for GL_NEAREST mode.

+ */

+#define RESAMPLE(NAME, PIXELTYPE, SIZE)			\

+static void						\

+NAME(GLint srcWidth, GLint dstWidth,			\

+     const GLvoid *srcBuffer, GLvoid *dstBuffer,	\

+     GLboolean flip)					\

+{							\

+   const PIXELTYPE *src = (const PIXELTYPE *) srcBuffer;\

+   PIXELTYPE *dst = (PIXELTYPE *) dstBuffer;		\

+   GLint dstCol;					\

+							\

+   if (flip) {						\

+      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\

+         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\

+         ASSERT(srcCol >= 0);				\

+         ASSERT(srcCol < srcWidth);			\

+         srcCol = srcWidth - 1 - srcCol; /* flip */	\

+         if (SIZE == 1) {				\

+            dst[dstCol] = src[srcCol];			\

+         }						\

+         else if (SIZE == 2) {				\

+            dst[dstCol*2+0] = src[srcCol*2+0];		\

+            dst[dstCol*2+1] = src[srcCol*2+1];		\

+         }						\

+         else if (SIZE == 4) {				\

+            dst[dstCol*4+0] = src[srcCol*4+0];		\

+            dst[dstCol*4+1] = src[srcCol*4+1];		\

+            dst[dstCol*4+2] = src[srcCol*4+2];		\

+            dst[dstCol*4+3] = src[srcCol*4+3];		\

+         }						\

+      }							\

+   }							\

+   else {						\

+      for (dstCol = 0; dstCol < dstWidth; dstCol++) {	\

+         GLint srcCol = (dstCol * srcWidth) / dstWidth;	\

+         ASSERT(srcCol >= 0);				\

+         ASSERT(srcCol < srcWidth);			\

+         if (SIZE == 1) {				\

+            dst[dstCol] = src[srcCol];			\

+         }						\

+         else if (SIZE == 2) {				\

+            dst[dstCol*2+0] = src[srcCol*2+0];		\

+            dst[dstCol*2+1] = src[srcCol*2+1];		\

+         }						\

+         else if (SIZE == 4) {				\

+            dst[dstCol*4+0] = src[srcCol*4+0];		\

+            dst[dstCol*4+1] = src[srcCol*4+1];		\

+            dst[dstCol*4+2] = src[srcCol*4+2];		\

+            dst[dstCol*4+3] = src[srcCol*4+3];		\

+         }						\

+      }							\

+   }							\

+}

+

+/**

+ * Resamplers for 1, 2, 4, 8 and 16-byte pixels.

+ */

+RESAMPLE(resample_row_1, GLubyte, 1)

+RESAMPLE(resample_row_2, GLushort, 1)

+RESAMPLE(resample_row_4, GLuint, 1)

+RESAMPLE(resample_row_8, GLuint, 2)

+RESAMPLE(resample_row_16, GLuint, 4)

+

+

+/**

+ * Blit color, depth or stencil with GL_NEAREST filtering.

+ */

+static void

+blit_nearest(struct gl_context *ctx,

+             GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+             GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+             GLbitfield buffer)

+{

+   struct gl_renderbuffer *readRb, *drawRb;

+

+   const GLint srcWidth = ABS(srcX1 - srcX0);

+   const GLint dstWidth = ABS(dstX1 - dstX0);

+   const GLint srcHeight = ABS(srcY1 - srcY0);

+   const GLint dstHeight = ABS(dstY1 - dstY0);

+

+   const GLint srcXpos = MIN2(srcX0, srcX1);

+   const GLint srcYpos = MIN2(srcY0, srcY1);

+   const GLint dstXpos = MIN2(dstX0, dstX1);

+   const GLint dstYpos = MIN2(dstY0, dstY1);

+

+   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);

+   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);

+

+   GLint dstRow;

+

+   GLint comps, pixelSize;

+   GLvoid *srcBuffer, *dstBuffer;

+   GLint prevY = -1;

+

+   typedef void (*resample_func)(GLint srcWidth, GLint dstWidth,

+                                 const GLvoid *srcBuffer, GLvoid *dstBuffer,

+                                 GLboolean flip);

+   resample_func resampleRow;

+

+   switch (buffer) {

+   case GL_COLOR_BUFFER_BIT:

+      readRb = ctx->ReadBuffer->_ColorReadBuffer;

+      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

+      comps = 4;

+      break;

+   case GL_DEPTH_BUFFER_BIT:

+      readRb = ctx->ReadBuffer->_DepthBuffer;

+      drawRb = ctx->DrawBuffer->_DepthBuffer;

+      comps = 1;

+      break;

+   case GL_STENCIL_BUFFER_BIT:

+      readRb = ctx->ReadBuffer->_StencilBuffer;

+      drawRb = ctx->DrawBuffer->_StencilBuffer;

+      comps = 1;

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected buffer in blit_nearest()");

+      return;

+   }

+

+   switch (readRb->DataType) {

+   case GL_UNSIGNED_BYTE:

+      pixelSize = comps * sizeof(GLubyte);

+      break;

+   case GL_UNSIGNED_SHORT:

+      pixelSize = comps * sizeof(GLushort);

+      break;

+   case GL_UNSIGNED_INT:

+      pixelSize = comps * sizeof(GLuint);

+      break;

+   case GL_FLOAT:

+      pixelSize = comps * sizeof(GLfloat);

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",

+                    readRb->DataType);

+      return;

+   }

+

+   /* choose row resampler */

+   switch (pixelSize) {

+   case 1:

+      resampleRow = resample_row_1;

+      break;

+   case 2:

+      resampleRow = resample_row_2;

+      break;

+   case 4:

+      resampleRow = resample_row_4;

+      break;

+   case 8:

+      resampleRow = resample_row_8;

+      break;

+   case 16:

+      resampleRow = resample_row_16;

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected pixel size (%d) in blit_nearest",

+                    pixelSize);

+      return;

+   }

+

+   /* allocate the src/dst row buffers */

+   srcBuffer = malloc(pixelSize * srcWidth);

+   if (!srcBuffer) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

+      return;

+   }

+   dstBuffer = malloc(pixelSize * dstWidth);

+   if (!dstBuffer) {

+      free(srcBuffer);

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

+      return;

+   }

+

+   for (dstRow = 0; dstRow < dstHeight; dstRow++) {

+      const GLint dstY = dstYpos + dstRow;

+      GLint srcRow = (dstRow * srcHeight) / dstHeight;

+      GLint srcY;

+

+      ASSERT(srcRow >= 0);

+      ASSERT(srcRow < srcHeight);

+

+      if (invertY) {

+         srcRow = srcHeight - 1 - srcRow;

+      }

+

+      srcY = srcYpos + srcRow;

+

+      /* get pixel row from source and resample to match dest width */

+      if (prevY != srcY) {

+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY, srcBuffer);

+         (*resampleRow)(srcWidth, dstWidth, srcBuffer, dstBuffer, invertX);

+         prevY = srcY;

+      }

+

+      /* store pixel row in destination */

+      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);

+   }

+

+   free(srcBuffer);

+   free(dstBuffer);

+}

+

+

+

+#define LERP(T, A, B)  ( (A) + (T) * ((B) - (A)) )

+

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

+}

+

+

+/**

+ * Bilinear interpolation of two source rows.

+ * GLubyte pixels.

+ */

+static void

+resample_linear_row_ub(GLint srcWidth, GLint dstWidth,

+                       const GLvoid *srcBuffer0, const GLvoid *srcBuffer1,

+                       GLvoid *dstBuffer, GLboolean flip, GLfloat rowWeight)

+{

+   const GLubyte (*srcColor0)[4] = (const GLubyte (*)[4]) srcBuffer0;

+   const GLubyte (*srcColor1)[4] = (const GLubyte (*)[4]) srcBuffer1;

+   GLubyte (*dstColor)[4] = (GLubyte (*)[4]) dstBuffer;

+   const GLfloat dstWidthF = (GLfloat) dstWidth;

+   GLint dstCol;

+

+   for (dstCol = 0; dstCol < dstWidth; dstCol++) {

+      const GLfloat srcCol = (dstCol * srcWidth) / dstWidthF;

+      GLint srcCol0 = IFLOOR(srcCol);

+      GLint srcCol1 = srcCol0 + 1;

+      GLfloat colWeight = srcCol - srcCol0; /* fractional part of srcCol */

+      GLfloat red, green, blue, alpha;

+

+      ASSERT(srcCol0 >= 0);

+      ASSERT(srcCol0 < srcWidth);

+      ASSERT(srcCol1 <= srcWidth);

+

+      if (srcCol1 == srcWidth) {

+         /* last column fudge */

+         srcCol1--;

+         colWeight = 0.0;

+      }

+

+      if (flip) {

+         srcCol0 = srcWidth - 1 - srcCol0;

+         srcCol1 = srcWidth - 1 - srcCol1;

+      }

+

+      red = lerp_2d(colWeight, rowWeight,

+                    srcColor0[srcCol0][RCOMP], srcColor0[srcCol1][RCOMP],

+                    srcColor1[srcCol0][RCOMP], srcColor1[srcCol1][RCOMP]);

+      green = lerp_2d(colWeight, rowWeight,

+                    srcColor0[srcCol0][GCOMP], srcColor0[srcCol1][GCOMP],

+                    srcColor1[srcCol0][GCOMP], srcColor1[srcCol1][GCOMP]);

+      blue = lerp_2d(colWeight, rowWeight,

+                    srcColor0[srcCol0][BCOMP], srcColor0[srcCol1][BCOMP],

+                    srcColor1[srcCol0][BCOMP], srcColor1[srcCol1][BCOMP]);

+      alpha = lerp_2d(colWeight, rowWeight,

+                    srcColor0[srcCol0][ACOMP], srcColor0[srcCol1][ACOMP],

+                    srcColor1[srcCol0][ACOMP], srcColor1[srcCol1][ACOMP]);

+      

+      dstColor[dstCol][RCOMP] = IFLOOR(red);

+      dstColor[dstCol][GCOMP] = IFLOOR(green);

+      dstColor[dstCol][BCOMP] = IFLOOR(blue);

+      dstColor[dstCol][ACOMP] = IFLOOR(alpha);

+   }

+}

+

+

+

+/**

+ * Bilinear filtered blit (color only).

+ */

+static void

+blit_linear(struct gl_context *ctx,

+            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1)

+{

+   struct gl_renderbuffer *readRb = ctx->ReadBuffer->_ColorReadBuffer;

+   struct gl_renderbuffer *drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

+

+   const GLint srcWidth = ABS(srcX1 - srcX0);

+   const GLint dstWidth = ABS(dstX1 - dstX0);

+   const GLint srcHeight = ABS(srcY1 - srcY0);

+   const GLint dstHeight = ABS(dstY1 - dstY0);

+   const GLfloat dstHeightF = (GLfloat) dstHeight;

+

+   const GLint srcXpos = MIN2(srcX0, srcX1);

+   const GLint srcYpos = MIN2(srcY0, srcY1);

+   const GLint dstXpos = MIN2(dstX0, dstX1);

+   const GLint dstYpos = MIN2(dstY0, dstY1);

+

+   const GLboolean invertX = (srcX1 < srcX0) ^ (dstX1 < dstX0);

+   const GLboolean invertY = (srcY1 < srcY0) ^ (dstY1 < dstY0);

+

+   GLint dstRow;

+

+   GLint pixelSize;

+   GLvoid *srcBuffer0, *srcBuffer1;

+   GLint srcBufferY0 = -1, srcBufferY1 = -1;

+   GLvoid *dstBuffer;

+

+   switch (readRb->DataType) {

+   case GL_UNSIGNED_BYTE:

+      pixelSize = 4 * sizeof(GLubyte);

+      break;

+   case GL_UNSIGNED_SHORT:

+      pixelSize = 4 * sizeof(GLushort);

+      break;

+   case GL_UNSIGNED_INT:

+      pixelSize = 4 * sizeof(GLuint);

+      break;

+   case GL_FLOAT:

+      pixelSize = 4 * sizeof(GLfloat);

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected buffer type (0x%x) in blit_nearest",

+                    readRb->DataType);

+      return;

+   }

+

+   /* Allocate the src/dst row buffers.

+    * Keep two adjacent src rows around for bilinear sampling.

+    */

+   srcBuffer0 = malloc(pixelSize * srcWidth);

+   if (!srcBuffer0) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

+      return;

+   }

+   srcBuffer1 = malloc(pixelSize * srcWidth);

+   if (!srcBuffer1) {

+      free(srcBuffer0);

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

+      return;

+   }

+   dstBuffer = malloc(pixelSize * dstWidth);

+   if (!dstBuffer) {

+      free(srcBuffer0);

+      free(srcBuffer1);

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

+      return;

+   }

+

+   for (dstRow = 0; dstRow < dstHeight; dstRow++) {

+      const GLint dstY = dstYpos + dstRow;

+      const GLfloat srcRow = (dstRow * srcHeight) / dstHeightF;

+      GLint srcRow0 = IFLOOR(srcRow);

+      GLint srcRow1 = srcRow0 + 1;

+      GLfloat rowWeight = srcRow - srcRow0; /* fractional part of srcRow */

+

+      ASSERT(srcRow >= 0);

+      ASSERT(srcRow < srcHeight);

+

+      if (srcRow1 == srcHeight) {

+         /* last row fudge */

+         srcRow1 = srcRow0;

+         rowWeight = 0.0;

+      }

+

+      if (invertY) {

+         srcRow0 = srcHeight - 1 - srcRow0;

+         srcRow1 = srcHeight - 1 - srcRow1;

+      }

+

+      srcY0 = srcYpos + srcRow0;

+      srcY1 = srcYpos + srcRow1;

+

+      /* get the two source rows */

+      if (srcY0 == srcBufferY0 && srcY1 == srcBufferY1) {

+         /* use same source row buffers again */

+      }

+      else if (srcY0 == srcBufferY1) {

+         /* move buffer1 into buffer0 by swapping pointers */

+         GLvoid *tmp = srcBuffer0;

+         srcBuffer0 = srcBuffer1;

+         srcBuffer1 = tmp;

+         /* get y1 row */

+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);

+         srcBufferY0 = srcY0;

+         srcBufferY1 = srcY1;

+      }

+      else {

+         /* get both new rows */

+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY0, srcBuffer0);

+         readRb->GetRow(ctx, readRb, srcWidth, srcXpos, srcY1, srcBuffer1);

+         srcBufferY0 = srcY0;

+         srcBufferY1 = srcY1;

+      }

+

+      if (readRb->DataType == GL_UNSIGNED_BYTE) {

+         resample_linear_row_ub(srcWidth, dstWidth, srcBuffer0, srcBuffer1,

+                                dstBuffer, invertX, rowWeight);

+      }

+      else {

+         _mesa_problem(ctx, "Unsupported color channel type in sw blit");

+         break;

+      }

+

+      /* store pixel row in destination */

+      drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);

+   }

+

+   free(srcBuffer0);

+   free(srcBuffer1);

+   free(dstBuffer);

+}

+

+

+/**

+ * Simple case:  Blit color, depth or stencil with no scaling or flipping.

+ * XXX we could easily support vertical flipping here.

+ */

+static void

+simple_blit(struct gl_context *ctx,

+            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,

+            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,

+            GLbitfield buffer)

+{

+   struct gl_renderbuffer *readRb, *drawRb;

+   const GLint width = srcX1 - srcX0;

+   const GLint height = srcY1 - srcY0;

+   GLint row, srcY, dstY, yStep;

+   GLint comps, bytesPerRow;

+   void *rowBuffer;

+

+   /* only one buffer */

+   ASSERT(_mesa_bitcount(buffer) == 1);

+   /* no flipping checks */

+   ASSERT(srcX0 < srcX1);

+   ASSERT(srcY0 < srcY1);

+   ASSERT(dstX0 < dstX1);

+   ASSERT(dstY0 < dstY1);

+   /* size checks */

+   ASSERT(srcX1 - srcX0 == dstX1 - dstX0);

+   ASSERT(srcY1 - srcY0 == dstY1 - dstY0);

+

+   /* determine if copy should be bottom-to-top or top-to-bottom */

+   if (srcY0 > dstY0) {

+      /* src above dst: copy bottom-to-top */

+      yStep = 1;

+      srcY = srcY0;

+      dstY = dstY0;

+   }

+   else {

+      /* src below dst: copy top-to-bottom */

+      yStep = -1;

+      srcY = srcY1 - 1;

+      dstY = dstY1 - 1;

+   }

+

+   switch (buffer) {

+   case GL_COLOR_BUFFER_BIT:

+      readRb = ctx->ReadBuffer->_ColorReadBuffer;

+      drawRb = ctx->DrawBuffer->_ColorDrawBuffers[0];

+      comps = 4;

+      break;

+   case GL_DEPTH_BUFFER_BIT:

+      readRb = ctx->ReadBuffer->_DepthBuffer;

+      drawRb = ctx->DrawBuffer->_DepthBuffer;

+      comps = 1;

+      break;

+   case GL_STENCIL_BUFFER_BIT:

+      readRb = ctx->ReadBuffer->_StencilBuffer;

+      drawRb = ctx->DrawBuffer->_StencilBuffer;

+      comps = 1;

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected buffer in simple_blit()");

+      return;

+   }

+

+   ASSERT(readRb->DataType == drawRb->DataType);

+

+   /* compute bytes per row */

+   switch (readRb->DataType) {

+   case GL_UNSIGNED_BYTE:

+      bytesPerRow = comps * width * sizeof(GLubyte);

+      break;

+   case GL_UNSIGNED_SHORT:

+      bytesPerRow = comps * width * sizeof(GLushort);

+      break;

+   case GL_UNSIGNED_INT:

+      bytesPerRow = comps * width * sizeof(GLuint);

+      break;

+   case GL_FLOAT:

+      bytesPerRow = comps * width * sizeof(GLfloat);

+      break;

+   default:

+      _mesa_problem(ctx, "unexpected buffer type in simple_blit");

+      return;

+   }

+

+   /* allocate the row buffer */

+   rowBuffer = malloc(bytesPerRow);

+   if (!rowBuffer) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");

+      return;

+   }

+

+   for (row = 0; row < height; row++) {

+      readRb->GetRow(ctx, readRb, width, srcX0, srcY, rowBuffer);

+      drawRb->PutRow(ctx, drawRb, width, dstX0, dstY, rowBuffer, NULL);

+      srcY += yStep;

+      dstY += yStep;

+   }

+

+   free(rowBuffer);

+}

+

+

+/**

+ * Software fallback for glBlitFramebufferEXT().

+ */

+void

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

+{

+   static const GLbitfield buffers[3] = {

+      GL_COLOR_BUFFER_BIT,

+      GL_DEPTH_BUFFER_BIT,

+      GL_STENCIL_BUFFER_BIT

+   };

+   GLint i;

+

+   if (!_mesa_check_conditional_render(ctx))

+      return; /* don't clear */

+

+   if (!ctx->DrawBuffer->_NumColorDrawBuffers)

+      return;

+

+   if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,

+                        &dstX0, &dstY0, &dstX1, &dstY1)) {

+      return;

+   }

+

+   swrast_render_start(ctx);

+

+   if (srcX1 - srcX0 == dstX1 - dstX0 &&

+       srcY1 - srcY0 == dstY1 - dstY0 &&

+       srcX0 < srcX1 &&

+       srcY0 < srcY1 &&

+       dstX0 < dstX1 &&

+       dstY0 < dstY1) {

+      /* no stretching or flipping.

+       * filter doesn't matter.

+       */

+      for (i = 0; i < 3; i++) {

+         if (mask & buffers[i]) {

+            simple_blit(ctx, srcX0, srcY0, srcX1, srcY1,

+                        dstX0, dstY0, dstX1, dstY1, buffers[i]);

+         }

+      }

+   }

+   else {

+      if (filter == GL_NEAREST) {

+         for (i = 0; i < 3; i++) {

+            if (mask & buffers[i]) {

+               blit_nearest(ctx,  srcX0, srcY0, srcX1, srcY1,

+                            dstX0, dstY0, dstX1, dstY1, buffers[i]);

+            }

+         }

+      }

+      else {

+         ASSERT(filter == GL_LINEAR);

+         if (mask & GL_COLOR_BUFFER_BIT) {  /* depth/stencil not allowed */

+            blit_linear(ctx,  srcX0, srcY0, srcX1, srcY1,

+                        dstX0, dstY0, dstX1, dstY1);

+         }

+      }

+   }

+

+   swrast_render_finish(ctx);

+}

diff --git a/mesalib/src/mesa/swrast/s_clear.c b/mesalib/src/mesa/swrast/s_clear.c
index efe500ae2..fac092f1e 100644
--- a/mesalib/src/mesa/swrast/s_clear.c
+++ b/mesalib/src/mesa/swrast/s_clear.c
@@ -1,230 +1,230 @@
-/*
- * 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 "main/glheader.h"
-#include "main/colormac.h"
-#include "main/condrender.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "s_accum.h"
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_masking.h"
-#include "s_stencil.h"
-
-
-/**
- * Clear the color buffer when glColorMask is in effect.
- */
-static void
-clear_rgba_buffer_with_masking(GLcontext *ctx, struct gl_renderbuffer *rb,
-                               GLuint buf)
-{
-   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;
-   SWspan span;
-   GLint i;
-
-   ASSERT(rb->PutRow);
-
-   /* Initialize color span with clear color */
-   /* XXX optimize for clearcolor == black/zero (bzero) */
-   INIT_SPAN(span, GL_BITMAP);
-   span.end = width;
-   span.arrayMask = SPAN_RGBA;
-   span.array->ChanType = rb->DataType;
-   if (span.array->ChanType == GL_UNSIGNED_BYTE) {
-      GLubyte clearColor[4];
-      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[RCOMP], ctx->Color.ClearColor[0]);
-      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[GCOMP], ctx->Color.ClearColor[1]);
-      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[BCOMP], ctx->Color.ClearColor[2]);
-      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[ACOMP], ctx->Color.ClearColor[3]);
-      for (i = 0; i < width; i++) {
-         COPY_4UBV(span.array->rgba[i], clearColor);
-      }
-   }
-   else if (span.array->ChanType == GL_UNSIGNED_SHORT) {
-      GLushort clearColor[4];
-      UNCLAMPED_FLOAT_TO_USHORT(clearColor[RCOMP], ctx->Color.ClearColor[0]);
-      UNCLAMPED_FLOAT_TO_USHORT(clearColor[GCOMP], ctx->Color.ClearColor[1]);
-      UNCLAMPED_FLOAT_TO_USHORT(clearColor[BCOMP], ctx->Color.ClearColor[2]);
-      UNCLAMPED_FLOAT_TO_USHORT(clearColor[ACOMP], ctx->Color.ClearColor[3]);
-      for (i = 0; i < width; i++) {
-         COPY_4V_CAST(span.array->rgba[i], clearColor, GLchan);
-      }
-   }
-   else {
-      ASSERT(span.array->ChanType == GL_FLOAT);
-      for (i = 0; i < width; i++) {
-         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][0], ctx->Color.ClearColor[0]);
-         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][1], ctx->Color.ClearColor[1]);
-         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][2], ctx->Color.ClearColor[2]);
-         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][3], ctx->Color.ClearColor[3]);
-      }
-   }
-
-   /* Note that masking will change the color values, but only the
-    * channels for which the write mask is GL_FALSE.  The channels
-    * which which are write-enabled won't get modified.
-    */
-   for (i = 0; i < height; i++) {
-      span.x = x;
-      span.y = y + i;
-      _swrast_mask_rgba_span(ctx, rb, &span, buf);
-      /* write masked row */
-      rb->PutRow(ctx, rb, width, x, y + i, span.array->rgba, NULL);
-   }
-}
-
-
-/**
- * Clear an rgba color buffer without channel masking.
- */
-static void
-clear_rgba_buffer(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint buf)
-{
-   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;
-   GLubyte clear8[4];
-   GLushort clear16[4];
-   GLvoid *clearVal;
-   GLint i;
-
-   ASSERT(ctx->Color.ColorMask[buf][0] &&
-          ctx->Color.ColorMask[buf][1] &&
-          ctx->Color.ColorMask[buf][2] &&
-          ctx->Color.ColorMask[buf][3]);             
-
-   ASSERT(rb->PutMonoRow);
-
-   switch (rb->DataType) {
-      case GL_UNSIGNED_BYTE:
-         UNCLAMPED_FLOAT_TO_UBYTE(clear8[0], ctx->Color.ClearColor[0]);
-         UNCLAMPED_FLOAT_TO_UBYTE(clear8[1], ctx->Color.ClearColor[1]);
-         UNCLAMPED_FLOAT_TO_UBYTE(clear8[2], ctx->Color.ClearColor[2]);
-         UNCLAMPED_FLOAT_TO_UBYTE(clear8[3], ctx->Color.ClearColor[3]);
-         clearVal = clear8;
-         break;
-      case GL_UNSIGNED_SHORT:
-         UNCLAMPED_FLOAT_TO_USHORT(clear16[0], ctx->Color.ClearColor[0]);
-         UNCLAMPED_FLOAT_TO_USHORT(clear16[1], ctx->Color.ClearColor[1]);
-         UNCLAMPED_FLOAT_TO_USHORT(clear16[2], ctx->Color.ClearColor[2]);
-         UNCLAMPED_FLOAT_TO_USHORT(clear16[3], ctx->Color.ClearColor[3]);
-         clearVal = clear16;
-         break;
-      case GL_FLOAT:
-         clearVal = ctx->Color.ClearColor;
-         break;
-      default:
-         _mesa_problem(ctx, "Bad rb DataType in clear_color_buffer");
-         return;
-   }
-
-   for (i = 0; i < height; i++) {
-      rb->PutMonoRow(ctx, rb, width, x, y + i, clearVal, NULL);
-   }
-}
-
-
-/**
- * Clear the front/back/left/right/aux color buffers.
- * This function is usually only called if the device driver can't
- * clear its own color buffers for some reason (such as with masking).
- */
-static void
-clear_color_buffers(GLcontext *ctx)
-{
-   GLuint buf;
-
-   for (buf = 0; buf < ctx->DrawBuffer->_NumColorDrawBuffers; buf++) {
-      struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[buf];
-      if (ctx->Color.ColorMask[buf][0] == 0 ||
-          ctx->Color.ColorMask[buf][1] == 0 ||
-          ctx->Color.ColorMask[buf][2] == 0 ||
-          ctx->Color.ColorMask[buf][3] == 0) {
-         clear_rgba_buffer_with_masking(ctx, rb, buf);
-      }
-      else {
-         clear_rgba_buffer(ctx, rb, buf);
-      }
-   }
-}
-
-
-/**
- * Called via the device driver's ctx->Driver.Clear() function if the
- * device driver can't clear one or more of the buffers itself.
- * \param buffers  bitfield of BUFFER_BIT_* values indicating which
- *                 renderbuffers are to be cleared.
- * \param all  if GL_TRUE, clear whole buffer, else clear specified region.
- */
-void
-_swrast_Clear(GLcontext *ctx, GLbitfield buffers)
-{
-#ifdef DEBUG_FOO
-   {
-      const GLbitfield legalBits =
-         BUFFER_BIT_FRONT_LEFT |
-	 BUFFER_BIT_FRONT_RIGHT |
-	 BUFFER_BIT_BACK_LEFT |
-	 BUFFER_BIT_BACK_RIGHT |
-	 BUFFER_BIT_DEPTH |
-	 BUFFER_BIT_STENCIL |
-	 BUFFER_BIT_ACCUM |
-         BUFFER_BIT_AUX0;
-      assert((buffers & (~legalBits)) == 0);
-   }
-#endif
-
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't clear */
-
-   swrast_render_start(ctx);
-
-   /* do software clearing here */
-   if (buffers) {
-      if ((buffers & BUFFER_BITS_COLOR)
-          && (ctx->DrawBuffer->_NumColorDrawBuffers > 0)) {
-         clear_color_buffers(ctx);
-      }
-      if (buffers & BUFFER_BIT_DEPTH) {
-         _swrast_clear_depth_buffer(ctx, ctx->DrawBuffer->_DepthBuffer);
-      }
-      if (buffers & BUFFER_BIT_ACCUM) {
-         _swrast_clear_accum_buffer(ctx,
-                       ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);
-      }
-      if (buffers & BUFFER_BIT_STENCIL) {
-         _swrast_clear_stencil_buffer(ctx, ctx->DrawBuffer->_StencilBuffer);
-      }
-   }
-
-   swrast_render_finish(ctx);
-}
+/*

+ * 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 "main/glheader.h"

+#include "main/colormac.h"

+#include "main/condrender.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "s_accum.h"

+#include "s_context.h"

+#include "s_depth.h"

+#include "s_masking.h"

+#include "s_stencil.h"

+

+

+/**

+ * Clear the color buffer when glColorMask is in effect.

+ */

+static void

+clear_rgba_buffer_with_masking(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                               GLuint buf)

+{

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

+   SWspan span;

+   GLint i;

+

+   ASSERT(rb->PutRow);

+

+   /* Initialize color span with clear color */

+   /* XXX optimize for clearcolor == black/zero (bzero) */

+   INIT_SPAN(span, GL_BITMAP);

+   span.end = width;

+   span.arrayMask = SPAN_RGBA;

+   span.array->ChanType = rb->DataType;

+   if (span.array->ChanType == GL_UNSIGNED_BYTE) {

+      GLubyte clearColor[4];

+      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[RCOMP], ctx->Color.ClearColor[0]);

+      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[GCOMP], ctx->Color.ClearColor[1]);

+      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[BCOMP], ctx->Color.ClearColor[2]);

+      UNCLAMPED_FLOAT_TO_UBYTE(clearColor[ACOMP], ctx->Color.ClearColor[3]);

+      for (i = 0; i < width; i++) {

+         COPY_4UBV(span.array->rgba[i], clearColor);

+      }

+   }

+   else if (span.array->ChanType == GL_UNSIGNED_SHORT) {

+      GLushort clearColor[4];

+      UNCLAMPED_FLOAT_TO_USHORT(clearColor[RCOMP], ctx->Color.ClearColor[0]);

+      UNCLAMPED_FLOAT_TO_USHORT(clearColor[GCOMP], ctx->Color.ClearColor[1]);

+      UNCLAMPED_FLOAT_TO_USHORT(clearColor[BCOMP], ctx->Color.ClearColor[2]);

+      UNCLAMPED_FLOAT_TO_USHORT(clearColor[ACOMP], ctx->Color.ClearColor[3]);

+      for (i = 0; i < width; i++) {

+         COPY_4V_CAST(span.array->rgba[i], clearColor, GLchan);

+      }

+   }

+   else {

+      ASSERT(span.array->ChanType == GL_FLOAT);

+      for (i = 0; i < width; i++) {

+         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][0], ctx->Color.ClearColor[0]);

+         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][1], ctx->Color.ClearColor[1]);

+         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][2], ctx->Color.ClearColor[2]);

+         CLAMPED_FLOAT_TO_CHAN(span.array->rgba[i][3], ctx->Color.ClearColor[3]);

+      }

+   }

+

+   /* Note that masking will change the color values, but only the

+    * channels for which the write mask is GL_FALSE.  The channels

+    * which which are write-enabled won't get modified.

+    */

+   for (i = 0; i < height; i++) {

+      span.x = x;

+      span.y = y + i;

+      _swrast_mask_rgba_span(ctx, rb, &span, buf);

+      /* write masked row */

+      rb->PutRow(ctx, rb, width, x, y + i, span.array->rgba, NULL);

+   }

+}

+

+

+/**

+ * Clear an rgba color buffer without channel masking.

+ */

+static void

+clear_rgba_buffer(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint buf)

+{

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

+   GLubyte clear8[4];

+   GLushort clear16[4];

+   GLvoid *clearVal;

+   GLint i;

+

+   ASSERT(ctx->Color.ColorMask[buf][0] &&

+          ctx->Color.ColorMask[buf][1] &&

+          ctx->Color.ColorMask[buf][2] &&

+          ctx->Color.ColorMask[buf][3]);             

+

+   ASSERT(rb->PutMonoRow);

+

+   switch (rb->DataType) {

+      case GL_UNSIGNED_BYTE:

+         UNCLAMPED_FLOAT_TO_UBYTE(clear8[0], ctx->Color.ClearColor[0]);

+         UNCLAMPED_FLOAT_TO_UBYTE(clear8[1], ctx->Color.ClearColor[1]);

+         UNCLAMPED_FLOAT_TO_UBYTE(clear8[2], ctx->Color.ClearColor[2]);

+         UNCLAMPED_FLOAT_TO_UBYTE(clear8[3], ctx->Color.ClearColor[3]);

+         clearVal = clear8;

+         break;

+      case GL_UNSIGNED_SHORT:

+         UNCLAMPED_FLOAT_TO_USHORT(clear16[0], ctx->Color.ClearColor[0]);

+         UNCLAMPED_FLOAT_TO_USHORT(clear16[1], ctx->Color.ClearColor[1]);

+         UNCLAMPED_FLOAT_TO_USHORT(clear16[2], ctx->Color.ClearColor[2]);

+         UNCLAMPED_FLOAT_TO_USHORT(clear16[3], ctx->Color.ClearColor[3]);

+         clearVal = clear16;

+         break;

+      case GL_FLOAT:

+         clearVal = ctx->Color.ClearColor;

+         break;

+      default:

+         _mesa_problem(ctx, "Bad rb DataType in clear_color_buffer");

+         return;

+   }

+

+   for (i = 0; i < height; i++) {

+      rb->PutMonoRow(ctx, rb, width, x, y + i, clearVal, NULL);

+   }

+}

+

+

+/**

+ * Clear the front/back/left/right/aux color buffers.

+ * This function is usually only called if the device driver can't

+ * clear its own color buffers for some reason (such as with masking).

+ */

+static void

+clear_color_buffers(struct gl_context *ctx)

+{

+   GLuint buf;

+

+   for (buf = 0; buf < ctx->DrawBuffer->_NumColorDrawBuffers; buf++) {

+      struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[buf];

+      if (ctx->Color.ColorMask[buf][0] == 0 ||

+          ctx->Color.ColorMask[buf][1] == 0 ||

+          ctx->Color.ColorMask[buf][2] == 0 ||

+          ctx->Color.ColorMask[buf][3] == 0) {

+         clear_rgba_buffer_with_masking(ctx, rb, buf);

+      }

+      else {

+         clear_rgba_buffer(ctx, rb, buf);

+      }

+   }

+}

+

+

+/**

+ * Called via the device driver's ctx->Driver.Clear() function if the

+ * device driver can't clear one or more of the buffers itself.

+ * \param buffers  bitfield of BUFFER_BIT_* values indicating which

+ *                 renderbuffers are to be cleared.

+ * \param all  if GL_TRUE, clear whole buffer, else clear specified region.

+ */

+void

+_swrast_Clear(struct gl_context *ctx, GLbitfield buffers)

+{

+#ifdef DEBUG_FOO

+   {

+      const GLbitfield legalBits =

+         BUFFER_BIT_FRONT_LEFT |

+	 BUFFER_BIT_FRONT_RIGHT |

+	 BUFFER_BIT_BACK_LEFT |

+	 BUFFER_BIT_BACK_RIGHT |

+	 BUFFER_BIT_DEPTH |

+	 BUFFER_BIT_STENCIL |

+	 BUFFER_BIT_ACCUM |

+         BUFFER_BIT_AUX0;

+      assert((buffers & (~legalBits)) == 0);

+   }

+#endif

+

+   if (!_mesa_check_conditional_render(ctx))

+      return; /* don't clear */

+

+   swrast_render_start(ctx);

+

+   /* do software clearing here */

+   if (buffers) {

+      if ((buffers & BUFFER_BITS_COLOR)

+          && (ctx->DrawBuffer->_NumColorDrawBuffers > 0)) {

+         clear_color_buffers(ctx);

+      }

+      if (buffers & BUFFER_BIT_DEPTH) {

+         _swrast_clear_depth_buffer(ctx, ctx->DrawBuffer->_DepthBuffer);

+      }

+      if (buffers & BUFFER_BIT_ACCUM) {

+         _swrast_clear_accum_buffer(ctx,

+                       ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);

+      }

+      if (buffers & BUFFER_BIT_STENCIL) {

+         _swrast_clear_stencil_buffer(ctx, ctx->DrawBuffer->_StencilBuffer);

+      }

+   }

+

+   swrast_render_finish(ctx);

+}

diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c
index f76a2b68e..b0c9880b1 100644
--- a/mesalib/src/mesa/swrast/s_context.c
+++ b/mesalib/src/mesa/swrast/s_context.c
@@ -1,957 +1,957 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- *    Brian Paul
- */
-
-#include "main/imports.h"
-#include "main/bufferobj.h"
-#include "main/colormac.h"
-#include "main/mtypes.h"
-#include "main/teximage.h"
-#include "program/prog_parameter.h"
-#include "program/prog_statevars.h"
-#include "swrast.h"
-#include "s_blend.h"
-#include "s_context.h"
-#include "s_lines.h"
-#include "s_points.h"
-#include "s_span.h"
-#include "s_triangle.h"
-#include "s_texfilter.h"
-
-
-/**
- * Recompute the value of swrast->_RasterMask, etc. according to
- * the current context.  The _RasterMask field can be easily tested by
- * drivers to determine certain basic GL state (does the primitive need
- * stenciling, logic-op, fog, etc?).
- */
-static void
-_swrast_update_rasterflags( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLbitfield rasterMask = 0;
-   GLuint i;
-
-   if (ctx->Color.AlphaEnabled)           rasterMask |= ALPHATEST_BIT;
-   if (ctx->Color.BlendEnabled)           rasterMask |= BLEND_BIT;
-   if (ctx->Depth.Test)                   rasterMask |= DEPTH_BIT;
-   if (swrast->_FogEnabled)               rasterMask |= FOG_BIT;
-   if (ctx->Scissor.Enabled)              rasterMask |= CLIP_BIT;
-   if (ctx->Stencil._Enabled)             rasterMask |= STENCIL_BIT;
-   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-      if (!ctx->Color.ColorMask[i][0] ||
-          !ctx->Color.ColorMask[i][1] ||
-          !ctx->Color.ColorMask[i][2] ||
-          !ctx->Color.ColorMask[i][3]) {
-         rasterMask |= MASKING_BIT;
-         break;
-      }
-   }
-   if (ctx->Color._LogicOpEnabled)     rasterMask |= LOGIC_OP_BIT;
-   if (ctx->Texture._EnabledUnits)     rasterMask |= TEXTURE_BIT;
-   if (   ctx->Viewport.X < 0
-       || ctx->Viewport.X + ctx->Viewport.Width > (GLint) ctx->DrawBuffer->Width
-       || ctx->Viewport.Y < 0
-       || ctx->Viewport.Y + ctx->Viewport.Height > (GLint) ctx->DrawBuffer->Height) {
-      rasterMask |= CLIP_BIT;
-   }
-
-   if (ctx->Query.CurrentOcclusionObject)
-      rasterMask |= OCCLUSION_BIT;
-
-
-   /* If we're not drawing to exactly one color buffer set the
-    * MULTI_DRAW_BIT flag.  Also set it if we're drawing to no
-    * buffers or the RGBA or CI mask disables all writes.
-    */
-   if (ctx->DrawBuffer->_NumColorDrawBuffers != 1) {
-      /* more than one color buffer designated for writing (or zero buffers) */
-      rasterMask |= MULTI_DRAW_BIT;
-   }
-
-   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
-      if (ctx->Color.ColorMask[i][0] +
-          ctx->Color.ColorMask[i][1] +
-          ctx->Color.ColorMask[i][2] +
-          ctx->Color.ColorMask[i][3] == 0) {
-         rasterMask |= MULTI_DRAW_BIT; /* all RGBA channels disabled */
-         break;
-      }
-   }
-
-
-   if (ctx->FragmentProgram._Current) {
-      rasterMask |= FRAGPROG_BIT;
-   }
-
-   if (ctx->ATIFragmentShader._Enabled) {
-      rasterMask |= ATIFRAGSHADER_BIT;
-   }
-
-#if CHAN_TYPE == GL_FLOAT
-   if (ctx->Color.ClampFragmentColor == GL_TRUE) {
-      rasterMask |= CLAMPING_BIT;
-   }
-#endif
-
-   SWRAST_CONTEXT(ctx)->_RasterMask = rasterMask;
-}
-
-
-/**
- * Examine polygon cull state to compute the _BackfaceCullSign field.
- * _BackfaceCullSign will be 0 if no culling, -1 if culling back-faces,
- * and 1 if culling front-faces.  The Polygon FrontFace state also
- * factors in.
- */
-static void
-_swrast_update_polygon( GLcontext *ctx )
-{
-   GLfloat backface_sign;
-
-   if (ctx->Polygon.CullFlag) {
-      switch (ctx->Polygon.CullFaceMode) {
-      case GL_BACK:
-         backface_sign = -1.0F;
-	 break;
-      case GL_FRONT:
-         backface_sign = 1.0F;
-	 break;
-      case GL_FRONT_AND_BACK:
-         /* fallthrough */
-      default:
-	 backface_sign = 0.0F;
-      }
-   }
-   else {
-      backface_sign = 0.0F;
-   }
-
-   SWRAST_CONTEXT(ctx)->_BackfaceCullSign = backface_sign;
-
-   /* This is for front/back-face determination, but not for culling */
-   SWRAST_CONTEXT(ctx)->_BackfaceSign
-      = (ctx->Polygon.FrontFace == GL_CW) ? -1.0F : 1.0F;
-}
-
-
-
-/**
- * Update the _PreferPixelFog field to indicate if we need to compute
- * fog blend factors (from the fog coords) per-fragment.
- */
-static void
-_swrast_update_fog_hint( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||
-                              ctx->FragmentProgram._Current ||
-			      (ctx->Hint.Fog == GL_NICEST &&
-			       swrast->AllowPixelFog));
-}
-
-
-
-/**
- * Update the swrast->_TextureCombinePrimary flag.
- */
-static void
-_swrast_update_texture_env( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint i;
-
-   swrast->_TextureCombinePrimary = GL_FALSE;
-
-   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
-      const struct gl_tex_env_combine_state *combine =
-         ctx->Texture.Unit[i]._CurrentCombine;
-      GLuint term;
-      for (term = 0; term < combine->_NumArgsRGB; term++) {
-         if (combine->SourceRGB[term] == GL_PRIMARY_COLOR) {
-            swrast->_TextureCombinePrimary = GL_TRUE;
-            return;
-         }
-         if (combine->SourceA[term] == GL_PRIMARY_COLOR) {
-            swrast->_TextureCombinePrimary = GL_TRUE;
-            return;
-         }
-      }
-   }
-}
-
-
-/**
- * Determine if we can defer texturing/shading until after Z/stencil
- * testing.  This potentially allows us to skip texturing/shading for
- * lots of fragments.
- */
-static void
-_swrast_update_deferred_texture(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   if (ctx->Color.AlphaEnabled) {
-      /* alpha test depends on post-texture/shader colors */
-      swrast->_DeferredTexture = GL_FALSE;
-   }
-   else {
-      const struct gl_fragment_program *fprog
-         = ctx->FragmentProgram._Current;
-      if (fprog && (fprog->Base.OutputsWritten & (1 << FRAG_RESULT_DEPTH))) {
-         /* Z comes from fragment program/shader */
-         swrast->_DeferredTexture = GL_FALSE;
-      }
-      else if (fprog && fprog->UsesKill) {
-         swrast->_DeferredTexture = GL_FALSE;
-      }
-      else if (ctx->Query.CurrentOcclusionObject) {
-         /* occlusion query depends on shader discard/kill results */
-         swrast->_DeferredTexture = GL_FALSE;
-      }
-      else {
-         swrast->_DeferredTexture = GL_TRUE;
-      }
-   }
-}
-
-
-/**
- * Update swrast->_FogColor and swrast->_FogEnable values.
- */
-static void
-_swrast_update_fog_state( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
-
-   /* determine if fog is needed, and if so, which fog mode */
-   swrast->_FogEnabled = GL_FALSE;
-   if (fp && fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
-      if (fp->FogOption != GL_NONE) {
-         swrast->_FogEnabled = GL_TRUE;
-         swrast->_FogMode = fp->FogOption;
-      }
-   }
-   else if (ctx->Fog.Enabled) {
-      swrast->_FogEnabled = GL_TRUE;
-      swrast->_FogMode = ctx->Fog.Mode;
-   }
-}
-
-
-/**
- * Update state for running fragment programs.  Basically, load the
- * program parameters with current state values.
- */
-static void
-_swrast_update_fragment_program(GLcontext *ctx, GLbitfield newState)
-{
-   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
-   if (fp) {
-      _mesa_load_state_parameters(ctx, fp->Base.Parameters);
-   }
-}
-
-
-/**
- * See if we can do early diffuse+specular (primary+secondary) color
- * add per vertex instead of per-fragment.
- */
-static void
-_swrast_update_specular_vertex_add(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLboolean separateSpecular = ctx->Fog.ColorSumEnabled ||
-      (ctx->Light.Enabled &&
-       ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR);
-
-   swrast->SpecularVertexAdd = (separateSpecular
-                                && ctx->Texture._EnabledUnits == 0x0
-                                && !ctx->FragmentProgram._Current
-                                && !ctx->ATIFragmentShader._Enabled);
-}
-
-
-#define _SWRAST_NEW_DERIVED (_SWRAST_NEW_RASTERMASK |	\
-                             _NEW_PROGRAM_CONSTANTS |   \
-			     _NEW_TEXTURE |		\
-			     _NEW_HINT |		\
-			     _NEW_POLYGON )
-
-/* State referenced by _swrast_choose_triangle, _swrast_choose_line.
- */
-#define _SWRAST_NEW_TRIANGLE (_SWRAST_NEW_DERIVED |		\
-			      _NEW_RENDERMODE|			\
-                              _NEW_POLYGON|			\
-                              _NEW_DEPTH|			\
-                              _NEW_STENCIL|			\
-                              _NEW_COLOR|			\
-                              _NEW_TEXTURE|			\
-                              _SWRAST_NEW_RASTERMASK|		\
-                              _NEW_LIGHT|			\
-                              _NEW_FOG |			\
-			      _DD_NEW_SEPARATE_SPECULAR)
-
-#define _SWRAST_NEW_LINE (_SWRAST_NEW_DERIVED |		\
-			  _NEW_RENDERMODE|		\
-                          _NEW_LINE|			\
-                          _NEW_TEXTURE|			\
-                          _NEW_LIGHT|			\
-                          _NEW_FOG|			\
-                          _NEW_DEPTH |			\
-                          _DD_NEW_SEPARATE_SPECULAR)
-
-#define _SWRAST_NEW_POINT (_SWRAST_NEW_DERIVED |	\
-			   _NEW_RENDERMODE |		\
-			   _NEW_POINT |			\
-			   _NEW_TEXTURE |		\
-			   _NEW_LIGHT |			\
-			   _NEW_FOG |			\
-                           _DD_NEW_SEPARATE_SPECULAR)
-
-#define _SWRAST_NEW_TEXTURE_SAMPLE_FUNC _NEW_TEXTURE
-
-#define _SWRAST_NEW_TEXTURE_ENV_MODE _NEW_TEXTURE
-
-#define _SWRAST_NEW_BLEND_FUNC _NEW_COLOR
-
-
-
-/**
- * Stub for swrast->Triangle to select a true triangle function
- * after a state change.
- */
-static void
-_swrast_validate_triangle( GLcontext *ctx,
-			   const SWvertex *v0,
-                           const SWvertex *v1,
-                           const SWvertex *v2 )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   _swrast_validate_derived( ctx );
-   swrast->choose_triangle( ctx );
-   ASSERT(swrast->Triangle);
-
-   if (swrast->SpecularVertexAdd) {
-      /* separate specular color, but no texture */
-      swrast->SpecTriangle = swrast->Triangle;
-      swrast->Triangle = _swrast_add_spec_terms_triangle;
-   }
-
-   swrast->Triangle( ctx, v0, v1, v2 );
-}
-
-/**
- * Called via swrast->Line.  Examine current GL state and choose a software
- * line routine.  Then call it.
- */
-static void
-_swrast_validate_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   _swrast_validate_derived( ctx );
-   swrast->choose_line( ctx );
-   ASSERT(swrast->Line);
-
-   if (swrast->SpecularVertexAdd) {
-      swrast->SpecLine = swrast->Line;
-      swrast->Line = _swrast_add_spec_terms_line;
-   }
-
-   swrast->Line( ctx, v0, v1 );
-}
-
-/**
- * Called via swrast->Point.  Examine current GL state and choose a software
- * point routine.  Then call it.
- */
-static void
-_swrast_validate_point( GLcontext *ctx, const SWvertex *v0 )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   _swrast_validate_derived( ctx );
-   swrast->choose_point( ctx );
-
-   if (swrast->SpecularVertexAdd) {
-      swrast->SpecPoint = swrast->Point;
-      swrast->Point = _swrast_add_spec_terms_point;
-   }
-
-   swrast->Point( ctx, v0 );
-}
-
-
-/**
- * Called via swrast->BlendFunc.  Examine GL state to choose a blending
- * function, then call it.
- */
-static void _ASMAPI
-_swrast_validate_blend_func(GLcontext *ctx, GLuint n, const GLubyte mask[],
-                            GLvoid *src, const GLvoid *dst,
-                            GLenum chanType )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   _swrast_validate_derived( ctx ); /* why is this needed? */
-   _swrast_choose_blend_func( ctx, chanType );
-
-   swrast->BlendFunc( ctx, n, mask, src, dst, chanType );
-}
-
-
-/**
- * Make sure we have texture image data for all the textures we may need
- * for subsequent rendering.
- */
-static void
-_swrast_validate_texture_images(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint u;
-
-   if (!swrast->ValidateTextureImage || !ctx->Texture._EnabledUnits) {
-      /* no textures enabled, or no way to validate images! */
-      return;
-   }
-
-   for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) {
-      if (ctx->Texture.Unit[u]._ReallyEnabled) {
-         struct gl_texture_object *texObj = ctx->Texture.Unit[u]._Current;
-         ASSERT(texObj);
-         if (texObj) {
-            GLuint numFaces = (texObj->Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
-            GLuint face;
-            for (face = 0; face < numFaces; face++) {
-               GLint lvl;
-               for (lvl = texObj->BaseLevel; lvl <= texObj->_MaxLevel; lvl++) {
-                  struct gl_texture_image *texImg = texObj->Image[face][lvl];
-                  if (texImg && !texImg->Data) {
-                     swrast->ValidateTextureImage(ctx, texObj, face, lvl);
-                     ASSERT(texObj->Image[face][lvl]->Data);
-                  }
-               }
-            }
-         }
-      }
-   }
-}
-
-
-/**
- * Free the texture image data attached to all currently enabled
- * textures.  Meant to be called by device drivers when transitioning
- * from software to hardware rendering.
- */
-void
-_swrast_eject_texture_images(GLcontext *ctx)
-{
-   GLuint u;
-
-   if (!ctx->Texture._EnabledUnits) {
-      /* no textures enabled */
-      return;
-   }
-
-   for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) {
-      if (ctx->Texture.Unit[u]._ReallyEnabled) {
-         struct gl_texture_object *texObj = ctx->Texture.Unit[u]._Current;
-         ASSERT(texObj);
-         if (texObj) {
-            GLuint numFaces = (texObj->Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
-            GLuint face;
-            for (face = 0; face < numFaces; face++) {
-               GLint lvl;
-               for (lvl = texObj->BaseLevel; lvl <= texObj->_MaxLevel; lvl++) {
-                  struct gl_texture_image *texImg = texObj->Image[face][lvl];
-                  if (texImg && texImg->Data) {
-                     _mesa_free_texmemory(texImg->Data);
-                     texImg->Data = NULL;
-                  }
-               }
-            }
-         }
-      }
-   }
-}
-
-
-
-static void
-_swrast_sleep( GLcontext *ctx, GLbitfield new_state )
-{
-   (void) ctx; (void) new_state;
-}
-
-
-static void
-_swrast_invalidate_state( GLcontext *ctx, GLbitfield new_state )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint i;
-
-   swrast->NewState |= new_state;
-
-   /* After 10 statechanges without any swrast functions being called,
-    * put the module to sleep.
-    */
-   if (++swrast->StateChanges > 10) {
-      swrast->InvalidateState = _swrast_sleep;
-      swrast->NewState = ~0;
-      new_state = ~0;
-   }
-
-   if (new_state & swrast->InvalidateTriangleMask)
-      swrast->Triangle = _swrast_validate_triangle;
-
-   if (new_state & swrast->InvalidateLineMask)
-      swrast->Line = _swrast_validate_line;
-
-   if (new_state & swrast->InvalidatePointMask)
-      swrast->Point = _swrast_validate_point;
-
-   if (new_state & _SWRAST_NEW_BLEND_FUNC)
-      swrast->BlendFunc = _swrast_validate_blend_func;
-
-   if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC)
-      for (i = 0 ; i < ctx->Const.MaxTextureImageUnits ; i++)
-	 swrast->TextureSample[i] = NULL;
-}
-
-
-void
-_swrast_update_texture_samplers(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint u;
-
-   if (!swrast)
-      return; /* pipe hack */
-
-   for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) {
-      const struct gl_texture_object *tObj = ctx->Texture.Unit[u]._Current;
-      /* Note: If tObj is NULL, the sample function will be a simple
-       * function that just returns opaque black (0,0,0,1).
-       */
-      swrast->TextureSample[u] = _swrast_choose_texture_sample_func(ctx, tObj);
-   }
-}
-
-
-/**
- * Update swrast->_ActiveAttribs, swrast->_NumActiveAttribs,
- * swrast->_ActiveAtttribMask.
- */
-static void
-_swrast_update_active_attribs(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint attribsMask;
-
-   /*
-    * Compute _ActiveAttribsMask = which fragment attributes are needed.
-    */
-   if (ctx->FragmentProgram._Current) {
-      /* fragment program/shader */
-      attribsMask = ctx->FragmentProgram._Current->Base.InputsRead;
-      attribsMask &= ~FRAG_BIT_WPOS; /* WPOS is always handled specially */
-   }
-   else if (ctx->ATIFragmentShader._Enabled) {
-      attribsMask = ~0;  /* XXX fix me */
-   }
-   else {
-      /* fixed function */
-      attribsMask = 0x0;
-
-#if CHAN_TYPE == GL_FLOAT
-      attribsMask |= FRAG_BIT_COL0;
-#endif
-
-      if (ctx->Fog.ColorSumEnabled ||
-          (ctx->Light.Enabled &&
-           ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {
-         attribsMask |= FRAG_BIT_COL1;
-      }
-
-      if (swrast->_FogEnabled)
-         attribsMask |= FRAG_BIT_FOGC;
-
-      attribsMask |= (ctx->Texture._EnabledUnits << FRAG_ATTRIB_TEX0);
-   }
-
-   swrast->_ActiveAttribMask = attribsMask;
-
-   /* Update _ActiveAttribs[] list */
-   {
-      GLuint i, num = 0;
-      for (i = 0; i < FRAG_ATTRIB_MAX; i++) {
-         if (attribsMask & (1 << i)) {
-            swrast->_ActiveAttribs[num++] = i;
-            /* how should this attribute be interpolated? */
-            if (i == FRAG_ATTRIB_COL0 || i == FRAG_ATTRIB_COL1)
-               swrast->_InterpMode[i] = ctx->Light.ShadeModel;
-            else
-               swrast->_InterpMode[i] = GL_SMOOTH;
-         }
-      }
-      swrast->_NumActiveAttribs = num;
-   }
-}
-
-
-void
-_swrast_validate_derived( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   if (swrast->NewState) {
-      if (swrast->NewState & _NEW_POLYGON)
-	 _swrast_update_polygon( ctx );
-
-      if (swrast->NewState & (_NEW_HINT | _NEW_PROGRAM))
-	 _swrast_update_fog_hint( ctx );
-
-      if (swrast->NewState & _SWRAST_NEW_TEXTURE_ENV_MODE)
-	 _swrast_update_texture_env( ctx );
-
-      if (swrast->NewState & (_NEW_FOG | _NEW_PROGRAM))
-         _swrast_update_fog_state( ctx );
-
-      if (swrast->NewState & (_NEW_PROGRAM_CONSTANTS | _NEW_PROGRAM))
-	 _swrast_update_fragment_program( ctx, swrast->NewState );
-
-      if (swrast->NewState & (_NEW_TEXTURE | _NEW_PROGRAM)) {
-         _swrast_update_texture_samplers( ctx );
-         _swrast_validate_texture_images(ctx);
-      }
-
-      if (swrast->NewState & (_NEW_COLOR | _NEW_PROGRAM))
-         _swrast_update_deferred_texture(ctx);
-
-      if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
- 	 _swrast_update_rasterflags( ctx );
-
-      if (swrast->NewState & (_NEW_DEPTH |
-                              _NEW_FOG |
-                              _NEW_LIGHT |
-                              _NEW_PROGRAM |
-                              _NEW_TEXTURE))
-         _swrast_update_active_attribs(ctx);
-
-      if (swrast->NewState & (_NEW_FOG | 
-                              _NEW_PROGRAM |
-                              _NEW_LIGHT |
-                              _NEW_TEXTURE))
-         _swrast_update_specular_vertex_add(ctx);
-
-      swrast->NewState = 0;
-      swrast->StateChanges = 0;
-      swrast->InvalidateState = _swrast_invalidate_state;
-   }
-}
-
-#define SWRAST_DEBUG 0
-
-/* Public entrypoints:  See also s_accum.c, s_bitmap.c, etc.
- */
-void
-_swrast_Quad( GLcontext *ctx,
-	      const SWvertex *v0, const SWvertex *v1,
-              const SWvertex *v2, const SWvertex *v3 )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_Quad\n");
-      _swrast_print_vertex( ctx, v0 );
-      _swrast_print_vertex( ctx, v1 );
-      _swrast_print_vertex( ctx, v2 );
-      _swrast_print_vertex( ctx, v3 );
-   }
-   SWRAST_CONTEXT(ctx)->Triangle( ctx, v0, v1, v3 );
-   SWRAST_CONTEXT(ctx)->Triangle( ctx, v1, v2, v3 );
-}
-
-void
-_swrast_Triangle( GLcontext *ctx, const SWvertex *v0,
-                  const SWvertex *v1, const SWvertex *v2 )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_Triangle\n");
-      _swrast_print_vertex( ctx, v0 );
-      _swrast_print_vertex( ctx, v1 );
-      _swrast_print_vertex( ctx, v2 );
-   }
-   SWRAST_CONTEXT(ctx)->Triangle( ctx, v0, v1, v2 );
-}
-
-void
-_swrast_Line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_Line\n");
-      _swrast_print_vertex( ctx, v0 );
-      _swrast_print_vertex( ctx, v1 );
-   }
-   SWRAST_CONTEXT(ctx)->Line( ctx, v0, v1 );
-}
-
-void
-_swrast_Point( GLcontext *ctx, const SWvertex *v0 )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_Point\n");
-      _swrast_print_vertex( ctx, v0 );
-   }
-   SWRAST_CONTEXT(ctx)->Point( ctx, v0 );
-}
-
-void
-_swrast_InvalidateState( GLcontext *ctx, GLbitfield new_state )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_InvalidateState\n");
-   }
-   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, new_state );
-}
-
-void
-_swrast_ResetLineStipple( GLcontext *ctx )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_ResetLineStipple\n");
-   }
-   SWRAST_CONTEXT(ctx)->StippleCounter = 0;
-}
-
-void
-_swrast_SetFacing(GLcontext *ctx, GLuint facing)
-{
-   SWRAST_CONTEXT(ctx)->PointLineFacing = facing;
-}
-
-void
-_swrast_allow_vertex_fog( GLcontext *ctx, GLboolean value )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_allow_vertex_fog %d\n", value);
-   }
-   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
-   SWRAST_CONTEXT(ctx)->AllowVertexFog = value;
-}
-
-void
-_swrast_allow_pixel_fog( GLcontext *ctx, GLboolean value )
-{
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_allow_pixel_fog %d\n", value);
-   }
-   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
-   SWRAST_CONTEXT(ctx)->AllowPixelFog = value;
-}
-
-
-GLboolean
-_swrast_CreateContext( GLcontext *ctx )
-{
-   GLuint i;
-   SWcontext *swrast = (SWcontext *)CALLOC(sizeof(SWcontext));
-
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_CreateContext\n");
-   }
-
-   if (!swrast)
-      return GL_FALSE;
-
-   swrast->NewState = ~0;
-
-   swrast->choose_point = _swrast_choose_point;
-   swrast->choose_line = _swrast_choose_line;
-   swrast->choose_triangle = _swrast_choose_triangle;
-
-   swrast->InvalidatePointMask = _SWRAST_NEW_POINT;
-   swrast->InvalidateLineMask = _SWRAST_NEW_LINE;
-   swrast->InvalidateTriangleMask = _SWRAST_NEW_TRIANGLE;
-
-   swrast->Point = _swrast_validate_point;
-   swrast->Line = _swrast_validate_line;
-   swrast->Triangle = _swrast_validate_triangle;
-   swrast->InvalidateState = _swrast_sleep;
-   swrast->BlendFunc = _swrast_validate_blend_func;
-
-   swrast->AllowVertexFog = GL_TRUE;
-   swrast->AllowPixelFog = GL_TRUE;
-
-   /* Optimized Accum buffer */
-   swrast->_IntegerAccumMode = GL_FALSE;
-   swrast->_IntegerAccumScaler = 0.0;
-
-   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
-      swrast->TextureSample[i] = NULL;
-
-   swrast->SpanArrays = MALLOC_STRUCT(sw_span_arrays);
-   if (!swrast->SpanArrays) {
-      FREE(swrast);
-      return GL_FALSE;
-   }
-   swrast->SpanArrays->ChanType = CHAN_TYPE;
-#if CHAN_TYPE == GL_UNSIGNED_BYTE
-   swrast->SpanArrays->rgba = swrast->SpanArrays->rgba8;
-#elif CHAN_TYPE == GL_UNSIGNED_SHORT
-   swrast->SpanArrays->rgba = swrast->SpanArrays->rgba16;
-#else
-   swrast->SpanArrays->rgba = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL0];
-#endif
-
-   /* init point span buffer */
-   swrast->PointSpan.primitive = GL_POINT;
-   swrast->PointSpan.end = 0;
-   swrast->PointSpan.facing = 0;
-   swrast->PointSpan.array = swrast->SpanArrays;
-
-   swrast->TexelBuffer = (GLfloat *) MALLOC(ctx->Const.MaxTextureImageUnits *
-                                           MAX_WIDTH * 4 * sizeof(GLfloat));
-   if (!swrast->TexelBuffer) {
-      FREE(swrast->SpanArrays);
-      FREE(swrast);
-      return GL_FALSE;
-   }
-
-   ctx->swrast_context = swrast;
-
-   return GL_TRUE;
-}
-
-void
-_swrast_DestroyContext( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   if (SWRAST_DEBUG) {
-      _mesa_debug(ctx, "_swrast_DestroyContext\n");
-   }
-
-   FREE( swrast->SpanArrays );
-   if (swrast->ZoomedArrays)
-      FREE( swrast->ZoomedArrays );
-   FREE( swrast->TexelBuffer );
-   FREE( swrast );
-
-   ctx->swrast_context = 0;
-}
-
-
-struct swrast_device_driver *
-_swrast_GetDeviceDriverReference( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   return &swrast->Driver;
-}
-
-void
-_swrast_flush( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   /* flush any pending fragments from rendering points */
-   if (swrast->PointSpan.end > 0) {
-      _swrast_write_rgba_span(ctx, &(swrast->PointSpan));
-      swrast->PointSpan.end = 0;
-   }
-}
-
-void
-_swrast_render_primitive( GLcontext *ctx, GLenum prim )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   if (swrast->Primitive == GL_POINTS && prim != GL_POINTS) {
-      _swrast_flush(ctx);
-   }
-   swrast->Primitive = prim;
-}
-
-
-void
-_swrast_render_start( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   if (swrast->Driver.SpanRenderStart)
-      swrast->Driver.SpanRenderStart( ctx );
-   swrast->PointSpan.end = 0;
-}
- 
-void
-_swrast_render_finish( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   if (swrast->Driver.SpanRenderFinish)
-      swrast->Driver.SpanRenderFinish( ctx );
-
-   _swrast_flush(ctx);
-}
-
-
-#define SWRAST_DEBUG_VERTICES 0
-
-void
-_swrast_print_vertex( GLcontext *ctx, const SWvertex *v )
-{
-   GLuint i;
-
-   if (SWRAST_DEBUG_VERTICES) {
-      _mesa_debug(ctx, "win %f %f %f %f\n",
-                  v->attrib[FRAG_ATTRIB_WPOS][0],
-                  v->attrib[FRAG_ATTRIB_WPOS][1],
-                  v->attrib[FRAG_ATTRIB_WPOS][2],
-                  v->attrib[FRAG_ATTRIB_WPOS][3]);
-
-      for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
-	 if (ctx->Texture.Unit[i]._ReallyEnabled)
-	    _mesa_debug(ctx, "texcoord[%d] %f %f %f %f\n", i,
-                        v->attrib[FRAG_ATTRIB_TEX0 + i][0],
-                        v->attrib[FRAG_ATTRIB_TEX0 + i][1],
-                        v->attrib[FRAG_ATTRIB_TEX0 + i][2],
-                        v->attrib[FRAG_ATTRIB_TEX0 + i][3]);
-
-#if CHAN_TYPE == GL_FLOAT
-      _mesa_debug(ctx, "color %f %f %f %f\n",
-                  v->color[0], v->color[1], v->color[2], v->color[3]);
-#else
-      _mesa_debug(ctx, "color %d %d %d %d\n",
-                  v->color[0], v->color[1], v->color[2], v->color[3]);
-#endif
-      _mesa_debug(ctx, "spec %g %g %g %g\n",
-                  v->attrib[FRAG_ATTRIB_COL1][0],
-                  v->attrib[FRAG_ATTRIB_COL1][1],
-                  v->attrib[FRAG_ATTRIB_COL1][2],
-                  v->attrib[FRAG_ATTRIB_COL1][3]);
-      _mesa_debug(ctx, "fog %f\n", v->attrib[FRAG_ATTRIB_FOGC][0]);
-      _mesa_debug(ctx, "index %f\n", v->attrib[FRAG_ATTRIB_CI][0]);
-      _mesa_debug(ctx, "pointsize %f\n", v->pointSize);
-      _mesa_debug(ctx, "\n");
-   }
-}
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ *    Brian Paul

+ */

+

+#include "main/imports.h"

+#include "main/bufferobj.h"

+#include "main/colormac.h"

+#include "main/mtypes.h"

+#include "main/teximage.h"

+#include "program/prog_parameter.h"

+#include "program/prog_statevars.h"

+#include "swrast.h"

+#include "s_blend.h"

+#include "s_context.h"

+#include "s_lines.h"

+#include "s_points.h"

+#include "s_span.h"

+#include "s_triangle.h"

+#include "s_texfilter.h"

+

+

+/**

+ * Recompute the value of swrast->_RasterMask, etc. according to

+ * the current context.  The _RasterMask field can be easily tested by

+ * drivers to determine certain basic GL state (does the primitive need

+ * stenciling, logic-op, fog, etc?).

+ */

+static void

+_swrast_update_rasterflags( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLbitfield rasterMask = 0;

+   GLuint i;

+

+   if (ctx->Color.AlphaEnabled)           rasterMask |= ALPHATEST_BIT;

+   if (ctx->Color.BlendEnabled)           rasterMask |= BLEND_BIT;

+   if (ctx->Depth.Test)                   rasterMask |= DEPTH_BIT;

+   if (swrast->_FogEnabled)               rasterMask |= FOG_BIT;

+   if (ctx->Scissor.Enabled)              rasterMask |= CLIP_BIT;

+   if (ctx->Stencil._Enabled)             rasterMask |= STENCIL_BIT;

+   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+      if (!ctx->Color.ColorMask[i][0] ||

+          !ctx->Color.ColorMask[i][1] ||

+          !ctx->Color.ColorMask[i][2] ||

+          !ctx->Color.ColorMask[i][3]) {

+         rasterMask |= MASKING_BIT;

+         break;

+      }

+   }

+   if (ctx->Color._LogicOpEnabled)     rasterMask |= LOGIC_OP_BIT;

+   if (ctx->Texture._EnabledUnits)     rasterMask |= TEXTURE_BIT;

+   if (   ctx->Viewport.X < 0

+       || ctx->Viewport.X + ctx->Viewport.Width > (GLint) ctx->DrawBuffer->Width

+       || ctx->Viewport.Y < 0

+       || ctx->Viewport.Y + ctx->Viewport.Height > (GLint) ctx->DrawBuffer->Height) {

+      rasterMask |= CLIP_BIT;

+   }

+

+   if (ctx->Query.CurrentOcclusionObject)

+      rasterMask |= OCCLUSION_BIT;

+

+

+   /* If we're not drawing to exactly one color buffer set the

+    * MULTI_DRAW_BIT flag.  Also set it if we're drawing to no

+    * buffers or the RGBA or CI mask disables all writes.

+    */

+   if (ctx->DrawBuffer->_NumColorDrawBuffers != 1) {

+      /* more than one color buffer designated for writing (or zero buffers) */

+      rasterMask |= MULTI_DRAW_BIT;

+   }

+

+   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {

+      if (ctx->Color.ColorMask[i][0] +

+          ctx->Color.ColorMask[i][1] +

+          ctx->Color.ColorMask[i][2] +

+          ctx->Color.ColorMask[i][3] == 0) {

+         rasterMask |= MULTI_DRAW_BIT; /* all RGBA channels disabled */

+         break;

+      }

+   }

+

+

+   if (ctx->FragmentProgram._Current) {

+      rasterMask |= FRAGPROG_BIT;

+   }

+

+   if (ctx->ATIFragmentShader._Enabled) {

+      rasterMask |= ATIFRAGSHADER_BIT;

+   }

+

+#if CHAN_TYPE == GL_FLOAT

+   if (ctx->Color.ClampFragmentColor == GL_TRUE) {

+      rasterMask |= CLAMPING_BIT;

+   }

+#endif

+

+   SWRAST_CONTEXT(ctx)->_RasterMask = rasterMask;

+}

+

+

+/**

+ * Examine polygon cull state to compute the _BackfaceCullSign field.

+ * _BackfaceCullSign will be 0 if no culling, -1 if culling back-faces,

+ * and 1 if culling front-faces.  The Polygon FrontFace state also

+ * factors in.

+ */

+static void

+_swrast_update_polygon( struct gl_context *ctx )

+{

+   GLfloat backface_sign;

+

+   if (ctx->Polygon.CullFlag) {

+      switch (ctx->Polygon.CullFaceMode) {

+      case GL_BACK:

+         backface_sign = -1.0F;

+	 break;

+      case GL_FRONT:

+         backface_sign = 1.0F;

+	 break;

+      case GL_FRONT_AND_BACK:

+         /* fallthrough */

+      default:

+	 backface_sign = 0.0F;

+      }

+   }

+   else {

+      backface_sign = 0.0F;

+   }

+

+   SWRAST_CONTEXT(ctx)->_BackfaceCullSign = backface_sign;

+

+   /* This is for front/back-face determination, but not for culling */

+   SWRAST_CONTEXT(ctx)->_BackfaceSign

+      = (ctx->Polygon.FrontFace == GL_CW) ? -1.0F : 1.0F;

+}

+

+

+

+/**

+ * Update the _PreferPixelFog field to indicate if we need to compute

+ * fog blend factors (from the fog coords) per-fragment.

+ */

+static void

+_swrast_update_fog_hint( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||

+                              ctx->FragmentProgram._Current ||

+			      (ctx->Hint.Fog == GL_NICEST &&

+			       swrast->AllowPixelFog));

+}

+

+

+

+/**

+ * Update the swrast->_TextureCombinePrimary flag.

+ */

+static void

+_swrast_update_texture_env( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint i;

+

+   swrast->_TextureCombinePrimary = GL_FALSE;

+

+   for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {

+      const struct gl_tex_env_combine_state *combine =

+         ctx->Texture.Unit[i]._CurrentCombine;

+      GLuint term;

+      for (term = 0; term < combine->_NumArgsRGB; term++) {

+         if (combine->SourceRGB[term] == GL_PRIMARY_COLOR) {

+            swrast->_TextureCombinePrimary = GL_TRUE;

+            return;

+         }

+         if (combine->SourceA[term] == GL_PRIMARY_COLOR) {

+            swrast->_TextureCombinePrimary = GL_TRUE;

+            return;

+         }

+      }

+   }

+}

+

+

+/**

+ * Determine if we can defer texturing/shading until after Z/stencil

+ * testing.  This potentially allows us to skip texturing/shading for

+ * lots of fragments.

+ */

+static void

+_swrast_update_deferred_texture(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   if (ctx->Color.AlphaEnabled) {

+      /* alpha test depends on post-texture/shader colors */

+      swrast->_DeferredTexture = GL_FALSE;

+   }

+   else {

+      const struct gl_fragment_program *fprog

+         = ctx->FragmentProgram._Current;

+      if (fprog && (fprog->Base.OutputsWritten & (1 << FRAG_RESULT_DEPTH))) {

+         /* Z comes from fragment program/shader */

+         swrast->_DeferredTexture = GL_FALSE;

+      }

+      else if (fprog && fprog->UsesKill) {

+         swrast->_DeferredTexture = GL_FALSE;

+      }

+      else if (ctx->Query.CurrentOcclusionObject) {

+         /* occlusion query depends on shader discard/kill results */

+         swrast->_DeferredTexture = GL_FALSE;

+      }

+      else {

+         swrast->_DeferredTexture = GL_TRUE;

+      }

+   }

+}

+

+

+/**

+ * Update swrast->_FogColor and swrast->_FogEnable values.

+ */

+static void

+_swrast_update_fog_state( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;

+

+   /* determine if fog is needed, and if so, which fog mode */

+   swrast->_FogEnabled = GL_FALSE;

+   if (fp && fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {

+      if (fp->FogOption != GL_NONE) {

+         swrast->_FogEnabled = GL_TRUE;

+         swrast->_FogMode = fp->FogOption;

+      }

+   }

+   else if (ctx->Fog.Enabled) {

+      swrast->_FogEnabled = GL_TRUE;

+      swrast->_FogMode = ctx->Fog.Mode;

+   }

+}

+

+

+/**

+ * Update state for running fragment programs.  Basically, load the

+ * program parameters with current state values.

+ */

+static void

+_swrast_update_fragment_program(struct gl_context *ctx, GLbitfield newState)

+{

+   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;

+   if (fp) {

+      _mesa_load_state_parameters(ctx, fp->Base.Parameters);

+   }

+}

+

+

+/**

+ * See if we can do early diffuse+specular (primary+secondary) color

+ * add per vertex instead of per-fragment.

+ */

+static void

+_swrast_update_specular_vertex_add(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLboolean separateSpecular = ctx->Fog.ColorSumEnabled ||

+      (ctx->Light.Enabled &&

+       ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR);

+

+   swrast->SpecularVertexAdd = (separateSpecular

+                                && ctx->Texture._EnabledUnits == 0x0

+                                && !ctx->FragmentProgram._Current

+                                && !ctx->ATIFragmentShader._Enabled);

+}

+

+

+#define _SWRAST_NEW_DERIVED (_SWRAST_NEW_RASTERMASK |	\

+                             _NEW_PROGRAM_CONSTANTS |   \

+			     _NEW_TEXTURE |		\

+			     _NEW_HINT |		\

+			     _NEW_POLYGON )

+

+/* State referenced by _swrast_choose_triangle, _swrast_choose_line.

+ */

+#define _SWRAST_NEW_TRIANGLE (_SWRAST_NEW_DERIVED |		\

+			      _NEW_RENDERMODE|			\

+                              _NEW_POLYGON|			\

+                              _NEW_DEPTH|			\

+                              _NEW_STENCIL|			\

+                              _NEW_COLOR|			\

+                              _NEW_TEXTURE|			\

+                              _SWRAST_NEW_RASTERMASK|		\

+                              _NEW_LIGHT|			\

+                              _NEW_FOG |			\

+			      _DD_NEW_SEPARATE_SPECULAR)

+

+#define _SWRAST_NEW_LINE (_SWRAST_NEW_DERIVED |		\

+			  _NEW_RENDERMODE|		\

+                          _NEW_LINE|			\

+                          _NEW_TEXTURE|			\

+                          _NEW_LIGHT|			\

+                          _NEW_FOG|			\

+                          _NEW_DEPTH |			\

+                          _DD_NEW_SEPARATE_SPECULAR)

+

+#define _SWRAST_NEW_POINT (_SWRAST_NEW_DERIVED |	\

+			   _NEW_RENDERMODE |		\

+			   _NEW_POINT |			\

+			   _NEW_TEXTURE |		\

+			   _NEW_LIGHT |			\

+			   _NEW_FOG |			\

+                           _DD_NEW_SEPARATE_SPECULAR)

+

+#define _SWRAST_NEW_TEXTURE_SAMPLE_FUNC _NEW_TEXTURE

+

+#define _SWRAST_NEW_TEXTURE_ENV_MODE _NEW_TEXTURE

+

+#define _SWRAST_NEW_BLEND_FUNC _NEW_COLOR

+

+

+

+/**

+ * Stub for swrast->Triangle to select a true triangle function

+ * after a state change.

+ */

+static void

+_swrast_validate_triangle( struct gl_context *ctx,

+			   const SWvertex *v0,

+                           const SWvertex *v1,

+                           const SWvertex *v2 )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   _swrast_validate_derived( ctx );

+   swrast->choose_triangle( ctx );

+   ASSERT(swrast->Triangle);

+

+   if (swrast->SpecularVertexAdd) {

+      /* separate specular color, but no texture */

+      swrast->SpecTriangle = swrast->Triangle;

+      swrast->Triangle = _swrast_add_spec_terms_triangle;

+   }

+

+   swrast->Triangle( ctx, v0, v1, v2 );

+}

+

+/**

+ * Called via swrast->Line.  Examine current GL state and choose a software

+ * line routine.  Then call it.

+ */

+static void

+_swrast_validate_line( struct gl_context *ctx, const SWvertex *v0, const SWvertex *v1 )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   _swrast_validate_derived( ctx );

+   swrast->choose_line( ctx );

+   ASSERT(swrast->Line);

+

+   if (swrast->SpecularVertexAdd) {

+      swrast->SpecLine = swrast->Line;

+      swrast->Line = _swrast_add_spec_terms_line;

+   }

+

+   swrast->Line( ctx, v0, v1 );

+}

+

+/**

+ * Called via swrast->Point.  Examine current GL state and choose a software

+ * point routine.  Then call it.

+ */

+static void

+_swrast_validate_point( struct gl_context *ctx, const SWvertex *v0 )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   _swrast_validate_derived( ctx );

+   swrast->choose_point( ctx );

+

+   if (swrast->SpecularVertexAdd) {

+      swrast->SpecPoint = swrast->Point;

+      swrast->Point = _swrast_add_spec_terms_point;

+   }

+

+   swrast->Point( ctx, v0 );

+}

+

+

+/**

+ * Called via swrast->BlendFunc.  Examine GL state to choose a blending

+ * function, then call it.

+ */

+static void _ASMAPI

+_swrast_validate_blend_func(struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                            GLvoid *src, const GLvoid *dst,

+                            GLenum chanType )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   _swrast_validate_derived( ctx ); /* why is this needed? */

+   _swrast_choose_blend_func( ctx, chanType );

+

+   swrast->BlendFunc( ctx, n, mask, src, dst, chanType );

+}

+

+

+/**

+ * Make sure we have texture image data for all the textures we may need

+ * for subsequent rendering.

+ */

+static void

+_swrast_validate_texture_images(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint u;

+

+   if (!swrast->ValidateTextureImage || !ctx->Texture._EnabledUnits) {

+      /* no textures enabled, or no way to validate images! */

+      return;

+   }

+

+   for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) {

+      if (ctx->Texture.Unit[u]._ReallyEnabled) {

+         struct gl_texture_object *texObj = ctx->Texture.Unit[u]._Current;

+         ASSERT(texObj);

+         if (texObj) {

+            GLuint numFaces = (texObj->Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;

+            GLuint face;

+            for (face = 0; face < numFaces; face++) {

+               GLint lvl;

+               for (lvl = texObj->BaseLevel; lvl <= texObj->_MaxLevel; lvl++) {

+                  struct gl_texture_image *texImg = texObj->Image[face][lvl];

+                  if (texImg && !texImg->Data) {

+                     swrast->ValidateTextureImage(ctx, texObj, face, lvl);

+                     ASSERT(texObj->Image[face][lvl]->Data);

+                  }

+               }

+            }

+         }

+      }

+   }

+}

+

+

+/**

+ * Free the texture image data attached to all currently enabled

+ * textures.  Meant to be called by device drivers when transitioning

+ * from software to hardware rendering.

+ */

+void

+_swrast_eject_texture_images(struct gl_context *ctx)

+{

+   GLuint u;

+

+   if (!ctx->Texture._EnabledUnits) {

+      /* no textures enabled */

+      return;

+   }

+

+   for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) {

+      if (ctx->Texture.Unit[u]._ReallyEnabled) {

+         struct gl_texture_object *texObj = ctx->Texture.Unit[u]._Current;

+         ASSERT(texObj);

+         if (texObj) {

+            GLuint numFaces = (texObj->Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;

+            GLuint face;

+            for (face = 0; face < numFaces; face++) {

+               GLint lvl;

+               for (lvl = texObj->BaseLevel; lvl <= texObj->_MaxLevel; lvl++) {

+                  struct gl_texture_image *texImg = texObj->Image[face][lvl];

+                  if (texImg && texImg->Data) {

+                     _mesa_free_texmemory(texImg->Data);

+                     texImg->Data = NULL;

+                  }

+               }

+            }

+         }

+      }

+   }

+}

+

+

+

+static void

+_swrast_sleep( struct gl_context *ctx, GLbitfield new_state )

+{

+   (void) ctx; (void) new_state;

+}

+

+

+static void

+_swrast_invalidate_state( struct gl_context *ctx, GLbitfield new_state )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint i;

+

+   swrast->NewState |= new_state;

+

+   /* After 10 statechanges without any swrast functions being called,

+    * put the module to sleep.

+    */

+   if (++swrast->StateChanges > 10) {

+      swrast->InvalidateState = _swrast_sleep;

+      swrast->NewState = ~0;

+      new_state = ~0;

+   }

+

+   if (new_state & swrast->InvalidateTriangleMask)

+      swrast->Triangle = _swrast_validate_triangle;

+

+   if (new_state & swrast->InvalidateLineMask)

+      swrast->Line = _swrast_validate_line;

+

+   if (new_state & swrast->InvalidatePointMask)

+      swrast->Point = _swrast_validate_point;

+

+   if (new_state & _SWRAST_NEW_BLEND_FUNC)

+      swrast->BlendFunc = _swrast_validate_blend_func;

+

+   if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC)

+      for (i = 0 ; i < ctx->Const.MaxTextureImageUnits ; i++)

+	 swrast->TextureSample[i] = NULL;

+}

+

+

+void

+_swrast_update_texture_samplers(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint u;

+

+   if (!swrast)

+      return; /* pipe hack */

+

+   for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) {

+      const struct gl_texture_object *tObj = ctx->Texture.Unit[u]._Current;

+      /* Note: If tObj is NULL, the sample function will be a simple

+       * function that just returns opaque black (0,0,0,1).

+       */

+      swrast->TextureSample[u] = _swrast_choose_texture_sample_func(ctx, tObj);

+   }

+}

+

+

+/**

+ * Update swrast->_ActiveAttribs, swrast->_NumActiveAttribs,

+ * swrast->_ActiveAtttribMask.

+ */

+static void

+_swrast_update_active_attribs(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint attribsMask;

+

+   /*

+    * Compute _ActiveAttribsMask = which fragment attributes are needed.

+    */

+   if (ctx->FragmentProgram._Current) {

+      /* fragment program/shader */

+      attribsMask = ctx->FragmentProgram._Current->Base.InputsRead;

+      attribsMask &= ~FRAG_BIT_WPOS; /* WPOS is always handled specially */

+   }

+   else if (ctx->ATIFragmentShader._Enabled) {

+      attribsMask = ~0;  /* XXX fix me */

+   }

+   else {

+      /* fixed function */

+      attribsMask = 0x0;

+

+#if CHAN_TYPE == GL_FLOAT

+      attribsMask |= FRAG_BIT_COL0;

+#endif

+

+      if (ctx->Fog.ColorSumEnabled ||

+          (ctx->Light.Enabled &&

+           ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {

+         attribsMask |= FRAG_BIT_COL1;

+      }

+

+      if (swrast->_FogEnabled)

+         attribsMask |= FRAG_BIT_FOGC;

+

+      attribsMask |= (ctx->Texture._EnabledUnits << FRAG_ATTRIB_TEX0);

+   }

+

+   swrast->_ActiveAttribMask = attribsMask;

+

+   /* Update _ActiveAttribs[] list */

+   {

+      GLuint i, num = 0;

+      for (i = 0; i < FRAG_ATTRIB_MAX; i++) {

+         if (attribsMask & (1 << i)) {

+            swrast->_ActiveAttribs[num++] = i;

+            /* how should this attribute be interpolated? */

+            if (i == FRAG_ATTRIB_COL0 || i == FRAG_ATTRIB_COL1)

+               swrast->_InterpMode[i] = ctx->Light.ShadeModel;

+            else

+               swrast->_InterpMode[i] = GL_SMOOTH;

+         }

+      }

+      swrast->_NumActiveAttribs = num;

+   }

+}

+

+

+void

+_swrast_validate_derived( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   if (swrast->NewState) {

+      if (swrast->NewState & _NEW_POLYGON)

+	 _swrast_update_polygon( ctx );

+

+      if (swrast->NewState & (_NEW_HINT | _NEW_PROGRAM))

+	 _swrast_update_fog_hint( ctx );

+

+      if (swrast->NewState & _SWRAST_NEW_TEXTURE_ENV_MODE)

+	 _swrast_update_texture_env( ctx );

+

+      if (swrast->NewState & (_NEW_FOG | _NEW_PROGRAM))

+         _swrast_update_fog_state( ctx );

+

+      if (swrast->NewState & (_NEW_PROGRAM_CONSTANTS | _NEW_PROGRAM))

+	 _swrast_update_fragment_program( ctx, swrast->NewState );

+

+      if (swrast->NewState & (_NEW_TEXTURE | _NEW_PROGRAM)) {

+         _swrast_update_texture_samplers( ctx );

+         _swrast_validate_texture_images(ctx);

+      }

+

+      if (swrast->NewState & (_NEW_COLOR | _NEW_PROGRAM))

+         _swrast_update_deferred_texture(ctx);

+

+      if (swrast->NewState & _SWRAST_NEW_RASTERMASK)

+ 	 _swrast_update_rasterflags( ctx );

+

+      if (swrast->NewState & (_NEW_DEPTH |

+                              _NEW_FOG |

+                              _NEW_LIGHT |

+                              _NEW_PROGRAM |

+                              _NEW_TEXTURE))

+         _swrast_update_active_attribs(ctx);

+

+      if (swrast->NewState & (_NEW_FOG | 

+                              _NEW_PROGRAM |

+                              _NEW_LIGHT |

+                              _NEW_TEXTURE))

+         _swrast_update_specular_vertex_add(ctx);

+

+      swrast->NewState = 0;

+      swrast->StateChanges = 0;

+      swrast->InvalidateState = _swrast_invalidate_state;

+   }

+}

+

+#define SWRAST_DEBUG 0

+

+/* Public entrypoints:  See also s_accum.c, s_bitmap.c, etc.

+ */

+void

+_swrast_Quad( struct gl_context *ctx,

+	      const SWvertex *v0, const SWvertex *v1,

+              const SWvertex *v2, const SWvertex *v3 )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_Quad\n");

+      _swrast_print_vertex( ctx, v0 );

+      _swrast_print_vertex( ctx, v1 );

+      _swrast_print_vertex( ctx, v2 );

+      _swrast_print_vertex( ctx, v3 );

+   }

+   SWRAST_CONTEXT(ctx)->Triangle( ctx, v0, v1, v3 );

+   SWRAST_CONTEXT(ctx)->Triangle( ctx, v1, v2, v3 );

+}

+

+void

+_swrast_Triangle( struct gl_context *ctx, const SWvertex *v0,

+                  const SWvertex *v1, const SWvertex *v2 )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_Triangle\n");

+      _swrast_print_vertex( ctx, v0 );

+      _swrast_print_vertex( ctx, v1 );

+      _swrast_print_vertex( ctx, v2 );

+   }

+   SWRAST_CONTEXT(ctx)->Triangle( ctx, v0, v1, v2 );

+}

+

+void

+_swrast_Line( struct gl_context *ctx, const SWvertex *v0, const SWvertex *v1 )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_Line\n");

+      _swrast_print_vertex( ctx, v0 );

+      _swrast_print_vertex( ctx, v1 );

+   }

+   SWRAST_CONTEXT(ctx)->Line( ctx, v0, v1 );

+}

+

+void

+_swrast_Point( struct gl_context *ctx, const SWvertex *v0 )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_Point\n");

+      _swrast_print_vertex( ctx, v0 );

+   }

+   SWRAST_CONTEXT(ctx)->Point( ctx, v0 );

+}

+

+void

+_swrast_InvalidateState( struct gl_context *ctx, GLbitfield new_state )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_InvalidateState\n");

+   }

+   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, new_state );

+}

+

+void

+_swrast_ResetLineStipple( struct gl_context *ctx )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_ResetLineStipple\n");

+   }

+   SWRAST_CONTEXT(ctx)->StippleCounter = 0;

+}

+

+void

+_swrast_SetFacing(struct gl_context *ctx, GLuint facing)

+{

+   SWRAST_CONTEXT(ctx)->PointLineFacing = facing;

+}

+

+void

+_swrast_allow_vertex_fog( struct gl_context *ctx, GLboolean value )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_allow_vertex_fog %d\n", value);

+   }

+   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );

+   SWRAST_CONTEXT(ctx)->AllowVertexFog = value;

+}

+

+void

+_swrast_allow_pixel_fog( struct gl_context *ctx, GLboolean value )

+{

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_allow_pixel_fog %d\n", value);

+   }

+   SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );

+   SWRAST_CONTEXT(ctx)->AllowPixelFog = value;

+}

+

+

+GLboolean

+_swrast_CreateContext( struct gl_context *ctx )

+{

+   GLuint i;

+   SWcontext *swrast = (SWcontext *)CALLOC(sizeof(SWcontext));

+

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_CreateContext\n");

+   }

+

+   if (!swrast)

+      return GL_FALSE;

+

+   swrast->NewState = ~0;

+

+   swrast->choose_point = _swrast_choose_point;

+   swrast->choose_line = _swrast_choose_line;

+   swrast->choose_triangle = _swrast_choose_triangle;

+

+   swrast->InvalidatePointMask = _SWRAST_NEW_POINT;

+   swrast->InvalidateLineMask = _SWRAST_NEW_LINE;

+   swrast->InvalidateTriangleMask = _SWRAST_NEW_TRIANGLE;

+

+   swrast->Point = _swrast_validate_point;

+   swrast->Line = _swrast_validate_line;

+   swrast->Triangle = _swrast_validate_triangle;

+   swrast->InvalidateState = _swrast_sleep;

+   swrast->BlendFunc = _swrast_validate_blend_func;

+

+   swrast->AllowVertexFog = GL_TRUE;

+   swrast->AllowPixelFog = GL_TRUE;

+

+   /* Optimized Accum buffer */

+   swrast->_IntegerAccumMode = GL_FALSE;

+   swrast->_IntegerAccumScaler = 0.0;

+

+   for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)

+      swrast->TextureSample[i] = NULL;

+

+   swrast->SpanArrays = MALLOC_STRUCT(sw_span_arrays);

+   if (!swrast->SpanArrays) {

+      FREE(swrast);

+      return GL_FALSE;

+   }

+   swrast->SpanArrays->ChanType = CHAN_TYPE;

+#if CHAN_TYPE == GL_UNSIGNED_BYTE

+   swrast->SpanArrays->rgba = swrast->SpanArrays->rgba8;

+#elif CHAN_TYPE == GL_UNSIGNED_SHORT

+   swrast->SpanArrays->rgba = swrast->SpanArrays->rgba16;

+#else

+   swrast->SpanArrays->rgba = swrast->SpanArrays->attribs[FRAG_ATTRIB_COL0];

+#endif

+

+   /* init point span buffer */

+   swrast->PointSpan.primitive = GL_POINT;

+   swrast->PointSpan.end = 0;

+   swrast->PointSpan.facing = 0;

+   swrast->PointSpan.array = swrast->SpanArrays;

+

+   swrast->TexelBuffer = (GLfloat *) MALLOC(ctx->Const.MaxTextureImageUnits *

+                                           MAX_WIDTH * 4 * sizeof(GLfloat));

+   if (!swrast->TexelBuffer) {

+      FREE(swrast->SpanArrays);

+      FREE(swrast);

+      return GL_FALSE;

+   }

+

+   ctx->swrast_context = swrast;

+

+   return GL_TRUE;

+}

+

+void

+_swrast_DestroyContext( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   if (SWRAST_DEBUG) {

+      _mesa_debug(ctx, "_swrast_DestroyContext\n");

+   }

+

+   FREE( swrast->SpanArrays );

+   if (swrast->ZoomedArrays)

+      FREE( swrast->ZoomedArrays );

+   FREE( swrast->TexelBuffer );

+   FREE( swrast );

+

+   ctx->swrast_context = 0;

+}

+

+

+struct swrast_device_driver *

+_swrast_GetDeviceDriverReference( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   return &swrast->Driver;

+}

+

+void

+_swrast_flush( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   /* flush any pending fragments from rendering points */

+   if (swrast->PointSpan.end > 0) {

+      _swrast_write_rgba_span(ctx, &(swrast->PointSpan));

+      swrast->PointSpan.end = 0;

+   }

+}

+

+void

+_swrast_render_primitive( struct gl_context *ctx, GLenum prim )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   if (swrast->Primitive == GL_POINTS && prim != GL_POINTS) {

+      _swrast_flush(ctx);

+   }

+   swrast->Primitive = prim;

+}

+

+

+void

+_swrast_render_start( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   if (swrast->Driver.SpanRenderStart)

+      swrast->Driver.SpanRenderStart( ctx );

+   swrast->PointSpan.end = 0;

+}

+ 

+void

+_swrast_render_finish( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   if (swrast->Driver.SpanRenderFinish)

+      swrast->Driver.SpanRenderFinish( ctx );

+

+   _swrast_flush(ctx);

+}

+

+

+#define SWRAST_DEBUG_VERTICES 0

+

+void

+_swrast_print_vertex( struct gl_context *ctx, const SWvertex *v )

+{

+   GLuint i;

+

+   if (SWRAST_DEBUG_VERTICES) {

+      _mesa_debug(ctx, "win %f %f %f %f\n",

+                  v->attrib[FRAG_ATTRIB_WPOS][0],

+                  v->attrib[FRAG_ATTRIB_WPOS][1],

+                  v->attrib[FRAG_ATTRIB_WPOS][2],

+                  v->attrib[FRAG_ATTRIB_WPOS][3]);

+

+      for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)

+	 if (ctx->Texture.Unit[i]._ReallyEnabled)

+	    _mesa_debug(ctx, "texcoord[%d] %f %f %f %f\n", i,

+                        v->attrib[FRAG_ATTRIB_TEX0 + i][0],

+                        v->attrib[FRAG_ATTRIB_TEX0 + i][1],

+                        v->attrib[FRAG_ATTRIB_TEX0 + i][2],

+                        v->attrib[FRAG_ATTRIB_TEX0 + i][3]);

+

+#if CHAN_TYPE == GL_FLOAT

+      _mesa_debug(ctx, "color %f %f %f %f\n",

+                  v->color[0], v->color[1], v->color[2], v->color[3]);

+#else

+      _mesa_debug(ctx, "color %d %d %d %d\n",

+                  v->color[0], v->color[1], v->color[2], v->color[3]);

+#endif

+      _mesa_debug(ctx, "spec %g %g %g %g\n",

+                  v->attrib[FRAG_ATTRIB_COL1][0],

+                  v->attrib[FRAG_ATTRIB_COL1][1],

+                  v->attrib[FRAG_ATTRIB_COL1][2],

+                  v->attrib[FRAG_ATTRIB_COL1][3]);

+      _mesa_debug(ctx, "fog %f\n", v->attrib[FRAG_ATTRIB_FOGC][0]);

+      _mesa_debug(ctx, "index %f\n", v->attrib[FRAG_ATTRIB_CI][0]);

+      _mesa_debug(ctx, "pointsize %f\n", v->pointSize);

+      _mesa_debug(ctx, "\n");

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_context.h b/mesalib/src/mesa/swrast/s_context.h
index 6d81f7476..7535832ab 100644
--- a/mesalib/src/mesa/swrast/s_context.h
+++ b/mesalib/src/mesa/swrast/s_context.h
@@ -1,349 +1,349 @@
-/*
- * 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 swrast/s_context.h
- * \brief Software rasterization context and private types.
- * \author Keith Whitwell <keith@tungstengraphics.com>
- */
-
-/**
- * \mainpage swrast module
- *
- * This module, software rasterization, contains the software fallback
- * routines for drawing points, lines, triangles, bitmaps and images.
- * All rendering boils down to writing spans (arrays) of pixels with
- * particular colors.  The span-writing routines must be implemented
- * by the device driver.
- */
-
-
-#ifndef S_CONTEXT_H
-#define S_CONTEXT_H
-
-#include "main/compiler.h"
-#include "main/mtypes.h"
-#include "program/prog_execute.h"
-#include "swrast.h"
-#include "s_span.h"
-
-
-typedef void (*texture_sample_func)(GLcontext *ctx,
-                                    const struct gl_texture_object *tObj,
-                                    GLuint n, const GLfloat texcoords[][4],
-                                    const GLfloat lambda[], GLfloat rgba[][4]);
-
-typedef void (_ASMAPIP blend_func)( GLcontext *ctx, GLuint n,
-                                    const GLubyte mask[],
-                                    GLvoid *src, const GLvoid *dst,
-                                    GLenum chanType);
-
-typedef void (*swrast_point_func)( GLcontext *ctx, const SWvertex *);
-
-typedef void (*swrast_line_func)( GLcontext *ctx,
-                                  const SWvertex *, const SWvertex *);
-
-typedef void (*swrast_tri_func)( GLcontext *ctx, const SWvertex *,
-                                 const SWvertex *, const SWvertex *);
-
-
-typedef void (*validate_texture_image_func)(GLcontext *ctx,
-                                            struct gl_texture_object *texObj,
-                                            GLuint face, GLuint level);
-
-
-/**
- * \defgroup Bitmasks
- * Bitmasks to indicate which rasterization options are enabled
- * (RasterMask)
- */
-/*@{*/
-#define ALPHATEST_BIT		0x001	/**< Alpha-test pixels */
-#define BLEND_BIT		0x002	/**< Blend pixels */
-#define DEPTH_BIT		0x004	/**< Depth-test pixels */
-#define FOG_BIT			0x008	/**< Fog pixels */
-#define LOGIC_OP_BIT		0x010	/**< Apply logic op in software */
-#define CLIP_BIT		0x020	/**< Scissor or window clip pixels */
-#define STENCIL_BIT		0x040	/**< Stencil pixels */
-#define MASKING_BIT		0x080	/**< Do glColorMask or glIndexMask */
-#define MULTI_DRAW_BIT		0x400	/**< Write to more than one color- */
-                                        /**< buffer or no buffers. */
-#define OCCLUSION_BIT           0x800   /**< GL_HP_occlusion_test enabled */
-#define TEXTURE_BIT		0x1000	/**< Texturing really enabled */
-#define FRAGPROG_BIT            0x2000  /**< Fragment program enabled */
-#define ATIFRAGSHADER_BIT       0x4000  /**< ATI Fragment shader enabled */
-#define CLAMPING_BIT            0x8000  /**< Clamp colors to [0,1] */
-/*@}*/
-
-#define _SWRAST_NEW_RASTERMASK (_NEW_BUFFERS|	\
-			        _NEW_SCISSOR|	\
-			        _NEW_COLOR|	\
-			        _NEW_DEPTH|	\
-			        _NEW_FOG|	\
-                                _NEW_PROGRAM|   \
-			        _NEW_STENCIL|	\
-			        _NEW_TEXTURE|	\
-			        _NEW_VIEWPORT|	\
-			        _NEW_DEPTH)
-
-
-/**
- * \struct SWcontext
- * \brief  Per-context state that's private to the software rasterizer module.
- */
-typedef struct
-{
-   /** Driver interface:
-    */
-   struct swrast_device_driver Driver;
-
-   /** Configuration mechanisms to make software rasterizer match
-    * characteristics of the hardware rasterizer (if present):
-    */
-   GLboolean AllowVertexFog;
-   GLboolean AllowPixelFog;
-
-   /** Derived values, invalidated on statechanges, updated from
-    * _swrast_validate_derived():
-    */
-   GLbitfield _RasterMask;
-   GLfloat _BackfaceSign;      /** +1 or -1 */
-   GLfloat _BackfaceCullSign;  /** +1, 0, or -1 */
-   GLboolean _PreferPixelFog;    /* Compute fog blend factor per fragment? */
-   GLboolean _TextureCombinePrimary;
-   GLboolean _FogEnabled;
-   GLboolean _DeferredTexture;
-   GLenum _FogMode;  /* either GL_FOG_MODE or fragment program's fog mode */
-
-   /** List/array of the fragment attributes to interpolate */
-   GLuint _ActiveAttribs[FRAG_ATTRIB_MAX];
-   /** Same info, but as a bitmask */
-   GLbitfield _ActiveAttribMask;
-   /** Number of fragment attributes to interpolate */
-   GLuint _NumActiveAttribs;
-   /** Indicates how each attrib is to be interpolated (lines/tris) */
-   GLenum _InterpMode[FRAG_ATTRIB_MAX]; /* GL_FLAT or GL_SMOOTH (for now) */
-
-   /* Accum buffer temporaries.
-    */
-   GLboolean _IntegerAccumMode;	/**< Storing unscaled integers? */
-   GLfloat _IntegerAccumScaler;	/**< Implicit scale factor */
-
-   /* Working values:
-    */
-   GLuint StippleCounter;    /**< Line stipple counter */
-   GLuint PointLineFacing;
-   GLbitfield NewState;
-   GLuint StateChanges;
-   GLenum Primitive;    /* current primitive being drawn (ala glBegin) */
-   GLboolean SpecularVertexAdd; /**< Add specular/secondary color per vertex */
-
-   void (*InvalidateState)( GLcontext *ctx, GLbitfield new_state );
-
-   /**
-    * When the NewState mask intersects these masks, we invalidate the
-    * Point/Line/Triangle function pointers below.
-    */
-   /*@{*/
-   GLbitfield InvalidatePointMask;
-   GLbitfield InvalidateLineMask;
-   GLbitfield InvalidateTriangleMask;
-   /*@}*/
-
-   /**
-    * Device drivers plug in functions for these callbacks.
-    * Will be called when the GL state change mask intersects the above masks.
-    */
-   /*@{*/
-   void (*choose_point)( GLcontext * );
-   void (*choose_line)( GLcontext * );
-   void (*choose_triangle)( GLcontext * );
-   /*@}*/
-
-   /**
-    * Current point, line and triangle drawing functions.
-    */
-   /*@{*/
-   swrast_point_func Point;
-   swrast_line_func Line;
-   swrast_tri_func Triangle;
-   /*@}*/
-
-   /**
-    * Placeholders for when separate specular (or secondary color) is
-    * enabled but texturing is not.
-    */
-   /*@{*/
-   swrast_point_func SpecPoint;
-   swrast_line_func SpecLine;
-   swrast_tri_func SpecTriangle;
-   /*@}*/
-
-   /**
-    * Typically, we'll allocate a sw_span structure as a local variable
-    * and set its 'array' pointer to point to this object.  The reason is
-    * this object is big and causes problems when allocated on the stack
-    * on some systems.
-    */
-   SWspanarrays *SpanArrays;
-   SWspanarrays *ZoomedArrays;  /**< For pixel zooming */
-
-   /**
-    * Used to buffer N GL_POINTS, instead of rendering one by one.
-    */
-   SWspan PointSpan;
-
-   /** Internal hooks, kept up to date by the same mechanism as above.
-    */
-   blend_func BlendFunc;
-   texture_sample_func TextureSample[MAX_TEXTURE_IMAGE_UNITS];
-
-   /** Buffer for saving the sampled texture colors.
-    * Needed for GL_ARB_texture_env_crossbar implementation.
-    */
-   GLfloat *TexelBuffer;
-
-   validate_texture_image_func ValidateTextureImage;
-
-   /** State used during execution of fragment programs */
-   struct gl_program_machine FragProgMachine;
-
-} SWcontext;
-
-
-extern void
-_swrast_validate_derived( GLcontext *ctx );
-
-extern void
-_swrast_update_texture_samplers(GLcontext *ctx);
-
-
-/** Return SWcontext for the given GLcontext */
-static INLINE SWcontext *
-SWRAST_CONTEXT(GLcontext *ctx)
-{
-   return (SWcontext *) ctx->swrast_context;
-}
-
-/** const version of above */
-static INLINE const SWcontext *
-CONST_SWRAST_CONTEXT(const GLcontext *ctx)
-{
-   return (const SWcontext *) ctx->swrast_context;
-}
-
-
-/**
- * Called prior to framebuffer reading/writing.
- * For drivers that rely on swrast for fallback rendering, this is the
- * driver's opportunity to map renderbuffers and textures.
- */
-static INLINE void
-swrast_render_start(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   if (swrast->Driver.SpanRenderStart)
-      swrast->Driver.SpanRenderStart(ctx);
-}
-
-
-/** Called after framebuffer reading/writing */
-static INLINE void
-swrast_render_finish(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   if (swrast->Driver.SpanRenderFinish)
-      swrast->Driver.SpanRenderFinish(ctx);
-}
-
-
-
-/**
- * Size of an RGBA pixel, in bytes, for given datatype.
- */
-#define RGBA_PIXEL_SIZE(TYPE)                                     \
-         ((TYPE == GL_UNSIGNED_BYTE) ? 4 * sizeof(GLubyte) :      \
-          ((TYPE == GL_UNSIGNED_SHORT) ? 4 * sizeof(GLushort)     \
-           : 4 * sizeof(GLfloat)))
-
-
-
-/*
- * Fixed point arithmetic macros
- */
-#ifndef FIXED_FRAC_BITS
-#define FIXED_FRAC_BITS 11
-#endif
-
-#define FIXED_SHIFT     FIXED_FRAC_BITS
-#define FIXED_ONE       (1 << FIXED_SHIFT)
-#define FIXED_HALF      (1 << (FIXED_SHIFT-1))
-#define FIXED_FRAC_MASK (FIXED_ONE - 1)
-#define FIXED_INT_MASK  (~FIXED_FRAC_MASK)
-#define FIXED_EPSILON   1
-#define FIXED_SCALE     ((float) FIXED_ONE)
-#define FIXED_DBL_SCALE ((double) FIXED_ONE)
-#define FloatToFixed(X) (IROUND((X) * FIXED_SCALE))
-#define FixedToDouble(X) ((X) * (1.0 / FIXED_DBL_SCALE))
-#define IntToFixed(I)   ((I) << FIXED_SHIFT)
-#define FixedToInt(X)   ((X) >> FIXED_SHIFT)
-#define FixedToUns(X)   (((unsigned int)(X)) >> FIXED_SHIFT)
-#define FixedCeil(X)    (((X) + FIXED_ONE - FIXED_EPSILON) & FIXED_INT_MASK)
-#define FixedFloor(X)   ((X) & FIXED_INT_MASK)
-#define FixedToFloat(X) ((X) * (1.0F / FIXED_SCALE))
-#define PosFloatToFixed(X)      FloatToFixed(X)
-#define SignedFloatToFixed(X)   FloatToFixed(X)
-
-
-
-/*
- * XXX these macros are just bandages for now in order to make
- * CHAN_BITS==32 compile cleanly.
- * These should probably go elsewhere at some point.
- */
-#if CHAN_TYPE == GL_FLOAT
-#define ChanToFixed(X)  (X)
-#define FixedToChan(X)  (X)
-#else
-#define ChanToFixed(X)  IntToFixed(X)
-#define FixedToChan(X)  FixedToInt(X)
-#endif
-
-
-/**
- * For looping over fragment attributes in the pointe, line
- * triangle rasterizers.
- */
-#define ATTRIB_LOOP_BEGIN                                \
-   {                                                     \
-      GLuint a;                                          \
-      for (a = 0; a < swrast->_NumActiveAttribs; a++) {  \
-         const GLuint attr = swrast->_ActiveAttribs[a];
-
-#define ATTRIB_LOOP_END } }
-
-
-
-#endif
+/*

+ * 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 swrast/s_context.h

+ * \brief Software rasterization context and private types.

+ * \author Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+/**

+ * \mainpage swrast module

+ *

+ * This module, software rasterization, contains the software fallback

+ * routines for drawing points, lines, triangles, bitmaps and images.

+ * All rendering boils down to writing spans (arrays) of pixels with

+ * particular colors.  The span-writing routines must be implemented

+ * by the device driver.

+ */

+

+

+#ifndef S_CONTEXT_H

+#define S_CONTEXT_H

+

+#include "main/compiler.h"

+#include "main/mtypes.h"

+#include "program/prog_execute.h"

+#include "swrast.h"

+#include "s_span.h"

+

+

+typedef void (*texture_sample_func)(struct gl_context *ctx,

+                                    const struct gl_texture_object *tObj,

+                                    GLuint n, const GLfloat texcoords[][4],

+                                    const GLfloat lambda[], GLfloat rgba[][4]);

+

+typedef void (_ASMAPIP blend_func)( struct gl_context *ctx, GLuint n,

+                                    const GLubyte mask[],

+                                    GLvoid *src, const GLvoid *dst,

+                                    GLenum chanType);

+

+typedef void (*swrast_point_func)( struct gl_context *ctx, const SWvertex *);

+

+typedef void (*swrast_line_func)( struct gl_context *ctx,

+                                  const SWvertex *, const SWvertex *);

+

+typedef void (*swrast_tri_func)( struct gl_context *ctx, const SWvertex *,

+                                 const SWvertex *, const SWvertex *);

+

+

+typedef void (*validate_texture_image_func)(struct gl_context *ctx,

+                                            struct gl_texture_object *texObj,

+                                            GLuint face, GLuint level);

+

+

+/**

+ * \defgroup Bitmasks

+ * Bitmasks to indicate which rasterization options are enabled

+ * (RasterMask)

+ */

+/*@{*/

+#define ALPHATEST_BIT		0x001	/**< Alpha-test pixels */

+#define BLEND_BIT		0x002	/**< Blend pixels */

+#define DEPTH_BIT		0x004	/**< Depth-test pixels */

+#define FOG_BIT			0x008	/**< Fog pixels */

+#define LOGIC_OP_BIT		0x010	/**< Apply logic op in software */

+#define CLIP_BIT		0x020	/**< Scissor or window clip pixels */

+#define STENCIL_BIT		0x040	/**< Stencil pixels */

+#define MASKING_BIT		0x080	/**< Do glColorMask or glIndexMask */

+#define MULTI_DRAW_BIT		0x400	/**< Write to more than one color- */

+                                        /**< buffer or no buffers. */

+#define OCCLUSION_BIT           0x800   /**< GL_HP_occlusion_test enabled */

+#define TEXTURE_BIT		0x1000	/**< Texturing really enabled */

+#define FRAGPROG_BIT            0x2000  /**< Fragment program enabled */

+#define ATIFRAGSHADER_BIT       0x4000  /**< ATI Fragment shader enabled */

+#define CLAMPING_BIT            0x8000  /**< Clamp colors to [0,1] */

+/*@}*/

+

+#define _SWRAST_NEW_RASTERMASK (_NEW_BUFFERS|	\

+			        _NEW_SCISSOR|	\

+			        _NEW_COLOR|	\

+			        _NEW_DEPTH|	\

+			        _NEW_FOG|	\

+                                _NEW_PROGRAM|   \

+			        _NEW_STENCIL|	\

+			        _NEW_TEXTURE|	\

+			        _NEW_VIEWPORT|	\

+			        _NEW_DEPTH)

+

+

+/**

+ * \struct SWcontext

+ * \brief  Per-context state that's private to the software rasterizer module.

+ */

+typedef struct

+{

+   /** Driver interface:

+    */

+   struct swrast_device_driver Driver;

+

+   /** Configuration mechanisms to make software rasterizer match

+    * characteristics of the hardware rasterizer (if present):

+    */

+   GLboolean AllowVertexFog;

+   GLboolean AllowPixelFog;

+

+   /** Derived values, invalidated on statechanges, updated from

+    * _swrast_validate_derived():

+    */

+   GLbitfield _RasterMask;

+   GLfloat _BackfaceSign;      /** +1 or -1 */

+   GLfloat _BackfaceCullSign;  /** +1, 0, or -1 */

+   GLboolean _PreferPixelFog;    /* Compute fog blend factor per fragment? */

+   GLboolean _TextureCombinePrimary;

+   GLboolean _FogEnabled;

+   GLboolean _DeferredTexture;

+   GLenum _FogMode;  /* either GL_FOG_MODE or fragment program's fog mode */

+

+   /** List/array of the fragment attributes to interpolate */

+   GLuint _ActiveAttribs[FRAG_ATTRIB_MAX];

+   /** Same info, but as a bitmask */

+   GLbitfield _ActiveAttribMask;

+   /** Number of fragment attributes to interpolate */

+   GLuint _NumActiveAttribs;

+   /** Indicates how each attrib is to be interpolated (lines/tris) */

+   GLenum _InterpMode[FRAG_ATTRIB_MAX]; /* GL_FLAT or GL_SMOOTH (for now) */

+

+   /* Accum buffer temporaries.

+    */

+   GLboolean _IntegerAccumMode;	/**< Storing unscaled integers? */

+   GLfloat _IntegerAccumScaler;	/**< Implicit scale factor */

+

+   /* Working values:

+    */

+   GLuint StippleCounter;    /**< Line stipple counter */

+   GLuint PointLineFacing;

+   GLbitfield NewState;

+   GLuint StateChanges;

+   GLenum Primitive;    /* current primitive being drawn (ala glBegin) */

+   GLboolean SpecularVertexAdd; /**< Add specular/secondary color per vertex */

+

+   void (*InvalidateState)( struct gl_context *ctx, GLbitfield new_state );

+

+   /**

+    * When the NewState mask intersects these masks, we invalidate the

+    * Point/Line/Triangle function pointers below.

+    */

+   /*@{*/

+   GLbitfield InvalidatePointMask;

+   GLbitfield InvalidateLineMask;

+   GLbitfield InvalidateTriangleMask;

+   /*@}*/

+

+   /**

+    * Device drivers plug in functions for these callbacks.

+    * Will be called when the GL state change mask intersects the above masks.

+    */

+   /*@{*/

+   void (*choose_point)( struct gl_context * );

+   void (*choose_line)( struct gl_context * );

+   void (*choose_triangle)( struct gl_context * );

+   /*@}*/

+

+   /**

+    * Current point, line and triangle drawing functions.

+    */

+   /*@{*/

+   swrast_point_func Point;

+   swrast_line_func Line;

+   swrast_tri_func Triangle;

+   /*@}*/

+

+   /**

+    * Placeholders for when separate specular (or secondary color) is

+    * enabled but texturing is not.

+    */

+   /*@{*/

+   swrast_point_func SpecPoint;

+   swrast_line_func SpecLine;

+   swrast_tri_func SpecTriangle;

+   /*@}*/

+

+   /**

+    * Typically, we'll allocate a sw_span structure as a local variable

+    * and set its 'array' pointer to point to this object.  The reason is

+    * this object is big and causes problems when allocated on the stack

+    * on some systems.

+    */

+   SWspanarrays *SpanArrays;

+   SWspanarrays *ZoomedArrays;  /**< For pixel zooming */

+

+   /**

+    * Used to buffer N GL_POINTS, instead of rendering one by one.

+    */

+   SWspan PointSpan;

+

+   /** Internal hooks, kept up to date by the same mechanism as above.

+    */

+   blend_func BlendFunc;

+   texture_sample_func TextureSample[MAX_TEXTURE_IMAGE_UNITS];

+

+   /** Buffer for saving the sampled texture colors.

+    * Needed for GL_ARB_texture_env_crossbar implementation.

+    */

+   GLfloat *TexelBuffer;

+

+   validate_texture_image_func ValidateTextureImage;

+

+   /** State used during execution of fragment programs */

+   struct gl_program_machine FragProgMachine;

+

+} SWcontext;

+

+

+extern void

+_swrast_validate_derived( struct gl_context *ctx );

+

+extern void

+_swrast_update_texture_samplers(struct gl_context *ctx);

+

+

+/** Return SWcontext for the given struct gl_context */

+static INLINE SWcontext *

+SWRAST_CONTEXT(struct gl_context *ctx)

+{

+   return (SWcontext *) ctx->swrast_context;

+}

+

+/** const version of above */

+static INLINE const SWcontext *

+CONST_SWRAST_CONTEXT(const struct gl_context *ctx)

+{

+   return (const SWcontext *) ctx->swrast_context;

+}

+

+

+/**

+ * Called prior to framebuffer reading/writing.

+ * For drivers that rely on swrast for fallback rendering, this is the

+ * driver's opportunity to map renderbuffers and textures.

+ */

+static INLINE void

+swrast_render_start(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   if (swrast->Driver.SpanRenderStart)

+      swrast->Driver.SpanRenderStart(ctx);

+}

+

+

+/** Called after framebuffer reading/writing */

+static INLINE void

+swrast_render_finish(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   if (swrast->Driver.SpanRenderFinish)

+      swrast->Driver.SpanRenderFinish(ctx);

+}

+

+

+

+/**

+ * Size of an RGBA pixel, in bytes, for given datatype.

+ */

+#define RGBA_PIXEL_SIZE(TYPE)                                     \

+         ((TYPE == GL_UNSIGNED_BYTE) ? 4 * sizeof(GLubyte) :      \

+          ((TYPE == GL_UNSIGNED_SHORT) ? 4 * sizeof(GLushort)     \

+           : 4 * sizeof(GLfloat)))

+

+

+

+/*

+ * Fixed point arithmetic macros

+ */

+#ifndef FIXED_FRAC_BITS

+#define FIXED_FRAC_BITS 11

+#endif

+

+#define FIXED_SHIFT     FIXED_FRAC_BITS

+#define FIXED_ONE       (1 << FIXED_SHIFT)

+#define FIXED_HALF      (1 << (FIXED_SHIFT-1))

+#define FIXED_FRAC_MASK (FIXED_ONE - 1)

+#define FIXED_INT_MASK  (~FIXED_FRAC_MASK)

+#define FIXED_EPSILON   1

+#define FIXED_SCALE     ((float) FIXED_ONE)

+#define FIXED_DBL_SCALE ((double) FIXED_ONE)

+#define FloatToFixed(X) (IROUND((X) * FIXED_SCALE))

+#define FixedToDouble(X) ((X) * (1.0 / FIXED_DBL_SCALE))

+#define IntToFixed(I)   ((I) << FIXED_SHIFT)

+#define FixedToInt(X)   ((X) >> FIXED_SHIFT)

+#define FixedToUns(X)   (((unsigned int)(X)) >> FIXED_SHIFT)

+#define FixedCeil(X)    (((X) + FIXED_ONE - FIXED_EPSILON) & FIXED_INT_MASK)

+#define FixedFloor(X)   ((X) & FIXED_INT_MASK)

+#define FixedToFloat(X) ((X) * (1.0F / FIXED_SCALE))

+#define PosFloatToFixed(X)      FloatToFixed(X)

+#define SignedFloatToFixed(X)   FloatToFixed(X)

+

+

+

+/*

+ * XXX these macros are just bandages for now in order to make

+ * CHAN_BITS==32 compile cleanly.

+ * These should probably go elsewhere at some point.

+ */

+#if CHAN_TYPE == GL_FLOAT

+#define ChanToFixed(X)  (X)

+#define FixedToChan(X)  (X)

+#else

+#define ChanToFixed(X)  IntToFixed(X)

+#define FixedToChan(X)  FixedToInt(X)

+#endif

+

+

+/**

+ * For looping over fragment attributes in the pointe, line

+ * triangle rasterizers.

+ */

+#define ATTRIB_LOOP_BEGIN                                \

+   {                                                     \

+      GLuint a;                                          \

+      for (a = 0; a < swrast->_NumActiveAttribs; a++) {  \

+         const GLuint attr = swrast->_ActiveAttribs[a];

+

+#define ATTRIB_LOOP_END } }

+

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_copypix.c b/mesalib/src/mesa/swrast/s_copypix.c
index f4f0c8a33..e249e4ad5 100644
--- a/mesalib/src/mesa/swrast/s_copypix.c
+++ b/mesalib/src/mesa/swrast/s_copypix.c
@@ -1,827 +1,720 @@
-/*
- * 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/context.h"
-#include "main/colormac.h"
-#include "main/condrender.h"
-#include "main/convolve.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_zoom.h"
-
-
-
-/**
- * Determine if there's overlap in an image copy.
- * This test also compensates for the fact that copies are done from
- * bottom to top and overlaps can sometimes be handled correctly
- * without making a temporary image copy.
- * \return GL_TRUE if the regions overlap, GL_FALSE otherwise.
- */
-static GLboolean
-regions_overlap(GLint srcx, GLint srcy,
-                GLint dstx, GLint dsty,
-                GLint width, GLint height,
-                GLfloat zoomX, GLfloat zoomY)
-{
-   if (zoomX == 1.0 && zoomY == 1.0) {
-      /* no zoom */
-      if (srcx >= dstx + width || (srcx + width <= dstx)) {
-         return GL_FALSE;
-      }
-      else if (srcy < dsty) { /* this is OK */
-         return GL_FALSE;
-      }
-      else if (srcy > dsty + height) {
-         return GL_FALSE;
-      }
-      else {
-         return GL_TRUE;
-      }
-   }
-   else {
-      /* add one pixel of slop when zooming, just to be safe */
-      if (srcx > (dstx + ((zoomX > 0.0F) ? (width * zoomX + 1.0F) : 0.0F))) {
-         /* src is completely right of dest */
-         return GL_FALSE;
-      }
-      else if (srcx + width + 1.0F < dstx + ((zoomX > 0.0F) ? 0.0F : (width * zoomX))) {
-         /* src is completely left of dest */
-         return GL_FALSE;
-      }
-      else if ((srcy < dsty) && (srcy + height < dsty + (height * zoomY))) {
-         /* src is completely below dest */
-         return GL_FALSE;
-      }
-      else if ((srcy > dsty) && (srcy + height > dsty + (height * zoomY))) {
-         /* src is completely above dest */
-         return GL_FALSE;
-      }
-      else {
-         return GL_TRUE;
-      }
-   }
-}
-
-
-/**
- * RGBA copypixels with convolution.
- */
-static void
-copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
-                      GLint width, GLint height, GLint destx, GLint desty)
-{
-   GLint row;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
-   const GLbitfield transferOps = ctx->_ImageTransferState;
-   const GLboolean sink = (ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink)
-      || (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink);
-   GLfloat *dest, *tmpImage, *convImage;
-   SWspan span;
-
-   INIT_SPAN(span, GL_BITMAP);
-   _swrast_span_default_attribs(ctx, &span);
-   span.arrayMask = SPAN_RGBA;
-   span.arrayAttribs = FRAG_BIT_COL0;
-
-   /* allocate space for GLfloat image */
-   tmpImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-   if (!tmpImage) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
-      return;
-   }
-   convImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-   if (!convImage) {
-      free(tmpImage);
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
-      return;
-   }
-
-   /* read source image as float/RGBA */
-   dest = tmpImage;
-   for (row = 0; row < height; row++) {
-      _swrast_read_rgba_span(ctx, ctx->ReadBuffer->_ColorReadBuffer,
-                             width, srcx, srcy + row, GL_FLOAT, dest);
-      dest += 4 * width;
-   }
-
-   /* do the image transfer ops which preceed convolution */
-   for (row = 0; row < height; row++) {
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) (tmpImage + row * width * 4);
-      _mesa_apply_rgba_transfer_ops(ctx,
-                                    transferOps & IMAGE_PRE_CONVOLUTION_BITS,
-                                    width, rgba);
-   }
-
-   /* do convolution */
-   if (ctx->Pixel.Convolution2DEnabled) {
-      _mesa_convolve_2d_image(ctx, &width, &height, tmpImage, convImage);
-   }
-   else {
-      ASSERT(ctx->Pixel.Separable2DEnabled);
-      _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
-   }
-   free(tmpImage);
-
-   /* do remaining post-convolution image transfer ops */
-   for (row = 0; row < height; row++) {
-      GLfloat (*rgba)[4] = (GLfloat (*)[4]) (convImage + row * width * 4);
-      _mesa_apply_rgba_transfer_ops(ctx,
-                                    transferOps & IMAGE_POST_CONVOLUTION_BITS,
-                                    width, rgba);
-   }
-
-   if (!sink) {
-      /* write the new image */
-      for (row = 0; row < height; row++) {
-         const GLfloat *src = convImage + row * width * 4;
-         GLfloat *rgba = (GLfloat *) span.array->attribs[FRAG_ATTRIB_COL0];
-
-         /* copy convolved colors into span array */
-         memcpy(rgba, src, width * 4 * sizeof(GLfloat));
-
-         /* write span */
-         span.x = destx;
-         span.y = desty + row;
-         span.end = width;
-         span.array->ChanType = GL_FLOAT;
-         if (zoom) {
-            _swrast_write_zoomed_rgba_span(ctx, destx, desty, &span, rgba);
-         }
-         else {
-            _swrast_write_rgba_span(ctx, &span);
-         }
-      }
-      /* restore this */
-      span.array->ChanType = CHAN_TYPE;
-   }
-
-   free(convImage);
-}
-
-
-/**
- * RGBA copypixels
- */
-static void
-copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
-                 GLint width, GLint height, GLint destx, GLint desty)
-{
-   GLfloat *tmpImage, *p;
-   GLint sy, dy, stepy, row;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
-   GLint overlapping;
-   GLuint transferOps = ctx->_ImageTransferState;
-   SWspan span;
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      /* no readbuffer - OK */
-      return;
-   }
-
-   if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
-      copy_conv_rgba_pixels(ctx, srcx, srcy, width, height, destx, desty);
-      return;
-   }
-   else if (ctx->Pixel.Convolution1DEnabled) {
-      /* make sure we don't apply 1D convolution */
-      transferOps &= ~(IMAGE_CONVOLUTION_BIT |
-                       IMAGE_POST_CONVOLUTION_SCALE_BIAS);
-   }
-
-   if (ctx->DrawBuffer == ctx->ReadBuffer) {
-      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
-                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
-   }
-   else {
-      overlapping = GL_FALSE;
-   }
-
-   /* Determine if copy should be done bottom-to-top or top-to-bottom */
-   if (!overlapping && srcy < desty) {
-      /* top-down  max-to-min */
-      sy = srcy + height - 1;
-      dy = desty + height - 1;
-      stepy = -1;
-   }
-   else {
-      /* bottom-up  min-to-max */
-      sy = srcy;
-      dy = desty;
-      stepy = 1;
-   }
-
-   INIT_SPAN(span, GL_BITMAP);
-   _swrast_span_default_attribs(ctx, &span);
-   span.arrayMask = SPAN_RGBA;
-   span.arrayAttribs = FRAG_BIT_COL0; /* we'll fill in COL0 attrib values */
-
-   if (overlapping) {
-      tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat) * 4);
-      if (!tmpImage) {
-         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
-         return;
-      }
-      /* read the source image as RGBA/float */
-      p = tmpImage;
-      for (row = 0; row < height; row++) {
-         _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer,
-                                 width, srcx, sy + row, GL_FLOAT, p );
-         p += width * 4;
-      }
-      p = tmpImage;
-   }
-   else {
-      tmpImage = NULL;  /* silence compiler warnings */
-      p = NULL;
-   }
-
-   ASSERT(width < MAX_WIDTH);
-
-   for (row = 0; row < height; row++, sy += stepy, dy += stepy) {
-      GLvoid *rgba = span.array->attribs[FRAG_ATTRIB_COL0];
-
-      /* Get row/span of source pixels */
-      if (overlapping) {
-         /* get from buffered image */
-         memcpy(rgba, p, width * sizeof(GLfloat) * 4);
-         p += width * 4;
-      }
-      else {
-         /* get from framebuffer */
-         _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer,
-                                 width, srcx, sy, GL_FLOAT, rgba );
-      }
-
-      if (transferOps) {
-         _mesa_apply_rgba_transfer_ops(ctx, transferOps, width,
-                                       (GLfloat (*)[4]) rgba);
-      }
-
-      /* Write color span */
-      span.x = destx;
-      span.y = dy;
-      span.end = width;
-      span.array->ChanType = GL_FLOAT;
-      if (zoom) {
-         _swrast_write_zoomed_rgba_span(ctx, destx, desty, &span, rgba);
-      }
-      else {
-         _swrast_write_rgba_span(ctx, &span);
-      }
-   }
-
-   span.array->ChanType = CHAN_TYPE; /* restore */
-
-   if (overlapping)
-      free(tmpImage);
-}
-
-
-/**
- * Convert floating point Z values to integer Z values with pixel transfer's
- * Z scale and bias.
- */
-static void
-scale_and_bias_z(GLcontext *ctx, GLuint width,
-                 const GLfloat depth[], GLuint z[])
-{
-   const GLuint depthMax = ctx->DrawBuffer->_DepthMax;
-   GLuint i;
-
-   if (depthMax <= 0xffffff &&
-       ctx->Pixel.DepthScale == 1.0 &&
-       ctx->Pixel.DepthBias == 0.0) {
-      /* no scale or bias and no clamping and no worry of overflow */
-      const GLfloat depthMaxF = ctx->DrawBuffer->_DepthMaxF;
-      for (i = 0; i < width; i++) {
-         z[i] = (GLuint) (depth[i] * depthMaxF);
-      }
-   }
-   else {
-      /* need to be careful with overflow */
-      const GLdouble depthMaxF = ctx->DrawBuffer->_DepthMaxF;
-      for (i = 0; i < width; i++) {
-         GLdouble d = depth[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias;
-         d = CLAMP(d, 0.0, 1.0) * depthMaxF;
-         if (d >= depthMaxF)
-            z[i] = depthMax;
-         else
-            z[i] = (GLuint) d;
-      }
-   }
-}
-
-
-
-/*
- * TODO: Optimize!!!!
- */
-static void
-copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
-                   GLint width, GLint height,
-                   GLint destx, GLint desty )
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct gl_renderbuffer *readRb = fb->_DepthBuffer;
-   GLfloat *p, *tmpImage;
-   GLint sy, dy, stepy;
-   GLint j;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
-   GLint overlapping;
-   SWspan span;
-
-   if (!readRb) {
-      /* no readbuffer - OK */
-      return;
-   }
-
-   INIT_SPAN(span, GL_BITMAP);
-   _swrast_span_default_attribs(ctx, &span);
-   span.arrayMask = SPAN_Z;
-
-   if (ctx->DrawBuffer == ctx->ReadBuffer) {
-      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
-                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
-   }
-   else {
-      overlapping = GL_FALSE;
-   }
-
-   /* Determine if copy should be bottom-to-top or top-to-bottom */
-   if (!overlapping && srcy < desty) {
-      /* top-down  max-to-min */
-      sy = srcy + height - 1;
-      dy = desty + height - 1;
-      stepy = -1;
-   }
-   else {
-      /* bottom-up  min-to-max */
-      sy = srcy;
-      dy = desty;
-      stepy = 1;
-   }
-
-   if (overlapping) {
-      GLint ssy = sy;
-      tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat));
-      if (!tmpImage) {
-         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
-         return;
-      }
-      p = tmpImage;
-      for (j = 0; j < height; j++, ssy += stepy) {
-         _swrast_read_depth_span_float(ctx, readRb, width, srcx, ssy, p);
-         p += width;
-      }
-      p = tmpImage;
-   }
-   else {
-      tmpImage = NULL;  /* silence compiler warning */
-      p = NULL;
-   }
-
-   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
-      GLfloat depth[MAX_WIDTH];
-      /* get depth values */
-      if (overlapping) {
-         memcpy(depth, p, width * sizeof(GLfloat));
-         p += width;
-      }
-      else {
-         _swrast_read_depth_span_float(ctx, readRb, width, srcx, sy, depth);
-      }
-
-      /* apply scale and bias */
-      scale_and_bias_z(ctx, width, depth, span.array->z);
-
-      /* write depth values */
-      span.x = destx;
-      span.y = dy;
-      span.end = width;
-      if (zoom)
-         _swrast_write_zoomed_depth_span(ctx, destx, desty, &span);
-      else
-         _swrast_write_rgba_span(ctx, &span);
-   }
-
-   if (overlapping)
-      free(tmpImage);
-}
-
-
-
-static void
-copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
-                     GLint width, GLint height,
-                     GLint destx, GLint desty )
-{
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   GLint sy, dy, stepy;
-   GLint j;
-   GLstencil *p, *tmpImage;
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
-   GLint overlapping;
-
-   if (!rb) {
-      /* no readbuffer - OK */
-      return;
-   }
-
-   if (ctx->DrawBuffer == ctx->ReadBuffer) {
-      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
-                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
-   }
-   else {
-      overlapping = GL_FALSE;
-   }
-
-   /* Determine if copy should be bottom-to-top or top-to-bottom */
-   if (!overlapping && srcy < desty) {
-      /* top-down  max-to-min */
-      sy = srcy + height - 1;
-      dy = desty + height - 1;
-      stepy = -1;
-   }
-   else {
-      /* bottom-up  min-to-max */
-      sy = srcy;
-      dy = desty;
-      stepy = 1;
-   }
-
-   if (overlapping) {
-      GLint ssy = sy;
-      tmpImage = (GLstencil *) malloc(width * height * sizeof(GLstencil));
-      if (!tmpImage) {
-         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
-         return;
-      }
-      p = tmpImage;
-      for (j = 0; j < height; j++, ssy += stepy) {
-         _swrast_read_stencil_span( ctx, rb, width, srcx, ssy, p );
-         p += width;
-      }
-      p = tmpImage;
-   }
-   else {
-      tmpImage = NULL;  /* silence compiler warning */
-      p = NULL;
-   }
-
-   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
-      GLstencil stencil[MAX_WIDTH];
-
-      /* Get stencil values */
-      if (overlapping) {
-         memcpy(stencil, p, width * sizeof(GLstencil));
-         p += width;
-      }
-      else {
-         _swrast_read_stencil_span( ctx, rb, width, srcx, sy, stencil );
-      }
-
-      _mesa_apply_stencil_transfer_ops(ctx, width, stencil);
-
-      /* Write stencil values */
-      if (zoom) {
-         _swrast_write_zoomed_stencil_span(ctx, destx, desty, width,
-                                           destx, dy, stencil);
-      }
-      else {
-         _swrast_write_stencil_span( ctx, width, destx, dy, stencil );
-      }
-   }
-
-   if (overlapping)
-      free(tmpImage);
-}
-
-
-/**
- * This isn't terribly efficient.  If a driver really has combined
- * depth/stencil buffers the driver should implement an optimized
- * CopyPixels function.
- */
-static void
-copy_depth_stencil_pixels(GLcontext *ctx,
-                          const GLint srcX, const GLint srcY,
-                          const GLint width, const GLint height,
-                          const GLint destX, const GLint destY)
-{
-   struct gl_renderbuffer *stencilReadRb, *depthReadRb, *depthDrawRb;
-   GLint sy, dy, stepy;
-   GLint j;
-   GLstencil *tempStencilImage = NULL, *stencilPtr = NULL;
-   GLfloat *tempDepthImage = NULL, *depthPtr = NULL;
-   const GLfloat depthScale = ctx->DrawBuffer->_DepthMaxF;
-   const GLuint stencilMask = ctx->Stencil.WriteMask[0];
-   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;
-   const GLboolean scaleOrBias
-      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;
-   GLint overlapping;
-
-   depthDrawRb = ctx->DrawBuffer->_DepthBuffer;
-   depthReadRb = ctx->ReadBuffer->_DepthBuffer;
-   stencilReadRb = ctx->ReadBuffer->_StencilBuffer;
-
-   ASSERT(depthDrawRb);
-   ASSERT(depthReadRb);
-   ASSERT(stencilReadRb);
-
-   if (ctx->DrawBuffer == ctx->ReadBuffer) {
-      overlapping = regions_overlap(srcX, srcY, destX, destY, width, height,
-                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
-   }
-   else {
-      overlapping = GL_FALSE;
-   }
-
-   /* Determine if copy should be bottom-to-top or top-to-bottom */
-   if (!overlapping && srcY < destY) {
-      /* top-down  max-to-min */
-      sy = srcY + height - 1;
-      dy = destY + height - 1;
-      stepy = -1;
-   }
-   else {
-      /* bottom-up  min-to-max */
-      sy = srcY;
-      dy = destY;
-      stepy = 1;
-   }
-
-   if (overlapping) {
-      GLint ssy = sy;
-
-      if (stencilMask != 0x0) {
-         tempStencilImage
-            = (GLstencil *) malloc(width * height * sizeof(GLstencil));
-         if (!tempStencilImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
-            return;
-         }
-
-         /* get copy of stencil pixels */
-         stencilPtr = tempStencilImage;
-         for (j = 0; j < height; j++, ssy += stepy) {
-            _swrast_read_stencil_span(ctx, stencilReadRb,
-                                      width, srcX, ssy, stencilPtr);
-            stencilPtr += width;
-         }
-         stencilPtr = tempStencilImage;
-      }
-
-      if (ctx->Depth.Mask) {
-         tempDepthImage
-            = (GLfloat *) malloc(width * height * sizeof(GLfloat));
-         if (!tempDepthImage) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
-            free(tempStencilImage);
-            return;
-         }
-
-         /* get copy of depth pixels */
-         depthPtr = tempDepthImage;
-         for (j = 0; j < height; j++, ssy += stepy) {
-            _swrast_read_depth_span_float(ctx, depthReadRb,
-                                          width, srcX, ssy, depthPtr);
-            depthPtr += width;
-         }
-         depthPtr = tempDepthImage;
-      }
-   }
-
-   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
-      if (stencilMask != 0x0) {
-         GLstencil stencil[MAX_WIDTH];
-
-         /* Get stencil values */
-         if (overlapping) {
-            memcpy(stencil, stencilPtr, width * sizeof(GLstencil));
-            stencilPtr += width;
-         }
-         else {
-            _swrast_read_stencil_span(ctx, stencilReadRb,
-                                      width, srcX, sy, stencil);
-         }
-
-         _mesa_apply_stencil_transfer_ops(ctx, width, stencil);
-
-         /* Write values */
-         if (zoom) {
-            _swrast_write_zoomed_stencil_span(ctx, destX, destY, width,
-                                              destX, dy, stencil);
-         }
-         else {
-            _swrast_write_stencil_span( ctx, width, destX, dy, stencil );
-         }
-      }
-
-      if (ctx->Depth.Mask) {
-         GLfloat depth[MAX_WIDTH];
-         GLuint zVals32[MAX_WIDTH];
-         GLushort zVals16[MAX_WIDTH];
-         GLvoid *zVals;
-         GLuint zBytes;
-
-         /* get depth values */
-         if (overlapping) {
-            memcpy(depth, depthPtr, width * sizeof(GLfloat));
-            depthPtr += width;
-         }
-         else {
-            _swrast_read_depth_span_float(ctx, depthReadRb,
-                                          width, srcX, sy, depth);
-         }
-
-         /* scale & bias */
-         if (scaleOrBias) {
-            _mesa_scale_and_bias_depth(ctx, width, depth);
-         }
-         /* convert to integer Z values */
-         if (depthDrawRb->DataType == GL_UNSIGNED_SHORT) {
-            GLint k;
-            for (k = 0; k < width; k++)
-               zVals16[k] = (GLushort) (depth[k] * depthScale);
-            zVals = zVals16;
-            zBytes = 2;
-         }
-         else {
-            GLint k;
-            for (k = 0; k < width; k++)
-               zVals32[k] = (GLuint) (depth[k] * depthScale);
-            zVals = zVals32;
-            zBytes = 4;
-         }
-
-         /* Write values */
-         if (zoom) {
-            _swrast_write_zoomed_z_span(ctx, destX, destY, width,
-                                        destX, dy, zVals);
-         }
-         else {
-            _swrast_put_row(ctx, depthDrawRb, width, destX, dy, zVals, zBytes);
-         }
-      }
-   }
-
-   if (tempStencilImage)
-      free(tempStencilImage);
-
-   if (tempDepthImage)
-      free(tempDepthImage);
-}
-
-
-
-/**
- * Try to do a fast copy pixels.
- */
-static GLboolean
-fast_copy_pixels(GLcontext *ctx,
-                 GLint srcX, GLint srcY, GLsizei width, GLsizei height,
-                 GLint dstX, GLint dstY, GLenum type)
-{
-   struct gl_framebuffer *srcFb = ctx->ReadBuffer;
-   struct gl_framebuffer *dstFb = ctx->DrawBuffer;
-   struct gl_renderbuffer *srcRb, *dstRb;
-   GLint row, yStep;
-
-   if (SWRAST_CONTEXT(ctx)->_RasterMask != 0x0 ||
-       ctx->Pixel.ZoomX != 1.0F ||
-       ctx->Pixel.ZoomY != 1.0F ||
-       ctx->_ImageTransferState) {
-      /* can't handle these */
-      return GL_FALSE;
-   }
-
-   if (type == GL_COLOR) {
-      if (dstFb->_NumColorDrawBuffers != 1)
-         return GL_FALSE;
-      srcRb = srcFb->_ColorReadBuffer;
-      dstRb = dstFb->_ColorDrawBuffers[0];
-   }
-   else if (type == GL_STENCIL) {
-      srcRb = srcFb->_StencilBuffer;
-      dstRb = dstFb->_StencilBuffer;
-   }
-   else if (type == GL_DEPTH) {
-      srcRb = srcFb->_DepthBuffer;
-      dstRb = dstFb->_DepthBuffer;
-   }
-   else {
-      ASSERT(type == GL_DEPTH_STENCIL_EXT);
-      /* XXX correct? */
-      srcRb = srcFb->Attachment[BUFFER_DEPTH].Renderbuffer;
-      dstRb = dstFb->Attachment[BUFFER_DEPTH].Renderbuffer;
-   }
-
-   /* src and dst renderbuffers must be same format and type */
-   if (!srcRb || !dstRb ||
-       srcRb->DataType != dstRb->DataType ||
-       srcRb->_BaseFormat != dstRb->_BaseFormat) {
-      return GL_FALSE;
-   }
-
-   /* clipping not supported */
-   if (srcX < 0 || srcX + width > (GLint) srcFb->Width ||
-       srcY < 0 || srcY + height > (GLint) srcFb->Height ||
-       dstX < dstFb->_Xmin || dstX + width > dstFb->_Xmax ||
-       dstY < dstFb->_Ymin || dstY + height > dstFb->_Ymax) {
-      return GL_FALSE;
-   }
-
-   /* overlapping src/dst doesn't matter, just determine Y direction */
-   if (srcY < dstY) {
-      /* top-down  max-to-min */
-      srcY = srcY + height - 1;
-      dstY = dstY + height - 1;
-      yStep = -1;
-   }
-   else {
-      /* bottom-up  min-to-max */
-      yStep = 1;
-   }
-
-   for (row = 0; row < height; row++) {
-      GLuint temp[MAX_WIDTH][4];
-      srcRb->GetRow(ctx, srcRb, width, srcX, srcY, temp);
-      dstRb->PutRow(ctx, dstRb, width, dstX, dstY, temp, NULL);
-      srcY += yStep;
-      dstY += yStep;
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Do software-based glCopyPixels.
- * By time we get here, all parameters will have been error-checked.
- */
-void
-_swrast_CopyPixels( GLcontext *ctx,
-		    GLint srcx, GLint srcy, GLsizei width, GLsizei height,
-		    GLint destx, GLint desty, GLenum type )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   swrast_render_start(ctx);
-      
-   if (!_mesa_check_conditional_render(ctx))
-      return; /* don't copy */
-
-   if (swrast->NewState)
-      _swrast_validate_derived( ctx );
-
-   if (!fast_copy_pixels(ctx, srcx, srcy, width, height, destx, desty, type)) {
-      switch (type) {
-      case GL_COLOR:
-         copy_rgba_pixels( ctx, srcx, srcy, width, height, destx, desty );
-         break;
-      case GL_DEPTH:
-         copy_depth_pixels( ctx, srcx, srcy, width, height, destx, desty );
-         break;
-      case GL_STENCIL:
-         copy_stencil_pixels( ctx, srcx, srcy, width, height, destx, desty );
-         break;
-      case GL_DEPTH_STENCIL_EXT:
-         copy_depth_stencil_pixels(ctx, srcx, srcy, width, height, destx, desty);
-         break;
-      default:
-         _mesa_problem(ctx, "unexpected type in _swrast_CopyPixels");
-      }
-   }
-
-   swrast_render_finish(ctx);
-}
+/*

+ * 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/context.h"

+#include "main/colormac.h"

+#include "main/condrender.h"

+#include "main/macros.h"

+#include "main/pixeltransfer.h"

+#include "main/imports.h"

+

+#include "s_context.h"

+#include "s_depth.h"

+#include "s_span.h"

+#include "s_stencil.h"

+#include "s_zoom.h"

+

+

+

+/**

+ * Determine if there's overlap in an image copy.

+ * This test also compensates for the fact that copies are done from

+ * bottom to top and overlaps can sometimes be handled correctly

+ * without making a temporary image copy.

+ * \return GL_TRUE if the regions overlap, GL_FALSE otherwise.

+ */

+static GLboolean

+regions_overlap(GLint srcx, GLint srcy,

+                GLint dstx, GLint dsty,

+                GLint width, GLint height,

+                GLfloat zoomX, GLfloat zoomY)

+{

+   if (zoomX == 1.0 && zoomY == 1.0) {

+      /* no zoom */

+      if (srcx >= dstx + width || (srcx + width <= dstx)) {

+         return GL_FALSE;

+      }

+      else if (srcy < dsty) { /* this is OK */

+         return GL_FALSE;

+      }

+      else if (srcy > dsty + height) {

+         return GL_FALSE;

+      }

+      else {

+         return GL_TRUE;

+      }

+   }

+   else {

+      /* add one pixel of slop when zooming, just to be safe */

+      if (srcx > (dstx + ((zoomX > 0.0F) ? (width * zoomX + 1.0F) : 0.0F))) {

+         /* src is completely right of dest */

+         return GL_FALSE;

+      }

+      else if (srcx + width + 1.0F < dstx + ((zoomX > 0.0F) ? 0.0F : (width * zoomX))) {

+         /* src is completely left of dest */

+         return GL_FALSE;

+      }

+      else if ((srcy < dsty) && (srcy + height < dsty + (height * zoomY))) {

+         /* src is completely below dest */

+         return GL_FALSE;

+      }

+      else if ((srcy > dsty) && (srcy + height > dsty + (height * zoomY))) {

+         /* src is completely above dest */

+         return GL_FALSE;

+      }

+      else {

+         return GL_TRUE;

+      }

+   }

+}

+

+

+/**

+ * RGBA copypixels

+ */

+static void

+copy_rgba_pixels(struct gl_context *ctx, GLint srcx, GLint srcy,

+                 GLint width, GLint height, GLint destx, GLint desty)

+{

+   GLfloat *tmpImage, *p;

+   GLint sy, dy, stepy, row;

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;

+   GLint overlapping;

+   GLuint transferOps = ctx->_ImageTransferState;

+   SWspan span;

+

+   if (!ctx->ReadBuffer->_ColorReadBuffer) {

+      /* no readbuffer - OK */

+      return;

+   }

+

+   if (ctx->DrawBuffer == ctx->ReadBuffer) {

+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,

+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);

+   }

+   else {

+      overlapping = GL_FALSE;

+   }

+

+   /* Determine if copy should be done bottom-to-top or top-to-bottom */

+   if (!overlapping && srcy < desty) {

+      /* top-down  max-to-min */

+      sy = srcy + height - 1;

+      dy = desty + height - 1;

+      stepy = -1;

+   }

+   else {

+      /* bottom-up  min-to-max */

+      sy = srcy;

+      dy = desty;

+      stepy = 1;

+   }

+

+   INIT_SPAN(span, GL_BITMAP);

+   _swrast_span_default_attribs(ctx, &span);

+   span.arrayMask = SPAN_RGBA;

+   span.arrayAttribs = FRAG_BIT_COL0; /* we'll fill in COL0 attrib values */

+

+   if (overlapping) {

+      tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat) * 4);

+      if (!tmpImage) {

+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );

+         return;

+      }

+      /* read the source image as RGBA/float */

+      p = tmpImage;

+      for (row = 0; row < height; row++) {

+         _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer,

+                                 width, srcx, sy + row, GL_FLOAT, p );

+         p += width * 4;

+      }

+      p = tmpImage;

+   }

+   else {

+      tmpImage = NULL;  /* silence compiler warnings */

+      p = NULL;

+   }

+

+   ASSERT(width < MAX_WIDTH);

+

+   for (row = 0; row < height; row++, sy += stepy, dy += stepy) {

+      GLvoid *rgba = span.array->attribs[FRAG_ATTRIB_COL0];

+

+      /* Get row/span of source pixels */

+      if (overlapping) {

+         /* get from buffered image */

+         memcpy(rgba, p, width * sizeof(GLfloat) * 4);

+         p += width * 4;

+      }

+      else {

+         /* get from framebuffer */

+         _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer,

+                                 width, srcx, sy, GL_FLOAT, rgba );

+      }

+

+      if (transferOps) {

+         _mesa_apply_rgba_transfer_ops(ctx, transferOps, width,

+                                       (GLfloat (*)[4]) rgba);

+      }

+

+      /* Write color span */

+      span.x = destx;

+      span.y = dy;

+      span.end = width;

+      span.array->ChanType = GL_FLOAT;

+      if (zoom) {

+         _swrast_write_zoomed_rgba_span(ctx, destx, desty, &span, rgba);

+      }

+      else {

+         _swrast_write_rgba_span(ctx, &span);

+      }

+   }

+

+   span.array->ChanType = CHAN_TYPE; /* restore */

+

+   if (overlapping)

+      free(tmpImage);

+}

+

+

+/**

+ * Convert floating point Z values to integer Z values with pixel transfer's

+ * Z scale and bias.

+ */

+static void

+scale_and_bias_z(struct gl_context *ctx, GLuint width,

+                 const GLfloat depth[], GLuint z[])

+{

+   const GLuint depthMax = ctx->DrawBuffer->_DepthMax;

+   GLuint i;

+

+   if (depthMax <= 0xffffff &&

+       ctx->Pixel.DepthScale == 1.0 &&

+       ctx->Pixel.DepthBias == 0.0) {

+      /* no scale or bias and no clamping and no worry of overflow */

+      const GLfloat depthMaxF = ctx->DrawBuffer->_DepthMaxF;

+      for (i = 0; i < width; i++) {

+         z[i] = (GLuint) (depth[i] * depthMaxF);

+      }

+   }

+   else {

+      /* need to be careful with overflow */

+      const GLdouble depthMaxF = ctx->DrawBuffer->_DepthMaxF;

+      for (i = 0; i < width; i++) {

+         GLdouble d = depth[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias;

+         d = CLAMP(d, 0.0, 1.0) * depthMaxF;

+         if (d >= depthMaxF)

+            z[i] = depthMax;

+         else

+            z[i] = (GLuint) d;

+      }

+   }

+}

+

+

+

+/*

+ * TODO: Optimize!!!!

+ */

+static void

+copy_depth_pixels( struct gl_context *ctx, GLint srcx, GLint srcy,

+                   GLint width, GLint height,

+                   GLint destx, GLint desty )

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct gl_renderbuffer *readRb = fb->_DepthBuffer;

+   GLfloat *p, *tmpImage;

+   GLint sy, dy, stepy;

+   GLint j;

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;

+   GLint overlapping;

+   SWspan span;

+

+   if (!readRb) {

+      /* no readbuffer - OK */

+      return;

+   }

+

+   INIT_SPAN(span, GL_BITMAP);

+   _swrast_span_default_attribs(ctx, &span);

+   span.arrayMask = SPAN_Z;

+

+   if (ctx->DrawBuffer == ctx->ReadBuffer) {

+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,

+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);

+   }

+   else {

+      overlapping = GL_FALSE;

+   }

+

+   /* Determine if copy should be bottom-to-top or top-to-bottom */

+   if (!overlapping && srcy < desty) {

+      /* top-down  max-to-min */

+      sy = srcy + height - 1;

+      dy = desty + height - 1;

+      stepy = -1;

+   }

+   else {

+      /* bottom-up  min-to-max */

+      sy = srcy;

+      dy = desty;

+      stepy = 1;

+   }

+

+   if (overlapping) {

+      GLint ssy = sy;

+      tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat));

+      if (!tmpImage) {

+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );

+         return;

+      }

+      p = tmpImage;

+      for (j = 0; j < height; j++, ssy += stepy) {

+         _swrast_read_depth_span_float(ctx, readRb, width, srcx, ssy, p);

+         p += width;

+      }

+      p = tmpImage;

+   }

+   else {

+      tmpImage = NULL;  /* silence compiler warning */

+      p = NULL;

+   }

+

+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {

+      GLfloat depth[MAX_WIDTH];

+      /* get depth values */

+      if (overlapping) {

+         memcpy(depth, p, width * sizeof(GLfloat));

+         p += width;

+      }

+      else {

+         _swrast_read_depth_span_float(ctx, readRb, width, srcx, sy, depth);

+      }

+

+      /* apply scale and bias */

+      scale_and_bias_z(ctx, width, depth, span.array->z);

+

+      /* write depth values */

+      span.x = destx;

+      span.y = dy;

+      span.end = width;

+      if (zoom)

+         _swrast_write_zoomed_depth_span(ctx, destx, desty, &span);

+      else

+         _swrast_write_rgba_span(ctx, &span);

+   }

+

+   if (overlapping)

+      free(tmpImage);

+}

+

+

+

+static void

+copy_stencil_pixels( struct gl_context *ctx, GLint srcx, GLint srcy,

+                     GLint width, GLint height,

+                     GLint destx, GLint desty )

+{

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   GLint sy, dy, stepy;

+   GLint j;

+   GLstencil *p, *tmpImage;

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;

+   GLint overlapping;

+

+   if (!rb) {

+      /* no readbuffer - OK */

+      return;

+   }

+

+   if (ctx->DrawBuffer == ctx->ReadBuffer) {

+      overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,

+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);

+   }

+   else {

+      overlapping = GL_FALSE;

+   }

+

+   /* Determine if copy should be bottom-to-top or top-to-bottom */

+   if (!overlapping && srcy < desty) {

+      /* top-down  max-to-min */

+      sy = srcy + height - 1;

+      dy = desty + height - 1;

+      stepy = -1;

+   }

+   else {

+      /* bottom-up  min-to-max */

+      sy = srcy;

+      dy = desty;

+      stepy = 1;

+   }

+

+   if (overlapping) {

+      GLint ssy = sy;

+      tmpImage = (GLstencil *) malloc(width * height * sizeof(GLstencil));

+      if (!tmpImage) {

+         _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );

+         return;

+      }

+      p = tmpImage;

+      for (j = 0; j < height; j++, ssy += stepy) {

+         _swrast_read_stencil_span( ctx, rb, width, srcx, ssy, p );

+         p += width;

+      }

+      p = tmpImage;

+   }

+   else {

+      tmpImage = NULL;  /* silence compiler warning */

+      p = NULL;

+   }

+

+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {

+      GLstencil stencil[MAX_WIDTH];

+

+      /* Get stencil values */

+      if (overlapping) {

+         memcpy(stencil, p, width * sizeof(GLstencil));

+         p += width;

+      }

+      else {

+         _swrast_read_stencil_span( ctx, rb, width, srcx, sy, stencil );

+      }

+

+      _mesa_apply_stencil_transfer_ops(ctx, width, stencil);

+

+      /* Write stencil values */

+      if (zoom) {

+         _swrast_write_zoomed_stencil_span(ctx, destx, desty, width,

+                                           destx, dy, stencil);

+      }

+      else {

+         _swrast_write_stencil_span( ctx, width, destx, dy, stencil );

+      }

+   }

+

+   if (overlapping)

+      free(tmpImage);

+}

+

+

+/**

+ * This isn't terribly efficient.  If a driver really has combined

+ * depth/stencil buffers the driver should implement an optimized

+ * CopyPixels function.

+ */

+static void

+copy_depth_stencil_pixels(struct gl_context *ctx,

+                          const GLint srcX, const GLint srcY,

+                          const GLint width, const GLint height,

+                          const GLint destX, const GLint destY)

+{

+   struct gl_renderbuffer *stencilReadRb, *depthReadRb, *depthDrawRb;

+   GLint sy, dy, stepy;

+   GLint j;

+   GLstencil *tempStencilImage = NULL, *stencilPtr = NULL;

+   GLfloat *tempDepthImage = NULL, *depthPtr = NULL;

+   const GLfloat depthScale = ctx->DrawBuffer->_DepthMaxF;

+   const GLuint stencilMask = ctx->Stencil.WriteMask[0];

+   const GLboolean zoom = ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F;

+   const GLboolean scaleOrBias

+      = ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0;

+   GLint overlapping;

+

+   depthDrawRb = ctx->DrawBuffer->_DepthBuffer;

+   depthReadRb = ctx->ReadBuffer->_DepthBuffer;

+   stencilReadRb = ctx->ReadBuffer->_StencilBuffer;

+

+   ASSERT(depthDrawRb);

+   ASSERT(depthReadRb);

+   ASSERT(stencilReadRb);

+

+   if (ctx->DrawBuffer == ctx->ReadBuffer) {

+      overlapping = regions_overlap(srcX, srcY, destX, destY, width, height,

+                                    ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);

+   }

+   else {

+      overlapping = GL_FALSE;

+   }

+

+   /* Determine if copy should be bottom-to-top or top-to-bottom */

+   if (!overlapping && srcY < destY) {

+      /* top-down  max-to-min */

+      sy = srcY + height - 1;

+      dy = destY + height - 1;

+      stepy = -1;

+   }

+   else {

+      /* bottom-up  min-to-max */

+      sy = srcY;

+      dy = destY;

+      stepy = 1;

+   }

+

+   if (overlapping) {

+      GLint ssy = sy;

+

+      if (stencilMask != 0x0) {

+         tempStencilImage

+            = (GLstencil *) malloc(width * height * sizeof(GLstencil));

+         if (!tempStencilImage) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");

+            return;

+         }

+

+         /* get copy of stencil pixels */

+         stencilPtr = tempStencilImage;

+         for (j = 0; j < height; j++, ssy += stepy) {

+            _swrast_read_stencil_span(ctx, stencilReadRb,

+                                      width, srcX, ssy, stencilPtr);

+            stencilPtr += width;

+         }

+         stencilPtr = tempStencilImage;

+      }

+

+      if (ctx->Depth.Mask) {

+         tempDepthImage

+            = (GLfloat *) malloc(width * height * sizeof(GLfloat));

+         if (!tempDepthImage) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");

+            free(tempStencilImage);

+            return;

+         }

+

+         /* get copy of depth pixels */

+         depthPtr = tempDepthImage;

+         for (j = 0; j < height; j++, ssy += stepy) {

+            _swrast_read_depth_span_float(ctx, depthReadRb,

+                                          width, srcX, ssy, depthPtr);

+            depthPtr += width;

+         }

+         depthPtr = tempDepthImage;

+      }

+   }

+

+   for (j = 0; j < height; j++, sy += stepy, dy += stepy) {

+      if (stencilMask != 0x0) {

+         GLstencil stencil[MAX_WIDTH];

+

+         /* Get stencil values */

+         if (overlapping) {

+            memcpy(stencil, stencilPtr, width * sizeof(GLstencil));

+            stencilPtr += width;

+         }

+         else {

+            _swrast_read_stencil_span(ctx, stencilReadRb,

+                                      width, srcX, sy, stencil);

+         }

+

+         _mesa_apply_stencil_transfer_ops(ctx, width, stencil);

+

+         /* Write values */

+         if (zoom) {

+            _swrast_write_zoomed_stencil_span(ctx, destX, destY, width,

+                                              destX, dy, stencil);

+         }

+         else {

+            _swrast_write_stencil_span( ctx, width, destX, dy, stencil );

+         }

+      }

+

+      if (ctx->Depth.Mask) {

+         GLfloat depth[MAX_WIDTH];

+         GLuint zVals32[MAX_WIDTH];

+         GLushort zVals16[MAX_WIDTH];

+         GLvoid *zVals;

+         GLuint zBytes;

+

+         /* get depth values */

+         if (overlapping) {

+            memcpy(depth, depthPtr, width * sizeof(GLfloat));

+            depthPtr += width;

+         }

+         else {

+            _swrast_read_depth_span_float(ctx, depthReadRb,

+                                          width, srcX, sy, depth);

+         }

+

+         /* scale & bias */

+         if (scaleOrBias) {

+            _mesa_scale_and_bias_depth(ctx, width, depth);

+         }

+         /* convert to integer Z values */

+         if (depthDrawRb->DataType == GL_UNSIGNED_SHORT) {

+            GLint k;

+            for (k = 0; k < width; k++)

+               zVals16[k] = (GLushort) (depth[k] * depthScale);

+            zVals = zVals16;

+            zBytes = 2;

+         }

+         else {

+            GLint k;

+            for (k = 0; k < width; k++)

+               zVals32[k] = (GLuint) (depth[k] * depthScale);

+            zVals = zVals32;

+            zBytes = 4;

+         }

+

+         /* Write values */

+         if (zoom) {

+            _swrast_write_zoomed_z_span(ctx, destX, destY, width,

+                                        destX, dy, zVals);

+         }

+         else {

+            _swrast_put_row(ctx, depthDrawRb, width, destX, dy, zVals, zBytes);

+         }

+      }

+   }

+

+   if (tempStencilImage)

+      free(tempStencilImage);

+

+   if (tempDepthImage)

+      free(tempDepthImage);

+}

+

+

+

+/**

+ * Try to do a fast copy pixels.

+ */

+static GLboolean

+fast_copy_pixels(struct gl_context *ctx,

+                 GLint srcX, GLint srcY, GLsizei width, GLsizei height,

+                 GLint dstX, GLint dstY, GLenum type)

+{

+   struct gl_framebuffer *srcFb = ctx->ReadBuffer;

+   struct gl_framebuffer *dstFb = ctx->DrawBuffer;

+   struct gl_renderbuffer *srcRb, *dstRb;

+   GLint row, yStep;

+

+   if (SWRAST_CONTEXT(ctx)->_RasterMask != 0x0 ||

+       ctx->Pixel.ZoomX != 1.0F ||

+       ctx->Pixel.ZoomY != 1.0F ||

+       ctx->_ImageTransferState) {

+      /* can't handle these */

+      return GL_FALSE;

+   }

+

+   if (type == GL_COLOR) {

+      if (dstFb->_NumColorDrawBuffers != 1)

+         return GL_FALSE;

+      srcRb = srcFb->_ColorReadBuffer;

+      dstRb = dstFb->_ColorDrawBuffers[0];

+   }

+   else if (type == GL_STENCIL) {

+      srcRb = srcFb->_StencilBuffer;

+      dstRb = dstFb->_StencilBuffer;

+   }

+   else if (type == GL_DEPTH) {

+      srcRb = srcFb->_DepthBuffer;

+      dstRb = dstFb->_DepthBuffer;

+   }

+   else {

+      ASSERT(type == GL_DEPTH_STENCIL_EXT);

+      /* XXX correct? */

+      srcRb = srcFb->Attachment[BUFFER_DEPTH].Renderbuffer;

+      dstRb = dstFb->Attachment[BUFFER_DEPTH].Renderbuffer;

+   }

+

+   /* src and dst renderbuffers must be same format and type */

+   if (!srcRb || !dstRb ||

+       srcRb->DataType != dstRb->DataType ||

+       srcRb->_BaseFormat != dstRb->_BaseFormat) {

+      return GL_FALSE;

+   }

+

+   /* clipping not supported */

+   if (srcX < 0 || srcX + width > (GLint) srcFb->Width ||

+       srcY < 0 || srcY + height > (GLint) srcFb->Height ||

+       dstX < dstFb->_Xmin || dstX + width > dstFb->_Xmax ||

+       dstY < dstFb->_Ymin || dstY + height > dstFb->_Ymax) {

+      return GL_FALSE;

+   }

+

+   /* overlapping src/dst doesn't matter, just determine Y direction */

+   if (srcY < dstY) {

+      /* top-down  max-to-min */

+      srcY = srcY + height - 1;

+      dstY = dstY + height - 1;

+      yStep = -1;

+   }

+   else {

+      /* bottom-up  min-to-max */

+      yStep = 1;

+   }

+

+   for (row = 0; row < height; row++) {

+      GLuint temp[MAX_WIDTH][4];

+      srcRb->GetRow(ctx, srcRb, width, srcX, srcY, temp);

+      dstRb->PutRow(ctx, dstRb, width, dstX, dstY, temp, NULL);

+      srcY += yStep;

+      dstY += yStep;

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Do software-based glCopyPixels.

+ * By time we get here, all parameters will have been error-checked.

+ */

+void

+_swrast_CopyPixels( struct gl_context *ctx,

+		    GLint srcx, GLint srcy, GLsizei width, GLsizei height,

+		    GLint destx, GLint desty, GLenum type )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   swrast_render_start(ctx);

+      

+   if (!_mesa_check_conditional_render(ctx))

+      return; /* don't copy */

+

+   if (swrast->NewState)

+      _swrast_validate_derived( ctx );

+

+   if (!fast_copy_pixels(ctx, srcx, srcy, width, height, destx, desty, type)) {

+      switch (type) {

+      case GL_COLOR:

+         copy_rgba_pixels( ctx, srcx, srcy, width, height, destx, desty );

+         break;

+      case GL_DEPTH:

+         copy_depth_pixels( ctx, srcx, srcy, width, height, destx, desty );

+         break;

+      case GL_STENCIL:

+         copy_stencil_pixels( ctx, srcx, srcy, width, height, destx, desty );

+         break;

+      case GL_DEPTH_STENCIL_EXT:

+         copy_depth_stencil_pixels(ctx, srcx, srcy, width, height, destx, desty);

+         break;

+      default:

+         _mesa_problem(ctx, "unexpected type in _swrast_CopyPixels");

+      }

+   }

+

+   swrast_render_finish(ctx);

+}

diff --git a/mesalib/src/mesa/swrast/s_depth.c b/mesalib/src/mesa/swrast/s_depth.c
index f952fd6ba..90b9ee572 100644
--- a/mesalib/src/mesa/swrast/s_depth.c
+++ b/mesalib/src/mesa/swrast/s_depth.c
@@ -1,1484 +1,1484 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.2.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 "main/glheader.h"
-#include "main/context.h"
-#include "main/formats.h"
-#include "main/macros.h"
-#include "main/imports.h"
-
-#include "s_depth.h"
-#include "s_span.h"
-
-
-/**
- * Do depth test for a horizontal span of fragments.
- * Input:  zbuffer - array of z values in the zbuffer
- *         z - array of fragment z values
- * Return:  number of fragments which pass the test.
- */
-static GLuint
-depth_test_span16( GLcontext *ctx, GLuint n,
-                   GLushort zbuffer[], const GLuint z[], GLubyte mask[] )
-{
-   GLuint passed = 0;
-
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
-      case GL_LESS:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  if (z[i] < zbuffer[i]) {
-		     /* pass */
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  if (z[i] < zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] <= zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] <= zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] >= zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] >= zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] > zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] > zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] != zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] != zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] == zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] == zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  zbuffer[i] = z[i];
-		  passed++;
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer or mask */
-	    passed = n;
-	 }
-	 break;
-      case GL_NEVER:
-         memset(mask, 0, n * sizeof(GLubyte));
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad depth func in depth_test_span16");
-   }
-
-   return passed;
-}
-
-
-static GLuint
-depth_test_span32( GLcontext *ctx, GLuint n,
-                   GLuint zbuffer[], const GLuint z[], GLubyte mask[] )
-{
-   GLuint passed = 0;
-
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
-      case GL_LESS:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  if (z[i] < zbuffer[i]) {
-		     /* pass */
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  if (z[i] < zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] <= zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] <= zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] >= zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] >= zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] > zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] > zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] != zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] != zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] == zbuffer[i]) {
-		     zbuffer[i] = z[i];
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  if (z[i] == zbuffer[i]) {
-		     /* pass */
-		     passed++;
-		  }
-		  else {
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  zbuffer[i] = z[i];
-		  passed++;
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer or mask */
-	    passed = n;
-	 }
-	 break;
-      case GL_NEVER:
-         memset(mask, 0, n * sizeof(GLubyte));
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad depth func in depth_test_span32");
-   }
-
-   return passed;
-}
-
-
-
-/**
- * Clamp fragment Z values to the depth near/far range (glDepthRange()).
- * This is used when GL_ARB_depth_clamp/GL_DEPTH_CLAMP is turned on.
- * In that case, vertexes are not clipped against the near/far planes
- * so rasterization will produce fragment Z values outside the usual
- * [0,1] range.
- */
-void
-_swrast_depth_clamp_span( GLcontext *ctx, SWspan *span )
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   const GLuint count = span->end;
-   GLint *zValues = (GLint *) span->array->z; /* sign change */
-   GLint min, max;
-   GLfloat min_f, max_f;
-   GLuint i;
-
-   if (ctx->Viewport.Near < ctx->Viewport.Far) {
-      min_f = ctx->Viewport.Near;
-      max_f = ctx->Viewport.Far;
-   } else {
-      min_f = ctx->Viewport.Far;
-      max_f = ctx->Viewport.Near;
-   }
-
-   /* Convert floating point values in [0,1] to device Z coordinates in
-    * [0, DepthMax].
-    * ex: If the Z buffer has 24 bits, DepthMax = 0xffffff.
-    * 
-    * XXX this all falls apart if we have 31 or more bits of Z because
-    * the triangle rasterization code produces unsigned Z values.  Negative
-    * vertex Z values come out as large fragment Z uints.
-    */
-   min = (GLint) (min_f * fb->_DepthMaxF);
-   max = (GLint) (max_f * fb->_DepthMaxF);
-   if (max < 0)
-      max = 0x7fffffff; /* catch over flow for 30-bit z */
-
-   /* Note that we do the comparisons here using signed integers.
-    */
-   for (i = 0; i < count; i++) {
-      if (zValues[i] < min)
-	 zValues[i] = min;
-      if (zValues[i] > max)
-	 zValues[i] = max;
-   }
-}
-
-
-
-/*
- * Apply depth test to span of fragments.
- */
-static GLuint
-depth_test_span( GLcontext *ctx, SWspan *span)
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_DepthBuffer;
-   const GLint x = span->x;
-   const GLint y = span->y;
-   const GLuint count = span->end;
-   const GLuint *zValues = span->array->z;
-   GLubyte *mask = span->array->mask;
-   GLuint passed;
-
-   ASSERT((span->arrayMask & SPAN_XY) == 0);
-   ASSERT(span->arrayMask & SPAN_Z);
-   
-   if (rb->GetPointer(ctx, rb, 0, 0)) {
-      /* Directly access buffer */
-      if (rb->DataType == GL_UNSIGNED_SHORT) {
-         GLushort *zbuffer = (GLushort *) rb->GetPointer(ctx, rb, x, y);
-         passed = depth_test_span16(ctx, count, zbuffer, zValues, mask);
-      }
-      else {
-         GLuint *zbuffer = (GLuint *) rb->GetPointer(ctx, rb, x, y);
-         ASSERT(rb->DataType == GL_UNSIGNED_INT);
-         passed = depth_test_span32(ctx, count, zbuffer, zValues, mask);
-      }
-   }
-   else {
-      /* read depth values from buffer, test, write back */
-      if (rb->DataType == GL_UNSIGNED_SHORT) {
-         GLushort zbuffer[MAX_WIDTH];
-         rb->GetRow(ctx, rb, count, x, y, zbuffer);
-         passed = depth_test_span16(ctx, count, zbuffer, zValues, mask);
-         rb->PutRow(ctx, rb, count, x, y, zbuffer, mask);
-      }
-      else {
-         GLuint zbuffer[MAX_WIDTH];
-         ASSERT(rb->DataType == GL_UNSIGNED_INT);
-         rb->GetRow(ctx, rb, count, x, y, zbuffer);
-         passed = depth_test_span32(ctx, count, zbuffer, zValues, mask);
-         rb->PutRow(ctx, rb, count, x, y, zbuffer, mask);
-      }
-   }
-
-   if (passed < count) {
-      span->writeAll = GL_FALSE;
-   }
-   return passed;
-}
-
-
-
-#define Z_ADDRESS(X, Y)   (zStart + (Y) * stride + (X))
-
-
-/*
- * Do depth testing for an array of fragments at assorted locations.
- */
-static void
-direct_depth_test_pixels16(GLcontext *ctx, GLushort *zStart, GLuint stride,
-                           GLuint n, const GLint x[], const GLint y[],
-                           const GLuint z[], GLubyte mask[] )
-{
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
-      case GL_LESS:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] < *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] < *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] > *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] > *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] != *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] != *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] == *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] == *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);
-		  *zptr = z[i];
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer or mask */
-	 }
-	 break;
-      case GL_NEVER:
-	 /* depth test never passes */
-         memset(mask, 0, n * sizeof(GLubyte));
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad depth func in direct_depth_test_pixels");
-   }
-}
-
-
-
-/*
- * Do depth testing for an array of fragments with direct access to zbuffer.
- */
-static void
-direct_depth_test_pixels32(GLcontext *ctx, GLuint *zStart, GLuint stride,
-                           GLuint n, const GLint x[], const GLint y[],
-                           const GLuint z[], GLubyte mask[] )
-{
-   /* switch cases ordered from most frequent to less frequent */
-   switch (ctx->Depth.Func) {
-      case GL_LESS:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] < *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] < *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] <= *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] >= *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] > *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] > *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] != *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] != *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-         if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] == *zptr) {
-		     /* pass */
-		     *zptr = z[i];
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  if (z[i] == *zptr) {
-		     /* pass */
-		  }
-		  else {
-		     /* fail */
-		     mask[i] = 0;
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 if (ctx->Depth.Mask) {
-	    /* Update Z buffer */
-            GLuint i;
-	    for (i=0; i<n; i++) {
-	       if (mask[i]) {
-		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);
-		  *zptr = z[i];
-	       }
-	    }
-	 }
-	 else {
-	    /* Don't update Z buffer or mask */
-	 }
-	 break;
-      case GL_NEVER:
-	 /* depth test never passes */
-         memset(mask, 0, n * sizeof(GLubyte));
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad depth func in direct_depth_test_pixels");
-   }
-}
-
-
-
-
-static GLuint
-depth_test_pixels( GLcontext *ctx, SWspan *span )
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_DepthBuffer;
-   const GLuint count = span->end;
-   const GLint *x = span->array->x;
-   const GLint *y = span->array->y;
-   const GLuint *z = span->array->z;
-   GLubyte *mask = span->array->mask;
-
-   if (rb->GetPointer(ctx, rb, 0, 0)) {
-      /* Directly access values */
-      if (rb->DataType == GL_UNSIGNED_SHORT) {
-         GLushort *zStart = (GLushort *) rb->Data;
-         GLuint stride = rb->Width;
-         direct_depth_test_pixels16(ctx, zStart, stride, count, x, y, z, mask);
-      }
-      else {
-         GLuint *zStart = (GLuint *) rb->Data;
-         GLuint stride = rb->Width;
-         ASSERT(rb->DataType == GL_UNSIGNED_INT);
-         direct_depth_test_pixels32(ctx, zStart, stride, count, x, y, z, mask);
-      }
-   }
-   else {
-      /* read depth values from buffer, test, write back */
-      if (rb->DataType == GL_UNSIGNED_SHORT) {
-         GLushort zbuffer[MAX_WIDTH];
-         _swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLushort));
-         depth_test_span16(ctx, count, zbuffer, z, mask);
-         rb->PutValues(ctx, rb, count, x, y, zbuffer, mask);
-      }
-      else {
-         GLuint zbuffer[MAX_WIDTH];
-         ASSERT(rb->DataType == GL_UNSIGNED_INT);
-         _swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLuint));
-         depth_test_span32(ctx, count, zbuffer, z, mask);
-         rb->PutValues(ctx, rb, count, x, y, zbuffer, mask);
-      }
-   }
-
-   return count; /* not really correct, but OK */
-}
-
-
-/**
- * Apply depth (Z) buffer testing to the span.
- * \return approx number of pixels that passed (only zero is reliable)
- */
-GLuint
-_swrast_depth_test_span( GLcontext *ctx, SWspan *span)
-{
-   if (span->arrayMask & SPAN_XY)
-      return depth_test_pixels(ctx, span);
-   else
-      return depth_test_span(ctx, span);
-}
-
-
-/**
- * GL_EXT_depth_bounds_test extension.
- * Discard fragments depending on whether the corresponding Z-buffer
- * values are outside the depth bounds test range.
- * Note: we test the Z buffer values, not the fragment Z values!
- * \return GL_TRUE if any fragments pass, GL_FALSE if no fragments pass
- */
-GLboolean
-_swrast_depth_bounds_test( GLcontext *ctx, SWspan *span )
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_DepthBuffer;
-   GLuint zMin = (GLuint) (ctx->Depth.BoundsMin * fb->_DepthMaxF + 0.5F);
-   GLuint zMax = (GLuint) (ctx->Depth.BoundsMax * fb->_DepthMaxF + 0.5F);
-   GLubyte *mask = span->array->mask;
-   const GLuint count = span->end;
-   GLuint i;
-   GLboolean anyPass = GL_FALSE;
-
-   if (rb->DataType == GL_UNSIGNED_SHORT) {
-      /* get 16-bit values */
-      GLushort zbuffer16[MAX_WIDTH], *zbuffer;
-      if (span->arrayMask & SPAN_XY) {
-         _swrast_get_values(ctx, rb, count, span->array->x, span->array->y,
-                            zbuffer16, sizeof(GLushort));
-         zbuffer = zbuffer16;
-      }
-      else {
-         zbuffer = (GLushort*) rb->GetPointer(ctx, rb, span->x, span->y);
-         if (!zbuffer) {
-            rb->GetRow(ctx, rb, count, span->x, span->y, zbuffer16);
-            zbuffer = zbuffer16;
-         }
-      }
-      assert(zbuffer);
-
-      /* Now do the tests */
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            if (zbuffer[i] < zMin || zbuffer[i] > zMax)
-               mask[i] = GL_FALSE;
-            else
-               anyPass = GL_TRUE;
-         }
-      }
-   }
-   else {
-      /* get 32-bit values */
-      GLuint zbuffer32[MAX_WIDTH], *zbuffer;
-      ASSERT(rb->DataType == GL_UNSIGNED_INT);
-      if (span->arrayMask & SPAN_XY) {
-         _swrast_get_values(ctx, rb, count, span->array->x, span->array->y,
-                            zbuffer32, sizeof(GLuint));
-         zbuffer = zbuffer32;
-      }
-      else {
-         zbuffer = (GLuint*) rb->GetPointer(ctx, rb, span->x, span->y);
-         if (!zbuffer) {
-            rb->GetRow(ctx, rb, count, span->x, span->y, zbuffer32);
-            zbuffer = zbuffer32;
-         }
-      }
-      assert(zbuffer);
-
-      /* Now do the tests */
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            if (zbuffer[i] < zMin || zbuffer[i] > zMax)
-               mask[i] = GL_FALSE;
-            else
-               anyPass = GL_TRUE;
-         }
-      }
-   }
-
-   return anyPass;
-}
-
-
-
-/**********************************************************************/
-/*****                      Read Depth Buffer                     *****/
-/**********************************************************************/
-
-
-/**
- * Read a span of depth values from the given depth renderbuffer, returning
- * the values as GLfloats.
- * This function does clipping to prevent reading outside the depth buffer's
- * bounds.  Though the clipping is redundant when we're called from
- * _swrast_ReadPixels.
- */
-void
-_swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb,
-                               GLint n, GLint x, GLint y, GLfloat depth[] )
-{
-   const GLfloat scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-
-   if (!rb) {
-      /* really only doing this to prevent FP exceptions later */
-      memset(depth, 0, n * sizeof(GLfloat));
-      return;
-   }
-
-   ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT);
-
-   if (y < 0 || y >= (GLint) rb->Height ||
-       x + n <= 0 || x >= (GLint) rb->Width) {
-      /* span is completely outside framebuffer */
-      memset(depth, 0, n * sizeof(GLfloat));
-      return;
-   }
-
-   if (x < 0) {
-      GLint dx = -x;
-      GLint i;
-      for (i = 0; i < dx; i++)
-         depth[i] = 0.0;
-      x = 0;
-      n -= dx;
-      depth += dx;
-   }
-   if (x + n > (GLint) rb->Width) {
-      GLint dx = x + n - (GLint) rb->Width;
-      GLint i;
-      for (i = 0; i < dx; i++)
-         depth[n - i - 1] = 0.0;
-      n -= dx;
-   }
-   if (n <= 0) {
-      return;
-   }
-
-   if (rb->DataType == GL_UNSIGNED_INT) {
-      GLuint temp[MAX_WIDTH];
-      GLint i;
-      rb->GetRow(ctx, rb, n, x, y, temp);
-      for (i = 0; i < n; i++) {
-         depth[i] = temp[i] * scale;
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      GLushort temp[MAX_WIDTH];
-      GLint i;
-      rb->GetRow(ctx, rb, n, x, y, temp);
-      for (i = 0; i < n; i++) {
-         depth[i] = temp[i] * scale;
-      }
-   }
-   else {
-      _mesa_problem(ctx, "Invalid depth renderbuffer data type");
-   }
-}
-
-
-/**
- * As above, but return 32-bit GLuint values.
- */
-void
-_swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
-                              GLint n, GLint x, GLint y, GLuint depth[] )
-{
-   GLuint depthBits;
-
-   if (!rb) {
-      /* really only doing this to prevent FP exceptions later */
-      memset(depth, 0, n * sizeof(GLuint));
-      return;
-   }
-
-   depthBits = _mesa_get_format_bits(rb->Format, GL_DEPTH_BITS);
-
-   ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT);
-
-   if (y < 0 || y >= (GLint) rb->Height ||
-       x + n <= 0 || x >= (GLint) rb->Width) {
-      /* span is completely outside framebuffer */
-      memset(depth, 0, n * sizeof(GLfloat));
-      return;
-   }
-
-   if (x < 0) {
-      GLint dx = -x;
-      GLint i;
-      for (i = 0; i < dx; i++)
-         depth[i] = 0;
-      x = 0;
-      n -= dx;
-      depth += dx;
-   }
-   if (x + n > (GLint) rb->Width) {
-      GLint dx = x + n - (GLint) rb->Width;
-      GLint i;
-      for (i = 0; i < dx; i++)
-         depth[n - i - 1] = 0;
-      n -= dx;
-   }
-   if (n <= 0) {
-      return;
-   }
-
-   if (rb->DataType == GL_UNSIGNED_INT) {
-      rb->GetRow(ctx, rb, n, x, y, depth);
-      if (depthBits < 32) {
-         GLuint shift = 32 - depthBits;
-         GLint i;
-         for (i = 0; i < n; i++) {
-            GLuint z = depth[i];
-            depth[i] = z << shift; /* XXX lsb bits? */
-         }
-      }
-   }
-   else if (rb->DataType == GL_UNSIGNED_SHORT) {
-      GLushort temp[MAX_WIDTH];
-      GLint i;
-      rb->GetRow(ctx, rb, n, x, y, temp);
-      if (depthBits == 16) {
-         for (i = 0; i < n; i++) {
-            GLuint z = temp[i];
-            depth[i] = (z << 16) | z;
-         }
-      }
-      else {
-         GLuint shift = 16 - depthBits;
-         for (i = 0; i < n; i++) {
-            GLuint z = temp[i];
-            depth[i] = (z << (shift + 16)) | (z << shift); /* XXX lsb bits? */
-         }
-      }
-   }
-   else {
-      _mesa_problem(ctx, "Invalid depth renderbuffer data type");
-   }
-}
-
-
-
-/**
- * Clear the given z/depth renderbuffer.
- */
-void
-_swrast_clear_depth_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
-{
-   GLuint clearValue;
-   GLint x, y, width, height;
-
-   if (!rb || !ctx->Depth.Mask) {
-      /* no depth buffer, or writing to it is disabled */
-      return;
-   }
-
-   /* compute integer clearing value */
-   if (ctx->Depth.Clear == 1.0) {
-      clearValue = ctx->DrawBuffer->_DepthMax;
-   }
-   else {
-      clearValue = (GLuint) (ctx->Depth.Clear * ctx->DrawBuffer->_DepthMaxF);
-   }
-
-   assert(rb->_BaseFormat == GL_DEPTH_COMPONENT);
-
-   /* compute region to clear */
-   x = ctx->DrawBuffer->_Xmin;
-   y = ctx->DrawBuffer->_Ymin;
-   width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
-   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
-
-   if (rb->GetPointer(ctx, rb, 0, 0)) {
-      /* Direct buffer access is possible.  Either this is just malloc'd
-       * memory, or perhaps the driver mmap'd the zbuffer memory.
-       */
-      if (rb->DataType == GL_UNSIGNED_SHORT) {
-         if ((clearValue & 0xff) == ((clearValue >> 8) & 0xff) &&
-             ((GLushort *) rb->GetPointer(ctx, rb, 0, 0) + width ==
-              (GLushort *) rb->GetPointer(ctx, rb, 0, 1))) {
-            /* optimized case */
-            GLushort *dst = (GLushort *) rb->GetPointer(ctx, rb, x, y);
-            GLuint len = width * height * sizeof(GLushort);
-            memset(dst, (clearValue & 0xff), len);
-         }
-         else {
-            /* general case */
-            GLint i, j;
-            for (i = 0; i < height; i++) {
-               GLushort *dst = (GLushort *) rb->GetPointer(ctx, rb, x, y + i);
-               for (j = 0; j < width; j++) {
-                  dst[j] = clearValue;
-               }
-            }
-         }
-      }
-      else {
-         GLint i, j;
-         ASSERT(rb->DataType == GL_UNSIGNED_INT);
-         for (i = 0; i < height; i++) {
-            GLuint *dst = (GLuint *) rb->GetPointer(ctx, rb, x, y + i);
-            for (j = 0; j < width; j++) {
-               dst[j] = clearValue;
-            }
-         }
-      }
-   }
-   else {
-      /* Direct access not possible.  Use PutRow to write new values. */
-      if (rb->DataType == GL_UNSIGNED_SHORT) {
-         GLushort clearVal16 = (GLushort) (clearValue & 0xffff);
-         GLint i;
-         for (i = 0; i < height; i++) {
-            rb->PutMonoRow(ctx, rb, width, x, y + i, &clearVal16, NULL);
-         }
-      }
-      else if (rb->DataType == GL_UNSIGNED_INT) {
-         GLint i;
-         ASSERT(sizeof(clearValue) == sizeof(GLuint));
-         for (i = 0; i < height; i++) {
-            rb->PutMonoRow(ctx, rb, width, x, y + i, &clearValue, NULL);
-         }
-      }
-      else {
-         _mesa_problem(ctx, "bad depth renderbuffer DataType");
-      }
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.2.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 "main/glheader.h"

+#include "main/context.h"

+#include "main/formats.h"

+#include "main/macros.h"

+#include "main/imports.h"

+

+#include "s_depth.h"

+#include "s_span.h"

+

+

+/**

+ * Do depth test for a horizontal span of fragments.

+ * Input:  zbuffer - array of z values in the zbuffer

+ *         z - array of fragment z values

+ * Return:  number of fragments which pass the test.

+ */

+static GLuint

+depth_test_span16( struct gl_context *ctx, GLuint n,

+                   GLushort zbuffer[], const GLuint z[], GLubyte mask[] )

+{

+   GLuint passed = 0;

+

+   /* switch cases ordered from most frequent to less frequent */

+   switch (ctx->Depth.Func) {

+      case GL_LESS:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  if (z[i] < zbuffer[i]) {

+		     /* pass */

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  if (z[i] < zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_LEQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] <= zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] <= zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GEQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] >= zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] >= zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GREATER:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] > zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] > zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_NOTEQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] != zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] != zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_EQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] == zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] == zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_ALWAYS:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  zbuffer[i] = z[i];

+		  passed++;

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer or mask */

+	    passed = n;

+	 }

+	 break;

+      case GL_NEVER:

+         memset(mask, 0, n * sizeof(GLubyte));

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad depth func in depth_test_span16");

+   }

+

+   return passed;

+}

+

+

+static GLuint

+depth_test_span32( struct gl_context *ctx, GLuint n,

+                   GLuint zbuffer[], const GLuint z[], GLubyte mask[] )

+{

+   GLuint passed = 0;

+

+   /* switch cases ordered from most frequent to less frequent */

+   switch (ctx->Depth.Func) {

+      case GL_LESS:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  if (z[i] < zbuffer[i]) {

+		     /* pass */

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  if (z[i] < zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_LEQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] <= zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] <= zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GEQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] >= zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] >= zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GREATER:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] > zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] > zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_NOTEQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] != zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] != zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_EQUAL:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] == zbuffer[i]) {

+		     zbuffer[i] = z[i];

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  if (z[i] == zbuffer[i]) {

+		     /* pass */

+		     passed++;

+		  }

+		  else {

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_ALWAYS:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  zbuffer[i] = z[i];

+		  passed++;

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer or mask */

+	    passed = n;

+	 }

+	 break;

+      case GL_NEVER:

+         memset(mask, 0, n * sizeof(GLubyte));

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad depth func in depth_test_span32");

+   }

+

+   return passed;

+}

+

+

+

+/**

+ * Clamp fragment Z values to the depth near/far range (glDepthRange()).

+ * This is used when GL_ARB_depth_clamp/GL_DEPTH_CLAMP is turned on.

+ * In that case, vertexes are not clipped against the near/far planes

+ * so rasterization will produce fragment Z values outside the usual

+ * [0,1] range.

+ */

+void

+_swrast_depth_clamp_span( struct gl_context *ctx, SWspan *span )

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   const GLuint count = span->end;

+   GLint *zValues = (GLint *) span->array->z; /* sign change */

+   GLint min, max;

+   GLfloat min_f, max_f;

+   GLuint i;

+

+   if (ctx->Viewport.Near < ctx->Viewport.Far) {

+      min_f = ctx->Viewport.Near;

+      max_f = ctx->Viewport.Far;

+   } else {

+      min_f = ctx->Viewport.Far;

+      max_f = ctx->Viewport.Near;

+   }

+

+   /* Convert floating point values in [0,1] to device Z coordinates in

+    * [0, DepthMax].

+    * ex: If the Z buffer has 24 bits, DepthMax = 0xffffff.

+    * 

+    * XXX this all falls apart if we have 31 or more bits of Z because

+    * the triangle rasterization code produces unsigned Z values.  Negative

+    * vertex Z values come out as large fragment Z uints.

+    */

+   min = (GLint) (min_f * fb->_DepthMaxF);

+   max = (GLint) (max_f * fb->_DepthMaxF);

+   if (max < 0)

+      max = 0x7fffffff; /* catch over flow for 30-bit z */

+

+   /* Note that we do the comparisons here using signed integers.

+    */

+   for (i = 0; i < count; i++) {

+      if (zValues[i] < min)

+	 zValues[i] = min;

+      if (zValues[i] > max)

+	 zValues[i] = max;

+   }

+}

+

+

+

+/*

+ * Apply depth test to span of fragments.

+ */

+static GLuint

+depth_test_span( struct gl_context *ctx, SWspan *span)

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_DepthBuffer;

+   const GLint x = span->x;

+   const GLint y = span->y;

+   const GLuint count = span->end;

+   const GLuint *zValues = span->array->z;

+   GLubyte *mask = span->array->mask;

+   GLuint passed;

+

+   ASSERT((span->arrayMask & SPAN_XY) == 0);

+   ASSERT(span->arrayMask & SPAN_Z);

+   

+   if (rb->GetPointer(ctx, rb, 0, 0)) {

+      /* Directly access buffer */

+      if (rb->DataType == GL_UNSIGNED_SHORT) {

+         GLushort *zbuffer = (GLushort *) rb->GetPointer(ctx, rb, x, y);

+         passed = depth_test_span16(ctx, count, zbuffer, zValues, mask);

+      }

+      else {

+         GLuint *zbuffer = (GLuint *) rb->GetPointer(ctx, rb, x, y);

+         ASSERT(rb->DataType == GL_UNSIGNED_INT);

+         passed = depth_test_span32(ctx, count, zbuffer, zValues, mask);

+      }

+   }

+   else {

+      /* read depth values from buffer, test, write back */

+      if (rb->DataType == GL_UNSIGNED_SHORT) {

+         GLushort zbuffer[MAX_WIDTH];

+         rb->GetRow(ctx, rb, count, x, y, zbuffer);

+         passed = depth_test_span16(ctx, count, zbuffer, zValues, mask);

+         rb->PutRow(ctx, rb, count, x, y, zbuffer, mask);

+      }

+      else {

+         GLuint zbuffer[MAX_WIDTH];

+         ASSERT(rb->DataType == GL_UNSIGNED_INT);

+         rb->GetRow(ctx, rb, count, x, y, zbuffer);

+         passed = depth_test_span32(ctx, count, zbuffer, zValues, mask);

+         rb->PutRow(ctx, rb, count, x, y, zbuffer, mask);

+      }

+   }

+

+   if (passed < count) {

+      span->writeAll = GL_FALSE;

+   }

+   return passed;

+}

+

+

+

+#define Z_ADDRESS(X, Y)   (zStart + (Y) * stride + (X))

+

+

+/*

+ * Do depth testing for an array of fragments at assorted locations.

+ */

+static void

+direct_depth_test_pixels16(struct gl_context *ctx, GLushort *zStart, GLuint stride,

+                           GLuint n, const GLint x[], const GLint y[],

+                           const GLuint z[], GLubyte mask[] )

+{

+   /* switch cases ordered from most frequent to less frequent */

+   switch (ctx->Depth.Func) {

+      case GL_LESS:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] < *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] < *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_LEQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] <= *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] <= *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GEQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] >= *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] >= *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GREATER:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] > *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] > *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_NOTEQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] != *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] != *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_EQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] == *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] == *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_ALWAYS:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLushort *zptr = Z_ADDRESS(x[i], y[i]);

+		  *zptr = z[i];

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer or mask */

+	 }

+	 break;

+      case GL_NEVER:

+	 /* depth test never passes */

+         memset(mask, 0, n * sizeof(GLubyte));

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad depth func in direct_depth_test_pixels");

+   }

+}

+

+

+

+/*

+ * Do depth testing for an array of fragments with direct access to zbuffer.

+ */

+static void

+direct_depth_test_pixels32(struct gl_context *ctx, GLuint *zStart, GLuint stride,

+                           GLuint n, const GLint x[], const GLint y[],

+                           const GLuint z[], GLubyte mask[] )

+{

+   /* switch cases ordered from most frequent to less frequent */

+   switch (ctx->Depth.Func) {

+      case GL_LESS:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] < *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] < *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_LEQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] <= *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] <= *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GEQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] >= *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] >= *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_GREATER:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] > *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] > *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_NOTEQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] != *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] != *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_EQUAL:

+         if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] == *zptr) {

+		     /* pass */

+		     *zptr = z[i];

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  if (z[i] == *zptr) {

+		     /* pass */

+		  }

+		  else {

+		     /* fail */

+		     mask[i] = 0;

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_ALWAYS:

+	 if (ctx->Depth.Mask) {

+	    /* Update Z buffer */

+            GLuint i;

+	    for (i=0; i<n; i++) {

+	       if (mask[i]) {

+		  GLuint *zptr = Z_ADDRESS(x[i], y[i]);

+		  *zptr = z[i];

+	       }

+	    }

+	 }

+	 else {

+	    /* Don't update Z buffer or mask */

+	 }

+	 break;

+      case GL_NEVER:

+	 /* depth test never passes */

+         memset(mask, 0, n * sizeof(GLubyte));

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad depth func in direct_depth_test_pixels");

+   }

+}

+

+

+

+

+static GLuint

+depth_test_pixels( struct gl_context *ctx, SWspan *span )

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_DepthBuffer;

+   const GLuint count = span->end;

+   const GLint *x = span->array->x;

+   const GLint *y = span->array->y;

+   const GLuint *z = span->array->z;

+   GLubyte *mask = span->array->mask;

+

+   if (rb->GetPointer(ctx, rb, 0, 0)) {

+      /* Directly access values */

+      if (rb->DataType == GL_UNSIGNED_SHORT) {

+         GLushort *zStart = (GLushort *) rb->Data;

+         GLuint stride = rb->Width;

+         direct_depth_test_pixels16(ctx, zStart, stride, count, x, y, z, mask);

+      }

+      else {

+         GLuint *zStart = (GLuint *) rb->Data;

+         GLuint stride = rb->Width;

+         ASSERT(rb->DataType == GL_UNSIGNED_INT);

+         direct_depth_test_pixels32(ctx, zStart, stride, count, x, y, z, mask);

+      }

+   }

+   else {

+      /* read depth values from buffer, test, write back */

+      if (rb->DataType == GL_UNSIGNED_SHORT) {

+         GLushort zbuffer[MAX_WIDTH];

+         _swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLushort));

+         depth_test_span16(ctx, count, zbuffer, z, mask);

+         rb->PutValues(ctx, rb, count, x, y, zbuffer, mask);

+      }

+      else {

+         GLuint zbuffer[MAX_WIDTH];

+         ASSERT(rb->DataType == GL_UNSIGNED_INT);

+         _swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLuint));

+         depth_test_span32(ctx, count, zbuffer, z, mask);

+         rb->PutValues(ctx, rb, count, x, y, zbuffer, mask);

+      }

+   }

+

+   return count; /* not really correct, but OK */

+}

+

+

+/**

+ * Apply depth (Z) buffer testing to the span.

+ * \return approx number of pixels that passed (only zero is reliable)

+ */

+GLuint

+_swrast_depth_test_span( struct gl_context *ctx, SWspan *span)

+{

+   if (span->arrayMask & SPAN_XY)

+      return depth_test_pixels(ctx, span);

+   else

+      return depth_test_span(ctx, span);

+}

+

+

+/**

+ * GL_EXT_depth_bounds_test extension.

+ * Discard fragments depending on whether the corresponding Z-buffer

+ * values are outside the depth bounds test range.

+ * Note: we test the Z buffer values, not the fragment Z values!

+ * \return GL_TRUE if any fragments pass, GL_FALSE if no fragments pass

+ */

+GLboolean

+_swrast_depth_bounds_test( struct gl_context *ctx, SWspan *span )

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_DepthBuffer;

+   GLuint zMin = (GLuint) (ctx->Depth.BoundsMin * fb->_DepthMaxF + 0.5F);

+   GLuint zMax = (GLuint) (ctx->Depth.BoundsMax * fb->_DepthMaxF + 0.5F);

+   GLubyte *mask = span->array->mask;

+   const GLuint count = span->end;

+   GLuint i;

+   GLboolean anyPass = GL_FALSE;

+

+   if (rb->DataType == GL_UNSIGNED_SHORT) {

+      /* get 16-bit values */

+      GLushort zbuffer16[MAX_WIDTH], *zbuffer;

+      if (span->arrayMask & SPAN_XY) {

+         _swrast_get_values(ctx, rb, count, span->array->x, span->array->y,

+                            zbuffer16, sizeof(GLushort));

+         zbuffer = zbuffer16;

+      }

+      else {

+         zbuffer = (GLushort*) rb->GetPointer(ctx, rb, span->x, span->y);

+         if (!zbuffer) {

+            rb->GetRow(ctx, rb, count, span->x, span->y, zbuffer16);

+            zbuffer = zbuffer16;

+         }

+      }

+      assert(zbuffer);

+

+      /* Now do the tests */

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            if (zbuffer[i] < zMin || zbuffer[i] > zMax)

+               mask[i] = GL_FALSE;

+            else

+               anyPass = GL_TRUE;

+         }

+      }

+   }

+   else {

+      /* get 32-bit values */

+      GLuint zbuffer32[MAX_WIDTH], *zbuffer;

+      ASSERT(rb->DataType == GL_UNSIGNED_INT);

+      if (span->arrayMask & SPAN_XY) {

+         _swrast_get_values(ctx, rb, count, span->array->x, span->array->y,

+                            zbuffer32, sizeof(GLuint));

+         zbuffer = zbuffer32;

+      }

+      else {

+         zbuffer = (GLuint*) rb->GetPointer(ctx, rb, span->x, span->y);

+         if (!zbuffer) {

+            rb->GetRow(ctx, rb, count, span->x, span->y, zbuffer32);

+            zbuffer = zbuffer32;

+         }

+      }

+      assert(zbuffer);

+

+      /* Now do the tests */

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            if (zbuffer[i] < zMin || zbuffer[i] > zMax)

+               mask[i] = GL_FALSE;

+            else

+               anyPass = GL_TRUE;

+         }

+      }

+   }

+

+   return anyPass;

+}

+

+

+

+/**********************************************************************/

+/*****                      Read Depth Buffer                     *****/

+/**********************************************************************/

+

+

+/**

+ * Read a span of depth values from the given depth renderbuffer, returning

+ * the values as GLfloats.

+ * This function does clipping to prevent reading outside the depth buffer's

+ * bounds.  Though the clipping is redundant when we're called from

+ * _swrast_ReadPixels.

+ */

+void

+_swrast_read_depth_span_float( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                               GLint n, GLint x, GLint y, GLfloat depth[] )

+{

+   const GLfloat scale = 1.0F / ctx->DrawBuffer->_DepthMaxF;

+

+   if (!rb) {

+      /* really only doing this to prevent FP exceptions later */

+      memset(depth, 0, n * sizeof(GLfloat));

+      return;

+   }

+

+   ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT);

+

+   if (y < 0 || y >= (GLint) rb->Height ||

+       x + n <= 0 || x >= (GLint) rb->Width) {

+      /* span is completely outside framebuffer */

+      memset(depth, 0, n * sizeof(GLfloat));

+      return;

+   }

+

+   if (x < 0) {

+      GLint dx = -x;

+      GLint i;

+      for (i = 0; i < dx; i++)

+         depth[i] = 0.0;

+      x = 0;

+      n -= dx;

+      depth += dx;

+   }

+   if (x + n > (GLint) rb->Width) {

+      GLint dx = x + n - (GLint) rb->Width;

+      GLint i;

+      for (i = 0; i < dx; i++)

+         depth[n - i - 1] = 0.0;

+      n -= dx;

+   }

+   if (n <= 0) {

+      return;

+   }

+

+   if (rb->DataType == GL_UNSIGNED_INT) {

+      GLuint temp[MAX_WIDTH];

+      GLint i;

+      rb->GetRow(ctx, rb, n, x, y, temp);

+      for (i = 0; i < n; i++) {

+         depth[i] = temp[i] * scale;

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      GLushort temp[MAX_WIDTH];

+      GLint i;

+      rb->GetRow(ctx, rb, n, x, y, temp);

+      for (i = 0; i < n; i++) {

+         depth[i] = temp[i] * scale;

+      }

+   }

+   else {

+      _mesa_problem(ctx, "Invalid depth renderbuffer data type");

+   }

+}

+

+

+/**

+ * As above, but return 32-bit GLuint values.

+ */

+void

+_swrast_read_depth_span_uint( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                              GLint n, GLint x, GLint y, GLuint depth[] )

+{

+   GLuint depthBits;

+

+   if (!rb) {

+      /* really only doing this to prevent FP exceptions later */

+      memset(depth, 0, n * sizeof(GLuint));

+      return;

+   }

+

+   depthBits = _mesa_get_format_bits(rb->Format, GL_DEPTH_BITS);

+

+   ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT);

+

+   if (y < 0 || y >= (GLint) rb->Height ||

+       x + n <= 0 || x >= (GLint) rb->Width) {

+      /* span is completely outside framebuffer */

+      memset(depth, 0, n * sizeof(GLfloat));

+      return;

+   }

+

+   if (x < 0) {

+      GLint dx = -x;

+      GLint i;

+      for (i = 0; i < dx; i++)

+         depth[i] = 0;

+      x = 0;

+      n -= dx;

+      depth += dx;

+   }

+   if (x + n > (GLint) rb->Width) {

+      GLint dx = x + n - (GLint) rb->Width;

+      GLint i;

+      for (i = 0; i < dx; i++)

+         depth[n - i - 1] = 0;

+      n -= dx;

+   }

+   if (n <= 0) {

+      return;

+   }

+

+   if (rb->DataType == GL_UNSIGNED_INT) {

+      rb->GetRow(ctx, rb, n, x, y, depth);

+      if (depthBits < 32) {

+         GLuint shift = 32 - depthBits;

+         GLint i;

+         for (i = 0; i < n; i++) {

+            GLuint z = depth[i];

+            depth[i] = z << shift; /* XXX lsb bits? */

+         }

+      }

+   }

+   else if (rb->DataType == GL_UNSIGNED_SHORT) {

+      GLushort temp[MAX_WIDTH];

+      GLint i;

+      rb->GetRow(ctx, rb, n, x, y, temp);

+      if (depthBits == 16) {

+         for (i = 0; i < n; i++) {

+            GLuint z = temp[i];

+            depth[i] = (z << 16) | z;

+         }

+      }

+      else {

+         GLuint shift = 16 - depthBits;

+         for (i = 0; i < n; i++) {

+            GLuint z = temp[i];

+            depth[i] = (z << (shift + 16)) | (z << shift); /* XXX lsb bits? */

+         }

+      }

+   }

+   else {

+      _mesa_problem(ctx, "Invalid depth renderbuffer data type");

+   }

+}

+

+

+

+/**

+ * Clear the given z/depth renderbuffer.

+ */

+void

+_swrast_clear_depth_buffer( struct gl_context *ctx, struct gl_renderbuffer *rb )

+{

+   GLuint clearValue;

+   GLint x, y, width, height;

+

+   if (!rb || !ctx->Depth.Mask) {

+      /* no depth buffer, or writing to it is disabled */

+      return;

+   }

+

+   /* compute integer clearing value */

+   if (ctx->Depth.Clear == 1.0) {

+      clearValue = ctx->DrawBuffer->_DepthMax;

+   }

+   else {

+      clearValue = (GLuint) (ctx->Depth.Clear * ctx->DrawBuffer->_DepthMaxF);

+   }

+

+   assert(rb->_BaseFormat == GL_DEPTH_COMPONENT);

+

+   /* compute region to clear */

+   x = ctx->DrawBuffer->_Xmin;

+   y = ctx->DrawBuffer->_Ymin;

+   width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;

+   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;

+

+   if (rb->GetPointer(ctx, rb, 0, 0)) {

+      /* Direct buffer access is possible.  Either this is just malloc'd

+       * memory, or perhaps the driver mmap'd the zbuffer memory.

+       */

+      if (rb->DataType == GL_UNSIGNED_SHORT) {

+         if ((clearValue & 0xff) == ((clearValue >> 8) & 0xff) &&

+             ((GLushort *) rb->GetPointer(ctx, rb, 0, 0) + width ==

+              (GLushort *) rb->GetPointer(ctx, rb, 0, 1))) {

+            /* optimized case */

+            GLushort *dst = (GLushort *) rb->GetPointer(ctx, rb, x, y);

+            GLuint len = width * height * sizeof(GLushort);

+            memset(dst, (clearValue & 0xff), len);

+         }

+         else {

+            /* general case */

+            GLint i, j;

+            for (i = 0; i < height; i++) {

+               GLushort *dst = (GLushort *) rb->GetPointer(ctx, rb, x, y + i);

+               for (j = 0; j < width; j++) {

+                  dst[j] = clearValue;

+               }

+            }

+         }

+      }

+      else {

+         GLint i, j;

+         ASSERT(rb->DataType == GL_UNSIGNED_INT);

+         for (i = 0; i < height; i++) {

+            GLuint *dst = (GLuint *) rb->GetPointer(ctx, rb, x, y + i);

+            for (j = 0; j < width; j++) {

+               dst[j] = clearValue;

+            }

+         }

+      }

+   }

+   else {

+      /* Direct access not possible.  Use PutRow to write new values. */

+      if (rb->DataType == GL_UNSIGNED_SHORT) {

+         GLushort clearVal16 = (GLushort) (clearValue & 0xffff);

+         GLint i;

+         for (i = 0; i < height; i++) {

+            rb->PutMonoRow(ctx, rb, width, x, y + i, &clearVal16, NULL);

+         }

+      }

+      else if (rb->DataType == GL_UNSIGNED_INT) {

+         GLint i;

+         ASSERT(sizeof(clearValue) == sizeof(GLuint));

+         for (i = 0; i < height; i++) {

+            rb->PutMonoRow(ctx, rb, width, x, y + i, &clearValue, NULL);

+         }

+      }

+      else {

+         _mesa_problem(ctx, "bad depth renderbuffer DataType");

+      }

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_depth.h b/mesalib/src/mesa/swrast/s_depth.h
index 878d242f5..a35ed66bc 100644
--- a/mesalib/src/mesa/swrast/s_depth.h
+++ b/mesalib/src/mesa/swrast/s_depth.h
@@ -1,58 +1,61 @@
-/*
- * 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.
- */
-
-
-#ifndef S_DEPTH_H
-#define S_DEPTH_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern GLuint
-_swrast_depth_test_span( GLcontext *ctx, SWspan *span);
-
-extern void
-_swrast_depth_clamp_span( GLcontext *ctx, SWspan *span );
-
-extern GLboolean
-_swrast_depth_bounds_test( GLcontext *ctx, SWspan *span );
-
-
-extern void
-_swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb,
-                               GLint n, GLint x, GLint y, GLfloat depth[] );
-
-
-extern void
-_swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
-                              GLint n, GLint x, GLint y, GLuint depth[] );
-
-
-extern void
-_swrast_clear_depth_buffer( GLcontext *ctx, struct gl_renderbuffer *rb );
-
-
-#endif
+/*

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

+ */

+

+

+#ifndef S_DEPTH_H

+#define S_DEPTH_H

+

+

+#include "main/glheader.h"

+#include "s_span.h"

+

+struct gl_context;

+struct gl_renderbuffer;

+

+

+extern GLuint

+_swrast_depth_test_span( struct gl_context *ctx, SWspan *span);

+

+extern void

+_swrast_depth_clamp_span( struct gl_context *ctx, SWspan *span );

+

+extern GLboolean

+_swrast_depth_bounds_test( struct gl_context *ctx, SWspan *span );

+

+

+extern void

+_swrast_read_depth_span_float( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                               GLint n, GLint x, GLint y, GLfloat depth[] );

+

+

+extern void

+_swrast_read_depth_span_uint( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                              GLint n, GLint x, GLint y, GLuint depth[] );

+

+

+extern void

+_swrast_clear_depth_buffer( struct gl_context *ctx, struct gl_renderbuffer *rb );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_drawpix.c b/mesalib/src/mesa/swrast/s_drawpix.c
index 3cec3a7a2..cca75784a 100644
--- a/mesalib/src/mesa/swrast/s_drawpix.c
+++ b/mesalib/src/mesa/swrast/s_drawpix.c
@@ -1,824 +1,752 @@
-/*
- * 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/convolve.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/imports.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(GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
-      /* Convolution has to be handled specially.  We'll create an
-       * intermediate image, applying all pixel transfer operations
-       * up to convolution.  Then we'll convolve the image.  Then
-       * we'll proceed with the rest of the transfer operations and
-       * rasterize the image.
-       */
-      GLint row;
-      GLfloat *dest, *tmpImage;
-
-      tmpImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-      if (!tmpImage) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
-         return;
-      }
-      convImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-      if (!convImage) {
-         free(tmpImage);
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
-         return;
-      }
-
-      /* Unpack the image and apply transfer ops up to convolution */
-      dest = tmpImage;
-      for (row = 0; row < height; row++) {
-         const GLvoid *source = _mesa_image_address2d(unpack,
-                                  pixels, width, height, format, type, row, 0);
-         _mesa_unpack_color_span_float(ctx, width, GL_RGBA, (GLfloat *) dest,
-                                     format, type, source, unpack,
-                                     transferOps & IMAGE_PRE_CONVOLUTION_BITS);
-         dest += width * 4;
-      }
-
-      /* do convolution */
-      if (ctx->Pixel.Convolution2DEnabled) {
-         _mesa_convolve_2d_image(ctx, &width, &height, tmpImage, convImage);
-      }
-      else {
-         ASSERT(ctx->Pixel.Separable2DEnabled);
-         _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
-      }
-      free(tmpImage);
-
-      /* continue transfer ops and draw the convolved image */
-      unpack = &ctx->DefaultPacking;
-      pixels = convImage;
-      format = GL_RGBA;
-      type = GL_FLOAT;
-      transferOps &= IMAGE_POST_CONVOLUTION_BITS;
-   }
-   else if (ctx->Pixel.Convolution1DEnabled) {
-      /* we only want to apply 1D convolution to glTexImage1D */
-      transferOps &= ~(IMAGE_CONVOLUTION_BIT |
-                       IMAGE_POST_CONVOLUTION_SCALE_BIAS);
-   }
-
-   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 GLboolean sink = (ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink)
-         || (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink);
-      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);
-            /* draw the span */
-            if (!sink) {
-               /* 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(GLcontext *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( GLcontext *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;
-    }
-
-   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_COLOR_INDEX:
-   case GL_RED:
-   case GL_GREEN:
-   case GL_BLUE:
-   case GL_ALPHA:
-   case GL_LUMINANCE:
-   case GL_LUMINANCE_ALPHA:
-   case GL_RGB:
-   case GL_BGR:
-   case GL_RGBA:
-   case GL_BGRA:
-   case GL_ABGR_EXT:
-      draw_rgba_pixels(ctx, x, y, width, height, format, type, unpack, pixels);
-      break;
-   case GL_DEPTH_STENCIL_EXT:
-      draw_depth_stencil_pixels(ctx, x, y, width, height,
-                                type, unpack, pixels);
-      break;
-   default:
-      _mesa_problem(ctx, "unexpected format in _swrast_DrawPixels");
-      /* don't return yet, clean-up */
-   }
-
-   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/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_feedback.c b/mesalib/src/mesa/swrast/s_feedback.c
index 6ac8ac73b..e548bf9c3 100644
--- a/mesalib/src/mesa/swrast/s_feedback.c
+++ b/mesalib/src/mesa/swrast/s_feedback.c
@@ -1,138 +1,138 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0
- *
- * 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/macros.h"
-
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_triangle.h"
-
-
-
-static void
-feedback_vertex(GLcontext * ctx, const SWvertex * v, const SWvertex * pv)
-{
-   GLfloat win[4];
-   const GLfloat *vtc = v->attrib[FRAG_ATTRIB_TEX0];
-   const GLfloat *color = v->attrib[FRAG_ATTRIB_COL0];
-
-   win[0] = v->attrib[FRAG_ATTRIB_WPOS][0];
-   win[1] = v->attrib[FRAG_ATTRIB_WPOS][1];
-   win[2] = v->attrib[FRAG_ATTRIB_WPOS][2] / ctx->DrawBuffer->_DepthMaxF;
-   win[3] = 1.0F / v->attrib[FRAG_ATTRIB_WPOS][3];
-
-   _mesa_feedback_vertex(ctx, win, color, vtc);
-}
-
-
-/*
- * Put triangle in feedback buffer.
- */
-void
-_swrast_feedback_triangle(GLcontext *ctx, const SWvertex *v0,
-                          const SWvertex *v1, const SWvertex *v2)
-{
-   if (!_swrast_culltriangle(ctx, v0, v1, v2)) {
-      _mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN);
-      _mesa_feedback_token(ctx, (GLfloat) 3); /* three vertices */
-
-      if (ctx->Light.ShadeModel == GL_SMOOTH) {
-         feedback_vertex(ctx, v0, v0);
-         feedback_vertex(ctx, v1, v1);
-         feedback_vertex(ctx, v2, v2);
-      }
-      else {
-         feedback_vertex(ctx, v0, v2);
-         feedback_vertex(ctx, v1, v2);
-         feedback_vertex(ctx, v2, v2);
-      }
-   }
-}
-
-
-void
-_swrast_feedback_line(GLcontext *ctx, const SWvertex *v0,
-                      const SWvertex *v1)
-{
-   GLenum token = GL_LINE_TOKEN;
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   if (swrast->StippleCounter == 0)
-      token = GL_LINE_RESET_TOKEN;
-
-   _mesa_feedback_token(ctx, (GLfloat) (GLint) token);
-
-   if (ctx->Light.ShadeModel == GL_SMOOTH) {
-      feedback_vertex(ctx, v0, v0);
-      feedback_vertex(ctx, v1, v1);
-   }
-   else {
-      feedback_vertex(ctx, v0, v1);
-      feedback_vertex(ctx, v1, v1);
-   }
-
-   swrast->StippleCounter++;
-}
-
-
-void
-_swrast_feedback_point(GLcontext *ctx, const SWvertex *v)
-{
-   _mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POINT_TOKEN);
-   feedback_vertex(ctx, v, v);
-}
-
-
-void
-_swrast_select_triangle(GLcontext *ctx, const SWvertex *v0,
-                        const SWvertex *v1, const SWvertex *v2)
-{
-   if (!_swrast_culltriangle(ctx, v0, v1, v2)) {
-      const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-
-      _mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-      _mesa_update_hitflag( ctx, v1->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-      _mesa_update_hitflag( ctx, v2->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-   }
-}
-
-
-void
-_swrast_select_line(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
-{
-   const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-   _mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-   _mesa_update_hitflag( ctx, v1->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-}
-
-
-void
-_swrast_select_point(GLcontext *ctx, const SWvertex *v)
-{
-   const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-   _mesa_update_hitflag( ctx, v->attrib[FRAG_ATTRIB_WPOS][2] * zs );
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.0

+ *

+ * 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/macros.h"

+

+#include "s_context.h"

+#include "s_feedback.h"

+#include "s_triangle.h"

+

+

+

+static void

+feedback_vertex(struct gl_context * ctx, const SWvertex * v, const SWvertex * pv)

+{

+   GLfloat win[4];

+   const GLfloat *vtc = v->attrib[FRAG_ATTRIB_TEX0];

+   const GLfloat *color = v->attrib[FRAG_ATTRIB_COL0];

+

+   win[0] = v->attrib[FRAG_ATTRIB_WPOS][0];

+   win[1] = v->attrib[FRAG_ATTRIB_WPOS][1];

+   win[2] = v->attrib[FRAG_ATTRIB_WPOS][2] / ctx->DrawBuffer->_DepthMaxF;

+   win[3] = 1.0F / v->attrib[FRAG_ATTRIB_WPOS][3];

+

+   _mesa_feedback_vertex(ctx, win, color, vtc);

+}

+

+

+/*

+ * Put triangle in feedback buffer.

+ */

+void

+_swrast_feedback_triangle(struct gl_context *ctx, const SWvertex *v0,

+                          const SWvertex *v1, const SWvertex *v2)

+{

+   if (!_swrast_culltriangle(ctx, v0, v1, v2)) {

+      _mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN);

+      _mesa_feedback_token(ctx, (GLfloat) 3); /* three vertices */

+

+      if (ctx->Light.ShadeModel == GL_SMOOTH) {

+         feedback_vertex(ctx, v0, v0);

+         feedback_vertex(ctx, v1, v1);

+         feedback_vertex(ctx, v2, v2);

+      }

+      else {

+         feedback_vertex(ctx, v0, v2);

+         feedback_vertex(ctx, v1, v2);

+         feedback_vertex(ctx, v2, v2);

+      }

+   }

+}

+

+

+void

+_swrast_feedback_line(struct gl_context *ctx, const SWvertex *v0,

+                      const SWvertex *v1)

+{

+   GLenum token = GL_LINE_TOKEN;

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   if (swrast->StippleCounter == 0)

+      token = GL_LINE_RESET_TOKEN;

+

+   _mesa_feedback_token(ctx, (GLfloat) (GLint) token);

+

+   if (ctx->Light.ShadeModel == GL_SMOOTH) {

+      feedback_vertex(ctx, v0, v0);

+      feedback_vertex(ctx, v1, v1);

+   }

+   else {

+      feedback_vertex(ctx, v0, v1);

+      feedback_vertex(ctx, v1, v1);

+   }

+

+   swrast->StippleCounter++;

+}

+

+

+void

+_swrast_feedback_point(struct gl_context *ctx, const SWvertex *v)

+{

+   _mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POINT_TOKEN);

+   feedback_vertex(ctx, v, v);

+}

+

+

+void

+_swrast_select_triangle(struct gl_context *ctx, const SWvertex *v0,

+                        const SWvertex *v1, const SWvertex *v2)

+{

+   if (!_swrast_culltriangle(ctx, v0, v1, v2)) {

+      const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;

+

+      _mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );

+      _mesa_update_hitflag( ctx, v1->attrib[FRAG_ATTRIB_WPOS][2] * zs );

+      _mesa_update_hitflag( ctx, v2->attrib[FRAG_ATTRIB_WPOS][2] * zs );

+   }

+}

+

+

+void

+_swrast_select_line(struct gl_context *ctx, const SWvertex *v0, const SWvertex *v1)

+{

+   const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;

+   _mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );

+   _mesa_update_hitflag( ctx, v1->attrib[FRAG_ATTRIB_WPOS][2] * zs );

+}

+

+

+void

+_swrast_select_point(struct gl_context *ctx, const SWvertex *v)

+{

+   const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;

+   _mesa_update_hitflag( ctx, v->attrib[FRAG_ATTRIB_WPOS][2] * zs );

+}

diff --git a/mesalib/src/mesa/swrast/s_feedback.h b/mesalib/src/mesa/swrast/s_feedback.h
index 9feab75db..f0ca2c0e6 100644
--- a/mesalib/src/mesa/swrast/s_feedback.h
+++ b/mesalib/src/mesa/swrast/s_feedback.h
@@ -1,50 +1,50 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 S_FEEDBACK_H
-#define S_FEEDBACK_H
-
-
-#include "swrast.h"
-
-
-extern void _swrast_feedback_point( GLcontext *ctx, const SWvertex *v );
-
-extern void _swrast_feedback_line( GLcontext *ctx,
-                              const SWvertex *v1, const SWvertex *v2 );
-
-extern void _swrast_feedback_triangle( GLcontext *ctx, const SWvertex *v0,
-                                  const SWvertex *v1, const SWvertex *v2 );
-
-extern void _swrast_select_point( GLcontext *ctx, const SWvertex *v );
-
-extern void _swrast_select_line( GLcontext *ctx,
-                            const SWvertex *v1, const SWvertex *v2 );
-
-extern void _swrast_select_triangle( GLcontext *ctx, const SWvertex *v0,
-                                const SWvertex *v1, const SWvertex *v2 );
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 S_FEEDBACK_H

+#define S_FEEDBACK_H

+

+

+#include "swrast.h"

+

+

+extern void _swrast_feedback_point( struct gl_context *ctx, const SWvertex *v );

+

+extern void _swrast_feedback_line( struct gl_context *ctx,

+                              const SWvertex *v1, const SWvertex *v2 );

+

+extern void _swrast_feedback_triangle( struct gl_context *ctx, const SWvertex *v0,

+                                  const SWvertex *v1, const SWvertex *v2 );

+

+extern void _swrast_select_point( struct gl_context *ctx, const SWvertex *v );

+

+extern void _swrast_select_line( struct gl_context *ctx,

+                            const SWvertex *v1, const SWvertex *v2 );

+

+extern void _swrast_select_triangle( struct gl_context *ctx, const SWvertex *v0,

+                                const SWvertex *v1, const SWvertex *v2 );

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_fog.c b/mesalib/src/mesa/swrast/s_fog.c
index 689500a61..5acb5f4d1 100644
--- a/mesalib/src/mesa/swrast/s_fog.c
+++ b/mesalib/src/mesa/swrast/s_fog.c
@@ -1,244 +1,244 @@
-/*
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_fog.h"
-
-
-/**
- * Used to convert current raster distance to a fog factor in [0,1].
- */
-GLfloat
-_swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z)
-{
-   GLfloat d, f;
-
-   switch (ctx->Fog.Mode) {
-   case GL_LINEAR:
-      if (ctx->Fog.Start == ctx->Fog.End)
-         d = 1.0F;
-      else
-         d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
-      f = (ctx->Fog.End - z) * d;
-      return CLAMP(f, 0.0F, 1.0F);
-   case GL_EXP:
-      d = ctx->Fog.Density;
-      f = EXPF(-d * z);
-      f = CLAMP(f, 0.0F, 1.0F);
-      return f;
-   case GL_EXP2:
-      d = ctx->Fog.Density;
-      f = EXPF(-(d * d * z * z));
-      f = CLAMP(f, 0.0F, 1.0F);
-      return f;
-   default:
-      _mesa_problem(ctx, "Bad fog mode in _swrast_z_to_fogfactor");
-      return 0.0; 
-   }
-}
-
-
-#define LINEAR_FOG(f, coord)  f = (fogEnd - coord) * fogScale
-
-#define EXP_FOG(f, coord)  f = EXPF(density * coord)
-
-#define EXP2_FOG(f, coord)				\
-do {							\
-   GLfloat tmp = negDensitySquared * coord * coord;	\
-   if (tmp < FLT_MIN_10_EXP)				\
-      tmp = FLT_MIN_10_EXP;				\
-   f = EXPF(tmp);					\
- } while(0)
-
-
-#define BLEND_FOG(f, coord)  f = coord
-
-
-
-/**
- * Template code for computing fog blend factor and applying it to colors.
- * \param TYPE  either GLubyte, GLushort or GLfloat.
- * \param COMPUTE_F  code to compute the fog blend factor, f.
- */
-#define FOG_LOOP(TYPE, FOG_FUNC)						\
-if (span->arrayAttribs & FRAG_BIT_FOGC) {					\
-   GLuint i;									\
-   for (i = 0; i < span->end; i++) {						\
-      const GLfloat fogCoord = span->array->attribs[FRAG_ATTRIB_FOGC][i][0];	\
-      const GLfloat c = FABSF(fogCoord);					\
-      GLfloat f, oneMinusF;							\
-      FOG_FUNC(f, c);								\
-      f = CLAMP(f, 0.0F, 1.0F);							\
-      oneMinusF = 1.0F - f;							\
-      rgba[i][RCOMP] = (TYPE) (f * rgba[i][RCOMP] + oneMinusF * rFog);		\
-      rgba[i][GCOMP] = (TYPE) (f * rgba[i][GCOMP] + oneMinusF * gFog);		\
-      rgba[i][BCOMP] = (TYPE) (f * rgba[i][BCOMP] + oneMinusF * bFog);		\
-   }										\
-}										\
-else {										\
-   const GLfloat fogStep = span->attrStepX[FRAG_ATTRIB_FOGC][0];		\
-   GLfloat fogCoord = span->attrStart[FRAG_ATTRIB_FOGC][0];			\
-   const GLfloat wStep = span->attrStepX[FRAG_ATTRIB_WPOS][3];			\
-   GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3];				\
-   GLuint i;									\
-   for (i = 0; i < span->end; i++) {						\
-      const GLfloat c = FABSF(fogCoord) / w;					\
-      GLfloat f, oneMinusF;							\
-      FOG_FUNC(f, c);								\
-      f = CLAMP(f, 0.0F, 1.0F);							\
-      oneMinusF = 1.0F - f;							\
-      rgba[i][RCOMP] = (TYPE) (f * rgba[i][RCOMP] + oneMinusF * rFog);		\
-      rgba[i][GCOMP] = (TYPE) (f * rgba[i][GCOMP] + oneMinusF * gFog);		\
-      rgba[i][BCOMP] = (TYPE) (f * rgba[i][BCOMP] + oneMinusF * bFog);		\
-      fogCoord += fogStep;							\
-      w += wStep;								\
-   }										\
-}
-
-/**
- * Apply fog to a span of RGBA pixels.
- * The fog value are either in the span->array->fog array or interpolated from
- * the fog/fogStep values.
- * They fog values are either fog coordinates (Z) or fog blend factors.
- * _PreferPixelFog should be in sync with that state!
- */
-void
-_swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span )
-{
-   const SWcontext *swrast = CONST_SWRAST_CONTEXT(ctx);
-   GLfloat rFog, gFog, bFog;
-
-   ASSERT(swrast->_FogEnabled);
-   ASSERT(span->arrayMask & SPAN_RGBA);
-
-   /* compute (scaled) fog color */
-   if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-      rFog = ctx->Fog.Color[RCOMP] * 255.0F;
-      gFog = ctx->Fog.Color[GCOMP] * 255.0F;
-      bFog = ctx->Fog.Color[BCOMP] * 255.0F;
-   }
-   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-      rFog = ctx->Fog.Color[RCOMP] * 65535.0F;
-      gFog = ctx->Fog.Color[GCOMP] * 65535.0F;
-      bFog = ctx->Fog.Color[BCOMP] * 65535.0F;
-   }
-   else {
-      rFog = ctx->Fog.Color[RCOMP];
-      gFog = ctx->Fog.Color[GCOMP];
-      bFog = ctx->Fog.Color[BCOMP];
-   }
-
-   if (swrast->_PreferPixelFog) {
-      /* The span's fog values are fog coordinates, now compute blend factors
-       * and blend the fragment colors with the fog color.
-       */
-      switch (swrast->_FogMode) {
-      case GL_LINEAR:
-         {
-            const GLfloat fogEnd = ctx->Fog.End;
-            const GLfloat fogScale = (ctx->Fog.Start == ctx->Fog.End)
-               ? 1.0F : 1.0F / (ctx->Fog.End - ctx->Fog.Start);
-            if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-               GLubyte (*rgba)[4] = span->array->rgba8;
-               FOG_LOOP(GLubyte, LINEAR_FOG);
-            }
-            else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-               GLushort (*rgba)[4] = span->array->rgba16;
-               FOG_LOOP(GLushort, LINEAR_FOG);
-            }
-            else {
-               GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-               ASSERT(span->array->ChanType == GL_FLOAT);
-               FOG_LOOP(GLfloat, LINEAR_FOG);
-            }
-         }
-         break;
-
-      case GL_EXP:
-         {
-            const GLfloat density = -ctx->Fog.Density;
-            if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-               GLubyte (*rgba)[4] = span->array->rgba8;
-               FOG_LOOP(GLubyte, EXP_FOG);
-            }
-            else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-               GLushort (*rgba)[4] = span->array->rgba16;
-               FOG_LOOP(GLushort, EXP_FOG);
-            }
-            else {
-               GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-               ASSERT(span->array->ChanType == GL_FLOAT);
-               FOG_LOOP(GLfloat, EXP_FOG);
-            }
-         }
-         break;
-
-      case GL_EXP2:
-         {
-            const GLfloat negDensitySquared = -ctx->Fog.Density * ctx->Fog.Density;
-            if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-               GLubyte (*rgba)[4] = span->array->rgba8;
-               FOG_LOOP(GLubyte, EXP2_FOG);
-            }
-            else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-               GLushort (*rgba)[4] = span->array->rgba16;
-               FOG_LOOP(GLushort, EXP2_FOG);
-            }
-            else {
-               GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-               ASSERT(span->array->ChanType == GL_FLOAT);
-               FOG_LOOP(GLfloat, EXP2_FOG);
-            }
-         }
-         break;
-
-      default:
-         _mesa_problem(ctx, "Bad fog mode in _swrast_fog_rgba_span");
-         return;
-      }
-   }
-   else {
-      /* The span's fog start/step/array values are blend factors in [0,1].
-       * They were previously computed per-vertex.
-       */
-      if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-         GLubyte (*rgba)[4] = span->array->rgba8;
-         FOG_LOOP(GLubyte, BLEND_FOG);
-      }
-      else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-         GLushort (*rgba)[4] = span->array->rgba16;
-         FOG_LOOP(GLushort, BLEND_FOG);
-      }
-      else {
-         GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-         ASSERT(span->array->ChanType == GL_FLOAT);
-         FOG_LOOP(GLfloat, BLEND_FOG);
-      }
-   }
-}
+/*

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

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+

+#include "s_context.h"

+#include "s_fog.h"

+

+

+/**

+ * Used to convert current raster distance to a fog factor in [0,1].

+ */

+GLfloat

+_swrast_z_to_fogfactor(struct gl_context *ctx, GLfloat z)

+{

+   GLfloat d, f;

+

+   switch (ctx->Fog.Mode) {

+   case GL_LINEAR:

+      if (ctx->Fog.Start == ctx->Fog.End)

+         d = 1.0F;

+      else

+         d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);

+      f = (ctx->Fog.End - z) * d;

+      return CLAMP(f, 0.0F, 1.0F);

+   case GL_EXP:

+      d = ctx->Fog.Density;

+      f = EXPF(-d * z);

+      f = CLAMP(f, 0.0F, 1.0F);

+      return f;

+   case GL_EXP2:

+      d = ctx->Fog.Density;

+      f = EXPF(-(d * d * z * z));

+      f = CLAMP(f, 0.0F, 1.0F);

+      return f;

+   default:

+      _mesa_problem(ctx, "Bad fog mode in _swrast_z_to_fogfactor");

+      return 0.0; 

+   }

+}

+

+

+#define LINEAR_FOG(f, coord)  f = (fogEnd - coord) * fogScale

+

+#define EXP_FOG(f, coord)  f = EXPF(density * coord)

+

+#define EXP2_FOG(f, coord)				\

+do {							\

+   GLfloat tmp = negDensitySquared * coord * coord;	\

+   if (tmp < FLT_MIN_10_EXP)				\

+      tmp = FLT_MIN_10_EXP;				\

+   f = EXPF(tmp);					\

+ } while(0)

+

+

+#define BLEND_FOG(f, coord)  f = coord

+

+

+

+/**

+ * Template code for computing fog blend factor and applying it to colors.

+ * \param TYPE  either GLubyte, GLushort or GLfloat.

+ * \param COMPUTE_F  code to compute the fog blend factor, f.

+ */

+#define FOG_LOOP(TYPE, FOG_FUNC)						\

+if (span->arrayAttribs & FRAG_BIT_FOGC) {					\

+   GLuint i;									\

+   for (i = 0; i < span->end; i++) {						\

+      const GLfloat fogCoord = span->array->attribs[FRAG_ATTRIB_FOGC][i][0];	\

+      const GLfloat c = FABSF(fogCoord);					\

+      GLfloat f, oneMinusF;							\

+      FOG_FUNC(f, c);								\

+      f = CLAMP(f, 0.0F, 1.0F);							\

+      oneMinusF = 1.0F - f;							\

+      rgba[i][RCOMP] = (TYPE) (f * rgba[i][RCOMP] + oneMinusF * rFog);		\

+      rgba[i][GCOMP] = (TYPE) (f * rgba[i][GCOMP] + oneMinusF * gFog);		\

+      rgba[i][BCOMP] = (TYPE) (f * rgba[i][BCOMP] + oneMinusF * bFog);		\

+   }										\

+}										\

+else {										\

+   const GLfloat fogStep = span->attrStepX[FRAG_ATTRIB_FOGC][0];		\

+   GLfloat fogCoord = span->attrStart[FRAG_ATTRIB_FOGC][0];			\

+   const GLfloat wStep = span->attrStepX[FRAG_ATTRIB_WPOS][3];			\

+   GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3];				\

+   GLuint i;									\

+   for (i = 0; i < span->end; i++) {						\

+      const GLfloat c = FABSF(fogCoord) / w;					\

+      GLfloat f, oneMinusF;							\

+      FOG_FUNC(f, c);								\

+      f = CLAMP(f, 0.0F, 1.0F);							\

+      oneMinusF = 1.0F - f;							\

+      rgba[i][RCOMP] = (TYPE) (f * rgba[i][RCOMP] + oneMinusF * rFog);		\

+      rgba[i][GCOMP] = (TYPE) (f * rgba[i][GCOMP] + oneMinusF * gFog);		\

+      rgba[i][BCOMP] = (TYPE) (f * rgba[i][BCOMP] + oneMinusF * bFog);		\

+      fogCoord += fogStep;							\

+      w += wStep;								\

+   }										\

+}

+

+/**

+ * Apply fog to a span of RGBA pixels.

+ * The fog value are either in the span->array->fog array or interpolated from

+ * the fog/fogStep values.

+ * They fog values are either fog coordinates (Z) or fog blend factors.

+ * _PreferPixelFog should be in sync with that state!

+ */

+void

+_swrast_fog_rgba_span( const struct gl_context *ctx, SWspan *span )

+{

+   const SWcontext *swrast = CONST_SWRAST_CONTEXT(ctx);

+   GLfloat rFog, gFog, bFog;

+

+   ASSERT(swrast->_FogEnabled);

+   ASSERT(span->arrayMask & SPAN_RGBA);

+

+   /* compute (scaled) fog color */

+   if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+      rFog = ctx->Fog.Color[RCOMP] * 255.0F;

+      gFog = ctx->Fog.Color[GCOMP] * 255.0F;

+      bFog = ctx->Fog.Color[BCOMP] * 255.0F;

+   }

+   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+      rFog = ctx->Fog.Color[RCOMP] * 65535.0F;

+      gFog = ctx->Fog.Color[GCOMP] * 65535.0F;

+      bFog = ctx->Fog.Color[BCOMP] * 65535.0F;

+   }

+   else {

+      rFog = ctx->Fog.Color[RCOMP];

+      gFog = ctx->Fog.Color[GCOMP];

+      bFog = ctx->Fog.Color[BCOMP];

+   }

+

+   if (swrast->_PreferPixelFog) {

+      /* The span's fog values are fog coordinates, now compute blend factors

+       * and blend the fragment colors with the fog color.

+       */

+      switch (swrast->_FogMode) {

+      case GL_LINEAR:

+         {

+            const GLfloat fogEnd = ctx->Fog.End;

+            const GLfloat fogScale = (ctx->Fog.Start == ctx->Fog.End)

+               ? 1.0F : 1.0F / (ctx->Fog.End - ctx->Fog.Start);

+            if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+               GLubyte (*rgba)[4] = span->array->rgba8;

+               FOG_LOOP(GLubyte, LINEAR_FOG);

+            }

+            else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+               GLushort (*rgba)[4] = span->array->rgba16;

+               FOG_LOOP(GLushort, LINEAR_FOG);

+            }

+            else {

+               GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+               ASSERT(span->array->ChanType == GL_FLOAT);

+               FOG_LOOP(GLfloat, LINEAR_FOG);

+            }

+         }

+         break;

+

+      case GL_EXP:

+         {

+            const GLfloat density = -ctx->Fog.Density;

+            if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+               GLubyte (*rgba)[4] = span->array->rgba8;

+               FOG_LOOP(GLubyte, EXP_FOG);

+            }

+            else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+               GLushort (*rgba)[4] = span->array->rgba16;

+               FOG_LOOP(GLushort, EXP_FOG);

+            }

+            else {

+               GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+               ASSERT(span->array->ChanType == GL_FLOAT);

+               FOG_LOOP(GLfloat, EXP_FOG);

+            }

+         }

+         break;

+

+      case GL_EXP2:

+         {

+            const GLfloat negDensitySquared = -ctx->Fog.Density * ctx->Fog.Density;

+            if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+               GLubyte (*rgba)[4] = span->array->rgba8;

+               FOG_LOOP(GLubyte, EXP2_FOG);

+            }

+            else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+               GLushort (*rgba)[4] = span->array->rgba16;

+               FOG_LOOP(GLushort, EXP2_FOG);

+            }

+            else {

+               GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+               ASSERT(span->array->ChanType == GL_FLOAT);

+               FOG_LOOP(GLfloat, EXP2_FOG);

+            }

+         }

+         break;

+

+      default:

+         _mesa_problem(ctx, "Bad fog mode in _swrast_fog_rgba_span");

+         return;

+      }

+   }

+   else {

+      /* The span's fog start/step/array values are blend factors in [0,1].

+       * They were previously computed per-vertex.

+       */

+      if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+         GLubyte (*rgba)[4] = span->array->rgba8;

+         FOG_LOOP(GLubyte, BLEND_FOG);

+      }

+      else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+         GLushort (*rgba)[4] = span->array->rgba16;

+         FOG_LOOP(GLushort, BLEND_FOG);

+      }

+      else {

+         GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+         ASSERT(span->array->ChanType == GL_FLOAT);

+         FOG_LOOP(GLfloat, BLEND_FOG);

+      }

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_fog.h b/mesalib/src/mesa/swrast/s_fog.h
index a496746d1..eed9b8bdd 100644
--- a/mesalib/src/mesa/swrast/s_fog.h
+++ b/mesalib/src/mesa/swrast/s_fog.h
@@ -1,41 +1,42 @@
-
-/*
- * 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.
- */
-
-
-#ifndef S_FOG_H
-#define S_FOG_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern GLfloat
-_swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z);
-
-extern void
-_swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span );
-
-#endif
+

+/*

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

+ */

+

+

+#ifndef S_FOG_H

+#define S_FOG_H

+

+

+#include "main/glheader.h"

+#include "s_span.h"

+

+struct gl_context;

+

+extern GLfloat

+_swrast_z_to_fogfactor(struct gl_context *ctx, GLfloat z);

+

+extern void

+_swrast_fog_rgba_span( const struct gl_context *ctx, SWspan *span );

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_fragprog.c b/mesalib/src/mesa/swrast/s_fragprog.c
index 9facb44d9..2608d5373 100644
--- a/mesalib/src/mesa/swrast/s_fragprog.c
+++ b/mesalib/src/mesa/swrast/s_fragprog.c
@@ -1,277 +1,277 @@
-/*
- * 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 "program/prog_instruction.h"
-
-#include "s_context.h"
-#include "s_fragprog.h"
-#include "s_span.h"
-
-
-/**
- * Apply texture object's swizzle (X/Y/Z/W/0/1) to incoming 'texel'
- * and return results in 'colorOut'.
- */
-static INLINE void
-swizzle_texel(const GLfloat texel[4], GLfloat colorOut[4], GLuint swizzle)
-{
-   if (swizzle == SWIZZLE_NOOP) {
-      COPY_4V(colorOut, texel);
-   }
-   else {
-      GLfloat vector[6];
-      vector[SWIZZLE_X] = texel[0];
-      vector[SWIZZLE_Y] = texel[1];
-      vector[SWIZZLE_Z] = texel[2];
-      vector[SWIZZLE_W] = texel[3];
-      vector[SWIZZLE_ZERO] = 0.0F;
-      vector[SWIZZLE_ONE] = 1.0F;
-      colorOut[0] = vector[GET_SWZ(swizzle, 0)];
-      colorOut[1] = vector[GET_SWZ(swizzle, 1)];
-      colorOut[2] = vector[GET_SWZ(swizzle, 2)];
-      colorOut[3] = vector[GET_SWZ(swizzle, 3)];
-   }
-}
-
-
-/**
- * Fetch a texel with given lod.
- * Called via machine->FetchTexelLod()
- */
-static void
-fetch_texel_lod( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
-                 GLuint unit, GLfloat color[4] )
-{
-   const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;
-
-   if (texObj) {
-      SWcontext *swrast = SWRAST_CONTEXT(ctx);
-      GLfloat rgba[4];
-
-      lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
-
-      swrast->TextureSample[unit](ctx, texObj, 1,
-                                  (const GLfloat (*)[4]) texcoord,
-                                  &lambda, &rgba);
-      swizzle_texel(rgba, color, texObj->_Swizzle);
-   }
-   else {
-      ASSIGN_4V(color, 0.0F, 0.0F, 0.0F, 1.0F);
-   }
-}
-
-
-/**
- * Fetch a texel with the given partial derivatives to compute a level
- * of detail in the mipmap.
- * Called via machine->FetchTexelDeriv()
- * \param lodBias  the lod bias which may be specified by a TXB instruction,
- *                 otherwise zero.
- */
-static void
-fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
-                   const GLfloat texdx[4], const GLfloat texdy[4],
-                   GLfloat lodBias, GLuint unit, GLfloat color[4] )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   const struct gl_texture_object *texObj = texUnit->_Current;
-
-   if (texObj) {
-      const struct gl_texture_image *texImg =
-         texObj->Image[0][texObj->BaseLevel];
-      const GLfloat texW = (GLfloat) texImg->WidthScale;
-      const GLfloat texH = (GLfloat) texImg->HeightScale;
-      GLfloat lambda;
-      GLfloat rgba[4];
-
-      lambda = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */
-                                      texdx[1], texdy[1], /* dt/dx, dt/dy */
-                                      texdx[3], texdy[3], /* dq/dx, dq/dy */
-                                      texW, texH,
-                                      texcoord[0], texcoord[1], texcoord[3],
-                                      1.0F / texcoord[3]);
-
-      lambda += lodBias + texUnit->LodBias + texObj->LodBias;
-
-      lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
-
-      swrast->TextureSample[unit](ctx, texObj, 1,
-                                  (const GLfloat (*)[4]) texcoord,
-                                  &lambda, &rgba);
-      swizzle_texel(rgba, color, texObj->_Swizzle);
-   }
-   else {
-      ASSIGN_4V(color, 0.0F, 0.0F, 0.0F, 1.0F);
-   }
-}
-
-
-/**
- * Initialize the virtual fragment program machine state prior to running
- * fragment program on a fragment.  This involves initializing the input
- * registers, condition codes, etc.
- * \param machine  the virtual machine state to init
- * \param program  the fragment program we're about to run
- * \param span  the span of pixels we'll operate on
- * \param col  which element (column) of the span we'll operate on
- */
-static void
-init_machine(GLcontext *ctx, struct gl_program_machine *machine,
-             const struct gl_fragment_program *program,
-             const SWspan *span, GLuint col)
-{
-   GLfloat *wpos = span->array->attribs[FRAG_ATTRIB_WPOS][col];
-
-   if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
-      /* Clear temporary registers (undefined for ARB_f_p) */
-      memset(machine->Temporaries, 0, MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
-   }
-
-   /* ARB_fragment_coord_conventions */
-   if (program->OriginUpperLeft)
-      wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1];
-   if (!program->PixelCenterInteger) {
-      wpos[0] += 0.5F;
-      wpos[1] += 0.5F;
-   }
-
-   /* Setup pointer to input attributes */
-   machine->Attribs = span->array->attribs;
-
-   machine->DerivX = (GLfloat (*)[4]) span->attrStepX;
-   machine->DerivY = (GLfloat (*)[4]) span->attrStepY;
-   machine->NumDeriv = FRAG_ATTRIB_MAX;
-
-   machine->Samplers = program->Base.SamplerUnits;
-
-   /* if running a GLSL program (not ARB_fragment_program) */
-   if (ctx->Shader.CurrentProgram) {
-      /* Store front/back facing value */
-      machine->Attribs[FRAG_ATTRIB_FACE][col][0] = 1.0F - span->facing;
-   }
-
-   machine->CurElement = col;
-
-   /* init condition codes */
-   machine->CondCodes[0] = COND_EQ;
-   machine->CondCodes[1] = COND_EQ;
-   machine->CondCodes[2] = COND_EQ;
-   machine->CondCodes[3] = COND_EQ;
-
-   /* init call stack */
-   machine->StackDepth = 0;
-
-   machine->FetchTexelLod = fetch_texel_lod;
-   machine->FetchTexelDeriv = fetch_texel_deriv;
-}
-
-
-/**
- * Run fragment program on the pixels in span from 'start' to 'end' - 1.
- */
-static void
-run_program(GLcontext *ctx, SWspan *span, GLuint start, GLuint end)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
-   const GLbitfield64 outputsWritten = program->Base.OutputsWritten;
-   struct gl_program_machine *machine = &swrast->FragProgMachine;
-   GLuint i;
-
-   for (i = start; i < end; i++) {
-      if (span->array->mask[i]) {
-         init_machine(ctx, machine, program, span, i);
-
-         if (_mesa_execute_program(ctx, &program->Base, machine)) {
-
-            /* Store result color */
-	    if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {
-               COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i],
-                       machine->Outputs[FRAG_RESULT_COLOR]);
-            }
-            else {
-               /* Multiple drawbuffers / render targets
-                * Note that colors beyond 0 and 1 will overwrite other
-                * attributes, such as FOGC, TEX0, TEX1, etc.  That's OK.
-                */
-               GLuint buf;
-               for (buf = 0; buf < ctx->DrawBuffer->_NumColorDrawBuffers; buf++) {
-                  if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DATA0 + buf)) {
-                     COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0 + buf][i],
-                             machine->Outputs[FRAG_RESULT_DATA0 + buf]);
-                  }
-               }
-            }
-
-            /* Store result depth/z */
-            if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {
-               const GLfloat depth = machine->Outputs[FRAG_RESULT_DEPTH][2];
-               if (depth <= 0.0)
-                  span->array->z[i] = 0;
-               else if (depth >= 1.0)
-                  span->array->z[i] = ctx->DrawBuffer->_DepthMax;
-               else
-                  span->array->z[i] = IROUND(depth * ctx->DrawBuffer->_DepthMaxF);
-            }
-         }
-         else {
-            /* killed fragment */
-            span->array->mask[i] = GL_FALSE;
-            span->writeAll = GL_FALSE;
-         }
-      }
-   }
-}
-
-
-/**
- * Execute the current fragment program for all the fragments
- * in the given span.
- */
-void
-_swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
-{
-   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
-
-   /* incoming colors should be floats */
-   if (program->Base.InputsRead & FRAG_BIT_COL0) {
-      ASSERT(span->array->ChanType == GL_FLOAT);
-   }
-
-   run_program(ctx, span, 0, span->end);
-
-   if (program->Base.OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {
-      span->interpMask &= ~SPAN_RGBA;
-      span->arrayMask |= SPAN_RGBA;
-   }
-
-   if (program->Base.OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {
-      span->interpMask &= ~SPAN_Z;
-      span->arrayMask |= SPAN_Z;
-   }
-}
-
+/*

+ * 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 "program/prog_instruction.h"

+

+#include "s_context.h"

+#include "s_fragprog.h"

+#include "s_span.h"

+

+

+/**

+ * Apply texture object's swizzle (X/Y/Z/W/0/1) to incoming 'texel'

+ * and return results in 'colorOut'.

+ */

+static INLINE void

+swizzle_texel(const GLfloat texel[4], GLfloat colorOut[4], GLuint swizzle)

+{

+   if (swizzle == SWIZZLE_NOOP) {

+      COPY_4V(colorOut, texel);

+   }

+   else {

+      GLfloat vector[6];

+      vector[SWIZZLE_X] = texel[0];

+      vector[SWIZZLE_Y] = texel[1];

+      vector[SWIZZLE_Z] = texel[2];

+      vector[SWIZZLE_W] = texel[3];

+      vector[SWIZZLE_ZERO] = 0.0F;

+      vector[SWIZZLE_ONE] = 1.0F;

+      colorOut[0] = vector[GET_SWZ(swizzle, 0)];

+      colorOut[1] = vector[GET_SWZ(swizzle, 1)];

+      colorOut[2] = vector[GET_SWZ(swizzle, 2)];

+      colorOut[3] = vector[GET_SWZ(swizzle, 3)];

+   }

+}

+

+

+/**

+ * Fetch a texel with given lod.

+ * Called via machine->FetchTexelLod()

+ */

+static void

+fetch_texel_lod( struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lambda,

+                 GLuint unit, GLfloat color[4] )

+{

+   const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;

+

+   if (texObj) {

+      SWcontext *swrast = SWRAST_CONTEXT(ctx);

+      GLfloat rgba[4];

+

+      lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);

+

+      swrast->TextureSample[unit](ctx, texObj, 1,

+                                  (const GLfloat (*)[4]) texcoord,

+                                  &lambda, &rgba);

+      swizzle_texel(rgba, color, texObj->_Swizzle);

+   }

+   else {

+      ASSIGN_4V(color, 0.0F, 0.0F, 0.0F, 1.0F);

+   }

+}

+

+

+/**

+ * Fetch a texel with the given partial derivatives to compute a level

+ * of detail in the mipmap.

+ * Called via machine->FetchTexelDeriv()

+ * \param lodBias  the lod bias which may be specified by a TXB instruction,

+ *                 otherwise zero.

+ */

+static void

+fetch_texel_deriv( struct gl_context *ctx, const GLfloat texcoord[4],

+                   const GLfloat texdx[4], const GLfloat texdy[4],

+                   GLfloat lodBias, GLuint unit, GLfloat color[4] )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+   const struct gl_texture_object *texObj = texUnit->_Current;

+

+   if (texObj) {

+      const struct gl_texture_image *texImg =

+         texObj->Image[0][texObj->BaseLevel];

+      const GLfloat texW = (GLfloat) texImg->WidthScale;

+      const GLfloat texH = (GLfloat) texImg->HeightScale;

+      GLfloat lambda;

+      GLfloat rgba[4];

+

+      lambda = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */

+                                      texdx[1], texdy[1], /* dt/dx, dt/dy */

+                                      texdx[3], texdy[3], /* dq/dx, dq/dy */

+                                      texW, texH,

+                                      texcoord[0], texcoord[1], texcoord[3],

+                                      1.0F / texcoord[3]);

+

+      lambda += lodBias + texUnit->LodBias + texObj->LodBias;

+

+      lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);

+

+      swrast->TextureSample[unit](ctx, texObj, 1,

+                                  (const GLfloat (*)[4]) texcoord,

+                                  &lambda, &rgba);

+      swizzle_texel(rgba, color, texObj->_Swizzle);

+   }

+   else {

+      ASSIGN_4V(color, 0.0F, 0.0F, 0.0F, 1.0F);

+   }

+}

+

+

+/**

+ * Initialize the virtual fragment program machine state prior to running

+ * fragment program on a fragment.  This involves initializing the input

+ * registers, condition codes, etc.

+ * \param machine  the virtual machine state to init

+ * \param program  the fragment program we're about to run

+ * \param span  the span of pixels we'll operate on

+ * \param col  which element (column) of the span we'll operate on

+ */

+static void

+init_machine(struct gl_context *ctx, struct gl_program_machine *machine,

+             const struct gl_fragment_program *program,

+             const SWspan *span, GLuint col)

+{

+   GLfloat *wpos = span->array->attribs[FRAG_ATTRIB_WPOS][col];

+

+   if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {

+      /* Clear temporary registers (undefined for ARB_f_p) */

+      memset(machine->Temporaries, 0, MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));

+   }

+

+   /* ARB_fragment_coord_conventions */

+   if (program->OriginUpperLeft)

+      wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1];

+   if (!program->PixelCenterInteger) {

+      wpos[0] += 0.5F;

+      wpos[1] += 0.5F;

+   }

+

+   /* Setup pointer to input attributes */

+   machine->Attribs = span->array->attribs;

+

+   machine->DerivX = (GLfloat (*)[4]) span->attrStepX;

+   machine->DerivY = (GLfloat (*)[4]) span->attrStepY;

+   machine->NumDeriv = FRAG_ATTRIB_MAX;

+

+   machine->Samplers = program->Base.SamplerUnits;

+

+   /* if running a GLSL program (not ARB_fragment_program) */

+   if (ctx->Shader.CurrentFragmentProgram) {

+      /* Store front/back facing value */

+      machine->Attribs[FRAG_ATTRIB_FACE][col][0] = 1.0F - span->facing;

+   }

+

+   machine->CurElement = col;

+

+   /* init condition codes */

+   machine->CondCodes[0] = COND_EQ;

+   machine->CondCodes[1] = COND_EQ;

+   machine->CondCodes[2] = COND_EQ;

+   machine->CondCodes[3] = COND_EQ;

+

+   /* init call stack */

+   machine->StackDepth = 0;

+

+   machine->FetchTexelLod = fetch_texel_lod;

+   machine->FetchTexelDeriv = fetch_texel_deriv;

+}

+

+

+/**

+ * Run fragment program on the pixels in span from 'start' to 'end' - 1.

+ */

+static void

+run_program(struct gl_context *ctx, SWspan *span, GLuint start, GLuint end)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;

+   const GLbitfield64 outputsWritten = program->Base.OutputsWritten;

+   struct gl_program_machine *machine = &swrast->FragProgMachine;

+   GLuint i;

+

+   for (i = start; i < end; i++) {

+      if (span->array->mask[i]) {

+         init_machine(ctx, machine, program, span, i);

+

+         if (_mesa_execute_program(ctx, &program->Base, machine)) {

+

+            /* Store result color */

+	    if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {

+               COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i],

+                       machine->Outputs[FRAG_RESULT_COLOR]);

+            }

+            else {

+               /* Multiple drawbuffers / render targets

+                * Note that colors beyond 0 and 1 will overwrite other

+                * attributes, such as FOGC, TEX0, TEX1, etc.  That's OK.

+                */

+               GLuint buf;

+               for (buf = 0; buf < ctx->DrawBuffer->_NumColorDrawBuffers; buf++) {

+                  if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DATA0 + buf)) {

+                     COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0 + buf][i],

+                             machine->Outputs[FRAG_RESULT_DATA0 + buf]);

+                  }

+               }

+            }

+

+            /* Store result depth/z */

+            if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {

+               const GLfloat depth = machine->Outputs[FRAG_RESULT_DEPTH][2];

+               if (depth <= 0.0)

+                  span->array->z[i] = 0;

+               else if (depth >= 1.0)

+                  span->array->z[i] = ctx->DrawBuffer->_DepthMax;

+               else

+                  span->array->z[i] = IROUND(depth * ctx->DrawBuffer->_DepthMaxF);

+            }

+         }

+         else {

+            /* killed fragment */

+            span->array->mask[i] = GL_FALSE;

+            span->writeAll = GL_FALSE;

+         }

+      }

+   }

+}

+

+

+/**

+ * Execute the current fragment program for all the fragments

+ * in the given span.

+ */

+void

+_swrast_exec_fragment_program( struct gl_context *ctx, SWspan *span )

+{

+   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;

+

+   /* incoming colors should be floats */

+   if (program->Base.InputsRead & FRAG_BIT_COL0) {

+      ASSERT(span->array->ChanType == GL_FLOAT);

+   }

+

+   run_program(ctx, span, 0, span->end);

+

+   if (program->Base.OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {

+      span->interpMask &= ~SPAN_RGBA;

+      span->arrayMask |= SPAN_RGBA;

+   }

+

+   if (program->Base.OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_DEPTH)) {

+      span->interpMask &= ~SPAN_Z;

+      span->arrayMask |= SPAN_Z;

+   }

+}

+

diff --git a/mesalib/src/mesa/swrast/s_fragprog.h b/mesalib/src/mesa/swrast/s_fragprog.h
index 92b9d01e1..bd5fe6877 100644
--- a/mesalib/src/mesa/swrast/s_fragprog.h
+++ b/mesalib/src/mesa/swrast/s_fragprog.h
@@ -1,39 +1,40 @@
-/*
- * 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.
- */
-
-
-#ifndef S_FRAGPROG_H
-#define S_FRAGPROG_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern void
-_swrast_exec_fragment_program(GLcontext *ctx, SWspan *span);
-
-
-#endif /* S_FRAGPROG_H */
-
+/*

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

+ */

+

+

+#ifndef S_FRAGPROG_H

+#define S_FRAGPROG_H

+

+

+#include "s_span.h"

+

+struct gl_context;

+

+

+extern void

+_swrast_exec_fragment_program(struct gl_context *ctx, SWspan *span);

+

+

+#endif /* S_FRAGPROG_H */

+

diff --git a/mesalib/src/mesa/swrast/s_lines.c b/mesalib/src/mesa/swrast/s_lines.c
index 7db5af4ae..aba403308 100644
--- a/mesalib/src/mesa/swrast/s_lines.c
+++ b/mesalib/src/mesa/swrast/s_lines.c
@@ -1,268 +1,268 @@
-/*
- * 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/context.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "s_aaline.h"
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_lines.h"
-#include "s_span.h"
-
-
-/*
- * Init the mask[] array to implement a line stipple.
- */
-static void
-compute_stipple_mask( GLcontext *ctx, GLuint len, GLubyte mask[] )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLuint i;
-
-   for (i = 0; i < len; i++) {
-      GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;
-      if ((1 << bit) & ctx->Line.StipplePattern) {
-         mask[i] = GL_TRUE;
-      }
-      else {
-         mask[i] = GL_FALSE;
-      }
-      swrast->StippleCounter++;
-   }
-}
-
-
-/*
- * To draw a wide line we can simply redraw the span N times, side by side.
- */
-static void
-draw_wide_line( GLcontext *ctx, SWspan *span, GLboolean xMajor )
-{
-   const GLint width = (GLint) CLAMP(ctx->Line.Width,
-                                     ctx->Const.MinLineWidth,
-                                     ctx->Const.MaxLineWidth);
-   GLint start;
-
-   ASSERT(span->end < MAX_WIDTH);
-
-   if (width & 1)
-      start = width / 2;
-   else
-      start = width / 2 - 1;
-
-   if (xMajor) {
-      GLint *y = span->array->y;
-      GLuint i;
-      GLint w;
-      for (w = 0; w < width; w++) {
-         if (w == 0) {
-            for (i = 0; i < span->end; i++)
-               y[i] -= start;
-         }
-         else {
-            for (i = 0; i < span->end; i++)
-               y[i]++;
-         }
-	 _swrast_write_rgba_span(ctx, span);
-      }
-   }
-   else {
-      GLint *x = span->array->x;
-      GLuint i;
-      GLint w;
-      for (w = 0; w < width; w++) {
-         if (w == 0) {
-            for (i = 0; i < span->end; i++)
-               x[i] -= start;
-         }
-         else {
-            for (i = 0; i < span->end; i++)
-               x[i]++;
-         }
-	 _swrast_write_rgba_span(ctx, span);
-      }
-   }
-}
-
-
-
-/**********************************************************************/
-/*****                    Rasterization                           *****/
-/**********************************************************************/
-
-/* Simple RGBA index line (no stipple, width=1, no Z, no fog, no tex)*/
-#define NAME simple_no_z_rgba_line
-#define INTERP_RGBA
-#define RENDER_SPAN(span) _swrast_write_rgba_span(ctx, &span);
-#include "s_linetemp.h"
-
-
-/* Z, fog, wide, stipple RGBA line */
-#define NAME rgba_line
-#define INTERP_RGBA
-#define INTERP_Z
-#define RENDER_SPAN(span)					\
-   if (ctx->Line.StippleFlag) {					\
-      span.arrayMask |= SPAN_MASK;				\
-      compute_stipple_mask(ctx, span.end, span.array->mask);	\
-   }								\
-   if (ctx->Line.Width > 1.0) {					\
-      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\
-   }								\
-   else {							\
-      _swrast_write_rgba_span(ctx, &span);			\
-   }
-#include "s_linetemp.h"
-
-
-/* General-purpose line (any/all features). */
-#define NAME general_line
-#define INTERP_RGBA
-#define INTERP_Z
-#define INTERP_ATTRIBS
-#define RENDER_SPAN(span)					\
-   if (ctx->Line.StippleFlag) {					\
-      span.arrayMask |= SPAN_MASK;				\
-      compute_stipple_mask(ctx, span.end, span.array->mask);	\
-   }								\
-   if (ctx->Line.Width > 1.0) {					\
-      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\
-   }								\
-   else {							\
-      _swrast_write_rgba_span(ctx, &span);			\
-   }
-#include "s_linetemp.h"
-
-
-
-void
-_swrast_add_spec_terms_line(GLcontext *ctx,
-                            const SWvertex *v0, const SWvertex *v1)
-{
-   SWvertex *ncv0 = (SWvertex *)v0;
-   SWvertex *ncv1 = (SWvertex *)v1;
-   GLfloat rSum, gSum, bSum;
-   GLchan cSave[2][4];
-
-   /* save original colors */
-   COPY_CHAN4(cSave[0], ncv0->color);
-   COPY_CHAN4(cSave[1], ncv1->color);
-   /* sum v0 */
-   rSum = CHAN_TO_FLOAT(ncv0->color[0]) + ncv0->attrib[FRAG_ATTRIB_COL1][0];
-   gSum = CHAN_TO_FLOAT(ncv0->color[1]) + ncv0->attrib[FRAG_ATTRIB_COL1][1];
-   bSum = CHAN_TO_FLOAT(ncv0->color[2]) + ncv0->attrib[FRAG_ATTRIB_COL1][2];
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[0], rSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[1], gSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[2], bSum);
-   /* sum v1 */
-   rSum = CHAN_TO_FLOAT(ncv1->color[0]) + ncv1->attrib[FRAG_ATTRIB_COL1][0];
-   gSum = CHAN_TO_FLOAT(ncv1->color[1]) + ncv1->attrib[FRAG_ATTRIB_COL1][1];
-   bSum = CHAN_TO_FLOAT(ncv1->color[2]) + ncv1->attrib[FRAG_ATTRIB_COL1][2];
-   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[0], rSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[1], gSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[2], bSum);
-   /* draw */
-   SWRAST_CONTEXT(ctx)->SpecLine( ctx, ncv0, ncv1 );
-   /* restore original colors */
-   COPY_CHAN4( ncv0->attrib[FRAG_ATTRIB_COL0], cSave[0] );
-   COPY_CHAN4( ncv1->attrib[FRAG_ATTRIB_COL0], cSave[1] );
-}
-
-
-
-#ifdef DEBUG
-
-/* record the current line function name */
-static const char *lineFuncName = NULL;
-
-#define USE(lineFunc)                   \
-do {                                    \
-    lineFuncName = #lineFunc;           \
-    /*printf("%s\n", lineFuncName);*/   \
-    swrast->Line = lineFunc;            \
-} while (0)
-
-#else
-
-#define USE(lineFunc)  swrast->Line = lineFunc
-
-#endif
-
-
-
-/**
- * Determine which line drawing function to use given the current
- * rendering context.
- *
- * Please update the summary flag _SWRAST_NEW_LINE if you add or remove
- * tests to this code.
- */
-void
-_swrast_choose_line( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLboolean specular = (ctx->Fog.ColorSumEnabled ||
-                         (ctx->Light.Enabled &&
-                          ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR));
-
-   if (ctx->RenderMode == GL_RENDER) {
-      if (ctx->Line.SmoothFlag) {
-         /* antialiased lines */
-         _swrast_choose_aa_line_function(ctx);
-         ASSERT(swrast->Line);
-      }
-      else if (ctx->Texture._EnabledCoordUnits
-               || ctx->FragmentProgram._Current
-               || swrast->_FogEnabled
-               || specular) {
-         USE(general_line);
-      }
-      else if (ctx->Depth.Test
-               || ctx->Line.Width != 1.0
-               || ctx->Line.StippleFlag) {
-         /* no texture, but Z, fog, width>1, stipple, etc. */
-#if CHAN_BITS == 32
-         USE(general_line);
-#else
-         USE(rgba_line);
-#endif
-      }
-      else {
-         ASSERT(!ctx->Depth.Test);
-         ASSERT(ctx->Line.Width == 1.0);
-         /* simple lines */
-         USE(simple_no_z_rgba_line);
-      }
-   }
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      USE(_swrast_feedback_line);
-   }
-   else {
-      ASSERT(ctx->RenderMode == GL_SELECT);
-      USE(_swrast_select_line);
-   }
-}
+/*

+ * 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/context.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "s_aaline.h"

+#include "s_context.h"

+#include "s_feedback.h"

+#include "s_lines.h"

+#include "s_span.h"

+

+

+/*

+ * Init the mask[] array to implement a line stipple.

+ */

+static void

+compute_stipple_mask( struct gl_context *ctx, GLuint len, GLubyte mask[] )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLuint i;

+

+   for (i = 0; i < len; i++) {

+      GLuint bit = (swrast->StippleCounter / ctx->Line.StippleFactor) & 0xf;

+      if ((1 << bit) & ctx->Line.StipplePattern) {

+         mask[i] = GL_TRUE;

+      }

+      else {

+         mask[i] = GL_FALSE;

+      }

+      swrast->StippleCounter++;

+   }

+}

+

+

+/*

+ * To draw a wide line we can simply redraw the span N times, side by side.

+ */

+static void

+draw_wide_line( struct gl_context *ctx, SWspan *span, GLboolean xMajor )

+{

+   const GLint width = (GLint) CLAMP(ctx->Line.Width,

+                                     ctx->Const.MinLineWidth,

+                                     ctx->Const.MaxLineWidth);

+   GLint start;

+

+   ASSERT(span->end < MAX_WIDTH);

+

+   if (width & 1)

+      start = width / 2;

+   else

+      start = width / 2 - 1;

+

+   if (xMajor) {

+      GLint *y = span->array->y;

+      GLuint i;

+      GLint w;

+      for (w = 0; w < width; w++) {

+         if (w == 0) {

+            for (i = 0; i < span->end; i++)

+               y[i] -= start;

+         }

+         else {

+            for (i = 0; i < span->end; i++)

+               y[i]++;

+         }

+	 _swrast_write_rgba_span(ctx, span);

+      }

+   }

+   else {

+      GLint *x = span->array->x;

+      GLuint i;

+      GLint w;

+      for (w = 0; w < width; w++) {

+         if (w == 0) {

+            for (i = 0; i < span->end; i++)

+               x[i] -= start;

+         }

+         else {

+            for (i = 0; i < span->end; i++)

+               x[i]++;

+         }

+	 _swrast_write_rgba_span(ctx, span);

+      }

+   }

+}

+

+

+

+/**********************************************************************/

+/*****                    Rasterization                           *****/

+/**********************************************************************/

+

+/* Simple RGBA index line (no stipple, width=1, no Z, no fog, no tex)*/

+#define NAME simple_no_z_rgba_line

+#define INTERP_RGBA

+#define RENDER_SPAN(span) _swrast_write_rgba_span(ctx, &span);

+#include "s_linetemp.h"

+

+

+/* Z, fog, wide, stipple RGBA line */

+#define NAME rgba_line

+#define INTERP_RGBA

+#define INTERP_Z

+#define RENDER_SPAN(span)					\

+   if (ctx->Line.StippleFlag) {					\

+      span.arrayMask |= SPAN_MASK;				\

+      compute_stipple_mask(ctx, span.end, span.array->mask);	\

+   }								\

+   if (ctx->Line.Width > 1.0) {					\

+      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\

+   }								\

+   else {							\

+      _swrast_write_rgba_span(ctx, &span);			\

+   }

+#include "s_linetemp.h"

+

+

+/* General-purpose line (any/all features). */

+#define NAME general_line

+#define INTERP_RGBA

+#define INTERP_Z

+#define INTERP_ATTRIBS

+#define RENDER_SPAN(span)					\

+   if (ctx->Line.StippleFlag) {					\

+      span.arrayMask |= SPAN_MASK;				\

+      compute_stipple_mask(ctx, span.end, span.array->mask);	\

+   }								\

+   if (ctx->Line.Width > 1.0) {					\

+      draw_wide_line(ctx, &span, (GLboolean)(dx > dy));		\

+   }								\

+   else {							\

+      _swrast_write_rgba_span(ctx, &span);			\

+   }

+#include "s_linetemp.h"

+

+

+

+void

+_swrast_add_spec_terms_line(struct gl_context *ctx,

+                            const SWvertex *v0, const SWvertex *v1)

+{

+   SWvertex *ncv0 = (SWvertex *)v0;

+   SWvertex *ncv1 = (SWvertex *)v1;

+   GLfloat rSum, gSum, bSum;

+   GLchan cSave[2][4];

+

+   /* save original colors */

+   COPY_CHAN4(cSave[0], ncv0->color);

+   COPY_CHAN4(cSave[1], ncv1->color);

+   /* sum v0 */

+   rSum = CHAN_TO_FLOAT(ncv0->color[0]) + ncv0->attrib[FRAG_ATTRIB_COL1][0];

+   gSum = CHAN_TO_FLOAT(ncv0->color[1]) + ncv0->attrib[FRAG_ATTRIB_COL1][1];

+   bSum = CHAN_TO_FLOAT(ncv0->color[2]) + ncv0->attrib[FRAG_ATTRIB_COL1][2];

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[0], rSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[1], gSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[2], bSum);

+   /* sum v1 */

+   rSum = CHAN_TO_FLOAT(ncv1->color[0]) + ncv1->attrib[FRAG_ATTRIB_COL1][0];

+   gSum = CHAN_TO_FLOAT(ncv1->color[1]) + ncv1->attrib[FRAG_ATTRIB_COL1][1];

+   bSum = CHAN_TO_FLOAT(ncv1->color[2]) + ncv1->attrib[FRAG_ATTRIB_COL1][2];

+   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[0], rSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[1], gSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[2], bSum);

+   /* draw */

+   SWRAST_CONTEXT(ctx)->SpecLine( ctx, ncv0, ncv1 );

+   /* restore original colors */

+   COPY_CHAN4( ncv0->attrib[FRAG_ATTRIB_COL0], cSave[0] );

+   COPY_CHAN4( ncv1->attrib[FRAG_ATTRIB_COL0], cSave[1] );

+}

+

+

+

+#ifdef DEBUG

+

+/* record the current line function name */

+static const char *lineFuncName = NULL;

+

+#define USE(lineFunc)                   \

+do {                                    \

+    lineFuncName = #lineFunc;           \

+    /*printf("%s\n", lineFuncName);*/   \

+    swrast->Line = lineFunc;            \

+} while (0)

+

+#else

+

+#define USE(lineFunc)  swrast->Line = lineFunc

+

+#endif

+

+

+

+/**

+ * Determine which line drawing function to use given the current

+ * rendering context.

+ *

+ * Please update the summary flag _SWRAST_NEW_LINE if you add or remove

+ * tests to this code.

+ */

+void

+_swrast_choose_line( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLboolean specular = (ctx->Fog.ColorSumEnabled ||

+                         (ctx->Light.Enabled &&

+                          ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR));

+

+   if (ctx->RenderMode == GL_RENDER) {

+      if (ctx->Line.SmoothFlag) {

+         /* antialiased lines */

+         _swrast_choose_aa_line_function(ctx);

+         ASSERT(swrast->Line);

+      }

+      else if (ctx->Texture._EnabledCoordUnits

+               || ctx->FragmentProgram._Current

+               || swrast->_FogEnabled

+               || specular) {

+         USE(general_line);

+      }

+      else if (ctx->Depth.Test

+               || ctx->Line.Width != 1.0

+               || ctx->Line.StippleFlag) {

+         /* no texture, but Z, fog, width>1, stipple, etc. */

+#if CHAN_BITS == 32

+         USE(general_line);

+#else

+         USE(rgba_line);

+#endif

+      }

+      else {

+         ASSERT(!ctx->Depth.Test);

+         ASSERT(ctx->Line.Width == 1.0);

+         /* simple lines */

+         USE(simple_no_z_rgba_line);

+      }

+   }

+   else if (ctx->RenderMode == GL_FEEDBACK) {

+      USE(_swrast_feedback_line);

+   }

+   else {

+      ASSERT(ctx->RenderMode == GL_SELECT);

+      USE(_swrast_select_line);

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_lines.h b/mesalib/src/mesa/swrast/s_lines.h
index 22979a02b..0f95eecab 100644
--- a/mesalib/src/mesa/swrast/s_lines.h
+++ b/mesalib/src/mesa/swrast/s_lines.h
@@ -1,41 +1,41 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 S_LINES_H
-#define S_LINES_H
-
-#include "swrast.h"
-
-void
-_swrast_choose_line( GLcontext *ctx );
-
-void
-_swrast_add_spec_terms_line( GLcontext *ctx,
-			     const SWvertex *v0,
-			     const SWvertex *v1 );
-
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 S_LINES_H

+#define S_LINES_H

+

+#include "swrast.h"

+

+void

+_swrast_choose_line( struct gl_context *ctx );

+

+void

+_swrast_add_spec_terms_line( struct gl_context *ctx,

+			     const SWvertex *v0,

+			     const SWvertex *v1 );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_linetemp.h b/mesalib/src/mesa/swrast/s_linetemp.h
index 033431df2..bd94ca40a 100644
--- a/mesalib/src/mesa/swrast/s_linetemp.h
+++ b/mesalib/src/mesa/swrast/s_linetemp.h
@@ -1,402 +1,402 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0
- *
- * 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.
- */
-
-
-/*
- * Line Rasterizer Template
- *
- * This file is #include'd to generate custom line rasterizers.
- *
- * The following macros may be defined to indicate what auxillary information
- * must be interplated along the line:
- *    INTERP_Z        - if defined, interpolate Z values
- *    INTERP_ATTRIBS  - if defined, interpolate attribs (texcoords, varying, etc)
- *
- * When one can directly address pixels in the color buffer the following
- * macros can be defined and used to directly compute pixel addresses during
- * rasterization (see pixelPtr):
- *    PIXEL_TYPE          - the datatype of a pixel (GLubyte, GLushort, GLuint)
- *    BYTES_PER_ROW       - number of bytes per row in the color buffer
- *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where
- *                          Y==0 at bottom of screen and increases upward.
- *
- * Similarly, for direct depth buffer access, this type is used for depth
- * buffer addressing:
- *    DEPTH_TYPE          - either GLushort or GLuint
- *
- * Optionally, one may provide one-time setup code
- *    SETUP_CODE    - code which is to be executed once per line
- *
- * To actually "plot" each pixel the PLOT macro must be defined...
- *    PLOT(X,Y) - code to plot a pixel.  Example:
- *                if (Z < *zPtr) {
- *                   *zPtr = Z;
- *                   color = pack_rgb( FixedToInt(r0), FixedToInt(g0),
- *                                     FixedToInt(b0) );
- *                   put_pixel( X, Y, color );
- *                }
- *
- * This code was designed for the origin to be in the lower-left corner.
- *
- */
-
-
-static void
-NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
-{
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   SWspan span;
-   GLuint interpFlags = 0;
-   GLint x0 = (GLint) vert0->attrib[FRAG_ATTRIB_WPOS][0];
-   GLint x1 = (GLint) vert1->attrib[FRAG_ATTRIB_WPOS][0];
-   GLint y0 = (GLint) vert0->attrib[FRAG_ATTRIB_WPOS][1];
-   GLint y1 = (GLint) vert1->attrib[FRAG_ATTRIB_WPOS][1];
-   GLint dx, dy;
-   GLint numPixels;
-   GLint xstep, ystep;
-#if defined(DEPTH_TYPE)
-   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;
-   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
-   struct gl_renderbuffer *zrb = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
-#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
-   GLint zPtrXstep, zPtrYstep;
-   DEPTH_TYPE *zPtr;
-#elif defined(INTERP_Z)
-   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;
-#endif
-#ifdef PIXEL_ADDRESS
-   PIXEL_TYPE *pixelPtr;
-   GLint pixelXstep, pixelYstep;
-#endif
-
-#ifdef SETUP_CODE
-   SETUP_CODE
-#endif
-
-   (void) swrast;
-
-   /* Cull primitives with malformed coordinates.
-    */
-   {
-      GLfloat tmp = vert0->attrib[FRAG_ATTRIB_WPOS][0] + vert0->attrib[FRAG_ATTRIB_WPOS][1]
-                  + vert1->attrib[FRAG_ATTRIB_WPOS][0] + vert1->attrib[FRAG_ATTRIB_WPOS][1];
-      if (IS_INF_OR_NAN(tmp))
-	 return;
-   }
-
-   /*
-   printf("%s():\n", __FUNCTION__);
-   printf(" (%f, %f, %f) -> (%f, %f, %f)\n",
-          vert0->attrib[FRAG_ATTRIB_WPOS][0],
-          vert0->attrib[FRAG_ATTRIB_WPOS][1],
-          vert0->attrib[FRAG_ATTRIB_WPOS][2],
-          vert1->attrib[FRAG_ATTRIB_WPOS][0],
-          vert1->attrib[FRAG_ATTRIB_WPOS][1],
-          vert1->attrib[FRAG_ATTRIB_WPOS][2]);
-   printf(" (%d, %d, %d) -> (%d, %d, %d)\n",
-          vert0->color[0], vert0->color[1], vert0->color[2], 
-          vert1->color[0], vert1->color[1], vert1->color[2]);
-   printf(" (%d, %d, %d) -> (%d, %d, %d)\n",
-          vert0->specular[0], vert0->specular[1], vert0->specular[2], 
-          vert1->specular[0], vert1->specular[1], vert1->specular[2]);
-   */
-
-/*
- * Despite being clipped to the view volume, the line's window coordinates
- * may just lie outside the window bounds.  That is, if the legal window
- * coordinates are [0,W-1][0,H-1], it's possible for x==W and/or y==H.
- * This quick and dirty code nudges the endpoints inside the window if
- * necessary.
- */
-#ifdef CLIP_HACK
-   {
-      GLint w = ctx->DrawBuffer->Width;
-      GLint h = ctx->DrawBuffer->Height;
-      if ((x0==w) | (x1==w)) {
-         if ((x0==w) & (x1==w))
-           return;
-         x0 -= x0==w;
-         x1 -= x1==w;
-      }
-      if ((y0==h) | (y1==h)) {
-         if ((y0==h) & (y1==h))
-           return;
-         y0 -= y0==h;
-         y1 -= y1==h;
-      }
-   }
-#endif
-
-   dx = x1 - x0;
-   dy = y1 - y0;
-   if (dx == 0 && dy == 0)
-      return;
-
-   /*
-   printf("%s %d,%d  %g %g %g %g  %g %g %g %g\n", __FUNCTION__, dx, dy,
-          vert0->attrib[FRAG_ATTRIB_COL1][0],
-          vert0->attrib[FRAG_ATTRIB_COL1][1],
-          vert0->attrib[FRAG_ATTRIB_COL1][2],
-          vert0->attrib[FRAG_ATTRIB_COL1][3],
-          vert1->attrib[FRAG_ATTRIB_COL1][0],
-          vert1->attrib[FRAG_ATTRIB_COL1][1],
-          vert1->attrib[FRAG_ATTRIB_COL1][2],
-          vert1->attrib[FRAG_ATTRIB_COL1][3]);
-   */
-
-#ifdef DEPTH_TYPE
-   zPtr = (DEPTH_TYPE *) zrb->GetPointer(ctx, zrb, x0, y0);
-#endif
-#ifdef PIXEL_ADDRESS
-   pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);
-#endif
-
-   if (dx<0) {
-      dx = -dx;   /* make positive */
-      xstep = -1;
-#ifdef DEPTH_TYPE
-      zPtrXstep = -((GLint)sizeof(DEPTH_TYPE));
-#endif
-#ifdef PIXEL_ADDRESS
-      pixelXstep = -((GLint)sizeof(PIXEL_TYPE));
-#endif
-   }
-   else {
-      xstep = 1;
-#ifdef DEPTH_TYPE
-      zPtrXstep = ((GLint)sizeof(DEPTH_TYPE));
-#endif
-#ifdef PIXEL_ADDRESS
-      pixelXstep = ((GLint)sizeof(PIXEL_TYPE));
-#endif
-   }
-
-   if (dy<0) {
-      dy = -dy;   /* make positive */
-      ystep = -1;
-#ifdef DEPTH_TYPE
-      zPtrYstep = -((GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE)));
-#endif
-#ifdef PIXEL_ADDRESS
-      pixelYstep = BYTES_PER_ROW;
-#endif
-   }
-   else {
-      ystep = 1;
-#ifdef DEPTH_TYPE
-      zPtrYstep = (GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE));
-#endif
-#ifdef PIXEL_ADDRESS
-      pixelYstep = -(BYTES_PER_ROW);
-#endif
-   }
-
-   ASSERT(dx >= 0);
-   ASSERT(dy >= 0);
-
-   numPixels = MAX2(dx, dy);
-
-   /*
-    * Span setup: compute start and step values for all interpolated values.
-    */
-   interpFlags |= SPAN_RGBA;
-   if (ctx->Light.ShadeModel == GL_SMOOTH) {
-      span.red   = ChanToFixed(vert0->color[0]);
-      span.green = ChanToFixed(vert0->color[1]);
-      span.blue  = ChanToFixed(vert0->color[2]);
-      span.alpha = ChanToFixed(vert0->color[3]);
-      span.redStep   = (ChanToFixed(vert1->color[0]) - span.red  ) / numPixels;
-      span.greenStep = (ChanToFixed(vert1->color[1]) - span.green) / numPixels;
-      span.blueStep  = (ChanToFixed(vert1->color[2]) - span.blue ) / numPixels;
-      span.alphaStep = (ChanToFixed(vert1->color[3]) - span.alpha) / numPixels;
-   }
-   else {
-      span.red   = ChanToFixed(vert1->color[0]);
-      span.green = ChanToFixed(vert1->color[1]);
-      span.blue  = ChanToFixed(vert1->color[2]);
-      span.alpha = ChanToFixed(vert1->color[3]);
-      span.redStep   = 0;
-      span.greenStep = 0;
-      span.blueStep  = 0;
-      span.alphaStep = 0;
-   }
-#if defined(INTERP_Z) || defined(DEPTH_TYPE)
-   interpFlags |= SPAN_Z;
-   {
-      if (depthBits <= 16) {
-         span.z = FloatToFixed(vert0->attrib[FRAG_ATTRIB_WPOS][2]) + FIXED_HALF;
-         span.zStep = FloatToFixed(  vert1->attrib[FRAG_ATTRIB_WPOS][2]
-                                   - vert0->attrib[FRAG_ATTRIB_WPOS][2]) / numPixels;
-      }
-      else {
-         /* don't use fixed point */
-         span.z = (GLuint) vert0->attrib[FRAG_ATTRIB_WPOS][2];
-         span.zStep = (GLint) ((  vert1->attrib[FRAG_ATTRIB_WPOS][2]
-                                - vert0->attrib[FRAG_ATTRIB_WPOS][2]) / numPixels);
-      }
-   }
-#endif
-#if defined(INTERP_ATTRIBS)
-   {
-      const GLfloat invLen = 1.0F / numPixels;
-      const GLfloat invw0 = vert0->attrib[FRAG_ATTRIB_WPOS][3];
-      const GLfloat invw1 = vert1->attrib[FRAG_ATTRIB_WPOS][3];
-
-      span.attrStart[FRAG_ATTRIB_WPOS][3] = invw0;
-      span.attrStepX[FRAG_ATTRIB_WPOS][3] = (invw1 - invw0) * invLen;
-      span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0;
-
-      ATTRIB_LOOP_BEGIN
-         if (swrast->_InterpMode[attr] == GL_FLAT) {
-            COPY_4V(span.attrStart[attr], vert1->attrib[attr]);
-            ASSIGN_4V(span.attrStepX[attr], 0.0, 0.0, 0.0, 0.0);
-         }
-         else {
-            GLuint c;
-            for (c = 0; c < 4; c++) {
-               float da;
-               span.attrStart[attr][c] = invw0 * vert0->attrib[attr][c];
-               da = (invw1 * vert1->attrib[attr][c]) - span.attrStart[attr][c];
-               span.attrStepX[attr][c] = da * invLen;
-            }
-         }
-         ASSIGN_4V(span.attrStepY[attr], 0.0, 0.0, 0.0, 0.0);
-      ATTRIB_LOOP_END
-   }
-#endif
-
-   INIT_SPAN(span, GL_LINE);
-   span.end = numPixels;
-   span.interpMask = interpFlags;
-   span.arrayMask = SPAN_XY;
-
-   span.facing = swrast->PointLineFacing;
-
-
-   /*
-    * Draw
-    */
-
-   if (dx > dy) {
-      /*** X-major line ***/
-      GLint i;
-      GLint errorInc = dy+dy;
-      GLint error = errorInc-dx;
-      GLint errorDec = error-dx;
-
-      for (i = 0; i < dx; i++) {
-#ifdef DEPTH_TYPE
-         GLuint Z = FixedToDepth(span.z);
-#endif
-#ifdef PLOT
-         PLOT( x0, y0 );
-#else
-         span.array->x[i] = x0;
-         span.array->y[i] = y0;
-#endif
-         x0 += xstep;
-#ifdef DEPTH_TYPE
-         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);
-         span.z += span.zStep;
-#endif
-#ifdef PIXEL_ADDRESS
-         pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);
-#endif
-         if (error < 0) {
-            error += errorInc;
-         }
-         else {
-            error += errorDec;
-            y0 += ystep;
-#ifdef DEPTH_TYPE
-            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);
-#endif
-#ifdef PIXEL_ADDRESS
-            pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);
-#endif
-         }
-      }
-   }
-   else {
-      /*** Y-major line ***/
-      GLint i;
-      GLint errorInc = dx+dx;
-      GLint error = errorInc-dy;
-      GLint errorDec = error-dy;
-
-      for (i=0;i<dy;i++) {
-#ifdef DEPTH_TYPE
-         GLuint Z = FixedToDepth(span.z);
-#endif
-#ifdef PLOT
-         PLOT( x0, y0 );
-#else
-         span.array->x[i] = x0;
-         span.array->y[i] = y0;
-#endif
-         y0 += ystep;
-#ifdef DEPTH_TYPE
-         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);
-         span.z += span.zStep;
-#endif
-#ifdef PIXEL_ADDRESS
-         pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);
-#endif
-         if (error<0) {
-            error += errorInc;
-         }
-         else {
-            error += errorDec;
-            x0 += xstep;
-#ifdef DEPTH_TYPE
-            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);
-#endif
-#ifdef PIXEL_ADDRESS
-            pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);
-#endif
-         }
-      }
-   }
-
-#ifdef RENDER_SPAN
-   RENDER_SPAN( span );
-#endif
-
-   (void)span;
-
-}
-
-
-#undef NAME
-#undef INTERP_Z
-#undef INTERP_ATTRIBS
-#undef PIXEL_ADDRESS
-#undef PIXEL_TYPE
-#undef DEPTH_TYPE
-#undef BYTES_PER_ROW
-#undef SETUP_CODE
-#undef PLOT
-#undef CLIP_HACK
-#undef FixedToDepth
-#undef RENDER_SPAN
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.0

+ *

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

+ */

+

+

+/*

+ * Line Rasterizer Template

+ *

+ * This file is #include'd to generate custom line rasterizers.

+ *

+ * The following macros may be defined to indicate what auxillary information

+ * must be interplated along the line:

+ *    INTERP_Z        - if defined, interpolate Z values

+ *    INTERP_ATTRIBS  - if defined, interpolate attribs (texcoords, varying, etc)

+ *

+ * When one can directly address pixels in the color buffer the following

+ * macros can be defined and used to directly compute pixel addresses during

+ * rasterization (see pixelPtr):

+ *    PIXEL_TYPE          - the datatype of a pixel (GLubyte, GLushort, GLuint)

+ *    BYTES_PER_ROW       - number of bytes per row in the color buffer

+ *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where

+ *                          Y==0 at bottom of screen and increases upward.

+ *

+ * Similarly, for direct depth buffer access, this type is used for depth

+ * buffer addressing:

+ *    DEPTH_TYPE          - either GLushort or GLuint

+ *

+ * Optionally, one may provide one-time setup code

+ *    SETUP_CODE    - code which is to be executed once per line

+ *

+ * To actually "plot" each pixel the PLOT macro must be defined...

+ *    PLOT(X,Y) - code to plot a pixel.  Example:

+ *                if (Z < *zPtr) {

+ *                   *zPtr = Z;

+ *                   color = pack_rgb( FixedToInt(r0), FixedToInt(g0),

+ *                                     FixedToInt(b0) );

+ *                   put_pixel( X, Y, color );

+ *                }

+ *

+ * This code was designed for the origin to be in the lower-left corner.

+ *

+ */

+

+

+static void

+NAME( struct gl_context *ctx, const SWvertex *vert0, const SWvertex *vert1 )

+{

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   SWspan span;

+   GLuint interpFlags = 0;

+   GLint x0 = (GLint) vert0->attrib[FRAG_ATTRIB_WPOS][0];

+   GLint x1 = (GLint) vert1->attrib[FRAG_ATTRIB_WPOS][0];

+   GLint y0 = (GLint) vert0->attrib[FRAG_ATTRIB_WPOS][1];

+   GLint y1 = (GLint) vert1->attrib[FRAG_ATTRIB_WPOS][1];

+   GLint dx, dy;

+   GLint numPixels;

+   GLint xstep, ystep;

+#if defined(DEPTH_TYPE)

+   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;

+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;

+   struct gl_renderbuffer *zrb = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;

+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)

+   GLint zPtrXstep, zPtrYstep;

+   DEPTH_TYPE *zPtr;

+#elif defined(INTERP_Z)

+   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;

+#endif

+#ifdef PIXEL_ADDRESS

+   PIXEL_TYPE *pixelPtr;

+   GLint pixelXstep, pixelYstep;

+#endif

+

+#ifdef SETUP_CODE

+   SETUP_CODE

+#endif

+

+   (void) swrast;

+

+   /* Cull primitives with malformed coordinates.

+    */

+   {

+      GLfloat tmp = vert0->attrib[FRAG_ATTRIB_WPOS][0] + vert0->attrib[FRAG_ATTRIB_WPOS][1]

+                  + vert1->attrib[FRAG_ATTRIB_WPOS][0] + vert1->attrib[FRAG_ATTRIB_WPOS][1];

+      if (IS_INF_OR_NAN(tmp))

+	 return;

+   }

+

+   /*

+   printf("%s():\n", __FUNCTION__);

+   printf(" (%f, %f, %f) -> (%f, %f, %f)\n",

+          vert0->attrib[FRAG_ATTRIB_WPOS][0],

+          vert0->attrib[FRAG_ATTRIB_WPOS][1],

+          vert0->attrib[FRAG_ATTRIB_WPOS][2],

+          vert1->attrib[FRAG_ATTRIB_WPOS][0],

+          vert1->attrib[FRAG_ATTRIB_WPOS][1],

+          vert1->attrib[FRAG_ATTRIB_WPOS][2]);

+   printf(" (%d, %d, %d) -> (%d, %d, %d)\n",

+          vert0->color[0], vert0->color[1], vert0->color[2], 

+          vert1->color[0], vert1->color[1], vert1->color[2]);

+   printf(" (%d, %d, %d) -> (%d, %d, %d)\n",

+          vert0->specular[0], vert0->specular[1], vert0->specular[2], 

+          vert1->specular[0], vert1->specular[1], vert1->specular[2]);

+   */

+

+/*

+ * Despite being clipped to the view volume, the line's window coordinates

+ * may just lie outside the window bounds.  That is, if the legal window

+ * coordinates are [0,W-1][0,H-1], it's possible for x==W and/or y==H.

+ * This quick and dirty code nudges the endpoints inside the window if

+ * necessary.

+ */

+#ifdef CLIP_HACK

+   {

+      GLint w = ctx->DrawBuffer->Width;

+      GLint h = ctx->DrawBuffer->Height;

+      if ((x0==w) | (x1==w)) {

+         if ((x0==w) & (x1==w))

+           return;

+         x0 -= x0==w;

+         x1 -= x1==w;

+      }

+      if ((y0==h) | (y1==h)) {

+         if ((y0==h) & (y1==h))

+           return;

+         y0 -= y0==h;

+         y1 -= y1==h;

+      }

+   }

+#endif

+

+   dx = x1 - x0;

+   dy = y1 - y0;

+   if (dx == 0 && dy == 0)

+      return;

+

+   /*

+   printf("%s %d,%d  %g %g %g %g  %g %g %g %g\n", __FUNCTION__, dx, dy,

+          vert0->attrib[FRAG_ATTRIB_COL1][0],

+          vert0->attrib[FRAG_ATTRIB_COL1][1],

+          vert0->attrib[FRAG_ATTRIB_COL1][2],

+          vert0->attrib[FRAG_ATTRIB_COL1][3],

+          vert1->attrib[FRAG_ATTRIB_COL1][0],

+          vert1->attrib[FRAG_ATTRIB_COL1][1],

+          vert1->attrib[FRAG_ATTRIB_COL1][2],

+          vert1->attrib[FRAG_ATTRIB_COL1][3]);

+   */

+

+#ifdef DEPTH_TYPE

+   zPtr = (DEPTH_TYPE *) zrb->GetPointer(ctx, zrb, x0, y0);

+#endif

+#ifdef PIXEL_ADDRESS

+   pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);

+#endif

+

+   if (dx<0) {

+      dx = -dx;   /* make positive */

+      xstep = -1;

+#ifdef DEPTH_TYPE

+      zPtrXstep = -((GLint)sizeof(DEPTH_TYPE));

+#endif

+#ifdef PIXEL_ADDRESS

+      pixelXstep = -((GLint)sizeof(PIXEL_TYPE));

+#endif

+   }

+   else {

+      xstep = 1;

+#ifdef DEPTH_TYPE

+      zPtrXstep = ((GLint)sizeof(DEPTH_TYPE));

+#endif

+#ifdef PIXEL_ADDRESS

+      pixelXstep = ((GLint)sizeof(PIXEL_TYPE));

+#endif

+   }

+

+   if (dy<0) {

+      dy = -dy;   /* make positive */

+      ystep = -1;

+#ifdef DEPTH_TYPE

+      zPtrYstep = -((GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE)));

+#endif

+#ifdef PIXEL_ADDRESS

+      pixelYstep = BYTES_PER_ROW;

+#endif

+   }

+   else {

+      ystep = 1;

+#ifdef DEPTH_TYPE

+      zPtrYstep = (GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE));

+#endif

+#ifdef PIXEL_ADDRESS

+      pixelYstep = -(BYTES_PER_ROW);

+#endif

+   }

+

+   ASSERT(dx >= 0);

+   ASSERT(dy >= 0);

+

+   numPixels = MAX2(dx, dy);

+

+   /*

+    * Span setup: compute start and step values for all interpolated values.

+    */

+   interpFlags |= SPAN_RGBA;

+   if (ctx->Light.ShadeModel == GL_SMOOTH) {

+      span.red   = ChanToFixed(vert0->color[0]);

+      span.green = ChanToFixed(vert0->color[1]);

+      span.blue  = ChanToFixed(vert0->color[2]);

+      span.alpha = ChanToFixed(vert0->color[3]);

+      span.redStep   = (ChanToFixed(vert1->color[0]) - span.red  ) / numPixels;

+      span.greenStep = (ChanToFixed(vert1->color[1]) - span.green) / numPixels;

+      span.blueStep  = (ChanToFixed(vert1->color[2]) - span.blue ) / numPixels;

+      span.alphaStep = (ChanToFixed(vert1->color[3]) - span.alpha) / numPixels;

+   }

+   else {

+      span.red   = ChanToFixed(vert1->color[0]);

+      span.green = ChanToFixed(vert1->color[1]);

+      span.blue  = ChanToFixed(vert1->color[2]);

+      span.alpha = ChanToFixed(vert1->color[3]);

+      span.redStep   = 0;

+      span.greenStep = 0;

+      span.blueStep  = 0;

+      span.alphaStep = 0;

+   }

+#if defined(INTERP_Z) || defined(DEPTH_TYPE)

+   interpFlags |= SPAN_Z;

+   {

+      if (depthBits <= 16) {

+         span.z = FloatToFixed(vert0->attrib[FRAG_ATTRIB_WPOS][2]) + FIXED_HALF;

+         span.zStep = FloatToFixed(  vert1->attrib[FRAG_ATTRIB_WPOS][2]

+                                   - vert0->attrib[FRAG_ATTRIB_WPOS][2]) / numPixels;

+      }

+      else {

+         /* don't use fixed point */

+         span.z = (GLuint) vert0->attrib[FRAG_ATTRIB_WPOS][2];

+         span.zStep = (GLint) ((  vert1->attrib[FRAG_ATTRIB_WPOS][2]

+                                - vert0->attrib[FRAG_ATTRIB_WPOS][2]) / numPixels);

+      }

+   }

+#endif

+#if defined(INTERP_ATTRIBS)

+   {

+      const GLfloat invLen = 1.0F / numPixels;

+      const GLfloat invw0 = vert0->attrib[FRAG_ATTRIB_WPOS][3];

+      const GLfloat invw1 = vert1->attrib[FRAG_ATTRIB_WPOS][3];

+

+      span.attrStart[FRAG_ATTRIB_WPOS][3] = invw0;

+      span.attrStepX[FRAG_ATTRIB_WPOS][3] = (invw1 - invw0) * invLen;

+      span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0;

+

+      ATTRIB_LOOP_BEGIN

+         if (swrast->_InterpMode[attr] == GL_FLAT) {

+            COPY_4V(span.attrStart[attr], vert1->attrib[attr]);

+            ASSIGN_4V(span.attrStepX[attr], 0.0, 0.0, 0.0, 0.0);

+         }

+         else {

+            GLuint c;

+            for (c = 0; c < 4; c++) {

+               float da;

+               span.attrStart[attr][c] = invw0 * vert0->attrib[attr][c];

+               da = (invw1 * vert1->attrib[attr][c]) - span.attrStart[attr][c];

+               span.attrStepX[attr][c] = da * invLen;

+            }

+         }

+         ASSIGN_4V(span.attrStepY[attr], 0.0, 0.0, 0.0, 0.0);

+      ATTRIB_LOOP_END

+   }

+#endif

+

+   INIT_SPAN(span, GL_LINE);

+   span.end = numPixels;

+   span.interpMask = interpFlags;

+   span.arrayMask = SPAN_XY;

+

+   span.facing = swrast->PointLineFacing;

+

+

+   /*

+    * Draw

+    */

+

+   if (dx > dy) {

+      /*** X-major line ***/

+      GLint i;

+      GLint errorInc = dy+dy;

+      GLint error = errorInc-dx;

+      GLint errorDec = error-dx;

+

+      for (i = 0; i < dx; i++) {

+#ifdef DEPTH_TYPE

+         GLuint Z = FixedToDepth(span.z);

+#endif

+#ifdef PLOT

+         PLOT( x0, y0 );

+#else

+         span.array->x[i] = x0;

+         span.array->y[i] = y0;

+#endif

+         x0 += xstep;

+#ifdef DEPTH_TYPE

+         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);

+         span.z += span.zStep;

+#endif

+#ifdef PIXEL_ADDRESS

+         pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);

+#endif

+         if (error < 0) {

+            error += errorInc;

+         }

+         else {

+            error += errorDec;

+            y0 += ystep;

+#ifdef DEPTH_TYPE

+            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);

+#endif

+#ifdef PIXEL_ADDRESS

+            pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);

+#endif

+         }

+      }

+   }

+   else {

+      /*** Y-major line ***/

+      GLint i;

+      GLint errorInc = dx+dx;

+      GLint error = errorInc-dy;

+      GLint errorDec = error-dy;

+

+      for (i=0;i<dy;i++) {

+#ifdef DEPTH_TYPE

+         GLuint Z = FixedToDepth(span.z);

+#endif

+#ifdef PLOT

+         PLOT( x0, y0 );

+#else

+         span.array->x[i] = x0;

+         span.array->y[i] = y0;

+#endif

+         y0 += ystep;

+#ifdef DEPTH_TYPE

+         zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrYstep);

+         span.z += span.zStep;

+#endif

+#ifdef PIXEL_ADDRESS

+         pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelYstep);

+#endif

+         if (error<0) {

+            error += errorInc;

+         }

+         else {

+            error += errorDec;

+            x0 += xstep;

+#ifdef DEPTH_TYPE

+            zPtr = (DEPTH_TYPE *) ((GLubyte*) zPtr + zPtrXstep);

+#endif

+#ifdef PIXEL_ADDRESS

+            pixelPtr = (PIXEL_TYPE*) ((GLubyte*) pixelPtr + pixelXstep);

+#endif

+         }

+      }

+   }

+

+#ifdef RENDER_SPAN

+   RENDER_SPAN( span );

+#endif

+

+   (void)span;

+

+}

+

+

+#undef NAME

+#undef INTERP_Z

+#undef INTERP_ATTRIBS

+#undef PIXEL_ADDRESS

+#undef PIXEL_TYPE

+#undef DEPTH_TYPE

+#undef BYTES_PER_ROW

+#undef SETUP_CODE

+#undef PLOT

+#undef CLIP_HACK

+#undef FixedToDepth

+#undef RENDER_SPAN

diff --git a/mesalib/src/mesa/swrast/s_logic.c b/mesalib/src/mesa/swrast/s_logic.c
index c36a16e66..2f0c0ea7c 100644
--- a/mesalib/src/mesa/swrast/s_logic.c
+++ b/mesalib/src/mesa/swrast/s_logic.c
@@ -1,219 +1,219 @@
-/*
- * 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.
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_logic.h"
-#include "s_span.h"
-
-
-/**
- * We do all logic ops on 4-byte GLuints.
- * Depending on bytes per pixel, the mask array elements correspond to
- * 1, 2 or 4 GLuints.
- */
-#define LOGIC_OP_LOOP(MODE, MASKSTRIDE)		\
-do {						\
-   GLuint i;					\
-   switch (MODE) {				\
-      case GL_CLEAR:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = 0;			\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_SET:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~0;			\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_COPY:				\
-	 /* do nothing */			\
-	 break;					\
-      case GL_COPY_INVERTED:			\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~src[i];		\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_NOOP:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = dest[i];		\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_INVERT:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~dest[i];		\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_AND:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] &= dest[i];		\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_NAND:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~(src[i] & dest[i]);	\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_OR:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] |= dest[i];		\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_NOR:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~(src[i] | dest[i]);	\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_XOR:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] ^= dest[i];		\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_EQUIV:				\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~(src[i] ^ dest[i]);	\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_AND_REVERSE:			\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = src[i] & ~dest[i];	\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_AND_INVERTED:			\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~src[i] & dest[i];	\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_OR_REVERSE:			\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = src[i] | ~dest[i];	\
-	    }					\
-	 }					\
-	 break;					\
-      case GL_OR_INVERTED:			\
-         for (i = 0; i < n; i++) {		\
-	    if (mask[i / MASKSTRIDE]) {		\
-	       src[i] = ~src[i] | dest[i];	\
-	    }					\
-	 }					\
-	 break;					\
-      default:					\
-	 _mesa_problem(ctx, "bad logicop mode");\
-   }						\
-} while (0)
-
-
-
-static INLINE void
-logicop_uint1(GLcontext *ctx, GLuint n, GLuint src[], const GLuint dest[],
-              const GLubyte mask[])
-{
-   LOGIC_OP_LOOP(ctx->Color.LogicOp, 1);
-}
-
-
-static INLINE void
-logicop_uint2(GLcontext *ctx, GLuint n, GLuint src[], const GLuint dest[],
-              const GLubyte mask[])
-{
-   LOGIC_OP_LOOP(ctx->Color.LogicOp, 2);
-}
-
-
-static INLINE void
-logicop_uint4(GLcontext *ctx, GLuint n, GLuint src[], const GLuint dest[],
-              const GLubyte mask[])
-{
-   LOGIC_OP_LOOP(ctx->Color.LogicOp, 4);
-}
-
-
-
-/**
- * Apply the current logic operator to a span of RGBA pixels.
- * We can handle horizontal runs of pixels (spans) or arrays of x/y
- * pixel coordinates.
- */
-void
-_swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          SWspan *span)
-{
-   void *rbPixels;
-
-   ASSERT(span->end < MAX_WIDTH);
-   ASSERT(span->arrayMask & SPAN_RGBA);
-   ASSERT(rb->DataType == span->array->ChanType);
-
-   rbPixels = _swrast_get_dest_rgba(ctx, rb, span);
-
-   if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-      /* treat 4*GLubyte as GLuint */
-      logicop_uint1(ctx, span->end,
-                    (GLuint *) span->array->rgba8,
-                    (const GLuint *) rbPixels, span->array->mask);
-   }
-   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-      /* treat 2*GLushort as GLuint */
-      logicop_uint2(ctx, 2 * span->end,
-                    (GLuint *) span->array->rgba16,
-                    (const GLuint *) rbPixels, span->array->mask);
-   }
-   else {
-      logicop_uint4(ctx, 4 * span->end,
-                    (GLuint *) span->array->attribs[FRAG_ATTRIB_COL0],
-                    (const GLuint *) rbPixels, span->array->mask);
-   }
-}
+/*

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

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/macros.h"

+

+#include "s_context.h"

+#include "s_logic.h"

+#include "s_span.h"

+

+

+/**

+ * We do all logic ops on 4-byte GLuints.

+ * Depending on bytes per pixel, the mask array elements correspond to

+ * 1, 2 or 4 GLuints.

+ */

+#define LOGIC_OP_LOOP(MODE, MASKSTRIDE)		\

+do {						\

+   GLuint i;					\

+   switch (MODE) {				\

+      case GL_CLEAR:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = 0;			\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_SET:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~0;			\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_COPY:				\

+	 /* do nothing */			\

+	 break;					\

+      case GL_COPY_INVERTED:			\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~src[i];		\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_NOOP:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = dest[i];		\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_INVERT:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~dest[i];		\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_AND:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] &= dest[i];		\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_NAND:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~(src[i] & dest[i]);	\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_OR:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] |= dest[i];		\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_NOR:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~(src[i] | dest[i]);	\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_XOR:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] ^= dest[i];		\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_EQUIV:				\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~(src[i] ^ dest[i]);	\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_AND_REVERSE:			\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = src[i] & ~dest[i];	\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_AND_INVERTED:			\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~src[i] & dest[i];	\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_OR_REVERSE:			\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = src[i] | ~dest[i];	\

+	    }					\

+	 }					\

+	 break;					\

+      case GL_OR_INVERTED:			\

+         for (i = 0; i < n; i++) {		\

+	    if (mask[i / MASKSTRIDE]) {		\

+	       src[i] = ~src[i] | dest[i];	\

+	    }					\

+	 }					\

+	 break;					\

+      default:					\

+	 _mesa_problem(ctx, "bad logicop mode");\

+   }						\

+} while (0)

+

+

+

+static INLINE void

+logicop_uint1(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[],

+              const GLubyte mask[])

+{

+   LOGIC_OP_LOOP(ctx->Color.LogicOp, 1);

+}

+

+

+static INLINE void

+logicop_uint2(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[],

+              const GLubyte mask[])

+{

+   LOGIC_OP_LOOP(ctx->Color.LogicOp, 2);

+}

+

+

+static INLINE void

+logicop_uint4(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[],

+              const GLubyte mask[])

+{

+   LOGIC_OP_LOOP(ctx->Color.LogicOp, 4);

+}

+

+

+

+/**

+ * Apply the current logic operator to a span of RGBA pixels.

+ * We can handle horizontal runs of pixels (spans) or arrays of x/y

+ * pixel coordinates.

+ */

+void

+_swrast_logicop_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                          SWspan *span)

+{

+   void *rbPixels;

+

+   ASSERT(span->end < MAX_WIDTH);

+   ASSERT(span->arrayMask & SPAN_RGBA);

+   ASSERT(rb->DataType == span->array->ChanType);

+

+   rbPixels = _swrast_get_dest_rgba(ctx, rb, span);

+

+   if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+      /* treat 4*GLubyte as GLuint */

+      logicop_uint1(ctx, span->end,

+                    (GLuint *) span->array->rgba8,

+                    (const GLuint *) rbPixels, span->array->mask);

+   }

+   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+      /* treat 2*GLushort as GLuint */

+      logicop_uint2(ctx, 2 * span->end,

+                    (GLuint *) span->array->rgba16,

+                    (const GLuint *) rbPixels, span->array->mask);

+   }

+   else {

+      logicop_uint4(ctx, 4 * span->end,

+                    (GLuint *) span->array->attribs[FRAG_ATTRIB_COL0],

+                    (const GLuint *) rbPixels, span->array->mask);

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_logic.h b/mesalib/src/mesa/swrast/s_logic.h
index d60951334..39713b990 100644
--- a/mesalib/src/mesa/swrast/s_logic.h
+++ b/mesalib/src/mesa/swrast/s_logic.h
@@ -1,38 +1,40 @@
-/*
- * 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 S_LOGIC_H
-#define S_LOGIC_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-extern void
-_swrast_logicop_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          SWspan *span);
-
-
-#endif
+/*

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

+#define S_LOGIC_H

+

+

+#include "s_span.h"

+

+struct gl_context;

+struct gl_renderbuffer;

+

+extern void

+_swrast_logicop_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                          SWspan *span);

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_masking.c b/mesalib/src/mesa/swrast/s_masking.c
index e38d90f19..6ee29d4b3 100644
--- a/mesalib/src/mesa/swrast/s_masking.c
+++ b/mesalib/src/mesa/swrast/s_masking.c
@@ -1,103 +1,103 @@
-/*
- * 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.
- */
-
-
-/*
- * Implement the effect of glColorMask and glIndexMask in software.
- */
-
-
-#include "main/glheader.h"
-#include "main/macros.h"
-
-#include "s_context.h"
-#include "s_masking.h"
-#include "s_span.h"
-
-
-/**
- * Apply the color mask to a span of rgba values.
- */
-void
-_swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       SWspan *span, GLuint buf)
-{
-   const GLuint n = span->end;
-   void *rbPixels;
-
-   ASSERT(n < MAX_WIDTH);
-   ASSERT(span->arrayMask & SPAN_RGBA);
-   ASSERT(rb->DataType == span->array->ChanType);
-
-   rbPixels = _swrast_get_dest_rgba(ctx, rb, span);
-
-   /*
-    * Do component masking.
-    * Note that we're not using span->array->mask[] here.  We could...
-    */
-   if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-      /* treat 4xGLubyte as 1xGLuint */
-      const GLuint srcMask = *((GLuint *) ctx->Color.ColorMask[buf]);
-      const GLuint dstMask = ~srcMask;
-      const GLuint *dst = (const GLuint *) rbPixels;
-      GLuint *src = (GLuint *) span->array->rgba8;
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         src[i] = (src[i] & srcMask) | (dst[i] & dstMask);
-      }
-   }
-   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-      /* 2-byte components */
-      /* XXX try to use 64-bit arithmetic someday */
-      const GLushort rMask = ctx->Color.ColorMask[buf][RCOMP] ? 0xffff : 0x0;
-      const GLushort gMask = ctx->Color.ColorMask[buf][GCOMP] ? 0xffff : 0x0;
-      const GLushort bMask = ctx->Color.ColorMask[buf][BCOMP] ? 0xffff : 0x0;
-      const GLushort aMask = ctx->Color.ColorMask[buf][ACOMP] ? 0xffff : 0x0;
-      const GLushort (*dst)[4] = (const GLushort (*)[4]) rbPixels;
-      GLushort (*src)[4] = span->array->rgba16;
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         src[i][RCOMP] = (src[i][RCOMP] & rMask) | (dst[i][RCOMP] & ~rMask);
-         src[i][GCOMP] = (src[i][GCOMP] & gMask) | (dst[i][GCOMP] & ~gMask);
-         src[i][BCOMP] = (src[i][BCOMP] & bMask) | (dst[i][BCOMP] & ~bMask);
-         src[i][ACOMP] = (src[i][ACOMP] & aMask) | (dst[i][ACOMP] & ~aMask);
-      }
-   }
-   else {
-      /* 4-byte components */
-      const GLuint rMask = ctx->Color.ColorMask[buf][RCOMP] ? ~0x0 : 0x0;
-      const GLuint gMask = ctx->Color.ColorMask[buf][GCOMP] ? ~0x0 : 0x0;
-      const GLuint bMask = ctx->Color.ColorMask[buf][BCOMP] ? ~0x0 : 0x0;
-      const GLuint aMask = ctx->Color.ColorMask[buf][ACOMP] ? ~0x0 : 0x0;
-      const GLuint (*dst)[4] = (const GLuint (*)[4]) rbPixels;
-      GLuint (*src)[4] = (GLuint (*)[4]) span->array->attribs[FRAG_ATTRIB_COL0];
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         src[i][RCOMP] = (src[i][RCOMP] & rMask) | (dst[i][RCOMP] & ~rMask);
-         src[i][GCOMP] = (src[i][GCOMP] & gMask) | (dst[i][GCOMP] & ~gMask);
-         src[i][BCOMP] = (src[i][BCOMP] & bMask) | (dst[i][BCOMP] & ~bMask);
-         src[i][ACOMP] = (src[i][ACOMP] & aMask) | (dst[i][ACOMP] & ~aMask);
-      }
-   }
-}
+/*

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

+ */

+

+

+/*

+ * Implement the effect of glColorMask and glIndexMask in software.

+ */

+

+

+#include "main/glheader.h"

+#include "main/macros.h"

+

+#include "s_context.h"

+#include "s_masking.h"

+#include "s_span.h"

+

+

+/**

+ * Apply the color mask to a span of rgba values.

+ */

+void

+_swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       SWspan *span, GLuint buf)

+{

+   const GLuint n = span->end;

+   void *rbPixels;

+

+   ASSERT(n < MAX_WIDTH);

+   ASSERT(span->arrayMask & SPAN_RGBA);

+   ASSERT(rb->DataType == span->array->ChanType);

+

+   rbPixels = _swrast_get_dest_rgba(ctx, rb, span);

+

+   /*

+    * Do component masking.

+    * Note that we're not using span->array->mask[] here.  We could...

+    */

+   if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+      /* treat 4xGLubyte as 1xGLuint */

+      const GLuint srcMask = *((GLuint *) ctx->Color.ColorMask[buf]);

+      const GLuint dstMask = ~srcMask;

+      const GLuint *dst = (const GLuint *) rbPixels;

+      GLuint *src = (GLuint *) span->array->rgba8;

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         src[i] = (src[i] & srcMask) | (dst[i] & dstMask);

+      }

+   }

+   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+      /* 2-byte components */

+      /* XXX try to use 64-bit arithmetic someday */

+      const GLushort rMask = ctx->Color.ColorMask[buf][RCOMP] ? 0xffff : 0x0;

+      const GLushort gMask = ctx->Color.ColorMask[buf][GCOMP] ? 0xffff : 0x0;

+      const GLushort bMask = ctx->Color.ColorMask[buf][BCOMP] ? 0xffff : 0x0;

+      const GLushort aMask = ctx->Color.ColorMask[buf][ACOMP] ? 0xffff : 0x0;

+      const GLushort (*dst)[4] = (const GLushort (*)[4]) rbPixels;

+      GLushort (*src)[4] = span->array->rgba16;

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         src[i][RCOMP] = (src[i][RCOMP] & rMask) | (dst[i][RCOMP] & ~rMask);

+         src[i][GCOMP] = (src[i][GCOMP] & gMask) | (dst[i][GCOMP] & ~gMask);

+         src[i][BCOMP] = (src[i][BCOMP] & bMask) | (dst[i][BCOMP] & ~bMask);

+         src[i][ACOMP] = (src[i][ACOMP] & aMask) | (dst[i][ACOMP] & ~aMask);

+      }

+   }

+   else {

+      /* 4-byte components */

+      const GLuint rMask = ctx->Color.ColorMask[buf][RCOMP] ? ~0x0 : 0x0;

+      const GLuint gMask = ctx->Color.ColorMask[buf][GCOMP] ? ~0x0 : 0x0;

+      const GLuint bMask = ctx->Color.ColorMask[buf][BCOMP] ? ~0x0 : 0x0;

+      const GLuint aMask = ctx->Color.ColorMask[buf][ACOMP] ? ~0x0 : 0x0;

+      const GLuint (*dst)[4] = (const GLuint (*)[4]) rbPixels;

+      GLuint (*src)[4] = (GLuint (*)[4]) span->array->attribs[FRAG_ATTRIB_COL0];

+      GLuint i;

+      for (i = 0; i < n; i++) {

+         src[i][RCOMP] = (src[i][RCOMP] & rMask) | (dst[i][RCOMP] & ~rMask);

+         src[i][GCOMP] = (src[i][GCOMP] & gMask) | (dst[i][GCOMP] & ~gMask);

+         src[i][BCOMP] = (src[i][BCOMP] & bMask) | (dst[i][BCOMP] & ~bMask);

+         src[i][ACOMP] = (src[i][ACOMP] & aMask) | (dst[i][ACOMP] & ~aMask);

+      }

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_masking.h b/mesalib/src/mesa/swrast/s_masking.h
index cb000da0f..7ab02cc7a 100644
--- a/mesalib/src/mesa/swrast/s_masking.h
+++ b/mesalib/src/mesa/swrast/s_masking.h
@@ -1,38 +1,41 @@
-/*
- * 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 S_MASKING_H
-#define S_MASKING_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern void
-_swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       SWspan *span, GLuint buf);
-
-#endif
+/*

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

+#define S_MASKING_H

+

+

+#include "main/glheader.h"

+#include "s_span.h"

+

+struct gl_context;

+struct gl_renderbuffer;

+

+

+extern void

+_swrast_mask_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       SWspan *span, GLuint buf);

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_points.c b/mesalib/src/mesa/swrast/s_points.c
index 12431662c..a46be8f58 100644
--- a/mesalib/src/mesa/swrast/s_points.c
+++ b/mesalib/src/mesa/swrast/s_points.c
@@ -1,572 +1,572 @@
-/*
- * 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/colormac.h"
-#include "main/macros.h"
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_points.h"
-#include "s_span.h"
-
-
-/**
- * Used to cull points with invalid coords
- */
-#define CULL_INVALID(V)                              \
-   do {                                              \
-      float tmp = (V)->attrib[FRAG_ATTRIB_WPOS][0]   \
-                + (V)->attrib[FRAG_ATTRIB_WPOS][1];  \
-      if (IS_INF_OR_NAN(tmp))                        \
-	 return;                                     \
-   } while(0)
-
-
-
-/**
- * Get/compute the point size.
- * The size may come from a vertex shader, or computed with attentuation
- * or just the glPointSize value.
- * Must also clamp to user-defined range and implmentation limits.
- */
-static INLINE GLfloat
-get_size(const GLcontext *ctx, const SWvertex *vert, GLboolean smoothed)
-{
-   GLfloat size;
-
-   if (ctx->Point._Attenuated || ctx->VertexProgram.PointSizeEnabled) {
-      /* use vertex's point size */
-      size = vert->pointSize;
-   }
-   else {
-      /* use constant point size */
-      size = ctx->Point.Size;
-   }
-   /* always clamp to user-specified limits */
-   size = CLAMP(size, ctx->Point.MinSize, ctx->Point.MaxSize);
-   /* clamp to implementation limits */
-   if (smoothed)
-      size = CLAMP(size, ctx->Const.MinPointSizeAA, ctx->Const.MaxPointSizeAA);
-   else
-      size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize);
-
-   return size;
-}
-
-
-/**
- * Draw a point sprite
- */
-static void
-sprite_point(GLcontext *ctx, const SWvertex *vert)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   SWspan span;
-   GLfloat size;
-   GLuint tCoords[MAX_TEXTURE_COORD_UNITS + 1];
-   GLuint numTcoords = 0;
-   GLfloat t0, dtdy;
-
-   CULL_INVALID(vert);
-
-   /* z coord */
-   if (ctx->DrawBuffer->Visual.depthBits <= 16)
-      span.z = FloatToFixed(vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-   else
-      span.z = (GLuint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-   span.zStep = 0;
-
-   size = get_size(ctx, vert, GL_FALSE);
-
-   /* span init */
-   INIT_SPAN(span, GL_POINT);
-   span.interpMask = SPAN_Z | SPAN_RGBA;
-
-   span.facing = swrast->PointLineFacing;
-
-   span.red   = ChanToFixed(vert->color[0]);
-   span.green = ChanToFixed(vert->color[1]);
-   span.blue  = ChanToFixed(vert->color[2]);
-   span.alpha = ChanToFixed(vert->color[3]);
-   span.redStep = 0;
-   span.greenStep = 0;
-   span.blueStep = 0;
-   span.alphaStep = 0;
-
-   /* need these for fragment programs */
-   span.attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;
-   span.attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;
-   span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;
-
-   {
-      GLfloat s, r, dsdx;
-
-      /* texcoord / pointcoord interpolants */
-      s = 0.0F;
-      dsdx = 1.0F / size;
-      if (ctx->Point.SpriteOrigin == GL_LOWER_LEFT) {
-         dtdy = 1.0F / size;
-         t0 = 0.5F * dtdy;
-      }
-      else {
-         /* GL_UPPER_LEFT */
-         dtdy = -1.0F / size;
-         t0 = 1.0F + 0.5F * dtdy;
-      }
-
-      ATTRIB_LOOP_BEGIN
-         if (attr >= FRAG_ATTRIB_TEX0 && attr <= FRAG_ATTRIB_TEX7) {
-            /* a texcoord attribute */
-            const GLuint u = attr - FRAG_ATTRIB_TEX0;
-            ASSERT(u < Elements(ctx->Point.CoordReplace));
-            if (ctx->Point.CoordReplace[u]) {
-               tCoords[numTcoords++] = attr;
-
-               if (ctx->Point.SpriteRMode == GL_ZERO)
-                  r = 0.0F;
-               else if (ctx->Point.SpriteRMode == GL_S)
-                  r = vert->attrib[attr][0];
-               else /* GL_R */
-                  r = vert->attrib[attr][2];
-
-               span.attrStart[attr][0] = s;
-               span.attrStart[attr][1] = 0.0; /* overwritten below */
-               span.attrStart[attr][2] = r;
-               span.attrStart[attr][3] = 1.0;
-
-               span.attrStepX[attr][0] = dsdx;
-               span.attrStepX[attr][1] = 0.0;
-               span.attrStepX[attr][2] = 0.0;
-               span.attrStepX[attr][3] = 0.0;
-
-               span.attrStepY[attr][0] = 0.0;
-               span.attrStepY[attr][1] = dtdy;
-               span.attrStepY[attr][2] = 0.0;
-               span.attrStepY[attr][3] = 0.0;
-
-               continue;
-            }
-         }
-         else if (attr == FRAG_ATTRIB_PNTC) {
-            /* GLSL gl_PointCoord.xy (.zw undefined) */
-            span.attrStart[FRAG_ATTRIB_PNTC][0] = 0.0;
-            span.attrStart[FRAG_ATTRIB_PNTC][1] = 0.0; /* t0 set below */
-            span.attrStepX[FRAG_ATTRIB_PNTC][0] = dsdx;
-            span.attrStepX[FRAG_ATTRIB_PNTC][1] = 0.0;
-            span.attrStepY[FRAG_ATTRIB_PNTC][0] = 0.0;
-            span.attrStepY[FRAG_ATTRIB_PNTC][1] = dtdy;
-            tCoords[numTcoords++] = FRAG_ATTRIB_PNTC;
-            continue;
-         }
-         /* use vertex's texcoord/attrib */
-         COPY_4V(span.attrStart[attr], vert->attrib[attr]);
-         ASSIGN_4V(span.attrStepX[attr], 0, 0, 0, 0);
-         ASSIGN_4V(span.attrStepY[attr], 0, 0, 0, 0);
-      ATTRIB_LOOP_END;
-   }
-
-   /* compute pos, bounds and render */
-   {
-      const GLfloat x = vert->attrib[FRAG_ATTRIB_WPOS][0];
-      const GLfloat y = vert->attrib[FRAG_ATTRIB_WPOS][1];
-      GLint iSize = (GLint) (size + 0.5F);
-      GLint xmin, xmax, ymin, ymax, iy;
-      GLint iRadius;
-      GLfloat tcoord = t0;
-
-      iSize = MAX2(1, iSize);
-      iRadius = iSize / 2;
-
-      if (iSize & 1) {
-         /* odd size */
-         xmin = (GLint) (x - iRadius);
-         xmax = (GLint) (x + iRadius);
-         ymin = (GLint) (y - iRadius);
-         ymax = (GLint) (y + iRadius);
-      }
-      else {
-         /* even size */
-         /* 0.501 factor allows conformance to pass */
-         xmin = (GLint) (x + 0.501) - iRadius;
-         xmax = xmin + iSize - 1;
-         ymin = (GLint) (y + 0.501) - iRadius;
-         ymax = ymin + iSize - 1;
-      }
-
-      /* render spans */
-      for (iy = ymin; iy <= ymax; iy++) {
-         GLuint i;
-         /* setup texcoord T for this row */
-         for (i = 0; i < numTcoords; i++) {
-            span.attrStart[tCoords[i]][1] = tcoord;
-         }
-
-         /* these might get changed by span clipping */
-         span.x = xmin;
-         span.y = iy;
-         span.end = xmax - xmin + 1;
-
-         _swrast_write_rgba_span(ctx, &span);
-
-         tcoord += dtdy;
-      }
-   }
-}
-
-
-/**
- * Draw smooth/antialiased point.  RGB or CI mode.
- */
-static void
-smooth_point(GLcontext *ctx, const SWvertex *vert)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   SWspan span;
-   GLfloat size, alphaAtten;
-
-   CULL_INVALID(vert);
-
-   /* z coord */
-   if (ctx->DrawBuffer->Visual.depthBits <= 16)
-      span.z = FloatToFixed(vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-   else
-      span.z = (GLuint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-   span.zStep = 0;
-
-   size = get_size(ctx, vert, GL_TRUE);
-
-   /* alpha attenuation / fade factor */
-   if (ctx->Multisample._Enabled) {
-      if (vert->pointSize >= ctx->Point.Threshold) {
-         alphaAtten = 1.0F;
-      }
-      else {
-         GLfloat dsize = vert->pointSize / ctx->Point.Threshold;
-         alphaAtten = dsize * dsize;
-      }
-   }
-   else {
-      alphaAtten = 1.0;
-   }
-   (void) alphaAtten; /* not used */
-
-   /* span init */
-   INIT_SPAN(span, GL_POINT);
-   span.interpMask = SPAN_Z | SPAN_RGBA;
-   span.arrayMask = SPAN_COVERAGE | SPAN_MASK;
-
-   span.facing = swrast->PointLineFacing;
-
-   span.red   = ChanToFixed(vert->color[0]);
-   span.green = ChanToFixed(vert->color[1]);
-   span.blue  = ChanToFixed(vert->color[2]);
-   span.alpha = ChanToFixed(vert->color[3]);
-   span.redStep = 0;
-   span.greenStep = 0;
-   span.blueStep = 0;
-   span.alphaStep = 0;
-
-   /* need these for fragment programs */
-   span.attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;
-   span.attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;
-   span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;
-
-   ATTRIB_LOOP_BEGIN
-      COPY_4V(span.attrStart[attr], vert->attrib[attr]);
-      ASSIGN_4V(span.attrStepX[attr], 0, 0, 0, 0);
-      ASSIGN_4V(span.attrStepY[attr], 0, 0, 0, 0);
-   ATTRIB_LOOP_END
-
-   /* compute pos, bounds and render */
-   {
-      const GLfloat x = vert->attrib[FRAG_ATTRIB_WPOS][0];
-      const GLfloat y = vert->attrib[FRAG_ATTRIB_WPOS][1];
-      const GLfloat radius = 0.5F * size;
-      const GLfloat rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */
-      const GLfloat rmax = radius + 0.7071F;
-      const GLfloat rmin2 = MAX2(0.0F, rmin * rmin);
-      const GLfloat rmax2 = rmax * rmax;
-      const GLfloat cscale = 1.0F / (rmax2 - rmin2);
-      const GLint xmin = (GLint) (x - radius);
-      const GLint xmax = (GLint) (x + radius);
-      const GLint ymin = (GLint) (y - radius);
-      const GLint ymax = (GLint) (y + radius);
-      GLint ix, iy;
-
-      for (iy = ymin; iy <= ymax; iy++) {
-
-         /* these might get changed by span clipping */
-         span.x = xmin;
-         span.y = iy;
-         span.end = xmax - xmin + 1;
-
-         /* compute coverage for each pixel in span */
-         for (ix = xmin; ix <= xmax; ix++) {
-            const GLfloat dx = ix - x + 0.5F;
-            const GLfloat dy = iy - y + 0.5F;
-            const GLfloat dist2 = dx * dx + dy * dy;
-            GLfloat coverage;
-
-            if (dist2 < rmax2) {
-               if (dist2 >= rmin2) {
-                  /* compute partial coverage */
-                  coverage = 1.0F - (dist2 - rmin2) * cscale;
-               }
-               else {
-                  /* full coverage */
-                  coverage = 1.0F;
-               }
-               span.array->mask[ix - xmin] = 1;
-            }
-            else {
-               /* zero coverage - fragment outside the radius */
-               coverage = 0.0;
-               span.array->mask[ix - xmin] = 0;
-            }
-            span.array->coverage[ix - xmin] = coverage;
-         }
-
-         /* render span */
-         _swrast_write_rgba_span(ctx, &span);
-
-      }
-   }
-}
-
-
-/**
- * Draw large (size >= 1) non-AA point.  RGB or CI mode.
- */
-static void
-large_point(GLcontext *ctx, const SWvertex *vert)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   SWspan span;
-   GLfloat size;
-
-   CULL_INVALID(vert);
-
-   /* z coord */
-   if (ctx->DrawBuffer->Visual.depthBits <= 16)
-      span.z = FloatToFixed(vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-   else
-      span.z = (GLuint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-   span.zStep = 0;
-
-   size = get_size(ctx, vert, GL_FALSE);
-
-   /* span init */
-   INIT_SPAN(span, GL_POINT);
-   span.arrayMask = SPAN_XY;
-   span.facing = swrast->PointLineFacing;
-
-   span.interpMask = SPAN_Z | SPAN_RGBA;
-   span.red   = ChanToFixed(vert->color[0]);
-   span.green = ChanToFixed(vert->color[1]);
-   span.blue  = ChanToFixed(vert->color[2]);
-   span.alpha = ChanToFixed(vert->color[3]);
-   span.redStep = 0;
-   span.greenStep = 0;
-   span.blueStep = 0;
-   span.alphaStep = 0;
-
-   /* need these for fragment programs */
-   span.attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;
-   span.attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;
-   span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;
-
-   ATTRIB_LOOP_BEGIN
-      COPY_4V(span.attrStart[attr], vert->attrib[attr]);
-      ASSIGN_4V(span.attrStepX[attr], 0, 0, 0, 0);
-      ASSIGN_4V(span.attrStepY[attr], 0, 0, 0, 0);
-   ATTRIB_LOOP_END
-
-   /* compute pos, bounds and render */
-   {
-      const GLfloat x = vert->attrib[FRAG_ATTRIB_WPOS][0];
-      const GLfloat y = vert->attrib[FRAG_ATTRIB_WPOS][1];
-      GLint iSize = (GLint) (size + 0.5F);
-      GLint xmin, xmax, ymin, ymax, ix, iy;
-      GLint iRadius;
-
-      iSize = MAX2(1, iSize);
-      iRadius = iSize / 2;
-
-      if (iSize & 1) {
-         /* odd size */
-         xmin = (GLint) (x - iRadius);
-         xmax = (GLint) (x + iRadius);
-         ymin = (GLint) (y - iRadius);
-         ymax = (GLint) (y + iRadius);
-      }
-      else {
-         /* even size */
-         /* 0.501 factor allows conformance to pass */
-         xmin = (GLint) (x + 0.501) - iRadius;
-         xmax = xmin + iSize - 1;
-         ymin = (GLint) (y + 0.501) - iRadius;
-         ymax = ymin + iSize - 1;
-      }
-
-      /* generate fragments */
-      span.end = 0;
-      for (iy = ymin; iy <= ymax; iy++) {
-         for (ix = xmin; ix <= xmax; ix++) {
-            span.array->x[span.end] = ix;
-            span.array->y[span.end] = iy;
-            span.end++;
-         }
-      }
-      assert(span.end <= MAX_WIDTH);
-      _swrast_write_rgba_span(ctx, &span);
-   }
-}
-
-
-/**
- * Draw size=1, single-pixel point
- */
-static void
-pixel_point(GLcontext *ctx, const SWvertex *vert)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   /*
-    * Note that unlike the other functions, we put single-pixel points
-    * into a special span array in order to render as many points as
-    * possible with a single _swrast_write_rgba_span() call.
-    */
-   SWspan *span = &(swrast->PointSpan);
-   GLuint count;
-
-   CULL_INVALID(vert);
-
-   /* Span init */
-   span->interpMask = 0;
-   span->arrayMask = SPAN_XY | SPAN_Z;
-   span->arrayMask |= SPAN_RGBA;
-   /*span->arrayMask |= SPAN_LAMBDA;*/
-   span->arrayAttribs = swrast->_ActiveAttribMask; /* we'll produce these vals */
-
-   /* need these for fragment programs */
-   span->attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;
-   span->attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;
-   span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;
-
-   /* check if we need to flush */
-   if (span->end >= MAX_WIDTH ||
-       (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT)) ||
-       span->facing != swrast->PointLineFacing) {
-      if (span->end > 0) {
-	 _swrast_write_rgba_span(ctx, span);
-         span->end = 0;
-      }
-   }
-
-   count = span->end;
-
-   span->facing = swrast->PointLineFacing;
-
-   /* fragment attributes */
-   span->array->rgba[count][RCOMP] = vert->color[0];
-   span->array->rgba[count][GCOMP] = vert->color[1];
-   span->array->rgba[count][BCOMP] = vert->color[2];
-   span->array->rgba[count][ACOMP] = vert->color[3];
-
-   ATTRIB_LOOP_BEGIN
-      COPY_4V(span->array->attribs[attr][count], vert->attrib[attr]);
-   ATTRIB_LOOP_END
-
-   /* fragment position */
-   span->array->x[count] = (GLint) vert->attrib[FRAG_ATTRIB_WPOS][0];
-   span->array->y[count] = (GLint) vert->attrib[FRAG_ATTRIB_WPOS][1];
-   span->array->z[count] = (GLint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
-
-   span->end = count + 1;
-   ASSERT(span->end <= MAX_WIDTH);
-}
-
-
-/**
- * Add specular color to primary color, draw point, restore original
- * primary color.
- */
-void
-_swrast_add_spec_terms_point(GLcontext *ctx, const SWvertex *v0)
-{
-   SWvertex *ncv0 = (SWvertex *) v0; /* cast away const */
-   GLfloat rSum, gSum, bSum;
-   GLchan cSave[4];
-
-   /* save */
-   COPY_CHAN4(cSave, ncv0->color);
-   /* sum */
-   rSum = CHAN_TO_FLOAT(ncv0->color[0]) + ncv0->attrib[FRAG_ATTRIB_COL1][0];
-   gSum = CHAN_TO_FLOAT(ncv0->color[1]) + ncv0->attrib[FRAG_ATTRIB_COL1][1];
-   bSum = CHAN_TO_FLOAT(ncv0->color[2]) + ncv0->attrib[FRAG_ATTRIB_COL1][2];
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[0], rSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[1], gSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[2], bSum);
-   /* draw */
-   SWRAST_CONTEXT(ctx)->SpecPoint(ctx, ncv0);
-   /* restore */
-   COPY_CHAN4(ncv0->color, cSave);
-}
-
-
-/**
- * Examine current state to determine which point drawing function to use.
- */
-void
-_swrast_choose_point(GLcontext *ctx)
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLfloat size = CLAMP(ctx->Point.Size,
-                              ctx->Point.MinSize,
-                              ctx->Point.MaxSize);
-
-   if (ctx->RenderMode == GL_RENDER) {
-      if (ctx->Point.PointSprite) {
-         swrast->Point = sprite_point;
-      }
-      else if (ctx->Point.SmoothFlag) {
-         swrast->Point = smooth_point;
-      }
-      else if (size > 1.0 ||
-               ctx->Point._Attenuated ||
-               ctx->VertexProgram.PointSizeEnabled) {
-         swrast->Point = large_point;
-      }
-      else {
-         swrast->Point = pixel_point;
-      }
-   }
-   else if (ctx->RenderMode == GL_FEEDBACK) {
-      swrast->Point = _swrast_feedback_point;
-   }
-   else {
-      /* GL_SELECT mode */
-      swrast->Point = _swrast_select_point;
-   }
-}
+/*

+ * 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/colormac.h"

+#include "main/macros.h"

+#include "s_context.h"

+#include "s_feedback.h"

+#include "s_points.h"

+#include "s_span.h"

+

+

+/**

+ * Used to cull points with invalid coords

+ */

+#define CULL_INVALID(V)                              \

+   do {                                              \

+      float tmp = (V)->attrib[FRAG_ATTRIB_WPOS][0]   \

+                + (V)->attrib[FRAG_ATTRIB_WPOS][1];  \

+      if (IS_INF_OR_NAN(tmp))                        \

+	 return;                                     \

+   } while(0)

+

+

+

+/**

+ * Get/compute the point size.

+ * The size may come from a vertex shader, or computed with attentuation

+ * or just the glPointSize value.

+ * Must also clamp to user-defined range and implmentation limits.

+ */

+static INLINE GLfloat

+get_size(const struct gl_context *ctx, const SWvertex *vert, GLboolean smoothed)

+{

+   GLfloat size;

+

+   if (ctx->Point._Attenuated || ctx->VertexProgram.PointSizeEnabled) {

+      /* use vertex's point size */

+      size = vert->pointSize;

+   }

+   else {

+      /* use constant point size */

+      size = ctx->Point.Size;

+   }

+   /* always clamp to user-specified limits */

+   size = CLAMP(size, ctx->Point.MinSize, ctx->Point.MaxSize);

+   /* clamp to implementation limits */

+   if (smoothed)

+      size = CLAMP(size, ctx->Const.MinPointSizeAA, ctx->Const.MaxPointSizeAA);

+   else

+      size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize);

+

+   return size;

+}

+

+

+/**

+ * Draw a point sprite

+ */

+static void

+sprite_point(struct gl_context *ctx, const SWvertex *vert)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   SWspan span;

+   GLfloat size;

+   GLuint tCoords[MAX_TEXTURE_COORD_UNITS + 1];

+   GLuint numTcoords = 0;

+   GLfloat t0, dtdy;

+

+   CULL_INVALID(vert);

+

+   /* z coord */

+   if (ctx->DrawBuffer->Visual.depthBits <= 16)

+      span.z = FloatToFixed(vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+   else

+      span.z = (GLuint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+   span.zStep = 0;

+

+   size = get_size(ctx, vert, GL_FALSE);

+

+   /* span init */

+   INIT_SPAN(span, GL_POINT);

+   span.interpMask = SPAN_Z | SPAN_RGBA;

+

+   span.facing = swrast->PointLineFacing;

+

+   span.red   = ChanToFixed(vert->color[0]);

+   span.green = ChanToFixed(vert->color[1]);

+   span.blue  = ChanToFixed(vert->color[2]);

+   span.alpha = ChanToFixed(vert->color[3]);

+   span.redStep = 0;

+   span.greenStep = 0;

+   span.blueStep = 0;

+   span.alphaStep = 0;

+

+   /* need these for fragment programs */

+   span.attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;

+   span.attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;

+   span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;

+

+   {

+      GLfloat s, r, dsdx;

+

+      /* texcoord / pointcoord interpolants */

+      s = 0.0F;

+      dsdx = 1.0F / size;

+      if (ctx->Point.SpriteOrigin == GL_LOWER_LEFT) {

+         dtdy = 1.0F / size;

+         t0 = 0.5F * dtdy;

+      }

+      else {

+         /* GL_UPPER_LEFT */

+         dtdy = -1.0F / size;

+         t0 = 1.0F + 0.5F * dtdy;

+      }

+

+      ATTRIB_LOOP_BEGIN

+         if (attr >= FRAG_ATTRIB_TEX0 && attr <= FRAG_ATTRIB_TEX7) {

+            /* a texcoord attribute */

+            const GLuint u = attr - FRAG_ATTRIB_TEX0;

+            ASSERT(u < Elements(ctx->Point.CoordReplace));

+            if (ctx->Point.CoordReplace[u]) {

+               tCoords[numTcoords++] = attr;

+

+               if (ctx->Point.SpriteRMode == GL_ZERO)

+                  r = 0.0F;

+               else if (ctx->Point.SpriteRMode == GL_S)

+                  r = vert->attrib[attr][0];

+               else /* GL_R */

+                  r = vert->attrib[attr][2];

+

+               span.attrStart[attr][0] = s;

+               span.attrStart[attr][1] = 0.0; /* overwritten below */

+               span.attrStart[attr][2] = r;

+               span.attrStart[attr][3] = 1.0;

+

+               span.attrStepX[attr][0] = dsdx;

+               span.attrStepX[attr][1] = 0.0;

+               span.attrStepX[attr][2] = 0.0;

+               span.attrStepX[attr][3] = 0.0;

+

+               span.attrStepY[attr][0] = 0.0;

+               span.attrStepY[attr][1] = dtdy;

+               span.attrStepY[attr][2] = 0.0;

+               span.attrStepY[attr][3] = 0.0;

+

+               continue;

+            }

+         }

+         else if (attr == FRAG_ATTRIB_PNTC) {

+            /* GLSL gl_PointCoord.xy (.zw undefined) */

+            span.attrStart[FRAG_ATTRIB_PNTC][0] = 0.0;

+            span.attrStart[FRAG_ATTRIB_PNTC][1] = 0.0; /* t0 set below */

+            span.attrStepX[FRAG_ATTRIB_PNTC][0] = dsdx;

+            span.attrStepX[FRAG_ATTRIB_PNTC][1] = 0.0;

+            span.attrStepY[FRAG_ATTRIB_PNTC][0] = 0.0;

+            span.attrStepY[FRAG_ATTRIB_PNTC][1] = dtdy;

+            tCoords[numTcoords++] = FRAG_ATTRIB_PNTC;

+            continue;

+         }

+         /* use vertex's texcoord/attrib */

+         COPY_4V(span.attrStart[attr], vert->attrib[attr]);

+         ASSIGN_4V(span.attrStepX[attr], 0, 0, 0, 0);

+         ASSIGN_4V(span.attrStepY[attr], 0, 0, 0, 0);

+      ATTRIB_LOOP_END;

+   }

+

+   /* compute pos, bounds and render */

+   {

+      const GLfloat x = vert->attrib[FRAG_ATTRIB_WPOS][0];

+      const GLfloat y = vert->attrib[FRAG_ATTRIB_WPOS][1];

+      GLint iSize = (GLint) (size + 0.5F);

+      GLint xmin, xmax, ymin, ymax, iy;

+      GLint iRadius;

+      GLfloat tcoord = t0;

+

+      iSize = MAX2(1, iSize);

+      iRadius = iSize / 2;

+

+      if (iSize & 1) {

+         /* odd size */

+         xmin = (GLint) (x - iRadius);

+         xmax = (GLint) (x + iRadius);

+         ymin = (GLint) (y - iRadius);

+         ymax = (GLint) (y + iRadius);

+      }

+      else {

+         /* even size */

+         /* 0.501 factor allows conformance to pass */

+         xmin = (GLint) (x + 0.501) - iRadius;

+         xmax = xmin + iSize - 1;

+         ymin = (GLint) (y + 0.501) - iRadius;

+         ymax = ymin + iSize - 1;

+      }

+

+      /* render spans */

+      for (iy = ymin; iy <= ymax; iy++) {

+         GLuint i;

+         /* setup texcoord T for this row */

+         for (i = 0; i < numTcoords; i++) {

+            span.attrStart[tCoords[i]][1] = tcoord;

+         }

+

+         /* these might get changed by span clipping */

+         span.x = xmin;

+         span.y = iy;

+         span.end = xmax - xmin + 1;

+

+         _swrast_write_rgba_span(ctx, &span);

+

+         tcoord += dtdy;

+      }

+   }

+}

+

+

+/**

+ * Draw smooth/antialiased point.  RGB or CI mode.

+ */

+static void

+smooth_point(struct gl_context *ctx, const SWvertex *vert)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   SWspan span;

+   GLfloat size, alphaAtten;

+

+   CULL_INVALID(vert);

+

+   /* z coord */

+   if (ctx->DrawBuffer->Visual.depthBits <= 16)

+      span.z = FloatToFixed(vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+   else

+      span.z = (GLuint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+   span.zStep = 0;

+

+   size = get_size(ctx, vert, GL_TRUE);

+

+   /* alpha attenuation / fade factor */

+   if (ctx->Multisample._Enabled) {

+      if (vert->pointSize >= ctx->Point.Threshold) {

+         alphaAtten = 1.0F;

+      }

+      else {

+         GLfloat dsize = vert->pointSize / ctx->Point.Threshold;

+         alphaAtten = dsize * dsize;

+      }

+   }

+   else {

+      alphaAtten = 1.0;

+   }

+   (void) alphaAtten; /* not used */

+

+   /* span init */

+   INIT_SPAN(span, GL_POINT);

+   span.interpMask = SPAN_Z | SPAN_RGBA;

+   span.arrayMask = SPAN_COVERAGE | SPAN_MASK;

+

+   span.facing = swrast->PointLineFacing;

+

+   span.red   = ChanToFixed(vert->color[0]);

+   span.green = ChanToFixed(vert->color[1]);

+   span.blue  = ChanToFixed(vert->color[2]);

+   span.alpha = ChanToFixed(vert->color[3]);

+   span.redStep = 0;

+   span.greenStep = 0;

+   span.blueStep = 0;

+   span.alphaStep = 0;

+

+   /* need these for fragment programs */

+   span.attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;

+   span.attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;

+   span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;

+

+   ATTRIB_LOOP_BEGIN

+      COPY_4V(span.attrStart[attr], vert->attrib[attr]);

+      ASSIGN_4V(span.attrStepX[attr], 0, 0, 0, 0);

+      ASSIGN_4V(span.attrStepY[attr], 0, 0, 0, 0);

+   ATTRIB_LOOP_END

+

+   /* compute pos, bounds and render */

+   {

+      const GLfloat x = vert->attrib[FRAG_ATTRIB_WPOS][0];

+      const GLfloat y = vert->attrib[FRAG_ATTRIB_WPOS][1];

+      const GLfloat radius = 0.5F * size;

+      const GLfloat rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */

+      const GLfloat rmax = radius + 0.7071F;

+      const GLfloat rmin2 = MAX2(0.0F, rmin * rmin);

+      const GLfloat rmax2 = rmax * rmax;

+      const GLfloat cscale = 1.0F / (rmax2 - rmin2);

+      const GLint xmin = (GLint) (x - radius);

+      const GLint xmax = (GLint) (x + radius);

+      const GLint ymin = (GLint) (y - radius);

+      const GLint ymax = (GLint) (y + radius);

+      GLint ix, iy;

+

+      for (iy = ymin; iy <= ymax; iy++) {

+

+         /* these might get changed by span clipping */

+         span.x = xmin;

+         span.y = iy;

+         span.end = xmax - xmin + 1;

+

+         /* compute coverage for each pixel in span */

+         for (ix = xmin; ix <= xmax; ix++) {

+            const GLfloat dx = ix - x + 0.5F;

+            const GLfloat dy = iy - y + 0.5F;

+            const GLfloat dist2 = dx * dx + dy * dy;

+            GLfloat coverage;

+

+            if (dist2 < rmax2) {

+               if (dist2 >= rmin2) {

+                  /* compute partial coverage */

+                  coverage = 1.0F - (dist2 - rmin2) * cscale;

+               }

+               else {

+                  /* full coverage */

+                  coverage = 1.0F;

+               }

+               span.array->mask[ix - xmin] = 1;

+            }

+            else {

+               /* zero coverage - fragment outside the radius */

+               coverage = 0.0;

+               span.array->mask[ix - xmin] = 0;

+            }

+            span.array->coverage[ix - xmin] = coverage;

+         }

+

+         /* render span */

+         _swrast_write_rgba_span(ctx, &span);

+

+      }

+   }

+}

+

+

+/**

+ * Draw large (size >= 1) non-AA point.  RGB or CI mode.

+ */

+static void

+large_point(struct gl_context *ctx, const SWvertex *vert)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   SWspan span;

+   GLfloat size;

+

+   CULL_INVALID(vert);

+

+   /* z coord */

+   if (ctx->DrawBuffer->Visual.depthBits <= 16)

+      span.z = FloatToFixed(vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+   else

+      span.z = (GLuint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+   span.zStep = 0;

+

+   size = get_size(ctx, vert, GL_FALSE);

+

+   /* span init */

+   INIT_SPAN(span, GL_POINT);

+   span.arrayMask = SPAN_XY;

+   span.facing = swrast->PointLineFacing;

+

+   span.interpMask = SPAN_Z | SPAN_RGBA;

+   span.red   = ChanToFixed(vert->color[0]);

+   span.green = ChanToFixed(vert->color[1]);

+   span.blue  = ChanToFixed(vert->color[2]);

+   span.alpha = ChanToFixed(vert->color[3]);

+   span.redStep = 0;

+   span.greenStep = 0;

+   span.blueStep = 0;

+   span.alphaStep = 0;

+

+   /* need these for fragment programs */

+   span.attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;

+   span.attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;

+   span.attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;

+

+   ATTRIB_LOOP_BEGIN

+      COPY_4V(span.attrStart[attr], vert->attrib[attr]);

+      ASSIGN_4V(span.attrStepX[attr], 0, 0, 0, 0);

+      ASSIGN_4V(span.attrStepY[attr], 0, 0, 0, 0);

+   ATTRIB_LOOP_END

+

+   /* compute pos, bounds and render */

+   {

+      const GLfloat x = vert->attrib[FRAG_ATTRIB_WPOS][0];

+      const GLfloat y = vert->attrib[FRAG_ATTRIB_WPOS][1];

+      GLint iSize = (GLint) (size + 0.5F);

+      GLint xmin, xmax, ymin, ymax, ix, iy;

+      GLint iRadius;

+

+      iSize = MAX2(1, iSize);

+      iRadius = iSize / 2;

+

+      if (iSize & 1) {

+         /* odd size */

+         xmin = (GLint) (x - iRadius);

+         xmax = (GLint) (x + iRadius);

+         ymin = (GLint) (y - iRadius);

+         ymax = (GLint) (y + iRadius);

+      }

+      else {

+         /* even size */

+         /* 0.501 factor allows conformance to pass */

+         xmin = (GLint) (x + 0.501) - iRadius;

+         xmax = xmin + iSize - 1;

+         ymin = (GLint) (y + 0.501) - iRadius;

+         ymax = ymin + iSize - 1;

+      }

+

+      /* generate fragments */

+      span.end = 0;

+      for (iy = ymin; iy <= ymax; iy++) {

+         for (ix = xmin; ix <= xmax; ix++) {

+            span.array->x[span.end] = ix;

+            span.array->y[span.end] = iy;

+            span.end++;

+         }

+      }

+      assert(span.end <= MAX_WIDTH);

+      _swrast_write_rgba_span(ctx, &span);

+   }

+}

+

+

+/**

+ * Draw size=1, single-pixel point

+ */

+static void

+pixel_point(struct gl_context *ctx, const SWvertex *vert)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   /*

+    * Note that unlike the other functions, we put single-pixel points

+    * into a special span array in order to render as many points as

+    * possible with a single _swrast_write_rgba_span() call.

+    */

+   SWspan *span = &(swrast->PointSpan);

+   GLuint count;

+

+   CULL_INVALID(vert);

+

+   /* Span init */

+   span->interpMask = 0;

+   span->arrayMask = SPAN_XY | SPAN_Z;

+   span->arrayMask |= SPAN_RGBA;

+   /*span->arrayMask |= SPAN_LAMBDA;*/

+   span->arrayAttribs = swrast->_ActiveAttribMask; /* we'll produce these vals */

+

+   /* need these for fragment programs */

+   span->attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F;

+   span->attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F;

+   span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;

+

+   /* check if we need to flush */

+   if (span->end >= MAX_WIDTH ||

+       (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT)) ||

+       span->facing != swrast->PointLineFacing) {

+      if (span->end > 0) {

+	 _swrast_write_rgba_span(ctx, span);

+         span->end = 0;

+      }

+   }

+

+   count = span->end;

+

+   span->facing = swrast->PointLineFacing;

+

+   /* fragment attributes */

+   span->array->rgba[count][RCOMP] = vert->color[0];

+   span->array->rgba[count][GCOMP] = vert->color[1];

+   span->array->rgba[count][BCOMP] = vert->color[2];

+   span->array->rgba[count][ACOMP] = vert->color[3];

+

+   ATTRIB_LOOP_BEGIN

+      COPY_4V(span->array->attribs[attr][count], vert->attrib[attr]);

+   ATTRIB_LOOP_END

+

+   /* fragment position */

+   span->array->x[count] = (GLint) vert->attrib[FRAG_ATTRIB_WPOS][0];

+   span->array->y[count] = (GLint) vert->attrib[FRAG_ATTRIB_WPOS][1];

+   span->array->z[count] = (GLint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);

+

+   span->end = count + 1;

+   ASSERT(span->end <= MAX_WIDTH);

+}

+

+

+/**

+ * Add specular color to primary color, draw point, restore original

+ * primary color.

+ */

+void

+_swrast_add_spec_terms_point(struct gl_context *ctx, const SWvertex *v0)

+{

+   SWvertex *ncv0 = (SWvertex *) v0; /* cast away const */

+   GLfloat rSum, gSum, bSum;

+   GLchan cSave[4];

+

+   /* save */

+   COPY_CHAN4(cSave, ncv0->color);

+   /* sum */

+   rSum = CHAN_TO_FLOAT(ncv0->color[0]) + ncv0->attrib[FRAG_ATTRIB_COL1][0];

+   gSum = CHAN_TO_FLOAT(ncv0->color[1]) + ncv0->attrib[FRAG_ATTRIB_COL1][1];

+   bSum = CHAN_TO_FLOAT(ncv0->color[2]) + ncv0->attrib[FRAG_ATTRIB_COL1][2];

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[0], rSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[1], gSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[2], bSum);

+   /* draw */

+   SWRAST_CONTEXT(ctx)->SpecPoint(ctx, ncv0);

+   /* restore */

+   COPY_CHAN4(ncv0->color, cSave);

+}

+

+

+/**

+ * Examine current state to determine which point drawing function to use.

+ */

+void

+_swrast_choose_point(struct gl_context *ctx)

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const GLfloat size = CLAMP(ctx->Point.Size,

+                              ctx->Point.MinSize,

+                              ctx->Point.MaxSize);

+

+   if (ctx->RenderMode == GL_RENDER) {

+      if (ctx->Point.PointSprite) {

+         swrast->Point = sprite_point;

+      }

+      else if (ctx->Point.SmoothFlag) {

+         swrast->Point = smooth_point;

+      }

+      else if (size > 1.0 ||

+               ctx->Point._Attenuated ||

+               ctx->VertexProgram.PointSizeEnabled) {

+         swrast->Point = large_point;

+      }

+      else {

+         swrast->Point = pixel_point;

+      }

+   }

+   else if (ctx->RenderMode == GL_FEEDBACK) {

+      swrast->Point = _swrast_feedback_point;

+   }

+   else {

+      /* GL_SELECT mode */

+      swrast->Point = _swrast_select_point;

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_points.h b/mesalib/src/mesa/swrast/s_points.h
index 9e39c601e..d99470bfe 100644
--- a/mesalib/src/mesa/swrast/s_points.h
+++ b/mesalib/src/mesa/swrast/s_points.h
@@ -1,39 +1,39 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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 S_POINTS_H
-#define S_POINTS_H
-
-#include "swrast.h"
-
-extern void
-_swrast_choose_point( GLcontext *ctx );
-
-extern void
-_swrast_add_spec_terms_point( GLcontext *ctx,
-			      const SWvertex *v0 );
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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 S_POINTS_H

+#define S_POINTS_H

+

+#include "swrast.h"

+

+extern void

+_swrast_choose_point( struct gl_context *ctx );

+

+extern void

+_swrast_add_spec_terms_point( struct gl_context *ctx,

+			      const SWvertex *v0 );

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c
index 1de481248..61399010b 100644
--- a/mesalib/src/mesa/swrast/s_readpix.c
+++ b/mesalib/src/mesa/swrast/s_readpix.c
@@ -1,578 +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/bufferobj.h"
-#include "main/colormac.h"
-#include "main/convolve.h"
-#include "main/feedback.h"
-#include "main/formats.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/imports.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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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);
-
-   if (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) {
-      GLfloat *dest, *src, *tmpImage, *convImage;
-      GLint row;
-
-      tmpImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-      if (!tmpImage) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
-         return;
-      }
-      convImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-      if (!convImage) {
-         free(tmpImage);
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
-         return;
-      }
-
-      /* read full RGBA, FLOAT image */
-      dest = tmpImage;
-      for (row = 0; row < height; row++, y++) {
-         _swrast_read_rgba_span(ctx, rb, width, x, y, GL_FLOAT, dest);
-         _mesa_apply_rgba_transfer_ops(ctx, 
-                                      transferOps & IMAGE_PRE_CONVOLUTION_BITS,
-                                      width, (GLfloat (*)[4]) dest);
-         dest += width * 4;
-      }
-
-      /* do convolution */
-      if (ctx->Pixel.Convolution2DEnabled) {
-         _mesa_convolve_2d_image(ctx, &width, &height, tmpImage, convImage);
-      }
-      else {
-         ASSERT(ctx->Pixel.Separable2DEnabled);
-         _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
-      }
-      free(tmpImage);
-
-      /* finish transfer ops and pack the resulting image */
-      src = convImage;
-      for (row = 0; row < height; row++) {
-         GLvoid *dest;
-         dest = _mesa_image_address2d(packing, pixels, width, height,
-                                      format, type, row, 0);
-         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) src,
-                                    format, type, dest, packing,
-                                    transferOps & IMAGE_POST_CONVOLUTION_BITS);
-         src += width * 4;
-      }
-      free(convImage);
-   }
-   else {
-      /* no convolution */
-      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);
-
-      /* make sure we don't apply 1D convolution */
-      transferOps &= ~(IMAGE_CONVOLUTION_BIT |
-                       IMAGE_POST_CONVOLUTION_SCALE_BIAS);
-
-      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;
-      }
-   }
-}
-
-
-/**
- * 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(GLcontext *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( GLcontext *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)) {
-      /* The ReadPixels region is totally outside the window bounds */
-      swrast_render_finish(ctx);
-      return;
-   }
-
-   pixels = _mesa_map_pbo_dest(ctx, &clippedPacking, pixels);
-   if (!pixels)
-      return;
-  
-   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_RED:
-      case GL_GREEN:
-      case GL_BLUE:
-      case GL_ALPHA:
-      case GL_RGB:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE_ALPHA:
-      case GL_RGBA:
-      case GL_BGR:
-      case GL_BGRA:
-      case GL_ABGR_EXT:
-         read_rgba_pixels(ctx, x, y, width, height,
-                          format, type, pixels, &clippedPacking);
-	 break;
-      case GL_DEPTH_STENCIL_EXT:
-         read_depth_stencil_pixels(ctx, x, y, width, height,
-                                   type, pixels, &clippedPacking);
-         break;
-      default:
-	 _mesa_problem(ctx, "unexpected format in _swrast_ReadPixels");
-         /* don't return yet, clean-up */
-   }
-
-   swrast_render_finish(ctx);
-
-   _mesa_unmap_pbo_dest(ctx, &clippedPacking);
-}
+/*

+ * 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/bufferobj.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/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_span.c b/mesalib/src/mesa/swrast/s_span.c
index 28c82990e..029c88b29 100644
--- a/mesalib/src/mesa/swrast/s_span.c
+++ b/mesalib/src/mesa/swrast/s_span.c
@@ -1,1502 +1,1502 @@
-/*
- * 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 swrast/s_span.c
- * \brief Span processing functions used by all rasterization functions.
- * This is where all the per-fragment tests are performed
- * \author Brian Paul
- */
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/image.h"
-
-#include "s_atifragshader.h"
-#include "s_alpha.h"
-#include "s_blend.h"
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_fog.h"
-#include "s_logic.h"
-#include "s_masking.h"
-#include "s_fragprog.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_texcombine.h"
-
-
-/**
- * Set default fragment attributes for the span using the
- * current raster values.  Used prior to glDraw/CopyPixels
- * and glBitmap.
- */
-void
-_swrast_span_default_attribs(GLcontext *ctx, SWspan *span)
-{
-   GLchan r, g, b, a;
-   /* Z*/
-   {
-      const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;
-      if (ctx->DrawBuffer->Visual.depthBits <= 16)
-         span->z = FloatToFixed(ctx->Current.RasterPos[2] * depthMax + 0.5F);
-      else {
-         GLfloat tmpf = ctx->Current.RasterPos[2] * depthMax; 
-         tmpf = MIN2(tmpf, depthMax);
-         span->z = (GLint)tmpf;
-      }
-      span->zStep = 0;
-      span->interpMask |= SPAN_Z;
-   }
-
-   /* W (for perspective correction) */
-   span->attrStart[FRAG_ATTRIB_WPOS][3] = 1.0;
-   span->attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0;
-   span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0;
-
-   /* primary color, or color index */
-   UNCLAMPED_FLOAT_TO_CHAN(r, ctx->Current.RasterColor[0]);
-   UNCLAMPED_FLOAT_TO_CHAN(g, ctx->Current.RasterColor[1]);
-   UNCLAMPED_FLOAT_TO_CHAN(b, ctx->Current.RasterColor[2]);
-   UNCLAMPED_FLOAT_TO_CHAN(a, ctx->Current.RasterColor[3]);
-#if CHAN_TYPE == GL_FLOAT
-   span->red = r;
-   span->green = g;
-   span->blue = b;
-   span->alpha = a;
-#else
-   span->red   = IntToFixed(r);
-   span->green = IntToFixed(g);
-   span->blue  = IntToFixed(b);
-   span->alpha = IntToFixed(a);
-#endif
-   span->redStep = 0;
-   span->greenStep = 0;
-   span->blueStep = 0;
-   span->alphaStep = 0;
-   span->interpMask |= SPAN_RGBA;
-
-   COPY_4V(span->attrStart[FRAG_ATTRIB_COL0], ctx->Current.RasterColor);
-   ASSIGN_4V(span->attrStepX[FRAG_ATTRIB_COL0], 0.0, 0.0, 0.0, 0.0);
-   ASSIGN_4V(span->attrStepY[FRAG_ATTRIB_COL0], 0.0, 0.0, 0.0, 0.0);
-
-   /* Secondary color */
-   if (ctx->Light.Enabled || ctx->Fog.ColorSumEnabled)
-   {
-      COPY_4V(span->attrStart[FRAG_ATTRIB_COL1], ctx->Current.RasterSecondaryColor);
-      ASSIGN_4V(span->attrStepX[FRAG_ATTRIB_COL1], 0.0, 0.0, 0.0, 0.0);
-      ASSIGN_4V(span->attrStepY[FRAG_ATTRIB_COL1], 0.0, 0.0, 0.0, 0.0);
-   }
-
-   /* fog */
-   {
-      const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-      GLfloat fogVal; /* a coord or a blend factor */
-      if (swrast->_PreferPixelFog) {
-         /* fog blend factors will be computed from fog coordinates per pixel */
-         fogVal = ctx->Current.RasterDistance;
-      }
-      else {
-         /* fog blend factor should be computed from fogcoord now */
-         fogVal = _swrast_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
-      }
-      span->attrStart[FRAG_ATTRIB_FOGC][0] = fogVal;
-      span->attrStepX[FRAG_ATTRIB_FOGC][0] = 0.0;
-      span->attrStepY[FRAG_ATTRIB_FOGC][0] = 0.0;
-   }
-
-   /* texcoords */
-   {
-      GLuint i;
-      for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
-         const GLuint attr = FRAG_ATTRIB_TEX0 + i;
-         const GLfloat *tc = ctx->Current.RasterTexCoords[i];
-         if (ctx->FragmentProgram._Current || ctx->ATIFragmentShader._Enabled) {
-            COPY_4V(span->attrStart[attr], tc);
-         }
-         else if (tc[3] > 0.0F) {
-            /* use (s/q, t/q, r/q, 1) */
-            span->attrStart[attr][0] = tc[0] / tc[3];
-            span->attrStart[attr][1] = tc[1] / tc[3];
-            span->attrStart[attr][2] = tc[2] / tc[3];
-            span->attrStart[attr][3] = 1.0;
-         }
-         else {
-            ASSIGN_4V(span->attrStart[attr], 0.0F, 0.0F, 0.0F, 1.0F);
-         }
-         ASSIGN_4V(span->attrStepX[attr], 0.0F, 0.0F, 0.0F, 0.0F);
-         ASSIGN_4V(span->attrStepY[attr], 0.0F, 0.0F, 0.0F, 0.0F);
-      }
-   }
-}
-
-
-/**
- * Interpolate the active attributes (and'd with attrMask) to
- * fill in span->array->attribs[].
- * Perspective correction will be done.  The point/line/triangle function
- * should have computed attrStart/Step values for FRAG_ATTRIB_WPOS[3]!
- */
-static INLINE void
-interpolate_active_attribs(GLcontext *ctx, SWspan *span, GLbitfield attrMask)
-{
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   /*
-    * Don't overwrite existing array values, such as colors that may have
-    * been produced by glDraw/CopyPixels.
-    */
-   attrMask &= ~span->arrayAttribs;
-
-   ATTRIB_LOOP_BEGIN
-      if (attrMask & (1 << attr)) {
-         const GLfloat dwdx = span->attrStepX[FRAG_ATTRIB_WPOS][3];
-         GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3];
-         const GLfloat dv0dx = span->attrStepX[attr][0];
-         const GLfloat dv1dx = span->attrStepX[attr][1];
-         const GLfloat dv2dx = span->attrStepX[attr][2];
-         const GLfloat dv3dx = span->attrStepX[attr][3];
-         GLfloat v0 = span->attrStart[attr][0] + span->leftClip * dv0dx;
-         GLfloat v1 = span->attrStart[attr][1] + span->leftClip * dv1dx;
-         GLfloat v2 = span->attrStart[attr][2] + span->leftClip * dv2dx;
-         GLfloat v3 = span->attrStart[attr][3] + span->leftClip * dv3dx;
-         GLuint k;
-         for (k = 0; k < span->end; k++) {
-            const GLfloat invW = 1.0f / w;
-            span->array->attribs[attr][k][0] = v0 * invW;
-            span->array->attribs[attr][k][1] = v1 * invW;
-            span->array->attribs[attr][k][2] = v2 * invW;
-            span->array->attribs[attr][k][3] = v3 * invW;
-            v0 += dv0dx;
-            v1 += dv1dx;
-            v2 += dv2dx;
-            v3 += dv3dx;
-            w += dwdx;
-         }
-         ASSERT((span->arrayAttribs & (1 << attr)) == 0);
-         span->arrayAttribs |= (1 << attr);
-      }
-   ATTRIB_LOOP_END
-}
-
-
-/**
- * Interpolate primary colors to fill in the span->array->rgba8 (or rgb16)
- * color array.
- */
-static INLINE void
-interpolate_int_colors(GLcontext *ctx, SWspan *span)
-{
-   const GLuint n = span->end;
-   GLuint i;
-
-#if CHAN_BITS != 32
-   ASSERT(!(span->arrayMask & SPAN_RGBA));
-#endif
-
-   switch (span->array->ChanType) {
-#if CHAN_BITS != 32
-   case GL_UNSIGNED_BYTE:
-      {
-         GLubyte (*rgba)[4] = span->array->rgba8;
-         if (span->interpMask & SPAN_FLAT) {
-            GLubyte color[4];
-            color[RCOMP] = FixedToInt(span->red);
-            color[GCOMP] = FixedToInt(span->green);
-            color[BCOMP] = FixedToInt(span->blue);
-            color[ACOMP] = FixedToInt(span->alpha);
-            for (i = 0; i < n; i++) {
-               COPY_4UBV(rgba[i], color);
-            }
-         }
-         else {
-            GLfixed r = span->red;
-            GLfixed g = span->green;
-            GLfixed b = span->blue;
-            GLfixed a = span->alpha;
-            GLint dr = span->redStep;
-            GLint dg = span->greenStep;
-            GLint db = span->blueStep;
-            GLint da = span->alphaStep;
-            for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = FixedToChan(r);
-               rgba[i][GCOMP] = FixedToChan(g);
-               rgba[i][BCOMP] = FixedToChan(b);
-               rgba[i][ACOMP] = FixedToChan(a);
-               r += dr;
-               g += dg;
-               b += db;
-               a += da;
-            }
-         }
-      }
-      break;
-   case GL_UNSIGNED_SHORT:
-      {
-         GLushort (*rgba)[4] = span->array->rgba16;
-         if (span->interpMask & SPAN_FLAT) {
-            GLushort color[4];
-            color[RCOMP] = FixedToInt(span->red);
-            color[GCOMP] = FixedToInt(span->green);
-            color[BCOMP] = FixedToInt(span->blue);
-            color[ACOMP] = FixedToInt(span->alpha);
-            for (i = 0; i < n; i++) {
-               COPY_4V(rgba[i], color);
-            }
-         }
-         else {
-            GLushort (*rgba)[4] = span->array->rgba16;
-            GLfixed r, g, b, a;
-            GLint dr, dg, db, da;
-            r = span->red;
-            g = span->green;
-            b = span->blue;
-            a = span->alpha;
-            dr = span->redStep;
-            dg = span->greenStep;
-            db = span->blueStep;
-            da = span->alphaStep;
-            for (i = 0; i < n; i++) {
-               rgba[i][RCOMP] = FixedToChan(r);
-               rgba[i][GCOMP] = FixedToChan(g);
-               rgba[i][BCOMP] = FixedToChan(b);
-               rgba[i][ACOMP] = FixedToChan(a);
-               r += dr;
-               g += dg;
-               b += db;
-               a += da;
-            }
-         }
-      }
-      break;
-#endif
-   case GL_FLOAT:
-      interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);
-      break;
-   default:
-      _mesa_problem(NULL, "bad datatype in interpolate_int_colors");
-   }
-   span->arrayMask |= SPAN_RGBA;
-}
-
-
-/**
- * Populate the FRAG_ATTRIB_COL0 array.
- */
-static INLINE void
-interpolate_float_colors(SWspan *span)
-{
-   GLfloat (*col0)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-   const GLuint n = span->end;
-   GLuint i;
-
-   assert(!(span->arrayAttribs & FRAG_BIT_COL0));
-
-   if (span->arrayMask & SPAN_RGBA) {
-      /* convert array of int colors */
-      for (i = 0; i < n; i++) {
-         col0[i][0] = UBYTE_TO_FLOAT(span->array->rgba8[i][0]);
-         col0[i][1] = UBYTE_TO_FLOAT(span->array->rgba8[i][1]);
-         col0[i][2] = UBYTE_TO_FLOAT(span->array->rgba8[i][2]);
-         col0[i][3] = UBYTE_TO_FLOAT(span->array->rgba8[i][3]);
-      }
-   }
-   else {
-      /* interpolate red/green/blue/alpha to get float colors */
-      ASSERT(span->interpMask & SPAN_RGBA);
-      if (span->interpMask & SPAN_FLAT) {
-         GLfloat r = FixedToFloat(span->red);
-         GLfloat g = FixedToFloat(span->green);
-         GLfloat b = FixedToFloat(span->blue);
-         GLfloat a = FixedToFloat(span->alpha);
-         for (i = 0; i < n; i++) {
-            ASSIGN_4V(col0[i], r, g, b, a);
-         }
-      }
-      else {
-         GLfloat r = FixedToFloat(span->red);
-         GLfloat g = FixedToFloat(span->green);
-         GLfloat b = FixedToFloat(span->blue);
-         GLfloat a = FixedToFloat(span->alpha);
-         GLfloat dr = FixedToFloat(span->redStep);
-         GLfloat dg = FixedToFloat(span->greenStep);
-         GLfloat db = FixedToFloat(span->blueStep);
-         GLfloat da = FixedToFloat(span->alphaStep);
-         for (i = 0; i < n; i++) {
-            col0[i][0] = r;
-            col0[i][1] = g;
-            col0[i][2] = b;
-            col0[i][3] = a;
-            r += dr;
-            g += dg;
-            b += db;
-            a += da;
-         }
-      }
-   }
-
-   span->arrayAttribs |= FRAG_BIT_COL0;
-   span->array->ChanType = GL_FLOAT;
-}
-
-
-
-/**
- * Fill in the span.zArray array from the span->z, zStep values.
- */
-void
-_swrast_span_interpolate_z( const GLcontext *ctx, SWspan *span )
-{
-   const GLuint n = span->end;
-   GLuint i;
-
-   ASSERT(!(span->arrayMask & SPAN_Z));
-
-   if (ctx->DrawBuffer->Visual.depthBits <= 16) {
-      GLfixed zval = span->z;
-      GLuint *z = span->array->z; 
-      for (i = 0; i < n; i++) {
-         z[i] = FixedToInt(zval);
-         zval += span->zStep;
-      }
-   }
-   else {
-      /* Deep Z buffer, no fixed->int shift */
-      GLuint zval = span->z;
-      GLuint *z = span->array->z;
-      for (i = 0; i < n; i++) {
-         z[i] = zval;
-         zval += span->zStep;
-      }
-   }
-   span->interpMask &= ~SPAN_Z;
-   span->arrayMask |= SPAN_Z;
-}
-
-
-/**
- * Compute mipmap LOD from partial derivatives.
- * This the ideal solution, as given in the OpenGL spec.
- */
-GLfloat
-_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
-                       GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
-                       GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)
-{
-   GLfloat dudx = texW * ((s + dsdx) / (q + dqdx) - s * invQ);
-   GLfloat dvdx = texH * ((t + dtdx) / (q + dqdx) - t * invQ);
-   GLfloat dudy = texW * ((s + dsdy) / (q + dqdy) - s * invQ);
-   GLfloat dvdy = texH * ((t + dtdy) / (q + dqdy) - t * invQ);
-   GLfloat x = SQRTF(dudx * dudx + dvdx * dvdx);
-   GLfloat y = SQRTF(dudy * dudy + dvdy * dvdy);
-   GLfloat rho = MAX2(x, y);
-   GLfloat lambda = LOG2(rho);
-   return lambda;
-}
-
-
-/**
- * Compute mipmap LOD from partial derivatives.
- * This is a faster approximation than above function.
- */
-#if 0
-GLfloat
-_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
-                     GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
-                     GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)
-{
-   GLfloat dsdx2 = (s + dsdx) / (q + dqdx) - s * invQ;
-   GLfloat dtdx2 = (t + dtdx) / (q + dqdx) - t * invQ;
-   GLfloat dsdy2 = (s + dsdy) / (q + dqdy) - s * invQ;
-   GLfloat dtdy2 = (t + dtdy) / (q + dqdy) - t * invQ;
-   GLfloat maxU, maxV, rho, lambda;
-   dsdx2 = FABSF(dsdx2);
-   dsdy2 = FABSF(dsdy2);
-   dtdx2 = FABSF(dtdx2);
-   dtdy2 = FABSF(dtdy2);
-   maxU = MAX2(dsdx2, dsdy2) * texW;
-   maxV = MAX2(dtdx2, dtdy2) * texH;
-   rho = MAX2(maxU, maxV);
-   lambda = LOG2(rho);
-   return lambda;
-}
-#endif
-
-
-/**
- * Fill in the span.array->attrib[FRAG_ATTRIB_TEXn] arrays from the
- * using the attrStart/Step values.
- *
- * This function only used during fixed-function fragment processing.
- *
- * Note: in the places where we divide by Q (or mult by invQ) we're
- * really doing two things: perspective correction and texcoord
- * projection.  Remember, for texcoord (s,t,r,q) we need to index
- * texels with (s/q, t/q, r/q).
- */
-static void
-interpolate_texcoords(GLcontext *ctx, SWspan *span)
-{
-   const GLuint maxUnit
-      = (ctx->Texture._EnabledCoordUnits > 1) ? ctx->Const.MaxTextureUnits : 1;
-   GLuint u;
-
-   /* XXX CoordUnits vs. ImageUnits */
-   for (u = 0; u < maxUnit; u++) {
-      if (ctx->Texture._EnabledCoordUnits & (1 << u)) {
-         const GLuint attr = FRAG_ATTRIB_TEX0 + u;
-         const struct gl_texture_object *obj = ctx->Texture.Unit[u]._Current;
-         GLfloat texW, texH;
-         GLboolean needLambda;
-         GLfloat (*texcoord)[4] = span->array->attribs[attr];
-         GLfloat *lambda = span->array->lambda[u];
-         const GLfloat dsdx = span->attrStepX[attr][0];
-         const GLfloat dsdy = span->attrStepY[attr][0];
-         const GLfloat dtdx = span->attrStepX[attr][1];
-         const GLfloat dtdy = span->attrStepY[attr][1];
-         const GLfloat drdx = span->attrStepX[attr][2];
-         const GLfloat dqdx = span->attrStepX[attr][3];
-         const GLfloat dqdy = span->attrStepY[attr][3];
-         GLfloat s = span->attrStart[attr][0] + span->leftClip * dsdx;
-         GLfloat t = span->attrStart[attr][1] + span->leftClip * dtdx;
-         GLfloat r = span->attrStart[attr][2] + span->leftClip * drdx;
-         GLfloat q = span->attrStart[attr][3] + span->leftClip * dqdx;
-
-         if (obj) {
-            const struct gl_texture_image *img = obj->Image[0][obj->BaseLevel];
-            needLambda = (obj->MinFilter != obj->MagFilter)
-               || ctx->FragmentProgram._Current;
-            texW = img->WidthScale;
-            texH = img->HeightScale;
-         }
-         else {
-            /* using a fragment program */
-            texW = 1.0;
-            texH = 1.0;
-            needLambda = GL_FALSE;
-         }
-
-         if (needLambda) {
-            GLuint i;
-            if (ctx->FragmentProgram._Current
-                || ctx->ATIFragmentShader._Enabled) {
-               /* do perspective correction but don't divide s, t, r by q */
-               const GLfloat dwdx = span->attrStepX[FRAG_ATTRIB_WPOS][3];
-               GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3] + span->leftClip * dwdx;
-               for (i = 0; i < span->end; i++) {
-                  const GLfloat invW = 1.0F / w;
-                  texcoord[i][0] = s * invW;
-                  texcoord[i][1] = t * invW;
-                  texcoord[i][2] = r * invW;
-                  texcoord[i][3] = q * invW;
-                  lambda[i] = _swrast_compute_lambda(dsdx, dsdy, dtdx, dtdy,
-                                                     dqdx, dqdy, texW, texH,
-                                                     s, t, q, invW);
-                  s += dsdx;
-                  t += dtdx;
-                  r += drdx;
-                  q += dqdx;
-                  w += dwdx;
-               }
-            }
-            else {
-               for (i = 0; i < span->end; i++) {
-                  const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
-                  texcoord[i][0] = s * invQ;
-                  texcoord[i][1] = t * invQ;
-                  texcoord[i][2] = r * invQ;
-                  texcoord[i][3] = q;
-                  lambda[i] = _swrast_compute_lambda(dsdx, dsdy, dtdx, dtdy,
-                                                     dqdx, dqdy, texW, texH,
-                                                     s, t, q, invQ);
-                  s += dsdx;
-                  t += dtdx;
-                  r += drdx;
-                  q += dqdx;
-               }
-            }
-            span->arrayMask |= SPAN_LAMBDA;
-         }
-         else {
-            GLuint i;
-            if (ctx->FragmentProgram._Current ||
-                ctx->ATIFragmentShader._Enabled) {
-               /* do perspective correction but don't divide s, t, r by q */
-               const GLfloat dwdx = span->attrStepX[FRAG_ATTRIB_WPOS][3];
-               GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3] + span->leftClip * dwdx;
-               for (i = 0; i < span->end; i++) {
-                  const GLfloat invW = 1.0F / w;
-                  texcoord[i][0] = s * invW;
-                  texcoord[i][1] = t * invW;
-                  texcoord[i][2] = r * invW;
-                  texcoord[i][3] = q * invW;
-                  lambda[i] = 0.0;
-                  s += dsdx;
-                  t += dtdx;
-                  r += drdx;
-                  q += dqdx;
-                  w += dwdx;
-               }
-            }
-            else if (dqdx == 0.0F) {
-               /* Ortho projection or polygon's parallel to window X axis */
-               const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
-               for (i = 0; i < span->end; i++) {
-                  texcoord[i][0] = s * invQ;
-                  texcoord[i][1] = t * invQ;
-                  texcoord[i][2] = r * invQ;
-                  texcoord[i][3] = q;
-                  lambda[i] = 0.0;
-                  s += dsdx;
-                  t += dtdx;
-                  r += drdx;
-               }
-            }
-            else {
-               for (i = 0; i < span->end; i++) {
-                  const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
-                  texcoord[i][0] = s * invQ;
-                  texcoord[i][1] = t * invQ;
-                  texcoord[i][2] = r * invQ;
-                  texcoord[i][3] = q;
-                  lambda[i] = 0.0;
-                  s += dsdx;
-                  t += dtdx;
-                  r += drdx;
-                  q += dqdx;
-               }
-            }
-         } /* lambda */
-      } /* if */
-   } /* for */
-}
-
-
-/**
- * Fill in the arrays->attribs[FRAG_ATTRIB_WPOS] array.
- */
-static INLINE void
-interpolate_wpos(GLcontext *ctx, SWspan *span)
-{
-   GLfloat (*wpos)[4] = span->array->attribs[FRAG_ATTRIB_WPOS];
-   GLuint i;
-   const GLfloat zScale = 1.0F / ctx->DrawBuffer->_DepthMaxF;
-   GLfloat w, dw;
-
-   if (span->arrayMask & SPAN_XY) {
-      for (i = 0; i < span->end; i++) {
-         wpos[i][0] = (GLfloat) span->array->x[i];
-         wpos[i][1] = (GLfloat) span->array->y[i];
-      }
-   }
-   else {
-      for (i = 0; i < span->end; i++) {
-         wpos[i][0] = (GLfloat) span->x + i;
-         wpos[i][1] = (GLfloat) span->y;
-      }
-   }
-
-   dw = span->attrStepX[FRAG_ATTRIB_WPOS][3];
-   w = span->attrStart[FRAG_ATTRIB_WPOS][3] + span->leftClip * dw;
-   for (i = 0; i < span->end; i++) {
-      wpos[i][2] = (GLfloat) span->array->z[i] * zScale;
-      wpos[i][3] = w;
-      w += dw;
-   }
-}
-
-
-/**
- * Apply the current polygon stipple pattern to a span of pixels.
- */
-static INLINE void
-stipple_polygon_span(GLcontext *ctx, SWspan *span)
-{
-   GLubyte *mask = span->array->mask;
-
-   ASSERT(ctx->Polygon.StippleFlag);
-
-   if (span->arrayMask & SPAN_XY) {
-      /* arrays of x/y pixel coords */
-      GLuint i;
-      for (i = 0; i < span->end; i++) {
-         const GLint col = span->array->x[i] % 32;
-         const GLint row = span->array->y[i] % 32;
-         const GLuint stipple = ctx->PolygonStipple[row];
-         if (((1 << col) & stipple) == 0) {
-            mask[i] = 0;
-         }
-      }
-   }
-   else {
-      /* horizontal span of pixels */
-      const GLuint highBit = 1 << 31;
-      const GLuint stipple = ctx->PolygonStipple[span->y % 32];
-      GLuint i, m = highBit >> (GLuint) (span->x % 32);
-      for (i = 0; i < span->end; i++) {
-         if ((m & stipple) == 0) {
-            mask[i] = 0;
-         }
-         m = m >> 1;
-         if (m == 0) {
-            m = highBit;
-         }
-      }
-   }
-   span->writeAll = GL_FALSE;
-}
-
-
-/**
- * Clip a pixel span to the current buffer/window boundaries:
- * DrawBuffer->_Xmin, _Xmax, _Ymin, _Ymax.  This will accomplish
- * window clipping and scissoring.
- * Return:   GL_TRUE   some pixels still visible
- *           GL_FALSE  nothing visible
- */
-static INLINE GLuint
-clip_span( GLcontext *ctx, SWspan *span )
-{
-   const GLint xmin = ctx->DrawBuffer->_Xmin;
-   const GLint xmax = ctx->DrawBuffer->_Xmax;
-   const GLint ymin = ctx->DrawBuffer->_Ymin;
-   const GLint ymax = ctx->DrawBuffer->_Ymax;
-
-   span->leftClip = 0;
-
-   if (span->arrayMask & SPAN_XY) {
-      /* arrays of x/y pixel coords */
-      const GLint *x = span->array->x;
-      const GLint *y = span->array->y;
-      const GLint n = span->end;
-      GLubyte *mask = span->array->mask;
-      GLint i;
-      if (span->arrayMask & SPAN_MASK) {
-         /* note: using & intead of && to reduce branches */
-         for (i = 0; i < n; i++) {
-            mask[i] &= (x[i] >= xmin) & (x[i] < xmax)
-                     & (y[i] >= ymin) & (y[i] < ymax);
-         }
-      }
-      else {
-         /* note: using & intead of && to reduce branches */
-         for (i = 0; i < n; i++) {
-            mask[i] = (x[i] >= xmin) & (x[i] < xmax)
-                    & (y[i] >= ymin) & (y[i] < ymax);
-         }
-      }
-      return GL_TRUE;  /* some pixels visible */
-   }
-   else {
-      /* horizontal span of pixels */
-      const GLint x = span->x;
-      const GLint y = span->y;
-      GLint n = span->end;
-
-      /* Trivial rejection tests */
-      if (y < ymin || y >= ymax || x + n <= xmin || x >= xmax) {
-         span->end = 0;
-         return GL_FALSE;  /* all pixels clipped */
-      }
-
-      /* Clip to right */
-      if (x + n > xmax) {
-         ASSERT(x < xmax);
-         n = span->end = xmax - x;
-      }
-
-      /* Clip to the left */
-      if (x < xmin) {
-         const GLint leftClip = xmin - x;
-         GLuint i;
-
-         ASSERT(leftClip > 0);
-         ASSERT(x + n > xmin);
-
-         /* Clip 'leftClip' pixels from the left side.
-          * The span->leftClip field will be applied when we interpolate
-          * fragment attributes.
-          * For arrays of values, shift them left.
-          */
-         for (i = 0; i < FRAG_ATTRIB_MAX; i++) {
-            if (span->interpMask & (1 << i)) {
-               GLuint j;
-               for (j = 0; j < 4; j++) {
-                  span->attrStart[i][j] += leftClip * span->attrStepX[i][j];
-               }
-            }
-         }
-
-         span->red += leftClip * span->redStep;
-         span->green += leftClip * span->greenStep;
-         span->blue += leftClip * span->blueStep;
-         span->alpha += leftClip * span->alphaStep;
-         span->index += leftClip * span->indexStep;
-         span->z += leftClip * span->zStep;
-         span->intTex[0] += leftClip * span->intTexStep[0];
-         span->intTex[1] += leftClip * span->intTexStep[1];
-
-#define SHIFT_ARRAY(ARRAY, SHIFT, LEN) \
-         memcpy(ARRAY, ARRAY + (SHIFT), (LEN) * sizeof(ARRAY[0]))
-
-         for (i = 0; i < FRAG_ATTRIB_MAX; i++) {
-            if (span->arrayAttribs & (1 << i)) {
-               /* shift array elements left by 'leftClip' */
-               SHIFT_ARRAY(span->array->attribs[i], leftClip, n - leftClip);
-            }
-         }
-
-         SHIFT_ARRAY(span->array->mask, leftClip, n - leftClip);
-         SHIFT_ARRAY(span->array->rgba8, leftClip, n - leftClip);
-         SHIFT_ARRAY(span->array->rgba16, leftClip, n - leftClip);
-         SHIFT_ARRAY(span->array->x, leftClip, n - leftClip);
-         SHIFT_ARRAY(span->array->y, leftClip, n - leftClip);
-         SHIFT_ARRAY(span->array->z, leftClip, n - leftClip);
-         SHIFT_ARRAY(span->array->index, leftClip, n - leftClip);
-         for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-            SHIFT_ARRAY(span->array->lambda[i], leftClip, n - leftClip);
-         }
-         SHIFT_ARRAY(span->array->coverage, leftClip, n - leftClip);
-
-#undef SHIFT_ARRAY
-
-         span->leftClip = leftClip;
-         span->x = xmin;
-         span->end -= leftClip;
-         span->writeAll = GL_FALSE;
-      }
-
-      ASSERT(span->x >= xmin);
-      ASSERT(span->x + span->end <= xmax);
-      ASSERT(span->y >= ymin);
-      ASSERT(span->y < ymax);
-
-      return GL_TRUE;  /* some pixels visible */
-   }
-}
-
-
-/**
- * Add specular colors to primary colors.
- * Only called during fixed-function operation.
- * Result is float color array (FRAG_ATTRIB_COL0).
- */
-static INLINE void
-add_specular(GLcontext *ctx, SWspan *span)
-{
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLubyte *mask = span->array->mask;
-   GLfloat (*col0)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-   GLfloat (*col1)[4] = span->array->attribs[FRAG_ATTRIB_COL1];
-   GLuint i;
-
-   ASSERT(!ctx->FragmentProgram._Current);
-   ASSERT(span->arrayMask & SPAN_RGBA);
-   ASSERT(swrast->_ActiveAttribMask & FRAG_BIT_COL1);
-   (void) swrast; /* silence warning */
-
-   if (span->array->ChanType == GL_FLOAT) {
-      if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {
-         interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);
-      }
-   }
-   else {
-      /* need float colors */
-      if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {
-         interpolate_float_colors(span);
-      }
-   }
-
-   if ((span->arrayAttribs & FRAG_BIT_COL1) == 0) {
-      /* XXX could avoid this and interpolate COL1 in the loop below */
-      interpolate_active_attribs(ctx, span, FRAG_BIT_COL1);
-   }
-
-   ASSERT(span->arrayAttribs & FRAG_BIT_COL0);
-   ASSERT(span->arrayAttribs & FRAG_BIT_COL1);
-
-   for (i = 0; i < span->end; i++) {
-      if (mask[i]) {
-         col0[i][0] += col1[i][0];
-         col0[i][1] += col1[i][1];
-         col0[i][2] += col1[i][2];
-      }
-   }
-
-   span->array->ChanType = GL_FLOAT;
-}
-
-
-/**
- * Apply antialiasing coverage value to alpha values.
- */
-static INLINE void
-apply_aa_coverage(SWspan *span)
-{
-   const GLfloat *coverage = span->array->coverage;
-   GLuint i;
-   if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-      GLubyte (*rgba)[4] = span->array->rgba8;
-      for (i = 0; i < span->end; i++) {
-         const GLfloat a = rgba[i][ACOMP] * coverage[i];
-         rgba[i][ACOMP] = (GLubyte) CLAMP(a, 0.0, 255.0);
-         ASSERT(coverage[i] >= 0.0);
-         ASSERT(coverage[i] <= 1.0);
-      }
-   }
-   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {
-      GLushort (*rgba)[4] = span->array->rgba16;
-      for (i = 0; i < span->end; i++) {
-         const GLfloat a = rgba[i][ACOMP] * coverage[i];
-         rgba[i][ACOMP] = (GLushort) CLAMP(a, 0.0, 65535.0);
-      }
-   }
-   else {
-      GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-      for (i = 0; i < span->end; i++) {
-         rgba[i][ACOMP] = rgba[i][ACOMP] * coverage[i];
-         /* clamp later */
-      }
-   }
-}
-
-
-/**
- * Clamp span's float colors to [0,1]
- */
-static INLINE void
-clamp_colors(SWspan *span)
-{
-   GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
-   GLuint i;
-   ASSERT(span->array->ChanType == GL_FLOAT);
-   for (i = 0; i < span->end; i++) {
-      rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
-      rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);
-      rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);
-      rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);
-   }
-}
-
-
-/**
- * Convert the span's color arrays to the given type.
- * The only way 'output' can be greater than zero is when we have a fragment
- * program that writes to gl_FragData[1] or higher.
- * \param output  which fragment program color output is being processed
- */
-static INLINE void
-convert_color_type(SWspan *span, GLenum newType, GLuint output)
-{
-   GLvoid *src, *dst;
-
-   if (output > 0 || span->array->ChanType == GL_FLOAT) {
-      src = span->array->attribs[FRAG_ATTRIB_COL0 + output];
-      span->array->ChanType = GL_FLOAT;
-   }
-   else if (span->array->ChanType == GL_UNSIGNED_BYTE) {
-      src = span->array->rgba8;
-   }
-   else {
-      ASSERT(span->array->ChanType == GL_UNSIGNED_SHORT);
-      src = span->array->rgba16;
-   }
-
-   if (newType == GL_UNSIGNED_BYTE) {
-      dst = span->array->rgba8;
-   }
-   else if (newType == GL_UNSIGNED_SHORT) {
-      dst = span->array->rgba16;
-   }
-   else {
-      dst = span->array->attribs[FRAG_ATTRIB_COL0];
-   }
-
-   _mesa_convert_colors(span->array->ChanType, src,
-                        newType, dst,
-                        span->end, span->array->mask);
-
-   span->array->ChanType = newType;
-   span->array->rgba = dst;
-}
-
-
-
-/**
- * Apply fragment shader, fragment program or normal texturing to span.
- */
-static INLINE void
-shade_texture_span(GLcontext *ctx, SWspan *span)
-{
-   GLbitfield inputsRead;
-
-   /* Determine which fragment attributes are actually needed */
-   if (ctx->FragmentProgram._Current) {
-      inputsRead = ctx->FragmentProgram._Current->Base.InputsRead;
-   }
-   else {
-      /* XXX we could be a bit smarter about this */
-      inputsRead = ~0;
-   }
-
-   if (ctx->FragmentProgram._Current ||
-       ctx->ATIFragmentShader._Enabled) {
-      /* programmable shading */
-      if (span->primitive == GL_BITMAP && span->array->ChanType != GL_FLOAT) {
-         convert_color_type(span, GL_FLOAT, 0);
-      }
-      else {
-         span->array->rgba = (void *) span->array->attribs[FRAG_ATTRIB_COL0];
-      }
-
-      if (span->primitive != GL_POINT ||
-	  (span->interpMask & SPAN_RGBA) ||
-	  ctx->Point.PointSprite) {
-         /* for single-pixel points, we populated the arrays already */
-         interpolate_active_attribs(ctx, span, ~0);
-      }
-      span->array->ChanType = GL_FLOAT;
-
-      if (!(span->arrayMask & SPAN_Z))
-         _swrast_span_interpolate_z (ctx, span);
-
-#if 0
-      if (inputsRead & FRAG_BIT_WPOS)
-#else
-      /* XXX always interpolate wpos so that DDX/DDY work */
-#endif
-         interpolate_wpos(ctx, span);
-
-      /* Run fragment program/shader now */
-      if (ctx->FragmentProgram._Current) {
-         _swrast_exec_fragment_program(ctx, span);
-      }
-      else {
-         ASSERT(ctx->ATIFragmentShader._Enabled);
-         _swrast_exec_fragment_shader(ctx, span);
-      }
-   }
-   else if (ctx->Texture._EnabledCoordUnits) {
-      /* conventional texturing */
-
-#if CHAN_BITS == 32
-      if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {
-         interpolate_int_colors(ctx, span);
-      }
-#else
-      if (!(span->arrayMask & SPAN_RGBA))
-         interpolate_int_colors(ctx, span);
-#endif
-      if ((span->arrayAttribs & FRAG_BITS_TEX_ANY) == 0x0)
-         interpolate_texcoords(ctx, span);
-
-      _swrast_texture_span(ctx, span);
-   }
-}
-
-
-
-/**
- * Apply all the per-fragment operations to a span.
- * This now includes texturing (_swrast_write_texture_span() is history).
- * This function may modify any of the array values in the span.
- * span->interpMask and span->arrayMask may be changed but will be restored
- * to their original values before returning.
- */
-void
-_swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
-{
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const GLuint *colorMask = (GLuint *) ctx->Color.ColorMask;
-   const GLbitfield origInterpMask = span->interpMask;
-   const GLbitfield origArrayMask = span->arrayMask;
-   const GLbitfield origArrayAttribs = span->arrayAttribs;
-   const GLenum origChanType = span->array->ChanType;
-   void * const origRgba = span->array->rgba;
-   const GLboolean shader = (ctx->FragmentProgram._Current
-                             || ctx->ATIFragmentShader._Enabled);
-   const GLboolean shaderOrTexture = shader || ctx->Texture._EnabledCoordUnits;
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-
-   /*
-   printf("%s()  interp 0x%x  array 0x%x\n", __FUNCTION__,
-          span->interpMask, span->arrayMask);
-   */
-
-   ASSERT(span->primitive == GL_POINT ||
-          span->primitive == GL_LINE ||
-	  span->primitive == GL_POLYGON ||
-          span->primitive == GL_BITMAP);
-
-   /* Fragment write masks */
-   if (span->arrayMask & SPAN_MASK) {
-      /* mask was initialized by caller, probably glBitmap */
-      span->writeAll = GL_FALSE;
-   }
-   else {
-      memset(span->array->mask, 1, span->end);
-      span->writeAll = GL_TRUE;
-   }
-
-   /* Clip to window/scissor box */
-   if (!clip_span(ctx, span)) {
-      return;
-   }
-
-   ASSERT(span->end <= MAX_WIDTH);
-
-   /* Depth bounds test */
-   if (ctx->Depth.BoundsTest && fb->Visual.depthBits > 0) {
-      if (!_swrast_depth_bounds_test(ctx, span)) {
-         return;
-      }
-   }
-
-#ifdef DEBUG
-   /* Make sure all fragments are within window bounds */
-   if (span->arrayMask & SPAN_XY) {
-      /* array of pixel locations */
-      GLuint i;
-      for (i = 0; i < span->end; i++) {
-         if (span->array->mask[i]) {
-            assert(span->array->x[i] >= fb->_Xmin);
-            assert(span->array->x[i] < fb->_Xmax);
-            assert(span->array->y[i] >= fb->_Ymin);
-            assert(span->array->y[i] < fb->_Ymax);
-         }
-      }
-   }
-#endif
-
-   /* Polygon Stippling */
-   if (ctx->Polygon.StippleFlag && span->primitive == GL_POLYGON) {
-      stipple_polygon_span(ctx, span);
-   }
-
-   /* This is the normal place to compute the fragment color/Z
-    * from texturing or shading.
-    */
-   if (shaderOrTexture && !swrast->_DeferredTexture) {
-      shade_texture_span(ctx, span);
-   }
-
-   /* Do the alpha test */
-   if (ctx->Color.AlphaEnabled) {
-      if (!_swrast_alpha_test(ctx, span)) {
-         /* all fragments failed test */
-         goto end;
-      }
-   }
-
-   /* Stencil and Z testing */
-   if (ctx->Stencil._Enabled || ctx->Depth.Test) {
-      if (!(span->arrayMask & SPAN_Z))
-         _swrast_span_interpolate_z(ctx, span);
-
-      if (ctx->Transform.DepthClamp)
-	 _swrast_depth_clamp_span(ctx, span);
-
-      if (ctx->Stencil._Enabled) {
-         /* Combined Z/stencil tests */
-         if (!_swrast_stencil_and_ztest_span(ctx, span)) {
-            /* all fragments failed test */
-            goto end;
-         }
-      }
-      else if (fb->Visual.depthBits > 0) {
-         /* Just regular depth testing */
-         ASSERT(ctx->Depth.Test);
-         ASSERT(span->arrayMask & SPAN_Z);
-         if (!_swrast_depth_test_span(ctx, span)) {
-            /* all fragments failed test */
-            goto end;
-         }
-      }
-   }
-
-   if (ctx->Query.CurrentOcclusionObject) {
-      /* update count of 'passed' fragments */
-      struct gl_query_object *q = ctx->Query.CurrentOcclusionObject;
-      GLuint i;
-      for (i = 0; i < span->end; i++)
-         q->Result += span->array->mask[i];
-   }
-
-   /* We had to wait until now to check for glColorMask(0,0,0,0) because of
-    * the occlusion test.
-    */
-   if (fb->_NumColorDrawBuffers == 1 && colorMask[0] == 0x0) {
-      /* no colors to write */
-      goto end;
-   }
-
-   /* If we were able to defer fragment color computation to now, there's
-    * a good chance that many fragments will have already been killed by
-    * Z/stencil testing.
-    */
-   if (shaderOrTexture && swrast->_DeferredTexture) {
-      shade_texture_span(ctx, span);
-   }
-
-#if CHAN_BITS == 32
-   if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {
-      interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);
-   }
-#else
-   if ((span->arrayMask & SPAN_RGBA) == 0) {
-      interpolate_int_colors(ctx, span);
-   }
-#endif
-
-   ASSERT(span->arrayMask & SPAN_RGBA);
-
-   if (span->primitive == GL_BITMAP || !swrast->SpecularVertexAdd) {
-      /* Add primary and specular (diffuse + specular) colors */
-      if (!shader) {
-         if (ctx->Fog.ColorSumEnabled ||
-             (ctx->Light.Enabled &&
-              ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {
-            add_specular(ctx, span);
-         }
-      }
-   }
-
-   /* Fog */
-   if (swrast->_FogEnabled) {
-      _swrast_fog_rgba_span(ctx, span);
-   }
-
-   /* Antialias coverage application */
-   if (span->arrayMask & SPAN_COVERAGE) {
-      apply_aa_coverage(span);
-   }
-
-   /* Clamp color/alpha values over the range [0.0, 1.0] before storage */
-   if (ctx->Color.ClampFragmentColor == GL_TRUE &&
-       span->array->ChanType == GL_FLOAT) {
-      clamp_colors(span);
-   }
-
-   /*
-    * Write to renderbuffers.
-    * Depending on glDrawBuffer() state and the which color outputs are
-    * written by the fragment shader, we may either replicate one color to
-    * all renderbuffers or write a different color to each renderbuffer.
-    * multiFragOutputs=TRUE for the later case.
-    */
-   {
-      const GLuint numBuffers = fb->_NumColorDrawBuffers;
-      const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
-      const GLboolean multiFragOutputs = 
-         (fp && fp->Base.OutputsWritten >= (1 << FRAG_RESULT_DATA0));
-      GLuint buf;
-
-      for (buf = 0; buf < numBuffers; buf++) {
-         struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf];
-
-         /* color[fragOutput] will be written to buffer[buf] */
-
-         if (rb) {
-            GLchan rgbaSave[MAX_WIDTH][4];
-            const GLuint fragOutput = multiFragOutputs ? buf : 0;
-
-            /* set span->array->rgba to colors for render buffer's datatype */
-            if (rb->DataType != span->array->ChanType || fragOutput > 0) {
-               convert_color_type(span, rb->DataType, fragOutput);
-            }
-            else {
-               if (rb->DataType == GL_UNSIGNED_BYTE) {
-                  span->array->rgba = span->array->rgba8;
-               }
-               else if (rb->DataType == GL_UNSIGNED_SHORT) {
-                  span->array->rgba = (void *) span->array->rgba16;
-               }
-               else {
-                  span->array->rgba = (void *)
-                     span->array->attribs[FRAG_ATTRIB_COL0];
-               }
-            }
-
-            if (!multiFragOutputs && numBuffers > 1) {
-               /* save colors for second, third renderbuffer writes */
-               memcpy(rgbaSave, span->array->rgba,
-                      4 * span->end * sizeof(GLchan));
-            }
-
-            ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||
-		   rb->_BaseFormat == GL_ALPHA);
-
-            if (ctx->Color._LogicOpEnabled) {
-               _swrast_logicop_rgba_span(ctx, rb, span);
-            }
-            else if ((ctx->Color.BlendEnabled >> buf) & 1) {
-               _swrast_blend_span(ctx, rb, span);
-            }
-
-            if (colorMask[buf] != 0xffffffff) {
-               _swrast_mask_rgba_span(ctx, rb, span, buf);
-            }
-
-            if (span->arrayMask & SPAN_XY) {
-               /* array of pixel coords */
-               ASSERT(rb->PutValues);
-               rb->PutValues(ctx, rb, span->end,
-                             span->array->x, span->array->y,
-                             span->array->rgba, span->array->mask);
-            }
-            else {
-               /* horizontal run of pixels */
-               ASSERT(rb->PutRow);
-               rb->PutRow(ctx, rb, span->end, span->x, span->y,
-                          span->array->rgba,
-                          span->writeAll ? NULL: span->array->mask);
-            }
-
-            if (!multiFragOutputs && numBuffers > 1) {
-               /* restore original span values */
-               memcpy(span->array->rgba, rgbaSave,
-                      4 * span->end * sizeof(GLchan));
-            }
-
-         } /* if rb */
-      } /* for buf */
-   }
-
-end:
-   /* restore these values before returning */
-   span->interpMask = origInterpMask;
-   span->arrayMask = origArrayMask;
-   span->arrayAttribs = origArrayAttribs;
-   span->array->ChanType = origChanType;
-   span->array->rgba = origRgba;
-}
-
-
-/**
- * Read RGBA pixels from a renderbuffer.  Clipping will be done to prevent
- * reading ouside the buffer's boundaries.
- * \param dstType  datatype for returned colors
- * \param rgba  the returned colors
- */
-void
-_swrast_read_rgba_span( GLcontext *ctx, struct gl_renderbuffer *rb,
-                        GLuint n, GLint x, GLint y, GLenum dstType,
-                        GLvoid *rgba)
-{
-   const GLint bufWidth = (GLint) rb->Width;
-   const GLint bufHeight = (GLint) rb->Height;
-
-   if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) {
-      /* completely above, below, or right */
-      /* XXX maybe leave rgba values undefined? */
-      memset(rgba, 0, 4 * n * sizeof(GLchan));
-   }
-   else {
-      GLint skip, length;
-      if (x < 0) {
-         /* left edge clipping */
-         skip = -x;
-         length = (GLint) n - skip;
-         if (length < 0) {
-            /* completely left of window */
-            return;
-         }
-         if (length > bufWidth) {
-            length = bufWidth;
-         }
-      }
-      else if ((GLint) (x + n) > bufWidth) {
-         /* right edge clipping */
-         skip = 0;
-         length = bufWidth - x;
-         if (length < 0) {
-            /* completely to right of window */
-            return;
-         }
-      }
-      else {
-         /* no clipping */
-         skip = 0;
-         length = (GLint) n;
-      }
-
-      ASSERT(rb);
-      ASSERT(rb->GetRow);
-      ASSERT(rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RGBA ||
-	     rb->_BaseFormat == GL_ALPHA);
-
-      if (rb->DataType == dstType) {
-         rb->GetRow(ctx, rb, length, x + skip, y,
-                    (GLubyte *) rgba + skip * RGBA_PIXEL_SIZE(rb->DataType));
-      }
-      else {
-         GLuint temp[MAX_WIDTH * 4];
-         rb->GetRow(ctx, rb, length, x + skip, y, temp);
-         _mesa_convert_colors(rb->DataType, temp,
-                   dstType, (GLubyte *) rgba + skip * RGBA_PIXEL_SIZE(dstType),
-                   length, NULL);
-      }
-   }
-}
-
-
-/**
- * Wrapper for gl_renderbuffer::GetValues() which does clipping to avoid
- * reading values outside the buffer bounds.
- * We can use this for reading any format/type of renderbuffer.
- * \param valueSize is the size in bytes of each value (pixel) put into the
- *                  values array.
- */
-void
-_swrast_get_values(GLcontext *ctx, struct gl_renderbuffer *rb,
-                   GLuint count, const GLint x[], const GLint y[],
-                   void *values, GLuint valueSize)
-{
-   GLuint i, inCount = 0, inStart = 0;
-
-   for (i = 0; i < count; i++) {
-      if (x[i] >= 0 && y[i] >= 0 &&
-	  x[i] < (GLint) rb->Width && y[i] < (GLint) rb->Height) {
-         /* inside */
-         if (inCount == 0)
-            inStart = i;
-         inCount++;
-      }
-      else {
-         if (inCount > 0) {
-            /* read [inStart, inStart + inCount) */
-            rb->GetValues(ctx, rb, inCount, x + inStart, y + inStart,
-                          (GLubyte *) values + inStart * valueSize);
-            inCount = 0;
-         }
-      }
-   }
-   if (inCount > 0) {
-      /* read last values */
-      rb->GetValues(ctx, rb, inCount, x + inStart, y + inStart,
-                    (GLubyte *) values + inStart * valueSize);
-   }
-}
-
-
-/**
- * Wrapper for gl_renderbuffer::PutRow() which does clipping.
- * \param valueSize  size of each value (pixel) in bytes
- */
-void
-_swrast_put_row(GLcontext *ctx, struct gl_renderbuffer *rb,
-                GLuint count, GLint x, GLint y,
-                const GLvoid *values, GLuint valueSize)
-{
-   GLint skip = 0;
-
-   if (y < 0 || y >= (GLint) rb->Height)
-      return; /* above or below */
-
-   if (x + (GLint) count <= 0 || x >= (GLint) rb->Width)
-      return; /* entirely left or right */
-
-   if ((GLint) (x + count) > (GLint) rb->Width) {
-      /* right clip */
-      GLint clip = x + count - rb->Width;
-      count -= clip;
-   }
-
-   if (x < 0) {
-      /* left clip */
-      skip = -x;
-      x = 0;
-      count -= skip;
-   }
-
-   rb->PutRow(ctx, rb, count, x, y,
-              (const GLubyte *) values + skip * valueSize, NULL);
-}
-
-
-/**
- * Wrapper for gl_renderbuffer::GetRow() which does clipping.
- * \param valueSize  size of each value (pixel) in bytes
- */
-void
-_swrast_get_row(GLcontext *ctx, struct gl_renderbuffer *rb,
-                GLuint count, GLint x, GLint y,
-                GLvoid *values, GLuint valueSize)
-{
-   GLint skip = 0;
-
-   if (y < 0 || y >= (GLint) rb->Height)
-      return; /* above or below */
-
-   if (x + (GLint) count <= 0 || x >= (GLint) rb->Width)
-      return; /* entirely left or right */
-
-   if (x + count > rb->Width) {
-      /* right clip */
-      GLint clip = x + count - rb->Width;
-      count -= clip;
-   }
-
-   if (x < 0) {
-      /* left clip */
-      skip = -x;
-      x = 0;
-      count -= skip;
-   }
-
-   rb->GetRow(ctx, rb, count, x, y, (GLubyte *) values + skip * valueSize);
-}
-
-
-/**
- * Get RGBA pixels from the given renderbuffer.
- * Used by blending, logicop and masking functions.
- * \return pointer to the colors we read.
- */
-void *
-_swrast_get_dest_rgba(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      SWspan *span)
-{
-   const GLuint pixelSize = RGBA_PIXEL_SIZE(span->array->ChanType);
-   void *rbPixels;
-
-   /* Point rbPixels to a temporary space */
-   rbPixels = span->array->attribs[FRAG_ATTRIB_MAX - 1];
-
-   /* Get destination values from renderbuffer */
-   if (span->arrayMask & SPAN_XY) {
-      _swrast_get_values(ctx, rb, span->end, span->array->x, span->array->y,
-                         rbPixels, pixelSize);
-   }
-   else {
-      _swrast_get_row(ctx, rb, span->end, span->x, span->y,
-                      rbPixels, pixelSize);
-   }
-
-   return rbPixels;
-}
+/*

+ * 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 swrast/s_span.c

+ * \brief Span processing functions used by all rasterization functions.

+ * This is where all the per-fragment tests are performed

+ * \author Brian Paul

+ */

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/image.h"

+

+#include "s_atifragshader.h"

+#include "s_alpha.h"

+#include "s_blend.h"

+#include "s_context.h"

+#include "s_depth.h"

+#include "s_fog.h"

+#include "s_logic.h"

+#include "s_masking.h"

+#include "s_fragprog.h"

+#include "s_span.h"

+#include "s_stencil.h"

+#include "s_texcombine.h"

+

+

+/**

+ * Set default fragment attributes for the span using the

+ * current raster values.  Used prior to glDraw/CopyPixels

+ * and glBitmap.

+ */

+void

+_swrast_span_default_attribs(struct gl_context *ctx, SWspan *span)

+{

+   GLchan r, g, b, a;

+   /* Z*/

+   {

+      const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;

+      if (ctx->DrawBuffer->Visual.depthBits <= 16)

+         span->z = FloatToFixed(ctx->Current.RasterPos[2] * depthMax + 0.5F);

+      else {

+         GLfloat tmpf = ctx->Current.RasterPos[2] * depthMax; 

+         tmpf = MIN2(tmpf, depthMax);

+         span->z = (GLint)tmpf;

+      }

+      span->zStep = 0;

+      span->interpMask |= SPAN_Z;

+   }

+

+   /* W (for perspective correction) */

+   span->attrStart[FRAG_ATTRIB_WPOS][3] = 1.0;

+   span->attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0;

+   span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0;

+

+   /* primary color, or color index */

+   UNCLAMPED_FLOAT_TO_CHAN(r, ctx->Current.RasterColor[0]);

+   UNCLAMPED_FLOAT_TO_CHAN(g, ctx->Current.RasterColor[1]);

+   UNCLAMPED_FLOAT_TO_CHAN(b, ctx->Current.RasterColor[2]);

+   UNCLAMPED_FLOAT_TO_CHAN(a, ctx->Current.RasterColor[3]);

+#if CHAN_TYPE == GL_FLOAT

+   span->red = r;

+   span->green = g;

+   span->blue = b;

+   span->alpha = a;

+#else

+   span->red   = IntToFixed(r);

+   span->green = IntToFixed(g);

+   span->blue  = IntToFixed(b);

+   span->alpha = IntToFixed(a);

+#endif

+   span->redStep = 0;

+   span->greenStep = 0;

+   span->blueStep = 0;

+   span->alphaStep = 0;

+   span->interpMask |= SPAN_RGBA;

+

+   COPY_4V(span->attrStart[FRAG_ATTRIB_COL0], ctx->Current.RasterColor);

+   ASSIGN_4V(span->attrStepX[FRAG_ATTRIB_COL0], 0.0, 0.0, 0.0, 0.0);

+   ASSIGN_4V(span->attrStepY[FRAG_ATTRIB_COL0], 0.0, 0.0, 0.0, 0.0);

+

+   /* Secondary color */

+   if (ctx->Light.Enabled || ctx->Fog.ColorSumEnabled)

+   {

+      COPY_4V(span->attrStart[FRAG_ATTRIB_COL1], ctx->Current.RasterSecondaryColor);

+      ASSIGN_4V(span->attrStepX[FRAG_ATTRIB_COL1], 0.0, 0.0, 0.0, 0.0);

+      ASSIGN_4V(span->attrStepY[FRAG_ATTRIB_COL1], 0.0, 0.0, 0.0, 0.0);

+   }

+

+   /* fog */

+   {

+      const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+      GLfloat fogVal; /* a coord or a blend factor */

+      if (swrast->_PreferPixelFog) {

+         /* fog blend factors will be computed from fog coordinates per pixel */

+         fogVal = ctx->Current.RasterDistance;

+      }

+      else {

+         /* fog blend factor should be computed from fogcoord now */

+         fogVal = _swrast_z_to_fogfactor(ctx, ctx->Current.RasterDistance);

+      }

+      span->attrStart[FRAG_ATTRIB_FOGC][0] = fogVal;

+      span->attrStepX[FRAG_ATTRIB_FOGC][0] = 0.0;

+      span->attrStepY[FRAG_ATTRIB_FOGC][0] = 0.0;

+   }

+

+   /* texcoords */

+   {

+      GLuint i;

+      for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {

+         const GLuint attr = FRAG_ATTRIB_TEX0 + i;

+         const GLfloat *tc = ctx->Current.RasterTexCoords[i];

+         if (ctx->FragmentProgram._Current || ctx->ATIFragmentShader._Enabled) {

+            COPY_4V(span->attrStart[attr], tc);

+         }

+         else if (tc[3] > 0.0F) {

+            /* use (s/q, t/q, r/q, 1) */

+            span->attrStart[attr][0] = tc[0] / tc[3];

+            span->attrStart[attr][1] = tc[1] / tc[3];

+            span->attrStart[attr][2] = tc[2] / tc[3];

+            span->attrStart[attr][3] = 1.0;

+         }

+         else {

+            ASSIGN_4V(span->attrStart[attr], 0.0F, 0.0F, 0.0F, 1.0F);

+         }

+         ASSIGN_4V(span->attrStepX[attr], 0.0F, 0.0F, 0.0F, 0.0F);

+         ASSIGN_4V(span->attrStepY[attr], 0.0F, 0.0F, 0.0F, 0.0F);

+      }

+   }

+}

+

+

+/**

+ * Interpolate the active attributes (and'd with attrMask) to

+ * fill in span->array->attribs[].

+ * Perspective correction will be done.  The point/line/triangle function

+ * should have computed attrStart/Step values for FRAG_ATTRIB_WPOS[3]!

+ */

+static INLINE void

+interpolate_active_attribs(struct gl_context *ctx, SWspan *span, GLbitfield attrMask)

+{

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   /*

+    * Don't overwrite existing array values, such as colors that may have

+    * been produced by glDraw/CopyPixels.

+    */

+   attrMask &= ~span->arrayAttribs;

+

+   ATTRIB_LOOP_BEGIN

+      if (attrMask & (1 << attr)) {

+         const GLfloat dwdx = span->attrStepX[FRAG_ATTRIB_WPOS][3];

+         GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3];

+         const GLfloat dv0dx = span->attrStepX[attr][0];

+         const GLfloat dv1dx = span->attrStepX[attr][1];

+         const GLfloat dv2dx = span->attrStepX[attr][2];

+         const GLfloat dv3dx = span->attrStepX[attr][3];

+         GLfloat v0 = span->attrStart[attr][0] + span->leftClip * dv0dx;

+         GLfloat v1 = span->attrStart[attr][1] + span->leftClip * dv1dx;

+         GLfloat v2 = span->attrStart[attr][2] + span->leftClip * dv2dx;

+         GLfloat v3 = span->attrStart[attr][3] + span->leftClip * dv3dx;

+         GLuint k;

+         for (k = 0; k < span->end; k++) {

+            const GLfloat invW = 1.0f / w;

+            span->array->attribs[attr][k][0] = v0 * invW;

+            span->array->attribs[attr][k][1] = v1 * invW;

+            span->array->attribs[attr][k][2] = v2 * invW;

+            span->array->attribs[attr][k][3] = v3 * invW;

+            v0 += dv0dx;

+            v1 += dv1dx;

+            v2 += dv2dx;

+            v3 += dv3dx;

+            w += dwdx;

+         }

+         ASSERT((span->arrayAttribs & (1 << attr)) == 0);

+         span->arrayAttribs |= (1 << attr);

+      }

+   ATTRIB_LOOP_END

+}

+

+

+/**

+ * Interpolate primary colors to fill in the span->array->rgba8 (or rgb16)

+ * color array.

+ */

+static INLINE void

+interpolate_int_colors(struct gl_context *ctx, SWspan *span)

+{

+   const GLuint n = span->end;

+   GLuint i;

+

+#if CHAN_BITS != 32

+   ASSERT(!(span->arrayMask & SPAN_RGBA));

+#endif

+

+   switch (span->array->ChanType) {

+#if CHAN_BITS != 32

+   case GL_UNSIGNED_BYTE:

+      {

+         GLubyte (*rgba)[4] = span->array->rgba8;

+         if (span->interpMask & SPAN_FLAT) {

+            GLubyte color[4];

+            color[RCOMP] = FixedToInt(span->red);

+            color[GCOMP] = FixedToInt(span->green);

+            color[BCOMP] = FixedToInt(span->blue);

+            color[ACOMP] = FixedToInt(span->alpha);

+            for (i = 0; i < n; i++) {

+               COPY_4UBV(rgba[i], color);

+            }

+         }

+         else {

+            GLfixed r = span->red;

+            GLfixed g = span->green;

+            GLfixed b = span->blue;

+            GLfixed a = span->alpha;

+            GLint dr = span->redStep;

+            GLint dg = span->greenStep;

+            GLint db = span->blueStep;

+            GLint da = span->alphaStep;

+            for (i = 0; i < n; i++) {

+               rgba[i][RCOMP] = FixedToChan(r);

+               rgba[i][GCOMP] = FixedToChan(g);

+               rgba[i][BCOMP] = FixedToChan(b);

+               rgba[i][ACOMP] = FixedToChan(a);

+               r += dr;

+               g += dg;

+               b += db;

+               a += da;

+            }

+         }

+      }

+      break;

+   case GL_UNSIGNED_SHORT:

+      {

+         GLushort (*rgba)[4] = span->array->rgba16;

+         if (span->interpMask & SPAN_FLAT) {

+            GLushort color[4];

+            color[RCOMP] = FixedToInt(span->red);

+            color[GCOMP] = FixedToInt(span->green);

+            color[BCOMP] = FixedToInt(span->blue);

+            color[ACOMP] = FixedToInt(span->alpha);

+            for (i = 0; i < n; i++) {

+               COPY_4V(rgba[i], color);

+            }

+         }

+         else {

+            GLushort (*rgba)[4] = span->array->rgba16;

+            GLfixed r, g, b, a;

+            GLint dr, dg, db, da;

+            r = span->red;

+            g = span->green;

+            b = span->blue;

+            a = span->alpha;

+            dr = span->redStep;

+            dg = span->greenStep;

+            db = span->blueStep;

+            da = span->alphaStep;

+            for (i = 0; i < n; i++) {

+               rgba[i][RCOMP] = FixedToChan(r);

+               rgba[i][GCOMP] = FixedToChan(g);

+               rgba[i][BCOMP] = FixedToChan(b);

+               rgba[i][ACOMP] = FixedToChan(a);

+               r += dr;

+               g += dg;

+               b += db;

+               a += da;

+            }

+         }

+      }

+      break;

+#endif

+   case GL_FLOAT:

+      interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);

+      break;

+   default:

+      _mesa_problem(NULL, "bad datatype in interpolate_int_colors");

+   }

+   span->arrayMask |= SPAN_RGBA;

+}

+

+

+/**

+ * Populate the FRAG_ATTRIB_COL0 array.

+ */

+static INLINE void

+interpolate_float_colors(SWspan *span)

+{

+   GLfloat (*col0)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+   const GLuint n = span->end;

+   GLuint i;

+

+   assert(!(span->arrayAttribs & FRAG_BIT_COL0));

+

+   if (span->arrayMask & SPAN_RGBA) {

+      /* convert array of int colors */

+      for (i = 0; i < n; i++) {

+         col0[i][0] = UBYTE_TO_FLOAT(span->array->rgba8[i][0]);

+         col0[i][1] = UBYTE_TO_FLOAT(span->array->rgba8[i][1]);

+         col0[i][2] = UBYTE_TO_FLOAT(span->array->rgba8[i][2]);

+         col0[i][3] = UBYTE_TO_FLOAT(span->array->rgba8[i][3]);

+      }

+   }

+   else {

+      /* interpolate red/green/blue/alpha to get float colors */

+      ASSERT(span->interpMask & SPAN_RGBA);

+      if (span->interpMask & SPAN_FLAT) {

+         GLfloat r = FixedToFloat(span->red);

+         GLfloat g = FixedToFloat(span->green);

+         GLfloat b = FixedToFloat(span->blue);

+         GLfloat a = FixedToFloat(span->alpha);

+         for (i = 0; i < n; i++) {

+            ASSIGN_4V(col0[i], r, g, b, a);

+         }

+      }

+      else {

+         GLfloat r = FixedToFloat(span->red);

+         GLfloat g = FixedToFloat(span->green);

+         GLfloat b = FixedToFloat(span->blue);

+         GLfloat a = FixedToFloat(span->alpha);

+         GLfloat dr = FixedToFloat(span->redStep);

+         GLfloat dg = FixedToFloat(span->greenStep);

+         GLfloat db = FixedToFloat(span->blueStep);

+         GLfloat da = FixedToFloat(span->alphaStep);

+         for (i = 0; i < n; i++) {

+            col0[i][0] = r;

+            col0[i][1] = g;

+            col0[i][2] = b;

+            col0[i][3] = a;

+            r += dr;

+            g += dg;

+            b += db;

+            a += da;

+         }

+      }

+   }

+

+   span->arrayAttribs |= FRAG_BIT_COL0;

+   span->array->ChanType = GL_FLOAT;

+}

+

+

+

+/**

+ * Fill in the span.zArray array from the span->z, zStep values.

+ */

+void

+_swrast_span_interpolate_z( const struct gl_context *ctx, SWspan *span )

+{

+   const GLuint n = span->end;

+   GLuint i;

+

+   ASSERT(!(span->arrayMask & SPAN_Z));

+

+   if (ctx->DrawBuffer->Visual.depthBits <= 16) {

+      GLfixed zval = span->z;

+      GLuint *z = span->array->z; 

+      for (i = 0; i < n; i++) {

+         z[i] = FixedToInt(zval);

+         zval += span->zStep;

+      }

+   }

+   else {

+      /* Deep Z buffer, no fixed->int shift */

+      GLuint zval = span->z;

+      GLuint *z = span->array->z;

+      for (i = 0; i < n; i++) {

+         z[i] = zval;

+         zval += span->zStep;

+      }

+   }

+   span->interpMask &= ~SPAN_Z;

+   span->arrayMask |= SPAN_Z;

+}

+

+

+/**

+ * Compute mipmap LOD from partial derivatives.

+ * This the ideal solution, as given in the OpenGL spec.

+ */

+GLfloat

+_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,

+                       GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,

+                       GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)

+{

+   GLfloat dudx = texW * ((s + dsdx) / (q + dqdx) - s * invQ);

+   GLfloat dvdx = texH * ((t + dtdx) / (q + dqdx) - t * invQ);

+   GLfloat dudy = texW * ((s + dsdy) / (q + dqdy) - s * invQ);

+   GLfloat dvdy = texH * ((t + dtdy) / (q + dqdy) - t * invQ);

+   GLfloat x = SQRTF(dudx * dudx + dvdx * dvdx);

+   GLfloat y = SQRTF(dudy * dudy + dvdy * dvdy);

+   GLfloat rho = MAX2(x, y);

+   GLfloat lambda = LOG2(rho);

+   return lambda;

+}

+

+

+/**

+ * Compute mipmap LOD from partial derivatives.

+ * This is a faster approximation than above function.

+ */

+#if 0

+GLfloat

+_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,

+                     GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,

+                     GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)

+{

+   GLfloat dsdx2 = (s + dsdx) / (q + dqdx) - s * invQ;

+   GLfloat dtdx2 = (t + dtdx) / (q + dqdx) - t * invQ;

+   GLfloat dsdy2 = (s + dsdy) / (q + dqdy) - s * invQ;

+   GLfloat dtdy2 = (t + dtdy) / (q + dqdy) - t * invQ;

+   GLfloat maxU, maxV, rho, lambda;

+   dsdx2 = FABSF(dsdx2);

+   dsdy2 = FABSF(dsdy2);

+   dtdx2 = FABSF(dtdx2);

+   dtdy2 = FABSF(dtdy2);

+   maxU = MAX2(dsdx2, dsdy2) * texW;

+   maxV = MAX2(dtdx2, dtdy2) * texH;

+   rho = MAX2(maxU, maxV);

+   lambda = LOG2(rho);

+   return lambda;

+}

+#endif

+

+

+/**

+ * Fill in the span.array->attrib[FRAG_ATTRIB_TEXn] arrays from the

+ * using the attrStart/Step values.

+ *

+ * This function only used during fixed-function fragment processing.

+ *

+ * Note: in the places where we divide by Q (or mult by invQ) we're

+ * really doing two things: perspective correction and texcoord

+ * projection.  Remember, for texcoord (s,t,r,q) we need to index

+ * texels with (s/q, t/q, r/q).

+ */

+static void

+interpolate_texcoords(struct gl_context *ctx, SWspan *span)

+{

+   const GLuint maxUnit

+      = (ctx->Texture._EnabledCoordUnits > 1) ? ctx->Const.MaxTextureUnits : 1;

+   GLuint u;

+

+   /* XXX CoordUnits vs. ImageUnits */

+   for (u = 0; u < maxUnit; u++) {

+      if (ctx->Texture._EnabledCoordUnits & (1 << u)) {

+         const GLuint attr = FRAG_ATTRIB_TEX0 + u;

+         const struct gl_texture_object *obj = ctx->Texture.Unit[u]._Current;

+         GLfloat texW, texH;

+         GLboolean needLambda;

+         GLfloat (*texcoord)[4] = span->array->attribs[attr];

+         GLfloat *lambda = span->array->lambda[u];

+         const GLfloat dsdx = span->attrStepX[attr][0];

+         const GLfloat dsdy = span->attrStepY[attr][0];

+         const GLfloat dtdx = span->attrStepX[attr][1];

+         const GLfloat dtdy = span->attrStepY[attr][1];

+         const GLfloat drdx = span->attrStepX[attr][2];

+         const GLfloat dqdx = span->attrStepX[attr][3];

+         const GLfloat dqdy = span->attrStepY[attr][3];

+         GLfloat s = span->attrStart[attr][0] + span->leftClip * dsdx;

+         GLfloat t = span->attrStart[attr][1] + span->leftClip * dtdx;

+         GLfloat r = span->attrStart[attr][2] + span->leftClip * drdx;

+         GLfloat q = span->attrStart[attr][3] + span->leftClip * dqdx;

+

+         if (obj) {

+            const struct gl_texture_image *img = obj->Image[0][obj->BaseLevel];

+            needLambda = (obj->MinFilter != obj->MagFilter)

+               || ctx->FragmentProgram._Current;

+            texW = img->WidthScale;

+            texH = img->HeightScale;

+         }

+         else {

+            /* using a fragment program */

+            texW = 1.0;

+            texH = 1.0;

+            needLambda = GL_FALSE;

+         }

+

+         if (needLambda) {

+            GLuint i;

+            if (ctx->FragmentProgram._Current

+                || ctx->ATIFragmentShader._Enabled) {

+               /* do perspective correction but don't divide s, t, r by q */

+               const GLfloat dwdx = span->attrStepX[FRAG_ATTRIB_WPOS][3];

+               GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3] + span->leftClip * dwdx;

+               for (i = 0; i < span->end; i++) {

+                  const GLfloat invW = 1.0F / w;

+                  texcoord[i][0] = s * invW;

+                  texcoord[i][1] = t * invW;

+                  texcoord[i][2] = r * invW;

+                  texcoord[i][3] = q * invW;

+                  lambda[i] = _swrast_compute_lambda(dsdx, dsdy, dtdx, dtdy,

+                                                     dqdx, dqdy, texW, texH,

+                                                     s, t, q, invW);

+                  s += dsdx;

+                  t += dtdx;

+                  r += drdx;

+                  q += dqdx;

+                  w += dwdx;

+               }

+            }

+            else {

+               for (i = 0; i < span->end; i++) {

+                  const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);

+                  texcoord[i][0] = s * invQ;

+                  texcoord[i][1] = t * invQ;

+                  texcoord[i][2] = r * invQ;

+                  texcoord[i][3] = q;

+                  lambda[i] = _swrast_compute_lambda(dsdx, dsdy, dtdx, dtdy,

+                                                     dqdx, dqdy, texW, texH,

+                                                     s, t, q, invQ);

+                  s += dsdx;

+                  t += dtdx;

+                  r += drdx;

+                  q += dqdx;

+               }

+            }

+            span->arrayMask |= SPAN_LAMBDA;

+         }

+         else {

+            GLuint i;

+            if (ctx->FragmentProgram._Current ||

+                ctx->ATIFragmentShader._Enabled) {

+               /* do perspective correction but don't divide s, t, r by q */

+               const GLfloat dwdx = span->attrStepX[FRAG_ATTRIB_WPOS][3];

+               GLfloat w = span->attrStart[FRAG_ATTRIB_WPOS][3] + span->leftClip * dwdx;

+               for (i = 0; i < span->end; i++) {

+                  const GLfloat invW = 1.0F / w;

+                  texcoord[i][0] = s * invW;

+                  texcoord[i][1] = t * invW;

+                  texcoord[i][2] = r * invW;

+                  texcoord[i][3] = q * invW;

+                  lambda[i] = 0.0;

+                  s += dsdx;

+                  t += dtdx;

+                  r += drdx;

+                  q += dqdx;

+                  w += dwdx;

+               }

+            }

+            else if (dqdx == 0.0F) {

+               /* Ortho projection or polygon's parallel to window X axis */

+               const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);

+               for (i = 0; i < span->end; i++) {

+                  texcoord[i][0] = s * invQ;

+                  texcoord[i][1] = t * invQ;

+                  texcoord[i][2] = r * invQ;

+                  texcoord[i][3] = q;

+                  lambda[i] = 0.0;

+                  s += dsdx;

+                  t += dtdx;

+                  r += drdx;

+               }

+            }

+            else {

+               for (i = 0; i < span->end; i++) {

+                  const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);

+                  texcoord[i][0] = s * invQ;

+                  texcoord[i][1] = t * invQ;

+                  texcoord[i][2] = r * invQ;

+                  texcoord[i][3] = q;

+                  lambda[i] = 0.0;

+                  s += dsdx;

+                  t += dtdx;

+                  r += drdx;

+                  q += dqdx;

+               }

+            }

+         } /* lambda */

+      } /* if */

+   } /* for */

+}

+

+

+/**

+ * Fill in the arrays->attribs[FRAG_ATTRIB_WPOS] array.

+ */

+static INLINE void

+interpolate_wpos(struct gl_context *ctx, SWspan *span)

+{

+   GLfloat (*wpos)[4] = span->array->attribs[FRAG_ATTRIB_WPOS];

+   GLuint i;

+   const GLfloat zScale = 1.0F / ctx->DrawBuffer->_DepthMaxF;

+   GLfloat w, dw;

+

+   if (span->arrayMask & SPAN_XY) {

+      for (i = 0; i < span->end; i++) {

+         wpos[i][0] = (GLfloat) span->array->x[i];

+         wpos[i][1] = (GLfloat) span->array->y[i];

+      }

+   }

+   else {

+      for (i = 0; i < span->end; i++) {

+         wpos[i][0] = (GLfloat) span->x + i;

+         wpos[i][1] = (GLfloat) span->y;

+      }

+   }

+

+   dw = span->attrStepX[FRAG_ATTRIB_WPOS][3];

+   w = span->attrStart[FRAG_ATTRIB_WPOS][3] + span->leftClip * dw;

+   for (i = 0; i < span->end; i++) {

+      wpos[i][2] = (GLfloat) span->array->z[i] * zScale;

+      wpos[i][3] = w;

+      w += dw;

+   }

+}

+

+

+/**

+ * Apply the current polygon stipple pattern to a span of pixels.

+ */

+static INLINE void

+stipple_polygon_span(struct gl_context *ctx, SWspan *span)

+{

+   GLubyte *mask = span->array->mask;

+

+   ASSERT(ctx->Polygon.StippleFlag);

+

+   if (span->arrayMask & SPAN_XY) {

+      /* arrays of x/y pixel coords */

+      GLuint i;

+      for (i = 0; i < span->end; i++) {

+         const GLint col = span->array->x[i] % 32;

+         const GLint row = span->array->y[i] % 32;

+         const GLuint stipple = ctx->PolygonStipple[row];

+         if (((1 << col) & stipple) == 0) {

+            mask[i] = 0;

+         }

+      }

+   }

+   else {

+      /* horizontal span of pixels */

+      const GLuint highBit = 1 << 31;

+      const GLuint stipple = ctx->PolygonStipple[span->y % 32];

+      GLuint i, m = highBit >> (GLuint) (span->x % 32);

+      for (i = 0; i < span->end; i++) {

+         if ((m & stipple) == 0) {

+            mask[i] = 0;

+         }

+         m = m >> 1;

+         if (m == 0) {

+            m = highBit;

+         }

+      }

+   }

+   span->writeAll = GL_FALSE;

+}

+

+

+/**

+ * Clip a pixel span to the current buffer/window boundaries:

+ * DrawBuffer->_Xmin, _Xmax, _Ymin, _Ymax.  This will accomplish

+ * window clipping and scissoring.

+ * Return:   GL_TRUE   some pixels still visible

+ *           GL_FALSE  nothing visible

+ */

+static INLINE GLuint

+clip_span( struct gl_context *ctx, SWspan *span )

+{

+   const GLint xmin = ctx->DrawBuffer->_Xmin;

+   const GLint xmax = ctx->DrawBuffer->_Xmax;

+   const GLint ymin = ctx->DrawBuffer->_Ymin;

+   const GLint ymax = ctx->DrawBuffer->_Ymax;

+

+   span->leftClip = 0;

+

+   if (span->arrayMask & SPAN_XY) {

+      /* arrays of x/y pixel coords */

+      const GLint *x = span->array->x;

+      const GLint *y = span->array->y;

+      const GLint n = span->end;

+      GLubyte *mask = span->array->mask;

+      GLint i;

+      if (span->arrayMask & SPAN_MASK) {

+         /* note: using & intead of && to reduce branches */

+         for (i = 0; i < n; i++) {

+            mask[i] &= (x[i] >= xmin) & (x[i] < xmax)

+                     & (y[i] >= ymin) & (y[i] < ymax);

+         }

+      }

+      else {

+         /* note: using & intead of && to reduce branches */

+         for (i = 0; i < n; i++) {

+            mask[i] = (x[i] >= xmin) & (x[i] < xmax)

+                    & (y[i] >= ymin) & (y[i] < ymax);

+         }

+      }

+      return GL_TRUE;  /* some pixels visible */

+   }

+   else {

+      /* horizontal span of pixels */

+      const GLint x = span->x;

+      const GLint y = span->y;

+      GLint n = span->end;

+

+      /* Trivial rejection tests */

+      if (y < ymin || y >= ymax || x + n <= xmin || x >= xmax) {

+         span->end = 0;

+         return GL_FALSE;  /* all pixels clipped */

+      }

+

+      /* Clip to right */

+      if (x + n > xmax) {

+         ASSERT(x < xmax);

+         n = span->end = xmax - x;

+      }

+

+      /* Clip to the left */

+      if (x < xmin) {

+         const GLint leftClip = xmin - x;

+         GLuint i;

+

+         ASSERT(leftClip > 0);

+         ASSERT(x + n > xmin);

+

+         /* Clip 'leftClip' pixels from the left side.

+          * The span->leftClip field will be applied when we interpolate

+          * fragment attributes.

+          * For arrays of values, shift them left.

+          */

+         for (i = 0; i < FRAG_ATTRIB_MAX; i++) {

+            if (span->interpMask & (1 << i)) {

+               GLuint j;

+               for (j = 0; j < 4; j++) {

+                  span->attrStart[i][j] += leftClip * span->attrStepX[i][j];

+               }

+            }

+         }

+

+         span->red += leftClip * span->redStep;

+         span->green += leftClip * span->greenStep;

+         span->blue += leftClip * span->blueStep;

+         span->alpha += leftClip * span->alphaStep;

+         span->index += leftClip * span->indexStep;

+         span->z += leftClip * span->zStep;

+         span->intTex[0] += leftClip * span->intTexStep[0];

+         span->intTex[1] += leftClip * span->intTexStep[1];

+

+#define SHIFT_ARRAY(ARRAY, SHIFT, LEN) \

+         memcpy(ARRAY, ARRAY + (SHIFT), (LEN) * sizeof(ARRAY[0]))

+

+         for (i = 0; i < FRAG_ATTRIB_MAX; i++) {

+            if (span->arrayAttribs & (1 << i)) {

+               /* shift array elements left by 'leftClip' */

+               SHIFT_ARRAY(span->array->attribs[i], leftClip, n - leftClip);

+            }

+         }

+

+         SHIFT_ARRAY(span->array->mask, leftClip, n - leftClip);

+         SHIFT_ARRAY(span->array->rgba8, leftClip, n - leftClip);

+         SHIFT_ARRAY(span->array->rgba16, leftClip, n - leftClip);

+         SHIFT_ARRAY(span->array->x, leftClip, n - leftClip);

+         SHIFT_ARRAY(span->array->y, leftClip, n - leftClip);

+         SHIFT_ARRAY(span->array->z, leftClip, n - leftClip);

+         SHIFT_ARRAY(span->array->index, leftClip, n - leftClip);

+         for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {

+            SHIFT_ARRAY(span->array->lambda[i], leftClip, n - leftClip);

+         }

+         SHIFT_ARRAY(span->array->coverage, leftClip, n - leftClip);

+

+#undef SHIFT_ARRAY

+

+         span->leftClip = leftClip;

+         span->x = xmin;

+         span->end -= leftClip;

+         span->writeAll = GL_FALSE;

+      }

+

+      ASSERT(span->x >= xmin);

+      ASSERT(span->x + span->end <= xmax);

+      ASSERT(span->y >= ymin);

+      ASSERT(span->y < ymax);

+

+      return GL_TRUE;  /* some pixels visible */

+   }

+}

+

+

+/**

+ * Add specular colors to primary colors.

+ * Only called during fixed-function operation.

+ * Result is float color array (FRAG_ATTRIB_COL0).

+ */

+static INLINE void

+add_specular(struct gl_context *ctx, SWspan *span)

+{

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const GLubyte *mask = span->array->mask;

+   GLfloat (*col0)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+   GLfloat (*col1)[4] = span->array->attribs[FRAG_ATTRIB_COL1];

+   GLuint i;

+

+   ASSERT(!ctx->FragmentProgram._Current);

+   ASSERT(span->arrayMask & SPAN_RGBA);

+   ASSERT(swrast->_ActiveAttribMask & FRAG_BIT_COL1);

+   (void) swrast; /* silence warning */

+

+   if (span->array->ChanType == GL_FLOAT) {

+      if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {

+         interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);

+      }

+   }

+   else {

+      /* need float colors */

+      if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {

+         interpolate_float_colors(span);

+      }

+   }

+

+   if ((span->arrayAttribs & FRAG_BIT_COL1) == 0) {

+      /* XXX could avoid this and interpolate COL1 in the loop below */

+      interpolate_active_attribs(ctx, span, FRAG_BIT_COL1);

+   }

+

+   ASSERT(span->arrayAttribs & FRAG_BIT_COL0);

+   ASSERT(span->arrayAttribs & FRAG_BIT_COL1);

+

+   for (i = 0; i < span->end; i++) {

+      if (mask[i]) {

+         col0[i][0] += col1[i][0];

+         col0[i][1] += col1[i][1];

+         col0[i][2] += col1[i][2];

+      }

+   }

+

+   span->array->ChanType = GL_FLOAT;

+}

+

+

+/**

+ * Apply antialiasing coverage value to alpha values.

+ */

+static INLINE void

+apply_aa_coverage(SWspan *span)

+{

+   const GLfloat *coverage = span->array->coverage;

+   GLuint i;

+   if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+      GLubyte (*rgba)[4] = span->array->rgba8;

+      for (i = 0; i < span->end; i++) {

+         const GLfloat a = rgba[i][ACOMP] * coverage[i];

+         rgba[i][ACOMP] = (GLubyte) CLAMP(a, 0.0, 255.0);

+         ASSERT(coverage[i] >= 0.0);

+         ASSERT(coverage[i] <= 1.0);

+      }

+   }

+   else if (span->array->ChanType == GL_UNSIGNED_SHORT) {

+      GLushort (*rgba)[4] = span->array->rgba16;

+      for (i = 0; i < span->end; i++) {

+         const GLfloat a = rgba[i][ACOMP] * coverage[i];

+         rgba[i][ACOMP] = (GLushort) CLAMP(a, 0.0, 65535.0);

+      }

+   }

+   else {

+      GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+      for (i = 0; i < span->end; i++) {

+         rgba[i][ACOMP] = rgba[i][ACOMP] * coverage[i];

+         /* clamp later */

+      }

+   }

+}

+

+

+/**

+ * Clamp span's float colors to [0,1]

+ */

+static INLINE void

+clamp_colors(SWspan *span)

+{

+   GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];

+   GLuint i;

+   ASSERT(span->array->ChanType == GL_FLOAT);

+   for (i = 0; i < span->end; i++) {

+      rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);

+      rgba[i][GCOMP] = CLAMP(rgba[i][GCOMP], 0.0F, 1.0F);

+      rgba[i][BCOMP] = CLAMP(rgba[i][BCOMP], 0.0F, 1.0F);

+      rgba[i][ACOMP] = CLAMP(rgba[i][ACOMP], 0.0F, 1.0F);

+   }

+}

+

+

+/**

+ * Convert the span's color arrays to the given type.

+ * The only way 'output' can be greater than zero is when we have a fragment

+ * program that writes to gl_FragData[1] or higher.

+ * \param output  which fragment program color output is being processed

+ */

+static INLINE void

+convert_color_type(SWspan *span, GLenum newType, GLuint output)

+{

+   GLvoid *src, *dst;

+

+   if (output > 0 || span->array->ChanType == GL_FLOAT) {

+      src = span->array->attribs[FRAG_ATTRIB_COL0 + output];

+      span->array->ChanType = GL_FLOAT;

+   }

+   else if (span->array->ChanType == GL_UNSIGNED_BYTE) {

+      src = span->array->rgba8;

+   }

+   else {

+      ASSERT(span->array->ChanType == GL_UNSIGNED_SHORT);

+      src = span->array->rgba16;

+   }

+

+   if (newType == GL_UNSIGNED_BYTE) {

+      dst = span->array->rgba8;

+   }

+   else if (newType == GL_UNSIGNED_SHORT) {

+      dst = span->array->rgba16;

+   }

+   else {

+      dst = span->array->attribs[FRAG_ATTRIB_COL0];

+   }

+

+   _mesa_convert_colors(span->array->ChanType, src,

+                        newType, dst,

+                        span->end, span->array->mask);

+

+   span->array->ChanType = newType;

+   span->array->rgba = dst;

+}

+

+

+

+/**

+ * Apply fragment shader, fragment program or normal texturing to span.

+ */

+static INLINE void

+shade_texture_span(struct gl_context *ctx, SWspan *span)

+{

+   GLbitfield inputsRead;

+

+   /* Determine which fragment attributes are actually needed */

+   if (ctx->FragmentProgram._Current) {

+      inputsRead = ctx->FragmentProgram._Current->Base.InputsRead;

+   }

+   else {

+      /* XXX we could be a bit smarter about this */

+      inputsRead = ~0;

+   }

+

+   if (ctx->FragmentProgram._Current ||

+       ctx->ATIFragmentShader._Enabled) {

+      /* programmable shading */

+      if (span->primitive == GL_BITMAP && span->array->ChanType != GL_FLOAT) {

+         convert_color_type(span, GL_FLOAT, 0);

+      }

+      else {

+         span->array->rgba = (void *) span->array->attribs[FRAG_ATTRIB_COL0];

+      }

+

+      if (span->primitive != GL_POINT ||

+	  (span->interpMask & SPAN_RGBA) ||

+	  ctx->Point.PointSprite) {

+         /* for single-pixel points, we populated the arrays already */

+         interpolate_active_attribs(ctx, span, ~0);

+      }

+      span->array->ChanType = GL_FLOAT;

+

+      if (!(span->arrayMask & SPAN_Z))

+         _swrast_span_interpolate_z (ctx, span);

+

+#if 0

+      if (inputsRead & FRAG_BIT_WPOS)

+#else

+      /* XXX always interpolate wpos so that DDX/DDY work */

+#endif

+         interpolate_wpos(ctx, span);

+

+      /* Run fragment program/shader now */

+      if (ctx->FragmentProgram._Current) {

+         _swrast_exec_fragment_program(ctx, span);

+      }

+      else {

+         ASSERT(ctx->ATIFragmentShader._Enabled);

+         _swrast_exec_fragment_shader(ctx, span);

+      }

+   }

+   else if (ctx->Texture._EnabledCoordUnits) {

+      /* conventional texturing */

+

+#if CHAN_BITS == 32

+      if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {

+         interpolate_int_colors(ctx, span);

+      }

+#else

+      if (!(span->arrayMask & SPAN_RGBA))

+         interpolate_int_colors(ctx, span);

+#endif

+      if ((span->arrayAttribs & FRAG_BITS_TEX_ANY) == 0x0)

+         interpolate_texcoords(ctx, span);

+

+      _swrast_texture_span(ctx, span);

+   }

+}

+

+

+

+/**

+ * Apply all the per-fragment operations to a span.

+ * This now includes texturing (_swrast_write_texture_span() is history).

+ * This function may modify any of the array values in the span.

+ * span->interpMask and span->arrayMask may be changed but will be restored

+ * to their original values before returning.

+ */

+void

+_swrast_write_rgba_span( struct gl_context *ctx, SWspan *span)

+{

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   const GLuint *colorMask = (GLuint *) ctx->Color.ColorMask;

+   const GLbitfield origInterpMask = span->interpMask;

+   const GLbitfield origArrayMask = span->arrayMask;

+   const GLbitfield origArrayAttribs = span->arrayAttribs;

+   const GLenum origChanType = span->array->ChanType;

+   void * const origRgba = span->array->rgba;

+   const GLboolean shader = (ctx->FragmentProgram._Current

+                             || ctx->ATIFragmentShader._Enabled);

+   const GLboolean shaderOrTexture = shader || ctx->Texture._EnabledCoordUnits;

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+

+   /*

+   printf("%s()  interp 0x%x  array 0x%x\n", __FUNCTION__,

+          span->interpMask, span->arrayMask);

+   */

+

+   ASSERT(span->primitive == GL_POINT ||

+          span->primitive == GL_LINE ||

+	  span->primitive == GL_POLYGON ||

+          span->primitive == GL_BITMAP);

+

+   /* Fragment write masks */

+   if (span->arrayMask & SPAN_MASK) {

+      /* mask was initialized by caller, probably glBitmap */

+      span->writeAll = GL_FALSE;

+   }

+   else {

+      memset(span->array->mask, 1, span->end);

+      span->writeAll = GL_TRUE;

+   }

+

+   /* Clip to window/scissor box */

+   if (!clip_span(ctx, span)) {

+      return;

+   }

+

+   ASSERT(span->end <= MAX_WIDTH);

+

+   /* Depth bounds test */

+   if (ctx->Depth.BoundsTest && fb->Visual.depthBits > 0) {

+      if (!_swrast_depth_bounds_test(ctx, span)) {

+         return;

+      }

+   }

+

+#ifdef DEBUG

+   /* Make sure all fragments are within window bounds */

+   if (span->arrayMask & SPAN_XY) {

+      /* array of pixel locations */

+      GLuint i;

+      for (i = 0; i < span->end; i++) {

+         if (span->array->mask[i]) {

+            assert(span->array->x[i] >= fb->_Xmin);

+            assert(span->array->x[i] < fb->_Xmax);

+            assert(span->array->y[i] >= fb->_Ymin);

+            assert(span->array->y[i] < fb->_Ymax);

+         }

+      }

+   }

+#endif

+

+   /* Polygon Stippling */

+   if (ctx->Polygon.StippleFlag && span->primitive == GL_POLYGON) {

+      stipple_polygon_span(ctx, span);

+   }

+

+   /* This is the normal place to compute the fragment color/Z

+    * from texturing or shading.

+    */

+   if (shaderOrTexture && !swrast->_DeferredTexture) {

+      shade_texture_span(ctx, span);

+   }

+

+   /* Do the alpha test */

+   if (ctx->Color.AlphaEnabled) {

+      if (!_swrast_alpha_test(ctx, span)) {

+         /* all fragments failed test */

+         goto end;

+      }

+   }

+

+   /* Stencil and Z testing */

+   if (ctx->Stencil._Enabled || ctx->Depth.Test) {

+      if (!(span->arrayMask & SPAN_Z))

+         _swrast_span_interpolate_z(ctx, span);

+

+      if (ctx->Transform.DepthClamp)

+	 _swrast_depth_clamp_span(ctx, span);

+

+      if (ctx->Stencil._Enabled) {

+         /* Combined Z/stencil tests */

+         if (!_swrast_stencil_and_ztest_span(ctx, span)) {

+            /* all fragments failed test */

+            goto end;

+         }

+      }

+      else if (fb->Visual.depthBits > 0) {

+         /* Just regular depth testing */

+         ASSERT(ctx->Depth.Test);

+         ASSERT(span->arrayMask & SPAN_Z);

+         if (!_swrast_depth_test_span(ctx, span)) {

+            /* all fragments failed test */

+            goto end;

+         }

+      }

+   }

+

+   if (ctx->Query.CurrentOcclusionObject) {

+      /* update count of 'passed' fragments */

+      struct gl_query_object *q = ctx->Query.CurrentOcclusionObject;

+      GLuint i;

+      for (i = 0; i < span->end; i++)

+         q->Result += span->array->mask[i];

+   }

+

+   /* We had to wait until now to check for glColorMask(0,0,0,0) because of

+    * the occlusion test.

+    */

+   if (fb->_NumColorDrawBuffers == 1 && colorMask[0] == 0x0) {

+      /* no colors to write */

+      goto end;

+   }

+

+   /* If we were able to defer fragment color computation to now, there's

+    * a good chance that many fragments will have already been killed by

+    * Z/stencil testing.

+    */

+   if (shaderOrTexture && swrast->_DeferredTexture) {

+      shade_texture_span(ctx, span);

+   }

+

+#if CHAN_BITS == 32

+   if ((span->arrayAttribs & FRAG_BIT_COL0) == 0) {

+      interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);

+   }

+#else

+   if ((span->arrayMask & SPAN_RGBA) == 0) {

+      interpolate_int_colors(ctx, span);

+   }

+#endif

+

+   ASSERT(span->arrayMask & SPAN_RGBA);

+

+   if (span->primitive == GL_BITMAP || !swrast->SpecularVertexAdd) {

+      /* Add primary and specular (diffuse + specular) colors */

+      if (!shader) {

+         if (ctx->Fog.ColorSumEnabled ||

+             (ctx->Light.Enabled &&

+              ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)) {

+            add_specular(ctx, span);

+         }

+      }

+   }

+

+   /* Fog */

+   if (swrast->_FogEnabled) {

+      _swrast_fog_rgba_span(ctx, span);

+   }

+

+   /* Antialias coverage application */

+   if (span->arrayMask & SPAN_COVERAGE) {

+      apply_aa_coverage(span);

+   }

+

+   /* Clamp color/alpha values over the range [0.0, 1.0] before storage */

+   if (ctx->Color.ClampFragmentColor == GL_TRUE &&

+       span->array->ChanType == GL_FLOAT) {

+      clamp_colors(span);

+   }

+

+   /*

+    * Write to renderbuffers.

+    * Depending on glDrawBuffer() state and the which color outputs are

+    * written by the fragment shader, we may either replicate one color to

+    * all renderbuffers or write a different color to each renderbuffer.

+    * multiFragOutputs=TRUE for the later case.

+    */

+   {

+      const GLuint numBuffers = fb->_NumColorDrawBuffers;

+      const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;

+      const GLboolean multiFragOutputs = 

+         (fp && fp->Base.OutputsWritten >= (1 << FRAG_RESULT_DATA0));

+      GLuint buf;

+

+      for (buf = 0; buf < numBuffers; buf++) {

+         struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf];

+

+         /* color[fragOutput] will be written to buffer[buf] */

+

+         if (rb) {

+            GLchan rgbaSave[MAX_WIDTH][4];

+            const GLuint fragOutput = multiFragOutputs ? buf : 0;

+

+            /* set span->array->rgba to colors for render buffer's datatype */

+            if (rb->DataType != span->array->ChanType || fragOutput > 0) {

+               convert_color_type(span, rb->DataType, fragOutput);

+            }

+            else {

+               if (rb->DataType == GL_UNSIGNED_BYTE) {

+                  span->array->rgba = span->array->rgba8;

+               }

+               else if (rb->DataType == GL_UNSIGNED_SHORT) {

+                  span->array->rgba = (void *) span->array->rgba16;

+               }

+               else {

+                  span->array->rgba = (void *)

+                     span->array->attribs[FRAG_ATTRIB_COL0];

+               }

+            }

+

+            if (!multiFragOutputs && numBuffers > 1) {

+               /* save colors for second, third renderbuffer writes */

+               memcpy(rgbaSave, span->array->rgba,

+                      4 * span->end * sizeof(GLchan));

+            }

+

+            ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||

+		   rb->_BaseFormat == GL_ALPHA);

+

+            if (ctx->Color._LogicOpEnabled) {

+               _swrast_logicop_rgba_span(ctx, rb, span);

+            }

+            else if ((ctx->Color.BlendEnabled >> buf) & 1) {

+               _swrast_blend_span(ctx, rb, span);

+            }

+

+            if (colorMask[buf] != 0xffffffff) {

+               _swrast_mask_rgba_span(ctx, rb, span, buf);

+            }

+

+            if (span->arrayMask & SPAN_XY) {

+               /* array of pixel coords */

+               ASSERT(rb->PutValues);

+               rb->PutValues(ctx, rb, span->end,

+                             span->array->x, span->array->y,

+                             span->array->rgba, span->array->mask);

+            }

+            else {

+               /* horizontal run of pixels */

+               ASSERT(rb->PutRow);

+               rb->PutRow(ctx, rb, span->end, span->x, span->y,

+                          span->array->rgba,

+                          span->writeAll ? NULL: span->array->mask);

+            }

+

+            if (!multiFragOutputs && numBuffers > 1) {

+               /* restore original span values */

+               memcpy(span->array->rgba, rgbaSave,

+                      4 * span->end * sizeof(GLchan));

+            }

+

+         } /* if rb */

+      } /* for buf */

+   }

+

+end:

+   /* restore these values before returning */

+   span->interpMask = origInterpMask;

+   span->arrayMask = origArrayMask;

+   span->arrayAttribs = origArrayAttribs;

+   span->array->ChanType = origChanType;

+   span->array->rgba = origRgba;

+}

+

+

+/**

+ * Read RGBA pixels from a renderbuffer.  Clipping will be done to prevent

+ * reading ouside the buffer's boundaries.

+ * \param dstType  datatype for returned colors

+ * \param rgba  the returned colors

+ */

+void

+_swrast_read_rgba_span( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                        GLuint n, GLint x, GLint y, GLenum dstType,

+                        GLvoid *rgba)

+{

+   const GLint bufWidth = (GLint) rb->Width;

+   const GLint bufHeight = (GLint) rb->Height;

+

+   if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) {

+      /* completely above, below, or right */

+      /* XXX maybe leave rgba values undefined? */

+      memset(rgba, 0, 4 * n * sizeof(GLchan));

+   }

+   else {

+      GLint skip, length;

+      if (x < 0) {

+         /* left edge clipping */

+         skip = -x;

+         length = (GLint) n - skip;

+         if (length < 0) {

+            /* completely left of window */

+            return;

+         }

+         if (length > bufWidth) {

+            length = bufWidth;

+         }

+      }

+      else if ((GLint) (x + n) > bufWidth) {

+         /* right edge clipping */

+         skip = 0;

+         length = bufWidth - x;

+         if (length < 0) {

+            /* completely to right of window */

+            return;

+         }

+      }

+      else {

+         /* no clipping */

+         skip = 0;

+         length = (GLint) n;

+      }

+

+      ASSERT(rb);

+      ASSERT(rb->GetRow);

+      ASSERT(rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RGBA ||

+	     rb->_BaseFormat == GL_ALPHA);

+

+      if (rb->DataType == dstType) {

+         rb->GetRow(ctx, rb, length, x + skip, y,

+                    (GLubyte *) rgba + skip * RGBA_PIXEL_SIZE(rb->DataType));

+      }

+      else {

+         GLuint temp[MAX_WIDTH * 4];

+         rb->GetRow(ctx, rb, length, x + skip, y, temp);

+         _mesa_convert_colors(rb->DataType, temp,

+                   dstType, (GLubyte *) rgba + skip * RGBA_PIXEL_SIZE(dstType),

+                   length, NULL);

+      }

+   }

+}

+

+

+/**

+ * Wrapper for gl_renderbuffer::GetValues() which does clipping to avoid

+ * reading values outside the buffer bounds.

+ * We can use this for reading any format/type of renderbuffer.

+ * \param valueSize is the size in bytes of each value (pixel) put into the

+ *                  values array.

+ */

+void

+_swrast_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLuint count, const GLint x[], const GLint y[],

+                   void *values, GLuint valueSize)

+{

+   GLuint i, inCount = 0, inStart = 0;

+

+   for (i = 0; i < count; i++) {

+      if (x[i] >= 0 && y[i] >= 0 &&

+	  x[i] < (GLint) rb->Width && y[i] < (GLint) rb->Height) {

+         /* inside */

+         if (inCount == 0)

+            inStart = i;

+         inCount++;

+      }

+      else {

+         if (inCount > 0) {

+            /* read [inStart, inStart + inCount) */

+            rb->GetValues(ctx, rb, inCount, x + inStart, y + inStart,

+                          (GLubyte *) values + inStart * valueSize);

+            inCount = 0;

+         }

+      }

+   }

+   if (inCount > 0) {

+      /* read last values */

+      rb->GetValues(ctx, rb, inCount, x + inStart, y + inStart,

+                    (GLubyte *) values + inStart * valueSize);

+   }

+}

+

+

+/**

+ * Wrapper for gl_renderbuffer::PutRow() which does clipping.

+ * \param valueSize  size of each value (pixel) in bytes

+ */

+void

+_swrast_put_row(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                GLuint count, GLint x, GLint y,

+                const GLvoid *values, GLuint valueSize)

+{

+   GLint skip = 0;

+

+   if (y < 0 || y >= (GLint) rb->Height)

+      return; /* above or below */

+

+   if (x + (GLint) count <= 0 || x >= (GLint) rb->Width)

+      return; /* entirely left or right */

+

+   if ((GLint) (x + count) > (GLint) rb->Width) {

+      /* right clip */

+      GLint clip = x + count - rb->Width;

+      count -= clip;

+   }

+

+   if (x < 0) {

+      /* left clip */

+      skip = -x;

+      x = 0;

+      count -= skip;

+   }

+

+   rb->PutRow(ctx, rb, count, x, y,

+              (const GLubyte *) values + skip * valueSize, NULL);

+}

+

+

+/**

+ * Wrapper for gl_renderbuffer::GetRow() which does clipping.

+ * \param valueSize  size of each value (pixel) in bytes

+ */

+void

+_swrast_get_row(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                GLuint count, GLint x, GLint y,

+                GLvoid *values, GLuint valueSize)

+{

+   GLint skip = 0;

+

+   if (y < 0 || y >= (GLint) rb->Height)

+      return; /* above or below */

+

+   if (x + (GLint) count <= 0 || x >= (GLint) rb->Width)

+      return; /* entirely left or right */

+

+   if (x + count > rb->Width) {

+      /* right clip */

+      GLint clip = x + count - rb->Width;

+      count -= clip;

+   }

+

+   if (x < 0) {

+      /* left clip */

+      skip = -x;

+      x = 0;

+      count -= skip;

+   }

+

+   rb->GetRow(ctx, rb, count, x, y, (GLubyte *) values + skip * valueSize);

+}

+

+

+/**

+ * Get RGBA pixels from the given renderbuffer.

+ * Used by blending, logicop and masking functions.

+ * \return pointer to the colors we read.

+ */

+void *

+_swrast_get_dest_rgba(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                      SWspan *span)

+{

+   const GLuint pixelSize = RGBA_PIXEL_SIZE(span->array->ChanType);

+   void *rbPixels;

+

+   /* Point rbPixels to a temporary space */

+   rbPixels = span->array->attribs[FRAG_ATTRIB_MAX - 1];

+

+   /* Get destination values from renderbuffer */

+   if (span->arrayMask & SPAN_XY) {

+      _swrast_get_values(ctx, rb, span->end, span->array->x, span->array->y,

+                         rbPixels, pixelSize);

+   }

+   else {

+      _swrast_get_row(ctx, rb, span->end, span->x, span->y,

+                      rbPixels, pixelSize);

+   }

+

+   return rbPixels;

+}

diff --git a/mesalib/src/mesa/swrast/s_span.h b/mesalib/src/mesa/swrast/s_span.h
index aaf1fec2a..d3cce304f 100644
--- a/mesalib/src/mesa/swrast/s_span.h
+++ b/mesalib/src/mesa/swrast/s_span.h
@@ -1,218 +1,223 @@
-/*
- * 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.
- */
-
-
-#ifndef S_SPAN_H
-#define S_SPAN_H
-
-
-#include "swrast.h"
-
-
-/**
- * \defgroup SpanFlags
- * Special bitflags to describe span data.
- *
- * In general, the point/line/triangle functions interpolate/emit the
- * attributes specified by swrast->_ActiveAttribs (i.e. FRAT_BIT_* values).
- * Some things don't fit into that, though, so we have these flags.
- */
-/*@{*/
-#define SPAN_RGBA       0x01  /**< interpMask and arrayMask */
-#define SPAN_Z          0x02  /**< interpMask and arrayMask */
-#define SPAN_FLAT       0x04  /**< interpMask: flat shading? */
-#define SPAN_XY         0x08  /**< array.x[], y[] valid? */
-#define SPAN_MASK       0x10  /**< was array.mask[] filled in by caller? */
-#define SPAN_LAMBDA     0x20  /**< array.lambda[] valid? */
-#define SPAN_COVERAGE   0x40  /**< array.coverage[] valid? */
-/*@}*/
-
-
-/**
- * \sw_span_arrays 
- * \brief Arrays of fragment values.
- *
- * These will either be computed from the span x/xStep values or
- * filled in by glDraw/CopyPixels, etc.
- * These arrays are separated out of sw_span to conserve memory.
- */
-typedef struct sw_span_arrays
-{
-   /** Per-fragment attributes (indexed by FRAG_ATTRIB_* tokens) */
-   /* XXX someday look at transposing first two indexes for better memory
-    * access pattern.
-    */
-   GLfloat attribs[FRAG_ATTRIB_MAX][MAX_WIDTH][4];
-
-   /** This mask indicates which fragments are alive or culled */
-   GLubyte mask[MAX_WIDTH];
-
-   GLenum ChanType; /**< Color channel type, GL_UNSIGNED_BYTE, GL_FLOAT */
-
-   /** Attribute arrays that don't fit into attribs[] array above */
-   /*@{*/
-   GLubyte rgba8[MAX_WIDTH][4];
-   GLushort rgba16[MAX_WIDTH][4];
-   GLchan (*rgba)[4];  /** either == rgba8 or rgba16 */
-   GLint   x[MAX_WIDTH];  /**< fragment X coords */
-   GLint   y[MAX_WIDTH];  /**< fragment Y coords */
-   GLuint  z[MAX_WIDTH];  /**< fragment Z coords */
-   GLuint  index[MAX_WIDTH];  /**< Color indexes */
-   GLfloat lambda[MAX_TEXTURE_COORD_UNITS][MAX_WIDTH]; /**< Texture LOD */
-   GLfloat coverage[MAX_WIDTH];  /**< Fragment coverage for AA/smoothing */
-   /*@}*/
-} SWspanarrays;
-
-
-/**
- * The SWspan structure describes the colors, Z, fogcoord, texcoords,
- * etc for either a horizontal run or an array of independent pixels.
- * We can either specify a base/step to indicate interpolated values, or
- * fill in explicit arrays of values.  The interpMask and arrayMask bitfields
- * indicate which attributes are active interpolants or arrays, respectively.
- *
- * It would be interesting to experiment with multiprocessor rasterization
- * with this structure.  The triangle rasterizer could simply emit a
- * stream of these structures which would be consumed by one or more
- * span-processing threads which could run in parallel.
- */
-typedef struct sw_span
-{
-   /** Coord of first fragment in horizontal span/run */
-   GLint x, y;
-
-   /** Number of fragments in the span */
-   GLuint end;
-
-   /** for clipping left edge of spans */
-   GLuint leftClip;
-
-   /** This flag indicates that mask[] array is effectively filled with ones */
-   GLboolean writeAll;
-
-   /** either GL_POLYGON, GL_LINE, GL_POLYGON, GL_BITMAP */
-   GLenum primitive;
-
-   /** 0 = front-facing span, 1 = back-facing span (for two-sided stencil) */
-   GLuint facing;
-
-   /**
-    * This bitmask (of  \link SpanFlags SPAN_* flags\endlink) indicates
-    * which of the attrStart/StepX/StepY variables are relevant.
-    */
-   GLbitfield interpMask;
-
-   /** Fragment attribute interpolants */
-   GLfloat attrStart[FRAG_ATTRIB_MAX][4];   /**< initial value */
-   GLfloat attrStepX[FRAG_ATTRIB_MAX][4];   /**< dvalue/dx */
-   GLfloat attrStepY[FRAG_ATTRIB_MAX][4];   /**< dvalue/dy */
-
-   /* XXX the rest of these will go away eventually... */
-
-   /* For horizontal spans, step is the partial derivative wrt X.
-    * For lines, step is the delta from one fragment to the next.
-    */
-   GLfixed red, redStep;
-   GLfixed green, greenStep;
-   GLfixed blue, blueStep;
-   GLfixed alpha, alphaStep;
-   GLfixed index, indexStep;
-   GLfixed z, zStep;    /**< XXX z should probably be GLuint */
-   GLfixed intTex[2], intTexStep[2];  /**< (s,t) for unit[0] only */
-
-   /**
-    * This bitmask (of \link SpanFlags SPAN_* flags\endlink) indicates
-    * which of the fragment arrays in the span_arrays struct are relevant.
-    */
-   GLbitfield arrayMask;
-
-   GLbitfield arrayAttribs;
-
-   /**
-    * We store the arrays of fragment values in a separate struct so
-    * that we can allocate sw_span structs on the stack without using
-    * a lot of memory.  The span_arrays struct is about 1.4MB while the
-    * sw_span struct is only about 512 bytes.
-    */
-   SWspanarrays *array;
-} SWspan;
-
-
-
-#define INIT_SPAN(S, PRIMITIVE)			\
-do {						\
-   (S).primitive = (PRIMITIVE);			\
-   (S).interpMask = 0x0;			\
-   (S).arrayMask = 0x0;				\
-   (S).arrayAttribs = 0x0;			\
-   (S).end = 0;					\
-   (S).leftClip = 0;				\
-   (S).facing = 0;				\
-   (S).array = SWRAST_CONTEXT(ctx)->SpanArrays;	\
-} while (0)
-
-
-
-extern void
-_swrast_span_default_attribs(GLcontext *ctx, SWspan *span);
-
-extern void
-_swrast_span_interpolate_z( const GLcontext *ctx, SWspan *span );
-
-extern GLfloat
-_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
-                       GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
-                       GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);
-
-
-extern void
-_swrast_write_rgba_span( GLcontext *ctx, SWspan *span);
-
-
-extern void
-_swrast_read_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                       GLuint n, GLint x, GLint y, GLenum type, GLvoid *rgba);
-
-extern void
-_swrast_get_values(GLcontext *ctx, struct gl_renderbuffer *rb,
-                   GLuint count, const GLint x[], const GLint y[],
-                   void *values, GLuint valueSize);
-
-extern void
-_swrast_put_row(GLcontext *ctx, struct gl_renderbuffer *rb,
-                GLuint count, GLint x, GLint y,
-                const GLvoid *values, GLuint valueSize);
-
-extern void
-_swrast_get_row(GLcontext *ctx, struct gl_renderbuffer *rb,
-                GLuint count, GLint x, GLint y,
-                GLvoid *values, GLuint valueSize);
-
-
-extern void *
-_swrast_get_dest_rgba(GLcontext *ctx, struct gl_renderbuffer *rb,
-                      SWspan *span);
-
-#endif
+/*

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

+ */

+

+

+#ifndef S_SPAN_H

+#define S_SPAN_H

+

+

+#include "main/config.h"

+#include "main/glheader.h"

+#include "main/mtypes.h"

+

+struct gl_context;

+struct gl_renderbuffer;

+

+

+/**

+ * \defgroup SpanFlags

+ * Special bitflags to describe span data.

+ *

+ * In general, the point/line/triangle functions interpolate/emit the

+ * attributes specified by swrast->_ActiveAttribs (i.e. FRAT_BIT_* values).

+ * Some things don't fit into that, though, so we have these flags.

+ */

+/*@{*/

+#define SPAN_RGBA       0x01  /**< interpMask and arrayMask */

+#define SPAN_Z          0x02  /**< interpMask and arrayMask */

+#define SPAN_FLAT       0x04  /**< interpMask: flat shading? */

+#define SPAN_XY         0x08  /**< array.x[], y[] valid? */

+#define SPAN_MASK       0x10  /**< was array.mask[] filled in by caller? */

+#define SPAN_LAMBDA     0x20  /**< array.lambda[] valid? */

+#define SPAN_COVERAGE   0x40  /**< array.coverage[] valid? */

+/*@}*/

+

+

+/**

+ * \sw_span_arrays 

+ * \brief Arrays of fragment values.

+ *

+ * These will either be computed from the span x/xStep values or

+ * filled in by glDraw/CopyPixels, etc.

+ * These arrays are separated out of sw_span to conserve memory.

+ */

+typedef struct sw_span_arrays

+{

+   /** Per-fragment attributes (indexed by FRAG_ATTRIB_* tokens) */

+   /* XXX someday look at transposing first two indexes for better memory

+    * access pattern.

+    */

+   GLfloat attribs[FRAG_ATTRIB_MAX][MAX_WIDTH][4];

+

+   /** This mask indicates which fragments are alive or culled */

+   GLubyte mask[MAX_WIDTH];

+

+   GLenum ChanType; /**< Color channel type, GL_UNSIGNED_BYTE, GL_FLOAT */

+

+   /** Attribute arrays that don't fit into attribs[] array above */

+   /*@{*/

+   GLubyte rgba8[MAX_WIDTH][4];

+   GLushort rgba16[MAX_WIDTH][4];

+   GLchan (*rgba)[4];  /** either == rgba8 or rgba16 */

+   GLint   x[MAX_WIDTH];  /**< fragment X coords */

+   GLint   y[MAX_WIDTH];  /**< fragment Y coords */

+   GLuint  z[MAX_WIDTH];  /**< fragment Z coords */

+   GLuint  index[MAX_WIDTH];  /**< Color indexes */

+   GLfloat lambda[MAX_TEXTURE_COORD_UNITS][MAX_WIDTH]; /**< Texture LOD */

+   GLfloat coverage[MAX_WIDTH];  /**< Fragment coverage for AA/smoothing */

+   /*@}*/

+} SWspanarrays;

+

+

+/**

+ * The SWspan structure describes the colors, Z, fogcoord, texcoords,

+ * etc for either a horizontal run or an array of independent pixels.

+ * We can either specify a base/step to indicate interpolated values, or

+ * fill in explicit arrays of values.  The interpMask and arrayMask bitfields

+ * indicate which attributes are active interpolants or arrays, respectively.

+ *

+ * It would be interesting to experiment with multiprocessor rasterization

+ * with this structure.  The triangle rasterizer could simply emit a

+ * stream of these structures which would be consumed by one or more

+ * span-processing threads which could run in parallel.

+ */

+typedef struct sw_span

+{

+   /** Coord of first fragment in horizontal span/run */

+   GLint x, y;

+

+   /** Number of fragments in the span */

+   GLuint end;

+

+   /** for clipping left edge of spans */

+   GLuint leftClip;

+

+   /** This flag indicates that mask[] array is effectively filled with ones */

+   GLboolean writeAll;

+

+   /** either GL_POLYGON, GL_LINE, GL_POLYGON, GL_BITMAP */

+   GLenum primitive;

+

+   /** 0 = front-facing span, 1 = back-facing span (for two-sided stencil) */

+   GLuint facing;

+

+   /**

+    * This bitmask (of  \link SpanFlags SPAN_* flags\endlink) indicates

+    * which of the attrStart/StepX/StepY variables are relevant.

+    */

+   GLbitfield interpMask;

+

+   /** Fragment attribute interpolants */

+   GLfloat attrStart[FRAG_ATTRIB_MAX][4];   /**< initial value */

+   GLfloat attrStepX[FRAG_ATTRIB_MAX][4];   /**< dvalue/dx */

+   GLfloat attrStepY[FRAG_ATTRIB_MAX][4];   /**< dvalue/dy */

+

+   /* XXX the rest of these will go away eventually... */

+

+   /* For horizontal spans, step is the partial derivative wrt X.

+    * For lines, step is the delta from one fragment to the next.

+    */

+   GLfixed red, redStep;

+   GLfixed green, greenStep;

+   GLfixed blue, blueStep;

+   GLfixed alpha, alphaStep;

+   GLfixed index, indexStep;

+   GLfixed z, zStep;    /**< XXX z should probably be GLuint */

+   GLfixed intTex[2], intTexStep[2];  /**< (s,t) for unit[0] only */

+

+   /**

+    * This bitmask (of \link SpanFlags SPAN_* flags\endlink) indicates

+    * which of the fragment arrays in the span_arrays struct are relevant.

+    */

+   GLbitfield arrayMask;

+

+   GLbitfield arrayAttribs;

+

+   /**

+    * We store the arrays of fragment values in a separate struct so

+    * that we can allocate sw_span structs on the stack without using

+    * a lot of memory.  The span_arrays struct is about 1.4MB while the

+    * sw_span struct is only about 512 bytes.

+    */

+   SWspanarrays *array;

+} SWspan;

+

+

+

+#define INIT_SPAN(S, PRIMITIVE)			\

+do {						\

+   (S).primitive = (PRIMITIVE);			\

+   (S).interpMask = 0x0;			\

+   (S).arrayMask = 0x0;				\

+   (S).arrayAttribs = 0x0;			\

+   (S).end = 0;					\

+   (S).leftClip = 0;				\

+   (S).facing = 0;				\

+   (S).array = SWRAST_CONTEXT(ctx)->SpanArrays;	\

+} while (0)

+

+

+

+extern void

+_swrast_span_default_attribs(struct gl_context *ctx, SWspan *span);

+

+extern void

+_swrast_span_interpolate_z( const struct gl_context *ctx, SWspan *span );

+

+extern GLfloat

+_swrast_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,

+                       GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,

+                       GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);

+

+

+extern void

+_swrast_write_rgba_span( struct gl_context *ctx, SWspan *span);

+

+

+extern void

+_swrast_read_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLuint n, GLint x, GLint y, GLenum type, GLvoid *rgba);

+

+extern void

+_swrast_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLuint count, const GLint x[], const GLint y[],

+                   void *values, GLuint valueSize);

+

+extern void

+_swrast_put_row(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                GLuint count, GLint x, GLint y,

+                const GLvoid *values, GLuint valueSize);

+

+extern void

+_swrast_get_row(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                GLuint count, GLint x, GLint y,

+                GLvoid *values, GLuint valueSize);

+

+

+extern void *

+_swrast_get_dest_rgba(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                      SWspan *span);

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_spantemp.h b/mesalib/src/mesa/swrast/s_spantemp.h
index 2948a90f6..125d19638 100644
--- a/mesalib/src/mesa/swrast/s_spantemp.h
+++ b/mesalib/src/mesa/swrast/s_spantemp.h
@@ -1,221 +1,221 @@
-/*
- * 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.
- */
-
-
-/*
- * Templates for the span/pixel-array write/read functions called via
- * the gl_renderbuffer's GetRow, GetValues, PutRow, PutMonoRow, PutValues
- * and PutMonoValues functions.
- *
- * Define the following macros before including this file:
- *   NAME(BASE)  to generate the function name (i.e. add prefix or suffix)
- *   RB_TYPE  the renderbuffer DataType
- *   SPAN_VARS  to declare any local variables
- *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel
- *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel
- *   STORE_PIXEL(DST, X, Y, VALUE)  to store pixel values in buffer
- *   FETCH_PIXEL(DST, SRC)  to fetch pixel values from buffer
- *
- * Note that in the STORE_PIXEL macros, we also pass in the (X,Y) coordinates
- * for the pixels to be stored.  This is useful when dithering and probably
- * ignored otherwise.
- */
-
-#include "main/macros.h"
-
-
-#if !defined(RB_COMPONENTS)
-#define RB_COMPONENTS 4
-#endif
-
-
-static void
-NAME(get_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
-               GLuint count, GLint x, GLint y, void *values )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   INIT_PIXEL_PTR(pixel, x, y);
-   for (i = 0; i < count; i++) {
-      FETCH_PIXEL(dest[i], pixel);
-      INC_PIXEL_PTR(pixel);
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(get_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                  GLuint count, const GLint x[], const GLint y[], void *values )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   for (i = 0; i < count; i++) {
-      INIT_PIXEL_PTR(pixel, x[i], y[i]);
-      FETCH_PIXEL(dest[i], pixel);
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
-               GLuint count, GLint x, GLint y,
-               const void *values, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   INIT_PIXEL_PTR(pixel, x, y);
-   if (mask) {
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            STORE_PIXEL(pixel, x + i, y, src[i]);
-         }
-         INC_PIXEL_PTR(pixel);
-      }
-   }
-   else {
-      for (i = 0; i < count; i++) {
-         STORE_PIXEL(pixel, x + i, y, src[i]);
-         INC_PIXEL_PTR(pixel);
-      }
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_row_rgb)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                   GLuint count, GLint x, GLint y,
-                   const void *values, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE (*src)[3] = (const RB_TYPE (*)[3]) values;
-   GLuint i;
-   INIT_PIXEL_PTR(pixel, x, y);
-   for (i = 0; i < count; i++) {
-      if (!mask || mask[i]) {
-#ifdef STORE_PIXEL_RGB
-         STORE_PIXEL_RGB(pixel, x + i, y, src[i]);
-#else
-         STORE_PIXEL(pixel, x + i, y, src[i]);
-#endif
-      }
-      INC_PIXEL_PTR(pixel);
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_mono_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                    GLuint count, GLint x, GLint y,
-                    const void *value, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE *src = (const RB_TYPE *) value;
-   GLuint i;
-   INIT_PIXEL_PTR(pixel, x, y);
-   if (mask) {
-      for (i = 0; i < count; i++) {
-         if (mask[i]) {
-            STORE_PIXEL(pixel, x + i, y, src);
-         }
-         INC_PIXEL_PTR(pixel);
-      }
-   }
-   else {
-      for (i = 0; i < count; i++) {
-         STORE_PIXEL(pixel, x + i, y, src);
-         INC_PIXEL_PTR(pixel);
-      }
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                  GLuint count, const GLint x[], const GLint y[],
-                  const void *values, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;
-   GLuint i;
-   ASSERT(mask);
-   for (i = 0; i < count; i++) {
-      if (mask[i]) {
-         INIT_PIXEL_PTR(pixel, x[i], y[i]);
-         STORE_PIXEL(pixel, x[i], y[i], src[i]);
-      }
-   }
-   (void) rb;
-}
-
-
-static void
-NAME(put_mono_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
-                       GLuint count, const GLint x[], const GLint y[],
-                       const void *value, const GLubyte mask[] )
-{
-#ifdef SPAN_VARS
-   SPAN_VARS
-#endif
-   const RB_TYPE *src = (const RB_TYPE *) value;
-   GLuint i;
-   ASSERT(mask);
-   for (i = 0; i < count; i++) {
-      if (mask[i]) {
-         INIT_PIXEL_PTR(pixel, x[i], y[i]);
-         STORE_PIXEL(pixel, x[i], y[i], src);
-      }
-   }
-   (void) rb;
-}
-
-
-#undef NAME
-#undef RB_TYPE
-#undef RB_COMPONENTS
-#undef SPAN_VARS
-#undef INIT_PIXEL_PTR
-#undef INC_PIXEL_PTR
-#undef STORE_PIXEL
-#undef STORE_PIXEL_RGB
-#undef FETCH_PIXEL
+/*

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

+ */

+

+

+/*

+ * Templates for the span/pixel-array write/read functions called via

+ * the gl_renderbuffer's GetRow, GetValues, PutRow, PutMonoRow, PutValues

+ * and PutMonoValues functions.

+ *

+ * Define the following macros before including this file:

+ *   NAME(BASE)  to generate the function name (i.e. add prefix or suffix)

+ *   RB_TYPE  the renderbuffer DataType

+ *   SPAN_VARS  to declare any local variables

+ *   INIT_PIXEL_PTR(P, X, Y)  to initialize a pointer to a pixel

+ *   INC_PIXEL_PTR(P)  to increment a pixel pointer by one pixel

+ *   STORE_PIXEL(DST, X, Y, VALUE)  to store pixel values in buffer

+ *   FETCH_PIXEL(DST, SRC)  to fetch pixel values from buffer

+ *

+ * Note that in the STORE_PIXEL macros, we also pass in the (X,Y) coordinates

+ * for the pixels to be stored.  This is useful when dithering and probably

+ * ignored otherwise.

+ */

+

+#include "main/macros.h"

+

+

+#if !defined(RB_COMPONENTS)

+#define RB_COMPONENTS 4

+#endif

+

+

+static void

+NAME(get_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+               GLuint count, GLint x, GLint y, void *values )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   INIT_PIXEL_PTR(pixel, x, y);

+   for (i = 0; i < count; i++) {

+      FETCH_PIXEL(dest[i], pixel);

+      INC_PIXEL_PTR(pixel);

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(get_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                  GLuint count, const GLint x[], const GLint y[], void *values )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   RB_TYPE (*dest)[RB_COMPONENTS] = (RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   for (i = 0; i < count; i++) {

+      INIT_PIXEL_PTR(pixel, x[i], y[i]);

+      FETCH_PIXEL(dest[i], pixel);

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+               GLuint count, GLint x, GLint y,

+               const void *values, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   INIT_PIXEL_PTR(pixel, x, y);

+   if (mask) {

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            STORE_PIXEL(pixel, x + i, y, src[i]);

+         }

+         INC_PIXEL_PTR(pixel);

+      }

+   }

+   else {

+      for (i = 0; i < count; i++) {

+         STORE_PIXEL(pixel, x + i, y, src[i]);

+         INC_PIXEL_PTR(pixel);

+      }

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_row_rgb)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                   GLuint count, GLint x, GLint y,

+                   const void *values, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE (*src)[3] = (const RB_TYPE (*)[3]) values;

+   GLuint i;

+   INIT_PIXEL_PTR(pixel, x, y);

+   for (i = 0; i < count; i++) {

+      if (!mask || mask[i]) {

+#ifdef STORE_PIXEL_RGB

+         STORE_PIXEL_RGB(pixel, x + i, y, src[i]);

+#else

+         STORE_PIXEL(pixel, x + i, y, src[i]);

+#endif

+      }

+      INC_PIXEL_PTR(pixel);

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_mono_row)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                    GLuint count, GLint x, GLint y,

+                    const void *value, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE *src = (const RB_TYPE *) value;

+   GLuint i;

+   INIT_PIXEL_PTR(pixel, x, y);

+   if (mask) {

+      for (i = 0; i < count; i++) {

+         if (mask[i]) {

+            STORE_PIXEL(pixel, x + i, y, src);

+         }

+         INC_PIXEL_PTR(pixel);

+      }

+   }

+   else {

+      for (i = 0; i < count; i++) {

+         STORE_PIXEL(pixel, x + i, y, src);

+         INC_PIXEL_PTR(pixel);

+      }

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                  GLuint count, const GLint x[], const GLint y[],

+                  const void *values, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE (*src)[RB_COMPONENTS] = (const RB_TYPE (*)[RB_COMPONENTS]) values;

+   GLuint i;

+   ASSERT(mask);

+   for (i = 0; i < count; i++) {

+      if (mask[i]) {

+         INIT_PIXEL_PTR(pixel, x[i], y[i]);

+         STORE_PIXEL(pixel, x[i], y[i], src[i]);

+      }

+   }

+   (void) rb;

+}

+

+

+static void

+NAME(put_mono_values)( struct gl_context *ctx, struct gl_renderbuffer *rb,

+                       GLuint count, const GLint x[], const GLint y[],

+                       const void *value, const GLubyte mask[] )

+{

+#ifdef SPAN_VARS

+   SPAN_VARS

+#endif

+   const RB_TYPE *src = (const RB_TYPE *) value;

+   GLuint i;

+   ASSERT(mask);

+   for (i = 0; i < count; i++) {

+      if (mask[i]) {

+         INIT_PIXEL_PTR(pixel, x[i], y[i]);

+         STORE_PIXEL(pixel, x[i], y[i], src);

+      }

+   }

+   (void) rb;

+}

+

+

+#undef NAME

+#undef RB_TYPE

+#undef RB_COMPONENTS

+#undef SPAN_VARS

+#undef INIT_PIXEL_PTR

+#undef INC_PIXEL_PTR

+#undef STORE_PIXEL

+#undef STORE_PIXEL_RGB

+#undef FETCH_PIXEL

diff --git a/mesalib/src/mesa/swrast/s_stencil.c b/mesalib/src/mesa/swrast/s_stencil.c
index aa74b21ee..999fe3c3f 100644
--- a/mesalib/src/mesa/swrast/s_stencil.c
+++ b/mesalib/src/mesa/swrast/s_stencil.c
@@ -1,1245 +1,1245 @@
-/*
- * 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/context.h"
-#include "main/imports.h"
-
-#include "s_context.h"
-#include "s_depth.h"
-#include "s_stencil.h"
-#include "s_span.h"
-
-
-
-/* Stencil Logic:
-
-IF stencil test fails THEN
-   Apply fail-op to stencil value
-   Don't write the pixel (RGBA,Z)
-ELSE
-   IF doing depth test && depth test fails THEN
-      Apply zfail-op to stencil value
-      Write RGBA and Z to appropriate buffers
-   ELSE
-      Apply zpass-op to stencil value
-ENDIF
-
-*/
-
-
-/**
- * Apply the given stencil operator to the array of stencil values.
- * Don't touch stencil[i] if mask[i] is zero.
- * Input:  n - size of stencil array
- *         oper - the stencil buffer operator
- *         face - 0 or 1 for front or back face operation
- *         stencil - array of stencil values
- *         mask - array [n] of flag:  1=apply operator, 0=don't apply operator
- * Output:  stencil - modified values
- */
-static void
-apply_stencil_op( const GLcontext *ctx, GLenum oper, GLuint face,
-                  GLuint n, GLstencil stencil[], const GLubyte mask[] )
-{
-   const GLstencil ref = ctx->Stencil.Ref[face];
-   const GLstencil wrtmask = ctx->Stencil.WriteMask[face];
-   const GLstencil invmask = (GLstencil) (~wrtmask);
-   const GLstencil stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;
-   GLuint i;
-
-   switch (oper) {
-      case GL_KEEP:
-         /* do nothing */
-         break;
-      case GL_ZERO:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  stencil[i] = 0;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  stencil[i] = (GLstencil) (stencil[i] & invmask);
-	       }
-	    }
-	 }
-	 break;
-      case GL_REPLACE:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  stencil[i] = ref;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  GLstencil s = stencil[i];
-		  stencil[i] = (GLstencil) ((invmask & s ) | (wrtmask & ref));
-	       }
-	    }
-	 }
-	 break;
-      case GL_INCR:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  GLstencil s = stencil[i];
-		  if (s < stencilMax) {
-		     stencil[i] = (GLstencil) (s+1);
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  /* VERIFY logic of adding 1 to a write-masked value */
-		  GLstencil s = stencil[i];
-		  if (s < stencilMax) {
-		     stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s+1)));
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_DECR:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  GLstencil s = stencil[i];
-		  if (s>0) {
-		     stencil[i] = (GLstencil) (s-1);
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  /* VERIFY logic of subtracting 1 to a write-masked value */
-		  GLstencil s = stencil[i];
-		  if (s>0) {
-		     stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s-1)));
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_INCR_WRAP_EXT:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  stencil[i]++;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil s = stencil[i];
-                  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s+1)));
-	       }
-	    }
-	 }
-	 break;
-      case GL_DECR_WRAP_EXT:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  stencil[i]--;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil s = stencil[i];
-                  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s-1)));
-	       }
-	    }
-	 }
-	 break;
-      case GL_INVERT:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  GLstencil s = stencil[i];
-		  stencil[i] = (GLstencil) ~s;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-		  GLstencil s = stencil[i];
-		  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & ~s));
-	       }
-	    }
-	 }
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad stencil op in apply_stencil_op");
-   }
-}
-
-
-
-
-/**
- * Apply stencil test to an array of stencil values (before depth buffering).
- * Input:  face - 0 or 1 for front or back-face polygons
- *         n - number of pixels in the array
- *         stencil - array of [n] stencil values
- *         mask - array [n] of flag:  0=skip the pixel, 1=stencil the pixel
- * Output:  mask - pixels which fail the stencil test will have their
- *                 mask flag set to 0.
- *          stencil - updated stencil values (where the test passed)
- * Return:  GL_FALSE = all pixels failed, GL_TRUE = zero or more pixels passed.
- */
-static GLboolean
-do_stencil_test( GLcontext *ctx, GLuint face, GLuint n, GLstencil stencil[],
-                 GLubyte mask[] )
-{
-   GLubyte fail[MAX_WIDTH];
-   GLboolean allfail = GL_FALSE;
-   GLuint i;
-   const GLuint valueMask = ctx->Stencil.ValueMask[face];
-   const GLstencil r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-   GLstencil s;
-
-   ASSERT(n <= MAX_WIDTH);
-
-   /*
-    * Perform stencil test.  The results of this operation are stored
-    * in the fail[] array:
-    *   IF fail[i] is non-zero THEN
-    *       the stencil fail operator is to be applied
-    *   ELSE
-    *       the stencil fail operator is not to be applied
-    *   ENDIF
-    */
-   switch (ctx->Stencil.Function[face]) {
-      case GL_NEVER:
-         /* never pass; always fail */
-         for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       mask[i] = 0;
-	       fail[i] = 1;
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 allfail = GL_TRUE;
-	 break;
-      case GL_LESS:
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       s = (GLstencil) (stencil[i] & valueMask);
-	       if (r < s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       s = (GLstencil) (stencil[i] & valueMask);
-	       if (r <= s) {
-		  /* pass */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       s = (GLstencil) (stencil[i] & valueMask);
-	       if (r > s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       s = (GLstencil) (stencil[i] & valueMask);
-	       if (r >= s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       s = (GLstencil) (stencil[i] & valueMask);
-	       if (r == s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       s = (GLstencil) (stencil[i] & valueMask);
-	       if (r != s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 /* always pass */
-	 for (i=0;i<n;i++) {
-	    fail[i] = 0;
-	 }
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad stencil func in gl_stencil_span");
-         return 0;
-   }
-
-   if (ctx->Stencil.FailFunc[face] != GL_KEEP) {
-      apply_stencil_op( ctx, ctx->Stencil.FailFunc[face], face, n, stencil, fail );
-   }
-
-   return !allfail;
-}
-
-
-/**
- * Compute the zpass/zfail masks by comparing the pre- and post-depth test
- * masks.
- */
-static INLINE void
-compute_pass_fail_masks(GLuint n, const GLubyte origMask[],
-                        const GLubyte newMask[],
-                        GLubyte passMask[], GLubyte failMask[])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      ASSERT(newMask[i] == 0 || newMask[i] == 1);
-      passMask[i] = origMask[i] & newMask[i];
-      failMask[i] = origMask[i] & (newMask[i] ^ 1);
-   }
-}
-
-
-/**
- * Apply stencil and depth testing to the span of pixels.
- * Both software and hardware stencil buffers are acceptable.
- * Input:  n - number of pixels in the span
- *         x, y - location of leftmost pixel in span
- *         z - array [n] of z values
- *         mask - array [n] of flags  (1=test this pixel, 0=skip the pixel)
- * Output:  mask - array [n] of flags (1=stencil and depth test passed)
- * Return: GL_FALSE - all fragments failed the testing
- *         GL_TRUE - one or more fragments passed the testing
- *
- */
-static GLboolean
-stencil_and_ztest_span(GLcontext *ctx, SWspan *span, GLuint face)
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   GLstencil stencilRow[MAX_WIDTH];
-   GLstencil *stencil;
-   const GLuint n = span->end;
-   const GLint x = span->x;
-   const GLint y = span->y;
-   GLubyte *mask = span->array->mask;
-
-   ASSERT((span->arrayMask & SPAN_XY) == 0);
-   ASSERT(ctx->Stencil.Enabled);
-   ASSERT(n <= MAX_WIDTH);
-#ifdef DEBUG
-   if (ctx->Depth.Test) {
-      ASSERT(span->arrayMask & SPAN_Z);
-   }
-#endif
-
-   stencil = (GLstencil *) rb->GetPointer(ctx, rb, x, y);
-   if (!stencil) {
-      rb->GetRow(ctx, rb, n, x, y, stencilRow);
-      stencil = stencilRow;
-   }
-
-   /*
-    * Apply the stencil test to the fragments.
-    * failMask[i] is 1 if the stencil test failed.
-    */
-   if (do_stencil_test( ctx, face, n, stencil, mask ) == GL_FALSE) {
-      /* all fragments failed the stencil test, we're done. */
-      span->writeAll = GL_FALSE;
-      if (!rb->GetPointer(ctx, rb, 0, 0)) {
-         /* put updated stencil values into buffer */
-         rb->PutRow(ctx, rb, n, x, y, stencil, NULL);
-      }
-      return GL_FALSE;
-   }
-
-   /*
-    * Some fragments passed the stencil test, apply depth test to them
-    * and apply Zpass and Zfail stencil ops.
-    */
-   if (ctx->Depth.Test == GL_FALSE) {
-      /*
-       * No depth buffer, just apply zpass stencil function to active pixels.
-       */
-      apply_stencil_op( ctx, ctx->Stencil.ZPassFunc[face], face, n, stencil, mask );
-   }
-   else {
-      /*
-       * Perform depth buffering, then apply zpass or zfail stencil function.
-       */
-      GLubyte passMask[MAX_WIDTH], failMask[MAX_WIDTH], origMask[MAX_WIDTH];
-
-      /* save the current mask bits */
-      memcpy(origMask, mask, n * sizeof(GLubyte));
-
-      /* apply the depth test */
-      _swrast_depth_test_span(ctx, span);
-
-      compute_pass_fail_masks(n, origMask, mask, passMask, failMask);
-
-      /* apply the pass and fail operations */
-      if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
-         apply_stencil_op( ctx, ctx->Stencil.ZFailFunc[face], face,
-                           n, stencil, failMask );
-      }
-      if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {
-         apply_stencil_op( ctx, ctx->Stencil.ZPassFunc[face], face,
-                           n, stencil, passMask );
-      }
-   }
-
-   /*
-    * Write updated stencil values back into hardware stencil buffer.
-    */
-   if (!rb->GetPointer(ctx, rb, 0, 0)) {
-      rb->PutRow(ctx, rb, n, x, y, stencil, NULL);
-   }
-   
-   span->writeAll = GL_FALSE;
-   
-   return GL_TRUE;  /* one or more fragments passed both tests */
-}
-
-
-
-/*
- * Return the address of a stencil buffer value given the window coords:
- */
-#define STENCIL_ADDRESS(X, Y)  (stencilStart + (Y) * stride + (X))
-
-
-
-/**
- * Apply the given stencil operator for each pixel in the array whose
- * mask flag is set.
- * \note  This is for software stencil buffers only.
- * Input:  n - number of pixels in the span
- *         x, y - array of [n] pixels
- *         operator - the stencil buffer operator
- *         mask - array [n] of flag:  1=apply operator, 0=don't apply operator
- */
-static void
-apply_stencil_op_to_pixels( GLcontext *ctx,
-                            GLuint n, const GLint x[], const GLint y[],
-                            GLenum oper, GLuint face, const GLubyte mask[] )
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   const GLstencil stencilMax = (1 << fb->Visual.stencilBits) - 1;
-   const GLstencil ref = ctx->Stencil.Ref[face];
-   const GLstencil wrtmask = ctx->Stencil.WriteMask[face];
-   const GLstencil invmask = (GLstencil) (~wrtmask);
-   GLuint i;
-   GLstencil *stencilStart = (GLubyte *) rb->Data;
-   const GLuint stride = rb->Width;
-
-   ASSERT(rb->GetPointer(ctx, rb, 0, 0));
-   ASSERT(sizeof(GLstencil) == 1);
-
-   switch (oper) {
-      case GL_KEEP:
-         /* do nothing */
-         break;
-      case GL_ZERO:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = 0;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-		  *sptr = (GLstencil) (invmask & *sptr);
-	       }
-	    }
-	 }
-	 break;
-      case GL_REPLACE:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = ref;
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-		  *sptr = (GLstencil) ((invmask & *sptr ) | (wrtmask & ref));
-	       }
-	    }
-	 }
-	 break;
-      case GL_INCR:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-		  if (*sptr < stencilMax) {
-		     *sptr = (GLstencil) (*sptr + 1);
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-		  if (*sptr < stencilMax) {
-		     *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr+1)));
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_DECR:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-		  if (*sptr>0) {
-		     *sptr = (GLstencil) (*sptr - 1);
-		  }
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-		  if (*sptr>0) {
-		     *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr-1)));
-		  }
-	       }
-	    }
-	 }
-	 break;
-      case GL_INCR_WRAP_EXT:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = (GLstencil) (*sptr + 1);
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr+1)));
-	       }
-	    }
-	 }
-	 break;
-      case GL_DECR_WRAP_EXT:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = (GLstencil) (*sptr - 1);
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr-1)));
-	       }
-	    }
-	 }
-	 break;
-      case GL_INVERT:
-	 if (invmask==0) {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = (GLstencil) (~*sptr);
-	       }
-	    }
-	 }
-	 else {
-	    for (i=0;i<n;i++) {
-	       if (mask[i]) {
-                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );
-                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & ~*sptr));
-	       }
-	    }
-	 }
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad stencilop in apply_stencil_op_to_pixels");
-   }
-}
-
-
-
-/**
- * Apply stencil test to an array of pixels before depth buffering.
- *
- * \note Used for software stencil buffer only.
- * Input:  n - number of pixels in the span
- *         x, y - array of [n] pixels to stencil
- *         mask - array [n] of flag:  0=skip the pixel, 1=stencil the pixel
- * Output:  mask - pixels which fail the stencil test will have their
- *                 mask flag set to 0.
- * \return  GL_FALSE = all pixels failed, GL_TRUE = zero or more pixels passed.
- */
-static GLboolean
-stencil_test_pixels( GLcontext *ctx, GLuint face, GLuint n,
-                     const GLint x[], const GLint y[], GLubyte mask[] )
-{
-   const struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   GLubyte fail[MAX_WIDTH];
-   GLstencil r, s;
-   GLuint i;
-   GLboolean allfail = GL_FALSE;
-   const GLuint valueMask = ctx->Stencil.ValueMask[face];
-   const GLstencil *stencilStart = (GLstencil *) rb->Data;
-   const GLuint stride = rb->Width;
-
-   ASSERT(rb->GetPointer(ctx, rb, 0, 0));
-   ASSERT(sizeof(GLstencil) == 1);
-
-   /*
-    * Perform stencil test.  The results of this operation are stored
-    * in the fail[] array:
-    *   IF fail[i] is non-zero THEN
-    *       the stencil fail operator is to be applied
-    *   ELSE
-    *       the stencil fail operator is not to be applied
-    *   ENDIF
-    */
-
-   switch (ctx->Stencil.Function[face]) {
-      case GL_NEVER:
-         /* always fail */
-         for (i=0;i<n;i++) {
-	    if (mask[i]) {
-	       mask[i] = 0;
-	       fail[i] = 1;
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 allfail = GL_TRUE;
-	 break;
-      case GL_LESS:
-	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
-	       s = (GLstencil) (*sptr & valueMask);
-	       if (r < s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_LEQUAL:
-	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
-	       s = (GLstencil) (*sptr & valueMask);
-	       if (r <= s) {
-		  /* pass */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_GREATER:
-	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
-	       s = (GLstencil) (*sptr & valueMask);
-	       if (r > s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_GEQUAL:
-	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
-	       s = (GLstencil) (*sptr & valueMask);
-	       if (r >= s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_EQUAL:
-	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
-	       s = (GLstencil) (*sptr & valueMask);
-	       if (r == s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_NOTEQUAL:
-	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);
-	 for (i=0;i<n;i++) {
-	    if (mask[i]) {
-               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);
-	       s = (GLstencil) (*sptr & valueMask);
-	       if (r != s) {
-		  /* passed */
-		  fail[i] = 0;
-	       }
-	       else {
-		  fail[i] = 1;
-		  mask[i] = 0;
-	       }
-	    }
-	    else {
-	       fail[i] = 0;
-	    }
-	 }
-	 break;
-      case GL_ALWAYS:
-	 /* always pass */
-	 for (i=0;i<n;i++) {
-	    fail[i] = 0;
-	 }
-	 break;
-      default:
-         _mesa_problem(ctx, "Bad stencil func in gl_stencil_pixels");
-         return 0;
-   }
-
-   if (ctx->Stencil.FailFunc[face] != GL_KEEP) {
-      apply_stencil_op_to_pixels( ctx, n, x, y, ctx->Stencil.FailFunc[face],
-                                  face, fail );
-   }
-
-   return !allfail;
-}
-
-
-
-
-/**
- * Apply stencil and depth testing to an array of pixels.
- * This is used both for software and hardware stencil buffers.
- *
- * The comments in this function are a bit sparse but the code is
- * almost identical to stencil_and_ztest_span(), which is well
- * commented.
- *
- * Input:  n - number of pixels in the array
- *         x, y - array of [n] pixel positions
- *         z - array [n] of z values
- *         mask - array [n] of flags  (1=test this pixel, 0=skip the pixel)
- * Output: mask - array [n] of flags (1=stencil and depth test passed)
- * Return: GL_FALSE - all fragments failed the testing
- *         GL_TRUE - one or more fragments passed the testing
- */
-static GLboolean
-stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face )
-{
-   GLubyte passMask[MAX_WIDTH], failMask[MAX_WIDTH], origMask[MAX_WIDTH];
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   const GLuint n = span->end;
-   const GLint *x = span->array->x;
-   const GLint *y = span->array->y;
-   GLubyte *mask = span->array->mask;
-
-   ASSERT(span->arrayMask & SPAN_XY);
-   ASSERT(ctx->Stencil.Enabled);
-   ASSERT(n <= MAX_WIDTH);
-
-   if (!rb->GetPointer(ctx, rb, 0, 0)) {
-      /* No direct access */
-      GLstencil stencil[MAX_WIDTH];
-
-      ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-      _swrast_get_values(ctx, rb, n, x, y, stencil, sizeof(GLubyte));
-
-      memcpy(origMask, mask, n * sizeof(GLubyte));          
-
-      (void) do_stencil_test(ctx, face, n, stencil, mask);
-
-      if (ctx->Depth.Test == GL_FALSE) {
-         apply_stencil_op(ctx, ctx->Stencil.ZPassFunc[face], face,
-                          n, stencil, mask);
-      }
-      else {
-         GLubyte tmpMask[MAX_WIDTH]; 
-         memcpy(tmpMask, mask, n * sizeof(GLubyte));
-
-         _swrast_depth_test_span(ctx, span);
-
-         compute_pass_fail_masks(n, tmpMask, mask, passMask, failMask);
-
-         if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
-            apply_stencil_op(ctx, ctx->Stencil.ZFailFunc[face], face,
-                             n, stencil, failMask);
-         }
-         if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {
-            apply_stencil_op(ctx, ctx->Stencil.ZPassFunc[face], face,
-                             n, stencil, passMask);
-         }
-      }
-
-      /* Write updated stencil values into hardware stencil buffer */
-      rb->PutValues(ctx, rb, n, x, y, stencil, origMask);
-
-      return GL_TRUE;
-   }
-   else {
-      /* Direct access to stencil buffer */
-
-      if (stencil_test_pixels(ctx, face, n, x, y, mask) == GL_FALSE) {
-         /* all fragments failed the stencil test, we're done. */
-         return GL_FALSE;
-      }
-
-      if (ctx->Depth.Test==GL_FALSE) {
-         apply_stencil_op_to_pixels(ctx, n, x, y,
-                                    ctx->Stencil.ZPassFunc[face], face, mask);
-      }
-      else {
-         memcpy(origMask, mask, n * sizeof(GLubyte));
-
-         _swrast_depth_test_span(ctx, span);
-
-         compute_pass_fail_masks(n, origMask, mask, passMask, failMask);
-
-         if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
-            apply_stencil_op_to_pixels(ctx, n, x, y,
-                                       ctx->Stencil.ZFailFunc[face],
-                                       face, failMask);
-         }
-         if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {
-            apply_stencil_op_to_pixels(ctx, n, x, y,
-                                       ctx->Stencil.ZPassFunc[face],
-                                       face, passMask);
-         }
-      }
-
-      return GL_TRUE;  /* one or more fragments passed both tests */
-   }
-}
-
-
-/**
- * /return GL_TRUE = one or more fragments passed,
- * GL_FALSE = all fragments failed.
- */
-GLboolean
-_swrast_stencil_and_ztest_span(GLcontext *ctx, SWspan *span)
-{
-   const GLuint face = (span->facing == 0) ? 0 : ctx->Stencil._BackFace;
-
-   if (span->arrayMask & SPAN_XY)
-      return stencil_and_ztest_pixels(ctx, span, face);
-   else
-      return stencil_and_ztest_span(ctx, span, face);
-}
-
-
-#if 0
-GLuint
-clip_span(GLuint bufferWidth, GLuint bufferHeight,
-          GLint x, GLint y, GLuint *count)
-{
-   GLuint n = *count;
-   GLuint skipPixels = 0;
-
-   if (y < 0 || y >= bufferHeight || x + n <= 0 || x >= bufferWidth) {
-      /* totally out of bounds */
-      n = 0;
-   }
-   else {
-      /* left clip */
-      if (x < 0) {
-         skipPixels = -x;
-         x = 0;
-         n -= skipPixels;
-      }
-      /* right clip */
-      if (x + n > bufferWidth) {
-         GLint dx = x + n - bufferWidth;
-         n -= dx;
-      }
-   }
-
-   *count = n;
-
-   return skipPixels;
-}
-#endif
-
-
-/**
- * Return a span of stencil values from the stencil buffer.
- * Used for glRead/CopyPixels
- * Input:  n - how many pixels
- *         x,y - location of first pixel
- * Output:  stencil - the array of stencil values
- */
-void
-_swrast_read_stencil_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          GLint n, GLint x, GLint y, GLstencil stencil[])
-{
-   if (y < 0 || y >= (GLint) rb->Height ||
-       x + n <= 0 || x >= (GLint) rb->Width) {
-      /* span is completely outside framebuffer */
-      return; /* undefined values OK */
-   }
-
-   if (x < 0) {
-      GLint dx = -x;
-      x = 0;
-      n -= dx;
-      stencil += dx;
-   }
-   if (x + n > (GLint) rb->Width) {
-      GLint dx = x + n - rb->Width;
-      n -= dx;
-   }
-   if (n <= 0) {
-      return;
-   }
-
-   rb->GetRow(ctx, rb, n, x, y, stencil);
-}
-
-
-
-/**
- * Write a span of stencil values to the stencil buffer.  This function
- * applies the stencil write mask when needed.
- * Used for glDraw/CopyPixels
- * Input:  n - how many pixels
- *         x, y - location of first pixel
- *         stencil - the array of stencil values
- */
-void
-_swrast_write_stencil_span(GLcontext *ctx, GLint n, GLint x, GLint y,
-                           const GLstencil stencil[] )
-{
-   struct gl_framebuffer *fb = ctx->DrawBuffer;
-   struct gl_renderbuffer *rb = fb->_StencilBuffer;
-   const GLuint stencilMax = (1 << fb->Visual.stencilBits) - 1;
-   const GLuint stencilMask = ctx->Stencil.WriteMask[0];
-
-   if (y < 0 || y >= (GLint) rb->Height ||
-       x + n <= 0 || x >= (GLint) rb->Width) {
-      /* span is completely outside framebuffer */
-      return; /* undefined values OK */
-   }
-   if (x < 0) {
-      GLint dx = -x;
-      x = 0;
-      n -= dx;
-      stencil += dx;
-   }
-   if (x + n > (GLint) rb->Width) {
-      GLint dx = x + n - rb->Width;
-      n -= dx;
-   }
-   if (n <= 0) {
-      return;
-   }
-
-   if ((stencilMask & stencilMax) != stencilMax) {
-      /* need to apply writemask */
-      GLstencil destVals[MAX_WIDTH], newVals[MAX_WIDTH];
-      GLint i;
-      rb->GetRow(ctx, rb, n, x, y, destVals);
-      for (i = 0; i < n; i++) {
-         newVals[i]
-            = (stencil[i] & stencilMask) | (destVals[i] & ~stencilMask);
-      }
-      rb->PutRow(ctx, rb, n, x, y, newVals, NULL);
-   }
-   else {
-      rb->PutRow(ctx, rb, n, x, y, stencil, NULL);
-   }
-}
-
-
-
-/**
- * Clear the stencil buffer.
- */
-void
-_swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
-{
-   const GLubyte stencilBits = ctx->DrawBuffer->Visual.stencilBits;
-   const GLuint mask = ctx->Stencil.WriteMask[0];
-   const GLuint invMask = ~mask;
-   const GLuint clearVal = (ctx->Stencil.Clear & mask);
-   const GLuint stencilMax = (1 << stencilBits) - 1;
-   GLint x, y, width, height;
-
-   if (!rb || mask == 0)
-      return;
-
-   ASSERT(rb->DataType == GL_UNSIGNED_BYTE ||
-          rb->DataType == GL_UNSIGNED_SHORT);
-
-   ASSERT(rb->_BaseFormat == GL_STENCIL_INDEX);
-
-   /* compute region to clear */
-   x = ctx->DrawBuffer->_Xmin;
-   y = ctx->DrawBuffer->_Ymin;
-   width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;
-   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;
-
-   if (rb->GetPointer(ctx, rb, 0, 0)) {
-      /* Direct buffer access */
-      if ((mask & stencilMax) != stencilMax) {
-         /* need to mask the clear */
-         if (rb->DataType == GL_UNSIGNED_BYTE) {
-            GLint i, j;
-            for (i = 0; i < height; i++) {
-               GLubyte *stencil = (GLubyte*) rb->GetPointer(ctx, rb, x, y + i);
-               for (j = 0; j < width; j++) {
-                  stencil[j] = (stencil[j] & invMask) | clearVal;
-               }
-            }
-         }
-         else {
-            GLint i, j;
-            for (i = 0; i < height; i++) {
-               GLushort *stencil = (GLushort*) rb->GetPointer(ctx, rb, x, y + i);
-               for (j = 0; j < width; j++) {
-                  stencil[j] = (stencil[j] & invMask) | clearVal;
-               }
-            }
-         }
-      }
-      else {
-         /* no bit masking */
-         if (width == (GLint) rb->Width && rb->DataType == GL_UNSIGNED_BYTE) {
-            /* optimized case */
-            /* Note: bottom-to-top raster assumed! */
-            GLubyte *stencil = (GLubyte *) rb->GetPointer(ctx, rb, x, y);
-            GLuint len = width * height * sizeof(GLubyte);
-            memset(stencil, clearVal, len);
-         }
-         else {
-            /* general case */
-            GLint i;
-            for (i = 0; i < height; i++) {
-               GLvoid *stencil = rb->GetPointer(ctx, rb, x, y + i);
-               if (rb->DataType == GL_UNSIGNED_BYTE) {
-                  memset(stencil, clearVal, width);
-               }
-               else {
-                  _mesa_memset16((short unsigned int*) stencil, clearVal, width);
-               }
-            }
-         }
-      }
-   }
-   else {
-      /* no direct access */
-      if ((mask & stencilMax) != stencilMax) {
-         /* need to mask the clear */
-         if (rb->DataType == GL_UNSIGNED_BYTE) {
-            GLint i, j;
-            for (i = 0; i < height; i++) {
-               GLubyte stencil[MAX_WIDTH];
-               rb->GetRow(ctx, rb, width, x, y + i, stencil);
-               for (j = 0; j < width; j++) {
-                  stencil[j] = (stencil[j] & invMask) | clearVal;
-               }
-               rb->PutRow(ctx, rb, width, x, y + i, stencil, NULL);
-            }
-         }
-         else {
-            GLint i, j;
-            for (i = 0; i < height; i++) {
-               GLushort stencil[MAX_WIDTH];
-               rb->GetRow(ctx, rb, width, x, y + i, stencil);
-               for (j = 0; j < width; j++) {
-                  stencil[j] = (stencil[j] & invMask) | clearVal;
-               }
-               rb->PutRow(ctx, rb, width, x, y + i, stencil, NULL);
-            }
-         }
-      }
-      else {
-         /* no bit masking */
-         const GLubyte clear8 = (GLubyte) clearVal;
-         const GLushort clear16 = (GLushort) clearVal;
-         const void *clear;
-         GLint i;
-         if (rb->DataType == GL_UNSIGNED_BYTE) {
-            clear = &clear8;
-         }
-         else {
-            clear = &clear16;
-         }
-         for (i = 0; i < height; i++) {
-            rb->PutMonoRow(ctx, rb, width, x, y + i, clear, 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 "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+

+#include "s_context.h"

+#include "s_depth.h"

+#include "s_stencil.h"

+#include "s_span.h"

+

+

+

+/* Stencil Logic:

+

+IF stencil test fails THEN

+   Apply fail-op to stencil value

+   Don't write the pixel (RGBA,Z)

+ELSE

+   IF doing depth test && depth test fails THEN

+      Apply zfail-op to stencil value

+      Write RGBA and Z to appropriate buffers

+   ELSE

+      Apply zpass-op to stencil value

+ENDIF

+

+*/

+

+

+/**

+ * Apply the given stencil operator to the array of stencil values.

+ * Don't touch stencil[i] if mask[i] is zero.

+ * Input:  n - size of stencil array

+ *         oper - the stencil buffer operator

+ *         face - 0 or 1 for front or back face operation

+ *         stencil - array of stencil values

+ *         mask - array [n] of flag:  1=apply operator, 0=don't apply operator

+ * Output:  stencil - modified values

+ */

+static void

+apply_stencil_op( const struct gl_context *ctx, GLenum oper, GLuint face,

+                  GLuint n, GLstencil stencil[], const GLubyte mask[] )

+{

+   const GLstencil ref = ctx->Stencil.Ref[face];

+   const GLstencil wrtmask = ctx->Stencil.WriteMask[face];

+   const GLstencil invmask = (GLstencil) (~wrtmask);

+   const GLstencil stencilMax = (1 << ctx->DrawBuffer->Visual.stencilBits) - 1;

+   GLuint i;

+

+   switch (oper) {

+      case GL_KEEP:

+         /* do nothing */

+         break;

+      case GL_ZERO:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  stencil[i] = 0;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  stencil[i] = (GLstencil) (stencil[i] & invmask);

+	       }

+	    }

+	 }

+	 break;

+      case GL_REPLACE:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  stencil[i] = ref;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  GLstencil s = stencil[i];

+		  stencil[i] = (GLstencil) ((invmask & s ) | (wrtmask & ref));

+	       }

+	    }

+	 }

+	 break;

+      case GL_INCR:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  GLstencil s = stencil[i];

+		  if (s < stencilMax) {

+		     stencil[i] = (GLstencil) (s+1);

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  /* VERIFY logic of adding 1 to a write-masked value */

+		  GLstencil s = stencil[i];

+		  if (s < stencilMax) {

+		     stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s+1)));

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_DECR:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  GLstencil s = stencil[i];

+		  if (s>0) {

+		     stencil[i] = (GLstencil) (s-1);

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  /* VERIFY logic of subtracting 1 to a write-masked value */

+		  GLstencil s = stencil[i];

+		  if (s>0) {

+		     stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s-1)));

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_INCR_WRAP_EXT:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  stencil[i]++;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil s = stencil[i];

+                  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s+1)));

+	       }

+	    }

+	 }

+	 break;

+      case GL_DECR_WRAP_EXT:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  stencil[i]--;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil s = stencil[i];

+                  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & (s-1)));

+	       }

+	    }

+	 }

+	 break;

+      case GL_INVERT:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  GLstencil s = stencil[i];

+		  stencil[i] = (GLstencil) ~s;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+		  GLstencil s = stencil[i];

+		  stencil[i] = (GLstencil) ((invmask & s) | (wrtmask & ~s));

+	       }

+	    }

+	 }

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad stencil op in apply_stencil_op");

+   }

+}

+

+

+

+

+/**

+ * Apply stencil test to an array of stencil values (before depth buffering).

+ * Input:  face - 0 or 1 for front or back-face polygons

+ *         n - number of pixels in the array

+ *         stencil - array of [n] stencil values

+ *         mask - array [n] of flag:  0=skip the pixel, 1=stencil the pixel

+ * Output:  mask - pixels which fail the stencil test will have their

+ *                 mask flag set to 0.

+ *          stencil - updated stencil values (where the test passed)

+ * Return:  GL_FALSE = all pixels failed, GL_TRUE = zero or more pixels passed.

+ */

+static GLboolean

+do_stencil_test( struct gl_context *ctx, GLuint face, GLuint n, GLstencil stencil[],

+                 GLubyte mask[] )

+{

+   GLubyte fail[MAX_WIDTH];

+   GLboolean allfail = GL_FALSE;

+   GLuint i;

+   const GLuint valueMask = ctx->Stencil.ValueMask[face];

+   const GLstencil r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+   GLstencil s;

+

+   ASSERT(n <= MAX_WIDTH);

+

+   /*

+    * Perform stencil test.  The results of this operation are stored

+    * in the fail[] array:

+    *   IF fail[i] is non-zero THEN

+    *       the stencil fail operator is to be applied

+    *   ELSE

+    *       the stencil fail operator is not to be applied

+    *   ENDIF

+    */

+   switch (ctx->Stencil.Function[face]) {

+      case GL_NEVER:

+         /* never pass; always fail */

+         for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       mask[i] = 0;

+	       fail[i] = 1;

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 allfail = GL_TRUE;

+	 break;

+      case GL_LESS:

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       s = (GLstencil) (stencil[i] & valueMask);

+	       if (r < s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_LEQUAL:

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       s = (GLstencil) (stencil[i] & valueMask);

+	       if (r <= s) {

+		  /* pass */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_GREATER:

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       s = (GLstencil) (stencil[i] & valueMask);

+	       if (r > s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_GEQUAL:

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       s = (GLstencil) (stencil[i] & valueMask);

+	       if (r >= s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_EQUAL:

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       s = (GLstencil) (stencil[i] & valueMask);

+	       if (r == s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_NOTEQUAL:

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       s = (GLstencil) (stencil[i] & valueMask);

+	       if (r != s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_ALWAYS:

+	 /* always pass */

+	 for (i=0;i<n;i++) {

+	    fail[i] = 0;

+	 }

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad stencil func in gl_stencil_span");

+         return 0;

+   }

+

+   if (ctx->Stencil.FailFunc[face] != GL_KEEP) {

+      apply_stencil_op( ctx, ctx->Stencil.FailFunc[face], face, n, stencil, fail );

+   }

+

+   return !allfail;

+}

+

+

+/**

+ * Compute the zpass/zfail masks by comparing the pre- and post-depth test

+ * masks.

+ */

+static INLINE void

+compute_pass_fail_masks(GLuint n, const GLubyte origMask[],

+                        const GLubyte newMask[],

+                        GLubyte passMask[], GLubyte failMask[])

+{

+   GLuint i;

+   for (i = 0; i < n; i++) {

+      ASSERT(newMask[i] == 0 || newMask[i] == 1);

+      passMask[i] = origMask[i] & newMask[i];

+      failMask[i] = origMask[i] & (newMask[i] ^ 1);

+   }

+}

+

+

+/**

+ * Apply stencil and depth testing to the span of pixels.

+ * Both software and hardware stencil buffers are acceptable.

+ * Input:  n - number of pixels in the span

+ *         x, y - location of leftmost pixel in span

+ *         z - array [n] of z values

+ *         mask - array [n] of flags  (1=test this pixel, 0=skip the pixel)

+ * Output:  mask - array [n] of flags (1=stencil and depth test passed)

+ * Return: GL_FALSE - all fragments failed the testing

+ *         GL_TRUE - one or more fragments passed the testing

+ *

+ */

+static GLboolean

+stencil_and_ztest_span(struct gl_context *ctx, SWspan *span, GLuint face)

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   GLstencil stencilRow[MAX_WIDTH];

+   GLstencil *stencil;

+   const GLuint n = span->end;

+   const GLint x = span->x;

+   const GLint y = span->y;

+   GLubyte *mask = span->array->mask;

+

+   ASSERT((span->arrayMask & SPAN_XY) == 0);

+   ASSERT(ctx->Stencil.Enabled);

+   ASSERT(n <= MAX_WIDTH);

+#ifdef DEBUG

+   if (ctx->Depth.Test) {

+      ASSERT(span->arrayMask & SPAN_Z);

+   }

+#endif

+

+   stencil = (GLstencil *) rb->GetPointer(ctx, rb, x, y);

+   if (!stencil) {

+      rb->GetRow(ctx, rb, n, x, y, stencilRow);

+      stencil = stencilRow;

+   }

+

+   /*

+    * Apply the stencil test to the fragments.

+    * failMask[i] is 1 if the stencil test failed.

+    */

+   if (do_stencil_test( ctx, face, n, stencil, mask ) == GL_FALSE) {

+      /* all fragments failed the stencil test, we're done. */

+      span->writeAll = GL_FALSE;

+      if (!rb->GetPointer(ctx, rb, 0, 0)) {

+         /* put updated stencil values into buffer */

+         rb->PutRow(ctx, rb, n, x, y, stencil, NULL);

+      }

+      return GL_FALSE;

+   }

+

+   /*

+    * Some fragments passed the stencil test, apply depth test to them

+    * and apply Zpass and Zfail stencil ops.

+    */

+   if (ctx->Depth.Test == GL_FALSE) {

+      /*

+       * No depth buffer, just apply zpass stencil function to active pixels.

+       */

+      apply_stencil_op( ctx, ctx->Stencil.ZPassFunc[face], face, n, stencil, mask );

+   }

+   else {

+      /*

+       * Perform depth buffering, then apply zpass or zfail stencil function.

+       */

+      GLubyte passMask[MAX_WIDTH], failMask[MAX_WIDTH], origMask[MAX_WIDTH];

+

+      /* save the current mask bits */

+      memcpy(origMask, mask, n * sizeof(GLubyte));

+

+      /* apply the depth test */

+      _swrast_depth_test_span(ctx, span);

+

+      compute_pass_fail_masks(n, origMask, mask, passMask, failMask);

+

+      /* apply the pass and fail operations */

+      if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {

+         apply_stencil_op( ctx, ctx->Stencil.ZFailFunc[face], face,

+                           n, stencil, failMask );

+      }

+      if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {

+         apply_stencil_op( ctx, ctx->Stencil.ZPassFunc[face], face,

+                           n, stencil, passMask );

+      }

+   }

+

+   /*

+    * Write updated stencil values back into hardware stencil buffer.

+    */

+   if (!rb->GetPointer(ctx, rb, 0, 0)) {

+      rb->PutRow(ctx, rb, n, x, y, stencil, NULL);

+   }

+   

+   span->writeAll = GL_FALSE;

+   

+   return GL_TRUE;  /* one or more fragments passed both tests */

+}

+

+

+

+/*

+ * Return the address of a stencil buffer value given the window coords:

+ */

+#define STENCIL_ADDRESS(X, Y)  (stencilStart + (Y) * stride + (X))

+

+

+

+/**

+ * Apply the given stencil operator for each pixel in the array whose

+ * mask flag is set.

+ * \note  This is for software stencil buffers only.

+ * Input:  n - number of pixels in the span

+ *         x, y - array of [n] pixels

+ *         operator - the stencil buffer operator

+ *         mask - array [n] of flag:  1=apply operator, 0=don't apply operator

+ */

+static void

+apply_stencil_op_to_pixels( struct gl_context *ctx,

+                            GLuint n, const GLint x[], const GLint y[],

+                            GLenum oper, GLuint face, const GLubyte mask[] )

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   const GLstencil stencilMax = (1 << fb->Visual.stencilBits) - 1;

+   const GLstencil ref = ctx->Stencil.Ref[face];

+   const GLstencil wrtmask = ctx->Stencil.WriteMask[face];

+   const GLstencil invmask = (GLstencil) (~wrtmask);

+   GLuint i;

+   GLstencil *stencilStart = (GLubyte *) rb->Data;

+   const GLuint stride = rb->Width;

+

+   ASSERT(rb->GetPointer(ctx, rb, 0, 0));

+   ASSERT(sizeof(GLstencil) == 1);

+

+   switch (oper) {

+      case GL_KEEP:

+         /* do nothing */

+         break;

+      case GL_ZERO:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = 0;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+		  *sptr = (GLstencil) (invmask & *sptr);

+	       }

+	    }

+	 }

+	 break;

+      case GL_REPLACE:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = ref;

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+		  *sptr = (GLstencil) ((invmask & *sptr ) | (wrtmask & ref));

+	       }

+	    }

+	 }

+	 break;

+      case GL_INCR:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+		  if (*sptr < stencilMax) {

+		     *sptr = (GLstencil) (*sptr + 1);

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+		  if (*sptr < stencilMax) {

+		     *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr+1)));

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_DECR:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+		  if (*sptr>0) {

+		     *sptr = (GLstencil) (*sptr - 1);

+		  }

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+		  if (*sptr>0) {

+		     *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr-1)));

+		  }

+	       }

+	    }

+	 }

+	 break;

+      case GL_INCR_WRAP_EXT:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = (GLstencil) (*sptr + 1);

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr+1)));

+	       }

+	    }

+	 }

+	 break;

+      case GL_DECR_WRAP_EXT:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = (GLstencil) (*sptr - 1);

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & (*sptr-1)));

+	       }

+	    }

+	 }

+	 break;

+      case GL_INVERT:

+	 if (invmask==0) {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = (GLstencil) (~*sptr);

+	       }

+	    }

+	 }

+	 else {

+	    for (i=0;i<n;i++) {

+	       if (mask[i]) {

+                  GLstencil *sptr = STENCIL_ADDRESS( x[i], y[i] );

+                  *sptr = (GLstencil) ((invmask & *sptr) | (wrtmask & ~*sptr));

+	       }

+	    }

+	 }

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad stencilop in apply_stencil_op_to_pixels");

+   }

+}

+

+

+

+/**

+ * Apply stencil test to an array of pixels before depth buffering.

+ *

+ * \note Used for software stencil buffer only.

+ * Input:  n - number of pixels in the span

+ *         x, y - array of [n] pixels to stencil

+ *         mask - array [n] of flag:  0=skip the pixel, 1=stencil the pixel

+ * Output:  mask - pixels which fail the stencil test will have their

+ *                 mask flag set to 0.

+ * \return  GL_FALSE = all pixels failed, GL_TRUE = zero or more pixels passed.

+ */

+static GLboolean

+stencil_test_pixels( struct gl_context *ctx, GLuint face, GLuint n,

+                     const GLint x[], const GLint y[], GLubyte mask[] )

+{

+   const struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   GLubyte fail[MAX_WIDTH];

+   GLstencil r, s;

+   GLuint i;

+   GLboolean allfail = GL_FALSE;

+   const GLuint valueMask = ctx->Stencil.ValueMask[face];

+   const GLstencil *stencilStart = (GLstencil *) rb->Data;

+   const GLuint stride = rb->Width;

+

+   ASSERT(rb->GetPointer(ctx, rb, 0, 0));

+   ASSERT(sizeof(GLstencil) == 1);

+

+   /*

+    * Perform stencil test.  The results of this operation are stored

+    * in the fail[] array:

+    *   IF fail[i] is non-zero THEN

+    *       the stencil fail operator is to be applied

+    *   ELSE

+    *       the stencil fail operator is not to be applied

+    *   ENDIF

+    */

+

+   switch (ctx->Stencil.Function[face]) {

+      case GL_NEVER:

+         /* always fail */

+         for (i=0;i<n;i++) {

+	    if (mask[i]) {

+	       mask[i] = 0;

+	       fail[i] = 1;

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 allfail = GL_TRUE;

+	 break;

+      case GL_LESS:

+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);

+	       s = (GLstencil) (*sptr & valueMask);

+	       if (r < s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_LEQUAL:

+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);

+	       s = (GLstencil) (*sptr & valueMask);

+	       if (r <= s) {

+		  /* pass */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_GREATER:

+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);

+	       s = (GLstencil) (*sptr & valueMask);

+	       if (r > s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_GEQUAL:

+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);

+	       s = (GLstencil) (*sptr & valueMask);

+	       if (r >= s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_EQUAL:

+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);

+	       s = (GLstencil) (*sptr & valueMask);

+	       if (r == s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_NOTEQUAL:

+	 r = (GLstencil) (ctx->Stencil.Ref[face] & valueMask);

+	 for (i=0;i<n;i++) {

+	    if (mask[i]) {

+               const GLstencil *sptr = STENCIL_ADDRESS(x[i],y[i]);

+	       s = (GLstencil) (*sptr & valueMask);

+	       if (r != s) {

+		  /* passed */

+		  fail[i] = 0;

+	       }

+	       else {

+		  fail[i] = 1;

+		  mask[i] = 0;

+	       }

+	    }

+	    else {

+	       fail[i] = 0;

+	    }

+	 }

+	 break;

+      case GL_ALWAYS:

+	 /* always pass */

+	 for (i=0;i<n;i++) {

+	    fail[i] = 0;

+	 }

+	 break;

+      default:

+         _mesa_problem(ctx, "Bad stencil func in gl_stencil_pixels");

+         return 0;

+   }

+

+   if (ctx->Stencil.FailFunc[face] != GL_KEEP) {

+      apply_stencil_op_to_pixels( ctx, n, x, y, ctx->Stencil.FailFunc[face],

+                                  face, fail );

+   }

+

+   return !allfail;

+}

+

+

+

+

+/**

+ * Apply stencil and depth testing to an array of pixels.

+ * This is used both for software and hardware stencil buffers.

+ *

+ * The comments in this function are a bit sparse but the code is

+ * almost identical to stencil_and_ztest_span(), which is well

+ * commented.

+ *

+ * Input:  n - number of pixels in the array

+ *         x, y - array of [n] pixel positions

+ *         z - array [n] of z values

+ *         mask - array [n] of flags  (1=test this pixel, 0=skip the pixel)

+ * Output: mask - array [n] of flags (1=stencil and depth test passed)

+ * Return: GL_FALSE - all fragments failed the testing

+ *         GL_TRUE - one or more fragments passed the testing

+ */

+static GLboolean

+stencil_and_ztest_pixels( struct gl_context *ctx, SWspan *span, GLuint face )

+{

+   GLubyte passMask[MAX_WIDTH], failMask[MAX_WIDTH], origMask[MAX_WIDTH];

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   const GLuint n = span->end;

+   const GLint *x = span->array->x;

+   const GLint *y = span->array->y;

+   GLubyte *mask = span->array->mask;

+

+   ASSERT(span->arrayMask & SPAN_XY);

+   ASSERT(ctx->Stencil.Enabled);

+   ASSERT(n <= MAX_WIDTH);

+

+   if (!rb->GetPointer(ctx, rb, 0, 0)) {

+      /* No direct access */

+      GLstencil stencil[MAX_WIDTH];

+

+      ASSERT(rb->DataType == GL_UNSIGNED_BYTE);

+      _swrast_get_values(ctx, rb, n, x, y, stencil, sizeof(GLubyte));

+

+      memcpy(origMask, mask, n * sizeof(GLubyte));          

+

+      (void) do_stencil_test(ctx, face, n, stencil, mask);

+

+      if (ctx->Depth.Test == GL_FALSE) {

+         apply_stencil_op(ctx, ctx->Stencil.ZPassFunc[face], face,

+                          n, stencil, mask);

+      }

+      else {

+         GLubyte tmpMask[MAX_WIDTH]; 

+         memcpy(tmpMask, mask, n * sizeof(GLubyte));

+

+         _swrast_depth_test_span(ctx, span);

+

+         compute_pass_fail_masks(n, tmpMask, mask, passMask, failMask);

+

+         if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {

+            apply_stencil_op(ctx, ctx->Stencil.ZFailFunc[face], face,

+                             n, stencil, failMask);

+         }

+         if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {

+            apply_stencil_op(ctx, ctx->Stencil.ZPassFunc[face], face,

+                             n, stencil, passMask);

+         }

+      }

+

+      /* Write updated stencil values into hardware stencil buffer */

+      rb->PutValues(ctx, rb, n, x, y, stencil, origMask);

+

+      return GL_TRUE;

+   }

+   else {

+      /* Direct access to stencil buffer */

+

+      if (stencil_test_pixels(ctx, face, n, x, y, mask) == GL_FALSE) {

+         /* all fragments failed the stencil test, we're done. */

+         return GL_FALSE;

+      }

+

+      if (ctx->Depth.Test==GL_FALSE) {

+         apply_stencil_op_to_pixels(ctx, n, x, y,

+                                    ctx->Stencil.ZPassFunc[face], face, mask);

+      }

+      else {

+         memcpy(origMask, mask, n * sizeof(GLubyte));

+

+         _swrast_depth_test_span(ctx, span);

+

+         compute_pass_fail_masks(n, origMask, mask, passMask, failMask);

+

+         if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {

+            apply_stencil_op_to_pixels(ctx, n, x, y,

+                                       ctx->Stencil.ZFailFunc[face],

+                                       face, failMask);

+         }

+         if (ctx->Stencil.ZPassFunc[face] != GL_KEEP) {

+            apply_stencil_op_to_pixels(ctx, n, x, y,

+                                       ctx->Stencil.ZPassFunc[face],

+                                       face, passMask);

+         }

+      }

+

+      return GL_TRUE;  /* one or more fragments passed both tests */

+   }

+}

+

+

+/**

+ * /return GL_TRUE = one or more fragments passed,

+ * GL_FALSE = all fragments failed.

+ */

+GLboolean

+_swrast_stencil_and_ztest_span(struct gl_context *ctx, SWspan *span)

+{

+   const GLuint face = (span->facing == 0) ? 0 : ctx->Stencil._BackFace;

+

+   if (span->arrayMask & SPAN_XY)

+      return stencil_and_ztest_pixels(ctx, span, face);

+   else

+      return stencil_and_ztest_span(ctx, span, face);

+}

+

+

+#if 0

+GLuint

+clip_span(GLuint bufferWidth, GLuint bufferHeight,

+          GLint x, GLint y, GLuint *count)

+{

+   GLuint n = *count;

+   GLuint skipPixels = 0;

+

+   if (y < 0 || y >= bufferHeight || x + n <= 0 || x >= bufferWidth) {

+      /* totally out of bounds */

+      n = 0;

+   }

+   else {

+      /* left clip */

+      if (x < 0) {

+         skipPixels = -x;

+         x = 0;

+         n -= skipPixels;

+      }

+      /* right clip */

+      if (x + n > bufferWidth) {

+         GLint dx = x + n - bufferWidth;

+         n -= dx;

+      }

+   }

+

+   *count = n;

+

+   return skipPixels;

+}

+#endif

+

+

+/**

+ * Return a span of stencil values from the stencil buffer.

+ * Used for glRead/CopyPixels

+ * Input:  n - how many pixels

+ *         x,y - location of first pixel

+ * Output:  stencil - the array of stencil values

+ */

+void

+_swrast_read_stencil_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                          GLint n, GLint x, GLint y, GLstencil stencil[])

+{

+   if (y < 0 || y >= (GLint) rb->Height ||

+       x + n <= 0 || x >= (GLint) rb->Width) {

+      /* span is completely outside framebuffer */

+      return; /* undefined values OK */

+   }

+

+   if (x < 0) {

+      GLint dx = -x;

+      x = 0;

+      n -= dx;

+      stencil += dx;

+   }

+   if (x + n > (GLint) rb->Width) {

+      GLint dx = x + n - rb->Width;

+      n -= dx;

+   }

+   if (n <= 0) {

+      return;

+   }

+

+   rb->GetRow(ctx, rb, n, x, y, stencil);

+}

+

+

+

+/**

+ * Write a span of stencil values to the stencil buffer.  This function

+ * applies the stencil write mask when needed.

+ * Used for glDraw/CopyPixels

+ * Input:  n - how many pixels

+ *         x, y - location of first pixel

+ *         stencil - the array of stencil values

+ */

+void

+_swrast_write_stencil_span(struct gl_context *ctx, GLint n, GLint x, GLint y,

+                           const GLstencil stencil[] )

+{

+   struct gl_framebuffer *fb = ctx->DrawBuffer;

+   struct gl_renderbuffer *rb = fb->_StencilBuffer;

+   const GLuint stencilMax = (1 << fb->Visual.stencilBits) - 1;

+   const GLuint stencilMask = ctx->Stencil.WriteMask[0];

+

+   if (y < 0 || y >= (GLint) rb->Height ||

+       x + n <= 0 || x >= (GLint) rb->Width) {

+      /* span is completely outside framebuffer */

+      return; /* undefined values OK */

+   }

+   if (x < 0) {

+      GLint dx = -x;

+      x = 0;

+      n -= dx;

+      stencil += dx;

+   }

+   if (x + n > (GLint) rb->Width) {

+      GLint dx = x + n - rb->Width;

+      n -= dx;

+   }

+   if (n <= 0) {

+      return;

+   }

+

+   if ((stencilMask & stencilMax) != stencilMax) {

+      /* need to apply writemask */

+      GLstencil destVals[MAX_WIDTH], newVals[MAX_WIDTH];

+      GLint i;

+      rb->GetRow(ctx, rb, n, x, y, destVals);

+      for (i = 0; i < n; i++) {

+         newVals[i]

+            = (stencil[i] & stencilMask) | (destVals[i] & ~stencilMask);

+      }

+      rb->PutRow(ctx, rb, n, x, y, newVals, NULL);

+   }

+   else {

+      rb->PutRow(ctx, rb, n, x, y, stencil, NULL);

+   }

+}

+

+

+

+/**

+ * Clear the stencil buffer.

+ */

+void

+_swrast_clear_stencil_buffer( struct gl_context *ctx, struct gl_renderbuffer *rb )

+{

+   const GLubyte stencilBits = ctx->DrawBuffer->Visual.stencilBits;

+   const GLuint mask = ctx->Stencil.WriteMask[0];

+   const GLuint invMask = ~mask;

+   const GLuint clearVal = (ctx->Stencil.Clear & mask);

+   const GLuint stencilMax = (1 << stencilBits) - 1;

+   GLint x, y, width, height;

+

+   if (!rb || mask == 0)

+      return;

+

+   ASSERT(rb->DataType == GL_UNSIGNED_BYTE ||

+          rb->DataType == GL_UNSIGNED_SHORT);

+

+   ASSERT(rb->_BaseFormat == GL_STENCIL_INDEX);

+

+   /* compute region to clear */

+   x = ctx->DrawBuffer->_Xmin;

+   y = ctx->DrawBuffer->_Ymin;

+   width  = ctx->DrawBuffer->_Xmax - ctx->DrawBuffer->_Xmin;

+   height = ctx->DrawBuffer->_Ymax - ctx->DrawBuffer->_Ymin;

+

+   if (rb->GetPointer(ctx, rb, 0, 0)) {

+      /* Direct buffer access */

+      if ((mask & stencilMax) != stencilMax) {

+         /* need to mask the clear */

+         if (rb->DataType == GL_UNSIGNED_BYTE) {

+            GLint i, j;

+            for (i = 0; i < height; i++) {

+               GLubyte *stencil = (GLubyte*) rb->GetPointer(ctx, rb, x, y + i);

+               for (j = 0; j < width; j++) {

+                  stencil[j] = (stencil[j] & invMask) | clearVal;

+               }

+            }

+         }

+         else {

+            GLint i, j;

+            for (i = 0; i < height; i++) {

+               GLushort *stencil = (GLushort*) rb->GetPointer(ctx, rb, x, y + i);

+               for (j = 0; j < width; j++) {

+                  stencil[j] = (stencil[j] & invMask) | clearVal;

+               }

+            }

+         }

+      }

+      else {

+         /* no bit masking */

+         if (width == (GLint) rb->Width && rb->DataType == GL_UNSIGNED_BYTE) {

+            /* optimized case */

+            /* Note: bottom-to-top raster assumed! */

+            GLubyte *stencil = (GLubyte *) rb->GetPointer(ctx, rb, x, y);

+            GLuint len = width * height * sizeof(GLubyte);

+            memset(stencil, clearVal, len);

+         }

+         else {

+            /* general case */

+            GLint i;

+            for (i = 0; i < height; i++) {

+               GLvoid *stencil = rb->GetPointer(ctx, rb, x, y + i);

+               if (rb->DataType == GL_UNSIGNED_BYTE) {

+                  memset(stencil, clearVal, width);

+               }

+               else {

+                  _mesa_memset16((short unsigned int*) stencil, clearVal, width);

+               }

+            }

+         }

+      }

+   }

+   else {

+      /* no direct access */

+      if ((mask & stencilMax) != stencilMax) {

+         /* need to mask the clear */

+         if (rb->DataType == GL_UNSIGNED_BYTE) {

+            GLint i, j;

+            for (i = 0; i < height; i++) {

+               GLubyte stencil[MAX_WIDTH];

+               rb->GetRow(ctx, rb, width, x, y + i, stencil);

+               for (j = 0; j < width; j++) {

+                  stencil[j] = (stencil[j] & invMask) | clearVal;

+               }

+               rb->PutRow(ctx, rb, width, x, y + i, stencil, NULL);

+            }

+         }

+         else {

+            GLint i, j;

+            for (i = 0; i < height; i++) {

+               GLushort stencil[MAX_WIDTH];

+               rb->GetRow(ctx, rb, width, x, y + i, stencil);

+               for (j = 0; j < width; j++) {

+                  stencil[j] = (stencil[j] & invMask) | clearVal;

+               }

+               rb->PutRow(ctx, rb, width, x, y + i, stencil, NULL);

+            }

+         }

+      }

+      else {

+         /* no bit masking */

+         const GLubyte clear8 = (GLubyte) clearVal;

+         const GLushort clear16 = (GLushort) clearVal;

+         const void *clear;

+         GLint i;

+         if (rb->DataType == GL_UNSIGNED_BYTE) {

+            clear = &clear8;

+         }

+         else {

+            clear = &clear16;

+         }

+         for (i = 0; i < height; i++) {

+            rb->PutMonoRow(ctx, rb, width, x, y + i, clear, NULL);

+         }

+      }

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_stencil.h b/mesalib/src/mesa/swrast/s_stencil.h
index c076ebbe2..0bcfb799f 100644
--- a/mesalib/src/mesa/swrast/s_stencil.h
+++ b/mesalib/src/mesa/swrast/s_stencil.h
@@ -1,53 +1,53 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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 S_STENCIL_H
-#define S_STENCIL_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-
-extern GLboolean
-_swrast_stencil_and_ztest_span(GLcontext *ctx, SWspan *span);
-
-
-extern void
-_swrast_read_stencil_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                          GLint n, GLint x, GLint y, GLstencil stencil[]);
-
-
-extern void
-_swrast_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
-                          const GLstencil stencil[] );
-
-
-extern void
-_swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb );
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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 S_STENCIL_H

+#define S_STENCIL_H

+

+

+#include "main/mtypes.h"

+#include "s_span.h"

+

+

+

+extern GLboolean

+_swrast_stencil_and_ztest_span(struct gl_context *ctx, SWspan *span);

+

+

+extern void

+_swrast_read_stencil_span(struct gl_context *ctx, struct gl_renderbuffer *rb,

+                          GLint n, GLint x, GLint y, GLstencil stencil[]);

+

+

+extern void

+_swrast_write_stencil_span( struct gl_context *ctx, GLint n, GLint x, GLint y,

+                          const GLstencil stencil[] );

+

+

+extern void

+_swrast_clear_stencil_buffer( struct gl_context *ctx, struct gl_renderbuffer *rb );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c
index 2ac0aaa24..672cd77bf 100644
--- a/mesalib/src/mesa/swrast/s_texcombine.c
+++ b/mesalib/src/mesa/swrast/s_texcombine.c
@@ -1,709 +1,742 @@
-/*
- * 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/image.h"
-#include "main/imports.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( GLcontext *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;
-   GLfloat ccolor[MAX_COMBINER_TERMS][MAX_WIDTH][4]; /* temp color buffers */
-   GLfloat rgba[MAX_WIDTH][4];
-   GLuint i, term;
-
-   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)
-                  return;
-               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)
-                  return;
-               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;
-	 }
-         return; /* 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]);
-   }
-}
-
-
-/**
- * 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( GLcontext *ctx, SWspan *span )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLfloat primary_rgba[MAX_WIDTH][4];
-   GLuint unit;
-
-   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_SGI_texture_color_table */
-         if (texUnit->ColorTableEnabled) {
-            _mesa_lookup_rgba_float(&texUnit->ColorTable, span->end, 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 );
-      }
-   }
-}
+/*

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

+         if (texUnit->ColorTableEnabled) {

+            _mesa_lookup_rgba_float(&texUnit->ColorTable, span->end, 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_texcombine.h b/mesalib/src/mesa/swrast/s_texcombine.h
index 4f5dfbe1a..3897acd69 100644
--- a/mesalib/src/mesa/swrast/s_texcombine.h
+++ b/mesalib/src/mesa/swrast/s_texcombine.h
@@ -1,36 +1,37 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 S_TEXCOMBINE_H
-#define S_TEXCOMBINE_H
-
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-extern void
-_swrast_texture_span( GLcontext *ctx, SWspan *span );
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 S_TEXCOMBINE_H

+#define S_TEXCOMBINE_H

+

+

+#include "s_span.h"

+

+struct gl_context;

+

+extern void

+_swrast_texture_span( struct gl_context *ctx, SWspan *span );

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c
index 3fc554c5a..f39bd8a38 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.c
+++ b/mesalib/src/mesa/swrast/s_texfilter.c
@@ -1,3300 +1,3312 @@
-/*
- * 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 "main/texformat.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]);
-   }
-}
-
-
-/**
- * If A is a signed integer, A % B doesn't give the right value for A < 0
- * (in terms of texture repeat).  Just casting to unsigned fixes that.
- */
-#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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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( GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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]);
-   }
-}
-
-
-/**
- * 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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *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 (depth00 <= coord)  luminance -= d;
-      if (depth01 <= coord)  luminance -= d;
-      if (depth10 <= coord)  luminance -= d;
-      if (depth11 <= coord)  luminance -= d;
-      return luminance;
-   case GL_GEQUAL:
-      if (depth00 >= coord)  luminance -= d;
-      if (depth01 >= coord)  luminance -= d;
-      if (depth10 >= coord)  luminance -= d;
-      if (depth11 >= coord)  luminance -= d;
-      return luminance;
-   case GL_LESS:
-      if (depth00 < coord)  luminance -= d;
-      if (depth01 < coord)  luminance -= d;
-      if (depth10 < coord)  luminance -= d;
-      if (depth11 < coord)  luminance -= d;
-      return luminance;
-   case GL_GREATER:
-      if (depth00 > coord)  luminance -= d;
-      if (depth01 > coord)  luminance -= d;
-      if (depth10 > coord)  luminance -= d;
-      if (depth11 > coord)  luminance -= d;
-      return luminance;
-   case GL_EQUAL:
-      if (depth00 == coord)  luminance -= d;
-      if (depth01 == coord)  luminance -= d;
-      if (depth10 == coord)  luminance -= d;
-      if (depth11 == coord)  luminance -= d;
-      return luminance;
-   case GL_NOTEQUAL:
-      if (depth00 != coord)  luminance -= d;
-      if (depth01 != coord)  luminance -= d;
-      if (depth10 != coord)  luminance -= d;
-      if (depth11 != coord)  luminance -= d;
-      return luminance;
-   case GL_ALWAYS:
-      return 0.0;
-   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_depth_texture");
-      return 0.0F;
-   }
-}
-
-
-/**
- * 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;
-
-   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( GLcontext *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;
-         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];
-         }
-
-         result = shadow_compare(function, texcoords[i][compare_coord],
-                                 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;
-         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;
-         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;
-            }
-         }
-
-         result = shadow_compare4(function, texcoords[i][compare_coord],
-                                  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( GLcontext *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( GLcontext *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 "main/texformat.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 (depth00 <= coord)  luminance -= d;

+      if (depth01 <= coord)  luminance -= d;

+      if (depth10 <= coord)  luminance -= d;

+      if (depth11 <= coord)  luminance -= d;

+      return luminance;

+   case GL_GEQUAL:

+      if (depth00 >= coord)  luminance -= d;

+      if (depth01 >= coord)  luminance -= d;

+      if (depth10 >= coord)  luminance -= d;

+      if (depth11 >= coord)  luminance -= d;

+      return luminance;

+   case GL_LESS:

+      if (depth00 < coord)  luminance -= d;

+      if (depth01 < coord)  luminance -= d;

+      if (depth10 < coord)  luminance -= d;

+      if (depth11 < coord)  luminance -= d;

+      return luminance;

+   case GL_GREATER:

+      if (depth00 > coord)  luminance -= d;

+      if (depth01 > coord)  luminance -= d;

+      if (depth10 > coord)  luminance -= d;

+      if (depth11 > coord)  luminance -= d;

+      return luminance;

+   case GL_EQUAL:

+      if (depth00 == coord)  luminance -= d;

+      if (depth01 == coord)  luminance -= d;

+      if (depth10 == coord)  luminance -= d;

+      if (depth11 == coord)  luminance -= d;

+      return luminance;

+   case GL_NOTEQUAL:

+      if (depth00 != coord)  luminance -= d;

+      if (depth01 != coord)  luminance -= d;

+      if (depth10 != coord)  luminance -= d;

+      if (depth11 != coord)  luminance -= d;

+      return luminance;

+   case GL_ALWAYS:

+      return 0.0;

+   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_depth_texture");

+      return 0.0F;

+   }

+}

+

+

+/**

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

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

+         }

+

+         result = shadow_compare(function, texcoords[i][compare_coord],

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

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

+            }

+         }

+

+         result = shadow_compare4(function, texcoords[i][compare_coord],

+                                  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/swrast/s_texfilter.h b/mesalib/src/mesa/swrast/s_texfilter.h
index eceab5965..fd7e5776f 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.h
+++ b/mesalib/src/mesa/swrast/s_texfilter.h
@@ -1,39 +1,41 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 S_TEXFILTER_H
-#define S_TEXFILTER_H
-
-
-#include "main/mtypes.h"
-#include "s_context.h"
-
-
-extern texture_sample_func
-_swrast_choose_texture_sample_func( GLcontext *ctx,
-				    const struct gl_texture_object *tObj );
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 S_TEXFILTER_H

+#define S_TEXFILTER_H

+

+

+#include "s_context.h"

+

+struct gl_context;

+struct gl_texture_object;

+

+

+extern texture_sample_func

+_swrast_choose_texture_sample_func( struct gl_context *ctx,

+				    const struct gl_texture_object *tObj );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_triangle.c b/mesalib/src/mesa/swrast/s_triangle.c
index d1b369bcd..93826b7ce 100644
--- a/mesalib/src/mesa/swrast/s_triangle.c
+++ b/mesalib/src/mesa/swrast/s_triangle.c
@@ -1,1142 +1,1142 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.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.
- */
-
-
-/*
- * When the device driver doesn't implement triangle rasterization it
- * can hook in _swrast_Triangle, which eventually calls one of these
- * functions to draw triangles.
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/texformat.h"
-#include "program/prog_instruction.h"
-
-#include "s_aatriangle.h"
-#include "s_context.h"
-#include "s_feedback.h"
-#include "s_span.h"
-#include "s_triangle.h"
-
-
-/**
- * Test if a triangle should be culled.  Used for feedback and selection mode.
- * \return GL_TRUE if the triangle is to be culled, GL_FALSE otherwise.
- */
-GLboolean
-_swrast_culltriangle( GLcontext *ctx,
-                      const SWvertex *v0,
-                      const SWvertex *v1,
-                      const SWvertex *v2 )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   GLfloat ex = v1->attrib[FRAG_ATTRIB_WPOS][0] - v0->attrib[FRAG_ATTRIB_WPOS][0];
-   GLfloat ey = v1->attrib[FRAG_ATTRIB_WPOS][1] - v0->attrib[FRAG_ATTRIB_WPOS][1];
-   GLfloat fx = v2->attrib[FRAG_ATTRIB_WPOS][0] - v0->attrib[FRAG_ATTRIB_WPOS][0];
-   GLfloat fy = v2->attrib[FRAG_ATTRIB_WPOS][1] - v0->attrib[FRAG_ATTRIB_WPOS][1];
-   GLfloat c = ex*fy-ey*fx;
-
-   if (c * swrast->_BackfaceSign * swrast->_BackfaceCullSign <= 0.0F)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-
-
-/*
- * Render a flat-shaded RGBA triangle.
- */
-#define NAME flat_rgba_triangle
-#define INTERP_Z 1
-#define SETUP_CODE				\
-   ASSERT(ctx->Texture._EnabledCoordUnits == 0);\
-   ASSERT(ctx->Light.ShadeModel==GL_FLAT);	\
-   span.interpMask |= SPAN_RGBA;		\
-   span.red = ChanToFixed(v2->color[0]);	\
-   span.green = ChanToFixed(v2->color[1]);	\
-   span.blue = ChanToFixed(v2->color[2]);	\
-   span.alpha = ChanToFixed(v2->color[3]);	\
-   span.redStep = 0;				\
-   span.greenStep = 0;				\
-   span.blueStep = 0;				\
-   span.alphaStep = 0;
-#define RENDER_SPAN( span )  _swrast_write_rgba_span(ctx, &span);
-#include "s_tritemp.h"
-
-
-
-/*
- * Render a smooth-shaded RGBA triangle.
- */
-#define NAME smooth_rgba_triangle
-#define INTERP_Z 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define SETUP_CODE				\
-   {						\
-      /* texturing must be off */		\
-      ASSERT(ctx->Texture._EnabledCoordUnits == 0);	\
-      ASSERT(ctx->Light.ShadeModel==GL_SMOOTH);	\
-   }
-#define RENDER_SPAN( span )  _swrast_write_rgba_span(ctx, &span);
-#include "s_tritemp.h"
-
-
-
-/*
- * Render an RGB, GL_DECAL, textured triangle.
- * Interpolate S,T only w/out mipmapping or perspective correction.
- *
- * No fog.  No depth testing.
- */
-#define NAME simple_textured_triangle
-#define INTERP_INT_TEX 1
-#define S_SCALE twidth
-#define T_SCALE theight
-
-#define SETUP_CODE							\
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];	\
-   const struct gl_texture_object *obj = 				\
-      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
-   const struct gl_texture_image *texImg =				\
-      obj->Image[0][obj->BaseLevel];					\
-   const GLfloat twidth = (GLfloat) texImg->Width;			\
-   const GLfloat theight = (GLfloat) texImg->Height;			\
-   const GLint twidth_log2 = texImg->WidthLog2;				\
-   const GLubyte *texture = (const GLubyte *) texImg->Data;		\
-   const GLint smask = texImg->Width - 1;				\
-   const GLint tmask = texImg->Height - 1;				\
-   ASSERT(texImg->TexFormat == MESA_FORMAT_RGB888);			\
-   if (!rb || !texture) {						\
-      return;								\
-   }
-
-#define RENDER_SPAN( span )						\
-   GLuint i;								\
-   GLubyte rgb[MAX_WIDTH][3];						\
-   span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\
-   span.intTex[1] -= FIXED_HALF;					\
-   for (i = 0; i < span.end; i++) {					\
-      GLint s = FixedToInt(span.intTex[0]) & smask;			\
-      GLint t = FixedToInt(span.intTex[1]) & tmask;			\
-      GLint pos = (t << twidth_log2) + s;				\
-      pos = pos + pos + pos;  /* multiply by 3 */			\
-      rgb[i][RCOMP] = texture[pos+2];					\
-      rgb[i][GCOMP] = texture[pos+1];					\
-      rgb[i][BCOMP] = texture[pos+0];					\
-      span.intTex[0] += span.intTexStep[0];				\
-      span.intTex[1] += span.intTexStep[1];				\
-   }									\
-   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, rgb, NULL);
-
-#include "s_tritemp.h"
-
-
-
-/*
- * Render an RGB, GL_DECAL, textured triangle.
- * Interpolate S,T, GL_LESS depth test, w/out mipmapping or
- * perspective correction.
- * Depth buffer bits must be <= sizeof(DEFAULT_SOFTWARE_DEPTH_TYPE)
- *
- * No fog.
- */
-#define NAME simple_z_textured_triangle
-#define INTERP_Z 1
-#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
-#define INTERP_INT_TEX 1
-#define S_SCALE twidth
-#define T_SCALE theight
-
-#define SETUP_CODE							\
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];	\
-   const struct gl_texture_object *obj = 				\
-      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
-   const struct gl_texture_image *texImg = 				\
-       obj->Image[0][obj->BaseLevel]; 					\
-   const GLfloat twidth = (GLfloat) texImg->Width;			\
-   const GLfloat theight = (GLfloat) texImg->Height;			\
-   const GLint twidth_log2 = texImg->WidthLog2;				\
-   const GLubyte *texture = (const GLubyte *) texImg->Data;		\
-   const GLint smask = texImg->Width - 1;				\
-   const GLint tmask = texImg->Height - 1;				\
-   ASSERT(texImg->TexFormat == MESA_FORMAT_RGB888);			\
-   if (!rb || !texture) {						\
-      return;								\
-   }
-
-#define RENDER_SPAN( span )						\
-   GLuint i;				    				\
-   GLubyte rgb[MAX_WIDTH][3];						\
-   span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\
-   span.intTex[1] -= FIXED_HALF;					\
-   for (i = 0; i < span.end; i++) {					\
-      const GLuint z = FixedToDepth(span.z);				\
-      if (z < zRow[i]) {						\
-         GLint s = FixedToInt(span.intTex[0]) & smask;			\
-         GLint t = FixedToInt(span.intTex[1]) & tmask;			\
-         GLint pos = (t << twidth_log2) + s;				\
-         pos = pos + pos + pos;  /* multiply by 3 */			\
-         rgb[i][RCOMP] = texture[pos+2];				\
-         rgb[i][GCOMP] = texture[pos+1];				\
-         rgb[i][BCOMP] = texture[pos+0];				\
-         zRow[i] = z;							\
-         span.array->mask[i] = 1;					\
-      }									\
-      else {								\
-         span.array->mask[i] = 0;					\
-      }									\
-      span.intTex[0] += span.intTexStep[0];				\
-      span.intTex[1] += span.intTexStep[1];				\
-      span.z += span.zStep;						\
-   }									\
-   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, rgb, span.array->mask);
-
-#include "s_tritemp.h"
-
-
-#if CHAN_TYPE != GL_FLOAT
-
-struct affine_info
-{
-   GLenum filter;
-   GLenum format;
-   GLenum envmode;
-   GLint smask, tmask;
-   GLint twidth_log2;
-   const GLchan *texture;
-   GLfixed er, eg, eb, ea;
-   GLint tbytesline, tsize;
-};
-
-
-static INLINE GLint
-ilerp(GLint t, GLint a, GLint b)
-{
-   return a + ((t * (b - a)) >> FIXED_SHIFT);
-}
-
-static INLINE GLint
-ilerp_2d(GLint ia, GLint ib, GLint v00, GLint v10, GLint v01, GLint v11)
-{
-   const GLint temp0 = ilerp(ia, v00, v10);
-   const GLint temp1 = ilerp(ia, v01, v11);
-   return ilerp(ib, temp0, temp1);
-}
-
-
-/* This function can handle GL_NEAREST or GL_LINEAR sampling of 2D RGB or RGBA
- * textures with GL_REPLACE, GL_MODULATE, GL_BLEND, GL_DECAL or GL_ADD
- * texture env modes.
- */
-static INLINE void
-affine_span(GLcontext *ctx, SWspan *span,
-            struct affine_info *info)
-{
-   GLchan sample[4];  /* the filtered texture sample */
-   const GLuint texEnableSave = ctx->Texture._EnabledCoordUnits;
-
-   /* Instead of defining a function for each mode, a test is done
-    * between the outer and inner loops. This is to reduce code size
-    * and complexity. Observe that an optimizing compiler kills
-    * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST).
-    */
-
-#define NEAREST_RGB		\
-   sample[RCOMP] = tex00[2];	\
-   sample[GCOMP] = tex00[1];	\
-   sample[BCOMP] = tex00[0];	\
-   sample[ACOMP] = CHAN_MAX;
-
-#define LINEAR_RGB							\
-   sample[RCOMP] = ilerp_2d(sf, tf, tex00[2], tex01[2], tex10[2], tex11[2]);\
-   sample[GCOMP] = ilerp_2d(sf, tf, tex00[1], tex01[1], tex10[1], tex11[1]);\
-   sample[BCOMP] = ilerp_2d(sf, tf, tex00[0], tex01[0], tex10[0], tex11[0]);\
-   sample[ACOMP] = CHAN_MAX;
-
-#define NEAREST_RGBA  \
-   sample[RCOMP] = tex00[3];	\
-   sample[GCOMP] = tex00[2];	\
-   sample[BCOMP] = tex00[1];	\
-   sample[ACOMP] = tex00[0];
-
-#define LINEAR_RGBA							\
-   sample[RCOMP] = ilerp_2d(sf, tf, tex00[3], tex01[3], tex10[3], tex11[3]);\
-   sample[GCOMP] = ilerp_2d(sf, tf, tex00[2], tex01[2], tex10[2], tex11[2]);\
-   sample[BCOMP] = ilerp_2d(sf, tf, tex00[1], tex01[1], tex10[1], tex11[1]);\
-   sample[ACOMP] = ilerp_2d(sf, tf, tex00[0], tex01[0], tex10[0], tex11[0])
-
-#define MODULATE							  \
-   dest[RCOMP] = span->red   * (sample[RCOMP] + 1u) >> (FIXED_SHIFT + 8); \
-   dest[GCOMP] = span->green * (sample[GCOMP] + 1u) >> (FIXED_SHIFT + 8); \
-   dest[BCOMP] = span->blue  * (sample[BCOMP] + 1u) >> (FIXED_SHIFT + 8); \
-   dest[ACOMP] = span->alpha * (sample[ACOMP] + 1u) >> (FIXED_SHIFT + 8)
-
-#define DECAL								\
-   dest[RCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->red +		\
-               ((sample[ACOMP] + 1) * sample[RCOMP] << FIXED_SHIFT))	\
-               >> (FIXED_SHIFT + 8);					\
-   dest[GCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->green +		\
-               ((sample[ACOMP] + 1) * sample[GCOMP] << FIXED_SHIFT))	\
-               >> (FIXED_SHIFT + 8);					\
-   dest[BCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->blue +		\
-               ((sample[ACOMP] + 1) * sample[BCOMP] << FIXED_SHIFT))	\
-               >> (FIXED_SHIFT + 8);					\
-   dest[ACOMP] = FixedToInt(span->alpha)
-
-#define BLEND								\
-   dest[RCOMP] = ((CHAN_MAX - sample[RCOMP]) * span->red		\
-               + (sample[RCOMP] + 1) * info->er) >> (FIXED_SHIFT + 8);	\
-   dest[GCOMP] = ((CHAN_MAX - sample[GCOMP]) * span->green		\
-               + (sample[GCOMP] + 1) * info->eg) >> (FIXED_SHIFT + 8);	\
-   dest[BCOMP] = ((CHAN_MAX - sample[BCOMP]) * span->blue		\
-               + (sample[BCOMP] + 1) * info->eb) >> (FIXED_SHIFT + 8);	\
-   dest[ACOMP] = span->alpha * (sample[ACOMP] + 1) >> (FIXED_SHIFT + 8)
-
-#define REPLACE  COPY_CHAN4(dest, sample)
-
-#define ADD								\
-   {									\
-      GLint rSum = FixedToInt(span->red)   + (GLint) sample[RCOMP];	\
-      GLint gSum = FixedToInt(span->green) + (GLint) sample[GCOMP];	\
-      GLint bSum = FixedToInt(span->blue)  + (GLint) sample[BCOMP];	\
-      dest[RCOMP] = MIN2(rSum, CHAN_MAX);				\
-      dest[GCOMP] = MIN2(gSum, CHAN_MAX);				\
-      dest[BCOMP] = MIN2(bSum, CHAN_MAX);				\
-      dest[ACOMP] = span->alpha * (sample[ACOMP] + 1) >> (FIXED_SHIFT + 8); \
-  }
-
-/* shortcuts */
-
-#define NEAREST_RGB_REPLACE		\
-   NEAREST_RGB;				\
-   dest[0] = sample[0];			\
-   dest[1] = sample[1];			\
-   dest[2] = sample[2];			\
-   dest[3] = FixedToInt(span->alpha);
-
-#define NEAREST_RGBA_REPLACE  \
-   dest[RCOMP] = tex00[3]; \
-   dest[GCOMP] = tex00[2]; \
-   dest[BCOMP] = tex00[1]; \
-   dest[ACOMP] = tex00[0]
-
-#define SPAN_NEAREST(DO_TEX, COMPS)					\
-	for (i = 0; i < span->end; i++) {				\
-           /* Isn't it necessary to use FixedFloor below?? */		\
-           GLint s = FixedToInt(span->intTex[0]) & info->smask;		\
-           GLint t = FixedToInt(span->intTex[1]) & info->tmask;		\
-           GLint pos = (t << info->twidth_log2) + s;			\
-           const GLchan *tex00 = info->texture + COMPS * pos;		\
-           DO_TEX;							\
-           span->red += span->redStep;					\
-	   span->green += span->greenStep;				\
-           span->blue += span->blueStep;				\
-	   span->alpha += span->alphaStep;				\
-	   span->intTex[0] += span->intTexStep[0];			\
-	   span->intTex[1] += span->intTexStep[1];			\
-           dest += 4;							\
-	}
-
-#define SPAN_LINEAR(DO_TEX, COMPS)					\
-	for (i = 0; i < span->end; i++) {				\
-           /* Isn't it necessary to use FixedFloor below?? */		\
-           const GLint s = FixedToInt(span->intTex[0]) & info->smask;	\
-           const GLint t = FixedToInt(span->intTex[1]) & info->tmask;	\
-           const GLfixed sf = span->intTex[0] & FIXED_FRAC_MASK;	\
-           const GLfixed tf = span->intTex[1] & FIXED_FRAC_MASK;	\
-           const GLint pos = (t << info->twidth_log2) + s;		\
-           const GLchan *tex00 = info->texture + COMPS * pos;		\
-           const GLchan *tex10 = tex00 + info->tbytesline;		\
-           const GLchan *tex01 = tex00 + COMPS;				\
-           const GLchan *tex11 = tex10 + COMPS;				\
-           if (t == info->tmask) {					\
-              tex10 -= info->tsize;					\
-              tex11 -= info->tsize;					\
-           }								\
-           if (s == info->smask) {					\
-              tex01 -= info->tbytesline;				\
-              tex11 -= info->tbytesline;				\
-           }								\
-           DO_TEX;							\
-           span->red += span->redStep;					\
-	   span->green += span->greenStep;				\
-           span->blue += span->blueStep;				\
-	   span->alpha += span->alphaStep;				\
-	   span->intTex[0] += span->intTexStep[0];			\
-	   span->intTex[1] += span->intTexStep[1];			\
-           dest += 4;							\
-	}
-
-
-   GLuint i;
-   GLchan *dest = span->array->rgba[0];
-
-   /* Disable tex units so they're not re-applied in swrast_write_rgba_span */
-   ctx->Texture._EnabledCoordUnits = 0x0;
-
-   span->intTex[0] -= FIXED_HALF;
-   span->intTex[1] -= FIXED_HALF;
-   switch (info->filter) {
-   case GL_NEAREST:
-      switch (info->format) {
-      case MESA_FORMAT_RGB888:
-         switch (info->envmode) {
-         case GL_MODULATE:
-            SPAN_NEAREST(NEAREST_RGB;MODULATE,3);
-            break;
-         case GL_DECAL:
-         case GL_REPLACE:
-            SPAN_NEAREST(NEAREST_RGB_REPLACE,3);
-            break;
-         case GL_BLEND:
-            SPAN_NEAREST(NEAREST_RGB;BLEND,3);
-            break;
-         case GL_ADD:
-            SPAN_NEAREST(NEAREST_RGB;ADD,3);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode in SPAN_LINEAR");
-            return;
-         }
-         break;
-      case MESA_FORMAT_RGBA8888:
-         switch(info->envmode) {
-         case GL_MODULATE:
-            SPAN_NEAREST(NEAREST_RGBA;MODULATE,4);
-            break;
-         case GL_DECAL:
-            SPAN_NEAREST(NEAREST_RGBA;DECAL,4);
-            break;
-         case GL_BLEND:
-            SPAN_NEAREST(NEAREST_RGBA;BLEND,4);
-            break;
-         case GL_ADD:
-            SPAN_NEAREST(NEAREST_RGBA;ADD,4);
-            break;
-         case GL_REPLACE:
-            SPAN_NEAREST(NEAREST_RGBA_REPLACE,4);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (2) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      }
-      break;
-
-   case GL_LINEAR:
-      span->intTex[0] -= FIXED_HALF;
-      span->intTex[1] -= FIXED_HALF;
-      switch (info->format) {
-      case MESA_FORMAT_RGB888:
-         switch (info->envmode) {
-         case GL_MODULATE:
-            SPAN_LINEAR(LINEAR_RGB;MODULATE,3);
-            break;
-         case GL_DECAL:
-         case GL_REPLACE:
-            SPAN_LINEAR(LINEAR_RGB;REPLACE,3);
-            break;
-         case GL_BLEND:
-            SPAN_LINEAR(LINEAR_RGB;BLEND,3);
-            break;
-         case GL_ADD:
-            SPAN_LINEAR(LINEAR_RGB;ADD,3);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (3) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      case MESA_FORMAT_RGBA8888:
-         switch (info->envmode) {
-         case GL_MODULATE:
-            SPAN_LINEAR(LINEAR_RGBA;MODULATE,4);
-            break;
-         case GL_DECAL:
-            SPAN_LINEAR(LINEAR_RGBA;DECAL,4);
-            break;
-         case GL_BLEND:
-            SPAN_LINEAR(LINEAR_RGBA;BLEND,4);
-            break;
-         case GL_ADD:
-            SPAN_LINEAR(LINEAR_RGBA;ADD,4);
-            break;
-         case GL_REPLACE:
-            SPAN_LINEAR(LINEAR_RGBA;REPLACE,4);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (4) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      }
-      break;
-   }
-   span->interpMask &= ~SPAN_RGBA;
-   ASSERT(span->arrayMask & SPAN_RGBA);
-
-   _swrast_write_rgba_span(ctx, span);
-
-   /* re-enable texture units */
-   ctx->Texture._EnabledCoordUnits = texEnableSave;
-
-#undef SPAN_NEAREST
-#undef SPAN_LINEAR
-}
-
-
-
-/*
- * Render an RGB/RGBA textured triangle without perspective correction.
- */
-#define NAME affine_textured_triangle
-#define INTERP_Z 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define INTERP_INT_TEX 1
-#define S_SCALE twidth
-#define T_SCALE theight
-
-#define SETUP_CODE							\
-   struct affine_info info;						\
-   struct gl_texture_unit *unit = ctx->Texture.Unit+0;			\
-   const struct gl_texture_object *obj = 				\
-      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
-   const struct gl_texture_image *texImg = 				\
-      obj->Image[0][obj->BaseLevel]; 					\
-   const GLfloat twidth = (GLfloat) texImg->Width;			\
-   const GLfloat theight = (GLfloat) texImg->Height;			\
-   info.texture = (const GLchan *) texImg->Data;			\
-   info.twidth_log2 = texImg->WidthLog2;				\
-   info.smask = texImg->Width - 1;					\
-   info.tmask = texImg->Height - 1;					\
-   info.format = texImg->TexFormat;					\
-   info.filter = obj->MinFilter;					\
-   info.envmode = unit->EnvMode;					\
-   info.er = 0;					\
-   info.eg = 0;					\
-   info.eb = 0;					\
-   span.arrayMask |= SPAN_RGBA;						\
-									\
-   if (info.envmode == GL_BLEND) {					\
-      /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\
-      info.er = FloatToFixed(unit->EnvColor[RCOMP] * CHAN_MAXF);	\
-      info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF);	\
-      info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF);	\
-      info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF);	\
-   }									\
-   if (!info.texture) {							\
-      /* this shouldn't happen */					\
-      return;								\
-   }									\
-									\
-   switch (info.format) {						\
-   case MESA_FORMAT_RGB888:						\
-      info.tbytesline = texImg->Width * 3;				\
-      break;								\
-   case MESA_FORMAT_RGBA8888:						\
-      info.tbytesline = texImg->Width * 4;				\
-      break;								\
-   default:								\
-      _mesa_problem(NULL, "Bad texture format in affine_texture_triangle");\
-      return;								\
-   }									\
-   info.tsize = texImg->Height * info.tbytesline;
-
-#define RENDER_SPAN( span )   affine_span(ctx, &span, &info);
-
-#include "s_tritemp.h"
-
-
-
-struct persp_info
-{
-   GLenum filter;
-   GLenum format;
-   GLenum envmode;
-   GLint smask, tmask;
-   GLint twidth_log2;
-   const GLchan *texture;
-   GLfixed er, eg, eb, ea;   /* texture env color */
-   GLint tbytesline, tsize;
-};
-
-
-static INLINE void
-fast_persp_span(GLcontext *ctx, SWspan *span,
-		struct persp_info *info)
-{
-   GLchan sample[4];  /* the filtered texture sample */
-
-  /* Instead of defining a function for each mode, a test is done
-   * between the outer and inner loops. This is to reduce code size
-   * and complexity. Observe that an optimizing compiler kills
-   * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST).
-   */
-#define SPAN_NEAREST(DO_TEX,COMP)					\
-	for (i = 0; i < span->end; i++) {				\
-           GLdouble invQ = tex_coord[2] ?				\
-                                 (1.0 / tex_coord[2]) : 1.0;            \
-           GLfloat s_tmp = (GLfloat) (tex_coord[0] * invQ);		\
-           GLfloat t_tmp = (GLfloat) (tex_coord[1] * invQ);		\
-           GLint s = IFLOOR(s_tmp) & info->smask;	        	\
-           GLint t = IFLOOR(t_tmp) & info->tmask;	        	\
-           GLint pos = (t << info->twidth_log2) + s;			\
-           const GLchan *tex00 = info->texture + COMP * pos;		\
-           DO_TEX;							\
-           span->red += span->redStep;					\
-	   span->green += span->greenStep;				\
-           span->blue += span->blueStep;				\
-	   span->alpha += span->alphaStep;				\
-	   tex_coord[0] += tex_step[0];					\
-	   tex_coord[1] += tex_step[1];					\
-	   tex_coord[2] += tex_step[2];					\
-           dest += 4;							\
-	}
-
-#define SPAN_LINEAR(DO_TEX,COMP)					\
-	for (i = 0; i < span->end; i++) {				\
-           GLdouble invQ = tex_coord[2] ?				\
-                                 (1.0 / tex_coord[2]) : 1.0;            \
-           const GLfloat s_tmp = (GLfloat) (tex_coord[0] * invQ);	\
-           const GLfloat t_tmp = (GLfloat) (tex_coord[1] * invQ);	\
-           const GLfixed s_fix = FloatToFixed(s_tmp) - FIXED_HALF;	\
-           const GLfixed t_fix = FloatToFixed(t_tmp) - FIXED_HALF;      \
-           const GLint s = FixedToInt(FixedFloor(s_fix)) & info->smask;	\
-           const GLint t = FixedToInt(FixedFloor(t_fix)) & info->tmask;	\
-           const GLfixed sf = s_fix & FIXED_FRAC_MASK;			\
-           const GLfixed tf = t_fix & FIXED_FRAC_MASK;			\
-           const GLint pos = (t << info->twidth_log2) + s;		\
-           const GLchan *tex00 = info->texture + COMP * pos;		\
-           const GLchan *tex10 = tex00 + info->tbytesline;		\
-           const GLchan *tex01 = tex00 + COMP;				\
-           const GLchan *tex11 = tex10 + COMP;				\
-           if (t == info->tmask) {					\
-              tex10 -= info->tsize;					\
-              tex11 -= info->tsize;					\
-           }								\
-           if (s == info->smask) {					\
-              tex01 -= info->tbytesline;				\
-              tex11 -= info->tbytesline;				\
-           }								\
-           DO_TEX;							\
-           span->red   += span->redStep;				\
-	   span->green += span->greenStep;				\
-           span->blue  += span->blueStep;				\
-	   span->alpha += span->alphaStep;				\
-	   tex_coord[0] += tex_step[0];					\
-	   tex_coord[1] += tex_step[1];					\
-	   tex_coord[2] += tex_step[2];					\
-           dest += 4;							\
-	}
-
-   GLuint i;
-   GLfloat tex_coord[3], tex_step[3];
-   GLchan *dest = span->array->rgba[0];
-
-   const GLuint texEnableSave = ctx->Texture._EnabledCoordUnits;
-   ctx->Texture._EnabledCoordUnits = 0;
-
-   tex_coord[0] = span->attrStart[FRAG_ATTRIB_TEX0][0]  * (info->smask + 1);
-   tex_step[0] = span->attrStepX[FRAG_ATTRIB_TEX0][0] * (info->smask + 1);
-   tex_coord[1] = span->attrStart[FRAG_ATTRIB_TEX0][1] * (info->tmask + 1);
-   tex_step[1] = span->attrStepX[FRAG_ATTRIB_TEX0][1] * (info->tmask + 1);
-   /* span->attrStart[FRAG_ATTRIB_TEX0][2] only if 3D-texturing, here only 2D */
-   tex_coord[2] = span->attrStart[FRAG_ATTRIB_TEX0][3];
-   tex_step[2] = span->attrStepX[FRAG_ATTRIB_TEX0][3];
-
-   switch (info->filter) {
-   case GL_NEAREST:
-      switch (info->format) {
-      case MESA_FORMAT_RGB888:
-         switch (info->envmode) {
-         case GL_MODULATE:
-            SPAN_NEAREST(NEAREST_RGB;MODULATE,3);
-            break;
-         case GL_DECAL:
-         case GL_REPLACE:
-            SPAN_NEAREST(NEAREST_RGB_REPLACE,3);
-            break;
-         case GL_BLEND:
-            SPAN_NEAREST(NEAREST_RGB;BLEND,3);
-            break;
-         case GL_ADD:
-            SPAN_NEAREST(NEAREST_RGB;ADD,3);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (5) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      case MESA_FORMAT_RGBA8888:
-         switch(info->envmode) {
-         case GL_MODULATE:
-            SPAN_NEAREST(NEAREST_RGBA;MODULATE,4);
-            break;
-         case GL_DECAL:
-            SPAN_NEAREST(NEAREST_RGBA;DECAL,4);
-            break;
-         case GL_BLEND:
-            SPAN_NEAREST(NEAREST_RGBA;BLEND,4);
-            break;
-         case GL_ADD:
-            SPAN_NEAREST(NEAREST_RGBA;ADD,4);
-            break;
-         case GL_REPLACE:
-            SPAN_NEAREST(NEAREST_RGBA_REPLACE,4);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (6) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      }
-      break;
-
-   case GL_LINEAR:
-      switch (info->format) {
-      case MESA_FORMAT_RGB888:
-         switch (info->envmode) {
-         case GL_MODULATE:
-            SPAN_LINEAR(LINEAR_RGB;MODULATE,3);
-            break;
-         case GL_DECAL:
-         case GL_REPLACE:
-            SPAN_LINEAR(LINEAR_RGB;REPLACE,3);
-            break;
-         case GL_BLEND:
-            SPAN_LINEAR(LINEAR_RGB;BLEND,3);
-            break;
-         case GL_ADD:
-            SPAN_LINEAR(LINEAR_RGB;ADD,3);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (7) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      case MESA_FORMAT_RGBA8888:
-         switch (info->envmode) {
-         case GL_MODULATE:
-            SPAN_LINEAR(LINEAR_RGBA;MODULATE,4);
-            break;
-         case GL_DECAL:
-            SPAN_LINEAR(LINEAR_RGBA;DECAL,4);
-            break;
-         case GL_BLEND:
-            SPAN_LINEAR(LINEAR_RGBA;BLEND,4);
-            break;
-         case GL_ADD:
-            SPAN_LINEAR(LINEAR_RGBA;ADD,4);
-            break;
-         case GL_REPLACE:
-            SPAN_LINEAR(LINEAR_RGBA;REPLACE,4);
-            break;
-         default:
-            _mesa_problem(ctx, "bad tex env mode (8) in SPAN_LINEAR");
-            return;
-         }
-         break;
-      }
-      break;
-   }
-   
-   ASSERT(span->arrayMask & SPAN_RGBA);
-   _swrast_write_rgba_span(ctx, span);
-
-#undef SPAN_NEAREST
-#undef SPAN_LINEAR
-
-   /* restore state */
-   ctx->Texture._EnabledCoordUnits = texEnableSave;
-}
-
-
-/*
- * Render an perspective corrected RGB/RGBA textured triangle.
- * The Q (aka V in Mesa) coordinate must be zero such that the divide
- * by interpolated Q/W comes out right.
- *
- */
-#define NAME persp_textured_triangle
-#define INTERP_Z 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define INTERP_ATTRIBS 1
-
-#define SETUP_CODE							\
-   struct persp_info info;						\
-   const struct gl_texture_unit *unit = ctx->Texture.Unit+0;		\
-   const struct gl_texture_object *obj = 				\
-      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
-   const struct gl_texture_image *texImg = 				\
-      obj->Image[0][obj->BaseLevel];			 		\
-   info.texture = (const GLchan *) texImg->Data;			\
-   info.twidth_log2 = texImg->WidthLog2;				\
-   info.smask = texImg->Width - 1;					\
-   info.tmask = texImg->Height - 1;					\
-   info.format = texImg->TexFormat;					\
-   info.filter = obj->MinFilter;					\
-   info.envmode = unit->EnvMode;					\
-   info.er = 0;					\
-   info.eg = 0;					\
-   info.eb = 0;					\
-									\
-   if (info.envmode == GL_BLEND) {					\
-      /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\
-      info.er = FloatToFixed(unit->EnvColor[RCOMP] * CHAN_MAXF);	\
-      info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF);	\
-      info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF);	\
-      info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF);	\
-   }									\
-   if (!info.texture) {							\
-      /* this shouldn't happen */					\
-      return;								\
-   }									\
-									\
-   switch (info.format) {						\
-   case MESA_FORMAT_RGB888:						\
-      info.tbytesline = texImg->Width * 3;				\
-      break;								\
-   case MESA_FORMAT_RGBA8888:						\
-      info.tbytesline = texImg->Width * 4;				\
-      break;								\
-   default:								\
-      _mesa_problem(NULL, "Bad texture format in persp_textured_triangle");\
-      return;								\
-   }									\
-   info.tsize = texImg->Height * info.tbytesline;
-
-#define RENDER_SPAN( span )			\
-   span.interpMask &= ~SPAN_RGBA;		\
-   span.arrayMask |= SPAN_RGBA;			\
-   fast_persp_span(ctx, &span, &info);
-
-#include "s_tritemp.h"
-
-#endif /*CHAN_TYPE != GL_FLOAT*/
-
-
-
-/*
- * Render an RGBA triangle with arbitrary attributes.
- */
-#define NAME general_triangle
-#define INTERP_Z 1
-#define INTERP_RGB 1
-#define INTERP_ALPHA 1
-#define INTERP_ATTRIBS 1
-#define RENDER_SPAN( span )   _swrast_write_rgba_span(ctx, &span);
-#include "s_tritemp.h"
-
-
-
-
-/*
- * Special tri function for occlusion testing
- */
-#define NAME occlusion_zless_triangle
-#define INTERP_Z 1
-#define SETUP_CODE							\
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_DepthBuffer;		\
-   struct gl_query_object *q = ctx->Query.CurrentOcclusionObject;	\
-   ASSERT(ctx->Depth.Test);						\
-   ASSERT(!ctx->Depth.Mask);						\
-   ASSERT(ctx->Depth.Func == GL_LESS);					\
-   if (!q) {								\
-      return;								\
-   }
-#define RENDER_SPAN( span )						\
-   if (rb->Format == MESA_FORMAT_Z16) {					\
-      GLuint i;								\
-      const GLushort *zRow = (const GLushort *)				\
-         rb->GetPointer(ctx, rb, span.x, span.y);			\
-      for (i = 0; i < span.end; i++) {					\
-         GLuint z = FixedToDepth(span.z);				\
-         if (z < zRow[i]) {						\
-            q->Result++;						\
-         }								\
-         span.z += span.zStep;						\
-      }									\
-   }									\
-   else {								\
-      GLuint i;								\
-      const GLuint *zRow = (const GLuint *)				\
-         rb->GetPointer(ctx, rb, span.x, span.y);			\
-      for (i = 0; i < span.end; i++) {					\
-         if ((GLuint)span.z < zRow[i]) {				\
-            q->Result++;						\
-         }								\
-         span.z += span.zStep;						\
-      }									\
-   }
-#include "s_tritemp.h"
-
-
-
-static void
-nodraw_triangle( GLcontext *ctx,
-                 const SWvertex *v0,
-                 const SWvertex *v1,
-                 const SWvertex *v2 )
-{
-   (void) (ctx && v0 && v1 && v2);
-}
-
-
-/*
- * This is used when separate specular color is enabled, but not
- * texturing.  We add the specular color to the primary color,
- * draw the triangle, then restore the original primary color.
- * Inefficient, but seldom needed.
- */
-void
-_swrast_add_spec_terms_triangle(GLcontext *ctx, const SWvertex *v0,
-                                const SWvertex *v1, const SWvertex *v2)
-{
-   SWvertex *ncv0 = (SWvertex *)v0; /* drop const qualifier */
-   SWvertex *ncv1 = (SWvertex *)v1;
-   SWvertex *ncv2 = (SWvertex *)v2;
-   GLfloat rSum, gSum, bSum;
-   GLchan cSave[3][4];
-
-   /* save original colors */
-   COPY_CHAN4( cSave[0], ncv0->color );
-   COPY_CHAN4( cSave[1], ncv1->color );
-   COPY_CHAN4( cSave[2], ncv2->color );
-   /* sum v0 */
-   rSum = CHAN_TO_FLOAT(ncv0->color[0]) + ncv0->attrib[FRAG_ATTRIB_COL1][0];
-   gSum = CHAN_TO_FLOAT(ncv0->color[1]) + ncv0->attrib[FRAG_ATTRIB_COL1][1];
-   bSum = CHAN_TO_FLOAT(ncv0->color[2]) + ncv0->attrib[FRAG_ATTRIB_COL1][2];
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[0], rSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[1], gSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[2], bSum);
-   /* sum v1 */
-   rSum = CHAN_TO_FLOAT(ncv1->color[0]) + ncv1->attrib[FRAG_ATTRIB_COL1][0];
-   gSum = CHAN_TO_FLOAT(ncv1->color[1]) + ncv1->attrib[FRAG_ATTRIB_COL1][1];
-   bSum = CHAN_TO_FLOAT(ncv1->color[2]) + ncv1->attrib[FRAG_ATTRIB_COL1][2];
-   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[0], rSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[1], gSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[2], bSum);
-   /* sum v2 */
-   rSum = CHAN_TO_FLOAT(ncv2->color[0]) + ncv2->attrib[FRAG_ATTRIB_COL1][0];
-   gSum = CHAN_TO_FLOAT(ncv2->color[1]) + ncv2->attrib[FRAG_ATTRIB_COL1][1];
-   bSum = CHAN_TO_FLOAT(ncv2->color[2]) + ncv2->attrib[FRAG_ATTRIB_COL1][2];
-   UNCLAMPED_FLOAT_TO_CHAN(ncv2->color[0], rSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv2->color[1], gSum);
-   UNCLAMPED_FLOAT_TO_CHAN(ncv2->color[2], bSum);
-   /* draw */
-   SWRAST_CONTEXT(ctx)->SpecTriangle( ctx, ncv0, ncv1, ncv2 );
-   /* restore original colors */
-   COPY_CHAN4( ncv0->color, cSave[0] );
-   COPY_CHAN4( ncv1->color, cSave[1] );
-   COPY_CHAN4( ncv2->color, cSave[2] );
-}
-
-
-
-#ifdef DEBUG
-
-/* record the current triangle function name */
-const char *_mesa_triFuncName = NULL;
-
-#define USE(triFunc)				\
-do {						\
-    _mesa_triFuncName = #triFunc;		\
-    /*printf("%s\n", _mesa_triFuncName);*/	\
-    swrast->Triangle = triFunc;			\
-} while (0)
-
-#else
-
-#define USE(triFunc)  swrast->Triangle = triFunc;
-
-#endif
-
-
-
-
-/*
- * Determine which triangle rendering function to use given the current
- * rendering context.
- *
- * Please update the summary flag _SWRAST_NEW_TRIANGLE if you add or
- * remove tests to this code.
- */
-void
-_swrast_choose_triangle( GLcontext *ctx )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   if (ctx->Polygon.CullFlag &&
-       ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) {
-      USE(nodraw_triangle);
-      return;
-   }
-
-   if (ctx->RenderMode==GL_RENDER) {
-
-      if (ctx->Polygon.SmoothFlag) {
-         _swrast_set_aa_triangle_function(ctx);
-         ASSERT(swrast->Triangle);
-         return;
-      }
-
-      /* special case for occlusion testing */
-      if (ctx->Query.CurrentOcclusionObject &&
-          ctx->Depth.Test &&
-          ctx->Depth.Mask == GL_FALSE &&
-          ctx->Depth.Func == GL_LESS &&
-          !ctx->Stencil._Enabled) {
-         if (ctx->Color.ColorMask[0][0] == 0 &&
-	     ctx->Color.ColorMask[0][1] == 0 &&
-	     ctx->Color.ColorMask[0][2] == 0 &&
-	     ctx->Color.ColorMask[0][3] == 0) {
-            USE(occlusion_zless_triangle);
-            return;
-         }
-      }
-
-      /*
-       * XXX should examine swrast->_ActiveAttribMask to determine what
-       * needs to be interpolated.
-       */
-      if (ctx->Texture._EnabledCoordUnits ||
-          ctx->FragmentProgram._Current ||
-          ctx->ATIFragmentShader._Enabled ||
-          NEED_SECONDARY_COLOR(ctx) ||
-          swrast->_FogEnabled) {
-         /* Ugh, we do a _lot_ of tests to pick the best textured tri func */
-         const struct gl_texture_object *texObj2D;
-         const struct gl_texture_image *texImg;
-         GLenum minFilter, magFilter, envMode;
-         gl_format format;
-         texObj2D = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];
-
-         texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL;
-         format = texImg ? texImg->TexFormat : MESA_FORMAT_NONE;
-         minFilter = texObj2D ? texObj2D->MinFilter : GL_NONE;
-         magFilter = texObj2D ? texObj2D->MagFilter : GL_NONE;
-         envMode = ctx->Texture.Unit[0].EnvMode;
-
-         /* First see if we can use an optimized 2-D texture function */
-         if (ctx->Texture._EnabledCoordUnits == 0x1
-             && !ctx->FragmentProgram._Current
-             && !ctx->ATIFragmentShader._Enabled
-             && ctx->Texture._EnabledUnits == 0x1
-             && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT
-             && texObj2D->WrapS == GL_REPEAT
-             && texObj2D->WrapT == GL_REPEAT
-             && texObj2D->_Swizzle == SWIZZLE_NOOP
-             && texImg->_IsPowerOfTwo
-             && texImg->Border == 0
-             && texImg->Width == texImg->RowStride
-             && (format == MESA_FORMAT_RGB888 || format == MESA_FORMAT_RGBA8888)
-             && minFilter == magFilter
-             && ctx->Light.Model.ColorControl == GL_SINGLE_COLOR
-             && !swrast->_FogEnabled
-             && ctx->Texture.Unit[0].EnvMode != GL_COMBINE_EXT
-             && ctx->Texture.Unit[0].EnvMode != GL_COMBINE4_NV) {
-	    if (ctx->Hint.PerspectiveCorrection==GL_FASTEST) {
-	       if (minFilter == GL_NEAREST
-		   && format == MESA_FORMAT_RGB888
-		   && (envMode == GL_REPLACE || envMode == GL_DECAL)
-		   && ((swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)
-			&& ctx->Depth.Func == GL_LESS
-			&& ctx->Depth.Mask == GL_TRUE)
-		       || swrast->_RasterMask == TEXTURE_BIT)
-		   && ctx->Polygon.StippleFlag == GL_FALSE
-                   && ctx->DrawBuffer->Visual.depthBits <= 16) {
-		  if (swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)) {
-		     USE(simple_z_textured_triangle);
-		  }
-		  else {
-		     USE(simple_textured_triangle);
-		  }
-	       }
-	       else {
-#if CHAN_BITS != 8
-                  USE(general_triangle);
-#else
-                  if (format == MESA_FORMAT_RGBA8888 && !_mesa_little_endian()) {
-                     /* We only handle RGBA8888 correctly on little endian
-                      * in the optimized code above.
-                      */
-                     USE(general_triangle);
-                  }
-                  else {
-                     USE(affine_textured_triangle);
-                 }
-#endif
-	       }
-	    }
-	    else {
-#if CHAN_BITS != 8
-               USE(general_triangle);
-#else
-               USE(persp_textured_triangle);
-#endif
-	    }
-	 }
-         else {
-            /* general case textured triangles */
-            USE(general_triangle);
-         }
-      }
-      else {
-         ASSERT(!swrast->_FogEnabled);
-         ASSERT(!NEED_SECONDARY_COLOR(ctx));
-	 if (ctx->Light.ShadeModel==GL_SMOOTH) {
-	    /* smooth shaded, no texturing, stippled or some raster ops */
-#if CHAN_BITS != 8
-               USE(general_triangle);
-#else
-               USE(smooth_rgba_triangle);
-#endif
-	 }
-	 else {
-	    /* flat shaded, no texturing, stippled or some raster ops */
-#if CHAN_BITS != 8
-            USE(general_triangle);
-#else
-            USE(flat_rgba_triangle);
-#endif
-	 }
-      }
-   }
-   else if (ctx->RenderMode==GL_FEEDBACK) {
-      USE(_swrast_feedback_triangle);
-   }
-   else {
-      /* GL_SELECT mode */
-      USE(_swrast_select_triangle);
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.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.

+ */

+

+

+/*

+ * When the device driver doesn't implement triangle rasterization it

+ * can hook in _swrast_Triangle, which eventually calls one of these

+ * functions to draw triangles.

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/texformat.h"

+#include "program/prog_instruction.h"

+

+#include "s_aatriangle.h"

+#include "s_context.h"

+#include "s_feedback.h"

+#include "s_span.h"

+#include "s_triangle.h"

+

+

+/**

+ * Test if a triangle should be culled.  Used for feedback and selection mode.

+ * \return GL_TRUE if the triangle is to be culled, GL_FALSE otherwise.

+ */

+GLboolean

+_swrast_culltriangle( struct gl_context *ctx,

+                      const SWvertex *v0,

+                      const SWvertex *v1,

+                      const SWvertex *v2 )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   GLfloat ex = v1->attrib[FRAG_ATTRIB_WPOS][0] - v0->attrib[FRAG_ATTRIB_WPOS][0];

+   GLfloat ey = v1->attrib[FRAG_ATTRIB_WPOS][1] - v0->attrib[FRAG_ATTRIB_WPOS][1];

+   GLfloat fx = v2->attrib[FRAG_ATTRIB_WPOS][0] - v0->attrib[FRAG_ATTRIB_WPOS][0];

+   GLfloat fy = v2->attrib[FRAG_ATTRIB_WPOS][1] - v0->attrib[FRAG_ATTRIB_WPOS][1];

+   GLfloat c = ex*fy-ey*fx;

+

+   if (c * swrast->_BackfaceSign * swrast->_BackfaceCullSign <= 0.0F)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+

+

+/*

+ * Render a flat-shaded RGBA triangle.

+ */

+#define NAME flat_rgba_triangle

+#define INTERP_Z 1

+#define SETUP_CODE				\

+   ASSERT(ctx->Texture._EnabledCoordUnits == 0);\

+   ASSERT(ctx->Light.ShadeModel==GL_FLAT);	\

+   span.interpMask |= SPAN_RGBA;		\

+   span.red = ChanToFixed(v2->color[0]);	\

+   span.green = ChanToFixed(v2->color[1]);	\

+   span.blue = ChanToFixed(v2->color[2]);	\

+   span.alpha = ChanToFixed(v2->color[3]);	\

+   span.redStep = 0;				\

+   span.greenStep = 0;				\

+   span.blueStep = 0;				\

+   span.alphaStep = 0;

+#define RENDER_SPAN( span )  _swrast_write_rgba_span(ctx, &span);

+#include "s_tritemp.h"

+

+

+

+/*

+ * Render a smooth-shaded RGBA triangle.

+ */

+#define NAME smooth_rgba_triangle

+#define INTERP_Z 1

+#define INTERP_RGB 1

+#define INTERP_ALPHA 1

+#define SETUP_CODE				\

+   {						\

+      /* texturing must be off */		\

+      ASSERT(ctx->Texture._EnabledCoordUnits == 0);	\

+      ASSERT(ctx->Light.ShadeModel==GL_SMOOTH);	\

+   }

+#define RENDER_SPAN( span )  _swrast_write_rgba_span(ctx, &span);

+#include "s_tritemp.h"

+

+

+

+/*

+ * Render an RGB, GL_DECAL, textured triangle.

+ * Interpolate S,T only w/out mipmapping or perspective correction.

+ *

+ * No fog.  No depth testing.

+ */

+#define NAME simple_textured_triangle

+#define INTERP_INT_TEX 1

+#define S_SCALE twidth

+#define T_SCALE theight

+

+#define SETUP_CODE							\

+   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];	\

+   const struct gl_texture_object *obj = 				\

+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\

+   const struct gl_texture_image *texImg =				\

+      obj->Image[0][obj->BaseLevel];					\

+   const GLfloat twidth = (GLfloat) texImg->Width;			\

+   const GLfloat theight = (GLfloat) texImg->Height;			\

+   const GLint twidth_log2 = texImg->WidthLog2;				\

+   const GLubyte *texture = (const GLubyte *) texImg->Data;		\

+   const GLint smask = texImg->Width - 1;				\

+   const GLint tmask = texImg->Height - 1;				\

+   ASSERT(texImg->TexFormat == MESA_FORMAT_RGB888);			\

+   if (!rb || !texture) {						\

+      return;								\

+   }

+

+#define RENDER_SPAN( span )						\

+   GLuint i;								\

+   GLubyte rgb[MAX_WIDTH][3];						\

+   span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\

+   span.intTex[1] -= FIXED_HALF;					\

+   for (i = 0; i < span.end; i++) {					\

+      GLint s = FixedToInt(span.intTex[0]) & smask;			\

+      GLint t = FixedToInt(span.intTex[1]) & tmask;			\

+      GLint pos = (t << twidth_log2) + s;				\

+      pos = pos + pos + pos;  /* multiply by 3 */			\

+      rgb[i][RCOMP] = texture[pos+2];					\

+      rgb[i][GCOMP] = texture[pos+1];					\

+      rgb[i][BCOMP] = texture[pos+0];					\

+      span.intTex[0] += span.intTexStep[0];				\

+      span.intTex[1] += span.intTexStep[1];				\

+   }									\

+   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, rgb, NULL);

+

+#include "s_tritemp.h"

+

+

+

+/*

+ * Render an RGB, GL_DECAL, textured triangle.

+ * Interpolate S,T, GL_LESS depth test, w/out mipmapping or

+ * perspective correction.

+ * Depth buffer bits must be <= sizeof(DEFAULT_SOFTWARE_DEPTH_TYPE)

+ *

+ * No fog.

+ */

+#define NAME simple_z_textured_triangle

+#define INTERP_Z 1

+#define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE

+#define INTERP_INT_TEX 1

+#define S_SCALE twidth

+#define T_SCALE theight

+

+#define SETUP_CODE							\

+   struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];	\

+   const struct gl_texture_object *obj = 				\

+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\

+   const struct gl_texture_image *texImg = 				\

+       obj->Image[0][obj->BaseLevel]; 					\

+   const GLfloat twidth = (GLfloat) texImg->Width;			\

+   const GLfloat theight = (GLfloat) texImg->Height;			\

+   const GLint twidth_log2 = texImg->WidthLog2;				\

+   const GLubyte *texture = (const GLubyte *) texImg->Data;		\

+   const GLint smask = texImg->Width - 1;				\

+   const GLint tmask = texImg->Height - 1;				\

+   ASSERT(texImg->TexFormat == MESA_FORMAT_RGB888);			\

+   if (!rb || !texture) {						\

+      return;								\

+   }

+

+#define RENDER_SPAN( span )						\

+   GLuint i;				    				\

+   GLubyte rgb[MAX_WIDTH][3];						\

+   span.intTex[0] -= FIXED_HALF; /* off-by-one error? */		\

+   span.intTex[1] -= FIXED_HALF;					\

+   for (i = 0; i < span.end; i++) {					\

+      const GLuint z = FixedToDepth(span.z);				\

+      if (z < zRow[i]) {						\

+         GLint s = FixedToInt(span.intTex[0]) & smask;			\

+         GLint t = FixedToInt(span.intTex[1]) & tmask;			\

+         GLint pos = (t << twidth_log2) + s;				\

+         pos = pos + pos + pos;  /* multiply by 3 */			\

+         rgb[i][RCOMP] = texture[pos+2];				\

+         rgb[i][GCOMP] = texture[pos+1];				\

+         rgb[i][BCOMP] = texture[pos+0];				\

+         zRow[i] = z;							\

+         span.array->mask[i] = 1;					\

+      }									\

+      else {								\

+         span.array->mask[i] = 0;					\

+      }									\

+      span.intTex[0] += span.intTexStep[0];				\

+      span.intTex[1] += span.intTexStep[1];				\

+      span.z += span.zStep;						\

+   }									\

+   rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, rgb, span.array->mask);

+

+#include "s_tritemp.h"

+

+

+#if CHAN_TYPE != GL_FLOAT

+

+struct affine_info

+{

+   GLenum filter;

+   GLenum format;

+   GLenum envmode;

+   GLint smask, tmask;

+   GLint twidth_log2;

+   const GLchan *texture;

+   GLfixed er, eg, eb, ea;

+   GLint tbytesline, tsize;

+};

+

+

+static INLINE GLint

+ilerp(GLint t, GLint a, GLint b)

+{

+   return a + ((t * (b - a)) >> FIXED_SHIFT);

+}

+

+static INLINE GLint

+ilerp_2d(GLint ia, GLint ib, GLint v00, GLint v10, GLint v01, GLint v11)

+{

+   const GLint temp0 = ilerp(ia, v00, v10);

+   const GLint temp1 = ilerp(ia, v01, v11);

+   return ilerp(ib, temp0, temp1);

+}

+

+

+/* This function can handle GL_NEAREST or GL_LINEAR sampling of 2D RGB or RGBA

+ * textures with GL_REPLACE, GL_MODULATE, GL_BLEND, GL_DECAL or GL_ADD

+ * texture env modes.

+ */

+static INLINE void

+affine_span(struct gl_context *ctx, SWspan *span,

+            struct affine_info *info)

+{

+   GLchan sample[4];  /* the filtered texture sample */

+   const GLuint texEnableSave = ctx->Texture._EnabledCoordUnits;

+

+   /* Instead of defining a function for each mode, a test is done

+    * between the outer and inner loops. This is to reduce code size

+    * and complexity. Observe that an optimizing compiler kills

+    * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST).

+    */

+

+#define NEAREST_RGB		\

+   sample[RCOMP] = tex00[2];	\

+   sample[GCOMP] = tex00[1];	\

+   sample[BCOMP] = tex00[0];	\

+   sample[ACOMP] = CHAN_MAX;

+

+#define LINEAR_RGB							\

+   sample[RCOMP] = ilerp_2d(sf, tf, tex00[2], tex01[2], tex10[2], tex11[2]);\

+   sample[GCOMP] = ilerp_2d(sf, tf, tex00[1], tex01[1], tex10[1], tex11[1]);\

+   sample[BCOMP] = ilerp_2d(sf, tf, tex00[0], tex01[0], tex10[0], tex11[0]);\

+   sample[ACOMP] = CHAN_MAX;

+

+#define NEAREST_RGBA  \

+   sample[RCOMP] = tex00[3];	\

+   sample[GCOMP] = tex00[2];	\

+   sample[BCOMP] = tex00[1];	\

+   sample[ACOMP] = tex00[0];

+

+#define LINEAR_RGBA							\

+   sample[RCOMP] = ilerp_2d(sf, tf, tex00[3], tex01[3], tex10[3], tex11[3]);\

+   sample[GCOMP] = ilerp_2d(sf, tf, tex00[2], tex01[2], tex10[2], tex11[2]);\

+   sample[BCOMP] = ilerp_2d(sf, tf, tex00[1], tex01[1], tex10[1], tex11[1]);\

+   sample[ACOMP] = ilerp_2d(sf, tf, tex00[0], tex01[0], tex10[0], tex11[0])

+

+#define MODULATE							  \

+   dest[RCOMP] = span->red   * (sample[RCOMP] + 1u) >> (FIXED_SHIFT + 8); \

+   dest[GCOMP] = span->green * (sample[GCOMP] + 1u) >> (FIXED_SHIFT + 8); \

+   dest[BCOMP] = span->blue  * (sample[BCOMP] + 1u) >> (FIXED_SHIFT + 8); \

+   dest[ACOMP] = span->alpha * (sample[ACOMP] + 1u) >> (FIXED_SHIFT + 8)

+

+#define DECAL								\

+   dest[RCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->red +		\

+               ((sample[ACOMP] + 1) * sample[RCOMP] << FIXED_SHIFT))	\

+               >> (FIXED_SHIFT + 8);					\

+   dest[GCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->green +		\

+               ((sample[ACOMP] + 1) * sample[GCOMP] << FIXED_SHIFT))	\

+               >> (FIXED_SHIFT + 8);					\

+   dest[BCOMP] = ((CHAN_MAX - sample[ACOMP]) * span->blue +		\

+               ((sample[ACOMP] + 1) * sample[BCOMP] << FIXED_SHIFT))	\

+               >> (FIXED_SHIFT + 8);					\

+   dest[ACOMP] = FixedToInt(span->alpha)

+

+#define BLEND								\

+   dest[RCOMP] = ((CHAN_MAX - sample[RCOMP]) * span->red		\

+               + (sample[RCOMP] + 1) * info->er) >> (FIXED_SHIFT + 8);	\

+   dest[GCOMP] = ((CHAN_MAX - sample[GCOMP]) * span->green		\

+               + (sample[GCOMP] + 1) * info->eg) >> (FIXED_SHIFT + 8);	\

+   dest[BCOMP] = ((CHAN_MAX - sample[BCOMP]) * span->blue		\

+               + (sample[BCOMP] + 1) * info->eb) >> (FIXED_SHIFT + 8);	\

+   dest[ACOMP] = span->alpha * (sample[ACOMP] + 1) >> (FIXED_SHIFT + 8)

+

+#define REPLACE  COPY_CHAN4(dest, sample)

+

+#define ADD								\

+   {									\

+      GLint rSum = FixedToInt(span->red)   + (GLint) sample[RCOMP];	\

+      GLint gSum = FixedToInt(span->green) + (GLint) sample[GCOMP];	\

+      GLint bSum = FixedToInt(span->blue)  + (GLint) sample[BCOMP];	\

+      dest[RCOMP] = MIN2(rSum, CHAN_MAX);				\

+      dest[GCOMP] = MIN2(gSum, CHAN_MAX);				\

+      dest[BCOMP] = MIN2(bSum, CHAN_MAX);				\

+      dest[ACOMP] = span->alpha * (sample[ACOMP] + 1) >> (FIXED_SHIFT + 8); \

+  }

+

+/* shortcuts */

+

+#define NEAREST_RGB_REPLACE		\

+   NEAREST_RGB;				\

+   dest[0] = sample[0];			\

+   dest[1] = sample[1];			\

+   dest[2] = sample[2];			\

+   dest[3] = FixedToInt(span->alpha);

+

+#define NEAREST_RGBA_REPLACE  \

+   dest[RCOMP] = tex00[3]; \

+   dest[GCOMP] = tex00[2]; \

+   dest[BCOMP] = tex00[1]; \

+   dest[ACOMP] = tex00[0]

+

+#define SPAN_NEAREST(DO_TEX, COMPS)					\

+	for (i = 0; i < span->end; i++) {				\

+           /* Isn't it necessary to use FixedFloor below?? */		\

+           GLint s = FixedToInt(span->intTex[0]) & info->smask;		\

+           GLint t = FixedToInt(span->intTex[1]) & info->tmask;		\

+           GLint pos = (t << info->twidth_log2) + s;			\

+           const GLchan *tex00 = info->texture + COMPS * pos;		\

+           DO_TEX;							\

+           span->red += span->redStep;					\

+	   span->green += span->greenStep;				\

+           span->blue += span->blueStep;				\

+	   span->alpha += span->alphaStep;				\

+	   span->intTex[0] += span->intTexStep[0];			\

+	   span->intTex[1] += span->intTexStep[1];			\

+           dest += 4;							\

+	}

+

+#define SPAN_LINEAR(DO_TEX, COMPS)					\

+	for (i = 0; i < span->end; i++) {				\

+           /* Isn't it necessary to use FixedFloor below?? */		\

+           const GLint s = FixedToInt(span->intTex[0]) & info->smask;	\

+           const GLint t = FixedToInt(span->intTex[1]) & info->tmask;	\

+           const GLfixed sf = span->intTex[0] & FIXED_FRAC_MASK;	\

+           const GLfixed tf = span->intTex[1] & FIXED_FRAC_MASK;	\

+           const GLint pos = (t << info->twidth_log2) + s;		\

+           const GLchan *tex00 = info->texture + COMPS * pos;		\

+           const GLchan *tex10 = tex00 + info->tbytesline;		\

+           const GLchan *tex01 = tex00 + COMPS;				\

+           const GLchan *tex11 = tex10 + COMPS;				\

+           if (t == info->tmask) {					\

+              tex10 -= info->tsize;					\

+              tex11 -= info->tsize;					\

+           }								\

+           if (s == info->smask) {					\

+              tex01 -= info->tbytesline;				\

+              tex11 -= info->tbytesline;				\

+           }								\

+           DO_TEX;							\

+           span->red += span->redStep;					\

+	   span->green += span->greenStep;				\

+           span->blue += span->blueStep;				\

+	   span->alpha += span->alphaStep;				\

+	   span->intTex[0] += span->intTexStep[0];			\

+	   span->intTex[1] += span->intTexStep[1];			\

+           dest += 4;							\

+	}

+

+

+   GLuint i;

+   GLchan *dest = span->array->rgba[0];

+

+   /* Disable tex units so they're not re-applied in swrast_write_rgba_span */

+   ctx->Texture._EnabledCoordUnits = 0x0;

+

+   span->intTex[0] -= FIXED_HALF;

+   span->intTex[1] -= FIXED_HALF;

+   switch (info->filter) {

+   case GL_NEAREST:

+      switch (info->format) {

+      case MESA_FORMAT_RGB888:

+         switch (info->envmode) {

+         case GL_MODULATE:

+            SPAN_NEAREST(NEAREST_RGB;MODULATE,3);

+            break;

+         case GL_DECAL:

+         case GL_REPLACE:

+            SPAN_NEAREST(NEAREST_RGB_REPLACE,3);

+            break;

+         case GL_BLEND:

+            SPAN_NEAREST(NEAREST_RGB;BLEND,3);

+            break;

+         case GL_ADD:

+            SPAN_NEAREST(NEAREST_RGB;ADD,3);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode in SPAN_LINEAR");

+            return;

+         }

+         break;

+      case MESA_FORMAT_RGBA8888:

+         switch(info->envmode) {

+         case GL_MODULATE:

+            SPAN_NEAREST(NEAREST_RGBA;MODULATE,4);

+            break;

+         case GL_DECAL:

+            SPAN_NEAREST(NEAREST_RGBA;DECAL,4);

+            break;

+         case GL_BLEND:

+            SPAN_NEAREST(NEAREST_RGBA;BLEND,4);

+            break;

+         case GL_ADD:

+            SPAN_NEAREST(NEAREST_RGBA;ADD,4);

+            break;

+         case GL_REPLACE:

+            SPAN_NEAREST(NEAREST_RGBA_REPLACE,4);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (2) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      }

+      break;

+

+   case GL_LINEAR:

+      span->intTex[0] -= FIXED_HALF;

+      span->intTex[1] -= FIXED_HALF;

+      switch (info->format) {

+      case MESA_FORMAT_RGB888:

+         switch (info->envmode) {

+         case GL_MODULATE:

+            SPAN_LINEAR(LINEAR_RGB;MODULATE,3);

+            break;

+         case GL_DECAL:

+         case GL_REPLACE:

+            SPAN_LINEAR(LINEAR_RGB;REPLACE,3);

+            break;

+         case GL_BLEND:

+            SPAN_LINEAR(LINEAR_RGB;BLEND,3);

+            break;

+         case GL_ADD:

+            SPAN_LINEAR(LINEAR_RGB;ADD,3);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (3) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      case MESA_FORMAT_RGBA8888:

+         switch (info->envmode) {

+         case GL_MODULATE:

+            SPAN_LINEAR(LINEAR_RGBA;MODULATE,4);

+            break;

+         case GL_DECAL:

+            SPAN_LINEAR(LINEAR_RGBA;DECAL,4);

+            break;

+         case GL_BLEND:

+            SPAN_LINEAR(LINEAR_RGBA;BLEND,4);

+            break;

+         case GL_ADD:

+            SPAN_LINEAR(LINEAR_RGBA;ADD,4);

+            break;

+         case GL_REPLACE:

+            SPAN_LINEAR(LINEAR_RGBA;REPLACE,4);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (4) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      }

+      break;

+   }

+   span->interpMask &= ~SPAN_RGBA;

+   ASSERT(span->arrayMask & SPAN_RGBA);

+

+   _swrast_write_rgba_span(ctx, span);

+

+   /* re-enable texture units */

+   ctx->Texture._EnabledCoordUnits = texEnableSave;

+

+#undef SPAN_NEAREST

+#undef SPAN_LINEAR

+}

+

+

+

+/*

+ * Render an RGB/RGBA textured triangle without perspective correction.

+ */

+#define NAME affine_textured_triangle

+#define INTERP_Z 1

+#define INTERP_RGB 1

+#define INTERP_ALPHA 1

+#define INTERP_INT_TEX 1

+#define S_SCALE twidth

+#define T_SCALE theight

+

+#define SETUP_CODE							\

+   struct affine_info info;						\

+   struct gl_texture_unit *unit = ctx->Texture.Unit+0;			\

+   const struct gl_texture_object *obj = 				\

+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\

+   const struct gl_texture_image *texImg = 				\

+      obj->Image[0][obj->BaseLevel]; 					\

+   const GLfloat twidth = (GLfloat) texImg->Width;			\

+   const GLfloat theight = (GLfloat) texImg->Height;			\

+   info.texture = (const GLchan *) texImg->Data;			\

+   info.twidth_log2 = texImg->WidthLog2;				\

+   info.smask = texImg->Width - 1;					\

+   info.tmask = texImg->Height - 1;					\

+   info.format = texImg->TexFormat;					\

+   info.filter = obj->MinFilter;					\

+   info.envmode = unit->EnvMode;					\

+   info.er = 0;					\

+   info.eg = 0;					\

+   info.eb = 0;					\

+   span.arrayMask |= SPAN_RGBA;						\

+									\

+   if (info.envmode == GL_BLEND) {					\

+      /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\

+      info.er = FloatToFixed(unit->EnvColor[RCOMP] * CHAN_MAXF);	\

+      info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF);	\

+      info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF);	\

+      info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF);	\

+   }									\

+   if (!info.texture) {							\

+      /* this shouldn't happen */					\

+      return;								\

+   }									\

+									\

+   switch (info.format) {						\

+   case MESA_FORMAT_RGB888:						\

+      info.tbytesline = texImg->Width * 3;				\

+      break;								\

+   case MESA_FORMAT_RGBA8888:						\

+      info.tbytesline = texImg->Width * 4;				\

+      break;								\

+   default:								\

+      _mesa_problem(NULL, "Bad texture format in affine_texture_triangle");\

+      return;								\

+   }									\

+   info.tsize = texImg->Height * info.tbytesline;

+

+#define RENDER_SPAN( span )   affine_span(ctx, &span, &info);

+

+#include "s_tritemp.h"

+

+

+

+struct persp_info

+{

+   GLenum filter;

+   GLenum format;

+   GLenum envmode;

+   GLint smask, tmask;

+   GLint twidth_log2;

+   const GLchan *texture;

+   GLfixed er, eg, eb, ea;   /* texture env color */

+   GLint tbytesline, tsize;

+};

+

+

+static INLINE void

+fast_persp_span(struct gl_context *ctx, SWspan *span,

+		struct persp_info *info)

+{

+   GLchan sample[4];  /* the filtered texture sample */

+

+  /* Instead of defining a function for each mode, a test is done

+   * between the outer and inner loops. This is to reduce code size

+   * and complexity. Observe that an optimizing compiler kills

+   * unused variables (for instance tf,sf,ti,si in case of GL_NEAREST).

+   */

+#define SPAN_NEAREST(DO_TEX,COMP)					\

+	for (i = 0; i < span->end; i++) {				\

+           GLdouble invQ = tex_coord[2] ?				\

+                                 (1.0 / tex_coord[2]) : 1.0;            \

+           GLfloat s_tmp = (GLfloat) (tex_coord[0] * invQ);		\

+           GLfloat t_tmp = (GLfloat) (tex_coord[1] * invQ);		\

+           GLint s = IFLOOR(s_tmp) & info->smask;	        	\

+           GLint t = IFLOOR(t_tmp) & info->tmask;	        	\

+           GLint pos = (t << info->twidth_log2) + s;			\

+           const GLchan *tex00 = info->texture + COMP * pos;		\

+           DO_TEX;							\

+           span->red += span->redStep;					\

+	   span->green += span->greenStep;				\

+           span->blue += span->blueStep;				\

+	   span->alpha += span->alphaStep;				\

+	   tex_coord[0] += tex_step[0];					\

+	   tex_coord[1] += tex_step[1];					\

+	   tex_coord[2] += tex_step[2];					\

+           dest += 4;							\

+	}

+

+#define SPAN_LINEAR(DO_TEX,COMP)					\

+	for (i = 0; i < span->end; i++) {				\

+           GLdouble invQ = tex_coord[2] ?				\

+                                 (1.0 / tex_coord[2]) : 1.0;            \

+           const GLfloat s_tmp = (GLfloat) (tex_coord[0] * invQ);	\

+           const GLfloat t_tmp = (GLfloat) (tex_coord[1] * invQ);	\

+           const GLfixed s_fix = FloatToFixed(s_tmp) - FIXED_HALF;	\

+           const GLfixed t_fix = FloatToFixed(t_tmp) - FIXED_HALF;      \

+           const GLint s = FixedToInt(FixedFloor(s_fix)) & info->smask;	\

+           const GLint t = FixedToInt(FixedFloor(t_fix)) & info->tmask;	\

+           const GLfixed sf = s_fix & FIXED_FRAC_MASK;			\

+           const GLfixed tf = t_fix & FIXED_FRAC_MASK;			\

+           const GLint pos = (t << info->twidth_log2) + s;		\

+           const GLchan *tex00 = info->texture + COMP * pos;		\

+           const GLchan *tex10 = tex00 + info->tbytesline;		\

+           const GLchan *tex01 = tex00 + COMP;				\

+           const GLchan *tex11 = tex10 + COMP;				\

+           if (t == info->tmask) {					\

+              tex10 -= info->tsize;					\

+              tex11 -= info->tsize;					\

+           }								\

+           if (s == info->smask) {					\

+              tex01 -= info->tbytesline;				\

+              tex11 -= info->tbytesline;				\

+           }								\

+           DO_TEX;							\

+           span->red   += span->redStep;				\

+	   span->green += span->greenStep;				\

+           span->blue  += span->blueStep;				\

+	   span->alpha += span->alphaStep;				\

+	   tex_coord[0] += tex_step[0];					\

+	   tex_coord[1] += tex_step[1];					\

+	   tex_coord[2] += tex_step[2];					\

+           dest += 4;							\

+	}

+

+   GLuint i;

+   GLfloat tex_coord[3], tex_step[3];

+   GLchan *dest = span->array->rgba[0];

+

+   const GLuint texEnableSave = ctx->Texture._EnabledCoordUnits;

+   ctx->Texture._EnabledCoordUnits = 0;

+

+   tex_coord[0] = span->attrStart[FRAG_ATTRIB_TEX0][0]  * (info->smask + 1);

+   tex_step[0] = span->attrStepX[FRAG_ATTRIB_TEX0][0] * (info->smask + 1);

+   tex_coord[1] = span->attrStart[FRAG_ATTRIB_TEX0][1] * (info->tmask + 1);

+   tex_step[1] = span->attrStepX[FRAG_ATTRIB_TEX0][1] * (info->tmask + 1);

+   /* span->attrStart[FRAG_ATTRIB_TEX0][2] only if 3D-texturing, here only 2D */

+   tex_coord[2] = span->attrStart[FRAG_ATTRIB_TEX0][3];

+   tex_step[2] = span->attrStepX[FRAG_ATTRIB_TEX0][3];

+

+   switch (info->filter) {

+   case GL_NEAREST:

+      switch (info->format) {

+      case MESA_FORMAT_RGB888:

+         switch (info->envmode) {

+         case GL_MODULATE:

+            SPAN_NEAREST(NEAREST_RGB;MODULATE,3);

+            break;

+         case GL_DECAL:

+         case GL_REPLACE:

+            SPAN_NEAREST(NEAREST_RGB_REPLACE,3);

+            break;

+         case GL_BLEND:

+            SPAN_NEAREST(NEAREST_RGB;BLEND,3);

+            break;

+         case GL_ADD:

+            SPAN_NEAREST(NEAREST_RGB;ADD,3);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (5) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      case MESA_FORMAT_RGBA8888:

+         switch(info->envmode) {

+         case GL_MODULATE:

+            SPAN_NEAREST(NEAREST_RGBA;MODULATE,4);

+            break;

+         case GL_DECAL:

+            SPAN_NEAREST(NEAREST_RGBA;DECAL,4);

+            break;

+         case GL_BLEND:

+            SPAN_NEAREST(NEAREST_RGBA;BLEND,4);

+            break;

+         case GL_ADD:

+            SPAN_NEAREST(NEAREST_RGBA;ADD,4);

+            break;

+         case GL_REPLACE:

+            SPAN_NEAREST(NEAREST_RGBA_REPLACE,4);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (6) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      }

+      break;

+

+   case GL_LINEAR:

+      switch (info->format) {

+      case MESA_FORMAT_RGB888:

+         switch (info->envmode) {

+         case GL_MODULATE:

+            SPAN_LINEAR(LINEAR_RGB;MODULATE,3);

+            break;

+         case GL_DECAL:

+         case GL_REPLACE:

+            SPAN_LINEAR(LINEAR_RGB;REPLACE,3);

+            break;

+         case GL_BLEND:

+            SPAN_LINEAR(LINEAR_RGB;BLEND,3);

+            break;

+         case GL_ADD:

+            SPAN_LINEAR(LINEAR_RGB;ADD,3);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (7) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      case MESA_FORMAT_RGBA8888:

+         switch (info->envmode) {

+         case GL_MODULATE:

+            SPAN_LINEAR(LINEAR_RGBA;MODULATE,4);

+            break;

+         case GL_DECAL:

+            SPAN_LINEAR(LINEAR_RGBA;DECAL,4);

+            break;

+         case GL_BLEND:

+            SPAN_LINEAR(LINEAR_RGBA;BLEND,4);

+            break;

+         case GL_ADD:

+            SPAN_LINEAR(LINEAR_RGBA;ADD,4);

+            break;

+         case GL_REPLACE:

+            SPAN_LINEAR(LINEAR_RGBA;REPLACE,4);

+            break;

+         default:

+            _mesa_problem(ctx, "bad tex env mode (8) in SPAN_LINEAR");

+            return;

+         }

+         break;

+      }

+      break;

+   }

+   

+   ASSERT(span->arrayMask & SPAN_RGBA);

+   _swrast_write_rgba_span(ctx, span);

+

+#undef SPAN_NEAREST

+#undef SPAN_LINEAR

+

+   /* restore state */

+   ctx->Texture._EnabledCoordUnits = texEnableSave;

+}

+

+

+/*

+ * Render an perspective corrected RGB/RGBA textured triangle.

+ * The Q (aka V in Mesa) coordinate must be zero such that the divide

+ * by interpolated Q/W comes out right.

+ *

+ */

+#define NAME persp_textured_triangle

+#define INTERP_Z 1

+#define INTERP_RGB 1

+#define INTERP_ALPHA 1

+#define INTERP_ATTRIBS 1

+

+#define SETUP_CODE							\

+   struct persp_info info;						\

+   const struct gl_texture_unit *unit = ctx->Texture.Unit+0;		\

+   const struct gl_texture_object *obj = 				\

+      ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\

+   const struct gl_texture_image *texImg = 				\

+      obj->Image[0][obj->BaseLevel];			 		\

+   info.texture = (const GLchan *) texImg->Data;			\

+   info.twidth_log2 = texImg->WidthLog2;				\

+   info.smask = texImg->Width - 1;					\

+   info.tmask = texImg->Height - 1;					\

+   info.format = texImg->TexFormat;					\

+   info.filter = obj->MinFilter;					\

+   info.envmode = unit->EnvMode;					\

+   info.er = 0;					\

+   info.eg = 0;					\

+   info.eb = 0;					\

+									\

+   if (info.envmode == GL_BLEND) {					\

+      /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\

+      info.er = FloatToFixed(unit->EnvColor[RCOMP] * CHAN_MAXF);	\

+      info.eg = FloatToFixed(unit->EnvColor[GCOMP] * CHAN_MAXF);	\

+      info.eb = FloatToFixed(unit->EnvColor[BCOMP] * CHAN_MAXF);	\

+      info.ea = FloatToFixed(unit->EnvColor[ACOMP] * CHAN_MAXF);	\

+   }									\

+   if (!info.texture) {							\

+      /* this shouldn't happen */					\

+      return;								\

+   }									\

+									\

+   switch (info.format) {						\

+   case MESA_FORMAT_RGB888:						\

+      info.tbytesline = texImg->Width * 3;				\

+      break;								\

+   case MESA_FORMAT_RGBA8888:						\

+      info.tbytesline = texImg->Width * 4;				\

+      break;								\

+   default:								\

+      _mesa_problem(NULL, "Bad texture format in persp_textured_triangle");\

+      return;								\

+   }									\

+   info.tsize = texImg->Height * info.tbytesline;

+

+#define RENDER_SPAN( span )			\

+   span.interpMask &= ~SPAN_RGBA;		\

+   span.arrayMask |= SPAN_RGBA;			\

+   fast_persp_span(ctx, &span, &info);

+

+#include "s_tritemp.h"

+

+#endif /*CHAN_TYPE != GL_FLOAT*/

+

+

+

+/*

+ * Render an RGBA triangle with arbitrary attributes.

+ */

+#define NAME general_triangle

+#define INTERP_Z 1

+#define INTERP_RGB 1

+#define INTERP_ALPHA 1

+#define INTERP_ATTRIBS 1

+#define RENDER_SPAN( span )   _swrast_write_rgba_span(ctx, &span);

+#include "s_tritemp.h"

+

+

+

+

+/*

+ * Special tri function for occlusion testing

+ */

+#define NAME occlusion_zless_triangle

+#define INTERP_Z 1

+#define SETUP_CODE							\

+   struct gl_renderbuffer *rb = ctx->DrawBuffer->_DepthBuffer;		\

+   struct gl_query_object *q = ctx->Query.CurrentOcclusionObject;	\

+   ASSERT(ctx->Depth.Test);						\

+   ASSERT(!ctx->Depth.Mask);						\

+   ASSERT(ctx->Depth.Func == GL_LESS);					\

+   if (!q) {								\

+      return;								\

+   }

+#define RENDER_SPAN( span )						\

+   if (rb->Format == MESA_FORMAT_Z16) {					\

+      GLuint i;								\

+      const GLushort *zRow = (const GLushort *)				\

+         rb->GetPointer(ctx, rb, span.x, span.y);			\

+      for (i = 0; i < span.end; i++) {					\

+         GLuint z = FixedToDepth(span.z);				\

+         if (z < zRow[i]) {						\

+            q->Result++;						\

+         }								\

+         span.z += span.zStep;						\

+      }									\

+   }									\

+   else {								\

+      GLuint i;								\

+      const GLuint *zRow = (const GLuint *)				\

+         rb->GetPointer(ctx, rb, span.x, span.y);			\

+      for (i = 0; i < span.end; i++) {					\

+         if ((GLuint)span.z < zRow[i]) {				\

+            q->Result++;						\

+         }								\

+         span.z += span.zStep;						\

+      }									\

+   }

+#include "s_tritemp.h"

+

+

+

+static void

+nodraw_triangle( struct gl_context *ctx,

+                 const SWvertex *v0,

+                 const SWvertex *v1,

+                 const SWvertex *v2 )

+{

+   (void) (ctx && v0 && v1 && v2);

+}

+

+

+/*

+ * This is used when separate specular color is enabled, but not

+ * texturing.  We add the specular color to the primary color,

+ * draw the triangle, then restore the original primary color.

+ * Inefficient, but seldom needed.

+ */

+void

+_swrast_add_spec_terms_triangle(struct gl_context *ctx, const SWvertex *v0,

+                                const SWvertex *v1, const SWvertex *v2)

+{

+   SWvertex *ncv0 = (SWvertex *)v0; /* drop const qualifier */

+   SWvertex *ncv1 = (SWvertex *)v1;

+   SWvertex *ncv2 = (SWvertex *)v2;

+   GLfloat rSum, gSum, bSum;

+   GLchan cSave[3][4];

+

+   /* save original colors */

+   COPY_CHAN4( cSave[0], ncv0->color );

+   COPY_CHAN4( cSave[1], ncv1->color );

+   COPY_CHAN4( cSave[2], ncv2->color );

+   /* sum v0 */

+   rSum = CHAN_TO_FLOAT(ncv0->color[0]) + ncv0->attrib[FRAG_ATTRIB_COL1][0];

+   gSum = CHAN_TO_FLOAT(ncv0->color[1]) + ncv0->attrib[FRAG_ATTRIB_COL1][1];

+   bSum = CHAN_TO_FLOAT(ncv0->color[2]) + ncv0->attrib[FRAG_ATTRIB_COL1][2];

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[0], rSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[1], gSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv0->color[2], bSum);

+   /* sum v1 */

+   rSum = CHAN_TO_FLOAT(ncv1->color[0]) + ncv1->attrib[FRAG_ATTRIB_COL1][0];

+   gSum = CHAN_TO_FLOAT(ncv1->color[1]) + ncv1->attrib[FRAG_ATTRIB_COL1][1];

+   bSum = CHAN_TO_FLOAT(ncv1->color[2]) + ncv1->attrib[FRAG_ATTRIB_COL1][2];

+   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[0], rSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[1], gSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv1->color[2], bSum);

+   /* sum v2 */

+   rSum = CHAN_TO_FLOAT(ncv2->color[0]) + ncv2->attrib[FRAG_ATTRIB_COL1][0];

+   gSum = CHAN_TO_FLOAT(ncv2->color[1]) + ncv2->attrib[FRAG_ATTRIB_COL1][1];

+   bSum = CHAN_TO_FLOAT(ncv2->color[2]) + ncv2->attrib[FRAG_ATTRIB_COL1][2];

+   UNCLAMPED_FLOAT_TO_CHAN(ncv2->color[0], rSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv2->color[1], gSum);

+   UNCLAMPED_FLOAT_TO_CHAN(ncv2->color[2], bSum);

+   /* draw */

+   SWRAST_CONTEXT(ctx)->SpecTriangle( ctx, ncv0, ncv1, ncv2 );

+   /* restore original colors */

+   COPY_CHAN4( ncv0->color, cSave[0] );

+   COPY_CHAN4( ncv1->color, cSave[1] );

+   COPY_CHAN4( ncv2->color, cSave[2] );

+}

+

+

+

+#ifdef DEBUG

+

+/* record the current triangle function name */

+const char *_mesa_triFuncName = NULL;

+

+#define USE(triFunc)				\

+do {						\

+    _mesa_triFuncName = #triFunc;		\

+    /*printf("%s\n", _mesa_triFuncName);*/	\

+    swrast->Triangle = triFunc;			\

+} while (0)

+

+#else

+

+#define USE(triFunc)  swrast->Triangle = triFunc;

+

+#endif

+

+

+

+

+/*

+ * Determine which triangle rendering function to use given the current

+ * rendering context.

+ *

+ * Please update the summary flag _SWRAST_NEW_TRIANGLE if you add or

+ * remove tests to this code.

+ */

+void

+_swrast_choose_triangle( struct gl_context *ctx )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   if (ctx->Polygon.CullFlag &&

+       ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) {

+      USE(nodraw_triangle);

+      return;

+   }

+

+   if (ctx->RenderMode==GL_RENDER) {

+

+      if (ctx->Polygon.SmoothFlag) {

+         _swrast_set_aa_triangle_function(ctx);

+         ASSERT(swrast->Triangle);

+         return;

+      }

+

+      /* special case for occlusion testing */

+      if (ctx->Query.CurrentOcclusionObject &&

+          ctx->Depth.Test &&

+          ctx->Depth.Mask == GL_FALSE &&

+          ctx->Depth.Func == GL_LESS &&

+          !ctx->Stencil._Enabled) {

+         if (ctx->Color.ColorMask[0][0] == 0 &&

+	     ctx->Color.ColorMask[0][1] == 0 &&

+	     ctx->Color.ColorMask[0][2] == 0 &&

+	     ctx->Color.ColorMask[0][3] == 0) {

+            USE(occlusion_zless_triangle);

+            return;

+         }

+      }

+

+      /*

+       * XXX should examine swrast->_ActiveAttribMask to determine what

+       * needs to be interpolated.

+       */

+      if (ctx->Texture._EnabledCoordUnits ||

+          ctx->FragmentProgram._Current ||

+          ctx->ATIFragmentShader._Enabled ||

+          NEED_SECONDARY_COLOR(ctx) ||

+          swrast->_FogEnabled) {

+         /* Ugh, we do a _lot_ of tests to pick the best textured tri func */

+         const struct gl_texture_object *texObj2D;

+         const struct gl_texture_image *texImg;

+         GLenum minFilter, magFilter, envMode;

+         gl_format format;

+         texObj2D = ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];

+

+         texImg = texObj2D ? texObj2D->Image[0][texObj2D->BaseLevel] : NULL;

+         format = texImg ? texImg->TexFormat : MESA_FORMAT_NONE;

+         minFilter = texObj2D ? texObj2D->MinFilter : GL_NONE;

+         magFilter = texObj2D ? texObj2D->MagFilter : GL_NONE;

+         envMode = ctx->Texture.Unit[0].EnvMode;

+

+         /* First see if we can use an optimized 2-D texture function */

+         if (ctx->Texture._EnabledCoordUnits == 0x1

+             && !ctx->FragmentProgram._Current

+             && !ctx->ATIFragmentShader._Enabled

+             && ctx->Texture._EnabledUnits == 0x1

+             && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT

+             && texObj2D->WrapS == GL_REPEAT

+             && texObj2D->WrapT == GL_REPEAT

+             && texObj2D->_Swizzle == SWIZZLE_NOOP

+             && texImg->_IsPowerOfTwo

+             && texImg->Border == 0

+             && texImg->Width == texImg->RowStride

+             && (format == MESA_FORMAT_RGB888 || format == MESA_FORMAT_RGBA8888)

+             && minFilter == magFilter

+             && ctx->Light.Model.ColorControl == GL_SINGLE_COLOR

+             && !swrast->_FogEnabled

+             && ctx->Texture.Unit[0].EnvMode != GL_COMBINE_EXT

+             && ctx->Texture.Unit[0].EnvMode != GL_COMBINE4_NV) {

+	    if (ctx->Hint.PerspectiveCorrection==GL_FASTEST) {

+	       if (minFilter == GL_NEAREST

+		   && format == MESA_FORMAT_RGB888

+		   && (envMode == GL_REPLACE || envMode == GL_DECAL)

+		   && ((swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)

+			&& ctx->Depth.Func == GL_LESS

+			&& ctx->Depth.Mask == GL_TRUE)

+		       || swrast->_RasterMask == TEXTURE_BIT)

+		   && ctx->Polygon.StippleFlag == GL_FALSE

+                   && ctx->DrawBuffer->Visual.depthBits <= 16) {

+		  if (swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)) {

+		     USE(simple_z_textured_triangle);

+		  }

+		  else {

+		     USE(simple_textured_triangle);

+		  }

+	       }

+	       else {

+#if CHAN_BITS != 8

+                  USE(general_triangle);

+#else

+                  if (format == MESA_FORMAT_RGBA8888 && !_mesa_little_endian()) {

+                     /* We only handle RGBA8888 correctly on little endian

+                      * in the optimized code above.

+                      */

+                     USE(general_triangle);

+                  }

+                  else {

+                     USE(affine_textured_triangle);

+                 }

+#endif

+	       }

+	    }

+	    else {

+#if CHAN_BITS != 8

+               USE(general_triangle);

+#else

+               USE(persp_textured_triangle);

+#endif

+	    }

+	 }

+         else {

+            /* general case textured triangles */

+            USE(general_triangle);

+         }

+      }

+      else {

+         ASSERT(!swrast->_FogEnabled);

+         ASSERT(!NEED_SECONDARY_COLOR(ctx));

+	 if (ctx->Light.ShadeModel==GL_SMOOTH) {

+	    /* smooth shaded, no texturing, stippled or some raster ops */

+#if CHAN_BITS != 8

+               USE(general_triangle);

+#else

+               USE(smooth_rgba_triangle);

+#endif

+	 }

+	 else {

+	    /* flat shaded, no texturing, stippled or some raster ops */

+#if CHAN_BITS != 8

+            USE(general_triangle);

+#else

+            USE(flat_rgba_triangle);

+#endif

+	 }

+      }

+   }

+   else if (ctx->RenderMode==GL_FEEDBACK) {

+      USE(_swrast_feedback_triangle);

+   }

+   else {

+      /* GL_SELECT mode */

+      USE(_swrast_select_triangle);

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_triangle.h b/mesalib/src/mesa/swrast/s_triangle.h
index b81932c73..bde5dd58b 100644
--- a/mesalib/src/mesa/swrast/s_triangle.h
+++ b/mesalib/src/mesa/swrast/s_triangle.h
@@ -1,50 +1,50 @@
-
-/*
- * 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.
- */
-
-
-#ifndef S_TRIANGLES_H
-#define S_TRIANGLES_H
-
-
-#include "swrast.h"
-
-
-extern GLboolean
-_swrast_culltriangle( GLcontext *ctx,
-                     const SWvertex *v0,
-                     const SWvertex *v1,
-                     const SWvertex *v2);
-
-extern void
-_swrast_choose_triangle( GLcontext *ctx );
-
-extern void
-_swrast_add_spec_terms_triangle( GLcontext *ctx,
-				 const SWvertex *v0,
-				 const SWvertex *v1,
-				 const SWvertex *v2 );
-
-
-#endif
+

+/*

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

+ */

+

+

+#ifndef S_TRIANGLES_H

+#define S_TRIANGLES_H

+

+

+#include "swrast.h"

+

+

+extern GLboolean

+_swrast_culltriangle( struct gl_context *ctx,

+                     const SWvertex *v0,

+                     const SWvertex *v1,

+                     const SWvertex *v2);

+

+extern void

+_swrast_choose_triangle( struct gl_context *ctx );

+

+extern void

+_swrast_add_spec_terms_triangle( struct gl_context *ctx,

+				 const SWvertex *v0,

+				 const SWvertex *v1,

+				 const SWvertex *v2 );

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/s_tritemp.h b/mesalib/src/mesa/swrast/s_tritemp.h
index 0aa8739f4..340c410ca 100644
--- a/mesalib/src/mesa/swrast/s_tritemp.h
+++ b/mesalib/src/mesa/swrast/s_tritemp.h
@@ -1,929 +1,929 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0
- *
- * 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.
- */
-
-/*
- * Triangle Rasterizer Template
- *
- * This file is #include'd to generate custom triangle rasterizers.
- *
- * The following macros may be defined to indicate what auxillary information
- * must be interpolated across the triangle:
- *    INTERP_Z        - if defined, interpolate integer Z values
- *    INTERP_RGB      - if defined, interpolate integer RGB values
- *    INTERP_ALPHA    - if defined, interpolate integer Alpha values
- *    INTERP_INT_TEX  - if defined, interpolate integer ST texcoords
- *                         (fast, simple 2-D texture mapping, without
- *                         perspective correction)
- *    INTERP_ATTRIBS  - if defined, interpolate arbitrary attribs (texcoords,
- *                         varying vars, etc)  This also causes W to be
- *                         computed for perspective correction).
- *
- * When one can directly address pixels in the color buffer the following
- * macros can be defined and used to compute pixel addresses during
- * rasterization (see pRow):
- *    PIXEL_TYPE          - the datatype of a pixel (GLubyte, GLushort, GLuint)
- *    BYTES_PER_ROW       - number of bytes per row in the color buffer
- *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where
- *                          Y==0 at bottom of screen and increases upward.
- *
- * Similarly, for direct depth buffer access, this type is used for depth
- * buffer addressing (see zRow):
- *    DEPTH_TYPE          - either GLushort or GLuint
- *
- * Optionally, one may provide one-time setup code per triangle:
- *    SETUP_CODE    - code which is to be executed once per triangle
- *
- * The following macro MUST be defined:
- *    RENDER_SPAN(span) - code to write a span of pixels.
- *
- * This code was designed for the origin to be in the lower-left corner.
- *
- * Inspired by triangle rasterizer code written by Allen Akin.  Thanks Allen!
- *
- *
- * Some notes on rasterization accuracy:
- *
- * This code uses fixed point arithmetic (the GLfixed type) to iterate
- * over the triangle edges and interpolate ancillary data (such as Z,
- * color, secondary color, etc).  The number of fractional bits in
- * GLfixed and the value of SUB_PIXEL_BITS has a direct bearing on the
- * accuracy of rasterization.
- *
- * If SUB_PIXEL_BITS=4 then we'll snap the vertices to the nearest
- * 1/16 of a pixel.  If we're walking up a long, nearly vertical edge
- * (dx=1/16, dy=1024) we'll need 4 + 10 = 14 fractional bits in
- * GLfixed to walk the edge without error.  If the maximum viewport
- * height is 4K pixels, then we'll need 4 + 12 = 16 fractional bits.
- *
- * Historically, Mesa has used 11 fractional bits in GLfixed, snaps
- * vertices to 1/16 pixel and allowed a maximum viewport height of 2K
- * pixels.  11 fractional bits is actually insufficient for accurately
- * rasterizing some triangles.  More recently, the maximum viewport
- * height was increased to 4K pixels.  Thus, Mesa should be using 16
- * fractional bits in GLfixed.  Unfortunately, there may be some issues
- * with setting FIXED_FRAC_BITS=16, such as multiplication overflow.
- * This will have to be examined in some detail...
- *
- * For now, if you find rasterization errors, particularly with tall,
- * sliver triangles, try increasing FIXED_FRAC_BITS and/or decreasing
- * SUB_PIXEL_BITS.
- */
-
-
-/*
- * Some code we unfortunately need to prevent negative interpolated colors.
- */
-#ifndef CLAMP_INTERPOLANT
-#define CLAMP_INTERPOLANT(CHANNEL, CHANNELSTEP, LEN)		\
-do {								\
-   GLfixed endVal = span.CHANNEL + (LEN) * span.CHANNELSTEP;	\
-   if (endVal < 0) {						\
-      span.CHANNEL -= endVal;					\
-   }								\
-   if (span.CHANNEL < 0) {					\
-      span.CHANNEL = 0;						\
-   }								\
-} while (0)
-#endif
-
-
-static void NAME(GLcontext *ctx, const SWvertex *v0,
-                                 const SWvertex *v1,
-                                 const SWvertex *v2 )
-{
-   typedef struct {
-      const SWvertex *v0, *v1;   /* Y(v0) < Y(v1) */
-      GLfloat dx;	/* X(v1) - X(v0) */
-      GLfloat dy;	/* Y(v1) - Y(v0) */
-      GLfloat dxdy;	/* dx/dy */
-      GLfixed fdxdy;	/* dx/dy in fixed-point */
-      GLfloat adjy;	/* adjust from v[0]->fy to fsy, scaled */
-      GLfixed fsx;	/* first sample point x coord */
-      GLfixed fsy;
-      GLfixed fx0;	/* fixed pt X of lower endpoint */
-      GLint lines;	/* number of lines to be sampled on this edge */
-   } EdgeT;
-
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
-#ifdef INTERP_Z
-   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;
-   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
-   const GLfloat maxDepth = ctx->DrawBuffer->_DepthMaxF;
-#define FixedToDepth(F)  ((F) >> fixedToDepthShift)
-#endif
-   EdgeT eMaj, eTop, eBot;
-   GLfloat oneOverArea;
-   const SWvertex *vMin, *vMid, *vMax;  /* Y(vMin)<=Y(vMid)<=Y(vMax) */
-   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceSign;
-   const GLint snapMask = ~((FIXED_ONE / (1 << SUB_PIXEL_BITS)) - 1); /* for x/y coord snapping */
-   GLfixed vMin_fx, vMin_fy, vMid_fx, vMid_fy, vMax_fx, vMax_fy;
-
-   SWspan span;
-
-   (void) swrast;
-
-   INIT_SPAN(span, GL_POLYGON);
-   span.y = 0; /* silence warnings */
-
-#ifdef INTERP_Z
-   (void) fixedToDepthShift;
-#endif
-
-   /*
-   printf("%s()\n", __FUNCTION__);
-   printf("  %g, %g, %g\n",
-          v0->attrib[FRAG_ATTRIB_WPOS][0],
-          v0->attrib[FRAG_ATTRIB_WPOS][1],
-          v0->attrib[FRAG_ATTRIB_WPOS][2]);
-   printf("  %g, %g, %g\n",
-          v1->attrib[FRAG_ATTRIB_WPOS][0],
-          v1->attrib[FRAG_ATTRIB_WPOS][1],
-          v1->attrib[FRAG_ATTRIB_WPOS][2]);
-   printf("  %g, %g, %g\n",
-          v2->attrib[FRAG_ATTRIB_WPOS][0],
-          v2->attrib[FRAG_ATTRIB_WPOS][1],
-          v2->attrib[FRAG_ATTRIB_WPOS][2]);
-   */
-
-   /* Compute fixed point x,y coords w/ half-pixel offsets and snapping.
-    * And find the order of the 3 vertices along the Y axis.
-    */
-   {
-      const GLfixed fy0 = FloatToFixed(v0->attrib[FRAG_ATTRIB_WPOS][1] - 0.5F) & snapMask;
-      const GLfixed fy1 = FloatToFixed(v1->attrib[FRAG_ATTRIB_WPOS][1] - 0.5F) & snapMask;
-      const GLfixed fy2 = FloatToFixed(v2->attrib[FRAG_ATTRIB_WPOS][1] - 0.5F) & snapMask;
-      if (fy0 <= fy1) {
-         if (fy1 <= fy2) {
-            /* y0 <= y1 <= y2 */
-            vMin = v0;   vMid = v1;   vMax = v2;
-            vMin_fy = fy0;  vMid_fy = fy1;  vMax_fy = fy2;
-         }
-         else if (fy2 <= fy0) {
-            /* y2 <= y0 <= y1 */
-            vMin = v2;   vMid = v0;   vMax = v1;
-            vMin_fy = fy2;  vMid_fy = fy0;  vMax_fy = fy1;
-         }
-         else {
-            /* y0 <= y2 <= y1 */
-            vMin = v0;   vMid = v2;   vMax = v1;
-            vMin_fy = fy0;  vMid_fy = fy2;  vMax_fy = fy1;
-            bf = -bf;
-         }
-      }
-      else {
-         if (fy0 <= fy2) {
-            /* y1 <= y0 <= y2 */
-            vMin = v1;   vMid = v0;   vMax = v2;
-            vMin_fy = fy1;  vMid_fy = fy0;  vMax_fy = fy2;
-            bf = -bf;
-         }
-         else if (fy2 <= fy1) {
-            /* y2 <= y1 <= y0 */
-            vMin = v2;   vMid = v1;   vMax = v0;
-            vMin_fy = fy2;  vMid_fy = fy1;  vMax_fy = fy0;
-            bf = -bf;
-         }
-         else {
-            /* y1 <= y2 <= y0 */
-            vMin = v1;   vMid = v2;   vMax = v0;
-            vMin_fy = fy1;  vMid_fy = fy2;  vMax_fy = fy0;
-         }
-      }
-
-      /* fixed point X coords */
-      vMin_fx = FloatToFixed(vMin->attrib[FRAG_ATTRIB_WPOS][0] + 0.5F) & snapMask;
-      vMid_fx = FloatToFixed(vMid->attrib[FRAG_ATTRIB_WPOS][0] + 0.5F) & snapMask;
-      vMax_fx = FloatToFixed(vMax->attrib[FRAG_ATTRIB_WPOS][0] + 0.5F) & snapMask;
-   }
-
-   /* vertex/edge relationship */
-   eMaj.v0 = vMin;   eMaj.v1 = vMax;   /*TODO: .v1's not needed */
-   eTop.v0 = vMid;   eTop.v1 = vMax;
-   eBot.v0 = vMin;   eBot.v1 = vMid;
-
-   /* compute deltas for each edge:  vertex[upper] - vertex[lower] */
-   eMaj.dx = FixedToFloat(vMax_fx - vMin_fx);
-   eMaj.dy = FixedToFloat(vMax_fy - vMin_fy);
-   eTop.dx = FixedToFloat(vMax_fx - vMid_fx);
-   eTop.dy = FixedToFloat(vMax_fy - vMid_fy);
-   eBot.dx = FixedToFloat(vMid_fx - vMin_fx);
-   eBot.dy = FixedToFloat(vMid_fy - vMin_fy);
-
-   /* compute area, oneOverArea and perform backface culling */
-   {
-      const GLfloat area = eMaj.dx * eBot.dy - eBot.dx * eMaj.dy;
-
-      if (IS_INF_OR_NAN(area) || area == 0.0F)
-         return;
-
-      if (area * bf * swrast->_BackfaceCullSign < 0.0)
-         return;
-
-      oneOverArea = 1.0F / area;
-
-      /* 0 = front, 1 = back */
-      span.facing = oneOverArea * bf > 0.0F;
-   }
-
-   /* Edge setup.  For a triangle strip these could be reused... */
-   {
-      eMaj.fsy = FixedCeil(vMin_fy);
-      eMaj.lines = FixedToInt(FixedCeil(vMax_fy - eMaj.fsy));
-      if (eMaj.lines > 0) {
-         eMaj.dxdy = eMaj.dx / eMaj.dy;
-         eMaj.fdxdy = SignedFloatToFixed(eMaj.dxdy);
-         eMaj.adjy = (GLfloat) (eMaj.fsy - vMin_fy);  /* SCALED! */
-         eMaj.fx0 = vMin_fx;
-         eMaj.fsx = eMaj.fx0 + (GLfixed) (eMaj.adjy * eMaj.dxdy);
-      }
-      else {
-         return;  /*CULLED*/
-      }
-
-      eTop.fsy = FixedCeil(vMid_fy);
-      eTop.lines = FixedToInt(FixedCeil(vMax_fy - eTop.fsy));
-      if (eTop.lines > 0) {
-         eTop.dxdy = eTop.dx / eTop.dy;
-         eTop.fdxdy = SignedFloatToFixed(eTop.dxdy);
-         eTop.adjy = (GLfloat) (eTop.fsy - vMid_fy); /* SCALED! */
-         eTop.fx0 = vMid_fx;
-         eTop.fsx = eTop.fx0 + (GLfixed) (eTop.adjy * eTop.dxdy);
-      }
-
-      eBot.fsy = FixedCeil(vMin_fy);
-      eBot.lines = FixedToInt(FixedCeil(vMid_fy - eBot.fsy));
-      if (eBot.lines > 0) {
-         eBot.dxdy = eBot.dx / eBot.dy;
-         eBot.fdxdy = SignedFloatToFixed(eBot.dxdy);
-         eBot.adjy = (GLfloat) (eBot.fsy - vMin_fy);  /* SCALED! */
-         eBot.fx0 = vMin_fx;
-         eBot.fsx = eBot.fx0 + (GLfixed) (eBot.adjy * eBot.dxdy);
-      }
-   }
-
-   /*
-    * Conceptually, we view a triangle as two subtriangles
-    * separated by a perfectly horizontal line.  The edge that is
-    * intersected by this line is one with maximal absolute dy; we
-    * call it a ``major'' edge.  The other two edges are the
-    * ``top'' edge (for the upper subtriangle) and the ``bottom''
-    * edge (for the lower subtriangle).  If either of these two
-    * edges is horizontal or very close to horizontal, the
-    * corresponding subtriangle might cover zero sample points;
-    * we take care to handle such cases, for performance as well
-    * as correctness.
-    *
-    * By stepping rasterization parameters along the major edge,
-    * we can avoid recomputing them at the discontinuity where
-    * the top and bottom edges meet.  However, this forces us to
-    * be able to scan both left-to-right and right-to-left.
-    * Also, we must determine whether the major edge is at the
-    * left or right side of the triangle.  We do this by
-    * computing the magnitude of the cross-product of the major
-    * and top edges.  Since this magnitude depends on the sine of
-    * the angle between the two edges, its sign tells us whether
-    * we turn to the left or to the right when travelling along
-    * the major edge to the top edge, and from this we infer
-    * whether the major edge is on the left or the right.
-    *
-    * Serendipitously, this cross-product magnitude is also a
-    * value we need to compute the iteration parameter
-    * derivatives for the triangle, and it can be used to perform
-    * backface culling because its sign tells us whether the
-    * triangle is clockwise or counterclockwise.  In this code we
-    * refer to it as ``area'' because it's also proportional to
-    * the pixel area of the triangle.
-    */
-
-   {
-      GLint scan_from_left_to_right;  /* true if scanning left-to-right */
-
-      /*
-       * Execute user-supplied setup code
-       */
-#ifdef SETUP_CODE
-      SETUP_CODE
-#endif
-
-      scan_from_left_to_right = (oneOverArea < 0.0F);
-
-
-      /* compute d?/dx and d?/dy derivatives */
-#ifdef INTERP_Z
-      span.interpMask |= SPAN_Z;
-      {
-         GLfloat eMaj_dz = vMax->attrib[FRAG_ATTRIB_WPOS][2] - vMin->attrib[FRAG_ATTRIB_WPOS][2];
-         GLfloat eBot_dz = vMid->attrib[FRAG_ATTRIB_WPOS][2] - vMin->attrib[FRAG_ATTRIB_WPOS][2];
-         span.attrStepX[FRAG_ATTRIB_WPOS][2] = oneOverArea * (eMaj_dz * eBot.dy - eMaj.dy * eBot_dz);
-         if (span.attrStepX[FRAG_ATTRIB_WPOS][2] > maxDepth ||
-             span.attrStepX[FRAG_ATTRIB_WPOS][2] < -maxDepth) {
-            /* probably a sliver triangle */
-            span.attrStepX[FRAG_ATTRIB_WPOS][2] = 0.0;
-            span.attrStepY[FRAG_ATTRIB_WPOS][2] = 0.0;
-         }
-         else {
-            span.attrStepY[FRAG_ATTRIB_WPOS][2] = oneOverArea * (eMaj.dx * eBot_dz - eMaj_dz * eBot.dx);
-         }
-         if (depthBits <= 16)
-            span.zStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_WPOS][2]);
-         else
-            span.zStep = (GLint) span.attrStepX[FRAG_ATTRIB_WPOS][2];
-      }
-#endif
-#ifdef INTERP_RGB
-      span.interpMask |= SPAN_RGBA;
-      if (ctx->Light.ShadeModel == GL_SMOOTH) {
-         GLfloat eMaj_dr = (GLfloat) (vMax->color[RCOMP] - vMin->color[RCOMP]);
-         GLfloat eBot_dr = (GLfloat) (vMid->color[RCOMP] - vMin->color[RCOMP]);
-         GLfloat eMaj_dg = (GLfloat) (vMax->color[GCOMP] - vMin->color[GCOMP]);
-         GLfloat eBot_dg = (GLfloat) (vMid->color[GCOMP] - vMin->color[GCOMP]);
-         GLfloat eMaj_db = (GLfloat) (vMax->color[BCOMP] - vMin->color[BCOMP]);
-         GLfloat eBot_db = (GLfloat) (vMid->color[BCOMP] - vMin->color[BCOMP]);
-#  ifdef INTERP_ALPHA
-         GLfloat eMaj_da = (GLfloat) (vMax->color[ACOMP] - vMin->color[ACOMP]);
-         GLfloat eBot_da = (GLfloat) (vMid->color[ACOMP] - vMin->color[ACOMP]);
-#  endif
-         span.attrStepX[FRAG_ATTRIB_COL0][0] = oneOverArea * (eMaj_dr * eBot.dy - eMaj.dy * eBot_dr);
-         span.attrStepY[FRAG_ATTRIB_COL0][0] = oneOverArea * (eMaj.dx * eBot_dr - eMaj_dr * eBot.dx);
-         span.attrStepX[FRAG_ATTRIB_COL0][1] = oneOverArea * (eMaj_dg * eBot.dy - eMaj.dy * eBot_dg);
-         span.attrStepY[FRAG_ATTRIB_COL0][1] = oneOverArea * (eMaj.dx * eBot_dg - eMaj_dg * eBot.dx);
-         span.attrStepX[FRAG_ATTRIB_COL0][2] = oneOverArea * (eMaj_db * eBot.dy - eMaj.dy * eBot_db);
-         span.attrStepY[FRAG_ATTRIB_COL0][2] = oneOverArea * (eMaj.dx * eBot_db - eMaj_db * eBot.dx);
-         span.redStep   = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][0]);
-         span.greenStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][1]);
-         span.blueStep  = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][2]);
-#  ifdef INTERP_ALPHA
-         span.attrStepX[FRAG_ATTRIB_COL0][3] = oneOverArea * (eMaj_da * eBot.dy - eMaj.dy * eBot_da);
-         span.attrStepY[FRAG_ATTRIB_COL0][3] = oneOverArea * (eMaj.dx * eBot_da - eMaj_da * eBot.dx);
-         span.alphaStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][3]);
-#  endif /* INTERP_ALPHA */
-      }
-      else {
-         ASSERT(ctx->Light.ShadeModel == GL_FLAT);
-         span.interpMask |= SPAN_FLAT;
-         span.attrStepX[FRAG_ATTRIB_COL0][0] = span.attrStepY[FRAG_ATTRIB_COL0][0] = 0.0F;
-         span.attrStepX[FRAG_ATTRIB_COL0][1] = span.attrStepY[FRAG_ATTRIB_COL0][1] = 0.0F;
-         span.attrStepX[FRAG_ATTRIB_COL0][2] = span.attrStepY[FRAG_ATTRIB_COL0][2] = 0.0F;
-	 span.redStep   = 0;
-	 span.greenStep = 0;
-	 span.blueStep  = 0;
-#  ifdef INTERP_ALPHA
-         span.attrStepX[FRAG_ATTRIB_COL0][3] = span.attrStepY[FRAG_ATTRIB_COL0][3] = 0.0F;
-	 span.alphaStep = 0;
-#  endif
-      }
-#endif /* INTERP_RGB */
-#ifdef INTERP_INT_TEX
-      {
-         GLfloat eMaj_ds = (vMax->attrib[FRAG_ATTRIB_TEX0][0] - vMin->attrib[FRAG_ATTRIB_TEX0][0]) * S_SCALE;
-         GLfloat eBot_ds = (vMid->attrib[FRAG_ATTRIB_TEX0][0] - vMin->attrib[FRAG_ATTRIB_TEX0][0]) * S_SCALE;
-         GLfloat eMaj_dt = (vMax->attrib[FRAG_ATTRIB_TEX0][1] - vMin->attrib[FRAG_ATTRIB_TEX0][1]) * T_SCALE;
-         GLfloat eBot_dt = (vMid->attrib[FRAG_ATTRIB_TEX0][1] - vMin->attrib[FRAG_ATTRIB_TEX0][1]) * T_SCALE;
-         span.attrStepX[FRAG_ATTRIB_TEX0][0] = oneOverArea * (eMaj_ds * eBot.dy - eMaj.dy * eBot_ds);
-         span.attrStepY[FRAG_ATTRIB_TEX0][0] = oneOverArea * (eMaj.dx * eBot_ds - eMaj_ds * eBot.dx);
-         span.attrStepX[FRAG_ATTRIB_TEX0][1] = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt);
-         span.attrStepY[FRAG_ATTRIB_TEX0][1] = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx);
-         span.intTexStep[0] = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_TEX0][0]);
-         span.intTexStep[1] = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_TEX0][1]);
-      }
-#endif
-#ifdef INTERP_ATTRIBS
-      {
-         /* attrib[FRAG_ATTRIB_WPOS][3] is 1/W */
-         const GLfloat wMax = vMax->attrib[FRAG_ATTRIB_WPOS][3];
-         const GLfloat wMin = vMin->attrib[FRAG_ATTRIB_WPOS][3];
-         const GLfloat wMid = vMid->attrib[FRAG_ATTRIB_WPOS][3];
-         {
-            const GLfloat eMaj_dw = wMax - wMin;
-            const GLfloat eBot_dw = wMid - wMin;
-            span.attrStepX[FRAG_ATTRIB_WPOS][3] = oneOverArea * (eMaj_dw * eBot.dy - eMaj.dy * eBot_dw);
-            span.attrStepY[FRAG_ATTRIB_WPOS][3] = oneOverArea * (eMaj.dx * eBot_dw - eMaj_dw * eBot.dx);
-         }
-         ATTRIB_LOOP_BEGIN
-            if (swrast->_InterpMode[attr] == GL_FLAT) {
-               ASSIGN_4V(span.attrStepX[attr], 0.0, 0.0, 0.0, 0.0);
-               ASSIGN_4V(span.attrStepY[attr], 0.0, 0.0, 0.0, 0.0);
-            }
-            else {
-               GLuint c;
-               for (c = 0; c < 4; c++) {
-                  GLfloat eMaj_da = vMax->attrib[attr][c] * wMax - vMin->attrib[attr][c] * wMin;
-                  GLfloat eBot_da = vMid->attrib[attr][c] * wMid - vMin->attrib[attr][c] * wMin;
-                  span.attrStepX[attr][c] = oneOverArea * (eMaj_da * eBot.dy - eMaj.dy * eBot_da);
-                  span.attrStepY[attr][c] = oneOverArea * (eMaj.dx * eBot_da - eMaj_da * eBot.dx);
-               }
-            }
-         ATTRIB_LOOP_END
-      }
-#endif
-
-      /*
-       * We always sample at pixel centers.  However, we avoid
-       * explicit half-pixel offsets in this code by incorporating
-       * the proper offset in each of x and y during the
-       * transformation to window coordinates.
-       *
-       * We also apply the usual rasterization rules to prevent
-       * cracks and overlaps.  A pixel is considered inside a
-       * subtriangle if it meets all of four conditions: it is on or
-       * to the right of the left edge, strictly to the left of the
-       * right edge, on or below the top edge, and strictly above
-       * the bottom edge.  (Some edges may be degenerate.)
-       *
-       * The following discussion assumes left-to-right scanning
-       * (that is, the major edge is on the left); the right-to-left
-       * case is a straightforward variation.
-       *
-       * We start by finding the half-integral y coordinate that is
-       * at or below the top of the triangle.  This gives us the
-       * first scan line that could possibly contain pixels that are
-       * inside the triangle.
-       *
-       * Next we creep down the major edge until we reach that y,
-       * and compute the corresponding x coordinate on the edge.
-       * Then we find the half-integral x that lies on or just
-       * inside the edge.  This is the first pixel that might lie in
-       * the interior of the triangle.  (We won't know for sure
-       * until we check the other edges.)
-       *
-       * As we rasterize the triangle, we'll step down the major
-       * edge.  For each step in y, we'll move an integer number
-       * of steps in x.  There are two possible x step sizes, which
-       * we'll call the ``inner'' step (guaranteed to land on the
-       * edge or inside it) and the ``outer'' step (guaranteed to
-       * land on the edge or outside it).  The inner and outer steps
-       * differ by one.  During rasterization we maintain an error
-       * term that indicates our distance from the true edge, and
-       * select either the inner step or the outer step, whichever
-       * gets us to the first pixel that falls inside the triangle.
-       *
-       * All parameters (z, red, etc.) as well as the buffer
-       * addresses for color and z have inner and outer step values,
-       * so that we can increment them appropriately.  This method
-       * eliminates the need to adjust parameters by creeping a
-       * sub-pixel amount into the triangle at each scanline.
-       */
-
-      {
-         GLint subTriangle;
-         GLfixed fxLeftEdge = 0, fxRightEdge = 0;
-         GLfixed fdxLeftEdge = 0, fdxRightEdge = 0;
-         GLfixed fError = 0, fdError = 0;
-#ifdef PIXEL_ADDRESS
-         PIXEL_TYPE *pRow = NULL;
-         GLint dPRowOuter = 0, dPRowInner;  /* offset in bytes */
-#endif
-#ifdef INTERP_Z
-#  ifdef DEPTH_TYPE
-         struct gl_renderbuffer *zrb
-            = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
-         DEPTH_TYPE *zRow = NULL;
-         GLint dZRowOuter = 0, dZRowInner;  /* offset in bytes */
-#  endif
-         GLuint zLeft = 0;
-         GLfixed fdzOuter = 0, fdzInner;
-#endif
-#ifdef INTERP_RGB
-         GLint rLeft = 0, fdrOuter = 0, fdrInner;
-         GLint gLeft = 0, fdgOuter = 0, fdgInner;
-         GLint bLeft = 0, fdbOuter = 0, fdbInner;
-#endif
-#ifdef INTERP_ALPHA
-         GLint aLeft = 0, fdaOuter = 0, fdaInner;
-#endif
-#ifdef INTERP_INT_TEX
-         GLfixed sLeft=0, dsOuter=0, dsInner;
-         GLfixed tLeft=0, dtOuter=0, dtInner;
-#endif
-#ifdef INTERP_ATTRIBS
-         GLfloat wLeft = 0, dwOuter = 0, dwInner;
-         GLfloat attrLeft[FRAG_ATTRIB_MAX][4];
-         GLfloat daOuter[FRAG_ATTRIB_MAX][4], daInner[FRAG_ATTRIB_MAX][4];
-#endif
-
-         for (subTriangle=0; subTriangle<=1; subTriangle++) {
-            EdgeT *eLeft, *eRight;
-            int setupLeft, setupRight;
-            int lines;
-
-            if (subTriangle==0) {
-               /* bottom half */
-               if (scan_from_left_to_right) {
-                  eLeft = &eMaj;
-                  eRight = &eBot;
-                  lines = eRight->lines;
-                  setupLeft = 1;
-                  setupRight = 1;
-               }
-               else {
-                  eLeft = &eBot;
-                  eRight = &eMaj;
-                  lines = eLeft->lines;
-                  setupLeft = 1;
-                  setupRight = 1;
-               }
-            }
-            else {
-               /* top half */
-               if (scan_from_left_to_right) {
-                  eLeft = &eMaj;
-                  eRight = &eTop;
-                  lines = eRight->lines;
-                  setupLeft = 0;
-                  setupRight = 1;
-               }
-               else {
-                  eLeft = &eTop;
-                  eRight = &eMaj;
-                  lines = eLeft->lines;
-                  setupLeft = 1;
-                  setupRight = 0;
-               }
-               if (lines == 0)
-                  return;
-            }
-
-            if (setupLeft && eLeft->lines > 0) {
-               const SWvertex *vLower = eLeft->v0;
-               const GLfixed fsy = eLeft->fsy;
-               const GLfixed fsx = eLeft->fsx;  /* no fractional part */
-               const GLfixed fx = FixedCeil(fsx);  /* no fractional part */
-               const GLfixed adjx = (GLfixed) (fx - eLeft->fx0); /* SCALED! */
-               const GLfixed adjy = (GLfixed) eLeft->adjy;      /* SCALED! */
-               GLint idxOuter;
-               GLfloat dxOuter;
-               GLfixed fdxOuter;
-
-               fError = fx - fsx - FIXED_ONE;
-               fxLeftEdge = fsx - FIXED_EPSILON;
-               fdxLeftEdge = eLeft->fdxdy;
-               fdxOuter = FixedFloor(fdxLeftEdge - FIXED_EPSILON);
-               fdError = fdxOuter - fdxLeftEdge + FIXED_ONE;
-               idxOuter = FixedToInt(fdxOuter);
-               dxOuter = (GLfloat) idxOuter;
-               span.y = FixedToInt(fsy);
-
-               /* silence warnings on some compilers */
-               (void) dxOuter;
-               (void) adjx;
-               (void) adjy;
-               (void) vLower;
-
-#ifdef PIXEL_ADDRESS
-               {
-                  pRow = (PIXEL_TYPE *) PIXEL_ADDRESS(FixedToInt(fxLeftEdge), span.y);
-                  dPRowOuter = -((int)BYTES_PER_ROW) + idxOuter * sizeof(PIXEL_TYPE);
-                  /* negative because Y=0 at bottom and increases upward */
-               }
-#endif
-               /*
-                * Now we need the set of parameter (z, color, etc.) values at
-                * the point (fx, fsy).  This gives us properly-sampled parameter
-                * values that we can step from pixel to pixel.  Furthermore,
-                * although we might have intermediate results that overflow
-                * the normal parameter range when we step temporarily outside
-                * the triangle, we shouldn't overflow or underflow for any
-                * pixel that's actually inside the triangle.
-                */
-
-#ifdef INTERP_Z
-               {
-                  GLfloat z0 = vLower->attrib[FRAG_ATTRIB_WPOS][2];
-                  if (depthBits <= 16) {
-                     /* interpolate fixed-pt values */
-                     GLfloat tmp = (z0 * FIXED_SCALE
-                                    + span.attrStepX[FRAG_ATTRIB_WPOS][2] * adjx
-                                    + span.attrStepY[FRAG_ATTRIB_WPOS][2] * adjy) + FIXED_HALF;
-                     if (tmp < MAX_GLUINT / 2)
-                        zLeft = (GLfixed) tmp;
-                     else
-                        zLeft = MAX_GLUINT / 2;
-                     fdzOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_WPOS][2] +
-                                                   dxOuter * span.attrStepX[FRAG_ATTRIB_WPOS][2]);
-                  }
-                  else {
-                     /* interpolate depth values w/out scaling */
-                     zLeft = (GLuint) (z0 + span.attrStepX[FRAG_ATTRIB_WPOS][2] * FixedToFloat(adjx)
-                                          + span.attrStepY[FRAG_ATTRIB_WPOS][2] * FixedToFloat(adjy));
-                     fdzOuter = (GLint) (span.attrStepY[FRAG_ATTRIB_WPOS][2] +
-                                         dxOuter * span.attrStepX[FRAG_ATTRIB_WPOS][2]);
-                  }
-#  ifdef DEPTH_TYPE
-                  zRow = (DEPTH_TYPE *)
-                    zrb->GetPointer(ctx, zrb, FixedToInt(fxLeftEdge), span.y);
-                  dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);
-#  endif
-               }
-#endif
-#ifdef INTERP_RGB
-               if (ctx->Light.ShadeModel == GL_SMOOTH) {
-                  rLeft = (GLint)(ChanToFixed(vLower->color[RCOMP])
-                                  + span.attrStepX[FRAG_ATTRIB_COL0][0] * adjx
-                                  + span.attrStepY[FRAG_ATTRIB_COL0][0] * adjy) + FIXED_HALF;
-                  gLeft = (GLint)(ChanToFixed(vLower->color[GCOMP])
-                                  + span.attrStepX[FRAG_ATTRIB_COL0][1] * adjx
-                                  + span.attrStepY[FRAG_ATTRIB_COL0][1] * adjy) + FIXED_HALF;
-                  bLeft = (GLint)(ChanToFixed(vLower->color[BCOMP])
-                                  + span.attrStepX[FRAG_ATTRIB_COL0][2] * adjx
-                                  + span.attrStepY[FRAG_ATTRIB_COL0][2] * adjy) + FIXED_HALF;
-                  fdrOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][0]
-                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][0]);
-                  fdgOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][1]
-                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][1]);
-                  fdbOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][2]
-                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][2]);
-#  ifdef INTERP_ALPHA
-                  aLeft = (GLint)(ChanToFixed(vLower->color[ACOMP])
-                                  + span.attrStepX[FRAG_ATTRIB_COL0][3] * adjx
-                                  + span.attrStepY[FRAG_ATTRIB_COL0][3] * adjy) + FIXED_HALF;
-                  fdaOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][3]
-                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][3]);
-#  endif
-               }
-               else {
-                  ASSERT(ctx->Light.ShadeModel == GL_FLAT);
-                  rLeft = ChanToFixed(v2->color[RCOMP]);
-                  gLeft = ChanToFixed(v2->color[GCOMP]);
-                  bLeft = ChanToFixed(v2->color[BCOMP]);
-                  fdrOuter = fdgOuter = fdbOuter = 0;
-#  ifdef INTERP_ALPHA
-                  aLeft = ChanToFixed(v2->color[ACOMP]);
-                  fdaOuter = 0;
-#  endif
-               }
-#endif /* INTERP_RGB */
-
-
-#ifdef INTERP_INT_TEX
-               {
-                  GLfloat s0, t0;
-                  s0 = vLower->attrib[FRAG_ATTRIB_TEX0][0] * S_SCALE;
-                  sLeft = (GLfixed)(s0 * FIXED_SCALE + span.attrStepX[FRAG_ATTRIB_TEX0][0] * adjx
-                                 + span.attrStepY[FRAG_ATTRIB_TEX0][0] * adjy) + FIXED_HALF;
-                  dsOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_TEX0][0]
-                                               + dxOuter * span.attrStepX[FRAG_ATTRIB_TEX0][0]);
-
-                  t0 = vLower->attrib[FRAG_ATTRIB_TEX0][1] * T_SCALE;
-                  tLeft = (GLfixed)(t0 * FIXED_SCALE + span.attrStepX[FRAG_ATTRIB_TEX0][1] * adjx
-                                 + span.attrStepY[FRAG_ATTRIB_TEX0][1] * adjy) + FIXED_HALF;
-                  dtOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_TEX0][1]
-                                               + dxOuter * span.attrStepX[FRAG_ATTRIB_TEX0][1]);
-               }
-#endif
-#ifdef INTERP_ATTRIBS
-               {
-                  const GLuint attr = FRAG_ATTRIB_WPOS;
-                  wLeft = vLower->attrib[FRAG_ATTRIB_WPOS][3]
-                        + (span.attrStepX[attr][3] * adjx
-                           + span.attrStepY[attr][3] * adjy) * (1.0F/FIXED_SCALE);
-                  dwOuter = span.attrStepY[attr][3] + dxOuter * span.attrStepX[attr][3];
-               }
-               ATTRIB_LOOP_BEGIN
-                  const GLfloat invW = vLower->attrib[FRAG_ATTRIB_WPOS][3];
-                  if (swrast->_InterpMode[attr] == GL_FLAT) {
-                     GLuint c;
-                     for (c = 0; c < 4; c++) {
-                        attrLeft[attr][c] = v2->attrib[attr][c] * invW;
-                        daOuter[attr][c] = 0.0;
-                     }
-                  }
-                  else {
-                     GLuint c;
-                     for (c = 0; c < 4; c++) {
-                        const GLfloat a = vLower->attrib[attr][c] * invW;
-                        attrLeft[attr][c] = a + (  span.attrStepX[attr][c] * adjx
-                                                 + span.attrStepY[attr][c] * adjy) * (1.0F/FIXED_SCALE);
-                        daOuter[attr][c] = span.attrStepY[attr][c] + dxOuter * span.attrStepX[attr][c];
-                     }
-                  }
-               ATTRIB_LOOP_END
-#endif
-            } /*if setupLeft*/
-
-
-            if (setupRight && eRight->lines>0) {
-               fxRightEdge = eRight->fsx - FIXED_EPSILON;
-               fdxRightEdge = eRight->fdxdy;
-            }
-
-            if (lines==0) {
-               continue;
-            }
-
-
-            /* Rasterize setup */
-#ifdef PIXEL_ADDRESS
-            dPRowInner = dPRowOuter + sizeof(PIXEL_TYPE);
-#endif
-#ifdef INTERP_Z
-#  ifdef DEPTH_TYPE
-            dZRowInner = dZRowOuter + sizeof(DEPTH_TYPE);
-#  endif
-            fdzInner = fdzOuter + span.zStep;
-#endif
-#ifdef INTERP_RGB
-            fdrInner = fdrOuter + span.redStep;
-            fdgInner = fdgOuter + span.greenStep;
-            fdbInner = fdbOuter + span.blueStep;
-#endif
-#ifdef INTERP_ALPHA
-            fdaInner = fdaOuter + span.alphaStep;
-#endif
-#ifdef INTERP_INT_TEX
-            dsInner = dsOuter + span.intTexStep[0];
-            dtInner = dtOuter + span.intTexStep[1];
-#endif
-#ifdef INTERP_ATTRIBS
-            dwInner = dwOuter + span.attrStepX[FRAG_ATTRIB_WPOS][3];
-            ATTRIB_LOOP_BEGIN
-               GLuint c;
-               for (c = 0; c < 4; c++) {
-                  daInner[attr][c] = daOuter[attr][c] + span.attrStepX[attr][c];
-               }
-            ATTRIB_LOOP_END
-#endif
-
-            while (lines > 0) {
-               /* initialize the span interpolants to the leftmost value */
-               /* ff = fixed-pt fragment */
-               const GLint right = FixedToInt(fxRightEdge);
-               span.x = FixedToInt(fxLeftEdge);
-               if (right <= span.x)
-                  span.end = 0;
-               else
-                  span.end = right - span.x;
-
-#ifdef INTERP_Z
-               span.z = zLeft;
-#endif
-#ifdef INTERP_RGB
-               span.red = rLeft;
-               span.green = gLeft;
-               span.blue = bLeft;
-#endif
-#ifdef INTERP_ALPHA
-               span.alpha = aLeft;
-#endif
-#ifdef INTERP_INT_TEX
-               span.intTex[0] = sLeft;
-               span.intTex[1] = tLeft;
-#endif
-
-#ifdef INTERP_ATTRIBS
-               span.attrStart[FRAG_ATTRIB_WPOS][3] = wLeft;
-               ATTRIB_LOOP_BEGIN
-                  GLuint c;
-                  for (c = 0; c < 4; c++) {
-                     span.attrStart[attr][c] = attrLeft[attr][c];
-                  }
-               ATTRIB_LOOP_END
-#endif
-
-               /* This is where we actually generate fragments */
-               /* XXX the test for span.y > 0 _shouldn't_ be needed but
-                * it fixes a problem on 64-bit Opterons (bug 4842).
-                */
-               if (span.end > 0 && span.y >= 0) {
-                  const GLint len = span.end - 1;
-                  (void) len;
-#ifdef INTERP_RGB
-                  CLAMP_INTERPOLANT(red, redStep, len);
-                  CLAMP_INTERPOLANT(green, greenStep, len);
-                  CLAMP_INTERPOLANT(blue, blueStep, len);
-#endif
-#ifdef INTERP_ALPHA
-                  CLAMP_INTERPOLANT(alpha, alphaStep, len);
-#endif
-                  {
-                     RENDER_SPAN( span );
-                  }
-               }
-
-               /*
-                * Advance to the next scan line.  Compute the
-                * new edge coordinates, and adjust the
-                * pixel-center x coordinate so that it stays
-                * on or inside the major edge.
-                */
-               span.y++;
-               lines--;
-
-               fxLeftEdge += fdxLeftEdge;
-               fxRightEdge += fdxRightEdge;
-
-               fError += fdError;
-               if (fError >= 0) {
-                  fError -= FIXED_ONE;
-
-#ifdef PIXEL_ADDRESS
-                  pRow = (PIXEL_TYPE *) ((GLubyte *) pRow + dPRowOuter);
-#endif
-#ifdef INTERP_Z
-#  ifdef DEPTH_TYPE
-                  zRow = (DEPTH_TYPE *) ((GLubyte *) zRow + dZRowOuter);
-#  endif
-                  zLeft += fdzOuter;
-#endif
-#ifdef INTERP_RGB
-                  rLeft += fdrOuter;
-                  gLeft += fdgOuter;
-                  bLeft += fdbOuter;
-#endif
-#ifdef INTERP_ALPHA
-                  aLeft += fdaOuter;
-#endif
-#ifdef INTERP_INT_TEX
-                  sLeft += dsOuter;
-                  tLeft += dtOuter;
-#endif
-#ifdef INTERP_ATTRIBS
-                  wLeft += dwOuter;
-                  ATTRIB_LOOP_BEGIN
-                     GLuint c;
-                     for (c = 0; c < 4; c++) {
-                        attrLeft[attr][c] += daOuter[attr][c];
-                     }
-                  ATTRIB_LOOP_END
-#endif
-               }
-               else {
-#ifdef PIXEL_ADDRESS
-                  pRow = (PIXEL_TYPE *) ((GLubyte *) pRow + dPRowInner);
-#endif
-#ifdef INTERP_Z
-#  ifdef DEPTH_TYPE
-                  zRow = (DEPTH_TYPE *) ((GLubyte *) zRow + dZRowInner);
-#  endif
-                  zLeft += fdzInner;
-#endif
-#ifdef INTERP_RGB
-                  rLeft += fdrInner;
-                  gLeft += fdgInner;
-                  bLeft += fdbInner;
-#endif
-#ifdef INTERP_ALPHA
-                  aLeft += fdaInner;
-#endif
-#ifdef INTERP_INT_TEX
-                  sLeft += dsInner;
-                  tLeft += dtInner;
-#endif
-#ifdef INTERP_ATTRIBS
-                  wLeft += dwInner;
-                  ATTRIB_LOOP_BEGIN
-                     GLuint c;
-                     for (c = 0; c < 4; c++) {
-                        attrLeft[attr][c] += daInner[attr][c];
-                     }
-                  ATTRIB_LOOP_END
-#endif
-               }
-            } /*while lines>0*/
-
-         } /* for subTriangle */
-
-      }
-   }
-}
-
-#undef SETUP_CODE
-#undef RENDER_SPAN
-
-#undef PIXEL_TYPE
-#undef BYTES_PER_ROW
-#undef PIXEL_ADDRESS
-#undef DEPTH_TYPE
-
-#undef INTERP_Z
-#undef INTERP_RGB
-#undef INTERP_ALPHA
-#undef INTERP_INT_TEX
-#undef INTERP_ATTRIBS
-
-#undef S_SCALE
-#undef T_SCALE
-
-#undef FixedToDepth
-
-#undef NAME
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.0

+ *

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

+ */

+

+/*

+ * Triangle Rasterizer Template

+ *

+ * This file is #include'd to generate custom triangle rasterizers.

+ *

+ * The following macros may be defined to indicate what auxillary information

+ * must be interpolated across the triangle:

+ *    INTERP_Z        - if defined, interpolate integer Z values

+ *    INTERP_RGB      - if defined, interpolate integer RGB values

+ *    INTERP_ALPHA    - if defined, interpolate integer Alpha values

+ *    INTERP_INT_TEX  - if defined, interpolate integer ST texcoords

+ *                         (fast, simple 2-D texture mapping, without

+ *                         perspective correction)

+ *    INTERP_ATTRIBS  - if defined, interpolate arbitrary attribs (texcoords,

+ *                         varying vars, etc)  This also causes W to be

+ *                         computed for perspective correction).

+ *

+ * When one can directly address pixels in the color buffer the following

+ * macros can be defined and used to compute pixel addresses during

+ * rasterization (see pRow):

+ *    PIXEL_TYPE          - the datatype of a pixel (GLubyte, GLushort, GLuint)

+ *    BYTES_PER_ROW       - number of bytes per row in the color buffer

+ *    PIXEL_ADDRESS(X,Y)  - returns the address of pixel at (X,Y) where

+ *                          Y==0 at bottom of screen and increases upward.

+ *

+ * Similarly, for direct depth buffer access, this type is used for depth

+ * buffer addressing (see zRow):

+ *    DEPTH_TYPE          - either GLushort or GLuint

+ *

+ * Optionally, one may provide one-time setup code per triangle:

+ *    SETUP_CODE    - code which is to be executed once per triangle

+ *

+ * The following macro MUST be defined:

+ *    RENDER_SPAN(span) - code to write a span of pixels.

+ *

+ * This code was designed for the origin to be in the lower-left corner.

+ *

+ * Inspired by triangle rasterizer code written by Allen Akin.  Thanks Allen!

+ *

+ *

+ * Some notes on rasterization accuracy:

+ *

+ * This code uses fixed point arithmetic (the GLfixed type) to iterate

+ * over the triangle edges and interpolate ancillary data (such as Z,

+ * color, secondary color, etc).  The number of fractional bits in

+ * GLfixed and the value of SUB_PIXEL_BITS has a direct bearing on the

+ * accuracy of rasterization.

+ *

+ * If SUB_PIXEL_BITS=4 then we'll snap the vertices to the nearest

+ * 1/16 of a pixel.  If we're walking up a long, nearly vertical edge

+ * (dx=1/16, dy=1024) we'll need 4 + 10 = 14 fractional bits in

+ * GLfixed to walk the edge without error.  If the maximum viewport

+ * height is 4K pixels, then we'll need 4 + 12 = 16 fractional bits.

+ *

+ * Historically, Mesa has used 11 fractional bits in GLfixed, snaps

+ * vertices to 1/16 pixel and allowed a maximum viewport height of 2K

+ * pixels.  11 fractional bits is actually insufficient for accurately

+ * rasterizing some triangles.  More recently, the maximum viewport

+ * height was increased to 4K pixels.  Thus, Mesa should be using 16

+ * fractional bits in GLfixed.  Unfortunately, there may be some issues

+ * with setting FIXED_FRAC_BITS=16, such as multiplication overflow.

+ * This will have to be examined in some detail...

+ *

+ * For now, if you find rasterization errors, particularly with tall,

+ * sliver triangles, try increasing FIXED_FRAC_BITS and/or decreasing

+ * SUB_PIXEL_BITS.

+ */

+

+

+/*

+ * Some code we unfortunately need to prevent negative interpolated colors.

+ */

+#ifndef CLAMP_INTERPOLANT

+#define CLAMP_INTERPOLANT(CHANNEL, CHANNELSTEP, LEN)		\

+do {								\

+   GLfixed endVal = span.CHANNEL + (LEN) * span.CHANNELSTEP;	\

+   if (endVal < 0) {						\

+      span.CHANNEL -= endVal;					\

+   }								\

+   if (span.CHANNEL < 0) {					\

+      span.CHANNEL = 0;						\

+   }								\

+} while (0)

+#endif

+

+

+static void NAME(struct gl_context *ctx, const SWvertex *v0,

+                                 const SWvertex *v1,

+                                 const SWvertex *v2 )

+{

+   typedef struct {

+      const SWvertex *v0, *v1;   /* Y(v0) < Y(v1) */

+      GLfloat dx;	/* X(v1) - X(v0) */

+      GLfloat dy;	/* Y(v1) - Y(v0) */

+      GLfloat dxdy;	/* dx/dy */

+      GLfixed fdxdy;	/* dx/dy in fixed-point */

+      GLfloat adjy;	/* adjust from v[0]->fy to fsy, scaled */

+      GLfixed fsx;	/* first sample point x coord */

+      GLfixed fsy;

+      GLfixed fx0;	/* fixed pt X of lower endpoint */

+      GLint lines;	/* number of lines to be sampled on this edge */

+   } EdgeT;

+

+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);

+#ifdef INTERP_Z

+   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;

+   const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;

+   const GLfloat maxDepth = ctx->DrawBuffer->_DepthMaxF;

+#define FixedToDepth(F)  ((F) >> fixedToDepthShift)

+#endif

+   EdgeT eMaj, eTop, eBot;

+   GLfloat oneOverArea;

+   const SWvertex *vMin, *vMid, *vMax;  /* Y(vMin)<=Y(vMid)<=Y(vMax) */

+   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceSign;

+   const GLint snapMask = ~((FIXED_ONE / (1 << SUB_PIXEL_BITS)) - 1); /* for x/y coord snapping */

+   GLfixed vMin_fx, vMin_fy, vMid_fx, vMid_fy, vMax_fx, vMax_fy;

+

+   SWspan span;

+

+   (void) swrast;

+

+   INIT_SPAN(span, GL_POLYGON);

+   span.y = 0; /* silence warnings */

+

+#ifdef INTERP_Z

+   (void) fixedToDepthShift;

+#endif

+

+   /*

+   printf("%s()\n", __FUNCTION__);

+   printf("  %g, %g, %g\n",

+          v0->attrib[FRAG_ATTRIB_WPOS][0],

+          v0->attrib[FRAG_ATTRIB_WPOS][1],

+          v0->attrib[FRAG_ATTRIB_WPOS][2]);

+   printf("  %g, %g, %g\n",

+          v1->attrib[FRAG_ATTRIB_WPOS][0],

+          v1->attrib[FRAG_ATTRIB_WPOS][1],

+          v1->attrib[FRAG_ATTRIB_WPOS][2]);

+   printf("  %g, %g, %g\n",

+          v2->attrib[FRAG_ATTRIB_WPOS][0],

+          v2->attrib[FRAG_ATTRIB_WPOS][1],

+          v2->attrib[FRAG_ATTRIB_WPOS][2]);

+   */

+

+   /* Compute fixed point x,y coords w/ half-pixel offsets and snapping.

+    * And find the order of the 3 vertices along the Y axis.

+    */

+   {

+      const GLfixed fy0 = FloatToFixed(v0->attrib[FRAG_ATTRIB_WPOS][1] - 0.5F) & snapMask;

+      const GLfixed fy1 = FloatToFixed(v1->attrib[FRAG_ATTRIB_WPOS][1] - 0.5F) & snapMask;

+      const GLfixed fy2 = FloatToFixed(v2->attrib[FRAG_ATTRIB_WPOS][1] - 0.5F) & snapMask;

+      if (fy0 <= fy1) {

+         if (fy1 <= fy2) {

+            /* y0 <= y1 <= y2 */

+            vMin = v0;   vMid = v1;   vMax = v2;

+            vMin_fy = fy0;  vMid_fy = fy1;  vMax_fy = fy2;

+         }

+         else if (fy2 <= fy0) {

+            /* y2 <= y0 <= y1 */

+            vMin = v2;   vMid = v0;   vMax = v1;

+            vMin_fy = fy2;  vMid_fy = fy0;  vMax_fy = fy1;

+         }

+         else {

+            /* y0 <= y2 <= y1 */

+            vMin = v0;   vMid = v2;   vMax = v1;

+            vMin_fy = fy0;  vMid_fy = fy2;  vMax_fy = fy1;

+            bf = -bf;

+         }

+      }

+      else {

+         if (fy0 <= fy2) {

+            /* y1 <= y0 <= y2 */

+            vMin = v1;   vMid = v0;   vMax = v2;

+            vMin_fy = fy1;  vMid_fy = fy0;  vMax_fy = fy2;

+            bf = -bf;

+         }

+         else if (fy2 <= fy1) {

+            /* y2 <= y1 <= y0 */

+            vMin = v2;   vMid = v1;   vMax = v0;

+            vMin_fy = fy2;  vMid_fy = fy1;  vMax_fy = fy0;

+            bf = -bf;

+         }

+         else {

+            /* y1 <= y2 <= y0 */

+            vMin = v1;   vMid = v2;   vMax = v0;

+            vMin_fy = fy1;  vMid_fy = fy2;  vMax_fy = fy0;

+         }

+      }

+

+      /* fixed point X coords */

+      vMin_fx = FloatToFixed(vMin->attrib[FRAG_ATTRIB_WPOS][0] + 0.5F) & snapMask;

+      vMid_fx = FloatToFixed(vMid->attrib[FRAG_ATTRIB_WPOS][0] + 0.5F) & snapMask;

+      vMax_fx = FloatToFixed(vMax->attrib[FRAG_ATTRIB_WPOS][0] + 0.5F) & snapMask;

+   }

+

+   /* vertex/edge relationship */

+   eMaj.v0 = vMin;   eMaj.v1 = vMax;   /*TODO: .v1's not needed */

+   eTop.v0 = vMid;   eTop.v1 = vMax;

+   eBot.v0 = vMin;   eBot.v1 = vMid;

+

+   /* compute deltas for each edge:  vertex[upper] - vertex[lower] */

+   eMaj.dx = FixedToFloat(vMax_fx - vMin_fx);

+   eMaj.dy = FixedToFloat(vMax_fy - vMin_fy);

+   eTop.dx = FixedToFloat(vMax_fx - vMid_fx);

+   eTop.dy = FixedToFloat(vMax_fy - vMid_fy);

+   eBot.dx = FixedToFloat(vMid_fx - vMin_fx);

+   eBot.dy = FixedToFloat(vMid_fy - vMin_fy);

+

+   /* compute area, oneOverArea and perform backface culling */

+   {

+      const GLfloat area = eMaj.dx * eBot.dy - eBot.dx * eMaj.dy;

+

+      if (IS_INF_OR_NAN(area) || area == 0.0F)

+         return;

+

+      if (area * bf * swrast->_BackfaceCullSign < 0.0)

+         return;

+

+      oneOverArea = 1.0F / area;

+

+      /* 0 = front, 1 = back */

+      span.facing = oneOverArea * bf > 0.0F;

+   }

+

+   /* Edge setup.  For a triangle strip these could be reused... */

+   {

+      eMaj.fsy = FixedCeil(vMin_fy);

+      eMaj.lines = FixedToInt(FixedCeil(vMax_fy - eMaj.fsy));

+      if (eMaj.lines > 0) {

+         eMaj.dxdy = eMaj.dx / eMaj.dy;

+         eMaj.fdxdy = SignedFloatToFixed(eMaj.dxdy);

+         eMaj.adjy = (GLfloat) (eMaj.fsy - vMin_fy);  /* SCALED! */

+         eMaj.fx0 = vMin_fx;

+         eMaj.fsx = eMaj.fx0 + (GLfixed) (eMaj.adjy * eMaj.dxdy);

+      }

+      else {

+         return;  /*CULLED*/

+      }

+

+      eTop.fsy = FixedCeil(vMid_fy);

+      eTop.lines = FixedToInt(FixedCeil(vMax_fy - eTop.fsy));

+      if (eTop.lines > 0) {

+         eTop.dxdy = eTop.dx / eTop.dy;

+         eTop.fdxdy = SignedFloatToFixed(eTop.dxdy);

+         eTop.adjy = (GLfloat) (eTop.fsy - vMid_fy); /* SCALED! */

+         eTop.fx0 = vMid_fx;

+         eTop.fsx = eTop.fx0 + (GLfixed) (eTop.adjy * eTop.dxdy);

+      }

+

+      eBot.fsy = FixedCeil(vMin_fy);

+      eBot.lines = FixedToInt(FixedCeil(vMid_fy - eBot.fsy));

+      if (eBot.lines > 0) {

+         eBot.dxdy = eBot.dx / eBot.dy;

+         eBot.fdxdy = SignedFloatToFixed(eBot.dxdy);

+         eBot.adjy = (GLfloat) (eBot.fsy - vMin_fy);  /* SCALED! */

+         eBot.fx0 = vMin_fx;

+         eBot.fsx = eBot.fx0 + (GLfixed) (eBot.adjy * eBot.dxdy);

+      }

+   }

+

+   /*

+    * Conceptually, we view a triangle as two subtriangles

+    * separated by a perfectly horizontal line.  The edge that is

+    * intersected by this line is one with maximal absolute dy; we

+    * call it a ``major'' edge.  The other two edges are the

+    * ``top'' edge (for the upper subtriangle) and the ``bottom''

+    * edge (for the lower subtriangle).  If either of these two

+    * edges is horizontal or very close to horizontal, the

+    * corresponding subtriangle might cover zero sample points;

+    * we take care to handle such cases, for performance as well

+    * as correctness.

+    *

+    * By stepping rasterization parameters along the major edge,

+    * we can avoid recomputing them at the discontinuity where

+    * the top and bottom edges meet.  However, this forces us to

+    * be able to scan both left-to-right and right-to-left.

+    * Also, we must determine whether the major edge is at the

+    * left or right side of the triangle.  We do this by

+    * computing the magnitude of the cross-product of the major

+    * and top edges.  Since this magnitude depends on the sine of

+    * the angle between the two edges, its sign tells us whether

+    * we turn to the left or to the right when travelling along

+    * the major edge to the top edge, and from this we infer

+    * whether the major edge is on the left or the right.

+    *

+    * Serendipitously, this cross-product magnitude is also a

+    * value we need to compute the iteration parameter

+    * derivatives for the triangle, and it can be used to perform

+    * backface culling because its sign tells us whether the

+    * triangle is clockwise or counterclockwise.  In this code we

+    * refer to it as ``area'' because it's also proportional to

+    * the pixel area of the triangle.

+    */

+

+   {

+      GLint scan_from_left_to_right;  /* true if scanning left-to-right */

+

+      /*

+       * Execute user-supplied setup code

+       */

+#ifdef SETUP_CODE

+      SETUP_CODE

+#endif

+

+      scan_from_left_to_right = (oneOverArea < 0.0F);

+

+

+      /* compute d?/dx and d?/dy derivatives */

+#ifdef INTERP_Z

+      span.interpMask |= SPAN_Z;

+      {

+         GLfloat eMaj_dz = vMax->attrib[FRAG_ATTRIB_WPOS][2] - vMin->attrib[FRAG_ATTRIB_WPOS][2];

+         GLfloat eBot_dz = vMid->attrib[FRAG_ATTRIB_WPOS][2] - vMin->attrib[FRAG_ATTRIB_WPOS][2];

+         span.attrStepX[FRAG_ATTRIB_WPOS][2] = oneOverArea * (eMaj_dz * eBot.dy - eMaj.dy * eBot_dz);

+         if (span.attrStepX[FRAG_ATTRIB_WPOS][2] > maxDepth ||

+             span.attrStepX[FRAG_ATTRIB_WPOS][2] < -maxDepth) {

+            /* probably a sliver triangle */

+            span.attrStepX[FRAG_ATTRIB_WPOS][2] = 0.0;

+            span.attrStepY[FRAG_ATTRIB_WPOS][2] = 0.0;

+         }

+         else {

+            span.attrStepY[FRAG_ATTRIB_WPOS][2] = oneOverArea * (eMaj.dx * eBot_dz - eMaj_dz * eBot.dx);

+         }

+         if (depthBits <= 16)

+            span.zStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_WPOS][2]);

+         else

+            span.zStep = (GLint) span.attrStepX[FRAG_ATTRIB_WPOS][2];

+      }

+#endif

+#ifdef INTERP_RGB

+      span.interpMask |= SPAN_RGBA;

+      if (ctx->Light.ShadeModel == GL_SMOOTH) {

+         GLfloat eMaj_dr = (GLfloat) (vMax->color[RCOMP] - vMin->color[RCOMP]);

+         GLfloat eBot_dr = (GLfloat) (vMid->color[RCOMP] - vMin->color[RCOMP]);

+         GLfloat eMaj_dg = (GLfloat) (vMax->color[GCOMP] - vMin->color[GCOMP]);

+         GLfloat eBot_dg = (GLfloat) (vMid->color[GCOMP] - vMin->color[GCOMP]);

+         GLfloat eMaj_db = (GLfloat) (vMax->color[BCOMP] - vMin->color[BCOMP]);

+         GLfloat eBot_db = (GLfloat) (vMid->color[BCOMP] - vMin->color[BCOMP]);

+#  ifdef INTERP_ALPHA

+         GLfloat eMaj_da = (GLfloat) (vMax->color[ACOMP] - vMin->color[ACOMP]);

+         GLfloat eBot_da = (GLfloat) (vMid->color[ACOMP] - vMin->color[ACOMP]);

+#  endif

+         span.attrStepX[FRAG_ATTRIB_COL0][0] = oneOverArea * (eMaj_dr * eBot.dy - eMaj.dy * eBot_dr);

+         span.attrStepY[FRAG_ATTRIB_COL0][0] = oneOverArea * (eMaj.dx * eBot_dr - eMaj_dr * eBot.dx);

+         span.attrStepX[FRAG_ATTRIB_COL0][1] = oneOverArea * (eMaj_dg * eBot.dy - eMaj.dy * eBot_dg);

+         span.attrStepY[FRAG_ATTRIB_COL0][1] = oneOverArea * (eMaj.dx * eBot_dg - eMaj_dg * eBot.dx);

+         span.attrStepX[FRAG_ATTRIB_COL0][2] = oneOverArea * (eMaj_db * eBot.dy - eMaj.dy * eBot_db);

+         span.attrStepY[FRAG_ATTRIB_COL0][2] = oneOverArea * (eMaj.dx * eBot_db - eMaj_db * eBot.dx);

+         span.redStep   = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][0]);

+         span.greenStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][1]);

+         span.blueStep  = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][2]);

+#  ifdef INTERP_ALPHA

+         span.attrStepX[FRAG_ATTRIB_COL0][3] = oneOverArea * (eMaj_da * eBot.dy - eMaj.dy * eBot_da);

+         span.attrStepY[FRAG_ATTRIB_COL0][3] = oneOverArea * (eMaj.dx * eBot_da - eMaj_da * eBot.dx);

+         span.alphaStep = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_COL0][3]);

+#  endif /* INTERP_ALPHA */

+      }

+      else {

+         ASSERT(ctx->Light.ShadeModel == GL_FLAT);

+         span.interpMask |= SPAN_FLAT;

+         span.attrStepX[FRAG_ATTRIB_COL0][0] = span.attrStepY[FRAG_ATTRIB_COL0][0] = 0.0F;

+         span.attrStepX[FRAG_ATTRIB_COL0][1] = span.attrStepY[FRAG_ATTRIB_COL0][1] = 0.0F;

+         span.attrStepX[FRAG_ATTRIB_COL0][2] = span.attrStepY[FRAG_ATTRIB_COL0][2] = 0.0F;

+	 span.redStep   = 0;

+	 span.greenStep = 0;

+	 span.blueStep  = 0;

+#  ifdef INTERP_ALPHA

+         span.attrStepX[FRAG_ATTRIB_COL0][3] = span.attrStepY[FRAG_ATTRIB_COL0][3] = 0.0F;

+	 span.alphaStep = 0;

+#  endif

+      }

+#endif /* INTERP_RGB */

+#ifdef INTERP_INT_TEX

+      {

+         GLfloat eMaj_ds = (vMax->attrib[FRAG_ATTRIB_TEX0][0] - vMin->attrib[FRAG_ATTRIB_TEX0][0]) * S_SCALE;

+         GLfloat eBot_ds = (vMid->attrib[FRAG_ATTRIB_TEX0][0] - vMin->attrib[FRAG_ATTRIB_TEX0][0]) * S_SCALE;

+         GLfloat eMaj_dt = (vMax->attrib[FRAG_ATTRIB_TEX0][1] - vMin->attrib[FRAG_ATTRIB_TEX0][1]) * T_SCALE;

+         GLfloat eBot_dt = (vMid->attrib[FRAG_ATTRIB_TEX0][1] - vMin->attrib[FRAG_ATTRIB_TEX0][1]) * T_SCALE;

+         span.attrStepX[FRAG_ATTRIB_TEX0][0] = oneOverArea * (eMaj_ds * eBot.dy - eMaj.dy * eBot_ds);

+         span.attrStepY[FRAG_ATTRIB_TEX0][0] = oneOverArea * (eMaj.dx * eBot_ds - eMaj_ds * eBot.dx);

+         span.attrStepX[FRAG_ATTRIB_TEX0][1] = oneOverArea * (eMaj_dt * eBot.dy - eMaj.dy * eBot_dt);

+         span.attrStepY[FRAG_ATTRIB_TEX0][1] = oneOverArea * (eMaj.dx * eBot_dt - eMaj_dt * eBot.dx);

+         span.intTexStep[0] = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_TEX0][0]);

+         span.intTexStep[1] = SignedFloatToFixed(span.attrStepX[FRAG_ATTRIB_TEX0][1]);

+      }

+#endif

+#ifdef INTERP_ATTRIBS

+      {

+         /* attrib[FRAG_ATTRIB_WPOS][3] is 1/W */

+         const GLfloat wMax = vMax->attrib[FRAG_ATTRIB_WPOS][3];

+         const GLfloat wMin = vMin->attrib[FRAG_ATTRIB_WPOS][3];

+         const GLfloat wMid = vMid->attrib[FRAG_ATTRIB_WPOS][3];

+         {

+            const GLfloat eMaj_dw = wMax - wMin;

+            const GLfloat eBot_dw = wMid - wMin;

+            span.attrStepX[FRAG_ATTRIB_WPOS][3] = oneOverArea * (eMaj_dw * eBot.dy - eMaj.dy * eBot_dw);

+            span.attrStepY[FRAG_ATTRIB_WPOS][3] = oneOverArea * (eMaj.dx * eBot_dw - eMaj_dw * eBot.dx);

+         }

+         ATTRIB_LOOP_BEGIN

+            if (swrast->_InterpMode[attr] == GL_FLAT) {

+               ASSIGN_4V(span.attrStepX[attr], 0.0, 0.0, 0.0, 0.0);

+               ASSIGN_4V(span.attrStepY[attr], 0.0, 0.0, 0.0, 0.0);

+            }

+            else {

+               GLuint c;

+               for (c = 0; c < 4; c++) {

+                  GLfloat eMaj_da = vMax->attrib[attr][c] * wMax - vMin->attrib[attr][c] * wMin;

+                  GLfloat eBot_da = vMid->attrib[attr][c] * wMid - vMin->attrib[attr][c] * wMin;

+                  span.attrStepX[attr][c] = oneOverArea * (eMaj_da * eBot.dy - eMaj.dy * eBot_da);

+                  span.attrStepY[attr][c] = oneOverArea * (eMaj.dx * eBot_da - eMaj_da * eBot.dx);

+               }

+            }

+         ATTRIB_LOOP_END

+      }

+#endif

+

+      /*

+       * We always sample at pixel centers.  However, we avoid

+       * explicit half-pixel offsets in this code by incorporating

+       * the proper offset in each of x and y during the

+       * transformation to window coordinates.

+       *

+       * We also apply the usual rasterization rules to prevent

+       * cracks and overlaps.  A pixel is considered inside a

+       * subtriangle if it meets all of four conditions: it is on or

+       * to the right of the left edge, strictly to the left of the

+       * right edge, on or below the top edge, and strictly above

+       * the bottom edge.  (Some edges may be degenerate.)

+       *

+       * The following discussion assumes left-to-right scanning

+       * (that is, the major edge is on the left); the right-to-left

+       * case is a straightforward variation.

+       *

+       * We start by finding the half-integral y coordinate that is

+       * at or below the top of the triangle.  This gives us the

+       * first scan line that could possibly contain pixels that are

+       * inside the triangle.

+       *

+       * Next we creep down the major edge until we reach that y,

+       * and compute the corresponding x coordinate on the edge.

+       * Then we find the half-integral x that lies on or just

+       * inside the edge.  This is the first pixel that might lie in

+       * the interior of the triangle.  (We won't know for sure

+       * until we check the other edges.)

+       *

+       * As we rasterize the triangle, we'll step down the major

+       * edge.  For each step in y, we'll move an integer number

+       * of steps in x.  There are two possible x step sizes, which

+       * we'll call the ``inner'' step (guaranteed to land on the

+       * edge or inside it) and the ``outer'' step (guaranteed to

+       * land on the edge or outside it).  The inner and outer steps

+       * differ by one.  During rasterization we maintain an error

+       * term that indicates our distance from the true edge, and

+       * select either the inner step or the outer step, whichever

+       * gets us to the first pixel that falls inside the triangle.

+       *

+       * All parameters (z, red, etc.) as well as the buffer

+       * addresses for color and z have inner and outer step values,

+       * so that we can increment them appropriately.  This method

+       * eliminates the need to adjust parameters by creeping a

+       * sub-pixel amount into the triangle at each scanline.

+       */

+

+      {

+         GLint subTriangle;

+         GLfixed fxLeftEdge = 0, fxRightEdge = 0;

+         GLfixed fdxLeftEdge = 0, fdxRightEdge = 0;

+         GLfixed fError = 0, fdError = 0;

+#ifdef PIXEL_ADDRESS

+         PIXEL_TYPE *pRow = NULL;

+         GLint dPRowOuter = 0, dPRowInner;  /* offset in bytes */

+#endif

+#ifdef INTERP_Z

+#  ifdef DEPTH_TYPE

+         struct gl_renderbuffer *zrb

+            = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;

+         DEPTH_TYPE *zRow = NULL;

+         GLint dZRowOuter = 0, dZRowInner;  /* offset in bytes */

+#  endif

+         GLuint zLeft = 0;

+         GLfixed fdzOuter = 0, fdzInner;

+#endif

+#ifdef INTERP_RGB

+         GLint rLeft = 0, fdrOuter = 0, fdrInner;

+         GLint gLeft = 0, fdgOuter = 0, fdgInner;

+         GLint bLeft = 0, fdbOuter = 0, fdbInner;

+#endif

+#ifdef INTERP_ALPHA

+         GLint aLeft = 0, fdaOuter = 0, fdaInner;

+#endif

+#ifdef INTERP_INT_TEX

+         GLfixed sLeft=0, dsOuter=0, dsInner;

+         GLfixed tLeft=0, dtOuter=0, dtInner;

+#endif

+#ifdef INTERP_ATTRIBS

+         GLfloat wLeft = 0, dwOuter = 0, dwInner;

+         GLfloat attrLeft[FRAG_ATTRIB_MAX][4];

+         GLfloat daOuter[FRAG_ATTRIB_MAX][4], daInner[FRAG_ATTRIB_MAX][4];

+#endif

+

+         for (subTriangle=0; subTriangle<=1; subTriangle++) {

+            EdgeT *eLeft, *eRight;

+            int setupLeft, setupRight;

+            int lines;

+

+            if (subTriangle==0) {

+               /* bottom half */

+               if (scan_from_left_to_right) {

+                  eLeft = &eMaj;

+                  eRight = &eBot;

+                  lines = eRight->lines;

+                  setupLeft = 1;

+                  setupRight = 1;

+               }

+               else {

+                  eLeft = &eBot;

+                  eRight = &eMaj;

+                  lines = eLeft->lines;

+                  setupLeft = 1;

+                  setupRight = 1;

+               }

+            }

+            else {

+               /* top half */

+               if (scan_from_left_to_right) {

+                  eLeft = &eMaj;

+                  eRight = &eTop;

+                  lines = eRight->lines;

+                  setupLeft = 0;

+                  setupRight = 1;

+               }

+               else {

+                  eLeft = &eTop;

+                  eRight = &eMaj;

+                  lines = eLeft->lines;

+                  setupLeft = 1;

+                  setupRight = 0;

+               }

+               if (lines == 0)

+                  return;

+            }

+

+            if (setupLeft && eLeft->lines > 0) {

+               const SWvertex *vLower = eLeft->v0;

+               const GLfixed fsy = eLeft->fsy;

+               const GLfixed fsx = eLeft->fsx;  /* no fractional part */

+               const GLfixed fx = FixedCeil(fsx);  /* no fractional part */

+               const GLfixed adjx = (GLfixed) (fx - eLeft->fx0); /* SCALED! */

+               const GLfixed adjy = (GLfixed) eLeft->adjy;      /* SCALED! */

+               GLint idxOuter;

+               GLfloat dxOuter;

+               GLfixed fdxOuter;

+

+               fError = fx - fsx - FIXED_ONE;

+               fxLeftEdge = fsx - FIXED_EPSILON;

+               fdxLeftEdge = eLeft->fdxdy;

+               fdxOuter = FixedFloor(fdxLeftEdge - FIXED_EPSILON);

+               fdError = fdxOuter - fdxLeftEdge + FIXED_ONE;

+               idxOuter = FixedToInt(fdxOuter);

+               dxOuter = (GLfloat) idxOuter;

+               span.y = FixedToInt(fsy);

+

+               /* silence warnings on some compilers */

+               (void) dxOuter;

+               (void) adjx;

+               (void) adjy;

+               (void) vLower;

+

+#ifdef PIXEL_ADDRESS

+               {

+                  pRow = (PIXEL_TYPE *) PIXEL_ADDRESS(FixedToInt(fxLeftEdge), span.y);

+                  dPRowOuter = -((int)BYTES_PER_ROW) + idxOuter * sizeof(PIXEL_TYPE);

+                  /* negative because Y=0 at bottom and increases upward */

+               }

+#endif

+               /*

+                * Now we need the set of parameter (z, color, etc.) values at

+                * the point (fx, fsy).  This gives us properly-sampled parameter

+                * values that we can step from pixel to pixel.  Furthermore,

+                * although we might have intermediate results that overflow

+                * the normal parameter range when we step temporarily outside

+                * the triangle, we shouldn't overflow or underflow for any

+                * pixel that's actually inside the triangle.

+                */

+

+#ifdef INTERP_Z

+               {

+                  GLfloat z0 = vLower->attrib[FRAG_ATTRIB_WPOS][2];

+                  if (depthBits <= 16) {

+                     /* interpolate fixed-pt values */

+                     GLfloat tmp = (z0 * FIXED_SCALE

+                                    + span.attrStepX[FRAG_ATTRIB_WPOS][2] * adjx

+                                    + span.attrStepY[FRAG_ATTRIB_WPOS][2] * adjy) + FIXED_HALF;

+                     if (tmp < MAX_GLUINT / 2)

+                        zLeft = (GLfixed) tmp;

+                     else

+                        zLeft = MAX_GLUINT / 2;

+                     fdzOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_WPOS][2] +

+                                                   dxOuter * span.attrStepX[FRAG_ATTRIB_WPOS][2]);

+                  }

+                  else {

+                     /* interpolate depth values w/out scaling */

+                     zLeft = (GLuint) (z0 + span.attrStepX[FRAG_ATTRIB_WPOS][2] * FixedToFloat(adjx)

+                                          + span.attrStepY[FRAG_ATTRIB_WPOS][2] * FixedToFloat(adjy));

+                     fdzOuter = (GLint) (span.attrStepY[FRAG_ATTRIB_WPOS][2] +

+                                         dxOuter * span.attrStepX[FRAG_ATTRIB_WPOS][2]);

+                  }

+#  ifdef DEPTH_TYPE

+                  zRow = (DEPTH_TYPE *)

+                    zrb->GetPointer(ctx, zrb, FixedToInt(fxLeftEdge), span.y);

+                  dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);

+#  endif

+               }

+#endif

+#ifdef INTERP_RGB

+               if (ctx->Light.ShadeModel == GL_SMOOTH) {

+                  rLeft = (GLint)(ChanToFixed(vLower->color[RCOMP])

+                                  + span.attrStepX[FRAG_ATTRIB_COL0][0] * adjx

+                                  + span.attrStepY[FRAG_ATTRIB_COL0][0] * adjy) + FIXED_HALF;

+                  gLeft = (GLint)(ChanToFixed(vLower->color[GCOMP])

+                                  + span.attrStepX[FRAG_ATTRIB_COL0][1] * adjx

+                                  + span.attrStepY[FRAG_ATTRIB_COL0][1] * adjy) + FIXED_HALF;

+                  bLeft = (GLint)(ChanToFixed(vLower->color[BCOMP])

+                                  + span.attrStepX[FRAG_ATTRIB_COL0][2] * adjx

+                                  + span.attrStepY[FRAG_ATTRIB_COL0][2] * adjy) + FIXED_HALF;

+                  fdrOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][0]

+                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][0]);

+                  fdgOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][1]

+                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][1]);

+                  fdbOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][2]

+                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][2]);

+#  ifdef INTERP_ALPHA

+                  aLeft = (GLint)(ChanToFixed(vLower->color[ACOMP])

+                                  + span.attrStepX[FRAG_ATTRIB_COL0][3] * adjx

+                                  + span.attrStepY[FRAG_ATTRIB_COL0][3] * adjy) + FIXED_HALF;

+                  fdaOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_COL0][3]

+                                                + dxOuter * span.attrStepX[FRAG_ATTRIB_COL0][3]);

+#  endif

+               }

+               else {

+                  ASSERT(ctx->Light.ShadeModel == GL_FLAT);

+                  rLeft = ChanToFixed(v2->color[RCOMP]);

+                  gLeft = ChanToFixed(v2->color[GCOMP]);

+                  bLeft = ChanToFixed(v2->color[BCOMP]);

+                  fdrOuter = fdgOuter = fdbOuter = 0;

+#  ifdef INTERP_ALPHA

+                  aLeft = ChanToFixed(v2->color[ACOMP]);

+                  fdaOuter = 0;

+#  endif

+               }

+#endif /* INTERP_RGB */

+

+

+#ifdef INTERP_INT_TEX

+               {

+                  GLfloat s0, t0;

+                  s0 = vLower->attrib[FRAG_ATTRIB_TEX0][0] * S_SCALE;

+                  sLeft = (GLfixed)(s0 * FIXED_SCALE + span.attrStepX[FRAG_ATTRIB_TEX0][0] * adjx

+                                 + span.attrStepY[FRAG_ATTRIB_TEX0][0] * adjy) + FIXED_HALF;

+                  dsOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_TEX0][0]

+                                               + dxOuter * span.attrStepX[FRAG_ATTRIB_TEX0][0]);

+

+                  t0 = vLower->attrib[FRAG_ATTRIB_TEX0][1] * T_SCALE;

+                  tLeft = (GLfixed)(t0 * FIXED_SCALE + span.attrStepX[FRAG_ATTRIB_TEX0][1] * adjx

+                                 + span.attrStepY[FRAG_ATTRIB_TEX0][1] * adjy) + FIXED_HALF;

+                  dtOuter = SignedFloatToFixed(span.attrStepY[FRAG_ATTRIB_TEX0][1]

+                                               + dxOuter * span.attrStepX[FRAG_ATTRIB_TEX0][1]);

+               }

+#endif

+#ifdef INTERP_ATTRIBS

+               {

+                  const GLuint attr = FRAG_ATTRIB_WPOS;

+                  wLeft = vLower->attrib[FRAG_ATTRIB_WPOS][3]

+                        + (span.attrStepX[attr][3] * adjx

+                           + span.attrStepY[attr][3] * adjy) * (1.0F/FIXED_SCALE);

+                  dwOuter = span.attrStepY[attr][3] + dxOuter * span.attrStepX[attr][3];

+               }

+               ATTRIB_LOOP_BEGIN

+                  const GLfloat invW = vLower->attrib[FRAG_ATTRIB_WPOS][3];

+                  if (swrast->_InterpMode[attr] == GL_FLAT) {

+                     GLuint c;

+                     for (c = 0; c < 4; c++) {

+                        attrLeft[attr][c] = v2->attrib[attr][c] * invW;

+                        daOuter[attr][c] = 0.0;

+                     }

+                  }

+                  else {

+                     GLuint c;

+                     for (c = 0; c < 4; c++) {

+                        const GLfloat a = vLower->attrib[attr][c] * invW;

+                        attrLeft[attr][c] = a + (  span.attrStepX[attr][c] * adjx

+                                                 + span.attrStepY[attr][c] * adjy) * (1.0F/FIXED_SCALE);

+                        daOuter[attr][c] = span.attrStepY[attr][c] + dxOuter * span.attrStepX[attr][c];

+                     }

+                  }

+               ATTRIB_LOOP_END

+#endif

+            } /*if setupLeft*/

+

+

+            if (setupRight && eRight->lines>0) {

+               fxRightEdge = eRight->fsx - FIXED_EPSILON;

+               fdxRightEdge = eRight->fdxdy;

+            }

+

+            if (lines==0) {

+               continue;

+            }

+

+

+            /* Rasterize setup */

+#ifdef PIXEL_ADDRESS

+            dPRowInner = dPRowOuter + sizeof(PIXEL_TYPE);

+#endif

+#ifdef INTERP_Z

+#  ifdef DEPTH_TYPE

+            dZRowInner = dZRowOuter + sizeof(DEPTH_TYPE);

+#  endif

+            fdzInner = fdzOuter + span.zStep;

+#endif

+#ifdef INTERP_RGB

+            fdrInner = fdrOuter + span.redStep;

+            fdgInner = fdgOuter + span.greenStep;

+            fdbInner = fdbOuter + span.blueStep;

+#endif

+#ifdef INTERP_ALPHA

+            fdaInner = fdaOuter + span.alphaStep;

+#endif

+#ifdef INTERP_INT_TEX

+            dsInner = dsOuter + span.intTexStep[0];

+            dtInner = dtOuter + span.intTexStep[1];

+#endif

+#ifdef INTERP_ATTRIBS

+            dwInner = dwOuter + span.attrStepX[FRAG_ATTRIB_WPOS][3];

+            ATTRIB_LOOP_BEGIN

+               GLuint c;

+               for (c = 0; c < 4; c++) {

+                  daInner[attr][c] = daOuter[attr][c] + span.attrStepX[attr][c];

+               }

+            ATTRIB_LOOP_END

+#endif

+

+            while (lines > 0) {

+               /* initialize the span interpolants to the leftmost value */

+               /* ff = fixed-pt fragment */

+               const GLint right = FixedToInt(fxRightEdge);

+               span.x = FixedToInt(fxLeftEdge);

+               if (right <= span.x)

+                  span.end = 0;

+               else

+                  span.end = right - span.x;

+

+#ifdef INTERP_Z

+               span.z = zLeft;

+#endif

+#ifdef INTERP_RGB

+               span.red = rLeft;

+               span.green = gLeft;

+               span.blue = bLeft;

+#endif

+#ifdef INTERP_ALPHA

+               span.alpha = aLeft;

+#endif

+#ifdef INTERP_INT_TEX

+               span.intTex[0] = sLeft;

+               span.intTex[1] = tLeft;

+#endif

+

+#ifdef INTERP_ATTRIBS

+               span.attrStart[FRAG_ATTRIB_WPOS][3] = wLeft;

+               ATTRIB_LOOP_BEGIN

+                  GLuint c;

+                  for (c = 0; c < 4; c++) {

+                     span.attrStart[attr][c] = attrLeft[attr][c];

+                  }

+               ATTRIB_LOOP_END

+#endif

+

+               /* This is where we actually generate fragments */

+               /* XXX the test for span.y > 0 _shouldn't_ be needed but

+                * it fixes a problem on 64-bit Opterons (bug 4842).

+                */

+               if (span.end > 0 && span.y >= 0) {

+                  const GLint len = span.end - 1;

+                  (void) len;

+#ifdef INTERP_RGB

+                  CLAMP_INTERPOLANT(red, redStep, len);

+                  CLAMP_INTERPOLANT(green, greenStep, len);

+                  CLAMP_INTERPOLANT(blue, blueStep, len);

+#endif

+#ifdef INTERP_ALPHA

+                  CLAMP_INTERPOLANT(alpha, alphaStep, len);

+#endif

+                  {

+                     RENDER_SPAN( span );

+                  }

+               }

+

+               /*

+                * Advance to the next scan line.  Compute the

+                * new edge coordinates, and adjust the

+                * pixel-center x coordinate so that it stays

+                * on or inside the major edge.

+                */

+               span.y++;

+               lines--;

+

+               fxLeftEdge += fdxLeftEdge;

+               fxRightEdge += fdxRightEdge;

+

+               fError += fdError;

+               if (fError >= 0) {

+                  fError -= FIXED_ONE;

+

+#ifdef PIXEL_ADDRESS

+                  pRow = (PIXEL_TYPE *) ((GLubyte *) pRow + dPRowOuter);

+#endif

+#ifdef INTERP_Z

+#  ifdef DEPTH_TYPE

+                  zRow = (DEPTH_TYPE *) ((GLubyte *) zRow + dZRowOuter);

+#  endif

+                  zLeft += fdzOuter;

+#endif

+#ifdef INTERP_RGB

+                  rLeft += fdrOuter;

+                  gLeft += fdgOuter;

+                  bLeft += fdbOuter;

+#endif

+#ifdef INTERP_ALPHA

+                  aLeft += fdaOuter;

+#endif

+#ifdef INTERP_INT_TEX

+                  sLeft += dsOuter;

+                  tLeft += dtOuter;

+#endif

+#ifdef INTERP_ATTRIBS

+                  wLeft += dwOuter;

+                  ATTRIB_LOOP_BEGIN

+                     GLuint c;

+                     for (c = 0; c < 4; c++) {

+                        attrLeft[attr][c] += daOuter[attr][c];

+                     }

+                  ATTRIB_LOOP_END

+#endif

+               }

+               else {

+#ifdef PIXEL_ADDRESS

+                  pRow = (PIXEL_TYPE *) ((GLubyte *) pRow + dPRowInner);

+#endif

+#ifdef INTERP_Z

+#  ifdef DEPTH_TYPE

+                  zRow = (DEPTH_TYPE *) ((GLubyte *) zRow + dZRowInner);

+#  endif

+                  zLeft += fdzInner;

+#endif

+#ifdef INTERP_RGB

+                  rLeft += fdrInner;

+                  gLeft += fdgInner;

+                  bLeft += fdbInner;

+#endif

+#ifdef INTERP_ALPHA

+                  aLeft += fdaInner;

+#endif

+#ifdef INTERP_INT_TEX

+                  sLeft += dsInner;

+                  tLeft += dtInner;

+#endif

+#ifdef INTERP_ATTRIBS

+                  wLeft += dwInner;

+                  ATTRIB_LOOP_BEGIN

+                     GLuint c;

+                     for (c = 0; c < 4; c++) {

+                        attrLeft[attr][c] += daInner[attr][c];

+                     }

+                  ATTRIB_LOOP_END

+#endif

+               }

+            } /*while lines>0*/

+

+         } /* for subTriangle */

+

+      }

+   }

+}

+

+#undef SETUP_CODE

+#undef RENDER_SPAN

+

+#undef PIXEL_TYPE

+#undef BYTES_PER_ROW

+#undef PIXEL_ADDRESS

+#undef DEPTH_TYPE

+

+#undef INTERP_Z

+#undef INTERP_RGB

+#undef INTERP_ALPHA

+#undef INTERP_INT_TEX

+#undef INTERP_ATTRIBS

+

+#undef S_SCALE

+#undef T_SCALE

+

+#undef FixedToDepth

+

+#undef NAME

diff --git a/mesalib/src/mesa/swrast/s_zoom.c b/mesalib/src/mesa/swrast/s_zoom.c
index f224627d5..3b99bf754 100644
--- a/mesalib/src/mesa/swrast/s_zoom.c
+++ b/mesalib/src/mesa/swrast/s_zoom.c
@@ -1,433 +1,433 @@
-/*
- * 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 "main/glheader.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/colormac.h"
-
-#include "s_context.h"
-#include "s_span.h"
-#include "s_stencil.h"
-#include "s_zoom.h"
-
-
-/**
- * Compute the bounds of the region resulting from zooming a pixel span.
- * The resulting region will be entirely inside the window/scissor bounds
- * so no additional clipping is needed.
- * \param imageX, imageY  position of the mage being drawn (gl WindowPos)
- * \param spanX, spanY  position of span being drawing
- * \param width  number of pixels in span
- * \param x0, x1  returned X bounds of zoomed region [x0, x1)
- * \param y0, y1  returned Y bounds of zoomed region [y0, y1)
- * \return GL_TRUE if any zoomed pixels visible, GL_FALSE if totally clipped
- */
-static GLboolean
-compute_zoomed_bounds(GLcontext *ctx, GLint imageX, GLint imageY,
-                      GLint spanX, GLint spanY, GLint width,
-                      GLint *x0, GLint *x1, GLint *y0, GLint *y1)
-{
-   const struct gl_framebuffer *fb = ctx->DrawBuffer;
-   GLint c0, c1, r0, r1;
-
-   ASSERT(spanX >= imageX);
-   ASSERT(spanY >= imageY);
-
-   /*
-    * Compute destination columns: [c0, c1)
-    */
-   c0 = imageX + (GLint) ((spanX - imageX) * ctx->Pixel.ZoomX);
-   c1 = imageX + (GLint) ((spanX + width - imageX) * ctx->Pixel.ZoomX);
-   if (c1 < c0) {
-      /* swap */
-      GLint tmp = c1;
-      c1 = c0;
-      c0 = tmp;
-   }
-   c0 = CLAMP(c0, fb->_Xmin, fb->_Xmax);
-   c1 = CLAMP(c1, fb->_Xmin, fb->_Xmax);
-   if (c0 == c1) {
-      return GL_FALSE; /* no width */
-   }
-
-   /*
-    * Compute destination rows: [r0, r1)
-    */
-   r0 = imageY + (GLint) ((spanY - imageY) * ctx->Pixel.ZoomY);
-   r1 = imageY + (GLint) ((spanY + 1 - imageY) * ctx->Pixel.ZoomY);
-   if (r1 < r0) {
-      /* swap */
-      GLint tmp = r1;
-      r1 = r0;
-      r0 = tmp;
-   }
-   r0 = CLAMP(r0, fb->_Ymin, fb->_Ymax);
-   r1 = CLAMP(r1, fb->_Ymin, fb->_Ymax);
-   if (r0 == r1) {
-      return GL_FALSE; /* no height */
-   }
-
-   *x0 = c0;
-   *x1 = c1;
-   *y0 = r0;
-   *y1 = r1;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Convert a zoomed x image coordinate back to an unzoomed x coord.
- * 'zx' is screen position of a pixel in the zoomed image, who's left edge
- * is at 'imageX'.
- * return corresponding x coord in the original, unzoomed image.
- * This can use this for unzooming X or Y values.
- */
-static INLINE GLint
-unzoom_x(GLfloat zoomX, GLint imageX, GLint zx)
-{
-   /*
-   zx = imageX + (x - imageX) * zoomX;
-   zx - imageX = (x - imageX) * zoomX;
-   (zx - imageX) / zoomX = x - imageX;
-   */
-   GLint x;
-   if (zoomX < 0.0)
-      zx++;
-   x = imageX + (GLint) ((zx - imageX) / zoomX);
-   return x;
-}
-
-
-
-/**
- * Helper function called from _swrast_write_zoomed_rgba/rgb/
- * index/depth_span().
- */
-static void
-zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const SWspan *span,
-           const GLvoid *src, GLenum format )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   SWspan zoomed;
-   GLint x0, x1, y0, y1;
-   GLint zoomedWidth;
-
-   if (!compute_zoomed_bounds(ctx, imgX, imgY, span->x, span->y, span->end,
-                              &x0, &x1, &y0, &y1)) {
-      return;  /* totally clipped */
-   }
-
-   if (!swrast->ZoomedArrays) {
-      /* allocate on demand */
-      swrast->ZoomedArrays = (SWspanarrays *) CALLOC(sizeof(SWspanarrays));
-      if (!swrast->ZoomedArrays)
-         return;
-   }
-
-   zoomedWidth = x1 - x0;
-   ASSERT(zoomedWidth > 0);
-   ASSERT(zoomedWidth <= MAX_WIDTH);
-
-   /* no pixel arrays! must be horizontal spans. */
-   ASSERT((span->arrayMask & SPAN_XY) == 0);
-   ASSERT(span->primitive == GL_BITMAP);
-
-   INIT_SPAN(zoomed, GL_BITMAP);
-   zoomed.x = x0;
-   zoomed.end = zoomedWidth;
-   zoomed.array = swrast->ZoomedArrays;
-   zoomed.array->ChanType = span->array->ChanType;
-   if (zoomed.array->ChanType == GL_UNSIGNED_BYTE)
-      zoomed.array->rgba = (GLchan (*)[4]) zoomed.array->rgba8;
-   else if (zoomed.array->ChanType == GL_UNSIGNED_SHORT)
-      zoomed.array->rgba = (GLchan (*)[4]) zoomed.array->rgba16;
-   else
-      zoomed.array->rgba = (GLchan (*)[4]) zoomed.array->attribs[FRAG_ATTRIB_COL0];
-
-   COPY_4V(zoomed.attrStart[FRAG_ATTRIB_WPOS], span->attrStart[FRAG_ATTRIB_WPOS]);
-   COPY_4V(zoomed.attrStepX[FRAG_ATTRIB_WPOS], span->attrStepX[FRAG_ATTRIB_WPOS]);
-   COPY_4V(zoomed.attrStepY[FRAG_ATTRIB_WPOS], span->attrStepY[FRAG_ATTRIB_WPOS]);
-
-   zoomed.attrStart[FRAG_ATTRIB_FOGC][0] = span->attrStart[FRAG_ATTRIB_FOGC][0];
-   zoomed.attrStepX[FRAG_ATTRIB_FOGC][0] = span->attrStepX[FRAG_ATTRIB_FOGC][0];
-   zoomed.attrStepY[FRAG_ATTRIB_FOGC][0] = span->attrStepY[FRAG_ATTRIB_FOGC][0];
-
-   if (format == GL_RGBA || format == GL_RGB) {
-      /* copy Z info */
-      zoomed.z = span->z;
-      zoomed.zStep = span->zStep;
-      /* we'll generate an array of colorss */
-      zoomed.interpMask = span->interpMask & ~SPAN_RGBA;
-      zoomed.arrayMask |= SPAN_RGBA;
-      zoomed.arrayAttribs |= FRAG_BIT_COL0;  /* we'll produce these values */
-      ASSERT(span->arrayMask & SPAN_RGBA);
-   }
-   else if (format == GL_DEPTH_COMPONENT) {
-      /* Copy color info */
-      zoomed.red = span->red;
-      zoomed.green = span->green;
-      zoomed.blue = span->blue;
-      zoomed.alpha = span->alpha;
-      zoomed.redStep = span->redStep;
-      zoomed.greenStep = span->greenStep;
-      zoomed.blueStep = span->blueStep;
-      zoomed.alphaStep = span->alphaStep;
-      /* we'll generate an array of depth values */
-      zoomed.interpMask = span->interpMask & ~SPAN_Z;
-      zoomed.arrayMask |= SPAN_Z;
-      ASSERT(span->arrayMask & SPAN_Z);
-   }
-   else {
-      _mesa_problem(ctx, "Bad format in zoom_span");
-      return;
-   }
-
-   /* zoom the span horizontally */
-   if (format == GL_RGBA) {
-      if (zoomed.array->ChanType == GL_UNSIGNED_BYTE) {
-         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) src;
-         GLint i;
-         for (i = 0; i < zoomedWidth; i++) {
-            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-            ASSERT(j >= 0);
-            ASSERT(j < (GLint) span->end);
-            COPY_4UBV(zoomed.array->rgba8[i], rgba[j]);
-         }
-      }
-      else if (zoomed.array->ChanType == GL_UNSIGNED_SHORT) {
-         const GLushort (*rgba)[4] = (const GLushort (*)[4]) src;
-         GLint i;
-         for (i = 0; i < zoomedWidth; i++) {
-            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-            ASSERT(j >= 0);
-            ASSERT(j < (GLint) span->end);
-            COPY_4V(zoomed.array->rgba16[i], rgba[j]);
-         }
-      }
-      else {
-         const GLfloat (*rgba)[4] = (const GLfloat (*)[4]) src;
-         GLint i;
-         for (i = 0; i < zoomedWidth; i++) {
-            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-            ASSERT(j >= 0);
-            ASSERT(j < span->end);
-            COPY_4V(zoomed.array->attribs[FRAG_ATTRIB_COL0][i], rgba[j]);
-         }
-      }
-   }
-   else if (format == GL_RGB) {
-      if (zoomed.array->ChanType == GL_UNSIGNED_BYTE) {
-         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) src;
-         GLint i;
-         for (i = 0; i < zoomedWidth; i++) {
-            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-            ASSERT(j >= 0);
-            ASSERT(j < (GLint) span->end);
-            zoomed.array->rgba8[i][0] = rgb[j][0];
-            zoomed.array->rgba8[i][1] = rgb[j][1];
-            zoomed.array->rgba8[i][2] = rgb[j][2];
-            zoomed.array->rgba8[i][3] = 0xff;
-         }
-      }
-      else if (zoomed.array->ChanType == GL_UNSIGNED_SHORT) {
-         const GLushort (*rgb)[3] = (const GLushort (*)[3]) src;
-         GLint i;
-         for (i = 0; i < zoomedWidth; i++) {
-            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-            ASSERT(j >= 0);
-            ASSERT(j < (GLint) span->end);
-            zoomed.array->rgba16[i][0] = rgb[j][0];
-            zoomed.array->rgba16[i][1] = rgb[j][1];
-            zoomed.array->rgba16[i][2] = rgb[j][2];
-            zoomed.array->rgba16[i][3] = 0xffff;
-         }
-      }
-      else {
-         const GLfloat (*rgb)[3] = (const GLfloat (*)[3]) src;
-         GLint i;
-         for (i = 0; i < zoomedWidth; i++) {
-            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-            ASSERT(j >= 0);
-            ASSERT(j < span->end);
-            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][0] = rgb[j][0];
-            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][1] = rgb[j][1];
-            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][2] = rgb[j][2];
-            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][3] = 1.0F;
-         }
-      }
-   }
-   else if (format == GL_DEPTH_COMPONENT) {
-      const GLuint *zValues = (const GLuint *) src;
-      GLint i;
-      for (i = 0; i < zoomedWidth; i++) {
-         GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;
-         ASSERT(j >= 0);
-         ASSERT(j < (GLint) span->end);
-         zoomed.array->z[i] = zValues[j];
-      }
-      /* Now, fall into the RGB path below */
-      format = GL_RGBA;
-   }
-
-   /* write the span in rows [r0, r1) */
-   if (format == GL_RGBA || format == GL_RGB) {
-      /* Writing the span may modify the colors, so make a backup now if we're
-       * going to call _swrast_write_zoomed_span() more than once.
-       * Also, clipping may change the span end value, so store it as well.
-       */
-      const GLint end = zoomed.end; /* save */
-      GLuint rgbaSave[MAX_WIDTH][4];
-      const GLint pixelSize =
-         (zoomed.array->ChanType == GL_UNSIGNED_BYTE) ? 4 * sizeof(GLubyte) :
-         ((zoomed.array->ChanType == GL_UNSIGNED_SHORT) ? 4 * sizeof(GLushort)
-          : 4 * sizeof(GLfloat));
-      if (y1 - y0 > 1) {
-         memcpy(rgbaSave, zoomed.array->rgba, zoomed.end * pixelSize);
-      }
-      for (zoomed.y = y0; zoomed.y < y1; zoomed.y++) {
-         _swrast_write_rgba_span(ctx, &zoomed);
-         zoomed.end = end;  /* restore */
-         if (y1 - y0 > 1) {
-            /* restore the colors */
-            memcpy(zoomed.array->rgba, rgbaSave, zoomed.end * pixelSize);
-         }
-      }
-   }
-}
-
-
-void
-_swrast_write_zoomed_rgba_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                               const SWspan *span, const GLvoid *rgba)
-{
-   zoom_span(ctx, imgX, imgY, span, rgba, GL_RGBA);
-}
-
-
-void
-_swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                              const SWspan *span, const GLvoid *rgb)
-{
-   zoom_span(ctx, imgX, imgY, span, rgb, GL_RGB);
-}
-
-
-void
-_swrast_write_zoomed_depth_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                const SWspan *span)
-{
-   zoom_span(ctx, imgX, imgY, span,
-             (const GLvoid *) span->array->z, GL_DEPTH_COMPONENT);
-}
-
-
-/**
- * Zoom/write stencil values.
- * No per-fragment operations are applied.
- */
-void
-_swrast_write_zoomed_stencil_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                  GLint width, GLint spanX, GLint spanY,
-                                  const GLstencil stencil[])
-{
-   GLstencil zoomedVals[MAX_WIDTH];
-   GLint x0, x1, y0, y1, y;
-   GLint i, zoomedWidth;
-
-   if (!compute_zoomed_bounds(ctx, imgX, imgY, spanX, spanY, width,
-                              &x0, &x1, &y0, &y1)) {
-      return;  /* totally clipped */
-   }
-
-   zoomedWidth = x1 - x0;
-   ASSERT(zoomedWidth > 0);
-   ASSERT(zoomedWidth <= MAX_WIDTH);
-
-   /* zoom the span horizontally */
-   for (i = 0; i < zoomedWidth; i++) {
-      GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - spanX;
-      ASSERT(j >= 0);
-      ASSERT(j < width);
-      zoomedVals[i] = stencil[j];
-   }
-
-   /* write the zoomed spans */
-   for (y = y0; y < y1; y++) {
-      _swrast_write_stencil_span(ctx, zoomedWidth, x0, y, zoomedVals);
-   }
-}
-
-
-/**
- * Zoom/write z values (16 or 32-bit).
- * No per-fragment operations are applied.
- */
-void
-_swrast_write_zoomed_z_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                            GLint width, GLint spanX, GLint spanY,
-                            const GLvoid *z)
-{
-   struct gl_renderbuffer *rb = ctx->DrawBuffer->_DepthBuffer;
-   GLushort zoomedVals16[MAX_WIDTH];
-   GLuint zoomedVals32[MAX_WIDTH];
-   GLint x0, x1, y0, y1, y;
-   GLint i, zoomedWidth;
-
-   if (!compute_zoomed_bounds(ctx, imgX, imgY, spanX, spanY, width,
-                              &x0, &x1, &y0, &y1)) {
-      return;  /* totally clipped */
-   }
-
-   zoomedWidth = x1 - x0;
-   ASSERT(zoomedWidth > 0);
-   ASSERT(zoomedWidth <= MAX_WIDTH);
-
-   /* zoom the span horizontally */
-   if (rb->DataType == GL_UNSIGNED_SHORT) {
-      for (i = 0; i < zoomedWidth; i++) {
-         GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - spanX;
-         ASSERT(j >= 0);
-         ASSERT(j < width);
-         zoomedVals16[i] = ((GLushort *) z)[j];
-      }
-      z = zoomedVals16;
-   }
-   else {
-      ASSERT(rb->DataType == GL_UNSIGNED_INT);
-      for (i = 0; i < zoomedWidth; i++) {
-         GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - spanX;
-         ASSERT(j >= 0);
-         ASSERT(j < width);
-         zoomedVals32[i] = ((GLuint *) z)[j];
-      }
-      z = zoomedVals32;
-   }
-
-   /* write the zoomed spans */
-   for (y = y0; y < y1; y++) {
-      rb->PutRow(ctx, rb, zoomedWidth, x0, y, z, NULL);
-   }
-}
+/*

+ * 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 "main/glheader.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/colormac.h"

+

+#include "s_context.h"

+#include "s_span.h"

+#include "s_stencil.h"

+#include "s_zoom.h"

+

+

+/**

+ * Compute the bounds of the region resulting from zooming a pixel span.

+ * The resulting region will be entirely inside the window/scissor bounds

+ * so no additional clipping is needed.

+ * \param imageX, imageY  position of the mage being drawn (gl WindowPos)

+ * \param spanX, spanY  position of span being drawing

+ * \param width  number of pixels in span

+ * \param x0, x1  returned X bounds of zoomed region [x0, x1)

+ * \param y0, y1  returned Y bounds of zoomed region [y0, y1)

+ * \return GL_TRUE if any zoomed pixels visible, GL_FALSE if totally clipped

+ */

+static GLboolean

+compute_zoomed_bounds(struct gl_context *ctx, GLint imageX, GLint imageY,

+                      GLint spanX, GLint spanY, GLint width,

+                      GLint *x0, GLint *x1, GLint *y0, GLint *y1)

+{

+   const struct gl_framebuffer *fb = ctx->DrawBuffer;

+   GLint c0, c1, r0, r1;

+

+   ASSERT(spanX >= imageX);

+   ASSERT(spanY >= imageY);

+

+   /*

+    * Compute destination columns: [c0, c1)

+    */

+   c0 = imageX + (GLint) ((spanX - imageX) * ctx->Pixel.ZoomX);

+   c1 = imageX + (GLint) ((spanX + width - imageX) * ctx->Pixel.ZoomX);

+   if (c1 < c0) {

+      /* swap */

+      GLint tmp = c1;

+      c1 = c0;

+      c0 = tmp;

+   }

+   c0 = CLAMP(c0, fb->_Xmin, fb->_Xmax);

+   c1 = CLAMP(c1, fb->_Xmin, fb->_Xmax);

+   if (c0 == c1) {

+      return GL_FALSE; /* no width */

+   }

+

+   /*

+    * Compute destination rows: [r0, r1)

+    */

+   r0 = imageY + (GLint) ((spanY - imageY) * ctx->Pixel.ZoomY);

+   r1 = imageY + (GLint) ((spanY + 1 - imageY) * ctx->Pixel.ZoomY);

+   if (r1 < r0) {

+      /* swap */

+      GLint tmp = r1;

+      r1 = r0;

+      r0 = tmp;

+   }

+   r0 = CLAMP(r0, fb->_Ymin, fb->_Ymax);

+   r1 = CLAMP(r1, fb->_Ymin, fb->_Ymax);

+   if (r0 == r1) {

+      return GL_FALSE; /* no height */

+   }

+

+   *x0 = c0;

+   *x1 = c1;

+   *y0 = r0;

+   *y1 = r1;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Convert a zoomed x image coordinate back to an unzoomed x coord.

+ * 'zx' is screen position of a pixel in the zoomed image, who's left edge

+ * is at 'imageX'.

+ * return corresponding x coord in the original, unzoomed image.

+ * This can use this for unzooming X or Y values.

+ */

+static INLINE GLint

+unzoom_x(GLfloat zoomX, GLint imageX, GLint zx)

+{

+   /*

+   zx = imageX + (x - imageX) * zoomX;

+   zx - imageX = (x - imageX) * zoomX;

+   (zx - imageX) / zoomX = x - imageX;

+   */

+   GLint x;

+   if (zoomX < 0.0)

+      zx++;

+   x = imageX + (GLint) ((zx - imageX) / zoomX);

+   return x;

+}

+

+

+

+/**

+ * Helper function called from _swrast_write_zoomed_rgba/rgb/

+ * index/depth_span().

+ */

+static void

+zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span,

+           const GLvoid *src, GLenum format )

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+   SWspan zoomed;

+   GLint x0, x1, y0, y1;

+   GLint zoomedWidth;

+

+   if (!compute_zoomed_bounds(ctx, imgX, imgY, span->x, span->y, span->end,

+                              &x0, &x1, &y0, &y1)) {

+      return;  /* totally clipped */

+   }

+

+   if (!swrast->ZoomedArrays) {

+      /* allocate on demand */

+      swrast->ZoomedArrays = (SWspanarrays *) CALLOC(sizeof(SWspanarrays));

+      if (!swrast->ZoomedArrays)

+         return;

+   }

+

+   zoomedWidth = x1 - x0;

+   ASSERT(zoomedWidth > 0);

+   ASSERT(zoomedWidth <= MAX_WIDTH);

+

+   /* no pixel arrays! must be horizontal spans. */

+   ASSERT((span->arrayMask & SPAN_XY) == 0);

+   ASSERT(span->primitive == GL_BITMAP);

+

+   INIT_SPAN(zoomed, GL_BITMAP);

+   zoomed.x = x0;

+   zoomed.end = zoomedWidth;

+   zoomed.array = swrast->ZoomedArrays;

+   zoomed.array->ChanType = span->array->ChanType;

+   if (zoomed.array->ChanType == GL_UNSIGNED_BYTE)

+      zoomed.array->rgba = (GLchan (*)[4]) zoomed.array->rgba8;

+   else if (zoomed.array->ChanType == GL_UNSIGNED_SHORT)

+      zoomed.array->rgba = (GLchan (*)[4]) zoomed.array->rgba16;

+   else

+      zoomed.array->rgba = (GLchan (*)[4]) zoomed.array->attribs[FRAG_ATTRIB_COL0];

+

+   COPY_4V(zoomed.attrStart[FRAG_ATTRIB_WPOS], span->attrStart[FRAG_ATTRIB_WPOS]);

+   COPY_4V(zoomed.attrStepX[FRAG_ATTRIB_WPOS], span->attrStepX[FRAG_ATTRIB_WPOS]);

+   COPY_4V(zoomed.attrStepY[FRAG_ATTRIB_WPOS], span->attrStepY[FRAG_ATTRIB_WPOS]);

+

+   zoomed.attrStart[FRAG_ATTRIB_FOGC][0] = span->attrStart[FRAG_ATTRIB_FOGC][0];

+   zoomed.attrStepX[FRAG_ATTRIB_FOGC][0] = span->attrStepX[FRAG_ATTRIB_FOGC][0];

+   zoomed.attrStepY[FRAG_ATTRIB_FOGC][0] = span->attrStepY[FRAG_ATTRIB_FOGC][0];

+

+   if (format == GL_RGBA || format == GL_RGB) {

+      /* copy Z info */

+      zoomed.z = span->z;

+      zoomed.zStep = span->zStep;

+      /* we'll generate an array of colorss */

+      zoomed.interpMask = span->interpMask & ~SPAN_RGBA;

+      zoomed.arrayMask |= SPAN_RGBA;

+      zoomed.arrayAttribs |= FRAG_BIT_COL0;  /* we'll produce these values */

+      ASSERT(span->arrayMask & SPAN_RGBA);

+   }

+   else if (format == GL_DEPTH_COMPONENT) {

+      /* Copy color info */

+      zoomed.red = span->red;

+      zoomed.green = span->green;

+      zoomed.blue = span->blue;

+      zoomed.alpha = span->alpha;

+      zoomed.redStep = span->redStep;

+      zoomed.greenStep = span->greenStep;

+      zoomed.blueStep = span->blueStep;

+      zoomed.alphaStep = span->alphaStep;

+      /* we'll generate an array of depth values */

+      zoomed.interpMask = span->interpMask & ~SPAN_Z;

+      zoomed.arrayMask |= SPAN_Z;

+      ASSERT(span->arrayMask & SPAN_Z);

+   }

+   else {

+      _mesa_problem(ctx, "Bad format in zoom_span");

+      return;

+   }

+

+   /* zoom the span horizontally */

+   if (format == GL_RGBA) {

+      if (zoomed.array->ChanType == GL_UNSIGNED_BYTE) {

+         const GLubyte (*rgba)[4] = (const GLubyte (*)[4]) src;

+         GLint i;

+         for (i = 0; i < zoomedWidth; i++) {

+            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+            ASSERT(j >= 0);

+            ASSERT(j < (GLint) span->end);

+            COPY_4UBV(zoomed.array->rgba8[i], rgba[j]);

+         }

+      }

+      else if (zoomed.array->ChanType == GL_UNSIGNED_SHORT) {

+         const GLushort (*rgba)[4] = (const GLushort (*)[4]) src;

+         GLint i;

+         for (i = 0; i < zoomedWidth; i++) {

+            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+            ASSERT(j >= 0);

+            ASSERT(j < (GLint) span->end);

+            COPY_4V(zoomed.array->rgba16[i], rgba[j]);

+         }

+      }

+      else {

+         const GLfloat (*rgba)[4] = (const GLfloat (*)[4]) src;

+         GLint i;

+         for (i = 0; i < zoomedWidth; i++) {

+            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+            ASSERT(j >= 0);

+            ASSERT(j < span->end);

+            COPY_4V(zoomed.array->attribs[FRAG_ATTRIB_COL0][i], rgba[j]);

+         }

+      }

+   }

+   else if (format == GL_RGB) {

+      if (zoomed.array->ChanType == GL_UNSIGNED_BYTE) {

+         const GLubyte (*rgb)[3] = (const GLubyte (*)[3]) src;

+         GLint i;

+         for (i = 0; i < zoomedWidth; i++) {

+            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+            ASSERT(j >= 0);

+            ASSERT(j < (GLint) span->end);

+            zoomed.array->rgba8[i][0] = rgb[j][0];

+            zoomed.array->rgba8[i][1] = rgb[j][1];

+            zoomed.array->rgba8[i][2] = rgb[j][2];

+            zoomed.array->rgba8[i][3] = 0xff;

+         }

+      }

+      else if (zoomed.array->ChanType == GL_UNSIGNED_SHORT) {

+         const GLushort (*rgb)[3] = (const GLushort (*)[3]) src;

+         GLint i;

+         for (i = 0; i < zoomedWidth; i++) {

+            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+            ASSERT(j >= 0);

+            ASSERT(j < (GLint) span->end);

+            zoomed.array->rgba16[i][0] = rgb[j][0];

+            zoomed.array->rgba16[i][1] = rgb[j][1];

+            zoomed.array->rgba16[i][2] = rgb[j][2];

+            zoomed.array->rgba16[i][3] = 0xffff;

+         }

+      }

+      else {

+         const GLfloat (*rgb)[3] = (const GLfloat (*)[3]) src;

+         GLint i;

+         for (i = 0; i < zoomedWidth; i++) {

+            GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+            ASSERT(j >= 0);

+            ASSERT(j < span->end);

+            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][0] = rgb[j][0];

+            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][1] = rgb[j][1];

+            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][2] = rgb[j][2];

+            zoomed.array->attribs[FRAG_ATTRIB_COL0][i][3] = 1.0F;

+         }

+      }

+   }

+   else if (format == GL_DEPTH_COMPONENT) {

+      const GLuint *zValues = (const GLuint *) src;

+      GLint i;

+      for (i = 0; i < zoomedWidth; i++) {

+         GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - span->x;

+         ASSERT(j >= 0);

+         ASSERT(j < (GLint) span->end);

+         zoomed.array->z[i] = zValues[j];

+      }

+      /* Now, fall into the RGB path below */

+      format = GL_RGBA;

+   }

+

+   /* write the span in rows [r0, r1) */

+   if (format == GL_RGBA || format == GL_RGB) {

+      /* Writing the span may modify the colors, so make a backup now if we're

+       * going to call _swrast_write_zoomed_span() more than once.

+       * Also, clipping may change the span end value, so store it as well.

+       */

+      const GLint end = zoomed.end; /* save */

+      GLuint rgbaSave[MAX_WIDTH][4];

+      const GLint pixelSize =

+         (zoomed.array->ChanType == GL_UNSIGNED_BYTE) ? 4 * sizeof(GLubyte) :

+         ((zoomed.array->ChanType == GL_UNSIGNED_SHORT) ? 4 * sizeof(GLushort)

+          : 4 * sizeof(GLfloat));

+      if (y1 - y0 > 1) {

+         memcpy(rgbaSave, zoomed.array->rgba, zoomed.end * pixelSize);

+      }

+      for (zoomed.y = y0; zoomed.y < y1; zoomed.y++) {

+         _swrast_write_rgba_span(ctx, &zoomed);

+         zoomed.end = end;  /* restore */

+         if (y1 - y0 > 1) {

+            /* restore the colors */

+            memcpy(zoomed.array->rgba, rgbaSave, zoomed.end * pixelSize);

+         }

+      }

+   }

+}

+

+

+void

+_swrast_write_zoomed_rgba_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                               const SWspan *span, const GLvoid *rgba)

+{

+   zoom_span(ctx, imgX, imgY, span, rgba, GL_RGBA);

+}

+

+

+void

+_swrast_write_zoomed_rgb_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                              const SWspan *span, const GLvoid *rgb)

+{

+   zoom_span(ctx, imgX, imgY, span, rgb, GL_RGB);

+}

+

+

+void

+_swrast_write_zoomed_depth_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                                const SWspan *span)

+{

+   zoom_span(ctx, imgX, imgY, span,

+             (const GLvoid *) span->array->z, GL_DEPTH_COMPONENT);

+}

+

+

+/**

+ * Zoom/write stencil values.

+ * No per-fragment operations are applied.

+ */

+void

+_swrast_write_zoomed_stencil_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                                  GLint width, GLint spanX, GLint spanY,

+                                  const GLstencil stencil[])

+{

+   GLstencil zoomedVals[MAX_WIDTH];

+   GLint x0, x1, y0, y1, y;

+   GLint i, zoomedWidth;

+

+   if (!compute_zoomed_bounds(ctx, imgX, imgY, spanX, spanY, width,

+                              &x0, &x1, &y0, &y1)) {

+      return;  /* totally clipped */

+   }

+

+   zoomedWidth = x1 - x0;

+   ASSERT(zoomedWidth > 0);

+   ASSERT(zoomedWidth <= MAX_WIDTH);

+

+   /* zoom the span horizontally */

+   for (i = 0; i < zoomedWidth; i++) {

+      GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - spanX;

+      ASSERT(j >= 0);

+      ASSERT(j < width);

+      zoomedVals[i] = stencil[j];

+   }

+

+   /* write the zoomed spans */

+   for (y = y0; y < y1; y++) {

+      _swrast_write_stencil_span(ctx, zoomedWidth, x0, y, zoomedVals);

+   }

+}

+

+

+/**

+ * Zoom/write z values (16 or 32-bit).

+ * No per-fragment operations are applied.

+ */

+void

+_swrast_write_zoomed_z_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                            GLint width, GLint spanX, GLint spanY,

+                            const GLvoid *z)

+{

+   struct gl_renderbuffer *rb = ctx->DrawBuffer->_DepthBuffer;

+   GLushort zoomedVals16[MAX_WIDTH];

+   GLuint zoomedVals32[MAX_WIDTH];

+   GLint x0, x1, y0, y1, y;

+   GLint i, zoomedWidth;

+

+   if (!compute_zoomed_bounds(ctx, imgX, imgY, spanX, spanY, width,

+                              &x0, &x1, &y0, &y1)) {

+      return;  /* totally clipped */

+   }

+

+   zoomedWidth = x1 - x0;

+   ASSERT(zoomedWidth > 0);

+   ASSERT(zoomedWidth <= MAX_WIDTH);

+

+   /* zoom the span horizontally */

+   if (rb->DataType == GL_UNSIGNED_SHORT) {

+      for (i = 0; i < zoomedWidth; i++) {

+         GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - spanX;

+         ASSERT(j >= 0);

+         ASSERT(j < width);

+         zoomedVals16[i] = ((GLushort *) z)[j];

+      }

+      z = zoomedVals16;

+   }

+   else {

+      ASSERT(rb->DataType == GL_UNSIGNED_INT);

+      for (i = 0; i < zoomedWidth; i++) {

+         GLint j = unzoom_x(ctx->Pixel.ZoomX, imgX, x0 + i) - spanX;

+         ASSERT(j >= 0);

+         ASSERT(j < width);

+         zoomedVals32[i] = ((GLuint *) z)[j];

+      }

+      z = zoomedVals32;

+   }

+

+   /* write the zoomed spans */

+   for (y = y0; y < y1; y++) {

+      rb->PutRow(ctx, rb, zoomedWidth, x0, y, z, NULL);

+   }

+}

diff --git a/mesalib/src/mesa/swrast/s_zoom.h b/mesalib/src/mesa/swrast/s_zoom.h
index 09f624efa..b8d17b5a4 100644
--- a/mesalib/src/mesa/swrast/s_zoom.h
+++ b/mesalib/src/mesa/swrast/s_zoom.h
@@ -1,56 +1,56 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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 S_ZOOM_H
-#define S_ZOOM_H
-
-#include "main/mtypes.h"
-#include "s_span.h"
-
-
-extern void
-_swrast_write_zoomed_rgba_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                               const SWspan *span, const GLvoid *rgba);
-
-extern void
-_swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                              const SWspan *span, const GLvoid *rgb);
-
-extern void
-_swrast_write_zoomed_depth_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                const SWspan *span);
-
-
-extern void
-_swrast_write_zoomed_stencil_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                                  GLint width, GLint spanX, GLint spanY,
-                                  const GLstencil stencil[]);
-
-extern void
-_swrast_write_zoomed_z_span(GLcontext *ctx, GLint imgX, GLint imgY,
-                            GLint width, GLint spanX, GLint spanY,
-                            const GLvoid *z);
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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 S_ZOOM_H

+#define S_ZOOM_H

+

+#include "main/mtypes.h"

+#include "s_span.h"

+

+

+extern void

+_swrast_write_zoomed_rgba_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                               const SWspan *span, const GLvoid *rgba);

+

+extern void

+_swrast_write_zoomed_rgb_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                              const SWspan *span, const GLvoid *rgb);

+

+extern void

+_swrast_write_zoomed_depth_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                                const SWspan *span);

+

+

+extern void

+_swrast_write_zoomed_stencil_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                                  GLint width, GLint spanX, GLint spanY,

+                                  const GLstencil stencil[]);

+

+extern void

+_swrast_write_zoomed_z_span(struct gl_context *ctx, GLint imgX, GLint imgY,

+                            GLint width, GLint spanX, GLint spanY,

+                            const GLvoid *z);

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast/swrast.h b/mesalib/src/mesa/swrast/swrast.h
index c01cf7d1f..2db536c7b 100644
--- a/mesalib/src/mesa/swrast/swrast.h
+++ b/mesalib/src/mesa/swrast/swrast.h
@@ -1,232 +1,232 @@
-/*
- * 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 swrast/swrast.h
- * \brief Public interface to the software rasterization functions.
- * \author Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#ifndef SWRAST_H
-#define SWRAST_H
-
-#include "main/mtypes.h"
-
-/**
- * \struct SWvertex
- * \brief Data-structure to handle vertices in the software rasterizer.
- * 
- * The software rasterizer now uses this format for vertices.  Thus a
- * 'RasterSetup' stage or other translation is required between the
- * tnl module and the swrast rasterization functions.  This serves to
- * isolate the swrast module from the internals of the tnl module, and
- * improve its usefulness as a fallback mechanism for hardware
- * drivers.
- *
- * wpos = attr[FRAG_ATTRIB_WPOS] and MUST BE THE FIRST values in the
- * vertex because of the tnl clipping code.
-
- * wpos[0] and [1] are the screen-coords of SWvertex.
- * wpos[2] is the z-buffer coord (if 16-bit Z buffer, in range [0,65535]).
- * wpos[3] is 1/w where w is the clip-space W coord.  This is the value
- * that clip{XYZ} were multiplied by to get ndc{XYZ}.
- *
- * Full software drivers:
- *   - Register the rastersetup and triangle functions from
- *     utils/software_helper.
- *   - On statechange, update the rasterization pointers in that module.
- *
- * Rasterization hardware drivers:
- *   - Keep native rastersetup.
- *   - Implement native twoside,offset and unfilled triangle setup.
- *   - Implement a translator from native vertices to swrast vertices.
- *   - On partial fallback (mix of accelerated and unaccelerated
- *   prims), call a pass-through function which translates native
- *   vertices to SWvertices and calls the appropriate swrast function.
- *   - On total fallback (vertex format insufficient for state or all
- *     primitives unaccelerated), hook in swrast_setup instead.
- */
-typedef struct {
-   GLfloat attrib[FRAG_ATTRIB_MAX][4];
-   GLchan color[4];   /** integer color */
-   GLfloat pointSize;
-} SWvertex;
-
-
-#define FRAG_ATTRIB_CI FRAG_ATTRIB_COL0
-
-
-struct swrast_device_driver;
-
-
-/* These are the public-access functions exported from swrast.
- */
-
-extern GLboolean
-_swrast_CreateContext( GLcontext *ctx );
-
-extern void
-_swrast_DestroyContext( GLcontext *ctx );
-
-/* Get a (non-const) reference to the device driver struct for swrast.
- */
-extern struct swrast_device_driver *
-_swrast_GetDeviceDriverReference( GLcontext *ctx );
-
-extern void
-_swrast_Bitmap( GLcontext *ctx,
-		GLint px, GLint py,
-		GLsizei width, GLsizei height,
-		const struct gl_pixelstore_attrib *unpack,
-		const GLubyte *bitmap );
-
-extern void
-_swrast_CopyPixels( GLcontext *ctx,
-		    GLint srcx, GLint srcy,
-		    GLint destx, GLint desty,
-		    GLsizei width, GLsizei height,
-		    GLenum type );
-
-extern void
-_swrast_DrawPixels( GLcontext *ctx,
-		    GLint x, GLint y,
-		    GLsizei width, GLsizei height,
-		    GLenum format, GLenum type,
-		    const struct gl_pixelstore_attrib *unpack,
-		    const GLvoid *pixels );
-
-extern void
-_swrast_ReadPixels( GLcontext *ctx,
-		    GLint x, GLint y, GLsizei width, GLsizei height,
-		    GLenum format, GLenum type,
-		    const struct gl_pixelstore_attrib *unpack,
-		    GLvoid *pixels );
-
-extern void
-_swrast_BlitFramebuffer(GLcontext *ctx,
-                        GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                        GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                        GLbitfield mask, GLenum filter);
-
-extern void
-_swrast_Clear(GLcontext *ctx, GLbitfield buffers);
-
-extern void
-_swrast_Accum(GLcontext *ctx, GLenum op, GLfloat value);
-
-
-
-/* Reset the stipple counter
- */
-extern void
-_swrast_ResetLineStipple( GLcontext *ctx );
-
-/**
- * Indicates front/back facing for subsequent points/lines when drawing
- * unfilled polygons.  Needed for two-side stencil.
- */
-extern void
-_swrast_SetFacing(GLcontext *ctx, GLuint facing);
-
-/* These will always render the correct point/line/triangle for the
- * current state.
- *
- * For flatshaded primitives, the provoking vertex is the final one.
- */
-extern void
-_swrast_Point( GLcontext *ctx, const SWvertex *v );
-
-extern void
-_swrast_Line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 );
-
-extern void
-_swrast_Triangle( GLcontext *ctx, const SWvertex *v0,
-                  const SWvertex *v1, const SWvertex *v2 );
-
-extern void
-_swrast_Quad( GLcontext *ctx,
-              const SWvertex *v0, const SWvertex *v1,
-	      const SWvertex *v2,  const SWvertex *v3);
-
-extern void
-_swrast_flush( GLcontext *ctx );
-
-extern void
-_swrast_render_primitive( GLcontext *ctx, GLenum mode );
-
-extern void
-_swrast_render_start( GLcontext *ctx );
-
-extern void
-_swrast_render_finish( GLcontext *ctx );
-
-/* Tell the software rasterizer about core state changes.
- */
-extern void
-_swrast_InvalidateState( GLcontext *ctx, GLbitfield new_state );
-
-/* Configure software rasterizer to match hardware rasterizer characteristics:
- */
-extern void
-_swrast_allow_vertex_fog( GLcontext *ctx, GLboolean value );
-
-extern void
-_swrast_allow_pixel_fog( GLcontext *ctx, GLboolean value );
-
-/* Debug:
- */
-extern void
-_swrast_print_vertex( GLcontext *ctx, const SWvertex *v );
-
-
-
-extern void
-_swrast_eject_texture_images(GLcontext *ctx);
-
-
-
-/**
- * The driver interface for the software rasterizer.
- * XXX this may go away.
- * We may move these functions to ctx->Driver.RenderStart, RenderEnd.
- */
-struct swrast_device_driver {
-   /*
-    * These are called before and after accessing renderbuffers during
-    * software rasterization.
-    *
-    * These are a suitable place for grabbing/releasing hardware locks.
-    *
-    * NOTE: The swrast triangle/line/point routines *DO NOT* call
-    * these functions.  Locking in that case must be organized by the
-    * driver by other mechanisms.
-    */
-   void (*SpanRenderStart)(GLcontext *ctx);
-   void (*SpanRenderFinish)(GLcontext *ctx);
-};
-
-
-
-#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 swrast/swrast.h

+ * \brief Public interface to the software rasterization functions.

+ * \author Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#ifndef SWRAST_H

+#define SWRAST_H

+

+#include "main/mtypes.h"

+

+/**

+ * \struct SWvertex

+ * \brief Data-structure to handle vertices in the software rasterizer.

+ * 

+ * The software rasterizer now uses this format for vertices.  Thus a

+ * 'RasterSetup' stage or other translation is required between the

+ * tnl module and the swrast rasterization functions.  This serves to

+ * isolate the swrast module from the internals of the tnl module, and

+ * improve its usefulness as a fallback mechanism for hardware

+ * drivers.

+ *

+ * wpos = attr[FRAG_ATTRIB_WPOS] and MUST BE THE FIRST values in the

+ * vertex because of the tnl clipping code.

+

+ * wpos[0] and [1] are the screen-coords of SWvertex.

+ * wpos[2] is the z-buffer coord (if 16-bit Z buffer, in range [0,65535]).

+ * wpos[3] is 1/w where w is the clip-space W coord.  This is the value

+ * that clip{XYZ} were multiplied by to get ndc{XYZ}.

+ *

+ * Full software drivers:

+ *   - Register the rastersetup and triangle functions from

+ *     utils/software_helper.

+ *   - On statechange, update the rasterization pointers in that module.

+ *

+ * Rasterization hardware drivers:

+ *   - Keep native rastersetup.

+ *   - Implement native twoside,offset and unfilled triangle setup.

+ *   - Implement a translator from native vertices to swrast vertices.

+ *   - On partial fallback (mix of accelerated and unaccelerated

+ *   prims), call a pass-through function which translates native

+ *   vertices to SWvertices and calls the appropriate swrast function.

+ *   - On total fallback (vertex format insufficient for state or all

+ *     primitives unaccelerated), hook in swrast_setup instead.

+ */

+typedef struct {

+   GLfloat attrib[FRAG_ATTRIB_MAX][4];

+   GLchan color[4];   /** integer color */

+   GLfloat pointSize;

+} SWvertex;

+

+

+#define FRAG_ATTRIB_CI FRAG_ATTRIB_COL0

+

+

+struct swrast_device_driver;

+

+

+/* These are the public-access functions exported from swrast.

+ */

+

+extern GLboolean

+_swrast_CreateContext( struct gl_context *ctx );

+

+extern void

+_swrast_DestroyContext( struct gl_context *ctx );

+

+/* Get a (non-const) reference to the device driver struct for swrast.

+ */

+extern struct swrast_device_driver *

+_swrast_GetDeviceDriverReference( struct gl_context *ctx );

+

+extern void

+_swrast_Bitmap( struct gl_context *ctx,

+		GLint px, GLint py,

+		GLsizei width, GLsizei height,

+		const struct gl_pixelstore_attrib *unpack,

+		const GLubyte *bitmap );

+

+extern void

+_swrast_CopyPixels( struct gl_context *ctx,

+		    GLint srcx, GLint srcy,

+		    GLint destx, GLint desty,

+		    GLsizei width, GLsizei height,

+		    GLenum type );

+

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

+

+extern void

+_swrast_ReadPixels( struct gl_context *ctx,

+		    GLint x, GLint y, GLsizei width, GLsizei height,

+		    GLenum format, GLenum type,

+		    const struct gl_pixelstore_attrib *unpack,

+		    GLvoid *pixels );

+

+extern void

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

+

+extern void

+_swrast_Clear(struct gl_context *ctx, GLbitfield buffers);

+

+extern void

+_swrast_Accum(struct gl_context *ctx, GLenum op, GLfloat value);

+

+

+

+/* Reset the stipple counter

+ */

+extern void

+_swrast_ResetLineStipple( struct gl_context *ctx );

+

+/**

+ * Indicates front/back facing for subsequent points/lines when drawing

+ * unfilled polygons.  Needed for two-side stencil.

+ */

+extern void

+_swrast_SetFacing(struct gl_context *ctx, GLuint facing);

+

+/* These will always render the correct point/line/triangle for the

+ * current state.

+ *

+ * For flatshaded primitives, the provoking vertex is the final one.

+ */

+extern void

+_swrast_Point( struct gl_context *ctx, const SWvertex *v );

+

+extern void

+_swrast_Line( struct gl_context *ctx, const SWvertex *v0, const SWvertex *v1 );

+

+extern void

+_swrast_Triangle( struct gl_context *ctx, const SWvertex *v0,

+                  const SWvertex *v1, const SWvertex *v2 );

+

+extern void

+_swrast_Quad( struct gl_context *ctx,

+              const SWvertex *v0, const SWvertex *v1,

+	      const SWvertex *v2,  const SWvertex *v3);

+

+extern void

+_swrast_flush( struct gl_context *ctx );

+

+extern void

+_swrast_render_primitive( struct gl_context *ctx, GLenum mode );

+

+extern void

+_swrast_render_start( struct gl_context *ctx );

+

+extern void

+_swrast_render_finish( struct gl_context *ctx );

+

+/* Tell the software rasterizer about core state changes.

+ */

+extern void

+_swrast_InvalidateState( struct gl_context *ctx, GLbitfield new_state );

+

+/* Configure software rasterizer to match hardware rasterizer characteristics:

+ */

+extern void

+_swrast_allow_vertex_fog( struct gl_context *ctx, GLboolean value );

+

+extern void

+_swrast_allow_pixel_fog( struct gl_context *ctx, GLboolean value );

+

+/* Debug:

+ */

+extern void

+_swrast_print_vertex( struct gl_context *ctx, const SWvertex *v );

+

+

+

+extern void

+_swrast_eject_texture_images(struct gl_context *ctx);

+

+

+

+/**

+ * The driver interface for the software rasterizer.

+ * XXX this may go away.

+ * We may move these functions to ctx->Driver.RenderStart, RenderEnd.

+ */

+struct swrast_device_driver {

+   /*

+    * These are called before and after accessing renderbuffers during

+    * software rasterization.

+    *

+    * These are a suitable place for grabbing/releasing hardware locks.

+    *

+    * NOTE: The swrast triangle/line/point routines *DO NOT* call

+    * these functions.  Locking in that case must be organized by the

+    * driver by other mechanisms.

+    */

+   void (*SpanRenderStart)(struct gl_context *ctx);

+   void (*SpanRenderFinish)(struct gl_context *ctx);

+};

+

+

+

+#endif

diff --git a/mesalib/src/mesa/swrast_setup/NOTES b/mesalib/src/mesa/swrast_setup/NOTES
new file mode 100644
index 000000000..b5d2c503e
--- /dev/null
+++ b/mesalib/src/mesa/swrast_setup/NOTES
@@ -0,0 +1,65 @@
+INTRODUCTION

+

+A helper module which provides glue to bind the software rasterizer to

+the software t&l module.  The main task of this module is to build

+swrast vertices from the t&l vertex_buffer structs, and to use them to

+perform triangle setup functions not implemented in the software

+rasterizer.

+

+The module implements a full set of functions to plug into the

+t_vb_render.c driver interface (tnl->Driver.Render.*).  

+

+There are strong advantages to decoupling the software rasterizer from

+the t&l module, primarily allowing hardware drivers better control

+over fallbacks, the removal of implicit knowledge about the software

+rasterizer in the t&l module, allowing the two modules to evolve

+independently and allowing either to be substituted with equivalent

+functionality from another codebase.

+

+This module implements triangle/quad setup for offset, unfilled and

+twoside-lit triangles.  The software rasterizer doesn't handle these

+primitives directly.

+

+Hardware rasterization drivers typically use this module in situations

+where no hardware rasterization is possible, ie during total

+fallbacks. 

+

+STATE

+

+To create and destroy the module:

+

+	GLboolean _swsetup_CreateContext( struct gl_context *ctx );

+	void _swsetup_DestroyContext( struct gl_context *ctx );

+

+The module is not active by default, and must be installed by calling

+_swrast_Wakeup().  This function installs internal swrast_setup

+functions into all the tnl->Driver.Render driver hooks, thus taking

+over the task of rasterization entirely:

+

+        void _swrast_Wakeup( struct gl_context *ctx );

+

+   

+This module tracks state changes internally and maintains derived

+values based on the current state.  For this to work, the driver

+ensure the following funciton is called whenever the state changes and

+the swsetup module is 'awake':

+

+	void _swsetup_InvalidateState( struct gl_context *ctx, GLuint new_state );

+

+There is no explicit call to put the swsetup module to sleep.  Simply

+install other function pointers into all the tnl->Driver.Render.*

+hooks, and (optionally) cease calling _swsetup_InvalidateState().

+

+DRIVER INTERFACE

+

+The module offers a minimal driver interface:

+

+	 void (*Start)( struct gl_context *ctx );

+	 void (*Finish)( struct gl_context *ctx );

+	 

+These are called before and after the completion of all swrast drawing

+activity.  As swrast doesn't call callbacks during triangle, line or

+point rasterization, these are necessary to provide locking hooks for

+some drivers.  They may otherwise be left null.

+

+

diff --git a/mesalib/src/mesa/swrast_setup/ss_context.c b/mesalib/src/mesa/swrast_setup/ss_context.c
index 0fcb7c77a..384cf425a 100644
--- a/mesalib/src/mesa/swrast_setup/ss_context.c
+++ b/mesalib/src/mesa/swrast_setup/ss_context.c
@@ -1,306 +1,306 @@
-/*
- * 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/imports.h"
-#include "main/colormac.h"
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_pipeline.h"
-#include "tnl/t_vertex.h"
-#include "swrast_setup.h"
-#include "ss_context.h"
-#include "ss_triangle.h"
-
-
-/* Need to check lighting state and vertex program state to know
- * if two-sided lighting is in effect.
- */
-#define _SWSETUP_NEW_RENDERINDEX (_NEW_POLYGON|_NEW_LIGHT|_NEW_PROGRAM)
-
-
-#define VARYING_EMIT_STYLE  EMIT_4F
-
-
-GLboolean
-_swsetup_CreateContext( GLcontext *ctx )
-{
-   SScontext *swsetup = (SScontext *)CALLOC(sizeof(SScontext));
-
-   if (!swsetup)
-      return GL_FALSE;
-
-   ctx->swsetup_context = swsetup;
-
-   swsetup->NewState = ~0;
-   _swsetup_trifuncs_init( ctx );
-
-   _tnl_init_vertices( ctx, ctx->Const.MaxArrayLockSize + 12, 
-		       sizeof(SWvertex) );
-
-
-   return GL_TRUE;
-}
-
-void
-_swsetup_DestroyContext( GLcontext *ctx )
-{
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-
-   if (swsetup) {
-      FREE(swsetup);
-      ctx->swsetup_context = 0;
-   }
-
-   _tnl_free_vertices( ctx );
-}
-
-static void
-_swsetup_RenderPrimitive( GLcontext *ctx, GLenum mode )
-{
-   SWSETUP_CONTEXT(ctx)->render_prim = mode;
-   _swrast_render_primitive( ctx, mode );
-}
-
-
-/**
- * Helper macros for setup_vertex_format()
- */
-#define SWZ ((SWvertex *)0)
-#define SWOffset(MEMBER) (((char *)&(SWZ->MEMBER)) - ((char *)SWZ))
-
-#define EMIT_ATTR( ATTR, STYLE, MEMBER )	\
-do {						\
-   map[e].attrib = (ATTR);			\
-   map[e].format = (STYLE);			\
-   map[e].offset = SWOffset(MEMBER);	       	\
-   e++;						\
-} while (0)
-
-
-/**
- * Tell the tnl module how to build SWvertex objects for swrast.
- * We'll build the map[] array with that info and pass it to
- * _tnl_install_attrs().
- */
-static void
-setup_vertex_format(GLcontext *ctx)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-   GLboolean intColors = !ctx->FragmentProgram._Current
-                      && !ctx->ATIFragmentShader._Enabled
-                      && ctx->RenderMode == GL_RENDER
-                      && CHAN_TYPE != GL_FLOAT;
-
-   if (intColors != swsetup->intColors ||
-       !RENDERINPUTS_EQUAL(tnl->render_inputs_bitset,
-                           swsetup->last_index_bitset)) {
-      DECLARE_RENDERINPUTS(index_bitset);
-      struct tnl_attr_map map[_TNL_ATTRIB_MAX];
-      unsigned int i, e = 0;
-
-      swsetup->intColors = intColors;
-
-      RENDERINPUTS_COPY( index_bitset, tnl->render_inputs_bitset );
-
-      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F_VIEWPORT, attrib[FRAG_ATTRIB_WPOS] );
-
-      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_COLOR0 )) {
-         if (swsetup->intColors)
-            EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4CHAN_4F_RGBA, color );
-         else
-            EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4F, attrib[FRAG_ATTRIB_COL0]);
-      }
-
-      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_COLOR1 )) {
-         EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_4F, attrib[FRAG_ATTRIB_COL1]);
-      }
-
-      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_FOG )) {
-         const GLint emit = ctx->FragmentProgram._Current ? EMIT_4F : EMIT_1F;
-         EMIT_ATTR( _TNL_ATTRIB_FOG, emit, attrib[FRAG_ATTRIB_FOGC]);
-      }
-
-      if (RENDERINPUTS_TEST_RANGE(index_bitset, _TNL_FIRST_TEX, _TNL_LAST_TEX))
-      {
-         for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
-            if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX(i) )) {
-               EMIT_ATTR( _TNL_ATTRIB_TEX(i), EMIT_4F,
-                          attrib[FRAG_ATTRIB_TEX0 + i] );
-            }
-         }
-      }
-
-      /* shader varying vars */
-      if (RENDERINPUTS_TEST_RANGE( index_bitset,
-                                   _TNL_FIRST_GENERIC, _TNL_LAST_GENERIC )) {
-         for (i = 0; i < ctx->Const.MaxVarying; i++) {
-            if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_GENERIC(i) )) {
-               EMIT_ATTR( _TNL_ATTRIB_GENERIC(i), VARYING_EMIT_STYLE,
-                          attrib[FRAG_ATTRIB_VAR0 + i] );
-            }
-         }
-      }
-
-      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_POINTSIZE ))
-         EMIT_ATTR( _TNL_ATTRIB_POINTSIZE, EMIT_1F, pointSize );
-
-      _tnl_install_attrs( ctx, map, e,
-                          ctx->Viewport._WindowMap.m,
-                          sizeof(SWvertex) );
-
-      RENDERINPUTS_COPY( swsetup->last_index_bitset, index_bitset );
-   }
-}
-
-
-/**
- * Prepare to render a vertex buffer.
- * Called via tnl->Driver.Render.Start.
- */
-static void
-_swsetup_RenderStart( GLcontext *ctx )
-{
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-
-   if (swsetup->NewState & _SWSETUP_NEW_RENDERINDEX) {
-      _swsetup_choose_trifuncs(ctx);
-   }
-
-   if (swsetup->NewState & _NEW_PROGRAM) {
-      RENDERINPUTS_ZERO( swsetup->last_index_bitset );
-   }
-
-   swsetup->NewState = 0;
-
-   /* This will change if drawing unfilled tris */
-   _swrast_SetFacing(ctx, 0);
-
-   _swrast_render_start(ctx);
-
-   /* Important */
-   VB->AttribPtr[VERT_ATTRIB_POS] = VB->NdcPtr;
-
-   setup_vertex_format(ctx);
-}
-
-
-/*
- * We patch this function into tnl->Driver.Render.Finish.
- * It's called when we finish rendering a vertex buffer.
- */
-static void
-_swsetup_RenderFinish( GLcontext *ctx )
-{
-   _swrast_render_finish( ctx );
-}
-
-void
-_swsetup_InvalidateState( GLcontext *ctx, GLuint new_state )
-{
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-   swsetup->NewState |= new_state;
-   _tnl_invalidate_vertex_state( ctx, new_state );
-}
-
-
-void
-_swsetup_Wakeup( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-
-   tnl->Driver.Render.Start = _swsetup_RenderStart;
-   tnl->Driver.Render.Finish = _swsetup_RenderFinish;
-   tnl->Driver.Render.PrimitiveNotify = _swsetup_RenderPrimitive;
-   tnl->Driver.Render.Interp = _tnl_interp;
-   tnl->Driver.Render.CopyPV = _tnl_copy_pv;
-   tnl->Driver.Render.ClippedPolygon = _tnl_RenderClippedPolygon; /* new */
-   tnl->Driver.Render.ClippedLine = _tnl_RenderClippedLine; /* new */
-   /* points */
-   /* line */
-   /* triangle */
-   /* quad */
-   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
-   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
-   tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
-   tnl->Driver.Render.BuildVertices = _tnl_build_vertices;
-   tnl->Driver.Render.Multipass = 0;
-
-   _tnl_invalidate_vertices( ctx, ~0 );
-   _tnl_need_projected_coords( ctx, GL_TRUE );
-   _swsetup_InvalidateState( ctx, ~0 );
-
-   swsetup->verts = (SWvertex *)tnl->clipspace.vertex_buf;
-   RENDERINPUTS_ZERO( swsetup->last_index_bitset );
-}
-
-
-/**
- * Populate a swrast SWvertex from an attrib-style vertex.
- */
-void 
-_swsetup_Translate( GLcontext *ctx, const void *vertex, SWvertex *dest )
-{
-   const GLfloat *m = ctx->Viewport._WindowMap.m;
-   GLfloat tmp[4];
-   GLuint i;
-
-   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_POS, tmp );
-
-   dest->attrib[FRAG_ATTRIB_WPOS][0] = m[0]  * tmp[0] + m[12];
-   dest->attrib[FRAG_ATTRIB_WPOS][1] = m[5]  * tmp[1] + m[13];
-   dest->attrib[FRAG_ATTRIB_WPOS][2] = m[10] * tmp[2] + m[14];
-   dest->attrib[FRAG_ATTRIB_WPOS][3] =         tmp[3];
-
-   /** XXX try to limit these loops someday */
-   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
-      _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_TEX0 + i,
-                     dest->attrib[FRAG_ATTRIB_TEX0 + i] );
-
-   for (i = 0 ; i < ctx->Const.MaxVarying ; i++)
-      _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_GENERIC0 + i,
-                     dest->attrib[FRAG_ATTRIB_VAR0 + i] );
-
-   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR0,
-                  dest->attrib[FRAG_ATTRIB_COL0] );
-   UNCLAMPED_FLOAT_TO_RGBA_CHAN( dest->color, tmp );
-
-   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR1,
-                  dest->attrib[FRAG_ATTRIB_COL1]);
-
-   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_FOG, tmp );
-   dest->attrib[FRAG_ATTRIB_FOGC][0] = tmp[0];
-
-   /* XXX See _tnl_get_attr about pointsize ... */
-   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_POINTSIZE, tmp );
-   dest->pointSize = tmp[0];
-}
-
+/*

+ * 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/imports.h"

+#include "main/colormac.h"

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+#include "tnl/t_vertex.h"

+#include "swrast_setup.h"

+#include "ss_context.h"

+#include "ss_triangle.h"

+

+

+/* Need to check lighting state and vertex program state to know

+ * if two-sided lighting is in effect.

+ */

+#define _SWSETUP_NEW_RENDERINDEX (_NEW_POLYGON|_NEW_LIGHT|_NEW_PROGRAM)

+

+

+#define VARYING_EMIT_STYLE  EMIT_4F

+

+

+GLboolean

+_swsetup_CreateContext( struct gl_context *ctx )

+{

+   SScontext *swsetup = (SScontext *)CALLOC(sizeof(SScontext));

+

+   if (!swsetup)

+      return GL_FALSE;

+

+   ctx->swsetup_context = swsetup;

+

+   swsetup->NewState = ~0;

+   _swsetup_trifuncs_init( ctx );

+

+   _tnl_init_vertices( ctx, ctx->Const.MaxArrayLockSize + 12, 

+		       sizeof(SWvertex) );

+

+

+   return GL_TRUE;

+}

+

+void

+_swsetup_DestroyContext( struct gl_context *ctx )

+{

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+

+   if (swsetup) {

+      FREE(swsetup);

+      ctx->swsetup_context = 0;

+   }

+

+   _tnl_free_vertices( ctx );

+}

+

+static void

+_swsetup_RenderPrimitive( struct gl_context *ctx, GLenum mode )

+{

+   SWSETUP_CONTEXT(ctx)->render_prim = mode;

+   _swrast_render_primitive( ctx, mode );

+}

+

+

+/**

+ * Helper macros for setup_vertex_format()

+ */

+#define SWZ ((SWvertex *)0)

+#define SWOffset(MEMBER) (((char *)&(SWZ->MEMBER)) - ((char *)SWZ))

+

+#define EMIT_ATTR( ATTR, STYLE, MEMBER )	\

+do {						\

+   map[e].attrib = (ATTR);			\

+   map[e].format = (STYLE);			\

+   map[e].offset = SWOffset(MEMBER);	       	\

+   e++;						\

+} while (0)

+

+

+/**

+ * Tell the tnl module how to build SWvertex objects for swrast.

+ * We'll build the map[] array with that info and pass it to

+ * _tnl_install_attrs().

+ */

+static void

+setup_vertex_format(struct gl_context *ctx)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+   GLboolean intColors = !ctx->FragmentProgram._Current

+                      && !ctx->ATIFragmentShader._Enabled

+                      && ctx->RenderMode == GL_RENDER

+                      && CHAN_TYPE != GL_FLOAT;

+

+   if (intColors != swsetup->intColors ||

+       !RENDERINPUTS_EQUAL(tnl->render_inputs_bitset,

+                           swsetup->last_index_bitset)) {

+      DECLARE_RENDERINPUTS(index_bitset);

+      struct tnl_attr_map map[_TNL_ATTRIB_MAX];

+      unsigned int i, e = 0;

+

+      swsetup->intColors = intColors;

+

+      RENDERINPUTS_COPY( index_bitset, tnl->render_inputs_bitset );

+

+      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F_VIEWPORT, attrib[FRAG_ATTRIB_WPOS] );

+

+      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_COLOR0 )) {

+         if (swsetup->intColors)

+            EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4CHAN_4F_RGBA, color );

+         else

+            EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4F, attrib[FRAG_ATTRIB_COL0]);

+      }

+

+      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_COLOR1 )) {

+         EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_4F, attrib[FRAG_ATTRIB_COL1]);

+      }

+

+      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_FOG )) {

+         const GLint emit = ctx->FragmentProgram._Current ? EMIT_4F : EMIT_1F;

+         EMIT_ATTR( _TNL_ATTRIB_FOG, emit, attrib[FRAG_ATTRIB_FOGC]);

+      }

+

+      if (RENDERINPUTS_TEST_RANGE(index_bitset, _TNL_FIRST_TEX, _TNL_LAST_TEX))

+      {

+         for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {

+            if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX(i) )) {

+               EMIT_ATTR( _TNL_ATTRIB_TEX(i), EMIT_4F,

+                          attrib[FRAG_ATTRIB_TEX0 + i] );

+            }

+         }

+      }

+

+      /* shader varying vars */

+      if (RENDERINPUTS_TEST_RANGE( index_bitset,

+                                   _TNL_FIRST_GENERIC, _TNL_LAST_GENERIC )) {

+         for (i = 0; i < ctx->Const.MaxVarying; i++) {

+            if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_GENERIC(i) )) {

+               EMIT_ATTR( _TNL_ATTRIB_GENERIC(i), VARYING_EMIT_STYLE,

+                          attrib[FRAG_ATTRIB_VAR0 + i] );

+            }

+         }

+      }

+

+      if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_POINTSIZE ))

+         EMIT_ATTR( _TNL_ATTRIB_POINTSIZE, EMIT_1F, pointSize );

+

+      _tnl_install_attrs( ctx, map, e,

+                          ctx->Viewport._WindowMap.m,

+                          sizeof(SWvertex) );

+

+      RENDERINPUTS_COPY( swsetup->last_index_bitset, index_bitset );

+   }

+}

+

+

+/**

+ * Prepare to render a vertex buffer.

+ * Called via tnl->Driver.Render.Start.

+ */

+static void

+_swsetup_RenderStart( struct gl_context *ctx )

+{

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+

+   if (swsetup->NewState & _SWSETUP_NEW_RENDERINDEX) {

+      _swsetup_choose_trifuncs(ctx);

+   }

+

+   if (swsetup->NewState & _NEW_PROGRAM) {

+      RENDERINPUTS_ZERO( swsetup->last_index_bitset );

+   }

+

+   swsetup->NewState = 0;

+

+   /* This will change if drawing unfilled tris */

+   _swrast_SetFacing(ctx, 0);

+

+   _swrast_render_start(ctx);

+

+   /* Important */

+   VB->AttribPtr[VERT_ATTRIB_POS] = VB->NdcPtr;

+

+   setup_vertex_format(ctx);

+}

+

+

+/*

+ * We patch this function into tnl->Driver.Render.Finish.

+ * It's called when we finish rendering a vertex buffer.

+ */

+static void

+_swsetup_RenderFinish( struct gl_context *ctx )

+{

+   _swrast_render_finish( ctx );

+}

+

+void

+_swsetup_InvalidateState( struct gl_context *ctx, GLuint new_state )

+{

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+   swsetup->NewState |= new_state;

+   _tnl_invalidate_vertex_state( ctx, new_state );

+}

+

+

+void

+_swsetup_Wakeup( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+

+   tnl->Driver.Render.Start = _swsetup_RenderStart;

+   tnl->Driver.Render.Finish = _swsetup_RenderFinish;

+   tnl->Driver.Render.PrimitiveNotify = _swsetup_RenderPrimitive;

+   tnl->Driver.Render.Interp = _tnl_interp;

+   tnl->Driver.Render.CopyPV = _tnl_copy_pv;

+   tnl->Driver.Render.ClippedPolygon = _tnl_RenderClippedPolygon; /* new */

+   tnl->Driver.Render.ClippedLine = _tnl_RenderClippedLine; /* new */

+   /* points */

+   /* line */

+   /* triangle */

+   /* quad */

+   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;

+   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;

+   tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;

+   tnl->Driver.Render.BuildVertices = _tnl_build_vertices;

+   tnl->Driver.Render.Multipass = 0;

+

+   _tnl_invalidate_vertices( ctx, ~0 );

+   _tnl_need_projected_coords( ctx, GL_TRUE );

+   _swsetup_InvalidateState( ctx, ~0 );

+

+   swsetup->verts = (SWvertex *)tnl->clipspace.vertex_buf;

+   RENDERINPUTS_ZERO( swsetup->last_index_bitset );

+}

+

+

+/**

+ * Populate a swrast SWvertex from an attrib-style vertex.

+ */

+void 

+_swsetup_Translate( struct gl_context *ctx, const void *vertex, SWvertex *dest )

+{

+   const GLfloat *m = ctx->Viewport._WindowMap.m;

+   GLfloat tmp[4];

+   GLuint i;

+

+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_POS, tmp );

+

+   dest->attrib[FRAG_ATTRIB_WPOS][0] = m[0]  * tmp[0] + m[12];

+   dest->attrib[FRAG_ATTRIB_WPOS][1] = m[5]  * tmp[1] + m[13];

+   dest->attrib[FRAG_ATTRIB_WPOS][2] = m[10] * tmp[2] + m[14];

+   dest->attrib[FRAG_ATTRIB_WPOS][3] =         tmp[3];

+

+   /** XXX try to limit these loops someday */

+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)

+      _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_TEX0 + i,

+                     dest->attrib[FRAG_ATTRIB_TEX0 + i] );

+

+   for (i = 0 ; i < ctx->Const.MaxVarying ; i++)

+      _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_GENERIC0 + i,

+                     dest->attrib[FRAG_ATTRIB_VAR0 + i] );

+

+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR0,

+                  dest->attrib[FRAG_ATTRIB_COL0] );

+   UNCLAMPED_FLOAT_TO_RGBA_CHAN( dest->color, tmp );

+

+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_COLOR1,

+                  dest->attrib[FRAG_ATTRIB_COL1]);

+

+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_FOG, tmp );

+   dest->attrib[FRAG_ATTRIB_FOGC][0] = tmp[0];

+

+   /* XXX See _tnl_get_attr about pointsize ... */

+   _tnl_get_attr( ctx, vertex, _TNL_ATTRIB_POINTSIZE, tmp );

+   dest->pointSize = tmp[0];

+}

+

diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.c b/mesalib/src/mesa/swrast_setup/ss_triangle.c
index f22bc52f0..4fc9a0756 100644
--- a/mesalib/src/mesa/swrast_setup/ss_triangle.c
+++ b/mesalib/src/mesa/swrast_setup/ss_triangle.c
@@ -1,265 +1,265 @@
-/*
- * 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/colormac.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-
-#include "tnl/t_context.h"
-
-#include "ss_triangle.h"
-#include "ss_context.h"
-
-#define SS_OFFSET_BIT	    0x1
-#define SS_TWOSIDE_BIT	    0x2
-#define SS_UNFILLED_BIT	    0x4
-#define SS_MAX_TRIFUNC      0x8
-
-static tnl_triangle_func tri_tab[SS_MAX_TRIFUNC];
-static tnl_quad_func     quad_tab[SS_MAX_TRIFUNC];
-
-
-/*
- * Render a triangle respecting edge flags.
- */
-typedef void (* swsetup_edge_render_prim_tri)(GLcontext *ctx,
-                                              const GLubyte *ef,
-                                              GLuint e0,
-                                              GLuint e1,
-                                              GLuint e2,
-                                              const SWvertex *v0,
-                                              const SWvertex *v1,
-                                              const SWvertex *v2);
-
-/*
- * Render a triangle using lines and respecting edge flags.
- */
-static void
-_swsetup_edge_render_line_tri(GLcontext *ctx,
-                              const GLubyte *ef,
-                              GLuint e0,
-                              GLuint e1,
-                              GLuint e2,
-                              const SWvertex *v0,
-                              const SWvertex *v1,
-                              const SWvertex *v2)
-{
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-
-   if (swsetup->render_prim == GL_POLYGON) {
-      if (ef[e2]) _swrast_Line( ctx, v2, v0 );
-      if (ef[e0]) _swrast_Line( ctx, v0, v1 );
-      if (ef[e1]) _swrast_Line( ctx, v1, v2 );
-   } else {
-      if (ef[e0]) _swrast_Line( ctx, v0, v1 );
-      if (ef[e1]) _swrast_Line( ctx, v1, v2 );
-      if (ef[e2]) _swrast_Line( ctx, v2, v0 );
-   }
-}
-
-/*
- * Render a triangle using points and respecting edge flags.
- */
-static void
-_swsetup_edge_render_point_tri(GLcontext *ctx,
-                               const GLubyte *ef,
-                               GLuint e0,
-                               GLuint e1,
-                               GLuint e2,
-                               const SWvertex *v0,
-                               const SWvertex *v1,
-                               const SWvertex *v2)
-{
-   if (ef[e0]) _swrast_Point( ctx, v0 );
-   if (ef[e1]) _swrast_Point( ctx, v1 );
-   if (ef[e2]) _swrast_Point( ctx, v2 );
-
-   _swrast_flush(ctx);
-}
-
-/*
- * Render a triangle respecting cull and shade model.
- */
-static void _swsetup_render_tri(GLcontext *ctx,
-                                GLuint e0,
-                                GLuint e1,
-                                GLuint e2,
-                                GLuint facing,
-                                swsetup_edge_render_prim_tri render)
-{
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLubyte *ef = VB->EdgeFlag;
-   SWvertex *verts = swsetup->verts;
-   SWvertex *v0 = &verts[e0];
-   SWvertex *v1 = &verts[e1];
-   SWvertex *v2 = &verts[e2];
-
-   /* cull testing */
-   if (ctx->Polygon.CullFlag) {
-      if (facing == 1 && ctx->Polygon.CullFaceMode != GL_FRONT)
-         return;
-      if (facing == 0 && ctx->Polygon.CullFaceMode != GL_BACK)
-         return;
-   }
-
-   _swrast_SetFacing(ctx, facing);
-
-   if (ctx->Light.ShadeModel == GL_FLAT) {
-      GLchan c[2][4];
-      GLfloat s[2][4];
-
-      /* save colors/indexes for v0, v1 vertices */
-      COPY_CHAN4(c[0], v0->color);
-      COPY_CHAN4(c[1], v1->color);
-      COPY_4V(s[0], v0->attrib[FRAG_ATTRIB_COL1]);
-      COPY_4V(s[1], v1->attrib[FRAG_ATTRIB_COL1]);
-
-      /* copy v2 color/indexes to v0, v1 indexes */
-      COPY_CHAN4(v0->color, v2->color);
-      COPY_CHAN4(v1->color, v2->color);
-      COPY_4V(v0->attrib[FRAG_ATTRIB_COL1], v2->attrib[FRAG_ATTRIB_COL1]);
-      COPY_4V(v1->attrib[FRAG_ATTRIB_COL1], v2->attrib[FRAG_ATTRIB_COL1]);
-
-      render(ctx, ef, e0, e1, e2, v0, v1, v2);
-
-      COPY_CHAN4(v0->color, c[0]);
-      COPY_CHAN4(v1->color, c[1]);
-      COPY_4V(v0->attrib[FRAG_ATTRIB_COL1], s[0]);
-      COPY_4V(v1->attrib[FRAG_ATTRIB_COL1], s[1]);
-   }
-   else {
-      render(ctx, ef, e0, e1, e2, v0, v1, v2);
-   }
-}
-
-#define SS_COLOR(a,b) UNCLAMPED_FLOAT_TO_RGBA_CHAN(a,b)
-#define SS_SPEC(a,b) COPY_4V(a,b)
-#define SS_IND(a,b) (a = b)
-
-#define IND (0)
-#define TAG(x) x##_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_OFFSET_BIT)
-#define TAG(x) x##_offset_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_TWOSIDE_BIT)
-#define TAG(x) x##_twoside_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT)
-#define TAG(x) x##_offset_twoside_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_UNFILLED_BIT)
-#define TAG(x) x##_unfilled_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_OFFSET_BIT|SS_UNFILLED_BIT)
-#define TAG(x) x##_offset_unfilled_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_TWOSIDE_BIT|SS_UNFILLED_BIT)
-#define TAG(x) x##_twoside_unfilled_rgba
-#include "ss_tritmp.h"
-
-#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT|SS_UNFILLED_BIT)
-#define TAG(x) x##_offset_twoside_unfilled_rgba
-#include "ss_tritmp.h"
-
-
-void _swsetup_trifuncs_init( GLcontext *ctx )
-{
-   (void) ctx;
-
-   init_rgba();
-   init_offset_rgba();
-   init_twoside_rgba();
-   init_offset_twoside_rgba();
-   init_unfilled_rgba();
-   init_offset_unfilled_rgba();
-   init_twoside_unfilled_rgba();
-   init_offset_twoside_unfilled_rgba();
-}
-
-
-static void swsetup_points( GLcontext *ctx, GLuint first, GLuint last )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;
-   GLuint i;
-
-   if (VB->Elts) {
-      for (i = first; i < last; i++)
-	 if (VB->ClipMask[VB->Elts[i]] == 0)
-	    _swrast_Point( ctx, &verts[VB->Elts[i]] );
-   }
-   else {
-      for (i = first; i < last; i++)
-	 if (VB->ClipMask[i] == 0)
-	    _swrast_Point( ctx, &verts[i] );
-   }
-}
-
-static void swsetup_line( GLcontext *ctx, GLuint v0, GLuint v1 )
-{
-   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;
-   _swrast_Line( ctx, &verts[v0], &verts[v1] );
-}
-
-
-
-void _swsetup_choose_trifuncs( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLuint ind = 0;
-
-   if (ctx->Polygon.OffsetPoint ||
-       ctx->Polygon.OffsetLine ||
-       ctx->Polygon.OffsetFill)
-      ind |= SS_OFFSET_BIT;
-
-   if ((ctx->Light.Enabled && ctx->Light.Model.TwoSide) ||
-       (ctx->VertexProgram._Current && ctx->VertexProgram.TwoSideEnabled))
-      ind |= SS_TWOSIDE_BIT;
-
-   /* We piggyback the two-sided stencil front/back determination on the
-    * unfilled triangle path.
-    */
-   if (ctx->Polygon.FrontMode != GL_FILL ||
-       ctx->Polygon.BackMode != GL_FILL ||
-       (ctx->Stencil.Enabled && ctx->Stencil._TestTwoSide))
-      ind |= SS_UNFILLED_BIT;
-
-   tnl->Driver.Render.Triangle = tri_tab[ind];
-   tnl->Driver.Render.Quad = quad_tab[ind];
-   tnl->Driver.Render.Line = swsetup_line;
-   tnl->Driver.Render.Points = swsetup_points;
-}
+/*

+ * 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/colormac.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+

+#include "tnl/t_context.h"

+

+#include "ss_triangle.h"

+#include "ss_context.h"

+

+#define SS_OFFSET_BIT	    0x1

+#define SS_TWOSIDE_BIT	    0x2

+#define SS_UNFILLED_BIT	    0x4

+#define SS_MAX_TRIFUNC      0x8

+

+static tnl_triangle_func tri_tab[SS_MAX_TRIFUNC];

+static tnl_quad_func     quad_tab[SS_MAX_TRIFUNC];

+

+

+/*

+ * Render a triangle respecting edge flags.

+ */

+typedef void (* swsetup_edge_render_prim_tri)(struct gl_context *ctx,

+                                              const GLubyte *ef,

+                                              GLuint e0,

+                                              GLuint e1,

+                                              GLuint e2,

+                                              const SWvertex *v0,

+                                              const SWvertex *v1,

+                                              const SWvertex *v2);

+

+/*

+ * Render a triangle using lines and respecting edge flags.

+ */

+static void

+_swsetup_edge_render_line_tri(struct gl_context *ctx,

+                              const GLubyte *ef,

+                              GLuint e0,

+                              GLuint e1,

+                              GLuint e2,

+                              const SWvertex *v0,

+                              const SWvertex *v1,

+                              const SWvertex *v2)

+{

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+

+   if (swsetup->render_prim == GL_POLYGON) {

+      if (ef[e2]) _swrast_Line( ctx, v2, v0 );

+      if (ef[e0]) _swrast_Line( ctx, v0, v1 );

+      if (ef[e1]) _swrast_Line( ctx, v1, v2 );

+   } else {

+      if (ef[e0]) _swrast_Line( ctx, v0, v1 );

+      if (ef[e1]) _swrast_Line( ctx, v1, v2 );

+      if (ef[e2]) _swrast_Line( ctx, v2, v0 );

+   }

+}

+

+/*

+ * Render a triangle using points and respecting edge flags.

+ */

+static void

+_swsetup_edge_render_point_tri(struct gl_context *ctx,

+                               const GLubyte *ef,

+                               GLuint e0,

+                               GLuint e1,

+                               GLuint e2,

+                               const SWvertex *v0,

+                               const SWvertex *v1,

+                               const SWvertex *v2)

+{

+   if (ef[e0]) _swrast_Point( ctx, v0 );

+   if (ef[e1]) _swrast_Point( ctx, v1 );

+   if (ef[e2]) _swrast_Point( ctx, v2 );

+

+   _swrast_flush(ctx);

+}

+

+/*

+ * Render a triangle respecting cull and shade model.

+ */

+static void _swsetup_render_tri(struct gl_context *ctx,

+                                GLuint e0,

+                                GLuint e1,

+                                GLuint e2,

+                                GLuint facing,

+                                swsetup_edge_render_prim_tri render)

+{

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   GLubyte *ef = VB->EdgeFlag;

+   SWvertex *verts = swsetup->verts;

+   SWvertex *v0 = &verts[e0];

+   SWvertex *v1 = &verts[e1];

+   SWvertex *v2 = &verts[e2];

+

+   /* cull testing */

+   if (ctx->Polygon.CullFlag) {

+      if (facing == 1 && ctx->Polygon.CullFaceMode != GL_FRONT)

+         return;

+      if (facing == 0 && ctx->Polygon.CullFaceMode != GL_BACK)

+         return;

+   }

+

+   _swrast_SetFacing(ctx, facing);

+

+   if (ctx->Light.ShadeModel == GL_FLAT) {

+      GLchan c[2][4];

+      GLfloat s[2][4];

+

+      /* save colors/indexes for v0, v1 vertices */

+      COPY_CHAN4(c[0], v0->color);

+      COPY_CHAN4(c[1], v1->color);

+      COPY_4V(s[0], v0->attrib[FRAG_ATTRIB_COL1]);

+      COPY_4V(s[1], v1->attrib[FRAG_ATTRIB_COL1]);

+

+      /* copy v2 color/indexes to v0, v1 indexes */

+      COPY_CHAN4(v0->color, v2->color);

+      COPY_CHAN4(v1->color, v2->color);

+      COPY_4V(v0->attrib[FRAG_ATTRIB_COL1], v2->attrib[FRAG_ATTRIB_COL1]);

+      COPY_4V(v1->attrib[FRAG_ATTRIB_COL1], v2->attrib[FRAG_ATTRIB_COL1]);

+

+      render(ctx, ef, e0, e1, e2, v0, v1, v2);

+

+      COPY_CHAN4(v0->color, c[0]);

+      COPY_CHAN4(v1->color, c[1]);

+      COPY_4V(v0->attrib[FRAG_ATTRIB_COL1], s[0]);

+      COPY_4V(v1->attrib[FRAG_ATTRIB_COL1], s[1]);

+   }

+   else {

+      render(ctx, ef, e0, e1, e2, v0, v1, v2);

+   }

+}

+

+#define SS_COLOR(a,b) UNCLAMPED_FLOAT_TO_RGBA_CHAN(a,b)

+#define SS_SPEC(a,b) COPY_4V(a,b)

+#define SS_IND(a,b) (a = b)

+

+#define IND (0)

+#define TAG(x) x##_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_OFFSET_BIT)

+#define TAG(x) x##_offset_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_TWOSIDE_BIT)

+#define TAG(x) x##_twoside_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT)

+#define TAG(x) x##_offset_twoside_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_UNFILLED_BIT)

+#define TAG(x) x##_unfilled_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_OFFSET_BIT|SS_UNFILLED_BIT)

+#define TAG(x) x##_offset_unfilled_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_TWOSIDE_BIT|SS_UNFILLED_BIT)

+#define TAG(x) x##_twoside_unfilled_rgba

+#include "ss_tritmp.h"

+

+#define IND (SS_OFFSET_BIT|SS_TWOSIDE_BIT|SS_UNFILLED_BIT)

+#define TAG(x) x##_offset_twoside_unfilled_rgba

+#include "ss_tritmp.h"

+

+

+void _swsetup_trifuncs_init( struct gl_context *ctx )

+{

+   (void) ctx;

+

+   init_rgba();

+   init_offset_rgba();

+   init_twoside_rgba();

+   init_offset_twoside_rgba();

+   init_unfilled_rgba();

+   init_offset_unfilled_rgba();

+   init_twoside_unfilled_rgba();

+   init_offset_twoside_unfilled_rgba();

+}

+

+

+static void swsetup_points( struct gl_context *ctx, GLuint first, GLuint last )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;

+   GLuint i;

+

+   if (VB->Elts) {

+      for (i = first; i < last; i++)

+	 if (VB->ClipMask[VB->Elts[i]] == 0)

+	    _swrast_Point( ctx, &verts[VB->Elts[i]] );

+   }

+   else {

+      for (i = first; i < last; i++)

+	 if (VB->ClipMask[i] == 0)

+	    _swrast_Point( ctx, &verts[i] );

+   }

+}

+

+static void swsetup_line( struct gl_context *ctx, GLuint v0, GLuint v1 )

+{

+   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;

+   _swrast_Line( ctx, &verts[v0], &verts[v1] );

+}

+

+

+

+void _swsetup_choose_trifuncs( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   GLuint ind = 0;

+

+   if (ctx->Polygon.OffsetPoint ||

+       ctx->Polygon.OffsetLine ||

+       ctx->Polygon.OffsetFill)

+      ind |= SS_OFFSET_BIT;

+

+   if ((ctx->Light.Enabled && ctx->Light.Model.TwoSide) ||

+       (ctx->VertexProgram._Current && ctx->VertexProgram.TwoSideEnabled))

+      ind |= SS_TWOSIDE_BIT;

+

+   /* We piggyback the two-sided stencil front/back determination on the

+    * unfilled triangle path.

+    */

+   if (ctx->Polygon.FrontMode != GL_FILL ||

+       ctx->Polygon.BackMode != GL_FILL ||

+       (ctx->Stencil.Enabled && ctx->Stencil._TestTwoSide))

+      ind |= SS_UNFILLED_BIT;

+

+   tnl->Driver.Render.Triangle = tri_tab[ind];

+   tnl->Driver.Render.Quad = quad_tab[ind];

+   tnl->Driver.Render.Line = swsetup_line;

+   tnl->Driver.Render.Points = swsetup_points;

+}

diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.h b/mesalib/src/mesa/swrast_setup/ss_triangle.h
index ac553cbd0..e21a9749a 100644
--- a/mesalib/src/mesa/swrast_setup/ss_triangle.h
+++ b/mesalib/src/mesa/swrast_setup/ss_triangle.h
@@ -1,38 +1,38 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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>
- */
-
-#ifndef SS_TRIANGLE_H
-#define SS_TRIANGLE_H
-
-#include "main/mtypes.h"
-
-
-void _swsetup_trifuncs_init( GLcontext *ctx );
-void _swsetup_choose_trifuncs( GLcontext *ctx );
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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>

+ */

+

+#ifndef SS_TRIANGLE_H

+#define SS_TRIANGLE_H

+

+struct gl_context;

+

+

+void _swsetup_trifuncs_init( struct gl_context *ctx );

+void _swsetup_choose_trifuncs( struct gl_context *ctx );

+

+#endif

diff --git a/mesalib/src/mesa/swrast_setup/ss_tritmp.h b/mesalib/src/mesa/swrast_setup/ss_tritmp.h
index 8e9fa1bd5..9b2b7cf6a 100644
--- a/mesalib/src/mesa/swrast_setup/ss_tritmp.h
+++ b/mesalib/src/mesa/swrast_setup/ss_tritmp.h
@@ -1,248 +1,248 @@
-/*
- * 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>
- */
-
-
-/**
- * This is where we handle assigning vertex colors based on front/back
- * facing, compute polygon offset and handle glPolygonMode().
- */
-static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   SScontext *swsetup = SWSETUP_CONTEXT(ctx);
-   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;
-   SWvertex *v[3];
-   GLfloat z[3];
-   GLfloat offset, oz0, oz1, oz2;
-   GLenum mode = GL_FILL;
-   GLuint facing = 0;
-   GLchan saved_color[3][4] = { { 0 } };
-   GLfloat saved_col0[3][4] = { { 0 } };
-   GLfloat saved_spec[3][4] = { { 0 } };
-
-   v[0] = &verts[e0];
-   v[1] = &verts[e1];
-   v[2] = &verts[e2];
-
-   if (IND & (SS_TWOSIDE_BIT | SS_OFFSET_BIT | SS_UNFILLED_BIT))
-   {
-      GLfloat ex = v[0]->attrib[FRAG_ATTRIB_WPOS][0] - v[2]->attrib[FRAG_ATTRIB_WPOS][0];
-      GLfloat ey = v[0]->attrib[FRAG_ATTRIB_WPOS][1] - v[2]->attrib[FRAG_ATTRIB_WPOS][1];
-      GLfloat fx = v[1]->attrib[FRAG_ATTRIB_WPOS][0] - v[2]->attrib[FRAG_ATTRIB_WPOS][0];
-      GLfloat fy = v[1]->attrib[FRAG_ATTRIB_WPOS][1] - v[2]->attrib[FRAG_ATTRIB_WPOS][1];
-      GLfloat cc  = ex*fy - ey*fx;
-
-      if (IND & (SS_TWOSIDE_BIT | SS_UNFILLED_BIT))
-      {
-	 facing = (cc < 0.0) ^ ctx->Polygon._FrontBit;
-
-	 if (IND & SS_UNFILLED_BIT)
-	    mode = facing ? ctx->Polygon.BackMode : ctx->Polygon.FrontMode;
-
-	 if (facing == 1) {
-	    if (IND & SS_TWOSIDE_BIT) {
-               if (VB->BackfaceColorPtr) {
-                  GLfloat (*vbcolor)[4] = VB->BackfaceColorPtr->data;
-
-                  if (swsetup->intColors) {
-                     COPY_CHAN4(saved_color[0], v[0]->color);
-                     COPY_CHAN4(saved_color[1], v[1]->color);
-                     COPY_CHAN4(saved_color[2], v[2]->color);
-                  }
-                  else {
-                     COPY_4V(saved_col0[0], v[0]->attrib[FRAG_ATTRIB_COL0]);
-                     COPY_4V(saved_col0[1], v[1]->attrib[FRAG_ATTRIB_COL0]);
-                     COPY_4V(saved_col0[2], v[2]->attrib[FRAG_ATTRIB_COL0]);
-                  }
-
-                  if (VB->BackfaceColorPtr->stride) {
-                     if (swsetup->intColors) {
-                        SS_COLOR(v[0]->color, vbcolor[e0]);
-                        SS_COLOR(v[1]->color, vbcolor[e1]);
-                        SS_COLOR(v[2]->color, vbcolor[e2]);
-                     }
-                     else {
-                        COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL0], vbcolor[e0]);
-                        COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL0], vbcolor[e1]);
-                        COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL0], vbcolor[e2]);
-                     }
-                  }
-                  else {
-                     /* flat shade */
-                     if (swsetup->intColors) {
-                        SS_COLOR(v[0]->color, vbcolor[0]);
-                        SS_COLOR(v[1]->color, vbcolor[0]);
-                        SS_COLOR(v[2]->color, vbcolor[0]);
-                     }
-                     else {
-                        COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL0], vbcolor[0]);
-                        COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL0], vbcolor[0]);
-                        COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL0], vbcolor[0]);
-                     }
-                  }
-               }
-
-               if (VB->BackfaceSecondaryColorPtr) {
-		  GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
-
-		  COPY_4V(saved_spec[0], v[0]->attrib[FRAG_ATTRIB_COL1]);
-		  COPY_4V(saved_spec[1], v[1]->attrib[FRAG_ATTRIB_COL1]);
-		  COPY_4V(saved_spec[2], v[2]->attrib[FRAG_ATTRIB_COL1]);
-
-		  if (VB->BackfaceSecondaryColorPtr->stride) {
-		    SS_SPEC(v[0]->attrib[FRAG_ATTRIB_COL1], vbspec[e0]);
-		    SS_SPEC(v[1]->attrib[FRAG_ATTRIB_COL1], vbspec[e1]);
-		    SS_SPEC(v[2]->attrib[FRAG_ATTRIB_COL1], vbspec[e2]);
-		  }
-		  else {
-		    SS_SPEC(v[0]->attrib[FRAG_ATTRIB_COL1], vbspec[0]);
-		    SS_SPEC(v[1]->attrib[FRAG_ATTRIB_COL1], vbspec[0]);
-		    SS_SPEC(v[2]->attrib[FRAG_ATTRIB_COL1], vbspec[0]);
-		  }
-	       }
-	    }
-	 }
-      }
-
-      if (IND & SS_OFFSET_BIT) {
-         const GLfloat max = ctx->DrawBuffer->_DepthMaxF;
-         /* save original Z values (restored later) */
-	 z[0] = v[0]->attrib[FRAG_ATTRIB_WPOS][2];
-	 z[1] = v[1]->attrib[FRAG_ATTRIB_WPOS][2];
-	 z[2] = v[2]->attrib[FRAG_ATTRIB_WPOS][2];
-         /* Note that Z values are already scaled to [0,65535] (for example)
-          * so no MRD value is used here.
-          */
-	 offset = ctx->Polygon.OffsetUnits;
-	 if (cc * cc > 1e-16) {
-	    const GLfloat ez = z[0] - z[2];
-	    const GLfloat fz = z[1] - z[2];
-	    const GLfloat oneOverArea = 1.0F / cc;
-	    const GLfloat dzdx = FABSF((ey * fz - ez * fy) * oneOverArea);
-	    const GLfloat dzdy = FABSF((ez * fx - ex * fz) * oneOverArea);
-	    offset += MAX2(dzdx, dzdy) * ctx->Polygon.OffsetFactor;
-	 }
-         /* new Z values */
-         oz0 = CLAMP(v[0]->attrib[FRAG_ATTRIB_WPOS][2] + offset, 0.0F, max);
-         oz1 = CLAMP(v[1]->attrib[FRAG_ATTRIB_WPOS][2] + offset, 0.0F, max);
-         oz2 = CLAMP(v[2]->attrib[FRAG_ATTRIB_WPOS][2] + offset, 0.0F, max);
-      }
-   }
-
-   if (mode == GL_POINT) {
-      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetPoint) {
-	 v[0]->attrib[FRAG_ATTRIB_WPOS][2] = oz0;
-	 v[1]->attrib[FRAG_ATTRIB_WPOS][2] = oz1;
-	 v[2]->attrib[FRAG_ATTRIB_WPOS][2] = oz2;
-      }
-      _swsetup_render_tri(ctx, e0, e1, e2, facing, _swsetup_edge_render_point_tri);
-   } else if (mode == GL_LINE) {
-      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetLine) {
-	 v[0]->attrib[FRAG_ATTRIB_WPOS][2] = oz0;
-	 v[1]->attrib[FRAG_ATTRIB_WPOS][2] = oz1;
-	 v[2]->attrib[FRAG_ATTRIB_WPOS][2] = oz2;
-      }
-      _swsetup_render_tri(ctx, e0, e1, e2, facing, _swsetup_edge_render_line_tri);
-   } else {
-      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetFill) {
-	 v[0]->attrib[FRAG_ATTRIB_WPOS][2] = oz0;
-	 v[1]->attrib[FRAG_ATTRIB_WPOS][2] = oz1;
-	 v[2]->attrib[FRAG_ATTRIB_WPOS][2] = oz2;
-      }
-      _swrast_Triangle( ctx, v[0], v[1], v[2] );
-   }
-
-   /*
-    * Restore original vertex colors, etc.
-    */
-   if (IND & SS_OFFSET_BIT) {
-      v[0]->attrib[FRAG_ATTRIB_WPOS][2] = z[0];
-      v[1]->attrib[FRAG_ATTRIB_WPOS][2] = z[1];
-      v[2]->attrib[FRAG_ATTRIB_WPOS][2] = z[2];
-   }
-
-   if (IND & SS_TWOSIDE_BIT) {
-      if (facing == 1) {
-	if (VB->BackfaceColorPtr) {
-	  if (swsetup->intColors) {
-	    COPY_CHAN4(v[0]->color, saved_color[0]);
-	    COPY_CHAN4(v[1]->color, saved_color[1]);
-	    COPY_CHAN4(v[2]->color, saved_color[2]);
-	  }
-	  else {
-	    COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL0], saved_col0[0]);
-	    COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL0], saved_col0[1]);
-	    COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL0], saved_col0[2]);
-	  }
-	}
-
-	if (VB->BackfaceSecondaryColorPtr) {
-	  COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL1], saved_spec[0]);
-	  COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL1], saved_spec[1]);
-	  COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL1], saved_spec[2]);
-	}
-      }
-   }
-}
-
-
-
-/* Need to fixup edgeflags when decomposing to triangles:
- */
-static void TAG(quadfunc)( GLcontext *ctx, GLuint v0,
-		       GLuint v1, GLuint v2, GLuint v3 )
-{
-   if (IND & SS_UNFILLED_BIT) {
-      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-      if (VB->EdgeFlag) { /* XXX this test shouldn't be needed (bug 12614) */
-         GLubyte ef1 = VB->EdgeFlag[v1];
-         GLubyte ef3 = VB->EdgeFlag[v3];
-         VB->EdgeFlag[v1] = 0;
-         TAG(triangle)( ctx, v0, v1, v3 );
-         VB->EdgeFlag[v1] = ef1;
-         VB->EdgeFlag[v3] = 0;
-         TAG(triangle)( ctx, v1, v2, v3 );
-         VB->EdgeFlag[v3] = ef3;
-      }
-   } else {
-      TAG(triangle)( ctx, v0, v1, v3 );
-      TAG(triangle)( ctx, v1, v2, v3 );
-   }
-}
-
-
-
-
-static void TAG(init)( void )
-{
-   tri_tab[IND] = TAG(triangle);
-   quad_tab[IND] = TAG(quadfunc);
-}
-
-
-#undef IND
-#undef TAG
+/*

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

+ */

+

+

+/**

+ * This is where we handle assigning vertex colors based on front/back

+ * facing, compute polygon offset and handle glPolygonMode().

+ */

+static void TAG(triangle)(struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2 )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   SScontext *swsetup = SWSETUP_CONTEXT(ctx);

+   SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts;

+   SWvertex *v[3];

+   GLfloat z[3];

+   GLfloat offset, oz0, oz1, oz2;

+   GLenum mode = GL_FILL;

+   GLuint facing = 0;

+   GLchan saved_color[3][4] = { { 0 } };

+   GLfloat saved_col0[3][4] = { { 0 } };

+   GLfloat saved_spec[3][4] = { { 0 } };

+

+   v[0] = &verts[e0];

+   v[1] = &verts[e1];

+   v[2] = &verts[e2];

+

+   if (IND & (SS_TWOSIDE_BIT | SS_OFFSET_BIT | SS_UNFILLED_BIT))

+   {

+      GLfloat ex = v[0]->attrib[FRAG_ATTRIB_WPOS][0] - v[2]->attrib[FRAG_ATTRIB_WPOS][0];

+      GLfloat ey = v[0]->attrib[FRAG_ATTRIB_WPOS][1] - v[2]->attrib[FRAG_ATTRIB_WPOS][1];

+      GLfloat fx = v[1]->attrib[FRAG_ATTRIB_WPOS][0] - v[2]->attrib[FRAG_ATTRIB_WPOS][0];

+      GLfloat fy = v[1]->attrib[FRAG_ATTRIB_WPOS][1] - v[2]->attrib[FRAG_ATTRIB_WPOS][1];

+      GLfloat cc  = ex*fy - ey*fx;

+

+      if (IND & (SS_TWOSIDE_BIT | SS_UNFILLED_BIT))

+      {

+	 facing = (cc < 0.0) ^ ctx->Polygon._FrontBit;

+

+	 if (IND & SS_UNFILLED_BIT)

+	    mode = facing ? ctx->Polygon.BackMode : ctx->Polygon.FrontMode;

+

+	 if (facing == 1) {

+	    if (IND & SS_TWOSIDE_BIT) {

+               if (VB->BackfaceColorPtr) {

+                  GLfloat (*vbcolor)[4] = VB->BackfaceColorPtr->data;

+

+                  if (swsetup->intColors) {

+                     COPY_CHAN4(saved_color[0], v[0]->color);

+                     COPY_CHAN4(saved_color[1], v[1]->color);

+                     COPY_CHAN4(saved_color[2], v[2]->color);

+                  }

+                  else {

+                     COPY_4V(saved_col0[0], v[0]->attrib[FRAG_ATTRIB_COL0]);

+                     COPY_4V(saved_col0[1], v[1]->attrib[FRAG_ATTRIB_COL0]);

+                     COPY_4V(saved_col0[2], v[2]->attrib[FRAG_ATTRIB_COL0]);

+                  }

+

+                  if (VB->BackfaceColorPtr->stride) {

+                     if (swsetup->intColors) {

+                        SS_COLOR(v[0]->color, vbcolor[e0]);

+                        SS_COLOR(v[1]->color, vbcolor[e1]);

+                        SS_COLOR(v[2]->color, vbcolor[e2]);

+                     }

+                     else {

+                        COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL0], vbcolor[e0]);

+                        COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL0], vbcolor[e1]);

+                        COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL0], vbcolor[e2]);

+                     }

+                  }

+                  else {

+                     /* flat shade */

+                     if (swsetup->intColors) {

+                        SS_COLOR(v[0]->color, vbcolor[0]);

+                        SS_COLOR(v[1]->color, vbcolor[0]);

+                        SS_COLOR(v[2]->color, vbcolor[0]);

+                     }

+                     else {

+                        COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL0], vbcolor[0]);

+                        COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL0], vbcolor[0]);

+                        COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL0], vbcolor[0]);

+                     }

+                  }

+               }

+

+               if (VB->BackfaceSecondaryColorPtr) {

+		  GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;

+

+		  COPY_4V(saved_spec[0], v[0]->attrib[FRAG_ATTRIB_COL1]);

+		  COPY_4V(saved_spec[1], v[1]->attrib[FRAG_ATTRIB_COL1]);

+		  COPY_4V(saved_spec[2], v[2]->attrib[FRAG_ATTRIB_COL1]);

+

+		  if (VB->BackfaceSecondaryColorPtr->stride) {

+		    SS_SPEC(v[0]->attrib[FRAG_ATTRIB_COL1], vbspec[e0]);

+		    SS_SPEC(v[1]->attrib[FRAG_ATTRIB_COL1], vbspec[e1]);

+		    SS_SPEC(v[2]->attrib[FRAG_ATTRIB_COL1], vbspec[e2]);

+		  }

+		  else {

+		    SS_SPEC(v[0]->attrib[FRAG_ATTRIB_COL1], vbspec[0]);

+		    SS_SPEC(v[1]->attrib[FRAG_ATTRIB_COL1], vbspec[0]);

+		    SS_SPEC(v[2]->attrib[FRAG_ATTRIB_COL1], vbspec[0]);

+		  }

+	       }

+	    }

+	 }

+      }

+

+      if (IND & SS_OFFSET_BIT) {

+         const GLfloat max = ctx->DrawBuffer->_DepthMaxF;

+         /* save original Z values (restored later) */

+	 z[0] = v[0]->attrib[FRAG_ATTRIB_WPOS][2];

+	 z[1] = v[1]->attrib[FRAG_ATTRIB_WPOS][2];

+	 z[2] = v[2]->attrib[FRAG_ATTRIB_WPOS][2];

+         /* Note that Z values are already scaled to [0,65535] (for example)

+          * so no MRD value is used here.

+          */

+	 offset = ctx->Polygon.OffsetUnits;

+	 if (cc * cc > 1e-16) {

+	    const GLfloat ez = z[0] - z[2];

+	    const GLfloat fz = z[1] - z[2];

+	    const GLfloat oneOverArea = 1.0F / cc;

+	    const GLfloat dzdx = FABSF((ey * fz - ez * fy) * oneOverArea);

+	    const GLfloat dzdy = FABSF((ez * fx - ex * fz) * oneOverArea);

+	    offset += MAX2(dzdx, dzdy) * ctx->Polygon.OffsetFactor;

+	 }

+         /* new Z values */

+         oz0 = CLAMP(v[0]->attrib[FRAG_ATTRIB_WPOS][2] + offset, 0.0F, max);

+         oz1 = CLAMP(v[1]->attrib[FRAG_ATTRIB_WPOS][2] + offset, 0.0F, max);

+         oz2 = CLAMP(v[2]->attrib[FRAG_ATTRIB_WPOS][2] + offset, 0.0F, max);

+      }

+   }

+

+   if (mode == GL_POINT) {

+      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetPoint) {

+	 v[0]->attrib[FRAG_ATTRIB_WPOS][2] = oz0;

+	 v[1]->attrib[FRAG_ATTRIB_WPOS][2] = oz1;

+	 v[2]->attrib[FRAG_ATTRIB_WPOS][2] = oz2;

+      }

+      _swsetup_render_tri(ctx, e0, e1, e2, facing, _swsetup_edge_render_point_tri);

+   } else if (mode == GL_LINE) {

+      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetLine) {

+	 v[0]->attrib[FRAG_ATTRIB_WPOS][2] = oz0;

+	 v[1]->attrib[FRAG_ATTRIB_WPOS][2] = oz1;

+	 v[2]->attrib[FRAG_ATTRIB_WPOS][2] = oz2;

+      }

+      _swsetup_render_tri(ctx, e0, e1, e2, facing, _swsetup_edge_render_line_tri);

+   } else {

+      if ((IND & SS_OFFSET_BIT) && ctx->Polygon.OffsetFill) {

+	 v[0]->attrib[FRAG_ATTRIB_WPOS][2] = oz0;

+	 v[1]->attrib[FRAG_ATTRIB_WPOS][2] = oz1;

+	 v[2]->attrib[FRAG_ATTRIB_WPOS][2] = oz2;

+      }

+      _swrast_Triangle( ctx, v[0], v[1], v[2] );

+   }

+

+   /*

+    * Restore original vertex colors, etc.

+    */

+   if (IND & SS_OFFSET_BIT) {

+      v[0]->attrib[FRAG_ATTRIB_WPOS][2] = z[0];

+      v[1]->attrib[FRAG_ATTRIB_WPOS][2] = z[1];

+      v[2]->attrib[FRAG_ATTRIB_WPOS][2] = z[2];

+   }

+

+   if (IND & SS_TWOSIDE_BIT) {

+      if (facing == 1) {

+	if (VB->BackfaceColorPtr) {

+	  if (swsetup->intColors) {

+	    COPY_CHAN4(v[0]->color, saved_color[0]);

+	    COPY_CHAN4(v[1]->color, saved_color[1]);

+	    COPY_CHAN4(v[2]->color, saved_color[2]);

+	  }

+	  else {

+	    COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL0], saved_col0[0]);

+	    COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL0], saved_col0[1]);

+	    COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL0], saved_col0[2]);

+	  }

+	}

+

+	if (VB->BackfaceSecondaryColorPtr) {

+	  COPY_4V(v[0]->attrib[FRAG_ATTRIB_COL1], saved_spec[0]);

+	  COPY_4V(v[1]->attrib[FRAG_ATTRIB_COL1], saved_spec[1]);

+	  COPY_4V(v[2]->attrib[FRAG_ATTRIB_COL1], saved_spec[2]);

+	}

+      }

+   }

+}

+

+

+

+/* Need to fixup edgeflags when decomposing to triangles:

+ */

+static void TAG(quadfunc)( struct gl_context *ctx, GLuint v0,

+		       GLuint v1, GLuint v2, GLuint v3 )

+{

+   if (IND & SS_UNFILLED_BIT) {

+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+      if (VB->EdgeFlag) { /* XXX this test shouldn't be needed (bug 12614) */

+         GLubyte ef1 = VB->EdgeFlag[v1];

+         GLubyte ef3 = VB->EdgeFlag[v3];

+         VB->EdgeFlag[v1] = 0;

+         TAG(triangle)( ctx, v0, v1, v3 );

+         VB->EdgeFlag[v1] = ef1;

+         VB->EdgeFlag[v3] = 0;

+         TAG(triangle)( ctx, v1, v2, v3 );

+         VB->EdgeFlag[v3] = ef3;

+      }

+   } else {

+      TAG(triangle)( ctx, v0, v1, v3 );

+      TAG(triangle)( ctx, v1, v2, v3 );

+   }

+}

+

+

+

+

+static void TAG(init)( void )

+{

+   tri_tab[IND] = TAG(triangle);

+   quad_tab[IND] = TAG(quadfunc);

+}

+

+

+#undef IND

+#undef TAG

diff --git a/mesalib/src/mesa/swrast_setup/ss_vb.h b/mesalib/src/mesa/swrast_setup/ss_vb.h
index 944a3b78d..35d5da6f7 100644
--- a/mesalib/src/mesa/swrast_setup/ss_vb.h
+++ b/mesalib/src/mesa/swrast_setup/ss_vb.h
@@ -1,37 +1,37 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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>
- */
-
-#ifndef SS_VB_H
-#define SS_VB_H
-
-#include "main/mtypes.h"
-
-void _swsetup_vb_init( GLcontext *ctx );
-void _swsetup_choose_rastersetup_func( GLcontext *ctx );
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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>

+ */

+

+#ifndef SS_VB_H

+#define SS_VB_H

+

+struct gl_context;

+

+void _swsetup_vb_init( struct gl_context *ctx );

+void _swsetup_choose_rastersetup_func( struct gl_context *ctx );

+

+#endif

diff --git a/mesalib/src/mesa/swrast_setup/swrast_setup.h b/mesalib/src/mesa/swrast_setup/swrast_setup.h
index 5dcbe2675..6d82ef58f 100644
--- a/mesalib/src/mesa/swrast_setup/swrast_setup.h
+++ b/mesalib/src/mesa/swrast_setup/swrast_setup.h
@@ -1,61 +1,61 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.5
- *
- * Copyright (C) 1999-2001  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>
- */
-
-/* Public interface to the swrast_setup module.  This module provides
- * an implementation of the driver interface to t_vb_render.c, and uses
- * the software rasterizer (swrast) to perform actual rasterization.
- *
- * The internals of the implementation are private, but can be hooked
- * into tnl at any time (except between RenderStart/RenderEnd) by
- * calling _swsetup_Wakeup(). 
- */
-
-#ifndef SWRAST_SETUP_H
-#define SWRAST_SETUP_H
-
-#include "swrast/swrast.h"
-
-extern GLboolean
-_swsetup_CreateContext( GLcontext *ctx );
-
-extern void
-_swsetup_DestroyContext( GLcontext *ctx );
-
-extern void
-_swsetup_InvalidateState( GLcontext *ctx, GLuint new_state );
-
-extern void
-_swsetup_Wakeup( GLcontext *ctx );
-
-/* Helper function to translate a hardware vertex (as understood by
- * the tnl/t_vertex.c code) to a swrast vertex.
- */
-extern void 
-_swsetup_Translate( GLcontext *ctx, const void *vertex, SWvertex *dest );
-
-#endif
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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>

+ */

+

+/* Public interface to the swrast_setup module.  This module provides

+ * an implementation of the driver interface to t_vb_render.c, and uses

+ * the software rasterizer (swrast) to perform actual rasterization.

+ *

+ * The internals of the implementation are private, but can be hooked

+ * into tnl at any time (except between RenderStart/RenderEnd) by

+ * calling _swsetup_Wakeup(). 

+ */

+

+#ifndef SWRAST_SETUP_H

+#define SWRAST_SETUP_H

+

+#include "swrast/swrast.h"

+

+extern GLboolean

+_swsetup_CreateContext( struct gl_context *ctx );

+

+extern void

+_swsetup_DestroyContext( struct gl_context *ctx );

+

+extern void

+_swsetup_InvalidateState( struct gl_context *ctx, GLuint new_state );

+

+extern void

+_swsetup_Wakeup( struct gl_context *ctx );

+

+/* Helper function to translate a hardware vertex (as understood by

+ * the tnl/t_vertex.c code) to a swrast vertex.

+ */

+extern void 

+_swsetup_Translate( struct gl_context *ctx, const void *vertex, SWvertex *dest );

+

+#endif

diff --git a/mesalib/src/mesa/tnl/NOTES b/mesalib/src/mesa/tnl/NOTES
new file mode 100644
index 000000000..9a35e948b
--- /dev/null
+++ b/mesalib/src/mesa/tnl/NOTES
@@ -0,0 +1,102 @@
+INTRODUCTION

+

+A generic, configurable software implementation of GL transformation &

+lighting.

+

+This module provides an implementation of the routines required by the

+'vtxfmt' mechanism of core mesa for tnl functionality in all

+combinations of compile and execute modes.

+

+Most current drivers use the tnl module exclusively to provide this

+functionality, though there is an experimental alternate

+implementation provided by the tnl_dd/t_dd_imm_* files which can

+handle a small subset of GL states in execute mode only.

+

+

+STATE

+

+To create and destroy the module:

+

+	GLboolean _tnl_CreateContext( struct gl_context *ctx );

+	void _tnl_DestroyContext( struct gl_context *ctx );

+

+The module is not active by default, and must be installed by calling

+_tnl_Wakeup().  This function installs internal tnl functions into all

+the vtxfmt dispatch hooks, thus taking over the task of transformation

+and lighting entirely:

+

+        void _tnl_wakeup_exec( struct gl_context *ctx );

+	void _tnl_wakeup_save_exec( struct gl_context *ctx );

+

+   

+This module tracks state changes internally and maintains derived

+values based on the current state.  For this to work, the driver

+ensure the following funciton is called whenever the state changes and

+the swsetup module is 'awake':

+

+	void _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state );

+

+There is no explicit call to put the tnl module to sleep.  Simply

+install other function pointers into all the vtxfmt dispatch slots,

+and (optionally) cease calling _tnl_InvalidateState().

+

+CUSTOMIZATION

+

+The module provides customizability through several mechanisms.  The

+most important is by allowing drivers to specify the pipeline through

+which vertex data is passed, including its eventual transfer to

+rasterization hardware (or software).

+

+The default pipeline is specified in t_pipeline.c, and is usually a

+starting point for driver pipelines.  Some drivers will remove a stage

+where hardware provides support for the implemented operation (for

+instance fog where per-pixel hardware fog is available, as in the dri

+tdfx driver), or add stages to shortcircuit latter operations (for

+example taking advantage of hardware support for strips and other

+higher-level primitives (for example the radeon driver).

+

+In addition, the following functions provide further tweaks:

+

+extern void

+_tnl_need_projected_coords( struct gl_context *ctx, GLboolean flag );

+

+	- Direct the default vertex transformation stage to

+          produce/not produce projected clip coordinates.

+	  

+extern void

+_tnl_need_dlist_loopback( struct gl_context *ctx, GLboolean flag );

+      

+        - Direct the display list component of the tnl module to

+          replay display lists as 'glVertex' type calls, rather than

+          passing the display list data directly into the tnl pipeline

+          mechanism.  

+

+	  This allows display lists to be replayed by the tnl module

+	  even when the module is not strictly active.

+

+

+extern void

+_tnl_need_dlist_norm_lengths( struct gl_context *ctx, GLboolean flag );

+

+	- Direct the display list component to enable/disable caching

+          1/length values for display list normals.  Doing so is

+          ususally helpful when lighting is performed in software, but

+          wasteful otherwise.

+

+

+DRIVER INTERFACE

+

+The module itself offers a minimal driver interface:

+

+	 void (*RunPipeline)( struct gl_context *ctx );

+

+Normally this is set to _tnl_RunPipeline(), however the driver can use

+this hook to wrap checks or other code around this call. 

+

+In addition, the driver interface for the default render pipeline

+stage is housed in the tnl context struct (this could be cleaner).  

+

+

+RENDER DRIVER INTERFACE

+

+See t_context.h for the definition and explanation of this.
\ No newline at end of file
diff --git a/mesalib/src/mesa/tnl/t_context.c b/mesalib/src/mesa/tnl/t_context.c
index f27c8ad9d..f27f2d090 100644
--- a/mesalib/src/mesa/tnl/t_context.c
+++ b/mesalib/src/mesa/tnl/t_context.c
@@ -1,223 +1,223 @@
-/*
- * 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/imports.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "main/light.h"
-#include "math/m_translate.h"
-#include "math/m_xform.h"
-
-#include "tnl.h"
-#include "t_context.h"
-#include "t_pipeline.h"
-
-#include "vbo/vbo.h"
-
-GLboolean
-_tnl_CreateContext( GLcontext *ctx )
-{
-   TNLcontext *tnl;
-
-   /* Create the TNLcontext structure
-    */
-   ctx->swtnl_context = tnl = (TNLcontext *) CALLOC( sizeof(TNLcontext) );
-
-   if (!tnl) {
-      return GL_FALSE;
-   }
-
-   /* Initialize the VB.
-    */
-   tnl->vb.Size = ctx->Const.MaxArrayLockSize + MAX_CLIPPED_VERTICES;
-
-
-   /* Initialize tnl state.
-    */
-   if (ctx->VertexProgram._MaintainTnlProgram) {
-      _tnl_install_pipeline( ctx, _tnl_vp_pipeline );
-   } else {
-      _tnl_install_pipeline( ctx, _tnl_default_pipeline );
-   }
-
-   tnl->NeedNdcCoords = GL_TRUE;
-   tnl->AllowVertexFog = GL_TRUE;
-   tnl->AllowPixelFog = GL_TRUE;
-
-   /* Set a few default values in the driver struct.
-    */
-   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;
-   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;
-   tnl->Driver.NotifyMaterialChange = _mesa_validate_all_lighting_tables;
-
-   tnl->nr_blocks = 0;
-
-   /* plug in the VBO drawing function */
-   vbo_set_draw_func(ctx, _tnl_vbo_draw_prims);
-
-   _math_init_transformation();
-   _math_init_translate();
-
-   return GL_TRUE;
-}
-
-
-void
-_tnl_DestroyContext( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-
-   _tnl_destroy_pipeline( ctx );
-
-   FREE(tnl);
-   ctx->swtnl_context = NULL;
-}
-
-
-void
-_tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   const struct gl_vertex_program *vp = ctx->VertexProgram._Current;
-   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
-   GLuint i;
-
-   if (new_state & (_NEW_HINT | _NEW_PROGRAM)) {
-      ASSERT(tnl->AllowVertexFog || tnl->AllowPixelFog);
-      tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))
-         || !tnl->AllowPixelFog) && !fp;
-   }
-
-   tnl->pipeline.new_state |= new_state;
-
-   /* Calculate tnl->render_inputs.  This bitmask indicates which vertex
-    * attributes need to be emitted to the rasterizer.
-    */
-   RENDERINPUTS_ZERO( tnl->render_inputs_bitset );
-   RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POS );
-
-   if (!fp || (fp->Base.InputsRead & FRAG_BIT_COL0)) {
-     RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR0 );
-   }
-
-   if (NEED_SECONDARY_COLOR(ctx))
-     RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR1 );
-
-   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
-     if (ctx->Texture._EnabledCoordUnits & (1 << i) ||
-	 (fp && fp->Base.InputsRead & FRAG_BIT_TEX(i))) {
-       RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX(i) );
-     }
-   }
-
-   if (ctx->Fog.Enabled) {
-      /* fixed-function fog */
-      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
-   }
-   else if (fp) {
-      if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {
-         /* fragment program needs fog coord */
-         RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
-      }
-   }
-
-   if (ctx->Polygon.FrontMode != GL_FILL || 
-       ctx->Polygon.BackMode != GL_FILL)
-      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_EDGEFLAG );
-
-   if (ctx->RenderMode == GL_FEEDBACK)
-      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX0 );
-
-   if (ctx->Point._Attenuated ||
-       (ctx->VertexProgram._Enabled && ctx->VertexProgram.PointSizeEnabled))
-      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POINTSIZE );
-
-   /* check for varying vars which are written by the vertex program */
-   if (vp) {
-      GLuint i;
-      for (i = 0; i < MAX_VARYING; i++) {
-	 if (vp->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_VAR0 + i)) {
-            RENDERINPUTS_SET(tnl->render_inputs_bitset,
-                             _TNL_ATTRIB_GENERIC(i));
-         }
-      }
-   }
-}
-
-
-void
-_tnl_wakeup( GLcontext *ctx )
-{
-   /* Assume we haven't been getting state updates either:
-    */
-   _tnl_InvalidateState( ctx, ~0 );
-
-#if 0
-   if (ctx->Light.ColorMaterialEnabled) {
-      _mesa_update_color_material( ctx, 
-				   ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
-   }
-#endif
-}
-
-
-
-
-/**
- * Drivers call this function to tell the TCL module whether or not
- * it wants Normalized Device Coords (NDC) computed.  I.e. whether
- * we should "Divide-by-W".  Software renders will want that.
- */
-void
-_tnl_need_projected_coords( GLcontext *ctx, GLboolean mode )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   tnl->NeedNdcCoords = mode;
-}
-
-void
-_tnl_allow_vertex_fog( GLcontext *ctx, GLboolean value )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   tnl->AllowVertexFog = value;
-   tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))
-      || !tnl->AllowPixelFog) && !ctx->FragmentProgram._Current;
-
-}
-
-void
-_tnl_allow_pixel_fog( GLcontext *ctx, GLboolean value )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   tnl->AllowPixelFog = value;
-   tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))
-      || !tnl->AllowPixelFog) && !ctx->FragmentProgram._Current;
-}
-
+/*

+ * 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/imports.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+#include "main/light.h"

+#include "math/m_translate.h"

+#include "math/m_xform.h"

+

+#include "tnl.h"

+#include "t_context.h"

+#include "t_pipeline.h"

+

+#include "vbo/vbo.h"

+

+GLboolean

+_tnl_CreateContext( struct gl_context *ctx )

+{

+   TNLcontext *tnl;

+

+   /* Create the TNLcontext structure

+    */

+   ctx->swtnl_context = tnl = (TNLcontext *) CALLOC( sizeof(TNLcontext) );

+

+   if (!tnl) {

+      return GL_FALSE;

+   }

+

+   /* Initialize the VB.

+    */

+   tnl->vb.Size = ctx->Const.MaxArrayLockSize + MAX_CLIPPED_VERTICES;

+

+

+   /* Initialize tnl state.

+    */

+   if (ctx->VertexProgram._MaintainTnlProgram) {

+      _tnl_install_pipeline( ctx, _tnl_vp_pipeline );

+   } else {

+      _tnl_install_pipeline( ctx, _tnl_default_pipeline );

+   }

+

+   tnl->NeedNdcCoords = GL_TRUE;

+   tnl->AllowVertexFog = GL_TRUE;

+   tnl->AllowPixelFog = GL_TRUE;

+

+   /* Set a few default values in the driver struct.

+    */

+   tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts;

+   tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts;

+   tnl->Driver.NotifyMaterialChange = _mesa_validate_all_lighting_tables;

+

+   tnl->nr_blocks = 0;

+

+   /* plug in the VBO drawing function */

+   vbo_set_draw_func(ctx, _tnl_vbo_draw_prims);

+

+   _math_init_transformation();

+   _math_init_translate();

+

+   return GL_TRUE;

+}

+

+

+void

+_tnl_DestroyContext( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+

+   _tnl_destroy_pipeline( ctx );

+

+   FREE(tnl);

+   ctx->swtnl_context = NULL;

+}

+

+

+void

+_tnl_InvalidateState( struct gl_context *ctx, GLuint new_state )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   const struct gl_vertex_program *vp = ctx->VertexProgram._Current;

+   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;

+   GLuint i;

+

+   if (new_state & (_NEW_HINT | _NEW_PROGRAM)) {

+      ASSERT(tnl->AllowVertexFog || tnl->AllowPixelFog);

+      tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))

+         || !tnl->AllowPixelFog) && !fp;

+   }

+

+   tnl->pipeline.new_state |= new_state;

+

+   /* Calculate tnl->render_inputs.  This bitmask indicates which vertex

+    * attributes need to be emitted to the rasterizer.

+    */

+   RENDERINPUTS_ZERO( tnl->render_inputs_bitset );

+   RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POS );

+

+   if (!fp || (fp->Base.InputsRead & FRAG_BIT_COL0)) {

+     RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR0 );

+   }

+

+   if (NEED_SECONDARY_COLOR(ctx))

+     RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_COLOR1 );

+

+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {

+     if (ctx->Texture._EnabledCoordUnits & (1 << i) ||

+	 (fp && fp->Base.InputsRead & FRAG_BIT_TEX(i))) {

+       RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX(i) );

+     }

+   }

+

+   if (ctx->Fog.Enabled) {

+      /* fixed-function fog */

+      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );

+   }

+   else if (fp) {

+      if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {

+         /* fragment program needs fog coord */

+         RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );

+      }

+   }

+

+   if (ctx->Polygon.FrontMode != GL_FILL || 

+       ctx->Polygon.BackMode != GL_FILL)

+      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_EDGEFLAG );

+

+   if (ctx->RenderMode == GL_FEEDBACK)

+      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_TEX0 );

+

+   if (ctx->Point._Attenuated ||

+       (ctx->VertexProgram._Enabled && ctx->VertexProgram.PointSizeEnabled))

+      RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_POINTSIZE );

+

+   /* check for varying vars which are written by the vertex program */

+   if (vp) {

+      GLuint i;

+      for (i = 0; i < MAX_VARYING; i++) {

+	 if (vp->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_VAR0 + i)) {

+            RENDERINPUTS_SET(tnl->render_inputs_bitset,

+                             _TNL_ATTRIB_GENERIC(i));

+         }

+      }

+   }

+}

+

+

+void

+_tnl_wakeup( struct gl_context *ctx )

+{

+   /* Assume we haven't been getting state updates either:

+    */

+   _tnl_InvalidateState( ctx, ~0 );

+

+#if 0

+   if (ctx->Light.ColorMaterialEnabled) {

+      _mesa_update_color_material( ctx, 

+				   ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );

+   }

+#endif

+}

+

+

+

+

+/**

+ * Drivers call this function to tell the TCL module whether or not

+ * it wants Normalized Device Coords (NDC) computed.  I.e. whether

+ * we should "Divide-by-W".  Software renders will want that.

+ */

+void

+_tnl_need_projected_coords( struct gl_context *ctx, GLboolean mode )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl->NeedNdcCoords = mode;

+}

+

+void

+_tnl_allow_vertex_fog( struct gl_context *ctx, GLboolean value )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl->AllowVertexFog = value;

+   tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))

+      || !tnl->AllowPixelFog) && !ctx->FragmentProgram._Current;

+

+}

+

+void

+_tnl_allow_pixel_fog( struct gl_context *ctx, GLboolean value )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl->AllowPixelFog = value;

+   tnl->_DoVertexFog = ((tnl->AllowVertexFog && (ctx->Hint.Fog != GL_NICEST))

+      || !tnl->AllowPixelFog) && !ctx->FragmentProgram._Current;

+}

+

diff --git a/mesalib/src/mesa/tnl/t_context.h b/mesalib/src/mesa/tnl/t_context.h
index 258906f79..ecc4e2aa4 100644
--- a/mesalib/src/mesa/tnl/t_context.h
+++ b/mesalib/src/mesa/tnl/t_context.h
@@ -1,545 +1,545 @@
-/*
- * 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 t_context.h
- * \brief TnL module datatypes and definitions.
- * \author Keith Whitwell
- */
-
-
-/**
- * \mainpage The TNL-module
- *
- * TNL stands for "transform and lighting", i.e. this module implements
- * a pipeline that receives as input a buffer of vertices and does all
- * necessary transformations (rotations, clipping, vertex shader etc.)
- * and passes then the output to the rasterizer.
- *
- * The tnl_pipeline contains the array of all stages, which should be
- * applied. Each stage is a black-box, which is described by an
- * tnl_pipeline_stage. The function ::_tnl_run_pipeline applies all the
- * stages to the vertex_buffer TNLcontext::vb, where the vertex data
- * is stored. The last stage in the pipeline is the rasterizer.
- *
- */
-
-
-#ifndef _T_CONTEXT_H
-#define _T_CONTEXT_H
-
-#include "main/glheader.h"
-#include "main/bitset.h"
-#include "main/mtypes.h"
-
-#include "math/m_vector.h"
-
-#include "vbo/vbo.h"
-
-#define MAX_PIPELINE_STAGES     30
-
-/*
- * Note: The first attributes match the VERT_ATTRIB_* definitions
- * in mtypes.h.  However, the tnl module has additional attributes
- * for materials, color indexes, edge flags, etc.
- */
-/* Although it's nice to use these as bit indexes in a DWORD flag, we
- * could manage without if necessary.  Another limit currently is the
- * number of bits allocated for these numbers in places like vertex
- * program instruction formats and register layouts.
- */
-/* The bit space exhaustion is a fact now, done by _TNL_ATTRIB_ATTRIBUTE* for
- * GLSL vertex shader which cannot be aliased with conventional vertex attribs.
- * Compacting _TNL_ATTRIB_MAT_* attribs would not work, they would not give
- * as many free bits (11 plus already 1 free bit) as _TNL_ATTRIB_ATTRIBUTE*
- * attribs want (16).
- */
-enum {
-	_TNL_ATTRIB_POS = 0,
-	_TNL_ATTRIB_WEIGHT = 1,
-	_TNL_ATTRIB_NORMAL = 2,
-	_TNL_ATTRIB_COLOR0 = 3,
-	_TNL_ATTRIB_COLOR1 = 4,
-	_TNL_ATTRIB_FOG = 5,
-	_TNL_ATTRIB_COLOR_INDEX = 6,
-	_TNL_ATTRIB_EDGEFLAG = 7,
-	_TNL_ATTRIB_TEX0 = 8,
-	_TNL_ATTRIB_TEX1 = 9,
-	_TNL_ATTRIB_TEX2 = 10,
-	_TNL_ATTRIB_TEX3 = 11,
-	_TNL_ATTRIB_TEX4 = 12,
-	_TNL_ATTRIB_TEX5 = 13,
-	_TNL_ATTRIB_TEX6 = 14,
-	_TNL_ATTRIB_TEX7 = 15,
-
-	_TNL_ATTRIB_GENERIC0 = 16, /* doesn't really exist! */
-	_TNL_ATTRIB_GENERIC1 = 17,
-	_TNL_ATTRIB_GENERIC2 = 18,
-	_TNL_ATTRIB_GENERIC3 = 19,
-	_TNL_ATTRIB_GENERIC4 = 20,
-	_TNL_ATTRIB_GENERIC5 = 21,
-	_TNL_ATTRIB_GENERIC6 = 22,
-	_TNL_ATTRIB_GENERIC7 = 23,
-	_TNL_ATTRIB_GENERIC8 = 24,
-	_TNL_ATTRIB_GENERIC9 = 25,
-	_TNL_ATTRIB_GENERIC10 = 26,
-	_TNL_ATTRIB_GENERIC11 = 27,
-	_TNL_ATTRIB_GENERIC12 = 28,
-	_TNL_ATTRIB_GENERIC13 = 29,
-	_TNL_ATTRIB_GENERIC14 = 30,
-	_TNL_ATTRIB_GENERIC15 = 31,
-
-	/* These alias with the generics, but they are not active
-	 * concurrently, so it's not a problem.  The TNL module
-	 * doesn't have to do anything about this as this is how they
-	 * are passed into the _draw_prims callback.
-	 *
-	 * When we generate fixed-function replacement programs (in
-	 * t_vp_build.c currently), they refer to the appropriate
-	 * generic attribute in order to pick up per-vertex material
-	 * data.
-	 */
-	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 16,
-	_TNL_ATTRIB_MAT_BACK_AMBIENT = 17,
-	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 18,
-	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 19,
-	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 20,
-	_TNL_ATTRIB_MAT_BACK_SPECULAR = 21,
-	_TNL_ATTRIB_MAT_FRONT_EMISSION = 22,
-	_TNL_ATTRIB_MAT_BACK_EMISSION = 23,
-	_TNL_ATTRIB_MAT_FRONT_SHININESS = 24,
-	_TNL_ATTRIB_MAT_BACK_SHININESS = 25,
-	_TNL_ATTRIB_MAT_FRONT_INDEXES = 26,
-	_TNL_ATTRIB_MAT_BACK_INDEXES = 27,
-
-	/* This is really a VERT_RESULT, not an attrib.  Need to fix
-	 * tnl to understand the difference.
-	 */
-	_TNL_ATTRIB_POINTSIZE = 16,
-
-	_TNL_ATTRIB_MAX = 32
-} ;
-
-#define _TNL_ATTRIB_TEX(u)       (_TNL_ATTRIB_TEX0 + (u))
-#define _TNL_ATTRIB_GENERIC(n) (_TNL_ATTRIB_GENERIC0 + (n))
-
-/* special index used for handing invalid glVertexAttribute() indices */
-#define _TNL_ATTRIB_ERROR    (_TNL_ATTRIB_GENERIC15 + 1)
-
-/**
- * Handy attribute ranges:
- */
-#define _TNL_FIRST_PROG      _TNL_ATTRIB_WEIGHT
-#define _TNL_LAST_PROG       _TNL_ATTRIB_TEX7
-
-#define _TNL_FIRST_TEX       _TNL_ATTRIB_TEX0
-#define _TNL_LAST_TEX        _TNL_ATTRIB_TEX7
-
-#define _TNL_FIRST_GENERIC _TNL_ATTRIB_GENERIC0
-#define _TNL_LAST_GENERIC  _TNL_ATTRIB_GENERIC15
-
-#define _TNL_FIRST_MAT       _TNL_ATTRIB_MAT_FRONT_AMBIENT /* GENERIC0 */
-#define _TNL_LAST_MAT        _TNL_ATTRIB_MAT_BACK_INDEXES  /* GENERIC11 */
-
-/* Number of available generic attributes */
-#define _TNL_NUM_GENERIC 16
-
-/* Number of attributes used for evaluators */
-#define _TNL_NUM_EVAL 16
-
-
-#define PRIM_BEGIN     0x10
-#define PRIM_END       0x20
-#define PRIM_MODE_MASK 0x0f
-
-static INLINE GLuint _tnl_translate_prim( const struct _mesa_prim *prim )
-{
-   GLuint flag;
-   flag = prim->mode;
-   if (prim->begin) flag |= PRIM_BEGIN;
-   if (prim->end) flag |= PRIM_END;
-   return flag;
-}
-
-
-
-
-/**
- * Contains the current state of a running pipeline.
- */
-struct vertex_buffer
-{
-   GLuint Size;  /**< Max vertices per vertex buffer, constant */
-
-   /* Constant over the pipeline.
-    */
-   GLuint Count;  /**< Number of vertices currently in buffer */
-
-   /* Pointers to current data.  Most of the data is in AttribPtr -- all of
-    * it that is one of VERT_ATTRIB_X.  For things only produced by TNL,
-    * such as backface color or eye-space coordinates, they are stored
-    * here.
-    */
-   GLuint      *Elts;		                
-   GLvector4f  *EyePtr;		                /* _TNL_BIT_POS */
-   GLvector4f  *ClipPtr;	                /* _TNL_BIT_POS */
-   GLvector4f  *NdcPtr;                         /* _TNL_BIT_POS */
-   GLubyte     ClipOrMask;	                /* _TNL_BIT_POS */
-   GLubyte     ClipAndMask;	                /* _TNL_BIT_POS */
-   GLubyte     *ClipMask;		        /* _TNL_BIT_POS */
-   GLfloat     *NormalLengthPtr;	        /* _TNL_BIT_NORMAL */
-   GLboolean   *EdgeFlag;	                /* _TNL_BIT_EDGEFLAG */
-   GLvector4f  *BackfaceIndexPtr;
-   GLvector4f  *BackfaceColorPtr;
-   GLvector4f  *BackfaceSecondaryColorPtr;
-
-   const struct _mesa_prim  *Primitive;	              
-   GLuint      PrimitiveCount;	      
-
-   /* Inputs to the vertex program stage */
-   GLvector4f *AttribPtr[_TNL_ATTRIB_MAX];      /* GL_NV_vertex_program */
-};
-
-
-/**
- * Describes an individual operation on the pipeline.
- */
-struct tnl_pipeline_stage
-{
-   const char *name;
-
-   /* Private data for the pipeline stage:
-    */
-   void *privatePtr;
-
-   /* Allocate private data
-    */
-   GLboolean (*create)( GLcontext *ctx, struct tnl_pipeline_stage * );
-
-   /* Free private data.
-    */
-   void (*destroy)( struct tnl_pipeline_stage * );
-
-   /* Called on any statechange or input array size change or
-    * input array change to/from zero stride.
-    */
-   void (*validate)( GLcontext *ctx, struct tnl_pipeline_stage * );
-
-   /* Called from _tnl_run_pipeline().  The stage.changed_inputs value
-    * encodes all inputs to thee struct which have changed.  If
-    * non-zero, recompute all affected outputs of the stage, otherwise
-    * execute any 'sideeffects' of the stage.
-    *
-    * Return value: GL_TRUE - keep going
-    *               GL_FALSE - finished pipeline
-    */
-   GLboolean (*run)( GLcontext *ctx, struct tnl_pipeline_stage * );
-};
-
-
-
-/** Contains the array of all pipeline stages.
- * The default values are defined at the end of t_pipeline.c 
- */
-struct tnl_pipeline {
-   
-   GLuint last_attrib_stride[_TNL_ATTRIB_MAX];
-   GLuint last_attrib_size[_TNL_ATTRIB_MAX];
-   GLuint input_changes;
-   GLuint new_state;
-
-   struct tnl_pipeline_stage stages[MAX_PIPELINE_STAGES+1];
-   GLuint nr_stages;
-};
-
-struct tnl_clipspace;
-struct tnl_clipspace_attr;
-
-typedef void (*tnl_extract_func)( const struct tnl_clipspace_attr *a, 
-				  GLfloat *out, 
-				  const GLubyte *v );
-
-typedef void (*tnl_insert_func)( const struct tnl_clipspace_attr *a, 
-				 GLubyte *v, 
-				 const GLfloat *in );
-
-typedef void (*tnl_emit_func)( GLcontext *ctx, 
-			       GLuint count, 
-			       GLubyte *dest );
-
-
-/**
- * Describes how to convert/move a vertex attribute from a vertex array
- * to a vertex structure.
- */
-struct tnl_clipspace_attr
-{
-   GLuint attrib;          /* which vertex attrib (0=position, etc) */
-   GLuint format;
-   GLuint vertoffset;      /* position of the attrib in the vertex struct */
-   GLuint vertattrsize;    /* size of the attribute in bytes */
-   GLubyte *inputptr;
-   GLuint inputstride;
-   GLuint inputsize;
-   const tnl_insert_func *insert;
-   tnl_insert_func emit;
-   tnl_extract_func extract;
-   const GLfloat *vp;   /* NDC->Viewport mapping matrix */
-};
-
-
-
-
-typedef void (*tnl_points_func)( GLcontext *ctx, GLuint first, GLuint last );
-typedef void (*tnl_line_func)( GLcontext *ctx, GLuint v1, GLuint v2 );
-typedef void (*tnl_triangle_func)( GLcontext *ctx,
-				   GLuint v1, GLuint v2, GLuint v3 );
-typedef void (*tnl_quad_func)( GLcontext *ctx, GLuint v1, GLuint v2,
-			       GLuint v3, GLuint v4 );
-typedef void (*tnl_render_func)( GLcontext *ctx, GLuint start, GLuint count,
-				 GLuint flags );
-typedef void (*tnl_interp_func)( GLcontext *ctx,
-				 GLfloat t, GLuint dst, GLuint out, GLuint in,
-				 GLboolean force_boundary );
-typedef void (*tnl_copy_pv_func)( GLcontext *ctx, GLuint dst, GLuint src );
-typedef void (*tnl_setup_func)( GLcontext *ctx,
-				GLuint start, GLuint end,
-				GLuint new_inputs);
-
-
-struct tnl_attr_type {
-   GLuint format;
-   GLuint size;
-   GLuint stride;
-   GLuint offset;
-};
-
-struct tnl_clipspace_fastpath {
-   GLuint vertex_size;
-   GLuint attr_count;
-   GLboolean match_strides;
-
-   struct tnl_attr_type *attr;
-
-   tnl_emit_func func;
-   struct tnl_clipspace_fastpath *next;
-};
-
-/**
- * Used to describe conversion of vertex arrays to vertex structures.
- * I.e. Structure of arrays to arrays of structs.
- */
-struct tnl_clipspace
-{
-   GLboolean need_extras;
-   
-   GLuint new_inputs;
-
-   GLubyte *vertex_buf;
-   GLuint vertex_size;
-   GLuint max_vertex_size;
-
-   struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];
-   GLuint attr_count;
-
-   tnl_emit_func emit;
-   tnl_interp_func interp;
-   tnl_copy_pv_func copy_pv;
-
-   /* Parameters and constants for codegen:
-    */
-   GLboolean need_viewport;
-   GLfloat vp_scale[4];		
-   GLfloat vp_xlate[4];
-   GLfloat chan_scale[4];
-   GLfloat identity[4];
-
-   struct tnl_clipspace_fastpath *fastpath;
-   
-   void (*codegen_emit)( GLcontext *ctx );
-};
-
-
-struct tnl_device_driver
-{
-   /***
-    *** TNL Pipeline
-    ***/
-
-   void (*RunPipeline)(GLcontext *ctx);
-   /* Replaces PipelineStart/PipelineFinish -- intended to allow
-    * drivers to wrap _tnl_run_pipeline() with code to validate state
-    * and grab/release hardware locks.  
-    */
-
-   void (*NotifyMaterialChange)(GLcontext *ctx);
-   /* Alert tnl-aware drivers of changes to material.
-    */
-
-   /***
-    *** Rendering -- These functions called only from t_vb_render.c
-    ***/
-   struct
-   {
-      void (*Start)(GLcontext *ctx);
-      void (*Finish)(GLcontext *ctx);
-      /* Called before and after all rendering operations, including DrawPixels,
-       * ReadPixels, Bitmap, span functions, and CopyTexImage, etc commands.
-       * These are a suitable place for grabbing/releasing hardware locks.
-       */
-
-      void (*PrimitiveNotify)(GLcontext *ctx, GLenum mode);
-      /* Called between RenderStart() and RenderFinish() to indicate the
-       * type of primitive we're about to draw.  Mode will be one of the
-       * modes accepted by glBegin().
-       */
-
-      tnl_interp_func Interp;
-      /* The interp function is called by the clipping routines when we need
-       * to generate an interpolated vertex.  All pertinant vertex ancilliary
-       * data should be computed by interpolating between the 'in' and 'out'
-       * vertices.
-       */
-
-      tnl_copy_pv_func CopyPV;
-      /* The copy function is used to make a copy of a vertex.  All pertinant
-       * vertex attributes should be copied.
-       */
-
-      void (*ClippedPolygon)( GLcontext *ctx, const GLuint *elts, GLuint n );
-      /* Render a polygon with <n> vertices whose indexes are in the <elts>
-       * array.
-       */
-
-      void (*ClippedLine)( GLcontext *ctx, GLuint v0, GLuint v1 );
-      /* Render a line between the two vertices given by indexes v0 and v1. */
-
-      tnl_points_func           Points; /* must now respect vb->elts */
-      tnl_line_func             Line;
-      tnl_triangle_func         Triangle;
-      tnl_quad_func             Quad;
-      /* These functions are called in order to render points, lines,
-       * triangles and quads.  These are only called via the T&L module.
-       */
-
-      tnl_render_func          *PrimTabVerts;
-      tnl_render_func          *PrimTabElts;
-      /* Render whole unclipped primitives (points, lines, linestrips,
-       * lineloops, etc).  The tables are indexed by the GL enum of the
-       * primitive to be rendered.  RenderTabVerts is used for non-indexed
-       * arrays of vertices.  RenderTabElts is used for indexed arrays of
-       * vertices.
-       */
-
-      void (*ResetLineStipple)( GLcontext *ctx );
-      /* Reset the hardware's line stipple counter.
-       */
-
-      tnl_setup_func BuildVertices;
-      /* This function is called whenever new vertices are required for
-       * rendering.  The vertices in question are those n such that start
-       * <= n < end.  The new_inputs parameter indicates those fields of
-       * the vertex which need to be updated, if only a partial repair of
-       * the vertex is required.
-       *
-       * This function is called only from _tnl_render_stage in tnl/t_render.c.
-       */
-      
-
-      GLboolean (*Multipass)( GLcontext *ctx, GLuint passno );
-      /* Driver may request additional render passes by returning GL_TRUE
-       * when this function is called.  This function will be called
-       * after the first pass, and passes will be made until the function
-       * returns GL_FALSE.  If no function is registered, only one pass
-       * is made.
-       *
-       * This function will be first invoked with passno == 1.
-       */
-   } Render;
-};
-
-
-#define DECLARE_RENDERINPUTS(name) BITSET64_DECLARE(name, _TNL_ATTRIB_MAX)
-#define RENDERINPUTS_COPY BITSET64_COPY
-#define RENDERINPUTS_EQUAL BITSET64_EQUAL
-#define RENDERINPUTS_ZERO BITSET64_ZERO
-#define RENDERINPUTS_ONES BITSET64_ONES
-#define RENDERINPUTS_TEST BITSET64_TEST
-#define RENDERINPUTS_SET BITSET64_SET
-#define RENDERINPUTS_CLEAR BITSET64_CLEAR
-#define RENDERINPUTS_TEST_RANGE BITSET64_TEST_RANGE
-#define RENDERINPUTS_SET_RANGE BITSET64_SET_RANGE
-#define RENDERINPUTS_CLEAR_RANGE BITSET64_CLEAR_RANGE
-
-
-/**
- * Context state for T&L context.
- */
-typedef struct
-{
-   /* Driver interface.
-    */
-   struct tnl_device_driver Driver;
-
-   /* Pipeline
-    */
-   struct tnl_pipeline pipeline;
-   struct vertex_buffer vb;
-
-   /* Clipspace/ndc/window vertex managment:
-    */
-   struct tnl_clipspace clipspace;
-
-   /* Probably need a better configuration mechanism:
-    */
-   GLboolean NeedNdcCoords;
-   GLboolean AllowVertexFog;
-   GLboolean AllowPixelFog;
-   GLboolean _DoVertexFog;  /* eval fog function at each vertex? */
-
-   DECLARE_RENDERINPUTS(render_inputs_bitset);
-
-   GLvector4f tmp_inputs[VERT_ATTRIB_MAX];
-
-   /* Temp storage for t_draw.c: 
-    */
-   GLubyte *block[VERT_ATTRIB_MAX];
-   GLuint nr_blocks;
-
-} TNLcontext;
-
-
-
-#define TNL_CONTEXT(ctx) ((TNLcontext *)((ctx)->swtnl_context))
-
-
-#define TYPE_IDX(t) ((t) & 0xf)
-#define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */
-
-
-extern void
-tnl_clip_prepare(GLcontext *ctx);
-
-
-#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 t_context.h

+ * \brief TnL module datatypes and definitions.

+ * \author Keith Whitwell

+ */

+

+

+/**

+ * \mainpage The TNL-module

+ *

+ * TNL stands for "transform and lighting", i.e. this module implements

+ * a pipeline that receives as input a buffer of vertices and does all

+ * necessary transformations (rotations, clipping, vertex shader etc.)

+ * and passes then the output to the rasterizer.

+ *

+ * The tnl_pipeline contains the array of all stages, which should be

+ * applied. Each stage is a black-box, which is described by an

+ * tnl_pipeline_stage. The function ::_tnl_run_pipeline applies all the

+ * stages to the vertex_buffer TNLcontext::vb, where the vertex data

+ * is stored. The last stage in the pipeline is the rasterizer.

+ *

+ */

+

+

+#ifndef _T_CONTEXT_H

+#define _T_CONTEXT_H

+

+#include "main/glheader.h"

+#include "main/bitset.h"

+#include "main/mtypes.h"

+

+#include "math/m_vector.h"

+

+#include "vbo/vbo.h"

+

+#define MAX_PIPELINE_STAGES     30

+

+/*

+ * Note: The first attributes match the VERT_ATTRIB_* definitions

+ * in mtypes.h.  However, the tnl module has additional attributes

+ * for materials, color indexes, edge flags, etc.

+ */

+/* Although it's nice to use these as bit indexes in a DWORD flag, we

+ * could manage without if necessary.  Another limit currently is the

+ * number of bits allocated for these numbers in places like vertex

+ * program instruction formats and register layouts.

+ */

+/* The bit space exhaustion is a fact now, done by _TNL_ATTRIB_ATTRIBUTE* for

+ * GLSL vertex shader which cannot be aliased with conventional vertex attribs.

+ * Compacting _TNL_ATTRIB_MAT_* attribs would not work, they would not give

+ * as many free bits (11 plus already 1 free bit) as _TNL_ATTRIB_ATTRIBUTE*

+ * attribs want (16).

+ */

+enum {

+	_TNL_ATTRIB_POS = 0,

+	_TNL_ATTRIB_WEIGHT = 1,

+	_TNL_ATTRIB_NORMAL = 2,

+	_TNL_ATTRIB_COLOR0 = 3,

+	_TNL_ATTRIB_COLOR1 = 4,

+	_TNL_ATTRIB_FOG = 5,

+	_TNL_ATTRIB_COLOR_INDEX = 6,

+	_TNL_ATTRIB_EDGEFLAG = 7,

+	_TNL_ATTRIB_TEX0 = 8,

+	_TNL_ATTRIB_TEX1 = 9,

+	_TNL_ATTRIB_TEX2 = 10,

+	_TNL_ATTRIB_TEX3 = 11,

+	_TNL_ATTRIB_TEX4 = 12,

+	_TNL_ATTRIB_TEX5 = 13,

+	_TNL_ATTRIB_TEX6 = 14,

+	_TNL_ATTRIB_TEX7 = 15,

+

+	_TNL_ATTRIB_GENERIC0 = 16, /* doesn't really exist! */

+	_TNL_ATTRIB_GENERIC1 = 17,

+	_TNL_ATTRIB_GENERIC2 = 18,

+	_TNL_ATTRIB_GENERIC3 = 19,

+	_TNL_ATTRIB_GENERIC4 = 20,

+	_TNL_ATTRIB_GENERIC5 = 21,

+	_TNL_ATTRIB_GENERIC6 = 22,

+	_TNL_ATTRIB_GENERIC7 = 23,

+	_TNL_ATTRIB_GENERIC8 = 24,

+	_TNL_ATTRIB_GENERIC9 = 25,

+	_TNL_ATTRIB_GENERIC10 = 26,

+	_TNL_ATTRIB_GENERIC11 = 27,

+	_TNL_ATTRIB_GENERIC12 = 28,

+	_TNL_ATTRIB_GENERIC13 = 29,

+	_TNL_ATTRIB_GENERIC14 = 30,

+	_TNL_ATTRIB_GENERIC15 = 31,

+

+	/* These alias with the generics, but they are not active

+	 * concurrently, so it's not a problem.  The TNL module

+	 * doesn't have to do anything about this as this is how they

+	 * are passed into the _draw_prims callback.

+	 *

+	 * When we generate fixed-function replacement programs (in

+	 * t_vp_build.c currently), they refer to the appropriate

+	 * generic attribute in order to pick up per-vertex material

+	 * data.

+	 */

+	_TNL_ATTRIB_MAT_FRONT_AMBIENT = 16,

+	_TNL_ATTRIB_MAT_BACK_AMBIENT = 17,

+	_TNL_ATTRIB_MAT_FRONT_DIFFUSE = 18,

+	_TNL_ATTRIB_MAT_BACK_DIFFUSE = 19,

+	_TNL_ATTRIB_MAT_FRONT_SPECULAR = 20,

+	_TNL_ATTRIB_MAT_BACK_SPECULAR = 21,

+	_TNL_ATTRIB_MAT_FRONT_EMISSION = 22,

+	_TNL_ATTRIB_MAT_BACK_EMISSION = 23,

+	_TNL_ATTRIB_MAT_FRONT_SHININESS = 24,

+	_TNL_ATTRIB_MAT_BACK_SHININESS = 25,

+	_TNL_ATTRIB_MAT_FRONT_INDEXES = 26,

+	_TNL_ATTRIB_MAT_BACK_INDEXES = 27,

+

+	/* This is really a VERT_RESULT, not an attrib.  Need to fix

+	 * tnl to understand the difference.

+	 */

+	_TNL_ATTRIB_POINTSIZE = 16,

+

+	_TNL_ATTRIB_MAX = 32

+} ;

+

+#define _TNL_ATTRIB_TEX(u)       (_TNL_ATTRIB_TEX0 + (u))

+#define _TNL_ATTRIB_GENERIC(n) (_TNL_ATTRIB_GENERIC0 + (n))

+

+/* special index used for handing invalid glVertexAttribute() indices */

+#define _TNL_ATTRIB_ERROR    (_TNL_ATTRIB_GENERIC15 + 1)

+

+/**

+ * Handy attribute ranges:

+ */

+#define _TNL_FIRST_PROG      _TNL_ATTRIB_WEIGHT

+#define _TNL_LAST_PROG       _TNL_ATTRIB_TEX7

+

+#define _TNL_FIRST_TEX       _TNL_ATTRIB_TEX0

+#define _TNL_LAST_TEX        _TNL_ATTRIB_TEX7

+

+#define _TNL_FIRST_GENERIC _TNL_ATTRIB_GENERIC0

+#define _TNL_LAST_GENERIC  _TNL_ATTRIB_GENERIC15

+

+#define _TNL_FIRST_MAT       _TNL_ATTRIB_MAT_FRONT_AMBIENT /* GENERIC0 */

+#define _TNL_LAST_MAT        _TNL_ATTRIB_MAT_BACK_INDEXES  /* GENERIC11 */

+

+/* Number of available generic attributes */

+#define _TNL_NUM_GENERIC 16

+

+/* Number of attributes used for evaluators */

+#define _TNL_NUM_EVAL 16

+

+

+#define PRIM_BEGIN     0x10

+#define PRIM_END       0x20

+#define PRIM_MODE_MASK 0x0f

+

+static INLINE GLuint _tnl_translate_prim( const struct _mesa_prim *prim )

+{

+   GLuint flag;

+   flag = prim->mode;

+   if (prim->begin) flag |= PRIM_BEGIN;

+   if (prim->end) flag |= PRIM_END;

+   return flag;

+}

+

+

+

+

+/**

+ * Contains the current state of a running pipeline.

+ */

+struct vertex_buffer

+{

+   GLuint Size;  /**< Max vertices per vertex buffer, constant */

+

+   /* Constant over the pipeline.

+    */

+   GLuint Count;  /**< Number of vertices currently in buffer */

+

+   /* Pointers to current data.  Most of the data is in AttribPtr -- all of

+    * it that is one of VERT_ATTRIB_X.  For things only produced by TNL,

+    * such as backface color or eye-space coordinates, they are stored

+    * here.

+    */

+   GLuint      *Elts;		                

+   GLvector4f  *EyePtr;		                /* _TNL_BIT_POS */

+   GLvector4f  *ClipPtr;	                /* _TNL_BIT_POS */

+   GLvector4f  *NdcPtr;                         /* _TNL_BIT_POS */

+   GLubyte     ClipOrMask;	                /* _TNL_BIT_POS */

+   GLubyte     ClipAndMask;	                /* _TNL_BIT_POS */

+   GLubyte     *ClipMask;		        /* _TNL_BIT_POS */

+   GLfloat     *NormalLengthPtr;	        /* _TNL_BIT_NORMAL */

+   GLboolean   *EdgeFlag;	                /* _TNL_BIT_EDGEFLAG */

+   GLvector4f  *BackfaceIndexPtr;

+   GLvector4f  *BackfaceColorPtr;

+   GLvector4f  *BackfaceSecondaryColorPtr;

+

+   const struct _mesa_prim  *Primitive;	              

+   GLuint      PrimitiveCount;	      

+

+   /* Inputs to the vertex program stage */

+   GLvector4f *AttribPtr[_TNL_ATTRIB_MAX];      /* GL_NV_vertex_program */

+};

+

+

+/**

+ * Describes an individual operation on the pipeline.

+ */

+struct tnl_pipeline_stage

+{

+   const char *name;

+

+   /* Private data for the pipeline stage:

+    */

+   void *privatePtr;

+

+   /* Allocate private data

+    */

+   GLboolean (*create)( struct gl_context *ctx, struct tnl_pipeline_stage * );

+

+   /* Free private data.

+    */

+   void (*destroy)( struct tnl_pipeline_stage * );

+

+   /* Called on any statechange or input array size change or

+    * input array change to/from zero stride.

+    */

+   void (*validate)( struct gl_context *ctx, struct tnl_pipeline_stage * );

+

+   /* Called from _tnl_run_pipeline().  The stage.changed_inputs value

+    * encodes all inputs to thee struct which have changed.  If

+    * non-zero, recompute all affected outputs of the stage, otherwise

+    * execute any 'sideeffects' of the stage.

+    *

+    * Return value: GL_TRUE - keep going

+    *               GL_FALSE - finished pipeline

+    */

+   GLboolean (*run)( struct gl_context *ctx, struct tnl_pipeline_stage * );

+};

+

+

+

+/** Contains the array of all pipeline stages.

+ * The default values are defined at the end of t_pipeline.c 

+ */

+struct tnl_pipeline {

+   

+   GLuint last_attrib_stride[_TNL_ATTRIB_MAX];

+   GLuint last_attrib_size[_TNL_ATTRIB_MAX];

+   GLuint input_changes;

+   GLuint new_state;

+

+   struct tnl_pipeline_stage stages[MAX_PIPELINE_STAGES+1];

+   GLuint nr_stages;

+};

+

+struct tnl_clipspace;

+struct tnl_clipspace_attr;

+

+typedef void (*tnl_extract_func)( const struct tnl_clipspace_attr *a, 

+				  GLfloat *out, 

+				  const GLubyte *v );

+

+typedef void (*tnl_insert_func)( const struct tnl_clipspace_attr *a, 

+				 GLubyte *v, 

+				 const GLfloat *in );

+

+typedef void (*tnl_emit_func)( struct gl_context *ctx, 

+			       GLuint count, 

+			       GLubyte *dest );

+

+

+/**

+ * Describes how to convert/move a vertex attribute from a vertex array

+ * to a vertex structure.

+ */

+struct tnl_clipspace_attr

+{

+   GLuint attrib;          /* which vertex attrib (0=position, etc) */

+   GLuint format;

+   GLuint vertoffset;      /* position of the attrib in the vertex struct */

+   GLuint vertattrsize;    /* size of the attribute in bytes */

+   GLubyte *inputptr;

+   GLuint inputstride;

+   GLuint inputsize;

+   const tnl_insert_func *insert;

+   tnl_insert_func emit;

+   tnl_extract_func extract;

+   const GLfloat *vp;   /* NDC->Viewport mapping matrix */

+};

+

+

+

+

+typedef void (*tnl_points_func)( struct gl_context *ctx, GLuint first, GLuint last );

+typedef void (*tnl_line_func)( struct gl_context *ctx, GLuint v1, GLuint v2 );

+typedef void (*tnl_triangle_func)( struct gl_context *ctx,

+				   GLuint v1, GLuint v2, GLuint v3 );

+typedef void (*tnl_quad_func)( struct gl_context *ctx, GLuint v1, GLuint v2,

+			       GLuint v3, GLuint v4 );

+typedef void (*tnl_render_func)( struct gl_context *ctx, GLuint start, GLuint count,

+				 GLuint flags );

+typedef void (*tnl_interp_func)( struct gl_context *ctx,

+				 GLfloat t, GLuint dst, GLuint out, GLuint in,

+				 GLboolean force_boundary );

+typedef void (*tnl_copy_pv_func)( struct gl_context *ctx, GLuint dst, GLuint src );

+typedef void (*tnl_setup_func)( struct gl_context *ctx,

+				GLuint start, GLuint end,

+				GLuint new_inputs);

+

+

+struct tnl_attr_type {

+   GLuint format;

+   GLuint size;

+   GLuint stride;

+   GLuint offset;

+};

+

+struct tnl_clipspace_fastpath {

+   GLuint vertex_size;

+   GLuint attr_count;

+   GLboolean match_strides;

+

+   struct tnl_attr_type *attr;

+

+   tnl_emit_func func;

+   struct tnl_clipspace_fastpath *next;

+};

+

+/**

+ * Used to describe conversion of vertex arrays to vertex structures.

+ * I.e. Structure of arrays to arrays of structs.

+ */

+struct tnl_clipspace

+{

+   GLboolean need_extras;

+   

+   GLuint new_inputs;

+

+   GLubyte *vertex_buf;

+   GLuint vertex_size;

+   GLuint max_vertex_size;

+

+   struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];

+   GLuint attr_count;

+

+   tnl_emit_func emit;

+   tnl_interp_func interp;

+   tnl_copy_pv_func copy_pv;

+

+   /* Parameters and constants for codegen:

+    */

+   GLboolean need_viewport;

+   GLfloat vp_scale[4];		

+   GLfloat vp_xlate[4];

+   GLfloat chan_scale[4];

+   GLfloat identity[4];

+

+   struct tnl_clipspace_fastpath *fastpath;

+   

+   void (*codegen_emit)( struct gl_context *ctx );

+};

+

+

+struct tnl_device_driver

+{

+   /***

+    *** TNL Pipeline

+    ***/

+

+   void (*RunPipeline)(struct gl_context *ctx);

+   /* Replaces PipelineStart/PipelineFinish -- intended to allow

+    * drivers to wrap _tnl_run_pipeline() with code to validate state

+    * and grab/release hardware locks.  

+    */

+

+   void (*NotifyMaterialChange)(struct gl_context *ctx);

+   /* Alert tnl-aware drivers of changes to material.

+    */

+

+   /***

+    *** Rendering -- These functions called only from t_vb_render.c

+    ***/

+   struct

+   {

+      void (*Start)(struct gl_context *ctx);

+      void (*Finish)(struct gl_context *ctx);

+      /* Called before and after all rendering operations, including DrawPixels,

+       * ReadPixels, Bitmap, span functions, and CopyTexImage, etc commands.

+       * These are a suitable place for grabbing/releasing hardware locks.

+       */

+

+      void (*PrimitiveNotify)(struct gl_context *ctx, GLenum mode);

+      /* Called between RenderStart() and RenderFinish() to indicate the

+       * type of primitive we're about to draw.  Mode will be one of the

+       * modes accepted by glBegin().

+       */

+

+      tnl_interp_func Interp;

+      /* The interp function is called by the clipping routines when we need

+       * to generate an interpolated vertex.  All pertinant vertex ancilliary

+       * data should be computed by interpolating between the 'in' and 'out'

+       * vertices.

+       */

+

+      tnl_copy_pv_func CopyPV;

+      /* The copy function is used to make a copy of a vertex.  All pertinant

+       * vertex attributes should be copied.

+       */

+

+      void (*ClippedPolygon)( struct gl_context *ctx, const GLuint *elts, GLuint n );

+      /* Render a polygon with <n> vertices whose indexes are in the <elts>

+       * array.

+       */

+

+      void (*ClippedLine)( struct gl_context *ctx, GLuint v0, GLuint v1 );

+      /* Render a line between the two vertices given by indexes v0 and v1. */

+

+      tnl_points_func           Points; /* must now respect vb->elts */

+      tnl_line_func             Line;

+      tnl_triangle_func         Triangle;

+      tnl_quad_func             Quad;

+      /* These functions are called in order to render points, lines,

+       * triangles and quads.  These are only called via the T&L module.

+       */

+

+      tnl_render_func          *PrimTabVerts;

+      tnl_render_func          *PrimTabElts;

+      /* Render whole unclipped primitives (points, lines, linestrips,

+       * lineloops, etc).  The tables are indexed by the GL enum of the

+       * primitive to be rendered.  RenderTabVerts is used for non-indexed

+       * arrays of vertices.  RenderTabElts is used for indexed arrays of

+       * vertices.

+       */

+

+      void (*ResetLineStipple)( struct gl_context *ctx );

+      /* Reset the hardware's line stipple counter.

+       */

+

+      tnl_setup_func BuildVertices;

+      /* This function is called whenever new vertices are required for

+       * rendering.  The vertices in question are those n such that start

+       * <= n < end.  The new_inputs parameter indicates those fields of

+       * the vertex which need to be updated, if only a partial repair of

+       * the vertex is required.

+       *

+       * This function is called only from _tnl_render_stage in tnl/t_render.c.

+       */

+      

+

+      GLboolean (*Multipass)( struct gl_context *ctx, GLuint passno );

+      /* Driver may request additional render passes by returning GL_TRUE

+       * when this function is called.  This function will be called

+       * after the first pass, and passes will be made until the function

+       * returns GL_FALSE.  If no function is registered, only one pass

+       * is made.

+       *

+       * This function will be first invoked with passno == 1.

+       */

+   } Render;

+};

+

+

+#define DECLARE_RENDERINPUTS(name) BITSET64_DECLARE(name, _TNL_ATTRIB_MAX)

+#define RENDERINPUTS_COPY BITSET64_COPY

+#define RENDERINPUTS_EQUAL BITSET64_EQUAL

+#define RENDERINPUTS_ZERO BITSET64_ZERO

+#define RENDERINPUTS_ONES BITSET64_ONES

+#define RENDERINPUTS_TEST BITSET64_TEST

+#define RENDERINPUTS_SET BITSET64_SET

+#define RENDERINPUTS_CLEAR BITSET64_CLEAR

+#define RENDERINPUTS_TEST_RANGE BITSET64_TEST_RANGE

+#define RENDERINPUTS_SET_RANGE BITSET64_SET_RANGE

+#define RENDERINPUTS_CLEAR_RANGE BITSET64_CLEAR_RANGE

+

+

+/**

+ * Context state for T&L context.

+ */

+typedef struct

+{

+   /* Driver interface.

+    */

+   struct tnl_device_driver Driver;

+

+   /* Pipeline

+    */

+   struct tnl_pipeline pipeline;

+   struct vertex_buffer vb;

+

+   /* Clipspace/ndc/window vertex managment:

+    */

+   struct tnl_clipspace clipspace;

+

+   /* Probably need a better configuration mechanism:

+    */

+   GLboolean NeedNdcCoords;

+   GLboolean AllowVertexFog;

+   GLboolean AllowPixelFog;

+   GLboolean _DoVertexFog;  /* eval fog function at each vertex? */

+

+   DECLARE_RENDERINPUTS(render_inputs_bitset);

+

+   GLvector4f tmp_inputs[VERT_ATTRIB_MAX];

+

+   /* Temp storage for t_draw.c: 

+    */

+   GLubyte *block[VERT_ATTRIB_MAX];

+   GLuint nr_blocks;

+

+} TNLcontext;

+

+

+

+#define TNL_CONTEXT(ctx) ((TNLcontext *)((ctx)->swtnl_context))

+

+

+#define TYPE_IDX(t) ((t) & 0xf)

+#define MAX_TYPES TYPE_IDX(GL_DOUBLE)+1      /* 0xa + 1 */

+

+

+extern void

+tnl_clip_prepare(struct gl_context *ctx);

+

+

+#endif

diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c
index fdde29425..6f152ad53 100644
--- a/mesalib/src/mesa/tnl/t_draw.c
+++ b/mesalib/src/mesa/tnl/t_draw.c
@@ -1,487 +1,487 @@
-/*
- * 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(GLcontext *ctx, GLuint bytes)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLubyte *space = malloc(bytes);
-   
-   tnl->block[tnl->nr_blocks++] = space;
-   return space;
-}
-
-
-static void free_space(GLcontext *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;
-   }
-}
-
-/* Adjust pointer to point at first requested element, convert to
- * floating point, populate VB->AttribPtr[].
- */
-static void _tnl_import_array( GLcontext *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;
-      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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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(GLcontext *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( GLcontext *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;
-
-      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;
-	 }
-
-	 /* Binding inputs may imply mapping some vertex buffer objects.
-	  * They will need to be unmapped below.
-	  */
-	 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_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;

+   }

+}

+

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

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

+

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

+	 }

+

+	 /* Binding inputs may imply mapping some vertex buffer objects.

+	  * They will need to be unmapped below.

+	  */

+	 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_CONTEXT(ctx)->Driver.RunPipeline(ctx);

+

+	 unmap_vbos(ctx, bo, nr_bo);

+	 free_space(ctx);

+

+	 i += this_nr_prims;

+      }

+   }

+}

+

diff --git a/mesalib/src/mesa/tnl/t_pipeline.c b/mesalib/src/mesa/tnl/t_pipeline.c
index 36fcd074c..27d7ecff7 100644
--- a/mesalib/src/mesa/tnl/t_pipeline.c
+++ b/mesalib/src/mesa/tnl/t_pipeline.c
@@ -1,210 +1,210 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-#include "t_vp_build.h"
-#include "t_vertex.h"
-
-void _tnl_install_pipeline( GLcontext *ctx,
-			    const struct tnl_pipeline_stage **stages )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLuint i;
-
-   tnl->pipeline.new_state = ~0;
-
-   /* Create a writeable copy of each stage.
-    */
-   for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {
-      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
-      memcpy(s, stages[i], sizeof(*s));
-      if (s->create)
-	 s->create(ctx, s);
-   }
-
-   tnl->pipeline.nr_stages = i;
-}
-
-void _tnl_destroy_pipeline( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLuint i;
-
-   for (i = 0 ; i < tnl->pipeline.nr_stages ; i++) {
-      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
-      if (s->destroy)
-	 s->destroy(s);
-   }
-
-   tnl->pipeline.nr_stages = 0;
-}
-
-
-
-static GLuint check_input_changes( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLuint i;
-   
-   for (i = 0; i <= _TNL_LAST_MAT; i++) {
-      if (tnl->vb.AttribPtr[i]->size != tnl->pipeline.last_attrib_size[i] ||
-	  tnl->vb.AttribPtr[i]->stride != tnl->pipeline.last_attrib_stride[i]) {
-	 tnl->pipeline.last_attrib_size[i] = tnl->vb.AttribPtr[i]->size;
-	 tnl->pipeline.last_attrib_stride[i] = tnl->vb.AttribPtr[i]->stride;
-	 tnl->pipeline.input_changes |= 1<<i;
-      }
-   }
-
-   return tnl->pipeline.input_changes;
-}
-
-
-static GLuint check_output_changes( GLcontext *ctx )
-{
-#if 0
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   
-   for (i = 0; i < VERT_RESULT_MAX; i++) {
-      if (tnl->vb.ResultPtr[i]->size != tnl->last_result_size[i] ||
-	  tnl->vb.ResultPtr[i]->stride != tnl->last_result_stride[i]) {
-	 tnl->last_result_size[i] = tnl->vb.ResultPtr[i]->size;
-	 tnl->last_result_stride[i] = tnl->vb.ResultPtr[i]->stride;
-	 tnl->pipeline.output_changes |= 1<<i;
-      }
-   }
-
-   if (tnl->pipeline.output_changes) 
-      tnl->Driver.NotifyOutputChanges( ctx, tnl->pipeline.output_changes );
-   
-   return tnl->pipeline.output_changes;
-#else
-   return ~0;
-#endif
-}
-
-
-void _tnl_run_pipeline( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   unsigned short __tmp;
-   GLuint i;
-
-   if (!tnl->vb.Count)
-      return;
-
-   /* Check for changed input sizes or change in stride to/from zero
-    * (ie const or non-const).
-    */
-   if (check_input_changes( ctx ) || tnl->pipeline.new_state) {
-      if (ctx->VertexProgram._MaintainTnlProgram)
-	 _tnl_UpdateFixedFunctionProgram( ctx );
-
-      for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
-	 struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
-	 if (s->validate)
-	    s->validate( ctx, s );
-      }
-      
-      tnl->pipeline.new_state = 0;
-      tnl->pipeline.input_changes = 0;
-      
-      /* Pipeline can only change its output in response to either a
-       * statechange or an input size/stride change.  No other changes
-       * are allowed.
-       */
-      if (check_output_changes( ctx ))
-	 _tnl_notify_pipeline_output_change( ctx );
-   }
-
-   START_FAST_MATH(__tmp);
-
-   for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
-      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
-      if (!s->run( ctx, s ))
-	 break;
-   }
-
-   END_FAST_MATH(__tmp);
-}
-
-
-
-/* The default pipeline.  This is useful for software rasterizers, and
- * simple hardware rasterizers.  For customization, I don't recommend
- * tampering with the internals of these stages in the way that
- * drivers did in Mesa 3.4.  These stages are basically black boxes,
- * and should be left intact.
- *
- * To customize the pipeline, consider:
- *
- * - removing redundant stages (making sure that the software rasterizer
- *   can cope with this on fallback paths).  An example is fog
- *   coordinate generation, which is not required in the FX driver.
- *
- * - replacing general-purpose machine-independent stages with
- *   general-purpose machine-specific stages.  There is no example of
- *   this to date, though it must be borne in mind that all subsequent
- *   stages that reference the output of the new stage must cope with
- *   any machine-specific data introduced.  This may not be easy
- *   unless there are no such stages (ie the new stage is the last in
- *   the pipe).
- *
- * - inserting optimized (but specialized) stages ahead of the
- *   general-purpose fallback implementation.  For example, the old
- *   fastpath mechanism, which only works when the VB->Elts input is
- *   available, can be duplicated by placing the fastpath stage at the
- *   head of this pipeline.  Such specialized stages are currently
- *   constrained to have no outputs (ie. they must either finish the *
- *   pipeline by returning GL_FALSE from run(), or do nothing).
- *
- * Some work can be done to lift some of the restrictions in the final
- * case, if it becomes necessary to do so.
- */
-const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
-   &_tnl_vertex_transform_stage,
-   &_tnl_normal_transform_stage,
-   &_tnl_lighting_stage,
-   &_tnl_texgen_stage,
-   &_tnl_texture_transform_stage,
-   &_tnl_point_attenuation_stage,
-   &_tnl_vertex_program_stage, 
-   &_tnl_fog_coordinate_stage,
-   &_tnl_render_stage,
-   NULL 
-};
-
-const struct tnl_pipeline_stage *_tnl_vp_pipeline[] = {
-   &_tnl_vertex_program_stage,
-   &_tnl_render_stage,
-   NULL
-};
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+#include "t_vp_build.h"

+#include "t_vertex.h"

+

+void _tnl_install_pipeline( struct gl_context *ctx,

+			    const struct tnl_pipeline_stage **stages )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   GLuint i;

+

+   tnl->pipeline.new_state = ~0;

+

+   /* Create a writeable copy of each stage.

+    */

+   for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {

+      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];

+      memcpy(s, stages[i], sizeof(*s));

+      if (s->create)

+	 s->create(ctx, s);

+   }

+

+   tnl->pipeline.nr_stages = i;

+}

+

+void _tnl_destroy_pipeline( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   GLuint i;

+

+   for (i = 0 ; i < tnl->pipeline.nr_stages ; i++) {

+      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];

+      if (s->destroy)

+	 s->destroy(s);

+   }

+

+   tnl->pipeline.nr_stages = 0;

+}

+

+

+

+static GLuint check_input_changes( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   GLuint i;

+   

+   for (i = 0; i <= _TNL_LAST_MAT; i++) {

+      if (tnl->vb.AttribPtr[i]->size != tnl->pipeline.last_attrib_size[i] ||

+	  tnl->vb.AttribPtr[i]->stride != tnl->pipeline.last_attrib_stride[i]) {

+	 tnl->pipeline.last_attrib_size[i] = tnl->vb.AttribPtr[i]->size;

+	 tnl->pipeline.last_attrib_stride[i] = tnl->vb.AttribPtr[i]->stride;

+	 tnl->pipeline.input_changes |= 1<<i;

+      }

+   }

+

+   return tnl->pipeline.input_changes;

+}

+

+

+static GLuint check_output_changes( struct gl_context *ctx )

+{

+#if 0

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   

+   for (i = 0; i < VERT_RESULT_MAX; i++) {

+      if (tnl->vb.ResultPtr[i]->size != tnl->last_result_size[i] ||

+	  tnl->vb.ResultPtr[i]->stride != tnl->last_result_stride[i]) {

+	 tnl->last_result_size[i] = tnl->vb.ResultPtr[i]->size;

+	 tnl->last_result_stride[i] = tnl->vb.ResultPtr[i]->stride;

+	 tnl->pipeline.output_changes |= 1<<i;

+      }

+   }

+

+   if (tnl->pipeline.output_changes) 

+      tnl->Driver.NotifyOutputChanges( ctx, tnl->pipeline.output_changes );

+   

+   return tnl->pipeline.output_changes;

+#else

+   return ~0;

+#endif

+}

+

+

+void _tnl_run_pipeline( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   unsigned short __tmp;

+   GLuint i;

+

+   if (!tnl->vb.Count)

+      return;

+

+   /* Check for changed input sizes or change in stride to/from zero

+    * (ie const or non-const).

+    */

+   if (check_input_changes( ctx ) || tnl->pipeline.new_state) {

+      if (ctx->VertexProgram._MaintainTnlProgram)

+	 _tnl_UpdateFixedFunctionProgram( ctx );

+

+      for (i = 0; i < tnl->pipeline.nr_stages ; i++) {

+	 struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];

+	 if (s->validate)

+	    s->validate( ctx, s );

+      }

+      

+      tnl->pipeline.new_state = 0;

+      tnl->pipeline.input_changes = 0;

+      

+      /* Pipeline can only change its output in response to either a

+       * statechange or an input size/stride change.  No other changes

+       * are allowed.

+       */

+      if (check_output_changes( ctx ))

+	 _tnl_notify_pipeline_output_change( ctx );

+   }

+

+   START_FAST_MATH(__tmp);

+

+   for (i = 0; i < tnl->pipeline.nr_stages ; i++) {

+      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];

+      if (!s->run( ctx, s ))

+	 break;

+   }

+

+   END_FAST_MATH(__tmp);

+}

+

+

+

+/* The default pipeline.  This is useful for software rasterizers, and

+ * simple hardware rasterizers.  For customization, I don't recommend

+ * tampering with the internals of these stages in the way that

+ * drivers did in Mesa 3.4.  These stages are basically black boxes,

+ * and should be left intact.

+ *

+ * To customize the pipeline, consider:

+ *

+ * - removing redundant stages (making sure that the software rasterizer

+ *   can cope with this on fallback paths).  An example is fog

+ *   coordinate generation, which is not required in the FX driver.

+ *

+ * - replacing general-purpose machine-independent stages with

+ *   general-purpose machine-specific stages.  There is no example of

+ *   this to date, though it must be borne in mind that all subsequent

+ *   stages that reference the output of the new stage must cope with

+ *   any machine-specific data introduced.  This may not be easy

+ *   unless there are no such stages (ie the new stage is the last in

+ *   the pipe).

+ *

+ * - inserting optimized (but specialized) stages ahead of the

+ *   general-purpose fallback implementation.  For example, the old

+ *   fastpath mechanism, which only works when the VB->Elts input is

+ *   available, can be duplicated by placing the fastpath stage at the

+ *   head of this pipeline.  Such specialized stages are currently

+ *   constrained to have no outputs (ie. they must either finish the *

+ *   pipeline by returning GL_FALSE from run(), or do nothing).

+ *

+ * Some work can be done to lift some of the restrictions in the final

+ * case, if it becomes necessary to do so.

+ */

+const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {

+   &_tnl_vertex_transform_stage,

+   &_tnl_normal_transform_stage,

+   &_tnl_lighting_stage,

+   &_tnl_texgen_stage,

+   &_tnl_texture_transform_stage,

+   &_tnl_point_attenuation_stage,

+   &_tnl_vertex_program_stage, 

+   &_tnl_fog_coordinate_stage,

+   &_tnl_render_stage,

+   NULL 

+};

+

+const struct tnl_pipeline_stage *_tnl_vp_pipeline[] = {

+   &_tnl_vertex_program_stage,

+   &_tnl_render_stage,

+   NULL

+};

diff --git a/mesalib/src/mesa/tnl/t_pipeline.h b/mesalib/src/mesa/tnl/t_pipeline.h
index d110010f0..579207889 100644
--- a/mesalib/src/mesa/tnl/t_pipeline.h
+++ b/mesalib/src/mesa/tnl/t_pipeline.h
@@ -1,74 +1,73 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-
-#ifndef _T_PIPELINE_H_
-#define _T_PIPELINE_H_
-
-#include "main/mtypes.h"
-#include "t_context.h"
-
-extern void _tnl_run_pipeline( GLcontext *ctx );
-
-extern void _tnl_destroy_pipeline( GLcontext *ctx );
-
-extern void _tnl_install_pipeline( GLcontext *ctx,
-				   const struct tnl_pipeline_stage **stages );
-
-
-/* These are implemented in the t_vb_*.c files:
- */
-extern const struct tnl_pipeline_stage _tnl_vertex_transform_stage;
-extern const struct tnl_pipeline_stage _tnl_vertex_cull_stage;
-extern const struct tnl_pipeline_stage _tnl_normal_transform_stage;
-extern const struct tnl_pipeline_stage _tnl_lighting_stage;
-extern const struct tnl_pipeline_stage _tnl_fog_coordinate_stage;
-extern const struct tnl_pipeline_stage _tnl_texgen_stage;
-extern const struct tnl_pipeline_stage _tnl_texture_transform_stage;
-extern const struct tnl_pipeline_stage _tnl_point_attenuation_stage;
-extern const struct tnl_pipeline_stage _tnl_vertex_program_stage;
-extern const struct tnl_pipeline_stage _tnl_render_stage;
-
-/* Shorthand to plug in the default pipeline:
- */
-extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];
-extern const struct tnl_pipeline_stage *_tnl_vp_pipeline[];
-
-
-/* Convenience routines provided by t_vb_render.c:
- */
-extern tnl_render_func _tnl_render_tab_elts[];
-extern tnl_render_func _tnl_render_tab_verts[];
-
-extern void _tnl_RenderClippedPolygon( GLcontext *ctx, 
-				       const GLuint *elts, GLuint n );
-
-extern void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj );
-
-
-#endif
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+

+#ifndef _T_PIPELINE_H_

+#define _T_PIPELINE_H_

+

+#include "main/mtypes.h"

+#include "t_context.h"

+

+extern void _tnl_run_pipeline( struct gl_context *ctx );

+

+extern void _tnl_destroy_pipeline( struct gl_context *ctx );

+

+extern void _tnl_install_pipeline( struct gl_context *ctx,

+				   const struct tnl_pipeline_stage **stages );

+

+

+/* These are implemented in the t_vb_*.c files:

+ */

+extern const struct tnl_pipeline_stage _tnl_vertex_transform_stage;

+extern const struct tnl_pipeline_stage _tnl_normal_transform_stage;

+extern const struct tnl_pipeline_stage _tnl_lighting_stage;

+extern const struct tnl_pipeline_stage _tnl_fog_coordinate_stage;

+extern const struct tnl_pipeline_stage _tnl_texgen_stage;

+extern const struct tnl_pipeline_stage _tnl_texture_transform_stage;

+extern const struct tnl_pipeline_stage _tnl_point_attenuation_stage;

+extern const struct tnl_pipeline_stage _tnl_vertex_program_stage;

+extern const struct tnl_pipeline_stage _tnl_render_stage;

+

+/* Shorthand to plug in the default pipeline:

+ */

+extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];

+extern const struct tnl_pipeline_stage *_tnl_vp_pipeline[];

+

+

+/* Convenience routines provided by t_vb_render.c:

+ */

+extern tnl_render_func _tnl_render_tab_elts[];

+extern tnl_render_func _tnl_render_tab_verts[];

+

+extern void _tnl_RenderClippedPolygon( struct gl_context *ctx, 

+				       const GLuint *elts, GLuint n );

+

+extern void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj );

+

+

+#endif

diff --git a/mesalib/src/mesa/tnl/t_rasterpos.c b/mesalib/src/mesa/tnl/t_rasterpos.c
index d82d5b507..78aa8880f 100644
--- a/mesalib/src/mesa/tnl/t_rasterpos.c
+++ b/mesalib/src/mesa/tnl/t_rasterpos.c
@@ -1,486 +1,486 @@
-/*
- * 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/colormac.h"
-#include "main/feedback.h"
-#include "main/light.h"
-#include "main/macros.h"
-#include "main/simple_list.h"
-#include "main/mtypes.h"
-
-#include "math/m_matrix.h"
-#include "tnl/tnl.h"
-
-
-
-/**
- * Clip a point against the view volume.
- *
- * \param v vertex vector describing the point to clip.
- * 
- * \return zero if outside view volume, or one if inside.
- */
-static GLuint
-viewclip_point_xy( const GLfloat v[] )
-{
-   if (   v[0] > v[3] || v[0] < -v[3]
-       || v[1] > v[3] || v[1] < -v[3] ) {
-      return 0;
-   }
-   else {
-      return 1;
-   }
-}
-
-
-/**
- * Clip a point against the far/near Z clipping planes.
- *
- * \param v vertex vector describing the point to clip.
- * 
- * \return zero if outside view volume, or one if inside.
- */
-static GLuint
-viewclip_point_z( const GLfloat v[] )
-{
-   if (v[2] > v[3] || v[2] < -v[3] ) {
-      return 0;
-   }
-   else {
-      return 1;
-   }
-}
-
-
-/**
- * Clip a point against the user clipping planes.
- * 
- * \param ctx GL context.
- * \param v vertex vector describing the point to clip.
- * 
- * \return zero if the point was clipped, or one otherwise.
- */
-static GLuint
-userclip_point( GLcontext *ctx, const GLfloat v[] )
-{
-   GLuint p;
-
-   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-	 GLfloat dot = v[0] * ctx->Transform._ClipUserPlane[p][0]
-		     + v[1] * ctx->Transform._ClipUserPlane[p][1]
-		     + v[2] * ctx->Transform._ClipUserPlane[p][2]
-		     + v[3] * ctx->Transform._ClipUserPlane[p][3];
-         if (dot < 0.0F) {
-            return 0;
-         }
-      }
-   }
-
-   return 1;
-}
-
-
-/**
- * Compute lighting for the raster position.  Both RGB and CI modes computed.
- * \param ctx the context
- * \param vertex vertex location
- * \param normal normal vector
- * \param Rcolor returned color
- * \param Rspec returned specular color (if separate specular enabled)
- * \param Rindex returned color index
- */
-static void
-shade_rastpos(GLcontext *ctx,
-              const GLfloat vertex[4],
-              const GLfloat normal[3],
-              GLfloat Rcolor[4],
-              GLfloat Rspec[4])
-{
-   /*const*/ GLfloat (*base)[3] = ctx->Light._BaseColor;
-   const struct gl_light *light;
-   GLfloat diffuseColor[4], specularColor[4];  /* for RGB mode only */
-   GLfloat diffuseCI = 0.0, specularCI = 0.0;  /* for CI mode only */
-
-   _mesa_validate_all_lighting_tables( ctx );
-
-   COPY_3V(diffuseColor, base[0]);
-   diffuseColor[3] = CLAMP( 
-      ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3], 0.0F, 1.0F );
-   ASSIGN_4V(specularColor, 0.0, 0.0, 0.0, 1.0);
-
-   foreach (light, &ctx->Light.EnabledList) {
-      GLfloat attenuation = 1.0;
-      GLfloat VP[3]; /* vector from vertex to light pos */
-      GLfloat n_dot_VP;
-      GLfloat diffuseContrib[3], specularContrib[3];
-
-      if (!(light->_Flags & LIGHT_POSITIONAL)) {
-         /* light at infinity */
-	 COPY_3V(VP, light->_VP_inf_norm);
-	 attenuation = light->_VP_inf_spot_attenuation;
-      }
-      else {
-         /* local/positional light */
-	 GLfloat d;
-
-         /* VP = vector from vertex pos to light[i].pos */
-	 SUB_3V(VP, light->_Position, vertex);
-         /* d = length(VP) */
-	 d = (GLfloat) LEN_3FV( VP );
-	 if (d > 1.0e-6) {
-            /* normalize VP */
-	    GLfloat invd = 1.0F / d;
-	    SELF_SCALE_SCALAR_3V(VP, invd);
-	 }
-
-         /* atti */
-	 attenuation = 1.0F / (light->ConstantAttenuation + d *
-			       (light->LinearAttenuation + d *
-				light->QuadraticAttenuation));
-
-	 if (light->_Flags & LIGHT_SPOT) {
-	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
-
-	    if (PV_dot_dir<light->_CosCutoff) {
-	       continue;
-	    }
-	    else {
-	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
-	       int k = (int) x;
-	       GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
-			       + (x-k)*light->_SpotExpTable[k][1]);
-	       attenuation *= spot;
-	    }
-	 }
-      }
-
-      if (attenuation < 1e-3)
-	 continue;
-
-      n_dot_VP = DOT3( normal, VP );
-
-      if (n_dot_VP < 0.0F) {
-	 ACC_SCALE_SCALAR_3V(diffuseColor, attenuation, light->_MatAmbient[0]);
-	 continue;
-      }
-
-      /* Ambient + diffuse */
-      COPY_3V(diffuseContrib, light->_MatAmbient[0]);
-      ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);
-      diffuseCI += n_dot_VP * light->_dli * attenuation;
-
-      /* Specular */
-      {
-         const GLfloat *h;
-         GLfloat n_dot_h;
-
-         ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);
-
-	 if (ctx->Light.Model.LocalViewer) {
-	    GLfloat v[3];
-	    COPY_3V(v, vertex);
-	    NORMALIZE_3FV(v);
-	    SUB_3V(VP, VP, v);
-            NORMALIZE_3FV(VP);
-	    h = VP;
-	 }
-	 else if (light->_Flags & LIGHT_POSITIONAL) {
-	    ACC_3V(VP, ctx->_EyeZDir);
-            NORMALIZE_3FV(VP);
-	    h = VP;
-	 }
-         else {
-	    h = light->_h_inf_norm;
-	 }
-
-	 n_dot_h = DOT3(normal, h);
-
-	 if (n_dot_h > 0.0F) {
-	    GLfloat spec_coef;
-	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );
-
-	    if (spec_coef > 1.0e-10) {
-               if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) {
-                  ACC_SCALE_SCALAR_3V( specularContrib, spec_coef,
-                                       light->_MatSpecular[0]);
-               }
-               else {
-                  ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,
-                                       light->_MatSpecular[0]);
-               }
-               /*assert(light->_sli > 0.0);*/
-               specularCI += spec_coef * light->_sli * attenuation;
-	    }
-	 }
-      }
-
-      ACC_SCALE_SCALAR_3V( diffuseColor, attenuation, diffuseContrib );
-      ACC_SCALE_SCALAR_3V( specularColor, attenuation, specularContrib );
-   }
-
-   Rcolor[0] = CLAMP(diffuseColor[0], 0.0F, 1.0F);
-   Rcolor[1] = CLAMP(diffuseColor[1], 0.0F, 1.0F);
-   Rcolor[2] = CLAMP(diffuseColor[2], 0.0F, 1.0F);
-   Rcolor[3] = CLAMP(diffuseColor[3], 0.0F, 1.0F);
-   Rspec[0] = CLAMP(specularColor[0], 0.0F, 1.0F);
-   Rspec[1] = CLAMP(specularColor[1], 0.0F, 1.0F);
-   Rspec[2] = CLAMP(specularColor[2], 0.0F, 1.0F);
-   Rspec[3] = CLAMP(specularColor[3], 0.0F, 1.0F);
-}
-
-
-/**
- * Do texgen needed for glRasterPos.
- * \param ctx  rendering context
- * \param vObj  object-space vertex coordinate
- * \param vEye  eye-space vertex coordinate
- * \param normal  vertex normal
- * \param unit  texture unit number
- * \param texcoord  incoming texcoord and resulting texcoord
- */
-static void
-compute_texgen(GLcontext *ctx, const GLfloat vObj[4], const GLfloat vEye[4],
-               const GLfloat normal[3], GLuint unit, GLfloat texcoord[4])
-{
-   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-
-   /* always compute sphere map terms, just in case */
-   GLfloat u[3], two_nu, rx, ry, rz, m, mInv;
-   COPY_3V(u, vEye);
-   NORMALIZE_3FV(u);
-   two_nu = 2.0F * DOT3(normal, u);
-   rx = u[0] - normal[0] * two_nu;
-   ry = u[1] - normal[1] * two_nu;
-   rz = u[2] - normal[2] * two_nu;
-   m = rx * rx + ry * ry + (rz + 1.0F) * (rz + 1.0F);
-   if (m > 0.0F)
-      mInv = 0.5F * _mesa_inv_sqrtf(m);
-   else
-      mInv = 0.0F;
-
-   if (texUnit->TexGenEnabled & S_BIT) {
-      switch (texUnit->GenS.Mode) {
-         case GL_OBJECT_LINEAR:
-            texcoord[0] = DOT4(vObj, texUnit->GenS.ObjectPlane);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[0] = DOT4(vEye, texUnit->GenS.EyePlane);
-            break;
-         case GL_SPHERE_MAP:
-            texcoord[0] = rx * mInv + 0.5F;
-            break;
-         case GL_REFLECTION_MAP:
-            texcoord[0] = rx;
-            break;
-         case GL_NORMAL_MAP:
-            texcoord[0] = normal[0];
-            break;
-         default:
-            _mesa_problem(ctx, "Bad S texgen in compute_texgen()");
-            return;
-      }
-   }
-
-   if (texUnit->TexGenEnabled & T_BIT) {
-      switch (texUnit->GenT.Mode) {
-         case GL_OBJECT_LINEAR:
-            texcoord[1] = DOT4(vObj, texUnit->GenT.ObjectPlane);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[1] = DOT4(vEye, texUnit->GenT.EyePlane);
-            break;
-         case GL_SPHERE_MAP:
-            texcoord[1] = ry * mInv + 0.5F;
-            break;
-         case GL_REFLECTION_MAP:
-            texcoord[1] = ry;
-            break;
-         case GL_NORMAL_MAP:
-            texcoord[1] = normal[1];
-            break;
-         default:
-            _mesa_problem(ctx, "Bad T texgen in compute_texgen()");
-            return;
-      }
-   }
-
-   if (texUnit->TexGenEnabled & R_BIT) {
-      switch (texUnit->GenR.Mode) {
-         case GL_OBJECT_LINEAR:
-            texcoord[2] = DOT4(vObj, texUnit->GenR.ObjectPlane);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[2] = DOT4(vEye, texUnit->GenR.EyePlane);
-            break;
-         case GL_REFLECTION_MAP:
-            texcoord[2] = rz;
-            break;
-         case GL_NORMAL_MAP:
-            texcoord[2] = normal[2];
-            break;
-         default:
-            _mesa_problem(ctx, "Bad R texgen in compute_texgen()");
-            return;
-      }
-   }
-
-   if (texUnit->TexGenEnabled & Q_BIT) {
-      switch (texUnit->GenQ.Mode) {
-         case GL_OBJECT_LINEAR:
-            texcoord[3] = DOT4(vObj, texUnit->GenQ.ObjectPlane);
-            break;
-         case GL_EYE_LINEAR:
-            texcoord[3] = DOT4(vEye, texUnit->GenQ.EyePlane);
-            break;
-         default:
-            _mesa_problem(ctx, "Bad Q texgen in compute_texgen()");
-            return;
-      }
-   }
-}
-
-
-/**
- * glRasterPos transformation.  Typically called via ctx->Driver.RasterPos().
- * XXX some of this code (such as viewport xform, clip testing and setting
- * of ctx->Current.Raster* fields) could get lifted up into the
- * main/rasterpos.c code.
- *
- * \param vObj  vertex position in object space
- */
-void
-_tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4])
-{
-   if (ctx->VertexProgram._Enabled) {
-      /* XXX implement this */
-      _mesa_problem(ctx, "Vertex programs not implemented for glRasterPos");
-      return;
-   }
-   else {
-      GLfloat eye[4], clip[4], ndc[3], d;
-      GLfloat *norm, eyenorm[3];
-      GLfloat *objnorm = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
-
-      /* apply modelview matrix:  eye = MV * obj */
-      TRANSFORM_POINT( eye, ctx->ModelviewMatrixStack.Top->m, vObj );
-      /* apply projection matrix:  clip = Proj * eye */
-      TRANSFORM_POINT( clip, ctx->ProjectionMatrixStack.Top->m, eye );
-
-      /* clip to view volume. */
-      if (!ctx->Transform.DepthClamp) {
-         if (viewclip_point_z(clip) == 0) {
-            ctx->Current.RasterPosValid = GL_FALSE;
-            return;
-         }
-      }
-      if (!ctx->Transform.RasterPositionUnclipped) {
-         if (viewclip_point_xy(clip) == 0) {
-            ctx->Current.RasterPosValid = GL_FALSE;
-            return;
-         }
-      }
-
-      /* clip to user clipping planes */
-      if (ctx->Transform.ClipPlanesEnabled && !userclip_point(ctx, clip)) {
-         ctx->Current.RasterPosValid = GL_FALSE;
-         return;
-      }
-
-      /* ndc = clip / W */
-      d = (clip[3] == 0.0F) ? 1.0F : 1.0F / clip[3];
-      ndc[0] = clip[0] * d;
-      ndc[1] = clip[1] * d;
-      ndc[2] = clip[2] * d;
-      /* wincoord = viewport_mapping(ndc) */
-      ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX]
-                                   + ctx->Viewport._WindowMap.m[MAT_TX]);
-      ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY]
-                                   + ctx->Viewport._WindowMap.m[MAT_TY]);
-      ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ]
-                                   + ctx->Viewport._WindowMap.m[MAT_TZ])
-                                  / ctx->DrawBuffer->_DepthMaxF;
-      ctx->Current.RasterPos[3] = clip[3];
-
-      if (ctx->Transform.DepthClamp) {
-	 ctx->Current.RasterPos[3] = CLAMP(ctx->Current.RasterPos[3],
-					   ctx->Viewport.Near,
-					   ctx->Viewport.Far);
-      }
-
-      /* compute raster distance */
-      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)
-         ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
-      else
-         ctx->Current.RasterDistance =
-                        SQRTF( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] );
-
-      /* compute transformed normal vector (for lighting or texgen) */
-      if (ctx->_NeedEyeCoords) {
-         const GLfloat *inv = ctx->ModelviewMatrixStack.Top->inv;
-         TRANSFORM_NORMAL( eyenorm, objnorm, inv );
-         norm = eyenorm;
-      }
-      else {
-         norm = objnorm;
-      }
-
-      /* update raster color */
-      if (ctx->Light.Enabled) {
-         /* lighting */
-         shade_rastpos( ctx, vObj, norm,
-                        ctx->Current.RasterColor,
-                        ctx->Current.RasterSecondaryColor );
-      }
-      else {
-         /* use current color */
-	 COPY_4FV(ctx->Current.RasterColor,
-		  ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);
-	 COPY_4FV(ctx->Current.RasterSecondaryColor,
-		  ctx->Current.Attrib[VERT_ATTRIB_COLOR1]);
-      }
-
-      /* texture coords */
-      {
-         GLuint u;
-         for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
-            GLfloat tc[4];
-            COPY_4V(tc, ctx->Current.Attrib[VERT_ATTRIB_TEX0 + u]);
-            if (ctx->Texture.Unit[u].TexGenEnabled) {
-               compute_texgen(ctx, vObj, eye, norm, u, tc);
-            }
-            TRANSFORM_POINT(ctx->Current.RasterTexCoords[u],
-                            ctx->TextureMatrixStack[u].Top->m, tc);
-         }
-      }
-
-      ctx->Current.RasterPosValid = GL_TRUE;
-   }
-
-   if (ctx->RenderMode == GL_SELECT) {
-      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );
-   }
-}
+/*

+ * 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/colormac.h"

+#include "main/feedback.h"

+#include "main/light.h"

+#include "main/macros.h"

+#include "main/simple_list.h"

+#include "main/mtypes.h"

+

+#include "math/m_matrix.h"

+#include "tnl/tnl.h"

+

+

+

+/**

+ * Clip a point against the view volume.

+ *

+ * \param v vertex vector describing the point to clip.

+ * 

+ * \return zero if outside view volume, or one if inside.

+ */

+static GLuint

+viewclip_point_xy( const GLfloat v[] )

+{

+   if (   v[0] > v[3] || v[0] < -v[3]

+       || v[1] > v[3] || v[1] < -v[3] ) {

+      return 0;

+   }

+   else {

+      return 1;

+   }

+}

+

+

+/**

+ * Clip a point against the far/near Z clipping planes.

+ *

+ * \param v vertex vector describing the point to clip.

+ * 

+ * \return zero if outside view volume, or one if inside.

+ */

+static GLuint

+viewclip_point_z( const GLfloat v[] )

+{

+   if (v[2] > v[3] || v[2] < -v[3] ) {

+      return 0;

+   }

+   else {

+      return 1;

+   }

+}

+

+

+/**

+ * Clip a point against the user clipping planes.

+ * 

+ * \param ctx GL context.

+ * \param v vertex vector describing the point to clip.

+ * 

+ * \return zero if the point was clipped, or one otherwise.

+ */

+static GLuint

+userclip_point( struct gl_context *ctx, const GLfloat v[] )

+{

+   GLuint p;

+

+   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

+      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+	 GLfloat dot = v[0] * ctx->Transform._ClipUserPlane[p][0]

+		     + v[1] * ctx->Transform._ClipUserPlane[p][1]

+		     + v[2] * ctx->Transform._ClipUserPlane[p][2]

+		     + v[3] * ctx->Transform._ClipUserPlane[p][3];

+         if (dot < 0.0F) {

+            return 0;

+         }

+      }

+   }

+

+   return 1;

+}

+

+

+/**

+ * Compute lighting for the raster position.  Both RGB and CI modes computed.

+ * \param ctx the context

+ * \param vertex vertex location

+ * \param normal normal vector

+ * \param Rcolor returned color

+ * \param Rspec returned specular color (if separate specular enabled)

+ * \param Rindex returned color index

+ */

+static void

+shade_rastpos(struct gl_context *ctx,

+              const GLfloat vertex[4],

+              const GLfloat normal[3],

+              GLfloat Rcolor[4],

+              GLfloat Rspec[4])

+{

+   /*const*/ GLfloat (*base)[3] = ctx->Light._BaseColor;

+   const struct gl_light *light;

+   GLfloat diffuseColor[4], specularColor[4];  /* for RGB mode only */

+   GLfloat diffuseCI = 0.0, specularCI = 0.0;  /* for CI mode only */

+

+   _mesa_validate_all_lighting_tables( ctx );

+

+   COPY_3V(diffuseColor, base[0]);

+   diffuseColor[3] = CLAMP( 

+      ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3], 0.0F, 1.0F );

+   ASSIGN_4V(specularColor, 0.0, 0.0, 0.0, 1.0);

+

+   foreach (light, &ctx->Light.EnabledList) {

+      GLfloat attenuation = 1.0;

+      GLfloat VP[3]; /* vector from vertex to light pos */

+      GLfloat n_dot_VP;

+      GLfloat diffuseContrib[3], specularContrib[3];

+

+      if (!(light->_Flags & LIGHT_POSITIONAL)) {

+         /* light at infinity */

+	 COPY_3V(VP, light->_VP_inf_norm);

+	 attenuation = light->_VP_inf_spot_attenuation;

+      }

+      else {

+         /* local/positional light */

+	 GLfloat d;

+

+         /* VP = vector from vertex pos to light[i].pos */

+	 SUB_3V(VP, light->_Position, vertex);

+         /* d = length(VP) */

+	 d = (GLfloat) LEN_3FV( VP );

+	 if (d > 1.0e-6) {

+            /* normalize VP */

+	    GLfloat invd = 1.0F / d;

+	    SELF_SCALE_SCALAR_3V(VP, invd);

+	 }

+

+         /* atti */

+	 attenuation = 1.0F / (light->ConstantAttenuation + d *

+			       (light->LinearAttenuation + d *

+				light->QuadraticAttenuation));

+

+	 if (light->_Flags & LIGHT_SPOT) {

+	    GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);

+

+	    if (PV_dot_dir<light->_CosCutoff) {

+	       continue;

+	    }

+	    else {

+	       double x = PV_dot_dir * (EXP_TABLE_SIZE-1);

+	       int k = (int) x;

+	       GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]

+			       + (x-k)*light->_SpotExpTable[k][1]);

+	       attenuation *= spot;

+	    }

+	 }

+      }

+

+      if (attenuation < 1e-3)

+	 continue;

+

+      n_dot_VP = DOT3( normal, VP );

+

+      if (n_dot_VP < 0.0F) {

+	 ACC_SCALE_SCALAR_3V(diffuseColor, attenuation, light->_MatAmbient[0]);

+	 continue;

+      }

+

+      /* Ambient + diffuse */

+      COPY_3V(diffuseContrib, light->_MatAmbient[0]);

+      ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);

+      diffuseCI += n_dot_VP * light->_dli * attenuation;

+

+      /* Specular */

+      {

+         const GLfloat *h;

+         GLfloat n_dot_h;

+

+         ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);

+

+	 if (ctx->Light.Model.LocalViewer) {

+	    GLfloat v[3];

+	    COPY_3V(v, vertex);

+	    NORMALIZE_3FV(v);

+	    SUB_3V(VP, VP, v);

+            NORMALIZE_3FV(VP);

+	    h = VP;

+	 }

+	 else if (light->_Flags & LIGHT_POSITIONAL) {

+	    ACC_3V(VP, ctx->_EyeZDir);

+            NORMALIZE_3FV(VP);

+	    h = VP;

+	 }

+         else {

+	    h = light->_h_inf_norm;

+	 }

+

+	 n_dot_h = DOT3(normal, h);

+

+	 if (n_dot_h > 0.0F) {

+	    GLfloat spec_coef;

+	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );

+

+	    if (spec_coef > 1.0e-10) {

+               if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) {

+                  ACC_SCALE_SCALAR_3V( specularContrib, spec_coef,

+                                       light->_MatSpecular[0]);

+               }

+               else {

+                  ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,

+                                       light->_MatSpecular[0]);

+               }

+               /*assert(light->_sli > 0.0);*/

+               specularCI += spec_coef * light->_sli * attenuation;

+	    }

+	 }

+      }

+

+      ACC_SCALE_SCALAR_3V( diffuseColor, attenuation, diffuseContrib );

+      ACC_SCALE_SCALAR_3V( specularColor, attenuation, specularContrib );

+   }

+

+   Rcolor[0] = CLAMP(diffuseColor[0], 0.0F, 1.0F);

+   Rcolor[1] = CLAMP(diffuseColor[1], 0.0F, 1.0F);

+   Rcolor[2] = CLAMP(diffuseColor[2], 0.0F, 1.0F);

+   Rcolor[3] = CLAMP(diffuseColor[3], 0.0F, 1.0F);

+   Rspec[0] = CLAMP(specularColor[0], 0.0F, 1.0F);

+   Rspec[1] = CLAMP(specularColor[1], 0.0F, 1.0F);

+   Rspec[2] = CLAMP(specularColor[2], 0.0F, 1.0F);

+   Rspec[3] = CLAMP(specularColor[3], 0.0F, 1.0F);

+}

+

+

+/**

+ * Do texgen needed for glRasterPos.

+ * \param ctx  rendering context

+ * \param vObj  object-space vertex coordinate

+ * \param vEye  eye-space vertex coordinate

+ * \param normal  vertex normal

+ * \param unit  texture unit number

+ * \param texcoord  incoming texcoord and resulting texcoord

+ */

+static void

+compute_texgen(struct gl_context *ctx, const GLfloat vObj[4], const GLfloat vEye[4],

+               const GLfloat normal[3], GLuint unit, GLfloat texcoord[4])

+{

+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+

+   /* always compute sphere map terms, just in case */

+   GLfloat u[3], two_nu, rx, ry, rz, m, mInv;

+   COPY_3V(u, vEye);

+   NORMALIZE_3FV(u);

+   two_nu = 2.0F * DOT3(normal, u);

+   rx = u[0] - normal[0] * two_nu;

+   ry = u[1] - normal[1] * two_nu;

+   rz = u[2] - normal[2] * two_nu;

+   m = rx * rx + ry * ry + (rz + 1.0F) * (rz + 1.0F);

+   if (m > 0.0F)

+      mInv = 0.5F * _mesa_inv_sqrtf(m);

+   else

+      mInv = 0.0F;

+

+   if (texUnit->TexGenEnabled & S_BIT) {

+      switch (texUnit->GenS.Mode) {

+         case GL_OBJECT_LINEAR:

+            texcoord[0] = DOT4(vObj, texUnit->GenS.ObjectPlane);

+            break;

+         case GL_EYE_LINEAR:

+            texcoord[0] = DOT4(vEye, texUnit->GenS.EyePlane);

+            break;

+         case GL_SPHERE_MAP:

+            texcoord[0] = rx * mInv + 0.5F;

+            break;

+         case GL_REFLECTION_MAP:

+            texcoord[0] = rx;

+            break;

+         case GL_NORMAL_MAP:

+            texcoord[0] = normal[0];

+            break;

+         default:

+            _mesa_problem(ctx, "Bad S texgen in compute_texgen()");

+            return;

+      }

+   }

+

+   if (texUnit->TexGenEnabled & T_BIT) {

+      switch (texUnit->GenT.Mode) {

+         case GL_OBJECT_LINEAR:

+            texcoord[1] = DOT4(vObj, texUnit->GenT.ObjectPlane);

+            break;

+         case GL_EYE_LINEAR:

+            texcoord[1] = DOT4(vEye, texUnit->GenT.EyePlane);

+            break;

+         case GL_SPHERE_MAP:

+            texcoord[1] = ry * mInv + 0.5F;

+            break;

+         case GL_REFLECTION_MAP:

+            texcoord[1] = ry;

+            break;

+         case GL_NORMAL_MAP:

+            texcoord[1] = normal[1];

+            break;

+         default:

+            _mesa_problem(ctx, "Bad T texgen in compute_texgen()");

+            return;

+      }

+   }

+

+   if (texUnit->TexGenEnabled & R_BIT) {

+      switch (texUnit->GenR.Mode) {

+         case GL_OBJECT_LINEAR:

+            texcoord[2] = DOT4(vObj, texUnit->GenR.ObjectPlane);

+            break;

+         case GL_EYE_LINEAR:

+            texcoord[2] = DOT4(vEye, texUnit->GenR.EyePlane);

+            break;

+         case GL_REFLECTION_MAP:

+            texcoord[2] = rz;

+            break;

+         case GL_NORMAL_MAP:

+            texcoord[2] = normal[2];

+            break;

+         default:

+            _mesa_problem(ctx, "Bad R texgen in compute_texgen()");

+            return;

+      }

+   }

+

+   if (texUnit->TexGenEnabled & Q_BIT) {

+      switch (texUnit->GenQ.Mode) {

+         case GL_OBJECT_LINEAR:

+            texcoord[3] = DOT4(vObj, texUnit->GenQ.ObjectPlane);

+            break;

+         case GL_EYE_LINEAR:

+            texcoord[3] = DOT4(vEye, texUnit->GenQ.EyePlane);

+            break;

+         default:

+            _mesa_problem(ctx, "Bad Q texgen in compute_texgen()");

+            return;

+      }

+   }

+}

+

+

+/**

+ * glRasterPos transformation.  Typically called via ctx->Driver.RasterPos().

+ * XXX some of this code (such as viewport xform, clip testing and setting

+ * of ctx->Current.Raster* fields) could get lifted up into the

+ * main/rasterpos.c code.

+ *

+ * \param vObj  vertex position in object space

+ */

+void

+_tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4])

+{

+   if (ctx->VertexProgram._Enabled) {

+      /* XXX implement this */

+      _mesa_problem(ctx, "Vertex programs not implemented for glRasterPos");

+      return;

+   }

+   else {

+      GLfloat eye[4], clip[4], ndc[3], d;

+      GLfloat *norm, eyenorm[3];

+      GLfloat *objnorm = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];

+

+      /* apply modelview matrix:  eye = MV * obj */

+      TRANSFORM_POINT( eye, ctx->ModelviewMatrixStack.Top->m, vObj );

+      /* apply projection matrix:  clip = Proj * eye */

+      TRANSFORM_POINT( clip, ctx->ProjectionMatrixStack.Top->m, eye );

+

+      /* clip to view volume. */

+      if (!ctx->Transform.DepthClamp) {

+         if (viewclip_point_z(clip) == 0) {

+            ctx->Current.RasterPosValid = GL_FALSE;

+            return;

+         }

+      }

+      if (!ctx->Transform.RasterPositionUnclipped) {

+         if (viewclip_point_xy(clip) == 0) {

+            ctx->Current.RasterPosValid = GL_FALSE;

+            return;

+         }

+      }

+

+      /* clip to user clipping planes */

+      if (ctx->Transform.ClipPlanesEnabled && !userclip_point(ctx, clip)) {

+         ctx->Current.RasterPosValid = GL_FALSE;

+         return;

+      }

+

+      /* ndc = clip / W */

+      d = (clip[3] == 0.0F) ? 1.0F : 1.0F / clip[3];

+      ndc[0] = clip[0] * d;

+      ndc[1] = clip[1] * d;

+      ndc[2] = clip[2] * d;

+      /* wincoord = viewport_mapping(ndc) */

+      ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX]

+                                   + ctx->Viewport._WindowMap.m[MAT_TX]);

+      ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY]

+                                   + ctx->Viewport._WindowMap.m[MAT_TY]);

+      ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ]

+                                   + ctx->Viewport._WindowMap.m[MAT_TZ])

+                                  / ctx->DrawBuffer->_DepthMaxF;

+      ctx->Current.RasterPos[3] = clip[3];

+

+      if (ctx->Transform.DepthClamp) {

+	 ctx->Current.RasterPos[3] = CLAMP(ctx->Current.RasterPos[3],

+					   ctx->Viewport.Near,

+					   ctx->Viewport.Far);

+      }

+

+      /* compute raster distance */

+      if (ctx->Fog.FogCoordinateSource == GL_FOG_COORDINATE_EXT)

+         ctx->Current.RasterDistance = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];

+      else

+         ctx->Current.RasterDistance =

+                        SQRTF( eye[0]*eye[0] + eye[1]*eye[1] + eye[2]*eye[2] );

+

+      /* compute transformed normal vector (for lighting or texgen) */

+      if (ctx->_NeedEyeCoords) {

+         const GLfloat *inv = ctx->ModelviewMatrixStack.Top->inv;

+         TRANSFORM_NORMAL( eyenorm, objnorm, inv );

+         norm = eyenorm;

+      }

+      else {

+         norm = objnorm;

+      }

+

+      /* update raster color */

+      if (ctx->Light.Enabled) {

+         /* lighting */

+         shade_rastpos( ctx, vObj, norm,

+                        ctx->Current.RasterColor,

+                        ctx->Current.RasterSecondaryColor );

+      }

+      else {

+         /* use current color */

+	 COPY_4FV(ctx->Current.RasterColor,

+		  ctx->Current.Attrib[VERT_ATTRIB_COLOR0]);

+	 COPY_4FV(ctx->Current.RasterSecondaryColor,

+		  ctx->Current.Attrib[VERT_ATTRIB_COLOR1]);

+      }

+

+      /* texture coords */

+      {

+         GLuint u;

+         for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {

+            GLfloat tc[4];

+            COPY_4V(tc, ctx->Current.Attrib[VERT_ATTRIB_TEX0 + u]);

+            if (ctx->Texture.Unit[u].TexGenEnabled) {

+               compute_texgen(ctx, vObj, eye, norm, u, tc);

+            }

+            TRANSFORM_POINT(ctx->Current.RasterTexCoords[u],

+                            ctx->TextureMatrixStack[u].Top->m, tc);

+         }

+      }

+

+      ctx->Current.RasterPosValid = GL_TRUE;

+   }

+

+   if (ctx->RenderMode == GL_SELECT) {

+      _mesa_update_hitflag( ctx, ctx->Current.RasterPos[2] );

+   }

+}

diff --git a/mesalib/src/mesa/tnl/t_vb_cliptmp.h b/mesalib/src/mesa/tnl/t_vb_cliptmp.h
index 8cc36e666..b67aaddda 100644
--- a/mesalib/src/mesa/tnl/t_vb_cliptmp.h
+++ b/mesalib/src/mesa/tnl/t_vb_cliptmp.h
@@ -1,320 +1,320 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#define CLIP_DOTPROD(K, A, B, C, D) X(K)*A + Y(K)*B + Z(K)*C + W(K)*D
-
-#define POLY_CLIP( PLANE_BIT, A, B, C, D )				\
-do {									\
-   if (mask & PLANE_BIT) {						\
-      GLuint idxPrev = inlist[0];					\
-      GLfloat dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );		\
-      GLuint outcount = 0;						\
-      GLuint i;								\
-									\
-      inlist[n] = inlist[0]; /* prevent rotation of vertices */		\
-      for (i = 1; i <= n; i++) {					\
-	 GLuint idx = inlist[i];					\
-	 GLfloat dp = CLIP_DOTPROD(idx, A, B, C, D );			\
-									\
-	 if (!IS_NEGATIVE(dpPrev)) {					\
-	    outlist[outcount++] = idxPrev;				\
-	 }								\
-									\
-	 if (DIFFERENT_SIGNS(dp, dpPrev)) {				\
-	    if (IS_NEGATIVE(dp)) {					\
-	       /* Going out of bounds.  Avoid division by zero as we	\
-		* know dp != dpPrev from DIFFERENT_SIGNS, above.	\
-		*/							\
-	       GLfloat t = dp / (dp - dpPrev);				\
-               INTERP_4F( t, coord[newvert], coord[idx], coord[idxPrev]); \
-      	       interp( ctx, t, newvert, idx, idxPrev, GL_TRUE );	\
-	    } else {							\
-	       /* Coming back in.					\
-		*/							\
-	       GLfloat t = dpPrev / (dpPrev - dp);			\
-               INTERP_4F( t, coord[newvert], coord[idxPrev], coord[idx]); \
-	       interp( ctx, t, newvert, idxPrev, idx, GL_FALSE );	\
-	    }								\
-            outlist[outcount++] = newvert++;				\
-	 }								\
-									\
-	 idxPrev = idx;							\
-	 dpPrev = dp;							\
-      }									\
-									\
-      if (outcount < 3)							\
-	 return;							\
-									\
-      {									\
-	 GLuint *tmp = inlist;						\
-	 inlist = outlist;						\
-	 outlist = tmp;							\
-	 n = outcount;							\
-      }									\
-   }									\
-} while (0)
-
-
-#define LINE_CLIP(PLANE_BIT, A, B, C, D )				\
-do {									\
-   if (mask & PLANE_BIT) {						\
-      const GLfloat dp0 = CLIP_DOTPROD( v0, A, B, C, D );		\
-      const GLfloat dp1 = CLIP_DOTPROD( v1, A, B, C, D );		\
-      const GLboolean neg_dp0 = IS_NEGATIVE(dp0);			\
-      const GLboolean neg_dp1 = IS_NEGATIVE(dp1);			\
-      									\
-      /* For regular clipping, we know from the clipmask that one	\
-       * (or both) of these must be negative (otherwise we wouldn't	\
-       * be here).							\
-       * For userclip, there is only a single bit for all active	\
-       * planes, so we can end up here when there is nothing to do,	\
-       * hence the second IS_NEGATIVE() test:				\
-       */								\
-      if (neg_dp0 && neg_dp1)						\
-         return; /* both vertices outside clip plane: discard */	\
-									\
-      if (neg_dp1) {							\
-	 GLfloat t = dp1 / (dp1 - dp0);					\
-	 if (t > t1) t1 = t;						\
-      } else if (neg_dp0) {						\
-	 GLfloat t = dp0 / (dp0 - dp1);					\
-	 if (t > t0) t0 = t;						\
-      }									\
-      if (t0 + t1 >= 1.0)						\
-	 return; /* discard */						\
-   }									\
-} while (0)
-
-
-
-/* Clip a line against the viewport and user clip planes.
- */
-static INLINE void
-TAG(clip_line)( GLcontext *ctx, GLuint v0, GLuint v1, GLubyte mask )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   tnl_interp_func interp = tnl->Driver.Render.Interp;
-   GLfloat (*coord)[4] = VB->ClipPtr->data;
-   GLuint newvert = VB->Count;
-   GLfloat t0 = 0;
-   GLfloat t1 = 0;
-   GLuint p;
-   const GLuint v0_orig = v0;
-
-   if (mask & CLIP_FRUSTUM_BITS) {
-      LINE_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
-      LINE_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
-      LINE_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
-      LINE_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
-      LINE_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
-      LINE_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
-   }
-
-   if (mask & CLIP_USER_BIT) {
-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
-            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
-            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
-            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
-	    LINE_CLIP( CLIP_USER_BIT, a, b, c, d );
-	 }
-      }
-   }
-
-   if (VB->ClipMask[v0]) {
-      INTERP_4F( t0, coord[newvert], coord[v0], coord[v1] );
-      interp( ctx, t0, newvert, v0, v1, GL_FALSE );
-      v0 = newvert;
-      newvert++;
-   }
-   else {
-      ASSERT(t0 == 0.0);
-   }
-
-   /* Note: we need to use vertex v0_orig when computing the new
-    * interpolated/clipped vertex position, not the current v0 which
-    * may have got set when we clipped the other end of the line!
-    */
-   if (VB->ClipMask[v1]) {
-      INTERP_4F( t1, coord[newvert], coord[v1], coord[v0_orig] );
-      interp( ctx, t1, newvert, v1, v0_orig, GL_FALSE );
-
-      if (ctx->Light.ShadeModel == GL_FLAT)
-	 tnl->Driver.Render.CopyPV( ctx, newvert, v1 );
-
-      v1 = newvert;
-
-      newvert++;
-   }
-   else {
-      ASSERT(t1 == 0.0);
-   }
-
-   tnl->Driver.Render.ClippedLine( ctx, v0, v1 );
-}
-
-
-/* Clip a triangle against the viewport and user clip planes.
- */
-static INLINE void
-TAG(clip_tri)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   tnl_interp_func interp = tnl->Driver.Render.Interp;
-   GLuint newvert = VB->Count;
-   GLfloat (*coord)[4] = VB->ClipPtr->data;
-   GLuint pv = v2;
-   GLuint vlist[2][MAX_CLIPPED_VERTICES];
-   GLuint *inlist = vlist[0], *outlist = vlist[1];
-   GLuint p;
-   GLuint n = 3;
-
-   ASSIGN_3V(inlist, v2, v0, v1 ); /* pv rotated to slot zero */
-
-   if (0) {
-      /* print pre-clip vertex coords */
-      GLuint i, j;
-      printf("pre clip:\n");
-      for (i = 0; i < n; i++) {
-         j = inlist[i];
-         printf("  %u: %u: %f, %f, %f, %f\n",
-		i, j,
-		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
-         assert(!IS_INF_OR_NAN(coord[j][0]));
-         assert(!IS_INF_OR_NAN(coord[j][1]));
-         assert(!IS_INF_OR_NAN(coord[j][2]));
-         assert(!IS_INF_OR_NAN(coord[j][3]));
-      }
-   }
-
-
-   if (mask & CLIP_FRUSTUM_BITS) {
-      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
-      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
-      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
-      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
-      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
-      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
-   }
-
-   if (mask & CLIP_USER_BIT) {
-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-         if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
-            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
-            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
-            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
-            POLY_CLIP( CLIP_USER_BIT, a, b, c, d );
-         }
-      }
-   }
-
-   if (ctx->Light.ShadeModel == GL_FLAT) {
-      if (pv != inlist[0]) {
-	 ASSERT( inlist[0] >= VB->Count );
-	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );
-      }
-   }
-
-   if (0) {
-      /* print post-clip vertex coords */
-      GLuint i, j;
-      printf("post clip:\n");
-      for (i = 0; i < n; i++) {
-         j = inlist[i];
-         printf("  %u: %u: %f, %f, %f, %f\n",
-		i, j,
-		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
-      }
-   }
-
-   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );
-}
-
-
-/* Clip a quad against the viewport and user clip planes.
- */
-static INLINE void
-TAG(clip_quad)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,
-                GLubyte mask )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   tnl_interp_func interp = tnl->Driver.Render.Interp;
-   GLuint newvert = VB->Count;
-   GLfloat (*coord)[4] = VB->ClipPtr->data;
-   GLuint pv = v3;
-   GLuint vlist[2][MAX_CLIPPED_VERTICES];
-   GLuint *inlist = vlist[0], *outlist = vlist[1];
-   GLuint p;
-   GLuint n = 4;
-
-   ASSIGN_4V(inlist, v3, v0, v1, v2 ); /* pv rotated to slot zero */
-
-   if (mask & CLIP_FRUSTUM_BITS) {
-      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );
-      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );
-      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );
-      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );
-      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );
-      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );
-   }
-
-   if (mask & CLIP_USER_BIT) {
-      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
-            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
-            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
-            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
-	    POLY_CLIP( CLIP_USER_BIT, a, b, c, d );
-	 }
-      }
-   }
-
-   if (ctx->Light.ShadeModel == GL_FLAT) {
-      if (pv != inlist[0]) {
-	 ASSERT( inlist[0] >= VB->Count );
-	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );
-      }
-   }
-
-   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );
-}
-
-#undef W
-#undef Z
-#undef Y
-#undef X
-#undef SIZE
-#undef TAG
-#undef POLY_CLIP
-#undef LINE_CLIP
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#define CLIP_DOTPROD(K, A, B, C, D) X(K)*A + Y(K)*B + Z(K)*C + W(K)*D

+

+#define POLY_CLIP( PLANE_BIT, A, B, C, D )				\

+do {									\

+   if (mask & PLANE_BIT) {						\

+      GLuint idxPrev = inlist[0];					\

+      GLfloat dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D );		\

+      GLuint outcount = 0;						\

+      GLuint i;								\

+									\

+      inlist[n] = inlist[0]; /* prevent rotation of vertices */		\

+      for (i = 1; i <= n; i++) {					\

+	 GLuint idx = inlist[i];					\

+	 GLfloat dp = CLIP_DOTPROD(idx, A, B, C, D );			\

+									\

+	 if (!IS_NEGATIVE(dpPrev)) {					\

+	    outlist[outcount++] = idxPrev;				\

+	 }								\

+									\

+	 if (DIFFERENT_SIGNS(dp, dpPrev)) {				\

+	    if (IS_NEGATIVE(dp)) {					\

+	       /* Going out of bounds.  Avoid division by zero as we	\

+		* know dp != dpPrev from DIFFERENT_SIGNS, above.	\

+		*/							\

+	       GLfloat t = dp / (dp - dpPrev);				\

+               INTERP_4F( t, coord[newvert], coord[idx], coord[idxPrev]); \

+      	       interp( ctx, t, newvert, idx, idxPrev, GL_TRUE );	\

+	    } else {							\

+	       /* Coming back in.					\

+		*/							\

+	       GLfloat t = dpPrev / (dpPrev - dp);			\

+               INTERP_4F( t, coord[newvert], coord[idxPrev], coord[idx]); \

+	       interp( ctx, t, newvert, idxPrev, idx, GL_FALSE );	\

+	    }								\

+            outlist[outcount++] = newvert++;				\

+	 }								\

+									\

+	 idxPrev = idx;							\

+	 dpPrev = dp;							\

+      }									\

+									\

+      if (outcount < 3)							\

+	 return;							\

+									\

+      {									\

+	 GLuint *tmp = inlist;						\

+	 inlist = outlist;						\

+	 outlist = tmp;							\

+	 n = outcount;							\

+      }									\

+   }									\

+} while (0)

+

+

+#define LINE_CLIP(PLANE_BIT, A, B, C, D )				\

+do {									\

+   if (mask & PLANE_BIT) {						\

+      const GLfloat dp0 = CLIP_DOTPROD( v0, A, B, C, D );		\

+      const GLfloat dp1 = CLIP_DOTPROD( v1, A, B, C, D );		\

+      const GLboolean neg_dp0 = IS_NEGATIVE(dp0);			\

+      const GLboolean neg_dp1 = IS_NEGATIVE(dp1);			\

+      									\

+      /* For regular clipping, we know from the clipmask that one	\

+       * (or both) of these must be negative (otherwise we wouldn't	\

+       * be here).							\

+       * For userclip, there is only a single bit for all active	\

+       * planes, so we can end up here when there is nothing to do,	\

+       * hence the second IS_NEGATIVE() test:				\

+       */								\

+      if (neg_dp0 && neg_dp1)						\

+         return; /* both vertices outside clip plane: discard */	\

+									\

+      if (neg_dp1) {							\

+	 GLfloat t = dp1 / (dp1 - dp0);					\

+	 if (t > t1) t1 = t;						\

+      } else if (neg_dp0) {						\

+	 GLfloat t = dp0 / (dp0 - dp1);					\

+	 if (t > t0) t0 = t;						\

+      }									\

+      if (t0 + t1 >= 1.0)						\

+	 return; /* discard */						\

+   }									\

+} while (0)

+

+

+

+/* Clip a line against the viewport and user clip planes.

+ */

+static INLINE void

+TAG(clip_line)( struct gl_context *ctx, GLuint v0, GLuint v1, GLubyte mask )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   tnl_interp_func interp = tnl->Driver.Render.Interp;

+   GLfloat (*coord)[4] = VB->ClipPtr->data;

+   GLuint newvert = VB->Count;

+   GLfloat t0 = 0;

+   GLfloat t1 = 0;

+   GLuint p;

+   const GLuint v0_orig = v0;

+

+   if (mask & CLIP_FRUSTUM_BITS) {

+      LINE_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );

+      LINE_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );

+      LINE_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );

+      LINE_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );

+      LINE_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );

+      LINE_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );

+   }

+

+   if (mask & CLIP_USER_BIT) {

+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

+	    LINE_CLIP( CLIP_USER_BIT, a, b, c, d );

+	 }

+      }

+   }

+

+   if (VB->ClipMask[v0]) {

+      INTERP_4F( t0, coord[newvert], coord[v0], coord[v1] );

+      interp( ctx, t0, newvert, v0, v1, GL_FALSE );

+      v0 = newvert;

+      newvert++;

+   }

+   else {

+      ASSERT(t0 == 0.0);

+   }

+

+   /* Note: we need to use vertex v0_orig when computing the new

+    * interpolated/clipped vertex position, not the current v0 which

+    * may have got set when we clipped the other end of the line!

+    */

+   if (VB->ClipMask[v1]) {

+      INTERP_4F( t1, coord[newvert], coord[v1], coord[v0_orig] );

+      interp( ctx, t1, newvert, v1, v0_orig, GL_FALSE );

+

+      if (ctx->Light.ShadeModel == GL_FLAT)

+	 tnl->Driver.Render.CopyPV( ctx, newvert, v1 );

+

+      v1 = newvert;

+

+      newvert++;

+   }

+   else {

+      ASSERT(t1 == 0.0);

+   }

+

+   tnl->Driver.Render.ClippedLine( ctx, v0, v1 );

+}

+

+

+/* Clip a triangle against the viewport and user clip planes.

+ */

+static INLINE void

+TAG(clip_tri)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   tnl_interp_func interp = tnl->Driver.Render.Interp;

+   GLuint newvert = VB->Count;

+   GLfloat (*coord)[4] = VB->ClipPtr->data;

+   GLuint pv = v2;

+   GLuint vlist[2][MAX_CLIPPED_VERTICES];

+   GLuint *inlist = vlist[0], *outlist = vlist[1];

+   GLuint p;

+   GLuint n = 3;

+

+   ASSIGN_3V(inlist, v2, v0, v1 ); /* pv rotated to slot zero */

+

+   if (0) {

+      /* print pre-clip vertex coords */

+      GLuint i, j;

+      printf("pre clip:\n");

+      for (i = 0; i < n; i++) {

+         j = inlist[i];

+         printf("  %u: %u: %f, %f, %f, %f\n",

+		i, j,

+		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);

+         assert(!IS_INF_OR_NAN(coord[j][0]));

+         assert(!IS_INF_OR_NAN(coord[j][1]));

+         assert(!IS_INF_OR_NAN(coord[j][2]));

+         assert(!IS_INF_OR_NAN(coord[j][3]));

+      }

+   }

+

+

+   if (mask & CLIP_FRUSTUM_BITS) {

+      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );

+      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );

+      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );

+      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );

+      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );

+      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );

+   }

+

+   if (mask & CLIP_USER_BIT) {

+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

+         if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

+            POLY_CLIP( CLIP_USER_BIT, a, b, c, d );

+         }

+      }

+   }

+

+   if (ctx->Light.ShadeModel == GL_FLAT) {

+      if (pv != inlist[0]) {

+	 ASSERT( inlist[0] >= VB->Count );

+	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );

+      }

+   }

+

+   if (0) {

+      /* print post-clip vertex coords */

+      GLuint i, j;

+      printf("post clip:\n");

+      for (i = 0; i < n; i++) {

+         j = inlist[i];

+         printf("  %u: %u: %f, %f, %f, %f\n",

+		i, j,

+		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);

+      }

+   }

+

+   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );

+}

+

+

+/* Clip a quad against the viewport and user clip planes.

+ */

+static INLINE void

+TAG(clip_quad)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,

+                GLubyte mask )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   tnl_interp_func interp = tnl->Driver.Render.Interp;

+   GLuint newvert = VB->Count;

+   GLfloat (*coord)[4] = VB->ClipPtr->data;

+   GLuint pv = v3;

+   GLuint vlist[2][MAX_CLIPPED_VERTICES];

+   GLuint *inlist = vlist[0], *outlist = vlist[1];

+   GLuint p;

+   GLuint n = 4;

+

+   ASSIGN_4V(inlist, v3, v0, v1, v2 ); /* pv rotated to slot zero */

+

+   if (mask & CLIP_FRUSTUM_BITS) {

+      POLY_CLIP( CLIP_RIGHT_BIT,  -1,  0,  0, 1 );

+      POLY_CLIP( CLIP_LEFT_BIT,    1,  0,  0, 1 );

+      POLY_CLIP( CLIP_TOP_BIT,     0, -1,  0, 1 );

+      POLY_CLIP( CLIP_BOTTOM_BIT,  0,  1,  0, 1 );

+      POLY_CLIP( CLIP_FAR_BIT,     0,  0, -1, 1 );

+      POLY_CLIP( CLIP_NEAR_BIT,    0,  0,  1, 1 );

+   }

+

+   if (mask & CLIP_USER_BIT) {

+      for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

+	 if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+            const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

+            const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

+            const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

+            const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

+	    POLY_CLIP( CLIP_USER_BIT, a, b, c, d );

+	 }

+      }

+   }

+

+   if (ctx->Light.ShadeModel == GL_FLAT) {

+      if (pv != inlist[0]) {

+	 ASSERT( inlist[0] >= VB->Count );

+	 tnl->Driver.Render.CopyPV( ctx, inlist[0], pv );

+      }

+   }

+

+   tnl->Driver.Render.ClippedPolygon( ctx, inlist, n );

+}

+

+#undef W

+#undef Z

+#undef Y

+#undef X

+#undef SIZE

+#undef TAG

+#undef POLY_CLIP

+#undef LINE_CLIP

diff --git a/mesalib/src/mesa/tnl/t_vb_cull.c b/mesalib/src/mesa/tnl/t_vb_cull.c
deleted file mode 100644
index 22df71667..000000000
--- a/mesalib/src/mesa/tnl/t_vb_cull.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
-
-/* EXT_vertex_cull.  Not really a big win, but probably depends on
- * your application.  This stage not included in the default pipeline.
- */
-static GLboolean run_cull_stage( GLcontext *ctx,
-				 struct tnl_pipeline_stage *stage )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-
-   const GLfloat a = ctx->Transform.CullObjPos[0];
-   const GLfloat b = ctx->Transform.CullObjPos[1];
-   const GLfloat c = ctx->Transform.CullObjPos[2];
-   GLfloat *norm = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;
-   GLuint stride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;
-   GLuint count = VB->Count;
-   GLuint i;
-
-   if (ctx->VertexProgram._Current ||
-       !ctx->Transform.CullVertexFlag) 
-      return GL_TRUE;
-
-   VB->ClipOrMask &= ~CLIP_CULL_BIT;
-   VB->ClipAndMask |= CLIP_CULL_BIT;
-
-   for (i = 0 ; i < count ; i++) {
-      GLfloat dp = (norm[0] * a + 
-		    norm[1] * b +
-		    norm[2] * c);
-
-      if (dp < 0) {
-	 VB->ClipMask[i] |= CLIP_CULL_BIT;
-	 VB->ClipOrMask |= CLIP_CULL_BIT;
-      }
-      else {
-	 VB->ClipMask[i] &= ~CLIP_CULL_BIT;
-	 VB->ClipAndMask &= ~CLIP_CULL_BIT;
-      }
-
-      STRIDE_F(norm, stride);
-   }
-
-   return !(VB->ClipAndMask & CLIP_CULL_BIT);
-}
-
-
-
-const struct tnl_pipeline_stage _tnl_vertex_cull_stage =
-{
-   "EXT_cull_vertex",
-   NULL,			/* private data */
-   NULL,				/* ctr */
-   NULL,				/* destructor */
-   NULL,
-   run_cull_stage		/* run -- initially set to init */
-};
diff --git a/mesalib/src/mesa/tnl/t_vb_fog.c b/mesalib/src/mesa/tnl/t_vb_fog.c
index 9faae24ec..3e5c99735 100644
--- a/mesalib/src/mesa/tnl/t_vb_fog.c
+++ b/mesalib/src/mesa/tnl/t_vb_fog.c
@@ -1,276 +1,276 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
-struct fog_stage_data {
-   GLvector4f fogcoord;		/* has actual storage allocated */
-};
-
-#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->privatePtr)
-
-#define FOG_EXP_TABLE_SIZE 256
-#define FOG_MAX (10.0)
-#define EXP_FOG_MAX .0006595
-#define FOG_INCR (FOG_MAX/FOG_EXP_TABLE_SIZE)
-static GLfloat exp_table[FOG_EXP_TABLE_SIZE];
-static GLfloat inited = 0;
-
-#if 1
-#define NEG_EXP( result, narg )						\
-do {									\
-   GLfloat f = (GLfloat) (narg * (1.0/FOG_INCR));			\
-   GLint k = (GLint) f;							\
-   if (k > FOG_EXP_TABLE_SIZE-2) 					\
-      result = (GLfloat) EXP_FOG_MAX;					\
-   else									\
-      result = exp_table[k] + (f-k)*(exp_table[k+1]-exp_table[k]);	\
-} while (0)
-#else
-#define NEG_EXP( result, narg )					\
-do {								\
-   result = exp(-narg);						\
-} while (0)
-#endif
-
-
-/**
- * Initialize the exp_table[] lookup table for approximating exp().
- */
-static void
-init_static_data( void )
-{
-   GLfloat f = 0.0F;
-   GLint i = 0;
-   for ( ; i < FOG_EXP_TABLE_SIZE ; i++, f += FOG_INCR) {
-      exp_table[i] = EXPF(-f);
-   }
-   inited = 1;
-}
-
-
-/**
- * Compute per-vertex fog blend factors from fog coordinates by
- * evaluating the GL_LINEAR, GL_EXP or GL_EXP2 fog function.
- * Fog coordinates are distances from the eye (typically between the
- * near and far clip plane distances).
- * Note that fogcoords may be negative, if eye z is source absolute
- * value must be taken earlier.
- * Fog blend factors are in the range [0,1].
- */
-static void
-compute_fog_blend_factors(GLcontext *ctx, GLvector4f *out, const GLvector4f *in)
-{
-   GLfloat end  = ctx->Fog.End;
-   GLfloat *v = in->start;
-   GLuint stride = in->stride;
-   GLuint n = in->count;
-   GLfloat (*data)[4] = out->data;
-   GLfloat d;
-   GLuint i;
-
-   out->count = in->count;
-
-   switch (ctx->Fog.Mode) {
-   case GL_LINEAR:
-      if (ctx->Fog.Start == ctx->Fog.End)
-         d = 1.0F;
-      else
-         d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);
-      for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
-         const GLfloat z = *v;
-         GLfloat f = (end - z) * d;
-	 data[i][0] = CLAMP(f, 0.0F, 1.0F);
-      }
-      break;
-   case GL_EXP:
-      d = ctx->Fog.Density;
-      for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride)) {
-         const GLfloat z = *v;
-         NEG_EXP( data[i][0], d * z );
-      }
-      break;
-   case GL_EXP2:
-      d = ctx->Fog.Density*ctx->Fog.Density;
-      for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {
-         const GLfloat z = *v;
-         NEG_EXP( data[i][0], d * z * z );
-      }
-      break;
-   default:
-      _mesa_problem(ctx, "Bad fog mode in make_fog_coord");
-      return;
-   }
-}
-
-
-static GLboolean
-run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   struct fog_stage_data *store = FOG_STAGE_DATA(stage);
-   GLvector4f *input;
-
-
-   if (!ctx->Fog.Enabled)
-      return GL_TRUE;
-
-   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT && !ctx->VertexProgram._Current) {
-      GLuint i;
-      GLfloat *coord;
-      /* Fog is computed from vertex or fragment Z values */
-      /* source = VB->AttribPtr[_TNL_ATTRIB_POS] or VB->EyePtr coords */
-      /* dest = VB->AttribPtr[_TNL_ATTRIB_FOG] = fog stage private storage */
-      VB->AttribPtr[_TNL_ATTRIB_FOG] = &store->fogcoord;
-
-      if (!ctx->_NeedEyeCoords) {
-         /* compute fog coords from object coords */
-	 const GLfloat *m = ctx->ModelviewMatrixStack.Top->m;
-	 GLfloat plane[4];
-
-	 /* Use this to store calculated eye z values:
-	  */
-	 input = &store->fogcoord;
-
-	 plane[0] = m[2];
-	 plane[1] = m[6];
-	 plane[2] = m[10];
-	 plane[3] = m[14];
-	 /* Full eye coords weren't required, just calculate the
-	  * eye Z values.
-	  */
-	 _mesa_dotprod_tab[VB->AttribPtr[_TNL_ATTRIB_POS]->size]
-	    ( (GLfloat *) input->data,
-	      4 * sizeof(GLfloat),
-	      VB->AttribPtr[_TNL_ATTRIB_POS], plane );
-
-	 input->count = VB->AttribPtr[_TNL_ATTRIB_POS]->count;
-
-	 /* make sure coords are really positive
-	    NOTE should avoid going through array twice */
-	 coord = input->start;
-	 for (i = 0; i < input->count; i++) {
-	    *coord = FABSF(*coord);
-	    STRIDE_F(coord, input->stride);
-	 }
-      }
-      else {
-         /* fog coordinates = eye Z coordinates - need to copy for ABS */
-	 input = &store->fogcoord;
-
-	 if (VB->EyePtr->size < 2)
-	    _mesa_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );
-
-	 input->stride = 4 * sizeof(GLfloat);
-	 input->count = VB->EyePtr->count;
-	 coord = VB->EyePtr->start;
-	 for (i = 0 ; i < VB->EyePtr->count; i++) {
-	    input->data[i][0] = FABSF(coord[2]);
-	    STRIDE_F(coord, VB->EyePtr->stride);
-	 }
-      }
-   }
-   else {
-      /* use glFogCoord() coordinates */
-      input = VB->AttribPtr[_TNL_ATTRIB_FOG];  /* source data */
-
-      /* input->count may be one if glFogCoord was only called once
-       * before glBegin.  But we need to compute fog for all vertices.
-       */
-      input->count = VB->AttribPtr[_TNL_ATTRIB_POS]->count;
-
-      VB->AttribPtr[_TNL_ATTRIB_FOG] = &store->fogcoord;  /* dest data */
-   }
-
-   if (tnl->_DoVertexFog) {
-      /* compute blend factors from fog coordinates */
-      compute_fog_blend_factors( ctx, VB->AttribPtr[_TNL_ATTRIB_FOG], input );
-   }
-   else {
-      /* results = incoming fog coords (compute fog per-fragment later) */
-      VB->AttribPtr[_TNL_ATTRIB_FOG] = input;
-   }
-
-   return GL_TRUE;
-}
-
-
-
-/* Called the first time stage->run() is invoked.
- */
-static GLboolean
-alloc_fog_data(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct fog_stage_data *store;
-   stage->privatePtr = MALLOC(sizeof(*store));
-   store = FOG_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   _mesa_vector4f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
-
-   if (!inited)
-      init_static_data();
-
-   return GL_TRUE;
-}
-
-
-static void
-free_fog_data(struct tnl_pipeline_stage *stage)
-{
-   struct fog_stage_data *store = FOG_STAGE_DATA(stage);
-   if (store) {
-      _mesa_vector4f_free( &store->fogcoord );
-      FREE( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-
-const struct tnl_pipeline_stage _tnl_fog_coordinate_stage =
-{
-   "build fog coordinates",	/* name */
-   NULL,			/* private_data */
-   alloc_fog_data,		/* dtr */
-   free_fog_data,		/* dtr */
-   NULL,		/* check */
-   run_fog_stage		/* run -- initially set to init. */
-};
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "math/m_xform.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+

+

+struct fog_stage_data {

+   GLvector4f fogcoord;		/* has actual storage allocated */

+};

+

+#define FOG_STAGE_DATA(stage) ((struct fog_stage_data *)stage->privatePtr)

+

+#define FOG_EXP_TABLE_SIZE 256

+#define FOG_MAX (10.0)

+#define EXP_FOG_MAX .0006595

+#define FOG_INCR (FOG_MAX/FOG_EXP_TABLE_SIZE)

+static GLfloat exp_table[FOG_EXP_TABLE_SIZE];

+static GLfloat inited = 0;

+

+#if 1

+#define NEG_EXP( result, narg )						\

+do {									\

+   GLfloat f = (GLfloat) (narg * (1.0/FOG_INCR));			\

+   GLint k = (GLint) f;							\

+   if (k > FOG_EXP_TABLE_SIZE-2) 					\

+      result = (GLfloat) EXP_FOG_MAX;					\

+   else									\

+      result = exp_table[k] + (f-k)*(exp_table[k+1]-exp_table[k]);	\

+} while (0)

+#else

+#define NEG_EXP( result, narg )					\

+do {								\

+   result = exp(-narg);						\

+} while (0)

+#endif

+

+

+/**

+ * Initialize the exp_table[] lookup table for approximating exp().

+ */

+static void

+init_static_data( void )

+{

+   GLfloat f = 0.0F;

+   GLint i = 0;

+   for ( ; i < FOG_EXP_TABLE_SIZE ; i++, f += FOG_INCR) {

+      exp_table[i] = EXPF(-f);

+   }

+   inited = 1;

+}

+

+

+/**

+ * Compute per-vertex fog blend factors from fog coordinates by

+ * evaluating the GL_LINEAR, GL_EXP or GL_EXP2 fog function.

+ * Fog coordinates are distances from the eye (typically between the

+ * near and far clip plane distances).

+ * Note that fogcoords may be negative, if eye z is source absolute

+ * value must be taken earlier.

+ * Fog blend factors are in the range [0,1].

+ */

+static void

+compute_fog_blend_factors(struct gl_context *ctx, GLvector4f *out, const GLvector4f *in)

+{

+   GLfloat end  = ctx->Fog.End;

+   GLfloat *v = in->start;

+   GLuint stride = in->stride;

+   GLuint n = in->count;

+   GLfloat (*data)[4] = out->data;

+   GLfloat d;

+   GLuint i;

+

+   out->count = in->count;

+

+   switch (ctx->Fog.Mode) {

+   case GL_LINEAR:

+      if (ctx->Fog.Start == ctx->Fog.End)

+         d = 1.0F;

+      else

+         d = 1.0F / (ctx->Fog.End - ctx->Fog.Start);

+      for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {

+         const GLfloat z = *v;

+         GLfloat f = (end - z) * d;

+	 data[i][0] = CLAMP(f, 0.0F, 1.0F);

+      }

+      break;

+   case GL_EXP:

+      d = ctx->Fog.Density;

+      for ( i = 0 ; i < n ; i++, STRIDE_F(v,stride)) {

+         const GLfloat z = *v;

+         NEG_EXP( data[i][0], d * z );

+      }

+      break;

+   case GL_EXP2:

+      d = ctx->Fog.Density*ctx->Fog.Density;

+      for ( i = 0 ; i < n ; i++, STRIDE_F(v, stride)) {

+         const GLfloat z = *v;

+         NEG_EXP( data[i][0], d * z * z );

+      }

+      break;

+   default:

+      _mesa_problem(ctx, "Bad fog mode in make_fog_coord");

+      return;

+   }

+}

+

+

+static GLboolean

+run_fog_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   struct fog_stage_data *store = FOG_STAGE_DATA(stage);

+   GLvector4f *input;

+

+

+   if (!ctx->Fog.Enabled)

+      return GL_TRUE;

+

+   if (ctx->Fog.FogCoordinateSource == GL_FRAGMENT_DEPTH_EXT && !ctx->VertexProgram._Current) {

+      GLuint i;

+      GLfloat *coord;

+      /* Fog is computed from vertex or fragment Z values */

+      /* source = VB->AttribPtr[_TNL_ATTRIB_POS] or VB->EyePtr coords */

+      /* dest = VB->AttribPtr[_TNL_ATTRIB_FOG] = fog stage private storage */

+      VB->AttribPtr[_TNL_ATTRIB_FOG] = &store->fogcoord;

+

+      if (!ctx->_NeedEyeCoords) {

+         /* compute fog coords from object coords */

+	 const GLfloat *m = ctx->ModelviewMatrixStack.Top->m;

+	 GLfloat plane[4];

+

+	 /* Use this to store calculated eye z values:

+	  */

+	 input = &store->fogcoord;

+

+	 plane[0] = m[2];

+	 plane[1] = m[6];

+	 plane[2] = m[10];

+	 plane[3] = m[14];

+	 /* Full eye coords weren't required, just calculate the

+	  * eye Z values.

+	  */

+	 _mesa_dotprod_tab[VB->AttribPtr[_TNL_ATTRIB_POS]->size]

+	    ( (GLfloat *) input->data,

+	      4 * sizeof(GLfloat),

+	      VB->AttribPtr[_TNL_ATTRIB_POS], plane );

+

+	 input->count = VB->AttribPtr[_TNL_ATTRIB_POS]->count;

+

+	 /* make sure coords are really positive

+	    NOTE should avoid going through array twice */

+	 coord = input->start;

+	 for (i = 0; i < input->count; i++) {

+	    *coord = FABSF(*coord);

+	    STRIDE_F(coord, input->stride);

+	 }

+      }

+      else {

+         /* fog coordinates = eye Z coordinates - need to copy for ABS */

+	 input = &store->fogcoord;

+

+	 if (VB->EyePtr->size < 2)

+	    _mesa_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );

+

+	 input->stride = 4 * sizeof(GLfloat);

+	 input->count = VB->EyePtr->count;

+	 coord = VB->EyePtr->start;

+	 for (i = 0 ; i < VB->EyePtr->count; i++) {

+	    input->data[i][0] = FABSF(coord[2]);

+	    STRIDE_F(coord, VB->EyePtr->stride);

+	 }

+      }

+   }

+   else {

+      /* use glFogCoord() coordinates */

+      input = VB->AttribPtr[_TNL_ATTRIB_FOG];  /* source data */

+

+      /* input->count may be one if glFogCoord was only called once

+       * before glBegin.  But we need to compute fog for all vertices.

+       */

+      input->count = VB->AttribPtr[_TNL_ATTRIB_POS]->count;

+

+      VB->AttribPtr[_TNL_ATTRIB_FOG] = &store->fogcoord;  /* dest data */

+   }

+

+   if (tnl->_DoVertexFog) {

+      /* compute blend factors from fog coordinates */

+      compute_fog_blend_factors( ctx, VB->AttribPtr[_TNL_ATTRIB_FOG], input );

+   }

+   else {

+      /* results = incoming fog coords (compute fog per-fragment later) */

+      VB->AttribPtr[_TNL_ATTRIB_FOG] = input;

+   }

+

+   return GL_TRUE;

+}

+

+

+

+/* Called the first time stage->run() is invoked.

+ */

+static GLboolean

+alloc_fog_data(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct fog_stage_data *store;

+   stage->privatePtr = MALLOC(sizeof(*store));

+   store = FOG_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   _mesa_vector4f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );

+

+   if (!inited)

+      init_static_data();

+

+   return GL_TRUE;

+}

+

+

+static void

+free_fog_data(struct tnl_pipeline_stage *stage)

+{

+   struct fog_stage_data *store = FOG_STAGE_DATA(stage);

+   if (store) {

+      _mesa_vector4f_free( &store->fogcoord );

+      FREE( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+

+const struct tnl_pipeline_stage _tnl_fog_coordinate_stage =

+{

+   "build fog coordinates",	/* name */

+   NULL,			/* private_data */

+   alloc_fog_data,		/* dtr */

+   free_fog_data,		/* dtr */

+   NULL,		/* check */

+   run_fog_stage		/* run -- initially set to init. */

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_light.c b/mesalib/src/mesa/tnl/t_vb_light.c
index e7309aaac..0760e6630 100644
--- a/mesalib/src/mesa/tnl/t_vb_light.c
+++ b/mesalib/src/mesa/tnl/t_vb_light.c
@@ -1,343 +1,343 @@
-/*
- * 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.
- */
-
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/light.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/simple_list.h"
-#include "main/mtypes.h"
-
-#include "math/m_translate.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-#define LIGHT_TWOSIDE       0x1
-#define LIGHT_MATERIAL      0x2
-#define MAX_LIGHT_FUNC      0x4
-
-typedef void (*light_func)( GLcontext *ctx,
-			    struct vertex_buffer *VB,
-			    struct tnl_pipeline_stage *stage,
-			    GLvector4f *input );
-
-/**
- * Information for updating current material attributes from vertex color,
- * for GL_COLOR_MATERIAL.
- */
-struct material_cursor {
-   const GLfloat *ptr;    /* points to src vertex color (in VB array) */
-   GLuint stride;         /* stride to next vertex color (bytes) */
-   GLfloat *current;      /* points to material attribute to update */
-   GLuint size;           /* vertex/color size: 1, 2, 3 or 4 */
-};
-
-/**
- * Data private to this pipeline stage.
- */
-struct light_stage_data {
-   GLvector4f Input;
-   GLvector4f LitColor[2];
-   GLvector4f LitSecondary[2];
-   light_func *light_func_tab;
-
-   struct material_cursor mat[MAT_ATTRIB_MAX];
-   GLuint mat_count;
-   GLuint mat_bitmask;
-};
-
-
-#define LIGHT_STAGE_DATA(stage) ((struct light_stage_data *)(stage->privatePtr))
-
-
-
-/**
- * In the case of colormaterial, the effected material attributes
- * should already have been bound to point to the incoming color data,
- * prior to running the pipeline.
- * This function copies the vertex's color to the material attributes
- * which are tracking glColor.
- * It's called per-vertex in the lighting loop.
- */
-static void
-update_materials(GLcontext *ctx, struct light_stage_data *store)
-{
-   GLuint i;
-
-   for (i = 0 ; i < store->mat_count ; i++) {
-      /* update the material */
-      COPY_CLEAN_4V(store->mat[i].current, store->mat[i].size, store->mat[i].ptr);
-      /* increment src vertex color pointer */
-      STRIDE_F(store->mat[i].ptr, store->mat[i].stride);
-   }
-      
-   /* recompute derived light/material values */
-   _mesa_update_material( ctx, store->mat_bitmask );
-   /* XXX we should only call this if we're tracking/changing the specular
-    * exponent.
-    */
-   _mesa_validate_all_lighting_tables( ctx );
-}
-
-
-/**
- * Prepare things prior to running the lighting stage.
- * Return number of material attributes which will track vertex color.
- */
-static GLuint
-prepare_materials(GLcontext *ctx,
-                  struct vertex_buffer *VB, struct light_stage_data *store)
-{
-   GLuint i;
-   
-   store->mat_count = 0;
-   store->mat_bitmask = 0;
-
-   /* Examine the ColorMaterialBitmask to determine which materials
-    * track vertex color.  Override the material attribute's pointer
-    * with the color pointer for each one.
-    */
-   if (ctx->Light.ColorMaterialEnabled) {
-      const GLuint bitmask = ctx->Light.ColorMaterialBitmask;
-      for (i = 0 ; i < MAT_ATTRIB_MAX ; i++)
-	 if (bitmask & (1<<i))
-	    VB->AttribPtr[_TNL_ATTRIB_MAT_FRONT_AMBIENT + i] = VB->AttribPtr[_TNL_ATTRIB_COLOR0];
-   }
-
-   /* Now, for each material attribute that's tracking vertex color, save
-    * some values (ptr, stride, size, current) that we'll need in
-    * update_materials(), above, that'll actually copy the vertex color to
-    * the material attribute(s).
-    */
-   for (i = _TNL_FIRST_MAT; i <= _TNL_LAST_MAT; i++) {
-      if (VB->AttribPtr[i]->stride) {
-	 const GLuint j = store->mat_count++;
-	 const GLuint attr = i - _TNL_ATTRIB_MAT_FRONT_AMBIENT;
-	 store->mat[j].ptr    = VB->AttribPtr[i]->start;
-	 store->mat[j].stride = VB->AttribPtr[i]->stride;
-	 store->mat[j].size   = VB->AttribPtr[i]->size;
-	 store->mat[j].current = ctx->Light.Material.Attrib[attr];
-	 store->mat_bitmask |= (1<<attr);
-      }
-   }
-
-   /* FIXME: Is this already done?
-    */
-   _mesa_update_material( ctx, ~0 );
-   _mesa_validate_all_lighting_tables( ctx );
-
-   return store->mat_count;
-}
-
-/* Tables for all the shading functions.
- */
-static light_func _tnl_light_tab[MAX_LIGHT_FUNC];
-static light_func _tnl_light_fast_tab[MAX_LIGHT_FUNC];
-static light_func _tnl_light_fast_single_tab[MAX_LIGHT_FUNC];
-static light_func _tnl_light_spec_tab[MAX_LIGHT_FUNC];
-
-#define TAG(x)           x
-#define IDX              (0)
-#include "t_vb_lighttmp.h"
-
-#define TAG(x)           x##_twoside
-#define IDX              (LIGHT_TWOSIDE)
-#include "t_vb_lighttmp.h"
-
-#define TAG(x)           x##_material
-#define IDX              (LIGHT_MATERIAL)
-#include "t_vb_lighttmp.h"
-
-#define TAG(x)           x##_twoside_material
-#define IDX              (LIGHT_TWOSIDE|LIGHT_MATERIAL)
-#include "t_vb_lighttmp.h"
-
-
-static void init_lighting_tables( void )
-{
-   static int done;
-
-   if (!done) {
-      init_light_tab();
-      init_light_tab_twoside();
-      init_light_tab_material();
-      init_light_tab_twoside_material();
-      done = 1;
-   }
-}
-
-
-static GLboolean run_lighting( GLcontext *ctx, 
-			       struct tnl_pipeline_stage *stage )
-{
-   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLvector4f *input = ctx->_NeedEyeCoords ? VB->EyePtr : VB->AttribPtr[_TNL_ATTRIB_POS];
-   GLuint idx;
-
-   if (!ctx->Light.Enabled || ctx->VertexProgram._Current)
-      return GL_TRUE;
-
-   /* Make sure we can talk about position x,y and z:
-    */
-   if (input->size <= 2 && input == VB->AttribPtr[_TNL_ATTRIB_POS]) {
-
-      _math_trans_4f( store->Input.data,
-		      VB->AttribPtr[_TNL_ATTRIB_POS]->data,
-		      VB->AttribPtr[_TNL_ATTRIB_POS]->stride,
-		      GL_FLOAT,
-		      VB->AttribPtr[_TNL_ATTRIB_POS]->size,
-		      0,
-		      VB->Count );
-
-      if (input->size <= 2) {
-	 /* Clean z.
-	  */
-	 _mesa_vector4f_clean_elem(&store->Input, VB->Count, 2);
-      }
-	 
-      if (input->size <= 1) {
-	 /* Clean y.
-	  */
-	 _mesa_vector4f_clean_elem(&store->Input, VB->Count, 1);
-      }
-
-      input = &store->Input;
-   }
-   
-   idx = 0;
-
-   if (prepare_materials( ctx, VB, store ))
-      idx |= LIGHT_MATERIAL;
-
-   if (ctx->Light.Model.TwoSide)
-      idx |= LIGHT_TWOSIDE;
-
-   /* The individual functions know about replaying side-effects
-    * vs. full re-execution. 
-    */
-   store->light_func_tab[idx]( ctx, VB, stage, input );
-
-   return GL_TRUE;
-}
-
-
-/* Called in place of do_lighting when the light table may have changed.
- */
-static void validate_lighting( GLcontext *ctx,
-					struct tnl_pipeline_stage *stage )
-{
-   light_func *tab;
-
-   if (!ctx->Light.Enabled || ctx->VertexProgram._Current)
-      return;
-
-   if (ctx->Light._NeedVertices) {
-      if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
-	 tab = _tnl_light_spec_tab;
-      else
-	 tab = _tnl_light_tab;
-   }
-   else {
-      if (ctx->Light.EnabledList.next == ctx->Light.EnabledList.prev)
-	 tab = _tnl_light_fast_single_tab;
-      else
-	 tab = _tnl_light_fast_tab;
-   }
-
-
-   LIGHT_STAGE_DATA(stage)->light_func_tab = tab;
-
-   /* This and the above should only be done on _NEW_LIGHT:
-    */
-   TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange( ctx );
-}
-
-
-
-/* Called the first time stage->run is called.  In effect, don't
- * allocate data until the first time the stage is run.
- */
-static GLboolean init_lighting( GLcontext *ctx,
-				struct tnl_pipeline_stage *stage )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct light_stage_data *store;
-   GLuint size = tnl->vb.Size;
-
-   stage->privatePtr = MALLOC(sizeof(*store));
-   store = LIGHT_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   /* Do onetime init.
-    */
-   init_lighting_tables();
-
-   _mesa_vector4f_alloc( &store->Input, 0, size, 32 );
-   _mesa_vector4f_alloc( &store->LitColor[0], 0, size, 32 );
-   _mesa_vector4f_alloc( &store->LitColor[1], 0, size, 32 );
-   _mesa_vector4f_alloc( &store->LitSecondary[0], 0, size, 32 );
-   _mesa_vector4f_alloc( &store->LitSecondary[1], 0, size, 32 );
-
-   store->LitColor[0].size = 4;
-   store->LitColor[1].size = 4;
-   store->LitSecondary[0].size = 3;
-   store->LitSecondary[1].size = 3;
-
-   return GL_TRUE;
-}
-
-
-
-
-static void dtr( struct tnl_pipeline_stage *stage )
-{
-   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
-
-   if (store) {
-      _mesa_vector4f_free( &store->Input );
-      _mesa_vector4f_free( &store->LitColor[0] );
-      _mesa_vector4f_free( &store->LitColor[1] );
-      _mesa_vector4f_free( &store->LitSecondary[0] );
-      _mesa_vector4f_free( &store->LitSecondary[1] );
-      FREE( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-const struct tnl_pipeline_stage _tnl_lighting_stage =
-{
-   "lighting",			/* name */
-   NULL,			/* private_data */
-   init_lighting,
-   dtr,				/* destroy */
-   validate_lighting,
-   run_lighting
-};
+/*

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

+ */

+

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/light.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/simple_list.h"

+#include "main/mtypes.h"

+

+#include "math/m_translate.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+

+#define LIGHT_TWOSIDE       0x1

+#define LIGHT_MATERIAL      0x2

+#define MAX_LIGHT_FUNC      0x4

+

+typedef void (*light_func)( struct gl_context *ctx,

+			    struct vertex_buffer *VB,

+			    struct tnl_pipeline_stage *stage,

+			    GLvector4f *input );

+

+/**

+ * Information for updating current material attributes from vertex color,

+ * for GL_COLOR_MATERIAL.

+ */

+struct material_cursor {

+   const GLfloat *ptr;    /* points to src vertex color (in VB array) */

+   GLuint stride;         /* stride to next vertex color (bytes) */

+   GLfloat *current;      /* points to material attribute to update */

+   GLuint size;           /* vertex/color size: 1, 2, 3 or 4 */

+};

+

+/**

+ * Data private to this pipeline stage.

+ */

+struct light_stage_data {

+   GLvector4f Input;

+   GLvector4f LitColor[2];

+   GLvector4f LitSecondary[2];

+   light_func *light_func_tab;

+

+   struct material_cursor mat[MAT_ATTRIB_MAX];

+   GLuint mat_count;

+   GLuint mat_bitmask;

+};

+

+

+#define LIGHT_STAGE_DATA(stage) ((struct light_stage_data *)(stage->privatePtr))

+

+

+

+/**

+ * In the case of colormaterial, the effected material attributes

+ * should already have been bound to point to the incoming color data,

+ * prior to running the pipeline.

+ * This function copies the vertex's color to the material attributes

+ * which are tracking glColor.

+ * It's called per-vertex in the lighting loop.

+ */

+static void

+update_materials(struct gl_context *ctx, struct light_stage_data *store)

+{

+   GLuint i;

+

+   for (i = 0 ; i < store->mat_count ; i++) {

+      /* update the material */

+      COPY_CLEAN_4V(store->mat[i].current, store->mat[i].size, store->mat[i].ptr);

+      /* increment src vertex color pointer */

+      STRIDE_F(store->mat[i].ptr, store->mat[i].stride);

+   }

+      

+   /* recompute derived light/material values */

+   _mesa_update_material( ctx, store->mat_bitmask );

+   /* XXX we should only call this if we're tracking/changing the specular

+    * exponent.

+    */

+   _mesa_validate_all_lighting_tables( ctx );

+}

+

+

+/**

+ * Prepare things prior to running the lighting stage.

+ * Return number of material attributes which will track vertex color.

+ */

+static GLuint

+prepare_materials(struct gl_context *ctx,

+                  struct vertex_buffer *VB, struct light_stage_data *store)

+{

+   GLuint i;

+   

+   store->mat_count = 0;

+   store->mat_bitmask = 0;

+

+   /* Examine the ColorMaterialBitmask to determine which materials

+    * track vertex color.  Override the material attribute's pointer

+    * with the color pointer for each one.

+    */

+   if (ctx->Light.ColorMaterialEnabled) {

+      const GLuint bitmask = ctx->Light.ColorMaterialBitmask;

+      for (i = 0 ; i < MAT_ATTRIB_MAX ; i++)

+	 if (bitmask & (1<<i))

+	    VB->AttribPtr[_TNL_ATTRIB_MAT_FRONT_AMBIENT + i] = VB->AttribPtr[_TNL_ATTRIB_COLOR0];

+   }

+

+   /* Now, for each material attribute that's tracking vertex color, save

+    * some values (ptr, stride, size, current) that we'll need in

+    * update_materials(), above, that'll actually copy the vertex color to

+    * the material attribute(s).

+    */

+   for (i = _TNL_FIRST_MAT; i <= _TNL_LAST_MAT; i++) {

+      if (VB->AttribPtr[i]->stride) {

+	 const GLuint j = store->mat_count++;

+	 const GLuint attr = i - _TNL_ATTRIB_MAT_FRONT_AMBIENT;

+	 store->mat[j].ptr    = VB->AttribPtr[i]->start;

+	 store->mat[j].stride = VB->AttribPtr[i]->stride;

+	 store->mat[j].size   = VB->AttribPtr[i]->size;

+	 store->mat[j].current = ctx->Light.Material.Attrib[attr];

+	 store->mat_bitmask |= (1<<attr);

+      }

+   }

+

+   /* FIXME: Is this already done?

+    */

+   _mesa_update_material( ctx, ~0 );

+   _mesa_validate_all_lighting_tables( ctx );

+

+   return store->mat_count;

+}

+

+/* Tables for all the shading functions.

+ */

+static light_func _tnl_light_tab[MAX_LIGHT_FUNC];

+static light_func _tnl_light_fast_tab[MAX_LIGHT_FUNC];

+static light_func _tnl_light_fast_single_tab[MAX_LIGHT_FUNC];

+static light_func _tnl_light_spec_tab[MAX_LIGHT_FUNC];

+

+#define TAG(x)           x

+#define IDX              (0)

+#include "t_vb_lighttmp.h"

+

+#define TAG(x)           x##_twoside

+#define IDX              (LIGHT_TWOSIDE)

+#include "t_vb_lighttmp.h"

+

+#define TAG(x)           x##_material

+#define IDX              (LIGHT_MATERIAL)

+#include "t_vb_lighttmp.h"

+

+#define TAG(x)           x##_twoside_material

+#define IDX              (LIGHT_TWOSIDE|LIGHT_MATERIAL)

+#include "t_vb_lighttmp.h"

+

+

+static void init_lighting_tables( void )

+{

+   static int done;

+

+   if (!done) {

+      init_light_tab();

+      init_light_tab_twoside();

+      init_light_tab_material();

+      init_light_tab_twoside_material();

+      done = 1;

+   }

+}

+

+

+static GLboolean run_lighting( struct gl_context *ctx, 

+			       struct tnl_pipeline_stage *stage )

+{

+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLvector4f *input = ctx->_NeedEyeCoords ? VB->EyePtr : VB->AttribPtr[_TNL_ATTRIB_POS];

+   GLuint idx;

+

+   if (!ctx->Light.Enabled || ctx->VertexProgram._Current)

+      return GL_TRUE;

+

+   /* Make sure we can talk about position x,y and z:

+    */

+   if (input->size <= 2 && input == VB->AttribPtr[_TNL_ATTRIB_POS]) {

+

+      _math_trans_4f( store->Input.data,

+		      VB->AttribPtr[_TNL_ATTRIB_POS]->data,

+		      VB->AttribPtr[_TNL_ATTRIB_POS]->stride,

+		      GL_FLOAT,

+		      VB->AttribPtr[_TNL_ATTRIB_POS]->size,

+		      0,

+		      VB->Count );

+

+      if (input->size <= 2) {

+	 /* Clean z.

+	  */

+	 _mesa_vector4f_clean_elem(&store->Input, VB->Count, 2);

+      }

+	 

+      if (input->size <= 1) {

+	 /* Clean y.

+	  */

+	 _mesa_vector4f_clean_elem(&store->Input, VB->Count, 1);

+      }

+

+      input = &store->Input;

+   }

+   

+   idx = 0;

+

+   if (prepare_materials( ctx, VB, store ))

+      idx |= LIGHT_MATERIAL;

+

+   if (ctx->Light.Model.TwoSide)

+      idx |= LIGHT_TWOSIDE;

+

+   /* The individual functions know about replaying side-effects

+    * vs. full re-execution. 

+    */

+   store->light_func_tab[idx]( ctx, VB, stage, input );

+

+   return GL_TRUE;

+}

+

+

+/* Called in place of do_lighting when the light table may have changed.

+ */

+static void validate_lighting( struct gl_context *ctx,

+					struct tnl_pipeline_stage *stage )

+{

+   light_func *tab;

+

+   if (!ctx->Light.Enabled || ctx->VertexProgram._Current)

+      return;

+

+   if (ctx->Light._NeedVertices) {

+      if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)

+	 tab = _tnl_light_spec_tab;

+      else

+	 tab = _tnl_light_tab;

+   }

+   else {

+      if (ctx->Light.EnabledList.next == ctx->Light.EnabledList.prev)

+	 tab = _tnl_light_fast_single_tab;

+      else

+	 tab = _tnl_light_fast_tab;

+   }

+

+

+   LIGHT_STAGE_DATA(stage)->light_func_tab = tab;

+

+   /* This and the above should only be done on _NEW_LIGHT:

+    */

+   TNL_CONTEXT(ctx)->Driver.NotifyMaterialChange( ctx );

+}

+

+

+

+/* Called the first time stage->run is called.  In effect, don't

+ * allocate data until the first time the stage is run.

+ */

+static GLboolean init_lighting( struct gl_context *ctx,

+				struct tnl_pipeline_stage *stage )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct light_stage_data *store;

+   GLuint size = tnl->vb.Size;

+

+   stage->privatePtr = MALLOC(sizeof(*store));

+   store = LIGHT_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   /* Do onetime init.

+    */

+   init_lighting_tables();

+

+   _mesa_vector4f_alloc( &store->Input, 0, size, 32 );

+   _mesa_vector4f_alloc( &store->LitColor[0], 0, size, 32 );

+   _mesa_vector4f_alloc( &store->LitColor[1], 0, size, 32 );

+   _mesa_vector4f_alloc( &store->LitSecondary[0], 0, size, 32 );

+   _mesa_vector4f_alloc( &store->LitSecondary[1], 0, size, 32 );

+

+   store->LitColor[0].size = 4;

+   store->LitColor[1].size = 4;

+   store->LitSecondary[0].size = 3;

+   store->LitSecondary[1].size = 3;

+

+   return GL_TRUE;

+}

+

+

+

+

+static void dtr( struct tnl_pipeline_stage *stage )

+{

+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);

+

+   if (store) {

+      _mesa_vector4f_free( &store->Input );

+      _mesa_vector4f_free( &store->LitColor[0] );

+      _mesa_vector4f_free( &store->LitColor[1] );

+      _mesa_vector4f_free( &store->LitSecondary[0] );

+      _mesa_vector4f_free( &store->LitSecondary[1] );

+      FREE( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+const struct tnl_pipeline_stage _tnl_lighting_stage =

+{

+   "lighting",			/* name */

+   NULL,			/* private_data */

+   init_lighting,

+   dtr,				/* destroy */

+   validate_lighting,

+   run_lighting

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_lighttmp.h b/mesalib/src/mesa/tnl/t_vb_lighttmp.h
index 0a98c6b02..63b817ab6 100644
--- a/mesalib/src/mesa/tnl/t_vb_lighttmp.h
+++ b/mesalib/src/mesa/tnl/t_vb_lighttmp.h
@@ -1,651 +1,651 @@
-/*
- * 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.
- *
- *
- * Authors:
- *    Brian Paul
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#if IDX & LIGHT_TWOSIDE
-#  define NR_SIDES 2
-#else
-#  define NR_SIDES 1
-#endif
-
-
-/* define TRACE to trace lighting code */
-/* #define TRACE 1 */
-
-/*
- * ctx is the current context
- * VB is the vertex buffer
- * stage is the lighting stage-private data
- * input is the vector of eye or object-space vertex coordinates
- */
-static void TAG(light_rgba_spec)( GLcontext *ctx,
-				  struct vertex_buffer *VB,
-				  struct tnl_pipeline_stage *stage,
-				  GLvector4f *input )
-{
-   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
-   GLfloat (*base)[3] = ctx->Light._BaseColor;
-   GLfloat sumA[2];
-   GLuint j;
-
-   const GLuint vstride = input->stride;
-   const GLfloat *vertex = (GLfloat *)input->data;
-   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;
-   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;
-
-   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
-   GLfloat (*Fspec)[4] = (GLfloat (*)[4]) store->LitSecondary[0].data;
-#if IDX & LIGHT_TWOSIDE
-   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
-   GLfloat (*Bspec)[4] = (GLfloat (*)[4]) store->LitSecondary[1].data;
-#endif
-
-   const GLuint nr = VB->Count;
-
-#ifdef TRACE
-   fprintf(stderr, "%s\n", __FUNCTION__ );
-#endif
-
-   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];
-   VB->AttribPtr[_TNL_ATTRIB_COLOR1] = &store->LitSecondary[0];
-   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-
-#if IDX & LIGHT_TWOSIDE
-   VB->BackfaceColorPtr = &store->LitColor[1];
-   VB->BackfaceSecondaryColorPtr = &store->LitSecondary[1];
-   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-#endif
-
-
-   store->LitColor[0].stride = 16;
-   store->LitColor[1].stride = 16;
-
-   for (j = 0; j < nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal,nstride)) {
-      GLfloat sum[2][3], spec[2][3];
-      struct gl_light *light;
-
-#if IDX & LIGHT_MATERIAL
-      update_materials( ctx, store );
-      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-#if IDX & LIGHT_TWOSIDE
-      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-#endif
-#endif
-
-      COPY_3V(sum[0], base[0]);
-      ZERO_3V(spec[0]);
-
-#if IDX & LIGHT_TWOSIDE
-      COPY_3V(sum[1], base[1]);
-      ZERO_3V(spec[1]);
-#endif
-
-      /* Add contribution from each enabled light source */
-      foreach (light, &ctx->Light.EnabledList) {
-	 GLfloat n_dot_h;
-	 GLfloat correction;
-	 GLint side;
-	 GLfloat contrib[3];
-	 GLfloat attenuation;
-	 GLfloat VP[3];  /* unit vector from vertex to light */
-	 GLfloat n_dot_VP;       /* n dot VP */
-	 GLfloat *h;
-
-	 /* compute VP and attenuation */
-	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
-	    /* directional light */
-	    COPY_3V(VP, light->_VP_inf_norm);
-	    attenuation = light->_VP_inf_spot_attenuation;
-	 }
-	 else {
-	    GLfloat d;     /* distance from vertex to light */
-
-	    SUB_3V(VP, light->_Position, vertex);
-
-	    d = (GLfloat) LEN_3FV( VP );
-
-	    if (d > 1e-6) {
-	       GLfloat invd = 1.0F / d;
-	       SELF_SCALE_SCALAR_3V(VP, invd);
-	    }
-
-	    attenuation = 1.0F / (light->ConstantAttenuation + d *
-				  (light->LinearAttenuation + d *
-				   light->QuadraticAttenuation));
-
-	    /* spotlight attenuation */
-	    if (light->_Flags & LIGHT_SPOT) {
-	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
-
-	       if (PV_dot_dir<light->_CosCutoff) {
-		  continue; /* this light makes no contribution */
-	       }
-	       else {
-		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);
-		  GLint k = (GLint) x;
-		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
-				    + (x-k)*light->_SpotExpTable[k][1]);
-		  attenuation *= spot;
-	       }
-	    }
-	 }
-
-	 if (attenuation < 1e-3)
-	    continue;		/* this light makes no contribution */
-
-	 /* Compute dot product or normal and vector from V to light pos */
-	 n_dot_VP = DOT3( normal, VP );
-
-	 /* Which side gets the diffuse & specular terms? */
-	 if (n_dot_VP < 0.0F) {
-	    ACC_SCALE_SCALAR_3V(sum[0], attenuation, light->_MatAmbient[0]);
-#if IDX & LIGHT_TWOSIDE
-	    side = 1;
-	    correction = -1;
-	    n_dot_VP = -n_dot_VP;
-#else
-            continue;
-#endif
-	 }
-         else {
-#if IDX & LIGHT_TWOSIDE
-            ACC_SCALE_SCALAR_3V( sum[1], attenuation, light->_MatAmbient[1]);
-#endif
-	    side = 0;
-	    correction = 1;
-	 }
-
-	 /* diffuse term */
-	 COPY_3V(contrib, light->_MatAmbient[side]);
-	 ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[side]);
-	 ACC_SCALE_SCALAR_3V(sum[side], attenuation, contrib );
-
-	 /* specular term - cannibalize VP... */
-	 if (ctx->Light.Model.LocalViewer) {
-	    GLfloat v[3];
-	    COPY_3V(v, vertex);
-	    NORMALIZE_3FV(v);
-	    SUB_3V(VP, VP, v);                /* h = VP + VPe */
-	    h = VP;
-	    NORMALIZE_3FV(h);
-	 }
-	 else if (light->_Flags & LIGHT_POSITIONAL) {
-	    h = VP;
-	    ACC_3V(h, ctx->_EyeZDir);
-	    NORMALIZE_3FV(h);
-	 }
-         else {
-	    h = light->_h_inf_norm;
-	 }
-
-	 n_dot_h = correction * DOT3(normal, h);
-
-	 if (n_dot_h > 0.0F) {
-	    GLfloat spec_coef;
-	    struct gl_shine_tab *tab = ctx->_ShineTable[side];
-	    GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );
-
-	    if (spec_coef > 1.0e-10) {
-	       spec_coef *= attenuation;
-	       ACC_SCALE_SCALAR_3V( spec[side], spec_coef,
-				    light->_MatSpecular[side]);
-	    }
-	 }
-      } /*loop over lights*/
-
-      COPY_3V( Fcolor[j], sum[0] );
-      COPY_3V( Fspec[j], spec[0] );
-      Fcolor[j][3] = sumA[0];
-
-#if IDX & LIGHT_TWOSIDE
-      COPY_3V( Bcolor[j], sum[1] );
-      COPY_3V( Bspec[j], spec[1] );
-      Bcolor[j][3] = sumA[1];
-#endif
-   }
-}
-
-
-static void TAG(light_rgba)( GLcontext *ctx,
-			     struct vertex_buffer *VB,
-			     struct tnl_pipeline_stage *stage,
-			     GLvector4f *input )
-{
-   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
-   GLuint j;
-
-   GLfloat (*base)[3] = ctx->Light._BaseColor;
-   GLfloat sumA[2];
-
-   const GLuint vstride = input->stride;
-   const GLfloat *vertex = (GLfloat *) input->data;
-   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;
-   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;
-
-   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
-#if IDX & LIGHT_TWOSIDE
-   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
-#endif
-
-   const GLuint nr = VB->Count;
-
-#ifdef TRACE
-   fprintf(stderr, "%s\n", __FUNCTION__ );
-#endif
-
-   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];
-   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-
-#if IDX & LIGHT_TWOSIDE
-   VB->BackfaceColorPtr = &store->LitColor[1];
-   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-#endif
-
-   store->LitColor[0].stride = 16;
-   store->LitColor[1].stride = 16;
-
-   for (j = 0; j < nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal,nstride)) {
-      GLfloat sum[2][3];
-      struct gl_light *light;
-
-#if IDX & LIGHT_MATERIAL
-      update_materials( ctx, store );
-      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-#if IDX & LIGHT_TWOSIDE
-      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-#endif
-#endif
-
-      COPY_3V(sum[0], base[0]);
-
-#if IDX & LIGHT_TWOSIDE
-      COPY_3V(sum[1], base[1]);
-#endif
-
-      /* Add contribution from each enabled light source */
-      foreach (light, &ctx->Light.EnabledList) {
-
-	 GLfloat n_dot_h;
-	 GLfloat correction;
-	 GLint side;
-	 GLfloat contrib[3];
-	 GLfloat attenuation = 1.0;
-	 GLfloat VP[3];          /* unit vector from vertex to light */
-	 GLfloat n_dot_VP;       /* n dot VP */
-	 GLfloat *h;
-
-	 /* compute VP and attenuation */
-	 if (!(light->_Flags & LIGHT_POSITIONAL)) {
-	    /* directional light */
-	    COPY_3V(VP, light->_VP_inf_norm);
-	    attenuation = light->_VP_inf_spot_attenuation;
-	 }
-	 else {
-	    GLfloat d;     /* distance from vertex to light */
-
-
-	    SUB_3V(VP, light->_Position, vertex);
-
-	    d = (GLfloat) LEN_3FV( VP );
-
-	    if ( d > 1e-6) {
-	       GLfloat invd = 1.0F / d;
-	       SELF_SCALE_SCALAR_3V(VP, invd);
-	    }
-
-            attenuation = 1.0F / (light->ConstantAttenuation + d *
-                                  (light->LinearAttenuation + d *
-                                   light->QuadraticAttenuation));
-
-	    /* spotlight attenuation */
-	    if (light->_Flags & LIGHT_SPOT) {
-	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);
-
-	       if (PV_dot_dir<light->_CosCutoff) {
-		  continue; /* this light makes no contribution */
-	       }
-	       else {
-		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);
-		  GLint k = (GLint) x;
-		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]
-				  + (x-k)*light->_SpotExpTable[k][1]);
-		  attenuation *= spot;
-	       }
-	    }
-	 }
-
-	 if (attenuation < 1e-3)
-	    continue;		/* this light makes no contribution */
-
-	 /* Compute dot product or normal and vector from V to light pos */
-	 n_dot_VP = DOT3( normal, VP );
-
-	 /* which side are we lighting? */
-	 if (n_dot_VP < 0.0F) {
-	    ACC_SCALE_SCALAR_3V(sum[0], attenuation, light->_MatAmbient[0]);
-#if IDX & LIGHT_TWOSIDE
-	    side = 1;
-	    correction = -1;
-	    n_dot_VP = -n_dot_VP;
-#else
-            continue;
-#endif
-	 }
-         else {
-#if IDX & LIGHT_TWOSIDE
-            ACC_SCALE_SCALAR_3V( sum[1], attenuation, light->_MatAmbient[1]);
-#endif
-	    side = 0;
-	    correction = 1;
-	 }
-
-	 COPY_3V(contrib, light->_MatAmbient[side]);
-
-	 /* diffuse term */
-	 ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[side]);
-
-	 /* specular term - cannibalize VP... */
-	 {
-	    if (ctx->Light.Model.LocalViewer) {
-	       GLfloat v[3];
-	       COPY_3V(v, vertex);
-	       NORMALIZE_3FV(v);
-	       SUB_3V(VP, VP, v);                /* h = VP + VPe */
-	       h = VP;
-	       NORMALIZE_3FV(h);
-	    }
-	    else if (light->_Flags & LIGHT_POSITIONAL) {
-	       h = VP;
-	       ACC_3V(h, ctx->_EyeZDir);
-	       NORMALIZE_3FV(h);
-	    }
-            else {
-	       h = light->_h_inf_norm;
-	    }
-
-	    n_dot_h = correction * DOT3(normal, h);
-
-	    if (n_dot_h > 0.0F)
-	    {
-	       GLfloat spec_coef;
-	       struct gl_shine_tab *tab = ctx->_ShineTable[side];
-
-	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );
-
-	       ACC_SCALE_SCALAR_3V( contrib, spec_coef,
-				    light->_MatSpecular[side]);
-	    }
-	 }
-
-	 ACC_SCALE_SCALAR_3V( sum[side], attenuation, contrib );
-      }
-
-      COPY_3V( Fcolor[j], sum[0] );
-      Fcolor[j][3] = sumA[0];
-
-#if IDX & LIGHT_TWOSIDE
-      COPY_3V( Bcolor[j], sum[1] );
-      Bcolor[j][3] = sumA[1];
-#endif
-   }
-}
-
-
-
-
-/* As below, but with just a single light.
- */
-static void TAG(light_fast_rgba_single)( GLcontext *ctx,
-					 struct vertex_buffer *VB,
-					 struct tnl_pipeline_stage *stage,
-					 GLvector4f *input )
-
-{
-   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
-   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;
-   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;
-   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
-#if IDX & LIGHT_TWOSIDE
-   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
-#endif
-   const struct gl_light *light = ctx->Light.EnabledList.next;
-   GLuint j = 0;
-   GLfloat base[2][4];
-#if IDX & LIGHT_MATERIAL
-   const GLuint nr = VB->Count;
-#else
-   const GLuint nr = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count;
-#endif
-
-#ifdef TRACE
-   fprintf(stderr, "%s\n", __FUNCTION__ );
-#endif
-
-   (void) input;		/* doesn't refer to Eye or Obj */
-
-   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];
-#if IDX & LIGHT_TWOSIDE
-   VB->BackfaceColorPtr = &store->LitColor[1];
-#endif
-
-   if (nr > 1) {
-      store->LitColor[0].stride = 16;
-      store->LitColor[1].stride = 16;
-   }
-   else {
-      store->LitColor[0].stride = 0;
-      store->LitColor[1].stride = 0;
-   }
-
-   for (j = 0; j < nr; j++, STRIDE_F(normal,nstride)) {
-
-      GLfloat n_dot_VP;
-
-#if IDX & LIGHT_MATERIAL
-      update_materials( ctx, store );
-#endif
-
-      /* No attenuation, so incoporate _MatAmbient into base color.
-       */
-#if !(IDX & LIGHT_MATERIAL)
-      if ( j == 0 )
-#endif
-      {
-	 COPY_3V(base[0], light->_MatAmbient[0]);
-	 ACC_3V(base[0], ctx->Light._BaseColor[0] );
-	 base[0][3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-
-#if IDX & LIGHT_TWOSIDE
-         COPY_3V(base[1], light->_MatAmbient[1]);
-         ACC_3V(base[1], ctx->Light._BaseColor[1]);
-         base[1][3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-#endif
-      }
-
-      n_dot_VP = DOT3(normal, light->_VP_inf_norm);
-
-      if (n_dot_VP < 0.0F) {
-#if IDX & LIGHT_TWOSIDE
-         GLfloat n_dot_h = -DOT3(normal, light->_h_inf_norm);
-         GLfloat sum[3];
-         COPY_3V(sum, base[1]);
-         ACC_SCALE_SCALAR_3V(sum, -n_dot_VP, light->_MatDiffuse[1]);
-         if (n_dot_h > 0.0F) {
-            GLfloat spec;
-            GET_SHINE_TAB_ENTRY( ctx->_ShineTable[1], n_dot_h, spec );
-            ACC_SCALE_SCALAR_3V(sum, spec, light->_MatSpecular[1]);
-         }
-         COPY_3V(Bcolor[j], sum );
-         Bcolor[j][3] = base[1][3];
-#endif
-	 COPY_4FV(Fcolor[j], base[0]);
-      }
-      else {
-	 GLfloat n_dot_h = DOT3(normal, light->_h_inf_norm);
-	 GLfloat sum[3];
-	 COPY_3V(sum, base[0]);
-	 ACC_SCALE_SCALAR_3V(sum, n_dot_VP, light->_MatDiffuse[0]);
-	 if (n_dot_h > 0.0F) {
-	    GLfloat spec;
-	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );
-	    ACC_SCALE_SCALAR_3V(sum, spec, light->_MatSpecular[0]);
-
-	 }
-	 COPY_3V(Fcolor[j], sum );
-	 Fcolor[j][3] = base[0][3];
-#if IDX & LIGHT_TWOSIDE
-         COPY_4FV(Bcolor[j], base[1]);
-#endif
-      }
-   }
-}
-
-
-/* Light infinite lights
- */
-static void TAG(light_fast_rgba)( GLcontext *ctx,
-				  struct vertex_buffer *VB,
-				  struct tnl_pipeline_stage *stage,
-				  GLvector4f *input )
-{
-   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
-   GLfloat sumA[2];
-   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;
-   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;
-   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;
-#if IDX & LIGHT_TWOSIDE
-   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;
-#endif
-   GLuint j = 0;
-#if IDX & LIGHT_MATERIAL
-   const GLuint nr = VB->Count;
-#else
-   const GLuint nr = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count;
-#endif
-   const struct gl_light *light;
-
-#ifdef TRACE
-   fprintf(stderr, "%s %d\n", __FUNCTION__, nr );
-#endif
-
-   (void) input;
-
-   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-
-   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];
-#if IDX & LIGHT_TWOSIDE
-   VB->BackfaceColorPtr = &store->LitColor[1];
-#endif
-
-   if (nr > 1) {
-      store->LitColor[0].stride = 16;
-      store->LitColor[1].stride = 16;
-   }
-   else {
-      store->LitColor[0].stride = 0;
-      store->LitColor[1].stride = 0;
-   }
-
-   for (j = 0; j < nr; j++, STRIDE_F(normal,nstride)) {
-
-      GLfloat sum[2][3];
-
-#if IDX & LIGHT_MATERIAL
-      update_materials( ctx, store );
-
-      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];
-#if IDX & LIGHT_TWOSIDE
-      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];
-#endif
-#endif
-
-
-      COPY_3V(sum[0], ctx->Light._BaseColor[0]);
-#if IDX & LIGHT_TWOSIDE
-      COPY_3V(sum[1], ctx->Light._BaseColor[1]);
-#endif
-
-      foreach (light, &ctx->Light.EnabledList) {
-	 GLfloat n_dot_h, n_dot_VP, spec;
-
-	 ACC_3V(sum[0], light->_MatAmbient[0]);
-#if IDX & LIGHT_TWOSIDE
-         ACC_3V(sum[1], light->_MatAmbient[1]);
-#endif
-
-	 n_dot_VP = DOT3(normal, light->_VP_inf_norm);
-
-	 if (n_dot_VP > 0.0F) {
-	    ACC_SCALE_SCALAR_3V(sum[0], n_dot_VP, light->_MatDiffuse[0]);
-	    n_dot_h = DOT3(normal, light->_h_inf_norm);
-	    if (n_dot_h > 0.0F) {
-	       struct gl_shine_tab *tab = ctx->_ShineTable[0];
-	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec );
-	       ACC_SCALE_SCALAR_3V( sum[0], spec, light->_MatSpecular[0]);
-	    }
-	 }
-#if IDX & LIGHT_TWOSIDE
-         else {
-	    ACC_SCALE_SCALAR_3V(sum[1], -n_dot_VP, light->_MatDiffuse[1]);
-	    n_dot_h = -DOT3(normal, light->_h_inf_norm);
-	    if (n_dot_h > 0.0F) {
-	       struct gl_shine_tab *tab = ctx->_ShineTable[1];
-	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec );
-	       ACC_SCALE_SCALAR_3V( sum[1], spec, light->_MatSpecular[1]);
-	    }
-	 }
-#endif
-      }
-
-      COPY_3V( Fcolor[j], sum[0] );
-      Fcolor[j][3] = sumA[0];
-
-#if IDX & LIGHT_TWOSIDE
-      COPY_3V( Bcolor[j], sum[1] );
-      Bcolor[j][3] = sumA[1];
-#endif
-   }
-}
-
-
-
-
-static void TAG(init_light_tab)( void )
-{
-   _tnl_light_tab[IDX] = TAG(light_rgba);
-   _tnl_light_fast_tab[IDX] = TAG(light_fast_rgba);
-   _tnl_light_fast_single_tab[IDX] = TAG(light_fast_rgba_single);
-   _tnl_light_spec_tab[IDX] = TAG(light_rgba_spec);
-}
-
-
-#undef TAG
-#undef IDX
-#undef NR_SIDES
+/*

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

+ *

+ *

+ * Authors:

+ *    Brian Paul

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#if IDX & LIGHT_TWOSIDE

+#  define NR_SIDES 2

+#else

+#  define NR_SIDES 1

+#endif

+

+

+/* define TRACE to trace lighting code */

+/* #define TRACE 1 */

+

+/*

+ * ctx is the current context

+ * VB is the vertex buffer

+ * stage is the lighting stage-private data

+ * input is the vector of eye or object-space vertex coordinates

+ */

+static void TAG(light_rgba_spec)( struct gl_context *ctx,

+				  struct vertex_buffer *VB,

+				  struct tnl_pipeline_stage *stage,

+				  GLvector4f *input )

+{

+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);

+   GLfloat (*base)[3] = ctx->Light._BaseColor;

+   GLfloat sumA[2];

+   GLuint j;

+

+   const GLuint vstride = input->stride;

+   const GLfloat *vertex = (GLfloat *)input->data;

+   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;

+   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;

+

+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;

+   GLfloat (*Fspec)[4] = (GLfloat (*)[4]) store->LitSecondary[0].data;

+#if IDX & LIGHT_TWOSIDE

+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;

+   GLfloat (*Bspec)[4] = (GLfloat (*)[4]) store->LitSecondary[1].data;

+#endif

+

+   const GLuint nr = VB->Count;

+

+#ifdef TRACE

+   fprintf(stderr, "%s\n", __FUNCTION__ );

+#endif

+

+   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];

+   VB->AttribPtr[_TNL_ATTRIB_COLOR1] = &store->LitSecondary[0];

+   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+

+#if IDX & LIGHT_TWOSIDE

+   VB->BackfaceColorPtr = &store->LitColor[1];

+   VB->BackfaceSecondaryColorPtr = &store->LitSecondary[1];

+   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+#endif

+

+

+   store->LitColor[0].stride = 16;

+   store->LitColor[1].stride = 16;

+

+   for (j = 0; j < nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal,nstride)) {

+      GLfloat sum[2][3], spec[2][3];

+      struct gl_light *light;

+

+#if IDX & LIGHT_MATERIAL

+      update_materials( ctx, store );

+      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+#if IDX & LIGHT_TWOSIDE

+      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+#endif

+#endif

+

+      COPY_3V(sum[0], base[0]);

+      ZERO_3V(spec[0]);

+

+#if IDX & LIGHT_TWOSIDE

+      COPY_3V(sum[1], base[1]);

+      ZERO_3V(spec[1]);

+#endif

+

+      /* Add contribution from each enabled light source */

+      foreach (light, &ctx->Light.EnabledList) {

+	 GLfloat n_dot_h;

+	 GLfloat correction;

+	 GLint side;

+	 GLfloat contrib[3];

+	 GLfloat attenuation;

+	 GLfloat VP[3];  /* unit vector from vertex to light */

+	 GLfloat n_dot_VP;       /* n dot VP */

+	 GLfloat *h;

+

+	 /* compute VP and attenuation */

+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {

+	    /* directional light */

+	    COPY_3V(VP, light->_VP_inf_norm);

+	    attenuation = light->_VP_inf_spot_attenuation;

+	 }

+	 else {

+	    GLfloat d;     /* distance from vertex to light */

+

+	    SUB_3V(VP, light->_Position, vertex);

+

+	    d = (GLfloat) LEN_3FV( VP );

+

+	    if (d > 1e-6) {

+	       GLfloat invd = 1.0F / d;

+	       SELF_SCALE_SCALAR_3V(VP, invd);

+	    }

+

+	    attenuation = 1.0F / (light->ConstantAttenuation + d *

+				  (light->LinearAttenuation + d *

+				   light->QuadraticAttenuation));

+

+	    /* spotlight attenuation */

+	    if (light->_Flags & LIGHT_SPOT) {

+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);

+

+	       if (PV_dot_dir<light->_CosCutoff) {

+		  continue; /* this light makes no contribution */

+	       }

+	       else {

+		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);

+		  GLint k = (GLint) x;

+		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]

+				    + (x-k)*light->_SpotExpTable[k][1]);

+		  attenuation *= spot;

+	       }

+	    }

+	 }

+

+	 if (attenuation < 1e-3)

+	    continue;		/* this light makes no contribution */

+

+	 /* Compute dot product or normal and vector from V to light pos */

+	 n_dot_VP = DOT3( normal, VP );

+

+	 /* Which side gets the diffuse & specular terms? */

+	 if (n_dot_VP < 0.0F) {

+	    ACC_SCALE_SCALAR_3V(sum[0], attenuation, light->_MatAmbient[0]);

+#if IDX & LIGHT_TWOSIDE

+	    side = 1;

+	    correction = -1;

+	    n_dot_VP = -n_dot_VP;

+#else

+            continue;

+#endif

+	 }

+         else {

+#if IDX & LIGHT_TWOSIDE

+            ACC_SCALE_SCALAR_3V( sum[1], attenuation, light->_MatAmbient[1]);

+#endif

+	    side = 0;

+	    correction = 1;

+	 }

+

+	 /* diffuse term */

+	 COPY_3V(contrib, light->_MatAmbient[side]);

+	 ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[side]);

+	 ACC_SCALE_SCALAR_3V(sum[side], attenuation, contrib );

+

+	 /* specular term - cannibalize VP... */

+	 if (ctx->Light.Model.LocalViewer) {

+	    GLfloat v[3];

+	    COPY_3V(v, vertex);

+	    NORMALIZE_3FV(v);

+	    SUB_3V(VP, VP, v);                /* h = VP + VPe */

+	    h = VP;

+	    NORMALIZE_3FV(h);

+	 }

+	 else if (light->_Flags & LIGHT_POSITIONAL) {

+	    h = VP;

+	    ACC_3V(h, ctx->_EyeZDir);

+	    NORMALIZE_3FV(h);

+	 }

+         else {

+	    h = light->_h_inf_norm;

+	 }

+

+	 n_dot_h = correction * DOT3(normal, h);

+

+	 if (n_dot_h > 0.0F) {

+	    GLfloat spec_coef;

+	    struct gl_shine_tab *tab = ctx->_ShineTable[side];

+	    GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );

+

+	    if (spec_coef > 1.0e-10) {

+	       spec_coef *= attenuation;

+	       ACC_SCALE_SCALAR_3V( spec[side], spec_coef,

+				    light->_MatSpecular[side]);

+	    }

+	 }

+      } /*loop over lights*/

+

+      COPY_3V( Fcolor[j], sum[0] );

+      COPY_3V( Fspec[j], spec[0] );

+      Fcolor[j][3] = sumA[0];

+

+#if IDX & LIGHT_TWOSIDE

+      COPY_3V( Bcolor[j], sum[1] );

+      COPY_3V( Bspec[j], spec[1] );

+      Bcolor[j][3] = sumA[1];

+#endif

+   }

+}

+

+

+static void TAG(light_rgba)( struct gl_context *ctx,

+			     struct vertex_buffer *VB,

+			     struct tnl_pipeline_stage *stage,

+			     GLvector4f *input )

+{

+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);

+   GLuint j;

+

+   GLfloat (*base)[3] = ctx->Light._BaseColor;

+   GLfloat sumA[2];

+

+   const GLuint vstride = input->stride;

+   const GLfloat *vertex = (GLfloat *) input->data;

+   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;

+   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;

+

+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;

+#if IDX & LIGHT_TWOSIDE

+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;

+#endif

+

+   const GLuint nr = VB->Count;

+

+#ifdef TRACE

+   fprintf(stderr, "%s\n", __FUNCTION__ );

+#endif

+

+   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];

+   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+

+#if IDX & LIGHT_TWOSIDE

+   VB->BackfaceColorPtr = &store->LitColor[1];

+   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+#endif

+

+   store->LitColor[0].stride = 16;

+   store->LitColor[1].stride = 16;

+

+   for (j = 0; j < nr; j++,STRIDE_F(vertex,vstride),STRIDE_F(normal,nstride)) {

+      GLfloat sum[2][3];

+      struct gl_light *light;

+

+#if IDX & LIGHT_MATERIAL

+      update_materials( ctx, store );

+      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+#if IDX & LIGHT_TWOSIDE

+      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+#endif

+#endif

+

+      COPY_3V(sum[0], base[0]);

+

+#if IDX & LIGHT_TWOSIDE

+      COPY_3V(sum[1], base[1]);

+#endif

+

+      /* Add contribution from each enabled light source */

+      foreach (light, &ctx->Light.EnabledList) {

+

+	 GLfloat n_dot_h;

+	 GLfloat correction;

+	 GLint side;

+	 GLfloat contrib[3];

+	 GLfloat attenuation = 1.0;

+	 GLfloat VP[3];          /* unit vector from vertex to light */

+	 GLfloat n_dot_VP;       /* n dot VP */

+	 GLfloat *h;

+

+	 /* compute VP and attenuation */

+	 if (!(light->_Flags & LIGHT_POSITIONAL)) {

+	    /* directional light */

+	    COPY_3V(VP, light->_VP_inf_norm);

+	    attenuation = light->_VP_inf_spot_attenuation;

+	 }

+	 else {

+	    GLfloat d;     /* distance from vertex to light */

+

+

+	    SUB_3V(VP, light->_Position, vertex);

+

+	    d = (GLfloat) LEN_3FV( VP );

+

+	    if ( d > 1e-6) {

+	       GLfloat invd = 1.0F / d;

+	       SELF_SCALE_SCALAR_3V(VP, invd);

+	    }

+

+            attenuation = 1.0F / (light->ConstantAttenuation + d *

+                                  (light->LinearAttenuation + d *

+                                   light->QuadraticAttenuation));

+

+	    /* spotlight attenuation */

+	    if (light->_Flags & LIGHT_SPOT) {

+	       GLfloat PV_dot_dir = - DOT3(VP, light->_NormSpotDirection);

+

+	       if (PV_dot_dir<light->_CosCutoff) {

+		  continue; /* this light makes no contribution */

+	       }

+	       else {

+		  GLdouble x = PV_dot_dir * (EXP_TABLE_SIZE-1);

+		  GLint k = (GLint) x;

+		  GLfloat spot = (GLfloat) (light->_SpotExpTable[k][0]

+				  + (x-k)*light->_SpotExpTable[k][1]);

+		  attenuation *= spot;

+	       }

+	    }

+	 }

+

+	 if (attenuation < 1e-3)

+	    continue;		/* this light makes no contribution */

+

+	 /* Compute dot product or normal and vector from V to light pos */

+	 n_dot_VP = DOT3( normal, VP );

+

+	 /* which side are we lighting? */

+	 if (n_dot_VP < 0.0F) {

+	    ACC_SCALE_SCALAR_3V(sum[0], attenuation, light->_MatAmbient[0]);

+#if IDX & LIGHT_TWOSIDE

+	    side = 1;

+	    correction = -1;

+	    n_dot_VP = -n_dot_VP;

+#else

+            continue;

+#endif

+	 }

+         else {

+#if IDX & LIGHT_TWOSIDE

+            ACC_SCALE_SCALAR_3V( sum[1], attenuation, light->_MatAmbient[1]);

+#endif

+	    side = 0;

+	    correction = 1;

+	 }

+

+	 COPY_3V(contrib, light->_MatAmbient[side]);

+

+	 /* diffuse term */

+	 ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[side]);

+

+	 /* specular term - cannibalize VP... */

+	 {

+	    if (ctx->Light.Model.LocalViewer) {

+	       GLfloat v[3];

+	       COPY_3V(v, vertex);

+	       NORMALIZE_3FV(v);

+	       SUB_3V(VP, VP, v);                /* h = VP + VPe */

+	       h = VP;

+	       NORMALIZE_3FV(h);

+	    }

+	    else if (light->_Flags & LIGHT_POSITIONAL) {

+	       h = VP;

+	       ACC_3V(h, ctx->_EyeZDir);

+	       NORMALIZE_3FV(h);

+	    }

+            else {

+	       h = light->_h_inf_norm;

+	    }

+

+	    n_dot_h = correction * DOT3(normal, h);

+

+	    if (n_dot_h > 0.0F)

+	    {

+	       GLfloat spec_coef;

+	       struct gl_shine_tab *tab = ctx->_ShineTable[side];

+

+	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec_coef );

+

+	       ACC_SCALE_SCALAR_3V( contrib, spec_coef,

+				    light->_MatSpecular[side]);

+	    }

+	 }

+

+	 ACC_SCALE_SCALAR_3V( sum[side], attenuation, contrib );

+      }

+

+      COPY_3V( Fcolor[j], sum[0] );

+      Fcolor[j][3] = sumA[0];

+

+#if IDX & LIGHT_TWOSIDE

+      COPY_3V( Bcolor[j], sum[1] );

+      Bcolor[j][3] = sumA[1];

+#endif

+   }

+}

+

+

+

+

+/* As below, but with just a single light.

+ */

+static void TAG(light_fast_rgba_single)( struct gl_context *ctx,

+					 struct vertex_buffer *VB,

+					 struct tnl_pipeline_stage *stage,

+					 GLvector4f *input )

+

+{

+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);

+   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;

+   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;

+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;

+#if IDX & LIGHT_TWOSIDE

+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;

+#endif

+   const struct gl_light *light = ctx->Light.EnabledList.next;

+   GLuint j = 0;

+   GLfloat base[2][4];

+#if IDX & LIGHT_MATERIAL

+   const GLuint nr = VB->Count;

+#else

+   const GLuint nr = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count;

+#endif

+

+#ifdef TRACE

+   fprintf(stderr, "%s\n", __FUNCTION__ );

+#endif

+

+   (void) input;		/* doesn't refer to Eye or Obj */

+

+   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];

+#if IDX & LIGHT_TWOSIDE

+   VB->BackfaceColorPtr = &store->LitColor[1];

+#endif

+

+   if (nr > 1) {

+      store->LitColor[0].stride = 16;

+      store->LitColor[1].stride = 16;

+   }

+   else {

+      store->LitColor[0].stride = 0;

+      store->LitColor[1].stride = 0;

+   }

+

+   for (j = 0; j < nr; j++, STRIDE_F(normal,nstride)) {

+

+      GLfloat n_dot_VP;

+

+#if IDX & LIGHT_MATERIAL

+      update_materials( ctx, store );

+#endif

+

+      /* No attenuation, so incoporate _MatAmbient into base color.

+       */

+#if !(IDX & LIGHT_MATERIAL)

+      if ( j == 0 )

+#endif

+      {

+	 COPY_3V(base[0], light->_MatAmbient[0]);

+	 ACC_3V(base[0], ctx->Light._BaseColor[0] );

+	 base[0][3] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+

+#if IDX & LIGHT_TWOSIDE

+         COPY_3V(base[1], light->_MatAmbient[1]);

+         ACC_3V(base[1], ctx->Light._BaseColor[1]);

+         base[1][3] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+#endif

+      }

+

+      n_dot_VP = DOT3(normal, light->_VP_inf_norm);

+

+      if (n_dot_VP < 0.0F) {

+#if IDX & LIGHT_TWOSIDE

+         GLfloat n_dot_h = -DOT3(normal, light->_h_inf_norm);

+         GLfloat sum[3];

+         COPY_3V(sum, base[1]);

+         ACC_SCALE_SCALAR_3V(sum, -n_dot_VP, light->_MatDiffuse[1]);

+         if (n_dot_h > 0.0F) {

+            GLfloat spec;

+            GET_SHINE_TAB_ENTRY( ctx->_ShineTable[1], n_dot_h, spec );

+            ACC_SCALE_SCALAR_3V(sum, spec, light->_MatSpecular[1]);

+         }

+         COPY_3V(Bcolor[j], sum );

+         Bcolor[j][3] = base[1][3];

+#endif

+	 COPY_4FV(Fcolor[j], base[0]);

+      }

+      else {

+	 GLfloat n_dot_h = DOT3(normal, light->_h_inf_norm);

+	 GLfloat sum[3];

+	 COPY_3V(sum, base[0]);

+	 ACC_SCALE_SCALAR_3V(sum, n_dot_VP, light->_MatDiffuse[0]);

+	 if (n_dot_h > 0.0F) {

+	    GLfloat spec;

+	    GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec );

+	    ACC_SCALE_SCALAR_3V(sum, spec, light->_MatSpecular[0]);

+

+	 }

+	 COPY_3V(Fcolor[j], sum );

+	 Fcolor[j][3] = base[0][3];

+#if IDX & LIGHT_TWOSIDE

+         COPY_4FV(Bcolor[j], base[1]);

+#endif

+      }

+   }

+}

+

+

+/* Light infinite lights

+ */

+static void TAG(light_fast_rgba)( struct gl_context *ctx,

+				  struct vertex_buffer *VB,

+				  struct tnl_pipeline_stage *stage,

+				  GLvector4f *input )

+{

+   struct light_stage_data *store = LIGHT_STAGE_DATA(stage);

+   GLfloat sumA[2];

+   const GLuint nstride = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->stride;

+   const GLfloat *normal = (GLfloat *)VB->AttribPtr[_TNL_ATTRIB_NORMAL]->data;

+   GLfloat (*Fcolor)[4] = (GLfloat (*)[4]) store->LitColor[0].data;

+#if IDX & LIGHT_TWOSIDE

+   GLfloat (*Bcolor)[4] = (GLfloat (*)[4]) store->LitColor[1].data;

+#endif

+   GLuint j = 0;

+#if IDX & LIGHT_MATERIAL

+   const GLuint nr = VB->Count;

+#else

+   const GLuint nr = VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count;

+#endif

+   const struct gl_light *light;

+

+#ifdef TRACE

+   fprintf(stderr, "%s %d\n", __FUNCTION__, nr );

+#endif

+

+   (void) input;

+

+   sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+   sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+

+   VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->LitColor[0];

+#if IDX & LIGHT_TWOSIDE

+   VB->BackfaceColorPtr = &store->LitColor[1];

+#endif

+

+   if (nr > 1) {

+      store->LitColor[0].stride = 16;

+      store->LitColor[1].stride = 16;

+   }

+   else {

+      store->LitColor[0].stride = 0;

+      store->LitColor[1].stride = 0;

+   }

+

+   for (j = 0; j < nr; j++, STRIDE_F(normal,nstride)) {

+

+      GLfloat sum[2][3];

+

+#if IDX & LIGHT_MATERIAL

+      update_materials( ctx, store );

+

+      sumA[0] = ctx->Light.Material.Attrib[MAT_ATTRIB_FRONT_DIFFUSE][3];

+#if IDX & LIGHT_TWOSIDE

+      sumA[1] = ctx->Light.Material.Attrib[MAT_ATTRIB_BACK_DIFFUSE][3];

+#endif

+#endif

+

+

+      COPY_3V(sum[0], ctx->Light._BaseColor[0]);

+#if IDX & LIGHT_TWOSIDE

+      COPY_3V(sum[1], ctx->Light._BaseColor[1]);

+#endif

+

+      foreach (light, &ctx->Light.EnabledList) {

+	 GLfloat n_dot_h, n_dot_VP, spec;

+

+	 ACC_3V(sum[0], light->_MatAmbient[0]);

+#if IDX & LIGHT_TWOSIDE

+         ACC_3V(sum[1], light->_MatAmbient[1]);

+#endif

+

+	 n_dot_VP = DOT3(normal, light->_VP_inf_norm);

+

+	 if (n_dot_VP > 0.0F) {

+	    ACC_SCALE_SCALAR_3V(sum[0], n_dot_VP, light->_MatDiffuse[0]);

+	    n_dot_h = DOT3(normal, light->_h_inf_norm);

+	    if (n_dot_h > 0.0F) {

+	       struct gl_shine_tab *tab = ctx->_ShineTable[0];

+	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec );

+	       ACC_SCALE_SCALAR_3V( sum[0], spec, light->_MatSpecular[0]);

+	    }

+	 }

+#if IDX & LIGHT_TWOSIDE

+         else {

+	    ACC_SCALE_SCALAR_3V(sum[1], -n_dot_VP, light->_MatDiffuse[1]);

+	    n_dot_h = -DOT3(normal, light->_h_inf_norm);

+	    if (n_dot_h > 0.0F) {

+	       struct gl_shine_tab *tab = ctx->_ShineTable[1];

+	       GET_SHINE_TAB_ENTRY( tab, n_dot_h, spec );

+	       ACC_SCALE_SCALAR_3V( sum[1], spec, light->_MatSpecular[1]);

+	    }

+	 }

+#endif

+      }

+

+      COPY_3V( Fcolor[j], sum[0] );

+      Fcolor[j][3] = sumA[0];

+

+#if IDX & LIGHT_TWOSIDE

+      COPY_3V( Bcolor[j], sum[1] );

+      Bcolor[j][3] = sumA[1];

+#endif

+   }

+}

+

+

+

+

+static void TAG(init_light_tab)( void )

+{

+   _tnl_light_tab[IDX] = TAG(light_rgba);

+   _tnl_light_fast_tab[IDX] = TAG(light_fast_rgba);

+   _tnl_light_fast_single_tab[IDX] = TAG(light_fast_rgba_single);

+   _tnl_light_spec_tab[IDX] = TAG(light_rgba_spec);

+}

+

+

+#undef TAG

+#undef IDX

+#undef NR_SIDES

diff --git a/mesalib/src/mesa/tnl/t_vb_normals.c b/mesalib/src/mesa/tnl/t_vb_normals.c
index c2aa65567..94e8d0ab5 100644
--- a/mesalib/src/mesa/tnl/t_vb_normals.c
+++ b/mesalib/src/mesa/tnl/t_vb_normals.c
@@ -1,187 +1,187 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
-struct normal_stage_data {
-   normal_func NormalTransform;
-   GLvector4f normal;
-};
-
-#define NORMAL_STAGE_DATA(stage) ((struct normal_stage_data *)stage->privatePtr)
-
-
-static GLboolean
-run_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   const GLfloat *lengths;
-
-   if (!store->NormalTransform)
-      return GL_TRUE;
-
-   /* We can only use the display list's saved normal lengths if we've
-    * got a transformation matrix with uniform scaling.
-    */
-   if (_math_matrix_is_general_scale(ctx->ModelviewMatrixStack.Top))
-      lengths = NULL;
-   else
-      lengths = VB->NormalLengthPtr;
-
-   store->NormalTransform( ctx->ModelviewMatrixStack.Top,
-			   ctx->_ModelViewInvScale,
-			   VB->AttribPtr[_TNL_ATTRIB_NORMAL],  /* input normals */
-			   lengths,
-			   &store->normal ); /* resulting normals */
-
-   if (VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count > 1) {
-      store->normal.stride = 4 * sizeof(GLfloat);
-   }
-   else {
-      store->normal.stride = 0;
-   }
-
-   VB->AttribPtr[_TNL_ATTRIB_NORMAL] = &store->normal;
-
-   VB->NormalLengthPtr = NULL;	/* no longer valid */
-   return GL_TRUE;
-}
-
-
-/**
- * Examine current GL state and set the store->NormalTransform pointer
- * to point to the appropriate normal transformation routine.
- */
-static void
-validate_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
-
-   if (ctx->VertexProgram._Current ||
-       (!ctx->Light.Enabled &&
-	!(ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS))) {
-      store->NormalTransform = NULL;
-      return;
-   }
-
-   if (ctx->_NeedEyeCoords) {
-      /* Eye coordinates are needed, for whatever reasons.
-       * Do lighting in eye coordinates, as the GL spec says.
-       */
-      GLuint transform = NORM_TRANSFORM_NO_ROT;
-
-      if (_math_matrix_has_rotation(ctx->ModelviewMatrixStack.Top)) {
-         /* need to do full (3x3) matrix transform */
-	 transform = NORM_TRANSFORM;
-      }
-
-      if (ctx->Transform.Normalize) {
-	 store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE];
-      }
-      else if (ctx->Transform.RescaleNormals &&
-               ctx->_ModelViewInvScale != 1.0) {
-	 store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE];
-      }
-      else {
-	 store->NormalTransform = _mesa_normal_tab[transform];
-      }
-   }
-   else {
-      /* We don't need eye coordinates.
-       * Do lighting in object coordinates.  Thus, we don't need to fully
-       * transform normal vectors (just leave them in object coordinates)
-       * but we still need to do normalization/rescaling if enabled.
-       */
-      if (ctx->Transform.Normalize) {
-	 store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE];
-      }
-      else if (!ctx->Transform.RescaleNormals &&
-	       ctx->_ModelViewInvScale != 1.0) {
-	 store->NormalTransform = _mesa_normal_tab[NORM_RESCALE];
-      }
-      else {
-	 store->NormalTransform = NULL;
-      }
-   }
-}
-
-
-/**
- * Allocate stage's private data (storage for transformed normals).
- */
-static GLboolean
-alloc_normal_data(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct normal_stage_data *store;
-
-   stage->privatePtr = malloc(sizeof(*store));
-   store = NORMAL_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   _mesa_vector4f_alloc( &store->normal, 0, tnl->vb.Size, 32 );
-   return GL_TRUE;
-}
-
-
-/**
- * Free stage's private data.
- */
-static void
-free_normal_data(struct tnl_pipeline_stage *stage)
-{
-   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
-   if (store) {
-      _mesa_vector4f_free( &store->normal );
-      free( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-
-const struct tnl_pipeline_stage _tnl_normal_transform_stage =
-{
-   "normal transform",		/* name */
-   NULL,			/* privatePtr */
-   alloc_normal_data,		/* create */
-   free_normal_data,		/* destroy */
-   validate_normal_stage,	/* validate */
-   run_normal_stage             /* run */
-};
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "math/m_xform.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+

+

+struct normal_stage_data {

+   normal_func NormalTransform;

+   GLvector4f normal;

+};

+

+#define NORMAL_STAGE_DATA(stage) ((struct normal_stage_data *)stage->privatePtr)

+

+

+static GLboolean

+run_normal_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   const GLfloat *lengths;

+

+   if (!store->NormalTransform)

+      return GL_TRUE;

+

+   /* We can only use the display list's saved normal lengths if we've

+    * got a transformation matrix with uniform scaling.

+    */

+   if (_math_matrix_is_general_scale(ctx->ModelviewMatrixStack.Top))

+      lengths = NULL;

+   else

+      lengths = VB->NormalLengthPtr;

+

+   store->NormalTransform( ctx->ModelviewMatrixStack.Top,

+			   ctx->_ModelViewInvScale,

+			   VB->AttribPtr[_TNL_ATTRIB_NORMAL],  /* input normals */

+			   lengths,

+			   &store->normal ); /* resulting normals */

+

+   if (VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count > 1) {

+      store->normal.stride = 4 * sizeof(GLfloat);

+   }

+   else {

+      store->normal.stride = 0;

+   }

+

+   VB->AttribPtr[_TNL_ATTRIB_NORMAL] = &store->normal;

+

+   VB->NormalLengthPtr = NULL;	/* no longer valid */

+   return GL_TRUE;

+}

+

+

+/**

+ * Examine current GL state and set the store->NormalTransform pointer

+ * to point to the appropriate normal transformation routine.

+ */

+static void

+validate_normal_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);

+

+   if (ctx->VertexProgram._Current ||

+       (!ctx->Light.Enabled &&

+	!(ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS))) {

+      store->NormalTransform = NULL;

+      return;

+   }

+

+   if (ctx->_NeedEyeCoords) {

+      /* Eye coordinates are needed, for whatever reasons.

+       * Do lighting in eye coordinates, as the GL spec says.

+       */

+      GLuint transform = NORM_TRANSFORM_NO_ROT;

+

+      if (_math_matrix_has_rotation(ctx->ModelviewMatrixStack.Top)) {

+         /* need to do full (3x3) matrix transform */

+	 transform = NORM_TRANSFORM;

+      }

+

+      if (ctx->Transform.Normalize) {

+	 store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE];

+      }

+      else if (ctx->Transform.RescaleNormals &&

+               ctx->_ModelViewInvScale != 1.0) {

+	 store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE];

+      }

+      else {

+	 store->NormalTransform = _mesa_normal_tab[transform];

+      }

+   }

+   else {

+      /* We don't need eye coordinates.

+       * Do lighting in object coordinates.  Thus, we don't need to fully

+       * transform normal vectors (just leave them in object coordinates)

+       * but we still need to do normalization/rescaling if enabled.

+       */

+      if (ctx->Transform.Normalize) {

+	 store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE];

+      }

+      else if (!ctx->Transform.RescaleNormals &&

+	       ctx->_ModelViewInvScale != 1.0) {

+	 store->NormalTransform = _mesa_normal_tab[NORM_RESCALE];

+      }

+      else {

+	 store->NormalTransform = NULL;

+      }

+   }

+}

+

+

+/**

+ * Allocate stage's private data (storage for transformed normals).

+ */

+static GLboolean

+alloc_normal_data(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct normal_stage_data *store;

+

+   stage->privatePtr = malloc(sizeof(*store));

+   store = NORMAL_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   _mesa_vector4f_alloc( &store->normal, 0, tnl->vb.Size, 32 );

+   return GL_TRUE;

+}

+

+

+/**

+ * Free stage's private data.

+ */

+static void

+free_normal_data(struct tnl_pipeline_stage *stage)

+{

+   struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);

+   if (store) {

+      _mesa_vector4f_free( &store->normal );

+      free( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+

+const struct tnl_pipeline_stage _tnl_normal_transform_stage =

+{

+   "normal transform",		/* name */

+   NULL,			/* privatePtr */

+   alloc_normal_data,		/* create */

+   free_normal_data,		/* destroy */

+   validate_normal_stage,	/* validate */

+   run_normal_stage             /* run */

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_points.c b/mesalib/src/mesa/tnl/t_vb_points.c
index 20634c80d..1bf961a6d 100644
--- a/mesalib/src/mesa/tnl/t_vb_points.c
+++ b/mesalib/src/mesa/tnl/t_vb_points.c
@@ -1,114 +1,114 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.0
- *
- * 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:
- *    Brian Paul
- */
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/dd.h"
-#include "main/imports.h"
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
-struct point_stage_data {
-   GLvector4f PointSize;
-};
-
-#define POINT_STAGE_DATA(stage) ((struct point_stage_data *)stage->privatePtr)
-
-
-/**
- * Compute point size for each vertex from the vertex eye-space Z
- * coordinate and the point size attenuation factors.
- * Only done when point size attenuation is enabled and vertex program is
- * disabled.
- */
-static GLboolean
-run_point_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   if (ctx->Point._Attenuated && !ctx->VertexProgram._Current) {
-      struct point_stage_data *store = POINT_STAGE_DATA(stage);
-      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-      const GLfloat *eyeCoord = (GLfloat *) VB->EyePtr->data + 2;
-      const GLint eyeCoordStride = VB->EyePtr->stride / sizeof(GLfloat);
-      const GLfloat p0 = ctx->Point.Params[0];
-      const GLfloat p1 = ctx->Point.Params[1];
-      const GLfloat p2 = ctx->Point.Params[2];
-      const GLfloat pointSize = ctx->Point.Size;
-      GLfloat (*size)[4] = store->PointSize.data;
-      GLuint i;
-
-      for (i = 0; i < VB->Count; i++) {
-         const GLfloat dist = FABSF(*eyeCoord);
-         const GLfloat q = p0 + dist * (p1 + dist * p2);
-         const GLfloat atten = (q != 0.0F) ? SQRTF(1.0F / q) : 1.0F;
-         size[i][0] = pointSize * atten; /* clamping done in rasterization */
-         eyeCoord += eyeCoordStride;
-      }
-
-      VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;
-   }
-
-   return GL_TRUE;
-}
-
-
-static GLboolean
-alloc_point_data(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct point_stage_data *store;
-   stage->privatePtr = malloc(sizeof(*store));
-   store = POINT_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   _mesa_vector4f_alloc( &store->PointSize, 0, VB->Size, 32 );
-   return GL_TRUE;
-}
-
-
-static void
-free_point_data(struct tnl_pipeline_stage *stage)
-{
-   struct point_stage_data *store = POINT_STAGE_DATA(stage);
-   if (store) {
-      _mesa_vector4f_free( &store->PointSize );
-      free( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-
-const struct tnl_pipeline_stage _tnl_point_attenuation_stage =
-{
-   "point size attenuation",	/* name */
-   NULL,			/* stage private data */
-   alloc_point_data,		/* alloc data */
-   free_point_data,		/* destructor */
-   NULL,
-   run_point_stage		/* run */
-};
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.0

+ *

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

+ *    Brian Paul

+ */

+

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "main/dd.h"

+#include "main/imports.h"

+#include "t_context.h"

+#include "t_pipeline.h"

+

+

+struct point_stage_data {

+   GLvector4f PointSize;

+};

+

+#define POINT_STAGE_DATA(stage) ((struct point_stage_data *)stage->privatePtr)

+

+

+/**

+ * Compute point size for each vertex from the vertex eye-space Z

+ * coordinate and the point size attenuation factors.

+ * Only done when point size attenuation is enabled and vertex program is

+ * disabled.

+ */

+static GLboolean

+run_point_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   if (ctx->Point._Attenuated && !ctx->VertexProgram._Current) {

+      struct point_stage_data *store = POINT_STAGE_DATA(stage);

+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+      const GLfloat *eyeCoord = (GLfloat *) VB->EyePtr->data + 2;

+      const GLint eyeCoordStride = VB->EyePtr->stride / sizeof(GLfloat);

+      const GLfloat p0 = ctx->Point.Params[0];

+      const GLfloat p1 = ctx->Point.Params[1];

+      const GLfloat p2 = ctx->Point.Params[2];

+      const GLfloat pointSize = ctx->Point.Size;

+      GLfloat (*size)[4] = store->PointSize.data;

+      GLuint i;

+

+      for (i = 0; i < VB->Count; i++) {

+         const GLfloat dist = FABSF(*eyeCoord);

+         const GLfloat q = p0 + dist * (p1 + dist * p2);

+         const GLfloat atten = (q != 0.0F) ? SQRTF(1.0F / q) : 1.0F;

+         size[i][0] = pointSize * atten; /* clamping done in rasterization */

+         eyeCoord += eyeCoordStride;

+      }

+

+      VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;

+   }

+

+   return GL_TRUE;

+}

+

+

+static GLboolean

+alloc_point_data(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct point_stage_data *store;

+   stage->privatePtr = malloc(sizeof(*store));

+   store = POINT_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   _mesa_vector4f_alloc( &store->PointSize, 0, VB->Size, 32 );

+   return GL_TRUE;

+}

+

+

+static void

+free_point_data(struct tnl_pipeline_stage *stage)

+{

+   struct point_stage_data *store = POINT_STAGE_DATA(stage);

+   if (store) {

+      _mesa_vector4f_free( &store->PointSize );

+      free( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+

+const struct tnl_pipeline_stage _tnl_point_attenuation_stage =

+{

+   "point size attenuation",	/* name */

+   NULL,			/* stage private data */

+   alloc_point_data,		/* alloc data */

+   free_point_data,		/* destructor */

+   NULL,

+   run_point_stage		/* run */

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_program.c b/mesalib/src/mesa/tnl/t_vb_program.c
index f3a338ef1..ea5717a7a 100644
--- a/mesalib/src/mesa/tnl/t_vb_program.c
+++ b/mesalib/src/mesa/tnl/t_vb_program.c
@@ -1,569 +1,571 @@
-/*
- * 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 tnl/t_vb_program.c
- * \brief Pipeline stage for executing vertex programs.
- * \author Brian Paul,  Keith Whitwell
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "math/m_xform.h"
-#include "program/prog_instruction.h"
-#include "program/prog_statevars.h"
-#include "program/prog_execute.h"
-#include "swrast/s_context.h"
-
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_pipeline.h"
-
-
-#ifdef NAN_CHECK
-/** Check for NaNs and very large values */
-static INLINE void
-check_float(float x)
-{
-   assert(!IS_INF_OR_NAN(x));
-   assert(1.0e-15 <= x && x <= 1.0e15);
-}
-#endif
-
-
-/*!
- * Private storage for the vertex program pipeline stage.
- */
-struct vp_stage_data {
-   /** The results of running the vertex program go into these arrays. */
-   GLvector4f results[VERT_RESULT_MAX];
-
-   GLvector4f ndcCoords;              /**< normalized device coords */
-   GLubyte *clipmask;                 /**< clip flags */
-   GLubyte ormask, andmask;           /**< for clipping */
-};
-
-
-#define VP_STAGE_DATA(stage) ((struct vp_stage_data *)(stage->privatePtr))
-
-
-static void
-userclip( GLcontext *ctx,
-          GLvector4f *clip,
-          GLubyte *clipmask,
-          GLubyte *clipormask,
-          GLubyte *clipandmask )
-{
-   GLuint p;
-
-   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
-      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
-	 GLuint nr, i;
-	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
-	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
-	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
-	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
-         GLfloat *coord = (GLfloat *)clip->data;
-         GLuint stride = clip->stride;
-         GLuint count = clip->count;
-
-	 for (nr = 0, i = 0 ; i < count ; i++) {
-	    GLfloat dp = (coord[0] * a + 
-			  coord[1] * b +
-			  coord[2] * c +
-			  coord[3] * d);
-
-	    if (dp < 0) {
-	       nr++;
-	       clipmask[i] |= CLIP_USER_BIT;
-	    }
-
-	    STRIDE_F(coord, stride);
-	 }
-
-	 if (nr > 0) {
-	    *clipormask |= CLIP_USER_BIT;
-	    if (nr == count) {
-	       *clipandmask |= CLIP_USER_BIT;
-	       return;
-	    }
-	 }
-      }
-   }
-}
-
-
-static GLboolean
-do_ndc_cliptest(GLcontext *ctx, struct vp_stage_data *store)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   /* Cliptest and perspective divide.  Clip functions must clear
-    * the clipmask.
-    */
-   store->ormask = 0;
-   store->andmask = CLIP_FRUSTUM_BITS;
-
-   tnl_clip_prepare(ctx);
-
-   if (tnl->NeedNdcCoords) {
-      VB->NdcPtr =
-         _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
-                                            &store->ndcCoords,
-                                            store->clipmask,
-                                            &store->ormask,
-                                            &store->andmask,
-					    !ctx->Transform.DepthClamp );
-   }
-   else {
-      VB->NdcPtr = NULL;
-      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,
-                                            NULL,
-                                            store->clipmask,
-                                            &store->ormask,
-                                            &store->andmask,
-					    !ctx->Transform.DepthClamp );
-   }
-
-   if (store->andmask) {
-      /* All vertices are outside the frustum */
-      return GL_FALSE;
-   }
-
-   /* Test userclip planes.  This contributes to VB->ClipMask.
-    */
-   /** XXX NEW_SLANG _Enabled ??? */
-   if (ctx->Transform.ClipPlanesEnabled && (!ctx->VertexProgram._Enabled ||
-      ctx->VertexProgram.Current->IsPositionInvariant)) {
-      userclip( ctx,
-		VB->ClipPtr,
-		store->clipmask,
-		&store->ormask,
-		&store->andmask );
-
-      if (store->andmask) {
-	 return GL_FALSE;
-      }
-   }
-
-   VB->ClipAndMask = store->andmask;
-   VB->ClipOrMask = store->ormask;
-   VB->ClipMask = store->clipmask;
-
-   return GL_TRUE;
-}
-
-
-/**
- * XXX the texture sampling code in this module is a bit of a hack.
- * The texture sampling code is in swrast, though it doesn't have any
- * real dependencies on the rest of swrast.  It should probably be
- * moved into main/ someday.
- */
-static void
-vp_fetch_texel(GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
-               GLuint unit, GLfloat color[4])
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-
-   /* XXX use a float-valued TextureSample routine here!!! */
-   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
-                               1, (const GLfloat (*)[4]) texcoord,
-                               &lambda,  (GLfloat (*)[4]) color);
-}
-
-
-/**
- * Called via ctx->Driver.ProgramStringNotify() after a new vertex program
- * string has been parsed.
- */
-GLboolean
-_tnl_program_string(GLcontext *ctx, GLenum target, struct gl_program *program)
-{
-   /* No-op.
-    * If we had derived anything from the program that was private to this
-    * stage we'd recompute/validate it here.
-    */
-   return GL_TRUE;
-}
-
-
-/**
- * Initialize virtual machine state prior to executing vertex program.
- */
-static void
-init_machine(GLcontext *ctx, struct gl_program_machine *machine)
-{
-   /* Input registers get initialized from the current vertex attribs */
-   memcpy(machine->VertAttribs, ctx->Current.Attrib,
-          MAX_VERTEX_GENERIC_ATTRIBS * 4 * sizeof(GLfloat));
-
-   if (ctx->VertexProgram._Current->IsNVProgram) {
-      GLuint i;
-      /* Output/result regs are initialized to [0,0,0,1] */
-      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_OUTPUTS; i++) {
-         ASSIGN_4V(machine->Outputs[i], 0.0F, 0.0F, 0.0F, 1.0F);
-      }
-      /* Temp regs are initialized to [0,0,0,0] */
-      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_TEMPS; i++) {
-         ASSIGN_4V(machine->Temporaries[i], 0.0F, 0.0F, 0.0F, 0.0F);
-      }
-      for (i = 0; i < MAX_VERTEX_PROGRAM_ADDRESS_REGS; i++) {
-         ASSIGN_4V(machine->AddressReg[i], 0, 0, 0, 0);
-      }
-   }
-
-   machine->NumDeriv = 0;
-
-   /* init condition codes */
-   machine->CondCodes[0] = COND_EQ;
-   machine->CondCodes[1] = COND_EQ;
-   machine->CondCodes[2] = COND_EQ;
-   machine->CondCodes[3] = COND_EQ;
-
-   /* init call stack */
-   machine->StackDepth = 0;
-
-   machine->FetchTexelLod = vp_fetch_texel;
-   machine->FetchTexelDeriv = NULL; /* not used by vertex programs */
-
-   machine->Samplers = ctx->VertexProgram._Current->Base.SamplerUnits;
-}
-
-
-/**
- * Map the texture images which the vertex program will access (if any).
- */
-static void
-map_textures(GLcontext *ctx, const struct gl_vertex_program *vp)
-{
-   GLuint u;
-
-   if (!ctx->Driver.MapTexture)
-      return;
-
-   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
-      if (vp->Base.TexturesUsed[u]) {
-         /* Note: _Current *should* correspond to the target indicated
-          * in TexturesUsed[u].
-          */
-         ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[u]._Current);
-      }
-   }
-}
-
-
-/**
- * Unmap the texture images which were used by the vertex program (if any).
- */
-static void
-unmap_textures(GLcontext *ctx, const struct gl_vertex_program *vp)
-{
-   GLuint u;
-
-   if (!ctx->Driver.MapTexture)
-      return;
-
-   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
-      if (vp->Base.TexturesUsed[u]) {
-         /* Note: _Current *should* correspond to the target indicated
-          * in TexturesUsed[u].
-          */
-         ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current);
-      }
-   }
-}
-
-
-/**
- * This function executes vertex programs
- */
-static GLboolean
-run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vp_stage_data *store = VP_STAGE_DATA(stage);
-   struct vertex_buffer *VB = &tnl->vb;
-   struct gl_vertex_program *program = ctx->VertexProgram._Current;
-   struct gl_program_machine machine;
-   GLuint outputs[VERT_RESULT_MAX], numOutputs;
-   GLuint i, j;
-
-   if (!program)
-      return GL_TRUE;
-
-   if (program->IsNVProgram) {
-      _mesa_load_tracked_matrices(ctx);
-   }
-   else {
-      /* ARB program or vertex shader */
-      _mesa_load_state_parameters(ctx, program->Base.Parameters);
-   }
-
-   /* make list of outputs to save some time below */
-   numOutputs = 0;
-   for (i = 0; i < VERT_RESULT_MAX; i++) {
-      if (program->Base.OutputsWritten & BITFIELD64_BIT(i)) {
-         outputs[numOutputs++] = i;
-      }
-   }
-
-   map_textures(ctx, program);
-
-   for (i = 0; i < VB->Count; i++) {
-      GLuint attr;
-
-      init_machine(ctx, &machine);
-
-#if 0
-      printf("Input  %d: %f, %f, %f, %f\n", i,
-             VB->AttribPtr[0]->data[i][0],
-             VB->AttribPtr[0]->data[i][1],
-             VB->AttribPtr[0]->data[i][2],
-             VB->AttribPtr[0]->data[i][3]);
-      printf("   color: %f, %f, %f, %f\n",
-             VB->AttribPtr[3]->data[i][0],
-             VB->AttribPtr[3]->data[i][1],
-             VB->AttribPtr[3]->data[i][2],
-             VB->AttribPtr[3]->data[i][3]);
-      printf("  normal: %f, %f, %f, %f\n",
-             VB->AttribPtr[2]->data[i][0],
-             VB->AttribPtr[2]->data[i][1],
-             VB->AttribPtr[2]->data[i][2],
-             VB->AttribPtr[2]->data[i][3]);
-#endif
-
-      /* the vertex array case */
-      for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
-	 if (program->Base.InputsRead & (1 << attr)) {
-	    const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data;
-	    const GLuint size = VB->AttribPtr[attr]->size;
-	    const GLuint stride = VB->AttribPtr[attr]->stride;
-	    const GLfloat *data = (GLfloat *) (ptr + stride * i);
-#ifdef NAN_CHECK
-            check_float(data[0]);
-            check_float(data[1]);
-            check_float(data[2]);
-            check_float(data[3]);
-#endif
-	    COPY_CLEAN_4V(machine.VertAttribs[attr], size, data);
-	 }
-      }
-
-      /* execute the program */
-      _mesa_execute_program(ctx, &program->Base, &machine);
-
-      /* copy the output registers into the VB->attribs arrays */
-      for (j = 0; j < numOutputs; j++) {
-         const GLuint attr = outputs[j];
-#ifdef NAN_CHECK
-         check_float(machine.Outputs[attr][0]);
-         check_float(machine.Outputs[attr][1]);
-         check_float(machine.Outputs[attr][2]);
-         check_float(machine.Outputs[attr][3]);
-#endif
-         COPY_4V(store->results[attr].data[i], machine.Outputs[attr]);
-      }
-
-      /* FOGC is a special case.  Fragment shader expects (f,0,0,1) */
-      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) {
-         store->results[VERT_RESULT_FOGC].data[i][1] = 0.0;
-         store->results[VERT_RESULT_FOGC].data[i][2] = 0.0;
-         store->results[VERT_RESULT_FOGC].data[i][3] = 1.0;
-      }
-#ifdef NAN_CHECK
-      ASSERT(machine.Outputs[0][3] != 0.0F);
-#endif
-#if 0
-      printf("HPOS: %f %f %f %f\n",
-             machine.Outputs[0][0], 
-             machine.Outputs[0][1], 
-             machine.Outputs[0][2], 
-             machine.Outputs[0][3]);
-#endif
-   }
-
-   unmap_textures(ctx, program);
-
-   /* Fixup fog and point size results if needed */
-   if (program->IsNVProgram) {
-      if (ctx->Fog.Enabled &&
-          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) == 0) {
-         for (i = 0; i < VB->Count; i++) {
-            store->results[VERT_RESULT_FOGC].data[i][0] = 1.0;
-         }
-      }
-
-      if (ctx->VertexProgram.PointSizeEnabled &&
-          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) == 0) {
-         for (i = 0; i < VB->Count; i++) {
-            store->results[VERT_RESULT_PSIZ].data[i][0] = ctx->Point.Size;
-         }
-      }
-   }
-
-   if (program->IsPositionInvariant) {
-      /* We need the exact same transform as in the fixed function path here
-       * to guarantee invariance, depending on compiler optimization flags
-       * results could be different otherwise.
-       */
-      VB->ClipPtr = TransformRaw( &store->results[0],
-				  &ctx->_ModelProjectMatrix,
-				  VB->AttribPtr[0] );
-
-      /* Drivers expect this to be clean to element 4...
-       */
-      switch (VB->ClipPtr->size) {
-      case 1:
-	 /* impossible */
-      case 2:
-	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
-	 /* fall-through */
-      case 3:
-	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
-	 /* fall-through */
-      case 4:
-	 break;
-      }
-   }
-   else {
-      /* Setup the VB pointers so that the next pipeline stages get
-       * their data from the right place (the program output arrays).
-       */
-      VB->ClipPtr = &store->results[VERT_RESULT_HPOS];
-      VB->ClipPtr->size = 4;
-      VB->ClipPtr->count = VB->Count;
-   }
-
-   VB->AttribPtr[VERT_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0];
-   VB->AttribPtr[VERT_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1];
-   VB->AttribPtr[VERT_ATTRIB_FOG] = &store->results[VERT_RESULT_FOGC];
-   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->results[VERT_RESULT_PSIZ];
-   VB->BackfaceColorPtr = &store->results[VERT_RESULT_BFC0];
-   VB->BackfaceSecondaryColorPtr = &store->results[VERT_RESULT_BFC1];
-
-   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]
-         = &store->results[VERT_RESULT_TEX0 + i];
-   }
-
-   for (i = 0; i < ctx->Const.MaxVarying; i++) {
-      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_VAR0 + i)) {
-         /* Note: varying results get put into the generic attributes */
-	 VB->AttribPtr[VERT_ATTRIB_GENERIC0+i]
-            = &store->results[VERT_RESULT_VAR0 + i];
-      }
-   }
-
-
-   /* Perform NDC and cliptest operations:
-    */
-   return do_ndc_cliptest(ctx, store);
-}
-
-
-/**
- * Called the first time stage->run is called.  In effect, don't
- * allocate data until the first time the stage is run.
- */
-static GLboolean
-init_vp(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &(tnl->vb);
-   struct vp_stage_data *store;
-   const GLuint size = VB->Size;
-   GLuint i;
-
-   stage->privatePtr = MALLOC(sizeof(*store));
-   store = VP_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   /* Allocate arrays of vertex output values */
-   for (i = 0; i < VERT_RESULT_MAX; i++) {
-      _mesa_vector4f_alloc( &store->results[i], 0, size, 32 );
-      store->results[i].size = 4;
-   }
-
-   /* a few other misc allocations */
-   _mesa_vector4f_alloc( &store->ndcCoords, 0, size, 32 );
-   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );
-
-   return GL_TRUE;
-}
-
-
-/**
- * Destructor for this pipeline stage.
- */
-static void
-dtr(struct tnl_pipeline_stage *stage)
-{
-   struct vp_stage_data *store = VP_STAGE_DATA(stage);
-
-   if (store) {
-      GLuint i;
-
-      /* free the vertex program result arrays */
-      for (i = 0; i < VERT_RESULT_MAX; i++)
-         _mesa_vector4f_free( &store->results[i] );
-
-      /* free misc arrays */
-      _mesa_vector4f_free( &store->ndcCoords );
-      _mesa_align_free( store->clipmask );
-
-      FREE( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-
-static void
-validate_vp_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
-{
-   if (ctx->VertexProgram._Current) {
-      _swrast_update_texture_samplers(ctx);
-   }
-}
-
-
-
-/**
- * Public description of this pipeline stage.
- */
-const struct tnl_pipeline_stage _tnl_vertex_program_stage =
-{
-   "vertex-program",
-   NULL,			/* private_data */
-   init_vp,			/* create */
-   dtr,				/* destroy */
-   validate_vp_stage, 		/* validate */
-   run_vp			/* run -- initially set to ctr */
-};
+/*

+ * 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 tnl/t_vb_program.c

+ * \brief Pipeline stage for executing vertex programs.

+ * \author Brian Paul,  Keith Whitwell

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "math/m_xform.h"

+#include "program/prog_instruction.h"

+#include "program/prog_statevars.h"

+#include "program/prog_execute.h"

+#include "swrast/s_context.h"

+

+#include "tnl/tnl.h"

+#include "tnl/t_context.h"

+#include "tnl/t_pipeline.h"

+

+

+#ifdef NAN_CHECK

+/** Check for NaNs and very large values */

+static INLINE void

+check_float(float x)

+{

+   assert(!IS_INF_OR_NAN(x));

+   assert(1.0e-15 <= x && x <= 1.0e15);

+}

+#endif

+

+

+/*!

+ * Private storage for the vertex program pipeline stage.

+ */

+struct vp_stage_data {

+   /** The results of running the vertex program go into these arrays. */

+   GLvector4f results[VERT_RESULT_MAX];

+

+   GLvector4f ndcCoords;              /**< normalized device coords */

+   GLubyte *clipmask;                 /**< clip flags */

+   GLubyte ormask, andmask;           /**< for clipping */

+

+   struct gl_program_machine machine;

+};

+

+

+#define VP_STAGE_DATA(stage) ((struct vp_stage_data *)(stage->privatePtr))

+

+

+static void

+userclip( struct gl_context *ctx,

+          GLvector4f *clip,

+          GLubyte *clipmask,

+          GLubyte *clipormask,

+          GLubyte *clipandmask )

+{

+   GLuint p;

+

+   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

+      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

+	 GLuint nr, i;

+	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

+	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

+	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

+	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

+         GLfloat *coord = (GLfloat *)clip->data;

+         GLuint stride = clip->stride;

+         GLuint count = clip->count;

+

+	 for (nr = 0, i = 0 ; i < count ; i++) {

+	    GLfloat dp = (coord[0] * a + 

+			  coord[1] * b +

+			  coord[2] * c +

+			  coord[3] * d);

+

+	    if (dp < 0) {

+	       nr++;

+	       clipmask[i] |= CLIP_USER_BIT;

+	    }

+

+	    STRIDE_F(coord, stride);

+	 }

+

+	 if (nr > 0) {

+	    *clipormask |= CLIP_USER_BIT;

+	    if (nr == count) {

+	       *clipandmask |= CLIP_USER_BIT;

+	       return;

+	    }

+	 }

+      }

+   }

+}

+

+

+static GLboolean

+do_ndc_cliptest(struct gl_context *ctx, struct vp_stage_data *store)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   /* Cliptest and perspective divide.  Clip functions must clear

+    * the clipmask.

+    */

+   store->ormask = 0;

+   store->andmask = CLIP_FRUSTUM_BITS;

+

+   tnl_clip_prepare(ctx);

+

+   if (tnl->NeedNdcCoords) {

+      VB->NdcPtr =

+         _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,

+                                            &store->ndcCoords,

+                                            store->clipmask,

+                                            &store->ormask,

+                                            &store->andmask,

+					    !ctx->Transform.DepthClamp );

+   }

+   else {

+      VB->NdcPtr = NULL;

+      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,

+                                            NULL,

+                                            store->clipmask,

+                                            &store->ormask,

+                                            &store->andmask,

+					    !ctx->Transform.DepthClamp );

+   }

+

+   if (store->andmask) {

+      /* All vertices are outside the frustum */

+      return GL_FALSE;

+   }

+

+   /* Test userclip planes.  This contributes to VB->ClipMask.

+    */

+   /** XXX NEW_SLANG _Enabled ??? */

+   if (ctx->Transform.ClipPlanesEnabled && (!ctx->VertexProgram._Enabled ||

+      ctx->VertexProgram.Current->IsPositionInvariant)) {

+      userclip( ctx,

+		VB->ClipPtr,

+		store->clipmask,

+		&store->ormask,

+		&store->andmask );

+

+      if (store->andmask) {

+	 return GL_FALSE;

+      }

+   }

+

+   VB->ClipAndMask = store->andmask;

+   VB->ClipOrMask = store->ormask;

+   VB->ClipMask = store->clipmask;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * XXX the texture sampling code in this module is a bit of a hack.

+ * The texture sampling code is in swrast, though it doesn't have any

+ * real dependencies on the rest of swrast.  It should probably be

+ * moved into main/ someday.

+ */

+static void

+vp_fetch_texel(struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lambda,

+               GLuint unit, GLfloat color[4])

+{

+   SWcontext *swrast = SWRAST_CONTEXT(ctx);

+

+   /* XXX use a float-valued TextureSample routine here!!! */

+   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,

+                               1, (const GLfloat (*)[4]) texcoord,

+                               &lambda,  (GLfloat (*)[4]) color);

+}

+

+

+/**

+ * Called via ctx->Driver.ProgramStringNotify() after a new vertex program

+ * string has been parsed.

+ */

+GLboolean

+_tnl_program_string(struct gl_context *ctx, GLenum target, struct gl_program *program)

+{

+   /* No-op.

+    * If we had derived anything from the program that was private to this

+    * stage we'd recompute/validate it here.

+    */

+   return GL_TRUE;

+}

+

+

+/**

+ * Initialize virtual machine state prior to executing vertex program.

+ */

+static void

+init_machine(struct gl_context *ctx, struct gl_program_machine *machine)

+{

+   /* Input registers get initialized from the current vertex attribs */

+   memcpy(machine->VertAttribs, ctx->Current.Attrib,

+          MAX_VERTEX_GENERIC_ATTRIBS * 4 * sizeof(GLfloat));

+

+   if (ctx->VertexProgram._Current->IsNVProgram) {

+      GLuint i;

+      /* Output/result regs are initialized to [0,0,0,1] */

+      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_OUTPUTS; i++) {

+         ASSIGN_4V(machine->Outputs[i], 0.0F, 0.0F, 0.0F, 1.0F);

+      }

+      /* Temp regs are initialized to [0,0,0,0] */

+      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_TEMPS; i++) {

+         ASSIGN_4V(machine->Temporaries[i], 0.0F, 0.0F, 0.0F, 0.0F);

+      }

+      for (i = 0; i < MAX_VERTEX_PROGRAM_ADDRESS_REGS; i++) {

+         ASSIGN_4V(machine->AddressReg[i], 0, 0, 0, 0);

+      }

+   }

+

+   machine->NumDeriv = 0;

+

+   /* init condition codes */

+   machine->CondCodes[0] = COND_EQ;

+   machine->CondCodes[1] = COND_EQ;

+   machine->CondCodes[2] = COND_EQ;

+   machine->CondCodes[3] = COND_EQ;

+

+   /* init call stack */

+   machine->StackDepth = 0;

+

+   machine->FetchTexelLod = vp_fetch_texel;

+   machine->FetchTexelDeriv = NULL; /* not used by vertex programs */

+

+   machine->Samplers = ctx->VertexProgram._Current->Base.SamplerUnits;

+}

+

+

+/**

+ * Map the texture images which the vertex program will access (if any).

+ */

+static void

+map_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)

+{

+   GLuint u;

+

+   if (!ctx->Driver.MapTexture)

+      return;

+

+   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {

+      if (vp->Base.TexturesUsed[u]) {

+         /* Note: _Current *should* correspond to the target indicated

+          * in TexturesUsed[u].

+          */

+         ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[u]._Current);

+      }

+   }

+}

+

+

+/**

+ * Unmap the texture images which were used by the vertex program (if any).

+ */

+static void

+unmap_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)

+{

+   GLuint u;

+

+   if (!ctx->Driver.MapTexture)

+      return;

+

+   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {

+      if (vp->Base.TexturesUsed[u]) {

+         /* Note: _Current *should* correspond to the target indicated

+          * in TexturesUsed[u].

+          */

+         ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current);

+      }

+   }

+}

+

+

+/**

+ * This function executes vertex programs

+ */

+static GLboolean

+run_vp( struct gl_context *ctx, struct tnl_pipeline_stage *stage )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vp_stage_data *store = VP_STAGE_DATA(stage);

+   struct vertex_buffer *VB = &tnl->vb;

+   struct gl_vertex_program *program = ctx->VertexProgram._Current;

+   struct gl_program_machine *machine = &store->machine;

+   GLuint outputs[VERT_RESULT_MAX], numOutputs;

+   GLuint i, j;

+

+   if (!program)

+      return GL_TRUE;

+

+   if (program->IsNVProgram) {

+      _mesa_load_tracked_matrices(ctx);

+   }

+   else {

+      /* ARB program or vertex shader */

+      _mesa_load_state_parameters(ctx, program->Base.Parameters);

+   }

+

+   /* make list of outputs to save some time below */

+   numOutputs = 0;

+   for (i = 0; i < VERT_RESULT_MAX; i++) {

+      if (program->Base.OutputsWritten & BITFIELD64_BIT(i)) {

+         outputs[numOutputs++] = i;

+      }

+   }

+

+   map_textures(ctx, program);

+

+   for (i = 0; i < VB->Count; i++) {

+      GLuint attr;

+

+      init_machine(ctx, machine);

+

+#if 0

+      printf("Input  %d: %f, %f, %f, %f\n", i,

+             VB->AttribPtr[0]->data[i][0],

+             VB->AttribPtr[0]->data[i][1],

+             VB->AttribPtr[0]->data[i][2],

+             VB->AttribPtr[0]->data[i][3]);

+      printf("   color: %f, %f, %f, %f\n",

+             VB->AttribPtr[3]->data[i][0],

+             VB->AttribPtr[3]->data[i][1],

+             VB->AttribPtr[3]->data[i][2],

+             VB->AttribPtr[3]->data[i][3]);

+      printf("  normal: %f, %f, %f, %f\n",

+             VB->AttribPtr[2]->data[i][0],

+             VB->AttribPtr[2]->data[i][1],

+             VB->AttribPtr[2]->data[i][2],

+             VB->AttribPtr[2]->data[i][3]);

+#endif

+

+      /* the vertex array case */

+      for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {

+	 if (program->Base.InputsRead & (1 << attr)) {

+	    const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data;

+	    const GLuint size = VB->AttribPtr[attr]->size;

+	    const GLuint stride = VB->AttribPtr[attr]->stride;

+	    const GLfloat *data = (GLfloat *) (ptr + stride * i);

+#ifdef NAN_CHECK

+            check_float(data[0]);

+            check_float(data[1]);

+            check_float(data[2]);

+            check_float(data[3]);

+#endif

+	    COPY_CLEAN_4V(machine->VertAttribs[attr], size, data);

+	 }

+      }

+

+      /* execute the program */

+      _mesa_execute_program(ctx, &program->Base, machine);

+

+      /* copy the output registers into the VB->attribs arrays */

+      for (j = 0; j < numOutputs; j++) {

+         const GLuint attr = outputs[j];

+#ifdef NAN_CHECK

+         check_float(machine->Outputs[attr][0]);

+         check_float(machine->Outputs[attr][1]);

+         check_float(machine->Outputs[attr][2]);

+         check_float(machine->Outputs[attr][3]);

+#endif

+         COPY_4V(store->results[attr].data[i], machine->Outputs[attr]);

+      }

+

+      /* FOGC is a special case.  Fragment shader expects (f,0,0,1) */

+      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) {

+         store->results[VERT_RESULT_FOGC].data[i][1] = 0.0;

+         store->results[VERT_RESULT_FOGC].data[i][2] = 0.0;

+         store->results[VERT_RESULT_FOGC].data[i][3] = 1.0;

+      }

+#ifdef NAN_CHECK

+      ASSERT(machine->Outputs[0][3] != 0.0F);

+#endif

+#if 0

+      printf("HPOS: %f %f %f %f\n",

+             machine->Outputs[0][0], 

+             machine->Outputs[0][1], 

+             machine->Outputs[0][2], 

+             machine->Outputs[0][3]);

+#endif

+   }

+

+   unmap_textures(ctx, program);

+

+   /* Fixup fog and point size results if needed */

+   if (program->IsNVProgram) {

+      if (ctx->Fog.Enabled &&

+          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) == 0) {

+         for (i = 0; i < VB->Count; i++) {

+            store->results[VERT_RESULT_FOGC].data[i][0] = 1.0;

+         }

+      }

+

+      if (ctx->VertexProgram.PointSizeEnabled &&

+          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) == 0) {

+         for (i = 0; i < VB->Count; i++) {

+            store->results[VERT_RESULT_PSIZ].data[i][0] = ctx->Point.Size;

+         }

+      }

+   }

+

+   if (program->IsPositionInvariant) {

+      /* We need the exact same transform as in the fixed function path here

+       * to guarantee invariance, depending on compiler optimization flags

+       * results could be different otherwise.

+       */

+      VB->ClipPtr = TransformRaw( &store->results[0],

+				  &ctx->_ModelProjectMatrix,

+				  VB->AttribPtr[0] );

+

+      /* Drivers expect this to be clean to element 4...

+       */

+      switch (VB->ClipPtr->size) {

+      case 1:

+	 /* impossible */

+      case 2:

+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );

+	 /* fall-through */

+      case 3:

+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );

+	 /* fall-through */

+      case 4:

+	 break;

+      }

+   }

+   else {

+      /* Setup the VB pointers so that the next pipeline stages get

+       * their data from the right place (the program output arrays).

+       */

+      VB->ClipPtr = &store->results[VERT_RESULT_HPOS];

+      VB->ClipPtr->size = 4;

+      VB->ClipPtr->count = VB->Count;

+   }

+

+   VB->AttribPtr[VERT_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0];

+   VB->AttribPtr[VERT_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1];

+   VB->AttribPtr[VERT_ATTRIB_FOG] = &store->results[VERT_RESULT_FOGC];

+   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->results[VERT_RESULT_PSIZ];

+   VB->BackfaceColorPtr = &store->results[VERT_RESULT_BFC0];

+   VB->BackfaceSecondaryColorPtr = &store->results[VERT_RESULT_BFC1];

+

+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {

+      VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]

+         = &store->results[VERT_RESULT_TEX0 + i];

+   }

+

+   for (i = 0; i < ctx->Const.MaxVarying; i++) {

+      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_VAR0 + i)) {

+         /* Note: varying results get put into the generic attributes */

+	 VB->AttribPtr[VERT_ATTRIB_GENERIC0+i]

+            = &store->results[VERT_RESULT_VAR0 + i];

+      }

+   }

+

+

+   /* Perform NDC and cliptest operations:

+    */

+   return do_ndc_cliptest(ctx, store);

+}

+

+

+/**

+ * Called the first time stage->run is called.  In effect, don't

+ * allocate data until the first time the stage is run.

+ */

+static GLboolean

+init_vp(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &(tnl->vb);

+   struct vp_stage_data *store;

+   const GLuint size = VB->Size;

+   GLuint i;

+

+   stage->privatePtr = CALLOC(sizeof(*store));

+   store = VP_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   /* Allocate arrays of vertex output values */

+   for (i = 0; i < VERT_RESULT_MAX; i++) {

+      _mesa_vector4f_alloc( &store->results[i], 0, size, 32 );

+      store->results[i].size = 4;

+   }

+

+   /* a few other misc allocations */

+   _mesa_vector4f_alloc( &store->ndcCoords, 0, size, 32 );

+   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Destructor for this pipeline stage.

+ */

+static void

+dtr(struct tnl_pipeline_stage *stage)

+{

+   struct vp_stage_data *store = VP_STAGE_DATA(stage);

+

+   if (store) {

+      GLuint i;

+

+      /* free the vertex program result arrays */

+      for (i = 0; i < VERT_RESULT_MAX; i++)

+         _mesa_vector4f_free( &store->results[i] );

+

+      /* free misc arrays */

+      _mesa_vector4f_free( &store->ndcCoords );

+      _mesa_align_free( store->clipmask );

+

+      FREE( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+

+static void

+validate_vp_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

+{

+   if (ctx->VertexProgram._Current) {

+      _swrast_update_texture_samplers(ctx);

+   }

+}

+

+

+

+/**

+ * Public description of this pipeline stage.

+ */

+const struct tnl_pipeline_stage _tnl_vertex_program_stage =

+{

+   "vertex-program",

+   NULL,			/* private_data */

+   init_vp,			/* create */

+   dtr,				/* destroy */

+   validate_vp_stage, 		/* validate */

+   run_vp			/* run -- initially set to ctr */

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_render.c b/mesalib/src/mesa/tnl/t_vb_render.c
index 7d991009a..64dabca98 100644
--- a/mesalib/src/mesa/tnl/t_vb_render.c
+++ b/mesalib/src/mesa/tnl/t_vb_render.c
@@ -1,348 +1,348 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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>
- */
-
-
-/*
- * Render whole vertex buffers, including projection of vertices from
- * clip space and clipping of primitives.
- *
- * This file makes calls to project vertices and to the point, line
- * and triangle rasterizers via the function pointers:
- *
- *    context->Driver.Render.*
- *
- */
-
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/enums.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "math/m_xform.h"
-
-#include "t_pipeline.h"
-
-
-
-/**********************************************************************/
-/*                        Clip single primitives                      */
-/**********************************************************************/
-
-
-#define W(i) coord[i][3]
-#define Z(i) coord[i][2]
-#define Y(i) coord[i][1]
-#define X(i) coord[i][0]
-#define SIZE 4
-#define TAG(x) x##_4
-#include "t_vb_cliptmp.h"
-
-
-
-/**********************************************************************/
-/*              Clip and render whole begin/end objects               */
-/**********************************************************************/
-
-#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)
-#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]
-#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val
-
-
-/* This does NOT include the CLIP_USER_BIT! */
-#define CLIPMASK (CLIP_FRUSTUM_BITS | CLIP_CULL_BIT)
-
-
-/* Vertices, with the possibility of clipping.
- */
-#define RENDER_POINTS( start, count ) \
-   tnl->Driver.Render.Points( ctx, start, count )
-
-#define RENDER_LINE( v1, v2 )			\
-do {						\
-   GLubyte c1 = mask[v1], c2 = mask[v2];	\
-   GLubyte ormask = c1|c2;			\
-   if (!ormask)					\
-      LineFunc( ctx, v1, v2 );			\
-   else if (!(c1 & c2 & CLIPMASK))			\
-      clip_line_4( ctx, v1, v2, ormask );	\
-} while (0)
-
-#define RENDER_TRI( v1, v2, v3 )			\
-do {							\
-   GLubyte c1 = mask[v1], c2 = mask[v2], c3 = mask[v3];	\
-   GLubyte ormask = c1|c2|c3;				\
-   if (!ormask)						\
-      TriangleFunc( ctx, v1, v2, v3 );			\
-   else if (!(c1 & c2 & c3 & CLIPMASK)) 			\
-      clip_tri_4( ctx, v1, v2, v3, ormask );    	\
-} while (0)
-
-#define RENDER_QUAD( v1, v2, v3, v4 )			\
-do {							\
-   GLubyte c1 = mask[v1], c2 = mask[v2];		\
-   GLubyte c3 = mask[v3], c4 = mask[v4];		\
-   GLubyte ormask = c1|c2|c3|c4;			\
-   if (!ormask)						\
-      QuadFunc( ctx, v1, v2, v3, v4 );			\
-   else if (!(c1 & c2 & c3 & c4 & CLIPMASK)) 		\
-      clip_quad_4( ctx, v1, v2, v3, v4, ormask );	\
-} while (0)
-
-
-#define LOCAL_VARS						\
-   TNLcontext *tnl = TNL_CONTEXT(ctx);				\
-   struct vertex_buffer *VB = &tnl->vb;				\
-   const GLuint * const elt = VB->Elts;				\
-   const GLubyte *mask = VB->ClipMask;				\
-   const GLuint sz = VB->ClipPtr->size;				\
-   const tnl_line_func LineFunc = tnl->Driver.Render.Line;		\
-   const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
-   const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;		\
-   const GLboolean stipple = ctx->Line.StippleFlag;		\
-   (void) (LineFunc && TriangleFunc && QuadFunc);		\
-   (void) elt; (void) mask; (void) sz; (void) stipple;
-
-#define TAG(x) clip_##x##_verts
-#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )
-#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )
-#define PRESERVE_VB_DEFS
-#include "t_vb_rendertmp.h"
-
-
-
-/* Elts, with the possibility of clipping.
- */
-#undef ELT
-#undef TAG
-#define ELT(x) elt[x]
-#define TAG(x) clip_##x##_elts
-#include "t_vb_rendertmp.h"
-
-/* TODO: do this for all primitives, verts and elts:
- */
-static void clip_elt_triangles( GLcontext *ctx,
-				GLuint start,
-				GLuint count,
-				GLuint flags )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   tnl_render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];
-   struct vertex_buffer *VB = &tnl->vb;
-   const GLuint * const elt = VB->Elts;
-   GLubyte *mask = VB->ClipMask;
-   GLuint last = count-2;
-   GLuint j;
-   (void) flags;
-
-   tnl->Driver.Render.PrimitiveNotify( ctx, GL_TRIANGLES );
-
-   for (j=start; j < last; j+=3 ) {
-      GLubyte c1 = mask[elt[j]];
-      GLubyte c2 = mask[elt[j+1]];
-      GLubyte c3 = mask[elt[j+2]];
-      GLubyte ormask = c1|c2|c3;
-      if (ormask) {
-	 if (start < j)
-	    render_tris( ctx, start, j, 0 );
-	 if (!(c1&c2&c3&CLIPMASK))
-	    clip_tri_4( ctx, elt[j], elt[j+1], elt[j+2], ormask );
-	 start = j+3;
-      }
-   }
-
-   if (start < j)
-      render_tris( ctx, start, j, 0 );
-}
-
-/**********************************************************************/
-/*                  Render whole begin/end objects                    */
-/**********************************************************************/
-
-#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)
-#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]
-#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val
-
-
-/* Vertices, no clipping.
- */
-#define RENDER_POINTS( start, count ) \
-   tnl->Driver.Render.Points( ctx, start, count )
-
-#define RENDER_LINE( v1, v2 ) \
-   LineFunc( ctx, v1, v2 )
-
-#define RENDER_TRI( v1, v2, v3 ) \
-   TriangleFunc( ctx, v1, v2, v3 )
-
-#define RENDER_QUAD( v1, v2, v3, v4 ) \
-   QuadFunc( ctx, v1, v2, v3, v4 )
-
-#define TAG(x) _tnl_##x##_verts
-
-#define LOCAL_VARS						\
-   TNLcontext *tnl = TNL_CONTEXT(ctx);				\
-   struct vertex_buffer *VB = &tnl->vb;				\
-   const GLuint * const elt = VB->Elts;				\
-   const tnl_line_func LineFunc = tnl->Driver.Render.Line;		\
-   const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
-   const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;		\
-   const GLboolean stipple = ctx->Line.StippleFlag;		\
-   (void) (LineFunc && TriangleFunc && QuadFunc);		\
-   (void) elt; (void) stipple
-
-#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )
-#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )
-#define RENDER_TAB_QUALIFIER
-#define PRESERVE_VB_DEFS
-#include "t_vb_rendertmp.h"
-
-
-/* Elts, no clipping.
- */
-#undef ELT
-#define TAG(x) _tnl_##x##_elts
-#define ELT(x) elt[x]
-#include "t_vb_rendertmp.h"
-
-
-/**********************************************************************/
-/*              Helper functions for drivers                  */
-/**********************************************************************/
-
-void _tnl_RenderClippedPolygon( GLcontext *ctx, const GLuint *elts, GLuint n )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLuint *tmp = VB->Elts;
-
-   VB->Elts = (GLuint *)elts;
-   tnl->Driver.Render.PrimTabElts[GL_POLYGON]( ctx, 0, n, PRIM_BEGIN|PRIM_END );
-   VB->Elts = tmp;
-}
-
-void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   tnl->Driver.Render.Line( ctx, ii, jj );
-}
-
-
-
-/**********************************************************************/
-/*              Clip and render whole vertex buffers                  */
-/**********************************************************************/
-
-
-static GLboolean run_render( GLcontext *ctx,
-			     struct tnl_pipeline_stage *stage )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   tnl_render_func *tab;
-   GLint pass = 0;
-
-   /* Allow the drivers to lock before projected verts are built so
-    * that window coordinates are guarenteed not to change before
-    * rendering.
-    */
-   ASSERT(tnl->Driver.Render.Start);
-
-   tnl->Driver.Render.Start( ctx );
-
-   ASSERT(tnl->Driver.Render.BuildVertices);
-   ASSERT(tnl->Driver.Render.PrimitiveNotify);
-   ASSERT(tnl->Driver.Render.Points);
-   ASSERT(tnl->Driver.Render.Line);
-   ASSERT(tnl->Driver.Render.Triangle);
-   ASSERT(tnl->Driver.Render.Quad);
-   ASSERT(tnl->Driver.Render.ResetLineStipple);
-   ASSERT(tnl->Driver.Render.Interp);
-   ASSERT(tnl->Driver.Render.CopyPV);
-   ASSERT(tnl->Driver.Render.ClippedLine);
-   ASSERT(tnl->Driver.Render.ClippedPolygon);
-   ASSERT(tnl->Driver.Render.Finish);
-
-   tnl->Driver.Render.BuildVertices( ctx, 0, VB->Count, ~0 );
-
-   if (VB->ClipOrMask) {
-      tab = VB->Elts ? clip_render_tab_elts : clip_render_tab_verts;
-      clip_render_tab_elts[GL_TRIANGLES] = clip_elt_triangles;
-   }
-   else {
-      tab = (VB->Elts ? 
-	     tnl->Driver.Render.PrimTabElts : 
-	     tnl->Driver.Render.PrimTabVerts);
-   }
-
-   do
-   {
-      GLuint i;
-
-      for (i = 0 ; i < VB->PrimitiveCount ; i++)
-      {
-	 GLuint prim = _tnl_translate_prim(&VB->Primitive[i]);
-	 GLuint start = VB->Primitive[i].start;
-	 GLuint length = VB->Primitive[i].count;
-
-	 assert((prim & PRIM_MODE_MASK) <= GL_POLYGON);
-
-	 if (MESA_VERBOSE & VERBOSE_PRIMS) 
-	    _mesa_debug(NULL, "MESA prim %s %d..%d\n", 
-			_mesa_lookup_enum_by_nr(prim & PRIM_MODE_MASK), 
-			start, start+length);
-
-	 if (length)
-	    tab[prim & PRIM_MODE_MASK]( ctx, start, start + length, prim );
-      }
-   } while (tnl->Driver.Render.Multipass &&
-	    tnl->Driver.Render.Multipass( ctx, ++pass ));
-
-   tnl->Driver.Render.Finish( ctx );
-
-   return GL_FALSE;		/* finished the pipe */
-}
-
-
-/**********************************************************************/
-/*                          Render pipeline stage                     */
-/**********************************************************************/
-
-
-
-
-
-const struct tnl_pipeline_stage _tnl_render_stage =
-{
-   "render",			/* name */
-   NULL,			/* private data */
-   NULL,			/* creator */
-   NULL,			/* destructor */
-   NULL,			/* validate */
-   run_render			/* run */
-};
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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>

+ */

+

+

+/*

+ * Render whole vertex buffers, including projection of vertices from

+ * clip space and clipping of primitives.

+ *

+ * This file makes calls to project vertices and to the point, line

+ * and triangle rasterizers via the function pointers:

+ *

+ *    context->Driver.Render.*

+ *

+ */

+

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/enums.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+#include "math/m_xform.h"

+

+#include "t_pipeline.h"

+

+

+

+/**********************************************************************/

+/*                        Clip single primitives                      */

+/**********************************************************************/

+

+

+#define W(i) coord[i][3]

+#define Z(i) coord[i][2]

+#define Y(i) coord[i][1]

+#define X(i) coord[i][0]

+#define SIZE 4

+#define TAG(x) x##_4

+#include "t_vb_cliptmp.h"

+

+

+

+/**********************************************************************/

+/*              Clip and render whole begin/end objects               */

+/**********************************************************************/

+

+#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)

+#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]

+#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val

+

+

+/* This does NOT include the CLIP_USER_BIT! */

+#define CLIPMASK (CLIP_FRUSTUM_BITS | CLIP_CULL_BIT)

+

+

+/* Vertices, with the possibility of clipping.

+ */

+#define RENDER_POINTS( start, count ) \

+   tnl->Driver.Render.Points( ctx, start, count )

+

+#define RENDER_LINE( v1, v2 )			\

+do {						\

+   GLubyte c1 = mask[v1], c2 = mask[v2];	\

+   GLubyte ormask = c1|c2;			\

+   if (!ormask)					\

+      LineFunc( ctx, v1, v2 );			\

+   else if (!(c1 & c2 & CLIPMASK))			\

+      clip_line_4( ctx, v1, v2, ormask );	\

+} while (0)

+

+#define RENDER_TRI( v1, v2, v3 )			\

+do {							\

+   GLubyte c1 = mask[v1], c2 = mask[v2], c3 = mask[v3];	\

+   GLubyte ormask = c1|c2|c3;				\

+   if (!ormask)						\

+      TriangleFunc( ctx, v1, v2, v3 );			\

+   else if (!(c1 & c2 & c3 & CLIPMASK)) 			\

+      clip_tri_4( ctx, v1, v2, v3, ormask );    	\

+} while (0)

+

+#define RENDER_QUAD( v1, v2, v3, v4 )			\

+do {							\

+   GLubyte c1 = mask[v1], c2 = mask[v2];		\

+   GLubyte c3 = mask[v3], c4 = mask[v4];		\

+   GLubyte ormask = c1|c2|c3|c4;			\

+   if (!ormask)						\

+      QuadFunc( ctx, v1, v2, v3, v4 );			\

+   else if (!(c1 & c2 & c3 & c4 & CLIPMASK)) 		\

+      clip_quad_4( ctx, v1, v2, v3, v4, ormask );	\

+} while (0)

+

+

+#define LOCAL_VARS						\

+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\

+   struct vertex_buffer *VB = &tnl->vb;				\

+   const GLuint * const elt = VB->Elts;				\

+   const GLubyte *mask = VB->ClipMask;				\

+   const GLuint sz = VB->ClipPtr->size;				\

+   const tnl_line_func LineFunc = tnl->Driver.Render.Line;		\

+   const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\

+   const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;		\

+   const GLboolean stipple = ctx->Line.StippleFlag;		\

+   (void) (LineFunc && TriangleFunc && QuadFunc);		\

+   (void) elt; (void) mask; (void) sz; (void) stipple;

+

+#define TAG(x) clip_##x##_verts

+#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )

+#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )

+#define PRESERVE_VB_DEFS

+#include "t_vb_rendertmp.h"

+

+

+

+/* Elts, with the possibility of clipping.

+ */

+#undef ELT

+#undef TAG

+#define ELT(x) elt[x]

+#define TAG(x) clip_##x##_elts

+#include "t_vb_rendertmp.h"

+

+/* TODO: do this for all primitives, verts and elts:

+ */

+static void clip_elt_triangles( struct gl_context *ctx,

+				GLuint start,

+				GLuint count,

+				GLuint flags )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl_render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];

+   struct vertex_buffer *VB = &tnl->vb;

+   const GLuint * const elt = VB->Elts;

+   GLubyte *mask = VB->ClipMask;

+   GLuint last = count-2;

+   GLuint j;

+   (void) flags;

+

+   tnl->Driver.Render.PrimitiveNotify( ctx, GL_TRIANGLES );

+

+   for (j=start; j < last; j+=3 ) {

+      GLubyte c1 = mask[elt[j]];

+      GLubyte c2 = mask[elt[j+1]];

+      GLubyte c3 = mask[elt[j+2]];

+      GLubyte ormask = c1|c2|c3;

+      if (ormask) {

+	 if (start < j)

+	    render_tris( ctx, start, j, 0 );

+	 if (!(c1&c2&c3&CLIPMASK))

+	    clip_tri_4( ctx, elt[j], elt[j+1], elt[j+2], ormask );

+	 start = j+3;

+      }

+   }

+

+   if (start < j)

+      render_tris( ctx, start, j, 0 );

+}

+

+/**********************************************************************/

+/*                  Render whole begin/end objects                    */

+/**********************************************************************/

+

+#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)

+#define EDGEFLAG_GET(idx) VB->EdgeFlag[idx]

+#define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val

+

+

+/* Vertices, no clipping.

+ */

+#define RENDER_POINTS( start, count ) \

+   tnl->Driver.Render.Points( ctx, start, count )

+

+#define RENDER_LINE( v1, v2 ) \

+   LineFunc( ctx, v1, v2 )

+

+#define RENDER_TRI( v1, v2, v3 ) \

+   TriangleFunc( ctx, v1, v2, v3 )

+

+#define RENDER_QUAD( v1, v2, v3, v4 ) \

+   QuadFunc( ctx, v1, v2, v3, v4 )

+

+#define TAG(x) _tnl_##x##_verts

+

+#define LOCAL_VARS						\

+   TNLcontext *tnl = TNL_CONTEXT(ctx);				\

+   struct vertex_buffer *VB = &tnl->vb;				\

+   const GLuint * const elt = VB->Elts;				\

+   const tnl_line_func LineFunc = tnl->Driver.Render.Line;		\

+   const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\

+   const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;		\

+   const GLboolean stipple = ctx->Line.StippleFlag;		\

+   (void) (LineFunc && TriangleFunc && QuadFunc);		\

+   (void) elt; (void) stipple

+

+#define RESET_STIPPLE if (stipple) tnl->Driver.Render.ResetLineStipple( ctx )

+#define INIT(x) tnl->Driver.Render.PrimitiveNotify( ctx, x )

+#define RENDER_TAB_QUALIFIER

+#define PRESERVE_VB_DEFS

+#include "t_vb_rendertmp.h"

+

+

+/* Elts, no clipping.

+ */

+#undef ELT

+#define TAG(x) _tnl_##x##_elts

+#define ELT(x) elt[x]

+#include "t_vb_rendertmp.h"

+

+

+/**********************************************************************/

+/*              Helper functions for drivers                  */

+/**********************************************************************/

+

+void _tnl_RenderClippedPolygon( struct gl_context *ctx, const GLuint *elts, GLuint n )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLuint *tmp = VB->Elts;

+

+   VB->Elts = (GLuint *)elts;

+   tnl->Driver.Render.PrimTabElts[GL_POLYGON]( ctx, 0, n, PRIM_BEGIN|PRIM_END );

+   VB->Elts = tmp;

+}

+

+void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   tnl->Driver.Render.Line( ctx, ii, jj );

+}

+

+

+

+/**********************************************************************/

+/*              Clip and render whole vertex buffers                  */

+/**********************************************************************/

+

+

+static GLboolean run_render( struct gl_context *ctx,

+			     struct tnl_pipeline_stage *stage )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   tnl_render_func *tab;

+   GLint pass = 0;

+

+   /* Allow the drivers to lock before projected verts are built so

+    * that window coordinates are guarenteed not to change before

+    * rendering.

+    */

+   ASSERT(tnl->Driver.Render.Start);

+

+   tnl->Driver.Render.Start( ctx );

+

+   ASSERT(tnl->Driver.Render.BuildVertices);

+   ASSERT(tnl->Driver.Render.PrimitiveNotify);

+   ASSERT(tnl->Driver.Render.Points);

+   ASSERT(tnl->Driver.Render.Line);

+   ASSERT(tnl->Driver.Render.Triangle);

+   ASSERT(tnl->Driver.Render.Quad);

+   ASSERT(tnl->Driver.Render.ResetLineStipple);

+   ASSERT(tnl->Driver.Render.Interp);

+   ASSERT(tnl->Driver.Render.CopyPV);

+   ASSERT(tnl->Driver.Render.ClippedLine);

+   ASSERT(tnl->Driver.Render.ClippedPolygon);

+   ASSERT(tnl->Driver.Render.Finish);

+

+   tnl->Driver.Render.BuildVertices( ctx, 0, VB->Count, ~0 );

+

+   if (VB->ClipOrMask) {

+      tab = VB->Elts ? clip_render_tab_elts : clip_render_tab_verts;

+      clip_render_tab_elts[GL_TRIANGLES] = clip_elt_triangles;

+   }

+   else {

+      tab = (VB->Elts ? 

+	     tnl->Driver.Render.PrimTabElts : 

+	     tnl->Driver.Render.PrimTabVerts);

+   }

+

+   do

+   {

+      GLuint i;

+

+      for (i = 0 ; i < VB->PrimitiveCount ; i++)

+      {

+	 GLuint prim = _tnl_translate_prim(&VB->Primitive[i]);

+	 GLuint start = VB->Primitive[i].start;

+	 GLuint length = VB->Primitive[i].count;

+

+	 assert((prim & PRIM_MODE_MASK) <= GL_POLYGON);

+

+	 if (MESA_VERBOSE & VERBOSE_PRIMS) 

+	    _mesa_debug(NULL, "MESA prim %s %d..%d\n", 

+			_mesa_lookup_enum_by_nr(prim & PRIM_MODE_MASK), 

+			start, start+length);

+

+	 if (length)

+	    tab[prim & PRIM_MODE_MASK]( ctx, start, start + length, prim );

+      }

+   } while (tnl->Driver.Render.Multipass &&

+	    tnl->Driver.Render.Multipass( ctx, ++pass ));

+

+   tnl->Driver.Render.Finish( ctx );

+

+   return GL_FALSE;		/* finished the pipe */

+}

+

+

+/**********************************************************************/

+/*                          Render pipeline stage                     */

+/**********************************************************************/

+

+

+

+

+

+const struct tnl_pipeline_stage _tnl_render_stage =

+{

+   "render",			/* name */

+   NULL,			/* private data */

+   NULL,			/* creator */

+   NULL,			/* destructor */

+   NULL,			/* validate */

+   run_render			/* run */

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_rendertmp.h b/mesalib/src/mesa/tnl/t_vb_rendertmp.h
index 75f6f55bd..92dbf219d 100644
--- a/mesalib/src/mesa/tnl/t_vb_rendertmp.h
+++ b/mesalib/src/mesa/tnl/t_vb_rendertmp.h
@@ -1,486 +1,486 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  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>
- */
-
-
-#ifndef POSTFIX
-#define POSTFIX
-#endif
-
-#ifndef INIT
-#define INIT(x)
-#endif
-
-#ifndef NEED_EDGEFLAG_SETUP
-#define NEED_EDGEFLAG_SETUP 0
-#define EDGEFLAG_GET(a) 0
-#define EDGEFLAG_SET(a,b) (void)b
-#endif
-
-#ifndef RESET_STIPPLE
-#define RESET_STIPPLE
-#endif
-
-#ifndef TEST_PRIM_END
-#define TEST_PRIM_END(prim) (flags & PRIM_END)
-#define TEST_PRIM_BEGIN(prim) (flags & PRIM_BEGIN)
-#endif
-
-#ifndef ELT
-#define ELT(x) x
-#endif
-
-#ifndef RENDER_TAB_QUALIFIER
-#define RENDER_TAB_QUALIFIER static
-#endif
-
-static void TAG(render_points)( GLcontext *ctx,
-				GLuint start,
-				GLuint count,
-				GLuint flags )
-{
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_POINTS);
-   RENDER_POINTS( start, count );
-   POSTFIX;
-}
-
-static void TAG(render_lines)( GLcontext *ctx,
-			       GLuint start,
-			       GLuint count,
-			       GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_LINES);
-   for (j=start+1; j<count; j+=2 ) {
-      RESET_STIPPLE;
-      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-         RENDER_LINE( ELT(j-1), ELT(j) );
-      else
-         RENDER_LINE( ELT(j), ELT(j-1) );
-   }
-   POSTFIX;
-}
-
-
-static void TAG(render_line_strip)( GLcontext *ctx,
-				    GLuint start,
-				    GLuint count,
-				    GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_LINE_STRIP);
-
-   if (TEST_PRIM_BEGIN(flags)) {
-      RESET_STIPPLE;
-   }
-
-   for (j=start+1; j<count; j++ ) {
-      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-         RENDER_LINE( ELT(j-1), ELT(j) );
-      else
-         RENDER_LINE( ELT(j), ELT(j-1) );
-   }
-   POSTFIX;
-}
-
-
-static void TAG(render_line_loop)( GLcontext *ctx,
-				   GLuint start,
-				   GLuint count,
-				   GLuint flags )
-{
-   GLuint i;
-   LOCAL_VARS;
-
-   (void) flags;
-
-   INIT(GL_LINE_LOOP);
-
-   if (start+1 < count) {
-      if (TEST_PRIM_BEGIN(flags)) {
-	 RESET_STIPPLE;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_LINE( ELT(start), ELT(start+1) );
-         else
-            RENDER_LINE( ELT(start+1), ELT(start) );
-      }
-
-      for ( i = start+2 ; i < count ; i++) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_LINE( ELT(i-1), ELT(i) );
-         else
-            RENDER_LINE( ELT(i), ELT(i-1) );
-      }
-
-      if ( TEST_PRIM_END(flags)) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_LINE( ELT(count-1), ELT(start) );
-         else
-            RENDER_LINE( ELT(start), ELT(count-1) );
-      }
-   }
-
-   POSTFIX;
-}
-
-
-static void TAG(render_triangles)( GLcontext *ctx,
-				   GLuint start,
-				   GLuint count,
-				   GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_TRIANGLES);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+2; j<count; j+=3) {
-	 /* Leave the edgeflags as supplied by the user.
-	  */
-	 RESET_STIPPLE;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );
-      }
-   } else {
-      for (j=start+2; j<count; j+=3) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );
-      }
-   }
-   POSTFIX;
-}
-
-
-
-static void TAG(render_tri_strip)( GLcontext *ctx,
-				   GLuint start,
-				   GLuint count,
-				   GLuint flags )
-{
-   GLuint j;
-   GLuint parity = 0;
-   LOCAL_VARS;
-
-   INIT(GL_TRIANGLE_STRIP);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+2;j<count;j++,parity^=1) {
-         GLuint ej2, ej1, ej;
-         GLboolean ef2, ef1, ef;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT) {
-            ej2 = ELT(j-2+parity);
-            ej1 = ELT(j-1-parity);
-            ej = ELT(j);
-         }
-         else {
-            ej2 = ELT(j-1+parity);
-            ej1 = ELT(j-parity);
-            ej = ELT(j-2);
-         }
-	 ef2 = EDGEFLAG_GET( ej2 );
-	 ef1 = EDGEFLAG_GET( ej1 );
-	 ef = EDGEFLAG_GET( ej );
-	 if (TEST_PRIM_BEGIN(flags)) {
-	    RESET_STIPPLE;
-	 }
-	 EDGEFLAG_SET( ej2, GL_TRUE );
-	 EDGEFLAG_SET( ej1, GL_TRUE );
-	 EDGEFLAG_SET( ej, GL_TRUE );
-         RENDER_TRI( ej2, ej1, ej );
-	 EDGEFLAG_SET( ej2, ef2 );
-	 EDGEFLAG_SET( ej1, ef1 );
-	 EDGEFLAG_SET( ej, ef );
-      }
-   } else {
-      for (j=start+2; j<count ; j++, parity^=1) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );
-         else
-            RENDER_TRI( ELT(j-1+parity), ELT(j-parity), ELT(j-2) );
-      }
-   }
-   POSTFIX;
-}
-
-
-static void TAG(render_tri_fan)( GLcontext *ctx,
-				 GLuint start,
-				 GLuint count,
-				 GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_TRIANGLE_FAN);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+2;j<count;j++) {
-	 /* For trifans, all edges are boundary.
-	  */
-	 GLuint ejs = ELT(start);
-	 GLuint ej1 = ELT(j-1);
-	 GLuint ej = ELT(j);
-	 GLboolean efs = EDGEFLAG_GET( ejs );
-	 GLboolean ef1 = EDGEFLAG_GET( ej1 );
-	 GLboolean ef = EDGEFLAG_GET( ej );
-	 if (TEST_PRIM_BEGIN(flags)) {
-	    RESET_STIPPLE;
-	 }
-	 EDGEFLAG_SET( ejs, GL_TRUE );
-	 EDGEFLAG_SET( ej1, GL_TRUE );
-	 EDGEFLAG_SET( ej, GL_TRUE );
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ejs, ej1, ej);
-         else
-            RENDER_TRI( ej, ejs, ej1);
-	 EDGEFLAG_SET( ejs, efs );
-	 EDGEFLAG_SET( ej1, ef1 );
-	 EDGEFLAG_SET( ej, ef );
-      }
-   } else {
-      for (j=start+2;j<count;j++) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)
-            RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );
-         else
-            RENDER_TRI( ELT(j), ELT(start), ELT(j-1) );
-      }
-   }
-
-   POSTFIX;
-}
-
-
-static void TAG(render_poly)( GLcontext *ctx,
-			      GLuint start,
-			      GLuint count,
-			      GLuint flags )
-{
-   GLuint j = start+2;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_POLYGON);
-   if (NEED_EDGEFLAG_SETUP) {
-      GLboolean efstart = EDGEFLAG_GET( ELT(start) );
-      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );
-
-      /* If the primitive does not begin here, the first edge
-       * is non-boundary.
-       */
-      if (!TEST_PRIM_BEGIN(flags))
-	 EDGEFLAG_SET( ELT(start), GL_FALSE );
-      else {
-	 RESET_STIPPLE;
-      }
-
-      /* If the primitive does not end here, the final edge is
-       * non-boundary.
-       */
-      if (!TEST_PRIM_END(flags))
-	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );
-
-      /* Draw the first triangles (possibly zero)
-       */
-      if (j+1<count) {
-	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
-	 EDGEFLAG_SET( ELT(j), GL_FALSE );
-	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-	 EDGEFLAG_SET( ELT(j), ef );
-	 j++;
-
-	 /* Don't render the first edge again:
-	  */
-	 EDGEFLAG_SET( ELT(start), GL_FALSE );
-
-	 for (;j+1<count;j++) {
-	    GLboolean efj = EDGEFLAG_GET( ELT(j) );
-	    EDGEFLAG_SET( ELT(j), GL_FALSE );
-	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-	    EDGEFLAG_SET( ELT(j), efj );
-	 }
-      }
-
-      /* Draw the last or only triangle
-       */
-      if (j < count)
-	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-
-      /* Restore the first and last edgeflags:
-       */
-      EDGEFLAG_SET( ELT(count-1), efcount );
-      EDGEFLAG_SET( ELT(start), efstart );
-
-   }
-   else {
-      for (j=start+2;j<count;j++) {
-	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );
-      }
-   }
-   POSTFIX;
-}
-
-static void TAG(render_quads)( GLcontext *ctx,
-			       GLuint start,
-			       GLuint count,
-			       GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_QUADS);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+3; j<count; j+=4) {
-	 /* Use user-specified edgeflags for quads.
-	  */
-	 RESET_STIPPLE;
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );
-      }
-   } else {
-      for (j=start+3; j<count; j+=4) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );
-      }
-   }
-   POSTFIX;
-}
-
-static void TAG(render_quad_strip)( GLcontext *ctx,
-				    GLuint start,
-				    GLuint count,
-				    GLuint flags )
-{
-   GLuint j;
-   LOCAL_VARS;
-   (void) flags;
-
-   INIT(GL_QUAD_STRIP);
-   if (NEED_EDGEFLAG_SETUP) {
-      for (j=start+3;j<count;j+=2) {
-	 /* All edges are boundary.  Set edgeflags to 1, draw the
-	  * quad, and restore them to the original values.
-	  */
-	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );
-	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );
-	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );
-	 GLboolean ef = EDGEFLAG_GET( ELT(j) );
-	 if (TEST_PRIM_BEGIN(flags)) {
-	    RESET_STIPPLE;
-	 }
-	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );
-	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );
-	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );
-	 EDGEFLAG_SET( ELT(j), GL_TRUE );
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );
-	 EDGEFLAG_SET( ELT(j-3), ef3 );
-	 EDGEFLAG_SET( ELT(j-2), ef2 );
-	 EDGEFLAG_SET( ELT(j-1), ef1 );
-	 EDGEFLAG_SET( ELT(j), ef );
-      }
-   } else {
-      for (j=start+3;j<count;j+=2) {
-         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||
-             !ctx->Const.QuadsFollowProvokingVertexConvention)
-            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );
-         else
-            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );
-      }
-   }
-   POSTFIX;
-}
-
-static void TAG(render_noop)( GLcontext *ctx,
-			      GLuint start,
-			      GLuint count,
-			      GLuint flags )
-{
-   (void)(ctx && start && count && flags);
-}
-
-RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *,
-							   GLuint,
-							   GLuint,
-							   GLuint) =
-{
-   TAG(render_points),
-   TAG(render_lines),
-   TAG(render_line_loop),
-   TAG(render_line_strip),
-   TAG(render_triangles),
-   TAG(render_tri_strip),
-   TAG(render_tri_fan),
-   TAG(render_quads),
-   TAG(render_quad_strip),
-   TAG(render_poly),
-   TAG(render_noop),
-};
-
-
-
-#ifndef PRESERVE_VB_DEFS
-#undef RENDER_TRI
-#undef RENDER_QUAD
-#undef RENDER_LINE
-#undef RENDER_POINTS
-#undef LOCAL_VARS
-#undef INIT
-#undef POSTFIX
-#undef RESET_STIPPLE
-#undef DBG
-#undef ELT
-#undef RENDER_TAB_QUALIFIER
-#endif
-
-#ifndef PRESERVE_TAG
-#undef TAG
-#endif
-
-#undef PRESERVE_VB_DEFS
-#undef PRESERVE_TAG
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 1999-2005  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>

+ */

+

+

+#ifndef POSTFIX

+#define POSTFIX

+#endif

+

+#ifndef INIT

+#define INIT(x)

+#endif

+

+#ifndef NEED_EDGEFLAG_SETUP

+#define NEED_EDGEFLAG_SETUP 0

+#define EDGEFLAG_GET(a) 0

+#define EDGEFLAG_SET(a,b) (void)b

+#endif

+

+#ifndef RESET_STIPPLE

+#define RESET_STIPPLE

+#endif

+

+#ifndef TEST_PRIM_END

+#define TEST_PRIM_END(prim) (flags & PRIM_END)

+#define TEST_PRIM_BEGIN(prim) (flags & PRIM_BEGIN)

+#endif

+

+#ifndef ELT

+#define ELT(x) x

+#endif

+

+#ifndef RENDER_TAB_QUALIFIER

+#define RENDER_TAB_QUALIFIER static

+#endif

+

+static void TAG(render_points)( struct gl_context *ctx,

+				GLuint start,

+				GLuint count,

+				GLuint flags )

+{

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_POINTS);

+   RENDER_POINTS( start, count );

+   POSTFIX;

+}

+

+static void TAG(render_lines)( struct gl_context *ctx,

+			       GLuint start,

+			       GLuint count,

+			       GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_LINES);

+   for (j=start+1; j<count; j+=2 ) {

+      RESET_STIPPLE;

+      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+         RENDER_LINE( ELT(j-1), ELT(j) );

+      else

+         RENDER_LINE( ELT(j), ELT(j-1) );

+   }

+   POSTFIX;

+}

+

+

+static void TAG(render_line_strip)( struct gl_context *ctx,

+				    GLuint start,

+				    GLuint count,

+				    GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_LINE_STRIP);

+

+   if (TEST_PRIM_BEGIN(flags)) {

+      RESET_STIPPLE;

+   }

+

+   for (j=start+1; j<count; j++ ) {

+      if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+         RENDER_LINE( ELT(j-1), ELT(j) );

+      else

+         RENDER_LINE( ELT(j), ELT(j-1) );

+   }

+   POSTFIX;

+}

+

+

+static void TAG(render_line_loop)( struct gl_context *ctx,

+				   GLuint start,

+				   GLuint count,

+				   GLuint flags )

+{

+   GLuint i;

+   LOCAL_VARS;

+

+   (void) flags;

+

+   INIT(GL_LINE_LOOP);

+

+   if (start+1 < count) {

+      if (TEST_PRIM_BEGIN(flags)) {

+	 RESET_STIPPLE;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_LINE( ELT(start), ELT(start+1) );

+         else

+            RENDER_LINE( ELT(start+1), ELT(start) );

+      }

+

+      for ( i = start+2 ; i < count ; i++) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_LINE( ELT(i-1), ELT(i) );

+         else

+            RENDER_LINE( ELT(i), ELT(i-1) );

+      }

+

+      if ( TEST_PRIM_END(flags)) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_LINE( ELT(count-1), ELT(start) );

+         else

+            RENDER_LINE( ELT(start), ELT(count-1) );

+      }

+   }

+

+   POSTFIX;

+}

+

+

+static void TAG(render_triangles)( struct gl_context *ctx,

+				   GLuint start,

+				   GLuint count,

+				   GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_TRIANGLES);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+2; j<count; j+=3) {

+	 /* Leave the edgeflags as supplied by the user.

+	  */

+	 RESET_STIPPLE;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );

+      }

+   } else {

+      for (j=start+2; j<count; j+=3) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_TRI( ELT(j-1), ELT(j), ELT(j-2) );

+      }

+   }

+   POSTFIX;

+}

+

+

+

+static void TAG(render_tri_strip)( struct gl_context *ctx,

+				   GLuint start,

+				   GLuint count,

+				   GLuint flags )

+{

+   GLuint j;

+   GLuint parity = 0;

+   LOCAL_VARS;

+

+   INIT(GL_TRIANGLE_STRIP);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+2;j<count;j++,parity^=1) {

+         GLuint ej2, ej1, ej;

+         GLboolean ef2, ef1, ef;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT) {

+            ej2 = ELT(j-2+parity);

+            ej1 = ELT(j-1-parity);

+            ej = ELT(j);

+         }

+         else {

+            ej2 = ELT(j-1+parity);

+            ej1 = ELT(j-parity);

+            ej = ELT(j-2);

+         }

+	 ef2 = EDGEFLAG_GET( ej2 );

+	 ef1 = EDGEFLAG_GET( ej1 );

+	 ef = EDGEFLAG_GET( ej );

+	 if (TEST_PRIM_BEGIN(flags)) {

+	    RESET_STIPPLE;

+	 }

+	 EDGEFLAG_SET( ej2, GL_TRUE );

+	 EDGEFLAG_SET( ej1, GL_TRUE );

+	 EDGEFLAG_SET( ej, GL_TRUE );

+         RENDER_TRI( ej2, ej1, ej );

+	 EDGEFLAG_SET( ej2, ef2 );

+	 EDGEFLAG_SET( ej1, ef1 );

+	 EDGEFLAG_SET( ej, ef );

+      }

+   } else {

+      for (j=start+2; j<count ; j++, parity^=1) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(j-2+parity), ELT(j-1-parity), ELT(j) );

+         else

+            RENDER_TRI( ELT(j-1+parity), ELT(j-parity), ELT(j-2) );

+      }

+   }

+   POSTFIX;

+}

+

+

+static void TAG(render_tri_fan)( struct gl_context *ctx,

+				 GLuint start,

+				 GLuint count,

+				 GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_TRIANGLE_FAN);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+2;j<count;j++) {

+	 /* For trifans, all edges are boundary.

+	  */

+	 GLuint ejs = ELT(start);

+	 GLuint ej1 = ELT(j-1);

+	 GLuint ej = ELT(j);

+	 GLboolean efs = EDGEFLAG_GET( ejs );

+	 GLboolean ef1 = EDGEFLAG_GET( ej1 );

+	 GLboolean ef = EDGEFLAG_GET( ej );

+	 if (TEST_PRIM_BEGIN(flags)) {

+	    RESET_STIPPLE;

+	 }

+	 EDGEFLAG_SET( ejs, GL_TRUE );

+	 EDGEFLAG_SET( ej1, GL_TRUE );

+	 EDGEFLAG_SET( ej, GL_TRUE );

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ejs, ej1, ej);

+         else

+            RENDER_TRI( ej, ejs, ej1);

+	 EDGEFLAG_SET( ejs, efs );

+	 EDGEFLAG_SET( ej1, ef1 );

+	 EDGEFLAG_SET( ej, ef );

+      }

+   } else {

+      for (j=start+2;j<count;j++) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT)

+            RENDER_TRI( ELT(start), ELT(j-1), ELT(j) );

+         else

+            RENDER_TRI( ELT(j), ELT(start), ELT(j-1) );

+      }

+   }

+

+   POSTFIX;

+}

+

+

+static void TAG(render_poly)( struct gl_context *ctx,

+			      GLuint start,

+			      GLuint count,

+			      GLuint flags )

+{

+   GLuint j = start+2;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_POLYGON);

+   if (NEED_EDGEFLAG_SETUP) {

+      GLboolean efstart = EDGEFLAG_GET( ELT(start) );

+      GLboolean efcount = EDGEFLAG_GET( ELT(count-1) );

+

+      /* If the primitive does not begin here, the first edge

+       * is non-boundary.

+       */

+      if (!TEST_PRIM_BEGIN(flags))

+	 EDGEFLAG_SET( ELT(start), GL_FALSE );

+      else {

+	 RESET_STIPPLE;

+      }

+

+      /* If the primitive does not end here, the final edge is

+       * non-boundary.

+       */

+      if (!TEST_PRIM_END(flags))

+	 EDGEFLAG_SET( ELT(count-1), GL_FALSE );

+

+      /* Draw the first triangles (possibly zero)

+       */

+      if (j+1<count) {

+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );

+	 EDGEFLAG_SET( ELT(j), GL_FALSE );

+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+	 EDGEFLAG_SET( ELT(j), ef );

+	 j++;

+

+	 /* Don't render the first edge again:

+	  */

+	 EDGEFLAG_SET( ELT(start), GL_FALSE );

+

+	 for (;j+1<count;j++) {

+	    GLboolean efj = EDGEFLAG_GET( ELT(j) );

+	    EDGEFLAG_SET( ELT(j), GL_FALSE );

+	    RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+	    EDGEFLAG_SET( ELT(j), efj );

+	 }

+      }

+

+      /* Draw the last or only triangle

+       */

+      if (j < count)

+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+

+      /* Restore the first and last edgeflags:

+       */

+      EDGEFLAG_SET( ELT(count-1), efcount );

+      EDGEFLAG_SET( ELT(start), efstart );

+

+   }

+   else {

+      for (j=start+2;j<count;j++) {

+	 RENDER_TRI( ELT(j-1), ELT(j), ELT(start) );

+      }

+   }

+   POSTFIX;

+}

+

+static void TAG(render_quads)( struct gl_context *ctx,

+			       GLuint start,

+			       GLuint count,

+			       GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_QUADS);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+3; j<count; j+=4) {

+	 /* Use user-specified edgeflags for quads.

+	  */

+	 RESET_STIPPLE;

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );

+      }

+   } else {

+      for (j=start+3; j<count; j+=4) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-3), ELT(j-2), ELT(j-1), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j-1), ELT(j), ELT(j-3) );

+      }

+   }

+   POSTFIX;

+}

+

+static void TAG(render_quad_strip)( struct gl_context *ctx,

+				    GLuint start,

+				    GLuint count,

+				    GLuint flags )

+{

+   GLuint j;

+   LOCAL_VARS;

+   (void) flags;

+

+   INIT(GL_QUAD_STRIP);

+   if (NEED_EDGEFLAG_SETUP) {

+      for (j=start+3;j<count;j+=2) {

+	 /* All edges are boundary.  Set edgeflags to 1, draw the

+	  * quad, and restore them to the original values.

+	  */

+	 GLboolean ef3 = EDGEFLAG_GET( ELT(j-3) );

+	 GLboolean ef2 = EDGEFLAG_GET( ELT(j-2) );

+	 GLboolean ef1 = EDGEFLAG_GET( ELT(j-1) );

+	 GLboolean ef = EDGEFLAG_GET( ELT(j) );

+	 if (TEST_PRIM_BEGIN(flags)) {

+	    RESET_STIPPLE;

+	 }

+	 EDGEFLAG_SET( ELT(j-3), GL_TRUE );

+	 EDGEFLAG_SET( ELT(j-2), GL_TRUE );

+	 EDGEFLAG_SET( ELT(j-1), GL_TRUE );

+	 EDGEFLAG_SET( ELT(j), GL_TRUE );

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );

+	 EDGEFLAG_SET( ELT(j-3), ef3 );

+	 EDGEFLAG_SET( ELT(j-2), ef2 );

+	 EDGEFLAG_SET( ELT(j-1), ef1 );

+	 EDGEFLAG_SET( ELT(j), ef );

+      }

+   } else {

+      for (j=start+3;j<count;j+=2) {

+         if (ctx->Light.ProvokingVertex == GL_LAST_VERTEX_CONVENTION_EXT ||

+             !ctx->Const.QuadsFollowProvokingVertexConvention)

+            RENDER_QUAD( ELT(j-1), ELT(j-3), ELT(j-2), ELT(j) );

+         else

+            RENDER_QUAD( ELT(j-2), ELT(j), ELT(j-1), ELT(j-3) );

+      }

+   }

+   POSTFIX;

+}

+

+static void TAG(render_noop)( struct gl_context *ctx,

+			      GLuint start,

+			      GLuint count,

+			      GLuint flags )

+{

+   (void)(ctx && start && count && flags);

+}

+

+RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(struct gl_context *,

+							   GLuint,

+							   GLuint,

+							   GLuint) =

+{

+   TAG(render_points),

+   TAG(render_lines),

+   TAG(render_line_loop),

+   TAG(render_line_strip),

+   TAG(render_triangles),

+   TAG(render_tri_strip),

+   TAG(render_tri_fan),

+   TAG(render_quads),

+   TAG(render_quad_strip),

+   TAG(render_poly),

+   TAG(render_noop),

+};

+

+

+

+#ifndef PRESERVE_VB_DEFS

+#undef RENDER_TRI

+#undef RENDER_QUAD

+#undef RENDER_LINE

+#undef RENDER_POINTS

+#undef LOCAL_VARS

+#undef INIT

+#undef POSTFIX

+#undef RESET_STIPPLE

+#undef DBG

+#undef ELT

+#undef RENDER_TAB_QUALIFIER

+#endif

+

+#ifndef PRESERVE_TAG

+#undef TAG

+#endif

+

+#undef PRESERVE_VB_DEFS

+#undef PRESERVE_TAG

diff --git a/mesalib/src/mesa/tnl/t_vb_texgen.c b/mesalib/src/mesa/tnl/t_vb_texgen.c
index 950e0f54e..228808461 100644
--- a/mesalib/src/mesa/tnl/t_vb_texgen.c
+++ b/mesalib/src/mesa/tnl/t_vb_texgen.c
@@ -1,609 +1,609 @@
-/*
- * 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.
- *
- * Authors:
- *    Brian Paul
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-/*
- * Regarding GL_NV_texgen_reflection:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
-/***********************************************************************
- * Automatic texture coordinate generation (texgen) code.
- */
-
-
-struct texgen_stage_data;
-
-typedef void (*texgen_func)( GLcontext *ctx,
-			     struct texgen_stage_data *store,
-			     GLuint unit);
-
-
-struct texgen_stage_data {
-
-   /* Per-texunit derived state.
-    */
-   GLuint TexgenSize[MAX_TEXTURE_COORD_UNITS];
-   texgen_func TexgenFunc[MAX_TEXTURE_COORD_UNITS];
-
-   /* Temporary values used in texgen.
-    */
-   GLfloat (*tmp_f)[3];
-   GLfloat *tmp_m;
-
-   /* Buffered outputs of the stage.
-    */
-   GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS];
-};
-
-
-#define TEXGEN_STAGE_DATA(stage) ((struct texgen_stage_data *)stage->privatePtr)
-
-
-
-static GLuint all_bits[5] = {
-   0,
-   VEC_SIZE_1,
-   VEC_SIZE_2,
-   VEC_SIZE_3,
-   VEC_SIZE_4,
-};
-
-#define VEC_SIZE_FLAGS (VEC_SIZE_1|VEC_SIZE_2|VEC_SIZE_3|VEC_SIZE_4)
-
-#define TEXGEN_NEED_M            (TEXGEN_SPHERE_MAP)
-#define TEXGEN_NEED_F            (TEXGEN_SPHERE_MAP        | \
-				  TEXGEN_REFLECTION_MAP_NV)
-
-
-
-static void build_m3( GLfloat f[][3], GLfloat m[],
-		      const GLvector4f *normal,
-		      const GLvector4f *eye )
-{
-   GLuint stride = eye->stride;
-   GLfloat *coord = (GLfloat *)eye->start;
-   GLuint count = eye->count;
-   const GLfloat *norm = normal->start;
-   GLuint i;
-
-   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(norm,normal->stride)) {
-      GLfloat u[3], two_nu, fx, fy, fz;
-      COPY_3V( u, coord );
-      NORMALIZE_3FV( u );
-      two_nu = 2.0F * DOT3(norm,u);
-      fx = f[i][0] = u[0] - norm[0] * two_nu;
-      fy = f[i][1] = u[1] - norm[1] * two_nu;
-      fz = f[i][2] = u[2] - norm[2] * two_nu;
-      m[i] = fx * fx + fy * fy + (fz + 1.0F) * (fz + 1.0F);
-      if (m[i] != 0.0F) {
-	 m[i] = 0.5F * _mesa_inv_sqrtf(m[i]);
-      }
-   }
-}
-
-
-
-static void build_m2( GLfloat f[][3], GLfloat m[],
-		      const GLvector4f *normal,
-		      const GLvector4f *eye )
-{
-   GLuint stride = eye->stride;
-   GLfloat *coord = eye->start;
-   GLuint count = eye->count;
-
-   GLfloat *norm = normal->start;
-   GLuint i;
-
-   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(norm,normal->stride)) {
-      GLfloat u[3], two_nu, fx, fy, fz;
-      COPY_2V( u, coord );
-      u[2] = 0;
-      NORMALIZE_3FV( u );
-      two_nu = 2.0F * DOT3(norm,u);
-      fx = f[i][0] = u[0] - norm[0] * two_nu;
-      fy = f[i][1] = u[1] - norm[1] * two_nu;
-      fz = f[i][2] = u[2] - norm[2] * two_nu;
-      m[i] = fx * fx + fy * fy + (fz + 1.0F) * (fz + 1.0F);
-      if (m[i] != 0.0F) {
-	 m[i] = 0.5F * _mesa_inv_sqrtf(m[i]);
-      }
-   }
-}
-
-
-
-typedef void (*build_m_func)( GLfloat f[][3],
-			      GLfloat m[],
-			      const GLvector4f *normal,
-			      const GLvector4f *eye );
-
-
-static build_m_func build_m_tab[5] = {
-   NULL,
-   NULL,
-   build_m2,
-   build_m3,
-   build_m3
-};
-
-
-/* This is unusual in that we respect the stride of the output vector
- * (f).  This allows us to pass in either a texcoord vector4f, or a
- * temporary vector3f.
- */
-static void build_f3( GLfloat *f,
-		      GLuint fstride,
-		      const GLvector4f *normal,
-		      const GLvector4f *eye )
-{
-   GLuint stride = eye->stride;
-   GLfloat *coord = eye->start;
-   GLuint count = eye->count;
-
-   GLfloat *norm = normal->start;
-   GLuint i;
-
-   for (i=0;i<count;i++) {
-      GLfloat u[3], two_nu;
-      COPY_3V( u, coord );
-      NORMALIZE_3FV( u );
-      two_nu = 2.0F * DOT3(norm,u);
-      f[0] = u[0] - norm[0] * two_nu;
-      f[1] = u[1] - norm[1] * two_nu;
-      f[2] = u[2] - norm[2] * two_nu;
-      STRIDE_F(coord,stride);
-      STRIDE_F(f,fstride);
-      STRIDE_F(norm, normal->stride);
-   }
-}
-
-
-static void build_f2( GLfloat *f,
-		      GLuint fstride,
-		      const GLvector4f *normal,
-		      const GLvector4f *eye )
-{
-   GLuint stride = eye->stride;
-   GLfloat *coord = eye->start;
-   GLuint count = eye->count;
-   GLfloat *norm = normal->start;
-   GLuint i;
-
-   for (i=0;i<count;i++) {
-
-      GLfloat u[3], two_nu;
-      COPY_2V( u, coord );
-      u[2] = 0;
-      NORMALIZE_3FV( u );
-      two_nu = 2.0F * DOT3(norm,u);
-      f[0] = u[0] - norm[0] * two_nu;
-      f[1] = u[1] - norm[1] * two_nu;
-      f[2] = u[2] - norm[2] * two_nu;
-
-      STRIDE_F(coord,stride);
-      STRIDE_F(f,fstride);
-      STRIDE_F(norm, normal->stride);
-   }
-}
-
-typedef void (*build_f_func)( GLfloat *f,
-			      GLuint fstride,
-			      const GLvector4f *normal_vec,
-			      const GLvector4f *eye );
-
-
-
-/* Just treat 4-vectors as 3-vectors.
- */
-static build_f_func build_f_tab[5] = {
-   NULL,
-   NULL,
-   build_f2,
-   build_f3,
-   build_f3
-};
-
-
-
-/* Special case texgen functions.
- */
-static void texgen_reflection_map_nv( GLcontext *ctx,
-				      struct texgen_stage_data *store,
-				      GLuint unit )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];
-   GLvector4f *out = &store->texcoord[unit];
-
-   build_f_tab[VB->EyePtr->size]( out->start,
-				  out->stride,
-				  VB->AttribPtr[_TNL_ATTRIB_NORMAL],
-				  VB->EyePtr );
-
-   out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3;
-   out->count = VB->Count;
-   out->size = MAX2(in->size, 3);
-   if (in->size == 4) 
-      _mesa_copy_tab[0x8]( out, in );
-}
-
-
-
-static void texgen_normal_map_nv( GLcontext *ctx,
-				  struct texgen_stage_data *store,
-				  GLuint unit )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];
-   GLvector4f *out = &store->texcoord[unit];
-   GLvector4f *normal = VB->AttribPtr[_TNL_ATTRIB_NORMAL];
-   GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->start;
-   GLuint count = VB->Count;
-   GLuint i;
-   const GLfloat *norm = normal->start;
-
-   for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {
-      texcoord[i][0] = norm[0];
-      texcoord[i][1] = norm[1];
-      texcoord[i][2] = norm[2];
-   }
-
-
-   out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3;
-   out->count = count;
-   out->size = MAX2(in->size, 3);
-   if (in->size == 4) 
-      _mesa_copy_tab[0x8]( out, in );
-}
-
-
-static void texgen_sphere_map( GLcontext *ctx,
-			       struct texgen_stage_data *store,
-			       GLuint unit )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];
-   GLvector4f *out = &store->texcoord[unit];
-   GLfloat (*texcoord)[4] = (GLfloat (*)[4]) out->start;
-   GLuint count = VB->Count;
-   GLuint i;
-   GLfloat (*f)[3] = store->tmp_f;
-   GLfloat *m = store->tmp_m;
-
-   (build_m_tab[VB->EyePtr->size])( store->tmp_f,
-				    store->tmp_m,
-				    VB->AttribPtr[_TNL_ATTRIB_NORMAL],
-				    VB->EyePtr );
-
-   out->size = MAX2(in->size,2);
-
-   for (i=0;i<count;i++) {
-      texcoord[i][0] = f[i][0] * m[i] + 0.5F;
-      texcoord[i][1] = f[i][1] * m[i] + 0.5F;
-   }
-
-   out->count = count;
-   out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_2;
-   if (in->size > 2)
-      _mesa_copy_tab[all_bits[in->size] & ~0x3]( out, in );
-}
-
-
-
-static void texgen( GLcontext *ctx,
-		    struct texgen_stage_data *store,
-		    GLuint unit )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];
-   GLvector4f *out = &store->texcoord[unit];
-   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
-   const GLvector4f *obj = VB->AttribPtr[_TNL_ATTRIB_POS];
-   const GLvector4f *eye = VB->EyePtr;
-   const GLvector4f *normal = VB->AttribPtr[_TNL_ATTRIB_NORMAL];
-   const GLfloat *m = store->tmp_m;
-   const GLuint count = VB->Count;
-   GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->data;
-   GLfloat (*f)[3] = store->tmp_f;
-   GLuint copy;
-
-   if (texUnit->_GenFlags & TEXGEN_NEED_M) {
-      build_m_tab[eye->size]( store->tmp_f, store->tmp_m, normal, eye );
-   } else if (texUnit->_GenFlags & TEXGEN_NEED_F) {
-      build_f_tab[eye->size]( (GLfloat *)store->tmp_f, 3, normal, eye );
-   }
-
-
-   out->size = MAX2(in->size, store->TexgenSize[unit]);
-   out->flags |= (in->flags & VEC_SIZE_FLAGS) | texUnit->TexGenEnabled;
-   out->count = count;
-
-   copy = (all_bits[in->size] & ~texUnit->TexGenEnabled);
-   if (copy)
-      _mesa_copy_tab[copy]( out, in );
-
-   if (texUnit->TexGenEnabled & S_BIT) {
-      GLuint i;
-      switch (texUnit->GenS.Mode) {
-      case GL_OBJECT_LINEAR:
-	 _mesa_dotprod_tab[obj->size]( (GLfloat *)out->data,
-				       sizeof(out->data[0]), obj,
-				       texUnit->GenS.ObjectPlane );
-	 break;
-      case GL_EYE_LINEAR:
-	 _mesa_dotprod_tab[eye->size]( (GLfloat *)out->data,
-				       sizeof(out->data[0]), eye,
-				       texUnit->GenS.EyePlane );
-	 break;
-      case GL_SPHERE_MAP:
-         for (i = 0; i < count; i++)
-            texcoord[i][0] = f[i][0] * m[i] + 0.5F;
-	 break;
-      case GL_REFLECTION_MAP_NV:
-	 for (i=0;i<count;i++)
-	     texcoord[i][0] = f[i][0];
-	 break;
-      case GL_NORMAL_MAP_NV: {
-	 const GLfloat *norm = normal->start;
-	 for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {
-	     texcoord[i][0] = norm[0];
-	 }
-	 break;
-      }
-      default:
-	 _mesa_problem(ctx, "Bad S texgen");
-      }
-   }
-
-   if (texUnit->TexGenEnabled & T_BIT) {
-      GLuint i;
-      switch (texUnit->GenT.Mode) {
-      case GL_OBJECT_LINEAR:
-	 _mesa_dotprod_tab[obj->size]( &(out->data[0][1]),
-				       sizeof(out->data[0]), obj,
-				       texUnit->GenT.ObjectPlane );
-	 break;
-      case GL_EYE_LINEAR:
-	 _mesa_dotprod_tab[eye->size]( &(out->data[0][1]),
-				       sizeof(out->data[0]), eye,
-				       texUnit->GenT.EyePlane );
-	 break;
-      case GL_SPHERE_MAP:
-         for (i = 0; i < count; i++)
-            texcoord[i][1] = f[i][1] * m[i] + 0.5F;
-	 break;
-      case GL_REFLECTION_MAP_NV:
-	 for (i=0;i<count;i++)
-	     texcoord[i][1] = f[i][1];
-	 break;
-      case GL_NORMAL_MAP_NV: {
-	 const GLfloat *norm = normal->start;
-	 for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {
-	     texcoord[i][1] = norm[1];
-	 }
-	 break;
-      }
-      default:
-	 _mesa_problem(ctx, "Bad T texgen");
-      }
-   }
-
-   if (texUnit->TexGenEnabled & R_BIT) {
-      GLuint i;
-      switch (texUnit->GenR.Mode) {
-      case GL_OBJECT_LINEAR:
-	 _mesa_dotprod_tab[obj->size]( &(out->data[0][2]),
-				       sizeof(out->data[0]), obj,
-				       texUnit->GenR.ObjectPlane );
-	 break;
-      case GL_EYE_LINEAR:
-	 _mesa_dotprod_tab[eye->size]( &(out->data[0][2]),
-				       sizeof(out->data[0]), eye,
-				       texUnit->GenR.EyePlane );
-	 break;
-      case GL_REFLECTION_MAP_NV:
-	 for (i=0;i<count;i++)
-	     texcoord[i][2] = f[i][2];
-	 break;
-      case GL_NORMAL_MAP_NV: {
-	 const GLfloat *norm = normal->start;
-	 for (i=0;i<count;i++,STRIDE_F(norm, normal->stride)) {
-	     texcoord[i][2] = norm[2];
-	 }
-	 break;
-      }
-      default:
-	 _mesa_problem(ctx, "Bad R texgen");
-      }
-   }
-
-   if (texUnit->TexGenEnabled & Q_BIT) {
-      switch (texUnit->GenQ.Mode) {
-      case GL_OBJECT_LINEAR:
-	 _mesa_dotprod_tab[obj->size]( &(out->data[0][3]),
-				       sizeof(out->data[0]), obj,
-				       texUnit->GenQ.ObjectPlane );
-	 break;
-      case GL_EYE_LINEAR:
-	 _mesa_dotprod_tab[eye->size]( &(out->data[0][3]),
-				       sizeof(out->data[0]), eye,
-				       texUnit->GenQ.EyePlane );
-	 break;
-      default:
-	 _mesa_problem(ctx, "Bad Q texgen");
-      }
-   }
-}
-
-
-
-
-static GLboolean run_texgen_stage( GLcontext *ctx,
-				   struct tnl_pipeline_stage *stage )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
-   GLuint i;
-
-   if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Current) 
-      return GL_TRUE;
-
-   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-
-      if (texUnit->TexGenEnabled) {
-
-	 store->TexgenFunc[i]( ctx, store, i );
-
-         VB->AttribPtr[VERT_ATTRIB_TEX0 + i] = &store->texcoord[i];
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-static void validate_texgen_stage( GLcontext *ctx,
-				   struct tnl_pipeline_stage *stage )
-{
-   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
-   GLuint i;
-
-   if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Current) 
-      return;
-
-   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {
-      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-
-      if (texUnit->TexGenEnabled) {
-	 GLuint sz;
-
-	 if (texUnit->TexGenEnabled & Q_BIT)
-	    sz = 4;
-	 else if (texUnit->TexGenEnabled & R_BIT)
-	    sz = 3;
-	 else if (texUnit->TexGenEnabled & T_BIT)
-	    sz = 2;
-	 else
-	    sz = 1;
-
-	 store->TexgenSize[i] = sz;
-	 store->TexgenFunc[i] = texgen; /* general solution */
-
-         /* look for special texgen cases */
-	 if (texUnit->TexGenEnabled == (S_BIT|T_BIT|R_BIT)) {
-	    if (texUnit->_GenFlags == TEXGEN_REFLECTION_MAP_NV) {
-	       store->TexgenFunc[i] = texgen_reflection_map_nv;
-	    }
-	    else if (texUnit->_GenFlags == TEXGEN_NORMAL_MAP_NV) {
-	       store->TexgenFunc[i] = texgen_normal_map_nv;
-	    }
-	 }
-	 else if (texUnit->TexGenEnabled == (S_BIT|T_BIT) &&
-		  texUnit->_GenFlags == TEXGEN_SPHERE_MAP) {
-	    store->TexgenFunc[i] = texgen_sphere_map;
-	 }
-      }
-   }
-}
-
-
-
-
-
-/* Called the first time stage->run() is invoked.
- */
-static GLboolean alloc_texgen_data( GLcontext *ctx,
-				    struct tnl_pipeline_stage *stage )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct texgen_stage_data *store;
-   GLuint i;
-
-   stage->privatePtr = CALLOC(sizeof(*store));
-   store = TEXGEN_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
-      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
-
-   store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3);
-   store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat));
-
-   return GL_TRUE;
-}
-
-
-static void free_texgen_data( struct tnl_pipeline_stage *stage )
-
-{
-   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
-   GLuint i;
-
-   if (store) {
-      for (i = 0 ; i < MAX_TEXTURE_COORD_UNITS ; i++)
-	 if (store->texcoord[i].data)
-	    _mesa_vector4f_free( &store->texcoord[i] );
-
-
-      if (store->tmp_f) FREE( store->tmp_f );
-      if (store->tmp_m) FREE( store->tmp_m );
-      FREE( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-
-
-const struct tnl_pipeline_stage _tnl_texgen_stage =
-{
-   "texgen",			/* name */
-   NULL,			/* private data */
-   alloc_texgen_data,		/* destructor */
-   free_texgen_data,		/* destructor */
-   validate_texgen_stage,		/* check */
-   run_texgen_stage		/* run -- initially set to alloc data */
-};
+/*

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

+ *

+ * Authors:

+ *    Brian Paul

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+/*

+ * Regarding GL_NV_texgen_reflection:

+ *

+ * Portions of this software may use or implement intellectual

+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims

+ * any and all warranties with respect to such intellectual property,

+ * including any use thereof or modifications thereto.

+ */

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "math/m_xform.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+

+

+/***********************************************************************

+ * Automatic texture coordinate generation (texgen) code.

+ */

+

+

+struct texgen_stage_data;

+

+typedef void (*texgen_func)( struct gl_context *ctx,

+			     struct texgen_stage_data *store,

+			     GLuint unit);

+

+

+struct texgen_stage_data {

+

+   /* Per-texunit derived state.

+    */

+   GLuint TexgenSize[MAX_TEXTURE_COORD_UNITS];

+   texgen_func TexgenFunc[MAX_TEXTURE_COORD_UNITS];

+

+   /* Temporary values used in texgen.

+    */

+   GLfloat (*tmp_f)[3];

+   GLfloat *tmp_m;

+

+   /* Buffered outputs of the stage.

+    */

+   GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS];

+};

+

+

+#define TEXGEN_STAGE_DATA(stage) ((struct texgen_stage_data *)stage->privatePtr)

+

+

+

+static GLuint all_bits[5] = {

+   0,

+   VEC_SIZE_1,

+   VEC_SIZE_2,

+   VEC_SIZE_3,

+   VEC_SIZE_4,

+};

+

+#define VEC_SIZE_FLAGS (VEC_SIZE_1|VEC_SIZE_2|VEC_SIZE_3|VEC_SIZE_4)

+

+#define TEXGEN_NEED_M            (TEXGEN_SPHERE_MAP)

+#define TEXGEN_NEED_F            (TEXGEN_SPHERE_MAP        | \

+				  TEXGEN_REFLECTION_MAP_NV)

+

+

+

+static void build_m3( GLfloat f[][3], GLfloat m[],

+		      const GLvector4f *normal,

+		      const GLvector4f *eye )

+{

+   GLuint stride = eye->stride;

+   GLfloat *coord = (GLfloat *)eye->start;

+   GLuint count = eye->count;

+   const GLfloat *norm = normal->start;

+   GLuint i;

+

+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(norm,normal->stride)) {

+      GLfloat u[3], two_nu, fx, fy, fz;

+      COPY_3V( u, coord );

+      NORMALIZE_3FV( u );

+      two_nu = 2.0F * DOT3(norm,u);

+      fx = f[i][0] = u[0] - norm[0] * two_nu;

+      fy = f[i][1] = u[1] - norm[1] * two_nu;

+      fz = f[i][2] = u[2] - norm[2] * two_nu;

+      m[i] = fx * fx + fy * fy + (fz + 1.0F) * (fz + 1.0F);

+      if (m[i] != 0.0F) {

+	 m[i] = 0.5F * _mesa_inv_sqrtf(m[i]);

+      }

+   }

+}

+

+

+

+static void build_m2( GLfloat f[][3], GLfloat m[],

+		      const GLvector4f *normal,

+		      const GLvector4f *eye )

+{

+   GLuint stride = eye->stride;

+   GLfloat *coord = eye->start;

+   GLuint count = eye->count;

+

+   GLfloat *norm = normal->start;

+   GLuint i;

+

+   for (i=0;i<count;i++,STRIDE_F(coord,stride),STRIDE_F(norm,normal->stride)) {

+      GLfloat u[3], two_nu, fx, fy, fz;

+      COPY_2V( u, coord );

+      u[2] = 0;

+      NORMALIZE_3FV( u );

+      two_nu = 2.0F * DOT3(norm,u);

+      fx = f[i][0] = u[0] - norm[0] * two_nu;

+      fy = f[i][1] = u[1] - norm[1] * two_nu;

+      fz = f[i][2] = u[2] - norm[2] * two_nu;

+      m[i] = fx * fx + fy * fy + (fz + 1.0F) * (fz + 1.0F);

+      if (m[i] != 0.0F) {

+	 m[i] = 0.5F * _mesa_inv_sqrtf(m[i]);

+      }

+   }

+}

+

+

+

+typedef void (*build_m_func)( GLfloat f[][3],

+			      GLfloat m[],

+			      const GLvector4f *normal,

+			      const GLvector4f *eye );

+

+

+static build_m_func build_m_tab[5] = {

+   NULL,

+   NULL,

+   build_m2,

+   build_m3,

+   build_m3

+};

+

+

+/* This is unusual in that we respect the stride of the output vector

+ * (f).  This allows us to pass in either a texcoord vector4f, or a

+ * temporary vector3f.

+ */

+static void build_f3( GLfloat *f,

+		      GLuint fstride,

+		      const GLvector4f *normal,

+		      const GLvector4f *eye )

+{

+   GLuint stride = eye->stride;

+   GLfloat *coord = eye->start;

+   GLuint count = eye->count;

+

+   GLfloat *norm = normal->start;

+   GLuint i;

+

+   for (i=0;i<count;i++) {

+      GLfloat u[3], two_nu;

+      COPY_3V( u, coord );

+      NORMALIZE_3FV( u );

+      two_nu = 2.0F * DOT3(norm,u);

+      f[0] = u[0] - norm[0] * two_nu;

+      f[1] = u[1] - norm[1] * two_nu;

+      f[2] = u[2] - norm[2] * two_nu;

+      STRIDE_F(coord,stride);

+      STRIDE_F(f,fstride);

+      STRIDE_F(norm, normal->stride);

+   }

+}

+

+

+static void build_f2( GLfloat *f,

+		      GLuint fstride,

+		      const GLvector4f *normal,

+		      const GLvector4f *eye )

+{

+   GLuint stride = eye->stride;

+   GLfloat *coord = eye->start;

+   GLuint count = eye->count;

+   GLfloat *norm = normal->start;

+   GLuint i;

+

+   for (i=0;i<count;i++) {

+

+      GLfloat u[3], two_nu;

+      COPY_2V( u, coord );

+      u[2] = 0;

+      NORMALIZE_3FV( u );

+      two_nu = 2.0F * DOT3(norm,u);

+      f[0] = u[0] - norm[0] * two_nu;

+      f[1] = u[1] - norm[1] * two_nu;

+      f[2] = u[2] - norm[2] * two_nu;

+

+      STRIDE_F(coord,stride);

+      STRIDE_F(f,fstride);

+      STRIDE_F(norm, normal->stride);

+   }

+}

+

+typedef void (*build_f_func)( GLfloat *f,

+			      GLuint fstride,

+			      const GLvector4f *normal_vec,

+			      const GLvector4f *eye );

+

+

+

+/* Just treat 4-vectors as 3-vectors.

+ */

+static build_f_func build_f_tab[5] = {

+   NULL,

+   NULL,

+   build_f2,

+   build_f3,

+   build_f3

+};

+

+

+

+/* Special case texgen functions.

+ */

+static void texgen_reflection_map_nv( struct gl_context *ctx,

+				      struct texgen_stage_data *store,

+				      GLuint unit )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];

+   GLvector4f *out = &store->texcoord[unit];

+

+   build_f_tab[VB->EyePtr->size]( out->start,

+				  out->stride,

+				  VB->AttribPtr[_TNL_ATTRIB_NORMAL],

+				  VB->EyePtr );

+

+   out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3;

+   out->count = VB->Count;

+   out->size = MAX2(in->size, 3);

+   if (in->size == 4) 

+      _mesa_copy_tab[0x8]( out, in );

+}

+

+

+

+static void texgen_normal_map_nv( struct gl_context *ctx,

+				  struct texgen_stage_data *store,

+				  GLuint unit )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];

+   GLvector4f *out = &store->texcoord[unit];

+   GLvector4f *normal = VB->AttribPtr[_TNL_ATTRIB_NORMAL];

+   GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->start;

+   GLuint count = VB->Count;

+   GLuint i;

+   const GLfloat *norm = normal->start;

+

+   for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {

+      texcoord[i][0] = norm[0];

+      texcoord[i][1] = norm[1];

+      texcoord[i][2] = norm[2];

+   }

+

+

+   out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3;

+   out->count = count;

+   out->size = MAX2(in->size, 3);

+   if (in->size == 4) 

+      _mesa_copy_tab[0x8]( out, in );

+}

+

+

+static void texgen_sphere_map( struct gl_context *ctx,

+			       struct texgen_stage_data *store,

+			       GLuint unit )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];

+   GLvector4f *out = &store->texcoord[unit];

+   GLfloat (*texcoord)[4] = (GLfloat (*)[4]) out->start;

+   GLuint count = VB->Count;

+   GLuint i;

+   GLfloat (*f)[3] = store->tmp_f;

+   GLfloat *m = store->tmp_m;

+

+   (build_m_tab[VB->EyePtr->size])( store->tmp_f,

+				    store->tmp_m,

+				    VB->AttribPtr[_TNL_ATTRIB_NORMAL],

+				    VB->EyePtr );

+

+   out->size = MAX2(in->size,2);

+

+   for (i=0;i<count;i++) {

+      texcoord[i][0] = f[i][0] * m[i] + 0.5F;

+      texcoord[i][1] = f[i][1] * m[i] + 0.5F;

+   }

+

+   out->count = count;

+   out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_2;

+   if (in->size > 2)

+      _mesa_copy_tab[all_bits[in->size] & ~0x3]( out, in );

+}

+

+

+

+static void texgen( struct gl_context *ctx,

+		    struct texgen_stage_data *store,

+		    GLuint unit )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit];

+   GLvector4f *out = &store->texcoord[unit];

+   const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

+   const GLvector4f *obj = VB->AttribPtr[_TNL_ATTRIB_POS];

+   const GLvector4f *eye = VB->EyePtr;

+   const GLvector4f *normal = VB->AttribPtr[_TNL_ATTRIB_NORMAL];

+   const GLfloat *m = store->tmp_m;

+   const GLuint count = VB->Count;

+   GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->data;

+   GLfloat (*f)[3] = store->tmp_f;

+   GLuint copy;

+

+   if (texUnit->_GenFlags & TEXGEN_NEED_M) {

+      build_m_tab[eye->size]( store->tmp_f, store->tmp_m, normal, eye );

+   } else if (texUnit->_GenFlags & TEXGEN_NEED_F) {

+      build_f_tab[eye->size]( (GLfloat *)store->tmp_f, 3, normal, eye );

+   }

+

+

+   out->size = MAX2(in->size, store->TexgenSize[unit]);

+   out->flags |= (in->flags & VEC_SIZE_FLAGS) | texUnit->TexGenEnabled;

+   out->count = count;

+

+   copy = (all_bits[in->size] & ~texUnit->TexGenEnabled);

+   if (copy)

+      _mesa_copy_tab[copy]( out, in );

+

+   if (texUnit->TexGenEnabled & S_BIT) {

+      GLuint i;

+      switch (texUnit->GenS.Mode) {

+      case GL_OBJECT_LINEAR:

+	 _mesa_dotprod_tab[obj->size]( (GLfloat *)out->data,

+				       sizeof(out->data[0]), obj,

+				       texUnit->GenS.ObjectPlane );

+	 break;

+      case GL_EYE_LINEAR:

+	 _mesa_dotprod_tab[eye->size]( (GLfloat *)out->data,

+				       sizeof(out->data[0]), eye,

+				       texUnit->GenS.EyePlane );

+	 break;

+      case GL_SPHERE_MAP:

+         for (i = 0; i < count; i++)

+            texcoord[i][0] = f[i][0] * m[i] + 0.5F;

+	 break;

+      case GL_REFLECTION_MAP_NV:

+	 for (i=0;i<count;i++)

+	     texcoord[i][0] = f[i][0];

+	 break;

+      case GL_NORMAL_MAP_NV: {

+	 const GLfloat *norm = normal->start;

+	 for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {

+	     texcoord[i][0] = norm[0];

+	 }

+	 break;

+      }

+      default:

+	 _mesa_problem(ctx, "Bad S texgen");

+      }

+   }

+

+   if (texUnit->TexGenEnabled & T_BIT) {

+      GLuint i;

+      switch (texUnit->GenT.Mode) {

+      case GL_OBJECT_LINEAR:

+	 _mesa_dotprod_tab[obj->size]( &(out->data[0][1]),

+				       sizeof(out->data[0]), obj,

+				       texUnit->GenT.ObjectPlane );

+	 break;

+      case GL_EYE_LINEAR:

+	 _mesa_dotprod_tab[eye->size]( &(out->data[0][1]),

+				       sizeof(out->data[0]), eye,

+				       texUnit->GenT.EyePlane );

+	 break;

+      case GL_SPHERE_MAP:

+         for (i = 0; i < count; i++)

+            texcoord[i][1] = f[i][1] * m[i] + 0.5F;

+	 break;

+      case GL_REFLECTION_MAP_NV:

+	 for (i=0;i<count;i++)

+	     texcoord[i][1] = f[i][1];

+	 break;

+      case GL_NORMAL_MAP_NV: {

+	 const GLfloat *norm = normal->start;

+	 for (i=0;i<count;i++, STRIDE_F(norm, normal->stride)) {

+	     texcoord[i][1] = norm[1];

+	 }

+	 break;

+      }

+      default:

+	 _mesa_problem(ctx, "Bad T texgen");

+      }

+   }

+

+   if (texUnit->TexGenEnabled & R_BIT) {

+      GLuint i;

+      switch (texUnit->GenR.Mode) {

+      case GL_OBJECT_LINEAR:

+	 _mesa_dotprod_tab[obj->size]( &(out->data[0][2]),

+				       sizeof(out->data[0]), obj,

+				       texUnit->GenR.ObjectPlane );

+	 break;

+      case GL_EYE_LINEAR:

+	 _mesa_dotprod_tab[eye->size]( &(out->data[0][2]),

+				       sizeof(out->data[0]), eye,

+				       texUnit->GenR.EyePlane );

+	 break;

+      case GL_REFLECTION_MAP_NV:

+	 for (i=0;i<count;i++)

+	     texcoord[i][2] = f[i][2];

+	 break;

+      case GL_NORMAL_MAP_NV: {

+	 const GLfloat *norm = normal->start;

+	 for (i=0;i<count;i++,STRIDE_F(norm, normal->stride)) {

+	     texcoord[i][2] = norm[2];

+	 }

+	 break;

+      }

+      default:

+	 _mesa_problem(ctx, "Bad R texgen");

+      }

+   }

+

+   if (texUnit->TexGenEnabled & Q_BIT) {

+      switch (texUnit->GenQ.Mode) {

+      case GL_OBJECT_LINEAR:

+	 _mesa_dotprod_tab[obj->size]( &(out->data[0][3]),

+				       sizeof(out->data[0]), obj,

+				       texUnit->GenQ.ObjectPlane );

+	 break;

+      case GL_EYE_LINEAR:

+	 _mesa_dotprod_tab[eye->size]( &(out->data[0][3]),

+				       sizeof(out->data[0]), eye,

+				       texUnit->GenQ.EyePlane );

+	 break;

+      default:

+	 _mesa_problem(ctx, "Bad Q texgen");

+      }

+   }

+}

+

+

+

+

+static GLboolean run_texgen_stage( struct gl_context *ctx,

+				   struct tnl_pipeline_stage *stage )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);

+   GLuint i;

+

+   if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Current) 

+      return GL_TRUE;

+

+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {

+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];

+

+      if (texUnit->TexGenEnabled) {

+

+	 store->TexgenFunc[i]( ctx, store, i );

+

+         VB->AttribPtr[VERT_ATTRIB_TEX0 + i] = &store->texcoord[i];

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+static void validate_texgen_stage( struct gl_context *ctx,

+				   struct tnl_pipeline_stage *stage )

+{

+   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);

+   GLuint i;

+

+   if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Current) 

+      return;

+

+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {

+      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];

+

+      if (texUnit->TexGenEnabled) {

+	 GLuint sz;

+

+	 if (texUnit->TexGenEnabled & Q_BIT)

+	    sz = 4;

+	 else if (texUnit->TexGenEnabled & R_BIT)

+	    sz = 3;

+	 else if (texUnit->TexGenEnabled & T_BIT)

+	    sz = 2;

+	 else

+	    sz = 1;

+

+	 store->TexgenSize[i] = sz;

+	 store->TexgenFunc[i] = texgen; /* general solution */

+

+         /* look for special texgen cases */

+	 if (texUnit->TexGenEnabled == (S_BIT|T_BIT|R_BIT)) {

+	    if (texUnit->_GenFlags == TEXGEN_REFLECTION_MAP_NV) {

+	       store->TexgenFunc[i] = texgen_reflection_map_nv;

+	    }

+	    else if (texUnit->_GenFlags == TEXGEN_NORMAL_MAP_NV) {

+	       store->TexgenFunc[i] = texgen_normal_map_nv;

+	    }

+	 }

+	 else if (texUnit->TexGenEnabled == (S_BIT|T_BIT) &&

+		  texUnit->_GenFlags == TEXGEN_SPHERE_MAP) {

+	    store->TexgenFunc[i] = texgen_sphere_map;

+	 }

+      }

+   }

+}

+

+

+

+

+

+/* Called the first time stage->run() is invoked.

+ */

+static GLboolean alloc_texgen_data( struct gl_context *ctx,

+				    struct tnl_pipeline_stage *stage )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct texgen_stage_data *store;

+   GLuint i;

+

+   stage->privatePtr = CALLOC(sizeof(*store));

+   store = TEXGEN_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)

+      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );

+

+   store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3);

+   store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat));

+

+   return GL_TRUE;

+}

+

+

+static void free_texgen_data( struct tnl_pipeline_stage *stage )

+

+{

+   struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);

+   GLuint i;

+

+   if (store) {

+      for (i = 0 ; i < MAX_TEXTURE_COORD_UNITS ; i++)

+	 if (store->texcoord[i].data)

+	    _mesa_vector4f_free( &store->texcoord[i] );

+

+

+      if (store->tmp_f) FREE( store->tmp_f );

+      if (store->tmp_m) FREE( store->tmp_m );

+      FREE( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+

+

+const struct tnl_pipeline_stage _tnl_texgen_stage =

+{

+   "texgen",			/* name */

+   NULL,			/* private data */

+   alloc_texgen_data,		/* destructor */

+   free_texgen_data,		/* destructor */

+   validate_texgen_stage,		/* check */

+   run_texgen_stage		/* run -- initially set to alloc data */

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_texmat.c b/mesalib/src/mesa/tnl/t_vb_texmat.c
index 985d137e5..7b30946c8 100644
--- a/mesalib/src/mesa/tnl/t_vb_texmat.c
+++ b/mesalib/src/mesa/tnl/t_vb_texmat.c
@@ -1,128 +1,128 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-/* Is there any real benefit seperating texmat from texgen?  It means
- * we need two lots of intermediate storage.  Any changes to
- * _NEW_TEXTURE will invalidate both sets -- it's only on changes to
- * *only* _NEW_TEXTURE_MATRIX that texgen survives but texmat doesn't.
- *
- * However, the seperation of this code from the complex texgen stuff
- * is very appealing.
- */
-struct texmat_stage_data {
-   GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS];
-};
-
-#define TEXMAT_STAGE_DATA(stage) ((struct texmat_stage_data *)stage->privatePtr)
-
-
-
-static GLboolean run_texmat_stage( GLcontext *ctx,
-				   struct tnl_pipeline_stage *stage )
-{
-   struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage);
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   GLuint i;
-
-   if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Current) 
-      return GL_TRUE;
-
-   /* ENABLE_TEXMAT implies that the texture matrix is not the
-    * identity, so we don't have to check that here.
-    */
-   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {
-      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) {
-	 (void) TransformRaw( &store->texcoord[i],
-			      ctx->TextureMatrixStack[i].Top,
-			      VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]);
-
-	 VB->AttribPtr[VERT_ATTRIB_TEX0+i] = &store->texcoord[i];
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/* Called the first time stage->run() is invoked.
- */
-static GLboolean alloc_texmat_data( GLcontext *ctx,
-				    struct tnl_pipeline_stage *stage )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct texmat_stage_data *store;
-   GLuint i;
-
-   stage->privatePtr = CALLOC(sizeof(*store));
-   store = TEXMAT_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
-      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
-
-   return GL_TRUE;
-}
-
-
-static void free_texmat_data( struct tnl_pipeline_stage *stage )
-{
-   struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage);
-   GLuint i;
-
-   if (store) {
-      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
-	 if (store->texcoord[i].data)
-	    _mesa_vector4f_free( &store->texcoord[i] );
-      FREE( store );
-      stage->privatePtr = NULL;
-   }
-}
-
-
-
-const struct tnl_pipeline_stage _tnl_texture_transform_stage =
-{
-   "texture transform",			/* name */
-   NULL,				/* private data */
-   alloc_texmat_data,
-   free_texmat_data,			/* destructor */
-   NULL,
-   run_texmat_stage,
-};
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "math/m_xform.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+

+/* Is there any real benefit seperating texmat from texgen?  It means

+ * we need two lots of intermediate storage.  Any changes to

+ * _NEW_TEXTURE will invalidate both sets -- it's only on changes to

+ * *only* _NEW_TEXTURE_MATRIX that texgen survives but texmat doesn't.

+ *

+ * However, the seperation of this code from the complex texgen stuff

+ * is very appealing.

+ */

+struct texmat_stage_data {

+   GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS];

+};

+

+#define TEXMAT_STAGE_DATA(stage) ((struct texmat_stage_data *)stage->privatePtr)

+

+

+

+static GLboolean run_texmat_stage( struct gl_context *ctx,

+				   struct tnl_pipeline_stage *stage )

+{

+   struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage);

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   GLuint i;

+

+   if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Current) 

+      return GL_TRUE;

+

+   /* ENABLE_TEXMAT implies that the texture matrix is not the

+    * identity, so we don't have to check that here.

+    */

+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) {

+      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) {

+	 (void) TransformRaw( &store->texcoord[i],

+			      ctx->TextureMatrixStack[i].Top,

+			      VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]);

+

+	 VB->AttribPtr[VERT_ATTRIB_TEX0+i] = &store->texcoord[i];

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+/* Called the first time stage->run() is invoked.

+ */

+static GLboolean alloc_texmat_data( struct gl_context *ctx,

+				    struct tnl_pipeline_stage *stage )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct texmat_stage_data *store;

+   GLuint i;

+

+   stage->privatePtr = CALLOC(sizeof(*store));

+   store = TEXMAT_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)

+      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );

+

+   return GL_TRUE;

+}

+

+

+static void free_texmat_data( struct tnl_pipeline_stage *stage )

+{

+   struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage);

+   GLuint i;

+

+   if (store) {

+      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)

+	 if (store->texcoord[i].data)

+	    _mesa_vector4f_free( &store->texcoord[i] );

+      FREE( store );

+      stage->privatePtr = NULL;

+   }

+}

+

+

+

+const struct tnl_pipeline_stage _tnl_texture_transform_stage =

+{

+   "texture transform",			/* name */

+   NULL,				/* private data */

+   alloc_texmat_data,

+   free_texmat_data,			/* destructor */

+   NULL,

+   run_texmat_stage,

+};

diff --git a/mesalib/src/mesa/tnl/t_vb_vertex.c b/mesalib/src/mesa/tnl/t_vb_vertex.c
index 453479227..a77959410 100644
--- a/mesalib/src/mesa/tnl/t_vb_vertex.c
+++ b/mesalib/src/mesa/tnl/t_vb_vertex.c
@@ -1,283 +1,283 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/glheader.h"
-#include "main/colormac.h"
-#include "main/macros.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "math/m_xform.h"
-
-#include "t_context.h"
-#include "t_pipeline.h"
-
-
-
-struct vertex_stage_data {
-   GLvector4f eye;
-   GLvector4f clip;
-   GLvector4f proj;
-   GLubyte *clipmask;
-   GLubyte ormask;
-   GLubyte andmask;
-};
-
-#define VERTEX_STAGE_DATA(stage) ((struct vertex_stage_data *)stage->privatePtr)
-
-
-
-
-/* This function implements cliptesting for user-defined clip planes.
- * The clipping of primitives to these planes is implemented in
- * t_render_clip.h.
- */
-#define USER_CLIPTEST(NAME, SZ)					\
-static void NAME( GLcontext *ctx,				\
-		  GLvector4f *clip,				\
-		  GLubyte *clipmask,				\
-		  GLubyte *clipormask,				\
-		  GLubyte *clipandmask )			\
-{								\
-   GLuint p;							\
-								\
-   for (p = 0; p < ctx->Const.MaxClipPlanes; p++)		\
-      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {	\
-	 GLuint nr, i;						\
-	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];	\
-	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];	\
-	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];	\
-	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];	\
-         GLfloat *coord = (GLfloat *)clip->data;		\
-         GLuint stride = clip->stride;				\
-         GLuint count = clip->count;				\
-								\
-	 for (nr = 0, i = 0 ; i < count ; i++) {		\
-	    GLfloat dp = coord[0] * a + coord[1] * b;		\
-	    if (SZ > 2) dp += coord[2] * c;			\
-	    if (SZ > 3) dp += coord[3] * d; else dp += d;	\
-								\
-	    if (dp < 0) {					\
-	       nr++;						\
-	       clipmask[i] |= CLIP_USER_BIT;			\
-	    }							\
-								\
-	    STRIDE_F(coord, stride);				\
-	 }							\
-								\
-	 if (nr > 0) {						\
-	    *clipormask |= CLIP_USER_BIT;			\
-	    if (nr == count) {					\
-	       *clipandmask |= CLIP_USER_BIT;			\
-	       return;						\
-	    }							\
-	 }							\
-      }								\
-}
-
-
-USER_CLIPTEST(userclip2, 2)
-USER_CLIPTEST(userclip3, 3)
-USER_CLIPTEST(userclip4, 4)
-
-static void (*(usercliptab[5]))( GLcontext *,
-				 GLvector4f *, GLubyte *,
-				 GLubyte *, GLubyte * ) =
-{
-   NULL,
-   NULL,
-   userclip2,
-   userclip3,
-   userclip4
-};
-
-
-void
-tnl_clip_prepare(GLcontext *ctx)
-{
-   /* Neither the x86 nor sparc asm cliptest functions have been updated
-    * for ARB_depth_clamp, so force the C paths.
-    */
-   if (ctx->Transform.DepthClamp) {
-      static GLboolean c_funcs_installed = GL_FALSE;
-      if (!c_funcs_installed) {
-         init_c_cliptest();
-         c_funcs_installed = GL_TRUE;
-      }
-   }
-}
-
-
-
-static GLboolean run_vertex_stage( GLcontext *ctx,
-				   struct tnl_pipeline_stage *stage )
-{
-   struct vertex_stage_data *store = (struct vertex_stage_data *)stage->privatePtr;
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-
-   if (ctx->VertexProgram._Current) 
-      return GL_TRUE;
-
-   tnl_clip_prepare(ctx);
-
-   if (ctx->_NeedEyeCoords) {
-      /* Separate modelview transformation:
-       * Use combined ModelProject to avoid some depth artifacts
-       */
-      if (ctx->ModelviewMatrixStack.Top->type == MATRIX_IDENTITY)
-	 VB->EyePtr = VB->AttribPtr[_TNL_ATTRIB_POS];
-      else
-	 VB->EyePtr = TransformRaw( &store->eye,
-				    ctx->ModelviewMatrixStack.Top,
-				    VB->AttribPtr[_TNL_ATTRIB_POS]);
-   }
-
-   VB->ClipPtr = TransformRaw( &store->clip,
-			       &ctx->_ModelProjectMatrix,
-			       VB->AttribPtr[_TNL_ATTRIB_POS] );
-
-   /* Drivers expect this to be clean to element 4...
-    */
-   switch (VB->ClipPtr->size) {
-   case 1:			
-      /* impossible */
-   case 2:
-      _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
-      /* fall-through */
-   case 3:
-      _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
-      /* fall-through */
-   case 4:
-      break;
-   }
-
-
-   /* Cliptest and perspective divide.  Clip functions must clear
-    * the clipmask.
-    */
-   store->ormask = 0;
-   store->andmask = CLIP_FRUSTUM_BITS;
-
-   if (tnl->NeedNdcCoords) {
-      VB->NdcPtr =
-	 _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
-					    &store->proj,
-					    store->clipmask,
-					    &store->ormask,
-					    &store->andmask,
-					    !ctx->Transform.DepthClamp );
-   }
-   else {
-      VB->NdcPtr = NULL;
-      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,
-					    NULL,
-					    store->clipmask,
-					    &store->ormask,
-					    &store->andmask,
-					    !ctx->Transform.DepthClamp );
-   }
-
-   if (store->andmask)
-      return GL_FALSE;
-
-
-   /* Test userclip planes.  This contributes to VB->ClipMask, so
-    * is essentially required to be in this stage.
-    */
-   if (ctx->Transform.ClipPlanesEnabled) {
-      usercliptab[VB->ClipPtr->size]( ctx,
-				      VB->ClipPtr,
-				      store->clipmask,
-				      &store->ormask,
-				      &store->andmask );
-
-      if (store->andmask)
-	 return GL_FALSE;
-   }
-
-   VB->ClipAndMask = store->andmask;
-   VB->ClipOrMask = store->ormask;
-   VB->ClipMask = store->clipmask;
-
-   return GL_TRUE;
-}
-
-
-static GLboolean init_vertex_stage( GLcontext *ctx,
-				    struct tnl_pipeline_stage *stage )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct vertex_stage_data *store;
-   GLuint size = VB->Size;
-
-   stage->privatePtr = CALLOC(sizeof(*store));
-   store = VERTEX_STAGE_DATA(stage);
-   if (!store)
-      return GL_FALSE;
-
-   _mesa_vector4f_alloc( &store->eye, 0, size, 32 );
-   _mesa_vector4f_alloc( &store->clip, 0, size, 32 );
-   _mesa_vector4f_alloc( &store->proj, 0, size, 32 );
-
-   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );
-
-   if (!store->clipmask ||
-       !store->eye.data ||
-       !store->clip.data ||
-       !store->proj.data)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-static void dtr( struct tnl_pipeline_stage *stage )
-{
-   struct vertex_stage_data *store = VERTEX_STAGE_DATA(stage);
-
-   if (store) {
-      _mesa_vector4f_free( &store->eye );
-      _mesa_vector4f_free( &store->clip );
-      _mesa_vector4f_free( &store->proj );
-      _mesa_align_free( store->clipmask );
-      FREE(store);
-      stage->privatePtr = NULL;
-      stage->run = init_vertex_stage;
-   }
-}
-
-
-const struct tnl_pipeline_stage _tnl_vertex_transform_stage =
-{
-   "modelview/project/cliptest/divide",
-   NULL,			/* private data */
-   init_vertex_stage,
-   dtr,				/* destructor */
-   NULL,
-   run_vertex_stage		/* run -- initially set to init */
-};
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/glheader.h"

+#include "main/colormac.h"

+#include "main/macros.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "math/m_xform.h"

+

+#include "t_context.h"

+#include "t_pipeline.h"

+

+

+

+struct vertex_stage_data {

+   GLvector4f eye;

+   GLvector4f clip;

+   GLvector4f proj;

+   GLubyte *clipmask;

+   GLubyte ormask;

+   GLubyte andmask;

+};

+

+#define VERTEX_STAGE_DATA(stage) ((struct vertex_stage_data *)stage->privatePtr)

+

+

+

+

+/* This function implements cliptesting for user-defined clip planes.

+ * The clipping of primitives to these planes is implemented in

+ * t_render_clip.h.

+ */

+#define USER_CLIPTEST(NAME, SZ)					\

+static void NAME( struct gl_context *ctx,				\

+		  GLvector4f *clip,				\

+		  GLubyte *clipmask,				\

+		  GLubyte *clipormask,				\

+		  GLubyte *clipandmask )			\

+{								\

+   GLuint p;							\

+								\

+   for (p = 0; p < ctx->Const.MaxClipPlanes; p++)		\

+      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {	\

+	 GLuint nr, i;						\

+	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];	\

+	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];	\

+	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];	\

+	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];	\

+         GLfloat *coord = (GLfloat *)clip->data;		\

+         GLuint stride = clip->stride;				\

+         GLuint count = clip->count;				\

+								\

+	 for (nr = 0, i = 0 ; i < count ; i++) {		\

+	    GLfloat dp = coord[0] * a + coord[1] * b;		\

+	    if (SZ > 2) dp += coord[2] * c;			\

+	    if (SZ > 3) dp += coord[3] * d; else dp += d;	\

+								\

+	    if (dp < 0) {					\

+	       nr++;						\

+	       clipmask[i] |= CLIP_USER_BIT;			\

+	    }							\

+								\

+	    STRIDE_F(coord, stride);				\

+	 }							\

+								\

+	 if (nr > 0) {						\

+	    *clipormask |= CLIP_USER_BIT;			\

+	    if (nr == count) {					\

+	       *clipandmask |= CLIP_USER_BIT;			\

+	       return;						\

+	    }							\

+	 }							\

+      }								\

+}

+

+

+USER_CLIPTEST(userclip2, 2)

+USER_CLIPTEST(userclip3, 3)

+USER_CLIPTEST(userclip4, 4)

+

+static void (*(usercliptab[5]))( struct gl_context *,

+				 GLvector4f *, GLubyte *,

+				 GLubyte *, GLubyte * ) =

+{

+   NULL,

+   NULL,

+   userclip2,

+   userclip3,

+   userclip4

+};

+

+

+void

+tnl_clip_prepare(struct gl_context *ctx)

+{

+   /* Neither the x86 nor sparc asm cliptest functions have been updated

+    * for ARB_depth_clamp, so force the C paths.

+    */

+   if (ctx->Transform.DepthClamp) {

+      static GLboolean c_funcs_installed = GL_FALSE;

+      if (!c_funcs_installed) {

+         init_c_cliptest();

+         c_funcs_installed = GL_TRUE;

+      }

+   }

+}

+

+

+

+static GLboolean run_vertex_stage( struct gl_context *ctx,

+				   struct tnl_pipeline_stage *stage )

+{

+   struct vertex_stage_data *store = (struct vertex_stage_data *)stage->privatePtr;

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+

+   if (ctx->VertexProgram._Current) 

+      return GL_TRUE;

+

+   tnl_clip_prepare(ctx);

+

+   if (ctx->_NeedEyeCoords) {

+      /* Separate modelview transformation:

+       * Use combined ModelProject to avoid some depth artifacts

+       */

+      if (ctx->ModelviewMatrixStack.Top->type == MATRIX_IDENTITY)

+	 VB->EyePtr = VB->AttribPtr[_TNL_ATTRIB_POS];

+      else

+	 VB->EyePtr = TransformRaw( &store->eye,

+				    ctx->ModelviewMatrixStack.Top,

+				    VB->AttribPtr[_TNL_ATTRIB_POS]);

+   }

+

+   VB->ClipPtr = TransformRaw( &store->clip,

+			       &ctx->_ModelProjectMatrix,

+			       VB->AttribPtr[_TNL_ATTRIB_POS] );

+

+   /* Drivers expect this to be clean to element 4...

+    */

+   switch (VB->ClipPtr->size) {

+   case 1:			

+      /* impossible */

+   case 2:

+      _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );

+      /* fall-through */

+   case 3:

+      _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );

+      /* fall-through */

+   case 4:

+      break;

+   }

+

+

+   /* Cliptest and perspective divide.  Clip functions must clear

+    * the clipmask.

+    */

+   store->ormask = 0;

+   store->andmask = CLIP_FRUSTUM_BITS;

+

+   if (tnl->NeedNdcCoords) {

+      VB->NdcPtr =

+	 _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,

+					    &store->proj,

+					    store->clipmask,

+					    &store->ormask,

+					    &store->andmask,

+					    !ctx->Transform.DepthClamp );

+   }

+   else {

+      VB->NdcPtr = NULL;

+      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,

+					    NULL,

+					    store->clipmask,

+					    &store->ormask,

+					    &store->andmask,

+					    !ctx->Transform.DepthClamp );

+   }

+

+   if (store->andmask)

+      return GL_FALSE;

+

+

+   /* Test userclip planes.  This contributes to VB->ClipMask, so

+    * is essentially required to be in this stage.

+    */

+   if (ctx->Transform.ClipPlanesEnabled) {

+      usercliptab[VB->ClipPtr->size]( ctx,

+				      VB->ClipPtr,

+				      store->clipmask,

+				      &store->ormask,

+				      &store->andmask );

+

+      if (store->andmask)

+	 return GL_FALSE;

+   }

+

+   VB->ClipAndMask = store->andmask;

+   VB->ClipOrMask = store->ormask;

+   VB->ClipMask = store->clipmask;

+

+   return GL_TRUE;

+}

+

+

+static GLboolean init_vertex_stage( struct gl_context *ctx,

+				    struct tnl_pipeline_stage *stage )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct vertex_stage_data *store;

+   GLuint size = VB->Size;

+

+   stage->privatePtr = CALLOC(sizeof(*store));

+   store = VERTEX_STAGE_DATA(stage);

+   if (!store)

+      return GL_FALSE;

+

+   _mesa_vector4f_alloc( &store->eye, 0, size, 32 );

+   _mesa_vector4f_alloc( &store->clip, 0, size, 32 );

+   _mesa_vector4f_alloc( &store->proj, 0, size, 32 );

+

+   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );

+

+   if (!store->clipmask ||

+       !store->eye.data ||

+       !store->clip.data ||

+       !store->proj.data)

+      return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+static void dtr( struct tnl_pipeline_stage *stage )

+{

+   struct vertex_stage_data *store = VERTEX_STAGE_DATA(stage);

+

+   if (store) {

+      _mesa_vector4f_free( &store->eye );

+      _mesa_vector4f_free( &store->clip );

+      _mesa_vector4f_free( &store->proj );

+      _mesa_align_free( store->clipmask );

+      FREE(store);

+      stage->privatePtr = NULL;

+      stage->run = init_vertex_stage;

+   }

+}

+

+

+const struct tnl_pipeline_stage _tnl_vertex_transform_stage =

+{

+   "modelview/project/cliptest/divide",

+   NULL,			/* private data */

+   init_vertex_stage,

+   dtr,				/* destructor */

+   NULL,

+   run_vertex_stage		/* run -- initially set to init */

+};

diff --git a/mesalib/src/mesa/tnl/t_vertex.c b/mesalib/src/mesa/tnl/t_vertex.c
index c1b157023..0ca324402 100644
--- a/mesalib/src/mesa/tnl/t_vertex.c
+++ b/mesalib/src/mesa/tnl/t_vertex.c
@@ -1,564 +1,564 @@
-/*
- * Copyright 2003 Tungsten Graphics, 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
- * 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 <keithw@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-
-#include "t_context.h"
-#include "t_vertex.h"
-
-#define DBG 0
-
-/* Build and manage clipspace/ndc/window vertices.
- */
-
-static GLboolean match_fastpath( struct tnl_clipspace *vtx,
-				 const struct tnl_clipspace_fastpath *fp)
-{
-   GLuint j;
-
-   if (vtx->attr_count != fp->attr_count) 
-      return GL_FALSE;
-
-   for (j = 0; j < vtx->attr_count; j++) 
-      if (vtx->attr[j].format != fp->attr[j].format ||
-	  vtx->attr[j].inputsize != fp->attr[j].size ||
-	  vtx->attr[j].vertoffset != fp->attr[j].offset) 
-	 return GL_FALSE;
-      
-   if (fp->match_strides) {
-      if (vtx->vertex_size != fp->vertex_size)
-	 return GL_FALSE;
-
-      for (j = 0; j < vtx->attr_count; j++) 
-	 if (vtx->attr[j].inputstride != fp->attr[j].stride) 
-	    return GL_FALSE;
-   }
-   
-   return GL_TRUE;
-}
-
-static GLboolean search_fastpath_emit( struct tnl_clipspace *vtx )
-{
-   struct tnl_clipspace_fastpath *fp = vtx->fastpath;
-
-   for ( ; fp ; fp = fp->next) {
-      if (match_fastpath(vtx, fp)) {
-         vtx->emit = fp->func;
-	 return GL_TRUE;
-      }
-   }
-
-   return GL_FALSE;
-}
-
-void _tnl_register_fastpath( struct tnl_clipspace *vtx,
-			     GLboolean match_strides )
-{
-   struct tnl_clipspace_fastpath *fastpath = CALLOC_STRUCT(tnl_clipspace_fastpath);
-   GLuint i;
-
-   fastpath->vertex_size = vtx->vertex_size;
-   fastpath->attr_count = vtx->attr_count;
-   fastpath->match_strides = match_strides;
-   fastpath->func = vtx->emit;
-   fastpath->attr = (struct tnl_attr_type *)
-      malloc(vtx->attr_count * sizeof(fastpath->attr[0]));
-
-   for (i = 0; i < vtx->attr_count; i++) {
-      fastpath->attr[i].format = vtx->attr[i].format;
-      fastpath->attr[i].stride = vtx->attr[i].inputstride;
-      fastpath->attr[i].size = vtx->attr[i].inputsize;
-      fastpath->attr[i].offset = vtx->attr[i].vertoffset;
-   }
-
-   fastpath->next = vtx->fastpath;
-   vtx->fastpath = fastpath;
-}
-
-
-
-/***********************************************************************
- * Build codegen functions or return generic ones:
- */
-static void choose_emit_func( GLcontext *ctx, GLuint count, GLubyte *dest)
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint attr_count = vtx->attr_count;
-   GLuint j;
-
-   for (j = 0; j < attr_count; j++) {
-      GLvector4f *vptr = VB->AttribPtr[a[j].attrib];
-      a[j].inputstride = vptr->stride;
-      a[j].inputsize = vptr->size;
-      a[j].emit = a[j].insert[vptr->size - 1]; /* not always used */
-   }
-
-   vtx->emit = NULL;
-   
-   /* Does this match an existing (hardwired, codegen or known-bad)
-    * fastpath?
-    */
-   if (search_fastpath_emit(vtx)) {
-      /* Use this result.  If it is null, then it is already known
-       * that the current state will fail for codegen and there is no
-       * point trying again.
-       */
-   }
-   else if (vtx->codegen_emit) {
-      vtx->codegen_emit(ctx);
-   }
-
-   if (!vtx->emit) {
-      _tnl_generate_hardwired_emit(ctx);
-   }
-
-   /* Otherwise use the generic version:
-    */
-   if (!vtx->emit)
-      vtx->emit = _tnl_generic_emit;
-
-   vtx->emit( ctx, count, dest );
-}
-
-
-
-static void choose_interp_func( GLcontext *ctx,
-				GLfloat t,
-				GLuint edst, GLuint eout, GLuint ein,
-				GLboolean force_boundary )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-
-   if (vtx->need_extras && 
-       (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
-      vtx->interp = _tnl_generic_interp_extras;
-   } else {
-      vtx->interp = _tnl_generic_interp;
-   }
-
-   vtx->interp( ctx, t, edst, eout, ein, force_boundary );
-}
-
-
-static void choose_copy_pv_func(  GLcontext *ctx, GLuint edst, GLuint esrc )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-
-   if (vtx->need_extras && 
-       (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {
-      vtx->copy_pv = _tnl_generic_copy_pv_extras;
-   } else {
-      vtx->copy_pv = _tnl_generic_copy_pv;
-   }
-
-   vtx->copy_pv( ctx, edst, esrc );
-}
-
-
-/***********************************************************************
- * Public entrypoints, mostly dispatch to the above:
- */
-
-
-/* Interpolate between two vertices to produce a third:
- */
-void _tnl_interp( GLcontext *ctx,
-		  GLfloat t,
-		  GLuint edst, GLuint eout, GLuint ein,
-		  GLboolean force_boundary )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   vtx->interp( ctx, t, edst, eout, ein, force_boundary );
-}
-
-/* Copy colors from one vertex to another:
- */
-void _tnl_copy_pv(  GLcontext *ctx, GLuint edst, GLuint esrc )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   vtx->copy_pv( ctx, edst, esrc );
-}
-
-
-/* Extract a named attribute from a hardware vertex.  Will have to
- * reverse any viewport transformation, swizzling or other conversions
- * which may have been applied:
- */
-void _tnl_get_attr( GLcontext *ctx, const void *vin,
-			      GLenum attr, GLfloat *dest )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   const struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint attr_count = vtx->attr_count;
-   GLuint j;
-
-   for (j = 0; j < attr_count; j++) {
-      if (a[j].attrib == attr) {
-	 a[j].extract( &a[j], dest, (GLubyte *)vin + a[j].vertoffset );
-	 return;
-      }
-   }
-
-   /* Else return the value from ctx->Current.
-    */
-   if (attr == _TNL_ATTRIB_POINTSIZE) {
-      /* If the hardware vertex doesn't have point size then use size from
-       * GLcontext.  XXX this will be wrong if drawing attenuated points!
-       */
-      dest[0] = ctx->Point.Size;
-   }
-   else {
-      memcpy( dest, ctx->Current.Attrib[attr], 4*sizeof(GLfloat));
-   }
-}
-
-
-/* Complementary operation to the above.
- */
-void _tnl_set_attr( GLcontext *ctx, void *vout,
-		    GLenum attr, const GLfloat *src )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   const struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint attr_count = vtx->attr_count;
-   GLuint j;
-
-   for (j = 0; j < attr_count; j++) {
-      if (a[j].attrib == attr) {
-	 a[j].insert[4-1]( &a[j], (GLubyte *)vout + a[j].vertoffset, src );
-	 return;
-      }
-   }
-}
-
-
-void *_tnl_get_vertex( GLcontext *ctx, GLuint nr )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-
-   return vtx->vertex_buf + nr * vtx->vertex_size;
-}
-
-void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state )
-{
-   if (new_state & (_DD_NEW_TRI_LIGHT_TWOSIDE|_DD_NEW_TRI_UNFILLED) ) {
-      struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-      vtx->new_inputs = ~0;
-      vtx->interp = choose_interp_func;
-      vtx->copy_pv = choose_copy_pv_func;
-   }
-}
-
-static void invalidate_funcs( struct tnl_clipspace *vtx )
-{
-   vtx->emit = choose_emit_func;
-   vtx->interp = choose_interp_func;
-   vtx->copy_pv = choose_copy_pv_func;
-   vtx->new_inputs = ~0;
-}
-
-GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map,
-			   GLuint nr, const GLfloat *vp, 
-			   GLuint unpacked_size )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   GLuint offset = 0;
-   GLuint i, j;
-
-   assert(nr < _TNL_ATTRIB_MAX);
-   assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS);
-
-   vtx->new_inputs = ~0;
-   vtx->need_viewport = GL_FALSE;
-
-   if (vp) {
-      vtx->need_viewport = GL_TRUE;
-   }
-
-   for (j = 0, i = 0; i < nr; i++) {
-      const GLuint format = map[i].format;
-      if (format == EMIT_PAD) {
-	 if (DBG)
-	    printf("%d: pad %d, offset %d\n", i,  
-		   map[i].offset, offset);  
-
-	 offset += map[i].offset;
-
-      }
-      else {
-	 GLuint tmpoffset;
-
-	 if (unpacked_size) 
-	    tmpoffset = map[i].offset;
-	 else
-	    tmpoffset = offset;
-
-	 if (vtx->attr_count != j ||
-	     vtx->attr[j].attrib != map[i].attrib ||
-	     vtx->attr[j].format != format ||
-	     vtx->attr[j].vertoffset != tmpoffset) {
-	    invalidate_funcs(vtx);
-
-	    vtx->attr[j].attrib = map[i].attrib;
-	    vtx->attr[j].format = format;
-	    vtx->attr[j].vp = vp;
-	    vtx->attr[j].insert = _tnl_format_info[format].insert;
-	    vtx->attr[j].extract = _tnl_format_info[format].extract;
-	    vtx->attr[j].vertattrsize = _tnl_format_info[format].attrsize;
-	    vtx->attr[j].vertoffset = tmpoffset;
-	 }
-
-	 
-	 if (DBG)
-	    printf("%d: %s, vp %p, offset %d\n", i,  
-		   _tnl_format_info[format].name, (void *)vp,
-		   vtx->attr[j].vertoffset);   
-
-	 offset += _tnl_format_info[format].attrsize;
-	 j++;
-      }
-   }
-
-   vtx->attr_count = j;
-
-   if (unpacked_size)
-      vtx->vertex_size = unpacked_size;
-   else
-      vtx->vertex_size = offset;
-
-   assert(vtx->vertex_size <= vtx->max_vertex_size);
-   return vtx->vertex_size;
-}
-
-
-
-void _tnl_invalidate_vertices( GLcontext *ctx, GLuint newinputs )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   vtx->new_inputs |= newinputs;
-}
-
-
-/* This event has broader use beyond this file - will move elsewhere
- * and probably invoke a driver callback.
- */
-void _tnl_notify_pipeline_output_change( GLcontext *ctx )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   invalidate_funcs(vtx);
-}
-
-
-static void adjust_input_ptrs( GLcontext *ctx, GLint diff)
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint count = vtx->attr_count;
-   GLuint j;
-
-   diff -= 1;
-   for (j=0; j<count; ++j) {
-           register GLvector4f *vptr = VB->AttribPtr[a->attrib];
-	   (a++)->inputptr += diff*vptr->stride;
-   }
-}
-
-static void update_input_ptrs( GLcontext *ctx, GLuint start )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint count = vtx->attr_count;
-   GLuint j;
-   
-   for (j = 0; j < count; j++) {
-      GLvector4f *vptr = VB->AttribPtr[a[j].attrib];
-
-      if (vtx->emit != choose_emit_func) {
-	 assert(a[j].inputstride == vptr->stride);
-	 assert(a[j].inputsize == vptr->size);
-      }
-
-      a[j].inputptr = ((GLubyte *)vptr->data) + start * vptr->stride;
-   }
-   
-   if (a->vp) {
-      vtx->vp_scale[0] = a->vp[MAT_SX];
-      vtx->vp_scale[1] = a->vp[MAT_SY];
-      vtx->vp_scale[2] = a->vp[MAT_SZ];
-      vtx->vp_scale[3] = 1.0;
-      vtx->vp_xlate[0] = a->vp[MAT_TX];
-      vtx->vp_xlate[1] = a->vp[MAT_TY];
-      vtx->vp_xlate[2] = a->vp[MAT_TZ];
-      vtx->vp_xlate[3] = 0.0;
-   }
-}
-
-
-void _tnl_build_vertices( GLcontext *ctx,
-			  GLuint start,
-			  GLuint end,
-			  GLuint newinputs )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);  
-   update_input_ptrs( ctx, start );      
-   vtx->emit( ctx, end - start, 
-	      (GLubyte *)(vtx->vertex_buf + 
-			  start * vtx->vertex_size));
-}
-
-/* Emit VB vertices start..end to dest.  Note that VB vertex at
- * postion start will be emitted to dest at position zero.
- */
-void *_tnl_emit_vertices_to_buffer( GLcontext *ctx,
-				    GLuint start,
-				    GLuint end,
-				    void *dest )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-
-   update_input_ptrs(ctx, start);
-   /* Note: dest should not be adjusted for non-zero 'start' values:
-    */
-   vtx->emit( ctx, end - start, (GLubyte*) dest );	
-   return (void *)((GLubyte *)dest + vtx->vertex_size * (end - start));
-}
-
-/* Emit indexed VB vertices start..end to dest.  Note that VB vertex at
- * postion start will be emitted to dest at position zero.
- */
-
-void *_tnl_emit_indexed_vertices_to_buffer( GLcontext *ctx,
-					    const GLuint *elts,
-					    GLuint start,
-					    GLuint end,
-					    void *dest )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   GLuint oldIndex;
-   GLubyte *cdest = dest;
-
-   update_input_ptrs(ctx, oldIndex = elts[start++]);
-   vtx->emit( ctx, 1, cdest );
-   cdest += vtx->vertex_size;
-
-   for (; start < end; ++start) {
-      adjust_input_ptrs(ctx, elts[start] - oldIndex);
-      oldIndex = elts[start];
-      vtx->emit( ctx, 1, cdest);
-      cdest += vtx->vertex_size;
-   }
-
-   return (void *) cdest;
-}
-
-
-void _tnl_init_vertices( GLcontext *ctx, 
-			GLuint vb_size,
-			GLuint max_vertex_size )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);  
-
-   _tnl_install_attrs( ctx, NULL, 0, NULL, 0 );
-
-   vtx->need_extras = GL_TRUE;
-   if (max_vertex_size > vtx->max_vertex_size) {
-      _tnl_free_vertices( ctx );
-      vtx->max_vertex_size = max_vertex_size;
-      vtx->vertex_buf = (GLubyte *)_mesa_align_calloc(vb_size * max_vertex_size, 32 );
-      invalidate_funcs(vtx);
-   }
-
-   switch(CHAN_TYPE) {
-   case GL_UNSIGNED_BYTE:
-      vtx->chan_scale[0] = 255.0;
-      vtx->chan_scale[1] = 255.0;
-      vtx->chan_scale[2] = 255.0;
-      vtx->chan_scale[3] = 255.0;
-      break;
-   case GL_UNSIGNED_SHORT:
-      vtx->chan_scale[0] = 65535.0;
-      vtx->chan_scale[1] = 65535.0;
-      vtx->chan_scale[2] = 65535.0;
-      vtx->chan_scale[3] = 65535.0;
-      break;
-   default:
-      vtx->chan_scale[0] = 1.0;
-      vtx->chan_scale[1] = 1.0;
-      vtx->chan_scale[2] = 1.0;
-      vtx->chan_scale[3] = 1.0;
-      break;
-   }
-
-   vtx->identity[0] = 0.0;
-   vtx->identity[1] = 0.0;
-   vtx->identity[2] = 0.0;
-   vtx->identity[3] = 1.0;
-
-   vtx->codegen_emit = NULL;
-
-#ifdef USE_SSE_ASM
-   if (!_mesa_getenv("MESA_NO_CODEGEN"))
-      vtx->codegen_emit = _tnl_generate_sse_emit;
-#endif
-}
-
-
-void _tnl_free_vertices( GLcontext *ctx )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   if (tnl) {
-      struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-      struct tnl_clipspace_fastpath *fp, *tmp;
-
-      if (vtx->vertex_buf) {
-         _mesa_align_free(vtx->vertex_buf);
-         vtx->vertex_buf = NULL;
-      }
-
-      for (fp = vtx->fastpath ; fp ; fp = tmp) {
-         tmp = fp->next;
-         FREE(fp->attr);
-
-         /* KW: At the moment, fp->func is constrained to be allocated by
-          * _mesa_exec_alloc(), as the hardwired fastpaths in
-          * t_vertex_generic.c are handled specially.  It would be nice
-          * to unify them, but this probably won't change until this
-          * module gets another overhaul.
-          */
-         _mesa_exec_free((void *) fp->func);
-         FREE(fp);
-      }
-
-      vtx->fastpath = NULL;
-   }
-}
+/*

+ * Copyright 2003 Tungsten Graphics, 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

+ * 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 <keithw@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+

+#include "t_context.h"

+#include "t_vertex.h"

+

+#define DBG 0

+

+/* Build and manage clipspace/ndc/window vertices.

+ */

+

+static GLboolean match_fastpath( struct tnl_clipspace *vtx,

+				 const struct tnl_clipspace_fastpath *fp)

+{

+   GLuint j;

+

+   if (vtx->attr_count != fp->attr_count) 

+      return GL_FALSE;

+

+   for (j = 0; j < vtx->attr_count; j++) 

+      if (vtx->attr[j].format != fp->attr[j].format ||

+	  vtx->attr[j].inputsize != fp->attr[j].size ||

+	  vtx->attr[j].vertoffset != fp->attr[j].offset) 

+	 return GL_FALSE;

+      

+   if (fp->match_strides) {

+      if (vtx->vertex_size != fp->vertex_size)

+	 return GL_FALSE;

+

+      for (j = 0; j < vtx->attr_count; j++) 

+	 if (vtx->attr[j].inputstride != fp->attr[j].stride) 

+	    return GL_FALSE;

+   }

+   

+   return GL_TRUE;

+}

+

+static GLboolean search_fastpath_emit( struct tnl_clipspace *vtx )

+{

+   struct tnl_clipspace_fastpath *fp = vtx->fastpath;

+

+   for ( ; fp ; fp = fp->next) {

+      if (match_fastpath(vtx, fp)) {

+         vtx->emit = fp->func;

+	 return GL_TRUE;

+      }

+   }

+

+   return GL_FALSE;

+}

+

+void _tnl_register_fastpath( struct tnl_clipspace *vtx,

+			     GLboolean match_strides )

+{

+   struct tnl_clipspace_fastpath *fastpath = CALLOC_STRUCT(tnl_clipspace_fastpath);

+   GLuint i;

+

+   fastpath->vertex_size = vtx->vertex_size;

+   fastpath->attr_count = vtx->attr_count;

+   fastpath->match_strides = match_strides;

+   fastpath->func = vtx->emit;

+   fastpath->attr = (struct tnl_attr_type *)

+      malloc(vtx->attr_count * sizeof(fastpath->attr[0]));

+

+   for (i = 0; i < vtx->attr_count; i++) {

+      fastpath->attr[i].format = vtx->attr[i].format;

+      fastpath->attr[i].stride = vtx->attr[i].inputstride;

+      fastpath->attr[i].size = vtx->attr[i].inputsize;

+      fastpath->attr[i].offset = vtx->attr[i].vertoffset;

+   }

+

+   fastpath->next = vtx->fastpath;

+   vtx->fastpath = fastpath;

+}

+

+

+

+/***********************************************************************

+ * Build codegen functions or return generic ones:

+ */

+static void choose_emit_func( struct gl_context *ctx, GLuint count, GLubyte *dest)

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint attr_count = vtx->attr_count;

+   GLuint j;

+

+   for (j = 0; j < attr_count; j++) {

+      GLvector4f *vptr = VB->AttribPtr[a[j].attrib];

+      a[j].inputstride = vptr->stride;

+      a[j].inputsize = vptr->size;

+      a[j].emit = a[j].insert[vptr->size - 1]; /* not always used */

+   }

+

+   vtx->emit = NULL;

+   

+   /* Does this match an existing (hardwired, codegen or known-bad)

+    * fastpath?

+    */

+   if (search_fastpath_emit(vtx)) {

+      /* Use this result.  If it is null, then it is already known

+       * that the current state will fail for codegen and there is no

+       * point trying again.

+       */

+   }

+   else if (vtx->codegen_emit) {

+      vtx->codegen_emit(ctx);

+   }

+

+   if (!vtx->emit) {

+      _tnl_generate_hardwired_emit(ctx);

+   }

+

+   /* Otherwise use the generic version:

+    */

+   if (!vtx->emit)

+      vtx->emit = _tnl_generic_emit;

+

+   vtx->emit( ctx, count, dest );

+}

+

+

+

+static void choose_interp_func( struct gl_context *ctx,

+				GLfloat t,

+				GLuint edst, GLuint eout, GLuint ein,

+				GLboolean force_boundary )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+

+   if (vtx->need_extras && 

+       (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {

+      vtx->interp = _tnl_generic_interp_extras;

+   } else {

+      vtx->interp = _tnl_generic_interp;

+   }

+

+   vtx->interp( ctx, t, edst, eout, ein, force_boundary );

+}

+

+

+static void choose_copy_pv_func(  struct gl_context *ctx, GLuint edst, GLuint esrc )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+

+   if (vtx->need_extras && 

+       (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED))) {

+      vtx->copy_pv = _tnl_generic_copy_pv_extras;

+   } else {

+      vtx->copy_pv = _tnl_generic_copy_pv;

+   }

+

+   vtx->copy_pv( ctx, edst, esrc );

+}

+

+

+/***********************************************************************

+ * Public entrypoints, mostly dispatch to the above:

+ */

+

+

+/* Interpolate between two vertices to produce a third:

+ */

+void _tnl_interp( struct gl_context *ctx,

+		  GLfloat t,

+		  GLuint edst, GLuint eout, GLuint ein,

+		  GLboolean force_boundary )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   vtx->interp( ctx, t, edst, eout, ein, force_boundary );

+}

+

+/* Copy colors from one vertex to another:

+ */

+void _tnl_copy_pv(  struct gl_context *ctx, GLuint edst, GLuint esrc )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   vtx->copy_pv( ctx, edst, esrc );

+}

+

+

+/* Extract a named attribute from a hardware vertex.  Will have to

+ * reverse any viewport transformation, swizzling or other conversions

+ * which may have been applied:

+ */

+void _tnl_get_attr( struct gl_context *ctx, const void *vin,

+			      GLenum attr, GLfloat *dest )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   const struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint attr_count = vtx->attr_count;

+   GLuint j;

+

+   for (j = 0; j < attr_count; j++) {

+      if (a[j].attrib == attr) {

+	 a[j].extract( &a[j], dest, (GLubyte *)vin + a[j].vertoffset );

+	 return;

+      }

+   }

+

+   /* Else return the value from ctx->Current.

+    */

+   if (attr == _TNL_ATTRIB_POINTSIZE) {

+      /* If the hardware vertex doesn't have point size then use size from

+       * struct gl_context.  XXX this will be wrong if drawing attenuated points!

+       */

+      dest[0] = ctx->Point.Size;

+   }

+   else {

+      memcpy( dest, ctx->Current.Attrib[attr], 4*sizeof(GLfloat));

+   }

+}

+

+

+/* Complementary operation to the above.

+ */

+void _tnl_set_attr( struct gl_context *ctx, void *vout,

+		    GLenum attr, const GLfloat *src )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   const struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint attr_count = vtx->attr_count;

+   GLuint j;

+

+   for (j = 0; j < attr_count; j++) {

+      if (a[j].attrib == attr) {

+	 a[j].insert[4-1]( &a[j], (GLubyte *)vout + a[j].vertoffset, src );

+	 return;

+      }

+   }

+}

+

+

+void *_tnl_get_vertex( struct gl_context *ctx, GLuint nr )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+

+   return vtx->vertex_buf + nr * vtx->vertex_size;

+}

+

+void _tnl_invalidate_vertex_state( struct gl_context *ctx, GLuint new_state )

+{

+   if (new_state & (_DD_NEW_TRI_LIGHT_TWOSIDE|_DD_NEW_TRI_UNFILLED) ) {

+      struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+      vtx->new_inputs = ~0;

+      vtx->interp = choose_interp_func;

+      vtx->copy_pv = choose_copy_pv_func;

+   }

+}

+

+static void invalidate_funcs( struct tnl_clipspace *vtx )

+{

+   vtx->emit = choose_emit_func;

+   vtx->interp = choose_interp_func;

+   vtx->copy_pv = choose_copy_pv_func;

+   vtx->new_inputs = ~0;

+}

+

+GLuint _tnl_install_attrs( struct gl_context *ctx, const struct tnl_attr_map *map,

+			   GLuint nr, const GLfloat *vp, 

+			   GLuint unpacked_size )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   GLuint offset = 0;

+   GLuint i, j;

+

+   assert(nr < _TNL_ATTRIB_MAX);

+   assert(nr == 0 || map[0].attrib == VERT_ATTRIB_POS);

+

+   vtx->new_inputs = ~0;

+   vtx->need_viewport = GL_FALSE;

+

+   if (vp) {

+      vtx->need_viewport = GL_TRUE;

+   }

+

+   for (j = 0, i = 0; i < nr; i++) {

+      const GLuint format = map[i].format;

+      if (format == EMIT_PAD) {

+	 if (DBG)

+	    printf("%d: pad %d, offset %d\n", i,  

+		   map[i].offset, offset);  

+

+	 offset += map[i].offset;

+

+      }

+      else {

+	 GLuint tmpoffset;

+

+	 if (unpacked_size) 

+	    tmpoffset = map[i].offset;

+	 else

+	    tmpoffset = offset;

+

+	 if (vtx->attr_count != j ||

+	     vtx->attr[j].attrib != map[i].attrib ||

+	     vtx->attr[j].format != format ||

+	     vtx->attr[j].vertoffset != tmpoffset) {

+	    invalidate_funcs(vtx);

+

+	    vtx->attr[j].attrib = map[i].attrib;

+	    vtx->attr[j].format = format;

+	    vtx->attr[j].vp = vp;

+	    vtx->attr[j].insert = _tnl_format_info[format].insert;

+	    vtx->attr[j].extract = _tnl_format_info[format].extract;

+	    vtx->attr[j].vertattrsize = _tnl_format_info[format].attrsize;

+	    vtx->attr[j].vertoffset = tmpoffset;

+	 }

+

+	 

+	 if (DBG)

+	    printf("%d: %s, vp %p, offset %d\n", i,  

+		   _tnl_format_info[format].name, (void *)vp,

+		   vtx->attr[j].vertoffset);   

+

+	 offset += _tnl_format_info[format].attrsize;

+	 j++;

+      }

+   }

+

+   vtx->attr_count = j;

+

+   if (unpacked_size)

+      vtx->vertex_size = unpacked_size;

+   else

+      vtx->vertex_size = offset;

+

+   assert(vtx->vertex_size <= vtx->max_vertex_size);

+   return vtx->vertex_size;

+}

+

+

+

+void _tnl_invalidate_vertices( struct gl_context *ctx, GLuint newinputs )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   vtx->new_inputs |= newinputs;

+}

+

+

+/* This event has broader use beyond this file - will move elsewhere

+ * and probably invoke a driver callback.

+ */

+void _tnl_notify_pipeline_output_change( struct gl_context *ctx )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   invalidate_funcs(vtx);

+}

+

+

+static void adjust_input_ptrs( struct gl_context *ctx, GLint diff)

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint count = vtx->attr_count;

+   GLuint j;

+

+   diff -= 1;

+   for (j=0; j<count; ++j) {

+           register GLvector4f *vptr = VB->AttribPtr[a->attrib];

+	   (a++)->inputptr += diff*vptr->stride;

+   }

+}

+

+static void update_input_ptrs( struct gl_context *ctx, GLuint start )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint count = vtx->attr_count;

+   GLuint j;

+   

+   for (j = 0; j < count; j++) {

+      GLvector4f *vptr = VB->AttribPtr[a[j].attrib];

+

+      if (vtx->emit != choose_emit_func) {

+	 assert(a[j].inputstride == vptr->stride);

+	 assert(a[j].inputsize == vptr->size);

+      }

+

+      a[j].inputptr = ((GLubyte *)vptr->data) + start * vptr->stride;

+   }

+   

+   if (a->vp) {

+      vtx->vp_scale[0] = a->vp[MAT_SX];

+      vtx->vp_scale[1] = a->vp[MAT_SY];

+      vtx->vp_scale[2] = a->vp[MAT_SZ];

+      vtx->vp_scale[3] = 1.0;

+      vtx->vp_xlate[0] = a->vp[MAT_TX];

+      vtx->vp_xlate[1] = a->vp[MAT_TY];

+      vtx->vp_xlate[2] = a->vp[MAT_TZ];

+      vtx->vp_xlate[3] = 0.0;

+   }

+}

+

+

+void _tnl_build_vertices( struct gl_context *ctx,

+			  GLuint start,

+			  GLuint end,

+			  GLuint newinputs )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);  

+   update_input_ptrs( ctx, start );      

+   vtx->emit( ctx, end - start, 

+	      (GLubyte *)(vtx->vertex_buf + 

+			  start * vtx->vertex_size));

+}

+

+/* Emit VB vertices start..end to dest.  Note that VB vertex at

+ * postion start will be emitted to dest at position zero.

+ */

+void *_tnl_emit_vertices_to_buffer( struct gl_context *ctx,

+				    GLuint start,

+				    GLuint end,

+				    void *dest )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+

+   update_input_ptrs(ctx, start);

+   /* Note: dest should not be adjusted for non-zero 'start' values:

+    */

+   vtx->emit( ctx, end - start, (GLubyte*) dest );	

+   return (void *)((GLubyte *)dest + vtx->vertex_size * (end - start));

+}

+

+/* Emit indexed VB vertices start..end to dest.  Note that VB vertex at

+ * postion start will be emitted to dest at position zero.

+ */

+

+void *_tnl_emit_indexed_vertices_to_buffer( struct gl_context *ctx,

+					    const GLuint *elts,

+					    GLuint start,

+					    GLuint end,

+					    void *dest )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   GLuint oldIndex;

+   GLubyte *cdest = dest;

+

+   update_input_ptrs(ctx, oldIndex = elts[start++]);

+   vtx->emit( ctx, 1, cdest );

+   cdest += vtx->vertex_size;

+

+   for (; start < end; ++start) {

+      adjust_input_ptrs(ctx, elts[start] - oldIndex);

+      oldIndex = elts[start];

+      vtx->emit( ctx, 1, cdest);

+      cdest += vtx->vertex_size;

+   }

+

+   return (void *) cdest;

+}

+

+

+void _tnl_init_vertices( struct gl_context *ctx, 

+			GLuint vb_size,

+			GLuint max_vertex_size )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);  

+

+   _tnl_install_attrs( ctx, NULL, 0, NULL, 0 );

+

+   vtx->need_extras = GL_TRUE;

+   if (max_vertex_size > vtx->max_vertex_size) {

+      _tnl_free_vertices( ctx );

+      vtx->max_vertex_size = max_vertex_size;

+      vtx->vertex_buf = (GLubyte *)_mesa_align_calloc(vb_size * max_vertex_size, 32 );

+      invalidate_funcs(vtx);

+   }

+

+   switch(CHAN_TYPE) {

+   case GL_UNSIGNED_BYTE:

+      vtx->chan_scale[0] = 255.0;

+      vtx->chan_scale[1] = 255.0;

+      vtx->chan_scale[2] = 255.0;

+      vtx->chan_scale[3] = 255.0;

+      break;

+   case GL_UNSIGNED_SHORT:

+      vtx->chan_scale[0] = 65535.0;

+      vtx->chan_scale[1] = 65535.0;

+      vtx->chan_scale[2] = 65535.0;

+      vtx->chan_scale[3] = 65535.0;

+      break;

+   default:

+      vtx->chan_scale[0] = 1.0;

+      vtx->chan_scale[1] = 1.0;

+      vtx->chan_scale[2] = 1.0;

+      vtx->chan_scale[3] = 1.0;

+      break;

+   }

+

+   vtx->identity[0] = 0.0;

+   vtx->identity[1] = 0.0;

+   vtx->identity[2] = 0.0;

+   vtx->identity[3] = 1.0;

+

+   vtx->codegen_emit = NULL;

+

+#ifdef USE_SSE_ASM

+   if (!_mesa_getenv("MESA_NO_CODEGEN"))

+      vtx->codegen_emit = _tnl_generate_sse_emit;

+#endif

+}

+

+

+void _tnl_free_vertices( struct gl_context *ctx )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   if (tnl) {

+      struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+      struct tnl_clipspace_fastpath *fp, *tmp;

+

+      if (vtx->vertex_buf) {

+         _mesa_align_free(vtx->vertex_buf);

+         vtx->vertex_buf = NULL;

+      }

+

+      for (fp = vtx->fastpath ; fp ; fp = tmp) {

+         tmp = fp->next;

+         FREE(fp->attr);

+

+         /* KW: At the moment, fp->func is constrained to be allocated by

+          * _mesa_exec_alloc(), as the hardwired fastpaths in

+          * t_vertex_generic.c are handled specially.  It would be nice

+          * to unify them, but this probably won't change until this

+          * module gets another overhaul.

+          */

+         _mesa_exec_free((void *) fp->func);

+         FREE(fp);

+      }

+

+      vtx->fastpath = NULL;

+   }

+}

diff --git a/mesalib/src/mesa/tnl/t_vertex.h b/mesalib/src/mesa/tnl/t_vertex.h
index 2dfd7b57f..580961037 100644
--- a/mesalib/src/mesa/tnl/t_vertex.h
+++ b/mesalib/src/mesa/tnl/t_vertex.h
@@ -1,181 +1,181 @@
-/*
- * Copyright 2003 Tungsten Graphics, 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
- * 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 <keithw@tungstengraphics.com>
- */
-
-#ifndef _TNL_VERTEX_H
-#define _TNL_VERTEX_H
-
-#include "main/mtypes.h"
-#include "t_context.h"
-
-/* New mechanism to specify hardware vertices so that tnl can build
- * and manipulate them directly.  
- */
-
-
-/* It will probably be necessary to allow drivers to specify new
- * emit-styles to cover all the wierd and wacky things out there.
- */
-enum tnl_attr_format {
-   EMIT_1F,
-   EMIT_2F,
-   EMIT_3F,
-   EMIT_4F,
-   EMIT_2F_VIEWPORT,		/* do viewport transform and emit */
-   EMIT_3F_VIEWPORT,		/* do viewport transform and emit */
-   EMIT_4F_VIEWPORT,		/* do viewport transform and emit */
-   EMIT_3F_XYW,			/* for projective texture */
-   EMIT_1UB_1F,			/* for fog coordinate */
-   EMIT_3UB_3F_RGB,		/* for specular color */
-   EMIT_3UB_3F_BGR,		/* for specular color */
-   EMIT_4UB_4F_RGBA,		/* for color */
-   EMIT_4UB_4F_BGRA,		/* for color */
-   EMIT_4UB_4F_ARGB,		/* for color */
-   EMIT_4UB_4F_ABGR,		/* for color */
-   EMIT_4CHAN_4F_RGBA,		/* for swrast color */
-   EMIT_PAD,			/* leave a hole of 'offset' bytes */
-   EMIT_MAX
-};
-
-struct tnl_attr_map {
-   GLuint attrib;			/* _TNL_ATTRIB_ enum */
-   enum tnl_attr_format format;
-   GLuint offset;
-};
-
-struct tnl_format_info {
-   const char *name;
-   tnl_extract_func extract;
-   tnl_insert_func insert[4];
-   const GLuint attrsize;
-};
-
-extern const struct tnl_format_info _tnl_format_info[EMIT_MAX];
-
-
-/* Interpolate between two vertices to produce a third:
- */
-extern void _tnl_interp( GLcontext *ctx,
-			 GLfloat t,
-			 GLuint edst, GLuint eout, GLuint ein,
-			 GLboolean force_boundary );
-
-/* Copy colors from one vertex to another:
- */
-extern void _tnl_copy_pv(  GLcontext *ctx, GLuint edst, GLuint esrc );
-
-
-/* Extract a named attribute from a hardware vertex.  Will have to
- * reverse any viewport transformation, swizzling or other conversions
- * which may have been applied:
- */
-extern void _tnl_get_attr( GLcontext *ctx, const void *vertex, GLenum attrib,
-			   GLfloat *dest );
-
-/* Complementary to the above.
- */
-extern void _tnl_set_attr( GLcontext *ctx, void *vout, GLenum attrib, 
-			   const GLfloat *src );
-
-
-extern void *_tnl_get_vertex( GLcontext *ctx, GLuint nr );
-
-extern GLuint _tnl_install_attrs( GLcontext *ctx,
-				  const struct tnl_attr_map *map,
-				  GLuint nr, const GLfloat *vp,
-				  GLuint unpacked_size );
-
-extern void _tnl_free_vertices( GLcontext *ctx );
-
-extern void _tnl_init_vertices( GLcontext *ctx, 
-				GLuint vb_size,
-				GLuint max_vertex_size );
-
-extern void *_tnl_emit_vertices_to_buffer( GLcontext *ctx,
-					   GLuint start,
-					   GLuint end,
-					   void *dest );
-
-/* This function isn't optimal. Check out 
- * gallium/auxilary/translate for a more comprehensive implementation of
- * the same functionality.
- */
-  
-extern void *_tnl_emit_indexed_vertices_to_buffer( GLcontext *ctx,
-						   const GLuint *elts,
-						   GLuint start,
-						   GLuint end,
-						   void *dest );
-
-
-extern void _tnl_build_vertices( GLcontext *ctx,
-				 GLuint start,
-				 GLuint end,
-				 GLuint newinputs );
-
-extern void _tnl_invalidate_vertices( GLcontext *ctx, GLuint newinputs );
-
-extern void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state );
-
-extern void _tnl_notify_pipeline_output_change( GLcontext *ctx );
-
-
-#define GET_VERTEX_STATE(ctx)  &(TNL_CONTEXT(ctx)->clipspace)
-
-/* Internal function:
- */
-void _tnl_register_fastpath( struct tnl_clipspace *vtx,
-			     GLboolean match_strides );
-
-
-/* t_vertex_generic.c -- Internal functions for t_vertex.c
- */
-void _tnl_generic_copy_pv_extras( GLcontext *ctx, 
-				  GLuint dst, GLuint src );
-
-void _tnl_generic_interp_extras( GLcontext *ctx,
-				 GLfloat t,
-				 GLuint dst, GLuint out, GLuint in,
-				 GLboolean force_boundary );
-
-void _tnl_generic_copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc );
-
-void _tnl_generic_interp( GLcontext *ctx,
-			  GLfloat t,
-			  GLuint edst, GLuint eout, GLuint ein,
-			  GLboolean force_boundary );
-
-void _tnl_generic_emit( GLcontext *ctx,
-			GLuint count,
-			GLubyte *v );
-
-void _tnl_generate_hardwired_emit( GLcontext *ctx );
-
-/* t_vertex_sse.c -- Internal functions for t_vertex.c
- */
-void _tnl_generate_sse_emit( GLcontext *ctx );
-
-#endif
+/*

+ * Copyright 2003 Tungsten Graphics, 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

+ * 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 <keithw@tungstengraphics.com>

+ */

+

+#ifndef _TNL_VERTEX_H

+#define _TNL_VERTEX_H

+

+#include "main/mtypes.h"

+#include "t_context.h"

+

+/* New mechanism to specify hardware vertices so that tnl can build

+ * and manipulate them directly.  

+ */

+

+

+/* It will probably be necessary to allow drivers to specify new

+ * emit-styles to cover all the wierd and wacky things out there.

+ */

+enum tnl_attr_format {

+   EMIT_1F,

+   EMIT_2F,

+   EMIT_3F,

+   EMIT_4F,

+   EMIT_2F_VIEWPORT,		/* do viewport transform and emit */

+   EMIT_3F_VIEWPORT,		/* do viewport transform and emit */

+   EMIT_4F_VIEWPORT,		/* do viewport transform and emit */

+   EMIT_3F_XYW,			/* for projective texture */

+   EMIT_1UB_1F,			/* for fog coordinate */

+   EMIT_3UB_3F_RGB,		/* for specular color */

+   EMIT_3UB_3F_BGR,		/* for specular color */

+   EMIT_4UB_4F_RGBA,		/* for color */

+   EMIT_4UB_4F_BGRA,		/* for color */

+   EMIT_4UB_4F_ARGB,		/* for color */

+   EMIT_4UB_4F_ABGR,		/* for color */

+   EMIT_4CHAN_4F_RGBA,		/* for swrast color */

+   EMIT_PAD,			/* leave a hole of 'offset' bytes */

+   EMIT_MAX

+};

+

+struct tnl_attr_map {

+   GLuint attrib;			/* _TNL_ATTRIB_ enum */

+   enum tnl_attr_format format;

+   GLuint offset;

+};

+

+struct tnl_format_info {

+   const char *name;

+   tnl_extract_func extract;

+   tnl_insert_func insert[4];

+   const GLuint attrsize;

+};

+

+extern const struct tnl_format_info _tnl_format_info[EMIT_MAX];

+

+

+/* Interpolate between two vertices to produce a third:

+ */

+extern void _tnl_interp( struct gl_context *ctx,

+			 GLfloat t,

+			 GLuint edst, GLuint eout, GLuint ein,

+			 GLboolean force_boundary );

+

+/* Copy colors from one vertex to another:

+ */

+extern void _tnl_copy_pv(  struct gl_context *ctx, GLuint edst, GLuint esrc );

+

+

+/* Extract a named attribute from a hardware vertex.  Will have to

+ * reverse any viewport transformation, swizzling or other conversions

+ * which may have been applied:

+ */

+extern void _tnl_get_attr( struct gl_context *ctx, const void *vertex, GLenum attrib,

+			   GLfloat *dest );

+

+/* Complementary to the above.

+ */

+extern void _tnl_set_attr( struct gl_context *ctx, void *vout, GLenum attrib, 

+			   const GLfloat *src );

+

+

+extern void *_tnl_get_vertex( struct gl_context *ctx, GLuint nr );

+

+extern GLuint _tnl_install_attrs( struct gl_context *ctx,

+				  const struct tnl_attr_map *map,

+				  GLuint nr, const GLfloat *vp,

+				  GLuint unpacked_size );

+

+extern void _tnl_free_vertices( struct gl_context *ctx );

+

+extern void _tnl_init_vertices( struct gl_context *ctx, 

+				GLuint vb_size,

+				GLuint max_vertex_size );

+

+extern void *_tnl_emit_vertices_to_buffer( struct gl_context *ctx,

+					   GLuint start,

+					   GLuint end,

+					   void *dest );

+

+/* This function isn't optimal. Check out 

+ * gallium/auxilary/translate for a more comprehensive implementation of

+ * the same functionality.

+ */

+  

+extern void *_tnl_emit_indexed_vertices_to_buffer( struct gl_context *ctx,

+						   const GLuint *elts,

+						   GLuint start,

+						   GLuint end,

+						   void *dest );

+

+

+extern void _tnl_build_vertices( struct gl_context *ctx,

+				 GLuint start,

+				 GLuint end,

+				 GLuint newinputs );

+

+extern void _tnl_invalidate_vertices( struct gl_context *ctx, GLuint newinputs );

+

+extern void _tnl_invalidate_vertex_state( struct gl_context *ctx, GLuint new_state );

+

+extern void _tnl_notify_pipeline_output_change( struct gl_context *ctx );

+

+

+#define GET_VERTEX_STATE(ctx)  &(TNL_CONTEXT(ctx)->clipspace)

+

+/* Internal function:

+ */

+void _tnl_register_fastpath( struct tnl_clipspace *vtx,

+			     GLboolean match_strides );

+

+

+/* t_vertex_generic.c -- Internal functions for t_vertex.c

+ */

+void _tnl_generic_copy_pv_extras( struct gl_context *ctx, 

+				  GLuint dst, GLuint src );

+

+void _tnl_generic_interp_extras( struct gl_context *ctx,

+				 GLfloat t,

+				 GLuint dst, GLuint out, GLuint in,

+				 GLboolean force_boundary );

+

+void _tnl_generic_copy_pv( struct gl_context *ctx, GLuint edst, GLuint esrc );

+

+void _tnl_generic_interp( struct gl_context *ctx,

+			  GLfloat t,

+			  GLuint edst, GLuint eout, GLuint ein,

+			  GLboolean force_boundary );

+

+void _tnl_generic_emit( struct gl_context *ctx,

+			GLuint count,

+			GLubyte *v );

+

+void _tnl_generate_hardwired_emit( struct gl_context *ctx );

+

+/* t_vertex_sse.c -- Internal functions for t_vertex.c

+ */

+void _tnl_generate_sse_emit( struct gl_context *ctx );

+

+#endif

diff --git a/mesalib/src/mesa/tnl/t_vertex_generic.c b/mesalib/src/mesa/tnl/t_vertex_generic.c
index b1ea14246..144b3669d 100644
--- a/mesalib/src/mesa/tnl/t_vertex_generic.c
+++ b/mesalib/src/mesa/tnl/t_vertex_generic.c
@@ -1,1155 +1,1155 @@
-
-/*
- * Copyright 2003 Tungsten Graphics, 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
- * 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 <keithw@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/simple_list.h"
-#include "t_context.h"
-#include "t_vertex.h"
-
-
-#if 0
-#define DEBUG_INSERT printf("%s\n", __FUNCTION__)
-#else
-#define DEBUG_INSERT
-#endif
-
-
-/*
- * These functions take the NDC coordinates pointed to by 'in', apply the
- * NDC->Viewport mapping and store the results at 'v'.
- */
-
-static INLINE void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,
-                      const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[5] * in[1] + vp[13];
-   out[2] = vp[10] * in[2] + vp[14];
-   out[3] = in[3];
-}
-
-static INLINE void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[5] * in[1] + vp[13];
-   out[2] = vp[10] * in[2] + vp[14];
-   out[3] = 1;
-}
-
-static INLINE void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[5] * in[1] + vp[13];
-   out[2] = vp[14];
-   out[3] = 1;
-}
-
-static INLINE void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[13];
-   out[2] = vp[14];
-   out[3] = 1;
-}
-
-static INLINE void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[5] * in[1] + vp[13];
-   out[2] = vp[10] * in[2] + vp[14];
-}
-
-static INLINE void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[5] * in[1] + vp[13];
-   out[2] = vp[14];
-}
-
-static INLINE void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[13];
-   out[2] = vp[14];
-}
-
-static INLINE void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[5] * in[1] + vp[13];
-}
-
-static INLINE void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
-				const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = vp[0] * in[0] + vp[12];
-   out[1] = vp[13];
-}
-
-
-/*
- * These functions do the same as above, except for the viewport mapping.
- */
-
-static INLINE void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = in[2];
-   out[3] = in[3];
-}
-
-static INLINE void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = in[2];
-   out[3] = 1;
-}
-
-static INLINE void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = 0;
-   out[3] = 1;
-}
-
-static INLINE void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = 0;
-   out[2] = 0;
-   out[3] = 1;
-}
-
-static INLINE void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = in[3];
-}
-
-static INLINE void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   (void) a; (void) v; (void) in;
-   DEBUG_INSERT;
-   exit(1);
-}
-
-static INLINE void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = in[2];
-}
-
-static INLINE void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = 0;
-}
-
-static INLINE void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = 0;
-   out[2] = 0;
-}
-
-
-static INLINE void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = in[1];
-}
-
-static INLINE void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-   out[1] = 0;
-}
-
-static INLINE void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   GLfloat *out = (GLfloat *)(v);
-   (void) a;
-   DEBUG_INSERT;
-   out[0] = in[0];
-}
-
-static INLINE void insert_null( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a; (void) v; (void) in;
-}
-
-static INLINE void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				  const GLfloat *in )
-{
-   GLchan *c = (GLchan *)v;
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
-   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 
-   UNCLAMPED_FLOAT_TO_CHAN(c[2], in[2]); 
-   UNCLAMPED_FLOAT_TO_CHAN(c[3], in[3]);
-}
-
-static INLINE void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				  const GLfloat *in )
-{
-   GLchan *c = (GLchan *)v;
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
-   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 
-   UNCLAMPED_FLOAT_TO_CHAN(c[2], in[2]); 
-   c[3] = CHAN_MAX;
-}
-
-static INLINE void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				  const GLfloat *in )
-{
-   GLchan *c = (GLchan *)v;
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
-   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 
-   c[2] = 0;
-   c[3] = CHAN_MAX;
-}
-
-static INLINE void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				  const GLfloat *in )
-{
-   GLchan *c = (GLchan *)v;
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 
-   c[1] = 0;
-   c[2] = 0;
-   c[3] = CHAN_MAX;
-}
-
-static INLINE void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
-}
-
-static INLINE void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
-   v[3] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   v[2] = 0;
-   v[3] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   v[1] = 0;
-   v[2] = 0;
-   v[3] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
-}
-
-static INLINE void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
-   v[3] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   v[0] = 0;
-   v[3] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   v[1] = 0;
-   v[0] = 0;
-   v[3] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[2]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
-}
-
-static INLINE void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[2]);
-   v[0] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
-   v[3] = 0x00;
-   v[0] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);
-   v[2] = 0x00;
-   v[3] = 0x00;
-   v[0] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[2]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
-}
-
-static INLINE void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[2]);
-   v[0] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);
-   v[1] = 0x00;
-   v[0] = 0xff;
-}
-
-static INLINE void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);
-   v[2] = 0x00;
-   v[1] = 0x00;
-   v[0] = 0xff;
-}
-
-static INLINE void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-			       const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
-}
-
-static INLINE void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-			       const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   v[2] = 0;
-}
-
-static INLINE void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-			       const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-   v[1] = 0;
-   v[2] = 0;
-}
-
-static INLINE void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				 const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
-}
-
-static INLINE void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				 const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);
-   v[0] = 0;
-}
-
-static INLINE void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-				 const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);
-   v[1] = 0;
-   v[0] = 0;
-}
-
-
-static INLINE void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
-			   const GLfloat *in )
-{
-   DEBUG_INSERT;
-   (void) a;
-   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);
-}
-
-
-/***********************************************************************
- * Functions to perform the reverse operations to the above, for
- * swrast translation and clip-interpolation.
- * 
- * Currently always extracts a full 4 floats.
- */
-
-static void extract_4f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   
-   /* Although included for completeness, the position coordinate is
-    * usually handled differently during clipping.
-    */
-   DEBUG_INSERT;
-   out[0] = (in[0] - vp[12]) / vp[0];
-   out[1] = (in[1] - vp[13]) / vp[5];
-   out[2] = (in[2] - vp[14]) / vp[10];
-   out[3] = in[3];
-}
-
-static void extract_3f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = (in[0] - vp[12]) / vp[0];
-   out[1] = (in[1] - vp[13]) / vp[5];
-   out[2] = (in[2] - vp[14]) / vp[10];
-   out[3] = 1;
-}
-
-
-static void extract_2f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   const GLfloat * const vp = a->vp;
-   DEBUG_INSERT;
-   out[0] = (in[0] - vp[12]) / vp[0];
-   out[1] = (in[1] - vp[13]) / vp[5];
-   out[2] = 0;
-   out[3] = 1;
-}
-
-
-static void extract_4f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v  )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   (void) a;
-   
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = in[2];
-   out[3] = in[3];
-}
-
-static void extract_3f_xyw( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   (void) a;
-   
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = 0;
-   out[3] = in[2];
-}
-
-
-static void extract_3f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   (void) a;
-   
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = in[2];
-   out[3] = 1;
-}
-
-
-static void extract_2f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   (void) a;
-   
-   out[0] = in[0];
-   out[1] = in[1];
-   out[2] = 0;
-   out[3] = 1;
-}
-
-static void extract_1f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
-{
-   const GLfloat *in = (const GLfloat *)v;
-   (void) a;
-   
-   out[0] = in[0];
-   out[1] = 0;
-   out[2] = 0;
-   out[3] = 1;
-}
-
-static void extract_4chan_4f_rgba( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   GLchan *c = (GLchan *)v;
-   (void) a;
-
-   out[0] = CHAN_TO_FLOAT(c[0]);
-   out[1] = CHAN_TO_FLOAT(c[1]);
-   out[2] = CHAN_TO_FLOAT(c[2]);
-   out[3] = CHAN_TO_FLOAT(c[3]);
-}
-
-static void extract_4ub_4f_rgba( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   (void) a;
-   out[0] = UBYTE_TO_FLOAT(v[0]);
-   out[1] = UBYTE_TO_FLOAT(v[1]);
-   out[2] = UBYTE_TO_FLOAT(v[2]);
-   out[3] = UBYTE_TO_FLOAT(v[3]);
-}
-
-static void extract_4ub_4f_bgra( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   (void) a;
-   out[2] = UBYTE_TO_FLOAT(v[0]);
-   out[1] = UBYTE_TO_FLOAT(v[1]);
-   out[0] = UBYTE_TO_FLOAT(v[2]);
-   out[3] = UBYTE_TO_FLOAT(v[3]);
-}
-
-static void extract_4ub_4f_argb( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   (void) a;
-   out[3] = UBYTE_TO_FLOAT(v[0]);
-   out[0] = UBYTE_TO_FLOAT(v[1]);
-   out[1] = UBYTE_TO_FLOAT(v[2]);
-   out[2] = UBYTE_TO_FLOAT(v[3]);
-}
-
-static void extract_4ub_4f_abgr( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				 const GLubyte *v )
-{
-   (void) a;
-   out[3] = UBYTE_TO_FLOAT(v[0]);
-   out[2] = UBYTE_TO_FLOAT(v[1]);
-   out[1] = UBYTE_TO_FLOAT(v[2]);
-   out[0] = UBYTE_TO_FLOAT(v[3]);
-}
-
-static void extract_3ub_3f_rgb( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				const GLubyte *v )
-{
-   (void) a;
-   out[0] = UBYTE_TO_FLOAT(v[0]);
-   out[1] = UBYTE_TO_FLOAT(v[1]);
-   out[2] = UBYTE_TO_FLOAT(v[2]);
-   out[3] = 1;
-}
-
-static void extract_3ub_3f_bgr( const struct tnl_clipspace_attr *a, GLfloat *out, 
-				const GLubyte *v )
-{
-   (void) a;
-   out[2] = UBYTE_TO_FLOAT(v[0]);
-   out[1] = UBYTE_TO_FLOAT(v[1]);
-   out[0] = UBYTE_TO_FLOAT(v[2]);
-   out[3] = 1;
-}
-
-static void extract_1ub_1f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )
-{
-   (void) a;
-   out[0] = UBYTE_TO_FLOAT(v[0]);
-   out[1] = 0;
-   out[2] = 0;
-   out[3] = 1;
-}
-
-
-const struct tnl_format_info _tnl_format_info[EMIT_MAX] = 
-{
-   { "1f",
-     extract_1f,
-     { insert_1f_1, insert_1f_1, insert_1f_1, insert_1f_1 },
-     sizeof(GLfloat) },
-
-   { "2f",
-     extract_2f,
-     { insert_2f_1, insert_2f_2, insert_2f_2, insert_2f_2 },
-     2 * sizeof(GLfloat) },
-
-   { "3f",
-     extract_3f,
-     { insert_3f_1, insert_3f_2, insert_3f_3, insert_3f_3 },
-     3 * sizeof(GLfloat) },
-
-   { "4f",
-     extract_4f,
-     { insert_4f_1, insert_4f_2, insert_4f_3, insert_4f_4 },
-     4 * sizeof(GLfloat) },
-
-   { "2f_viewport",
-     extract_2f_viewport,
-     { insert_2f_viewport_1, insert_2f_viewport_2, insert_2f_viewport_2,
-       insert_2f_viewport_2 },
-     2 * sizeof(GLfloat) },
-
-   { "3f_viewport",
-     extract_3f_viewport,
-     { insert_3f_viewport_1, insert_3f_viewport_2, insert_3f_viewport_3,
-       insert_3f_viewport_3 },
-     3 * sizeof(GLfloat) },
-
-   { "4f_viewport",
-     extract_4f_viewport,
-     { insert_4f_viewport_1, insert_4f_viewport_2, insert_4f_viewport_3,
-       insert_4f_viewport_4 }, 
-     4 * sizeof(GLfloat) },
-
-   { "3f_xyw",
-     extract_3f_xyw,
-     { insert_3f_xyw_err, insert_3f_xyw_err, insert_3f_xyw_err, 
-       insert_3f_xyw_4 },
-     3 * sizeof(GLfloat) },
-
-   { "1ub_1f",
-     extract_1ub_1f,
-     { insert_1ub_1f_1, insert_1ub_1f_1, insert_1ub_1f_1, insert_1ub_1f_1 },
-     sizeof(GLubyte) },
-
-   { "3ub_3f_rgb",
-     extract_3ub_3f_rgb,
-     { insert_3ub_3f_rgb_1, insert_3ub_3f_rgb_2, insert_3ub_3f_rgb_3,
-       insert_3ub_3f_rgb_3 },
-     3 * sizeof(GLubyte) },
-
-   { "3ub_3f_bgr",
-     extract_3ub_3f_bgr,
-     { insert_3ub_3f_bgr_1, insert_3ub_3f_bgr_2, insert_3ub_3f_bgr_3,
-       insert_3ub_3f_bgr_3 },
-     3 * sizeof(GLubyte) },
-
-   { "4ub_4f_rgba",
-     extract_4ub_4f_rgba,
-     { insert_4ub_4f_rgba_1, insert_4ub_4f_rgba_2, insert_4ub_4f_rgba_3, 
-       insert_4ub_4f_rgba_4 },
-     4 * sizeof(GLubyte) },
-
-   { "4ub_4f_bgra",
-     extract_4ub_4f_bgra,
-     { insert_4ub_4f_bgra_1, insert_4ub_4f_bgra_2, insert_4ub_4f_bgra_3,
-       insert_4ub_4f_bgra_4 },
-     4 * sizeof(GLubyte) },
-
-   { "4ub_4f_argb",
-     extract_4ub_4f_argb,
-     { insert_4ub_4f_argb_1, insert_4ub_4f_argb_2, insert_4ub_4f_argb_3,
-       insert_4ub_4f_argb_4 },
-     4 * sizeof(GLubyte) },
-
-   { "4ub_4f_abgr",
-     extract_4ub_4f_abgr,
-     { insert_4ub_4f_abgr_1, insert_4ub_4f_abgr_2, insert_4ub_4f_abgr_3,
-       insert_4ub_4f_abgr_4 },
-     4 * sizeof(GLubyte) },
-
-   { "4chan_4f_rgba",
-     extract_4chan_4f_rgba,
-     { insert_4chan_4f_rgba_1, insert_4chan_4f_rgba_2, insert_4chan_4f_rgba_3,
-       insert_4chan_4f_rgba_4 },
-     4 * sizeof(GLchan) },
-
-   { "pad",
-     NULL,
-     { NULL, NULL, NULL, NULL },
-     0 }
-
-};
-
-
-
-    
-/***********************************************************************
- * Hardwired fastpaths for emitting whole vertices or groups of
- * vertices
- */
-#define EMIT5(NR, F0, F1, F2, F3, F4, NAME)				\
-static void NAME( GLcontext *ctx,					\
-		  GLuint count,						\
-		  GLubyte *v )						\
-{									\
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);			\
-   struct tnl_clipspace_attr *a = vtx->attr;				\
-   GLuint i;								\
-									\
-   for (i = 0 ; i < count ; i++, v += vtx->vertex_size) {		\
-      if (NR > 0) {							\
-	 F0( &a[0], v + a[0].vertoffset, (GLfloat *)a[0].inputptr );	\
-	 a[0].inputptr += a[0].inputstride;				\
-      }									\
-      									\
-      if (NR > 1) {							\
-	 F1( &a[1], v + a[1].vertoffset, (GLfloat *)a[1].inputptr );	\
-	 a[1].inputptr += a[1].inputstride;				\
-      }									\
-      									\
-      if (NR > 2) {							\
-	 F2( &a[2], v + a[2].vertoffset, (GLfloat *)a[2].inputptr );	\
-	 a[2].inputptr += a[2].inputstride;				\
-      }									\
-      									\
-      if (NR > 3) {							\
-	 F3( &a[3], v + a[3].vertoffset, (GLfloat *)a[3].inputptr );	\
-	 a[3].inputptr += a[3].inputstride;				\
-      }									\
-									\
-      if (NR > 4) {							\
-	 F4( &a[4], v + a[4].vertoffset, (GLfloat *)a[4].inputptr );	\
-	 a[4].inputptr += a[4].inputstride;				\
-      }									\
-   }									\
-}
-
-   
-#define EMIT2(F0, F1, NAME) EMIT5(2, F0, F1, insert_null, \
-				  insert_null, insert_null, NAME)
-
-#define EMIT3(F0, F1, F2, NAME) EMIT5(3, F0, F1, F2, insert_null, \
-				      insert_null, NAME)
-   
-#define EMIT4(F0, F1, F2, F3, NAME) EMIT5(4, F0, F1, F2, F3, \
-				          insert_null, NAME)
-   
-
-EMIT2(insert_3f_viewport_3, insert_4ub_4f_rgba_4, emit_viewport3_rgba4)
-EMIT2(insert_3f_viewport_3, insert_4ub_4f_bgra_4, emit_viewport3_bgra4)
-EMIT2(insert_3f_3, insert_4ub_4f_rgba_4, emit_xyz3_rgba4)
-
-EMIT3(insert_4f_viewport_4, insert_4ub_4f_rgba_4, insert_2f_2, emit_viewport4_rgba4_st2)
-EMIT3(insert_4f_viewport_4, insert_4ub_4f_bgra_4, insert_2f_2,  emit_viewport4_bgra4_st2)
-EMIT3(insert_4f_4, insert_4ub_4f_rgba_4, insert_2f_2, emit_xyzw4_rgba4_st2)
-
-EMIT4(insert_4f_viewport_4, insert_4ub_4f_rgba_4, insert_2f_2, insert_2f_2, emit_viewport4_rgba4_st2_st2)
-EMIT4(insert_4f_viewport_4, insert_4ub_4f_bgra_4, insert_2f_2, insert_2f_2,  emit_viewport4_bgra4_st2_st2)
-EMIT4(insert_4f_4, insert_4ub_4f_rgba_4, insert_2f_2, insert_2f_2, emit_xyzw4_rgba4_st2_st2)
-
-
-/* Use the codegen paths to select one of a number of hardwired
- * fastpaths.
- */
-void _tnl_generate_hardwired_emit( GLcontext *ctx )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   tnl_emit_func func = NULL;
-
-   /* Does it fit a hardwired fastpath?  Help! this is growing out of
-    * control!
-    */
-   switch (vtx->attr_count) {
-   case 2:
-      if (vtx->attr[0].emit == insert_3f_viewport_3) {
-	 if (vtx->attr[1].emit == insert_4ub_4f_bgra_4) 
-	    func = emit_viewport3_bgra4;
-	 else if (vtx->attr[1].emit == insert_4ub_4f_rgba_4) 
-	    func = emit_viewport3_rgba4;
-      }
-      else if (vtx->attr[0].emit == insert_3f_3 &&
-	       vtx->attr[1].emit == insert_4ub_4f_rgba_4) {
- 	 func = emit_xyz3_rgba4; 
-      }
-      break;
-   case 3:
-      if (vtx->attr[2].emit == insert_2f_2) {
-	 if (vtx->attr[1].emit == insert_4ub_4f_rgba_4) {
-	    if (vtx->attr[0].emit == insert_4f_viewport_4)
-	       func = emit_viewport4_rgba4_st2;
-	    else if (vtx->attr[0].emit == insert_4f_4) 
-	       func = emit_xyzw4_rgba4_st2;
-	 }
-	 else if (vtx->attr[1].emit == insert_4ub_4f_bgra_4 &&
-		  vtx->attr[0].emit == insert_4f_viewport_4)
-	    func = emit_viewport4_bgra4_st2;
-      }
-      break;
-   case 4:
-      if (vtx->attr[2].emit == insert_2f_2 &&
-	  vtx->attr[3].emit == insert_2f_2) {
-	 if (vtx->attr[1].emit == insert_4ub_4f_rgba_4) {
-	    if (vtx->attr[0].emit == insert_4f_viewport_4)
-	       func = emit_viewport4_rgba4_st2_st2;
-	    else if (vtx->attr[0].emit == insert_4f_4) 
-	       func = emit_xyzw4_rgba4_st2_st2;
-	 }
-	 else if (vtx->attr[1].emit == insert_4ub_4f_bgra_4 &&
-		  vtx->attr[0].emit == insert_4f_viewport_4)
-	    func = emit_viewport4_bgra4_st2_st2;
-      }
-      break;
-   }
-
-   vtx->emit = func;
-}
-
-/***********************************************************************
- * Generic (non-codegen) functions for whole vertices or groups of
- * vertices
- */
-
-void _tnl_generic_emit( GLcontext *ctx,
-			GLuint count,
-			GLubyte *v )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint attr_count = vtx->attr_count;
-   const GLuint stride = vtx->vertex_size;
-   GLuint i, j;
-
-   for (i = 0 ; i < count ; i++, v += stride) {
-      for (j = 0; j < attr_count; j++) {
-	 GLfloat *in = (GLfloat *)a[j].inputptr;
-	 a[j].inputptr += a[j].inputstride;
-	 a[j].emit( &a[j], v + a[j].vertoffset, in );
-      }
-   }
-}
-
-
-void _tnl_generic_interp( GLcontext *ctx,
-			    GLfloat t,
-			    GLuint edst, GLuint eout, GLuint ein,
-			    GLboolean force_boundary )
-{
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct vertex_buffer *VB = &tnl->vb;
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   const GLubyte *vin  = vtx->vertex_buf + ein  * vtx->vertex_size;
-   const GLubyte *vout = vtx->vertex_buf + eout * vtx->vertex_size;
-   GLubyte *vdst = vtx->vertex_buf + edst * vtx->vertex_size;
-   const struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint attr_count = vtx->attr_count;
-   GLuint j;
-   (void) force_boundary;
-
-   if (tnl->NeedNdcCoords) {
-      const GLfloat *dstclip = VB->ClipPtr->data[edst];
-      if (dstclip[3] != 0.0) {
-	 const GLfloat w = 1.0f / dstclip[3];
-	 GLfloat pos[4];
-
-	 pos[0] = dstclip[0] * w;
-	 pos[1] = dstclip[1] * w;
-	 pos[2] = dstclip[2] * w;
-	 pos[3] = w;
-
-	 a[0].insert[4-1]( &a[0], vdst, pos );
-      }
-   }
-   else {
-      a[0].insert[4-1]( &a[0], vdst, VB->ClipPtr->data[edst] );
-   }
-
-
-   for (j = 1; j < attr_count; j++) {
-      GLfloat fin[4], fout[4], fdst[4];
-	 
-      a[j].extract( &a[j], fin, vin + a[j].vertoffset );
-      a[j].extract( &a[j], fout, vout + a[j].vertoffset );
-
-      INTERP_F( t, fdst[3], fout[3], fin[3] );
-      INTERP_F( t, fdst[2], fout[2], fin[2] );
-      INTERP_F( t, fdst[1], fout[1], fin[1] );
-      INTERP_F( t, fdst[0], fout[0], fin[0] );
-
-      a[j].insert[4-1]( &a[j], vdst + a[j].vertoffset, fdst );
-   }
-}
-
-
-/* Extract color attributes from one vertex and insert them into
- * another.  (Shortcircuit extract/insert with memcpy).
- */
-void _tnl_generic_copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   GLubyte *vsrc = vtx->vertex_buf + esrc * vtx->vertex_size;
-   GLubyte *vdst = vtx->vertex_buf + edst * vtx->vertex_size;
-   const struct tnl_clipspace_attr *a = vtx->attr;
-   const GLuint attr_count = vtx->attr_count;
-   GLuint j;
-
-   for (j = 0; j < attr_count; j++) {
-      if (a[j].attrib == VERT_ATTRIB_COLOR0 ||
-	  a[j].attrib == VERT_ATTRIB_COLOR1) {
-
-	 memcpy( vdst + a[j].vertoffset,
-                 vsrc + a[j].vertoffset,
-                 a[j].vertattrsize );
-      }
-   }
-}
-
-
-/* Helper functions for hardware which doesn't put back colors and/or
- * edgeflags into vertices.
- */
-void _tnl_generic_interp_extras( GLcontext *ctx,
-				   GLfloat t,
-				   GLuint dst, GLuint out, GLuint in,
-				   GLboolean force_boundary )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-
-   /* If stride is zero, BackfaceColorPtr is constant across the VB, so
-    * there is no point interpolating between two values as they will
-    * be identical.  In all other cases, this value is generated by
-    * t_vb_lighttmp.h and has a stride of 4 dwords.
-    */
-   if (VB->BackfaceColorPtr && VB->BackfaceColorPtr->stride) {
-      assert(VB->BackfaceColorPtr->stride == 4 * sizeof(GLfloat));
-
-      INTERP_4F( t,
-		 VB->BackfaceColorPtr->data[dst],
-		 VB->BackfaceColorPtr->data[out],
-		 VB->BackfaceColorPtr->data[in] );
-   }
-
-   if (VB->BackfaceSecondaryColorPtr) {
-      assert(VB->BackfaceSecondaryColorPtr->stride == 4 * sizeof(GLfloat));
-      
-      INTERP_3F( t,
-		 VB->BackfaceSecondaryColorPtr->data[dst],
-		 VB->BackfaceSecondaryColorPtr->data[out],
-		 VB->BackfaceSecondaryColorPtr->data[in] );
-   }
-   
-   if (VB->BackfaceIndexPtr) {
-      VB->BackfaceIndexPtr->data[dst][0] = LINTERP( t,
-					       VB->BackfaceIndexPtr->data[out][0],
-					       VB->BackfaceIndexPtr->data[in][0] );
-   }
-
-   if (VB->EdgeFlag) {
-      VB->EdgeFlag[dst] = VB->EdgeFlag[out] || force_boundary;
-   }
-
-   _tnl_generic_interp(ctx, t, dst, out, in, force_boundary);
-}
-
-void _tnl_generic_copy_pv_extras( GLcontext *ctx, 
-				  GLuint dst, GLuint src )
-{
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-
-   /* See above comment:
-    */
-   if (VB->BackfaceColorPtr && VB->BackfaceColorPtr->stride) {
-      COPY_4FV( VB->BackfaceColorPtr->data[dst],
-		VB->BackfaceColorPtr->data[src] );
-   }
-
-   if (VB->BackfaceSecondaryColorPtr) {
-      COPY_4FV( VB->BackfaceSecondaryColorPtr->data[dst],
-		VB->BackfaceSecondaryColorPtr->data[src] );
-   }
-
-   if (VB->BackfaceIndexPtr) {
-      VB->BackfaceIndexPtr->data[dst][0] = VB->BackfaceIndexPtr->data[src][0];
-   }
-
-   _tnl_generic_copy_pv(ctx, dst, src);
-}
-
-
+

+/*

+ * Copyright 2003 Tungsten Graphics, 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

+ * 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 <keithw@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/simple_list.h"

+#include "t_context.h"

+#include "t_vertex.h"

+

+

+#if 0

+#define DEBUG_INSERT printf("%s\n", __FUNCTION__)

+#else

+#define DEBUG_INSERT

+#endif

+

+

+/*

+ * These functions take the NDC coordinates pointed to by 'in', apply the

+ * NDC->Viewport mapping and store the results at 'v'.

+ */

+

+static INLINE void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,

+                      const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[5] * in[1] + vp[13];

+   out[2] = vp[10] * in[2] + vp[14];

+   out[3] = in[3];

+}

+

+static INLINE void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[5] * in[1] + vp[13];

+   out[2] = vp[10] * in[2] + vp[14];

+   out[3] = 1;

+}

+

+static INLINE void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[5] * in[1] + vp[13];

+   out[2] = vp[14];

+   out[3] = 1;

+}

+

+static INLINE void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[13];

+   out[2] = vp[14];

+   out[3] = 1;

+}

+

+static INLINE void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[5] * in[1] + vp[13];

+   out[2] = vp[10] * in[2] + vp[14];

+}

+

+static INLINE void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[5] * in[1] + vp[13];

+   out[2] = vp[14];

+}

+

+static INLINE void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[13];

+   out[2] = vp[14];

+}

+

+static INLINE void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[5] * in[1] + vp[13];

+}

+

+static INLINE void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,

+				const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = vp[0] * in[0] + vp[12];

+   out[1] = vp[13];

+}

+

+

+/*

+ * These functions do the same as above, except for the viewport mapping.

+ */

+

+static INLINE void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = in[2];

+   out[3] = in[3];

+}

+

+static INLINE void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = in[2];

+   out[3] = 1;

+}

+

+static INLINE void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = 0;

+   out[3] = 1;

+}

+

+static INLINE void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = 0;

+   out[2] = 0;

+   out[3] = 1;

+}

+

+static INLINE void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = in[3];

+}

+

+static INLINE void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   (void) a; (void) v; (void) in;

+   DEBUG_INSERT;

+   exit(1);

+}

+

+static INLINE void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = in[2];

+}

+

+static INLINE void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = 0;

+}

+

+static INLINE void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = 0;

+   out[2] = 0;

+}

+

+

+static INLINE void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = in[1];

+}

+

+static INLINE void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+   out[1] = 0;

+}

+

+static INLINE void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   GLfloat *out = (GLfloat *)(v);

+   (void) a;

+   DEBUG_INSERT;

+   out[0] = in[0];

+}

+

+static INLINE void insert_null( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a; (void) v; (void) in;

+}

+

+static INLINE void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				  const GLfloat *in )

+{

+   GLchan *c = (GLchan *)v;

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 

+   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 

+   UNCLAMPED_FLOAT_TO_CHAN(c[2], in[2]); 

+   UNCLAMPED_FLOAT_TO_CHAN(c[3], in[3]);

+}

+

+static INLINE void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				  const GLfloat *in )

+{

+   GLchan *c = (GLchan *)v;

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 

+   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 

+   UNCLAMPED_FLOAT_TO_CHAN(c[2], in[2]); 

+   c[3] = CHAN_MAX;

+}

+

+static INLINE void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				  const GLfloat *in )

+{

+   GLchan *c = (GLchan *)v;

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 

+   UNCLAMPED_FLOAT_TO_CHAN(c[1], in[1]); 

+   c[2] = 0;

+   c[3] = CHAN_MAX;

+}

+

+static INLINE void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				  const GLfloat *in )

+{

+   GLchan *c = (GLchan *)v;

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_CHAN(c[0], in[0]); 

+   c[1] = 0;

+   c[2] = 0;

+   c[3] = CHAN_MAX;

+}

+

+static INLINE void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);

+}

+

+static INLINE void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);

+   v[3] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   v[2] = 0;

+   v[3] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   v[1] = 0;

+   v[2] = 0;

+   v[3] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);

+}

+

+static INLINE void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);

+   v[3] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   v[0] = 0;

+   v[3] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   v[1] = 0;

+   v[0] = 0;

+   v[3] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[2]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);

+}

+

+static INLINE void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[2]);

+   v[0] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);

+   v[3] = 0x00;

+   v[0] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[0]);

+   v[2] = 0x00;

+   v[3] = 0x00;

+   v[0] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[2]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);

+}

+

+static INLINE void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[2]);

+   v[0] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[1]);

+   v[1] = 0x00;

+   v[0] = 0xff;

+}

+

+static INLINE void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[0]);

+   v[2] = 0x00;

+   v[1] = 0x00;

+   v[0] = 0xff;

+}

+

+static INLINE void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+			       const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);

+}

+

+static INLINE void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+			       const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   v[2] = 0;

+}

+

+static INLINE void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+			       const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+   v[1] = 0;

+   v[2] = 0;

+}

+

+static INLINE void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				 const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);

+}

+

+static INLINE void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				 const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   UNCLAMPED_FLOAT_TO_UBYTE(v[1], in[1]);

+   v[0] = 0;

+}

+

+static INLINE void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+				 const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[0]);

+   v[1] = 0;

+   v[0] = 0;

+}

+

+

+static INLINE void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, 

+			   const GLfloat *in )

+{

+   DEBUG_INSERT;

+   (void) a;

+   UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[0]);

+}

+

+

+/***********************************************************************

+ * Functions to perform the reverse operations to the above, for

+ * swrast translation and clip-interpolation.

+ * 

+ * Currently always extracts a full 4 floats.

+ */

+

+static void extract_4f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   

+   /* Although included for completeness, the position coordinate is

+    * usually handled differently during clipping.

+    */

+   DEBUG_INSERT;

+   out[0] = (in[0] - vp[12]) / vp[0];

+   out[1] = (in[1] - vp[13]) / vp[5];

+   out[2] = (in[2] - vp[14]) / vp[10];

+   out[3] = in[3];

+}

+

+static void extract_3f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = (in[0] - vp[12]) / vp[0];

+   out[1] = (in[1] - vp[13]) / vp[5];

+   out[2] = (in[2] - vp[14]) / vp[10];

+   out[3] = 1;

+}

+

+

+static void extract_2f_viewport( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   const GLfloat * const vp = a->vp;

+   DEBUG_INSERT;

+   out[0] = (in[0] - vp[12]) / vp[0];

+   out[1] = (in[1] - vp[13]) / vp[5];

+   out[2] = 0;

+   out[3] = 1;

+}

+

+

+static void extract_4f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v  )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   (void) a;

+   

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = in[2];

+   out[3] = in[3];

+}

+

+static void extract_3f_xyw( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   (void) a;

+   

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = 0;

+   out[3] = in[2];

+}

+

+

+static void extract_3f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   (void) a;

+   

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = in[2];

+   out[3] = 1;

+}

+

+

+static void extract_2f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   (void) a;

+   

+   out[0] = in[0];

+   out[1] = in[1];

+   out[2] = 0;

+   out[3] = 1;

+}

+

+static void extract_1f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )

+{

+   const GLfloat *in = (const GLfloat *)v;

+   (void) a;

+   

+   out[0] = in[0];

+   out[1] = 0;

+   out[2] = 0;

+   out[3] = 1;

+}

+

+static void extract_4chan_4f_rgba( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   GLchan *c = (GLchan *)v;

+   (void) a;

+

+   out[0] = CHAN_TO_FLOAT(c[0]);

+   out[1] = CHAN_TO_FLOAT(c[1]);

+   out[2] = CHAN_TO_FLOAT(c[2]);

+   out[3] = CHAN_TO_FLOAT(c[3]);

+}

+

+static void extract_4ub_4f_rgba( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   (void) a;

+   out[0] = UBYTE_TO_FLOAT(v[0]);

+   out[1] = UBYTE_TO_FLOAT(v[1]);

+   out[2] = UBYTE_TO_FLOAT(v[2]);

+   out[3] = UBYTE_TO_FLOAT(v[3]);

+}

+

+static void extract_4ub_4f_bgra( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   (void) a;

+   out[2] = UBYTE_TO_FLOAT(v[0]);

+   out[1] = UBYTE_TO_FLOAT(v[1]);

+   out[0] = UBYTE_TO_FLOAT(v[2]);

+   out[3] = UBYTE_TO_FLOAT(v[3]);

+}

+

+static void extract_4ub_4f_argb( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   (void) a;

+   out[3] = UBYTE_TO_FLOAT(v[0]);

+   out[0] = UBYTE_TO_FLOAT(v[1]);

+   out[1] = UBYTE_TO_FLOAT(v[2]);

+   out[2] = UBYTE_TO_FLOAT(v[3]);

+}

+

+static void extract_4ub_4f_abgr( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				 const GLubyte *v )

+{

+   (void) a;

+   out[3] = UBYTE_TO_FLOAT(v[0]);

+   out[2] = UBYTE_TO_FLOAT(v[1]);

+   out[1] = UBYTE_TO_FLOAT(v[2]);

+   out[0] = UBYTE_TO_FLOAT(v[3]);

+}

+

+static void extract_3ub_3f_rgb( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				const GLubyte *v )

+{

+   (void) a;

+   out[0] = UBYTE_TO_FLOAT(v[0]);

+   out[1] = UBYTE_TO_FLOAT(v[1]);

+   out[2] = UBYTE_TO_FLOAT(v[2]);

+   out[3] = 1;

+}

+

+static void extract_3ub_3f_bgr( const struct tnl_clipspace_attr *a, GLfloat *out, 

+				const GLubyte *v )

+{

+   (void) a;

+   out[2] = UBYTE_TO_FLOAT(v[0]);

+   out[1] = UBYTE_TO_FLOAT(v[1]);

+   out[0] = UBYTE_TO_FLOAT(v[2]);

+   out[3] = 1;

+}

+

+static void extract_1ub_1f( const struct tnl_clipspace_attr *a, GLfloat *out, const GLubyte *v )

+{

+   (void) a;

+   out[0] = UBYTE_TO_FLOAT(v[0]);

+   out[1] = 0;

+   out[2] = 0;

+   out[3] = 1;

+}

+

+

+const struct tnl_format_info _tnl_format_info[EMIT_MAX] = 

+{

+   { "1f",

+     extract_1f,

+     { insert_1f_1, insert_1f_1, insert_1f_1, insert_1f_1 },

+     sizeof(GLfloat) },

+

+   { "2f",

+     extract_2f,

+     { insert_2f_1, insert_2f_2, insert_2f_2, insert_2f_2 },

+     2 * sizeof(GLfloat) },

+

+   { "3f",

+     extract_3f,

+     { insert_3f_1, insert_3f_2, insert_3f_3, insert_3f_3 },

+     3 * sizeof(GLfloat) },

+

+   { "4f",

+     extract_4f,

+     { insert_4f_1, insert_4f_2, insert_4f_3, insert_4f_4 },

+     4 * sizeof(GLfloat) },

+

+   { "2f_viewport",

+     extract_2f_viewport,

+     { insert_2f_viewport_1, insert_2f_viewport_2, insert_2f_viewport_2,

+       insert_2f_viewport_2 },

+     2 * sizeof(GLfloat) },

+

+   { "3f_viewport",

+     extract_3f_viewport,

+     { insert_3f_viewport_1, insert_3f_viewport_2, insert_3f_viewport_3,

+       insert_3f_viewport_3 },

+     3 * sizeof(GLfloat) },

+

+   { "4f_viewport",

+     extract_4f_viewport,

+     { insert_4f_viewport_1, insert_4f_viewport_2, insert_4f_viewport_3,

+       insert_4f_viewport_4 }, 

+     4 * sizeof(GLfloat) },

+

+   { "3f_xyw",

+     extract_3f_xyw,

+     { insert_3f_xyw_err, insert_3f_xyw_err, insert_3f_xyw_err, 

+       insert_3f_xyw_4 },

+     3 * sizeof(GLfloat) },

+

+   { "1ub_1f",

+     extract_1ub_1f,

+     { insert_1ub_1f_1, insert_1ub_1f_1, insert_1ub_1f_1, insert_1ub_1f_1 },

+     sizeof(GLubyte) },

+

+   { "3ub_3f_rgb",

+     extract_3ub_3f_rgb,

+     { insert_3ub_3f_rgb_1, insert_3ub_3f_rgb_2, insert_3ub_3f_rgb_3,

+       insert_3ub_3f_rgb_3 },

+     3 * sizeof(GLubyte) },

+

+   { "3ub_3f_bgr",

+     extract_3ub_3f_bgr,

+     { insert_3ub_3f_bgr_1, insert_3ub_3f_bgr_2, insert_3ub_3f_bgr_3,

+       insert_3ub_3f_bgr_3 },

+     3 * sizeof(GLubyte) },

+

+   { "4ub_4f_rgba",

+     extract_4ub_4f_rgba,

+     { insert_4ub_4f_rgba_1, insert_4ub_4f_rgba_2, insert_4ub_4f_rgba_3, 

+       insert_4ub_4f_rgba_4 },

+     4 * sizeof(GLubyte) },

+

+   { "4ub_4f_bgra",

+     extract_4ub_4f_bgra,

+     { insert_4ub_4f_bgra_1, insert_4ub_4f_bgra_2, insert_4ub_4f_bgra_3,

+       insert_4ub_4f_bgra_4 },

+     4 * sizeof(GLubyte) },

+

+   { "4ub_4f_argb",

+     extract_4ub_4f_argb,

+     { insert_4ub_4f_argb_1, insert_4ub_4f_argb_2, insert_4ub_4f_argb_3,

+       insert_4ub_4f_argb_4 },

+     4 * sizeof(GLubyte) },

+

+   { "4ub_4f_abgr",

+     extract_4ub_4f_abgr,

+     { insert_4ub_4f_abgr_1, insert_4ub_4f_abgr_2, insert_4ub_4f_abgr_3,

+       insert_4ub_4f_abgr_4 },

+     4 * sizeof(GLubyte) },

+

+   { "4chan_4f_rgba",

+     extract_4chan_4f_rgba,

+     { insert_4chan_4f_rgba_1, insert_4chan_4f_rgba_2, insert_4chan_4f_rgba_3,

+       insert_4chan_4f_rgba_4 },

+     4 * sizeof(GLchan) },

+

+   { "pad",

+     NULL,

+     { NULL, NULL, NULL, NULL },

+     0 }

+

+};

+

+

+

+    

+/***********************************************************************

+ * Hardwired fastpaths for emitting whole vertices or groups of

+ * vertices

+ */

+#define EMIT5(NR, F0, F1, F2, F3, F4, NAME)				\

+static void NAME( struct gl_context *ctx,					\

+		  GLuint count,						\

+		  GLubyte *v )						\

+{									\

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);			\

+   struct tnl_clipspace_attr *a = vtx->attr;				\

+   GLuint i;								\

+									\

+   for (i = 0 ; i < count ; i++, v += vtx->vertex_size) {		\

+      if (NR > 0) {							\

+	 F0( &a[0], v + a[0].vertoffset, (GLfloat *)a[0].inputptr );	\

+	 a[0].inputptr += a[0].inputstride;				\

+      }									\

+      									\

+      if (NR > 1) {							\

+	 F1( &a[1], v + a[1].vertoffset, (GLfloat *)a[1].inputptr );	\

+	 a[1].inputptr += a[1].inputstride;				\

+      }									\

+      									\

+      if (NR > 2) {							\

+	 F2( &a[2], v + a[2].vertoffset, (GLfloat *)a[2].inputptr );	\

+	 a[2].inputptr += a[2].inputstride;				\

+      }									\

+      									\

+      if (NR > 3) {							\

+	 F3( &a[3], v + a[3].vertoffset, (GLfloat *)a[3].inputptr );	\

+	 a[3].inputptr += a[3].inputstride;				\

+      }									\

+									\

+      if (NR > 4) {							\

+	 F4( &a[4], v + a[4].vertoffset, (GLfloat *)a[4].inputptr );	\

+	 a[4].inputptr += a[4].inputstride;				\

+      }									\

+   }									\

+}

+

+   

+#define EMIT2(F0, F1, NAME) EMIT5(2, F0, F1, insert_null, \

+				  insert_null, insert_null, NAME)

+

+#define EMIT3(F0, F1, F2, NAME) EMIT5(3, F0, F1, F2, insert_null, \

+				      insert_null, NAME)

+   

+#define EMIT4(F0, F1, F2, F3, NAME) EMIT5(4, F0, F1, F2, F3, \

+				          insert_null, NAME)

+   

+

+EMIT2(insert_3f_viewport_3, insert_4ub_4f_rgba_4, emit_viewport3_rgba4)

+EMIT2(insert_3f_viewport_3, insert_4ub_4f_bgra_4, emit_viewport3_bgra4)

+EMIT2(insert_3f_3, insert_4ub_4f_rgba_4, emit_xyz3_rgba4)

+

+EMIT3(insert_4f_viewport_4, insert_4ub_4f_rgba_4, insert_2f_2, emit_viewport4_rgba4_st2)

+EMIT3(insert_4f_viewport_4, insert_4ub_4f_bgra_4, insert_2f_2,  emit_viewport4_bgra4_st2)

+EMIT3(insert_4f_4, insert_4ub_4f_rgba_4, insert_2f_2, emit_xyzw4_rgba4_st2)

+

+EMIT4(insert_4f_viewport_4, insert_4ub_4f_rgba_4, insert_2f_2, insert_2f_2, emit_viewport4_rgba4_st2_st2)

+EMIT4(insert_4f_viewport_4, insert_4ub_4f_bgra_4, insert_2f_2, insert_2f_2,  emit_viewport4_bgra4_st2_st2)

+EMIT4(insert_4f_4, insert_4ub_4f_rgba_4, insert_2f_2, insert_2f_2, emit_xyzw4_rgba4_st2_st2)

+

+

+/* Use the codegen paths to select one of a number of hardwired

+ * fastpaths.

+ */

+void _tnl_generate_hardwired_emit( struct gl_context *ctx )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   tnl_emit_func func = NULL;

+

+   /* Does it fit a hardwired fastpath?  Help! this is growing out of

+    * control!

+    */

+   switch (vtx->attr_count) {

+   case 2:

+      if (vtx->attr[0].emit == insert_3f_viewport_3) {

+	 if (vtx->attr[1].emit == insert_4ub_4f_bgra_4) 

+	    func = emit_viewport3_bgra4;

+	 else if (vtx->attr[1].emit == insert_4ub_4f_rgba_4) 

+	    func = emit_viewport3_rgba4;

+      }

+      else if (vtx->attr[0].emit == insert_3f_3 &&

+	       vtx->attr[1].emit == insert_4ub_4f_rgba_4) {

+ 	 func = emit_xyz3_rgba4; 

+      }

+      break;

+   case 3:

+      if (vtx->attr[2].emit == insert_2f_2) {

+	 if (vtx->attr[1].emit == insert_4ub_4f_rgba_4) {

+	    if (vtx->attr[0].emit == insert_4f_viewport_4)

+	       func = emit_viewport4_rgba4_st2;

+	    else if (vtx->attr[0].emit == insert_4f_4) 

+	       func = emit_xyzw4_rgba4_st2;

+	 }

+	 else if (vtx->attr[1].emit == insert_4ub_4f_bgra_4 &&

+		  vtx->attr[0].emit == insert_4f_viewport_4)

+	    func = emit_viewport4_bgra4_st2;

+      }

+      break;

+   case 4:

+      if (vtx->attr[2].emit == insert_2f_2 &&

+	  vtx->attr[3].emit == insert_2f_2) {

+	 if (vtx->attr[1].emit == insert_4ub_4f_rgba_4) {

+	    if (vtx->attr[0].emit == insert_4f_viewport_4)

+	       func = emit_viewport4_rgba4_st2_st2;

+	    else if (vtx->attr[0].emit == insert_4f_4) 

+	       func = emit_xyzw4_rgba4_st2_st2;

+	 }

+	 else if (vtx->attr[1].emit == insert_4ub_4f_bgra_4 &&

+		  vtx->attr[0].emit == insert_4f_viewport_4)

+	    func = emit_viewport4_bgra4_st2_st2;

+      }

+      break;

+   }

+

+   vtx->emit = func;

+}

+

+/***********************************************************************

+ * Generic (non-codegen) functions for whole vertices or groups of

+ * vertices

+ */

+

+void _tnl_generic_emit( struct gl_context *ctx,

+			GLuint count,

+			GLubyte *v )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint attr_count = vtx->attr_count;

+   const GLuint stride = vtx->vertex_size;

+   GLuint i, j;

+

+   for (i = 0 ; i < count ; i++, v += stride) {

+      for (j = 0; j < attr_count; j++) {

+	 GLfloat *in = (GLfloat *)a[j].inputptr;

+	 a[j].inputptr += a[j].inputstride;

+	 a[j].emit( &a[j], v + a[j].vertoffset, in );

+      }

+   }

+}

+

+

+void _tnl_generic_interp( struct gl_context *ctx,

+			    GLfloat t,

+			    GLuint edst, GLuint eout, GLuint ein,

+			    GLboolean force_boundary )

+{

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct vertex_buffer *VB = &tnl->vb;

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   const GLubyte *vin  = vtx->vertex_buf + ein  * vtx->vertex_size;

+   const GLubyte *vout = vtx->vertex_buf + eout * vtx->vertex_size;

+   GLubyte *vdst = vtx->vertex_buf + edst * vtx->vertex_size;

+   const struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint attr_count = vtx->attr_count;

+   GLuint j;

+   (void) force_boundary;

+

+   if (tnl->NeedNdcCoords) {

+      const GLfloat *dstclip = VB->ClipPtr->data[edst];

+      if (dstclip[3] != 0.0) {

+	 const GLfloat w = 1.0f / dstclip[3];

+	 GLfloat pos[4];

+

+	 pos[0] = dstclip[0] * w;

+	 pos[1] = dstclip[1] * w;

+	 pos[2] = dstclip[2] * w;

+	 pos[3] = w;

+

+	 a[0].insert[4-1]( &a[0], vdst, pos );

+      }

+   }

+   else {

+      a[0].insert[4-1]( &a[0], vdst, VB->ClipPtr->data[edst] );

+   }

+

+

+   for (j = 1; j < attr_count; j++) {

+      GLfloat fin[4], fout[4], fdst[4];

+	 

+      a[j].extract( &a[j], fin, vin + a[j].vertoffset );

+      a[j].extract( &a[j], fout, vout + a[j].vertoffset );

+

+      INTERP_F( t, fdst[3], fout[3], fin[3] );

+      INTERP_F( t, fdst[2], fout[2], fin[2] );

+      INTERP_F( t, fdst[1], fout[1], fin[1] );

+      INTERP_F( t, fdst[0], fout[0], fin[0] );

+

+      a[j].insert[4-1]( &a[j], vdst + a[j].vertoffset, fdst );

+   }

+}

+

+

+/* Extract color attributes from one vertex and insert them into

+ * another.  (Shortcircuit extract/insert with memcpy).

+ */

+void _tnl_generic_copy_pv( struct gl_context *ctx, GLuint edst, GLuint esrc )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   GLubyte *vsrc = vtx->vertex_buf + esrc * vtx->vertex_size;

+   GLubyte *vdst = vtx->vertex_buf + edst * vtx->vertex_size;

+   const struct tnl_clipspace_attr *a = vtx->attr;

+   const GLuint attr_count = vtx->attr_count;

+   GLuint j;

+

+   for (j = 0; j < attr_count; j++) {

+      if (a[j].attrib == VERT_ATTRIB_COLOR0 ||

+	  a[j].attrib == VERT_ATTRIB_COLOR1) {

+

+	 memcpy( vdst + a[j].vertoffset,

+                 vsrc + a[j].vertoffset,

+                 a[j].vertattrsize );

+      }

+   }

+}

+

+

+/* Helper functions for hardware which doesn't put back colors and/or

+ * edgeflags into vertices.

+ */

+void _tnl_generic_interp_extras( struct gl_context *ctx,

+				   GLfloat t,

+				   GLuint dst, GLuint out, GLuint in,

+				   GLboolean force_boundary )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+

+   /* If stride is zero, BackfaceColorPtr is constant across the VB, so

+    * there is no point interpolating between two values as they will

+    * be identical.  In all other cases, this value is generated by

+    * t_vb_lighttmp.h and has a stride of 4 dwords.

+    */

+   if (VB->BackfaceColorPtr && VB->BackfaceColorPtr->stride) {

+      assert(VB->BackfaceColorPtr->stride == 4 * sizeof(GLfloat));

+

+      INTERP_4F( t,

+		 VB->BackfaceColorPtr->data[dst],

+		 VB->BackfaceColorPtr->data[out],

+		 VB->BackfaceColorPtr->data[in] );

+   }

+

+   if (VB->BackfaceSecondaryColorPtr) {

+      assert(VB->BackfaceSecondaryColorPtr->stride == 4 * sizeof(GLfloat));

+      

+      INTERP_3F( t,

+		 VB->BackfaceSecondaryColorPtr->data[dst],

+		 VB->BackfaceSecondaryColorPtr->data[out],

+		 VB->BackfaceSecondaryColorPtr->data[in] );

+   }

+   

+   if (VB->BackfaceIndexPtr) {

+      VB->BackfaceIndexPtr->data[dst][0] = LINTERP( t,

+					       VB->BackfaceIndexPtr->data[out][0],

+					       VB->BackfaceIndexPtr->data[in][0] );

+   }

+

+   if (VB->EdgeFlag) {

+      VB->EdgeFlag[dst] = VB->EdgeFlag[out] || force_boundary;

+   }

+

+   _tnl_generic_interp(ctx, t, dst, out, in, force_boundary);

+}

+

+void _tnl_generic_copy_pv_extras( struct gl_context *ctx, 

+				  GLuint dst, GLuint src )

+{

+   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

+

+   /* See above comment:

+    */

+   if (VB->BackfaceColorPtr && VB->BackfaceColorPtr->stride) {

+      COPY_4FV( VB->BackfaceColorPtr->data[dst],

+		VB->BackfaceColorPtr->data[src] );

+   }

+

+   if (VB->BackfaceSecondaryColorPtr) {

+      COPY_4FV( VB->BackfaceSecondaryColorPtr->data[dst],

+		VB->BackfaceSecondaryColorPtr->data[src] );

+   }

+

+   if (VB->BackfaceIndexPtr) {

+      VB->BackfaceIndexPtr->data[dst][0] = VB->BackfaceIndexPtr->data[src][0];

+   }

+

+   _tnl_generic_copy_pv(ctx, dst, src);

+}

+

+

diff --git a/mesalib/src/mesa/tnl/t_vertex_sse.c b/mesalib/src/mesa/tnl/t_vertex_sse.c
index 98058f3bd..f164cd77e 100644
--- a/mesalib/src/mesa/tnl/t_vertex_sse.c
+++ b/mesalib/src/mesa/tnl/t_vertex_sse.c
@@ -1,684 +1,684 @@
-/*
- * Copyright 2003 Tungsten Graphics, 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
- * 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 <keithw@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/colormac.h"
-#include "main/simple_list.h"
-#include "main/enums.h"
-#include "t_context.h"
-#include "t_vertex.h"
-
-#if defined(USE_SSE_ASM)
-
-#include "x86/rtasm/x86sse.h"
-#include "x86/common_x86_asm.h"
-
-
-/**
- * Number of bytes to allocate for generated SSE functions
- */
-#define MAX_SSE_CODE_SIZE 1024
-
-
-#define X    0
-#define Y    1
-#define Z    2
-#define W    3
-
-
-struct x86_program {
-   struct x86_function func;
-
-   GLcontext *ctx;
-   GLboolean inputs_safe;
-   GLboolean outputs_safe;
-   GLboolean have_sse2;
-   
-   struct x86_reg identity;
-   struct x86_reg chan0;
-};
-
-
-static struct x86_reg get_identity( struct x86_program *p )
-{
-   return p->identity;
-}
-
-static void emit_load4f_4( struct x86_program *p, 			   
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   sse_movups(&p->func, dest, arg0);
-}
-
-static void emit_load4f_3( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   /* Have to jump through some hoops:
-    *
-    * c 0 0 0
-    * c 0 0 1
-    * 0 0 c 1
-    * a b c 1
-    */
-   sse_movss(&p->func, dest, x86_make_disp(arg0, 8));
-   sse_shufps(&p->func, dest, get_identity(p), SHUF(X,Y,Z,W) );
-   sse_shufps(&p->func, dest, dest, SHUF(Y,Z,X,W) );
-   sse_movlps(&p->func, dest, arg0);
-}
-
-static void emit_load4f_2( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   /* Initialize from identity, then pull in low two words:
-    */
-   sse_movups(&p->func, dest, get_identity(p));
-   sse_movlps(&p->func, dest, arg0);
-}
-
-static void emit_load4f_1( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   /* Pull in low word, then swizzle in identity */
-   sse_movss(&p->func, dest, arg0);
-   sse_shufps(&p->func, dest, get_identity(p), SHUF(X,Y,Z,W) );
-}
-
-
-
-static void emit_load3f_3( struct x86_program *p, 			   
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   /* Over-reads by 1 dword - potential SEGV if input is a vertex
-    * array.
-    */
-   if (p->inputs_safe) {
-      sse_movups(&p->func, dest, arg0);
-   } 
-   else {
-      /* c 0 0 0
-       * c c c c
-       * a b c c 
-       */
-      sse_movss(&p->func, dest, x86_make_disp(arg0, 8));
-      sse_shufps(&p->func, dest, dest, SHUF(X,X,X,X));
-      sse_movlps(&p->func, dest, arg0);
-   }
-}
-
-static void emit_load3f_2( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   emit_load4f_2(p, dest, arg0);
-}
-
-static void emit_load3f_1( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   /* Loading from memory erases the upper bits. */
-   sse_movss(&p->func, dest, arg0);
-}
-
-static void emit_load2f_2( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   sse_movlps(&p->func, dest, arg0);
-}
-
-static void emit_load2f_1( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   /* Loading from memory erases the upper bits. */
-   sse_movss(&p->func, dest, arg0);
-}
-
-static void emit_load1f_1( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   sse_movss(&p->func, dest, arg0);
-}
-
-static void (*load[4][4])( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 ) = {
-   { emit_load1f_1, 
-     emit_load1f_1, 
-     emit_load1f_1, 
-     emit_load1f_1 },
-
-   { emit_load2f_1, 
-     emit_load2f_2, 
-     emit_load2f_2, 
-     emit_load2f_2 },
-
-   { emit_load3f_1, 
-     emit_load3f_2, 
-     emit_load3f_3, 
-     emit_load3f_3 },
-
-   { emit_load4f_1, 
-     emit_load4f_2, 
-     emit_load4f_3, 
-     emit_load4f_4 } 
-};
-
-static void emit_load( struct x86_program *p,
-		       struct x86_reg dest,
-		       GLuint sz,
-		       struct x86_reg src,
-		       GLuint src_sz)
-{
-   load[sz-1][src_sz-1](p, dest, src);
-}
-
-static void emit_store4f( struct x86_program *p, 			   
-			  struct x86_reg dest,
-			  struct x86_reg arg0 )
-{
-   sse_movups(&p->func, dest, arg0);
-}
-
-static void emit_store3f( struct x86_program *p, 
-			  struct x86_reg dest,
-			  struct x86_reg arg0 )
-{
-   if (p->outputs_safe) {
-      /* Emit the extra dword anyway.  This may hurt writecombining,
-       * may cause other problems.
-       */
-      sse_movups(&p->func, dest, arg0);
-   }
-   else {
-      /* Alternate strategy - emit two, shuffle, emit one.
-       */
-      sse_movlps(&p->func, dest, arg0);
-      sse_shufps(&p->func, arg0, arg0, SHUF(Z,Z,Z,Z) ); /* NOTE! destructive */
-      sse_movss(&p->func, x86_make_disp(dest,8), arg0);
-   }
-}
-
-static void emit_store2f( struct x86_program *p, 
-			   struct x86_reg dest,
-			   struct x86_reg arg0 )
-{
-   sse_movlps(&p->func, dest, arg0);
-}
-
-static void emit_store1f( struct x86_program *p, 
-			  struct x86_reg dest,
-			  struct x86_reg arg0 )
-{
-   sse_movss(&p->func, dest, arg0);
-}
-
-
-static void (*store[4])( struct x86_program *p, 
-			 struct x86_reg dest,
-			 struct x86_reg arg0 ) = 
-{
-   emit_store1f, 
-   emit_store2f, 
-   emit_store3f, 
-   emit_store4f 
-};
-
-static void emit_store( struct x86_program *p,
-			struct x86_reg dest,
-			GLuint sz,
-			struct x86_reg temp )
-
-{
-   store[sz-1](p, dest, temp);
-}
-
-static void emit_pack_store_4ub( struct x86_program *p,
-				 struct x86_reg dest,
-				 struct x86_reg temp )
-{
-   /* Scale by 255.0
-    */
-   sse_mulps(&p->func, temp, p->chan0);
-
-   if (p->have_sse2) {
-      sse2_cvtps2dq(&p->func, temp, temp);
-      sse2_packssdw(&p->func, temp, temp);
-      sse2_packuswb(&p->func, temp, temp);
-      sse_movss(&p->func, dest, temp);
-   }
-   else {
-      struct x86_reg mmx0 = x86_make_reg(file_MMX, 0);
-      struct x86_reg mmx1 = x86_make_reg(file_MMX, 1);
-      sse_cvtps2pi(&p->func, mmx0, temp);
-      sse_movhlps(&p->func, temp, temp);
-      sse_cvtps2pi(&p->func, mmx1, temp);
-      mmx_packssdw(&p->func, mmx0, mmx1);
-      mmx_packuswb(&p->func, mmx0, mmx0);
-      mmx_movd(&p->func, dest, mmx0);
-   }
-}
-
-static GLint get_offset( const void *a, const void *b )
-{
-   return (const char *)b - (const char *)a;
-}
-
-/* Not much happens here.  Eventually use this function to try and
- * avoid saving/reloading the source pointers each vertex (if some of
- * them can fit in registers).
- */
-static void get_src_ptr( struct x86_program *p,
-			 struct x86_reg srcREG,
-			 struct x86_reg vtxREG,
-			 struct tnl_clipspace_attr *a )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(p->ctx);
-   struct x86_reg ptr_to_src = x86_make_disp(vtxREG, get_offset(vtx, &a->inputptr));
-
-   /* Load current a[j].inputptr
-    */
-   x86_mov(&p->func, srcREG, ptr_to_src);
-}
-
-static void update_src_ptr( struct x86_program *p,
-			 struct x86_reg srcREG,
-			 struct x86_reg vtxREG,
-			 struct tnl_clipspace_attr *a )
-{
-   if (a->inputstride) {
-      struct tnl_clipspace *vtx = GET_VERTEX_STATE(p->ctx);
-      struct x86_reg ptr_to_src = x86_make_disp(vtxREG, get_offset(vtx, &a->inputptr));
-
-      /* add a[j].inputstride (hardcoded value - could just as easily
-       * pull the stride value from memory each time).
-       */
-      x86_lea(&p->func, srcREG, x86_make_disp(srcREG, a->inputstride));
-      
-      /* save new value of a[j].inputptr 
-       */
-      x86_mov(&p->func, ptr_to_src, srcREG);
-   }
-}
-
-
-/* Lots of hardcoding
- *
- * EAX -- pointer to current output vertex
- * ECX -- pointer to current attribute 
- * 
- */
-static GLboolean build_vertex_emit( struct x86_program *p )
-{
-   GLcontext *ctx = p->ctx;
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   GLuint j = 0;
-
-   struct x86_reg vertexEAX = x86_make_reg(file_REG32, reg_AX);
-   struct x86_reg srcECX = x86_make_reg(file_REG32, reg_CX);
-   struct x86_reg countEBP = x86_make_reg(file_REG32, reg_BP);
-   struct x86_reg vtxESI = x86_make_reg(file_REG32, reg_SI);
-   struct x86_reg temp = x86_make_reg(file_XMM, 0);
-   struct x86_reg vp0 = x86_make_reg(file_XMM, 1);
-   struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
-   struct x86_reg temp2 = x86_make_reg(file_XMM, 3);
-   GLubyte *fixup, *label;
-
-   /* Push a few regs?
-    */
-   x86_push(&p->func, countEBP);
-   x86_push(&p->func, vtxESI);
-
-
-   /* Get vertex count, compare to zero
-    */
-   x86_xor(&p->func, srcECX, srcECX);
-   x86_mov(&p->func, countEBP, x86_fn_arg(&p->func, 2));
-   x86_cmp(&p->func, countEBP, srcECX);
-   fixup = x86_jcc_forward(&p->func, cc_E);
-
-   /* Initialize destination register. 
-    */
-   x86_mov(&p->func, vertexEAX, x86_fn_arg(&p->func, 3));
-
-   /* Dereference ctx to get tnl, then vtx:
-    */
-   x86_mov(&p->func, vtxESI, x86_fn_arg(&p->func, 1));
-   x86_mov(&p->func, vtxESI, x86_make_disp(vtxESI, get_offset(ctx, &ctx->swtnl_context)));
-   vtxESI = x86_make_disp(vtxESI, get_offset(tnl, &tnl->clipspace));
-
-   
-   /* Possibly load vp0, vp1 for viewport calcs:
-    */
-   if (vtx->need_viewport) {
-      sse_movups(&p->func, vp0, x86_make_disp(vtxESI, get_offset(vtx, &vtx->vp_scale[0])));
-      sse_movups(&p->func, vp1, x86_make_disp(vtxESI, get_offset(vtx, &vtx->vp_xlate[0])));
-   }
-
-   /* always load, needed or not:
-    */
-   sse_movups(&p->func, p->chan0, x86_make_disp(vtxESI, get_offset(vtx, &vtx->chan_scale[0])));
-   sse_movups(&p->func, p->identity, x86_make_disp(vtxESI, get_offset(vtx, &vtx->identity[0])));
-
-   /* Note address for loop jump */
-   label = x86_get_label(&p->func);
-
-   /* Emit code for each of the attributes.  Currently routes
-    * everything through SSE registers, even when it might be more
-    * efficient to stick with regular old x86.  No optimization or
-    * other tricks - enough new ground to cover here just getting
-    * things working.
-    */
-   while (j < vtx->attr_count) {
-      struct tnl_clipspace_attr *a = &vtx->attr[j];
-      struct x86_reg dest = x86_make_disp(vertexEAX, a->vertoffset);
-
-      /* Now, load an XMM reg from src, perhaps transform, then save.
-       * Could be shortcircuited in specific cases:
-       */
-      switch (a->format) {
-      case EMIT_1F:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 1, x86_deref(srcECX), a->inputsize);
-	 emit_store(p, dest, 1, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_2F:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 2, x86_deref(srcECX), a->inputsize);
-	 emit_store(p, dest, 2, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_3F:
-	 /* Potentially the worst case - hardcode 2+1 copying:
-	  */
-	 if (0) {
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);
-	    emit_store(p, dest, 3, temp);
-	    update_src_ptr(p, srcECX, vtxESI, a);
-	 }
-	 else {
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 2, x86_deref(srcECX), a->inputsize);
-	    emit_store(p, dest, 2, temp);
-	    if (a->inputsize > 2) {
-	       emit_load(p, temp, 1, x86_make_disp(srcECX, 8), 1);
-	       emit_store(p, x86_make_disp(dest,8), 1, temp);
-	    }
-	    else {
-	       sse_movss(&p->func, x86_make_disp(dest,8), get_identity(p));
-	    }
-	    update_src_ptr(p, srcECX, vtxESI, a);
-	 }
-	 break;
-      case EMIT_4F:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 emit_store(p, dest, 4, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_2F_VIEWPORT: 
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 2, x86_deref(srcECX), a->inputsize);
-	 sse_mulps(&p->func, temp, vp0);
-	 sse_addps(&p->func, temp, vp1);
-	 emit_store(p, dest, 2, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_3F_VIEWPORT: 
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);
-	 sse_mulps(&p->func, temp, vp0);
-	 sse_addps(&p->func, temp, vp1);
-	 emit_store(p, dest, 3, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_4F_VIEWPORT: 
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 sse_mulps(&p->func, temp, vp0);
-	 sse_addps(&p->func, temp, vp1);
-	 emit_store(p, dest, 4, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_3F_XYW:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 sse_shufps(&p->func, temp, temp, SHUF(X,Y,W,Z));
-	 emit_store(p, dest, 3, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-
-      case EMIT_1UB_1F:	 
-	 /* Test for PAD3 + 1UB:
-	  */
-	 if (j > 0 &&
-	     a[-1].vertoffset + a[-1].vertattrsize <= a->vertoffset - 3)
-	 {
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 1, x86_deref(srcECX), a->inputsize);
-	    sse_shufps(&p->func, temp, temp, SHUF(X,X,X,X));
-	    emit_pack_store_4ub(p, x86_make_disp(dest, -3), temp); /* overkill! */
-	    update_src_ptr(p, srcECX, vtxESI, a);
-	 }
-	 else {
-	    printf("Can't emit 1ub %x %x %d\n", a->vertoffset, a[-1].vertoffset, a[-1].vertattrsize );
-	    return GL_FALSE;
-	 }
-	 break;
-      case EMIT_3UB_3F_RGB:
-      case EMIT_3UB_3F_BGR:
-	 /* Test for 3UB + PAD1:
-	  */
-	 if (j == vtx->attr_count - 1 ||
-	     a[1].vertoffset >= a->vertoffset + 4) {
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);
-	    if (a->format == EMIT_3UB_3F_BGR)
-	       sse_shufps(&p->func, temp, temp, SHUF(Z,Y,X,W));
-	    emit_pack_store_4ub(p, dest, temp);
-	    update_src_ptr(p, srcECX, vtxESI, a);
-	 }
-	 /* Test for 3UB + 1UB:
-	  */
-	 else if (j < vtx->attr_count - 1 &&
-		  a[1].format == EMIT_1UB_1F &&
-		  a[1].vertoffset == a->vertoffset + 3) {
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);
-	    update_src_ptr(p, srcECX, vtxESI, a);
-
-	    /* Make room for incoming value:
-	     */
-	    sse_shufps(&p->func, temp, temp, SHUF(W,X,Y,Z));
-
-	    get_src_ptr(p, srcECX, vtxESI, &a[1]);
-	    emit_load(p, temp2, 1, x86_deref(srcECX), a[1].inputsize);
-	    sse_movss(&p->func, temp, temp2);
-	    update_src_ptr(p, srcECX, vtxESI, &a[1]);
-
-	    /* Rearrange and possibly do BGR conversion:
-	     */
-	    if (a->format == EMIT_3UB_3F_BGR)
-	       sse_shufps(&p->func, temp, temp, SHUF(W,Z,Y,X));
-	    else
-	       sse_shufps(&p->func, temp, temp, SHUF(Y,Z,W,X));
-
-	    emit_pack_store_4ub(p, dest, temp);
-	    j++;		/* NOTE: two attrs consumed */
-	 }
-	 else {
-	    printf("Can't emit 3ub\n");
-	    return GL_FALSE;	/* add this later */
-	 }
-	 break;
-
-      case EMIT_4UB_4F_RGBA:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 emit_pack_store_4ub(p, dest, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_4UB_4F_BGRA:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 sse_shufps(&p->func, temp, temp, SHUF(Z,Y,X,W));
-	 emit_pack_store_4ub(p, dest, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_4UB_4F_ARGB:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 sse_shufps(&p->func, temp, temp, SHUF(W,X,Y,Z));
-	 emit_pack_store_4ub(p, dest, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_4UB_4F_ABGR:
-	 get_src_ptr(p, srcECX, vtxESI, a);
-	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	 sse_shufps(&p->func, temp, temp, SHUF(W,Z,Y,X));
-	 emit_pack_store_4ub(p, dest, temp);
-	 update_src_ptr(p, srcECX, vtxESI, a);
-	 break;
-      case EMIT_4CHAN_4F_RGBA:
-	 switch (CHAN_TYPE) {
-	 case GL_UNSIGNED_BYTE:
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	    emit_pack_store_4ub(p, dest, temp);
-	    update_src_ptr(p, srcECX, vtxESI, a);
-	    break;
-	 case GL_FLOAT:
-	    get_src_ptr(p, srcECX, vtxESI, a);
-	    emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);
-	    emit_store(p, dest, 4, temp);
-	    update_src_ptr(p, srcECX, vtxESI, a);
-	    break;
-	 case GL_UNSIGNED_SHORT:
-	 default:
-	    printf("unknown CHAN_TYPE %s\n", _mesa_lookup_enum_by_nr(CHAN_TYPE));
-	    return GL_FALSE;
-	 }
-	 break;
-      default:
-	 printf("unknown a[%d].format %d\n", j, a->format);
-	 return GL_FALSE;	/* catch any new opcodes */
-      }
-      
-      /* Increment j by at least 1 - may have been incremented above also:
-       */
-      j++;
-   }
-
-   /* Next vertex:
-    */
-   x86_lea(&p->func, vertexEAX, x86_make_disp(vertexEAX, vtx->vertex_size));
-
-   /* decr count, loop if not zero
-    */
-   x86_dec(&p->func, countEBP);
-   x86_test(&p->func, countEBP, countEBP); 
-   x86_jcc(&p->func, cc_NZ, label);
-
-   /* Exit mmx state?
-    */
-   if (p->func.need_emms)
-      mmx_emms(&p->func);
-
-   /* Land forward jump here:
-    */
-   x86_fixup_fwd_jump(&p->func, fixup);
-
-   /* Pop regs and return
-    */
-   x86_pop(&p->func, x86_get_base_reg(vtxESI));
-   x86_pop(&p->func, countEBP);
-   x86_ret(&p->func);
-
-   assert(!vtx->emit);
-   vtx->emit = (tnl_emit_func)x86_get_func(&p->func);
-
-   assert( (char *) p->func.csr - (char *) p->func.store <= MAX_SSE_CODE_SIZE );
-   return GL_TRUE;
-}
-
-
-
-void _tnl_generate_sse_emit( GLcontext *ctx )
-{
-   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
-   struct x86_program p;   
-
-   if (!cpu_has_xmm) {
-      vtx->codegen_emit = NULL;
-      return;
-   }
-
-   memset(&p, 0, sizeof(p));
-
-   p.ctx = ctx;
-   p.inputs_safe = 0;		/* for now */
-   p.outputs_safe = 0;		/* for now */
-   p.have_sse2 = cpu_has_xmm2;
-   p.identity = x86_make_reg(file_XMM, 6);
-   p.chan0 = x86_make_reg(file_XMM, 7);
-
-   if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) {
-      vtx->emit = NULL;
-      return;
-   }
-
-   if (build_vertex_emit(&p)) {
-      _tnl_register_fastpath( vtx, GL_TRUE );
-   }
-   else {
-      /* Note the failure so that we don't keep trying to codegen an
-       * impossible state:
-       */
-      _tnl_register_fastpath( vtx, GL_FALSE );
-      x86_release_func(&p.func);
-   }
-}
-
-#else
-
-void _tnl_generate_sse_emit( GLcontext *ctx )
-{
-   /* Dummy version for when USE_SSE_ASM not defined */
-}
-
-#endif
+/*

+ * Copyright 2003 Tungsten Graphics, 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

+ * 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 <keithw@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/colormac.h"

+#include "main/simple_list.h"

+#include "main/enums.h"

+#include "t_context.h"

+#include "t_vertex.h"

+

+#if defined(USE_SSE_ASM)

+

+#include "x86/rtasm/x86sse.h"

+#include "x86/common_x86_asm.h"

+

+

+/**

+ * Number of bytes to allocate for generated SSE functions

+ */

+#define MAX_SSE_CODE_SIZE 1024

+

+

+#define X    0

+#define Y    1

+#define Z    2

+#define W    3

+

+

+struct x86_program {

+   struct x86_function func;

+

+   struct gl_context *ctx;

+   GLboolean inputs_safe;

+   GLboolean outputs_safe;

+   GLboolean have_sse2;

+   

+   struct x86_reg identity;

+   struct x86_reg chan0;

+};

+

+

+static struct x86_reg get_identity( struct x86_program *p )

+{

+   return p->identity;

+}

+

+static void emit_load4f_4( struct x86_program *p, 			   

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   sse_movups(&p->func, dest, arg0);

+}

+

+static void emit_load4f_3( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   /* Have to jump through some hoops:

+    *

+    * c 0 0 0

+    * c 0 0 1

+    * 0 0 c 1

+    * a b c 1

+    */

+   sse_movss(&p->func, dest, x86_make_disp(arg0, 8));

+   sse_shufps(&p->func, dest, get_identity(p), SHUF(X,Y,Z,W) );

+   sse_shufps(&p->func, dest, dest, SHUF(Y,Z,X,W) );

+   sse_movlps(&p->func, dest, arg0);

+}

+

+static void emit_load4f_2( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   /* Initialize from identity, then pull in low two words:

+    */

+   sse_movups(&p->func, dest, get_identity(p));

+   sse_movlps(&p->func, dest, arg0);

+}

+

+static void emit_load4f_1( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   /* Pull in low word, then swizzle in identity */

+   sse_movss(&p->func, dest, arg0);

+   sse_shufps(&p->func, dest, get_identity(p), SHUF(X,Y,Z,W) );

+}

+

+

+

+static void emit_load3f_3( struct x86_program *p, 			   

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   /* Over-reads by 1 dword - potential SEGV if input is a vertex

+    * array.

+    */

+   if (p->inputs_safe) {

+      sse_movups(&p->func, dest, arg0);

+   } 

+   else {

+      /* c 0 0 0

+       * c c c c

+       * a b c c 

+       */

+      sse_movss(&p->func, dest, x86_make_disp(arg0, 8));

+      sse_shufps(&p->func, dest, dest, SHUF(X,X,X,X));

+      sse_movlps(&p->func, dest, arg0);

+   }

+}

+

+static void emit_load3f_2( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   emit_load4f_2(p, dest, arg0);

+}

+

+static void emit_load3f_1( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   /* Loading from memory erases the upper bits. */

+   sse_movss(&p->func, dest, arg0);

+}

+

+static void emit_load2f_2( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   sse_movlps(&p->func, dest, arg0);

+}

+

+static void emit_load2f_1( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   /* Loading from memory erases the upper bits. */

+   sse_movss(&p->func, dest, arg0);

+}

+

+static void emit_load1f_1( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   sse_movss(&p->func, dest, arg0);

+}

+

+static void (*load[4][4])( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 ) = {

+   { emit_load1f_1, 

+     emit_load1f_1, 

+     emit_load1f_1, 

+     emit_load1f_1 },

+

+   { emit_load2f_1, 

+     emit_load2f_2, 

+     emit_load2f_2, 

+     emit_load2f_2 },

+

+   { emit_load3f_1, 

+     emit_load3f_2, 

+     emit_load3f_3, 

+     emit_load3f_3 },

+

+   { emit_load4f_1, 

+     emit_load4f_2, 

+     emit_load4f_3, 

+     emit_load4f_4 } 

+};

+

+static void emit_load( struct x86_program *p,

+		       struct x86_reg dest,

+		       GLuint sz,

+		       struct x86_reg src,

+		       GLuint src_sz)

+{

+   load[sz-1][src_sz-1](p, dest, src);

+}

+

+static void emit_store4f( struct x86_program *p, 			   

+			  struct x86_reg dest,

+			  struct x86_reg arg0 )

+{

+   sse_movups(&p->func, dest, arg0);

+}

+

+static void emit_store3f( struct x86_program *p, 

+			  struct x86_reg dest,

+			  struct x86_reg arg0 )

+{

+   if (p->outputs_safe) {

+      /* Emit the extra dword anyway.  This may hurt writecombining,

+       * may cause other problems.

+       */

+      sse_movups(&p->func, dest, arg0);

+   }

+   else {

+      /* Alternate strategy - emit two, shuffle, emit one.

+       */

+      sse_movlps(&p->func, dest, arg0);

+      sse_shufps(&p->func, arg0, arg0, SHUF(Z,Z,Z,Z) ); /* NOTE! destructive */

+      sse_movss(&p->func, x86_make_disp(dest,8), arg0);

+   }

+}

+

+static void emit_store2f( struct x86_program *p, 

+			   struct x86_reg dest,

+			   struct x86_reg arg0 )

+{

+   sse_movlps(&p->func, dest, arg0);

+}

+

+static void emit_store1f( struct x86_program *p, 

+			  struct x86_reg dest,

+			  struct x86_reg arg0 )

+{

+   sse_movss(&p->func, dest, arg0);

+}

+

+

+static void (*store[4])( struct x86_program *p, 

+			 struct x86_reg dest,

+			 struct x86_reg arg0 ) = 

+{

+   emit_store1f, 

+   emit_store2f, 

+   emit_store3f, 

+   emit_store4f 

+};

+

+static void emit_store( struct x86_program *p,

+			struct x86_reg dest,

+			GLuint sz,

+			struct x86_reg temp )

+

+{

+   store[sz-1](p, dest, temp);

+}

+

+static void emit_pack_store_4ub( struct x86_program *p,

+				 struct x86_reg dest,

+				 struct x86_reg temp )

+{

+   /* Scale by 255.0

+    */

+   sse_mulps(&p->func, temp, p->chan0);

+

+   if (p->have_sse2) {

+      sse2_cvtps2dq(&p->func, temp, temp);

+      sse2_packssdw(&p->func, temp, temp);

+      sse2_packuswb(&p->func, temp, temp);

+      sse_movss(&p->func, dest, temp);

+   }

+   else {

+      struct x86_reg mmx0 = x86_make_reg(file_MMX, 0);

+      struct x86_reg mmx1 = x86_make_reg(file_MMX, 1);

+      sse_cvtps2pi(&p->func, mmx0, temp);

+      sse_movhlps(&p->func, temp, temp);

+      sse_cvtps2pi(&p->func, mmx1, temp);

+      mmx_packssdw(&p->func, mmx0, mmx1);

+      mmx_packuswb(&p->func, mmx0, mmx0);

+      mmx_movd(&p->func, dest, mmx0);

+   }

+}

+

+static GLint get_offset( const void *a, const void *b )

+{

+   return (const char *)b - (const char *)a;

+}

+

+/* Not much happens here.  Eventually use this function to try and

+ * avoid saving/reloading the source pointers each vertex (if some of

+ * them can fit in registers).

+ */

+static void get_src_ptr( struct x86_program *p,

+			 struct x86_reg srcREG,

+			 struct x86_reg vtxREG,

+			 struct tnl_clipspace_attr *a )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(p->ctx);

+   struct x86_reg ptr_to_src = x86_make_disp(vtxREG, get_offset(vtx, &a->inputptr));

+

+   /* Load current a[j].inputptr

+    */

+   x86_mov(&p->func, srcREG, ptr_to_src);

+}

+

+static void update_src_ptr( struct x86_program *p,

+			 struct x86_reg srcREG,

+			 struct x86_reg vtxREG,

+			 struct tnl_clipspace_attr *a )

+{

+   if (a->inputstride) {

+      struct tnl_clipspace *vtx = GET_VERTEX_STATE(p->ctx);

+      struct x86_reg ptr_to_src = x86_make_disp(vtxREG, get_offset(vtx, &a->inputptr));

+

+      /* add a[j].inputstride (hardcoded value - could just as easily

+       * pull the stride value from memory each time).

+       */

+      x86_lea(&p->func, srcREG, x86_make_disp(srcREG, a->inputstride));

+      

+      /* save new value of a[j].inputptr 

+       */

+      x86_mov(&p->func, ptr_to_src, srcREG);

+   }

+}

+

+

+/* Lots of hardcoding

+ *

+ * EAX -- pointer to current output vertex

+ * ECX -- pointer to current attribute 

+ * 

+ */

+static GLboolean build_vertex_emit( struct x86_program *p )

+{

+   struct gl_context *ctx = p->ctx;

+   TNLcontext *tnl = TNL_CONTEXT(ctx);

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   GLuint j = 0;

+

+   struct x86_reg vertexEAX = x86_make_reg(file_REG32, reg_AX);

+   struct x86_reg srcECX = x86_make_reg(file_REG32, reg_CX);

+   struct x86_reg countEBP = x86_make_reg(file_REG32, reg_BP);

+   struct x86_reg vtxESI = x86_make_reg(file_REG32, reg_SI);

+   struct x86_reg temp = x86_make_reg(file_XMM, 0);

+   struct x86_reg vp0 = x86_make_reg(file_XMM, 1);

+   struct x86_reg vp1 = x86_make_reg(file_XMM, 2);

+   struct x86_reg temp2 = x86_make_reg(file_XMM, 3);

+   GLubyte *fixup, *label;

+

+   /* Push a few regs?

+    */

+   x86_push(&p->func, countEBP);

+   x86_push(&p->func, vtxESI);

+

+

+   /* Get vertex count, compare to zero

+    */

+   x86_xor(&p->func, srcECX, srcECX);

+   x86_mov(&p->func, countEBP, x86_fn_arg(&p->func, 2));

+   x86_cmp(&p->func, countEBP, srcECX);

+   fixup = x86_jcc_forward(&p->func, cc_E);

+

+   /* Initialize destination register. 

+    */

+   x86_mov(&p->func, vertexEAX, x86_fn_arg(&p->func, 3));

+

+   /* Dereference ctx to get tnl, then vtx:

+    */

+   x86_mov(&p->func, vtxESI, x86_fn_arg(&p->func, 1));

+   x86_mov(&p->func, vtxESI, x86_make_disp(vtxESI, get_offset(ctx, &ctx->swtnl_context)));

+   vtxESI = x86_make_disp(vtxESI, get_offset(tnl, &tnl->clipspace));

+

+   

+   /* Possibly load vp0, vp1 for viewport calcs:

+    */

+   if (vtx->need_viewport) {

+      sse_movups(&p->func, vp0, x86_make_disp(vtxESI, get_offset(vtx, &vtx->vp_scale[0])));

+      sse_movups(&p->func, vp1, x86_make_disp(vtxESI, get_offset(vtx, &vtx->vp_xlate[0])));

+   }

+

+   /* always load, needed or not:

+    */

+   sse_movups(&p->func, p->chan0, x86_make_disp(vtxESI, get_offset(vtx, &vtx->chan_scale[0])));

+   sse_movups(&p->func, p->identity, x86_make_disp(vtxESI, get_offset(vtx, &vtx->identity[0])));

+

+   /* Note address for loop jump */

+   label = x86_get_label(&p->func);

+

+   /* Emit code for each of the attributes.  Currently routes

+    * everything through SSE registers, even when it might be more

+    * efficient to stick with regular old x86.  No optimization or

+    * other tricks - enough new ground to cover here just getting

+    * things working.

+    */

+   while (j < vtx->attr_count) {

+      struct tnl_clipspace_attr *a = &vtx->attr[j];

+      struct x86_reg dest = x86_make_disp(vertexEAX, a->vertoffset);

+

+      /* Now, load an XMM reg from src, perhaps transform, then save.

+       * Could be shortcircuited in specific cases:

+       */

+      switch (a->format) {

+      case EMIT_1F:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 1, x86_deref(srcECX), a->inputsize);

+	 emit_store(p, dest, 1, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_2F:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 2, x86_deref(srcECX), a->inputsize);

+	 emit_store(p, dest, 2, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_3F:

+	 /* Potentially the worst case - hardcode 2+1 copying:

+	  */

+	 if (0) {

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);

+	    emit_store(p, dest, 3, temp);

+	    update_src_ptr(p, srcECX, vtxESI, a);

+	 }

+	 else {

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 2, x86_deref(srcECX), a->inputsize);

+	    emit_store(p, dest, 2, temp);

+	    if (a->inputsize > 2) {

+	       emit_load(p, temp, 1, x86_make_disp(srcECX, 8), 1);

+	       emit_store(p, x86_make_disp(dest,8), 1, temp);

+	    }

+	    else {

+	       sse_movss(&p->func, x86_make_disp(dest,8), get_identity(p));

+	    }

+	    update_src_ptr(p, srcECX, vtxESI, a);

+	 }

+	 break;

+      case EMIT_4F:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 emit_store(p, dest, 4, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_2F_VIEWPORT: 

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 2, x86_deref(srcECX), a->inputsize);

+	 sse_mulps(&p->func, temp, vp0);

+	 sse_addps(&p->func, temp, vp1);

+	 emit_store(p, dest, 2, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_3F_VIEWPORT: 

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);

+	 sse_mulps(&p->func, temp, vp0);

+	 sse_addps(&p->func, temp, vp1);

+	 emit_store(p, dest, 3, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_4F_VIEWPORT: 

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 sse_mulps(&p->func, temp, vp0);

+	 sse_addps(&p->func, temp, vp1);

+	 emit_store(p, dest, 4, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_3F_XYW:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 sse_shufps(&p->func, temp, temp, SHUF(X,Y,W,Z));

+	 emit_store(p, dest, 3, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+

+      case EMIT_1UB_1F:	 

+	 /* Test for PAD3 + 1UB:

+	  */

+	 if (j > 0 &&

+	     a[-1].vertoffset + a[-1].vertattrsize <= a->vertoffset - 3)

+	 {

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 1, x86_deref(srcECX), a->inputsize);

+	    sse_shufps(&p->func, temp, temp, SHUF(X,X,X,X));

+	    emit_pack_store_4ub(p, x86_make_disp(dest, -3), temp); /* overkill! */

+	    update_src_ptr(p, srcECX, vtxESI, a);

+	 }

+	 else {

+	    printf("Can't emit 1ub %x %x %d\n", a->vertoffset, a[-1].vertoffset, a[-1].vertattrsize );

+	    return GL_FALSE;

+	 }

+	 break;

+      case EMIT_3UB_3F_RGB:

+      case EMIT_3UB_3F_BGR:

+	 /* Test for 3UB + PAD1:

+	  */

+	 if (j == vtx->attr_count - 1 ||

+	     a[1].vertoffset >= a->vertoffset + 4) {

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);

+	    if (a->format == EMIT_3UB_3F_BGR)

+	       sse_shufps(&p->func, temp, temp, SHUF(Z,Y,X,W));

+	    emit_pack_store_4ub(p, dest, temp);

+	    update_src_ptr(p, srcECX, vtxESI, a);

+	 }

+	 /* Test for 3UB + 1UB:

+	  */

+	 else if (j < vtx->attr_count - 1 &&

+		  a[1].format == EMIT_1UB_1F &&

+		  a[1].vertoffset == a->vertoffset + 3) {

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 3, x86_deref(srcECX), a->inputsize);

+	    update_src_ptr(p, srcECX, vtxESI, a);

+

+	    /* Make room for incoming value:

+	     */

+	    sse_shufps(&p->func, temp, temp, SHUF(W,X,Y,Z));

+

+	    get_src_ptr(p, srcECX, vtxESI, &a[1]);

+	    emit_load(p, temp2, 1, x86_deref(srcECX), a[1].inputsize);

+	    sse_movss(&p->func, temp, temp2);

+	    update_src_ptr(p, srcECX, vtxESI, &a[1]);

+

+	    /* Rearrange and possibly do BGR conversion:

+	     */

+	    if (a->format == EMIT_3UB_3F_BGR)

+	       sse_shufps(&p->func, temp, temp, SHUF(W,Z,Y,X));

+	    else

+	       sse_shufps(&p->func, temp, temp, SHUF(Y,Z,W,X));

+

+	    emit_pack_store_4ub(p, dest, temp);

+	    j++;		/* NOTE: two attrs consumed */

+	 }

+	 else {

+	    printf("Can't emit 3ub\n");

+	    return GL_FALSE;	/* add this later */

+	 }

+	 break;

+

+      case EMIT_4UB_4F_RGBA:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 emit_pack_store_4ub(p, dest, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_4UB_4F_BGRA:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 sse_shufps(&p->func, temp, temp, SHUF(Z,Y,X,W));

+	 emit_pack_store_4ub(p, dest, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_4UB_4F_ARGB:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 sse_shufps(&p->func, temp, temp, SHUF(W,X,Y,Z));

+	 emit_pack_store_4ub(p, dest, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_4UB_4F_ABGR:

+	 get_src_ptr(p, srcECX, vtxESI, a);

+	 emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	 sse_shufps(&p->func, temp, temp, SHUF(W,Z,Y,X));

+	 emit_pack_store_4ub(p, dest, temp);

+	 update_src_ptr(p, srcECX, vtxESI, a);

+	 break;

+      case EMIT_4CHAN_4F_RGBA:

+	 switch (CHAN_TYPE) {

+	 case GL_UNSIGNED_BYTE:

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	    emit_pack_store_4ub(p, dest, temp);

+	    update_src_ptr(p, srcECX, vtxESI, a);

+	    break;

+	 case GL_FLOAT:

+	    get_src_ptr(p, srcECX, vtxESI, a);

+	    emit_load(p, temp, 4, x86_deref(srcECX), a->inputsize);

+	    emit_store(p, dest, 4, temp);

+	    update_src_ptr(p, srcECX, vtxESI, a);

+	    break;

+	 case GL_UNSIGNED_SHORT:

+	 default:

+	    printf("unknown CHAN_TYPE %s\n", _mesa_lookup_enum_by_nr(CHAN_TYPE));

+	    return GL_FALSE;

+	 }

+	 break;

+      default:

+	 printf("unknown a[%d].format %d\n", j, a->format);

+	 return GL_FALSE;	/* catch any new opcodes */

+      }

+      

+      /* Increment j by at least 1 - may have been incremented above also:

+       */

+      j++;

+   }

+

+   /* Next vertex:

+    */

+   x86_lea(&p->func, vertexEAX, x86_make_disp(vertexEAX, vtx->vertex_size));

+

+   /* decr count, loop if not zero

+    */

+   x86_dec(&p->func, countEBP);

+   x86_test(&p->func, countEBP, countEBP); 

+   x86_jcc(&p->func, cc_NZ, label);

+

+   /* Exit mmx state?

+    */

+   if (p->func.need_emms)

+      mmx_emms(&p->func);

+

+   /* Land forward jump here:

+    */

+   x86_fixup_fwd_jump(&p->func, fixup);

+

+   /* Pop regs and return

+    */

+   x86_pop(&p->func, x86_get_base_reg(vtxESI));

+   x86_pop(&p->func, countEBP);

+   x86_ret(&p->func);

+

+   assert(!vtx->emit);

+   vtx->emit = (tnl_emit_func)x86_get_func(&p->func);

+

+   assert( (char *) p->func.csr - (char *) p->func.store <= MAX_SSE_CODE_SIZE );

+   return GL_TRUE;

+}

+

+

+

+void _tnl_generate_sse_emit( struct gl_context *ctx )

+{

+   struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

+   struct x86_program p;   

+

+   if (!cpu_has_xmm) {

+      vtx->codegen_emit = NULL;

+      return;

+   }

+

+   memset(&p, 0, sizeof(p));

+

+   p.ctx = ctx;

+   p.inputs_safe = 0;		/* for now */

+   p.outputs_safe = 0;		/* for now */

+   p.have_sse2 = cpu_has_xmm2;

+   p.identity = x86_make_reg(file_XMM, 6);

+   p.chan0 = x86_make_reg(file_XMM, 7);

+

+   if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) {

+      vtx->emit = NULL;

+      return;

+   }

+

+   if (build_vertex_emit(&p)) {

+      _tnl_register_fastpath( vtx, GL_TRUE );

+   }

+   else {

+      /* Note the failure so that we don't keep trying to codegen an

+       * impossible state:

+       */

+      _tnl_register_fastpath( vtx, GL_FALSE );

+      x86_release_func(&p.func);

+   }

+}

+

+#else

+

+void _tnl_generate_sse_emit( struct gl_context *ctx )

+{

+   /* Dummy version for when USE_SSE_ASM not defined */

+}

+

+#endif

diff --git a/mesalib/src/mesa/tnl/t_vp_build.c b/mesalib/src/mesa/tnl/t_vp_build.c
index 735937bbe..d0bada3bc 100644
--- a/mesalib/src/mesa/tnl/t_vp_build.c
+++ b/mesalib/src/mesa/tnl/t_vp_build.c
@@ -1,60 +1,60 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 2007  Tungsten Graphics   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
- * TUNGSTEN GRAPHICS 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 t_vp_build.c
- * Create a vertex program to execute the current fixed function T&L pipeline.
- * \author Keith Whitwell
- */
-
-
-#include "main/glheader.h"
-#include "main/ffvertex_prog.h"
-#include "main/dd.h"
-#include "t_vp_build.h"
-
-
-/**
- * XXX This should go away someday, but still referenced by some drivers...
- */
-void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
-{
-   const struct gl_vertex_program *prev = ctx->VertexProgram._Current;
-
-   if (!ctx->VertexProgram._Current ||
-       ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram) {
-      ctx->VertexProgram._Current
-         = ctx->VertexProgram._TnlProgram
-         = _mesa_get_fixed_func_vertex_program(ctx);
-   }
-
-   /* Tell the driver about the change.  Could define a new target for
-    * this?
-    */
-   if (ctx->VertexProgram._Current != prev && ctx->Driver.BindProgram) {
-      ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-                            (struct gl_program *) ctx->VertexProgram._Current);
-   }
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 2007  Tungsten Graphics   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

+ * TUNGSTEN GRAPHICS 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 t_vp_build.c

+ * Create a vertex program to execute the current fixed function T&L pipeline.

+ * \author Keith Whitwell

+ */

+

+

+#include "main/glheader.h"

+#include "main/ffvertex_prog.h"

+#include "main/dd.h"

+#include "t_vp_build.h"

+

+

+/**

+ * XXX This should go away someday, but still referenced by some drivers...

+ */

+void _tnl_UpdateFixedFunctionProgram( struct gl_context *ctx )

+{

+   const struct gl_vertex_program *prev = ctx->VertexProgram._Current;

+

+   if (!ctx->VertexProgram._Current ||

+       ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram) {

+      ctx->VertexProgram._Current

+         = ctx->VertexProgram._TnlProgram

+         = _mesa_get_fixed_func_vertex_program(ctx);

+   }

+

+   /* Tell the driver about the change.  Could define a new target for

+    * this?

+    */

+   if (ctx->VertexProgram._Current != prev && ctx->Driver.BindProgram) {

+      ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

+                            (struct gl_program *) ctx->VertexProgram._Current);

+   }

+}

diff --git a/mesalib/src/mesa/tnl/t_vp_build.h b/mesalib/src/mesa/tnl/t_vp_build.h
index d6ebc66c0..e5133e052 100644
--- a/mesalib/src/mesa/tnl/t_vp_build.h
+++ b/mesalib/src/mesa/tnl/t_vp_build.h
@@ -1,42 +1,42 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 2005  Tungsten Graphics   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
- * TUNGSTEN GRAPHICS 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 T_VP_BUILD_H
-#define T_VP_BUILD_H
-
-#include "main/mtypes.h"
-
-#define TNL_FIXED_FUNCTION_STATE_FLAGS (_NEW_PROGRAM |		\
-					_NEW_LIGHT |		\
-					_NEW_TEXTURE |		\
-					_NEW_TEXTURE_MATRIX |		\
-					_NEW_TRANSFORM |	\
-					_NEW_FOG |		\
-					_NEW_POINT)
-
-extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 2005  Tungsten Graphics   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

+ * TUNGSTEN GRAPHICS 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 T_VP_BUILD_H

+#define T_VP_BUILD_H

+

+#include "main/mtypes.h"

+

+#define TNL_FIXED_FUNCTION_STATE_FLAGS (_NEW_PROGRAM |		\

+					_NEW_LIGHT |		\

+					_NEW_TEXTURE |		\

+					_NEW_TEXTURE_MATRIX |		\

+					_NEW_TRANSFORM |	\

+					_NEW_FOG |		\

+					_NEW_POINT)

+

+extern void _tnl_UpdateFixedFunctionProgram( struct gl_context *ctx );

+

+#endif

diff --git a/mesalib/src/mesa/tnl/tnl.h b/mesalib/src/mesa/tnl/tnl.h
index 2c0d1fef7..9966878da 100644
--- a/mesalib/src/mesa/tnl/tnl.h
+++ b/mesalib/src/mesa/tnl/tnl.h
@@ -1,100 +1,100 @@
-/*
- * 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>
- */
-
-#ifndef _TNL_H
-#define _TNL_H
-
-#include "main/mtypes.h"
-
-
-
-/* These are the public-access functions exported from tnl.  (A few
- * more are currently hooked into dispatch directly by the module
- * itself.)
- */
-extern GLboolean
-_tnl_CreateContext( GLcontext *ctx );
-
-extern void
-_tnl_DestroyContext( GLcontext *ctx );
-
-extern void
-_tnl_InvalidateState( GLcontext *ctx, GLuint new_state );
-
-/* Functions to revive the tnl module after being unhooked from
- * dispatch and/or driver callbacks.
- */
-
-extern void
-_tnl_wakeup( GLcontext *ctx );
-
-/* Driver configuration options:
- */
-extern void
-_tnl_need_projected_coords( GLcontext *ctx, GLboolean flag );
-
-
-/* Control whether T&L does per-vertex fog
- */
-extern void
-_tnl_allow_vertex_fog( GLcontext *ctx, GLboolean value );
-
-extern void
-_tnl_allow_pixel_fog( GLcontext *ctx, GLboolean value );
-
-extern GLboolean
-_tnl_program_string(GLcontext *ctx, GLenum target, struct gl_program *program);
-
-struct _mesa_prim;
-struct _mesa_index_buffer;
-
-void
-_tnl_draw_prims( GLcontext *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);
-
-void
-_tnl_vbo_draw_prims( GLcontext *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);
-
-extern void
-_mesa_load_tracked_matrices(GLcontext *ctx);
-
-extern void
-_tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4]);
-
-#endif
+/*

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

+ */

+

+#ifndef _TNL_H

+#define _TNL_H

+

+#include "main/mtypes.h"

+

+

+

+/* These are the public-access functions exported from tnl.  (A few

+ * more are currently hooked into dispatch directly by the module

+ * itself.)

+ */

+extern GLboolean

+_tnl_CreateContext( struct gl_context *ctx );

+

+extern void

+_tnl_DestroyContext( struct gl_context *ctx );

+

+extern void

+_tnl_InvalidateState( struct gl_context *ctx, GLuint new_state );

+

+/* Functions to revive the tnl module after being unhooked from

+ * dispatch and/or driver callbacks.

+ */

+

+extern void

+_tnl_wakeup( struct gl_context *ctx );

+

+/* Driver configuration options:

+ */

+extern void

+_tnl_need_projected_coords( struct gl_context *ctx, GLboolean flag );

+

+

+/* Control whether T&L does per-vertex fog

+ */

+extern void

+_tnl_allow_vertex_fog( struct gl_context *ctx, GLboolean value );

+

+extern void

+_tnl_allow_pixel_fog( struct gl_context *ctx, GLboolean value );

+

+extern GLboolean

+_tnl_program_string(struct gl_context *ctx, GLenum target, struct gl_program *program);

+

+struct _mesa_prim;

+struct _mesa_index_buffer;

+

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

+

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

+

+extern void

+_mesa_load_tracked_matrices(struct gl_context *ctx);

+

+extern void

+_tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]);

+

+#endif

diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index 07d31f6ce..3575aa749 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -1,168 +1,170 @@
-/*
- * 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/mtypes.h"
-
-struct _mesa_prim {
-   GLuint mode:8;
-   GLuint indexed:1;
-   GLuint begin:1;
-   GLuint end:1;
-   GLuint weak:1;
-   GLuint pad:20;
-
-   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( GLcontext *ctx );
-void _vbo_DestroyContext( GLcontext *ctx );
-void _vbo_InvalidateState( GLcontext *ctx, GLuint new_state );
-
-
-typedef void (*vbo_draw_func)( GLcontext *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( GLcontext *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[] );
-
-void vbo_rebase_prims( GLcontext *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(GLcontext *ctx, const struct _mesa_prim *prim,
-		     const struct _mesa_index_buffer *ib,
-		     GLuint *min_index, GLuint *max_index);
-
-void vbo_use_buffer_objects(GLcontext *ctx);
-
-
-void vbo_set_draw_func(GLcontext *ctx, vbo_draw_func func);
-
-
-void GLAPIENTRY
-_vbo_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
-
-void GLAPIENTRY
-_vbo_Normal3f(GLfloat x, GLfloat y, GLfloat z);
-
-void GLAPIENTRY
-_vbo_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-
-void GLAPIENTRY
-_vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params);
-
-void GLAPIENTRY
-_vbo_Materialf(GLenum face, GLenum pname, GLfloat param);
-
-void GLAPIENTRY
-_vbo_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-
-void GLAPIENTRY
-_vbo_VertexAttrib1f(GLuint indx, GLfloat x);
-
-void GLAPIENTRY
-_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values);
-
-void GLAPIENTRY
-_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
-
-void GLAPIENTRY
-_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values);
-
-void GLAPIENTRY
-_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-
-void GLAPIENTRY
-_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values);
-
-void GLAPIENTRY
-_vbo_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/mtypes.h"

+

+struct _mesa_prim {

+   GLuint mode:8;

+   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_set_draw_func(struct gl_context *ctx, vbo_draw_func func);

+

+

+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 7a889b8e2..654f0eaae 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
@@ -1,486 +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.
-
-**************************************************************************/
-
-#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 )
-
-#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();
-}
-
-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();
-}
-
-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();
-}
-
-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();
-}
-
-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();
-}
-
-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();
-}
-
-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();
-}
-
-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();
-}
-
-
-/* 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();
-      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();

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

+

+

+/* 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();

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

+

+

+/* 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();

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

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

+}

+

+

+

+/* 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();

+      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_context.c b/mesalib/src/mesa/vbo/vbo_context.c
index 580850574..67a6091ba 100644
--- a/mesalib/src/mesa/vbo/vbo_context.c
+++ b/mesalib/src/mesa/vbo/vbo_context.c
@@ -1,247 +1,247 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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/imports.h"
-#include "main/mtypes.h"
-#include "main/api_arrayelt.h"
-#include "main/bufferobj.h"
-#include "math/m_eval.h"
-#include "vbo.h"
-#include "vbo_context.h"
-
-
-
-#define NR_LEGACY_ATTRIBS 16
-#define NR_GENERIC_ATTRIBS 16
-#define NR_MAT_ATTRIBS 12
-
-
-static GLuint check_size( const GLfloat *attr )
-{
-   if (attr[3] != 1.0) return 4;
-   if (attr[2] != 0.0) return 3;
-   if (attr[1] != 0.0) return 2;
-   return 1;		
-}
-
-
-static void init_legacy_currval(GLcontext *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct gl_client_array *arrays = vbo->legacy_currval;
-   GLuint i;
-
-   memset(arrays, 0, sizeof(*arrays) * NR_LEGACY_ATTRIBS);
-
-   /* Set up a constant (StrideB == 0) array for each current
-    * attribute:
-    */
-   for (i = 0; i < NR_LEGACY_ATTRIBS; i++) {
-      struct gl_client_array *cl = &arrays[i];
-
-      /* Size will have to be determined at runtime:
-       */
-      cl->Size = check_size(ctx->Current.Attrib[i]);
-      cl->Stride = 0;
-      cl->StrideB = 0;
-      cl->Enabled = 1;
-      cl->Type = GL_FLOAT;
-      cl->Format = GL_RGBA;
-      cl->Ptr = (const void *)ctx->Current.Attrib[i];
-      _mesa_reference_buffer_object(ctx, &cl->BufferObj,
-                                    ctx->Shared->NullBufferObj);
-   }
-}
-
-
-static void init_generic_currval(GLcontext *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct gl_client_array *arrays = vbo->generic_currval;
-   GLuint i;
-
-   memset(arrays, 0, sizeof(*arrays) * NR_GENERIC_ATTRIBS);
-
-   for (i = 0; i < NR_GENERIC_ATTRIBS; i++) {
-      struct gl_client_array *cl = &arrays[i];
-
-      /* This will have to be determined at runtime:
-       */
-      cl->Size = 1;
-      cl->Type = GL_FLOAT;
-      cl->Format = GL_RGBA;
-      cl->Ptr = (const void *)ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i];
-      cl->Stride = 0;
-      cl->StrideB = 0;
-      cl->Enabled = 1;
-      _mesa_reference_buffer_object(ctx, &cl->BufferObj,
-                                    ctx->Shared->NullBufferObj);
-   }
-}
-
-
-static void init_mat_currval(GLcontext *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct gl_client_array *arrays = vbo->mat_currval;
-   GLuint i;
-
-   ASSERT(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);
-
-   memset(arrays, 0, sizeof(*arrays) * NR_MAT_ATTRIBS);
-
-   /* Set up a constant (StrideB == 0) array for each current
-    * attribute:
-    */
-   for (i = 0; i < NR_MAT_ATTRIBS; i++) {
-      struct gl_client_array *cl = &arrays[i];
-
-      /* Size is fixed for the material attributes, for others will
-       * be determined at runtime:
-       */
-      switch (i - VERT_ATTRIB_GENERIC0) {
-      case MAT_ATTRIB_FRONT_SHININESS:
-      case MAT_ATTRIB_BACK_SHININESS:
-	 cl->Size = 1;
-	 break;
-      case MAT_ATTRIB_FRONT_INDEXES:
-      case MAT_ATTRIB_BACK_INDEXES:
-	 cl->Size = 3;
-	 break;
-      default:
-	 cl->Size = 4;
-	 break;
-      }
-
-      cl->Ptr = (const void *)ctx->Light.Material.Attrib[i];
-      cl->Type = GL_FLOAT;
-      cl->Format = GL_RGBA;
-      cl->Stride = 0;
-      cl->StrideB = 0;
-      cl->Enabled = 1;
-      _mesa_reference_buffer_object(ctx, &cl->BufferObj,
-                                    ctx->Shared->NullBufferObj);
-   }
-}
-
-
-GLboolean _vbo_CreateContext( GLcontext *ctx )
-{
-   struct vbo_context *vbo = CALLOC_STRUCT(vbo_context);
-
-   ctx->swtnl_im = (void *)vbo;
-
-   /* Initialize the arrayelt helper
-    */
-   if (!ctx->aelt_context &&
-       !_ae_create_context( ctx )) {
-      return GL_FALSE;
-   }
-
-   /* TODO: remove these pointers.
-    */
-   vbo->legacy_currval = &vbo->currval[VBO_ATTRIB_POS];
-   vbo->generic_currval = &vbo->currval[VBO_ATTRIB_GENERIC0];
-   vbo->mat_currval = &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];
-
-   init_legacy_currval( ctx );
-   init_generic_currval( ctx );
-   init_mat_currval( ctx );
-
-   /* Build mappings from VERT_ATTRIB -> VBO_ATTRIB depending on type
-    * of vertex program active.
-    */
-   {
-      GLuint i;
-
-      /* When no vertex program, pull in the material attributes in
-       * the 16..32 generic range.
-       */
-      for (i = 0; i < 16; i++) 
-	 vbo->map_vp_none[i] = i;
-      for (i = 0; i < 12; i++) 
-	 vbo->map_vp_none[16+i] = VBO_ATTRIB_MAT_FRONT_AMBIENT + i;
-      for (i = 0; i < 4; i++)
-	 vbo->map_vp_none[28+i] = i;	
-      
-      for (i = 0; i < Elements(vbo->map_vp_arb); i++)
-	 vbo->map_vp_arb[i] = i;
-   }
-
-
-   /* Hook our functions into exec and compile dispatch tables.  These
-    * will pretty much be permanently installed, which means that the
-    * vtxfmt mechanism can be removed now.
-    */
-   vbo_exec_init( ctx );
-   if (ctx->API == API_OPENGL)
-      vbo_save_init( ctx );
-
-   _math_init_eval();
-
-   return GL_TRUE;
-}
-
-
-void _vbo_InvalidateState( GLcontext *ctx, GLuint new_state )
-{
-   _ae_invalidate_state(ctx, new_state);
-   vbo_exec_invalidate_state(ctx, new_state);
-}
-
-
-void _vbo_DestroyContext( GLcontext *ctx )
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-
-   if (ctx->aelt_context) {
-      _ae_destroy_context( ctx );
-      ctx->aelt_context = NULL;
-   }
-
-   if (vbo) {
-      GLuint i;
-
-      for (i = 0; i < VBO_ATTRIB_MAX; i++) {
-         _mesa_reference_buffer_object(ctx, &vbo->currval[i].BufferObj, NULL);
-      }
-
-      vbo_exec_destroy(ctx);
-      if (ctx->API == API_OPENGL)
-         vbo_save_destroy(ctx);
-      FREE(vbo);
-      ctx->swtnl_im = NULL;
-   }
-}
-
-
-void vbo_set_draw_func(GLcontext *ctx, vbo_draw_func func)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   vbo->draw_prims = func;
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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/imports.h"

+#include "main/mtypes.h"

+#include "main/api_arrayelt.h"

+#include "main/bufferobj.h"

+#include "math/m_eval.h"

+#include "vbo.h"

+#include "vbo_context.h"

+

+

+

+#define NR_LEGACY_ATTRIBS 16

+#define NR_GENERIC_ATTRIBS 16

+#define NR_MAT_ATTRIBS 12

+

+

+static GLuint check_size( const GLfloat *attr )

+{

+   if (attr[3] != 1.0) return 4;

+   if (attr[2] != 0.0) return 3;

+   if (attr[1] != 0.0) return 2;

+   return 1;		

+}

+

+

+static void init_legacy_currval(struct gl_context *ctx)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct gl_client_array *arrays = vbo->legacy_currval;

+   GLuint i;

+

+   memset(arrays, 0, sizeof(*arrays) * NR_LEGACY_ATTRIBS);

+

+   /* Set up a constant (StrideB == 0) array for each current

+    * attribute:

+    */

+   for (i = 0; i < NR_LEGACY_ATTRIBS; i++) {

+      struct gl_client_array *cl = &arrays[i];

+

+      /* Size will have to be determined at runtime:

+       */

+      cl->Size = check_size(ctx->Current.Attrib[i]);

+      cl->Stride = 0;

+      cl->StrideB = 0;

+      cl->Enabled = 1;

+      cl->Type = GL_FLOAT;

+      cl->Format = GL_RGBA;

+      cl->Ptr = (const void *)ctx->Current.Attrib[i];

+      _mesa_reference_buffer_object(ctx, &cl->BufferObj,

+                                    ctx->Shared->NullBufferObj);

+   }

+}

+

+

+static void init_generic_currval(struct gl_context *ctx)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct gl_client_array *arrays = vbo->generic_currval;

+   GLuint i;

+

+   memset(arrays, 0, sizeof(*arrays) * NR_GENERIC_ATTRIBS);

+

+   for (i = 0; i < NR_GENERIC_ATTRIBS; i++) {

+      struct gl_client_array *cl = &arrays[i];

+

+      /* This will have to be determined at runtime:

+       */

+      cl->Size = 1;

+      cl->Type = GL_FLOAT;

+      cl->Format = GL_RGBA;

+      cl->Ptr = (const void *)ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i];

+      cl->Stride = 0;

+      cl->StrideB = 0;

+      cl->Enabled = 1;

+      _mesa_reference_buffer_object(ctx, &cl->BufferObj,

+                                    ctx->Shared->NullBufferObj);

+   }

+}

+

+

+static void init_mat_currval(struct gl_context *ctx)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct gl_client_array *arrays = vbo->mat_currval;

+   GLuint i;

+

+   ASSERT(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);

+

+   memset(arrays, 0, sizeof(*arrays) * NR_MAT_ATTRIBS);

+

+   /* Set up a constant (StrideB == 0) array for each current

+    * attribute:

+    */

+   for (i = 0; i < NR_MAT_ATTRIBS; i++) {

+      struct gl_client_array *cl = &arrays[i];

+

+      /* Size is fixed for the material attributes, for others will

+       * be determined at runtime:

+       */

+      switch (i - VERT_ATTRIB_GENERIC0) {

+      case MAT_ATTRIB_FRONT_SHININESS:

+      case MAT_ATTRIB_BACK_SHININESS:

+	 cl->Size = 1;

+	 break;

+      case MAT_ATTRIB_FRONT_INDEXES:

+      case MAT_ATTRIB_BACK_INDEXES:

+	 cl->Size = 3;

+	 break;

+      default:

+	 cl->Size = 4;

+	 break;

+      }

+

+      cl->Ptr = (const void *)ctx->Light.Material.Attrib[i];

+      cl->Type = GL_FLOAT;

+      cl->Format = GL_RGBA;

+      cl->Stride = 0;

+      cl->StrideB = 0;

+      cl->Enabled = 1;

+      _mesa_reference_buffer_object(ctx, &cl->BufferObj,

+                                    ctx->Shared->NullBufferObj);

+   }

+}

+

+

+GLboolean _vbo_CreateContext( struct gl_context *ctx )

+{

+   struct vbo_context *vbo = CALLOC_STRUCT(vbo_context);

+

+   ctx->swtnl_im = (void *)vbo;

+

+   /* Initialize the arrayelt helper

+    */

+   if (!ctx->aelt_context &&

+       !_ae_create_context( ctx )) {

+      return GL_FALSE;

+   }

+

+   /* TODO: remove these pointers.

+    */

+   vbo->legacy_currval = &vbo->currval[VBO_ATTRIB_POS];

+   vbo->generic_currval = &vbo->currval[VBO_ATTRIB_GENERIC0];

+   vbo->mat_currval = &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];

+

+   init_legacy_currval( ctx );

+   init_generic_currval( ctx );

+   init_mat_currval( ctx );

+

+   /* Build mappings from VERT_ATTRIB -> VBO_ATTRIB depending on type

+    * of vertex program active.

+    */

+   {

+      GLuint i;

+

+      /* When no vertex program, pull in the material attributes in

+       * the 16..32 generic range.

+       */

+      for (i = 0; i < 16; i++) 

+	 vbo->map_vp_none[i] = i;

+      for (i = 0; i < 12; i++) 

+	 vbo->map_vp_none[16+i] = VBO_ATTRIB_MAT_FRONT_AMBIENT + i;

+      for (i = 0; i < 4; i++)

+	 vbo->map_vp_none[28+i] = i;	

+      

+      for (i = 0; i < Elements(vbo->map_vp_arb); i++)

+	 vbo->map_vp_arb[i] = i;

+   }

+

+

+   /* Hook our functions into exec and compile dispatch tables.  These

+    * will pretty much be permanently installed, which means that the

+    * vtxfmt mechanism can be removed now.

+    */

+   vbo_exec_init( ctx );

+   if (ctx->API == API_OPENGL)

+      vbo_save_init( ctx );

+

+   _math_init_eval();

+

+   return GL_TRUE;

+}

+

+

+void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state )

+{

+   _ae_invalidate_state(ctx, new_state);

+   vbo_exec_invalidate_state(ctx, new_state);

+}

+

+

+void _vbo_DestroyContext( struct gl_context *ctx )

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+

+   if (ctx->aelt_context) {

+      _ae_destroy_context( ctx );

+      ctx->aelt_context = NULL;

+   }

+

+   if (vbo) {

+      GLuint i;

+

+      for (i = 0; i < VBO_ATTRIB_MAX; i++) {

+         _mesa_reference_buffer_object(ctx, &vbo->currval[i].BufferObj, NULL);

+      }

+

+      vbo_exec_destroy(ctx);

+      if (ctx->API == API_OPENGL)

+         vbo_save_destroy(ctx);

+      FREE(vbo);

+      ctx->swtnl_im = NULL;

+   }

+}

+

+

+void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func)

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   vbo->draw_prims = func;

+}

+

diff --git a/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h
index 00cfc522a..91953958b 100644
--- a/mesalib/src/mesa/vbo/vbo_context.h
+++ b/mesalib/src/mesa/vbo/vbo_context.h
@@ -1,112 +1,112 @@
-/*
- * 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
- */
-
-
-/**
- * \mainpage The VBO builder module
- *
- * This module hooks into the GL dispatch table and catches all vertex
- * building and drawing commands, such as glVertex3f, glBegin and
- * glDrawArrays.  The module stores all incoming vertex data as arrays
- * in GL vertex buffer objects (VBOs), and translates all drawing
- * commands into calls to a driver supplied DrawPrimitives() callback.
- *
- * The module captures both immediate mode and display list drawing,
- * and manages the allocation, reference counting and deallocation of
- * vertex buffer objects itself.
- * 
- * The DrawPrimitives() callback can be either implemented by the
- * driver itself or hooked to the tnl module's _tnl_draw_primitives()
- * function for hardware without tnl capablilties or during fallbacks.
- */
-
-
-#ifndef _VBO_CONTEXT_H
-#define _VBO_CONTEXT_H
-
-#include "vbo.h"
-#include "vbo_attrib.h"
-#include "vbo_exec.h"
-#include "vbo_save.h"
-
-
-struct vbo_context {
-   struct gl_client_array currval[VBO_ATTRIB_MAX];
-   
-   /* These point into the above.  TODO: remove. 
-    */
-   struct gl_client_array *legacy_currval;
-   struct gl_client_array *generic_currval;
-   struct gl_client_array *mat_currval;
-
-   GLuint map_vp_none[VERT_ATTRIB_MAX];
-   GLuint map_vp_arb[VERT_ATTRIB_MAX];
-
-   GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->Current, ctx->Light.Material */
-   GLfloat CurrentFloatEdgeFlag;
-
-
-   struct vbo_exec_context exec;
-#if FEATURE_dlist
-   struct vbo_save_context save;
-#endif
-
-   /* Callback into the driver.  This must always succeed, the driver
-    * is responsible for initiating any fallback actions required:
-    */
-   vbo_draw_func draw_prims;
-};
-
-
-static INLINE struct vbo_context *vbo_context(GLcontext *ctx) 
-{
-   return (struct vbo_context *)(ctx->swtnl_im);
-}
-
-
-/**
- * Return VP_x token to indicate whether we're running fixed-function
- * vertex transformation, an NV vertex program or ARB vertex program/shader.
- */
-static INLINE enum vp_mode
-get_program_mode( GLcontext *ctx )
-{
-   if (!ctx->VertexProgram._Current)
-      return VP_NONE;
-   else if (ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram)
-      return VP_NONE;
-   else if (ctx->VertexProgram._Current->IsNVProgram)
-      return VP_NV;
-   else
-      return VP_ARB;
-}
-
-
-#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

+ */

+

+

+/**

+ * \mainpage The VBO builder module

+ *

+ * This module hooks into the GL dispatch table and catches all vertex

+ * building and drawing commands, such as glVertex3f, glBegin and

+ * glDrawArrays.  The module stores all incoming vertex data as arrays

+ * in GL vertex buffer objects (VBOs), and translates all drawing

+ * commands into calls to a driver supplied DrawPrimitives() callback.

+ *

+ * The module captures both immediate mode and display list drawing,

+ * and manages the allocation, reference counting and deallocation of

+ * vertex buffer objects itself.

+ * 

+ * The DrawPrimitives() callback can be either implemented by the

+ * driver itself or hooked to the tnl module's _tnl_draw_primitives()

+ * function for hardware without tnl capablilties or during fallbacks.

+ */

+

+

+#ifndef _VBO_CONTEXT_H

+#define _VBO_CONTEXT_H

+

+#include "vbo.h"

+#include "vbo_attrib.h"

+#include "vbo_exec.h"

+#include "vbo_save.h"

+

+

+struct vbo_context {

+   struct gl_client_array currval[VBO_ATTRIB_MAX];

+   

+   /* These point into the above.  TODO: remove. 

+    */

+   struct gl_client_array *legacy_currval;

+   struct gl_client_array *generic_currval;

+   struct gl_client_array *mat_currval;

+

+   GLuint map_vp_none[VERT_ATTRIB_MAX];

+   GLuint map_vp_arb[VERT_ATTRIB_MAX];

+

+   GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->Current, ctx->Light.Material */

+   GLfloat CurrentFloatEdgeFlag;

+

+

+   struct vbo_exec_context exec;

+#if FEATURE_dlist

+   struct vbo_save_context save;

+#endif

+

+   /* Callback into the driver.  This must always succeed, the driver

+    * is responsible for initiating any fallback actions required:

+    */

+   vbo_draw_func draw_prims;

+};

+

+

+static INLINE struct vbo_context *vbo_context(struct gl_context *ctx) 

+{

+   return (struct vbo_context *)(ctx->swtnl_im);

+}

+

+

+/**

+ * Return VP_x token to indicate whether we're running fixed-function

+ * vertex transformation, an NV vertex program or ARB vertex program/shader.

+ */

+static INLINE enum vp_mode

+get_program_mode( struct gl_context *ctx )

+{

+   if (!ctx->VertexProgram._Current)

+      return VP_NONE;

+   else if (ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram)

+      return VP_NONE;

+   else if (ctx->VertexProgram._Current->IsNVProgram)

+      return VP_NV;

+   else

+      return VP_ARB;

+}

+

+

+#endif

diff --git a/mesalib/src/mesa/vbo/vbo_exec.c b/mesalib/src/mesa/vbo/vbo_exec.c
index 046fa8105..7793aa238 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.c
+++ b/mesalib/src/mesa/vbo/vbo_exec.c
@@ -1,92 +1,92 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2005  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/api_arrayelt.h"
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "main/vtxfmt.h"
-#include "vbo_context.h"
-
-
-
-void vbo_exec_init( GLcontext *ctx )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   exec->ctx = ctx;
-
-   /* Initialize the arrayelt helper
-    */
-   if (!ctx->aelt_context &&
-       !_ae_create_context( ctx )) 
-      return;
-
-   vbo_exec_vtx_init( exec );
-   vbo_exec_array_init( exec );
-
-   /* Hook our functions into exec and compile dispatch tables.
-    */
-   _mesa_install_exec_vtxfmt( ctx, &exec->vtxfmt );
-
-   ctx->Driver.NeedFlush = 0;
-   ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
-   ctx->Driver.BeginVertices = vbo_exec_BeginVertices;
-   ctx->Driver.FlushVertices = vbo_exec_FlushVertices;
-
-   vbo_exec_invalidate_state( ctx, ~0 );
-}
-
-
-void vbo_exec_destroy( GLcontext *ctx )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   if (ctx->aelt_context) {
-      _ae_destroy_context( ctx );
-      ctx->aelt_context = NULL;
-   }
-
-   vbo_exec_vtx_destroy( exec );
-   vbo_exec_array_destroy( exec );
-}
-
-
-/**
- * Really want to install these callbacks to a central facility to be
- * invoked according to the state flags.  That will have to wait for a
- * mesa rework:
- */ 
-void vbo_exec_invalidate_state( GLcontext *ctx, GLuint new_state )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   if (new_state & (_NEW_PROGRAM|_NEW_EVAL))
-      exec->eval.recalculate_maps = 1;
-
-   _ae_invalidate_state(ctx, new_state);
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

+ * Copyright (C) 1999-2005  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/api_arrayelt.h"

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "main/vtxfmt.h"

+#include "vbo_context.h"

+

+

+

+void vbo_exec_init( struct gl_context *ctx )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   exec->ctx = ctx;

+

+   /* Initialize the arrayelt helper

+    */

+   if (!ctx->aelt_context &&

+       !_ae_create_context( ctx )) 

+      return;

+

+   vbo_exec_vtx_init( exec );

+   vbo_exec_array_init( exec );

+

+   /* Hook our functions into exec and compile dispatch tables.

+    */

+   _mesa_install_exec_vtxfmt( ctx, &exec->vtxfmt );

+

+   ctx->Driver.NeedFlush = 0;

+   ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;

+   ctx->Driver.BeginVertices = vbo_exec_BeginVertices;

+   ctx->Driver.FlushVertices = vbo_exec_FlushVertices;

+

+   vbo_exec_invalidate_state( ctx, ~0 );

+}

+

+

+void vbo_exec_destroy( struct gl_context *ctx )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   if (ctx->aelt_context) {

+      _ae_destroy_context( ctx );

+      ctx->aelt_context = NULL;

+   }

+

+   vbo_exec_vtx_destroy( exec );

+   vbo_exec_array_destroy( exec );

+}

+

+

+/**

+ * Really want to install these callbacks to a central facility to be

+ * invoked according to the state flags.  That will have to wait for a

+ * mesa rework:

+ */ 

+void vbo_exec_invalidate_state( struct gl_context *ctx, GLuint new_state )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

+   if (new_state & (_NEW_PROGRAM|_NEW_EVAL))

+      exec->eval.recalculate_maps = 1;

+

+   _ae_invalidate_state(ctx, new_state);

+}

diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h
index 33494f0ce..be3028941 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.h
+++ b/mesalib/src/mesa/vbo/vbo_exec.h
@@ -1,198 +1,198 @@
-/**************************************************************************
-
-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/mtypes.h"
-#include "vbo.h"
-#include "vbo_attrib.h"
-
-
-#define VBO_MAX_PRIM 64
-
-/* Wierd implementation stuff:
- */
-#define VBO_VERT_BUFFER_SIZE (1024*64)	/* bytes */
-#define VBO_MAX_ATTR_CODEGEN 16 
-#define ERROR_ATTRIB 16
-
-
-/** 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
-{
-   GLcontext *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;
-
-#ifdef DEBUG
-   GLint flush_call_depth;
-#endif
-};
-
-
-
-/* External API:
- */
-void vbo_exec_init( GLcontext *ctx );
-void vbo_exec_destroy( GLcontext *ctx );
-void vbo_exec_invalidate_state( GLcontext *ctx, GLuint new_state );
-void vbo_exec_FlushVertices_internal( GLcontext *ctx, GLboolean unmap );
-
-void vbo_exec_BeginVertices( GLcontext *ctx );
-void vbo_exec_FlushVertices( GLcontext *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/mtypes.h"

+#include "vbo.h"

+#include "vbo_attrib.h"

+

+

+#define VBO_MAX_PRIM 64

+

+/* Wierd implementation stuff:

+ */

+#define VBO_VERT_BUFFER_SIZE (1024*64)	/* bytes */

+#define VBO_MAX_ATTR_CODEGEN 16 

+#define ERROR_ATTRIB 16

+

+

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

+

+#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_FlushVertices_internal( struct gl_context *ctx, GLboolean unmap );

+

+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 9df75a840..b6ced258e 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -1,1032 +1,1079 @@
-/**************************************************************************
-
-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/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 )
-{
-   GLcontext *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]);
-   }
-}
-
-
-static void vbo_exec_copy_from_current( struct vbo_exec_context *exec )
-{
-   GLcontext *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.
- */ 
-static void vbo_exec_wrap_upgrade_vertex( struct vbo_exec_context *exec,
-					  GLuint attr,
-					  GLuint newsz )
-{
-   GLcontext *ctx = exec->ctx;
-   struct vbo_context *vbo = vbo_context(ctx);
-   GLint lastcount = exec->vtx.vert_count;
-   GLfloat *tmp;
-   GLuint oldsz;
-   GLuint i;
-
-   /* Run pipeline on current vertices, copy wrapped vertices
-    * to exec->vtx.copied.
-    */
-   vbo_exec_wrap_buffers( exec );
-
-
-   /* 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 &&
-       exec->vtx.attrsz[attr] == 0 && 
-       lastcount > 8 &&
-       exec->vtx.vertex_size) {
-      reset_attrfv( exec );
-   }
-
-   /* Fix up sizes:
-    */
-   oldsz = exec->vtx.attrsz[attr];
-   exec->vtx.attrsz[attr] = newsz;
-
-   exec->vtx.vertex_size += newsz - oldsz;
-   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;
-   
-
-   /* Recalculate all the attrptr[] values
-    */
-   for (i = 0, tmp = exec->vtx.vertex ; 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 );
-
-   /* Replay stored vertices to translate them
-    * to new format here.
-    *
-    * -- No need to replay - just copy piecewise
-    */
-   if (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++) {
-	    if (exec->vtx.attrsz[j]) {
-	       if (j == attr) {
-		  if (oldsz) {
-		     COPY_CLEAN_4V( dest, oldsz, data );
-		     data += oldsz;
-		     dest += newsz;
-		  } else {
-		     const GLfloat *current = (const GLfloat *)vbo->currval[j].Ptr;
-		     COPY_SZ_4V( dest, newsz, current );
-		     dest += newsz;
-		  }
-	       }
-	       else {
-		  GLuint sz = exec->vtx.attrsz[j];
-		  COPY_SZ_4V( dest, sz, data );
-		  dest += sz;
-		  data += sz;
-	       }
-	    }
-	 }
-      }
-
-      exec->vtx.buffer_ptr = dest;
-      exec->vtx.vert_count += exec->vtx.copied.nr;
-      exec->vtx.copied.nr = 0;
-   }
-}
-
-
-static void vbo_exec_fixup_vertex( GLcontext *ctx,
-				   GLuint attr, GLuint sz )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-   int i;
-
-   if (sz > 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, sz );
-   }
-   else if (sz < exec->vtx.active_sz[attr]) {
-      static const GLfloat id[4] = { 0, 0, 0, 1 };
-
-      /* New size is smaller - just need to fill in some
-       * zeros.  Don't need to flush or wrap.
-       */
-      for (i = sz ; i <= exec->vtx.attrsz[attr] ; i++)
-	 exec->vtx.attrptr[attr][i-1] = id[i-1];
-   }
-
-   exec->vtx.active_sz[attr] = sz;
-
-   /* Does setting NeedFlush belong here?  Necessitates resetting
-    * vtxfmt on each flush (otherwise flags won't get reset
-    * afterwards).
-    */
-   if (attr == 0) 
-      exec->ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
-}
-
-
-#if FEATURE_beginend
-
-/* 
- */
-#define ATTR( A, N, V0, V1, V2, V3 )				\
-do {								\
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;	\
-								\
-   if (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) {						\
-      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;			\
-      exec->ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;	\
-								\
-      if (++exec->vtx.vert_count >= exec->vtx.max_vert)		\
-	 vbo_exec_vtx_wrap( exec );				\
-   }								\
-} while (0)
-
-
-#define ERROR() _mesa_error( ctx, GL_INVALID_ENUM, __FUNCTION__ )
-#define TAG(x) vbo_##x
-
-#include "vbo_attrib_tmp.h"
-
-
-
-
-
-#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 */
-
-
-/**
- * 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( ctx, 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" );
-}
-
-
-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;
-
-   _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;
-
-   vfmt->Materialfv = vbo_Materialfv;
-
-   vfmt->EdgeFlag = vbo_EdgeFlag;
-   vfmt->Indexf = vbo_Indexf;
-   vfmt->Indexfv = vbo_Indexfv;
-
-}
-
-
-#else /* FEATURE_beginend */
-
-
-#define ATTR( A, N, V0, V1, V2, V3 )				\
-do {								\
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;	\
-								\
-   /* FLUSH_UPDATE_CURRENT needs to be set manually */		\
-   exec->ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;		\
-								\
-   if (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;					\
-   }								\
-} while (0)
-
-#define ERROR() _mesa_error( ctx, GL_INVALID_ENUM, __FUNCTION__ )
-#define TAG(x) vbo_##x
-
-#include "vbo_attrib_tmp.h"
-
-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(GLcontext *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);
-}
-
-
-
-void vbo_exec_vtx_init( struct vbo_exec_context *exec )
-{
-   GLcontext *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( exec->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;
-}
-
-
-void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
-{
-   /* using a real VBO for vertex data */
-   GLcontext *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);
-}
-
-void vbo_exec_BeginVertices( GLcontext *ctx )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-   if (0) printf("%s\n", __FUNCTION__);
-   vbo_exec_vtx_map( exec );
-
-   assert((exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);
-   exec->ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
-}
-
-void vbo_exec_FlushVertices_internal( GLcontext *ctx, GLboolean unmap )
-{
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-
-   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 );
-   }
-}
-
-
-/**
- * \param flags  bitmask of FLUSH_STORED_VERTICES, FLUSH_UPDATE_CURRENT
- */
-void vbo_exec_FlushVertices( GLcontext *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 (0) printf("%s\n", __FUNCTION__);
-
-   if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-      if (0) printf("%s - inside begin/end\n", __FUNCTION__);
-#ifdef DEBUG
-      exec->flush_call_depth--;
-      assert(exec->flush_call_depth == 0);
-#endif
-      return;
-   }
-
-   vbo_exec_FlushVertices_internal( ctx, GL_TRUE );
-
-   /* Need to do this to ensure BeginVertices gets called again:
-    */
-   if (exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) {
-      _mesa_restore_exec_vtxfmt( ctx );
-      exec->ctx->Driver.NeedFlush &= ~FLUSH_UPDATE_CURRENT;
-   }
-
-   exec->ctx->Driver.NeedFlush &= ~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
-_vbo_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a)
-{
-   vbo_Color4f(r, g, b, a);
-}
-
-
-void GLAPIENTRY
-_vbo_Normal3f(GLfloat x, GLfloat y, GLfloat z)
-{
-   vbo_Normal3f(x, y, z);
-}
-
-
-void GLAPIENTRY
-_vbo_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-   vbo_MultiTexCoord4f(target, s, t, r, q);
-}
-
-
-void GLAPIENTRY
-_vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params)
-{
-   vbo_Materialfv(face, pname, params);
-}
-
-
-void GLAPIENTRY
-_vbo_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);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-   vbo_VertexAttrib4fARB(index, x, y, z, w);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib1f(GLuint indx, GLfloat x)
-{
-   vbo_VertexAttrib1fARB(indx, x);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib1fv(GLuint indx, const GLfloat* values)
-{
-   vbo_VertexAttrib1fvARB(indx, values);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-{
-   vbo_VertexAttrib2fARB(indx, x, y);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib2fv(GLuint indx, const GLfloat* values)
-{
-   vbo_VertexAttrib2fvARB(indx, values);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-{
-   vbo_VertexAttrib3fARB(indx, x, y, z);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib3fv(GLuint indx, const GLfloat* values)
-{
-   vbo_VertexAttrib3fvARB(indx, values);
-}
-
-
-void GLAPIENTRY
-_vbo_VertexAttrib4fv(GLuint indx, const GLfloat* values)
-{
-   vbo_VertexAttrib4fvARB(indx, values);
-}
+/**************************************************************************

+

+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/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]);

+   }

+}

+

+

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

+ */ 

+static void vbo_exec_wrap_upgrade_vertex( struct vbo_exec_context *exec,

+					  GLuint attr,

+					  GLuint newsz )

+{

+   struct gl_context *ctx = exec->ctx;

+   struct vbo_context *vbo = vbo_context(ctx);

+   GLint lastcount = exec->vtx.vert_count;

+   GLfloat *old_attrptr[VBO_ATTRIB_MAX];

+   GLuint old_vtx_size = exec->vtx.vertex_size;

+   GLuint oldsz = 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(oldsz)) {

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

+       !oldsz && lastcount > 8 && exec->vtx.vertex_size) {

+      vbo_exec_copy_to_current( exec );

+      reset_attrfv( exec );

+   }

+

+   /* Fix up sizes:

+    */

+   exec->vtx.attrsz[attr] = newsz;

+   exec->vtx.vertex_size += newsz - oldsz;

+   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(oldsz)) {

+      /* 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 - newsz;

+   }

+

+   /* 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 (oldsz) {

+		     GLfloat tmp[4];

+		     COPY_CLEAN_4V(tmp, oldsz, data + old_offset);

+		     COPY_SZ_4V(dest + new_offset, newsz, 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;

+   }

+}

+

+

+static void vbo_exec_fixup_vertex( struct gl_context *ctx,

+				   GLuint attr, GLuint sz )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+   int i;

+

+   if (sz > 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, sz );

+   }

+   else if (sz < exec->vtx.active_sz[attr]) {

+      static const GLfloat id[4] = { 0, 0, 0, 1 };

+

+      /* New size is smaller - just need to fill in some

+       * zeros.  Don't need to flush or wrap.

+       */

+      for (i = sz ; i <= exec->vtx.attrsz[attr] ; i++)

+	 exec->vtx.attrptr[attr][i-1] = id[i-1];

+   }

+

+   exec->vtx.active_sz[attr] = sz;

+

+   /* Does setting NeedFlush belong here?  Necessitates resetting

+    * vtxfmt on each flush (otherwise flags won't get reset

+    * afterwards).

+    */

+   if (attr == 0) 

+      exec->ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;

+}

+

+

+/* 

+ */

+#define ATTR( A, N, V0, V1, V2, V3 )				\

+do {								\

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;	\

+									\

+   if (unlikely(!(exec->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) {						\

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

+      exec->ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;	\

+								\

+      if (++exec->vtx.vert_count >= exec->vtx.max_vert)		\

+	 vbo_exec_vtx_wrap( exec );				\

+   }								\

+} while (0)

+

+

+#define ERROR() _mesa_error( ctx, GL_INVALID_ENUM, __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 */

+

+

+/**

+ * 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( ctx, 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);

+}

+

+

+

+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( exec->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;

+}

+

+

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

+}

+

+void vbo_exec_BeginVertices( struct gl_context *ctx )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+   if (0) printf("%s\n", __FUNCTION__);

+   vbo_exec_vtx_map( exec );

+

+   assert((exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);

+   exec->ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;

+}

+

+void vbo_exec_FlushVertices_internal( struct gl_context *ctx, GLboolean unmap )

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+

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

+   }

+}

+

+

+/**

+ * \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 (0) printf("%s\n", __FUNCTION__);

+

+   if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {

+      if (0) printf("%s - inside begin/end\n", __FUNCTION__);

+#ifdef DEBUG

+      exec->flush_call_depth--;

+      assert(exec->flush_call_depth == 0);

+#endif

+      return;

+   }

+

+   vbo_exec_FlushVertices_internal( ctx, GL_TRUE );

+

+   /* Need to do this to ensure BeginVertices gets called again:

+    */

+   if (exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)

+      exec->ctx->Driver.NeedFlush &= ~FLUSH_UPDATE_CURRENT;

+

+   exec->ctx->Driver.NeedFlush &= ~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();

+}

+

+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 1759e5788..5b3a06f3b 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -1,1213 +1,1277 @@
-/**************************************************************************
- * 
- * 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"
-
-
-/**
- * Compute min and max elements by scanning the index buffer for
- * glDraw[Range]Elements() calls.
- */
-void
-vbo_get_minmax_index(GLcontext *ctx,
-		     const struct _mesa_prim *prim,
-		     const struct _mesa_index_buffer *ib,
-		     GLuint *min_index, GLuint *max_index)
-{
-   GLuint i;
-   GLuint count = prim->count;
-   const void *indices;
-
-   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 = ui_indices[count-1];
-      GLuint min_ui = ui_indices[0];
-      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 = us_indices[count-1];
-      GLuint min_us = us_indices[0];
-      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 = ub_indices[count-1];
-      GLuint min_ub = ub_indices[0];
-      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(GLcontext *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(GLcontext *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(GLcontext *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(GLcontext *ctx, GLint start, GLsizei count)
-{
-   /* TO DO */
-}
-
-
-/**
- * Print info/data for glDrawArrays(), for debugging.
- */
-static void
-print_draw_arrays(GLcontext *ctx, struct vbo_exec_context *exec,
-                  GLenum mode, GLint start, GLsizei count)
-{
-   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(GLcontext *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(GLcontext *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);
-      }
-      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;
-      }
-      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);
-         }
-
-      }
-      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(GLcontext *ctx)
-{
-   bind_array_obj(ctx);
-   recalculate_input_bindings(ctx);
-}
-
-
-
-/**
- * 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);
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_prim prim[1];
-
-   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);
-#else
-   (void) check_draw_arrays_data;
-#endif
-
-   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 = start;
-   prim[0].count = count;
-   prim[0].indexed = 0;
-   prim[0].basevertex = 0;
-   prim[0].num_instances = 1;
-
-   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
-                    GL_TRUE, start, start + count - 1 );
-
-#if 0
-   print_draw_arrays(ctx, exec, mode, start, count);
-#else
-   (void) print_draw_arrays;
-#endif
-}
-
-
-/**
- * Called from glDrawArraysInstanced when in immediate mode (not
- * display list mode).
- */
-static void GLAPIENTRY
-vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
-                             GLsizei primcount)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_prim prim[1];
-
-   if (MESA_VERBOSE & VERBOSE_DRAW)
-      _mesa_debug(ctx, "glDrawArraysInstanced(%s, %d, %d, %d)\n",
-                  _mesa_lookup_enum_by_nr(mode), start, count, primcount);
-
-   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, start, count, primcount))
-      return;
-
-   FLUSH_CURRENT( ctx, 0 );
-
-   if (!_mesa_valid_to_render(ctx, "glDrawArraysInstanced")) {
-      return;
-   }
-
-#if 0 /* debug */
-   check_draw_arrays_data(ctx, start, count);
-#endif
-
-   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 = start;
-   prim[0].count = count;
-   prim[0].indexed = 0;
-   prim[0].basevertex = 0;
-   prim[0].num_instances = primcount;
-
-   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
-                    GL_TRUE, start, start + count - 1 );
-
-#if 0 /* debug */
-   print_draw_arrays(ctx, exec, mode, start, count);
-#endif
-}
-
-
-/**
- * Map GL_ELEMENT_ARRAY_BUFFER and print contents.
- * For debugging.
- */
-static void
-dump_element_buffer(GLcontext *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(GLcontext *ctx, GLenum mode,
-				GLboolean index_bounds_valid,
-				GLuint start, GLuint end,
-				GLsizei count, GLenum type,
-				const GLvoid *indices,
-				GLint basevertex, GLint primcount)
-{
-   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 = primcount;
-
-   /* 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.
-    */
-
-   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 primcount)
-{
-   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, primcount);
-
-   if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices,
-                                             primcount))
-      return;
-
-   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,
-				   count, type, indices, 0, primcount);
-}
-
-
-/**
- * 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(GLcontext *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.
-    */
-   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;
-      }
-
-      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;
-
-         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"

+

+

+/**

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

+      }

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

+      }

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

+         }

+

+      }

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

+{

+   bind_array_obj(ctx);

+   recalculate_input_bindings(ctx);

+}

+

+

+/**

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

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

+

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

+{

+   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, primcount);

+

+   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, start, count, primcount))

+      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, primcount);

+

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

+{

+   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 = primcount;

+

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

+    */

+

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

+{

+   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, primcount);

+

+   if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices,

+                                             primcount))

+      return;

+

+   vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0,

+				   count, type, indices, 0, primcount);

+}

+

+

+/**

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

+      }

+

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

+

+         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 84ae1b87f..ea2738421 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c
@@ -1,422 +1,419 @@
-/*
- * 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/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( GLcontext *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 GLubyte *data = (GLubyte *) exec->vtx.buffer_map;
-   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]) {
-         /* 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*/
-            GLsizeiptr offset;
-            assert(exec->vtx.bufferobj->Pointer);  /* buf should be mapped */
-            offset = (GLbyte *) data -
-	       (GLbyte *) exec->vtx.bufferobj->Pointer +
-	       exec->vtx.bufferobj->Offset;
-            assert(offset >= 0);
-            arrays[attr].Ptr = (void *) offset;
-         }
-         else {
-            /* Ptr into ordinary app memory */
-            arrays[attr].Ptr = (void *) data;
-         }
-	 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; /* ??? */
-
-	 data += exec->vtx.attrsz[src] * sizeof(GLfloat);
-         varying_inputs |= 1 << attr;
-      }
-   }
-
-   _mesa_set_varying_vp_inputs( ctx, varying_inputs );
-}
-
-
-static void
-vbo_exec_vtx_unmap( struct vbo_exec_context *exec )
-{
-   GLenum target = GL_ARRAY_BUFFER_ARB;
-
-   if (_mesa_is_bufferobj(exec->vtx.bufferobj)) {
-      GLcontext *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;
-   }
-}
-
-
-void
-vbo_exec_vtx_map( struct vbo_exec_context *exec )
-{
-   GLcontext *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;
-
-   if (exec->vtx.buffer_map != NULL) {
-      assert(0);
-      exec->vtx.buffer_map = NULL;
-      exec->vtx.buffer_ptr = NULL;
-   }
-
-   if (VBO_VERT_BUFFER_SIZE > exec->vtx.buffer_used + 1024 &&
-       ctx->Driver.MapBufferRange) {
-      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) {
-      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.
- */
-void
-vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
-{
-   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) {
-	 GLcontext *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) && !unmap) {
-            vbo_exec_vtx_map( exec );
-         }
-      }
-   }
-
-   /* May have to unmap explicitly if we didn't draw:
-    */
-   if (unmap && 
-       _mesa_is_bufferobj(exec->vtx.bufferobj) &&
-       exec->vtx.buffer_map) {
-      vbo_exec_vtx_unmap( exec );
-   }
-
-
-   if (unmap || 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/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;

+      }

+   }

+

+   _mesa_set_varying_vp_inputs( ctx, varying_inputs );

+}

+

+

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

+   }

+}

+

+

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

+

+   if (exec->vtx.buffer_map != NULL) {

+      assert(0);

+      exec->vtx.buffer_map = NULL;

+      exec->vtx.buffer_ptr = NULL;

+   }

+

+   if (VBO_VERT_BUFFER_SIZE > exec->vtx.buffer_used + 1024 &&

+       ctx->Driver.MapBufferRange) {

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

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

+ */

+void

+vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )

+{

+   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) && !unmap) {

+            vbo_exec_vtx_map( exec );

+         }

+      }

+   }

+

+   /* May have to unmap explicitly if we didn't draw:

+    */

+   if (unmap && 

+       _mesa_is_bufferobj(exec->vtx.bufferobj) &&

+       exec->vtx.buffer_map) {

+      vbo_exec_vtx_unmap( exec );

+   }

+

+

+   if (unmap || 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_exec_eval.c b/mesalib/src/mesa/vbo/vbo_exec_eval.c
index 23ad12608..0aff01b25 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_eval.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_eval.c
@@ -1,263 +1,263 @@
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-#include "main/glheader.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "math/m_eval.h"
-#include "main/dispatch.h"
-#include "vbo_exec.h"
-
-
-static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 
-{
-   assert(attr < Elements(exec->eval.map1));
-   exec->eval.map1[attr].map = NULL;
-}
-
-static void clear_active_eval2( struct vbo_exec_context *exec, GLuint attr ) 
-{
-   assert(attr < Elements(exec->eval.map2));
-   exec->eval.map2[attr].map = NULL;
-}
-
-static void set_active_eval1( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 
-			      struct gl_1d_map *map )
-{
-   assert(attr < Elements(exec->eval.map1));
-   if (!exec->eval.map1[attr].map) {
-      exec->eval.map1[attr].map = map;
-      exec->eval.map1[attr].sz = dim;
-   }
-} 
-
-static void set_active_eval2( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 
-			      struct gl_2d_map *map )
-{
-   assert(attr < Elements(exec->eval.map2));
-   if (!exec->eval.map2[attr].map) {
-      exec->eval.map2[attr].map = map;
-      exec->eval.map2[attr].sz = dim;
-   }
-} 
-
-void vbo_exec_eval_update( struct vbo_exec_context *exec )
-{
-   GLcontext *ctx = exec->ctx;
-   GLuint attr;
-
-   /* Vertex program maps have priority over conventional attribs */
-
-   for (attr = 0; attr < VBO_ATTRIB_FIRST_MATERIAL; attr++) {
-      clear_active_eval1( exec, attr );
-      clear_active_eval2( exec, attr );
-   }
-
-   if (ctx->Eval.Map1Color4) 
-      set_active_eval1( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map1Color4 );
-      
-   if (ctx->Eval.Map2Color4) 
-      set_active_eval2( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map2Color4 );
-
-   if (ctx->Eval.Map1TextureCoord4) 
-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map1Texture4 );
-   else if (ctx->Eval.Map1TextureCoord3) 
-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map1Texture3 );
-   else if (ctx->Eval.Map1TextureCoord2) 
-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map1Texture2 );
-   else if (ctx->Eval.Map1TextureCoord1) 
-      set_active_eval1( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map1Texture1 );
-
-   if (ctx->Eval.Map2TextureCoord4) 
-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map2Texture4 );
-   else if (ctx->Eval.Map2TextureCoord3) 
-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map2Texture3 );
-   else if (ctx->Eval.Map2TextureCoord2) 
-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map2Texture2 );
-   else if (ctx->Eval.Map2TextureCoord1) 
-      set_active_eval2( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map2Texture1 );
-
-   if (ctx->Eval.Map1Normal) 
-      set_active_eval1( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map1Normal );
-
-   if (ctx->Eval.Map2Normal) 
-      set_active_eval2( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map2Normal );
-
-   if (ctx->Eval.Map1Vertex4) 
-      set_active_eval1( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map1Vertex4 );
-   else if (ctx->Eval.Map1Vertex3) 
-      set_active_eval1( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map1Vertex3 );
-
-   if (ctx->Eval.Map2Vertex4) 
-      set_active_eval2( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map2Vertex4 );
-   else if (ctx->Eval.Map2Vertex3) 
-      set_active_eval2( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map2Vertex3 );
-
-   /* _NEW_PROGRAM */
-   if (ctx->VertexProgram._Enabled) {
-      /* These are the 16 evaluators which GL_NV_vertex_program defines.
-       * They alias and override the conventional vertex attributs.
-       */
-      for (attr = 0; attr < 16; attr++) {
-         /* _NEW_EVAL */
-         assert(attr < Elements(ctx->Eval.Map1Attrib));
-         if (ctx->Eval.Map1Attrib[attr]) 
-            set_active_eval1( exec, attr, 4, &ctx->EvalMap.Map1Attrib[attr] );
-
-         assert(attr < Elements(ctx->Eval.Map2Attrib));
-         if (ctx->Eval.Map2Attrib[attr]) 
-            set_active_eval2( exec, attr, 4, &ctx->EvalMap.Map2Attrib[attr] );
-      }
-   }
-
-   exec->eval.recalculate_maps = 0;
-}
-
-
-
-void vbo_exec_do_EvalCoord1f(struct vbo_exec_context *exec, GLfloat u)
-{
-   GLuint attr;
-
-   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {
-      struct gl_1d_map *map = exec->eval.map1[attr].map;
-      if (map) {
-	 GLfloat uu = (u - map->u1) * map->du;
-	 GLfloat data[4];
-
-	 ASSIGN_4V(data, 0, 0, 0, 1);
-
-	 _math_horner_bezier_curve(map->Points, data, uu, 
-				   exec->eval.map1[attr].sz, 
-				   map->Order);
-
-	 COPY_SZ_4V( exec->vtx.attrptr[attr],
-		     exec->vtx.attrsz[attr],
-		     data );
-      }
-   }
-
-   /** Vertex -- EvalCoord1f is a noop if this map not enabled:
-    **/
-   if (exec->eval.map1[0].map) {
-      struct gl_1d_map *map = exec->eval.map1[0].map;
-      GLfloat uu = (u - map->u1) * map->du;
-      GLfloat vertex[4];
-
-      ASSIGN_4V(vertex, 0, 0, 0, 1);
-
-      _math_horner_bezier_curve(map->Points, vertex, uu, 
-				exec->eval.map1[0].sz, 
-				map->Order);
-
-      if (exec->eval.map1[0].sz == 4) 
-	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));
-      else
-	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 
-   }
-}
-
-
-
-void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec, 
-			      GLfloat u, GLfloat v )
-{   
-   GLuint attr;
-
-   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {
-      struct gl_2d_map *map = exec->eval.map2[attr].map;
-      if (map) {
-	 GLfloat uu = (u - map->u1) * map->du;
-	 GLfloat vv = (v - map->v1) * map->dv;
-	 GLfloat data[4];
-
-	 ASSIGN_4V(data, 0, 0, 0, 1);
-
-	 _math_horner_bezier_surf(map->Points, 
-				  data, 
-				  uu, vv, 
-				  exec->eval.map2[attr].sz, 
-				  map->Uorder, map->Vorder);
-
-	 COPY_SZ_4V( exec->vtx.attrptr[attr],
-		     exec->vtx.attrsz[attr],
-		     data );
-      }
-   }
-
-   /** Vertex -- EvalCoord2f is a noop if this map not enabled:
-    **/
-   if (exec->eval.map2[0].map) {
-      struct gl_2d_map *map = exec->eval.map2[0].map;
-      GLfloat uu = (u - map->u1) * map->du;
-      GLfloat vv = (v - map->v1) * map->dv;
-      GLfloat vertex[4];
-
-      ASSIGN_4V(vertex, 0, 0, 0, 1);
-
-      if (exec->ctx->Eval.AutoNormal) {
-	 GLfloat normal[4];
-         GLfloat du[4], dv[4];
-
-         _math_de_casteljau_surf(map->Points, vertex, du, dv, uu, vv, 
-				 exec->eval.map2[0].sz,
-				 map->Uorder, map->Vorder);
-
-	 if (exec->eval.map2[0].sz == 4) {
-	    du[0] = du[0]*vertex[3] - du[3]*vertex[0];
-	    du[1] = du[1]*vertex[3] - du[3]*vertex[1];
-	    du[2] = du[2]*vertex[3] - du[3]*vertex[2];
-	 
-	    dv[0] = dv[0]*vertex[3] - dv[3]*vertex[0];
-	    dv[1] = dv[1]*vertex[3] - dv[3]*vertex[1];
-	    dv[2] = dv[2]*vertex[3] - dv[3]*vertex[2];
-	 }
-
-
-         CROSS3(normal, du, dv);
-         NORMALIZE_3FV(normal);
-	 normal[3] = 1.0;
-
-	 COPY_SZ_4V( exec->vtx.attrptr[VBO_ATTRIB_NORMAL],
-		     exec->vtx.attrsz[VBO_ATTRIB_NORMAL],
-		     normal );
-
-      }
-      else {
-         _math_horner_bezier_surf(map->Points, vertex, uu, vv, 
-				  exec->eval.map2[0].sz,
-				  map->Uorder, map->Vorder);
-      }
-
-      if (exec->vtx.attrsz[0] == 4) 
-	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));
-      else
-	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 
-   }
-}
-
-
+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "main/macros.h"

+#include "math/m_eval.h"

+#include "main/dispatch.h"

+#include "vbo_exec.h"

+

+

+static void clear_active_eval1( struct vbo_exec_context *exec, GLuint attr ) 

+{

+   assert(attr < Elements(exec->eval.map1));

+   exec->eval.map1[attr].map = NULL;

+}

+

+static void clear_active_eval2( struct vbo_exec_context *exec, GLuint attr ) 

+{

+   assert(attr < Elements(exec->eval.map2));

+   exec->eval.map2[attr].map = NULL;

+}

+

+static void set_active_eval1( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 

+			      struct gl_1d_map *map )

+{

+   assert(attr < Elements(exec->eval.map1));

+   if (!exec->eval.map1[attr].map) {

+      exec->eval.map1[attr].map = map;

+      exec->eval.map1[attr].sz = dim;

+   }

+} 

+

+static void set_active_eval2( struct vbo_exec_context *exec, GLuint attr, GLuint dim, 

+			      struct gl_2d_map *map )

+{

+   assert(attr < Elements(exec->eval.map2));

+   if (!exec->eval.map2[attr].map) {

+      exec->eval.map2[attr].map = map;

+      exec->eval.map2[attr].sz = dim;

+   }

+} 

+

+void vbo_exec_eval_update( struct vbo_exec_context *exec )

+{

+   struct gl_context *ctx = exec->ctx;

+   GLuint attr;

+

+   /* Vertex program maps have priority over conventional attribs */

+

+   for (attr = 0; attr < VBO_ATTRIB_FIRST_MATERIAL; attr++) {

+      clear_active_eval1( exec, attr );

+      clear_active_eval2( exec, attr );

+   }

+

+   if (ctx->Eval.Map1Color4) 

+      set_active_eval1( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map1Color4 );

+      

+   if (ctx->Eval.Map2Color4) 

+      set_active_eval2( exec, VBO_ATTRIB_COLOR0, 4, &ctx->EvalMap.Map2Color4 );

+

+   if (ctx->Eval.Map1TextureCoord4) 

+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map1Texture4 );

+   else if (ctx->Eval.Map1TextureCoord3) 

+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map1Texture3 );

+   else if (ctx->Eval.Map1TextureCoord2) 

+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map1Texture2 );

+   else if (ctx->Eval.Map1TextureCoord1) 

+      set_active_eval1( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map1Texture1 );

+

+   if (ctx->Eval.Map2TextureCoord4) 

+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 4, &ctx->EvalMap.Map2Texture4 );

+   else if (ctx->Eval.Map2TextureCoord3) 

+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 3, &ctx->EvalMap.Map2Texture3 );

+   else if (ctx->Eval.Map2TextureCoord2) 

+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 2, &ctx->EvalMap.Map2Texture2 );

+   else if (ctx->Eval.Map2TextureCoord1) 

+      set_active_eval2( exec, VBO_ATTRIB_TEX0, 1, &ctx->EvalMap.Map2Texture1 );

+

+   if (ctx->Eval.Map1Normal) 

+      set_active_eval1( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map1Normal );

+

+   if (ctx->Eval.Map2Normal) 

+      set_active_eval2( exec, VBO_ATTRIB_NORMAL, 3, &ctx->EvalMap.Map2Normal );

+

+   if (ctx->Eval.Map1Vertex4) 

+      set_active_eval1( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map1Vertex4 );

+   else if (ctx->Eval.Map1Vertex3) 

+      set_active_eval1( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map1Vertex3 );

+

+   if (ctx->Eval.Map2Vertex4) 

+      set_active_eval2( exec, VBO_ATTRIB_POS, 4, &ctx->EvalMap.Map2Vertex4 );

+   else if (ctx->Eval.Map2Vertex3) 

+      set_active_eval2( exec, VBO_ATTRIB_POS, 3, &ctx->EvalMap.Map2Vertex3 );

+

+   /* _NEW_PROGRAM */

+   if (ctx->VertexProgram._Enabled) {

+      /* These are the 16 evaluators which GL_NV_vertex_program defines.

+       * They alias and override the conventional vertex attributs.

+       */

+      for (attr = 0; attr < 16; attr++) {

+         /* _NEW_EVAL */

+         assert(attr < Elements(ctx->Eval.Map1Attrib));

+         if (ctx->Eval.Map1Attrib[attr]) 

+            set_active_eval1( exec, attr, 4, &ctx->EvalMap.Map1Attrib[attr] );

+

+         assert(attr < Elements(ctx->Eval.Map2Attrib));

+         if (ctx->Eval.Map2Attrib[attr]) 

+            set_active_eval2( exec, attr, 4, &ctx->EvalMap.Map2Attrib[attr] );

+      }

+   }

+

+   exec->eval.recalculate_maps = 0;

+}

+

+

+

+void vbo_exec_do_EvalCoord1f(struct vbo_exec_context *exec, GLfloat u)

+{

+   GLuint attr;

+

+   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {

+      struct gl_1d_map *map = exec->eval.map1[attr].map;

+      if (map) {

+	 GLfloat uu = (u - map->u1) * map->du;

+	 GLfloat data[4];

+

+	 ASSIGN_4V(data, 0, 0, 0, 1);

+

+	 _math_horner_bezier_curve(map->Points, data, uu, 

+				   exec->eval.map1[attr].sz, 

+				   map->Order);

+

+	 COPY_SZ_4V( exec->vtx.attrptr[attr],

+		     exec->vtx.attrsz[attr],

+		     data );

+      }

+   }

+

+   /** Vertex -- EvalCoord1f is a noop if this map not enabled:

+    **/

+   if (exec->eval.map1[0].map) {

+      struct gl_1d_map *map = exec->eval.map1[0].map;

+      GLfloat uu = (u - map->u1) * map->du;

+      GLfloat vertex[4];

+

+      ASSIGN_4V(vertex, 0, 0, 0, 1);

+

+      _math_horner_bezier_curve(map->Points, vertex, uu, 

+				exec->eval.map1[0].sz, 

+				map->Order);

+

+      if (exec->eval.map1[0].sz == 4) 

+	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));

+      else

+	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 

+   }

+}

+

+

+

+void vbo_exec_do_EvalCoord2f( struct vbo_exec_context *exec, 

+			      GLfloat u, GLfloat v )

+{   

+   GLuint attr;

+

+   for (attr = 1; attr <= VBO_ATTRIB_TEX7; attr++) {

+      struct gl_2d_map *map = exec->eval.map2[attr].map;

+      if (map) {

+	 GLfloat uu = (u - map->u1) * map->du;

+	 GLfloat vv = (v - map->v1) * map->dv;

+	 GLfloat data[4];

+

+	 ASSIGN_4V(data, 0, 0, 0, 1);

+

+	 _math_horner_bezier_surf(map->Points, 

+				  data, 

+				  uu, vv, 

+				  exec->eval.map2[attr].sz, 

+				  map->Uorder, map->Vorder);

+

+	 COPY_SZ_4V( exec->vtx.attrptr[attr],

+		     exec->vtx.attrsz[attr],

+		     data );

+      }

+   }

+

+   /** Vertex -- EvalCoord2f is a noop if this map not enabled:

+    **/

+   if (exec->eval.map2[0].map) {

+      struct gl_2d_map *map = exec->eval.map2[0].map;

+      GLfloat uu = (u - map->u1) * map->du;

+      GLfloat vv = (v - map->v1) * map->dv;

+      GLfloat vertex[4];

+

+      ASSIGN_4V(vertex, 0, 0, 0, 1);

+

+      if (exec->ctx->Eval.AutoNormal) {

+	 GLfloat normal[4];

+         GLfloat du[4], dv[4];

+

+         _math_de_casteljau_surf(map->Points, vertex, du, dv, uu, vv, 

+				 exec->eval.map2[0].sz,

+				 map->Uorder, map->Vorder);

+

+	 if (exec->eval.map2[0].sz == 4) {

+	    du[0] = du[0]*vertex[3] - du[3]*vertex[0];

+	    du[1] = du[1]*vertex[3] - du[3]*vertex[1];

+	    du[2] = du[2]*vertex[3] - du[3]*vertex[2];

+	 

+	    dv[0] = dv[0]*vertex[3] - dv[3]*vertex[0];

+	    dv[1] = dv[1]*vertex[3] - dv[3]*vertex[1];

+	    dv[2] = dv[2]*vertex[3] - dv[3]*vertex[2];

+	 }

+

+

+         CROSS3(normal, du, dv);

+         NORMALIZE_3FV(normal);

+	 normal[3] = 1.0;

+

+	 COPY_SZ_4V( exec->vtx.attrptr[VBO_ATTRIB_NORMAL],

+		     exec->vtx.attrsz[VBO_ATTRIB_NORMAL],

+		     normal );

+

+      }

+      else {

+         _math_horner_bezier_surf(map->Points, vertex, uu, vv, 

+				  exec->eval.map2[0].sz,

+				  map->Uorder, map->Vorder);

+      }

+

+      if (exec->vtx.attrsz[0] == 4) 

+	 CALL_Vertex4fv(GET_DISPATCH(), ( vertex ));

+      else

+	 CALL_Vertex3fv(GET_DISPATCH(), ( vertex )); 

+   }

+}

+

+

diff --git a/mesalib/src/mesa/vbo/vbo_rebase.c b/mesalib/src/mesa/vbo/vbo_rebase.c
index ff7c7a6b0..a62777cbf 100644
--- a/mesalib/src/mesa/vbo/vbo_rebase.c
+++ b/mesalib/src/mesa/vbo/vbo_rebase.c
@@ -1,239 +1,251 @@
-
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-/* Helper for drivers which find themselves rendering a range of
- * indices starting somewhere above zero.  Typically the application
- * is issuing multiple DrawArrays() or DrawElements() to draw
- * successive primitives layed out linearly in the vertex arrays.
- * Unless the vertex arrays are all in a VBO, the OpenGL semantics
- * imply that we need to re-upload the vertex data on each draw call.
- * In that case, 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 will be transformed and lit.
- *
- * If we just upload the new data, however, the indices will be
- * incorrect as we tend to upload each set of vertex data to a new
- * region.  
- *
- * This file provides a helper to adjust the arrays, primitives and
- * indices of a draw call so that it can be re-issued with a min_index
- * of zero.
- */
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-
-#include "vbo.h"
-
-
-#define REBASE(TYPE) 						\
-static void *rebase_##TYPE( const void *ptr,			\
-			  GLuint count, 			\
-			  TYPE min_index )			\
-{								\
-   const TYPE *in = (TYPE *)ptr;				\
-   TYPE *tmp_indices = malloc(count * sizeof(TYPE));	\
-   GLuint i;							\
-								\
-   for (i = 0; i < count; i++)  				\
-      tmp_indices[i] = in[i] - min_index;			\
-								\
-   return (void *)tmp_indices;					\
-}
-
-
-REBASE(GLuint)
-REBASE(GLushort)
-REBASE(GLubyte)
-
-GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] )
-{
-   GLuint i;
-   
-   for (i = 0; i < VERT_ATTRIB_MAX; i++)
-      if (arrays[i]->StrideB &&
-	  arrays[i]->BufferObj->Name == 0)
-	 return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-/* Adjust primitives, indices and vertex definitions so that min_index
- * becomes zero. There are lots of reasons for wanting to do this, eg:
- *
- * Software tnl:
- *    - any time min_index != 0, otherwise unused vertices lower than
- *      min_index will be transformed.
- *
- * Hardware tnl:
- *    - if ib != NULL and min_index != 0, otherwise vertices lower than 
- *      min_index will be uploaded.  Requires adjusting index values.
- *
- *    - if ib == NULL and min_index != 0, just for convenience so this doesn't
- *      have to be handled within the driver.
- *
- * Hardware tnl with VBO support:
- *    - as above, but only when vertices are not (all?) in VBO's.
- *    - can't save time by trying to upload half a vbo - typically it is
- *      all or nothing.
- */
-void vbo_rebase_prims( GLcontext *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 )
-{
-   struct gl_client_array tmp_arrays[VERT_ATTRIB_MAX];
-   const struct gl_client_array *tmp_array_pointers[VERT_ATTRIB_MAX];
-
-   struct _mesa_index_buffer tmp_ib;
-   struct _mesa_prim *tmp_prims = NULL;
-   void *tmp_indices = NULL;
-   GLuint i;
-
-   assert(min_index != 0);
-
-   if (0)
-      printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
-
-
-   /* XXX this path is disabled for now.
-    * There's rendering corruption in some apps when it's enabled.
-    */
-   if (0 && ib && ctx->Extensions.ARB_draw_elements_base_vertex) {
-      /* If we can just tell the hardware or the TNL to interpret our
-       * indices with a different base, do so.
-       */
-      tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims);
-
-      for (i = 0; i < nr_prims; i++) {
-	 tmp_prims[i] = prim[i];
-	 tmp_prims[i].basevertex -= min_index;
-      }
-
-      prim = tmp_prims;
-   } else if (ib) {
-      /* Unfortunately need to adjust each index individually.
-       */
-      GLboolean map_ib = ib->obj->Name && !ib->obj->Pointer;
-      void *ptr;
-
-      if (map_ib) 
-	 ctx->Driver.MapBuffer(ctx, 
-			       GL_ELEMENT_ARRAY_BUFFER,
-			       GL_READ_ONLY_ARB,
-			       ib->obj);
-
-
-      ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);
-
-      /* Some users might prefer it if we translated elements to
-       * GLuints here.  Others wouldn't...
-       */
-      switch (ib->type) {
-      case GL_UNSIGNED_INT: 
-	 tmp_indices = rebase_GLuint( ptr, ib->count, min_index );
-	 break;
-      case GL_UNSIGNED_SHORT: 
-	 tmp_indices = rebase_GLushort( ptr, ib->count, min_index );
-	 break;
-      case GL_UNSIGNED_BYTE: 
-	 tmp_indices = rebase_GLubyte( ptr, ib->count, min_index );
-	 break;
-      }      
-
-      if (map_ib) 
-	 ctx->Driver.UnmapBuffer(ctx, 
-				 GL_ELEMENT_ARRAY_BUFFER,
-				 ib->obj);
-
-      tmp_ib.obj = ctx->Shared->NullBufferObj;
-      tmp_ib.ptr = tmp_indices;
-      tmp_ib.count = ib->count;
-      tmp_ib.type = ib->type;
-
-      ib = &tmp_ib;
-   }
-   else {
-      /* Otherwise the primitives need adjustment.
-       */
-      tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims);
-
-      for (i = 0; i < nr_prims; i++) {
-	 /* If this fails, it could indicate an application error:
-	  */
-	 assert(prim[i].start >= min_index);
-
-	 tmp_prims[i] = prim[i];
-	 tmp_prims[i].start -= min_index;
-      }
-
-      prim = tmp_prims;
-   }
-
-   /* Just need to adjust the pointer values on each incoming array.
-    * This works for VBO and non-vbo rendering and shouldn't pesimize
-    * VBO-based upload schemes.  However this may still not be a fast
-    * path for hardware tnl for VBO based rendering as most machines
-    * will be happier if you just specify a starting vertex value in
-    * each primitive.
-    *
-    * For drivers with hardware tnl, you only want to do this if you
-    * are forced to, eg non-VBO indexed rendering with start != 0.
-    */
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-      tmp_arrays[i] = *arrays[i];
-      tmp_arrays[i].Ptr += min_index * tmp_arrays[i].StrideB;
-      tmp_array_pointers[i] = &tmp_arrays[i];
-   }
-   
-   /* Re-issue the draw call.
-    */
-   draw( ctx, 
-	 tmp_array_pointers, 
-	 prim, 
-	 nr_prims, 
-	 ib, 
-	 GL_TRUE,
-	 0, 
-	 max_index - min_index );
-   
-   if (tmp_indices)
-      free(tmp_indices);
-   
-   if (tmp_prims)
-      free(tmp_prims);
-}
-
-
-
+

+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+/* Helper for drivers which find themselves rendering a range of

+ * indices starting somewhere above zero.  Typically the application

+ * is issuing multiple DrawArrays() or DrawElements() to draw

+ * successive primitives layed out linearly in the vertex arrays.

+ * Unless the vertex arrays are all in a VBO, the OpenGL semantics

+ * imply that we need to re-upload the vertex data on each draw call.

+ * In that case, 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 will be transformed and lit.

+ *

+ * If we just upload the new data, however, the indices will be

+ * incorrect as we tend to upload each set of vertex data to a new

+ * region.  

+ *

+ * This file provides a helper to adjust the arrays, primitives and

+ * indices of a draw call so that it can be re-issued with a min_index

+ * of zero.

+ */

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+

+#include "vbo.h"

+

+

+#define REBASE(TYPE) 						\

+static void *rebase_##TYPE( const void *ptr,			\

+			  GLuint count, 			\

+			  TYPE min_index )			\

+{								\

+   const TYPE *in = (TYPE *)ptr;				\

+   TYPE *tmp_indices = malloc(count * sizeof(TYPE));	\

+   GLuint i;							\

+								\

+   for (i = 0; i < count; i++)  				\

+      tmp_indices[i] = in[i] - min_index;			\

+								\

+   return (void *)tmp_indices;					\

+}

+

+

+REBASE(GLuint)

+REBASE(GLushort)

+REBASE(GLubyte)

+

+GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] )

+{

+   GLuint i;

+   

+   for (i = 0; i < VERT_ATTRIB_MAX; i++)

+      if (arrays[i]->StrideB &&

+	  arrays[i]->BufferObj->Name == 0)

+	 return GL_FALSE;

+

+   return GL_TRUE;

+}

+

+GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] )

+{

+   GLuint i;

+

+   for (i = 0; i < VERT_ATTRIB_MAX; i++)

+      if (arrays[i]->StrideB &&

+	  arrays[i]->BufferObj->Name != 0)

+	 return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+/* Adjust primitives, indices and vertex definitions so that min_index

+ * becomes zero. There are lots of reasons for wanting to do this, eg:

+ *

+ * Software tnl:

+ *    - any time min_index != 0, otherwise unused vertices lower than

+ *      min_index will be transformed.

+ *

+ * Hardware tnl:

+ *    - if ib != NULL and min_index != 0, otherwise vertices lower than 

+ *      min_index will be uploaded.  Requires adjusting index values.

+ *

+ *    - if ib == NULL and min_index != 0, just for convenience so this doesn't

+ *      have to be handled within the driver.

+ *

+ * Hardware tnl with VBO support:

+ *    - as above, but only when vertices are not (all?) in VBO's.

+ *    - can't save time by trying to upload half a vbo - typically it is

+ *      all or nothing.

+ */

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

+{

+   struct gl_client_array tmp_arrays[VERT_ATTRIB_MAX];

+   const struct gl_client_array *tmp_array_pointers[VERT_ATTRIB_MAX];

+

+   struct _mesa_index_buffer tmp_ib;

+   struct _mesa_prim *tmp_prims = NULL;

+   void *tmp_indices = NULL;

+   GLuint i;

+

+   assert(min_index != 0);

+

+   if (0)

+      printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);

+

+

+   /* XXX this path is disabled for now.

+    * There's rendering corruption in some apps when it's enabled.

+    */

+   if (0 && ib && ctx->Extensions.ARB_draw_elements_base_vertex) {

+      /* If we can just tell the hardware or the TNL to interpret our

+       * indices with a different base, do so.

+       */

+      tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims);

+

+      for (i = 0; i < nr_prims; i++) {

+	 tmp_prims[i] = prim[i];

+	 tmp_prims[i].basevertex -= min_index;

+      }

+

+      prim = tmp_prims;

+   } else if (ib) {

+      /* Unfortunately need to adjust each index individually.

+       */

+      GLboolean map_ib = ib->obj->Name && !ib->obj->Pointer;

+      void *ptr;

+

+      if (map_ib) 

+	 ctx->Driver.MapBuffer(ctx, 

+			       GL_ELEMENT_ARRAY_BUFFER,

+			       GL_READ_ONLY_ARB,

+			       ib->obj);

+

+

+      ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);

+

+      /* Some users might prefer it if we translated elements to

+       * GLuints here.  Others wouldn't...

+       */

+      switch (ib->type) {

+      case GL_UNSIGNED_INT: 

+	 tmp_indices = rebase_GLuint( ptr, ib->count, min_index );

+	 break;

+      case GL_UNSIGNED_SHORT: 

+	 tmp_indices = rebase_GLushort( ptr, ib->count, min_index );

+	 break;

+      case GL_UNSIGNED_BYTE: 

+	 tmp_indices = rebase_GLubyte( ptr, ib->count, min_index );

+	 break;

+      }      

+

+      if (map_ib) 

+	 ctx->Driver.UnmapBuffer(ctx, 

+				 GL_ELEMENT_ARRAY_BUFFER,

+				 ib->obj);

+

+      tmp_ib.obj = ctx->Shared->NullBufferObj;

+      tmp_ib.ptr = tmp_indices;

+      tmp_ib.count = ib->count;

+      tmp_ib.type = ib->type;

+

+      ib = &tmp_ib;

+   }

+   else {

+      /* Otherwise the primitives need adjustment.

+       */

+      tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims);

+

+      for (i = 0; i < nr_prims; i++) {

+	 /* If this fails, it could indicate an application error:

+	  */

+	 assert(prim[i].start >= min_index);

+

+	 tmp_prims[i] = prim[i];

+	 tmp_prims[i].start -= min_index;

+      }

+

+      prim = tmp_prims;

+   }

+

+   /* Just need to adjust the pointer values on each incoming array.

+    * This works for VBO and non-vbo rendering and shouldn't pesimize

+    * VBO-based upload schemes.  However this may still not be a fast

+    * path for hardware tnl for VBO based rendering as most machines

+    * will be happier if you just specify a starting vertex value in

+    * each primitive.

+    *

+    * For drivers with hardware tnl, you only want to do this if you

+    * are forced to, eg non-VBO indexed rendering with start != 0.

+    */

+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {

+      tmp_arrays[i] = *arrays[i];

+      tmp_arrays[i].Ptr += min_index * tmp_arrays[i].StrideB;

+      tmp_array_pointers[i] = &tmp_arrays[i];

+   }

+   

+   /* Re-issue the draw call.

+    */

+   draw( ctx, 

+	 tmp_array_pointers, 

+	 prim, 

+	 nr_prims, 

+	 ib, 

+	 GL_TRUE,

+	 0, 

+	 max_index - min_index );

+   

+   if (tmp_indices)

+      free(tmp_indices);

+   

+   if (tmp_prims)

+      free(tmp_prims);

+}

+

+

+

diff --git a/mesalib/src/mesa/vbo/vbo_save.c b/mesalib/src/mesa/vbo/vbo_save.c
index dd5570689..87ced410c 100644
--- a/mesalib/src/mesa/vbo/vbo_save.c
+++ b/mesalib/src/mesa/vbo/vbo_save.c
@@ -1,122 +1,122 @@
-/*
- * 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/mtypes.h"
-#include "main/bufferobj.h"
-#include "main/imports.h"
-
-#include "vbo_context.h"
-
-
-#if FEATURE_dlist
-
-
-static void vbo_save_callback_init( GLcontext *ctx )
-{
-   ctx->Driver.NewList = vbo_save_NewList;
-   ctx->Driver.EndList = vbo_save_EndList;
-   ctx->Driver.SaveFlushVertices = vbo_save_SaveFlushVertices;
-   ctx->Driver.BeginCallList = vbo_save_BeginCallList;
-   ctx->Driver.EndCallList = vbo_save_EndCallList;
-   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;
-}
-
-
-
-void vbo_save_init( GLcontext *ctx )
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_save_context *save = &vbo->save;
-
-   save->ctx = ctx;
-
-   vbo_save_api_init( save );
-   vbo_save_callback_init(ctx);
-
-   {
-      struct gl_client_array *arrays = save->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);
-      }
-   }
-
-   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
-}
-
-
-void vbo_save_destroy( GLcontext *ctx )
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_save_context *save = &vbo->save;
-   GLuint i;
-
-   if (save->prim_store) {
-      if ( --save->prim_store->refcount == 0 ) {
-         FREE( save->prim_store );
-         save->prim_store = NULL;
-      }
-      if ( --save->vertex_store->refcount == 0 ) {
-         _mesa_reference_buffer_object(ctx,
-                                       &save->vertex_store->bufferobj, NULL);
-         FREE( save->vertex_store );
-         save->vertex_store = NULL;
-      }
-   }
-
-   for (i = 0; i < VBO_ATTRIB_MAX; i++) {
-      _mesa_reference_buffer_object(ctx, &save->arrays[i].BufferObj, NULL);
-   }
-}
-
-
-
-
-/* Note that this can occur during the playback of a display list:
- */
-void vbo_save_fallback( GLcontext *ctx, GLboolean fallback )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   if (fallback)
-      save->replay_flags |= VBO_SAVE_FALLBACK;
-   else
-      save->replay_flags &= ~VBO_SAVE_FALLBACK;
-}
-
-
-#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.

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/mtypes.h"

+#include "main/bufferobj.h"

+#include "main/imports.h"

+

+#include "vbo_context.h"

+

+

+#if FEATURE_dlist

+

+

+static void vbo_save_callback_init( struct gl_context *ctx )

+{

+   ctx->Driver.NewList = vbo_save_NewList;

+   ctx->Driver.EndList = vbo_save_EndList;

+   ctx->Driver.SaveFlushVertices = vbo_save_SaveFlushVertices;

+   ctx->Driver.BeginCallList = vbo_save_BeginCallList;

+   ctx->Driver.EndCallList = vbo_save_EndCallList;

+   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;

+}

+

+

+

+void vbo_save_init( struct gl_context *ctx )

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_save_context *save = &vbo->save;

+

+   save->ctx = ctx;

+

+   vbo_save_api_init( save );

+   vbo_save_callback_init(ctx);

+

+   {

+      struct gl_client_array *arrays = save->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);

+      }

+   }

+

+   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;

+}

+

+

+void vbo_save_destroy( struct gl_context *ctx )

+{

+   struct vbo_context *vbo = vbo_context(ctx);

+   struct vbo_save_context *save = &vbo->save;

+   GLuint i;

+

+   if (save->prim_store) {

+      if ( --save->prim_store->refcount == 0 ) {

+         FREE( save->prim_store );

+         save->prim_store = NULL;

+      }

+      if ( --save->vertex_store->refcount == 0 ) {

+         _mesa_reference_buffer_object(ctx,

+                                       &save->vertex_store->bufferobj, NULL);

+         FREE( save->vertex_store );

+         save->vertex_store = NULL;

+      }

+   }

+

+   for (i = 0; i < VBO_ATTRIB_MAX; i++) {

+      _mesa_reference_buffer_object(ctx, &save->arrays[i].BufferObj, NULL);

+   }

+}

+

+

+

+

+/* Note that this can occur during the playback of a display list:

+ */

+void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback )

+{

+   struct vbo_save_context *save = &vbo_context(ctx)->save;

+

+   if (fallback)

+      save->replay_flags |= VBO_SAVE_FALLBACK;

+   else

+      save->replay_flags &= ~VBO_SAVE_FALLBACK;

+}

+

+

+#endif /* FEATURE_dlist */

diff --git a/mesalib/src/mesa/vbo/vbo_save.h b/mesalib/src/mesa/vbo/vbo_save.h
index 82ba6c8af..25704f827 100644
--- a/mesalib/src/mesa/vbo/vbo_save.h
+++ b/mesalib/src/mesa/vbo/vbo_save.h
@@ -1,199 +1,201 @@
-/**************************************************************************
-
-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_SAVE_H
-#define VBO_SAVE_H
-
-#include "main/mtypes.h"
-#include "vbo.h"
-#include "vbo_attrib.h"
-
-
-struct vbo_save_copied_vtx {
-   GLfloat buffer[VBO_ATTRIB_MAX * 4 * VBO_MAX_COPIED_VERTS];
-   GLuint nr;
-};
-
-
-/* For display lists, this structure holds a run of vertices of the
- * same format, and a strictly well-formed set of begin/end pairs,
- * starting on the first vertex and ending at the last.  Vertex
- * copying on buffer breaks is precomputed according to these
- * primitives, though there are situations where the copying will need
- * correction at execute-time, perhaps by replaying the list as
- * immediate mode commands.
- *
- * On executing this list, the 'current' values may be updated with
- * the values of the final vertex, and often no fixup of the start of
- * the vertex list is required.
- *
- * Eval and other commands that don't fit into these vertex lists are
- * compiled using the fallback opcode mechanism provided by dlist.c.
- */
-struct vbo_save_vertex_list {
-   GLubyte attrsz[VBO_ATTRIB_MAX];
-   GLuint vertex_size;
-
-   /* Copy of the final vertex from node->vertex_store->bufferobj.
-    * Keep this in regular (non-VBO) memory to avoid repeated
-    * map/unmap of the VBO when updating GL current data.
-    */
-   GLfloat *current_data;
-   GLuint current_size;
-
-   GLuint buffer_offset;
-   GLuint count;
-   GLuint wrap_count;		/* number of copied vertices at start */
-   GLboolean dangling_attr_ref;	/* current attr implicitly referenced 
-				   outside the list */
-
-   struct _mesa_prim *prim;
-   GLuint prim_count;
-
-   struct vbo_save_vertex_store *vertex_store;
-   struct vbo_save_primitive_store *prim_store;
-};
-
-/* These buffers should be a reasonable size to support upload to
- * hardware.  Current vbo implementation will re-upload on any
- * changes, so don't make too big or apps which dynamically create
- * dlists and use only a few times will suffer.
- *
- * Consider stategy of uploading regions from the VBO on demand in the
- * case of dynamic vbos.  Then make the dlist code signal that
- * likelyhood as it occurs.  No reason we couldn't change usage
- * internally even though this probably isn't allowed for client VBOs?
- */
-#define VBO_SAVE_BUFFER_SIZE (8*1024) /* dwords */
-#define VBO_SAVE_PRIM_SIZE   128
-#define VBO_SAVE_PRIM_WEAK 0x40
-
-#define VBO_SAVE_FALLBACK    0x10000000
-
-/* Storage to be shared among several vertex_lists.
- */
-struct vbo_save_vertex_store {
-   struct gl_buffer_object *bufferobj;
-   GLfloat *buffer;
-   GLuint used;
-   GLuint refcount;
-};
-
-struct vbo_save_primitive_store {
-   struct _mesa_prim buffer[VBO_SAVE_PRIM_SIZE];
-   GLuint used;
-   GLuint refcount;
-};
-
-
-struct vbo_save_context {
-   GLcontext *ctx;
-   GLvertexformat vtxfmt;
-   struct gl_client_array arrays[VBO_ATTRIB_MAX];
-   const struct gl_client_array *inputs[VBO_ATTRIB_MAX];
-
-   GLubyte attrsz[VBO_ATTRIB_MAX];
-   GLubyte active_sz[VBO_ATTRIB_MAX];
-   GLuint vertex_size;
-
-   GLfloat *buffer;
-   GLuint count;
-   GLuint wrap_count;
-   GLuint replay_flags;
-
-   struct _mesa_prim *prim;
-   GLuint prim_count, prim_max;
-
-   struct vbo_save_vertex_store *vertex_store;
-   struct vbo_save_primitive_store *prim_store;
-
-   GLfloat *buffer_ptr;		   /* cursor, points into buffer */
-   GLfloat vertex[VBO_ATTRIB_MAX*4];	   /* current values */
-   GLfloat *attrptr[VBO_ATTRIB_MAX];
-   GLuint vert_count;
-   GLuint max_vert;
-   GLboolean dangling_attr_ref;
-   GLboolean have_materials;
-
-   GLuint opcode_vertex_list;
-
-   struct vbo_save_copied_vtx copied;
-   
-   GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->ListState */
-   GLubyte *currentsz[VBO_ATTRIB_MAX];
-};
-
-#if FEATURE_dlist
-
-void vbo_save_init( GLcontext *ctx );
-void vbo_save_destroy( GLcontext *ctx );
-void vbo_save_fallback( GLcontext *ctx, GLboolean fallback );
-
-/* save_loopback.c:
- */
-void vbo_loopback_vertex_list( GLcontext *ctx,
-			       const GLfloat *buffer,
-			       const GLubyte *attrsz,
-			       const struct _mesa_prim *prim,
-			       GLuint prim_count,
-			       GLuint wrap_count,
-			       GLuint vertex_size);
-
-/* Callbacks:
- */
-void vbo_save_EndList( GLcontext *ctx );
-void vbo_save_NewList( GLcontext *ctx, GLuint list, GLenum mode );
-void vbo_save_EndCallList( GLcontext *ctx );
-void vbo_save_BeginCallList( GLcontext *ctx, struct gl_display_list *list );
-void vbo_save_SaveFlushVertices( GLcontext *ctx );
-GLboolean vbo_save_NotifyBegin( GLcontext *ctx, GLenum mode );
-
-void vbo_save_playback_vertex_list( GLcontext *ctx, void *data );
-
-void vbo_save_api_init( struct vbo_save_context *save );
-
-#else /* FEATURE_dlist */
-
-static INLINE void
-vbo_save_init( GLcontext *ctx )
-{
-}
-
-static INLINE void
-vbo_save_destroy( GLcontext *ctx )
-{
-}
-
-#endif /* FEATURE_dlist */
-
-#endif /* VBO_SAVE_H */
+/**************************************************************************

+

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

+#define VBO_SAVE_H

+

+#include "main/mtypes.h"

+#include "vbo.h"

+#include "vbo_attrib.h"

+

+

+struct vbo_save_copied_vtx {

+   GLfloat buffer[VBO_ATTRIB_MAX * 4 * VBO_MAX_COPIED_VERTS];

+   GLuint nr;

+};

+

+

+/* For display lists, this structure holds a run of vertices of the

+ * same format, and a strictly well-formed set of begin/end pairs,

+ * starting on the first vertex and ending at the last.  Vertex

+ * copying on buffer breaks is precomputed according to these

+ * primitives, though there are situations where the copying will need

+ * correction at execute-time, perhaps by replaying the list as

+ * immediate mode commands.

+ *

+ * On executing this list, the 'current' values may be updated with

+ * the values of the final vertex, and often no fixup of the start of

+ * the vertex list is required.

+ *

+ * Eval and other commands that don't fit into these vertex lists are

+ * compiled using the fallback opcode mechanism provided by dlist.c.

+ */

+struct vbo_save_vertex_list {

+   GLubyte attrsz[VBO_ATTRIB_MAX];

+   GLuint vertex_size;

+

+   /* Copy of the final vertex from node->vertex_store->bufferobj.

+    * Keep this in regular (non-VBO) memory to avoid repeated

+    * map/unmap of the VBO when updating GL current data.

+    */

+   GLfloat *current_data;

+   GLuint current_size;

+

+   GLuint buffer_offset;

+   GLuint count;

+   GLuint wrap_count;		/* number of copied vertices at start */

+   GLboolean dangling_attr_ref;	/* current attr implicitly referenced 

+				   outside the list */

+

+   struct _mesa_prim *prim;

+   GLuint prim_count;

+

+   struct vbo_save_vertex_store *vertex_store;

+   struct vbo_save_primitive_store *prim_store;

+};

+

+/* These buffers should be a reasonable size to support upload to

+ * hardware.  Current vbo implementation will re-upload on any

+ * changes, so don't make too big or apps which dynamically create

+ * dlists and use only a few times will suffer.

+ *

+ * Consider stategy of uploading regions from the VBO on demand in the

+ * case of dynamic vbos.  Then make the dlist code signal that

+ * likelyhood as it occurs.  No reason we couldn't change usage

+ * internally even though this probably isn't allowed for client VBOs?

+ */

+#define VBO_SAVE_BUFFER_SIZE (8*1024) /* dwords */

+#define VBO_SAVE_PRIM_SIZE   128

+#define VBO_SAVE_PRIM_MODE_MASK         0x3f

+#define VBO_SAVE_PRIM_WEAK              0x40

+#define VBO_SAVE_PRIM_NO_CURRENT_UPDATE 0x80

+

+#define VBO_SAVE_FALLBACK    0x10000000

+

+/* Storage to be shared among several vertex_lists.

+ */

+struct vbo_save_vertex_store {

+   struct gl_buffer_object *bufferobj;

+   GLfloat *buffer;

+   GLuint used;

+   GLuint refcount;

+};

+

+struct vbo_save_primitive_store {

+   struct _mesa_prim buffer[VBO_SAVE_PRIM_SIZE];

+   GLuint used;

+   GLuint refcount;

+};

+

+

+struct vbo_save_context {

+   struct gl_context *ctx;

+   GLvertexformat vtxfmt;

+   struct gl_client_array arrays[VBO_ATTRIB_MAX];

+   const struct gl_client_array *inputs[VBO_ATTRIB_MAX];

+

+   GLubyte attrsz[VBO_ATTRIB_MAX];

+   GLubyte active_sz[VBO_ATTRIB_MAX];

+   GLuint vertex_size;

+

+   GLfloat *buffer;

+   GLuint count;

+   GLuint wrap_count;

+   GLuint replay_flags;

+

+   struct _mesa_prim *prim;

+   GLuint prim_count, prim_max;

+

+   struct vbo_save_vertex_store *vertex_store;

+   struct vbo_save_primitive_store *prim_store;

+

+   GLfloat *buffer_ptr;		   /* cursor, points into buffer */

+   GLfloat vertex[VBO_ATTRIB_MAX*4];	   /* current values */

+   GLfloat *attrptr[VBO_ATTRIB_MAX];

+   GLuint vert_count;

+   GLuint max_vert;

+   GLboolean dangling_attr_ref;

+   GLboolean have_materials;

+

+   GLuint opcode_vertex_list;

+

+   struct vbo_save_copied_vtx copied;

+   

+   GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->ListState */

+   GLubyte *currentsz[VBO_ATTRIB_MAX];

+};

+

+#if FEATURE_dlist

+

+void vbo_save_init( struct gl_context *ctx );

+void vbo_save_destroy( struct gl_context *ctx );

+void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback );

+

+/* save_loopback.c:

+ */

+void vbo_loopback_vertex_list( struct gl_context *ctx,

+			       const GLfloat *buffer,

+			       const GLubyte *attrsz,

+			       const struct _mesa_prim *prim,

+			       GLuint prim_count,

+			       GLuint wrap_count,

+			       GLuint vertex_size);

+

+/* Callbacks:

+ */

+void vbo_save_EndList( struct gl_context *ctx );

+void vbo_save_NewList( struct gl_context *ctx, GLuint list, GLenum mode );

+void vbo_save_EndCallList( struct gl_context *ctx );

+void vbo_save_BeginCallList( struct gl_context *ctx, struct gl_display_list *list );

+void vbo_save_SaveFlushVertices( struct gl_context *ctx );

+GLboolean vbo_save_NotifyBegin( struct gl_context *ctx, GLenum mode );

+

+void vbo_save_playback_vertex_list( struct gl_context *ctx, void *data );

+

+void vbo_save_api_init( struct vbo_save_context *save );

+

+#else /* FEATURE_dlist */

+

+static INLINE void

+vbo_save_init( struct gl_context *ctx )

+{

+}

+

+static INLINE void

+vbo_save_destroy( struct gl_context *ctx )

+{

+}

+

+#endif /* FEATURE_dlist */

+

+#endif /* VBO_SAVE_H */

diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index c3727cb52..7c928820a 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -1,1270 +1,1309 @@
-/**************************************************************************
-
-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/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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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++;
-
-
-   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( GLcontext *ctx )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   GLint i = save->prim_count - 1;
-   GLenum mode;
-   GLboolean weak;
-
-   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;
-   
-   /* 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].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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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()   _mesa_compile_error( ctx, GL_INVALID_ENUM, __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( GLcontext *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);
-   ctx->Save->EvalCoord1f( u );
-}
-
-static void GLAPIENTRY _save_EvalCoord1fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->EvalCoord1fv( v );
-}
-
-static void GLAPIENTRY _save_EvalCoord2f( GLfloat u, GLfloat v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->EvalCoord2f( u, v );
-}
-
-static void GLAPIENTRY _save_EvalCoord2fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->EvalCoord2fv( v );
-}
-
-static void GLAPIENTRY _save_EvalPoint1( GLint i )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->EvalPoint1( i );
-}
-
-static void GLAPIENTRY _save_EvalPoint2( GLint i, GLint j )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->EvalPoint2( i, j );
-}
-
-static void GLAPIENTRY _save_CallList( GLuint l )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->CallList( l );
-}
-
-static void GLAPIENTRY _save_CallLists( GLsizei n, GLenum type, const GLvoid *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   DO_FALLBACK(ctx);
-   ctx->Save->CallLists( n, type, v );
-}
-
-
-
-
-/* This begin is hooked into ...  Updating of
- * ctx->Driver.CurrentSavePrimitive is already taken care of.
- */
-GLboolean vbo_save_NotifyBegin( GLcontext *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_WEAK;
-   save->prim[i].begin = 1;
-   save->prim[i].end = 0;
-   save->prim[i].weak = (mode & VBO_SAVE_PRIM_WEAK) ? 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" );
-}
-
-
-/* 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 );
-
-   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 );
-
-   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( GLcontext *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->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;
-   
-   /* 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( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *ctx, struct gl_display_list *dlist )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-   save->replay_flags |= dlist->Flags;
-}
-
-void vbo_save_EndCallList( GLcontext *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( GLcontext *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( GLcontext *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( GLcontext *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 )
-{
-   GLcontext *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/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()   _mesa_compile_error( ctx, GL_INVALID_ENUM, __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 297fd8705..5d189ba4d 100644
--- a/mesalib/src/mesa/vbo/vbo_save_draw.c
+++ b/mesalib/src/mesa/vbo/vbo_save_draw.c
@@ -1,303 +1,303 @@
-/*
- * 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/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(GLcontext *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(GLcontext *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;
-      }
-   }
-
-   _mesa_set_varying_vp_inputs( ctx, varying_inputs );
-}
-
-
-static void
-vbo_save_loopback_vertex_list(GLcontext *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(GLcontext *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/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;

+      }

+   }

+

+   _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/src/mesa/vbo/vbo_save_loopback.c b/mesalib/src/mesa/vbo/vbo_save_loopback.c
index 5d1c7e481..cc48e4a69 100644
--- a/mesalib/src/mesa/vbo/vbo_save_loopback.c
+++ b/mesalib/src/mesa/vbo/vbo_save_loopback.c
@@ -1,195 +1,195 @@
-/**************************************************************************
- * 
- * Copyright 2005 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/context.h"
-#include "main/glheader.h"
-#include "main/enums.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "main/dispatch.h"
-#include "glapi/glapi.h"
-
-#include "vbo_context.h"
-
-
-#if FEATURE_dlist
-
-
-typedef void (*attr_func)( GLcontext *ctx, GLint target, const GLfloat * );
-
-
-/* This file makes heavy use of the aliasing of NV vertex attributes
- * with the legacy attributes, and also with ARB and Material
- * attributes as currently implemented.
- */
-static void VertexAttrib1fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
-{
-   CALL_VertexAttrib1fvNV(ctx->Exec, (target, v));
-}
-
-static void VertexAttrib2fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
-{
-   CALL_VertexAttrib2fvNV(ctx->Exec, (target, v));
-}
-
-static void VertexAttrib3fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
-{
-   CALL_VertexAttrib3fvNV(ctx->Exec, (target, v));
-}
-
-static void VertexAttrib4fvNV(GLcontext *ctx, GLint target, const GLfloat *v)
-{
-   CALL_VertexAttrib4fvNV(ctx->Exec, (target, v));
-}
-
-static attr_func vert_attrfunc[4] = {
-   VertexAttrib1fvNV,
-   VertexAttrib2fvNV,
-   VertexAttrib3fvNV,
-   VertexAttrib4fvNV
-};
-
-struct loopback_attr {
-   GLint target;
-   GLint sz;
-   attr_func func;
-};
-
-/* Don't emit ends and begins on wrapped primitives.  Don't replay
- * wrapped vertices.  If we get here, it's probably because the
- * precalculated wrapping is wrong.
- */
-static void loopback_prim( GLcontext *ctx,
-			   const GLfloat *buffer,
-			   const struct _mesa_prim *prim,
-			   GLuint wrap_count,
-			   GLuint vertex_size,
-			   const struct loopback_attr *la, GLuint nr )
-{
-   GLint start = prim->start;
-   GLint end = start + prim->count;
-   const GLfloat *data;
-   GLint j;
-   GLuint k;
-
-   if (0)
-      printf("loopback prim %s(%s,%s) verts %d..%d\n",
-	     _mesa_lookup_prim_by_nr(prim->mode),
-	     prim->begin ? "begin" : "..",
-	     prim->end ? "end" : "..",
-	     start, 
-	     end);
-
-   if (prim->begin) {
-      CALL_Begin(GET_DISPATCH(), ( prim->mode ));
-   }
-   else {
-      assert(start == 0);
-      start += wrap_count;
-   }
-
-   data = buffer + start * vertex_size;
-
-   for (j = start ; j < end ; j++) {
-      const GLfloat *tmp = data + la[0].sz;
-
-      for (k = 1 ; k < nr ; k++) {
-	 la[k].func( ctx, la[k].target, tmp );
-	 tmp += la[k].sz;
-      }
-	 
-      /* Fire the vertex
-       */
-      la[0].func( ctx, VBO_ATTRIB_POS, data );
-      data = tmp;
-   }
-
-   if (prim->end) {
-      CALL_End(GET_DISPATCH(), ());
-   }
-}
-
-/* Primitives generated by DrawArrays/DrawElements/Rectf may be
- * caught here.  If there is no primitive in progress, execute them
- * normally, otherwise need to track and discard the generated
- * primitives.
- */
-static void loopback_weak_prim( GLcontext *ctx,
-				const struct _mesa_prim *prim )
-{
-   /* Use the prim_weak flag to ensure that if this primitive
-    * wraps, we don't mistake future vertex_lists for part of the
-    * surrounding primitive.
-    *
-    * While this flag is set, we are simply disposing of data
-    * generated by an operation now known to be a noop.
-    */
-   if (prim->begin)
-      ctx->Driver.CurrentExecPrimitive |= VBO_SAVE_PRIM_WEAK;
-   if (prim->end)
-      ctx->Driver.CurrentExecPrimitive &= ~VBO_SAVE_PRIM_WEAK;
-}
-
-
-void vbo_loopback_vertex_list( GLcontext *ctx,
-			       const GLfloat *buffer,
-			       const GLubyte *attrsz,
-			       const struct _mesa_prim *prim,
-			       GLuint prim_count,
-			       GLuint wrap_count,
-			       GLuint vertex_size)
-{
-   struct loopback_attr la[VBO_ATTRIB_MAX];
-   GLuint i, nr = 0;
-
-   /* All Legacy, NV, ARB and Material attributes are routed through
-    * the NV attributes entrypoints:
-    */
-   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
-      if (attrsz[i]) {
-	 la[nr].target = i;
-	 la[nr].sz = attrsz[i];
-	 la[nr].func = vert_attrfunc[attrsz[i]-1];
-	 nr++;
-      }
-   }
-
-   for (i = 0 ; i < prim_count ; i++) {
-      if ((prim[i].mode & VBO_SAVE_PRIM_WEAK) &&
-	  (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END))
-      {
-	 loopback_weak_prim( ctx, &prim[i] );
-      }
-      else
-      {
-	 loopback_prim( ctx, buffer, &prim[i], wrap_count, vertex_size, la, nr );
-      }
-   }
-}
-
-
-#endif /* FEATURE_dlist */
+/**************************************************************************

+ * 

+ * Copyright 2005 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/context.h"

+#include "main/glheader.h"

+#include "main/enums.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+#include "main/dispatch.h"

+#include "glapi/glapi.h"

+

+#include "vbo_context.h"

+

+

+#if FEATURE_dlist

+

+

+typedef void (*attr_func)( struct gl_context *ctx, GLint target, const GLfloat * );

+

+

+/* This file makes heavy use of the aliasing of NV vertex attributes

+ * with the legacy attributes, and also with ARB and Material

+ * attributes as currently implemented.

+ */

+static void VertexAttrib1fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

+{

+   CALL_VertexAttrib1fvNV(ctx->Exec, (target, v));

+}

+

+static void VertexAttrib2fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

+{

+   CALL_VertexAttrib2fvNV(ctx->Exec, (target, v));

+}

+

+static void VertexAttrib3fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

+{

+   CALL_VertexAttrib3fvNV(ctx->Exec, (target, v));

+}

+

+static void VertexAttrib4fvNV(struct gl_context *ctx, GLint target, const GLfloat *v)

+{

+   CALL_VertexAttrib4fvNV(ctx->Exec, (target, v));

+}

+

+static attr_func vert_attrfunc[4] = {

+   VertexAttrib1fvNV,

+   VertexAttrib2fvNV,

+   VertexAttrib3fvNV,

+   VertexAttrib4fvNV

+};

+

+struct loopback_attr {

+   GLint target;

+   GLint sz;

+   attr_func func;

+};

+

+/* Don't emit ends and begins on wrapped primitives.  Don't replay

+ * wrapped vertices.  If we get here, it's probably because the

+ * precalculated wrapping is wrong.

+ */

+static void loopback_prim( struct gl_context *ctx,

+			   const GLfloat *buffer,

+			   const struct _mesa_prim *prim,

+			   GLuint wrap_count,

+			   GLuint vertex_size,

+			   const struct loopback_attr *la, GLuint nr )

+{

+   GLint start = prim->start;

+   GLint end = start + prim->count;

+   const GLfloat *data;

+   GLint j;

+   GLuint k;

+

+   if (0)

+      printf("loopback prim %s(%s,%s) verts %d..%d\n",

+	     _mesa_lookup_prim_by_nr(prim->mode),

+	     prim->begin ? "begin" : "..",

+	     prim->end ? "end" : "..",

+	     start, 

+	     end);

+

+   if (prim->begin) {

+      CALL_Begin(GET_DISPATCH(), ( prim->mode ));

+   }

+   else {

+      assert(start == 0);

+      start += wrap_count;

+   }

+

+   data = buffer + start * vertex_size;

+

+   for (j = start ; j < end ; j++) {

+      const GLfloat *tmp = data + la[0].sz;

+

+      for (k = 1 ; k < nr ; k++) {

+	 la[k].func( ctx, la[k].target, tmp );

+	 tmp += la[k].sz;

+      }

+	 

+      /* Fire the vertex

+       */

+      la[0].func( ctx, VBO_ATTRIB_POS, data );

+      data = tmp;

+   }

+

+   if (prim->end) {

+      CALL_End(GET_DISPATCH(), ());

+   }

+}

+

+/* Primitives generated by DrawArrays/DrawElements/Rectf may be

+ * caught here.  If there is no primitive in progress, execute them

+ * normally, otherwise need to track and discard the generated

+ * primitives.

+ */

+static void loopback_weak_prim( struct gl_context *ctx,

+				const struct _mesa_prim *prim )

+{

+   /* Use the prim_weak flag to ensure that if this primitive

+    * wraps, we don't mistake future vertex_lists for part of the

+    * surrounding primitive.

+    *

+    * While this flag is set, we are simply disposing of data

+    * generated by an operation now known to be a noop.

+    */

+   if (prim->begin)

+      ctx->Driver.CurrentExecPrimitive |= VBO_SAVE_PRIM_WEAK;

+   if (prim->end)

+      ctx->Driver.CurrentExecPrimitive &= ~VBO_SAVE_PRIM_WEAK;

+}

+

+

+void vbo_loopback_vertex_list( struct gl_context *ctx,

+			       const GLfloat *buffer,

+			       const GLubyte *attrsz,

+			       const struct _mesa_prim *prim,

+			       GLuint prim_count,

+			       GLuint wrap_count,

+			       GLuint vertex_size)

+{

+   struct loopback_attr la[VBO_ATTRIB_MAX];

+   GLuint i, nr = 0;

+

+   /* All Legacy, NV, ARB and Material attributes are routed through

+    * the NV attributes entrypoints:

+    */

+   for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {

+      if (attrsz[i]) {

+	 la[nr].target = i;

+	 la[nr].sz = attrsz[i];

+	 la[nr].func = vert_attrfunc[attrsz[i]-1];

+	 nr++;

+      }

+   }

+

+   for (i = 0 ; i < prim_count ; i++) {

+      if ((prim[i].mode & VBO_SAVE_PRIM_WEAK) &&

+	  (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END))

+      {

+	 loopback_weak_prim( ctx, &prim[i] );

+      }

+      else

+      {

+	 loopback_prim( ctx, buffer, &prim[i], wrap_count, vertex_size, la, nr );

+      }

+   }

+}

+

+

+#endif /* FEATURE_dlist */

diff --git a/mesalib/src/mesa/vbo/vbo_split.c b/mesalib/src/mesa/vbo/vbo_split.c
index ce40cbbcc..e28f9afcf 100644
--- a/mesalib/src/mesa/vbo/vbo_split.c
+++ b/mesalib/src/mesa/vbo/vbo_split.c
@@ -1,169 +1,169 @@
-
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-/* Deal with hardware and/or swtnl maximums:
- * - maximum number of vertices in buffer
- * - maximum number of elements (maybe zero)
- *
- * The maximums may vary with opengl state (eg if a larger hardware
- * vertex is required in this state, the maximum number of vertices
- * may be smaller than in another state).
- *
- * We want buffer splitting to be a convenience function for the code
- * actually drawing the primitives rather than a system-wide maximum,
- * otherwise it is hard to avoid pessimism.  
- *
- * For instance, if a driver has no hardware limits on vertex buffer
- * dimensions, it would not ordinarily want to split vbos.  But if
- * there is an unexpected fallback, eg memory manager fails to upload
- * textures, it will want to pass the drawing commands onto swtnl,
- * which does have limitations.  A convenience function allows swtnl
- * to split the drawing and vbos internally without imposing its
- * limitations on drivers which want to use it as a fallback path.
- */
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "main/macros.h"
-
-#include "vbo_split.h"
-#include "vbo.h"
-
-/* True if a primitive can be split without copying of vertices, false
- * otherwise.
- */
-GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr)
-{
-   switch (mode) {
-   case GL_POINTS:
-      *first = 1;
-      *incr = 1;
-      return GL_TRUE;
-   case GL_LINES:
-      *first = 2;
-      *incr = 2;
-      return GL_TRUE;
-   case GL_LINE_STRIP:
-      *first = 2;
-      *incr = 1;
-      return GL_TRUE;
-   case GL_TRIANGLES:
-      *first = 3;
-      *incr = 3;
-      return GL_TRUE;
-   case GL_TRIANGLE_STRIP:
-      *first = 3;
-      *incr = 1;
-      return GL_TRUE;
-   case GL_QUADS:
-      *first = 4;
-      *incr = 4;
-      return GL_TRUE;
-   case GL_QUAD_STRIP:
-      *first = 4;
-      *incr = 2;
-      return GL_TRUE;
-   default:
-      *first = 0;
-      *incr = 1;		/* so that count % incr works */
-      return GL_FALSE;
-   }
-}
-
-
-
-void vbo_split_prims( GLcontext *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 )
-{
-   GLint max_basevertex = prim->basevertex;
-   GLuint i;
-
-   for (i = 1; i < nr_prims; i++)
-      max_basevertex = MAX2(max_basevertex, prim[i].basevertex);
-
-   /* XXX max_basevertex is computed but not used, why? */
-
-   if (ib) {
-      if (limits->max_indices == 0) {
-	 /* Could traverse the indices, re-emitting vertices in turn.
-	  * But it's hard to see why this case would be needed - for
-	  * software tnl, it is better to convert to non-indexed
-	  * rendering after transformation is complete, as is done in
-	  * the t_dd_rendertmp.h templates.  Are there any devices
-	  * with hardware tnl that cannot do indexed rendering?
-	  *
-	  * For now, this path is disabled.
-	  */
-	 assert(0);
-      }
-      else if (max_index - min_index >= limits->max_verts) {
-	 /* The vertex buffers are too large for hardware (or the
-	  * swtnl module).  Traverse the indices, re-emitting vertices
-	  * in turn.  Use a vertex cache to preserve some of the
-	  * sharing from the original index list.
-	  */
-	 vbo_split_copy(ctx, arrays, prim, nr_prims, ib,
-			draw, limits );
-      }
-      else if (ib->count > limits->max_indices) {
-	 /* The index buffer is too large for hardware.  Try to split
-	  * on whole-primitive boundaries, otherwise try to split the
-	  * individual primitives.
-	  */
-	 vbo_split_inplace(ctx, arrays, prim, nr_prims, ib,
-			   min_index, max_index, draw, limits );
-      }
-      else {
-	 /* Why were we called? */
-	 assert(0);
-      }
-   }
-   else {
-      if (max_index - min_index >= limits->max_verts) {
-	 /* The vertex buffer is too large for hardware (or the swtnl
-	  * module).  Try to split on whole-primitive boundaries,
-	  * otherwise try to split the individual primitives.
-	  */
-	 vbo_split_inplace(ctx, arrays, prim, nr_prims, ib,
-			   min_index, max_index, draw, limits );
-      }
-      else {
-	 /* Why were we called? */
-	 assert(0);
-      }
-   }
-}
-
+

+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+/* Deal with hardware and/or swtnl maximums:

+ * - maximum number of vertices in buffer

+ * - maximum number of elements (maybe zero)

+ *

+ * The maximums may vary with opengl state (eg if a larger hardware

+ * vertex is required in this state, the maximum number of vertices

+ * may be smaller than in another state).

+ *

+ * We want buffer splitting to be a convenience function for the code

+ * actually drawing the primitives rather than a system-wide maximum,

+ * otherwise it is hard to avoid pessimism.  

+ *

+ * For instance, if a driver has no hardware limits on vertex buffer

+ * dimensions, it would not ordinarily want to split vbos.  But if

+ * there is an unexpected fallback, eg memory manager fails to upload

+ * textures, it will want to pass the drawing commands onto swtnl,

+ * which does have limitations.  A convenience function allows swtnl

+ * to split the drawing and vbos internally without imposing its

+ * limitations on drivers which want to use it as a fallback path.

+ */

+

+#include "main/glheader.h"

+#include "main/imports.h"

+#include "main/mtypes.h"

+#include "main/macros.h"

+

+#include "vbo_split.h"

+#include "vbo.h"

+

+/* True if a primitive can be split without copying of vertices, false

+ * otherwise.

+ */

+GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr)

+{

+   switch (mode) {

+   case GL_POINTS:

+      *first = 1;

+      *incr = 1;

+      return GL_TRUE;

+   case GL_LINES:

+      *first = 2;

+      *incr = 2;

+      return GL_TRUE;

+   case GL_LINE_STRIP:

+      *first = 2;

+      *incr = 1;

+      return GL_TRUE;

+   case GL_TRIANGLES:

+      *first = 3;

+      *incr = 3;

+      return GL_TRUE;

+   case GL_TRIANGLE_STRIP:

+      *first = 3;

+      *incr = 1;

+      return GL_TRUE;

+   case GL_QUADS:

+      *first = 4;

+      *incr = 4;

+      return GL_TRUE;

+   case GL_QUAD_STRIP:

+      *first = 4;

+      *incr = 2;

+      return GL_TRUE;

+   default:

+      *first = 0;

+      *incr = 1;		/* so that count % incr works */

+      return GL_FALSE;

+   }

+}

+

+

+

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

+{

+   GLint max_basevertex = prim->basevertex;

+   GLuint i;

+

+   for (i = 1; i < nr_prims; i++)

+      max_basevertex = MAX2(max_basevertex, prim[i].basevertex);

+

+   /* XXX max_basevertex is computed but not used, why? */

+

+   if (ib) {

+      if (limits->max_indices == 0) {

+	 /* Could traverse the indices, re-emitting vertices in turn.

+	  * But it's hard to see why this case would be needed - for

+	  * software tnl, it is better to convert to non-indexed

+	  * rendering after transformation is complete, as is done in

+	  * the t_dd_rendertmp.h templates.  Are there any devices

+	  * with hardware tnl that cannot do indexed rendering?

+	  *

+	  * For now, this path is disabled.

+	  */

+	 assert(0);

+      }

+      else if (max_index - min_index >= limits->max_verts) {

+	 /* The vertex buffers are too large for hardware (or the

+	  * swtnl module).  Traverse the indices, re-emitting vertices

+	  * in turn.  Use a vertex cache to preserve some of the

+	  * sharing from the original index list.

+	  */

+	 vbo_split_copy(ctx, arrays, prim, nr_prims, ib,

+			draw, limits );

+      }

+      else if (ib->count > limits->max_indices) {

+	 /* The index buffer is too large for hardware.  Try to split

+	  * on whole-primitive boundaries, otherwise try to split the

+	  * individual primitives.

+	  */

+	 vbo_split_inplace(ctx, arrays, prim, nr_prims, ib,

+			   min_index, max_index, draw, limits );

+      }

+      else {

+	 /* Why were we called? */

+	 assert(0);

+      }

+   }

+   else {

+      if (max_index - min_index >= limits->max_verts) {

+	 /* The vertex buffer is too large for hardware (or the swtnl

+	  * module).  Try to split on whole-primitive boundaries,

+	  * otherwise try to split the individual primitives.

+	  */

+	 vbo_split_inplace(ctx, arrays, prim, nr_prims, ib,

+			   min_index, max_index, draw, limits );

+      }

+      else {

+	 /* Why were we called? */

+	 assert(0);

+      }

+   }

+}

+

diff --git a/mesalib/src/mesa/vbo/vbo_split.h b/mesalib/src/mesa/vbo/vbo_split.h
index 05888d048..14cf9e49c 100644
--- a/mesalib/src/mesa/vbo/vbo_split.h
+++ b/mesalib/src/mesa/vbo/vbo_split.h
@@ -1,72 +1,72 @@
-/*
- * 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
- */
-
-
-/**
- * \mainpage The VBO splitter
- *
- * This is the private data used internally to the vbo_split_prims()
- * helper function.  Nobody outside the vbo_split* files needs to
- * include or know about this structure.
- */
-
-
-#ifndef _VBO_SPLIT_H
-#define _VBO_SPLIT_H
-
-#include "vbo.h"
-
-
-/* True if a primitive can be split without copying of vertices, false
- * otherwise.
- */
-GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr);
-
-void vbo_split_inplace( GLcontext *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 );
-
-/* Requires ib != NULL:
- */
-void vbo_split_copy( GLcontext *ctx,
-		     const struct gl_client_array *arrays[],
-		     const struct _mesa_prim *prim,
-		     GLuint nr_prims,
-		     const struct _mesa_index_buffer *ib,
-		     vbo_draw_func draw,
-		     const struct split_limits *limits );
-
-#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

+ */

+

+

+/**

+ * \mainpage The VBO splitter

+ *

+ * This is the private data used internally to the vbo_split_prims()

+ * helper function.  Nobody outside the vbo_split* files needs to

+ * include or know about this structure.

+ */

+

+

+#ifndef _VBO_SPLIT_H

+#define _VBO_SPLIT_H

+

+#include "vbo.h"

+

+

+/* True if a primitive can be split without copying of vertices, false

+ * otherwise.

+ */

+GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr);

+

+void vbo_split_inplace( 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 );

+

+/* Requires ib != NULL:

+ */

+void vbo_split_copy( struct gl_context *ctx,

+		     const struct gl_client_array *arrays[],

+		     const struct _mesa_prim *prim,

+		     GLuint nr_prims,

+		     const struct _mesa_index_buffer *ib,

+		     vbo_draw_func draw,

+		     const struct split_limits *limits );

+

+#endif

diff --git a/mesalib/src/mesa/vbo/vbo_split_copy.c b/mesalib/src/mesa/vbo/vbo_split_copy.c
index 2ec7d9b0f..e172da08b 100644
--- a/mesalib/src/mesa/vbo/vbo_split_copy.c
+++ b/mesalib/src/mesa/vbo/vbo_split_copy.c
@@ -1,625 +1,625 @@
-
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-/* Split indexed primitives with per-vertex copying.
- */
-
-#include "main/glheader.h"
-#include "main/bufferobj.h"
-#include "main/imports.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-
-#include "vbo_split.h"
-#include "vbo.h"
-
-
-#define ELT_TABLE_SIZE 16
-
-/**
- * Used for vertex-level splitting of indexed buffers.  Note that
- * non-indexed primitives may be converted to indexed in some cases
- * (eg loops, fans) in order to use this splitting path.
- */
-struct copy_context {
-
-   GLcontext *ctx;
-   const struct gl_client_array **array;
-   const struct _mesa_prim *prim;
-   GLuint nr_prims;
-   const struct _mesa_index_buffer *ib;
-   vbo_draw_func draw;
-
-   const struct split_limits *limits;
-
-   struct {
-      GLuint attr;
-      GLuint size;
-      const struct gl_client_array *array;
-      const GLubyte *src_ptr;
-
-      struct gl_client_array dstarray;
-
-   } varying[VERT_ATTRIB_MAX];
-   GLuint nr_varying;
-
-   const struct gl_client_array *dstarray_ptr[VERT_ATTRIB_MAX];
-   struct _mesa_index_buffer dstib;
-
-   GLuint *translated_elt_buf;
-   const GLuint *srcelt;
-
-   /** A baby hash table to avoid re-emitting (some) duplicate
-    * vertices when splitting indexed primitives.
-    */
-   struct { 
-      GLuint in;
-      GLuint out;
-   } vert_cache[ELT_TABLE_SIZE];
-
-   GLuint vertex_size;
-   GLubyte *dstbuf;
-   GLubyte *dstptr;     /**< dstptr == dstbuf + dstelt_max * vertsize */
-   GLuint dstbuf_size;  /**< in vertices */
-   GLuint dstbuf_nr;    /**< count of emitted vertices, also the largest value
-                         * in dstelt.  Our MaxIndex.
-                         */
-
-   GLuint *dstelt;
-   GLuint dstelt_nr;
-   GLuint dstelt_size;
-
-#define MAX_PRIM 32
-   struct _mesa_prim dstprim[MAX_PRIM];
-   GLuint dstprim_nr;
-
-};
-
-
-static GLuint attr_size( const struct gl_client_array *array )
-{
-   return array->Size * _mesa_sizeof_type(array->Type);
-}
-
-
-/**
- * Starts returning true slightly before the buffer fills, to ensure
- * that there is sufficient room for any remaining vertices to finish
- * off the prim:
- */
-static GLboolean
-check_flush( struct copy_context *copy )
-{
-   GLenum mode = copy->dstprim[copy->dstprim_nr].mode; 
-
-   if (GL_TRIANGLE_STRIP == mode &&
-       copy->dstelt_nr & 1) { /* see bug9962 */
-       return GL_FALSE;
-   }
-
-   if (copy->dstbuf_nr + 4 > copy->dstbuf_size)
-      return GL_TRUE;
-
-   if (copy->dstelt_nr + 4 > copy->dstelt_size)
-      return GL_TRUE;
-
-   return GL_FALSE;
-}
-
-
-/**
- * Dump the parameters/info for a vbo->draw() call.
- */
-static void
-dump_draw_info(GLcontext *ctx,
-               const struct gl_client_array **arrays,
-               const struct _mesa_prim *prims,
-               GLuint nr_prims,
-               const struct _mesa_index_buffer *ib,
-               GLuint min_index,
-               GLuint max_index)
-{
-   GLuint i, j;
-
-   printf("VBO Draw:\n");
-   for (i = 0; i < nr_prims; i++) {
-      printf("Prim %u of %u\n", i, nr_prims);
-      printf("  Prim mode 0x%x\n", prims[i].mode);
-      printf("  IB: %p\n", (void*) ib);
-      for (j = 0; j < VERT_ATTRIB_MAX; j++) {
-         printf("    array %d at %p:\n", j, (void*) arrays[j]);
-         printf("      enabled %d, ptr %p, size %d, type 0x%x, stride %d\n",
-		arrays[j]->Enabled, arrays[j]->Ptr,
-		arrays[j]->Size, arrays[j]->Type, arrays[j]->StrideB);
-         if (0) {
-            GLint k = prims[i].start + prims[i].count - 1;
-            GLfloat *last = (GLfloat *) (arrays[j]->Ptr + arrays[j]->Stride * k);
-            printf("        last: %f %f %f\n",
-		   last[0], last[1], last[2]);
-         }
-      }
-   }
-}
-
-
-static void
-flush( struct copy_context *copy )
-{
-   GLuint i;
-
-   /* Set some counters: 
-    */
-   copy->dstib.count = copy->dstelt_nr;
-
-#if 0
-   dump_draw_info(copy->ctx,
-                  copy->dstarray_ptr,
-                  copy->dstprim,
-                  copy->dstprim_nr,
-                  &copy->dstib,
-                  0,
-                  copy->dstbuf_nr);
-#else
-   (void) dump_draw_info;
-#endif
-
-   copy->draw( copy->ctx,
-	       copy->dstarray_ptr,
-	       copy->dstprim,
-	       copy->dstprim_nr,
-	       &copy->dstib,
-	       GL_TRUE,
-	       0,
-	       copy->dstbuf_nr - 1 );
-
-   /* Reset all pointers: 
-    */
-   copy->dstprim_nr = 0;
-   copy->dstelt_nr = 0;
-   copy->dstbuf_nr = 0;
-   copy->dstptr = copy->dstbuf;
-
-   /* Clear the vertex cache:
-    */
-   for (i = 0; i < ELT_TABLE_SIZE; i++)
-      copy->vert_cache[i].in = ~0;
-}
-
-
-/**
- * Called at begin of each primitive during replay.
- */
-static void
-begin( struct copy_context *copy, GLenum mode, GLboolean begin_flag )
-{
-   struct _mesa_prim *prim = &copy->dstprim[copy->dstprim_nr];
-
-   prim->mode = mode;
-   prim->begin = begin_flag;
-}
-
-
-/**
- * Use a hashtable to attempt to identify recently-emitted vertices
- * and avoid re-emitting them.
- */
-static GLuint
-elt(struct copy_context *copy, GLuint elt_idx)
-{
-   GLuint elt = copy->srcelt[elt_idx];
-   GLuint slot = elt & (ELT_TABLE_SIZE-1);
-
-/*    printf("elt %d\n", elt); */
-
-   /* Look up the incoming element in the vertex cache.  Re-emit if
-    * necessary.   
-    */
-   if (copy->vert_cache[slot].in != elt) {
-      GLubyte *csr = copy->dstptr;
-      GLuint i;
-
-/*       printf("  --> emit to dstelt %d\n", copy->dstbuf_nr); */
-
-      for (i = 0; i < copy->nr_varying; i++) {
-	 const struct gl_client_array *srcarray = copy->varying[i].array;
-	 const GLubyte *srcptr = copy->varying[i].src_ptr + elt * srcarray->StrideB;
-
-	 memcpy(csr, srcptr, copy->varying[i].size);
-	 csr += copy->varying[i].size;
-
-#ifdef NAN_CHECK
-         if (srcarray->Type == GL_FLOAT) {
-            GLuint k;
-            GLfloat *f = (GLfloat *) srcptr;
-            for (k = 0; k < srcarray->Size; k++) {
-               assert(!IS_INF_OR_NAN(f[k]));
-               assert(f[k] <= 1.0e20 && f[k] >= -1.0e20);
-            }
-         }
-#endif
-
-	 if (0) 
-	 {
-	    const GLuint *f = (const GLuint *)srcptr;
-	    GLuint j;
-	    printf("  varying %d: ", i);
-	    for(j = 0; j < copy->varying[i].size / 4; j++)
-	       printf("%x ", f[j]);
-	    printf("\n");
-	 }
-      }
-
-      copy->vert_cache[slot].in = elt;
-      copy->vert_cache[slot].out = copy->dstbuf_nr++;
-      copy->dstptr += copy->vertex_size;
-
-      assert(csr == copy->dstptr);
-      assert(copy->dstptr == (copy->dstbuf +
-                              copy->dstbuf_nr * copy->vertex_size));
-   }
-/*    else */
-/*       printf("  --> reuse vertex\n"); */
-   
-/*    printf("  --> emit %d\n", copy->vert_cache[slot].out); */
-   copy->dstelt[copy->dstelt_nr++] = copy->vert_cache[slot].out;
-   return check_flush(copy);
-}
-
-
-/**
- * Called at end of each primitive during replay.
- */
-static void
-end( struct copy_context *copy, GLboolean end_flag )
-{
-   struct _mesa_prim *prim = &copy->dstprim[copy->dstprim_nr];
-
-/*    printf("end (%d)\n", end_flag); */
-
-   prim->end = end_flag;
-   prim->count = copy->dstelt_nr - prim->start;
-
-   if (++copy->dstprim_nr == MAX_PRIM ||
-       check_flush(copy)) 
-      flush(copy);
-}
-
-
-static void
-replay_elts( struct copy_context *copy )
-{
-   GLuint i, j, k;
-   GLboolean split;
-
-   for (i = 0; i < copy->nr_prims; i++) {
-      const struct _mesa_prim *prim = &copy->prim[i];
-      const GLuint start = prim->start;
-      GLuint first, incr;
-
-      switch (prim->mode) {
-	 
-      case GL_LINE_LOOP:
-	 /* Convert to linestrip and emit the final vertex explicitly,
-	  * but only in the resultant strip that requires it.
-	  */
-	 j = 0;
-	 while (j != prim->count) {
-	    begin(copy, GL_LINE_STRIP, prim->begin && j == 0);
-
-	    for (split = GL_FALSE; j != prim->count && !split; j++)
-	       split = elt(copy, start + j);
-
-	    if (j == prim->count) {
-	       /* Done, emit final line.  Split doesn't matter as
-		* it is always raised a bit early so we can emit
-		* the last verts if necessary!
-		*/
-	       if (prim->end) 
-		  (void)elt(copy, start + 0);
-
-	       end(copy, prim->end);
-	    }
-	    else {
-	       /* Wrap
-		*/
-	       assert(split);
-	       end(copy, 0);
-	       j--;
-	    }
-	 }
-	 break;
-
-      case GL_TRIANGLE_FAN:
-      case GL_POLYGON:
-	 j = 2;
-	 while (j != prim->count) {
-	    begin(copy, prim->mode, prim->begin && j == 0);
-
-	    split = elt(copy, start+0); 
-	    assert(!split);
-
-	    split = elt(copy, start+j-1); 
-	    assert(!split);
-
-	    for (; j != prim->count && !split; j++)
-	       split = elt(copy, start+j);
-
-	    end(copy, prim->end && j == prim->count);
-
-	    if (j != prim->count) {
-	       /* Wrapped the primitive, need to repeat some vertices:
-		*/
-	       j -= 1;
-	    }
-	 }
-	 break;
-
-      default:
-	 (void)split_prim_inplace(prim->mode, &first, &incr);
-	 
-	 j = 0;
-	 while (j != prim->count) {
-
-	    begin(copy, prim->mode, prim->begin && j == 0);
-
-	    split = 0;
-	    for (k = 0; k < first; k++, j++)
-	       split |= elt(copy, start+j);
-
-	    assert(!split);
-
-	    for (; j != prim->count && !split; )
-	       for (k = 0; k < incr; k++, j++)
-		  split |= elt(copy, start+j);
-
-	    end(copy, prim->end && j == prim->count);
-
-	    if (j != prim->count) {
-	       /* Wrapped the primitive, need to repeat some vertices:
-		*/
-	       assert(j > first - incr);
-	       j -= (first - incr);
-	    }
-	 }
-	 break;
-      }
-   }
-
-   if (copy->dstprim_nr)
-      flush(copy);
-}
-
-
-static void
-replay_init( struct copy_context *copy )
-{
-   GLcontext *ctx = copy->ctx;
-   GLuint i;
-   GLuint offset;
-   const GLvoid *srcptr;
-
-   /* Make a list of varying attributes and their vbo's.  Also
-    * calculate vertex size.
-    */
-   copy->vertex_size = 0;
-   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
-      struct gl_buffer_object *vbo = copy->array[i]->BufferObj;
-
-      if (copy->array[i]->StrideB == 0) {
-	 copy->dstarray_ptr[i] = copy->array[i];
-      }
-      else {
-	 GLuint j = copy->nr_varying++;
-	 
-	 copy->varying[j].attr = i;
-	 copy->varying[j].array = copy->array[i];
-	 copy->varying[j].size = attr_size(copy->array[i]);
-	 copy->vertex_size += attr_size(copy->array[i]);
-      
-	 if (_mesa_is_bufferobj(vbo) && !_mesa_bufferobj_mapped(vbo)) 
-	    ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER, GL_READ_ONLY, vbo);
-
-	 copy->varying[j].src_ptr = ADD_POINTERS(vbo->Pointer,
-						 copy->array[i]->Ptr);
-
-	 copy->dstarray_ptr[i] = &copy->varying[j].dstarray;
-      }
-   }
-
-   /* There must always be an index buffer.  Currently require the
-    * caller convert non-indexed prims to indexed.  Could alternately
-    * do it internally.
-    */
-   if (_mesa_is_bufferobj(copy->ib->obj) &&
-       !_mesa_bufferobj_mapped(copy->ib->obj)) 
-      ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER, GL_READ_ONLY,
-			    copy->ib->obj);
-
-   srcptr = (const GLubyte *) ADD_POINTERS(copy->ib->obj->Pointer,
-                                           copy->ib->ptr);
-
-   switch (copy->ib->type) {
-   case GL_UNSIGNED_BYTE:
-      copy->translated_elt_buf = malloc(sizeof(GLuint) * copy->ib->count);
-      copy->srcelt = copy->translated_elt_buf;
-
-      for (i = 0; i < copy->ib->count; i++)
-	 copy->translated_elt_buf[i] = ((const GLubyte *)srcptr)[i];
-      break;
-
-   case GL_UNSIGNED_SHORT:
-      copy->translated_elt_buf = malloc(sizeof(GLuint) * copy->ib->count);
-      copy->srcelt = copy->translated_elt_buf;
-
-      for (i = 0; i < copy->ib->count; i++)
-	 copy->translated_elt_buf[i] = ((const GLushort *)srcptr)[i];
-      break;
-
-   case GL_UNSIGNED_INT:
-      copy->translated_elt_buf = NULL;
-      copy->srcelt = (const GLuint *)srcptr;
-      break;
-   }
-
-   /* Figure out the maximum allowed vertex buffer size:
-    */
-   if (copy->vertex_size * copy->limits->max_verts <= copy->limits->max_vb_size) {
-      copy->dstbuf_size = copy->limits->max_verts;
-   }
-   else {
-      copy->dstbuf_size = copy->limits->max_vb_size / copy->vertex_size;
-   }
-
-   /* Allocate an output vertex buffer:
-    *
-    * XXX:  This should be a VBO!
-    */
-   copy->dstbuf = malloc(copy->dstbuf_size * copy->vertex_size);   
-   copy->dstptr = copy->dstbuf;
-
-   /* Setup new vertex arrays to point into the output buffer: 
-    */
-   for (offset = 0, i = 0; i < copy->nr_varying; i++) {
-      const struct gl_client_array *src = copy->varying[i].array;
-      struct gl_client_array *dst = &copy->varying[i].dstarray;
-
-      dst->Size = src->Size;
-      dst->Type = src->Type;
-      dst->Format = GL_RGBA;
-      dst->Stride = copy->vertex_size;
-      dst->StrideB = copy->vertex_size;
-      dst->Ptr = copy->dstbuf + offset;
-      dst->Enabled = GL_TRUE;
-      dst->Normalized = src->Normalized; 
-      dst->BufferObj = ctx->Shared->NullBufferObj;
-      dst->_MaxElement = copy->dstbuf_size; /* may be less! */
-
-      offset += copy->varying[i].size;
-   }
-
-   /* Allocate an output element list:
-    */
-   copy->dstelt_size = MIN2(65536,
-			    copy->ib->count * 2 + 3);
-   copy->dstelt_size = MIN2(copy->dstelt_size,
-			    copy->limits->max_indices);
-   copy->dstelt = malloc(sizeof(GLuint) * copy->dstelt_size);
-   copy->dstelt_nr = 0;
-
-   /* Setup the new index buffer to point to the allocated element
-    * list:
-    */
-   copy->dstib.count = 0;	/* duplicates dstelt_nr */
-   copy->dstib.type = GL_UNSIGNED_INT;
-   copy->dstib.obj = ctx->Shared->NullBufferObj;
-   copy->dstib.ptr = copy->dstelt;
-}
-
-
-/**
- * Free up everything allocated during split/replay.
- */
-static void
-replay_finish( struct copy_context *copy )
-{
-   GLcontext *ctx = copy->ctx;
-   GLuint i;
-
-   /* Free our vertex and index buffers: 
-    */
-   free(copy->translated_elt_buf);
-   free(copy->dstbuf);
-   free(copy->dstelt);
-
-   /* Unmap VBO's 
-    */
-   for (i = 0; i < copy->nr_varying; i++) {
-      struct gl_buffer_object *vbo = copy->varying[i].array->BufferObj;
-      if (_mesa_is_bufferobj(vbo) && _mesa_bufferobj_mapped(vbo)) 
-	 ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER, vbo);
-   }
-
-   /* Unmap index buffer:
-    */
-   if (_mesa_is_bufferobj(copy->ib->obj) &&
-       _mesa_bufferobj_mapped(copy->ib->obj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER, copy->ib->obj);
-   }
-}
-
-
-/**
- * Split VBO into smaller pieces, draw the pieces.
- */
-void vbo_split_copy( GLcontext *ctx,
-		     const struct gl_client_array *arrays[],
-		     const struct _mesa_prim *prim,
-		     GLuint nr_prims,
-		     const struct _mesa_index_buffer *ib,
-		     vbo_draw_func draw,
-		     const struct split_limits *limits )
-{
-   struct copy_context copy;
-   GLuint i, this_nr_prims;
-
-   for (i = 0; i < 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;
-      }
-
-      memset(&copy, 0, sizeof(copy));
-
-      /* Require indexed primitives:
-       */
-      assert(ib);
-
-      copy.ctx = ctx;
-      copy.array = arrays;
-      copy.prim = &prim[i];
-      copy.nr_prims = this_nr_prims;
-      copy.ib = ib;
-      copy.draw = draw;
-      copy.limits = limits;
-
-      /* Clear the vertex cache:
-       */
-      for (i = 0; i < ELT_TABLE_SIZE; i++)
-	 copy.vert_cache[i].in = ~0;
-
-      replay_init(&copy);
-      replay_elts(&copy);
-      replay_finish(&copy);
-   }
-}
+

+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+/* Split indexed primitives with per-vertex copying.

+ */

+

+#include "main/glheader.h"

+#include "main/bufferobj.h"

+#include "main/imports.h"

+#include "main/image.h"

+#include "main/macros.h"

+#include "main/mtypes.h"

+

+#include "vbo_split.h"

+#include "vbo.h"

+

+

+#define ELT_TABLE_SIZE 16

+

+/**

+ * Used for vertex-level splitting of indexed buffers.  Note that

+ * non-indexed primitives may be converted to indexed in some cases

+ * (eg loops, fans) in order to use this splitting path.

+ */

+struct copy_context {

+

+   struct gl_context *ctx;

+   const struct gl_client_array **array;

+   const struct _mesa_prim *prim;

+   GLuint nr_prims;

+   const struct _mesa_index_buffer *ib;

+   vbo_draw_func draw;

+

+   const struct split_limits *limits;

+

+   struct {

+      GLuint attr;

+      GLuint size;

+      const struct gl_client_array *array;

+      const GLubyte *src_ptr;

+

+      struct gl_client_array dstarray;

+

+   } varying[VERT_ATTRIB_MAX];

+   GLuint nr_varying;

+

+   const struct gl_client_array *dstarray_ptr[VERT_ATTRIB_MAX];

+   struct _mesa_index_buffer dstib;

+

+   GLuint *translated_elt_buf;

+   const GLuint *srcelt;

+

+   /** A baby hash table to avoid re-emitting (some) duplicate

+    * vertices when splitting indexed primitives.

+    */

+   struct { 

+      GLuint in;

+      GLuint out;

+   } vert_cache[ELT_TABLE_SIZE];

+

+   GLuint vertex_size;

+   GLubyte *dstbuf;

+   GLubyte *dstptr;     /**< dstptr == dstbuf + dstelt_max * vertsize */

+   GLuint dstbuf_size;  /**< in vertices */

+   GLuint dstbuf_nr;    /**< count of emitted vertices, also the largest value

+                         * in dstelt.  Our MaxIndex.

+                         */

+

+   GLuint *dstelt;

+   GLuint dstelt_nr;

+   GLuint dstelt_size;

+

+#define MAX_PRIM 32

+   struct _mesa_prim dstprim[MAX_PRIM];

+   GLuint dstprim_nr;

+

+};

+

+

+static GLuint attr_size( const struct gl_client_array *array )

+{

+   return array->Size * _mesa_sizeof_type(array->Type);

+}

+

+

+/**

+ * Starts returning true slightly before the buffer fills, to ensure

+ * that there is sufficient room for any remaining vertices to finish

+ * off the prim:

+ */

+static GLboolean

+check_flush( struct copy_context *copy )

+{

+   GLenum mode = copy->dstprim[copy->dstprim_nr].mode; 

+

+   if (GL_TRIANGLE_STRIP == mode &&

+       copy->dstelt_nr & 1) { /* see bug9962 */

+       return GL_FALSE;

+   }

+

+   if (copy->dstbuf_nr + 4 > copy->dstbuf_size)

+      return GL_TRUE;

+

+   if (copy->dstelt_nr + 4 > copy->dstelt_size)

+      return GL_TRUE;

+

+   return GL_FALSE;

+}

+

+

+/**

+ * Dump the parameters/info for a vbo->draw() call.

+ */

+static void

+dump_draw_info(struct gl_context *ctx,

+               const struct gl_client_array **arrays,

+               const struct _mesa_prim *prims,

+               GLuint nr_prims,

+               const struct _mesa_index_buffer *ib,

+               GLuint min_index,

+               GLuint max_index)

+{

+   GLuint i, j;

+

+   printf("VBO Draw:\n");

+   for (i = 0; i < nr_prims; i++) {

+      printf("Prim %u of %u\n", i, nr_prims);

+      printf("  Prim mode 0x%x\n", prims[i].mode);

+      printf("  IB: %p\n", (void*) ib);

+      for (j = 0; j < VERT_ATTRIB_MAX; j++) {

+         printf("    array %d at %p:\n", j, (void*) arrays[j]);

+         printf("      enabled %d, ptr %p, size %d, type 0x%x, stride %d\n",

+		arrays[j]->Enabled, arrays[j]->Ptr,

+		arrays[j]->Size, arrays[j]->Type, arrays[j]->StrideB);

+         if (0) {

+            GLint k = prims[i].start + prims[i].count - 1;

+            GLfloat *last = (GLfloat *) (arrays[j]->Ptr + arrays[j]->Stride * k);

+            printf("        last: %f %f %f\n",

+		   last[0], last[1], last[2]);

+         }

+      }

+   }

+}

+

+

+static void

+flush( struct copy_context *copy )

+{

+   GLuint i;

+

+   /* Set some counters: 

+    */

+   copy->dstib.count = copy->dstelt_nr;

+

+#if 0

+   dump_draw_info(copy->ctx,

+                  copy->dstarray_ptr,

+                  copy->dstprim,

+                  copy->dstprim_nr,

+                  &copy->dstib,

+                  0,

+                  copy->dstbuf_nr);

+#else

+   (void) dump_draw_info;

+#endif

+

+   copy->draw( copy->ctx,

+	       copy->dstarray_ptr,

+	       copy->dstprim,

+	       copy->dstprim_nr,

+	       &copy->dstib,

+	       GL_TRUE,

+	       0,

+	       copy->dstbuf_nr - 1 );

+

+   /* Reset all pointers: 

+    */

+   copy->dstprim_nr = 0;

+   copy->dstelt_nr = 0;

+   copy->dstbuf_nr = 0;

+   copy->dstptr = copy->dstbuf;

+

+   /* Clear the vertex cache:

+    */

+   for (i = 0; i < ELT_TABLE_SIZE; i++)

+      copy->vert_cache[i].in = ~0;

+}

+

+

+/**

+ * Called at begin of each primitive during replay.

+ */

+static void

+begin( struct copy_context *copy, GLenum mode, GLboolean begin_flag )

+{

+   struct _mesa_prim *prim = &copy->dstprim[copy->dstprim_nr];

+

+   prim->mode = mode;

+   prim->begin = begin_flag;

+}

+

+

+/**

+ * Use a hashtable to attempt to identify recently-emitted vertices

+ * and avoid re-emitting them.

+ */

+static GLuint

+elt(struct copy_context *copy, GLuint elt_idx)

+{

+   GLuint elt = copy->srcelt[elt_idx];

+   GLuint slot = elt & (ELT_TABLE_SIZE-1);

+

+/*    printf("elt %d\n", elt); */

+

+   /* Look up the incoming element in the vertex cache.  Re-emit if

+    * necessary.   

+    */

+   if (copy->vert_cache[slot].in != elt) {

+      GLubyte *csr = copy->dstptr;

+      GLuint i;

+

+/*       printf("  --> emit to dstelt %d\n", copy->dstbuf_nr); */

+

+      for (i = 0; i < copy->nr_varying; i++) {

+	 const struct gl_client_array *srcarray = copy->varying[i].array;

+	 const GLubyte *srcptr = copy->varying[i].src_ptr + elt * srcarray->StrideB;

+

+	 memcpy(csr, srcptr, copy->varying[i].size);

+	 csr += copy->varying[i].size;

+

+#ifdef NAN_CHECK

+         if (srcarray->Type == GL_FLOAT) {

+            GLuint k;

+            GLfloat *f = (GLfloat *) srcptr;

+            for (k = 0; k < srcarray->Size; k++) {

+               assert(!IS_INF_OR_NAN(f[k]));

+               assert(f[k] <= 1.0e20 && f[k] >= -1.0e20);

+            }

+         }

+#endif

+

+	 if (0) 

+	 {

+	    const GLuint *f = (const GLuint *)srcptr;

+	    GLuint j;

+	    printf("  varying %d: ", i);

+	    for(j = 0; j < copy->varying[i].size / 4; j++)

+	       printf("%x ", f[j]);

+	    printf("\n");

+	 }

+      }

+

+      copy->vert_cache[slot].in = elt;

+      copy->vert_cache[slot].out = copy->dstbuf_nr++;

+      copy->dstptr += copy->vertex_size;

+

+      assert(csr == copy->dstptr);

+      assert(copy->dstptr == (copy->dstbuf +

+                              copy->dstbuf_nr * copy->vertex_size));

+   }

+/*    else */

+/*       printf("  --> reuse vertex\n"); */

+   

+/*    printf("  --> emit %d\n", copy->vert_cache[slot].out); */

+   copy->dstelt[copy->dstelt_nr++] = copy->vert_cache[slot].out;

+   return check_flush(copy);

+}

+

+

+/**

+ * Called at end of each primitive during replay.

+ */

+static void

+end( struct copy_context *copy, GLboolean end_flag )

+{

+   struct _mesa_prim *prim = &copy->dstprim[copy->dstprim_nr];

+

+/*    printf("end (%d)\n", end_flag); */

+

+   prim->end = end_flag;

+   prim->count = copy->dstelt_nr - prim->start;

+

+   if (++copy->dstprim_nr == MAX_PRIM ||

+       check_flush(copy)) 

+      flush(copy);

+}

+

+

+static void

+replay_elts( struct copy_context *copy )

+{

+   GLuint i, j, k;

+   GLboolean split;

+

+   for (i = 0; i < copy->nr_prims; i++) {

+      const struct _mesa_prim *prim = &copy->prim[i];

+      const GLuint start = prim->start;

+      GLuint first, incr;

+

+      switch (prim->mode) {

+	 

+      case GL_LINE_LOOP:

+	 /* Convert to linestrip and emit the final vertex explicitly,

+	  * but only in the resultant strip that requires it.

+	  */

+	 j = 0;

+	 while (j != prim->count) {

+	    begin(copy, GL_LINE_STRIP, prim->begin && j == 0);

+

+	    for (split = GL_FALSE; j != prim->count && !split; j++)

+	       split = elt(copy, start + j);

+

+	    if (j == prim->count) {

+	       /* Done, emit final line.  Split doesn't matter as

+		* it is always raised a bit early so we can emit

+		* the last verts if necessary!

+		*/

+	       if (prim->end) 

+		  (void)elt(copy, start + 0);

+

+	       end(copy, prim->end);

+	    }

+	    else {

+	       /* Wrap

+		*/

+	       assert(split);

+	       end(copy, 0);

+	       j--;

+	    }

+	 }

+	 break;

+

+      case GL_TRIANGLE_FAN:

+      case GL_POLYGON:

+	 j = 2;

+	 while (j != prim->count) {

+	    begin(copy, prim->mode, prim->begin && j == 0);

+

+	    split = elt(copy, start+0); 

+	    assert(!split);

+

+	    split = elt(copy, start+j-1); 

+	    assert(!split);

+

+	    for (; j != prim->count && !split; j++)

+	       split = elt(copy, start+j);

+

+	    end(copy, prim->end && j == prim->count);

+

+	    if (j != prim->count) {

+	       /* Wrapped the primitive, need to repeat some vertices:

+		*/

+	       j -= 1;

+	    }

+	 }

+	 break;

+

+      default:

+	 (void)split_prim_inplace(prim->mode, &first, &incr);

+	 

+	 j = 0;

+	 while (j != prim->count) {

+

+	    begin(copy, prim->mode, prim->begin && j == 0);

+

+	    split = 0;

+	    for (k = 0; k < first; k++, j++)

+	       split |= elt(copy, start+j);

+

+	    assert(!split);

+

+	    for (; j != prim->count && !split; )

+	       for (k = 0; k < incr; k++, j++)

+		  split |= elt(copy, start+j);

+

+	    end(copy, prim->end && j == prim->count);

+

+	    if (j != prim->count) {

+	       /* Wrapped the primitive, need to repeat some vertices:

+		*/

+	       assert(j > first - incr);

+	       j -= (first - incr);

+	    }

+	 }

+	 break;

+      }

+   }

+

+   if (copy->dstprim_nr)

+      flush(copy);

+}

+

+

+static void

+replay_init( struct copy_context *copy )

+{

+   struct gl_context *ctx = copy->ctx;

+   GLuint i;

+   GLuint offset;

+   const GLvoid *srcptr;

+

+   /* Make a list of varying attributes and their vbo's.  Also

+    * calculate vertex size.

+    */

+   copy->vertex_size = 0;

+   for (i = 0; i < VERT_ATTRIB_MAX; i++) {

+      struct gl_buffer_object *vbo = copy->array[i]->BufferObj;

+

+      if (copy->array[i]->StrideB == 0) {

+	 copy->dstarray_ptr[i] = copy->array[i];

+      }

+      else {

+	 GLuint j = copy->nr_varying++;

+	 

+	 copy->varying[j].attr = i;

+	 copy->varying[j].array = copy->array[i];

+	 copy->varying[j].size = attr_size(copy->array[i]);

+	 copy->vertex_size += attr_size(copy->array[i]);

+      

+	 if (_mesa_is_bufferobj(vbo) && !_mesa_bufferobj_mapped(vbo)) 

+	    ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER, GL_READ_ONLY, vbo);

+

+	 copy->varying[j].src_ptr = ADD_POINTERS(vbo->Pointer,

+						 copy->array[i]->Ptr);

+

+	 copy->dstarray_ptr[i] = &copy->varying[j].dstarray;

+      }

+   }

+

+   /* There must always be an index buffer.  Currently require the

+    * caller convert non-indexed prims to indexed.  Could alternately

+    * do it internally.

+    */

+   if (_mesa_is_bufferobj(copy->ib->obj) &&

+       !_mesa_bufferobj_mapped(copy->ib->obj)) 

+      ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER, GL_READ_ONLY,

+			    copy->ib->obj);

+

+   srcptr = (const GLubyte *) ADD_POINTERS(copy->ib->obj->Pointer,

+                                           copy->ib->ptr);

+

+   switch (copy->ib->type) {

+   case GL_UNSIGNED_BYTE:

+      copy->translated_elt_buf = malloc(sizeof(GLuint) * copy->ib->count);

+      copy->srcelt = copy->translated_elt_buf;

+

+      for (i = 0; i < copy->ib->count; i++)

+	 copy->translated_elt_buf[i] = ((const GLubyte *)srcptr)[i];

+      break;

+

+   case GL_UNSIGNED_SHORT:

+      copy->translated_elt_buf = malloc(sizeof(GLuint) * copy->ib->count);

+      copy->srcelt = copy->translated_elt_buf;

+

+      for (i = 0; i < copy->ib->count; i++)

+	 copy->translated_elt_buf[i] = ((const GLushort *)srcptr)[i];

+      break;

+

+   case GL_UNSIGNED_INT:

+      copy->translated_elt_buf = NULL;

+      copy->srcelt = (const GLuint *)srcptr;

+      break;

+   }

+

+   /* Figure out the maximum allowed vertex buffer size:

+    */

+   if (copy->vertex_size * copy->limits->max_verts <= copy->limits->max_vb_size) {

+      copy->dstbuf_size = copy->limits->max_verts;

+   }

+   else {

+      copy->dstbuf_size = copy->limits->max_vb_size / copy->vertex_size;

+   }

+

+   /* Allocate an output vertex buffer:

+    *

+    * XXX:  This should be a VBO!

+    */

+   copy->dstbuf = malloc(copy->dstbuf_size * copy->vertex_size);   

+   copy->dstptr = copy->dstbuf;

+

+   /* Setup new vertex arrays to point into the output buffer: 

+    */

+   for (offset = 0, i = 0; i < copy->nr_varying; i++) {

+      const struct gl_client_array *src = copy->varying[i].array;

+      struct gl_client_array *dst = &copy->varying[i].dstarray;

+

+      dst->Size = src->Size;

+      dst->Type = src->Type;

+      dst->Format = GL_RGBA;

+      dst->Stride = copy->vertex_size;

+      dst->StrideB = copy->vertex_size;

+      dst->Ptr = copy->dstbuf + offset;

+      dst->Enabled = GL_TRUE;

+      dst->Normalized = src->Normalized; 

+      dst->BufferObj = ctx->Shared->NullBufferObj;

+      dst->_MaxElement = copy->dstbuf_size; /* may be less! */

+

+      offset += copy->varying[i].size;

+   }

+

+   /* Allocate an output element list:

+    */

+   copy->dstelt_size = MIN2(65536,

+			    copy->ib->count * 2 + 3);

+   copy->dstelt_size = MIN2(copy->dstelt_size,

+			    copy->limits->max_indices);

+   copy->dstelt = malloc(sizeof(GLuint) * copy->dstelt_size);

+   copy->dstelt_nr = 0;

+

+   /* Setup the new index buffer to point to the allocated element

+    * list:

+    */

+   copy->dstib.count = 0;	/* duplicates dstelt_nr */

+   copy->dstib.type = GL_UNSIGNED_INT;

+   copy->dstib.obj = ctx->Shared->NullBufferObj;

+   copy->dstib.ptr = copy->dstelt;

+}

+

+

+/**

+ * Free up everything allocated during split/replay.

+ */

+static void

+replay_finish( struct copy_context *copy )

+{

+   struct gl_context *ctx = copy->ctx;

+   GLuint i;

+

+   /* Free our vertex and index buffers: 

+    */

+   free(copy->translated_elt_buf);

+   free(copy->dstbuf);

+   free(copy->dstelt);

+

+   /* Unmap VBO's 

+    */

+   for (i = 0; i < copy->nr_varying; i++) {

+      struct gl_buffer_object *vbo = copy->varying[i].array->BufferObj;

+      if (_mesa_is_bufferobj(vbo) && _mesa_bufferobj_mapped(vbo)) 

+	 ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER, vbo);

+   }

+

+   /* Unmap index buffer:

+    */

+   if (_mesa_is_bufferobj(copy->ib->obj) &&

+       _mesa_bufferobj_mapped(copy->ib->obj)) {

+      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER, copy->ib->obj);

+   }

+}

+

+

+/**

+ * Split VBO into smaller pieces, draw the pieces.

+ */

+void vbo_split_copy( struct gl_context *ctx,

+		     const struct gl_client_array *arrays[],

+		     const struct _mesa_prim *prim,

+		     GLuint nr_prims,

+		     const struct _mesa_index_buffer *ib,

+		     vbo_draw_func draw,

+		     const struct split_limits *limits )

+{

+   struct copy_context copy;

+   GLuint i, this_nr_prims;

+

+   for (i = 0; i < 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;

+      }

+

+      memset(&copy, 0, sizeof(copy));

+

+      /* Require indexed primitives:

+       */

+      assert(ib);

+

+      copy.ctx = ctx;

+      copy.array = arrays;

+      copy.prim = &prim[i];

+      copy.nr_prims = this_nr_prims;

+      copy.ib = ib;

+      copy.draw = draw;

+      copy.limits = limits;

+

+      /* Clear the vertex cache:

+       */

+      for (i = 0; i < ELT_TABLE_SIZE; i++)

+	 copy.vert_cache[i].in = ~0;

+

+      replay_init(&copy);

+      replay_elts(&copy);

+      replay_finish(&copy);

+   }

+}

diff --git a/mesalib/src/mesa/vbo/vbo_split_inplace.c b/mesalib/src/mesa/vbo/vbo_split_inplace.c
index 2fc866c57..98c32eda5 100644
--- a/mesalib/src/mesa/vbo/vbo_split_inplace.c
+++ b/mesalib/src/mesa/vbo/vbo_split_inplace.c
@@ -1,283 +1,283 @@
-
-/*
- * 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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/enums.h"
-#include "main/image.h"
-#include "vbo_split.h"
-
-
-#define MAX_PRIM 32
-
-/* Used for splitting without copying. No attempt is made to handle
- * too large indexed vertex buffers: In general you need to copy to do
- * that.
- */
-struct split_context {
-   GLcontext *ctx;
-   const struct gl_client_array **array;
-   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;
-   GLuint limit;
-
-   struct _mesa_prim dstprim[MAX_PRIM];
-   GLuint dstprim_nr;
-};
-
-
-
-
-static void flush_vertex( struct split_context *split )
-{
-   struct _mesa_index_buffer ib;
-   GLuint i;
-
-   if (!split->dstprim_nr) 
-      return;
-
-   if (split->ib) {
-      ib = *split->ib;
-
-      ib.count = split->max_index - split->min_index + 1;
-      ib.ptr = (const void *)((const char *)ib.ptr + 
-                              split->min_index * _mesa_sizeof_type(ib.type));
-
-      /* Rebase the primitives to save index buffer entries. */
-      for (i = 0; i < split->dstprim_nr; i++)
-	 split->dstprim[i].start -= split->min_index;
-   }
-
-   assert(split->max_index >= split->min_index);
-
-   split->draw(split->ctx,
-	       split->array,
-	       split->dstprim,
-	       split->dstprim_nr,
-	       split->ib ? &ib : NULL,
-	       !split->ib,
-	       split->min_index,
-	       split->max_index);
-
-   split->dstprim_nr = 0;
-   split->min_index = ~0;
-   split->max_index = 0;
-}
-
-
-static struct _mesa_prim *next_outprim( struct split_context *split )
-{
-   if (split->dstprim_nr == MAX_PRIM-1) {
-      flush_vertex(split);
-   }
-
-   {
-      struct _mesa_prim *prim = &split->dstprim[split->dstprim_nr++];
-      memset(prim, 0, sizeof(*prim));
-      return prim;
-   }
-}
-
-static void update_index_bounds(struct split_context *split,
-				const struct _mesa_prim *prim)
-{
-   split->min_index = MIN2(split->min_index, prim->start);
-   split->max_index = MAX2(split->max_index, prim->start + prim->count - 1);
-}
-
-/* Return the maximum amount of vertices that can be emitted for a
- * primitive starting at 'prim->start', depending on the previous
- * index bounds.
- */
-static GLuint get_max_vertices(struct split_context *split,
-			       const struct _mesa_prim *prim)
-{
-   if ((prim->start > split->min_index &&
-	prim->start - split->min_index >= split->limit) ||
-       (prim->start < split->max_index &&
-        split->max_index - prim->start >= split->limit))
-      /* "prim" starts too far away from the old range. */
-      return 0;
-
-   return MIN2(split->min_index, prim->start) + split->limit - prim->start;
-}
-
-/* Break large primitives into smaller ones.  If not possible, convert
- * the primitive to indexed and pass to split_elts().
- */
-static void split_prims( struct split_context *split) 
-{
-   GLuint i;
-
-   for (i = 0; i < split->nr_prims; i++) {
-      const struct _mesa_prim *prim = &split->prim[i];
-      GLuint first, incr;
-      GLboolean split_inplace = split_prim_inplace(prim->mode, &first, &incr);
-      GLuint available = get_max_vertices(split, prim);
-      GLuint count = prim->count - (prim->count - first) % incr;
-
-      if (prim->count < first)
-	 continue;
-
-      if ((available < count && !split_inplace) ||
-	  (available < first && split_inplace)) {
-	 flush_vertex(split);
-	 available = get_max_vertices(split, prim);
-      }
-      
-      if (available >= count) {
-	 struct _mesa_prim *outprim = next_outprim(split);
-
-	 *outprim = *prim;
-	 update_index_bounds(split, outprim);
-      }
-      else if (split_inplace) {
-	 GLuint j, nr;
-
-	 for (j = 0 ; j < count ; ) {
-	    GLuint remaining = count - j;
-	    struct _mesa_prim *outprim = next_outprim(split);
-
-	    nr = MIN2( available, remaining );
-	    nr -= (nr - first) % incr;
-	    
-	    outprim->mode = prim->mode;
-	    outprim->begin = (j == 0 && prim->begin);
-	    outprim->end = (nr == remaining && prim->end);
-	    outprim->start = prim->start + j;
-	    outprim->count = nr;
-
-	    update_index_bounds(split, outprim);
-
-	    if (nr == remaining) {
-	       /* Finished. 
-		*/
-	       j += nr;
-	    }
-	    else {
-	       /* Wrapped the primitive: 
-		*/
-	       j += nr - (first - incr);
-	       flush_vertex(split);
-	       available = get_max_vertices(split, prim);
-	    }
-	 }
-      }
-      else if (split->ib == NULL) {
-	 /* XXX: could at least send the first max_verts off from the
-	  * inplace buffers.
-	  */
-
-	 /* else convert to indexed primitive and pass to split_elts,
-	  * which will do the necessary copying and turn it back into a
-	  * vertex primitive for rendering...
-	  */
-	 struct _mesa_index_buffer ib;
-	 struct _mesa_prim tmpprim;
-	 GLuint *elts = malloc(count * sizeof(GLuint));
-	 GLuint j;
-	 
-	 for (j = 0; j < count; j++)
-	    elts[j] = prim->start + j;
-
-	 ib.count = count;
-	 ib.type = GL_UNSIGNED_INT;
-	 ib.obj = split->ctx->Shared->NullBufferObj;
-	 ib.ptr = elts;
-	    
-	 tmpprim = *prim;
-	 tmpprim.indexed = 1;
-	 tmpprim.start = 0;
-	 tmpprim.count = count;
-
-	 flush_vertex(split);
-
-	 vbo_split_copy(split->ctx,
-			split->array,
-			&tmpprim, 1, 
-			&ib,
-			split->draw,
-			split->limits);
-	    
-	 free(elts);
-      }
-      else {
-	 flush_vertex(split);
-
-	 vbo_split_copy(split->ctx,
-			split->array,
-			prim, 1, 
-			split->ib,
-			split->draw,
-			split->limits);
-      }
-   }
-
-   flush_vertex(split);
-}
-
-
-void vbo_split_inplace( GLcontext *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 )
-{
-   struct split_context split;
-
-   memset(&split, 0, sizeof(split));
-
-   split.ctx = ctx;
-   split.array = arrays;
-   split.prim = prim;
-   split.nr_prims = nr_prims;
-   split.ib = ib;
-
-   /* Empty interval, makes calculations simpler. */
-   split.min_index = ~0;
-   split.max_index = 0;
-
-   split.draw = draw;
-   split.limits = limits;
-   split.limit = ib ? limits->max_indices : limits->max_verts;
-
-   split_prims( &split );
-}
-
-
+

+/*

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+#include "main/mtypes.h"

+#include "main/macros.h"

+#include "main/enums.h"

+#include "main/image.h"

+#include "vbo_split.h"

+

+

+#define MAX_PRIM 32

+

+/* Used for splitting without copying. No attempt is made to handle

+ * too large indexed vertex buffers: In general you need to copy to do

+ * that.

+ */

+struct split_context {

+   struct gl_context *ctx;

+   const struct gl_client_array **array;

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

+   GLuint limit;

+

+   struct _mesa_prim dstprim[MAX_PRIM];

+   GLuint dstprim_nr;

+};

+

+

+

+

+static void flush_vertex( struct split_context *split )

+{

+   struct _mesa_index_buffer ib;

+   GLuint i;

+

+   if (!split->dstprim_nr) 

+      return;

+

+   if (split->ib) {

+      ib = *split->ib;

+

+      ib.count = split->max_index - split->min_index + 1;

+      ib.ptr = (const void *)((const char *)ib.ptr + 

+                              split->min_index * _mesa_sizeof_type(ib.type));

+

+      /* Rebase the primitives to save index buffer entries. */

+      for (i = 0; i < split->dstprim_nr; i++)

+	 split->dstprim[i].start -= split->min_index;

+   }

+

+   assert(split->max_index >= split->min_index);

+

+   split->draw(split->ctx,

+	       split->array,

+	       split->dstprim,

+	       split->dstprim_nr,

+	       split->ib ? &ib : NULL,

+	       !split->ib,

+	       split->min_index,

+	       split->max_index);

+

+   split->dstprim_nr = 0;

+   split->min_index = ~0;

+   split->max_index = 0;

+}

+

+

+static struct _mesa_prim *next_outprim( struct split_context *split )

+{

+   if (split->dstprim_nr == MAX_PRIM-1) {

+      flush_vertex(split);

+   }

+

+   {

+      struct _mesa_prim *prim = &split->dstprim[split->dstprim_nr++];

+      memset(prim, 0, sizeof(*prim));

+      return prim;

+   }

+}

+

+static void update_index_bounds(struct split_context *split,

+				const struct _mesa_prim *prim)

+{

+   split->min_index = MIN2(split->min_index, prim->start);

+   split->max_index = MAX2(split->max_index, prim->start + prim->count - 1);

+}

+

+/* Return the maximum amount of vertices that can be emitted for a

+ * primitive starting at 'prim->start', depending on the previous

+ * index bounds.

+ */

+static GLuint get_max_vertices(struct split_context *split,

+			       const struct _mesa_prim *prim)

+{

+   if ((prim->start > split->min_index &&

+	prim->start - split->min_index >= split->limit) ||

+       (prim->start < split->max_index &&

+        split->max_index - prim->start >= split->limit))

+      /* "prim" starts too far away from the old range. */

+      return 0;

+

+   return MIN2(split->min_index, prim->start) + split->limit - prim->start;

+}

+

+/* Break large primitives into smaller ones.  If not possible, convert

+ * the primitive to indexed and pass to split_elts().

+ */

+static void split_prims( struct split_context *split) 

+{

+   GLuint i;

+

+   for (i = 0; i < split->nr_prims; i++) {

+      const struct _mesa_prim *prim = &split->prim[i];

+      GLuint first, incr;

+      GLboolean split_inplace = split_prim_inplace(prim->mode, &first, &incr);

+      GLuint available = get_max_vertices(split, prim);

+      GLuint count = prim->count - (prim->count - first) % incr;

+

+      if (prim->count < first)

+	 continue;

+

+      if ((available < count && !split_inplace) ||

+	  (available < first && split_inplace)) {

+	 flush_vertex(split);

+	 available = get_max_vertices(split, prim);

+      }

+      

+      if (available >= count) {

+	 struct _mesa_prim *outprim = next_outprim(split);

+

+	 *outprim = *prim;

+	 update_index_bounds(split, outprim);

+      }

+      else if (split_inplace) {

+	 GLuint j, nr;

+

+	 for (j = 0 ; j < count ; ) {

+	    GLuint remaining = count - j;

+	    struct _mesa_prim *outprim = next_outprim(split);

+

+	    nr = MIN2( available, remaining );

+	    nr -= (nr - first) % incr;

+	    

+	    outprim->mode = prim->mode;

+	    outprim->begin = (j == 0 && prim->begin);

+	    outprim->end = (nr == remaining && prim->end);

+	    outprim->start = prim->start + j;

+	    outprim->count = nr;

+

+	    update_index_bounds(split, outprim);

+

+	    if (nr == remaining) {

+	       /* Finished. 

+		*/

+	       j += nr;

+	    }

+	    else {

+	       /* Wrapped the primitive: 

+		*/

+	       j += nr - (first - incr);

+	       flush_vertex(split);

+	       available = get_max_vertices(split, prim);

+	    }

+	 }

+      }

+      else if (split->ib == NULL) {

+	 /* XXX: could at least send the first max_verts off from the

+	  * inplace buffers.

+	  */

+

+	 /* else convert to indexed primitive and pass to split_elts,

+	  * which will do the necessary copying and turn it back into a

+	  * vertex primitive for rendering...

+	  */

+	 struct _mesa_index_buffer ib;

+	 struct _mesa_prim tmpprim;

+	 GLuint *elts = malloc(count * sizeof(GLuint));

+	 GLuint j;

+	 

+	 for (j = 0; j < count; j++)

+	    elts[j] = prim->start + j;

+

+	 ib.count = count;

+	 ib.type = GL_UNSIGNED_INT;

+	 ib.obj = split->ctx->Shared->NullBufferObj;

+	 ib.ptr = elts;

+	    

+	 tmpprim = *prim;

+	 tmpprim.indexed = 1;

+	 tmpprim.start = 0;

+	 tmpprim.count = count;

+

+	 flush_vertex(split);

+

+	 vbo_split_copy(split->ctx,

+			split->array,

+			&tmpprim, 1, 

+			&ib,

+			split->draw,

+			split->limits);

+	    

+	 free(elts);

+      }

+      else {

+	 flush_vertex(split);

+

+	 vbo_split_copy(split->ctx,

+			split->array,

+			prim, 1, 

+			split->ib,

+			split->draw,

+			split->limits);

+      }

+   }

+

+   flush_vertex(split);

+}

+

+

+void vbo_split_inplace( 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 )

+{

+   struct split_context split;

+

+   memset(&split, 0, sizeof(split));

+

+   split.ctx = ctx;

+   split.array = arrays;

+   split.prim = prim;

+   split.nr_prims = nr_prims;

+   split.ib = ib;

+

+   /* Empty interval, makes calculations simpler. */

+   split.min_index = ~0;

+   split.max_index = 0;

+

+   split.draw = draw;

+   split.limits = limits;

+   split.limit = ib ? limits->max_indices : limits->max_verts;

+

+   split_prims( &split );

+}

+

+

diff --git a/mesalib/src/mesa/x86/3dnow.c b/mesalib/src/mesa/x86/3dnow.c
new file mode 100644
index 000000000..549157c50
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow.c
@@ -0,0 +1,91 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  5.0.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.

+ */

+

+/*

+ * 3DNow! optimizations contributed by

+ * Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "math/m_xform.h"

+#include "tnl/t_context.h"

+

+#include "3dnow.h"

+#include "x86_xform.h"

+

+#ifdef DEBUG_MATH

+#include "math/m_debug.h"

+#endif

+

+

+#ifdef USE_3DNOW_ASM

+DECLARE_XFORM_GROUP( 3dnow, 2 )

+DECLARE_XFORM_GROUP( 3dnow, 3 )

+DECLARE_XFORM_GROUP( 3dnow, 4 )

+

+DECLARE_NORM_GROUP( 3dnow )

+

+

+extern void _ASMAPI

+_mesa_v16_3dnow_general_xform( GLfloat *first_vert,

+			       const GLfloat *m,

+			       const GLfloat *src,

+			       GLuint src_stride,

+			       GLuint count );

+

+extern void _ASMAPI

+_mesa_3dnow_project_vertices( GLfloat *first,

+			      GLfloat *last,

+			      const GLfloat *m,

+			      GLuint stride );

+

+extern void _ASMAPI

+_mesa_3dnow_project_clipped_vertices( GLfloat *first,

+				      GLfloat *last,

+				      const GLfloat *m,

+				      GLuint stride,

+				      const GLubyte *clipmask );

+#endif

+

+

+void _mesa_init_3dnow_transform_asm( void )

+{

+#ifdef USE_3DNOW_ASM

+   ASSIGN_XFORM_GROUP( 3dnow, 2 );

+   ASSIGN_XFORM_GROUP( 3dnow, 3 );

+   ASSIGN_XFORM_GROUP( 3dnow, 4 );

+

+   /* There's a bug somewhere in the 3dnow_normal.S file that causes

+    * bad shading.  Disable for now.

+   ASSIGN_NORM_GROUP( 3dnow );

+   */

+

+#ifdef DEBUG_MATH

+   _math_test_all_transform_functions( "3DNow!" );

+   _math_test_all_normal_transform_functions( "3DNow!" );

+#endif

+#endif

+}

diff --git a/mesalib/src/mesa/x86/3dnow.h b/mesalib/src/mesa/x86/3dnow.h
new file mode 100644
index 000000000..067f8f721
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow.h
@@ -0,0 +1,36 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * 3DNow! optimizations contributed by

+ * Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>

+ */

+

+#ifndef __3DNOW_H__

+#define __3DNOW_H__

+

+void _mesa_init_3dnow_transform_asm( void );

+

+#endif

diff --git a/mesalib/src/mesa/x86/3dnow_normal.S b/mesalib/src/mesa/x86/3dnow_normal.S
new file mode 100644
index 000000000..bfa316588
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow_normal.S
@@ -0,0 +1,852 @@
+

+/*

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

+ */

+

+/*

+ * 3Dnow assembly code by Holger Waechtler

+ */

+

+#ifdef USE_3DNOW_ASM

+

+#include "assyntax.h"

+#include "matypes.h"

+#include "norm_args.h"

+

+        SEG_TEXT

+

+#define M(i)    REGOFF(i * 4, ECX)

+#define STRIDE  REGOFF(12, ESI)

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_transform_normalize_normals)

+HIDDEN(_mesa_3dnow_transform_normalize_normals)

+GLNAME(_mesa_3dnow_transform_normalize_normals):

+

+#define FRAME_OFFSET 12

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+    PUSH_L     ( EBP )

+

+    MOV_L      ( ARG_LENGTHS, EDI )

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EBP ) /*  dest->count = in->count   */

+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( ARG_MAT, ECX )

+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */

+

+    CMP_L      ( CONST(0), EBP )        /*   count > 0 ??  */

+    JE         ( LLBL (G3TN_end) )

+

+    MOV_L      ( REGOFF (V4F_COUNT, ESI), EBP )

+    FEMMS

+

+    PUSH_L     ( EBP )

+    PUSH_L     ( EAX )

+    PUSH_L     ( EDX )                  /*  save counter & pointer for   */

+                                        /*  the normalize pass           */

+#undef  FRAME_OFFSET

+#define FRAME_OFFSET 24

+

+    MOVQ       ( M(0), MM3 )            /*  m1              | m0         */

+    MOVQ       ( M(4), MM4 )            /*  m5              | m4         */

+

+    MOVD       ( M(2), MM5 )            /*                  | m2         */

+    PUNPCKLDQ  ( M(6), MM5 )            /*  m6              | m2         */

+

+    MOVQ       ( M(8), MM6 )            /*  m9              | m8         */

+    MOVQ       ( M(10), MM7 )           /*                  | m10        */

+

+    CMP_L      ( CONST(0), EDI )        /*  lengths == 0 ?                 */

+    JNE        ( LLBL (G3TN_scale_end ) )

+

+    MOVD       ( ARG_SCALE, MM0 )       /*               | scale           */

+    PUNPCKLDQ  ( MM0, MM0 )             /* scale         | scale           */

+

+    PFMUL      ( MM0, MM3 )             /* scale * m1    | scale * m0      */

+    PFMUL      ( MM0, MM4 )             /* scale * m5    | scale * m4      */

+    PFMUL      ( MM0, MM5 )             /* scale * m6    | scale * m2      */

+    PFMUL      ( MM0, MM6 )             /* scale * m9    | scale * m8      */

+    PFMUL      ( MM0, MM7 )             /*               | scale * m10     */

+

+ALIGNTEXT32

+LLBL (G3TN_scale_end):

+LLBL (G3TN_transform):

+    MOVQ       ( REGIND (EDX), MM0 )    /*  x1              | x0         */

+    MOVD       ( REGOFF (8, EDX), MM2 ) /*                  | x2         */

+

+    MOVQ       ( MM0, MM1 )             /*  x1              | x0           */

+    PUNPCKLDQ  ( MM2, MM2 )             /*  x2              | x2           */

+

+    PFMUL      ( MM3, MM0 )             /*  x1*m1           | x0*m0        */

+    ADD_L      ( CONST(16), EAX )       /*  next r                         */

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    PFMUL      ( MM4, MM1 )             /*  x1*m5           | x0*m4        */

+    PFACC      ( MM1, MM0 )             /*  x0*m4+x1*m5     | x0*m0+x1*m1  */

+

+    PFMUL      ( MM5, MM2 )             /*  x2*m6           | x2*m2        */

+    PFADD      ( MM2, MM0 )             /* x0*m4+x1*m5+x2*m6| x0*m0+...+x2**/

+

+    MOVQ       ( REGIND (EDX), MM1 )    /*  x1           | x0              */

+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write r0, r1                   */

+

+    PFMUL      ( MM6, MM1 )             /* x1*m9         | x0*m8           */

+    MOVD       ( REGOFF (8, EDX), MM2 ) /*               | x2              */

+

+    PFMUL      ( MM7, MM2 )             /*               | x2*m10          */

+    PFACC      ( MM1, MM1 )             /*  *not used*   | x0*m8+x1*m9     */

+

+    PFADD      ( MM2, MM1 )             /*  *not used*   | x0*m8+x1*m9+x2*m*/

+    ADD_L      ( STRIDE, EDX )          /*  next normal                    */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    MOVD       ( MM1, REGOFF(-8, EAX) ) /*  write r2                       */

+    SUB_L      ( CONST(1), EBP )                  /*  decrement normal counter       */

+    JNZ        ( LLBL (G3TN_transform) )

+

+

+    POP_L      ( EDX )                  /*  end of transform ---           */

+    POP_L      ( EAX )                  /*    now normalizing ...          */

+    POP_L      ( EBP )

+

+    CMP_L      ( CONST(0), EDI )        /*  lengths == 0 ?                 */

+    JE         ( LLBL (G3TN_norm ) )    /*  calculate lengths              */

+

+

+ALIGNTEXT32

+LLBL (G3TN_norm_w_lengths):

+

+    PREFETCHW  ( REGOFF(12,EAX) )

+

+    MOVQ       ( REGIND(EAX), MM0 )     /*  x1              | x0           */

+    MOVD       ( REGOFF(8, EAX), MM1 )  /*                  | x2           */

+

+    MOVD       ( REGIND (EDI), MM3 )    /*                  | length (x)   */

+    PFMUL      ( MM3, MM1 )             /*                  | x2 (normalize*/

+

+    PUNPCKLDQ  ( MM3, MM3 )             /*  length (x)      | length (x)   */

+    PFMUL      ( MM3, MM0 )             /*  x1 (normalized) | x0 (normalize*/

+

+    ADD_L      ( STRIDE, EDX )          /*  next normal                    */

+    ADD_L      ( CONST(4), EDI )        /*  next length                    */

+

+    PREFETCH   ( REGIND(EDI) )

+

+    MOVQ       ( MM0, REGIND(EAX) )     /*  write new x0, x1               */

+    MOVD       ( MM1, REGOFF(8, EAX) )  /*  write new x2                   */

+

+    ADD_L      ( CONST(16), EAX )       /*  next r                         */

+    SUB_L      ( CONST(1), EBP )        /*  decrement normal counter       */

+

+    JNZ        ( LLBL (G3TN_norm_w_lengths) )

+    JMP        ( LLBL (G3TN_exit_3dnow) )

+

+ALIGNTEXT32

+LLBL (G3TN_norm):

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND (EAX), MM0 )    /*  x1             | x0           */

+    MOVD       ( REGOFF(8, EAX), MM1 )  /*                 | x2           */

+

+    MOVQ       ( MM0, MM3 )             /*  x1              | x0           */

+    MOVQ       ( MM1, MM4 )             /*                  | x2           */

+

+    PFMUL      ( MM0, MM3 )             /*  x1*x1           | x0*x0        */

+    ADD_L      ( CONST(16), EAX )       /*  next r                         */

+

+    PFMUL      ( MM1, MM4 )             /*                  | x2*x2        */

+    PFADD      ( MM4, MM3 )             /*                  | x0*x0+x2*x2  */

+

+    PFACC      ( MM3, MM3 )             /* **not used**    | x0*x0+x1*x1+x2**/

+    PFRSQRT    ( MM3, MM5 )             /*  1/sqrt (x0*x0+x1*x1+x2*x2)     */

+

+    MOVQ       ( MM5, MM4 )

+    PUNPCKLDQ  ( MM3, MM3 )

+

+    SUB_L      ( CONST(1), EBP )                  /*  decrement normal counter       */

+    PFMUL      ( MM5, MM5 )

+

+    PFRSQIT1   ( MM3, MM5 )

+    PFRCPIT2   ( MM4, MM5 )

+

+    PFMUL      ( MM5, MM0 )             /*  x1 (normalized) | x0 (normalize*/

+

+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /*  write new x0, x1              */

+    PFMUL      ( MM5, MM1 )             /*                 | x2 (normalize*/

+

+    MOVD       ( MM1, REGOFF(-8, EAX) ) /*  write new x2                  */

+    JNZ        ( LLBL (G3TN_norm) )

+

+LLBL (G3TN_exit_3dnow):

+    FEMMS

+

+LLBL (G3TN_end):

+    POP_L      ( EBP )

+    POP_L      ( ESI )

+    POP_L      ( EDI )

+    RET

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_transform_normalize_normals_no_rot)

+HIDDEN(_mesa_3dnow_transform_normalize_normals_no_rot)

+GLNAME(_mesa_3dnow_transform_normalize_normals_no_rot):

+

+#undef FRAME_OFFSET

+#define FRAME_OFFSET 12

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+    PUSH_L     ( EBP )

+

+    MOV_L      ( ARG_LENGTHS, EDI )

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EBP ) /*  dest->count = in->count   */

+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( ARG_MAT, ECX )

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */

+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */

+

+    CMP_L      ( CONST(0), EBP ) /*   count > 0 ??  */

+    JE         ( LLBL (G3TNNR_end) )

+

+    FEMMS

+

+    MOVD       ( M(0), MM0 )            /*               | m0                 */

+    PUNPCKLDQ  ( M(5), MM0 )            /* m5            | m0                 */

+

+    MOVD       ( M(10), MM2 )           /*               | m10                */

+    PUNPCKLDQ  ( MM2, MM2 )             /* m10           | m10                */

+

+    CMP_L      ( CONST(0), EDI )        /*  lengths == 0 ?                    */

+    JNE        ( LLBL (G3TNNR_scale_end ) )

+

+    MOVD       ( ARG_SCALE, MM7 )       /*               | scale              */

+    PUNPCKLDQ  ( MM7, MM7 )             /* scale         | scale              */

+

+    PFMUL      ( MM7, MM0 )             /* scale * m5    | scale * m0         */

+    PFMUL      ( MM7, MM2 )             /* scale * m10   | scale * m10        */

+

+ALIGNTEXT32

+LLBL (G3TNNR_scale_end):

+    CMP_L      ( CONST(0), EDI )        /* lengths == 0 ?                     */

+    JE         ( LLBL (G3TNNR_norm) )   /* need to calculate lengths          */

+

+    MOVD       ( REGIND(EDI), MM3 )     /*                 | length (x)       */

+

+

+ALIGNTEXT32

+LLBL (G3TNNR_norm_w_lengths):           /* use precalculated lengths          */

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(EDX), MM6 )     /* x1            | x0                 */

+    MOVD       ( REGOFF(8, EDX), MM7 )  /*               | x2                 */

+

+    PFMUL      ( MM0, MM6 )             /* x1*m5         | x0*m0              */

+    ADD_L      ( STRIDE, EDX )          /* next normal                        */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    PFMUL      ( MM2, MM7 )             /*               | x2*m10             */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    PFMUL      ( MM3, MM7 )             /*               | x2 (normalized)  */

+    PUNPCKLDQ  ( MM3, MM3 )             /* length (x)    | length (x)       */

+

+    ADD_L      ( CONST(4), EDI )        /* next length                        */

+    PFMUL      ( MM3, MM6 )             /* x1 (normalized) | x0 (normalized)  */

+

+    SUB_L      ( CONST(1), EBP )        /* decrement normal counter           */

+    MOVQ       ( MM6, REGOFF(-16, EAX) ) /* write r0, r1                      */

+

+    MOVD       ( MM7, REGOFF(-8, EAX) ) /* write r2                           */

+    MOVD       ( REGIND(EDI), MM3 )     /*                 | length (x)       */

+

+    JNZ        ( LLBL (G3TNNR_norm_w_lengths) )

+    JMP        ( LLBL (G3TNNR_exit_3dnow) )

+

+ALIGNTEXT32

+LLBL (G3TNNR_norm):                     /* need to calculate lengths          */

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(EDX), MM6 )     /* x1              | x0               */

+    MOVD       ( REGOFF(8, EDX), MM7 )  /*                 | x2               */

+

+    PFMUL      ( MM0, MM6 )             /* x1*m5           | x0*m0            */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    PFMUL      ( MM2, MM7 )             /*                 | x2*m10           */

+    MOVQ       ( MM6, MM3 )             /* x1 (transformed)| x0 (transformed) */

+

+    MOVQ       ( MM7, MM4 )             /*                 | x2 (transformed) */

+    PFMUL      ( MM6, MM3 )             /* x1*x1           | x0*x0            */

+

+

+    PFMUL      ( MM7, MM4 )             /*                 | x2*x2            */

+    PFACC      ( MM3, MM3 )             /* **not used**    | x0*x0+x1*x1      */

+

+    PFADD      ( MM4, MM3 )             /*                 | x0*x0+x1*x1+x2*x2*/

+    ADD_L      ( STRIDE, EDX )          /* next normal            */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    PFRSQRT    ( MM3, MM5 )             /* 1/sqrt (x0*x0+x1*x1+x2*x2)         */

+    MOVQ       ( MM5, MM4 )

+

+    PUNPCKLDQ  ( MM3, MM3 )

+    PFMUL      ( MM5, MM5 )

+

+    PFRSQIT1   ( MM3, MM5 )

+    SUB_L      ( CONST(1), EBP )        /* decrement normal counter           */

+

+    PFRCPIT2   ( MM4, MM5 )

+    PFMUL      ( MM5, MM6 )             /* x1 (normalized) | x0 (normalized)  */

+

+    MOVQ       ( MM6, REGOFF(-16, EAX) ) /* write r0, r1                      */

+    PFMUL      ( MM5, MM7 )             /*                 | x2 (normalized)  */

+

+    MOVD       ( MM7, REGOFF(-8, EAX) ) /* write r2                           */

+    JNZ        ( LLBL (G3TNNR_norm) )

+

+

+LLBL (G3TNNR_exit_3dnow):

+    FEMMS

+

+LLBL (G3TNNR_end):

+    POP_L      ( EBP )

+    POP_L      ( ESI )

+    POP_L      ( EDI )

+    RET

+

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_transform_rescale_normals_no_rot)

+HIDDEN(_mesa_3dnow_transform_rescale_normals_no_rot)

+GLNAME(_mesa_3dnow_transform_rescale_normals_no_rot):

+

+#undef FRAME_OFFSET

+#define FRAME_OFFSET 12

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+    PUSH_L     ( EBP )

+

+    MOV_L      ( ARG_IN, EAX )

+    MOV_L      ( ARG_DEST, EDX )

+    MOV_L      ( REGOFF(V4F_COUNT, EAX), EBP ) /*  dest->count = in->count   */

+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EDX) )

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_MAT, ECX )

+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */

+    MOV_L      ( REGOFF(V4F_START, EDX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */

+

+    CMP_L      ( CONST(0), EBP )

+    JE         ( LLBL (G3TRNR_end) )

+

+    FEMMS

+

+    MOVD       ( ARG_SCALE, MM6 )       /*               | scale              */

+    PUNPCKLDQ  ( MM6, MM6 )             /* scale         | scale              */

+

+    MOVD       ( REGIND(ECX), MM0 )     /*               | m0                 */

+    PUNPCKLDQ  ( REGOFF(20, ECX), MM0 ) /* m5            | m0                 */

+

+    PFMUL      ( MM6, MM0 )             /* scale*m5      | scale*m0           */

+    MOVD       ( REGOFF(40, ECX), MM2 ) /*               | m10                */

+

+    PFMUL      ( MM6, MM2 )             /*               | scale*m10          */

+

+ALIGNTEXT32

+LLBL (G3TRNR_rescale):

+

+    PREFETCHW  ( REGIND(EAX) )

+	

+    MOVQ       ( REGIND(EDX), MM4 )     /* x1            | x0                 */

+    MOVD       ( REGOFF(8, EDX), MM5 )  /*               | x2                 */

+	

+    PFMUL      ( MM0, MM4 )             /* x1*m5         | x0*m0              */

+    ADD_L      ( STRIDE, EDX )          /* next normal                        */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    PFMUL      ( MM2, MM5 )             /*               | x2*m10             */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    SUB_L      ( CONST(1), EBP )        /* decrement normal counter           */

+    MOVQ       ( MM4, REGOFF(-16, EAX) ) /* write r0, r1                      */

+

+    MOVD       ( MM5, REGOFF(-8, EAX) ) /* write r2                           */

+    JNZ        ( LLBL (G3TRNR_rescale) ) /* cnt > 0 ? -> process next normal  */

+

+    FEMMS

+

+LLBL (G3TRNR_end):

+    POP_L      ( EBP )

+    POP_L      ( ESI )

+    POP_L      ( EDI )

+    RET

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_transform_rescale_normals)

+HIDDEN(_mesa_3dnow_transform_rescale_normals)

+GLNAME(_mesa_3dnow_transform_rescale_normals):

+

+#undef  FRAME_OFFSET

+#define FRAME_OFFSET 8

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( ARG_MAT, ECX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDI ) /*  dest->count = in->count   */

+    MOV_L      ( EDI, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */

+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */

+

+    CMP_L      ( CONST(0), EDI )

+    JE         ( LLBL (G3TR_end) )

+

+    FEMMS

+

+    MOVQ       ( REGIND(ECX), MM3 )     /* m1            | m0                 */

+

+    MOVQ       ( REGOFF(16,ECX), MM4 )  /* m5            | m4                 */

+    MOVD       ( ARG_SCALE, MM0 )       /* scale       */

+

+    MOVD       ( REGOFF(8,ECX), MM5 )   /*               | m2                 */

+    PUNPCKLDQ  ( MM0, MM0 )             /* scale         | scale              */

+

+    PUNPCKLDQ  ( REGOFF(24, ECX), MM5 )

+    PFMUL      ( MM0, MM3 )             /* scale*m1      | scale*m0           */

+

+    MOVQ       ( REGOFF(32, ECX), MM6 ) /* m9            | m8*/

+    PFMUL      ( MM0, MM4 )             /* scale*m5      | scale*m4           */

+

+    MOVD       ( REGOFF(40, ECX), MM7 ) /*               | m10                */

+    PFMUL      ( MM0, MM5 )             /* scale*m6      | scale*m2           */

+

+    PFMUL      ( MM0, MM6 )             /* scale*m9      | scale*m8           */

+

+    PFMUL      ( MM0, MM7 )             /*               | scale*m10          */

+

+ALIGNTEXT32

+LLBL (G3TR_rescale):

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(EDX), MM0 )     /* x1            | x0                 */

+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */

+

+    MOVQ       ( MM0, MM1 )             /* x1            | x0                 */

+    PUNPCKLDQ  ( MM2, MM2 )             /* x2            | x2                 */

+

+    PFMUL      ( MM3, MM0 )             /* x1*m1         | x0*m0              */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    PFMUL      ( MM4, MM1 )             /* x1*m5         | x0*m4              */

+    PFACC      ( MM1, MM0 )             /* x0*m4+x1*m5   | x0*m0+x1*m1        */

+

+    MOVQ       ( REGIND(EDX), MM1 )     /* x1            | x0                 */

+

+    PFMUL      ( MM5, MM2 )             /* x2*m6         | x2*m2              */

+    PFADD      ( MM2, MM0 )             /* x0*m4...+x2*m6| x0*m0+x1*m1+x2*m2  */

+

+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */

+    ADD_L      ( STRIDE, EDX )          /* next normal                    */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write r0, r1                      */

+    PFMUL      ( MM6, MM1 )             /* x1*m9         | x0*m8              */

+

+    PFMUL      ( MM7, MM2 )             /*               | x2*m10             */

+    PFACC      ( MM1, MM1 )             /* *not used*    | x0*m8+x1*m9        */

+

+    PFADD      ( MM2, MM1 )             /* *not used*    | x0*m8+x1*m9+x2*m10 */

+    MOVD       ( MM1, REGOFF(-8, EAX) ) /* write r2                           */

+

+    SUB_L      ( CONST(1), EDI )        /* decrement normal counter           */

+    JNZ        ( LLBL (G3TR_rescale) )

+

+    FEMMS

+

+LLBL (G3TR_end):

+    POP_L       ( ESI )

+    POP_L       ( EDI )

+    RET

+

+

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_transform_normals_no_rot)

+HIDDEN(_mesa_3dnow_transform_normals_no_rot)

+GLNAME(_mesa_3dnow_transform_normals_no_rot):

+

+#undef  FRAME_OFFSET

+#define FRAME_OFFSET 8

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( ARG_MAT, ECX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDI ) /*  dest->count = in->count   */

+    MOV_L      ( EDI, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */

+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */

+

+    CMP_L      ( CONST(0), EDI )

+    JE         ( LLBL (G3TNR_end) )

+

+    FEMMS

+

+    MOVD       ( REGIND(ECX), MM0 )     /*               | m0                 */

+    PUNPCKLDQ  ( REGOFF(20, ECX), MM0 ) /* m5            | m0                 */

+

+    MOVD       ( REGOFF(40, ECX), MM2 ) /*               | m10                */

+    PUNPCKLDQ  ( MM2, MM2 )             /* m10           | m10                */

+

+ALIGNTEXT32

+LLBL (G3TNR_transform):

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(EDX), MM4 )     /* x1            | x0                 */

+    MOVD       ( REGOFF(8, EDX), MM5 )  /*               | x2                 */

+

+    PFMUL      ( MM0, MM4 )             /* x1*m5         | x0*m0              */

+    ADD_L      ( STRIDE, EDX)           /* next normal      */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    PFMUL      ( MM2, MM5 )             /*               | x2*m10             */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    SUB_L      ( CONST(1), EDI )        /* decrement normal counter           */

+    MOVQ       ( MM4, REGOFF(-16, EAX) ) /* write r0, r1                      */

+

+    MOVD       ( MM5, REGOFF(-8, EAX) ) /* write r2                           */

+    JNZ        ( LLBL (G3TNR_transform) )

+

+    FEMMS

+

+LLBL (G3TNR_end):

+    POP_L       ( ESI )

+    POP_L       ( EDI )

+    RET

+

+

+

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_transform_normals)

+HIDDEN(_mesa_3dnow_transform_normals)

+GLNAME(_mesa_3dnow_transform_normals):

+

+#undef  FRAME_OFFSET

+#define FRAME_OFFSET 8

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( ARG_MAT, ECX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDI ) /*  dest->count = in->count   */

+    MOV_L      ( EDI, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(V4F_START, ESI), EDX ) /*  in->start    */

+    MOV_L      ( REGOFF(MATRIX_INV, ECX), ECX ) /*  mat->inv     */

+

+    CMP_L      ( CONST(0), EDI )        /* count > 0 ??                       */

+    JE         ( LLBL (G3T_end) )

+

+    FEMMS

+

+    MOVQ       ( REGIND(ECX), MM3 )     /* m1            | m0                 */

+    MOVQ       ( REGOFF(16, ECX), MM4 ) /* m5            | m4                 */

+

+    MOVD       ( REGOFF(8, ECX), MM5 )  /*               | m2                 */

+    PUNPCKLDQ  ( REGOFF(24, ECX), MM5 ) /* m6            | m2                 */

+

+    MOVQ       ( REGOFF(32, ECX), MM6 ) /* m9            | m8                 */

+    MOVD       ( REGOFF(40, ECX), MM7 ) /*               | m10                */

+

+ALIGNTEXT32

+LLBL (G3T_transform):

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(EDX), MM0 )     /* x1            | x0                 */

+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */

+

+    MOVQ       ( MM0, MM1 )             /* x1            | x0                 */

+    PUNPCKLDQ  ( MM2, MM2 )             /* x2            | x2                 */

+

+    PFMUL      ( MM3, MM0 )             /* x1*m1         | x0*m0              */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    PFMUL      ( MM4, MM1 )             /* x1*m5         | x0*m4              */

+    PFACC      ( MM1, MM0 )             /* x0*m4+x1*m5   | x0*m0+x1*m1        */

+

+    PFMUL      ( MM5, MM2 )             /* x2*m6         | x2*m2              */

+    PFADD      ( MM2, MM0 )             /* x0*m4...+x2*m6| x0*m0+x1*m1+x2*m2  */

+

+    MOVQ       ( REGIND(EDX), MM1 )     /* x1            | x0                 */

+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write r0, r1                      */

+

+    PFMUL      ( MM6, MM1 )             /* x1*m9         | x0*m8              */

+    MOVD       ( REGOFF(8, EDX), MM2 )  /*               | x2                 */

+

+    PFMUL      ( MM7, MM2 )             /*               | x2*m10             */

+    ADD_L      ( STRIDE, EDX )          /* next normal               */

+

+    PREFETCH   ( REGIND(EDX) )

+

+    PFACC      ( MM1, MM1 )             /* *not used*    | x0*m8+x1*m9        */

+    PFADD      ( MM2, MM1 )             /* *not used*    | x0*m8+x1*m9+x2*m10 */

+

+    MOVD       ( MM1, REGOFF(-8, EAX) ) /* write r2                           */

+    SUB_L      ( CONST(1), EDI )        /* decrement normal counter           */

+

+    JNZ        ( LLBL (G3T_transform) )

+

+    FEMMS

+

+LLBL (G3T_end):

+    POP_L  ( ESI )

+    POP_L  ( EDI )

+    RET

+

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_normalize_normals)

+HIDDEN(_mesa_3dnow_normalize_normals)

+GLNAME(_mesa_3dnow_normalize_normals):

+

+#undef  FRAME_OFFSET

+#define FRAME_OFFSET 12

+

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+    PUSH_L     ( EBP )

+

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EBP ) /*  dest->count = in->count   */

+    MOV_L      ( EBP, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(V4F_START, ESI), ECX ) /*  in->start    */

+    MOV_L      ( ARG_LENGTHS, EDX )

+

+    CMP_L      ( CONST(0), EBP ) /* count > 0 ?? */

+    JE         ( LLBL (G3N_end) )

+

+    FEMMS

+

+    CMP_L      ( CONST(0), EDX )        /* lengths == 0 ?                     */

+    JE         ( LLBL (G3N_norm2) )     /* calculate lengths                  */

+

+ALIGNTEXT32

+LLBL (G3N_norm1):                       /* use precalculated lengths          */

+

+    PREFETCH   ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(ECX), MM0 )     /* x1              | x0               */

+    MOVD       ( REGOFF(8, ECX), MM1 )  /*                 | x2               */

+

+    MOVD       ( REGIND(EDX), MM3 )     /*                 | length (x)       */

+    PFMUL      ( MM3, MM1 )             /*                 | x2 (normalized)  */

+

+    PUNPCKLDQ  ( MM3, MM3 )             /* length (x)      | length (x)       */

+    ADD_L      ( STRIDE, ECX )          /* next normal            */

+

+    PREFETCH   ( REGIND(ECX) )

+

+    PFMUL      ( MM3, MM0 )             /* x1 (normalized) | x0 (normalized)  */

+    MOVQ       ( MM0, REGIND(EAX) )     /* write new x0, x1                   */

+

+    MOVD       ( MM1, REGOFF(8, EAX) )  /* write new x2                       */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    ADD_L      ( CONST(4), EDX )        /* next length                        */

+    SUB_L      ( CONST(1), EBP )        /* decrement normal counter           */

+

+    JNZ        ( LLBL (G3N_norm1) )

+

+    JMP        ( LLBL (G3N_end1) )

+

+ALIGNTEXT32

+LLBL (G3N_norm2):                       /* need to calculate lengths          */

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    PREFETCH   ( REGIND(ECX) )

+

+    MOVQ       ( REGIND(ECX), MM0 )     /* x1              | x0               */

+    MOVD       ( REGOFF(8, ECX), MM1 )  /*                 | x2               */

+

+    MOVQ       ( MM0, MM3 )             /* x1              | x0               */

+    ADD_L      ( STRIDE, ECX )          /* next normal    */

+

+    PFMUL      ( MM0, MM3 )             /* x1*x1           | x0*x0            */

+    MOVQ       ( MM1, MM4 )             /*                 | x2               */

+

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+    PFMUL      ( MM1, MM4 )             /*                 | x2*x2            */

+

+    PFADD      ( MM4, MM3 )             /*                 | x0*x0+x2*x2      */

+    PFACC      ( MM3, MM3 )             /* x0*x0+...+x2*x2 | x0*x0+x1*x1+x2*x2*/

+

+    PFRSQRT    ( MM3, MM5 )             /* 1/sqrt (x0*x0+x1*x1+x2*x2)         */

+    MOVQ       ( MM5, MM4 )

+

+    PUNPCKLDQ  ( MM3, MM3 )

+    PFMUL      ( MM5, MM5 )

+

+    PFRSQIT1   ( MM3, MM5 )

+    SUB_L      ( CONST(1), EBP )        /* decrement normal counter           */

+

+    PFRCPIT2   ( MM4, MM5 )

+

+    PFMUL      ( MM5, MM0 )             /* x1 (normalized) | x0 (normalized)  */

+    MOVQ       ( MM0, REGOFF(-16, EAX) ) /* write new x0, x1                  */

+

+    PFMUL      ( MM5, MM1 )             /*                 | x2 (normalized)  */

+    MOVD       ( MM1, REGOFF(-8, EAX) ) /* write new x2                       */

+

+    JNZ        ( LLBL (G3N_norm2) )

+

+LLBL (G3N_end1):

+    FEMMS

+

+LLBL (G3N_end):

+    POP_L      ( EBP )

+    POP_L      ( ESI )

+    POP_L      ( EDI )

+    RET

+

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_3dnow_rescale_normals)

+HIDDEN(_mesa_3dnow_rescale_normals)

+GLNAME(_mesa_3dnow_rescale_normals):

+

+#undef  FRAME_OFFSET

+#define FRAME_OFFSET 8

+    PUSH_L     ( EDI )

+    PUSH_L     ( ESI )

+

+    MOV_L      ( ARG_IN, ESI )

+    MOV_L      ( ARG_DEST, EAX )

+    MOV_L      ( REGOFF(V4F_COUNT, ESI), EDX ) /*  dest->count = in->count   */

+    MOV_L      ( EDX, REGOFF(V4F_COUNT, EAX) )

+    MOV_L      ( REGOFF(V4F_START, EAX), EAX ) /*  dest->start  */

+    MOV_L      ( REGOFF(V4F_START, ESI), ECX ) /*  in->start    */

+

+    CMP_L      ( CONST(0), EDX )

+    JE         ( LLBL (G3R_end) )

+

+    FEMMS

+

+    MOVD       ( ARG_SCALE, MM0 )       /* scale                              */

+    PUNPCKLDQ  ( MM0, MM0 )

+

+ALIGNTEXT32

+LLBL (G3R_rescale):

+

+    PREFETCHW  ( REGIND(EAX) )

+

+    MOVQ       ( REGIND(ECX), MM1 )     /* x1            | x0                 */

+    MOVD       ( REGOFF(8, ECX), MM2 )  /*               | x2                 */

+

+    PFMUL      ( MM0, MM1 )             /* x1*scale      | x0*scale           */

+    ADD_L      ( STRIDE, ECX )          /* next normal                  */

+

+    PREFETCH   ( REGIND(ECX) )

+

+    PFMUL      ( MM0, MM2 )             /*               | x2*scale           */

+    ADD_L      ( CONST(16), EAX )       /* next r                             */

+

+    MOVQ       ( MM1, REGOFF(-16, EAX) ) /* write r0, r1                      */

+    MOVD       ( MM2, REGOFF(-8, EAX) ) /* write r2                           */

+

+    SUB_L      ( CONST(1), EDX )        /* decrement normal counter           */

+    JNZ        ( LLBL (G3R_rescale) )

+

+    FEMMS

+

+LLBL (G3R_end):

+    POP_L      ( ESI )

+    POP_L      ( EDI )

+    RET

+

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/3dnow_xform1.S b/mesalib/src/mesa/x86/3dnow_xform1.S
new file mode 100644
index 000000000..9719ba2c1
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow_xform1.S
@@ -0,0 +1,437 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+#ifdef USE_3DNOW_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+    SEG_TEXT

+

+#define FRAME_OFFSET	4

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_general )

+HIDDEN(_mesa_3dnow_transform_points1_general)

+GLNAME( _mesa_3dnow_transform_points1_general ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPGR_3 ) )

+

+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */

+    MOVQ      ( REGOFF(8, ECX), MM1 )	/* m03             | m02             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+    MOVQ      ( REGOFF(56, ECX), MM3 )	/* m33             | m32             */

+

+ALIGNTEXT16

+LLBL( G3TPGR_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */

+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */

+

+    MOVQ      ( MM4, MM5 )		/* x0              | x0              */

+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */

+

+    PFMUL     ( MM1, MM5 )		/* x0*m03          | x0*m02          */

+    PFADD     ( MM2, MM4 )		/* x0*m01+m31      | x0*m00+m30      */

+

+    PFADD     ( MM3, MM5 )		/* x0*m03+m33      | x0*m02+m32      */

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+

+    MOVQ      ( MM5, REGOFF(8, EDX) )	/* write r3, r2                      */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TPGR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPGR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_identity )

+HIDDEN(_mesa_3dnow_transform_points1_identity)

+GLNAME( _mesa_3dnow_transform_points1_identity ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(1), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_1), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPIR_4) )

+

+ALIGNTEXT16

+LLBL( G3TPIR_3 ):

+

+    MOVD      ( REGIND(EAX), MM0 )	/*                 | x0              */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    MOVD      ( MM0, REGIND(EDX) )	/*                 | r0              */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPIR_3 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPIR_4 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_3d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points1_3d_no_rot)

+GLNAME( _mesa_3dnow_transform_points1_3d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3NRR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TP3NRR_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */

+    PFMUL     ( MM0, MM4 )		/*                 | x0*m00          */

+

+    PFADD     ( MM2, MM4 )		/* m31             | x0*m00+m30      */

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+

+    MOVD      ( MM3, REGOFF(8, EDX) )	/* write r2                          */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP3NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3NRR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_perspective )

+HIDDEN(_mesa_3dnow_transform_points1_perspective)

+GLNAME( _mesa_3dnow_transform_points1_perspective ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPPR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TPPR_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/* 0               | x0              */

+    PFMUL     ( MM0, MM4 )		/* 0               | x0*m00          */

+

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+    MOVQ      ( MM3, REGOFF(8, EDX) )	/* write r2  (=m32), r3 (=0)         */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPPR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPPR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_2d )

+HIDDEN(_mesa_3dnow_transform_points1_2d)

+GLNAME( _mesa_3dnow_transform_points1_2d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2R_3 ) )

+

+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2R_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */

+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */

+

+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */

+    PFADD     ( MM2, MM4 )		/* x0*m01+m31      | x0*m00+m30      */

+

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP2R_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2R_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_2d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points1_2d_no_rot)

+GLNAME( _mesa_3dnow_transform_points1_2d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2NRR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2NRR_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    PFMUL     ( MM0, MM4 )		/*                 | x0*m00          */

+    PFADD     ( MM2, MM4 )		/* m31             | x0*m00+m30      */

+

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP2NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2NRR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points1_3d )

+HIDDEN(_mesa_3dnow_transform_points1_3d)

+GLNAME( _mesa_3dnow_transform_points1_3d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(4, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3R_3 ) )

+

+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */

+    MOVD      ( REGOFF(8, ECX), MM1 )	/*                 | m02             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TP3R_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */

+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */

+

+    MOVQ      ( MM4, MM5 )		/*                 | x0              */

+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */

+

+    PFMUL     ( MM1, MM5 )		/*                 | x0*m02          */

+    PFADD     ( MM2, MM4 )		/* x0*m01+m31      | x0*m00+m30      */

+

+    PFADD     ( MM3, MM5 )		/*                 | x0*m02+m32      */

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+

+    MOVD      ( MM5, REGOFF(8, EDX) )	/* write r2                          */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP3R_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3R_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/3dnow_xform2.S b/mesalib/src/mesa/x86/3dnow_xform2.S
new file mode 100644
index 000000000..8c706074a
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow_xform2.S
@@ -0,0 +1,477 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+#ifdef USE_3DNOW_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+    SEG_TEXT

+

+#define FRAME_OFFSET	4

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_general )

+HIDDEN(_mesa_3dnow_transform_points2_general)

+GLNAME( _mesa_3dnow_transform_points2_general ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPGR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */

+

+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */

+

+    MOVD      ( REGOFF(8, ECX), MM2 )	/*                 | m02             */

+    PUNPCKLDQ ( REGOFF(24, ECX), MM2 )	/* m12             | m02             */

+

+    MOVD      ( REGOFF(12, ECX), MM3 )	/*                 | m03             */

+    PUNPCKLDQ ( REGOFF(28, ECX), MM3 )	/* m13             | m03             */

+

+    MOVQ      ( REGOFF(48, ECX), MM4 )	/* m31             | m30             */

+    MOVQ      ( REGOFF(56, ECX), MM5 )	/* m33             | m32             */

+

+ALIGNTEXT16

+LLBL( G3TPGR_2 ):

+

+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */

+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */

+

+    PFMUL     ( MM0, MM6 )		/* x1*m10          | x0*m00          */

+    PFMUL     ( MM1, MM7 )		/* x1*m11          | x0*m01          */

+

+    PFACC     ( MM7, MM6 )		/* x0*m01+x1*m11   | x0*x00+x1*m10   */

+    PFADD     ( MM4, MM6 )		/* x0*...*m11+m31  | x0*...*m10+m30  */

+

+    MOVQ      ( MM6, REGIND(EDX) )	/* write r1, r0                      */

+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */

+

+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */

+    PFMUL     ( MM2, MM6 )		/* x1*m12          | x0*m02          */

+

+    PFMUL     ( MM3, MM7 )		/* x1*m13          | x0*m03          */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    PFACC     ( MM7, MM6 )		/* x0*m03+x1*m13   | x0*x02+x1*m12   */

+    PFADD     ( MM5, MM6 )		/* x0*...*m13+m33  | x0*...*m12+m32  */

+

+    MOVQ      ( MM6, REGOFF(8, EDX) )	/* write r3, r2                      */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPGR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPGR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_perspective )

+HIDDEN(_mesa_3dnow_transform_points2_perspective)

+GLNAME( _mesa_3dnow_transform_points2_perspective ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPPR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TPPR_2 ):

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+    MOVQ      ( MM3, REGOFF(8, EDX) )	/* write r2  (=m32), r3 (=0)         */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPPR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPPR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_3d )

+HIDDEN(_mesa_3dnow_transform_points2_3d)

+GLNAME( _mesa_3dnow_transform_points2_3d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3 ), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3R_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */

+

+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */

+

+    MOVD      ( REGOFF(8, ECX), MM2 )	/*                 | m02             */

+    PUNPCKLDQ ( REGOFF(24, ECX), MM2 )	/* m12             | m02             */

+

+    MOVQ      ( REGOFF(48, ECX), MM4 )	/* m31             | m30             */

+    MOVD      ( REGOFF(56, ECX), MM5 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TP3R_2 ):

+

+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */

+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */

+

+    PFMUL     ( MM0, MM6 )		/* x1*m10          | x0*m00          */

+    PFMUL     ( MM1, MM7 )		/* x1*m11          | x0*m01          */

+

+    PFACC     ( MM7, MM6 )		/* x0*m01+x1*m11   | x0*x00+x1*m10   */

+    PFADD     ( MM4, MM6 )		/* x0*...*m11+m31  | x0*...*m10+m30  */

+

+    MOVQ      ( MM6, REGIND(EDX) )	/* write r1, r0                      */

+    MOVQ      ( REGIND(EAX), MM6 )	/* x1              | x0              */

+

+    MOVQ      ( MM6, MM7 )		/* x1              | x0              */

+    PFMUL     ( MM2, MM6 )		/* x1*m12          | x0*m02          */

+

+    PFACC     ( MM7, MM6 )		/* ***trash***     | x0*x02+x1*m12   */

+    PFADD     ( MM5, MM6 )		/* ***trash***     | x0*...*m12+m32  */

+

+    MOVD      ( MM6, REGOFF(8, EDX) )	/* write r2                          */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP3R_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3R_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_3d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points2_3d_no_rot)

+GLNAME( _mesa_3dnow_transform_points2_3d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3 ), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3NRR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TP3NRR_2 ):

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+

+    PFADD     ( MM2, MM4 )		/* x1*m11+m31      | x0*m00+m30      */

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+

+    MOVD      ( MM3, REGOFF(8, EDX) )	/* write r2                          */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP3NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3NRR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_2d )

+HIDDEN(_mesa_3dnow_transform_points2_2d)

+GLNAME( _mesa_3dnow_transform_points2_2d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2R_3 ) )

+

+    MOVQ      ( REGIND(ECX), MM0 )	/* m01             | m00             */

+    MOVQ      ( REGOFF(16, ECX), MM1 )	/* m11             | m10             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2R_2 ):

+

+    MOVD      ( REGIND(EAX), MM4 )	/*                 | x0              */

+    MOVD      ( REGOFF(4, EAX), MM5 )	/*                 | x1              */

+

+    PUNPCKLDQ ( MM4, MM4 )		/* x0              | x0              */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    PFMUL     ( MM0, MM4 )		/* x0*m01          | x0*m00          */

+    PUNPCKLDQ ( MM5, MM5 )		/* x1              | x1              */

+

+    PFMUL     ( MM1, MM5 )		/* x1*m11          | x1*m10          */

+    PFADD     ( MM2, MM4 )		/* x...x1*m11+31   | x0*..*m10+m30   */

+

+    PFADD     ( MM5, MM4 )		/* x0*m01+x1*m11   | x0*m00+x1*m10   */

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP2R_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2R_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_2d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points2_2d_no_rot)

+GLNAME( _mesa_3dnow_transform_points2_2d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2NRR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2NRR_2 ):

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+    PFADD     ( MM2, MM4 )		/* m31             | x0*m00+m30      */

+

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r1, r0                      */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP2NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2NRR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points2_identity )

+HIDDEN(_mesa_3dnow_transform_points2_identity)

+GLNAME( _mesa_3dnow_transform_points2_identity ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(2), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPIR_3 ) )

+

+ALIGNTEXT16

+LLBL( G3TPIR_3 ):

+

+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+

+    MOVQ      ( MM0, REGIND(EDX) )	/* r1              | r0              */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPIR_3 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPIR_4 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/3dnow_xform3.S b/mesalib/src/mesa/x86/3dnow_xform3.S
new file mode 100644
index 000000000..d119fe821
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow_xform3.S
@@ -0,0 +1,561 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+#ifdef USE_3DNOW_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+    SEG_TEXT

+

+#define FRAME_OFFSET	4

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_general )

+HIDDEN(_mesa_3dnow_transform_points3_general)

+GLNAME( _mesa_3dnow_transform_points3_general ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPGR_2 ) )

+

+    PREFETCHW ( REGIND(EDX) )

+

+ALIGNTEXT16

+LLBL( G3TPGR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */

+    MOVD      ( REGOFF(8, EAX), MM2 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    MOVQ      ( MM0, MM1 )		/* x1              | x0              */

+    PUNPCKLDQ ( MM2, MM2 )		/* x2              | x2              */

+

+    PUNPCKLDQ ( MM0, MM0 )		/* x0              | x0              */

+    MOVQ      ( MM2, MM5 )		/* x2              | x2              */

+

+    PUNPCKHDQ ( MM1, MM1 )		/* x1              | x1              */

+    PFMUL     ( REGOFF(32, ECX), MM2 )	/* x2*m9           | x2*m8           */

+

+    MOVQ      ( MM0, MM3 )		/* x0              | x0              */

+    PFMUL     ( REGOFF(40, ECX), MM5 )	/* x2*m11          | x2*m10          */

+

+    MOVQ      ( MM1, MM4 )		/* x1              | x1              */

+    PFMUL     ( REGIND(ECX), MM0 )	/* x0*m1           | x0*m0           */

+

+    PFADD     ( REGOFF(48, ECX), MM2 )	/* x2*m9+m13       | x2*m8+m12       */

+    PFMUL     ( REGOFF(16, ECX), MM1 )	/* x1*m5           | x1*m4           */

+

+    PFADD     ( REGOFF(56, ECX), MM5 )	/* x2*m11+m15      | x2*m10+m14      */

+    PFADD     ( MM0, MM1 )		/* x0*m1+x1*m5     | x0*m0+x1*m4     */

+

+    PFMUL     ( REGOFF(8, ECX), MM3 )	/* x0*m3           | x0*m2           */

+    PFADD     ( MM1, MM2 )		/* r1              | r0              */

+

+    PFMUL     ( REGOFF(24, ECX), MM4 )	/* x1*m7           | x1*m6           */

+    ADD_L     ( CONST(16), EDX )	/* next output vertex                */

+

+    PFADD     ( MM3, MM4 )		/* x0*m3+x1*m7     | x0*m2+x1*m6     */

+    MOVQ      ( MM2, REGOFF(-16, EDX) )	/* write r0, r1                      */

+

+    PFADD     ( MM4, MM5 )		/* r3              | r2              */

+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPGR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPGR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_perspective )

+HIDDEN(_mesa_3dnow_transform_points3_perspective)

+GLNAME( _mesa_3dnow_transform_points3_perspective ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPPR_2 ) )

+

+    PREFETCH  ( REGIND(EAX) )

+    PREFETCHW ( REGIND(EDX) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVQ      ( REGOFF(32, ECX), MM1 )	/* m21             | m20             */

+    MOVD      ( REGOFF(40, ECX), MM2 )	/*                 | m22             */

+

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+ALIGNTEXT16

+LLBL( G3TPPR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    PXOR      ( MM7, MM7 )		/* 0               | 0               */

+    MOVQ      ( MM5, MM6 )		/*                 | x2              */

+

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+    PFSUB     ( MM5, MM7 )		/*                 | -x2             */

+

+    PFMUL     ( MM2, MM6 )		/*                 | x2*m22          */

+    PUNPCKLDQ ( MM5, MM5 )		/* x2              | x2              */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    PFMUL     ( MM1, MM5 )		/* x2*m21          | x2*m20          */

+

+    PFADD     ( MM3, MM6 )		/*                 | x2*m22+m32      */

+    PFADD     ( MM4, MM5 )		/* x1*m11+x2*m21   | x0*m00+x2*m20   */

+

+    MOVQ      ( MM5, REGOFF(-16, EDX) )	/* write r0, r1                      */

+    MOVD      ( MM6, REGOFF(-8, EDX) )	/* write r2                          */

+

+    MOVD      ( MM7, REGOFF(-4, EDX) )	/* write r3                          */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPPR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPPR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_3d )

+HIDDEN(_mesa_3dnow_transform_points3_3d)

+GLNAME( _mesa_3dnow_transform_points3_3d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3R_2 ) )

+

+    PREFETCH  ( REGIND(EAX) )

+    PREFETCH  ( REGIND(EDX) )

+

+    MOVD      ( REGOFF(8, ECX), MM7 )	/*                 | m2              */

+    PUNPCKLDQ ( REGOFF(24, ECX), MM7 )	/* m6              | m2              */

+

+

+ALIGNTEXT16

+LLBL( G3TP3R_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */

+    MOVD      ( REGOFF(8, EAX), MM1 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    MOVQ      ( MM0, MM2 )		/* x1              | x0              */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    PUNPCKLDQ ( MM2, MM2 )		/* x0              | x0              */

+    MOVQ      ( MM0, MM3 )		/* x1              | x0              */

+

+    PFMUL     ( REGIND(ECX), MM2 )	/* x0*m1           | x0*m0           */

+    PUNPCKHDQ ( MM3, MM3 )		/* x1              | x1              */

+

+    MOVQ      ( MM1, MM4 )		/*                 | x2              */

+    PFMUL     ( REGOFF(16, ECX), MM3 )	/* x1*m5           | x1*m4           */

+

+    PUNPCKLDQ ( MM4, MM4 )		/* x2              | x2              */

+    PFADD     ( MM2, MM3 )		/* x0*m1+x1*m5     | x0*m0+x1*m4     */

+

+    PFMUL     ( REGOFF(32, ECX), MM4 )	/* x2*m9           | x2*m8           */

+    PFADD     ( REGOFF(48, ECX), MM3 )	/* x0*m1+...+m11   | x0*m0+x1*m4+m12 */

+

+    PFMUL     ( MM7, MM0 )		/* x1*m6           | x0*m2           */

+    PFADD     ( MM4, MM3 )		/* r1              | r0              */

+

+    PFMUL     ( REGOFF(40, ECX), MM1 )	/*                 | x2*m10          */

+    PUNPCKLDQ ( REGOFF(56, ECX), MM1 )	/* m14             | x2*m10          */

+

+    PFACC     ( MM0, MM1 )

+

+    MOVQ      ( MM3, REGOFF(-16, EDX) )	/* write r0, r1                      */

+    PFACC     ( MM1, MM1 )		/*                 | r2              */

+

+    MOVD      ( MM1, REGOFF(-8, EDX) )	/* write r2                          */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP3R_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3R_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_3d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points3_3d_no_rot)

+GLNAME( _mesa_3dnow_transform_points3_3d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3NRR_2 ) )

+

+    PREFETCH  ( REGIND(EAX) )

+    PREFETCHW ( REGIND(EDX) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVD      ( REGOFF(40, ECX), MM2 )	/*                 | m22             */

+    PUNPCKLDQ ( MM2, MM2 )		/* m22             | m22             */

+

+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */

+    MOVD      ( REGOFF(56, ECX), MM3 )	/*                 | m32             */

+

+    PUNPCKLDQ ( MM3, MM3 )		/* m32             | m32             */

+

+

+ALIGNTEXT16

+LLBL( G3TP3NRR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCHW ( REGIND(EAX) )

+	

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+

+    PFADD     ( MM1, MM4 )		/* x1*m11+m31      | x0*m00+m30      */

+    PFMUL     ( MM2, MM5 )		/*                 | x2*m22          */

+

+    PFADD     ( MM3, MM5 )		/*                 | x2*m22+m32      */

+    MOVQ      ( MM4, REGIND(EDX) )	/* write r0, r1                      */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    MOVD      ( MM5, REGOFF(-8, EDX) )	/* write r2                          */

+    JNZ       ( LLBL( G3TP3NRR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3NRR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_2d )

+HIDDEN(_mesa_3dnow_transform_points3_2d)

+GLNAME( _mesa_3dnow_transform_points3_2d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2R_3) )

+

+    PREFETCH  ( REGIND(EAX) )

+    PREFETCHW ( REGIND(EDX) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */

+

+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2R_2 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM3 )	/* x1              | x0              */

+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    MOVQ      ( MM3, MM4 )		/* x1              | x0              */

+    PFMUL     ( MM0, MM3 )		/* x1*m10          | x0*m00          */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    PFMUL     ( MM1, MM4 )		/* x1*m11          | x0*m01          */

+

+    PFACC     ( MM4, MM3 )		/* x0*m00+x1*m10   | x0*m01+x1*m11   */

+    MOVD      ( MM5, REGOFF(-8, EDX) )	/* write r2 (=x2)                    */

+

+    PFADD     ( MM2, MM3 )		/* x0*...*m10+m30  | x0*...*m11+m31  */

+    MOVQ      ( MM3, REGOFF(-16, EDX) )	/* write r0, r1                      */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP2R_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2R_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_2d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points3_2d_no_rot)

+GLNAME( _mesa_3dnow_transform_points3_2d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2NRR_2 ) )

+

+    PREFETCH  ( REGIND(EAX) )

+    PREFETCHW ( REGIND(EDX) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */

+

+

+ALIGNTEXT16

+LLBL( G3TP2NRR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    MOVD      ( REGOFF(8, EAX), MM5 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    PFADD     ( MM1, MM4 )		/* x1*m11+m31      | x0*m00+m30      */

+

+    MOVQ      ( MM4, REGOFF(-16, EDX) )	/* write r0, r1                      */

+    MOVD      ( MM5, REGOFF(-8, EDX) )	/* write r2 (=x2)                    */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP2NRR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2NRR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points3_identity )

+HIDDEN(_mesa_3dnow_transform_points3_identity)

+GLNAME( _mesa_3dnow_transform_points3_identity ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(3), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPIR_2 ) )

+

+    PREFETCHW ( REGIND(EDX) )

+

+ALIGNTEXT16

+LLBL( G3TPIR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )

+

+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */

+    MOVD      ( REGOFF(8, EAX), MM1 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    MOVQ      ( MM0, REGOFF(-16, EDX) )	/* r1              | r0              */

+

+    MOVD      ( MM1, REGOFF(-8, EDX) )	/*                 | r2              */

+    JNZ       ( LLBL( G3TPIR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPIR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/3dnow_xform4.S b/mesalib/src/mesa/x86/3dnow_xform4.S
new file mode 100644
index 000000000..3a9b97160
--- /dev/null
+++ b/mesalib/src/mesa/x86/3dnow_xform4.S
@@ -0,0 +1,570 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+#ifdef USE_3DNOW_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+    SEG_TEXT

+

+#define FRAME_OFFSET	4

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_general )

+HIDDEN(_mesa_3dnow_transform_points4_general)

+GLNAME( _mesa_3dnow_transform_points4_general ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPGR_2 ) )

+

+    PREFETCHW ( REGIND(EDX) )

+

+ALIGNTEXT16

+LLBL( G3TPGR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM0 )	/* x1            | x0                */

+    MOVQ      ( REGOFF(8, EAX), MM4 )	/* x3            | x2                */

+	

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+	

+    MOVQ      ( MM0, MM2 )		/* x1              | x0              */

+    MOVQ      ( MM4, MM6 )		/* x3              | x2              */

+

+    PUNPCKLDQ ( MM0, MM0 )		/* x0              | x0              */

+    PUNPCKHDQ ( MM2, MM2 )		/* x1              | x1              */

+

+    MOVQ      ( MM0, MM1 )		/* x0              | x0              */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    PFMUL     ( REGIND(ECX), MM0 )	/* x0*m1           | x0*m0           */

+    MOVQ      ( MM2, MM3 )		/* x1              | x1              */

+

+    PFMUL     ( REGOFF(8, ECX), MM1 )	/* x0*m3           | x0*m2           */

+    PUNPCKLDQ ( MM4, MM4 )		/* x2              | x2              */

+

+    PFMUL     ( REGOFF(16, ECX), MM2 )	/* x1*m5           | x1*m4           */

+    MOVQ      ( MM4, MM5 )		/* x2              | x2              */

+

+    PFMUL     ( REGOFF(24, ECX), MM3 )	/* x1*m7           | x1*m6           */

+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */

+

+    PFMUL     ( REGOFF(32, ECX), MM4 )	/* x2*m9           | x2*m8           */

+    MOVQ      ( MM6, MM7 )		/* x3              | x3              */

+

+    PFMUL     ( REGOFF(40, ECX), MM5 )	/* x2*m11          | x2*m10          */

+    PFADD     ( MM0, MM2 )

+

+    PFMUL     ( REGOFF(48, ECX), MM6 )	/* x3*m13          | x3*m12          */

+    PFADD     ( MM1, MM3 )

+

+    PFMUL     ( REGOFF(56, ECX), MM7 )	/* x3*m15          | x3*m14          */

+    PFADD     ( MM4, MM6 )

+

+    PFADD     ( MM5, MM7 )

+    PFADD     ( MM2, MM6 )

+

+    PFADD     ( MM3, MM7 )

+    MOVQ      ( MM6, REGOFF(-16, EDX) )

+

+    MOVQ      ( MM7, REGOFF(-8, EDX) )

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPGR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPGR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_perspective )

+HIDDEN(_mesa_3dnow_transform_points4_perspective)

+GLNAME( _mesa_3dnow_transform_points4_perspective ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPPR_2 ) )

+

+    PREFETCH  ( REGIND(EAX) )

+    PREFETCHW ( REGIND(EDX) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVD      ( REGOFF(40, ECX), MM1 )	/*                 | m22             */

+    PUNPCKLDQ ( REGOFF(56, ECX), MM1 )	/* m32             | m22             */

+

+    MOVQ      ( REGOFF(32, ECX), MM2 )	/* m21             | m20             */

+    PXOR      ( MM7, MM7 )		/* 0               | 0               */

+

+ALIGNTEXT16

+LLBL( G3TPPR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */

+    MOVD      ( REGOFF(8, EAX), MM3 )	/*                 | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGOFF(32, EAX) )	/* hopefully stride is zero          */

+

+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+

+    PUNPCKLDQ ( MM5, MM5 )		/* x2              | x2              */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    PFMUL     ( MM2, MM5 )		/* x2*m21          | x2*m20          */

+    PFSUBR    ( MM7, MM3 )		/*                 | -x2             */

+

+    PFMUL     ( MM1, MM6 )		/* x3*m32          | x2*m22          */

+    PFADD     ( MM4, MM5 )		/* x1*m11+x2*m21   | x0*m00+x2*m20   */

+

+    PFACC     ( MM3, MM6 )		/* -x2             | x2*m22+x3*m32   */

+    MOVQ      ( MM5, REGOFF(-16, EDX) )	/* write r0, r1                      */

+

+    MOVQ      ( MM6, REGOFF(-8, EDX) )	/* write r2, r3                      */

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TPPR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPPR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_3d )

+HIDDEN(_mesa_3dnow_transform_points4_3d)

+GLNAME( _mesa_3dnow_transform_points4_3d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3R_2 ) )

+

+    MOVD      ( REGOFF(8, ECX), MM6 )	/*                 | m2              */

+    PUNPCKLDQ ( REGOFF(24, ECX), MM6 )	/* m6              | m2              */

+

+    MOVD      ( REGOFF(40, ECX), MM7 )	/*                 | m10             */

+    PUNPCKLDQ ( REGOFF(56, ECX), MM7 )	/* m14             | m10             */

+

+ALIGNTEXT16

+LLBL( G3TP3R_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+    PREFETCH  ( REGOFF(32, EAX) )	/* hopefully array is tightly packed */

+

+    MOVQ      ( REGIND(EAX), MM2 )	/* x1              | x0              */

+    MOVQ      ( REGOFF(8, EAX), MM3 )	/* x3              | x2              */

+

+    MOVQ      ( MM2, MM0 )		/* x1              | x0              */

+    MOVQ      ( MM3, MM4 )		/* x3              | x2              */

+

+    MOVQ      ( MM0, MM1 )		/* x1              | x0              */

+    MOVQ      ( MM4, MM5 )		/* x3              | x2              */

+

+    PUNPCKLDQ ( MM0, MM0 )		/* x0              | x0              */

+    PUNPCKHDQ ( MM1, MM1 )		/* x1              | x1              */

+

+    PFMUL     ( REGIND(ECX), MM0 )	/* x0*m1           | x0*m0           */

+    PUNPCKLDQ ( MM3, MM3 )		/* x2              | x2              */

+

+    PFMUL     ( REGOFF(16, ECX), MM1 )	/* x1*m5           | x1*m4           */

+    PUNPCKHDQ ( MM4, MM4 )		/* x3              | x3              */

+

+    PFMUL     ( MM6, MM2 )		/* x1*m6           | x0*m2           */

+    PFADD     ( MM0, MM1 )		/* x0*m1+x1*m5     | x0*m0+x1*m4     */

+

+    PFMUL     ( REGOFF(32, ECX), MM3 )	/* x2*m9           | x2*m8           */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    PFMUL     ( REGOFF(48, ECX), MM4 )	/* x3*m13          | x3*m12          */

+    PFADD     ( MM1, MM3 )		/* x0*m1+..+x2*m9  | x0*m0+...+x2*m8 */

+

+    PFMUL     ( MM7, MM5 )		/* x3*m14          | x2*m10          */

+    PFADD     ( MM3, MM4 )		/* r1              | r0              */

+

+    PFACC     ( MM2, MM5 )		/* x0*m2+x1*m6     | x2*m10+x3*m14   */

+    MOVD      ( REGOFF(12, EAX), MM0 )	/*                 | x3              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PFACC     ( MM0, MM5 )		/* r3              | r2              */

+

+    MOVQ      ( MM4, REGOFF(-16, EDX) )	/* write r0, r1                      */

+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP3R_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3R_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_3d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points4_3d_no_rot)

+GLNAME( _mesa_3dnow_transform_points4_3d_no_rot ):

+

+    PUSH_L    ( ESI )

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP3NRR_2 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVD      ( REGOFF(40, ECX), MM2 )	/*                 | m22             */

+    PUNPCKLDQ ( REGOFF(56, ECX), MM2 )	/* m32             | m22             */

+

+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP3NRR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */

+    MOVD      ( REGOFF(12, EAX), MM7 )	/*                 | x3              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGOFF(32, EAX) )	/* hopefully stride is zero          */

+

+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+

+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */

+    PFMUL     ( MM2, MM5 )		/* x3*m32          | x2*m22          */

+

+    PFMUL     ( MM1, MM6 )		/* x3*m31          | x3*m30          */

+    PFACC     ( MM7, MM5 )		/* x3              | x2*m22+x3*m32   */

+

+    PFADD     ( MM6, MM4 )		/* x1*m11+x3*m31   | x0*m00+x3*m30   */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    MOVQ      ( MM4, REGOFF(-16, EDX) )	/* write r0, r1                      */

+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP3NRR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP3NRR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_2d )

+HIDDEN(_mesa_3dnow_transform_points4_2d)

+GLNAME( _mesa_3dnow_transform_points4_2d ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2R_2 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(16, ECX), MM0 )	/* m10             | m00             */

+

+    MOVD      ( REGOFF(4, ECX), MM1 )	/*                 | m01             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM1 )	/* m11             | m01             */

+

+    MOVQ      ( REGOFF(48, ECX), MM2 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2R_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM3 )	/* x1              | x0              */

+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    MOVQ      ( MM3, MM4 )		/* x1              | x0              */

+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */

+

+    PFMUL     ( MM1, MM4 )		/* x1*m11          | x0*m01          */

+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */

+

+    PFMUL     ( MM0, MM3 )		/* x1*m10          | x0*m00          */

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+

+    PFACC     ( MM4, MM3 )		/* x0*m01+x1*m11   | x0*m00+x1*m10   */

+    PFMUL     ( MM2, MM6 )		/* x3*m31          | x3*m30          */

+

+    PFADD     ( MM6, MM3 )		/* r1              | r0              */

+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */

+

+    MOVQ      ( MM3, REGOFF(-16, EDX) )	/* write r0, r1                      */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TP2R_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2R_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_2d_no_rot )

+HIDDEN(_mesa_3dnow_transform_points4_2d_no_rot)

+GLNAME( _mesa_3dnow_transform_points4_2d_no_rot ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TP2NRR_3 ) )

+

+    MOVD      ( REGIND(ECX), MM0 )	/*                 | m00             */

+    PUNPCKLDQ ( REGOFF(20, ECX), MM0 )	/* m11             | m00             */

+

+    MOVQ      ( REGOFF(48, ECX), MM1 )	/* m31             | m30             */

+

+ALIGNTEXT16

+LLBL( G3TP2NRR_2 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )	/* prefetch 2 vertices ahead         */

+

+    MOVQ      ( REGIND(EAX), MM4 )	/* x1              | x0              */

+    MOVQ      ( REGOFF(8, EAX), MM5 )	/* x3              | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    PFMUL     ( MM0, MM4 )		/* x1*m11          | x0*m00          */

+    MOVQ      ( MM5, MM6 )		/* x3              | x2              */

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    PUNPCKHDQ ( MM6, MM6 )		/* x3              | x3              */

+

+    PFMUL     ( MM1, MM6 )		/* x3*m31          | x3*m30          */

+    PFADD     ( MM4, MM6 )		/* x1*m11+x3*m31   | x0*m00+x3*m30   */

+

+    MOVQ      ( MM6, REGOFF(-16, EDX) )	/* write r0, r1                      */

+    MOVQ      ( MM5, REGOFF(-8, EDX) )	/* write r2, r3                      */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+

+    JNZ       ( LLBL( G3TP2NRR_2 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TP2NRR_3 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_3dnow_transform_points4_identity )

+HIDDEN(_mesa_3dnow_transform_points4_identity)

+GLNAME( _mesa_3dnow_transform_points4_identity ):

+

+    PUSH_L    ( ESI )

+

+    MOV_L     ( ARG_DEST, ECX )

+    MOV_L     ( ARG_MATRIX, ESI )

+    MOV_L     ( ARG_SOURCE, EAX )

+    MOV_L     ( CONST(4), REGOFF(V4F_SIZE, ECX) )

+    OR_B      ( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, ECX) )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), EDX )

+    MOV_L     ( EDX, REGOFF(V4F_COUNT, ECX) )

+

+    PUSH_L    ( EDI )

+

+    MOV_L     ( REGOFF(V4F_START, ECX), EDX )

+    MOV_L     ( ESI, ECX )

+    MOV_L     ( REGOFF(V4F_COUNT, EAX), ESI )

+    MOV_L     ( REGOFF(V4F_STRIDE, EAX), EDI )

+    MOV_L     ( REGOFF(V4F_START, EAX), EAX )

+

+    TEST_L    ( ESI, ESI )

+    JZ        ( LLBL( G3TPIR_2 ) )

+

+ALIGNTEXT16

+LLBL( G3TPIR_1 ):

+

+    PREFETCHW ( REGOFF(32, EDX) )       /* prefetch 2 vertices ahead         */

+	

+    MOVQ      ( REGIND(EAX), MM0 )	/* x1              | x0              */

+    MOVQ      ( REGOFF(8, EAX), MM1 )	/* x3              | x2              */

+

+    ADD_L     ( EDI, EAX )		/* next vertex                       */

+    PREFETCH  ( REGIND(EAX) )

+

+    ADD_L     ( CONST(16), EDX )	/* next r                            */

+    MOVQ      ( MM0, REGOFF(-16, EDX) )	/* r1              | r0              */

+

+    MOVQ      ( MM1, REGOFF(-8, EDX) )	/* r3              | r2              */

+

+    DEC_L     ( ESI )			/* decrement vertex counter          */

+    JNZ       ( LLBL( G3TPIR_1 ) )	/* cnt > 0 ? -> process next vertex  */

+

+LLBL( G3TPIR_2 ):

+

+    FEMMS

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/Makefile b/mesalib/src/mesa/x86/Makefile
new file mode 100644
index 000000000..8cbe26015
--- /dev/null
+++ b/mesalib/src/mesa/x86/Makefile
@@ -0,0 +1,46 @@
+# src/mesa/x86/Makefile

+

+TOP = ../../..

+include $(TOP)/configs/current

+

+

+INCLUDE_DIRS = \

+	-I$(TOP)/include/GL \

+	-I$(TOP)/include \

+	-I$(TOP)/src/mapi \

+	-I.. \

+	-I../main \

+	-I../math \

+	-I../tnl

+

+

+default: gen_matypes matypes.h

+

+clean:

+	-rm -f matypes.h gen_matypes

+

+

+gen_matypes: gen_matypes.c

+	$(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes

+

+# need some special rules here, unfortunately

+matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes

+	./gen_matypes > matypes.h

+

+common_x86_asm.o: matypes.h

+3dnow_normal.o: matypes.h

+3dnow_xform1.o: matypes.h

+3dnow_xform2.o: matypes.h

+3dnow_xform3.o: matypes.h

+3dnow_xform4.o: matypes.h

+mmx_blend.o: matypes.h

+sse_normal.o: matypes.h

+sse_xform1.o: matypes.h

+sse_xform2.o: matypes.h

+sse_xform3.o: matypes.h

+sse_xform4.o: matypes.h

+x86_cliptest.o: matypes.h

+x86_xform2.o: matypes.h

+x86_xform3.o: matypes.h

+x86_xform4.o: matypes.h

+

diff --git a/mesalib/src/mesa/x86/assyntax.h b/mesalib/src/mesa/x86/assyntax.h
new file mode 100644
index 000000000..1e3ea66e2
--- /dev/null
+++ b/mesalib/src/mesa/x86/assyntax.h
@@ -0,0 +1,1747 @@
+

+#ifndef __ASSYNTAX_H__

+#define __ASSYNTAX_H__

+

+/*

+ * Copyright 1992 Vrije Universiteit, The Netherlands

+ *

+ * Permission to use, copy, modify, and distribute this software and its

+ * documentation for any purpose and without fee is hereby granted, provided

+ * that the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of the Vrije Universiteit not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  The Vrije Universiteit makes no

+ * representations about the suitability of this software for any purpose.

+ * It is provided "as is" without express or implied warranty.

+ *

+ * The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS

+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,

+ * IN NO EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL,

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

+ */

+

+/*

+ * assyntax.h

+ *

+ * Select the syntax appropriate to the 386 assembler being used

+ * To add support for more assemblers add more columns to the CHOICE

+ * macro.  Note that register names must also have uppercase names

+ * to avoid macro recursion. e.g., #define ah %ah recurses!

+ *

+ * NB 1.  Some of the macros for certain assemblers imply that the code is to

+ *	  run in protected mode!!  Caveat emptor.

+ *

+ * NB 2.  486 specific instructions are not included.  This is to discourage

+ *	  their accidental use in code that is intended to run on 386 and 486

+ *	  systems.

+ *

+ * Supported assemblers:

+ *

+ * (a) AT&T SysVr4 as(1):	define ATT_ASSEMBLER

+ * (b) GNU Assembler gas:	define GNU_ASSEMBLER (default)

+ * (c) Amsterdam Compiler kit:	define ACK_ASSEMBLER

+ * (d) The Netwide Assembler:	define NASM_ASSEMBLER

+ * (e) Microsoft Assembler:	define MASM_ASSEMBLER (UNTESTED!)

+ *

+ * The following naming conventions have been used to identify the various

+ * data types:

+ *		_SR = segment register version

+ *	Integer:

+ *		_Q = quadword	= 64 bits

+ *		_L = long	= 32 bits

+ *		_W = short	= 16 bits

+ *		_B = byte	=  8 bits

+ *	Floating-point:

+ *		_X = m80real	= 80 bits

+ *		_D = double	= 64 bits

+ *		_S = single	= 32 bits

+ *

+ * Author: Gregory J. Sharp, Sept 1992

+ *         Vrije Universiteit, Amsterdam, The Netherlands

+ *

+ *         [support for Intel syntax added by Josh Vanderhoof, 1999]

+ */

+

+#if !(defined(NASM_ASSEMBLER) || defined(MASM_ASSEMBLER))

+

+/* Default to ATT_ASSEMBLER when SVR4 or SYSV are defined */

+#if (defined(SVR4) || defined(SYSV)) && !defined(GNU_ASSEMBLER)

+#define ATT_ASSEMBLER

+#endif

+

+#if !defined(ATT_ASSEMBLER) && !defined(GNU_ASSEMBLER) && !defined(ACK_ASSEMBLER)

+#define GNU_ASSEMBLER

+#endif

+

+#if (defined(__STDC__) && !defined(UNIXCPP)) || (defined (sun) && defined (i386) && defined (SVR4) && defined (__STDC__) && !defined (__GNUC__))

+#define CONCAT(x, y)		x ## y

+#define CONCAT3(x, y, z)	x ## y ## z

+#else

+#define CONCAT(x, y)		x/**/y

+#define CONCAT3(x, y, z)	x/**/y/**/z

+#endif

+

+#ifdef ACK_ASSEMBLER

+

+/* Assume we write code for 32-bit protected mode! */

+

+/* Redefine register names for GAS & AT&T assemblers */

+#define AL		al

+#define AH		ah

+#define AX		ax

+#define EAX		ax

+#define BL		bl

+#define BH		bh

+#define BX		bx

+#define EBX		bx

+#define CL		cl

+#define CH		ch

+#define CX		cx

+#define ECX		cx

+#define DL		dl

+#define DH		dh

+#define DX		dx

+#define EDX		dx

+#define BP		bp

+#define EBP		bp

+#define SI		si

+#define ESI		si

+#define DI		di

+#define EDI		di

+#define SP		sp

+#define ESP		sp

+#define CS		cs

+#define SS		ss

+#define DS		ds

+#define ES		es

+#define FS		fs

+#define GS		gs

+/* Control Registers */

+#define CR0		cr0

+#define CR1		cr1

+#define CR2		cr2

+#define CR3		cr3

+/* Debug Registers */

+#define DR0		dr0

+#define DR1		dr1

+#define DR2		dr2

+#define DR3		dr3

+#define DR4		dr4

+#define DR5		dr5

+#define DR6		dr6

+#define DR7		dr7

+/* Floating-point Stack */

+#define ST		st

+

+#define AS_BEGIN	.sect .text; .sect .rom; .sect .data; .sect .bss; .sect .text

+

+

+#define _WTOG		o16	/* word toggle for _W instructions */

+#define _LTOG			/* long toggle for _L instructions */

+#define ADDR_TOGGLE	a16

+#define OPSZ_TOGGLE	o16

+#define USE16		.use16

+#define USE32		.use32

+

+#define CHOICE(a,b,c)	c

+

+#else /* AT&T or GAS */

+

+/* Redefine register names for GAS & AT&T assemblers */

+#define AL		%al

+#define AH		%ah

+#define AX		%ax

+#define EAX		%eax

+#define BL		%bl

+#define BH		%bh

+#define BX		%bx

+#define EBX		%ebx

+#define CL		%cl

+#define CH		%ch

+#define CX		%cx

+#define ECX		%ecx

+#define DL		%dl

+#define DH		%dh

+#define DX		%dx

+#define EDX		%edx

+#define BP		%bp

+#define EBP		%ebp

+#define SI		%si

+#define ESI		%esi

+#define DI		%di

+#define EDI		%edi

+#define SP		%sp

+#define ESP		%esp

+#define CS		%cs

+#define SS		%ss

+#define DS		%ds

+#define ES		%es

+#define FS		%fs

+#define GS		%gs

+/* Control Registers */

+#define CR0		%cr0

+#define CR1		%cr1

+#define CR2		%cr2

+#define CR3		%cr3

+/* Debug Registers */

+#define DR0		%db0

+#define DR1		%db1

+#define DR2		%db2

+#define DR3		%db3

+#define DR4		%db4

+#define DR5		%db5

+#define DR6		%db6

+#define DR7		%db7

+/* Floating-point Stack */

+#define _STX0		%st(0)

+#define _STX1		%st(1)

+#define _STX2		%st(2)

+#define _STX3		%st(3)

+#define _STX4		%st(4)

+#define _STX5		%st(5)

+#define _STX6		%st(6)

+#define _STX7		%st(7)

+#define ST(x)		CONCAT(_STX,x)

+#ifdef GNU_ASSEMBLER

+#define ST0		%st(0)

+#else

+#define ST0		%st

+#endif

+/* MMX Registers */

+#define MM0		%mm0

+#define MM1		%mm1

+#define MM2		%mm2

+#define MM3		%mm3

+#define MM4		%mm4

+#define MM5		%mm5

+#define MM6		%mm6

+#define MM7		%mm7

+/* SSE Registers */

+#define XMM0		%xmm0

+#define XMM1		%xmm1

+#define XMM2		%xmm2

+#define XMM3		%xmm3

+#define XMM4		%xmm4

+#define XMM5		%xmm5

+#define XMM6		%xmm6

+#define XMM7		%xmm7

+

+#define AS_BEGIN

+#define USE16

+#define USE32

+

+#ifdef GNU_ASSEMBLER

+

+#define ADDR_TOGGLE	aword

+#define OPSZ_TOGGLE	word

+

+#define CHOICE(a,b,c)	b

+

+#else

+/*

+ * AT&T ASSEMBLER SYNTAX

+ * *********************

+ */

+#define CHOICE(a,b,c)	a

+

+#define ADDR_TOGGLE	addr16

+#define OPSZ_TOGGLE	data16

+

+#endif /* GNU_ASSEMBLER */

+#endif /* ACK_ASSEMBLER */

+

+

+#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__)

+#define GLNAME(a)	a

+#else

+#define GLNAME(a)	CONCAT(_,a)

+#endif

+

+

+	/****************************************/

+	/*					*/

+	/*	Select the various choices	*/

+	/*					*/

+	/****************************************/

+

+

+/* Redefine assembler directives */

+/*********************************/

+#define GLOBL		CHOICE(.globl, .globl, .extern)

+#define GLOBAL		GLOBL

+#define EXTERN		GLOBL

+#ifndef __AOUT__

+#define ALIGNTEXT32	CHOICE(.align 32, .balign 32, .align 32)

+#define ALIGNTEXT16	CHOICE(.align 16, .balign 16, .align 16)

+#define ALIGNTEXT8	CHOICE(.align 8, .balign 8, .align 8)

+#define ALIGNTEXT4	CHOICE(.align 4, .balign 4, .align 4)

+#define ALIGNTEXT2	CHOICE(.align 2, .balign 2, .align 2)

+/* ALIGNTEXT4ifNOP is the same as ALIGNTEXT4, but only if the space is

+ * guaranteed to be filled with NOPs.  Otherwise it does nothing.

+ */

+#define ALIGNTEXT32ifNOP	CHOICE(.align 32, .balign ARG2(32,0x90), /*can't do it*/)

+#define ALIGNTEXT16ifNOP	CHOICE(.align 16, .balign ARG2(16,0x90), /*can't do it*/)

+#define ALIGNTEXT8ifNOP	CHOICE(.align 8, .balign ARG2(8,0x90), /*can't do it*/)

+#define ALIGNTEXT4ifNOP	CHOICE(.align 4, .balign ARG2(4,0x90), /*can't do it*/)

+#define ALIGNDATA32	CHOICE(.align 32, .balign ARG2(32,0x0), .align 32)

+#define ALIGNDATA16	CHOICE(.align 16, .balign ARG2(16,0x0), .align 16)

+#define ALIGNDATA8	CHOICE(.align 8, .balign ARG2(8,0x0), .align 8)

+#define ALIGNDATA4	CHOICE(.align 4, .balign ARG2(4,0x0), .align 4)

+#define ALIGNDATA2	CHOICE(.align 2, .balign ARG2(2,0x0), .align 2)

+#else

+/* 'as -aout' on FreeBSD doesn't have .balign */

+#define ALIGNTEXT32	CHOICE(.align 32, .align ARG2(5,0x90), .align 32)

+#define ALIGNTEXT16	CHOICE(.align 16, .align ARG2(4,0x90), .align 16)

+#define ALIGNTEXT8	CHOICE(.align 8, .align ARG2(3,0x90), .align 8)

+#define ALIGNTEXT4	CHOICE(.align 4, .align ARG2(2,0x90), .align 4)

+#define ALIGNTEXT2	CHOICE(.align 2, .align ARG2(1,0x90), .align 2)

+/* ALIGNTEXT4ifNOP is the same as ALIGNTEXT4, but only if the space is

+ * guaranteed to be filled with NOPs.  Otherwise it does nothing.

+ */

+#define ALIGNTEXT32ifNOP	CHOICE(.align 32, .align ARG2(5,0x90), /*can't do it*/)

+#define ALIGNTEXT16ifNOP	CHOICE(.align 16, .align ARG2(4,0x90), /*can't do it*/)

+#define ALIGNTEXT8ifNOP	CHOICE(.align 8, .align ARG2(3,0x90), /*can't do it*/)

+#define ALIGNTEXT4ifNOP	CHOICE(.align 4, .align ARG2(2,0x90), /*can't do it*/)

+#define ALIGNDATA32	CHOICE(.align 32, .align ARG2(5,0x0), .align 32)

+#define ALIGNDATA16	CHOICE(.align 16, .align ARG2(4,0x0), .align 16)

+#define ALIGNDATA8	CHOICE(.align 8, .align ARG2(3,0x0), .align 8)

+#define ALIGNDATA4	CHOICE(.align 4, .align ARG2(2,0x0), .align 4)

+#define ALIGNDATA2	CHOICE(.align 2, .align ARG2(1,0x0), .align 2)

+#endif /* __AOUT__ */

+#define FILE(s)		CHOICE(.file s, .file s, .file s)

+#define STRING(s)	CHOICE(.string s, .asciz s, .asciz s)

+#define D_LONG		CHOICE(.long, .long, .data4)

+#define D_WORD		CHOICE(.value, .short, .data2)

+#define D_BYTE		CHOICE(.byte, .byte, .data1)

+#define SPACE		CHOICE(.comm, .space, .space)

+#define COMM		CHOICE(.comm, .comm, .comm)

+#define SEG_DATA	CHOICE(.data, .data, .sect .data)

+#define SEG_TEXT	CHOICE(.text, .text, .sect .text)

+#define SEG_BSS		CHOICE(.bss, .bss, .sect .bss)

+

+#ifdef GNU_ASSEMBLER

+#define D_SPACE(n)	. = . + n

+#else

+#define D_SPACE(n)	.space n

+#endif

+

+/* Addressing Modes */

+/* Immediate Mode */

+#define ADDR(a)		CHOICE(CONCAT($,a), $a, a)

+#define CONST(a)	CHOICE(CONCAT($,a), $a, a)

+

+/* Indirect Mode */

+#define CONTENT(a)	CHOICE(a, a, (a))	 /* take contents of variable */

+#define REGIND(a)	CHOICE((a), (a), (a))	 /* Register a indirect */

+/* Register b indirect plus displacement a */

+#define REGOFF(a, b)	CHOICE(a(b), a(b), a(b))

+/* Reg indirect Base + Index + Displacement  - this is mainly for 16-bit mode

+ * which has no scaling

+ */

+#define REGBID(b,i,d)	CHOICE(d(b,i), d(b,i), d(b)(i))

+/* Reg indirect Base + (Index * Scale) */

+#define REGBIS(b,i,s)	CHOICE((b,i,s), (b,i,s), (b)(i*s))

+/* Reg indirect Base + (Index * Scale) + Displacement */

+#define REGBISD(b,i,s,d) CHOICE(d(b,i,s), d(b,i,s), d(b)(i*s))

+/* Displaced Scaled Index: */

+#define REGDIS(d,i,s)	CHOICE(d(,i,s), d(,i,s), d(i * s))

+/* Indexed Base: */

+#define REGBI(b,i)	CHOICE((b,i), (b,i), (b)(i))

+/* Displaced Base: */

+#define REGDB(d,b)	CHOICE(d(b), d(b), d(b))

+/* Variable indirect: */

+#define VARINDIRECT(var) CHOICE(*var, *var, (var))

+/* Use register contents as jump/call target: */

+#define CODEPTR(reg)	CHOICE(*reg, *reg, reg)

+

+/* For expressions requiring bracketing

+ * eg. (CRT0_PM | CRT_EM)

+ */

+

+#define EXPR(a)		CHOICE([a], (a), [a])

+#define ENOT(a)		CHOICE(0!a, ~a, ~a)

+#define EMUL(a,b)	CHOICE(a\*b, a*b, a*b)

+#define EDIV(a,b)	CHOICE(a\/b, a/b, a/b)

+

+/*

+ * We have to beat the problem of commas within arguments to choice.

+ * eg. choice (add a,b, add b,a) will get argument mismatch.  Luckily ANSI

+ * and other known cpp definitions evaluate arguments before substitution

+ * so the following works.

+ */

+#define ARG2(a, b)	a,b

+#define ARG3(a,b,c)	a,b,c

+

+/* Redefine assembler commands */

+#define AAA		CHOICE(aaa, aaa, aaa)

+#define AAD		CHOICE(aad, aad, aad)

+#define AAM		CHOICE(aam, aam, aam)

+#define AAS		CHOICE(aas, aas, aas)

+#define ADC_L(a, b)	CHOICE(adcl ARG2(a,b), adcl ARG2(a,b), _LTOG adc ARG2(b,a))

+#define ADC_W(a, b)	CHOICE(adcw ARG2(a,b), adcw ARG2(a,b), _WTOG adc ARG2(b,a))

+#define ADC_B(a, b)	CHOICE(adcb ARG2(a,b), adcb ARG2(a,b), adcb ARG2(b,a))

+#define ADD_L(a, b)	CHOICE(addl ARG2(a,b), addl ARG2(a,b), _LTOG add ARG2(b,a))

+#define ADD_W(a, b)	CHOICE(addw ARG2(a,b), addw ARG2(a,b), _WTOG add ARG2(b,a))

+#define ADD_B(a, b)	CHOICE(addb ARG2(a,b), addb ARG2(a,b), addb ARG2(b,a))

+#define AND_L(a, b)	CHOICE(andl ARG2(a,b), andl ARG2(a,b), _LTOG and ARG2(b,a))

+#define AND_W(a, b)	CHOICE(andw ARG2(a,b), andw ARG2(a,b), _WTOG and ARG2(b,a))

+#define AND_B(a, b)	CHOICE(andb ARG2(a,b), andb ARG2(a,b), andb ARG2(b,a))

+#define ARPL(a,b)	CHOICE(arpl ARG2(a,b), arpl ARG2(a,b), arpl ARG2(b,a))

+#define BOUND_L(a, b)	CHOICE(boundl ARG2(a,b), boundl ARG2(b,a), _LTOG bound ARG2(b,a))

+#define BOUND_W(a, b)	CHOICE(boundw ARG2(a,b), boundw ARG2(b,a), _WTOG bound ARG2(b,a))

+#define BSF_L(a, b)	CHOICE(bsfl ARG2(a,b), bsfl ARG2(a,b), _LTOG bsf ARG2(b,a))

+#define BSF_W(a, b)	CHOICE(bsfw ARG2(a,b), bsfw ARG2(a,b), _WTOG bsf ARG2(b,a))

+#define BSR_L(a, b)	CHOICE(bsrl ARG2(a,b), bsrl ARG2(a,b), _LTOG bsr ARG2(b,a))

+#define BSR_W(a, b)	CHOICE(bsrw ARG2(a,b), bsrw ARG2(a,b), _WTOG bsr ARG2(b,a))

+#define BT_L(a, b)	CHOICE(btl ARG2(a,b), btl ARG2(a,b), _LTOG bt ARG2(b,a))

+#define BT_W(a, b)	CHOICE(btw ARG2(a,b), btw ARG2(a,b), _WTOG bt ARG2(b,a))

+#define BTC_L(a, b)	CHOICE(btcl ARG2(a,b), btcl ARG2(a,b), _LTOG btc ARG2(b,a))

+#define BTC_W(a, b)	CHOICE(btcw ARG2(a,b), btcw ARG2(a,b), _WTOG btc ARG2(b,a))

+#define BTR_L(a, b)	CHOICE(btrl ARG2(a,b), btrl ARG2(a,b), _LTOG btr ARG2(b,a))

+#define BTR_W(a, b)	CHOICE(btrw ARG2(a,b), btrw ARG2(a,b), _WTOG btr ARG2(b,a))

+#define BTS_L(a, b)	CHOICE(btsl ARG2(a,b), btsl ARG2(a,b), _LTOG bts ARG2(b,a))

+#define BTS_W(a, b)	CHOICE(btsw ARG2(a,b), btsw ARG2(a,b), _WTOG bts ARG2(b,a))

+#define CALL(a)		CHOICE(call a, call a, call a)

+#define CALLF(s,a)	CHOICE(lcall ARG2(s,a), lcall ARG2(s,a), callf s:a)

+#define CBW		CHOICE(cbtw, cbw, cbw)

+#define CWDE		CHOICE(cwtd, cwde, cwde)

+#define CLC		CHOICE(clc, clc, clc)

+#define CLD		CHOICE(cld, cld, cld)

+#define CLI		CHOICE(cli, cli, cli)

+#define CLTS		CHOICE(clts, clts, clts)

+#define CMC		CHOICE(cmc, cmc, cmc)

+#define CMP_L(a, b)	CHOICE(cmpl ARG2(a,b), cmpl ARG2(a,b), _LTOG cmp ARG2(b,a))

+#define CMP_W(a, b)	CHOICE(cmpw ARG2(a,b), cmpw ARG2(a,b), _WTOG cmp ARG2(b,a))

+#define CMP_B(a, b)	CHOICE(cmpb ARG2(a,b), cmpb ARG2(a,b), cmpb ARG2(b,a))

+#define CMPS_L		CHOICE(cmpsl, cmpsl, _LTOG cmps)

+#define CMPS_W		CHOICE(cmpsw, cmpsw, _WTOG cmps)

+#define CMPS_B		CHOICE(cmpsb, cmpsb, cmpsb)

+#define CWD		CHOICE(cwtl, cwd, cwd)

+#define CDQ		CHOICE(cltd, cdq, cdq)

+#define DAA		CHOICE(daa, daa, daa)

+#define DAS		CHOICE(das, das, das)

+#define DEC_L(a)	CHOICE(decl a, decl a, _LTOG dec a)

+#define DEC_W(a)	CHOICE(decw a, decw a, _WTOG dec a)

+#define DEC_B(a)	CHOICE(decb a, decb a, decb a)

+#define DIV_L(a)	CHOICE(divl a, divl a, div a)

+#define DIV_W(a)	CHOICE(divw a, divw a, div a)

+#define DIV_B(a)	CHOICE(divb a, divb a, divb a)

+#define ENTER(a,b)	CHOICE(enter ARG2(a,b), enter ARG2(a,b), enter ARG2(b,a))

+#define HLT		CHOICE(hlt, hlt, hlt)

+#define IDIV_L(a)	CHOICE(idivl a, idivl a, _LTOG idiv a)

+#define IDIV_W(a)	CHOICE(idivw a, idivw a, _WTOG idiv a)

+#define IDIV_B(a)	CHOICE(idivb a, idivb a, idivb a)

+/* More forms than this for imul!! */

+#define IMUL_L(a, b)	CHOICE(imull ARG2(a,b), imull ARG2(a,b), _LTOG imul ARG2(b,a))

+#define IMUL_W(a, b)	CHOICE(imulw ARG2(a,b), imulw ARG2(a,b), _WTOG imul ARG2(b,a))

+#define IMUL_B(a)	CHOICE(imulb a, imulb a, imulb a)

+#define IN_L		CHOICE(inl (DX), inl ARG2(DX,EAX), _LTOG in DX)

+#define IN_W		CHOICE(inw (DX), inw ARG2(DX,AX), _WTOG in DX)

+#define IN_B		CHOICE(inb (DX), inb ARG2(DX,AL), inb DX)

+/* Please AS code writer: use the following ONLY, if you refer to ports<256

+ * directly, but not in IN1_W(DX), for instance, even if IN1_ looks nicer

+ */

+#if defined (sun)

+#define IN1_L(a)	CHOICE(inl (a), inl ARG2(a,EAX), _LTOG in a)

+#define IN1_W(a)	CHOICE(inw (a), inw ARG2(a,AX), _WTOG in a)

+#define IN1_B(a)	CHOICE(inb (a), inb ARG2(a,AL), inb a)

+#else

+#define IN1_L(a)	CHOICE(inl a, inl ARG2(a,EAX), _LTOG in a)

+#define IN1_W(a)	CHOICE(inw a, inw ARG2(a,AX), _WTOG in a)

+#define IN1_B(a)	CHOICE(inb a, inb ARG2(a,AL), inb a)

+#endif

+#define INC_L(a)	CHOICE(incl a, incl a, _LTOG inc a)

+#define INC_W(a)	CHOICE(incw a, incw a, _WTOG inc a)

+#define INC_B(a)	CHOICE(incb a, incb a, incb a)

+#define INS_L		CHOICE(insl, insl, _LTOG ins)

+#define INS_W		CHOICE(insw, insw, _WTOG ins)

+#define INS_B		CHOICE(insb, insb, insb)

+#define INT(a)		CHOICE(int a, int a, int a)

+#define INT3		CHOICE(int CONST(3), int3, int CONST(3))

+#define INTO		CHOICE(into, into, into)

+#define IRET		CHOICE(iret, iret, iret)

+#define IRETD		CHOICE(iret, iret, iretd)

+#define JA(a)		CHOICE(ja a, ja a, ja a)

+#define JAE(a)		CHOICE(jae a, jae a, jae a)

+#define JB(a)		CHOICE(jb a, jb a, jb a)

+#define JBE(a)		CHOICE(jbe a, jbe a, jbe a)

+#define JC(a)		CHOICE(jc a, jc a, jc a)

+#define JE(a)		CHOICE(je a, je a, je a)

+#define JG(a)		CHOICE(jg a, jg a, jg a)

+#define JGE(a)		CHOICE(jge a, jge a, jge a)

+#define JL(a)		CHOICE(jl a, jl a, jl a)

+#define JLE(a)		CHOICE(jle a, jle a, jle a)

+#define JNA(a)		CHOICE(jna a, jna a, jna a)

+#define JNAE(a)		CHOICE(jnae a, jnae a, jnae a)

+#define JNB(a)		CHOICE(jnb a, jnb a, jnb a)

+#define JNBE(a)		CHOICE(jnbe a, jnbe a, jnbe a)

+#define JNC(a)		CHOICE(jnc a, jnc a, jnc a)

+#define JNE(a)		CHOICE(jne a, jne a, jne a)

+#define JNG(a)		CHOICE(jng a, jng a, jng a)

+#define JNGE(a)		CHOICE(jnge a, jnge a, jnge a)

+#define JNL(a)		CHOICE(jnl a, jnl a, jnl a)

+#define JNLE(a)		CHOICE(jnle a, jnle a, jnle a)

+#define JNO(a)		CHOICE(jno a, jno a, jno a)

+#define JNP(a)		CHOICE(jnp a, jnp a, jnp a)

+#define JNS(a)		CHOICE(jns a, jns a, jns a)

+#define JNZ(a)		CHOICE(jnz a, jnz a, jnz a)

+#define JO(a)		CHOICE(jo a, jo a, jo a)

+#define JP(a)		CHOICE(jp a, jp a, jp a)

+#define JPE(a)		CHOICE(jpe a, jpe a, jpe a)

+#define JPO(a)		CHOICE(jpo a, jpo a, jpo a)

+#define JS(a)		CHOICE(js a, js a, js a)

+#define JZ(a)		CHOICE(jz a, jz a, jz a)

+#define JMP(a)		CHOICE(jmp a, jmp a, jmp a)

+#define JMPF(s,a)	CHOICE(ljmp ARG2(s,a), ljmp ARG2(s,a), jmpf s:a)

+#define LAHF		CHOICE(lahf, lahf, lahf)

+#if !defined(_REAL_MODE) && !defined(_V86_MODE)

+#define LAR(a, b)	CHOICE(lar ARG2(a, b), lar ARG2(a, b), lar ARG2(b, a))

+#endif

+#define LEA_L(a, b)	CHOICE(leal ARG2(a,b), leal ARG2(a,b), _LTOG lea ARG2(b,a))

+#define LEA_W(a, b)	CHOICE(leaw ARG2(a,b), leaw ARG2(a,b), _WTOG lea ARG2(b,a))

+#define LEAVE		CHOICE(leave, leave, leave)

+#define LGDT(a)		CHOICE(lgdt a, lgdt a, lgdt a)

+#define LIDT(a)		CHOICE(lidt a, lidt a, lidt a)

+#define LDS(a, b)	CHOICE(ldsl ARG2(a,b), lds ARG2(a,b), lds ARG2(b,a))

+#define LES(a, b)	CHOICE(lesl ARG2(a,b), les ARG2(a,b), les ARG2(b,a))

+#define LFS(a, b)	CHOICE(lfsl ARG2(a,b), lfs ARG2(a,b), lfs ARG2(b,a))

+#define LGS(a, b)	CHOICE(lgsl ARG2(a,b), lgs ARG2(a,b), lgs ARG2(b,a))

+#define LSS(a, b)	CHOICE(lssl ARG2(a,b), lss ARG2(a,b), lss ARG2(b,a))

+#define LLDT(a)		CHOICE(lldt a, lldt a, lldt a)

+#define LMSW(a)		CHOICE(lmsw a, lmsw a, lmsw a)

+#define LOCK		CHOICE(lock, lock, lock)

+#define LODS_L		CHOICE(lodsl, lodsl, _LTOG lods)

+#define LODS_W		CHOICE(lodsw, lodsw, _WTOG lods)

+#define LODS_B		CHOICE(lodsb, lodsb, lodsb)

+#define LOOP(a)		CHOICE(loop a, loop a, loop a)

+#define LOOPE(a)	CHOICE(loope a, loope a, loope a)

+#define LOOPZ(a)	CHOICE(loopz a, loopz a, loopz a)

+#define LOOPNE(a)	CHOICE(loopne a, loopne a, loopne a)

+#define LOOPNZ(a)	CHOICE(loopnz a, loopnz a, loopnz a)

+#if !defined(_REAL_MODE) && !defined(_V86_MODE)

+#define LSL(a, b)	CHOICE(lsl ARG2(a,b), lsl ARG2(a,b), lsl ARG2(b,a))

+#endif

+#define LTR(a)		CHOICE(ltr a, ltr a, ltr a)

+#define MOV_SR(a, b)	CHOICE(movw ARG2(a,b), mov ARG2(a,b), mov ARG2(b,a))

+#define MOV_L(a, b)	CHOICE(movl ARG2(a,b), movl ARG2(a,b), _LTOG mov ARG2(b,a))

+#define MOV_W(a, b)	CHOICE(movw ARG2(a,b), movw ARG2(a,b), _WTOG mov ARG2(b,a))

+#define MOV_B(a, b)	CHOICE(movb ARG2(a,b), movb ARG2(a,b), movb ARG2(b,a))

+#define MOVS_L		CHOICE(movsl, movsl, _LTOG movs)

+#define MOVS_W		CHOICE(movsw, movsw, _WTOG movs)

+#define MOVS_B		CHOICE(movsb, movsb, movsb)

+#define MOVSX_BL(a, b)	CHOICE(movsbl ARG2(a,b), movsbl ARG2(a,b), movsx ARG2(b,a))

+#define MOVSX_BW(a, b)	CHOICE(movsbw ARG2(a,b), movsbw ARG2(a,b), movsx ARG2(b,a))

+#define MOVSX_WL(a, b)	CHOICE(movswl ARG2(a,b), movswl ARG2(a,b), movsx ARG2(b,a))

+#define MOVZX_BL(a, b)	CHOICE(movzbl ARG2(a,b), movzbl ARG2(a,b), movzx ARG2(b,a))

+#define MOVZX_BW(a, b)	CHOICE(movzbw ARG2(a,b), movzbw ARG2(a,b), movzx ARG2(b,a))

+#define MOVZX_WL(a, b)	CHOICE(movzwl ARG2(a,b), movzwl ARG2(a,b), movzx ARG2(b,a))

+#define MUL_L(a)	CHOICE(mull a, mull a, _LTOG mul a)

+#define MUL_W(a)	CHOICE(mulw a, mulw a, _WTOG mul a)

+#define MUL_B(a)	CHOICE(mulb a, mulb a, mulb a)

+#define NEG_L(a)	CHOICE(negl a, negl a, _LTOG neg a)

+#define NEG_W(a)	CHOICE(negw a, negw a, _WTOG neg a)

+#define NEG_B(a)	CHOICE(negb a, negb a, negb a)

+#define NOP		CHOICE(nop, nop, nop)

+#define NOT_L(a)	CHOICE(notl a, notl a, _LTOG not a)

+#define NOT_W(a)	CHOICE(notw a, notw a, _WTOG not a)

+#define NOT_B(a)	CHOICE(notb a, notb a, notb a)

+#define OR_L(a,b)	CHOICE(orl ARG2(a,b), orl ARG2(a,b), _LTOG or ARG2(b,a))

+#define OR_W(a,b)	CHOICE(orw ARG2(a,b), orw ARG2(a,b), _WTOG or ARG2(b,a))

+#define OR_B(a,b)	CHOICE(orb ARG2(a,b), orb ARG2(a,b), orb ARG2(b,a))

+#define OUT_L		CHOICE(outl (DX), outl ARG2(EAX,DX), _LTOG out DX)

+#define OUT_W		CHOICE(outw (DX), outw ARG2(AX,DX), _WTOG out DX)

+#define OUT_B		CHOICE(outb (DX), outb ARG2(AL,DX), outb DX)

+/* Please AS code writer: use the following ONLY, if you refer to ports<256

+ * directly, but not in OUT1_W(DX), for instance, even if OUT1_ looks nicer

+ */

+#define OUT1_L(a)	CHOICE(outl (a), outl ARG2(EAX,a), _LTOG out a)

+#define OUT1_W(a)	CHOICE(outw (a), outw ARG2(AX,a), _WTOG out a)

+#define OUT1_B(a)	CHOICE(outb (a), outb ARG2(AL,a), outb a)

+#define OUTS_L		CHOICE(outsl, outsl, _LTOG outs)

+#define OUTS_W		CHOICE(outsw, outsw, _WTOG outs)

+#define OUTS_B		CHOICE(outsb, outsb, outsb)

+#define POP_SR(a)	CHOICE(pop a, pop a, pop a)

+#define POP_L(a)	CHOICE(popl a, popl a, _LTOG pop a)

+#define POP_W(a)	CHOICE(popw a, popw a, _WTOG pop a)

+#define POPA_L		CHOICE(popal, popal, _LTOG popa)

+#define POPA_W		CHOICE(popaw, popaw, _WTOG popa)

+#define POPF_L		CHOICE(popfl, popfl, _LTOG popf)

+#define POPF_W		CHOICE(popfw, popfw, _WTOG popf)

+#define PUSH_SR(a)	CHOICE(push a, push a, push a)

+#define PUSH_L(a)	CHOICE(pushl a, pushl a, _LTOG push a)

+#define PUSH_W(a)	CHOICE(pushw a, pushw a, _WTOG push a)

+#define PUSH_B(a)	CHOICE(push a, pushb a, push a)

+#define PUSHA_L		CHOICE(pushal, pushal, _LTOG pusha)

+#define PUSHA_W		CHOICE(pushaw, pushaw, _WTOG pusha)

+#define PUSHF_L		CHOICE(pushfl, pushfl, _LTOG pushf)

+#define PUSHF_W		CHOICE(pushfw, pushfw, _WTOG pushf)

+#define RCL_L(a, b)	CHOICE(rcll ARG2(a,b), rcll ARG2(a,b), _LTOG rcl ARG2(b,a))

+#define RCL_W(a, b)	CHOICE(rclw ARG2(a,b), rclw ARG2(a,b), _WTOG rcl ARG2(b,a))

+#define RCL_B(a, b)	CHOICE(rclb ARG2(a,b), rclb ARG2(a,b), rclb ARG2(b,a))

+#define RCR_L(a, b)	CHOICE(rcrl ARG2(a,b), rcrl ARG2(a,b), _LTOG rcr ARG2(b,a))

+#define RCR_W(a, b)	CHOICE(rcrw ARG2(a,b), rcrw ARG2(a,b), _WTOG rcr ARG2(b,a))

+#define RCR_B(a, b)	CHOICE(rcrb ARG2(a,b), rcrb ARG2(a,b), rcrb ARG2(b,a))

+#define ROL_L(a, b)	CHOICE(roll ARG2(a,b), roll ARG2(a,b), _LTOG rol ARG2(b,a))

+#define ROL_W(a, b)	CHOICE(rolw ARG2(a,b), rolw ARG2(a,b), _WTOG rol ARG2(b,a))

+#define ROL_B(a, b)	CHOICE(rolb ARG2(a,b), rolb ARG2(a,b), rolb ARG2(b,a))

+#define ROR_L(a, b)	CHOICE(rorl ARG2(a,b), rorl ARG2(a,b), _LTOG ror ARG2(b,a))

+#define ROR_W(a, b)	CHOICE(rorw ARG2(a,b), rorw ARG2(a,b), _WTOG ror ARG2(b,a))

+#define ROR_B(a, b)	CHOICE(rorb ARG2(a,b), rorb ARG2(a,b), rorb ARG2(b,a))

+#define REP		CHOICE(rep ;, rep ;, repe)

+#define REPE		CHOICE(repz ;, repe ;, repe)

+#define REPNE		CHOICE(repnz ;, repne ;, repne)

+#define REPNZ		REPNE

+#define REPZ		REPE

+#define RET		CHOICE(ret, ret, ret)

+#define SAHF		CHOICE(sahf, sahf, sahf)

+#define SAL_L(a, b)	CHOICE(sall ARG2(a,b), sall ARG2(a,b), _LTOG sal ARG2(b,a))

+#define SAL_W(a, b)	CHOICE(salw ARG2(a,b), salw ARG2(a,b), _WTOG sal ARG2(b,a))

+#define SAL_B(a, b)	CHOICE(salb ARG2(a,b), salb ARG2(a,b), salb ARG2(b,a))

+#define SAR_L(a, b)	CHOICE(sarl ARG2(a,b), sarl ARG2(a,b), _LTOG sar ARG2(b,a))

+#define SAR_W(a, b)	CHOICE(sarw ARG2(a,b), sarw ARG2(a,b), _WTOG sar ARG2(b,a))

+#define SAR_B(a, b)	CHOICE(sarb ARG2(a,b), sarb ARG2(a,b), sarb ARG2(b,a))

+#define SBB_L(a, b)	CHOICE(sbbl ARG2(a,b), sbbl ARG2(a,b), _LTOG sbb ARG2(b,a))

+#define SBB_W(a, b)	CHOICE(sbbw ARG2(a,b), sbbw ARG2(a,b), _WTOG sbb ARG2(b,a))

+#define SBB_B(a, b)	CHOICE(sbbb ARG2(a,b), sbbb ARG2(a,b), sbbb ARG2(b,a))

+#define SCAS_L		CHOICE(scasl, scasl, _LTOG scas)

+#define SCAS_W		CHOICE(scasw, scasw, _WTOG scas)

+#define SCAS_B		CHOICE(scasb, scasb, scasb)

+#define SETA(a)		CHOICE(seta a, seta a, seta a)

+#define SETAE(a)	CHOICE(setae a, setae a, setae a)

+#define SETB(a)		CHOICE(setb a, setb a, setb a)

+#define SETBE(a)	CHOICE(setbe a, setbe a, setbe a)

+#define SETC(a)		CHOICE(setc a, setb a, setb a)

+#define SETE(a)		CHOICE(sete a, sete a, sete a)

+#define SETG(a)		CHOICE(setg a, setg a, setg a)

+#define SETGE(a)	CHOICE(setge a, setge a, setge a)

+#define SETL(a)		CHOICE(setl a, setl a, setl a)

+#define SETLE(a)	CHOICE(setle a, setle a, setle a)

+#define SETNA(a)	CHOICE(setna a, setna a, setna a)

+#define SETNAE(a)	CHOICE(setnae a, setnae a, setnae a)

+#define SETNB(a)	CHOICE(setnb a, setnb a, setnb a)

+#define SETNBE(a)	CHOICE(setnbe a, setnbe a, setnbe a)

+#define SETNC(a)	CHOICE(setnc a, setnb a, setnb a)

+#define SETNE(a)	CHOICE(setne a, setne a, setne a)

+#define SETNG(a)	CHOICE(setng a, setng a, setng a)

+#define SETNGE(a)	CHOICE(setnge a, setnge a, setnge a)

+#define SETNL(a)	CHOICE(setnl a, setnl a, setnl a)

+#define SETNLE(a)	CHOICE(setnle a, setnle a, setnle a)

+#define SETNO(a)	CHOICE(setno a, setno a, setno a)

+#define SETNP(a)	CHOICE(setnp a, setnp a, setnp a)

+#define SETNS(a)	CHOICE(setns a, setns a, setna a)

+#define SETNZ(a)	CHOICE(setnz a, setnz a, setnz a)

+#define SETO(a)		CHOICE(seto a, seto a, seto a)

+#define SETP(a)		CHOICE(setp a, setp a, setp a)

+#define SETPE(a)	CHOICE(setpe a, setpe a, setpe a)

+#define SETPO(a)	CHOICE(setpo a, setpo a, setpo a)

+#define SETS(a)		CHOICE(sets a, sets a, seta a)

+#define SETZ(a)		CHOICE(setz a, setz a, setz a)

+#define SGDT(a)		CHOICE(sgdt a, sgdt a, sgdt a)

+#define SIDT(a)		CHOICE(sidt a, sidt a, sidt a)

+#define SHL_L(a, b)	CHOICE(shll ARG2(a,b), shll ARG2(a,b), _LTOG shl ARG2(b,a))

+#define SHL_W(a, b)	CHOICE(shlw ARG2(a,b), shlw ARG2(a,b), _WTOG shl ARG2(b,a))

+#define SHL_B(a, b)	CHOICE(shlb ARG2(a,b), shlb ARG2(a,b), shlb ARG2(b,a))

+#define SHLD_L(a,b,c)	CHOICE(shldl ARG3(a,b,c), shldl ARG3(a,b,c), _LTOG shld ARG3(c,b,a))

+#define SHLD2_L(a,b)	CHOICE(shldl ARG2(a,b), shldl ARG3(CL,a,b), _LTOG shld ARG3(b,a,CL))

+#define SHLD_W(a,b,c)	CHOICE(shldw ARG3(a,b,c), shldw ARG3(a,b,c), _WTOG shld ARG3(c,b,a))

+#define SHLD2_W(a,b)	CHOICE(shldw ARG2(a,b), shldw ARG3(CL,a,b), _WTOG shld ARG3(b,a,CL))

+#define SHR_L(a, b)	CHOICE(shrl ARG2(a,b), shrl ARG2(a,b), _LTOG shr ARG2(b,a))

+#define SHR_W(a, b)	CHOICE(shrw ARG2(a,b), shrw ARG2(a,b), _WTOG shr ARG2(b,a))

+#define SHR_B(a, b)	CHOICE(shrb ARG2(a,b), shrb ARG2(a,b), shrb ARG2(b,a))

+#define SHRD_L(a,b,c)	CHOICE(shrdl ARG3(a,b,c), shrdl ARG3(a,b,c), _LTOG shrd ARG3(c,b,a))

+#define SHRD2_L(a,b)	CHOICE(shrdl ARG2(a,b), shrdl ARG3(CL,a,b), _LTOG shrd ARG3(b,a,CL))

+#define SHRD_W(a,b,c)	CHOICE(shrdw ARG3(a,b,c), shrdw ARG3(a,b,c), _WTOG shrd ARG3(c,b,a))

+#define SHRD2_W(a,b)	CHOICE(shrdw ARG2(a,b), shrdw ARG3(CL,a,b), _WTOG shrd ARG3(b,a,CL))

+#define SLDT(a)		CHOICE(sldt a, sldt a, sldt a)

+#define SMSW(a)		CHOICE(smsw a, smsw a, smsw a)

+#define STC		CHOICE(stc, stc, stc)

+#define STD		CHOICE(std, std, std)

+#define STI		CHOICE(sti, sti, sti)

+#define STOS_L		CHOICE(stosl, stosl, _LTOG stos)

+#define STOS_W		CHOICE(stosw, stosw, _WTOG stos)

+#define STOS_B		CHOICE(stosb, stosb, stosb)

+#define STR(a)		CHOICE(str a, str a, str a)

+#define SUB_L(a, b)	CHOICE(subl ARG2(a,b), subl ARG2(a,b), _LTOG sub ARG2(b,a))

+#define SUB_W(a, b)	CHOICE(subw ARG2(a,b), subw ARG2(a,b), _WTOG sub ARG2(b,a))

+#define SUB_B(a, b)	CHOICE(subb ARG2(a,b), subb ARG2(a,b), subb ARG2(b,a))

+#define TEST_L(a, b)	CHOICE(testl ARG2(a,b), testl ARG2(a,b), _LTOG test ARG2(b,a))

+#define TEST_W(a, b)	CHOICE(testw ARG2(a,b), testw ARG2(a,b), _WTOG test ARG2(b,a))

+#define TEST_B(a, b)	CHOICE(testb ARG2(a,b), testb ARG2(a,b), testb ARG2(b,a))

+#define VERR(a)		CHOICE(verr a, verr a, verr a)

+#define VERW(a)		CHOICE(verw a, verw a, verw a)

+#define WAIT		CHOICE(wait, wait, wait)

+#define XCHG_L(a, b)	CHOICE(xchgl ARG2(a,b), xchgl ARG2(a,b), _LTOG xchg ARG2(b,a))

+#define XCHG_W(a, b)	CHOICE(xchgw ARG2(a,b), xchgw ARG2(a,b), _WTOG xchg ARG2(b,a))

+#define XCHG_B(a, b)	CHOICE(xchgb ARG2(a,b), xchgb ARG2(a,b), xchgb ARG2(b,a))

+#define XLAT		CHOICE(xlat, xlat, xlat)

+#define XOR_L(a, b)	CHOICE(xorl ARG2(a,b), xorl ARG2(a,b), _LTOG xor ARG2(b,a))

+#define XOR_W(a, b)	CHOICE(xorw ARG2(a,b), xorw ARG2(a,b), _WTOG xor ARG2(b,a))

+#define XOR_B(a, b)	CHOICE(xorb ARG2(a,b), xorb ARG2(a,b), xorb ARG2(b,a))

+

+

+/* Floating Point Instructions */

+#define F2XM1		CHOICE(f2xm1, f2xm1, f2xm1)

+#define FABS		CHOICE(fabs, fabs, fabs)

+#define FADD_D(a)	CHOICE(faddl a, faddl a, faddd a)

+#define FADD_S(a)	CHOICE(fadds a, fadds a, fadds a)

+#define FADD2(a, b)	CHOICE(fadd ARG2(a,b), fadd ARG2(a,b), fadd ARG2(b,a))

+#define FADDP(a, b)	CHOICE(faddp ARG2(a,b), faddp ARG2(a,b), faddp ARG2(b,a))

+#define FIADD_L(a)	CHOICE(fiaddl a, fiaddl a, fiaddl a)

+#define FIADD_W(a)	CHOICE(fiadd a, fiadds a, fiadds a)

+#define FBLD(a)		CHOICE(fbld a, fbld a, fbld a)

+#define FBSTP(a)	CHOICE(fbstp a, fbstp a, fbstp a)

+#define FCHS		CHOICE(fchs, fchs, fchs)

+#define FCLEX		CHOICE(fclex, wait; fnclex, wait; fclex)

+#define FNCLEX		CHOICE(fnclex, fnclex, fclex)

+#define FCOM(a)		CHOICE(fcom a, fcom a, fcom a)

+#define FCOM_D(a)	CHOICE(fcoml a, fcoml a, fcomd a)

+#define FCOM_S(a)	CHOICE(fcoms a, fcoms a, fcoms a)

+#define FCOMP(a)	CHOICE(fcomp a, fcomp a, fcomp a)

+#define FCOMP_D(a)	CHOICE(fcompl a, fcompl a, fcompd a)

+#define FCOMP_S(a)	CHOICE(fcomps a, fcomps a, fcomps a)

+#define FCOMPP		CHOICE(fcompp, fcompp, fcompp)

+#define FCOS		CHOICE(fcos, fcos, fcos)

+#define FDECSTP		CHOICE(fdecstp, fdecstp, fdecstp)

+#define FDIV_D(a)	CHOICE(fdivl a, fdivl a, fdivd a)

+#define FDIV_S(a)	CHOICE(fdivs a, fdivs a, fdivs a)

+#define FDIV2(a, b)	CHOICE(fdiv ARG2(a,b), fdiv ARG2(a,b), fdiv ARG2(b,a))

+#define FDIVP(a, b)	CHOICE(fdivp ARG2(a,b), fdivp ARG2(a,b), fdivp ARG2(b,a))

+#define FIDIV_L(a)	CHOICE(fidivl a, fidivl a, fidivl a)

+#define FIDIV_W(a)	CHOICE(fidiv a, fidivs a, fidivs a)

+#define FDIVR_D(a)	CHOICE(fdivrl a, fdivrl a, fdivrd a)

+#define FDIVR_S(a)	CHOICE(fdivrs a, fdivrs a, fdivrs a)

+#define FDIVR2(a, b)	CHOICE(fdivr ARG2(a,b), fdivr ARG2(a,b), fdivr ARG2(b,a))

+#define FDIVRP(a, b)	CHOICE(fdivrp ARG2(a,b), fdivrp ARG2(a,b), fdivrp ARG2(b,a))

+#define FIDIVR_L(a)	CHOICE(fidivrl a, fidivrl a, fidivrl a)

+#define FIDIVR_W(a)	CHOICE(fidivr a, fidivrs a, fidivrs a)

+#define FFREE(a)	CHOICE(ffree a, ffree a, ffree a)

+#define FICOM_L(a)	CHOICE(ficoml a, ficoml a, ficoml a)

+#define FICOM_W(a)	CHOICE(ficom a, ficoms a, ficoms a)

+#define FICOMP_L(a)	CHOICE(ficompl a, ficompl a, ficompl a)

+#define FICOMP_W(a)	CHOICE(ficomp a, ficomps a, ficomps a)

+#define FILD_Q(a)	CHOICE(fildll a, fildq a, fildq a)

+#define FILD_L(a)	CHOICE(fildl a, fildl a, fildl a)

+#define FILD_W(a)	CHOICE(fild a, filds a, filds a)

+#define FINCSTP		CHOICE(fincstp, fincstp, fincstp)

+#define FINIT		CHOICE(finit, wait; fninit, wait; finit)

+#define FNINIT		CHOICE(fninit, fninit, finit)

+#define FIST_L(a)	CHOICE(fistl a, fistl a, fistl a)

+#define FIST_W(a)	CHOICE(fist a, fists a, fists a)

+#define FISTP_Q(a)	CHOICE(fistpll a, fistpq a, fistpq a)

+#define FISTP_L(a)	CHOICE(fistpl a, fistpl a, fistpl a)

+#define FISTP_W(a)	CHOICE(fistp a, fistps a, fistps a)

+#define FLD_X(a)	CHOICE(fldt a, fldt a, fldx a) /* 80 bit data type! */

+#define FLD_D(a)	CHOICE(fldl a, fldl a, fldd a)

+#define FLD_S(a)	CHOICE(flds a, flds a, flds a)

+#define FLD1		CHOICE(fld1, fld1, fld1)

+#define FLDL2T		CHOICE(fldl2t, fldl2t, fldl2t)

+#define FLDL2E		CHOICE(fldl2e, fldl2e, fldl2e)

+#define FLDPI		CHOICE(fldpi, fldpi, fldpi)

+#define FLDLG2		CHOICE(fldlg2, fldlg2, fldlg2)

+#define FLDLN2		CHOICE(fldln2, fldln2, fldln2)

+#define FLDZ		CHOICE(fldz, fldz, fldz)

+#define FLDCW(a)	CHOICE(fldcw a, fldcw a, fldcw a)

+#define FLDENV(a)	CHOICE(fldenv a, fldenv a, fldenv a)

+#define FMUL_S(a)	CHOICE(fmuls a, fmuls a, fmuls a)

+#define FMUL_D(a)	CHOICE(fmull a, fmull a, fmuld a)

+#define FMUL2(a, b)	CHOICE(fmul ARG2(a,b), fmul ARG2(a,b), fmul ARG2(b,a))

+#define FMULP(a, b)	CHOICE(fmulp ARG2(a,b), fmulp ARG2(a,b), fmulp ARG2(b,a))

+#define FIMUL_L(a)	CHOICE(fimull a, fimull a, fimull a)

+#define FIMUL_W(a)	CHOICE(fimul a, fimuls a, fimuls a)

+#define FNOP		CHOICE(fnop, fnop, fnop)

+#define FPATAN		CHOICE(fpatan, fpatan, fpatan)

+#define FPREM		CHOICE(fprem, fprem, fprem)

+#define FPREM1		CHOICE(fprem1, fprem1, fprem1)

+#define FPTAN		CHOICE(fptan, fptan, fptan)

+#define FRNDINT		CHOICE(frndint, frndint, frndint)

+#define FRSTOR(a)	CHOICE(frstor a, frstor a, frstor a)

+#define FSAVE(a)	CHOICE(fsave a, wait; fnsave a, wait; fsave a)

+#define FNSAVE(a)	CHOICE(fnsave a, fnsave a, fsave a)

+#define FSCALE		CHOICE(fscale, fscale, fscale)

+#define FSIN		CHOICE(fsin, fsin, fsin)

+#define FSINCOS		CHOICE(fsincos, fsincos, fsincos)

+#define FSQRT		CHOICE(fsqrt, fsqrt, fsqrt)

+#define FST_D(a)	CHOICE(fstl a, fstl a, fstd a)

+#define FST_S(a)	CHOICE(fsts a, fsts a, fsts a)

+#define FSTP_X(a)	CHOICE(fstpt a, fstpt a, fstpx a)

+#define FSTP_D(a)	CHOICE(fstpl a, fstpl a, fstpd a)

+#define FSTP_S(a)	CHOICE(fstps a, fstps a, fstps a)

+#define FSTP(a)		CHOICE(fstp a, fstp a, fstp a)

+#define FSTCW(a)	CHOICE(fstcw a, wait; fnstcw a, wait; fstcw a)

+#define FNSTCW(a)	CHOICE(fnstcw a, fnstcw a, fstcw a)

+#define FSTENV(a)	CHOICE(fstenv a, wait; fnstenv a, fstenv a)

+#define FNSTENV(a)	CHOICE(fnstenv a, fnstenv a, fstenv a)

+#define FSTSW(a)	CHOICE(fstsw a, wait; fnstsw a, wait; fstsw a)

+#define FNSTSW(a)	CHOICE(fnstsw a, fnstsw a, fstsw a)

+#define FSUB_S(a)	CHOICE(fsubs a, fsubs a, fsubs a)

+#define FSUB_D(a)	CHOICE(fsubl a, fsubl a, fsubd a)

+#define FSUB2(a, b)	CHOICE(fsub ARG2(a,b), fsub ARG2(a,b), fsub ARG2(b,a))

+#define FSUBP(a, b)	CHOICE(fsubp ARG2(a,b), fsubp ARG2(a,b), fsubp ARG2(b,a))

+#define FISUB_L(a)	CHOICE(fisubl a, fisubl a, fisubl a)

+#define FISUB_W(a)	CHOICE(fisub a, fisubs a, fisubs a)

+#define FSUBR_S(a)	CHOICE(fsubrs a, fsubrs a, fsubrs a)

+#define FSUBR_D(a)	CHOICE(fsubrl a, fsubrl a, fsubrd a)

+#define FSUBR2(a, b)	CHOICE(fsubr ARG2(a,b), fsubr ARG2(a,b), fsubr ARG2(b,a))

+#define FSUBRP(a, b)	CHOICE(fsubrp ARG2(a,b), fsubrp ARG2(a,b), fsubrp ARG2(b,a))

+#define FISUBR_L(a)	CHOICE(fisubrl a, fisubrl a, fisubrl a)

+#define FISUBR_W(a)	CHOICE(fisubr a, fisubrs a, fisubrs a)

+#define FTST		CHOICE(ftst, ftst, ftst)

+#define FUCOM(a)	CHOICE(fucom a, fucom a, fucom a)

+#define FUCOMP(a)	CHOICE(fucomp a, fucomp a, fucomp a)

+#define FUCOMPP		CHOICE(fucompp, fucompp, fucompp)

+#define FWAIT		CHOICE(wait, wait, wait)

+#define FXAM		CHOICE(fxam, fxam, fxam)

+#define FXCH(a)		CHOICE(fxch a, fxch a, fxch a)

+#define FXTRACT		CHOICE(fxtract, fxtract, fxtract)

+#define FYL2X		CHOICE(fyl2x, fyl2x, fyl2x)

+#define FYL2XP1		CHOICE(fyl2xp1, fyl2xp1, fyl2xp1)

+

+/* New instructions */

+#define CPUID		CHOICE(D_BYTE ARG2(15, 162), cpuid, D_BYTE ARG2(15, 162))

+#define RDTSC		CHOICE(D_BYTE ARG2(15, 49), rdtsc, D_BYTE ARG2(15, 49))

+

+#else /* NASM_ASSEMBLER || MASM_ASSEMBLER is defined */

+

+	/****************************************/

+	/*					*/

+	/*	Intel style assemblers.		*/

+	/*	(NASM and MASM)			*/

+	/*					*/

+	/****************************************/

+

+#define P_EAX		EAX

+#define L_EAX		EAX

+#define W_AX		AX

+#define B_AH		AH

+#define B_AL		AL

+

+#define P_EBX		EBX

+#define L_EBX		EBX

+#define W_BX		BX

+#define B_BH		BH

+#define B_BL		BL

+

+#define P_ECX		ECX

+#define L_ECX		ECX

+#define W_CX		CX

+#define B_CH		CH

+#define B_CL		CL

+

+#define P_EDX		EDX

+#define L_EDX		EDX

+#define W_DX		DX

+#define B_DH		DH

+#define B_DL		DL

+

+#define P_EBP		EBP

+#define L_EBP		EBP

+#define W_BP		BP

+

+#define P_ESI		ESI

+#define L_ESI		ESI

+#define W_SI		SI

+

+#define P_EDI		EDI

+#define L_EDI		EDI

+#define W_DI		DI

+

+#define P_ESP		ESP

+#define L_ESP		ESP

+#define W_SP		SP

+

+#define W_CS		CS

+#define W_SS		SS

+#define W_DS		DS

+#define W_ES		ES

+#define W_FS		FS

+#define W_GS		GS

+

+#define X_ST		ST

+#define D_ST		ST

+#define L_ST		ST

+

+#define P_MM0		mm0

+#define P_MM1		mm1

+#define P_MM2		mm2

+#define P_MM3		mm3

+#define P_MM4		mm4

+#define P_MM5		mm5

+#define P_MM6		mm6

+#define P_MM7		mm7

+

+#define P_XMM0		xmm0

+#define P_XMM1		xmm1

+#define P_XMM2		xmm2

+#define P_XMM3		xmm3

+#define P_XMM4		xmm4

+#define P_XMM5		xmm5

+#define P_XMM6		xmm6

+#define P_XMM7		xmm7

+

+#define CONCAT(x, y)		x ## y

+#define CONCAT3(x, y, z)	x ## y ## z

+

+#if defined(NASM_ASSEMBLER)

+

+#define ST(n)		st ## n

+#define ST0		st0

+

+#define TBYTE_PTR	tword

+#define QWORD_PTR	qword

+#define DWORD_PTR	dword

+#define WORD_PTR	word

+#define BYTE_PTR	byte

+

+#define OFFSET

+

+#define GLOBL			GLOBAL

+#define ALIGNTEXT32		ALIGN 32

+#define ALIGNTEXT16		ALIGN 16

+#define ALIGNTEXT8		ALIGN 8

+#define ALIGNTEXT4		ALIGN 4

+#define ALIGNTEXT2		ALIGN 2

+#define ALIGNTEXT32ifNOP	ALIGN 32

+#define ALIGNTEXT16ifNOP	ALIGN 16

+#define ALIGNTEXT8ifNOP		ALIGN 8

+#define ALIGNTEXT4ifNOP		ALIGN 4

+#define ALIGNDATA32		ALIGN 32

+#define ALIGNDATA16		ALIGN 16

+#define ALIGNDATA8		ALIGN 8

+#define ALIGNDATA4		ALIGN 4

+#define ALIGNDATA2		ALIGN 2

+#define FILE(s)

+#define STRING(s)	db s

+#define D_LONG		dd

+#define D_WORD		dw

+#define D_BYTE		db

+/* #define SPACE */

+/* #define COMM */

+#if defined(__WATCOMC__)

+SECTION _TEXT public align=16 class=CODE use32 flat

+SECTION _DATA public align=16 class=DATA use32 flat

+#define SEG_TEXT	SECTION _TEXT

+#define SEG_DATA	SECTION _DATA

+#define SEG_BSS		SECTION .bss

+#else

+#define SEG_DATA	SECTION .data

+#define SEG_TEXT	SECTION .text

+#define SEG_BSS		SECTION .bss

+#endif

+

+#define D_SPACE(n)	db n REP 0

+

+#define AS_BEGIN

+

+/* Jcc's should be handled better than this... */

+#define NEAR		near

+

+#else /* MASM */

+

+#define TBYTE_PTR	tbyte ptr

+#define QWORD_PTR	qword ptr

+#define DWORD_PTR	dword ptr

+#define WORD_PTR	word ptr

+#define BYTE_PTR	byte ptr

+

+#define OFFSET		offset

+

+#define GLOBL			GLOBAL

+#define ALIGNTEXT32		ALIGN 32

+#define ALIGNTEXT16		ALIGN 16

+#define ALIGNTEXT8		ALIGN 8

+#define ALIGNTEXT4		ALIGN 4

+#define ALIGNTEXT2		ALIGN 2

+#define ALIGNTEXT32ifNOP	ALIGN 32

+#define ALIGNTEXT16ifNOP	ALIGN 16

+#define ALIGNTEXT8ifNOP		ALIGN 8

+#define ALIGNTEXT4ifNOP		ALIGN 4

+#define ALIGNDATA32		ALIGN 32

+#define ALIGNDATA16		ALIGN 16

+#define ALIGNDATA8		ALIGN 8

+#define ALIGNDATA4		ALIGN 4

+#define ALIGNDATA2		ALIGN 2

+#define FILE(s)

+#define STRING(s)	db s

+#define D_LONG		dd

+#define D_WORD		dw

+#define D_BYTE		db

+/* #define SPACE */

+/* #define COMM */

+#define SEG_DATA	.DATA

+#define SEG_TEXT	.CODE

+#define SEG_BSS		.DATA

+

+#define D_SPACE(n)	db n REP 0

+

+#define AS_BEGIN

+

+#define NEAR

+

+#endif

+

+#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \

+ || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \

+ || (defined(__FreeBSD__) && __FreeBSD__ >= 3) \

+ || (defined(__NetBSD__) && defined(__ELF__))

+#define GLNAME(a)	a

+#else

+#define GLNAME(a)	CONCAT(_, a)

+#endif

+

+/*

+ *	Addressing Modes

+ */

+

+/* Immediate Mode */

+#define P_ADDR(a)		OFFSET a

+#define X_ADDR(a)		OFFSET a

+#define D_ADDR(a)		OFFSET a

+#define L_ADDR(a)		OFFSET a

+#define W_ADDR(a)		OFFSET a

+#define B_ADDR(a)		OFFSET a

+

+#define P_CONST(a)		a

+#define X_CONST(a)		a

+#define D_CONST(a)		a

+#define L_CONST(a)		a

+#define W_CONST(a)		a

+#define B_CONST(a)		a

+

+/* Indirect Mode */

+#ifdef NASM_ASSEMBLER

+#define P_CONTENT(a)		[a]

+#define X_CONTENT(a)		TBYTE_PTR [a]

+#define D_CONTENT(a)		QWORD_PTR [a]

+#define L_CONTENT(a)		DWORD_PTR [a]

+#define W_CONTENT(a)		WORD_PTR [a]

+#define B_CONTENT(a)		BYTE_PTR [a]

+#else

+#define P_CONTENT(a)		a

+#define X_CONTENT(a)		TBYTE_PTR a

+#define D_CONTENT(a)		QWORD_PTR a

+#define L_CONTENT(a)		DWORD_PTR a

+#define W_CONTENT(a)		WORD_PTR a

+#define B_CONTENT(a)		BYTE_PTR a

+#endif

+

+/* Register a indirect */

+#define P_REGIND(a)		[a]

+#define X_REGIND(a)		TBYTE_PTR [a]

+#define D_REGIND(a)		QWORD_PTR [a]

+#define L_REGIND(a)		DWORD_PTR [a]

+#define W_REGIND(a)		WORD_PTR [a]

+#define B_REGIND(a)		BYTE_PTR [a]

+

+/* Register b indirect plus displacement a */

+#define P_REGOFF(a, b)		[b + a]

+#define X_REGOFF(a, b)		TBYTE_PTR [b + a]

+#define D_REGOFF(a, b)		QWORD_PTR [b + a]

+#define L_REGOFF(a, b)		DWORD_PTR [b + a]

+#define W_REGOFF(a, b)		WORD_PTR [b + a]

+#define B_REGOFF(a, b)		BYTE_PTR [b + a]

+

+/* Reg indirect Base + Index + Displacement  - this is mainly for 16-bit mode

+ * which has no scaling

+ */

+#define P_REGBID(b, i, d)	[b + i + d]

+#define X_REGBID(b, i, d)	TBYTE_PTR [b + i + d]

+#define D_REGBID(b, i, d)	QWORD_PTR [b + i + d]

+#define L_REGBID(b, i, d)	DWORD_PTR [b + i + d]

+#define W_REGBID(b, i, d)	WORD_PTR [b + i + d]

+#define B_REGBID(b, i, d)	BYTE_PTR [b + i + d]

+

+/* Reg indirect Base + (Index * Scale) */

+#define P_REGBIS(b, i, s)	[b + i * s]

+#define X_REGBIS(b, i, s)	TBYTE_PTR [b + i * s]

+#define D_REGBIS(b, i, s)	QWORD_PTR [b + i * s]

+#define L_REGBIS(b, i, s)	DWORD_PTR [b + i * s]

+#define W_REGBIS(b, i, s)	WORD_PTR [b + i * s]

+#define B_REGBIS(b, i, s)	BYTE_PTR [b + i * s]

+

+/* Reg indirect Base + (Index * Scale) + Displacement */

+#define P_REGBISD(b, i, s, d)	[b + i * s + d]

+#define X_REGBISD(b, i, s, d)	TBYTE_PTR [b + i * s + d]

+#define D_REGBISD(b, i, s, d)	QWORD_PTR [b + i * s + d]

+#define L_REGBISD(b, i, s, d)	DWORD_PTR [b + i * s + d]

+#define W_REGBISD(b, i, s, d)	WORD_PTR [b + i * s + d]

+#define B_REGBISD(b, i, s, d)	BYTE_PTR [b + i * s + d]

+

+/* Displaced Scaled Index: */

+#define P_REGDIS(d, i, s)	[i * s + d]

+#define X_REGDIS(d, i, s)	TBYTE_PTR [i * s + d]

+#define D_REGDIS(d, i, s)	QWORD_PTR [i * s + d]

+#define L_REGDIS(d, i, s)	DWORD_PTR [i * s + d]

+#define W_REGDIS(d, i, s)	WORD_PTR [i * s + d]

+#define B_REGDIS(d, i, s)	BYTE_PTR [i * s + d]

+

+/* Indexed Base: */

+#define P_REGBI(b, i)		[b + i]

+#define X_REGBI(b, i)		TBYTE_PTR [b + i]

+#define D_REGBI(b, i)		QWORD_PTR [b + i]

+#define L_REGBI(b, i)		DWORD_PTR [b + i]

+#define W_REGBI(b, i)		WORD_PTR [b + i]

+#define B_REGBI(b, i)		BYTE_PTR [b + i]

+

+/* Displaced Base: */

+#define P_REGDB(d, b)		[b + d]

+#define X_REGDB(d, b)		TBYTE_PTR [b + d]

+#define D_REGDB(d, b)		QWORD_PTR [b + d]

+#define L_REGDB(d, b)		DWORD_PTR [b + d]

+#define W_REGDB(d, b)		WORD_PTR [b + d]

+#define B_REGDB(d, b)		BYTE_PTR [b + d]

+

+/* Variable indirect: */

+#define VARINDIRECT(var)	[var]

+

+/* Use register contents as jump/call target: */

+#define CODEPTR(reg)		P_(reg)

+

+/*

+ * Redefine assembler commands

+ */

+

+#define P_(a)			P_ ## a

+#define X_(a)			X_ ## a

+#define D_(a)			D_ ## a

+#define SR_(a)			W_ ## a

+#define S_(a)			L_ ## a

+#define L_(a)			L_ ## a

+#define W_(a)			W_ ## a

+#define B_(a)			B_ ## a

+

+#define AAA			aaa

+#define AAD			aad

+#define AAM			aam

+#define AAS			aas

+#define ADC_L(a, b)		adc L_(b), L_(a)

+#define ADC_W(a, b)		adc W_(b), W_(a)

+#define ADC_B(a, b)		adc B_(b), B_(a)

+#define ADD_L(a, b)		add L_(b), L_(a)

+#define ADD_W(a, b)		add W_(b), W_(a)

+#define ADD_B(a, b)		add B_(b), B_(a)

+#define AND_L(a, b)		and L_(b), L_(a)

+#define AND_W(a, b)		and W_(b), W_(a)

+#define AND_B(a, b)		and B_(b), B_(a)

+#define ARPL(a,b)		arpl W_(b), a

+#define BOUND_L(a, b)		bound L_(b), L_(a)

+#define BOUND_W(a, b)		bound W_(b), W_(a)

+#define BSF_L(a, b)		bsf L_(b), L_(a)

+#define BSF_W(a, b)		bsf W_(b), W_(a)

+#define BSR_L(a, b)		bsr L_(b), L_(a)

+#define BSR_W(a, b)		bsr W_(b), W_(a)

+#define BT_L(a, b)		bt L_(b), L_(a)

+#define BT_W(a, b)		bt W_(b), W_(a)

+#define BTC_L(a, b)		btc L_(b), L_(a)

+#define BTC_W(a, b)		btc W_(b), W_(a)

+#define BTR_L(a, b)		btr L_(b), L_(a)

+#define BTR_W(a, b)		btr W_(b), W_(a)

+#define BTS_L(a, b)		bts L_(b), L_(a)

+#define BTS_W(a, b)		bts W_(b), W_(a)

+#define CALL(a)			call a

+#define CALLF(s,a)		call far s:a

+#define CBW			cbw

+#define CWDE			cwde

+#define CLC			clc

+#define CLD			cld

+#define CLI			cli

+#define CLTS			clts

+#define CMC			cmc

+#define CMP_L(a, b)		cmp L_(b), L_(a)

+#define CMP_W(a, b)		cmp W_(b), W_(a)

+#define CMP_B(a, b)		cmp B_(b), B_(a)

+#define CMPS_L			cmpsd

+#define CMPS_W			cmpsw

+#define CMPS_B			cmpsb

+#define CPUID			cpuid

+#define CWD			cwd

+#define CDQ			cdq

+#define DAA			daa

+#define DAS			das

+#define DEC_L(a)		dec L_(a)

+#define DEC_W(a)		dec W_(a)

+#define DEC_B(a)		dec B_(a)

+#define DIV_L(a)		div L_(a)

+#define DIV_W(a)		div W_(a)

+#define DIV_B(a)		div B_(a)

+#define ENTER(a,b)		enter b, a

+#define HLT			hlt

+#define IDIV_L(a)		idiv L_(a)

+#define IDIV_W(a)		idiv W_(a)

+#define IDIV_B(a)		idiv B_(a)

+#define IMUL_L(a, b)		imul L_(b), L_(a)

+#define IMUL_W(a, b)		imul W_(b), W_(a)

+#define IMUL_B(a)		imul B_(a)

+#define IN_L			in EAX, DX

+#define IN_W			in AX, DX

+#define IN_B			in AL, DX

+#define IN1_L(a)		in1 L_(a)

+#define IN1_W(a)		in1 W_(a)

+#define IN1_B(a)		in1 B_(a)

+#define INC_L(a)		inc L_(a)

+#define INC_W(a)		inc W_(a)

+#define INC_B(a)		inc B_(a)

+#define INS_L			ins

+#define INS_W			ins

+#define INS_B			ins

+#define INT(a)			int B_(a)

+#define INT3			int3

+#define INTO			into

+#define IRET			iret

+#define IRETD			iretd

+#define JA(a)			ja NEAR a

+#define JAE(a)			jae NEAR a

+#define JB(a)			jb NEAR a

+#define JBE(a)			jbe NEAR a

+#define JC(a)			jc NEAR a

+#define JE(a)			je NEAR a

+#define JG(a)			jg NEAR a

+#define JGE(a)			jge NEAR a

+#define JL(a)			jl NEAR a

+#define JLE(a)			jle NEAR a

+#define JNA(a)			jna NEAR a

+#define JNAE(a)			jnae NEAR a

+#define JNB(a)			jnb NEAR a

+#define JNBE(a)			jnbe NEAR a

+#define JNC(a)			jnc NEAR a

+#define JNE(a)			jne NEAR a

+#define JNG(a)			jng NEAR a

+#define JNGE(a)			jnge NEAR a

+#define JNL(a)			jnl NEAR a

+#define JNLE(a)			jnle NEAR a

+#define JNO(a)			jno NEAR a

+#define JNP(a)			jnp NEAR a

+#define JNS(a)			jns NEAR a

+#define JNZ(a)			jnz NEAR a

+#define JO(a)			jo NEAR a

+#define JP(a)			jp NEAR a

+#define JPE(a)			jpe NEAR a

+#define JPO(a)			jpo NEAR a

+#define JS(a)			js NEAR a

+#define JZ(a)			jz NEAR a

+#define JMP(a)			jmp a

+#define JMPF(s,a)		jmp far s:a

+#define LAHF			lahf

+#define LAR(a, b)		lar b, a

+#define LEA_L(a, b)		lea P_(b), P_(a)

+#define LEA_W(a, b)		lea P_(b), P_(a)

+#define LEAVE			leave

+#define LGDT(a)			lgdt a

+#define LIDT(a)			lidt a

+#define LDS(a, b)		lds b, P_(a)

+#define LES(a, b)		les b, P_(a)

+#define LFS(a, b)		lfs b, P_(a)

+#define LGS(a, b)		lgs b, P_(a)

+#define LSS(a, b)		lss b, P_(a)

+#define LLDT(a)			lldt a

+#define LMSW(a)			lmsw a

+#define LOCK			lock

+#define LODS_L			lodsd

+#define LODS_W			lodsw

+#define LODS_B			lodsb

+#define LOOP(a)			loop a

+#define LOOPE(a)		loope a

+#define LOOPZ(a)		loopz a

+#define LOOPNE(a)		loopne a

+#define LOOPNZ(a)		loopnz a

+#define LSL(a, b)		lsl b, a

+#define LTR(a)			ltr a

+#define MOV_SR(a, b)		mov SR_(b), SR_(a)

+#define MOV_L(a, b)		mov L_(b), L_(a)

+#define MOV_W(a, b)		mov W_(b), W_(a)

+#define MOV_B(a, b)		mov B_(b), B_(a)

+#define MOVS_L			movsd

+#define MOVS_W			movsw

+#define MOVS_B			movsb

+#define MOVSX_BL(a, b)		movsx B_(b), B_(a)

+#define MOVSX_BW(a, b)		movsx B_(b), B_(a)

+#define MOVSX_WL(a, b)		movsx W_(b), W_(a)

+#define MOVZX_BL(a, b)		movzx B_(b), B_(a)

+#define MOVZX_BW(a, b)		movzx B_(b), B_(a)

+#define MOVZX_WL(a, b)		movzx W_(b), W_(a)

+#define MUL_L(a)		mul L_(a)

+#define MUL_W(a)		mul W_(a)

+#define MUL_B(a)		mul B_(a)

+#define NEG_L(a)		neg L_(a)

+#define NEG_W(a)		neg W_(a)

+#define NEG_B(a)		neg B_(a)

+#define NOP			nop

+#define NOT_L(a)		not L_(a)

+#define NOT_W(a)		not W_(a)

+#define NOT_B(a)		not B_(a)

+#define OR_L(a,b)		or L_(b), L_(a)

+#define OR_W(a,b)		or W_(b), W_(a)

+#define OR_B(a,b)		or B_(b), B_(a)

+#define OUT_L			out DX, EAX

+#define OUT_W			out DX, AX

+#define OUT_B			out DX, AL

+#define OUT1_L(a)		out1 L_(a)

+#define OUT1_W(a)		out1 W_(a)

+#define OUT1_B(a)		out1 B_(a)

+#define OUTS_L			outsd

+#define OUTS_W			outsw

+#define OUTS_B			outsb

+#define POP_SR(a)		pop SR_(a)

+#define POP_L(a)		pop L_(a)

+#define POP_W(a)		pop W_(a)

+#define POPA_L			popad

+#define POPA_W			popa

+#define POPF_L			popfd

+#define POPF_W			popf

+#define PUSH_SR(a)		push SR_(a)

+#define PUSH_L(a)		push L_(a)

+#define PUSH_W(a)		push W_(a)

+#define PUSH_B(a)		push B_(a)

+#define PUSHA_L			pushad

+#define PUSHA_W			pusha

+#define PUSHF_L			pushfd

+#define PUSHF_W			pushf

+#define RCL_L(a, b)		rcl L_(b), L_(a)

+#define RCL_W(a, b)		rcl W_(b), W_(a)

+#define RCL_B(a, b)		rcl B_(b), B_(a)

+#define RCR_L(a, b)		rcr L_(b), L_(a)

+#define RCR_W(a, b)		rcr W_(b), W_(a)

+#define RCR_B(a, b)		rcr B_(b), B_(a)

+#define RDTSC			rdtsc

+#define ROL_L(a, b)		rol L_(b), L_(a)

+#define ROL_W(a, b)		rol W_(b), W_(a)

+#define ROL_B(a, b)		rol B_(b), B_(a)

+#define ROR_L(a, b)		ror L_(b), L_(a)

+#define ROR_W(a, b)		ror W_(b), W_(a)

+#define ROR_B(a, b)		ror B_(b), B_(a)

+#define REP			rep

+#define REPE			repe

+#define REPNE			repne

+#define REPNZ			REPNE

+#define REPZ			REPE

+#define RET			ret

+#define SAHF			sahf

+#define SAL_L(a, b)		sal L_(b), B_(a)

+#define SAL_W(a, b)		sal W_(b), B_(a)

+#define SAL_B(a, b)		sal B_(b), B_(a)

+#define SAR_L(a, b)		sar L_(b), B_(a)

+#define SAR_W(a, b)		sar W_(b), B_(a)

+#define SAR_B(a, b)		sar B_(b), B_(a)

+#define SBB_L(a, b)		sbb L_(b), L_(a)

+#define SBB_W(a, b)		sbb W_(b), W_(a)

+#define SBB_B(a, b)		sbb B_(b), B_(a)

+#define SCAS_L			scas

+#define SCAS_W			scas

+#define SCAS_B			scas

+#define SETA(a)			seta a

+#define SETAE(a)		setae a

+#define SETB(a)			setb a

+#define SETBE(a)		setbe a

+#define SETC(a)			setc a

+#define SETE(a)			sete a

+#define SETG(a)			setg a

+#define SETGE(a)		setge a

+#define SETL(a)			setl a

+#define SETLE(a)		setle a

+#define SETNA(a)		setna a

+#define SETNAE(a)		setnae a

+#define SETNB(a)		setnb a

+#define SETNBE(a)		setnbe a

+#define SETNC(a)		setnc a

+#define SETNE(a)		setne a

+#define SETNG(a)		setng a

+#define SETNGE(a)		setnge a

+#define SETNL(a)		setnl a

+#define SETNLE(a)		setnle a

+#define SETNO(a)		setno a

+#define SETNP(a)		setnp a

+#define SETNS(a)		setns a

+#define SETNZ(a)		setnz a

+#define SETO(a)			seto a

+#define SETP(a)			setp a

+#define SETPE(a)		setpe a

+#define SETPO(a)		setpo a

+#define SETS(a)			sets a

+#define SETZ(a)			setz a

+#define SGDT(a)			sgdt a

+#define SIDT(a)			sidt a

+#define SHL_L(a, b)		shl L_(b), B_(a)

+#define SHL_W(a, b)		shl W_(b), B_(a)

+#define SHL_B(a, b)		shl B_(b), B_(a)

+#define SHLD_L(a,b,c)		shld

+#define SHLD2_L(a,b)		shld L_(b), L_(a)

+#define SHLD_W(a,b,c)		shld

+#define SHLD2_W(a,b)		shld W_(b), W_(a)

+#define SHR_L(a, b)		shr L_(b), B_(a)

+#define SHR_W(a, b)		shr W_(b), B_(a)

+#define SHR_B(a, b)		shr B_(b), B_(a)

+#define SHRD_L(a,b,c)		shrd

+#define SHRD2_L(a,b)		shrd L_(b), L_(a)

+#define SHRD_W(a,b,c)		shrd

+#define SHRD2_W(a,b)		shrd W_(b), W_(a)

+#define SLDT(a)			sldt a

+#define SMSW(a)			smsw a

+#define STC			stc

+#define STD			std

+#define STI			sti

+#define STOS_L			stosd

+#define STOS_W			stosw

+#define STOS_B			stosb

+#define STR(a)			str a

+#define SUB_L(a, b)		sub L_(b), L_(a)

+#define SUB_W(a, b)		sub W_(b), W_(a)

+#define SUB_B(a, b)		sub B_(b), B_(a)

+#define TEST_L(a, b)		test L_(b), L_(a)

+#define TEST_W(a, b)		test W_(b), W_(a)

+#define TEST_B(a, b)		test B_(b), B_(a)

+#define VERR(a)			verr a

+#define VERW(a)			verw a

+#define WAIT			wait

+#define XCHG_L(a, b)		xchg L_(b), L_(a)

+#define XCHG_W(a, b)		xchg W_(b), W_(a)

+#define XCHG_B(a, b)		xchg B_(b), B_(a)

+#define XLAT			xlat

+#define XOR_L(a, b)		xor L_(b), L_(a)

+#define XOR_W(a, b)		xor W_(b), W_(a)

+#define XOR_B(a, b)		xor B_(b), B_(a)

+

+

+/* Floating Point Instructions */

+#define F2XM1			f2xm1

+#define FABS			fabs

+#define FADD_D(a)		fadd D_(a)

+#define FADD_S(a)		fadd S_(a)

+#define FADD2(a, b)		fadd b, a

+#define FADDP(a, b)		faddp b, a

+#define FIADD_L(a)		fiadd L_(a)

+#define FIADD_W(a)		fiadd W_(a)

+#define FBLD(a)			fbld a

+#define FBSTP(a)		fbstp a

+#define FCHS			fchs

+#define FCLEX			fclex

+#define FNCLEX			fnclex

+#define FCOM(a)			fcom a

+#define FCOM_D(a)		fcom D_(a)

+#define FCOM_S(a)		fcom S_(a)

+#define FCOMP(a)		fcomp a

+#define FCOMP_D(a)		fcomp D_(a)

+#define FCOMP_S(a)		fcomp S_(a)

+#define FCOMPP			fcompp

+#define FCOS			fcos

+#define FDECSTP			fdecstp

+#define FDIV_D(a)		fdiv D_(a)

+#define FDIV_S(a)		fdiv S_(a)

+#define FDIV2(a, b)		fdiv b, a

+#define FDIVP(a, b)		fdivp b, a

+#define FIDIV_L(a)		fidiv L_(a)

+#define FIDIV_W(a)		fidiv W_(a)

+#define FDIVR_D(a)		fdivr D_(a)

+#define FDIVR_S(a)		fdivr S_(a)

+#define FDIVR2(a, b)		fdivr b, a

+#define FDIVRP(a, b)		fdivrp b, a

+#define FIDIVR_L(a)		fidivr L_(a)

+#define FIDIVR_W(a)		fidivr W_(a)

+#define FFREE(a)		ffree a

+#define FICOM_L(a)		ficom L_(a)

+#define FICOM_W(a)		ficom W_(a)

+#define FICOMP_L(a)		ficomp L_(a)

+#define FICOMP_W(a)		ficomp W_(a)

+#define FILD_Q(a)		fild D_(a)

+#define FILD_L(a)		fild L_(a)

+#define FILD_W(a)		fild W_(a)

+#define FINCSTP			fincstp

+#define FINIT			finit

+#define FNINIT			fninit

+#define FIST_L(a)		fist L_(a)

+#define FIST_W(a)		fist W_(a)

+#define FISTP_Q(a)		fistp D_(a)

+#define FISTP_L(a)		fistp L_(a)

+#define FISTP_W(a)		fistp W_(a)

+#define FLD_X(a)		fld X_(a)

+#define FLD_D(a)		fld D_(a)

+#define FLD_S(a)		fld S_(a)

+#define FLD1			fld1

+#define FLDL2T			fldl2t

+#define FLDL2E			fldl2e

+#define FLDPI			fldpi

+#define FLDLG2			fldlg2

+#define FLDLN2			fldln2

+#define FLDZ			fldz

+#define FLDCW(a)		fldcw a

+#define FLDENV(a)		fldenv a

+#define FMUL_S(a)		fmul S_(a)

+#define FMUL_D(a)		fmul D_(a)

+#define FMUL2(a, b)		fmul b, a

+#define FMULP(a, b)		fmulp b, a

+#define FIMUL_L(a)		fimul L_(a)

+#define FIMUL_W(a)		fimul W_(a)

+#define FNOP			fnop

+#define FPATAN			fpatan

+#define FPREM			fprem

+#define FPREM1			fprem1

+#define FPTAN			fptan

+#define FRNDINT			frndint

+#define FRSTOR(a)		frstor a

+#define FSAVE(a)		fsave a

+#define FNSAVE(a)		fnsave a

+#define FSCALE			fscale

+#define FSIN			fsin

+#define FSINCOS			fsincos

+#define FSQRT			fsqrt

+#define FST_D(a)		fst D_(a)

+#define FST_S(a)		fst S_(a)

+#define FSTP_X(a)		fstp X_(a)

+#define FSTP_D(a)		fstp D_(a)

+#define FSTP_S(a)		fstp S_(a)

+#define FSTP(a)			fstp a

+#define FSTCW(a)		fstcw a

+#define FNSTCW(a)		fnstcw a

+#define FSTENV(a)		fstenv a

+#define FNSTENV(a)		fnstenv a

+#define FSTSW(a)		fstsw a

+#define FNSTSW(a)		fnstsw a

+#define FSUB_S(a)		fsub S_(a)

+#define FSUB_D(a)		fsub D_(a)

+#define FSUB2(a, b)		fsub b, a

+#define FSUBP(a, b)		fsubp b, a

+#define FISUB_L(a)		fisub L_(a)

+#define FISUB_W(a)		fisub W_(a)

+#define FSUBR_S(a)		fsubr S_(a)

+#define FSUBR_D(a)		fsubr D_(a)

+#define FSUBR2(a, b)		fsubr b, a

+#define FSUBRP(a, b)		fsubrp b, a

+#define FISUBR_L(a)		fisubr L_(a)

+#define FISUBR_W(a)		fisubr W_(a)

+#define FTST			ftst

+#define FUCOM(a)		fucom a

+#define FUCOMP(a)		fucomp a

+#define FUCOMPP			fucompp

+#define FWAIT			fwait

+#define FXAM			fxam

+#define FXCH(a)			fxch a

+#define FXTRACT			fxtract

+#define FYL2X			fyl2x

+#define FYL2XP1			fyl2xp1

+

+#endif /* NASM_ASSEMBLER, MASM_ASSEMBLER */

+

+	/****************************************/

+	/*					*/

+	/*	Extensions to x86 insn set -	*/

+	/*	MMX, 3DNow!			*/

+	/*					*/

+	/****************************************/

+

+#if defined(NASM_ASSEMBLER) || defined(MASM_ASSEMBLER)

+#define P_ARG1(a)		P_ ## a

+#define P_ARG2(a, b)		P_ ## b, P_ ## a

+#define P_ARG3(a, b, c)		P_ ## c, P_ ## b, P_ ## a

+#else

+#define P_ARG1(a)		a

+#define P_ARG2(a, b)		a, b

+#define P_ARG3(a, b, c)		a, b, c

+#endif

+

+/* MMX */

+#define MOVD(a, b)		movd P_ARG2(a, b)

+#define MOVQ(a, b)		movq P_ARG2(a, b)

+

+#define PADDB(a, b)		paddb P_ARG2(a, b)

+#define PADDW(a, b)		paddw P_ARG2(a, b)

+#define PADDD(a, b)		paddd P_ARG2(a, b)

+

+#define PADDSB(a, b)		paddsb P_ARG2(a, b)

+#define PADDSW(a, b)		paddsw P_ARG2(a, b)

+

+#define PADDUSB(a, b)		paddusb P_ARG2(a, b)

+#define PADDUSW(a, b)		paddusw P_ARG2(a, b)

+

+#define PSUBB(a, b)		psubb P_ARG2(a, b)

+#define PSUBW(a, b)		psubw P_ARG2(a, b)

+#define PSUBD(a, b)		psubd P_ARG2(a, b)

+

+#define PSUBSB(a, b)		psubsb P_ARG2(a, b)

+#define PSUBSW(a, b)		psubsw P_ARG2(a, b)

+

+#define PSUBUSB(a, b)		psubusb P_ARG2(a, b)

+#define PSUBUSW(a, b)		psubusw P_ARG2(a, b)

+

+#define PCMPEQB(a, b)		pcmpeqb P_ARG2(a, b)

+#define PCMPEQW(a, b)		pcmpeqw P_ARG2(a, b)

+#define PCMPEQD(a, b)		pcmpeqd P_ARG2(a, b)

+

+#define PCMPGTB(a, b)		pcmpgtb P_ARG2(a, b)

+#define PCMPGTW(a, b)		pcmpgtw P_ARG2(a, b)

+#define PCMPGTD(a, b)		pcmpgtd P_ARG2(a, b)

+

+#define PMULHW(a, b)		pmulhw P_ARG2(a, b)

+#define PMULLW(a, b)		pmullw P_ARG2(a, b)

+

+#define PMADDWD(a, b)		pmaddwd P_ARG2(a, b)

+

+#define PAND(a, b)		pand P_ARG2(a, b)

+

+#define PANDN(a, b)		pandn P_ARG2(a, b)

+

+#define POR(a, b)		por P_ARG2(a, b)

+

+#define PXOR(a, b)		pxor P_ARG2(a, b)

+

+#define PSRAW(a, b)		psraw P_ARG2(a, b)

+#define PSRAD(a, b)		psrad P_ARG2(a, b)

+

+#define PSRLW(a, b)		psrlw P_ARG2(a, b)

+#define PSRLD(a, b)		psrld P_ARG2(a, b)

+#define PSRLQ(a, b)		psrlq P_ARG2(a, b)

+

+#define PSLLW(a, b)		psllw P_ARG2(a, b)

+#define PSLLD(a, b)		pslld P_ARG2(a, b)

+#define PSLLQ(a, b)		psllq P_ARG2(a, b)

+

+#define PACKSSWB(a, b)		packsswb P_ARG2(a, b)

+#define PACKSSDW(a, b)		packssdw P_ARG2(a, b)

+#define PACKUSWB(a, b)		packuswb P_ARG2(a, b)

+

+#define PUNPCKHBW(a, b)		punpckhbw P_ARG2(a, b)

+#define PUNPCKHWD(a, b)		punpckhwd P_ARG2(a, b)

+#define PUNPCKHDQ(a, b)		punpckhdq P_ARG2(a, b)

+#define PUNPCKLBW(a, b)		punpcklbw P_ARG2(a, b)

+#define PUNPCKLWD(a, b)		punpcklwd P_ARG2(a, b)

+#define PUNPCKLDQ(a, b)		punpckldq P_ARG2(a, b)

+

+#define EMMS			emms

+

+/* AMD 3DNow! */

+#define PAVGUSB(a, b)		pavgusb P_ARG2(a, b)

+#define PFADD(a, b)		pfadd P_ARG2(a, b)

+#define PFSUB(a, b)		pfsub P_ARG2(a, b)

+#define PFSUBR(a, b)		pfsubr P_ARG2(a, b)

+#define PFACC(a, b)		pfacc P_ARG2(a, b)

+#define PFCMPGE(a, b)		pfcmpge P_ARG2(a, b)

+#define PFCMPGT(a, b)		pfcmpgt P_ARG2(a, b)

+#define PFCMPEQ(a, b)		pfcmpeq P_ARG2(a, b)

+#define PFMIN(a, b)		pfmin P_ARG2(a, b)

+#define PFMAX(a, b)		pfmax P_ARG2(a, b)

+#define PI2FD(a, b)		pi2fd P_ARG2(a, b)

+#define PF2ID(a, b)		pf2id P_ARG2(a, b)

+#define PFRCP(a, b)		pfrcp P_ARG2(a, b)

+#define PFRSQRT(a, b)		pfrsqrt P_ARG2(a, b)

+#define PFMUL(a, b)		pfmul P_ARG2(a, b)

+#define PFRCPIT1(a, b)		pfrcpit1 P_ARG2(a, b)

+#define PFRSQIT1(a, b)		pfrsqit1 P_ARG2(a, b)

+#define PFRCPIT2(a, b)		pfrcpit2 P_ARG2(a, b)

+#define PMULHRW(a, b)		pmulhrw P_ARG2(a, b)

+

+#define FEMMS			femms

+#define PREFETCH(a)		prefetch P_ARG1(a)

+#define PREFETCHW(a)		prefetchw P_ARG1(a)

+

+/* Intel SSE */

+#define ADDPS(a, b)		addps P_ARG2(a, b)

+#define ADDSS(a, b)		addss P_ARG2(a, b)

+#define ANDNPS(a, b)		andnps P_ARG2(a, b)

+#define ANDPS(a, b)		andps P_ARG2(a, b)

+/* NASM only knows the pseudo ops for these.

+#define CMPPS(a, b, c)		cmpps P_ARG3(a, b, c)

+#define CMPSS(a, b, c)		cmpss P_ARG3(a, b, c)

+*/

+#define CMPEQPS(a, b)		cmpeqps P_ARG2(a, b)

+#define CMPLTPS(a, b)		cmpltps P_ARG2(a, b)

+#define CMPLEPS(a, b)		cmpleps P_ARG2(a, b)

+#define CMPUNORDPS(a, b)	cmpunordps P_ARG2(a, b)

+#define CMPNEQPS(a, b)		cmpneqps P_ARG2(a, b)

+#define CMPNLTPS(a, b)		cmpnltps P_ARG2(a, b)

+#define CMPNLEPS(a, b)		cmpnleps P_ARG2(a, b)

+#define CMPORDPS(a, b)		cmpordps P_ARG2(a, b)

+#define CMPEQSS(a, b)		cmpeqss P_ARG2(a, b)

+#define CMPLTSS(a, b)		cmpltss P_ARG2(a, b)

+#define CMPLESS(a, b)		cmpless P_ARG2(a, b)

+#define CMPUNORDSS(a, b)	cmpunordss P_ARG2(a, b)

+#define CMPNEQSS(a, b)		cmpneqss P_ARG2(a, b)

+#define CMPNLTSS(a, b)		cmpnltss P_ARG2(a, b)

+#define CMPNLESS(a, b)		cmpnless P_ARG2(a, b)

+#define CMPORDSS(a, b)		cmpordss P_ARG2(a, b)

+#define COMISS(a, b)		comiss P_ARG2(a, b)

+#define CVTPI2PS(a, b)		cvtpi2ps P_ARG2(a, b)

+#define CVTPS2PI(a, b)		cvtps2pi P_ARG2(a, b)

+#define CVTSI2SS(a, b)		cvtsi2ss P_ARG2(a, b)

+#define CVTSS2SI(a, b)		cvtss2si P_ARG2(a, b)

+#define CVTTPS2PI(a, b)		cvttps2pi P_ARG2(a, b)

+#define CVTTSS2SI(a, b)		cvttss2si P_ARG2(a, b)

+#define DIVPS(a, b)		divps P_ARG2(a, b)

+#define DIVSS(a, b)		divss P_ARG2(a, b)

+#define FXRSTOR(a)		fxrstor P_ARG1(a)

+#define FXSAVE(a)		fxsave P_ARG1(a)

+#define LDMXCSR(a)		ldmxcsr P_ARG1(a)

+#define MAXPS(a, b)		maxps P_ARG2(a, b)

+#define MAXSS(a, b)		maxss P_ARG2(a, b)

+#define MINPS(a, b)		minps P_ARG2(a, b)

+#define MINSS(a, b)		minss P_ARG2(a, b)

+#define MOVAPS(a, b)		movaps P_ARG2(a, b)

+#define MOVHLPS(a, b)		movhlps P_ARG2(a, b)

+#define MOVHPS(a, b)		movhps P_ARG2(a, b)

+#define MOVLHPS(a, b)		movlhps P_ARG2(a, b)

+#define MOVLPS(a, b)		movlps P_ARG2(a, b)

+#define MOVMSKPS(a, b)		movmskps P_ARG2(a, b)

+#define MOVNTPS(a, b)		movntps P_ARG2(a, b)

+#define MOVNTQ(a, b)		movntq P_ARG2(a, b)

+#define MOVSS(a, b)		movss P_ARG2(a, b)

+#define MOVUPS(a, b)		movups P_ARG2(a, b)

+#define MULPS(a, b)		mulps P_ARG2(a, b)

+#define MULSS(a, b)		mulss P_ARG2(a, b)

+#define ORPS(a, b)		orps P_ARG2(a, b)

+#define RCPPS(a, b)		rcpps P_ARG2(a, b)

+#define RCPSS(a, b)		rcpss P_ARG2(a, b)

+#define RSQRTPS(a, b)		rsqrtps P_ARG2(a, b)

+#define RSQRTSS(a, b)		rsqrtss P_ARG2(a, b)

+#define SHUFPS(a, b, c)		shufps P_ARG3(a, b, c)

+#define SQRTPS(a, b)		sqrtps P_ARG2(a, b)

+#define SQRTSS(a, b)		sqrtss P_ARG2(a, b)

+#define STMXCSR(a)		stmxcsr P_ARG1(a)

+#define SUBPS(a, b)		subps P_ARG2(a, b)

+#define UCOMISS(a, b)		ucomiss P_ARG2(a, b)

+#define UNPCKHPS(a, b)		unpckhps P_ARG2(a, b)

+#define UNPCKLPS(a, b)		unpcklps P_ARG2(a, b)

+#define XORPS(a, b)		xorps P_ARG2(a, b)

+

+#define PREFETCHNTA(a)		prefetchnta P_ARG1(a)

+#define PREFETCHT0(a)		prefetcht0 P_ARG1(a)

+#define PREFETCHT1(a)		prefetcht1 P_ARG1(a)

+#define PREFETCHT2(a)		prefetcht2 P_ARG1(a)

+#define SFENCE			sfence

+

+/* Added by BrianP for FreeBSD (per David Dawes) */

+#if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) && !defined(__bsdi__)

+#define LLBL(a)		CONCAT(.L,a)

+#define LLBL2(a,b)	CONCAT3(.L,a,b)

+#else

+#define LLBL(a)		a

+#define LLBL2(a,b)	CONCAT(a,b)

+#endif

+

+/* Segment overrides */

+#define SEGCS		D_BYTE	46

+#define SEGDS		D_BYTE	62

+#define SEGES		D_BYTE	38

+#define SEGFS		D_BYTE	100

+#define SEGGS		D_BYTE	101

+

+/* Temporary labels: valid until next non-local label */

+#ifdef NASM_ASSEMBLER

+#define TLBL(a)		CONCAT(.,a)

+#else

+#define TLBL(a)		CONCAT(a,$)

+#endif

+

+/* Hidden symbol visibility support.

+ * If we build with gcc's -fvisibility=hidden flag, we'll need to change

+ * the symbol visibility mode to 'default'.

+ */

+#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)

+#  define HIDDEN(x) .hidden x

+#elif defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)

+#  pragma GCC visibility push(default)

+#  define HIDDEN(x) .hidden x

+#else

+#  define HIDDEN(x)

+#endif

+

+#endif /* __ASSYNTAX_H__ */

diff --git a/mesalib/src/mesa/x86/clip_args.h b/mesalib/src/mesa/x86/clip_args.h
new file mode 100644
index 000000000..faa3c6f87
--- /dev/null
+++ b/mesalib/src/mesa/x86/clip_args.h
@@ -0,0 +1,59 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * Clip test function interface for assembly code.  Simply define

+ * FRAME_OFFSET to the number of bytes pushed onto the stack before

+ * using the ARG_* argument macros.

+ *

+ * Gareth Hughes

+ */

+

+#ifndef __CLIP_ARGS_H__

+#define __CLIP_ARGS_H__

+

+/*

+ * Offsets for clip_func arguments

+ *

+ * typedef GLvector4f *(*clip_func)( GLvector4f *clip_vec,

+ *	                             GLvector4f *proj_vec,

+ *	                             GLubyte clipMask[],

+ *	                             GLubyte *orMask,

+ *	                             GLubyte *andMask );

+ */

+

+#define OFFSET_SOURCE	4

+#define OFFSET_DEST	8

+#define OFFSET_CLIP	12

+#define OFFSET_OR	16

+#define OFFSET_AND	20

+

+#define ARG_SOURCE	REGOFF(FRAME_OFFSET+OFFSET_SOURCE, ESP)

+#define ARG_DEST	REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)

+#define ARG_CLIP	REGOFF(FRAME_OFFSET+OFFSET_CLIP, ESP)

+#define ARG_OR		REGOFF(FRAME_OFFSET+OFFSET_OR, ESP)

+#define ARG_AND		REGOFF(FRAME_OFFSET+OFFSET_AND, ESP)

+

+#endif

diff --git a/mesalib/src/mesa/x86/common_x86.c b/mesalib/src/mesa/x86/common_x86.c
new file mode 100644
index 000000000..f5b9357cc
--- /dev/null
+++ b/mesalib/src/mesa/x86/common_x86.c
@@ -0,0 +1,336 @@
+/*

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

+ */

+

+/**

+ * \file common_x86.c

+ *

+ * Check CPU capabilities & initialize optimized funtions for this particular

+ * processor.

+ *

+ * Changed by Andre Werthmann for using the new SSE functions.

+ *

+ * \author Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>

+ * \author Andre Werthmann <wertmann@cs.uni-potsdam.de>

+ */

+

+/* XXX these includes should probably go into imports.h or glheader.h */

+#if defined(USE_SSE_ASM) && defined(__linux__)

+#include <linux/version.h>

+#endif

+#if defined(USE_SSE_ASM) && defined(__FreeBSD__)

+#include <sys/types.h>

+#include <sys/sysctl.h>

+#endif

+#if defined(USE_SSE_ASM) && defined(__OpenBSD__)

+#include <sys/param.h>

+#include <sys/sysctl.h>

+#include <machine/cpu.h>

+#endif

+

+#include "main/imports.h"

+#include "common_x86_asm.h"

+

+

+/** Bitmask of X86_FEATURE_x bits */

+int _mesa_x86_cpu_features = 0x0;

+

+static int detection_debug = GL_FALSE;

+

+/* No reason for this to be public.

+ */

+extern GLuint	_ASMAPI _mesa_x86_has_cpuid(void);

+extern void	_ASMAPI _mesa_x86_cpuid(GLuint op, GLuint *reg_eax, GLuint *reg_ebx, GLuint *reg_ecx, GLuint *reg_edx);

+extern GLuint	_ASMAPI _mesa_x86_cpuid_eax(GLuint op);

+extern GLuint	_ASMAPI _mesa_x86_cpuid_ebx(GLuint op);

+extern GLuint	_ASMAPI _mesa_x86_cpuid_ecx(GLuint op);

+extern GLuint	_ASMAPI _mesa_x86_cpuid_edx(GLuint op);

+

+

+#if defined(USE_SSE_ASM)

+/*

+ * We must verify that the Streaming SIMD Extensions are truly supported

+ * on this processor before we go ahead and hook out the optimized code.

+ *

+ * However, I have been told by Alan Cox that all 2.4 (and later) Linux

+ * kernels provide full SSE support on all processors that expose SSE via

+ * the CPUID mechanism.

+ */

+

+/* These are assembly functions: */

+extern void _mesa_test_os_sse_support( void );

+extern void _mesa_test_os_sse_exception_support( void );

+

+

+#if defined(WIN32)

+#ifndef STATUS_FLOAT_MULTIPLE_TRAPS

+# define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L)

+#endif

+static LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS exp)

+{

+   PEXCEPTION_RECORD rec = exp->ExceptionRecord;

+   PCONTEXT ctx = exp->ContextRecord;

+

+   if ( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION ) {

+      _mesa_debug(NULL, "EXCEPTION_ILLEGAL_INSTRUCTION\n" );

+      _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);

+   } else if ( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS ) {

+      _mesa_debug(NULL, "STATUS_FLOAT_MULTIPLE_TRAPS\n");

+      /* Windows seems to clear the exception flag itself, we just have to increment Eip */

+   } else {

+      _mesa_debug(NULL, "UNEXPECTED EXCEPTION (0x%08x), terminating!\n" );

+      return EXCEPTION_EXECUTE_HANDLER;

+   }

+

+   if ( (ctx->ContextFlags & CONTEXT_CONTROL) != CONTEXT_CONTROL ) {

+      _mesa_debug(NULL, "Context does not contain control registers, terminating!\n");

+      return EXCEPTION_EXECUTE_HANDLER;

+   }

+   ctx->Eip += 3;

+

+   return EXCEPTION_CONTINUE_EXECUTION;

+}

+#endif /* WIN32 */

+

+

+/**

+ * Check if SSE is supported.

+ * If not, turn off the X86_FEATURE_XMM flag in _mesa_x86_cpu_features.

+ */

+void _mesa_check_os_sse_support( void )

+{

+#if defined(__FreeBSD__)

+   {

+      int ret, enabled;

+      unsigned int len;

+      len = sizeof(enabled);

+      ret = sysctlbyname("hw.instruction_sse", &enabled, &len, NULL, 0);

+      if (ret || !enabled)

+         _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);

+   }

+#elif defined (__NetBSD__)

+   {

+      int ret, enabled;

+      size_t len = sizeof(enabled);

+      ret = sysctlbyname("machdep.sse", &enabled, &len, (void *)NULL, 0);

+      if (ret || !enabled)

+         _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);

+   }

+#elif defined(__OpenBSD__)

+   {

+      int mib[2];

+      int ret, enabled;

+      size_t len = sizeof(enabled);

+

+      mib[0] = CTL_MACHDEP;

+      mib[1] = CPU_SSE;

+

+      ret = sysctl(mib, 2, &enabled, &len, NULL, 0);

+      if (ret || !enabled)

+         _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);

+   }

+#elif defined(WIN32)

+   LPTOP_LEVEL_EXCEPTION_FILTER oldFilter;

+   

+   /* Install our ExceptionFilter */

+   oldFilter = SetUnhandledExceptionFilter( ExceptionFilter );

+   

+   if ( cpu_has_xmm ) {

+      _mesa_debug(NULL, "Testing OS support for SSE...\n");

+

+      _mesa_test_os_sse_support();

+

+      if ( cpu_has_xmm ) {

+	 _mesa_debug(NULL, "Yes.\n");

+      } else {

+	 _mesa_debug(NULL, "No!\n");

+      }

+   }

+

+   if ( cpu_has_xmm ) {

+      _mesa_debug(NULL, "Testing OS support for SSE unmasked exceptions...\n");

+

+      _mesa_test_os_sse_exception_support();

+

+      if ( cpu_has_xmm ) {

+	 _mesa_debug(NULL, "Yes.\n");

+      } else {

+	 _mesa_debug(NULL, "No!\n");

+      }

+   }

+

+   /* Restore previous exception filter */

+   SetUnhandledExceptionFilter( oldFilter );

+

+   if ( cpu_has_xmm ) {

+      _mesa_debug(NULL, "Tests of OS support for SSE passed.\n");

+   } else {

+      _mesa_debug(NULL, "Tests of OS support for SSE failed!\n");

+   }

+#else

+   /* Do nothing on other platforms for now.

+    */

+   if (detection_debug)

+      _mesa_debug(NULL, "Not testing OS support for SSE, leaving enabled.\n");

+#endif /* __FreeBSD__ */

+}

+

+#endif /* USE_SSE_ASM */

+

+

+/**

+ * Initialize the _mesa_x86_cpu_features bitfield.

+ * This is a no-op if called more than once.

+ */

+void

+_mesa_get_x86_features(void)

+{

+   static int called = 0;

+

+   if (called)

+      return;

+

+   called = 1;

+

+#ifdef USE_X86_ASM

+   _mesa_x86_cpu_features = 0x0;

+

+   if (_mesa_getenv( "MESA_NO_ASM")) {

+      return;

+   }

+

+   if (!_mesa_x86_has_cpuid()) {

+       _mesa_debug(NULL, "CPUID not detected\n");

+   }

+   else {

+       GLuint cpu_features;

+       GLuint cpu_ext_features;

+       GLuint cpu_ext_info;

+       char cpu_vendor[13];

+       GLuint result;

+

+       /* get vendor name */

+       _mesa_x86_cpuid(0, &result, (GLuint *)(cpu_vendor + 0), (GLuint *)(cpu_vendor + 8), (GLuint *)(cpu_vendor + 4));

+       cpu_vendor[12] = '\0';

+

+       if (detection_debug)

+	  _mesa_debug(NULL, "CPU vendor: %s\n", cpu_vendor);

+

+       /* get cpu features */

+       cpu_features = _mesa_x86_cpuid_edx(1);

+

+       if (cpu_features & X86_CPU_FPU)

+	   _mesa_x86_cpu_features |= X86_FEATURE_FPU;

+       if (cpu_features & X86_CPU_CMOV)

+	   _mesa_x86_cpu_features |= X86_FEATURE_CMOV;

+

+#ifdef USE_MMX_ASM

+       if (cpu_features & X86_CPU_MMX)

+	   _mesa_x86_cpu_features |= X86_FEATURE_MMX;

+#endif

+

+#ifdef USE_SSE_ASM

+       if (cpu_features & X86_CPU_XMM)

+	   _mesa_x86_cpu_features |= X86_FEATURE_XMM;

+       if (cpu_features & X86_CPU_XMM2)

+	   _mesa_x86_cpu_features |= X86_FEATURE_XMM2;

+#endif

+

+       /* query extended cpu features */

+       if ((cpu_ext_info = _mesa_x86_cpuid_eax(0x80000000)) > 0x80000000) {

+	   if (cpu_ext_info >= 0x80000001) {

+

+	       cpu_ext_features = _mesa_x86_cpuid_edx(0x80000001);

+

+	       if (cpu_features & X86_CPU_MMX) {

+

+#ifdef USE_3DNOW_ASM

+		   if (cpu_ext_features & X86_CPUEXT_3DNOW)

+		       _mesa_x86_cpu_features |= X86_FEATURE_3DNOW;

+		   if (cpu_ext_features & X86_CPUEXT_3DNOW_EXT)

+		       _mesa_x86_cpu_features |= X86_FEATURE_3DNOWEXT;

+#endif

+

+#ifdef USE_MMX_ASM

+		   if (cpu_ext_features & X86_CPUEXT_MMX_EXT)

+		       _mesa_x86_cpu_features |= X86_FEATURE_MMXEXT;

+#endif

+	       }

+	   }

+

+	   /* query cpu name */

+	   if (cpu_ext_info >= 0x80000002) {

+	       GLuint ofs;

+	       char cpu_name[49];

+	       for (ofs = 0; ofs < 3; ofs++)

+		   _mesa_x86_cpuid(0x80000002+ofs, (GLuint *)(cpu_name + (16*ofs)+0), (GLuint *)(cpu_name + (16*ofs)+4), (GLuint *)(cpu_name + (16*ofs)+8), (GLuint *)(cpu_name + (16*ofs)+12));

+	       cpu_name[48] = '\0'; /* the name should be NULL terminated, but just to be sure */

+

+	       if (detection_debug)

+		  _mesa_debug(NULL, "CPU name: %s\n", cpu_name);

+	   }

+       }

+

+   }

+

+#ifdef USE_MMX_ASM

+   if ( cpu_has_mmx ) {

+      if ( _mesa_getenv( "MESA_NO_MMX" ) == 0 ) {

+	 if (detection_debug)

+	    _mesa_debug(NULL, "MMX cpu detected.\n");

+      } else {

+         _mesa_x86_cpu_features &= ~(X86_FEATURE_MMX);

+      }

+   }

+#endif

+

+#ifdef USE_3DNOW_ASM

+   if ( cpu_has_3dnow ) {

+      if ( _mesa_getenv( "MESA_NO_3DNOW" ) == 0 ) {

+	 if (detection_debug)

+	    _mesa_debug(NULL, "3DNow! cpu detected.\n");

+      } else {

+         _mesa_x86_cpu_features &= ~(X86_FEATURE_3DNOW);

+      }

+   }

+#endif

+

+#ifdef USE_SSE_ASM

+   if ( cpu_has_xmm ) {

+      if ( _mesa_getenv( "MESA_NO_SSE" ) == 0 ) {

+	 if (detection_debug)

+	    _mesa_debug(NULL, "SSE cpu detected.\n");

+         if ( _mesa_getenv( "MESA_FORCE_SSE" ) == 0 ) {

+            _mesa_check_os_sse_support();

+         }

+      } else {

+         _mesa_debug(NULL, "SSE cpu detected, but switched off by user.\n");

+         _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);

+      }

+   }

+#endif

+

+#endif /* USE_X86_ASM */

+

+   (void) detection_debug;

+}

diff --git a/mesalib/src/mesa/x86/common_x86_asm.S b/mesalib/src/mesa/x86/common_x86_asm.S
new file mode 100644
index 000000000..1d61bde58
--- /dev/null
+++ b/mesalib/src/mesa/x86/common_x86_asm.S
@@ -0,0 +1,220 @@
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.3

+ *

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

+ */

+

+/*

+ * Check extended CPU capabilities.  Now justs returns the raw CPUID

+ * feature information, allowing the higher level code to interpret the

+ * results.

+ *

+ * Written by Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>

+ *

+ * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com>

+ *

+ */

+

+/*

+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially

+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces

+ * in there will break the build on some platforms.

+ */

+

+#include "matypes.h"

+#include "assyntax.h"

+#include "common_x86_features.h"

+

+	SEG_TEXT

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_x86_has_cpuid)

+HIDDEN(_mesa_x86_has_cpuid)

+GLNAME(_mesa_x86_has_cpuid):

+

+	/* Test for the CPUID command.  If the ID Flag bit in EFLAGS

+	 * (bit 21) is writable, the CPUID command is present */

+	PUSHF_L

+	POP_L	(EAX)

+	MOV_L	(EAX, ECX)

+	XOR_L	(CONST(0x00200000), EAX)

+	PUSH_L	(EAX)

+	POPF_L

+	PUSHF_L

+	POP_L	(EAX)

+

+	/* Verify the ID Flag bit has been written. */

+	CMP_L	(ECX, EAX)

+	SETNE	(AL)

+	XOR_L	(CONST(0xff), EAX)

+

+	RET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_x86_cpuid)

+HIDDEN(_mesa_x86_cpuid)

+GLNAME(_mesa_x86_cpuid):

+

+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */

+	PUSH_L	(EDI)

+	PUSH_L	(EBX)

+

+	CPUID

+

+	MOV_L	(REGOFF(16, ESP), EDI)	/* *eax */

+	MOV_L	(EAX, REGIND(EDI))

+	MOV_L	(REGOFF(20, ESP), EDI)	/* *ebx */

+	MOV_L	(EBX, REGIND(EDI))

+	MOV_L	(REGOFF(24, ESP), EDI)	/* *ecx */

+	MOV_L	(ECX, REGIND(EDI))

+	MOV_L	(REGOFF(28, ESP), EDI)	/* *edx */

+	MOV_L	(EDX, REGIND(EDI))

+

+	POP_L	(EBX)

+	POP_L	(EDI)

+	RET

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_x86_cpuid_eax)

+HIDDEN(_mesa_x86_cpuid_eax)

+GLNAME(_mesa_x86_cpuid_eax):

+

+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */

+	PUSH_L	(EBX)

+

+	CPUID

+

+	POP_L	(EBX)

+	RET

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_x86_cpuid_ebx)

+HIDDEN(_mesa_x86_cpuid_ebx)

+GLNAME(_mesa_x86_cpuid_ebx):

+

+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */

+	PUSH_L	(EBX)

+

+	CPUID

+	MOV_L	(EBX, EAX)			/* return EBX */

+

+	POP_L	(EBX)

+	RET

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_x86_cpuid_ecx)

+HIDDEN(_mesa_x86_cpuid_ecx)

+GLNAME(_mesa_x86_cpuid_ecx):

+

+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */

+	PUSH_L	(EBX)

+

+	CPUID

+	MOV_L	(ECX, EAX)			/* return ECX */

+

+	POP_L	(EBX)

+	RET

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_x86_cpuid_edx)

+HIDDEN(_mesa_x86_cpuid_edx)

+GLNAME(_mesa_x86_cpuid_edx):

+

+	MOV_L	(REGOFF(4, ESP), EAX)		/* cpuid op */

+	PUSH_L	(EBX)

+

+	CPUID

+	MOV_L	(EDX, EAX)			/* return EDX */

+

+	POP_L	(EBX)

+	RET

+

+#ifdef USE_SSE_ASM

+/* Execute an SSE instruction to see if the operating system correctly

+ * supports SSE.  A signal handler for SIGILL should have been set

+ * before calling this function, otherwise this could kill the client

+ * application.

+ *

+ *        -----> !!!! ATTENTION DEVELOPERS !!!! <-----

+ *

+ * If you're debugging with gdb and you get stopped in this function,

+ * just type 'continue'!  Execution will proceed normally.

+ * See freedesktop.org bug #1709 for more info.

+ */

+ALIGNTEXT4

+GLOBL GLNAME( _mesa_test_os_sse_support )

+HIDDEN(_mesa_test_os_sse_support)

+GLNAME( _mesa_test_os_sse_support ):

+

+	XORPS	( XMM0, XMM0 )

+

+	RET

+

+

+/* Perform an SSE divide-by-zero to see if the operating system

+ * correctly supports unmasked SIMD FPU exceptions.  Signal handlers for

+ * SIGILL and SIGFPE should have been set before calling this function,

+ * otherwise this could kill the client application.

+ */

+ALIGNTEXT4

+GLOBL GLNAME( _mesa_test_os_sse_exception_support )

+HIDDEN(_mesa_test_os_sse_exception_support)

+GLNAME( _mesa_test_os_sse_exception_support ):

+

+	PUSH_L	( EBP )

+	MOV_L	( ESP, EBP )

+	SUB_L	( CONST( 8 ), ESP )

+

+	/* Save the original MXCSR register value.

+	 */

+	STMXCSR	( REGOFF( -4, EBP ) )

+

+	/* Unmask the divide-by-zero exception and perform one.

+	 */

+	STMXCSR	( REGOFF( -8, EBP ) )

+	AND_L	( CONST( 0xfffffdff ), REGOFF( -8, EBP ) )

+	LDMXCSR	( REGOFF( -8, EBP ) )

+

+	XORPS	( XMM0, XMM0 )

+

+	PUSH_L	( CONST( 0x3f800000 ) )

+	PUSH_L	( CONST( 0x3f800000 ) )

+	PUSH_L	( CONST( 0x3f800000 ) )

+	PUSH_L	( CONST( 0x3f800000 ) )

+

+	MOVUPS	( REGIND( ESP ), XMM1 )

+

+	DIVPS	( XMM0, XMM1 )

+

+	/* Restore the original MXCSR register value.

+	 */

+	LDMXCSR	( REGOFF( -4, EBP ) )

+

+	LEAVE

+	RET

+

+#endif

+

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/common_x86_asm.h b/mesalib/src/mesa/x86/common_x86_asm.h
new file mode 100644
index 000000000..efda4a0c8
--- /dev/null
+++ b/mesalib/src/mesa/x86/common_x86_asm.h
@@ -0,0 +1,53 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * Check CPU capabilities & initialize optimized funtions for this particular

+ * processor.

+ *

+ * Written by Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>

+ * Changed by Andre Werthmann <wertmann@cs.uni-potsdam.de> for using the

+ * new SSE functions

+ *

+ * Reimplemented by Gareth Hughes in a more

+ * future-proof manner, based on code in the Linux kernel.

+ */

+

+#ifndef __COMMON_X86_ASM_H__

+#define __COMMON_X86_ASM_H__

+

+/* Do not reference mtypes.h from this file.

+ */

+#include "common_x86_features.h"

+

+extern int _mesa_x86_cpu_features;

+

+extern void _mesa_get_x86_features(void);

+

+extern void _mesa_check_os_sse_support(void);

+

+extern void _mesa_init_all_x86_transform_asm( void );

+

+#endif

diff --git a/mesalib/src/mesa/x86/common_x86_features.h b/mesalib/src/mesa/x86/common_x86_features.h
new file mode 100644
index 000000000..2482d00ab
--- /dev/null
+++ b/mesalib/src/mesa/x86/common_x86_features.h
@@ -0,0 +1,67 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  5.1

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * x86 CPUID feature information.  The raw data is returned by

+ * _mesa_identify_x86_cpu_features() and interpreted with the cpu_has_*

+ * helper macros.

+ *

+ * Gareth Hughes

+ */

+

+#ifndef __COMMON_X86_FEATURES_H__

+#define __COMMON_X86_FEATURES_H__

+

+#define X86_FEATURE_FPU		(1<<0)

+#define X86_FEATURE_CMOV	(1<<1)

+#define X86_FEATURE_MMXEXT	(1<<2)

+#define X86_FEATURE_MMX		(1<<3)

+#define X86_FEATURE_FXSR	(1<<4)

+#define X86_FEATURE_XMM		(1<<5)

+#define X86_FEATURE_XMM2	(1<<6)

+#define X86_FEATURE_3DNOWEXT	(1<<7)

+#define X86_FEATURE_3DNOW	(1<<8)

+

+/* standard X86 CPU features */

+#define X86_CPU_FPU		(1<<0)

+#define X86_CPU_CMOV		(1<<15)

+#define X86_CPU_MMX		(1<<23)

+#define X86_CPU_XMM		(1<<25)

+#define X86_CPU_XMM2		(1<<26)

+

+/* extended X86 CPU features */

+#define X86_CPUEXT_MMX_EXT	(1<<22)

+#define X86_CPUEXT_3DNOW_EXT	(1<<30)

+#define X86_CPUEXT_3DNOW	(1<<31)

+

+#define cpu_has_mmx		(_mesa_x86_cpu_features & X86_FEATURE_MMX)

+#define cpu_has_mmxext		(_mesa_x86_cpu_features & X86_FEATURE_MMXEXT)

+#define cpu_has_xmm		(_mesa_x86_cpu_features & X86_FEATURE_XMM)

+#define cpu_has_xmm2		(_mesa_x86_cpu_features & X86_FEATURE_XMM2)

+#define cpu_has_3dnow		(_mesa_x86_cpu_features & X86_FEATURE_3DNOW)

+#define cpu_has_3dnowext	(_mesa_x86_cpu_features & X86_FEATURE_3DNOWEXT)

+

+#endif

+

diff --git a/mesalib/src/mesa/x86/gen_matypes.c b/mesalib/src/mesa/x86/gen_matypes.c
new file mode 100644
index 000000000..a7f9a9242
--- /dev/null
+++ b/mesalib/src/mesa/x86/gen_matypes.c
@@ -0,0 +1,238 @@
+/*

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

+ *

+ * Authors:

+ *    Gareth Hughes

+ */

+

+/*

+ * This generates an asm version of mtypes.h (called matypes.h), so that

+ * Mesa's x86 assembly code can access the internal structures easily.

+ * This will be particularly useful when developing new x86 asm code for

+ * Mesa, including lighting, clipping, texture image conversion etc.

+ */

+

+#include "main/glheader.h"

+#include "main/mtypes.h"

+#include "tnl/t_context.h"

+

+

+#undef offsetof

+#define offsetof( type, member ) ((size_t) &((type *)0)->member)

+

+

+#define OFFSET_HEADER( x )						\

+do {									\

+   printf( "\n" );							\

+   printf( "\n" );							\

+   printf( "/* ====================================================="	\

+	   "========\n" );						\

+   printf( " * Offsets for %s\n", x );					\

+   printf( " */\n" );							\

+   printf( "\n" );							\

+} while (0)

+

+#define DEFINE_HEADER( x )						\

+do {									\

+   printf( "\n" );							\

+   printf( "/*\n" );							\

+   printf( " * Flags for %s\n", x );					\

+   printf( " */\n" );							\

+   printf( "\n" );							\

+} while (0)

+

+#define OFFSET( s, t, m )						\

+   printf( "#define %s\t%lu\n", s, (unsigned long) offsetof( t, m ) );

+

+#define SIZEOF( s, t )							\

+   printf( "#define %s\t%lu\n", s, (unsigned long) sizeof(t) );

+

+#define DEFINE( s, d )							\

+   printf( "#define %s\t0x%x\n", s, d );

+

+

+

+int main( int argc, char **argv )

+{

+   printf( "/*\n" );

+   printf( " * This file is automatically generated from the Mesa internal type\n" );

+   printf( " * definitions.  Do not edit directly.\n" );

+   printf( " */\n" );

+   printf( "\n" );

+   printf( "#ifndef __ASM_TYPES_H__\n" );

+   printf( "#define __ASM_TYPES_H__\n" );

+   printf( "\n" );

+

+

+   /* struct gl_context offsets:

+    */

+   OFFSET_HEADER( "struct gl_context" );

+

+   OFFSET( "CTX_DRIVER_CTX              ", struct gl_context, DriverCtx );

+   printf( "\n" );

+   OFFSET( "CTX_LIGHT_ENABLED           ", struct gl_context, Light.Enabled );

+   OFFSET( "CTX_LIGHT_SHADE_MODEL       ", struct gl_context, Light.ShadeModel );

+   OFFSET( "CTX_LIGHT_COLOR_MAT_FACE    ", struct gl_context, Light.ColorMaterialFace );

+   OFFSET( "CTX_LIGHT_COLOR_MAT_MODE    ", struct gl_context, Light.ColorMaterialMode );

+   OFFSET( "CTX_LIGHT_COLOR_MAT_MASK    ", struct gl_context, Light.ColorMaterialBitmask );

+   OFFSET( "CTX_LIGHT_COLOR_MAT_ENABLED ", struct gl_context, Light.ColorMaterialEnabled );

+   OFFSET( "CTX_LIGHT_ENABLED_LIST      ", struct gl_context, Light.EnabledList );

+   OFFSET( "CTX_LIGHT_NEED_VERTS        ", struct gl_context, Light._NeedVertices );

+   OFFSET( "CTX_LIGHT_FLAGS             ", struct gl_context, Light._Flags );

+   OFFSET( "CTX_LIGHT_BASE_COLOR        ", struct gl_context, Light._BaseColor );

+

+

+   /* struct vertex_buffer offsets:

+    */

+   OFFSET_HEADER( "struct vertex_buffer" );

+

+   OFFSET( "VB_SIZE                ", struct vertex_buffer, Size );

+   OFFSET( "VB_COUNT               ", struct vertex_buffer, Count );

+   printf( "\n" );

+   OFFSET( "VB_ELTS                ", struct vertex_buffer, Elts );

+   OFFSET( "VB_OBJ_PTR             ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_POS] );

+   OFFSET( "VB_EYE_PTR             ", struct vertex_buffer, EyePtr );

+   OFFSET( "VB_CLIP_PTR            ", struct vertex_buffer, ClipPtr );

+   OFFSET( "VB_PROJ_CLIP_PTR       ", struct vertex_buffer, NdcPtr );

+   OFFSET( "VB_CLIP_OR_MASK        ", struct vertex_buffer, ClipOrMask );

+   OFFSET( "VB_CLIP_MASK           ", struct vertex_buffer, ClipMask );

+   OFFSET( "VB_NORMAL_PTR          ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_NORMAL] );

+   OFFSET( "VB_EDGE_FLAG           ", struct vertex_buffer, EdgeFlag );

+   OFFSET( "VB_TEX0_COORD_PTR      ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_TEX0] );

+   OFFSET( "VB_TEX1_COORD_PTR      ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_TEX1] );

+   OFFSET( "VB_TEX2_COORD_PTR      ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_TEX2] );

+   OFFSET( "VB_TEX3_COORD_PTR      ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_TEX3] );

+   OFFSET( "VB_INDEX_PTR           ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR_INDEX] );

+   OFFSET( "VB_COLOR_PTR           ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR0] );

+   OFFSET( "VB_SECONDARY_COLOR_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR1] );

+   OFFSET( "VB_FOG_COORD_PTR       ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_FOG] );

+   OFFSET( "VB_PRIMITIVE           ", struct vertex_buffer, Primitive );

+   printf( "\n" );

+

+   DEFINE_HEADER( "struct vertex_buffer" );

+

+   /* XXX use new labels here someday after vertex proram is done */

+   DEFINE( "VERT_BIT_OBJ           ", VERT_BIT_POS );

+   DEFINE( "VERT_BIT_NORM          ", VERT_BIT_NORMAL );

+   DEFINE( "VERT_BIT_RGBA          ", VERT_BIT_COLOR0 );

+   DEFINE( "VERT_BIT_SPEC_RGB      ", VERT_BIT_COLOR1 );

+   DEFINE( "VERT_BIT_FOG_COORD     ", VERT_BIT_FOG );

+   DEFINE( "VERT_BIT_TEX0          ", VERT_BIT_TEX0 );

+   DEFINE( "VERT_BIT_TEX1          ", VERT_BIT_TEX1 );

+   DEFINE( "VERT_BIT_TEX2          ", VERT_BIT_TEX2 );

+   DEFINE( "VERT_BIT_TEX3          ", VERT_BIT_TEX3 );

+

+

+   /* GLvector4f offsets:

+    */

+   OFFSET_HEADER( "GLvector4f" );

+

+   OFFSET( "V4F_DATA          ", GLvector4f, data );

+   OFFSET( "V4F_START         ", GLvector4f, start );

+   OFFSET( "V4F_COUNT         ", GLvector4f, count );

+   OFFSET( "V4F_STRIDE        ", GLvector4f, stride );

+   OFFSET( "V4F_SIZE          ", GLvector4f, size );

+   OFFSET( "V4F_FLAGS         ", GLvector4f, flags );

+

+   DEFINE_HEADER( "GLvector4f" );

+

+   DEFINE( "VEC_MALLOC        ", VEC_MALLOC );

+   DEFINE( "VEC_NOT_WRITEABLE ", VEC_NOT_WRITEABLE );

+   DEFINE( "VEC_BAD_STRIDE    ", VEC_BAD_STRIDE );

+   printf( "\n" );

+   DEFINE( "VEC_SIZE_1        ", VEC_SIZE_1 );

+   DEFINE( "VEC_SIZE_2        ", VEC_SIZE_2 );

+   DEFINE( "VEC_SIZE_3        ", VEC_SIZE_3 );

+   DEFINE( "VEC_SIZE_4        ", VEC_SIZE_4 );

+

+

+   /* GLmatrix offsets:

+    */

+   OFFSET_HEADER( "GLmatrix" );

+

+   OFFSET( "MATRIX_DATA   ", GLmatrix, m );

+   OFFSET( "MATRIX_INV    ", GLmatrix, inv );

+   OFFSET( "MATRIX_FLAGS  ", GLmatrix, flags );

+   OFFSET( "MATRIX_TYPE   ", GLmatrix, type );

+

+

+   /* struct gl_light offsets:

+    */

+   OFFSET_HEADER( "struct gl_light" );

+

+   OFFSET( "LIGHT_NEXT              ", struct gl_light, next );

+   OFFSET( "LIGHT_PREV              ", struct gl_light, prev );

+   printf( "\n" );

+   OFFSET( "LIGHT_AMBIENT           ", struct gl_light, Ambient );

+   OFFSET( "LIGHT_DIFFUSE           ", struct gl_light, Diffuse );

+   OFFSET( "LIGHT_SPECULAR          ", struct gl_light, Specular );

+   OFFSET( "LIGHT_EYE_POSITION      ", struct gl_light, EyePosition );

+   OFFSET( "LIGHT_SPOT_DIRECTION    ", struct gl_light, SpotDirection );

+   OFFSET( "LIGHT_SPOT_EXPONENT     ", struct gl_light, SpotExponent );

+   OFFSET( "LIGHT_SPOT_CUTOFF       ", struct gl_light, SpotCutoff );

+   OFFSET( "LIGHT_COS_CUTOFF        ", struct gl_light, _CosCutoff );

+   OFFSET( "LIGHT_CONST_ATTEN       ", struct gl_light, ConstantAttenuation );

+   OFFSET( "LIGHT_LINEAR_ATTEN      ", struct gl_light, LinearAttenuation );

+   OFFSET( "LIGHT_QUADRATIC_ATTEN   ", struct gl_light, QuadraticAttenuation );

+   OFFSET( "LIGHT_ENABLED           ", struct gl_light, Enabled );

+   printf( "\n" );

+   OFFSET( "LIGHT_FLAGS             ", struct gl_light, _Flags );

+   printf( "\n" );

+   OFFSET( "LIGHT_POSITION          ", struct gl_light, _Position );

+   OFFSET( "LIGHT_VP_INF_NORM       ", struct gl_light, _VP_inf_norm );

+   OFFSET( "LIGHT_H_INF_NORM        ", struct gl_light, _h_inf_norm );

+   OFFSET( "LIGHT_NORM_DIRECTION    ", struct gl_light, _NormSpotDirection );

+   OFFSET( "LIGHT_VP_INF_SPOT_ATTEN ", struct gl_light, _VP_inf_spot_attenuation );

+   printf( "\n" );

+   OFFSET( "LIGHT_SPOT_EXP_TABLE    ", struct gl_light, _SpotExpTable );

+   OFFSET( "LIGHT_MAT_AMBIENT       ", struct gl_light, _MatAmbient );

+   OFFSET( "LIGHT_MAT_DIFFUSE       ", struct gl_light, _MatDiffuse );

+   OFFSET( "LIGHT_MAT_SPECULAR      ", struct gl_light, _MatSpecular );

+   printf( "\n" );

+   SIZEOF( "SIZEOF_GL_LIGHT         ", struct gl_light );

+

+   DEFINE_HEADER( "struct gl_light" );

+

+   DEFINE( "LIGHT_SPOT              ", LIGHT_SPOT );

+   DEFINE( "LIGHT_LOCAL_VIEWER      ", LIGHT_LOCAL_VIEWER );

+   DEFINE( "LIGHT_POSITIONAL        ", LIGHT_POSITIONAL );

+   printf( "\n" );

+   DEFINE( "LIGHT_NEED_VERTICES     ", LIGHT_NEED_VERTICES );

+

+

+   /* struct gl_lightmodel offsets:

+    */

+   OFFSET_HEADER( "struct gl_lightmodel" );

+

+   OFFSET( "LIGHT_MODEL_AMBIENT       ", struct gl_lightmodel, Ambient );

+   OFFSET( "LIGHT_MODEL_LOCAL_VIEWER  ", struct gl_lightmodel, LocalViewer );

+   OFFSET( "LIGHT_MODEL_TWO_SIDE      ", struct gl_lightmodel, TwoSide );

+   OFFSET( "LIGHT_MODEL_COLOR_CONTROL ", struct gl_lightmodel, ColorControl );

+

+

+   printf( "\n" );

+   printf( "\n" );

+   printf( "#endif /* __ASM_TYPES_H__ */\n" );

+

+   return 0;

+}

diff --git a/mesalib/src/mesa/x86/mmx.h b/mesalib/src/mesa/x86/mmx.h
new file mode 100644
index 000000000..c1bda5909
--- /dev/null
+++ b/mesalib/src/mesa/x86/mmx.h
@@ -0,0 +1,57 @@
+/*

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

+#define ASM_MMX_H

+

+#include "main/compiler.h"

+#include "main/mtypes.h"

+

+extern void _ASMAPI

+_mesa_mmx_blend_transparency( struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                              GLvoid *rgba, const GLvoid *dest,

+                              GLenum chanType );

+

+extern void _ASMAPI

+_mesa_mmx_blend_add( struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                     GLvoid *rgba, const GLvoid *dest,

+                     GLenum chanType );

+

+extern void _ASMAPI

+_mesa_mmx_blend_min( struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                     GLvoid *rgba, const GLvoid *dest,

+                     GLenum chanType );

+

+extern void _ASMAPI

+_mesa_mmx_blend_max( struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                     GLvoid *rgba, const GLvoid *dest,

+                     GLenum chanType );

+

+extern void _ASMAPI

+_mesa_mmx_blend_modulate( struct gl_context *ctx, GLuint n, const GLubyte mask[],

+                          GLvoid *rgba, const GLvoid *dest,

+                          GLenum chanType );

+

+#endif

diff --git a/mesalib/src/mesa/x86/mmx_blend.S b/mesalib/src/mesa/x86/mmx_blend.S
new file mode 100644
index 000000000..1e3954730
--- /dev/null
+++ b/mesalib/src/mesa/x86/mmx_blend.S
@@ -0,0 +1,402 @@
+	;

+/*

+ * Written by Jos� Fonseca <j_r_fonseca@yahoo.co.uk>

+ */

+

+

+#ifdef USE_MMX_ASM

+#include "assyntax.h"

+#include "matypes.h"

+

+/* integer multiplication - alpha plus one

+ *

+ * makes the following approximation to the division (Sree)

+ *

+ *   rgb*a/255 ~= (rgb*(a+1)) >> 256

+ *

+ * which is the fastest method that satisfies the following OpenGL criteria

+ *

+ *   0*0 = 0 and 255*255 = 255

+ *

+ * note that MX1 is a register with 0xffffffffffffffff constant which can be easily obtained making

+ *

+ *   PCMPEQW    ( MX1, MX1 )

+ */

+#define GMB_MULT_AP1( MP1, MA1, MP2, MA2, MX1 ) \

+    PSUBW      ( MX1, MA1 )			/*   a1 + 1  |   a1 + 1  |   a1 + 1  |   a1 + 1  */	;\

+    PMULLW     ( MP1, MA1 )			/*                  t1 = p1*a1                   */	;\

+													;\

+TWO(PSUBW      ( MX1, MA2 ))			/*   a2 + 1  |   a2 + 1  |   a2 + 1  |   a2 + 1  */	;\

+TWO(PMULLW     ( MP2, MA2 ))			/*                  t2 = p2*a2                   */	;\

+													;\

+    PSRLW      ( CONST(8), MA1 )		/*               t1 >> 8 ~= t1/255               */	;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*               t2 >> 8 ~= t2/255               */	

+

+

+/* integer multiplication - geometric series

+ *

+ * takes the geometric series approximation to the division

+ *

+ *   t/255 = (t >> 8) + (t >> 16) + (t >> 24) ..

+ *

+ * in this case just the first two terms to fit in 16bit arithmetic

+ *

+ *   t/255 ~= (t + (t >> 8)) >> 8

+ *

+ * note that just by itself it doesn't satisfies the OpenGL criteria, as 255*255 = 254, 

+ * so the special case a = 255 must be accounted or roundoff must be used

+ */

+#define GMB_MULT_GS( MP1, MA1, MP2, MA2 ) \

+    PMULLW     ( MP1, MA1 )			/*                  t1 = p1*a1                   */	;\

+TWO(PMULLW     ( MP2, MA2 ))			/*                  t2 = p2*a2                   */	;\

+													;\

+    MOVQ       ( MA1, MP1 )										;\

+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\

+													;\

+TWO(MOVQ       ( MA2, MP2 ))										;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\

+													;\

+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\

+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\

+													;\

+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */

+

+

+/* integer multiplication - geometric series plus rounding

+ *

+ * when using a geometric series division instead of truncating the result 

+ * use roundoff in the approximation (Jim Blinn)

+ *

+ *   t = rgb*a + 0x80

+ *

+ * achieving the exact results

+ *

+ * note that M80 is register with the 0x0080008000800080 constant

+ */

+#define GMB_MULT_GSR( MP1, MA1, MP2, MA2, M80 ) \

+    PMULLW     ( MP1, MA1 )			/*                  t1 = p1*a1                   */	;\

+    PADDW      ( M80, MA1 )			/*                 t1 += 0x80                    */	;\

+													;\

+TWO(PMULLW     ( MP2, MA2 ))			/*                  t2 = p2*a2                   */	;\

+TWO(PADDW      ( M80, MA2 ))			/*                 t2 += 0x80                    */	;\

+													;\

+    MOVQ       ( MA1, MP1 )										;\

+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\

+													;\

+TWO(MOVQ       ( MA2, MP2 ))										;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\

+													;\

+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\

+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\

+													;\

+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */

+

+

+/* linear interpolation - geometric series 

+ */

+#define GMB_LERP_GS( MP1, MQ1, MA1, MP2, MQ2, MA2) \

+    PSUBW      ( MQ1, MP1 )                     /* pa1 - qa1 | pb1 - qb1 | pg1 - qg1 | pr1 - qr1 */	;\

+    PSLLW      ( CONST(8), MQ1 )		/*                    q1 << 8                    */	;\

+    PMULLW     ( MP1, MA1 )			/*              t1 = (q1 - p1)*pa1               */	;\

+													;\

+TWO(PSUBW      ( MQ2, MP2 ))                    /* pa2 - qa2 | pb2 - qb2 | pg2 - qg2 | pr2 - qr2 */	;\

+TWO(PSLLW      ( CONST(8), MQ2 ))		/*                    q2 << 8                    */	;\

+TWO(PMULLW     ( MP2, MA2 ))			/*              t2 = (q2 - p2)*pa2               */	;\

+													;\

+    MOVQ       ( MA1, MP1 )										;\

+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\

+													;\

+TWO(MOVQ       ( MA2, MP2 ))										;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\

+													;\

+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\

+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\

+													;\

+    PADDW      ( MQ1, MA1 )			/*              (t1/255 + q1) << 8               */	;\

+TWO(PADDW      ( MQ2, MA2 ))			/*              (t2/255 + q2) << 8               */	;\

+													;\

+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */

+

+

+/* linear interpolation - geometric series with roundoff

+ *

+ * this is a generalization of Blinn's formula to signed arithmetic

+ *

+ * note that M80 is a register with the 0x0080008000800080 constant

+ */

+#define GMB_LERP_GSR( MP1, MQ1, MA1, MP2, MQ2, MA2, M80) \

+    PSUBW      ( MQ1, MP1 )                     /* pa1 - qa1 | pb1 - qb1 | pg1 - qg1 | pr1 - qr1 */	;\

+    PSLLW      ( CONST(8), MQ1 )		/*                    q1 << 8                    */	;\

+    PMULLW     ( MP1, MA1 )			/*              t1 = (q1 - p1)*pa1               */	;\

+													;\

+TWO(PSUBW      ( MQ2, MP2 ))                    /* pa2 - qa2 | pb2 - qb2 | pg2 - qg2 | pr2 - qr2 */	;\

+TWO(PSLLW      ( CONST(8), MQ2 ))		/*                    q2 << 8                    */	;\

+TWO(PMULLW     ( MP2, MA2 ))			/*              t2 = (q2 - p2)*pa2               */	;\

+													;\

+    PSRLW      ( CONST(15), MP1 )		/*                 q1 > p1 ? 1 : 0               */	;\

+TWO(PSRLW      ( CONST(15), MP2 ))		/*                 q2 > q2 ? 1 : 0               */	;\

+													;\

+    PSLLW      ( CONST(8), MP1 )		/*             q1 > p1 ? 0x100 : 0               */	;\

+TWO(PSLLW      ( CONST(8), MP2 ))		/*             q2 > q2 ? 0x100 : 0               */	;\

+													;\

+    PSUBW      ( MP1, MA1 )			/*                  t1 -=? 0x100                 */	;\

+TWO(PSUBW      ( MP2, MA2 ))			/*                  t2 -=? 0x100                 */	;\

+ 													;\

+    PADDW      ( M80, MA1 )			/*                 t1 += 0x80                    */	;\

+TWO(PADDW      ( M80, MA2 ))			/*                 t2 += 0x80                    */	;\

+													;\

+    MOVQ       ( MA1, MP1 )										;\

+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\

+													;\

+TWO(MOVQ       ( MA2, MP2 ))										;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\

+													;\

+    PADDW      ( MP1, MA1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\

+TWO(PADDW      ( MP2, MA2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\

+													;\

+    PADDW      ( MQ1, MA1 )			/*              (t1/255 + q1) << 8               */	;\

+TWO(PADDW      ( MQ2, MA2 ))			/*              (t2/255 + q2) << 8               */	;\

+													;\

+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */

+

+

+/* linear interpolation - geometric series with correction

+ *

+ * instead of the roundoff this adds a small correction to satisfy the OpenGL criteria

+ *

+ *   t/255 ~= (t + (t >> 8) + (t >> 15)) >> 8

+ *

+ * note that although is faster than rounding off it doesn't give always the exact results

+ */

+#define GMB_LERP_GSC( MP1, MQ1, MA1, MP2, MQ2, MA2) \

+    PSUBW      ( MQ1, MP1 )                     /* pa1 - qa1 | pb1 - qb1 | pg1 - qg1 | pr1 - qr1 */	;\

+    PSLLW      ( CONST(8), MQ1 )		/*                    q1 << 8                    */	;\

+    PMULLW     ( MP1, MA1 )			/*              t1 = (q1 - p1)*pa1               */	;\

+													;\

+TWO(PSUBW      ( MQ2, MP2 ))                    /* pa2 - qa2 | pb2 - qb2 | pg2 - qg2 | pr2 - qr2 */	;\

+TWO(PSLLW      ( CONST(8), MQ2 ))		/*                    q2 << 8                    */	;\

+TWO(PMULLW     ( MP2, MA2 ))			/*              t2 = (q2 - p2)*pa2               */	;\

+													;\

+    MOVQ       ( MA1, MP1 )										;\

+    PSRLW      ( CONST(8), MA1 )		/*                    t1 >> 8                    */	;\

+													;\

+TWO(MOVQ       ( MA2, MP2 ))										;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*                    t2 >> 8                    */	;\

+													;\

+    PADDW      ( MA1, MP1 )			/*        t1 + (t1 >> 8) ~= (t1/255) << 8        */	;\

+    PSRLW      ( CONST(7), MA1 )		/*                    t1 >> 15                   */	;\

+													;\

+TWO(PADDW      ( MA2, MP2 ))			/*        t2 + (t2 >> 8) ~= (t2/255) << 8        */	;\

+TWO(PSRLW      ( CONST(7), MA2 ))		/*                    t2 >> 15                   */	;\

+													;\

+    PADDW      ( MP1, MA1 )			/*  t1 + (t1 >> 8) + (t1 >>15) ~= (t1/255) << 8  */	;\

+TWO(PADDW      ( MP2, MA2 ))			/*  t2 + (t2 >> 8) + (t2 >>15) ~= (t2/255) << 8  */	;\

+													;\

+    PADDW      ( MQ1, MA1 )			/*              (t1/255 + q1) << 8               */	;\

+TWO(PADDW      ( MQ2, MA2 ))			/*              (t2/255 + q2) << 8               */	;\

+													;\

+    PSRLW      ( CONST(8), MA1 )		/*    sa1    |    sb1    |    sg1    |    sr1    */	;\

+TWO(PSRLW      ( CONST(8), MA2 ))		/*    sa2    |    sb2    |    sg2    |    sr2    */

+

+

+/* common blending setup code

+ *

+ * note that M00 is a register with 0x0000000000000000 constant which can be easily obtained making

+ *

+ *   PXOR      ( M00, M00 )

+ */

+#define GMB_LOAD(rgba, dest, MPP, MQQ) \

+ONE(MOVD       ( REGIND(rgba), MPP ))		/*     |     |     |     | qa1 | qb1 | qg1 | qr1 */	;\

+ONE(MOVD       ( REGIND(dest), MQQ ))		/*     |     |     |     | pa1 | pb1 | pg1 | pr1 */	;\

+													;\

+TWO(MOVQ       ( REGIND(rgba), MPP ))		/* qa2 | qb2 | qg2 | qr2 | qa1 | qb1 | qg1 | qr1 */	;\

+TWO(MOVQ       ( REGIND(dest), MQQ ))		/* pa2 | pb2 | pg2 | pr2 | pa1 | pb1 | pg1 | pr1 */

+

+#define GMB_UNPACK(MP1, MQ1, MP2, MQ2, M00) \

+TWO(MOVQ       ( MP1, MP2 ))										;\

+TWO(MOVQ       ( MQ1, MQ2 ))										;\

+													;\

+    PUNPCKLBW  ( M00, MQ1 )			/*    qa1    |    qb1    |    qg1    |    qr1    */	;\

+TWO(PUNPCKHBW  ( M00, MQ2 ))                    /*    qa2    |    qb2    |    qg2    |    qr2    */	;\

+    PUNPCKLBW  ( M00, MP1 )			/*    pa1    |    pb1    |    pg1    |    pr1    */	;\

+TWO(PUNPCKHBW  ( M00, MP2 ))                    /*    pa2    |    pb2    |    pg2    |    pr2    */

+

+#define GMB_ALPHA(MP1, MA1, MP2, MA2) \

+    MOVQ       ( MP1, MA1 )										;\

+TWO(MOVQ       ( MP2, MA2 ))										;\

+													;\

+    PUNPCKHWD  ( MA1, MA1 )			/*    pa1    |    pa1    |           |           */	;\

+TWO(PUNPCKHWD  ( MA2, MA2 ))			/*    pa2    |    pa2    |           |           */	;\

+    PUNPCKHDQ  ( MA1, MA1 )                     /*    pa1    |    pa1    |    pa1    |    pa1    */	;\

+TWO(PUNPCKHDQ  ( MA2, MA2 ))                    /*    pa2    |    pa2    |    pa2    |    pa2    */

+

+#define GMB_PACK( MS1, MS2 ) \

+    PACKUSWB   ( MS2, MS1 )			/* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */	;\

+

+#define GMB_STORE(rgba, MSS ) \

+ONE(MOVD       ( MSS, REGIND(rgba) ))		/*     |     |     |     | sa1 | sb1 | sg1 | sr1 */	;\

+TWO(MOVQ       ( MSS, REGIND(rgba) ))		/* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */

+

+/* Kevin F. Quinn <kevquinn@gentoo.org> 2 July 2006

+ * Replace data segment constants with text-segment

+ * constants (via pushl/movq)

+    SEG_DATA

+

+ALIGNDATA8

+const_0080:

+    D_LONG 0x00800080, 0x00800080

+

+const_80:

+    D_LONG 0x80808080, 0x80808080

+*/

+#define const_0080_l 0x00800080

+#define const_0080_h 0x00800080

+#define const_80_l 0x80808080

+#define const_80_h 0x80808080

+

+    SEG_TEXT

+

+

+/* Blend transparency function

+ */

+

+#define TAG(x) CONCAT(x,_transparency)

+#define LLTAG(x) LLBL2(x,_transparency)

+

+#define INIT \

+    PXOR       ( MM0, MM0 )			/*   0x0000  |   0x0000  |   0x0000  |   0x0000  */

+

+#define MAIN( rgba, dest ) \

+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\

+    GMB_UNPACK( MM1, MM2, MM4, MM5, MM0 )								;\

+    GMB_ALPHA( MM1, MM3, MM4, MM6 )									;\

+    GMB_LERP_GSC( MM1, MM2, MM3, MM4, MM5, MM6 )							;\

+    GMB_PACK( MM3, MM6 )										;\

+    GMB_STORE( rgba, MM3 )

+

+#include "mmx_blendtmp.h"

+

+

+/* Blend add function

+ *

+ * FIXME: Add some loop unrolling here...

+ */

+

+#define TAG(x) CONCAT(x,_add)

+#define LLTAG(x) LLBL2(x,_add)

+

+#define INIT

+

+#define MAIN( rgba, dest ) \

+ONE(MOVD       ( REGIND(rgba), MM1 ))		/*     |     |     |     | qa1 | qb1 | qg1 | qr1 */	;\

+ONE(MOVD       ( REGIND(dest), MM2 ))		/*     |     |     |     | pa1 | pb1 | pg1 | pr1 */	;\

+ONE(PADDUSB    ( MM2, MM1 ))										;\

+ONE(MOVD       ( MM1, REGIND(rgba) ))		/*     |     |     |     | sa1 | sb1 | sg1 | sr1 */	;\

+													;\

+TWO(MOVQ       ( REGIND(rgba), MM1 ))		/* qa2 | qb2 | qg2 | qr2 | qa1 | qb1 | qg1 | qr1 */	;\

+TWO(PADDUSB    ( REGIND(dest), MM1 ))		/* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */	;\

+TWO(MOVQ       ( MM1, REGIND(rgba) ))

+

+#include "mmx_blendtmp.h"

+

+

+/* Blend min function

+ */

+

+#define TAG(x) CONCAT(x,_min)

+#define LLTAG(x) LLBL2(x,_min)

+

+/* Kevin F. Quinn 2nd July 2006

+ * Replace data segment constants with text-segment instructions

+#define INIT \

+    MOVQ       ( CONTENT(const_80), MM7 )

+ */

+#define INIT \

+    PUSH_L     ( CONST(const_80_h) ) 		/* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/	;\

+    PUSH_L     ( CONST(const_80_l) ) 									;\

+    MOVQ       ( REGIND(ESP), MM7 ) 									;\

+    ADD_L      ( CONST(8), ESP)

+

+#define MAIN( rgba, dest ) \

+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\

+    MOVQ       ( MM1, MM3 )										;\

+    MOVQ       ( MM2, MM4 )										;\

+    PXOR       ( MM7, MM3 )			/*              unsigned -> signed               */	;\

+    PXOR       ( MM7, MM4 )			/*              unsigned -> signed               */	;\

+    PCMPGTB    ( MM3, MM4 )			/*                 q > p ? 0xff : 0x00           */	;\

+    PAND       ( MM4, MM1 )			/*                 q > p ? p : 0                 */	;\

+    PANDN      ( MM2, MM4 )			/*                 q > p ? 0 : q                 */	;\

+    POR        ( MM1, MM4 )			/*                 q > p ? p : q                 */	;\

+    GMB_STORE( rgba, MM4 )

+

+#include "mmx_blendtmp.h"

+

+

+/* Blend max function

+ */

+

+#define TAG(x) CONCAT(x,_max)

+#define LLTAG(x) LLBL2(x,_max)

+

+/* Kevin F. Quinn 2nd July 2006

+ * Replace data segment constants with text-segment instructions

+#define INIT \

+    MOVQ       ( CONTENT(const_80), MM7 )

+ */

+#define INIT \

+    PUSH_L     ( CONST(const_80_l) ) 		/* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/	;\

+    PUSH_L     ( CONST(const_80_h) ) 									;\

+    MOVQ       ( REGIND(ESP), MM7 ) 									;\

+    ADD_L      ( CONST(8), ESP)

+

+#define MAIN( rgba, dest ) \

+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\

+    MOVQ       ( MM1, MM3 )										;\

+    MOVQ       ( MM2, MM4 )										;\

+    PXOR       ( MM7, MM3 )			/*              unsigned -> signed               */	;\

+    PXOR       ( MM7, MM4 )			/*              unsigned -> signed               */	;\

+    PCMPGTB    ( MM3, MM4 )			/*                 q > p ? 0xff : 0x00           */	;\

+    PAND       ( MM4, MM2 )			/*                 q > p ? q : 0                 */	;\

+    PANDN      ( MM1, MM4 )			/*                 q > p ? 0 : p                 */	;\

+    POR        ( MM2, MM4 )			/*                 q > p ? p : q                 */	;\

+    GMB_STORE( rgba, MM4 )

+

+#include "mmx_blendtmp.h"

+

+

+/* Blend modulate function

+ */

+

+#define TAG(x) CONCAT(x,_modulate)

+#define LLTAG(x) LLBL2(x,_modulate)

+

+/* Kevin F. Quinn 2nd July 2006

+ * Replace data segment constants with text-segment instructions

+#define INIT \

+    MOVQ       ( CONTENT(const_0080), MM7 )

+ */

+#define INIT \

+    PXOR       ( MM0, MM0 )			/*   0x0000  |   0x0000  |   0x0000  |   0x0000  */	;\

+    PUSH_L     ( CONST(const_0080_l) ) 	/*   0x0080  |   0x0080  |   0x0080  |   0x0080  */	;\

+    PUSH_L     ( CONST(const_0080_h) ) 								;\

+    MOVQ       ( REGIND(ESP), MM7 ) 									;\

+    ADD_L      ( CONST(8), ESP)

+

+#define MAIN( rgba, dest ) \

+    GMB_LOAD( rgba, dest, MM1, MM2 )									;\

+    GMB_UNPACK( MM1, MM2, MM4, MM5, MM0 )								;\

+    GMB_MULT_GSR( MM1, MM2, MM4, MM5, MM7 )								;\

+    GMB_PACK( MM2, MM5 )										;\

+    GMB_STORE( rgba, MM2 )

+

+#include "mmx_blendtmp.h"

+

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/mmx_blendtmp.h b/mesalib/src/mesa/x86/mmx_blendtmp.h
new file mode 100644
index 000000000..f282c0c21
--- /dev/null
+++ b/mesalib/src/mesa/x86/mmx_blendtmp.h
@@ -0,0 +1,114 @@
+/*

+ * Written by José Fonseca <j_r_fonseca@yahoo.co.uk>

+ */

+

+

+/*

+ * void _mesa_mmx_blend( struct gl_context *ctx,

+ *                       GLuint n, 

+ *                       const GLubyte mask[],

+ *                       GLchan rgba[][4], 

+ *                       CONST GLchan dest[][4] )

+ * 

+ */

+ALIGNTEXT16

+GLOBL GLNAME( TAG(_mesa_mmx_blend) )

+HIDDEN( TAG(_mesa_mmx_blend) )

+GLNAME( TAG(_mesa_mmx_blend) ):

+

+    PUSH_L     ( EBP )

+    MOV_L      ( ESP, EBP )

+    PUSH_L     ( ESI )

+    PUSH_L     ( EDI )

+    PUSH_L     ( EBX )

+

+    MOV_L      ( REGOFF(12, EBP), ECX )		/* n */

+    CMP_L      ( CONST(0), ECX)

+    JE         ( LLTAG(GMB_return) )

+

+    MOV_L      ( REGOFF(16, EBP), EBX )		/* mask */

+    MOV_L      ( REGOFF(20, EBP), EDI )         /* rgba */

+    MOV_L      ( REGOFF(24, EBP), ESI )         /* dest */

+

+    INIT

+    

+    TEST_L     ( CONST(4), EDI )		/* align rgba on an 8-byte boundary */

+    JZ         ( LLTAG(GMB_align_end) )

+

+    CMP_B      ( CONST(0), REGIND(EBX) )	/* *mask == 0 */

+    JE         ( LLTAG(GMB_align_continue) )

+

+    /* runin */

+#define ONE(x)	x

+#define TWO(x)  

+    MAIN       ( EDI, ESI )

+#undef ONE

+#undef TWO

+

+LLTAG(GMB_align_continue):

+

+    DEC_L      ( ECX )				/* n -= 1 */

+    INC_L      ( EBX )		                /* mask += 1 */

+    ADD_L      ( CONST(4), EDI )		/* rgba += 1 */

+    ADD_L      ( CONST(4), ESI )		/* dest += 1 */ 

+

+LLTAG(GMB_align_end):

+

+    CMP_L      ( CONST(2), ECX)

+    JB         ( LLTAG(GMB_loop_end) )

+

+ALIGNTEXT16

+LLTAG(GMB_loop_begin):

+

+    CMP_W      ( CONST(0), REGIND(EBX) )	/* *mask == 0 && *(mask + 1) == 0 */

+    JE         ( LLTAG(GMB_loop_continue) )

+

+    /* main loop */

+#define ONE(x)

+#define TWO(x)	x

+    MAIN       ( EDI, ESI )

+#undef ONE

+#undef TWO

+

+LLTAG(GMB_loop_continue):

+

+    DEC_L      ( ECX )

+    DEC_L      ( ECX )				/* n -= 2 */

+    ADD_L      ( CONST(2), EBX )		/* mask += 2 */

+    ADD_L      ( CONST(8), EDI )		/* rgba += 2 */

+    ADD_L      ( CONST(8), ESI )		/* dest += 2 */ 

+    CMP_L      ( CONST(2), ECX )

+    JAE        ( LLTAG(GMB_loop_begin) )

+

+LLTAG(GMB_loop_end):

+

+    CMP_L      ( CONST(1), ECX )

+    JB         ( LLTAG(GMB_done) )

+

+    CMP_B      ( CONST(0), REGIND(EBX) )	/* *mask == 0 */

+    JE         ( LLTAG(GMB_done) )

+

+    /* runout */

+#define ONE(x)	x

+#define TWO(x)

+    MAIN       ( EDI, ESI )

+#undef ONE

+#undef TWO

+

+LLTAG(GMB_done):

+

+    EMMS

+

+LLTAG(GMB_return):

+

+    POP_L      ( EBX )

+    POP_L      ( EDI )

+    POP_L      ( ESI )

+    MOV_L      ( EBP, ESP )

+    POP_L      ( EBP )

+    RET

+

+#undef TAG

+#undef LLTAG

+#undef INIT

+#undef MAIN

diff --git a/mesalib/src/mesa/x86/norm_args.h b/mesalib/src/mesa/x86/norm_args.h
new file mode 100644
index 000000000..bad1a1975
--- /dev/null
+++ b/mesalib/src/mesa/x86/norm_args.h
@@ -0,0 +1,57 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * Normal transform function interface for assembly code.  Simply define

+ * FRAME_OFFSET to the number of bytes pushed onto the stack before

+ * using the ARG_* argument macros.

+ *

+ * Gareth Hughes

+ */

+

+#ifndef __NORM_ARGS_H__

+#define __NORM_ARGS_H__

+

+/* Offsets for normal_func arguments

+ *

+ * typedef void (*normal_func)( CONST GLmatrix *mat,

+ *                              GLfloat scale,

+ *                              CONST GLvector4f *in,

+ *                              CONST GLfloat lengths[],

+ *                              GLvector4f *dest );

+ */

+#define OFFSET_MAT	4

+#define OFFSET_SCALE	8

+#define OFFSET_IN	12

+#define OFFSET_LENGTHS	16

+#define OFFSET_DEST	20

+

+#define ARG_MAT         REGOFF(FRAME_OFFSET+OFFSET_MAT, ESP)

+#define ARG_SCALE       REGOFF(FRAME_OFFSET+OFFSET_SCALE, ESP)

+#define ARG_IN          REGOFF(FRAME_OFFSET+OFFSET_IN, ESP)

+#define ARG_LENGTHS     REGOFF(FRAME_OFFSET+OFFSET_LENGTHS, ESP)

+#define ARG_DEST        REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)

+

+#endif

diff --git a/mesalib/src/mesa/x86/read_rgba_span_x86.S b/mesalib/src/mesa/x86/read_rgba_span_x86.S
new file mode 100644
index 000000000..cd7596026
--- /dev/null
+++ b/mesalib/src/mesa/x86/read_rgba_span_x86.S
@@ -0,0 +1,678 @@
+/*

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

+ * IBM 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 read_rgba_span_x86.S

+ * Optimized routines to transfer pixel data from the framebuffer to a

+ * buffer in main memory.

+ *

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

+ */

+

+	.file	"read_rgba_span_x86.S"

+#if !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */

+/* Kevin F. Quinn 2nd July 2006

+ * Replaced data segment constants with text-segment instructions.

+ */

+#define	LOAD_MASK(mvins,m1,m2) \

+   	pushl	$0xff00ff00 ;\

+   	pushl	$0xff00ff00 ;\

+   	pushl	$0xff00ff00 ;\

+   	pushl	$0xff00ff00 ;\

+	mvins	(%esp), m1	;\

+   	pushl	$0x00ff0000 ;\

+   	pushl	$0x00ff0000 ;\

+   	pushl	$0x00ff0000 ;\

+   	pushl	$0x00ff0000 ;\

+	mvins	(%esp), m2	;\

+	addl	$32, %esp

+

+/* I implemented these as macros because they appear in several places,

+ * and I've tweaked them a number of times.  I got tired of changing every

+ * place they appear. :)

+ */

+

+#define DO_ONE_PIXEL() \

+	movl	(%ebx), %eax ; \

+	addl	$4, %ebx ; \

+	bswap	%eax          /* ARGB -> BGRA */ ; \

+	rorl	$8, %eax      /* BGRA -> ABGR */ ; \

+	movl	%eax, (%ecx)  /* ABGR -> R, G, B, A */ ; \

+	addl	$4, %ecx

+

+#define DO_ONE_LAST_PIXEL() \

+	movl	(%ebx), %eax ; \

+	bswap	%eax          /* ARGB -> BGRA */ ; \

+	rorl	$8, %eax      /* BGRA -> ABGR */ ; \

+	movl	%eax, (%ecx)  /* ABGR -> R, G, B, A */ ; \

+

+

+/**

+ * MMX optimized version of the BGRA8888_REV to RGBA copy routine.

+ * 

+ * \warning

+ * This function assumes that the caller will issue the EMMS instruction

+ * at the correct places.

+ */

+

+.globl _generic_read_RGBA_span_BGRA8888_REV_MMX

+.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX

+	.type	_generic_read_RGBA_span_BGRA8888_REV_MMX, @function

+_generic_read_RGBA_span_BGRA8888_REV_MMX:

+	pushl	%ebx

+

+#ifdef USE_INNER_EMMS

+	emms

+#endif

+	LOAD_MASK(movq,%mm1,%mm2)

+

+	movl	8(%esp), %ebx	/* source pointer */

+	movl	16(%esp), %edx	/* number of pixels to copy */

+	movl	12(%esp), %ecx	/* destination pointer */

+

+	testl	%edx, %edx

+	jle	.L20		/* Bail if there's nothing to do. */

+

+	movl	%ebx, %eax

+

+	negl	%eax

+	sarl	$2, %eax

+	andl	$1, %eax

+	je	.L17

+

+	subl	%eax, %edx

+	DO_ONE_PIXEL()

+.L17:

+

+	/* Would it be faster to unroll this loop once and process 4 pixels

+	 * per pass, instead of just two?

+	 */

+

+	movl	%edx, %eax

+	shrl	%eax

+	jmp	.L18

+.L19:

+	movq	(%ebx), %mm0

+	addl	$8, %ebx

+

+	/* These 9 instructions do what PSHUFB (if there were such an

+	 * instruction) could do in 1. :(

+	 */

+

+	movq	%mm0, %mm3

+	movq	%mm0, %mm4

+

+	pand	%mm2, %mm3

+	psllq	$16, %mm4

+	psrlq	$16, %mm3

+	pand	%mm2, %mm4

+

+	pand	%mm1, %mm0

+	por	%mm4, %mm3

+	por	%mm3, %mm0

+

+	movq	%mm0, (%ecx)

+	addl	$8, %ecx

+	subl	$1, %eax

+.L18:

+	jne	.L19

+

+#ifdef USE_INNER_EMMS

+	emms

+#endif

+

+	/* At this point there are either 1 or 0 pixels remaining to be

+	 * converted.  Convert the last pixel, if needed.

+	 */

+

+	testl	$1, %edx

+	je	.L20

+

+	DO_ONE_LAST_PIXEL()

+

+.L20:

+	popl	%ebx

+	ret

+	.size	_generic_read_RGBA_span_BGRA8888_REV_MMX, .-_generic_read_RGBA_span_BGRA8888_REV_MMX

+

+

+/**

+ * SSE optimized version of the BGRA8888_REV to RGBA copy routine.  SSE

+ * instructions are only actually used to read data from the framebuffer.

+ * In practice, the speed-up is pretty small.

+ *

+ * \todo

+ * Do some more testing and determine if there's any reason to have this

+ * function in addition to the MMX version.

+ *

+ * \warning

+ * This function assumes that the caller will issue the EMMS instruction

+ * at the correct places.

+ */

+

+.globl _generic_read_RGBA_span_BGRA8888_REV_SSE

+.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE

+	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE, @function

+_generic_read_RGBA_span_BGRA8888_REV_SSE:

+	pushl	%esi

+	pushl	%ebx

+	pushl	%ebp

+

+#ifdef USE_INNER_EMMS

+	emms

+#endif

+

+	LOAD_MASK(movq,%mm1,%mm2)

+

+	movl	16(%esp), %ebx	/* source pointer */

+	movl	24(%esp), %edx	/* number of pixels to copy */

+	movl	20(%esp), %ecx	/* destination pointer */

+

+	testl	%edx, %edx

+	jle	.L35		/* Bail if there's nothing to do. */

+

+	movl	%esp, %ebp

+	subl	$16, %esp

+	andl	$0xfffffff0, %esp

+

+	movl	%ebx, %eax

+	movl	%edx, %esi

+

+	negl	%eax

+	andl	$15, %eax

+	sarl	$2, %eax

+	cmpl	%edx, %eax

+	cmovle	%eax, %esi

+

+	subl	%esi, %edx

+

+	testl	$1, %esi

+	je	.L32

+

+	DO_ONE_PIXEL()

+.L32:

+

+	testl	$2, %esi

+	je	.L31

+

+	movq	(%ebx), %mm0

+	addl	$8, %ebx

+

+	movq	%mm0, %mm3

+	movq	%mm0, %mm4

+	

+	pand	%mm2, %mm3

+	psllq	$16, %mm4

+	psrlq	$16, %mm3

+	pand	%mm2, %mm4

+

+	pand	%mm1, %mm0

+	por	%mm4, %mm3

+	por	%mm3, %mm0

+

+	movq	%mm0, (%ecx)

+	addl	$8, %ecx

+.L31:

+

+	movl	%edx, %eax

+	shrl	$2, %eax

+	jmp	.L33

+.L34:

+	movaps	(%ebx), %xmm0

+	addl	$16, %ebx

+

+	/* This would be so much better if we could just move directly from

+	 * an SSE register to an MMX register.  Unfortunately, that

+	 * functionality wasn't introduced until SSE2 with the MOVDQ2Q

+	 * instruction.

+	 */

+

+	movaps	%xmm0, (%esp)

+	movq	(%esp), %mm0

+	movq	8(%esp), %mm5

+

+	movq	%mm0, %mm3

+	movq	%mm0, %mm4

+	movq	%mm5, %mm6

+	movq	%mm5, %mm7

+

+	pand	%mm2, %mm3

+	pand	%mm2, %mm6

+

+	psllq	$16, %mm4

+	psllq	$16, %mm7

+

+	psrlq	$16, %mm3

+	psrlq	$16, %mm6

+

+	pand	%mm2, %mm4

+	pand	%mm2, %mm7

+

+	pand	%mm1, %mm0

+	pand	%mm1, %mm5

+

+	por	%mm4, %mm3

+	por	%mm7, %mm6

+

+	por	%mm3, %mm0

+	por	%mm6, %mm5

+

+	movq	%mm0, (%ecx)

+	movq	%mm5, 8(%ecx)

+	addl	$16, %ecx

+

+	subl	$1, %eax

+.L33:

+	jne	.L34

+

+#ifdef USE_INNER_EMMS

+	emms

+#endif

+	movl	%ebp, %esp

+

+	/* At this point there are either [0, 3] pixels remaining to be

+	 * converted.

+	 */

+

+	testl	$2, %edx

+	je	.L36

+

+	movq	(%ebx), %mm0

+	addl	$8, %ebx

+

+	movq	%mm0, %mm3

+	movq	%mm0, %mm4

+	

+	pand	%mm2, %mm3

+	psllq	$16, %mm4

+	psrlq	$16, %mm3

+	pand	%mm2, %mm4

+

+	pand	%mm1, %mm0

+	por	%mm4, %mm3

+	por	%mm3, %mm0

+

+	movq	%mm0, (%ecx)

+	addl	$8, %ecx

+.L36:

+

+	testl	$1, %edx

+	je	.L35

+

+	DO_ONE_LAST_PIXEL()

+.L35:

+	popl	%ebp

+	popl	%ebx

+	popl	%esi

+	ret

+	.size	_generic_read_RGBA_span_BGRA8888_REV_SSE, .-_generic_read_RGBA_span_BGRA8888_REV_SSE

+

+

+/**

+ * SSE2 optimized version of the BGRA8888_REV to RGBA copy routine.

+ */

+

+	.text

+.globl _generic_read_RGBA_span_BGRA8888_REV_SSE2

+.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2

+	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE2, @function

+_generic_read_RGBA_span_BGRA8888_REV_SSE2:

+	pushl	%esi

+	pushl	%ebx

+

+	LOAD_MASK(movdqu,%xmm1,%xmm2)

+

+	movl	12(%esp), %ebx	/* source pointer */

+	movl	20(%esp), %edx	/* number of pixels to copy */

+	movl	16(%esp), %ecx	/* destination pointer */

+

+	movl	%ebx, %eax

+	movl	%edx, %esi

+

+	testl	%edx, %edx

+	jle	.L46		/* Bail if there's nothing to do. */

+

+	/* If the source pointer isn't a multiple of 16 we have to process

+	 * a few pixels the "slow" way to get the address aligned for

+	 * the SSE fetch intsructions.

+	 */

+

+	negl	%eax

+	andl	$15, %eax

+	sarl	$2, %eax

+

+	cmpl	%edx, %eax

+	cmovbe	%eax, %esi

+	subl	%esi, %edx

+

+	testl	$1, %esi

+	je	.L41

+

+	DO_ONE_PIXEL()  

+.L41:

+	testl	$2, %esi

+	je	.L40

+

+	movq	(%ebx), %xmm0

+	addl	$8, %ebx

+

+	movdqa	%xmm0, %xmm3

+	movdqa	%xmm0, %xmm4

+	andps	%xmm1, %xmm0

+

+	andps	%xmm2, %xmm3

+	pslldq	$2, %xmm4

+	psrldq	$2, %xmm3

+	andps	%xmm2, %xmm4

+

+	orps	%xmm4, %xmm3

+	orps	%xmm3, %xmm0

+

+	movq	%xmm0, (%ecx)

+	addl	$8, %ecx

+.L40:

+

+	/* Would it be worth having a specialized version of this loop for

+	 * the case where the destination is 16-byte aligned?  That version

+	 * would be identical except that it could use movedqa instead of

+	 * movdqu.

+	 */

+

+	movl	%edx, %eax

+	shrl	$2, %eax

+	jmp	.L42

+.L43:

+	movdqa	(%ebx), %xmm0

+	addl	$16, %ebx

+

+	movdqa	%xmm0, %xmm3

+	movdqa	%xmm0, %xmm4

+	andps	%xmm1, %xmm0

+

+	andps	%xmm2, %xmm3

+	pslldq	$2, %xmm4

+	psrldq	$2, %xmm3

+	andps	%xmm2, %xmm4

+

+	orps	%xmm4, %xmm3

+	orps	%xmm3, %xmm0

+

+	movdqu	%xmm0, (%ecx)

+	addl	$16, %ecx

+	subl	$1, %eax

+.L42:

+	jne	.L43

+

+

+	/* There may be upto 3 pixels remaining to be copied.  Take care

+	 * of them now.  We do the 2 pixel case first because the data

+	 * will be aligned.

+	 */

+

+	testl	$2, %edx

+	je	.L47

+

+	movq	(%ebx), %xmm0

+	addl	$8, %ebx

+        

+	movdqa	%xmm0, %xmm3

+	movdqa	%xmm0, %xmm4

+	andps	%xmm1, %xmm0

+

+	andps	%xmm2, %xmm3

+	pslldq	$2, %xmm4

+	psrldq	$2, %xmm3

+	andps	%xmm2, %xmm4

+

+	orps	%xmm4, %xmm3

+	orps	%xmm3, %xmm0

+

+	movq	%xmm0, (%ecx)

+	addl	$8, %ecx        

+.L47:

+

+	testl	$1, %edx

+	je	.L46

+

+	DO_ONE_LAST_PIXEL()  

+.L46:

+

+	popl	%ebx

+	popl	%esi

+	ret

+	.size	_generic_read_RGBA_span_BGRA8888_REV_SSE2, .-_generic_read_RGBA_span_BGRA8888_REV_SSE2

+

+

+

+#define MASK_565_L	0x07e0f800

+#define MASK_565_H	0x0000001f

+/* Setting SCALE_ADJUST to 5 gives a perfect match with the

+ * classic C implementation in Mesa.  Setting SCALE_ADJUST

+ * to 0 is slightly faster but at a small cost to accuracy.

+ */

+#define SCALE_ADJUST	5

+#if SCALE_ADJUST == 5

+#define PRESCALE_L 0x00100001

+#define PRESCALE_H 0x00000200

+#define SCALE_L 0x40C620E8

+#define SCALE_H 0x0000839d

+#elif SCALE_ADJUST == 0

+#define PRESCALE_L 0x00200001

+#define PRESCALE_H 0x00000800

+#define SCALE_L 0x01040108

+#define SCALE_H 0x00000108

+#else

+#error SCALE_ADJUST must either be 5 or 0.

+#endif

+#define ALPHA_L 0x00000000

+#define ALPHA_H 0x00ff0000

+

+/**

+ * MMX optimized version of the RGB565 to RGBA copy routine.

+ */

+

+	.text

+	.globl	_generic_read_RGBA_span_RGB565_MMX

+        .hidden _generic_read_RGBA_span_RGB565_MMX

+	.type	_generic_read_RGBA_span_RGB565_MMX, @function

+

+_generic_read_RGBA_span_RGB565_MMX:

+

+#ifdef USE_INNER_EMMS

+	emms

+#endif

+

+	movl	4(%esp), %eax	/* source pointer */

+	movl	8(%esp), %edx	/* destination pointer */

+	movl	12(%esp), %ecx	/* number of pixels to copy */

+

+	pushl	$MASK_565_H

+	pushl	$MASK_565_L

+	movq	(%esp), %mm5

+	pushl	$PRESCALE_H

+	pushl	$PRESCALE_L

+	movq	(%esp), %mm6

+	pushl	$SCALE_H

+	pushl	$SCALE_L

+	movq	(%esp), %mm7

+	pushl	$ALPHA_H

+	pushl	$ALPHA_L

+	movq	(%esp), %mm3

+	addl	$32,%esp

+

+	sarl	$2, %ecx

+	jl	.L01		/* Bail early if the count is negative. */

+	jmp	.L02

+

+.L03:

+	/* Fetch 4 RGB565 pixels into %mm4.  Distribute the first and

+	 * second pixels into the four words of %mm0 and %mm2.

+      	 */

+

+	movq	(%eax), %mm4

+	addl	$8, %eax

+

+	pshufw	$0x00, %mm4, %mm0

+	pshufw	$0x55, %mm4, %mm2

+

+

+	/* Mask the pixels so that each word of each register contains only

+	 * one color component.

+	 */

+

+	pand	%mm5, %mm0

+	pand	%mm5, %mm2

+

+

+	/* Adjust the component values so that they are as small as possible,

+	 * but large enough so that we can multiply them by an unsigned 16-bit

+	 * number and get a value as large as 0x00ff0000.

+ 	 */

+

+	pmullw	%mm6, %mm0

+	pmullw	%mm6, %mm2

+#if SCALE_ADJUST > 0

+	psrlw	$SCALE_ADJUST, %mm0

+	psrlw	$SCALE_ADJUST, %mm2

+#endif

+

+	/* Scale the input component values to be on the range

+	 * [0, 0x00ff0000].  This it the real magic of the whole routine.

+	 */

+

+	pmulhuw	%mm7, %mm0

+	pmulhuw	%mm7, %mm2

+

+

+	/* Always set the alpha value to 0xff.

+	 */

+

+ 	por %mm3, %mm0

+ 	por %mm3, %mm2

+

+

+	/* Pack the 16-bit values to 8-bit values and store the converted

+	 * pixel data.

+	 */

+

+	packuswb	%mm2, %mm0

+	movq	%mm0, (%edx)

+	addl	$8, %edx

+

+	pshufw	$0xaa, %mm4, %mm0

+	pshufw	$0xff, %mm4, %mm2

+

+	pand	%mm5, %mm0

+	pand	%mm5, %mm2

+	pmullw	%mm6, %mm0

+	pmullw	%mm6, %mm2

+#if SCALE_ADJUST > 0

+	psrlw	$SCALE_ADJUST, %mm0

+	psrlw	$SCALE_ADJUST, %mm2

+#endif

+	pmulhuw	%mm7, %mm0

+	pmulhuw	%mm7, %mm2

+

+ 	por %mm3, %mm0

+ 	por %mm3, %mm2

+

+	packuswb	%mm2, %mm0

+

+	movq	%mm0, (%edx)

+	addl	$8, %edx

+

+	subl	$1, %ecx

+.L02:

+	jne	.L03

+

+

+	/* At this point there can be at most 3 pixels left to process.  If

+	 * there is either 2 or 3 left, process 2.

+         */

+

+	movl	12(%esp), %ecx

+	testl	$0x02, %ecx

+	je	.L04

+

+	movd	(%eax), %mm4

+	addl	$4, %eax

+

+	pshufw	$0x00, %mm4, %mm0

+	pshufw	$0x55, %mm4, %mm2

+

+	pand	%mm5, %mm0

+	pand	%mm5, %mm2

+	pmullw	%mm6, %mm0

+	pmullw	%mm6, %mm2

+#if SCALE_ADJUST > 0

+	psrlw	$SCALE_ADJUST, %mm0

+	psrlw	$SCALE_ADJUST, %mm2

+#endif

+	pmulhuw	%mm7, %mm0

+	pmulhuw	%mm7, %mm2

+

+ 	por %mm3, %mm0

+ 	por %mm3, %mm2

+

+	packuswb	%mm2, %mm0

+

+	movq	%mm0, (%edx)

+	addl	$8, %edx

+

+.L04:

+	/* At this point there can be at most 1 pixel left to process.

+	 * Process it if needed.

+         */

+

+	testl	$0x01, %ecx

+	je	.L01

+

+	movzxw	(%eax), %ecx

+	movd	%ecx, %mm4

+

+	pshufw	$0x00, %mm4, %mm0

+

+	pand	%mm5, %mm0

+	pmullw	%mm6, %mm0

+#if SCALE_ADJUST > 0

+	psrlw	$SCALE_ADJUST, %mm0

+#endif

+	pmulhuw	%mm7, %mm0

+

+ 	por %mm3, %mm0

+

+	packuswb	%mm0, %mm0

+

+	movd	%mm0, (%edx)

+

+.L01:

+#ifdef USE_INNER_EMMS

+	emms

+#endif

+	ret

+#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) */

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/read_rgba_span_x86.h b/mesalib/src/mesa/x86/read_rgba_span_x86.h
new file mode 100644
index 000000000..d255f6dcb
--- /dev/null
+++ b/mesalib/src/mesa/x86/read_rgba_span_x86.h
@@ -0,0 +1,56 @@
+/*

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

+ * IBM 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 read_rgba_span_x86.h

+ *

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

+ */

+

+#ifndef READ_RGBA_SPAN_X86_H

+#define READ_RGBA_SPAN_X86_H

+

+#if defined(USE_SSE_ASM) || defined(USE_MMX_ASM)

+#include "x86/common_x86_asm.h"

+#endif

+

+#if defined(USE_SSE_ASM)

+extern void _generic_read_RGBA_span_BGRA8888_REV_SSE2( const unsigned char *,

+    unsigned char *, unsigned );

+#endif

+

+#if defined(USE_SSE_ASM)

+extern void _generic_read_RGBA_span_BGRA8888_REV_SSE( const unsigned char *,

+    unsigned char *, unsigned );

+#endif

+

+#if defined(USE_MMX_ASM)

+extern void _generic_read_RGBA_span_BGRA8888_REV_MMX( const unsigned char *,

+    unsigned char *, unsigned );

+

+extern void _generic_read_RGBA_span_RGB565_MMX( const unsigned char *,

+    unsigned char *, unsigned );

+#endif

+

+#endif /* READ_RGBA_SPAN_X86_H */

diff --git a/mesalib/src/mesa/x86/rtasm/x86sse.c b/mesalib/src/mesa/x86/rtasm/x86sse.c
new file mode 100644
index 000000000..08e3969b2
--- /dev/null
+++ b/mesalib/src/mesa/x86/rtasm/x86sse.c
@@ -0,0 +1,1203 @@
+#ifdef USE_X86_ASM

+#if defined(__i386__) || defined(__386__)

+

+#include "main/imports.h"

+#include "x86sse.h"

+

+#define DISASSEM 0

+#define X86_TWOB 0x0f

+

+#if 0

+static unsigned char *cptr( void (*label)() )

+{

+   return (unsigned char *)(unsigned long)label;

+}

+#endif

+

+

+static void do_realloc( struct x86_function *p )

+{

+   if (p->size == 0) {

+      p->size = 1024;

+      p->store = _mesa_exec_malloc(p->size);

+      p->csr = p->store;

+   }

+   else {

+      unsigned used = p->csr - p->store;

+      unsigned char *tmp = p->store;

+      p->size *= 2;

+      p->store = _mesa_exec_malloc(p->size);

+      memcpy(p->store, tmp, used);

+      p->csr = p->store + used;

+      _mesa_exec_free(tmp);

+   }

+}

+

+/* Emit bytes to the instruction stream:

+ */

+static unsigned char *reserve( struct x86_function *p, int bytes )

+{

+   if (p->csr + bytes - p->store > p->size)

+      do_realloc(p);

+

+   {

+      unsigned char *csr = p->csr;

+      p->csr += bytes;

+      return csr;

+   }

+}

+

+

+

+static void emit_1b( struct x86_function *p, char b0 )

+{

+   char *csr = (char *)reserve(p, 1);

+   *csr = b0;

+}

+

+static void emit_1i( struct x86_function *p, int i0 )

+{

+   int *icsr = (int *)reserve(p, sizeof(i0));

+   *icsr = i0;

+}

+

+static void emit_1ub( struct x86_function *p, unsigned char b0 )

+{

+   unsigned char *csr = reserve(p, 1);

+   *csr++ = b0;

+}

+

+static void emit_2ub( struct x86_function *p, unsigned char b0, unsigned char b1 )

+{

+   unsigned char *csr = reserve(p, 2);

+   *csr++ = b0;

+   *csr++ = b1;

+}

+

+static void emit_3ub( struct x86_function *p, unsigned char b0, unsigned char b1, unsigned char b2 )

+{

+   unsigned char *csr = reserve(p, 3);

+   *csr++ = b0;

+   *csr++ = b1;

+   *csr++ = b2;

+}

+

+

+/* Build a modRM byte + possible displacement.  No treatment of SIB

+ * indexing.  BZZT - no way to encode an absolute address.

+ */

+static void emit_modrm( struct x86_function *p, 

+			struct x86_reg reg, 

+			struct x86_reg regmem )

+{

+   unsigned char val = 0;

+   

+   assert(reg.mod == mod_REG);

+   

+   val |= regmem.mod << 6;     	/* mod field */

+   val |= reg.idx << 3;		/* reg field */

+   val |= regmem.idx;		/* r/m field */

+   

+   emit_1ub(p, val);

+

+   /* Oh-oh we've stumbled into the SIB thing.

+    */

+   if (regmem.file == file_REG32 &&

+       regmem.idx == reg_SP) {

+      emit_1ub(p, 0x24);		/* simplistic! */

+   }

+

+   switch (regmem.mod) {

+   case mod_REG:

+   case mod_INDIRECT:

+      break;

+   case mod_DISP8:

+      emit_1b(p, regmem.disp);

+      break;

+   case mod_DISP32:

+      emit_1i(p, regmem.disp);

+      break;

+   default:

+      assert(0);

+      break;

+   }

+}

+

+

+static void emit_modrm_noreg( struct x86_function *p,

+			      unsigned op,

+			      struct x86_reg regmem )

+{

+   struct x86_reg dummy = x86_make_reg(file_REG32, op);

+   emit_modrm(p, dummy, regmem);

+}

+

+/* Many x86 instructions have two opcodes to cope with the situations

+ * where the destination is a register or memory reference

+ * respectively.  This function selects the correct opcode based on

+ * the arguments presented.

+ */

+static void emit_op_modrm( struct x86_function *p,

+			   unsigned char op_dst_is_reg, 

+			   unsigned char op_dst_is_mem,

+			   struct x86_reg dst,

+			   struct x86_reg src )

+{  

+   switch (dst.mod) {

+   case mod_REG:

+      emit_1ub(p, op_dst_is_reg);

+      emit_modrm(p, dst, src);

+      break;

+   case mod_INDIRECT:

+   case mod_DISP32:

+   case mod_DISP8:

+      assert(src.mod == mod_REG);

+      emit_1ub(p, op_dst_is_mem);

+      emit_modrm(p, src, dst);

+      break;

+   default:

+      assert(0);

+      break;

+   }

+}

+

+

+

+

+

+

+

+/* Create and manipulate registers and regmem values:

+ */

+struct x86_reg x86_make_reg( enum x86_reg_file file,

+			     enum x86_reg_name idx )

+{

+   struct x86_reg reg;

+

+   reg.file = file;

+   reg.idx = idx;

+   reg.mod = mod_REG;

+   reg.disp = 0;

+

+   return reg;

+}

+

+struct x86_reg x86_make_disp( struct x86_reg reg,

+			      int disp )

+{

+   assert(reg.file == file_REG32);

+

+   if (reg.mod == mod_REG)

+      reg.disp = disp;

+   else

+      reg.disp += disp;

+

+   if (reg.disp == 0)

+      reg.mod = mod_INDIRECT;

+   else if (reg.disp <= 127 && reg.disp >= -128)

+      reg.mod = mod_DISP8;

+   else

+      reg.mod = mod_DISP32;

+

+   return reg;

+}

+

+struct x86_reg x86_deref( struct x86_reg reg )

+{

+   return x86_make_disp(reg, 0);

+}

+

+struct x86_reg x86_get_base_reg( struct x86_reg reg )

+{

+   return x86_make_reg( reg.file, reg.idx );

+}

+

+unsigned char *x86_get_label( struct x86_function *p )

+{

+   return p->csr;

+}

+

+

+

+/***********************************************************************

+ * x86 instructions

+ */

+

+

+void x86_jcc( struct x86_function *p,

+	      enum x86_cc cc,

+	      unsigned char *label )

+{

+   int offset = label - (x86_get_label(p) + 2);

+   

+   if (offset <= 127 && offset >= -128) {

+      emit_1ub(p, 0x70 + cc);

+      emit_1b(p, (char) offset);

+   }

+   else {

+      offset = label - (x86_get_label(p) + 6);

+      emit_2ub(p, 0x0f, 0x80 + cc);

+      emit_1i(p, offset);

+   }

+}

+

+/* Always use a 32bit offset for forward jumps:

+ */

+unsigned char *x86_jcc_forward( struct x86_function *p,

+			  enum x86_cc cc )

+{

+   emit_2ub(p, 0x0f, 0x80 + cc);

+   emit_1i(p, 0);

+   return x86_get_label(p);

+}

+

+unsigned char *x86_jmp_forward( struct x86_function *p)

+{

+   emit_1ub(p, 0xe9);

+   emit_1i(p, 0);

+   return x86_get_label(p);

+}

+

+unsigned char *x86_call_forward( struct x86_function *p)

+{

+   emit_1ub(p, 0xe8);

+   emit_1i(p, 0);

+   return x86_get_label(p);

+}

+

+/* Fixup offset from forward jump:

+ */

+void x86_fixup_fwd_jump( struct x86_function *p,

+			 unsigned char *fixup )

+{

+   *(int *)(fixup - 4) = x86_get_label(p) - fixup;

+}

+

+void x86_jmp( struct x86_function *p, unsigned char *label)

+{

+   emit_1ub(p, 0xe9);

+   emit_1i(p, label - x86_get_label(p) - 4);

+}

+

+#if 0

+/* This doesn't work once we start reallocating & copying the

+ * generated code on buffer fills, because the call is relative to the

+ * current pc.

+ */

+void x86_call( struct x86_function *p, void (*label)())

+{

+   emit_1ub(p, 0xe8);

+   emit_1i(p, cptr(label) - x86_get_label(p) - 4);

+}

+#else

+void x86_call( struct x86_function *p, struct x86_reg reg)

+{

+   emit_1ub(p, 0xff);

+   emit_modrm_noreg(p, 2, reg);

+}

+#endif

+

+

+/* michal:

+ * Temporary. As I need immediate operands, and dont want to mess with the codegen,

+ * I load the immediate into general purpose register and use it.

+ */

+void x86_mov_reg_imm( struct x86_function *p, struct x86_reg dst, int imm )

+{

+   assert(dst.mod == mod_REG);

+   emit_1ub(p, 0xb8 + dst.idx);

+   emit_1i(p, imm);

+}

+

+void x86_push( struct x86_function *p,

+	       struct x86_reg reg )

+{

+   assert(reg.mod == mod_REG);

+   emit_1ub(p, 0x50 + reg.idx);

+   p->stack_offset += 4;

+}

+

+void x86_pop( struct x86_function *p,

+	      struct x86_reg reg )

+{

+   assert(reg.mod == mod_REG);

+   emit_1ub(p, 0x58 + reg.idx);

+   p->stack_offset -= 4;

+}

+

+void x86_inc( struct x86_function *p,

+	      struct x86_reg reg )

+{

+   assert(reg.mod == mod_REG);

+   emit_1ub(p, 0x40 + reg.idx);

+}

+

+void x86_dec( struct x86_function *p,

+	      struct x86_reg reg )

+{

+   assert(reg.mod == mod_REG);

+   emit_1ub(p, 0x48 + reg.idx);

+}

+

+void x86_ret( struct x86_function *p )

+{

+   emit_1ub(p, 0xc3);

+}

+

+void x86_sahf( struct x86_function *p )

+{

+   emit_1ub(p, 0x9e);

+}

+

+void x86_mov( struct x86_function *p,

+	      struct x86_reg dst,

+	      struct x86_reg src )

+{

+   emit_op_modrm( p, 0x8b, 0x89, dst, src );

+}

+

+void x86_xor( struct x86_function *p,

+	      struct x86_reg dst,

+	      struct x86_reg src )

+{

+   emit_op_modrm( p, 0x33, 0x31, dst, src );

+}

+

+void x86_cmp( struct x86_function *p,

+	      struct x86_reg dst,

+	      struct x86_reg src )

+{

+   emit_op_modrm( p, 0x3b, 0x39, dst, src );

+}

+

+void x86_lea( struct x86_function *p,

+	      struct x86_reg dst,

+	      struct x86_reg src )

+{

+   emit_1ub(p, 0x8d);

+   emit_modrm( p, dst, src );

+}

+

+void x86_test( struct x86_function *p,

+	       struct x86_reg dst,

+	       struct x86_reg src )

+{

+   emit_1ub(p, 0x85);

+   emit_modrm( p, dst, src );

+}

+

+void x86_add( struct x86_function *p,

+	       struct x86_reg dst,

+	       struct x86_reg src )

+{

+   emit_op_modrm(p, 0x03, 0x01, dst, src );

+}

+

+void x86_mul( struct x86_function *p,

+	       struct x86_reg src )

+{

+   assert (src.file == file_REG32 && src.mod == mod_REG);

+   emit_op_modrm(p, 0xf7, 0, x86_make_reg (file_REG32, reg_SP), src );

+}

+

+void x86_sub( struct x86_function *p,

+	       struct x86_reg dst,

+	       struct x86_reg src )

+{

+   emit_op_modrm(p, 0x2b, 0x29, dst, src );

+}

+

+void x86_or( struct x86_function *p,

+             struct x86_reg dst,

+             struct x86_reg src )

+{

+   emit_op_modrm( p, 0x0b, 0x09, dst, src );

+}

+

+void x86_and( struct x86_function *p,

+              struct x86_reg dst,

+              struct x86_reg src )

+{

+   emit_op_modrm( p, 0x23, 0x21, dst, src );

+}

+

+

+

+/***********************************************************************

+ * SSE instructions

+ */

+

+

+void sse_movss( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, 0xF3, X86_TWOB);

+   emit_op_modrm( p, 0x10, 0x11, dst, src );

+}

+

+void sse_movaps( struct x86_function *p,

+		 struct x86_reg dst,

+		 struct x86_reg src )

+{

+   emit_1ub(p, X86_TWOB);

+   emit_op_modrm( p, 0x28, 0x29, dst, src );

+}

+

+void sse_movups( struct x86_function *p,

+		 struct x86_reg dst,

+		 struct x86_reg src )

+{

+   emit_1ub(p, X86_TWOB);

+   emit_op_modrm( p, 0x10, 0x11, dst, src );

+}

+

+void sse_movhps( struct x86_function *p,

+		 struct x86_reg dst,

+		 struct x86_reg src )

+{

+   assert(dst.mod != mod_REG || src.mod != mod_REG);

+   emit_1ub(p, X86_TWOB);

+   emit_op_modrm( p, 0x16, 0x17, dst, src ); /* cf movlhps */

+}

+

+void sse_movlps( struct x86_function *p,

+		 struct x86_reg dst,

+		 struct x86_reg src )

+{

+   assert(dst.mod != mod_REG || src.mod != mod_REG);

+   emit_1ub(p, X86_TWOB);

+   emit_op_modrm( p, 0x12, 0x13, dst, src ); /* cf movhlps */

+}

+

+void sse_maxps( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x5F);

+   emit_modrm( p, dst, src );

+}

+

+void sse_maxss( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_3ub(p, 0xF3, X86_TWOB, 0x5F);

+   emit_modrm( p, dst, src );

+}

+

+void sse_divss( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_3ub(p, 0xF3, X86_TWOB, 0x5E);

+   emit_modrm( p, dst, src );

+}

+

+void sse_minps( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x5D);

+   emit_modrm( p, dst, src );

+}

+

+void sse_subps( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x5C);

+   emit_modrm( p, dst, src );

+}

+

+void sse_mulps( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x59);

+   emit_modrm( p, dst, src );

+}

+

+void sse_mulss( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_3ub(p, 0xF3, X86_TWOB, 0x59);

+   emit_modrm( p, dst, src );

+}

+

+void sse_addps( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x58);

+   emit_modrm( p, dst, src );

+}

+

+void sse_addss( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_3ub(p, 0xF3, X86_TWOB, 0x58);

+   emit_modrm( p, dst, src );

+}

+

+void sse_andnps( struct x86_function *p,

+                 struct x86_reg dst,

+                 struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x55);

+   emit_modrm( p, dst, src );

+}

+

+void sse_andps( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x54);

+   emit_modrm( p, dst, src );

+}

+

+void sse_rsqrtps( struct x86_function *p,

+                  struct x86_reg dst,

+                  struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x52);

+   emit_modrm( p, dst, src );

+}

+

+void sse_rsqrtss( struct x86_function *p,

+		  struct x86_reg dst,

+		  struct x86_reg src )

+{

+   emit_3ub(p, 0xF3, X86_TWOB, 0x52);

+   emit_modrm( p, dst, src );

+

+}

+

+void sse_movhlps( struct x86_function *p,

+		  struct x86_reg dst,

+		  struct x86_reg src )

+{

+   assert(dst.mod == mod_REG && src.mod == mod_REG);

+   emit_2ub(p, X86_TWOB, 0x12);

+   emit_modrm( p, dst, src );

+}

+

+void sse_movlhps( struct x86_function *p,

+		  struct x86_reg dst,

+		  struct x86_reg src )

+{

+   assert(dst.mod == mod_REG && src.mod == mod_REG);

+   emit_2ub(p, X86_TWOB, 0x16);

+   emit_modrm( p, dst, src );

+}

+

+void sse_orps( struct x86_function *p,

+               struct x86_reg dst,

+               struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x56);

+   emit_modrm( p, dst, src );

+}

+

+void sse_xorps( struct x86_function *p,

+                struct x86_reg dst,

+                struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x57);

+   emit_modrm( p, dst, src );

+}

+

+void sse_cvtps2pi( struct x86_function *p,

+		   struct x86_reg dst,

+		   struct x86_reg src )

+{

+   assert(dst.file == file_MMX && 

+	  (src.file == file_XMM || src.mod != mod_REG));

+

+   p->need_emms = 1;

+

+   emit_2ub(p, X86_TWOB, 0x2d);

+   emit_modrm( p, dst, src );

+}

+

+

+/* Shufps can also be used to implement a reduced swizzle when dest ==

+ * arg0.

+ */

+void sse_shufps( struct x86_function *p,

+		 struct x86_reg dest,

+		 struct x86_reg arg0,

+		 unsigned char shuf) 

+{

+   emit_2ub(p, X86_TWOB, 0xC6);

+   emit_modrm(p, dest, arg0);

+   emit_1ub(p, shuf); 

+}

+

+void sse_cmpps( struct x86_function *p,

+		struct x86_reg dest,

+		struct x86_reg arg0,

+		unsigned char cc) 

+{

+   emit_2ub(p, X86_TWOB, 0xC2);

+   emit_modrm(p, dest, arg0);

+   emit_1ub(p, cc); 

+}

+

+void sse_pmovmskb( struct x86_function *p,

+                   struct x86_reg dest,

+                   struct x86_reg src)

+{

+    emit_3ub(p, 0x66, X86_TWOB, 0xD7);

+    emit_modrm(p, dest, src);

+}

+

+/***********************************************************************

+ * SSE2 instructions

+ */

+

+/**

+ * Perform a reduced swizzle:

+ */

+void sse2_pshufd( struct x86_function *p,

+		  struct x86_reg dest,

+		  struct x86_reg arg0,

+		  unsigned char shuf) 

+{

+   emit_3ub(p, 0x66, X86_TWOB, 0x70);

+   emit_modrm(p, dest, arg0);

+   emit_1ub(p, shuf); 

+}

+

+void sse2_cvttps2dq( struct x86_function *p,

+                     struct x86_reg dst,

+                     struct x86_reg src )

+{

+   emit_3ub( p, 0xF3, X86_TWOB, 0x5B );

+   emit_modrm( p, dst, src );

+}

+

+void sse2_cvtps2dq( struct x86_function *p,

+		    struct x86_reg dst,

+		    struct x86_reg src )

+{

+   emit_3ub(p, 0x66, X86_TWOB, 0x5B);

+   emit_modrm( p, dst, src );

+}

+

+void sse2_packssdw( struct x86_function *p,

+		    struct x86_reg dst,

+		    struct x86_reg src )

+{

+   emit_3ub(p, 0x66, X86_TWOB, 0x6B);

+   emit_modrm( p, dst, src );

+}

+

+void sse2_packsswb( struct x86_function *p,

+		    struct x86_reg dst,

+		    struct x86_reg src )

+{

+   emit_3ub(p, 0x66, X86_TWOB, 0x63);

+   emit_modrm( p, dst, src );

+}

+

+void sse2_packuswb( struct x86_function *p,

+		    struct x86_reg dst,

+		    struct x86_reg src )

+{

+   emit_3ub(p, 0x66, X86_TWOB, 0x67);

+   emit_modrm( p, dst, src );

+}

+

+void sse2_rcpps( struct x86_function *p,

+                 struct x86_reg dst,

+                 struct x86_reg src )

+{

+   emit_2ub(p, X86_TWOB, 0x53);

+   emit_modrm( p, dst, src );

+}

+

+void sse2_rcpss( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_3ub(p, 0xF3, X86_TWOB, 0x53);

+   emit_modrm( p, dst, src );

+}

+

+void sse2_movd( struct x86_function *p,

+		struct x86_reg dst,

+		struct x86_reg src )

+{

+   emit_2ub(p, 0x66, X86_TWOB);

+   emit_op_modrm( p, 0x6e, 0x7e, dst, src );

+}

+

+

+

+

+/***********************************************************************

+ * x87 instructions

+ */

+void x87_fist( struct x86_function *p, struct x86_reg dst )

+{

+   emit_1ub(p, 0xdb);

+   emit_modrm_noreg(p, 2, dst);

+}

+

+void x87_fistp( struct x86_function *p, struct x86_reg dst )

+{

+   emit_1ub(p, 0xdb);

+   emit_modrm_noreg(p, 3, dst);

+}

+

+void x87_fild( struct x86_function *p, struct x86_reg arg )

+{

+   emit_1ub(p, 0xdf);

+   emit_modrm_noreg(p, 0, arg);

+}

+

+void x87_fldz( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xee);

+}

+

+

+void x87_fldcw( struct x86_function *p, struct x86_reg arg )

+{

+   assert(arg.file == file_REG32);

+   assert(arg.mod != mod_REG);

+   emit_1ub(p, 0xd9);

+   emit_modrm_noreg(p, 5, arg);

+}

+

+void x87_fld1( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xe8);

+}

+

+void x87_fldl2e( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xea);

+}

+

+void x87_fldln2( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xed);

+}

+

+void x87_fwait( struct x86_function *p )

+{

+   emit_1ub(p, 0x9b);

+}

+

+void x87_fnclex( struct x86_function *p )

+{

+   emit_2ub(p, 0xdb, 0xe2);

+}

+

+void x87_fclex( struct x86_function *p )

+{

+   x87_fwait(p);

+   x87_fnclex(p);

+}

+

+

+static void x87_arith_op( struct x86_function *p, struct x86_reg dst, struct x86_reg arg,

+			  unsigned char dst0ub0,

+			  unsigned char dst0ub1,

+			  unsigned char arg0ub0,

+			  unsigned char arg0ub1,

+			  unsigned char argmem_noreg)

+{

+   assert(dst.file == file_x87);

+

+   if (arg.file == file_x87) {

+      if (dst.idx == 0) 

+	 emit_2ub(p, dst0ub0, dst0ub1+arg.idx);

+      else if (arg.idx == 0) 

+	 emit_2ub(p, arg0ub0, arg0ub1+arg.idx);

+      else

+	 assert(0);

+   }

+   else if (dst.idx == 0) {

+      assert(arg.file == file_REG32);

+      emit_1ub(p, 0xd8);

+      emit_modrm_noreg(p, argmem_noreg, arg);

+   }

+   else

+      assert(0);

+}

+

+void x87_fmul( struct x86_function *p, struct x86_reg dst, struct x86_reg arg )

+{

+   x87_arith_op(p, dst, arg, 

+		0xd8, 0xc8,

+		0xdc, 0xc8,

+		4);

+}

+

+void x87_fsub( struct x86_function *p, struct x86_reg dst, struct x86_reg arg )

+{

+   x87_arith_op(p, dst, arg, 

+		0xd8, 0xe0,

+		0xdc, 0xe8,

+		4);

+}

+

+void x87_fsubr( struct x86_function *p, struct x86_reg dst, struct x86_reg arg )

+{

+   x87_arith_op(p, dst, arg, 

+		0xd8, 0xe8,

+		0xdc, 0xe0,

+		5);

+}

+

+void x87_fadd( struct x86_function *p, struct x86_reg dst, struct x86_reg arg )

+{

+   x87_arith_op(p, dst, arg, 

+		0xd8, 0xc0,

+		0xdc, 0xc0,

+		0);

+}

+

+void x87_fdiv( struct x86_function *p, struct x86_reg dst, struct x86_reg arg )

+{

+   x87_arith_op(p, dst, arg, 

+		0xd8, 0xf0,

+		0xdc, 0xf8,

+		6);

+}

+

+void x87_fdivr( struct x86_function *p, struct x86_reg dst, struct x86_reg arg )

+{

+   x87_arith_op(p, dst, arg, 

+		0xd8, 0xf8,

+		0xdc, 0xf0,

+		7);

+}

+

+void x87_fmulp( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_x87);

+   assert(dst.idx >= 1);

+   emit_2ub(p, 0xde, 0xc8+dst.idx);

+}

+

+void x87_fsubp( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_x87);

+   assert(dst.idx >= 1);

+   emit_2ub(p, 0xde, 0xe8+dst.idx);

+}

+

+void x87_fsubrp( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_x87);

+   assert(dst.idx >= 1);

+   emit_2ub(p, 0xde, 0xe0+dst.idx);

+}

+

+void x87_faddp( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_x87);

+   assert(dst.idx >= 1);

+   emit_2ub(p, 0xde, 0xc0+dst.idx);

+}

+

+void x87_fdivp( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_x87);

+   assert(dst.idx >= 1);

+   emit_2ub(p, 0xde, 0xf8+dst.idx);

+}

+

+void x87_fdivrp( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_x87);

+   assert(dst.idx >= 1);

+   emit_2ub(p, 0xde, 0xf0+dst.idx);

+}

+

+void x87_fucom( struct x86_function *p, struct x86_reg arg )

+{

+   assert(arg.file == file_x87);

+   emit_2ub(p, 0xdd, 0xe0+arg.idx);

+}

+

+void x87_fucomp( struct x86_function *p, struct x86_reg arg )

+{

+   assert(arg.file == file_x87);

+   emit_2ub(p, 0xdd, 0xe8+arg.idx);

+}

+

+void x87_fucompp( struct x86_function *p )

+{

+   emit_2ub(p, 0xda, 0xe9);

+}

+

+void x87_fxch( struct x86_function *p, struct x86_reg arg )

+{

+   assert(arg.file == file_x87);

+   emit_2ub(p, 0xd9, 0xc8+arg.idx);

+}

+

+void x87_fabs( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xe1);

+}

+

+void x87_fchs( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xe0);

+}

+

+void x87_fcos( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xff);

+}

+

+

+void x87_fprndint( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xfc);

+}

+

+void x87_fscale( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xfd);

+}

+

+void x87_fsin( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xfe);

+}

+

+void x87_fsincos( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xfb);

+}

+

+void x87_fsqrt( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xfa);

+}

+

+void x87_fxtract( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xf4);

+}

+

+/* st0 = (2^st0)-1

+ *

+ * Restrictions: -1.0 <= st0 <= 1.0

+ */

+void x87_f2xm1( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xf0);

+}

+

+/* st1 = st1 * log2(st0);

+ * pop_stack;

+ */

+void x87_fyl2x( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xf1);

+}

+

+/* st1 = st1 * log2(st0 + 1.0);

+ * pop_stack;

+ *

+ * A fast operation, with restrictions: -.29 < st0 < .29 

+ */

+void x87_fyl2xp1( struct x86_function *p )

+{

+   emit_2ub(p, 0xd9, 0xf9);

+}

+

+

+void x87_fld( struct x86_function *p, struct x86_reg arg )

+{

+   if (arg.file == file_x87) 

+      emit_2ub(p, 0xd9, 0xc0 + arg.idx);

+   else {

+      emit_1ub(p, 0xd9);

+      emit_modrm_noreg(p, 0, arg);

+   }

+}

+

+void x87_fst( struct x86_function *p, struct x86_reg dst )

+{

+   if (dst.file == file_x87) 

+      emit_2ub(p, 0xdd, 0xd0 + dst.idx);

+   else {

+      emit_1ub(p, 0xd9);

+      emit_modrm_noreg(p, 2, dst);

+   }

+}

+

+void x87_fstp( struct x86_function *p, struct x86_reg dst )

+{

+   if (dst.file == file_x87) 

+      emit_2ub(p, 0xdd, 0xd8 + dst.idx);

+   else {

+      emit_1ub(p, 0xd9);

+      emit_modrm_noreg(p, 3, dst);

+   }

+}

+

+void x87_fcom( struct x86_function *p, struct x86_reg dst )

+{

+   if (dst.file == file_x87) 

+      emit_2ub(p, 0xd8, 0xd0 + dst.idx);

+   else {

+      emit_1ub(p, 0xd8);

+      emit_modrm_noreg(p, 2, dst);

+   }

+}

+

+void x87_fcomp( struct x86_function *p, struct x86_reg dst )

+{

+   if (dst.file == file_x87) 

+      emit_2ub(p, 0xd8, 0xd8 + dst.idx);

+   else {

+      emit_1ub(p, 0xd8);

+      emit_modrm_noreg(p, 3, dst);

+   }

+}

+

+

+void x87_fnstsw( struct x86_function *p, struct x86_reg dst )

+{

+   assert(dst.file == file_REG32);

+

+   if (dst.idx == reg_AX &&

+       dst.mod == mod_REG) 

+      emit_2ub(p, 0xdf, 0xe0);

+   else {

+      emit_1ub(p, 0xdd);

+      emit_modrm_noreg(p, 7, dst);

+   }

+}

+

+

+

+

+/***********************************************************************

+ * MMX instructions

+ */

+

+void mmx_emms( struct x86_function *p )

+{

+   assert(p->need_emms);

+   emit_2ub(p, 0x0f, 0x77);

+   p->need_emms = 0;

+}

+

+void mmx_packssdw( struct x86_function *p,

+		   struct x86_reg dst,

+		   struct x86_reg src )

+{

+   assert(dst.file == file_MMX && 

+	  (src.file == file_MMX || src.mod != mod_REG));

+

+   p->need_emms = 1;

+

+   emit_2ub(p, X86_TWOB, 0x6b);

+   emit_modrm( p, dst, src );

+}

+

+void mmx_packuswb( struct x86_function *p,

+		   struct x86_reg dst,

+		   struct x86_reg src )

+{

+   assert(dst.file == file_MMX && 

+	  (src.file == file_MMX || src.mod != mod_REG));

+

+   p->need_emms = 1;

+

+   emit_2ub(p, X86_TWOB, 0x67);

+   emit_modrm( p, dst, src );

+}

+

+void mmx_movd( struct x86_function *p,

+	       struct x86_reg dst,

+	       struct x86_reg src )

+{

+   p->need_emms = 1;

+   emit_1ub(p, X86_TWOB);

+   emit_op_modrm( p, 0x6e, 0x7e, dst, src );

+}

+

+void mmx_movq( struct x86_function *p,

+	       struct x86_reg dst,

+	       struct x86_reg src )

+{

+   p->need_emms = 1;

+   emit_1ub(p, X86_TWOB);

+   emit_op_modrm( p, 0x6f, 0x7f, dst, src );

+}

+

+

+/***********************************************************************

+ * Helper functions

+ */

+

+

+/* Retreive a reference to one of the function arguments, taking into

+ * account any push/pop activity:

+ */

+struct x86_reg x86_fn_arg( struct x86_function *p,

+			   unsigned arg )

+{

+   return x86_make_disp(x86_make_reg(file_REG32, reg_SP), 

+			p->stack_offset + arg * 4);	/* ??? */

+}

+

+

+void x86_init_func( struct x86_function *p )

+{

+   p->size = 0;

+   p->store = NULL;

+   p->csr = p->store;

+}

+

+int x86_init_func_size( struct x86_function *p, unsigned code_size )

+{

+   p->size = code_size;

+   p->store = _mesa_exec_malloc(code_size);

+   p->csr = p->store;

+   return p->store != NULL;

+}

+

+void x86_release_func( struct x86_function *p )

+{

+   _mesa_exec_free(p->store);

+   p->store = NULL;

+   p->csr = NULL;

+   p->size = 0;

+}

+

+

+void (*x86_get_func( struct x86_function *p ))(void)

+{

+   if (DISASSEM && p->store)

+      printf("disassemble %p %p\n", p->store, p->csr);

+   return (void (*)(void)) (unsigned long) p->store;

+}

+

+#else

+

+void x86sse_dummy( void )

+{

+}

+

+#endif

+

+#else  /* USE_X86_ASM */

+

+int x86sse_c_dummy_var; /* silence warning */

+

+#endif /* USE_X86_ASM */

diff --git a/mesalib/src/mesa/x86/rtasm/x86sse.h b/mesalib/src/mesa/x86/rtasm/x86sse.h
new file mode 100644
index 000000000..399a694bc
--- /dev/null
+++ b/mesalib/src/mesa/x86/rtasm/x86sse.h
@@ -0,0 +1,256 @@
+

+#ifndef _X86SSE_H_

+#define _X86SSE_H_

+

+#if defined(__i386__) || defined(__386__)

+

+/* It is up to the caller to ensure that instructions issued are

+ * suitable for the host cpu.  There are no checks made in this module

+ * for mmx/sse/sse2 support on the cpu.

+ */

+struct x86_reg {

+   unsigned file:3;

+   unsigned idx:3;

+   unsigned mod:2;		/* mod_REG if this is just a register */

+   int      disp:24;		/* only +/- 23bits of offset - should be enough... */

+};

+

+struct x86_function {

+   unsigned size;

+   unsigned char *store;

+   unsigned char *csr;

+   unsigned stack_offset;

+   int need_emms;

+   const char *fn;

+};

+

+enum x86_reg_file {

+   file_REG32,

+   file_MMX,

+   file_XMM,

+   file_x87

+};

+

+/* Values for mod field of modr/m byte

+ */

+enum x86_reg_mod {

+   mod_INDIRECT,

+   mod_DISP8,

+   mod_DISP32,

+   mod_REG

+};

+

+enum x86_reg_name {

+   reg_AX,

+   reg_CX,

+   reg_DX,

+   reg_BX,

+   reg_SP,

+   reg_BP,

+   reg_SI,

+   reg_DI

+};

+

+

+enum x86_cc {

+   cc_O,			/* overflow */

+   cc_NO,			/* not overflow */

+   cc_NAE,			/* not above or equal / carry */

+   cc_AE,			/* above or equal / not carry */

+   cc_E,			/* equal / zero */

+   cc_NE			/* not equal / not zero */

+};

+

+enum sse_cc {

+   cc_Equal,

+   cc_LessThan,

+   cc_LessThanEqual,

+   cc_Unordered,

+   cc_NotEqual,

+   cc_NotLessThan,

+   cc_NotLessThanEqual,

+   cc_Ordered

+};

+

+#define cc_Z  cc_E

+#define cc_NZ cc_NE

+

+/* Begin/end/retreive function creation:

+ */

+

+

+void x86_init_func( struct x86_function *p );

+int x86_init_func_size( struct x86_function *p, unsigned code_size );

+void x86_release_func( struct x86_function *p );

+void (*x86_get_func( struct x86_function *p ))( void );

+

+

+

+/* Create and manipulate registers and regmem values:

+ */

+struct x86_reg x86_make_reg( enum x86_reg_file file,

+			     enum x86_reg_name idx );

+

+struct x86_reg x86_make_disp( struct x86_reg reg,

+			      int disp );

+

+struct x86_reg x86_deref( struct x86_reg reg );

+

+struct x86_reg x86_get_base_reg( struct x86_reg reg );

+

+

+/* Labels, jumps and fixup:

+ */

+unsigned char *x86_get_label( struct x86_function *p );

+

+void x86_jcc( struct x86_function *p,

+	      enum x86_cc cc,

+	      unsigned char *label );

+

+unsigned char *x86_jcc_forward( struct x86_function *p,

+			  enum x86_cc cc );

+

+unsigned char *x86_jmp_forward( struct x86_function *p);

+

+unsigned char *x86_call_forward( struct x86_function *p);

+

+void x86_fixup_fwd_jump( struct x86_function *p,

+			 unsigned char *fixup );

+

+void x86_jmp( struct x86_function *p, unsigned char *label );

+

+/* void x86_call( struct x86_function *p, void (*label)() ); */

+void x86_call( struct x86_function *p, struct x86_reg reg);

+

+/* michal:

+ * Temporary. As I need immediate operands, and dont want to mess with the codegen,

+ * I load the immediate into general purpose register and use it.

+ */

+void x86_mov_reg_imm( struct x86_function *p, struct x86_reg dst, int imm );

+

+

+/* Macro for sse_shufps() and sse2_pshufd():

+ */

+#define SHUF(_x,_y,_z,_w)       (((_x)<<0) | ((_y)<<2) | ((_z)<<4) | ((_w)<<6))

+#define SHUF_NOOP               RSW(0,1,2,3)

+#define GET_SHUF(swz, idx)      (((swz) >> ((idx)*2)) & 0x3)

+

+void mmx_emms( struct x86_function *p );

+void mmx_movd( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void mmx_movq( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void mmx_packssdw( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void mmx_packuswb( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+

+void sse2_cvtps2dq( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_cvttps2dq( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_movd( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_packssdw( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_packsswb( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_packuswb( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_pshufd( struct x86_function *p, struct x86_reg dest, struct x86_reg arg0,

+                  unsigned char shuf );

+void sse2_rcpps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse2_rcpss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+

+void sse_addps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_addss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_cvtps2pi( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_divss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_andnps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_andps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_cmpps( struct x86_function *p, struct x86_reg dst, struct x86_reg src,

+                unsigned char cc );

+void sse_maxps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_maxss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_minps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movaps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movhlps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movhps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movlhps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movlps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_movups( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_mulps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_mulss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_orps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_xorps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_subps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_rsqrtps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_rsqrtss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void sse_shufps( struct x86_function *p, struct x86_reg dest, struct x86_reg arg0,

+                 unsigned char shuf );

+void sse_pmovmskb( struct x86_function *p, struct x86_reg dest, struct x86_reg src );

+

+void x86_add( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_and( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_cmp( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_dec( struct x86_function *p, struct x86_reg reg );

+void x86_inc( struct x86_function *p, struct x86_reg reg );

+void x86_lea( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_mov( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_mul( struct x86_function *p, struct x86_reg src );

+void x86_or( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_pop( struct x86_function *p, struct x86_reg reg );

+void x86_push( struct x86_function *p, struct x86_reg reg );

+void x86_ret( struct x86_function *p );

+void x86_sub( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_test( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_xor( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_sahf( struct x86_function *p );

+

+void x87_f2xm1( struct x86_function *p );

+void x87_fabs( struct x86_function *p );

+void x87_fadd( struct x86_function *p, struct x86_reg dst, struct x86_reg arg );

+void x87_faddp( struct x86_function *p, struct x86_reg dst );

+void x87_fchs( struct x86_function *p );

+void x87_fclex( struct x86_function *p );

+void x87_fcom( struct x86_function *p, struct x86_reg dst );

+void x87_fcomp( struct x86_function *p, struct x86_reg dst );

+void x87_fcos( struct x86_function *p );

+void x87_fdiv( struct x86_function *p, struct x86_reg dst, struct x86_reg arg );

+void x87_fdivp( struct x86_function *p, struct x86_reg dst );

+void x87_fdivr( struct x86_function *p, struct x86_reg dst, struct x86_reg arg );

+void x87_fdivrp( struct x86_function *p, struct x86_reg dst );

+void x87_fild( struct x86_function *p, struct x86_reg arg );

+void x87_fist( struct x86_function *p, struct x86_reg dst );

+void x87_fistp( struct x86_function *p, struct x86_reg dst );

+void x87_fld( struct x86_function *p, struct x86_reg arg );

+void x87_fld1( struct x86_function *p );

+void x87_fldcw( struct x86_function *p, struct x86_reg arg );

+void x87_fldl2e( struct x86_function *p );

+void x87_fldln2( struct x86_function *p );

+void x87_fldz( struct x86_function *p );

+void x87_fmul( struct x86_function *p, struct x86_reg dst, struct x86_reg arg );

+void x87_fmulp( struct x86_function *p, struct x86_reg dst );

+void x87_fnclex( struct x86_function *p );

+void x87_fprndint( struct x86_function *p );

+void x87_fscale( struct x86_function *p );

+void x87_fsin( struct x86_function *p );

+void x87_fsincos( struct x86_function *p );

+void x87_fsqrt( struct x86_function *p );

+void x87_fst( struct x86_function *p, struct x86_reg dst );

+void x87_fstp( struct x86_function *p, struct x86_reg dst );

+void x87_fsub( struct x86_function *p, struct x86_reg dst, struct x86_reg arg );

+void x87_fsubp( struct x86_function *p, struct x86_reg dst );

+void x87_fsubr( struct x86_function *p, struct x86_reg dst, struct x86_reg arg );

+void x87_fsubrp( struct x86_function *p, struct x86_reg dst );

+void x87_fxch( struct x86_function *p, struct x86_reg dst );

+void x87_fxtract( struct x86_function *p );

+void x87_fyl2x( struct x86_function *p );

+void x87_fyl2xp1( struct x86_function *p );

+void x87_fwait( struct x86_function *p );

+void x87_fnstsw( struct x86_function *p, struct x86_reg dst );

+void x87_fucompp( struct x86_function *p );

+void x87_fucomp( struct x86_function *p, struct x86_reg arg );

+void x87_fucom( struct x86_function *p, struct x86_reg arg );

+

+

+

+/* Retreive a reference to one of the function arguments, taking into

+ * account any push/pop activity.  Note - doesn't track explict

+ * manipulation of ESP by other instructions.

+ */

+struct x86_reg x86_fn_arg( struct x86_function *p, unsigned arg );

+

+#endif

+#endif

diff --git a/mesalib/src/mesa/x86/sse.c b/mesalib/src/mesa/x86/sse.c
new file mode 100644
index 000000000..b249811c7
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse.c
@@ -0,0 +1,123 @@
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.0

+ *

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

+ */

+

+/*

+ * PentiumIII-SIMD (SSE) optimizations contributed by

+ * Andre Werthmann <wertmann@cs.uni-potsdam.de>

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "math/m_xform.h"

+#include "tnl/t_context.h"

+

+#include "sse.h"

+#include "x86_xform.h"

+

+#ifdef DEBUG_MATH

+#include "math/m_debug.h"

+#endif

+

+

+#ifdef USE_SSE_ASM

+DECLARE_XFORM_GROUP( sse, 2 )

+DECLARE_XFORM_GROUP( sse, 3 )

+

+#if 1

+/* Some functions are not written in SSE-assembly, because the fpu ones are faster */

+extern void _ASMAPI _mesa_sse_transform_normals_no_rot( NORM_ARGS );

+extern void _ASMAPI _mesa_sse_transform_rescale_normals( NORM_ARGS );

+extern void _ASMAPI _mesa_sse_transform_rescale_normals_no_rot( NORM_ARGS );

+

+extern void _ASMAPI _mesa_sse_transform_points4_general( XFORM_ARGS );

+extern void _ASMAPI _mesa_sse_transform_points4_3d( XFORM_ARGS );

+/* XXX this function segfaults, see below */

+extern void _ASMAPI _mesa_sse_transform_points4_identity( XFORM_ARGS );

+/* XXX this one works, see below */

+extern void _ASMAPI _mesa_x86_transform_points4_identity( XFORM_ARGS );

+#else

+DECLARE_NORM_GROUP( sse )

+#endif

+

+

+extern void _ASMAPI

+_mesa_v16_sse_general_xform( GLfloat *first_vert,

+			     const GLfloat *m,

+			     const GLfloat *src,

+			     GLuint src_stride,

+			     GLuint count );

+

+extern void _ASMAPI

+_mesa_sse_project_vertices( GLfloat *first,

+			    GLfloat *last,

+			    const GLfloat *m,

+			    GLuint stride );

+

+extern void _ASMAPI

+_mesa_sse_project_clipped_vertices( GLfloat *first,

+				    GLfloat *last,

+				    const GLfloat *m,

+				    GLuint stride,

+				    const GLubyte *clipmask );

+#endif

+

+

+void _mesa_init_sse_transform_asm( void )

+{

+#ifdef USE_SSE_ASM

+   ASSIGN_XFORM_GROUP( sse, 2 );

+   ASSIGN_XFORM_GROUP( sse, 3 );

+

+#if 1

+   /* TODO: Finish these off.

+    */

+   _mesa_transform_tab[4][MATRIX_GENERAL] =

+      _mesa_sse_transform_points4_general;

+   _mesa_transform_tab[4][MATRIX_3D] =

+      _mesa_sse_transform_points4_3d;

+   /* XXX NOTE: _mesa_sse_transform_points4_identity segfaults with the

+      conformance tests, so use the x86 version.

+   */

+   _mesa_transform_tab[4][MATRIX_IDENTITY] =

+      _mesa_x86_transform_points4_identity;/*_mesa_sse_transform_points4_identity;*/

+

+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =

+      _mesa_sse_transform_normals_no_rot;

+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =

+      _mesa_sse_transform_rescale_normals;

+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =

+      _mesa_sse_transform_rescale_normals_no_rot;

+#else

+   ASSIGN_XFORM_GROUP( sse, 4 );

+

+   ASSIGN_NORM_GROUP( sse );

+#endif

+

+#ifdef DEBUG_MATH

+   _math_test_all_transform_functions( "SSE" );

+   _math_test_all_normal_transform_functions( "SSE" );

+#endif

+#endif

+}

+

diff --git a/mesalib/src/mesa/x86/sse.h b/mesalib/src/mesa/x86/sse.h
new file mode 100644
index 000000000..d240bf38b
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse.h
@@ -0,0 +1,36 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * PentiumIII-SIMD (SSE) optimizations contributed by

+ * Andre Werthmann <wertmann@cs.uni-potsdam.de>

+ */

+

+#ifndef __SSE_H__

+#define __SSE_H__

+

+void _mesa_init_sse_transform_asm( void );

+

+#endif

diff --git a/mesalib/src/mesa/x86/sse_normal.S b/mesalib/src/mesa/x86/sse_normal.S
new file mode 100644
index 000000000..b6d5ef965
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse_normal.S
@@ -0,0 +1,261 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/** TODO:

+  * - insert PREFETCH instructions to avoid cache-misses !

+  * - some more optimizations are possible...

+  * - for 40-50% more performance in the SSE-functions, the

+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !

+  */

+

+#ifdef USE_SSE_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "norm_args.h"

+

+   SEG_TEXT

+

+#define M(i)    REGOFF(i * 4, EDX)

+#define S(i)	REGOFF(i * 4, ESI)

+#define D(i)	REGOFF(i * 4, EDI)

+#define STRIDE  REGOFF(12, ESI)

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_sse_transform_rescale_normals_no_rot)

+HIDDEN(_mesa_sse_transform_rescale_normals_no_rot)

+GLNAME(_mesa_sse_transform_rescale_normals_no_rot):

+

+#define FRAME_OFFSET 8

+	PUSH_L  ( ESI )

+	PUSH_L  ( EDI )

+

+	MOV_L	( ARG_IN, ESI )				/* ptr to source GLvector3f */

+	MOV_L	( ARG_DEST, EDI )			/* ptr to dest GLvector3f */

+

+	MOV_L	( ARG_MAT, EDX )			/* ptr to matrix */

+	MOV_L	( REGOFF(MATRIX_INV, EDX), EDX)		/* matrix->inv */

+

+	MOV_L	( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L	( ECX, ECX )

+	JZ( LLBL(K_G3TRNNRR_finish) )			/* count was zero; go to finish */

+

+	MOV_L	( STRIDE, EAX )				/* stride */

+	MOV_L	( ECX, REGOFF(V4F_COUNT, EDI) )		/* set dest-count */

+

+	IMUL_L( CONST(16), ECX )			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI )		/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )		/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVSS	( M(0), XMM1 )				/* m0 */

+	MOVSS	( M(5), XMM2 )				/* m5 */

+	UNPCKLPS( XMM2, XMM1 )				/* m5 | m0 */

+	MOVSS	( ARG_SCALE, XMM0 )			/* scale */

+	SHUFPS	( CONST(0x0), XMM0, XMM0 )		/* scale | scale */

+	MULPS	( XMM0, XMM1 )				/* m5*scale | m0*scale */

+	MULSS	( M(10), XMM0 )				/* m10*scale */

+

+ALIGNTEXT32

+LLBL(K_G3TRNNRR_top):

+	MOVLPS	( S(0), XMM2 )				/* uy | ux */

+	MULPS	( XMM1, XMM2 )				/* uy*m5*scale | ux*m0*scale */

+	MOVLPS	( XMM2, D(0) )				/* ->D(1) | D(0) */

+

+	MOVSS	( S(2), XMM2 )				/* uz */

+	MULSS	( XMM0, XMM2 )				/* uz*m10*scale */

+	MOVSS	( XMM2, D(2) )				/* ->D(2) */

+

+LLBL(K_G3TRNNRR_skip):

+	ADD_L	( CONST(16), EDI )

+	ADD_L	( EAX, ESI )

+	CMP_L	( ECX, EDI )

+	JNE	( LLBL(K_G3TRNNRR_top) )

+

+LLBL(K_G3TRNNRR_finish):

+	POP_L	( EDI )

+	POP_L	( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_sse_transform_rescale_normals)

+HIDDEN(_mesa_sse_transform_rescale_normals)

+GLNAME(_mesa_sse_transform_rescale_normals):

+

+#define FRAME_OFFSET 8

+	PUSH_L  ( ESI )

+	PUSH_L  ( EDI )

+

+	MOV_L	( ARG_IN, ESI )				/* ptr to source GLvector3f */

+	MOV_L	( ARG_DEST, EDI )			/* ptr to dest GLvector3f */

+

+	MOV_L	( ARG_MAT, EDX )			/* ptr to matrix */

+	MOV_L	( REGOFF(MATRIX_INV, EDX), EDX)		/* matrix->inv */

+

+	MOV_L	( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L	( ECX, ECX )

+	JZ( LLBL(K_G3TRNR_finish) )			/* count was zero; go to finish */

+

+	MOV_L	( STRIDE, EAX )				/* stride */

+	MOV_L	( ECX, REGOFF(V4F_COUNT, EDI) )		/* set dest-count */

+

+	IMUL_L( CONST(16), ECX )			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI )		/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )		/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVSS	( M(0), XMM0 )				/* m0 */

+	MOVSS	( M(4), XMM1 )				/* m4 */

+	UNPCKLPS( XMM1, XMM0 )				/* m4 | m0 */

+

+	MOVSS	( ARG_SCALE, XMM4 )			/* scale */

+	SHUFPS	( CONST(0x0), XMM4, XMM4 )		/* scale | scale */

+

+	MULPS	( XMM4, XMM0 )				/* m4*scale | m0*scale */

+	MOVSS	( M(1), XMM1 )				/* m1 */

+	MOVSS	( M(5), XMM2 )				/* m5 */

+	UNPCKLPS( XMM2, XMM1 )				/* m5 | m1 */

+	MULPS	( XMM4, XMM1 )				/* m5*scale | m1*scale */

+	MOVSS	( M(2), XMM2 )				/* m2 */

+	MOVSS	( M(6), XMM3 )				/* m6 */

+	UNPCKLPS( XMM3, XMM2 )				/* m6 | m2 */

+	MULPS	( XMM4, XMM2 )				/* m6*scale | m2*scale */

+

+	MOVSS	( M(8), XMM6 )				/* m8 */

+	MULSS	( ARG_SCALE, XMM6 )			/* m8*scale */

+	MOVSS	( M(9), XMM7 )				/* m9 */

+	MULSS	( ARG_SCALE, XMM7 )			/* m9*scale */

+

+ALIGNTEXT32

+LLBL(K_G3TRNR_top):

+	MOVSS	( S(0), XMM3 )				/* ux */

+	SHUFPS	( CONST(0x0), XMM3, XMM3 )		/* ux | ux */

+	MULPS	( XMM0, XMM3 )				/* ux*m4 | ux*m0 */

+	MOVSS	( S(1), XMM4 )				/* uy */

+	SHUFPS	( CONST(0x0), XMM4, XMM4 )		/* uy | uy */

+	MULPS	( XMM1, XMM4 )				/* uy*m5 | uy*m1 */

+	MOVSS	( S(2), XMM5 )				/* uz */

+	SHUFPS	( CONST(0x0), XMM5, XMM5 )		/* uz | uz */

+	MULPS	( XMM2, XMM5 )				/* uz*m6 | uz*m2 */

+

+	ADDPS	( XMM4, XMM3 )

+	ADDPS	( XMM5, XMM3 )

+	MOVLPS	( XMM3, D(0) )

+

+	MOVSS	( M(10), XMM3 )				/* m10 */

+	MULSS	( ARG_SCALE, XMM3 )			/* m10*scale */

+	MULSS	( S(2), XMM3 )				/* m10*scale*uz */

+	MOVSS	( S(1), XMM4 )				/* uy */

+	MULSS	( XMM7, XMM4 )				/* uy*m9*scale */

+	MOVSS	( S(0), XMM5 )				/* ux */

+	MULSS	( XMM6, XMM5 )				/* ux*m8*scale */

+

+	ADDSS	( XMM4, XMM3 )

+	ADDSS	( XMM5, XMM3 )

+	MOVSS	( XMM3, D(2) )

+

+LLBL(K_G3TRNR_skip):

+	ADD_L	( CONST(16), EDI )

+	ADD_L	( EAX, ESI )

+	CMP_L	( ECX, EDI )

+	JNE	( LLBL(K_G3TRNR_top) )

+

+LLBL(K_G3TRNR_finish):

+	POP_L	( EDI )

+	POP_L	( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_sse_transform_normals_no_rot)

+HIDDEN(_mesa_sse_transform_normals_no_rot)

+GLNAME(_mesa_sse_transform_normals_no_rot):

+

+#define FRAME_OFFSET 8

+	PUSH_L  ( ESI )

+	PUSH_L  ( EDI )

+

+	MOV_L	( ARG_IN, ESI )				/* ptr to source GLvector3f */

+	MOV_L	( ARG_DEST, EDI )			/* ptr to dest GLvector3f */

+

+	MOV_L	( ARG_MAT, EDX )			/* ptr to matrix */

+	MOV_L	( REGOFF(MATRIX_INV, EDX), EDX)		/* matrix->inv */

+

+	MOV_L	( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L	( ECX, ECX )

+	JZ( LLBL(K_G3TNNRR_finish) )			/* count was zero; go to finish */

+

+	MOV_L	( STRIDE, EAX )				/* stride */

+	MOV_L	( ECX, REGOFF(V4F_COUNT, EDI) )		/* set dest-count */

+

+	IMUL_L( CONST(16), ECX )			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI )		/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )		/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVSS( M(0), XMM0 )				/* m0 */

+	MOVSS( M(5), XMM1 )				/* m5 */

+	UNPCKLPS( XMM1, XMM0 )				/* m5 | m0 */

+	MOVSS( M(10), XMM1 )				/* m10 */

+

+ALIGNTEXT32

+LLBL(K_G3TNNRR_top):

+	MOVLPS( S(0), XMM2 )				/* uy | ux */

+	MULPS( XMM0, XMM2 )				/* uy*m5 | ux*m0 */

+	MOVLPS( XMM2, D(0) )

+

+	MOVSS( S(2), XMM2 )				/* uz */

+	MULSS( XMM1, XMM2 )				/* uz*m10 */

+	MOVSS( XMM2, D(2) )

+

+LLBL(K_G3TNNRR_skip):

+	ADD_L	( CONST(16), EDI )

+	ADD_L	( EAX, ESI )

+	CMP_L	( ECX, EDI )

+	JNE	( LLBL(K_G3TNNRR_top) )

+

+LLBL(K_G3TNNRR_finish):

+	POP_L	( EDI )

+	POP_L	( ESI )

+	RET

+#undef FRAME_OFFSET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/sse_xform1.S b/mesalib/src/mesa/x86/sse_xform1.S
new file mode 100644
index 000000000..45a6dd7ec
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse_xform1.S
@@ -0,0 +1,446 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/** TODO:

+  * - insert PREFETCH instructions to avoid cache-misses !

+  * - some more optimizations are possible...

+  * - for 40-50% more performance in the SSE-functions, the

+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !

+  */

+

+#ifdef USE_SSE_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+   SEG_TEXT

+

+#define S(i) 	REGOFF(i * 4, ESI)

+#define D(i) 	REGOFF(i * 4, EDI)

+#define M(i) 	REGOFF(i * 4, EDX)

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_general)

+HIDDEN( _mesa_sse_transform_points1_general )

+GLNAME( _mesa_sse_transform_points1_general ):

+

+#define FRAME_OFFSET 8

+    PUSH_L    ( ESI )

+    PUSH_L    ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    CMP_L( CONST(0), ECX )			/* count == 0 ? */

+    JE( LLBL(K_GTP1GR_finish) )			/* yes -> nothing to do. */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+

+ALIGNTEXT32

+    MOVAPS( M(0), XMM0 )			/* m3  | m2  | m1  | m0  */

+    MOVAPS( M(12), XMM1 )			/* m15 | m14 | m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP1GR_top):

+    MOVSS( S(0), XMM2 )				/* ox */

+    SHUFPS( CONST(0x0), XMM2, XMM2 )		/* ox | ox | ox | ox */

+    MULPS( XMM0, XMM2 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */

+    ADDPS( XMM1, XMM2 )				/* + | + | + | + */

+    MOVUPS( XMM2, D(0) )

+

+LLBL(K_GTP1GR_skip):

+    ADD_L     ( CONST(16), EDI )

+    ADD_L     ( EAX, ESI )

+    CMP_L     ( ECX, EDI )

+    JNE       ( LLBL(K_GTP1GR_top) )

+

+LLBL(K_GTP1GR_finish):

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_identity)

+HIDDEN(_mesa_sse_transform_points1_identity)

+GLNAME( _mesa_sse_transform_points1_identity ):

+

+#define FRAME_OFFSET 8

+    PUSH_L    ( ESI )

+    PUSH_L    ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP1IR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_1), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(1), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+    CMP_L( ESI, EDI )

+    JE( LLBL(K_GTP1IR_finish) )

+

+

+ALIGNTEXT32

+LLBL(K_GTP1IR_top):

+    MOV_L( S(0), EDX )

+    MOV_L( EDX, D(0) )

+

+LLBL(K_GTP1IR_skip):

+    ADD_L     ( CONST(16), EDI )

+    ADD_L     ( EAX, ESI )

+    CMP_L     ( ECX, EDI )

+    JNE       ( LLBL(K_GTP1IR_top) )

+

+LLBL(K_GTP1IR_finish):

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_3d_no_rot)

+HIDDEN(_mesa_sse_transform_points1_3d_no_rot)

+GLNAME(_mesa_sse_transform_points1_3d_no_rot):

+

+#define FRAME_OFFSET 8

+    PUSH_L( ESI )

+    PUSH_L( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI )	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP13DNRR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+

+ALIGNTEXT32

+    MOVSS( M(0), XMM0 )				/* m0 */

+    MOVSS( M(12), XMM1 )			/* m12 */

+    MOVSS( M(13), XMM2 )			/* m13 */

+    MOVSS( M(14), XMM3 )			/* m14 */

+

+ALIGNTEXT32

+LLBL(K_GTP13DNRR_top):

+    MOVSS( S(0), XMM4 )				/* ox */

+    MULSS( XMM0, XMM4 )				/* ox*m0 */

+    ADDSS( XMM1, XMM4 )				/* ox*m0+m12 */

+    MOVSS( XMM4, D(0) )

+

+    MOVSS( XMM2, D(1) )

+    MOVSS( XMM3, D(2) )

+

+LLBL(K_GTP13DNRR_skip):

+    ADD_L    ( CONST(16), EDI )

+    ADD_L    ( EAX, ESI )

+    CMP_L    ( ECX, EDI )

+    JNE      ( LLBL(K_GTP13DNRR_top) )

+

+LLBL(K_GTP13DNRR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_perspective)

+HIDDEN(_mesa_sse_transform_points1_perspective)

+GLNAME(_mesa_sse_transform_points1_perspective):

+

+#define FRAME_OFFSET 8

+    PUSH_L   ( ESI )

+    PUSH_L   ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP13PR_finish) )		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+

+ALIGNTEXT32

+    XORPS( XMM0, XMM0 )				/* 0 | 0 | 0 | 0 */

+    MOVSS( M(0), XMM1 )				/* m0 */

+    MOVSS( M(14), XMM2 )			/* m14 */

+

+ALIGNTEXT32

+LLBL(K_GTP13PR_top):

+    MOVSS( S(0), XMM3 )				/* ox */

+    MULSS( XMM1, XMM3 )				/* ox*m0 */

+    MOVSS( XMM3, D(0) )				/* ox*m0->D(0) */

+    MOVSS( XMM2, D(2) )				/* m14->D(2) */

+

+    MOVSS( XMM0, D(1) )

+    MOVSS( XMM0, D(3) )

+

+LLBL(K_GTP13PR_skip):

+    ADD_L( CONST(16), EDI )

+    ADD_L( EAX, ESI )

+    CMP_L( ECX, EDI )

+    JNE( LLBL(K_GTP13PR_top) )

+

+LLBL(K_GTP13PR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_2d)

+HIDDEN(_mesa_sse_transform_points1_2d)

+GLNAME(_mesa_sse_transform_points1_2d):

+

+#define FRAME_OFFSET 8

+    PUSH_L( ESI )

+    PUSH_L( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP13P2DR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+    MOVLPS( M(0), XMM0 )			/* m1  | m0  */

+    MOVLPS( M(12), XMM1 )			/* m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP13P2DR_top):

+    MOVSS( S(0), XMM2 )				/* ox */

+    SHUFPS( CONST(0x0), XMM2, XMM2 )		/* ox | ox | ox | ox */

+    MULPS( XMM0, XMM2 )				/* - | - | ox*m1 | ox*m0 */

+    ADDPS( XMM1, XMM2 )				/* - | - | ox*m1+m13 | ox*m0+m12 */

+    MOVLPS( XMM2, D(0) )

+

+LLBL(K_GTP13P2DR_skip):

+    ADD_L    ( CONST(16), EDI )

+    ADD_L    ( EAX, ESI )

+    CMP_L    ( ECX, EDI )

+    JNE      ( LLBL(K_GTP13P2DR_top) )

+

+LLBL(K_GTP13P2DR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_2d_no_rot)

+HIDDEN(_mesa_sse_transform_points1_2d_no_rot)

+GLNAME(_mesa_sse_transform_points1_2d_no_rot):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP13P2DNRR_finish) ) 	/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 			/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVSS( M(0), XMM0 )			/* m0 */

+	MOVSS( M(12), XMM1 )			/* m12 */

+	MOVSS( M(13), XMM2 )			/* m13 */

+

+ALIGNTEXT32

+LLBL(K_GTP13P2DNRR_top):

+	MOVSS( S(0), XMM3 )			/* ox */

+	MULSS( XMM0, XMM3 )			/* ox*m0 */

+	ADDSS( XMM1, XMM3 )			/* ox*m0+m12 */

+	MOVSS( XMM3, D(0) )

+	MOVSS( XMM2, D(1) )

+

+LLBL(K_GTP13P2DNRR_skip):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP13P2DNRR_top) )

+

+LLBL(K_GTP13P2DNRR_finish):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points1_3d)

+HIDDEN(_mesa_sse_transform_points1_3d)

+GLNAME(_mesa_sse_transform_points1_3d):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP13P3DR_finish) ) 	/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 			/* count += dest ptr */

+

+

+ALIGNTEXT32

+	MOVAPS( M(0), XMM0 )			/* m3  | m2  | m1  |  m0 */

+	MOVAPS( M(12), XMM1 )			/* m15 | m14 | m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP13P3DR_top):

+	MOVSS( S(0), XMM2 )			/* ox */

+	SHUFPS( CONST(0x0), XMM2, XMM2 )	/* ox | ox | ox | ox */

+	MULPS( XMM0, XMM2 )			/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */

+	ADDPS( XMM1, XMM2 )			/* +m15  | +m14  | +m13  | +m12  */

+	MOVLPS( XMM2, D(0) )			/*   -   |   -   | ->D(1)| ->D(0)*/

+	UNPCKHPS( XMM2, XMM2 )			/* ox*m3+m15 | ox*m3+m15 | ox*m2+m14 | ox*m2+m14 */

+	MOVSS( XMM2, D(2) )

+

+LLBL(K_GTP13P3DR_skip):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP13P3DR_top) )

+

+LLBL(K_GTP13P3DR_finish):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/sse_xform2.S b/mesalib/src/mesa/x86/sse_xform2.S
new file mode 100644
index 000000000..7fb52e2e7
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse_xform2.S
@@ -0,0 +1,466 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/** TODO:

+  * - insert PREFETCH instructions to avoid cache-misses !

+  * - some more optimizations are possible...

+  * - for 40-50% more performance in the SSE-functions, the

+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !

+  */

+

+#ifdef USE_SSE_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+   SEG_TEXT

+

+#define S(i) 	REGOFF(i * 4, ESI)

+#define D(i) 	REGOFF(i * 4, EDI)

+#define M(i) 	REGOFF(i * 4, EDX)

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_general)

+HIDDEN (_mesa_sse_transform_points2_general)

+GLNAME( _mesa_sse_transform_points2_general ):

+

+#define FRAME_OFFSET 8

+    PUSH_L    ( ESI )

+    PUSH_L    ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX )

+    JZ( LLBL(K_GTP2GR_finish) )			/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+    MOVAPS( M(0), XMM0 )			/* m3  | m2  | m1  | m0 */

+    MOVAPS( M(4), XMM1 )			/* m7  | m6  | m5  | m4 */

+    MOVAPS( M(12), XMM2 )			/* m15 | m14 | m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP2GR_top):

+    MOVSS( S(0), XMM3 )				/* ox */

+    SHUFPS( CONST(0x0), XMM3, XMM3 )		/* ox | ox | ox | ox */

+    MULPS( XMM0, XMM3 )				/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */

+    MOVSS( S(1), XMM4 )				/* oy */

+    SHUFPS( CONST(0x0), XMM4, XMM4 )		/* oy | oy | oy | oy */

+    MULPS( XMM1, XMM4 )				/* oy*m7 | oy*m6 | oy*m5 | oy*m4 */

+

+    ADDPS( XMM4, XMM3 )

+    ADDPS( XMM2, XMM3 )

+    MOVAPS( XMM3, D(0) )

+

+LLBL(K_GTP2GR_skip):

+    ADD_L     ( CONST(16), EDI )

+    ADD_L     ( EAX, ESI )

+    CMP_L     ( ECX, EDI )

+    JNE       ( LLBL(K_GTP2GR_top) )

+

+LLBL(K_GTP2GR_finish):

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_identity)

+HIDDEN(_mesa_sse_transform_points2_identity)

+GLNAME( _mesa_sse_transform_points2_identity ):

+

+#define FRAME_OFFSET 8

+    PUSH_L    ( ESI )

+    PUSH_L    ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) /* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP2IR_finish) )			/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+    CMP_L( ESI, EDI )

+    JE( LLBL(K_GTP2IR_finish) )

+

+

+ALIGNTEXT32

+LLBL(K_GTP2IR_top):

+    MOV_L     ( S(0), EDX )

+    MOV_L     ( EDX, D(0) )

+    MOV_L     ( S(1), EDX )

+    MOV_L     ( EDX, D(1) )

+

+LLBL(K_GTP2IR_skip):

+    ADD_L     ( CONST(16), EDI )

+    ADD_L     ( EAX, ESI )

+    CMP_L     ( ECX, EDI )

+    JNE       ( LLBL(K_GTP2IR_top) )

+

+LLBL(K_GTP2IR_finish):

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_3d_no_rot)

+HIDDEN(_mesa_sse_transform_points2_3d_no_rot)

+GLNAME(_mesa_sse_transform_points2_3d_no_rot):

+

+#define FRAME_OFFSET 8

+    PUSH_L( ESI )

+    PUSH_L( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP23DNRR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+    XORPS( XMM0, XMM0 )                         /* clean the working register */

+

+ALIGNTEXT32

+    MOVSS    ( M(0), XMM1 )			/* - | - |  -  | m0  */

+    MOVSS    ( M(5), XMM2 )			/* - | - |  -  | m5  */

+    UNPCKLPS ( XMM2, XMM1 )			/* - | - | m5  | m0  */

+    MOVLPS   ( M(12), XMM2 )			/* - | - | m13 | m12 */

+    MOVSS    ( M(14), XMM3 )			/* - | - |  -  | m14 */

+

+ALIGNTEXT32

+LLBL(K_GTP23DNRR_top):

+    MOVLPS   ( S(0), XMM0 )			/* - | - |  oy   | ox */

+    MULPS    ( XMM1, XMM0 )			/* - | - | oy*m5 | ox*m0 */

+    ADDPS    ( XMM2, XMM0 )			/* - | - | +m13  | +m12 */

+    MOVLPS   ( XMM0, D(0) )			/* -> D(1) | -> D(0) */

+

+    MOVSS    ( XMM3, D(2) )			/* -> D(2) */

+

+LLBL(K_GTP23DNRR_skip):

+    ADD_L    ( CONST(16), EDI )

+    ADD_L    ( EAX, ESI )

+    CMP_L    ( ECX, EDI )

+    JNE      ( LLBL(K_GTP23DNRR_top) )

+

+LLBL(K_GTP23DNRR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_perspective)

+HIDDEN(_mesa_sse_transform_points2_perspective)

+GLNAME(_mesa_sse_transform_points2_perspective):

+

+#define FRAME_OFFSET 8

+    PUSH_L   ( ESI )

+    PUSH_L   ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI )	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP23PR_finish) )		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+    MOVSS    ( M(0), XMM1 )			/* -  | -  |  -  | m0  */

+    MOVSS    ( M(5), XMM2 )			/* -  | -  |  -  | m5  */

+    UNPCKLPS ( XMM2, XMM1 )			/* -  | -  | m5  | m0  */

+    MOVSS    ( M(14), XMM3 )			/* m14 */

+    XORPS    ( XMM0, XMM0 )			/* 0 | 0 | 0 | 0 */

+

+ALIGNTEXT32

+LLBL(K_GTP23PR_top):

+    MOVLPS( S(0), XMM4 )			/* oy | ox */

+    MULPS( XMM1, XMM4 )				/* oy*m5 | ox*m0 */

+    MOVLPS( XMM4, D(0) )			/* ->D(1) | ->D(0) */

+    MOVSS( XMM3, D(2) )				/* ->D(2) */

+    MOVSS( XMM0, D(3) )				/* ->D(3) */

+

+LLBL(K_GTP23PR_skip):

+    ADD_L( CONST(16), EDI )

+    ADD_L( EAX, ESI )

+    CMP_L( ECX, EDI )

+    JNE( LLBL(K_GTP23PR_top) )

+

+LLBL(K_GTP23PR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_2d)

+HIDDEN(_mesa_sse_transform_points2_2d)

+GLNAME(_mesa_sse_transform_points2_2d):

+

+#define FRAME_OFFSET 8

+    PUSH_L( ESI )

+    PUSH_L( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP23P2DR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+    MOVLPS( M(0), XMM0 )			/* m1  | m0 */

+    MOVLPS( M(4), XMM1 )			/* m5  | m4 */

+    MOVLPS( M(12), XMM2 )			/* m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP23P2DR_top):

+    MOVSS( S(0), XMM3 )				/* ox */

+    SHUFPS( CONST(0x0), XMM3, XMM3 )		/* ox | ox */

+    MULPS( XMM0, XMM3 )				/* ox*m1 | ox*m0 */

+

+    MOVSS( S(1), XMM4 )				/* oy */

+    SHUFPS( CONST(0x0), XMM4, XMM4 )		/* oy | oy */

+    MULPS( XMM1, XMM4 )				/* oy*m5 | oy*m4 */

+

+    ADDPS( XMM4, XMM3 )

+    ADDPS( XMM2, XMM3 )

+    MOVLPS( XMM3, D(0) )			/* ->D(1) | ->D(0) */

+

+LLBL(K_GTP23P2DR_skip):

+    ADD_L    ( CONST(16), EDI )

+    ADD_L    ( EAX, ESI )

+    CMP_L    ( ECX, EDI )

+    JNE      ( LLBL(K_GTP23P2DR_top) )

+

+LLBL(K_GTP23P2DR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_2d_no_rot)

+HIDDEN(_mesa_sse_transform_points2_2d_no_rot)

+GLNAME(_mesa_sse_transform_points2_2d_no_rot):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP23P2DNRR_finish) ) 	/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 			/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVSS    ( M(0), XMM1 )			/* m0 */

+	MOVSS    ( M(5), XMM2 )			/* m5 */

+	UNPCKLPS ( XMM2, XMM1 )			/* m5 | m0 */

+	MOVLPS   ( M(12), XMM2 )		/* m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP23P2DNRR_top):

+	MOVLPS( S(0), XMM0 )			/* oy | ox */

+	MULPS( XMM1, XMM0 )			/* oy*m5 | ox*m0 */

+	ADDPS( XMM2, XMM0 )			/* +m13 | +m12 */

+	MOVLPS( XMM0, D(0) )			/* ->D(1) | ->D(0) */

+

+LLBL(K_GTP23P2DNRR_skip):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP23P2DNRR_top) )

+

+LLBL(K_GTP23P2DNRR_finish):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points2_3d)

+HIDDEN(_mesa_sse_transform_points2_3d)

+GLNAME(_mesa_sse_transform_points2_3d):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP23P3DR_finish) ) 	/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 			/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVAPS( M(0), XMM0 )			/* m2  | m1  | m0 */

+	MOVAPS( M(4), XMM1 )			/* m6  | m5  | m4 */

+	MOVAPS( M(12), XMM2 )			/* m14 | m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP23P3DR_top):

+	MOVSS( S(0), XMM3 )			/* ox */

+	SHUFPS( CONST(0x0), XMM3, XMM3 )	/* ox | ox | ox */

+	MULPS( XMM0, XMM3 )			/* ox*m2 | ox*m1 | ox*m0 */

+

+	MOVSS( S(1), XMM4 )			/* oy */

+	SHUFPS( CONST(0x0), XMM4, XMM4 )	/* oy | oy | oy */

+	MULPS( XMM1, XMM4 )			/* oy*m6 | oy*m5 | oy*m4 */

+

+	ADDPS( XMM4, XMM3 )

+	ADDPS( XMM2, XMM3 )

+

+	MOVLPS( XMM3, D(0) )			/* ->D(1) | ->D(0) */

+	UNPCKHPS( XMM3, XMM3 )

+	MOVSS( XMM3, D(2) )			/* ->D(2) */

+

+LLBL(K_GTP23P3DR_skip):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP23P3DR_top) )

+

+LLBL(K_GTP23P3DR_finish):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/sse_xform3.S b/mesalib/src/mesa/x86/sse_xform3.S
new file mode 100644
index 000000000..4e39312bf
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse_xform3.S
@@ -0,0 +1,512 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/** TODO:

+  * - insert PREFETCH instructions to avoid cache-misses !

+  * - some more optimizations are possible...

+  * - for 40-50% more performance in the SSE-functions, the

+  *   data (trans-matrix, src_vert, dst_vert) needs to be 16byte aligned !

+  */

+

+#ifdef USE_SSE_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+   SEG_TEXT

+

+#define S(i) 	REGOFF(i * 4, ESI)

+#define D(i) 	REGOFF(i * 4, EDI)

+#define M(i) 	REGOFF(i * 4, EDX)

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_general)

+HIDDEN(_mesa_sse_transform_points3_general)

+GLNAME( _mesa_sse_transform_points3_general ):

+

+#define FRAME_OFFSET 8

+    PUSH_L    ( ESI )

+    PUSH_L    ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    CMP_L     ( CONST(0), ECX )			/* count == 0 ? */

+    JE        ( LLBL(K_GTPGR_finish) )		/* yes -> nothing to do. */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+

+ALIGNTEXT32

+    MOVAPS    ( REGOFF(0, EDX), XMM0 )	/* m0  | m1  | m2  | m3 */

+    MOVAPS    ( REGOFF(16, EDX), XMM1 )	/* m4  | m5  | m6  | m7 */

+    MOVAPS    ( REGOFF(32, EDX), XMM2 )	/* m8  | m9  | m10 | m11 */

+    MOVAPS    ( REGOFF(48, EDX), XMM3 )	/* m12 | m13 | m14 | m15 */

+

+

+ALIGNTEXT32

+LLBL(K_GTPGR_top):

+    MOVSS     ( REGOFF(0, ESI), XMM4 )		/*    |    |    | ox */

+    SHUFPS    ( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox | ox */

+    MOVSS     ( REGOFF(4, ESI), XMM5 )		/*    |    |    | oy */

+    SHUFPS    ( CONST(0x0), XMM5, XMM5 )	/* oy | oy | oy | oy */

+    MOVSS     ( REGOFF(8, ESI), XMM6 )		/*    |    |    | oz */

+    SHUFPS    ( CONST(0x0), XMM6, XMM6 )	/* oz | oz | oz | oz */

+

+    MULPS     ( XMM0, XMM4 )		/* m3*ox  | m2*ox  | m1*ox | m0*ox */

+    MULPS     ( XMM1, XMM5 )		/* m7*oy  | m6*oy  | m5*oy | m4*oy */

+    MULPS     ( XMM2, XMM6 )		/* m11*oz | m10*oz | m9*oz | m8*oz */

+

+    ADDPS     ( XMM5, XMM4 )

+    ADDPS     ( XMM6, XMM4 )

+    ADDPS     ( XMM3, XMM4 )

+

+    MOVAPS    ( XMM4, REGOFF(0, EDI) )

+

+LLBL(K_GTPGR_skip):

+    ADD_L     ( CONST(16), EDI )

+    ADD_L     ( EAX, ESI )

+    CMP_L     ( ECX, EDI )

+    JNE       ( LLBL(K_GTPGR_top) )

+

+LLBL(K_GTPGR_finish):

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_identity)

+HIDDEN(_mesa_sse_transform_points3_identity)

+GLNAME( _mesa_sse_transform_points3_identity ):

+

+#define FRAME_OFFSET 8

+    PUSH_L    ( ESI )

+    PUSH_L    ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTPIR_finish) ) 			/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+    CMP_L( ESI, EDI )

+    JE( LLBL(K_GTPIR_finish) )

+

+

+ALIGNTEXT32

+LLBL(K_GTPIR_top):

+    MOVLPS    ( S(0), XMM0 )

+    MOVLPS    ( XMM0, D(0) )

+    MOVSS     ( S(2), XMM0 )

+    MOVSS     ( XMM0, D(2) )

+

+LLBL(K_GTPIR_skip):

+    ADD_L     ( CONST(16), EDI )

+    ADD_L     ( EAX, ESI )

+    CMP_L     ( ECX, EDI )

+    JNE       ( LLBL(K_GTPIR_top) )

+

+LLBL(K_GTPIR_finish):

+    POP_L     ( EDI )

+    POP_L     ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_3d_no_rot)

+HIDDEN(_mesa_sse_transform_points3_3d_no_rot)

+GLNAME(_mesa_sse_transform_points3_3d_no_rot):

+

+#define FRAME_OFFSET 8

+    PUSH_L( ESI )

+    PUSH_L( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP3DNRR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+    XORPS( XMM0, XMM0 )                         /* clean the working register */

+

+ALIGNTEXT32

+    MOVSS    ( M(0), XMM1 )			/* - | - |  -  | m0  */

+    MOVSS    ( M(5), XMM2 )			/* - | - |  -  | m5  */

+    UNPCKLPS ( XMM2, XMM1 )			/* - | - | m5  | m0  */

+    MOVLPS   ( M(12), XMM2 )			/* - | - | m13 | m12 */

+    MOVSS    ( M(10), XMM3 )			/* - | - |  -  | m10 */

+    MOVSS    ( M(14), XMM4 )			/* - | - |  -  | m14 */

+

+ALIGNTEXT32

+LLBL(K_GTP3DNRR_top):

+

+    MOVLPS   ( S(0), XMM0 )			/* - | - |  s1   | s0 */

+    MULPS    ( XMM1, XMM0 )			/* - | - | s1*m5 | s0*m0 */

+    ADDPS    ( XMM2, XMM0 )			/* - | - | +m13  | +m12 */

+    MOVLPS   ( XMM0, D(0) )			/* -> D(1) | -> D(0) */

+

+    MOVSS    ( S(2), XMM0 )			/* sz */

+    MULSS    ( XMM3, XMM0 )			/* sz*m10 */

+    ADDSS    ( XMM4, XMM0 )			/* +m14 */

+    MOVSS    ( XMM0, D(2) )			/* -> D(2) */

+

+LLBL(K_GTP3DNRR_skip):

+    ADD_L    ( CONST(16), EDI )

+    ADD_L    ( EAX, ESI )

+    CMP_L    ( ECX, EDI )

+    JNE      ( LLBL(K_GTP3DNRR_top) )

+

+LLBL(K_GTP3DNRR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_perspective)

+HIDDEN(_mesa_sse_transform_points3_perspective)

+GLNAME(_mesa_sse_transform_points3_perspective):

+

+#define FRAME_OFFSET 8

+    PUSH_L   ( ESI )

+    PUSH_L   ( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP3PR_finish) )			/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+    MOVSS    ( M(0), XMM1 )			/* -  | -  |  -  | m0  */

+    MOVSS    ( M(5), XMM2 )			/* -  | -  |  -  | m5  */

+    UNPCKLPS ( XMM2, XMM1 )			/* -  | -  | m5  | m0  */

+    MOVLPS   ( M(8), XMM2 )			/* -  | -  | m9  | m8  */

+    MOVSS    ( M(10), XMM3 )			/* m10 */

+    MOVSS    ( M(14), XMM4 )			/* m14 */

+    XORPS    ( XMM6, XMM6 )			/* 0 */

+

+ALIGNTEXT32

+LLBL(K_GTP3PR_top):

+    MOVLPS   ( S(0), XMM0 )			/* oy | ox */

+    MULPS    ( XMM1, XMM0 )			/* oy*m5 | ox*m0 */

+    MOVSS    ( S(2), XMM5 )			/* oz */

+    SHUFPS   ( CONST(0x0), XMM5, XMM5 )		/* oz | oz */

+    MULPS    ( XMM2, XMM5 )			/* oz*m9 | oz*m8 */

+    ADDPS    ( XMM5, XMM0 )			/* +oy*m5 | +ox*m0 */

+    MOVLPS   ( XMM0, D(0) )			/* ->D(1) | ->D(0) */

+

+    MOVSS    ( S(2), XMM0 )			/* oz */

+    MULSS    ( XMM3, XMM0 )			/* oz*m10 */

+    ADDSS    ( XMM4, XMM0 )			/* +m14 */

+    MOVSS    ( XMM0, D(2) )			/* ->D(2) */

+

+    MOVSS    ( S(2), XMM0 )			/* oz */

+    MOVSS    ( XMM6, XMM5 )			/* 0 */

+    SUBPS    ( XMM0, XMM5 )			/* -oz */

+    MOVSS    ( XMM5, D(3) )			/* ->D(3) */

+

+LLBL(K_GTP3PR_skip):

+    ADD_L( CONST(16), EDI )

+    ADD_L( EAX, ESI )

+    CMP_L( ECX, EDI )

+    JNE( LLBL(K_GTP3PR_top) )

+

+LLBL(K_GTP3PR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_2d)

+HIDDEN(_mesa_sse_transform_points3_2d)

+GLNAME(_mesa_sse_transform_points3_2d):

+

+#define FRAME_OFFSET 8

+    PUSH_L( ESI )

+    PUSH_L( EDI )

+

+    MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+    MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+    MOV_L( ARG_MATRIX, EDX ) 			/* ptr to matrix */

+    MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+    TEST_L( ECX, ECX)

+    JZ( LLBL(K_GTP3P2DR_finish) ) 		/* count was zero; go to finish */

+

+    MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+    OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+    MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+    MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+    SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+    MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+    MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+    ADD_L( EDI, ECX ) 				/* count += dest ptr */

+

+ALIGNTEXT32

+    MOVLPS( M(0), XMM0 )			/* m1  | m0 */

+    MOVLPS( M(4), XMM1 )			/* m5  | m4 */

+    MOVLPS( M(12), XMM2 )			/* m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP3P2DR_top):

+    MOVSS    ( S(0), XMM3 )			/* ox */

+    SHUFPS   ( CONST(0x0), XMM3, XMM3 )		/* ox | ox */

+    MULPS    ( XMM0, XMM3 )			/* ox*m1 | ox*m0 */

+    MOVSS    ( S(1), XMM4 )			/* oy */

+    SHUFPS   ( CONST(0x0), XMM4, XMM4 )		/* oy | oy */

+    MULPS    ( XMM1, XMM4 )			/* oy*m5 | oy*m4 */

+

+    ADDPS    ( XMM4, XMM3 )

+    ADDPS    ( XMM2, XMM3 )

+    MOVLPS   ( XMM3, D(0) )

+

+    MOVSS    ( S(2), XMM3 )

+    MOVSS    ( XMM3, D(2) )

+

+LLBL(K_GTP3P2DR_skip):

+    ADD_L    ( CONST(16), EDI )

+    ADD_L    ( EAX, ESI )

+    CMP_L    ( ECX, EDI )

+    JNE      ( LLBL(K_GTP3P2DR_top) )

+

+LLBL(K_GTP3P2DR_finish):

+    POP_L    ( EDI )

+    POP_L    ( ESI )

+    RET

+#undef FRAME_OFFSET

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_2d_no_rot)

+HIDDEN(_mesa_sse_transform_points3_2d_no_rot)

+GLNAME(_mesa_sse_transform_points3_2d_no_rot):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP3P2DNRR_finish) ) 	/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 			/* count += dest ptr */

+

+ALIGNTEXT32

+	MOVSS    ( M(0), XMM1 )			/* m0 */

+	MOVSS    ( M(5), XMM2 )			/* m5 */

+	UNPCKLPS ( XMM2, XMM1 )			/* m5 | m0 */

+	MOVLPS   ( M(12), XMM2 )		/* m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP3P2DNRR_top):

+	MOVLPS( S(0), XMM0 )			/* oy | ox */

+	MULPS( XMM1, XMM0 )			/* oy*m5 | ox*m0 */

+	ADDPS( XMM2, XMM0 )			/* +m13 | +m12 */

+	MOVLPS( XMM0, D(0) )			/* ->D(1) | ->D(0) */

+

+	MOVSS( S(2), XMM0 )

+	MOVSS( XMM0, D(2) )

+

+LLBL(K_GTP3P2DNRR_skip):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP3P2DNRR_top) )

+

+LLBL(K_GTP3P2DNRR_finish):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME(_mesa_sse_transform_points3_3d)

+HIDDEN(_mesa_sse_transform_points3_3d)

+GLNAME(_mesa_sse_transform_points3_3d):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( REGOFF(OFFSET_SOURCE+8, ESP), ESI ) 	/* ptr to source GLvector4f */

+	MOV_L( REGOFF(OFFSET_DEST+8, ESP), EDI ) 	/* ptr to dest GLvector4f */

+

+

+	MOV_L( ARG_MATRIX, EDX ) 		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX ) 	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP3P3DR_finish) ) 	/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX ) 	/* stride */

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) 	/* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) ) 	/* set dest count */

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) ) 	/* set dest size */

+

+	SHL_L( CONST(4), ECX ) 			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI ) 	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI ) 	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX ) 			/* count += dest ptr */

+

+

+ALIGNTEXT32

+	MOVAPS( M(0), XMM0 )			/* m2  | m1  | m0 */

+	MOVAPS( M(4), XMM1 )			/* m6  | m5  | m4 */

+	MOVAPS( M(8), XMM2 )			/* m10 | m9  | m8 */

+	MOVAPS( M(12), XMM3 )			/* m14 | m13 | m12 */

+

+ALIGNTEXT32

+LLBL(K_GTP3P3DR_top):

+	MOVSS( S(0), XMM4 )

+	SHUFPS( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox */

+	MULPS( XMM0, XMM4 )			/* ox*m2 | ox*m1 | ox*m0 */

+

+	MOVSS( S(1), XMM5 )

+	SHUFPS( CONST(0x0), XMM5, XMM5 )	/* oy | oy | oy */

+	MULPS( XMM1, XMM5 )			/* oy*m6 | oy*m5 | oy*m4 */

+

+	MOVSS( S(2), XMM6 )

+	SHUFPS( CONST(0x0), XMM6, XMM6 )	/* oz | oz | oz */

+	MULPS( XMM2, XMM6 )			/* oz*m10 | oz*m9 | oz*m8 */

+

+	ADDPS( XMM5, XMM4 )			/* + | + | + */

+	ADDPS( XMM6, XMM4 )			/* + | + | + */

+	ADDPS( XMM3, XMM4 )			/* + | + | + */

+

+	MOVLPS( XMM4, D(0) )			/* => D(1) | => D(0) */

+	UNPCKHPS( XMM4, XMM4 )

+	MOVSS( XMM4, D(2) )

+

+LLBL(K_GTP3P3DR_skip):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP3P3DR_top) )

+

+LLBL(K_GTP3P3DR_finish):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/sse_xform4.S b/mesalib/src/mesa/x86/sse_xform4.S
new file mode 100644
index 000000000..75e0ff396
--- /dev/null
+++ b/mesalib/src/mesa/x86/sse_xform4.S
@@ -0,0 +1,235 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+#ifdef USE_SSE_ASM

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+	SEG_TEXT

+

+#define FRAME_OFFSET	8

+

+#define SRC(i)		REGOFF(i * 4, ESI)

+#define DST(i)		REGOFF(i * 4, EDI)

+#define MAT(i)		REGOFF(i * 4, EDX)

+

+#define SELECT(r0, r1, r2, r3)	CONST( r0 * 64 + r1 * 16 + r2 * 4 + r3 )

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_sse_transform_points4_general )

+HIDDEN(_mesa_sse_transform_points4_general)

+GLNAME( _mesa_sse_transform_points4_general ):

+

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )			/* verify non-zero count */

+	JE( LLBL( sse_general_done ) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )	/* stride */

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )	/* set dest count */

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )/* set dest size */

+

+	MOV_L( REGOFF(V4F_START, ESI), ESI )	/* ptr to first source vertex */

+	MOV_L( REGOFF(V4F_START, EDI), EDI )	/* ptr to first dest vertex */

+

+	PREFETCHT0( REGIND(ESI) )

+

+	MOVAPS( MAT(0), XMM4 )			/* m3  | m2  | m1  | m0  */

+	MOVAPS( MAT(4), XMM5 )			/* m7  | m6  | m5  | m4  */

+	MOVAPS( MAT(8), XMM6 )			/* m11 | m10 | m9  | m8  */

+	MOVAPS( MAT(12), XMM7 )			/* m15 | m14 | m13 | m12 */

+

+ALIGNTEXT16

+LLBL( sse_general_loop ):

+

+	MOVSS( SRC(0), XMM0 )			/* ox */

+	SHUFPS( CONST(0x0), XMM0, XMM0 )	/* ox | ox | ox | ox */

+	MULPS( XMM4, XMM0 )			/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */

+

+	MOVSS( SRC(1), XMM1 )			/* oy */

+	SHUFPS( CONST(0x0), XMM1, XMM1 )	/* oy | oy | oy | oy */

+	MULPS( XMM5, XMM1 )			/* oy*m7 | oy*m6 | oy*m5 | oy*m4 */

+

+	MOVSS( SRC(2), XMM2 )			/* oz */

+	SHUFPS( CONST(0x0), XMM2, XMM2 )	/* oz | oz | oz | oz */

+	MULPS( XMM6, XMM2 )			/* oz*m11 | oz*m10 | oz*m9 | oz*m8 */

+

+	MOVSS( SRC(3), XMM3 )			/* ow */

+	SHUFPS( CONST(0x0), XMM3, XMM3 )	/* ow | ow | ow | ow */

+	MULPS( XMM7, XMM3 )			/* ow*m15 | ow*m14 | ow*m13 | ow*m12 */

+

+	ADDPS( XMM1, XMM0 )			/* ox*m3+oy*m7 | ... */

+	ADDPS( XMM2, XMM0 )			/* ox*m3+oy*m7+oz*m11 | ... */

+	ADDPS( XMM3, XMM0 )			/* ox*m3+oy*m7+oz*m11+ow*m15 | ... */

+	MOVAPS( XMM0, DST(0) )			/* ->D(3) | ->D(2) | ->D(1) | ->D(0) */

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+

+	DEC_L( ECX )

+	JNZ( LLBL( sse_general_loop ) )

+

+LLBL( sse_general_done ):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME( _mesa_sse_transform_points4_3d )

+HIDDEN(_mesa_sse_transform_points4_3d)

+GLNAME( _mesa_sse_transform_points4_3d ):

+

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )		/* ptr to source GLvector4f */

+	MOV_L( ARG_DEST, EDI )			/* ptr to dest GLvector4f */

+

+	MOV_L( ARG_MATRIX, EDX )		/* ptr to matrix */

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )	/* source count */

+

+	TEST_L( ECX, ECX)

+	JZ( LLBL(K_GTP43P3DR_finish) )		/* count was zero; go to finish */

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )	/* stride */

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )	/* set dest count */

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )/* set dest size */

+

+	SHL_L( CONST(4), ECX )			/* count *= 16 */

+	MOV_L( REGOFF(V4F_START, ESI), ESI )	/* ptr to first source vertex */

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )	/* ptr to first dest vertex */

+	ADD_L( EDI, ECX )			/* count += dest ptr */

+

+	MOVAPS( MAT(0), XMM0 )			/* m3  | m2  | m1  |  m0 */

+	MOVAPS( MAT(4), XMM1 )			/* m7  | m6  | m5  |  m4 */

+	MOVAPS( MAT(8), XMM2 )			/* m11 | m10 | m9  |  m8 */

+	MOVAPS( MAT(12), XMM3 )			/* m15 | m14 | m13 | m12 */

+

+ALIGNTEXT32

+LLBL( K_GTP43P3DR_top ):

+	MOVSS( SRC(0), XMM4 )			/* ox */

+	SHUFPS( CONST(0x0), XMM4, XMM4 )	/* ox | ox | ox | ox */

+	MULPS( XMM0, XMM4 )			/* ox*m3 | ox*m2 | ox*m1 | ox*m0 */

+

+	MOVSS( SRC(1), XMM5 )			/* oy */

+	SHUFPS( CONST(0x0), XMM5, XMM5 )	/* oy | oy | oy | oy */

+	MULPS( XMM1, XMM5 )			/* oy*m7 | oy*m6 | oy*m5 | oy*m4 */

+

+	MOVSS( SRC(2), XMM6 )			/* oz */

+	SHUFPS( CONST(0x0), XMM6, XMM6 )	/* oz | oz | oz | oz */

+	MULPS( XMM2, XMM6 )			/* oz*m11 | oz*m10 | oz*m9 | oz*m8 */

+

+	MOVSS( SRC(3), XMM7 )			/* ow */

+	SHUFPS( CONST(0x0), XMM7, XMM7 )	/* ow | ow | ow | ow */

+	MULPS( XMM3, XMM7 )			/* ow*m15 | ow*m14 | ow*m13 | ow*m12 */

+

+	ADDPS( XMM5, XMM4 )			/* ox*m3+oy*m7 | ... */

+	ADDPS( XMM6, XMM4 )			/* ox*m3+oy*m7+oz*m11 | ... */

+	ADDPS( XMM7, XMM4 )			/* ox*m3+oy*m7+oz*m11+ow*m15 | ... */

+	MOVAPS( XMM4, DST(0) )			/* ->D(3) | ->D(2) | ->D(1) | ->D(0) */

+

+	MOVSS( SRC(3), XMM4 )			/* ow */

+	MOVSS( XMM4, DST(3) )			/* ->D(3) */

+

+LLBL( K_GTP43P3DR_skip ):

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(K_GTP43P3DR_top) )

+

+LLBL( K_GTP43P3DR_finish ):

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_sse_transform_points4_identity )

+HIDDEN(_mesa_sse_transform_points4_identity)

+GLNAME( _mesa_sse_transform_points4_identity ):

+

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )			/* verify non-zero count */

+	JE( LLBL( sse_identity_done ) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )	/* stride */

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) ) /* set dest flags */

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )	/* set dest count */

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )/* set dest size */

+

+	MOV_L( REGOFF(V4F_START, ESI), ESI )	/* ptr to first source vertex */

+	MOV_L( REGOFF(V4F_START, EDI), EDI )	/* ptr to first dest vertex */

+

+ALIGNTEXT16

+LLBL( sse_identity_loop ):

+

+	PREFETCHNTA( REGOFF(32, ESI) )

+

+	MOVAPS( REGIND(ESI), XMM0 )

+	ADD_L( EAX, ESI )

+

+	MOVAPS( XMM0, REGIND(EDI) )

+	ADD_L( CONST(16), EDI )

+

+	DEC_L( ECX )

+	JNZ( LLBL( sse_identity_loop ) )

+

+LLBL( sse_identity_done ):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#endif

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/x86_cliptest.S b/mesalib/src/mesa/x86/x86_cliptest.S
new file mode 100644
index 000000000..8556a887a
--- /dev/null
+++ b/mesalib/src/mesa/x86/x86_cliptest.S
@@ -0,0 +1,407 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially

+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces

+ * in there will break the build on some platforms.

+ */

+

+#include "assyntax.h"

+#include "matypes.h"

+#include "clip_args.h"

+

+#define SRC0		REGOFF(0, ESI)

+#define SRC1		REGOFF(4, ESI)

+#define SRC2		REGOFF(8, ESI)

+#define SRC3		REGOFF(12, ESI)

+#define DST0		REGOFF(0, EDI)

+#define DST1		REGOFF(4, EDI)

+#define DST2		REGOFF(8, EDI)

+#define DST3		REGOFF(12, EDI)

+#define MAT0		REGOFF(0, EDX)

+#define MAT1		REGOFF(4, EDX)

+#define MAT2		REGOFF(8, EDX)

+#define MAT3		REGOFF(12, EDX)

+

+

+/*

+ * Table for clip test.

+ *

+ * 	bit6 = SRC3 < 0

+ * 	bit5 = SRC2 < 0

+ * 	bit4 = abs(S(2)) > abs(S(3))

+ * 	bit3 = SRC1 < 0

+ * 	bit2 = abs(S(1)) > abs(S(3))

+ * 	bit1 = SRC0 < 0

+ * 	bit0 = abs(S(0)) > abs(S(3))

+ */

+

+	SEG_DATA

+

+clip_table:

+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06

+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a

+	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x24, 0x25, 0x24, 0x26

+	D_BYTE 0x20, 0x21, 0x20, 0x22, 0x28, 0x29, 0x28, 0x2a

+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x04, 0x05, 0x04, 0x06

+	D_BYTE 0x00, 0x01, 0x00, 0x02, 0x08, 0x09, 0x08, 0x0a

+	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x14, 0x15, 0x14, 0x16

+	D_BYTE 0x10, 0x11, 0x10, 0x12, 0x18, 0x19, 0x18, 0x1a

+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36

+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a

+	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x27, 0x25, 0x27, 0x26

+	D_BYTE 0x2f, 0x2d, 0x2f, 0x2e, 0x2b, 0x29, 0x2b, 0x2a

+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x37, 0x35, 0x37, 0x36

+	D_BYTE 0x3f, 0x3d, 0x3f, 0x3e, 0x3b, 0x39, 0x3b, 0x3a

+	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x17, 0x15, 0x17, 0x16

+	D_BYTE 0x1f, 0x1d, 0x1f, 0x1e, 0x1b, 0x19, 0x1b, 0x1a

+

+

+	SEG_TEXT

+

+/*

+ * _mesa_x86_cliptest_points4

+ *

+ *   AL:  ormask

+ *   AH:  andmask

+ *   EBX: temp0

+ *   ECX: temp1

+ *   EDX: clipmask[]

+ *   ESI: clip[]

+ *   EDI: proj[]

+ *   EBP: temp2

+ */

+

+#if defined(__ELF__) && defined(__PIC__) && defined(GNU_ASSEMBLER) && !defined(ELFPIC)

+#define ELFPIC

+#endif

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_cliptest_points4 )

+HIDDEN(_mesa_x86_cliptest_points4)

+GLNAME( _mesa_x86_cliptest_points4 ):

+

+#ifdef ELFPIC

+#define FRAME_OFFSET 20

+#else

+#define FRAME_OFFSET 16

+#endif

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBP )

+	PUSH_L( EBX )

+

+#ifdef ELFPIC

+	/* store pointer to clip_table on stack */

+	CALL( LLBL(ctp4_get_eip) )

+	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )

+	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )

+	PUSH_L( EBX )

+	JMP( LLBL(ctp4_clip_table_ready) )

+

+LLBL(ctp4_get_eip):

+	/* store eip in ebx */

+	MOV_L( REGIND(ESP), EBX )

+	RET

+

+LLBL(ctp4_clip_table_ready):

+#endif

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_CLIP, EDX )

+	MOV_L( ARG_OR, EBX )

+

+	MOV_L( ARG_AND, EBP )

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+	MOV_L( EAX, ARG_SOURCE )	/* put stride in ARG_SOURCE */

+

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDX, ECX )

+

+	MOV_L( ECX, ARG_CLIP )		/* put clipmask + count in ARG_CLIP */

+	CMP_L( ECX, EDX )

+

+	MOV_B( REGIND(EBX), AL )

+	MOV_B( REGIND(EBP), AH )

+

+	JZ( LLBL(ctp4_finish) )

+

+ALIGNTEXT16

+LLBL(ctp4_top):

+

+	FLD1				/* F3 */

+	FDIV_S( SRC3 )		/* GH: don't care about div-by-zero */

+

+	MOV_L( SRC3, EBP )

+	MOV_L( SRC2, EBX )

+

+	XOR_L( ECX, ECX )

+	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */

+

+	ADC_L( ECX, ECX )

+	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */

+

+	ADC_L( ECX, ECX )

+	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */

+

+	ADC_L( ECX, ECX )

+	MOV_L( SRC1, EBX )

+

+	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */

+

+	ADC_L( ECX, ECX )

+	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */

+

+	ADC_L( ECX, ECX )

+	MOV_L( SRC0, EBX )

+

+	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */

+

+	ADC_L( ECX, ECX )

+	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */

+

+	ADC_L( ECX, ECX )

+

+#ifdef ELFPIC

+	MOV_L( REGIND(ESP), EBP )	/* clip_table */

+

+	MOV_B( REGBI(EBP, ECX), CL )

+#else

+	MOV_B( REGOFF(clip_table,ECX), CL )

+#endif

+

+	OR_B( CL, AL )

+	AND_B( CL, AH )

+

+	TEST_B( CL, CL )

+	MOV_B( CL, REGIND(EDX) )

+

+	JZ( LLBL(ctp4_proj) )

+

+LLBL(ctp4_noproj):

+

+	FSTP( ST(0) )			/* */

+

+	MOV_L( CONST(0), DST0 )

+	MOV_L( CONST(0), DST1 )

+	MOV_L( CONST(0), DST2 )

+	MOV_L( CONST(0x3f800000), DST3 )

+

+	JMP( LLBL(ctp4_next) )

+

+LLBL(ctp4_proj):

+

+	FLD_S( SRC0 )			/* F0 F3 */

+	FMUL2( ST(1), ST0 )

+

+	FLD_S( SRC1 )			/* F1 F0 F3 */

+	FMUL2( ST(2), ST0 )

+

+	FLD_S( SRC2 )			/* F2 F1 F0 F3 */

+	FMUL2( ST(3), ST0 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F3 */

+	FSTP_S( DST0 )		/* F1 F2 F3 */

+	FSTP_S( DST1 )		/* F2 F3 */

+	FSTP_S( DST2 )		/* F3 */

+	FSTP_S( DST3 )		/* */

+

+LLBL(ctp4_next):

+

+	INC_L( EDX )

+	ADD_L( CONST(16), EDI )

+

+	ADD_L( ARG_SOURCE, ESI )

+	CMP_L( EDX, ARG_CLIP )

+

+	JNZ( LLBL(ctp4_top) )

+

+	MOV_L( ARG_OR, ECX )

+	MOV_L( ARG_AND, EDX )

+

+	MOV_B( AL, REGIND(ECX) )

+	MOV_B( AH, REGIND(EDX) )

+

+LLBL(ctp4_finish):

+

+	MOV_L( ARG_DEST, EAX )

+#ifdef ELFPIC

+	POP_L( ESI )			/* discard ptr to clip_table */

+#endif

+	POP_L( EBX )

+	POP_L( EBP )

+	POP_L( EDI )

+	POP_L( ESI )

+

+	RET

+

+

+

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_cliptest_points4_np )

+HIDDEN(_mesa_x86_cliptest_points4_np)

+GLNAME( _mesa_x86_cliptest_points4_np ):

+

+#ifdef ELFPIC

+#define FRAME_OFFSET 20

+#else

+#define FRAME_OFFSET 16

+#endif

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBP )

+	PUSH_L( EBX )

+

+#ifdef ELFPIC

+	/* store pointer to clip_table on stack */

+	CALL( LLBL(ctp4_np_get_eip) )

+	ADD_L( CONST(_GLOBAL_OFFSET_TABLE_), EBX )

+	MOV_L( REGOFF(clip_table@GOT, EBX), EBX )

+	PUSH_L( EBX )

+	JMP( LLBL(ctp4_np_clip_table_ready) )

+

+LLBL(ctp4_np_get_eip):

+	/* store eip in ebx */

+	MOV_L( REGIND(ESP), EBX )

+	RET

+

+LLBL(ctp4_np_clip_table_ready):

+#endif

+

+	MOV_L( ARG_SOURCE, ESI )

+	/* slot */

+

+	MOV_L( ARG_CLIP, EDX )

+	MOV_L( ARG_OR, EBX )

+

+	MOV_L( ARG_AND, EBP )

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( EAX, ARG_DEST )   	/* put stride in ARG_DEST */

+	ADD_L( EDX, ECX )

+

+	MOV_L( ECX, EDI )		/* put clipmask + count in EDI */

+	CMP_L( ECX, EDX )

+

+	MOV_B( REGIND(EBX), AL )

+	MOV_B( REGIND(EBP), AH )

+

+	JZ( LLBL(ctp4_np_finish) )

+

+ALIGNTEXT16

+LLBL(ctp4_np_top):

+

+	MOV_L( SRC3, EBP )

+	MOV_L( SRC2, EBX )

+

+	XOR_L( ECX, ECX )

+	ADD_L( EBP, EBP )	/* ebp = abs(S(3))*2 ; carry = sign of S(3) */

+

+	ADC_L( ECX, ECX )

+	ADD_L( EBX, EBX )	/* ebx = abs(S(2))*2 ; carry = sign of S(2) */

+

+	ADC_L( ECX, ECX )

+	CMP_L( EBX, EBP )	/* carry = abs(S(2))*2 > abs(S(3))*2 */

+

+	ADC_L( ECX, ECX )

+	MOV_L( SRC1, EBX )

+

+	ADD_L( EBX, EBX )	/* ebx = abs(S(1))*2 ; carry = sign of S(1) */

+

+	ADC_L( ECX, ECX )

+	CMP_L( EBX, EBP )	/* carry = abs(S(1))*2 > abs(S(3))*2 */

+

+	ADC_L( ECX, ECX )

+	MOV_L( SRC0, EBX )

+

+	ADD_L( EBX, EBX )	/* ebx = abs(S(0))*2 ; carry = sign of S(0) */

+

+	ADC_L( ECX, ECX )

+	CMP_L( EBX, EBP )	/* carry = abs(S(0))*2 > abs(S(3))*2 */

+

+	ADC_L( ECX, ECX )

+

+#ifdef ELFPIC

+	MOV_L( REGIND(ESP), EBP )	/* clip_table */

+

+	MOV_B( REGBI(EBP, ECX), CL )

+#else

+	MOV_B( REGOFF(clip_table,ECX), CL )

+#endif

+

+	OR_B( CL, AL )

+	AND_B( CL, AH )

+

+	TEST_B( CL, CL )

+	MOV_B( CL, REGIND(EDX) )

+

+	INC_L( EDX )

+	/* slot */

+

+	ADD_L( ARG_DEST, ESI )

+	CMP_L( EDX, EDI )

+

+	JNZ( LLBL(ctp4_np_top) )

+

+	MOV_L( ARG_OR, ECX )

+	MOV_L( ARG_AND, EDX )

+

+	MOV_B( AL, REGIND(ECX) )

+	MOV_B( AH, REGIND(EDX) )

+

+LLBL(ctp4_np_finish):

+

+	MOV_L( ARG_SOURCE, EAX )

+#ifdef ELFPIC

+	POP_L( ESI )			/* discard ptr to clip_table */

+#endif

+	POP_L( EBX )

+	POP_L( EBP )

+	POP_L( EDI )

+	POP_L( ESI )

+

+	RET

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/x86_xform.c b/mesalib/src/mesa/x86/x86_xform.c
new file mode 100644
index 000000000..57b10c262
--- /dev/null
+++ b/mesalib/src/mesa/x86/x86_xform.c
@@ -0,0 +1,126 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * Intel x86 assembly code by Josh Vanderhoof

+ */

+

+#include "main/glheader.h"

+#include "main/context.h"

+#include "math/m_xform.h"

+

+#include "x86_xform.h"

+#include "common_x86_asm.h"

+

+#ifdef USE_X86_ASM

+#ifdef USE_3DNOW_ASM

+#include "3dnow.h"

+#endif

+#ifdef USE_SSE_ASM

+#include "sse.h"

+#endif

+#endif

+

+#ifdef DEBUG_MATH

+#include "math/m_debug.h"

+#endif

+

+

+#ifdef USE_X86_ASM

+DECLARE_XFORM_GROUP( x86, 2 )

+DECLARE_XFORM_GROUP( x86, 3 )

+DECLARE_XFORM_GROUP( x86, 4 )

+

+

+extern GLvector4f * _ASMAPI

+_mesa_x86_cliptest_points4( GLvector4f *clip_vec,

+			    GLvector4f *proj_vec,

+			    GLubyte clipMask[],

+			    GLubyte *orMask,

+			    GLubyte *andMask,

+			    GLboolean viewport_z_clip );

+

+extern GLvector4f * _ASMAPI

+_mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,

+			       GLvector4f *proj_vec,

+			       GLubyte clipMask[],

+			       GLubyte *orMask,

+			       GLubyte *andMask,

+			       GLboolean viewport_z_clip );

+

+extern void _ASMAPI

+_mesa_v16_x86_cliptest_points4( GLfloat *first_vert,

+				GLfloat *last_vert,

+				GLubyte *or_mask,

+				GLubyte *and_mask,

+				GLubyte *clip_mask,

+				GLboolean viewport_z_clip );

+

+extern void _ASMAPI

+_mesa_v16_x86_general_xform( GLfloat *dest,

+			     const GLfloat *m,

+			     const GLfloat *src,

+			     GLuint src_stride,

+			     GLuint count );

+#endif

+

+

+#ifdef USE_X86_ASM

+static void _mesa_init_x86_transform_asm( void )

+{

+   ASSIGN_XFORM_GROUP( x86, 2 );

+   ASSIGN_XFORM_GROUP( x86, 3 );

+   ASSIGN_XFORM_GROUP( x86, 4 );

+

+   _mesa_clip_tab[4] = _mesa_x86_cliptest_points4;

+   _mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np;

+

+#ifdef DEBUG_MATH

+   _math_test_all_transform_functions( "x86" );

+   _math_test_all_cliptest_functions( "x86" );

+#endif

+}

+#endif

+

+

+void _mesa_init_all_x86_transform_asm( void )

+{

+   _mesa_get_x86_features();

+

+#ifdef USE_X86_ASM

+   if ( _mesa_x86_cpu_features ) {

+      _mesa_init_x86_transform_asm();

+   }

+

+   if (cpu_has_3dnow) {

+      _mesa_init_3dnow_transform_asm();

+   }

+

+   if ( cpu_has_xmm ) {

+      _mesa_init_sse_transform_asm();

+   }

+

+#endif

+}

diff --git a/mesalib/src/mesa/x86/x86_xform.h b/mesalib/src/mesa/x86/x86_xform.h
new file mode 100644
index 000000000..055fd6a1f
--- /dev/null
+++ b/mesalib/src/mesa/x86/x86_xform.h
@@ -0,0 +1,106 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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:

+ *    Gareth Hughes

+ */

+

+#ifndef X86_XFORM_H

+#define X86_XFORM_H

+

+

+/* =============================================================

+ * Transformation function declarations:

+ */

+

+#define XFORM_ARGS	GLvector4f *to_vec,				\

+			const GLfloat m[16],				\

+			const GLvector4f *from_vec

+

+#define DECLARE_XFORM_GROUP( pfx, sz ) \

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\

+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );

+

+#define ASSIGN_XFORM_GROUP( pfx, sz )					\

+   _mesa_transform_tab[sz][MATRIX_GENERAL] =				\

+      _mesa_##pfx##_transform_points##sz##_general;			\

+   _mesa_transform_tab[sz][MATRIX_IDENTITY] =				\

+      _mesa_##pfx##_transform_points##sz##_identity;			\

+   _mesa_transform_tab[sz][MATRIX_3D_NO_ROT] =				\

+      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\

+   _mesa_transform_tab[sz][MATRIX_PERSPECTIVE] =			\

+      _mesa_##pfx##_transform_points##sz##_perspective;			\

+   _mesa_transform_tab[sz][MATRIX_2D] =					\

+      _mesa_##pfx##_transform_points##sz##_2d;				\

+   _mesa_transform_tab[sz][MATRIX_2D_NO_ROT] =				\

+      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\

+   _mesa_transform_tab[sz][MATRIX_3D] =					\

+      _mesa_##pfx##_transform_points##sz##_3d;

+

+

+/* =============================================================

+ * Normal transformation function declarations:

+ */

+

+#define NORM_ARGS	const GLmatrix *mat,				\

+			GLfloat scale,					\

+			const GLvector4f *in,				\

+			const GLfloat *lengths,				\

+			GLvector4f *dest

+

+#define DECLARE_NORM_GROUP( pfx ) \

+extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );				\

+extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );			\

+extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );			\

+extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\

+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\

+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\

+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\

+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );

+

+#define ASSIGN_NORM_GROUP( pfx )					\

+   _mesa_normal_tab[NORM_RESCALE] =					\

+      _mesa_##pfx##_rescale_normals;					\

+   _mesa_normal_tab[NORM_NORMALIZE] =					\

+      _mesa_##pfx##_normalize_normals;					\

+   _mesa_normal_tab[NORM_TRANSFORM] =					\

+      _mesa_##pfx##_transform_normals;					\

+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =				\

+      _mesa_##pfx##_transform_normals_no_rot;				\

+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =			\

+      _mesa_##pfx##_transform_rescale_normals;				\

+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =		\

+      _mesa_##pfx##_transform_rescale_normals_no_rot;			\

+   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =			\

+      _mesa_##pfx##_transform_normalize_normals;			\

+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =		\

+      _mesa_##pfx##_transform_normalize_normals_no_rot;

+

+

+#endif

diff --git a/mesalib/src/mesa/x86/x86_xform2.S b/mesalib/src/mesa/x86/x86_xform2.S
new file mode 100644
index 000000000..482035c1f
--- /dev/null
+++ b/mesalib/src/mesa/x86/x86_xform2.S
@@ -0,0 +1,574 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially

+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces

+ * in there will break the build on some platforms.

+ */

+

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+	SEG_TEXT

+

+#define FP_ONE		1065353216

+#define FP_ZERO		0

+

+#define SRC0		REGOFF(0, ESI)

+#define SRC1		REGOFF(4, ESI)

+#define SRC2		REGOFF(8, ESI)

+#define SRC3		REGOFF(12, ESI)

+#define DST0		REGOFF(0, EDI)

+#define DST1		REGOFF(4, EDI)

+#define DST2		REGOFF(8, EDI)

+#define DST3		REGOFF(12, EDI)

+#define MAT0		REGOFF(0, EDX)

+#define MAT1		REGOFF(4, EDX)

+#define MAT2		REGOFF(8, EDX)

+#define MAT3		REGOFF(12, EDX)

+#define MAT4		REGOFF(16, EDX)

+#define MAT5		REGOFF(20, EDX)

+#define MAT6		REGOFF(24, EDX)

+#define MAT7		REGOFF(28, EDX)

+#define MAT8		REGOFF(32, EDX)

+#define MAT9		REGOFF(36, EDX)

+#define MAT10		REGOFF(40, EDX)

+#define MAT11		REGOFF(44, EDX)

+#define MAT12		REGOFF(48, EDX)

+#define MAT13		REGOFF(52, EDX)

+#define MAT14		REGOFF(56, EDX)

+#define MAT15		REGOFF(60, EDX)

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points2_general )

+HIDDEN(_mesa_x86_transform_points2_general)

+GLNAME( _mesa_x86_transform_points2_general ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_gr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p2_gr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+	FLD_S( SRC0 )			/* F6 F5 F4 */

+	FMUL_S( MAT2 )

+	FLD_S( SRC0 )			/* F7 F6 F5 F4 */

+	FMUL_S( MAT3 )

+

+	FLD_S( SRC1 )			/* F0 F7 F6 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT5 )

+	FLD_S( SRC1 )			/* F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT6 )

+	FLD_S( SRC1 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT7 )

+

+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */

+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */

+

+	FXCH( ST(3) )			/* F4 F6 F5 F7 */

+	FADD_S( MAT12 )

+	FXCH( ST(2) )			/* F5 F6 F4 F7 */

+	FADD_S( MAT13 )

+	FXCH( ST(1) )			/* F6 F5 F4 F7 */

+	FADD_S( MAT14 )

+	FXCH( ST(3) )			/* F7 F5 F4 F6 */

+	FADD_S( MAT15 )

+

+	FXCH( ST(2) )			/* F4 F5 F7 F6 */

+	FSTP_S( DST0 )			/* F5 F7 F6 */

+	FSTP_S( DST1 )			/* F7 F6 */

+	FXCH( ST(1) )			/* F6 F7 */

+	FSTP_S( DST2 )			/* F7 */

+	FSTP_S( DST3 )			/* */

+

+LLBL(x86_p2_gr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_gr_loop) )

+

+LLBL(x86_p2_gr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points2_perspective )

+HIDDEN(_mesa_x86_transform_points2_perspective)

+GLNAME( _mesa_x86_transform_points2_perspective ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_pr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+	MOV_L( MAT14, EBX )

+

+ALIGNTEXT16

+LLBL(x86_p2_pr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F1 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F4 F1 */

+	FSTP_S( DST0   )		/* F1 */

+	FSTP_S( DST1   )		/* */

+	MOV_L( EBX, DST2 )

+	MOV_L( CONST(FP_ZERO), DST3 )

+

+LLBL(x86_p2_pr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_pr_loop) )

+

+LLBL(x86_p2_pr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points2_3d )

+HIDDEN(_mesa_x86_transform_points2_3d)

+GLNAME( _mesa_x86_transform_points2_3d ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_3dr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p2_3dr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+	FLD_S( SRC0 )			/* F6 F5 F4 */

+	FMUL_S( MAT2 )

+

+	FLD_S( SRC1 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT5 )

+	FLD_S( SRC1 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT6 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	FXCH( ST(2) )			/* F4 F5 F6 */

+	FADD_S( MAT12 )

+	FXCH( ST(1) )			/* F5 F4 F6 */

+	FADD_S( MAT13 )

+	FXCH( ST(2) )			/* F6 F4 F5 */

+	FADD_S( MAT14 )

+

+	FXCH( ST(1) )			/* F4 F6 F5 */

+	FSTP_S( DST0 )			/* F6 F5 */

+	FXCH( ST(1) )			/* F5 F6 */

+	FSTP_S( DST1 )			/* F6 */

+	FSTP_S( DST2 )			/* */

+

+LLBL(x86_p2_3dr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_3dr_loop) )

+

+LLBL(x86_p2_3dr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points2_3d_no_rot )

+HIDDEN(_mesa_x86_transform_points2_3d_no_rot)

+GLNAME( _mesa_x86_transform_points2_3d_no_rot ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_3dnrr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+	MOV_L( MAT14, EBX )

+

+ALIGNTEXT16

+LLBL(x86_p2_3dnrr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F1 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F4 F1 */

+	FADD_S( MAT12 )

+	FLD_S( MAT13 )		/* F5 F4 F1 */

+	FXCH( ST(2) )			/* F1 F4 F5 */

+	FADDP( ST0, ST(2) )		/* F4 F5 */

+

+	FSTP_S( DST0 )		/* F5 */

+	FSTP_S( DST1 )		/* */

+	MOV_L( EBX, DST2 )

+

+LLBL(x86_p2_3dnrr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_3dnrr_loop) )

+

+LLBL(x86_p2_3dnrr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points2_2d )

+HIDDEN(_mesa_x86_transform_points2_2d)

+GLNAME( _mesa_x86_transform_points2_2d ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_2dr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p2_2dr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+

+	FLD_S( SRC1 )			/* F0 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F0 F1 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F5 F4 */

+

+	FXCH( ST(1) )			/* F4 F5 */

+	FADD_S( MAT12 )

+	FXCH( ST(1) )			/* F5 F4 */

+	FADD_S( MAT13 )

+

+	FXCH( ST(1) )			/* F4 F5 */

+	FSTP_S( DST0 )		/* F5 */

+	FSTP_S( DST1 )		/* */

+

+LLBL(x86_p2_2dr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_2dr_loop) )

+

+LLBL(x86_p2_2dr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT4

+GLOBL GLNAME( _mesa_x86_transform_points2_2d_no_rot )

+HIDDEN(_mesa_x86_transform_points2_2d_no_rot)

+GLNAME( _mesa_x86_transform_points2_2d_no_rot ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_2dnrr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p2_2dnrr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F1 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F4 F1 */

+	FADD_S( MAT12 )

+	FLD_S( MAT13 )		/* F5 F4 F1 */

+	FXCH( ST(2) )			/* F1 F4 F5 */

+	FADDP( ST0, ST(2) )		/* F4 F5 */

+

+	FSTP_S( DST0   )		/* F5 */

+	FSTP_S( DST1   )		/* */

+

+LLBL(x86_p2_2dnrr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_2dnrr_loop) )

+

+LLBL(x86_p2_2dnrr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points2_identity )

+HIDDEN(_mesa_x86_transform_points2_identity)

+GLNAME( _mesa_x86_transform_points2_identity ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p2_ir_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_2), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(2), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+	CMP_L( ESI, EDI )

+	JE( LLBL(x86_p2_ir_done) )

+

+ALIGNTEXT16

+LLBL(x86_p2_ir_loop):

+

+	MOV_L( SRC0, EBX )

+	MOV_L( SRC1, EDX )

+

+	MOV_L( EBX, DST0 )

+	MOV_L( EDX, DST1 )

+

+LLBL(x86_p2_ir_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p2_ir_loop) )

+

+LLBL(x86_p2_ir_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/x86_xform3.S b/mesalib/src/mesa/x86/x86_xform3.S
new file mode 100644
index 000000000..6f717caf9
--- /dev/null
+++ b/mesalib/src/mesa/x86/x86_xform3.S
@@ -0,0 +1,644 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially

+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces

+ * in there will break the build on some platforms.

+ */

+

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+	SEG_TEXT

+

+#define FP_ONE		1065353216

+#define FP_ZERO		0

+

+#define SRC0		REGOFF(0, ESI)

+#define SRC1		REGOFF(4, ESI)

+#define SRC2		REGOFF(8, ESI)

+#define SRC3		REGOFF(12, ESI)

+#define DST0		REGOFF(0, EDI)

+#define DST1		REGOFF(4, EDI)

+#define DST2		REGOFF(8, EDI)

+#define DST3		REGOFF(12, EDI)

+#define MAT0		REGOFF(0, EDX)

+#define MAT1		REGOFF(4, EDX)

+#define MAT2		REGOFF(8, EDX)

+#define MAT3		REGOFF(12, EDX)

+#define MAT4		REGOFF(16, EDX)

+#define MAT5		REGOFF(20, EDX)

+#define MAT6		REGOFF(24, EDX)

+#define MAT7		REGOFF(28, EDX)

+#define MAT8		REGOFF(32, EDX)

+#define MAT9		REGOFF(36, EDX)

+#define MAT10		REGOFF(40, EDX)

+#define MAT11		REGOFF(44, EDX)

+#define MAT12		REGOFF(48, EDX)

+#define MAT13		REGOFF(52, EDX)

+#define MAT14		REGOFF(56, EDX)

+#define MAT15		REGOFF(60, EDX)

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_general )

+HIDDEN(_mesa_x86_transform_points3_general)

+GLNAME( _mesa_x86_transform_points3_general ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_gr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p3_gr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+	FLD_S( SRC0 )			/* F6 F5 F4 */

+	FMUL_S( MAT2 )

+	FLD_S( SRC0 )			/* F7 F6 F5 F4 */

+	FMUL_S( MAT3 )

+

+	FLD_S( SRC1 )			/* F0 F7 F6 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT5 )

+	FLD_S( SRC1 )			/* F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT6 )

+	FLD_S( SRC1 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT7 )

+

+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */

+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */

+

+	FLD_S( SRC2 )			/* F0 F7 F6 F5 F4 */

+	FMUL_S( MAT8 )

+	FLD_S( SRC2 )			/* F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT9 )

+	FLD_S( SRC2 )			/* F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT10 )

+	FLD_S( SRC2 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT11 )

+

+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */

+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */

+

+	FXCH( ST(3) )			/* F4 F6 F5 F7 */

+	FADD_S( MAT12 )

+	FXCH( ST(2) )			/* F5 F6 F4 F7 */

+	FADD_S( MAT13 )

+	FXCH( ST(1) )			/* F6 F5 F4 F7 */

+	FADD_S( MAT14 )

+	FXCH( ST(3) )			/* F7 F5 F4 F6 */

+	FADD_S( MAT15 )

+

+	FXCH( ST(2) )			/* F4 F5 F7 F6 */

+	FSTP_S( DST0 )		/* F5 F7 F6 */

+	FSTP_S( DST1 )		/* F7 F6 */

+	FXCH( ST(1) )			/* F6 F7 */

+	FSTP_S( DST2 )		/* F7 */

+	FSTP_S( DST3 )		/* */

+

+LLBL(x86_p3_gr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_gr_loop) )

+

+LLBL(x86_p3_gr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_perspective )

+HIDDEN(_mesa_x86_transform_points3_perspective)

+GLNAME( _mesa_x86_transform_points3_perspective ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_pr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p3_pr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F5 F4 */

+	FMUL_S( MAT5 )

+

+	FLD_S( SRC2 )			/* F0 F5 F4 */

+	FMUL_S( MAT8 )

+	FLD_S( SRC2 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT9 )

+	FLD_S( SRC2 )			/* F2 F1 F0 F5 F4 */

+	FMUL_S( MAT10 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F5 F4 */

+	FADDP( ST0, ST(4) )		/* F1 F2 F5 F4 */

+	FADDP( ST0, ST(2) )		/* F2 F5 F4 */

+	FLD_S( MAT14 )		/* F6 F2 F5 F4 */

+	FXCH( ST(1) )			/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	MOV_L( SRC2, EBX )

+	XOR_L( CONST(-2147483648), EBX )/* change sign */

+

+	FXCH( ST(2) )			/* F4 F5 F6 */

+	FSTP_S( DST0 )		/* F5 F6 */

+	FSTP_S( DST1 )		/* F6 */

+	FSTP_S( DST2 )		/* */

+	MOV_L( EBX, DST3 )

+

+LLBL(x86_p3_pr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_pr_loop) )

+

+LLBL(x86_p3_pr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_3d )

+HIDDEN(_mesa_x86_transform_points3_3d)

+GLNAME( _mesa_x86_transform_points3_3d ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_3dr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p3_3dr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+	FLD_S( SRC0 )			/* F6 F5 F4 */

+	FMUL_S( MAT2 )

+

+	FLD_S( SRC1 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT5 )

+	FLD_S( SRC1 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT6 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	FLD_S( SRC2 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT8 )

+	FLD_S( SRC2 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT9 )

+	FLD_S( SRC2 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT10 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	FXCH( ST(2) )			/* F4 F5 F6 */

+	FADD_S( MAT12 )

+	FXCH( ST(1) )			/* F5 F4 F6 */

+	FADD_S( MAT13 )

+	FXCH( ST(2) )			/* F6 F4 F5 */

+	FADD_S( MAT14 )

+

+	FXCH( ST(1) )			/* F4 F6 F5 */

+	FSTP_S( DST0   )		/* F6 F5 */

+	FXCH( ST(1) )			/* F5 F6 */

+	FSTP_S( DST1   )		/* F6 */

+	FSTP_S( DST2   )		/* */

+

+LLBL(x86_p3_3dr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_3dr_loop) )

+

+LLBL(x86_p3_3dr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_3d_no_rot )

+HIDDEN(_mesa_x86_transform_points3_3d_no_rot)

+GLNAME( _mesa_x86_transform_points3_3d_no_rot ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_3dnrr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p3_3dnrr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F1 F4 */

+	FMUL_S( MAT5 )

+

+	FLD_S( SRC2 )			/* F2 F1 F4 */

+	FMUL_S( MAT10 )

+

+	FXCH( ST(2) )			/* F4 F1 F2 */

+	FADD_S( MAT12 )

+	FLD_S( MAT13 )		/* F5 F4 F1 F2 */

+	FXCH( ST(2) )			/* F1 F4 F5 F2 */

+	FADDP( ST0, ST(2) )		/* F4 F5 F2 */

+	FLD_S( MAT14 )		/* F6 F4 F5 F2 */

+	FXCH( ST(3) )			/* F2 F4 F5 F6 */

+	FADDP( ST0, ST(3) )		/* F4 F5 F6 */

+

+	FSTP_S( DST0   )		/* F5 F6 */

+	FSTP_S( DST1   )		/* F6 */

+	FSTP_S( DST2   )		/* */

+

+LLBL(x86_p3_3dnrr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_3dnrr_loop) )

+

+LLBL(x86_p3_3dnrr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_2d )

+HIDDEN(_mesa_x86_transform_points3_2d)

+GLNAME( _mesa_x86_transform_points3_2d ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_2dr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p3_2dr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+

+	FLD_S( SRC1 )			/* F0 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F0 F1 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F5 F4 */

+

+	FXCH( ST(1) )			/* F4 F5 */

+	FADD_S( MAT12 )

+	FXCH( ST(1) )			/* F5 F4 */

+	FADD_S( MAT13 )

+

+	MOV_L( SRC2, EBX )

+

+	FXCH( ST(1) )			/* F4 F5 */

+	FSTP_S( DST0   )		/* F5 */

+	FSTP_S( DST1   )		/* */

+	MOV_L( EBX, DST2 )

+

+LLBL(x86_p3_2dr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_2dr_loop) )

+

+LLBL(x86_p3_2dr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_2d_no_rot )

+HIDDEN(_mesa_x86_transform_points3_2d_no_rot)

+GLNAME( _mesa_x86_transform_points3_2d_no_rot ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_2dnrr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p3_2dnrr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F1 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F4 F1 */

+	FADD_S( MAT12 )

+	FLD_S( MAT13 )		/* F5 F4 F1 */

+

+	FXCH( ST(2) )			/* F1 F4 F5 */

+	FADDP( ST0, ST(2) )		/* F4 F5 */

+

+	MOV_L( SRC2, EBX )

+

+	FSTP_S( DST0 )		/* F5 */

+	FSTP_S( DST1 )		/* */

+	MOV_L( EBX, DST2 )

+

+LLBL(x86_p3_2dnrr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_2dnrr_loop) )

+

+LLBL(x86_p3_2dnrr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points3_identity )

+HIDDEN(_mesa_x86_transform_points3_identity)

+GLNAME(_mesa_x86_transform_points3_identity ):

+

+#define FRAME_OFFSET 16

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+	PUSH_L( EBP )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p3_ir_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_3), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(3), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+	CMP_L( ESI, EDI )

+	JE( LLBL(x86_p3_ir_done) )

+

+ALIGNTEXT16

+LLBL(x86_p3_ir_loop):

+

+#if 1

+	MOV_L( SRC0, EBX )

+	MOV_L( SRC1, EBP )

+	MOV_L( SRC2, EDX )

+

+	MOV_L( EBX, DST0 )

+	MOV_L( EBP, DST1 )

+	MOV_L( EDX, DST2 )

+#else

+	FLD_S( SRC0 )

+	FLD_S( SRC1 )

+	FLD_S( SRC2 )

+

+	FSTP_S( DST2 )

+	FSTP_S( DST1 )

+	FSTP_S( DST0 )

+#endif

+

+LLBL(x86_p3_ir_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p3_ir_loop) )

+

+LLBL(x86_p3_ir_done):

+

+	POP_L( EBP )

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/x86_xform4.S b/mesalib/src/mesa/x86/x86_xform4.S
new file mode 100644
index 000000000..687426eb5
--- /dev/null
+++ b/mesalib/src/mesa/x86/x86_xform4.S
@@ -0,0 +1,677 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * NOTE: Avoid using spaces in between '(' ')' and arguments, especially

+ * with macros like CONST, LLBL that expand to CONCAT(...).  Putting spaces

+ * in there will break the build on some platforms.

+ */

+

+#include "assyntax.h"

+#include "matypes.h"

+#include "xform_args.h"

+

+	SEG_TEXT

+

+#define FP_ONE		1065353216

+#define FP_ZERO		0

+

+#define SRC0		REGOFF(0, ESI)

+#define SRC1		REGOFF(4, ESI)

+#define SRC2		REGOFF(8, ESI)

+#define SRC3		REGOFF(12, ESI)

+#define DST0		REGOFF(0, EDI)

+#define DST1		REGOFF(4, EDI)

+#define DST2		REGOFF(8, EDI)

+#define DST3		REGOFF(12, EDI)

+#define MAT0		REGOFF(0, EDX)

+#define MAT1		REGOFF(4, EDX)

+#define MAT2		REGOFF(8, EDX)

+#define MAT3		REGOFF(12, EDX)

+#define MAT4		REGOFF(16, EDX)

+#define MAT5		REGOFF(20, EDX)

+#define MAT6		REGOFF(24, EDX)

+#define MAT7		REGOFF(28, EDX)

+#define MAT8		REGOFF(32, EDX)

+#define MAT9		REGOFF(36, EDX)

+#define MAT10		REGOFF(40, EDX)

+#define MAT11		REGOFF(44, EDX)

+#define MAT12		REGOFF(48, EDX)

+#define MAT13		REGOFF(52, EDX)

+#define MAT14		REGOFF(56, EDX)

+#define MAT15		REGOFF(60, EDX)

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points4_general )

+HIDDEN(_mesa_x86_transform_points4_general)

+GLNAME( _mesa_x86_transform_points4_general ):

+

+#define FRAME_OFFSET 8

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_gr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p4_gr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+	FLD_S( SRC0 )			/* F6 F5 F4 */

+	FMUL_S( MAT2 )

+	FLD_S( SRC0 )			/* F7 F6 F5 F4 */

+	FMUL_S( MAT3 )

+

+	FLD_S( SRC1 )			/* F0 F7 F6 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT5 )

+	FLD_S( SRC1 )			/* F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT6 )

+	FLD_S( SRC1 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT7 )

+

+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */

+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */

+

+	FLD_S( SRC2 )			/* F0 F7 F6 F5 F4 */

+	FMUL_S( MAT8 )

+	FLD_S( SRC2 )			/* F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT9 )

+	FLD_S( SRC2 )			/* F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT10 )

+	FLD_S( SRC2 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT11 )

+

+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */

+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */

+

+	FLD_S( SRC3 )			/* F0 F7 F6 F5 F4 */

+	FMUL_S( MAT12 )

+	FLD_S( SRC3 )			/* F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT13 )

+	FLD_S( SRC3 )			/* F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT14 )

+	FLD_S( SRC3 )			/* F3 F2 F1 F0 F7 F6 F5 F4 */

+	FMUL_S( MAT15 )

+

+	FXCH( ST(3) )			/* F0 F2 F1 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(7) )		/* F2 F1 F3 F7 F6 F5 F4 */

+	FXCH( ST(1) )			/* F1 F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F2 F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F3 F7 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F7 F6 F5 F4 */

+

+	FXCH( ST(3) )			/* F4 F6 F5 F7 */

+	FSTP_S( DST0 )		/* F6 F5 F7 */

+	FXCH( ST(1) )			/* F5 F6 F7 */

+	FSTP_S( DST1 )		/* F6 F7 */

+	FSTP_S( DST2 )		/* F7 */

+	FSTP_S( DST3 )		/* */

+

+LLBL(x86_p4_gr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_gr_loop) )

+

+LLBL(x86_p4_gr_done):

+

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points4_perspective )

+HIDDEN(_mesa_x86_transform_points4_perspective)

+GLNAME( _mesa_x86_transform_points4_perspective ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_pr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p4_pr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F5 F4 */

+	FMUL_S( MAT5 )

+

+	FLD_S( SRC2 )			/* F0 F5 F4 */

+	FMUL_S( MAT8 )

+	FLD_S( SRC2 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT9 )

+	FLD_S( SRC2 )			/* F6 F1 F0 F5 F4 */

+	FMUL_S( MAT10 )

+

+	FXCH( ST(2) )			/* F0 F1 F6 F5 F4 */

+	FADDP( ST0, ST(4) )		/* F1 F6 F5 F4 */

+	FADDP( ST0, ST(2) )		/* F6 F5 F4 */

+

+	FLD_S( SRC3 )			/* F2 F6 F5 F4 */

+	FMUL_S( MAT14 )

+

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	MOV_L( SRC2, EBX )

+	XOR_L( CONST(-2147483648), EBX )/* change sign */

+

+	FXCH( ST(2) )			/* F4 F5 F6 */

+	FSTP_S( DST0 )		/* F5 F6 */

+	FSTP_S( DST1 )		/* F6 */

+	FSTP_S( DST2 )		/* */

+	MOV_L( EBX, DST3 )

+

+LLBL(x86_p4_pr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_pr_loop) )

+

+LLBL(x86_p4_pr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points4_3d )

+HIDDEN(_mesa_x86_transform_points4_3d)

+GLNAME( _mesa_x86_transform_points4_3d ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_3dr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p4_3dr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+	FLD_S( SRC0 )			/* F6 F5 F4 */

+	FMUL_S( MAT2 )

+

+	FLD_S( SRC1 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT5 )

+	FLD_S( SRC1 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT6 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	FLD_S( SRC2 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT8 )

+	FLD_S( SRC2 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT9 )

+	FLD_S( SRC2 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT10 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	FLD_S( SRC3 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT12 )

+	FLD_S( SRC3 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT13 )

+	FLD_S( SRC3 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT14 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	MOV_L( SRC3, EBX )

+

+	FXCH( ST(2) )			/* F4 F5 F6 */

+	FSTP_S( DST0 )		/* F5 F6 */

+	FSTP_S( DST1 )		/* F6 */

+	FSTP_S( DST2 )		/* */

+	MOV_L( EBX, DST3 )

+

+LLBL(x86_p4_3dr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_3dr_loop) )

+

+LLBL(x86_p4_3dr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME(_mesa_x86_transform_points4_3d_no_rot)

+HIDDEN(_mesa_x86_transform_points4_3d_no_rot)

+GLNAME(_mesa_x86_transform_points4_3d_no_rot):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_3dnrr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p4_3dnrr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F5 F4 */

+	FMUL_S( MAT5 )

+

+	FLD_S( SRC2 )			/* F6 F5 F4 */

+	FMUL_S( MAT10 )

+

+	FLD_S( SRC3 )			/* F0 F6 F5 F4 */

+	FMUL_S( MAT12 )

+	FLD_S( SRC3 )			/* F1 F0 F6 F5 F4 */

+	FMUL_S( MAT13 )

+	FLD_S( SRC3 )			/* F2 F1 F0 F6 F5 F4 */

+	FMUL_S( MAT14 )

+

+	FXCH( ST(2) )			/* F0 F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(5) )		/* F1 F2 F6 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F2 F6 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F6 F5 F4 */

+

+	MOV_L( SRC3, EBX )

+

+	FXCH( ST(2) )			/* F4 F5 F6 */

+	FSTP_S( DST0   )		/* F5 F6 */

+	FSTP_S( DST1   )		/* F6 */

+	FSTP_S( DST2   )		/* */

+	MOV_L( EBX, DST3 )

+

+LLBL(x86_p4_3dnrr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_3dnrr_loop) )

+

+LLBL(x86_p4_3dnrr_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points4_2d )

+HIDDEN(_mesa_x86_transform_points4_2d)

+GLNAME( _mesa_x86_transform_points4_2d ):

+

+#define FRAME_OFFSET 16

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+	PUSH_L( EBP )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_2dr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p4_2dr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+	FLD_S( SRC0 )			/* F5 F4 */

+	FMUL_S( MAT1 )

+

+	FLD_S( SRC1 )			/* F0 F5 F4 */

+	FMUL_S( MAT4 )

+	FLD_S( SRC1 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT5 )

+

+	FXCH( ST(1) )			/* F0 F1 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F5 F4 */

+

+	FLD_S( SRC3 )			/* F0 F5 F4 */

+	FMUL_S( MAT12 )

+	FLD_S( SRC3 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT13 )

+

+	FXCH( ST(1) )			/* F0 F1 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F5 F4 */

+

+	MOV_L( SRC2, EBX )

+	MOV_L( SRC3, EBP )

+

+	FXCH( ST(1) )			/* F4 F5 */

+	FSTP_S( DST0 )		/* F5 */

+	FSTP_S( DST1 )		/* */

+	MOV_L( EBX, DST2 )

+	MOV_L( EBP, DST3 )

+

+LLBL(x86_p4_2dr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_2dr_loop) )

+

+LLBL(x86_p4_2dr_done):

+

+	POP_L( EBP )

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points4_2d_no_rot )

+HIDDEN(_mesa_x86_transform_points4_2d_no_rot)

+GLNAME( _mesa_x86_transform_points4_2d_no_rot ):

+

+#define FRAME_OFFSET 16

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+	PUSH_L( EBP )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_2dnrr_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+ALIGNTEXT16

+LLBL(x86_p4_2dnrr_loop):

+

+	FLD_S( SRC0 )			/* F4 */

+	FMUL_S( MAT0 )

+

+	FLD_S( SRC1 )			/* F5 F4 */

+	FMUL_S( MAT5 )

+

+	FLD_S( SRC3 )			/* F0 F5 F4 */

+	FMUL_S( MAT12 )

+	FLD_S( SRC3 )			/* F1 F0 F5 F4 */

+	FMUL_S( MAT13 )

+

+	FXCH( ST(1) )			/* F0 F1 F5 F4 */

+	FADDP( ST0, ST(3) )		/* F1 F5 F4 */

+	FADDP( ST0, ST(1) )		/* F5 F4 */

+

+	MOV_L( SRC2, EBX )

+	MOV_L( SRC3, EBP )

+

+	FXCH( ST(1) )			/* F4 F5 */

+	FSTP_S( DST0   )		/* F5 */

+	FSTP_S( DST1   )		/* */

+	MOV_L( EBX, DST2 )

+	MOV_L( EBP, DST3 )

+

+LLBL(x86_p4_2dnrr_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_2dnrr_loop) )

+

+LLBL(x86_p4_2dnrr_done):

+

+	POP_L( EBP )

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+#undef FRAME_OFFSET

+

+

+

+

+ALIGNTEXT16

+GLOBL GLNAME( _mesa_x86_transform_points4_identity )

+HIDDEN(_mesa_x86_transform_points4_identity)

+GLNAME( _mesa_x86_transform_points4_identity ):

+

+#define FRAME_OFFSET 12

+	PUSH_L( ESI )

+	PUSH_L( EDI )

+	PUSH_L( EBX )

+

+	MOV_L( ARG_SOURCE, ESI )

+	MOV_L( ARG_DEST, EDI )

+

+	MOV_L( ARG_MATRIX, EDX )

+	MOV_L( REGOFF(V4F_COUNT, ESI), ECX )

+

+	TEST_L( ECX, ECX )

+	JZ( LLBL(x86_p4_ir_done) )

+

+	MOV_L( REGOFF(V4F_STRIDE, ESI), EAX )

+	OR_L( CONST(VEC_SIZE_4), REGOFF(V4F_FLAGS, EDI) )

+

+	MOV_L( ECX, REGOFF(V4F_COUNT, EDI) )

+	MOV_L( CONST(4), REGOFF(V4F_SIZE, EDI) )

+

+	SHL_L( CONST(4), ECX )

+	MOV_L( REGOFF(V4F_START, ESI), ESI )

+

+	MOV_L( REGOFF(V4F_START, EDI), EDI )

+	ADD_L( EDI, ECX )

+

+	CMP_L( ESI, EDI )

+	JE( LLBL(x86_p4_ir_done) )

+

+ALIGNTEXT16

+LLBL(x86_p4_ir_loop):

+

+	MOV_L( SRC0, EBX )

+	MOV_L( SRC1, EDX )

+

+	MOV_L( EBX, DST0 )

+	MOV_L( EDX, DST1 )

+

+	MOV_L( SRC2, EBX )

+	MOV_L( SRC3, EDX )

+

+	MOV_L( EBX, DST2 )

+	MOV_L( EDX, DST3 )

+

+LLBL(x86_p4_ir_skip):

+

+	ADD_L( CONST(16), EDI )

+	ADD_L( EAX, ESI )

+	CMP_L( ECX, EDI )

+	JNE( LLBL(x86_p4_ir_loop) )

+

+LLBL(x86_p4_ir_done):

+

+	POP_L( EBX )

+	POP_L( EDI )

+	POP_L( ESI )

+	RET

+	

+#if defined (__ELF__) && defined (__linux__)

+	.section .note.GNU-stack,"",%progbits

+#endif

diff --git a/mesalib/src/mesa/x86/xform_args.h b/mesalib/src/mesa/x86/xform_args.h
new file mode 100644
index 000000000..772ab9d1f
--- /dev/null
+++ b/mesalib/src/mesa/x86/xform_args.h
@@ -0,0 +1,51 @@
+

+/*

+ * Mesa 3-D graphics library

+ * Version:  3.5

+ *

+ * Copyright (C) 1999-2001  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.

+ */

+

+/*

+ * Transform function interface for assembly code.  Simply define

+ * FRAME_OFFSET to the number of bytes pushed onto the stack before

+ * using the ARG_* argument macros.

+ *

+ * Gareth Hughes

+ */

+

+#ifndef __XFORM_ARGS_H__

+#define __XFORM_ARGS_H__

+

+/* Offsets for transform_func arguments

+ *

+ * typedef void (*transform_func)( GLvector4f *to_vec,

+ *				   const GLfloat m[16],

+ *				   const GLvector4f *from_vec );

+ */

+#define OFFSET_DEST	4

+#define OFFSET_MATRIX	8

+#define OFFSET_SOURCE	12

+

+#define ARG_DEST	REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)

+#define ARG_MATRIX 	REGOFF(FRAME_OFFSET+OFFSET_MATRIX, ESP)

+#define ARG_SOURCE 	REGOFF(FRAME_OFFSET+OFFSET_SOURCE, ESP)

+

+#endif